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

Add MagicBean_BottleLogic fn

Browse Source
This commit is contained in:
scawful
2024-12-15 16:13:57 -05:00
parent 1e7bf4d727
commit 2459ea0e98
1 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Sprites/NPCs/bean_vendor.asm
View File

@@ -88,46 +88,17 @@ Sprite_BeanVendor_Main:
RTS
}
; 0x01 - Liftable Magic Bean
MagicBean:
{
%StartOnFrame(1)
%PlayAnimation(1,1,1)
; TODO: Finish bottle logic
LDA.w SprMiscE, X : CMP.b #$01 : BEQ .not_lifting
LDA.w $0309 : CMP.b #$02 : BNE .not_lifting
LDA.l $7EF35C : CMP.b #$02 : BEQ .bottle1_available
LDA.l $7EF35D : CMP.b #$02 : BEQ .bottle2_available
LDA.l $7EF35E : CMP.b #$02 : BEQ .bottle3_available
LDA.l $7EF35F : CMP.b #$02 : BEQ .bottle4_available
%ShowUnconditionalMessage($033)
JMP .not_lifting
.bottle1_available
LDA.b #$09 : STA.l $7EF35C
%ShowUnconditionalMessage($034)
JMP .finish_storage
.bottle2_available
LDA.b #$09 : STA.l $7EF35D
%ShowUnconditionalMessage($034)
JMP .finish_storage
.bottle3_available
LDA.b #$09 : STA.l $7EF35E
%ShowUnconditionalMessage($034)
JMP .finish_storage
.bottle4_available
LDA.b #$09 : STA.l $7EF35F
%ShowUnconditionalMessage($034)
.finish_storage
LDA.b #$01 : STA.w SprMiscE, X
STZ.w SprState, X
RTS
LDA.w $0309 : CMP.b #$02 : BNE .not_lifting
LDA.b $8A : BEQ +
JSR MagicBean_BottleLogic
+
RTS
.not_lifting
JSL Sprite_CheckIfLifted
@@ -223,6 +194,41 @@ ReleaseMagicBean:
RTL
}
MagicBean_BottleLogic:
{
LDA.l $7EF35C : CMP.b #$02 : BEQ .bottle1_available
LDA.l $7EF35D : CMP.b #$02 : BEQ .bottle2_available
LDA.l $7EF35E : CMP.b #$02 : BEQ .bottle3_available
LDA.l $7EF35F : CMP.b #$02 : BEQ .bottle4_available
%ShowUnconditionalMessage($033)
JMP .return
.bottle1_available
LDA.b #$09 : STA.l $7EF35C
%ShowUnconditionalMessage($034)
JMP .finish_storage
.bottle2_available
LDA.b #$09 : STA.l $7EF35D
%ShowUnconditionalMessage($034)
JMP .finish_storage
.bottle3_available
LDA.b #$09 : STA.l $7EF35E
%ShowUnconditionalMessage($034)
JMP .finish_storage
.bottle4_available
LDA.b #$09 : STA.l $7EF35F
%ShowUnconditionalMessage($034)
.finish_storage
LDA.b #$01 : STA.w SprMiscE, X
STZ.w SprState, X
.return
RTS
}
; =========================================================
Sprite_BeanVendor_Draw: