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

prevent gbc form from resetting minish form

Browse Source
This commit is contained in:
scawful
2024-06-07 17:19:26 -04:00
parent e7c43fdff1
commit d1ba08edb5
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Masks/gbc_form.asm
View File

@@ -73,7 +73,7 @@ LinkState_GameboyInDungeonEntrance:
LoadOverworld_CheckForGbcLink: LoadOverworld_CheckForGbcLink:
{ {
LDA $0FFF : BEQ .return_lw LDA $0FFF : BEQ .return_lw
LDA.w !CurrentMask : CMP.b #$05 : BEQ .return
LDA.b #$06 : STA $02B2 LDA.b #$06 : STA $02B2
LDA.b #$3B : STA $BC ; change link's sprite LDA.b #$3B : STA $BC ; change link's sprite
JSL UpdateGbcPalette JSL UpdateGbcPalette
@@ -92,33 +92,28 @@ LoadOverworld_CheckForGbcLink:
OverworldTransition_CheckForGbcLink: OverworldTransition_CheckForGbcLink:
{ {
LDA $0FFF : BEQ .return LDA $0FFF : BEQ .return
LDA.w !CurrentMask : CMP.b #$05 : BEQ .return
LDA #$3B : STA $BC ; change link's sprite LDA #$3B : STA $BC ; change link's sprite
LDA #$06 : STA $02B2 LDA #$06 : STA $02B2
JSL Palette_ArmorAndGloves JSL Palette_ArmorAndGloves
.return .return
JSL $07E6A6 JSL $07E6A6 ; Link_HandleMovingAnimation_FullLongEntry
RTL RTL
} }
; Module08_02_LoadAndAdvance ; Module08_02_LoadAndAdvance
org $02EDC0 org $02EDC0
{
JSL LoadOverworld_CheckForGbcLink JSL LoadOverworld_CheckForGbcLink
}
org $02ABDA org $02ABDA
JSL OverworldTransition_CheckForGbcLink JSL OverworldTransition_CheckForGbcLink
org $07A9B1 org $07A9B1
LinkMode_MagicMirror: LinkMode_MagicMirror:
{
JSL LinkState_GameboyForm JSL LinkState_GameboyForm
}
org $0287A4 org $0287A4
{
JSL LinkState_GameboyInDungeonEntrance JSL LinkState_GameboyInDungeonEntrance
}
org $1EE48E org $1EE48E
; TODO: Check a status flag to dismiss villager girl ; TODO: Check a status flag to dismiss villager girl
@@ -137,8 +132,7 @@ LinkState_GameboyForm:
SEP #$30 SEP #$30
LDA $02B2 : CMP.b #$06 : BEQ .already_gbc LDA $02B2 : CMP.b #$06 : BEQ .already_gbc
LDA $0FFF : BEQ .return ; not in dark world LDA $0FFF : BEQ .return ; not in dark world
.transform
.transform
%PlayerTransform() %PlayerTransform()
LDA #$3B : STA $BC ; change link's sprite LDA #$3B : STA $BC ; change link's sprite
@@ -146,14 +140,13 @@ LinkState_GameboyForm:
JSL UpdateGbcPalette JSL UpdateGbcPalette
BRA .return BRA .return
.already_gbc .already_gbc
%PlayerTransform() %PlayerTransform()
LDA #$10 : STA $BC LDA #$10 : STA $BC
STZ $02B2 STZ $02B2
JSL Palette_ArmorAndGloves JSL Palette_ArmorAndGloves
.not_gbc .return
.return
JSL $07F1E6 JSL $07F1E6
RTL RTL
} }