diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 02:39:57 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 02:39:57 +0100 |
| commit | c17a46823e55c5b60592963d7edb9425255aea8d (patch) | |
| tree | 158b2ee43ebbac1150ea36203310752813c3a6ad /src/battle/battle_controller_linkpartner.c | |
| parent | 353a083d97be81cbc612ecb8de46b62a0e523362 (diff) | |
| parent | c4c885504729b56c00aa245aea6e284a1b6a1719 (diff) | |
Merge branch 'master' into some_battle_sound_stuff
Diffstat (limited to 'src/battle/battle_controller_linkpartner.c')
| -rw-r--r-- | src/battle/battle_controller_linkpartner.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index adc3c1c85..2c78d4a82 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -48,8 +48,8 @@ extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern MainCallback gPreBattleCallback1; extern void (*gBattleBankFunc[])(void); extern u8 gHealthboxIDs[]; @@ -1355,8 +1355,8 @@ void sub_811FF30(void) void LinkPartnerHandlePrintString(void) { - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gBattleBankFunc[gActiveBank] = sub_811DFA0; |