Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-09 01:26:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Name more routines in pokemon.s

Browse Source
This commit is contained in:
PikalaxALT
2020-06-07 21:09:35 -04:00
parent 5dfe344038
commit fb938eada9
23 changed files with 154 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
arm9/asm/pokemon.s
View File

@@ -443,7 +443,7 @@ _02066BDE:
bl FUN_02067960
ldr r0, [sp, #0x24]
ldr r1, [sp, #0x28]
bl FUN_02068758
bl GetMonExpByLevel
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x8
@@ -451,7 +451,7 @@ _02066BDE:
bl FUN_02067960
ldr r0, [sp, #0x24]
mov r1, #0x14
bl FUN_02068678
bl GetMonBaseStat
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x9
@@ -561,11 +561,11 @@ _02066C94:
_02066D18:
ldr r0, [sp, #0x24]
mov r1, #0x18
bl FUN_02068678
bl GetMonBaseStat
str r0, [sp, #0x8]
ldr r0, [sp, #0x24]
mov r1, #0x19
bl FUN_02068678
bl GetMonBaseStat
str r0, [sp, #0x4]
cmp r0, #0x0
beq _02066D50
@@ -731,7 +731,7 @@ FUN_02066E74: ; 0x02066E74
add r5, r1, #0x0
mov r1, #0x12
add r4, r2, #0x0
bl FUN_02068678
bl GetMonBaseStat
lsl r0, r0, #0x18
lsr r0, r0, #0x18
beq _02066EA0
@@ -896,7 +896,7 @@ FUN_02066F04: ; 0x02066F04
ldr r1, [sp, #0x38]
add r0, r7, #0x0
add r2, r6, #0x0
bl FUN_0206A380
bl LoadMonBaseStats_HandleUnownOrArceus
mov r0, #0x49
lsl r0, r0, #0x2
cmp r7, r0
@@ -1588,7 +1588,7 @@ _0206753C:
_02067540:
ldrh r0, [r5, #0x0]
ldr r1, [r5, #0x8]
bl FUN_02068800
bl CalcMonLevel
add r4, r0, #0x0
b _0206781A
_0206754C:
@@ -2003,7 +2003,7 @@ _020677FC:
sub r2, #0xaa
lsr r1, r1, #0x1b
str r2, [sp, #0x4]
bl FUN_02068654
bl GetMonBaseStat_HandleUnownOrArceus
add r4, r0, #0x0
b _0206781A
_02067810:
@@ -3436,14 +3436,14 @@ _0206814E: ; jump table (using 16-bit offset)
_020682B4:
ldrh r0, [r4, #0x0]
mov r1, #0x64
bl FUN_02068758
bl GetMonExpByLevel
ldr r1, [r4, #0x8]
add r1, r1, r6
cmp r1, r0
bls _020682D2
ldrh r0, [r4, #0x0]
mov r1, #0x64
bl FUN_02068758
bl GetMonExpByLevel
add sp, #0xc
str r0, [r4, #0x8]
pop {r4-r7, pc}
@@ -3773,8 +3773,8 @@ _02068510: .word 0xFFF07FFF
_02068514: .word 0xFE0FFFFF
_02068518: .word 0xC1FFFFFF
thumb_func_start FUN_0206851C
FUN_0206851C: ; 0x0206851C
thumb_func_start AllocAndLoadMonPersonal
AllocAndLoadMonPersonal: ; 0x0206851C
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
@@ -3788,8 +3788,8 @@ FUN_0206851C: ; 0x0206851C
pop {r3-r5, pc}
.balign 4
thumb_func_start FUN_02068538
FUN_02068538: ; 0x02068538
thumb_func_start GetPersonalAttr
GetPersonalAttr: ; 0x02068538
push {r4-r6, lr}
add r4, r0, #0x0
add r6, r1, #0x0
@@ -3958,8 +3958,8 @@ _0206863A:
pop {r4-r6, pc}
.balign 4
thumb_func_start FUN_02068640
FUN_02068640: ; 0x02068640
thumb_func_start FreeMonPersonal
FreeMonPersonal: ; 0x02068640
push {r4, lr}
add r4, r0, #0x0
bne _0206864A
@@ -3970,35 +3970,35 @@ _0206864A:
pop {r4, pc}
.balign 4
thumb_func_start FUN_02068654
FUN_02068654: ; 0x02068654
thumb_func_start GetMonBaseStat_HandleUnownOrArceus
GetMonBaseStat_HandleUnownOrArceus: ; 0x02068654
push {r3-r5, lr}
add r4, r2, #0x0
bl ConvertUnownOrArceusSpecies
mov r1, #0x0
bl FUN_0206851C
bl AllocAndLoadMonPersonal
add r5, r0, #0x0
add r1, r4, #0x0
bl FUN_02068538
bl GetPersonalAttr
add r4, r0, #0x0
add r0, r5, #0x0
bl FUN_02068640
bl FreeMonPersonal
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
thumb_func_start FUN_02068678
FUN_02068678: ; 0x02068678
thumb_func_start GetMonBaseStat
GetMonBaseStat: ; 0x02068678
push {r3-r5, lr}
add r4, r1, #0x0
mov r1, #0x0
bl FUN_0206851C
bl AllocAndLoadMonPersonal
add r5, r0, #0x0
add r1, r4, #0x0
bl FUN_02068538
bl GetPersonalAttr
add r4, r0, #0x0
add r0, r5, #0x0
bl FUN_02068640
bl FreeMonPersonal
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -4023,11 +4023,11 @@ FUN_02068698: ; 0x02068698
lsr r7, r0, #0x18
add r0, r6, #0x0
add r1, r7, #0x0
bl FUN_02068758
bl GetMonExpByLevel
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r7, #0x1
bl FUN_02068758
bl GetMonExpByLevel
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0x8
@@ -4074,7 +4074,7 @@ FUN_02068700: ; 0x02068700
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r5, #0x0
bl FUN_02068758
bl GetMonExpByLevel
sub r0, r0, r4
pop {r4-r6, pc}
@@ -4092,16 +4092,16 @@ FUN_02068734: ; 0x02068734
bl FUN_020671BC
add r1, r0, #0x0
add r0, r4, #0x0
bl FUN_02068758
bl GetMonExpByLevel
pop {r3-r5, pc}
.balign 4
thumb_func_start FUN_02068758
FUN_02068758: ; 0x02068758
thumb_func_start GetMonExpByLevel
GetMonExpByLevel: ; 0x02068758
push {r4, lr}
add r4, r1, #0x0
mov r1, #0x15
bl FUN_02068678
bl GetMonBaseStat
add r1, r4, #0x0
bl GetExpByGrowthRateAndLevel
pop {r4, pc}
@@ -4180,34 +4180,34 @@ FUN_020687C8: ; 0x020687C8
lsl r0, r4, #0x10
lsr r0, r0, #0x10
add r1, r7, #0x0
bl FUN_02068800
bl CalcMonLevel
pop {r3-r7, pc}
.balign 4
thumb_func_start FUN_02068800
FUN_02068800: ; 0x02068800
thumb_func_start CalcMonLevel
CalcMonLevel: ; 0x02068800
push {r4-r6, lr}
add r4, r1, #0x0
add r5, r0, #0x0
mov r1, #0x0
bl FUN_0206851C
bl AllocAndLoadMonPersonal
add r6, r0, #0x0
add r1, r5, #0x0
add r2, r4, #0x0
bl FUN_02068824
bl CalcMonLevelInternal
add r4, r0, #0x0
add r0, r6, #0x0
bl FUN_02068640
bl FreeMonPersonal
add r0, r4, #0x0
pop {r4-r6, pc}
.balign 4
thumb_func_start FUN_02068824
FUN_02068824: ; 0x02068824
thumb_func_start CalcMonLevelInternal
CalcMonLevelInternal: ; 0x02068824
push {r4, lr}
mov r1, #0x15
add r4, r2, #0x0
bl FUN_02068538
bl GetPersonalAttr
ldr r1, _0206884C ; =UNK_021C5AC0
bl LoadGrowthTable
ldr r2, _02068850 ; =UNK_021C5AC0 + 4
@@ -4475,14 +4475,14 @@ FUN_02068A20: ; 0x02068A20
add r4, r1, #0x0
add r5, r0, #0x0
mov r1, #0x0
bl FUN_0206851C
bl AllocAndLoadMonPersonal
add r6, r0, #0x0
add r1, r5, #0x0
add r2, r4, #0x0
bl FUN_02068A44
add r4, r0, #0x0
add r0, r6, #0x0
bl FUN_02068640
bl FreeMonPersonal
add r0, r4, #0x0
pop {r4-r6, pc}
.balign 4
@@ -4492,7 +4492,7 @@ FUN_02068A44: ; 0x02068A44
push {r4, lr}
mov r1, #0x12
add r4, r2, #0x0
bl FUN_02068538
bl GetPersonalAttr
lsl r0, r0, #0x18
lsr r1, r0, #0x18
beq _02068A5E
@@ -5467,7 +5467,7 @@ FUN_020690E8: ; 0x020690E8
str r0, [sp, #0x4]
add r0, r5, #0x0
mov r1, #0x15
bl FUN_02068678
bl GetMonBaseStat
mov r1, #0x64
add r5, r0, #0x0
bl GetExpByGrowthRateAndLevel
@@ -5575,7 +5575,7 @@ _020691EA:
str r0, [sp, #0x18]
ldr r0, [sp, #0x2c]
ldr r1, [sp, #0x18]
bl FUN_0206A394
bl LoadMonEvolutionTable
cmp r4, #0x3
bls _02069202
b _0206954A
@@ -6029,8 +6029,8 @@ _0206954A:
pop {r4-r7, pc}
.balign 4
thumb_func_start FUN_02069558
FUN_02069558: ; 0x02069558
thumb_func_start ReadFromPersonalPmsNarc
ReadFromPersonalPmsNarc: ; 0x02069558
push {r3-r4, lr}
sub sp, #0x4c
add r4, r0, #0x0
@@ -6065,8 +6065,8 @@ _0206956E:
_020695A0: .word 0x000001EE
_020695A4: .word UNK_02105FC8
thumb_func_start FUN_020695A8
FUN_020695A8: ; 0x020695A8
thumb_func_start GetEggSpecies
GetEggSpecies: ; 0x020695A8
push {r3, lr}
cmp r0, #0xb9
bgt _020695CC
@@ -6105,7 +6105,7 @@ _020695E2:
cmp r0, r1
beq _020695EC
_020695E8:
bl FUN_02069558
bl ReadFromPersonalPmsNarc
_020695EC:
pop {r3, pc}
nop
@@ -7540,13 +7540,13 @@ FUN_0206A094: ; 0x0206A094
ldr r1, [sp, #0x0]
add r0, r6, #0x0
mov r2, #0x10
bl FUN_02068654
bl GetMonBaseStat_HandleUnownOrArceus
add r1, sp, #0x4
strh r0, [r1, #0x2]
ldr r1, [sp, #0x0]
add r0, r6, #0x0
mov r2, #0x11
bl FUN_02068654
bl GetMonBaseStat_HandleUnownOrArceus
add r1, sp, #0x4
strh r0, [r1, #0x0]
ldrh r2, [r1, #0x2]
@@ -7658,7 +7658,7 @@ _0206A1A6:
lsl r4, r2
mov r2, #0x20
_0206A1B0:
bl FUN_02068654
bl GetMonBaseStat_HandleUnownOrArceus
tst r0, r4
beq _0206A1BC
mov r0, #0x1
@@ -7695,11 +7695,11 @@ FUN_0206A1CC: ; 0x0206A1CC
add r6, r0, #0x0
add r0, r4, #0x0
mov r1, #0x18
bl FUN_02068678
bl GetMonBaseStat
str r0, [sp, #0x4]
add r0, r4, #0x0
mov r1, #0x19
bl FUN_02068678
bl GetMonBaseStat
str r0, [sp, #0x0]
cmp r0, #0x0
beq _0206A226
@@ -7880,8 +7880,8 @@ FUN_0206A370: ; 0x0206A370
nop
_0206A37C: .word ReadWholeNarcMemberByIdPair
thumb_func_start FUN_0206A380
FUN_0206A380: ; 0x0206A380
thumb_func_start LoadMonBaseStats_HandleUnownOrArceus
LoadMonBaseStats_HandleUnownOrArceus: ; 0x0206A380
push {r4, lr}
add r4, r2, #0x0
bl ConvertUnownOrArceusSpecies
@@ -7891,8 +7891,8 @@ FUN_0206A380: ; 0x0206A380
bl ReadWholeNarcMemberByIdPair
pop {r4, pc}
thumb_func_start FUN_0206A394
FUN_0206A394: ; 0x0206A394
thumb_func_start LoadMonEvolutionTable
LoadMonEvolutionTable: ; 0x0206A394
ldr r3, _0206A3A0 ; =ReadWholeNarcMemberByIdPair
add r2, r0, #0x0
add r0, r1, #0x0

2
arm9/asm/unk_02023C40.s
View File

@@ -975,7 +975,7 @@ FUN_020242C8: ; 0x020242C8
add r0, r6, #0x0
mov r1, #0x12
add r4, r2, #0x0
bl FUN_02068678
bl GetMonBaseStat
cmp r0, #0xff
bne _020242EA
cmp r4, #0x0

2
arm9/asm/unk_020476CC.s
View File

@@ -677,7 +677,7 @@ _02047C40:
mov r2, #0x0
bl FUN_020671BC
add r1, r7, #0x0
bl FUN_02068758
bl GetMonExpByLevel
str r0, [sp, #0x18]
add r0, r5, #0x0
mov r1, #0x8

2
arm9/asm/unk_0206BB5C.s
View File

@@ -70,7 +70,7 @@ _0206BBD0:
cmp r0, #0x0
bne _0206BBEA
add r0, r6, #0x0
bl FUN_020695A8
bl GetEggSpecies
cmp r6, r0
beq _0206BBEA
mov r0, #0x0

4
arm9/asm/unk_02079C70.s
View File

@@ -2013,7 +2013,7 @@ _0207AC1E:
ldrh r0, [r5, #0xc]
lsl r1, r1, #0x19
lsr r1, r1, #0x19
bl FUN_02068758
bl GetMonExpByLevel
str r0, [r5, #0x1c]
ldrb r0, [r5, #0x12]
lsl r0, r0, #0x19
@@ -2025,7 +2025,7 @@ _0207AC1E:
_0207ACAA:
ldrh r0, [r5, #0xc]
add r1, r1, #0x1
bl FUN_02068758
bl GetMonExpByLevel
_0207ACB2:
str r0, [r5, #0x20]
add r0, r6, #0x0

2
arm9/asm/unk_0207C328.s
View File

@@ -1893,7 +1893,7 @@ _0207D00C:
lsl r0, r0, #0x2
ldrh r0, [r4, r0]
mov r1, #0x1c
bl FUN_02068678
bl GetMonBaseStat
add r2, r0, #0x0
ldr r0, _0207D068 ; =0x00000454
mov r1, #0x1

2
arm9/asm/unk_0207EF6C.s
View File

@@ -1169,7 +1169,7 @@ _0207F876:
lsl r0, r0, #0x2
ldrh r0, [r4, r0]
mov r1, #0x1c
bl FUN_02068678
bl GetMonBaseStat
mov r1, #0x1
eor r0, r1
mov r1, #0xb6

20
arm9/global.inc
View File

@@ -4724,19 +4724,19 @@
.extern FUN_02067830
.extern FUN_02067960
.extern FUN_02068018
.extern FUN_0206851C
.extern FUN_02068538
.extern FUN_02068640
.extern FUN_02068654
.extern FUN_02068678
.extern AllocAndLoadMonPersonal
.extern GetPersonalAttr
.extern FreeMonPersonal
.extern GetMonBaseStat_HandleUnownOrArceus
.extern GetMonBaseStat
.extern FUN_02068698
.extern FUN_020686F8
.extern FUN_02068734
.extern FUN_02068758
.extern GetMonExpByLevel
.extern FUN_020687C0
.extern FUN_020687C8
.extern FUN_02068800
.extern FUN_02068824
.extern CalcMonLevel
.extern CalcMonLevelInternal
.extern FUN_02068854
.extern FUN_0206885C
.extern GetNatureFromPersonality
@@ -4765,8 +4765,8 @@
.extern FUN_020690E4
.extern FUN_020690E8
.extern FUN_02069168
.extern FUN_02069558
.extern FUN_020695A8
.extern ReadFromPersonalPmsNarc
.extern GetEggSpecies
.extern FUN_02069698
.extern FUN_02069708
.extern FUN_020697CC

10
arm9/modules/05/asm/module_05.s
View File

@@ -44333,7 +44333,7 @@ _021ECE8C:
lsl r1, r0, #1
add r0, sp, #0xc
ldrh r0, [r0, r1]
bl FUN_02069558
bl ReadFromPersonalPmsNarc
add r4, r0, #0
cmp r4, #0x1d
bne _021ECEBC
@@ -44403,7 +44403,7 @@ MOD05_021ECF14: ; 0x021ECF14
add r0, r6, #0
mov r1, #0x13
add r4, r3, #0
bl FUN_02068678
bl GetMonBaseStat
add r1, sp, #0x10
strb r0, [r1]
mov r0, #0
@@ -44514,7 +44514,7 @@ MOD05_021ED00C: ; 0x021ED00C
mov r1, #0x13
add r5, r2, #0
add r6, r3, #0
bl FUN_02068678
bl GetMonBaseStat
add r1, sp, #0x14
strb r0, [r1]
add r0, r5, #0
@@ -44783,11 +44783,11 @@ _021ED228:
stmia r7!, {r0}
ldrh r0, [r4]
mov r1, #0x16
bl FUN_02068678
bl GetMonBaseStat
strh r0, [r6]
ldrh r0, [r4]
mov r1, #0x17
bl FUN_02068678
bl GetMonBaseStat
strh r0, [r6, #2]
ldr r0, [sp]
add r5, r5, #4

18
arm9/modules/06/asm/module_06.s
View File

@@ -6567,7 +6567,7 @@ MOD06_0223C854: ; 0x0223C854
bne _0223C8BE
ldr r0, [sp, #0x10]
mov r1, #0x12
bl FUN_02068678
bl GetMonBaseStat
cmp r0, #0
beq _0223C8E0
cmp r0, #0xfe
@@ -6690,7 +6690,7 @@ MOD06_0223C968: ; 0x0223C968
add r0, r7, #0
mov r1, #0x12
mov r6, #1
bl FUN_02068678
bl GetMonBaseStat
cmp r0, #0
beq _0223C996
cmp r0, #0xfe
@@ -7320,14 +7320,14 @@ _0223CE6A:
str r0, [sp, #0xc]
ldr r0, [r6, r0]
mov r1, #6
bl FUN_02068678
bl GetMonBaseStat
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #8]
ldr r0, [sp, #0xc]
mov r1, #7
ldr r0, [r6, r0]
bl FUN_02068678
bl GetMonBaseStat
lsl r0, r0, #0x18
lsr r1, r0, #0x18
ldr r0, [sp, #8]
@@ -22165,7 +22165,7 @@ _022445A6:
mov r2, #0
bl FUN_020671BC
mov r1, #0x32
bl FUN_02068758
bl GetMonExpByLevel
str r0, [sp, #8]
add r0, r4, #0
mov r1, #8
@@ -22672,7 +22672,7 @@ _0224499C:
ldrh r0, [r5]
lsl r0, r0, #0x15
lsr r0, r0, #0x15
bl FUN_02068678
bl GetMonBaseStat
cmp r0, #0
beq _022449E0
ldr r2, [r5, #0x10]
@@ -22688,7 +22688,7 @@ _022449CC:
mov r1, #0x18
lsl r0, r0, #0x15
lsr r0, r0, #0x15
bl FUN_02068678
bl GetMonBaseStat
add r1, r5, #0
add r1, #0x20
strb r0, [r1]
@@ -22698,7 +22698,7 @@ _022449E0:
mov r1, #0x18
lsl r0, r0, #0x15
lsr r0, r0, #0x15
bl FUN_02068678
bl GetMonBaseStat
add r1, r5, #0
add r1, #0x20
strb r0, [r1]
@@ -23233,7 +23233,7 @@ MOD06_02244DC4: ; 0x02244DC4
str r1, [r7, r0]
add r0, r4, #0
mov r1, #0x12
bl FUN_02068678
bl GetMonBaseStat
lsl r0, r0, #0x18
lsr r0, r0, #0x18
beq _02244DEC

4
arm9/modules/09/asm/module_09.s
View File

@@ -2588,7 +2588,7 @@ _022132C2:
ldrh r0, [r4, #8]
lsl r1, r1, #0x19
lsr r1, r1, #0x19
bl FUN_02068758
bl GetMonExpByLevel
str r0, [r4, #0x24]
ldrb r0, [r6, r5]
lsl r0, r0, #0x19
@@ -2604,7 +2604,7 @@ _0221335A:
add r1, r1, #1
add r4, r0, r5
ldrh r0, [r4, #8]
bl FUN_02068758
bl GetMonExpByLevel
_02213366:
str r0, [r4, #0x28]
ldr r0, [r4, #4]

52
arm9/modules/11/asm/module_11.s
View File

@@ -12644,7 +12644,7 @@ _022339C6:
lsl r0, r0, #6
ldrh r0, [r1, r0]
mov r1, #9
bl FUN_02068678
bl GetMonBaseStat
lsl r0, r0, #0x10
lsr r1, r0, #0x10
ldr r2, [r5, #0x74]
@@ -20687,7 +20687,7 @@ _02237900:
ldr r0, [sp, #4]
add r1, r6, #0
mov r2, #1
bl FUN_02068654
bl GetMonBaseStat_HandleUnownOrArceus
ldr r1, _02237AB0 ; =0x00002144
ldr r2, _02237AB4 ; =0x00003044
str r0, [r5, r1]
@@ -20719,7 +20719,7 @@ _02237900:
mov r2, #2
lsl r1, r1, #0x1b
lsr r1, r1, #0x1b
bl FUN_02068654
bl GetMonBaseStat_HandleUnownOrArceus
add r1, r0, #0
ldr r0, _02237AB0 ; =0x00002144
ldr r0, [r5, r0]
@@ -27984,7 +27984,7 @@ MOD11_0223B2DC: ; 0x0223B2DC
add r0, r2, #0
mov r1, #5
mov r4, #0
bl FUN_0206851C
bl AllocAndLoadMonPersonal
add r7, r0, #0
ldr r0, [sp]
ldr r1, [sp, #4]
@@ -28063,7 +28063,7 @@ _0223B37A: ; jump table
_0223B386:
add r0, r7, #0
mov r1, #0xa
bl FUN_02068538
bl GetPersonalAttr
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x79
@@ -28075,7 +28075,7 @@ _0223B386:
_0223B39E:
add r0, r7, #0
mov r1, #0xb
bl FUN_02068538
bl GetPersonalAttr
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x74
@@ -28087,7 +28087,7 @@ _0223B39E:
_0223B3B6:
add r0, r7, #0
mov r1, #0xc
bl FUN_02068538
bl GetPersonalAttr
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x75
@@ -28099,7 +28099,7 @@ _0223B3B6:
_0223B3CE:
add r0, r7, #0
mov r1, #0xd
bl FUN_02068538
bl GetPersonalAttr
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x78
@@ -28111,7 +28111,7 @@ _0223B3CE:
_0223B3E6:
add r0, r7, #0
mov r1, #0xe
bl FUN_02068538
bl GetPersonalAttr
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x76
@@ -28123,7 +28123,7 @@ _0223B3E6:
_0223B3FE:
add r0, r7, #0
mov r1, #0xf
bl FUN_02068538
bl GetPersonalAttr
lsl r0, r0, #0x10
asr r4, r0, #0x10
cmp r5, #0x77
@@ -28195,7 +28195,7 @@ _0223B45A:
b _0223B35E
_0223B48C:
add r0, r7, #0
bl FUN_02068640
bl FreeMonPersonal
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -29533,7 +29533,7 @@ _0223BFEE:
lsl r0, r0, #6
ldrh r0, [r1, r0]
mov r1, #8
bl FUN_02068678
bl GetMonBaseStat
ldr r1, _0223C200 ; =0x0000311C
ldr r2, _0223C204 ; =0x0225DCF0
ldrb r1, [r4, r1]
@@ -29554,7 +29554,7 @@ _0223C026:
lsl r0, r0, #6
ldrh r0, [r1, r0]
mov r1, #8
bl FUN_02068678
bl GetMonBaseStat
str r0, [sp]
_0223C03A:
ldr r1, [r4, #0x6c]
@@ -72923,7 +72923,7 @@ MOD11_02250F94: ; 0x02250F94
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #0x1a
bl FUN_02068678
bl GetMonBaseStat
ldr r2, _0225100C ; =0x0225E830
lsl r1, r5, #1
ldrb r2, [r2, r1]
@@ -81124,7 +81124,7 @@ _022550D0:
_022550EA:
ldr r0, [sp, #0x10]
ldr r1, [sp, #0xc]
bl FUN_02068758
bl GetMonExpByLevel
mov r1, #0xc0
mul r1, r4
add r2, r5, r1
@@ -81135,11 +81135,11 @@ _022550EA:
str r0, [sp, #0x1c]
ldr r0, [sp, #0x10]
add r1, r1, #1
bl FUN_02068758
bl GetMonExpByLevel
add r5, r0, #0
ldr r0, [sp, #0x10]
ldr r1, [sp, #0xc]
bl FUN_02068758
bl GetMonExpByLevel
sub r0, r5, r0
str r0, [sp, #0x20]
ldrh r1, [r7, r6]
@@ -82432,7 +82432,7 @@ _02255B04:
_02255B12:
add r0, r7, #0
add r1, r6, #0
bl FUN_02068758
bl GetMonExpByLevel
ldr r1, _02255B64 ; =0x00002DA4
add r2, r5, r4
ldr r1, [r2, r1]
@@ -82440,11 +82440,11 @@ _02255B12:
str r0, [sp, #0x18]
add r0, r7, #0
add r1, r6, #1
bl FUN_02068758
bl GetMonExpByLevel
add r4, r0, #0
add r0, r7, #0
add r1, r6, #0
bl FUN_02068758
bl GetMonExpByLevel
sub r0, r4, r0
str r0, [sp, #0x1c]
mov r0, #0x14
@@ -82494,7 +82494,7 @@ MOD11_02255B68: ; 0x02255B68
add r1, r6, #0
str r0, [sp, #0x10]
add r0, r7, #0
bl FUN_02068758
bl GetMonExpByLevel
mov r1, #0xc0
mul r1, r4
add r2, r5, r1
@@ -82504,11 +82504,11 @@ MOD11_02255B68: ; 0x02255B68
str r0, [sp, #0x14]
add r0, r7, #0
add r1, r6, #1
bl FUN_02068758
bl GetMonExpByLevel
add r5, r0, #0
add r0, r7, #0
add r1, r6, #0
bl FUN_02068758
bl GetMonExpByLevel
sub r0, r5, r0
str r0, [sp, #0x18]
mov r0, #0x10
@@ -83183,7 +83183,7 @@ _022560BA:
_022560D4:
ldr r0, [sp, #0xc]
ldr r1, [sp, #8]
bl FUN_02068758
bl GetMonExpByLevel
mov r1, #0xc0
mul r1, r4
add r2, r5, r1
@@ -83194,11 +83194,11 @@ _022560D4:
str r0, [sp, #0x18]
ldr r0, [sp, #0xc]
add r1, r1, #1
bl FUN_02068758
bl GetMonExpByLevel
add r5, r0, #0
ldr r0, [sp, #0xc]
ldr r1, [sp, #8]
bl FUN_02068758
bl GetMonExpByLevel
sub r0, r5, r0
str r0, [sp, #0x1c]
ldrh r1, [r7, r6]

8
arm9/modules/14/asm/module_14.s
View File

@@ -9216,7 +9216,7 @@ MOD14_021DBEAC: ; 0x021DBEAC
strb r0, [r4, #0xf]
ldrh r0, [r4, #4]
mov r1, #9
bl FUN_0206851C
bl AllocAndLoadMonPersonal
add r7, r0, #0
add r0, r5, #0
mov r1, #8
@@ -9225,7 +9225,7 @@ MOD14_021DBEAC: ; 0x021DBEAC
add r2, r0, #0
ldrh r1, [r4, #4]
add r0, r7, #0
bl FUN_02068824
bl CalcMonLevelInternal
strb r0, [r4, #0xa]
add r0, r5, #0
mov r1, #0xb
@@ -9320,7 +9320,7 @@ _021DBFB8:
ldr r2, [r4, #0x24]
bl FUN_0200A8E0
add r0, r7, #0
bl FUN_02068640
bl FreeMonPersonal
ldr r1, [sp]
add r0, r5, #0
bl FUN_02066A94
@@ -21843,7 +21843,7 @@ _021E204A:
lsr r1, r0, #0x10
add r0, r7, #0
mov r2, #0x1b
bl FUN_02068654
bl GetMonBaseStat_HandleUnownOrArceus
lsl r0, r0, #0x18
lsr r1, r0, #0x18
b _021E20AA

18
arm9/modules/16/asm/module_16.s
View File

@@ -30379,12 +30379,12 @@ MOD16_021E5554: ; 0x021E5554
ldr r1, [sp, #0x30]
add r0, r7, #0
mov r2, #6
bl FUN_02068654
bl GetMonBaseStat_HandleUnownOrArceus
add r6, r0, #0
ldr r1, [sp, #0x30]
add r0, r7, #0
mov r2, #7
bl FUN_02068654
bl GetMonBaseStat_HandleUnownOrArceus
add r7, r0, #0
add r0, r6, #0
bl MOD16_021E563C
@@ -32759,7 +32759,7 @@ MOD16_021E66F4: ; 0x021E66F4
add r4, r1, #0
mov r1, #0x12
add r5, r0, #0
bl FUN_02068678
bl GetMonBaseStat
cmp r0, #0
bne _021E6708
mov r0, #1
@@ -51949,11 +51949,11 @@ MOD16_021EF6E0: ; 0x021EF6E0
mov r1, #6
str r2, [sp]
str r3, [sp, #4]
bl FUN_02068678
bl GetMonBaseStat
add r4, r0, #0
ldr r0, [sp, #0x60]
mov r1, #7
bl FUN_02068678
bl GetMonBaseStat
add r6, r0, #0
add r0, r4, #0
bl MOD16_021E563C
@@ -55170,11 +55170,11 @@ _021F0F88:
add r7, r5, r3
ldrh r0, [r7, r6]
mov r1, #0x18
bl FUN_02068678
bl GetMonBaseStat
add r4, r0, #0
ldrh r0, [r7, r6]
mov r1, #0x19
bl FUN_02068678
bl GetMonBaseStat
add r6, r0, #0
cmp r4, #0
beq _021F0FC2
@@ -55281,12 +55281,12 @@ _021F1046:
ldrh r0, [r6, r1]
str r1, [sp]
mov r1, #0x18
bl FUN_02068678
bl GetMonBaseStat
add r4, r0, #0
ldr r0, [sp]
mov r1, #0x19
ldrh r0, [r6, r0]
bl FUN_02068678
bl GetMonBaseStat
cmp r4, #0
beq _021F108C
cmp r0, #0

2
arm9/modules/28/asm/module_28.s
View File

@@ -760,7 +760,7 @@ _02254DDC:
_02254DE0:
ldrh r0, [r4, #8]
mov r1, #0x1c
bl FUN_02068678
bl GetMonBaseStat
mov r1, #0x59
lsl r1, r1, #2
strb r0, [r5, r1]

2
arm9/modules/35/asm/module_35.s
View File

@@ -925,7 +925,7 @@ _02254F00:
beq _02254F36
ldrh r0, [r6, #0x1c]
mov r1, #0x1c
bl FUN_02068678
bl GetMonBaseStat
cmp r0, #0
ldr r0, [r7, #0x24]
beq _02254F30

2
arm9/modules/39/asm/module_39.s
View File

@@ -1008,7 +1008,7 @@ MOD39_02254FA4: ; 0x02254FA4
_02254FBA:
add r0, r7, #0
mov r1, #0x1c
bl FUN_02068678
bl GetMonBaseStat
cmp r0, #0
beq _02254FCA
mov r1, #4

2
arm9/modules/65/asm/module_65.s
View File

@@ -3388,7 +3388,7 @@ MOD65_021D8F34: ; 0x021D8F34
strb r0, [r1]
ldrh r0, [r4, #0x34]
mov r1, #0x1c
bl FUN_02068678
bl GetMonBaseStat
mov r1, #1
eor r1, r0
add r0, r4, #0

2
arm9/modules/71/asm/module_71.s
View File

@@ -1387,7 +1387,7 @@ MOD71_0222E118: ; 0x0222E118
cmp r0, #0
beq _0222E18E
mov r1, #0x1c
bl FUN_02068678
bl GetMonBaseStat
strh r0, [r4, #0xa]
_0222E18E:
cmp r6, #0

6
arm9/modules/80/asm/module_80.s
View File

@@ -6811,7 +6811,7 @@ _02230BD4:
cmp r0, #0
beq _02230C04
mov r1, #0x12
bl FUN_02068678
bl GetMonBaseStat
mov r1, #0xfe
lsl r1, r1, #4
ldr r2, [r4, r1]
@@ -7821,7 +7821,7 @@ _0223138C:
bl MOD80_02233EA4
add r0, r5, #0
mov r1, #0x12
bl FUN_02068678
bl GetMonBaseStat
mov r1, #0xfe
lsl r1, r1, #4
ldr r2, [r4, r1]
@@ -12478,7 +12478,7 @@ _0223398C:
bl FUN_020054C8
add r0, r5, #0
mov r1, #0x12
bl FUN_02068678
bl GetMonBaseStat
mov r1, #0xfe
lsl r1, r1, #4
ldr r2, [r4, r1]

2
arm9/modules/81/asm/module_81.s
View File

@@ -199,7 +199,7 @@ MOD81_02237FE8: ; 0x02237FE8
mov r2, #0
bl FUN_020672BC
mov r1, #0x1c
bl FUN_02068678
bl GetMonBaseStat
cmp r0, #0
bne _02238000
mov r0, #1

10
arm9/modules/83/asm/module_83.s
View File

@@ -21798,7 +21798,7 @@ MOD83_02237EDC: ; 0x02237EDC
add r1, r0, #0
lsl r0, r4, #0x10
lsr r0, r0, #0x10
bl FUN_02068800
bl CalcMonLevel
pop {r3, r4, r5, pc}
thumb_func_end MOD83_02237EDC
@@ -21819,7 +21819,7 @@ MOD83_02237F04: ; 0x02237F04
add r6, r0, #0
add r0, r5, #0
mov r1, #0x19
bl FUN_02068678
bl GetMonBaseStat
cmp r0, #0
beq _02237F5E
ldr r2, _02237F68 ; =0x0223B4C0
@@ -21830,7 +21830,7 @@ _02237F32:
bne _02237F42
add r0, r5, #0
mov r1, #0x18
bl FUN_02068678
bl GetMonBaseStat
b _02237F4A
_02237F42:
add r4, r4, #1
@@ -21845,12 +21845,12 @@ _02237F4A:
bne _02237F66
add r0, r5, #0
mov r1, #0x18
bl FUN_02068678
bl GetMonBaseStat
pop {r4, r5, r6, pc}
_02237F5E:
add r0, r5, #0
mov r1, #0x18
bl FUN_02068678
bl GetMonBaseStat
_02237F66:
pop {r4, r5, r6, pc}
.align 2, 0

7
include/pokemon.h
View File

@@ -196,4 +196,11 @@ struct PokemonData {
PokemonDataBlock block4;
};
int GetMonBaseStat_HandleUnownOrArceus(int species, int form, int stat_id);
int GetMonBaseStat(int species, int stat_id);
int GetMonExpByLevel(int species, int level);
void LoadGrowthTable(int species, int * table);
int GetExpByGrowthRateAndLevel(int rate, int level);
int CalcMonLevel(int species, int experience);
#endif //POKEDIAMOND_POKEMON_H