Merge branch 'master' of https://github.com/pret/pokeemerald

1 files changed, 5 insertions, 12 deletions

diff --git a/berry_fix/payload/include/global.fieldmap.h b/berry_fix/payload/include/global.fieldmap.h
index f876e5a56..d5ab0812e 100644
--- a/berry_fix/payload/include/global.fieldmap.h
+++ b/berry_fix/payload/include/global.fieldmap.h
@@ -79,23 +79,16 @@ struct CoordEvent
 
 struct BgEvent
 {
-    /*0x00*/u16 x;
-    /*0x02*/u16 y;
-    /*0x04*/u8 elevation;
-    /*0x05*/u8 kind;
-    /*0x08*/union { // carried over from diego's FR/LG work, seems to be the same struct
-        // in gen 3, "kind" (0x3 in BgEvent struct) determines the method to read the union.
+    u16 x, y;
+    u8 elevation;
+    u8 kind; // The "kind" field determines how to access bgUnion union below.
+    union {
         u8 *script;
-
-        // hidden item type
         struct {
             u16 item;
-            u16 hiddenItemId; // flag offset to determine flag lookup
+            u16 hiddenItemId;
         } hiddenItem;
-
-        // secret base type
         u32 secretBaseId;
-
     } bgUnion;
 };