diff options
| author | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-02-20 21:59:07 -0500 |
|---|---|---|
| committer | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-02-20 21:59:23 -0500 |
| commit | 60a19d681cda14c4ebeab5d18a98e3b07a5e93a3 (patch) | |
| tree | f660e34515e72a33f68af5f8822dd2eb1628dc08 /include | |
| parent | 96372eb336d21e5da66246983e0522212f370bdf (diff) | |
Decomped GetMapTile_2
Diffstat (limited to 'include')
| -rw-r--r-- | include/dungeon_global_data.h | 2 | ||||
| -rw-r--r-- | include/dungeon_map_access.h | 9 | ||||
| -rw-r--r-- | include/dungeon_util.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/dungeon_global_data.h b/include/dungeon_global_data.h index 948603e..74e052e 100644 --- a/include/dungeon_global_data.h +++ b/include/dungeon_global_data.h @@ -71,7 +71,7 @@ struct DungeonGlobalData /* 0xE277 */ u8 mudSportTurnsLeft; /* 0xE278 */ u8 waterSportTurnsLeft; u8 fillE279[0xE8C0 - 0xE279]; - /* 0xE8C0 */ struct MapTile* mapEntityPointers[DUNGEON_MAX_SIZE_Y][DUNGEON_MAX_SIZE_X]; + /* 0xE8C0 */ struct MapTile* mapTilePointers[DUNGEON_MAX_SIZE_Y][DUNGEON_MAX_SIZE_X]; u8 fill104C0[0x104C4 - 0x104C0]; /* 0x104C4 */ struct MapRoom roomData[MAX_ROOM_COUNT]; u8 fill10764[0x10844 - 0x10764]; diff --git a/include/dungeon_map_access.h b/include/dungeon_map_access.h index 5e4e3da..c715483 100644 --- a/include/dungeon_map_access.h +++ b/include/dungeon_map_access.h @@ -3,7 +3,14 @@ #include "map.h" +struct unkStruct_202F190 +{ + struct MapTile* unk0[6]; +}; + // 0x4954C -struct MapTile* GetMapTileAtPosition(s32 x, s32 y); +struct MapTile* GetMapTile_1(s32 x, s32 y); +// 0x49590 +struct MapTile* GetMapTile_2(s32 x, s32 y); #endif diff --git a/include/dungeon_util.h b/include/dungeon_util.h index 4d91b29..b32b85d 100644 --- a/include/dungeon_util.h +++ b/include/dungeon_util.h @@ -15,6 +15,6 @@ u32 GetEntityType(struct DungeonEntity *entity); struct DungeonEntityData *GetTrapData(struct DungeonEntity *entity); // 0x45108 struct ItemSlot *GetItemData(struct DungeonEntity *entity); -struct MapTile *GetMapEntityForDungeonEntity(struct DungeonEntity *entity); +struct MapTile *GetMapTileForDungeonEntity_2(struct DungeonEntity *entity); #endif |