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

More RAM labels

Browse Source 
Fixed tablets checking for item collected, uses NpcFlags+1
Deleted mantle.asm, moved to lampmantlecone.asm
This commit is contained in:
cassidoxa
2022-11-24 18:34:35 -05:00
parent da8576546d
commit 7426ce5945
52 changed files with 1048 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
inverted.asm
View File

@@ -35,7 +35,7 @@ Overworld_CreatePyramidHoleModified:
JSL C9DE_LONG
JSL C9DE_LONG
LDA.w #$FFFF : STA.w $1012, Y
LDA.w #$FFFF : STA.w GFXStripes+$12, Y
JMP .ending
.originalBehaviour
@@ -64,7 +64,7 @@ Overworld_CreatePyramidHoleModified:
JSL C9DE_LONG
JSL C9DE_LONG
LDA.w #$FFFF : STA.w $1012, Y
LDA.w #$FFFF : STA.w GFXStripes+$12, Y
.ending
LDA.w #$3515 : STA.w SFX1
@@ -75,7 +75,7 @@ Overworld_CreatePyramidHoleModified:
LDA.b #$03 : STA.w SFX3
LDA.b #$01 : STA.b $14
LDA.b #$01 : STA.b NMISTRIPES
RTL
;------------------------------------------------------------------------------
@@ -195,12 +195,12 @@ TurtleRockPegSolved:
RTL
MirrorBonk:
; must preserve X/Y, and must preserve $00-$0F
LDA.l InvertedMode : BEQ .normal
; must preserve X/Y, and must preserve $00-$0F
LDA.l InvertedMode : BEQ .normal
; Goal: use $20 and $22 to decide to force a bonk
; if we want to bonk branch to .forceBonk
; otherwise fall through to .normal
; Goal: use $20 and $22 to decide to force a bonk
; if we want to bonk branch to .forceBonk
; otherwise fall through to .normal
PHX : PHP
PHB : PHK : PLB
LDA.b OverworldIndex : AND.b #$40 : BEQ .endLoop ;World we're in? branch if we are in LW we don't want bonks
@@ -208,31 +208,31 @@ MirrorBonk:
LDX.w #$0000
.loop
LDA.l .bonkRectanglesTable, X ;Load X1
CMP $22 : !BGE ++
CMP LinkPosX : !BGE ++
;IF X > X1
LDA.l .bonkRectanglesTable+2, X ; Load X2
CMP $22 : !BLT ++
CMP LinkPosX : !BLT ++
;IF X < X2
LDA.l .bonkRectanglesTable+4, X ;Load Y1
CMP $20 : !BGE ++
CMP LinkPosY : !BGE ++
;IF Y > Y1
LDA.l .bonkRectanglesTable+6, X ; Load Y2
CMP $20 : !BLT ++
CMP LinkPosY : !BLT ++
;IF Y < Y2
;Bonk Here
PLB : PLP : PLX
BRA .forceBonk
++
TXA : !ADD #$0008 : CMP #.tableEnd-.bonkRectanglesTable : BEQ .endLoop
TAX
BRA .loop
.endbonkRectanglesTable
++
TXA : !ADD #$0008 : CMP #.tableEnd-.bonkRectanglesTable : BEQ .endLoop
TAX
BRA .loop
.endbonkRectanglesTable
.endLoop
PLB : PLP : PLX
.endLoop
PLB : PLP : PLX
.normal
;Not forcing a bonk, so the vanilla bonk detection run.
LDA.b Scrap0C : ORA.b Scrap0E
;Not forcing a bonk, so the vanilla bonk detection run.
LDA.b Scrap0C : ORA.b Scrap0E
JML.l MirrorBonk_NormalReturn
.forceBonk
JML.l MirrorBonk_BranchGamma