From e987137f00b4421d02d19b1cc80939bd87e9242f Mon Sep 17 00:00:00 2001
From: jeboo <jeb00o@yahoo.com>
Date: Mon, 19 Jan 2026 11:39:34 -0500
Subject: [PATCH] animate dachora map icon

---
 patches/ips/map_area.ips    | Bin 4434 -> 4555 bytes
 patches/rom_map/Bank B6.txt |   4 +--
 patches/src/map_area.asm    |  50 +++++++++++++++++++++++++++++++++---
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/patches/ips/map_area.ips b/patches/ips/map_area.ips
index 3b81b074042d70304fd0d5bcead6e732644b5a9d..93da0a5a61cf3a50ecf7a250938e8fb47d356d3e 100644
GIT binary patch
delta 374
zcmcblbXs}CZ6?ON&3BlVa9X-CFm&IF@?O1wfnlG`whufz?Y1f8?>GSj4e!@8d|3EF
zd=Ue~{)T_s<~JOyd-39d0>g!mD-#%6%_eW*QD9s!`6`cneb|l+g{wP$y#Rs-JPa4E
z0Cjk;-aBdg1!kZA?YB<;|NkMyLzChE>s1+={~7ExZq$7U$v7#&@PXN<eLL6=r}c_A
z>NFb|E?6EjTWSVWbU}Nm*=ryzb&{Fk0xQtI2A0>JEI?a9f?OaVk-6aCs+A3zK*uUC
zYGY`a2(;?gt-VvWui7ub(7$Rw1H%rW(zDU>7XpC7(<V3Zs_FIbn4t9Q7LW&2#K6$6
z5VoW1mqhKX?H)5EYUgZUv3JJyUqF9kNM!ObtnyjA`5Lbo6LSM&!(@H|2P+O<R#skK
xc5k003@i*REIhJIrd<9u>%Z{)|8sZ`mxu&Jp4r=B0kZt+FFc<&dkSze0st&Rp}GJ7

delta 274
zcmX@Dd`W4;Z6?Od&3BlVaGLNkFm&IF@?O1wfnlHdwhufzEw?F{?KlAh4e!@8d|3EF
zXb}U${saHE&2KnZ_u|C^1%?YBC-3A@V0<w77LR?s?2ZhDIXiy60D=cR3>U5d6??DV
z8@c@gvrpLeTPOej|6t&u$?*U6stnEl4E7o~>OLrBoRnbr!0h9<9c(<`dc_-cnhgvW
zSQoW1G#mx$`gLn>^!8Qz1sM8Q?Pp-v0n~RkTK+-+P&jt`Es#+EFR+mhBp5bKKEo@j
z7q(-9(yv<}X|Sw<?2fKq619ojJ!VMMCU0M{H-7sspc^wJGI<zQ`K;K?&u7NOe1Oqm
NvWI}f<`V+Ui~thegP;Ha

diff --git a/patches/rom_map/Bank B6.txt b/patches/rom_map/Bank B6.txt
index 23dc64573..b40d3669d 100644
--- a/patches/rom_map/Bank B6.txt	
+++ b/patches/rom_map/Bank B6.txt	
@@ -1,3 +1,3 @@
 F200-F660: pause_menu_objectives.asm
-F660-FEC0: [FREE]
-FEC0-FFFF: map_area.asm
+F660-FE80: [FREE]
+FE80-FFFF: map_area.asm
diff --git a/patches/src/map_area.asm b/patches/src/map_area.asm
index 7a0c04ee3..6fc009c70 100644
--- a/patches/src/map_area.asm
+++ b/patches/src/map_area.asm
@@ -13,7 +13,7 @@ lorom
 !bank_85_freespace2_end  = $85ACA0
 !bank_85_freespace3_start = $85B600
 !bank_85_freespace3_end  = $85BA00
-!bank_b6_freespace_start = $B6FEC0
+!bank_b6_freespace_start = $B6FE80
 !bank_b6_freespace_end = $B70000
 !bank_94_freespace_start = $94B1A0
 !bank_94_freespace_end = $94B1B0
@@ -1726,10 +1726,18 @@ animal_palette:
 db $00,$00,$57,$3F,$4D,$2E,$E2,$00,$60,$00,$7F,$19,$0B,$22,$66,$11
 db $24,$09,$FF,$57,$F7,$42,$10,$26,$8C,$15,$1F,$7C,$18,$60,$0A,$30
 
-dachora_icon:
+dachora_icon_open:
 db $08,$0D,$05,$05,$0D,$0D,$1F,$53,$4C,$B4,$00,$04,$00,$04,$04,$0C
 db $1D,$02,$35,$0A,$4F,$3C,$B7,$FC,$1C,$FF,$FC,$C3,$BC,$0A,$14,$18
 
+dachora_icon_blink:
+db $08,$0D,$05,$05,$0D,$0D,$07,$4B,$4C,$A4,$00,$04,$00,$04,$04,$0C
+db $1D,$02,$35,$0A,$4F,$3C,$AF,$F4,$0C,$FF,$FC,$C3,$BC,$0A,$14,$18
+
+dachora_icon_close:
+db $08,$0D,$05,$05,$0D,$0D,$03,$4B,$40,$A0,$00,$04,$00,$04,$04,$0C
+db $1D,$02,$35,$0A,$4F,$3C,$AB,$F4,$0C,$F3,$FC,$C3,$BC,$0A,$14,$18
+
 dachora_icon_r:
 db $00,$00,$80,$00,$80,$80,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00
 db $80,$00,$00,$00,$40,$00,$40,$00,$80,$00,$00,$00,$00,$00,$00,$00
@@ -1795,7 +1803,10 @@ write_sprites:
     INX #2
     CPX #$0020
     BNE .copy_lp
-    
+
+    LDA #$0060
+    STA $36 ; initialize dachora state/frame count
+
 .no_animals
     PLY
     PLX
@@ -1804,7 +1815,7 @@ write_sprites:
 
 sprite_table: ; [$b6xxxx, vram addr] .. null-terminated
     dw $d120, $2890, $d1e0, $28c0, save_yellow, $28d0, save_orange, $28e0
-    dw save_pink, $28f0, $d140, $28a0, boss_green, $28b0, dachora_icon, $2980
+    dw save_pink, $28f0, $d140, $28a0, boss_green, $28b0, dachora_icon_open, $2980
     dw dachora_icon_r, $2990, dachora_icon_t, $2880, dachora_icon_l, $2970, dachora_icon_b, $2a80
     dw $0000
 
@@ -1876,6 +1887,37 @@ hook_map_icons:
     LDA $7ED821
     AND #$0080                  ; already saved?
     BNE .no_dachora
+
+; determine which dachora state to show (blink animation)
+; $36: frame count, $37 = state (00-02)
+    DEC $36
+    LDA $36
+    AND #$00FF                  ; frames
+    BNE .no_change
+    LDA $36
+    XBA
+    AND #$00FF                  ; state
+    INC
+    CMP #$0003
+    BNE .no_wrap
+    LDA #$0060                  ; ~1.5s
+    BRA .save_state
+.no_wrap
+    XBA
+    EOR #$0004                  ; 4-frame delay between states
+.save_state
+    STA $36
+    XBA
+    AND #$00FF
+    ASL #5                      ; state*20h
+    CLC
+    ADC #dachora_icon_open      ; A = dachora_icon + state*20h
+; update VRAM based on state
+    TAX
+    LDA #$2980
+    JSR write_to_vram
+
+.no_change
     LDX #(marker_table_dachora-marker_table) ; set index to dachora table
     BRA .marker_lp              ; restart loop with new index
 .no_dachora