From aa9e368561ae13106daa14da4e2bf0656bfc70da Mon Sep 17 00:00:00 2001
From: engineer124 <47598039+engineer124@users.noreply.github.com>
Date: Sat, 24 Jun 2023 00:57:01 +1000
Subject: `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>
---
 assets/xml/objects/object_gi_sword_4.xml | 16 ++++++++--------
 assets/xml/objects/object_thiefbird.xml  |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'assets/xml/objects')

diff --git a/assets/xml/objects/object_gi_sword_4.xml b/assets/xml/objects/object_gi_sword_4.xml
index 7732259c6..082c27e2a 100644
--- a/assets/xml/objects/object_gi_sword_4.xml
+++ b/assets/xml/objects/object_gi_sword_4.xml
@@ -1,14 +1,14 @@
 <Root>
-    <!-- Get Item Draw: Great Fairy Sword -->
+    <!-- Get Item Draw: Great Fairys Sword -->
     <File Name="object_gi_sword_4" Segment="6">
         
-        <!-- Great Fairy Sword Display Lists -->
-        <DList Name="gGiGreatFairySwordHiltEmblemDL" Offset="0x940" /> <!-- The leafy hilt and the green emblem on the blade -->
-        <DList Name="gGiGreatFairySwordBladeDL" Offset="0xAD8" />
+        <!-- Great Fairys Sword Display Lists -->
+        <DList Name="gGiGreatFairysSwordHiltEmblemDL" Offset="0x940" /> <!-- The leafy hilt and the green emblem on the blade -->
+        <DList Name="gGiGreatFairysSwordBladeDL" Offset="0xAD8" />
 
-        <!-- Great Fairy Sword Textures -->
-        <Texture Name="gGiGreatFairySwordLeafPatternTex" OutName="gi_great_fairy_sword_leaf_pattern" Format="ia8" Width="32" Height="32" Offset="0xE58" />
-        <Texture Name="gGiGreatFairySwordBladeTex" OutName="gi_great_fairy_sword_blade" Format="i8" Width="16" Height="16" Offset="0x1258" />
-        <Texture Name="gGiGreatFairySwordEmblemBackgroundTex" OutName="gi_great_fairy_sword_emblem_background" Format="i8" Width="16" Height="16" Offset="0x1358" />
+        <!-- Great Fairys Sword Textures -->
+        <Texture Name="gGiGreatFairysSwordLeafPatternTex" OutName="gi_great_fairys_sword_leaf_pattern" Format="ia8" Width="32" Height="32" Offset="0xE58" />
+        <Texture Name="gGiGreatFairysSwordBladeTex" OutName="gi_great_fairys_sword_blade" Format="i8" Width="16" Height="16" Offset="0x1258" />
+        <Texture Name="gGiGreatFairysSwordEmblemBackgroundTex" OutName="gi_great_fairys_sword_emblem_background" Format="i8" Width="16" Height="16" Offset="0x1358" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_thiefbird.xml b/assets/xml/objects/object_thiefbird.xml
index 5a4cec335..52165cb89 100644
--- a/assets/xml/objects/object_thiefbird.xml
+++ b/assets/xml/objects/object_thiefbird.xml
@@ -40,13 +40,13 @@
         
         <!-- DisplayLists for stolen items -->
         <DList Name="gTakkuriStolenBottleDL" Offset="0x33B0" />
-        <DList Name="gTakkuriStolenGreatFairySwordDL" Offset="0x3D58" />
+        <DList Name="gTakkuriStolenGreatFairysSwordDL" Offset="0x3D58" />
         <DList Name="gTakkuriStolenKokiriSwordDL" Offset="0x4348" />
         <DList Name="gTakkuriStolenRazorSwordDL" Offset="0x4B88" />
         <DList Name="gTakkuriStolenGildedSwordDL" Offset="0x55E0" />
 
         <!-- Textures for stolen items -->
-        <Texture Name="gTakkuriStolenGreatFairySwordCenterAndHiltTex" OutName="takkuri_stolen_great_fairy_sword_center_and_hilt" Format="rgba16" Width="32" Height="8" Offset="0x59A0" />
+        <Texture Name="gTakkuriStolenGreatFairysSwordCenterAndHiltTex" OutName="takkuri_stolen_great_fairys_sword_center_and_hilt" Format="rgba16" Width="32" Height="8" Offset="0x59A0" />
         <Texture Name="gTakkuriStolenKokiriSwordPommelTex" OutName="takkuri_stolen_kokiri_sword_pommel" Format="rgba16" Width="8" Height="8" Offset="0x5BA0" />
         <Texture Name="gTakkuriStolenKokiriAndRazorSwordScabbardTex" OutName="takkuri_stolen_kokiri_and_razor_sword_scabbard" Format="rgba16" Width="8" Height="8" Offset="0x5C20" />
         <Texture Name="gTakkuriStolenKokiriSwordGuardTex" OutName="takkuri_stolen_kokiri_sword_guard" Format="rgba16" Width="8" Height="8" Offset="0x5CA0" />
@@ -55,7 +55,7 @@
         <Texture Name="gTakkuriStolenGildedSwordScabbardTex" OutName="takkuri_stolen_gilded_sword_scabbard" Format="rgba16" Width="8" Height="16" Offset="0x5E60" />
         <Texture Name="gTakkuriStolenGildedSwordGripAndScabbardTopTex" OutName="takkuri_stolen_gilded_sword_grip_and_scabbard_top" Format="rgba16" Width="8" Height="8" Offset="0x5F60" />
         <Texture Name="gTakkuriStolenBottleAndGildedSwordGemTex" OutName="takkuri_stolen_bottle_and_gilded_sword_gem" Format="i8" Width="8" Height="8" Offset="0x5FE0" />
-        <Texture Name="gTakkuriStolenGreatFairySwordBladeGildedSwordPommelAndGuardTex" OutName="takkuri_stolen_great_fairy_sword_blade_gilded_sword_pommel_and_guard" Format="i4" Width="16" Height="16" Offset="0x6020" />
+        <Texture Name="gTakkuriStolenGreatFairysSwordBladeGildedSwordPommelGuardTex" OutName="takkuri_stolen_great_fairys_sword_blade_gilded_sword_pommel_guard" Format="i4" Width="16" Height="16" Offset="0x6020" />
 
         <!-- Takkuri Limbs -->
         <Limb Name="gTakkuriBodyLimb" Type="Standard" EnumName="TAKKURI_LIMB_BODY" Offset="0x60A0" />
-- 
cgit v1.2.3