Skip to content

Commit b060351

Browse files
iProgramMCiProgramMC
committed
* Ch2: Add some respawn objects here too.
1 parent ab38e78 commit b060351

7 files changed

Lines changed: 89 additions & 92 deletions

File tree

‎src/level2/roomlist.asm‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ level2:
22
.word level2_music ; music table
33
.word level2_banks ; list of banks for each room
44
.byte $02 ; environment type
5-
.byte $59 ; warp count
5+
.byte $58 ; warp count
66
.word level2_w_init
77
.word level2_w_start_to_0
88
.word level2_w_start_to_s0
@@ -65,7 +65,6 @@ level2:
6565
.word level2_w_d3m_to_d8
6666
.word level2_w_d3m_to_d3u
6767
.word level2_w_d3b_to_d8
68-
.word level2_w_d3b_to_d3m
6968
.word level2_w_r6_to_r7
7069
.word level2_w_r7_to_r8
7170
.word level2_w_r8_to_r9
@@ -155,7 +154,6 @@ level2_banks:
155154
.byte prgb_lvl2c ; level2_w_d3m_to_d8
156155
.byte prgb_lvl2d ; level2_w_d3m_to_d3u
157156
.byte prgb_lvl2c ; level2_w_d3b_to_d8
158-
.byte prgb_lvl2d ; level2_w_d3b_to_d3m
159157
.byte prgb_lvl2d ; level2_w_r6_to_r7
160158
.byte prgb_lvl2a ; level2_w_r7_to_r8
161159
.byte prgb_lvl2c ; level2_w_r8_to_r9

‎src/level2/rooms/0.asm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ level2_r8_t:
560560
.byte $5A,$DE,$EE,$FF
561561
level2_r8:
562562
.byte 48, 15
563-
.byte 255, 255, 255, 65
563+
.byte 255, 255, 255, 64
564564
.byte 0, 0, 0, 250
565565
.byte 32
566566
.byte 255
@@ -651,7 +651,7 @@ level2_r9b_t:
651651
.byte $FF
652652
level2_r9b:
653653
.byte 44, 0
654-
.byte 255, 70, 255, 255
654+
.byte 255, 69, 255, 255
655655
.byte 0, 8, 0, 0
656656
.byte 38
657657
.byte 255
@@ -838,7 +838,7 @@ level2_r10_t:
838838
.byte $53,$52,$52,$54,$54,$C3,$53,$FF
839839
level2_r10:
840840
.byte 40, 7
841-
.byte 255, 71, 255, 255
841+
.byte 255, 70, 255, 255
842842
.byte 0, 0, 0, 0
843843
.byte 0
844844
.byte 255
@@ -1008,7 +1008,7 @@ level2_r10__t:
10081008
.byte $5D,$ED,$5A,$5A,$EC,$FF
10091009
level2_r10_:
10101010
.byte 40, 7
1011-
.byte 255, 72, 255, 255
1011+
.byte 255, 71, 255, 255
10121012
.byte 0, 8, 0, 0
10131013
.byte 0
10141014
.byte 255

‎src/level2/rooms/2.asm‎

Lines changed: 72 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -39,78 +39,79 @@ level2_d0_p:
3939
.byte $00,$00,$CF,$0C,$F1,$30,$FD,$FF
4040
.byte $0C,$FF
4141
level2_d0_e:
42+
.byte $00,$30,$24,$20,$40,$00,$18
43+
.byte $80,$20,$24,$30,$20,$10,$10
4244
.byte $90,$90,$01,$04
45+
.byte $E8,$58,$24,$20,$60,$48,$28
4346
.byte $FF
4447
level2_d0_t:
45-
.byte $C4,$E2,$E0,$BD,$C5,$E3,$B9,$DE
48+
.byte $C4,$E2,$E0,$BC,$C5,$E3,$B9,$DE
4649
.byte $DF,$C4,$E2,$E1,$C6,$A2,$C4,$E8
4750
.byte $C5,$C2,$C4,$C5,$C3,$C4,$C3,$C2
48-
.byte $84,$E2,$E1,$BC,$85,$E1,$B3,$A2
49-
.byte $C3,$E6,$C8,$E1,$DD,$E2,$DD,$BB
50-
.byte $C6,$E4,$A9,$8B,$8C,$8F,$84,$E0
51-
.byte $86,$E6,$00,$00,$00,$B2,$C5,$C2
52-
.byte $A2,$C4,$E1,$B6,$86,$E4,$9A,$86
51+
.byte $8B,$E1,$B3,$A2,$C3,$E6,$C8,$E1
52+
.byte $DD,$E2,$DD,$BB,$C6,$E4,$A9,$8B
53+
.byte $8C,$8F,$8B,$E4,$00,$00,$00,$B2
54+
.byte $A4,$C4,$E1,$B6,$86,$E4,$9A,$86
5355
.byte $7A,$81,$84,$E1,$E1,$89,$E1,$EC
5456
.byte $CB,$E2,$AB,$93,$A2,$94,$83,$E3
5557
.byte $C6,$C3,$B7,$88,$E1,$EB,$8B,$C4
56-
.byte $82,$E2,$DE,$BB,$CA,$90,$82,$E2
57-
.byte $E0,$BD,$8A,$D0,$82,$E2,$E3,$BB
58-
.byte $9A,$82,$E1,$E1,$9B,$82,$E2,$DE
59-
.byte $BD,$9A,$82,$E2,$E3,$BC,$9A,$82
60-
.byte $E3,$00,$C7,$B5,$99,$83,$E4,$E0
61-
.byte $C7,$BE,$B4,$97,$82,$E1,$C6,$A2
62-
.byte $C2,$E4,$C3,$C2,$CC,$D2,$95,$E3
63-
.byte $00,$E1,$BB,$D6,$E2,$B1,$B5,$83
64-
.byte $E3,$E2,$E1,$BD,$96,$E5,$B9,$C7
65-
.byte $C1,$BF,$C1,$E3,$C2,$C3,$B6,$85
66-
.byte $EB,$A8,$89,$8A,$8B,$8C,$8D,$8E
67-
.byte $8F,$AC,$E7,$CE,$A3,$CC,$E4,$C0
68-
.byte $C0,$BE,$C9,$A2,$E1,$A2,$E2,$C8
69-
.byte $E9,$99,$7D,$81,$85,$79,$7D,$81
70-
.byte $85,$A1,$C4,$E9,$E7,$B8,$DD,$E0
71-
.byte $E0,$C6,$C3,$C4,$C3,$88,$E9,$9A
72-
.byte $7E,$82,$86,$7A,$7E,$82,$86,$A2
73-
.byte $85,$E8,$B9,$E1,$C6,$C5,$B6,$00
74-
.byte $00,$00,$88,$E9,$9B,$7F,$83,$87
75-
.byte $7B,$7F,$83,$87,$A3,$85,$E3,$B8
76-
.byte $C6,$B7,$C5,$88,$E9,$9C,$7C,$80
77-
.byte $84,$78,$7C,$80,$84,$A4,$86,$E1
78-
.byte $BB,$C6,$E3,$C1,$BF,$B4,$85,$F0
79-
.byte $AB,$91,$92,$93,$94,$95,$96,$97
80-
.byte $AF,$E7,$CE,$BF,$BE,$C0,$C9,$B6
81-
.byte $86,$E3,$E0,$E2,$BC,$85,$E4,$00
82-
.byte $00,$00,$D5,$C7,$E4,$B8,$DE,$C6
83-
.byte $B7,$C7,$E3,$00,$DF,$BB,$88,$E1
84-
.byte $DA,$87,$E3,$B9,$C6,$B7,$C8,$E3
85-
.byte $00,$E3,$BC,$90,$E2,$BA,$BD,$C9
86-
.byte $E3,$00,$DC,$BB,$87,$E2,$B1,$BB
87-
.byte $87,$E2,$B9,$B7,$89,$8A,$E2,$B8
88-
.byte $B6,$87,$E1,$DA,$CA,$00,$E0,$88
89-
.byte $E1,$DB,$C7,$E2,$B0,$BD,$8A,$00
90-
.byte $DF,$87,$E2,$B1,$BB,$87,$E2,$B8
91-
.byte $BC,$8A,$E4,$00,$00,$C7,$B5,$85
92-
.byte $E1,$B8,$87,$E4,$B1,$C9,$C7,$B4
93-
.byte $89,$82,$E2,$DF,$BB,$85,$E2,$B9
94-
.byte $BD,$86,$E4,$B9,$E0,$DE,$BD,$89
95-
.byte $82,$E4,$00,$C7,$C1,$B4,$83,$E2
96-
.byte $B8,$BB,$87,$E2,$E2,$E3,$8A,$83
97-
.byte $E7,$00,$E3,$C7,$C0,$BF,$BE,$C9
98-
.byte $87,$E5,$07,$E0,$00,$C7,$B5,$88
99-
.byte $84,$E7,$00,$00,$DD,$DE,$E3,$C6
100-
.byte $B7,$84,$E9,$01,$0B,$3B,$00,$00
101-
.byte $00,$C7,$C1,$B4,$86,$86,$E4,$00
102-
.byte $00,$DD,$BD,$C5,$02,$0F,$3A,$83
103-
.byte $E3,$00,$E2,$BB,$86,$88,$E1,$DE
104-
.byte $86,$E4,$00,$00,$07,$E3,$83,$E2
105-
.byte $DD,$BD,$86,$88,$E2,$E3,$BC,$87
106-
.byte $E2,$02,$C8,$83,$E3,$00,$C7,$B4
107-
.byte $85,$89,$E1,$BD,$87,$E3,$00,$BA
108-
.byte $E2,$83,$E4,$00,$C7,$C0,$B5,$83
109-
.byte $88,$E5,$E0,$C7,$C1,$BE,$B5,$85
110-
.byte $E1,$B8,$85,$E6,$00,$E1,$C7,$C0
111-
.byte $C1,$BF,$88,$E5,$DF,$E2,$E0,$DE
112-
.byte $BB,$85,$E2,$B9,$DC,$85,$E5,$00
113-
.byte $00,$E2,$DC,$E2,$FF
58+
.byte $82,$E2,$DE,$BB,$CA,$90,$82,$E0
59+
.byte $8B,$D0,$82,$E1,$E3,$9B,$82,$E1
60+
.byte $E1,$9B,$82,$E1,$DE,$9B,$82,$E1
61+
.byte $E3,$9B,$82,$E3,$00,$C7,$B5,$99
62+
.byte $83,$E4,$E0,$C7,$BE,$B4,$97,$82
63+
.byte $E1,$C6,$A2,$C2,$E4,$C3,$C2,$CC
64+
.byte $D2,$95,$E3,$00,$E1,$BB,$D6,$E2
65+
.byte $B1,$B5,$83,$E3,$E2,$E1,$BD,$96
66+
.byte $E5,$B9,$C7,$C1,$BF,$C1,$E3,$C2
67+
.byte $C3,$B6,$85,$EB,$A8,$89,$8A,$8B
68+
.byte $8C,$8D,$8E,$8F,$AC,$E7,$CE,$A3
69+
.byte $CC,$E4,$C0,$C0,$BE,$C9,$A4,$E1
70+
.byte $C8,$E9,$99,$7D,$81,$85,$79,$7D
71+
.byte $81,$85,$A1,$C4,$E9,$E7,$B8,$DD
72+
.byte $E0,$E0,$C6,$C3,$C4,$C3,$88,$E9
73+
.byte $9A,$7E,$82,$86,$7A,$7E,$82,$86
74+
.byte $A2,$85,$E8,$B9,$E1,$C6,$C5,$B6
75+
.byte $00,$00,$00,$88,$E9,$9B,$7F,$83
76+
.byte $87,$7B,$7F,$83,$87,$A3,$85,$E3
77+
.byte $B8,$C6,$B7,$C5,$88,$E9,$9C,$7C
78+
.byte $80,$84,$78,$7C,$80,$84,$A4,$86
79+
.byte $E1,$BB,$C6,$E3,$C1,$BF,$B4,$85
80+
.byte $F0,$AB,$91,$92,$93,$94,$95,$96
81+
.byte $97,$AF,$E7,$CE,$BF,$BE,$C0,$C9
82+
.byte $B6,$86,$E3,$E0,$E2,$BB,$85,$E4
83+
.byte $00,$00,$00,$D5,$C7,$E4,$B8,$DE
84+
.byte $C6,$B7,$C7,$00,$DF,$89,$E1,$DA
85+
.byte $87,$E3,$B9,$C6,$B7,$C8,$E2,$00
86+
.byte $E3,$91,$E2,$BA,$BD,$C9,$E2,$00
87+
.byte $DC,$88,$E2,$B1,$BB,$87,$E2,$B9
88+
.byte $B7,$89,$8A,$E2,$B8,$B6,$87,$E1
89+
.byte $DA,$CA,$00,$E0,$88,$E1,$DB,$C7
90+
.byte $E2,$B0,$BD,$8A,$00,$DF,$87,$E2
91+
.byte $B1,$BB,$87,$E2,$B8,$BC,$8A,$E4
92+
.byte $00,$00,$C7,$B5,$85,$E1,$B8,$87
93+
.byte $E4,$B1,$C9,$C7,$B4,$89,$82,$E2
94+
.byte $DF,$BB,$85,$E2,$B9,$BD,$86,$E4
95+
.byte $B9,$E0,$DE,$BD,$89,$82,$E4,$00
96+
.byte $C7,$C1,$B4,$83,$E2,$B8,$BB,$87
97+
.byte $E2,$E2,$E3,$8A,$83,$E7,$00,$E3
98+
.byte $C7,$C0,$BF,$BE,$C9,$87,$E5,$07
99+
.byte $E0,$00,$C7,$B5,$88,$84,$E7,$00
100+
.byte $00,$DD,$DE,$E3,$C6,$B7,$84,$E9
101+
.byte $01,$0B,$3B,$00,$00,$00,$C7,$C1
102+
.byte $B4,$86,$86,$E4,$00,$00,$DD,$BD
103+
.byte $C5,$02,$0F,$3A,$83,$E3,$00,$E2
104+
.byte $BB,$86,$88,$E1,$DE,$86,$E4,$00
105+
.byte $00,$07,$E3,$83,$E2,$DD,$BD,$86
106+
.byte $88,$E2,$E3,$BC,$87,$E2,$02,$C8
107+
.byte $83,$E3,$00,$C7,$B4,$85,$89,$E1
108+
.byte $BD,$87,$E3,$00,$BA,$E2,$83,$E4
109+
.byte $00,$C7,$C0,$B5,$83,$88,$E5,$00
110+
.byte $C7,$C1,$BE,$B5,$85,$E1,$B8,$85
111+
.byte $E6,$00,$E1,$C7,$C0,$C1,$BF,$89
112+
.byte $E4,$00,$E0,$DE,$BB,$85,$E2,$B9
113+
.byte $DC,$85,$E5,$00,$00,$E2,$DC,$E2
114+
.byte $FF
114115
level2_d0:
115116
.byte 40, 128
116117
.byte 20, 22, 21, 23
@@ -808,7 +809,7 @@ level2_r6_t:
808809
.byte $FF
809810
level2_r6:
810811
.byte 44, 0
811-
.byte 63, 255, 255, 255
812+
.byte 62, 255, 255, 255
812813
.byte 0, 0, 0, 0
813814
.byte 0
814815
.byte 255
@@ -907,7 +908,7 @@ level2_r9_t:
907908
.byte $63,$47,$8F,$FF
908909
level2_r9:
909910
.byte 60, 0
910-
.byte 67, 255, 255, 66
911+
.byte 66, 255, 255, 65
911912
.byte 248, 0, 0, 6
912913
.byte 38
913914
.byte 255
@@ -996,11 +997,11 @@ level2_r12b_t:
996997
.byte $FF
997998
level2_r12b:
998999
.byte 48, 0
999-
.byte 255, 81, 79, 80
1000+
.byte 255, 80, 78, 79
10001001
.byte 0, 12, 0, 0
10011002
.byte 32
10021003
.byte 254, 0, 0, 0
1003-
.byte 82, 0, 0, 0
1004+
.byte 81, 0, 0, 0
10041005
.byte 4, 0, 0, 0
10051006
.word level2_r12b_t
10061007
.word level2_r12b_p
@@ -1092,7 +1093,7 @@ level2_r12_t:
10921093
.byte $FF
10931094
level2_r12:
10941095
.byte 60, 0
1095-
.byte 255, 255, 83, 84
1096+
.byte 255, 255, 82, 83
10961097
.byte 0, 0, 0, 0
10971098
.byte 32
10981099
.byte 255
@@ -1182,11 +1183,11 @@ level2_r12d_t:
11821183
.byte $59,$EE,$59,$58,$AC,$EE,$FF
11831184
level2_r12d:
11841185
.byte 48, 0
1185-
.byte 86, 255, 255, 255
1186+
.byte 85, 255, 255, 255
11861187
.byte 36, 0, 0, 0
11871188
.byte 32
11881189
.byte 254, 0, 0, 0
1189-
.byte 85, 0, 0, 0
1190+
.byte 84, 0, 0, 0
11901191
.byte 244, 0, 0, 0
11911192
.word level2_r12d_t
11921193
.word level2_r12d_p

‎src/level2/rooms/3.asm‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ level2_d0a_p:
155155
.byte $0B,$CC,$00,$00,$3F,$33,$33,$33
156156
.byte $03,$FF
157157
level2_d0a_e:
158+
.byte $FE
159+
.byte $10,$28,$24,$30,$40,$20,$28
158160
.byte $FF
159161
level2_d0a_t:
160162
.byte $E2,$C2,$C3,$A2,$C2,$F6,$C3,$C2
@@ -864,7 +866,7 @@ level2_r7_t:
864866
.byte $53,$53,$37,$C9,$FF
865867
level2_r7:
866868
.byte 44, 0
867-
.byte 64, 255, 255, 255
869+
.byte 63, 255, 255, 255
868870
.byte 252, 0, 0, 0
869871
.byte 0
870872
.byte 255
@@ -927,7 +929,7 @@ level2_r9z_t:
927929
.byte $D9,$83,$DB,$9E,$9E,$9E,$9E,$FF
928930
level2_r9z:
929931
.byte 32, 0
930-
.byte 255, 69, 68, 255
932+
.byte 255, 68, 67, 255
931933
.byte 0, 232, 250, 0
932934
.byte 32
933935
.byte 255
@@ -1002,7 +1004,7 @@ level2_r2_t:
10021004
.byte $96,$22,$33,$86,$97,$2E,$86,$FF
10031005
level2_r2:
10041006
.byte 44, 128
1005-
.byte 255, 255, 255, 74
1007+
.byte 255, 255, 255, 73
10061008
.byte 0, 0, 0, 0
10071009
.byte 32
10081010
.byte 255
@@ -1087,7 +1089,7 @@ level2_r11_t:
10871089
.byte $96,$21,$30,$86,$FF
10881090
level2_r11:
10891091
.byte 52, 0
1090-
.byte 255, 255, 75, 76
1092+
.byte 255, 255, 74, 75
10911093
.byte 0, 0, 0, 0
10921094
.byte 32
10931095
.byte 255

‎src/level2/rooms/4.asm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ level2_d3b_t:
3333
.byte $9E,$9E,$FF
3434
level2_d3b:
3535
.byte 32, 0
36-
.byte 255, 255, 61, 62
37-
.byte 0, 0, 242, 234
36+
.byte 255, 255, 61, 255
37+
.byte 0, 0, 242, 0
3838
.byte 1
3939
.byte 255
4040
.word level2_d3b_t
@@ -89,7 +89,7 @@ level2_r2__t:
8989
.byte $4A,$83,$FF
9090
level2_r2_:
9191
.byte 32, 0
92-
.byte 255, 73, 255, 255
92+
.byte 255, 72, 255, 255
9393
.byte 0, 0, 0, 0
9494
.byte 32
9595
.byte 255
@@ -150,7 +150,7 @@ level2_r12bp_t:
150150
.byte $2F,$85,$FF
151151
level2_r12bp:
152152
.byte 32, 0
153-
.byte 255, 255, 77, 78
153+
.byte 255, 255, 76, 77
154154
.byte 0, 0, 0, 0
155155
.byte 32
156156
.byte 255

‎src/level2/rooms/5.asm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ level2_r12c_t:
440440
.byte $FE,$FE,$FE,$FE,$FF
441441
level2_r12c:
442442
.byte 40, 15
443-
.byte 255, 87, 255, 255
443+
.byte 255, 86, 255, 255
444444
.byte 0, 252, 0, 0
445445
.byte 32
446446
.byte 255
@@ -485,7 +485,7 @@ level2_end_chase_t:
485485
.byte $86,$FF
486486
level2_end_chase:
487487
.byte 40, 0
488-
.byte 255, 255, 88, 255
488+
.byte 255, 255, 87, 255
489489
.byte 0, 0, 0, 0
490490
.byte 8
491491
.byte 255

‎src/level2/warplist.asm‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,6 @@ level2_w_d3b_to_d8:
246246
.byte 8 ; room left offset
247247
.byte 240, 168 ; player spawn X/Y
248248
.word level2_d8
249-
level2_w_d3b_to_d3m:
250-
.byte 0 ; room left offset
251-
.byte 0, 112 ; player spawn X/Y
252-
.word level2_d3m
253249
level2_w_r6_to_r7:
254250
.byte 0 ; room left offset
255251
.byte 56, 184 ; player spawn X/Y

0 commit comments

Comments
 (0)