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/16/asm/module_16.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/16/asm/module_16.s')
| -rw-r--r-- | arm9/modules/16/asm/module_16.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index ffd7eb1f..34107e9c 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -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 |