data through gSpriteImageTable_83ED228

4 files changed, 147 insertions, 128 deletions

diff --git a/data/slot_machine.s b/data/slot_machine.s
index 4f9629c49..ffc54f75e 100644
--- a/data/slot_machine.s
+++ b/data/slot_machine.s
@@ -4,133 +4,6 @@
 	.section .rodata
 
 	.align 2
-gSpriteImageTable_83ED0C0:: @ 83ED0C0
-	obj_frame_tiles gSharedMem + 0x13200, 0x800
-	obj_frame_tiles gSharedMem + 0x13A00, 0x800
-	obj_frame_tiles gSharedMem + 0x14200, 0x800
-	obj_frame_tiles gSharedMem + 0x14A00, 0x800
-	obj_frame_tiles gSharedMem + 0x15200, 0x800
-
-	.align 2
-gSpriteImageTable_83ED0E8:: @ 83ED0E8
-	obj_frame_tiles gSharedMem + 0x15A00, 0x300
-
-	.align 2
-gSpriteImageTable_83ED0F0:: @ 83ED0F0
-	obj_frame_tiles gSharedMem + 0x15D00, 0x500
-
-	.align 2
-gSpriteImageTable_83ED0F8:: @ 83ED0F8
-	obj_frame_tiles gSharedMem + 0x16200, 0x600
-
-	.align 2
-gSpriteImageTable_83ED100:: @ 83ED100
-	obj_frame_tiles gSpriteImage_8E988E8, 0x80
-	obj_frame_tiles gSpriteImage_8E98968, 0x80
-	obj_frame_tiles gSpriteImage_8E989E8, 0x80
-	obj_frame_tiles gSpriteImage_8E98A68, 0x80
-	obj_frame_tiles gSpriteImage_8E98AE8, 0x80
-	obj_frame_tiles gSpriteImage_8E98B68, 0x80
-
-	.align 2
-gSpriteImageTable_83ED130:: @ 83ED130
-	obj_frame_tiles gSpriteImage_8E991E8, 0x200
-
-	.align 2
-gSpriteImageTable_83ED138:: @ 83ED138
-	obj_frame_tiles gSpriteImage_8E99808, 0x40
-
-	.align 2
-gSpriteImageTable_83ED140:: @ 83ED140
-	obj_frame_tiles gSpriteImage_8E98BE8, 0x100
-	obj_frame_tiles gSpriteImage_8E98CE8, 0x100
-
-	.align 2
-gSpriteImageTable_83ED150:: @ 83ED150
-	obj_frame_tiles gSpriteImage_8E993E8, 0x400
-
-	.align 2
-gSpriteImageTable_83ED158:: @ 83ED158
-	obj_frame_tiles gSpriteImage_8E98DE8, 0x200
-	obj_frame_tiles gSpriteImage_8E98FE8, 0x200
-
-	.align 2
-gSpriteImageTable_83ED168:: @ 83ED168
-	obj_frame_tiles gSpriteImage_8E98848, 0x20
-
-	.align 2
-gSpriteImageTable_83ED170:: @ 83ED170
-	obj_frame_tiles gSpriteImage_8E98868, 0x80
-
-	.align 2
-gSpriteImageTable_83ED178:: @ 83ED178
-	obj_frame_tiles gSharedMem + 0x10000, 0x600
-
-	.align 2
-gSpriteImageTable_83ED180:: @ 83ED180
-	obj_frame_tiles gSharedMem + 0x10600, 0x200
-
-	.align 2
-gSpriteImageTable_83ED188:: @ 83ED188
-	obj_frame_tiles gSharedMem + 0x10800, 0x200
-
-	.align 2
-gSpriteImageTable_83ED190:: @ 83ED190
-	obj_frame_tiles gSharedMem + 0x10A00, 0x200
-
-	.align 2
-gSpriteImageTable_83ED198:: @ 83ED198
-	obj_frame_tiles gSharedMem + 0x10C00, 0x300
-
-	.align 2
-gSpriteImageTable_83ED1A0:: @ 83ED1A0
-	obj_frame_tiles gSharedMem + 0x11000, 0x400
-
-	.align 2
-gSpriteImageTable_83ED1A8:: @ 83ED1A8
-	obj_frame_tiles gSharedMem + 0x11400, 0x200
-
-	.align 2
-gSpriteImageTable_83ED1B0:: @ 83ED1B0
-	obj_frame_tiles gSharedMem + 0x11600, 0x300
-
-	.align 2
-gSpriteImageTable_83ED1B8:: @ 83ED1B8
-	obj_frame_tiles gSharedMem + 0x11900, 0x300
-
-	.align 2
-gSpriteImageTable_83ED1C0:: @ 83ED1C0
-	obj_frame_tiles gSharedMem + 0x11C00, 0x200
-	obj_frame_tiles gSharedMem + 0x11E00, 0x200
-	obj_frame_tiles gSharedMem + 0x11E00, 0x200 @ is this a typo?
-
-	.align 2
-gSpriteImageTable_83ED1D8:: @ 83ED1D8
-	obj_frame_tiles gSharedMem + 0x12000, 0x280
-
-	.align 2
-gSpriteImageTable_83ED1E0:: @ 83ED1E0
-	obj_frame_tiles gSharedMem + 0x12280, 0x80
-	obj_frame_tiles gSharedMem + 0x12300, 0x80
-	obj_frame_tiles gSharedMem + 0x12380, 0x80
-	obj_frame_tiles gSharedMem + 0x12400, 0x80
-	obj_frame_tiles gSharedMem + 0x12480, 0x80
-
-	.align 2
-gSpriteImageTable_83ED208:: @ 83ED208
-	obj_frame_tiles gSharedMem + 0x12600, 0x480
-	obj_frame_tiles gSharedMem + 0x12A80, 0x480
-
-	.align 2
-gSpriteImageTable_83ED218:: @ 83ED218
-	obj_frame_tiles gSharedMem + 0x12F00, 0x180
-	obj_frame_tiles gSharedMem + 0x13080, 0x180
-
-	.align 2
-gSpriteImageTable_83ED228:: @ 83ED228
-	obj_frame_tiles gSpriteImage_8E98828, 0x20
-
-	.align 2
 gSpriteAnim_83ED230:: @ 83ED230
 	obj_image_anim_frame 0, 1
 	obj_image_anim_end
diff --git a/include/ewram.h b/include/ewram.h
index 9d3002615..7b480a0e8 100755
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -78,6 +78,7 @@ extern u8 gSharedMem[];
 #define ewram12000                      (&gSharedMem[0x12000])
 #define ewram12800                      (&gSharedMem[0x12800])
 #define ewram13000                      (&gSharedMem[0x13000])
+#define ewram13200                      (&gSharedMem[0x13200])
 #define ewram13800                      (&gSharedMem[0x13800])
 #define EWRAM_14000                     ((u8 *)(gSharedMem + 0x14000))
 #define ewram14000                      (&gSharedMem[0x14000])
diff --git a/include/graphics.h b/include/graphics.h
index 488de07c0..9db35862c 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2656,4 +2656,21 @@ extern const u8 gNamingScreenRightPointingTriangleTiles[];
 extern const u8 gNamingScreenUnderscoreTiles[];
 extern const u16 gNamingScreenPalettes[][16];
 
+extern const u8 gSpriteImage_8E988E8[];
+extern const u8 gSpriteImage_8E98968[];
+extern const u8 gSpriteImage_8E989E8[];
+extern const u8 gSpriteImage_8E98A68[];
+extern const u8 gSpriteImage_8E98AE8[];
+extern const u8 gSpriteImage_8E98B68[];
+extern const u8 gSpriteImage_8E991E8[];
+extern const u8 gSpriteImage_8E99808[];
+extern const u8 gSpriteImage_8E98BE8[];
+extern const u8 gSpriteImage_8E98CE8[];
+extern const u8 gSpriteImage_8E993E8[];
+extern const u8 gSpriteImage_8E98DE8[];
+extern const u8 gSpriteImage_8E98FE8[];
+extern const u8 gSpriteImage_8E98848[];
+extern const u8 gSpriteImage_8E98868[];
+extern const u8 gSpriteImage_8E98828[];
+
 #endif  // GUARD_GRAPHICS_H
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 1e440cba8..43eb6e53a 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -10,6 +10,7 @@
 #include "slot_machine.h"
 #include "decompress.h"
 #include "trig.h"
+#include "graphics.h"
 #include "palette.h"
 #include "task.h"
 #include "util.h"
@@ -4017,7 +4018,7 @@ void sub_81063C0(void)
 {
     sub_8106404();
     LZDecompressWram(gSlotMachineReelTimeLights_Gfx, ewram10000);
-    LZDecompressWram(gUnknown_083EDE8C, ewram10000 + 0x3200);
+    LZDecompressWram(gUnknown_083EDE8C, ewram13200);
     LoadSpriteSheets(gUnknown_083EDC2C);
     LoadSpritePalettes(gSlotMachineSpritePalettes);
 }
@@ -4511,3 +4512,130 @@ const struct OamData gOamData_83ED0B8 = {
     .paletteNum = 0,
     .affineParam = 0
 };
+
+const struct SpriteFrameImage gSpriteImageTable_83ED0C0[] = {
+    {ewram13200 + 0x0000, 0x800},
+    {ewram13200 + 0x0800, 0x800},
+    {ewram13200 + 0x1000, 0x800},
+    {ewram13200 + 0x1800, 0x800},
+    {ewram13200 + 0x2000, 0x800}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED0E8[] = {
+    {ewram13200 + 0x2800, 0x300}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED0F0[] = {
+    {ewram13200 + 0x2B00, 0x500}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED0F8[] = {
+    {ewram13200 + 0x3000, 0x600}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED100[] = {
+    {gSpriteImage_8E988E8, 0x80},
+    {gSpriteImage_8E98968, 0x80},
+    {gSpriteImage_8E989E8, 0x80},
+    {gSpriteImage_8E98A68, 0x80},
+    {gSpriteImage_8E98AE8, 0x80},
+    {gSpriteImage_8E98B68, 0x80}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED130[] = {
+    {gSpriteImage_8E991E8, 0x200}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED138[] = {
+    {gSpriteImage_8E99808, 0x40}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED140[] = {
+    {gSpriteImage_8E98BE8, 0x100},
+    {gSpriteImage_8E98CE8, 0x100}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED150[] = {
+    {gSpriteImage_8E993E8, 0x400}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED158[] = {
+    {gSpriteImage_8E98DE8, 0x200},
+    {gSpriteImage_8E98FE8, 0x200}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED168[] = {
+    {gSpriteImage_8E98848, 0x20}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED170[] = {
+    {gSpriteImage_8E98868, 0x80}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED178[] = {
+    {ewram10000 + 0x0000, 0x600}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED180[] = {
+    {ewram10000 + 0x0600, 0x200}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED188[] = {
+    {ewram10000 + 0x0800, 0x200}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED190[] = {
+    {ewram10000 + 0x0A00, 0x200}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED198[] = {
+    {ewram10000 + 0x0C00, 0x300}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED1A0[] = {
+    {ewram10000 + 0x1000, 0x400}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED1A8[] = {
+    {ewram10000 + 0x1400, 0x200}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED1B0[] = {
+    {ewram10000 + 0x1600, 0x300}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED1B8[] = {
+    {ewram10000 + 0x1900, 0x300}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED1C0[] = {
+    {ewram10000 + 0x1C00, 0x200},
+    {ewram10000 + 0x1E00, 0x200},
+    {ewram10000 + 0x1E00, 0x200} // is this a typo?
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED1D8[] = {
+    {ewram10000 + 0x2000, 0x280}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED1E0[] = {
+    {ewram10000 + 0x2280, 0x80},
+    {ewram10000 + 0x2300, 0x80},
+    {ewram10000 + 0x2380, 0x80},
+    {ewram10000 + 0x2400, 0x80},
+    {ewram10000 + 0x2480, 0x80}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED208[] = {
+    {ewram10000 + 0x2600, 0x480},
+    {ewram10000 + 0x2A80, 0x480}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED218[] = {
+    {ewram10000 + 0x2F00, 0x180},
+    {ewram10000 + 0x3080, 0x180}
+};
+
+const struct SpriteFrameImage gSpriteImageTable_83ED228[] = {
+    {gSpriteImage_8E98828, 0x20}
+};