Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-08-06 10:43:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync pokemon.c with pokeheartgold

Browse Source
This commit is contained in:
Eduardo Quezada 2025-12-24 10:16:53 -03:00
parent cf51c2828f
commit ddf6bd43b0
96 changed files with 2988 additions and 2952 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
arm9/asm/scrcmd_12.s
View File

@ -349,17 +349,17 @@ sub_02042F6C: ; 0x02042F6C
mov r1, #0x97
add r2, r7, #0x0
add r5, #0xf0
bl GetMonData
bl Pokemon_GetData
add r1, r7, #0x0
str r0, [sp, #0x8]
add r0, r4, #0x0
add r2, r1, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x14]
add r0, r4, #0x0
mov r1, #0x7
add r2, r7, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
bl OS_GetTick
bl PRandom
@ -371,7 +371,7 @@ sub_02042F6C: ; 0x02042F6C
cmp r0, #0x1
bne _02042FE6
add r0, r6, #0x0
bl CalcShininessByOtIdAndPersonality
bl Personality_IsShiny
cmp r0, #0x0
beq _02042FE8
_02042FD0:
@ -380,7 +380,7 @@ _02042FD0:
add r1, r0, #0x0
add r0, r6, #0x0
str r1, [sp, #0x34]
bl CalcShininessByOtIdAndPersonality
bl Personality_IsShiny
cmp r0, #0x0
bne _02042FD0
b _02042FE8
@ -391,41 +391,41 @@ _02042FE8:
add r0, r4, #0x0
bl sub_0206A23C
add r0, r4, #0x0
bl GetMonGender
bl Pokemon_GetGender
str r0, [sp, #0x30]
add r0, r4, #0x0
mov r1, #0x6f
add r2, sp, #0x30
bl SetMonData
bl Pokemon_SetData
add r0, r4, #0x0
mov r1, #0x4b
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x18]
add r0, r4, #0x0
mov r1, #0x4a
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x1c]
add r0, r4, #0x0
mov r1, #0x49
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x20]
add r0, r4, #0x0
mov r1, #0x48
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x24]
add r0, r4, #0x0
mov r1, #0x46
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
add r0, r4, #0x0
mov r1, #0x47
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r6, r0
ldr r0, [sp, #0x24]
add r1, r0, r1
@ -445,7 +445,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x46
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
mov r0, #0x3e
lsl r0, r0, #0x4
and r0, r6
@ -454,7 +454,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x47
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
mov r0, #0x1f
lsl r0, r0, #0xa
and r0, r6
@ -463,7 +463,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x48
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
bl LCRandom
add r6, r0, #0x0
mov r0, #0x1f
@ -472,7 +472,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x49
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
mov r0, #0x3e
lsl r0, r0, #0x4
and r0, r6
@ -481,7 +481,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x4a
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
mov r0, #0x1f
lsl r0, r0, #0xa
and r0, r6
@ -490,7 +490,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x4b
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
_020430DA:
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
@ -499,7 +499,7 @@ _020430DA:
add r0, r4, #0x0
mov r1, #0x2e
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _020430FC
mov r0, #0x49
@ -510,7 +510,7 @@ _020430FC:
add r0, r4, #0x0
mov r1, #0x2f
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _02043114
mov r0, #0x4a
@ -521,7 +521,7 @@ _02043114:
add r0, r4, #0x0
mov r1, #0x30
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0204312C
mov r0, #0x4b
@ -532,7 +532,7 @@ _0204312C:
add r0, r4, #0x0
mov r1, #0x31
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _02043144
mov r0, #0x4c
@ -543,7 +543,7 @@ _02043144:
add r0, r4, #0x0
mov r1, #0x32
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0204315C
mov r0, #0x4d
@ -554,7 +554,7 @@ _0204315C:
add r0, r4, #0x0
mov r1, #0x33
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _02043174
mov r0, #0x4e
@ -565,7 +565,7 @@ _02043174:
add r0, r4, #0x0
mov r1, #0x34
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0204318C
mov r0, #0x4f
@ -576,7 +576,7 @@ _0204318C:
add r0, r4, #0x0
mov r1, #0x67
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _020431A4
mov r0, #0x19
@ -587,7 +587,7 @@ _020431A4:
add r0, r4, #0x0
mov r1, #0x68
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _020431BC
mov r0, #0x1a
@ -598,7 +598,7 @@ _020431BC:
add r0, r4, #0x0
mov r1, #0x69
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _020431D4
mov r0, #0x1b
@ -621,7 +621,7 @@ _020431D4:
bl PlayerProfile_GetTrainerGender
str r0, [sp, #0x28]
mov r0, #0x20
bl AllocMonZeroed
bl Pokemon_New
add r7, r0, #0x0
add r0, r4, #0x0
add r1, r7, #0x0
@ -629,15 +629,15 @@ _020431D4:
add r0, r7, #0x0
mov r1, #0x90
add r2, r5, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r7, #0x0
mov r1, #0x7
add r2, sp, #0x2c
bl SetMonData
bl Pokemon_SetData
add r0, r7, #0x0
mov r1, #0x9c
add r2, sp, #0x28
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
add r4, r7, #0x0
bl String_Delete
@ -653,7 +653,7 @@ _0204322C:
mov r2, #0x4
bl sub_0208089C
add r0, r4, #0x0
bl CalcMonLevelAndStats
bl Pokemon_CalcLevelAndStats
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Party_Get

10
arm9/asm/scrcmd_5.s
View File

@ -91,13 +91,13 @@ _0204123C:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
bne _0204127C
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
lsl r1, r1, #0x10
@ -132,19 +132,19 @@ _02041290:
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
beq _020412E0
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
bne _020412E0
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
lsl r1, r1, #0x10

22
arm9/asm/unk_02026CD0.s
View File

@ -15,27 +15,27 @@ sub_02026CD0: ; 0x02026CD0
mov r1, #0x5
mov r2, #0x0
add r7, r3, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r5, #0x0
strh r0, [r5, #0x8]
add r0, r4, #0x0
mov r1, #0x74
add r2, #0xa
bl GetMonData
bl Pokemon_GetData
mov r1, #0x0
add r0, r4, #0x0
add r2, r1, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [r5, #0x4]
add r0, r4, #0x0
mov r1, #0x70
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x33
strb r0, [r1, #0x0]
@ -2120,17 +2120,17 @@ _02027B9C:
str r0, [sp, #0xc]
ldrh r1, [r5, #0x10]
add r0, r4, #0x0
bl CreateMon
bl Pokemon_InitWithParams
add r2, r5, #0x0
add r0, r4, #0x0
mov r1, #0x74
add r2, #0x12
bl SetMonData
bl Pokemon_SetData
add r5, #0x3b
add r0, r4, #0x0
mov r1, #0x70
add r2, r5, #0x0
bl SetMonData
bl Pokemon_SetData
add sp, #0x10
pop {r3-r5, pc}
nop
@ -2295,17 +2295,17 @@ sub_02027CB8: ; 0x02027CB8
str r0, [sp, #0xc]
ldrh r1, [r5, #0x8]
add r0, r4, #0x0
bl CreateMon
bl Pokemon_InitWithParams
add r2, r5, #0x0
add r0, r4, #0x0
mov r1, #0x74
add r2, #0xa
bl SetMonData
bl Pokemon_SetData
add r5, #0x33
add r0, r4, #0x0
mov r1, #0x70
add r2, r5, #0x0
bl SetMonData
bl Pokemon_SetData
add sp, #0x10
pop {r3-r5, pc}
.balign 4

10
arm9/asm/unk_0202BE98.s
View File

@ -23,11 +23,11 @@ sub_0202BEA0: ; 0x0202BEA0
add r7, r4, #0x0
_0202BEB4:
add r0, r5, #0x0
bl ZeroMonData
bl Pokemon_Init
add r0, r5, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0202BECC
bl GF_AssertFail
@ -53,11 +53,11 @@ sub_0202BEDC: ; 0x0202BEDC
add r7, r4, #0x0
_0202BEF0:
add r0, r5, #0x0
bl ZeroMonData
bl Pokemon_Init
add r0, r5, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0202BF08
bl GF_AssertFail
@ -205,7 +205,7 @@ _0202C00A:
add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0202C01A
add r4, r4, #0x1

2
arm9/asm/unk_02035068.s
View File

@ -2463,7 +2463,7 @@ _020363F6:
ldr r0, [sp, #0xc]
mov r1, #0x6
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
bne _02036474
add r0, r5, #0x0

8
arm9/asm/unk_020377F0.s
View File

@ -1617,7 +1617,7 @@ _020382F6:
ldr r0, [r4, #0x44]
mov r1, #0x6
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r3, r0, #0x0
add r0, sp, #0x30
str r0, [sp, #0x0]
@ -1942,7 +1942,7 @@ _02038590:
ldr r2, [r4, #0xc]
mov r1, #0x75
add r2, #0x1c
bl SetMonData
bl Pokemon_SetData
pop {r3-r5, pc}
_020385A8:
ldr r0, [r5, #0xc]
@ -2009,13 +2009,13 @@ _02038620:
mov r1, #0x6f
mov r2, #0x0
add r6, r0, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [r4, #0xc]
mov r2, #0x0
str r0, [r1, #0x10]
add r0, r6, #0x0
mov r1, #0x70
bl GetMonData
bl Pokemon_GetData
ldr r1, [r4, #0xc]
cmp r5, #0x0
str r0, [r1, #0x8]

2
arm9/asm/unk_02047500.s
View File

@ -242,7 +242,7 @@ sub_02047668: ; 0x02047668
bl GetFirstAliveMonInParty_CrashIfNone
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020476C8 ; =0x000001DF
sub r0, r0, r1
cmp r0, #0xe

20
arm9/asm/unk_020476CC.s
View File

@ -250,7 +250,7 @@ sub_02047814: ; 0x02047814
add r3, r6, #0x0
bl Bag_AddItem
add r0, r6, #0x0
bl AllocMonZeroed
bl Pokemon_New
add r6, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
@ -265,7 +265,7 @@ sub_02047814: ; 0x02047814
add r0, r6, #0x0
mov r2, #0x5
mov r3, #0x20
bl CreateMon
bl Pokemon_InitWithParams
ldr r0, [r4, #0x4]
add r1, r6, #0x0
bl Party_AddMon
@ -278,7 +278,7 @@ sub_02047814: ; 0x02047814
ldr r1, _02047960 ; =0x0000018F
add r0, r6, #0x0
mov r3, #0x20
bl CreateMon
bl Pokemon_InitWithParams
ldr r0, [r4, #0x8]
add r1, r6, #0x0
bl Party_AddMon
@ -646,7 +646,7 @@ sub_02047BC0: ; 0x02047BC0
mov r2, #0x0
bl sub_02047A44
mov r0, #0xb
bl AllocMonZeroed
bl Pokemon_New
add r5, r0, #0x0
ldr r0, [sp, #0x14]
bl Party_GetCount
@ -667,7 +667,7 @@ _02047C40:
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r7, r0
beq _02047C82
cmp r7, #0x0
@ -675,16 +675,16 @@ _02047C40:
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r7, #0x0
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
str r0, [sp, #0x18]
add r0, r5, #0x0
mov r1, #0x8
add r2, sp, #0x18
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
bl CalcMonLevelAndStats
bl Pokemon_CalcLevelAndStats
_02047C82:
add r0, r6, #0x0
add r1, r5, #0x0
@ -844,7 +844,7 @@ _02047DC2:
b _02047E14
_02047DD8:
mov r0, #0xb
bl AllocMonZeroed
bl Pokemon_New
str r0, [sp, #0x8]
ldr r0, [r5, #0x4]
add r1, r4, #0x0

10
arm9/asm/unk_0204B9EC.s
View File

@ -180,7 +180,7 @@ sub_0204BB20: ; 0x0204BB20
bl sub_02022528
str r0, [sp, #0x4]
mov r0, #0x4
bl AllocMonZeroed
bl Pokemon_New
ldr r5, [sp, #0x0]
add r4, r0, #0x0
mov r6, #0x0
@ -198,7 +198,7 @@ _0204BB3C:
add r0, r4, #0x0
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
strh r0, [r5, #0x0]
@ -220,12 +220,12 @@ _0204BB72:
ldrb r0, [r7, #0x2]
strh r0, [r5, #0x4]
add r0, r4, #0x0
bl GetMonData
bl Pokemon_GetData
strb r0, [r5, #0x6]
add r0, r4, #0x0
mov r1, #0xb1
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strb r0, [r5, #0x7]
add r6, r6, #0x1
add r5, #0x8
@ -473,7 +473,7 @@ sub_0204BD40: ; 0x0204BD40
add r5, r0, #0x0
mov r0, #0x20
add r6, r1, #0x0
bl AllocMonZeroed
bl Pokemon_New
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl sub_02022528

2
arm9/asm/unk_02050E48.s
View File

@ -1720,7 +1720,7 @@ _02051BD6:
mov r1, #0x5
add r0, r0, r6
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r0, #0x0
ldr r0, [sp, #0x18]
ldr r2, [r5, #0xc]

4
arm9/asm/unk_02054C14.s
View File

@ -302,7 +302,7 @@ _02054E02:
bl Party_GetMonByIndex
add r1, r7, #0x0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
bne _02054E1E
add r0, r4, #0x0
@ -338,7 +338,7 @@ _02054E4A:
bl Party_GetMonByIndex
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x0]
add r6, r6, #0x1
add r5, r5, #0x2

12
arm9/asm/unk_020603B0.s
View File

@ -245,9 +245,9 @@ _020604D0:
bl Save_PlayerData_GetProfile
str r0, [sp, #0x18]
mov r0, #0x4
bl AllocMonZeroed
bl Pokemon_New
str r0, [sp, #0x1c]
bl ZeroMonData
bl Pokemon_Init
ldr r0, [sp, #0x18]
bl PlayerProfile_GetTrainerID_VisibleHalf
mov r1, #0x0
@ -260,7 +260,7 @@ _020604D0:
add r1, r7, #0x0
add r2, r6, #0x0
mov r3, #0x20
bl CreateMon
bl Pokemon_InitWithParams
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
@ -272,7 +272,7 @@ _020604D0:
ldr r0, [sp, #0x1c]
mov r1, #0xae
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x2
@ -280,7 +280,7 @@ _020604D0:
mov r1, #0x0
ldr r0, [sp, #0x1c]
add r2, r1, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x3
@ -288,7 +288,7 @@ _020604D0:
ldr r0, [sp, #0x1c]
mov r1, #0xa3
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x5

4
arm9/asm/unk_020606B0.s
View File

@ -140,10 +140,10 @@ CallTask_NPCTrade: ; 0x02060790
str r5, [r4, #0x0]
ldr r0, [sp, #0x0]
str r6, [r4, #0x8]
bl AllocMonZeroed
bl Pokemon_New
str r0, [r4, #0x24]
ldr r0, [sp, #0x0]
bl AllocMonZeroed
bl Pokemon_New
str r0, [r4, #0x28]
ldr r1, _020607D0 ; =sub_020606D0
add r0, r7, #0x0

20
arm9/asm/unk_02060CCC.s
View File

@ -323,7 +323,7 @@ sub_02060E04: ; 0x02060E04
add r0, r6, #0x0
mov r1, #0x76
add r2, r4, #0x0
bl GetMonData
bl Pokemon_GetData
add r0, r4, #0x0
add r1, r5, #0x0
mov r2, #0xb
@ -342,22 +342,22 @@ sub_02060E34: ; 0x02060E34
mov r1, #0x5
mov r2, #0x0
add r7, r3, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x0]
add r0, r5, #0x0
mov r1, #0x6f
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strb r0, [r6, #0x0]
add r0, r5, #0x0
mov r1, #0xc
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strb r0, [r7, #0x0]
add r0, r5, #0x0
mov r1, #0x79
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x18]
strb r0, [r1, #0x0]
pop {r3-r7, pc}
@ -420,7 +420,7 @@ sub_02060ECC: ; 0x02060ECC
mov r1, #0x4d
mov r2, #0x0
add r7, r3, #0x0
bl GetMonData
bl Pokemon_GetData
strb r0, [r4, #0x0]
ldrb r0, [r4, #0x0]
cmp r0, #0x0
@ -432,7 +432,7 @@ sub_02060ECC: ; 0x02060ECC
add r0, r5, #0x0
mov r1, #0x76
add r2, r4, #0x0
bl GetMonData
bl Pokemon_GetData
add r0, r4, #0x0
add r1, r7, #0x0
mov r2, #0xb
@ -479,7 +479,7 @@ sub_02060F3C: ; 0x02060F3C
mov r0, #0x0
strb r0, [r4, #0x1f]
add r0, r5, #0x0
bl GetMonNature
bl Pokemon_GetNature
strb r0, [r4, #0x1e]
add r0, r4, #0x6
str r0, [sp, #0x0]
@ -491,7 +491,7 @@ sub_02060F3C: ; 0x02060F3C
add r0, r5, #0x0
mov r1, #0x4d
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strb r0, [r4, #0x7]
add r2, r4, #0x7
add r4, #0x8
@ -624,7 +624,7 @@ sub_02061028: ; 0x02061028
add r0, r4, #0x0
mov r1, #0x9a
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x22]
ldrh r0, [r5, #0x22]
cmp r0, #0x0

16
arm9/asm/unk_0206BB5C.s
View File

@ -34,7 +34,7 @@ sub_0206BB84: ; 0x0206BB84
add r0, r7, #0x0
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r6, r0, #0x10
cmp r4, #0x0
@ -49,7 +49,7 @@ _0206BBA2:
add r0, r7, #0x0
mov r1, #0xa0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, r5
bls _0206BBBE
mov r0, #0x0
@ -58,7 +58,7 @@ _0206BBBE:
add r0, r7, #0x0
mov r1, #0x4c
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0206BBD0
mov r0, #0x0
@ -208,17 +208,17 @@ _0206BCE2:
add r0, r4, #0x0
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r7, #0x0]
add r0, r4, #0x0
mov r1, #0x6
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r6, #0x0]
add r0, r4, #0x0
mov r1, #0xa0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x10]
add r0, r1, r0
str r0, [sp, #0x10]
@ -427,12 +427,12 @@ _0206BE72:
str r0, [sp, #0x24]
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x0]
ldr r0, [sp, #0x24]
mov r1, #0xa0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x0]
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x24]

52
arm9/asm/unk_0206C700.s
View File

@ -76,7 +76,7 @@ sub_0206C700: ; 0x0206C700
mov r1, #0x5
mov r2, #0x0
str r0, [r4, #0x28]
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0x0
add r1, #0x60
strh r0, [r1, #0x0]
@ -1040,11 +1040,11 @@ _0206CF7E:
ldr r0, [r4, #0x28]
mov r1, #0x5
add r2, #0x62
bl SetMonData
bl Pokemon_SetData
ldr r0, [r4, #0x28]
bl sub_0206A1C4
ldr r0, [r4, #0x28]
bl CalcMonLevelAndStats
bl Pokemon_CalcLevelAndStats
ldr r0, [r4, #0x28]
bl sub_020690E4
add r2, r0, #0x0
@ -1111,13 +1111,13 @@ _0206CFFA:
ldr r0, [r4, #0x28]
mov r1, #0x4d
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
bne _0206D05E
ldr r0, [r4, #0x28]
mov r1, #0xb2
mov r2, #0x0
bl SetMonData
bl Pokemon_SetData
_0206D05E:
add r0, r4, #0x0
add r0, #0x64
@ -1652,7 +1652,7 @@ _0206D4A6:
ldr r0, [r4, #0x28]
mov r2, #0x0
add r1, #0x36
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
ldr r0, [r4, #0xc]
mov r1, #0x1
@ -1736,7 +1736,7 @@ _0206D560:
ldr r0, [r4, #0x28]
add r2, #0x66
add r1, #0x3e
bl SetMonData
bl Pokemon_SetData
add r1, r4, #0x0
add r2, r4, #0x0
add r1, #0x6c
@ -2092,7 +2092,7 @@ _0206D86C:
b _0206D9AE
_0206D86E:
ldr r0, [r4, #0x5c]
bl AllocMonZeroed
bl Pokemon_New
add r5, r0, #0x0
ldr r0, [r4, #0x28]
add r1, r5, #0x0
@ -2103,30 +2103,30 @@ _0206D86E:
add r0, r5, #0x0
mov r1, #0x5
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
mov r0, #0x4
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x9a
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
mov r0, #0x0
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
mov r1, #0xb
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
mov r1, #0x19
str r1, [sp, #0x4]
add r6, sp, #0x0
_0206D8BA:
add r0, r5, #0x0
add r2, r6, #0x0
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x4]
add r1, r0, #0x1
str r1, [sp, #0x4]
@ -2138,7 +2138,7 @@ _0206D8BA:
_0206D8D2:
add r0, r5, #0x0
add r2, r6, #0x0
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x4]
add r1, r0, #0x1
str r1, [sp, #0x4]
@ -2150,7 +2150,7 @@ _0206D8D2:
_0206D8EA:
add r0, r5, #0x0
add r2, r6, #0x0
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x4]
add r1, r0, #0x1
str r1, [sp, #0x4]
@ -2159,28 +2159,28 @@ _0206D8EA:
add r0, r5, #0x0
mov r1, #0xb2
mov r2, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
mov r1, #0x4d
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
ldr r0, [r4, #0x5c]
bl Mail_New
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa9
add r2, r6, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r6, #0x0
bl FreeToHeap
add r0, r5, #0x0
mov r1, #0xa1
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
mov r0, #0x0
add r1, sp, #0x8
mov r2, #0x18
@ -2188,11 +2188,11 @@ _0206D8EA:
add r0, r5, #0x0
mov r1, #0xaa
add r2, sp, #0x8
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
bl sub_0206A1C4
add r0, r5, #0x0
bl CalcMonLevelAndStats
bl Pokemon_CalcLevelAndStats
ldr r0, [r4, #0x24]
add r1, r5, #0x0
bl Party_AddMon
@ -2225,7 +2225,7 @@ _0206D9A0:
ldr r0, [r4, #0x28]
mov r1, #0x6
add r2, sp, #0x4
bl SetMonData
bl Pokemon_SetData
_0206D9AE:
add sp, #0x20
pop {r4-r6, pc}
@ -2572,7 +2572,7 @@ sub_0206DC80: ; 0x0206DC80
bl sub_020073A0
str r0, [r4, #0x1c]
ldr r0, [r4, #0x5c]
bl AllocMonZeroed
bl Pokemon_New
add r5, r0, #0x0
ldr r0, [r4, #0x28]
add r1, r5, #0x0
@ -2581,9 +2581,9 @@ sub_0206DC80: ; 0x0206DC80
add r0, r5, #0x0
mov r1, #0x5
add r2, #0x62
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
bl CalcMonLevelAndStats
bl Pokemon_CalcLevelAndStats
add r0, sp, #0x10
add r1, r5, #0x0
mov r2, #0x2

72
arm9/asm/unk_0206F3FC.s
View File

@ -1684,7 +1684,7 @@ _020700BC:
mov r1, #0x5
mov r2, #0x0
add r7, r0, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x4]
@ -1708,42 +1708,42 @@ _020700DE:
add r0, r7, #0x0
mov r1, #0xa2
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020701E4 ; =0x00000706
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xa3
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020701E8 ; =0x00000708
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xa0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020701EC ; =0x0000070A
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0x6
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020701F0 ; =0x0000070C
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xa1
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020701F4 ; =0x00000712
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0x4c
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x71
add r2, r5, r6
lsl r1, r1, #0x4
@ -1751,14 +1751,14 @@ _020700DE:
add r0, r7, #0x0
mov r1, #0x70
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020701F8 ; =0x00000711
add r2, r5, r6
strb r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xaf
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x1
ldr r0, _020701FC ; =0x0000070E
bne _02070184
@ -1778,7 +1778,7 @@ _0207018E:
ldr r0, _020701FC ; =0x0000070E
add r6, r5, r0
add r0, r7, #0x0
bl GetMonGender
bl Pokemon_GetGender
lsl r0, r0, #0x1e
ldrh r2, [r6, r4]
ldr r1, _02070204 ; =0xFFFF9FFF
@ -1867,7 +1867,7 @@ _02070256:
add r0, r5, #0x0
add r1, #0x36
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0207026C
add r4, r4, #0x1
@ -1928,106 +1928,106 @@ _020702BE: ; jump table (using 16-bit offset)
_020702C8:
mov r1, #0x7a
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x7b
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x7c
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x7d
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
b _020703B6
_020702F8:
mov r1, #0x7e
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x7f
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x80
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x81
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
b _020703B6
_02070328:
mov r1, #0x82
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x83
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x84
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x85
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
b _020703B6
_02070358:
mov r1, #0x86
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x87
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x88
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x89
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
b _020703B6
_02070388:
mov r1, #0x8a
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x8b
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x8c
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x8d
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r4, r0
_020703B6:
add r0, r4, #0x0
@ -2842,7 +2842,7 @@ _02070A38:
_02070A3A:
mov r1, #0xa2
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
bne _02070A4E
add r0, r4, #0x2
@ -3793,7 +3793,7 @@ _020711D0:
ldr r0, [sp, #0x8]
add r1, #0x36
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r7, r0, #0x10
beq _02071210
@ -5252,7 +5252,7 @@ _02071D14:
add r2, sp, #0x0
str r1, [sp, #0x0]
mov r1, #0xa2
bl SetMonData
bl Pokemon_SetData
mov r0, #0x1
pop {r3-r7, pc}
_02071D30:
@ -5673,7 +5673,7 @@ sub_02072080: ; 0x02072080
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
bl Pokemon_UpdateArceusForm
ldr r1, _020720D8 ; =0x00000B25
@ -5716,7 +5716,7 @@ sub_020720E0: ; 0x020720E0
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x1c
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
bl Pokemon_UpdateArceusForm
ldr r1, _02072138 ; =0x00000B25

12
arm9/asm/unk_02072548.s
View File

@ -1987,37 +1987,37 @@ sub_020734C0: ; 0x020734C0
mov r1, #0xa3
mov r2, #0x0
add r4, r0, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #0x20
strh r0, [r1, #0x0]
add r0, r4, #0x0
mov r1, #0xa4
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #0x20
strh r0, [r1, #0x2]
add r0, r4, #0x0
mov r1, #0xa5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #0x20
strh r0, [r1, #0x4]
add r0, r4, #0x0
mov r1, #0xa7
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #0x20
strh r0, [r1, #0x6]
add r0, r4, #0x0
mov r1, #0xa8
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #0x20
strh r0, [r1, #0x8]
add r0, r4, #0x0
mov r1, #0xa6
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #0x20
strh r0, [r1, #0xa]
mov r3, #0x1

2
arm9/asm/unk_02073710.s
View File

@ -248,7 +248,7 @@ sub_020737D0: ; 0x020737D0
ldr r0, [sp, #0x10]
mov r1, #0x4c
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
str r7, [sp, #0x14]
add r0, sp, #0x14

6
arm9/asm/unk_02073DA8.s
View File

@ -244,7 +244,7 @@ _02073F66:
add r6, r0, #0x0
mov r1, #0x6
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r6, #0x0
bl Pokemon_UpdateArceusForm
ldr r2, _02074058 ; =0x0000069C
@ -631,7 +631,7 @@ sub_020742A8: ; 0x020742A8
add r5, r0, #0x0
mov r1, #0x6
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
bl Pokemon_UpdateArceusForm
ldr r1, _02074330 ; =0x00000B25
@ -2386,7 +2386,7 @@ sub_02075118: ; 0x02075118
bl Party_GetMonByIndex
mov r1, #0xa1
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
ldr r2, _02075198 ; =0x0000069C
bne _0207515C

72
arm9/asm/unk_0207550C.s
View File

@ -1049,49 +1049,49 @@ sub_02075DC0: ; 0x02075DC0
mov r1, #0xd
mov r2, #0x0
add r4, r0, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x1c]
add r0, r4, #0x0
mov r1, #0xe
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x18]
add r0, r4, #0x0
mov r1, #0xf
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x14]
add r0, r4, #0x0
mov r1, #0x10
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x10]
add r0, r4, #0x0
mov r1, #0x11
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0xc]
add r0, r4, #0x0
mov r1, #0x12
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x8]
add r0, r4, #0x0
mov r1, #0x9
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r7, r0, #0x18
ldr r0, _02075F4C ; =0x000005A4
@ -1135,42 +1135,42 @@ sub_02075DC0: ; 0x02075DC0
add r0, r4, #0x0
mov r1, #0xd
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x1c]
cmp r1, r0
bne _02075EFA
add r0, r4, #0x0
mov r1, #0xe
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x18]
cmp r1, r0
bne _02075EFA
add r0, r4, #0x0
mov r1, #0xf
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x14]
cmp r1, r0
bne _02075EFA
add r0, r4, #0x0
mov r1, #0x10
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x10]
cmp r1, r0
bne _02075EFA
add r0, r4, #0x0
mov r1, #0x11
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0xc]
cmp r1, r0
bne _02075EFA
add r0, r4, #0x0
mov r1, #0x12
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x8]
cmp r1, r0
beq _02075F26
@ -1178,7 +1178,7 @@ _02075EFA:
add r0, r4, #0x0
mov r1, #0x9
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r7, r0
ldr r1, _02075F4C ; =0x000005A4
beq _02075F18
@ -1247,7 +1247,7 @@ sub_02075F60: ; 0x02075F60
mov r1, #0xa2
mov r2, #0x0
str r0, [sp, #0x8]
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0x0
ldr r0, _02076084 ; =0x00000B25
ldrb r1, [r5, r0]
@ -1375,7 +1375,7 @@ sub_020760A0: ; 0x020760A0
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02076134 ; =0x00000B25
add r4, r0, #0x0
ldrb r2, [r5, r1]
@ -1574,7 +1574,7 @@ _02076212:
add r0, r5, #0x0
mov r1, #0xa2
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r0, _020763E4 ; =0x0000069C
mov r1, #0x46
ldr r0, [r4, r0]
@ -1649,7 +1649,7 @@ _020762DC:
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r2, _020763E0 ; =0x00000B25
add r5, r0, #0x0
ldr r0, _02076400 ; =0x00000706
@ -1786,38 +1786,38 @@ sub_0207640C: ; 0x0207640C
mov r1, #0xa3
mov r2, #0x0
add r4, r0, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020765B8 ; =0x00000B28
mov r2, #0x0
strh r0, [r5, r1]
add r0, r4, #0x0
mov r1, #0xa4
bl GetMonData
bl Pokemon_GetData
ldr r1, _020765BC ; =0x00000B2A
mov r2, #0x0
strh r0, [r5, r1]
add r0, r4, #0x0
mov r1, #0xa5
bl GetMonData
bl Pokemon_GetData
ldr r1, _020765C0 ; =0x00000B2C
mov r2, #0x0
strh r0, [r5, r1]
add r0, r4, #0x0
mov r1, #0xa7
bl GetMonData
bl Pokemon_GetData
ldr r1, _020765C4 ; =0x00000B2E
mov r2, #0x0
strh r0, [r5, r1]
add r0, r4, #0x0
mov r1, #0xa8
bl GetMonData
bl Pokemon_GetData
mov r1, #0xb3
lsl r1, r1, #0x4
strh r0, [r5, r1]
add r0, r4, #0x0
mov r1, #0xa6
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020765C8 ; =0x00000B32
strh r0, [r5, r1]
ldr r0, _020765B0 ; =0x000005A4
@ -1836,7 +1836,7 @@ sub_0207640C: ; 0x0207640C
add r0, r4, #0x0
mov r1, #0xa0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020765B4 ; =0x00000B25
ldrb r2, [r5, r1]
mov r1, #0x2c
@ -1847,7 +1847,7 @@ sub_0207640C: ; 0x0207640C
add r0, r4, #0x0
mov r1, #0xa2
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020765B4 ; =0x00000B25
ldrb r2, [r5, r1]
mov r1, #0x2c
@ -1858,7 +1858,7 @@ sub_0207640C: ; 0x0207640C
add r0, r4, #0x0
mov r1, #0xa3
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020765B4 ; =0x00000B25
ldrb r2, [r5, r1]
mov r1, #0x2c
@ -2335,7 +2335,7 @@ _020768E6:
add r0, r5, #0x0
add r1, #0x36
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
mov r0, #0x6a
lsl r0, r0, #0x4
@ -2540,7 +2540,7 @@ _02076AAA:
add r0, r6, #0x0
add r1, #0x36
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r2, r0, #0x10
ldr r0, [r5, r7]
@ -2803,7 +2803,7 @@ _02076CDC:
add r0, r5, #0x0
add r1, #0x36
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
mov r0, #0x6a
lsl r0, r0, #0x4
@ -3080,14 +3080,14 @@ sub_02076F2C: ; 0x02076F2C
str r0, [sp, #0x0]
add r0, r4, #0x0
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
mov r0, #0x0
add r1, r6, #0x0
str r0, [sp, #0x0]
add r0, r4, #0x0
add r1, #0x3e
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
ldr r0, _02076FAC ; =0x000005A4
mov r1, #0x0
ldr r0, [r5, r0]
@ -3098,7 +3098,7 @@ sub_02076F2C: ; 0x02076F2C
add r0, r4, #0x0
add r1, r6, #0x0
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
ldr r0, _02076FAC ; =0x000005A4
ldr r1, [r5, r0]
ldrh r0, [r1, #0x24]
@ -3121,7 +3121,7 @@ _02076F98:
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x4
bl MonApplyFriendshipMod
bl Pokemon_UpdateFriendship
_02076FA8:
add sp, #0x4
pop {r3-r6, pc}
@ -3142,7 +3142,7 @@ sub_02076FB0: ; 0x02076FB0
add r1, r6, #0x0
add r1, #0x36
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r4, r0, #0x10
ldr r0, _02077034 ; =0x0000069C
@ -3379,7 +3379,7 @@ _0207716A:
add r4, #0x36
add r1, r4, #0x0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02077234 ; =0x000005A4
add r2, r0, #0x0
ldr r1, [r5, r1]

12
arm9/asm/unk_020772F0.s
View File

@ -1407,7 +1407,7 @@ sub_02077894: ; 0x02077894
cmp r0, #0x1
bne _020778DE
mov r0, #0x12
bl AllocMonZeroed
bl Pokemon_New
mov r3, #0xa
str r3, [sp, #0x0]
str r3, [sp, #0x4]
@ -1416,7 +1416,7 @@ sub_02077894: ; 0x02077894
ldr r1, [r4, #0x4]
add r6, r0, #0x0
mov r2, #0x5
bl CreateMon
bl Pokemon_InitWithParams
add r0, r6, #0x0
bl FreeToHeap
_020778DE:
@ -1978,7 +1978,7 @@ _02077D88:
cmp r0, #0x1
bne _02077DCE
mov r0, #0x12
bl AllocMonZeroed
bl Pokemon_New
mov r3, #0xa
str r3, [sp, #0x0]
str r3, [sp, #0x4]
@ -1987,7 +1987,7 @@ _02077D88:
ldr r1, [r4, #0x4]
add r5, r0, #0x0
mov r2, #0x5
bl CreateMon
bl Pokemon_InitWithParams
add r0, r5, #0x0
bl sub_020690E4
add r2, r0, #0x0
@ -2158,7 +2158,7 @@ _02077F04:
beq _02077F50
_02077F1A:
mov r0, #0x12
bl AllocMonZeroed
bl Pokemon_New
mov r3, #0x0
str r3, [sp, #0x0]
str r3, [sp, #0x4]
@ -2167,7 +2167,7 @@ _02077F1A:
ldr r1, [r5, #0x4]
add r6, r0, #0x0
mov r2, #0x1
bl CreateMon
bl Pokemon_InitWithParams
add r0, r6, #0x0
bl sub_020690E4
add r2, r0, #0x0

104
arm9/asm/unk_02079C70.s
View File

@ -1532,7 +1532,7 @@ _0207A896:
bl sub_0207B628
add r6, r0, #0x0
mov r0, #0x13
bl AllocMonZeroed
bl Pokemon_New
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
@ -1555,7 +1555,7 @@ _0207A8C0:
mov r1, #0x13
ldrb r6, [r5, r0]
add r0, r4, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _0207AA08 ; =0x00000295
strb r0, [r5, r1]
ldrb r0, [r5, r1]
@ -1572,7 +1572,7 @@ _0207A8F4:
ldrb r6, [r5, r0]
add r0, r4, #0x0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _0207AA0C ; =0x00000296
strb r0, [r5, r1]
ldrb r0, [r5, r1]
@ -1589,7 +1589,7 @@ _0207A916:
ldrb r6, [r5, r0]
add r0, r4, #0x0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _0207AA10 ; =0x00000297
strb r0, [r5, r1]
ldrb r0, [r5, r1]
@ -1607,7 +1607,7 @@ _0207A938:
add r0, r4, #0x0
mov r1, #0x16
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
mov r1, #0xa6
lsl r1, r1, #0x2
strb r0, [r5, r1]
@ -1625,7 +1625,7 @@ _0207A95E:
ldrb r6, [r5, r0]
add r0, r4, #0x0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _0207AA14 ; =0x00000299
strb r0, [r5, r1]
ldrb r0, [r5, r1]
@ -1640,7 +1640,7 @@ _0207A980:
add r0, r4, #0x0
mov r1, #0x18
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _0207AA18 ; =0x0000029A
strb r0, [r5, r1]
sub r1, #0x4e
@ -1821,7 +1821,7 @@ sub_0207AAE0: ; 0x0207AAE0
mov r0, #0x13
add r6, r1, #0x0
add r7, r2, #0x0
bl AllocMonZeroed
bl Pokemon_New
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
@ -1848,7 +1848,7 @@ sub_0207AB0C: ; 0x0207AB0C
add r0, r6, #0x0
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0xc]
add r0, r6, #0x0
bl sub_020690E4
@ -1913,12 +1913,12 @@ sub_0207AB0C: ; 0x0207AB0C
add r0, r6, #0x0
mov r1, #0x6
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0xe]
add r0, r6, #0x0
mov r1, #0xa0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldrb r1, [r5, #0x12]
mov r2, #0x7f
lsl r0, r0, #0x18
@ -1931,7 +1931,7 @@ sub_0207AB0C: ; 0x0207AB0C
add r0, r6, #0x0
mov r1, #0x4c
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x1f
ldr r2, [r5, #0x50]
ldr r1, _0207AEB4 ; =0xEFFFFFFF
@ -1942,7 +1942,7 @@ sub_0207AB0C: ; 0x0207AB0C
add r0, r6, #0x0
mov r1, #0xaf
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x1
bne _0207AC16
ldr r0, [r5, #0x50]
@ -1961,7 +1961,7 @@ _0207AC16:
strb r0, [r5, #0x12]
_0207AC1E:
add r0, r6, #0x0
bl GetMonGender
bl Pokemon_GetGender
ldrb r1, [r5, #0x13]
mov r2, #0x3
bic r1, r2
@ -1972,7 +1972,7 @@ _0207AC1E:
add r0, r6, #0x0
mov r1, #0x9a
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
lsl r0, r0, #0x1a
@ -1985,27 +1985,27 @@ _0207AC1E:
add r0, r6, #0x0
mov r1, #0xb0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strb r0, [r5, #0x10]
add r0, r6, #0x0
mov r1, #0xb1
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strb r0, [r5, #0x11]
add r0, r6, #0x0
mov r1, #0x7
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [r5, #0x14]
add r0, r6, #0x0
mov r1, #0x8
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [r5, #0x18]
add r0, r6, #0x0
mov r1, #0x9c
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x44
strb r0, [r1, #0x0]
@ -2013,7 +2013,7 @@ _0207AC1E:
ldrh r0, [r5, #0xc]
lsl r1, r1, #0x19
lsr r1, r1, #0x19
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
str r0, [r5, #0x1c]
ldrb r0, [r5, #0x12]
lsl r0, r0, #0x19
@ -2025,53 +2025,53 @@ _0207AC1E:
_0207ACAA:
ldrh r0, [r5, #0xc]
add r1, r1, #0x1
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
_0207ACB2:
str r0, [r5, #0x20]
add r0, r6, #0x0
mov r1, #0xa2
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x24]
add r0, r6, #0x0
mov r1, #0xa3
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x26]
add r0, r6, #0x0
mov r1, #0xa4
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x28]
add r0, r6, #0x0
mov r1, #0xa5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x2a]
add r0, r6, #0x0
mov r1, #0xa7
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x2c]
add r0, r6, #0x0
mov r1, #0xa8
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x2e]
add r0, r6, #0x0
mov r1, #0xa6
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x30]
add r0, r6, #0x0
mov r1, #0xa
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x32
strb r0, [r1, #0x0]
add r0, r6, #0x0
bl GetMonNature
bl Pokemon_GetNature
add r1, r5, #0x0
add r1, #0x33
strb r0, [r1, #0x0]
@ -2084,14 +2084,14 @@ _0207AD26:
add r0, r6, #0x0
add r1, #0x36
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x0]
mov r2, #0x0
strh r0, [r1, #0x34]
add r1, r4, #0x0
add r0, r6, #0x0
add r1, #0x3a
bl GetMonData
bl Pokemon_GetData
add r1, r5, r4
add r1, #0x3c
strb r0, [r1, #0x0]
@ -2099,7 +2099,7 @@ _0207AD26:
add r0, r6, #0x0
add r1, #0x3e
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r1, r0, #0x18
ldr r0, [sp, #0x0]
@ -2116,42 +2116,42 @@ _0207AD26:
add r0, r6, #0x0
mov r1, #0x13
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x45
strb r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x14
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x46
strb r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x15
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x47
strb r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x16
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x48
strb r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x17
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x49
strb r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x18
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x4a
strb r0, [r1, #0x0]
@ -2180,14 +2180,14 @@ _0207ADFE:
add r0, r6, #0x0
mov r1, #0xb
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x4c
strh r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x70
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0x0
add r1, #0x4e
strh r0, [r1, #0x0]
@ -2243,7 +2243,7 @@ _0207AE7C:
str r0, [r5, #0x50]
_0207AE84:
add r0, r6, #0x0
bl MonIsShiny
bl Pokemon_IsShiny
cmp r0, #0x1
ldr r1, [r5, #0x50]
bne _0207AE98
@ -2281,7 +2281,7 @@ _0207AECC:
add r1, r0, #0x0
add r0, r6, #0x0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0207AF04
lsr r0, r4, #0x5
@ -3123,13 +3123,13 @@ _0207B528:
add r0, r6, r7
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0207B50C
add r0, r6, r7
mov r1, #0x4c
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0207B55E
add r0, r5, #0x0
@ -3173,13 +3173,13 @@ _0207B58E:
mov r1, #0x5
mov r2, #0x0
add r6, r0, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0207B574
add r0, r6, #0x0
mov r1, #0x4c
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0207B5BC
add r0, r5, #0x0
@ -3227,13 +3227,13 @@ _0207B5EC:
add r0, r6, r7
mov r1, #0x5
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
beq _0207B5D0
add r0, r6, r7
mov r1, #0x4c
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
beq _0207B622
add r0, r5, #0x0
@ -4814,12 +4814,12 @@ sub_0207C2D4: ; 0x0207C2D4
add r5, r0, #0x0
mov r1, #0x9f
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa2
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
bne _0207C2F4
mov r0, #0x6

4
arm9/asm/unk_0207C328.s
View File

@ -1892,8 +1892,8 @@ _0207D00C:
mov r0, #0x97
lsl r0, r0, #0x2
ldrh r0, [r4, r0]
mov r1, #0x1c ; BASE_FLIP
bl GetMonBaseStat
mov r1, #0x1c ; SPECIES_DATA_FLIP_SPRITE
bl Species_GetValue
add r2, r0, #0x0
ldr r0, _0207D068 ; =0x00000454
mov r1, #0x1

2
arm9/asm/unk_0207D5BC.s
View File

@ -1536,7 +1536,7 @@ sub_0207E190: ; 0x0207E190
cmp r1, #0x2
bne _0207E1E8
mov r0, #0x13
bl AllocMonZeroed
bl Pokemon_New
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0

4
arm9/asm/unk_0207EF6C.s
View File

@ -1168,8 +1168,8 @@ _0207F876:
mov r0, #0x97
lsl r0, r0, #0x2
ldrh r0, [r4, r0]
mov r1, #0x1c ; BASE_FLIP
bl GetMonBaseStat
mov r1, #0x1c ; SPECIES_DATA_FLIP_SPRITE
bl Species_GetValue
mov r1, #0x1
eor r0, r1
mov r1, #0xb6

162
arm9/asm/unk_0207FD00.s
View File

@ -472,7 +472,7 @@ sub_020800E0: ; 0x020800E0
push {r3-r5, lr}
add r5, r0, #0x0
ldr r0, [r5, #0xc]
bl GetMonNature
bl Pokemon_GetNature
add r4, r0, #0x0
cmp r4, #0x18
bgt _02080106
@ -511,7 +511,7 @@ sub_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x94
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
mov r3, #0x2
add r2, r0, #0x0
str r3, [sp, #0x0]
@ -523,7 +523,7 @@ sub_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x95
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x1
@ -531,7 +531,7 @@ sub_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x96
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@ -544,7 +544,7 @@ sub_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x9b
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@ -557,7 +557,7 @@ sub_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x98
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x4
@ -565,7 +565,7 @@ sub_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x91
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
mov r3, #0x2
add r2, r0, #0x0
str r3, [sp, #0x0]
@ -577,7 +577,7 @@ sub_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x92
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x6
@ -585,7 +585,7 @@ sub_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x93
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@ -598,7 +598,7 @@ sub_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x97
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x8
@ -635,7 +635,7 @@ sub_02080228: ; 0x02080228
ldr r0, [r4, #0xc]
mov r1, #0x94
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
mov r3, #0x2
add r2, r0, #0x0
str r3, [sp, #0x0]
@ -647,7 +647,7 @@ sub_02080228: ; 0x02080228
ldr r0, [r4, #0xc]
mov r1, #0x95
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
ldr r0, [r4, #0x8]
mov r1, #0x1
@ -655,7 +655,7 @@ sub_02080228: ; 0x02080228
ldr r0, [r4, #0xc]
mov r1, #0x96
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@ -668,7 +668,7 @@ sub_02080228: ; 0x02080228
ldr r0, [r4, #0xc]
mov r1, #0x9b
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@ -681,7 +681,7 @@ sub_02080228: ; 0x02080228
ldr r0, [r4, #0xc]
mov r1, #0x79
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0xf
bhi _020802F8
add r0, r0, r0
@ -797,7 +797,7 @@ sub_02080384: ; 0x02080384
bne _02080418
mov r1, #0x91
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
mov r3, #0x2
add r2, r0, #0x0
str r3, [sp, #0x0]
@ -809,7 +809,7 @@ sub_02080384: ; 0x02080384
ldr r0, [r5, #0xc]
mov r1, #0x92
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x6
@ -817,7 +817,7 @@ sub_02080384: ; 0x02080384
ldr r0, [r5, #0xc]
mov r1, #0x93
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@ -830,7 +830,7 @@ sub_02080384: ; 0x02080384
ldr r0, [r5, #0xc]
mov r1, #0x97
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x8
@ -839,7 +839,7 @@ sub_02080384: ; 0x02080384
_02080418:
mov r1, #0x94
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
mov r3, #0x2
add r2, r0, #0x0
str r3, [sp, #0x0]
@ -851,7 +851,7 @@ _02080418:
ldr r0, [r5, #0xc]
mov r1, #0x95
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x6
@ -859,7 +859,7 @@ _02080418:
ldr r0, [r5, #0xc]
mov r1, #0x96
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@ -872,7 +872,7 @@ _02080418:
ldr r0, [r5, #0xc]
mov r1, #0x98
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x8
@ -899,37 +899,37 @@ sub_0208048C: ; 0x0208048C
ldr r0, [r4, #0xc]
mov r1, #0x46
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xc]
ldr r0, [r4, #0xc]
mov r1, #0x47
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x8]
ldr r0, [r4, #0xc]
mov r1, #0x48
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x4]
ldr r0, [r4, #0xc]
mov r1, #0x49
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x0]
ldr r0, [r4, #0xc]
mov r1, #0x4a
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0x0
ldr r0, [r4, #0xc]
mov r1, #0x4b
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
mov r1, #0x0
ldr r0, [r4, #0xc]
add r2, r1, #0x0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x6
bl _u32_div_f
cmp r1, #0x5
@ -1196,7 +1196,7 @@ sub_020806B4: ; 0x020806B4
ldr r0, [r5, #0xc]
mov r1, #0x9
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0x0
mov r0, #0x12
ldr r1, [r5, #0x0]
@ -1232,7 +1232,7 @@ sub_020806F4: ; 0x020806F4
mov r1, #0x4c
mov r2, #0x0
add r5, r0, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _02080708
b _0208084E
@ -1240,13 +1240,13 @@ _02080708:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
bne _02080774
add r0, r5, #0x0
mov r1, #0x98
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
mov r0, #0x0
mov r1, #0x37
@ -1259,7 +1259,7 @@ _02080732:
add r0, r5, #0x0
mov r1, #0x6e
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x1
bne _0208074C
cmp r4, #0x1
@ -1273,7 +1273,7 @@ _0208074C:
add r0, r5, #0x0
mov r1, #0x98
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r5, r0, #0x0
mov r0, #0x1
add r1, r0, #0x0
@ -1294,13 +1294,13 @@ _02080774:
add r0, r5, #0x0
mov r1, #0x6e
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x1
bne _020807D6
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
mov r0, #0x1
mov r1, #0x2
@ -1318,7 +1318,7 @@ _020807A6:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r5, r0, #0x0
mov r0, #0x2
mov r1, #0x1
@ -1344,7 +1344,7 @@ _020807D6:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
mov r0, #0x1
add r1, r0, #0x0
@ -1354,7 +1354,7 @@ _020807D6:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
mov r0, #0x1
mov r1, #0x0
@ -1364,7 +1364,7 @@ _020807D6:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
mov r0, #0x1
mov r1, #0x9
@ -1374,7 +1374,7 @@ _020807D6:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r5, r0, #0x0
mov r0, #0x1
mov r1, #0xa
@ -1403,13 +1403,13 @@ _0208084E:
add r0, r5, #0x0
mov r1, #0x6e
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x1
bne _02080880
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0x0
mov r0, #0x2
mov r1, #0x1
@ -1428,7 +1428,7 @@ _02080884:
add r0, r5, #0x0
mov r1, #0x6e
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x1
bne _02080896
mov r0, #0x13
@ -1484,7 +1484,7 @@ _020808E4:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
bne _0208090C
add r0, r4, #0x0
@ -1514,7 +1514,7 @@ _0208091E:
_0208092A:
mov r1, #0x4c
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
bne _02080958
add r0, r4, #0x0
@ -1575,7 +1575,7 @@ _020809B0:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
bne _020809E2
add r0, r4, #0x0
@ -1601,7 +1601,7 @@ _020809F6:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
bne _02080A1E
add r0, r4, #0x0
@ -1629,7 +1629,7 @@ _02080A30:
_02080A38:
mov r1, #0x4c
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
beq _02080AE0
mov r0, #0x1
@ -1657,39 +1657,39 @@ _02080A66:
add r0, r4, #0x0
mov r1, #0x98
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x97
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0x0
mov r1, #0x94
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x91
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0x0
mov r1, #0x95
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x92
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0x0
mov r1, #0x96
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x93
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
_02080ACC:
add r0, r4, #0x0
add r1, r5, #0x0
@ -1723,15 +1723,15 @@ sub_02080AE4: ; 0x02080AE4
add r0, r5, #0x0
mov r1, #0x7
add r2, sp, #0x4
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r5, #0x0
mov r1, #0x9c
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r5, #0x0
mov r1, #0x90
add r2, r4, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0x0
bl String_Delete
add sp, #0x8
@ -1751,19 +1751,19 @@ sub_02080B30: ; 0x02080B30
bne _02080B76
add r0, r5, #0x0
mov r1, #0x97
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r5, #0x0
mov r1, #0x91
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r5, #0x0
mov r1, #0x92
add r2, sp, #0x4
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r5, #0x0
mov r1, #0x93
add r2, sp, #0x8
bl SetBoxMonData
bl BoxPokemon_SetData
add sp, #0x10
pop {r3-r5}
pop {r3}
@ -1772,19 +1772,19 @@ sub_02080B30: ; 0x02080B30
_02080B76:
add r0, r5, #0x0
mov r1, #0x98
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r5, #0x0
mov r1, #0x94
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r5, #0x0
mov r1, #0x95
add r2, sp, #0x4
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r5, #0x0
mov r1, #0x96
add r2, sp, #0x8
bl SetBoxMonData
bl BoxPokemon_SetData
add sp, #0x10
pop {r3-r5}
pop {r3}
@ -1803,36 +1803,36 @@ sub_02080BA8: ; 0x02080BA8
add r2, sp, #0x0
bne _02080BE0
mov r1, #0x97
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0x0
mov r1, #0x91
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0x0
mov r1, #0x92
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0x0
mov r1, #0x93
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add sp, #0x4
pop {r3-r4, pc}
_02080BE0:
mov r1, #0x98
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0x0
mov r1, #0x94
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0x0
mov r1, #0x95
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0x0
mov r1, #0x96
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add sp, #0x4
pop {r3-r4, pc}
@ -1843,12 +1843,12 @@ sub_02080C08: ; 0x02080C08
add r4, r0, #0x0
mov r1, #0xa0
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x9b
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
add sp, #0x4
pop {r3-r4, pc}
.balign 4
@ -1860,5 +1860,5 @@ sub_02080C28: ; 0x02080C28
str r1, [sp, #0x0]
mov r1, #0x6e
add r2, sp, #0x0
bl SetBoxMonData
bl BoxPokemon_SetData
pop {r3, pc}

22
arm9/asm/unk_02080C38.s
View File

@ -907,7 +907,7 @@ _020812B6:
add r5, r4, #0x0
_020812F2:
mov r0, #0x14
bl AllocMonZeroed
bl Pokemon_New
add r7, r7, #0x1
stmia r5!, {r0}
cmp r7, #0x4
@ -1083,7 +1083,7 @@ _02081454:
ldr r0, [r4, #0x0]
ldr r2, [r2, #0x0]
mov r1, #0x90
bl GetMonData
bl Pokemon_GetData
add r6, r6, #0x1
add r4, r4, #0x4
cmp r6, #0x4
@ -1223,7 +1223,7 @@ _02081566:
add r0, r5, #0x0
add r1, #0x7a
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
b _020815BA
_02081576:
@ -1231,7 +1231,7 @@ _02081576:
add r0, r5, #0x0
add r1, #0x7e
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
b _020815BA
_02081586:
@ -1239,7 +1239,7 @@ _02081586:
add r0, r5, #0x0
add r1, #0x82
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
b _020815BA
_02081596:
@ -1247,7 +1247,7 @@ _02081596:
add r0, r5, #0x0
add r1, #0x86
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
b _020815BA
_020815A6:
@ -1255,7 +1255,7 @@ _020815A6:
add r0, r5, #0x0
add r1, #0x8a
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
b _020815BA
_020815B6:
@ -2973,7 +2973,7 @@ sub_02082254: ; 0x02082254
ldr r0, _02082280 ; =0x00001990
mov r2, #0x0
ldr r0, [r4, r0]
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0208227A
mov r0, #0x1
@ -3590,7 +3590,7 @@ _020826AC:
add r1, r6, #0x0
ldr r0, [r4, r0]
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
bne _020826DE
mov r5, #0x1
@ -3599,7 +3599,7 @@ _020826DE:
add r1, r6, #0x0
ldr r0, [r4, r0]
add r2, sp, #0x8
bl SetMonData
bl Pokemon_SetData
_020826EA:
ldr r0, _02082848 ; =0x0000198C
ldr r0, [r4, r0]
@ -3748,7 +3748,7 @@ _02082820:
lsl r2, r2, #0x10
mov r1, #0x9
lsr r2, r2, #0x10
bl MonApplyFriendshipMod
bl Pokemon_UpdateFriendship
_0208283A:
add sp, #0xc
pop {r4-r7, pc}

22
arm9/asm/unk_020828BC.s
View File

@ -765,7 +765,7 @@ sub_02082D60: ; 0x02082D60
lsl r1, r1, #0x18
lsr r1, r1, #0x18
mov r2, #0x0
bl GenPersonalityByGenderAndNature
bl Personality_CreateFromGenderAndNature
mov r1, #0x1
str r1, [sp, #0x0]
str r0, [sp, #0x4]
@ -777,7 +777,7 @@ sub_02082D60: ; 0x02082D60
ldrh r1, [r7, #0x14]
add r0, r6, #0x0
mov r3, #0x20
bl CreateMon
bl Pokemon_InitWithParams
mov r4, #0x0
add r5, r7, #0x0
_02082D9A:
@ -789,7 +789,7 @@ _02082D9A:
add r0, r6, #0x0
add r1, #0x36
add r2, #0x2
bl SetMonData
bl Pokemon_SetData
add r4, r4, #0x1
add r5, r5, #0x2
cmp r4, #0x4
@ -810,11 +810,11 @@ _02082D9A:
add r0, r6, #0x0
mov r1, #0x76
add r2, r5, #0x0
bl SetMonData
bl Pokemon_SetData
ldr r2, [sp, #0x14]
add r0, r6, #0x0
mov r1, #0x90
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
bl String_Delete
ldr r0, [sp, #0x14]
@ -838,30 +838,30 @@ _02082D9A:
strb r1, [r0, #0x0]
add r0, r6, #0x0
mov r1, #0x13
bl SetMonData
bl Pokemon_SetData
add r0, r6, #0x0
mov r1, #0x14
add r2, sp, #0x1c
bl SetMonData
bl Pokemon_SetData
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x15
add r2, #0x3
bl SetMonData
bl Pokemon_SetData
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x16
add r2, #0x2
bl SetMonData
bl Pokemon_SetData
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x17
add r2, #0x1
bl SetMonData
bl Pokemon_SetData
add r0, r6, #0x0
mov r1, #0x18
add r2, sp, #0x18
bl SetMonData
bl Pokemon_SetData
add sp, #0x20
pop {r3-r7, pc}
nop

14
arm9/asm/unk_020854E0.s
View File

@ -111,7 +111,7 @@ sub_02085578: ; 0x02085578
ldr r2, [r4, #0x14]
add r0, r6, #0x0
mov r1, #0xa9
bl GetMonData
bl Pokemon_GetData
add r0, r4, #0x0
pop {r3-r7, pc}
.balign 4
@ -180,7 +180,7 @@ _0208561E:
ldr r2, [r5, #0x14]
add r0, r4, #0x0
mov r1, #0xa9
bl SetMonData
bl Pokemon_SetData
mov r0, #0x1
pop {r3-r5, pc}
@ -218,7 +218,7 @@ sub_02085644: ; 0x02085644
add r0, r5, #0x0
mov r1, #0xa9
add r2, r4, #0x0
bl GetMonData
bl Pokemon_GetData
add r0, r7, #0x0
mov r1, #0x0
add r2, r6, #0x0
@ -229,11 +229,11 @@ sub_02085644: ; 0x02085644
add r0, r5, #0x0
mov r1, #0xa9
add r2, r4, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r4, #0x0
bl FreeToHeap
add r0, r6, #0x0
@ -262,11 +262,11 @@ _020856BC:
add r0, r4, #0x0
mov r1, #0xa9
add r2, r6, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r4, #0x0
mov r1, #0x6
add r2, sp, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r7, #0x0
mov r1, #0x0
add r2, r5, #0x0

8
arm9/asm/unk_020859C0.s
View File

@ -204,7 +204,7 @@ sub_020859C0: ; 0x020859C0
bl OverlayManager_GetField18
str r0, [r4, #0x0]
mov r0, #0x35
bl AllocMonZeroed
bl Pokemon_New
ldr r1, _02085BA4 ; =0x00000428
mov r2, #0xff
str r0, [r4, r1]
@ -269,7 +269,7 @@ _02085A7C:
beq _02085A9A
add r1, r7, #0x0
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _02085A9A
lsl r0, r0, #0x3
@ -766,7 +766,7 @@ _02085EA6:
mov r1, #0xa1
add r2, sp, #0x8
add r5, r0, #0x0
bl SetMonData
bl Pokemon_SetData
ldr r1, [sp, #0x8]
ldr r0, [r7, #0x20]
sub r1, r1, #0x1
@ -774,7 +774,7 @@ _02085EA6:
add r2, r0, #0x0
add r0, r5, #0x0
mov r1, #0xaa
bl SetMonData
bl Pokemon_SetData
ldr r1, [sp, #0x8]
ldr r0, [r7, #0x20]
sub r1, r1, #0x1

14
arm9/asm/unk_02086084.s
View File

@ -125,7 +125,7 @@ _0208618C:
mov r1, #0x5
ldr r0, [r0, #0xc]
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, _020861D8 ; =0x000001EA
cmp r0, r1
bne _020861A4
@ -286,7 +286,7 @@ _020862D6:
add r0, r5, #0x0
mov r1, #0x4c
add r2, sp, #0x8
bl SetMonData
bl Pokemon_SetData
mov r0, #0xb
str r0, [sp, #0x0]
ldr r3, [sp, #0x4]
@ -297,7 +297,7 @@ _020862D6:
add r0, r5, #0x0
mov r1, #0xb2
mov r2, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r6, #0x0
bl FieldSystem_GetSaveData
ldr r1, [r4, #0xc]
@ -319,7 +319,7 @@ _0208633A:
ldr r0, [r4, #0xc]
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0x0
add r0, r6, #0x0
bl FieldSystem_GetSaveData
@ -334,13 +334,13 @@ _0208633A:
ldr r0, [r4, #0xc]
mov r1, #0x6f
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
ldr r1, [r4, #0x8]
mov r2, #0x0
str r0, [r1, #0x10]
ldr r0, [r4, #0xc]
mov r1, #0x70
bl GetMonData
bl Pokemon_GetData
ldr r1, [r4, #0x8]
str r0, [r1, #0x8]
ldr r1, _020863D8 ; =UNK_020FA5FC
@ -359,7 +359,7 @@ _02086396:
ldr r0, [r4, #0xc]
ldr r2, [r2, #0x18]
mov r1, #0x77
bl SetMonData
bl Pokemon_SetData
_020863A8:
ldr r0, [r4, #0x8]
bl sub_02077AC4

8
arm9/asm/unk_02086414.s
View File

@ -1441,7 +1441,7 @@ sub_02086EE8: ; 0x02086EE8
ldr r4, [r0, #0xc]
mov r2, #0x0
add r0, r4, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
add r0, r4, #0x0
mov r1, #0x2
@ -1452,7 +1452,7 @@ sub_02086EE8: ; 0x02086EE8
add r0, r4, #0x0
mov r1, #0x4c
add r2, sp, #0x10
bl SetMonData
bl Pokemon_SetData
add r0, sp, #0x28
add r1, r4, #0x0
mov r2, #0x2
@ -1487,11 +1487,11 @@ sub_02086F4C: ; 0x02086F4C
mov r1, #0x5
ldr r0, [r0, #0xc]
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl GetMonNature
bl Pokemon_GetNature
add r6, r0, #0x0
ldr r0, [r5, #0x68]
mov r1, #0x1

4
arm9/asm/unk_02086FA8.s
View File

@ -164,7 +164,7 @@ _020870D2:
mov r1, #0x5
ldr r0, [r0, #0xc]
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl sub_02005578
@ -447,7 +447,7 @@ _02087322:
mov r1, #0x5
ldr r0, [r0, #0xc]
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl sub_02005578

10
arm9/asm/unk_02087D00.s
View File

@ -704,7 +704,7 @@ sub_0208821C: ; 0x0208821C
add r6, r1, #0x0
add r4, r0, #0x0
add r0, r6, #0x0
bl GetMonNature
bl Pokemon_GetNature
lsl r1, r0, #0x1
ldr r0, _02088310 ; =UNK_020FD17C
ldrb r0, [r0, r1]
@ -723,7 +723,7 @@ _02088246:
add r0, r6, #0x0
add r1, #0x13
add r2, r7, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r1, r4, #0x2
str r0, [r5, r1]
add r0, r4, #0x1
@ -791,7 +791,7 @@ _020882D4:
add r0, r6, #0x0
add r1, #0x13
add r2, r4, r2
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x1
lsl r0, r0, #0x18
lsr r5, r0, #0x18
@ -800,7 +800,7 @@ _020882D4:
add r0, r6, #0x0
mov r1, #0x9
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #0x8
strb r0, [r1, #0x0]
ldrb r0, [r1, #0x0]
@ -811,7 +811,7 @@ _020882D4:
add r0, r6, #0x0
mov r1, #0x9
add r2, sp, #0x8
bl SetMonData
bl Pokemon_SetData
_0208830C:
add sp, #0x30
pop {r3-r7, pc}

74
arm9/global.inc
View File

@ -4726,50 +4726,50 @@
.extern sub_02065344
.extern sub_02066818
.extern sub_02066840
.extern ZeroMonData
.extern ZeroBoxMonData
.extern Pokemon_Init
.extern BoxPokemon_Init
.extern SizeOfStructPokemon
.extern AllocMonZeroed
.extern Pokemon_New
.extern AcquireMonLock
.extern ReleaseMonLock
.extern AcquireBoxMonLock
.extern ReleaseBoxMonLock
.extern CreateMon
.extern CreateMonWithNature
.extern CreateMonWithGenderNatureLetter
.extern GenPersonalityByGenderAndNature
.extern Pokemon_InitWithParams
.extern Pokemon_InitWithNature
.extern Pokemon_InitWithGenderNatureLetter
.extern Personality_CreateFromGenderAndNature
.extern CreateMonWithFixedIVs
.extern CalcMonLevelAndStats
.extern CalcMonStats
.extern GetMonData
.extern GetBoxMonData
.extern SetMonData
.extern SetBoxMonData
.extern Pokemon_CalcLevelAndStats
.extern Pokemon_CalcStats
.extern Pokemon_GetData
.extern BoxPokemon_GetData
.extern Pokemon_SetData
.extern BoxPokemon_SetData
.extern AddMonData
.extern AllocAndLoadMonPersonal
.extern GetPersonalAttr
.extern FreeMonPersonal
.extern GetMonBaseStat_HandleFormConversion
.extern GetMonBaseStat
.extern GetPercentProgressTowardsNextLevel
.extern CalcMonExpToNextLevel
.extern GetMonBaseExperienceAtCurrentLevel
.extern GetMonExpBySpeciesAndLevel
.extern CalcMonLevel
.extern CalcBoxMonLevel
.extern CalcLevelBySpeciesAndExp
.extern CalcLevelBySpeciesAndExp_PreloadedPersonal
.extern GetMonNature
.extern GetBoxMonNature
.extern GetNatureFromPersonality
.extern MonApplyFriendshipMod
.extern GetMonGender
.extern GetBoxMonGender
.extern GetGenderBySpeciesAndPersonality
.extern GetGenderBySpeciesAndPersonality_PreloadedPersonal
.extern MonIsShiny
.extern CalcShininessByOtIdAndPersonality
.extern GenerateShinyPersonality
.extern SpeciesData_NewFromSpecies
.extern SpeciesData_GetValue
.extern SpeciesData_Free
.extern Species_GetFormValue
.extern Species_GetValue
.extern Pokemon_CalcPercentToNextLevel
.extern Pokemon_CalcExpToNextLevel
.extern Pokemon_GetCurrentLevelBaseExp
.extern Species_GetExpAtLevel
.extern Pokemon_CalcLevel
.extern BoxPokemon_CalcLevel
.extern Species_CalcLevelByExp
.extern SpeciesData_CalcLevelByExp
.extern Pokemon_GetNature
.extern BoxPokemon_GetNature
.extern Personality_GetNature
.extern Pokemon_UpdateFriendship
.extern Pokemon_GetGender
.extern BoxPokemon_GetGender
.extern Species_GetGenderFromPersonality
.extern SpeciesData_GetGenderFromPersonality
.extern Pokemon_IsShiny
.extern Personality_IsShiny
.extern Personality_GenerateShiny
.extern sub_02068B68
.extern sub_02068B70
.extern sub_02068C00

2
arm9/overlays/05/asm/ov05_021D80E8.s
View File

@ -1861,7 +1861,7 @@ _021D8FF6:
bl Party_GetMonByIndex
mov r1, #5
add r2, r5, #0
bl MonApplyFriendshipMod
bl Pokemon_UpdateFriendship
add r4, r4, #1
cmp r4, r7
blt _021D8FF6

4
arm9/overlays/05/asm/ov05_021E3444.s
View File

@ -2799,12 +2799,12 @@ _021E4980:
add r0, r7, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
ldr r0, [sp]
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x55
lsl r1, r1, #2
ldr r1, [r5, r1]

308
arm9/overlays/05/asm/ov05_021EC458.s
View File

File diff suppressed because it is too large Load Diff

18
arm9/overlays/05/asm/ov05_021F38CC.s
View File

@ -10,13 +10,13 @@ ov05_021F38CC: ; 0x021F38CC
mov r1, #0
add r2, r1, #0
add r5, r0, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r5, #0
mov r1, #0x46
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@ -25,7 +25,7 @@ ov05_021F38CC: ; 0x021F38CC
add r0, r5, #0
mov r1, #0x47
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@ -34,7 +34,7 @@ ov05_021F38CC: ; 0x021F38CC
add r0, r5, #0
mov r1, #0x48
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@ -43,7 +43,7 @@ ov05_021F38CC: ; 0x021F38CC
add r0, r5, #0
mov r1, #0x49
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@ -51,7 +51,7 @@ ov05_021F38CC: ; 0x021F38CC
add r0, r5, #0
mov r1, #0x4a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@ -59,7 +59,7 @@ ov05_021F38CC: ; 0x021F38CC
add r0, r5, #0
mov r1, #0x4b
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@ -174,7 +174,7 @@ Field_CheckPokemonSizeRecord: ; 0x021F3A18
mov r1, #5
mov r2, #0
str r0, [sp]
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r5, r0, #0x10
ldr r0, [sp]
@ -339,7 +339,7 @@ Field_BufferPartyPokemonSize: ; 0x021F3B7C
mov r1, #5
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r6, #0

250
arm9/overlays/06/asm/overlay_06.s
View File

@ -4869,7 +4869,7 @@ _0223BA42:
str r1, [sp, #0x34]
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #0x24
strb r0, [r1, #0x18]
_0223BA8C:
@ -5651,7 +5651,7 @@ _0223C0CE:
str r1, [sp, #0x2c]
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #0x20
strb r0, [r1, #0x14]
_0223C118:
@ -6465,7 +6465,7 @@ ov06_0223C738: ; 0x0223C738
add r4, r1, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
cmp r1, #0xe0
@ -6529,7 +6529,7 @@ _0223C7AC:
mov r1, #0
add r0, r4, #0
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x19
bl _u32_div_f
lsl r0, r1, #0x18
@ -6620,9 +6620,9 @@ ov06_0223C854: ; 0x0223C854
mov r0, #0xb
str r2, [sp, #0x18]
add r5, r3, #0
bl AllocMonZeroed
bl Pokemon_New
str r0, [sp, #0x1c]
bl ZeroMonData
bl Pokemon_Init
ldrb r0, [r6, #0xd]
mov r7, #0
cmp r0, #0
@ -6631,8 +6631,8 @@ ov06_0223C854: ; 0x0223C854
cmp r0, #0x38
bne _0223C8BE
ldr r0, [sp, #0x10]
mov r1, #0x12 ; BASE_GENDER_RATIO
bl GetMonBaseStat
mov r1, #0x12 ; SPECIES_DATA_GENDER_RATIO
bl Species_GetValue
cmp r0, #0
beq _0223C8E0
cmp r0, #0xfe
@ -6653,7 +6653,7 @@ _0223C8A6:
ldr r0, [sp, #0x44]
mov r1, #0x6f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x24]
@ -6672,12 +6672,12 @@ _0223C8D2:
cmp r4, #0
bne _0223C8E0
ldr r0, [sp, #0x44]
bl GetMonNature
bl Pokemon_GetNature
str r0, [sp, #0x20]
mov r7, #1
_0223C8E0:
add r0, r5, #0
bl GenerateShinyPersonality
bl Personality_GenerateShiny
add r4, r0, #0
cmp r7, #0
beq _0223C92E
@ -6687,7 +6687,7 @@ _0223C8EC:
bne _0223C914
ldr r0, [sp, #0x10]
add r1, r4, #0
bl GetGenderBySpeciesAndPersonality
bl Species_GetGenderFromPersonality
add r7, r0, #0
cmp r7, #2
bne _0223C904
@ -6697,19 +6697,19 @@ _0223C904:
cmp r7, r0
bne _0223C92E
add r0, r5, #0
bl GenerateShinyPersonality
bl Personality_GenerateShiny
add r4, r0, #0
b _0223C8EC
_0223C914:
cmp r0, #0x1c
bne _0223C8EC
add r0, r4, #0
bl GetNatureFromPersonality
bl Personality_GetNature
ldr r1, [sp, #0x20]
cmp r0, r1
beq _0223C92E
add r0, r5, #0
bl GenerateShinyPersonality
bl Personality_GenerateShiny
add r4, r0, #0
b _0223C8EC
_0223C92E:
@ -6723,7 +6723,7 @@ _0223C92E:
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x10]
ldr r2, [sp, #0x14]
bl CreateMon
bl Pokemon_InitWithParams
ldr r0, [sp, #0x18]
ldr r2, [sp, #0x1c]
ldr r3, [sp, #0x48]
@ -6749,13 +6749,13 @@ ov06_0223C968: ; 0x0223C968
str r1, [sp, #0xc]
str r2, [sp, #0x10]
add r5, r3, #0
bl AllocMonZeroed
bl Pokemon_New
add r4, r0, #0
bl ZeroMonData
bl Pokemon_Init
add r0, r7, #0
mov r1, #0x12 ; BASE_GENDER_RATIO
mov r1, #0x12 ; SPECIES_DATA_GENDER_RATIO
mov r6, #1
bl GetMonBaseStat
bl Species_GetValue
cmp r0, #0
beq _0223C996
cmp r0, #0xfe
@ -6787,7 +6787,7 @@ _0223C9BE:
ldr r0, [sp, #0x28]
mov r1, #0x6f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r6, r0, #0x18
cmp r6, #1
@ -6813,11 +6813,11 @@ _0223C9E4:
add r0, r4, #0
add r1, r7, #0
mov r3, #0x20
bl CreateMonWithGenderNatureLetter
bl Pokemon_InitWithGenderNatureLetter
add r0, r4, #0
mov r1, #7
add r2, r5, #0
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x10]
ldr r3, [sp, #0x2c]
add r1, r5, #0
@ -6840,11 +6840,11 @@ _0223CA28:
add r0, r4, #0
add r1, r7, #0
mov r3, #0x20
bl CreateMonWithNature
bl Pokemon_InitWithNature
add r0, r4, #0
mov r1, #7
add r2, r5, #0
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x10]
ldr r3, [sp, #0x2c]
add r1, r5, #0
@ -7384,15 +7384,15 @@ _0223CE6A:
lsl r0, r5, #3
str r0, [sp, #0xc]
ldr r0, [r6, r0]
mov r1, #6 ; BASE_TYPE1
bl GetMonBaseStat
mov r1, #6 ; SPECIES_DATA_TYPE_1
bl Species_GetValue
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #8]
ldr r0, [sp, #0xc]
mov r1, #7 ; BASE_TYPE2
mov r1, #7 ; SPECIES_DATA_TYPE_2
ldr r0, [r6, r0]
bl GetMonBaseStat
bl Species_GetValue
lsl r0, r0, #0x18
lsr r1, r0, #0x18
ldr r0, [sp, #8]
@ -7553,7 +7553,7 @@ _0223CF96:
add r0, r1, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
cmp r0, #5
@ -7651,7 +7651,7 @@ ov06_0223D044: ; 0x0223D044
add r5, r1, #0
mov r0, #4
add r6, r2, #0
bl AllocMonZeroed
bl Pokemon_New
add r4, r0, #0
add r0, r5, #0
mov r1, #4
@ -7691,15 +7691,15 @@ ov06_0223D044: ; 0x0223D044
add r0, r4, #0
mov r1, #7
add r2, sp, #0x30
bl SetMonData
bl Pokemon_SetData
add r0, r4, #0
mov r1, #0x9f
add r2, sp, #0x14
bl SetMonData
bl Pokemon_SetData
add r0, r4, #0
mov r1, #0xa2
add r2, sp, #0x10
bl SetMonData
bl Pokemon_SetData
ldr r0, [r6, #8]
add r1, r4, #0
bl Party_AddMon
@ -7847,7 +7847,7 @@ _0223D1DA:
add r0, r6, #0
mov r1, #5
add r2, r4, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _0223D270 ; =0x000001A6
cmp r0, r1
bne _0223D208
@ -7904,7 +7904,7 @@ _0223D24E:
add r0, r6, #0
mov r1, #0x70
add r2, sp, #8
bl SetMonData
bl Pokemon_SetData
_0223D25C:
ldr r0, [sp]
add r1, r6, #0
@ -7984,14 +7984,14 @@ ov06_0223D2DC: ; 0x0223D2DC
mov r1, #0x4c
mov r2, #0
add r4, r3, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0223D302
mov r2, #0
add r0, r7, #0
mov r1, #0xa
strb r2, [r4, #0xd]
bl GetMonData
bl Pokemon_GetData
b _0223D308
_0223D302:
mov r0, #1
@ -19823,19 +19823,19 @@ _02243312:
mov r1, #5
mov r2, #0
str r0, [sp, #0xc]
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r5, r0, #0x10
ldr r0, [sp, #0xc]
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r6, r0, #0x10
ldr r0, [sp, #0xc]
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0224336E
add r0, r5, #0
@ -20352,12 +20352,12 @@ _02243726:
add r7, r0, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r6, #0x2e]
add r0, r7, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r6, #0x36]
add r0, r4, #1
lsl r0, r0, #0x10
@ -20403,12 +20403,12 @@ _0224379C:
lsl r6, r5, #1
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, r6]
ldr r0, [sp, #8]
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r7, r6]
cmp r5, #0
beq _022437FA
@ -21522,13 +21522,13 @@ _02243FFA:
add r1, r6, #0
mov r2, #0
str r0, [sp, #4]
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _02244024
ldr r0, [sp, #4]
add r1, r6, #0
add r2, sp, #8
bl SetMonData
bl Pokemon_SetData
add r0, r7, #1
lsl r0, r0, #0x18
lsr r7, r0, #0x18
@ -21587,7 +21587,7 @@ ov06_0224406C: ; 0x0224406C
add r0, r5, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp]
lsl r0, r0, #0x10
ldrh r1, [r1]
@ -21602,7 +21602,7 @@ ov06_0224406C: ; 0x0224406C
strh r1, [r0]
add r0, r5, #0
mov r1, #0x70
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp]
lsl r0, r0, #0x10
ldrh r2, [r1]
@ -21617,7 +21617,7 @@ ov06_0224406C: ; 0x0224406C
strh r1, [r0]
add r0, r5, #0
mov r1, #6
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp]
mov r4, #0
strh r0, [r1, #2]
@ -21632,13 +21632,13 @@ _022440D0:
add r0, r5, #0
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0
strh r0, [r6, #4]
add r0, r5, #0
add r1, #0x3e
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #4]
lsl r0, r7
ldrb r1, [r1]
@ -21653,25 +21653,25 @@ _022440D0:
add r0, r5, #0
mov r1, #0xc
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp]
mov r2, #0
strb r0, [r1, #0x1f]
add r0, r5, #0
mov r1, #7
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp]
str r0, [r1, #0xc]
mov r1, #0
add r0, r5, #0
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp]
mov r2, #0
str r0, [r1, #0x10]
add r0, r5, #0
mov r1, #0xae
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp]
mov r4, #0
str r0, [r1, #0x14]
@ -21681,7 +21681,7 @@ _0224413C:
add r0, r5, #0
add r1, #0xd
add r2, r6, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp]
add r1, r1, r4
add r4, r4, #1
@ -21691,14 +21691,14 @@ _0224413C:
add r0, r5, #0
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp]
mov r2, #0
add r1, #0x20
strb r0, [r1]
add r0, r5, #0
mov r1, #9
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp]
ldr r2, [sp]
add r1, #0x21
@ -21707,7 +21707,7 @@ _0224413C:
add r0, r5, #0
mov r1, #0x74
str r2, [sp]
bl GetMonData
bl Pokemon_GetData
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
@ -21963,7 +21963,7 @@ ov06_02244388: ; 0x02244388
add r5, r1, #0
add r6, r0, #0
add r0, r5, #0
bl ZeroMonData
bl Pokemon_Init
ldr r0, [r6, #0x10]
ldr r3, _02244520 ; =0x3FFFFFFF
str r0, [sp]
@ -21984,11 +21984,11 @@ ov06_02244388: ; 0x02244388
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x70
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0
mov r1, #6
add r2, r6, #2
bl SetMonData
bl Pokemon_SetData
mov r4, #0
str r6, [sp, #4]
add r7, r4, #0
@ -22002,7 +22002,7 @@ _022443D4:
add r1, r4, #0
add r0, r5, #0
add r1, #0x36
bl SetMonData
bl Pokemon_SetData
ldrb r0, [r6, #0x1e]
add r2, sp, #8
add r2, #1
@ -22015,19 +22015,19 @@ _022443D4:
add r1, r4, #0
add r0, r5, #0
add r1, #0x3e
bl SetMonData
bl Pokemon_SetData
add r1, r4, #0
add r0, r5, #0
add r1, #0x42
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #8
strb r0, [r1]
add r1, r4, #0
add r0, r5, #0
add r1, #0x3a
add r2, sp, #8
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #4]
add r4, r4, #1
add r0, r0, #2
@ -22040,7 +22040,7 @@ _022443D4:
str r0, [sp, #0xc]
add r0, r5, #0
add r2, sp, #0xc
bl SetMonData
bl Pokemon_SetData
add r2, sp, #8
ldrb r1, [r6, #0x18]
add r0, sp, #8
@ -22048,7 +22048,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xd
bl SetMonData
bl Pokemon_SetData
add r2, sp, #8
ldrb r1, [r6, #0x19]
add r0, sp, #8
@ -22056,7 +22056,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xe
bl SetMonData
bl Pokemon_SetData
add r2, sp, #8
ldrb r1, [r6, #0x1a]
add r0, sp, #8
@ -22064,7 +22064,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xf
bl SetMonData
bl Pokemon_SetData
add r2, sp, #8
ldrb r1, [r6, #0x1b]
add r0, sp, #8
@ -22072,7 +22072,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x10
bl SetMonData
bl Pokemon_SetData
add r2, sp, #8
ldrb r1, [r6, #0x1c]
add r0, sp, #8
@ -22080,7 +22080,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x11
bl SetMonData
bl Pokemon_SetData
add r2, sp, #8
ldrb r1, [r6, #0x1d]
add r0, sp, #8
@ -22088,17 +22088,17 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x12
bl SetMonData
bl Pokemon_SetData
add r2, r6, #0
add r0, r5, #0
mov r1, #0xa
add r2, #0x20
bl SetMonData
bl Pokemon_SetData
add r2, r6, #0
add r0, r5, #0
mov r1, #9
add r2, #0x21
bl SetMonData
bl Pokemon_SetData
ldr r0, [r6, #0x14]
lsl r0, r0, #1
lsr r0, r0, #0x1f
@ -22117,7 +22117,7 @@ _022443D4:
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
bl SetMonData
bl Pokemon_SetData
add r0, r7, #0
bl String_Delete
add r0, r4, #0
@ -22128,15 +22128,15 @@ _022444FC:
add r0, r5, #0
mov r1, #0x74
add r2, #0x22
bl SetMonData
bl Pokemon_SetData
_02244508:
add r6, #0x1f
add r0, r5, #0
mov r1, #0xc
add r2, r6, #0
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0
bl CalcMonLevelAndStats
bl Pokemon_CalcLevelAndStats
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
@ -22202,7 +22202,7 @@ ov06_02244558: ; 0x02244558
add r0, r0, #4
str r1, [r7, r0]
ldr r0, [r5, #4]
bl AllocMonZeroed
bl Pokemon_New
add r4, r0, #0
ldrb r1, [r5, #0xe]
ldr r0, [r7, #4]
@ -22222,22 +22222,22 @@ _022445A6:
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x32
bls _022445E8
add r0, r4, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x32
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
str r0, [sp, #8]
add r0, r4, #0
mov r1, #8
add r2, sp, #8
bl SetMonData
bl Pokemon_SetData
add r0, r4, #0
bl CalcMonLevelAndStats
bl Pokemon_CalcLevelAndStats
_022445E8:
add r0, r7, #0
add r1, r4, #0
@ -22413,7 +22413,7 @@ _0224471C:
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x21
lsl r1, r1, #6
strh r0, [r5, r1]
@ -22645,14 +22645,14 @@ _022448EC:
add r7, r6, #0
orr r7, r0
add r0, r7, #0
bl GetNatureFromPersonality
bl Personality_GetNature
add r1, sp, #8
ldrb r1, [r1, #0xb]
cmp r1, r0
beq _0224491A
ldr r0, [sp]
add r1, r7, #0
bl CalcShininessByOtIdAndPersonality
bl Personality_IsShiny
cmp r0, #1
beq _022448EC
_0224491A:
@ -22731,13 +22731,13 @@ _0224499C:
mov r0, #0
strb r0, [r5, #0x1e]
ldr r0, _02244A30 ; =gGameLanguage
mov r1, #0x19 ; BASE_ABILITY_2
mov r1, #0x19 ; SPECIES_DATA_ABILITY_2
ldrb r0, [r0]
strb r0, [r5, #0x1f]
ldrh r0, [r5]
lsl r0, r0, #0x15
lsr r0, r0, #0x15
bl GetMonBaseStat
bl Species_GetValue
cmp r0, #0
beq _022449E0
ldr r2, [r5, #0x10]
@ -22750,20 +22750,20 @@ _0224499C:
b _022449F2
_022449CC:
ldrh r0, [r5]
mov r1, #0x18 ; BASE_ABILITY_1
mov r1, #0x18 ; SPECIES_DATA_ABILITY_1
lsl r0, r0, #0x15
lsr r0, r0, #0x15
bl GetMonBaseStat
bl Species_GetValue
add r1, r5, #0
add r1, #0x20
strb r0, [r1]
b _022449F2
_022449E0:
ldrh r0, [r5]
mov r1, #0x18 ; BASE_ABILITY_1
mov r1, #0x18 ; SPECIES_DATA_ABILITY_1
lsl r0, r0, #0x15
lsr r0, r0, #0x15
bl GetMonBaseStat
bl Species_GetValue
add r1, r5, #0
add r1, #0x20
strb r0, [r1]
@ -23242,7 +23242,7 @@ ov06_02244D04: ; 0x02244D04
add r0, #0x5a
strh r1, [r0]
ldr r0, [sp, #0x20]
bl AllocMonZeroed
bl Pokemon_New
add r4, r0, #0
ldr r0, [sp]
mov r6, #0
@ -23297,8 +23297,8 @@ ov06_02244DC4: ; 0x02244DC4
lsl r0, r0, #2
str r1, [r7, r0]
add r0, r4, #0
mov r1, #0x12 ; BASE_GENDER_RATIO
bl GetMonBaseStat
mov r1, #0x12 ; SPECIES_DATA_GENDER_RATIO
bl Species_GetValue
lsl r0, r0, #0x18
lsr r0, r0, #0x18
beq _02244DEC
@ -26898,7 +26898,7 @@ ov06_0224690C: ; 0x0224690C
str r0, [r4]
ldr r0, [r4, #0x5c]
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl sub_02005578
@ -28810,7 +28810,7 @@ _022477A8:
mov r1, #0
add r0, r6, #0
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp]
mov r0, #0
str r0, [sp, #4]
@ -30834,7 +30834,7 @@ ov06_02248724: ; 0x02248724
add r0, r6, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r0, #0
add r0, r7, #0
bl ov06_02248810
@ -30844,13 +30844,13 @@ ov06_02248724: ; 0x02248724
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r6, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r6, r0, #0x18
ldr r0, [sp]
@ -30997,7 +30997,7 @@ _0224886C:
str r5, [r4, #0x10]
str r6, [r4, #0xc]
add r0, r5, #0
bl AllocMonZeroed
bl Pokemon_New
str r0, [r4, #4]
add r0, r5, #0
bl PlayerProfile_New
@ -31083,7 +31083,7 @@ ov06_0224891C: ; 0x0224891C
mov r1, #0xa0
mov r2, #0
add r7, r0, #0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0
ldr r0, [r5, #0x10]
str r0, [sp]
@ -31172,7 +31172,7 @@ CreateInGameTradeMon: ; 0x022489D4
mov r3, #0x20
str r1, [sp, #0xc]
ldr r1, [r4]
bl CreateMon
bl Pokemon_InitWithParams
ldr r0, [sp, #0x28]
add r1, r6, #0
bl GetInGameTradeMonOrPartnerName
@ -31180,7 +31180,7 @@ CreateInGameTradeMon: ; 0x022489D4
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
bl SetMonData
bl Pokemon_SetData
add r0, r7, #0
bl String_Delete
mov r1, #1
@ -31189,66 +31189,66 @@ CreateInGameTradeMon: ; 0x022489D4
add r0, r5, #0
mov r1, #0x4d
add r2, sp, #0x10
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0
mov r1, #0x46
add r2, r4, #4
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x47
add r2, #8
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x48
add r2, #0xc
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x49
add r2, #0x10
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4a
add r2, #0x14
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4b
add r2, #0x18
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x13
add r2, #0x24
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x14
add r2, #0x28
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x15
add r2, #0x2c
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x16
add r2, #0x30
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #0x17
add r2, #0x34
bl SetMonData
bl Pokemon_SetData
add r2, r4, #0
add r0, r5, #0
mov r1, #6
add r2, #0x3c
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x28]
add r1, r6, #4
bl GetInGameTradeMonOrPartnerName
@ -31256,19 +31256,19 @@ CreateInGameTradeMon: ; 0x022489D4
add r0, r5, #0
mov r1, #0x90
add r2, r6, #0
bl SetMonData
bl Pokemon_SetData
add r0, r6, #0
bl String_Delete
add r2, r4, #0
add r0, r5, #0
mov r1, #0x9c
add r2, #0x40
bl SetMonData
bl Pokemon_SetData
add r4, #0x48
add r0, r5, #0
mov r1, #0xc
add r2, r4, #0
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x2c]
bl MapHeader_GetMapSec
add r3, r0, #0
@ -31279,9 +31279,9 @@ CreateInGameTradeMon: ; 0x022489D4
mov r2, #1
bl sub_0208089C
add r0, r5, #0
bl CalcMonLevelAndStats
bl Pokemon_CalcLevelAndStats
add r0, r5, #0
bl MonIsShiny
bl Pokemon_IsShiny
cmp r0, #0
beq _02248B08
bl GF_AssertFail

24
arm9/overlays/07/asm/overlay_07.s
View File

@ -2333,13 +2333,13 @@ _0221312A:
mov r1, #5
mov r2, #0
add r7, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022131B0
add r0, r7, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _022131B0
add r0, r7, #0
@ -3686,7 +3686,7 @@ _02213C2E:
add r0, r4, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x86
lsl r1, r1, #2
strh r0, [r7, r1]
@ -3702,52 +3702,52 @@ _02213C2E:
add r5, r0, r1
add r0, r4, #0
mov r1, #0x4c
bl GetMonData
bl Pokemon_GetData
ldr r1, _02213D18 ; =0x00000223
mov r2, #0
strb r0, [r5, r1]
add r0, r4, #0
mov r1, #0xa2
bl GetMonData
bl Pokemon_GetData
ldr r1, _02213D1C ; =0x0000021A
mov r2, #0
strh r0, [r5, r1]
add r0, r4, #0
mov r1, #0xa3
bl GetMonData
bl Pokemon_GetData
mov r1, #0x87
lsl r1, r1, #2
strh r0, [r5, r1]
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x22
lsl r1, r1, #4
strb r0, [r5, r1]
add r0, r4, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02213D20 ; =0x0000021E
mov r2, #0
strh r0, [r5, r1]
add r0, r4, #0
mov r1, #0xa1
bl GetMonData
bl Pokemon_GetData
mov r1, #0x89
lsl r1, r1, #2
strb r0, [r5, r1]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02213D24 ; =0x00000225
mov r2, #0
strb r0, [r5, r1]
add r0, r4, #0
mov r1, #0xaf
bl GetMonData
bl Pokemon_GetData
cmp r0, #1
bne _02213CE8
mov r1, #0
@ -3758,7 +3758,7 @@ _02213CEA:
ldr r0, _02213D28 ; =0x00000222
strb r1, [r7, r0]
add r0, r4, #0
bl GetMonGender
bl Pokemon_GetGender
ldr r1, _02213D2C ; =0x00000221
strb r0, [r5, r1]
add r0, r4, #0

6
arm9/overlays/08/asm/overlay_08.s
View File

@ -45038,7 +45038,7 @@ ov08_02228244: ; 0x02228244
str r0, [r2]
ldr r0, [r4, #0xc]
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0
add r1, #0x9c
str r0, [r1]
@ -45067,7 +45067,7 @@ _02228272:
_02228290:
ldr r0, [r4, #0xc]
mov r1, #0x9a
bl GetMonData
bl Pokemon_GetData
add r4, #0x98
str r0, [r4]
pop {r4, pc}
@ -45080,7 +45080,7 @@ _0222829E:
add r4, #0xa0
mov r1, #0xaa
add r2, r4, #0
bl GetMonData
bl Pokemon_GetData
pop {r4, pc}
thumb_func_start ov08_022282B4

68
arm9/overlays/09/asm/overlay_09.s
View File

@ -576,7 +576,7 @@ _022122BA:
add r0, r5, r1
ldr r0, [r0, #4]
mov r1, #0xa2
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x20]
ldrb r1, [r4, #0x11]
mov r0, #0x50
@ -1630,7 +1630,7 @@ _02212B0A:
ldr r0, [r0, #4]
add r1, #0x3a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r7, #4
strh r0, [r4, r1]
mov r2, #2
@ -1686,7 +1686,7 @@ _02212BAA:
add r0, r4, r0
ldr r0, [r0, #4]
mov r1, #0xa2
bl GetMonData
bl Pokemon_GetData
ldr r1, _02212C84 ; =0x0000207E
mov r2, #4
strh r0, [r4, r1]
@ -1841,7 +1841,7 @@ _02212CD0:
add r1, r7, #0
add r1, #0x3a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x82
lsl r1, r1, #6
strh r0, [r4, r1]
@ -2441,7 +2441,7 @@ _022131E2:
str r0, [r4, #4]
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #8]
ldrh r0, [r4, #8]
cmp r0, #0
@ -2457,54 +2457,54 @@ _0221320C:
add r4, r0, r5
ldr r0, [r4, #4]
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0xa]
ldr r0, [r4, #4]
mov r1, #0xa5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0xc]
ldr r0, [r4, #4]
mov r1, #0xa6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0xe]
ldr r0, [r4, #4]
mov r1, #0xa7
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x10]
ldr r0, [r4, #4]
mov r1, #0xa8
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x12]
ldr r0, [r4, #4]
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x14]
ldr r0, [r4, #4]
mov r1, #0xa3
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x16]
ldr r0, [r4, #4]
mov r1, #0xb0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strb r0, [r4, #0x18]
ldr r0, [r4, #4]
mov r1, #0xb1
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r6, [sp]
strb r0, [r4, #0x19]
ldr r0, [r4, #4]
add r6, #0x1a
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldrb r1, [r6, r5]
mov r2, #0x7f
lsl r0, r0, #0x18
@ -2517,7 +2517,7 @@ _0221320C:
ldr r0, [r4, #4]
mov r1, #0xaf
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #1
ldrb r1, [r6, r5]
bne _022132BC
@ -2535,7 +2535,7 @@ _022132C2:
add r6, r0, #0
ldr r0, [r4, #4]
add r6, #0x1b
bl GetMonGender
bl Pokemon_GetGender
ldrb r1, [r6, r5]
mov r2, #7
bic r1, r2
@ -2557,7 +2557,7 @@ _022132C2:
ldr r0, [r4, #4]
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
lsl r0, r0, #0x1f
@ -2570,17 +2570,17 @@ _022132C2:
ldr r0, [r4, #4]
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x1c]
ldr r0, [r4, #4]
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x1e]
ldr r0, [r4, #4]
mov r1, #8
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r6, [sp]
str r0, [r4, #0x20]
add r6, #0x1a
@ -2588,7 +2588,7 @@ _022132C2:
ldrh r0, [r4, #8]
lsl r1, r1, #0x19
lsr r1, r1, #0x19
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
str r0, [r4, #0x24]
ldrb r0, [r6, r5]
lsl r0, r0, #0x19
@ -2604,55 +2604,55 @@ _0221335A:
add r1, r1, #1
add r4, r0, r5
ldrh r0, [r4, #8]
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
_02213366:
str r0, [r4, #0x28]
ldr r0, [r4, #4]
mov r1, #0x13
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0
add r1, #0x2c
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x14
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0
add r1, #0x2d
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x15
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0
add r1, #0x2e
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x16
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0
add r1, #0x2f
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x17
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0
add r1, #0x30
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0xa1
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0
add r1, #0x31
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r4, #0x32
strb r0, [r4]
ldr r1, [sp]
@ -2670,7 +2670,7 @@ _022133E4:
ldr r0, [r6, #4]
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0xc]
strh r0, [r7, r1]
add r0, r1, #0
@ -2681,13 +2681,13 @@ _022133E4:
ldr r0, [r6, #4]
add r1, #0x3a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strb r0, [r5, #2]
add r1, r4, #0
ldr r0, [r6, #4]
add r1, #0x3e
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strb r0, [r5, #3]
ldrh r0, [r5]
ldrb r1, [r5, #3]
@ -8336,7 +8336,7 @@ ov09_02216378: ; 0x02216378
mov r1, #0xa2
mov r2, #0
add r7, r0, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #8]

74
arm9/overlays/11/asm/ov11_0222D5C0_1.s
View File

@ -1685,7 +1685,7 @@ _0222E4AC:
bl ov11_02230014
mov r1, #0x9a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0
ldr r1, [r6, #0x34]
add r0, r5, #0
@ -2024,19 +2024,19 @@ _0222E76C:
mov r1, #5
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222E79E
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222E79E
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222E7AA
_0222E79E:
@ -2129,19 +2129,19 @@ _0222E848:
mov r1, #5
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222E87A
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222E87A
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222E886
_0222E87A:
@ -2255,38 +2255,38 @@ _0222E938:
add r0, r5, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222E9AC
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222E9AC
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222E9B8
b _0222E9AC
_0222E984:
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222E9AC
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222E9AC
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222E9B8
_0222E9AC:
@ -2355,19 +2355,19 @@ _0222EA22:
mov r1, #5
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222EA54
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222EA54
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222EA60
_0222EA54:
@ -2457,19 +2457,19 @@ _0222EAEE:
bne _0222EB2E
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222EB56
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222EB56
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222EB56
ldr r0, [sp, #0x38]
@ -2479,19 +2479,19 @@ _0222EAEE:
_0222EB2E:
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222EB56
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222EB56
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222EB64
_0222EB56:
@ -2582,19 +2582,19 @@ _0222EBF6:
mov r1, #5
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222EC28
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222EC28
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222EC34
_0222EC28:
@ -2707,38 +2707,38 @@ _0222ECE0:
add r0, r5, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222ED54
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222ED54
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222ED60
b _0222ED54
_0222ED2C:
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222ED54
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222ED54
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222ED60
_0222ED54:
@ -2810,19 +2810,19 @@ _0222EDD2:
mov r1, #5
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222EE04
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222EE04
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222EE10
_0222EE04:
@ -2865,7 +2865,7 @@ _0222EE3E:
add r2, r4, #0
mov r1, #0x8f
add r2, #0xf4
bl GetMonData
bl Pokemon_GetData
_0222EE5A:
ldr r1, [r4, #0x2c]
mov r0, #1
@ -2898,7 +2898,7 @@ _0222EE8C:
add r1, r7, #0
lsl r2, r2, #0x10
lsr r2, r2, #0x10
bl MonApplyFriendshipMod
bl Pokemon_UpdateFriendship
ldr r0, [r4, #0x68]
add r5, r5, #1
bl Party_GetCount
@ -2920,7 +2920,7 @@ _0222EEBC:
add r1, r7, #0
lsl r2, r2, #0x10
lsr r2, r2, #0x10
bl MonApplyFriendshipMod
bl Pokemon_UpdateFriendship
ldr r0, [r4, #0x70]
add r5, r5, #1
bl Party_GetCount

62
arm9/overlays/11/asm/ov11_0222FF68.s
View File

@ -740,7 +740,7 @@ _022303E4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #7
str r0, [sp, #0x20]
tst r1, r0
@ -751,7 +751,7 @@ _022303E4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230434
@ -802,7 +802,7 @@ _02230478:
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _0223068C ; =0x00000F88
str r0, [sp, #0x20]
tst r1, r0
@ -813,7 +813,7 @@ _02230478:
str r0, [sp, #0x20]
ldr r0, [sp, #0x18]
mov r1, #0x9f
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022304B8
@ -850,7 +850,7 @@ _022304DC:
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x10
str r0, [sp, #0x20]
tst r1, r0
@ -861,7 +861,7 @@ _022304DC:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x10]
cmp r0, r5
beq _0223051C
@ -898,7 +898,7 @@ _02230540:
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x20
str r0, [sp, #0x20]
tst r1, r0
@ -909,7 +909,7 @@ _02230540:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230580
@ -946,7 +946,7 @@ _022305A4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x40
str r0, [sp, #0x20]
tst r1, r0
@ -957,7 +957,7 @@ _022305A4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022305E4
@ -1337,13 +1337,13 @@ _022308C4:
ldr r0, [sp, #0x18]
add r1, #0x3a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r1, r4, #0
ldr r0, [sp, #0x18]
add r1, #0x42
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r7, r0
beq _0223095A
add r1, r4, #0
@ -1408,13 +1408,13 @@ _0223097E:
ldr r0, [sp, #0x18]
add r1, #0x3a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r1, r4, #0
ldr r0, [sp, #0x18]
add r1, #0x42
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r7, r0
beq _022309F2
add r1, r4, #0
@ -1485,7 +1485,7 @@ _02230A0C:
ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _02230A42
mov r0, #1
@ -1495,7 +1495,7 @@ _02230A36:
ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x20]
_02230A42:
ldr r0, [sp, #0x20]
@ -1504,12 +1504,12 @@ _02230A42:
ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0
ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r4, r0
beq _02230B14
ldr r0, [sp, #0x38]
@ -1528,14 +1528,14 @@ _02230A42:
ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x20]
b _02230AC2
_02230A8C:
ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsr r0, r0, #1
str r0, [sp, #0x20]
bne _02230AC2
@ -1546,7 +1546,7 @@ _02230AA2:
ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x19
mul r1, r0
add r0, r1, #0
@ -1609,7 +1609,7 @@ _02230B14:
ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x64
bhs _02230B4A
ldr r0, [sp, #0x14]
@ -1634,13 +1634,13 @@ _02230B4A:
ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x64
blo _02230B8E
ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0xc8
bhs _02230B8E
ldr r0, [sp, #0x14]
@ -1665,7 +1665,7 @@ _02230B8E:
ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0xc8
blo _02230BC4
ldr r0, [sp, #0x14]
@ -1686,7 +1686,7 @@ _02230BC4:
ldr r0, [sp, #0x18]
mov r1, #0x9a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0xb
bne _02230BE0
ldr r0, [sp, #8]
@ -1696,7 +1696,7 @@ _02230BE0:
ldr r0, [sp, #0x18]
mov r1, #0x97
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0
ldr r0, [sp, #4]
bl ov11_022302B0
@ -1709,7 +1709,7 @@ _02230BFC:
ldr r0, [sp, #0x18]
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x20]
ldr r0, [sp, #0x38]
mov r1, #1
@ -2139,7 +2139,7 @@ _02230EE4:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
mov r0, #0x67
@ -2189,7 +2189,7 @@ _02230F4E:
add r0, r6, #0
mov r1, #0x70
add r2, sp, #0
bl SetMonData
bl Pokemon_SetData
_02230F58:
add r0, r5, #0
mov r1, #0
@ -3178,7 +3178,7 @@ _02231606:
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x67
lsl r1, r1, #2
cmp r0, r1

186
arm9/overlays/11/asm/ov11_02232264.s
View File

@ -2928,13 +2928,13 @@ _02233950:
mov r1, #5
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022339B4
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022339B4
add r0, r4, #0
@ -2955,7 +2955,7 @@ _02233994:
add r0, r6, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
add r0, r5, #0
@ -2982,8 +2982,8 @@ _022339C6:
mov r0, #0xb5
lsl r0, r0, #6
ldrh r0, [r1, r0]
mov r1, #9 ; BASE_EXP_YIELD
bl GetMonBaseStat
mov r1, #9 ; SPECIES_DATA_EXP_YIELD
bl Species_GetValue
lsl r0, r0, #0x10
lsr r1, r0, #0x10
ldr r2, [r5, #0x74]
@ -8823,19 +8823,19 @@ _02236794:
mov r1, #5
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022367C8
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _022367C8
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022367C8
add r7, r7, #1
@ -8876,19 +8876,19 @@ _022367EA:
add r1, r7, #0
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022367EA
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #1
beq _022367EA
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022367EA
ldr r0, [sp]
@ -10975,26 +10975,26 @@ _022378A2:
beq _02237900
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022378F8
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022378F8
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02237AAC ; =0x000001EE
cmp r0, r1
beq _022378F8
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02237900
_022378F8:
@ -11011,22 +11011,22 @@ _02237900:
add r4, r0, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #4]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0
ldr r0, [sp, #4]
add r1, r6, #0
mov r2, #1 ; BASE_ATK
bl GetMonBaseStat_HandleFormConversion
mov r2, #1 ; SPECIES_DATA_BASE_ATK
bl Species_GetFormValue
ldr r1, _02237AB0 ; =0x00002144
ldr r2, _02237AB4 ; =0x00003044
str r0, [r5, r1]
@ -11055,10 +11055,10 @@ _02237900:
ldrh r0, [r2, r1]
add r1, #0x26
ldrb r1, [r2, r1]
mov r2, #2 ; BASE_DEF
mov r2, #2 ; SPECIES_DATA_BASE_DEF
lsl r1, r1, #0x1b
lsr r1, r1, #0x1b
bl GetMonBaseStat_HandleFormConversion
bl Species_GetFormValue
add r1, r0, #0
ldr r0, _02237AB0 ; =0x00002144
ldr r0, [r5, r0]
@ -11157,26 +11157,26 @@ _02237A2A:
beq _02237A9A
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02237A7C
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02237A7C
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02237AAC ; =0x000001EE
cmp r0, r1
beq _02237A7C
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02237A9A
_02237A7C:
@ -11513,13 +11513,13 @@ _02237D16:
mov r1, #0xad
mov r2, #0
str r0, [sp, #8]
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02237D7E
ldr r0, [sp, #8]
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02237DBC ; =0x000001EE
cmp r0, r1
beq _02237D7E
@ -11529,7 +11529,7 @@ _02237D4E:
ldr r0, [sp, #8]
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r6, #0
@ -14215,20 +14215,20 @@ _02239222:
mov r1, #0xad
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r4, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #8]
add r0, r4, #0
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #4]
@ -14254,7 +14254,7 @@ _02239222:
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
sub r0, r0, #1
mov r1, #0xa
bl _u32_div_f
@ -14278,7 +14278,7 @@ _022392AA:
add r0, r4, #0
mov r1, #6
add r2, r5, r2
bl SetMonData
bl Pokemon_SetData
b _022392EC
_022392C4:
cmp r5, #0x62
@ -14293,7 +14293,7 @@ _022392C4:
add r0, r4, #0
mov r1, #6
add r2, r2, r3
bl SetMonData
bl Pokemon_SetData
b _022392EC
_022392E2:
add r1, r1, #1
@ -14318,7 +14318,7 @@ _022392EC:
mov r1, #0xa0
str r2, [sp, #0xc]
mov r5, #0xa
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r1, r0, #0x18
cmp r1, #0xa
@ -14349,7 +14349,7 @@ _0223932E:
add r0, r4, #0
mov r1, #6
add r2, sp, #0xc
bl SetMonData
bl Pokemon_SetData
_02239350:
ldr r0, [sp]
mov r1, #0
@ -15701,20 +15701,20 @@ _02239E2A:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02239E5C
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02239F48 ; =0x000001EE
cmp r0, r1
beq _02239E5C
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r5, r5, r0
_02239E5C:
add r0, r7, #0
@ -15750,19 +15750,19 @@ _02239E90:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02239EC0
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, r7
beq _02239EC0
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r5, r5, r0
_02239EC0:
ldr r0, [sp, #8]
@ -15797,20 +15797,20 @@ _02239EF8:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02239F2A
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02239F48 ; =0x000001EE
cmp r0, r1
beq _02239F2A
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r5, r5, r0
_02239F2A:
add r0, r7, #0
@ -16146,12 +16146,12 @@ ov11_0223A178: ; 0x0223A178
add r6, r0, #0
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp]
add r0, r6, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0
ldr r0, _0223A210 ; =0x00002D67
add r1, r5, r4
@ -16981,7 +16981,7 @@ _0223A7D6:
mov r1, #6
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #1
@ -17085,7 +17085,7 @@ _0223A8B0:
add r0, r6, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #1
@ -17107,7 +17107,7 @@ _0223A8B0:
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0223A90E
ldr r1, [r4, #4]
@ -17133,7 +17133,7 @@ _0223A90E:
ldr r2, [sp, #0x34]
add r0, r6, #0
mov r1, #0xa2
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0223A928
b _0223AA34
@ -17141,7 +17141,7 @@ _0223A928:
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x64
beq _0223AA34
ldr r0, [r4, #4]
@ -17200,7 +17200,7 @@ _0223A994:
add r0, r6, #0
mov r1, #0xc
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _0223ABAC ; =gGameLanguage
ldrb r1, [r1]
cmp r1, r0
@ -17227,10 +17227,10 @@ _0223A9D6:
add r0, r6, #0
mov r1, #8
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x48]
add r0, r6, #0
bl GetMonBaseExperienceAtCurrentLevel
bl Pokemon_GetCurrentLevelBaseExp
ldr r1, [sp, #0x48]
sub r0, r1, r0
str r0, [r4, #0x3c]
@ -17253,7 +17253,7 @@ _0223AA0C:
add r0, r6, #0
mov r1, #8
add r2, sp, #0x48
bl SetMonData
bl Pokemon_SetData
ldr r6, [r4, #4]
ldr r0, [r4]
add r1, r7, #0
@ -17401,7 +17401,7 @@ _0223AB22:
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x30]
mov r0, #5
mov r1, #0x18
@ -17421,7 +17421,7 @@ _0223AB58:
ldr r1, [r1, r2]
add r0, r6, #0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x4c]
lsl r2, r1, #2
ldr r1, [sp, #0x2c]
@ -17438,9 +17438,9 @@ _0223AB58:
add r0, r6, #0
mov r1, #0
lsr r2, r2, #0x10
bl MonApplyFriendshipMod
bl Pokemon_UpdateFriendship
add r0, r6, #0
bl CalcMonStats
bl Pokemon_CalcStats
ldr r1, [r4, #4]
ldr r0, _0223ABB0 ; =0x0000219C
b _0223ABBC
@ -17663,7 +17663,7 @@ _0223AD30:
ldr r1, [r1, r2]
add r0, r6, #0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x28]
lsl r2, r5, #2
ldr r1, [r1, r2]
@ -17729,7 +17729,7 @@ _0223ADEC:
strb r0, [r5, #1]
add r0, r6, #0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xb4]
mov r0, #3
str r0, [sp, #0xcc]
@ -18177,7 +18177,7 @@ _0223B192:
add r0, r6, #0
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xb8]
ldr r0, [r4]
bl ov11_02230E54
@ -18236,7 +18236,7 @@ _0223B1F6:
add r0, r6, #0
add r1, #0x3e
add r2, sp, #0x4c
bl SetMonData
bl Pokemon_SetData
ldr r1, [r4, #0x40]
ldr r2, [r4, #0x44]
lsl r1, r1, #0x10
@ -18323,7 +18323,7 @@ ov11_0223B2DC: ; 0x0223B2DC
add r0, r2, #0
mov r1, #5
mov r4, #0
bl AllocAndLoadMonPersonal
bl SpeciesData_NewFromSpecies
add r7, r0, #0
ldr r0, [sp]
ldr r1, [sp, #4]
@ -18331,7 +18331,7 @@ ov11_0223B2DC: ; 0x0223B2DC
mov r1, #6
add r2, r4, #0
str r0, [sp, #0x14]
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r6, #0
@ -18354,7 +18354,7 @@ _0223B328:
ldr r0, [sp, #0x14]
add r1, #0xd
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0xc]
strb r0, [r1]
add r0, r1, #0
@ -18402,7 +18402,7 @@ _0223B37A: ; jump table
_0223B386:
add r0, r7, #0
mov r1, #0xa
bl GetPersonalAttr
bl SpeciesData_GetValue
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x79
@ -18414,7 +18414,7 @@ _0223B386:
_0223B39E:
add r0, r7, #0
mov r1, #0xb
bl GetPersonalAttr
bl SpeciesData_GetValue
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x74
@ -18426,7 +18426,7 @@ _0223B39E:
_0223B3B6:
add r0, r7, #0
mov r1, #0xc
bl GetPersonalAttr
bl SpeciesData_GetValue
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x75
@ -18438,7 +18438,7 @@ _0223B3B6:
_0223B3CE:
add r0, r7, #0
mov r1, #0xd
bl GetPersonalAttr
bl SpeciesData_GetValue
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x78
@ -18450,7 +18450,7 @@ _0223B3CE:
_0223B3E6:
add r0, r7, #0
mov r1, #0xe
bl GetPersonalAttr
bl SpeciesData_GetValue
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x76
@ -18462,7 +18462,7 @@ _0223B3E6:
_0223B3FE:
add r0, r7, #0
mov r1, #0xf
bl GetPersonalAttr
bl SpeciesData_GetValue
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x77
@ -18522,7 +18522,7 @@ _0223B45A:
str r0, [sp, #0x18]
ldr r0, [sp, #0x14]
add r1, #0xd
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x10]
add r0, r0, #1
str r0, [sp, #0x10]
@ -18534,7 +18534,7 @@ _0223B45A:
b _0223B35E
_0223B48C:
add r0, r7, #0
bl FreeMonPersonal
bl SpeciesData_Free
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
nop
@ -18977,7 +18977,7 @@ _0223B83C:
add r0, r6, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r0, #0
ldr r0, [r4]
bl ov11_02231668
@ -19359,7 +19359,7 @@ _0223BB76:
mov r1, #5
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
add r5, r0, #0
ldr r0, [r4]
bl ov11_02230E18
@ -19397,7 +19397,7 @@ _0223BBEE:
add r0, r6, #0
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [r5, #8]
ldr r0, [r4]
bl ov11_02230290
@ -19405,7 +19405,7 @@ _0223BBEE:
add r0, r6, #0
mov r1, #0x6f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [r5, #0x10]
ldr r0, _0223BF18 ; =UNK_020FA5FC
add r1, r5, #0
@ -19441,7 +19441,7 @@ _0223BC38:
bne _0223BC62
ldr r2, [r5, #0x18]
mov r1, #0x77
bl SetMonData
bl Pokemon_SetData
_0223BC62:
add r0, r5, #0
bl sub_02077AC4
@ -19543,13 +19543,13 @@ _0223BD3E:
add r0, r6, #0
add r1, #0x42
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r5, #0
str r0, [sp, #0x2c]
add r0, r6, #0
add r1, #0x3a
add r2, sp, #0x2c
bl SetMonData
bl Pokemon_SetData
add r5, r5, #1
cmp r5, #4
blt _0223BD3E
@ -19871,8 +19871,8 @@ _0223BFEE:
mov r0, #0xb5
lsl r0, r0, #6
ldrh r0, [r1, r0]
mov r1, #8 ; BASE_CATCH_RATE
bl GetMonBaseStat
mov r1, #8 ; SPECIES_DATA_CATCH_RATE
bl Species_GetValue
ldr r1, _0223C200 ; =0x0000311C
ldr r2, _0223C204 ; =ov11_0225DCF0
ldrb r1, [r4, r1]
@ -19892,8 +19892,8 @@ _0223C026:
mov r0, #0xb5
lsl r0, r0, #6
ldrh r0, [r1, r0]
mov r1, #8 ; BASE_CATCH_RATE
bl GetMonBaseStat
mov r1, #8 ; SPECIES_DATA_CATCH_RATE
bl Species_GetValue
str r0, [sp]
_0223C03A:
ldr r1, [r4, #0x6c]
@ -21769,7 +21769,7 @@ ov11_0223CDC4: ; 0x0223CDC4
ldr r0, [sp, #0x18]
mov r1, #0xaf
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0223CF26
mov r0, #2
@ -21778,7 +21778,7 @@ _0223CF26:
ldr r0, [sp, #0x18]
mov r1, #0x6f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
_0223CF30:
cmp r0, #0
bne _0223CF42
@ -21811,7 +21811,7 @@ _0223CF5C:
ldr r0, [sp, #0x18]
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0
mov r0, #0
str r0, [sp]
@ -22036,7 +22036,7 @@ _0223D148:
add r0, r7, #0
mov r1, #8
lsr r2, r2, #0x10
bl MonApplyFriendshipMod
bl Pokemon_UpdateFriendship
pop {r3, r4, r5, r6, r7, pc}
_0223D18E:
add r0, r5, #0
@ -22046,7 +22046,7 @@ _0223D18E:
add r0, r7, #0
mov r1, #6
lsr r2, r2, #0x10
bl MonApplyFriendshipMod
bl Pokemon_UpdateFriendship
pop {r3, r4, r5, r6, r7, pc}
_0223D1A4:
add r0, r5, #0
@ -22056,7 +22056,7 @@ _0223D1A4:
add r0, r7, #0
mov r1, #6
lsr r2, r2, #0x10
bl MonApplyFriendshipMod
bl Pokemon_UpdateFriendship
_0223D1B8:
pop {r3, r4, r5, r6, r7, pc}
nop

36
arm9/overlays/11/asm/ov11_0223D1DC.s
View File

@ -9884,20 +9884,20 @@ _02241DFE:
mov r1, #0xad
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02241E3E
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02241FCC ; =0x000001EE
cmp r0, r1
beq _02241E3E
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02241E3E
ldr r2, [sp, #8]
@ -9971,20 +9971,20 @@ _02241EB4:
mov r1, #0xad
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02241EE6
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02241FCC ; =0x000001EE
cmp r0, r1
beq _02241EE6
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r7, r0
_02241EE6:
add r0, r6, #0
@ -10176,20 +10176,20 @@ _02242056:
mov r1, #0xad
mov r2, #0
add r5, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02242088
add r0, r5, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242340 ; =0x000001EE
cmp r0, r1
beq _02242088
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r7, r0
_02242088:
add r0, r6, #0
@ -10256,20 +10256,20 @@ _022420FE:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02242130
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242340 ; =0x000001EE
cmp r0, r1
beq _02242130
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r5, r5, r0
_02242130:
add r0, r7, #0
@ -10291,19 +10291,19 @@ _0224214A:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0224217A
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, r7
beq _0224217A
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r5, r5, r0
_0224217A:
ldr r0, [sp, #0x18]
@ -10360,20 +10360,20 @@ _022421DC:
mov r1, #0xad
mov r2, #0
add r5, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0224220E
add r0, r5, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242340 ; =0x000001EE
cmp r0, r1
beq _0224220E
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r7, r0
_0224220E:
add r0, r6, #0

116
arm9/overlays/11/asm/ov11_02242B78.s
View File

@ -24,41 +24,41 @@ ov11_02242B78: ; 0x02242B78
mov r1, #5
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x18]
mov r2, #0
strh r0, [r1, r5]
add r0, r4, #0
mov r1, #0xa4
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242F4C ; =0x00002D42
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242F50 ; =0x00002D44
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242F54 ; =0x00002D46
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa7
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242F58 ; =0x00002D48
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa8
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r7, r5
ldr r2, _02242F5C ; =0x00002D4A
str r1, [sp, #0xc]
@ -72,7 +72,7 @@ _02242C02:
add r0, r4, #0
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp, #0x14]
ldr r1, _02242F60 ; =0x00002D4C
strh r0, [r2, r1]
@ -80,7 +80,7 @@ _02242C02:
add r0, r4, #0
add r1, #0x3a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp, #0x10]
ldr r1, _02242F64 ; =0x00002D6C
strb r0, [r2, r1]
@ -88,7 +88,7 @@ _02242C02:
add r0, r4, #0
add r1, #0x3e
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp, #0x10]
ldr r1, _02242F68 ; =0x00002D70
add r6, r6, #1
@ -107,7 +107,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x46
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [r6, r5]
mov r2, #0x1f
bic r1, r2
@ -118,7 +118,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x47
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F6C ; =0xFFFFFC1F
@ -129,7 +129,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x48
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F70 ; =0xFFFF83FF
@ -140,7 +140,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x49
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F74 ; =0xFFF07FFF
@ -151,7 +151,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x4a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F78 ; =0xFE0FFFFF
@ -162,7 +162,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x4b
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F7C ; =0xC1FFFFFF
@ -173,7 +173,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [r6, r5]
ldr r1, _02242F80 ; =0xBFFFFFFF
lsl r0, r0, #0x1f
@ -184,7 +184,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x4d
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [r6, r5]
ldr r1, _02242F84 ; =0x7FFFFFFF
lsl r0, r0, #0x1f
@ -258,14 +258,14 @@ _02242D2E:
add r0, r4, #0
mov r1, #0xb0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FA0 ; =0x00002D64
add r2, r7, r5
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #0xb1
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FA4 ; =0x00002D65
add r2, r7, r5
strb r0, [r2, r1]
@ -273,7 +273,7 @@ _02242D2E:
add r0, r7, r1
str r0, [sp, #0x1c]
add r0, r4, #0
bl GetMonGender
bl Pokemon_GetGender
ldr r1, [sp, #0x1c]
mov r2, #0xf
ldrb r1, [r1, r5]
@ -286,7 +286,7 @@ _02242D2E:
ldr r0, _02242FA8 ; =0x00002D66
add r6, r7, r0
add r0, r4, #0
bl MonIsShiny
bl Pokemon_IsShiny
ldrb r1, [r6, r5]
mov r2, #0x20
lsl r0, r0, #0x1f
@ -297,7 +297,7 @@ _02242D2E:
add r0, r4, #0
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldrb r1, [r6, r5]
mov r2, #0x1f
lsl r0, r0, #0x18
@ -330,14 +330,14 @@ _02242E24:
add r0, r4, #0
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FAC ; =0x00002D67
add r2, r7, r5
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FB0 ; =0x00002DAC
add r2, r7, r5
str r0, [r2, r1]
@ -348,7 +348,7 @@ _02242E24:
add r0, r4, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r6, r5]
_02242E58:
ldr r0, [sp, #4]
@ -358,56 +358,56 @@ _02242E58:
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FB4 ; =0x00002D74
add r2, r7, r6
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #9
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FB8 ; =0x00002D75
add r2, r7, r6
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FBC ; =0x00002D8C
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa3
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FC0 ; =0x00002D90
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #8
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FC4 ; =0x00002DA4
add r2, r7, r6
str r0, [r2, r1]
mov r1, #0
add r0, r4, #0
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FC8 ; =0x00002DA8
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #7
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FCC ; =0x00002DB4
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #0x9c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x1c]
lsl r0, r0, #0x18
lsr r0, r0, #0x18
@ -422,7 +422,7 @@ _02242E58:
strb r1, [r0, r5]
add r0, r4, #0
mov r1, #0x9a
bl GetMonData
bl Pokemon_GetData
ldr r1, _02242FD0 ; =0x00002DBF
add r2, r7, r6
strb r0, [r2, r1]
@ -448,13 +448,13 @@ _02242E58:
add r2, r7, r2
mov r1, #0x74
add r2, r2, r6
bl GetMonData
bl Pokemon_GetData
ldr r2, _02242FDC ; =0x00002D94
add r0, r4, #0
add r2, r7, r2
mov r1, #0x8f
add r2, r2, r6
bl GetMonData
bl Pokemon_GetData
ldr r0, _02242FE0 ; =0x00002DBC
b _02242FE4
.align 2, 0
@ -566,7 +566,7 @@ ov11_02243054: ; 0x02243054
mov r1, #0xa4
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@ -575,7 +575,7 @@ ov11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@ -584,7 +584,7 @@ ov11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@ -593,7 +593,7 @@ ov11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa7
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@ -602,7 +602,7 @@ ov11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa8
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@ -611,7 +611,7 @@ ov11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@ -620,7 +620,7 @@ ov11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #9
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@ -629,7 +629,7 @@ ov11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@ -638,7 +638,7 @@ ov11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa3
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@ -676,21 +676,21 @@ _02243142:
add r0, r6, #0
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _022431CC ; =0x00002D4C
mov r2, #0
strh r0, [r7, r1]
add r1, r4, #0
add r0, r6, #0
add r1, #0x3a
bl GetMonData
bl Pokemon_GetData
ldr r1, _022431D0 ; =0x00002D6C
mov r2, #0
strb r0, [r5, r1]
add r1, r4, #0
add r0, r6, #0
add r1, #0x3e
bl GetMonData
bl Pokemon_GetData
ldr r1, _022431D4 ; =0x00002D70
strb r0, [r5, r1]
_02243186:
@ -702,7 +702,7 @@ _02243186:
add r0, r6, #0
mov r1, #8
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@ -5309,7 +5309,7 @@ _022453A4:
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022453BA
add r6, r6, #1
@ -5366,7 +5366,7 @@ _02245418:
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0224542E
add r6, r6, #1
@ -8796,19 +8796,19 @@ _02246E76:
mov r1, #5
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02246EB6
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _02246EB6
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02246EB6
ldr r0, [sp, #0xc]
@ -17101,7 +17101,7 @@ ov11_0224AD38: ; 0x0224AD38
add r0, r6, #0
mov r1, #0x9a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0
b _0224AD7A
_0224AD76:
@ -17210,17 +17210,17 @@ ov11_0224AE14: ; 0x0224AE14
add r0, r5, #0
mov r1, #0x8f
add r2, sp, #0
bl GetMonData
bl Pokemon_GetData
add r0, r5, #0
mov r1, #7
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r6, r0
bne _0224AE72
add r0, r5, #0
mov r1, #0x9c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r7, r0
bne _0224AE72
add r0, r4, #0

22
arm9/overlays/11/asm/ov11_0224CA64.s
View File

@ -629,13 +629,13 @@ _0224CEE2:
add r0, r7, #0
add r1, #0x36
add r2, r5, #0
bl SetMonData
bl Pokemon_SetData
ldr r2, [sp, #8]
add r1, r4, #0
add r0, r7, #0
add r1, #0x3a
add r2, r2, r4
bl SetMonData
bl Pokemon_SetData
_0224CF0C:
add r4, r4, #1
add r5, r5, #2
@ -653,16 +653,16 @@ _0224CF14:
add r0, r7, #0
mov r1, #6
add r2, #0xc
bl SetMonData
bl Pokemon_SetData
_0224CF30:
add r0, r7, #0
mov r1, #0xa2
add r2, r6, #2
bl SetMonData
bl Pokemon_SetData
add r0, r7, #0
mov r1, #0x9f
add r2, r6, #4
bl SetMonData
bl Pokemon_SetData
mov r2, #0x65
ldr r1, [sp, #4]
lsl r2, r2, #2
@ -775,7 +775,7 @@ _0224D00A:
_0224D024:
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
_0224D02C:
ldrh r1, [r4, #2]
cmp r1, #0xd7
@ -787,7 +787,7 @@ _0224D038:
add r0, r6, #0
mov r1, #0x9f
add r2, sp, #8
bl SetMonData
bl Pokemon_SetData
_0224D042:
ldr r0, [sp, #4]
add r5, r5, #1
@ -1317,13 +1317,13 @@ _0224D466:
mov r1, #5
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0224D4B4
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0224D4B4
ldr r0, [sp]
@ -1334,7 +1334,7 @@ _0224D466:
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #8]
add r0, r1, r0
str r0, [sp, #8]
@ -1343,7 +1343,7 @@ _0224D4A8:
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r7, r0
_0224D4B4:
add r0, r6, #0

22
arm9/overlays/11/asm/ov11_0224D550.s
View File

@ -212,7 +212,7 @@ _0224D6D8:
ldrb r0, [r6, r1]
str r0, [r4, #0x1c]
ldr r0, [r5, #4]
bl GetNatureFromPersonality
bl Personality_GetNature
str r0, [r4, #0x24]
ldrb r0, [r5, #1]
add r1, r4, #0
@ -363,7 +363,7 @@ _0224D774:
add r0, #0x8c
strb r1, [r0]
ldr r0, [r5, #4]
bl GetNatureFromPersonality
bl Personality_GetNature
add r1, r4, #0
add r1, #0x8d
strb r0, [r1]
@ -520,7 +520,7 @@ _0224D8C4:
add r0, #0x8c
strb r1, [r0]
ldr r0, [r4, #4]
bl GetNatureFromPersonality
bl Personality_GetNature
add r1, r5, #0
add r1, #0x8d
strb r0, [r1]
@ -7222,8 +7222,8 @@ ov11_02250F94: ; 0x02250F94
bl ov11_02243420
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #0x1a ; BASE_GREAT_MARSH_RATE
bl GetMonBaseStat
mov r1, #0x1a ; SPECIES_DATA_SAFARI_FLEE_RATE
bl Species_GetValue
ldr r2, _0225100C ; =ov11_0225E830
lsl r1, r5, #1
ldrb r2, [r2, r1]
@ -8896,7 +8896,7 @@ _02251CEC:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [r4, #8]
mov r2, #0
ldr r1, [r1, #4]
@ -8905,7 +8905,7 @@ _02251CEC:
str r0, [r5, #0x28]
add r0, r6, #0
mov r1, #0xa3
bl GetMonData
bl Pokemon_GetData
str r0, [r5, #0x2c]
ldr r0, [r4, #8]
mov r1, #0x9f
@ -8914,7 +8914,7 @@ _02251CEC:
ldrh r0, [r0, #0x20]
str r0, [r5, #0x30]
add r0, r6, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _02251D72
add r0, r5, #0
@ -9035,7 +9035,7 @@ _02251E2E:
bl ov11_02230014
mov r1, #0x9f
add r2, r5, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _02251E6A
ldr r0, [sp, #0x10]
@ -9435,7 +9435,7 @@ _02252196:
str r0, [sp, #0x14]
_022521A4:
mov r0, #5
bl AllocMonZeroed
bl Pokemon_New
add r6, r0, #0
mov r5, #0
_022521AE:
@ -9827,7 +9827,7 @@ _022524D0:
bl ov11_02230014
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022524F2
ldrb r0, [r7, #0xc]

84
arm9/overlays/11/asm/ov11_02254710.s
View File

@ -1206,12 +1206,12 @@ ov11_02255034: ; 0x02255034
add r6, r0, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x10]
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xc]
mov r0, #0xc
add r2, sp, #0x14
@ -1284,7 +1284,7 @@ _022550D0:
_022550EA:
ldr r0, [sp, #0x10]
ldr r1, [sp, #0xc]
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
mov r1, #0xc0
mul r1, r4
add r2, r5, r1
@ -1295,11 +1295,11 @@ _022550EA:
str r0, [sp, #0x1c]
ldr r0, [sp, #0x10]
add r1, r1, #1
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
add r5, r0, #0
ldr r0, [sp, #0x10]
ldr r1, [sp, #0xc]
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
sub r0, r5, r0
str r0, [sp, #0x20]
ldrh r1, [r7, r6]
@ -1447,7 +1447,7 @@ _0225523A:
mov r1, #0xad
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02255298
ldr r1, _02255500 ; =0x000001EE
@ -1456,13 +1456,13 @@ _0225523A:
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02255280
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0225527A
mov r0, #3
@ -1483,7 +1483,7 @@ _02255284:
b _02255294
_0225528E:
add r0, r4, #0
bl GetPercentProgressTowardsNextLevel
bl Pokemon_CalcPercentToNextLevel
_02255294:
strb r0, [r5, #2]
add r5, r5, #1
@ -1548,7 +1548,7 @@ _02255304:
mov r1, #0xad
mov r2, #0
add r7, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02255350
ldr r1, _02255500 ; =0x000001EE
@ -1557,13 +1557,13 @@ _02255304:
add r0, r7, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0225534A
add r0, r7, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02255344
mov r0, #3
@ -1624,7 +1624,7 @@ _022553A0:
mov r1, #0xad
mov r2, #0
add r7, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022553EC
ldr r1, _02255500 ; =0x000001EE
@ -1633,13 +1633,13 @@ _022553A0:
add r0, r7, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022553E6
add r0, r7, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022553E0
mov r0, #3
@ -1690,7 +1690,7 @@ _02255428:
mov r1, #0xad
mov r2, #0
add r7, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02255474
ldr r1, _02255500 ; =0x000001EE
@ -1699,13 +1699,13 @@ _02255428:
add r0, r7, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0225546E
add r0, r7, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02255468
mov r0, #3
@ -2536,12 +2536,12 @@ ov11_02255A8C: ; 0x02255A8C
add r4, r0, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0
mov r0, #0x18
add r2, sp, #0xc
@ -2592,7 +2592,7 @@ _02255B04:
_02255B12:
add r0, r7, #0
add r1, r6, #0
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
ldr r1, _02255B64 ; =0x00002DA4
add r2, r5, r4
ldr r1, [r2, r1]
@ -2600,11 +2600,11 @@ _02255B12:
str r0, [sp, #0x18]
add r0, r7, #0
add r1, r6, #1
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
add r4, r0, #0
add r0, r7, #0
add r1, r6, #0
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
sub r0, r4, r0
str r0, [sp, #0x1c]
mov r0, #0x14
@ -2640,12 +2640,12 @@ ov11_02255B68: ; 0x02255B68
add r6, r0, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0
mov r1, #0x19
add r0, sp, #0xc
@ -2654,7 +2654,7 @@ ov11_02255B68: ; 0x02255B68
add r1, r6, #0
str r0, [sp, #0x10]
add r0, r7, #0
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
mov r1, #0xc0
mul r1, r4
add r2, r5, r1
@ -2664,11 +2664,11 @@ ov11_02255B68: ; 0x02255B68
str r0, [sp, #0x14]
add r0, r7, #0
add r1, r6, #1
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
add r5, r0, #0
add r0, r7, #0
add r1, r6, #0
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
sub r0, r5, r0
str r0, [sp, #0x18]
mov r0, #0x10
@ -3265,12 +3265,12 @@ ov11_02256020: ; 0x02256020
add r6, r0, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xc]
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #8]
mov r0, #0x26
add r2, sp, #0x10
@ -3343,7 +3343,7 @@ _022560BA:
_022560D4:
ldr r0, [sp, #0xc]
ldr r1, [sp, #8]
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
mov r1, #0xc0
mul r1, r4
add r2, r5, r1
@ -3354,11 +3354,11 @@ _022560D4:
str r0, [sp, #0x18]
ldr r0, [sp, #0xc]
add r1, r1, #1
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
add r5, r0, #0
ldr r0, [sp, #0xc]
ldr r1, [sp, #8]
bl GetMonExpBySpeciesAndLevel
bl Species_GetExpAtLevel
sub r0, r5, r0
str r0, [sp, #0x1c]
ldrh r1, [r7, r6]
@ -4630,7 +4630,7 @@ _02256A80:
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x14]
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02256AD2
ldr r1, _02256C04 ; =0x000001EE
@ -4639,13 +4639,13 @@ _02256A80:
ldr r0, [sp, #0x14]
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02256ACA
ldr r0, [sp, #0x14]
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02256AC2
add r1, r5, r4
@ -4695,7 +4695,7 @@ _02256B02:
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x18]
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02256B54
ldr r1, _02256C04 ; =0x000001EE
@ -4704,13 +4704,13 @@ _02256B02:
ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02256B4C
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02256B44
add r1, r5, r4
@ -4771,7 +4771,7 @@ _02256B9A:
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x1c]
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02256BEC
ldr r1, _02256C04 ; =0x000001EE
@ -4780,13 +4780,13 @@ _02256B9A:
ldr r0, [sp, #0x1c]
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02256BE4
ldr r0, [sp, #0x1c]
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02256BDC
add r1, r5, r4

88
arm9/overlays/12/asm/overlay_12.s
View File

@ -217,7 +217,7 @@ _0222D7BC:
ldr r0, [r1, r0]
add r1, r6, #0
add r1, #0x36
bl GetMonData
bl Pokemon_GetData
strh r0, [r5]
add r6, r6, #1
add r5, r5, #2
@ -975,7 +975,7 @@ _0222DE9E:
ldr r0, [r1, r0]
add r1, r4, #0
add r1, #0x36
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222DEBE
mov r1, #0xb
@ -5972,7 +5972,7 @@ _0223072E:
mov r1, #5
ldr r0, [r0, r6]
mov r2, #0
bl GetMonData
bl Pokemon_GetData
bl ov12_0223EE70
add r1, r5, r4
add r4, r4, #1
@ -7750,7 +7750,7 @@ _0223151C:
ldr r0, [r4]
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r6, #0x64
add r5, r0, #0
add r0, r6, #0
@ -7777,17 +7777,17 @@ _0223154E:
ldr r0, [r4]
mov r1, #0x13
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0x17
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #8]
ldr r0, [r4]
mov r1, #0x14
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r0, r6, #0
add r0, #0xa0
@ -7812,17 +7812,17 @@ _02231594:
ldr r0, [r4]
mov r1, #0x14
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0x13
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #8]
ldr r0, [r4]
mov r1, #0x15
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r0, r6, #0
add r0, #0xa0
@ -7847,17 +7847,17 @@ _022315DA:
ldr r0, [r4]
mov r1, #0x15
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0x14
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #8]
ldr r0, [r4]
mov r1, #0x16
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r0, r6, #0
add r0, #0xa1
@ -7882,17 +7882,17 @@ _02231620:
ldr r0, [r4]
mov r1, #0x16
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0x15
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #8]
ldr r0, [r4]
mov r1, #0x17
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r0, r6, #0
add r0, #0xa2
@ -7917,17 +7917,17 @@ _02231666:
ldr r0, [r4]
mov r1, #0x17
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0x16
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #8]
ldr r0, [r4]
mov r1, #0x13
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r0, r6, #0
add r0, #0xa0
@ -7954,7 +7954,7 @@ _022316B2:
ldr r0, [r4]
mov r1, #0x18
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #8]
add r1, r1, r7
add r1, r0, r1
@ -8951,7 +8951,7 @@ _02231E5E:
ldr r0, [r0, r1]
add r1, r4, #0
add r1, #0x36
bl GetMonData
bl Pokemon_GetData
lsl r1, r4, #1
add r2, sp, #0x3c
strh r0, [r2, r1]
@ -9369,7 +9369,7 @@ _022321A6:
ldr r0, [r1, r0]
add r1, r5, #0
add r1, #0x36
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022321C8
ldr r0, _0223220C ; =0x000002E1
@ -10201,7 +10201,7 @@ _022327EC:
ldr r0, [r0, r1]
add r1, r6, #0
add r1, #0x36
bl GetMonData
bl Pokemon_GetData
strh r0, [r5]
add r6, r6, #1
add r5, r5, #2
@ -11076,7 +11076,7 @@ _02232EB2:
ldr r0, [r0, r1]
add r1, r4, #0
add r1, #0x36
bl GetMonData
bl Pokemon_GetData
lsl r2, r4, #1
add r1, sp, #0x10
strh r0, [r1, r2]
@ -12221,7 +12221,7 @@ _022336D4:
mov r1, #5
ldr r0, [r0, r4]
mov r2, #0
bl GetMonData
bl Pokemon_GetData
bl ov08_0222A6C8
cmp r0, #1
bne _02233750
@ -12296,7 +12296,7 @@ _0223377C:
ldr r0, [r0]
mov r2, #0
ldr r0, [r0, r4]
bl GetMonData
bl Pokemon_GetData
bl ov08_0222A6C8
cmp r0, #1
bne _022337E6
@ -15395,7 +15395,7 @@ ov12_02235038: ; 0x02235038
ldr r0, [r1, r0]
ldr r2, [sp, #0x30]
mov r1, #0x76
bl GetMonData
bl Pokemon_GetData
ldr r1, [r5]
ldr r0, _022350E8 ; =0x00000123
ldrb r0, [r1, r0]
@ -16862,12 +16862,12 @@ _02235B9C:
ldr r0, [r6, r5]
mov r1, #0xb0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
ldr r0, [r6, r5]
mov r1, #0xb1
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r7, #7
beq _02235BBC
cmp r0, #7
@ -18438,7 +18438,7 @@ _02236736:
lsl r0, r0, #2
ldr r0, [r1, r0]
mov r1, #5
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0
ldr r0, [r4]
mov r2, #0
@ -18447,14 +18447,14 @@ _02236736:
lsl r0, r0, #2
ldr r0, [r1, r0]
mov r1, #0x6f
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
ldr r0, [r4]
ldr r1, [r0, #0xc]
ldrb r0, [r4, #0xd]
lsl r0, r0, #2
ldr r0, [r1, r0]
bl MonIsShiny
bl Pokemon_IsShiny
str r0, [sp, #0x20]
ldr r0, [r4]
mov r2, #0
@ -18463,7 +18463,7 @@ _02236736:
lsl r0, r0, #2
ldr r0, [r1, r0]
mov r1, #0x70
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x1c]
ldr r0, [r4]
ldr r1, [r0, #0xc]
@ -18472,7 +18472,7 @@ _02236736:
ldr r0, [r1, r0]
mov r1, #0
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #8]
ldr r0, [r4]
lsl r5, r5, #2
@ -18480,33 +18480,33 @@ _02236736:
mov r1, #5
ldr r0, [r0, r5]
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x18]
ldr r0, [r4]
mov r1, #0x6f
ldr r0, [r0, #0xc]
mov r2, #0
ldr r0, [r0, r5]
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x14]
ldr r0, [r4]
ldr r0, [r0, #0xc]
ldr r0, [r0, r5]
bl MonIsShiny
bl Pokemon_IsShiny
str r0, [sp, #0x10]
ldr r0, [r4]
mov r1, #0x70
ldr r0, [r0, #0xc]
mov r2, #0
ldr r0, [r0, r5]
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0
ldr r0, [r0, #0xc]
add r2, r1, #0
ldr r0, [r0, r5]
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #4]
mov r2, #0x47
mov r0, #0
@ -19010,7 +19010,7 @@ _02236BD0:
lsl r0, r0, #2
ldr r0, [r2, r0]
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x10]
ldr r0, _02236CF0 ; =0x000005DD
bl PlaySE
@ -23971,7 +23971,7 @@ _02239080:
ldr r0, [r0, r1]
add r1, r4, #0
add r1, #0x36
bl GetMonData
bl Pokemon_GetData
strh r0, [r5]
mov r0, #0x23
lsl r0, r0, #4
@ -27801,7 +27801,7 @@ _0223AC68:
lsl r0, r0, #2
ldr r0, [r1, r0]
mov r1, #5
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0
mov r0, #0x7f
str r0, [sp]
@ -43888,7 +43888,7 @@ _022428E6:
str r0, [sp, #0x10]
ldr r0, [r1, r0]
mov r1, #0x76
bl GetMonData
bl Pokemon_GetData
add r0, r5, #1
lsl r0, r0, #4
str r0, [sp, #0x14]
@ -47346,7 +47346,7 @@ _022443A4:
lsl r0, r0, #2
ldr r0, [r1, r0]
mov r1, #5
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0
mov r0, #0x7f
str r0, [sp]

134
arm9/overlays/14/asm/overlay_14.s
View File

@ -3868,7 +3868,7 @@ _021D9488:
bl PCStorage_GetMonByIndexPair
mov r1, #0xab
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
beq _021D94AE
mov r0, #0
@ -4718,13 +4718,13 @@ _021D9B9E:
add r0, r4, #0
mov r1, #0xac
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _021D9BD2
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021D9BD2
add r5, r5, #1
@ -5301,7 +5301,7 @@ _021DA042:
mov r1, #0xab
mov r2, #0
add r7, r0, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
beq _021DA080
ldr r4, _021DA164 ; =ov14_021E6224
@ -5460,7 +5460,7 @@ ov14_021DA168: ; 0x021DA168
add r0, r5, #0
mov r1, #0xac
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
bne _021DA1A8
mov r4, #0
@ -5470,7 +5470,7 @@ _021DA18C:
add r0, r5, #0
add r1, #0x36
add r2, r7, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r6, r0
bne _021DA1A2
mov r0, #1
@ -8518,7 +8518,7 @@ _021DB998:
beq _021DB9C4
mov r1, #0xab
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
beq _021DB9C4
mov r0, #1
@ -8739,7 +8739,7 @@ _021DBB36:
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x20]
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
beq _021DBB86
ldr r0, [sp, #0x20]
@ -9122,7 +9122,7 @@ ov14_021DBE34: ; 0x021DBE34
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x14]
bl ZeroBoxMonData
bl BoxPokemon_Init
mov r0, #1
strb r0, [r4, #0x13]
add r0, r4, #0
@ -9195,12 +9195,12 @@ ov14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strh r0, [r4, #4]
add r0, r5, #0
mov r1, #6
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strh r0, [r4, #6]
mov r0, #0x47
lsl r0, r0, #2
@ -9212,35 +9212,35 @@ ov14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
mov r1, #0xac
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strb r0, [r4, #0xf]
ldrh r0, [r4, #4]
mov r1, #9
bl AllocAndLoadMonPersonal
bl SpeciesData_NewFromSpecies
add r7, r0, #0
add r0, r5, #0
mov r1, #8
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r2, r0, #0
ldrh r1, [r4, #4]
add r0, r7, #0
bl CalcLevelBySpeciesAndExp_PreloadedPersonal
bl SpeciesData_CalcLevelByExp
strb r0, [r4, #0xa]
add r0, r5, #0
mov r1, #0xb
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strb r0, [r4, #0xb]
add r0, r5, #0
mov r1, #0xb0
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strb r0, [r4, #0xc]
add r0, r5, #0
mov r1, #0xb1
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strb r0, [r4, #0xd]
ldrb r0, [r4, #0xf]
cmp r0, #0
@ -9248,17 +9248,17 @@ ov14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
mov r1, #0xaf
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
beq _021DBF68
mov r1, #0
add r0, r5, #0
add r2, r1, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r2, r0, #0
ldrh r1, [r4, #4]
add r0, r7, #0
bl GetGenderBySpeciesAndPersonality_PreloadedPersonal
bl SpeciesData_GetGenderFromPersonality
strb r0, [r4, #0xe]
b _021DBF6C
_021DBF68:
@ -9268,7 +9268,7 @@ _021DBF6C:
ldr r2, [r4, #0x14]
add r0, r5, #0
mov r1, #0x76
bl GetBoxMonData
bl BoxPokemon_GetData
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _021DBF8C
@ -9302,7 +9302,7 @@ _021DBFAA:
bl ReadMsgDataIntoString
_021DBFB8:
add r0, r5, #0
bl GetBoxMonNature
bl BoxPokemon_GetNature
add r1, r0, #0
mov r0, #0x65
lsl r0, r0, #2
@ -9312,7 +9312,7 @@ _021DBFB8:
add r0, r5, #0
mov r1, #0xa
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r1, r0, #0
mov r0, #0x66
lsl r0, r0, #2
@ -9320,7 +9320,7 @@ _021DBFB8:
ldr r2, [r4, #0x24]
bl ReadMsgDataIntoString
add r0, r7, #0
bl FreeMonPersonal
bl SpeciesData_Free
ldr r1, [sp]
add r0, r5, #0
bl ReleaseBoxMonLock
@ -9378,112 +9378,112 @@ _021DC034:
ldr r0, [r5, r0]
mov r1, #0xa3
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0xa]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0xa4
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0xc]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0xa5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0xe]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0xa7
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x10]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0xa8
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x12]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0xa6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x14]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x13
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x16]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x14
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x18]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x15
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x1a]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x16
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x1c]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x17
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x1e]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x20]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x37
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x22]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x38
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x24]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x39
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x26]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strb r0, [r4, #7]
mov r0, #0x1a
lsl r0, r0, #4
@ -9557,7 +9557,7 @@ ov14_021DC1AC: ; 0x021DC1AC
ldr r0, [r4, #0x4c]
mov r1, #0xb
add r2, sp, #0
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0
bl ov14_021DC3CC
cmp r0, #0
@ -9623,12 +9623,12 @@ _021DC24A:
ldr r0, [r4]
mov r1, #6
add r2, sp, #0x1c
bl SetBoxMonData
bl BoxPokemon_SetData
_021DC254:
ldr r0, [r4]
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
ldr r1, _021DC274 ; =0x000001ED
cmp r0, r1
bne _021DC26A
@ -10215,7 +10215,7 @@ ov14_021DC58C: ; 0x021DC58C
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
bl GetBoxMonData
bl BoxPokemon_GetData
pop {r4, r5, r6, pc}
_021DC5B2:
ldrb r0, [r5, #0x1f]
@ -10224,13 +10224,13 @@ _021DC5B2:
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
bl GetBoxMonData
bl BoxPokemon_GetData
pop {r4, r5, r6, pc}
_021DC5C4:
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
bl GetMonData
bl Pokemon_GetData
pop {r4, r5, r6, pc}
thumb_func_start ov14_021DC5D0
@ -10245,13 +10245,13 @@ ov14_021DC5D0: ; 0x021DC5D0
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
bl GetBoxMonData
bl BoxPokemon_GetData
pop {r4, r5, r6, pc}
_021DC5EC:
ldr r0, [r5, #8]
add r1, r4, #0
add r2, r6, #0
bl GetMonData
bl Pokemon_GetData
pop {r4, r5, r6, pc}
thumb_func_start ov14_021DC5F8
@ -14333,7 +14333,7 @@ _021DE5FE:
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x34]
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
beq _021DE64E
add r0, r4, #0
@ -14434,7 +14434,7 @@ _021DE6D0:
mov r1, #5
mov r2, #0
add r7, r0, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
beq _021DE70A
ldr r1, _021DE724 ; =0x00005814
@ -14908,7 +14908,7 @@ _021DEA70:
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x20]
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
beq _021DEB02
ldrb r1, [r5, #2]
@ -15025,7 +15025,7 @@ _021DEB5C:
mov r1, #5
mov r2, #0
str r0, [sp, #0x2c]
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
beq _021DEBA0
add r0, r4, #0
@ -18877,21 +18877,21 @@ ov14_021E0940: ; 0x021E0940
add r0, r6, #0
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x18]
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x14]
add r0, r6, #0
mov r1, #0x70
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
lsl r0, r0, #0x18
lsr r7, r0, #0x18
add r0, r6, #0
@ -18905,12 +18905,12 @@ ov14_021E0940: ; 0x021E0940
add r0, r6, #0
mov r1, #6
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strh r0, [r4, #0x30]
add r0, r6, #0
mov r1, #0xb
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strh r0, [r4, #0x2e]
add r0, r4, #4
bl NNS_G2dInitImageProxy
@ -18992,14 +18992,14 @@ ov14_021E0A60: ; 0x021E0A60
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x10]
add r0, r6, #0
mov r1, #0x70
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0xc]
@ -19023,12 +19023,12 @@ ov14_021E0A60: ; 0x021E0A60
add r0, r6, #0
mov r1, #6
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strh r0, [r4, #0x30]
add r0, r6, #0
mov r1, #0xb
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strh r0, [r4, #0x2e]
add r0, r4, #4
bl NNS_G2dInitImageProxy
@ -21826,24 +21826,24 @@ _021E204A:
add r0, r5, #0
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r7, r0, #0
beq _021E20C8
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
bne _021E209A
add r0, r5, #0
mov r1, #0x70
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
add r0, r7, #0
mov r2, #0x1b ; BASE_COLOR
bl GetMonBaseStat_HandleFormConversion
mov r2, #0x1b ; SPECIES_DATA_BODY_COLOR
bl Species_GetFormValue
lsl r0, r0, #0x18
lsr r1, r0, #0x18
b _021E20AA

192
arm9/overlays/16/asm/overlay_16.s
View File

@ -2392,7 +2392,7 @@ _021D873A:
lsl r0, r5, #0x10
lsr r0, r0, #0x10
mov r1, #0
bl GetGenderBySpeciesAndPersonality
bl Species_GetGenderFromPersonality
add r4, r0, #0
_021D874E:
ldr r0, [sp, #0x40]
@ -30398,13 +30398,13 @@ ov16_021E5554: ; 0x021E5554
str r0, [sp, #0x30]
ldr r1, [sp, #0x30]
add r0, r7, #0
mov r2, #6 ; BASE_TYPE1
bl GetMonBaseStat_HandleFormConversion
mov r2, #6 ; SPECIES_DATA_TYPE_1
bl Species_GetFormValue
add r6, r0, #0
ldr r1, [sp, #0x30]
add r0, r7, #0
mov r2, #7 ; BASE_TYPE2
bl GetMonBaseStat_HandleFormConversion
mov r2, #7 ; SPECIES_DATA_TYPE_2
bl Species_GetFormValue
add r7, r0, #0
add r0, r6, #0
bl ov16_021E563C
@ -32777,9 +32777,9 @@ _021E66EC:
ov16_021E66F4: ; 0x021E66F4
push {r3, r4, r5, lr}
add r4, r1, #0
mov r1, #0x12 ; BASE_GENDER_RATIO
mov r1, #0x12 ; SPECIES_DATA_GENDER_RATIO
add r5, r0, #0
bl GetMonBaseStat
bl Species_GetValue
cmp r0, #0
bne _021E6708
mov r0, #1
@ -51063,7 +51063,7 @@ ov16_021EEFA4: ; 0x021EEFA4
ldr r0, [r4, #0x10]
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x6f
lsl r1, r1, #2
str r0, [r5, r1]
@ -51966,14 +51966,14 @@ ov16_021EF6E0: ; 0x021EF6E0
add r5, r0, #0
add r7, r1, #0
ldr r0, [sp, #0x60]
mov r1, #6 ; BASE_TYPE1
mov r1, #6 ; SPECIES_DATA_TYPE_1
str r2, [sp]
str r3, [sp, #4]
bl GetMonBaseStat
bl Species_GetValue
add r4, r0, #0
ldr r0, [sp, #0x60]
mov r1, #7 ; BASE_TYPE2
bl GetMonBaseStat
mov r1, #7 ; SPECIES_DATA_TYPE_2
bl Species_GetValue
add r6, r0, #0
add r0, r4, #0
bl ov16_021E563C
@ -55048,19 +55048,19 @@ _021F0E68:
beq _021F0EB6
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F0EB6
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F0EB6
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F0ECC ; =0x000001EE
cmp r0, r1
beq _021F0EB6
@ -55189,12 +55189,12 @@ _021F0F88:
sub r3, #0x80
add r7, r5, r3
ldrh r0, [r7, r6]
mov r1, #0x18 ; BASE_ABILITY_1
bl GetMonBaseStat
mov r1, #0x18 ; SPECIES_DATA_ABILITY_1
bl Species_GetValue
add r4, r0, #0
ldrh r0, [r7, r6]
mov r1, #0x19 ; BASE_ABILITY_2
bl GetMonBaseStat
mov r1, #0x19 ; SPECIES_DATA_ABILITY_2
bl Species_GetValue
add r6, r0, #0
cmp r4, #0
beq _021F0FC2
@ -55300,13 +55300,13 @@ _021F1046:
mul r1, r0
ldrh r0, [r6, r1]
str r1, [sp]
mov r1, #0x18 ; BASE_ABILITY_1
bl GetMonBaseStat
mov r1, #0x18 ; SPECIES_DATA_ABILITY_1
bl Species_GetValue
add r4, r0, #0
ldr r0, [sp]
mov r1, #0x19 ; BASE_ABILITY_2
mov r1, #0x19 ; SPECIES_DATA_ABILITY_2
ldrh r0, [r6, r0]
bl GetMonBaseStat
bl Species_GetValue
cmp r4, #0
beq _021F108C
cmp r0, #0
@ -55598,26 +55598,26 @@ _021F128E:
beq _021F12EA
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F12EA
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F12EA
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F1300 ; =0x000001EE
cmp r0, r1
beq _021F12EA
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x10]
tst r0, r1
beq _021F12EA
@ -55713,26 +55713,26 @@ _021F1382:
beq _021F13DE
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F13DE
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F13DE
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F13F4 ; =0x000001EE
cmp r0, r1
beq _021F13DE
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x10]
tst r0, r1
bne _021F13DE
@ -57095,12 +57095,12 @@ _021F1E2C:
beq _021F1E66
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
ldr r0, [sp, #0xc]
mov r1, #0xa3
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r7, r0
beq _021F1E66
ldr r0, [sp]
@ -57169,13 +57169,13 @@ _021F1ED6:
add r0, r5, #0
add r1, #0x3a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0
add r6, r0, #0
add r0, r5, #0
add r1, #0x42
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r6, r0
beq _021F1EFE
ldr r0, [sp, #4]
@ -57575,19 +57575,19 @@ _021F21D8:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F22A0
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F22A0
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F22C0 ; =0x000001EE
cmp r0, r1
beq _021F22A0
@ -57599,7 +57599,7 @@ _021F221E:
add r0, r6, #0
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5]
add r4, r4, #1
add r5, r5, #2
@ -57612,7 +57612,7 @@ _021F2238:
add r0, r6, #0
add r1, #0x46
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strb r0, [r4]
add r5, r5, #1
add r4, r4, #1
@ -57621,12 +57621,12 @@ _021F2238:
add r0, r6, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0
add r0, r6, #0
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, sp, #0x44
str r1, [sp]
lsl r1, r4, #0x10
@ -60085,7 +60085,7 @@ _021F3486:
add r0, r4, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r6, #0
@ -60098,7 +60098,7 @@ _021F34A2:
add r0, r4, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r6, #0
@ -60186,32 +60186,32 @@ _021F3530:
add r0, r4, #0
mov r1, #0x4b
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r5, r0, #0
add r0, r4, #0
mov r1, #0x4a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0
add r0, r4, #0
mov r1, #0x49
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r0, r4, #0
mov r1, #0x48
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #4]
add r0, r4, #0
mov r1, #0x46
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #8]
add r0, r4, #0
mov r1, #0x47
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r0, #0
lsl r2, r6, #0x1f
lsl r0, r5, #0x1f
@ -60418,19 +60418,19 @@ _021F36EC:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F37DE
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F37DE
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F3804 ; =0x000001EE
cmp r0, r1
beq _021F37DE
@ -60446,7 +60446,7 @@ _021F3730:
add r0, r6, #0
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x1c]
@ -60464,7 +60464,7 @@ _021F3730:
add r0, r6, #0
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x30]
add r0, r5, #0
add r1, r4, #0
@ -60720,19 +60720,19 @@ _021F3956:
mov r1, #0xa2
mov r2, #0
str r0, [sp, #0x50]
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F39BC
ldr r0, [sp, #0x50]
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F39BC
ldr r0, [sp, #0x50]
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F3B84 ; =0x000001EE
cmp r0, r1
beq _021F39BC
@ -60770,7 +60770,7 @@ _021F39C2:
ldr r0, [sp, #0x50]
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r7, r0, #0x10
ldr r0, [sp, #0x14]
@ -60800,7 +60800,7 @@ _021F39F2:
ldr r0, [sp, #0x50]
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x70]
add r0, r5, #0
add r1, r6, #0
@ -60864,7 +60864,7 @@ _021F3A7E:
ldr r0, [sp, #0x50]
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x80]
add r0, r5, #0
add r1, r4, #0
@ -60954,19 +60954,19 @@ _021F3B3C:
mov r1, #0xa2
mov r2, #0
str r0, [sp, #0x20]
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F3BBE
ldr r0, [sp, #0x20]
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F3BBE
ldr r0, [sp, #0x20]
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F3B84 ; =0x000001EE
cmp r0, r1
beq _021F3BBE
@ -61013,7 +61013,7 @@ _021F3BC4:
ldr r0, [sp, #0x20]
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r7, r0, #0x10
ldr r0, [sp, #0x14]
@ -61043,7 +61043,7 @@ _021F3BF4:
ldr r0, [sp, #0x20]
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x90]
add r0, r5, #0
add r1, r6, #0
@ -61109,7 +61109,7 @@ _021F3C82:
ldr r0, [sp, #0x20]
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0xa0]
add r0, r5, #0
add r1, r4, #0
@ -61475,19 +61475,19 @@ _021F3F62:
mov r1, #0xa2
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F3FE6
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F3FE6
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F3FFC ; =0x000001EE
cmp r0, r1
beq _021F3FE6
@ -61510,7 +61510,7 @@ _021F3F62:
add r0, r4, #0
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r1, r0, #0x18
ldr r0, [sp, #0x10]
@ -61628,19 +61628,19 @@ _021F4094:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F40FA
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F40FA
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F4254 ; =0x000001EE
cmp r0, r1
beq _021F40FA
@ -61689,12 +61689,12 @@ _021F40FC:
add r0, r6, #0
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x40]
add r0, r6, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r5, #0
@ -61705,12 +61705,12 @@ _021F40FC:
add r0, r6, #0
mov r1, #0xb0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r0, r6, #0
mov r1, #0xb1
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [sp, #0x40]
ldr r2, [sp, #0x38]
str r1, [sp]
@ -61735,7 +61735,7 @@ _021F4182:
add r0, r6, #0
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x20]
@ -61753,7 +61753,7 @@ _021F4182:
add r0, r6, #0
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F425C ; =0x0000306C
str r0, [sp, #0x4c]
ldrh r1, [r4, r1]
@ -62100,19 +62100,19 @@ _021F445C:
mov r1, #0xa2
mov r2, #0
add r4, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F44BA
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F44BA
add r0, r4, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F4598 ; =0x000001EE
cmp r0, r1
beq _021F44BA
@ -62328,7 +62328,7 @@ _021F462E:
bl ov11_02230014
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F4664
ldr r0, _021F4694 ; =0x0000219C
@ -62440,7 +62440,7 @@ _021F4704:
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x68]
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
beq _021F47E0
@ -62450,7 +62450,7 @@ _021F4704:
ldr r0, [sp, #0x68]
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F47E0
add r0, r4, #0
@ -62497,14 +62497,14 @@ _021F4704:
ldr r0, [sp, #0x68]
mov r1, #0xb0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x58]
ldr r0, [sp, #0x68]
mov r1, #0xb1
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x54]
@ -62562,7 +62562,7 @@ _021F480E:
add r0, r4, #0
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x3c]
@ -62580,7 +62580,7 @@ _021F480E:
add r0, r4, #0
mov r1, #0xa
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x70]
add r0, r5, #0
add r1, r6, #0
@ -62668,7 +62668,7 @@ _021F48E0:
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x1c]
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
beq _021F4900
@ -62681,7 +62681,7 @@ _021F4902:
ldr r0, [sp, #0x1c]
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F4A06
ldr r0, _021F4A20 ; =0x0000219C
@ -62723,7 +62723,7 @@ _021F4954:
ldr r0, [sp, #0x1c]
add r1, #0x36
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x8c]
@ -62896,19 +62896,19 @@ _021F4AA8:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F4AE6
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021F4AE6
add r0, r6, #0
mov r1, #0xad
mov r2, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, _021F4D70 ; =0x000001EE
cmp r0, r1
beq _021F4AE6

8
arm9/overlays/17/asm/overlay_17.s
View File

@ -8856,7 +8856,7 @@ ov17_021DB700: ; 0x021DB700
add r0, r4, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r0, r6, #0
add r1, r4, #0
mov r2, #2
@ -13208,7 +13208,7 @@ ov17_021DD6DC: ; 0x021DD6DC
lsl r0, r0, #2
str r1, [r4, r0]
ldr r0, [r5, #0x68]
bl AllocMonZeroed
bl Pokemon_New
mov r1, #0x8a
lsl r1, r1, #2
str r0, [r4, r1]
@ -13278,7 +13278,7 @@ ov17_021DD778: ; 0x021DD778
lsl r0, r0, #2
str r1, [r4, r0]
ldr r0, [r5, #0x68]
bl AllocMonZeroed
bl Pokemon_New
mov r1, #0x8a
lsl r1, r1, #2
str r0, [r4, r1]
@ -14501,7 +14501,7 @@ ov17_021DE0F4: ; 0x021DE0F4
add r3, r6, #0
bl BufferString
mov r0, #0xd
bl AllocMonZeroed
bl Pokemon_New
add r6, r0, #0
ldr r0, [r5, #4]
add r1, r6, #0

14
arm9/overlays/27/asm/overlay_27.s
View File

@ -301,27 +301,27 @@ _02254A62:
add r0, r4, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #8]
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0xa]
add r0, r4, #0
mov r1, #0xa3
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0xc]
add r0, r4, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0xe]
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02254ABC
mov r0, #1
@ -333,12 +333,12 @@ _02254ABE:
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strb r0, [r5, #0x12]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strb r0, [r5, #0x13]
add r0, r4, #0
add r1, r7, #0

12
arm9/overlays/28/asm/overlay_28.s
View File

@ -74,18 +74,18 @@ _022548D6:
mov r1, #0x4c
mov r2, #0
add r5, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _02254962
add r0, r5, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0xc]
add r0, r5, #0
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x10]
add r0, r5, #0
bl sub_0206B688
@ -93,7 +93,7 @@ _022548D6:
add r0, r5, #0
mov r1, #9
mov r2, #0
bl GetMonData
bl Pokemon_GetData
bl ov28_0225498C
cmp r0, #6
bhi _02254944
@ -747,8 +747,8 @@ _02254DDC:
bl GF_AssertFail
_02254DE0:
ldrh r0, [r4, #8]
mov r1, #0x1c ; BASE_FLIP
bl GetMonBaseStat
mov r1, #0x1c ; SPECIES_DATA_FLIP_SPRITE
bl Species_GetValue
mov r1, #0x59
lsl r1, r1, #2
strb r0, [r5, r1]

10
arm9/overlays/35/asm/overlay_35.s
View File

@ -326,18 +326,18 @@ _02254A7A:
add r0, r4, #0
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strh r0, [r6, #0x1c]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strh r0, [r6, #0x20]
ldr r0, [sp, #8]
bl ov05_021EC7B4
str r0, [r5, #0xc]
add r0, r4, #0
bl GetBoxMonGender
bl BoxPokemon_GetGender
str r0, [r5, #0x14]
ldr r1, [sp, #0xc]
add r0, r4, #0
@ -912,8 +912,8 @@ _02254F00:
cmp r0, #0
beq _02254F36
ldrh r0, [r6, #0x1c]
mov r1, #0x1c ; BASE_FLIP
bl GetMonBaseStat
mov r1, #0x1c ; SPECIES_DATA_FLIP_SPRITE
bl Species_GetValue
cmp r0, #0
ldr r0, [r7, #0x24]
beq _02254F30

8
arm9/overlays/39/asm/overlay_39.s
View File

@ -73,12 +73,12 @@ _022548CC:
add r0, r7, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x1c]
add r0, r7, #0
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r5, #0x28]
ldr r0, [sp, #4]
str r7, [r4, #0x48]
@ -995,8 +995,8 @@ ov39_02254FA4: ; 0x02254FA4
b _02254FCC
_02254FBA:
add r0, r7, #0
mov r1, #0x1c ; BASE_FLIP
bl GetMonBaseStat
mov r1, #0x1c ; SPECIES_DATA_FLIP_SPRITE
bl Species_GetValue
cmp r0, #0
beq _02254FCA
mov r1, #4

8
arm9/overlays/56/asm/overlay_56.s
View File

@ -225,13 +225,13 @@ _02211FA2:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _02211FC8
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _02211FC8
add r5, r5, #1
@ -2005,13 +2005,13 @@ _02212E52:
mov r1, #5
mov r2, #0
add r7, r0, #0
bl GetMonData
bl Pokemon_GetData
ldr r1, [r5, #4]
mov r2, #0
strh r0, [r1, r4]
add r0, r7, #0
mov r1, #6
bl GetMonData
bl Pokemon_GetData
ldr r1, [r5, #4]
add r6, r6, #1
add r1, r1, r4

30
arm9/overlays/62/asm/overlay_62.s
View File

@ -2207,17 +2207,17 @@ _0222E5EC:
add r0, r7, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x10]
add r0, r7, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x14]
add r0, r7, #0
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r1, r0, #0
ldr r0, [sp, #0x10]
ldr r2, [sp, #0x14]
@ -2993,7 +2993,7 @@ ov62_0222EC54: ; 0x0222EC54
ldr r0, [r0, #4]
mov r1, #0xa1
add r2, sp, #0xc
bl SetMonData
bl Pokemon_SetData
_0222EC80:
cmp r7, #0xff
beq _0222EC9A
@ -3006,7 +3006,7 @@ _0222EC80:
add r0, r1, r0
ldr r0, [r0, #4]
mov r1, #0xa1
bl SetMonData
bl Pokemon_SetData
_0222EC9A:
add r2, r5, #4
ldr r1, [r2, r6]
@ -4481,7 +4481,7 @@ _0222F83E:
mov r1, #0x4c
add r0, r7, #0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222F85C
ldr r1, _0222F86C ; =0x00000428
@ -5690,7 +5690,7 @@ ov62_022301AC: ; 0x022301AC
mov r1, #5
ldr r0, [r5, r0]
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0
ldr r0, _02230214 ; =0x00000428
mov r1, #2
@ -5738,11 +5738,11 @@ ov62_0223021C: ; 0x0223021C
mov r1, #5
ldr r0, [r5, r0]
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r4, r0, #0
ldr r0, _02230268 ; =0x00000428
ldr r0, [r5, r0]
bl GetMonNature
bl Pokemon_GetNature
add r6, r0, #0
mov r0, #0x6a
lsl r0, r0, #2
@ -6188,7 +6188,7 @@ _0223059A:
str r0, [sp, #0x9c]
ldr r0, _02230724 ; =0x00000428
ldr r0, [r4, r0]
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x8c]
add r0, sp, #0x7c
bl ov08_02229918
@ -6224,12 +6224,12 @@ _022305E2:
mov r1, #0xa1
ldr r0, [r4, r0]
add r2, sp, #0x18
bl SetMonData
bl Pokemon_SetData
ldr r0, _02230724 ; =0x00000428
mov r1, #0xaa
ldr r0, [r4, r0]
add r2, sp, #0x64
bl SetMonData
bl Pokemon_SetData
mov r0, #0x35
add r1, sp, #0x58
bl ov08_02228218
@ -6385,7 +6385,7 @@ _0223072C:
str r0, [sp, #0x50]
ldr r0, [r4, r1]
mov r1, #0x9a
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x40]
add r0, sp, #0x30
bl ov08_02229918
@ -6520,7 +6520,7 @@ _02230860:
add r2, r0, #0
add r0, r5, #0
mov r1, #0xaa
bl SetMonData
bl Pokemon_SetData
_022308A8:
mov r0, #0xf5
mov r1, #8
@ -7080,7 +7080,7 @@ ov62_02230D38: ; 0x02230D38
ldr r0, [r0, #4]
mov r1, #0xa1
add r2, sp, #0
bl SetMonData
bl Pokemon_SetData
_02230D5C:
mov r0, #0xff
str r0, [r4, r6]

2
arm9/overlays/64/asm/overlay_64.s
View File

@ -824,7 +824,7 @@ ov64_021D7BB4: ; 0x021D7BB4
add r4, r1, #0
lsr r0, r0, #0x10
mov r1, #0
bl GetGenderBySpeciesAndPersonality
bl Species_GetGenderFromPersonality
add r2, r0, #0
mov r0, #0
str r0, [sp]

12
arm9/overlays/65/asm/overlay_65.s
View File

@ -3372,23 +3372,23 @@ ov65_021D8F34: ; 0x021D8F34
str r0, [r4, #0x30]
ldr r0, [r4, #0x10]
ldr r0, [r0]
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #0x34]
ldr r0, [r4, #0x10]
ldr r0, [r0]
bl GetMonGender
bl Pokemon_GetGender
add r1, r4, #0
add r1, #0x37
strb r0, [r1]
ldr r0, [r4, #0x10]
ldr r0, [r0]
bl GetMonNature
bl Pokemon_GetNature
add r1, r4, #0
add r1, #0x36
strb r0, [r1]
ldrh r0, [r4, #0x34]
mov r1, #0x1c ; BASE_FLIP
bl GetMonBaseStat
mov r1, #0x1c ; SPECIES_DATA_FLIP_SPRITE
bl Species_GetValue
mov r1, #1
eor r1, r0
add r0, r4, #0
@ -3402,7 +3402,7 @@ ov65_021D8F34: ; 0x021D8F34
ldr r2, [r4, #0x3c]
ldr r0, [r0]
mov r1, #0x76
bl GetMonData
bl Pokemon_GetData
add r1, r4, #0
ldr r0, [r4, #0x10]
add r1, #0x36

4
arm9/overlays/67/asm/overlay_67.s
View File

@ -3298,7 +3298,7 @@ ov67_021D8F00: ; 0x021D8F00
str r3, [sp, #0xc]
mov r0, #0x2a
add r7, r1, #0
bl AllocMonZeroed
bl Pokemon_New
str r4, [sp]
mov r1, #0
str r1, [sp, #4]
@ -3307,7 +3307,7 @@ ov67_021D8F00: ; 0x021D8F00
add r1, r7, #0
mov r2, #1
mov r3, #0x20
bl CreateMonWithGenderNatureLetter
bl Pokemon_InitWithGenderNatureLetter
add r0, r6, #0
bl sub_020690E4
add r2, r0, #0

28
arm9/overlays/69/asm/overlay_69.s
View File

@ -64,7 +64,7 @@ _0222D63A:
bl Party_GetMonByIndex
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222D65E
ldr r0, [r4, #4]
@ -1233,14 +1233,14 @@ _0222DF98:
ldr r0, [sp, #0x2c]
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x81
lsl r1, r1, #2
str r0, [r5, r1]
mov r1, #0
ldr r0, [sp, #0x2c]
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
str r4, [sp]
str r0, [sp, #4]
mov r0, #1
@ -1268,7 +1268,7 @@ _0222DF98:
mov r1, #0
ldr r0, [sp, #0x2c]
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
str r4, [sp]
str r0, [sp, #4]
mov r0, #1
@ -2360,7 +2360,7 @@ HOF_MonGetUIStrings: ; 0x0222E8FC
mov r1, #0
bl BufferBoxMonSpeciesName
ldr r0, [r4, #0x24]
bl CalcMonLevel
bl Pokemon_CalcLevel
add r2, r0, #0
mov r0, #0
str r0, [sp]
@ -2370,7 +2370,7 @@ HOF_MonGetUIStrings: ; 0x0222E8FC
mov r3, #3
bl BufferIntegerAsString
ldr r0, [r4, #0x24]
bl GetMonGender
bl Pokemon_GetGender
cmp r0, #0
beq _0222E93C
cmp r0, #1
@ -2418,7 +2418,7 @@ _0222E982:
ldr r0, [r5, #0x24]
mov r1, #0x98
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0
ldr r0, [r5, #0x14]
mov r1, #0
@ -2480,7 +2480,7 @@ _0222E9FC:
ldr r0, [r4, #0x24]
ldr r2, [r4, #0x1c]
mov r1, #0x76
bl GetMonData
bl Pokemon_GetData
add r0, r4, #0
mov r1, #0x48
bl ov69_0222E89C
@ -4042,7 +4042,7 @@ HOF_MonGetMetLocationStringId: ; 0x0222F6C4
add r0, r4, #0
mov r1, #0x79
mov r2, #0
bl GetMonData
bl Pokemon_GetData
sub r1, r0, #1
cmp r1, #2
bhi _0222F6E8
@ -4063,7 +4063,7 @@ _0222F6FA:
add r0, r4, #0
mov r1, #0x6e
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _0222F70C
mov r5, #6
@ -4075,7 +4075,7 @@ _0222F70C:
add r0, r4, #0
mov r1, #7
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r7, r0
beq _0222F726
mov r5, #2
@ -4089,7 +4089,7 @@ _0222F726:
add r0, r4, #0
ldr r2, [r5, r2]
mov r1, #0x90
bl GetMonData
bl Pokemon_GetData
ldr r1, _0222F788 ; =0x00001B54
ldr r0, [r5, r1]
add r1, r1, #4
@ -4103,7 +4103,7 @@ _0222F750:
add r0, r4, #0
mov r1, #0x98
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r1, #0x7d
lsl r1, r1, #4
cmp r0, r1
@ -4114,7 +4114,7 @@ _0222F766:
add r0, r4, #0
mov r1, #0x92
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222F778
mov r5, #0

8
arm9/overlays/70/asm/overlay_70.s
View File

@ -469,7 +469,7 @@ ov70_021D77CC: ; 0x021D77CC
lsl r1, r1, #2
str r0, [r4, r1]
mov r0, #0x3d
bl AllocMonZeroed
bl Pokemon_New
mov r1, #0x66
lsl r1, r1, #2
str r0, [r4, r1]
@ -1191,7 +1191,7 @@ _021D7DC8:
bl AddTextPrinterParameterized
ldrh r0, [r7, #0x10]
ldr r1, [r7, #8]
bl GetGenderBySpeciesAndPersonality
bl Species_GetGenderFromPersonality
cmp r0, #0
beq _021D7E3A
cmp r0, #1
@ -1556,13 +1556,13 @@ _021D80F4:
ldrb r2, [r2]
ldr r0, [r7, r0]
mov r3, #0x20
bl CreateMon
bl Pokemon_InitWithParams
mov r0, #0x66
lsl r0, r0, #2
ldr r0, [r7, r0]
ldr r2, [sp, #0x1c]
mov r1, #0x70
bl SetMonData
bl Pokemon_SetData
mov r1, #0x66
lsl r1, r1, #2
ldr r1, [r7, r1]

42
arm9/overlays/71/asm/overlay_71.s
View File

@ -1348,37 +1348,37 @@ ov71_0222E118: ; 0x0222E118
add r0, r5, #0
mov r1, #0x9a
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strb r0, [r4, #4]
add r0, r5, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4]
add r0, r5, #0
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strb r0, [r4, #6]
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strb r0, [r4, #5]
add r0, r5, #0
mov r1, #0x6f
mov r2, #0
bl GetMonData
bl Pokemon_GetData
strh r0, [r4, #8]
add r0, r5, #0
mov r1, #0xa1
mov r2, #0
bl GetMonData
bl Pokemon_GetData
str r0, [r4, #0xc]
add r0, r5, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0
add r0, r5, #0
add r1, r7, #0
@ -1386,8 +1386,8 @@ ov71_0222E118: ; 0x0222E118
ldrh r0, [r4]
cmp r0, #0
beq _0222E18E
mov r1, #0x1c ; BASE_FLIP
bl GetMonBaseStat
mov r1, #0x1c ; SPECIES_DATA_FLIP_SPRITE
bl Species_GetValue
strh r0, [r4, #0xa]
_0222E18E:
cmp r6, #0
@ -2647,12 +2647,12 @@ ov71_0222EBFC: ; 0x0222EBFC
mov r1, #0
add r0, r6, #0
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
add r7, r0, #0
add r0, r6, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r3, #0
str r3, [sp]
mov r1, #0xa
@ -2697,7 +2697,7 @@ ov71_0222EC5C: ; 0x0222EC5C
bl Party_GetMonByIndex
mov r1, #0x76
add r2, r4, #0
bl GetMonData
bl Pokemon_GetData
add r0, r5, #0
mov r1, #0
bl FillWindowPixelBuffer
@ -2731,7 +2731,7 @@ _0222ECB6:
bl Party_GetMonByIndex
mov r1, #0x4d
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _0222ECCE
mov r0, #2
@ -2932,7 +2932,7 @@ _0222EE14:
bl Party_GetMonByIndex
mov r1, #0xa0
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
mov r0, #1
@ -2978,7 +2978,7 @@ _0222EEA6:
bl Party_GetMonByIndex
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r5, #0x20
lsl r0, r0, #0x10
lsl r4, r5, #4
@ -6320,10 +6320,10 @@ ov71_022309E8: ; 0x022309E8
add r6, r2, #0
str r3, [sp, #0xc]
ldr r5, [sp, #0x28]
bl AllocMonZeroed
bl Pokemon_New
add r7, r0, #0
mov r0, #0x1a
bl AllocMonZeroed
bl Pokemon_New
add r4, r0, #0
ldr r0, [sp, #4]
add r1, r6, #0
@ -6338,7 +6338,7 @@ ov71_022309E8: ; 0x022309E8
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
bne _02230A40
mov r1, #0x46
@ -6347,7 +6347,7 @@ ov71_022309E8: ; 0x022309E8
add r0, r4, #0
mov r1, #9
add r2, sp, #0x10
bl SetMonData
bl Pokemon_SetData
_02230A40:
bl sub_02031190
bl sub_0202DFA4
@ -6427,7 +6427,7 @@ ov71_02230AE4: ; 0x02230AE4
add r0, r4, #0
mov r1, #0x74
add r2, sp, #4
bl GetMonData
bl Pokemon_GetData
add r0, r5, #0
bl PlayerProfile_GetNamePtr
add r7, r0, #0
@ -6435,7 +6435,7 @@ ov71_02230AE4: ; 0x02230AE4
bl PlayerProfile_GetTrainerGender
add r5, r0, #0
add r0, r4, #0
bl GetMonGender
bl Pokemon_GetGender
add r3, r0, #0
mov r0, #0x1a
lsl r1, r5, #0x18

10
arm9/overlays/76/asm/overlay_76.s
View File

@ -801,7 +801,7 @@ ov76_021D7B2C: ; 0x021D7B2C
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x36
bl SetMonData
bl Pokemon_SetData
mov r0, #0
str r0, [sp]
ldr r1, [r4]
@ -809,7 +809,7 @@ ov76_021D7B2C: ; 0x021D7B2C
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x3e
bl SetMonData
bl Pokemon_SetData
add r0, r4, #0
bl ov76_021D8514
mov r1, #0
@ -820,7 +820,7 @@ ov76_021D7B2C: ; 0x021D7B2C
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x3a
bl SetMonData
bl Pokemon_SetData
ldr r0, [r4]
mov r1, #0
strb r1, [r0, #0x16]
@ -2028,7 +2028,7 @@ ov76_021D8524: ; 0x021D8524
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x36
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
pop {r3, pc}
@ -2131,7 +2131,7 @@ _021D85EC:
ldr r0, [r0]
add r1, #0x36
add r2, r6, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _021D8608
add r0, r4, #1

104
arm9/overlays/80/asm/overlay_80.s
View File

@ -4855,7 +4855,7 @@ ov80_0222FBC0: ; 0x0222FBC0
ldr r0, [sp, #0x48]
ldr r2, [sp, #0x1c]
mov r1, #0x76
bl GetBoxMonData
bl BoxPokemon_GetData
mov r2, #0
ldrsh r0, [r4, r2]
mov r1, #6
@ -4866,7 +4866,7 @@ ov80_0222FBC0: ; 0x0222FBC0
mov r0, #3
ldrsb r4, [r4, r0]
ldr r0, [sp, #0x48]
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x30]
add r0, r5, #0
mov r1, #0x46
@ -5058,12 +5058,12 @@ ov80_0222FD88: ; 0x0222FD88
mov r1, #0
add r0, r5, #0
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0
add r0, r5, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
mov r3, #0
str r3, [sp]
mov r1, #0xa
@ -6810,8 +6810,8 @@ _02230BD4:
ldrsh r0, [r4, r0]
cmp r0, #0
beq _02230C04
mov r1, #0x12 ; BASE_GENDER_RATIO
bl GetMonBaseStat
mov r1, #0x12 ; SPECIES_DATA_GENDER_RATIO
bl Species_GetValue
mov r1, #0xfe
lsl r1, r1, #4
ldr r2, [r4, r1]
@ -7820,8 +7820,8 @@ _0223138C:
mov r3, #2
bl ov80_02233EA4
add r0, r5, #0
mov r1, #0x12 ; BASE_GENDER_RATIO
bl GetMonBaseStat
mov r1, #0x12 ; SPECIES_DATA_GENDER_RATIO
bl Species_GetValue
mov r1, #0xfe
lsl r1, r1, #4
ldr r2, [r4, r1]
@ -9979,7 +9979,7 @@ _022325CE:
bl Party_GetMonByIndex
mov r1, #0xa1
add r2, r4, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022325FE
mov r0, #0xe
@ -10219,7 +10219,7 @@ _022327CE:
bl Party_GetMonByIndex
mov r1, #0xa1
add r2, r4, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
beq _022327FE
mov r0, #0xb
@ -10777,7 +10777,7 @@ ov80_02232BD4: ; 0x02232BD4
ov80_02232C2C: ; 0x02232C2C
push {r4, lr}
add r4, r1, #0
bl CalcBoxMonLevel
bl BoxPokemon_CalcLevel
strb r0, [r4, #3]
pop {r4, pc}
thumb_func_end ov80_02232C2C
@ -10836,34 +10836,34 @@ ov80_02232C88: ; 0x02232C88
add r0, r5, #0
mov r1, #0xab
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x1c]
add r0, r5, #0
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strh r0, [r6]
add r0, r5, #0
mov r1, #0x70
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x10]
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x14]
add r0, r5, #0
mov r1, #6
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x18]
ldrh r0, [r6]
mov r1, #0x6f
mov r2, #0
strh r0, [r4]
add r0, r5, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r0, r0, #1
strb r0, [r4, #2]
ldr r0, [sp, #0x14]
@ -11076,7 +11076,7 @@ _02232E4A:
ldr r0, [sp, #0x24]
mov r1, #0xa1
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0
ldr r0, _02232F90 ; =0x00000E54
beq _02232EB4
@ -11274,7 +11274,7 @@ _02233028:
ldrh r1, [r5]
add r0, r7, #0
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r6, r6, #1
add r4, r4, r0
add r5, r5, #2
@ -11305,7 +11305,7 @@ ov80_02233054: ; 0x02233054
_02233062:
mov r1, #0xab
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
bne _02233072
mov r0, #0
@ -11314,7 +11314,7 @@ _02233072:
add r0, r4, #0
mov r1, #0xac
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
beq _02233084
mov r0, #2
@ -11386,18 +11386,18 @@ ov80_022330E4: ; 0x022330E4
mov r1, #5
mov r2, #0
add r5, r0, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r1, sp, #0
strh r0, [r1]
add r0, r5, #0
mov r1, #0x6f
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r1, r0, #1
add r0, sp, #0
strb r1, [r0, #2]
add r0, r5, #0
bl CalcBoxMonLevel
bl BoxPokemon_CalcLevel
add r1, sp, #0
strb r0, [r1, #3]
add r0, sp, #0
@ -11418,7 +11418,7 @@ ov80_0223311C: ; 0x0223311C
ldr r0, [r0]
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r1, sp, #0
strh r0, [r1, #6]
add r0, r5, #0
@ -11426,14 +11426,14 @@ ov80_0223311C: ; 0x0223311C
ldr r0, [r0]
mov r1, #0x6f
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r1, r0, #1
add r0, sp, #0
strb r1, [r0, #8]
add r0, r5, #0
add r0, #0xbc
ldr r0, [r0]
bl CalcBoxMonLevel
bl BoxPokemon_CalcLevel
add r1, sp, #0
strb r0, [r1, #9]
add r0, r4, #0
@ -11459,13 +11459,13 @@ ov80_0223311C: ; 0x0223311C
mov r1, #5
mov r2, #0
add r5, r0, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r1, sp, #0
strh r0, [r1]
add r0, r5, #0
mov r1, #0x6f
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r0, r0, #1
add r1, sp, #0
strb r0, [r1, #2]
@ -11524,7 +11524,7 @@ ov80_022331F8: ; 0x022331F8
push {r3, lr}
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl ItemIdIsMail
@ -12477,8 +12477,8 @@ _0223398C:
ldr r0, _02233A5C ; =0x000005DC
bl PlaySE
add r0, r5, #0
mov r1, #0x12 ; BASE_GENDER_RATIO
bl GetMonBaseStat
mov r1, #0x12 ; SPECIES_DATA_GENDER_RATIO
bl Species_GetValue
mov r1, #0xfe
lsl r1, r1, #4
ldr r2, [r4, r1]
@ -13374,14 +13374,14 @@ ov80_022340DC: ; 0x022340DC
ldr r0, [sp, #0xc]
ldr r2, [sp, #0x18]
mov r1, #0x76
bl GetBoxMonData
bl BoxPokemon_GetData
ldr r0, [sp, #0xc]
mov r1, #0x6f
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r6, r0, #1
ldr r0, [sp, #0xc]
bl CalcBoxMonLevel
bl BoxPokemon_CalcLevel
str r0, [sp, #0x10]
add r0, r4, #0
mov r1, #0x64
@ -13467,7 +13467,7 @@ _022341CA:
ldr r0, [sp, #0xc]
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
strh r0, [r7]
ldr r0, [sp, #0x10]
strb r6, [r7, #2]
@ -15243,7 +15243,7 @@ _02234F38:
cmp r0, #0
beq _02234F9C
mov r0, #0x3e
bl AllocMonZeroed
bl Pokemon_New
add r5, r0, #0
ldr r0, [r4]
add r1, r5, #0
@ -15289,7 +15289,7 @@ _02234FA4:
cmp r0, #0
beq _02235006
mov r0, #0x3e
bl AllocMonZeroed
bl Pokemon_New
add r5, r0, #0
ldr r0, [r4]
add r1, r5, #0
@ -16064,7 +16064,7 @@ ov80_02235534: ; 0x02235534
cmp r0, #0x12
beq _02235590
mov r0, #0x3e
bl AllocMonZeroed
bl Pokemon_New
add r1, r5, #0
add r2, r5, #0
add r4, r0, #0
@ -16152,7 +16152,7 @@ ov80_022355F0: ; 0x022355F0
mov r1, #6
mov r2, #0
add r6, r3, #0
bl GetMonData
bl Pokemon_GetData
ldr r0, [r5]
add r1, r4, #0
ldr r0, [r0, #0x20]
@ -16175,7 +16175,7 @@ _02235624:
add r0, r4, #0
mov r1, #9
add r2, sp, #0
bl SetMonData
bl Pokemon_SetData
ldr r0, [r5]
ldr r0, [r0]
bl ov80_02235754
@ -16258,7 +16258,7 @@ _022356D2:
add r0, r4, #0
mov r1, #9
add r2, sp, #0
bl SetMonData
bl Pokemon_SetData
ldr r0, [sp, #0x20]
cmp r0, #0x12
bne _02235706
@ -16364,9 +16364,9 @@ ov80_022357A0: ; 0x022357A0
add r0, r4, #0
mov r1, #0x74
add r2, sp, #4
bl GetMonData
bl Pokemon_GetData
add r0, r4, #0
bl GetMonGender
bl Pokemon_GetGender
add r3, r0, #0
mov r0, #0x3e
str r0, [sp]
@ -17194,7 +17194,7 @@ ov80_02235E08: ; 0x02235E08
push {r4, lr}
add r4, r0, #0
mov r0, #0x3e
bl AllocMonZeroed
bl Pokemon_New
mov r1, #1
lsl r1, r1, #0xc
str r0, [r4, r1]
@ -17434,7 +17434,7 @@ _02235FDE:
mov r1, #6
mov r2, #0
add r7, r0, #0
bl GetMonData
bl Pokemon_GetData
add r3, r0, #0
add r0, sp, #0x30
lsl r3, r3, #0x10
@ -17493,7 +17493,7 @@ _02236068:
bl ov80_022361E8
add r7, r0, #0
mov r0, #0x3e
bl AllocMonZeroed
bl Pokemon_New
str r0, [sp, #0x20]
ldr r0, [r4]
ldr r1, [sp, #0x20]
@ -17502,30 +17502,30 @@ _02236068:
add r0, r7, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r5, r0, #0
ldr r0, [sp, #0x20]
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
cmp r5, r0
bne _022360B6
mov r1, #0
add r0, r7, #0
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
add r5, r0, #0
mov r1, #0
ldr r0, [sp, #0x20]
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
cmp r5, r0
beq _02236126
_022360B6:
add r0, r7, #0
mov r1, #6
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r3, r0, #0
add r0, sp, #0x2c
lsl r3, r3, #0x10

18
arm9/overlays/81/asm/overlay_81.s
View File

@ -136,7 +136,7 @@ _02237F22:
mov r1, #5
ldr r0, [r0]
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
mov r1, #0x53
lsl r1, r1, #2
strh r0, [r4, r1]
@ -144,7 +144,7 @@ _02237F22:
mov r1, #5
ldr r0, [r0, #4]
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
ldr r1, _02237FD8 ; =0x0000014E
strh r0, [r4, r1]
mov r0, #0
@ -197,9 +197,9 @@ ov81_02237FE8: ; 0x02237FE8
push {r3, lr}
mov r1, #5
mov r2, #0
bl GetBoxMonData
mov r1, #0x1c ; BASE_FLIP
bl GetMonBaseStat
bl BoxPokemon_GetData
mov r1, #0x1c ; SPECIES_DATA_FLIP_SPRITE
bl Species_GetValue
cmp r0, #0
bne _02238000
mov r0, #1
@ -1008,12 +1008,12 @@ _02238610:
mov r1, #0
add r0, r4, #0
add r2, r1, #0
bl GetBoxMonData
bl BoxPokemon_GetData
str r0, [sp, #0x1c]
add r0, r4, #0
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
lsl r0, r0, #0x10
ldr r1, [sp, #0x58]
lsr r0, r0, #0x10
@ -2514,7 +2514,7 @@ _02239138:
bl ov81_02238818
mov r1, #0x4c
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
bne _0223918A
ldr r0, [r4, #0x10]
@ -9501,7 +9501,7 @@ _0223C8D6:
bl ov81_02238820
mov r1, #0x4c
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0
bne _0223C902
ldr r0, [r4]

162
arm9/overlays/83/asm/overlay_83.s
View File

@ -21811,7 +21811,7 @@ ov83_02237EDC: ; 0x02237EDC
add r1, r0, #0
lsl r0, r4, #0x10
lsr r0, r0, #0x10
bl CalcLevelBySpeciesAndExp
bl Species_CalcLevelByExp
pop {r3, r4, r5, pc}
thumb_func_end ov83_02237EDC
@ -21822,7 +21822,7 @@ ov83_02237F04: ; 0x02237F04
add r0, r1, #0
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, #0
@ -21831,8 +21831,8 @@ ov83_02237F04: ; 0x02237F04
bl AGB_GetBoxMonData
add r6, r0, #0
add r0, r5, #0
mov r1, #0x19 ; BASE_ABILITY_2
bl GetMonBaseStat
mov r1, #0x19 ; SPECIES_DATA_ABILITY_2
bl Species_GetValue
cmp r0, #0
beq _02237F5E
ldr r2, _02237F68 ; =ov83_SpeciesWithAbilityOverridesList
@ -21842,8 +21842,8 @@ _02237F32:
cmp r5, r1
bne _02237F42
add r0, r5, #0
mov r1, #0x18 ; BASE_ABILITY_1
bl GetMonBaseStat
mov r1, #0x18 ; SPECIES_DATA_ABILITY_1
bl Species_GetValue
b _02237F4A
_02237F42:
add r4, r4, #1
@ -21857,13 +21857,13 @@ _02237F4A:
tst r1, r6
bne _02237F66
add r0, r5, #0
mov r1, #0x18 ; BASE_ABILITY_1
bl GetMonBaseStat
mov r1, #0x18 ; SPECIES_DATA_ABILITY_1
bl Species_GetValue
pop {r4, r5, r6, pc}
_02237F5E:
add r0, r5, #0
mov r1, #0x18 ; BASE_ABILITY_1
bl GetMonBaseStat
mov r1, #0x18 ; SPECIES_DATA_ABILITY_1
bl Species_GetValue
_02237F66:
pop {r4, r5, r6, pc}
.align 2, 0
@ -21877,7 +21877,7 @@ MigrateBoxMon: ; 0x02237F6C
add r4, r1, #0
add r6, r0, #0
add r0, r4, #0
bl ZeroBoxMonData
bl BoxPokemon_Init
add r0, r4, #0
bl AcquireBoxMonLock
mov r1, #0
@ -21889,7 +21889,7 @@ MigrateBoxMon: ; 0x02237F6C
add r0, r4, #0
mov r1, #0
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0xb
mov r2, #0
@ -21900,7 +21900,7 @@ MigrateBoxMon: ; 0x02237F6C
add r0, r4, #0
mov r1, #5
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0xc
mov r2, #0
@ -21916,7 +21916,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #6
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #1
mov r2, #0
@ -21925,7 +21925,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #7
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x19
mov r2, #0
@ -21934,13 +21934,13 @@ _02237FCE:
add r0, r4, #0
mov r1, #8
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
mov r0, #0x46
str r0, [sp, #8]
add r0, r4, #0
mov r1, #9
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
add r1, r4, #0
bl ov83_02237F04
@ -21948,7 +21948,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xa
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #8
mov r2, #0
@ -21957,7 +21957,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xb
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #3
mov r2, #0
@ -21966,7 +21966,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xc
add r2, sp, #4
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x1a
mov r2, #0
@ -21975,7 +21975,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xd
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x1b
mov r2, #0
@ -21984,7 +21984,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xe
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x1c
mov r2, #0
@ -21993,7 +21993,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xf
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x1d
mov r2, #0
@ -22002,7 +22002,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x10
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x1e
mov r2, #0
@ -22011,7 +22011,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x11
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x1f
mov r2, #0
@ -22020,7 +22020,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x12
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x16
mov r2, #0
@ -22029,7 +22029,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x13
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x17
mov r2, #0
@ -22038,7 +22038,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x14
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x18
mov r2, #0
@ -22047,7 +22047,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x15
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x21
mov r2, #0
@ -22056,7 +22056,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x16
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x2f
mov r2, #0
@ -22065,7 +22065,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x17
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x30
mov r2, #0
@ -22074,7 +22074,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x18
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
mov r5, #0
add r7, r5, #0
_0223815E:
@ -22088,7 +22088,7 @@ _0223815E:
add r0, r4, #0
add r1, #0x36
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x15
mov r2, #0
@ -22103,18 +22103,18 @@ _0223815E:
add r0, r4, #0
add r1, #0x3e
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r1, r5, #0
add r0, r4, #0
add r1, #0x42
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
add r1, r5, #0
str r0, [sp, #8]
add r0, r4, #0
add r1, #0x3a
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r5, r5, #1
add r7, r7, #2
cmp r5, #4
@ -22127,7 +22127,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x46
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x28
mov r2, #0
@ -22136,7 +22136,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x47
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x29
mov r2, #0
@ -22145,7 +22145,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x48
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x2a
mov r2, #0
@ -22154,7 +22154,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x49
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x2b
mov r2, #0
@ -22163,7 +22163,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x4a
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x2c
mov r2, #0
@ -22172,7 +22172,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x4b
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x2d
mov r2, #0
@ -22181,7 +22181,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x4c
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x32
mov r2, #0
@ -22199,7 +22199,7 @@ _0223826C:
add r0, r4, #0
add r1, #0x4e
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r5, r5, #1
cmp r5, r7
blt _0223826C
@ -22221,7 +22221,7 @@ _02238298:
add r0, r4, #0
add r1, #0x52
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r5, r5, #1
cmp r5, r7
blt _02238298
@ -22243,7 +22243,7 @@ _022382C4:
add r0, r4, #0
add r1, #0x56
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r5, r5, #1
cmp r5, r7
blt _022382C4
@ -22265,7 +22265,7 @@ _022382F0:
add r0, r4, #0
add r1, #0x5a
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r5, r5, #1
cmp r5, r7
blt _022382F0
@ -22287,7 +22287,7 @@ _0223831C:
add r0, r4, #0
add r1, #0x5e
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r5, r5, #1
cmp r5, r7
blt _0223831C
@ -22300,7 +22300,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x62
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x44
mov r2, #0
@ -22309,7 +22309,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x63
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x45
mov r2, #0
@ -22318,7 +22318,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x64
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x46
mov r2, #0
@ -22327,7 +22327,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x65
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x47
mov r2, #0
@ -22336,7 +22336,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x66
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x48
mov r2, #0
@ -22345,7 +22345,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x67
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x49
mov r2, #0
@ -22354,7 +22354,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x68
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x4a
mov r2, #0
@ -22363,7 +22363,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x69
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x4b
mov r2, #0
@ -22372,7 +22372,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6a
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
@ -22381,7 +22381,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6b
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x4d
mov r2, #0
@ -22390,7 +22390,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6c
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x4e
mov r2, #0
@ -22399,7 +22399,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6d
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x50
mov r2, #0
@ -22408,18 +22408,18 @@ _02238332:
add r0, r4, #0
mov r1, #0x6e
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0
bl GetBoxMonGender
bl BoxPokemon_GetGender
str r0, [sp, #8]
add r0, r4, #0
mov r1, #0x6f
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r4, #0
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0xc9
bne _022384AE
mov r1, #0
@ -22449,12 +22449,12 @@ _02238332:
add r0, r4, #0
mov r1, #0x70
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
_022384AE:
add r0, r4, #0
mov r1, #5
mov r2, #0
bl GetBoxMonData
bl BoxPokemon_GetData
ldr r1, _022385F0 ; =0x00000182
cmp r0, r1
bne _022384FE
@ -22494,7 +22494,7 @@ _022384F4:
add r0, r4, #0
mov r1, #0x70
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
_022384FE:
add r0, r6, #0
mov r1, #2
@ -22508,7 +22508,7 @@ _022384FE:
add r0, r4, #0
mov r1, #0x75
add r2, sp, #0xc
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #3
mov r2, #0
@ -22522,7 +22522,7 @@ _022384FE:
add r0, r4, #0
mov r1, #0x4d
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
_0223853E:
add r0, r6, #0
mov r1, #0x25
@ -22532,7 +22532,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x79
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #7
add r2, sp, #0x24
@ -22545,7 +22545,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x8f
add r2, sp, #0xc
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x23
mov r2, #0
@ -22554,7 +22554,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x98
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x22
mov r2, #0
@ -22563,7 +22563,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x99
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x26
mov r2, #0
@ -22572,7 +22572,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x9a
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x24
mov r2, #0
@ -22581,7 +22581,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x9b
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
add r0, r6, #0
mov r1, #0x31
mov r2, #0
@ -22590,7 +22590,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x9c
add r2, sp, #8
bl SetBoxMonData
bl BoxPokemon_SetData
ldr r1, [sp]
add r0, r4, #0
bl ReleaseBoxMonLock
@ -23898,10 +23898,10 @@ ov83_02238F94: ; 0x02238F94
add r7, r2, #0
add r6, r3, #0
ldr r4, [sp, #0x40]
bl GetMonGender
bl Pokemon_GetGender
str r0, [sp, #0x24]
ldr r0, [sp, #0x20]
bl MonIsShiny
bl Pokemon_IsShiny
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp]
@ -23921,7 +23921,7 @@ ov83_02238F94: ; 0x02238F94
mov r1, #0
ldr r0, [sp, #0x20]
add r2, r1, #0
bl GetMonData
bl Pokemon_GetData
mov r3, #0
str r3, [sp]
mov r1, #0xa
@ -24040,12 +24040,12 @@ _022390C2:
add r0, r4, #0
mov r1, #5
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0
add r0, r4, #0
mov r1, #0x70
mov r2, #0
bl GetMonData
bl Pokemon_GetData
add r2, r0, #0
mov r0, #0xe9
lsl r0, r0, #4

8
arm9/src/daycare.c
View File

@ -12,8 +12,8 @@ u32 Save_Daycare_sizeof(void) {
void Save_Daycare_Init(Daycare *daycare) {
memset(daycare, 0, sizeof(Daycare));
ZeroBoxMonData(&daycare->mons[0].mon);
ZeroBoxMonData(&daycare->mons[1].mon);
BoxPokemon_Init(&daycare->mons[0].mon);
BoxPokemon_Init(&daycare->mons[1].mon);
daycare->egg_pid = 0;
daycare->egg_cycles = 0;
}
@ -67,7 +67,7 @@ BOOL Save_Daycare_MasudaCheck(Daycare *daycare) {
// Uses language as a proxy for country, even though it
// only accounts for European languages and Japanese.
// If true, shiny odds are increased.
return GetBoxMonData(&daycare->mons[0].mon, MON_DATA_LANGUAGE, NULL) != GetBoxMonData(&daycare->mons[1].mon, MON_DATA_LANGUAGE, NULL);
return BoxPokemon_GetData(&daycare->mons[0].mon, MON_DATA_LANGUAGE, NULL) != BoxPokemon_GetData(&daycare->mons[1].mon, MON_DATA_LANGUAGE, NULL);
}
void DaycareMon_Copy(DaycareMon *dest, const DaycareMon *src) {
@ -90,7 +90,7 @@ void DaycareMon_Extras_Init(DaycareMail *mail) {
}
void DaycareMon_Init(DaycareMon *mon) {
ZeroBoxMonData(&mon->mon);
BoxPokemon_Init(&mon->mon);
mon->steps = 0;
DaycareMon_Extras_Init(&mon->mail);
}

8
arm9/src/encounter.c
View File

@ -762,7 +762,7 @@ static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8);
} else if (winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0);
if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) {
if (Pokedex_ConvertToCurrentDexNo(FALSE, Pokemon_GetData(mon, MON_DATA_SPECIES, NULL)) != 0) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9);
} else {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK10);
@ -774,7 +774,7 @@ static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup) {
}
} else if ((battleType & BATTLE_TYPE_SAFARI || battleType & BATTLE_TYPE_PAL_PARK) && winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0);
if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) {
if (Pokedex_ConvertToCurrentDexNo(FALSE, Pokemon_GetData(mon, MON_DATA_SPECIES, NULL)) != 0) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9);
} else {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK10);
@ -797,10 +797,10 @@ static void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup) {
return;
}
mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0);
sub_02028AD4(fieldSystem->unk98, sub_0202920C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2);
sub_02028AD4(fieldSystem->unk98, sub_0202920C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), Pokemon_GetData(mon, MON_DATA_SPECIES, NULL), Pokemon_GetData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2);
} else if (winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
mon = Party_GetMonByIndex(setup->party[setup->unk170], 0);
sub_02028AD4(fieldSystem->unk98, sub_0202918C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2);
sub_02028AD4(fieldSystem->unk98, sub_0202918C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), Pokemon_GetData(mon, MON_DATA_SPECIES, NULL), Pokemon_GetData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2);
}
} else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_INGAME_PARTNER)) {
if (winFlag == BATTLE_OUTCOME_WIN) {

24
arm9/src/hall_of_fame.c
View File

@ -30,20 +30,20 @@ void Save_HOF_RecordParty(struct HallOfFame *hof, struct Party *party, RTCDate *
for (i = 0, j = 0; i < nmons; i++) {
struct Pokemon *mon = Party_GetMonByIndex(party, i);
BOOL lock = AcquireMonLock(mon);
if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) {
hof_party->party[j].species = (u16)GetMonData(mon, MON_DATA_SPECIES, NULL);
hof_party->party[j].level = (u8)GetMonData(mon, MON_DATA_LEVEL, NULL);
hof_party->party[j].form = (u8)GetMonData(mon, MON_DATA_FORM, NULL);
hof_party->party[j].personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL);
hof_party->party[j].otid = GetMonData(mon, MON_DATA_OT_ID, NULL);
hof_party->party[j].moves[0] = (u16)GetMonData(mon, MON_DATA_MOVE1, NULL);
hof_party->party[j].moves[1] = (u16)GetMonData(mon, MON_DATA_MOVE2, NULL);
hof_party->party[j].moves[2] = (u16)GetMonData(mon, MON_DATA_MOVE3, NULL);
hof_party->party[j].moves[3] = (u16)GetMonData(mon, MON_DATA_MOVE4, NULL);
if (!Pokemon_GetData(mon, MON_DATA_IS_EGG, NULL)) {
hof_party->party[j].species = (u16)Pokemon_GetData(mon, MON_DATA_SPECIES, NULL);
hof_party->party[j].level = (u8)Pokemon_GetData(mon, MON_DATA_LEVEL, NULL);
hof_party->party[j].form = (u8)Pokemon_GetData(mon, MON_DATA_FORM, NULL);
hof_party->party[j].personality = Pokemon_GetData(mon, MON_DATA_PERSONALITY, NULL);
hof_party->party[j].otid = Pokemon_GetData(mon, MON_DATA_OT_ID, NULL);
hof_party->party[j].moves[0] = (u16)Pokemon_GetData(mon, MON_DATA_MOVE1, NULL);
hof_party->party[j].moves[1] = (u16)Pokemon_GetData(mon, MON_DATA_MOVE2, NULL);
hof_party->party[j].moves[2] = (u16)Pokemon_GetData(mon, MON_DATA_MOVE3, NULL);
hof_party->party[j].moves[3] = (u16)Pokemon_GetData(mon, MON_DATA_MOVE4, NULL);
if (str != NULL) {
GetMonData(mon, MON_DATA_NICKNAME_STRING, str);
Pokemon_GetData(mon, MON_DATA_NICKNAME_STRING, str);
CopyStringToU16Array(str, hof_party->party[j].nickname, POKEMON_NAME_LENGTH + 1);
GetMonData(mon, MON_DATA_OT_NAME_STRING, str);
Pokemon_GetData(mon, MON_DATA_OT_NAME_STRING, str);
CopyStringToU16Array(str, hof_party->party[j].otname, PLAYER_NAME_LENGTH + 1);
} else {
hof_party->party[j].nickname[0] = EOS;

6
arm9/src/mail.c
View File

@ -64,9 +64,9 @@ void Mail_SetNewMessageDetails(struct Mail *mail, u8 type, u8 monIdx, struct Sav
for (i = 0; monIdx < Party_GetCount(party); monIdx++) {
union MailPatternData *ptr;
pokemon = Party_GetMonByIndex(party, monIdx);
species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL);
is_egg = (BOOL)GetMonData(pokemon, MON_DATA_IS_EGG, NULL);
form = GetMonData(pokemon, MON_DATA_FORM, NULL);
species = (u16)Pokemon_GetData(pokemon, MON_DATA_SPECIES, NULL);
is_egg = (BOOL)Pokemon_GetData(pokemon, MON_DATA_IS_EGG, NULL);
form = Pokemon_GetData(pokemon, MON_DATA_FORM, NULL);
sp10 = sub_0206B6C8(pokemon);
r7 = sub_0206B7BC(species, form, is_egg);
ptr = &mail->unk_18[i];

8
arm9/src/message_format.c
View File

@ -138,13 +138,13 @@ void BufferFriendsName(MessageFormat *messageFormat, u32 idx, struct SaveData *s
void BufferBoxMonSpeciesName(MessageFormat *messageFormat, u32 idx, struct BoxPokemon *mon) {
struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, messageFormat->heapId);
ReadMsgDataIntoString(msgData, GetBoxMonData(mon, MON_DATA_SPECIES, NULL), messageFormat->buffer);
ReadMsgDataIntoString(msgData, BoxPokemon_GetData(mon, MON_DATA_SPECIES, NULL), messageFormat->buffer);
SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL);
DestroyMsgData(msgData);
}
void BufferBoxMonSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, struct BoxPokemon *mon) {
BufferSpeciesNameWithArticle(messageFormat, idx, GetBoxMonData(mon, MON_DATA_SPECIES, NULL));
BufferSpeciesNameWithArticle(messageFormat, idx, BoxPokemon_GetData(mon, MON_DATA_SPECIES, NULL));
}
void BufferSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 species) {
@ -155,12 +155,12 @@ void BufferSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 spe
}
void BufferBoxMonNickname(MessageFormat *messageFormat, u32 idx, struct BoxPokemon *mon) {
GetBoxMonData(mon, MON_DATA_NICKNAME_STRING, messageFormat->buffer);
BoxPokemon_GetData(mon, MON_DATA_NICKNAME_STRING, messageFormat->buffer);
SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL);
}
void BufferBoxMonOTName(MessageFormat *messageFormat, u32 idx, struct BoxPokemon *mon) {
GetBoxMonData(mon, MON_DATA_OT_NAME_STRING, messageFormat->buffer);
BoxPokemon_GetData(mon, MON_DATA_OT_NAME_STRING, messageFormat->buffer);
SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL);
}

8
arm9/src/move_relearner.c
View File

@ -15,13 +15,13 @@ void MoveRelearner_Delete(MoveRelearner *moveRelearner) {
}
u16 *MoveRelearner_GetEligibleLevelUpMoves(Pokemon *mon, HeapID heapId) {
u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
u8 form = GetMonData(mon, MON_DATA_FORM, NULL);
u8 level = GetMonData(mon, MON_DATA_LEVEL, NULL);
u16 species = Pokemon_GetData(mon, MON_DATA_SPECIES, NULL);
u8 form = Pokemon_GetData(mon, MON_DATA_FORM, NULL);
u8 level = Pokemon_GetData(mon, MON_DATA_LEVEL, NULL);
u16 moves[MAX_MON_MOVES];
for (u8 i = 0; i < MAX_MON_MOVES; ++i) {
moves[i] = GetMonData(mon, MON_DATA_MOVE1 + i, NULL);
moves[i] = Pokemon_GetData(mon, MON_DATA_MOVE1 + i, NULL);
}
u16 *tableFromFile = AllocFromHeap(heapId, LEVEL_UP_LEARNSET_MAX * 2);

8
arm9/src/party.c
View File

@ -28,7 +28,7 @@ void Party_InitWithMaxSize(struct Party *party, int count) {
party->curCount = 0;
party->maxCount = count;
for (i = 0; i < PARTY_SIZE; i++) {
ZeroMonData(&party->mons[i]);
Pokemon_Init(&party->mons[i]);
}
}
@ -53,7 +53,7 @@ BOOL Party_RemoveMon(struct Party *party, int pos) {
party->mons[i] = party->mons[i + 1];
}
ZeroMonData(&party->mons[i]);
Pokemon_Init(&party->mons[i]);
party->curCount--;
return TRUE;
}
@ -74,7 +74,7 @@ void ReplacePartySlotWithMon(struct Party *party, int pos, struct Pokemon *pokem
GF_ASSERT(pos >= 0);
GF_ASSERT(pos < party->curCount);
GF_ASSERT(pos < party->maxCount);
r2 = (int)(GetMonData(&party->mons[pos], MON_DATA_SPECIES_EXISTS, NULL) - GetMonData(pokemon, MON_DATA_SPECIES_EXISTS, NULL));
r2 = (int)(Pokemon_GetData(&party->mons[pos], MON_DATA_SPECIES_EXISTS, NULL) - Pokemon_GetData(pokemon, MON_DATA_SPECIES_EXISTS, NULL));
party->mons[pos] = *pokemon;
party->curCount += r2;
}
@ -102,7 +102,7 @@ void CopyParty(struct Party *src, struct Party *dest) {
BOOL Party_HasMon(struct Party *party, u16 species) {
int i;
for (i = 0; i < party->curCount; i++) {
if (species == GetMonData(&party->mons[i], MON_DATA_SPECIES, NULL)) {
if (species == Pokemon_GetData(&party->mons[i], MON_DATA_SPECIES, NULL)) {
break;
}
}

26
arm9/src/pokedex.c
View File

@ -187,7 +187,7 @@ BOOL Pokedex_HasSeenDeoxysForm(struct Pokedex *pokedex, u32 state) {
}
void Pokedex_TrySetSeenDeoxysForm(struct Pokedex *pokedex, u16 species, struct Pokemon *pokemon) {
u8 form = (u8)GetMonData(pokemon, MON_DATA_FORM, NULL);
u8 form = (u8)Pokemon_GetData(pokemon, MON_DATA_FORM, NULL);
if (species == SPECIES_DEOXYS && !Pokedex_HasSeenDeoxysForm(pokedex, form)) {
s32 r2 = Pokedex_CountSeenDeoxysForms_Internal(pokedex);
Pokedex_SetSeenDeoxysFormAt(pokedex, form, (u8)r2);
@ -240,13 +240,13 @@ void Pokedex_SetMonSeenForm(struct Pokedex *pokedex, u16 species, struct Pokemon
if (species == SPECIES_UNOWN) {
SetSeenUnownLetter(pokedex, species, GetMonUnownLetter(pokemon));
} else if (species == SPECIES_BURMY) {
Pokedex_SetSeenBurmyOrWormadamForm(pokedex, species, (s32)GetMonData(pokemon, MON_DATA_FORM, NULL));
Pokedex_SetSeenBurmyOrWormadamForm(pokedex, species, (s32)Pokemon_GetData(pokemon, MON_DATA_FORM, NULL));
} else if (species == SPECIES_WORMADAM) {
Pokedex_SetSeenBurmyOrWormadamForm(pokedex, species, (s32)GetMonData(pokemon, MON_DATA_FORM, NULL));
Pokedex_SetSeenBurmyOrWormadamForm(pokedex, species, (s32)Pokemon_GetData(pokemon, MON_DATA_FORM, NULL));
} else if (species == SPECIES_SHELLOS) {
Pokedex_SetSeenShellosOrGastrodonForm(pokedex, species, GetMonData(pokemon, MON_DATA_FORM, NULL));
Pokedex_SetSeenShellosOrGastrodonForm(pokedex, species, Pokemon_GetData(pokemon, MON_DATA_FORM, NULL));
} else if (species == SPECIES_GASTRODON) {
Pokedex_SetSeenShellosOrGastrodonForm(pokedex, species, GetMonData(pokemon, MON_DATA_FORM, NULL));
Pokedex_SetSeenShellosOrGastrodonForm(pokedex, species, Pokemon_GetData(pokemon, MON_DATA_FORM, NULL));
} else if (species == SPECIES_DEOXYS) {
Pokedex_TrySetSeenDeoxysForm(pokedex, species, pokemon);
}
@ -263,7 +263,7 @@ void Pokedex_SetMeisterFlagBySpeciesAndLanguage(struct Pokedex *pokedex, u32 spe
s32 sub_020242C8(struct Pokedex *pokedex, u16 species, s32 r4) {
u8 r0;
u8 r1;
if (GetMonBaseStat(species, BASE_GENDER_RATIO) == MON_RATIO_UNKNOWN) {
if (Species_GetValue(species, SPECIES_DATA_GENDER_RATIO) == MON_RATIO_UNKNOWN) {
return r4 == 0 ? 2 : -1;
}
r1 = (u8)CheckDexFlag(pokedex->field_0084, species);
@ -572,9 +572,9 @@ static inline void SetSeenGender(struct Pokedex *pokedex, u16 species, u8 gender
}
void Pokedex_SetMonSeenFlag(struct Pokedex *pokedex, struct Pokemon *pokemon) {
u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL);
u32 personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL);
u32 gender = GetMonGender(pokemon);
u16 species = (u16)Pokemon_GetData(pokemon, MON_DATA_SPECIES, NULL);
u32 personality = Pokemon_GetData(pokemon, MON_DATA_PERSONALITY, NULL);
u32 gender = Pokemon_GetGender(pokemon);
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
if (DexSpeciesIsInvalid(species)) {
return;
@ -600,10 +600,10 @@ void Pokedex_SetMonCaughtFlag(struct Pokedex *pokedex, struct Pokemon *pokemon)
u32 gender; // r7
u16 species; // r6
species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL);
language = GetMonData(pokemon, MON_DATA_LANGUAGE, NULL);
personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL);
gender = GetMonGender(pokemon);
species = (u16)Pokemon_GetData(pokemon, MON_DATA_SPECIES, NULL);
language = Pokemon_GetData(pokemon, MON_DATA_LANGUAGE, NULL);
personality = Pokemon_GetData(pokemon, MON_DATA_PERSONALITY, NULL);
gender = Pokemon_GetGender(pokemon);
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
if (DexSpeciesIsInvalid(species)) {
return;

2050
arm9/src/pokemon.c
View File

File diff suppressed because it is too large Load Diff

18
arm9/src/pokemon_storage_system.c
View File

@ -22,7 +22,7 @@ void PCStorage_InitializeBoxes(struct PCStorage *pc) {
int i, j;
for (i = 0; i < NUM_BOXES; i++) {
for (j = 0; j < MONS_PER_BOX; j++) {
ZeroBoxMonData(&pc->boxes[i][j]);
BoxPokemon_Init(&pc->boxes[i][j]);
}
}
for (i = 0, j = 0; i < NUM_BOXES; i++) {
@ -65,7 +65,7 @@ BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(struct PCStorage *pc, int boxno, stru
boxno = (int)pc->curBox;
}
for (int i = 0; i < MONS_PER_BOX; i++) {
if (GetBoxMonData(&pc->boxes[boxno][i], MON_DATA_SPECIES, NULL) == SPECIES_NONE) {
if (BoxPokemon_GetData(&pc->boxes[boxno][i], MON_DATA_SPECIES, NULL) == SPECIES_NONE) {
pc->boxes[boxno][i] = *boxmon;
Save_SetDirtyBit();
return TRUE;
@ -93,7 +93,7 @@ void PCStorage_DeleteBoxMonByIndexPair(struct PCStorage *pc, int boxno, int slot
boxno = (int)pc->curBox;
}
if (slotno < MONS_PER_BOX && boxno < NUM_BOXES) {
ZeroBoxMonData(&pc->boxes[boxno][slotno]);
BoxPokemon_Init(&pc->boxes[boxno][slotno]);
Save_SetDirtyBit();
return;
}
@ -109,7 +109,7 @@ int PCStorage_FindFirstBoxWithEmptySlot(struct PCStorage *pc) {
i = (int)pc->curBox;
do {
for (j = 0; j < (int)MONS_PER_BOX; j++) {
if (!GetBoxMonData(&pc->boxes[i][j], MON_DATA_SPECIES_EXISTS, NULL)) {
if (!BoxPokemon_GetData(&pc->boxes[i][j], MON_DATA_SPECIES_EXISTS, NULL)) {
return i;
}
}
@ -128,7 +128,7 @@ BOOL PCStorage_FindFirstEmptySlot(struct PCStorage *pc, int *boxno, int *slotno)
int i = *boxno, j = *slotno;
do {
while (j < (int)MONS_PER_BOX) {
if (!GetBoxMonData(&pc->boxes[i][j], MON_DATA_SPECIES_EXISTS, NULL)) {
if (!BoxPokemon_GetData(&pc->boxes[i][j], MON_DATA_SPECIES_EXISTS, NULL)) {
*boxno = i;
*slotno = j;
return TRUE;
@ -151,7 +151,7 @@ int PCStorage_CountMonsAndEggsInAllBoxes(struct PCStorage *pc) {
int i, j, count = 0;
for (i = 0; i < (int)NUM_BOXES; i++) {
for (j = 0; j < (int)MONS_PER_BOX; j++) {
if (GetBoxMonData(&pc->boxes[i][j], MON_DATA_SPECIES_EXISTS, NULL)) {
if (BoxPokemon_GetData(&pc->boxes[i][j], MON_DATA_SPECIES_EXISTS, NULL)) {
count++;
}
}
@ -216,7 +216,7 @@ int PCStorage_CountMonsAndEggsInBox(struct PCStorage *pc, int boxno) {
if (boxno < NUM_BOXES) {
int i, count = 0;
for (i = 0; i < (int)MONS_PER_BOX; i++) {
if (GetBoxMonData(&pc->boxes[boxno][i], MON_DATA_SPECIES_EXISTS, NULL)) {
if (BoxPokemon_GetData(&pc->boxes[boxno][i], MON_DATA_SPECIES_EXISTS, NULL)) {
count++;
}
}
@ -233,7 +233,7 @@ int PCStorage_CountMonsInBox(struct PCStorage *pc, int boxno) {
if (boxno < NUM_BOXES) {
int i, count = 0;
for (i = 0; i < (int)MONS_PER_BOX; i++) {
if (GetBoxMonData(&pc->boxes[boxno][i], MON_DATA_SPECIES_EXISTS, NULL) && !GetBoxMonData(&pc->boxes[boxno][i], MON_DATA_IS_EGG, NULL)) {
if (BoxPokemon_GetData(&pc->boxes[boxno][i], MON_DATA_SPECIES_EXISTS, NULL) && !BoxPokemon_GetData(&pc->boxes[boxno][i], MON_DATA_IS_EGG, NULL)) {
count++;
}
}
@ -259,7 +259,7 @@ void PCStorage_SetBoxMonDataByIndexPair(struct PCStorage *pc, int boxno, int slo
if (boxno == -1) {
boxno = (int)pc->curBox;
}
SetBoxMonData(&pc->boxes[boxno][slotno], (int)attr, value);
BoxPokemon_SetData(&pc->boxes[boxno][slotno], (int)attr, value);
Save_SetDirtyBit();
}

2
arm9/src/poketch.c
View File

@ -196,7 +196,7 @@ void Save_Poketch_PokemonHistoryAddMon(struct Poketch *poketch, struct BoxPokemo
}
i = 11;
}
poketch->pokemonHistory[i][0] = (u16)GetBoxMonData(mon, MON_DATA_SPECIES, NULL);
poketch->pokemonHistory[i][0] = (u16)BoxPokemon_GetData(mon, MON_DATA_SPECIES, NULL);
poketch->pokemonHistory[i][1] = BoxMon_GetAlternateForm(mon);
}

40
arm9/src/scrcmd.c
View File

@ -2125,7 +2125,7 @@ BOOL ScrCmd_ShowPartyPokemonPic(ScriptContext *ctx) { // 028C
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyId);
LoadUserFrameGfx1(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, HEAP_ID_4);
*pokepicManager = DrawPokemonPicFromMon(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, mon, HEAP_ID_4);
u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
u32 species = Pokemon_GetData(mon, MON_DATA_SPECIES, NULL);
Script_SetMonSeenFlagBySpecies(ctx->fieldSystem, (u16)species);
return FALSE;
}
@ -2418,11 +2418,11 @@ BOOL ScrCmd_NamePokemonScreen(ScriptContext *ctx) { // 00BB
Pokemon *mon = Party_GetMonByIndex(party, partyPos);
u16 monNick[20];
GetMonData(mon, MON_DATA_NICKNAME, monNick);
Pokemon_GetData(mon, MON_DATA_NICKNAME, monNick);
u16 *var = ScriptGetVarPointer(ctx);
s32 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
s32 species = Pokemon_GetData(mon, MON_DATA_SPECIES, NULL);
CreateNamingScreen(ctx->taskManager, NAMINGSCREEN_POKEMON, species, POKEMON_NAME_LENGTH, partyPos, monNick, var);
return TRUE;
@ -3889,12 +3889,12 @@ BOOL ScrCmd_GetTotalPokemonEVs(ScriptContext *ctx) { // 0233
u16 partyPosition = ScriptGetVar(ctx);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition);
u32 hpEv = GetMonData(mon, MON_DATA_HP_EV, NULL);
u32 atkEv = GetMonData(mon, MON_DATA_ATK_EV, NULL);
u32 defEv = GetMonData(mon, MON_DATA_DEF_EV, NULL);
u32 speedEv = GetMonData(mon, MON_DATA_SPEED_EV, NULL);
u32 spAtkEv = GetMonData(mon, MON_DATA_SPATK_EV, NULL);
u32 spDefEv = GetMonData(mon, MON_DATA_SPDEF_EV, NULL);
u32 hpEv = Pokemon_GetData(mon, MON_DATA_HP_EV, NULL);
u32 atkEv = Pokemon_GetData(mon, MON_DATA_ATK_EV, NULL);
u32 defEv = Pokemon_GetData(mon, MON_DATA_DEF_EV, NULL);
u32 speedEv = Pokemon_GetData(mon, MON_DATA_SPEED_EV, NULL);
u32 spAtkEv = Pokemon_GetData(mon, MON_DATA_SPATK_EV, NULL);
u32 spDefEv = Pokemon_GetData(mon, MON_DATA_SPDEF_EV, NULL);
*var = hpEv + atkEv + defEv + speedEv + spAtkEv + spDefEv;
return FALSE;
@ -3919,7 +3919,7 @@ BOOL ScrCmd_GetPokemonFootprint(ScriptContext *ctx) { // 023A
u16 *var2 = ScriptGetVarPointer(ctx);
u16 partyPosition = ScriptGetVar(ctx);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition);
u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
u16 species = Pokemon_GetData(mon, MON_DATA_SPECIES, NULL);
*var = ov05_021F61E8(species);
*var2 = ov05_021F61DC(species);
return FALSE;
@ -4011,9 +4011,9 @@ BOOL ScrCmd_Unk024D(ScriptContext *ctx) { // 024D - todo: ClosePCAnimation?
static void Script_SetMonSeenFlagBySpecies(FieldSystem *fieldSystem, u16 species) {
Pokedex *pokedex = Save_Pokedex_Get(fieldSystem->saveData);
Pokemon *mon = AllocMonZeroed(HEAP_ID_32);
ZeroMonData(mon);
CreateMon(mon, species, 50, 32, FALSE, 0, OT_ID_PLAYER_ID, 0);
Pokemon *mon = Pokemon_New(HEAP_ID_32);
Pokemon_Init(mon);
Pokemon_InitWithParams(mon, species, 50, 32, FALSE, 0, OT_ID_PLAYER_ID, 0);
Pokedex_SetMonSeenFlag(pokedex, mon);
FreeToHeap(mon);
}
@ -4095,9 +4095,9 @@ BOOL ScrCmd_SetDeoxysForm(ScriptContext *ctx) { // 0263
for (s32 i = 0; i < partyCount; i++) {
Pokemon *mon = Party_GetMonByIndex(playerParty, i);
if (GetMonData(mon, MON_DATA_SPECIES, NULL) == SPECIES_DEOXYS) {
SetMonData(mon, MON_DATA_FORM, &form);
CalcMonLevelAndStats(mon);
if (Pokemon_GetData(mon, MON_DATA_SPECIES, NULL) == SPECIES_DEOXYS) {
Pokemon_SetData(mon, MON_DATA_FORM, &form);
Pokemon_CalcLevelAndStats(mon);
Pokedex_SetMonCaughtFlag(pokedex, mon);
}
}
@ -4118,8 +4118,8 @@ BOOL ScrCmd_CheckBurmyForms(ScriptContext *ctx) { // 0264
s32 j;
BOOL hasMultiple;
Pokemon *mon = Party_GetMonByIndex(playerParty, i);
u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
u32 form = GetMonData(mon, MON_DATA_FORM, NULL);
u32 species = Pokemon_GetData(mon, MON_DATA_SPECIES, NULL);
u32 form = Pokemon_GetData(mon, MON_DATA_FORM, NULL);
if (species == SPECIES_BURMY) {
hasMultiple = FALSE;
unk0[i] = form;
@ -4179,12 +4179,12 @@ _0203EFA2:
add r6, r0, #0x0
mov r1, #0x5
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x10]
add r0, r6, #0x0
mov r1, #0x70
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r3, r0, #0x0
mov r0, #0x67
ldr r1, [sp, #0x10]

4
arm9/src/scrcmd_13.c
View File

@ -42,7 +42,7 @@ BOOL ScrCmd_Unk0253(struct ScriptContext *ctx) // 0253
BOOL ScrCmd_Unk0254(struct ScriptContext *ctx) // 0254
{
void *unk = sub_02022528(ctx->fieldSystem->saveData);
struct Pokemon *pokemon = AllocMonZeroed(HEAP_ID_32);
struct Pokemon *pokemon = Pokemon_New(HEAP_ID_32);
u16 *ret_ptr = ScriptGetVarPointer(ctx);
u16 eggs = sub_0202C000(unk);
@ -61,7 +61,7 @@ BOOL ScrCmd_Unk0255(struct ScriptContext *ctx) // 0255
{
void *unk = sub_02022528(ctx->fieldSystem->saveData);
struct PCStorage *pc = SaveArray_PCStorage_Get(ctx->fieldSystem->saveData);
struct Pokemon *pokemon = AllocMonZeroed(HEAP_ID_32);
struct Pokemon *pokemon = Pokemon_New(HEAP_ID_32);
PlayerProfile *player = Save_PlayerData_GetProfile(ctx->fieldSystem->saveData);
struct Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData); // unused

2
arm9/src/scrcmd_names.c
View File

@ -393,7 +393,7 @@ BOOL ScrCmd_GetPokemonMoveName(ScriptContext *ctx) // 01CB - todo: BufferPartyPo
u16 mon_move_idx = ScriptGetVar(ctx);
Party *party = SaveArray_Party_Get(fieldSystem->saveData);
Pokemon *pokemon = Party_GetMonByIndex(party, mon_idx);
u16 move = (u16)GetMonData(pokemon, MON_DATA_MOVE1 + mon_move_idx, NULL);
u16 move = (u16)Pokemon_GetData(pokemon, MON_DATA_MOVE1 + mon_move_idx, NULL);
BufferMoveName(*messageFormat, idx, move);

106
arm9/src/scrcmd_party.c
View File

@ -40,9 +40,9 @@ BOOL ScrCmd_GetPartyMonSpecies(struct ScriptContext *ctx) // 0198 - todo: GetPar
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, *mon_slot);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg == FALSE) {
species = GetMonData(party_mon, MON_DATA_SPECIES, NULL);
species = Pokemon_GetData(party_mon, MON_DATA_SPECIES, NULL);
} else {
species = SPECIES_NONE;
}
@ -63,7 +63,7 @@ BOOL ScrCmd_CheckPartyMonOTID(struct ScriptContext *ctx) // 0199 - todo: CheckPa
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, *mon_slot);
u16 party_mon_otid = (u16)GetMonData(party_mon, MON_DATA_OT_ID, NULL);
u16 party_mon_otid = (u16)Pokemon_GetData(party_mon, MON_DATA_OT_ID, NULL);
u16 player_otid = (u16)PlayerProfile_GetTrainerID(player);
if (party_mon_otid == player_otid) {
*ret_ptr = 0;
@ -84,8 +84,8 @@ BOOL ScrCmd_GiveEgg(struct ScriptContext *ctx) // 0097
u8 party_count = (u8)Party_GetCount(party);
if (party_count < PARTY_SIZE) {
struct Pokemon *egg = AllocMonZeroed(HEAP_ID_FIELD);
ZeroMonData(egg);
struct Pokemon *egg = Pokemon_New(HEAP_ID_FIELD);
Pokemon_Init(egg);
s32 met_loc = sub_02015CF8(1, unk);
ov05_SetEggStats(egg, species, 1, player, 3, met_loc);
@ -120,12 +120,12 @@ BOOL ScrCmd_PartyMonHasMove(struct ScriptContext *ctx) // 0099
*ret_ptr = 0;
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg) {
return FALSE;
}
if (required_move == GetMonData(party_mon, MON_DATA_MOVE1, NULL) || required_move == GetMonData(party_mon, MON_DATA_MOVE2, NULL) || required_move == GetMonData(party_mon, MON_DATA_MOVE3, NULL) || required_move == GetMonData(party_mon, MON_DATA_MOVE4, NULL)) {
if (required_move == Pokemon_GetData(party_mon, MON_DATA_MOVE1, NULL) || required_move == Pokemon_GetData(party_mon, MON_DATA_MOVE2, NULL) || required_move == Pokemon_GetData(party_mon, MON_DATA_MOVE3, NULL) || required_move == Pokemon_GetData(party_mon, MON_DATA_MOVE4, NULL)) {
*ret_ptr = 1;
}
@ -144,9 +144,9 @@ BOOL ScrCmd_FindPartyMonWithMove(struct ScriptContext *ctx) // 009A - todo: Chec
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg == FALSE) {
if (required_move == GetMonData(party_mon, MON_DATA_MOVE1, NULL) || required_move == GetMonData(party_mon, MON_DATA_MOVE2, NULL) || required_move == GetMonData(party_mon, MON_DATA_MOVE3, NULL) || required_move == GetMonData(party_mon, MON_DATA_MOVE4, NULL)) {
if (required_move == Pokemon_GetData(party_mon, MON_DATA_MOVE1, NULL) || required_move == Pokemon_GetData(party_mon, MON_DATA_MOVE2, NULL) || required_move == Pokemon_GetData(party_mon, MON_DATA_MOVE3, NULL) || required_move == Pokemon_GetData(party_mon, MON_DATA_MOVE4, NULL)) {
*ret_ptr = i;
break;
}
@ -182,9 +182,9 @@ BOOL ScrCmd_CountPartyMonsAtOrBelowLevel(struct ScriptContext *ctx) // 01F6
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg == FALSE) {
u32 party_mon_level = GetMonData(party_mon, MON_DATA_LEVEL, NULL);
u32 party_mon_level = Pokemon_GetData(party_mon, MON_DATA_LEVEL, NULL);
if (party_mon_level <= highest_level) {
mons++;
}
@ -205,9 +205,9 @@ BOOL ScrCmd_GetPartyMonLevel(struct ScriptContext *ctx) // 0278
*ret_ptr = 0;
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg == FALSE) {
*ret_ptr = (u16)GetMonData(party_mon, MON_DATA_LEVEL, NULL);
*ret_ptr = (u16)Pokemon_GetData(party_mon, MON_DATA_LEVEL, NULL);
}
return FALSE;
@ -228,13 +228,13 @@ BOOL ScrCmd_GetPartyMonNature(struct ScriptContext *ctx) // 0212
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg) {
*ret_ptr = 0;
return FALSE;
}
*ret_ptr = GetMonNature(party_mon);
*ret_ptr = Pokemon_GetNature(party_mon);
return FALSE;
}
@ -250,9 +250,9 @@ BOOL ScrCmd_FindPartyMonWithNature(struct ScriptContext *ctx) // 0213 - todo: Ch
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg == FALSE) {
u8 party_mon_nature = GetMonNature(party_mon);
u8 party_mon_nature = Pokemon_GetNature(party_mon);
if (required_nature == party_mon_nature) {
*ret_ptr = i;
break;
@ -271,7 +271,7 @@ BOOL ScrCmd_GetPartyMonFriendship(struct ScriptContext *ctx) // 01B9
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
*ret_ptr = (u16)GetMonData(party_mon, MON_DATA_FRIENDSHIP, NULL);
*ret_ptr = (u16)Pokemon_GetData(party_mon, MON_DATA_FRIENDSHIP, NULL);
return FALSE;
}
@ -284,21 +284,21 @@ BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext *ctx) // 01BA
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
u16 friendship = (u16)GetMonData(party_mon, MON_DATA_FRIENDSHIP, NULL);
u16 friendship = (u16)Pokemon_GetData(party_mon, MON_DATA_FRIENDSHIP, NULL);
if (friendship_to_add != 0) {
u16 party_mon_held_item = (u16)GetMonData(party_mon, MON_DATA_HELD_ITEM, NULL);
u16 party_mon_held_item = (u16)Pokemon_GetData(party_mon, MON_DATA_HELD_ITEM, NULL);
u32 held_item_hold_effect = GetItemAttr(party_mon_held_item, ITEMATTR_HOLD_EFFECT, HEAP_ID_FIELD);
if (held_item_hold_effect == HOLD_EFFECT_FRIENDSHIP_UP) {
friendship_to_add = (u16)((friendship_to_add * 150) / 100);
}
u32 party_mon_pokeball = GetMonData(party_mon, MON_DATA_POKEBALL, NULL);
u32 party_mon_pokeball = Pokemon_GetData(party_mon, MON_DATA_POKEBALL, NULL);
if (party_mon_pokeball == ITEM_LUXURY_BALL) {
friendship_to_add++;
}
u32 party_mon_egg_met_location = GetMonData(party_mon, MON_DATA_EGG_LOCATION, NULL);
u32 party_mon_egg_met_location = Pokemon_GetData(party_mon, MON_DATA_EGG_LOCATION, NULL);
if (map_sec == party_mon_egg_met_location) {
friendship_to_add++;
}
@ -309,7 +309,7 @@ BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext *ctx) // 01BA
friendship = 0xFF;
}
SetMonData(party_mon, MON_DATA_FRIENDSHIP, &friendship);
Pokemon_SetData(party_mon, MON_DATA_FRIENDSHIP, &friendship);
return FALSE;
}
@ -322,14 +322,14 @@ BOOL ScrCmd_SubtractPartyMonFriendship(struct ScriptContext *ctx) // 01BB
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
u16 friendship = (u16)GetMonData(party_mon, MON_DATA_FRIENDSHIP, NULL);
u16 friendship = (u16)Pokemon_GetData(party_mon, MON_DATA_FRIENDSHIP, NULL);
if (friendship_to_deplete > friendship) {
friendship = 0;
} else {
friendship -= friendship_to_deplete;
}
SetMonData(party_mon, MON_DATA_FRIENDSHIP, &friendship);
Pokemon_SetData(party_mon, MON_DATA_FRIENDSHIP, &friendship);
return FALSE;
}
@ -342,7 +342,7 @@ BOOL ScrCmd_GetPartyMonContestCondition(struct ScriptContext *ctx) // 0281
struct Party *party = SaveArray_Party_Get(ctx->fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
*ret_ptr = (u16)GetMonData(party_mon, MON_DATA_COOL + contest_condition_id, NULL);
*ret_ptr = (u16)Pokemon_GetData(party_mon, MON_DATA_COOL + contest_condition_id, NULL);
return FALSE;
}
@ -363,8 +363,8 @@ BOOL ScrCmd_GetPartyMonTypes(struct ScriptContext *ctx) // 0248
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
*type1 = (u16)GetMonData(party_mon, MON_DATA_TYPE_1, NULL);
*type2 = (u16)GetMonData(party_mon, MON_DATA_TYPE_2, NULL);
*type1 = (u16)Pokemon_GetData(party_mon, MON_DATA_TYPE_1, NULL);
*type2 = (u16)Pokemon_GetData(party_mon, MON_DATA_TYPE_2, NULL);
return FALSE;
}
@ -391,7 +391,7 @@ BOOL ScrCmd_CountPartyMons_OmitEggs(struct ScriptContext *ctx) // 019A
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg == FALSE) {
non_egg_mons++;
}
@ -418,9 +418,9 @@ BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext *ctx) // 019
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg == FALSE) {
u32 party_mon_hp = GetMonData(party_mon, MON_DATA_HP, NULL);
u32 party_mon_hp = Pokemon_GetData(party_mon, MON_DATA_HP, NULL);
if (party_mon_hp != 0) {
available_mons++;
}
@ -448,9 +448,9 @@ BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext *ctx) // 019C
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg == FALSE) {
u32 party_mon_hp = GetMonData(party_mon, MON_DATA_HP, NULL);
u32 party_mon_hp = Pokemon_GetData(party_mon, MON_DATA_HP, NULL);
if (party_mon_hp != 0) {
mons++;
}
@ -475,7 +475,7 @@ BOOL ScrCmd_GetPartyEggCount(struct ScriptContext *ctx) // 019D
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg) {
eggs_in_party++;
}
@ -498,7 +498,7 @@ BOOL ScrCmd_CheckPartyForPokerus(struct ScriptContext *ctx) // 0119
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_has_pokerus = (BOOL)GetMonData(party_mon, MON_DATA_POKERUS, NULL);
BOOL party_mon_has_pokerus = (BOOL)Pokemon_GetData(party_mon, MON_DATA_POKERUS, NULL);
if (party_mon_has_pokerus) {
*ret_ptr = 1;
break;
@ -515,7 +515,7 @@ BOOL ScrCmd_GetPartyMonGender(struct ScriptContext *ctx) // 011A
struct Party *party = SaveArray_Party_Get(ctx->fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
*ret_ptr = (u16)GetMonData(party_mon, MON_DATA_GENDER, NULL);
*ret_ptr = (u16)Pokemon_GetData(party_mon, MON_DATA_GENDER, NULL);
return FALSE;
}
@ -530,7 +530,7 @@ BOOL ScrCmd_CountPartyMonMoves(struct ScriptContext *ctx) // 01C8
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
party_mon = Party_GetMonByIndex(party, mon_slot);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg) {
*ret_ptr = 0;
return FALSE;
@ -538,22 +538,22 @@ BOOL ScrCmd_CountPartyMonMoves(struct ScriptContext *ctx) // 01C8
moves = 0;
u32 move1 = GetMonData(party_mon, MON_DATA_MOVE1, NULL);
u32 move1 = Pokemon_GetData(party_mon, MON_DATA_MOVE1, NULL);
if (move1 != MOVE_NONE) {
moves++;
}
u32 move2 = GetMonData(party_mon, MON_DATA_MOVE2, NULL);
u32 move2 = Pokemon_GetData(party_mon, MON_DATA_MOVE2, NULL);
if (move2 != MOVE_NONE) {
moves++;
}
u32 move3 = GetMonData(party_mon, MON_DATA_MOVE3, NULL);
u32 move3 = Pokemon_GetData(party_mon, MON_DATA_MOVE3, NULL);
if (move3 != MOVE_NONE) {
moves++;
}
u32 move4 = GetMonData(party_mon, MON_DATA_MOVE4, NULL);
u32 move4 = Pokemon_GetData(party_mon, MON_DATA_MOVE4, NULL);
if (move4 != MOVE_NONE) {
moves++;
}
@ -584,7 +584,7 @@ BOOL ScrCmd_GetPartyMonMove(struct ScriptContext *ctx) // 01CA
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
*ret_ptr = (u16)GetMonData(party_mon, MON_DATA_MOVE1 + move_slot, NULL);
*ret_ptr = (u16)Pokemon_GetData(party_mon, MON_DATA_MOVE1 + move_slot, NULL);
return FALSE;
}
@ -596,7 +596,7 @@ BOOL ScrCmd_GetPartyMonHeldItem(struct ScriptContext *ctx) // 01EE
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
*ret_ptr = (u16)GetMonData(party_mon, MON_DATA_HELD_ITEM, NULL);
*ret_ptr = (u16)Pokemon_GetData(party_mon, MON_DATA_HELD_ITEM, NULL);
return FALSE;
}
@ -608,7 +608,7 @@ BOOL ScrCmd_ResetPartyMonHeldItem(struct ScriptContext *ctx) // 01F0
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
u16 party_mon_held_item = ITEM_NONE;
SetMonData(party_mon, MON_DATA_HELD_ITEM, &party_mon_held_item);
Pokemon_SetData(party_mon, MON_DATA_HELD_ITEM, &party_mon_held_item);
return FALSE;
}
@ -625,9 +625,9 @@ BOOL ScrCmd_CheckPartyForSpecies(struct ScriptContext *ctx) // 01C0
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg == FALSE) {
u16 party_mon_species = (u16)GetMonData(party_mon, MON_DATA_SPECIES, NULL);
u16 party_mon_species = (u16)Pokemon_GetData(party_mon, MON_DATA_SPECIES, NULL);
if (species == party_mon_species) {
*ret_ptr = 1;
break;
@ -648,7 +648,7 @@ BOOL ScrCmd_CountPartyMonRibbons(struct ScriptContext *ctx) // 022E
u16 ribbon_idx;
u16 ribbons;
for (ribbon_idx = 0, ribbons = 0; ribbon_idx < 80; ribbon_idx++) {
BOOL party_mon_has_ribbon = (BOOL)GetMonData(party_mon, sub_0207FC5C((u8)ribbon_idx, 0), NULL);
BOOL party_mon_has_ribbon = (BOOL)Pokemon_GetData(party_mon, sub_0207FC5C((u8)ribbon_idx, 0), NULL);
if (party_mon_has_ribbon) {
ribbons++;
}
@ -672,14 +672,14 @@ BOOL ScrCmd_CountTotalPartyRibbons(struct ScriptContext *ctx) // 022F
for (u16 i = 0; i < party_count; i++) {
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg) {
// BUG: This `break` should be a `continue`, as any party mons after a detected
// egg would have their ribbons ignored.
break;
}
BOOL party_mon_has_ribbon = (BOOL)GetMonData(party_mon, sub_0207FC5C((u8)ribbon_idx, 0), NULL);
BOOL party_mon_has_ribbon = (BOOL)Pokemon_GetData(party_mon, sub_0207FC5C((u8)ribbon_idx, 0), NULL);
if (party_mon_has_ribbon) {
ribbons++;
break;
@ -699,7 +699,7 @@ BOOL ScrCmd_PartyMonHasRibbon(struct ScriptContext *ctx) // 0230
struct Party *party = SaveArray_Party_Get(ctx->fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
*ret_ptr = (u16)GetMonData(party_mon, sub_0207FC5C((u8)ribbon_idx, 0), NULL);
*ret_ptr = (u16)Pokemon_GetData(party_mon, sub_0207FC5C((u8)ribbon_idx, 0), NULL);
return FALSE;
}
@ -711,7 +711,7 @@ BOOL ScrCmd_GivePartyMonRibbon(struct ScriptContext *ctx) // 0231
struct Party *party = SaveArray_Party_Get(ctx->fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, mon_slot);
SetMonData(party_mon, (s32)sub_0207FC5C((u8)ribbon_idx, 0), &mon_has_ribbon);
Pokemon_SetData(party_mon, (s32)sub_0207FC5C((u8)ribbon_idx, 0), &mon_has_ribbon);
return FALSE;
}
@ -729,9 +729,9 @@ BOOL ScrCmd_CheckPartyForBadEgg(struct ScriptContext *ctx) // 02B7
for (ribbon_idx = 0; ribbon_idx < 80; ribbon_idx++) {
for (u16 i = 0; i < party_count; i++) {
struct Pokemon *party_mon = Party_GetMonByIndex(party, i);
BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);
BOOL party_mon_is_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_IS_EGG, NULL);
if (party_mon_is_egg) {
BOOL party_mon_is_bad_egg = (BOOL)GetMonData(party_mon, MON_DATA_CHECKSUM_FAILED, NULL);
BOOL party_mon_is_bad_egg = (BOOL)Pokemon_GetData(party_mon, MON_DATA_CHECKSUM_FAILED, NULL);
if (party_mon_is_bad_egg) {
*ret_ptr = 1;
return FALSE;

46
arm9/src/script_pokemon_util.c
View File

@ -15,10 +15,10 @@
#include "unk_0202C144.h"
BOOL MonNotFaintedOrEgg(struct Pokemon *pokemon) {
if (GetMonData(pokemon, MON_DATA_HP, NULL) == 0) {
if (Pokemon_GetData(pokemon, MON_DATA_HP, NULL) == 0) {
return FALSE;
}
if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) {
if (Pokemon_GetData(pokemon, MON_DATA_IS_EGG, NULL)) {
return FALSE;
}
return TRUE;
@ -28,12 +28,12 @@ BOOL GiveMon(HeapID heapId, struct SaveData *save, u16 species, u8 level, u16 it
u32 ptr;
PlayerProfile *data = Save_PlayerData_GetProfile(save);
struct Party *party = SaveArray_Party_Get(save);
struct Pokemon *mon = AllocMonZeroed(heapId);
ZeroMonData(mon);
CreateMon(mon, species, level, 32, 0, 0, OT_ID_PLAYER_ID, 0);
struct Pokemon *mon = Pokemon_New(heapId);
Pokemon_Init(mon);
Pokemon_InitWithParams(mon, species, level, 32, 0, 0, OT_ID_PLAYER_ID, 0);
sub_0206A014(mon, data, ITEM_POKE_BALL, mapSec, encounterType, heapId);
ptr = item;
SetMonData(mon, MON_DATA_HELD_ITEM, &ptr);
Pokemon_SetData(mon, MON_DATA_HELD_ITEM, &ptr);
BOOL isAdded = Party_AddMon(party, mon);
if (isAdded) {
sub_0202C144(save, mon);
@ -47,8 +47,8 @@ BOOL GiveEgg(HeapID heapId, struct SaveData *save, u16 species, int level, int m
#pragma unused(heapId)
PlayerProfile *data = Save_PlayerData_GetProfile(save);
struct Party *party = SaveArray_Party_Get(save);
struct Pokemon *mon = AllocMonZeroed(HEAP_ID_32);
ZeroMonData(mon);
struct Pokemon *mon = Pokemon_New(HEAP_ID_32);
Pokemon_Init(mon);
ov05_SetEggStats(mon, species, level, data, 4, sub_02015CF8(metLocIndex, a3));
BOOL isAdded = Party_AddMon(party, mon);
FreeToHeap(mon);
@ -66,13 +66,13 @@ int GetIdxOfFirstPartyMonWithMove(struct Party *party, int move) {
for (int i = 0; i < partyCount; i++) {
struct Pokemon *mon = Party_GetMonByIndex(party, i);
if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) {
if (Pokemon_GetData(mon, MON_DATA_IS_EGG, NULL)) {
continue;
}
if (GetMonData(mon, MON_DATA_MOVE1, NULL) == move
|| GetMonData(mon, MON_DATA_MOVE2, NULL) == move
|| GetMonData(mon, MON_DATA_MOVE3, NULL) == move
|| GetMonData(mon, MON_DATA_MOVE4, NULL) == move) {
if (Pokemon_GetData(mon, MON_DATA_MOVE1, NULL) == move
|| Pokemon_GetData(mon, MON_DATA_MOVE2, NULL) == move
|| Pokemon_GetData(mon, MON_DATA_MOVE3, NULL) == move
|| Pokemon_GetData(mon, MON_DATA_MOVE4, NULL) == move) {
return i;
}
}
@ -116,7 +116,7 @@ struct Pokemon *GetFirstNonEggInParty(struct Party *party) {
for (i = 0; i < partyCount; i++) {
struct Pokemon *mon = Party_GetMonByIndex(party, i);
if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) {
if (!Pokemon_GetData(mon, MON_DATA_IS_EGG, NULL)) {
return mon;
}
}
@ -134,11 +134,11 @@ void GiveAllMonsTheSinnohChampRibbon(struct Party *party) {
for (int i = 0; i < partyCount; i++) {
struct Pokemon *mon = Party_GetMonByIndex(party, i);
if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) {
if (Pokemon_GetData(mon, MON_DATA_IS_EGG, NULL)) {
continue;
}
SetMonData(mon, MON_DATA_SINNOH_CHAMP_RIBBON, &var);
Pokemon_SetData(mon, MON_DATA_SINNOH_CHAMP_RIBBON, &var);
}
}
@ -155,18 +155,18 @@ int ApplyPoisonStep(struct Party *party, int location) {
continue;
}
if (!(GetMonData(mon, MON_DATA_STATUS, NULL) & 0x88)) {
if (!(Pokemon_GetData(mon, MON_DATA_STATUS, NULL) & 0x88)) {
continue;
}
hp = GetMonData(mon, MON_DATA_HP, NULL);
hp = Pokemon_GetData(mon, MON_DATA_HP, NULL);
if (hp > 1) {
hp--;
}
SetMonData(mon, MON_DATA_HP, &hp);
Pokemon_SetData(mon, MON_DATA_HP, &hp);
if (hp == 1) {
numHealed++;
MonApplyFriendshipMod(mon, FRIENDSHIP_EVENT_HEAL_FIELD_PSN, (u32)location);
Pokemon_UpdateFriendship(mon, FRIENDSHIP_EVENT_HEAL_FIELD_PSN, (u32)location);
}
numPoisoned++;
}
@ -184,10 +184,10 @@ int ApplyPoisonStep(struct Party *party, int location) {
BOOL SurvivePoisoning(struct Pokemon *mon) {
int status;
if (GetMonData(mon, MON_DATA_STATUS, NULL) & 0x88) {
if (GetMonData(mon, MON_DATA_HP, NULL) == 1) {
if (Pokemon_GetData(mon, MON_DATA_STATUS, NULL) & 0x88) {
if (Pokemon_GetData(mon, MON_DATA_HP, NULL) == 1) {
status = 0;
SetMonData(mon, MON_DATA_STATUS, &status);
Pokemon_SetData(mon, MON_DATA_STATUS, &status);
return TRUE;
}
}

14
arm9/src/trainer_data.c
View File

@ -267,7 +267,7 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) {
seed_bak = GetLCRNGSeed();
Party_InitWithMaxSize(setup->party[party_id], PARTY_SIZE);
data = (union TrainerMon *)AllocFromHeap(heapId, sizeof(union TrainerMon) * PARTY_SIZE);
pokemon = AllocMonZeroed(heapId);
pokemon = Pokemon_New(heapId);
TrainerData_ReadTrPoke(setup->trainerId[party_id], data);
// If a Pokemon's gender ratio is 50/50, the generated Pokemon will be the same
@ -301,7 +301,7 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) {
// Difficulty is a number between 0 and 250 which directly corresponds
// to the (uniform) IV spread of the generated Pokemon.
iv = (u8)((monSpecies[i].difficulty * 31) / 255);
CreateMon(pokemon, monSpecies[i].species, monSpecies[i].level, iv, 1, (s32)personality, 2, 0);
Pokemon_InitWithParams(pokemon, monSpecies[i].species, monSpecies[i].level, iv, 1, (s32)personality, 2, 0);
// If you were treating the trainer type as a bitfield, you'd put the
// checks for held item and moves here. You'd also treat the trpoke
@ -321,7 +321,7 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) {
personality = (seed << 8);
personality += pid_gender;
iv = (u8)((monSpeciesMoves[i].difficulty * 31) / 255);
CreateMon(pokemon, monSpeciesMoves[i].species, monSpeciesMoves[i].level, iv, 1, (s32)personality, 2, 0);
Pokemon_InitWithParams(pokemon, monSpeciesMoves[i].species, monSpeciesMoves[i].level, iv, 1, (s32)personality, 2, 0);
for (j = 0; j < 4; j++) {
MonSetMoveInSlot(pokemon, monSpeciesMoves[i].moves[j], (u8)j);
}
@ -340,8 +340,8 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) {
personality = (seed << 8);
personality += pid_gender;
iv = (u8)((monSpeciesItem[i].difficulty * 31) / 255);
CreateMon(pokemon, monSpeciesItem[i].species, monSpeciesItem[i].level, iv, 1, (s32)personality, 2, 0);
SetMonData(pokemon, MON_DATA_HELD_ITEM, &monSpeciesItem[i].item);
Pokemon_InitWithParams(pokemon, monSpeciesItem[i].species, monSpeciesItem[i].level, iv, 1, (s32)personality, 2, 0);
Pokemon_SetData(pokemon, MON_DATA_HELD_ITEM, &monSpeciesItem[i].item);
Party_AddMon(setup->party[party_id], pokemon);
}
break;
@ -357,8 +357,8 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) {
personality = (seed << 8);
personality += pid_gender;
iv = (u8)((monSpeciesItemMoves[i].difficulty * 31) / 255);
CreateMon(pokemon, monSpeciesItemMoves[i].species, monSpeciesItemMoves[i].level, iv, 1, (s32)personality, 2, 0);
SetMonData(pokemon, MON_DATA_HELD_ITEM, &monSpeciesItemMoves[i].item);
Pokemon_InitWithParams(pokemon, monSpeciesItemMoves[i].species, monSpeciesItemMoves[i].level, iv, 1, (s32)personality, 2, 0);
Pokemon_SetData(pokemon, MON_DATA_HELD_ITEM, &monSpeciesItemMoves[i].item);
for (j = 0; j < 4; j++) {
MonSetMoveInSlot(pokemon, monSpeciesItemMoves[i].moves[j], (u8)j);
}

4
arm9/src/unk_0202C144.c
View File

@ -7,11 +7,11 @@
#include "unk_02029FB0.h"
void sub_0202C144(struct SaveData *save, struct Pokemon *mon) {
u32 is_egg = GetMonData(mon, MON_DATA_IS_EGG, NULL);
u32 is_egg = Pokemon_GetData(mon, MON_DATA_IS_EGG, NULL);
if (!is_egg) {
struct Pokedex *pokedex = Save_Pokedex_Get(save);
struct GameStats *unk = Save_GameStats_Get(save);
u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
u32 species = Pokemon_GetData(mon, MON_DATA_SPECIES, NULL);
GameStats_IncSpeciesCaught(unk, pokedex, (u16)species);
Pokedex_SetMonCaughtFlag(pokedex, mon);

12
arm9/src/unk_0206B688.c
View File

@ -9,8 +9,8 @@ u32 sub_0206B6D4(u32 species, u32 is_egg, u32 form);
u32 sub_0206B688(struct BoxPokemon *boxmon) {
BOOL decry = AcquireBoxMonLock(boxmon);
u32 species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL);
u32 is_egg = GetBoxMonData(boxmon, MON_DATA_IS_EGG, NULL);
u32 species = BoxPokemon_GetData(boxmon, MON_DATA_SPECIES, NULL);
u32 is_egg = BoxPokemon_GetData(boxmon, MON_DATA_IS_EGG, NULL);
u32 form = BoxMon_GetAlternateForm(boxmon);
u32 ret = sub_0206B6D4(species, is_egg, form);
ReleaseBoxMonLock(boxmon, decry);
@ -53,7 +53,7 @@ u32 sub_0206B6D4(u32 species, u32 is_egg, u32 form) {
}
u16 BoxMon_GetAlternateForm(struct BoxPokemon *boxmon) {
u32 species = GetBoxMonData(boxmon, MON_DATA_SPECIES_OR_EGG, NULL);
u32 species = BoxPokemon_GetData(boxmon, MON_DATA_SPECIES_OR_EGG, NULL);
switch (species) {
case SPECIES_UNOWN:
return GetBoxMonUnownLetter(boxmon);
@ -62,7 +62,7 @@ u16 BoxMon_GetAlternateForm(struct BoxPokemon *boxmon) {
case SPECIES_WORMADAM:
case SPECIES_SHELLOS:
case SPECIES_GASTRODON:
return (u16)GetBoxMonData(boxmon, MON_DATA_FORM, NULL);
return (u16)BoxPokemon_GetData(boxmon, MON_DATA_FORM, NULL);
default:
return 0;
}
@ -102,8 +102,8 @@ u32 sub_0206B7BC(u32 species, u32 form, u32 is_egg) {
u32 sub_0206B83C(struct BoxPokemon *boxmon) {
BOOL decry = AcquireBoxMonLock(boxmon);
u32 form = BoxMon_GetAlternateForm(boxmon);
u32 species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL);
u32 is_egg = GetBoxMonData(boxmon, MON_DATA_IS_EGG, NULL);
u32 species = BoxPokemon_GetData(boxmon, MON_DATA_SPECIES, NULL);
u32 is_egg = BoxPokemon_GetData(boxmon, MON_DATA_IS_EGG, NULL);
ReleaseBoxMonLock(boxmon, decry);
return sub_0206B7BC(species, form, is_egg);
}

124
arm9/src/use_item_on_mon.c
View File

@ -27,7 +27,7 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID
FreeToHeap(itemData);
return FALSE;
}
status = GetMonData(pokemon, MON_DATA_STATUS, NULL);
status = Pokemon_GetData(pokemon, MON_DATA_STATUS, NULL);
// slp
if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_SLP_HEAL) && (status & MON_STATUS_SLP_MASK)) {
FreeToHeap(itemData);
@ -53,17 +53,17 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID
FreeToHeap(itemData);
return TRUE;
}
hp = GetMonData(pokemon, MON_DATA_HP, NULL);
hp = Pokemon_GetData(pokemon, MON_DATA_HP, NULL);
if ((GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE) || GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE_ALL)) && !GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP)) {
if (hp == 0) {
FreeToHeap(itemData);
return TRUE;
}
} else if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE) && hp != 0 && hp < GetMonData(pokemon, MON_DATA_MAX_HP, NULL)) {
} else if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE) && hp != 0 && hp < Pokemon_GetData(pokemon, MON_DATA_MAX_HP, NULL)) {
FreeToHeap(itemData);
return TRUE;
}
if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP) && GetMonData(pokemon, MON_DATA_LEVEL, NULL) < MAX_LEVEL) {
if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP) && Pokemon_GetData(pokemon, MON_DATA_LEVEL, NULL) < MAX_LEVEL) {
FreeToHeap(itemData);
return TRUE;
}
@ -72,7 +72,7 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID
return TRUE;
}
if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_UP) || GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_MAX)) {
if (GetMonData(pokemon, MON_DATA_MOVE1_PP_UPS + moveId, NULL) < 3 && WazaGetMaxPp((u16)GetMonData(pokemon, MON_DATA_MOVE1 + moveId, NULL), 0) >= 5) {
if (Pokemon_GetData(pokemon, MON_DATA_MOVE1_PP_UPS + moveId, NULL) < 3 && WazaGetMaxPp((u16)Pokemon_GetData(pokemon, MON_DATA_MOVE1 + moveId, NULL), 0) >= 5) {
FreeToHeap(itemData);
return TRUE;
}
@ -89,13 +89,13 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID
}
}
}
hpEv = (s32)GetMonData(pokemon, MON_DATA_HP_EV, NULL);
atkEv = (s32)GetMonData(pokemon, MON_DATA_ATK_EV, NULL);
defEv = (s32)GetMonData(pokemon, MON_DATA_DEF_EV, NULL);
speedEv = (s32)GetMonData(pokemon, MON_DATA_SPEED_EV, NULL);
spAtkEv = (s32)GetMonData(pokemon, MON_DATA_SPATK_EV, NULL);
spDefEv = (s32)GetMonData(pokemon, MON_DATA_SPDEF_EV, NULL);
if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_SHEDINJA && GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP)) {
hpEv = (s32)Pokemon_GetData(pokemon, MON_DATA_HP_EV, NULL);
atkEv = (s32)Pokemon_GetData(pokemon, MON_DATA_ATK_EV, NULL);
defEv = (s32)Pokemon_GetData(pokemon, MON_DATA_DEF_EV, NULL);
speedEv = (s32)Pokemon_GetData(pokemon, MON_DATA_SPEED_EV, NULL);
spAtkEv = (s32)Pokemon_GetData(pokemon, MON_DATA_SPATK_EV, NULL);
spDefEv = (s32)Pokemon_GetData(pokemon, MON_DATA_SPDEF_EV, NULL);
if (Pokemon_GetData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_SHEDINJA && GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP)) {
s32 dHpEv = (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP_PARAM);
if (dHpEv > 0) {
if (hpEv < MAX_EV && (hpEv + atkEv + defEv + speedEv + spAtkEv + spDefEv) < MAX_EV_SUM) {
@ -228,7 +228,7 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
hadEffect = FALSE;
effectFound = FALSE;
{
sp54 = sp50 = (int)GetMonData(pokemon, MON_DATA_STATUS, NULL);
sp54 = sp50 = (int)Pokemon_GetData(pokemon, MON_DATA_STATUS, NULL);
if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_SLP_HEAL)) {
sp54 &= ~MON_STATUS_SLP_MASK;
effectFound = TRUE;
@ -250,13 +250,13 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
effectFound = TRUE;
}
if (sp50 != sp54) {
SetMonData(pokemon, MON_DATA_STATUS, &sp54);
Pokemon_SetData(pokemon, MON_DATA_STATUS, &sp54);
hadEffect = TRUE;
}
}
{
sp50 = (int)GetMonData(pokemon, MON_DATA_HP, NULL);
sp54 = (int)GetMonData(pokemon, MON_DATA_MAX_HP, NULL);
sp50 = (int)Pokemon_GetData(pokemon, MON_DATA_HP, NULL);
sp54 = (int)Pokemon_GetData(pokemon, MON_DATA_MAX_HP, NULL);
if ((GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE) || GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE_ALL)) && GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP)) {
if (sp50 == 0) {
RestoreMonHPBy(pokemon, (u32)sp50, (u32)sp54, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE_PARAM));
@ -270,13 +270,13 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
}
effectFound = TRUE;
}
sp58 = (s32)GetMonData(pokemon, MON_DATA_LEVEL, NULL);
sp58 = (s32)Pokemon_GetData(pokemon, MON_DATA_LEVEL, NULL);
if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP)) {
if (sp58 < MAX_LEVEL) {
AddMonData(pokemon, MON_DATA_EXPERIENCE, (int)CalcMonExpToNextLevel(pokemon));
CalcMonLevelAndStats(pokemon);
AddMonData(pokemon, MON_DATA_EXPERIENCE, (int)Pokemon_CalcExpToNextLevel(pokemon));
Pokemon_CalcLevelAndStats(pokemon);
if (sp50 == 0) {
sp5C = (s32)GetMonData(pokemon, MON_DATA_MAX_HP, NULL);
sp5C = (s32)Pokemon_GetData(pokemon, MON_DATA_MAX_HP, NULL);
RestoreMonHPBy(pokemon, (u32)sp50, (u32)sp5C, (u32)(sp5C - sp54));
}
hadEffect = TRUE;
@ -313,19 +313,19 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
effectFound = TRUE;
}
{
sp50 = (s32)GetMonData(pokemon, MON_DATA_HP_EV, NULL);
sp54 = (s32)GetMonData(pokemon, MON_DATA_ATK_EV, NULL);
sp58 = (s32)GetMonData(pokemon, MON_DATA_DEF_EV, NULL);
sp5C = (s32)GetMonData(pokemon, MON_DATA_SPEED_EV, NULL);
sp60 = (s32)GetMonData(pokemon, MON_DATA_SPATK_EV, NULL);
sp64 = (s32)GetMonData(pokemon, MON_DATA_SPDEF_EV, NULL);
if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_SHEDINJA && GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP)) {
sp50 = (s32)Pokemon_GetData(pokemon, MON_DATA_HP_EV, NULL);
sp54 = (s32)Pokemon_GetData(pokemon, MON_DATA_ATK_EV, NULL);
sp58 = (s32)Pokemon_GetData(pokemon, MON_DATA_DEF_EV, NULL);
sp5C = (s32)Pokemon_GetData(pokemon, MON_DATA_SPEED_EV, NULL);
sp60 = (s32)Pokemon_GetData(pokemon, MON_DATA_SPATK_EV, NULL);
sp64 = (s32)Pokemon_GetData(pokemon, MON_DATA_SPDEF_EV, NULL);
if (Pokemon_GetData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_SHEDINJA && GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP)) {
sp6C = (int)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP_PARAM);
sp68 = TryModEV(sp50, sp54 + sp58 + sp5C + sp60 + sp64, sp6C);
if (sp68 != -1) {
sp50 = sp68;
SetMonData(pokemon, MON_DATA_HP_EV, &sp50);
CalcMonLevelAndStats(pokemon);
Pokemon_SetData(pokemon, MON_DATA_HP_EV, &sp50);
Pokemon_CalcLevelAndStats(pokemon);
hadEffect = TRUE;
}
if (sp6C > 0) {
@ -337,8 +337,8 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
sp68 = TryModEV(sp54, sp50 + sp58 + sp5C + sp60 + sp64, sp6C);
if (sp68 != -1) {
sp54 = sp68;
SetMonData(pokemon, MON_DATA_ATK_EV, &sp54);
CalcMonLevelAndStats(pokemon);
Pokemon_SetData(pokemon, MON_DATA_ATK_EV, &sp54);
Pokemon_CalcLevelAndStats(pokemon);
hadEffect = TRUE;
}
if (sp6C > 0) {
@ -350,8 +350,8 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
sp68 = TryModEV(sp58, sp50 + sp54 + sp5C + sp60 + sp64, sp6C);
if (sp68 != -1) {
sp58 = sp68;
SetMonData(pokemon, MON_DATA_DEF_EV, &sp58);
CalcMonLevelAndStats(pokemon);
Pokemon_SetData(pokemon, MON_DATA_DEF_EV, &sp58);
Pokemon_CalcLevelAndStats(pokemon);
hadEffect = TRUE;
}
if (sp6C > 0) {
@ -363,8 +363,8 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
sp68 = TryModEV(sp5C, sp50 + sp54 + sp58 + sp60 + sp64, sp6C);
if (sp68 != -1) {
sp5C = sp68;
SetMonData(pokemon, MON_DATA_SPEED_EV, &sp5C);
CalcMonLevelAndStats(pokemon);
Pokemon_SetData(pokemon, MON_DATA_SPEED_EV, &sp5C);
Pokemon_CalcLevelAndStats(pokemon);
hadEffect = TRUE;
}
if (sp6C > 0) {
@ -376,8 +376,8 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
sp68 = TryModEV(sp60, sp50 + sp54 + sp58 + sp5C + sp64, sp6C);
if (sp68 != -1) {
sp60 = sp68;
SetMonData(pokemon, MON_DATA_SPATK_EV, &sp60);
CalcMonLevelAndStats(pokemon);
Pokemon_SetData(pokemon, MON_DATA_SPATK_EV, &sp60);
Pokemon_CalcLevelAndStats(pokemon);
hadEffect = TRUE;
}
if (sp6C > 0) {
@ -389,8 +389,8 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
sp68 = TryModEV(sp64, sp50 + sp54 + sp58 + sp5C + sp60, sp6C);
if (sp68 != -1) {
sp64 = sp68;
SetMonData(pokemon, MON_DATA_SPDEF_EV, &sp64);
CalcMonLevelAndStats(pokemon);
Pokemon_SetData(pokemon, MON_DATA_SPDEF_EV, &sp64);
Pokemon_CalcLevelAndStats(pokemon);
hadEffect = TRUE;
}
if (sp6C > 0) {
@ -403,7 +403,7 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
return FALSE;
}
{
sp50 = (s32)GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL);
sp50 = (s32)Pokemon_GetData(pokemon, MON_DATA_FRIENDSHIP, NULL);
if (sp50 < 100) {
if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_LO)) {
DoItemFriendshipMod(pokemon, sp50, (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_LO_PARAM), location, heapId);
@ -442,12 +442,12 @@ BOOL UseItemOnMonInParty(struct Party *party, u16 itemId, s32 partyIdx, s32 move
}
u8 MonMoveCanRestorePP(struct Pokemon *pokemon, s32 moveIdx) {
u16 move_id = (u16)GetMonData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL);
u16 move_id = (u16)Pokemon_GetData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL);
if (move_id == MOVE_NONE) {
return FALSE;
}
u8 pp = (u8)GetMonData(pokemon, MON_DATA_MOVE1_PP + moveIdx, NULL);
u8 ppUp = (u8)GetMonData(pokemon, MON_DATA_MOVE1_PP_UPS + moveIdx, NULL);
u8 pp = (u8)Pokemon_GetData(pokemon, MON_DATA_MOVE1_PP + moveIdx, NULL);
u8 ppUp = (u8)Pokemon_GetData(pokemon, MON_DATA_MOVE1_PP_UPS + moveIdx, NULL);
return (u8)(pp < WazaGetMaxPp(move_id, ppUp));
}
@ -458,14 +458,14 @@ BOOL MonMoveRestorePP(struct Pokemon *pokemon, s32 moveIdx, s32 ppRestore) {
s32 ppAttr;
s32 ppUpAttr;
move_id = (u16)GetMonData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL);
move_id = (u16)Pokemon_GetData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL);
if (move_id == MOVE_NONE) {
return FALSE;
}
ppAttr = MON_DATA_MOVE1_PP + moveIdx;
pp = (u8)GetMonData(pokemon, ppAttr, NULL);
pp = (u8)Pokemon_GetData(pokemon, ppAttr, NULL);
ppUpAttr = MON_DATA_MOVE1_PP_UPS + moveIdx;
maxPp = WazaGetMaxPp(move_id, (u8)GetMonData(pokemon, ppUpAttr, NULL));
maxPp = WazaGetMaxPp(move_id, (u8)Pokemon_GetData(pokemon, ppUpAttr, NULL));
if (pp < maxPp) {
if (ppRestore == PP_RESTORE_ALL) {
pp = maxPp;
@ -475,7 +475,7 @@ BOOL MonMoveRestorePP(struct Pokemon *pokemon, s32 moveIdx, s32 ppRestore) {
pp = maxPp;
}
}
SetMonData(pokemon, ppAttr, &pp);
Pokemon_SetData(pokemon, ppAttr, &pp);
return TRUE;
}
return FALSE;
@ -488,16 +488,16 @@ BOOL BoostMonMovePpUpBy(struct Pokemon *pokemon, s32 moveIdx, u32 nPpUp) {
s32 ppAttr;
ppUpAttr = MON_DATA_MOVE1_PP_UPS + moveIdx;
ppUp = (u8)GetMonData(pokemon, ppUpAttr, NULL);
ppUp = (u8)Pokemon_GetData(pokemon, ppUpAttr, NULL);
if (ppUp == 3) {
return FALSE;
}
move = (u16)GetMonData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL);
move = (u16)Pokemon_GetData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL);
if (WazaGetMaxPp(move, 0) < 5) {
return FALSE;
}
ppAttr = MON_DATA_MOVE1_PP + moveIdx;
pp = (u8)GetMonData(pokemon, ppAttr, NULL);
pp = (u8)Pokemon_GetData(pokemon, ppAttr, NULL);
maxPp = WazaGetMaxPp(move, ppUp);
if (ppUp + nPpUp > 3) {
ppUp = 3;
@ -506,8 +506,8 @@ BOOL BoostMonMovePpUpBy(struct Pokemon *pokemon, s32 moveIdx, u32 nPpUp) {
}
newMaxPp = WazaGetMaxPp(move, ppUp);
pp = (u8)(pp + newMaxPp - maxPp);
SetMonData(pokemon, ppUpAttr, &ppUp);
SetMonData(pokemon, ppAttr, &pp);
Pokemon_SetData(pokemon, ppUpAttr, &ppUp);
Pokemon_SetData(pokemon, ppAttr, &pp);
return TRUE;
}
@ -526,7 +526,7 @@ void RestoreMonHPBy(struct Pokemon *pokemon, u32 hp, u32 maxHp, u32 restoration)
} else {
hp = hp + restoration;
}
SetMonData(pokemon, MON_DATA_HP, &hp);
Pokemon_SetData(pokemon, MON_DATA_HP, &hp);
}
s32 TryModEV(s32 ev, s32 evSum, s32 by) {
@ -552,7 +552,7 @@ s32 TryModEV(s32 ev, s32 evSum, s32 by) {
}
BOOL CanItemModFriendship(struct Pokemon *pokemon, struct ItemData *itemData) {
s32 friendship = (s32)GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL);
s32 friendship = (s32)Pokemon_GetData(pokemon, MON_DATA_FRIENDSHIP, NULL);
if (friendship >= 255) {
return FALSE;
}
@ -576,13 +576,13 @@ BOOL DoItemFriendshipMod(struct Pokemon *pokemon, s32 friendship, s32 mod, u16 l
return FALSE;
}
if (mod > 0) {
if (GetItemAttr((u16)GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), ITEMATTR_HOLD_EFFECT, heapId) == HOLD_EFFECT_FRIENDSHIP_UP) {
if (GetItemAttr((u16)Pokemon_GetData(pokemon, MON_DATA_HELD_ITEM, NULL), ITEMATTR_HOLD_EFFECT, heapId) == HOLD_EFFECT_FRIENDSHIP_UP) {
mod = mod * 150 / 100;
}
if (GetMonData(pokemon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) {
if (Pokemon_GetData(pokemon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) {
mod++;
}
if (location == GetMonData(pokemon, MON_DATA_EGG_LOCATION, NULL)) {
if (location == Pokemon_GetData(pokemon, MON_DATA_EGG_LOCATION, NULL)) {
mod++;
}
}
@ -593,7 +593,7 @@ BOOL DoItemFriendshipMod(struct Pokemon *pokemon, s32 friendship, s32 mod, u16 l
if (mod < 0) {
mod = 0;
}
SetMonData(pokemon, MON_DATA_FRIENDSHIP, &mod);
Pokemon_SetData(pokemon, MON_DATA_FRIENDSHIP, &mod);
return TRUE;
}
@ -606,12 +606,12 @@ void HealParty(struct Party *party) {
nmons = Party_GetCount(party);
for (i = 0; i < nmons; i++) {
struct Pokemon *pokemon = Party_GetMonByIndex(party, i);
if (GetMonData(pokemon, MON_DATA_SPECIES_EXISTS, NULL)) {
sp8 = GetMonData(pokemon, MON_DATA_MAX_HP, NULL);
SetMonData(pokemon, MON_DATA_HP, &sp8);
if (Pokemon_GetData(pokemon, MON_DATA_SPECIES_EXISTS, NULL)) {
sp8 = Pokemon_GetData(pokemon, MON_DATA_MAX_HP, NULL);
Pokemon_SetData(pokemon, MON_DATA_HP, &sp8);
sp8 = 0;
SetMonData(pokemon, MON_DATA_STATUS, &sp8);
Pokemon_SetData(pokemon, MON_DATA_STATUS, &sp8);
for (j = 0; j < MAX_MON_MOVES; j++) {
if (MonMoveCanRestorePP(pokemon, j) == 1) {

4
files/poketool/personal/personal.json.txt
View File

@ -7,9 +7,9 @@
#include "constants/abilities.h"
#include "constants/items.h"
u32 __size = sizeof(struct BaseStats);
u32 __size = sizeof(SpeciesData);
const struct BaseStats __data[] = {
const SpeciesData __data[] = {
## for mon in baseStats
// {{ mon.species }}
{

4
files/poketool/personal_pearl/personal.json.txt
View File

@ -7,9 +7,9 @@
#include "constants/abilities.h"
#include "constants/items.h"
u32 __size = sizeof(struct BaseStats);
u32 __size = sizeof(SpeciesData);
const struct BaseStats __data[] = {
const SpeciesData __data[] = {
## for mon in baseStats
// {{ mon.species }}
{

85
include/constants/pokemon.h
View File

@ -97,6 +97,8 @@
#define NATURE_CAREFUL 23
#define NATURE_QUIRKY 24
#define NATURE_NUM 25
// Pokemon Stats
#define STAT_HP 0
#define STAT_ATK 1
@ -107,8 +109,9 @@
#define STAT_ACC 6 // Only in battles.
#define STAT_EVASION 7 // Only in battles.
#define NUM_EV_STATS NUM_STATS - 1 // excludes HP
#define NUM_BATTLE_STATS NUM_STATS + 2 // includes Accuracy and Evasion
#define NUM_STATS 6
#define NUM_EV_STATS (NUM_STATS - 1) // excludes HP
#define NUM_BATTLE_STATS (NUM_STATS + 2) // includes Accuracy and Evasion
// Shiny odds
#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
@ -324,42 +327,46 @@ enum MonGender {
#define FRIENDSHIP_EVENT_FAINT_SMALL 6
#define FRIENDSHIP_EVENT_HEAL_FIELD_PSN 7
#define FRIENDSHIP_EVENT_FAINT_LARGE 8 // If opponent was >= 30 levels higher. See AdjustFriendshipOnBattleFaint
#define FRIENDHSIP_EVENT_CONTEST_WIN 9
#define FRIENDSHIP_EVENT_NUM 10
#define FRIENDSHIP_MAX 255
// TODO: Identify the rest of these
enum BaseStat {
BASE_HP = 0,
BASE_ATK,
BASE_DEF,
BASE_SPEED,
BASE_SPATK,
BASE_SPDEF,
BASE_TYPE1,
BASE_TYPE2,
BASE_CATCH_RATE,
BASE_EXP_YIELD,
BASE_HP_YIELD,
BASE_ATK_YIELD,
BASE_DEF_YIELD,
BASE_SPEED_YIELD,
BASE_SPATK_YIELD,
BASE_SPDEF_YIELD,
BASE_ITEM_1,
BASE_ITEM_2,
BASE_GENDER_RATIO,
BASE_EGG_CYCLES,
BASE_FRIENDSHIP,
BASE_GROWTH_RATE,
BASE_EGG_GROUP_1,
GASE_EGG_GROUP_2,
BASE_ABILITY_1,
BASE_ABILITY_2,
BASE_GREAT_MARSH_RATE,
BASE_COLOR,
BASE_FLIP,
BASE_TMHM_1,
BASE_TMHM_2,
BASE_TMHM_3,
BASE_TMHM_4,
enum SpeciesDataParam {
SPECIES_DATA_BASE_HP = 0,
SPECIES_DATA_BASE_ATK,
SPECIES_DATA_BASE_DEF,
SPECIES_DATA_BASE_SPEED,
SPECIES_DATA_BASE_SP_ATK,
SPECIES_DATA_BASE_SP_DEF,
SPECIES_DATA_TYPE_1,
SPECIES_DATA_TYPE_2,
SPECIES_DATA_CATCH_RATE,
SPECIES_DATA_EXP_YIELD,
SPECIES_DATA_EV_HP_YIELD,
SPECIES_DATA_EV_ATK_YIELD,
SPECIES_DATA_EV_DEF_YIELD,
SPECIES_DATA_EV_SPEED_YIELD,
SPECIES_DATA_EV_SP_ATK_YIELD,
SPECIES_DATA_EV_SP_DEF_YIELD,
SPECIES_DATA_HELD_ITEM_COMMON,
SPECIES_DATA_HELD_ITEM_RARE,
SPECIES_DATA_GENDER_RATIO,
SPECIES_DATA_EGG_CYCLES,
SPECIES_DATA_BASE_FRIENDSHIP,
SPECIES_DATA_EXP_RATE,
SPECIES_DATA_EGG_GROUP_1,
SPECIES_DATA_EGG_GROUP_2,
SPECIES_DATA_ABILITY_1,
SPECIES_DATA_ABILITY_2,
SPECIES_DATA_SAFARI_FLEE_RATE,
SPECIES_DATA_BODY_COLOR,
SPECIES_DATA_FLIP_SPRITE,
SPECIES_DATA_TM_LEARNSET_MASK_1,
SPECIES_DATA_TM_LEARNSET_MASK_2,
SPECIES_DATA_TM_LEARNSET_MASK_3,
SPECIES_DATA_TM_LEARNSET_MASK_4,
};
typedef enum {
@ -447,7 +454,8 @@ typedef enum {
UNOWN_Y = 24,
UNOWN_Z = 25,
UNOWN_EXCLAMATION_MARK = 26,
UNOWN_QUESTION_MARK = 27
UNOWN_QUESTION_MARK = 27,
UNOWN_FORM_MAX = 28,
} AlternateForms;
typedef enum EvoMethod {
@ -487,6 +495,9 @@ enum GrowthRate {
GROWTH_MEDIUM_SLOW,
GROWTH_FAST,
GROWTH_SLOW,
GROWTH_UNUSED_6,
GROWTH_UNUSED_7,
GROWTH_RATE_COUNT
};
#endif // POKEDIAMOND_CONSTANTS_POKEMON_H

263
include/pokemon.h
View File

@ -24,7 +24,7 @@
#define LEVEL_UP_LEARNSET_MOVE(x) ((u16)(((x) & LEVEL_UP_LEARNSET_MOVEID_MASK) >> LEVEL_UP_LEARNSET_MOVEID_SHIFT))
#define LEVEL_UP_LEARNSET_LVL(x) (((x) & LEVEL_UP_LEARNSET_LEVEL_MASK) >> LEVEL_UP_LEARNSET_LEVEL_SHIFT)
struct BaseStats {
typedef struct SpeciesData {
/* 0x00 */ u8 hp;
/* 0x01 */ u8 atk;
/* 0x02 */ u8 def;
@ -53,11 +53,11 @@ struct BaseStats {
/* 0x19 */ u8 color : 7;
u8 flip : 1;
u8 padding_1A[2];
/* 0x1C */ u32 unk1C;
/* 0x20 */ u32 unk20;
/* 0x24 */ u32 unk24;
/* 0x28 */ u32 unk28;
};
/* 0x1C */ u32 tmhm_1;
/* 0x20 */ u32 tmhm_2;
/* 0x24 */ u32 tmhm_3;
/* 0x28 */ u32 tmhm_4;
} SpeciesData;
// Structs
@ -73,56 +73,73 @@ typedef struct {
/* 0x10 */ u8 hpEV;
/* 0x11 */ u8 atkEV;
/* 0x12 */ u8 defEV;
/* 0x13 */ u8 spdEV;
/* 0x14 */ u8 spatkEV;
/* 0x15 */ u8 spdefEV;
/* 0x16 */ u8 coolStat;
/* 0x17 */ u8 beautyStat;
/* 0x18 */ u8 cuteStat;
/* 0x19 */ u8 smartStat;
/* 0x1A */ u8 toughStat;
/* 0x13 */ u8 speedEV;
/* 0x14 */ u8 spAtkEV;
/* 0x15 */ u8 spDefEV;
/* 0x16 */ u8 cool;
/* 0x17 */ u8 beauty;
/* 0x18 */ u8 cute;
/* 0x19 */ u8 smart;
/* 0x1A */ u8 tough;
/* 0x1B */ u8 sheen;
// TODO: Finish SinnohRibbonSet1
/* 0x1C */ u32 sinnohRibbons;
/* 0x1C */ u32 ribbonsDS1;
// u8 sinnohChampRibbon:1, abilityRibbon:1;
// u8 field_0x1d;
// u8 gorgeousRoyalRibbon:1, footprintRibbon:1;
// u8 field_0x1f;
} PokemonDataBlockA;
typedef struct {
typedef struct PokemonDataBlockB {
/* 0x00 */ u16 moves[4];
/* 0x08 */ u8 movePP[4];
/* 0x0C */ u8 movePpUps[4];
/* 0x10 */ u32 hpIV : 5, atkIV : 5, defIV : 5, spdIV : 5, spatkIV : 5, spdefIV : 5, isEgg : 1, isNicknamed : 1;
// TODO: Finish HoennRibbonSet
/* 0x14 */ u32 ribbonFlags; // cool, ...
/* 0x18 */ u8 fatefulEncounter : 1, gender : 2, alternateForm : 5;
/* 0x19 */ u8 HGSS_shinyLeaves; // TODO: Turn into bitfield
/* 0x1A */ u16 Unused;
/* 0x1C */ u16 Platinum_EggLocation;
/* 0x1E */ u16 Platinum_MetLocation;
/* 0x08 */ u8 moveCurrentPPs[4];
/* 0x0C */ u8 movePPUps[4];
/* 0x10 */ u32 hpIV : 5;
u32 atkIV : 5;
u32 defIV : 5;
u32 speedIV : 5;
u32 spAtkIV : 5;
u32 spDefIV : 5;
u32 isEgg : 1;
u32 hasNickname : 1;
/* 0x14 */ u32 ribbonsGBA; //!< A bitmask of ribbons introduced in Generation 3. Cool, Beauty, Cute, Smart, Tough, Champion, Winning, Victory, Artist, Effort, Marine, Land, Sky, Country, National, Earth and World Ribbons.
/* 0x18 */ u8 fatefulEncounter : 1;
u8 gender : 2;
u8 form : 5;
/* 0x19 */ u8 unused1; //!< First 6 bits track Shiny Leaves from HGSS.
/* 0x1A */ u16 unused2;
/* 0x1C */ u16 EggLocation_PtHGSS;
/* 0x1E */ u16 MetLocation_PtHGSS;
} PokemonDataBlockB;
typedef struct {
/* 0x00 */ u16 nickname[11];
/* 0x16 */ u8 Unused;
/* 0x00 */ u16 nickname[POKEMON_NAME_LENGTH + 1];
/* 0x16 */ u8 unused;
/* 0x17 */ u8 originGame;
// TODO: Finish SinnohRibbonSet2
/* 0x18 */ u64 sinnohRibbons2; // cool, ...
/* 0x18 */ u64 ribbonsDS2; //!< A bitmask of ribbons given to the Pokemon from Sinnoh's Super Contests.
} PokemonDataBlockC;
typedef struct {
/* 0x00 */ u16 otTrainerName[8];
/* 0x10 */ u8 dateEggReceived[3];
/* 0x13 */ u8 dateMet[3];
/* 0x00 */ u16 otName[PLAYER_NAME_LENGTH + 1];
/* 0x10 */ u8 eggYear;
/* 0x11 */ u8 eggMonth;
/* 0x12 */ u8 eggDay;
/* 0x13 */ u8 metYear;
/* 0x14 */ u8 metMonth;
/* 0x15 */ u8 metDay;
/* 0x16 */ u16 DP_EggLocation;
/* 0x18 */ u16 DP_MetLocation;
/* 0x1A */ u8 pokerus;
/* 0x1B */ u8 pokeball;
/* 0x1C */ u8 metLevel : 7;
u8 otGender : 1;
/* 0x1D */ u8 encounterType;
/* 0x1D */ u8 metTerrain;
/* 0x1E */ u16 HGSS_Pokeball;
} PokemonDataBlockD;
@ -134,21 +151,21 @@ typedef union {
} PokemonDataBlock;
typedef struct BoxPokemon {
/* 0x000 */ u32 pid;
/* 0x004 */ u16 party_lock : 1;
u16 box_lock : 1;
u16 checksum_fail : 1;
u16 Unused : 13; // Might be used for validity checks
/* 0x006 */ u16 checksum; // Stored checksum of pokemon
/* 0x008 */ PokemonDataBlock substructs[4];
/* 0x000 */ u32 personality;
/* 0x004 */ u16 partyDecrypted : 1;
u16 boxDecrypted : 1;
u16 checksumFailed : 1;
u16 unused : 13;
/* 0x006 */ u16 checksum;
/* 0x008 */ PokemonDataBlock dataBlocks[4];
} BoxPokemon;
struct PartyPokemon {
/* 0x088 */ u32 status; // slp:3, psn:1, brn:1, frz:1, prz:1, tox:1, ...
/* 0x08C */ u8 level;
/* 0x08D */ u8 capsule;
/* 0x08D */ u8 ballCapsuleID;
/* 0x08E */ u16 hp;
/* 0x090 */ u16 maxHp;
/* 0x090 */ u16 maxHP;
/* 0x092 */ u16 atk;
/* 0x094 */ u16 def;
/* 0x096 */ u16 speed;
@ -205,114 +222,114 @@ typedef struct Party {
struct Pokemon mons[PARTY_SIZE];
} Party;
void ZeroMonData(struct Pokemon *pokemon);
void ZeroBoxMonData(struct BoxPokemon *boxmon);
void Pokemon_Init(Pokemon *mon);
void BoxPokemon_Init(BoxPokemon *boxMon);
u32 SizeOfStructPokemon(void);
struct Pokemon *AllocMonZeroed(HeapID heapId);
BOOL AcquireMonLock(struct Pokemon *mon);
BOOL ReleaseMonLock(struct Pokemon *mon, BOOL decrypt_result);
BOOL AcquireBoxMonLock(struct BoxPokemon *mon);
BOOL ReleaseBoxMonLock(struct BoxPokemon *mon, BOOL decrypt_result);
void CreateMon(struct Pokemon *pokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId);
void CreateBoxMon(struct BoxPokemon *boxPokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId);
void CreateMonWithNature(struct Pokemon *pokemon, u16 species, u8 level, u8 fixedIv, u8 nature);
void CreateMonWithGenderNatureLetter(struct Pokemon *pokemon, u16 species, u8 level, u8 fixedIv, u8 gender, u8 nature, u8 letter);
u32 GenPersonalityByGenderAndNature(u16 species, u8 gender, u8 nature);
void CreateMonWithFixedIVs(struct Pokemon *pokemon, int species, int level, int ivs, int personality);
void CalcMonLevelAndStats(struct Pokemon *pokemon);
void CalcMonStats(struct Pokemon *pokemon);
Pokemon *Pokemon_New(HeapID heapId);
BOOL AcquireMonLock(Pokemon *mon);
BOOL ReleaseMonLock(Pokemon *mon, BOOL decrypt_result);
BOOL AcquireBoxMonLock(BoxPokemon *boxMon);
BOOL ReleaseBoxMonLock(BoxPokemon *boxMon, BOOL decrypt_result);
void Pokemon_InitWithParams(Pokemon *mon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId);
void BoxPokemon_InitWithParams(BoxPokemon *boxMon, int species, int level, int ivs, BOOL hasFixedPersonality, int personality, int otIDType, int otID);
void Pokemon_InitWithNature(Pokemon *mon, u16 species, u8 level, u8 fixedIv, u8 nature);
void Pokemon_InitWithGenderNatureLetter(Pokemon *mon, u16 species, u8 level, u8 ivs, u8 gender, u8 nature, u8 letter);
u32 Personality_CreateFromGenderAndNature(u16 species, u8 gender, u8 nature);
void CreateMonWithFixedIVs(Pokemon *mon, int species, int level, int ivs, int personality);
void Pokemon_CalcLevelAndStats(Pokemon *mon);
void Pokemon_CalcStats(Pokemon *mon);
#ifndef IN_POKEMON_C
u32 GetMonData();
u32 GetBoxMonData();
u32 Pokemon_GetData();
u32 BoxPokemon_GetData();
#else
u32 GetMonData(struct Pokemon *pokemon, int attr, void *ptr);
u32 GetBoxMonData(struct BoxPokemon *pokemon, int attr, void *ptr);
u32 Pokemon_GetData(Pokemon *mon, int param, void *ptr);
u32 BoxPokemon_GetData(BoxPokemon *boxMon, int param, void *ptr);
#endif
void SetMonData(struct Pokemon *pokemon, int attr, void *ptr);
void SetBoxMonData(struct BoxPokemon *pokemon, int attr, void *ptr);
void AddMonData(struct Pokemon *pokemon, int attr, int amount);
struct BaseStats *AllocAndLoadMonPersonal(int species, HeapID heapId);
int GetPersonalAttr(struct BaseStats *baseStats, enum BaseStat attr);
void FreeMonPersonal(struct BaseStats *personal);
int GetMonBaseStat_HandleFormConversion(int species, int form, enum BaseStat stat_id);
int GetMonBaseStat(int species, enum BaseStat stat_id);
u8 GetPercentProgressTowardsNextLevel(struct Pokemon *pokemon);
u32 CalcMonExpToNextLevel(struct Pokemon *pokemon);
u32 GetMonBaseExperienceAtCurrentLevel(struct Pokemon *pokemon);
u32 GetMonExpBySpeciesAndLevel(int species, int level);
void LoadGrowthTable(int growthRate, u32 *table);
u32 GetExpByGrowthRateAndLevel(int rate, int level);
int CalcMonLevel(struct Pokemon *pokemon);
int CalcBoxMonLevel(struct BoxPokemon *boxmon);
int CalcLevelBySpeciesAndExp(u16 species, u32 experience);
int CalcLevelBySpeciesAndExp_PreloadedPersonal(struct BaseStats *personal, u16 species, u32 experience);
u8 GetBoxMonNature(struct BoxPokemon *boxmon);
u8 GetMonNature(struct Pokemon *mon);
u8 GetNatureFromPersonality(u32 pid);
void MonApplyFriendshipMod(struct Pokemon *pokemon, u32 kind, u32 location);
u8 GetMonGender(struct Pokemon *pokemon);
u8 GetBoxMonGender(struct BoxPokemon *boxmon);
u8 GetGenderBySpeciesAndPersonality(u16 species, u32 pid);
u8 MonIsShiny(struct Pokemon *pokemon);
u32 GenerateShinyPersonality(u32 otid);
void sub_02068B70(struct SomeDrawPokemonStruct *spC, struct BoxPokemon *boxmon, u8 sp10);
void Pokemon_SetData(Pokemon *mon, int param, void *ptr);
void BoxPokemon_SetData(BoxPokemon *boxMon, int param, void *ptr);
void AddMonData(Pokemon *mon, int param, int amount);
SpeciesData *SpeciesData_NewFromSpecies(int species, HeapID heapId);
int SpeciesData_GetValue(SpeciesData *speciesData, enum SpeciesDataParam attr);
void SpeciesData_Free(SpeciesData *speciesData);
int Species_GetFormValue(int species, int form, enum SpeciesDataParam stat_id);
int Species_GetValue(int species, enum SpeciesDataParam stat_id);
u8 Pokemon_CalcPercentToNextLevel(Pokemon *mon);
u32 Pokemon_CalcExpToNextLevel(Pokemon *mon);
u32 Pokemon_GetCurrentLevelBaseExp(Pokemon *mon);
u32 Species_GetExpAtLevel(int species, int level);
void ExpRate_LoadTable(int growthRate, u32 *table);
u32 ExpRate_GetExpAtLevel(int rate, int level);
int Pokemon_CalcLevel(Pokemon *mon);
int BoxPokemon_CalcLevel(BoxPokemon *boxMon);
int Species_CalcLevelByExp(u16 species, u32 experience);
int SpeciesData_CalcLevelByExp(SpeciesData *speciesData, u16 species, u32 experience);
u8 BoxPokemon_GetNature(BoxPokemon *boxMon);
u8 Pokemon_GetNature(Pokemon *mon);
u8 Personality_GetNature(u32 personality);
void Pokemon_UpdateFriendship(Pokemon *mon, u32 kind, u32 location);
u8 Pokemon_GetGender(Pokemon *mon);
u8 BoxPokemon_GetGender(BoxPokemon *boxMon);
u8 Species_GetGenderFromPersonality(u16 species, u32 personality);
u8 Pokemon_IsShiny(Pokemon *mon);
u32 Personality_GenerateShiny(u32 otID);
void sub_02068B70(struct SomeDrawPokemonStruct *spC, BoxPokemon *boxMon, u8 sp10);
void sub_02068C00(struct SomeDrawPokemonStruct *spC, int species, u8 gender, u8 sp10, u8 shiny, u8 form, u32 personality);
u8 sub_02068E14(struct Pokemon *pokemon, u32 a1);
u8 sub_02068E1C(struct BoxPokemon *boxmon, u32 a1);
u8 sub_02068E14(Pokemon *mon, u32 a1);
u8 sub_02068E1C(BoxPokemon *boxMon, u32 a1);
u8 sub_02068E88(int species, u8 gender, u32 a2, u8 form, u32 pid);
u32 GetArceusTypeByHeldItemEffect(u16 plate);
int sub_0206AA30(int a0);
void sub_02068B68(struct SomeDrawPokemonStruct *spC, struct Pokemon *pokemon, u8 sp10);
void sub_02068B68(struct SomeDrawPokemonStruct *spC, Pokemon *mon, u8 sp10);
void sub_02068FE0(struct SomeDrawPokemonStruct *a0, u16 a1, int a2);
void sub_02069010(void *dest, int a1);
void sub_02069038(u32 a0, u32 a1, u32 a2, s32 a3, u32 a4, u32 a5, u32 a6);
void sub_020690AC(struct SomeDrawPokemonStruct *a0, u32 a1);
u32 sub_020690C4(void);
u32 sub_020690C8(void);
u8 GetBoxMonUnownLetter(struct BoxPokemon *boxmon);
u8 GetMonUnownLetter(struct Pokemon *pokemon);
u8 GetBoxMonUnownLetter(BoxPokemon *boxMon);
u8 GetMonUnownLetter(Pokemon *mon);
void LoadLevelUpLearnset_HandleAlternateForm(int species, int form, u16 *levelUpLearnset);
struct BoxPokemon *sub_020690E4(struct Pokemon *pokemon);
BoxPokemon *sub_020690E4(Pokemon *mon);
u16 GetMonEvolution(struct Party *party, struct Pokemon *pokemon, u32 context, u32 usedItem, u32 *method_ret);
u16 GetMonEvolution(struct Party *party, Pokemon *mon, u32 context, u32 usedItem, u32 *method_ret);
u16 ReadFromPersonalPmsNarc(u16 species);
u16 GetEggSpecies(u16 species);
BOOL sub_020690E8(struct Pokemon *pokemon);
u32 sub_02069698(struct Pokemon *pokemon, u16 move);
void sub_02069708(struct Pokemon *pokemon, u16 move);
void sub_02069718(struct BoxPokemon *boxmon, u16 move);
void MonSetMoveInSlot(struct Pokemon *pokemon, u16 move, u8 slot);
u32 sub_02069818(struct Pokemon *pokemon, u32 *r5, u16 *sp0);
void sub_020698E0(struct Pokemon *pokemon, int slot1, int slot2);
void sub_020698E8(struct BoxPokemon *boxmon, int slot1, int slot2);
void sub_020699A4(struct Pokemon *pokemon, u32 slot);
void CopyBoxPokemonToPokemon(struct BoxPokemon *src, struct Pokemon *dest);
BOOL sub_020690E8(Pokemon *mon);
u32 sub_02069698(Pokemon *mon, u16 move);
void sub_02069708(Pokemon *mon, u16 move);
void sub_02069718(BoxPokemon *boxMon, u16 move);
void MonSetMoveInSlot(Pokemon *mon, u16 move, u8 slot);
u32 sub_02069818(Pokemon *mon, u32 *r5, u16 *sp0);
void sub_020698E0(Pokemon *mon, int slot1, int slot2);
void sub_020698E8(BoxPokemon *boxMon, int slot1, int slot2);
void sub_020699A4(Pokemon *mon, u32 slot);
void CopyBoxPokemonToPokemon(BoxPokemon *src, Pokemon *dest);
u8 Party_GetMaxLevel(struct Party *party);
u16 SpeciesToSinnohDexNo(u16 species);
u16 SinnohDexNoToSpecies(u16 sinnoh_dex);
void CopyPokemonToPokemon(struct Pokemon *src, struct Pokemon *dest);
void CopyPokemonToBoxPokemon(struct Pokemon *src, struct BoxPokemon *dest);
void CopyBoxPokemonToBoxPokemon(struct BoxPokemon *src, struct BoxPokemon *dest);
s8 MonGetFlavorPreference(struct Pokemon *pokemon, int flavor);
void CopyPokemonToPokemon(Pokemon *src, Pokemon *dest);
void CopyPokemonToBoxPokemon(Pokemon *src, BoxPokemon *dest);
void CopyBoxPokemonToBoxPokemon(BoxPokemon *src, BoxPokemon *dest);
s8 MonGetFlavorPreference(Pokemon *mon, int flavor);
int Species_LoadLearnsetTable(u16 species, u32 form, u16 *dest);
void Party_GivePokerusAtRandom(struct Party *party);
void Party_UpdatePokerus(struct Party *party, int r5);
void Party_SpreadPokerus(struct Party *party);
BOOL Pokemon_HasPokerus(struct Pokemon *pokemon);
BOOL Pokemon_IsImmuneToPokerus(struct Pokemon *pokemon);
void Pokemon_UpdateArceusForm(struct Pokemon *pokemon);
BOOL Pokemon_HasPokerus(Pokemon *mon);
BOOL Pokemon_IsImmuneToPokerus(Pokemon *mon);
void Pokemon_UpdateArceusForm(Pokemon *mon);
void sub_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp18, u32 sp1C, HeapID heapId);
void sub_0206A014(struct Pokemon *pokemon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heapId);
void sub_0206A094(struct Pokemon *pokemon, u32 a1, u32 a2);
BOOL sub_0206A13C(struct Pokemon *pokemon, u32 a1);
void sub_0206A1C4(struct Pokemon *pokemon);
void sub_0206A23C(struct Pokemon *r5, u32 personality);
void sub_0206A014(Pokemon *mon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heapId);
void sub_0206A094(Pokemon *mon, u32 a1, u32 a2);
BOOL sub_0206A13C(Pokemon *mon, u32 a1);
void sub_0206A1C4(Pokemon *mon);
void sub_0206A23C(Pokemon *r5, u32 personality);
int LowestFlagNo(u32 mask);
BOOL IsPokemonLegendaryOrMythical(u16 species);
u16 GetLegendaryMon(u32 idx);
BOOL sub_0206A998(struct Pokemon *pokemon);
BOOL sub_0206A9AC(struct BoxPokemon *boxmon, PlayerProfile *sb2, HeapID heapId);
void Pokemon_RemoveCapsule(struct Pokemon *pokemon);
void RestoreBoxMonPP(struct BoxPokemon *boxmon);
BOOL sub_0206A998(Pokemon *mon);
BOOL sub_0206A9AC(BoxPokemon *boxMon, PlayerProfile *sb2, HeapID heapId);
void Pokemon_RemoveCapsule(Pokemon *mon);
void RestoreBoxMonPP(BoxPokemon *boxMon);
#endif // POKEDIAMOND_POKEMON_H