Decompile remaining sprite templates

2 files changed, 97 insertions, 73 deletions

diff --git a/data/fame_checker.s b/data/fame_checker.s
index 38639c70b..7e2ff471e 100644
--- a/data/fame_checker.s
+++ b/data/fame_checker.s
@@ -4,71 +4,5 @@
 	.section .rodata
 
 	.align 2
-gUnknown_845FC2C:: @ 845FC2C
-	.4byte 0x000f0000, 0x000f0010, 0x0000fffe
-
-gUnknown_845FC38::
-	.4byte gUnknown_845FC2C
-
-gOamData_845FC3C::
-	.4byte 0x80000000, 0x00000800
-
-gUnknown_845FC44:: @ 845FC44
-	spr_template 1000, 1000, gOamData_845FC3C, gUnknown_845FC38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_845FC5C::
-	.4byte 0x00000000, 0x00000000
-
-gOamData_845FC64::
-	.4byte 0x80008000, 0x00000800
-
-gUnknown_845FC6C::
-	.4byte 0x000a0000, 0x0000ffff
-
-gUnknown_845FC74::
-	.4byte gUnknown_845FC6C
-
-gUnknown_845FC78:: @ 845FC78
-	spr_template 1001, 0xffff, gOamData_845FC64, gUnknown_845FC74, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_845FC90:: @ 845FC90
-	.4byte 0x000a0000, 0x0000ffff
-
-gUnknown_845FC98::
-	.4byte gUnknown_845FC90
-
-gOamData_845FC9C::
-	.4byte 0x80000100, 0x00000000
-
-gUnknown_845FCA4::
-	.4byte 0x00000000, 0x00001404, 0x00007ffe, 0x00000000
-
-gUnknown_845FCB4:: @ 845FCB4
-	.4byte gUnknown_845FCA4
-
-gUnknown_845FCB8:: @ 845FCB8
-	spr_template 1002, 1002, gOamData_845FC9C, gUnknown_845FC98, NULL, gUnknown_845FCB4, sub_812D840
-
-gUnknown_845FCD0:: @ 845FCD0
-	.4byte 0x000f0000, 0x0000ffff
-
-gUnknown_845FCD8::
-	.4byte gUnknown_845FCD0
-
-gOamData_845FCDC::
-	.4byte 0xc0000000, 0x00000000
-
-gUnknown_845FCE4:: @ 845FCE4
-	spr_template 1006, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_845FCFC:: @ 845FCFC
-	spr_template 1007, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_845FD14:: @ 845FD14
-	spr_template 1008, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_845FD2C:: @ 845FD2C
-	spr_template 1009, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
 gUnknown_845FD44:: @ 845FD44
 	.byte 0x02, 0x28, 0x1a, 0x03, 0x28, 0x64, 0x00, 0x00, 0x00, 0x00, 0xec, 0x03, 0xff, 0xff, 0x01, 0x00
diff --git a/src/fame_checker.c b/src/fame_checker.c
index ac01f172f..0efd60057 100644
--- a/src/fame_checker.c
+++ b/src/fame_checker.c
@@ -104,6 +104,7 @@ void sub_812D9A8(u8 a0, u16 a1);
 void sub_812DA14(u8 a0);
 void sub_812DB10(void);
 void sub_812DB28(void);
+void sub_812D840(struct Sprite * sprite);
 void sub_812DB64(void);
 void sub_812DBC0(s32, bool8, struct ListMenu *);
 void sub_812DD50(u8 taskId);
@@ -384,13 +385,102 @@ const struct WindowTemplate gUnknown_845FC04[] = {
     DUMMY_WIN_TEMPLATE
 };
 
-extern const struct SpriteTemplate gUnknown_845FC44;
-extern const struct SpriteTemplate gUnknown_845FC78;
-extern const struct SpriteTemplate gUnknown_845FCB8;
-extern const struct SpriteTemplate gUnknown_845FCE4;
-extern const struct SpriteTemplate gUnknown_845FCFC;
-extern const struct SpriteTemplate gUnknown_845FD14;
-extern const struct SpriteTemplate gUnknown_845FD2C;
+const union AnimCmd gUnknown_845FC2C[] = {
+    ANIMCMD_FRAME( 0, 15),
+    ANIMCMD_FRAME(16, 15),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd *const gUnknown_845FC38[] = {
+    gUnknown_845FC2C
+};
+
+const struct OamData gOamData_845FC3C = {
+    .size = 2,
+    .priority = 2
+};
+
+const struct SpriteTemplate gUnknown_845FC44 = {
+    SPRITETAG_1000, SPRITETAG_1000, &gOamData_845FC3C, gUnknown_845FC38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+};
+
+const u8 filler_845FC5C[8] = {};
+
+const struct OamData gOamData_845FC64 = {
+    .shape = ST_OAM_V_RECTANGLE,
+    .size = 2,
+    .priority = 2
+};
+
+const union AnimCmd gUnknown_845FC6C[] = {
+    ANIMCMD_FRAME( 0, 10),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gUnknown_845FC74[] = {
+    gUnknown_845FC6C
+};
+
+const struct SpriteTemplate gUnknown_845FC78 = {
+    SPRITETAG_1001, 0xffff, &gOamData_845FC64, gUnknown_845FC74, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+};
+
+const union AnimCmd gUnknown_845FC90[] = {
+    ANIMCMD_FRAME( 0, 10),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gUnknown_845FC98[] = {
+    gUnknown_845FC90
+};
+
+const struct OamData gOamData_845FC9C = {
+    .affineMode = ST_OAM_AFFINE_NORMAL,
+    .size = 2
+};
+
+const union AffineAnimCmd gUnknown_845FCA4[] = {
+    AFFINEANIMCMD_FRAME(0, 0, 4, 20),
+    AFFINEANIMCMD_JUMP(0)
+};
+
+const union AffineAnimCmd *const gUnknown_845FCB4[] = {
+    gUnknown_845FCA4
+};
+
+const struct SpriteTemplate gUnknown_845FCB8 = {
+    SPRITETAG_1002, SPRITETAG_1002, &gOamData_845FC9C, gUnknown_845FC98, NULL, gUnknown_845FCB4, sub_812D840
+};
+
+const union AnimCmd gUnknown_845FCD0[] = {
+    ANIMCMD_FRAME( 0, 15),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gUnknown_845FCD8[] = {
+    gUnknown_845FCD0
+};
+
+const struct OamData gOamData_845FCDC = {
+    .size = 3
+};
+
+const struct SpriteTemplate gUnknown_845FCE4 = {
+    SPRITETAG_1006, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+};
+
+const struct SpriteTemplate gUnknown_845FCFC = {
+    SPRITETAG_1007, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+};
+
+const struct SpriteTemplate gUnknown_845FD14 = {
+    SPRITETAG_1008, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+};
+
+const struct SpriteTemplate gUnknown_845FD2C = {
+    SPRITETAG_1009, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+};
+
 extern const struct ScrollIndicatorArrowPairTemplate gUnknown_845FD44;
 
 void sub_812C380(void)