From 273e7fc0592b9a659e369017f44606f660c3ddd2 Mon Sep 17 00:00:00 2001 From: hjk321 Date: Wed, 31 Mar 2021 10:08:08 -0500 Subject: Index battle_records and berry_fix graphics --- graphics/battle_records/bg_tiles.bin | Bin 0 -> 2048 bytes graphics/battle_records/bg_tiles.png | Bin 135 -> 175 bytes graphics/battle_records/palette.pal | 19 ------------------- graphics/battle_records/tilemap.bin | Bin 2048 -> 0 bytes graphics/berry_fix/gba_small.png | Bin 2790 -> 2434 bytes graphics/berry_fix/gba_transfer.png | Bin 2311 -> 2005 bytes graphics/berry_fix/gba_transfer_error.png | Bin 1865 -> 1628 bytes graphics/berry_fix/gba_transfer_highlight.png | Bin 2207 -> 2000 bytes graphics/berry_fix/logo.png | Bin 2531 -> 2199 bytes graphics/berry_fix/window.png | Bin 1430 -> 1214 bytes src/battle_records.c | 6 +++--- 11 files changed, 3 insertions(+), 22 deletions(-) create mode 100644 graphics/battle_records/bg_tiles.bin delete mode 100644 graphics/battle_records/palette.pal delete mode 100644 graphics/battle_records/tilemap.bin diff --git a/graphics/battle_records/bg_tiles.bin b/graphics/battle_records/bg_tiles.bin new file mode 100644 index 000000000..a3691cfd7 Binary files /dev/null and b/graphics/battle_records/bg_tiles.bin differ 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/battle_records/tilemap.bin b/graphics/battle_records/tilemap.bin deleted file mode 100644 index a3691cfd7..000000000 Binary files a/graphics/battle_records/tilemap.bin and /dev/null differ 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[] = { { -- cgit v1.2.3