diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-10 08:56:58 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-10 08:56:58 -0400 |
commit | 1b973b17c22c8b6f0ac55a5675ebdb70b045c253 (patch) | |
tree | 596060fca7e87e6902e26e41d877c48009141a6f /arm9/modules/07/asm/module_07.s | |
parent | 70d51296ca9d527aa19b859acc79e3744635e6f4 (diff) |
Preliminary base stats struct; name pokemon.s encryption funcs
Diffstat (limited to 'arm9/modules/07/asm/module_07.s')
-rw-r--r-- | arm9/modules/07/asm/module_07.s | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 8cccb236..7fbc2c22 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -2333,13 +2333,13 @@ _0221312A: mov r1, #5 mov r2, #0 add r7, r0, #0 - bl FUN_020671BC + bl GetMonDataEncrypted cmp r0, #0 beq _022131B0 add r0, r7, #0 mov r1, #0x4c mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted cmp r0, #0 bne _022131B0 add r0, r7, #0 @@ -3686,7 +3686,7 @@ _02213C2E: add r0, r4, #0 mov r1, #5 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted mov r1, #0x86 lsl r1, r1, #2 strh r0, [r7, r1] @@ -3702,52 +3702,52 @@ _02213C2E: add r5, r0, r1 add r0, r4, #0 mov r1, #0x4c - bl FUN_020671BC + bl GetMonDataEncrypted ldr r1, _02213D18 ; =0x00000223 mov r2, #0 strb r0, [r5, r1] add r0, r4, #0 mov r1, #0xa2 - bl FUN_020671BC + bl GetMonDataEncrypted ldr r1, _02213D1C ; =0x0000021A mov r2, #0 strh r0, [r5, r1] add r0, r4, #0 mov r1, #0xa3 - bl FUN_020671BC + bl GetMonDataEncrypted mov r1, #0x87 lsl r1, r1, #2 strh r0, [r5, r1] add r0, r4, #0 mov r1, #0xa0 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted mov r1, #0x22 lsl r1, r1, #4 strb r0, [r5, r1] add r0, r4, #0 mov r1, #6 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted ldr r1, _02213D20 ; =0x0000021E mov r2, #0 strh r0, [r5, r1] add r0, r4, #0 mov r1, #0xa1 - bl FUN_020671BC + bl GetMonDataEncrypted mov r1, #0x89 lsl r1, r1, #2 strb r0, [r5, r1] add r0, r4, #0 mov r1, #0x70 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted ldr r1, _02213D24 ; =0x00000225 mov r2, #0 strb r0, [r5, r1] add r0, r4, #0 mov r1, #0xaf - bl FUN_020671BC + bl GetMonDataEncrypted cmp r0, #1 bne _02213CE8 mov r1, #0 |