`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>

6 files changed, 148 insertions, 149 deletions

diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c
index 1fbce712d..37039a05d 100644
--- a/src/code/code_8012EC80.c
+++ b/src/code/code_8012EC80.c
@@ -98,137 +98,137 @@ u32 gGsFlagsShift[] = {
 };
 
 TexturePtr gItemIcons[] = {
-    icon_item_static_yar_Blob_000000,    // ITEM_OCARINA
-    icon_item_static_yar_Blob_001000,    // ITEM_BOW
-    icon_item_static_yar_Blob_002000,    // ITEM_ARROW_FIRE
-    icon_item_static_yar_Blob_003000,    // ITEM_ARROW_ICE
-    icon_item_static_yar_Blob_004000,    // ITEM_ARROW_LIGHT
-    icon_item_static_yar_Blob_005000,    // ITEM_OCARINA_FAIRY
-    icon_item_static_yar_Blob_006000,    // ITEM_BOMB
-    icon_item_static_yar_Blob_007000,    // ITEM_BOMBCHU
-    icon_item_static_yar_Blob_008000,    // ITEM_STICK
-    icon_item_static_yar_Blob_009000,    // ITEM_NUT
-    icon_item_static_yar_Blob_00A000,    // ITEM_MAGIC_BEANS
-    icon_item_static_yar_Blob_00B000,    // ITEM_SLINGSHOT
-    icon_item_static_yar_Blob_00C000,    // ITEM_POWDER_KEG
-    icon_item_static_yar_Blob_00D000,    // ITEM_PICTO_BOX
-    icon_item_static_yar_Blob_00E000,    // ITEM_LENS
-    icon_item_static_yar_Blob_00F000,    // ITEM_HOOKSHOT
-    icon_item_static_yar_Blob_010000,    // ITEM_SWORD_GREAT_FAIRY
-    icon_item_static_yar_Blob_011000,    // ITEM_LONGSHOT
-    icon_item_static_yar_Blob_012000,    // ITEM_BOTTLE
-    icon_item_static_yar_Blob_013000,    // ITEM_POTION_RED
-    icon_item_static_yar_Blob_014000,    // ITEM_POTION_GREEN
-    icon_item_static_yar_Blob_015000,    // ITEM_POTION_BLUE
-    icon_item_static_yar_Blob_016000,    // ITEM_FAIRY
-    icon_item_static_yar_Blob_017000,    // ITEM_DEKU_PRINCESS
-    icon_item_static_yar_Blob_018000,    // ITEM_MILK_BOTTLE
-    icon_item_static_yar_Blob_019000,    // ITEM_MILK_HALF
-    icon_item_static_yar_Blob_01A000,    // ITEM_FISH
-    icon_item_static_yar_Blob_01B000,    // ITEM_BUG
-    icon_item_static_yar_Blob_01C000,    // ITEM_BLUE_FIRE
-    icon_item_static_yar_Blob_01D000,    // ITEM_POE
-    icon_item_static_yar_Blob_01E000,    // ITEM_BIG_POE
-    icon_item_static_yar_Blob_01F000,    // ITEM_SPRING_WATER
-    icon_item_static_yar_Blob_020000,    // ITEM_HOT_SPRING_WATER
-    icon_item_static_yar_Blob_021000,    // ITEM_ZORA_EGG
-    icon_item_static_yar_Blob_022000,    // ITEM_GOLD_DUST
-    icon_item_static_yar_Blob_023000,    // ITEM_MUSHROOM
-    icon_item_static_yar_Blob_024000,    // ITEM_SEAHORSE
-    icon_item_static_yar_Blob_025000,    // ITEM_CHATEAU
-    icon_item_static_yar_Blob_026000,    // ITEM_HYLIAN_LOACH
-    icon_item_static_yar_Blob_027000,    // ITEM_OBABA_DRINK
-    icon_item_static_yar_Blob_028000,    // ITEM_MOON_TEAR
-    icon_item_static_yar_Blob_029000,    // ITEM_DEED_LAND
-    icon_item_static_yar_Blob_02A000,    // ITEM_DEED_SWAMP
-    icon_item_static_yar_Blob_02B000,    // ITEM_DEED_MOUNTAIN
-    icon_item_static_yar_Blob_02C000,    // ITEM_DEED_OCEAN
-    icon_item_static_yar_Blob_02D000,    // ITEM_ROOM_KEY
-    icon_item_static_yar_Blob_02E000,    // ITEM_LETTER_MAMA
-    icon_item_static_yar_Blob_02F000,    // ITEM_LETTER_TO_KAFEI
-    icon_item_static_yar_Blob_030000,    // ITEM_PENDANT_OF_MEMORIES
-    icon_item_static_yar_Blob_031000,    // ITEM_TINGLE_MAP
-    icon_item_static_yar_Blob_032000,    // ITEM_MASK_DEKU
-    icon_item_static_yar_Blob_033000,    // ITEM_MASK_GORON
-    icon_item_static_yar_Blob_034000,    // ITEM_MASK_ZORA
-    icon_item_static_yar_Blob_035000,    // ITEM_MASK_FIERCE_DEITY
-    icon_item_static_yar_Blob_036000,    // ITEM_MASK_TRUTH
-    icon_item_static_yar_Blob_037000,    // ITEM_MASK_KAFEIS_MASK
-    icon_item_static_yar_Blob_038000,    // ITEM_MASK_ALL_NIGHT
-    icon_item_static_yar_Blob_039000,    // ITEM_MASK_BUNNY
-    icon_item_static_yar_Blob_03A000,    // ITEM_MASK_KEATON
-    icon_item_static_yar_Blob_03B000,    // ITEM_MASK_GARO
-    icon_item_static_yar_Blob_03C000,    // ITEM_MASK_ROMANI
-    icon_item_static_yar_Blob_03D000,    // ITEM_MASK_CIRCUS_LEADER
-    icon_item_static_yar_Blob_03E000,    // ITEM_MASK_POSTMAN
-    icon_item_static_yar_Blob_03F000,    // ITEM_MASK_COUPLE
-    icon_item_static_yar_Blob_040000,    // ITEM_MASK_GREAT_FAIRY
-    icon_item_static_yar_Blob_041000,    // ITEM_MASK_GIBDO
-    icon_item_static_yar_Blob_042000,    // ITEM_MASK_DON_GERO
-    icon_item_static_yar_Blob_043000,    // ITEM_MASK_KAMARO
-    icon_item_static_yar_Blob_044000,    // ITEM_MASK_CAPTAIN
-    icon_item_static_yar_Blob_045000,    // ITEM_MASK_STONE
-    icon_item_static_yar_Blob_046000,    // ITEM_MASK_BREMEN
-    icon_item_static_yar_Blob_047000,    // ITEM_MASK_BLAST
-    icon_item_static_yar_Blob_048000,    // ITEM_MASK_SCENTS
-    icon_item_static_yar_Blob_049000,    // ITEM_MASK_GIANT
-    icon_item_static_yar_Blob_04A000,    // ITEM_BOW_ARROW_FIRE
-    icon_item_static_yar_Blob_04B000,    // ITEM_BOW_ARROW_ICE
-    icon_item_static_yar_Blob_04C000,    // ITEM_BOW_ARROW_LIGHT
-    icon_item_static_yar_Blob_04D000,    // ITEM_SWORD_KOKIRI
-    icon_item_static_yar_Blob_04E000,    // ITEM_SWORD_RAZOR
-    icon_item_static_yar_Blob_04F000,    // ITEM_SWORD_GILDED
-    icon_item_static_yar_Blob_050000,    // ITEM_SWORD_DEITY
-    icon_item_static_yar_Blob_051000,    // ITEM_SHIELD_HERO
-    icon_item_static_yar_Blob_052000,    // ITEM_SHIELD_MIRROR
-    icon_item_static_yar_Blob_053000,    // ITEM_QUIVER_30
-    icon_item_static_yar_Blob_054000,    // ITEM_QUIVER_40
-    icon_item_static_yar_Blob_055000,    // ITEM_QUIVER_50
-    icon_item_static_yar_Blob_056000,    // ITEM_BOMB_BAG_20
-    icon_item_static_yar_Blob_057000,    // ITEM_BOMB_BAG_30
-    icon_item_static_yar_Blob_058000,    // ITEM_BOMB_BAG_40
-    icon_item_static_yar_Blob_059000,    // ITEM_WALLET_DEFAULT
-    icon_item_static_yar_Blob_05A000,    // ITEM_WALLET_ADULT
-    icon_item_static_yar_Blob_05B000,    // ITEM_WALLET_GIANT
-    icon_item_static_yar_Blob_05C000,    // ITEM_FISHING_ROD
-    icon_item_static_yar_Blob_05D000,    // ITEM_REMAINS_ODOLWA
-    icon_item_static_yar_Blob_05E000,    // ITEM_REMAINS_GOHT
-    icon_item_static_yar_Blob_05F000,    // ITEM_REMAINS_GYORG
-    icon_item_static_yar_Blob_060000,    // ITEM_REMAINS_TWINMOLD
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_SONATA
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_LULLABY
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_NOVA
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_ELEGY
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_OATH
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_SARIA
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_TIME
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_HEALING
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_EPONA
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_SOARING
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_STORMS
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_SUN
-    icon_item_static_yar_Blob_061000,    // ITEM_BOMBERS_NOTEBOOK
-    icon_item_24_static_yar_Blob_000000, // ITEM_SKULL_TOKEN
-    icon_item_24_static_yar_Blob_000900, // ITEM_HEART_CONTAINER
-    icon_item_24_static_yar_Blob_001200, // ITEM_HEART_PIECE
-    icon_item_static_yar_Blob_062000,    //
-    icon_item_static_yar_Blob_062000,    //
-    icon_item_static_yar_Blob_062000,    // ITEM_SONG_LULLABY_INTRO
-    icon_item_24_static_yar_Blob_003600, // ITEM_KEY_BOSS
-    icon_item_24_static_yar_Blob_004800, // ITEM_COMPASS
-    icon_item_24_static_yar_Blob_003F00, // ITEM_DUNGEON_MAP
-    icon_item_24_static_yar_Blob_005100, // ITEM_STRAY_FAIRIES
-    icon_item_24_static_yar_Blob_005A00, // ITEM_KEY_SMALL
-    icon_item_24_static_yar_Blob_006300, // ITEM_MAGIC_SMALL
-    icon_item_24_static_yar_Blob_006C00, // ITEM_MAGIC_LARGE
-    icon_item_static_yar_Blob_062180,    // ITEM_HEART_PIECE_2
-    icon_item_static_yar_Blob_062A80,    // ITEM_INVALID_1
-    icon_item_static_yar_Blob_063380,    // ITEM_INVALID_2
-    gOcarinaCUpTex,                      // ITEM_INVALID_3
-    gOcarinaCDownTex,                    // ITEM_INVALID_4
-    gOcarinaCLeftTex,                    // ITEM_INVALID_5
-    gOcarinaCRightTex,                   // ITEM_INVALID_6
-    gOcarinaATex,                        // ITEM_INVALID_7
+    gItemIconOcarinaOfTimeTex,       // ITEM_OCARINA
+    gItemIconBowTex,                 // ITEM_BOW
+    gItemIconFireArrowTex,           // ITEM_ARROW_FIRE
+    gItemIconIceArrowTex,            // ITEM_ARROW_ICE
+    gItemIconLightArrowTex,          // ITEM_ARROW_LIGHT
+    gItemIconFairyOcarinaTex,        // ITEM_OCARINA_FAIRY
+    gItemIconBombTex,                // ITEM_BOMB
+    gItemIconBombchuTex,             // ITEM_BOMBCHU
+    gItemIconDekuStickTex,           // ITEM_STICK
+    gItemIconDekuNutTex,             // ITEM_NUT
+    gItemIconMagicBeansTex,          // ITEM_MAGIC_BEANS
+    gItemIconSlingshotTex,           // ITEM_SLINGSHOT
+    gItemIconPowderKegTex,           // ITEM_POWDER_KEG
+    gItemIconPictoBoxTex,            // ITEM_PICTO_BOX
+    gItemIconLensofTruthTex,         // ITEM_LENS
+    gItemIconHookshotTex,            // ITEM_HOOKSHOT
+    gItemIconGreatFairysSwordTex,    // ITEM_SWORD_GREAT_FAIRY
+    gItemIconLongshotTex,            // ITEM_LONGSHOT
+    gItemIconEmptyBottleTex,         // ITEM_BOTTLE
+    gItemIconRedPotionTex,           // ITEM_POTION_RED
+    gItemIconGreenPotionTex,         // ITEM_POTION_GREEN
+    gItemIconBluePotionTex,          // ITEM_POTION_BLUE
+    gItemIconBottledFairyTex,        // ITEM_FAIRY
+    gItemIconBottledDekuPrincessTex, // ITEM_DEKU_PRINCESS
+    gItemIconBottledFullMilkTex,     // ITEM_MILK_BOTTLE
+    gItemIconBottledHalfMilkTex,     // ITEM_MILK_HALF
+    gItemIconBottledFishTex,         // ITEM_FISH
+    gItemIconBottledBugTex,          // ITEM_BUG
+    gItemIconBottledBlueFireTex,     // ITEM_BLUE_FIRE
+    gItemIconBottledPoeTex,          // ITEM_POE
+    gItemIconBottledBigPoeTex,       // ITEM_BIG_POE
+    gItemIconSpringWaterTex,         // ITEM_SPRING_WATER
+    gItemIconHotSpringWaterTex,      // ITEM_HOT_SPRING_WATER
+    gItemIconBottledZoraEggTex,      // ITEM_ZORA_EGG
+    gItemIconBottledGoldDustTex,     // ITEM_GOLD_DUST
+    gItemIconBottledMushroomTex,     // ITEM_MUSHROOM
+    gItemIconBottledSeahorseTex,     // ITEM_SEAHORSE
+    gItemIconChateauRomaniTex,       // ITEM_CHATEAU
+    gItemIconBottledHylianLoachTex,  // ITEM_HYLIAN_LOACH
+    gItemIconEmptyBottle2Tex,        // ITEM_OBABA_DRINK
+    gItemIconMoonsTearTex,           // ITEM_MOONS_TEAR
+    gItemIconLandDeedTex,            // ITEM_DEED_LAND
+    gItemIconSwampDeedTex,           // ITEM_DEED_SWAMP
+    gItemIconMountainDeedTex,        // ITEM_DEED_MOUNTAIN
+    gItemIconOceanDeedTex,           // ITEM_DEED_OCEAN
+    gItemIconRoomKeyTex,             // ITEM_ROOM_KEY
+    gItemIconLetterToMamaTex,        // ITEM_LETTER_MAMA
+    gItemIconLetterToKafeiTex,       // ITEM_LETTER_TO_KAFEI
+    gItemIconPendantOfMemoriesTex,   // ITEM_PENDANT_OF_MEMORIES
+    gItemIconTingleMapTex,           // ITEM_TINGLE_MAP
+    gItemIconDekuMaskTex,            // ITEM_MASK_DEKU
+    gItemIconGoronMaskTex,           // ITEM_MASK_GORON
+    gItemIconZoraMaskTex,            // ITEM_MASK_ZORA
+    gItemIconFierceDeityMaskTex,     // ITEM_MASK_FIERCE_DEITY
+    gItemIconMaskOfTruthTex,         // ITEM_MASK_TRUTH
+    gItemIconKafeisMaskTex,          // ITEM_MASK_KAFEIS_MASK
+    gItemIconAllNightMaskTex,        // ITEM_MASK_ALL_NIGHT
+    gItemIconBunnyHoodTex,           // ITEM_MASK_BUNNY
+    gItemIconKeatonMaskTex,          // ITEM_MASK_KEATON
+    gItemIconGaroMaskTex,            // ITEM_MASK_GARO
+    gItemIconRomaniMaskTex,          // ITEM_MASK_ROMANI
+    gItemIconCircusLeaderMaskTex,    // ITEM_MASK_CIRCUS_LEADER
+    gItemIconPostmansHatTex,         // ITEM_MASK_POSTMAN
+    gItemIconCouplesMaskTex,         // ITEM_MASK_COUPLE
+    gItemIconGreatFairyMaskTex,      // ITEM_MASK_GREAT_FAIRY
+    gItemIconGibdoMaskTex,           // ITEM_MASK_GIBDO
+    gItemIconDonGeroMaskTex,         // ITEM_MASK_DON_GERO
+    gItemIconKamaroMaskTex,          // ITEM_MASK_KAMARO
+    gItemIconCaptainsHatTex,         // ITEM_MASK_CAPTAIN
+    gItemIconStoneMaskTex,           // ITEM_MASK_STONE
+    gItemIconBremenMaskTex,          // ITEM_MASK_BREMEN
+    gItemIconBlastMaskTex,           // ITEM_MASK_BLAST
+    gItemIconMaskOfScentsTex,        // ITEM_MASK_SCENTS
+    gItemIconGiantsMaskTex,          // ITEM_MASK_GIANT
+    gItemIconBowFireTex,             // ITEM_BOW_ARROW_FIRE
+    gItemIconBowIceTex,              // ITEM_BOW_ARROW_ICE
+    gItemIconBowLightTex,            // ITEM_BOW_ARROW_LIGHT
+    gItemIconKokiriSwordTex,         // ITEM_SWORD_KOKIRI
+    gItemIconRazorSwordTex,          // ITEM_SWORD_RAZOR
+    gItemIconGildedSwordTex,         // ITEM_SWORD_GILDED
+    gItemIconFierceDeitySwordTex,    // ITEM_SWORD_DEITY
+    gItemIconHerosShieldTex,         // ITEM_SHIELD_HERO
+    gItemIconMirrorShieldTex,        // ITEM_SHIELD_MIRROR
+    gItemIconQuiver30Tex,            // ITEM_QUIVER_30
+    gItemIconQuiver40Tex,            // ITEM_QUIVER_40
+    gItemIconQuiver50Tex,            // ITEM_QUIVER_50
+    gItemIconBombBag20Tex,           // ITEM_BOMB_BAG_20
+    gItemIconBombBag30Tex,           // ITEM_BOMB_BAG_30
+    gItemIconBombBag40Tex,           // ITEM_BOMB_BAG_40
+    gItemIconDefaultWalletTex,       // ITEM_WALLET_DEFAULT
+    gItemIconAdultsWalletTex,        // ITEM_WALLET_ADULT
+    gItemIconGiantsWalletTex,        // ITEM_WALLET_GIANT
+    gItemIconFishingRodTex,          // ITEM_FISHING_ROD
+    gItemIconOdolwasRemainsTex,      // ITEM_REMAINS_ODOLWA
+    gItemIconGohtsRemainsTex,        // ITEM_REMAINS_GOHT
+    gItemIconGyorgsRemainsTex,       // ITEM_REMAINS_GYORG
+    gItemIconTwinmoldsRemainsTex,    // ITEM_REMAINS_TWINMOLD
+    gItemIconSongNoteTex,            // ITEM_SONG_SONATA
+    gItemIconSongNoteTex,            // ITEM_SONG_LULLABY
+    gItemIconSongNoteTex,            // ITEM_SONG_NOVA
+    gItemIconSongNoteTex,            // ITEM_SONG_ELEGY
+    gItemIconSongNoteTex,            // ITEM_SONG_OATH
+    gItemIconSongNoteTex,            // ITEM_SONG_SARIA
+    gItemIconSongNoteTex,            // ITEM_SONG_TIME
+    gItemIconSongNoteTex,            // ITEM_SONG_HEALING
+    gItemIconSongNoteTex,            // ITEM_SONG_EPONA
+    gItemIconSongNoteTex,            // ITEM_SONG_SOARING
+    gItemIconSongNoteTex,            // ITEM_SONG_STORMS
+    gItemIconSongNoteTex,            // ITEM_SONG_SUN
+    gItemIconBombersNotebookTex,     // ITEM_BOMBERS_NOTEBOOK
+    gQuestIconGoldSkulltulaTex,      // ITEM_SKULL_TOKEN
+    gQuestIconHeartContainerTex,     // ITEM_HEART_CONTAINER
+    gQuestIconPieceOfHeartTex,       // ITEM_HEART_PIECE
+    gItemIconSongNoteTex,            //
+    gItemIconSongNoteTex,            //
+    gItemIconSongNoteTex,            // ITEM_SONG_LULLABY_INTRO
+    gQuestIconBossKeyTex,            // ITEM_KEY_BOSS
+    gQuestIconDungeonMapTex,         // ITEM_COMPASS
+    gQuestIconCompassTex,            // ITEM_DUNGEON_MAP
+    gQuestIconGoldSkulltula2Tex,     // ITEM_STRAY_FAIRIES
+    gQuestIconSmallKeyTex,           // ITEM_KEY_SMALL
+    gQuestIconSmallMagicJarTex,      // ITEM_MAGIC_SMALL
+    gQuestIconBigMagicJarTex,        // ITEM_MAGIC_LARGE
+    gItemIconHeartPiece1Tex,         // ITEM_HEART_PIECE_2
+    gItemIconHeartPiece2Tex,         // ITEM_INVALID_1
+    gItemIconHeartPiece3Tex,         // ITEM_INVALID_2
+    gOcarinaCUpTex,                  // ITEM_INVALID_3
+    gOcarinaCDownTex,                // ITEM_INVALID_4
+    gOcarinaCLeftTex,                // ITEM_INVALID_5
+    gOcarinaCRightTex,               // ITEM_INVALID_6
+    gOcarinaATex,                    // ITEM_INVALID_7
 };
 
 // Used to map item IDs to inventory slots
@@ -273,7 +273,7 @@ u8 gItemSlots[] = {
     SLOT_BOTTLE_1,           // ITEM_CHATEAU
     SLOT_BOTTLE_1,           // ITEM_HYLIAN_LOACH
     SLOT_BOTTLE_1,           // ITEM_OBABA_DRINK
-    SLOT_TRADE_DEED,         // ITEM_MOON_TEAR
+    SLOT_TRADE_DEED,         // ITEM_MOONS_TEAR
     SLOT_TRADE_DEED,         // ITEM_DEED_LAND
     SLOT_TRADE_DEED,         // ITEM_DEED_SWAMP
     SLOT_TRADE_DEED,         // ITEM_DEED_MOUNTAIN
@@ -353,7 +353,7 @@ s16 gItemPrices[] = {
     200, // ITEM_CHATEAU
     20,  // ITEM_HYLIAN_LOACH
     0,   // ITEM_OBABA_DRINK
-    0,   // ITEM_MOON_TEAR
+    0,   // ITEM_MOONS_TEAR
     0,   // ITEM_DEED_LAND
     0,   // ITEM_DEED_SWAMP
     0,   // ITEM_DEED_MOUNTAIN
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index e6a814e2a..43b9c35b5 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -313,7 +313,7 @@ static DrawItemTableEntry sDrawItemTable[] = {
     { GetItem_DrawOpa0Xlu1, { gGiRedPotionBottleEmptyDL, gGiRedPotionBottleDL } },
     // GID_ZORA_EGG, OBJECT_GI_BOTTLE_15
     { GetItem_DrawOpa0Xlu1, { gGiZoraEggBottleContentsDL, gGiZoraEggBottleGlassAndCorkDL } },
-    // GID_MOON_TEAR, OBJECT_GI_RESERVE00
+    // GID_MOONS_TEAR, OBJECT_GI_RESERVE00
     { GetItem_DrawMoonsTear, { gGiMoonsTearItemDL, gGiMoonsTearGlowDL } },
     // GID_DEED_LAND, OBJECT_GI_RESERVE01
     { GetItem_DrawOpa01, { gGiTitleDeedEmptyDL, gGiTitleDeedLandColorDL } },
@@ -344,7 +344,7 @@ static DrawItemTableEntry sDrawItemTable[] = {
     // GID_SWORD_GILDED, OBJECT_GI_SWORD_3
     { GetItem_DrawOpa01, { gGiGildedSwordDL, gGiGildedSwordEmptyDL } },
     // GID_SWORD_GREAT_FAIRY, OBJECT_GI_SWORD_4
-    { GetItem_DrawOpa0Xlu1, { gGiGreatFairySwordBladeDL, gGiGreatFairySwordHiltEmblemDL } },
+    { GetItem_DrawOpa0Xlu1, { gGiGreatFairysSwordBladeDL, gGiGreatFairysSwordHiltEmblemDL } },
     // GID_MASK_GARO, OBJECT_GI_MASK09
     { GetItem_DrawOpa0Xlu1, { gGiGarosMaskCloakDL, gGiGarosMaskFaceDL } },
     // GID_MASK_GREAT_FAIRY, OBJECT_GI_MASK14
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index e2b54a9bf..75112a6b5 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -57,7 +57,7 @@ u16 QuestHint_GetTatlTextId(PlayState* play) {
         return 0;
     }
 
-    if (INV_CONTENT(ITEM_MOON_TEAR) == ITEM_MOON_TEAR) {
+    if (INV_CONTENT(ITEM_MOONS_TEAR) == ITEM_MOONS_TEAR) {
         if (CHECK_WEEKEVENTREG(WEEKEVENTREG_86_04)) {
             return 0x242;
         }
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index fe5ade1d2..c6a086276 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "z64snap.h"
 #include "z64view.h"
+#include "archives/icon_item_static/icon_item_static_yar.h"
 #include "interface/parameter_static/parameter_static.h"
 #include "interface/do_action_static/do_action_static.h"
 #include "misc/story_static/story_static.h"
@@ -8,8 +9,6 @@
 #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
 #include "overlays/actors/ovl_En_Mm3/z_en_mm3.h"
 
-extern TexturePtr D_08095AC0; // gMagicArrowEquipEffectTex
-
 typedef enum {
     /* 0 */ PICTO_BOX_STATE_OFF,         // Not using the pictograph
     /* 1 */ PICTO_BOX_STATE_LENS,        // Looking through the lens of the pictograph
@@ -2057,7 +2056,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
                 } else {
                     // End of special item cases. Apply restrictions to buttons
                     if (interfaceCtx->restrictions.tradeItems != 0) {
-                        if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) &&
+                        if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
                              (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) ||
                             ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
                              (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) ||
@@ -2068,7 +2067,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
                             gSaveContext.buttonStatus[i] = BTN_DISABLED;
                         }
                     } else if (interfaceCtx->restrictions.tradeItems == 0) {
-                        if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) &&
+                        if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
                              (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) ||
                             ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
                              (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) ||
@@ -2115,7 +2114,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
                     }
 
                     if (interfaceCtx->restrictions.all != 0) {
-                        if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) &&
+                        if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
                               (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) &&
                             !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
                               (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) &&
@@ -2130,7 +2129,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
                             }
                         }
                     } else if (interfaceCtx->restrictions.all == 0) {
-                        if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) &&
+                        if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
                               (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) &&
                             !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
                               (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) &&
@@ -2899,10 +2898,10 @@ u8 Item_Give(PlayState* play, u8 item) {
             }
         }
 
-    } else if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_MASK_GIANT)) {
+    } else if ((item >= ITEM_MOONS_TEAR) && (item <= ITEM_MASK_GIANT)) {
         temp = INV_CONTENT(item);
         INV_CONTENT(item) = item;
-        if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_PENDANT_OF_MEMORIES) && (temp != ITEM_NONE)) {
+        if ((item >= ITEM_MOONS_TEAR) && (item <= ITEM_PENDANT_OF_MEMORIES) && (temp != ITEM_NONE)) {
             for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
                 if (temp == GET_CUR_FORM_BTN_ITEM(i)) {
                     SET_CUR_FORM_BTN_ITEM(i, item);
@@ -3066,7 +3065,7 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
                 }
             }
         }
-    } else if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_MASK_GIANT)) {
+    } else if ((item >= ITEM_MOONS_TEAR) && (item <= ITEM_MASK_GIANT)) {
         return ITEM_NONE;
     }
 
@@ -4295,7 +4294,7 @@ void Interface_DrawPauseMenuEquippingIcons(PlayState* play) {
             }
 
             gSPVertex(OVERLAY_DISP++, &pauseCtx->cursorVtx[16], 4, 0);
-            gDPLoadTextureBlock(OVERLAY_DISP++, &D_08095AC0, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
+            gDPLoadTextureBlock(OVERLAY_DISP++, gMagicArrowEquipEffectTex, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
                                 G_TX_NOLOD, G_TX_NOLOD);
         }
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 4654158f9..abab2f560 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -695,7 +695,7 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
     PLAYER_MODELGROUP_BOTTLE,         // PLAYER_IA_BOTTLE_MILK_HALF
     PLAYER_MODELGROUP_BOTTLE,         // PLAYER_IA_BOTTLE_CHATEAU
     PLAYER_MODELGROUP_BOTTLE,         // PLAYER_IA_BOTTLE_FAIRY
-    PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_MOON_TEAR
+    PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_MOONS_TEAR
     PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_DEED_LAND
     PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_ROOM_KEY
     PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_LETTER_TO_KAFEI
diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c
index 79f2d7043..4da2f6963 100644
--- a/src/code/z_sram_NES.c
+++ b/src/code/z_sram_NES.c
@@ -608,7 +608,7 @@ void Sram_SaveEndOfCycle(PlayState* play) {
     Inventory_DeleteItem(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
 
     for (j = EQUIP_SLOT_C_LEFT; j <= EQUIP_SLOT_C_RIGHT; j++) {
-        if (GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOON_TEAR && GET_CUR_FORM_BTN_ITEM(j) <= ITEM_PENDANT_OF_MEMORIES) {
+        if (GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOONS_TEAR && GET_CUR_FORM_BTN_ITEM(j) <= ITEM_PENDANT_OF_MEMORIES) {
             SET_CUR_FORM_BTN_ITEM(j, ITEM_NONE);
             Interface_LoadItemIconImpl(play, j);
         }
@@ -907,7 +907,7 @@ Inventory sSaveDebugInventory = {
         ITEM_ARROW_FIRE,
         ITEM_ARROW_ICE,
         ITEM_ARROW_LIGHT,
-        ITEM_MOON_TEAR,
+        ITEM_MOONS_TEAR,
         ITEM_BOMB,
         ITEM_BOMBCHU,
         ITEM_STICK,