alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue with Flute Cancel in OW Layout Shuffle

Browse Source
This commit is contained in:
codemann8
2024-04-13 03:18:26 -05:00
parent 2367f16179
commit b22d618323
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
owrando.asm
View File

@@ -43,6 +43,9 @@ Overworld_LoadSpecialOverworld_RoomId:
org $84E8B4 org $84E8B4
Overworld_LoadSpecialOverworld: Overworld_LoadSpecialOverworld:
org $84E96A
JSL OWSpecialReturnTriggerClear
org $82A9DA org $82A9DA
JSL OWSkipPalettes JSL OWSkipPalettes
BCC OverworldHandleTransitions_change_palettes : NOP #4 BCC OverworldHandleTransitions_change_palettes : NOP #4
@@ -758,8 +761,8 @@ OWDetectSpecialTransition:
OWEdgeTransition: OWEdgeTransition:
{ {
LDA.l OWMode : ORA.l OWMode+1 : BEQ .unshuffled LDA.l OWMode : ORA.l OWMode+1 : BEQ .unshuffled
LDY.w RandoOverworldTargetEdge : CPY.b #$7F LDY.w RandoOverworldTargetEdge : STZ.w RandoOverworldTargetEdge
BEQ .unshuffled CPY.b #$7F : BEQ .unshuffled
REP #$10 REP #$10
LDX.w RandoOverworldEdgeAddr LDX.w RandoOverworldEdgeAddr
PHB : PHK : PLB PHB : PHK : PLB
@@ -1199,6 +1202,12 @@ OWEndScrollTransition:
CMP.l Overworld_FinalizeEntryOntoScreen_Data,X ; what we wrote over CMP.l Overworld_FinalizeEntryOntoScreen_Data,X ; what we wrote over
RTL RTL
} }
OWSpecialReturnTriggerClear:
{
STZ.b SubSubModule : STZ.b RoomIndex ; what we wrote over
STZ.w RandoOverworldTargetEdge
RTL
}
;Data ;Data
org $aaa000 org $aaa000