diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-06-24 00:57:01 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-23 10:57:01 -0400 |
| commit | aa9e368561ae13106daa14da4e2bf0656bfc70da (patch) | |
| tree | 19418e3c31502a64ff04882c9f00d9b65ace5173 /include | |
| parent | 11dac8d0207912db138f450df04ee40e6771923a (diff) | |
`icon_item_static` and `icon_item_24_static` documented (#1297)
* extract_archives.py
* autogenerated xmls
* build OK
* cleanup
* Use symbols in gItemIcons
* change how archives are generated
* makeyar in C
* Rename segments
* rename .archive.o to .yar.o
* Explanation at the top of programs
* fix progress calculation
* Ignore archives in progress script
* merge
* document icon items
* cleanup
* remove duplicate headers
* jap -> jpn
* PR review
* link human
* PR Review
* missed some
---------
Co-authored-by: angie <angheloalf95@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64item.h | 6 | ||||
| -rw-r--r-- | include/z64player.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/z64item.h b/include/z64item.h index 55cbb337f..c37ba02c8 100644 --- a/include/z64item.h +++ b/include/z64item.h @@ -184,7 +184,7 @@ typedef enum ItemId { /* 0x25 */ ITEM_CHATEAU, /* 0x26 */ ITEM_HYLIAN_LOACH, /* 0x27 */ ITEM_OBABA_DRINK, - /* 0x28 */ ITEM_MOON_TEAR, + /* 0x28 */ ITEM_MOONS_TEAR, /* 0x29 */ ITEM_DEED_LAND, /* 0x2A */ ITEM_DEED_SWAMP, /* 0x2B */ ITEM_DEED_MOUNTAIN, @@ -471,7 +471,7 @@ typedef enum GetItemId { /* 0x93 */ GI_GOLD_DUST_2, /* 0x94 */ GI_HYLIAN_LOACH_2, // Unused bottled eel /* 0x95 */ GI_SEAHORSE_CAUGHT, - /* 0x96 */ GI_MOON_TEAR, + /* 0x96 */ GI_MOONS_TEAR, /* 0x97 */ GI_DEED_LAND, /* 0x98 */ GI_DEED_SWAMP, /* 0x99 */ GI_DEED_MOUNTAIN, @@ -601,7 +601,7 @@ typedef enum GetItemDrawId { /* 0x56 */ GID_SKULL_TOKEN_2, /* 0x57 */ GID_57, /* 0x58 */ GID_ZORA_EGG, - /* 0x59 */ GID_MOON_TEAR, + /* 0x59 */ GID_MOONS_TEAR, /* 0x5A */ GID_DEED_LAND, /* 0x5B */ GID_MASK_DEKU, /* 0x5C */ GID_REMAINS_ODOLWA, diff --git a/include/z64player.h b/include/z64player.h index 5982233b8..598e75246 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -98,7 +98,7 @@ typedef enum PlayerItemAction { /* 0x27 */ PLAYER_IA_BOTTLE_MILK_HALF, /* 0x28 */ PLAYER_IA_BOTTLE_CHATEAU, /* 0x29 */ PLAYER_IA_BOTTLE_FAIRY, - /* 0x2A */ PLAYER_IA_MOON_TEAR, + /* 0x2A */ PLAYER_IA_MOONS_TEAR, /* 0x2B */ PLAYER_IA_DEED_LAND, /* 0x2C */ PLAYER_IA_ROOM_KEY, /* 0x2D */ PLAYER_IA_LETTER_TO_KAFEI, |