scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix House Tag bug after game over

Browse Source
This commit is contained in:
scawful
2023-08-01 10:21:52 -04:00
parent 57ec7d133d
commit a330dc4c9b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Events/house_tag.asm
View File

@@ -61,16 +61,12 @@ HouseTag_TelepathicPlea:
HouseTag_WakeUpPlayer: HouseTag_WakeUpPlayer:
{ {
; Lighten the screen gradually and then wake Link up partially ; Lighten the screen gradually and then wake Link up partially
LDA $1A : AND.b #$03 : BNE .delay LDA $1A : AND.b #$03 : BNE .delay
LDA $9C : CMP.b #$20 : BEQ .colorTargetReached LDA $9C : CMP.b #$20 : BEQ .colorTargetReached
DEC $9C DEC $9C : DEC $9D
DEC $9D
.delay .delay
RTS RTS
.colorTargetReached .colorTargetReached
@@ -97,6 +93,7 @@ HouseTag_WakeUpPlayer:
; Set the game mode ; Set the game mode
LDA #$00 : STA $7EF3C5 ; (0 - intro, 1 - pendants, 2 - crystals) LDA #$00 : STA $7EF3C5 ; (0 - intro, 1 - pendants, 2 - crystals)
LDA #$00 : STA $7EF3CC ; disable telepathic message LDA #$00 : STA $7EF3CC ; disable telepathic message
LDA #$01 : STA $7EE00E
JSL $00FC41 ; fix monsters JSL $00FC41 ; fix monsters
RTS RTS
@@ -106,7 +103,11 @@ HouseTag_WakeUpPlayer:
HouseTag_End: HouseTag_End:
{ {
RTS LDA $B6 : BNE .hasMetFarore
LDA #$00 : STA StoryState
.hasMetFarore
RTS
} }
; ============================================================================== ; ==============================================================================
@@ -179,7 +180,7 @@ STA $7003C7,x
; 01 - Blue Shield ; 01 - Blue Shield
; 02 - Hero's Shield ; 02 - Hero's Shield
; 03 - Mirror Shield ; 03 - Mirror Shield
LDA #$0101 ; 01=sword, 02 = shield to start with LDA #$0000 ; 01=sword, 02 = shield to start with
STA $700359,x STA $700359,x
LDY #$0000 LDY #$0000