From c53bdc35f8bdd401e90dfae263a3f5fc9182f86b Mon Sep 17 00:00:00 2001 From: Cheng Hann Gan Date: Sun, 12 Dec 2021 15:52:06 -0500 Subject: Dungeon random/AI decomp + converted positions to structs (#83) * Decomped RollPercentChance() * Decomped DungeonRandomCapped() * Decomped DungeonRandom() * Decomped FindRockItemTargets() -Added position struct. --- include/map.h | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'include/map.h') diff --git a/include/map.h b/include/map.h index 38fe68a..7863b46 100644 --- a/include/map.h +++ b/include/map.h @@ -25,23 +25,27 @@ struct MapTile /* 0x14 */ struct DungeonEntity *mapObject; // Item or trap on the tile. }; +struct Position +{ + s16 x; + s16 y; +}; + +struct Position32 +{ + s32 x; + s32 y; +}; + struct MapRoom { u8 fill0[0x2 - 0x0]; // All coordinates are inclusive. - /* 0x2 */ s16 startX; - /* 0x4 */ s16 startY; - /* 0x6 */ s16 endX; - /* 0x8 */ s16 endY; + /* 0x2 */ struct Position start; + /* 0x6 */ struct Position end; u8 fillA[0x1C - 0xA]; }; -struct RoomExit -{ - s16 x; - s16 y; -}; - enum TileType { TILE_TYPE_FLOOR = 1 << 0, -- cgit v1.2.3