resolve more undefined references

5 files changed, 34 insertions, 34 deletions

diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c
index 53c6394ba..629b7b9eb 100644
--- a/src/debug/nohara_debug_menu.c
+++ b/src/debug/nohara_debug_menu.c
@@ -340,7 +340,7 @@ void debug_sub_808F5D8()
         "._29:\n"
         "	ldr	r5, ._30 + 8\n"
         "	strh	r4, [r5]\n"
-        "	bl	sub_810F424\n"
+        "	bl	GetSlotMachineId\n"
         "	add	r1, r0, #0\n"
         "	lsl	r1, r1, #0x10\n"
         "	lsr	r1, r1, #0x10\n"
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index 321bbb951..b376a4076 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -46,7 +46,7 @@ void debug_sub_8076AC8()
         "	mov	r0, #0x11\n"
         "	mov	r1, #0x1\n"
         "	add	r2, r4, #0\n"
-        "	bl	PrintMenuItemsReordered\n"
+        "	bl	Menu_PrintItemsReordered\n"
         "	mov	r0, #0x0\n"
         "	str	r0, [sp]\n"
         "	mov	r0, #0xc\n"
@@ -448,7 +448,7 @@ void DebugMenu_8076D50()
 {
     asm(
         "	push	{lr}\n"
-        "	bl	ClearSaveData\n"
+        "	bl	Save_EraseAllData\n"
         "	mov	r0, #0x0\n"
         "	pop	{r1}\n"
         "	bx	r1\n"
@@ -1105,7 +1105,7 @@ void DebugMenu_807719C()
         "	mov	r0, #0x1\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0x8\n"
-        "	bl	PrintMenuItemsReordered\n"
+        "	bl	Menu_PrintItemsReordered\n"
         "	ldr	r4, ._133 + 8\n"
         "	ldrb	r0, [r4]\n"
         "	str	r0, [sp]\n"
@@ -1698,10 +1698,10 @@ void DebugMenu_NationalDex()
         "	lsr	r4, r4, #0x10\n"
         "	add	r0, r4, #0\n"
         "	mov	r1, #0x2\n"
-        "	bl	GetNationalPokedexFlag\n"
+        "	bl	GetSetPokedexFlag\n"
         "	add	r0, r4, #0\n"
         "	mov	r1, #0x3\n"
-        "	bl	GetNationalPokedexFlag\n"
+        "	bl	GetSetPokedexFlag\n"
         "	cmp	r4, r5\n"
         "	bls	._177	@cond_branch\n"
         "	ldr	r1, ._178 + 4\n"
@@ -1738,10 +1738,10 @@ void DebugMenu_HoennDex()
         "	lsr	r4, r4, #0x10\n"
         "	add	r0, r4, #0\n"
         "	mov	r1, #0x2\n"
-        "	bl	GetNationalPokedexFlag\n"
+        "	bl	GetSetPokedexFlag\n"
         "	add	r0, r4, #0\n"
         "	mov	r1, #0x3\n"
-        "	bl	GetNationalPokedexFlag\n"
+        "	bl	GetSetPokedexFlag\n"
         "	cmp	r5, #0xc9\n"
         "	bls	._180	@cond_branch\n"
         "	ldr	r1, ._181\n"
@@ -2356,7 +2356,7 @@ void DebugMenu_8077974()
         "	asr	r1, r1, #0x18\n"
         "	lsl	r1, r1, #0x10\n"
         "	lsr	r1, r1, #0x10\n"
-        "	bl	unref_sub_8082C2C\n"
+        "	bl	IsRematchTrainerIn\n"
         "	cmp	r0, #0\n"
         "	beq	._224	@cond_branch\n"
         "	ldr	r0, ._226 + 4\n"
@@ -4670,7 +4670,7 @@ void DebugMenu_80787EC()
         "._467:\n"
         "	.align	2, 0\n"
         "._466:\n"
-        "	.word	gScriptResult\n"
+        "	.word	gSpecialVar_Result\n"
         "	.word	gStringVar1\n"
         "	.word	gStringVar2\n"
         "	.word	gStringVar3\n"
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index 842837b18..8b586deb2 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -893,7 +893,7 @@ void TayaDebugMenu_PKMNLottery()
         "	.align	2, 0\n"
         "._83:\n"
         "	.word	+0x2000000\n"
-        "	.word	gScriptResult\n"
+        "	.word	gSpecialVar_Result\n"
         "	.word	gCallback_03004AE8\n"
         "	.word	debug_sub_8090C88+1\n"
         "\n"
@@ -911,44 +911,44 @@ void TayaDebugMenu_Trainer()
         "	lsl	r0, r4, #0x4\n"
         "	add	r0, r0, r5\n"
         "	ldrh	r0, [r0]\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	add	r0, r4, #1\n"
         "	lsl	r0, r0, #0x10\n"
         "	lsr	r4, r0, #0x10\n"
         "	cmp	r4, #0x37\n"
         "	bls	._85	@cond_branch\n"
         "	ldr	r0, ._86 + 4\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	mov	r0, #0x85\n"
         "	lsl	r0, r0, #0x1\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	ldr	r0, ._86 + 8\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	mov	r0, #0x86\n"
         "	lsl	r0, r0, #0x1\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	ldr	r0, ._86 + 12\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	mov	r0, #0x87\n"
         "	lsl	r0, r0, #0x1\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	ldr	r0, ._86 + 16\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	mov	r0, #0x88\n"
         "	lsl	r0, r0, #0x1\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	ldr	r0, ._86 + 20\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	mov	r0, #0x83\n"
         "	lsl	r0, r0, #0x1\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	ldr	r0, ._86 + 24\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	mov	r0, #0x84\n"
         "	lsl	r0, r0, #0x1\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	ldr	r0, ._86 + 28\n"
-        "	bl	trainer_flag_set\n"
+        "	bl	SetTrainerFlag\n"
         "	bl	CloseMenu\n"
         "	mov	r0, #0x1\n"
         "	pop	{r4, r5}\n"
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index 2d9074d19..28bb2717d 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -5001,7 +5001,7 @@ void debug_sub_808DABC()
         "._387:\n"
         "	.align	2, 0\n"
         "._386:\n"
-        "	.word	gScriptResult\n"
+        "	.word	gSpecialVar_Result\n"
         "\n"
     );
 }
@@ -5043,7 +5043,7 @@ void debug_sub_808DAD4()
         "	.align	2, 0\n"
         "._393:\n"
         "	.word	0xffff\n"
-        "	.word	gScriptResult\n"
+        "	.word	gSpecialVar_Result\n"
         "\n"
     );
 }
diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c
index 7288f602e..b0fbebac1 100644
--- a/src/debug/watanabe_debug_menu.c
+++ b/src/debug/watanabe_debug_menu.c
@@ -116,7 +116,7 @@ void debug_80C35DC()
         "	str	r3, [r2, #0x8]\n"
         "	ldr	r0, [r2, #0x8]\n"
         "	bl	ResetPaletteFade\n"
-        "	bl	remove_some_task\n"
+        "	bl	ScanlineEffect_Stop\n"
         "	bl	ResetTasks\n"
         "	bl	ResetSpriteData\n"
         "	bl	ResetPaletteFade\n"
@@ -4289,10 +4289,10 @@ void debug_80C53F0()
         "	lsr	r4, r4, #0x10\n"
         "	add	r0, r4, #0\n"
         "	mov	r1, #0x2\n"
-        "	bl	GetNationalPokedexFlag\n"
+        "	bl	GetSetPokedexFlag\n"
         "	add	r0, r4, #0\n"
         "	mov	r1, #0x3\n"
-        "	bl	GetNationalPokedexFlag\n"
+        "	bl	GetSetPokedexFlag\n"
         "	mov	r0, #0x5\n"
         "	bl	PlaySE\n"
         "	b	._400\n"
@@ -7813,7 +7813,7 @@ void debug_80C6FA8()
         "	ldrh	r0, [r1]\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x0\n"
-        "	bl	species_and_otid_get_pal\n"
+        "	bl	GetMonSpritePal\n"
         "	ldr	r1, [r4]\n"
         "	ldrb	r1, [r1, #0x6]\n"
         "	lsl	r1, r1, #0x14\n"
@@ -7832,7 +7832,7 @@ void debug_80C6FA8()
         "	ldrh	r0, [r1]\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x9\n"
-        "	bl	species_and_otid_get_pal\n"
+        "	bl	GetMonSpritePal\n"
         "	ldr	r1, [r4]\n"
         "	ldrb	r1, [r1, #0x6]\n"
         "	lsl	r1, r1, #0x14\n"
@@ -9268,7 +9268,7 @@ void debug_80C7B14()
         "	ldrh	r0, [r1]\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x0\n"
-        "	bl	species_and_otid_get_pal\n"
+        "	bl	GetMonSpritePal\n"
         "	ldr	r1, [r4]\n"
         "	ldrb	r1, [r1, #0x6]\n"
         "	lsl	r1, r1, #0x14\n"
@@ -9287,7 +9287,7 @@ void debug_80C7B14()
         "	ldrh	r0, [r1]\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x9\n"
-        "	bl	species_and_otid_get_pal\n"
+        "	bl	GetMonSpritePal\n"
         "	ldr	r1, [r4]\n"
         "	ldrb	r1, [r1, #0x6]\n"
         "	lsl	r1, r1, #0x14\n"