Merge pull request #1583 from GriffinRichards/renametilemaps

Give less generic names to some tilemaps, some misc fixes 

21 files changed, 25 insertions, 39 deletions

diff --git a/src/apprentice.c b/src/apprentice.c
index 2ab2f0e5a..591ab79e4 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -23,9 +23,7 @@
 #include "task.h"
 #include "text.h"
 #include "constants/battle_frontier.h"
-#include "constants/easy_chat.h"
 #include "constants/items.h"
-#include "constants/pokemon.h"
 #include "constants/songs.h"
 #include "constants/trainers.h"
 #include "constants/moves.h"
diff --git a/src/bard_music.c b/src/bard_music.c
index 114f1cf42..bdc5ac808 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -1,6 +1,5 @@
 #include "global.h"
 #include "bard_music.h"
-#include "constants/easy_chat.h"
 #include "easy_chat.h"
 
 #include "data/bard_music/bard_sounds.h"
diff --git a/src/battle_anim_smokescreen.c b/src/battle_anim_smokescreen.c
index 9844f5007..0819796d2 100644
--- a/src/battle_anim_smokescreen.c
+++ b/src/battle_anim_smokescreen.c
@@ -5,7 +5,6 @@
 #include "graphics.h"
 #include "sprite.h"
 #include "util.h"
-#include "constants/pokemon.h"
 #include "constants/battle_palace.h"
 
 static void SmokescreenImpact_Callback(struct Sprite *);
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 293662985..2f77491c9 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -34,7 +34,6 @@
 #include "constants/battle_dome.h"
 #include "constants/frontier_util.h"
 #include "constants/moves.h"
-#include "constants/pokemon.h"
 #include "constants/trainers.h"
 #include "constants/abilities.h"
 #include "constants/songs.h"
diff --git a/src/battle_pike.c b/src/battle_pike.c
index d889d7cdd..2b0cf6420 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -17,7 +17,6 @@
 #include "constants/battle_frontier.h"
 #include "constants/frontier_util.h"
 #include "constants/abilities.h"
-#include "constants/easy_chat.h"
 #include "constants/layouts.h"
 #include "constants/rgb.h"
 #include "constants/trainers.h"
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 7ed15d1e6..d1c95285b 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -35,7 +35,6 @@
 #include "constants/trainers.h"
 #include "constants/event_objects.h"
 #include "constants/moves.h"
-#include "constants/easy_chat.h"
 
 extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer[];
 extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer[];
diff --git a/src/data/easy_chat/easy_chat_words_by_letter.h b/src/data/easy_chat/easy_chat_words_by_letter.h
index a56e3184f..235afbb78 100755
--- a/src/data/easy_chat/easy_chat_words_by_letter.h
+++ b/src/data/easy_chat/easy_chat_words_by_letter.h
@@ -1,5 +1,4 @@
 #include "easy_chat.h"
-#include "constants/easy_chat.h"
 
 #define DOUBLE_SPECIES_NAME EC_EMPTY_WORD, 2,
 
diff --git a/src/data/lilycove_lady.h b/src/data/lilycove_lady.h
index dd0885ff8..4a3a7a719 100644
--- a/src/data/lilycove_lady.h
+++ b/src/data/lilycove_lady.h
@@ -1,4 +1,3 @@
-#include "constants/easy_chat.h"
 #include "constants/event_objects.h"
 #include "constants/items.h"
 #include "constants/moves.h"
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index bba2085e8..08dd9afe0 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -8,7 +8,6 @@
 #include "text.h"
 #include "tv.h"
 #include "string_util.h"
-#include "constants/easy_chat.h"
 
 /*
     ## Overview ##
diff --git a/src/easy_chat.c b/src/easy_chat.c
index f9ba44ba7..734fd4f18 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -27,7 +27,6 @@
 #include "task.h"
 #include "text_window.h"
 #include "window.h"
-#include "constants/easy_chat.h"
 #include "constants/event_objects.h"
 #include "constants/lilycove_lady.h"
 #include "constants/mauville_old_man.h"
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index 0de87602e..c3f17f234 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -10,7 +10,6 @@
 #include "task.h"
 #include "util.h"
 #include "trainer_hill.h"
-#include "constants/easy_chat.h"
 #include "constants/trainers.h"
 #include "constants/moves.h"
 #include "constants/items.h"
diff --git a/src/frontier_pass.c b/src/frontier_pass.c
index 07dd8f228..b14358741 100644
--- a/src/frontier_pass.c
+++ b/src/frontier_pass.c
@@ -173,7 +173,7 @@ static const u32 sHeads_Gfx[]                    = INCBIN_U32("graphics/frontier
 static const u32 sMapCursor_Gfx[]                = INCBIN_U32("graphics/frontier_pass/map_cursor.4bpp.lz");
 static const u32 sMapScreen_Tilemap[]            = INCBIN_U32("graphics/frontier_pass/map_screen.bin.lz");
 static const u32 sMapAndCard_ZoomedOut_Tilemap[] = INCBIN_U32("graphics/frontier_pass/small_map_and_card.bin.lz");
-static const u32 sUnusedData[]                   = INCBIN_U32("graphics/frontier_pass/unused.bin");
+static const u32 sCardBall_Filled_Tilemap[]      = INCBIN_U32("graphics/frontier_pass/card_ball_filled.bin"); // Unused
 static const u32 sBattleRecord_Tilemap[]         = INCBIN_U32("graphics/frontier_pass/record_frame.bin.lz");
 static const u32 sMapAndCard_Zooming_Tilemap[]   = INCBIN_U32("graphics/frontier_pass/small_map_and_card_affine.bin.lz");
 
diff --git a/src/graphics.c b/src/graphics.c
index 73825aebf..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");
@@ -1505,12 +1505,12 @@ const u16 gMonIconPalettes[][16] =
 const u16 gTitleScreenBgPalettes[]         = INCBIN_U16("graphics/title_screen/pokemon_logo.gbapal",
                                                         "graphics/title_screen/rayquaza_and_clouds.gbapal");
 const u16 gTitleScreenEmeraldVersionPal[]  = INCBIN_U16("graphics/title_screen/emerald_version.gbapal");
-const u32 gTitleScreenCloudsTilemap[]      = INCBIN_U32("graphics/title_screen/title_screen1.bin.lz");
+const u32 gTitleScreenCloudsTilemap[]      = INCBIN_U32("graphics/title_screen/clouds.bin.lz");
 const u32 gTitleScreenPokemonLogoGfx[]     = INCBIN_U32("graphics/title_screen/pokemon_logo.8bpp.lz");
 const u32 gTitleScreenEmeraldVersionGfx[]  = INCBIN_U32("graphics/title_screen/emerald_version.8bpp.lz");
 const u16 gTitleScreenPressStartPal[]      = INCBIN_U16("graphics/title_screen/press_start.gbapal");
 const u32 gTitleScreenPressStartGfx[]      = INCBIN_U32("graphics/title_screen/press_start.4bpp.lz");
-const u32 gTitleScreenPokemonLogoTilemap[] = INCBIN_U32("graphics/title_screen/title_screen2.bin.lz");
+const u32 gTitleScreenPokemonLogoTilemap[] = INCBIN_U32("graphics/title_screen/pokemon_logo.bin.lz");
 
 // size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well
 const u16 gFrontierPassBg_Pal[][16]                      = INCBIN_U16("graphics/frontier_pass/bg.gbapal");
diff --git a/src/mail_data.c b/src/mail_data.c
index ca50a687e..99cf1f9ed 100644
--- a/src/mail_data.c
+++ b/src/mail_data.c
@@ -5,7 +5,6 @@
 #include "pokemon_icon.h"
 #include "text.h"
 #include "international_string_util.h"
-#include "constants/easy_chat.h"
 
 #define UNOWN_OFFSET 30000
 
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 06c3b8288..681a3dadf 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -1,7 +1,6 @@
 #include "global.h"
 #include "main.h"
 #include "constants/songs.h"
-#include "constants/easy_chat.h"
 #include "constants/event_objects.h"
 #include "mauville_old_man.h"
 #include "event_data.h"
diff --git a/src/party_menu.c b/src/party_menu.c
index 34aff619f..36e83a168 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -65,7 +65,6 @@
 #include "window.h"
 #include "constants/battle.h"
 #include "constants/battle_frontier.h"
-#include "constants/easy_chat.h"
 #include "constants/field_effects.h"
 #include "constants/item_effects.h"
 #include "constants/items.h"
diff --git a/src/save.c b/src/save.c
index b53956438..dafc20868 100644
--- a/src/save.c
+++ b/src/save.c
@@ -428,7 +428,7 @@ static u8 CopySectorSecurityByte(u16 sectorId, const struct SaveSectorLocation *
     }
     else
     {
-        // Succeded
+        // Succeeded
         SetDamagedSectorBits(DISABLE, sector);
         return SAVE_STATUS_OK;
     }
@@ -734,7 +734,7 @@ u8 HandleSavingData(u8 saveType)
         WriteSaveSectorOrSlot(FULL_SAVE_SLOT, gRamSaveSectorLocations);
         break;
     case SAVE_LINK:
-    case SAVE_LINK2:
+    case SAVE_EREADER: // Dummied, now duplicate of SAVE_LINK
         // Used by link / Battle Frontier
         // Write only SaveBlocks 1 and 2 (skips the PC)
         CopyPartyAndObjectsToSave();
diff --git a/src/slot_machine.c b/src/slot_machine.c
index 6cbcd76fd..c58de415b 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -7154,18 +7154,18 @@ static const struct SpriteSheet sSlotMachineSpriteSheets[22] =
 
 static const u8 *const sReelBackground_Tilemap = gSlotMachineReelBackground_Tilemap;
 
-static const u16 sUnused[] =
+static const u16 sUnusedColors[] =
 {
-    0x6F7B,
-    0x6968,
-    0x36AB,
-    0x7FFF,
-    0x5750,
-    0x7EC0,
-    0x02BA,
-    0x02BA,
-    0x01FD,
-    0x01FD,
+    RGB(27, 27, 27),
+    RGB(8, 11, 26),
+    RGB(11, 21, 13),
+    RGB(31, 31, 31),
+    RGB(16, 26, 21),
+    RGB(0, 22, 31),
+    RGB(26, 21, 0),
+    RGB(26, 21, 0),
+    RGB(29, 15, 0),
+    RGB(29, 15, 0),
 };
 
 // The Bet 2 and 3 match line palettes are duplicated unnecessarily
@@ -7234,7 +7234,10 @@ static const u16 *const sPokeballShiningPalTable[] =
 };
 
 static const u16 *const sDigitalDisplay_Pal = gSlotMachineDigitalDisplay_Pal;
-static const u16 sUnkPalette[] = INCBIN_U16("graphics/slot_machine/85A8524.bin");
+static const u16 sUnkPalette[16] = {
+    [1] = RGB_WHITEALPHA,
+    [3] = RGB(8, 8, 8),
+};
 
 static const struct SpritePalette sSlotMachineSpritePalettes[] =
 {
diff --git a/src/title_screen.c b/src/title_screen.c
index 93e01327c..d64ee6024 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -52,7 +52,7 @@ static void SpriteCB_PressStartCopyrightBanner(struct Sprite *sprite);
 static void SpriteCB_PokemonLogoShine(struct Sprite *sprite);
 
 // const rom data
-static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unk_853EF78.gbapal");
+static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unused.gbapal");
 
 static const u32 sTitleScreenRayquazaGfx[] = INCBIN_U32("graphics/title_screen/rayquaza.4bpp.lz");
 static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_screen/rayquaza.bin.lz");
diff --git a/src/trade.c b/src/trade.c
index 935a89b02..b48d1abf5 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -44,7 +44,6 @@
 #include "util.h"
 #include "window.h"
 #include "constants/contest.h"
-#include "constants/easy_chat.h"
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/region_map_sections.h"
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 04312a2dd..3ada262e5 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -29,7 +29,6 @@
 #include "constants/layouts.h"
 #include "constants/moves.h"
 #include "constants/trainers.h"
-#include "constants/easy_chat.h"
 #include "constants/trainer_hill.h"
 #include "constants/trainer_types.h"