summaryrefslogtreecommitdiff
path: root/include/global.fieldmap.h
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-03-18 21:20:42 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-03-18 21:20:42 -0400
commit7074900712c2d87e1afb4014189059ef460b2193 (patch)
tree56c494d58a559cd172b016018cb00b72f9bfb580 /include/global.fieldmap.h
parent4516c63652686344160015ea91ee8729c2f355c5 (diff)
Finish field_control_avatar
Diffstat (limited to 'include/global.fieldmap.h')
-rw-r--r--include/global.fieldmap.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 2d7dc104e..3c4b5f382 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -110,20 +110,18 @@ struct ObjectEventTemplate
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;
+ u16 x, y;
+ u8 elevation;
u16 trigger;
u16 index;
- u8 filler_A[0x2];
u8 *script;
};
@@ -152,7 +150,7 @@ union BgUnion
struct BgEvent
{
u16 x, y;
- u8 unk4;
+ u8 elevation;
u8 kind;
// 0x2 padding for the union beginning.
union BgUnion bgUnion;