diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-04-11 13:21:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 13:21:26 -0400 |
| commit | c17af4853c5c5854170702292ebd573bc14b5b0e (patch) | |
| tree | 4b10ee7f38e45cf1c0f74eafb1274afe70405155 /asm/battle_controller_link_opponent.s | |
| parent | 7f920b887f9a060524347b4cc3a5e3f3abdd3b03 (diff) | |
| parent | 18b20721d91e811595491d70e9512ace654e4f5a (diff) | |
Merge pull request #46 from PikalaxALT/oak_speech
Oak speech
Diffstat (limited to 'asm/battle_controller_link_opponent.s')
| -rw-r--r-- | asm/battle_controller_link_opponent.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_controller_link_opponent.s b/asm/battle_controller_link_opponent.s index d5a9b8ae6..e2c52a592 100644 --- a/asm/battle_controller_link_opponent.s +++ b/asm/battle_controller_link_opponent.s @@ -4952,10 +4952,10 @@ _0803CF40: thumb_func_start sub_803CF50 sub_803CF50: @ 803CF50 push {r4,lr} - ldr r0, _0803CF84 @ =gUnknown_2022974 + ldr r0, _0803CF84 @ =gBattle_BG0_X movs r1, 0 strh r1, [r0] - ldr r0, _0803CF88 @ =gUnknown_2022976 + ldr r0, _0803CF88 @ =gBattle_BG0_Y strh r1, [r0] ldr r0, _0803CF8C @ =gActiveBattler ldrb r4, [r0] @@ -4974,8 +4974,8 @@ sub_803CF50: @ 803CF50 bl sub_80D87BC b _0803CFA0 .align 2, 0 -_0803CF84: .4byte gUnknown_2022974 -_0803CF88: .4byte gUnknown_2022976 +_0803CF84: .4byte gBattle_BG0_X +_0803CF88: .4byte gBattle_BG0_Y _0803CF8C: .4byte gActiveBattler _0803CF90: .4byte gUnknown_2022BC6 _0803CF94: .4byte gDisplayedStringBattle |