diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-09 21:40:05 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-09 21:40:05 +0200 |
| commit | eb59f15799d0b730bb5d792fb142174ade0ad891 (patch) | |
| tree | 4a40bff70a4999b06b654297ee83d6de4e62979e /asm/battle_controller_player.s | |
| parent | 7fb4a54e3997a3a77309c819fbde671fe2b2b104 (diff) | |
| parent | 08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (diff) | |
mergin and chill
Diffstat (limited to 'asm/battle_controller_player.s')
| -rw-r--r-- | asm/battle_controller_player.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 73601e84c..94d4cdef0 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -7371,11 +7371,11 @@ _0805B5E0: beq _0805B618 movs r0, 0x5A mov r9, r0 - ldr r1, =gUnknown_083054E0 + ldr r1, =gTrainerFrontPicCoords b _0805B642 .pool _0805B618: - ldr r1, =gUnknown_08305D2C + ldr r1, =gTrainerBackPicCoords lsls r0, r4, 2 adds r0, r1 ldrb r1, [r0] @@ -7392,7 +7392,7 @@ _0805B618: _0805B63C: movs r0, 0x50 mov r9, r0 - ldr r1, =gUnknown_08305D2C + ldr r1, =gTrainerBackPicCoords _0805B642: lsls r0, r4, 2 adds r0, r1 @@ -7733,7 +7733,7 @@ _0805B926: adds r0, r4, 0 bl sub_806A12C ldr r0, =gUnknown_0202499C - ldr r1, =gUnknown_08305D2C + ldr r1, =gTrainerBackPicCoords lsls r4, 2 adds r4, r1 ldrb r1, [r4] |