diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 15:33:42 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 15:33:42 -0400 |
commit | 2145af4a3ef133e4084015792b7d541f3e653edc (patch) | |
tree | cd8d917a74a14a6c4a8deaa88fff9adf10664896 /asm/battle_controller_recorded_player.s | |
parent | 96f4b6d118179daa948201871385ba7750830c59 (diff) | |
parent | 08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into use_build
Diffstat (limited to 'asm/battle_controller_recorded_player.s')
-rw-r--r-- | asm/battle_controller_recorded_player.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_recorded_player.s b/asm/battle_controller_recorded_player.s index 1b0cd52e3..a2ea742b7 100644 --- a/asm/battle_controller_recorded_player.s +++ b/asm/battle_controller_recorded_player.s @@ -4033,14 +4033,14 @@ _0818BD72: beq _0818BD9C movs r0, 0x5A mov r9, r0 - ldr r1, =gUnknown_083054E0 + ldr r1, =gTrainerFrontPicCoords b _0818BD9E .pool _0818BD98: movs r0, 0x50 mov r9, r0 _0818BD9C: - ldr r1, =gUnknown_08305D2C + ldr r1, =gTrainerBackPicCoords _0818BD9E: lsls r0, r4, 2 adds r0, r1 |