From 4dd7bac4d6e370a7c5c3f27adc7027d68c233d09 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Mon, 1 Dec 2025 23:45:31 -0600
Subject: [PATCH] Fixed cucco storm to actually work on first trigger

---
 cuccostorm.asm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cuccostorm.asm b/cuccostorm.asm
index d01f282..0ceba80 100644
--- a/cuccostorm.asm
+++ b/cuccostorm.asm
@@ -3,6 +3,7 @@
 !INERT = $00
 !INIT = $08
 !ALIVE = $09
+!OAMPROPS = $09
 !CUCCO_ENRAGED = $23
 
 CuccoStorm:
@@ -12,6 +13,7 @@ CuccoStorm:
 	LDA.b GameMode : CMP.b #$09 : BNE + ; only if outdoors
 	LDA.l LoopFrames : AND.b #$7F : BNE + ; check every 128 frames
 
+.activate
 	-
 		;==== Find a Cucco
 
@@ -40,7 +42,11 @@ CuccoStorm:
 			PLY
 			CPY.b #$FF : BEQ + ; fail if no slots found
 			LDA.b #!CUCCO : STA.w SpriteTypeTable, Y
-			LDA.b #!INIT : STA.w SpriteAITable, Y
+			LDA.b #!ALIVE : STA.w SpriteAITable, Y
+			PHX
+				TYX : JSL ResetSpriteProperties
+			PLX
+			LDA.b #!OAMPROPS : STA.w SpriteOAMProp, Y
 			LDA.b LinkPosY : STA.w SpritePosYLow, Y
 			LDA.b LinkPosY+1 : STA.w SpritePosYHigh, Y
 			LDA.b LinkPosX : STA.w SpritePosXLow, Y