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_partner.s | |
| parent | 7f920b887f9a060524347b4cc3a5e3f3abdd3b03 (diff) | |
| parent | 18b20721d91e811595491d70e9512ace654e4f5a (diff) | |
Merge pull request #46 from PikalaxALT/oak_speech
Oak speech
Diffstat (limited to 'asm/battle_controller_link_partner.s')
| -rw-r--r-- | asm/battle_controller_link_partner.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_controller_link_partner.s b/asm/battle_controller_link_partner.s index 7480e8b12..0087859c4 100644 --- a/asm/battle_controller_link_partner.s +++ b/asm/battle_controller_link_partner.s @@ -4573,10 +4573,10 @@ _080D67BC: thumb_func_start sub_80D67CC sub_80D67CC: @ 80D67CC push {r4,lr} - ldr r0, _080D6800 @ =gUnknown_2022974 + ldr r0, _080D6800 @ =gBattle_BG0_X movs r1, 0 strh r1, [r0] - ldr r0, _080D6804 @ =gUnknown_2022976 + ldr r0, _080D6804 @ =gBattle_BG0_Y strh r1, [r0] ldr r0, _080D6808 @ =gActiveBattler ldrb r4, [r0] @@ -4595,8 +4595,8 @@ sub_80D67CC: @ 80D67CC bl sub_80D87BC b _080D681C .align 2, 0 -_080D6800: .4byte gUnknown_2022974 -_080D6804: .4byte gUnknown_2022976 +_080D6800: .4byte gBattle_BG0_X +_080D6804: .4byte gBattle_BG0_Y _080D6808: .4byte gActiveBattler _080D680C: .4byte gUnknown_2022BC6 _080D6810: .4byte gDisplayedStringBattle |