summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/scrcmd_12.s2
-rw-r--r--arm9/asm/unk_0202BE98.s4
-rw-r--r--arm9/asm/unk_020377F0.s2
-rw-r--r--arm9/asm/unk_020476CC.s4
-rw-r--r--arm9/asm/unk_0204B0A0.s2
-rw-r--r--arm9/asm/unk_0206C700.s4
-rw-r--r--arm9/asm/unk_0206F3FC.s4
-rw-r--r--arm9/asm/unk_02073DA8.s6
-rw-r--r--arm9/asm/unk_02079C70.s10
-rw-r--r--arm9/asm/unk_0207D5BC.s2
-rw-r--r--arm9/asm/unk_0207FD00.s12
-rw-r--r--arm9/asm/unk_02080C38.s2
12 files changed, 27 insertions, 27 deletions
diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s
index 137140a8..a434a5cb 100644
--- a/arm9/asm/scrcmd_12.s
+++ b/arm9/asm/scrcmd_12.s
@@ -625,7 +625,7 @@ _020431D4:
add r7, r0, #0x0
add r0, r4, #0x0
add r1, r7, #0x0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
add r0, r7, #0x0
mov r1, #0x90
add r2, r5, #0x0
diff --git a/arm9/asm/unk_0202BE98.s b/arm9/asm/unk_0202BE98.s
index 2b1b2f16..37bc1c4e 100644
--- a/arm9/asm/unk_0202BE98.s
+++ b/arm9/asm/unk_0202BE98.s
@@ -133,10 +133,10 @@ FUN_0202BF7C: ; 0x0202BF7C
mov r1, #0xec
mul r1, r2
add r1, r3, r1
- ldr r3, _0202BF8C ; =FUN_02069A64
+ ldr r3, _0202BF8C ; =CopyBoxPokemonToPokemon
bx r3
nop
-_0202BF8C: .word FUN_02069A64
+_0202BF8C: .word CopyBoxPokemonToPokemon
thumb_func_start FUN_0202BF90
FUN_0202BF90: ; 0x0202BF90
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index d0d60821..e7d630f6 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -1687,7 +1687,7 @@ _02038386:
bl GetPartyMonByIndex
add r1, r0, #0x0
ldr r0, [r4, #0x44]
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r0, [r4, #0x60]
bl FUN_0206C92C
mov r0, #0x1a
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index 374ab418..568c4b5d 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -663,7 +663,7 @@ _02047C40:
add r1, r4, #0x0
bl GetPartyMonByIndex
add r1, r5, #0x0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
@@ -858,7 +858,7 @@ _02047DEE:
sub r1, r1, #0x1
bl GetPartyMonByIndex
ldr r1, [sp, #0x8]
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r1, [sp, #0x8]
add r0, r5, #0x0
mov r2, #0x0
diff --git a/arm9/asm/unk_0204B0A0.s b/arm9/asm/unk_0204B0A0.s
index f2e46ab6..a78c13d0 100644
--- a/arm9/asm/unk_0204B0A0.s
+++ b/arm9/asm/unk_0204B0A0.s
@@ -149,7 +149,7 @@ FUN_0204B1DC: ; 0x0204B1DC
ldr r0, [r5, #0xc]
bl SavArray_PlayerParty_get
add r1, r4, #0x0
- bl FUN_02069D50
+ bl Party_UpdatePokerus
ldr r0, [r5, #0xc]
bl SavArray_Flags_get
add r6, r0, #0x0
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index c42b766a..f5a0873e 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -2096,7 +2096,7 @@ _0206D86E:
add r5, r0, #0x0
ldr r0, [r4, #0x28]
add r1, r5, #0x0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
mov r0, #0x49
lsl r0, r0, #0x2
str r0, [sp, #0x0]
@@ -2576,7 +2576,7 @@ FUN_0206DC80: ; 0x0206DC80
add r5, r0, #0x0
ldr r0, [r4, #0x28]
add r1, r5, #0x0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
add r2, r4, #0x0
add r0, r5, #0x0
mov r1, #0x5
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index db3328a4..212030cc 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -5672,7 +5672,7 @@ FUN_02072080: ; 0x02072080
add r2, sp, #0x0
bl SetMonData
add r0, r5, #0x0
- bl FUN_02069EC4
+ bl Pokemon_UpdateArceusForme
ldr r1, _020720D8 ; =0x00000B25
ldr r0, _020720D4 ; =0x000005A4
ldrb r3, [r4, r1]
@@ -5715,7 +5715,7 @@ FUN_020720E0: ; 0x020720E0
add r2, sp, #0x1c
bl SetMonData
add r0, r5, #0x0
- bl FUN_02069EC4
+ bl Pokemon_UpdateArceusForme
ldr r1, _02072138 ; =0x00000B25
mov r2, #0x2c
ldrb r3, [r4, r1]
diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s
index 8b8442a3..6635b399 100644
--- a/arm9/asm/unk_02073DA8.s
+++ b/arm9/asm/unk_02073DA8.s
@@ -246,7 +246,7 @@ _02073F66:
add r2, sp, #0x0
bl SetMonData
add r0, r6, #0x0
- bl FUN_02069EC4
+ bl Pokemon_UpdateArceusForme
ldr r2, _02074058 ; =0x0000069C
mov r1, #0x52
ldr r0, [r5, r2]
@@ -633,7 +633,7 @@ FUN_020742A8: ; 0x020742A8
add r2, sp, #0x0
bl SetMonData
add r0, r5, #0x0
- bl FUN_02069EC4
+ bl Pokemon_UpdateArceusForme
ldr r1, _02074330 ; =0x00000B25
mov r2, #0x2c
ldrb r3, [r4, r1]
@@ -790,7 +790,7 @@ FUN_02074428: ; 0x02074428
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
- bl FUN_0206AA84
+ bl Pokemon_RemoveCapsule
ldr r0, _0207444C ; =0x000005A4
mov r1, #0x0
ldr r0, [r4, r0]
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index c701f1a8..33c0a040 100644
--- a/arm9/asm/unk_02079C70.s
+++ b/arm9/asm/unk_02079C70.s
@@ -1536,7 +1536,7 @@ _0207A896:
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
- bl FUN_02069A64
+ bl CopyBoxPokemonToPokemon
b _0207A8C0
_0207A8BA:
bl FUN_0207B628
@@ -1825,7 +1825,7 @@ FUN_0207AAE0: ; 0x0207AAE0
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
- bl FUN_02069A64
+ bl CopyBoxPokemonToPokemon
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r7, #0x0
@@ -2163,7 +2163,7 @@ _0207AD26:
_0207ADE0:
add r0, r6, #0x0
add r1, r4, #0x0
- bl FUN_02069BC8
+ bl MonGetFlavorPreference
cmp r0, #0x1
bne _0207ADF4
add r0, r5, #0x0
@@ -2202,7 +2202,7 @@ _0207ADFE:
orr r0, r2
str r0, [r5, #0x50]
add r0, r6, #0x0
- bl FUN_02069E94
+ bl Pokemon_IsImmuneToPokerus
cmp r0, #0x1
bne _0207AE4E
ldr r1, [r5, #0x50]
@@ -2215,7 +2215,7 @@ _0207ADFE:
b _0207AE84
_0207AE4E:
add r0, r6, #0x0
- bl FUN_02069E74
+ bl Pokemon_HasPokerus
cmp r0, #0x1
bne _0207AE7C
ldr r2, [r5, #0x50]
diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s
index ca5fef37..2546b905 100644
--- a/arm9/asm/unk_0207D5BC.s
+++ b/arm9/asm/unk_0207D5BC.s
@@ -1540,7 +1540,7 @@ FUN_0207E190: ; 0x0207E190
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
- bl FUN_02069A64
+ bl CopyBoxPokemonToPokemon
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r5, r0]
diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s
index 294b8bfc..e48ad6f9 100644
--- a/arm9/asm/unk_0207FD00.s
+++ b/arm9/asm/unk_0207FD00.s
@@ -5,14 +5,14 @@
.global UNK_020FBB48
UNK_020FBB48: ; 0x020FBB48
- .byte 0x46, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 0x00
+ .short 0x0046, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045
.global UNK_020FBB54
UNK_020FBB54: ; 0x020FBB54
- .byte 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00
- .byte 0x4F, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00
- .byte 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00
- .byte 0x5F, 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00, 0x64, 0x00
+ .short 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E
+ .short 0x004F, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056
+ .short 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E
+ .short 0x005F, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064
.text
@@ -1171,7 +1171,7 @@ FUN_02080678: ; 0x02080678
_0208068A:
ldr r0, [r5, #0xc]
add r1, r4, #0x0
- bl FUN_02069BC8
+ bl MonGetFlavorPreference
cmp r0, #0x1
bne _02080698
add r6, r4, #0x1
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index 458d4420..0f1630ed 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -930,7 +930,7 @@ _02081304:
bl FUN_02029F9C
ldr r0, [r6, #0x8]
ldr r1, [r4, #0x0]
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
mov r0, #0x8
mov r1, #0x14
bl String_ctor
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 17:58:27 +0000