Extract animations

6 files changed, 95 insertions, 50 deletions

diff --git a/data/const/enemy/ballChainSoldier.s b/data/const/enemy/ballChainSoldier.s
index 22c8fc1d..69e8693f 100644
--- a/data/const/enemy/ballChainSoldier.s
+++ b/data/const/enemy/ballChainSoldier.s
@@ -34,11 +34,11 @@ gUnk_080D0728:: @ 080D0728
 gUnk_080D0730:: @ 080D0730
 	.incbin "ballChainSoldier/gUnk_080D0730.bin"
 
-gUnk_080D0738:: @ 080D0738
-	.incbin "ballChainSoldier/gUnk_080D0738.bin"
+gSpriteAnimations_BallChainSoldier_3:: @ 080D0738
+	.include "animations/gSpriteAnimations_BallChainSoldier_3.s"
 
-gUnk_080D073C:: @ 080D073C
-	.incbin "ballChainSoldier/gUnk_080D073C.bin"
+gSpriteAnimations_BallChainSoldier_2:: @ 080D073C
+	.include "animations/gSpriteAnimations_BallChainSoldier_2.s"
 
-gUnk_080D0740:: @ 080D0740
-	.incbin "ballChainSoldier/gUnk_080D0740.bin"
+gSpriteAnimations_BallChainSoldier_1:: @ 080D0740
+	.include "animations/gSpriteAnimations_BallChainSoldier_1.s"
diff --git a/data/const/npc/bladeBrothers.s b/data/const/npc/bladeBrothers.s
index bd4b1756..1401778f 100644
--- a/data/const/npc/bladeBrothers.s
+++ b/data/const/npc/bladeBrothers.s
@@ -72,5 +72,5 @@ gUnk_0811172A:: @ 0811172A
 gUnk_08111740:: @ 08111740
 	.incbin "bladeBrothers/gUnk_08111740.bin"
 
-gUnk_0811176C:: @ 0811176C
-	.incbin "bladeBrothers/gUnk_0811176C.bin"
+gSpriteAnimations_BladeBrothers_1_1:: @ 0811176C
+	.include "animations/gSpriteAnimations_BladeBrothers_1_1.s"
diff --git a/data/const/npc/guard.s b/data/const/npc/guard.s
index 1af67e05..5cefab70 100644
--- a/data/const/npc/guard.s
+++ b/data/const/npc/guard.s
@@ -24,3 +24,48 @@ gUnk_0810F550:: @ 0810F550
 	.4byte sub_08063E54
 	.4byte sub_08063E6C
 
+gUnk_0810F560:: @ 0810F560
+	.incbin "guard/gUnk_0810F560.bin"
+
+gUnk_0810F59A:: @ 0810F59A
+	.incbin "guard/gUnk_0810F59A.bin"
+
+gUnk_0810F5D4:: @ 0810F5D4
+	.incbin "guard/gUnk_0810F5D4.bin"
+
+gUnk_0810F60E:: @ 0810F60E
+	.incbin "guard/gUnk_0810F60E.bin"
+.ifdef JP
+    @ TODO only small differences
+	.incbin "guard/gUnk_0810F60E_1_JP.bin"
+.else
+.ifdef EU
+	.incbin "guard/gUnk_0810F60E_2_EU.bin"
+.else
+	.incbin "guard/gUnk_0810F60E_3_USA-DEMO_USA-DEMO_JP.bin"
+.endif
+.endif
+.ifdef JP
+    @ TODO only small differences
+	.incbin "guard/gUnk_0810F60E_4_JP.bin"
+.else
+.ifdef EU
+	.incbin "guard/gUnk_0810F60E_5_EU.bin"
+.else
+	.incbin "guard/gUnk_0810F60E_6_USA-DEMO_USA-DEMO_JP.bin"
+.endif
+.endif
+
+gUnk_0810F648:: @ 0810F648
+	.incbin "guard/gUnk_0810F648.bin"
+
+gUnk_0810F682:: @ 0810F682
+	.incbin "guard/gUnk_0810F682.bin"
+
+gUnk_0810F6BC:: @ 0810F6BC
+	.4byte gUnk_0810F560
+	.4byte gUnk_0810F59A
+	.4byte gUnk_0810F5D4
+	.4byte gUnk_0810F60E
+	.4byte gUnk_0810F648
+	.4byte gUnk_0810F682
diff --git a/data/const/npc/sturgeon.s b/data/const/npc/sturgeon.s
index d7506db5..7da0e49d 100644
--- a/data/const/npc/sturgeon.s
+++ b/data/const/npc/sturgeon.s
@@ -19,14 +19,14 @@ gUnk_0810FA54:: @ 0810FA54
 gUnk_0810FA5A:: @ 0810FA5A
 	.incbin "sturgeon/gUnk_0810FA5A.bin"
 
-gUnk_0810FB24:: @ 0810FB24
-	.incbin "sturgeon/gUnk_0810FB24.bin"
+gSpriteAnimations_Sturgeon_4:: @ 0810FB24
+	.include "animations/gSpriteAnimations_Sturgeon_4.s"
 
-gUnk_0810FB39:: @ 0810FB39
-	.incbin "sturgeon/gUnk_0810FB39.bin"
+gSpriteAnimations_Sturgeon_5:: @ 0810FB39
+	.include "animations/gSpriteAnimations_Sturgeon_5.s"
 
-gUnk_0810FB4E:: @ 0810FB4E
-	.incbin "sturgeon/gUnk_0810FB4E.bin"
+gSpriteAnimations_Sturgeon_6:: @ 0810FB4E
+	.include "animations/gSpriteAnimations_Sturgeon_6.s"
 
-gUnk_0810FB63:: @ 0810FB63
-	.incbin "sturgeon/gUnk_0810FB63.bin"
+gSpriteAnimations_Sturgeon_7:: @ 0810FB63
+	.include "animations/gSpriteAnimations_Sturgeon_7.s"
diff --git a/data/const/object/beanstalk.s b/data/const/object/beanstalk.s
index d465e60b..768aef3e 100644
--- a/data/const/object/beanstalk.s
+++ b/data/const/object/beanstalk.s
@@ -38,8 +38,8 @@ gUnk_08120E84:: @ 08120E84
 	.4byte sub_0808A220
 	.4byte nullsub_518
 
-gUnk_08120E8C:: @ 08120E8C
-	.incbin "beanstalk/gUnk_08120E8C.bin"
+gSpriteAnimations_Beanstalk_0_0:: @ 08120E8C
+	.include "animations/gSpriteAnimations_Beanstalk_0_0.s"
 
-gUnk_08120ED1:: @ 08120ED1
-	.incbin "beanstalk/gUnk_08120ED1.bin"
+gSpriteAnimations_Beanstalk_0_1:: @ 08120ED1
+	.include "animations/gSpriteAnimations_Beanstalk_0_1.s"
diff --git a/data/const/playerItem/playerItemGustJar.s b/data/const/playerItem/playerItemGustJar.s
index f555e860..48dbafc6 100644
--- a/data/const/playerItem/playerItemGustJar.s
+++ b/data/const/playerItem/playerItemGustJar.s
@@ -21,46 +21,46 @@ gUnk_08132714:: @ 08132714
 	.4byte gUnk_08132AFE
 	.4byte gUnk_08132B0C
 
-gUnk_08132734:: @ 08132734
-	.incbin "playerItemGustJar/gUnk_08132734.bin"
+gSpriteAnimations_ItemGustJar_2:: @ 08132734
+	.include "animations/gSpriteAnimations_ItemGustJar_2.s"
 
-gUnk_08132744:: @ 08132744
-	.incbin "playerItemGustJar/gUnk_08132744.bin"
+gSpriteAnimations_ItemGustJar_1:: @ 08132744
+	.include "animations/gSpriteAnimations_ItemGustJar_1.s"
 
-gUnk_08132754:: @ 08132754
-	.incbin "playerItemGustJar/gUnk_08132754.bin"
+gSpriteAnimations_ItemGustJar_0:: @ 08132754
+	.include "animations/gSpriteAnimations_ItemGustJar_0.s"
 
-gUnk_08132764:: @ 08132764
-	.incbin "playerItemGustJar/gUnk_08132764.bin"
+gSpriteAnimations_ItemGustJar_6:: @ 08132764
+	.include "animations/gSpriteAnimations_ItemGustJar_6.s"
 
-gUnk_08132774:: @ 08132774
-	.incbin "playerItemGustJar/gUnk_08132774.bin"
+gSpriteAnimations_ItemGustJar_5:: @ 08132774
+	.include "animations/gSpriteAnimations_ItemGustJar_5.s"
 
-gUnk_08132784:: @ 08132784
-	.incbin "playerItemGustJar/gUnk_08132784.bin"
+gSpriteAnimations_ItemGustJar_4:: @ 08132784
+	.include "animations/gSpriteAnimations_ItemGustJar_4.s"
 
-gUnk_08132794:: @ 08132794
-	.incbin "playerItemGustJar/gUnk_08132794.bin"
+gSpriteAnimations_ItemGustJar_10:: @ 08132794
+	.include "animations/gSpriteAnimations_ItemGustJar_10.s"
 
-gUnk_081327AC:: @ 081327AC
-	.incbin "playerItemGustJar/gUnk_081327AC.bin"
+gSpriteAnimations_ItemGustJar_9:: @ 081327AC
+	.include "animations/gSpriteAnimations_ItemGustJar_9.s"
 
-gUnk_081327C4:: @ 081327C4
-	.incbin "playerItemGustJar/gUnk_081327C4.bin"
+gSpriteAnimations_ItemGustJar_8:: @ 081327C4
+	.include "animations/gSpriteAnimations_ItemGustJar_8.s"
 
 gSpriteAnimations_ItemGustJar:: @ 081327DC
-	.4byte gUnk_08132754
-	.4byte gUnk_08132744
-	.4byte gUnk_08132734
-	.4byte gUnk_08132744
-	.4byte gUnk_08132784
-	.4byte gUnk_08132774
-	.4byte gUnk_08132764
-	.4byte gUnk_08132774
-	.4byte gUnk_081327C4
-	.4byte gUnk_081327AC
-	.4byte gUnk_08132794
-	.4byte gUnk_081327AC
+	.4byte gSpriteAnimations_ItemGustJar_0
+	.4byte gSpriteAnimations_ItemGustJar_1
+	.4byte gSpriteAnimations_ItemGustJar_2
+	.4byte gSpriteAnimations_ItemGustJar_1
+	.4byte gSpriteAnimations_ItemGustJar_4
+	.4byte gSpriteAnimations_ItemGustJar_5
+	.4byte gSpriteAnimations_ItemGustJar_6
+	.4byte gSpriteAnimations_ItemGustJar_5
+	.4byte gSpriteAnimations_ItemGustJar_8
+	.4byte gSpriteAnimations_ItemGustJar_9
+	.4byte gSpriteAnimations_ItemGustJar_10
+	.4byte gSpriteAnimations_ItemGustJar_9
 	.4byte 00000000
 
 gSpriteFrames_23:: @ 08132810