diff options
author | Garak <thomastaps194@comcast.net> | 2018-06-26 00:01:17 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-26 00:01:17 -0400 |
commit | 1cada74444df875649b239ed488c6ee4deb8a7f1 (patch) | |
tree | 0cd68b160fa8d4a27cd65d6ffa80159b231f715c /src/battle/anim/battle_intro.c | |
parent | b3dec86071ae7d2eb5c1258ea778f0e823a5f636 (diff) | |
parent | fa0e1ca4de35c9723a0972efeb6f7de4dca25594 (diff) |
Merge pull request #3 from pret/master
upstream merge
Diffstat (limited to 'src/battle/anim/battle_intro.c')
-rw-r--r-- | src/battle/anim/battle_intro.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/battle/anim/battle_intro.c b/src/battle/anim/battle_intro.c index d96dc7ea8..a189b1425 100644 --- a/src/battle/anim/battle_intro.c +++ b/src/battle/anim/battle_intro.c @@ -12,11 +12,6 @@ #include "trig.h" extern u16 gBattleTypeFlags; -extern u16 gBattle_BG1_X; -extern u16 gBattle_BG1_Y; -extern u16 gBattle_BG2_X; -extern u16 gBattle_BG2_Y; -extern u16 gBattle_WIN0V; extern u16 gUnknown_02024DE8; extern u8 gBattleMonForms[]; @@ -376,7 +371,7 @@ static void BattleIntroTask_ScrollAndFadeScenery(u8 taskId) REG_BLDALPHA = gTasks[taskId].data[4]; } -// Seems to only be used for link battles. +// Seems to only be used for link battles. static void BattleIntroTask_80E4C34(u8 taskId) { s32 i; |