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

Update fairyfixes.asm

Browse Source 
JML
dont push yet if the branch just pulls
This commit is contained in:
spannerisms
2021-03-24 08:21:44 -04:00
parent 33dbe3003c
commit 372b0ba599
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fairyfixes.asm
View File

@@ -27,8 +27,7 @@ RTL
FairyPond_Init: FairyPond_Init:
LDA.l Restrict_Ponds : BNE + LDA.l Restrict_Ponds : BNE +
LDA.b #$48 LDA.b #$48
JSL.l Sprite_ShowMessageFromPlayerContact JML.l Sprite_ShowMessageFromPlayerContact
RTL
+ +
PHY : JSL.l Sprite_CheckDamageToPlayerSameLayerLong : BCC + PHY : JSL.l Sprite_CheckDamageToPlayerSameLayerLong : BCC +
LDA $7EF35C : CMP.b #$02 : BNE ++ : LDA.b #$1C : PHA : BRA .emptyBottle : ++ LDA $7EF35C : CMP.b #$02 : BNE ++ : LDA.b #$1C : PHA : BRA .emptyBottle : ++
@@ -56,8 +55,8 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
HappinessPond_Check: HappinessPond_Check:
LDA $A0 : CMP.b #$15 ;what we wrote over LDA $A0 : CMP.b #$15 ;what we wrote over
PHP
BNE .done BNE .done
PHP
LDA.b #$72 LDA.b #$72
JSL Sprite_SpawnDynamically JSL Sprite_SpawnDynamically
@@ -83,6 +82,6 @@ HappinessPond_Check:
STZ $0DD0, X ; self terminate STZ $0DD0, X ; self terminate
.done
PLP PLP
.done
RTL RTL