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_wally.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_wally.s')
-rw-r--r-- | asm/battle_controller_wally.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index 629fa308d..64c8b4442 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -3039,7 +3039,7 @@ sub_8169EC8: @ 8169EC8 movs r0, 0x6 bl sub_806A12C ldr r0, =gUnknown_0202499C - ldr r1, =gUnknown_08305D2C + ldr r1, =gTrainerBackPicCoords ldrb r1, [r1, 0x18] movs r2, 0x8 subs r2, r1 @@ -3124,7 +3124,7 @@ dp01t_07_6_: @ 8169F94 movs r0, 0x6 bl sub_806A12C ldr r0, =gUnknown_0202499C - ldr r1, =gUnknown_08305D2C + ldr r1, =gTrainerBackPicCoords ldrb r1, [r1, 0x18] movs r2, 0x8 subs r2, r1 |