summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-02-12 15:01:43 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-02-12 15:01:43 +0100
commit382442c4c8754262c77acb50930df31c63a62355 (patch)
treebbd8da8d388b0df552b391452d4d150b40c47480 /include/global.h
parenta4787bc06a323071d32d3e0705e9cd39d9221452 (diff)
start decompiling overworld.s
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h19
1 files changed, 18 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h
index 4a71a8a87..8913432ba 100644
--- a/include/global.h
+++ b/include/global.h
@@ -618,7 +618,7 @@ struct SaveBlock1
/*0x04*/ struct WarpData location;
/*0x0C*/ struct WarpData warp1;
/*0x14*/ struct WarpData warp2;
- /*0x1C*/ struct WarpData warp3;
+ /*0x1C*/ struct WarpData lastHealLocation;
/*0x24*/ struct WarpData warp4;
/*0x2C*/ u16 battleMusic;
/*0x2E*/ u8 weather;
@@ -705,6 +705,23 @@ struct SaveBlock1
extern struct SaveBlock1* gSaveBlock1Ptr;
+struct MapPosition
+{
+ s16 x;
+ s16 y;
+ u8 height;
+};
+
+struct UnkStruct_8054FF8
+{
+ u8 a;
+ u8 b;
+ u8 c;
+ u8 d;
+ struct MapPosition sub;
+ u16 field_C;
+};
+
struct Bitmap // TODO: Find a better spot for this
{
u8* pixels;