Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-01-15 05:31:34 +00:00
Code Issues Projects Releases Wiki Activity

ootw: fix bug with loading wrong background after slug cutscene

Browse Source
This commit is contained in:
Vince Weaver 2019-01-23 15:48:32 -05:00
parent bb1bd59615
commit 0a24ac5d86
2 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
ootw/ootw_cavern.s
View File

@ -25,21 +25,22 @@ ootw_cavern:
sta RIGHT_LIMIT sta RIGHT_LIMIT
;============================= ;=============================
; Load background to $c00 ; Load backgrounds to $c00 / $1000
lda #$0c jsr cavern_load_background
sta BASH
lda #$00
sta BASL ; load image off-screen $c00
;================================
; Load quake background to $1000
; Setup some stuff based on which cave we are in jsr gr_make_quake
;================================
; setup per-cave variables
lda WHICH_CAVE lda WHICH_CAVE
bne cave_bg1 bne cave1
cave_bg0: cave0:
; set slug table to use ; set slug table to use
lda #0 lda #0
sta ds_smc1+1 sta ds_smc1+1
@ -62,15 +63,9 @@ cave_bg0:
lda #>ootw_pool lda #>ootw_pool
sta cel_smc+6 sta cel_smc+6
jmp cave_setup_done
; load background cave1:
lda #>(cavern_rle)
sta GBASH
lda #<(cavern_rle)
sta GBASL
jmp cave_bg_done
cave_bg1:
; set slug table to use ; set slug table to use
lda #(SLUG_STRUCT_SIZE*3) lda #(SLUG_STRUCT_SIZE*3)
@ -94,19 +89,7 @@ cave_bg1:
lda #>ootw_cavern lda #>ootw_cavern
sta cel_smc+6 sta cel_smc+6
; load background cave_setup_done:
lda #>(cavern2_rle)
sta GBASH
lda #<(cavern2_rle)
sta GBASL
cave_bg_done:
jsr load_rle_gr
;================================
; Load quake background to $1000
jsr gr_make_quake
;================================= ;=================================
@ -259,3 +242,35 @@ still_in_cavern:
done_cavern: done_cavern:
rts rts
;===============================
; load proper background to $c00
;===============================
cavern_load_background:
lda #$0c
sta BASH
lda #$00
sta BASL ; load image off-screen $c00
lda WHICH_CAVE
bne cave_bg1
cave_bg0:
; load background
lda #>(cavern_rle)
sta GBASH
lda #<(cavern_rle)
sta GBASL
jmp cave_bg_done
cave_bg1:
; load background
lda #>(cavern2_rle)
sta GBASH
lda #<(cavern2_rle)
sta GBASL
cave_bg_done:
jmp load_rle_gr ; tail call

13
ootw/slug_cutscene.s
View File

@ -144,18 +144,9 @@ leg_end:
;============================= ;=============================
; Restore background to $c00 ; Restore background to $c00
lda #$0c jmp cavern_load_background
sta BASH
lda #$00
sta BASL
lda #>(cavern_rle) ; rts ; tail call?
sta GBASH
lda #<(cavern_rle)
sta GBASL
jsr load_rle_gr
rts
slug_background: slug_background: