summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/fieldmap.h10
-rw-r--r--include/global.h6
2 files changed, 13 insertions, 3 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h
index e60e4bbce..d1da5a7e4 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -26,7 +26,15 @@ struct MapData
struct MapObjectTemplate
{
- u8 filler[0x18];
+ u8 localId;
+ u8 filler_1[0x3];
+ s16 x;
+ s16 y;
+ u8 elevation;
+ u8 movementType;
+ u8 filler_A[0x6];
+ u8 *script;
+ u8 filler_14[0x4];
};
struct MapEvents
diff --git a/include/global.h b/include/global.h
index ca3ae4509..bcc4d240d 100644
--- a/include/global.h
+++ b/include/global.h
@@ -98,7 +98,7 @@ struct WarpData
{
s8 mapGroup;
s8 mapNum;
- u8 warpId;
+ s8 warpId;
s16 x, y;
};
@@ -126,7 +126,9 @@ struct SaveBlock1
{
struct Coords16 pos;
struct WarpData location;
- u8 filler_C[0x484];
+ u8 filler_C[0x26];
+ u16 mapDataId;
+ u8 filler_34[0x45C];
u32 money;
u16 coins;
u16 registeredItem; // registered for use with SELECT button