summaryrefslogtreecommitdiff
path: root/arm9/modules/06
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/06')
-rw-r--r--arm9/modules/06/asm/module_06.s346
1 files changed, 173 insertions, 173 deletions
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 2f478ef3..6819127d 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -4786,7 +4786,7 @@ _0223BA42:
add r4, r0, #0
add r0, r7, #0
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x20]
ldr r1, [sp, #0x20]
add r0, r5, #0
@@ -4804,7 +4804,7 @@ _0223BA42:
str r1, [sp, #0x34]
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, sp, #0x24
strb r0, [r1, #0x18]
_0223BA8C:
@@ -5130,7 +5130,7 @@ _0223BD2E:
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x14]
ldr r0, [sp, #8]
ldr r1, [sp, #0x14]
@@ -5149,7 +5149,7 @@ _0223BD2E:
add r2, sp, #0x20
bl MOD06_0223CF14
add r6, r0, #0
- bl rand_LC
+ bl LCRandom
mov r1, #0x29
lsl r1, r1, #4
bl _s32_div_f
@@ -5312,7 +5312,7 @@ _0223BEA4:
add r4, r0, #0
add r0, r6, #0
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x18]
ldr r1, [sp, #0x18]
add r0, r5, #0
@@ -5568,7 +5568,7 @@ _0223C0CE:
str r0, [sp, #0x14]
add r0, r6, #0
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x1c]
ldr r1, [sp, #0x1c]
ldr r2, [sp, #0x14]
@@ -5586,7 +5586,7 @@ _0223C0CE:
str r1, [sp, #0x2c]
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, sp, #0x20
strb r0, [r1, #0x14]
_0223C118:
@@ -6016,7 +6016,7 @@ MOD06_0223C470: ; 0x0223C470
add r0, r5, #0
add r0, #0x74
strh r1, [r0]
- bl rand_LC
+ bl LCRandom
mov r1, #0x29
lsl r1, r1, #4
bl _s32_div_f
@@ -6060,7 +6060,7 @@ _0223C4D4:
bls _0223C4EC
mov r4, #0x64
_0223C4EC:
- bl rand_LC
+ bl LCRandom
mov r1, #0x29
lsl r1, r1, #4
bl _s32_div_f
@@ -6144,7 +6144,7 @@ _0223C580:
MOD06_0223C584: ; 0x0223C584
push {r3, r4, r5, lr}
add r4, r1, #0
- bl rand_LC
+ bl LCRandom
mov r1, #0x29
lsl r1, r1, #4
bl _s32_div_f
@@ -6165,7 +6165,7 @@ _0223C5A8:
thumb_func_start MOD06_0223C5AC
MOD06_0223C5AC: ; 0x0223C5AC
push {r4, lr}
- bl rand_LC
+ bl LCRandom
mov r1, #0x29
lsl r1, r1, #4
bl _s32_div_f
@@ -6255,7 +6255,7 @@ _0223C644:
thumb_func_start MOD06_0223C648
MOD06_0223C648: ; 0x0223C648
push {r4, lr}
- bl rand_LC
+ bl LCRandom
mov r1, #0x29
lsl r1, r1, #4
bl _s32_div_f
@@ -6300,7 +6300,7 @@ MOD06_0223C694: ; 0x0223C694
push {r4, r5, r6, lr}
add r5, r0, #0
mov r4, #0
- bl rand_LC
+ bl LCRandom
mov r1, #0x29
lsl r1, r1, #4
bl _s32_div_f
@@ -6400,7 +6400,7 @@ MOD06_0223C738: ; 0x0223C738
add r4, r1, #0
mov r1, #6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
cmp r1, #0xe0
@@ -6452,7 +6452,7 @@ MOD06_0223C78C: ; 0x0223C78C
ldrb r0, [r1, #0xe]
cmp r0, #0x1c
bne _0223C7C6
- bl rand_LC
+ bl LCRandom
lsl r0, r0, #1
lsr r5, r0, #0x10
cmp r5, #2
@@ -6464,14 +6464,14 @@ _0223C7AC:
mov r1, #0
add r0, r4, #0
add r2, r1, #0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #0x19
bl _u32_div_f
lsl r0, r1, #0x18
lsr r0, r0, #0x18
pop {r3, r4, r5, pc}
_0223C7C6:
- bl rand_LC
+ bl LCRandom
ldr r1, _0223C7E4 ; =0x00000A3E
bl _s32_div_f
lsl r0, r0, #0x10
@@ -6504,7 +6504,7 @@ _0223C7FC:
lsl r0, r2, #0x18
_0223C802:
lsr r4, r0, #0x18
- bl rand_LC
+ bl LCRandom
sub r1, r4, r5
add r1, r1, #1
lsl r1, r1, #0x18
@@ -6523,7 +6523,7 @@ _0223C802:
cmp r0, #0x2e
bne _0223C84C
_0223C82C:
- bl rand_LC
+ bl LCRandom
lsl r0, r0, #1
lsr r7, r0, #0x10
cmp r7, #2
@@ -6574,7 +6574,7 @@ MOD06_0223C854: ; 0x0223C854
beq _0223C8E0
cmp r0, #0xff
beq _0223C8E0
- bl rand_LC
+ bl LCRandom
ldr r1, _0223C964 ; =0x00005556
bl _s32_div_f
lsl r0, r0, #0x10
@@ -6588,7 +6588,7 @@ _0223C8A6:
ldr r0, [sp, #0x44]
mov r1, #0x6f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x24]
@@ -6597,7 +6597,7 @@ _0223C8A6:
_0223C8BE:
cmp r0, #0x1c
bne _0223C8E0
- bl rand_LC
+ bl LCRandom
lsl r0, r0, #1
lsr r4, r0, #0x10
cmp r4, #2
@@ -6607,12 +6607,12 @@ _0223C8D2:
cmp r4, #0
bne _0223C8E0
ldr r0, [sp, #0x44]
- bl GetMonNatureEncrypted
+ bl GetMonNature
str r0, [sp, #0x20]
mov r7, #1
_0223C8E0:
add r0, r5, #0
- bl FUN_02068AD8
+ bl GenerateShinyPersonality
add r4, r0, #0
cmp r7, #0
beq _0223C92E
@@ -6632,7 +6632,7 @@ _0223C904:
cmp r7, r0
bne _0223C92E
add r0, r5, #0
- bl FUN_02068AD8
+ bl GenerateShinyPersonality
add r4, r0, #0
b _0223C8EC
_0223C914:
@@ -6644,7 +6644,7 @@ _0223C914:
cmp r0, r1
beq _0223C92E
add r0, r5, #0
- bl FUN_02068AD8
+ bl GenerateShinyPersonality
add r4, r0, #0
b _0223C8EC
_0223C92E:
@@ -6708,7 +6708,7 @@ _0223C998:
ldrb r0, [r5, #0xe]
cmp r0, #0x38
bne _0223CA28
- bl rand_LC
+ bl LCRandom
ldr r1, _0223CA68 ; =0x00005556
bl _s32_div_f
lsl r0, r0, #0x10
@@ -6722,7 +6722,7 @@ _0223C9BE:
ldr r0, [sp, #0x28]
mov r1, #0x6f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x18
lsr r6, r0, #0x18
cmp r6, #1
@@ -6748,11 +6748,11 @@ _0223C9E4:
add r0, r4, #0
add r1, r7, #0
mov r3, #0x20
- bl CreateMonWithNatureGenderLetter
+ bl CreateMonWithGenderNatureLetter
add r0, r4, #0
mov r1, #7
add r2, r5, #0
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #0x10]
ldr r3, [sp, #0x2c]
add r1, r5, #0
@@ -6779,7 +6779,7 @@ _0223CA28:
add r0, r4, #0
mov r1, #7
add r2, r5, #0
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #0x10]
ldr r3, [sp, #0x2c]
add r1, r5, #0
@@ -7118,14 +7118,14 @@ MOD06_0223CCDC: ; 0x0223CCDC
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0xc]
ldr r1, [sp, #0xc]
add r0, r5, #0
mov r2, #0
add r3, sp, #0x10
bl MOD06_0223D2DC
- bl rand_LC
+ bl LCRandom
ldr r1, _0223CD78 ; =0x00001746
bl _s32_div_f
lsl r0, r0, #0x10
@@ -7149,7 +7149,7 @@ _0223CD1A:
cmp r0, #0x2e
bne _0223CD4C
_0223CD36:
- bl rand_LC
+ bl LCRandom
lsl r0, r0, #1
lsr r6, r0, #0x10
cmp r6, #2
@@ -7194,7 +7194,7 @@ MOD06_0223CD7C: ; 0x0223CD7C
add r6, r3, #0
bl FUN_0206BB1C
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, r0, #0
add r0, r5, #0
add r1, r4, #0
@@ -7360,7 +7360,7 @@ _0223CEB6:
mov r0, #0
pop {r4, r5, r6, r7, pc}
_0223CEBC:
- bl rand_LC
+ bl LCRandom
add r1, r4, #0
bl _s32_div_f
add r0, sp, #0x10
@@ -7384,7 +7384,7 @@ MOD06_0223CED4: ; 0x0223CED4
ldrb r0, [r0, #0x14]
cmp r1, r0
bne _0223CF0E
- bl rand_LC
+ bl LCRandom
lsl r0, r0, #1
lsr r4, r0, #0x10
cmp r4, #2
@@ -7488,7 +7488,7 @@ _0223CF96:
add r0, r1, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
cmp r0, #5
@@ -7499,7 +7499,7 @@ _0223CFAC:
sub r0, r0, #5
cmp r4, r0
bgt _0223CFCA
- bl rand_LC
+ bl LCRandom
lsl r0, r0, #1
lsr r4, r0, #0x10
cmp r4, #2
@@ -7622,19 +7622,19 @@ MOD06_0223D044: ; 0x0223D044
add r0, r4, #0
lsr r1, r1, #0x10
add r2, r7, #0
- bl FUN_02066EA4
+ bl CreateMonWithFixedIVs
add r0, r4, #0
mov r1, #7
add r2, sp, #0x30
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r4, #0
mov r1, #0x9f
add r2, sp, #0x14
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r4, #0
mov r1, #0xa2
add r2, sp, #0x10
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [r6, #8]
add r1, r4, #0
bl FUN_0206B900
@@ -7698,7 +7698,7 @@ _0223D134:
mov r0, #0
pop {r4, r5, r6, r7, pc}
_0223D148:
- bl rand_LC
+ bl LCRandom
lsl r0, r0, #1
lsr r4, r0, #0x10
cmp r4, #2
@@ -7722,7 +7722,7 @@ _0223D16E:
mov r4, #0
b _0223D19E
_0223D176:
- bl rand_LC
+ bl LCRandom
add r4, r0, #0
ldr r0, _0223D1B8 ; =0x0000FFFF
add r1, r5, #0
@@ -7782,7 +7782,7 @@ _0223D1DA:
add r0, r6, #0
mov r1, #5
add r2, r4, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _0223D270 ; =0x000001A6
cmp r0, r1
bne _0223D208
@@ -7823,7 +7823,7 @@ _0223D222:
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #4]
- bl rand_LC
+ bl LCRandom
ldr r1, [sp, #4]
bl _s32_div_f
ldrb r0, [r5, #0x11]
@@ -7839,7 +7839,7 @@ _0223D24E:
add r0, r6, #0
mov r1, #0x70
add r2, sp, #8
- bl SetMonDataEncrypted
+ bl SetMonData
_0223D25C:
ldr r0, [sp]
add r1, r6, #0
@@ -7870,7 +7870,7 @@ MOD06_0223D27C: ; 0x0223D27C
cmp r0, #0x2e
bne _0223D2D8
_0223D296:
- bl rand_LC
+ bl LCRandom
lsl r0, r0, #1
lsr r6, r0, #0x10
cmp r6, #2
@@ -7919,14 +7919,14 @@ MOD06_0223D2DC: ; 0x0223D2DC
mov r1, #0x4c
mov r2, #0
add r4, r3, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0223D302
mov r2, #0
add r0, r7, #0
mov r1, #0xa
strb r2, [r4, #0xd]
- bl GetMonDataEncrypted
+ bl GetMonData
b _0223D308
_0223D302:
mov r0, #1
@@ -19735,7 +19735,7 @@ MOD06_022432E4: ; 0x022432E4
add r0, r1, #0
bl FUN_0206BB1C
str r0, [sp, #4]
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x18
lsr r1, r0, #0x18
str r1, [sp, #8]
@@ -19754,23 +19754,23 @@ _02243308:
_02243312:
ldr r0, [sp, #4]
add r1, r7, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
str r0, [sp, #0xc]
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r5, r0, #0x10
ldr r0, [sp, #0xc]
mov r1, #6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r6, r0, #0x10
ldr r0, [sp, #0xc]
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0224336E
add r0, r5, #0
@@ -20281,18 +20281,18 @@ _02243726:
add r1, #0x2a
ldrb r1, [r1]
ldr r0, [sp, #8]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
lsl r1, r4, #1
add r6, r5, r1
add r7, r0, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r6, #0x2e]
add r0, r7, #0
mov r1, #6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r6, #0x36]
add r0, r4, #1
lsl r0, r0, #0x10
@@ -20333,17 +20333,17 @@ _0224379C:
add r1, r1, r5
add r1, #0x2a
ldrb r1, [r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #8]
lsl r6, r5, #1
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, r6]
ldr r0, [sp, #8]
mov r1, #6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r7, r6]
cmp r5, #0
beq _022437FA
@@ -20579,7 +20579,7 @@ _0224394A:
bne _0224396C
add r5, #0x2a
ldrb r1, [r5]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r2, r0, #0
add r0, r4, #0
add r1, r6, #0
@@ -20589,7 +20589,7 @@ _0224394A:
_0224396C:
add r5, #0x2a
ldrb r1, [r5]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r2, r0, #0
add r0, r4, #0
add r1, r6, #0
@@ -21453,17 +21453,17 @@ _02243FFA:
add r1, #0x2a
ldrb r1, [r1]
ldr r0, [sp]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r6, #0
mov r2, #0
str r0, [sp, #4]
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _02244024
ldr r0, [sp, #4]
add r1, r6, #0
add r2, sp, #8
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r7, #1
lsl r0, r0, #0x18
lsr r7, r0, #0x18
@@ -21522,7 +21522,7 @@ MOD06_0224406C: ; 0x0224406C
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp]
lsl r0, r0, #0x10
ldrh r1, [r1]
@@ -21537,7 +21537,7 @@ MOD06_0224406C: ; 0x0224406C
strh r1, [r0]
add r0, r5, #0
mov r1, #0x70
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp]
lsl r0, r0, #0x10
ldrh r2, [r1]
@@ -21552,7 +21552,7 @@ MOD06_0224406C: ; 0x0224406C
strh r1, [r0]
add r0, r5, #0
mov r1, #6
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp]
mov r4, #0
strh r0, [r1, #2]
@@ -21567,13 +21567,13 @@ _022440D0:
add r0, r5, #0
add r1, #0x36
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r4, #0
strh r0, [r6, #4]
add r0, r5, #0
add r1, #0x3e
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp, #4]
lsl r0, r7
ldrb r1, [r1]
@@ -21588,25 +21588,25 @@ _022440D0:
add r0, r5, #0
mov r1, #0xc
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp]
mov r2, #0
strb r0, [r1, #0x1f]
add r0, r5, #0
mov r1, #7
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp]
str r0, [r1, #0xc]
mov r1, #0
add r0, r5, #0
add r2, r1, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp]
mov r2, #0
str r0, [r1, #0x10]
add r0, r5, #0
mov r1, #0xae
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp]
mov r4, #0
str r0, [r1, #0x14]
@@ -21616,7 +21616,7 @@ _0224413C:
add r0, r5, #0
add r1, #0xd
add r2, r6, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp]
add r1, r1, r4
add r4, r4, #1
@@ -21626,14 +21626,14 @@ _0224413C:
add r0, r5, #0
mov r1, #0xa
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp]
mov r2, #0
add r1, #0x20
strb r0, [r1]
add r0, r5, #0
mov r1, #9
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp]
ldr r2, [sp]
add r1, #0x21
@@ -21642,7 +21642,7 @@ _0224413C:
add r0, r5, #0
mov r1, #0x74
str r2, [sp]
- bl GetMonDataEncrypted
+ bl GetMonData
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -21673,7 +21673,7 @@ _022441B8:
add r1, #0x2a
ldrb r1, [r1]
add r0, r7, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
add r0, r5, #0
bl MOD06_0224406C
@@ -21909,7 +21909,7 @@ MOD06_02244388: ; 0x02244388
lsr r1, r1, #0x15
mov r2, #0x32
and r3, r4
- bl FUN_02066EA4
+ bl CreateMonWithFixedIVs
ldrh r0, [r6]
add r2, sp, #8
add r2, #1
@@ -21919,11 +21919,11 @@ MOD06_02244388: ; 0x02244388
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x70
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r5, #0
mov r1, #6
add r2, r6, #2
- bl SetMonDataEncrypted
+ bl SetMonData
mov r4, #0
str r6, [sp, #4]
add r7, r4, #0
@@ -21937,7 +21937,7 @@ _022443D4:
add r1, r4, #0
add r0, r5, #0
add r1, #0x36
- bl SetMonDataEncrypted
+ bl SetMonData
ldrb r0, [r6, #0x1e]
add r2, sp, #8
add r2, #1
@@ -21950,19 +21950,19 @@ _022443D4:
add r1, r4, #0
add r0, r5, #0
add r1, #0x3e
- bl SetMonDataEncrypted
+ bl SetMonData
add r1, r4, #0
add r0, r5, #0
add r1, #0x42
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, sp, #8
strb r0, [r1]
add r1, r4, #0
add r0, r5, #0
add r1, #0x3a
add r2, sp, #8
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #4]
add r4, r4, #1
add r0, r0, #2
@@ -21975,7 +21975,7 @@ _022443D4:
str r0, [sp, #0xc]
add r0, r5, #0
add r2, sp, #0xc
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, sp, #8
ldrb r1, [r6, #0x18]
add r0, sp, #8
@@ -21983,7 +21983,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xd
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, sp, #8
ldrb r1, [r6, #0x19]
add r0, sp, #8
@@ -21991,7 +21991,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xe
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, sp, #8
ldrb r1, [r6, #0x1a]
add r0, sp, #8
@@ -21999,7 +21999,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xf
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, sp, #8
ldrb r1, [r6, #0x1b]
add r0, sp, #8
@@ -22007,7 +22007,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x10
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, sp, #8
ldrb r1, [r6, #0x1c]
add r0, sp, #8
@@ -22015,7 +22015,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x11
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, sp, #8
ldrb r1, [r6, #0x1d]
add r0, sp, #8
@@ -22023,17 +22023,17 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x12
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r6, #0
add r0, r5, #0
mov r1, #0xa
add r2, #0x20
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r6, #0
add r0, r5, #0
mov r1, #9
add r2, #0x21
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [r6, #0x14]
lsl r0, r0, #1
lsr r0, r0, #0x1f
@@ -22052,7 +22052,7 @@ _022443D4:
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r7, #0
bl FUN_02021A20
add r0, r4, #0
@@ -22063,15 +22063,15 @@ _022444FC:
add r0, r5, #0
mov r1, #0x74
add r2, #0x22
- bl SetMonDataEncrypted
+ bl SetMonData
_02244508:
add r6, #0x1f
add r0, r5, #0
mov r1, #0xc
add r2, r6, #0
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r5, #0
- bl UpdateMonLevelAndRecalcStats
+ bl CalcMonLevelAndStats
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -22151,28 +22151,28 @@ _022445A6:
add r1, #0x2a
ldrb r1, [r1]
ldr r0, [sp, #4]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r4, #0
bl FUN_02069B88
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x32
bls _022445E8
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #0x32
- bl GetMonExpByLevel
+ bl GetMonExpBySpeciesAndLevel
str r0, [sp, #8]
add r0, r4, #0
mov r1, #8
add r2, sp, #8
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r4, #0
- bl UpdateMonLevelAndRecalcStats
+ bl CalcMonLevelAndStats
_022445E8:
add r0, r7, #0
add r1, r4, #0
@@ -22345,10 +22345,10 @@ _0224471C:
add r1, #0x2a
ldrb r1, [r1]
add r0, r7, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #0x21
lsl r1, r1, #6
strh r0, [r5, r1]
@@ -22587,7 +22587,7 @@ _022448EC:
beq _0224491A
ldr r0, [sp]
add r1, r7, #0
- bl FUN_02068AAC
+ bl CalcShininessByOtIdAndPersonality
cmp r0, #1
beq _022448EC
_0224491A:
@@ -23252,7 +23252,7 @@ _02244DF4:
mov r2, #2
b _02244E10
_02244DF8:
- bl rand_LC
+ bl LCRandom
lsr r2, r0, #0x1f
lsl r1, r0, #0x1f
sub r1, r1, r2
@@ -23611,7 +23611,7 @@ _02245098:
add r2, sp, #0x24
add r3, sp, #0x28
bl MOD06_0224CDB8
- bl rand_LC
+ bl LCRandom
ldr r1, _02245110 ; =0x00001556
bl _s32_div_f
lsl r0, r0, #0x10
@@ -23644,7 +23644,7 @@ MOD06_02245114: ; 0x02245114
add r7, r0, #0
mov r4, #0
_02245132:
- bl rand_LC
+ bl LCRandom
ldr r1, _0224518C ; =0x0000071D
bl _s32_div_f
lsl r0, r0, #0x10
@@ -25503,7 +25503,7 @@ MOD06_02245EC0: ; 0x02245EC0
add r1, sp, #0x10
bl FUN_02020064
mov r0, #0
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
add r0, r4, #0
bl FUN_02020088
@@ -25715,7 +25715,7 @@ MOD06_02246034: ; 0x02246034
lsl r0, r3, #0x11
str r0, [r4, #0x4c]
mov r0, #0x2d
- bl FUN_0201B988
+ bl Cos_Wrap
ldr r2, [r4, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -25729,7 +25729,7 @@ MOD06_02246034: ; 0x02246034
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B970
+ bl Sin_Wrap
ldr r2, [r4, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -25757,7 +25757,7 @@ MOD06_02246034: ; 0x02246034
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
ldr r0, [r4, #0x68]
bl FUN_02020088
@@ -25801,7 +25801,7 @@ MOD06_02246034: ; 0x02246034
add r1, sp, #0
bl FUN_02020064
mov r0, #0
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
add r0, r4, #0
bl FUN_02020088
@@ -25851,7 +25851,7 @@ _022461C6:
str r0, [r5, #0x4c]
_022461D2:
mov r0, #0x2d
- bl FUN_0201B988
+ bl Cos_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -25865,7 +25865,7 @@ _022461D2:
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B970
+ bl Sin_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -26005,7 +26005,7 @@ _022462F4:
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B988
+ bl Cos_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -26014,7 +26014,7 @@ _022462F4:
mul r0, r1
str r0, [r5, #0x14]
mov r0, #0x80
- bl FUN_0201B970
+ bl Sin_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -26042,7 +26042,7 @@ _02246338:
lsl r0, r0, #4
lsr r0, r0, #0x10
str r1, [r5, #0x38]
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
add r0, r4, #0
bl FUN_02020088
@@ -26185,7 +26185,7 @@ _022463F6:
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
ldr r0, [r4, #0x68]
bl FUN_02020088
@@ -26235,7 +26235,7 @@ _022464C4:
str r0, [r5, #0x48]
_022464CE:
ldr r0, _022465AC ; =0x0000013B
- bl FUN_0201B988
+ bl Cos_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -26249,7 +26249,7 @@ _022464CE:
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B970
+ bl Sin_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -26314,7 +26314,7 @@ _02246560:
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
add r0, r4, #0
bl FUN_02020088
@@ -26833,7 +26833,7 @@ MOD06_0224690C: ; 0x0224690C
str r0, [r4]
ldr r0, [r4, #0x5c]
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl FUN_02005578
@@ -28322,7 +28322,7 @@ MOD06_0224743C: ; 0x0224743C
add r1, sp, #0x10
bl FUN_02020064
add r0, r7, #0
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
add r0, r4, #0
bl FUN_02020088
@@ -28745,7 +28745,7 @@ _022477A8:
mov r1, #0
add r0, r6, #0
add r2, r1, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp]
mov r0, #0
str r0, [sp, #4]
@@ -29398,7 +29398,7 @@ MOD06_02247C0C: ; 0x02247C0C
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
ldr r0, [r4, #0x58]
bl FUN_02020088
@@ -29431,7 +29431,7 @@ MOD06_02247CB4: ; 0x02247CB4
str r0, [r5, #0x4c]
_02247CD4:
ldr r0, _02247DB4 ; =0x0000013B
- bl FUN_0201B988
+ bl Cos_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -29445,7 +29445,7 @@ _02247CD4:
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B970
+ bl Sin_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -29509,7 +29509,7 @@ _02247D64:
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
add r0, r4, #0
bl FUN_02020088
@@ -29610,7 +29610,7 @@ MOD06_02247DC4: ; 0x02247DC4
lsl r0, r7, #0x11
str r0, [r4, #0x4c]
lsr r0, r6, #0xc
- bl FUN_0201B988
+ bl Cos_Wrap
ldr r2, [r4, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -29624,7 +29624,7 @@ MOD06_02247DC4: ; 0x02247DC4
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B970
+ bl Sin_Wrap
ldr r2, [r4, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -29652,7 +29652,7 @@ MOD06_02247DC4: ; 0x02247DC4
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
ldr r0, [r4, #0x58]
bl FUN_02020088
@@ -29701,7 +29701,7 @@ MOD06_02247DC4: ; 0x02247DC4
add r1, sp, #0
bl FUN_02020064
mov r0, #0
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
add r0, r4, #0
bl FUN_02020088
@@ -29746,7 +29746,7 @@ _02247F58:
str r0, [r5, #0x4c]
_02247F64:
ldr r0, _02248098 ; =0x0000013B
- bl FUN_0201B988
+ bl Cos_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -29760,7 +29760,7 @@ _02247F64:
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B970
+ bl Sin_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -29827,7 +29827,7 @@ _02247FFA:
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B9A0
+ bl MathUtil_0201B9A0
add r1, r0, #0
add r0, r4, #0
bl FUN_02020088
@@ -29973,7 +29973,7 @@ _02248120:
add r0, r1, r0
lsl r0, r0, #4
lsr r0, r0, #0x10
- bl FUN_0201B988
+ bl Cos_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -29982,7 +29982,7 @@ _02248120:
mul r0, r1
str r0, [r5, #0x14]
mov r0, #0x80
- bl FUN_0201B970
+ bl Sin_Wrap
ldr r2, [r5, #0x48]
asr r1, r2, #0xb
lsr r1, r1, #0x14
@@ -30761,7 +30761,7 @@ MOD06_02248724: ; 0x02248724
ldr r0, [r1, #8]
str r1, [sp]
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r6, r0, #0
ldr r0, [r5, #0xc]
bl FUN_0202A9B0
@@ -30769,7 +30769,7 @@ MOD06_02248724: ; 0x02248724
add r0, r6, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r0, #0
add r0, r7, #0
bl MOD06_02248810
@@ -30779,13 +30779,13 @@ MOD06_02248724: ; 0x02248724
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r6, #0
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x18
lsr r6, r0, #0x18
ldr r0, [sp]
@@ -30818,7 +30818,7 @@ _0224879E:
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
_022487AC:
- bl rand_LC
+ bl LCRandom
mov r1, #0x29
lsl r1, r1, #4
bl _s32_div_f
@@ -31014,11 +31014,11 @@ MOD06_0224891C: ; 0x0224891C
add r4, r3, #0
bl FUN_0206BB1C
add r1, r7, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa0
mov r2, #0
add r7, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r2, r0, #0
ldr r0, [r5, #0x10]
str r0, [sp]
@@ -31114,7 +31114,7 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r7, #0
bl FUN_02021A20
mov r1, #1
@@ -31123,66 +31123,66 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x4d
add r2, sp, #0x10
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r5, #0
mov r1, #0x46
add r2, r4, #4
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x47
add r2, #8
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x48
add r2, #0xc
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x49
add r2, #0x10
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4a
add r2, #0x14
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4b
add r2, #0x18
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x13
add r2, #0x24
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x14
add r2, #0x28
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x15
add r2, #0x2c
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x16
add r2, #0x30
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x17
add r2, #0x34
- bl SetMonDataEncrypted
+ bl SetMonData
add r2, r4, #0
add r0, r5, #0
mov r1, #6
add r2, #0x3c
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #0x28]
add r1, r6, #4
bl MOD06_022489AC
@@ -31190,19 +31190,19 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x90
add r2, r6, #0
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r6, #0
bl FUN_02021A20
add r2, r4, #0
add r0, r5, #0
mov r1, #0x9c
add r2, #0x40
- bl SetMonDataEncrypted
+ bl SetMonData
add r4, #0x48
add r0, r5, #0
mov r1, #0xc
add r2, r4, #0
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #0x2c]
bl FUN_02034824
add r3, r0, #0
@@ -31213,9 +31213,9 @@ MOD06_022489D4: ; 0x022489D4
mov r2, #1
bl FUN_0208089C
add r0, r5, #0
- bl UpdateMonLevelAndRecalcStats
+ bl CalcMonLevelAndStats
add r0, r5, #0
- bl FUN_02068A80
+ bl MonIsShiny
cmp r0, #0
beq _02248B08
bl ErrorHandling
@@ -31661,7 +31661,7 @@ _02248E32:
ldrb r0, [r0]
pop {r3, r4, r5, pc}
_02248E3E:
- bl rand_MT
+ bl MTRandom
add r1, r4, #0
bl _u32_div_f
add r0, sp, #0
@@ -32194,7 +32194,7 @@ MOD06_022491FC: ; 0x022491FC
mov r0, #0
pop {r4, pc}
_0224921E:
- bl rand_MT
+ bl MTRandom
add r1, r4, #0
bl _u32_div_f
add r0, sp, #0
@@ -39651,7 +39651,7 @@ _0224CBE0:
_0224CBF0:
mov r7, #0
_0224CBF2:
- bl rand_LC
+ bl LCRandom
lsl r0, r0, #4
lsr r5, r0, #0x10
cmp r5, #0x10
@@ -39709,7 +39709,7 @@ MOD06_0224CC60: ; 0x0224CC60
push {r4, r5, r6, r7, lr}
sub sp, #0x4c
add r5, r0, #0
- bl rand_LC
+ bl LCRandom
lsl r0, r0, #1
lsr r4, r0, #0x10
cmp r4, #2
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 23:31:38 +0000