data through gUnknown_083EDD08

3 files changed, 125 insertions, 111 deletions

diff --git a/data/slot_machine.s b/data/slot_machine.s
index 391bdf05d..23d2b8a74 100644
--- a/data/slot_machine.s
+++ b/data/slot_machine.s
@@ -4,112 +4,6 @@
 	.section .rodata
 
 	.align 2
-gUnknown_083EDB5C:: @ 83EDB5C
-	.4byte gSpriteTemplate_83ED57C
-	.4byte gSpriteTemplate_83ED594
-	.4byte gSpriteTemplate_83ED5AC
-	.4byte gSpriteTemplate_83ED5DC
-	.4byte gSpriteTemplate_83ED5F4
-	.4byte gSpriteTemplate_83ED654
-	.4byte gSpriteTemplate_83ED66C
-	.4byte gSpriteTemplate_83ED684
-	.4byte gSpriteTemplate_83ED69C
-	.4byte gSpriteTemplate_83ED6B4
-	.4byte gSpriteTemplate_83ED5C4
-	.4byte gSpriteTemplate_83ED5C4
-	.4byte gSpriteTemplate_83ED5C4
-	.4byte gSpriteTemplate_83ED5C4
-	.4byte gSpriteTemplate_83ED60C
-	.4byte gSpriteTemplate_83ED60C
-	.4byte gSpriteTemplate_83ED60C
-	.4byte gSpriteTemplate_83ED60C
-	.4byte gSpriteTemplate_83ED60C
-	.4byte gSpriteTemplate_83ED624
-	.4byte gSpriteTemplate_83ED624
-	.4byte gSpriteTemplate_83ED624
-	.4byte gSpriteTemplate_83ED63C
-	.4byte gSpriteTemplate_83ED63C
-	.4byte gSpriteTemplate_83ED63C
-	.4byte gDummySpriteTemplate
-
-	.align 2
-gUnknown_083EDBC4:: @ 83EDBC4
-	.4byte gSubspriteTables_83ED804
-	.4byte gSubspriteTables_83ED82C
-	.4byte gSubspriteTables_83ED854
-	.4byte gSubspriteTables_83ED8B4
-	.4byte NULL
-	.4byte NULL
-	.4byte gSubspriteTables_83ED8CC
-	.4byte NULL
-	.4byte gSubspriteTables_83ED93C
-	.4byte gSubspriteTables_83ED95C
-	.4byte gSubspriteTables_83ED974
-	.4byte gSubspriteTables_83ED98C
-	.4byte gSubspriteTables_83ED9A4
-	.4byte gSubspriteTables_83ED9BC
-	.4byte gSubspriteTables_83ED9D4
-	.4byte gSubspriteTables_83ED9EC
-	.4byte gSubspriteTables_83EDA04
-	.4byte gSubspriteTables_83EDA1C
-	.4byte gSubspriteTables_83EDA34
-	.4byte gSubspriteTables_83EDA6C
-	.4byte gSubspriteTables_83EDA8C
-	.4byte gSubspriteTables_83EDAC4
-	.4byte gSubspriteTables_83EDAFC
-	.4byte gSubspriteTables_83EDB1C
-	.4byte gSubspriteTables_83EDB54
-	.4byte NULL
-
-	.align 2
-gUnknown_083EDC2C:: @ 83EDC2C
-	obj_tiles gSlotMachineReelSymbol1Tiles, 0x200, 0
-	obj_tiles gSlotMachineReelSymbol2Tiles, 0x200, 1
-	obj_tiles gSlotMachineReelSymbol3Tiles, 0x200, 2
-	obj_tiles gSlotMachineReelSymbol4Tiles, 0x200, 3
-	obj_tiles gSlotMachineReelSymbol5Tiles, 0x200, 4
-	obj_tiles gSlotMachineReelSymbol6Tiles, 0x200, 5
-	obj_tiles gSlotMachineReelSymbol7Tiles, 0x200, 6
-	obj_tiles gSlotMachineNumber0Tiles, 0x40, 7
-	obj_tiles gSlotMachineNumber1Tiles, 0x40, 8
-	obj_tiles gSlotMachineNumber2Tiles, 0x40, 9
-	obj_tiles gSlotMachineNumber3Tiles, 0x40, 10
-	obj_tiles gSlotMachineNumber4Tiles, 0x40, 11
-	obj_tiles gSlotMachineNumber5Tiles, 0x40, 12
-	obj_tiles gSlotMachineNumber6Tiles, 0x40, 13
-	obj_tiles gSlotMachineNumber7Tiles, 0x40, 14
-	obj_tiles gSlotMachineNumber8Tiles, 0x40, 15
-	obj_tiles gSlotMachineNumber9Tiles, 0x40, 16
-	obj_tiles gSharedMem + 0x10A00, 0x200, 18
-	obj_tiles gSharedMem + 0x11400, 0x200, 19
-	obj_tiles gSharedMem + 0x11600, 0x300, 20
-	obj_tiles gSharedMem + 0x11900, 0x300, 21
-	null_obj_tiles
-
-	.align 2
-gUnknown_083EDCDC:: @ 83EDCDC
-	obj_tiles gSharedMem + 0x10000, 2048, 0x0011
-
-	.align 2
-gUnknown_083EDCE4:: @ 83EDCE4
-	.4byte gUnknownPalette_08E997E8
-
-UnknownPalette_83EDCE8:
-	.ifdef SAPPHIRE
-	.incbin "graphics/unknown/sapphire_83EDD40.gbapal"
-	.else
-	.incbin "graphics/unknown/ruby_83EDCE8.gbapal"
-	.endif
-
-	.align 2
-gUnknown_083EDD08:: @ 83EDD08
-	.4byte UnknownPalette_83EDCE8 + 10 * 2
-	.4byte UnknownPalette_83EDCE8 + 11 * 2
-	.4byte UnknownPalette_83EDCE8 + 12 * 2
-	.4byte UnknownPalette_83EDCE8 + 13 * 2
-	.4byte UnknownPalette_83EDCE8 + 14 * 2
-
-	.align 2
 gUnknown_083EDD1C:: @ 83EDD1C
 	.4byte gUnknown_08E95A18 + 148
 	.4byte gUnknown_08E95A18 + 150
diff --git a/include/graphics.h b/include/graphics.h
index 9db35862c..5f19b09cb 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2672,5 +2672,23 @@ extern const u8 gSpriteImage_8E98FE8[];
 extern const u8 gSpriteImage_8E98848[];
 extern const u8 gSpriteImage_8E98868[];
 extern const u8 gSpriteImage_8E98828[];
+extern const u8 gSlotMachineReelSymbol1Tiles[];
+extern const u8 gSlotMachineReelSymbol2Tiles[];
+extern const u8 gSlotMachineReelSymbol3Tiles[];
+extern const u8 gSlotMachineReelSymbol4Tiles[];
+extern const u8 gSlotMachineReelSymbol5Tiles[];
+extern const u8 gSlotMachineReelSymbol6Tiles[];
+extern const u8 gSlotMachineReelSymbol7Tiles[];
+extern const u8 gSlotMachineNumber0Tiles[];
+extern const u8 gSlotMachineNumber1Tiles[];
+extern const u8 gSlotMachineNumber2Tiles[];
+extern const u8 gSlotMachineNumber3Tiles[];
+extern const u8 gSlotMachineNumber4Tiles[];
+extern const u8 gSlotMachineNumber5Tiles[];
+extern const u8 gSlotMachineNumber6Tiles[];
+extern const u8 gSlotMachineNumber7Tiles[];
+extern const u8 gSlotMachineNumber8Tiles[];
+extern const u8 gSlotMachineNumber9Tiles[];
+extern const u8 gUnknownPalette_08E997E8[];
 
 #endif  // GUARD_GRAPHICS_H
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index bff4e6a96..4aa6af742 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -3571,8 +3571,8 @@ u8 sub_8105BB4(u8 a0, u8 a1, s16 a2)
     return sub_8105BF8(a0, gUnknown_083ECF0C[a1], gUnknown_083ECE7E[a1][0], gUnknown_083ECE7E[a1][1], a2);
 }
 
-extern const struct SpriteTemplate *gUnknown_083EDB5C[];
-extern const struct SubspriteTable *gUnknown_083EDBC4[];
+const struct SpriteTemplate *const gUnknown_083EDB5C[];
+const struct SubspriteTable *const gUnknown_083EDBC4[];
 
 u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4)
 {
@@ -4011,7 +4011,7 @@ void sub_810639C(void)
 
 extern const u8 gSlotMachineReelTimeLights_Gfx[];
 extern const u8 gUnknown_083EDE8C[];
-extern const struct SpriteSheet gUnknown_083EDC2C[];
+const struct SpriteSheet gUnknown_083EDC2C[];
 extern const struct SpritePalette gSlotMachineSpritePalettes[];
 
 void sub_81063C0(void)
@@ -4023,8 +4023,8 @@ void sub_81063C0(void)
     LoadSpritePalettes(gSlotMachineSpritePalettes);
 }
 
-extern const u8 *gUnknown_083EDCE4;
-extern const struct SpriteSheet gUnknown_083EDCDC;
+const u8 *const gUnknown_083EDCE4;
+const struct SpriteSheet gUnknown_083EDCDC;
 
 void sub_8106404(void)
 {
@@ -5306,4 +5306,106 @@ const struct SubspriteTable gSubspriteTables_83EDB54[] = {
     {6, gSubspriteTable_83EDB24}
 };
 
+const struct SpriteTemplate *const gUnknown_083EDB5C[] = {
+    &gSpriteTemplate_83ED57C,
+    &gSpriteTemplate_83ED594,
+    &gSpriteTemplate_83ED5AC,
+    &gSpriteTemplate_83ED5DC,
+    &gSpriteTemplate_83ED5F4,
+    &gSpriteTemplate_83ED654,
+    &gSpriteTemplate_83ED66C,
+    &gSpriteTemplate_83ED684,
+    &gSpriteTemplate_83ED69C,
+    &gSpriteTemplate_83ED6B4,
+    &gSpriteTemplate_83ED5C4,
+    &gSpriteTemplate_83ED5C4,
+    &gSpriteTemplate_83ED5C4,
+    &gSpriteTemplate_83ED5C4,
+    &gSpriteTemplate_83ED60C,
+    &gSpriteTemplate_83ED60C,
+    &gSpriteTemplate_83ED60C,
+    &gSpriteTemplate_83ED60C,
+    &gSpriteTemplate_83ED60C,
+    &gSpriteTemplate_83ED624,
+    &gSpriteTemplate_83ED624,
+    &gSpriteTemplate_83ED624,
+    &gSpriteTemplate_83ED63C,
+    &gSpriteTemplate_83ED63C,
+    &gSpriteTemplate_83ED63C,
+    &gDummySpriteTemplate
+};
+
+const struct SubspriteTable *const gUnknown_083EDBC4[] = {
+    gSubspriteTables_83ED804,
+    gSubspriteTables_83ED82C,
+    gSubspriteTables_83ED854,
+    gSubspriteTables_83ED8B4,
+    NULL,
+    NULL,
+    gSubspriteTables_83ED8CC,
+    NULL,
+    gSubspriteTables_83ED93C,
+    gSubspriteTables_83ED95C,
+    gSubspriteTables_83ED974,
+    gSubspriteTables_83ED98C,
+    gSubspriteTables_83ED9A4,
+    gSubspriteTables_83ED9BC,
+    gSubspriteTables_83ED9D4,
+    gSubspriteTables_83ED9EC,
+    gSubspriteTables_83EDA04,
+    gSubspriteTables_83EDA1C,
+    gSubspriteTables_83EDA34,
+    gSubspriteTables_83EDA6C,
+    gSubspriteTables_83EDA8C,
+    gSubspriteTables_83EDAC4,
+    gSubspriteTables_83EDAFC,
+    gSubspriteTables_83EDB1C,
+    gSubspriteTables_83EDB54,
+    NULL
+};
+
+const struct SpriteSheet gUnknown_083EDC2C[] = {
+    {gSlotMachineReelSymbol1Tiles, 0x200, 0},
+    {gSlotMachineReelSymbol2Tiles, 0x200, 1},
+    {gSlotMachineReelSymbol3Tiles, 0x200, 2},
+    {gSlotMachineReelSymbol4Tiles, 0x200, 3},
+    {gSlotMachineReelSymbol5Tiles, 0x200, 4},
+    {gSlotMachineReelSymbol6Tiles, 0x200, 5},
+    {gSlotMachineReelSymbol7Tiles, 0x200, 6},
+    {gSlotMachineNumber0Tiles, 0x40, 7},
+    {gSlotMachineNumber1Tiles, 0x40, 8},
+    {gSlotMachineNumber2Tiles, 0x40, 9},
+    {gSlotMachineNumber3Tiles, 0x40, 10},
+    {gSlotMachineNumber4Tiles, 0x40, 11},
+    {gSlotMachineNumber5Tiles, 0x40, 12},
+    {gSlotMachineNumber6Tiles, 0x40, 13},
+    {gSlotMachineNumber7Tiles, 0x40, 14},
+    {gSlotMachineNumber8Tiles, 0x40, 15},
+    {gSlotMachineNumber9Tiles, 0x40, 16},
+    {ewram10000 + 0x0A00, 0x200, 18},
+    {ewram10000 + 0x1400, 0x200, 19},
+    {ewram10000 + 0x1600, 0x300, 20},
+    {ewram10000 + 0x1900, 0x300, 21},
+    {}
+};
+
+const struct SpriteSheet gUnknown_083EDCDC = {
+    ewram10000 + 0x0000, 0x800, 17
+};
+
+const u8 *const gUnknown_083EDCE4 = gUnknownPalette_08E997E8;
+
+#ifdef SAPPHIRE
+const u16 UnknownPalette_83EDCE8[] = INCBIN_U16("graphics/unknown/sapphire_83EDD40.gbapal");
+#elif defined(RUBY)
+const u16 UnknownPalette_83EDCE8[] = INCBIN_U16("graphics/unknown/ruby_83EDCE8.gbapal");
+#endif // RS
+
+const u16 *const gUnknown_083EDD08[] = {
+    UnknownPalette_83EDCE8 + 10,
+    UnknownPalette_83EDCE8 + 11,
+    UnknownPalette_83EDCE8 + 12,
+    UnknownPalette_83EDCE8 + 13,
+    UnknownPalette_83EDCE8 + 14
+};