diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 17:00:55 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 17:00:55 -0700 |
| commit | 9e4bf55716fb5a27bc2f6eee4a489e48327eac3f (patch) | |
| tree | 8b31e761c5b2b03e2b5200baec6755f6a3273fe5 /include/battle.h | |
| parent | f150a5cd9f15c368a3e520168b56acd3628d6852 (diff) | |
| parent | ed5847cb41c48357d83b92823e08393a1ca54bdd (diff) | |
Merge remote-tracking branch 'upstream/master' into nakamura
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 11bb9e387..6a5a97e90 100644 --- a/include/battle.h +++ b/include/battle.h @@ -708,7 +708,7 @@ void MarkBufferBankForExecution(u8 bank); extern u8 gBattleTextBuff1[]; -// asm/battle_1.o +// src/battle_bg.o void sub_800D6D4(); void ApplyPlayerChosenFrameToBattleMenu(); void DrawMainBattleBackground(void); |