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

Slight correction for old OWR initial implementation

Browse Source
This commit is contained in:
codemann8
2024-03-25 21:46:52 -05:00
parent 8cfa94b49e
commit e15585c184
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
entrances.asm
View File

@@ -192,9 +192,9 @@ JML Overworld_Hole_End
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
PreventEnterOnBonk: PreventEnterOnBonk:
STA.b Scrap00 ; part of what we wrote over STA.b Scrap00 ; part of what we wrote over
LDA.b OverworldIndex : TAX : LDA.l OWTileMapAlt, X : AND.w #$0001 : BEQ .done LDX.b OverworldIndex : LDA.l OWTileMapAlt, X : AND.w #$0001 : BEQ .done
LDA.b LinkState : AND.w #$00FF : CMP.w #$0014 : BNE .done ;in mirror mode? LDA.b LinkState : AND.w #$00FF : CMP.w #$0014 : BNE .done ;in mirror mode?
LDA.b OverworldIndex : TAX : LDA.l OWTileWorldAssoc, X : AND.w #$00FF : CMP.b WorldCache : BEQ .done ; Are we bonking, or doing the superbunny glitch? LDA.l OWTileWorldAssoc, X : AND.w #$00FF : CMP.b WorldCache : BEQ .done ; Are we bonking, or doing the superbunny glitch?
; If in inverted, are in mirror mode, and are bonking then do not enter ; If in inverted, are in mirror mode, and are bonking then do not enter
JML PreventEnterOnBonk_BRANCH_IX JML PreventEnterOnBonk_BRANCH_IX
@@ -212,16 +212,15 @@ TurtleRockEntranceFix:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
AnimatedEntranceFix: ;when an entrance animation tries to start AnimatedEntranceFix: ;when an entrance animation tries to start
PHA PHA : PHX
LDA.l InvertedMode : BEQ + ;If we are in inverted mode LDA.b OverworldIndex : TAX : AND.b #$40 : BNE + ; on a light world screen
LDA.l OWMode+1 : AND.b #!FLAG_OW_MIXED : BNE + ;If we are in Mixed OW shuffle mode LDA.l OWTileMapAlt, X : BNE + ; tile is flipped
LDA.b OverworldIndex : AND.b #$40 : BNE + ;and in the light world PLX : PLA
PLA
STZ.w OWEntranceCutscene ; skip it. STZ.w OWEntranceCutscene ; skip it.
LDA.b #$00 LDA.b #$00
RTL RTL
+ +
PLA PLX : PLA
STA.w CutsceneFlag ;what we wrote over STA.w CutsceneFlag ;what we wrote over
STA.w FreezeSprites ;what we wrote over STA.w FreezeSprites ;what we wrote over
STA.w SkipOAM ;what we wrote over STA.w SkipOAM ;what we wrote over