diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-05 17:39:26 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-05 17:39:26 +0100 |
| commit | ae8e89a10ddfb736afc23a2477c20b6897b0313d (patch) | |
| tree | 03ead636462c868b93cad1046867ac338f9788b0 /asm/battle_frontier_1.s | |
| parent | eb6aed50e56f36ce416f7ecc8edfacea1da61bf1 (diff) | |
move some pokemon data to c
Diffstat (limited to 'asm/battle_frontier_1.s')
| -rw-r--r-- | asm/battle_frontier_1.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 31d5d3fbe..f0961d74d 100644 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -7171,7 +7171,7 @@ _0819270A: ldr r4, [sp, 0x24] cmp r4, r0 bne _08192784 - ldr r0, =gTrainerClassToNameIndex + ldr r0, =gFacilityClassToTrainerClass adds r0, 0x3C ldrb r5, [r0] b _081927A2 @@ -12991,7 +12991,7 @@ sub_8195938: @ 8195938 push {r4,lr} adds r3, r0, 0 movs r2, 0 - ldr r4, =gTrainers + TRAINER_TUCKER * 0x28 + 0x4 @ Tucker's name + ldr r4, =(gTrainers + 806 * 0x28 + 0x4) @ TRAINER_TUCKER name _08195940: adds r0, r3, r2 adds r1, r2, r4 |