First pass disassembly of fame_checker sprite templates

2 files changed, 99 insertions, 17 deletions

diff --git a/data/fame_checker.s b/data/fame_checker.s
index 3aaaf84dc..38639c70b 100644
--- a/data/fame_checker.s
+++ b/data/fame_checker.s
@@ -4,35 +4,71 @@
 	.section .rodata
 
 	.align 2
-gUnknown_845FBDC:: @ 845FBDC
-	.incbin "baserom.gba", 0x45FBDC, 0x18
+gUnknown_845FC2C:: @ 845FC2C
+	.4byte 0x000f0000, 0x000f0010, 0x0000fffe
 
-gUnknown_845FBF4:: @ 845FBF4
-	.incbin "baserom.gba", 0x45FBF4, 0x10
+gUnknown_845FC38::
+	.4byte gUnknown_845FC2C
 
-gUnknown_845FC04:: @ 845FC04
-	.incbin "baserom.gba", 0x45FC04, 0x40
+gOamData_845FC3C::
+	.4byte 0x80000000, 0x00000800
 
 gUnknown_845FC44:: @ 845FC44
-	.incbin "baserom.gba", 0x45FC44, 0x34
+	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
-	.incbin "baserom.gba", 0x45FC78, 0x40
+	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
-	.incbin "baserom.gba", 0x45FCB8, 0x2C
+	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
-	.incbin "baserom.gba", 0x45FCE4, 0x18
+	spr_template 1006, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_845FCFC:: @ 845FCFC
-	.incbin "baserom.gba", 0x45FCFC, 0x18
+	spr_template 1007, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_845FD14:: @ 845FD14
-	.incbin "baserom.gba", 0x45FD14, 0x18
+	spr_template 1008, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_845FD2C:: @ 845FD2C
-	.incbin "baserom.gba", 0x45FD2C, 0x18
+	spr_template 1009, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_845FD44:: @ 845FD44
-	.incbin "baserom.gba", 0x45FD44, 0x10
+	.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 82cb25812..ac01f172f 100644
--- a/src/fame_checker.c
+++ b/src/fame_checker.c
@@ -335,9 +335,55 @@ const struct SpriteSheet gUnknown_845FB9C[] = {
     {}
 };
 
-extern const struct SpritePalette gUnknown_845FBDC[];
-extern const struct BgTemplate gUnknown_845FBF4[4];
-extern const struct WindowTemplate gUnknown_845FC04[];
+const struct SpritePalette gUnknown_845FBDC[] = {
+    {gUnknown_845D500, SPRITETAG_1000},
+    {gUnknown_845D0E0, SPRITETAG_1002},
+    {}
+};
+
+const struct BgTemplate gUnknown_845FBF4[4] = {
+    {
+        .bg = 3,
+        .charBaseIndex = 0x03,
+        .mapBaseIndex =  0x1e,
+        .screenSize = 0,
+        .paletteMode = FALSE,
+        .priority = 3,
+        .baseTile = 0x000},
+    {
+        .bg = 2,
+        .charBaseIndex = 0x03,
+        .mapBaseIndex =  0x1b,
+        .screenSize = 0,
+        .paletteMode = FALSE,
+        .priority = 2,
+        .baseTile = 0x000},
+    {
+        .bg = 1,
+        .charBaseIndex = 0x03,
+        .mapBaseIndex =  0x1c,
+        .screenSize = 1,
+        .paletteMode = FALSE,
+        .priority = 0,
+        .baseTile = 0x000},
+    {
+        .bg = 0,
+        .charBaseIndex = 0x00,
+        .mapBaseIndex =  0x1f,
+        .screenSize = 0,
+        .paletteMode = FALSE,
+        .priority = 2,
+        .baseTile = 0x000},
+};
+
+const struct WindowTemplate gUnknown_845FC04[] = {
+    {0x00, 0x01, 0x03, 0x08, 0x0a, 0x0f, 0x0014},
+    {0x00, 0x06, 0x00, 0x18, 0x02, 0x0f, 0x0064},
+    {0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x0094},
+    {0x00, 0x0f, 0x0a, 0x0b, 0x04, 0x0f, 0x00fc},
+    DUMMY_WIN_TEMPLATE
+};
+
 extern const struct SpriteTemplate gUnknown_845FC44;
 extern const struct SpriteTemplate gUnknown_845FC78;
 extern const struct SpriteTemplate gUnknown_845FCB8;