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

todos for rain overlay song of storms

Browse Source
This commit is contained in:
scawful
2024-08-16 13:53:02 -04:00
parent 3270294fc2
commit ed8cf3f205
4 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Items/ocarina.asm
View File

@@ -271,8 +271,8 @@ print "Bank07 Free Space: ", pc
; ZS OW ; ZS OW
; Load the rain overlay by default for the song of storms ; Load the rain overlay by default for the song of storms
org $02B011 ; org $02B011
LDX #$009F ; LDX #$009F
org $2B8000 org $2B8000
OcarinaEffect_SummonStorms: OcarinaEffect_SummonStorms:
@@ -335,6 +335,9 @@ PlayThunderAndRain:
RTL RTL
} }
if ZS_CUSTOM_OW_V2 = 1
; TODO: Setup Song of Storms and Rain Overlay for V2
else
CheckRealTable: CheckRealTable:
{ {
LDA $7EE00E : CMP #$00 : BEQ .continue LDA $7EE00E : CMP #$00 : BEQ .continue
@@ -349,6 +352,7 @@ CheckRealTable:
JML RainAnimation_Overridden_skipMovement JML RainAnimation_Overridden_skipMovement
} }
endif
ResetOcarinaFlag: ResetOcarinaFlag:
{ {
@@ -432,6 +436,9 @@ org $02F210 ; OverworldTransitionScrollAndLoadMap
JSL ResetOcarinaFlag JSL ResetOcarinaFlag
} }
if ZS_CUSTOM_OW_V2 = 1
; TODO: Setup Song of Storms and Rain Overlay for V2
else
; ZS OW ; ZS OW
org $02A4CD org $02A4CD
RainAnimation_Overridden: RainAnimation_Overridden:
@@ -490,3 +497,4 @@ RainAnimation_Overridden:
RTL RTL
} }
warnpc $02A52D warnpc $02A52D
endif

4
Masks/gbc_form.asm
View File

@@ -80,10 +80,10 @@ LoadOverworld_CheckForGbcLink:
JSL UpdateGbcPalette JSL UpdateGbcPalette
JMP .return JMP .return
.return_lw .return_lw
STZ.w $02B2 STZ.w $02B2
.return .return
JSL Palette_ArmorAndGloves JSL Palette_ArmorAndGloves
STZ.b $B0 STZ.b $B0
STZ.b $11 STZ.b $11

6
Overworld/ZCustomOverworld2.asm
View File

@@ -147,13 +147,13 @@ Pool:
; phase. Default is $FF. ; phase. Default is $FF.
org $288146 ; $140146 org $288146 ; $140146
.EnableBeginningRain ; 0x01 .EnableBeginningRain ; 0x01
db $FF db $00
; When non 0 this will disable the ambiant sound that plays in the mire ; When non 0 this will disable the ambiant sound that plays in the mire
; area after the event is triggered. Default is $FF. ; area after the event is triggered. Default is $FF.
org $288147 ; $140147 org $288147 ; $140147
.EnableRainMireEvent ; 0x01 .EnableRainMireEvent ; 0x01
db $FF db $00
; When non 0 this will make the game reload all gfx in between OW ; When non 0 this will make the game reload all gfx in between OW
; transitions. Default is $FF. ; transitions. Default is $FF.
@@ -989,7 +989,7 @@ PreOverworld_LoadProperties_LoadMain:
STZ.b $EE ; Reset Link layer to BG2 STZ.b $EE ; Reset Link layer to BG2
STZ.w $0476 ; Another layer flag STZ.w $0476 ; Another layer flag
INC.b $11 ; SCAWFUL: We should verify what submodule this is moving to. INC.b $11 ; Move to Overworld_LoadSubscreenAndSilenceSFX1
INC.b $16 ; NMI HUD Update flag INC.b $16 ; NMI HUD Update flag
STZ.w $0402 : STZ.w $0403 STZ.w $0402 : STZ.w $0403

23
Overworld/custom_gfx.asm
View File

@@ -1,10 +1,3 @@
org $02E94A
JSL CheckForSpecialAreaGraphics
org $0ED5A8
OverworldPalettesLoader:
; ==============================================================================
org $3F8000 org $3F8000
CheckForChangeGraphicsNormalLoadBoat: CheckForChangeGraphicsNormalLoadBoat:
@@ -19,22 +12,6 @@ CheckForChangeGraphicsNormalLoadBoat:
RTL RTL
} }
CheckForSpecialAreaGraphics:
{
JSL OverworldPalettesLoader
LDA $8A : CMP.b #$81 : BNE .korok_area
PHB : PHK : PLB
JSL ApplyKorokSpriteSheets
PLB
.korok_area
RTL
}
; ============================================================================== ; ==============================================================================
ApplyGraphics1: ApplyGraphics1: