Rename funcs related to hall of fame

16 files changed, 62 insertions, 62 deletions

diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s
index 4017e2f0..ccf022f4 100644
--- a/arm9/asm/unk_0200AA80.s
+++ b/arm9/asm/unk_0200AA80.s
@@ -391,7 +391,7 @@ FUN_0200AD38: ; 0x0200AD38
 	add r2, r3, #0x0
 	ldr r0, [r5, #0xc]
 	ldr r3, [sp, #0x10]
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	ldr r2, [r5, #0xc]
 	add r0, r5, #0x0
 	add r1, r4, #0x0
@@ -730,8 +730,8 @@ _0200AFF0:
 	pop {r3-r7, pc}
 	.balign 4
 
-	thumb_func_start FUN_0200AFF4
-FUN_0200AFF4: ; 0x0200AFF4
+	thumb_func_start GetLandmarkName
+GetLandmarkName: ; 0x0200AFF4
 	push {r3-r7, lr}
 	add r5, r0, #0x0
 	add r6, r2, #0x0
diff --git a/arm9/asm/unk_02021934.s b/arm9/asm/unk_02021934.s
index 08a23632..337bae11 100644
--- a/arm9/asm/unk_02021934.s
+++ b/arm9/asm/unk_02021934.s
@@ -269,8 +269,8 @@ _02021AFA:
 	nop
 _02021B00: .word 0xB6F8D2EC
 
-	thumb_func_start FUN_02021B04
-FUN_02021B04: ; 0x02021B04
+	thumb_func_start String16_FormatInteger
+String16_FormatInteger: ; 0x02021B04
 	push {r3-r7, lr}
 	sub sp, #0x8
 	add r5, r0, #0x0
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 2dd22237..f4394e88 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -125,7 +125,7 @@ UNK_020F2D54: ; 0x020F2D54
 
 	.global UNK_020F2D64
 UNK_020F2D64: ; 0x020F2D64
-	.word MOD69_0222D5C0, MOD69_0222D7F4, MOD69_0222D750, SDK_OVERLAY_MODULE_69_ID
+	.word HOF_OverlayInit, HOF_OverlayRun, HOF_OverlayTeardown, SDK_OVERLAY_MODULE_69_ID
 
 	.global UNK_020F2D74
 UNK_020F2D74: ; 0x020F2D74
diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s
index 6dd43423..6bc4b7fb 100644
--- a/arm9/asm/unk_02060CCC.s
+++ b/arm9/asm/unk_02060CCC.s
@@ -1056,7 +1056,7 @@ FUN_0206139C: ; 0x0206139C
 	ldrh r2, [r4, #0x2]
 	add r0, r5, #0x0
 	mov r1, #0x0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	add r0, r5, #0x0
 	mov r1, #0x1
 	add r2, r6, #0x0
@@ -1108,7 +1108,7 @@ FUN_02061404: ; 0x02061404
 	ldrh r2, [r4, #0x6]
 	add r0, r5, #0x0
 	mov r1, #0x1
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	add r0, r5, #0x0
 	mov r1, #0x0
 	add r2, r6, #0x0
@@ -2842,7 +2842,7 @@ _0206218C:
 	add r2, r0, #0x0
 	add r0, r7, #0x0
 	mov r1, #0x0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	cmp r4, #0xb
 	bhi _0206222C
 	add r0, r4, r4
@@ -2953,7 +2953,7 @@ FUN_02062240: ; 0x02062240
 	add r2, r0, #0x0
 	add r0, r4, #0x0
 	mov r1, #0x0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	add r2, sp, #0x0
 	ldrh r2, [r2, #0x0]
 	add r0, r4, #0x0
@@ -3180,7 +3180,7 @@ FUN_020623F4: ; 0x020623F4
 	add r2, r0, #0x0
 	add r0, r5, #0x0
 	mov r1, #0x0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	add r0, r6, #0x0
 	add r1, r4, #0x0
 	bl FUN_02025238
diff --git a/arm9/global.inc b/arm9/global.inc
index ace8a6da..f8466905 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -563,7 +563,7 @@
 .extern FUN_0200AF50
 .extern FUN_0200AF88
 .extern FUN_0200AFBC
-.extern FUN_0200AFF4
+.extern GetLandmarkName
 .extern FUN_0200B02C
 .extern FUN_0200B064
 .extern FUN_0200B09C
@@ -1395,7 +1395,7 @@
 .extern StringSetEmpty
 .extern StringCopy
 .extern StringDup
-.extern FUN_02021B04
+.extern String16_FormatInteger
 .extern FUN_02021C38
 .extern FUN_02021CE0
 .extern FUN_02021D3C
@@ -7189,9 +7189,9 @@
 .extern MOD68_021D74E0
 .extern MOD68_021D75D8
 .extern MOD68_021D762C
-.extern MOD69_0222D5C0
-.extern MOD69_0222D7F4
-.extern MOD69_0222D750
+.extern HOF_OverlayInit
+.extern HOF_OverlayRun
+.extern HOF_OverlayTeardown
 .extern MOD69_0222EC60
 .extern MOD70_021D74E0
 .extern MOD70_021D758C
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index aa0610f2..72a2c0e5 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -35063,7 +35063,7 @@ MOD05_021E835C: ; 0x021E835C
 	ldr r2, [r4, #4]
 	mov r1, #0
 	add r5, r0, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r2, [r4, #8]
 	add r0, r5, #0
 	mov r1, #1
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 2c5fb91b..d53e4a93 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -29199,7 +29199,7 @@ _021E5872:
 	ldr r0, [r5, #0x74]
 	mov r2, #3
 	mov r3, #0
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r0, #0
 	ldr r1, [r5, #0x74]
 	add r2, r0, #0
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index d4e8ee86..1c08b8e1 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -1167,7 +1167,7 @@ MOD16_021D7D9C: ; 0x021D7D9C
 	mov r2, #3
 	mov r3, #2
 	add r4, r0, #0
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	ldr r2, [sp, #0x10]
 	add r0, r7, #0
 	mov r1, #2
@@ -11571,7 +11571,7 @@ MOD16_021DC958: ; 0x021DC958
 	add r1, r7, #0
 	mov r2, #3
 	mov r3, #2
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r0, #0xaa
 	str r0, [sp]
 	mov r1, #0
@@ -11589,7 +11589,7 @@ MOD16_021DC958: ; 0x021DC958
 	add r0, r4, #0
 	mov r2, #3
 	mov r3, #2
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r0, #0xaa
 	str r0, [sp]
 	mov r1, #0
@@ -11651,7 +11651,7 @@ MOD16_021DCA2C: ; 0x021DCA2C
 	add r1, r7, #0
 	mov r2, #3
 	mov r3, #2
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r0, #0xaa
 	str r0, [sp]
 	mov r1, #0
@@ -12840,7 +12840,7 @@ MOD16_021DD370: ; 0x021DD370
 	add r0, r7, #0
 	mov r2, #3
 	mov r3, #2
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r1, #0
 	str r1, [sp]
 	mov r0, #0xff
diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s
index 56a71aff..978634c1 100644
--- a/arm9/modules/47/asm/module_47.s
+++ b/arm9/modules/47/asm/module_47.s
@@ -1453,7 +1453,7 @@ _0225532C:
 	ldr r0, [r5, #0x5c]
 	ldr r1, [r7]
 	add r3, r2, #0
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	str r4, [sp]
 	mov r0, #0xff
 	str r0, [sp, #4]
diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s
index e7459c18..8d82ce5d 100644
--- a/arm9/modules/57/asm/module_57.s
+++ b/arm9/modules/57/asm/module_57.s
@@ -3380,7 +3380,7 @@ MOD57_021D8FD8: ; 0x021D8FD8
 	ldr r0, [sp, #0x28]
 	ldr r1, [sp, #0x2c]
 	ldr r3, [sp, #0x34]
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r0, #0
 	ldr r1, [sp, #0x28]
 	add r2, r0, #0
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index a6136dbb..2504e001 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -3585,7 +3585,7 @@ _0222F0FE:
 	add r0, r4, #0
 	mov r2, #3
 	mov r3, #1
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r0, #0
 	str r0, [sp]
 	mov r0, #0xff
@@ -3653,7 +3653,7 @@ _0222F194:
 	ldr r0, [sp, #0x10]
 	mov r2, #3
 	str r3, [sp]
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r1, #0
 	str r1, [sp]
 	mov r0, #0xff
diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s
index 857b05b7..014fe29f 100644
--- a/arm9/modules/67/asm/module_67.s
+++ b/arm9/modules/67/asm/module_67.s
@@ -1252,7 +1252,7 @@ _021D7E32:
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r4, #0
@@ -1778,7 +1778,7 @@ _021D82F2:
 	add r2, r0, #0
 	ldr r0, [r4, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r4, #0x54]
 	ldr r1, [r4, #0x58]
 	add r2, r5, #0
@@ -2427,7 +2427,7 @@ MOD67_021D87E4: ; 0x021D87E4
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -2482,7 +2482,7 @@ _021D886E:
 	ldr r0, [r5, #0x54]
 	mov r1, #0
 	add r2, r4, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -2532,7 +2532,7 @@ _021D88D2:
 	ldr r0, [r5, #0x54]
 	ldr r2, [sp, #0x10]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r6, #0
@@ -2678,7 +2678,7 @@ MOD67_021D89E0: ; 0x021D89E0
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -2721,7 +2721,7 @@ MOD67_021D8A3C: ; 0x021D8A3C
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -2764,7 +2764,7 @@ MOD67_021D8A98: ; 0x021D8A98
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -2807,7 +2807,7 @@ MOD67_021D8AF4: ; 0x021D8AF4
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -2850,7 +2850,7 @@ MOD67_021D8B50: ; 0x021D8B50
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -2893,7 +2893,7 @@ MOD67_021D8BAC: ; 0x021D8BAC
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -2936,7 +2936,7 @@ MOD67_021D8C08: ; 0x021D8C08
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -2979,7 +2979,7 @@ MOD67_021D8C64: ; 0x021D8C64
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -3022,7 +3022,7 @@ MOD67_021D8CC0: ; 0x021D8CC0
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -3065,7 +3065,7 @@ MOD67_021D8D1C: ; 0x021D8D1C
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
@@ -3108,7 +3108,7 @@ MOD67_021D8D78: ; 0x021D8D78
 	add r2, r0, #0
 	ldr r0, [r5, #0x54]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 	ldr r0, [r5, #0x54]
 	ldr r1, [r5, #0x58]
 	add r2, r7, #0
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index d16a434a..e66e60f0 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -3,8 +3,8 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD69_0222D5C0
-MOD69_0222D5C0: ; 0x0222D5C0
+	thumb_func_start HOF_OverlayInit
+HOF_OverlayInit: ; 0x0222D5C0
 	push {r3, r4, r5, r6, r7, lr}
 	add r5, r0, #0
 	mov r0, #0
@@ -169,8 +169,8 @@ _0222D744: .word MOD69_0222DB2C
 _0222D748: .word 0x00001B34
 _0222D74C: .word 0x00000493
 
-	thumb_func_start MOD69_0222D750
-MOD69_0222D750: ; 0x0222D750
+	thumb_func_start HOF_OverlayTeardown
+HOF_OverlayTeardown: ; 0x0222D750
 	push {r4, r5, r6, lr}
 	add r5, r1, #0
 	ldr r1, [r5]
@@ -236,8 +236,8 @@ _0222D7E8: .word 0x00001B54
 _0222D7EC: .word 0x00001B58
 _0222D7F0: .word 0x00001B5C
 
-	thumb_func_start MOD69_0222D7F4
-MOD69_0222D7F4: ; 0x0222D7F4
+	thumb_func_start HOF_OverlayRun
+HOF_OverlayRun: ; 0x0222D7F4
 	push {r3, r4, r5, lr}
 	add r5, r1, #0
 	bl FUN_02006278
@@ -2348,8 +2348,8 @@ _0222E8F2:
 	nop
 _0222E8F8: .word 0x00010200
 
-	thumb_func_start MOD69_0222E8FC
-MOD69_0222E8FC: ; 0x0222E8FC
+	thumb_func_start HOF_MonGetUIStrings
+HOF_MonGetUIStrings: ; 0x0222E8FC
 	push {r4, lr}
 	sub sp, #8
 	add r4, r0, #0
@@ -2402,14 +2402,14 @@ _0222E95E:
 	add sp, #8
 	pop {r4, pc}
 
-	thumb_func_start MOD69_0222E96C
-MOD69_0222E96C: ; 0x0222E96C
+	thumb_func_start HOF_MonGetMetLocationString
+HOF_MonGetMetLocationString: ; 0x0222E96C
 	push {r3, r4, r5, lr}
 	add r5, r0, #0
 	ldr r0, [r5, #8]
 	ldr r1, [r5, #0x24]
 	ldr r2, [r5, #0x28]
-	bl MOD69_0222F6C4
+	bl HOF_MonGetMetLocationStringId
 	add r4, r0, #0
 	beq _0222E982
 	cmp r4, #1
@@ -2422,7 +2422,7 @@ _0222E982:
 	add r2, r0, #0
 	ldr r0, [r5, #0x14]
 	mov r1, #0
-	bl FUN_0200AFF4
+	bl GetLandmarkName
 _0222E996:
 	ldr r0, [r5, #0x20]
 	ldr r2, [r5, #0x18]
@@ -2485,7 +2485,7 @@ _0222E9FC:
 	mov r1, #0x48
 	bl MOD69_0222E89C
 	add r0, r4, #0
-	bl MOD69_0222E8FC
+	bl HOF_MonGetUIStrings
 	add r0, r4, #0
 	mov r1, #0x58
 	bl MOD69_0222E89C
@@ -2516,7 +2516,7 @@ _0222EA2E:
 	mov r1, #0x78
 	bl MOD69_0222E89C
 	add r0, r4, #0
-	bl MOD69_0222E96C
+	bl HOF_MonGetMetLocationString
 	add r0, r4, #0
 	mov r1, #0x88
 	bl MOD69_0222E89C
@@ -4030,8 +4030,8 @@ MOD69_0222F6C0: ; 0x0222F6C0
 	ldr r0, [r0, #0x10]
 	bx lr
 
-	thumb_func_start MOD69_0222F6C4
-MOD69_0222F6C4: ; 0x0222F6C4
+	thumb_func_start HOF_MonGetMetLocationStringId
+HOF_MonGetMetLocationStringId: ; 0x0222F6C4
 	push {r3, r4, r5, r6, r7, lr}
 	add r4, r1, #0
 	add r5, r0, #0
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 09bca872..111546a5 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -2940,7 +2940,7 @@ _0222EE14:
 	add r0, r7, #0
 	mov r2, #3
 	mov r3, #0
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r0, #0x1e
 	str r0, [sp]
 	ldr r0, [sp, #0x30]
diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s
index 48654b9a..b2a8f127 100644
--- a/arm9/modules/82/asm/module_82.s
+++ b/arm9/modules/82/asm/module_82.s
@@ -4265,7 +4265,7 @@ MOD82_0222F694: ; 0x0222F694
 	add r1, r6, #0
 	add r2, r7, #0
 	mov r3, #2
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r3, #1
 	ldr r0, _0222F6CC ; =0x00010200
 	str r3, [sp]
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index bbde3e98..1824f32f 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -17329,7 +17329,7 @@ _02235DAC:
 	mov r2, #3
 	add r4, r0, #0
 	str r3, [sp]
-	bl FUN_02021B04
+	bl String16_FormatInteger
 	mov r0, #0
 	mvn r0, r0
 	str r0, [sp, #0x60]