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

maku tree housekeeping

Browse Source
This commit is contained in:
scawful
2024-08-21 19:33:55 -04:00
parent 4143b82247
commit 38c0aeec42
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Overworld/special_areas.asm
View File

@@ -462,17 +462,17 @@ LoadSpecialOverworld:
db $2F, $2F, $2F, $2F db $2F, $2F, $2F, $2F
.palette_prop_a .palette_prop_a
db $0A, $0A, $0A, $0A db $0A, $0A, $0A, $0A ; 0x00 - Maku Tree
db $02, $02, $02, $0A db $02, $02, $02, $0A ; 0x01 - Tree House
db $02, $02, $0A, $02 db $01, $01, $04, $01 ; 0x02 - Zora Falls
db $02, $02, $02, $0A db $02, $02, $02, $0A ; 0x03 - Zora Falls
db $02, $02, $02, $0A db $02, $02, $02, $0A ; 0x04 - Tree House
db $02, $02, $02, $0A db $02, $02, $02, $0A ; 0x05 - Tiny House
.palette_prop_b .palette_prop_b
db $01, $08, $08, $08 db $01, $08, $08, $08
db $00, $00, $00, $00 db $00, $00, $00, $00
db $00, $00, $08, $00 db $00, $00, $00, $00
db $00, $00, $00, $02 db $00, $00, $00, $02
db $00, $00, $00, $00 db $00, $00, $00, $00
db $00, $00, $00, $00 db $00, $00, $00, $00

10
Sprites/Bosses/kydrog_boss.asm
View File

@@ -64,7 +64,7 @@ Sprite_KydrogBoss_Long:
Sprite_KydrogBoss_CheckIfDead: Sprite_KydrogBoss_CheckIfDead:
{ {
LDA $0D80, X : CMP.b #$09 : BEQ .not_dead LDA.w SprAction, X : CMP.b #$09 : BEQ .not_dead
; If health is negative, set back to zero ; If health is negative, set back to zero
LDA $0E50, X : CMP.b #$C3 : BCC .health_not_negative LDA $0E50, X : CMP.b #$C3 : BCC .health_not_negative
LDA.b #$00 : STA $0E50, X LDA.b #$00 : STA $0E50, X
@@ -73,7 +73,7 @@ Sprite_KydrogBoss_CheckIfDead:
LDA $0E50, X : BNE .not_dead LDA $0E50, X : BNE .not_dead
PHX PHX
LDA.b #$04 : STA $0DD0, X ;kill sprite boss style LDA.b #$04 : STA $0DD0, X ;kill sprite boss style
LDA.b #$09 : STA $0D80, X ;go to KydrogBoss_Death stage LDA.b #$09 : STA.w SprAction, X ;go to KydrogBoss_Death stage
STZ.w $0D90,X STZ.w $0D90,X
LDA.b #$E0 : STA.w $0DF0,X LDA.b #$E0 : STA.w $0DF0,X
@@ -501,7 +501,7 @@ CheckForNextPhase:
LDA SprHealth,X : CMP.b #$20 : BCC .phase_three LDA SprHealth,X : CMP.b #$20 : BCC .phase_three
LDA !KydrogPhase : CMP.b #$01 : BEQ .return LDA !KydrogPhase : CMP.b #$01 : BEQ .return
LDA #$80 : STA $0E50, X LDA #$80 : STA $0E50, X
LDA #$01 : STA $0D80, X LDA #$01 : STA SprAction, X
STA !KydrogPhase STA !KydrogPhase
INC.w SprFlash, X INC.w SprFlash, X
RTS RTS
@@ -510,13 +510,13 @@ CheckForNextPhase:
LDA SprHealth,X : CMP.b #$20 : BCC .phase_four LDA SprHealth,X : CMP.b #$20 : BCC .phase_four
LDA !KydrogPhase : CMP.b #$02 : BEQ .return LDA !KydrogPhase : CMP.b #$02 : BEQ .return
LDA #$80 : STA $0E50, X LDA #$80 : STA $0E50, X
LDA #$02 : STA $0D80, X LDA #$02 : STA SprAction, X
STA !KydrogPhase STA !KydrogPhase
RTS RTS
.phase_four .phase_four
LDA #$03 : STA $0D80, X LDA #$03 : STA SprAction, X
STA !KydrogPhase STA !KydrogPhase
.return .return
RTS RTS

2
Sprites/NPCs/korok.asm
View File

@@ -65,7 +65,7 @@ Sprite_Korok_Long:
Sprite_Korok_Prep: Sprite_Korok_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
JSL GetRandomInt : AND.b #$02 : STA.w SprSubtype, X JSL GetRandomInt : AND.b #$03 : STA.w SprSubtype, X
PLB PLB
RTL RTL
} }

8
Sprites/NPCs/maku_tree.asm
View File

@@ -53,6 +53,9 @@ Sprite_MakuTree_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
; Play the Maku Song
LDA.b #$03 : STA.w $012C
PLB PLB
RTL RTL
} }
@@ -128,8 +131,9 @@ Sprite_MakuTree_Main:
MakuTree_OfferTheDreamer: MakuTree_OfferTheDreamer:
{ {
%ShowUnconditionalMessage($013C) %ShowSolicitedMessage($013C) : BCC .no_talk
INC.w SprAction, X INC.w SprAction, X
.no_talk
RTS RTS
} }
@@ -142,7 +146,7 @@ Sprite_MakuTree_Main:
INC.w SprAction, X INC.w SprAction, X
RTS RTS
.said_no .said_no
%GotoAction(3) %GotoAction(4)
RTS RTS
} }