From 98062c69d613fb1b9e2345924dd34d0bbdcfcc90 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 2 Jan 2017 04:27:51 -0500
Subject: label and document berry.c, decompress.c, item_use.c and label
 gBattleTypeFlags (#146)

* make ROM match again

* clean up item_use.c labels and clarify functions.

* label and clarify some functions in decompress.c

* label and clarify berry.c

* rename 20239F8 to gBattleTypeFlags

* formatting
---
 src/battle_setup.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/battle_setup.c')

diff --git a/src/battle_setup.c b/src/battle_setup.c
index bb69638c4..ed43b4437 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -304,24 +304,24 @@ s8 sub_8081D3C(void)
         return 1;
     if (MetatileBehavior_IsSandOrDeepSand(tileBehavior))
         return 2;
-    switch (gMapHeader.light)
+    switch (gMapHeader.mapType)
     {
-    case 1:
-    case 2:
-    case 3:
+    case MAP_TYPE_TOWN:
+    case MAP_TYPE_CITY:
+    case MAP_TYPE_ROUTE:
         break;
-    case 4:
+    case MAP_TYPE_UNDERGROUND:
         if (sub_80574C4(tileBehavior))
             return 8;
         if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
             return 5;
         return 7;
-    case 8:
-    case 9:
+    case MAP_TYPE_INDOOR:
+    case MAP_TYPE_SECRET_BASE:
         return 8;
-    case 5:
+    case MAP_TYPE_UNDERWATER:
         return 3;
-    case 6:
+    case MAP_TYPE_6:
         if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
             return 4;
         return 9;
@@ -362,11 +362,11 @@ s8 sub_8081E90(void)
 
     if (!MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
     {
-        switch (gMapHeader.light)
+        switch (gMapHeader.mapType)
         {
-        case 4:
+        case MAP_TYPE_UNDERGROUND:
             return 1;
-        case 5:
+        case MAP_TYPE_UNDERWATER:
             return 3;
         default:
             return 0;
@@ -384,7 +384,7 @@ u16 GetSumOfPartyMonLevel(u8 numMons)
     {
         u32 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
         
-        if (species != 412 && species != 0 && GetMonData(&gPlayerParty[i], MON_DATA_HP) != 0)
+        if (species != SPECIES_EGG && species != SPECIES_NONE && GetMonData(&gPlayerParty[i], MON_DATA_HP) != 0)
         {
             sum += GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
             numMons--;
-- 
cgit v1.2.3