diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-07-04 17:58:02 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-04 17:58:02 +1000 |
| commit | 0f572acbda00bb46cf0079ea851ef1d2fa17290b (patch) | |
| tree | 63639e2dbfdd3b2eb07e9b1a1eabdbffa687f48b /include | |
| parent | 0c4f2524d83a9bdb74a34cb507fae16318006948 (diff) | |
`map_static_name` docs (#1298)
* map static docs
* adjust comment
* improve comments
* PR Suggestions
* map point
* adjust comments
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64item.h | 18 | ||||
| -rw-r--r-- | include/z64scene.h | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/include/z64item.h b/include/z64item.h index c37ba02c8..19c86f0a1 100644 --- a/include/z64item.h +++ b/include/z64item.h @@ -308,6 +308,24 @@ typedef enum ItemId { /* 0xA1 */ ITEM_GOLD_DUST_2, /* 0xA2 */ ITEM_HYLIAN_LOACH_2, /* 0xA3 */ ITEM_SEAHORSE_CAUGHT, + // First entries of `MAP_POINT` must be continguous with `RegionId` + /* 0xA4 */ ITEM_MAP_POINT_GREAT_BAY, + /* 0xA5 */ ITEM_MAP_POINT_ZORA_HALL, + /* 0xA6 */ ITEM_MAP_POINT_ROMANI_RANCH, + /* 0xA7 */ ITEM_MAP_POINT_DEKU_PALACE, + /* 0xA8 */ ITEM_MAP_POINT_WOODFALL, + /* 0xA9 */ ITEM_MAP_POINT_CLOCK_TOWN, + /* 0xAA */ ITEM_MAP_POINT_SNOWHEAD, + /* 0xAB */ ITEM_MAP_POINT_IKANA_GRAVEYARD, + /* 0xAC */ ITEM_MAP_POINT_IKANA_CANYON, + /* 0xAD */ ITEM_MAP_POINT_GORON_VILLAGE, + /* 0xAE */ ITEM_MAP_POINT_STONE_TOWER, + // Remaining map points are unique to owl warps + /* 0xAF */ ITEM_MAP_POINT_GREAT_BAY_COAST, + /* 0xBO */ ITEM_MAP_POINT_SOUTHERN_SWAMP, + /* 0xB1 */ ITEM_MAP_POINT_MOUNTAIN_VILLAGE, + /* 0xB2 */ ITEM_MAP_POINT_MILK_ROAD, + /* 0xB3 */ ITEM_MAP_POINT_ZORA_CAPE, /* 0xF0 */ ITEM_F0 = 0xF0, // PLAYER_MASK_BLAST /* 0xF1 */ ITEM_F1, // PLAYER_MASK_BREMEN /* 0xF2 */ ITEM_F2, // PLAYER_MASK_KAMARO diff --git a/include/z64scene.h b/include/z64scene.h index 55c959b31..e0f186cd8 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -559,6 +559,7 @@ typedef union { // Sets cursor point options on the world map typedef enum { + /* -1 */ REGION_NONE = -1, /* 0x0 */ REGION_GREAT_BAY, /* 0x1 */ REGION_ZORA_HALL, /* 0x2 */ REGION_ROMANI_RANCH, |