diff --git a/ootw/Makefile b/ootw/Makefile index 3e240ea1..64e83691 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -92,7 +92,7 @@ OOTW_C4: ootw_c4.o ootw_c4.o: ootw_c4.s \ gr_copy.s gr_copy_offset.s gr_fast_clear.s gr_pageflip.s gr_unrle.s \ gr_putsprite.s gr_putsprite_flipped.s gr_putsprite_crop.s \ - keyboard.s gr_run_sequence.s physicist.s \ + keyboard.s gr_run_sequence.s physicist.s ootw_c4_city.s \ ootw_graphics/sprites/physicist.inc \ ootw_graphics/l4city/ootw_c4_city.inc ca65 -o ootw_c4.o ootw_c4.s -l ootw_c4.lst diff --git a/ootw/ootw_c4_city.s b/ootw/ootw_c4_city.s index 1e5933bb..61c8e1e6 100644 --- a/ootw/ootw_c4_city.s +++ b/ootw/ootw_c4_city.s @@ -40,7 +40,7 @@ ootw_city: ; Room0 with recharger room0: - lda #(24+128) + lda #(6+128) sta LEFT_LIMIT lda #(39+128) sta RIGHT_LIMIT @@ -53,7 +53,7 @@ room0: lda #0 sta cel_smc+1 - lda #30 + lda #28 sta PHYSICIST_Y ; load background @@ -81,7 +81,7 @@ room1: lda #0 sta cel_smc+1 - lda #30 + lda #8 sta PHYSICIST_Y ; load background @@ -109,6 +109,9 @@ room2: lda #1 sta cel_smc+1 + lda #18 + sta PHYSICIST_Y + ; load background lda #>(causeway1_rle) sta GBASH