From 1b973b17c22c8b6f0ac55a5675ebdb70b045c253 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Jun 2020 08:56:58 -0400 Subject: Preliminary base stats struct; name pokemon.s encryption funcs --- arm9/modules/09/asm/module_09.s | 62 ++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'arm9/modules/09') diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index f03d3e57..a5b5560b 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -576,7 +576,7 @@ _022122BA: add r0, r5, r1 ldr r0, [r0, #4] mov r1, #0xa2 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #0x20] ldrb r1, [r4, #0x11] mov r0, #0x50 @@ -1630,7 +1630,7 @@ _02212B0A: ldr r0, [r0, #4] add r1, #0x3a mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted add r1, r7, #4 strh r0, [r4, r1] mov r2, #2 @@ -1686,7 +1686,7 @@ _02212BAA: add r0, r4, r0 ldr r0, [r0, #4] mov r1, #0xa2 - bl FUN_020671BC + bl GetMonDataEncrypted ldr r1, _02212C84 ; =0x0000207E mov r2, #4 strh r0, [r4, r1] @@ -1841,7 +1841,7 @@ _02212CD0: add r1, r7, #0 add r1, #0x3a mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted mov r1, #0x82 lsl r1, r1, #6 strh r0, [r4, r1] @@ -2441,7 +2441,7 @@ _022131E2: str r0, [r4, #4] mov r1, #5 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #8] ldrh r0, [r4, #8] cmp r0, #0 @@ -2457,54 +2457,54 @@ _0221320C: add r4, r0, r5 ldr r0, [r4, #4] mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #0xa] ldr r0, [r4, #4] mov r1, #0xa5 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #0xc] ldr r0, [r4, #4] mov r1, #0xa6 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #0xe] ldr r0, [r4, #4] mov r1, #0xa7 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #0x10] ldr r0, [r4, #4] mov r1, #0xa8 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #0x12] ldr r0, [r4, #4] mov r1, #0xa2 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #0x14] ldr r0, [r4, #4] mov r1, #0xa3 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #0x16] ldr r0, [r4, #4] mov r1, #0xb0 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strb r0, [r4, #0x18] ldr r0, [r4, #4] mov r1, #0xb1 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted ldr r6, [sp] strb r0, [r4, #0x19] ldr r0, [r4, #4] add r6, #0x1a mov r1, #0xa0 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted ldrb r1, [r6, r5] mov r2, #0x7f lsl r0, r0, #0x18 @@ -2517,7 +2517,7 @@ _0221320C: ldr r0, [r4, #4] mov r1, #0xaf mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted cmp r0, #1 ldrb r1, [r6, r5] bne _022132BC @@ -2557,7 +2557,7 @@ _022132C2: ldr r0, [r4, #4] mov r1, #0x4c mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted lsl r0, r0, #0x18 lsr r0, r0, #0x18 lsl r0, r0, #0x1f @@ -2570,17 +2570,17 @@ _022132C2: ldr r0, [r4, #4] mov r1, #0xa mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #0x1c] ldr r0, [r4, #4] mov r1, #6 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strh r0, [r4, #0x1e] ldr r0, [r4, #4] mov r1, #8 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted ldr r6, [sp] str r0, [r4, #0x20] add r6, #0x1a @@ -2610,49 +2610,49 @@ _02213366: ldr r0, [r4, #4] mov r1, #0x13 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted add r1, r4, #0 add r1, #0x2c strb r0, [r1] ldr r0, [r4, #4] mov r1, #0x14 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted add r1, r4, #0 add r1, #0x2d strb r0, [r1] ldr r0, [r4, #4] mov r1, #0x15 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted add r1, r4, #0 add r1, #0x2e strb r0, [r1] ldr r0, [r4, #4] mov r1, #0x16 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted add r1, r4, #0 add r1, #0x2f strb r0, [r1] ldr r0, [r4, #4] mov r1, #0x17 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted add r1, r4, #0 add r1, #0x30 strb r0, [r1] ldr r0, [r4, #4] mov r1, #0xa1 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted add r1, r4, #0 add r1, #0x31 strb r0, [r1] ldr r0, [r4, #4] mov r1, #0x70 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted add r4, #0x32 strb r0, [r4] ldr r1, [sp] @@ -2670,7 +2670,7 @@ _022133E4: ldr r0, [r6, #4] add r1, #0x36 mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted ldr r1, [sp, #0xc] strh r0, [r7, r1] add r0, r1, #0 @@ -2681,13 +2681,13 @@ _022133E4: ldr r0, [r6, #4] add r1, #0x3a mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strb r0, [r5, #2] add r1, r4, #0 ldr r0, [r6, #4] add r1, #0x3e mov r2, #0 - bl FUN_020671BC + bl GetMonDataEncrypted strb r0, [r5, #3] ldrh r0, [r5] ldrb r1, [r5, #3] @@ -8336,7 +8336,7 @@ MOD09_02216378: ; 0x02216378 mov r1, #0xa2 mov r2, #0 add r7, r0, #0 - bl FUN_020671BC + bl GetMonDataEncrypted lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #8] -- cgit v1.2.3