summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhjk321 <anderdude@outlook.com>2021-03-31 10:08:08 -0500
committerhjk321 <anderdude@outlook.com>2021-03-31 10:08:08 -0500
commit273e7fc0592b9a659e369017f44606f660c3ddd2 (patch)
tree3f1d7a593de7c1bb11f234a850ddf2e1fddd3a42 /src
parentea68ec3fd7359061eaa4ca0e2550ee9961a52449 (diff)
Index battle_records and berry_fix graphics
Diffstat (limited to 'src')
-rw-r--r--src/battle_records.c6
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[] = {
{