Merge branch 'master' into doc-littleroot

8 files changed, 24 insertions, 13 deletions

diff --git a/include/battle_bg.h b/include/battle_bg.h
index dac41c992..167ea5cf7 100644
--- a/include/battle_bg.h
+++ b/include/battle_bg.h
@@ -2,11 +2,11 @@
 #define GUARD_BATTLE_BG_H
 
 void BattleInitBgsAndWindows(void);
-void sub_80356D0(void);
+void InitBattleBgsVideo(void);
 void LoadBattleMenuWindowGfx(void);
 void DrawMainBattleBackground(void);
 void LoadBattleTextboxAndBackground(void);
-void sub_8035D74(u8 taskId);
+void InitLinkBattleVsScreen(u8 taskId);
 void DrawBattleEntryBackground(void);
 bool8 LoadChosenBattleElement(u8 caseId);
 
diff --git a/include/battle_message.h b/include/battle_message.h
index 88ccbb90f..1157fbfae 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -213,7 +213,7 @@ struct BattleMsgData
 void BufferStringBattle(u16 stringID);
 u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src);
 u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
-void BattlePutTextOnWindow(const u8* text, u8 arg1);
+void BattlePutTextOnWindow(const u8* text, u8 windowId);
 void SetPpNumbersPaletteInMoveSelection(void);
 u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
 
diff --git a/include/constants/coins.h b/include/constants/coins.h
new file mode 100644
index 000000000..fd68f3f9e
--- /dev/null
+++ b/include/constants/coins.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_CONSTANTS_COINS_H
+#define GUARD_CONSTANTS_COINS_H
+
+#define MAX_COINS 9999
+
+#endif // GUARD_CONSTANTS_COINS_H
\ No newline at end of file
diff --git a/include/constants/flags.h b/include/constants/flags.h
index e76a9d9d7..0ab22c1ef 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -119,7 +119,7 @@
 #define FLAG_OCEANIC_MUSEUM_MET_REPORTER     0x69
 #define FLAG_RECEIVED_HM04                   0x6A
 #define FLAG_RECEIVED_HM06                   0x6B
-#define FLAG_FLANNERY_GIVES_BADGE_INFO       0x6C
+#define FLAG_WHITEOUT_TO_LAVARIDGE           0x6C // Set after defeating Flannery, so the player cant white out from poison before receiving Go Goggles
 #define FLAG_RECEIVED_HM05                   0x6D
 #define FLAG_RECEIVED_HM02                   0x6E
 #define FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT  0x6F
@@ -261,7 +261,7 @@
 #define FLAG_USED_ROOM_2_KEY                 0xF1
 #define FLAG_USED_ROOM_4_KEY                 0xF2
 #define FLAG_USED_ROOM_6_KEY                 0xF3
-#define FLAG_MET_PROF_COSMO                  0xF4
+#define FLAG_MET_PROF_COZMO                  0xF4
 #define FLAG_RECEIVED_WAILMER_DOLL           0xF5
 #define FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 0xF6
 #define FLAG_DEFEATED_SS_TIDAL_TRAINERS      0xF7
@@ -807,7 +807,7 @@
 #define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE                      0x2FC
 #define FLAG_HIDE_MAUVILLE_CITY_SCOTT                               0x2FD
 #define FLAG_HIDE_VERDANTURF_TOWN_SCOTT                             0x2FE
-#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT                  0x2FF
+#define FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT                  0x2FF
 #define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE                        0x300
 #define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE                      0x301
 #define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE                          0x302
@@ -919,7 +919,7 @@
 #define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL                           0x36C
 #define FLAG_HIDE_MT_CHIMNEY_TRAINERS                               0x36D
 #define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT                         0x36E
-#define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN                            0x36F
+#define FLAG_HIDE_RUSTURF_TUNNEL_BRINEY                             0x36F
 #define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO                              0x370
 #define FLAG_HIDE_BRINEYS_HOUSE_PEEKO                               0x371
 #define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA                          0x372
@@ -969,8 +969,8 @@
 #define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA                              0x39E
 #define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA                             0x39F
 #define FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO                        0x3A0
-#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1                            0x3A1
-#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2                            0x3A2
+#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL                              0x3A1
+#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE                      0x3A2
 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1                             0x3A3
 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2                             0x3A4
 #define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL                      0x3A5
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 6d17fc047..c3ec28406 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -381,7 +381,7 @@
 #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C
 #define METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right  0x298
 
-// gTileset_BikeShop
+// gTileset_BikeShop (also used by New Mauville)
 #define METATILE_BikeShop_Barrier_Hidden_Top      0x269
 #define METATILE_BikeShop_Barrier_Hidden_Bottom   0x271
 #define METATILE_BikeShop_Floor_Shadow_Top        0x26D
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 1a3230b31..1b2759787 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -552,7 +552,7 @@ extern const u8 EventScript_FieldPoison[];
 extern const u8 EventScript_EggHatch[];
 extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[];
 extern const u8 IslandCave_EventScript_OpenRegiEntrance[];
-extern const u8 MauvilleCity_EventScript_1DF7BA[];
+extern const u8 MauvilleCity_EventScript_RegisterWallyCall[];
 extern const u8 Route119_EventScript_1F49EC[];
 extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[];
 extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[];
diff --git a/include/graphics.h b/include/graphics.h
index 37dd77e89..831b202f8 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3208,7 +3208,7 @@ extern const u32 gBattleTextboxTiles[];
 extern const u32 gBattleTextboxTilemap[];
 extern const u32 gBattleTextboxPalette[];
 extern const u32 gUnknown_08D778F0[];
-extern const u32 gUnknown_08D77B0C[];
+extern const u32 gVsLettersGfx[];
 extern const u32 gUnknown_08D77AE4[];
 extern const u32 gUnknown_08D779D8[];
 extern const u32 gUnknown_08D857A8[];
@@ -4122,7 +4122,7 @@ extern const u32 gUnknown_08D84970[];
 extern const u32 gUnknown_08D84F00[];
 extern const u32 gUnknown_08D85444[];
 extern const u32 gUnknown_08D85358[];
-extern const u32 gUnknown_08D85600[];
+extern const u32 gBattleWindowTextPalette[];
 extern const u32 gUnknown_08D854C8[];
 extern const u32 gUnknown_08D82F10[];
 extern const u32 gUnknown_08D834FC[];
diff --git a/include/save_location.h b/include/save_location.h
index 2eb550b1a..6c2ae0e6b 100644
--- a/include/save_location.h
+++ b/include/save_location.h
@@ -6,6 +6,11 @@
 #define POKECENTER_SAVEWARP          (1 << 1)
 #define LOBBY_SAVEWARP               (1 << 2)
 #define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3)
+//
+//
+//
+//
+#define CHAMPION_SAVEWARP            (1 << 7)
 
 void TrySetMapSaveWarpStatus(void);
 void sub_81AFDA0(void);