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/05/asm/module_05.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/05/asm/module_05.s')
| -rw-r--r-- | arm9/modules/05/asm/module_05.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index b6c8c3b5..5f07ebe7 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -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 |