summaryrefslogtreecommitdiff
path: root/include/map.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/map.h')
-rw-r--r--include/map.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/include/map.h b/include/map.h
index d3d1ed9..a0a5660 100644
--- a/include/map.h
+++ b/include/map.h
@@ -5,11 +5,24 @@
#define MAX_ROOM_COUNT 24 // Empirical max, not sure if the code supports any more.
-struct MapTile
+
+struct MapTileBitFlagStair
{
/* 0x0 */ u8 tileFlags;
/* 0x1 */ bool8 stairs;
- u8 fill2[0x9 - 0x2];
+};
+
+struct MapTile
+{
+ // TODO: can we get rid of the union... is tileFlags a u16 only?
+ union MapTileUnion
+ {
+ struct MapTileBitFlagStair unk0;
+ u16 tileFlags_u16;
+ } MapTileUnion;
+ u16 unk4;
+ u16 unk6;
+ u8 unk8;
/* 0x9 */ u8 roomIndex;
// Bitwise flags for whether Pokémon can move to an adjacent tile. Bits correspond to directions in direction.h.
// Different sets of flags are used for Pokémon that can cross special terrain.