diff options
author | hjk321 <anderdude@outlook.com> | 2021-03-31 10:08:08 -0500 |
---|---|---|
committer | hjk321 <anderdude@outlook.com> | 2021-03-31 10:08:08 -0500 |
commit | 273e7fc0592b9a659e369017f44606f660c3ddd2 (patch) | |
tree | 3f1d7a593de7c1bb11f234a850ddf2e1fddd3a42 | |
parent | ea68ec3fd7359061eaa4ca0e2550ee9961a52449 (diff) |
Index battle_records and berry_fix graphics
-rw-r--r-- | graphics/battle_records/bg_tiles.bin (renamed from graphics/battle_records/tilemap.bin) | bin | 2048 -> 2048 bytes | |||
-rw-r--r-- | graphics/battle_records/bg_tiles.png | bin | 135 -> 175 bytes | |||
-rw-r--r-- | graphics/battle_records/palette.pal | 19 | ||||
-rw-r--r-- | graphics/berry_fix/gba_small.png | bin | 2790 -> 2434 bytes | |||
-rw-r--r-- | graphics/berry_fix/gba_transfer.png | bin | 2311 -> 2005 bytes | |||
-rw-r--r-- | graphics/berry_fix/gba_transfer_error.png | bin | 1865 -> 1628 bytes | |||
-rw-r--r-- | graphics/berry_fix/gba_transfer_highlight.png | bin | 2207 -> 2000 bytes | |||
-rw-r--r-- | graphics/berry_fix/logo.png | bin | 2531 -> 2199 bytes | |||
-rw-r--r-- | graphics/berry_fix/window.png | bin | 1430 -> 1214 bytes | |||
-rw-r--r-- | src/battle_records.c | 6 |
10 files changed, 3 insertions, 22 deletions
diff --git a/graphics/battle_records/tilemap.bin b/graphics/battle_records/bg_tiles.bin Binary files differindex a3691cfd7..a3691cfd7 100644 --- a/graphics/battle_records/tilemap.bin +++ b/graphics/battle_records/bg_tiles.bin diff --git a/graphics/battle_records/bg_tiles.png b/graphics/battle_records/bg_tiles.png Binary files differindex bbe9de321..824ec68b0 100644 --- a/graphics/battle_records/bg_tiles.png +++ b/graphics/battle_records/bg_tiles.png 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 Binary files differindex 59bfaf4d5..63f79cb49 100644 --- a/graphics/berry_fix/gba_small.png +++ b/graphics/berry_fix/gba_small.png diff --git a/graphics/berry_fix/gba_transfer.png b/graphics/berry_fix/gba_transfer.png Binary files differindex a741fe1b9..f8d49db21 100644 --- a/graphics/berry_fix/gba_transfer.png +++ b/graphics/berry_fix/gba_transfer.png diff --git a/graphics/berry_fix/gba_transfer_error.png b/graphics/berry_fix/gba_transfer_error.png Binary files differindex 766b9f28e..6c5f69ff5 100644 --- a/graphics/berry_fix/gba_transfer_error.png +++ b/graphics/berry_fix/gba_transfer_error.png diff --git a/graphics/berry_fix/gba_transfer_highlight.png b/graphics/berry_fix/gba_transfer_highlight.png Binary files differindex 25b47d036..e763bd62b 100644 --- a/graphics/berry_fix/gba_transfer_highlight.png +++ b/graphics/berry_fix/gba_transfer_highlight.png diff --git a/graphics/berry_fix/logo.png b/graphics/berry_fix/logo.png Binary files differindex ab91d5a26..120dd0f52 100644 --- a/graphics/berry_fix/logo.png +++ b/graphics/berry_fix/logo.png diff --git a/graphics/berry_fix/window.png b/graphics/berry_fix/window.png Binary files differindex 5e437e727..0ba517a6b 100644 --- a/graphics/berry_fix/window.png +++ b/graphics/berry_fix/window.png 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[] = { { |