restore song of storms for ZSCustomOverworldV2

This commit is contained in:
scawful
2024-08-17 18:53:47 -04:00
parent c33cdc87ca
commit a4ddf1eb22
2 changed files with 2 additions and 14 deletions

View File

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

View File

@@ -1251,7 +1251,7 @@ CustomOverworld_LoadSubscreenOverlay_PostInit:
; pyramid one by default.
CPX.w #$00FF : BNE .notFF
; The pyramid background.
LDX.w #$0096
LDX.w #$009F
.notFF