summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2021-12-27 18:19:47 -0800
committertheo3 <arisstephenson2@gmail.com>2021-12-27 18:19:47 -0800
commitdc8bcb32e0db99420b35b4254c5218711bc1e3a0 (patch)
treeaf51b2d55428f2a47786b358f4f4af604d7da842 /include
parent24750a6bb59eebab95a9ef0a020ba612cac908e1 (diff)
dungeon stuff
Diffstat (limited to 'include')
-rw-r--r--include/player.h3
-rw-r--r--include/room.h16
2 files changed, 10 insertions, 9 deletions
diff --git a/include/player.h b/include/player.h
index f664b6f3..7d29812c 100644
--- a/include/player.h
+++ b/include/player.h
@@ -216,7 +216,8 @@ typedef struct {
/*0x8b*/ u8 controlMode;
/*0x8c*/ u16 vel_x;
/*0x8e*/ u16 vel_y;
- /*0x90*/ union SplitWord field_0x90;
+ /*0x90*/ u16 field_0x90;
+ /*0x92*/ u16 field_0x92;
/*0x94*/ u32 field_0x94;
/*0x98*/ u16 field_0x98;
/*0x9a*/ u16 field_0x9a;
diff --git a/include/room.h b/include/room.h
index 64729622..5e603926 100644
--- a/include/room.h
+++ b/include/room.h
@@ -101,14 +101,14 @@ typedef struct {
Coords start_pos;
u8 layer;
u8 field_0x15;
- u8 field_0x16;
- u8 field_0x17;
- s16 field_0x18;
- s16 field_0x1a;
- s16 field_0x1c;
- s16 field_0x1e;
- s16 field_0x20;
- s16 field_0x22;
+ u8 dungeon_area;
+ u8 dungeon_room;
+ s16 dungeon_x;
+ s16 dungeon_y;
+ s16 dungeon_map_x;
+ s16 dungeon_map_y;
+ s16 overworld_map_x;
+ s16 overworld_map_y;
u8 field_0x24[0x8];
} PlayerWorldStatus;
static_assert(sizeof(PlayerWorldStatus) == 0x20);