diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-09 22:37:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 22:37:08 +0300 |
| commit | caba1031233657d89f3c35079e664551a07cd72f (patch) | |
| tree | 9d4fb9b4cee8f4b3697f9103e28897d7cd225de2 /arm9/modules/09/asm/module_09.s | |
| parent | c8f98c38d5baf6bf86531188b1a6ff0745d8d8c9 (diff) | |
| parent | 912f95b5d5125f1d20b80c9909527259c09c1262 (diff) | |
Merge pull request #152 from PikalaxALT/pikalax_work
Some cleanup; grow2bin is now a general purpose csv2bin converter for integers
Diffstat (limited to 'arm9/modules/09/asm/module_09.s')
| -rw-r--r-- | arm9/modules/09/asm/module_09.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 7c980707..f03d3e57 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -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]
|