summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRevo <projectrevotpp@hotmail.com>2020-05-29 17:43:19 -0400
committerGitHub <noreply@github.com>2020-05-29 17:43:19 -0400
commit6bc6ec1ccc052f03a9c1a5b91b1cf022277c7ab6 (patch)
tree5b135665de3fb5de184b14afa2c8722c42990249
parent0ff1d4e382111d9d55245fa9e195508a426a0753 (diff)
parentd8c0fedab00fbd150feb37c342b5d56e909fa658 (diff)
Merge pull request #130 from PikalaxALT/pikalax_work
Name pokemon.s; name methods in pokemon.s
Diffstat
-rw-r--r--arm9/arm9.lcf8
-rw-r--r--arm9/asm/pokemon.s (renamed from arm9/asm/unk_02066978.s)294
-rw-r--r--arm9/asm/scrcmd.s4
-rw-r--r--arm9/asm/scrcmd_18.s2
-rw-r--r--arm9/asm/unk_02026CD0.s4
-rw-r--r--arm9/asm/unk_0202BE98.s4
-rw-r--r--arm9/asm/unk_020476CC.s4
-rw-r--r--arm9/asm/unk_0204A01C.s6
-rw-r--r--arm9/asm/unk_020603B0.s4
-rw-r--r--arm9/asm/unk_0206ABC4.s8
-rw-r--r--arm9/asm/unk_0206B8A4.s4
-rw-r--r--arm9/asm/unk_0206F3FC.s2
-rw-r--r--arm9/asm/unk_020772F0.s6
-rw-r--r--arm9/asm/unk_020828BC.s2
-rw-r--r--arm9/global.inc18
-rw-r--r--arm9/modules/05/asm/module_05.s10
-rw-r--r--arm9/modules/06/asm/module_06.s24
-rw-r--r--arm9/modules/11/asm/module_11.s242
-rw-r--r--arm9/modules/16/asm/module_16.s28
-rw-r--r--arm9/modules/70/asm/module_70.s2
-rw-r--r--arm9/src/filesystem.c4
21 files changed, 367 insertions, 313 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 061ec8d5..fced9d86 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -360,7 +360,7 @@ SECTIONS {
unk_02064E90.o (.text)
unk_020653EC.o (.text)
unk_02066840.o (.text)
- unk_02066978.o (.text)
+ pokemon.o (.text)
unk_0206AB04.o (.text)
unk_0206ABC4.o (.text)
unk_0206B16C.o (.text)
@@ -688,7 +688,7 @@ SECTIONS {
unk_020647A4.o (.rodata)
unk_02064CA8.o (.rodata)
unk_020653EC.o (.rodata)
- unk_02066978.o (.rodata)
+ pokemon.o (.rodata)
unk_0206ABC4.o (.rodata)
unk_0206B688.o (.rodata)
unk_0206BF90.o (.rodata)
@@ -794,7 +794,7 @@ SECTIONS {
unk_02058EE8.o (.data)
unk_0205F7A0.o (.data)
unk_02060CCC.o (.data)
- unk_02066978.o (.data)
+ pokemon.o (.data)
unk_02073710.o (.data)
unk_020772F0.o (.data)
unk_0207C328.o (.data)
@@ -886,7 +886,7 @@ SECTIONS {
unk_0204FBA8.o (.bss)
unk_020520AC.o (.bss)
unk_02052EE8.o (.bss)
- unk_02066978.o (.bss)
+ pokemon.o (.bss)
unk_020772F0.o (.bss)
unk_020893E0.o (.bss)
unk_0208A998.o (.bss)
diff --git a/arm9/asm/unk_02066978.s b/arm9/asm/pokemon.s
index cb93aaae..8bcaa0c7 100644
--- a/arm9/asm/unk_02066978.s
+++ b/arm9/asm/pokemon.s
@@ -8,44 +8,98 @@
.global UNK_020F7ECC
UNK_020F7ECC: ; 0x020F7ECC
- .byte 0x2D, 0x00
-
- .global UNK_020F7ECE
-UNK_020F7ECE: ; 0x020F7ECE
- .byte 0x5F, 0x00, 0x14, 0x00, 0x50, 0x00
+ .short 0x002D, 0x005F
+ .short 0x0014, 0x0050
.global UNK_020F7ED4
UNK_020F7ED4: ; 0x020F7ED4
- .byte 0x05, 0x03, 0x02, 0x05, 0x03, 0x02, 0x01, 0x01, 0x00, 0x03, 0x02, 0x01, 0x01, 0x01, 0x00, 0x01
- .byte 0x01, 0x01, 0xFF, 0xFF, 0xFF, 0xFB, 0xFB, 0xF6, 0xFB, 0xFB, 0xF6, 0x03, 0x02, 0x01
-
- .global UNK_020F7EF2
-UNK_020F7EF2: ; 0x020F7EF2
- .byte 0x96, 0x00, 0x97, 0x00, 0xFA, 0x00, 0xF9, 0x00, 0xFB, 0x00, 0x7E, 0x01, 0x7F, 0x01, 0x80, 0x01
- .byte 0x81, 0x01, 0x82, 0x01, 0xE3, 0x01, 0xE4, 0x01, 0xE7, 0x01, 0xE9, 0x01, 0xEA, 0x01, 0xEB, 0x01
- .byte 0xEC, 0x01, 0xED, 0x01
+ .byte 0x05, 0x03, 0x02
+ .byte 0x05, 0x03, 0x02
+ .byte 0x01, 0x01, 0x00
+ .byte 0x03, 0x02, 0x01
+ .byte 0x01, 0x01, 0x00
+ .byte 0x01, 0x01, 0x01
+ .byte 0xFF, 0xFF, 0xFF
+ .byte 0xFB, 0xFB, 0xF6
+ .byte 0xFB, 0xFB, 0xF6
+ .byte 0x03, 0x02, 0x01
+
+ .global sLegendaryMonsList
+sLegendaryMonsList: ; 0x020F7EF2
+ .short 0x0096 ; MEWTWO
+ .short 0x0097 ; MEW
+ .short 0x00FA ; LUGIA
+ .short 0x00F9 ; HO-OH
+ .short 0x00FB ; CELEBI
+ .short 0x017E ; KYOGRE
+ .short 0x017F ; GROUDON
+ .short 0x0180 ; RAYQUAZA
+ .short 0x0181 ; JIRACHI
+ .short 0x0182 ; DEOXYS
+ .short 0x01E3 ; DIALGA
+ .short 0x01E4 ; PALKIA
+ .short 0x01E7 ; GIRATINA
+ .short 0x01E9 ; PHIONE
+ .short 0x01EA ; MANAPHY
+ .short 0x01EB ; DARKRAI
+ .short 0x01EC ; SHAYMIN
+ .short 0x01ED ; ARCEUS
.global UNK_020F7F16
UNK_020F7F16: ; 0x020F7F16
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00, 0xFF, 0x00, 0x00, 0x01
- .byte 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x01, 0x00, 0xFF, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0xFF, 0x01, 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00
- .byte 0x00, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x01, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00, 0x00
- .byte 0xFF, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0, 0, 0, 0, 0
+ .byte 1, 0, 0, 0, -1
+ .byte 1, 0, -1, 0, 0
+ .byte 1, -1, 0, 0, 0
+ .byte 1, 0, 0, -1, 0
+ .byte -1, 0, 0, 0, 1
+ .byte 0, 0, 0, 0, 0
+ .byte 0, 0, -1, 0, 1
+ .byte 0, -1, 0, 0, 1
+ .byte 0, 0, 0, -1, 1
+ .byte -1, 0, 1, 0, 0
+ .byte 0, 0, 1, 0, -1
+ .byte 0, 0, 0, 0, 0
+ .byte 0, -1, 1, 0, 0
+ .byte 0, 0, 1, -1, 0
+ .byte -1, 1, 0, 0, 0
+ .byte 0, 1, 0, 0, -1
+ .byte 0, 1, -1, 0, 0
+ .byte 0, 0, 0, 0, 0
+ .byte 0, 1, 0, -1, 0
+ .byte -1, 0, 0, 1, 0
+ .byte 0, 0, 0, 1, -1
+ .byte 0, 0, -1, 1, 0
+ .byte 0, -1, 0, 1, 0
+ .byte 0, 0, 0, 0, 0
.global UNK_020F7F93
UNK_020F7F93: ; 0x020F7F93
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0x00, 0x00, 0x01
- .byte 0x00, 0x00, 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0x00, 0x00, 0x01, 0x00
- .byte 0x00, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x00
- .byte 0x00, 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0x00, 0x00, 0x01, 0x00, 0x00
- .byte 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0, 0, 0, 0, 0
+ .byte 1, -1, 0, 0, 0
+ .byte 1, 0, -1, 0, 0
+ .byte 1, 0, 0, -1, 0
+ .byte 1, 0, 0, 0, -1
+ .byte -1, 1, 0, 0, 0
+ .byte 0, 0, 0, 0, 0
+ .byte 0, 1, -1, 0, 0
+ .byte 0, 1, 0, -1, 0
+ .byte 0, 1, 0, 0, -1
+ .byte -1, 0, 1, 0, 0
+ .byte 0, -1, 1, 0, 0
+ .byte 0, 0, 0, 0, 0
+ .byte 0, 0, 1, -1, 0
+ .byte 0, 0, 1, 0, -1
+ .byte -1, 0, 0, 1, 0
+ .byte 0, -1, 0, 1, 0
+ .byte 0, 0, -1, 1, 0
+ .byte 0, 0, 0, 0, 0
+ .byte 0, 0, 0, 1, -1
+ .byte -1, 0, 0, 0, 1
+ .byte 0, -1, 0, 0, 1
+ .byte 0, 0, -1, 0, 1
+ .byte 0, 0, 0, -1, 1
+ .byte 0, 0, 0, 0, 0
.section .data
@@ -57,16 +111,12 @@ UNK_02105FC8: ; 0x02105FC8
.global UNK_021C5AC0
UNK_021C5AC0: ; 0x021C5AC0
- .space 0x4
-
- .global UNK_021C5AC4
-UNK_021C5AC4: ; 0x021C5AC4
- .space 0x190
+ .space 0x194
.text
- thumb_func_start FUN_02066978
-FUN_02066978: ; 0x02066978
+ thumb_func_start ZeroMonData
+ZeroMonData: ; 0x02066978
push {r4, lr}
add r4, r0, #0x0
mov r0, #0x0
@@ -111,7 +161,7 @@ FUN_020669C0: ; 0x020669C0
mov r1, #0xec
bl AllocFromHeap
add r4, r0, #0x0
- bl FUN_02066978
+ bl ZeroMonData
add r0, r4, #0x0
pop {r4, pc}
.balign 4
@@ -248,15 +298,15 @@ _02066AC8:
add r0, r4, #0x0
pop {r3-r5, pc}
- thumb_func_start FUN_02066ACC
-FUN_02066ACC: ; 0x02066ACC
+ thumb_func_start CreateMon
+CreateMon: ; 0x02066ACC
push {r0-r3}
push {r3-r6, lr}
sub sp, #0x2c
add r5, r0, #0x0
add r4, r1, #0x0
add r6, r3, #0x0
- bl FUN_02066978
+ bl ZeroMonData
ldr r0, [sp, #0x50]
add r1, r4, #0x0
str r0, [sp, #0x0]
@@ -269,7 +319,7 @@ FUN_02066ACC: ; 0x02066ACC
str r0, [sp, #0xc]
ldr r2, [sp, #0x48]
add r0, r5, #0x0
- bl FUN_02066B64
+ bl CreateBoxMon
add r0, r5, #0x0
add r0, #0x88
mov r1, #0x64
@@ -315,8 +365,8 @@ FUN_02066ACC: ; 0x02066ACC
add sp, #0x10
bx r3
- thumb_func_start FUN_02066B64
-FUN_02066B64: ; 0x02066B64
+ thumb_func_start CreateBoxMon
+CreateBoxMon: ; 0x02066B64
push {r0-r3}
push {r4-r7, lr}
sub sp, #0xc
@@ -562,8 +612,8 @@ _02066D84: .word 0xFFFF0000
_02066D88: .word gGameLanguage
_02066D8C: .word gGameVersion
- thumb_func_start FUN_02066D90
-FUN_02066D90: ; 0x02066D90
+ thumb_func_start CreateMonWithNature
+CreateMonWithNature: ; 0x02066D90
push {r3-r7, lr}
sub sp, #0x18
str r2, [sp, #0x10]
@@ -578,7 +628,7 @@ _02066D9E:
lsl r0, r0, #0x10
orr r5, r0
add r0, r5, #0x0
- bl FUN_02068884
+ bl GetNatureFromPersonality
cmp r4, r0
bne _02066D9E
mov r0, #0x1
@@ -591,7 +641,7 @@ _02066D9E:
ldr r3, [sp, #0x14]
add r0, r6, #0x0
add r1, r7, #0x0
- bl FUN_02066ACC
+ bl CreateMon
add sp, #0x18
pop {r3-r7, pc}
.balign 4
@@ -642,7 +692,7 @@ _02066DF4:
lsl r0, r1, #0x10
lsr r5, r0, #0x10
add r0, r4, #0x0
- bl FUN_02068884
+ bl GetNatureFromPersonality
cmp r7, r0
bne _02066DF4
ldr r0, [sp, #0x14]
@@ -671,7 +721,7 @@ _02066E58:
ldr r1, [sp, #0x14]
ldr r2, [sp, #0x18]
ldr r3, [sp, #0x1c]
- bl FUN_02066ACC
+ bl CreateMon
add sp, #0x24
pop {r4-r7, pc}
@@ -714,7 +764,7 @@ FUN_02066EA4: ; 0x02066EA4
mov r3, #0x0
str r3, [sp, #0x8]
str r3, [sp, #0xc]
- bl FUN_02066ACC
+ bl CreateMon
add r0, r4, #0x0
mov r1, #0xae
add r2, sp, #0x24
@@ -1099,7 +1149,7 @@ _02067204:
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_02067234
+ bl GetMonData
add r4, r0, #0x0
ldrh r0, [r5, #0x4]
lsl r0, r0, #0x1f
@@ -1119,8 +1169,8 @@ _02067230:
add r0, r4, #0x0
pop {r4-r6, pc}
- thumb_func_start FUN_02067234
-FUN_02067234: ; 0x02067234
+ thumb_func_start GetMonData
+GetMonData: ; 0x02067234
push {r3, lr}
add r3, r1, #0x0
sub r3, #0x9f
@@ -1198,7 +1248,7 @@ _020672AA:
mov r0, #0x1
pop {r3, pc}
_020672B6:
- bl FUN_0206731C
+ bl GetBoxMonData
pop {r3, pc}
thumb_func_start FUN_020672BC
@@ -1235,7 +1285,7 @@ _020672F8:
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_0206731C
+ bl GetBoxMonData
add r4, r0, #0x0
ldrh r0, [r5, #0x4]
lsl r0, r0, #0x1e
@@ -1250,8 +1300,8 @@ _02067318:
add r0, r4, #0x0
pop {r4-r6, pc}
- thumb_func_start FUN_0206731C
-FUN_0206731C: ; 0x0206731C
+ thumb_func_start GetBoxMonData
+GetBoxMonData: ; 0x0206731C
push {r4-r7, lr}
sub sp, #0xc
str r1, [sp, #0x4]
@@ -1261,25 +1311,25 @@ FUN_0206731C: ; 0x0206731C
ldr r1, [r1, #0x0]
str r0, [sp, #0x0]
add r2, r4, #0x0
- bl FUN_0206A418
+ bl GetSubstruct
add r5, r0, #0x0
ldr r0, [sp, #0x0]
mov r2, #0x1
add r1, r0, #0x0
ldr r1, [r1, #0x0]
- bl FUN_0206A418
+ bl GetSubstruct
add r6, r0, #0x0
ldr r0, [sp, #0x0]
mov r2, #0x2
add r1, r0, #0x0
ldr r1, [r1, #0x0]
- bl FUN_0206A418
+ bl GetSubstruct
add r7, r0, #0x0
ldr r0, [sp, #0x0]
mov r2, #0x3
add r1, r0, #0x0
ldr r1, [r1, #0x0]
- bl FUN_0206A418
+ bl GetSubstruct
add r1, r0, #0x0
ldr r0, [sp, #0x4]
cmp r0, #0xb2
@@ -1943,7 +1993,7 @@ _020677D8:
bl FUN_0206E7B8
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_02069F24
+ bl GetArceusTypeByPlate
add r4, r0, #0x0
b _0206781A
_020677FC:
@@ -2016,7 +2066,7 @@ _02067886:
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_020678C0
+ bl SetMonData
ldrh r0, [r5, #0x4]
lsl r0, r0, #0x1f
lsr r0, r0, #0x1f
@@ -2040,8 +2090,8 @@ _020678BC:
pop {r4-r6, pc}
.balign 4
- thumb_func_start FUN_020678C0
-FUN_020678C0: ; 0x020678C0
+ thumb_func_start SetMonData
+SetMonData: ; 0x020678C0
push {r3, lr}
add r3, r0, #0x0
add r0, r1, #0x0
@@ -2131,7 +2181,7 @@ _0206794C:
pop {r3, pc}
_02067958:
add r0, r3, #0x0
- bl FUN_020679D8
+ bl SetBoxMonData
pop {r3, pc}
thumb_func_start FUN_02067960
@@ -2174,7 +2224,7 @@ _020679AA:
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_020679D8
+ bl SetBoxMonData
ldrh r0, [r5, #0x4]
lsl r0, r0, #0x1e
lsr r0, r0, #0x1f
@@ -2193,8 +2243,8 @@ _020679D4:
pop {r4-r6, pc}
.balign 4
- thumb_func_start FUN_020679D8
-FUN_020679D8: ; 0x020679D8
+ thumb_func_start SetBoxMonData
+SetBoxMonData: ; 0x020679D8
push {r4-r7, lr}
sub sp, #0x4c
str r1, [sp, #0x4]
@@ -2203,25 +2253,25 @@ FUN_020679D8: ; 0x020679D8
ldr r1, [r1, #0x0]
str r0, [sp, #0x0]
mov r2, #0x0
- bl FUN_0206A418
+ bl GetSubstruct
add r7, r0, #0x0
ldr r0, [sp, #0x0]
mov r2, #0x1
add r1, r0, #0x0
ldr r1, [r1, #0x0]
- bl FUN_0206A418
+ bl GetSubstruct
add r5, r0, #0x0
ldr r0, [sp, #0x0]
mov r2, #0x2
add r1, r0, #0x0
ldr r1, [r1, #0x0]
- bl FUN_0206A418
+ bl GetSubstruct
add r6, r0, #0x0
ldr r0, [sp, #0x0]
mov r2, #0x3
add r1, r0, #0x0
ldr r1, [r1, #0x0]
- bl FUN_0206A418
+ bl GetSubstruct
add r1, r0, #0x0
ldr r0, [sp, #0x4]
cmp r0, #0xb2
@@ -3175,24 +3225,24 @@ FUN_02068100: ; 0x02068100
ldr r1, [r1, #0x0]
str r0, [sp, #0x0]
mov r2, #0x0
- bl FUN_0206A418
+ bl GetSubstruct
add r4, r0, #0x0
ldr r0, [sp, #0x0]
mov r2, #0x1
add r1, r0, #0x0
ldr r1, [r1, #0x0]
- bl FUN_0206A418
+ bl GetSubstruct
add r5, r0, #0x0
ldr r0, [sp, #0x0]
mov r2, #0x2
add r1, r0, #0x0
ldr r1, [r1, #0x0]
- bl FUN_0206A418
+ bl GetSubstruct
ldr r0, [sp, #0x0]
mov r2, #0x3
add r1, r0, #0x0
ldr r1, [r1, #0x0]
- bl FUN_0206A418
+ bl GetSubstruct
cmp r7, #0xb2
bls _02068142
b _02068500
@@ -3924,7 +3974,7 @@ _0206864A:
FUN_02068654: ; 0x02068654
push {r3-r5, lr}
add r4, r2, #0x0
- bl FUN_0206A8FC
+ bl ConvertUnownOrArceusSpecies
mov r1, #0x0
bl FUN_0206851C
add r5, r0, #0x0
@@ -4160,7 +4210,7 @@ FUN_02068824: ; 0x02068824
bl FUN_02068538
ldr r1, _0206884C ; =UNK_021C5AC0
bl FUN_0206876C
- ldr r2, _02068850 ; =UNK_021C5AC4
+ ldr r2, _02068850 ; =UNK_021C5AC0 + 4
mov r1, #0x1
_02068838:
ldr r0, [r2, #0x0]
@@ -4175,7 +4225,7 @@ _02068846:
pop {r4, pc}
nop
_0206884C: .word UNK_021C5AC0
-_02068850: .word UNK_021C5AC4
+_02068850: .word UNK_021C5AC0 + 4
thumb_func_start FUN_02068854
FUN_02068854: ; 0x02068854
@@ -4199,12 +4249,12 @@ FUN_0206885C: ; 0x0206885C
add r1, r4, #0x0
bl FUN_02066A94
add r0, r6, #0x0
- bl FUN_02068884
+ bl GetNatureFromPersonality
pop {r4-r6, pc}
.balign 4
- thumb_func_start FUN_02068884
-FUN_02068884: ; 0x02068884
+ thumb_func_start GetNatureFromPersonality
+GetNatureFromPersonality: ; 0x02068884
push {r3, lr}
mov r1, #0x19
bl _u32_div_f
@@ -4551,7 +4601,7 @@ FUN_02068AD8: ; 0x02068AD8
mov r4, #0x0
_02068B04:
add r0, r4, #0x0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r7
beq _02068B34
bl rand_LC
@@ -4559,14 +4609,14 @@ _02068B04:
tst r0, r1
beq _02068B26
add r0, r4, #0x3
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r0, r6
lsl r0, r0, #0x10
lsr r6, r0, #0x10
b _02068B56
_02068B26:
add r0, r4, #0x3
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r0, r5
lsl r0, r0, #0x10
lsr r5, r0, #0x10
@@ -4577,12 +4627,12 @@ _02068B34:
tst r0, r1
beq _02068B56
add r0, r4, #0x3
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r0, r6
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r4, #0x3
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r0, r5
lsl r0, r0, #0x10
lsr r5, r0, #0x10
@@ -6830,7 +6880,7 @@ FUN_02069BD0: ; 0x02069BD0
FUN_02069BE4: ; 0x02069BE4
push {r4, lr}
add r4, r1, #0x0
- bl FUN_02068884
+ bl GetNatureFromPersonality
lsl r1, r0, #0x2
add r1, r0, r1
ldr r0, _02069BF8 ; =UNK_020F7F16
@@ -6919,7 +6969,7 @@ _02069C70:
cmp r0, #0x0
bne _02069C70
add r0, r7, #0x0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
add r1, r0, #0x0
lsl r1, r1, #0x18
add r0, r5, #0x0
@@ -7246,7 +7296,7 @@ FUN_02069ECC: ; 0x02069ECC
bl FUN_0206E7B8
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_02069F24
+ bl GetArceusTypeByPlate
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x70
@@ -7258,8 +7308,8 @@ _02069F1C:
.balign 4
_02069F20: .word 0x000001ED
- thumb_func_start FUN_02069F24
-FUN_02069F24: ; 0x02069F24
+ thumb_func_start GetArceusTypeByPlate
+GetArceusTypeByPlate: ; 0x02069F24
sub r0, #0x7d
cmp r0, #0xf
bhi _02069F96
@@ -7343,7 +7393,7 @@ _02069F96:
FUN_02069F9C: ; 0x02069F9C
push {r4, lr}
add r4, r2, #0x0
- bl FUN_0206A8FC
+ bl ConvertUnownOrArceusSpecies
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x21
@@ -7518,7 +7568,7 @@ _0206A104:
ldrh r0, [r0, r1]
cmp r4, r0
blo _0206A12E
- ldr r0, _0206A138 ; =UNK_020F7ECE
+ ldr r0, _0206A138 ; =UNK_020F7ECC + 2
ldrh r0, [r0, r1]
cmp r4, r0
add r2, sp, #0x4
@@ -7538,7 +7588,7 @@ _0206A12E:
pop {r3-r7, pc}
nop
_0206A134: .word UNK_020F7ECC
-_0206A138: .word UNK_020F7ECE
+_0206A138: .word UNK_020F7ECC + 2
thumb_func_start FUN_0206A13C
FUN_0206A13C: ; 0x0206A13C
@@ -7694,42 +7744,42 @@ FUN_0206A23C: ; 0x0206A23C
ldr r0, [sp, #0x4]
ldr r1, [r5, #0x0]
mov r2, #0x0
- bl FUN_0206A418
+ bl GetSubstruct
add r4, r0, #0x0
ldr r0, [sp, #0x4]
ldr r1, [r5, #0x0]
mov r2, #0x1
- bl FUN_0206A418
+ bl GetSubstruct
add r6, r0, #0x0
ldr r0, [sp, #0x4]
ldr r1, [r5, #0x0]
mov r2, #0x2
- bl FUN_0206A418
+ bl GetSubstruct
add r7, r0, #0x0
ldr r0, [sp, #0x4]
ldr r1, [r5, #0x0]
mov r2, #0x3
- bl FUN_0206A418
+ bl GetSubstruct
str r0, [sp, #0x8]
ldr r1, [sp, #0x0]
add r0, r5, #0x0
mov r2, #0x0
- bl FUN_0206A418
+ bl GetSubstruct
str r0, [sp, #0xc]
ldr r1, [sp, #0x0]
add r0, r5, #0x0
mov r2, #0x1
- bl FUN_0206A418
+ bl GetSubstruct
str r0, [sp, #0x10]
ldr r1, [sp, #0x0]
add r0, r5, #0x0
mov r2, #0x2
- bl FUN_0206A418
+ bl GetSubstruct
str r0, [sp, #0x14]
ldr r1, [sp, #0x0]
add r0, r5, #0x0
mov r2, #0x3
- bl FUN_0206A418
+ bl GetSubstruct
ldr r2, [sp, #0x4]
str r0, [sp, #0x18]
ldr r0, [sp, #0x4]
@@ -7834,7 +7884,7 @@ _0206A37C: .word ReadWholeNarcMemberByIdPair
FUN_0206A380: ; 0x0206A380
push {r4, lr}
add r4, r2, #0x0
- bl FUN_0206A8FC
+ bl ConvertUnownOrArceusSpecies
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x2
@@ -7922,8 +7972,8 @@ _0206A412:
pop {r3-r4}
bx lr
- thumb_func_start FUN_0206A418
-FUN_0206A418: ; 0x0206A418
+ thumb_func_start GetSubstruct
+GetSubstruct: ; 0x0206A418
push {r3, lr}
mov r3, #0x3e
lsl r3, r3, #0xc
@@ -8705,8 +8755,8 @@ _0206A8F8:
add r0, r1, #0x0
pop {r3, pc}
- thumb_func_start FUN_0206A8FC
-FUN_0206A8FC: ; 0x0206A8FC
+ thumb_func_start ConvertUnownOrArceusSpecies
+ConvertUnownOrArceusSpecies: ; 0x0206A8FC
ldr r3, _0206A928 ; =0x00000182
cmp r0, r3
beq _0206A90C
@@ -8735,8 +8785,8 @@ _0206A926:
.balign 4
_0206A928: .word 0x00000182
- thumb_func_start FUN_0206A92C
-FUN_0206A92C: ; 0x0206A92C
+ thumb_func_start MaskOfFlagNo
+MaskOfFlagNo: ; 0x0206A92C
push {r3-r5, lr}
add r5, r0, #0x0
mov r4, #0x1
@@ -8756,8 +8806,8 @@ _0206A948:
add r0, r4, #0x0
pop {r3-r5, pc}
- thumb_func_start FUN_0206A94C
-FUN_0206A94C: ; 0x0206A94C
+ thumb_func_start LowestFlagNo
+LowestFlagNo: ; 0x0206A94C
mov r3, #0x1
mov r2, #0x0
_0206A950:
@@ -8773,9 +8823,9 @@ _0206A95E:
bx lr
.balign 4
- thumb_func_start FUN_0206A964
-FUN_0206A964: ; 0x0206A964
- ldr r3, _0206A980 ; =UNK_020F7EF2
+ thumb_func_start IsPokemonLegendaryOrMythical
+IsPokemonLegendaryOrMythical: ; 0x0206A964
+ ldr r3, _0206A980 ; =sLegendaryMonsList
mov r2, #0x0
_0206A968:
ldrh r1, [r3, #0x0]
@@ -8791,20 +8841,20 @@ _0206A972:
mov r0, #0x0
bx lr
nop
-_0206A980: .word UNK_020F7EF2
+_0206A980: .word sLegendaryMonsList
- thumb_func_start FUN_0206A984
-FUN_0206A984: ; 0x0206A984
+ thumb_func_start GetLegendaryMon
+GetLegendaryMon: ; 0x0206A984
cmp r0, #0x12
blo _0206A98A
mov r0, #0x0
_0206A98A:
lsl r1, r0, #0x1
- ldr r0, _0206A994 ; =UNK_020F7EF2
+ ldr r0, _0206A994 ; =sLegendaryMonsList
ldrh r0, [r0, r1]
bx lr
nop
-_0206A994: .word UNK_020F7EF2
+_0206A994: .word sLegendaryMonsList
thumb_func_start FUN_0206A998
FUN_0206A998: ; 0x0206A998
@@ -8814,7 +8864,7 @@ FUN_0206A998: ; 0x0206A998
bl FUN_020671BC
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206A964
+ bl IsPokemonLegendaryOrMythical
pop {r3, pc}
thumb_func_start FUN_0206A9AC
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index 05fb23de..ec67407a 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -10476,7 +10476,7 @@ FUN_0203ED2C: ; 0x0203ED2C
mov r0, #0x20
bl FUN_020669C0
add r4, r0, #0x0
- bl FUN_02066978
+ bl ZeroMonData
mov r0, #0x0
str r0, [sp, #0x0]
str r0, [sp, #0x4]
@@ -10486,7 +10486,7 @@ FUN_0203ED2C: ; 0x0203ED2C
add r1, r5, #0x0
mov r2, #0x32
mov r3, #0x20
- bl FUN_02066ACC
+ bl CreateMon
add r0, r6, #0x0
add r1, r4, #0x0
bl FUN_0202498C
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
index d8b2bdef..5b96a589 100644
--- a/arm9/asm/scrcmd_18.s
+++ b/arm9/asm/scrcmd_18.s
@@ -195,7 +195,7 @@ FUN_02044414: ; 0x02044414
mov r0, #0xb
bl FUN_020669C0
add r4, r0, #0x0
- bl FUN_02066978
+ bl ZeroMonData
mov r0, #0x1
add r1, r5, #0x0
bl FUN_02015CF8
diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s
index b3d772a0..cae28930 100644
--- a/arm9/asm/unk_02026CD0.s
+++ b/arm9/asm/unk_02026CD0.s
@@ -2120,7 +2120,7 @@ _02027B9C:
str r0, [sp, #0xc]
ldrh r1, [r5, #0x10]
add r0, r4, #0x0
- bl FUN_02066ACC
+ bl CreateMon
add r2, r5, #0x0
add r0, r4, #0x0
mov r1, #0x74
@@ -2295,7 +2295,7 @@ FUN_02027CB8: ; 0x02027CB8
str r0, [sp, #0xc]
ldrh r1, [r5, #0x8]
add r0, r4, #0x0
- bl FUN_02066ACC
+ bl CreateMon
add r2, r5, #0x0
add r0, r4, #0x0
mov r1, #0x74
diff --git a/arm9/asm/unk_0202BE98.s b/arm9/asm/unk_0202BE98.s
index 8c7d9d51..818023a8 100644
--- a/arm9/asm/unk_0202BE98.s
+++ b/arm9/asm/unk_0202BE98.s
@@ -23,7 +23,7 @@ FUN_0202BEA0: ; 0x0202BEA0
add r7, r4, #0x0
_0202BEB4:
add r0, r5, #0x0
- bl FUN_02066978
+ bl ZeroMonData
add r0, r5, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
@@ -53,7 +53,7 @@ FUN_0202BEDC: ; 0x0202BEDC
add r7, r4, #0x0
_0202BEF0:
add r0, r5, #0x0
- bl FUN_02066978
+ bl ZeroMonData
add r0, r5, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index ec3f24cf..887e4151 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -265,7 +265,7 @@ FUN_02047814: ; 0x02047814
add r0, r6, #0x0
mov r2, #0x5
mov r3, #0x20
- bl FUN_02066ACC
+ bl CreateMon
ldr r0, [r4, #0x4]
add r1, r6, #0x0
bl FUN_0206B900
@@ -278,7 +278,7 @@ FUN_02047814: ; 0x02047814
ldr r1, _02047960 ; =0x0000018F
add r0, r6, #0x0
mov r3, #0x20
- bl FUN_02066ACC
+ bl CreateMon
ldr r0, [r4, #0x8]
add r1, r6, #0x0
bl FUN_0206B900
diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s
index 72deacec..633c56f0 100644
--- a/arm9/asm/unk_0204A01C.s
+++ b/arm9/asm/unk_0204A01C.s
@@ -45,7 +45,7 @@ FUN_0204A048: ; 0x0204A048
add r0, r5, #0x0
bl FUN_020669C0
add r4, r0, #0x0
- bl FUN_02066978
+ bl ZeroMonData
mov r0, #0x0
str r0, [sp, #0x0]
str r0, [sp, #0x4]
@@ -55,7 +55,7 @@ FUN_0204A048: ; 0x0204A048
add r0, r4, #0x0
add r1, r7, #0x0
mov r3, #0x20
- bl FUN_02066ACC
+ bl CreateMon
ldr r0, [sp, #0x40]
ldr r1, [sp, #0x14]
str r0, [sp, #0x0]
@@ -102,7 +102,7 @@ FUN_0204A0C8: ; 0x0204A0C8
mov r0, #0x20
bl FUN_020669C0
add r4, r0, #0x0
- bl FUN_02066978
+ bl ZeroMonData
ldr r0, [sp, #0x20]
ldr r1, [sp, #0x24]
bl FUN_02015CF8
diff --git a/arm9/asm/unk_020603B0.s b/arm9/asm/unk_020603B0.s
index 944911fc..14461752 100644
--- a/arm9/asm/unk_020603B0.s
+++ b/arm9/asm/unk_020603B0.s
@@ -217,7 +217,7 @@ _020604D0:
mov r0, #0x4
bl FUN_020669C0
str r0, [sp, #0x1c]
- bl FUN_02066978
+ bl ZeroMonData
ldr r0, [sp, #0x18]
bl FUN_020239C0
mov r1, #0x0
@@ -230,7 +230,7 @@ _020604D0:
add r1, r7, #0x0
add r2, r6, #0x0
mov r3, #0x20
- bl FUN_02066ACC
+ bl CreateMon
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s
index 483f68a7..cd3d180b 100644
--- a/arm9/asm/unk_0206ABC4.s
+++ b/arm9/asm/unk_0206ABC4.s
@@ -443,7 +443,7 @@ _0206AECE:
ldrh r2, [r2, #0x2]
ldr r0, [sp, #0x40]
lsr r3, r3, #0x18
- bl FUN_02066ACC
+ bl CreateMon
ldr r0, [sp, #0x24]
ldr r1, [sp, #0x40]
ldr r0, [r0, #0x4]
@@ -527,7 +527,7 @@ _0206AF76:
ldrh r2, [r2, #0x2]
ldr r0, [sp, #0x40]
lsr r3, r3, #0x18
- bl FUN_02066ACC
+ bl CreateMon
ldr r7, [sp, #0x30]
mov r6, #0x0
_0206AFB0:
@@ -618,7 +618,7 @@ _0206B030:
ldrh r2, [r7, #0x2]
ldr r0, [sp, #0x40]
lsr r3, r3, #0x18
- bl FUN_02066ACC
+ bl CreateMon
ldr r0, [sp, #0x40]
mov r1, #0x6
add r2, r7, #0x6
@@ -704,7 +704,7 @@ _0206B0DA:
ldrh r2, [r2, #0x2]
ldr r0, [sp, #0x40]
lsr r3, r3, #0x18
- bl FUN_02066ACC
+ bl CreateMon
ldr r2, [sp, #0x3c]
ldr r0, [sp, #0x40]
mov r1, #0x6
diff --git a/arm9/asm/unk_0206B8A4.s b/arm9/asm/unk_0206B8A4.s
index 9ba283b4..4bf6e391 100644
--- a/arm9/asm/unk_0206B8A4.s
+++ b/arm9/asm/unk_0206B8A4.s
@@ -49,7 +49,7 @@ _0206B8DA:
add r5, #0x8
_0206B8EE:
add r0, r5, #0x0
- bl FUN_02066978
+ bl ZeroMonData
add r4, r4, #0x1
add r5, #0xec
cmp r4, #0x6
@@ -145,7 +145,7 @@ _0206B992:
add r1, #0x8
mul r0, r4
add r0, r1, r0
- bl FUN_02066978
+ bl ZeroMonData
ldr r0, [r7, #0x4]
sub r0, r0, #0x1
str r0, [r7, #0x4]
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index 215119f6..21ef4169 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -4020,7 +4020,7 @@ _0207136E:
add r1, r5, r0
ldr r0, _020713E8 ; =0x00000704
ldrh r0, [r1, r0]
- bl FUN_0206A964
+ bl IsPokemonLegendaryOrMythical
cmp r0, #0x1
bne _02071390
mov r0, #0x0
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index a533f049..9cb86502 100644
--- a/arm9/asm/unk_020772F0.s
+++ b/arm9/asm/unk_020772F0.s
@@ -1080,7 +1080,7 @@ FUN_02077894: ; 0x02077894
ldr r1, [r4, #0x4]
add r6, r0, #0x0
mov r2, #0x5
- bl FUN_02066ACC
+ bl CreateMon
add r0, r6, #0x0
bl FreeToHeap
_020778DE:
@@ -1651,7 +1651,7 @@ _02077D88:
ldr r1, [r4, #0x4]
add r5, r0, #0x0
mov r2, #0x5
- bl FUN_02066ACC
+ bl CreateMon
add r0, r5, #0x0
bl FUN_020690E4
add r2, r0, #0x0
@@ -1831,7 +1831,7 @@ _02077F1A:
ldr r1, [r5, #0x4]
add r6, r0, #0x0
mov r2, #0x1
- bl FUN_02066ACC
+ bl CreateMon
add r0, r6, #0x0
bl FUN_020690E4
add r2, r0, #0x0
diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s
index 94266a9b..c54093d9 100644
--- a/arm9/asm/unk_020828BC.s
+++ b/arm9/asm/unk_020828BC.s
@@ -777,7 +777,7 @@ FUN_02082D60: ; 0x02082D60
ldrh r1, [r7, #0x14]
add r0, r6, #0x0
mov r3, #0x20
- bl FUN_02066ACC
+ bl CreateMon
mov r4, #0x0
add r5, r7, #0x0
_02082D9A:
diff --git a/arm9/global.inc b/arm9/global.inc
index 1484bd14..8d9128fd 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -4704,7 +4704,7 @@
.extern FUN_02065344
.extern FUN_02066818
.extern FUN_02066840
-.extern FUN_02066978
+.extern ZeroMonData
.extern FUN_020669A0
.extern FUN_020669BC
.extern FUN_020669C0
@@ -4712,8 +4712,8 @@
.extern FUN_02066A20
.extern FUN_02066A6C
.extern FUN_02066A94
-.extern FUN_02066ACC
-.extern FUN_02066D90
+.extern CreateMon
+.extern CreateMonWithNature
.extern FUN_02066DD4
.extern FUN_02066E74
.extern FUN_02066EA4
@@ -4739,7 +4739,7 @@
.extern FUN_02068824
.extern FUN_02068854
.extern FUN_0206885C
-.extern FUN_02068884
+.extern GetNatureFromPersonality
.extern FUN_020688E8
.extern FUN_020689E0
.extern FUN_020689E8
@@ -4792,7 +4792,7 @@
.extern FUN_02069E94
.extern FUN_02069EC4
.extern FUN_02069ECC
-.extern FUN_02069F24
+.extern GetArceusTypeByPlate
.extern FUN_02069F9C
.extern FUN_02069FB0
.extern FUN_0206A014
@@ -4801,10 +4801,10 @@
.extern FUN_0206A16C
.extern FUN_0206A1C4
.extern FUN_0206A23C
-.extern FUN_0206A92C
-.extern FUN_0206A94C
-.extern FUN_0206A964
-.extern FUN_0206A984
+.extern MaskOfFlagNo
+.extern LowestFlagNo
+.extern IsPokemonLegendaryOrMythical
+.extern GetLegendaryMon
.extern FUN_0206A998
.extern FUN_0206A9AC
.extern FUN_0206AA30
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 201a9066..7b887c14 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -43653,14 +43653,14 @@ _021EC960:
add r1, r5, #0
add r2, r1, #0
bl FUN_020672BC
- bl FUN_02068884
+ bl GetNatureFromPersonality
mov r7, #0x96
add r6, r0, #0
lsl r7, r7, #4
_021EC978:
bl rand_MT
add r4, r0, #0
- bl FUN_02068884
+ bl GetNatureFromPersonality
cmp r6, r0
bne _021EC98A
cmp r4, #0
@@ -44415,7 +44415,7 @@ MOD05_021ECF14: ; 0x021ECF14
add r1, r6, #0
mov r2, #1
mov r3, #0x20
- bl FUN_02066ACC
+ bl CreateMon
mov r1, #0
add r0, sp, #0x10
strb r1, [r0, #2]
@@ -44552,7 +44552,7 @@ _021ED05E:
ldr r1, [sp, #0x10]
add r0, r7, #0
mov r3, #0x20
- bl FUN_02066ACC
+ bl CreateMon
add r2, sp, #0x14
mov r1, #0
add r0, sp, #0x14
@@ -45451,7 +45451,7 @@ _021ED788:
ldr r1, [sp, #0x14]
add r0, r6, #0
mov r3, #0x20
- bl FUN_02066ACC
+ bl CreateMon
mov r5, #0
add r7, sp, #0x34
_021ED7A2:
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 9540ce0b..0656aec0 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -6557,7 +6557,7 @@ MOD06_0223C854: ; 0x0223C854
add r5, r3, #0
bl FUN_020669C0
str r0, [sp, #0x1c]
- bl FUN_02066978
+ bl ZeroMonData
ldrb r0, [r6, #0xd]
mov r7, #0
cmp r0, #0
@@ -6639,7 +6639,7 @@ _0223C914:
cmp r0, #0x1c
bne _0223C8EC
add r0, r4, #0
- bl FUN_02068884
+ bl GetNatureFromPersonality
ldr r1, [sp, #0x20]
cmp r0, r1
beq _0223C92E
@@ -6658,7 +6658,7 @@ _0223C92E:
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x10]
ldr r2, [sp, #0x14]
- bl FUN_02066ACC
+ bl CreateMon
ldr r0, [sp, #0x18]
ldr r2, [sp, #0x1c]
ldr r3, [sp, #0x48]
@@ -6686,7 +6686,7 @@ MOD06_0223C968: ; 0x0223C968
add r5, r3, #0
bl FUN_020669C0
add r4, r0, #0
- bl FUN_02066978
+ bl ZeroMonData
add r0, r7, #0
mov r1, #0x12
mov r6, #1
@@ -6775,7 +6775,7 @@ _0223CA28:
add r0, r4, #0
add r1, r7, #0
mov r3, #0x20
- bl FUN_02066D90
+ bl CreateMonWithNature
add r0, r4, #0
mov r1, #7
add r2, r5, #0
@@ -19774,7 +19774,7 @@ _02243312:
cmp r0, #0
bne _0224336E
add r0, r5, #0
- bl FUN_0206A964
+ bl IsPokemonLegendaryOrMythical
cmp r0, #1
beq _0224336E
add r0, sp, #0x10
@@ -21750,7 +21750,7 @@ MOD06_02244210: ; 0x02244210
mov r4, #0
_02244264:
add r0, r4, #0
- bl FUN_0206A984
+ bl GetLegendaryMon
add r7, r0, #0
ldr r0, [sp, #0x18]
add r1, r7, #0
@@ -21898,7 +21898,7 @@ MOD06_02244388: ; 0x02244388
add r5, r1, #0
add r6, r0, #0
add r0, r5, #0
- bl FUN_02066978
+ bl ZeroMonData
ldr r0, [r6, #0x10]
ldr r3, _02244520 ; =0x3FFFFFFF
str r0, [sp]
@@ -22580,7 +22580,7 @@ _022448EC:
add r7, r6, #0
orr r7, r0
add r0, r7, #0
- bl FUN_02068884
+ bl GetNatureFromPersonality
add r1, sp, #8
ldrb r1, [r1, #0xb]
cmp r1, r0
@@ -22630,7 +22630,7 @@ _02244920:
str r0, [r5, #0x14]
_02244960:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
add r1, sp, #8
ldrb r1, [r1, #0xa]
tst r0, r1
@@ -22652,7 +22652,7 @@ _02244984:
lsr r6, r0, #0x18
_0224498A:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
add r1, sp, #8
ldrb r1, [r1, #0xa]
tst r0, r1
@@ -31106,7 +31106,7 @@ MOD06_022489D4: ; 0x022489D4
mov r3, #0x20
str r1, [sp, #0xc]
ldr r1, [r4]
- bl FUN_02066ACC
+ bl CreateMon
ldr r0, [sp, #0x28]
add r1, r6, #0
bl MOD06_022489AC
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 46ec5b7a..466a8905 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -3287,7 +3287,7 @@ _0222F18E:
cmp r0, #1
bne _0222F1C8
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_0222F1C8:
ldr r0, [sp]
@@ -6337,7 +6337,7 @@ _0223091C:
bl MOD11_02243420
add r7, r0, #0
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r7
bne _02230956
add r4, #0x1f
@@ -6408,7 +6408,7 @@ _022309B4:
bl MOD11_02243420
add r7, r0, #0
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r7
bne _022309EE
add r2, r4, #0
@@ -6795,7 +6795,7 @@ MOD11_02230CB8: ; 0x02230CB8
add r0, r5, #0
add r1, r4, #0
bl MOD11_022302BC
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r1, #0x91
lsl r1, r1, #6
ldrb r1, [r5, r1]
@@ -6828,7 +6828,7 @@ _02230D12:
bl MOD11_0224C474
add r4, r0, #0
mov r0, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r4
beq _02230D2E
_02230D2A:
@@ -6875,12 +6875,12 @@ _02230D64:
mov r6, #0x5e
lsl r6, r6, #2
_02230D70:
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [r5, r6]
tst r0, r1
beq _02230D92
ldr r0, [r4]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r3, #0x5e
lsl r3, r3, #2
mov r2, #0
@@ -7110,7 +7110,7 @@ _02230EE4:
cmp r1, r0
bne _02230F58
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02230F68 ; =0x00002414
ldrb r1, [r5, r1]
tst r0, r1
@@ -7171,7 +7171,7 @@ MOD11_02230F6C: ; 0x02230F6C
add r5, r0, #0
add r0, r2, #0
add r4, r1, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02230F84 ; =0x00002414
add r2, r5, r1
ldrb r1, [r2, r4]
@@ -10265,7 +10265,7 @@ _02232724:
tst r0, r1
beq _0223274E
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02232770 ; =0x00003108
ldrb r1, [r6, r1]
tst r0, r1
@@ -11279,7 +11279,7 @@ _02232EF0:
tst r0, r1
bne _02232F18
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02232F60 ; =0x00003108
ldrb r1, [r7, r1]
tst r0, r1
@@ -12032,7 +12032,7 @@ MOD11_022334D4: ; 0x022334D4
cmp r1, #0
bne _0223352A
str r4, [r5, #0x74]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02233534 ; =0x0000213C
lsl r0, r0, #0x18
ldr r2, [r5, r1]
@@ -12069,7 +12069,7 @@ MOD11_02233538: ; 0x02233538
add r1, r4, #0
bl MOD11_02255BEC
ldr r0, [r4, #0x74]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r2, _02233594 ; =0x0000213C
lsl r3, r0, #0x18
mov r0, #0
@@ -12079,7 +12079,7 @@ MOD11_02233538: ; 0x02233538
and r0, r1
str r0, [r4, r2]
ldr r0, [r4, #0x74]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r1, #0x85
lsl r1, r1, #6
ldr r2, [r4, r1]
@@ -12599,7 +12599,7 @@ _02233950:
cmp r0, #0
beq _022339B4
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [r5, #0x74]
asr r1, r1, #1
lsl r1, r1, #0x1f
@@ -12809,7 +12809,7 @@ _02233B0A:
tst r0, r1
beq _02233B34
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r4, r0
mov r0, #0
str r0, [sp]
@@ -12841,15 +12841,15 @@ _02233B46:
bl MOD11_022302BC
str r0, [sp, #0x10]
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r4
bne _02233B92
ldr r0, [sp, #0x10]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r4
bne _02233B92
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r4, r0
add r0, r6, #0
add r1, r5, #0
@@ -12857,7 +12857,7 @@ _02233B46:
b _02233B92
_02233B80:
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r4
bne _02233B92
add r0, r6, #0
@@ -12949,7 +12949,7 @@ _02233BFE:
ldr r0, _02233C8C ; =0x000021A0
strb r2, [r1, r0]
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r1, #0x85
lsl r1, r1, #6
ldr r1, [r5, r1]
@@ -12957,7 +12957,7 @@ _02233BFE:
tst r0, r1
bne _02233C58
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r1, #0x85
lsl r1, r1, #6
ldr r1, [r5, r1]
@@ -13035,7 +13035,7 @@ _02233CC0:
bic r1, r0
add r0, r4, #0
str r1, [r3, r2]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r3, _02233D24 ; =0x00003108
mov r2, #0
mvn r2, r2
@@ -13326,7 +13326,7 @@ _02233F08:
b _02233F42
_02233F10:
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
str r0, [r4]
b _02233F42
_02233F1A:
@@ -14232,7 +14232,7 @@ _02234616:
b _02234648
_0223461C:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
str r0, [sp, #0xc]
b _02234648
_02234626:
@@ -14567,7 +14567,7 @@ _022348B2:
b _022348F6
_022348BE:
ldr r0, [r1]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
str r0, [r4]
b _022348F6
_022348C8:
@@ -14728,7 +14728,7 @@ _022349E2:
b _02234A26
_022349EE:
ldr r0, [r1]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
str r0, [sp, #0xc]
b _02234A26
_022349F8:
@@ -16743,7 +16743,7 @@ _022359BA:
add r1, r1, r3
strb r0, [r1, r2]
add r0, r3, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02235A24 ; =0x00002DCC
mov r4, #0xc0
add r3, r6, r1
@@ -17691,7 +17691,7 @@ _0223610E:
beq _02236156
_0223614E:
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r7, r0
_02236156:
add r6, r6, #1
@@ -17723,7 +17723,7 @@ _02236182:
ror r0, r7
add r6, r1, r0
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r4
bne _02236182
ldr r0, [r5, #0x64]
@@ -17925,7 +17925,7 @@ _02236316:
mov r2, #0x10
bl MOD11_0223C230
add r4, r0, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02236400 ; =0x00003108
ldrb r1, [r5, r1]
tst r0, r1
@@ -17995,7 +17995,7 @@ _02236382:
mov r2, #0x10
bl MOD11_0223C230
add r4, r0, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02236400 ; =0x00003108
ldrb r1, [r5, r1]
tst r0, r1
@@ -18073,7 +18073,7 @@ _02236454:
add r1, r4, r0
ldr r0, _022364F4 ; =0x0000219C
ldrb r0, [r1, r0]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
lsl r1, r7, #3
add r2, r4, r1
mov r1, #0x71
@@ -19707,7 +19707,7 @@ _0223715A:
bl MOD11_0223A424
b _0223717E
_02237164:
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02237188 ; =0x00002DB0
mov r2, #0xc0
add r1, r4, r1
@@ -20926,7 +20926,7 @@ MOD11_02237B04: ; 0x02237B04
mov r2, #0x10
bl MOD11_0223C230
add r4, r0, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02237B90 ; =0x00003108
ldrb r1, [r5, r1]
tst r0, r1
@@ -21020,7 +21020,7 @@ _02237BF2:
add r1, r4, r0
ldr r0, _02237C98 ; =0x0000219C
ldrb r0, [r1, r0]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp]
lsl r1, r1, #3
add r2, r4, r1
@@ -21035,7 +21035,7 @@ _02237BF2:
add r1, r4, r0
ldr r0, _02237C98 ; =0x0000219C
ldrb r0, [r1, r0]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
lsl r1, r7, #3
add r2, r4, r1
mov r1, #0x71
@@ -21414,7 +21414,7 @@ MOD11_02237EE8: ; 0x02237EE8
ldr r1, [r2, r1]
cmp r1, #0
beq _02237F1A
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r1, #0x7b
add r2, r5, r4
lsl r1, r1, #2
@@ -21431,7 +21431,7 @@ _02237F1A:
ldr r1, [r2, r1]
cmp r1, #0
beq _02237F48
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [r5, #0x64]
lsl r1, r1, #6
add r2, r5, r1
@@ -21656,7 +21656,7 @@ _02238086:
add r1, r5, r0
ldr r0, _02238128 ; =0x0000219C
ldrb r0, [r1, r0]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r1, #0x71
lsl r1, r1, #2
add r3, r5, r1
@@ -26651,7 +26651,7 @@ _0223A7D6:
cmp r0, #0x32
beq _0223A81E
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
add r2, r0, #0
ldr r1, [r4, #4]
ldr r0, [sp, #0x24]
@@ -26808,7 +26808,7 @@ _0223A928:
ldr r0, [r4, #4]
str r0, [sp, #0x20]
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x40]
lsl r2, r1, #2
ldr r1, [sp, #0x20]
@@ -27125,7 +27125,7 @@ _0223ABBC:
bl MOD11_02243054
_0223ABCC:
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [r4, #4]
ldr r2, _0223AF48 ; =0x00003109
ldrb r3, [r1, r2]
@@ -27933,7 +27933,7 @@ _0223B25C:
pop {r4, r5, r6, r7, pc}
_0223B272:
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x40]
ldr r2, [r4, #4]
mov r3, #0
@@ -28133,7 +28133,7 @@ _0223B3FE:
asr r4, r0, #0x10
_0223B414:
ldr r0, [sp, #4]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
add r1, r0, #0
lsl r1, r1, #0x18
ldr r0, [sp]
@@ -28219,7 +28219,7 @@ MOD11_0223B49C: ; 0x0223B49C
str r0, [sp, #0x24]
add r0, r7, #0
ldr r6, [r4, #4]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _0223B7F0 ; =0x00003108
ldrb r1, [r6, r1]
tst r0, r1
@@ -32095,7 +32095,7 @@ _0223D47C:
bne _0223D50A
_0223D486:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _0223D714 ; =0x00003108
ldrb r1, [r6, r1]
tst r0, r1
@@ -33263,7 +33263,7 @@ _0223DD58:
ldr r0, _0223DE60 ; =0x000021E8
ldrb r5, [r1, r0]
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _0223DE64 ; =0x00003108
ldrb r1, [r4, r1]
tst r0, r1
@@ -34519,7 +34519,7 @@ _0223E6E8:
add r1, r4, r1
ldrb r5, [r1, r0]
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _0223EA18 ; =0x00003108
ldrb r1, [r4, r1]
tst r0, r1
@@ -35197,7 +35197,7 @@ _0223EC14:
mov r6, #0xf1
add r0, r5, #0
str r1, [r7, r2]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
add r3, r6, #0
add r3, #0x8f
lsl r2, r0, #8
@@ -35221,7 +35221,7 @@ _0223EC5A:
mov r6, #0xf1
add r0, r5, #0
str r1, [r7, r2]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
add r3, r6, #0
add r3, #0x8f
lsl r2, r0, #8
@@ -35840,7 +35840,7 @@ _0223F11E:
ldr r0, _0223F310 ; =0x000021EC
ldrb r6, [r1, r0]
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _0223F314 ; =0x00003108
ldrb r1, [r4, r1]
tst r0, r1
@@ -35958,7 +35958,7 @@ _0223F208:
ldr r0, _0223F310 ; =0x000021EC
ldrb r6, [r1, r0]
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _0223F314 ; =0x00003108
ldrb r1, [r4, r1]
tst r0, r1
@@ -36367,7 +36367,7 @@ _0223F51A:
str r0, [r4, r1]
b _0223F53E
_0223F534:
- bl FUN_0206A94C
+ bl LowestFlagNo
mov r1, #0x13
lsl r1, r1, #4
str r0, [r4, r1]
@@ -36924,7 +36924,7 @@ _0223F968:
add r1, r4, r0
ldr r0, _0223FAFC ; =0x000030BC
ldrh r0, [r1, r0]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
add r3, r0, #0
mov r0, #0
mvn r0, r0
@@ -36947,7 +36947,7 @@ _0223F9B6:
add r7, r0, #0
and r7, r1
add r0, r7, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r5
bne _0223F9B6
ldr r0, [r4, #0x64]
@@ -37287,7 +37287,7 @@ _0223FC42:
tst r0, r2
bne _0223FC90
add r0, r1, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
add r1, r7, #0
sub r1, #0x80
ldr r2, [r5, r1]
@@ -38126,7 +38126,7 @@ _022402E8:
and r0, r1
beq _02240346
lsr r0, r0, #0x10
- bl FUN_0206A94C
+ bl LowestFlagNo
mov r1, #0x46
lsl r1, r1, #2
str r0, [r4, r1]
@@ -40020,7 +40020,7 @@ _02241166:
add r1, #0x10
str r2, [r0, r1]
ldr r0, [r4, #0x64]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r1, #0x7b
ldr r3, [r4, #0x6c]
lsl r1, r1, #2
@@ -40068,7 +40068,7 @@ _022411D4:
lsl r0, r0, #8
str r2, [r1, r0]
ldr r0, [r4, #0x64]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r1, #0x81
ldr r3, [r4, #0x6c]
lsl r1, r1, #2
@@ -40661,7 +40661,7 @@ _02241688:
add r1, r4, r6
ldrb r6, [r1, r0]
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _0224172C ; =0x00003108
ldrb r1, [r4, r1]
tst r0, r1
@@ -40955,7 +40955,7 @@ _022418CE:
ldr r0, _022419F0 ; =0x000021EC
ldrb r6, [r1, r0]
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _022419F4 ; =0x00003108
ldrb r1, [r4, r1]
tst r0, r1
@@ -41040,7 +41040,7 @@ _02241982:
ldr r0, _022419F0 ; =0x000021EC
ldrb r6, [r1, r0]
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _022419F4 ; =0x00003108
ldrb r1, [r4, r1]
tst r0, r1
@@ -41097,7 +41097,7 @@ MOD11_022419FC: ; 0x022419FC
and r0, r1
beq _02241A32
lsr r0, r0, #0x1c
- bl FUN_0206A94C
+ bl LowestFlagNo
str r0, [r4, #0x74]
ldr r1, _02241A38 ; =0x0000213C
ldr r0, _02241A3C ; =0x0FFFFFFF
@@ -41655,7 +41655,7 @@ _02241E4A:
cmp r7, #0
bne _02241E6E
ldr r0, [sp, #0x2c]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r2, _02241FD4 ; =0x00003108
ldr r1, [sp, #4]
ldrb r1, [r1, r2]
@@ -41735,7 +41735,7 @@ _02241EF2:
cmp r7, #0
bne _02241F16
ldr r0, [sp, #0x2c]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r2, _02241FD4 ; =0x00003108
ldr r1, [sp, #4]
ldrb r1, [r1, r2]
@@ -42333,7 +42333,7 @@ _022423A6:
ldr r0, [sp]
add r1, r6, #0
bl MOD11_022302BC
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _022423FC ; =0x00003108
ldrb r1, [r5, r1]
tst r0, r1
@@ -42434,7 +42434,7 @@ MOD11_0224246C: ; 0x0224246C
add r6, r2, #0
str r3, [sp, #4]
mov r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02242508 ; =0x0000213C
lsl r0, r0, #0x18
ldr r2, [r5, r1]
@@ -42452,7 +42452,7 @@ _0224249C:
add r4, r4, #1
add r0, r5, r4
ldrb r0, [r0, r7]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [r5, r6]
lsl r0, r0, #0x18
tst r1, r0
@@ -42466,7 +42466,7 @@ _022424AE:
asr r0, r0, #0x18
and r1, r3
str r1, [r5, r2]
- bl FUN_0206A94C
+ bl LowestFlagNo
str r0, [r5, #0x74]
ldr r0, [sp, #4]
cmp r0, #1
@@ -42537,7 +42537,7 @@ _02242536:
asr r0, r0, #0x1c
and r1, r3
str r1, [r5, r2]
- bl FUN_0206A94C
+ bl LowestFlagNo
mov r2, #0x45
str r0, [r5, #0x74]
add r0, r5, #0
@@ -43850,7 +43850,7 @@ _02242FE4:
add r1, r7, r0
ldr r0, _02243048 ; =0x0000219C
ldrb r0, [r1, r0]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
lsl r1, r4, #3
add r2, r7, r1
mov r1, #0x71
@@ -44004,7 +44004,7 @@ MOD11_02243054: ; 0x02243054
str r0, [sp, #0xc]
_02243142:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r2, [sp, #0xc]
ldr r1, [sp, #8]
ldr r1, [r2, r1]
@@ -47255,13 +47255,13 @@ MOD11_022448CC: ; 0x022448CC
add r6, #0xa4
_022448F2:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _0224493C ; =0x00003108
ldrb r1, [r5, r1]
tst r0, r1
bne _02244928
ldr r0, [sp]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _0224493C ; =0x00003108
ldrb r1, [r5, r1]
tst r0, r1
@@ -47274,7 +47274,7 @@ _022448F2:
ldr r0, _02244944 ; =0x0000219C
add r1, r5, r4
ldrb r0, [r1, r0]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [r6]
orr r0, r1
str r0, [r6]
@@ -48916,13 +48916,13 @@ _02245594:
tst r0, r1
bne _022455E4
add r0, r1, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02245600 ; =0x00003108
ldrb r2, [r6, r1]
orr r0, r2
strb r0, [r6, r1]
mov r0, #3
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02245600 ; =0x00003108
ldrb r2, [r6, r1]
orr r0, r2
@@ -49130,14 +49130,14 @@ _0224575A:
add r7, r0, r1
_0224576A:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02245958 ; =0x00002DB0
lsl r0, r0, #0x10
ldr r1, [r5, r1]
tst r0, r1
beq _02245792
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02245958 ; =0x00002DB0
lsl r2, r0, #0x10
mov r0, #0
@@ -49352,7 +49352,7 @@ _0224587A:
add r1, #0x80
add r0, r4, #0
strh r5, [r3, r1]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r1, #6
lsl r3, r0, #8
sub r0, r5, #1
@@ -49515,14 +49515,14 @@ _02245A5E:
str r1, [r4, r0]
_02245A80:
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02245C38 ; =0x00002DB0
lsl r0, r0, #0x10
ldr r1, [r4, r1]
tst r0, r1
beq _02245AA8
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _02245C38 ; =0x00002DB0
lsl r2, r0, #0x10
mov r0, #0
@@ -49663,7 +49663,7 @@ _02245AFA:
add r0, #0x80
strh r4, [r2, r0]
add r0, r5, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
mov r1, #6
lsl r3, r0, #8
mov r0, #0
@@ -49948,7 +49948,7 @@ _02245DE0:
cmp r0, #0
beq _02245DF6
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_02245DF6:
ldr r1, [sp, #0x30]
@@ -49960,7 +49960,7 @@ _02245DF6:
cmp r0, #0
beq _02245E0E
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_02245E0E:
ldr r0, [sp, #0x44]
@@ -49973,7 +49973,7 @@ _02245E0E:
cmp r0, #0
beq _02245E28
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_02245E28:
ldr r1, [sp, #0x20]
@@ -49993,7 +49993,7 @@ _02245E28:
tst r0, r1
beq _02245E50
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_02245E50:
ldr r1, [sp, #0x3c]
@@ -50014,7 +50014,7 @@ _02245E50:
cmp r0, #0
bne _02245E7A
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_02245E7A:
ldr r3, _02245F64 ; =0x00002D4C
@@ -50029,7 +50029,7 @@ _02245E7A:
cmp r0, #0
beq _02245E9A
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_02245E9A:
ldr r3, _02245F64 ; =0x00002D4C
@@ -50044,7 +50044,7 @@ _02245E9A:
cmp r0, #0
beq _02245EBA
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_02245EBA:
ldr r3, _02245F64 ; =0x00002D4C
@@ -50059,7 +50059,7 @@ _02245EBA:
cmp r0, #0
beq _02245EDA
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_02245EDA:
ldr r0, [sp, #0x4c]
@@ -50071,7 +50071,7 @@ _02245EDA:
cmp r1, r0
beq _02245EF2
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_02245EF2:
ldr r0, [sp, #0x34]
@@ -50107,7 +50107,7 @@ _02245F20:
cmp r1, r0
beq _02245F38
add r0, r6, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_02245F38:
ldr r0, [sp, #0x30]
@@ -50150,7 +50150,7 @@ MOD11_02245F74: ; 0x02245F74
bl MOD11_02245D38
str r0, [sp, #0xc]
add r0, r7, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0xc]
tst r0, r1
beq _02245FC6
@@ -50183,7 +50183,7 @@ _02245FC6:
bl MOD11_02245D38
str r0, [sp, #0x10]
add r0, r7, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x10]
tst r0, r1
beq _02245FFE
@@ -50209,7 +50209,7 @@ _02245FFE:
bl MOD11_02245D38
str r0, [sp, #0x14]
add r0, r7, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x14]
tst r0, r1
beq _02246044
@@ -50242,7 +50242,7 @@ _02246044:
bl MOD11_02245D38
str r0, [sp, #0x18]
add r0, r7, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x18]
tst r0, r1
beq _0224608C
@@ -50276,7 +50276,7 @@ _0224608C:
bl MOD11_02245D38
str r0, [sp, #0x1c]
add r0, r7, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x1c]
tst r0, r1
beq _022460D2
@@ -50309,7 +50309,7 @@ _022460D2:
bl MOD11_02245D38
str r0, [sp, #0x20]
add r0, r7, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x20]
tst r0, r1
beq _0224611C
@@ -50345,7 +50345,7 @@ _0224611C:
bl MOD11_02245D38
str r0, [sp, #0x24]
add r0, r7, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x24]
tst r0, r1
beq _0224615C
@@ -50375,7 +50375,7 @@ _0224615C:
bl MOD11_02245D38
add r5, r0, #0
add r0, r7, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r5
beq _02246182
mov r0, #0
@@ -51505,7 +51505,7 @@ _022469C2:
cmp r6, r0
bne _022469F8
ldr r0, [sp, #0x18]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r4, r0
_022469F8:
ldr r0, [sp, #0x38]
@@ -51860,7 +51860,7 @@ MOD11_02246C50: ; 0x02246C50
ldr r0, _02246CA8 ; =0x0000219C
add r1, r5, r6
ldrb r0, [r1, r0]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp]
lsl r1, r1, #3
add r2, r5, r1
@@ -58146,7 +58146,7 @@ _02249BF2:
add r1, r5, r0
ldr r0, _02249D74 ; =0x0000219C
ldrb r0, [r1, r0]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #8]
lsl r1, r1, #3
add r2, r5, r1
@@ -61031,7 +61031,7 @@ _0224B1D8:
bl FUN_0206E7B8
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_02069F24
+ bl GetArceusTypeByPlate
mov r1, #0x46
lsl r1, r1, #2
ldr r1, [r5, r1]
@@ -63338,7 +63338,7 @@ _0224C3AA:
add r1, r5, r0
ldr r0, _0224C430 ; =0x0000219C
ldrb r0, [r1, r0]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #4]
lsl r1, r1, #3
add r2, r5, r1
@@ -64898,7 +64898,7 @@ MOD11_0224CEAC: ; 0x0224CEAC
str r0, [sp, #8]
_0224CEE2:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldrb r1, [r6, #1]
lsl r1, r1, #0x18
lsr r1, r1, #0x1c
@@ -64924,7 +64924,7 @@ _0224CF14:
ldrb r0, [r6, #1]
lsl r0, r0, #0x1c
lsr r0, r0, #0x1c
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [r6, #8]
tst r0, r1
bne _0224CF30
@@ -65912,7 +65912,7 @@ _0224D6D8:
ldrb r0, [r6, r1]
str r0, [r4, #0x1c]
ldr r0, [r5, #4]
- bl FUN_02068884
+ bl GetNatureFromPersonality
str r0, [r4, #0x24]
ldrb r0, [r5, #1]
add r1, r4, #0
@@ -66063,7 +66063,7 @@ _0224D774:
add r0, #0x8c
strb r1, [r0]
ldr r0, [r5, #4]
- bl FUN_02068884
+ bl GetNatureFromPersonality
add r1, r4, #0
add r1, #0x8d
strb r0, [r1]
@@ -66220,7 +66220,7 @@ _0224D8C4:
add r0, #0x8c
strb r1, [r0]
ldr r0, [r4, #4]
- bl FUN_02068884
+ bl GetNatureFromPersonality
add r1, r5, #0
add r1, #0x8d
strb r0, [r1]
@@ -73211,7 +73211,7 @@ _02251216:
add r5, sp, #0x10
_0225121C:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldrh r1, [r6, #0x22]
tst r0, r1
bne _0225122E
@@ -75337,7 +75337,7 @@ _0225230E:
add r0, #0x32
strb r1, [r0]
ldrb r0, [r4, #9]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldrb r1, [r4, #0x18]
tst r0, r1
bne _0225235E
@@ -75363,7 +75363,7 @@ _02252378:
ldrb r1, [r4, #9]
ldr r0, [r4]
bl MOD11_022302BC
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldrb r1, [r4, #0x18]
tst r0, r1
bne _0225239C
@@ -79189,7 +79189,7 @@ MOD11_022541C4: ; 0x022541C4
ble _0225420C
_022541DC:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp]
ldrb r1, [r1, #1]
tst r0, r1
@@ -81222,7 +81222,7 @@ _022551B8:
cmp r0, #0
bne _022551CC
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
orr r5, r0
_022551CC:
ldr r0, [sp, #4]
@@ -81979,14 +81979,14 @@ _02255774:
cmp r0, #0x4a
bne _02255852
mov r0, #1
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r2, _022558BC ; =0x00003108
ldr r1, [sp, #8]
ldrb r1, [r1, r2]
tst r0, r1
bne _022557D8
mov r0, #3
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r2, _022558BC ; =0x00003108
ldr r1, [sp, #8]
ldrb r1, [r1, r2]
@@ -82001,7 +82001,7 @@ _02255774:
b _0225589C
_022557D8:
mov r0, #1
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r2, _022558BC ; =0x00003108
ldr r1, [sp, #8]
add r3, sp, #0x10
@@ -83880,7 +83880,7 @@ _02256610:
cmp r0, #0x10
bne _02256624
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldrb r1, [r7, #1]
orr r0, r1
strb r0, [r7, #1]
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index 4cefdab3..ffd7eb1f 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -52747,7 +52747,7 @@ _021EFCC6:
add r7, r4, #0
_021EFCEA:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
tst r0, r6
beq _021EFCFC
mov r0, #0xd6
@@ -58345,7 +58345,7 @@ _021F2834:
add r0, r5, #0
lsr r1, r1, #0x18
bl MOD16_021F2D98
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _021F2854 ; =0x00003108
ldrb r1, [r5, r1]
tst r0, r1
@@ -58384,7 +58384,7 @@ _021F2884:
add r0, r5, #0
lsr r1, r1, #0x18
bl MOD16_021F2D98
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _021F28A4 ; =0x00003108
ldrb r1, [r5, r1]
tst r0, r1
@@ -61188,7 +61188,7 @@ MOD16_021F3D3C: ; 0x021F3D3C
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x24]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _021F3E88 ; =0x00003108
ldrb r1, [r5, r1]
tst r0, r1
@@ -61266,7 +61266,7 @@ _021F3DF4:
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x1c]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _021F3E88 ; =0x00003108
ldrb r1, [r5, r1]
tst r0, r1
@@ -62434,7 +62434,7 @@ _021F4704:
cmp r0, #0
beq _021F47E0
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x50]
tst r0, r1
bne _021F47E0
@@ -62515,7 +62515,7 @@ _021F4704:
b _021F47F0
_021F47E0:
add r0, r4, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x50]
orr r0, r1
lsl r0, r0, #0x18
@@ -62610,7 +62610,7 @@ _021F48A2:
cmp r0, #4
bne _021F48BA
ldr r0, [sp, #0x38]
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, [sp, #0x50]
orr r0, r1
lsl r0, r0, #0x18
@@ -63008,7 +63008,7 @@ _021F4BB2:
b _021F4DFA
_021F4BB4:
mov r0, #5
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _021F4D6C ; =0x000003D3
ldrb r1, [r5, r1]
orr r1, r0
@@ -63037,7 +63037,7 @@ _021F4BD0:
beq _021F4CBE
_021F4BEE:
mov r0, #4
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _021F4D6C ; =0x000003D3
ldrb r1, [r5, r1]
orr r1, r0
@@ -63062,7 +63062,7 @@ _021F4C0A:
tst r0, r1
beq _021F4CBE
mov r0, #3
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _021F4D6C ; =0x000003D3
ldrb r1, [r5, r1]
orr r1, r0
@@ -63087,7 +63087,7 @@ _021F4C3E:
tst r0, r1
beq _021F4CBE
mov r0, #2
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _021F4D6C ; =0x000003D3
ldrb r1, [r5, r1]
orr r1, r0
@@ -63112,7 +63112,7 @@ _021F4C72:
tst r0, r1
beq _021F4CBE
mov r0, #1
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _021F4D6C ; =0x000003D3
ldrb r1, [r5, r1]
orr r1, r0
@@ -63140,7 +63140,7 @@ _021F4CBE:
b _021F4DFA
_021F4CC0:
mov r0, #0
- bl FUN_0206A92C
+ bl MaskOfFlagNo
ldr r1, _021F4D6C ; =0x000003D3
ldrb r1, [r5, r1]
orr r1, r0
diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s
index ac2b8a5d..b27fc3c8 100644
--- a/arm9/modules/70/asm/module_70.s
+++ b/arm9/modules/70/asm/module_70.s
@@ -1556,7 +1556,7 @@ _021D80F4:
ldrb r2, [r2]
ldr r0, [r7, r0]
mov r3, #0x20
- bl FUN_02066ACC
+ bl CreateMon
mov r0, #0x66
lsl r0, r0, #2
ldr r0, [r7, r0]
diff --git a/arm9/src/filesystem.c b/arm9/src/filesystem.c
index de0f6457..16258195 100644
--- a/arm9/src/filesystem.c
+++ b/arm9/src/filesystem.c
@@ -6,7 +6,11 @@
static char * sNarcFileList[] = {
"battle/skill/waza_seq.narc",
"battle/skill/sub_seq.narc",
+#ifdef PEARL
+ "poketool/personal_pearl/personal.narc",
+#else
"poketool/personal/personal.narc",
+#endif
"poketool/personal/growtbl.narc",
"poketool/pokegra/pokegra.narc",
"poketool/pokegra/height.narc",
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 07:10:17 +0000