diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-11 09:00:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-11 09:00:55 -0400 |
| commit | 7e447c68f5e11e2a0a96b4251e77f3fa7c9c3fc1 (patch) | |
| tree | 82e6209f00ca5b47dfe2943c294a16bfd5cc7a4e /arm9/modules/81 | |
| parent | 6a1f6122b5422deebf218372cbd9b5684505d4ec (diff) | |
Name more funcs in pokemon.s
Diffstat (limited to 'arm9/modules/81')
| -rw-r--r-- | arm9/modules/81/asm/module_81.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index f852db8d..e9a154d2 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -136,7 +136,7 @@ _02237F22: mov r1, #5 ldr r0, [r0] mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted mov r1, #0x53 lsl r1, r1, #2 strh r0, [r4, r1] @@ -144,7 +144,7 @@ _02237F22: mov r1, #5 ldr r0, [r0, #4] mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, _02237FD8 ; =0x0000014E strh r0, [r4, r1] mov r0, #0 @@ -197,7 +197,7 @@ MOD81_02237FE8: ; 0x02237FE8 push {r3, lr} mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted mov r1, #0x1c bl GetMonBaseStat cmp r0, #0 @@ -999,7 +999,7 @@ _0223860E: ldr r4, [r0, #4] _02238610: add r0, r4, #0 - bl FUN_02066A6C + bl TryDecryptBoxMon str r0, [sp, #0x20] add r0, sp, #0x34 add r1, r4, #0 @@ -1008,12 +1008,12 @@ _02238610: mov r1, #0 add r0, r4, #0 add r2, r1, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x1c] add r0, r4, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 ldr r1, [sp, #0x58] lsr r0, r0, #0x10 @@ -1051,7 +1051,7 @@ _02238648: bl FUN_02017E14 ldr r1, [sp, #0x20] add r0, r4, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon add r0, r7, #0 bl FreeToHeap _02238690: @@ -2514,7 +2514,7 @@ _02239138: bl MOD81_02238818 mov r1, #0x4c mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 bne _0223918A ldr r0, [r4, #0x10] @@ -9501,7 +9501,7 @@ _0223C8D6: bl MOD81_02238820 mov r1, #0x4c mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 bne _0223C902 ldr r0, [r4] |