From fdfd43d0d31feeda3082227bcfae7d32abc663f6 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sun, 24 Oct 2021 11:41:27 +0200
Subject: Extract animations

---
 data/const/npc/bladeBrothers.s |  4 ++--
 data/const/npc/guard.s         | 45 ++++++++++++++++++++++++++++++++++++++++++
 data/const/npc/sturgeon.s      | 16 +++++++--------
 3 files changed, 55 insertions(+), 10 deletions(-)

(limited to 'data/const/npc')

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"
-- 
cgit v1.2.3