From e75f0b4f80670bd3b6a28257f10770911869ea08 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 16 Oct 2018 21:47:08 -0500
Subject: Port/decompile field_control_avatar

---
 include/global.fieldmap.h | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'include/global.fieldmap.h')

diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 4bec8e0c7..66d5b5e4c 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -63,17 +63,16 @@ struct EventObjectTemplate
 struct WarpEvent
 {
     s16 x, y;
-    s8 warpId;
-    u8 mapGroup;
+    u8 elevation;
+    u8 warpId;
     u8 mapNum;
-    u8 unk7;
+    u8 mapGroup;
 };
 
 struct CoordEvent
 {
     s16 x, y;
-    u8 unk4;
-    u8 filler_5;
+    u8 elevation;
     u16 trigger;
     u16 index;
     u8 filler_A[0x2];
@@ -83,16 +82,15 @@ struct CoordEvent
 struct BgEvent
 {
     u16 x, y;
-    u8 unk4;
+    u8 elevation;
     u8 kind;
-    // 0x2 padding for the union beginning.
     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.
         u8 *script;
 
-        // hidden item type probably
+        // hidden item type
         struct {
-            u8 filler6[0x2];
+            u16 item;
             u16 hiddenItemId; // flag offset to determine flag lookup
         } hiddenItem;
 
-- 
cgit v1.2.3


From dd3689fdbf98b0a60190bf10e3bed3158692818e Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Fri, 19 Oct 2018 00:05:54 -0500
Subject: Finish porting/decompiling field_player_avatar

---
 include/global.fieldmap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/global.fieldmap.h')

diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 66d5b5e4c..bb120c62c 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -232,7 +232,7 @@ struct EventObjectGraphicsInfo
 #define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1)
 #define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2)
 #define PLAYER_AVATAR_FLAG_SURFING   (1 << 3)
-#define PLAYER_AVATAR_FLAG_4         (1 << 4)
+#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4)
 #define PLAYER_AVATAR_FLAG_5         (1 << 5)
 #define PLAYER_AVATAR_FLAG_6         (1 << 6)
 #define PLAYER_AVATAR_FLAG_DASH      (1 << 7)
-- 
cgit v1.2.3