Move maku tree to NPCs, fix Twinrova errors

Sprites/Bosses/twinrova.asm

@@ -396,7 +396,7 @@ Sprite_Twinrova_FireAttack:
     JSL Sprite_CheckTileCollision : BNE .no_collision
     JSL Sprite_Move
   .no_collision
-    JSR Sprite_Twinrova_FireAttack_AddFireGarnish
+    JSR AddFireGarnish
     JMP TrinexxBreath_AltEntry
 }
 
@@ -420,10 +420,10 @@ AddFireGarnish:
     LDA.b #$10 : STA $7FF800, X : STA $0FB4
     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
@@ -453,10 +453,10 @@ AddIceGarnishV2:
     LDA.b #$0C : STA $7FF800, X : STA $0FB4
     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
     

Sprites/NPCs/maku_tree.asm

@@ -1,6 +1,6 @@
-;==============================================================================
+; =========================================================
 ; Sprite Properties
-;==============================================================================
+; =========================================================
 !SPRID              = $9E ; The sprite ID you are overwriting (HEX)
 !NbrTiles           = 00  ; Number of tiles used in a frame
 !Harmless           = 01  ; 00 = Sprite is Harmful,  01 = Sprite is Harmless
@@ -31,81 +31,79 @@
 
 %Set_Sprite_Properties(Sprite_MakuTree_Prep, Sprite_MakuTree_Long)
 
-;==============================================================================
+; =========================================================
 
 Sprite_MakuTree_Long:
 {
-  PHB : PHK : PLB
+    PHB : PHK : PLB
 
-  JSR Sprite_MakuTree_Draw ; Call the draw code
+    JSR Sprite_MakuTree_Draw ; Call the draw code
-  JSL Sprite_CheckActive   ; Check if game is not paused
+    JSL Sprite_CheckActive   ; Check if game is not paused
-  BCC .SpriteIsNotActive   ; Skip Main code is sprite is innactive
+    BCC .SpriteIsNotActive   ; Skip Main code is sprite is innactive
 
-  JSR Sprite_MakuTree_Main ; Call the main sprite code
+    JSR Sprite_MakuTree_Main ; Call the main sprite code
 
   .SpriteIsNotActive
-  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:
 {
-  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 
   .intro_is_done
-
+    PLB
-  PLB
+    RTL
-  RTL
 }
 
-;==============================================================================
+; =========================================================
 
 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_MeetLink
-  dw MakuTree_GiveBow
+  dw MakuTree_GiveMoonPearl
 
   MakuTree_Handler:
   {
-    ; Check the progress flags 
+      ; Check the progress flags 
-    LDA $7EF3D4 : CMP.b #$01 : BEQ .has_met_link
+      LDA $7EF3D4 : CMP.b #$01 : BEQ .has_met_link
-    %GotoAction(1)
+      %GotoAction(1)
-    RTS
+      RTS
 
-  .has_met_link
+    .has_met_link
-    %ShowSolicitedMessage($22) 
+      %ShowSolicitedMessage($22) 
-    RTS
+      RTS
   }
 
   MakuTree_MeetLink:
   {
-    %ShowSolicitedMessage($20) : BCC .no_talk
+      %ShowSolicitedMessage($20) : BCC .no_talk
-    LDA #$01 : STA $7EF3D4
+      LDA #$01 : STA $7EF3D4
-    LDA #$06 : STA $7EF3C7
+      LDA #$06 : STA $7EF3C7
-    %GotoAction(2)
+      %GotoAction(2)
-  .no_talk
+    .no_talk
-    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
-    %GotoAction(0)
+      %GotoAction(0)
-    RTS
+      RTS
   }
 
 }
 
-;==============================================================================
+; =========================================================
 
 Sprite_MakuTree_Draw:
 {
@@ -163,7 +161,7 @@ Sprite_MakuTree_Draw:
 
   RTS
 
-;==============================================================================
+; =========================================================
 
 .start_index
 .nbr_of_tiles

Sprites/all_sprites.asm

@@ -45,7 +45,7 @@ print  "End of kydrog.asm                 ", pc
 incsrc "Sprites/Bosses/kydrog_boss.asm"
 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
 
 incsrc "Sprites/NPCs/mask_salesman.asm"