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/14 | |
| 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/14')
| -rw-r--r-- | arm9/modules/14/asm/module_14.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 22ebe973..79050eac 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -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 |