scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Tingle map sales logic

Browse Source
This commit is contained in:
scawful
2024-11-28 19:59:51 -05:00
parent b7e4cd9183
commit 0fa952c9b0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Sprites/NPCs/tingle.asm
View File

@@ -89,13 +89,17 @@ Sprite_Tingle_Main:
%PlayAnimation(0,0,10) %PlayAnimation(0,0,10)
LDA $1CE8 : BNE .said_no LDA $1CE8 : BNE .said_no
PHX PHX
LDA.l TingleMaps : ASL : TAX LDA.l TingleId : ASL : TAX
LDY.b #$01 LDY.b #$01
LDA.w .message_ids, X LDA.w .message_ids, X
JSL Sprite_ShowMessageUnconditional JSL Sprite_ShowMessageUnconditional
PLX PLX
LDA.l TingleId : CMP.b #$07 : BEQ +
%GotoAction(4) %GotoAction(4)
RTS RTS
+
%GotoAction(0)
RTS
.said_no .said_no
%GotoAction(5) %GotoAction(5)
RTS RTS
@@ -115,7 +119,7 @@ Sprite_Tingle_Main:
%PlayAnimation(0,0,10) %PlayAnimation(0,0,10)
LDA $1CE8 : BNE .said_no LDA $1CE8 : BNE .said_no
REP #$20 REP #$20
LDA.l TingleMaps : ASL : TAY LDA.l TingleId : ASL : TAY
LDA.l $7EF360 : CMP.w .cost, Y LDA.l $7EF360 : CMP.w .cost, Y
SEP #$30 SEP #$30
BCC .not_enough_rupees BCC .not_enough_rupees
@@ -126,6 +130,7 @@ Sprite_Tingle_Main:
LDA.l TingleMaps LDA.l TingleMaps
ORA.w .dungeon, Y ORA.w .dungeon, Y
STA.l TingleMaps STA.l TingleMaps
LDA.l TingleId : INC A : STA.l TingleId
%ShowUnconditionalMessage($018E) ; Purchased %ShowUnconditionalMessage($018E) ; Purchased
STZ.w SprAction, X STZ.w SprAction, X
RTS RTS