From 8a94e8e43b5b4e5589b43697fc098179e98fa055 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 26 Jan 2019 12:39:11 -0500 Subject: [PATCH] ootw: only draw beast in background if it's not chasing you --- ootw/ootw_pool.inc | 73 +++++++++++++++++++++++----------------------- ootw/ootw_pool.s | 23 +++++++++++++++ 2 files changed, 59 insertions(+), 37 deletions(-) diff --git a/ootw/ootw_pool.inc b/ootw/ootw_pool.inc index 025fbf1c..47bf4fe9 100644 --- a/ootw/ootw_pool.inc +++ b/ootw/ootw_pool.inc @@ -6,41 +6,40 @@ pool_rle: .byte $28 ; ysize=48 .byte $A4,$66, $77, $A4,$66, $67, $7F, $A0,$13,$66, $76 .byte $A4,$66, $22, $28, $22,$22, $99, $A5,$66, $67 .byte $A3,$66, $76, $77, $A0,$15,$66, $76, $66,$66, $A4,$22 - .byte $89, $26, $A8,$66, $7F, $A0,$13,$66, $16, $00 - .byte $06, $66,$66, $67, $22, $89, $22,$22, $88 - .byte $22, $99, $A5,$66, $67,$67, $66,$66, $89,$89, $56 - .byte $66, $76, $AD,$66, $A4,$00, $66,$66, $22,$22, $28 - .byte $88, $89, $22,$22, $A9,$66, $88,$88, $55, $A3,$66 - .byte $67, $66, $67, $66, $67, $66,$66, $76 - .byte $66, $76, $A3,$66, $00, $60,$60, $06, $66 - .byte $22,$22, $82, $22, $82, $28, $22, $A9,$66 - .byte $88,$88, $55, $66, $89, $A6,$66, $55, $95 - .byte $A4,$66, $67, $28, $A6,$88, $22, $A3,$28, $82 - .byte $22, $76, $66, $76, $66,$66, $96, $A3,$66 - .byte $88,$88, $55, $66, $88, $A5,$66, $A3,$55, $A5,$66 - .byte $62, $A5,$28, $88, $A4,$22, $88, $22, $82 - .byte $A3,$66, $67, $55, $66, $67, $26, $88,$88 - .byte $85, $66, $88, $66, $76, $86, $76 - .byte $66, $68, $55, $95, $76, $A5,$66, $88,$88 - .byte $82, $22, $88,$88, $22, $82, $22,$22, $88 - .byte $A3,$22, $A3,$66, $55, $26,$26, $22, $A3,$88, $22 - .byte $88, $66,$66, $88, $26,$26, $A3,$55, $26,$26, $27 - .byte $66,$66, $22, $A3,$88, $22, $88,$88, $22, $28 - .byte $82, $22, $28, $22, $88, $82, $28 - .byte $82, $A3,$55, $52,$52, $A3,$88, $52, $88, $52,$52 - .byte $58, $52, $A3,$55, $88, $55,$55, $52, $26 - .byte $A3,$82, $88, $22, $A3,$88, $22,$22, $88, $A3,$22 - .byte $88, $22,$22, $88,$88, $55,$55, $82, $A4,$88, $85 - .byte $88, $A6,$55, $85, $88, $A3,$55, $22, $A4,$88 - .byte $82,$82, $88, $A3,$22, $28, $A6,$22, $28,$28, $25 - .byte $A9,$88, $A5,$85, $88,$88, $85,$85, $8A, $82, $A7,$88 - .byte $A4,$22, $52, $82, $55, $85, $AA,$25, $28 - .byte $A5,$25, $28, $A8,$25, $85, $55,$55, $A4,$85, $22 - .byte $55, $88, $55,$55, $85, $28, $A0,$1B,$22, $28 - .byte $85, $55, $78, $88,$88, $A3,$55, $25, $58 - .byte $A7,$52, $72, $A3,$52, $22, $52,$52, $72, $A8,$52 - .byte $22, $A6,$52, $72, $58, $55,$55, $58, $A3,$82 - .byte $88, $82,$82, $A3,$88, $A7,$82, $88, $A3,$82, $88 - .byte $A7,$82, $88, $A4,$82, $88, $A6,$82, $A0,$28,$88, $AA,$28 - .byte $A4,$22, $A0,$1A,$28, $A0,$A0,$00 + .byte $89, $26, $A8,$66, $7F, $A0,$18,$66, $67, $22 + .byte $89, $22,$22, $88, $22, $99, $A5,$66, $67,$67 + .byte $66,$66, $89,$89, $56, $66, $76, $AE,$66, $58 + .byte $A4,$66, $22,$22, $28, $88, $89, $22,$22, $A9,$66 + .byte $88,$88, $55, $A3,$66, $67, $66, $67, $66 + .byte $67, $66,$66, $76, $66, $76, $A3,$66, $58 + .byte $A4,$66, $22,$22, $82, $22, $82, $28, $22 + .byte $A9,$66, $88,$88, $55, $66, $89, $A6,$66, $55 + .byte $95, $A4,$66, $67, $28, $A6,$88, $22, $A3,$28 + .byte $82, $22, $76, $66, $76, $66,$66, $96 + .byte $A3,$66, $88,$88, $55, $66, $88, $A5,$66, $A3,$55 + .byte $A5,$66, $62, $A5,$28, $88, $A4,$22, $88, $22 + .byte $82, $A3,$66, $67, $55, $66, $67, $26 + .byte $88,$88, $85, $66, $88, $66, $76, $86 + .byte $76, $66, $68, $55, $95, $76, $A5,$66 + .byte $88,$88, $82, $22, $88,$88, $22, $82, $22,$22 + .byte $88, $A3,$22, $A3,$66, $55, $26,$26, $22, $A3,$88 + .byte $22, $88, $66,$66, $88, $26,$26, $A3,$55, $26,$26 + .byte $27, $66,$66, $22, $A3,$88, $22, $88,$88, $22 + .byte $28, $82, $22, $28, $22, $88, $82 + .byte $28, $82, $A3,$55, $52,$52, $A3,$88, $52, $88 + .byte $52,$52, $58, $52, $A3,$55, $88, $55,$55, $52 + .byte $26, $A3,$82, $88, $22, $A3,$88, $22,$22, $88 + .byte $A3,$22, $88, $22,$22, $88,$88, $55,$55, $82, $A4,$88 + .byte $85, $88, $A6,$55, $85, $88, $A3,$55, $22 + .byte $A4,$88, $82,$82, $88, $A3,$22, $28, $A6,$22, $28,$28 + .byte $25, $A9,$88, $A5,$85, $88,$88, $85,$85, $8A, $82 + .byte $A7,$88, $A4,$22, $52, $82, $55, $85, $AA,$25 + .byte $28, $A5,$25, $28, $A8,$25, $85, $55,$55, $A4,$85 + .byte $22, $55, $88, $55,$55, $85, $28, $A0,$1B,$22 + .byte $28, $85, $55, $78, $88,$88, $A3,$55, $25 + .byte $58, $A7,$52, $72, $A3,$52, $22, $52,$52, $72 + .byte $A8,$52, $22, $A6,$52, $72, $58, $55,$55, $58 + .byte $A3,$82, $88, $82,$82, $A3,$88, $A7,$82, $88, $A3,$82 + .byte $88, $A7,$82, $88, $A4,$82, $88, $A6,$82, $A0,$28,$88 + .byte $AA,$28, $A4,$22, $A0,$1A,$28, $A0,$A0,$00 .byte $A1 diff --git a/ootw/ootw_pool.s b/ootw/ootw_pool.s index b7801da6..2cae711f 100644 --- a/ootw/ootw_pool.s +++ b/ootw/ootw_pool.s @@ -44,6 +44,29 @@ ootw_pool: sta GBASL jsr load_rle_gr + ;=================================================== + ; put beast in background if it hasn't been released + + lda BEAST_OUT + bne beast_in + + lda #8 + sta DRAW_PAGE + + lda #background_beast + sta INH + + lda #34 + sta XPOS + lda #8 + sta YPOS + + jsr put_sprite + + +beast_in: ;================================= ; copy to both pages $400/$800