add more debug things

5 files changed, 47 insertions, 47 deletions

diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c
index 1d36d528f..b86fa0abf 100644
--- a/src/debug/nakamura_debug_menu.c
+++ b/src/debug/nakamura_debug_menu.c
@@ -2237,7 +2237,7 @@ void debug_sub_815FFDC()
         "	mov	r0, #0xf\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0xff\n"
-        "	bl	unref_sub_80F924C\n"
+        "	bl	PrintTriangleCursorWithPalette\n"
         "	ldr	r1, ._217 + 4\n"
         "	ldr	r0, ._217 + 8\n"
         "	str	r0, [r1]\n"
@@ -2831,7 +2831,7 @@ void debug_sub_81603B8()
         "	lsl	r1, r1, #0x18\n"
         "	lsr	r1, r1, #0x18\n"
         "	mov	r2, #0xff\n"
-        "	bl	unref_sub_80F924C\n"
+        "	bl	PrintTriangleCursorWithPalette\n"
         "	pop	{r4, r5, r6, r7}\n"
         "	pop	{r0}\n"
         "	bx	r0\n"
@@ -3206,7 +3206,7 @@ void debug_sub_8160714()
         "	lsr	r1, r1, #0x18\n"
         "	mov	r0, r9\n"
         "	str	r2, [sp, #0xc]\n"
-        "	bl	sub_810CA9C\n"
+        "	bl	GetPokeblockData\n"
         "	add	r1, r0, #0\n"
         "	lsl	r0, r5, #0x1\n"
         "	add r0, r0, sp\n"
diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c
index f929170fd..766137871 100644
--- a/src/debug/nohara_debug_menu.c
+++ b/src/debug/nohara_debug_menu.c
@@ -2177,7 +2177,7 @@ void NoharaDebugMenu_SootopolisCity()
         "	mov	r0, #0x71\n"
         "	bl	FlagSet\n"
         "	ldr	r0, ._227\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "	bl	CloseMenu\n"
         "	mov	r0, #0x1\n"
         "	pop	{r1}\n"
@@ -2196,7 +2196,7 @@ void NoharaDebugMenu_Embark()
     asm(
         "	push	{lr}\n"
         "	ldr	r0, ._229\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "	ldr	r0, ._229 + 4\n"
         "	mov	r1, #0x1\n"
         "	bl	VarSet\n"
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index 6f9f0d02c..e4ae404e2 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -170,7 +170,7 @@ void debug_sub_8076BB4()
         "	add	r2, r2, #0x4\n"
         "	add	r0, r0, r2\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gScriptFuncs_End+0x3cf4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
         "	b	._24\n"
         "._14:\n"
         "	.align	2, 0\n"
@@ -886,7 +886,7 @@ void DebugMenu_8077020()
         "	lsr	r4, r0, #0x18\n"
         "	ldr	r0, ._109\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gScriptFuncs_End+0x3cf4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x18\n"
         "	cmp	r0, #0x1\n"
@@ -1058,7 +1058,7 @@ void DebugMenu_807709C()
         "	add	r1, r1, #0x4\n"
         "	add	r0, r0, r1\n"
         "	ldr	r0, [r0]\n"
-        "	bl	gScriptFuncs_End+0x3cf4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf4\n"
         "	lsl	r0, r0, #0x18\n"
         "	lsr	r0, r0, #0x18\n"
         "	b	._132\n"
@@ -1185,18 +1185,18 @@ void DebugMenu_8077238()
         "	ldr	r1, ._139\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x2\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, sp, #0x4\n"
         "	mov	r9, r0\n"
         "	ldr	r1, ._139 + 4\n"
         "	mov	r2, #0x3\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r1, sp, #0x8\n"
         "	mov	sl, r1\n"
         "	ldr	r1, ._139 + 8\n"
         "	mov	r0, sl\n"
         "	mov	r2, #0x3\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	mov	r2, #0x0\n"
         "	str	r2, [sp, #0x14]\n"
         "	add	r4, sp, #0x10\n"
@@ -1930,7 +1930,7 @@ void DebugMenu_80776B4()
         "	ldr	r1, ._183\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x7\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	lsl	r3, r4, #0x1\n"
         "	lsl	r5, r4, #0x19\n"
         "	lsr	r5, r5, #0x18\n"
@@ -1973,7 +1973,7 @@ void DebugMenu_8077704()
         "	ldr	r1, ._185\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x11\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	mov	r0, #0x13\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x1d\n"
@@ -2172,7 +2172,7 @@ void DebugMenu_807786C()
         "	ldr	r1, ._205\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x7\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	mov	r0, #0x19\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x1d\n"
@@ -2871,7 +2871,7 @@ void DebugMenu_8077C3C()
         "	add	r0, r2, #0\n"
         "	mov	r1, #0xa\n"
         "	str	r3, [sp]\n"
-        "	bl	gScriptFuncs_End+0x3d30\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x3d30\n"
         "	add	r2, r0, #0\n"
         "	ldr	r3, [sp]\n"
         "	cmp	r4, r6\n"
@@ -3983,7 +3983,7 @@ void DebugMenu_80783C8()
         "	.word	0x804\n"
         "._381:\n"
         "	add	r0, r4, #0\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "	mov	r0, #0x1\n"
         "	bl	DebugMenu_807786C\n"
         "._382:\n"
@@ -4075,7 +4075,7 @@ void DebugMenu_8078464()
         "	b	._401\n"
         "._392:\n"
         "	add	r0, r4, #0\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "	b	._401\n"
         "._398:\n"
         "	add	r0, r4, #0\n"
@@ -5578,7 +5578,7 @@ void DebugMenu_8078E04()
         "	lsr	r4, r0, #0x10\n"
         "	add	r0, r4, #0\n"
         "	add	r1, r6, #0\n"
-        "	bl	gScriptFuncs_End+0x2f60\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x2f60\n"
         "	cmp	r0, #0\n"
         "	bne	._576	@cond_branch\n"
         "	mov	r0, #0x80\n"
@@ -5611,13 +5611,13 @@ void DebugMenu_8078E40()
         "	add	r6, r2, #0\n"
         "	lsl	r4, r4, #0x18\n"
         "	lsr	r4, r4, #0x18\n"
-        "	bl	gScriptFuncs_End+0x19f4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x19f4\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	gScriptFuncs_End+0x1a70\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x1a70\n"
         "	add	r0, r4, #0\n"
         "	pop	{r4, r5, r6}\n"
         "	pop	{r1}\n"
@@ -5637,7 +5637,7 @@ void DebugMenu_8078E68()
         "	lsr	r0, r0, #0x18\n"
         "	mov	r1, #0x0\n"
         "	add	r2, r4, #0\n"
-        "	bl	gScriptFuncs_End+0x2d64\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x2d64\n"
         "	pop	{r4}\n"
         "	pop	{r0}\n"
         "	bx	r0\n"
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index cc2bdd80e..2d9074d19 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -2197,7 +2197,7 @@ void debug_sub_808C714()
         "	.word	gUnknown_Debug_083C31DC+0xa\n"
         "._189:\n"
         "	add	r0, r4, #0\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "._190:\n"
         "	pop	{r4}\n"
         "	pop	{r0}\n"
@@ -2857,7 +2857,7 @@ void debug_sub_808CBC0()
         "	.word	gUnknown_Debug_083C2710+0xa\n"
         "._229:\n"
         "	add	r0, r4, #0\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "._230:\n"
         "	pop	{r4}\n"
         "	pop	{r0}\n"
@@ -3235,7 +3235,7 @@ void debug_sub_808CE5C()
         "	.word	gUnknown_Debug_083C1C34+0x4\n"
         "._257:\n"
         "	add	r0, r4, #0\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "._258:\n"
         "	pop	{r4}\n"
         "	pop	{r0}\n"
@@ -3895,7 +3895,7 @@ void debug_sub_808D308()
         "	.word	gUnknown_Debug_083C19C6\n"
         "._297:\n"
         "	add	r0, r4, #0\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "._298:\n"
         "	pop	{r4}\n"
         "	pop	{r0}\n"
@@ -4226,7 +4226,7 @@ void debug_sub_808D54C()
         "	.word	gUnknown_Debug_083C1194+0x2\n"
         "._323:\n"
         "	add	r0, r4, #0\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "._324:\n"
         "	pop	{r4}\n"
         "	pop	{r0}\n"
@@ -4557,7 +4557,7 @@ void debug_sub_808D790()
         "	.word	gUnknown_Debug_083C12D0+0x2\n"
         "._349:\n"
         "	add	r0, r4, #0\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "._350:\n"
         "	pop	{r4}\n"
         "	pop	{r0}\n"
@@ -4840,7 +4840,7 @@ void debug_sub_808D97C()
         "	.word	gUnknown_Debug_083C1AAC+0x2\n"
         "._373:\n"
         "	add	r0, r4, #0\n"
-        "	bl	FlagReset\n"
+        "	bl	FlagClear\n"
         "._374:\n"
         "	pop	{r4}\n"
         "	pop	{r0}\n"
diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c
index 70e194907..a217a0258 100644
--- a/src/debug/unk_debug_menu_3.c
+++ b/src/debug/unk_debug_menu_3.c
@@ -9,7 +9,7 @@ void debug_sub_813C404()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -37,7 +37,7 @@ void debug_sub_813C430()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -65,7 +65,7 @@ void debug_sub_813C45C()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -93,7 +93,7 @@ void debug_sub_813C488()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -119,7 +119,7 @@ void debug_sub_813C4B4()
         "	ldr	r1, ._9 + 4\n"
         "	sub	r4, r4, r1\n"
         "	add	r2, r4, #0\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r4, #0\n"
         "	pop	{r4}\n"
         "	pop	{r1}\n"
@@ -144,7 +144,7 @@ void debug_sub_813C4D4()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_81261B4\n"
@@ -172,7 +172,7 @@ void debug_sub_813C500()
         "	sub	r5, r5, r4\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r4, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -207,7 +207,7 @@ void debug_sub_813C52C()
         "	mov	r0, r8\n"
         "	add	r1, r4, #0\n"
         "	add	r2, r6, #0\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	ldr	r0, ._15 + 8\n"
         "	sub	r0, r0, r4\n"
         "	add r0, r0, r8\n"
@@ -517,7 +517,7 @@ void debug_sub_813C740()
         "	add	r0, r6, #0\n"
         "	mov	r1, r8\n"
         "	mov	r2, r9\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r5, #0\n"
         "	mov	r1, #0x19\n"
         "	mov	r2, #0x5\n"
@@ -564,7 +564,7 @@ void debug_sub_813C740()
         "	sub	r0, r0, r1\n"
         "	add	r1, r5, #0\n"
         "	mov	r2, #0x64\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	ldr	r0, ._29 + 20\n"
         "	add	r6, r6, r0\n"
         "	mov	r0, r8\n"
@@ -572,7 +572,7 @@ void debug_sub_813C740()
         "	add	r0, r6, #0\n"
         "	mov	r1, sp\n"
         "	mov	r2, #0x24\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	mov	r0, r9\n"
         "	add	sp, sp, #0x30\n"
         "	pop	{r3, r4, r5}\n"
@@ -612,7 +612,7 @@ void debug_sub_813C810()
         "	add	r0, r6, #0\n"
         "	add	r1, r5, #0\n"
         "	mov	r2, r8\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r4, #0\n"
         "	mov	r1, #0xc9\n"
         "	mov	r2, #0x15\n"
@@ -626,13 +626,13 @@ void debug_sub_813C810()
         "	sub	r0, r0, r5\n"
         "	add	r1, r4, #0\n"
         "	mov	r2, #0x64\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\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	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r5, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -672,7 +672,7 @@ void debug_sub_813C888()
         "	add	r0, r6, #0\n"
         "	add	r1, r5, #0\n"
         "	mov	r2, r8\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r4, #0\n"
         "	mov	r1, #0xc9\n"
         "	mov	r2, #0x15\n"
@@ -688,13 +688,13 @@ void debug_sub_813C888()
         "	sub	r0, r0, r5\n"
         "	add	r1, r4, #0\n"
         "	mov	r2, #0x64\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\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	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r6, #0\n"
         "	add	r1, r5, #0\n"
         "	bl	unref_sub_812620C\n"
@@ -763,7 +763,7 @@ void debug_sub_813C93C()
         "	sub	r5, r5, r6\n"
         "	add	r1, r6, #0\n"
         "	add	r2, r5, #0\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	bl	SavePlayerParty\n"
         "	bl	debug_sub_813C904\n"
         "	ldr	r1, ._37 + 8\n"
@@ -777,7 +777,7 @@ void debug_sub_813C93C()
         "	add	r0, r4, #0\n"
         "	mov	r1, sp\n"
         "	mov	r2, #0xbc\n"
-        "	bl	gScriptFuncs_End+0x5bc4\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x5bc4\n"
         "	add	r0, r5, #0\n"
         "	add	sp, sp, #0xbc\n"
         "	pop	{r4, r5, r6}\n"