diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-09 14:32:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 14:32:44 -0500 |
| commit | 08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (patch) | |
| tree | ab77e37580ab0eb0ee18c28f749d8c8da15dbcf7 /asm/battle_controller_player.s | |
| parent | 96c5966ff3676eb1b3463808b83b42e13e1591fd (diff) | |
| parent | 41db0259759c8e4c3c31c5cf09daed9f85ab5b63 (diff) | |
Merge pull request #62 from Diegoisawesome/baserom_extraction
Continued baserom extraction
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 1ea1bb5f2..4dbdf3968 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] |