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.s170
1 files changed, 85 insertions, 85 deletions
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 529aeb97..2f478ef3 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -6555,7 +6555,7 @@ MOD06_0223C854: ; 0x0223C854
mov r0, #0xb
str r2, [sp, #0x18]
add r5, r3, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x1c]
bl ZeroMonData
ldrb r0, [r6, #0xd]
@@ -6607,7 +6607,7 @@ _0223C8D2:
cmp r4, #0
bne _0223C8E0
ldr r0, [sp, #0x44]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
str r0, [sp, #0x20]
mov r7, #1
_0223C8E0:
@@ -6622,7 +6622,7 @@ _0223C8EC:
bne _0223C914
ldr r0, [sp, #0x10]
add r1, r4, #0
- bl FUN_02068A20
+ bl GetGenderBySpeciesAndPersonality
add r7, r0, #0
cmp r7, #2
bne _0223C904
@@ -6684,7 +6684,7 @@ MOD06_0223C968: ; 0x0223C968
str r1, [sp, #0xc]
str r2, [sp, #0x10]
add r5, r3, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
bl ZeroMonData
add r0, r7, #0
@@ -6748,11 +6748,11 @@ _0223C9E4:
add r0, r4, #0
add r1, r7, #0
mov r3, #0x20
- bl FUN_02066DD4
+ bl CreateMonWithNatureGenderLetter
add r0, r4, #0
mov r1, #7
add r2, r5, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
ldr r3, [sp, #0x2c]
add r1, r5, #0
@@ -7586,7 +7586,7 @@ MOD06_0223D044: ; 0x0223D044
add r5, r1, #0
mov r0, #4
add r6, r2, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
add r0, r5, #0
mov r1, #4
@@ -7626,15 +7626,15 @@ MOD06_0223D044: ; 0x0223D044
add r0, r4, #0
mov r1, #7
add r2, sp, #0x30
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0x9f
add r2, sp, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0xa2
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r6, #8]
add r1, r4, #0
bl FUN_0206B900
@@ -7839,7 +7839,7 @@ _0223D24E:
add r0, r6, #0
mov r1, #0x70
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0223D25C:
ldr r0, [sp]
add r1, r6, #0
@@ -8340,7 +8340,7 @@ MOD06_0223D618: ; 0x0223D618
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r1, #0x88
str r0, [r1]
@@ -8588,7 +8588,7 @@ _0223D804:
add r0, r4, #0
add r0, #0x88
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
add r0, #0x8c
ldr r0, [r0]
@@ -9055,7 +9055,7 @@ MOD06_0223DBF4: ; 0x0223DBF4
mov r1, #0x1a
sub r2, #0xe9
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp]
b _0223DC34
_0223DC12:
@@ -9065,7 +9065,7 @@ _0223DC12:
mov r1, #0x1a
sub r2, #0xa
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp]
b _0223DC34
_0223DC26:
@@ -9073,7 +9073,7 @@ _0223DC26:
mov r1, #0x1a
mov r2, #0xa
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp]
_0223DC34:
mov r0, #0x8b
@@ -9127,7 +9127,7 @@ _0223DC8E:
sub r3, #0xa
bl FUN_02012880
ldr r0, [sp]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r4, _0223DCEC ; =0x0224F38C
add r3, sp, #4
add r2, r3, #0
@@ -9206,21 +9206,21 @@ _0223DD3C:
mov r1, #0x1a
sub r2, #0xa
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r5, #0
add r7, r0, #0
add r1, #0x8a
bl FUN_0200A914
add r6, r0, #0
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
b _0223DD86
_0223DD60:
mov r0, #0
mov r1, #0x1a
sub r2, #0x5a
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
lsl r0, r5, #0x18
lsr r0, r0, #0x18
@@ -9230,7 +9230,7 @@ _0223DD60:
bl FUN_0200A914
add r6, r0, #0
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
_0223DD86:
mov r1, #0
str r1, [sp]
@@ -11371,7 +11371,7 @@ _0223EF28:
strb r2, [r0]
ldr r2, _0223EFF8 ; =0x0000013A
mov r0, #1
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _0223EFF4 ; =0x02252420
ldr r2, [r1]
str r0, [r2, #0x74]
@@ -11498,7 +11498,7 @@ _0223F060:
ldr r0, _0223F08C ; =0x02252420
ldr r0, [r0]
ldr r0, [r0, #0x74]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0223F08C ; =0x02252420
ldr r0, [r0]
ldr r1, [r0, #0x4c]
@@ -14889,7 +14889,7 @@ MOD06_02240C58: ; 0x02240C58
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x30]
mov r0, #0xb4
mov r1, #4
@@ -15195,7 +15195,7 @@ _02240EE0:
ldr r0, [sp, #0x28]
bl FUN_02021A20
ldr r0, [sp, #0x30]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [sp, #0x24]
bl FUN_020191D0
add sp, #0x34
@@ -15488,7 +15488,7 @@ _0224113A:
ldr r0, [r4, #0x64]
bl FUN_0200AB18
ldr r0, [r4, #0x68]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x14]
bl FUN_02021A20
ldr r0, [r4, #0x18]
@@ -15535,7 +15535,7 @@ MOD06_02241188: ; 0x02241188
mov r1, #0x1a
mov r2, #0xcf
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x68]
mov r0, #0xb4
mov r1, #4
@@ -18878,7 +18878,7 @@ MOD06_02242C78: ; 0x02242C78
mov r0, #1
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r5, #0x54]
mov r0, #4
bl FUN_0200AA80
@@ -19392,7 +19392,7 @@ _02243060:
ldr r0, [r6, #0x58]
bl FUN_0200AB18
ldr r0, [r6, #0x54]
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r4, r5, r6, pc}
.align 2, 0
_0224307C: .word 0x000005DC
@@ -21463,7 +21463,7 @@ _02243FFA:
ldr r0, [sp, #4]
add r1, r6, #0
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #1
lsl r0, r0, #0x18
lsr r7, r0, #0x18
@@ -21734,7 +21734,7 @@ MOD06_02244210: ; 0x02244210
mov r0, #1
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x10]
mov r0, #0x13
mov r1, #0xe
@@ -21781,7 +21781,7 @@ _0224429E:
cmp r4, #0x12
blo _02244264
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [sp, #0x1c]
bl FUN_02021A20
add r0, r6, #0
@@ -21919,11 +21919,11 @@ MOD06_02244388: ; 0x02244388
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x70
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #6
add r2, r6, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldrb r0, [r6, #0x1e]
add r2, sp, #8
add r2, #1
@@ -21950,7 +21950,7 @@ _022443D4:
add r1, r4, #0
add r0, r5, #0
add r1, #0x3e
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r4, #0
add r0, r5, #0
add r1, #0x42
@@ -21962,7 +21962,7 @@ _022443D4:
add r0, r5, #0
add r1, #0x3a
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r6, #0
add r0, r5, #0
mov r1, #0xa
add r2, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r6, #0
add r0, r5, #0
mov r1, #9
add r2, #0x21
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r6, #0x14]
lsl r0, r0, #1
lsr r0, r0, #0x1f
@@ -22042,7 +22042,7 @@ _022443D4:
mov r0, #1
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldrh r1, [r6]
add r4, r0, #0
lsl r1, r1, #0x15
@@ -22052,26 +22052,26 @@ _022443D4:
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
bl FUN_02021A20
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
b _02244508
_022444FC:
add r2, r6, #0
add r0, r5, #0
mov r1, #0x74
add r2, #0x22
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02244508:
add r6, #0x1f
add r0, r5, #0
mov r1, #0xc
add r2, r6, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -22137,7 +22137,7 @@ MOD06_02244558: ; 0x02244558
add r0, r0, #4
str r1, [r7, r0]
ldr r0, [r5, #4]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
ldrb r1, [r5, #0xe]
ldr r0, [r7, #4]
@@ -22170,9 +22170,9 @@ _022445A6:
add r0, r4, #0
mov r1, #8
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
_022445E8:
add r0, r7, #0
add r1, r4, #0
@@ -22477,7 +22477,7 @@ MOD06_02244820: ; 0x02244820
mov r1, #0x1a
mov r2, #0x10
add r3, r6, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
add r0, r4, #0
add r1, r6, #0
@@ -22502,7 +22502,7 @@ MOD06_02244820: ; 0x02244820
add r0, r4, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -22713,7 +22713,7 @@ _022449F2:
lsl r0, r0, #0x15
lsr r0, r0, #0x15
add r2, r5, #0
- bl FUN_0200A99C
+ bl GetSpeciesName
add r0, r7, #0
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
@@ -23177,7 +23177,7 @@ MOD06_02244D04: ; 0x02244D04
add r0, #0x5a
strh r1, [r0]
ldr r0, [sp, #0x20]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
ldr r0, [sp]
mov r6, #0
@@ -30932,7 +30932,7 @@ _0224886C:
str r5, [r4, #0x10]
str r6, [r4, #0xc]
add r0, r5, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [r4, #4]
add r0, r5, #0
bl FUN_02023928
@@ -31078,13 +31078,13 @@ MOD06_022489AC: ; 0x022489AC
add r4, r1, #0
mov r0, #0
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r5, r0, #0
add r1, r4, #0
bl FUN_0200A914
add r4, r0, #0
add r0, r5, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
pop {r3, r4, r5, pc}
.align 2, 0
@@ -31114,7 +31114,7 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #0x46
add r2, r4, #4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x47
add r2, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x48
add r2, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x49
add r2, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4a
add r2, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4b
add r2, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x13
add r2, #0x24
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x14
add r2, #0x28
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x15
add r2, #0x2c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x16
add r2, #0x30
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x17
add r2, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #6
add r2, #0x3c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
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 SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
bl FUN_02021A20
add r2, r4, #0
add r0, r5, #0
mov r1, #0x9c
add r2, #0x40
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r4, #0x48
add r0, r5, #0
mov r1, #0xc
add r2, r4, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x2c]
bl FUN_02034824
add r3, r0, #0
@@ -31213,7 +31213,7 @@ MOD06_022489D4: ; 0x022489D4
mov r2, #1
bl FUN_0208089C
add r0, r5, #0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add r0, r5, #0
bl FUN_02068A80
cmp r0, #0
@@ -40792,7 +40792,7 @@ MOD06_0224D46C: ; 0x0224D46C
mov r1, #0x1a
mov r2, #0xc3
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x10]
mov r0, #0xb
bl FUN_0200AA80
@@ -41031,7 +41031,7 @@ MOD06_0224D6A4: ; 0x0224D6A4
add r0, r4, #0
bl FUN_02019178
ldr r0, [r4, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x14]
bl FUN_0200AB18
add r0, r4, #0
@@ -41103,7 +41103,7 @@ MOD06_0224D70C: ; 0x0224D70C
mov r0, #0
mov r1, #0x1a
lsl r2, r2, #2
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x52
lsl r1, r1, #2
str r0, [r4, r1]
@@ -41123,7 +41123,7 @@ MOD06_0224D76C: ; 0x0224D76C
mov r0, #0x52
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
bl MOD06_0224DC28
add r0, r4, #0
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 19:05:30 +0000