From 46c7397223fac901d5c221fcee8179f471ea363b Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 6 Oct 2024 08:11:59 -0400
Subject: [PATCH] Setup KaeporaGaebora subtype sprite

---
 Sprites/NPCs/bean_vendor.asm | 4 ----
 Sprites/NPCs/eon_owl.asm     | 5 ++++-
 Sprites/all_sprites.asm      | 7 +++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Sprites/NPCs/bean_vendor.asm b/Sprites/NPCs/bean_vendor.asm
index 5fa753e..d907d7a 100644
--- a/Sprites/NPCs/bean_vendor.asm
+++ b/Sprites/NPCs/bean_vendor.asm
@@ -60,10 +60,6 @@ Sprite_BeanVendor_Prep:
   LDA.w SprSubtype, X : STA.w SprAction, X
   CMP.b #$02 : BEQ .OldMan
 
-  LDA.b $8A : CMP.b #$0E : BNE .NotGaebora
-    LDA.b #$05 : STA.w SprAction, X
-  .NotGaebora
-
   LDA.b $8A : CMP.b #$00 : BEQ .RanchFlower
 
   .OldMan
diff --git a/Sprites/NPCs/eon_owl.asm b/Sprites/NPCs/eon_owl.asm
index d3677a0..c6d43db 100644
--- a/Sprites/NPCs/eon_owl.asm
+++ b/Sprites/NPCs/eon_owl.asm
@@ -40,7 +40,7 @@ Sprite_EonOwl_Long:
      LDA.l $7EF37A : CMP.b #$77 : BNE .Despawn
         ; If the player has the Song of Soaring, despawn
         LDA.l $7EF34C : CMP.b #$03 : BCS .Despawn
-          LDA.b #$05 : STA.w SprSubtype, X
+          LDA.b #$01 : STA.w SprSubtype, X
           JSR Sprite_KaeporaGaebora_Draw
           JMP .HandleSprite
   .NotGaebora
@@ -65,6 +65,9 @@ Sprite_EonOwl_Long:
 Sprite_EonOwl_Prep:
 {
   PHB : PHK : PLB
+  LDA.b $8A : CMP.b #$0E : BNE .NotGaebora
+    LDA.b #$03 : STA.w SprAction, X
+  .NotGaebora
   LDA.w AreaIndex : CMP.b #$50 : BNE .not_intro
     ; If Map 0x50, don't spawn after meeting Maku Tree
     LDA.l OOSPROG : AND.b #$02 : BEQ .continue
diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm
index 9e1d888..ca5b7d2 100644
--- a/Sprites/all_sprites.asm
+++ b/Sprites/all_sprites.asm
@@ -35,7 +35,7 @@ Sprite_Librarian = $F0 ; Subtype 2
 incsrc "Sprites/NPCs/mermaid.asm"
 print  "End of mermaid.asm                ", pc
 
-Sprite_Manhandla = $88 
+Sprite_Manhandla = $88
 incsrc "Sprites/Bosses/manhandla.asm"
 print  "End of manhandla.asm              ", pc
 
@@ -197,7 +197,7 @@ incsrc "Sprites/Bosses/wolfos.asm"
 print  "End of wolfos.asm                 ",  pc
 
 ; TODO: Change from digging game guy?
-Sprite_IceBlock = $D5 
+Sprite_IceBlock = $D5
 incsrc "Sprites/Objects/ice_block.asm"
 print  "End of ice_block.asm              ",  pc
 
@@ -410,7 +410,7 @@ LDA.b #$03 : STA.w $04C6
 org $05FF7D
   LDA.l $7EF34C
   CMP.b #$01
-  
+
 ; Raven Damage (LW/DW)
 org $068963
   db $81, $84
@@ -442,4 +442,3 @@ SpriteDraw_RunningBoy:
   #_05EA3D: dw   0,  -7 : db $2E, $40, $00, $02
   #_05EA45: dw   0,   1 : db $CE, $4E, $00, $02
 
-; =========================================================