diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-12-19 16:38:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-19 16:38:51 -0600 |
| commit | 8e1c66d8bd01807285b05d8333f36cd2d70e062c (patch) | |
| tree | bb1bf94d56b770eca66780948ff9e05401967ed1 /include/dungeon_global_data.h | |
| parent | 087405b9d975b447ef7b17afd1e73e449cc7881b (diff) | |
| parent | 0369264407563b64d60c885f8bf79322b6f663c8 (diff) | |
Merge pull request #85 from AnonymousRandomPerson/master
More AI decomp
Diffstat (limited to 'include/dungeon_global_data.h')
| -rw-r--r-- | include/dungeon_global_data.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/dungeon_global_data.h b/include/dungeon_global_data.h index 1d0a971..948603e 100644 --- a/include/dungeon_global_data.h +++ b/include/dungeon_global_data.h @@ -5,12 +5,15 @@ #include "dungeon_entity.h" #include "global.h" #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 +extern struct DungeonGlobalData *gDungeonGlobalData; + struct DungeonGlobalData { u8 unk0; @@ -51,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]; @@ -68,8 +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[0x10844 - 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 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. |