From 3acf002a9c2187ca228e1c7a8b3862e1bc4ab3ea Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Tue, 28 Dec 2021 13:16:31 -0500
Subject: [PATCH] Rename generic jp contest tilemaps

---
 .../{unused_tilemap_2.bin => japanese/audience.bin} | Bin
 graphics/contest/japanese/{tilemap_1.bin => bg.bin} | Bin
 .../interface.bin}                                  | Bin
 .../contest/japanese/{tilemap_2.bin => windows.bin} | Bin
 src/graphics.c                                      |   8 ++++----
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename graphics/contest/{unused_tilemap_2.bin => japanese/audience.bin} (100%)
 rename graphics/contest/japanese/{tilemap_1.bin => bg.bin} (100%)
 rename graphics/contest/{unused_tilemap_1.bin => japanese/interface.bin} (100%)
 rename graphics/contest/japanese/{tilemap_2.bin => windows.bin} (100%)

diff --git a/graphics/contest/unused_tilemap_2.bin b/graphics/contest/japanese/audience.bin
similarity index 100%
rename from graphics/contest/unused_tilemap_2.bin
rename to graphics/contest/japanese/audience.bin
diff --git a/graphics/contest/japanese/tilemap_1.bin b/graphics/contest/japanese/bg.bin
similarity index 100%
rename from graphics/contest/japanese/tilemap_1.bin
rename to graphics/contest/japanese/bg.bin
diff --git a/graphics/contest/unused_tilemap_1.bin b/graphics/contest/japanese/interface.bin
similarity index 100%
rename from graphics/contest/unused_tilemap_1.bin
rename to graphics/contest/japanese/interface.bin
diff --git a/graphics/contest/japanese/tilemap_2.bin b/graphics/contest/japanese/windows.bin
similarity index 100%
rename from graphics/contest/japanese/tilemap_2.bin
rename to graphics/contest/japanese/windows.bin
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");