summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-07-03 13:47:49 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-07-03 13:47:49 -0400
commita9d89d196cad1fc40c2b8f0d79a63d8c1894bef7 (patch)
tree7104210dd0a425e5b8062a1fe0ba219931b76be5 /arm9/modules
parentb4e0fdb8aa1f6c1a4b3d2404017c866bfdc90320 (diff)
Rename funcs related to hall of fame
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/module_05.s2
-rw-r--r--arm9/modules/14/asm/module_14.s2
-rw-r--r--arm9/modules/16/asm/module_16.s10
-rw-r--r--arm9/modules/47/asm/module_47.s2
-rw-r--r--arm9/modules/57/asm/module_57.s2
-rw-r--r--arm9/modules/62/asm/module_62.s4
-rw-r--r--arm9/modules/67/asm/module_67.s32
-rw-r--r--arm9/modules/69/asm/module_69.s32
-rw-r--r--arm9/modules/71/asm/module_71.s2
-rw-r--r--arm9/modules/82/asm/module_82.s2
-rw-r--r--arm9/modules/83/asm/module_83.s2
11 files changed, 46 insertions, 46 deletions
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]