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

fix gbc form mirror warp palette bug

Browse Source
This commit is contained in:
scawful
2024-05-28 09:46:50 -04:00
parent 6b396a8290
commit d0253bd325
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Masks/gbc_form.asm
View File

@@ -57,12 +57,17 @@ LinkState_GameboyInDungeonEntrance:
; Retain GBC sprite when exiting DW dungeons ; Retain GBC sprite when exiting DW dungeons
LoadOverworld_CheckForGbcLink: LoadOverworld_CheckForGbcLink:
{ {
LDA $0FFF : BEQ .return LDA $0FFF : BEQ .return_lw
JSL UpdateGbcPalette LDA.b #$06 : STA $02B2
LDA #$3B : STA $BC ; change link's sprite LDA.b #$3B : STA $BC ; change link's sprite
JMP .return
.return_lw
STZ.w $02B2
.return .return
JSL Palette_ArmorAndGloves
STZ.b $B0 STZ.b $B0
STZ.b $11 STZ.b $11
RTL RTL
@@ -71,10 +76,9 @@ LoadOverworld_CheckForGbcLink:
OverworldTransition_CheckForGbcLink: OverworldTransition_CheckForGbcLink:
{ {
LDA $0FFF : BEQ .return LDA $0FFF : BEQ .return
JSL UpdateGbcPalette
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
.return .return
JSL $07E6A6 JSL $07E6A6
RTL RTL
@@ -121,15 +125,16 @@ LinkState_GameboyForm:
.transform .transform
%PlayerTransform() %PlayerTransform()
JSL UpdateGbcPalette
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
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
.not_gbc .not_gbc
.return .return