diff --git a/ootw/Makefile b/ootw/Makefile index 43bc09c5..2b55df18 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -16,7 +16,7 @@ ootw.dsk: HELLO LOADER INTRO OOTW_C1 OOTW_C2 OOTW_C3 OOTW_C4 OOTW_C5 $(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C2 $(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C3 $(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C4 -# $(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C5 + $(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C5 # $(DOS33) -y ootw.dsk BSAVE -a 0x1700 AUDIO_TEST # $(DOS33) -y ootw.dsk BSAVE -a 0x2000 COMPRESS-TEST diff --git a/ootw/empty.dsk b/ootw/empty.dsk index 0a2af35e..023c538b 100644 Binary files a/ootw/empty.dsk and b/ootw/empty.dsk differ diff --git a/ootw/ootw_c5.s b/ootw/ootw_c5.s index 255225b6..1e94e60e 100644 --- a/ootw/ootw_c5.s +++ b/ootw/ootw_c5.s @@ -95,12 +95,13 @@ end_message: .include "alien.s" -;.include "gun.s" -;.include "blast.s" -;.include "shield.s" +.include "gun.s" +.include "laser.s" +.include "blast.s" +.include "shield.s" -;.include "door.s" -;.include "collision.s" +.include "door.s" +.include "collision.s" ; room backgrounds .include "ootw_graphics/l5cave/ootw_c5_cave.inc" @@ -108,4 +109,3 @@ end_message: .include "ootw_graphics/sprites/physicist.inc" .include "ootw_graphics/sprites/alien.inc" - diff --git a/ootw/ootw_c5_cave.s b/ootw/ootw_c5_cave.s index 0d4485f5..40368b33 100644 --- a/ootw/ootw_c5_cave.s +++ b/ootw/ootw_c5_cave.s @@ -72,7 +72,7 @@ falling_in: jmp cave_setup_done - ; hallway with weird ceiling + ; ???? cave1: ; cmp #1 ; bne cave2 @@ -106,6 +106,11 @@ cave_setup_done: lda #$c ; load to page $c00 jsr load_rle_gr ; tail call + ;===================== + ; setup walk collision + jsr recalc_walk_collision + + ootw_cave_already_set: ;=========================== @@ -395,3 +400,41 @@ large_rock: .byte $AA,$A0,$00,$00,$02,$AA,$AA + + + +door_y: + c4_r0_door0_y: .byte 24 + c4_r0_door1_y: .byte 24 + c4_r0_door2_y: .byte 24 + c4_r0_door3_y: .byte 24 + c4_r0_door4_y: .byte 24 + +door_status: + c4_r0_door0_status: .byte DOOR_STATUS_CLOSED + c4_r0_door1_status: .byte DOOR_STATUS_CLOSED + c4_r0_door2_status: .byte DOOR_STATUS_LOCKED + c4_r0_door3_status: .byte DOOR_STATUS_LOCKED + c4_r0_door4_status: .byte DOOR_STATUS_LOCKED + +door_x: + c4_r0_door0_x: .byte 7 + c4_r0_door1_x: .byte 18 + c4_r0_door2_x: .byte 29 + c4_r0_door3_x: .byte 31 + c4_r0_door4_x: .byte 33 + +door_xmin: + c4_r0_door0_xmin: .byte 0 ; 7-4-5 + c4_r0_door1_xmin: .byte 11 ; 18-4-5 + c4_r0_door2_xmin: .byte 20 ; 29-4-5 + c4_r0_door3_xmin: .byte 22 ; 31-4-5 + c4_r0_door4_xmin: .byte 24 ; 33-4-5 + +door_xmax: + c4_r0_door0_xmax: .byte 11 ; 7+4 + c4_r0_door1_xmax: .byte 21 ; 18+4 + c4_r0_door2_xmax: .byte 33 ; don't care + c4_r0_door3_xmax: .byte 35 ; don't care + c4_r0_door4_xmax: .byte 37 ; don't care +