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

Move maku tree to NPCs, fix Twinrova errors

Browse Source
This commit is contained in:
scawful
2024-03-17 14:04:41 -04:00
parent 2e22114d8a
commit ea00780785
3 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sprites/Bosses/twinrova.asm
View File

@@ -396,7 +396,7 @@ Sprite_Twinrova_FireAttack:
JSL Sprite_CheckTileCollision : BNE .no_collision JSL Sprite_CheckTileCollision : BNE .no_collision
JSL Sprite_Move JSL Sprite_Move
.no_collision .no_collision
JSR Sprite_Twinrova_FireAttack_AddFireGarnish JSR AddFireGarnish
JMP TrinexxBreath_AltEntry JMP TrinexxBreath_AltEntry
} }
@@ -420,10 +420,10 @@ AddFireGarnish:
LDA.b #$10 : STA $7FF800, X : STA $0FB4 LDA.b #$10 : STA $7FF800, X : STA $0FB4
TYA : STA $7FF92C, X TYA : STA $7FF92C, X
LDA SprX, Y : STA $7FF83C, X LDA.w SprX, Y : STA $7FF83C, X
LDA SprXH, Y : STA $7FF878, X LDA.w SprXH, Y : STA $7FF878, X
LDA SprY, Y : CLC : ADC.b #$10 : STA $7FF81E, X LDA.w SprY, Y : CLC : ADC.b #$10 : STA $7FF81E, X
LDA SprYH, Y : ADC.b #$00 : STA $7FF85A, X LDA.w SprYH, Y : ADC.b #$00 : STA $7FF85A, X
LDA.b #$7F : STA $7FF90E, X LDA.b #$7F : STA $7FF90E, X
STX $00 STX $00
@@ -453,10 +453,10 @@ AddIceGarnishV2:
LDA.b #$0C : STA $7FF800, X : STA $0FB4 LDA.b #$0C : STA $7FF800, X : STA $0FB4
TYA : STA $7FF92C, X TYA : STA $7FF92C, X
LDA SprX, Y : STA $7FF83C, X LDA.w SprX, Y : STA $7FF83C, X
LDA SprXH, Y : STA $7FF878, X LDA.w SprXH, Y : STA $7FF878, X
LDA SprY, Y : CLC : ADC.b #$10 : STA $7FF81E, X LDA.w SprY, Y : CLC : ADC.b #$10 : STA $7FF81E, X
LDA SprYH, Y : ADC.b #$00 : STA $7FF85A, X LDA.w SprYH, Y : ADC.b #$00 : STA $7FF85A, X
LDA.b #$7F : STA $7FF90E, X : STX $00 LDA.b #$7F : STA $7FF90E, X : STX $00

28
Sprites/maku_tree.asm → Sprites/NPCs/maku_tree.asm
View File

@@ -1,6 +1,6 @@
;============================================================================== ; =========================================================
; Sprite Properties ; Sprite Properties
;============================================================================== ; =========================================================
!SPRID = $9E ; The sprite ID you are overwriting (HEX) !SPRID = $9E ; The sprite ID you are overwriting (HEX)
!NbrTiles = 00 ; Number of tiles used in a frame !NbrTiles = 00 ; Number of tiles used in a frame
!Harmless = 01 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless !Harmless = 01 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless
@@ -31,7 +31,7 @@
%Set_Sprite_Properties(Sprite_MakuTree_Prep, Sprite_MakuTree_Long) %Set_Sprite_Properties(Sprite_MakuTree_Prep, Sprite_MakuTree_Long)
;============================================================================== ; =========================================================
Sprite_MakuTree_Long: Sprite_MakuTree_Long:
{ {
@@ -47,31 +47,29 @@ Sprite_MakuTree_Long:
PLB ; Get back the databank we stored previously PLB ; Get back the databank we stored previously
RTL ; Go back to original code RTL ; Go back to original code
} }
;============================================================================== ; =========================================================
Sprite_MakuTree_Prep: Sprite_MakuTree_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
; Check if the intro has executed already.
LDA.l $7EF300 LDA.l $7EF300 : BNE .intro_is_done
BNE .intro_is_done
STZ.w $0DD0, X ; Kill the sprite STZ.w $0DD0, X ; Kill the sprite
.intro_is_done .intro_is_done
PLB PLB
RTL RTL
} }
;============================================================================== ; =========================================================
Sprite_MakuTree_Main: Sprite_MakuTree_Main:
{ {
LDA.w SprAction, X ; Load the SprAction LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable ; Goto the SprAction we are currently in JSL UseImplicitRegIndexedLocalJumpTable
dw MakuTree_Handler dw MakuTree_Handler
dw MakuTree_MeetLink dw MakuTree_MeetLink
dw MakuTree_GiveBow dw MakuTree_GiveMoonPearl
MakuTree_Handler: MakuTree_Handler:
{ {
@@ -95,7 +93,7 @@ Sprite_MakuTree_Main:
RTS RTS
} }
MakuTree_GiveBow: MakuTree_GiveMoonPearl:
{ {
; Give Link the Moon Pearl ; Give Link the Moon Pearl
LDY #$1F : JSL Link_ReceiveItem LDY #$1F : JSL Link_ReceiveItem
@@ -105,7 +103,7 @@ Sprite_MakuTree_Main:
} }
;============================================================================== ; =========================================================
Sprite_MakuTree_Draw: Sprite_MakuTree_Draw:
{ {
@@ -163,7 +161,7 @@ Sprite_MakuTree_Draw:
RTS RTS
;============================================================================== ; =========================================================
.start_index .start_index
.nbr_of_tiles .nbr_of_tiles

2
Sprites/all_sprites.asm
View File

@@ -45,7 +45,7 @@ print "End of kydrog.asm ", pc
incsrc "Sprites/Bosses/kydrog_boss.asm" incsrc "Sprites/Bosses/kydrog_boss.asm"
print "End of kydrog_boss.asm ", pc print "End of kydrog_boss.asm ", pc
incsrc "Sprites/maku_tree.asm" incsrc "Sprites/NPCs/maku_tree.asm"
print "End of maku_tree.asm ", pc print "End of maku_tree.asm ", pc
incsrc "Sprites/NPCs/mask_salesman.asm" incsrc "Sprites/NPCs/mask_salesman.asm"