diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-04-23 14:01:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-23 14:01:11 -0400 |
| commit | d21090cf044c3693f020f9580fa1dbefe3d4556f (patch) | |
| tree | 553c15314325bfad9c75bc026121ca26aceb5f9e /src/battle_records.c | |
| parent | dbf3de7755136f434a1fc07496d2a685e752ef08 (diff) | |
| parent | b80442645dc880216a35a780e5bed232aea1f92a (diff) | |
Merge pull request #406 from hjk321/index-graphics
Document, Index, and Prettify Graphics, Part 1 (A-H)
Diffstat (limited to 'src/battle_records.c')
| -rw-r--r-- | src/battle_records.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_records.c b/src/battle_records.c index a32276199..017c1078c 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -25,7 +25,7 @@ static void Task_WaitFadeIn(u8 taskId); static void Task_WaitButton(u8 taskId); static void Task_FadeOut(u8 taskId); static void Task_DestroyAndReturnToField(u8 taskId); -static void ClearWindowCommitAndRemove(u8 winddowId); +static void ClearWindowCommitAndRemove(u8 windowId); static void ResetGpu(void); static void StopAllRunningTasks(void); static void EnableDisplay(void); @@ -35,8 +35,8 @@ static void CommitWindow(u8 windowId); static void LoadFrameGfxOnBg(u8 bgId); static const u16 sTiles[] = INCBIN_U16("graphics/battle_records/bg_tiles.4bpp"); -static const u16 sPalette[] = INCBIN_U16("graphics/battle_records/palette.gbapal"); -static const u16 sTilemap[] = INCBIN_U16("graphics/battle_records/tilemap.bin"); +static const u16 sPalette[] = INCBIN_U16("graphics/battle_records/bg_tiles.gbapal"); +static const u16 sTilemap[] = INCBIN_U16("graphics/battle_records/bg_tiles.bin"); static const struct WindowTemplate sWindowTemplates[] = { { |