through sub_81248F4

2 files changed, 23 insertions, 37 deletions

diff --git a/asm/region_map.s b/asm/region_map.s
index cdcfee68f..7708a9fc8 100644
--- a/asm/region_map.s
+++ b/asm/region_map.s
@@ -5,42 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_81248C0
-sub_81248C0: @ 81248C0
-	push {lr}
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81248C0
-
-	thumb_func_start sub_81248D4
-sub_81248D4: @ 81248D4
-	push {lr}
-	ldr r0, =gUnknown_0203A148
-	ldr r0, [r0]
-	ldr r0, [r0]
-	bl _call_via_r0
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl do_scheduled_bg_tilemap_copies_to_vram
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81248D4
-
-	thumb_func_start sub_81248F4
-sub_81248F4: @ 81248F4
-	ldr r1, =gUnknown_0203A148
-	ldr r1, [r1]
-	str r0, [r1]
-	movs r0, 0
-	strh r0, [r1, 0x4]
-	bx lr
-	.pool
-	thumb_func_end sub_81248F4
-
 	thumb_func_start sub_8124904
 sub_8124904: @ 8124904
 	push {r4-r7,lr}
diff --git a/src/region_map.c b/src/region_map.c
index 14bf9a6b0..15de369b9 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -41,7 +41,8 @@ struct RegionMapLocation
 
 EWRAM_DATA struct RegionMap *gRegionMap = NULL;
 EWRAM_DATA struct {
-    /*0x000*/ u8 filler_000[0x6];
+    /*0x000*/ void (*unk_000)(void);
+    /*0x004*/ u16 unk_004;
     /*0x006*/ u16 mapSecId;
     /*0x008*/ struct RegionMap regionMap;
     /*0x88c*/ u8 filler_88c[0x1c0];
@@ -1373,3 +1374,24 @@ void MCB2_FlyMap(void)
             break;
     }
 }
+
+void sub_81248C0(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_81248D4(void)
+{
+    gUnknown_0203A148->unk_000();
+    AnimateSprites();
+    BuildOamBuffer();
+    do_scheduled_bg_tilemap_copies_to_vram();
+}
+
+void sub_81248F4(void callback(void))
+{
+    gUnknown_0203A148->unk_000 = callback;
+    gUnknown_0203A148->unk_004 = 0;
+}