summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/module_05.s10
-rw-r--r--arm9/modules/06/asm/module_06.s12
-rw-r--r--arm9/modules/07/asm/module_07.s16
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s62
-rw-r--r--arm9/modules/14/asm/module_14.s8
-rw-r--r--arm9/modules/23/asm/module_23.s2
-rw-r--r--arm9/modules/62/asm/module_62.s4
-rw-r--r--arm9/modules/71/asm/module_71.s14
-rw-r--r--arm9/modules/80/asm/module_80.s12
9 files changed, 70 insertions, 70 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index f9672ea0..b665a9b3 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -14436,7 +14436,7 @@ MOD05_021EC4F0: ; 0x021EC4F0
_021EC544:
ldr r1, [sp, #4]
add r0, r4, #0
- bl FUN_02069BB4
+ bl CopyBoxPokemonToBoxPokemon
add r0, r5, #0
mov r1, #0
bl DayCareMon_SetSteps
@@ -14599,7 +14599,7 @@ MOD05_021EC668: ; 0x021EC668
lsr r7, r0, #0x10
add r0, r5, #0
add r1, r4, #0
- bl FUN_02069A64
+ bl CopyBoxPokemonToPokemon
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
@@ -14680,7 +14680,7 @@ MOD05_021EC744: ; 0x021EC744
add r4, r0, #0
add r0, r6, #0
add r1, r4, #0
- bl FUN_02069BA0
+ bl CopyPokemonToBoxPokemon
add r0, r4, #0
mov r1, #8
mov r2, #0
@@ -15240,7 +15240,7 @@ MOD05_021ECB6C: ; 0x021ECB6C
ldr r0, [sp, #0x18]
ldr r1, [sp, #0xc]
add r2, #0x30
- bl FUN_02069BFC
+ bl Species_LoadLearnsetTable
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x14]
@@ -16911,7 +16911,7 @@ _021ED7CE:
bl SetMonData
add r0, r6, #0
add r1, r4, #0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r0, [sp, #0x10]
bl String_dtor
add r0, r6, #0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 2af29137..02bc8f52 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -5094,7 +5094,7 @@ _0223BC5A:
str r0, [r1, #0x20]
ldr r0, [sp, #0x2c]
ldr r1, [r5, #0xc]
- bl FUN_0206ABC4
+ bl EnemyTrainerSet_Init
add r0, sp, #0x30
str r0, [sp]
ldr r1, [sp, #0x20]
@@ -5531,7 +5531,7 @@ _0223BFFE:
str r0, [r1, #0x20]
ldr r0, [sp, #0x24]
ldr r1, [r5, #0xc]
- bl FUN_0206ABC4
+ bl EnemyTrainerSet_Init
add r0, sp, #0x28
str r0, [sp]
ldr r1, [sp, #0x18]
@@ -5841,7 +5841,7 @@ _0223C2A2:
str r0, [r1, #0x20]
ldr r0, [r4]
ldr r1, [r5, #0xc]
- bl FUN_0206ABC4
+ bl EnemyTrainerSet_Init
add r0, sp, #0x28
str r0, [sp]
ldr r1, [sp, #0x1c]
@@ -22218,7 +22218,7 @@ _022445A6:
ldr r0, [sp, #4]
bl GetPartyMonByIndex
add r1, r4, #0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
@@ -31096,10 +31096,10 @@ MOD06_0224891C: ; 0x0224891C
bl CreateInGameTradeMon
ldr r1, [sp, #0x20]
add r0, r7, #0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r0, [r5, #4]
ldr r1, [sp, #0x24]
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r0, [sp, #0x20]
bl FUN_020690E4
str r0, [r4]
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 2659dd5c..05283e3d 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -5049,7 +5049,7 @@ MOD07_02214720: ; 0x02214720
add r0, r1, r0
add r0, #0x29
ldrb r0, [r0]
- bl FUN_0206AE00
+ bl TrainerClass_GetGenderOrTrainerCount
str r0, [sp, #0x10]
ldr r0, [r4, #0x24]
mov r1, #0x10
@@ -5101,7 +5101,7 @@ _022147BC:
add r0, r1, r0
add r0, #0x29
ldrb r0, [r0]
- bl FUN_0206AE00
+ bl TrainerClass_GetGenderOrTrainerCount
str r0, [sp, #0x14]
ldr r0, [r4, #0x24]
mov r1, #0x10
@@ -5134,7 +5134,7 @@ _02214808:
add r0, r1, r0
add r0, #0x29
ldrb r0, [r0]
- bl FUN_0206AE00
+ bl TrainerClass_GetGenderOrTrainerCount
str r0, [sp, #0x18]
ldr r0, [r4, #0x24]
mov r1, #0x10
@@ -5167,7 +5167,7 @@ _02214854:
add r0, r1, r0
add r0, #0x29
ldrb r0, [r0]
- bl FUN_0206AE00
+ bl TrainerClass_GetGenderOrTrainerCount
str r0, [sp, #0x1c]
ldr r0, [r4, #0x24]
mov r1, #0x10
@@ -5205,12 +5205,12 @@ _022148A0:
bne _022148EA
add r0, #0x5d
ldrb r0, [r0]
- bl FUN_0206AE00
+ bl TrainerClass_GetGenderOrTrainerCount
str r0, [sp, #8]
ldr r0, [r4]
add r0, #0xc5
ldrb r0, [r0]
- bl FUN_0206AE00
+ bl TrainerClass_GetGenderOrTrainerCount
str r0, [sp, #0xc]
ldr r0, [r4, #0x18]
add r1, r5, #0
@@ -5224,12 +5224,12 @@ _022148A0:
_022148EA:
add r0, #0x29
ldrb r0, [r0]
- bl FUN_0206AE00
+ bl TrainerClass_GetGenderOrTrainerCount
str r0, [sp, #8]
ldr r0, [r4]
add r0, #0x91
ldrb r0, [r0]
- bl FUN_0206AE00
+ bl TrainerClass_GetGenderOrTrainerCount
str r0, [sp, #0xc]
ldr r0, [r4, #0x14]
add r1, r5, #0
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index a962fbf2..6b184294 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -4694,7 +4694,7 @@ MOD11_0223158C: ; 0x0223158C
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0
- bl FUN_02069AEC
+ bl Party_GetMaxLevel
ldr r1, _022315BC ; =MOD11_0225DC1C
lsl r0, r0, #2
ldrb r1, [r1, r4]
@@ -4914,7 +4914,7 @@ _0223174C:
add r0, r4, #0
add r1, r7, #0
mov r3, #5
- bl FUN_0206AD4C
+ bl GetTrainerMessageByIdPair
add r0, r6, #0
mov r1, #0xff
bl FUN_02019620
@@ -24749,7 +24749,7 @@ _0223B414:
lsl r1, r1, #0x18
ldr r0, [sp]
lsr r1, r1, #0x18
- bl FUN_02069CF4
+ bl Party_MaskMonsWithPokerus
cmp r0, #0
beq _0223B42E
lsl r0, r4, #0x11
@@ -38100,9 +38100,9 @@ MOD11_02241CF0: ; 0x02241CF0
mov r1, #0
bl MOD11_0222FF88
add r6, r0, #0
- bl FUN_02069C4C
+ bl Party_GivePokerusAtRandom
add r0, r6, #0
- bl FUN_02069DC8
+ bl Party_SpreadPokerus
_02241D16:
cmp r4, #0
beq _02241D20
@@ -45181,7 +45181,7 @@ _022452F8:
ldr r0, [sp, #8]
mov r1, #0xd
mov r2, #5
- bl FUN_0206ACD4
+ bl TrainerMessageWithIdPairExists
cmp r0, #0
beq _02245334
mov r1, #0x85
@@ -45219,7 +45219,7 @@ _0224533C:
ldr r0, [sp, #8]
mov r1, #0xe
mov r2, #5
- bl FUN_0206ACD4
+ bl TrainerMessageWithIdPairExists
cmp r0, #0
beq _0224537C
ldr r1, _0224548C ; =0x00002E7D
@@ -45276,7 +45276,7 @@ _022453C6:
ldr r0, [sp, #8]
mov r1, #0xf
mov r2, #5
- bl FUN_0206ACD4
+ bl TrainerMessageWithIdPairExists
cmp r0, #0
beq _022453F0
ldr r1, _0224548C ; =0x00002E7D
@@ -45340,7 +45340,7 @@ _0224543A:
ldr r0, [sp, #8]
mov r1, #0x10
mov r2, #5
- bl FUN_0206ACD4
+ bl TrainerMessageWithIdPairExists
cmp r0, #0
beq _02245472
ldr r1, _0224548C ; =0x00002E7D
@@ -52971,7 +52971,7 @@ _02248E3A:
str r1, [r4, r0]
ldr r0, _02248F68 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
mov r1, #0
mvn r1, r1
cmp r0, r1
@@ -53002,7 +53002,7 @@ _02248E76:
str r1, [r4, r0]
ldr r0, _02248F68 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
mov r1, #0
mvn r1, r1
cmp r0, r1
@@ -53033,7 +53033,7 @@ _02248EB2:
str r1, [r4, r0]
ldr r0, _02248F68 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
mov r1, #0
mvn r1, r1
cmp r0, r1
@@ -53067,7 +53067,7 @@ _02248EFC:
str r1, [r4, r0]
ldr r0, _02248F68 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
mov r1, #0
mvn r1, r1
cmp r0, r1
@@ -53108,7 +53108,7 @@ _02248F64: .word 0x00002DB0
_02248F68: .word 0x00002DA8
_02248F6C:
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
mov r1, #0
mvn r1, r1
cmp r0, r1
@@ -54103,7 +54103,7 @@ _02249708: .word 0x00002DCC
_0224970C: .word 0x00002DA8
_02249710:
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
mov r1, #0
mvn r1, r1
cmp r0, r1
@@ -54135,7 +54135,7 @@ _0224972C:
str r1, [r4, r0]
ldr r0, _02249A5C ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
mov r1, #0
mvn r1, r1
cmp r0, r1
@@ -54167,7 +54167,7 @@ _0224976A:
str r1, [r4, r0]
ldr r0, _02249A5C ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
mov r1, #0
mvn r1, r1
cmp r0, r1
@@ -54199,7 +54199,7 @@ _022497A8:
str r1, [r4, r0]
ldr r0, _02249A5C ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
mov r1, #0
mvn r1, r1
cmp r0, r1
@@ -54234,7 +54234,7 @@ _022497F4:
str r1, [r4, r0]
ldr r0, _02249A5C ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
mov r1, #0
mvn r1, r1
cmp r0, r1
@@ -55536,7 +55536,7 @@ _0224A1B6:
add r2, r4, r0
ldr r0, _0224A344 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
sub r1, r6, #1
cmp r0, r1
bne _0224A1F6
@@ -55572,7 +55572,7 @@ _0224A1FC:
add r2, r4, r0
ldr r0, _0224A344 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
sub r1, r6, #1
cmp r0, r1
bne _0224A23C
@@ -55608,7 +55608,7 @@ _0224A242:
add r2, r4, r0
ldr r0, _0224A344 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
sub r1, r6, #1
cmp r0, r1
bne _0224A282
@@ -55644,7 +55644,7 @@ _0224A288:
add r2, r4, r0
ldr r0, _0224A344 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
sub r1, r6, #1
cmp r0, r1
bne _0224A2C8
@@ -55680,7 +55680,7 @@ _0224A2CE:
add r2, r4, r0
ldr r0, _0224A344 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
sub r1, r6, #1
cmp r0, r1
bne _0224A30E
@@ -56300,7 +56300,7 @@ _0224A77A:
add r2, r4, r0
ldr r0, _0224A874 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
sub r1, r5, #1
cmp r0, r1
ldr r0, _0224A850 ; =0x00003118
@@ -56333,7 +56333,7 @@ _0224A7BC:
add r2, r4, r0
ldr r0, _0224A874 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
sub r1, r5, #1
cmp r0, r1
ldr r0, _0224A850 ; =0x00003118
@@ -56366,7 +56366,7 @@ _0224A7FE:
add r2, r4, r0
ldr r0, _0224A874 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
sub r1, r5, #1
cmp r0, r1
ldr r0, _0224A850 ; =0x00003118
@@ -56413,7 +56413,7 @@ _0224A878:
add r2, r4, r0
ldr r0, _0224AB18 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
sub r1, r5, #1
cmp r0, r1
ldr r0, _0224AB1C ; =0x00003118
@@ -56446,7 +56446,7 @@ _0224A8B0:
add r2, r4, r0
ldr r0, _0224AB18 ; =0x00002DA8
ldr r0, [r2, r0]
- bl FUN_02069BE4
+ bl GetFlavorPreferenceFromPID
sub r1, r5, #1
cmp r0, r1
ldr r0, _0224AB1C ; =0x00003118
@@ -71782,7 +71782,7 @@ _022521DC:
bl GetPartyMonByIndex
add r1, r0, #0
ldr r0, [sp, #0x1c]
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r0, [r4, #4]
ldrb r1, [r5, #0x1c]
add r0, r0, r6
@@ -71822,7 +71822,7 @@ _02252232:
bl GetPartyMonByIndex
add r1, r0, #0
ldr r0, [sp, #0x20]
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r0, [r4, #4]
ldrb r1, [r5, #0x1c]
add r0, r0, r7
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 7b1720cb..53969b45 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -8885,7 +8885,7 @@ _021DBC56:
lsl r1, r1, #4
ldr r0, [r4]
ldr r1, [r5, r1]
- bl FUN_02069A64
+ bl CopyBoxPokemonToPokemon
mov r1, #0x49
lsl r1, r1, #2
ldr r0, [r5, r1]
@@ -9038,7 +9038,7 @@ _021DBD8E:
lsl r1, r1, #4
ldr r1, [r5, r1]
add r0, r7, r6
- bl FUN_02069A64
+ bl CopyBoxPokemonToPokemon
b _021DBDB0
_021DBDA2:
mov r1, #0x1a
@@ -9367,7 +9367,7 @@ _021DC034:
lsl r1, r1, #4
ldr r0, [sp]
ldr r1, [r5, r1]
- bl FUN_02069A64
+ bl CopyBoxPokemonToPokemon
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
@@ -9633,7 +9633,7 @@ _021DC254:
cmp r0, r1
bne _021DC26A
ldr r0, [r4]
- bl FUN_02069ECC
+ bl BoxMon_UpdateArceusForme
_021DC26A:
add sp, #4
pop {r3, r4, r5, r6}
diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s
index f3a4f14c..5550c76b 100644
--- a/arm9/modules/23/asm/module_23.s
+++ b/arm9/modules/23/asm/module_23.s
@@ -1032,7 +1032,7 @@ MOD23_02254F94: ; 0x02254F94
_02254FCE:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- bl FUN_02069B60
+ bl SinnohDexNoToSpecies
add r4, r0, #0
_02254FD8:
cmp r4, #0
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 79190f60..73025559 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -4466,7 +4466,7 @@ MOD62_0222F80C: ; 0x0222F80C
add r1, #0x64
ldr r0, [r0, #4]
ldr r1, [r5, r1]
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
pop {r3, r4, r5, r6, r7, pc}
_0222F832:
ldr r1, [r5]
@@ -4487,7 +4487,7 @@ _0222F83E:
ldr r1, _0222F86C ; =0x00000428
add r0, r7, #0
ldr r1, [r5, r1]
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
pop {r3, r4, r5, r6, r7, pc}
_0222F85C:
ldr r1, [r5]
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 4f418110..b77c8662 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -6329,12 +6329,12 @@ MOD71_022309E8: ; 0x022309E8
add r1, r6, #0
bl GetPartyMonByIndex
add r1, r7, #0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
bl GetPartyMonByIndex
add r1, r4, #0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
@@ -6359,13 +6359,13 @@ _02230A40:
mov r3, #0
bl FUN_0208089C
add r0, r4, #0
- bl FUN_0206AA84
+ bl Pokemon_RemoveCapsule
ldr r1, [r5, #0x3c]
add r0, r7, #0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r1, [r5, #0x40]
add r0, r4, #0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
bl FUN_02031190
mov r1, #1
eor r0, r1
@@ -6390,13 +6390,13 @@ _02230A98:
bl GetPartyMonByIndex
add r1, r0, #0
add r0, r4, #0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
bl GetPartyMonByIndex
add r1, r0, #0
add r0, r7, #0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
ldr r0, [r5, #0x1c]
add r1, r4, #0
bl MOD71_02230AE4
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 8e74df8f..667a4ae1 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -13583,7 +13583,7 @@ _022342B0:
add r0, #0xbc
ldr r0, [r0]
add r1, r5, #0
- bl FUN_02069A64
+ bl CopyBoxPokemonToPokemon
_022342BC:
ldr r0, [r4]
ldr r0, [r0, #0x1c]
@@ -14618,7 +14618,7 @@ MOD80_02234AC0: ; 0x02234AC0
push {r4, lr}
add r4, r0, #0
add r0, #0xd4
- bl FUN_0206AA84
+ bl Pokemon_RemoveCapsule
add r0, r4, #0
add r0, #0xd4
bl MOD80_0222DBC4
@@ -14939,7 +14939,7 @@ MOD80_02234CFC: ; 0x02234CFC
push {r4, lr}
add r4, r0, #0
add r0, #0xd4
- bl FUN_0206AA84
+ bl Pokemon_RemoveCapsule
add r0, r4, #0
add r0, #0xc4
ldr r1, [r0]
@@ -16076,7 +16076,7 @@ MOD80_02235534: ; 0x02235534
ldr r0, [r0, #0xc]
bl PCStorage_GetMonByIndexPair
add r1, r4, #0
- bl FUN_02069A64
+ bl CopyBoxPokemonToPokemon
add r2, r5, #0
ldr r0, [r5]
add r2, #0xb8
@@ -16104,7 +16104,7 @@ _02235590:
ldr r0, [r0, #8]
bl GetPartyMonByIndex
add r4, r0, #0
- bl FUN_0206AA84
+ bl Pokemon_RemoveCapsule
add r2, r5, #0
ldr r0, [r5]
add r2, #0xb8
@@ -17720,7 +17720,7 @@ MOD80_02236218: ; 0x02236218
bl GetPartyMonByIndex
add r1, r0, #0
add r0, r4, #0
- bl FUN_02069B88
+ bl CopyPokemonToPokemon
add sp, #8
pop {r3, r4, r5, pc}
_02236248:
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 07:33:15 +0000