diff --git a/graphics/battle_records/tilemap.bin b/graphics/battle_records/bg_tiles.bin similarity index 100% rename from graphics/battle_records/tilemap.bin rename to graphics/battle_records/bg_tiles.bin diff --git a/graphics/battle_records/bg_tiles.png b/graphics/battle_records/bg_tiles.png index bbe9de321..824ec68b0 100644 Binary files a/graphics/battle_records/bg_tiles.png and b/graphics/battle_records/bg_tiles.png differ diff --git a/graphics/battle_records/palette.pal b/graphics/battle_records/palette.pal deleted file mode 100644 index d6994a324..000000000 --- a/graphics/battle_records/palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -74 74 74 -189 131 156 -230 156 213 -222 238 255 -230 246 255 -148 115 139 -197 213 222 -172 164 189 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/berry_fix/gba_small.png b/graphics/berry_fix/gba_small.png index 59bfaf4d5..63f79cb49 100644 Binary files a/graphics/berry_fix/gba_small.png and b/graphics/berry_fix/gba_small.png differ diff --git a/graphics/berry_fix/gba_transfer.png b/graphics/berry_fix/gba_transfer.png index a741fe1b9..f8d49db21 100644 Binary files a/graphics/berry_fix/gba_transfer.png and b/graphics/berry_fix/gba_transfer.png differ diff --git a/graphics/berry_fix/gba_transfer_error.png b/graphics/berry_fix/gba_transfer_error.png index 766b9f28e..6c5f69ff5 100644 Binary files a/graphics/berry_fix/gba_transfer_error.png and b/graphics/berry_fix/gba_transfer_error.png differ diff --git a/graphics/berry_fix/gba_transfer_highlight.png b/graphics/berry_fix/gba_transfer_highlight.png index 25b47d036..e763bd62b 100644 Binary files a/graphics/berry_fix/gba_transfer_highlight.png and b/graphics/berry_fix/gba_transfer_highlight.png differ diff --git a/graphics/berry_fix/logo.png b/graphics/berry_fix/logo.png index ab91d5a26..120dd0f52 100644 Binary files a/graphics/berry_fix/logo.png and b/graphics/berry_fix/logo.png differ diff --git a/graphics/berry_fix/window.png b/graphics/berry_fix/window.png index 5e437e727..0ba517a6b 100644 Binary files a/graphics/berry_fix/window.png and b/graphics/berry_fix/window.png differ 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[] = { {