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

Update bean vendor prep so village elder loads indoors

Browse Source
This commit is contained in:
scawful
2025-01-10 21:19:54 -05:00
parent 80fd69d8bb
commit e9ff95faf3
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Sprites/NPCs/bean_vendor.asm
View File

@@ -32,8 +32,6 @@
%Set_Sprite_Properties(Sprite_BeanVendor_Prep, Sprite_BeanVendor_Long) %Set_Sprite_Properties(Sprite_BeanVendor_Prep, Sprite_BeanVendor_Long)
; =========================================================
Sprite_BeanVendor_Long: Sprite_BeanVendor_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
@@ -53,8 +51,6 @@ Sprite_BeanVendor_Long:
RTL RTL
} }
; =========================================================
Sprite_BeanVendor_Prep: Sprite_BeanVendor_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
@@ -62,24 +58,23 @@ Sprite_BeanVendor_Prep:
LDA.b #$40 : STA.w SprTimerA, X LDA.b #$40 : STA.w SprTimerA, X
STZ.w SprMiscD, X STZ.w SprMiscD, X
LDA.b $8A : CMP.b #$00 : BNE + LDA.b $1B : BNE +
LDA.l MagicBeanProg : BNE .in_progress LDA.b $8A : CMP.b #$00 : BNE +
LDA.b #$01 : STA.w SprMiscD, X LDA.l MagicBeanProg : BNE .in_progress
LDA.b #$04 : STA.w SprAction, X LDA.b #$01 : STA.w SprMiscD, X
JMP + LDA.b #$04 : STA.w SprAction, X
.in_progress JMP +
LDA.l MagicBeanProg : CMP.b #$3F : BCS .not_flower .in_progress
; Sprite is the flower on ranch map LDA.l MagicBeanProg : CMP.b #$3F : BCS .not_flower
LDA.b #$05 : STA.w SprAction, X ; Sprite is the flower on ranch map
.not_flower LDA.b #$05 : STA.w SprAction, X
STA.w SprFrame, X .not_flower
STA.w SprFrame, X
+ +
PLB PLB
RTL RTL
} }
; =========================================================
Sprite_BeanVendor_Main: Sprite_BeanVendor_Main:
{ {
%SpriteJumpTable(BeanVendor, %SpriteJumpTable(BeanVendor,
@@ -398,8 +393,6 @@ Sprite_BeanVendor_Draw:
RTS RTS
; =======================================================
.start_index .start_index
db $00, $04, $05, $0B, $11, $13, $15 db $00, $04, $05, $0B, $11, $13, $15
.nbr_of_tiles .nbr_of_tiles