From fe55580fe1e51c669033939125c939ed13a555d0 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Wed, 27 Feb 2019 03:42:04 -0500
Subject: Reverse engineer unusual weather events

---
 src/field_specials.c | 22 +++++++++++-----------
 src/match_call.c     |  2 +-
 src/overworld.c      |  2 +-
 src/region_map.c     |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/field_specials.c b/src/field_specials.c
index 307f81399..1accaa5e5 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3421,28 +3421,28 @@ bool8 sub_813B260(void)
     return FALSE;
 }
 
-void sub_813B2E4(void)
+void CreateUnusualWeatherEvent(void)
 {
     u16 randomValue = Random();
     VarSet(VAR_0x4038, 0);
 
     if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE)
     {
-        VarSet(VAR_0x4037, (randomValue & 7) + 1);
+        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
     }
     else if (FlagGet(FLAG_DEFEATED_GROUDON) == TRUE)
     {
-        VarSet(VAR_0x4037, (randomValue & 7) + 9);
+        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
     }
     else if ((randomValue & 1) == 0)
     {
         randomValue = Random();
-        VarSet(VAR_0x4037, (randomValue & 7) + 1);
+        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
     }
     else
     {
         randomValue = Random();
-        VarSet(VAR_0x4037, (randomValue & 7) + 9);
+        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
     }
 }
 
@@ -3450,7 +3450,7 @@ bool32 sub_813B374(void)
 {
     static const u8 gUnknown_085B3400[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
 
-    u16 var = VarGet(VAR_0x4037);
+    u16 var = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
 
     GetMapName(gStringVar1, gUnknown_085B3400[var - 1], 0);
 
@@ -3466,12 +3466,12 @@ bool32 sub_813B374(void)
 
 bool8 sub_813B3B0(void)
 {
-    static const u8 gUnknown_085B3410[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
+    static const u8 sUnusualWeatherMapNumbers[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
 
     u16 var1 = VarGet(VAR_0x4038);
-    u16 var2 = VarGet(VAR_0x4037);
+    u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
 
-    if (!var2)
+    if (unusualWeather == UNUSUAL_WEATHER_NONE)
     {
         return FALSE;
     }
@@ -3510,14 +3510,14 @@ bool8 sub_813B3B0(void)
             }
         }
 
-        if (gSaveBlock1Ptr->location.mapNum == gUnknown_085B3410[var2 - 1] &&
+        if (gSaveBlock1Ptr->location.mapNum == sUnusualWeatherMapNumbers[unusualWeather - 1] &&
             gSaveBlock1Ptr->location.mapGroup == 0)
         {
             return TRUE;
         }
         else
         {
-            VarSet(VAR_0x4037, 0);
+            VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE);
             return FALSE;
         }
     }
diff --git a/src/match_call.c b/src/match_call.c
index e7e91969f..de1181e8b 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -1016,7 +1016,7 @@ static bool32 MapAllowsMatchCall(void)
     
     if (gMapHeader.regionMapSectionId == MAPSEC_SOOTOPOLIS_CITY
      && FlagGet(FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA) == TRUE
-     && FlagGet(FLAG_UNUSED_0x0DC) == FALSE)
+     && FlagGet(FLAG_NEVER_SET_0x0DC) == FALSE)
         return FALSE;
 
     if (gMapHeader.regionMapSectionId == MAPSEC_MT_CHIMNEY
diff --git a/src/overworld.c b/src/overworld.c
index a10d1e17a..edc4d402c 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -411,7 +411,7 @@ static void Overworld_ResetStateAfterWhiteOut(void)
     if (VarGet(VAR_0x4039) == 1)
     {
         VarSet(VAR_0x4039, 0);
-        VarSet(VAR_0x4037, 0);
+        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE);
     }
 }
 
diff --git a/src/region_map.c b/src/region_map.c
index ff0c19167..5c85606a8 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1159,7 +1159,7 @@ static u16 RegionMap_GetTerraCaveMapSecId(void)
 {
     s16 idx;
 
-    idx = VarGet(VAR_0x4037) - 1;
+    idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION) - 1;
     if (idx < 0 || idx > 15)
     {
         idx = 0;
@@ -1171,7 +1171,7 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y)
 {
     u16 idx;
 
-    idx = VarGet(VAR_0x4037);
+    idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
     if (idx < 9 || idx > 16)
     {
         idx = 9;
-- 
cgit v1.2.3


From c1348d22f3d85cbc7425e8498a023b9b525f7207 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Wed, 27 Feb 2019 04:27:54 -0500
Subject: Name most event scripts related to unusual weather

---
 src/field_control_avatar.c |  2 +-
 src/field_specials.c       | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index cffafaf9f..90f7f4d5e 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -559,7 +559,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
         }
         if (sub_813B3B0() == TRUE)
         {
-            ScriptContext1_SetupScript(gUnknown_08273D1F);
+            ScriptContext1_SetupScript(UnusualWeather_EventScript_EndEventAndCleanup_1);
             return TRUE;
         }
         if (ShouldDoBrailleRegicePuzzle() == TRUE)
diff --git a/src/field_specials.c b/src/field_specials.c
index 1accaa5e5..a5edb0122 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3446,15 +3446,17 @@ void CreateUnusualWeatherEvent(void)
     }
 }
 
-bool32 sub_813B374(void)
+// Saves the map name for the current unusual weather location in gStringVar1, then
+// returns TRUE if the weather is for Kyogre, and FALSE if it's for Groudon.
+bool32 GetUnusualWeatherMapNameAndType(void)
 {
-    static const u8 gUnknown_085B3400[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
+    static const u8 sUnusualWeatherMapNumbers[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
 
-    u16 var = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
+    u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
 
-    GetMapName(gStringVar1, gUnknown_085B3400[var - 1], 0);
+    GetMapName(gStringVar1, sUnusualWeatherMapNumbers[unusualWeather - 1], 0);
 
-    if (var < 9)
+    if (unusualWeather < UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START)
     {
         return FALSE;
     }
@@ -3466,7 +3468,8 @@ bool32 sub_813B374(void)
 
 bool8 sub_813B3B0(void)
 {
-    static const u8 sUnusualWeatherMapNumbers[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
+    // Duplicate array.
+    static const u8 sUnusualWeatherMapNumbers_2[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
 
     u16 var1 = VarGet(VAR_0x4038);
     u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
@@ -3510,7 +3513,7 @@ bool8 sub_813B3B0(void)
             }
         }
 
-        if (gSaveBlock1Ptr->location.mapNum == sUnusualWeatherMapNumbers[unusualWeather - 1] &&
+        if (gSaveBlock1Ptr->location.mapNum == sUnusualWeatherMapNumbers_2[unusualWeather - 1] &&
             gSaveBlock1Ptr->location.mapGroup == 0)
         {
             return TRUE;
-- 
cgit v1.2.3


From 4137dd7b0bd6dd661831856e4ca30b958d4beac9 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Wed, 27 Feb 2019 14:42:32 -0500
Subject: Identify unused, never read, and never written vars

---
 src/event_data.c           | 14 +++++++-------
 src/field_control_avatar.c |  2 +-
 src/field_specials.c       | 16 ++++++++--------
 src/overworld.c            |  6 ++++--
 4 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/event_data.c b/src/event_data.c
index e75c37773..5ca288e7b 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -131,13 +131,13 @@ void sub_809D4D8(void)
 void sub_809D570(void)
 {
     VarSet(VAR_EVENT_PICHU_SLOT, 0);
-    VarSet(VAR_0x40DE, 0);
-    VarSet(VAR_0x40DF, 0);
-    VarSet(VAR_0x40E0, 0);
-    VarSet(VAR_0x40E1, 0);
-    VarSet(VAR_0x40E2, 0);
-    VarSet(VAR_0x40E3, 0);
-    VarSet(VAR_0x40E4, 0);
+    VarSet(VAR_NEVER_READ_0x40DE, 0);
+    VarSet(VAR_NEVER_READ_0x40DF, 0);
+    VarSet(VAR_NEVER_READ_0x40E0, 0);
+    VarSet(VAR_NEVER_READ_0x40E1, 0);
+    VarSet(VAR_NEVER_READ_0x40E2, 0);
+    VarSet(VAR_NEVER_READ_0x40E3, 0);
+    VarSet(VAR_NEVER_READ_0x40E4, 0);
 }
 
 void DisableResetRTC(void)
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 90f7f4d5e..7bb2b257d 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -557,7 +557,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
             ScriptContext1_SetupScript(EventScript_EggHatch);
             return TRUE;
         }
-        if (sub_813B3B0() == TRUE)
+        if (UnusualWeatherHasExpired() == TRUE)
         {
             ScriptContext1_SetupScript(UnusualWeather_EventScript_EndEventAndCleanup_1);
             return TRUE;
diff --git a/src/field_specials.c b/src/field_specials.c
index a5edb0122..7bfce8dd9 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3424,7 +3424,7 @@ bool8 sub_813B260(void)
 void CreateUnusualWeatherEvent(void)
 {
     u16 randomValue = Random();
-    VarSet(VAR_0x4038, 0);
+    VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0);
 
     if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE)
     {
@@ -3466,12 +3466,12 @@ bool32 GetUnusualWeatherMapNameAndType(void)
     }
 }
 
-bool8 sub_813B3B0(void)
+bool8 UnusualWeatherHasExpired(void)
 {
     // Duplicate array.
     static const u8 sUnusualWeatherMapNumbers_2[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
 
-    u16 var1 = VarGet(VAR_0x4038);
+    u16 steps = VarGet(VAR_UNUSUAL_WEATHER_STEP_COUNTER);
     u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
 
     if (unusualWeather == UNUSUAL_WEATHER_NONE)
@@ -3479,9 +3479,9 @@ bool8 sub_813B3B0(void)
         return FALSE;
     }
 
-    if (++var1 > 999)
+    if (++steps > 999)
     {
-        VarSet(VAR_0x4038, 0);
+        VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0);
         if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_MARINE_CAVE))
         {
             switch (gSaveBlock1Ptr->location.mapNum)
@@ -3491,7 +3491,7 @@ bool8 sub_813B3B0(void)
                 case MAP_NUM(MARINE_CAVE_END):
                 case MAP_NUM(TERRA_CAVE_ENTRANCE):
                 case MAP_NUM(TERRA_CAVE_END):
-                    VarSet(VAR_0x4039, 1);
+                    VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1);
                     return FALSE;
                 default:
                     break;
@@ -3506,7 +3506,7 @@ bool8 sub_813B3B0(void)
                 case MAP_NUM(UNDERWATER5):
                 case MAP_NUM(UNDERWATER6):
                 case MAP_NUM(UNDERWATER7):
-                    VarSet(VAR_0x4039, 1);
+                    VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1);
                     return FALSE;
                 default:
                     break;
@@ -3526,7 +3526,7 @@ bool8 sub_813B3B0(void)
     }
     else
     {
-        VarSet(VAR_0x4038, var1);
+        VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, steps);
         return FALSE;
     }
 }
diff --git a/src/overworld.c b/src/overworld.c
index edc4d402c..4206be448 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -408,9 +408,11 @@ static void Overworld_ResetStateAfterWhiteOut(void)
     FlagClear(FLAG_SYS_SAFARI_MODE);
     FlagClear(FLAG_SYS_USE_STRENGTH);
     FlagClear(FLAG_SYS_USE_FLASH);
-    if (VarGet(VAR_0x4039) == 1)
+    // If you were defeated by Kyogre/Groudon and the step counter has
+    // maxed out, end the unusual weather.
+    if (VarGet(VAR_SHOULD_END_UNUSUAL_WEATHER) == 1)
     {
-        VarSet(VAR_0x4039, 0);
+        VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 0);
         VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE);
     }
 }
-- 
cgit v1.2.3


From 648fc3d4f33b0df553b0fd3737843a1495351993 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Wed, 27 Feb 2019 15:18:56 -0500
Subject: Name more unknown vars

---
 src/field_specials.c | 2 +-
 src/lottery_corner.c | 2 +-
 src/overworld.c      | 6 +++---
 src/secret_base.c    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/field_specials.c b/src/field_specials.c
index 7bfce8dd9..a07e987eb 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3580,7 +3580,7 @@ bool32 sub_813B4E0(void)
 
 bool32 sub_813B514(void)
 {
-    if (!VarGet(VAR_0x403F))
+    if (!VarGet(VAR_ALWAYS_ZERO_0x403F))
     {
         return FALSE;
     }
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index bd7d17ef7..bb3bb7a5c 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -27,7 +27,7 @@ void ResetLotteryCorner(void)
     u16 rand = Random();
 
     SetLotteryNumber((Random() << 16) | rand);
-    VarSet(VAR_POKELOT_PRIZE, 0);
+    VarSet(VAR_POKELOT_PRIZE_ITEM, 0);
 }
 
 void SetRandomLotteryNumber(u16 i)
diff --git a/src/overworld.c b/src/overworld.c
index 4206be448..8ca10a33b 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -1018,7 +1018,7 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
         case MAP_NUM(ROUTE128):
             return TRUE;
         default:
-            if (VarGet(VAR_0x405E) < 4)
+            if (VarGet(VAR_RAYQUAZA_STATE) < 4)
                 return FALSE;
             switch (warp->mapNum)
             {
@@ -1059,9 +1059,9 @@ static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp)
 
 static bool16 IsInflitratedSpaceCenter(struct WarpData *warp)
 {
-    if (VarGet(VAR_0x405D) == 0)
+    if (VarGet(VAR_MOSSDEEP_STATE) == 0)
         return FALSE;
-    else if (VarGet(VAR_0x405D) > 2)
+    else if (VarGet(VAR_MOSSDEEP_STATE) > 2)
         return FALSE;
     else if (warp->mapGroup != MAP_GROUP(MOSSDEEP_CITY_SPACE_CENTER_1F))
         return FALSE;
diff --git a/src/secret_base.c b/src/secret_base.c
index adcab9cbc..7ff83dec8 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -407,7 +407,7 @@ void sub_80E9068(void)
 
 bool8 sub_80E909C(void)
 {
-    if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_0x4097) == 0)
+    if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_SECRET_BASE_SHOULD_BE_INIT) == 0)
     {
         return FALSE;
     }
@@ -494,7 +494,7 @@ void sub_80E9238(u8 flagIn)
             sub_80E8CB0(&x, &y, 0x220);
             MapGridSetMetatileIdAt(x + 7, y + 7, 0x221 | 0xc00);
         }
-        else if (flagIn == 1 && VarGet(VAR_0x4089) == 1)
+        else if (flagIn == 1 && VarGet(VAR_SECRET_BASE_INITIALIZED) == 1)
         {
             sub_80E8CB0(&x, &y, 0x220);
             MapGridSetMetatileIdAt(x + 7, y + 7, 0x20a | 0xc00);
-- 
cgit v1.2.3


From e77e7844ea6b6cdba1a6386f144aa712aea1807b Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Wed, 27 Feb 2019 20:25:09 -0500
Subject: Name several vars, document some related events

---
 src/mirage_tower.c | 2 +-
 src/overworld.c    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mirage_tower.c b/src/mirage_tower.c
index a8dd5d9de..4f5834db1 100644
--- a/src/mirage_tower.c
+++ b/src/mirage_tower.c
@@ -317,7 +317,7 @@ void SetMirageTowerVisibility(void)
     u16 rand;
     bool8 visible;
 
-    if (VarGet(VAR_0x40CB))
+    if (VarGet(VAR_ROUTE_111_STATE))
     {
         FlagClear(FLAG_MIRAGE_TOWER_VISIBLE);
         return;
diff --git a/src/overworld.c b/src/overworld.c
index 8ca10a33b..6055c74bb 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -1034,7 +1034,7 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
 
 static bool16 NoMusicInSotopolisWithLegendaries(struct WarpData *warp)
 {
-    if (VarGet(VAR_0x40CA) != 1)
+    if (VarGet(VAR_SKY_PILLAR_STATE) != 1)
         return FALSE;
     else if (warp->mapGroup != MAP_GROUP(SOOTOPOLIS_CITY))
         return FALSE;
@@ -1212,7 +1212,7 @@ void TryFadeOutOldMapMusic(void)
     if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE && warpMusic != GetCurrentMapMusic())
     {
         if (currentMusic == MUS_NAMINORI
-            && VarGet(VAR_0x40CA) == 2
+            && VarGet(VAR_SKY_PILLAR_STATE) == 2
             && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY)
             && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SOOTOPOLIS_CITY)
             && sWarpDestination.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY)
-- 
cgit v1.2.3


From 66f0616a2d3fd3a8e09aabf9e3ee51cd88ae474f Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Wed, 27 Feb 2019 21:28:34 -0500
Subject: I guess I'm documenting Trainer Hill now

---
 src/load_save.c    |  2 +-
 src/main.c         | 14 +++++++-------
 src/save.c         |  6 +++---
 src/trainer_hill.c | 50 +++++++++++++++++++++++++-------------------------
 4 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'src')

diff --git a/src/load_save.c b/src/load_save.c
index 0d19c6dae..d71e72802 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -99,7 +99,7 @@ void MoveSaveBlocks_ResetHeap(void)
     hblankCB = gMain.hblankCallback;
     gMain.vblankCallback = NULL;
     gMain.hblankCallback = NULL;
-    gUnknown_0203CF5C = NULL;
+    gVBlankCounterPointer = NULL;
 
     saveBlock2Copy = (struct SaveBlock2 *)(gHeap);
     saveBlock1Copy = (struct SaveBlock1 *)(gHeap + sizeof(struct SaveBlock2));
diff --git a/src/main.c b/src/main.c
index 61c5e3386..3e282775d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -163,7 +163,7 @@ static void UpdateLinkAndCallCallbacks(void)
 static void InitMainCallbacks(void)
 {
     gMain.vblankCounter1 = 0;
-    gUnknown_0203CF5C = NULL;
+    gVBlankCounterPointer = NULL;
     gMain.vblankCounter2 = 0;
     gMain.callback1 = NULL;
     SetMainCallback2(CB2_InitCopyrightScreenAfterBootup);
@@ -324,8 +324,8 @@ static void VBlankIntr(void)
 
     gMain.vblankCounter1++;
 
-    if (gUnknown_0203CF5C && *gUnknown_0203CF5C < 0xFFFFFFFF)
-        (*gUnknown_0203CF5C)++;
+    if (gVBlankCounterPointer && *gVBlankCounterPointer < 0xFFFFFFFF)
+        (*gVBlankCounterPointer)++;
 
     if (gMain.vblankCallback)
         gMain.vblankCallback();
@@ -393,14 +393,14 @@ static void WaitForVBlank(void)
         ;
 }
 
-void sub_80008DC(u32 *var)
+void SetVBlankCounterPointer(u32 *var)
 {
-    gUnknown_0203CF5C = var;
+    gVBlankCounterPointer = var;
 }
 
-void sub_80008E8(void)
+void ClearVBlankCounterPointer(void)
 {
-    gUnknown_0203CF5C = NULL;
+    gVBlankCounterPointer = NULL;
 }
 
 void DoSoftReset(void)
diff --git a/src/save.c b/src/save.c
index a22e20f0b..593ee8f2c 100644
--- a/src/save.c
+++ b/src/save.c
@@ -659,10 +659,10 @@ static void UpdateSaveAddresses(void)
 u8 HandleSavingData(u8 saveType)
 {
     u8 i;
-    u32 *backupVar = gUnknown_0203CF5C;
+    u32 *backupVar = gVBlankCounterPointer;
     u8 *tempAddr;
 
-    gUnknown_0203CF5C = NULL;
+    gVBlankCounterPointer = NULL;
     UpdateSaveAddresses();
     switch (saveType)
     {
@@ -705,7 +705,7 @@ u8 HandleSavingData(u8 saveType)
         save_write_to_flash(0xFFFF, gRamSaveSectionLocations);
         break;
     }
-    gUnknown_0203CF5C = backupVar;
+    gVBlankCounterPointer = backupVar;
     return 0;
 }
 
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 42b196abd..60f67c91d 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -92,15 +92,15 @@ struct TrHillStruct2
 // EWRAM
 static EWRAM_DATA struct TrHillStruct2 *sHillData = NULL;
 static EWRAM_DATA struct TrHillRoomTrainers *sRoomTrainers = NULL;
-EWRAM_DATA u32 *gUnknown_0203CF5C = NULL;
+EWRAM_DATA u32 *gVBlankCounterPointer = NULL;
 
 // This file's functions.
-static void sub_81D581C(void);
+static void TrainerHillStartChallenge(void);
 static void sub_81D58D8(void);
 static void sub_81D5924(void);
 static void sub_81D59D0(void);
-static void sub_81D5A70(void);
-static void sub_81D5AB4(void);
+static void TrainerHillResumeTimer(void);
+static void TrainerHillSetPlayerLost(void);
 static void sub_81D5AD0(void);
 static void sub_81D5B2C(void);
 static void sub_81D5BBC(void);
@@ -263,12 +263,12 @@ static const u8 *const sFloorStrings[] =
 
 static void (* const sHillFunctions[])(void) =
 {
-    sub_81D581C,
+    TrainerHillStartChallenge,
     sub_81D58D8,
     sub_81D5924,
     sub_81D59D0,
-    sub_81D5A70,
-    sub_81D5AB4,
+    TrainerHillResumeTimer,
+    TrainerHillSetPlayerLost,
     sub_81D5AD0,
     sub_81D5B2C,
     sub_81D5BBC,
@@ -371,7 +371,7 @@ void InitTrainerHillBattleStruct(void)
         }
         sRoomTrainers->facilityClass[i] = sHillData->tag.floors[sHillData->floorId].trainers[i].facilityClass;
     }
-    sub_80008DC(&gSaveBlock1Ptr->trainerHill.field_3D64);
+    SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer);
     FreeDataStruct();
 }
 
@@ -425,7 +425,7 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId)
     FreeDataStruct();
 }
 
-static void sub_81D581C(void)
+static void TrainerHillStartChallenge(void)
 {
     nullsub_2();
     if (!sub_81D3B34())
@@ -434,8 +434,8 @@ static void sub_81D581C(void)
         gSaveBlock1Ptr->trainerHill.field_3D6E_0f = 0;
 
     gSaveBlock1Ptr->trainerHill.field_3D6C = 0;
-    sub_80008DC(&gSaveBlock1Ptr->trainerHill.field_3D64);
-    gSaveBlock1Ptr->trainerHill.field_3D64 = 0;
+    SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer);
+    gSaveBlock1Ptr->trainerHill.timer = 0;
     gSaveBlock1Ptr->trainerHill.field_3D6E_0c = 0;
     gSaveBlock1Ptr->trainerHill.field_3D6E_0b = 0;
     gSaveBlock1Ptr->trainerHill.field_3D6E_0e = 0;
@@ -446,7 +446,7 @@ static void sub_81D581C(void)
 
 static void sub_81D58D8(void)
 {
-    sub_80008E8();
+    ClearVBlankCounterPointer();
     gSpecialVar_Result = 0;
     if (gSaveBlock1Ptr->trainerHill.field_3D6E_0c)
         gSpecialVar_Result++;
@@ -483,9 +483,9 @@ static void sub_81D59D0(void)
     {
         gSpecialVar_Result = 2;
     }
-    else if (GetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68) > gSaveBlock1Ptr->trainerHill.field_3D64)
+    else if (GetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68) > gSaveBlock1Ptr->trainerHill.timer)
     {
-        SetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68, gSaveBlock1Ptr->trainerHill.field_3D64);
+        SetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68, gSaveBlock1Ptr->trainerHill.timer);
         gSaveBlock1Ptr->trainerHillTimes[gSaveBlock1Ptr->trainerHill.tag] = gSaveBlock1Ptr->trainerHill.field_3D68;
         gSpecialVar_Result = 0;
     }
@@ -497,27 +497,27 @@ static void sub_81D59D0(void)
     gSaveBlock1Ptr->trainerHill.field_3D6E_0b = 1;
 }
 
-static void sub_81D5A70(void)
+static void TrainerHillResumeTimer(void)
 {
     if (!gSaveBlock1Ptr->trainerHill.field_3D6E_0c)
     {
-        if (gSaveBlock1Ptr->trainerHill.field_3D64 >= HILL_MAX_TIME)
-            gSaveBlock1Ptr->trainerHill.field_3D64 = HILL_MAX_TIME;
+        if (gSaveBlock1Ptr->trainerHill.timer >= HILL_MAX_TIME)
+            gSaveBlock1Ptr->trainerHill.timer = HILL_MAX_TIME;
         else
-            sub_80008DC(&gSaveBlock1Ptr->trainerHill.field_3D64);
+            SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer);
     }
 }
 
-static void sub_81D5AB4(void)
+static void TrainerHillSetPlayerLost(void)
 {
-    gSaveBlock1Ptr->trainerHill.field_3D6E_0d = 1;
+    gSaveBlock1Ptr->trainerHill.hasLost = 1;
 }
 
 static void sub_81D5AD0(void)
 {
-    if (gSaveBlock1Ptr->trainerHill.field_3D6E_0d)
+    if (gSaveBlock1Ptr->trainerHill.hasLost)
     {
-        gSaveBlock1Ptr->trainerHill.field_3D6E_0d = 0;
+        gSaveBlock1Ptr->trainerHill.hasLost = 0;
         gSpecialVar_Result = 0;
     }
     else if (gSaveBlock1Ptr->trainerHill.field_3D6E_0e)
@@ -535,7 +535,7 @@ static void sub_81D5B2C(void)
 {
     s32 total, minutes, secondsWhole, secondsFraction;
 
-    total = gSaveBlock1Ptr->trainerHill.field_3D64;
+    total = gSaveBlock1Ptr->trainerHill.timer;
     if (total >= HILL_MAX_TIME)
         total = HILL_MAX_TIME;
 
@@ -1048,7 +1048,7 @@ bool32 sub_81D6534(void)
 
 static void sub_81D6568(void)
 {
-    if (gSaveBlock1Ptr->trainerHill.field_3D6E_0d)
+    if (gSaveBlock1Ptr->trainerHill.hasLost)
         gSpecialVar_Result = 0;
     else
         gSpecialVar_Result = 1;
@@ -1103,7 +1103,7 @@ static u16 sub_81D6640(void)
         i = (i + 1) % 10;
 
     ptr = gUnknown_0862A5CC[var2][i];
-    minutes = (signed)(gSaveBlock1Ptr->trainerHill.field_3D64) / (60 * 60);
+    minutes = (signed)(gSaveBlock1Ptr->trainerHill.timer) / (60 * 60);
     if (minutes < 12)
         id = 0;
     else if (minutes < 13)
-- 
cgit v1.2.3


From 782979f1fc37c358a5c675a1c42afae9b0027805 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Wed, 27 Feb 2019 22:16:01 -0500
Subject: Finish documenting trainer hill

Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
---
 src/trainer_hill.c | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 60f67c91d..ee7e2287a 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -30,6 +30,7 @@
 #include "constants/species.h"
 #include "constants/trainers.h"
 #include "constants/easy_chat.h"
+#include "constants/trainer_hill.h"
 
 extern bool32 sub_81D3B34(void);
 
@@ -101,7 +102,7 @@ static void sub_81D5924(void);
 static void sub_81D59D0(void);
 static void TrainerHillResumeTimer(void);
 static void TrainerHillSetPlayerLost(void);
-static void sub_81D5AD0(void);
+static void TrainerHillGetChallengeStatus(void);
 static void sub_81D5B2C(void);
 static void sub_81D5BBC(void);
 static void sub_81D5C00(void);
@@ -112,7 +113,7 @@ static void sub_81D64DC(void);
 static void sub_81D64FC(void);
 static void sub_81D6518(void);
 static void sub_81D6568(void);
-static void sub_81D65A0(void);
+static void TrainerHillSetTag(void);
 static void SetUpDataStruct(void);
 static void FreeDataStruct(void);
 static void nullsub_2(void);
@@ -269,7 +270,7 @@ static void (* const sHillFunctions[])(void) =
     sub_81D59D0,
     TrainerHillResumeTimer,
     TrainerHillSetPlayerLost,
-    sub_81D5AD0,
+    TrainerHillGetChallengeStatus,
     sub_81D5B2C,
     sub_81D5BBC,
     sub_81D5C00,
@@ -280,7 +281,7 @@ static void (* const sHillFunctions[])(void) =
     sub_81D64FC,
     sub_81D6518,
     sub_81D6568,
-    sub_81D65A0,
+    TrainerHillSetTag,
 };
 
 static const u8 *const sTagMatchStrings[] =
@@ -318,7 +319,7 @@ void ResetTrainerHillResults(void)
 
     gSaveBlock2Ptr->frontier.field_EF9_1 = 0;
     gSaveBlock2Ptr->frontier.field_EF9_0 = 0;
-    gSaveBlock1Ptr->trainerHill.field_3D68 = 0;
+    gSaveBlock1Ptr->trainerHill.bestTime = 0;
     for (i = 0; i < 4; i++)
         SetTimerValue(&gSaveBlock1Ptr->trainerHillTimes[i], HILL_MAX_TIME);
 }
@@ -438,7 +439,7 @@ static void TrainerHillStartChallenge(void)
     gSaveBlock1Ptr->trainerHill.timer = 0;
     gSaveBlock1Ptr->trainerHill.field_3D6E_0c = 0;
     gSaveBlock1Ptr->trainerHill.field_3D6E_0b = 0;
-    gSaveBlock1Ptr->trainerHill.field_3D6E_0e = 0;
+    gSaveBlock1Ptr->trainerHill.maybeECardScanDuringChallenge = 0;
     gSaveBlock2Ptr->frontier.field_EE0 = 0;
     gBattleOutcome = 0;
     gSaveBlock1Ptr->trainerHill.field_3D6E_0a = 0;
@@ -483,10 +484,10 @@ static void sub_81D59D0(void)
     {
         gSpecialVar_Result = 2;
     }
-    else if (GetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68) > gSaveBlock1Ptr->trainerHill.timer)
+    else if (GetTimerValue(&gSaveBlock1Ptr->trainerHill.bestTime) > gSaveBlock1Ptr->trainerHill.timer)
     {
-        SetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68, gSaveBlock1Ptr->trainerHill.timer);
-        gSaveBlock1Ptr->trainerHillTimes[gSaveBlock1Ptr->trainerHill.tag] = gSaveBlock1Ptr->trainerHill.field_3D68;
+        SetTimerValue(&gSaveBlock1Ptr->trainerHill.bestTime, gSaveBlock1Ptr->trainerHill.timer);
+        gSaveBlock1Ptr->trainerHillTimes[gSaveBlock1Ptr->trainerHill.tag] = gSaveBlock1Ptr->trainerHill.bestTime;
         gSpecialVar_Result = 0;
     }
     else
@@ -513,21 +514,24 @@ static void TrainerHillSetPlayerLost(void)
     gSaveBlock1Ptr->trainerHill.hasLost = 1;
 }
 
-static void sub_81D5AD0(void)
+static void TrainerHillGetChallengeStatus(void)
 {
     if (gSaveBlock1Ptr->trainerHill.hasLost)
     {
+        // The player lost their last match.
         gSaveBlock1Ptr->trainerHill.hasLost = 0;
-        gSpecialVar_Result = 0;
+        gSpecialVar_Result = TRAINER_HILL_PLAYER_STATUS_LOST;
     }
-    else if (gSaveBlock1Ptr->trainerHill.field_3D6E_0e)
+    else if (gSaveBlock1Ptr->trainerHill.maybeECardScanDuringChallenge)
     {
-        gSaveBlock1Ptr->trainerHill.field_3D6E_0e = 0;
-        gSpecialVar_Result = 1;
+        // Unreachable code. Something relating to eCards?
+        gSaveBlock1Ptr->trainerHill.maybeECardScanDuringChallenge = 0;
+        gSpecialVar_Result = TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED;
     }
     else
     {
-        gSpecialVar_Result = 2;
+        // Continue playing.
+        gSpecialVar_Result = TRAINER_HILL_PLAYER_STATUS_NORMAL;
     }
 }
 
@@ -575,7 +579,7 @@ static void sub_81D5C00(void)
 
 bool8 sub_81D5C18(void)
 {
-    if (VarGet(VAR_0x40D6) == 0)
+    if (VarGet(VAR_TRAINER_HILL_IS_ACTIVE) == 0)
         return FALSE;
     else if (gSaveBlock1Ptr->trainerHill.field_3D6E_0c)
         return FALSE;
@@ -1054,10 +1058,10 @@ static void sub_81D6568(void)
         gSpecialVar_Result = 1;
 }
 
-static void sub_81D65A0(void)
+static void TrainerHillSetTag(void)
 {
     gSaveBlock1Ptr->trainerHill.tag = gSpecialVar_0x8005;
-    gSaveBlock1Ptr->trainerHill.field_3D68 = gSaveBlock1Ptr->trainerHillTimes[gSpecialVar_0x8005];
+    gSaveBlock1Ptr->trainerHill.bestTime = gSaveBlock1Ptr->trainerHillTimes[gSpecialVar_0x8005];
 }
 
 static u8 sub_81D65E8(u8 arg0)
-- 
cgit v1.2.3


From bf45b83c65026a84425e3bc1f99e269653ed8c8b Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Wed, 27 Feb 2019 23:54:51 -0500
Subject: Finish documenting event vars

---
 src/battle_setup.c         |   2 +-
 src/event_data.c           |   8 +--
 src/field_control_avatar.c |  10 ++--
 src/field_effect.c         |   2 +-
 src/field_specials.c       |  34 +++++------
 src/fldeff_misc.c          |  10 ++--
 src/item.c                 |   4 +-
 src/overworld.c            |  12 ++--
 src/region_map.c           |   4 +-
 src/secret_base.c          | 144 ++++++++++++++++++++++-----------------------
 src/time_events.c          |   2 +-
 src/tv.c                   |  26 ++++----
 12 files changed, 129 insertions(+), 129 deletions(-)

(limited to 'src')

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 7626420e9..40423697e 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -641,7 +641,7 @@ u8 BattleSetup_GetTerrainId(void)
         return BATTLE_TERRAIN_BUILDING;
     case MAP_TYPE_UNDERWATER:
         return BATTLE_TERRAIN_UNDERWATER;
-    case MAP_TYPE_6:
+    case MAP_TYPE_OCEAN_ROUTE:
         if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
             return BATTLE_TERRAIN_WATER;
         return BATTLE_TERRAIN_PLAIN;
diff --git a/src/event_data.c b/src/event_data.c
index 5ca288e7b..50628f984 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -23,8 +23,8 @@ EWRAM_DATA u16 gSpecialVar_LastTalked = 0;
 EWRAM_DATA u16 gSpecialVar_Facing = 0;
 EWRAM_DATA u16 gSpecialVar_MonBoxId = 0;
 EWRAM_DATA u16 gSpecialVar_MonBoxPos = 0;
-EWRAM_DATA u16 gSpecialVar_0x8014 = 0;
-EWRAM_DATA static u8 gUnknown_020375FC[16] = {0};
+EWRAM_DATA u16 gSpecialVar_Unused_0x8014 = 0;
+EWRAM_DATA static u8 gSpecialFlags[16] = {0};
 
 extern u16 *const gSpecialVars[];
 
@@ -32,7 +32,7 @@ void InitEventData(void)
 {
     memset(gSaveBlock1Ptr->flags, 0, sizeof(gSaveBlock1Ptr->flags));
     memset(gSaveBlock1Ptr->vars, 0, sizeof(gSaveBlock1Ptr->vars));
-    memset(gUnknown_020375FC, 0, sizeof(gUnknown_020375FC));
+    memset(gSpecialFlags, 0, sizeof(gSpecialFlags));
 }
 
 void ClearTempFieldEventData(void)
@@ -199,7 +199,7 @@ u8 *GetFlagPointer(u16 id)
     else if (id < SPECIAL_FLAGS_START)
         return &gSaveBlock1Ptr->flags[id / 8];
     else
-        return &gUnknown_020375FC[(id - SPECIAL_FLAGS_START) / 8];
+        return &gSpecialFlags[(id - SPECIAL_FLAGS_START) / 8];
 }
 
 u8 FlagSet(u16 id)
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 7bb2b257d..8a7076591 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -567,27 +567,27 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
             ScriptContext1_SetupScript(IslandCave_EventScript_238EAF);
             return TRUE;
         }
-        if (is_tile_that_overrides_player_control() == TRUE)
+        if (ShouldDoWallyCall() == TRUE)
         {
             ScriptContext1_SetupScript(MauvilleCity_EventScript_1DF7BA);
             return TRUE;
         }
-        if (sub_8138120() == TRUE)
+        if (ShouldDoWinonaCall() == TRUE)
         {
             ScriptContext1_SetupScript(Route119_EventScript_1F49EC);
             return TRUE;
         }
-        if (sub_8138168() == TRUE)
+        if (ShouldDoScottCall() == TRUE)
         {
             ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6);
             return TRUE;
         }
-        if (sub_81381B0() == TRUE)
+        if (ShouldDoRoxanneCall() == TRUE)
         {
             ScriptContext1_SetupScript(RustboroCity_Gym_EventScript_21307B);
             return TRUE;
         }
-        if (sub_81381F8() == TRUE)
+        if (ShouldDoRivalRayquazaCall() == TRUE)
         {
             ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_224175);
             return TRUE;
diff --git a/src/field_effect.c b/src/field_effect.c
index e7c0b39b9..74f7801bd 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2443,7 +2443,7 @@ static void sub_80B8410(struct Task *task)
 bool8 FldEff_FieldMoveShowMon(void)
 {
     u8 taskId;
-    if (is_map_type_1_2_3_5_or_6(GetCurrentMapType()) == TRUE)
+    if (IsMapTypeOutside(GetCurrentMapType()) == TRUE)
     {
         taskId = CreateTask(sub_80B8554, 0xff);
     } else
diff --git a/src/field_specials.c b/src/field_specials.c
index a07e987eb..e603c3ebf 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -360,17 +360,17 @@ u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
     return 0;
 }
 
-bool32 is_tile_that_overrides_player_control(void)
+bool32 ShouldDoWallyCall(void)
 {
     if (FlagGet(FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL))
     {
         switch (gMapHeader.mapType)
         {
-            case 1:
-            case 2:
-            case 3:
-            case 6:
-                if (++(*GetVarPointer(VAR_0x40F2)) < 0xFA)
+            case MAP_TYPE_TOWN:
+            case MAP_TYPE_CITY:
+            case MAP_TYPE_ROUTE:
+            case MAP_TYPE_OCEAN_ROUTE:
+                if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 0xFA)
                 {
                     return FALSE;
                 }
@@ -387,7 +387,7 @@ bool32 is_tile_that_overrides_player_control(void)
     return TRUE;
 }
 
-bool32 sub_8138120(void)
+bool32 ShouldDoWinonaCall(void)
 {
     if (FlagGet(FLAG_REGISTER_WINONA_POKENAV))
     {
@@ -396,8 +396,8 @@ bool32 sub_8138120(void)
             case MAP_TYPE_TOWN:
             case MAP_TYPE_CITY:
             case MAP_TYPE_ROUTE:
-            case MAP_TYPE_6:
-                if (++(*GetVarPointer(VAR_0x40F3)) < 10)
+            case MAP_TYPE_OCEAN_ROUTE:
+                if (++(*GetVarPointer(VAR_WINONA_CALL_STEP_COUNTER)) < 10)
                 {
                     return FALSE;
                 }
@@ -414,7 +414,7 @@ bool32 sub_8138120(void)
     return TRUE;
 }
 
-bool32 sub_8138168(void)
+bool32 ShouldDoScottCall(void)
 {
     if (FlagGet(FLAG_SCOTT_CALL_NATIONAL_DEX))
     {
@@ -424,7 +424,7 @@ bool32 sub_8138168(void)
             case 2:
             case 3:
             case 6:
-                if (++(*GetVarPointer(VAR_0x40F5)) < 0xA)
+                if (++(*GetVarPointer(VAR_SCOTT_CALL_STEP_COUNTER)) < 10)
                 {
                     return FALSE;
                 }
@@ -441,7 +441,7 @@ bool32 sub_8138168(void)
     return TRUE;
 }
 
-bool32 sub_81381B0(void)
+bool32 ShouldDoRoxanneCall(void)
 {
     if (FlagGet(FLAG_ENABLE_ROXANNE_FIRST_CALL))
     {
@@ -451,7 +451,7 @@ bool32 sub_81381B0(void)
             case 2:
             case 3:
             case 6:
-                if (++(*GetVarPointer(VAR_0x40F4)) < 0xFA)
+                if (++(*GetVarPointer(VAR_ROXANNE_CALL_STEP_COUNTER)) < 0xFA)
                 {
                     return FALSE;
                 }
@@ -468,7 +468,7 @@ bool32 sub_81381B0(void)
     return TRUE;
 }
 
-bool32 sub_81381F8(void)
+bool32 ShouldDoRivalRayquazaCall(void)
 {
     if (FlagGet(FLAG_DEFEATED_MAGMA_SPACE_CENTER))
     {
@@ -478,7 +478,7 @@ bool32 sub_81381F8(void)
             case 2:
             case 3:
             case 6:
-                if (++(*GetVarPointer(VAR_0x40F6)) < 0xFA)
+                if (++(*GetVarPointer(VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER)) < 0xFA)
                 {
                     return FALSE;
                 }
@@ -1516,7 +1516,7 @@ bool8 FoundBlackGlasses(void)
 
 void SetRoute119Weather(void)
 {
-    if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType()) != TRUE)
+    if (IsMapTypeOutside(GetLastUsedWarpMapType()) != TRUE)
     {
         SetSav1Weather(20);
     }
@@ -1524,7 +1524,7 @@ void SetRoute119Weather(void)
 
 void SetRoute123Weather(void)
 {
-    if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType()) != TRUE)
+    if (IsMapTypeOutside(GetLastUsedWarpMapType()) != TRUE)
     {
         SetSav1Weather(21);
     }
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index df4576a7f..d4d6075f3 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -1126,7 +1126,7 @@ void GetShieldToyTVDecorationInfo(void)
         if (!VarGet(VAR_CURRENT_SECRET_BASE))
             return;
 
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x10);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x10);
         break;
     case 734:
         ConvertIntToDecimalStringN(gStringVar1, 50, STR_CONV_MODE_LEFT_ALIGN, 2);
@@ -1137,7 +1137,7 @@ void GetShieldToyTVDecorationInfo(void)
         if (!VarGet(VAR_CURRENT_SECRET_BASE))
             return;
 
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x20);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x20);
         break;
     case 756:
         gSpecialVar_Result = 1;
@@ -1145,7 +1145,7 @@ void GetShieldToyTVDecorationInfo(void)
         if (!VarGet(VAR_CURRENT_SECRET_BASE))
             return;
 
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x80);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x80);
         break;
     case 757:
         gSpecialVar_Result = 2;
@@ -1153,7 +1153,7 @@ void GetShieldToyTVDecorationInfo(void)
         if (!VarGet(VAR_CURRENT_SECRET_BASE))
             return;
 
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x80);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x80);
         break;
     case 758:
         gSpecialVar_Result = 3;
@@ -1161,7 +1161,7 @@ void GetShieldToyTVDecorationInfo(void)
         if (!VarGet(VAR_CURRENT_SECRET_BASE))
             return;
 
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x80);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x80);
         break;
     }
 }
diff --git a/src/item.c b/src/item.c
index 71c2dc0f7..0e13ddf4c 100644
--- a/src/item.c
+++ b/src/item.c
@@ -539,8 +539,8 @@ bool8 RemoveBagItem(u16 itemId, u16 count)
 
         if (CurrentMapIsSecretBase() == TRUE)
         {
-            VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x200);
-            VarSet(VAR_0x40ED, itemId);
+            VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x200);
+            VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, itemId);
         }
 
         var = GetItemListPosition(pocket);
diff --git a/src/overworld.c b/src/overworld.c
index 6055c74bb..84eb80a06 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -678,7 +678,7 @@ void UpdateEscapeWarp(s16 x, s16 y)
 {
     u8 currMapType = GetCurrentMapType();
     u8 destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum);
-    if (is_map_type_1_2_3_5_or_6(currMapType) && is_map_type_1_2_3_5_or_6(destMapType) != TRUE)
+    if (IsMapTypeOutside(currMapType) && IsMapTypeOutside(destMapType) != TRUE)
         SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x - 7, y - 6);
 }
 
@@ -837,7 +837,7 @@ static void mli0_load_map(u32 a1)
             LoadEventObjTemplatesFromHeader();
     }
 
-    v2 = is_map_type_1_2_3_5_or_6(gMapHeader.mapType);
+    v2 = IsMapTypeOutside(gMapHeader.mapType);
     indoors = Overworld_MapTypeIsIndoors(gMapHeader.mapType);
 
     sub_80EB218();
@@ -925,7 +925,7 @@ static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *pla
 
 static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStruct, u8 transitionFlags, u16 metatileBehavior, u8 mapType)
 {
-    if (FlagGet(FLAG_SYS_CRUISE_MODE) && mapType == MAP_TYPE_6)
+    if (FlagGet(FLAG_SYS_CRUISE_MODE) && mapType == MAP_TYPE_OCEAN_ROUTE)
         return DIR_EAST;
     else if (MetatileBehavior_IsDeepSouthWarp(metatileBehavior) == TRUE)
         return DIR_NORTH;
@@ -1330,13 +1330,13 @@ u8 GetLastUsedWarpMapType(void)
     return GetMapTypeByWarpData(&gLastUsedWarp);
 }
 
-bool8 is_map_type_1_2_3_5_or_6(u8 mapType)
+bool8 IsMapTypeOutside(u8 mapType)
 {
     if (mapType == MAP_TYPE_ROUTE
      || mapType == MAP_TYPE_TOWN
      || mapType == MAP_TYPE_UNDERWATER
      || mapType == MAP_TYPE_CITY
-     || mapType == MAP_TYPE_6)
+     || mapType == MAP_TYPE_OCEAN_ROUTE)
         return TRUE;
     else
         return FALSE;
@@ -1346,7 +1346,7 @@ bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType)
 {
     if (mapType == MAP_TYPE_ROUTE
      || mapType == MAP_TYPE_TOWN
-     || mapType == MAP_TYPE_6
+     || mapType == MAP_TYPE_OCEAN_ROUTE
      || mapType == MAP_TYPE_CITY)
         return TRUE;
     else
diff --git a/src/region_map.c b/src/region_map.c
index 5c85606a8..814849bfd 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -883,7 +883,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
         case MAP_TYPE_CITY:
         case MAP_TYPE_ROUTE:
         case MAP_TYPE_UNDERWATER:
-        case MAP_TYPE_6:
+        case MAP_TYPE_OCEAN_ROUTE:
             gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
             gRegionMap->playerIsInCave = FALSE;
             mapWidth = gMapHeader.mapLayout->width;
@@ -896,7 +896,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
             }
             break;
         case MAP_TYPE_UNDERGROUND:
-        case MAP_TYPE_7:
+        case MAP_TYPE_UNUSED_2:
             if (gMapHeader.flags & 0x02)
             {
                 mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum);
diff --git a/src/secret_base.c b/src/secret_base.c
index 7ff83dec8..02d627722 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -60,7 +60,7 @@ struct SecretBaseRecordMixer {
 
 // Static RAM declarations
 EWRAM_DATA u8 sCurSecretBaseId = 0;
-EWRAM_DATA u8 gUnknown_0203A01D = 0;
+EWRAM_DATA bool8 gIsInSecretBase = FALSE;
 EWRAM_DATA struct SecretBaseListMenuBuffer *gUnknown_0203A020 = NULL;
 
 // Static ROM declarations
@@ -1186,11 +1186,11 @@ void SecretBasePerStepCallback(u8 taskId)
         case 0:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                gUnknown_0203A01D = TRUE;
+                gIsInSecretBase = TRUE;
             }
             else
             {
-                gUnknown_0203A01D = FALSE;
+                gIsInSecretBase = FALSE;
             }
             PlayerGetDestCoords(&data[2], &data[3]);
             data[1] = 1;
@@ -1201,103 +1201,103 @@ void SecretBasePerStepCallback(u8 taskId)
             {
                 data[2] = x;
                 data[3] = y;
-                VarSet(VAR_0x40EC, VarGet(VAR_0x40EC) + 1);
+                VarSet(VAR_SECRET_BASE_STEP_COUNTER, VarGet(VAR_SECRET_BASE_STEP_COUNTER) + 1);
                 behavior = MapGridGetMetatileBehaviorAt(x, y);
                 tileId = MapGridGetMetatileIdAt(x, y);
                 if (tileId == 0x234 || tileId == 0x23C)
                 {
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
-                        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x20);
+                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x20);
                     }
                 }
                 else if (tileId == 0x2b8 || tileId == 0x2b9 || tileId == 0x2ba || tileId == 0x2c0 || tileId == 0x2c1 || tileId == 0x2c2 || tileId == 0x2c8 || tileId == 0x2c9 || tileId == 0x2ca)
                 {
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
-                        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x01);
+                        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x01);
                     }
                 }
                 else if (tileId == 0x239 || tileId == 0x241 || tileId == 0x251 || tileId == 0x259)
                 {
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
-                        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x04);
+                        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x04);
                     }
                 }
                 else if ((behavior == 0x34 && tileId == 0x26d) || (behavior == 0x35 && MapGridGetMetatileIdAt(x, y) == 0x26a))
                 {
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
-                        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x200);
+                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x200);
                     }
                 }
                 else if (behavior == 0xc1 && tileId == 0x23d)
                 {
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
-                        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) ^ 0x1000);
-                        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x2000);
+                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x1000);
+                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x2000);
                     }
                 }
                 else if (behavior == 0x47 && tileId == 0x23e)
                 {
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
-                        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x1000);
-                        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) ^ 0x2000);
+                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x1000);
+                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x2000);
                     }
                 }
                 else if (MetatileBehavior_IsSecretBaseGlitterMat(behavior) == TRUE)
                 {
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
-                        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x80);
+                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x80);
                     }
                 }
                 else if (MetatileBehavior_IsSecretBaseBalloon(behavior) == TRUE)
                 {
                     PopSecretBaseBalloon(MapGridGetMetatileIdAt(x, y), x, y);
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
                         switch ((int)MapGridGetMetatileIdAt(x, y))
                         {
                             case 0x338:
                             case 0x33c:
                             case 0x340:
-                                VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x02);
+                                VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x02);
                                 break;
                             case 0x228:
-                                VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x100);
+                                VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x100);
                                 break;
                         }
                     }
                 }
                 else if (MetatileBehavior_IsSecretBaseBreakableDoor(behavior) == TRUE)
                 {
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
-                        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x400);
+                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x400);
                     }
                     ShatterSecretBaseBreakableDoor(x, y);
                 }
                 else if (MetatileBehavior_IsSecretBaseSoundMat(behavior) == TRUE){
-                    if (gUnknown_0203A01D == TRUE) {
-                        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x8000);
+                    if (gIsInSecretBase == TRUE) {
+                        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x8000);
                     }
                 }
                 else if (MetatileBehavior_IsSecretBaseJumpMat(behavior) == TRUE)
                 {
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
-                        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x4000);
+                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x4000);
                     }
                 }
                 else if (MetatileBehavior_IsSecretBaseSpinMat(behavior) == TRUE)
                 {
-                    if (gUnknown_0203A01D == TRUE)
+                    if (gIsInSecretBase == TRUE)
                     {
-                        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x02);
+                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x02);
                     }
                 }
             }
@@ -1780,33 +1780,33 @@ void sub_80EB18C(struct SecretBaseRecord *bases)
 
 void sub_80EB1AC(void)
 {
-    VarSet(VAR_0x40EC, 0);
-    VarSet(VAR_0x40ED, 0);
-    VarSet(VAR_0x40EE, 0);
-    VarSet(VAR_0x40EF, 0);
+    VarSet(VAR_SECRET_BASE_STEP_COUNTER, 0);
+    VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, 0);
+    VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, 0);
+    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, 0);
     if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
     {
-        VarSet(VAR_0x40F0, TRUE);
+        VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, TRUE);
     }
     else
     {
-        VarSet(VAR_0x40F0, FALSE);
+        VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE);
     }
-    gUnknown_0203A01D = FALSE;
+    gIsInSecretBase = FALSE;
 }
 
 void sub_80EB218(void)
 {
-    if (VarGet(VAR_0x40F0) && gUnknown_0203A01D == TRUE && !CurrentMapIsSecretBase())
+    if (VarGet(VAR_SECRET_BASE_IS_NOT_LOCAL) && gIsInSecretBase == TRUE && !CurrentMapIsSecretBase())
     {
-        VarSet(VAR_0x40F0, FALSE);
-        gUnknown_0203A01D = FALSE;
+        VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE);
+        gIsInSecretBase = FALSE;
         sub_80EEA70();
-        VarSet(VAR_0x40EC, 0);
-        VarSet(VAR_0x40ED, 0);
-        VarSet(VAR_0x40EE, 0);
-        VarSet(VAR_0x40EF, 0);
-        VarSet(VAR_0x40F0, FALSE);
+        VarSet(VAR_SECRET_BASE_STEP_COUNTER, 0);
+        VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, 0);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, 0);
+        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, 0);
+        VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE);
     }
 }
 
@@ -1814,7 +1814,7 @@ void sub_80EB290(void)
 {
     if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
     {
-        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x800);
+        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x800);
     }
 }
 
@@ -1822,7 +1822,7 @@ void sub_80EB2C8(void)
 {
     if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
     {
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x400);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x400);
     }
 }
 
@@ -1830,9 +1830,9 @@ void sub_80EB300(void)
 {
     if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
     {
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800);
-        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001);
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x2000);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) & ~0x3800);
+        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) & ~0x001);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x2000);
     }
 }
 
@@ -1840,9 +1840,9 @@ void sub_80EB368(void)
 {
     if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
     {
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800);
-        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001);
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x800);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) & ~0x3800);
+        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) & ~0x001);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x800);
     }
 }
 
@@ -1850,9 +1850,9 @@ void sub_80EB3D0(void)
 {
     if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
     {
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800);
-        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001);
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x1000);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) & ~0x3800);
+        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) & ~0x001);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x1000);
     }
 }
 
@@ -1860,9 +1860,9 @@ void sub_80EB438(void)
 {
     if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
     {
-        VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800);
-        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001);
-        VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x001);
+        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) & ~0x3800);
+        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) & ~0x001);
+        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x001);
     }
 }
 
@@ -1891,7 +1891,7 @@ void sub_80EB498(void)
         case 0x334:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x4000);
+                VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x4000);
             }
             break;
     }
@@ -1909,7 +1909,7 @@ void sub_80EB56C(void)
         case 0x28b:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x40);
+                VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x40);
             }
             break;
         case 0x2d8:
@@ -1932,21 +1932,21 @@ void sub_80EB56C(void)
         case 0x2fb:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x8);
+                VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x8);
             }
             break;
         case 0x22c:
         case 0x233:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x40);
+                VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x40);
             }
             break;
         case 0x288:
         case 0x289:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x100);
+                VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x100);
             }
             break;
         case 0x22d:
@@ -1954,7 +1954,7 @@ void sub_80EB56C(void)
         case 0x22f:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x10);
+                VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x10);
             }
             break;
         case 0x287:
@@ -1982,7 +1982,7 @@ void sub_80EB56C(void)
         case 0x2cf:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x8);
+                VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x8);
             }
             break;
     }
@@ -2009,7 +2009,7 @@ void sub_80EB9E0(void)
         case 0x2c6:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x8);
+                VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x8);
             }
             break;
     }
@@ -2047,14 +2047,14 @@ void sub_80EBB28(void)
         case 0x2c7:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x8);
+                VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x8);
             }
             break;
         case 0x280:
         case 0x281:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x100);
+                VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x100);
             }
             break;
         case 0x225:
@@ -2062,7 +2062,7 @@ void sub_80EBB28(void)
         case 0x227:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x10);
+                VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x10);
             }
             break;
     }
@@ -2080,7 +2080,7 @@ void sub_80EBE7C(void)
         case 0x28e:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x4);
+                VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x4);
             }
             break;
     }
diff --git a/src/time_events.c b/src/time_events.c
index 9702d321f..9263bffac 100644
--- a/src/time_events.c
+++ b/src/time_events.c
@@ -81,7 +81,7 @@ void UpdateShoalTideFlag(void)
         1, // 23
     };
 
-    if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType()))
+    if (IsMapTypeOutside(GetLastUsedWarpMapType()))
     {
         RtcCalcLocalTime();
         if (tide[gLocalTime.hours])
diff --git a/src/tv.c b/src/tv.c
index 248721083..d53cec8b2 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -2565,13 +2565,13 @@ void sub_80EEA70(void)
             show->secretBaseSecrets.kind = TVSHOW_SECRET_BASE_SECRETS;
             show->secretBaseSecrets.active = FALSE;
             StringCopy(show->secretBaseSecrets.playerName, gSaveBlock2Ptr->playerName);
-            show->secretBaseSecrets.stepsInBase = VarGet(VAR_0x40EC);
+            show->secretBaseSecrets.stepsInBase = VarGet(VAR_SECRET_BASE_STEP_COUNTER);
             sub_80E980C();
             StringCopy(strbuf, gStringVar1);
             StripExtCtrlCodes(strbuf);
             StringCopy(show->secretBaseSecrets.baseOwnersName, strbuf);
-            show->secretBaseSecrets.item = VarGet(VAR_0x40ED);
-            show->secretBaseSecrets.flags = VarGet(VAR_0x40EE) + (VarGet(VAR_0x40EF) << 16);
+            show->secretBaseSecrets.item = VarGet(VAR_SECRET_BASE_LAST_ITEM_USED);
+            show->secretBaseSecrets.flags = VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) + (VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) << 16);
             tv_store_id_3x(show);
             show->secretBaseSecrets.language = gGameLanguage;
             if (show->secretBaseSecrets.language == LANGUAGE_JAPANESE || gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].language == LANGUAGE_JAPANESE)
@@ -7350,7 +7350,7 @@ static void DoTVShowWhatsNo1InHoennToday(void)
     ShowFieldMessage(sTVWhatsNo1InHoennTodayTextGroup[state]);
 }
 
-u8 sub_80F5180(TVShow *show)
+u8 TVShowGetFlagCount(TVShow *show)
 {
     u8 i;
     u8 tot;
@@ -7365,7 +7365,7 @@ u8 sub_80F5180(TVShow *show)
     return tot;
 }
 
-u8 sub_80F51AC(TVShow *show, u8 a1)
+u8 TVShowGetStateForFlagNumber(TVShow *show, u8 a1)
 {
     u8 i;
     u8 tot;
@@ -7399,7 +7399,7 @@ static void DoTVShowSecretBaseSecrets(void)
         case 0:
             TVShowConvertInternationalString(gStringVar1, show->secretBaseSecrets.baseOwnersName, show->secretBaseSecrets.baseOwnersNameLanguage);
             TVShowConvertInternationalString(gStringVar2, show->secretBaseSecrets.playerName, show->secretBaseSecrets.language);
-            bitCount = sub_80F5180(show);
+            bitCount = TVShowGetFlagCount(show);
             if (bitCount == 0)
             {
                 sTVShowState = 8;
@@ -7408,12 +7408,12 @@ static void DoTVShowSecretBaseSecrets(void)
             {
                 show->secretBaseSecrets.savedState = 1;
                 sTVSecretBaseSecretsRandomValues[0] = Random() % bitCount;
-                sTVShowState = sub_80F51AC(show, sTVSecretBaseSecretsRandomValues[0]);
+                sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[0]);
             }
             break;
         case 1:
             TVShowConvertInternationalString(gStringVar2, show->secretBaseSecrets.playerName, show->secretBaseSecrets.language);
-            bitCount = sub_80F5180(show);
+            bitCount = TVShowGetFlagCount(show);
             switch (bitCount)
             {
                 case 1:
@@ -7423,11 +7423,11 @@ static void DoTVShowSecretBaseSecrets(void)
                     show->secretBaseSecrets.savedState = 2;
                     if (sTVSecretBaseSecretsRandomValues[0] == 0)
                     {
-                        sTVShowState = sub_80F51AC(show, 1);
+                        sTVShowState = TVShowGetStateForFlagNumber(show, 1);
                     }
                     else
                     {
-                        sTVShowState = sub_80F51AC(show, 0);
+                        sTVShowState = TVShowGetStateForFlagNumber(show, 0);
                     }
                     break;
                 default:
@@ -7440,13 +7440,13 @@ static void DoTVShowSecretBaseSecrets(void)
                         }
                     }
                     show->secretBaseSecrets.savedState = 2;
-                    sTVShowState = sub_80F51AC(show, sTVSecretBaseSecretsRandomValues[1]);
+                    sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[1]);
                     break;
             }
             break;
         case 2:
             TVShowConvertInternationalString(gStringVar2, show->secretBaseSecrets.playerName, show->secretBaseSecrets.language);
-            bitCount = sub_80F5180(show);
+            bitCount = TVShowGetFlagCount(show);
             if (bitCount == 2)
             {
                 sTVShowState = 9;
@@ -7462,7 +7462,7 @@ static void DoTVShowSecretBaseSecrets(void)
                     }
                 }
                 show->secretBaseSecrets.savedState = 3;
-                sTVShowState = sub_80F51AC(show, sTVSecretBaseSecretsRandomValues[2]);
+                sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[2]);
             }
             break;
         case 3:
-- 
cgit v1.2.3


From 99bfd8c80fcfcafa55166ff65f5264c727b16ed0 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Thu, 28 Feb 2019 00:10:44 -0500
Subject: VAR_0x3F20 is not a var

---
 src/decoration.c  | 2 +-
 src/secret_base.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/decoration.c b/src/decoration.c
index 2ac49b98c..1635528d9 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1254,7 +1254,7 @@ void sub_8127E18(void)
                     break;
                 }
             }
-            VarSet(VAR_0x3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
+            VarSet(UNKNOWN_VAR_OFFSET_3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
             gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId;
             gSpecialVar_0x8006 = sCurDecorMapX;
             gSpecialVar_0x8007 = sCurDecorMapY;
diff --git a/src/secret_base.c b/src/secret_base.c
index 02d627722..cf35deb07 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -552,7 +552,7 @@ void sub_80E933C(void)
                 metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
                 if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE)
                 {
-                    gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].graphicsId + VAR_0x3F20;
+                    gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].graphicsId + UNKNOWN_VAR_OFFSET_3F20;
                     VarSet(gSpecialVar_Result, gDecorations[roomDecor[decorIdx]].tiles[0]);
                     gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].localId;
                     FlagClear(gSpecialVar_0x8004 + 0xAE);
-- 
cgit v1.2.3


From a7e5852f1d95dd2b438e94fbf31b865196c6e951 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Fri, 1 Mar 2019 01:49:11 -0500
Subject: More minor fixes

---
 src/field_effect.c   |  2 +-
 src/field_specials.c | 56 +++++++++++++++++++++++++++++++++++++++++-----------
 src/load_save.c      |  2 +-
 src/main.c           | 14 ++++++-------
 src/overworld.c      | 16 +++++++--------
 src/save.c           |  6 +++---
 src/secret_base.c    | 38 +++++++++++++++++------------------
 src/time_events.c    |  2 +-
 src/trainer_hill.c   | 10 +++++-----
 9 files changed, 90 insertions(+), 56 deletions(-)

(limited to 'src')

diff --git a/src/field_effect.c b/src/field_effect.c
index 74f7801bd..a4614b0a0 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2443,7 +2443,7 @@ static void sub_80B8410(struct Task *task)
 bool8 FldEff_FieldMoveShowMon(void)
 {
     u8 taskId;
-    if (IsMapTypeOutside(GetCurrentMapType()) == TRUE)
+    if (IsMapTypeOutdoors(GetCurrentMapType()) == TRUE)
     {
         taskId = CreateTask(sub_80B8554, 0xff);
     } else
diff --git a/src/field_specials.c b/src/field_specials.c
index e603c3ebf..20125d855 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -370,7 +370,7 @@ bool32 ShouldDoWallyCall(void)
             case MAP_TYPE_CITY:
             case MAP_TYPE_ROUTE:
             case MAP_TYPE_OCEAN_ROUTE:
-                if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 0xFA)
+                if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 250)
                 {
                     return FALSE;
                 }
@@ -451,7 +451,7 @@ bool32 ShouldDoRoxanneCall(void)
             case 2:
             case 3:
             case 6:
-                if (++(*GetVarPointer(VAR_ROXANNE_CALL_STEP_COUNTER)) < 0xFA)
+                if (++(*GetVarPointer(VAR_ROXANNE_CALL_STEP_COUNTER)) < 250)
                 {
                     return FALSE;
                 }
@@ -478,7 +478,7 @@ bool32 ShouldDoRivalRayquazaCall(void)
             case 2:
             case 3:
             case 6:
-                if (++(*GetVarPointer(VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER)) < 0xFA)
+                if (++(*GetVarPointer(VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER)) < 250)
                 {
                     return FALSE;
                 }
@@ -1516,7 +1516,7 @@ bool8 FoundBlackGlasses(void)
 
 void SetRoute119Weather(void)
 {
-    if (IsMapTypeOutside(GetLastUsedWarpMapType()) != TRUE)
+    if (IsMapTypeOutdoors(GetLastUsedWarpMapType()) != TRUE)
     {
         SetSav1Weather(20);
     }
@@ -1524,7 +1524,7 @@ void SetRoute119Weather(void)
 
 void SetRoute123Weather(void)
 {
-    if (IsMapTypeOutside(GetLastUsedWarpMapType()) != TRUE)
+    if (IsMapTypeOutdoors(GetLastUsedWarpMapType()) != TRUE)
     {
         SetSav1Weather(21);
     }
@@ -3428,21 +3428,21 @@ void CreateUnusualWeatherEvent(void)
 
     if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE)
     {
-        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
+        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
     }
     else if (FlagGet(FLAG_DEFEATED_GROUDON) == TRUE)
     {
-        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
+        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
     }
     else if ((randomValue & 1) == 0)
     {
         randomValue = Random();
-        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
+        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
     }
     else
     {
         randomValue = Random();
-        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
+        VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
     }
 }
 
@@ -3450,7 +3450,24 @@ void CreateUnusualWeatherEvent(void)
 // returns TRUE if the weather is for Kyogre, and FALSE if it's for Groudon.
 bool32 GetUnusualWeatherMapNameAndType(void)
 {
-    static const u8 sUnusualWeatherMapNumbers[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
+    static const u8 sUnusualWeatherMapNumbers[] = {
+        MAP_NUM(ROUTE114),
+        MAP_NUM(ROUTE114),
+        MAP_NUM(ROUTE115),
+        MAP_NUM(ROUTE115),
+        MAP_NUM(ROUTE116),
+        MAP_NUM(ROUTE116),
+        MAP_NUM(ROUTE118),
+        MAP_NUM(ROUTE118),
+        MAP_NUM(ROUTE105),
+        MAP_NUM(ROUTE105),
+        MAP_NUM(ROUTE125),
+        MAP_NUM(ROUTE125),
+        MAP_NUM(ROUTE127),
+        MAP_NUM(ROUTE127),
+        MAP_NUM(ROUTE129),
+        MAP_NUM(ROUTE129)
+    };
 
     u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
 
@@ -3469,7 +3486,24 @@ bool32 GetUnusualWeatherMapNameAndType(void)
 bool8 UnusualWeatherHasExpired(void)
 {
     // Duplicate array.
-    static const u8 sUnusualWeatherMapNumbers_2[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
+    static const u8 sUnusualWeatherMapNumbers_2[] = {
+        MAP_NUM(ROUTE114),
+        MAP_NUM(ROUTE114),
+        MAP_NUM(ROUTE115),
+        MAP_NUM(ROUTE115),
+        MAP_NUM(ROUTE116),
+        MAP_NUM(ROUTE116),
+        MAP_NUM(ROUTE118),
+        MAP_NUM(ROUTE118),
+        MAP_NUM(ROUTE105),
+        MAP_NUM(ROUTE105),
+        MAP_NUM(ROUTE125),
+        MAP_NUM(ROUTE125),
+        MAP_NUM(ROUTE127),
+        MAP_NUM(ROUTE127),
+        MAP_NUM(ROUTE129),
+        MAP_NUM(ROUTE129)
+    };
 
     u16 steps = VarGet(VAR_UNUSUAL_WEATHER_STEP_COUNTER);
     u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
diff --git a/src/load_save.c b/src/load_save.c
index d71e72802..7d307ec1b 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -99,7 +99,7 @@ void MoveSaveBlocks_ResetHeap(void)
     hblankCB = gMain.hblankCallback;
     gMain.vblankCallback = NULL;
     gMain.hblankCallback = NULL;
-    gVBlankCounterPointer = NULL;
+    gTrainerHillVBlankCounter = NULL;
 
     saveBlock2Copy = (struct SaveBlock2 *)(gHeap);
     saveBlock1Copy = (struct SaveBlock1 *)(gHeap + sizeof(struct SaveBlock2));
diff --git a/src/main.c b/src/main.c
index 3e282775d..3049f4f90 100644
--- a/src/main.c
+++ b/src/main.c
@@ -163,7 +163,7 @@ static void UpdateLinkAndCallCallbacks(void)
 static void InitMainCallbacks(void)
 {
     gMain.vblankCounter1 = 0;
-    gVBlankCounterPointer = NULL;
+    gTrainerHillVBlankCounter = NULL;
     gMain.vblankCounter2 = 0;
     gMain.callback1 = NULL;
     SetMainCallback2(CB2_InitCopyrightScreenAfterBootup);
@@ -324,8 +324,8 @@ static void VBlankIntr(void)
 
     gMain.vblankCounter1++;
 
-    if (gVBlankCounterPointer && *gVBlankCounterPointer < 0xFFFFFFFF)
-        (*gVBlankCounterPointer)++;
+    if (gTrainerHillVBlankCounter && *gTrainerHillVBlankCounter < 0xFFFFFFFF)
+        (*gTrainerHillVBlankCounter)++;
 
     if (gMain.vblankCallback)
         gMain.vblankCallback();
@@ -393,14 +393,14 @@ static void WaitForVBlank(void)
         ;
 }
 
-void SetVBlankCounterPointer(u32 *var)
+void SetTrainerHillVBlankCounter(u32 *counter)
 {
-    gVBlankCounterPointer = var;
+    gTrainerHillVBlankCounter = counter;
 }
 
-void ClearVBlankCounterPointer(void)
+void ClearTrainerHillVBlankCounter(void)
 {
-    gVBlankCounterPointer = NULL;
+    gTrainerHillVBlankCounter = NULL;
 }
 
 void DoSoftReset(void)
diff --git a/src/overworld.c b/src/overworld.c
index 84eb80a06..837855877 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -678,7 +678,7 @@ void UpdateEscapeWarp(s16 x, s16 y)
 {
     u8 currMapType = GetCurrentMapType();
     u8 destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum);
-    if (IsMapTypeOutside(currMapType) && IsMapTypeOutside(destMapType) != TRUE)
+    if (IsMapTypeOutdoors(currMapType) && IsMapTypeOutdoors(destMapType) != TRUE)
         SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x - 7, y - 6);
 }
 
@@ -823,8 +823,8 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
 
 static void mli0_load_map(u32 a1)
 {
-    bool8 v2;
-    bool8 indoors;
+    bool8 isOutdoors;
+    bool8 isIndoors;
 
     LoadCurrentMapData();
     if (!(sUnknown_020322D8 & 1))
@@ -837,8 +837,8 @@ static void mli0_load_map(u32 a1)
             LoadEventObjTemplatesFromHeader();
     }
 
-    v2 = IsMapTypeOutside(gMapHeader.mapType);
-    indoors = Overworld_MapTypeIsIndoors(gMapHeader.mapType);
+    isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType);
+    isIndoors = Overworld_MapTypeIsIndoors(gMapHeader.mapType);
 
     sub_80EB218();
     TrySetMapSaveWarpStatus();
@@ -850,7 +850,7 @@ static void mli0_load_map(u32 a1)
         DoTimeBasedEvents();
     SetSav1WeatherFromCurrMapHeader();
     ChooseAmbientCrySpecies();
-    if (v2)
+    if (isOutdoors)
         FlagClear(FLAG_SYS_USE_FLASH);
     SetDefaultFlashLevel();
     Overworld_ClearSavedMusic();
@@ -864,7 +864,7 @@ static void mli0_load_map(u32 a1)
     else
         InitMap();
 
-    if (a1 != 1 && indoors)
+    if (a1 != 1 && isIndoors)
     {
         UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height);
         sub_80E9238(1);
@@ -1330,7 +1330,7 @@ u8 GetLastUsedWarpMapType(void)
     return GetMapTypeByWarpData(&gLastUsedWarp);
 }
 
-bool8 IsMapTypeOutside(u8 mapType)
+bool8 IsMapTypeOutdoors(u8 mapType)
 {
     if (mapType == MAP_TYPE_ROUTE
      || mapType == MAP_TYPE_TOWN
diff --git a/src/save.c b/src/save.c
index 593ee8f2c..920a5152a 100644
--- a/src/save.c
+++ b/src/save.c
@@ -659,10 +659,10 @@ static void UpdateSaveAddresses(void)
 u8 HandleSavingData(u8 saveType)
 {
     u8 i;
-    u32 *backupVar = gVBlankCounterPointer;
+    u32 *backupVar = gTrainerHillVBlankCounter;
     u8 *tempAddr;
 
-    gVBlankCounterPointer = NULL;
+    gTrainerHillVBlankCounter = NULL;
     UpdateSaveAddresses();
     switch (saveType)
     {
@@ -705,7 +705,7 @@ u8 HandleSavingData(u8 saveType)
         save_write_to_flash(0xFFFF, gRamSaveSectionLocations);
         break;
     }
-    gVBlankCounterPointer = backupVar;
+    gTrainerHillVBlankCounter = backupVar;
     return 0;
 }
 
diff --git a/src/secret_base.c b/src/secret_base.c
index cf35deb07..af8804ec3 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -60,7 +60,7 @@ struct SecretBaseRecordMixer {
 
 // Static RAM declarations
 EWRAM_DATA u8 sCurSecretBaseId = 0;
-EWRAM_DATA bool8 gIsInSecretBase = FALSE;
+EWRAM_DATA bool8 gInFriendSecretBase = FALSE;
 EWRAM_DATA struct SecretBaseListMenuBuffer *gUnknown_0203A020 = NULL;
 
 // Static ROM declarations
@@ -407,7 +407,7 @@ void sub_80E9068(void)
 
 bool8 sub_80E909C(void)
 {
-    if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_SECRET_BASE_SHOULD_BE_INIT) == 0)
+    if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_INIT_SECRET_BASE) == 0)
     {
         return FALSE;
     }
@@ -1186,11 +1186,11 @@ void SecretBasePerStepCallback(u8 taskId)
         case 0:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
             {
-                gIsInSecretBase = TRUE;
+                gInFriendSecretBase = TRUE;
             }
             else
             {
-                gIsInSecretBase = FALSE;
+                gInFriendSecretBase = FALSE;
             }
             PlayerGetDestCoords(&data[2], &data[3]);
             data[1] = 1;
@@ -1206,35 +1206,35 @@ void SecretBasePerStepCallback(u8 taskId)
                 tileId = MapGridGetMetatileIdAt(x, y);
                 if (tileId == 0x234 || tileId == 0x23C)
                 {
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x20);
                     }
                 }
                 else if (tileId == 0x2b8 || tileId == 0x2b9 || tileId == 0x2ba || tileId == 0x2c0 || tileId == 0x2c1 || tileId == 0x2c2 || tileId == 0x2c8 || tileId == 0x2c9 || tileId == 0x2ca)
                 {
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x01);
                     }
                 }
                 else if (tileId == 0x239 || tileId == 0x241 || tileId == 0x251 || tileId == 0x259)
                 {
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x04);
                     }
                 }
                 else if ((behavior == 0x34 && tileId == 0x26d) || (behavior == 0x35 && MapGridGetMetatileIdAt(x, y) == 0x26a))
                 {
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x200);
                     }
                 }
                 else if (behavior == 0xc1 && tileId == 0x23d)
                 {
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x1000);
                         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x2000);
@@ -1242,7 +1242,7 @@ void SecretBasePerStepCallback(u8 taskId)
                 }
                 else if (behavior == 0x47 && tileId == 0x23e)
                 {
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x1000);
                         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x2000);
@@ -1250,7 +1250,7 @@ void SecretBasePerStepCallback(u8 taskId)
                 }
                 else if (MetatileBehavior_IsSecretBaseGlitterMat(behavior) == TRUE)
                 {
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x80);
                     }
@@ -1258,7 +1258,7 @@ void SecretBasePerStepCallback(u8 taskId)
                 else if (MetatileBehavior_IsSecretBaseBalloon(behavior) == TRUE)
                 {
                     PopSecretBaseBalloon(MapGridGetMetatileIdAt(x, y), x, y);
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         switch ((int)MapGridGetMetatileIdAt(x, y))
                         {
@@ -1275,27 +1275,27 @@ void SecretBasePerStepCallback(u8 taskId)
                 }
                 else if (MetatileBehavior_IsSecretBaseBreakableDoor(behavior) == TRUE)
                 {
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x400);
                     }
                     ShatterSecretBaseBreakableDoor(x, y);
                 }
                 else if (MetatileBehavior_IsSecretBaseSoundMat(behavior) == TRUE){
-                    if (gIsInSecretBase == TRUE) {
+                    if (gInFriendSecretBase == TRUE) {
                         VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x8000);
                     }
                 }
                 else if (MetatileBehavior_IsSecretBaseJumpMat(behavior) == TRUE)
                 {
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x4000);
                     }
                 }
                 else if (MetatileBehavior_IsSecretBaseSpinMat(behavior) == TRUE)
                 {
-                    if (gIsInSecretBase == TRUE)
+                    if (gInFriendSecretBase == TRUE)
                     {
                         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x02);
                     }
@@ -1792,15 +1792,15 @@ void sub_80EB1AC(void)
     {
         VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE);
     }
-    gIsInSecretBase = FALSE;
+    gInFriendSecretBase = FALSE;
 }
 
 void sub_80EB218(void)
 {
-    if (VarGet(VAR_SECRET_BASE_IS_NOT_LOCAL) && gIsInSecretBase == TRUE && !CurrentMapIsSecretBase())
+    if (VarGet(VAR_SECRET_BASE_IS_NOT_LOCAL) && gInFriendSecretBase == TRUE && !CurrentMapIsSecretBase())
     {
         VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE);
-        gIsInSecretBase = FALSE;
+        gInFriendSecretBase = FALSE;
         sub_80EEA70();
         VarSet(VAR_SECRET_BASE_STEP_COUNTER, 0);
         VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, 0);
diff --git a/src/time_events.c b/src/time_events.c
index 9263bffac..bd51f0c2d 100644
--- a/src/time_events.c
+++ b/src/time_events.c
@@ -81,7 +81,7 @@ void UpdateShoalTideFlag(void)
         1, // 23
     };
 
-    if (IsMapTypeOutside(GetLastUsedWarpMapType()))
+    if (IsMapTypeOutdoors(GetLastUsedWarpMapType()))
     {
         RtcCalcLocalTime();
         if (tide[gLocalTime.hours])
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index ee7e2287a..06ca8615f 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -93,7 +93,7 @@ struct TrHillStruct2
 // EWRAM
 static EWRAM_DATA struct TrHillStruct2 *sHillData = NULL;
 static EWRAM_DATA struct TrHillRoomTrainers *sRoomTrainers = NULL;
-EWRAM_DATA u32 *gVBlankCounterPointer = NULL;
+EWRAM_DATA u32 *gTrainerHillVBlankCounter = NULL;
 
 // This file's functions.
 static void TrainerHillStartChallenge(void);
@@ -372,7 +372,7 @@ void InitTrainerHillBattleStruct(void)
         }
         sRoomTrainers->facilityClass[i] = sHillData->tag.floors[sHillData->floorId].trainers[i].facilityClass;
     }
-    SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer);
+    SetTrainerHillVBlankCounter(&gSaveBlock1Ptr->trainerHill.timer);
     FreeDataStruct();
 }
 
@@ -435,7 +435,7 @@ static void TrainerHillStartChallenge(void)
         gSaveBlock1Ptr->trainerHill.field_3D6E_0f = 0;
 
     gSaveBlock1Ptr->trainerHill.field_3D6C = 0;
-    SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer);
+    SetTrainerHillVBlankCounter(&gSaveBlock1Ptr->trainerHill.timer);
     gSaveBlock1Ptr->trainerHill.timer = 0;
     gSaveBlock1Ptr->trainerHill.field_3D6E_0c = 0;
     gSaveBlock1Ptr->trainerHill.field_3D6E_0b = 0;
@@ -447,7 +447,7 @@ static void TrainerHillStartChallenge(void)
 
 static void sub_81D58D8(void)
 {
-    ClearVBlankCounterPointer();
+    ClearTrainerHillVBlankCounter();
     gSpecialVar_Result = 0;
     if (gSaveBlock1Ptr->trainerHill.field_3D6E_0c)
         gSpecialVar_Result++;
@@ -505,7 +505,7 @@ static void TrainerHillResumeTimer(void)
         if (gSaveBlock1Ptr->trainerHill.timer >= HILL_MAX_TIME)
             gSaveBlock1Ptr->trainerHill.timer = HILL_MAX_TIME;
         else
-            SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer);
+            SetTrainerHillVBlankCounter(&gSaveBlock1Ptr->trainerHill.timer);
     }
 }
 
-- 
cgit v1.2.3


From 25050b99444538535a67ba51b7aaf3d0bf90c50e Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Sat, 2 Mar 2019 04:13:27 -0500
Subject: Fix tabs, do suggested rename

---
 src/overworld.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/overworld.c b/src/overworld.c
index 837855877..731449608 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -838,7 +838,7 @@ static void mli0_load_map(u32 a1)
     }
 
     isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType);
-    isIndoors = Overworld_MapTypeIsIndoors(gMapHeader.mapType);
+    isIndoors = IsMapTypeIndoors(gMapHeader.mapType);
 
     sub_80EB218();
     TrySetMapSaveWarpStatus();
@@ -1199,7 +1199,7 @@ void Overworld_ChangeMusicTo(u16 newMusic)
 u8 GetMapMusicFadeoutSpeed(void)
 {
     const struct MapHeader *mapHeader = GetDestinationWarpMapHeader();
-    if (Overworld_MapTypeIsIndoors(mapHeader->mapType) == TRUE)
+    if (IsMapTypeIndoors(mapHeader->mapType) == TRUE)
         return 2;
     else
         return 4;
@@ -1353,7 +1353,7 @@ bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType)
         return FALSE;
 }
 
-bool8 Overworld_MapTypeIsIndoors(u8 mapType)
+bool8 IsMapTypeIndoors(u8 mapType)
 {
     if (mapType == MAP_TYPE_INDOOR
      || mapType == MAP_TYPE_SECRET_BASE)
-- 
cgit v1.2.3