summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/06/asm/module_06.s2
-rw-r--r--arm9/modules/07/asm/module_07.s4
-rw-r--r--arm9/modules/08/asm/module_08.s28
-rw-r--r--arm9/modules/09/asm/module_09.s10
-rw-r--r--arm9/modules/11/asm/module_11_thumb1.s4
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s2
-rw-r--r--arm9/modules/14/asm/module_14.s12
-rw-r--r--arm9/modules/15/asm/module_15.s2
-rw-r--r--arm9/modules/18/asm/module_18.s6
-rw-r--r--arm9/modules/62/asm/module_62.s22
-rw-r--r--arm9/modules/67/asm/module_67.s8
-rw-r--r--arm9/modules/68/asm/module_68.s4
-rw-r--r--arm9/modules/75/asm/module_75.s4
-rw-r--r--arm9/modules/80/asm/module_80.s2
14 files changed, 55 insertions, 55 deletions
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 02bc8f52..1337a593 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -8177,7 +8177,7 @@ _0223D456:
str r0, [r4, r1]
b _0223D472
_0223D468:
- bl FUN_02029C80
+ bl Sav2_SealCase_get
mov r1, #0x21
lsl r1, r1, #4
str r0, [r4, r1]
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 05283e3d..1a91192a 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -4972,7 +4972,7 @@ MOD07_0221469C: ; 0x0221469C
mov r0, #0xf
mov r1, #0xe
mov r2, #0
- bl FUN_0200B870
+ bl MessagePrinter_new
str r0, [sp, #0xc]
ldr r0, [r6]
ldr r0, [r0, #0x24]
@@ -5008,7 +5008,7 @@ _022146F6:
ldr r0, [sp, #0x10]
bl DestroyMsgData
ldr r0, [sp, #0xc]
- bl FUN_0200B990
+ bl MessagePrinter_delete
ldr r0, [sp, #8]
bl ScrStrBufs_delete
add sp, #0x14
diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s
index bd4cc319..b6af83a9 100644
--- a/arm9/modules/08/asm/module_08.s
+++ b/arm9/modules/08/asm/module_08.s
@@ -45124,10 +45124,10 @@ _022282DC:
_022282F8:
ldr r0, [sp, #0x14]
add r1, r5, #0
- bl FUN_02029CC8
+ bl Capsule_GetSealI
add r7, r0, #0
beq _02228360
- bl FUN_02029CE0
+ bl Seal_GetId
cmp r0, #0
beq _02228360
cmp r0, #0x51
@@ -45193,10 +45193,10 @@ _02228376:
_02228384:
ldr r0, [sp, #0x18]
add r1, r5, #0
- bl FUN_02029CC8
+ bl Capsule_GetSealI
add r7, r0, #0
beq _022283EC
- bl FUN_02029CE0
+ bl Seal_GetId
cmp r0, #0
beq _022283EC
cmp r0, #0x51
@@ -45262,10 +45262,10 @@ _02228402:
_02228410:
ldr r0, [sp, #0x1c]
add r1, r5, #0
- bl FUN_02029CC8
+ bl Capsule_GetSealI
add r7, r0, #0
beq _02228478
- bl FUN_02029CE0
+ bl Seal_GetId
cmp r0, #0
beq _02228478
cmp r0, #0x51
@@ -45331,10 +45331,10 @@ _0222848E:
_0222849C:
ldr r0, [sp, #0x20]
add r1, r5, #0
- bl FUN_02029CC8
+ bl Capsule_GetSealI
add r7, r0, #0
beq _02228504
- bl FUN_02029CE0
+ bl Seal_GetId
cmp r0, #0
beq _02228504
cmp r0, #0x51
@@ -45765,13 +45765,13 @@ MOD08_022287C4: ; 0x022287C4
add r1, sp, #0
bl MOD08_02228710
ldr r0, [r4, #0x14]
- bl FUN_02029CE0
+ bl Seal_GetId
bl FUN_02086018
ldr r0, [r4, #0x14]
- bl FUN_02029CE4
+ bl Seal_GetXCoord
add r6, r0, #0
ldr r0, [r4, #0x14]
- bl FUN_02029CE8
+ bl Seal_GetYCoord
sub r6, #0xbe
lsl r1, r6, #0x10
asr r3, r1, #0x10
@@ -49049,10 +49049,10 @@ MOD08_0222A02C: ; 0x0222A02C
MOD08_0222A058: ; 0x0222A058
push {r3, r4, r5, lr}
add r5, r0, #0
- bl FUN_02029CE4
+ bl Seal_GetXCoord
add r4, r0, #0
add r0, r5, #0
- bl FUN_02029CE8
+ bl Seal_GetYCoord
add r1, r0, #0
add r0, r4, #0
mov r2, #0xbe
@@ -49077,7 +49077,7 @@ _0222A084:
sub r1, r1, #1
bne _0222A084
add r0, r4, #0
- bl FUN_02029CE0
+ bl Seal_GetId
lsl r0, r0, #0x18
lsr r0, r0, #0x18
bl FUN_02086018
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 59100716..e98eadea 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2368,7 +2368,7 @@ MOD09_02213138: ; 0x02213138
mov r0, #0xf
ldr r3, [r3, #0xc]
mov r1, #0xe
- bl FUN_0200B870
+ bl MessagePrinter_new
ldr r1, _02213184 ; =0x00001FA4
str r0, [r4, r1]
ldr r0, [r4]
@@ -2399,7 +2399,7 @@ MOD09_02213190: ; 0x02213190
bl DestroyMsgData
ldr r0, _022131BC ; =0x00001FA4
ldr r0, [r4, r0]
- bl FUN_0200B990
+ bl MessagePrinter_delete
ldr r0, _022131C0 ; =0x00001FAC
ldr r0, [r4, r0]
bl ScrStrBufs_delete
@@ -3474,7 +3474,7 @@ MOD09_022139D4: ; 0x022139D4
ldr r0, _02213B74 ; =0x00001FAC
mov r1, #0
ldr r0, [r5, r0]
- bl FUN_0200B144
+ bl BufferTrainerNameFromDataStruct
ldr r1, _02213B74 ; =0x00001FAC
add r2, r4, #0
ldr r0, [r5, r1]
@@ -14095,7 +14095,7 @@ MOD09_022192A4: ; 0x022192A4
ldr r3, [r3, #0xc]
mov r1, #0xe
mov r2, #0
- bl FUN_0200B870
+ bl MessagePrinter_new
str r0, [r4, #0xc]
ldr r0, [r4]
ldr r0, [r0, #0xc]
@@ -14117,7 +14117,7 @@ MOD09_022192E4: ; 0x022192E4
ldr r0, [r4, #0x10]
bl DestroyMsgData
ldr r0, [r4, #0xc]
- bl FUN_0200B990
+ bl MessagePrinter_delete
ldr r0, [r4, #0x14]
bl ScrStrBufs_delete
ldr r0, [r4, #0x18]
diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s
index bbcb304d..30ee9995 100644
--- a/arm9/modules/11/asm/module_11_thumb1.s
+++ b/arm9/modules/11/asm/module_11_thumb1.s
@@ -706,7 +706,7 @@ MOD11_0222DB50: ; 0x0222DB50
mov r1, #1
mov r2, #0xf
mov r3, #5
- bl FUN_0200B870
+ bl MessagePrinter_new
mov r1, #0x6a
lsl r1, r1, #2
str r0, [r4, r1]
@@ -1369,7 +1369,7 @@ _0222E1AC:
mov r0, #0x6a
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200B990
+ bl MessagePrinter_delete
mov r0, #2
bl FUN_02002CF8
ldr r0, [r4, #0x1c]
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index 6b184294..46816d64 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -6200,7 +6200,7 @@ MOD11_022321C4: ; 0x022321C4
add r2, r0, #0
ldr r0, [r5, #0x14]
add r1, r4, #0
- bl FUN_0200B144
+ bl BufferTrainerNameFromDataStruct
pop {r3, r4, r5, pc}
thumb_func_start MOD11_022321DC
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 53969b45..ae226da3 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -19435,13 +19435,13 @@ _021E0DAC:
mov r1, #6
mov r2, #0xf
mov r3, #0xa
- bl FUN_0200B870
+ bl MessagePrinter_new
str r0, [r5, #0x18]
mov r0, #1
mov r1, #2
mov r2, #0xf
mov r3, #0xa
- bl FUN_0200B870
+ bl MessagePrinter_new
str r0, [r5, #0x1c]
mov r0, #0xa
add r3, r5, #0
@@ -19516,12 +19516,12 @@ _021E0E72:
ldr r0, [r5, #0x18]
cmp r0, #0
beq _021E0E7C
- bl FUN_0200B990
+ bl MessagePrinter_delete
_021E0E7C:
ldr r0, [r5, #0x1c]
cmp r0, #0
beq _021E0E86
- bl FUN_0200B990
+ bl MessagePrinter_delete
_021E0E86:
ldr r0, [r5, #0x44]
cmp r0, #0
@@ -21555,7 +21555,7 @@ _021E1DBC:
mov r1, #0xd
mov r2, #4
mov r3, #0xa
- bl FUN_0200B870
+ bl MessagePrinter_new
str r0, [r5, #0x44]
mov r0, #0x7d
lsl r0, r0, #2
@@ -21687,7 +21687,7 @@ _021E1F58:
ldr r0, [r5, #0x44]
cmp r0, #0
beq _021E1F62
- bl FUN_0200B990
+ bl MessagePrinter_delete
_021E1F62:
ldr r0, _021E1F94 ; =0x00004BFC
ldr r0, [r5, r0]
diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s
index d8172549..6c23c898 100644
--- a/arm9/modules/15/asm/module_15.s
+++ b/arm9/modules/15/asm/module_15.s
@@ -5154,7 +5154,7 @@ MOD15_021D9C58: ; 0x021D9C58
bl MOD15_021D9C08
ldr r1, [r5, #0x4c]
add r0, r6, #0
- bl FUN_02013A58
+ bl GetECWordIntoStringByIndex
ldr r1, [r5, #0x4c]
mov r0, #1
mov r2, #0
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 081a836b..b611c883 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -7720,7 +7720,7 @@ _0223D212:
bl BufferUndergroundItemNameWithArticle
add r0, r5, #0
mov r1, #2
- bl FUN_0200B7A8
+ bl ScrStrBufs_UpperFirstChar
bl MOD18_0223D638
bl MOD18_0224DBB4
mov r1, #0x5f
@@ -42040,11 +42040,11 @@ MOD18_0224DF40: ; 0x0224DF40
thumb_func_start MOD18_0224DF54
MOD18_0224DF54: ; 0x0224DF54
- ldr r3, _0224DF5C ; =FUN_0200B7A8
+ ldr r3, _0224DF5C ; =ScrStrBufs_UpperFirstChar
ldr r0, [r0, #0x28]
bx r3
nop
-_0224DF5C: .word FUN_0200B7A8
+_0224DF5C: .word ScrStrBufs_UpperFirstChar
thumb_func_end MOD18_0224DF54
thumb_func_start MOD18_0224DF60
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 73025559..76088322 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -952,7 +952,7 @@ _0222DC90:
ldr r0, [r0, #0x20]
ldr r2, [r7, r2]
add r1, sp, #0
- bl FUN_02029CA4
+ bl SealCase_SetCapsuleI
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -3017,18 +3017,18 @@ _0222EC9A:
add r7, #8
ldr r0, [r7, r6]
add r1, sp, #0x10
- bl FUN_02029C74
+ bl CapsuleArray_copy
add r0, r5, #0
str r0, [sp, #4]
add r0, #8
str r0, [sp, #4]
ldr r0, [r0, r4]
ldr r1, [r7, r6]
- bl FUN_02029C74
+ bl CapsuleArray_copy
ldr r1, [sp, #4]
add r0, sp, #0x10
ldr r1, [r1, r4]
- bl FUN_02029C74
+ bl CapsuleArray_copy
add r0, r5, #0
bl MOD62_0222EC28
add sp, #0x28
@@ -4363,14 +4363,14 @@ MOD62_0222F778: ; 0x0222F778
mov r0, #0xf1
lsl r0, r0, #2
ldr r0, [r1, r0]
- ldr r3, _0222F78C ; =FUN_02029C74
+ ldr r3, _0222F78C ; =CapsuleArray_copy
lsl r0, r0, #3
add r0, r1, r0
ldr r0, [r0, #8]
add r1, #0x68
bx r3
.align 2, 0
-_0222F78C: .word FUN_02029C74
+_0222F78C: .word CapsuleArray_copy
thumb_func_end MOD62_0222F778
thumb_func_start MOD62_0222F790
@@ -4379,14 +4379,14 @@ MOD62_0222F790: ; 0x0222F790
add r2, r0, #0
lsl r1, r1, #2
ldr r1, [r2, r1]
- ldr r3, _0222F7A4 ; =FUN_02029C74
+ ldr r3, _0222F7A4 ; =CapsuleArray_copy
lsl r1, r1, #3
add r1, r2, r1
add r0, #0x68
ldr r1, [r1, #8]
bx r3
.align 2, 0
-_0222F7A4: .word FUN_02029C74
+_0222F7A4: .word CapsuleArray_copy
thumb_func_end MOD62_0222F790
thumb_func_start MOD62_0222F7A8
@@ -4512,8 +4512,8 @@ MOD62_0222F870: ; 0x0222F870
_0222F87A:
add r0, r6, #0
add r1, r4, #0
- bl FUN_02029CC8
- bl FUN_02029CE0
+ bl Capsule_GetSealI
+ bl Seal_GetId
cmp r0, #0
beq _0222F88C
add r5, r5, #1
@@ -6516,7 +6516,7 @@ _02230860:
add r0, r2, r0
ldr r5, [r0, #4]
ldr r0, [r2, #0x20]
- bl FUN_02029C8C
+ bl SealCase_GetCapsuleI
add r2, r0, #0
add r0, r5, #0
mov r1, #0xaa
diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s
index d71a7476..a72ccebc 100644
--- a/arm9/modules/67/asm/module_67.s
+++ b/arm9/modules/67/asm/module_67.s
@@ -1742,7 +1742,7 @@ _021D828A:
mov r1, #1
lsl r2, r2, #0x10
lsr r2, r2, #0x11
- bl FUN_0200B10C
+ bl BufferTrainerName
_021D82BA:
cmp r5, #0xe
bhi _021D82CA
@@ -2302,7 +2302,7 @@ MOD67_021D86DC: ; 0x021D86DC
ldrh r2, [r4, #4]
ldr r0, [r5, #0x54]
mov r1, #1
- bl FUN_0200B10C
+ bl BufferTrainerName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2343,7 +2343,7 @@ MOD67_021D873C: ; 0x021D873C
ldrh r2, [r4, #4]
ldr r0, [r5, #0x54]
mov r1, #0
- bl FUN_0200B10C
+ bl BufferTrainerName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2384,7 +2384,7 @@ MOD67_021D8790: ; 0x021D8790
ldrh r2, [r4, #4]
ldr r0, [r5, #0x54]
mov r1, #0
- bl FUN_0200B10C
+ bl BufferTrainerName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s
index c201069e..dfab7ef8 100644
--- a/arm9/modules/68/asm/module_68.s
+++ b/arm9/modules/68/asm/module_68.s
@@ -441,7 +441,7 @@ MOD68_021D7870: ; 0x021D7870
mov r1, #2
mov r2, #0
mov r3, #0x24
- bl FUN_0200B870
+ bl MessagePrinter_new
add r1, r4, #0
add r1, #0xcc
str r0, [r1]
@@ -464,7 +464,7 @@ MOD68_021D78A8: ; 0x021D78A8
add r0, r4, #0
add r0, #0xcc
ldr r0, [r0]
- bl FUN_0200B990
+ bl MessagePrinter_delete
add r4, #0xc8
ldr r0, [r4]
bl ScrStrBufs_delete
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index f6d498ce..63f45d1d 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -446,7 +446,7 @@ MOD75_021E6F00: ; 0x021E6F00
mov r0, #0x11
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_0200B990
+ bl MessagePrinter_delete
mov r0, #0x46
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -946,7 +946,7 @@ MOD75_021E737C: ; 0x021E737C
mov r1, #2
mov r2, #0
mov r3, #6
- bl FUN_0200B870
+ bl MessagePrinter_new
mov r1, #0x11
lsl r1, r1, #4
str r0, [r4, r1]
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 667a4ae1..29a329f0 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -5624,7 +5624,7 @@ MOD80_0223022C: ; 0x0223022C
str r0, [r5, r1]
sub r1, #0x1c
ldr r0, [r5, r1]
- bl FUN_0200B84C
+ bl ScrStrBufs_ResetBuffers
ldr r0, _022302B4 ; =0x0000011E
ldrb r2, [r4, r0]
cmp r2, #0
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 18:30:26 +0000