diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 20:47:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 20:47:28 -0700 |
| commit | ed5847cb41c48357d83b92823e08393a1ca54bdd (patch) | |
| tree | ea68024a14289a5a84bba21591f0e426eaa8b035 /include | |
| parent | b58527a387a65b84d2aefd23e589a53844308d6a (diff) | |
| parent | 90380f68bd0725eb77f38f5c00828efba89e5219 (diff) | |
Merge pull request #587 from pret/rename_files
Rename two files
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/contest_painting_effects.h (renamed from include/cute_sketch.h) | 0 |
2 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); diff --git a/include/cute_sketch.h b/include/contest_painting_effects.h index 1fa3c90fb..1fa3c90fb 100644 --- a/include/cute_sketch.h +++ b/include/contest_painting_effects.h |