Merge branch 'master' of github.com:pret/pokefirered into trade

1 files changed, 3 insertions, 31 deletions

diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index bf142d265..c0f25fa93 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -13,35 +13,6 @@ enum
     CONNECTION_EMERGE
 };
 
-// map types
-enum
-{
-    MAP_TYPE_0,
-    MAP_TYPE_TOWN,
-    MAP_TYPE_CITY,
-    MAP_TYPE_ROUTE,
-    MAP_TYPE_UNDERGROUND,
-    MAP_TYPE_UNDERWATER,
-    MAP_TYPE_6,
-    MAP_TYPE_7,
-    MAP_TYPE_INDOOR,
-    MAP_TYPE_SECRET_BASE
-};
-
-// map battle scenes
-enum
-{
-    MAP_BATTLE_SCENE_NORMAL,       // 0
-    MAP_BATTLE_SCENE_GYM,          // 1
-    MAP_BATTLE_SCENE_MAGMA,        // 2
-    MAP_BATTLE_SCENE_AQUA,         // 3
-    MAP_BATTLE_SCENE_SIDNEY,       // 4
-    MAP_BATTLE_SCENE_PHOEBE,       // 5
-    MAP_BATTLE_SCENE_GLACIA,       // 6
-    MAP_BATTLE_SCENE_DRAKE,        // 7
-    MAP_BATTLE_SCENE_BATTLE_TOWER, // 8
-};
-
 typedef void (*TilesetCB)(void);
 
 struct Tileset
@@ -134,7 +105,8 @@ union BgUnion
     u8 *script;
 
     // hidden item type probably
-    struct HiddenItemStruct hiddenItem;
+    struct HiddenItemStruct hiddenItemStr;
+    u32 hiddenItem;
 
     // secret base type
     u32 secretBaseId;
@@ -241,7 +213,7 @@ struct MapObject
     /*0x0C*/ struct Coords16 coords1;
     /*0x10*/ struct Coords16 coords2;
     /*0x14*/ struct Coords16 coords3;
-    /*0x18*/ u8 mapobj_unk_18:4;  //current direction?
+    /*0x18*/ u8 facingDirection:4;  //current direction?
     /*0x18*/ u8 placeholder18:4;
     /*0x19*/ union MapObjectRange range;
     /*0x1A*/ u8 mapobj_unk_1A;