From db20da57384a090e11666b70403efe8f60b729cf Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 9 Aug 2019 16:00:28 -0400 Subject: [PATCH] ootw: c4: add some doorways to hide behind --- ootw/ootw_c4_city.s | 128 ++++++++++++++++++--- ootw/ootw_graphics/l4city/causeway1.png | Bin 469 -> 8781 bytes ootw/ootw_graphics/l4city/ootw_c4_city.inc | 78 ++++++------- ootw/zp.inc | 2 + 4 files changed, 151 insertions(+), 57 deletions(-) diff --git a/ootw/ootw_c4_city.s b/ootw/ootw_c4_city.s index fb2cf9f1..f7c7e85b 100644 --- a/ootw/ootw_c4_city.s +++ b/ootw/ootw_c4_city.s @@ -250,20 +250,41 @@ city_loop: ; draw split screen if falling into pit ;====================================== + ; only fall in room3 lda WHICH_ROOM cmp #3 bne nothing_fancy - lda PHYSICIST_STATE - cmp #P_FALLING_SIDEWAYS - beq scroll_bg - cmp #P_FALLING_DOWN - bne nothing_fancy - ;====================== ; falling -scroll_bg: + ; only fall if falling sideways/down + lda PHYSICIST_STATE + cmp #P_FALLING_SIDEWAYS + beq falling_sideways + cmp #P_FALLING_DOWN + beq falling_down + + jmp nothing_fancy + +falling_sideways: + ; if falling sideways, and Y>=22, then crouch + lda PHYSICIST_Y + cmp #30 + bcc scroll_check ; blt + + lda #P_CROUCHING + sta PHYSICIST_STATE + + lda #4 + sta WHICH_ROOM + sta GAME_OVER + + jmp scroll_check + +falling_down: +check_done_falling_down: + ; if falling down, and Y>=32, then impale lda PHYSICIST_Y cmp #32 bcc scroll_check ; blt @@ -280,6 +301,7 @@ scroll_bg: lda #P_IMPALED sta PHYSICIST_STATE + scroll_check: lda BG_SCROLL ; if done scrolling, re-enable falling cmp #48 @@ -310,12 +332,6 @@ not_far_enough: inc BG_SCROLL inc BG_SCROLL -; ldy BG_SCROLL -; cpy #44 -; bne no_scroll_progress - -; lda #P_IMPALED -; sta PHYSICIST_STATE no_scroll_progress: @@ -416,18 +432,33 @@ c4_no_bg_action: jsr check_screen_limit + ;=================== ;=================== ; extra room limits ;=================== + ;=================== + ; only fall in room#3 lda WHICH_ROOM cmp #3 bne regular_room + ; don't fall if impaled or already falling + lda PHYSICIST_STATE + cmp #P_IMPALED + beq regular_room + cmp #P_FALLING_DOWN + beq regular_room + cmp #P_FALLING_SIDEWAYS + beq regular_room + + + ; only start falling if y>=18 lda PHYSICIST_Y cmp #18 - bne regular_room ; blt + bcc regular_room ; blt + ; only start falling if x>=8 lda PHYSICIST_X cmp #8 bcc regular_room ; blt @@ -456,13 +487,51 @@ regular_room: ;======================== - ; draw foreground action + ; draw foreground cover lda WHICH_ROOM cmp #2 - bne c4_no_fg_action + beq c4_room2_cover -;c2_draw_cart: + cmp #4 + beq c4_room4_cover + + jmp c4_no_fg_cover +c4_room2_cover: + + lda #0 + sta XPOS + lda #18 + sta YPOS + + lda #causeway_door_cover + sta INH + + jsr put_sprite + + + jmp c4_no_fg_cover +c4_room4_cover: + + lda #30 + sta XPOS + lda #8 + sta YPOS + + lda #pit_door_cover + sta INH + + jsr put_sprite + +c4_no_fg_cover: + + + +;c2_draw_doorway: ; ; lda CART_X ; sta XPOS @@ -535,7 +604,7 @@ city_frame_no_oflo: bne regular_exit_check lda PHYSICIST_X - cmp #35 + cmp #32 bcc regular_exit_check ; blt lda #5 @@ -715,3 +784,26 @@ recharge_bg4: +; 0x18 +causeway_door_cover: + .byte 8,8 + .byte $00,$00,$00,$00,$00,$00,$22,$AA + .byte $00,$00,$00,$00,$00,$00,$22,$AA + .byte $00,$00,$00,$00,$00,$00,$22,$AA + .byte $00,$00,$00,$00,$00,$00,$02,$2A + .byte $00,$00,$00,$00,$00,$00,$00,$22 + .byte $00,$00,$00,$00,$00,$00,$00,$22 + .byte $00,$00,$00,$00,$00,$00,$00,$22 + .byte $00,$00,$00,$00,$00,$00,$00,$22 + +; 30x8 +pit_door_cover: + .byte 8,8 + .byte $02,$22,$00,$00,$00,$00,$00,$00 + .byte $00,$00,$00,$00,$00,$00,$00,$00 + .byte $20,$00,$00,$00,$00,$00,$00,$00 + .byte $22,$02,$00,$00,$00,$00,$00,$00 + .byte $22,$00,$00,$00,$00,$00,$00,$00 + .byte $00,$00,$00,$00,$00,$00,$00,$00 + .byte $00,$00,$00,$00,$00,$00,$00,$00 + .byte $00,$00,$00,$00,$00,$00,$00,$00 diff --git a/ootw/ootw_graphics/l4city/causeway1.png b/ootw/ootw_graphics/l4city/causeway1.png index 7b8eb2b8002e2748600039db9b5c0025b085ba6b..bb38908be3f9fbc37303c94d195267d8884281e3 100644 GIT binary patch delta 8584 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 N002ovPDHLkV1i1#Tzvol diff --git a/ootw/ootw_graphics/l4city/ootw_c4_city.inc b/ootw/ootw_graphics/l4city/ootw_c4_city.inc index 3e057292..fc0b3ab0 100644 --- a/ootw/ootw_graphics/l4city/ootw_c4_city.inc +++ b/ootw/ootw_graphics/l4city/ootw_c4_city.inc @@ -76,45 +76,45 @@ causeway1_rle: .byte $28 ; ysize=48 .byte $22, $77, $A4,$66, $02,$02, $77, $A5,$66, $22 .byte $A9,$00, $22,$22, $70, $A3,$00, $22, $00, $22 .byte $27, $A5,$66, $00, $22, $77, $A4,$66, $06 - .byte $22, $77, $A5,$66, $22, $A9,$00, $22,$22, $77 - .byte $A3,$00, $22, $00, $22,$22, $56, $A4,$66, $00 - .byte $27, $77, $A4,$22, $00, $22, $77, $A3,$66 - .byte $56, $66, $22, $A6,$00, $22, $00,$00, $22,$22 - .byte $77, $A3,$00, $22, $00, $22,$22, $55, $66 - .byte $56, $66,$66, $00, $22, $77, $A3,$22, $02 - .byte $00, $22, $77, $A3,$66, $55, $66, $22 - .byte $A6,$00, $22, $00,$00, $22,$22, $77, $A3,$00, $22 - .byte $00, $22,$22, $A3,$55, $56, $55, $00, $22 - .byte $77, $22,$22, $02, $00,$00, $22, $77, $66 - .byte $56, $66, $55,$55, $22, $A6,$00, $22, $00,$00 - .byte $22,$22, $77, $A3,$00, $22, $00, $22,$22, $25 - .byte $22, $25, $05,$05, $00, $22, $77, $02 - .byte $A4,$00, $22, $77, $A4,$25, $05, $22, $A6,$00 - .byte $02, $20, $00,$00, $22, $77, $A3,$00, $22 - .byte $00, $A0,$02,$A2, $72,$72, $02, $A3,$00, $22, $77 - .byte $A5,$00, $22, $77, $A3,$22, $02, $00, $22 - .byte $A7,$00, $22, $00,$00, $22, $A0,$01,$A7, $A0,$02,$A0, $A3,$2A - .byte $22, $02, $22, $02, $A4,$00, $22, $77 - .byte $A5,$00, $22, $77, $22, $02, $A3,$00, $22 - .byte $A7,$00, $22, $00,$00, $2A,$2A, $02, $22, $02 - .byte $22, $00, $22, $00, $22, $A5,$00, $22 - .byte $27, $A5,$00, $22, $27, $A5,$00, $22, $A7,$00 - .byte $22, $00,$00, $22, $00,$00, $22, $00, $22 - .byte $00, $22, $00, $22, $A5,$00, $22,$22, $A5,$00 - .byte $22,$22, $A5,$00, $22, $A7,$00, $22, $80, $88 - .byte $78, $57, $58, $78, $88, $58,$58, $88 - .byte $58, $A3,$88, $A5,$85, $A5,$50, $52,$52, $A5,$50, $52 - .byte $A7,$00, $02, $08,$08, $07, $A8,$08, $A3,$05, $A3,$08 - .byte $05, $A4,$08, $A5,$88, $A5,$85, $A0,$34,$00, $20,$20, $A7,$00 - .byte $20, $A5,$00, $20, $22, $72, $50, $A5,$00 - .byte $50, $55, $AD,$00, $20, $22,$22, $A3,$00, $20 - .byte $22,$22, $52,$52, $50, $A3,$00, $50, $55, $25 - .byte $77, $55, $A4,$00, $A4,$55, $AC,$00, $A3,$52, $50 - .byte $00,$00, $52, $A5,$55, $00,$00, $50, $A5,$55, $A3,$00 - .byte $50, $A4,$55, $50, $AB,$00, $75, $A3,$55, $00,$00 - .byte $A6,$55, $00,$00, $55,$55, $A4,$25, $A3,$00, $A6,$55, $AA,$00 - .byte $77,$77, $25,$25, $22, $00,$00, $55, $A5,$22, $00,$00 - .byte $A6,$22, $A3,$00, $22,$22, $A4,$25 + .byte $22, $77, $A5,$66, $22, $A7,$00, $20, $00 + .byte $22,$22, $77, $A3,$00, $22, $00, $22,$22, $56 + .byte $A4,$66, $00, $27, $77, $A4,$22, $00, $22 + .byte $77, $A3,$66, $56, $66, $22, $A6,$00, $22 + .byte $00,$00, $22,$22, $77, $A3,$00, $22, $00, $22,$22 + .byte $55, $66, $56, $66,$66, $00, $22, $77 + .byte $A3,$22, $02, $00, $22, $77, $A3,$66, $55 + .byte $66, $22, $A6,$00, $22, $00,$00, $22,$22, $77 + .byte $A3,$00, $22, $00, $22,$22, $A3,$55, $56, $55 + .byte $00, $22, $77, $22,$22, $02, $00,$00, $22 + .byte $77, $66, $56, $66, $55,$55, $22, $A6,$00 + .byte $22, $00,$00, $22,$22, $77, $A3,$00, $22, $00 + .byte $22,$22, $25, $22, $25, $05,$05, $00, $22 + .byte $77, $02, $A4,$00, $22, $77, $A4,$25, $05 + .byte $22, $A6,$00, $02, $20, $00,$00, $22, $77 + .byte $A3,$00, $22, $00, $A0,$02,$A2, $72,$72, $02, $A3,$00 + .byte $22, $77, $A5,$00, $22, $77, $A3,$22, $02 + .byte $00, $22, $A7,$00, $22, $00,$00, $22, $A0,$01,$A7 + .byte $A0,$02,$A0, $A3,$2A, $22, $02, $22, $02, $A4,$00 + .byte $22, $77, $A5,$00, $22, $77, $22, $02 + .byte $A3,$00, $22, $A7,$00, $22, $00,$00, $2A,$2A, $02 + .byte $22, $02, $22, $00, $22, $00, $22 + .byte $A5,$00, $22, $27, $A5,$00, $22, $27, $A5,$00 + .byte $22, $A7,$00, $22, $00,$00, $22, $00,$00, $22 + .byte $00, $22, $00, $22, $00, $22, $A5,$00 + .byte $22,$22, $A5,$00, $22,$22, $A5,$00, $22, $A7,$00, $22 + .byte $80, $88, $78, $57, $58, $78, $88 + .byte $58,$58, $88, $58, $A3,$88, $A5,$85, $A5,$50, $52,$52 + .byte $A5,$50, $52, $A7,$00, $02, $08,$08, $07, $A8,$08 + .byte $A3,$05, $A3,$08, $05, $A4,$08, $A5,$88, $A5,$85, $A0,$34,$00 + .byte $20,$20, $A7,$00, $20, $A5,$00, $20, $22, $72 + .byte $50, $A5,$00, $50, $55, $AD,$00, $20, $22,$22 + .byte $A3,$00, $20, $22,$22, $52,$52, $50, $A3,$00, $50 + .byte $55, $25, $77, $55, $A4,$00, $A4,$55, $AC,$00 + .byte $A3,$52, $50, $00,$00, $52, $A5,$55, $00,$00, $50 + .byte $A5,$55, $A3,$00, $50, $A4,$55, $50, $AB,$00, $75 + .byte $A3,$55, $00,$00, $A6,$55, $00,$00, $55,$55, $A4,$25, $A3,$00 + .byte $A6,$55, $AA,$00, $77,$77, $25,$25, $22, $00,$00, $55 + .byte $A5,$22, $00,$00, $A6,$22, $A3,$00, $22,$22, $A4,$25 .byte $A1 causeway2_rle: .byte $28 ; ysize=48 .byte $26, $AD,$66, $06, $26, $56, $AA,$66, $00 diff --git a/ootw/zp.inc b/ootw/zp.inc index 2e40e2f6..743418a4 100644 --- a/ootw/zp.inc +++ b/ootw/zp.inc @@ -119,6 +119,8 @@ LZ4_DONE = $96 ; we try not to conflict with anything DOS, MONITOR or BASIC related +GUN_CHARGE = $DC ; 2+ + MONSTER_AI = $DD ; C1 underwater BG_BEAST = $DE ; C1