From 449dbd149e2d9529512c9ccf3b7741713a78cffd Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 22 Dec 2024 20:41:40 -0500
Subject: [PATCH] Add HyruleDream sprites as subtype for 0x76 Farore

---
 Sprites/NPCs/farore.asm       |  10 +++
 Sprites/NPCs/hyrule_dream.asm | 120 ++++++++++++++++++++++++++++++++++
 Sprites/NPCs/maple.asm        |   2 +-
 Sprites/all_sprites.asm       |   2 +
 4 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 Sprites/NPCs/hyrule_dream.asm

diff --git a/Sprites/NPCs/farore.asm b/Sprites/NPCs/farore.asm
index c0f9564..3bc46e7 100644
--- a/Sprites/NPCs/farore.asm
+++ b/Sprites/NPCs/farore.asm
@@ -36,6 +36,12 @@
 Sprite_Farore_Long:
 {
   PHB : PHK : PLB
+  LDA.b INDOORS : BEQ .outdoors
+    JSR Sprite_HyruleDream_Draw
+    JSL Sprite_CheckActive : BCC .SpriteIsNotActive
+      JSR Sprite_HyruleDream_Main
+      JMP .SpriteIsNotActive
+  .outdoors
   JSR Sprite_Farore_Draw
   JSL Sprite_CheckActive : BCC .SpriteIsNotActive
     JSR Sprite_Farore_Main
@@ -50,6 +56,10 @@ Sprite_Farore_Prep:
 {
   PHB : PHK : PLB
   LDA.b #$80 : STA.w SprDefl, X ; Don't kill Farore when she goes off screen
+  LDA.b INDOORS : BEQ .outdoors
+    JSR Sprite_HyruleDream_Prep
+    JMP .PlayIntro
+  .outdoors
   LDA.l $7EF300 : BEQ .PlayIntro
     STZ.w SprState, X ; Kill the sprite
   .PlayIntro
diff --git a/Sprites/NPCs/hyrule_dream.asm b/Sprites/NPCs/hyrule_dream.asm
new file mode 100644
index 0000000..bc307d3
--- /dev/null
+++ b/Sprites/NPCs/hyrule_dream.asm
@@ -0,0 +1,120 @@
+Sprite_HyruleDream_Prep:
+{
+  LDA.b ROOM : CMP.b #$51 : BEQ .king
+               CMP.b #$60 : BEQ .soldier
+               LDA.b #$00 : JMP .done
+  .king
+  LDA.b #$01 : JMP .done
+  .soldier
+  LDA.b #$02
+  .done
+  STA.w SprAction, X
+  RTS
+}
+
+Sprite_HyruleDream_Main:
+{
+  %SpriteJumpTable(Zelda_Idle,
+                   King_Idle,
+                   Soldier_Idle)
+
+  Zelda_Idle:
+  {
+    STZ.w SprFrame, X
+    RTS
+  }
+
+  King_Idle:
+  {
+    LDA.b #$01 : STA.w SprFrame, X
+    RTS
+  }
+
+  Soldier_Idle:
+  {
+    LDA.b #$02 : STA.w SprFrame, X
+    RTS
+  }
+}
+
+Sprite_HyruleDream_Draw:
+{
+  JSL Sprite_PrepOamCoord
+  JSL Sprite_OAM_AllocateDeferToPlayer
+
+  LDA.w SprFrame, X : TAY ;Animation Frame
+  LDA .start_index, Y : STA $06
+
+
+  PHX
+  LDX .nbr_of_tiles, Y ;amount of tiles -1
+  LDY.b #$00
+  .nextTile
+
+  PHX ; Save current Tile Index?
+
+  TXA : CLC : ADC $06 ; Add Animation Index Offset
+
+  PHA ; Keep the value with animation index offset?
+
+  ASL A : TAX
+
+  REP #$20
+
+  LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y
+  AND.w #$0100 : STA $0E
+  INY
+  LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y
+  CLC : ADC #$0010 : CMP.w #$0100
+  SEP #$20
+  BCC .on_screen_y
+
+  LDA.b #$F0 : STA ($90), Y ;Put the sprite out of the way
+  STA $0E
+  .on_screen_y
+
+  PLX ; Pullback Animation Index Offset (without the *2 not 16bit anymore)
+  INY
+  LDA .chr, X : STA ($90), Y
+  INY
+  LDA .properties, X : STA ($90), Y
+
+  PHY
+
+  TYA : LSR #2 : TAY
+
+  LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
+
+  PLY : INY
+
+  PLX : DEX : BPL .nextTile
+
+  PLX
+
+  RTS
+
+  .start_index
+  db $00, $03, $07
+  .nbr_of_tiles
+  db 2, 3, 2
+  .x_offsets
+  dw -8, 8, 0
+  dw -8, 8, -8, 8
+  dw -4, 4, 0
+  .y_offsets
+  dw -4, -4, -14
+  dw -16, -16, 0, 0
+  dw -4, -4, -14
+  .chr
+  db $A8, $A8, $84
+  db $8E, $8E, $AE, $AE
+  db $A4, $A4, $A6
+  .properties
+  db $39, $79, $39
+  db $39, $79, $39, $79
+  db $39, $79, $39
+  .sizes
+  db $02, $02, $02
+  db $02, $02, $02, $02
+  db $02, $02, $02
+}
diff --git a/Sprites/NPCs/maple.asm b/Sprites/NPCs/maple.asm
index 5680abd..768c03f 100644
--- a/Sprites/NPCs/maple.asm
+++ b/Sprites/NPCs/maple.asm
@@ -76,7 +76,6 @@ MapleHandler:
 
   Maple_CheckForPendant:
   {
-    print pc
     ; Check for pendant
     LDA.l PENDANTS : AND.b #$04 : BNE .courage
     LDA.l PENDANTS : AND.b #$02 : BNE .power
@@ -156,6 +155,7 @@ Link_HandleDreams:
     LDA.l Dreams : ORA.b #%00000001 : STA.l Dreams
     LDX.b #$00
     JSR Link_WarpToRoom
+    LDA.b #$01 : STA.b $EE
     RTS
   }
 
diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm
index 2ad8b9b..2db1101 100644
--- a/Sprites/all_sprites.asm
+++ b/Sprites/all_sprites.asm
@@ -8,6 +8,8 @@ incsrc Core/sprite_new_table.asm
 Sprite_Farore    = $73
 incsrc "Sprites/NPCs/farore.asm"
 print  "End of farore.asm                 ", pc
+incsrc "Sprites/NPCs/hyrule_dream.asm"
+print  "End of hyrule_dream.asm           ", pc
 
 Sprite_KydrogNPC = $7B
 incsrc "Sprites/Bosses/kydrog.asm"