Started bringing level 2 content in. When zone level is changed, make…

… sure the level bounding boxes are immediately refreshed.
cadaver · Jul 22, 2015 · 4a39d77 · 4a39d77
1 parent 8a02442
commit 4a39d77
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ clean:
 hessian.d64: loader.prg main.pak options.bin emptysave.bin savelist.bin logo.pak \
 	music00.pak music01.pak music02.pak music03.pak music04.pak music05.pak music06.pak music07.pak \
 	music08.pak music09.pak music10.pak music11.pak music12.pak script00.pak \
-	charset00.pak charset01.pak level00.pak level01.pak \
+	charset00.pak charset01.pak charset02.pak level00.pak level01.pak level02.pak \
 	common.pak item.pak weapon.pak playert.pak playerb.pak playerta.pak playerba.pak
 	makedisk hessian.d64 hessian.seq HESSIAN___________HE_2A 12
 
@@ -253,6 +253,12 @@ charset01.pak: charset01.s memory.s bg/world01.blk bg/world01.bli bg/world01.chi
 	pchunk2 bg/world01.blk charset01_2.pak
 	filejoin charset01_1.pak+charset01_2.pak charset01.pak
 
+charset02.pak: charset02.s memory.s bg/world02.blk bg/world02.bli bg/world02.chi bg/world02.chc bg/world02.chr
+	dasm charset02.s -ocharset02_1.bin -f3
+	pack2 charset02_1.bin charset02_1.pak
+	pchunk2 bg/world02.blk charset02_2.pak
+	filejoin charset02_1.pak+charset02_2.pak charset02.pak
+
 level00.pak: bg/world00.map bg/world00.lvo bg/world00.lva
 	pack2 bg/world00.lvo level00_1.pak
 	pack2 bg/world00.lva level00_2.pak
@@ -265,6 +271,12 @@ level01.pak: bg/world01.map bg/world01.lvo bg/world01.lva
 	pchunk2 bg/world01.map level01_3.pak
 	filejoin level01_1.pak+level01_2.pak+level01_3.pak level01.pak
 
+level02.pak: bg/world02.map bg/world02.lvo bg/world02.lva
+	pack2 bg/world02.lvo level02_1.pak
+	pack2 bg/world02.lva level02_2.pak
+	pchunk2 bg/world02.map level02_3.pak
+	filejoin level02_1.pak+level02_2.pak+level02_3.pak level02.pak
+
 common.pak: spr/common.spr
 	pchunk2 spr/common.spr common.pak
 

diff --git a/bg/world.lvo b/bg/world.lvo
diff --git a/bg/world.lvz b/bg/world.lvz
diff --git a/bg/world.map b/bg/world.map
diff --git a/bg/world.s b/bg/world.s
@@ -1,34 +1,42 @@
-NUMLEVELS = 2
+NUMLEVELS = 3
 
-WORLDSIZEBLOCKS = 3130
+WORLDSIZEBLOCKS = 3330
 
-WORLDSIZESCREENS = 52
+WORLDSIZESCREENS = 56
 
-LVLDATAACTTOTALSIZE = 2
+LVLDATAACTTOTALSIZE = 3
 
-LVLOBJTOTALSIZE = 2
+LVLOBJTOTALSIZE = 3
 
 lvlDataActBitsStart:
                 dc.b 0
                 dc.b 1
+                dc.b 2
 lvlDataActBitsLen:
                 dc.b 1
                 dc.b 1
+                dc.b 1
 lvlObjBitsStart:
                 dc.b 0
                 dc.b 1
+                dc.b 2
 lvlObjBitsLen:
                 dc.b 1
                 dc.b 1
+                dc.b 1
 lvlLimitL:
                 dc.b 0
                 dc.b 18
+                dc.b 18
 lvlLimitR:
                 dc.b 18
-                dc.b 29
+                dc.b 34
+                dc.b 24
 lvlLimitU:
                 dc.b 17
+                dc.b 20
                 dc.b 12
 lvlLimitD:
                 dc.b 34
                 dc.b 30
+                dc.b 18
diff --git a/bg/world01.blk b/bg/world01.blk
diff --git a/bg/world01.lvo b/bg/world01.lvo
diff --git a/bg/world01.map b/bg/world01.map
diff --git a/bg/world02.bli b/bg/world02.bli
diff --git a/bg/world02.blk b/bg/world02.blk
diff --git a/bg/world02.chc b/bg/world02.chc
@@ -0,0 +1,2 @@
+										
+									OOOI		

diff --git a/bg/world02.chi b/bg/world02.chi
diff --git a/bg/world02.chr b/bg/world02.chr
diff --git a/bg/world02.ctm b/bg/world02.ctm
diff --git a/bg/world02.lvo b/bg/world02.lvo
diff --git a/bg/world02.lvr b/bg/world02.lvr
diff --git a/bg/world02.map b/bg/world02.map
diff --git a/hessian.seq b/hessian.seq
@@ -10,8 +10,10 @@ playerb.pak 07
 playerba.pak 08
 level00.pak 10
 level01.pak 11
+level02.pak 12
 charset00.pak 18
 charset01.pak 19
+charset02.pak 1a
 music00.pak 20
 music01.pak 21
 music02.pak 22

diff --git a/hessiand81.seq b/hessiand81.seq
@@ -12,8 +12,10 @@ write 05 @8:
 write 06 @8:
 write 10 @8:
 write 11 @8:
+write 12 @8:
 write 18 @8:
 write 19 @8:
+write 1a @8:
 write 20 @8:
 write 21 @8:
 write 22 @8:

diff --git a/script00.s b/script00.s
@@ -21,10 +21,15 @@ logoScreen      = chars+608
 logoColors      = chars+608+168
 titleTexts      = chars+608+168*2
 
-START_LEVEL     = $00                           ;Warehouse
-START_X         = $6780
+;START_LEVEL     = $00                           ;Warehouse
+;START_X         = $6780
+;START_Y         = $1d00
+
+START_LEVEL     = $01                           ;Courtyard
+START_X         = $0280
 START_Y         = $1d00
 
+
                 org scriptCodeStart
 
                 dc.w TitleScreen

diff --git a/tools/worlded.c b/tools/worlded.c
@@ -875,11 +875,13 @@ void zone_mainloop(void)
       {
         zonelevel[zonenum]++;
         zonelevel[zonenum] &= NUMLEVELS-1;
+        calculatelevelorigins();
       }
       if (k == KEY_K)
       {
         zonelevel[zonenum]--;
         zonelevel[zonenum] &= NUMLEVELS-1;
+        calculatelevelorigins();
       }
       if (k == KEY_U)
       {