From 3acf002a9c2187ca228e1c7a8b3862e1bc4ab3ea Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Dec 2021 13:16:31 -0500 Subject: Rename generic jp contest tilemaps --- graphics/contest/japanese/audience.bin | Bin 0 -> 8192 bytes graphics/contest/japanese/bg.bin | Bin 0 -> 2048 bytes graphics/contest/japanese/interface.bin | Bin 0 -> 2048 bytes graphics/contest/japanese/tilemap_1.bin | Bin 2048 -> 0 bytes graphics/contest/japanese/tilemap_2.bin | Bin 4096 -> 0 bytes graphics/contest/japanese/windows.bin | Bin 0 -> 4096 bytes graphics/contest/unused_tilemap_1.bin | Bin 2048 -> 0 bytes graphics/contest/unused_tilemap_2.bin | Bin 8192 -> 0 bytes src/graphics.c | 8 ++++---- 9 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 graphics/contest/japanese/audience.bin create mode 100644 graphics/contest/japanese/bg.bin create mode 100644 graphics/contest/japanese/interface.bin delete mode 100644 graphics/contest/japanese/tilemap_1.bin delete mode 100644 graphics/contest/japanese/tilemap_2.bin create mode 100644 graphics/contest/japanese/windows.bin delete mode 100644 graphics/contest/unused_tilemap_1.bin delete mode 100644 graphics/contest/unused_tilemap_2.bin diff --git a/graphics/contest/japanese/audience.bin b/graphics/contest/japanese/audience.bin new file mode 100644 index 000000000..e8a506838 Binary files /dev/null and b/graphics/contest/japanese/audience.bin differ diff --git a/graphics/contest/japanese/bg.bin b/graphics/contest/japanese/bg.bin new file mode 100644 index 000000000..da6f4652e Binary files /dev/null and b/graphics/contest/japanese/bg.bin differ diff --git a/graphics/contest/japanese/interface.bin b/graphics/contest/japanese/interface.bin new file mode 100644 index 000000000..b2567ca7c Binary files /dev/null and b/graphics/contest/japanese/interface.bin differ diff --git a/graphics/contest/japanese/tilemap_1.bin b/graphics/contest/japanese/tilemap_1.bin deleted file mode 100644 index da6f4652e..000000000 Binary files a/graphics/contest/japanese/tilemap_1.bin and /dev/null differ diff --git a/graphics/contest/japanese/tilemap_2.bin b/graphics/contest/japanese/tilemap_2.bin deleted file mode 100644 index 40de9e529..000000000 Binary files a/graphics/contest/japanese/tilemap_2.bin and /dev/null differ diff --git a/graphics/contest/japanese/windows.bin b/graphics/contest/japanese/windows.bin new file mode 100644 index 000000000..40de9e529 Binary files /dev/null and b/graphics/contest/japanese/windows.bin differ diff --git a/graphics/contest/unused_tilemap_1.bin b/graphics/contest/unused_tilemap_1.bin deleted file mode 100644 index b2567ca7c..000000000 Binary files a/graphics/contest/unused_tilemap_1.bin and /dev/null differ diff --git a/graphics/contest/unused_tilemap_2.bin b/graphics/contest/unused_tilemap_2.bin deleted file mode 100644 index e8a506838..000000000 Binary files a/graphics/contest/unused_tilemap_2.bin and /dev/null differ diff --git a/src/graphics.c b/src/graphics.c index 26eae14e2..47b82b6b7 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -435,15 +435,15 @@ const u32 gBattleAnimSpriteGfx_BlueFlames2[] = INCBIN_U32("graphics/battle_anims // Contest const u32 gJPContestGfx1[] = INCBIN_U32("graphics/contest/japanese/composite_1.4bpp.lz"); const u32 gJPContestPal[] = INCBIN_U32("graphics/contest/japanese/palette.gbapal.lz"); -const u32 gJPContestTilemap1[] = INCBIN_U32("graphics/contest/japanese/tilemap_1.bin.lz"); -const u32 gJPContestTilemap2[] = INCBIN_U32("graphics/contest/japanese/tilemap_2.bin.lz"); +const u32 gJPContestBgTilemap[] = INCBIN_U32("graphics/contest/japanese/bg.bin.lz"); +const u32 gJPContestWindowsTilemap[] = INCBIN_U32("graphics/contest/japanese/windows.bin.lz"); const u32 gJPContestGfx2[] = INCBIN_U32("graphics/contest/japanese/composite_2.4bpp.lz"); const u32 gContestInterfaceAudiencePalette[] = INCBIN_U32("graphics/contest/interface_audience.gbapal.lz"); const u32 gContestAudienceTilemap[] = INCBIN_U32("graphics/contest/audience.bin.lz"); const u32 gContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/interface.bin.lz"); -const u32 gContestUnusedTilemap1[] = INCBIN_U32("graphics/contest/unused_tilemap_1.bin.lz"); -const u32 gContestUnusedTilemap2[] = INCBIN_U32("graphics/contest/unused_tilemap_2.bin.lz"); +const u32 gJPContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/japanese/interface.bin.lz"); +const u32 gJPContestAudienceTilemap[] = INCBIN_U32("graphics/contest/japanese/audience.bin.lz"); const u32 gContestCurtainTilemap[] = INCBIN_U32("graphics/contest/curtain.bin.lz"); const u32 gContestInterfaceGfx[] = INCBIN_U32("graphics/contest/interface.4bpp.lz"); -- cgit v1.2.3