fix false gMysteryEventScriptCmdTableEnd offsets

2 files changed, 33 insertions, 33 deletions

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"