diff options
| author | red031000 <rubenru09@aol.com> | 2020-08-31 21:57:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 21:57:56 +0100 |
| commit | 6891309e08e30a744561d42e347e2dbe2de3eab8 (patch) | |
| tree | 19fa922dbfedc4be863aeb5b36f51f76d076fc6e /arm9/modules | |
| parent | bf25a361cd0d013beb86a936b516957b66cfa011 (diff) | |
| parent | 392f50eea4375637f23a4abc8643f525ba98f469 (diff) | |
Merge pull request #276 from PikalaxALT/pikalax_work
Trainer parties to json; trainer frontpics to png; refactor graphics rules
Diffstat (limited to 'arm9/modules')
| -rw-r--r-- | arm9/modules/11/asm/module_11_thumb2.s | 4 | ||||
| -rw-r--r-- | arm9/modules/67/asm/module_67.s | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index c342adc4..a962fbf2 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -11742,11 +11742,11 @@ MOD11_02234CFC: ; 0x02234CFC str r0, [sp, #4] ldrh r0, [r6, r0] add r1, sp, #8 - bl FUN_0206ADE0 + bl TrainerData_ReadTrData ldr r0, [sp, #4] add r1, r4, #0 ldrh r0, [r6, r0] - bl FUN_0206ADF0 + bl TrainerData_ReadTrPoke add r0, sp, #8 ldrb r1, [r0] cmp r1, #3 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 997d785e..d71a7476 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -1701,7 +1701,7 @@ _021D822A: mov r1, #1 lsl r0, r0, #0x10 lsr r0, r0, #0x11 - bl FUN_0206AC74 + bl TrainerData_GetAttr cmp r0, #0x3f bne _021D828A ldr r0, [r4, #0x50] |