restore song of storms for ZSCustomOverworldV2
This commit is contained in:
@@ -269,11 +269,6 @@ Link_HandleCardinalCollision_Long:
|
|||||||
|
|
||||||
print "Bank07 Free Space: ", pc
|
print "Bank07 Free Space: ", pc
|
||||||
|
|
||||||
; ZS OW
|
|
||||||
; Load the rain overlay by default for the song of storms
|
|
||||||
; org $02B011
|
|
||||||
; LDX #$009F
|
|
||||||
|
|
||||||
org $2B8000
|
org $2B8000
|
||||||
OcarinaEffect_SummonStorms:
|
OcarinaEffect_SummonStorms:
|
||||||
{
|
{
|
||||||
@@ -335,9 +330,7 @@ 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
|
||||||
@@ -352,7 +345,6 @@ CheckRealTable:
|
|||||||
|
|
||||||
JML RainAnimation_Overridden_skipMovement
|
JML RainAnimation_Overridden_skipMovement
|
||||||
}
|
}
|
||||||
endif
|
|
||||||
|
|
||||||
ResetOcarinaFlag:
|
ResetOcarinaFlag:
|
||||||
{
|
{
|
||||||
@@ -436,9 +428,6 @@ 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:
|
||||||
@@ -497,4 +486,3 @@ RainAnimation_Overridden:
|
|||||||
RTL
|
RTL
|
||||||
}
|
}
|
||||||
warnpc $02A52D
|
warnpc $02A52D
|
||||||
endif
|
|
||||||
@@ -1251,7 +1251,7 @@ CustomOverworld_LoadSubscreenOverlay_PostInit:
|
|||||||
; pyramid one by default.
|
; pyramid one by default.
|
||||||
CPX.w #$00FF : BNE .notFF
|
CPX.w #$00FF : BNE .notFF
|
||||||
; The pyramid background.
|
; The pyramid background.
|
||||||
LDX.w #$0096
|
LDX.w #$009F
|
||||||
|
|
||||||
.notFF
|
.notFF
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user