diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/dungeon_global_data.h | 14 | ||||
| -rw-r--r-- | include/dungeon_map_access.h | 9 | ||||
| -rw-r--r-- | include/dungeon_util.h | 2 |
3 files changed, 17 insertions, 8 deletions
diff --git a/include/dungeon_global_data.h b/include/dungeon_global_data.h index d1d57ae..948603e 100644 --- a/include/dungeon_global_data.h +++ b/include/dungeon_global_data.h @@ -7,8 +7,8 @@ #include "map.h" #include "position.h" -#define DUNGEON_MAX_SIZE_X 55 -#define DUNGEON_MAX_SIZE_Y 31 +#define DUNGEON_MAX_SIZE_X 56 +#define DUNGEON_MAX_SIZE_Y 32 #define DUNGEON_MAX_WILD_POKEMON 16 #define DUNGEON_MAX_POKEMON MAX_TEAM_MEMBERS + DUNGEON_MAX_WILD_POKEMON @@ -54,8 +54,8 @@ struct DungeonGlobalData u8 fill3A10[0x3A14 - 0x3A10]; /* 0x3A14 */ s16 bossBattleIndex; u8 fill3A16[0x3A18 - 0x3A16]; - /* 0x3A18 */ struct MapTile mapTiles[DUNGEON_MAX_SIZE_X * DUNGEON_MAX_SIZE_Y]; - u8 fill54BC[0xE23C - 0xD9F0]; + /* 0x3A18 */ struct MapTile mapTiles[DUNGEON_MAX_SIZE_Y][DUNGEON_MAX_SIZE_X]; + u8 fillE218[0xE23C - 0xE218]; s16 unkE23C; s16 unkE23E; u8 fillE240[0xE264 - 0xE240]; @@ -71,10 +71,10 @@ struct DungeonGlobalData /* 0xE277 */ u8 mudSportTurnsLeft; /* 0xE278 */ u8 waterSportTurnsLeft; u8 fillE279[0xE8C0 - 0xE279]; - /* 0xE8C0 */ u32 mapEntityPointers[DUNGEON_MAX_SIZE_X * DUNGEON_MAX_SIZE_Y]; - u8 fill10364[0x104C4 - 0x10364]; + /* 0xE8C0 */ struct MapTile* mapEntityPointers[DUNGEON_MAX_SIZE_Y][DUNGEON_MAX_SIZE_X]; + u8 fill104C0[0x104C4 - 0x104C0]; /* 0x104C4 */ struct MapRoom roomData[MAX_ROOM_COUNT]; - u8 fill10604[0x10844 - 0x10764]; + u8 fill10764[0x10844 - 0x10764]; /* 0x10844 */ u16 numRoomExits[MAX_ROOM_COUNT]; u8 fill10874[0x10884 - 0x10874]; /* 0x10884 */ struct Position roomExits[MAX_ROOM_COUNT][32]; // Arrays of room exits for each room. diff --git a/include/dungeon_map_access.h b/include/dungeon_map_access.h new file mode 100644 index 0000000..5e4e3da --- /dev/null +++ b/include/dungeon_map_access.h @@ -0,0 +1,9 @@ +#ifndef GUARD_DUNGEON_MAP_ACCESS_H +#define GUARD_DUNGEON_MAP_ACCESS_H + +#include "map.h" + +// 0x4954C +struct MapTile* GetMapTileAtPosition(s32 x, s32 y); + +#endif diff --git a/include/dungeon_util.h b/include/dungeon_util.h index ca62184..82d44ba 100644 --- a/include/dungeon_util.h +++ b/include/dungeon_util.h @@ -11,6 +11,6 @@ u32 GetEntityType(struct DungeonEntity *entity); struct DungeonEntityData *GetTrapData(struct DungeonEntity *entity); // 0x45108 struct ItemSlot *GetItemData(struct DungeonEntity *entity); -struct MapTile *sub_8045128(struct DungeonEntity *entity); +struct MapTile *GetMapEntityForDungeonEntity(struct DungeonEntity *entity); #endif |