fix false gMysteryEventScriptCmdTableEnd offsets

19 files changed, 128 insertions, 128 deletions

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 478499ad7..41d00546d 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -220,7 +220,7 @@ void InitBattle(void)
         "	lsl	r1, r1, #0x13\n"
         "	ldr	r2, ._10\n"
         "	mov	r0, sp\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cb4\n"
+        "	bl	CpuSet\n"
         "	ldr	r0, ._10 + 4\n"
         "	strh	r4, [r0]\n"
         "	sub	r0, r0, #0xc\n"
@@ -907,7 +907,7 @@ void sub_800EC9C()
         "	ldr	r2, ._116 + 4\n"
         "	add	r1, r1, r2\n"
         "	mov	r2, #0xc8\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	b	._129\n"
         "._117:\n"
         "	.align	2, 0\n"
@@ -946,7 +946,7 @@ void sub_800EC9C()
         "	ldr	r2, ._126 + 4\n"
         "	add	r1, r1, r2\n"
         "	mov	r2, #0xc8\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	b	._129\n"
         "._127:\n"
         "	.align	2, 0\n"
@@ -982,7 +982,7 @@ void sub_800EC9C()
         "	add	r1, r1, r0\n"
         "	add	r0, r4, #0\n"
         "	mov	r2, #0xc8\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	ldr	r1, ._134 + 8\n"
         "	add	r0, r4, r1\n"
         "	bl	shedinja_something\n"
@@ -1407,7 +1407,7 @@ void sub_800F104()
         "	add	r1, r1, r0\n"
         "	ldr	r0, ._177 + 4\n"
         "	mov	r2, #0x60\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "._174:\n"
         "	add	r7, r7, #0x1c\n"
         "	add	r4, r4, #0x1\n"
@@ -1781,7 +1781,7 @@ void sub_800F298()
         "	ldr	r1, ._239 + 4\n"
         "	mov	r2, #0x96\n"
         "	lsl	r2, r2, #0x1\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	ldr	r0, ._239 + 8\n"
         "	mov	r1, #0x0\n"
         "	bl	CreateTask\n"
@@ -2018,7 +2018,7 @@ void sub_800F298()
         "._283:\n"
         "	add	r1, r5, #0\n"
         "	mov	r2, #0xc8\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	b	._291\n"
         "._293:\n"
         "	.align	2, 0\n"
@@ -2028,7 +2028,7 @@ void sub_800F298()
         "	ldr	r0, ._296\n"
         "	add	r1, r5, #0\n"
         "	mov	r2, #0xc8\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "._291:\n"
         "	mov	r0, #0x80\n"
         "	lsl	r0, r0, #0x1\n"
@@ -2185,7 +2185,7 @@ void sub_800F298()
         "._333:\n"
         "	add	r1, r5, #0\n"
         "	mov	r2, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	b	._341\n"
         "._343:\n"
         "	.align	2, 0\n"
@@ -2195,7 +2195,7 @@ void sub_800F298()
         "	ldr	r0, ._346\n"
         "	add	r1, r5, #0\n"
         "	mov	r2, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "._341:\n"
         "	mov	r0, #0x80\n"
         "	lsl	r0, r0, #0x1\n"
@@ -2627,7 +2627,7 @@ void BattleMainCB2(void)
         "	str	r0, [r4]\n"
         "	bl	ZeroEnemyPartyMons\n"
         "	mov	r0, #0x5a\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x148c\n"
+        "	bl	m4aSongNumStop\n"
         "	ldr	r0, ._358 + 24\n"
         "	ldrh	r1, [r0]\n"
         "	mov	r0, #0x2\n"
@@ -3197,7 +3197,7 @@ void debug_sub_80108B8()
     asm(
         "	push	{r4, r5, lr}\n"
         "	add	sp, sp, #0xfffffffc\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x19f4\n"
+        "	bl	m4aSoundVSyncOff\n"
         "	mov	r0, #0x0\n"
         "	bl	SetHBlankCallback\n"
         "	mov	r0, #0x0\n"
@@ -3264,7 +3264,7 @@ void debug_sub_80108B8()
         "	ldr	r1, ._507 + 72\n"
         "	add	r0, r4, #0\n"
         "	bl	LZDecompressVram\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x1a70\n"
+        "	bl	m4aSoundVSyncOn\n"
         "	ldr	r0, ._507 + 76\n"
         "	bl	SetVBlankCallback\n"
         "	ldr	r0, ._507 + 80\n"
@@ -3860,7 +3860,7 @@ void debug_sub_8010CAC()
         "	strb	r0, [r3, #0x15]\n"
         "	lsl	r0, r0, #0x1f\n"
         "	lsr	r0, r0, #0x1f\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x2aa0\n"
+        "	bl	SetPokemonCryStereo\n"
         "	bl	debug_nullsub_3\n"
         "._559:\n"
         "	ldr	r4, ._565 + 12\n"
@@ -4774,7 +4774,7 @@ void debug_sub_8011498()
         "	lsl	r4, r4, #0x1\n"
         "	mov	r0, r9\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x4358\n"
+        "	bl	__udivsi3\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x15\n"
         "	add	r4, r4, r0\n"
@@ -4830,7 +4830,7 @@ void debug_sub_8011498()
         "	lsl	r4, r4, #0x1\n"
         "	mov	r0, r9\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x4358\n"
+        "	bl	__udivsi3\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x15\n"
         "	add	r4, r4, r0\n"
@@ -4886,7 +4886,7 @@ void debug_sub_8011498()
         "	lsl	r4, r4, #0x1\n"
         "	mov	r0, r9\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x4358\n"
+        "	bl	__udivsi3\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x15\n"
         "	add	r4, r4, r0\n"
@@ -4929,7 +4929,7 @@ void debug_sub_8011498()
         "	lsl	r4, r5, #0x1\n"
         "	mov	r0, r9\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x4358\n"
+        "	bl	__udivsi3\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x15\n"
         "	add	r4, r4, r0\n"
@@ -4965,7 +4965,7 @@ void debug_sub_8011498()
         "	lsl	r4, r4, #0x1\n"
         "	mov	r0, r9\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x4358\n"
+        "	bl	__udivsi3\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x15\n"
         "	add	r4, r4, r0\n"
@@ -5002,7 +5002,7 @@ void debug_sub_8011498()
         "	lsl	r4, r5, #0x1\n"
         "	mov	r0, r9\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x4358\n"
+        "	bl	__udivsi3\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x15\n"
         "	add	r4, r4, r0\n"
@@ -5200,7 +5200,7 @@ void debug_sub_801174C()
         "._713:\n"
         "	add	r0, r7, #0\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	mov	r3, #0x64\n"
         "	mul	r0, r0, r3\n"
         "	ldr	r1, ._719\n"
@@ -5223,7 +5223,7 @@ void debug_sub_801174C()
         "._699:\n"
         "	add	r0, r7, #0\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	mov	r2, #0x64\n"
         "	add	r1, r0, #0\n"
         "	mul	r1, r1, r2\n"
@@ -5282,7 +5282,7 @@ void debug_sub_801174C()
         "	str	r0, [sp, #0xc]\n"
         "	add	r0, r7, #0\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	mov	r3, #0x64\n"
         "	mul	r0, r0, r3\n"
         "	ldr	r1, ._726\n"
@@ -5355,7 +5355,7 @@ void debug_sub_801174C()
         "._735:\n"
         "	add	r0, r7, #0\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	mov	r2, #0x64\n"
         "	mul	r0, r0, r2\n"
         "	ldr	r1, ._741\n"
@@ -5382,7 +5382,7 @@ void debug_sub_801174C()
         "._721:\n"
         "	add	r0, r7, #0\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	mov	r2, #0x64\n"
         "	add	r1, r0, #0\n"
         "	mul	r1, r1, r2\n"
@@ -5441,7 +5441,7 @@ void debug_sub_801174C()
         "	str	r0, [sp, #0xc]\n"
         "	add	r0, r7, #0\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	mov	r2, #0x64\n"
         "	mul	r0, r0, r2\n"
         "	ldr	r1, ._750\n"
@@ -5460,7 +5460,7 @@ void debug_sub_801174C()
         "	ble	._743	@cond_branch\n"
         "	add	r0, r7, #0\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	mov	r3, #0x64\n"
         "	mul	r0, r0, r3\n"
         "	ldr	r1, ._750\n"
@@ -6483,7 +6483,7 @@ void debug_sub_8012294()
         "	lsl	r4, r4, #0x1\n"
         "	add	r0, r5, #0\n"
         "	mov	r1, #0x5\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x4358\n"
+        "	bl	__udivsi3\n"
         "	add	r5, r0, #0\n"
         "	lsl	r5, r5, #0x18\n"
         "	lsr	r5, r5, #0x15\n"
@@ -7102,7 +7102,7 @@ void debug_sub_8012688()
         "	bl	SetHBlankCallback\n"
         "	ldr	r0, ._873 + 100\n"
         "	bl	SetVBlankCallback\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x14f4\n"
+        "	bl	m4aMPlayAllStop\n"
         "	ldr	r0, ._873 + 104\n"
         "	mov	r1, #0x0\n"
         "	bl	CreateTask\n"
@@ -8484,7 +8484,7 @@ void debug_sub_8013240()
 {
     asm(
         "	push	{lr}\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x2fec\n"
+        "	bl	IdentifyFlash\n"
         "	lsl	r0, r0, #0x10\n"
         "	cmp	r0, #0\n"
         "	beq	._1068	@cond_branch\n"
@@ -8519,7 +8519,7 @@ void debug_sub_8013258()
         "	lsr	r4, r0, #0x10\n"
         "	add	r0, r4, #0\n"
         "	add	r1, r6, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x2f60\n"
+        "	bl	ProgramFlashSectorAndVerify\n"
         "	cmp	r0, #0\n"
         "	bne	._1071	@cond_branch\n"
         "	mov	r0, #0x80\n"
@@ -8555,13 +8555,13 @@ void debug_sub_8013294()
         "	lsl	r0, r0, #0x18\n"
         "	cmp	r0, #0\n"
         "	bne	._1076	@cond_branch\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x19f4\n"
+        "	bl	m4aSoundVSyncOff\n"
         "	add	r0, r4, #0\n"
         "	add	r1, r5, #0\n"
         "	add	r2, r6, #0\n"
         "	bl	debug_sub_8013258\n"
         "	add	r4, r0, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x1a70\n"
+        "	bl	m4aSoundVSyncOn\n"
         "	add	r0, r4, #0\n"
         "	b	._1077\n"
         "._1076:\n"
@@ -8591,7 +8591,7 @@ void debug_sub_80132C8()
         "	mov	r1, #0x0\n"
         "	add	r2, r5, #0\n"
         "	add	r3, r6, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x2d64\n"
+        "	bl	ReadFlash\n"
         "._1078:\n"
         "	pop	{r4, r5, r6}\n"
         "	pop	{r0}\n"
@@ -9066,7 +9066,7 @@ void debug_sub_80139E4()
         "._1193:\n"
         "	ldr	r0, ._1198 + 12\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
+        "	bl	_call_via_r0\n"
         "	ldr	r1, ._1198 + 4\n"
         "	mov	r0, #0x0\n"
         "	strb	r0, [r1]\n"
@@ -9081,7 +9081,7 @@ void debug_sub_80139E4()
         "	lsl	r0, r0, #0x2\n"
         "	add	r0, r0, r5\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
+        "	bl	_call_via_r0\n"
         "	ldrb	r0, [r4]\n"
         "	add	r0, r0, #0x1\n"
         "	strb	r0, [r4]\n"
@@ -9103,7 +9103,7 @@ void debug_sub_80139E4()
         "._1192:\n"
         "	ldr	r0, ._1202\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
+        "	bl	_call_via_r0\n"
         "	ldr	r1, ._1202 + 4\n"
         "	strb	r4, [r1]\n"
         "	ldr	r0, ._1202 + 8\n"
@@ -9117,7 +9117,7 @@ void debug_sub_80139E4()
         "	lsl	r0, r0, #0x2\n"
         "	add	r0, r0, r5\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
+        "	bl	_call_via_r0\n"
         "	ldrb	r0, [r4]\n"
         "	add	r0, r0, #0x1\n"
         "	strb	r0, [r4]\n"
@@ -9339,7 +9339,7 @@ void sub_8010874()
         "	mov	r0, #0x64\n"
         "	mul	r0, r0, r1\n"
         "	ldr	r1, ._1215 + 160\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	ldr	r2, ._1215 + 164\n"
         "	add	r1, r4, r2\n"
         "	strb	r0, [r1]\n"
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 038b4f5cf..3415d9337 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -5111,7 +5111,7 @@ static void atk15_seteffectwithchance(void)
 	lsl	r0, r0, #0x10\n\
 	lsr	r0, r0, #0x10\n\
 	mov	r1, #0x64\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x43d0\n\
+	bl	__umodsi3\n\
 	lsl	r0, r0, #0x10\n\
 	lsr	r0, r0, #0x10\n\
 	cmp	r0, r4\n\
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 7e3655e4a..cbca4a586 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -2234,7 +2234,7 @@ void debug_sub_803107C(void)
 	mov	r7, #0x0\n\
 	ldr	r0, ._369\n\
 	ldr	r0, [r0]\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n\
+	bl	_call_via_r0\n\
 	ldr	r0, ._369 + 4\n\
 	ldrb	r0, [r0]\n\
 	cmp	r0, #0\n\
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index 1b6240159..b703bc7b8 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -1405,7 +1405,7 @@ void sub_804454C()
         "	add	r1, r1, r0\n"
         "	mov	r0, sp\n"
         "	ldr	r2, ._150 + 36\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cb4\n"
+        "	bl	CpuSet\n"
         "	ldrb	r4, [r5]\n"
         "	ldrh	r0, [r7]\n"
         "	mov	r1, sl\n"
@@ -1467,7 +1467,7 @@ void sub_804454C()
         "	ldr	r2, ._153 + 4\n"
         "	add	r1, r1, r2\n"
         "	ldr	r2, ._153 + 8\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cb4\n"
+        "	bl	CpuSet\n"
         "	b	._163\n"
         "._154:\n"
         "	.align	2, 0\n"
@@ -1521,7 +1521,7 @@ void sub_804454C()
         "	add	r1, r1, r6\n"
         "	mov	r0, sp\n"
         "	ldr	r2, ._161 + 4\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cb4\n"
+        "	bl	CpuSet\n"
         "	ldrb	r4, [r5]\n"
         "	ldrh	r0, [r7]\n"
         "	mov	r1, sl\n"
diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c
index 8dae98b66..817382911 100644
--- a/src/battle/battle_util.c
+++ b/src/battle/battle_util.c
@@ -2407,7 +2407,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
 	lsl	r0, r0, #0x10\n\
 	lsr	r0, r0, #0x10\n\
 	mov	r1, #0x3\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x43d0\n\
+	bl	__umodsi3\n\
 	lsl	r0, r0, #0x10\n\
 	lsr	r4, r0, #0x10\n\
 	cmp	r4, #0\n\
@@ -3332,7 +3332,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
 	lsl	r0, r0, #0x10\n\
 	lsr	r0, r0, #0x10\n\
 	mov	r1, #0xa\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x43d0\n\
+	bl	__umodsi3\n\
 	lsl	r0, r0, #0x10\n\
 	cmp	r0, #0\n\
 	beq	._1091	@cond_branch\n\
@@ -3542,7 +3542,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
 	lsl	r0, r0, #0x10\n\
 	lsr	r0, r0, #0x10\n\
 	mov	r1, #0x3\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x43d0\n\
+	bl	__umodsi3\n\
 	lsl	r0, r0, #0x10\n\
 	cmp	r0, #0\n\
 	beq	._1124	@cond_branch\n\
@@ -3737,7 +3737,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
 	lsl	r0, r0, #0x10\n\
 	lsr	r0, r0, #0x10\n\
 	mov	r1, #0x3\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x43d0\n\
+	bl	__umodsi3\n\
 	lsl	r0, r0, #0x10\n\
 	cmp	r0, #0\n\
 	beq	._1155	@cond_branch\n\
@@ -3932,7 +3932,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
 	lsl	r0, r0, #0x10\n\
 	lsr	r0, r0, #0x10\n\
 	mov	r1, #0x3\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x43d0\n\
+	bl	__umodsi3\n\
 	lsl	r0, r0, #0x10\n\
 	cmp	r0, #0\n\
 	beq	._1186	@cond_branch\n\
@@ -4204,7 +4204,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
 	lsl	r0, r0, #0x10\n\
 	lsr	r0, r0, #0x10\n\
 	mov	r1, #0x3\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x43d0\n\
+	bl	__umodsi3\n\
 	lsl	r0, r0, #0x10\n\
 	cmp	r0, #0\n\
 	beq	._1232	@cond_branch\n\
diff --git a/src/contest.c b/src/contest.c
index 20e202d80..834d641d0 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -1392,7 +1392,7 @@ void debug_sub_80BA054()
 	mov	r0, r9\n\
 	mov	r1, #0x0\n\
 	mov	r2, #0x14\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x5c24\n\
+	bl	memset\n\
 	ldr	r4, ._262 + 8\n\
 	ldrb	r0, [r4]\n\
 	bl	sub_80B28F0\n\
@@ -1505,7 +1505,7 @@ void debug_sub_80BA054()
 ._241:\n\
 	ldr	r0, ._273\n\
 	ldr	r0, [r0]\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n\
+	bl	_call_via_r0\n\
 	ldr	r0, ._273 + 4\n\
 	ldrb	r4, [r0]\n\
 	cmp	r4, #0\n\
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index 572251fb4..d9f14a6b8 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -172,7 +172,7 @@ void debug_sub_8076BB4()
         "	add	r2, r2, #0x4\n"
         "	add	r0, r0, r2\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
+        "	bl	_call_via_r0\n"
         "	b	._24\n"
         "._14:\n"
         "	.align	2, 0\n"
@@ -888,7 +888,7 @@ void DebugMenu_8077020()
         "	lsr	r4, r0, #0x18\n"
         "	ldr	r0, ._109\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
+        "	bl	_call_via_r0\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x18\n"
         "	cmp	r0, #0x1\n"
@@ -1060,7 +1060,7 @@ void DebugMenu_807709C()
         "	add	r1, r1, #0x4\n"
         "	add	r0, r0, r1\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
+        "	bl	_call_via_r0\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x18\n"
         "	b	._132\n"
@@ -1187,18 +1187,18 @@ void DebugMenu_8077238()
         "	ldr	r1, ._139\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x2\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, sp, #0x4\n"
         "	mov	r9, r0\n"
         "	ldr	r1, ._139 + 4\n"
         "	mov	r2, #0x3\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r1, sp, #0x8\n"
         "	mov	sl, r1\n"
         "	ldr	r1, ._139 + 8\n"
         "	mov	r0, sl\n"
         "	mov	r2, #0x3\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	mov	r2, #0x0\n"
         "	str	r2, [sp, #0x14]\n"
         "	add	r4, sp, #0x10\n"
@@ -1932,7 +1932,7 @@ void DebugMenu_80776B4()
         "	ldr	r1, ._183\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x7\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	lsl	r3, r4, #0x1\n"
         "	lsl	r5, r4, #0x19\n"
         "	lsr	r5, r5, #0x18\n"
@@ -1975,7 +1975,7 @@ void DebugMenu_8077704()
         "	ldr	r1, ._185\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x11\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	mov	r0, #0x13\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x1d\n"
@@ -2174,7 +2174,7 @@ void DebugMenu_807786C()
         "	ldr	r1, ._205\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x7\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	mov	r0, #0x19\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x1d\n"
@@ -2873,7 +2873,7 @@ void DebugMenu_8077C3C()
         "	add	r0, r2, #0\n"
         "	mov	r1, #0xa\n"
         "	str	r3, [sp]\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	add	r2, r0, #0\n"
         "	ldr	r3, [sp]\n"
         "	cmp	r4, r6\n"
@@ -5580,7 +5580,7 @@ void DebugMenu_8078E04()
         "	lsr	r4, r0, #0x10\n"
         "	add	r0, r4, #0\n"
         "	add	r1, r6, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x2f60\n"
+        "	bl	ProgramFlashSectorAndVerify\n"
         "	cmp	r0, #0\n"
         "	bne	._576	@cond_branch\n"
         "	mov	r0, #0x80\n"
@@ -5613,13 +5613,13 @@ void DebugMenu_8078E40()
         "	add	r6, r2, #0\n"
         "	lsl	r4, r4, #0x18\n"
         "	lsr	r4, r4, #0x18\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x19f4\n"
+        "	bl	m4aSoundVSyncOff\n"
         "	add	r0, r4, #0\n"
         "	add	r1, r5, #0\n"
         "	add	r2, r6, #0\n"
         "	bl	DebugMenu_8078E04\n"
         "	add	r4, r0, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x1a70\n"
+        "	bl	m4aSoundVSyncOn\n"
         "	add	r0, r4, #0\n"
         "	pop	{r4, r5, r6}\n"
         "	pop	{r1}\n"
@@ -5639,7 +5639,7 @@ void DebugMenu_8078E68()
         "	lsr	r0, r0, #0x18\n"
         "	mov	r1, #0x0\n"
         "	add	r2, r4, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x2d64\n"
+        "	bl	ReadFlash\n"
         "	pop	{r4}\n"
         "	pop	{r0}\n"
         "	bx	r0\n"
diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c
index fe2e6317e..411b32fe3 100644
--- a/src/debug/unk_debug_menu_3.c
+++ b/src/debug/unk_debug_menu_3.c
@@ -14,7 +14,7 @@ int debug_sub_813C404()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -42,7 +42,7 @@ int debug_sub_813C430()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -70,7 +70,7 @@ int debug_sub_813C45C()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -98,7 +98,7 @@ int debug_sub_813C488()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -124,7 +124,7 @@ int debug_sub_813C4B4()
         "	ldr	r1, ._9 + 4\n"
         "	sub	r4, r4, r1\n"
         "	add	r2, r4, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r4, #0\n"
         "	pop	{r4}\n"
         "	pop	{r1}\n"
@@ -149,7 +149,7 @@ int debug_sub_813C4D4()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_81261B4\n"
@@ -177,7 +177,7 @@ int debug_sub_813C500()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -212,7 +212,7 @@ void debug_sub_813C52C()
         "	mov	r0, r8\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r6, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	ldr	r0, ._15 + 8\n"
         "	sub	r0, r0, r4\n"
         "	add r0, r0, r8\n"
@@ -522,7 +522,7 @@ int debug_sub_813C740()
         "	add	r0, r6, #0\n"
         "	mov	r1, r8\n"
         "	mov	r2, r9\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r5, #0\n"
         "	mov	r1, #0x19\n"
         "	mov	r2, #0x5\n"
@@ -569,7 +569,7 @@ int debug_sub_813C740()
         "	sub	r0, r0, r1\n"
         "	add	r1, r5, #0\n"
         "	mov	r2, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	ldr	r0, ._29 + 20\n"
         "	add	r6, r6, r0\n"
         "	mov	r0, r8\n"
@@ -577,7 +577,7 @@ int debug_sub_813C740()
         "	add	r0, r6, #0\n"
         "	mov	r1, sp\n"
         "	mov	r2, #0x24\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	mov	r0, r9\n"
         "	add	sp, sp, #0x30\n"
         "	pop	{r3, r4, r5}\n"
@@ -617,7 +617,7 @@ int debug_sub_813C810()
         "	add	r0, r6, #0\n"
         "	add	r1, r5, #0\n"
         "	mov	r2, r8\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r4, #0\n"
         "	mov	r1, #0xc9\n"
         "	mov	r2, #0x15\n"
@@ -631,13 +631,13 @@ int debug_sub_813C810()
         "	sub	r0, r0, r5\n"
         "	add	r1, r4, #0\n"
         "	mov	r2, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	ldr	r0, ._31 + 16\n"
         "	add	r0, r6, r0\n"
         "	sub	r0, r0, r5\n"
         "	mov	r1, sp\n"
         "	mov	r2, #0x24\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r5, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -677,7 +677,7 @@ int debug_sub_813C888()
         "	add	r0, r6, #0\n"
         "	add	r1, r5, #0\n"
         "	mov	r2, r8\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r4, #0\n"
         "	mov	r1, #0xc9\n"
         "	mov	r2, #0x15\n"
@@ -693,13 +693,13 @@ int debug_sub_813C888()
         "	sub	r0, r0, r5\n"
         "	add	r1, r4, #0\n"
         "	mov	r2, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	ldr	r0, ._33 + 16\n"
         "	add	r0, r6, r0\n"
         "	sub	r0, r0, r5\n"
         "	mov	r1, sp\n"
         "	mov	r2, #0x24\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r5, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -768,7 +768,7 @@ int debug_sub_813C93C()
         "	sub	r5, r5, r6\n"
         "	add	r1, r6, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	bl	SavePlayerParty\n"
         "	bl	debug_sub_813C904\n"
         "	ldr	r1, ._37 + 8\n"
@@ -782,7 +782,7 @@ int debug_sub_813C93C()
         "	add	r0, r4, #0\n"
         "	mov	r1, sp\n"
         "	mov	r2, #0xbc\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
+        "	bl	memcpy\n"
         "	add	r0, r5, #0\n"
         "	add	sp, sp, #0xbc\n"
         "	pop	{r4, r5, r6}\n"
diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index 656e774c5..da2973945 100644
--- a/src/engine/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
@@ -465,7 +465,7 @@ void debug_sub_815D04C()
         "	add	r1, r1, r0\n"
         "	ldr	r0, ._133 + 8\n"
         "	ldr	r1, [r1]\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf8\n"
+        "	bl	_call_via_r1\n"
         "	ldr	r0, ._133 + 12\n"
         "	add	r1, r6, r0\n"
         "	ldrb	r0, [r1]\n"
diff --git a/src/engine/save.c b/src/engine/save.c
index d11eebaac..0eb93eb1d 100644
--- a/src/engine/save.c
+++ b/src/engine/save.c
@@ -690,7 +690,7 @@ void sub_813B79C()
         "	strh	r0, [r1]\n"
         "	add	r0, r5, #0\n"
         "	add	r1, r4, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x2f60\n"
+        "	bl	ProgramFlashSectorAndVerify\n"
         "	add	r0, r5, #1\n"
         "	lsl	r0, r0, #0x10\n"
         "	lsr	r5, r0, #0x10\n"
@@ -718,7 +718,7 @@ void sub_813B79C()
         "	lsr	r4, r4, #0x10\n"
         "	add	r0, r4, #0\n"
         "	add	r1, r6, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x2f60\n"
+        "	bl	ProgramFlashSectorAndVerify\n"
         "	add	r0, r5, #1\n"
         "	lsl	r0, r0, #0x10\n"
         "	lsr	r5, r0, #0x10\n"
diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c
index 421cd0779..7902427e0 100644
--- a/src/engine/save_failed_screen.c
+++ b/src/engine/save_failed_screen.c
@@ -424,7 +424,7 @@ bool8 VerifySectorWipe(u16 sector)
         "	mov	r3, #0x80\n"
         "	lsl	r3, r3, #0x5\n"
         "	mov	r1, #0x0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x2d64\n"
+        "	bl	ReadFlash\n"
         "	mov	r0, #0x0\n"
         "	ldr	r1, ._50 + 4\n"
         "._49:\n"
diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index fd5808fc3..b2d950e35 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -540,7 +540,7 @@ void debug_sub_81381B4()
         "	add	r0, r4, #0\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x60\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x5c24\n"
+        "	bl	memset\n"
         "	mov	r7, #0x0\n"
         "	mov	r8, r4\n"
         "	mov	r0, #0x4\n"
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index 85cfdb829..c382db19f 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -291,7 +291,7 @@ u8 TryDoMetatileBehaviorForcedMovement()
         "	lsr	r0, r0, #0x16\n"
         "	add	r0, r0, r4\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
+        "	bl	_call_via_r0\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x18\n"
         "._26:\n"
@@ -513,7 +513,7 @@ void MovePlayerNotOnBike(u8 u81, u16 u161)
         "	ldr	r2, [r0]\n"
         "	add	r0, r5, #0\n"
         "	add	r1, r6, #0\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3cfc\n"
+        "	bl	_call_via_r2\n"
         "._83:\n"
         "	pop	{r4, r5, r6}\n"
         "	pop	{r0}\n"
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index 4fdb17786..4108145c1 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -989,7 +989,7 @@ bool8 InitPartyMenu(void)
 	add	r2, r2, #0x4\n\
 	add	r0, r0, r2\n\
 	ldr	r0, [r0]\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n\
+	bl	_call_via_r0\n\
 	lsl	r0, r0, #0x18\n\
 	lsr	r0, r0, #0x18\n\
 	cmp	r0, #0x1\n\
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 082e8ebc6..01e9711dc 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -1686,13 +1686,13 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c)
 	add	r0, r6, r4\n\
 	mov	r1, #0x0\n\
 	add	r2, r5, #0\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x5c24\n\
+	bl	memset\n\
 	add	r4, r4, r5\n\
 	add	r4, r6, r4\n\
 	add	r0, r4, #0\n\
 	mov	r1, #0x0\n\
 	add	r2, r5, #0\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x5c24\n\
+	bl	memset\n\
 	b	._505\n\
 ._501:\n\
 	lsl	r0, r5, #0x1\n\
@@ -1700,7 +1700,7 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c)
 	add	r0, r6, r0\n\
 	mov	r1, #0x0\n\
 	add	r2, r5, #0\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x5c24\n\
+	bl	memset\n\
 ._505:\n\
 	cmp	r7, #0x1\n\
 	beq	._506	@cond_branch\n\
diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c
index 63f1b322a..6f187ad71 100644
--- a/src/pokemon/pokemon_1.c
+++ b/src/pokemon/pokemon_1.c
@@ -646,7 +646,7 @@ void debug_sub_803F55C()
         "	ldr	r4, [sp]\n"
         "	mul	r0, r0, r4\n"
         "	mov	r1, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	add	r0, r0, r4\n"
         "	add	r0, r0, #0xa\n"
         "	str	r0, [sp, #0x4]\n"
@@ -673,7 +673,7 @@ void debug_sub_803F55C()
         "	ldr	r1, [sp]\n"
         "	mul	r0, r0, r1\n"
         "	mov	r1, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	add	r0, r0, #0x5\n"
         "	str	r0, [sp, #0x8]\n"
         "	add	r0, r5, #0\n"
@@ -705,7 +705,7 @@ void debug_sub_803F55C()
         "	ldr	r1, [sp]\n"
         "	mul	r0, r0, r1\n"
         "	mov	r1, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	add	r0, r0, #0x5\n"
         "	str	r0, [sp, #0xc]\n"
         "	add	r0, r5, #0\n"
@@ -737,7 +737,7 @@ void debug_sub_803F55C()
         "	ldr	r1, [sp]\n"
         "	mul	r0, r0, r1\n"
         "	mov	r1, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	add	r0, r0, #0x5\n"
         "	str	r0, [sp, #0x10]\n"
         "	add	r0, r5, #0\n"
@@ -769,7 +769,7 @@ void debug_sub_803F55C()
         "	ldr	r1, [sp]\n"
         "	mul	r0, r0, r1\n"
         "	mov	r1, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	add	r0, r0, #0x5\n"
         "	str	r0, [sp, #0x14]\n"
         "	add	r0, r5, #0\n"
@@ -801,7 +801,7 @@ void debug_sub_803F55C()
         "	ldr	r1, [sp]\n"
         "	mul	r0, r0, r1\n"
         "	mov	r1, #0x64\n"
-        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
+        "	bl	__divsi3\n"
         "	add	r0, r0, #0x5\n"
         "	str	r0, [sp, #0x18]\n"
         "	add	r0, r5, #0\n"
diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c
index 29973fd99..f1bded592 100644
--- a/src/pokemon/pokemon_summary_screen.c
+++ b/src/pokemon/pokemon_summary_screen.c
@@ -1042,7 +1042,7 @@ bool8 sub_809DA84(void)
 	lsl	r1, r1, #0x2\n\
 	add	r1, r1, r0\n\
 	ldr	r0, [r1]\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n\
+	bl	_call_via_r0\n\
 ._132:\n\
 	ldr	r1, ._134 + 8\n\
 	ldr	r2, ._134 + 12\n\
@@ -1071,7 +1071,7 @@ bool8 sub_809DA84(void)
 	add	r1, r1, r2\n\
 	add	r0, r0, #0x10\n\
 	ldr	r1, [r1]\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x3cf8\n\
+	bl	_call_via_r1\n\
 	ldr	r1, ._140 + 8\n\
 	ldr	r2, ._140 + 12\n\
 	add	r1, r1, r2\n\
diff --git a/src/roulette.c b/src/roulette.c
index e01f085a2..5a8d35647 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -646,10 +646,10 @@ void sub_8115384(void)
 	ldr	r0, ._47 + 16\n\
 	mov	r1, #0xc0\n\
 	lsl	r1, r1, #0x13\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x3cb8\n\
+	bl	LZ77UnCompVram\n\
 	ldr	r0, ._47 + 20\n\
 	ldr	r1, ._47 + 24\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x3cb8\n\
+	bl	LZ77UnCompVram\n\
 	ldr	r1, ._47 + 28\n\
 	ldr	r3, ._47 + 32\n\
 	add	r1, r1, r3\n\
@@ -706,10 +706,10 @@ void sub_8115384(void)
 	bl	ClearBGTilemapBuffers\n\
 	ldr	r0, ._56\n\
 	ldr	r1, ._56 + 4\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x3cbc\n\
+	bl	LZ77UnCompWram\n\
 	ldr	r0, ._56 + 8\n\
 	ldr	r1, ._56 + 12\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x3cb8\n\
+	bl	LZ77UnCompVram\n\
 	ldr	r1, ._56 + 16\n\
 	ldr	r3, ._56 + 20\n\
 	add	r1, r1, r3\n\
@@ -1051,11 +1051,11 @@ void sub_8115634(u8 unused)
 	ldr	r1, ._75 + 16\n\
 	str	r1, [r0]\n\
 	ldr	r0, ._75 + 20\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x1c08\n\
+	bl	m4aMPlayStop\n\
 	ldr	r0, ._75 + 24\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x1c08\n\
+	bl	m4aMPlayStop\n\
 	ldr	r0, ._75 + 28\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x1c08\n\
+	bl	m4aMPlayStop\n\
 ._74:\n\
 	pop	{r4, r5, r6}\n\
 	pop	{r0}\n\
@@ -2034,7 +2034,7 @@ void sub_8116B40(u8 taskid) // end roulette ?
 	mov	r2, #0xbe\n\
 	lsl	r2, r2, #0x1\n\
 	mov	r1, #0x0\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x5c24\n\
+	bl	memset\n\
 	ldr	r1, ._381 + 4\n\
 	ldr	r0, ._381 + 8\n\
 	mov	r4, #0x0\n\
@@ -4473,7 +4473,7 @@ void debug_sub_812E698()
 	add	r0, r7, #0\n\
 	bl	sub_81186B8\n\
 	mov	r0, #0x38\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x13c0\n\
+	bl	m4aSongNumStart\n\
 	bl	Random\n\
 	mov	r1, #0x1\n\
 	and	r1, r1, r0\n\
@@ -4489,7 +4489,7 @@ void debug_sub_812E698()
 	ldrb	r0, [r0]\n\
 	add	r0, r0, #0x1\n\
 	mov	r1, #0xc\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x3e40\n\
+	bl	__modsi3\n\
 	add	r1, r4, #0\n\
 	add	r1, r1, #0x7f\n\
 	strb	r0, [r1]\n\
@@ -4515,7 +4515,7 @@ void debug_sub_812E698()
 	add	r0, r0, r1\n\
 	ldr	r1, [r0]\n\
 	add	r0, r1, #0\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x54dc\n\
+	bl	__addsf3\n\
 	str	r0, [r5]\n\
 	add	r0, r6, #0\n\
 	add	r0, r0, #0x7e\n\
@@ -4845,7 +4845,7 @@ void sub_8118F8C(struct Sprite *sprite)
 	mov	r8, r0\n\
 	ldr	r0, [r0]\n\
 	ldr	r1, ._868 + 4\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x5928\n\
+	bl	__gtsf2\n\
 	cmp	r0, #0\n\
 	bgt	._874	@cond_branch\n\
 	add	r0, r6, #0\n\
@@ -4868,26 +4868,26 @@ void sub_8118F8C(struct Sprite *sprite)
 	mov	r4, #0x3\n\
 	ldsb	r4, [r0, r4]\n\
 	add	r0, r4, #0\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x5a48\n\
+	bl	__floatsisf\n\
 	add	r5, r0, #0\n\
 	cmp	r4, #0\n\
 	bge	._865	@cond_branch\n\
 	ldr	r1, ._868 + 16\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x54dc\n\
+	bl	__addsf3\n\
 	add	r5, r0, #0\n\
 ._865:\n\
 	lsr	r0, r7, #0x19\n\
 	add r0, r0, r9\n\
 	ldrb	r0, [r0, #0x4]\n\
 	add	r0, r0, #0x1\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x5a48\n\
+	bl	__floatsisf\n\
 	add	r1, r0, #0\n\
 	add	r0, r5, #0\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x56a0\n\
+	bl	__divsf3\n\
 	add	r1, r0, #0\n\
 	mov	r2, r8\n\
 	ldr	r0, [r2]\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x5508\n\
+	bl	__subsf3\n\
 	mov	r1, r8\n\
 	str	r0, [r1]\n\
 	mov	r0, #0x4\n\
@@ -4923,13 +4923,13 @@ void sub_8118F8C(struct Sprite *sprite)
 	ldr	r0, [r6]\n\
 	ldr	r4, ._875\n\
 	add	r1, r4, #0\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x58e0\n\
+	bl	__nesf2\n\
 	cmp	r0, #0\n\
 	beq	._874	@cond_branch\n\
 	mov	r2, r8\n\
 	ldr	r0, [r2]\n\
 	add	r1, r4, #0\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x59b8\n\
+	bl	__ltsf2\n\
 	cmp	r0, #0\n\
 	bge	._874	@cond_branch\n\
 	str	r4, [r6]\n\
@@ -4938,11 +4938,11 @@ void sub_8118F8C(struct Sprite *sprite)
 	add	r4, r5, #0\n\
 	add	r4, r4, #0x98\n\
 	ldr	r0, [r4]\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x5b4c\n\
+	bl	__extendsfdf2\n\
 	ldr	r2, ._875 + 4\n\
 	ldr	r3, ._875 + 8\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x4c2c\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x51e8\n\
+	bl	__divdf3\n\
+	bl	__truncdfsf2\n\
 	str	r0, [r4]\n\
 ._874:\n\
 	pop	{r3, r4}\n\
diff --git a/src/scene/cute_sketch.c b/src/scene/cute_sketch.c
index c4d9463f5..848249528 100644
--- a/src/scene/cute_sketch.c
+++ b/src/scene/cute_sketch.c
@@ -212,7 +212,7 @@ void debug_sub_8110D84(void)
 	b	._65\n\
 ._38:\n\
 	mov	r0, #0x5\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x13c0\n\
+	bl	m4aSongNumStart\n\
 	ldr	r1, ._41 + 4\n\
 	add	r0, r4, r1\n\
 	mov	r1, #0x1\n\
@@ -228,7 +228,7 @@ void debug_sub_8110D84(void)
 	.word	sub_80FC69C+1\n\
 ._36:\n\
 	mov	r0, #0x5\n\
-	bl	gMysteryEventScriptCmdTableEnd+0x13c0\n\
+	bl	m4aSongNumStart\n\
 	mov	r0, #0x1\n\
 	neg	r0, r0\n\
 	mov	r1, #0x0\n\