Merge remote-tracking branch 'upstream/master' into Aliens

4 files changed, 104 insertions, 0 deletions

diff --git a/assets/xml/interface/icon_item_dungeon_static.xml b/assets/xml/interface/icon_item_dungeon_static.xml
new file mode 100644
index 000000000..04ba39338
--- /dev/null
+++ b/assets/xml/interface/icon_item_dungeon_static.xml
@@ -0,0 +1,32 @@
+<Root>
+    <!-- Assets for dungeon icons -->
+    <File Name="icon_item_dungeon_static" Segment="12">
+        <!-- Identical icons to OoT -->
+        <Texture Name="gDungeonMapBlankFloorButtonTex" OutName="dungeon_map_blank_floor_button" Format="ia8" Width="24" Height="16" Offset="0x0"/>
+        <Texture Name="gDungeonMap1FButtonTex" OutName="dungeon_map_1f_button" Format="ia8" Width="24" Height="16" Offset="0x180"/>
+        <Texture Name="gDungeonMap2FButtonTex" OutName="dungeon_map_2f_button" Format="ia8" Width="24" Height="16" Offset="0x300"/>
+        <Texture Name="gDungeonMap3FButtonTex" OutName="dungeon_map_3f_button" Format="ia8" Width="24" Height="16" Offset="0x480"/>
+        <Texture Name="gDungeonMap4FButtonTex" OutName="dungeon_map_4f_button" Format="ia8" Width="24" Height="16" Offset="0x600"/>
+        <Texture Name="gDungeonMap5FButtonTex" OutName="dungeon_map_5f_button" Format="ia8" Width="24" Height="16" Offset="0x780"/>
+        <Texture Name="gDungeonMap6FButtonTex" OutName="dungeon_map_6f_button" Format="ia8" Width="24" Height="16" Offset="0x900"/>
+        <Texture Name="gDungeonMap7FButtonTex" OutName="dungeon_map_7f_button" Format="ia8" Width="24" Height="16" Offset="0xA80"/>
+        <Texture Name="gDungeonMap8FButtonTex" OutName="dungeon_map_8f_button" Format="ia8" Width="24" Height="16" Offset="0xC00"/>
+        <Texture Name="gDungeonMapB1ButtonTex" OutName="dungeon_map_b1_button" Format="ia8" Width="24" Height="16" Offset="0xD80"/>
+        <Texture Name="gDungeonMapB2ButtonTex" OutName="dungeon_map_b2_button" Format="ia8" Width="24" Height="16" Offset="0xF00"/>
+        <Texture Name="gDungeonMapB3ButtonTex" OutName="dungeon_map_b3_button" Format="ia8" Width="24" Height="16" Offset="0x1080"/>
+        <Texture Name="gDungeonMapB4ButtonTex" OutName="dungeon_map_b4_button" Format="ia8" Width="24" Height="16" Offset="0x1200"/>
+        <Texture Name="gDungeonMapB5ButtonTex" OutName="dungeon_map_b5_button" Format="ia8" Width="24" Height="16" Offset="0x1380"/>
+        <Texture Name="gDungeonMapB6ButtonTex" OutName="dungeon_map_b6_button" Format="ia8" Width="24" Height="16" Offset="0x1500"/>
+        <Texture Name="gDungeonMapB7ButtonTex" OutName="dungeon_map_b7_button" Format="ia8" Width="24" Height="16" Offset="0x1680"/>
+        <Texture Name="gDungeonMapB8ButtonTex" OutName="dungeon_map_b8_button" Format="ia8" Width="24" Height="16" Offset="0x1800"/>
+        
+        <!-- Skull has a slightly altered design compared to OoT -->
+        <Texture Name="gDungeonMapSkullTex" OutName="dungeon_map_skull" Format="rgba16" Width="16" Height="16" Offset="0x1980"/>
+
+        <!-- Similar to stray fairy icons in parameter_static, except facing forward -->
+        <Texture Name="gDungeonStrayFairyWoodfallIconTex" OutName="dungeon_stray_fairy_woodfall_icon" Format="rgba32" Width="32" Height="24" Offset="0x1B80"/>
+        <Texture Name="gDungeonStrayFairySnowheadIconTex" OutName="dungeon_stray_fairy_snowhead_icon" Format="rgba32" Width="32" Height="24" Offset="0x2780"/>
+        <Texture Name="gDungeonStrayFairyGreatBayIconTex" OutName="dungeon_stray_fairy_great_bay_icon" Format="rgba32" Width="32" Height="24" Offset="0x3380"/>
+        <Texture Name="gDungeonStrayFairyStoneTowerIconTex" OutName="dungeon_stray_fairy_stone_tower_icon" Format="rgba32" Width="32" Height="24" Offset="0x3F80"/>
+    </File>
+</Root>
diff --git a/assets/xml/interface/icon_item_field_static.xml b/assets/xml/interface/icon_item_field_static.xml
new file mode 100644
index 000000000..8fe3a9299
--- /dev/null
+++ b/assets/xml/interface/icon_item_field_static.xml
@@ -0,0 +1,40 @@
+<Root>
+    <!-- Assets for the world map -->
+    <File Name="icon_item_field_static" Segment="12">
+        <!-- World map itself -->
+        <Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0" TlutOffset="0x6C00"/>
+        <Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
+
+        <!-- Identical To OoT -->
+        <Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
+        <Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>
+        <Texture Name="gWorldMapAreaBox2Tex" OutName="world_map_area_box_2" Format="ia4" Width="48" Height="38" Offset="0x6F70"/>
+        <Texture Name="gWorldMapAreaBox3Tex" OutName="world_map_area_box_3" Format="ia4" Width="32" Height="17" Offset="0x7300"/>
+        <Texture Name="gWorldMapAreaBox4Tex" OutName="world_map_area_box_4" Format="ia4" Width="32" Height="13" Offset="0x7410"/>
+        <Texture Name="gWorldMapAreaBox5Tex" OutName="world_map_area_box_5" Format="ia4" Width="32" Height="26" Offset="0x74E0"/>
+        <Texture Name="gWorldMapAreaBox6Tex" OutName="world_map_area_box_6" Format="ia4" Width="48" Height="19" Offset="0x7680"/>
+        <Texture Name="gWorldMapAreaBox7Tex" OutName="world_map_area_box_7" Format="ia4" Width="96" Height="59" Offset="0x7848"/>
+        <Texture Name="gWorldMapAreaBox8Tex" OutName="world_map_area_box_8" Format="ia4" Width="16" Height="16" Offset="0x8358"/>
+        <Texture Name="gWorldMapArrowTex" OutName="world_map_arrow" Format="ia8" Width="8" Height="8" Offset="0x83D8"/>
+
+        <!-- Cloud cover based on tingle maps -->
+        <Texture Name="gWorldMapClockTownCloud1Tex" OutName="world_map_clock_town_cloud_1" Format="ia8" Width="80" Height="40" Offset="0x8418"/>
+        <Texture Name="gWorldMapClockTownCloud2Tex" OutName="world_map_clock_town_cloud_2" Format="ia8" Width="64" Height="31" Offset="0x9098"/>
+        <Texture Name="gWorldMapRomaniRanchCloudTex" OutName="world_map_romani_ranch_cloud" Format="ia8" Width="48" Height="32" Offset="0x9858"/>
+        <Texture Name="gWorldMapGreatBayCloud1Tex" OutName="world_map_great_bay_cloud_1" Format="ia8" Width="64" Height="64" Offset="0x9E58"/>
+        <Texture Name="gWorldMapGreatBayCloud2Tex" OutName="world_map_great_bay_cloud_2" Format="ia8" Width="64" Height="64" Offset="0xAE58"/>
+        <Texture Name="gWorldMapGreatBayCloud3Tex" OutName="world_map_great_bay_cloud_3" Format="ia8" Width="64" Height="64" Offset="0xBE58"/>
+        <Texture Name="gWorldMapGreatBayCloud4Tex" OutName="world_map_great_bay_cloud_4" Format="ia8" Width="64" Height="64" Offset="0xCE58"/>
+        <Texture Name="gWorldMapSnowheadCloud1Tex" OutName="world_map_snowhead_cloud_1" Format="ia8" Width="64" Height="52" Offset="0xDE58"/>
+        <Texture Name="gWorldMapSnowheadCloud2Tex" OutName="world_map_snowhead_cloud_2" Format="ia8" Width="112" Height="35" Offset="0xEB58"/>
+        <Texture Name="gWorldMapSnowheadCloud3Tex" OutName="world_map_snowhead_cloud_3" Format="ia8" Width="112" Height="35" Offset="0xFAA8"/>
+        <Texture Name="gWorldMapStoneTowerCloud1Tex" OutName="world_map_stone_tower_cloud_1" Format="ia8" Width="48" Height="82" Offset="0x109F8"/>
+        <Texture Name="gWorldMapStoneTowerCloud2Tex" OutName="world_map_stone_tower_cloud_2" Format="ia8" Width="64" Height="61" Offset="0x11958"/>
+        <Texture Name="gWorldMapWoodfallCloud1Tex" OutName="world_map_woodfall_cloud_1" Format="ia8" Width="64" Height="53" Offset="0x12898"/>
+        <Texture Name="gWorldMapWoodfallCloud2Tex" OutName="world_map_woodfall_cloud_2" Format="ia8" Width="64" Height="53" Offset="0x135D8"/>
+        <Texture Name="gWorldMapWoodfallCloud3Tex" OutName="world_map_woodfall_cloud_3" Format="ia8" Width="16" Height="53" Offset="0x14318"/>
+
+        <!-- Face of an owl to indicate warp points -->
+        <Texture Name="gWorldMapOwlFaceTex" OutName="world_map_owl_face" Format="rgba32" Width="24" Height="12" Offset="0x14668"/>
+    </File>
+</Root>
diff --git a/assets/xml/interface/icon_item_jpn_static.xml b/assets/xml/interface/icon_item_jpn_static.xml
new file mode 100644
index 000000000..aff93d07e
--- /dev/null
+++ b/assets/xml/interface/icon_item_jpn_static.xml
@@ -0,0 +1,31 @@
+<Root>
+    <!-- Pause Menu: Language-Dependent Textures -->
+    <File Name="icon_item_jpn_static" Segment="13">
+        <!-- Pause Menu Dungeon Title Cards -->
+        <Texture Name="gPauseWoodfallTitleENGTex" OutName="pause_woodfall_title_eng" Format="ia8" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseSnowheadTitleENGTex" OutName="pause_snowhead_title_eng" Format="ia8" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gPauseGreatBayTitleENGTex" OutName="pause_great_bay_title_eng" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gPauseStoneTowerTitleENGTex" OutName="pause_stone_tower_title_eng" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
+
+        <!-- Pause Menu Info Panel To-> Textures -->
+        <Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia4" Width="64" Height="16" Offset="0x2000"/>
+        <Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia4" Width="64" Height="16" Offset="0x2200"/>
+        <Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia4" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia4" Width="128" Height="16" Offset="0x2700"/>
+        <Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia4" Width="128" Height="16" Offset="0x2B00"/>
+        <Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia4" Width="128" Height="16" Offset="0x2F00"/>
+        <Texture Name="gPauseToMasksENGTex" OutName="pause_to_masks_eng" Format="ia4" Width="128" Height="16" Offset="0x3300"/>
+        <Texture Name="gPauseToViewNotebookENGTex" OutName="pause_to_view_notebook_eng" Format="ia4" Width="96" Height="16" Offset="0x3700"/>
+
+        <!-- Pause Menu Pages Background Textures -->
+        <!-- Divided into 3 columns (first digit) and 5 rows (second digit) -->
+        <Texture Name="gPauseMasks10ENGTex" OutName="pause_masks_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x3A00"/>
+        <Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x4400"/>
+        <Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x4E00"/>
+        <Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0x5800"/>
+        <Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x6200"/>
+        <Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x6C00"/>
+        <Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x7600"/>
+        <Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8000"/>
+    </File>
+</Root>
diff --git a/assets/xml/interface/parameter_static.xml b/assets/xml/interface/parameter_static.xml
index 7532a95b8..e5e0808c0 100644
--- a/assets/xml/interface/parameter_static.xml
+++ b/assets/xml/interface/parameter_static.xml
@@ -127,6 +127,7 @@
         <Texture Name="gMinigameLetterTTex" OutName="minigame_letter_t" Format="i4" Width="32" Height="33" Offset="0x8578"/>
         <Texture Name="gMinigameExclamationTex" OutName="minigame_exclamation" Format="i4" Width="32" Height="33" Offset="0x8788"/>
 
+        <!-- Similar to stray fairy icons in icon_item_dungeon_static, except with a turned head -->
         <Texture Name="gStrayFairyWoodfallIconTex" OutName="stray_fairy_woodfall_icon" Format="rgba32" Width="32" Height="24" Offset="0x8998"/>
         <Texture Name="gStrayFairySnowheadIconTex" OutName="stray_fairy_snowhead_icon" Format="rgba32" Width="32" Height="24" Offset="0x9598"/>
         <Texture Name="gStrayFairyGreatBayIconTex" OutName="stray_fairy_great_bay_icon" Format="rgba32" Width="32" Height="24" Offset="0xA198"/>