Fix dungeon tingle maps save ram check

This commit is contained in:
scawful
2024-12-19 13:54:47 -05:00
parent a901945316
commit 704dd78901

View File

@@ -15,9 +15,8 @@ org $028BE7 : NOP #2
org $028364 org $028364
Module06_UnderworldLoad: Module06_UnderworldLoad:
{ {
LDA.b #$00 ; Fixed color RGB: #808000 ; Fixed color RGB: #808000
STA.b $9C LDA.b #$00 : STA.b $9C
LDA.b #$00 : STA.b $9D LDA.b #$00 : STA.b $9D
LDA.b #$00 : STA.b $9E LDA.b #$00 : STA.b $9E
LDA.b #$00 LDA.b #$00
@@ -85,6 +84,11 @@ TransferDungeonMapGfx:
incbin dungeon_maps.bin incbin dungeon_maps.bin
} }
pushpc
org $0288FF
JSL CheckForTingleMaps : NOP
pullpc
CheckForTingleMaps: CheckForTingleMaps:
{ {
LDA.w $040C : CMP.b #$0C : BEQ .check_mush LDA.w $040C : CMP.b #$0C : BEQ .check_mush
@@ -96,23 +100,29 @@ CheckForTingleMaps:
CMP.b #$18 : BEQ .check_ship CMP.b #$18 : BEQ .check_ship
JMP + JMP +
.check_mush .check_mush
LDA.l TingleMaps : AND.b #$01 : RTL LDA.l TingleMaps : AND.b #$01 : BEQ +
JMP ++
.check_tail .check_tail
LDA.l TingleMaps : AND.b #$02 : RTL LDA.l TingleMaps : AND.b #$02 : BEQ +
JMP ++
.check_castle .check_castle
LDA.l TingleMaps : AND.b #$04 : RTL LDA.l TingleMaps : AND.b #$04 : BEQ +
JMP ++
.check_zora .check_zora
LDA.l TingleMaps : AND.b #$08 : RTL LDA.l TingleMaps : AND.b #$08 : BEQ +
JMP ++
.check_glacia .check_glacia
LDA.l TingleMaps : AND.b #$10 : RTL LDA.l TingleMaps : AND.b #$10 : BEQ +
JMP ++
.check_goron .check_goron
LDA.l TingleMaps : AND.b #$20 : RTL LDA.l TingleMaps : AND.b #$20 : BEQ +
JMP ++
.check_ship .check_ship
LDA.l TingleMaps : AND.b #$40 : RTL LDA.l TingleMaps : AND.b #$40 : BEQ +
++
LDA.b #$01 : RTL
+ +
LDA.w $040C LDA.w $040C : CMP.b #$FF : RTL
CMP.b #$FF
RTL
} }
NewWaterOverlayData: NewWaterOverlayData:
@@ -133,8 +143,6 @@ print "End of dungeons.asm ", pc
pushpc pushpc
org $0288FF : JSL CheckForTingleMaps : NOP
; Transfer Dungeon Map Graphics ; Transfer Dungeon Map Graphics
; Module0E_03_01_00_PrepMapGraphics ; Module0E_03_01_00_PrepMapGraphics
org $0AE152 : JSL TransferDungeonMapGfx org $0AE152 : JSL TransferDungeonMapGfx