diff --git a/Android/app/src/main/assets/.gitignore b/Android/app/src/main/assets/.gitignore
new file mode 100644
index 000000000..8df920084
--- /dev/null
+++ b/Android/app/src/main/assets/.gitignore
@@ -0,0 +1,3 @@
+# Extractor Assets Copied by CMake during buildtime
+assets/
+2ship.o2r
diff --git a/Android/app/src/main/assets/assets/extractor/Config_GC_US.xml b/Android/app/src/main/assets/assets/extractor/Config_GC_US.xml
deleted file mode 100644
index 673830ebe..000000000
--- a/Android/app/src/main/assets/assets/extractor/Config_GC_US.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <SymbolMap File="symbols/SymbolMap_MM.txt"/>
-    <ActorList File="symbols/ActorList_MM.txt"/>
-    <ObjectList File="symbols/ObjectList_MM.txt"/>
-    <EnumData File="EnumData.xml"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/GC_US/"/>
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/Config_N64_US.xml b/Android/app/src/main/assets/assets/extractor/Config_N64_US.xml
deleted file mode 100644
index 3dce01df6..000000000
--- a/Android/app/src/main/assets/assets/extractor/Config_N64_US.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <SymbolMap File="symbols/SymbolMap_MM.txt"/>
-    <ActorList File="symbols/ActorList_MM.txt"/>
-    <ObjectList File="symbols/ObjectList_MM.txt"/>
-    <EnumData File="EnumData.xml"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/N64_US/"/>
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/EnumData.xml b/Android/app/src/main/assets/assets/extractor/EnumData.xml
deleted file mode 100644
index 2ade5b346..000000000
--- a/Android/app/src/main/assets/assets/extractor/EnumData.xml
+++ /dev/null
@@ -1,718 +0,0 @@
-<Root>
-<!-- 
-    Description:
-        This file hosts various enum data from decomp.
-
-    Format:
-        - <Enum>: a list of <Item> with an unique identifier (key), the decomp ID and the index
-            Parameters:
-            * Games: list of OoT versions that shares this data
-            * Key: identifier, the name is the same as the enum from decomp
-        - <Item>: description of an element of an <Enum>
-            Parameters:
-            * Key: identifier that should never be changed
-            * ID: the actual enum name from decomp, this may change hence the need of the Key parameter
-            * Name: a descriptive name about the current item
-            * Index: the location of the item in the enum (should match decomp)
-
-    Notes:
-        - Player Cue Ids got their own enum but not regular Actor Cues.
-          This is because Actor Cues are among cutscene commands (``csCmd``)
--->
-    <Enum Games="MM" Key="fadeOutSeqPlayer" ID="CutsceneFadeOutSeqPlayer">
-        <!-- https://github.com/zeldaret/mm/blob/df800c74aecfb6b89ee976df8a2f11451f295e37/include/z64cutscene.h#L77-L80 -->
-        <Item Key="fade_out_bgm_main" ID="CS_FADE_OUT_BGM_MAIN" Index="1"/>
-        <Item Key="fade_out_fanfare" ID="CS_FADE_OUT_FANFARE" Index="2"/>
-    </Enum>
-    <Enum Games="MM" Key="modifySeqType" ID="CsModifySeqType">
-        <!-- https://github.com/zeldaret/mm/blob/df800c74aecfb6b89ee976df8a2f11451f295e37/include/z64cutscene.h#L109-L118 -->
-        <Item Key="mod_seq_0" ID="CS_MOD_SEQ_0" Index="1"/>
-        <Item Key="mod_seq_1" ID="CS_MOD_SEQ_1" Index="2"/>
-        <Item Key="mod_seq_2" ID="CS_MOD_SEQ_2" Index="3"/>
-        <Item Key="mod_ambience_0" ID="CS_MOD_AMBIENCE_0" Index="4"/>
-        <Item Key="mod_ambience_1" ID="CS_MOD_AMBIENCE_1" Index="5"/>
-        <Item Key="mod_ambience_2" ID="CS_MOD_AMBIENCE_2" Index="6"/>
-        <Item Key="mod_seq_store" ID="CS_MOD_SEQ_STORE" Index="7"/>
-        <Item Key="mod_seq_restore" ID="CS_MOD_SEQ_RESTORE" Index="8"/>
-    </Enum>
-    <Enum Games="MM" Key="destinationType" ID="CsDestinationType">
-        <!-- https://github.com/zeldaret/mm/blob/df800c74aecfb6b89ee976df8a2f11451f295e37/include/z64cutscene.h#L129-L132 -->
-        <Item Key="destination_default" ID="CS_DESTINATION_DEFAULT" Index="1"/>
-        <Item Key="destination_boss_warp" ID="CS_DESTINATION_BOSS_WARP" Index="2"/>
-    </Enum>
-    <Enum Games="MM" Key="chooseCreditsSceneType" ID="CsChooseCreditsSceneType">
-        <!-- https://github.com/zeldaret/mm/blob/df800c74aecfb6b89ee976df8a2f11451f295e37/include/z64cutscene.h#L143-L155 -->
-        <Item Key="credits_destination" ID="CS_CREDITS_DESTINATION" Index="1"/>
-        <Item Key="credits_mask_kamaro" ID="CS_CREDITS_MASK_KAMARO" Index="2"/>
-        <Item Key="credits_mask_great_fairy" ID="CS_CREDITS_MASK_GREAT_FAIRY" Index="3"/>
-        <Item Key="credits_mask_romani" ID="CS_CREDITS_MASK_ROMANI" Index="4"/>
-        <Item Key="credits_mask_blast" ID="CS_CREDITS_MASK_BLAST" Index="5"/>
-        <Item Key="credits_mask_circus_leader" ID="CS_CREDITS_MASK_CIRCUS_LEADER" Index="6"/>
-        <Item Key="credits_mask_bremen" ID="CS_CREDITS_MASK_BREMEN" Index="7"/>
-        <Item Key="credits_mask_ikana" ID="CS_CREDITS_IKANA" Index="8"/>
-        <Item Key="credits_mask_couple" ID="CS_CREDITS_MASK_COUPLE" Index="9"/>
-        <Item Key="credits_mask_bunny" ID="CS_CREDITS_MASK_BUNNY" Index="10"/>
-        <Item Key="credits_mask_postman" ID="CS_CREDITS_MASK_POSTMAN" Index="11"/>
-    </Enum>
-    <Enum Games="MM" Key="motionBlurType" ID="CsMotionBlurType">
-        <!-- https://github.com/zeldaret/mm/blob/df800c74aecfb6b89ee976df8a2f11451f295e37/include/z64cutscene.h#L166-L169 -->
-        <Item Key="motion_blur_enable" ID="CS_MOTION_BLUR_ENABLE" Index="1"/>
-        <Item Key="motion_blur_disable" ID="CS_MOTION_BLUR_DISABLE" Index="2"/>
-    </Enum>
-    <Enum Games="MM" Key="transitionType" ID="CutsceneTransitionType">
-        <!-- https://github.com/zeldaret/mm/blob/df800c74aecfb6b89ee976df8a2f11451f295e37/include/z64cutscene.h#L198-L212 -->
-        <Item Key="gray_fill_in" ID="CS_TRANS_GRAY_FILL_IN" Index="1"/>
-        <Item Key="blue_fill_in" ID="CS_TRANS_BLUE_FILL_IN" Index="2"/>
-        <Item Key="red_fill_out" ID="CS_TRANS_RED_FILL_OUT" Index="3"/>
-        <Item Key="green_fill_out" ID="CS_TRANS_GREEN_FILL_OUT" Index="4"/>
-        <Item Key="gray_fill_out" ID="CS_TRANS_GRAY_FILL_OUT" Index="5"/>
-        <Item Key="blue_fill_out" ID="CS_TRANS_BLUE_FILL_OUT" Index="6"/>
-        <Item Key="red_fill_in" ID="CS_TRANS_RED_FILL_IN" Index="7"/>
-        <Item Key="green_fill_in" ID="CS_TRANS_GREEN_FILL_IN" Index="8"/>
-        <Item Key="trigger_instance" ID="CS_TRANS_TRIGGER_INSTANCE" Index="9"/>
-        <Item Key="black_fill_out" ID="CS_TRANS_BLACK_FILL_OUT" Index="10"/>
-        <Item Key="black_fill_in" ID="CS_TRANS_BLACK_FILL_IN" Index="11"/>
-        <Item Key="gray_to_black" ID="CS_TRANS_GRAY_TO_BLACK" Index="12"/>
-        <Item Key="black_to_gray" ID="CS_TRANS_BLACK_TO_GRAY" Index="13"/>
-    </Enum>
-    <Enum Games="MM" Key="rumbleType" ID="CutsceneRumbleType">
-        <!-- https://github.com/zeldaret/mm/blob/df800c74aecfb6b89ee976df8a2f11451f295e37/include/z64cutscene.h#L248-L251 -->
-        <Item Key="rumble_once" ID="CS_RUMBLE_ONCE" Index="1"/>
-        <Item Key="rumble_pulse" ID="CS_RUMBLE_PULSE" Index="2"/>
-    </Enum>
-    <Enum Games="MM" Key="transitionGeneralType" ID="CsTransitionGeneralType">
-        <!-- https://github.com/zeldaret/mm/blob/df800c74aecfb6b89ee976df8a2f11451f295e37/include/z64cutscene.h#L263-L266 -->
-        <Item Key="trans_general_fill_in" ID="CS_TRANS_GENERAL_FILL_IN" Index="1"/>
-        <Item Key="trans_general_fill_out" ID="CS_TRANS_GENERAL_FILL_OUT" Index="2"/>
-    </Enum>
-    <Enum Games="MM" Key="cmd" ID="CutsceneCmd">
-        <!-- https://github.com/zeldaret/mm/blob/df800c74aecfb6b89ee976df8a2f11451f295e37/include/z64cutscene.h#L294-L530 -->
-        <Item Key="actor_cue_post_process" ID="CS_CMD_ACTOR_CUE_POST_PROCESS" Index="-2"/>
-        <Item Key="cs_cam_stop" ID="CS_CAM_STOP" Index="-1"/>
-        <Item Key="text" ID="CS_CMD_TEXT" Index="10"/>
-        <Item Key="camera_spline" ID="CS_CMD_CAMERA_SPLINE" Index="90"/>
-        <Item Key="actor_cue_100" ID="CS_CMD_ACTOR_CUE_100" Index="100"/>
-        <Item Key="actor_cue_101" ID="CS_CMD_ACTOR_CUE_101" Index="101"/>
-        <Item Key="actor_cue_102" ID="CS_CMD_ACTOR_CUE_102" Index="102"/>
-        <Item Key="actor_cue_103" ID="CS_CMD_ACTOR_CUE_103" Index="103"/>
-        <Item Key="actor_cue_104" ID="CS_CMD_ACTOR_CUE_104" Index="104"/>
-        <Item Key="actor_cue_105" ID="CS_CMD_ACTOR_CUE_105" Index="105"/>
-        <Item Key="actor_cue_106" ID="CS_CMD_ACTOR_CUE_106" Index="106"/>
-        <Item Key="actor_cue_107" ID="CS_CMD_ACTOR_CUE_107" Index="107"/>
-        <Item Key="actor_cue_108" ID="CS_CMD_ACTOR_CUE_108" Index="108"/>
-        <Item Key="actor_cue_109" ID="CS_CMD_ACTOR_CUE_109" Index="109"/>
-        <Item Key="actor_cue_110" ID="CS_CMD_ACTOR_CUE_110" Index="110"/>
-        <Item Key="actor_cue_111" ID="CS_CMD_ACTOR_CUE_111" Index="111"/>
-        <Item Key="actor_cue_112" ID="CS_CMD_ACTOR_CUE_112" Index="112"/>
-        <Item Key="actor_cue_113" ID="CS_CMD_ACTOR_CUE_113" Index="113"/>
-        <Item Key="actor_cue_114" ID="CS_CMD_ACTOR_CUE_114" Index="114"/>
-        <Item Key="actor_cue_115" ID="CS_CMD_ACTOR_CUE_115" Index="115"/>
-        <Item Key="actor_cue_116" ID="CS_CMD_ACTOR_CUE_116" Index="116"/>
-        <Item Key="actor_cue_117" ID="CS_CMD_ACTOR_CUE_117" Index="117"/>
-        <Item Key="actor_cue_118" ID="CS_CMD_ACTOR_CUE_118" Index="118"/>
-        <Item Key="actor_cue_119" ID="CS_CMD_ACTOR_CUE_119" Index="119"/>
-        <Item Key="actor_cue_120" ID="CS_CMD_ACTOR_CUE_120" Index="120"/>
-        <Item Key="actor_cue_121" ID="CS_CMD_ACTOR_CUE_121" Index="121"/>
-        <Item Key="actor_cue_122" ID="CS_CMD_ACTOR_CUE_122" Index="122"/>
-        <Item Key="actor_cue_123" ID="CS_CMD_ACTOR_CUE_123" Index="123"/>
-        <Item Key="actor_cue_124" ID="CS_CMD_ACTOR_CUE_124" Index="124"/>
-        <Item Key="actor_cue_125" ID="CS_CMD_ACTOR_CUE_125" Index="125"/>
-        <Item Key="actor_cue_126" ID="CS_CMD_ACTOR_CUE_126" Index="126"/>
-        <Item Key="actor_cue_127" ID="CS_CMD_ACTOR_CUE_127" Index="127"/>
-        <Item Key="actor_cue_128" ID="CS_CMD_ACTOR_CUE_128" Index="128"/>
-        <Item Key="actor_cue_129" ID="CS_CMD_ACTOR_CUE_129" Index="129"/>
-        <Item Key="actor_cue_130" ID="CS_CMD_ACTOR_CUE_130" Index="130"/>
-        <Item Key="actor_cue_131" ID="CS_CMD_ACTOR_CUE_131" Index="131"/>
-        <Item Key="actor_cue_132" ID="CS_CMD_ACTOR_CUE_132" Index="132"/>
-        <Item Key="actor_cue_133" ID="CS_CMD_ACTOR_CUE_133" Index="133"/>
-        <Item Key="actor_cue_134" ID="CS_CMD_ACTOR_CUE_134" Index="134"/>
-        <Item Key="actor_cue_135" ID="CS_CMD_ACTOR_CUE_135" Index="135"/>
-        <Item Key="actor_cue_136" ID="CS_CMD_ACTOR_CUE_136" Index="136"/>
-        <Item Key="actor_cue_137" ID="CS_CMD_ACTOR_CUE_137" Index="137"/>
-        <Item Key="actor_cue_138" ID="CS_CMD_ACTOR_CUE_138" Index="138"/>
-        <Item Key="actor_cue_139" ID="CS_CMD_ACTOR_CUE_139" Index="139"/>
-        <Item Key="actor_cue_140" ID="CS_CMD_ACTOR_CUE_140" Index="140"/>
-        <Item Key="actor_cue_141" ID="CS_CMD_ACTOR_CUE_141" Index="141"/>
-        <Item Key="actor_cue_142" ID="CS_CMD_ACTOR_CUE_142" Index="142"/>
-        <Item Key="actor_cue_143" ID="CS_CMD_ACTOR_CUE_143" Index="143"/>
-        <Item Key="actor_cue_144" ID="CS_CMD_ACTOR_CUE_144" Index="144"/>
-        <Item Key="actor_cue_145" ID="CS_CMD_ACTOR_CUE_145" Index="145"/>
-        <Item Key="actor_cue_146" ID="CS_CMD_ACTOR_CUE_146" Index="146"/>
-        <Item Key="actor_cue_147" ID="CS_CMD_ACTOR_CUE_147" Index="147"/>
-        <Item Key="actor_cue_148" ID="CS_CMD_ACTOR_CUE_148" Index="148"/>
-        <Item Key="actor_cue_149" ID="CS_CMD_ACTOR_CUE_149" Index="149"/>
-        <Item Key="misc" ID="CS_CMD_MISC" Index="150"/>
-        <Item Key="light_setting" ID="CS_CMD_LIGHT_SETTING" Index="151"/>
-        <Item Key="transition" ID="CS_CMD_TRANSITION" Index="152"/>
-        <Item Key="motion_blur" ID="CS_CMD_MOTION_BLUR" Index="153"/>
-        <Item Key="give_tatl" ID="CS_CMD_GIVE_TATL" Index="154"/>
-        <Item Key="transition_general" ID="CS_CMD_TRANSITION_GENERAL" Index="155"/>
-        <Item Key="fade_out_seq" ID="CS_CMD_FADE_OUT_SEQ" Index="156"/>
-        <Item Key="time" ID="CS_CMD_TIME" Index="157"/>
-        <Item Key="player_cue" ID="CS_CMD_PLAYER_CUE" Index="200"/>
-        <Item Key="actor_cue_201" ID="CS_CMD_ACTOR_CUE_201" Index="201"/>
-        <Item Key="unk_data_fa" ID="CS_CMD_UNK_DATA_FA" Index="250"/>
-        <Item Key="unk_data_fe" ID="CS_CMD_UNK_DATA_FE" Index="254"/>
-        <Item Key="unk_data_ff" ID="CS_CMD_UNK_DATA_FF" Index="255"/>
-        <Item Key="unk_data_100" ID="CS_CMD_UNK_DATA_100" Index="256"/>
-        <Item Key="unk_data_101" ID="CS_CMD_UNK_DATA_101" Index="257"/>
-        <Item Key="unk_data_102" ID="CS_CMD_UNK_DATA_102" Index="258"/>
-        <Item Key="unk_data_103" ID="CS_CMD_UNK_DATA_103" Index="259"/>
-        <Item Key="unk_data_104" ID="CS_CMD_UNK_DATA_104" Index="260"/>
-        <Item Key="unk_data_105" ID="CS_CMD_UNK_DATA_105" Index="261"/>
-        <Item Key="unk_data_108" ID="CS_CMD_UNK_DATA_108" Index="264"/>
-        <Item Key="unk_data_109" ID="CS_CMD_UNK_DATA_109" Index="265"/>
-        <Item Key="start_seq" ID="CS_CMD_START_SEQ" Index="300"/>
-        <Item Key="stop_seq" ID="CS_CMD_STOP_SEQ" Index="301"/>
-        <Item Key="start_ambience" ID="CS_CMD_START_AMBIENCE" Index="302"/>
-        <Item Key="fade_out_ambience" ID="CS_CMD_FADE_OUT_AMBIENCE" Index="303"/>
-        <Item Key="sfx_reverb_index_2" ID="CS_CMD_SFX_REVERB_INDEX_2" Index="304"/>
-        <Item Key="sfx_reverb_index_1" ID="CS_CMD_SFX_REVERB_INDEX_1" Index="305"/>
-        <Item Key="modify_seq" ID="CS_CMD_MODIFY_SEQ" Index="306"/>
-        <Item Key="destination" ID="CS_CMD_DESTINATION" Index="350"/>
-        <Item Key="choose_credits_scenes" ID="CS_CMD_CHOOSE_CREDITS_SCENES" Index="351"/>
-        <Item Key="rumble" ID="CS_CMD_RUMBLE" Index="400"/>
-        <Item Key="actor_cue_450" ID="CS_CMD_ACTOR_CUE_450" Index="450"/>
-        <Item Key="actor_cue_451" ID="CS_CMD_ACTOR_CUE_451" Index="451"/>
-        <Item Key="actor_cue_452" ID="CS_CMD_ACTOR_CUE_452" Index="452"/>
-        <Item Key="actor_cue_453" ID="CS_CMD_ACTOR_CUE_453" Index="453"/>
-        <Item Key="actor_cue_454" ID="CS_CMD_ACTOR_CUE_454" Index="454"/>
-        <Item Key="actor_cue_455" ID="CS_CMD_ACTOR_CUE_455" Index="455"/>
-        <Item Key="actor_cue_456" ID="CS_CMD_ACTOR_CUE_456" Index="456"/>
-        <Item Key="actor_cue_457" ID="CS_CMD_ACTOR_CUE_457" Index="457"/>
-        <Item Key="actor_cue_458" ID="CS_CMD_ACTOR_CUE_458" Index="458"/>
-        <Item Key="actor_cue_459" ID="CS_CMD_ACTOR_CUE_459" Index="459"/>
-        <Item Key="actor_cue_460" ID="CS_CMD_ACTOR_CUE_460" Index="460"/>
-        <Item Key="actor_cue_461" ID="CS_CMD_ACTOR_CUE_461" Index="461"/>
-        <Item Key="actor_cue_462" ID="CS_CMD_ACTOR_CUE_462" Index="462"/>
-        <Item Key="actor_cue_463" ID="CS_CMD_ACTOR_CUE_463" Index="463"/>
-        <Item Key="actor_cue_464" ID="CS_CMD_ACTOR_CUE_464" Index="464"/>
-        <Item Key="actor_cue_465" ID="CS_CMD_ACTOR_CUE_465" Index="465"/>
-        <Item Key="actor_cue_466" ID="CS_CMD_ACTOR_CUE_466" Index="466"/>
-        <Item Key="actor_cue_467" ID="CS_CMD_ACTOR_CUE_467" Index="467"/>
-        <Item Key="actor_cue_468" ID="CS_CMD_ACTOR_CUE_468" Index="468"/>
-        <Item Key="actor_cue_469" ID="CS_CMD_ACTOR_CUE_469" Index="469"/>
-        <Item Key="actor_cue_470" ID="CS_CMD_ACTOR_CUE_470" Index="470"/>
-        <Item Key="actor_cue_471" ID="CS_CMD_ACTOR_CUE_471" Index="471"/>
-        <Item Key="actor_cue_472" ID="CS_CMD_ACTOR_CUE_472" Index="472"/>
-        <Item Key="actor_cue_473" ID="CS_CMD_ACTOR_CUE_473" Index="473"/>
-        <Item Key="actor_cue_474" ID="CS_CMD_ACTOR_CUE_474" Index="474"/>
-        <Item Key="actor_cue_475" ID="CS_CMD_ACTOR_CUE_475" Index="475"/>
-        <Item Key="actor_cue_476" ID="CS_CMD_ACTOR_CUE_476" Index="476"/>
-        <Item Key="actor_cue_477" ID="CS_CMD_ACTOR_CUE_477" Index="477"/>
-        <Item Key="actor_cue_478" ID="CS_CMD_ACTOR_CUE_478" Index="478"/>
-        <Item Key="actor_cue_479" ID="CS_CMD_ACTOR_CUE_479" Index="479"/>
-        <Item Key="actor_cue_480" ID="CS_CMD_ACTOR_CUE_480" Index="480"/>
-        <Item Key="actor_cue_481" ID="CS_CMD_ACTOR_CUE_481" Index="481"/>
-        <Item Key="actor_cue_482" ID="CS_CMD_ACTOR_CUE_482" Index="482"/>
-        <Item Key="actor_cue_483" ID="CS_CMD_ACTOR_CUE_483" Index="483"/>
-        <Item Key="actor_cue_484" ID="CS_CMD_ACTOR_CUE_484" Index="484"/>
-        <Item Key="actor_cue_485" ID="CS_CMD_ACTOR_CUE_485" Index="485"/>
-        <Item Key="actor_cue_486" ID="CS_CMD_ACTOR_CUE_486" Index="486"/>
-        <Item Key="actor_cue_487" ID="CS_CMD_ACTOR_CUE_487" Index="487"/>
-        <Item Key="actor_cue_488" ID="CS_CMD_ACTOR_CUE_488" Index="488"/>
-        <Item Key="actor_cue_489" ID="CS_CMD_ACTOR_CUE_489" Index="489"/>
-        <Item Key="actor_cue_490" ID="CS_CMD_ACTOR_CUE_490" Index="490"/>
-        <Item Key="actor_cue_491" ID="CS_CMD_ACTOR_CUE_491" Index="491"/>
-        <Item Key="actor_cue_492" ID="CS_CMD_ACTOR_CUE_492" Index="492"/>
-        <Item Key="actor_cue_493" ID="CS_CMD_ACTOR_CUE_493" Index="493"/>
-        <Item Key="actor_cue_494" ID="CS_CMD_ACTOR_CUE_494" Index="494"/>
-        <Item Key="actor_cue_495" ID="CS_CMD_ACTOR_CUE_495" Index="495"/>
-        <Item Key="actor_cue_496" ID="CS_CMD_ACTOR_CUE_496" Index="496"/>
-        <Item Key="actor_cue_497" ID="CS_CMD_ACTOR_CUE_497" Index="497"/>
-        <Item Key="actor_cue_498" ID="CS_CMD_ACTOR_CUE_498" Index="498"/>
-        <Item Key="actor_cue_499" ID="CS_CMD_ACTOR_CUE_499" Index="499"/>
-        <Item Key="actor_cue_500" ID="CS_CMD_ACTOR_CUE_500" Index="500"/>
-        <Item Key="actor_cue_501" ID="CS_CMD_ACTOR_CUE_501" Index="501"/>
-        <Item Key="actor_cue_502" ID="CS_CMD_ACTOR_CUE_502" Index="502"/>
-        <Item Key="actor_cue_503" ID="CS_CMD_ACTOR_CUE_503" Index="503"/>
-        <Item Key="actor_cue_504" ID="CS_CMD_ACTOR_CUE_504" Index="504"/>
-        <Item Key="actor_cue_sotcs" ID="CS_CMD_ACTOR_CUE_SOTCS" Index="505"/>
-        <Item Key="actor_cue_506" ID="CS_CMD_ACTOR_CUE_506" Index="506"/>
-        <Item Key="actor_cue_507" ID="CS_CMD_ACTOR_CUE_507" Index="507"/>
-        <Item Key="actor_cue_508" ID="CS_CMD_ACTOR_CUE_508" Index="508"/>
-        <Item Key="actor_cue_509" ID="CS_CMD_ACTOR_CUE_509" Index="509"/>
-        <Item Key="actor_cue_510" ID="CS_CMD_ACTOR_CUE_510" Index="510"/>
-        <Item Key="actor_cue_511" ID="CS_CMD_ACTOR_CUE_511" Index="511"/>
-        <Item Key="actor_cue_512" ID="CS_CMD_ACTOR_CUE_512" Index="512"/>
-        <Item Key="actor_cue_513" ID="CS_CMD_ACTOR_CUE_513" Index="513"/>
-        <Item Key="actor_cue_514" ID="CS_CMD_ACTOR_CUE_514" Index="514"/>
-        <Item Key="actor_cue_515" ID="CS_CMD_ACTOR_CUE_515" Index="515"/>
-        <Item Key="actor_cue_516" ID="CS_CMD_ACTOR_CUE_516" Index="516"/>
-        <Item Key="actor_cue_517" ID="CS_CMD_ACTOR_CUE_517" Index="517"/>
-        <Item Key="actor_cue_518" ID="CS_CMD_ACTOR_CUE_518" Index="518"/>
-        <Item Key="actor_cue_519" ID="CS_CMD_ACTOR_CUE_519" Index="519"/>
-        <Item Key="actor_cue_520" ID="CS_CMD_ACTOR_CUE_520" Index="520"/>
-        <Item Key="actor_cue_521" ID="CS_CMD_ACTOR_CUE_521" Index="521"/>
-        <Item Key="actor_cue_522" ID="CS_CMD_ACTOR_CUE_522" Index="522"/>
-        <Item Key="actor_cue_523" ID="CS_CMD_ACTOR_CUE_523" Index="523"/>
-        <Item Key="actor_cue_524" ID="CS_CMD_ACTOR_CUE_524" Index="524"/>
-        <Item Key="actor_cue_525" ID="CS_CMD_ACTOR_CUE_525" Index="525"/>
-        <Item Key="actor_cue_526" ID="CS_CMD_ACTOR_CUE_526" Index="526"/>
-        <Item Key="actor_cue_527" ID="CS_CMD_ACTOR_CUE_527" Index="527"/>
-        <Item Key="actor_cue_528" ID="CS_CMD_ACTOR_CUE_528" Index="528"/>
-        <Item Key="actor_cue_529" ID="CS_CMD_ACTOR_CUE_529" Index="529"/>
-        <Item Key="actor_cue_530" ID="CS_CMD_ACTOR_CUE_530" Index="530"/>
-        <Item Key="actor_cue_531" ID="CS_CMD_ACTOR_CUE_531" Index="531"/>
-        <Item Key="actor_cue_532" ID="CS_CMD_ACTOR_CUE_532" Index="532"/>
-        <Item Key="actor_cue_533" ID="CS_CMD_ACTOR_CUE_533" Index="533"/>
-        <Item Key="actor_cue_534" ID="CS_CMD_ACTOR_CUE_534" Index="534"/>
-        <Item Key="actor_cue_535" ID="CS_CMD_ACTOR_CUE_535" Index="535"/>
-        <Item Key="actor_cue_536" ID="CS_CMD_ACTOR_CUE_536" Index="536"/>
-        <Item Key="actor_cue_537" ID="CS_CMD_ACTOR_CUE_537" Index="537"/>
-        <Item Key="actor_cue_538" ID="CS_CMD_ACTOR_CUE_538" Index="538"/>
-        <Item Key="actor_cue_539" ID="CS_CMD_ACTOR_CUE_539" Index="539"/>
-        <Item Key="actor_cue_540" ID="CS_CMD_ACTOR_CUE_540" Index="540"/>
-        <Item Key="actor_cue_541" ID="CS_CMD_ACTOR_CUE_541" Index="541"/>
-        <Item Key="actor_cue_542" ID="CS_CMD_ACTOR_CUE_542" Index="542"/>
-        <Item Key="actor_cue_543" ID="CS_CMD_ACTOR_CUE_543" Index="543"/>
-        <Item Key="actor_cue_544" ID="CS_CMD_ACTOR_CUE_544" Index="544"/>
-        <Item Key="actor_cue_545" ID="CS_CMD_ACTOR_CUE_545" Index="545"/>
-        <Item Key="actor_cue_546" ID="CS_CMD_ACTOR_CUE_546" Index="546"/>
-        <Item Key="actor_cue_547" ID="CS_CMD_ACTOR_CUE_547" Index="547"/>
-        <Item Key="actor_cue_548" ID="CS_CMD_ACTOR_CUE_548" Index="548"/>
-        <Item Key="actor_cue_549" ID="CS_CMD_ACTOR_CUE_549" Index="549"/>
-        <Item Key="actor_cue_550" ID="CS_CMD_ACTOR_CUE_550" Index="550"/>
-        <Item Key="actor_cue_551" ID="CS_CMD_ACTOR_CUE_551" Index="551"/>
-        <Item Key="actor_cue_552" ID="CS_CMD_ACTOR_CUE_552" Index="552"/>
-        <Item Key="actor_cue_553" ID="CS_CMD_ACTOR_CUE_553" Index="553"/>
-        <Item Key="actor_cue_554" ID="CS_CMD_ACTOR_CUE_554" Index="554"/>
-        <Item Key="actor_cue_555" ID="CS_CMD_ACTOR_CUE_555" Index="555"/>
-        <Item Key="actor_cue_556" ID="CS_CMD_ACTOR_CUE_556" Index="556"/>
-        <Item Key="actor_cue_557" ID="CS_CMD_ACTOR_CUE_557" Index="557"/>
-        <Item Key="actor_cue_558" ID="CS_CMD_ACTOR_CUE_558" Index="558"/>
-        <Item Key="actor_cue_559" ID="CS_CMD_ACTOR_CUE_559" Index="559"/>
-        <Item Key="actor_cue_560" ID="CS_CMD_ACTOR_CUE_560" Index="560"/>
-        <Item Key="actor_cue_561" ID="CS_CMD_ACTOR_CUE_561" Index="561"/>
-        <Item Key="actor_cue_562" ID="CS_CMD_ACTOR_CUE_562" Index="562"/>
-        <Item Key="actor_cue_563" ID="CS_CMD_ACTOR_CUE_563" Index="563"/>
-        <Item Key="actor_cue_564" ID="CS_CMD_ACTOR_CUE_564" Index="564"/>
-        <Item Key="actor_cue_565" ID="CS_CMD_ACTOR_CUE_565" Index="565"/>
-        <Item Key="actor_cue_566" ID="CS_CMD_ACTOR_CUE_566" Index="566"/>
-        <Item Key="actor_cue_567" ID="CS_CMD_ACTOR_CUE_567" Index="567"/>
-        <Item Key="actor_cue_568" ID="CS_CMD_ACTOR_CUE_568" Index="568"/>
-        <Item Key="actor_cue_569" ID="CS_CMD_ACTOR_CUE_569" Index="569"/>
-        <Item Key="actor_cue_570" ID="CS_CMD_ACTOR_CUE_570" Index="570"/>
-        <Item Key="actor_cue_571" ID="CS_CMD_ACTOR_CUE_571" Index="571"/>
-        <Item Key="actor_cue_572" ID="CS_CMD_ACTOR_CUE_572" Index="572"/>
-        <Item Key="actor_cue_573" ID="CS_CMD_ACTOR_CUE_573" Index="573"/>
-        <Item Key="actor_cue_574" ID="CS_CMD_ACTOR_CUE_574" Index="574"/>
-        <Item Key="actor_cue_575" ID="CS_CMD_ACTOR_CUE_575" Index="575"/>
-        <Item Key="actor_cue_576" ID="CS_CMD_ACTOR_CUE_576" Index="576"/>
-        <Item Key="actor_cue_577" ID="CS_CMD_ACTOR_CUE_577" Index="577"/>
-        <Item Key="actor_cue_578" ID="CS_CMD_ACTOR_CUE_578" Index="578"/>
-        <Item Key="actor_cue_579" ID="CS_CMD_ACTOR_CUE_579" Index="579"/>
-        <Item Key="actor_cue_580" ID="CS_CMD_ACTOR_CUE_580" Index="580"/>
-        <Item Key="actor_cue_581" ID="CS_CMD_ACTOR_CUE_581" Index="581"/>
-        <Item Key="actor_cue_582" ID="CS_CMD_ACTOR_CUE_582" Index="582"/>
-        <Item Key="actor_cue_583" ID="CS_CMD_ACTOR_CUE_583" Index="583"/>
-        <Item Key="actor_cue_584" ID="CS_CMD_ACTOR_CUE_584" Index="584"/>
-        <Item Key="actor_cue_585" ID="CS_CMD_ACTOR_CUE_585" Index="585"/>
-        <Item Key="actor_cue_586" ID="CS_CMD_ACTOR_CUE_586" Index="586"/>
-        <Item Key="actor_cue_587" ID="CS_CMD_ACTOR_CUE_587" Index="587"/>
-        <Item Key="actor_cue_588" ID="CS_CMD_ACTOR_CUE_588" Index="588"/>
-        <Item Key="actor_cue_589" ID="CS_CMD_ACTOR_CUE_589" Index="589"/>
-        <Item Key="actor_cue_590" ID="CS_CMD_ACTOR_CUE_590" Index="590"/>
-        <Item Key="actor_cue_591" ID="CS_CMD_ACTOR_CUE_591" Index="591"/>
-        <Item Key="actor_cue_592" ID="CS_CMD_ACTOR_CUE_592" Index="592"/>
-        <Item Key="actor_cue_593" ID="CS_CMD_ACTOR_CUE_593" Index="593"/>
-        <Item Key="actor_cue_594" ID="CS_CMD_ACTOR_CUE_594" Index="594"/>
-        <Item Key="actor_cue_595" ID="CS_CMD_ACTOR_CUE_595" Index="595"/>
-        <Item Key="actor_cue_596" ID="CS_CMD_ACTOR_CUE_596" Index="596"/>
-        <Item Key="actor_cue_597" ID="CS_CMD_ACTOR_CUE_597" Index="597"/>
-        <Item Key="actor_cue_598" ID="CS_CMD_ACTOR_CUE_598" Index="598"/>
-        <Item Key="actor_cue_599" ID="CS_CMD_ACTOR_CUE_599" Index="599"/>
-    </Enum>
-    <Enum Games="MM" Key="miscType" ID="CutsceneMiscType">
-        <!-- https://github.com/zeldaret/mm/blob/df800c74aecfb6b89ee976df8a2f11451f295e37/include/z64cutscene.h#L532-L574 -->
-        <Item Key="unimplemented_0" ID="CS_MISC_UNIMPLEMENTED_0" Index="0"/>
-        <Item Key="rain" ID="CS_MISC_RAIN" Index="1"/>
-        <Item Key="lightning" ID="CS_MISC_LIGHTNING" Index="2"/>
-        <Item Key="lift_fog" ID="CS_MISC_LIFT_FOG" Index="3"/>
-        <Item Key="cloudy_sky" ID="CS_MISC_CLOUDY_SKY" Index="4"/>
-        <Item Key="stop_cutscene" ID="CS_MISC_STOP_CUTSCENE" Index="5"/>
-        <Item Key="unimplemented_6" ID="CS_MISC_UNIMPLEMENTED_6" Index="6"/>
-        <Item Key="show_title_card" ID="CS_MISC_SHOW_TITLE_CARD" Index="7"/>
-        <Item Key="earthquake_medium" ID="CS_MISC_EARTHQUAKE_MEDIUM" Index="8"/>
-        <Item Key="earthquake_stop" ID="CS_MISC_EARTHQUAKE_STOP" Index="9"/>
-        <Item Key="vismono_black_and_white" ID="CS_MISC_VISMONO_BLACK_AND_WHITE" Index="10"/>
-        <Item Key="vismono_sepia" ID="CS_MISC_VISMONO_SEPIA" Index="11"/>
-        <Item Key="hide_room" ID="CS_MISC_HIDE_ROOM" Index="12"/>
-        <Item Key="red_pulsating_lights" ID="CS_MISC_RED_PULSATING_LIGHTS" Index="13"/>
-        <Item Key="halt_all_actors" ID="CS_MISC_HALT_ALL_ACTORS" Index="14"/>
-        <Item Key="resume_all_actors" ID="CS_MISC_RESUME_ALL_ACTORS" Index="15"/>
-        <Item Key="sandstorm_fill" ID="CS_MISC_SANDSTORM_FILL" Index="16"/>
-        <Item Key="sunssong_start" ID="CS_MISC_SUNSSONG_START" Index="17"/>
-        <Item Key="freeze_time" ID="CS_MISC_FREEZE_TIME" Index="18"/>
-        <Item Key="long_scarecrow_song" ID="CS_MISC_LONG_SCARECROW_SONG" Index="19"/>
-        <Item Key="set_csflag_3" ID="CS_MISC_SET_CSFLAG_3" Index="20"/>
-        <Item Key="set_csflag_4" ID="CS_MISC_SET_CSFLAG_4" Index="21"/>
-        <Item Key="player_form_deku" ID="CS_MISC_PLAYER_FORM_DEKU" Index="22"/>
-        <Item Key="enable_player_reflection" ID="CS_MISC_ENABLE_PLAYER_REFLECTION" Index="23"/>
-        <Item Key="disable_player_reflection" ID="CS_MISC_DISABLE_PLAYER_REFLECTION" Index="24"/>
-        <Item Key="player_form_human" ID="CS_MISC_PLAYER_FORM_HUMAN" Index="25"/>
-        <Item Key="earthquake_strong" ID="CS_MISC_EARTHQUAKE_STRONG" Index="26"/>
-        <Item Key="dest_moon_crash_fire_wall" ID="CS_MISC_DEST_MOON_CRASH_FIRE_WALL" Index="27"/>
-        <Item Key="moon_crash_skybox" ID="CS_MISC_MOON_CRASH_SKYBOX" Index="28"/>
-        <Item Key="player_form_restored" ID="CS_MISC_PLAYER_FORM_RESTORED" Index="29"/>
-        <Item Key="disable_player_csmode_start_pos" ID="CS_MISC_DISABLE_PLAYER_CSACTION_START_POS" Index="30"/>
-        <Item Key="enable_player_csmode_start_pos" ID="CS_MISC_ENABLE_PLAYER_CSACTION_START_POS" Index="31"/>
-        <Item Key="unimplemented_20" ID="CS_MISC_UNIMPLEMENTED_20" Index="32"/>
-        <Item Key="save_enter_clock_town" ID="CS_MISC_SAVE_ENTER_CLOCK_TOWN" Index="33"/>
-        <Item Key="reset_save_from_moon_crash" ID="CS_MISC_RESET_SAVE_FROM_MOON_CRASH" Index="34"/>
-        <Item Key="time_advance" ID="CS_MISC_TIME_ADVANCE" Index="35"/>
-        <Item Key="earthquake_weak" ID="CS_MISC_EARTHQUAKE_WEAK" Index="36"/>
-        <Item Key="unimplemented_25" ID="CS_MISC_UNIMPLEMENTED_25" Index="37"/>
-        <Item Key="dawn_of_a_new_day" ID="CS_MISC_DAWN_OF_A_NEW_DAY" Index="38"/>
-        <Item Key="player_form_zora" ID="CS_MISC_PLAYER_FORM_ZORA" Index="39"/>
-        <Item Key="finale" ID="CS_MISC_FINALE" Index="40"/>
-    </Enum>
-    <Enum Games="MM" Key="spawnFlag" ID="CS_SPAWN_FLAG">
-        <!-- https://github.com/zeldaret/mm/blob/0fdd63a350c47b5da87a58f00855bc95b6a32b47/include/z64cutscene.h#L583-L586 -->
-        <Item Key="flag_none" ID="CS_SPAWN_FLAG_NONE" Index="255"/>
-        <Item Key="flag_always" ID="CS_SPAWN_FLAG_ALWAYS" Index="254"/>
-    </Enum>
-    <Enum Games="MM" Key="endSfx" ID="CutsceneEndSfx">
-        <!-- https://github.com/zeldaret/mm/blob/0fdd63a350c47b5da87a58f00855bc95b6a32b47/include/z64cutscene.h#L709-L714 -->
-        <Item Key="none" ID="CS_END_SFX_NONE" Index="0"/>
-        <Item Key="tre_box_appear" ID="CS_END_SFX_TRE_BOX_APPEAR" Index="1"/>
-        <Item Key="correct_chime" ID="CS_END_SFX_CORRECT_CHIME" Index="2"/>
-        <Item Key="none_alt" ID="CS_END_SFX_NONE_ALT" Index="255"/>
-    </Enum>
-    <Enum Games="MM" Key="naviQuestHintType" ID="NaviQuestHintFileId">
-        <!-- https://github.com/zeldaret/mm/blob/0fdd63a350c47b5da87a58f00855bc95b6a32b47/include/z64scene.h#L761-L765 -->
-        <Item Key="hints_none" ID="NAVI_QUEST_HINTS_NONE" Index="0"/>
-        <Item Key="hints_overworld" ID="NAVI_QUEST_HINTS_OVERWORLD" Index="1"/>
-        <Item Key="hints_dungeon" ID="NAVI_QUEST_HINTS_DUNGEON" Index="2"/>
-    </Enum>
-    <Enum Games="MM" Key="playerCueId" ID="PlayerCueId">
-        <!-- https://github.com/zeldaret/mm/blob/da0c9072f5332edbde00d405b2f1c94e92ece434/include/z64player.h#L753-L847 -->
-        <Item Key="cueid_none" ID="PLAYER_CUEID_NONE" Index="0"/>
-        <Item Key="cueid_1" ID="PLAYER_CUEID_1" Index="1"/>
-        <Item Key="cueid_2" ID="PLAYER_CUEID_2" Index="2"/>
-        <Item Key="cueid_3" ID="PLAYER_CUEID_3" Index="3"/>
-        <Item Key="cueid_4" ID="PLAYER_CUEID_4" Index="4"/>
-        <Item Key="cueid_5" ID="PLAYER_CUEID_5" Index="5"/>
-        <Item Key="cueid_6" ID="PLAYER_CUEID_6" Index="6"/>
-        <Item Key="cueid_7" ID="PLAYER_CUEID_7" Index="7"/>
-        <Item Key="cueid_8" ID="PLAYER_CUEID_8" Index="8"/>
-        <Item Key="cueid_9" ID="PLAYER_CUEID_9" Index="9"/>
-        <Item Key="cueid_10" ID="PLAYER_CUEID_10" Index="10"/>
-        <Item Key="cueid_11" ID="PLAYER_CUEID_11" Index="11"/>
-        <Item Key="cueid_12" ID="PLAYER_CUEID_12" Index="12"/>
-        <Item Key="cueid_13" ID="PLAYER_CUEID_13" Index="13"/>
-        <Item Key="cueid_14" ID="PLAYER_CUEID_14" Index="14"/>
-        <Item Key="cueid_15" ID="PLAYER_CUEID_15" Index="15"/>
-        <Item Key="cueid_16" ID="PLAYER_CUEID_16" Index="16"/>
-        <Item Key="cueid_17" ID="PLAYER_CUEID_17" Index="17"/>
-        <Item Key="cueid_18" ID="PLAYER_CUEID_18" Index="18"/>
-        <Item Key="cueid_19" ID="PLAYER_CUEID_19" Index="19"/>
-        <Item Key="cueid_20" ID="PLAYER_CUEID_20" Index="20"/>
-        <Item Key="cueid_21" ID="PLAYER_CUEID_21" Index="21"/>
-        <Item Key="cueid_22" ID="PLAYER_CUEID_22" Index="22"/>
-        <Item Key="cueid_23" ID="PLAYER_CUEID_23" Index="23"/>
-        <Item Key="cueid_24" ID="PLAYER_CUEID_24" Index="24"/>
-        <Item Key="cueid_25" ID="PLAYER_CUEID_25" Index="25"/>
-        <Item Key="cueid_26" ID="PLAYER_CUEID_26" Index="26"/>
-        <Item Key="cueid_27" ID="PLAYER_CUEID_27" Index="27"/>
-        <Item Key="cueid_28" ID="PLAYER_CUEID_28" Index="28"/>
-        <Item Key="cueid_29" ID="PLAYER_CUEID_29" Index="29"/>
-        <Item Key="cueid_30" ID="PLAYER_CUEID_30" Index="30"/>
-        <Item Key="cueid_31" ID="PLAYER_CUEID_31" Index="31"/>
-        <Item Key="cueid_32" ID="PLAYER_CUEID_32" Index="32"/>
-        <Item Key="cueid_33" ID="PLAYER_CUEID_33" Index="33"/>
-        <Item Key="cueid_34" ID="PLAYER_CUEID_34" Index="34"/>
-        <Item Key="cueid_35" ID="PLAYER_CUEID_35" Index="35"/>
-        <Item Key="cueid_36" ID="PLAYER_CUEID_36" Index="36"/>
-        <Item Key="cueid_37" ID="PLAYER_CUEID_37" Index="37"/>
-        <Item Key="cueid_38" ID="PLAYER_CUEID_38" Index="38"/>
-        <Item Key="cueid_39" ID="PLAYER_CUEID_39" Index="39"/>
-        <Item Key="cueid_40" ID="PLAYER_CUEID_40" Index="40"/>
-        <Item Key="cueid_41" ID="PLAYER_CUEID_41" Index="41"/>
-        <Item Key="cueid_42" ID="PLAYER_CUEID_42" Index="42"/>
-        <Item Key="cueid_43" ID="PLAYER_CUEID_43" Index="43"/>
-        <Item Key="cueid_44" ID="PLAYER_CUEID_44" Index="44"/>
-        <Item Key="cueid_45" ID="PLAYER_CUEID_45" Index="45"/>
-        <Item Key="cueid_46" ID="PLAYER_CUEID_46" Index="46"/>
-        <Item Key="cueid_47" ID="PLAYER_CUEID_47" Index="47"/>
-        <Item Key="cueid_48" ID="PLAYER_CUEID_48" Index="48"/>
-        <Item Key="cueid_49" ID="PLAYER_CUEID_49" Index="49"/>
-        <Item Key="cueid_50" ID="PLAYER_CUEID_50" Index="50"/>
-        <Item Key="cueid_51" ID="PLAYER_CUEID_51" Index="51"/>
-        <Item Key="cueid_52" ID="PLAYER_CUEID_52" Index="52"/>
-        <Item Key="cueid_53" ID="PLAYER_CUEID_53" Index="53"/>
-        <Item Key="cueid_54" ID="PLAYER_CUEID_54" Index="54"/>
-        <Item Key="cueid_55" ID="PLAYER_CUEID_55" Index="55"/>
-        <Item Key="cueid_56" ID="PLAYER_CUEID_56" Index="56"/>
-        <Item Key="cueid_57" ID="PLAYER_CUEID_57" Index="57"/>
-        <Item Key="cueid_58" ID="PLAYER_CUEID_58" Index="58"/>
-        <Item Key="cueid_59" ID="PLAYER_CUEID_59" Index="59"/>
-        <Item Key="cueid_60" ID="PLAYER_CUEID_60" Index="60"/>
-        <Item Key="cueid_61" ID="PLAYER_CUEID_61" Index="61"/>
-        <Item Key="cueid_62" ID="PLAYER_CUEID_62" Index="62"/>
-        <Item Key="cueid_63" ID="PLAYER_CUEID_63" Index="63"/>
-        <Item Key="cueid_64" ID="PLAYER_CUEID_64" Index="64"/>
-        <Item Key="cueid_65" ID="PLAYER_CUEID_65" Index="65"/>
-        <Item Key="cueid_66" ID="PLAYER_CUEID_66" Index="66"/>
-        <Item Key="cueid_67" ID="PLAYER_CUEID_67" Index="67"/>
-        <Item Key="cueid_68" ID="PLAYER_CUEID_68" Index="68"/>
-        <Item Key="cueid_69" ID="PLAYER_CUEID_69" Index="69"/>
-        <Item Key="cueid_70" ID="PLAYER_CUEID_70" Index="70"/>
-        <Item Key="cueid_71" ID="PLAYER_CUEID_71" Index="71"/>
-        <Item Key="cueid_72" ID="PLAYER_CUEID_72" Index="72"/>
-        <Item Key="cueid_73" ID="PLAYER_CUEID_73" Index="73"/>
-        <Item Key="cueid_74" ID="PLAYER_CUEID_74" Index="74"/>
-        <Item Key="cueid_75" ID="PLAYER_CUEID_75" Index="75"/>
-        <Item Key="cueid_76" ID="PLAYER_CUEID_76" Index="76"/>
-        <Item Key="cueid_77" ID="PLAYER_CUEID_77" Index="77"/>
-        <Item Key="cueid_78" ID="PLAYER_CUEID_78" Index="78"/>
-        <Item Key="cueid_79" ID="PLAYER_CUEID_79" Index="79"/>
-        <Item Key="cueid_80" ID="PLAYER_CUEID_80" Index="80"/>
-        <Item Key="cueid_81" ID="PLAYER_CUEID_81" Index="81"/>
-        <Item Key="cueid_82" ID="PLAYER_CUEID_82" Index="82"/>
-        <Item Key="cueid_83" ID="PLAYER_CUEID_83" Index="83"/>
-        <Item Key="cueid_84" ID="PLAYER_CUEID_84" Index="84"/>
-        <Item Key="cueid_85" ID="PLAYER_CUEID_85" Index="85"/>
-        <Item Key="cueid_86" ID="PLAYER_CUEID_86" Index="86"/>
-        <Item Key="cueid_87" ID="PLAYER_CUEID_87" Index="87"/>
-        <Item Key="cueid_88" ID="PLAYER_CUEID_88" Index="88"/>
-        <Item Key="cueid_89" ID="PLAYER_CUEID_89" Index="89"/>
-        <Item Key="cueid_90" ID="PLAYER_CUEID_90" Index="90"/>
-        <Item Key="cueid_91" ID="PLAYER_CUEID_91" Index="91"/>
-    </Enum>
-	<Enum Games="MM" Key="csSplineInterpType" ID="CutsceneCamInterpType">
-        <!-- https://github.com/zeldaret/mm/blob/5607eec18bae68e4cd38ef6d1fa69d7f1d84bfc8/include/z64cutscene.h#L740-L751 -->
-        <Item Key="none" ID="CS_CAM_INTERP_NONE" Index="0"/>
-        <Item Key="set" ID="CS_CAM_INTERP_SET" Index="1"/>
-        <Item Key="linear" ID="CS_CAM_INTERP_LINEAR" Index="2"/>
-		<Item Key="scale" ID="CS_CAM_INTERP_SCALE" Index="3"/>
-		<Item Key="cubic" ID="CS_CAM_INTERP_MP_CUBIC" Index="4"/>
-		<Item Key="quad" ID="CS_CAM_INTERP_MP_QUAD" Index="5"/>
-		<Item Key="geo" ID="CS_CAM_INTERP_GEO" Index="6"/>
-		<Item Key="off" ID="CS_CAM_INTERP_OFF" Index="7"/>
-	</Enum>
-	<Enum Games="MM" Key="csSplineRelTo" ID="CutsceneCamRelativeTo ">
-		<!-- https://github.com/zeldaret/mm/blob/5607eec18bae68e4cd38ef6d1fa69d7f1d84bfc8/include/z64cutscene.h#L754C14-L754-L760 -->
-		<Item Key="rel0" ID="CS_CAM_REL_0" Index="0"/>
-		<Item Key="rel1" ID="CS_CAM_REL_1" Index="1"/>
-		<Item Key="rel2" ID="CS_CAM_REL_2" Index="2"/>
-		<Item Key="rel3" ID="CS_CAM_REL_3" Index="3"/>
-		<Item Key="rel4" ID="CS_CAM_REL_4" Index="4"/>
-		<Item Key="rel5" ID="CS_CAM_REL_5" Index="5"/>
-	</Enum>
-    <Enum Games="OoTMqDbg" Key="ocarinaSongActionId" ID="OcarinaSongActionId">
-        <!-- https://github.com/zeldaret/mm/blob/2dc405b6af0cc700b7f3086aabb424bbdf98822d/include/z64ocarina.h#L35-L118 -->
-        <Item Key="action_0" ID="OCARINA_ACTION_0" Index="0"/>
-        <Item Key="action_free_play" ID="OCARINA_ACTION_FREE_PLAY" Index="1"/>
-        <Item Key="action_demonstrate_sonata" ID="OCARINA_ACTION_DEMONSTRATE_SONATA" Index="2"/>
-        <Item Key="action_demonstrate_goron_lullaby" ID="OCARINA_ACTION_DEMONSTRATE_GORON_LULLABY" Index="3"/>
-        <Item Key="action_demonstrate_new_wave" ID="OCARINA_ACTION_DEMONSTRATE_NEW_WAVE" Index="4"/>
-        <Item Key="action_demonstrate_elegy" ID="OCARINA_ACTION_DEMONSTRATE_ELEGY" Index="5"/>
-        <Item Key="action_demonstrate_oath" ID="OCARINA_ACTION_DEMONSTRATE_OATH" Index="6"/>
-        <Item Key="action_demonstrate_sarias" ID="OCARINA_ACTION_DEMONSTRATE_SARIAS" Index="7"/>
-        <Item Key="action_demonstrate_time" ID="OCARINA_ACTION_DEMONSTRATE_TIME" Index="8"/>
-        <Item Key="action_demonstrate_healing" ID="OCARINA_ACTION_DEMONSTRATE_HEALING" Index="9"/>
-        <Item Key="action_demonstrate_eponas" ID="OCARINA_ACTION_DEMONSTRATE_EPONAS" Index="10"/>
-        <Item Key="action_demonstrate_soaring" ID="OCARINA_ACTION_DEMONSTRATE_SOARING" Index="11"/>
-        <Item Key="action_demonstrate_storms" ID="OCARINA_ACTION_DEMONSTRATE_STORMS" Index="12"/>
-        <Item Key="action_demonstrate_suns" ID="OCARINA_ACTION_DEMONSTRATE_SUNS" Index="13"/>
-        <Item Key="action_demonstrate_inverted_time" ID="OCARINA_ACTION_DEMONSTRATE_INVERTED_TIME" Index="14"/>
-        <Item Key="action_demonstrate_double_time" ID="OCARINA_ACTION_DEMONSTRATE_DOUBLE_TIME" Index="15"/>
-        <Item Key="action_demonstrate_goron_lullaby_intro" ID="OCARINA_ACTION_DEMONSTRATE_GORON_LULLABY_INTRO" Index="16"/>
-        <Item Key="action_11" ID="OCARINA_ACTION_11" Index="17"/>
-        <Item Key="action_prompt_sonata" ID="OCARINA_ACTION_PROMPT_SONATA" Index="18"/>
-        <Item Key="action_prompt_goron_lullaby" ID="OCARINA_ACTION_PROMPT_GORON_LULLABY" Index="19"/>
-        <Item Key="action_prompt_new_wave" ID="OCARINA_ACTION_PROMPT_NEW_WAVE" Index="20"/>
-        <Item Key="action_prompt_elegy" ID="OCARINA_ACTION_PROMPT_ELEGY" Index="21"/>
-        <Item Key="action_prompt_oath" ID="OCARINA_ACTION_PROMPT_OATH" Index="22"/>
-        <Item Key="action_prompt_sarias" ID="OCARINA_ACTION_PROMPT_SARIAS" Index="23"/>
-        <Item Key="action_prompt_time" ID="OCARINA_ACTION_PROMPT_TIME" Index="24"/>
-        <Item Key="action_prompt_healing" ID="OCARINA_ACTION_PROMPT_HEALING" Index="25"/>
-        <Item Key="action_prompt_eponas" ID="OCARINA_ACTION_PROMPT_EPONAS" Index="26"/>
-        <Item Key="action_prompt_soaring" ID="OCARINA_ACTION_PROMPT_SOARING" Index="27"/>
-        <Item Key="action_prompt_storms" ID="OCARINA_ACTION_PROMPT_STORMS" Index="28"/>
-        <Item Key="action_prompt_suns" ID="OCARINA_ACTION_PROMPT_SUNS" Index="29"/>
-        <Item Key="action_prompt_inverted_time" ID="OCARINA_ACTION_PROMPT_INVERTED_TIME" Index="30"/>
-        <Item Key="action_prompt_double_time" ID="OCARINA_ACTION_PROMPT_DOUBLE_TIME" Index="31"/>
-        <Item Key="action_prompt_goron_lullaby_intro" ID="OCARINA_ACTION_PROMPT_GORON_LULLABY_INTRO" Index="32"/>
-        <Item Key="action_21" ID="OCARINA_ACTION_21" Index="33"/>
-        <Item Key="action_check_sonata" ID="OCARINA_ACTION_CHECK_SONATA" Index="34"/>
-        <Item Key="action_check_goron_lullaby" ID="OCARINA_ACTION_CHECK_GORON_LULLABY" Index="35"/>
-        <Item Key="action_check_new_wave" ID="OCARINA_ACTION_CHECK_NEW_WAVE" Index="36"/>
-        <Item Key="action_check_elegy" ID="OCARINA_ACTION_CHECK_ELEGY" Index="37"/>
-        <Item Key="action_check_oath" ID="OCARINA_ACTION_CHECK_OATH" Index="38"/>
-        <Item Key="action_check_sarias" ID="OCARINA_ACTION_CHECK_SARIAS" Index="39"/>
-        <Item Key="action_check_time" ID="OCARINA_ACTION_CHECK_TIME" Index="40"/>
-        <Item Key="action_check_healing" ID="OCARINA_ACTION_CHECK_HEALING" Index="41"/>
-        <Item Key="action_check_eponas" ID="OCARINA_ACTION_CHECK_EPONAS" Index="42"/>
-        <Item Key="action_check_soaring" ID="OCARINA_ACTION_CHECK_SOARING" Index="43"/>
-        <Item Key="action_check_storms" ID="OCARINA_ACTION_CHECK_STORMS" Index="44"/>
-        <Item Key="action_check_suns" ID="OCARINA_ACTION_CHECK_SUNS" Index="45"/>
-        <Item Key="action_check_inverted_time" ID="OCARINA_ACTION_CHECK_INVERTED_TIME" Index="46"/>
-        <Item Key="action_check_double_time" ID="OCARINA_ACTION_CHECK_DOUBLE_TIME" Index="47"/>
-        <Item Key="action_check_goron_lullaby_intro" ID="OCARINA_ACTION_CHECK_GORON_LULLABY_INTRO" Index="48"/>
-        <Item Key="action_check_scarecrow_spawn" ID="OCARINA_ACTION_CHECK_SCARECROW_SPAWN" Index="49"/>
-        <Item Key="action_free_play_done," ID="OCARINA_ACTION_FREE_PLAY_DONE," Index="50"/>
-        <Item Key="action_scarecrow_long_recording" ID="OCARINA_ACTION_SCARECROW_LONG_RECORDING" Index="51"/>
-        <Item Key="action_scarecrow_long_demonstration" ID="OCARINA_ACTION_SCARECROW_LONG_DEMONSTRATION" Index="52"/>
-        <Item Key="action_scarecrow_spawn_recording" ID="OCARINA_ACTION_SCARECROW_SPAWN_RECORDING" Index="53"/>
-        <Item Key="action_scarecrow_spawn_demonstration" ID="OCARINA_ACTION_SCARECROW_SPAWN_DEMONSTRATION" Index="54"/>
-        <Item Key="action_37" ID="OCARINA_ACTION_37" Index="55"/>
-        <Item Key="action_check_notime" ID="OCARINA_ACTION_CHECK_NOTIME" Index="56"/>
-        <Item Key="action_check_notime_done" ID="OCARINA_ACTION_CHECK_NOTIME_DONE" Index="57"/>
-        <Item Key="action_3a" ID="OCARINA_ACTION_3A" Index="58"/>
-        <Item Key="action_3b" ID="OCARINA_ACTION_3B" Index="59"/>
-        <Item Key="action_3c" ID="OCARINA_ACTION_3C" Index="60"/>
-        <Item Key="action_demonstrate_evan_part1_first_half" ID="OCARINA_ACTION_DEMONSTRATE_EVAN_PART1_FIRST_HALF" Index="61"/>
-        <Item Key="action_demonstrate_evan_part2_first_half" ID="OCARINA_ACTION_DEMONSTRATE_EVAN_PART2_FIRST_HALF" Index="62"/>
-        <Item Key="action_demonstrate_evan_part1_second_half" ID="OCARINA_ACTION_DEMONSTRATE_EVAN_PART1_SECOND_HALF" Index="63"/>
-        <Item Key="action_demonstrate_evan_part2_second_half" ID="OCARINA_ACTION_DEMONSTRATE_EVAN_PART2_SECOND_HALF" Index="64"/>
-        <Item Key="action_prompt_evan_part1_second_half" ID="OCARINA_ACTION_PROMPT_EVAN_PART1_SECOND_HALF" Index="65"/>
-        <Item Key="action_prompt_evan_part2_second_half" ID="OCARINA_ACTION_PROMPT_EVAN_PART2_SECOND_HALF" Index="66"/>
-        <Item Key="action_prompt_wind_fish_human" ID="OCARINA_ACTION_PROMPT_WIND_FISH_HUMAN" Index="67"/>
-        <Item Key="action_prompt_wind_fish_goron" ID="OCARINA_ACTION_PROMPT_WIND_FISH_GORON" Index="68"/>
-        <Item Key="action_prompt_wind_fish_zora" ID="OCARINA_ACTION_PROMPT_WIND_FISH_ZORA" Index="69"/>
-        <Item Key="action_prompt_wind_fish_deku" ID="OCARINA_ACTION_PROMPT_WIND_FISH_DEKU" Index="70"/>
-        <Item Key="action_timed_prompt_sonata" ID="OCARINA_ACTION_TIMED_PROMPT_SONATA" Index="71"/>
-        <Item Key="action_timed_prompt_goron_lullaby" ID="OCARINA_ACTION_TIMED_PROMPT_GORON_LULLABY" Index="72"/>
-        <Item Key="action_timed_prompt_new_wave" ID="OCARINA_ACTION_TIMED_PROMPT_NEW_WAVE" Index="73"/>
-        <Item Key="action_timed_prompt_elegy" ID="OCARINA_ACTION_TIMED_PROMPT_ELEGY" Index="74"/>
-        <Item Key="action_timed_prompt_oath" ID="OCARINA_ACTION_TIMED_PROMPT_OATH" Index="75"/>
-        <Item Key="action_timed_prompt_sarias" ID="OCARINA_ACTION_TIMED_PROMPT_SARIAS" Index="76"/>
-        <Item Key="action_timed_prompt_time" ID="OCARINA_ACTION_TIMED_PROMPT_TIME" Index="77"/>
-        <Item Key="action_timed_prompt_healing" ID="OCARINA_ACTION_TIMED_PROMPT_HEALING" Index="78"/>
-        <Item Key="action_timed_prompt_eponas" ID="OCARINA_ACTION_TIMED_PROMPT_EPONAS" Index="79"/>
-        <Item Key="action_timed_prompt_soaring" ID="OCARINA_ACTION_TIMED_PROMPT_SOARING" Index="80"/>
-        <Item Key="action_timed_prompt_storms" ID="OCARINA_ACTION_TIMED_PROMPT_STORMS" Index="81"/>
-    </Enum>
-    <Enum Games="OoTMqDbg" Key="seqId" ID="SeqId">
-        <!-- https://github.com/zeldaret/mm/blob/2dc405b6af0cc700b7f3086aabb424bbdf98822d/include/sequence.h#L4-132 -->
-        <Item Key="general_sfx" ID="NA_BGM_GENERAL_SFX" Index="0"/>
-        <Item Key="ambience" ID="NA_BGM_AMBIENCE" Index="1"/>
-        <Item Key="termina_field" ID="NA_BGM_TERMINA_FIELD" Index="2"/>
-        <Item Key="chase" ID="NA_BGM_CHASE" Index="3"/>
-        <Item Key="majoras_theme" ID="NA_BGM_MAJORAS_THEME" Index="4"/>
-        <Item Key="clock_tower" ID="NA_BGM_CLOCK_TOWER" Index="5"/>
-        <Item Key="stone_tower_temple" ID="NA_BGM_STONE_TOWER_TEMPLE" Index="6"/>
-        <Item Key="inv_stone_tower_temple" ID="NA_BGM_INV_STONE_TOWER_TEMPLE" Index="7"/>
-        <Item Key="failure_0" ID="NA_BGM_FAILURE_0" Index="8"/>
-        <Item Key="failure_1" ID="NA_BGM_FAILURE_1" Index="9"/>
-        <Item Key="happy_mask_salesman" ID="NA_BGM_HAPPY_MASK_SALESMAN" Index="10"/>
-        <Item Key="song_of_healing" ID="NA_BGM_SONG_OF_HEALING" Index="11"/>
-        <Item Key="swamp_region" ID="NA_BGM_SWAMP_REGION" Index="12"/>
-        <Item Key="alien_invasion" ID="NA_BGM_ALIEN_INVASION" Index="13"/>
-        <Item Key="swamp_cruise" ID="NA_BGM_SWAMP_CRUISE" Index="14"/>
-        <Item Key="sharps_curse" ID="NA_BGM_SHARPS_CURSE" Index="15"/>
-        <Item Key="great_bay_region" ID="NA_BGM_GREAT_BAY_REGION" Index="16"/>
-        <Item Key="ikana_region" ID="NA_BGM_IKANA_REGION" Index="17"/>
-        <Item Key="deku_palace" ID="NA_BGM_DEKU_PALACE" Index="18"/>
-        <Item Key="mountain_region" ID="NA_BGM_MOUNTAIN_REGION" Index="19"/>
-        <Item Key="pirates_fortress" ID="NA_BGM_PIRATES_FORTRESS" Index="20"/>
-        <Item Key="clock_town_day_1" ID="NA_BGM_CLOCK_TOWN_DAY_1" Index="21"/>
-        <Item Key="clock_town_day_2" ID="NA_BGM_CLOCK_TOWN_DAY_2" Index="22"/>
-        <Item Key="clock_town_day_3" ID="NA_BGM_CLOCK_TOWN_DAY_3" Index="23"/>
-        <Item Key="file_select" ID="NA_BGM_FILE_SELECT" Index="24"/>
-        <Item Key="clear_event" ID="NA_BGM_CLEAR_EVENT" Index="25"/>
-        <Item Key="enemy" ID="NA_BGM_ENEMY" Index="26"/>
-        <Item Key="boss" ID="NA_BGM_BOSS" Index="27"/>
-        <Item Key="woodfall_temple" ID="NA_BGM_WOODFALL_TEMPLE" Index="28"/>
-        <Item Key="clock_town_main_sequence" ID="NA_BGM_CLOCK_TOWN_MAIN_SEQUENCE" Index="29"/>
-        <Item Key="opening" ID="NA_BGM_OPENING" Index="30"/>
-        <Item Key="inside_a_house" ID="NA_BGM_INSIDE_A_HOUSE" Index="31"/>
-        <Item Key="game_over" ID="NA_BGM_GAME_OVER" Index="32"/>
-        <Item Key="clear_boss" ID="NA_BGM_CLEAR_BOSS" Index="33"/>
-        <Item Key="get_item" ID="NA_BGM_GET_ITEM" Index="34"/>
-        <Item Key="clock_town_day_2_ptr" ID="NA_BGM_CLOCK_TOWN_DAY_2_PTR" Index="35"/>
-        <Item Key="get_heart" ID="NA_BGM_GET_HEART" Index="36"/>
-        <Item Key="timed_mini_game" ID="NA_BGM_TIMED_MINI_GAME" Index="37"/>
-        <Item Key="goron_race" ID="NA_BGM_GORON_RACE" Index="38"/>
-        <Item Key="music_box_house" ID="NA_BGM_MUSIC_BOX_HOUSE" Index="39"/>
-        <Item Key="fairy_fountain" ID="NA_BGM_FAIRY_FOUNTAIN" Index="40"/>
-        <Item Key="zeldas_lullaby" ID="NA_BGM_ZELDAS_LULLABY" Index="41"/>
-        <Item Key="rosa_sisters" ID="NA_BGM_ROSA_SISTERS" Index="42"/>
-        <Item Key="open_chest" ID="NA_BGM_OPEN_CHEST" Index="43"/>
-        <Item Key="marine_research_lab" ID="NA_BGM_MARINE_RESEARCH_LAB" Index="44"/>
-        <Item Key="giants_theme" ID="NA_BGM_GIANTS_THEME" Index="45"/>
-        <Item Key="song_of_storms" ID="NA_BGM_SONG_OF_STORMS" Index="46"/>
-        <Item Key="romani_ranch" ID="NA_BGM_ROMANI_RANCH" Index="47"/>
-        <Item Key="goron_village" ID="NA_BGM_GORON_VILLAGE" Index="48"/>
-        <Item Key="mayors_office" ID="NA_BGM_MAYORS_OFFICE" Index="49"/>
-        <Item Key="ocarina_epona" ID="NA_BGM_OCARINA_EPONA" Index="50"/>
-        <Item Key="ocarina_suns" ID="NA_BGM_OCARINA_SUNS" Index="51"/>
-        <Item Key="ocarina_time" ID="NA_BGM_OCARINA_TIME" Index="52"/>
-        <Item Key="ocarina_storm" ID="NA_BGM_OCARINA_STORM" Index="53"/>
-        <Item Key="zora_hall" ID="NA_BGM_ZORA_HALL" Index="54"/>
-        <Item Key="get_new_mask" ID="NA_BGM_GET_NEW_MASK" Index="55"/>
-        <Item Key="mini_boss" ID="NA_BGM_MINI_BOSS" Index="56"/>
-        <Item Key="get_small_item" ID="NA_BGM_GET_SMALL_ITEM" Index="57"/>
-        <Item Key="astral_observatory" ID="NA_BGM_ASTRAL_OBSERVATORY" Index="58"/>
-        <Item Key="cavern" ID="NA_BGM_CAVERN" Index="59"/>
-        <Item Key="milk_bar" ID="NA_BGM_MILK_BAR" Index="60"/>
-        <Item Key="zelda_appear" ID="NA_BGM_ZELDA_APPEAR" Index="61"/>
-        <Item Key="sarias_song" ID="NA_BGM_SARIAS_SONG" Index="62"/>
-        <Item Key="goron_goal" ID="NA_BGM_GORON_GOAL" Index="63"/>
-        <Item Key="horse" ID="NA_BGM_HORSE" Index="64"/>
-        <Item Key="horse_goal" ID="NA_BGM_HORSE_GOAL" Index="65"/>
-        <Item Key="ingo" ID="NA_BGM_INGO" Index="66"/>
-        <Item Key="kotake_potion_shop" ID="NA_BGM_KOTAKE_POTION_SHOP" Index="67"/>
-        <Item Key="shop" ID="NA_BGM_SHOP" Index="68"/>
-        <Item Key="owl" ID="NA_BGM_OWL" Index="69"/>
-        <Item Key="shooting_gallery" ID="NA_BGM_SHOOTING_GALLERY" Index="70"/>
-        <Item Key="ocarina_soaring" ID="NA_BGM_OCARINA_SOARING" Index="71"/>
-        <Item Key="ocarina_healing" ID="NA_BGM_OCARINA_HEALING" Index="72"/>
-        <Item Key="inverted_song_of_time" ID="NA_BGM_INVERTED_SONG_OF_TIME" Index="73"/>
-        <Item Key="song_of_double_time" ID="NA_BGM_SONG_OF_DOUBLE_TIME" Index="74"/>
-        <Item Key="sonata_of_awakening" ID="NA_BGM_SONATA_OF_AWAKENING" Index="75"/>
-        <Item Key="goron_lullaby" ID="NA_BGM_GORON_LULLABY" Index="76"/>
-        <Item Key="new_wave_bossa_nova" ID="NA_BGM_NEW_WAVE_BOSSA_NOVA" Index="77"/>
-        <Item Key="elegy_of_emptiness" ID="NA_BGM_ELEGY_OF_EMPTINESS" Index="78"/>
-        <Item Key="oath_to_order" ID="NA_BGM_OATH_TO_ORDER" Index="79"/>
-        <Item Key="sword_training_hall" ID="NA_BGM_SWORD_TRAINING_HALL" Index="80"/>
-        <Item Key="ocarina_lullaby_intro" ID="NA_BGM_OCARINA_LULLABY_INTRO" Index="81"/>
-        <Item Key="learned_new_song" ID="NA_BGM_LEARNED_NEW_SONG" Index="82"/>
-        <Item Key="bremen_march" ID="NA_BGM_BREMEN_MARCH" Index="83"/>
-        <Item Key="ballad_of_the_wind_fish" ID="NA_BGM_BALLAD_OF_THE_WIND_FISH" Index="84"/>
-        <Item Key="song_of_soaring" ID="NA_BGM_SONG_OF_SOARING" Index="85"/>
-        <Item Key="milk_bar_duplicate" ID="NA_BGM_MILK_BAR_DUPLICATE" Index="86"/>
-        <Item Key="final_hours" ID="NA_BGM_FINAL_HOURS" Index="87"/>
-        <Item Key="mikau_riff" ID="NA_BGM_MIKAU_RIFF" Index="88"/>
-        <Item Key="mikau_finale" ID="NA_BGM_MIKAU_FINALE" Index="89"/>
-        <Item Key="frog_song" ID="NA_BGM_FROG_SONG" Index="90"/>
-        <Item Key="ocarina_sonata" ID="NA_BGM_OCARINA_SONATA" Index="91"/>
-        <Item Key="ocarina_lullaby" ID="NA_BGM_OCARINA_LULLABY" Index="92"/>
-        <Item Key="ocarina_new_wave" ID="NA_BGM_OCARINA_NEW_WAVE" Index="93"/>
-        <Item Key="ocarina_elegy" ID="NA_BGM_OCARINA_ELEGY" Index="94"/>
-        <Item Key="ocarina_oath" ID="NA_BGM_OCARINA_OATH" Index="95"/>
-        <Item Key="majoras_lair" ID="NA_BGM_MAJORAS_LAIR" Index="96"/>
-        <Item Key="ocarina_lullaby_intro_ptr" ID="NA_BGM_OCARINA_LULLABY_INTRO_PTR" Index="97"/>
-        <Item Key="ocarina_guitar_bass_session" ID="NA_BGM_OCARINA_GUITAR_BASS_SESSION" Index="98"/>
-        <Item Key="piano_session" ID="NA_BGM_PIANO_SESSION" Index="99"/>
-        <Item Key="indigo_go_session" ID="NA_BGM_INDIGO_GO_SESSION" Index="100"/>
-        <Item Key="snowhead_temple" ID="NA_BGM_SNOWHEAD_TEMPLE" Index="101"/>
-        <Item Key="great_bay_temple" ID="NA_BGM_GREAT_BAY_TEMPLE" Index="102"/>
-        <Item Key="new_wave_saxophone" ID="NA_BGM_NEW_WAVE_SAXOPHONE" Index="103"/>
-        <Item Key="new_wave_vocal" ID="NA_BGM_NEW_WAVE_VOCAL" Index="104"/>
-        <Item Key="majoras_wrath" ID="NA_BGM_MAJORAS_WRATH" Index="105"/>
-        <Item Key="majoras_incarnation" ID="NA_BGM_MAJORAS_INCARNATION" Index="106"/>
-        <Item Key="majoras_mask" ID="NA_BGM_MAJORAS_MASK" Index="107"/>
-        <Item Key="bass_play" ID="NA_BGM_BASS_PLAY" Index="108"/>
-        <Item Key="drums_play" ID="NA_BGM_DRUMS_PLAY" Index="109"/>
-        <Item Key="piano_play" ID="NA_BGM_PIANO_PLAY" Index="110"/>
-        <Item Key="ikana_castle" ID="NA_BGM_IKANA_CASTLE" Index="111"/>
-        <Item Key="gathering_giants" ID="NA_BGM_GATHERING_GIANTS" Index="112"/>
-        <Item Key="kamaro_dance" ID="NA_BGM_KAMARO_DANCE" Index="113"/>
-        <Item Key="cremia_carriage" ID="NA_BGM_CREMIA_CARRIAGE" Index="114"/>
-        <Item Key="keaton_quiz" ID="NA_BGM_KEATON_QUIZ" Index="115"/>
-        <Item Key="end_credits" ID="NA_BGM_END_CREDITS" Index="116"/>
-        <Item Key="opening_loop" ID="NA_BGM_OPENING_LOOP" Index="117"/>
-        <Item Key="title_theme" ID="NA_BGM_TITLE_THEME" Index="118"/>
-        <Item Key="dungeon_appear" ID="NA_BGM_DUNGEON_APPEAR" Index="119"/>
-        <Item Key="woodfall_clear" ID="NA_BGM_WOODFALL_CLEAR" Index="120"/>
-        <Item Key="snowhead_clear" ID="NA_BGM_SNOWHEAD_CLEAR" Index="121"/>
-        <Item Key="into_the_moon" ID="NA_BGM_INTO_THE_MOON" Index="123"/>
-        <Item Key="goodbye_giant" ID="NA_BGM_GOODBYE_GIANT" Index="124"/>
-        <Item Key="tatl_and_tael" ID="NA_BGM_TATL_AND_TAEL" Index="125"/>
-        <Item Key="moons_destruction" ID="NA_BGM_MOONS_DESTRUCTION" Index="126"/>
-        <Item Key="end_credits_second_half" ID="NA_BGM_END_CREDITS_SECOND_HALF" Index="127"/>
-    </Enum>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/filelists/dbg.txt b/Android/app/src/main/assets/assets/extractor/filelists/dbg.txt
deleted file mode 100644
index 68af5e557..000000000
--- a/Android/app/src/main/assets/assets/extractor/filelists/dbg.txt
+++ /dev/null
@@ -1,1532 +0,0 @@
-makerom
-boot
-dmadata
-Audiobank
-Audioseq
-Audiotable
-link_animetion
-icon_item_static
-icon_item_24_static
-icon_item_field_static
-icon_item_dungeon_static
-icon_item_gameover_static
-icon_item_nes_static
-icon_item_ger_static
-icon_item_fra_static
-item_name_static
-map_name_static
-do_action_static
-message_static
-message_texture_static
-nes_font_static
-nes_message_data_static
-ger_message_data_static
-fra_message_data_static
-staff_message_data_static
-map_grand_static
-map_i_static
-map_48x85_static
-code
-ovl_title
-ovl_select
-ovl_opening
-ovl_file_choose
-ovl_kaleido_scope
-ovl_player_actor
-ovl_map_mark_data
-ovl_En_Test
-ovl_Arms_Hook
-ovl_Arrow_Fire
-ovl_Arrow_Ice
-ovl_Arrow_Light
-ovl_Bg_Bdan_Objects
-ovl_Bg_Bdan_Switch
-ovl_Bg_Bom_Guard
-ovl_Bg_Bombwall
-ovl_Bg_Bowl_Wall
-ovl_Bg_Breakwall
-ovl_Bg_Ddan_Jd
-ovl_Bg_Ddan_Kd
-ovl_Bg_Dodoago
-ovl_Bg_Dy_Yoseizo
-ovl_Bg_Ganon_Otyuka
-ovl_Bg_Gate_Shutter
-ovl_Bg_Gjyo_Bridge
-ovl_Bg_Gnd_Darkmeiro
-ovl_Bg_Gnd_Firemeiro
-ovl_Bg_Gnd_Iceblock
-ovl_Bg_Gnd_Nisekabe
-ovl_Bg_Gnd_Soulmeiro
-ovl_Bg_Haka
-ovl_Bg_Haka_Gate
-ovl_Bg_Haka_Huta
-ovl_Bg_Haka_Megane
-ovl_Bg_Haka_MeganeBG
-ovl_Bg_Haka_Sgami
-ovl_Bg_Haka_Ship
-ovl_Bg_Haka_Trap
-ovl_Bg_Haka_Tubo
-ovl_Bg_Haka_Water
-ovl_Bg_Haka_Zou
-ovl_Bg_Heavy_Block
-ovl_Bg_Hidan_Curtain
-ovl_Bg_Hidan_Dalm
-ovl_Bg_Hidan_Firewall
-ovl_Bg_Hidan_Fslift
-ovl_Bg_Hidan_Fwbig
-ovl_Bg_Hidan_Hamstep
-ovl_Bg_Hidan_Hrock
-ovl_Bg_Hidan_Kousi
-ovl_Bg_Hidan_Kowarerukabe
-ovl_Bg_Hidan_Rock
-ovl_Bg_Hidan_Rsekizou
-ovl_Bg_Hidan_Sekizou
-ovl_Bg_Hidan_Sima
-ovl_Bg_Hidan_Syoku
-ovl_Bg_Ice_Objects
-ovl_Bg_Ice_Shelter
-ovl_Bg_Ice_Shutter
-ovl_Bg_Ice_Turara
-ovl_Bg_Ingate
-ovl_Bg_Jya_1flift
-ovl_Bg_Jya_Amishutter
-ovl_Bg_Jya_Bigmirror
-ovl_Bg_Jya_Block
-ovl_Bg_Jya_Bombchuiwa
-ovl_Bg_Jya_Bombiwa
-ovl_Bg_Jya_Cobra
-ovl_Bg_Jya_Goroiwa
-ovl_Bg_Jya_Haheniron
-ovl_Bg_Jya_Ironobj
-ovl_Bg_Jya_Kanaami
-ovl_Bg_Jya_Lift
-ovl_Bg_Jya_Megami
-ovl_Bg_Jya_Zurerukabe
-ovl_Bg_Menkuri_Eye
-ovl_Bg_Menkuri_Kaiten
-ovl_Bg_Menkuri_Nisekabe
-ovl_Bg_Mizu_Bwall
-ovl_Bg_Mizu_Movebg
-ovl_Bg_Mizu_Shutter
-ovl_Bg_Mizu_Uzu
-ovl_Bg_Mizu_Water
-ovl_Bg_Mjin
-ovl_Bg_Mori_Bigst
-ovl_Bg_Mori_Elevator
-ovl_Bg_Mori_Hashigo
-ovl_Bg_Mori_Hashira4
-ovl_Bg_Mori_Hineri
-ovl_Bg_Mori_Idomizu
-ovl_Bg_Mori_Kaitenkabe
-ovl_Bg_Mori_Rakkatenjo
-ovl_Bg_Po_Event
-ovl_Bg_Po_Syokudai
-ovl_Bg_Pushbox
-ovl_Bg_Relay_Objects
-ovl_Bg_Spot00_Break
-ovl_Bg_Spot00_Hanebasi
-ovl_Bg_Spot01_Fusya
-ovl_Bg_Spot01_Idohashira
-ovl_Bg_Spot01_Idomizu
-ovl_Bg_Spot01_Idosoko
-ovl_Bg_Spot01_Objects2
-ovl_Bg_Spot02_Objects
-ovl_Bg_Spot03_Taki
-ovl_Bg_Spot05_Soko
-ovl_Bg_Spot06_Objects
-ovl_Bg_Spot07_Taki
-ovl_Bg_Spot08_Bakudankabe
-ovl_Bg_Spot08_Iceblock
-ovl_Bg_Spot09_Obj
-ovl_Bg_Spot11_Bakudankabe
-ovl_Bg_Spot11_Oasis
-ovl_Bg_Spot12_Gate
-ovl_Bg_Spot12_Saku
-ovl_Bg_Spot15_Rrbox
-ovl_Bg_Spot15_Saku
-ovl_Bg_Spot16_Bombstone
-ovl_Bg_Spot16_Doughnut
-ovl_Bg_Spot17_Bakudankabe
-ovl_Bg_Spot17_Funen
-ovl_Bg_Spot18_Basket
-ovl_Bg_Spot18_Futa
-ovl_Bg_Spot18_Obj
-ovl_Bg_Spot18_Shutter
-ovl_Bg_Sst_Floor
-ovl_Bg_Toki_Hikari
-ovl_Bg_Toki_Swd
-ovl_Bg_Treemouth
-ovl_Bg_Umajump
-ovl_Bg_Vb_Sima
-ovl_Bg_Ydan_Hasi
-ovl_Bg_Ydan_Maruta
-ovl_Bg_Ydan_Sp
-ovl_Bg_Zg
-ovl_Boss_Dodongo
-ovl_Boss_Fd
-ovl_Boss_Fd2
-ovl_Boss_Ganon
-ovl_Boss_Ganon2
-ovl_Boss_Ganondrof
-ovl_Boss_Goma
-ovl_Boss_Mo
-ovl_Boss_Sst
-ovl_Boss_Tw
-ovl_Boss_Va
-ovl_Demo_6K
-ovl_Demo_Du
-ovl_Demo_Ec
-ovl_Demo_Effect
-ovl_Demo_Ext
-ovl_Demo_Geff
-ovl_Demo_Gj
-ovl_Demo_Go
-ovl_Demo_Gt
-ovl_Demo_Ik
-ovl_Demo_Im
-ovl_Demo_Kankyo
-ovl_Demo_Kekkai
-ovl_Demo_Sa
-ovl_Demo_Shd
-ovl_Demo_Tre_Lgt
-ovl_Door_Ana
-ovl_Door_Gerudo
-ovl_Door_Killer
-ovl_Door_Shutter
-ovl_Door_Toki
-ovl_Door_Warp1
-ovl_Efc_Erupc
-ovl_Eff_Dust
-ovl_Effect_Ss_Blast
-ovl_Effect_Ss_Bomb
-ovl_Effect_Ss_Bomb2
-ovl_Effect_Ss_Bubble
-ovl_Effect_Ss_D_Fire
-ovl_Effect_Ss_Dead_Db
-ovl_Effect_Ss_Dead_Dd
-ovl_Effect_Ss_Dead_Ds
-ovl_Effect_Ss_Dead_Sound
-ovl_Effect_Ss_Dt_Bubble
-ovl_Effect_Ss_Dust
-ovl_Effect_Ss_En_Fire
-ovl_Effect_Ss_En_Ice
-ovl_Effect_Ss_Extra
-ovl_Effect_Ss_Fcircle
-ovl_Effect_Ss_Fhg_Flash
-ovl_Effect_Ss_Fire_Tail
-ovl_Effect_Ss_G_Fire
-ovl_Effect_Ss_G_Magma
-ovl_Effect_Ss_G_Magma2
-ovl_Effect_Ss_G_Ripple
-ovl_Effect_Ss_G_Spk
-ovl_Effect_Ss_G_Splash
-ovl_Effect_Ss_Hahen
-ovl_Effect_Ss_HitMark
-ovl_Effect_Ss_Ice_Piece
-ovl_Effect_Ss_Ice_Smoke
-ovl_Effect_Ss_K_Fire
-ovl_Effect_Ss_Kakera
-ovl_Effect_Ss_KiraKira
-ovl_Effect_Ss_Lightning
-ovl_Effect_Ss_Sibuki
-ovl_Effect_Ss_Sibuki2
-ovl_Effect_Ss_Solder_Srch_Ball
-ovl_Effect_Ss_Stick
-ovl_Effect_Ss_Stone1
-ovl_Elf_Msg
-ovl_Elf_Msg2
-ovl_En_Am
-ovl_En_Ani
-ovl_En_Anubice
-ovl_En_Anubice_Fire
-ovl_En_Anubice_Tag
-ovl_En_Arow_Trap
-ovl_En_Arrow
-ovl_En_Attack_Niw
-ovl_En_Ba
-ovl_En_Bb
-ovl_En_Bdfire
-ovl_En_Bigokuta
-ovl_En_Bili
-ovl_En_Bird
-ovl_En_Blkobj
-ovl_En_Bom
-ovl_En_Bom_Bowl_Man
-ovl_En_Bom_Bowl_Pit
-ovl_En_Bom_Chu
-ovl_En_Bombf
-ovl_En_Boom
-ovl_En_Box
-ovl_En_Brob
-ovl_En_Bubble
-ovl_En_Butte
-ovl_En_Bw
-ovl_En_Bx
-ovl_En_Changer
-ovl_En_Clear_Tag
-ovl_En_Cow
-ovl_En_Crow
-ovl_En_Cs
-ovl_En_Daiku
-ovl_En_Daiku_Kakariko
-ovl_En_Dekubaba
-ovl_En_Dekunuts
-ovl_En_Dh
-ovl_En_Dha
-ovl_En_Diving_Game
-ovl_En_Dns
-ovl_En_Dnt_Demo
-ovl_En_Dnt_Jiji
-ovl_En_Dnt_Nomal
-ovl_En_Dodojr
-ovl_En_Dodongo
-ovl_En_Dog
-ovl_En_Door
-ovl_En_Ds
-ovl_En_Du
-ovl_En_Dy_Extra
-ovl_En_Eg
-ovl_En_Eiyer
-ovl_En_Elf
-ovl_En_Encount1
-ovl_En_Encount2
-ovl_En_Ex_Item
-ovl_En_Ex_Ruppy
-ovl_En_Fd
-ovl_En_Fd_Fire
-ovl_En_Fhg_Fire
-ovl_En_Fire_Rock
-ovl_En_Firefly
-ovl_En_Fish
-ovl_En_Floormas
-ovl_En_Fr
-ovl_En_Fu
-ovl_En_Fw
-ovl_En_Fz
-ovl_En_G_Switch
-ovl_En_Ganon_Mant
-ovl_En_Ganon_Organ
-ovl_En_Gb
-ovl_En_Ge1
-ovl_En_Ge2
-ovl_En_Ge3
-ovl_En_GeldB
-ovl_En_GirlA
-ovl_En_Gm
-ovl_En_Go
-ovl_En_Go2
-ovl_En_Goma
-ovl_En_Goroiwa
-ovl_En_Gs
-ovl_En_Guest
-ovl_En_Hata
-ovl_En_Heishi1
-ovl_En_Heishi2
-ovl_En_Heishi3
-ovl_En_Heishi4
-ovl_En_Hintnuts
-ovl_En_Holl
-ovl_En_Honotrap
-ovl_En_Horse
-ovl_En_Horse_Game_Check
-ovl_En_Horse_Ganon
-ovl_En_Horse_Link_Child
-ovl_En_Horse_Normal
-ovl_En_Horse_Zelda
-ovl_En_Hs
-ovl_En_Hs2
-ovl_En_Hy
-ovl_En_Ice_Hono
-ovl_En_Ik
-ovl_En_In
-ovl_En_Insect
-ovl_En_Ishi
-ovl_En_It
-ovl_En_Jj
-ovl_En_Js
-ovl_En_Jsjutan
-ovl_En_Kakasi
-ovl_En_Kakasi2
-ovl_En_Kakasi3
-ovl_En_Kanban
-ovl_En_Karebaba
-ovl_En_Ko
-ovl_En_Kusa
-ovl_En_Kz
-ovl_En_Light
-ovl_En_Lightbox
-ovl_En_M_Fire1
-ovl_En_M_Thunder
-ovl_En_Ma1
-ovl_En_Ma2
-ovl_En_Ma3
-ovl_En_Mag
-ovl_En_Mb
-ovl_En_Md
-ovl_En_Mk
-ovl_En_Mm
-ovl_En_Mm2
-ovl_En_Ms
-ovl_En_Mu
-ovl_En_Nb
-ovl_En_Niw
-ovl_En_Niw_Girl
-ovl_En_Niw_Lady
-ovl_En_Nutsball
-ovl_En_Nwc
-ovl_En_Ny
-ovl_En_OE2
-ovl_En_Okarina_Effect
-ovl_En_Okarina_Tag
-ovl_En_Okuta
-ovl_En_Ossan
-ovl_En_Owl
-ovl_En_Part
-ovl_En_Peehat
-ovl_En_Po_Desert
-ovl_En_Po_Field
-ovl_En_Po_Relay
-ovl_En_Po_Sisters
-ovl_En_Poh
-ovl_En_Pu_box
-ovl_En_Rd
-ovl_En_Reeba
-ovl_En_River_Sound
-ovl_En_Rl
-ovl_En_Rr
-ovl_En_Ru1
-ovl_En_Ru2
-ovl_En_Sa
-ovl_En_Sb
-ovl_En_Scene_Change
-ovl_En_Sda
-ovl_En_Shopnuts
-ovl_En_Si
-ovl_En_Siofuki
-ovl_En_Skb
-ovl_En_Skj
-ovl_En_Skjneedle
-ovl_En_Ssh
-ovl_En_St
-ovl_En_Sth
-ovl_En_Stream
-ovl_En_Sw
-ovl_En_Syateki_Itm
-ovl_En_Syateki_Man
-ovl_En_Syateki_Niw
-ovl_En_Ta
-ovl_En_Takara_Man
-ovl_En_Tana
-ovl_En_Tg
-ovl_En_Tite
-ovl_En_Tk
-ovl_En_Torch
-ovl_En_Torch2
-ovl_En_Toryo
-ovl_En_Tp
-ovl_En_Tr
-ovl_En_Trap
-ovl_En_Tubo_Trap
-ovl_En_Vali
-ovl_En_Vase
-ovl_En_Vb_Ball
-ovl_En_Viewer
-ovl_En_Vm
-ovl_En_Wall_Tubo
-ovl_En_Wallmas
-ovl_En_Weather_Tag
-ovl_En_Weiyer
-ovl_En_Wf
-ovl_En_Wonder_Item
-ovl_En_Wonder_Talk
-ovl_En_Wonder_Talk2
-ovl_En_Wood02
-ovl_En_Xc
-ovl_En_Yabusame_Mark
-ovl_En_Yukabyun
-ovl_En_Zf
-ovl_En_Zl1
-ovl_En_Zl2
-ovl_En_Zl3
-ovl_En_Zl4
-ovl_En_Zo
-ovl_En_fHG
-ovl_End_Title
-ovl_Fishing
-ovl_Item_B_Heart
-ovl_Item_Etcetera
-ovl_Item_Inbox
-ovl_Item_Ocarina
-ovl_Item_Shield
-ovl_Magic_Dark
-ovl_Magic_Fire
-ovl_Magic_Wind
-ovl_Mir_Ray
-ovl_Obj_Bean
-ovl_Obj_Blockstop
-ovl_Obj_Bombiwa
-ovl_Obj_Comb
-ovl_Obj_Dekujr
-ovl_Obj_Elevator
-ovl_Obj_Hamishi
-ovl_Obj_Hana
-ovl_Obj_Hsblock
-ovl_Obj_Ice_Poly
-ovl_Obj_Kibako
-ovl_Obj_Kibako2
-ovl_Obj_Lift
-ovl_Obj_Lightswitch
-ovl_Obj_Makekinsuta
-ovl_Obj_Makeoshihiki
-ovl_Obj_Mure
-ovl_Obj_Mure2
-ovl_Obj_Mure3
-ovl_Obj_Oshihiki
-ovl_Obj_Roomtimer
-ovl_Obj_Switch
-ovl_Obj_Syokudai
-ovl_Obj_Timeblock
-ovl_Obj_Tsubo
-ovl_Obj_Warp2block
-ovl_Object_Kankyo
-ovl_Oceff_Spot
-ovl_Oceff_Storm
-ovl_Oceff_Wipe
-ovl_Oceff_Wipe2
-ovl_Oceff_Wipe3
-ovl_Oceff_Wipe4
-ovl_Shot_Sun
-gameplay_keep
-gameplay_field_keep
-gameplay_dangeon_keep
-gameplay_object_exchange_static
-object_link_boy
-object_link_child
-object_box
-object_human
-object_okuta
-object_poh
-object_wallmaster
-object_dy_obj
-object_firefly
-object_dodongo
-object_fire
-object_niw
-object_tite
-object_reeba
-object_peehat
-object_kingdodongo
-object_horse
-object_zf
-object_goma
-object_zl1
-object_gol
-object_bubble
-object_dodojr
-object_torch2
-object_bl
-object_tp
-object_oA1
-object_st
-object_bw
-object_ei
-object_horse_normal
-object_oB1
-object_o_anime
-object_spot04_objects
-object_ddan_objects
-object_hidan_objects
-object_horse_ganon
-object_oA2
-object_spot00_objects
-object_mb
-object_bombf
-object_sk2
-object_oE1
-object_oE_anime
-object_oE2
-object_ydan_objects
-object_gnd
-object_am
-object_dekubaba
-object_oA3
-object_oA4
-object_oA5
-object_oA6
-object_oA7
-object_jj
-object_oA8
-object_oA9
-object_oB2
-object_oB3
-object_oB4
-object_horse_zelda
-object_opening_demo1
-object_warp1
-object_b_heart
-object_dekunuts
-object_oE3
-object_oE4
-object_menkuri_objects
-object_oE5
-object_oE6
-object_oE7
-object_oE8
-object_oE9
-object_oE10
-object_oE11
-object_oE12
-object_vali
-object_oA10
-object_oA11
-object_mizu_objects
-object_fhg
-object_ossan
-object_mori_hineri1
-object_Bb
-object_toki_objects
-object_yukabyun
-object_zl2
-object_mjin
-object_mjin_flash
-object_mjin_dark
-object_mjin_flame
-object_mjin_ice
-object_mjin_soul
-object_mjin_wind
-object_mjin_oka
-object_haka_objects
-object_spot06_objects
-object_ice_objects
-object_relay_objects
-object_mori_hineri1a
-object_mori_hineri2
-object_mori_hineri2a
-object_mori_objects
-object_mori_tex
-object_spot08_obj
-object_warp2
-object_hata
-object_bird
-object_wood02
-object_lightbox
-object_pu_box
-object_trap
-object_vase
-object_im
-object_ta
-object_tk
-object_xc
-object_vm
-object_bv
-object_hakach_objects
-object_efc_crystal_light
-object_efc_fire_ball
-object_efc_flash
-object_efc_lgt_shower
-object_efc_star_field
-object_god_lgt
-object_light_ring
-object_triforce_spot
-object_medal
-object_bdan_objects
-object_sd
-object_rd
-object_po_sisters
-object_heavy_object
-object_gndd
-object_fd
-object_du
-object_fw
-object_horse_link_child
-object_spot02_objects
-object_haka
-object_ru1
-object_syokudai
-object_fd2
-object_dh
-object_rl
-object_efc_tw
-object_demo_tre_lgt
-object_gi_key
-object_mir_ray
-object_brob
-object_gi_jewel
-object_spot09_obj
-object_spot18_obj
-object_bdoor
-object_spot17_obj
-object_shop_dungen
-object_nb
-object_mo
-object_sb
-object_gi_melody
-object_gi_heart
-object_gi_compass
-object_gi_bosskey
-object_gi_medal
-object_gi_nuts
-object_sa
-object_gi_hearts
-object_gi_arrowcase
-object_gi_bombpouch
-object_in
-object_tr
-object_spot16_obj
-object_oE1s
-object_oE4s
-object_os_anime
-object_gi_bottle
-object_gi_stick
-object_gi_map
-object_oF1d_map
-object_ru2
-object_gi_shield_1
-object_dekujr
-object_gi_magicpot
-object_gi_bomb_1
-object_oF1s
-object_ma2
-object_gi_purse
-object_hni
-object_tw
-object_rr
-object_bxa
-object_anubice
-object_gi_gerudo
-object_gi_arrow
-object_gi_bomb_2
-object_gi_egg
-object_gi_scale
-object_gi_shield_2
-object_gi_hookshot
-object_gi_ocarina
-object_gi_milk
-object_ma1
-object_ganon
-object_sst
-object_ny
-object_fr
-object_gi_pachinko
-object_gi_boomerang
-object_gi_bow
-object_gi_glasses
-object_gi_liquid
-object_ani
-object_demo_6k
-object_gi_shield_3
-object_gi_letter
-object_spot15_obj
-object_jya_obj
-object_gi_clothes
-object_gi_bean
-object_gi_fish
-object_gi_saw
-object_gi_hammer
-object_gi_grass
-object_gi_longsword
-object_spot01_objects
-object_md
-object_km1
-object_kw1
-object_zo
-object_kz
-object_umajump
-object_masterkokiri
-object_masterkokirihead
-object_mastergolon
-object_masterzoora
-object_aob
-object_ik
-object_ahg
-object_cne
-object_gi_niwatori
-object_skj
-object_gi_bottle_letter
-object_bji
-object_bba
-object_gi_ocarina_0
-object_ds
-object_ane
-object_boj
-object_spot03_object
-object_spot07_object
-object_fz
-object_bob
-object_ge1
-object_yabusame_point
-object_gi_boots_2
-object_gi_seed
-object_gnd_magic
-object_d_elevator
-object_d_hsblock
-object_d_lift
-object_mamenoki
-object_goroiwa
-object_toryo
-object_daiku
-object_nwc
-object_blkobj
-object_gm
-object_ms
-object_hs
-object_ingate
-object_lightswitch
-object_kusa
-object_tsubo
-object_gi_gloves
-object_gi_coin
-object_kanban
-object_gjyo_objects
-object_owl
-object_mk
-object_fu
-object_gi_ki_tan_mask
-object_gi_redead_mask
-object_gi_skj_mask
-object_gi_rabit_mask
-object_gi_truth_mask
-object_ganon_objects
-object_siofuki
-object_stream
-object_mm
-object_fa
-object_os
-object_gi_eye_lotion
-object_gi_powder
-object_gi_mushroom
-object_gi_ticketstone
-object_gi_brokensword
-object_js
-object_cs
-object_gi_prescription
-object_gi_bracelet
-object_gi_soldout
-object_gi_frog
-object_mag
-object_door_gerudo
-object_gt
-object_efc_erupc
-object_zl2_anime1
-object_zl2_anime2
-object_gi_golonmask
-object_gi_zoramask
-object_gi_gerudomask
-object_ganon2
-object_ka
-object_ts
-object_zg
-object_gi_hoverboots
-object_gi_m_arrow
-object_ds2
-object_ec
-object_fish
-object_gi_sutaru
-object_gi_goddess
-object_ssh
-object_bigokuta
-object_bg
-object_spot05_objects
-object_spot12_obj
-object_bombiwa
-object_hintnuts
-object_rs
-object_spot00_break
-object_gla
-object_shopnuts
-object_geldb
-object_gr
-object_dog
-object_jya_iron
-object_jya_door
-object_spot01_objects2
-object_spot11_obj
-object_kibako2
-object_dns
-object_dnk
-object_gi_fire
-object_gi_insect
-object_gi_butterfly
-object_gi_ghost
-object_gi_soul
-object_bowl
-object_po_field
-object_demo_kekkai
-object_efc_doughnut
-object_gi_dekupouch
-object_ganon_anime1
-object_ganon_anime2
-object_ganon_anime3
-object_gi_rupy
-object_spot01_matoya
-object_spot01_matoyab
-object_po_composer
-object_mu
-object_wf
-object_skb
-object_gj
-object_geff
-object_haka_door
-object_gs
-object_ps
-object_bwall
-object_crow
-object_cow
-object_cob
-object_gi_sword_1
-object_door_killer
-object_ouke_haka
-object_timeblock
-object_zl4
-g_pn_01
-g_pn_02
-g_pn_03
-g_pn_04
-g_pn_05
-g_pn_06
-g_pn_07
-g_pn_08
-g_pn_09
-g_pn_10
-g_pn_11
-g_pn_12
-g_pn_13
-g_pn_14
-g_pn_15
-g_pn_16
-g_pn_17
-g_pn_18
-g_pn_19
-g_pn_20
-g_pn_21
-g_pn_22
-g_pn_23
-g_pn_24
-g_pn_25
-g_pn_26
-g_pn_27
-g_pn_28
-g_pn_29
-g_pn_30
-g_pn_31
-g_pn_32
-g_pn_33
-g_pn_34
-g_pn_35
-g_pn_36
-g_pn_37
-g_pn_38
-g_pn_39
-g_pn_40
-g_pn_41
-g_pn_42
-g_pn_43
-g_pn_44
-g_pn_45
-g_pn_46
-g_pn_47
-g_pn_48
-g_pn_49
-g_pn_50
-g_pn_51
-g_pn_52
-g_pn_53
-g_pn_54
-g_pn_55
-g_pn_56
-g_pn_57
-z_select_static
-nintendo_rogo_static
-title_static
-parameter_static
-vr_fine0_static
-vr_fine0_pal_static
-vr_fine1_static
-vr_fine1_pal_static
-vr_fine2_static
-vr_fine2_pal_static
-vr_fine3_static
-vr_fine3_pal_static
-vr_cloud0_static
-vr_cloud0_pal_static
-vr_cloud1_static
-vr_cloud1_pal_static
-vr_cloud2_static
-vr_cloud2_pal_static
-vr_cloud3_static
-vr_cloud3_pal_static
-vr_holy0_static
-vr_holy0_pal_static
-vr_holy1_static
-vr_holy1_pal_static
-vr_MDVR_static
-vr_MDVR_pal_static
-vr_MNVR_static
-vr_MNVR_pal_static
-vr_RUVR_static
-vr_RUVR_pal_static
-vr_LHVR_static
-vr_LHVR_pal_static
-vr_KHVR_static
-vr_KHVR_pal_static
-vr_K3VR_static
-vr_K3VR_pal_static
-vr_K4VR_static
-vr_K4VR_pal_static
-vr_K5VR_static
-vr_K5VR_pal_static
-vr_SP1a_static
-vr_SP1a_pal_static
-vr_MLVR_static
-vr_MLVR_pal_static
-vr_KKRVR_static
-vr_KKRVR_pal_static
-vr_KR3VR_static
-vr_KR3VR_pal_static
-vr_IPVR_static
-vr_IPVR_pal_static
-vr_KSVR_static
-vr_KSVR_pal_static
-vr_GLVR_static
-vr_GLVR_pal_static
-vr_ZRVR_static
-vr_ZRVR_pal_static
-vr_DGVR_static
-vr_DGVR_pal_static
-vr_ALVR_static
-vr_ALVR_pal_static
-vr_NSVR_static
-vr_NSVR_pal_static
-vr_LBVR_static
-vr_LBVR_pal_static
-vr_TTVR_static
-vr_TTVR_pal_static
-vr_FCVR_static
-vr_FCVR_pal_static
-elf_message_field
-elf_message_ydan
-syotes_scene
-syotes_room_0
-syotes2_scene
-syotes2_room_0
-depth_test_scene
-depth_test_room_0
-spot00_scene
-spot00_room_0
-spot01_scene
-spot01_room_0
-spot02_scene
-spot02_room_0
-spot02_room_1
-spot03_scene
-spot03_room_0
-spot03_room_1
-spot04_scene
-spot04_room_0
-spot04_room_1
-spot04_room_2
-spot05_scene
-spot05_room_0
-spot06_scene
-spot06_room_0
-spot07_scene
-spot07_room_0
-spot07_room_1
-spot08_scene
-spot08_room_0
-spot09_scene
-spot09_room_0
-spot10_scene
-spot10_room_0
-spot10_room_1
-spot10_room_2
-spot10_room_3
-spot10_room_4
-spot10_room_5
-spot10_room_6
-spot10_room_7
-spot10_room_8
-spot10_room_9
-spot11_scene
-spot11_room_0
-spot12_scene
-spot12_room_0
-spot12_room_1
-spot13_scene
-spot13_room_0
-spot13_room_1
-spot15_scene
-spot15_room_0
-spot16_scene
-spot16_room_0
-spot17_scene
-spot17_room_0
-spot17_room_1
-spot18_scene
-spot18_room_0
-spot18_room_1
-spot18_room_2
-spot18_room_3
-ydan_scene
-ydan_room_0
-ydan_room_1
-ydan_room_2
-ydan_room_3
-ydan_room_4
-ydan_room_5
-ydan_room_6
-ydan_room_7
-ydan_room_8
-ydan_room_9
-ydan_room_10
-ydan_room_11
-ddan_scene
-ddan_room_0
-ddan_room_1
-ddan_room_2
-ddan_room_3
-ddan_room_4
-ddan_room_5
-ddan_room_6
-ddan_room_7
-ddan_room_8
-ddan_room_9
-ddan_room_10
-ddan_room_11
-ddan_room_12
-ddan_room_13
-ddan_room_14
-ddan_room_15
-ddan_room_16
-bdan_scene
-bdan_room_0
-bdan_room_1
-bdan_room_2
-bdan_room_3
-bdan_room_4
-bdan_room_5
-bdan_room_6
-bdan_room_7
-bdan_room_8
-bdan_room_9
-bdan_room_10
-bdan_room_11
-bdan_room_12
-bdan_room_13
-bdan_room_14
-bdan_room_15
-Bmori1_scene
-Bmori1_room_0
-Bmori1_room_1
-Bmori1_room_2
-Bmori1_room_3
-Bmori1_room_4
-Bmori1_room_5
-Bmori1_room_6
-Bmori1_room_7
-Bmori1_room_8
-Bmori1_room_9
-Bmori1_room_10
-Bmori1_room_11
-Bmori1_room_12
-Bmori1_room_13
-Bmori1_room_14
-Bmori1_room_15
-Bmori1_room_16
-Bmori1_room_17
-Bmori1_room_18
-Bmori1_room_19
-Bmori1_room_20
-Bmori1_room_21
-Bmori1_room_22
-HIDAN_scene
-HIDAN_room_0
-HIDAN_room_1
-HIDAN_room_2
-HIDAN_room_3
-HIDAN_room_4
-HIDAN_room_5
-HIDAN_room_6
-HIDAN_room_7
-HIDAN_room_8
-HIDAN_room_9
-HIDAN_room_10
-HIDAN_room_11
-HIDAN_room_12
-HIDAN_room_13
-HIDAN_room_14
-HIDAN_room_15
-HIDAN_room_16
-HIDAN_room_17
-HIDAN_room_18
-HIDAN_room_19
-HIDAN_room_20
-HIDAN_room_21
-HIDAN_room_22
-HIDAN_room_23
-HIDAN_room_24
-HIDAN_room_25
-HIDAN_room_26
-MIZUsin_scene
-MIZUsin_room_0
-MIZUsin_room_1
-MIZUsin_room_2
-MIZUsin_room_3
-MIZUsin_room_4
-MIZUsin_room_5
-MIZUsin_room_6
-MIZUsin_room_7
-MIZUsin_room_8
-MIZUsin_room_9
-MIZUsin_room_10
-MIZUsin_room_11
-MIZUsin_room_12
-MIZUsin_room_13
-MIZUsin_room_14
-MIZUsin_room_15
-MIZUsin_room_16
-MIZUsin_room_17
-MIZUsin_room_18
-MIZUsin_room_19
-MIZUsin_room_20
-MIZUsin_room_21
-MIZUsin_room_22
-jyasinzou_scene
-jyasinzou_room_0
-jyasinzou_room_1
-jyasinzou_room_2
-jyasinzou_room_3
-jyasinzou_room_4
-jyasinzou_room_5
-jyasinzou_room_6
-jyasinzou_room_7
-jyasinzou_room_8
-jyasinzou_room_9
-jyasinzou_room_10
-jyasinzou_room_11
-jyasinzou_room_12
-jyasinzou_room_13
-jyasinzou_room_14
-jyasinzou_room_15
-jyasinzou_room_16
-jyasinzou_room_17
-jyasinzou_room_18
-jyasinzou_room_19
-jyasinzou_room_20
-jyasinzou_room_21
-jyasinzou_room_22
-jyasinzou_room_23
-jyasinzou_room_24
-jyasinzou_room_25
-jyasinzou_room_26
-jyasinzou_room_27
-jyasinzou_room_28
-HAKAdan_scene
-HAKAdan_room_0
-HAKAdan_room_1
-HAKAdan_room_2
-HAKAdan_room_3
-HAKAdan_room_4
-HAKAdan_room_5
-HAKAdan_room_6
-HAKAdan_room_7
-HAKAdan_room_8
-HAKAdan_room_9
-HAKAdan_room_10
-HAKAdan_room_11
-HAKAdan_room_12
-HAKAdan_room_13
-HAKAdan_room_14
-HAKAdan_room_15
-HAKAdan_room_16
-HAKAdan_room_17
-HAKAdan_room_18
-HAKAdan_room_19
-HAKAdan_room_20
-HAKAdan_room_21
-HAKAdan_room_22
-HAKAdanCH_scene
-HAKAdanCH_room_0
-HAKAdanCH_room_1
-HAKAdanCH_room_2
-HAKAdanCH_room_3
-HAKAdanCH_room_4
-HAKAdanCH_room_5
-HAKAdanCH_room_6
-ice_doukutu_scene
-ice_doukutu_room_0
-ice_doukutu_room_1
-ice_doukutu_room_2
-ice_doukutu_room_3
-ice_doukutu_room_4
-ice_doukutu_room_5
-ice_doukutu_room_6
-ice_doukutu_room_7
-ice_doukutu_room_8
-ice_doukutu_room_9
-ice_doukutu_room_10
-ice_doukutu_room_11
-men_scene
-men_room_0
-men_room_1
-men_room_2
-men_room_3
-men_room_4
-men_room_5
-men_room_6
-men_room_7
-men_room_8
-men_room_9
-men_room_10
-ganontika_scene
-ganontika_room_0
-ganontika_room_1
-ganontika_room_2
-ganontika_room_3
-ganontika_room_4
-ganontika_room_5
-ganontika_room_6
-ganontika_room_7
-ganontika_room_8
-ganontika_room_9
-ganontika_room_10
-ganontika_room_11
-ganontika_room_12
-ganontika_room_13
-ganontika_room_14
-ganontika_room_15
-ganontika_room_16
-ganontika_room_17
-ganontika_room_18
-ganontika_room_19
-market_day_scene
-market_day_room_0
-market_night_scene
-market_night_room_0
-testroom_scene
-testroom_room_0
-testroom_room_1
-testroom_room_2
-testroom_room_3
-testroom_room_4
-kenjyanoma_scene
-kenjyanoma_room_0
-tokinoma_scene
-tokinoma_room_0
-tokinoma_room_1
-sutaru_scene
-sutaru_room_0
-link_home_scene
-link_home_room_0
-kokiri_shop_scene
-kokiri_shop_room_0
-kokiri_home_scene
-kokiri_home_room_0
-kakusiana_scene
-kakusiana_room_0
-kakusiana_room_1
-kakusiana_room_2
-kakusiana_room_3
-kakusiana_room_4
-kakusiana_room_5
-kakusiana_room_6
-kakusiana_room_7
-kakusiana_room_8
-kakusiana_room_9
-kakusiana_room_10
-kakusiana_room_11
-kakusiana_room_12
-kakusiana_room_13
-entra_scene
-entra_room_0
-moribossroom_scene
-moribossroom_room_0
-moribossroom_room_1
-syatekijyou_scene
-syatekijyou_room_0
-shop1_scene
-shop1_room_0
-hairal_niwa_scene
-hairal_niwa_room_0
-ganon_tou_scene
-ganon_tou_room_0
-sasatest_scene
-sasatest_room_0
-market_alley_scene
-market_alley_room_0
-spot20_scene
-spot20_room_0
-market_ruins_scene
-market_ruins_room_0
-entra_n_scene
-entra_n_room_0
-enrui_scene
-enrui_room_0
-market_alley_n_scene
-market_alley_n_room_0
-hiral_demo_scene
-hiral_demo_room_0
-kokiri_home3_scene
-kokiri_home3_room_0
-malon_stable_scene
-malon_stable_room_0
-kakariko_scene
-kakariko_room_0
-bdan_boss_scene
-bdan_boss_room_0
-bdan_boss_room_1
-FIRE_bs_scene
-FIRE_bs_room_0
-FIRE_bs_room_1
-hut_scene
-hut_room_0
-daiyousei_izumi_scene
-daiyousei_izumi_room_0
-hakaana_scene
-hakaana_room_0
-yousei_izumi_tate_scene
-yousei_izumi_tate_room_0
-yousei_izumi_yoko_scene
-yousei_izumi_yoko_room_0
-golon_scene
-golon_room_0
-zoora_scene
-zoora_room_0
-drag_scene
-drag_room_0
-alley_shop_scene
-alley_shop_room_0
-night_shop_scene
-night_shop_room_0
-impa_scene
-impa_room_0
-labo_scene
-labo_room_0
-tent_scene
-tent_room_0
-nakaniwa_scene
-nakaniwa_room_0
-ddan_boss_scene
-ddan_boss_room_0
-ddan_boss_room_1
-ydan_boss_scene
-ydan_boss_room_0
-ydan_boss_room_1
-HAKAdan_bs_scene
-HAKAdan_bs_room_0
-HAKAdan_bs_room_1
-MIZUsin_bs_scene
-MIZUsin_bs_room_0
-MIZUsin_bs_room_1
-ganon_scene
-ganon_room_0
-ganon_room_1
-ganon_room_2
-ganon_room_3
-ganon_room_4
-ganon_room_5
-ganon_room_6
-ganon_room_7
-ganon_room_8
-ganon_room_9
-ganon_boss_scene
-ganon_boss_room_0
-jyasinboss_scene
-jyasinboss_room_0
-jyasinboss_room_1
-jyasinboss_room_2
-jyasinboss_room_3
-kokiri_home4_scene
-kokiri_home4_room_0
-kokiri_home5_scene
-kokiri_home5_room_0
-ganon_final_scene
-ganon_final_room_0
-kakariko3_scene
-kakariko3_room_0
-hairal_niwa2_scene
-hairal_niwa2_room_0
-hakasitarelay_scene
-hakasitarelay_room_0
-hakasitarelay_room_1
-hakasitarelay_room_2
-hakasitarelay_room_3
-hakasitarelay_room_4
-hakasitarelay_room_5
-hakasitarelay_room_6
-shrine_scene
-shrine_room_0
-turibori_scene
-turibori_room_0
-shrine_n_scene
-shrine_n_room_0
-shrine_r_scene
-shrine_r_room_0
-hakaana2_scene
-hakaana2_room_0
-gerudoway_scene
-gerudoway_room_0
-gerudoway_room_1
-gerudoway_room_2
-gerudoway_room_3
-gerudoway_room_4
-gerudoway_room_5
-hairal_niwa_n_scene
-hairal_niwa_n_room_0
-bowling_scene
-bowling_room_0
-hakaana_ouke_scene
-hakaana_ouke_room_0
-hakaana_ouke_room_1
-hakaana_ouke_room_2
-hylia_labo_scene
-hylia_labo_room_0
-souko_scene
-souko_room_0
-souko_room_1
-souko_room_2
-miharigoya_scene
-miharigoya_room_0
-mahouya_scene
-mahouya_room_0
-takaraya_scene
-takaraya_room_0
-takaraya_room_1
-takaraya_room_2
-takaraya_room_3
-takaraya_room_4
-takaraya_room_5
-takaraya_room_6
-ganon_sonogo_scene
-ganon_sonogo_room_0
-ganon_sonogo_room_1
-ganon_sonogo_room_2
-ganon_sonogo_room_3
-ganon_sonogo_room_4
-ganon_demo_scene
-ganon_demo_room_0
-besitu_scene
-besitu_room_0
-face_shop_scene
-face_shop_room_0
-kinsuta_scene
-kinsuta_room_0
-ganontikasonogo_scene
-ganontikasonogo_room_0
-ganontikasonogo_room_1
-test01_scene
-test01_room_0
-bump_texture_static
-anime_model_1_static
-anime_model_2_static
-anime_model_3_static
-anime_model_4_static
-anime_model_5_static
-anime_model_6_static
-anime_texture_1_static
-anime_texture_2_static
-anime_texture_3_static
-anime_texture_4_static
-anime_texture_5_static
-anime_texture_6_static
-softsprite_matrix_static
\ No newline at end of file
diff --git a/Android/app/src/main/assets/assets/extractor/filelists/gamecube.txt b/Android/app/src/main/assets/assets/extractor/filelists/gamecube.txt
deleted file mode 100644
index 23794e1f6..000000000
--- a/Android/app/src/main/assets/assets/extractor/filelists/gamecube.txt
+++ /dev/null
@@ -1,1509 +0,0 @@
-makerom
-boot
-dmadata
-Audiobank
-Audioseq
-Audiotable
-kanji
-link_animetion
-icon_item_static
-icon_item_24_static
-icon_item_field_static
-icon_item_dungeon_static
-icon_item_gameover_static
-icon_item_jpn_static
-icon_item_nes_static
-item_name_static
-map_name_static
-do_action_static
-message_static
-message_texture_static
-nes_font_static
-jpn_message_data_static
-nes_message_data_static
-staff_message_data_static
-map_grand_static
-map_48x85_static
-map_i_static
-code
-ovl_title
-ovl_select
-ovl_opening
-ovl_file_choose
-ovl_kaleido_scope
-ovl_player_actor
-ovl_map_mark_data
-ovl_En_Test
-ovl_Arms_Hook
-ovl_Arrow_Fire
-ovl_Arrow_Ice
-ovl_Arrow_Light
-ovl_Bg_Bdan_Objects
-ovl_Bg_Bdan_Switch
-ovl_Bg_Bom_Guard
-ovl_Bg_Bombwall
-ovl_Bg_Bowl_Wall
-ovl_Bg_Breakwall
-ovl_Bg_Ddan_Jd
-ovl_Bg_Ddan_Kd
-ovl_Bg_Dodoago
-ovl_Bg_Dy_Yoseizo
-ovl_Bg_Ganon_Otyuka
-ovl_Bg_Gate_Shutter
-ovl_Bg_Gjyo_Bridge
-ovl_Bg_Gnd_Darkmeiro
-ovl_Bg_Gnd_Firemeiro
-ovl_Bg_Gnd_Iceblock
-ovl_Bg_Gnd_Nisekabe
-ovl_Bg_Gnd_Soulmeiro
-ovl_Bg_Haka
-ovl_Bg_Haka_Gate
-ovl_Bg_Haka_Huta
-ovl_Bg_Haka_Megane
-ovl_Bg_Haka_MeganeBG
-ovl_Bg_Haka_Sgami
-ovl_Bg_Haka_Ship
-ovl_Bg_Haka_Trap
-ovl_Bg_Haka_Tubo
-ovl_Bg_Haka_Water
-ovl_Bg_Haka_Zou
-ovl_Bg_Heavy_Block
-ovl_Bg_Hidan_Curtain
-ovl_Bg_Hidan_Dalm
-ovl_Bg_Hidan_Firewall
-ovl_Bg_Hidan_Fslift
-ovl_Bg_Hidan_Fwbig
-ovl_Bg_Hidan_Hamstep
-ovl_Bg_Hidan_Hrock
-ovl_Bg_Hidan_Kousi
-ovl_Bg_Hidan_Kowarerukabe
-ovl_Bg_Hidan_Rock
-ovl_Bg_Hidan_Rsekizou
-ovl_Bg_Hidan_Sekizou
-ovl_Bg_Hidan_Sima
-ovl_Bg_Hidan_Syoku
-ovl_Bg_Ice_Objects
-ovl_Bg_Ice_Shelter
-ovl_Bg_Ice_Shutter
-ovl_Bg_Ice_Turara
-ovl_Bg_Ingate
-ovl_Bg_Jya_1flift
-ovl_Bg_Jya_Amishutter
-ovl_Bg_Jya_Bigmirror
-ovl_Bg_Jya_Block
-ovl_Bg_Jya_Bombchuiwa
-ovl_Bg_Jya_Bombiwa
-ovl_Bg_Jya_Cobra
-ovl_Bg_Jya_Goroiwa
-ovl_Bg_Jya_Haheniron
-ovl_Bg_Jya_Ironobj
-ovl_Bg_Jya_Kanaami
-ovl_Bg_Jya_Lift
-ovl_Bg_Jya_Megami
-ovl_Bg_Jya_Zurerukabe
-ovl_Bg_Menkuri_Eye
-ovl_Bg_Menkuri_Kaiten
-ovl_Bg_Menkuri_Nisekabe
-ovl_Bg_Mizu_Bwall
-ovl_Bg_Mizu_Movebg
-ovl_Bg_Mizu_Shutter
-ovl_Bg_Mizu_Uzu
-ovl_Bg_Mizu_Water
-ovl_Bg_Mjin
-ovl_Bg_Mori_Bigst
-ovl_Bg_Mori_Elevator
-ovl_Bg_Mori_Hashigo
-ovl_Bg_Mori_Hashira4
-ovl_Bg_Mori_Hineri
-ovl_Bg_Mori_Idomizu
-ovl_Bg_Mori_Kaitenkabe
-ovl_Bg_Mori_Rakkatenjo
-ovl_Bg_Po_Event
-ovl_Bg_Po_Syokudai
-ovl_Bg_Pushbox
-ovl_Bg_Relay_Objects
-ovl_Bg_Spot00_Break
-ovl_Bg_Spot00_Hanebasi
-ovl_Bg_Spot01_Fusya
-ovl_Bg_Spot01_Idohashira
-ovl_Bg_Spot01_Idomizu
-ovl_Bg_Spot01_Idosoko
-ovl_Bg_Spot01_Objects2
-ovl_Bg_Spot02_Objects
-ovl_Bg_Spot03_Taki
-ovl_Bg_Spot05_Soko
-ovl_Bg_Spot06_Objects
-ovl_Bg_Spot07_Taki
-ovl_Bg_Spot08_Bakudankabe
-ovl_Bg_Spot08_Iceblock
-ovl_Bg_Spot09_Obj
-ovl_Bg_Spot11_Bakudankabe
-ovl_Bg_Spot11_Oasis
-ovl_Bg_Spot12_Gate
-ovl_Bg_Spot12_Saku
-ovl_Bg_Spot15_Rrbox
-ovl_Bg_Spot15_Saku
-ovl_Bg_Spot16_Bombstone
-ovl_Bg_Spot16_Doughnut
-ovl_Bg_Spot17_Bakudankabe
-ovl_Bg_Spot17_Funen
-ovl_Bg_Spot18_Basket
-ovl_Bg_Spot18_Futa
-ovl_Bg_Spot18_Obj
-ovl_Bg_Spot18_Shutter
-ovl_Bg_Sst_Floor
-ovl_Bg_Toki_Hikari
-ovl_Bg_Toki_Swd
-ovl_Bg_Treemouth
-ovl_Bg_Umajump
-ovl_Bg_Vb_Sima
-ovl_Bg_Ydan_Hasi
-ovl_Bg_Ydan_Maruta
-ovl_Bg_Ydan_Sp
-ovl_Bg_Zg
-ovl_Boss_Dodongo
-ovl_Boss_Fd
-ovl_Boss_Fd2
-ovl_Boss_Ganon
-ovl_Boss_Ganon2
-ovl_Boss_Ganondrof
-ovl_Boss_Goma
-ovl_Boss_Mo
-ovl_Boss_Sst
-ovl_Boss_Tw
-ovl_Boss_Va
-ovl_Demo_6K
-ovl_Demo_Du
-ovl_Demo_Ec
-ovl_Demo_Effect
-ovl_Demo_Ext
-ovl_Demo_Geff
-ovl_Demo_Gj
-ovl_Demo_Go
-ovl_Demo_Gt
-ovl_Demo_Ik
-ovl_Demo_Im
-ovl_Demo_Kankyo
-ovl_Demo_Kekkai
-ovl_Demo_Sa
-ovl_Demo_Shd
-ovl_Demo_Tre_Lgt
-ovl_Door_Ana
-ovl_Door_Gerudo
-ovl_Door_Killer
-ovl_Door_Shutter
-ovl_Door_Toki
-ovl_Door_Warp1
-ovl_Efc_Erupc
-ovl_Eff_Dust
-ovl_Effect_Ss_Blast
-ovl_Effect_Ss_Bomb
-ovl_Effect_Ss_Bomb2
-ovl_Effect_Ss_Bubble
-ovl_Effect_Ss_D_Fire
-ovl_Effect_Ss_Dead_Db
-ovl_Effect_Ss_Dead_Dd
-ovl_Effect_Ss_Dead_Ds
-ovl_Effect_Ss_Dead_Sound
-ovl_Effect_Ss_Dt_Bubble
-ovl_Effect_Ss_Dust
-ovl_Effect_Ss_En_Fire
-ovl_Effect_Ss_En_Ice
-ovl_Effect_Ss_Extra
-ovl_Effect_Ss_Fcircle
-ovl_Effect_Ss_Fhg_Flash
-ovl_Effect_Ss_Fire_Tail
-ovl_Effect_Ss_G_Fire
-ovl_Effect_Ss_G_Magma
-ovl_Effect_Ss_G_Magma2
-ovl_Effect_Ss_G_Ripple
-ovl_Effect_Ss_G_Spk
-ovl_Effect_Ss_G_Splash
-ovl_Effect_Ss_Hahen
-ovl_Effect_Ss_HitMark
-ovl_Effect_Ss_Ice_Piece
-ovl_Effect_Ss_Ice_Smoke
-ovl_Effect_Ss_K_Fire
-ovl_Effect_Ss_Kakera
-ovl_Effect_Ss_KiraKira
-ovl_Effect_Ss_Lightning
-ovl_Effect_Ss_Sibuki
-ovl_Effect_Ss_Sibuki2
-ovl_Effect_Ss_Solder_Srch_Ball
-ovl_Effect_Ss_Stick
-ovl_Effect_Ss_Stone1
-ovl_Elf_Msg
-ovl_Elf_Msg2
-ovl_En_Am
-ovl_En_Ani
-ovl_En_Anubice
-ovl_En_Anubice_Fire
-ovl_En_Anubice_Tag
-ovl_En_Arow_Trap
-ovl_En_Arrow
-ovl_En_Attack_Niw
-ovl_En_Ba
-ovl_En_Bb
-ovl_En_Bdfire
-ovl_En_Bigokuta
-ovl_En_Bili
-ovl_En_Bird
-ovl_En_Blkobj
-ovl_En_Bom
-ovl_En_Bom_Bowl_Man
-ovl_En_Bom_Bowl_Pit
-ovl_En_Bom_Chu
-ovl_En_Bombf
-ovl_En_Boom
-ovl_En_Box
-ovl_En_Brob
-ovl_En_Bubble
-ovl_En_Butte
-ovl_En_Bw
-ovl_En_Bx
-ovl_En_Changer
-ovl_En_Clear_Tag
-ovl_En_Cow
-ovl_En_Crow
-ovl_En_Cs
-ovl_En_Daiku
-ovl_En_Daiku_Kakariko
-ovl_En_Dekubaba
-ovl_En_Dekunuts
-ovl_En_Dh
-ovl_En_Dha
-ovl_En_Diving_Game
-ovl_En_Dns
-ovl_En_Dnt_Demo
-ovl_En_Dnt_Jiji
-ovl_En_Dnt_Nomal
-ovl_En_Dodojr
-ovl_En_Dodongo
-ovl_En_Dog
-ovl_En_Door
-ovl_En_Ds
-ovl_En_Du
-ovl_En_Dy_Extra
-ovl_En_Eg
-ovl_En_Eiyer
-ovl_En_Elf
-ovl_En_Encount1
-ovl_En_Encount2
-ovl_En_Ex_Item
-ovl_En_Ex_Ruppy
-ovl_En_Fd
-ovl_En_Fd_Fire
-ovl_En_Fhg_Fire
-ovl_En_Fire_Rock
-ovl_En_Firefly
-ovl_En_Fish
-ovl_En_Floormas
-ovl_En_Fr
-ovl_En_Fu
-ovl_En_Fw
-ovl_En_Fz
-ovl_En_G_Switch
-ovl_En_Ganon_Mant
-ovl_En_Ganon_Organ
-ovl_En_Gb
-ovl_En_Ge1
-ovl_En_Ge2
-ovl_En_Ge3
-ovl_En_GeldB
-ovl_En_GirlA
-ovl_En_Gm
-ovl_En_Go
-ovl_En_Go2
-ovl_En_Goma
-ovl_En_Goroiwa
-ovl_En_Gs
-ovl_En_Guest
-ovl_En_Hata
-ovl_En_Heishi1
-ovl_En_Heishi2
-ovl_En_Heishi3
-ovl_En_Heishi4
-ovl_En_Hintnuts
-ovl_En_Holl
-ovl_En_Honotrap
-ovl_En_Horse
-ovl_En_Horse_Game_Check
-ovl_En_Horse_Ganon
-ovl_En_Horse_Link_Child
-ovl_En_Horse_Normal
-ovl_En_Horse_Zelda
-ovl_En_Hs
-ovl_En_Hs2
-ovl_En_Hy
-ovl_En_Ice_Hono
-ovl_En_Ik
-ovl_En_In
-ovl_En_Insect
-ovl_En_Ishi
-ovl_En_It
-ovl_En_Jj
-ovl_En_Js
-ovl_En_Jsjutan
-ovl_En_Kakasi
-ovl_En_Kakasi2
-ovl_En_Kakasi3
-ovl_En_Kanban
-ovl_En_Karebaba
-ovl_En_Ko
-ovl_En_Kusa
-ovl_En_Kz
-ovl_En_Light
-ovl_En_Lightbox
-ovl_En_M_Fire1
-ovl_En_M_Thunder
-ovl_En_Ma1
-ovl_En_Ma2
-ovl_En_Ma3
-ovl_En_Mag
-ovl_En_Mb
-ovl_En_Md
-ovl_En_Mk
-ovl_En_Mm
-ovl_En_Mm2
-ovl_En_Ms
-ovl_En_Mu
-ovl_En_Nb
-ovl_En_Niw
-ovl_En_Niw_Girl
-ovl_En_Niw_Lady
-ovl_En_Nutsball
-ovl_En_Nwc
-ovl_En_Ny
-ovl_En_OE2
-ovl_En_Okarina_Effect
-ovl_En_Okarina_Tag
-ovl_En_Okuta
-ovl_En_Ossan
-ovl_En_Owl
-ovl_En_Part
-ovl_En_Peehat
-ovl_En_Po_Desert
-ovl_En_Po_Field
-ovl_En_Po_Relay
-ovl_En_Po_Sisters
-ovl_En_Poh
-ovl_En_Pu_box
-ovl_En_Rd
-ovl_En_Reeba
-ovl_En_River_Sound
-ovl_En_Rl
-ovl_En_Rr
-ovl_En_Ru1
-ovl_En_Ru2
-ovl_En_Sa
-ovl_En_Sb
-ovl_En_Scene_Change
-ovl_En_Sda
-ovl_En_Shopnuts
-ovl_En_Si
-ovl_En_Siofuki
-ovl_En_Skb
-ovl_En_Skj
-ovl_En_Skjneedle
-ovl_En_Ssh
-ovl_En_St
-ovl_En_Sth
-ovl_En_Stream
-ovl_En_Sw
-ovl_En_Syateki_Itm
-ovl_En_Syateki_Man
-ovl_En_Syateki_Niw
-ovl_En_Ta
-ovl_En_Takara_Man
-ovl_En_Tana
-ovl_En_Tg
-ovl_En_Tite
-ovl_En_Tk
-ovl_En_Torch
-ovl_En_Torch2
-ovl_En_Toryo
-ovl_En_Tp
-ovl_En_Tr
-ovl_En_Trap
-ovl_En_Tubo_Trap
-ovl_En_Vali
-ovl_En_Vase
-ovl_En_Vb_Ball
-ovl_En_Viewer
-ovl_En_Vm
-ovl_En_Wall_Tubo
-ovl_En_Wallmas
-ovl_En_Weather_Tag
-ovl_En_Weiyer
-ovl_En_Wf
-ovl_En_Wonder_Item
-ovl_En_Wonder_Talk
-ovl_En_Wonder_Talk2
-ovl_En_Wood02
-ovl_En_Xc
-ovl_En_Yabusame_Mark
-ovl_En_Yukabyun
-ovl_En_Zf
-ovl_En_Zl1
-ovl_En_Zl2
-ovl_En_Zl3
-ovl_En_Zl4
-ovl_En_Zo
-ovl_En_fHG
-ovl_End_Title
-ovl_Fishing
-ovl_Item_B_Heart
-ovl_Item_Etcetera
-ovl_Item_Inbox
-ovl_Item_Ocarina
-ovl_Item_Shield
-ovl_Magic_Dark
-ovl_Magic_Fire
-ovl_Magic_Wind
-ovl_Mir_Ray
-ovl_Obj_Bean
-ovl_Obj_Blockstop
-ovl_Obj_Bombiwa
-ovl_Obj_Comb
-ovl_Obj_Dekujr
-ovl_Obj_Elevator
-ovl_Obj_Hamishi
-ovl_Obj_Hana
-ovl_Obj_Hsblock
-ovl_Obj_Ice_Poly
-ovl_Obj_Kibako
-ovl_Obj_Kibako2
-ovl_Obj_Lift
-ovl_Obj_Lightswitch
-ovl_Obj_Makekinsuta
-ovl_Obj_Makeoshihiki
-ovl_Obj_Mure
-ovl_Obj_Mure2
-ovl_Obj_Mure3
-ovl_Obj_Oshihiki
-ovl_Obj_Roomtimer
-ovl_Obj_Switch
-ovl_Obj_Syokudai
-ovl_Obj_Timeblock
-ovl_Obj_Tsubo
-ovl_Obj_Warp2block
-ovl_Object_Kankyo
-ovl_Oceff_Spot
-ovl_Oceff_Storm
-ovl_Oceff_Wipe
-ovl_Oceff_Wipe2
-ovl_Oceff_Wipe3
-ovl_Oceff_Wipe4
-ovl_Shot_Sun
-gameplay_keep
-gameplay_field_keep
-gameplay_dangeon_keep
-gameplay_object_exchange_static
-object_link_boy
-object_link_child
-object_box
-object_human
-object_okuta
-object_poh
-object_wallmaster
-object_dy_obj
-object_firefly
-object_dodongo
-object_fire
-object_niw
-object_tite
-object_reeba
-object_peehat
-object_kingdodongo
-object_horse
-object_zf
-object_goma
-object_zl1
-object_gol
-object_bubble
-object_dodojr
-object_torch2
-object_bl
-object_tp
-object_oA1
-object_st
-object_bw
-object_ei
-object_horse_normal
-object_oB1
-object_o_anime
-object_spot04_objects
-object_ddan_objects
-object_hidan_objects
-object_horse_ganon
-object_oA2
-object_spot00_objects
-object_mb
-object_bombf
-object_sk2
-object_oE1
-object_oE_anime
-object_oE2
-object_ydan_objects
-object_gnd
-object_am
-object_dekubaba
-object_oA3
-object_oA4
-object_oA5
-object_oA6
-object_oA7
-object_jj
-object_oA8
-object_oA9
-object_oB2
-object_oB3
-object_oB4
-object_horse_zelda
-object_opening_demo1
-object_warp1
-object_b_heart
-object_dekunuts
-object_oE3
-object_oE4
-object_menkuri_objects
-object_oE5
-object_oE6
-object_oE7
-object_oE8
-object_oE9
-object_oE10
-object_oE11
-object_oE12
-object_vali
-object_oA10
-object_oA11
-object_mizu_objects
-object_fhg
-object_ossan
-object_mori_hineri1
-object_Bb
-object_toki_objects
-object_yukabyun
-object_zl2
-object_mjin
-object_mjin_flash
-object_mjin_dark
-object_mjin_flame
-object_mjin_ice
-object_mjin_soul
-object_mjin_wind
-object_mjin_oka
-object_haka_objects
-object_spot06_objects
-object_ice_objects
-object_relay_objects
-object_mori_hineri1a
-object_mori_hineri2
-object_mori_hineri2a
-object_mori_objects
-object_mori_tex
-object_spot08_obj
-object_warp2
-object_hata
-object_bird
-object_wood02
-object_lightbox
-object_pu_box
-object_trap
-object_vase
-object_im
-object_ta
-object_tk
-object_xc
-object_vm
-object_bv
-object_hakach_objects
-object_efc_crystal_light
-object_efc_fire_ball
-object_efc_flash
-object_efc_lgt_shower
-object_efc_star_field
-object_god_lgt
-object_light_ring
-object_triforce_spot
-object_medal
-object_bdan_objects
-object_sd
-object_rd
-object_po_sisters
-object_heavy_object
-object_gndd
-object_fd
-object_du
-object_fw
-object_horse_link_child
-object_spot02_objects
-object_haka
-object_ru1
-object_syokudai
-object_fd2
-object_dh
-object_rl
-object_efc_tw
-object_demo_tre_lgt
-object_gi_key
-object_mir_ray
-object_brob
-object_gi_jewel
-object_spot09_obj
-object_spot18_obj
-object_bdoor
-object_spot17_obj
-object_shop_dungen
-object_nb
-object_mo
-object_sb
-object_gi_melody
-object_gi_heart
-object_gi_compass
-object_gi_bosskey
-object_gi_medal
-object_gi_nuts
-object_sa
-object_gi_hearts
-object_gi_arrowcase
-object_gi_bombpouch
-object_in
-object_tr
-object_spot16_obj
-object_oE1s
-object_oE4s
-object_os_anime
-object_gi_bottle
-object_gi_stick
-object_gi_map
-object_oF1d_map
-object_ru2
-object_gi_shield_1
-object_dekujr
-object_gi_magicpot
-object_gi_bomb_1
-object_oF1s
-object_ma2
-object_gi_purse
-object_hni
-object_tw
-object_rr
-object_bxa
-object_anubice
-object_gi_gerudo
-object_gi_arrow
-object_gi_bomb_2
-object_gi_egg
-object_gi_scale
-object_gi_shield_2
-object_gi_hookshot
-object_gi_ocarina
-object_gi_milk
-object_ma1
-object_ganon
-object_sst
-object_ny
-object_fr
-object_gi_pachinko
-object_gi_boomerang
-object_gi_bow
-object_gi_glasses
-object_gi_liquid
-object_ani
-object_demo_6k
-object_gi_shield_3
-object_gi_letter
-object_spot15_obj
-object_jya_obj
-object_gi_clothes
-object_gi_bean
-object_gi_fish
-object_gi_saw
-object_gi_hammer
-object_gi_grass
-object_gi_longsword
-object_spot01_objects
-object_md
-object_km1
-object_kw1
-object_zo
-object_kz
-object_umajump
-object_masterkokiri
-object_masterkokirihead
-object_mastergolon
-object_masterzoora
-object_aob
-object_ik
-object_ahg
-object_cne
-object_gi_niwatori
-object_skj
-object_gi_bottle_letter
-object_bji
-object_bba
-object_gi_ocarina_0
-object_ds
-object_ane
-object_boj
-object_spot03_object
-object_spot07_object
-object_fz
-object_bob
-object_ge1
-object_yabusame_point
-object_gi_boots_2
-object_gi_seed
-object_gnd_magic
-object_d_elevator
-object_d_hsblock
-object_d_lift
-object_mamenoki
-object_goroiwa
-object_toryo
-object_daiku
-object_nwc
-object_blkobj
-object_gm
-object_ms
-object_hs
-object_ingate
-object_lightswitch
-object_kusa
-object_tsubo
-object_gi_gloves
-object_gi_coin
-object_kanban
-object_gjyo_objects
-object_owl
-object_mk
-object_fu
-object_gi_ki_tan_mask
-object_gi_redead_mask
-object_gi_skj_mask
-object_gi_rabit_mask
-object_gi_truth_mask
-object_ganon_objects
-object_siofuki
-object_stream
-object_mm
-object_fa
-object_os
-object_gi_eye_lotion
-object_gi_powder
-object_gi_mushroom
-object_gi_ticketstone
-object_gi_brokensword
-object_js
-object_cs
-object_gi_prescription
-object_gi_bracelet
-object_gi_soldout
-object_gi_frog
-object_mag
-object_door_gerudo
-object_gt
-object_efc_erupc
-object_zl2_anime1
-object_zl2_anime2
-object_gi_golonmask
-object_gi_zoramask
-object_gi_gerudomask
-object_ganon2
-object_ka
-object_ts
-object_zg
-object_gi_hoverboots
-object_gi_m_arrow
-object_ds2
-object_ec
-object_fish
-object_gi_sutaru
-object_gi_goddess
-object_ssh
-object_bigokuta
-object_bg
-object_spot05_objects
-object_spot12_obj
-object_bombiwa
-object_hintnuts
-object_rs
-object_spot00_break
-object_gla
-object_shopnuts
-object_geldb
-object_gr
-object_dog
-object_jya_iron
-object_jya_door
-object_spot01_objects2
-object_spot11_obj
-object_kibako2
-object_dns
-object_dnk
-object_gi_fire
-object_gi_insect
-object_gi_butterfly
-object_gi_ghost
-object_gi_soul
-object_bowl
-object_po_field
-object_demo_kekkai
-object_efc_doughnut
-object_gi_dekupouch
-object_ganon_anime1
-object_ganon_anime2
-object_ganon_anime3
-object_gi_rupy
-object_spot01_matoya
-object_spot01_matoyab
-object_po_composer
-object_mu
-object_wf
-object_skb
-object_gj
-object_geff
-object_haka_door
-object_gs
-object_ps
-object_bwall
-object_crow
-object_cow
-object_cob
-object_gi_sword_1
-object_door_killer
-object_ouke_haka
-object_timeblock
-object_zl4
-g_pn_01
-g_pn_02
-g_pn_03
-g_pn_04
-g_pn_05
-g_pn_06
-g_pn_07
-g_pn_08
-g_pn_09
-g_pn_10
-g_pn_11
-g_pn_12
-g_pn_13
-g_pn_14
-g_pn_15
-g_pn_16
-g_pn_17
-g_pn_18
-g_pn_19
-g_pn_20
-g_pn_21
-g_pn_22
-g_pn_23
-g_pn_24
-g_pn_25
-g_pn_26
-g_pn_27
-g_pn_28
-g_pn_29
-g_pn_30
-g_pn_31
-g_pn_32
-g_pn_33
-g_pn_34
-g_pn_35
-g_pn_36
-g_pn_37
-g_pn_38
-g_pn_39
-g_pn_40
-g_pn_41
-g_pn_42
-g_pn_43
-g_pn_44
-g_pn_45
-g_pn_46
-g_pn_47
-g_pn_48
-g_pn_49
-g_pn_50
-g_pn_51
-g_pn_52
-g_pn_53
-g_pn_54
-g_pn_55
-g_pn_56
-g_pn_57
-z_select_static
-nintendo_rogo_static
-title_static
-parameter_static
-vr_fine0_static
-vr_fine0_pal_static
-vr_fine1_static
-vr_fine1_pal_static
-vr_fine2_static
-vr_fine2_pal_static
-vr_fine3_static
-vr_fine3_pal_static
-vr_cloud0_static
-vr_cloud0_pal_static
-vr_cloud1_static
-vr_cloud1_pal_static
-vr_cloud2_static
-vr_cloud2_pal_static
-vr_cloud3_static
-vr_cloud3_pal_static
-vr_holy0_static
-vr_holy0_pal_static
-vr_holy1_static
-vr_holy1_pal_static
-vr_MDVR_static
-vr_MDVR_pal_static
-vr_MNVR_static
-vr_MNVR_pal_static
-vr_RUVR_static
-vr_RUVR_pal_static
-vr_LHVR_static
-vr_LHVR_pal_static
-vr_KHVR_static
-vr_KHVR_pal_static
-vr_K3VR_static
-vr_K3VR_pal_static
-vr_K4VR_static
-vr_K4VR_pal_static
-vr_K5VR_static
-vr_K5VR_pal_static
-vr_SP1a_static
-vr_SP1a_pal_static
-vr_MLVR_static
-vr_MLVR_pal_static
-vr_KKRVR_static
-vr_KKRVR_pal_static
-vr_KR3VR_static
-vr_KR3VR_pal_static
-vr_IPVR_static
-vr_IPVR_pal_static
-vr_KSVR_static
-vr_KSVR_pal_static
-vr_GLVR_static
-vr_GLVR_pal_static
-vr_ZRVR_static
-vr_ZRVR_pal_static
-vr_DGVR_static
-vr_DGVR_pal_static
-vr_ALVR_static
-vr_ALVR_pal_static
-vr_NSVR_static
-vr_NSVR_pal_static
-vr_LBVR_static
-vr_LBVR_pal_static
-vr_TTVR_static
-vr_TTVR_pal_static
-vr_FCVR_static
-vr_FCVR_pal_static
-elf_message_field
-elf_message_ydan
-ydan_scene
-ydan_room_0
-ydan_room_1
-ydan_room_2
-ydan_room_3
-ydan_room_4
-ydan_room_5
-ydan_room_6
-ydan_room_7
-ydan_room_8
-ydan_room_9
-ydan_room_10
-ydan_room_11
-ddan_scene
-ddan_room_0
-ddan_room_1
-ddan_room_2
-ddan_room_3
-ddan_room_4
-ddan_room_5
-ddan_room_6
-ddan_room_7
-ddan_room_8
-ddan_room_9
-ddan_room_10
-ddan_room_11
-ddan_room_12
-ddan_room_13
-ddan_room_14
-ddan_room_15
-ddan_room_16
-bdan_scene
-bdan_room_0
-bdan_room_1
-bdan_room_2
-bdan_room_3
-bdan_room_4
-bdan_room_5
-bdan_room_6
-bdan_room_7
-bdan_room_8
-bdan_room_9
-bdan_room_10
-bdan_room_11
-bdan_room_12
-bdan_room_13
-bdan_room_14
-bdan_room_15
-Bmori1_scene
-Bmori1_room_0
-Bmori1_room_1
-Bmori1_room_2
-Bmori1_room_3
-Bmori1_room_4
-Bmori1_room_5
-Bmori1_room_6
-Bmori1_room_7
-Bmori1_room_8
-Bmori1_room_9
-Bmori1_room_10
-Bmori1_room_11
-Bmori1_room_12
-Bmori1_room_13
-Bmori1_room_14
-Bmori1_room_15
-Bmori1_room_16
-Bmori1_room_17
-Bmori1_room_18
-Bmori1_room_19
-Bmori1_room_20
-Bmori1_room_21
-Bmori1_room_22
-HIDAN_scene
-HIDAN_room_0
-HIDAN_room_1
-HIDAN_room_2
-HIDAN_room_3
-HIDAN_room_4
-HIDAN_room_5
-HIDAN_room_6
-HIDAN_room_7
-HIDAN_room_8
-HIDAN_room_9
-HIDAN_room_10
-HIDAN_room_11
-HIDAN_room_12
-HIDAN_room_13
-HIDAN_room_14
-HIDAN_room_15
-HIDAN_room_16
-HIDAN_room_17
-HIDAN_room_18
-HIDAN_room_19
-HIDAN_room_20
-HIDAN_room_21
-HIDAN_room_22
-HIDAN_room_23
-HIDAN_room_24
-HIDAN_room_25
-HIDAN_room_26
-MIZUsin_scene
-MIZUsin_room_0
-MIZUsin_room_1
-MIZUsin_room_2
-MIZUsin_room_3
-MIZUsin_room_4
-MIZUsin_room_5
-MIZUsin_room_6
-MIZUsin_room_7
-MIZUsin_room_8
-MIZUsin_room_9
-MIZUsin_room_10
-MIZUsin_room_11
-MIZUsin_room_12
-MIZUsin_room_13
-MIZUsin_room_14
-MIZUsin_room_15
-MIZUsin_room_16
-MIZUsin_room_17
-MIZUsin_room_18
-MIZUsin_room_19
-MIZUsin_room_20
-MIZUsin_room_21
-MIZUsin_room_22
-jyasinzou_scene
-jyasinzou_room_0
-jyasinzou_room_1
-jyasinzou_room_2
-jyasinzou_room_3
-jyasinzou_room_4
-jyasinzou_room_5
-jyasinzou_room_6
-jyasinzou_room_7
-jyasinzou_room_8
-jyasinzou_room_9
-jyasinzou_room_10
-jyasinzou_room_11
-jyasinzou_room_12
-jyasinzou_room_13
-jyasinzou_room_14
-jyasinzou_room_15
-jyasinzou_room_16
-jyasinzou_room_17
-jyasinzou_room_18
-jyasinzou_room_19
-jyasinzou_room_20
-jyasinzou_room_21
-jyasinzou_room_22
-jyasinzou_room_23
-jyasinzou_room_24
-jyasinzou_room_25
-jyasinzou_room_26
-jyasinzou_room_27
-jyasinzou_room_28
-HAKAdan_scene
-HAKAdan_room_0
-HAKAdan_room_1
-HAKAdan_room_2
-HAKAdan_room_3
-HAKAdan_room_4
-HAKAdan_room_5
-HAKAdan_room_6
-HAKAdan_room_7
-HAKAdan_room_8
-HAKAdan_room_9
-HAKAdan_room_10
-HAKAdan_room_11
-HAKAdan_room_12
-HAKAdan_room_13
-HAKAdan_room_14
-HAKAdan_room_15
-HAKAdan_room_16
-HAKAdan_room_17
-HAKAdan_room_18
-HAKAdan_room_19
-HAKAdan_room_20
-HAKAdan_room_21
-HAKAdan_room_22
-HAKAdanCH_scene
-HAKAdanCH_room_0
-HAKAdanCH_room_1
-HAKAdanCH_room_2
-HAKAdanCH_room_3
-HAKAdanCH_room_4
-HAKAdanCH_room_5
-HAKAdanCH_room_6
-ice_doukutu_scene
-ice_doukutu_room_0
-ice_doukutu_room_1
-ice_doukutu_room_2
-ice_doukutu_room_3
-ice_doukutu_room_4
-ice_doukutu_room_5
-ice_doukutu_room_6
-ice_doukutu_room_7
-ice_doukutu_room_8
-ice_doukutu_room_9
-ice_doukutu_room_10
-ice_doukutu_room_11
-men_scene
-men_room_0
-men_room_1
-men_room_2
-men_room_3
-men_room_4
-men_room_5
-men_room_6
-men_room_7
-men_room_8
-men_room_9
-men_room_10
-ganontika_scene
-ganontika_room_0
-ganontika_room_1
-ganontika_room_2
-ganontika_room_3
-ganontika_room_4
-ganontika_room_5
-ganontika_room_6
-ganontika_room_7
-ganontika_room_8
-ganontika_room_9
-ganontika_room_10
-ganontika_room_11
-ganontika_room_12
-ganontika_room_13
-ganontika_room_14
-ganontika_room_15
-ganontika_room_16
-ganontika_room_17
-ganontika_room_18
-ganontika_room_19
-spot00_scene
-spot00_room_0
-spot01_scene
-spot01_room_0
-spot02_scene
-spot02_room_0
-spot02_room_1
-spot03_scene
-spot03_room_0
-spot03_room_1
-spot04_scene
-spot04_room_0
-spot04_room_1
-spot04_room_2
-spot05_scene
-spot05_room_0
-spot06_scene
-spot06_room_0
-spot07_scene
-spot07_room_0
-spot07_room_1
-spot08_scene
-spot08_room_0
-spot09_scene
-spot09_room_0
-spot10_scene
-spot10_room_0
-spot10_room_1
-spot10_room_2
-spot10_room_3
-spot10_room_4
-spot10_room_5
-spot10_room_6
-spot10_room_7
-spot10_room_8
-spot10_room_9
-spot11_scene
-spot11_room_0
-spot12_scene
-spot12_room_0
-spot12_room_1
-spot13_scene
-spot13_room_0
-spot13_room_1
-spot15_scene
-spot15_room_0
-spot16_scene
-spot16_room_0
-spot17_scene
-spot17_room_0
-spot17_room_1
-spot18_scene
-spot18_room_0
-spot18_room_1
-spot18_room_2
-spot18_room_3
-market_day_scene
-market_day_room_0
-market_night_scene
-market_night_room_0
-kenjyanoma_scene
-kenjyanoma_room_0
-tokinoma_scene
-tokinoma_room_0
-tokinoma_room_1
-link_home_scene
-link_home_room_0
-kokiri_shop_scene
-kokiri_shop_room_0
-kokiri_home_scene
-kokiri_home_room_0
-kakusiana_scene
-kakusiana_room_0
-kakusiana_room_1
-kakusiana_room_2
-kakusiana_room_3
-kakusiana_room_4
-kakusiana_room_5
-kakusiana_room_6
-kakusiana_room_7
-kakusiana_room_8
-kakusiana_room_9
-kakusiana_room_10
-kakusiana_room_11
-kakusiana_room_12
-kakusiana_room_13
-entra_scene
-entra_room_0
-moribossroom_scene
-moribossroom_room_0
-moribossroom_room_1
-syatekijyou_scene
-syatekijyou_room_0
-shop1_scene
-shop1_room_0
-hairal_niwa_scene
-hairal_niwa_room_0
-ganon_tou_scene
-ganon_tou_room_0
-market_alley_scene
-market_alley_room_0
-spot20_scene
-spot20_room_0
-market_ruins_scene
-market_ruins_room_0
-entra_n_scene
-entra_n_room_0
-enrui_scene
-enrui_room_0
-market_alley_n_scene
-market_alley_n_room_0
-hiral_demo_scene
-hiral_demo_room_0
-kokiri_home3_scene
-kokiri_home3_room_0
-malon_stable_scene
-malon_stable_room_0
-kakariko_scene
-kakariko_room_0
-bdan_boss_scene
-bdan_boss_room_0
-bdan_boss_room_1
-FIRE_bs_scene
-FIRE_bs_room_0
-FIRE_bs_room_1
-hut_scene
-hut_room_0
-daiyousei_izumi_scene
-daiyousei_izumi_room_0
-hakaana_scene
-hakaana_room_0
-yousei_izumi_tate_scene
-yousei_izumi_tate_room_0
-yousei_izumi_yoko_scene
-yousei_izumi_yoko_room_0
-golon_scene
-golon_room_0
-zoora_scene
-zoora_room_0
-drag_scene
-drag_room_0
-alley_shop_scene
-alley_shop_room_0
-night_shop_scene
-night_shop_room_0
-impa_scene
-impa_room_0
-labo_scene
-labo_room_0
-tent_scene
-tent_room_0
-nakaniwa_scene
-nakaniwa_room_0
-ddan_boss_scene
-ddan_boss_room_0
-ddan_boss_room_1
-ydan_boss_scene
-ydan_boss_room_0
-ydan_boss_room_1
-HAKAdan_bs_scene
-HAKAdan_bs_room_0
-HAKAdan_bs_room_1
-MIZUsin_bs_scene
-MIZUsin_bs_room_0
-MIZUsin_bs_room_1
-ganon_scene
-ganon_room_0
-ganon_room_1
-ganon_room_2
-ganon_room_3
-ganon_room_4
-ganon_room_5
-ganon_room_6
-ganon_room_7
-ganon_room_8
-ganon_room_9
-ganon_boss_scene
-ganon_boss_room_0
-jyasinboss_scene
-jyasinboss_room_0
-jyasinboss_room_1
-jyasinboss_room_2
-jyasinboss_room_3
-kokiri_home4_scene
-kokiri_home4_room_0
-kokiri_home5_scene
-kokiri_home5_room_0
-ganon_final_scene
-ganon_final_room_0
-kakariko3_scene
-kakariko3_room_0
-hakasitarelay_scene
-hakasitarelay_room_0
-hakasitarelay_room_1
-hakasitarelay_room_2
-hakasitarelay_room_3
-hakasitarelay_room_4
-hakasitarelay_room_5
-hakasitarelay_room_6
-shrine_scene
-shrine_room_0
-turibori_scene
-turibori_room_0
-shrine_n_scene
-shrine_n_room_0
-shrine_r_scene
-shrine_r_room_0
-hakaana2_scene
-hakaana2_room_0
-gerudoway_scene
-gerudoway_room_0
-gerudoway_room_1
-gerudoway_room_2
-gerudoway_room_3
-gerudoway_room_4
-gerudoway_room_5
-hairal_niwa_n_scene
-hairal_niwa_n_room_0
-bowling_scene
-bowling_room_0
-hakaana_ouke_scene
-hakaana_ouke_room_0
-hakaana_ouke_room_1
-hakaana_ouke_room_2
-hylia_labo_scene
-hylia_labo_room_0
-souko_scene
-souko_room_0
-souko_room_1
-souko_room_2
-miharigoya_scene
-miharigoya_room_0
-mahouya_scene
-mahouya_room_0
-takaraya_scene
-takaraya_room_0
-takaraya_room_1
-takaraya_room_2
-takaraya_room_3
-takaraya_room_4
-takaraya_room_5
-takaraya_room_6
-ganon_sonogo_scene
-ganon_sonogo_room_0
-ganon_sonogo_room_1
-ganon_sonogo_room_2
-ganon_sonogo_room_3
-ganon_sonogo_room_4
-ganon_demo_scene
-ganon_demo_room_0
-face_shop_scene
-face_shop_room_0
-kinsuta_scene
-kinsuta_room_0
-ganontikasonogo_scene
-ganontikasonogo_room_0
-ganontikasonogo_room_1
-bump_texture_static
-anime_model_1_static
-anime_model_2_static
-anime_model_3_static
-anime_model_4_static
-anime_model_5_static
-anime_model_6_static
-anime_texture_1_static
-anime_texture_2_static
-anime_texture_3_static
-anime_texture_4_static
-anime_texture_5_static
-anime_texture_6_static
-softsprite_matrix_static
\ No newline at end of file
diff --git a/Android/app/src/main/assets/assets/extractor/filelists/gamecube_pal.txt b/Android/app/src/main/assets/assets/extractor/filelists/gamecube_pal.txt
deleted file mode 100644
index c9746c1da..000000000
--- a/Android/app/src/main/assets/assets/extractor/filelists/gamecube_pal.txt
+++ /dev/null
@@ -1,1510 +0,0 @@
-makerom
-boot
-dmadata
-Audiobank
-Audioseq
-Audiotable
-link_animetion
-icon_item_static
-icon_item_24_static
-icon_item_field_static
-icon_item_dungeon_static
-icon_item_gameover_static
-icon_item_nes_static
-icon_item_ger_static
-icon_item_fra_static
-item_name_static
-map_name_static
-do_action_static
-message_static
-message_texture_static
-nes_font_static
-nes_message_data_static
-ger_message_data_static
-fra_message_data_static
-staff_message_data_static
-map_grand_static
-map_48x85_static
-map_i_static
-code
-ovl_title
-ovl_select
-ovl_opening
-ovl_file_choose
-ovl_kaleido_scope
-ovl_player_actor
-ovl_map_mark_data
-ovl_En_Test
-ovl_Arms_Hook
-ovl_Arrow_Fire
-ovl_Arrow_Ice
-ovl_Arrow_Light
-ovl_Bg_Bdan_Objects
-ovl_Bg_Bdan_Switch
-ovl_Bg_Bom_Guard
-ovl_Bg_Bombwall
-ovl_Bg_Bowl_Wall
-ovl_Bg_Breakwall
-ovl_Bg_Ddan_Jd
-ovl_Bg_Ddan_Kd
-ovl_Bg_Dodoago
-ovl_Bg_Dy_Yoseizo
-ovl_Bg_Ganon_Otyuka
-ovl_Bg_Gate_Shutter
-ovl_Bg_Gjyo_Bridge
-ovl_Bg_Gnd_Darkmeiro
-ovl_Bg_Gnd_Firemeiro
-ovl_Bg_Gnd_Iceblock
-ovl_Bg_Gnd_Nisekabe
-ovl_Bg_Gnd_Soulmeiro
-ovl_Bg_Haka
-ovl_Bg_Haka_Gate
-ovl_Bg_Haka_Huta
-ovl_Bg_Haka_Megane
-ovl_Bg_Haka_MeganeBG
-ovl_Bg_Haka_Sgami
-ovl_Bg_Haka_Ship
-ovl_Bg_Haka_Trap
-ovl_Bg_Haka_Tubo
-ovl_Bg_Haka_Water
-ovl_Bg_Haka_Zou
-ovl_Bg_Heavy_Block
-ovl_Bg_Hidan_Curtain
-ovl_Bg_Hidan_Dalm
-ovl_Bg_Hidan_Firewall
-ovl_Bg_Hidan_Fslift
-ovl_Bg_Hidan_Fwbig
-ovl_Bg_Hidan_Hamstep
-ovl_Bg_Hidan_Hrock
-ovl_Bg_Hidan_Kousi
-ovl_Bg_Hidan_Kowarerukabe
-ovl_Bg_Hidan_Rock
-ovl_Bg_Hidan_Rsekizou
-ovl_Bg_Hidan_Sekizou
-ovl_Bg_Hidan_Sima
-ovl_Bg_Hidan_Syoku
-ovl_Bg_Ice_Objects
-ovl_Bg_Ice_Shelter
-ovl_Bg_Ice_Shutter
-ovl_Bg_Ice_Turara
-ovl_Bg_Ingate
-ovl_Bg_Jya_1flift
-ovl_Bg_Jya_Amishutter
-ovl_Bg_Jya_Bigmirror
-ovl_Bg_Jya_Block
-ovl_Bg_Jya_Bombchuiwa
-ovl_Bg_Jya_Bombiwa
-ovl_Bg_Jya_Cobra
-ovl_Bg_Jya_Goroiwa
-ovl_Bg_Jya_Haheniron
-ovl_Bg_Jya_Ironobj
-ovl_Bg_Jya_Kanaami
-ovl_Bg_Jya_Lift
-ovl_Bg_Jya_Megami
-ovl_Bg_Jya_Zurerukabe
-ovl_Bg_Menkuri_Eye
-ovl_Bg_Menkuri_Kaiten
-ovl_Bg_Menkuri_Nisekabe
-ovl_Bg_Mizu_Bwall
-ovl_Bg_Mizu_Movebg
-ovl_Bg_Mizu_Shutter
-ovl_Bg_Mizu_Uzu
-ovl_Bg_Mizu_Water
-ovl_Bg_Mjin
-ovl_Bg_Mori_Bigst
-ovl_Bg_Mori_Elevator
-ovl_Bg_Mori_Hashigo
-ovl_Bg_Mori_Hashira4
-ovl_Bg_Mori_Hineri
-ovl_Bg_Mori_Idomizu
-ovl_Bg_Mori_Kaitenkabe
-ovl_Bg_Mori_Rakkatenjo
-ovl_Bg_Po_Event
-ovl_Bg_Po_Syokudai
-ovl_Bg_Pushbox
-ovl_Bg_Relay_Objects
-ovl_Bg_Spot00_Break
-ovl_Bg_Spot00_Hanebasi
-ovl_Bg_Spot01_Fusya
-ovl_Bg_Spot01_Idohashira
-ovl_Bg_Spot01_Idomizu
-ovl_Bg_Spot01_Idosoko
-ovl_Bg_Spot01_Objects2
-ovl_Bg_Spot02_Objects
-ovl_Bg_Spot03_Taki
-ovl_Bg_Spot05_Soko
-ovl_Bg_Spot06_Objects
-ovl_Bg_Spot07_Taki
-ovl_Bg_Spot08_Bakudankabe
-ovl_Bg_Spot08_Iceblock
-ovl_Bg_Spot09_Obj
-ovl_Bg_Spot11_Bakudankabe
-ovl_Bg_Spot11_Oasis
-ovl_Bg_Spot12_Gate
-ovl_Bg_Spot12_Saku
-ovl_Bg_Spot15_Rrbox
-ovl_Bg_Spot15_Saku
-ovl_Bg_Spot16_Bombstone
-ovl_Bg_Spot16_Doughnut
-ovl_Bg_Spot17_Bakudankabe
-ovl_Bg_Spot17_Funen
-ovl_Bg_Spot18_Basket
-ovl_Bg_Spot18_Futa
-ovl_Bg_Spot18_Obj
-ovl_Bg_Spot18_Shutter
-ovl_Bg_Sst_Floor
-ovl_Bg_Toki_Hikari
-ovl_Bg_Toki_Swd
-ovl_Bg_Treemouth
-ovl_Bg_Umajump
-ovl_Bg_Vb_Sima
-ovl_Bg_Ydan_Hasi
-ovl_Bg_Ydan_Maruta
-ovl_Bg_Ydan_Sp
-ovl_Bg_Zg
-ovl_Boss_Dodongo
-ovl_Boss_Fd
-ovl_Boss_Fd2
-ovl_Boss_Ganon
-ovl_Boss_Ganon2
-ovl_Boss_Ganondrof
-ovl_Boss_Goma
-ovl_Boss_Mo
-ovl_Boss_Sst
-ovl_Boss_Tw
-ovl_Boss_Va
-ovl_Demo_6K
-ovl_Demo_Du
-ovl_Demo_Ec
-ovl_Demo_Effect
-ovl_Demo_Ext
-ovl_Demo_Geff
-ovl_Demo_Gj
-ovl_Demo_Go
-ovl_Demo_Gt
-ovl_Demo_Ik
-ovl_Demo_Im
-ovl_Demo_Kankyo
-ovl_Demo_Kekkai
-ovl_Demo_Sa
-ovl_Demo_Shd
-ovl_Demo_Tre_Lgt
-ovl_Door_Ana
-ovl_Door_Gerudo
-ovl_Door_Killer
-ovl_Door_Shutter
-ovl_Door_Toki
-ovl_Door_Warp1
-ovl_Efc_Erupc
-ovl_Eff_Dust
-ovl_Effect_Ss_Blast
-ovl_Effect_Ss_Bomb
-ovl_Effect_Ss_Bomb2
-ovl_Effect_Ss_Bubble
-ovl_Effect_Ss_D_Fire
-ovl_Effect_Ss_Dead_Db
-ovl_Effect_Ss_Dead_Dd
-ovl_Effect_Ss_Dead_Ds
-ovl_Effect_Ss_Dead_Sound
-ovl_Effect_Ss_Dt_Bubble
-ovl_Effect_Ss_Dust
-ovl_Effect_Ss_En_Fire
-ovl_Effect_Ss_En_Ice
-ovl_Effect_Ss_Extra
-ovl_Effect_Ss_Fcircle
-ovl_Effect_Ss_Fhg_Flash
-ovl_Effect_Ss_Fire_Tail
-ovl_Effect_Ss_G_Fire
-ovl_Effect_Ss_G_Magma
-ovl_Effect_Ss_G_Magma2
-ovl_Effect_Ss_G_Ripple
-ovl_Effect_Ss_G_Spk
-ovl_Effect_Ss_G_Splash
-ovl_Effect_Ss_Hahen
-ovl_Effect_Ss_HitMark
-ovl_Effect_Ss_Ice_Piece
-ovl_Effect_Ss_Ice_Smoke
-ovl_Effect_Ss_K_Fire
-ovl_Effect_Ss_Kakera
-ovl_Effect_Ss_KiraKira
-ovl_Effect_Ss_Lightning
-ovl_Effect_Ss_Sibuki
-ovl_Effect_Ss_Sibuki2
-ovl_Effect_Ss_Solder_Srch_Ball
-ovl_Effect_Ss_Stick
-ovl_Effect_Ss_Stone1
-ovl_Elf_Msg
-ovl_Elf_Msg2
-ovl_En_Am
-ovl_En_Ani
-ovl_En_Anubice
-ovl_En_Anubice_Fire
-ovl_En_Anubice_Tag
-ovl_En_Arow_Trap
-ovl_En_Arrow
-ovl_En_Attack_Niw
-ovl_En_Ba
-ovl_En_Bb
-ovl_En_Bdfire
-ovl_En_Bigokuta
-ovl_En_Bili
-ovl_En_Bird
-ovl_En_Blkobj
-ovl_En_Bom
-ovl_En_Bom_Bowl_Man
-ovl_En_Bom_Bowl_Pit
-ovl_En_Bom_Chu
-ovl_En_Bombf
-ovl_En_Boom
-ovl_En_Box
-ovl_En_Brob
-ovl_En_Bubble
-ovl_En_Butte
-ovl_En_Bw
-ovl_En_Bx
-ovl_En_Changer
-ovl_En_Clear_Tag
-ovl_En_Cow
-ovl_En_Crow
-ovl_En_Cs
-ovl_En_Daiku
-ovl_En_Daiku_Kakariko
-ovl_En_Dekubaba
-ovl_En_Dekunuts
-ovl_En_Dh
-ovl_En_Dha
-ovl_En_Diving_Game
-ovl_En_Dns
-ovl_En_Dnt_Demo
-ovl_En_Dnt_Jiji
-ovl_En_Dnt_Nomal
-ovl_En_Dodojr
-ovl_En_Dodongo
-ovl_En_Dog
-ovl_En_Door
-ovl_En_Ds
-ovl_En_Du
-ovl_En_Dy_Extra
-ovl_En_Eg
-ovl_En_Eiyer
-ovl_En_Elf
-ovl_En_Encount1
-ovl_En_Encount2
-ovl_En_Ex_Item
-ovl_En_Ex_Ruppy
-ovl_En_Fd
-ovl_En_Fd_Fire
-ovl_En_Fhg_Fire
-ovl_En_Fire_Rock
-ovl_En_Firefly
-ovl_En_Fish
-ovl_En_Floormas
-ovl_En_Fr
-ovl_En_Fu
-ovl_En_Fw
-ovl_En_Fz
-ovl_En_G_Switch
-ovl_En_Ganon_Mant
-ovl_En_Ganon_Organ
-ovl_En_Gb
-ovl_En_Ge1
-ovl_En_Ge2
-ovl_En_Ge3
-ovl_En_GeldB
-ovl_En_GirlA
-ovl_En_Gm
-ovl_En_Go
-ovl_En_Go2
-ovl_En_Goma
-ovl_En_Goroiwa
-ovl_En_Gs
-ovl_En_Guest
-ovl_En_Hata
-ovl_En_Heishi1
-ovl_En_Heishi2
-ovl_En_Heishi3
-ovl_En_Heishi4
-ovl_En_Hintnuts
-ovl_En_Holl
-ovl_En_Honotrap
-ovl_En_Horse
-ovl_En_Horse_Game_Check
-ovl_En_Horse_Ganon
-ovl_En_Horse_Link_Child
-ovl_En_Horse_Normal
-ovl_En_Horse_Zelda
-ovl_En_Hs
-ovl_En_Hs2
-ovl_En_Hy
-ovl_En_Ice_Hono
-ovl_En_Ik
-ovl_En_In
-ovl_En_Insect
-ovl_En_Ishi
-ovl_En_It
-ovl_En_Jj
-ovl_En_Js
-ovl_En_Jsjutan
-ovl_En_Kakasi
-ovl_En_Kakasi2
-ovl_En_Kakasi3
-ovl_En_Kanban
-ovl_En_Karebaba
-ovl_En_Ko
-ovl_En_Kusa
-ovl_En_Kz
-ovl_En_Light
-ovl_En_Lightbox
-ovl_En_M_Fire1
-ovl_En_M_Thunder
-ovl_En_Ma1
-ovl_En_Ma2
-ovl_En_Ma3
-ovl_En_Mag
-ovl_En_Mb
-ovl_En_Md
-ovl_En_Mk
-ovl_En_Mm
-ovl_En_Mm2
-ovl_En_Ms
-ovl_En_Mu
-ovl_En_Nb
-ovl_En_Niw
-ovl_En_Niw_Girl
-ovl_En_Niw_Lady
-ovl_En_Nutsball
-ovl_En_Nwc
-ovl_En_Ny
-ovl_En_OE2
-ovl_En_Okarina_Effect
-ovl_En_Okarina_Tag
-ovl_En_Okuta
-ovl_En_Ossan
-ovl_En_Owl
-ovl_En_Part
-ovl_En_Peehat
-ovl_En_Po_Desert
-ovl_En_Po_Field
-ovl_En_Po_Relay
-ovl_En_Po_Sisters
-ovl_En_Poh
-ovl_En_Pu_box
-ovl_En_Rd
-ovl_En_Reeba
-ovl_En_River_Sound
-ovl_En_Rl
-ovl_En_Rr
-ovl_En_Ru1
-ovl_En_Ru2
-ovl_En_Sa
-ovl_En_Sb
-ovl_En_Scene_Change
-ovl_En_Sda
-ovl_En_Shopnuts
-ovl_En_Si
-ovl_En_Siofuki
-ovl_En_Skb
-ovl_En_Skj
-ovl_En_Skjneedle
-ovl_En_Ssh
-ovl_En_St
-ovl_En_Sth
-ovl_En_Stream
-ovl_En_Sw
-ovl_En_Syateki_Itm
-ovl_En_Syateki_Man
-ovl_En_Syateki_Niw
-ovl_En_Ta
-ovl_En_Takara_Man
-ovl_En_Tana
-ovl_En_Tg
-ovl_En_Tite
-ovl_En_Tk
-ovl_En_Torch
-ovl_En_Torch2
-ovl_En_Toryo
-ovl_En_Tp
-ovl_En_Tr
-ovl_En_Trap
-ovl_En_Tubo_Trap
-ovl_En_Vali
-ovl_En_Vase
-ovl_En_Vb_Ball
-ovl_En_Viewer
-ovl_En_Vm
-ovl_En_Wall_Tubo
-ovl_En_Wallmas
-ovl_En_Weather_Tag
-ovl_En_Weiyer
-ovl_En_Wf
-ovl_En_Wonder_Item
-ovl_En_Wonder_Talk
-ovl_En_Wonder_Talk2
-ovl_En_Wood02
-ovl_En_Xc
-ovl_En_Yabusame_Mark
-ovl_En_Yukabyun
-ovl_En_Zf
-ovl_En_Zl1
-ovl_En_Zl2
-ovl_En_Zl3
-ovl_En_Zl4
-ovl_En_Zo
-ovl_En_fHG
-ovl_End_Title
-ovl_Fishing
-ovl_Item_B_Heart
-ovl_Item_Etcetera
-ovl_Item_Inbox
-ovl_Item_Ocarina
-ovl_Item_Shield
-ovl_Magic_Dark
-ovl_Magic_Fire
-ovl_Magic_Wind
-ovl_Mir_Ray
-ovl_Obj_Bean
-ovl_Obj_Blockstop
-ovl_Obj_Bombiwa
-ovl_Obj_Comb
-ovl_Obj_Dekujr
-ovl_Obj_Elevator
-ovl_Obj_Hamishi
-ovl_Obj_Hana
-ovl_Obj_Hsblock
-ovl_Obj_Ice_Poly
-ovl_Obj_Kibako
-ovl_Obj_Kibako2
-ovl_Obj_Lift
-ovl_Obj_Lightswitch
-ovl_Obj_Makekinsuta
-ovl_Obj_Makeoshihiki
-ovl_Obj_Mure
-ovl_Obj_Mure2
-ovl_Obj_Mure3
-ovl_Obj_Oshihiki
-ovl_Obj_Roomtimer
-ovl_Obj_Switch
-ovl_Obj_Syokudai
-ovl_Obj_Timeblock
-ovl_Obj_Tsubo
-ovl_Obj_Warp2block
-ovl_Object_Kankyo
-ovl_Oceff_Spot
-ovl_Oceff_Storm
-ovl_Oceff_Wipe
-ovl_Oceff_Wipe2
-ovl_Oceff_Wipe3
-ovl_Oceff_Wipe4
-ovl_Shot_Sun
-gameplay_keep
-gameplay_field_keep
-gameplay_dangeon_keep
-gameplay_object_exchange_static
-object_link_boy
-object_link_child
-object_box
-object_human
-object_okuta
-object_poh
-object_wallmaster
-object_dy_obj
-object_firefly
-object_dodongo
-object_fire
-object_niw
-object_tite
-object_reeba
-object_peehat
-object_kingdodongo
-object_horse
-object_zf
-object_goma
-object_zl1
-object_gol
-object_bubble
-object_dodojr
-object_torch2
-object_bl
-object_tp
-object_oA1
-object_st
-object_bw
-object_ei
-object_horse_normal
-object_oB1
-object_o_anime
-object_spot04_objects
-object_ddan_objects
-object_hidan_objects
-object_horse_ganon
-object_oA2
-object_spot00_objects
-object_mb
-object_bombf
-object_sk2
-object_oE1
-object_oE_anime
-object_oE2
-object_ydan_objects
-object_gnd
-object_am
-object_dekubaba
-object_oA3
-object_oA4
-object_oA5
-object_oA6
-object_oA7
-object_jj
-object_oA8
-object_oA9
-object_oB2
-object_oB3
-object_oB4
-object_horse_zelda
-object_opening_demo1
-object_warp1
-object_b_heart
-object_dekunuts
-object_oE3
-object_oE4
-object_menkuri_objects
-object_oE5
-object_oE6
-object_oE7
-object_oE8
-object_oE9
-object_oE10
-object_oE11
-object_oE12
-object_vali
-object_oA10
-object_oA11
-object_mizu_objects
-object_fhg
-object_ossan
-object_mori_hineri1
-object_Bb
-object_toki_objects
-object_yukabyun
-object_zl2
-object_mjin
-object_mjin_flash
-object_mjin_dark
-object_mjin_flame
-object_mjin_ice
-object_mjin_soul
-object_mjin_wind
-object_mjin_oka
-object_haka_objects
-object_spot06_objects
-object_ice_objects
-object_relay_objects
-object_mori_hineri1a
-object_mori_hineri2
-object_mori_hineri2a
-object_mori_objects
-object_mori_tex
-object_spot08_obj
-object_warp2
-object_hata
-object_bird
-object_wood02
-object_lightbox
-object_pu_box
-object_trap
-object_vase
-object_im
-object_ta
-object_tk
-object_xc
-object_vm
-object_bv
-object_hakach_objects
-object_efc_crystal_light
-object_efc_fire_ball
-object_efc_flash
-object_efc_lgt_shower
-object_efc_star_field
-object_god_lgt
-object_light_ring
-object_triforce_spot
-object_medal
-object_bdan_objects
-object_sd
-object_rd
-object_po_sisters
-object_heavy_object
-object_gndd
-object_fd
-object_du
-object_fw
-object_horse_link_child
-object_spot02_objects
-object_haka
-object_ru1
-object_syokudai
-object_fd2
-object_dh
-object_rl
-object_efc_tw
-object_demo_tre_lgt
-object_gi_key
-object_mir_ray
-object_brob
-object_gi_jewel
-object_spot09_obj
-object_spot18_obj
-object_bdoor
-object_spot17_obj
-object_shop_dungen
-object_nb
-object_mo
-object_sb
-object_gi_melody
-object_gi_heart
-object_gi_compass
-object_gi_bosskey
-object_gi_medal
-object_gi_nuts
-object_sa
-object_gi_hearts
-object_gi_arrowcase
-object_gi_bombpouch
-object_in
-object_tr
-object_spot16_obj
-object_oE1s
-object_oE4s
-object_os_anime
-object_gi_bottle
-object_gi_stick
-object_gi_map
-object_oF1d_map
-object_ru2
-object_gi_shield_1
-object_dekujr
-object_gi_magicpot
-object_gi_bomb_1
-object_oF1s
-object_ma2
-object_gi_purse
-object_hni
-object_tw
-object_rr
-object_bxa
-object_anubice
-object_gi_gerudo
-object_gi_arrow
-object_gi_bomb_2
-object_gi_egg
-object_gi_scale
-object_gi_shield_2
-object_gi_hookshot
-object_gi_ocarina
-object_gi_milk
-object_ma1
-object_ganon
-object_sst
-object_ny
-object_fr
-object_gi_pachinko
-object_gi_boomerang
-object_gi_bow
-object_gi_glasses
-object_gi_liquid
-object_ani
-object_demo_6k
-object_gi_shield_3
-object_gi_letter
-object_spot15_obj
-object_jya_obj
-object_gi_clothes
-object_gi_bean
-object_gi_fish
-object_gi_saw
-object_gi_hammer
-object_gi_grass
-object_gi_longsword
-object_spot01_objects
-object_md
-object_km1
-object_kw1
-object_zo
-object_kz
-object_umajump
-object_masterkokiri
-object_masterkokirihead
-object_mastergolon
-object_masterzoora
-object_aob
-object_ik
-object_ahg
-object_cne
-object_gi_niwatori
-object_skj
-object_gi_bottle_letter
-object_bji
-object_bba
-object_gi_ocarina_0
-object_ds
-object_ane
-object_boj
-object_spot03_object
-object_spot07_object
-object_fz
-object_bob
-object_ge1
-object_yabusame_point
-object_gi_boots_2
-object_gi_seed
-object_gnd_magic
-object_d_elevator
-object_d_hsblock
-object_d_lift
-object_mamenoki
-object_goroiwa
-object_toryo
-object_daiku
-object_nwc
-object_blkobj
-object_gm
-object_ms
-object_hs
-object_ingate
-object_lightswitch
-object_kusa
-object_tsubo
-object_gi_gloves
-object_gi_coin
-object_kanban
-object_gjyo_objects
-object_owl
-object_mk
-object_fu
-object_gi_ki_tan_mask
-object_gi_redead_mask
-object_gi_skj_mask
-object_gi_rabit_mask
-object_gi_truth_mask
-object_ganon_objects
-object_siofuki
-object_stream
-object_mm
-object_fa
-object_os
-object_gi_eye_lotion
-object_gi_powder
-object_gi_mushroom
-object_gi_ticketstone
-object_gi_brokensword
-object_js
-object_cs
-object_gi_prescription
-object_gi_bracelet
-object_gi_soldout
-object_gi_frog
-object_mag
-object_door_gerudo
-object_gt
-object_efc_erupc
-object_zl2_anime1
-object_zl2_anime2
-object_gi_golonmask
-object_gi_zoramask
-object_gi_gerudomask
-object_ganon2
-object_ka
-object_ts
-object_zg
-object_gi_hoverboots
-object_gi_m_arrow
-object_ds2
-object_ec
-object_fish
-object_gi_sutaru
-object_gi_goddess
-object_ssh
-object_bigokuta
-object_bg
-object_spot05_objects
-object_spot12_obj
-object_bombiwa
-object_hintnuts
-object_rs
-object_spot00_break
-object_gla
-object_shopnuts
-object_geldb
-object_gr
-object_dog
-object_jya_iron
-object_jya_door
-object_spot01_objects2
-object_spot11_obj
-object_kibako2
-object_dns
-object_dnk
-object_gi_fire
-object_gi_insect
-object_gi_butterfly
-object_gi_ghost
-object_gi_soul
-object_bowl
-object_po_field
-object_demo_kekkai
-object_efc_doughnut
-object_gi_dekupouch
-object_ganon_anime1
-object_ganon_anime2
-object_ganon_anime3
-object_gi_rupy
-object_spot01_matoya
-object_spot01_matoyab
-object_po_composer
-object_mu
-object_wf
-object_skb
-object_gj
-object_geff
-object_haka_door
-object_gs
-object_ps
-object_bwall
-object_crow
-object_cow
-object_cob
-object_gi_sword_1
-object_door_killer
-object_ouke_haka
-object_timeblock
-object_zl4
-g_pn_01
-g_pn_02
-g_pn_03
-g_pn_04
-g_pn_05
-g_pn_06
-g_pn_07
-g_pn_08
-g_pn_09
-g_pn_10
-g_pn_11
-g_pn_12
-g_pn_13
-g_pn_14
-g_pn_15
-g_pn_16
-g_pn_17
-g_pn_18
-g_pn_19
-g_pn_20
-g_pn_21
-g_pn_22
-g_pn_23
-g_pn_24
-g_pn_25
-g_pn_26
-g_pn_27
-g_pn_28
-g_pn_29
-g_pn_30
-g_pn_31
-g_pn_32
-g_pn_33
-g_pn_34
-g_pn_35
-g_pn_36
-g_pn_37
-g_pn_38
-g_pn_39
-g_pn_40
-g_pn_41
-g_pn_42
-g_pn_43
-g_pn_44
-g_pn_45
-g_pn_46
-g_pn_47
-g_pn_48
-g_pn_49
-g_pn_50
-g_pn_51
-g_pn_52
-g_pn_53
-g_pn_54
-g_pn_55
-g_pn_56
-g_pn_57
-z_select_static
-nintendo_rogo_static
-title_static
-parameter_static
-vr_fine0_static
-vr_fine0_pal_static
-vr_fine1_static
-vr_fine1_pal_static
-vr_fine2_static
-vr_fine2_pal_static
-vr_fine3_static
-vr_fine3_pal_static
-vr_cloud0_static
-vr_cloud0_pal_static
-vr_cloud1_static
-vr_cloud1_pal_static
-vr_cloud2_static
-vr_cloud2_pal_static
-vr_cloud3_static
-vr_cloud3_pal_static
-vr_holy0_static
-vr_holy0_pal_static
-vr_holy1_static
-vr_holy1_pal_static
-vr_MDVR_static
-vr_MDVR_pal_static
-vr_MNVR_static
-vr_MNVR_pal_static
-vr_RUVR_static
-vr_RUVR_pal_static
-vr_LHVR_static
-vr_LHVR_pal_static
-vr_KHVR_static
-vr_KHVR_pal_static
-vr_K3VR_static
-vr_K3VR_pal_static
-vr_K4VR_static
-vr_K4VR_pal_static
-vr_K5VR_static
-vr_K5VR_pal_static
-vr_SP1a_static
-vr_SP1a_pal_static
-vr_MLVR_static
-vr_MLVR_pal_static
-vr_KKRVR_static
-vr_KKRVR_pal_static
-vr_KR3VR_static
-vr_KR3VR_pal_static
-vr_IPVR_static
-vr_IPVR_pal_static
-vr_KSVR_static
-vr_KSVR_pal_static
-vr_GLVR_static
-vr_GLVR_pal_static
-vr_ZRVR_static
-vr_ZRVR_pal_static
-vr_DGVR_static
-vr_DGVR_pal_static
-vr_ALVR_static
-vr_ALVR_pal_static
-vr_NSVR_static
-vr_NSVR_pal_static
-vr_LBVR_static
-vr_LBVR_pal_static
-vr_TTVR_static
-vr_TTVR_pal_static
-vr_FCVR_static
-vr_FCVR_pal_static
-elf_message_field
-elf_message_ydan
-ydan_scene
-ydan_room_0
-ydan_room_1
-ydan_room_2
-ydan_room_3
-ydan_room_4
-ydan_room_5
-ydan_room_6
-ydan_room_7
-ydan_room_8
-ydan_room_9
-ydan_room_10
-ydan_room_11
-ddan_scene
-ddan_room_0
-ddan_room_1
-ddan_room_2
-ddan_room_3
-ddan_room_4
-ddan_room_5
-ddan_room_6
-ddan_room_7
-ddan_room_8
-ddan_room_9
-ddan_room_10
-ddan_room_11
-ddan_room_12
-ddan_room_13
-ddan_room_14
-ddan_room_15
-ddan_room_16
-bdan_scene
-bdan_room_0
-bdan_room_1
-bdan_room_2
-bdan_room_3
-bdan_room_4
-bdan_room_5
-bdan_room_6
-bdan_room_7
-bdan_room_8
-bdan_room_9
-bdan_room_10
-bdan_room_11
-bdan_room_12
-bdan_room_13
-bdan_room_14
-bdan_room_15
-Bmori1_scene
-Bmori1_room_0
-Bmori1_room_1
-Bmori1_room_2
-Bmori1_room_3
-Bmori1_room_4
-Bmori1_room_5
-Bmori1_room_6
-Bmori1_room_7
-Bmori1_room_8
-Bmori1_room_9
-Bmori1_room_10
-Bmori1_room_11
-Bmori1_room_12
-Bmori1_room_13
-Bmori1_room_14
-Bmori1_room_15
-Bmori1_room_16
-Bmori1_room_17
-Bmori1_room_18
-Bmori1_room_19
-Bmori1_room_20
-Bmori1_room_21
-Bmori1_room_22
-HIDAN_scene
-HIDAN_room_0
-HIDAN_room_1
-HIDAN_room_2
-HIDAN_room_3
-HIDAN_room_4
-HIDAN_room_5
-HIDAN_room_6
-HIDAN_room_7
-HIDAN_room_8
-HIDAN_room_9
-HIDAN_room_10
-HIDAN_room_11
-HIDAN_room_12
-HIDAN_room_13
-HIDAN_room_14
-HIDAN_room_15
-HIDAN_room_16
-HIDAN_room_17
-HIDAN_room_18
-HIDAN_room_19
-HIDAN_room_20
-HIDAN_room_21
-HIDAN_room_22
-HIDAN_room_23
-HIDAN_room_24
-HIDAN_room_25
-HIDAN_room_26
-MIZUsin_scene
-MIZUsin_room_0
-MIZUsin_room_1
-MIZUsin_room_2
-MIZUsin_room_3
-MIZUsin_room_4
-MIZUsin_room_5
-MIZUsin_room_6
-MIZUsin_room_7
-MIZUsin_room_8
-MIZUsin_room_9
-MIZUsin_room_10
-MIZUsin_room_11
-MIZUsin_room_12
-MIZUsin_room_13
-MIZUsin_room_14
-MIZUsin_room_15
-MIZUsin_room_16
-MIZUsin_room_17
-MIZUsin_room_18
-MIZUsin_room_19
-MIZUsin_room_20
-MIZUsin_room_21
-MIZUsin_room_22
-jyasinzou_scene
-jyasinzou_room_0
-jyasinzou_room_1
-jyasinzou_room_2
-jyasinzou_room_3
-jyasinzou_room_4
-jyasinzou_room_5
-jyasinzou_room_6
-jyasinzou_room_7
-jyasinzou_room_8
-jyasinzou_room_9
-jyasinzou_room_10
-jyasinzou_room_11
-jyasinzou_room_12
-jyasinzou_room_13
-jyasinzou_room_14
-jyasinzou_room_15
-jyasinzou_room_16
-jyasinzou_room_17
-jyasinzou_room_18
-jyasinzou_room_19
-jyasinzou_room_20
-jyasinzou_room_21
-jyasinzou_room_22
-jyasinzou_room_23
-jyasinzou_room_24
-jyasinzou_room_25
-jyasinzou_room_26
-jyasinzou_room_27
-jyasinzou_room_28
-HAKAdan_scene
-HAKAdan_room_0
-HAKAdan_room_1
-HAKAdan_room_2
-HAKAdan_room_3
-HAKAdan_room_4
-HAKAdan_room_5
-HAKAdan_room_6
-HAKAdan_room_7
-HAKAdan_room_8
-HAKAdan_room_9
-HAKAdan_room_10
-HAKAdan_room_11
-HAKAdan_room_12
-HAKAdan_room_13
-HAKAdan_room_14
-HAKAdan_room_15
-HAKAdan_room_16
-HAKAdan_room_17
-HAKAdan_room_18
-HAKAdan_room_19
-HAKAdan_room_20
-HAKAdan_room_21
-HAKAdan_room_22
-HAKAdanCH_scene
-HAKAdanCH_room_0
-HAKAdanCH_room_1
-HAKAdanCH_room_2
-HAKAdanCH_room_3
-HAKAdanCH_room_4
-HAKAdanCH_room_5
-HAKAdanCH_room_6
-ice_doukutu_scene
-ice_doukutu_room_0
-ice_doukutu_room_1
-ice_doukutu_room_2
-ice_doukutu_room_3
-ice_doukutu_room_4
-ice_doukutu_room_5
-ice_doukutu_room_6
-ice_doukutu_room_7
-ice_doukutu_room_8
-ice_doukutu_room_9
-ice_doukutu_room_10
-ice_doukutu_room_11
-men_scene
-men_room_0
-men_room_1
-men_room_2
-men_room_3
-men_room_4
-men_room_5
-men_room_6
-men_room_7
-men_room_8
-men_room_9
-men_room_10
-ganontika_scene
-ganontika_room_0
-ganontika_room_1
-ganontika_room_2
-ganontika_room_3
-ganontika_room_4
-ganontika_room_5
-ganontika_room_6
-ganontika_room_7
-ganontika_room_8
-ganontika_room_9
-ganontika_room_10
-ganontika_room_11
-ganontika_room_12
-ganontika_room_13
-ganontika_room_14
-ganontika_room_15
-ganontika_room_16
-ganontika_room_17
-ganontika_room_18
-ganontika_room_19
-spot00_scene
-spot00_room_0
-spot01_scene
-spot01_room_0
-spot02_scene
-spot02_room_0
-spot02_room_1
-spot03_scene
-spot03_room_0
-spot03_room_1
-spot04_scene
-spot04_room_0
-spot04_room_1
-spot04_room_2
-spot05_scene
-spot05_room_0
-spot06_scene
-spot06_room_0
-spot07_scene
-spot07_room_0
-spot07_room_1
-spot08_scene
-spot08_room_0
-spot09_scene
-spot09_room_0
-spot10_scene
-spot10_room_0
-spot10_room_1
-spot10_room_2
-spot10_room_3
-spot10_room_4
-spot10_room_5
-spot10_room_6
-spot10_room_7
-spot10_room_8
-spot10_room_9
-spot11_scene
-spot11_room_0
-spot12_scene
-spot12_room_0
-spot12_room_1
-spot13_scene
-spot13_room_0
-spot13_room_1
-spot15_scene
-spot15_room_0
-spot16_scene
-spot16_room_0
-spot17_scene
-spot17_room_0
-spot17_room_1
-spot18_scene
-spot18_room_0
-spot18_room_1
-spot18_room_2
-spot18_room_3
-market_day_scene
-market_day_room_0
-market_night_scene
-market_night_room_0
-kenjyanoma_scene
-kenjyanoma_room_0
-tokinoma_scene
-tokinoma_room_0
-tokinoma_room_1
-link_home_scene
-link_home_room_0
-kokiri_shop_scene
-kokiri_shop_room_0
-kokiri_home_scene
-kokiri_home_room_0
-kakusiana_scene
-kakusiana_room_0
-kakusiana_room_1
-kakusiana_room_2
-kakusiana_room_3
-kakusiana_room_4
-kakusiana_room_5
-kakusiana_room_6
-kakusiana_room_7
-kakusiana_room_8
-kakusiana_room_9
-kakusiana_room_10
-kakusiana_room_11
-kakusiana_room_12
-kakusiana_room_13
-entra_scene
-entra_room_0
-moribossroom_scene
-moribossroom_room_0
-moribossroom_room_1
-syatekijyou_scene
-syatekijyou_room_0
-shop1_scene
-shop1_room_0
-hairal_niwa_scene
-hairal_niwa_room_0
-ganon_tou_scene
-ganon_tou_room_0
-market_alley_scene
-market_alley_room_0
-spot20_scene
-spot20_room_0
-market_ruins_scene
-market_ruins_room_0
-entra_n_scene
-entra_n_room_0
-enrui_scene
-enrui_room_0
-market_alley_n_scene
-market_alley_n_room_0
-hiral_demo_scene
-hiral_demo_room_0
-kokiri_home3_scene
-kokiri_home3_room_0
-malon_stable_scene
-malon_stable_room_0
-kakariko_scene
-kakariko_room_0
-bdan_boss_scene
-bdan_boss_room_0
-bdan_boss_room_1
-FIRE_bs_scene
-FIRE_bs_room_0
-FIRE_bs_room_1
-hut_scene
-hut_room_0
-daiyousei_izumi_scene
-daiyousei_izumi_room_0
-hakaana_scene
-hakaana_room_0
-yousei_izumi_tate_scene
-yousei_izumi_tate_room_0
-yousei_izumi_yoko_scene
-yousei_izumi_yoko_room_0
-golon_scene
-golon_room_0
-zoora_scene
-zoora_room_0
-drag_scene
-drag_room_0
-alley_shop_scene
-alley_shop_room_0
-night_shop_scene
-night_shop_room_0
-impa_scene
-impa_room_0
-labo_scene
-labo_room_0
-tent_scene
-tent_room_0
-nakaniwa_scene
-nakaniwa_room_0
-ddan_boss_scene
-ddan_boss_room_0
-ddan_boss_room_1
-ydan_boss_scene
-ydan_boss_room_0
-ydan_boss_room_1
-HAKAdan_bs_scene
-HAKAdan_bs_room_0
-HAKAdan_bs_room_1
-MIZUsin_bs_scene
-MIZUsin_bs_room_0
-MIZUsin_bs_room_1
-ganon_scene
-ganon_room_0
-ganon_room_1
-ganon_room_2
-ganon_room_3
-ganon_room_4
-ganon_room_5
-ganon_room_6
-ganon_room_7
-ganon_room_8
-ganon_room_9
-ganon_boss_scene
-ganon_boss_room_0
-jyasinboss_scene
-jyasinboss_room_0
-jyasinboss_room_1
-jyasinboss_room_2
-jyasinboss_room_3
-kokiri_home4_scene
-kokiri_home4_room_0
-kokiri_home5_scene
-kokiri_home5_room_0
-ganon_final_scene
-ganon_final_room_0
-kakariko3_scene
-kakariko3_room_0
-hakasitarelay_scene
-hakasitarelay_room_0
-hakasitarelay_room_1
-hakasitarelay_room_2
-hakasitarelay_room_3
-hakasitarelay_room_4
-hakasitarelay_room_5
-hakasitarelay_room_6
-shrine_scene
-shrine_room_0
-turibori_scene
-turibori_room_0
-shrine_n_scene
-shrine_n_room_0
-shrine_r_scene
-shrine_r_room_0
-hakaana2_scene
-hakaana2_room_0
-gerudoway_scene
-gerudoway_room_0
-gerudoway_room_1
-gerudoway_room_2
-gerudoway_room_3
-gerudoway_room_4
-gerudoway_room_5
-hairal_niwa_n_scene
-hairal_niwa_n_room_0
-bowling_scene
-bowling_room_0
-hakaana_ouke_scene
-hakaana_ouke_room_0
-hakaana_ouke_room_1
-hakaana_ouke_room_2
-hylia_labo_scene
-hylia_labo_room_0
-souko_scene
-souko_room_0
-souko_room_1
-souko_room_2
-miharigoya_scene
-miharigoya_room_0
-mahouya_scene
-mahouya_room_0
-takaraya_scene
-takaraya_room_0
-takaraya_room_1
-takaraya_room_2
-takaraya_room_3
-takaraya_room_4
-takaraya_room_5
-takaraya_room_6
-ganon_sonogo_scene
-ganon_sonogo_room_0
-ganon_sonogo_room_1
-ganon_sonogo_room_2
-ganon_sonogo_room_3
-ganon_sonogo_room_4
-ganon_demo_scene
-ganon_demo_room_0
-face_shop_scene
-face_shop_room_0
-kinsuta_scene
-kinsuta_room_0
-ganontikasonogo_scene
-ganontikasonogo_room_0
-ganontikasonogo_room_1
-bump_texture_static
-anime_model_1_static
-anime_model_2_static
-anime_model_3_static
-anime_model_4_static
-anime_model_5_static
-anime_model_6_static
-anime_texture_1_static
-anime_texture_2_static
-anime_texture_3_static
-anime_texture_4_static
-anime_texture_5_static
-anime_texture_6_static
-softsprite_matrix_static
\ No newline at end of file
diff --git a/Android/app/src/main/assets/assets/extractor/filelists/mm.txt b/Android/app/src/main/assets/assets/extractor/filelists/mm.txt
deleted file mode 100644
index 598a67c83..000000000
--- a/Android/app/src/main/assets/assets/extractor/filelists/mm.txt
+++ /dev/null
@@ -1,1552 +0,0 @@
-makerom
-boot
-dmadata
-Audiobank
-Audioseq
-Audiotable
-kanji
-link_animetion
-icon_item_static_syms
-icon_item_24_static_syms
-icon_item_field_static
-icon_item_dungeon_static
-icon_item_gameover_static
-icon_item_jpn_static
-icon_item_vtx_static
-map_i_static
-map_grand_static
-item_name_static
-map_name_static
-icon_item_static_yar
-icon_item_24_static_yar
-schedule_dma_static_syms
-schedule_dma_static_yar
-schedule_static
-story_static
-do_action_static
-message_static
-message_texture_static
-nes_font_static
-message_data_static
-staff_message_data_static
-code
-ovl_title
-ovl_select
-ovl_opening
-ovl_file_choose
-ovl_daytelop
-ovl_kaleido_scope
-ovl_player_actor
-ovl_En_Test
-ovl_En_GirlA
-ovl_En_Part
-ovl_En_Light
-ovl_En_Door
-ovl_En_Box
-ovl_En_Pametfrog
-ovl_En_Okuta
-ovl_En_Bom
-ovl_En_Wallmas
-ovl_En_Dodongo
-ovl_En_Firefly
-ovl_En_Horse
-ovl_En_Arrow
-ovl_En_Elf
-ovl_En_Niw
-ovl_En_Tite
-ovl_En_Peehat
-ovl_En_Holl
-ovl_En_Dinofos
-ovl_En_Hata
-ovl_En_Zl1
-ovl_En_Viewer
-ovl_En_Bubble
-ovl_Door_Shutter
-ovl_En_Boom
-ovl_En_Torch2
-ovl_En_Minifrog
-ovl_En_St
-ovl_Obj_Wturn
-ovl_En_River_Sound
-ovl_En_Ossan
-ovl_En_Famos
-ovl_En_Bombf
-ovl_En_Am
-ovl_En_Dekubaba
-ovl_En_M_Fire1
-ovl_En_M_Thunder
-ovl_Bg_Breakwall
-ovl_Door_Warp1
-ovl_Obj_Syokudai
-ovl_Item_B_Heart
-ovl_En_Dekunuts
-ovl_En_Bbfall
-ovl_Arms_Hook
-ovl_En_Bb
-ovl_Bg_Keikoku_Spr
-ovl_En_Wood02
-ovl_En_Death
-ovl_En_Minideath
-ovl_En_Vm
-ovl_Demo_Effect
-ovl_Demo_Kankyo
-ovl_En_Floormas
-ovl_En_Rd
-ovl_Bg_F40_Flift
-ovl_Obj_Mure
-ovl_En_Sw
-ovl_Object_Kankyo
-ovl_En_Horse_Link_Child
-ovl_Door_Ana
-ovl_En_Encount1
-ovl_Demo_Tre_Lgt
-ovl_En_Encount2
-ovl_En_Fire_Rock
-ovl_Bg_Ctower_Rot
-ovl_Mir_Ray
-ovl_En_Sb
-ovl_En_Bigslime
-ovl_En_Karebaba
-ovl_En_In
-ovl_En_Bom_Chu
-ovl_En_Horse_Game_Check
-ovl_En_Rr
-ovl_En_Fr
-ovl_En_Fishing
-ovl_Obj_Oshihiki
-ovl_Eff_Dust
-ovl_Bg_Umajump
-ovl_En_Insect
-ovl_En_Butte
-ovl_En_Fish
-ovl_Item_Etcetera
-ovl_Arrow_Fire
-ovl_Arrow_Ice
-ovl_Arrow_Light
-ovl_Obj_Kibako
-ovl_Obj_Tsubo
-ovl_En_Ik
-ovl_Demo_Shd
-ovl_En_Dns
-ovl_Elf_Msg
-ovl_En_Honotrap
-ovl_En_Tubo_Trap
-ovl_Obj_Ice_Poly
-ovl_En_Fz
-ovl_En_Kusa
-ovl_Obj_Bean
-ovl_Obj_Bombiwa
-ovl_Obj_Switch
-ovl_Obj_Lift
-ovl_Obj_Hsblock
-ovl_En_Okarina_Tag
-ovl_En_Goroiwa
-ovl_En_Daiku
-ovl_En_Nwc
-ovl_Item_Inbox
-ovl_En_Ge1
-ovl_Obj_Blockstop
-ovl_En_Sda
-ovl_En_Clear_Tag
-ovl_En_Gm
-ovl_En_Ms
-ovl_En_Hs
-ovl_Bg_Ingate
-ovl_En_Kanban
-ovl_En_Attack_Niw
-ovl_En_Mk
-ovl_En_Owl
-ovl_En_Ishi
-ovl_Obj_Hana
-ovl_Obj_Lightswitch
-ovl_Obj_Mure2
-ovl_En_Fu
-ovl_En_Stream
-ovl_En_Mm
-ovl_En_Weather_Tag
-ovl_En_Ani
-ovl_En_Js
-ovl_En_Okarina_Effect
-ovl_En_Mag
-ovl_Elf_Msg2
-ovl_Bg_F40_Swlift
-ovl_En_Kakasi
-ovl_Obj_Makeoshihiki
-ovl_Oceff_Spot
-ovl_En_Torch
-ovl_Shot_Sun
-ovl_Obj_Roomtimer
-ovl_En_Ssh
-ovl_Oceff_Wipe
-ovl_Effect_Ss_Dust
-ovl_Effect_Ss_Kirakira
-ovl_Effect_Ss_Bomb2
-ovl_Effect_Ss_Blast
-ovl_Effect_Ss_G_Spk
-ovl_Effect_Ss_D_Fire
-ovl_Effect_Ss_Bubble
-ovl_Effect_Ss_G_Ripple
-ovl_Effect_Ss_G_Splash
-ovl_Effect_Ss_G_Fire
-ovl_Effect_Ss_Lightning
-ovl_Effect_Ss_Dt_Bubble
-ovl_Effect_Ss_Hahen
-ovl_Effect_Ss_Stick
-ovl_Effect_Ss_Sibuki
-ovl_Effect_Ss_Stone1
-ovl_Effect_Ss_Hitmark
-ovl_Effect_Ss_Fhg_Flash
-ovl_Effect_Ss_K_Fire
-ovl_Effect_Ss_Solder_Srch_Ball
-ovl_Effect_Ss_Kakera
-ovl_Effect_Ss_Ice_Piece
-ovl_Effect_Ss_En_Ice
-ovl_Effect_Ss_Fire_Tail
-ovl_Effect_Ss_En_Fire
-ovl_Effect_Ss_Extra
-ovl_Effect_Ss_Dead_Db
-ovl_Effect_Ss_Dead_Dd
-ovl_Effect_Ss_Dead_Ds
-ovl_Oceff_Storm
-ovl_Obj_Demo
-ovl_En_Minislime
-ovl_En_Nutsball
-ovl_Oceff_Wipe2
-ovl_Oceff_Wipe3
-ovl_En_Dg
-ovl_En_Si
-ovl_Obj_Comb
-ovl_Obj_Kibako2
-ovl_En_Hs2
-ovl_Obj_Mure3
-ovl_En_Tg
-ovl_En_Wf
-ovl_En_Skb
-ovl_En_Gs
-ovl_Obj_Sound
-ovl_En_Crow
-ovl_En_Cow
-ovl_Oceff_Wipe4
-ovl_En_Zo
-ovl_Effect_Ss_Ice_Smoke
-ovl_Obj_Makekinsuta
-ovl_En_Ge3
-ovl_Obj_Hamishi
-ovl_En_Zl4
-ovl_En_Mm2
-ovl_Door_Spiral
-ovl_Obj_Pzlblock
-ovl_Obj_Toge
-ovl_Obj_Armos
-ovl_Obj_Boyo
-ovl_En_Grasshopper
-ovl_Obj_Grass
-ovl_Obj_Grass_Carry
-ovl_Obj_Grass_Unit
-ovl_Bg_Fire_Wall
-ovl_En_Bu
-ovl_En_Encount3
-ovl_En_Jso
-ovl_Obj_Chikuwa
-ovl_En_Knight
-ovl_En_Warp_tag
-ovl_En_Aob_01
-ovl_En_Boj_01
-ovl_En_Boj_02
-ovl_En_Boj_03
-ovl_En_Encount4
-ovl_En_Bom_Bowl_Man
-ovl_En_Syateki_Man
-ovl_Bg_Icicle
-ovl_En_Syateki_Crow
-ovl_En_Boj_04
-ovl_En_Cne_01
-ovl_En_Bba_01
-ovl_En_Bji_01
-ovl_Bg_Spdweb
-ovl_En_Mt_tag
-ovl_Boss_01
-ovl_Boss_02
-ovl_Boss_03
-ovl_Boss_04
-ovl_Boss_05
-ovl_Boss_06
-ovl_Boss_07
-ovl_Bg_Dy_Yoseizo
-ovl_En_Boj_05
-ovl_En_Sob1
-ovl_En_Go
-ovl_En_Raf
-ovl_Obj_Funen
-ovl_Obj_Raillift
-ovl_Bg_Numa_Hana
-ovl_Obj_Flowerpot
-ovl_Obj_Spinyroll
-ovl_Dm_Hina
-ovl_En_Syateki_Wf
-ovl_Obj_Skateblock
-ovl_Effect_En_Ice_Block
-ovl_Obj_Iceblock
-ovl_En_Bigpamet
-ovl_Bg_Dblue_Movebg
-ovl_En_Syateki_Dekunuts
-ovl_Elf_Msg3
-ovl_En_Fg
-ovl_Dm_Ravine
-ovl_Dm_Sa
-ovl_En_Slime
-ovl_En_Pr
-ovl_Obj_Toudai
-ovl_Obj_Entotu
-ovl_Obj_Bell
-ovl_En_Syateki_Okuta
-ovl_Obj_Shutter
-ovl_Dm_Zl
-ovl_En_Ru
-ovl_En_Elfgrp
-ovl_Dm_Tsg
-ovl_En_Baguo
-ovl_Obj_Vspinyroll
-ovl_Obj_Smork
-ovl_En_Test2
-ovl_En_Test3
-ovl_En_Test4
-ovl_En_Bat
-ovl_En_Sekihi
-ovl_En_Wiz
-ovl_En_Wiz_Brock
-ovl_En_Wiz_Fire
-ovl_Eff_Change
-ovl_Dm_Statue
-ovl_Obj_Fireshield
-ovl_Bg_Ladder
-ovl_En_Mkk
-ovl_Demo_Getitem
-ovl_En_Dnb
-ovl_En_Dnh
-ovl_En_Dnk
-ovl_En_Dnq
-ovl_Bg_Keikoku_Saku
-ovl_Obj_Hugebombiwa
-ovl_En_Firefly2
-ovl_En_Rat
-ovl_En_Water_Effect
-ovl_En_Kusa2
-ovl_Bg_Spout_Fire
-ovl_En_Dy_Extra
-ovl_En_Bal
-ovl_En_Ginko_Man
-ovl_En_Warp_Uzu
-ovl_Obj_Driftice
-ovl_En_Look_Nuts
-ovl_En_Mushi2
-ovl_En_Fall
-ovl_En_Mm3
-ovl_Bg_Crace_Movebg
-ovl_En_Dno
-ovl_En_Pr2
-ovl_En_Prz
-ovl_En_Jso2
-ovl_Obj_Etcetera
-ovl_En_Egol
-ovl_Obj_Mine
-ovl_Obj_Purify
-ovl_En_Tru
-ovl_En_Trt
-ovl_En_Test5
-ovl_En_Test6
-ovl_En_Az
-ovl_En_Estone
-ovl_Bg_Hakugin_Post
-ovl_Dm_Opstage
-ovl_Dm_Stk
-ovl_Dm_Char00
-ovl_Dm_Char01
-ovl_Dm_Char02
-ovl_Dm_Char03
-ovl_Dm_Char04
-ovl_Dm_Char05
-ovl_Dm_Char06
-ovl_Dm_Char07
-ovl_Dm_Char08
-ovl_Dm_Char09
-ovl_Obj_Tokeidai
-ovl_En_Mnk
-ovl_En_Egblock
-ovl_En_Guard_Nuts
-ovl_Bg_Hakugin_Bombwall
-ovl_Obj_Tokei_Tobira
-ovl_Bg_Hakugin_Elvpole
-ovl_En_Ma4
-ovl_En_Twig
-ovl_En_Po_Fusen
-ovl_En_Door_Etc
-ovl_En_Bigokuta
-ovl_Bg_Icefloe
-ovl_fbdemo_triforce
-ovl_fbdemo_wipe1
-ovl_fbdemo_wipe3
-ovl_fbdemo_wipe4
-ovl_fbdemo_wipe5
-ovl_Effect_Ss_Sbn
-ovl_Obj_Ocarinalift
-ovl_En_Time_Tag
-ovl_Bg_Open_Shutter
-ovl_Bg_Open_Spot
-ovl_Bg_Fu_Kaiten
-ovl_Obj_Aqua
-ovl_En_Elforg
-ovl_En_Elfbub
-ovl_En_Fu_Mato
-ovl_En_Fu_Kago
-ovl_En_Osn
-ovl_Bg_Ctower_Gear
-ovl_En_Trt2
-ovl_Obj_Tokei_Step
-ovl_Bg_Lotus
-ovl_En_Kame
-ovl_Obj_Takaraya_Wall
-ovl_Bg_Fu_Mizu
-ovl_En_Sellnuts
-ovl_Bg_Dkjail_Ivy
-ovl_Obj_Visiblock
-ovl_En_Takaraya
-ovl_En_Tsn
-ovl_En_Ds2n
-ovl_En_Fsn
-ovl_En_Shn
-ovl_En_Stop_heishi
-ovl_Obj_Bigicicle
-ovl_En_Lift_Nuts
-ovl_En_Tk
-ovl_Bg_Market_Step
-ovl_Obj_Lupygamelift
-ovl_En_Test7
-ovl_Obj_Lightblock
-ovl_Mir_Ray2
-ovl_En_Wdhand
-ovl_En_Gamelupy
-ovl_Bg_Danpei_Movebg
-ovl_En_Snowwd
-ovl_En_Pm
-ovl_En_Gakufu
-ovl_Elf_Msg4
-ovl_Elf_Msg5
-ovl_En_Col_Man
-ovl_En_Talk_Gibud
-ovl_En_Giant
-ovl_Obj_Snowball
-ovl_Boss_Hakugin
-ovl_En_Gb2
-ovl_En_Onpuman
-ovl_Bg_Tobira01
-ovl_En_Tag_Obj
-ovl_Obj_Dhouse
-ovl_Obj_Hakaisi
-ovl_Bg_Hakugin_Switch
-ovl_En_Snowman
-ovl_TG_Sw
-ovl_En_Po_Sisters
-ovl_En_Pp
-ovl_En_Hakurock
-ovl_En_Hanabi
-ovl_Obj_Dowsing
-ovl_Obj_Wind
-ovl_En_Racedog
-ovl_En_Kendo_Js
-ovl_Bg_Botihasira
-ovl_En_Fish2
-ovl_En_Pst
-ovl_En_Poh
-ovl_Obj_Spidertent
-ovl_En_Zoraegg
-ovl_En_Kbt
-ovl_En_Gg
-ovl_En_Maruta
-ovl_Obj_Snowball2
-ovl_En_Gg2
-ovl_Obj_Ghaka
-ovl_En_Dnp
-ovl_En_Dai
-ovl_Bg_Goron_Oyu
-ovl_En_Kgy
-ovl_En_Invadepoh
-ovl_En_Gk
-ovl_En_An
-ovl_En_Bee
-ovl_En_Ot
-ovl_En_Dragon
-ovl_Obj_Dora
-ovl_En_Bigpo
-ovl_Obj_Kendo_Kanban
-ovl_Obj_Hariko
-ovl_En_Sth
-ovl_Bg_Sinkai_Kabe
-ovl_Bg_Haka_Curtain
-ovl_Bg_Kin2_Bombwall
-ovl_Bg_Kin2_Fence
-ovl_Bg_Kin2_Picture
-ovl_Bg_Kin2_Shelf
-ovl_En_Rail_Skb
-ovl_En_Jg
-ovl_En_Tru_Mt
-ovl_Obj_Um
-ovl_En_Neo_Reeba
-ovl_Bg_Mbar_Chair
-ovl_Bg_Ikana_Block
-ovl_Bg_Ikana_Mirror
-ovl_Bg_Ikana_Rotaryroom
-ovl_Bg_Dblue_Balance
-ovl_Bg_Dblue_Waterfall
-ovl_En_Kaizoku
-ovl_En_Ge2
-ovl_En_Ma_Yts
-ovl_En_Ma_Yto
-ovl_Obj_Tokei_Turret
-ovl_Bg_Dblue_Elevator
-ovl_Obj_Warpstone
-ovl_En_Zog
-ovl_Obj_Rotlift
-ovl_Obj_Jg_Gakki
-ovl_Bg_Inibs_Movebg
-ovl_En_Zot
-ovl_Obj_Tree
-ovl_Obj_Y2lift
-ovl_Obj_Y2shutter
-ovl_Obj_Boat
-ovl_Obj_Taru
-ovl_Obj_Hunsui
-ovl_En_Jc_Mato
-ovl_Mir_Ray3
-ovl_En_Zob
-ovl_Elf_Msg6
-ovl_Obj_Nozoki
-ovl_En_Toto
-ovl_En_Railgibud
-ovl_En_Baba
-ovl_En_Suttari
-ovl_En_Zod
-ovl_En_Kujiya
-ovl_En_Geg
-ovl_Obj_Kinoko
-ovl_Obj_Yasi
-ovl_En_Tanron1
-ovl_En_Tanron2
-ovl_En_Tanron3
-ovl_Obj_Chan
-ovl_En_Zos
-ovl_En_S_Goro
-ovl_En_Nb
-ovl_En_Ja
-ovl_Bg_F40_Block
-ovl_Bg_F40_Switch
-ovl_En_Po_Composer
-ovl_En_Guruguru
-ovl_Oceff_Wipe5
-ovl_En_Stone_heishi
-ovl_Oceff_Wipe6
-ovl_En_Scopenuts
-ovl_En_Scopecrow
-ovl_Oceff_Wipe7
-ovl_Eff_Kamejima_Wave
-ovl_En_Hg
-ovl_En_Hgo
-ovl_En_Zov
-ovl_En_Ah
-ovl_Obj_Hgdoor
-ovl_Bg_Ikana_Bombwall
-ovl_Bg_Ikana_Ray
-ovl_Bg_Ikana_Shutter
-ovl_Bg_Haka_Bombwall
-ovl_Bg_Haka_Tomb
-ovl_En_Sc_Ruppe
-ovl_Bg_Iknv_Doukutu
-ovl_Bg_Iknv_Obj
-ovl_En_Pamera
-ovl_Obj_HsStump
-ovl_En_Hidden_Nuts
-ovl_En_Zow
-ovl_En_Talk
-ovl_En_Al
-ovl_En_Tab
-ovl_En_Nimotsu
-ovl_En_Hit_Tag
-ovl_En_Ruppecrow
-ovl_En_Tanron4
-ovl_En_Tanron5
-ovl_En_Tanron6
-ovl_En_Daiku2
-ovl_En_Muto
-ovl_En_Baisen
-ovl_En_Heishi
-ovl_En_Demo_heishi
-ovl_En_Dt
-ovl_En_Cha
-ovl_Obj_Dinner
-ovl_Eff_Lastday
-ovl_Bg_Ikana_Dharma
-ovl_En_Akindonuts
-ovl_Eff_Stk
-ovl_En_Ig
-ovl_En_Rg
-ovl_En_Osk
-ovl_En_Sth2
-ovl_En_Yb
-ovl_En_Rz
-ovl_En_Scopecoin
-ovl_En_Bjt
-ovl_En_Bomjima
-ovl_En_Bomjimb
-ovl_En_Bombers
-ovl_En_Bombers2
-ovl_En_Bombal
-ovl_Obj_Moon_Stone
-ovl_Obj_Mu_Pict
-ovl_Bg_Ikninside
-ovl_Eff_Zoraband
-ovl_Obj_Kepn_Koya
-ovl_Obj_Usiyane
-ovl_En_Nnh
-ovl_Obj_Kzsaku
-ovl_Obj_Milk_Bin
-ovl_En_Kitan
-ovl_Bg_Astr_Bombwall
-ovl_Bg_Iknin_Susceil
-ovl_En_Bsb
-ovl_En_Recepgirl
-ovl_En_Thiefbird
-ovl_En_Jgame_Tsn
-ovl_Obj_Jgame_Light
-ovl_Obj_Yado
-ovl_Demo_Syoten
-ovl_Demo_Moonend
-ovl_Bg_Lbfshot
-ovl_Bg_Last_Bwall
-ovl_En_And
-ovl_En_Invadepoh_Demo
-ovl_Obj_Danpeilift
-ovl_En_Fall2
-ovl_Dm_Al
-ovl_Dm_An
-ovl_Dm_Ah
-ovl_Dm_Nb
-ovl_En_Drs
-ovl_En_Ending_Hero
-ovl_Dm_Bal
-ovl_En_Paper
-ovl_En_Hint_Skb
-ovl_Dm_Tag
-ovl_En_Bh
-ovl_En_Ending_Hero2
-ovl_En_Ending_Hero3
-ovl_En_Ending_Hero4
-ovl_En_Ending_Hero5
-ovl_En_Ending_Hero6
-ovl_Dm_Gm
-ovl_Obj_Swprize
-ovl_En_Invisible_Ruppe
-ovl_Obj_Ending
-ovl_En_Rsn
-gameplay_keep
-gameplay_field_keep
-gameplay_dangeon_keep
-gameplay_object_exchange_static
-object_link_boy
-object_link_child
-object_link_goron
-object_link_zora
-object_link_nuts
-object_mask_ki_tan
-object_mask_rabit
-object_mask_skj
-object_mask_truth
-object_mask_gibudo
-object_mask_json
-object_mask_kerfay
-object_mask_bigelf
-object_mask_kyojin
-object_mask_romerny
-object_mask_posthat
-object_mask_zacho
-object_mask_stone
-object_mask_bree
-object_mask_gero
-object_mask_yofukasi
-object_mask_meoto
-object_mask_dancer
-object_mask_bakuretu
-object_mask_bu_san
-object_mask_goron
-object_mask_zora
-object_mask_nuts
-object_mask_boy
-object_box
-object_okuta
-object_wallmaster
-object_dy_obj
-object_firefly
-object_dodongo
-object_niw
-object_tite
-object_ph
-object_dinofos
-object_zl1
-object_bubble
-object_test3
-object_famos
-object_st
-object_thiefbird
-object_bombf
-object_am
-object_dekubaba
-object_warp1
-object_b_heart
-object_dekunuts
-object_bb
-object_death
-object_hata
-object_wood02
-object_trap
-object_vm
-object_efc_star_field
-object_rd
-object_yukimura_obj
-object_horse_link_child
-object_syokudai
-object_efc_tw
-object_gi_key
-object_mir_ray
-object_ctower_rot
-object_bdoor
-object_sb
-object_gi_melody
-object_gi_heart
-object_gi_compass
-object_gi_bosskey
-object_gi_nuts
-object_gi_hearts
-object_gi_arrowcase
-object_gi_bombpouch
-object_in
-object_os_anime
-object_gi_bottle
-object_gi_stick
-object_gi_map
-object_oF1d_map
-object_ru2
-object_gi_magicpot
-object_gi_bomb_1
-object_ma2
-object_gi_purse
-object_rr
-object_gi_arrow
-object_gi_bomb_2
-object_gi_shield_2
-object_gi_hookshot
-object_gi_ocarina
-object_gi_milk
-object_ma1
-object_ny
-object_fr
-object_gi_bow
-object_gi_glasses
-object_gi_liquid
-object_ani
-object_gi_shield_3
-object_gi_bean
-object_gi_fish
-object_gi_longsword
-object_zo
-object_umajump
-object_mastergolon
-object_masterzoora
-object_aob
-object_ik
-object_ahg
-object_cne
-object_bji
-object_bba
-object_an1
-object_boj
-object_fz
-object_bob
-object_ge1
-object_yabusame_point
-object_d_hsblock
-object_d_lift
-object_mamenoki
-object_goroiwa
-object_toryo
-object_daiku
-object_nwc
-object_gm
-object_ms
-object_hs
-object_lightswitch
-object_kusa
-object_tsubo
-object_kanban
-object_owl
-object_mk
-object_fu
-object_gi_ki_tan_mask
-object_gi_mask18
-object_gi_rabit_mask
-object_gi_truth_mask
-object_stream
-object_mm
-object_js
-object_cs
-object_gi_soldout
-object_mag
-object_gi_golonmask
-object_gi_zoramask
-object_ka
-object_zg
-object_gi_m_arrow
-object_ds2
-object_fish
-object_gi_sutaru
-object_ssh
-object_bigslime
-object_bg
-object_bombiwa
-object_hintnuts
-object_rs
-object_gla
-object_geldb
-object_dog
-object_kibako2
-object_dns
-object_dnk
-object_gi_insect
-object_gi_ghost
-object_gi_soul
-object_f40_obj
-object_gi_rupy
-object_po_composer
-object_mu
-object_wf
-object_skb
-object_gs
-object_ps
-object_omoya_obj
-object_crow
-object_cow
-object_gi_sword_1
-object_zl4
-object_grasshopper
-object_boyo
-object_fwall
-object_jso
-object_knight
-object_icicle
-object_spdweb
-object_boss01
-object_boss02
-object_boss03
-object_boss04
-object_boss05
-object_boss07
-object_raf
-object_funen
-object_raillift
-object_numa_obj
-object_flowerpot
-object_spinyroll
-object_ice_block
-object_keikoku_demo
-object_slime
-object_pr
-object_f52_obj
-object_f53_obj
-object_kibako
-object_sek
-object_gmo
-object_bat
-object_sekihil
-object_sekihig
-object_sekihin
-object_sekihiz
-object_wiz
-object_ladder
-object_mkk
-object_keikoku_obj
-object_sichitai_obj
-object_dekucity_ana_obj
-object_rat
-object_water_effect
-object_dblue_object
-object_bal
-object_warp_uzu
-object_driftice
-object_fall
-object_hanareyama_obj
-object_crace_object
-object_dno
-object_obj_tokeidai
-object_eg
-object_tru
-object_trt
-object_hakugin_obj
-object_horse_game_check
-object_stk
-object_mnk
-object_gi_bottle_red
-object_tokei_tobira
-object_az
-object_twig
-object_dekucity_obj
-object_po_fusen
-object_racetsubo
-object_ha
-object_bigokuta
-object_open_obj
-object_fu_kaiten
-object_fu_mato
-object_mtoride
-object_osn
-object_tokei_step
-object_lotus
-object_tl
-object_dkjail_obj
-object_visiblock
-object_tsn
-object_ds2n
-object_fsn
-object_shn
-object_bigicicle
-object_gi_bottle_15
-object_tk
-object_market_obj
-object_gi_reserve00
-object_gi_reserve01
-object_lightblock
-object_takaraya_objects
-object_wdhand
-object_sdn
-object_snowwd
-object_giant
-object_comb
-object_hana
-object_boss_hakugin
-object_meganeana_obj
-object_gi_nutsmask
-object_stk2
-object_spot11_obj
-object_danpei_object
-object_dhouse
-object_hakaisi
-object_po
-object_snowman
-object_po_sisters
-object_pp
-object_goronswitch
-object_delf
-object_botihasira
-object_gi_bigbomb
-object_pst
-object_bsmask
-object_spidertent
-object_zoraegg
-object_kbt
-object_gg
-object_maruta
-object_ghaka
-object_oyu
-object_dnq
-object_dai
-object_kgy
-object_fb
-object_taisou
-object_gk
-object_haka_obj
-object_dnt
-object_yukiyama
-object_icefloe
-object_gi_gold_dust
-object_gi_bottle_16
-object_gi_bottle_22
-object_bee
-object_ot
-object_utubo
-object_dora
-object_gi_loach
-object_gi_seahorse
-object_bigpo
-object_hariko
-object_dnj
-object_sinkai_kabe
-object_kin2_obj
-object_ishi
-object_hakugin_demo
-object_jg
-object_gi_sword_2
-object_gi_sword_3
-object_gi_sword_4
-object_um
-object_rb
-object_mbar_obj
-object_ikana_obj
-object_kz
-object_tokei_turret
-object_zog
-object_rotlift
-object_posthouse_obj
-object_gi_mask09
-object_gi_mask14
-object_gi_mask15
-object_inibs_object
-object_tree
-object_kaizoku_obj
-object_gi_reserve_b_00
-object_gi_reserve_c_00
-object_zob
-object_milkbar
-object_dmask
-object_gi_reserve_c_01
-object_zod
-object_kumo30
-object_obj_yasi
-object_tanron1
-object_tanron2
-object_tanron3
-object_gi_magicmushroom
-object_obj_chan
-object_gi_mask10
-object_zos
-object_an2
-object_an3
-object_f40_switch
-object_lodmoon
-object_tro
-object_gi_mask12
-object_gi_mask23
-object_gi_bottle_21
-object_gi_camera
-object_kamejima
-object_nb
-object_harfgibud
-object_zov
-object_ah
-object_hgdoor
-object_dor01
-object_dor02
-object_dor03
-object_dor04
-object_last_obj
-object_redead_obj
-object_ikninside_obj
-object_iknv_obj
-object_pamera
-object_hsstump
-object_zm
-object_al
-object_tab
-object_secom_obj
-object_dt
-object_gi_mask03
-object_cha
-object_obj_dinner
-object_gi_reserve_b_01
-object_lastday
-object_bai
-object_ikn_demo
-object_gi_fieldmap
-object_big_fwall
-object_hunsui
-object_uch
-object_tanron4
-object_tanron5
-object_in2
-object_yb
-object_rz
-object_bjt
-object_taru
-object_moonston
-object_gi_schedule
-object_gi_stonemask
-object_zoraband
-object_kepn_koya
-object_obj_usiyane
-object_gi_mask05
-object_gi_mask11
-object_gi_mask20
-object_nnh
-object_kzsaku
-object_obj_milk_bin
-object_random_obj
-object_kujiya
-object_kitan
-object_gi_mask06
-object_gi_mask16
-object_astr_obj
-object_bsb
-object_fall2
-object_sth
-object_gi_mssa
-object_smtower
-object_gi_mask21
-object_yado_obj
-object_syoten
-object_moonend
-object_ob
-object_gi_bottle_04
-object_and
-object_obj_danpeilift
-object_drs
-object_msmo
-object_an4
-object_wdor01
-object_wdor02
-object_wdor03
-object_wdor04
-object_wdor05
-object_stk3
-object_kinsta1_obj
-object_kinsta2_obj
-object_bh
-object_gi_mask17
-object_gi_mask22
-object_lbfshot
-object_fusen
-object_ending_obj
-object_gi_mask13
-scene_texture_01
-scene_texture_02
-scene_texture_03
-scene_texture_04
-scene_texture_05
-scene_texture_06
-scene_texture_07
-scene_texture_08
-nintendo_rogo_static
-title_static
-memerrmsg
-locerrmsg
-parameter_static
-week_static
-daytelop_static
-ger_daytelop_static
-fra_daytelop_static
-esp_daytelop_static
-d2_fine_static
-d2_cloud_static
-d2_fine_pal_static
-elf_message_field
-elf_message_ydan
-Z2_20SICHITAI2
-Z2_20SICHITAI2_room_00
-Z2_20SICHITAI2_room_01
-Z2_20SICHITAI2_room_02
-Z2_WITCH_SHOP
-Z2_WITCH_SHOP_room_00
-Z2_LAST_BS
-Z2_LAST_BS_room_00
-Z2_HAKASHITA
-Z2_HAKASHITA_room_00
-Z2_HAKASHITA_room_01
-Z2_HAKASHITA_room_02
-Z2_HAKASHITA_room_03
-Z2_HAKASHITA_room_04
-Z2_AYASHIISHOP
-Z2_AYASHIISHOP_room_00
-Z2_AYASHIISHOP_room_01
-Z2_OMOYA
-Z2_OMOYA_room_00
-Z2_OMOYA_room_01
-Z2_OMOYA_room_02
-Z2_BOWLING
-Z2_BOWLING_room_00
-Z2_SONCHONOIE
-Z2_SONCHONOIE_room_00
-Z2_SONCHONOIE_room_01
-Z2_SONCHONOIE_room_02
-Z2_SONCHONOIE_room_03
-Z2_IKANA
-Z2_IKANA_room_00
-Z2_IKANA_room_01
-Z2_IKANA_room_02
-Z2_IKANA_room_03
-Z2_IKANA_room_04
-Z2_KAIZOKU
-Z2_KAIZOKU_room_00
-Z2_MILK_BAR
-Z2_MILK_BAR_room_00
-Z2_INISIE_N
-Z2_INISIE_N_room_00
-Z2_INISIE_N_room_01
-Z2_INISIE_N_room_02
-Z2_INISIE_N_room_03
-Z2_INISIE_N_room_04
-Z2_INISIE_N_room_05
-Z2_INISIE_N_room_06
-Z2_INISIE_N_room_07
-Z2_INISIE_N_room_08
-Z2_INISIE_N_room_09
-Z2_INISIE_N_room_10
-Z2_INISIE_N_room_11
-Z2_TAKARAYA
-Z2_TAKARAYA_room_00
-Z2_INISIE_R
-Z2_INISIE_R_room_00
-Z2_INISIE_R_room_01
-Z2_INISIE_R_room_02
-Z2_INISIE_R_room_03
-Z2_INISIE_R_room_04
-Z2_INISIE_R_room_05
-Z2_INISIE_R_room_06
-Z2_INISIE_R_room_07
-Z2_INISIE_R_room_08
-Z2_INISIE_R_room_09
-Z2_INISIE_R_room_10
-Z2_INISIE_R_room_11
-Z2_OKUJOU
-Z2_OKUJOU_room_00
-Z2_OPENINGDAN
-Z2_OPENINGDAN_room_00
-Z2_OPENINGDAN_room_01
-Z2_MITURIN
-Z2_MITURIN_room_00
-Z2_MITURIN_room_01
-Z2_MITURIN_room_02
-Z2_MITURIN_room_03
-Z2_MITURIN_room_04
-Z2_MITURIN_room_05
-Z2_MITURIN_room_06
-Z2_MITURIN_room_07
-Z2_MITURIN_room_08
-Z2_MITURIN_room_09
-Z2_MITURIN_room_10
-Z2_MITURIN_room_11
-Z2_MITURIN_room_12
-Z2_13HUBUKINOMITI
-Z2_13HUBUKINOMITI_room_00
-Z2_CASTLE
-Z2_CASTLE_room_00
-Z2_CASTLE_room_01
-Z2_CASTLE_room_02
-Z2_CASTLE_room_03
-Z2_CASTLE_room_04
-Z2_CASTLE_room_05
-Z2_CASTLE_room_06
-Z2_CASTLE_room_07
-Z2_CASTLE_room_08
-Z2_CASTLE_room_09
-Z2_DEKUTES
-Z2_DEKUTES_room_00
-Z2_MITURIN_BS
-Z2_MITURIN_BS_room_00
-Z2_SYATEKI_MIZU
-Z2_SYATEKI_MIZU_room_00
-Z2_HAKUGIN
-Z2_HAKUGIN_room_00
-Z2_HAKUGIN_room_01
-Z2_HAKUGIN_room_02
-Z2_HAKUGIN_room_03
-Z2_HAKUGIN_room_04
-Z2_HAKUGIN_room_05
-Z2_HAKUGIN_room_06
-Z2_HAKUGIN_room_07
-Z2_HAKUGIN_room_08
-Z2_HAKUGIN_room_09
-Z2_HAKUGIN_room_10
-Z2_HAKUGIN_room_11
-Z2_HAKUGIN_room_12
-Z2_HAKUGIN_room_13
-Z2_ROMANYMAE
-Z2_ROMANYMAE_room_00
-Z2_PIRATE
-Z2_PIRATE_room_00
-Z2_PIRATE_room_01
-Z2_PIRATE_room_02
-Z2_PIRATE_room_03
-Z2_PIRATE_room_04
-Z2_PIRATE_room_05
-Z2_PIRATE_room_06
-Z2_PIRATE_room_07
-Z2_PIRATE_room_08
-Z2_PIRATE_room_09
-Z2_PIRATE_room_10
-Z2_PIRATE_room_11
-Z2_PIRATE_room_12
-Z2_PIRATE_room_13
-Z2_PIRATE_room_14
-Z2_SYATEKI_MORI
-Z2_SYATEKI_MORI_room_00
-Z2_SINKAI
-Z2_SINKAI_room_00
-Z2_YOUSEI_IZUMI
-Z2_YOUSEI_IZUMI_room_00
-Z2_YOUSEI_IZUMI_room_01
-Z2_YOUSEI_IZUMI_room_02
-Z2_YOUSEI_IZUMI_room_03
-Z2_YOUSEI_IZUMI_room_04
-Z2_KINSTA1
-Z2_KINSTA1_room_00
-Z2_KINSTA1_room_01
-Z2_KINSTA1_room_02
-Z2_KINSTA1_room_03
-Z2_KINSTA1_room_04
-Z2_KINSTA1_room_05
-Z2_KINDAN2
-Z2_KINDAN2_room_00
-Z2_KINDAN2_room_01
-Z2_KINDAN2_room_02
-Z2_KINDAN2_room_03
-Z2_KINDAN2_room_04
-Z2_KINDAN2_room_05
-Z2_TENMON_DAI
-Z2_TENMON_DAI_room_00
-Z2_TENMON_DAI_room_01
-Z2_LAST_DEKU
-Z2_LAST_DEKU_room_00
-Z2_LAST_DEKU_room_01
-Z2_22DEKUCITY
-Z2_22DEKUCITY_room_00
-Z2_22DEKUCITY_room_01
-Z2_22DEKUCITY_room_02
-Z2_KAJIYA
-Z2_KAJIYA_room_00
-Z2_00KEIKOKU
-Z2_00KEIKOKU_room_00
-Z2_POSTHOUSE
-Z2_POSTHOUSE_room_00
-Z2_LABO
-Z2_LABO_room_00
-Z2_DANPEI2TEST
-Z2_DANPEI2TEST_room_00
-Z2_DANPEI2TEST_room_01
-Z2_16GORON_HOUSE
-Z2_16GORON_HOUSE_room_00
-Z2_16GORON_HOUSE_room_01
-Z2_33ZORACITY
-Z2_33ZORACITY_room_00
-Z2_8ITEMSHOP
-Z2_8ITEMSHOP_room_00
-Z2_F01
-Z2_F01_room_00
-Z2_INISIE_BS
-Z2_INISIE_BS_room_00
-Z2_30GYOSON
-Z2_30GYOSON_room_00
-Z2_31MISAKI
-Z2_31MISAKI_room_00
-Z2_TAKARAKUJI
-Z2_TAKARAKUJI_room_00
-Z2_TORIDE
-Z2_TORIDE_room_00
-Z2_FISHERMAN
-Z2_FISHERMAN_room_00
-Z2_GORONSHOP
-Z2_GORONSHOP_room_00
-Z2_DEKU_KING
-Z2_DEKU_KING_room_00
-Z2_LAST_GORON
-Z2_LAST_GORON_room_00
-Z2_LAST_GORON_room_01
-Z2_24KEMONOMITI
-Z2_24KEMONOMITI_room_00
-Z2_F01_B
-Z2_F01_B_room_00
-Z2_F01C
-Z2_F01C_room_00
-Z2_BOTI
-Z2_BOTI_room_00
-Z2_BOTI_room_01
-Z2_HAKUGIN_BS
-Z2_HAKUGIN_BS_room_00
-Z2_20SICHITAI
-Z2_20SICHITAI_room_00
-Z2_20SICHITAI_room_01
-Z2_20SICHITAI_room_02
-Z2_21MITURINMAE
-Z2_21MITURINMAE_room_00
-Z2_LAST_ZORA
-Z2_LAST_ZORA_room_00
-Z2_11GORONNOSATO2
-Z2_11GORONNOSATO2_room_00
-Z2_11GORONNOSATO2_room_01
-Z2_SEA
-Z2_SEA_room_00
-Z2_SEA_room_01
-Z2_SEA_room_02
-Z2_SEA_room_03
-Z2_SEA_room_04
-Z2_SEA_room_05
-Z2_SEA_room_06
-Z2_SEA_room_07
-Z2_SEA_room_08
-Z2_SEA_room_09
-Z2_SEA_room_10
-Z2_SEA_room_11
-Z2_SEA_room_12
-Z2_SEA_room_13
-Z2_SEA_room_14
-Z2_SEA_room_15
-Z2_35TAKI
-Z2_35TAKI_room_00
-Z2_REDEAD
-Z2_REDEAD_room_00
-Z2_REDEAD_room_01
-Z2_REDEAD_room_02
-Z2_REDEAD_room_03
-Z2_REDEAD_room_04
-Z2_REDEAD_room_05
-Z2_REDEAD_room_06
-Z2_REDEAD_room_07
-Z2_REDEAD_room_08
-Z2_REDEAD_room_09
-Z2_REDEAD_room_10
-Z2_REDEAD_room_11
-Z2_REDEAD_room_12
-Z2_REDEAD_room_13
-Z2_BANDROOM
-Z2_BANDROOM_room_00
-Z2_BANDROOM_room_01
-Z2_BANDROOM_room_02
-Z2_BANDROOM_room_03
-Z2_BANDROOM_room_04
-Z2_11GORONNOSATO
-Z2_11GORONNOSATO_room_00
-Z2_11GORONNOSATO_room_01
-Z2_GORON_HAKA
-Z2_GORON_HAKA_room_00
-Z2_SECOM
-Z2_SECOM_room_00
-Z2_SECOM_room_01
-Z2_10YUKIYAMANOMURA
-Z2_10YUKIYAMANOMURA_room_00
-Z2_TOUGITES
-Z2_TOUGITES_room_00
-Z2_DANPEI
-Z2_DANPEI_room_00
-Z2_DANPEI_room_01
-Z2_DANPEI_room_02
-Z2_DANPEI_room_03
-Z2_DANPEI_room_04
-Z2_DANPEI_room_05
-Z2_DANPEI_room_06
-Z2_DANPEI_room_07
-Z2_DANPEI_room_08
-Z2_IKANAMAE
-Z2_IKANAMAE_room_00
-Z2_DOUJOU
-Z2_DOUJOU_room_00
-Z2_MUSICHOUSE
-Z2_MUSICHOUSE_room_00
-Z2_IKNINSIDE
-Z2_IKNINSIDE_room_00
-Z2_IKNINSIDE_room_01
-Z2_MAP_SHOP
-Z2_MAP_SHOP_room_00
-Z2_F40
-Z2_F40_room_00
-Z2_F41
-Z2_F41_room_00
-Z2_10YUKIYAMANOMURA2
-Z2_10YUKIYAMANOMURA2_room_00
-Z2_10YUKIYAMANOMURA2_room_01
-Z2_14YUKIDAMANOMITI
-Z2_14YUKIDAMANOMITI_room_00
-Z2_12HAKUGINMAE
-Z2_12HAKUGINMAE_room_00
-Z2_17SETUGEN
-Z2_17SETUGEN_room_00
-Z2_17SETUGEN2
-Z2_17SETUGEN2_room_00
-Z2_SEA_BS
-Z2_SEA_BS_room_00
-Z2_RANDOM
-Z2_RANDOM_room_00
-Z2_RANDOM_room_01
-Z2_RANDOM_room_02
-Z2_RANDOM_room_03
-Z2_RANDOM_room_04
-Z2_RANDOM_room_05
-Z2_YADOYA
-Z2_YADOYA_room_00
-Z2_YADOYA_room_01
-Z2_YADOYA_room_02
-Z2_YADOYA_room_03
-Z2_YADOYA_room_04
-Z2_KONPEKI_ENT
-Z2_KONPEKI_ENT_room_00
-Z2_INSIDETOWER
-Z2_INSIDETOWER_room_00
-Z2_INSIDETOWER_room_01
-Z2_26SARUNOMORI
-Z2_26SARUNOMORI_room_00
-Z2_26SARUNOMORI_room_01
-Z2_26SARUNOMORI_room_02
-Z2_26SARUNOMORI_room_03
-Z2_26SARUNOMORI_room_04
-Z2_26SARUNOMORI_room_05
-Z2_26SARUNOMORI_room_06
-Z2_26SARUNOMORI_room_07
-Z2_26SARUNOMORI_room_08
-Z2_LOST_WOODS
-Z2_LOST_WOODS_room_00
-Z2_LOST_WOODS_room_01
-Z2_LOST_WOODS_room_02
-Z2_LAST_LINK
-Z2_LAST_LINK_room_00
-Z2_LAST_LINK_room_01
-Z2_LAST_LINK_room_02
-Z2_LAST_LINK_room_03
-Z2_LAST_LINK_room_04
-Z2_LAST_LINK_room_05
-Z2_LAST_LINK_room_06
-Z2_LAST_LINK_room_07
-Z2_SOUGEN
-Z2_SOUGEN_room_00
-Z2_BOMYA
-Z2_BOMYA_room_00
-Z2_KYOJINNOMA
-Z2_KYOJINNOMA_room_00
-Z2_KOEPONARACE
-Z2_KOEPONARACE_room_00
-Z2_GORONRACE
-Z2_GORONRACE_room_00
-Z2_TOWN
-Z2_TOWN_room_00
-Z2_ICHIBA
-Z2_ICHIBA_room_00
-Z2_BACKTOWN
-Z2_BACKTOWN_room_00
-Z2_CLOCKTOWER
-Z2_CLOCKTOWER_room_00
-Z2_ALLEY
-Z2_ALLEY_room_00
-SPOT00
-SPOT00_room_00
-KAKUSIANA
-KAKUSIANA_room_00
-KAKUSIANA_room_01
-KAKUSIANA_room_02
-KAKUSIANA_room_03
-KAKUSIANA_room_04
-KAKUSIANA_room_05
-KAKUSIANA_room_06
-KAKUSIANA_room_07
-KAKUSIANA_room_08
-KAKUSIANA_room_09
-KAKUSIANA_room_10
-KAKUSIANA_room_11
-KAKUSIANA_room_12
-KAKUSIANA_room_13
-KAKUSIANA_room_14
-bump_texture_static
-anime_model_1_static
-anime_model_2_static
-anime_model_3_static
-anime_model_4_static
-anime_model_5_static
-anime_model_6_static
-anime_texture_1_static
-anime_texture_2_static
-anime_texture_3_static
-anime_texture_4_static
-anime_texture_5_static
-anime_texture_6_static
-softsprite_matrix_static
diff --git a/Android/app/src/main/assets/assets/extractor/filelists/mm_gc.txt b/Android/app/src/main/assets/assets/extractor/filelists/mm_gc.txt
deleted file mode 100644
index 45ca5e49f..000000000
--- a/Android/app/src/main/assets/assets/extractor/filelists/mm_gc.txt
+++ /dev/null
@@ -1,1549 +0,0 @@
-makerom
-boot
-dmadata
-Audiobank
-Audioseq
-Audiotable
-kanji
-link_animetion
-icon_item_static_syms
-icon_item_24_static_syms
-icon_item_field_static
-icon_item_dungeon_static
-icon_item_gameover_static
-icon_item_jpn_static
-icon_item_vtx_static
-map_i_static
-map_grand_static
-item_name_static
-map_name_static
-icon_item_static_yar
-icon_item_24_static_yar
-schedule_dma_static_syms
-schedule_dma_static_yar
-schedule_static
-story_static
-do_action_static
-message_static
-message_texture_static
-nes_font_static
-message_data_static
-staff_message_data_static
-code
-ovl_title
-ovl_select
-ovl_opening
-ovl_file_choose
-ovl_daytelop
-ovl_kaleido_scope
-ovl_player_actor
-ovl_En_Test
-ovl_En_GirlA
-ovl_En_Part
-ovl_En_Light
-ovl_En_Door
-ovl_En_Box
-ovl_En_Pametfrog
-ovl_En_Okuta
-ovl_En_Bom
-ovl_En_Wallmas
-ovl_En_Dodongo
-ovl_En_Firefly
-ovl_En_Horse
-ovl_En_Arrow
-ovl_En_Elf
-ovl_En_Niw
-ovl_En_Tite
-ovl_En_Peehat
-ovl_En_Holl
-ovl_En_Dinofos
-ovl_En_Hata
-ovl_En_Zl1
-ovl_En_Viewer
-ovl_En_Bubble
-ovl_Door_Shutter
-ovl_En_Boom
-ovl_En_Torch2
-ovl_En_Minifrog
-ovl_En_St
-ovl_Obj_Wturn
-ovl_En_River_Sound
-ovl_En_Ossan
-ovl_En_Famos
-ovl_En_Bombf
-ovl_En_Am
-ovl_En_Dekubaba
-ovl_En_M_Fire1
-ovl_En_M_Thunder
-ovl_Bg_Breakwall
-ovl_Door_Warp1
-ovl_Obj_Syokudai
-ovl_Item_B_Heart
-ovl_En_Dekunuts
-ovl_En_Bbfall
-ovl_Arms_Hook
-ovl_En_Bb
-ovl_Bg_Keikoku_Spr
-ovl_En_Wood02
-ovl_En_Death
-ovl_En_Minideath
-ovl_En_Vm
-ovl_Demo_Effect
-ovl_Demo_Kankyo
-ovl_En_Floormas
-ovl_En_Rd
-ovl_Bg_F40_Flift
-ovl_Obj_Mure
-ovl_En_Sw
-ovl_Object_Kankyo
-ovl_En_Horse_Link_Child
-ovl_Door_Ana
-ovl_En_Encount1
-ovl_Demo_Tre_Lgt
-ovl_En_Encount2
-ovl_En_Fire_Rock
-ovl_Bg_Ctower_Rot
-ovl_Mir_Ray
-ovl_En_Sb
-ovl_En_Bigslime
-ovl_En_Karebaba
-ovl_En_In
-ovl_En_Bom_Chu
-ovl_En_Horse_Game_Check
-ovl_En_Rr
-ovl_En_Fr
-ovl_Obj_Oshihiki
-ovl_Eff_Dust
-ovl_Bg_Umajump
-ovl_En_Insect
-ovl_En_Butte
-ovl_En_Fish
-ovl_Item_Etcetera
-ovl_Arrow_Fire
-ovl_Arrow_Ice
-ovl_Arrow_Light
-ovl_Obj_Kibako
-ovl_Obj_Tsubo
-ovl_En_Ik
-ovl_Demo_Shd
-ovl_En_Dns
-ovl_Elf_Msg
-ovl_En_Honotrap
-ovl_En_Tubo_Trap
-ovl_Obj_Ice_Poly
-ovl_En_Fz
-ovl_En_Kusa
-ovl_Obj_Bean
-ovl_Obj_Bombiwa
-ovl_Obj_Switch
-ovl_Obj_Lift
-ovl_Obj_Hsblock
-ovl_En_Okarina_Tag
-ovl_En_Goroiwa
-ovl_En_Daiku
-ovl_En_Nwc
-ovl_Item_Inbox
-ovl_En_Ge1
-ovl_Obj_Blockstop
-ovl_En_Sda
-ovl_En_Clear_Tag
-ovl_En_Gm
-ovl_En_Ms
-ovl_En_Hs
-ovl_Bg_Ingate
-ovl_En_Kanban
-ovl_En_Attack_Niw
-ovl_En_Mk
-ovl_En_Owl
-ovl_En_Ishi
-ovl_Obj_Hana
-ovl_Obj_Lightswitch
-ovl_Obj_Mure2
-ovl_En_Fu
-ovl_En_Stream
-ovl_En_Mm
-ovl_En_Weather_Tag
-ovl_En_Ani
-ovl_En_Js
-ovl_En_Okarina_Effect
-ovl_En_Mag
-ovl_Elf_Msg2
-ovl_Bg_F40_Swlift
-ovl_En_Kakasi
-ovl_Obj_Makeoshihiki
-ovl_Oceff_Spot
-ovl_En_Torch
-ovl_Shot_Sun
-ovl_Obj_Roomtimer
-ovl_En_Ssh
-ovl_Oceff_Wipe
-ovl_Effect_Ss_Dust
-ovl_Effect_Ss_Kirakira
-ovl_Effect_Ss_Bomb2
-ovl_Effect_Ss_Blast
-ovl_Effect_Ss_G_Spk
-ovl_Effect_Ss_D_Fire
-ovl_Effect_Ss_Bubble
-ovl_Effect_Ss_G_Ripple
-ovl_Effect_Ss_G_Splash
-ovl_Effect_Ss_G_Fire
-ovl_Effect_Ss_Lightning
-ovl_Effect_Ss_Dt_Bubble
-ovl_Effect_Ss_Hahen
-ovl_Effect_Ss_Stick
-ovl_Effect_Ss_Sibuki
-ovl_Effect_Ss_Stone1
-ovl_Effect_Ss_Hitmark
-ovl_Effect_Ss_Fhg_Flash
-ovl_Effect_Ss_K_Fire
-ovl_Effect_Ss_Solder_Srch_Ball
-ovl_Effect_Ss_Kakera
-ovl_Effect_Ss_Ice_Piece
-ovl_Effect_Ss_En_Ice
-ovl_Effect_Ss_Fire_Tail
-ovl_Effect_Ss_En_Fire
-ovl_Effect_Ss_Extra
-ovl_Effect_Ss_Dead_Db
-ovl_Effect_Ss_Dead_Dd
-ovl_Effect_Ss_Dead_Ds
-ovl_Oceff_Storm
-ovl_Obj_Demo
-ovl_En_Minislime
-ovl_En_Nutsball
-ovl_Oceff_Wipe2
-ovl_Oceff_Wipe3
-ovl_En_Dg
-ovl_En_Si
-ovl_Obj_Comb
-ovl_Obj_Kibako2
-ovl_En_Hs2
-ovl_Obj_Mure3
-ovl_En_Tg
-ovl_En_Wf
-ovl_En_Skb
-ovl_En_Gs
-ovl_Obj_Sound
-ovl_En_Crow
-ovl_En_Cow
-ovl_Oceff_Wipe4
-ovl_En_Zo
-ovl_Effect_Ss_Ice_Smoke
-ovl_Obj_Makekinsuta
-ovl_En_Ge3
-ovl_Obj_Hamishi
-ovl_En_Zl4
-ovl_En_Mm2
-ovl_Door_Spiral
-ovl_Obj_Pzlblock
-ovl_Obj_Toge
-ovl_Obj_Armos
-ovl_Obj_Boyo
-ovl_En_Grasshopper
-ovl_Obj_Grass
-ovl_Obj_Grass_Carry
-ovl_Obj_Grass_Unit
-ovl_Bg_Fire_Wall
-ovl_En_Bu
-ovl_En_Encount3
-ovl_En_Jso
-ovl_Obj_Chikuwa
-ovl_En_Knight
-ovl_En_Warp_tag
-ovl_En_Aob_01
-ovl_En_Boj_01
-ovl_En_Boj_02
-ovl_En_Boj_03
-ovl_En_Encount4
-ovl_En_Bom_Bowl_Man
-ovl_En_Syateki_Man
-ovl_Bg_Icicle
-ovl_En_Syateki_Crow
-ovl_En_Boj_04
-ovl_En_Cne_01
-ovl_En_Bba_01
-ovl_En_Bji_01
-ovl_Bg_Spdweb
-ovl_En_Mt_tag
-ovl_Boss_01
-ovl_Boss_02
-ovl_Boss_03
-ovl_Boss_04
-ovl_Boss_05
-ovl_Boss_06
-ovl_Boss_07
-ovl_Bg_Dy_Yoseizo
-ovl_En_Boj_05
-ovl_En_Sob1
-ovl_En_Go
-ovl_En_Raf
-ovl_Obj_Funen
-ovl_Obj_Raillift
-ovl_Bg_Numa_Hana
-ovl_Obj_Flowerpot
-ovl_Obj_Spinyroll
-ovl_Dm_Hina
-ovl_En_Syateki_Wf
-ovl_Obj_Skateblock
-ovl_Effect_En_Ice_Block
-ovl_Obj_Iceblock
-ovl_En_Bigpamet
-ovl_Bg_Dblue_Movebg
-ovl_En_Syateki_Dekunuts
-ovl_Elf_Msg3
-ovl_En_Fg
-ovl_Dm_Ravine
-ovl_Dm_Sa
-ovl_En_Slime
-ovl_En_Pr
-ovl_Obj_Toudai
-ovl_Obj_Entotu
-ovl_Obj_Bell
-ovl_En_Syateki_Okuta
-ovl_Obj_Shutter
-ovl_Dm_Zl
-ovl_En_Ru
-ovl_En_Elfgrp
-ovl_Dm_Tsg
-ovl_En_Baguo
-ovl_Obj_Vspinyroll
-ovl_Obj_Smork
-ovl_En_Test2
-ovl_En_Test3
-ovl_En_Test4
-ovl_En_Bat
-ovl_En_Sekihi
-ovl_En_Wiz
-ovl_En_Wiz_Brock
-ovl_En_Wiz_Fire
-ovl_Eff_Change
-ovl_Dm_Statue
-ovl_Obj_Fireshield
-ovl_Bg_Ladder
-ovl_En_Mkk
-ovl_Demo_Getitem
-ovl_En_Dnb
-ovl_En_Dnh
-ovl_En_Dnk
-ovl_En_Dnq
-ovl_Bg_Keikoku_Saku
-ovl_Obj_Hugebombiwa
-ovl_En_Firefly2
-ovl_En_Rat
-ovl_En_Water_Effect
-ovl_En_Kusa2
-ovl_Bg_Spout_Fire
-ovl_En_Dy_Extra
-ovl_En_Bal
-ovl_En_Ginko_Man
-ovl_En_Warp_Uzu
-ovl_Obj_Driftice
-ovl_En_Look_Nuts
-ovl_En_Mushi2
-ovl_En_Fall
-ovl_En_Mm3
-ovl_Bg_Crace_Movebg
-ovl_En_Dno
-ovl_En_Pr2
-ovl_En_Prz
-ovl_En_Jso2
-ovl_Obj_Etcetera
-ovl_En_Egol
-ovl_Obj_Mine
-ovl_Obj_Purify
-ovl_En_Tru
-ovl_En_Trt
-ovl_En_Test5
-ovl_En_Test6
-ovl_En_Az
-ovl_En_Estone
-ovl_Bg_Hakugin_Post
-ovl_Dm_Opstage
-ovl_Dm_Stk
-ovl_Dm_Char00
-ovl_Dm_Char01
-ovl_Dm_Char02
-ovl_Dm_Char03
-ovl_Dm_Char04
-ovl_Dm_Char05
-ovl_Dm_Char06
-ovl_Dm_Char07
-ovl_Dm_Char08
-ovl_Dm_Char09
-ovl_Obj_Tokeidai
-ovl_En_Mnk
-ovl_En_Egblock
-ovl_En_Guard_Nuts
-ovl_Bg_Hakugin_Bombwall
-ovl_Obj_Tokei_Tobira
-ovl_Bg_Hakugin_Elvpole
-ovl_En_Ma4
-ovl_En_Twig
-ovl_En_Po_Fusen
-ovl_En_Door_Etc
-ovl_En_Bigokuta
-ovl_Bg_Icefloe
-ovl_fbdemo_triforce
-ovl_fbdemo_wipe1
-ovl_fbdemo_wipe3
-ovl_fbdemo_wipe4
-ovl_fbdemo_wipe5
-ovl_Effect_Ss_Sbn
-ovl_Obj_Ocarinalift
-ovl_En_Time_Tag
-ovl_Bg_Open_Shutter
-ovl_Bg_Open_Spot
-ovl_Bg_Fu_Kaiten
-ovl_Obj_Aqua
-ovl_En_Elforg
-ovl_En_Elfbub
-ovl_En_Fu_Mato
-ovl_En_Fu_Kago
-ovl_En_Osn
-ovl_Bg_Ctower_Gear
-ovl_En_Trt2
-ovl_Obj_Tokei_Step
-ovl_Bg_Lotus
-ovl_En_Kame
-ovl_Obj_Takaraya_Wall
-ovl_Bg_Fu_Mizu
-ovl_En_Sellnuts
-ovl_Bg_Dkjail_Ivy
-ovl_Obj_Visiblock
-ovl_En_Takaraya
-ovl_En_Tsn
-ovl_En_Ds2n
-ovl_En_Fsn
-ovl_En_Shn
-ovl_En_Stop_heishi
-ovl_Obj_Bigicicle
-ovl_En_Lift_Nuts
-ovl_En_Tk
-ovl_Bg_Market_Step
-ovl_Obj_Lupygamelift
-ovl_En_Test7
-ovl_Obj_Lightblock
-ovl_Mir_Ray2
-ovl_En_Wdhand
-ovl_En_Gamelupy
-ovl_Bg_Danpei_Movebg
-ovl_En_Snowwd
-ovl_En_Pm
-ovl_En_Gakufu
-ovl_Elf_Msg4
-ovl_Elf_Msg5
-ovl_En_Col_Man
-ovl_En_Talk_Gibud
-ovl_En_Giant
-ovl_Obj_Snowball
-ovl_Boss_Hakugin
-ovl_En_Gb2
-ovl_En_Onpuman
-ovl_Bg_Tobira01
-ovl_En_Tag_Obj
-ovl_Obj_Dhouse
-ovl_Obj_Hakaisi
-ovl_Bg_Hakugin_Switch
-ovl_En_Snowman
-ovl_TG_Sw
-ovl_En_Po_Sisters
-ovl_En_Pp
-ovl_En_Hakurock
-ovl_En_Hanabi
-ovl_Obj_Dowsing
-ovl_Obj_Wind
-ovl_En_Racedog
-ovl_En_Kendo_Js
-ovl_Bg_Botihasira
-ovl_En_Fish2
-ovl_En_Pst
-ovl_En_Poh
-ovl_Obj_Spidertent
-ovl_En_Zoraegg
-ovl_En_Kbt
-ovl_En_Gg
-ovl_En_Maruta
-ovl_Obj_Snowball2
-ovl_En_Gg2
-ovl_Obj_Ghaka
-ovl_En_Dnp
-ovl_En_Dai
-ovl_Bg_Goron_Oyu
-ovl_En_Kgy
-ovl_En_Invadepoh
-ovl_En_Gk
-ovl_En_An
-ovl_En_Bee
-ovl_En_Ot
-ovl_En_Dragon
-ovl_Obj_Dora
-ovl_En_Bigpo
-ovl_Obj_Kendo_Kanban
-ovl_Obj_Hariko
-ovl_En_Sth
-ovl_Bg_Sinkai_Kabe
-ovl_Bg_Haka_Curtain
-ovl_Bg_Kin2_Bombwall
-ovl_Bg_Kin2_Fence
-ovl_Bg_Kin2_Picture
-ovl_Bg_Kin2_Shelf
-ovl_En_Rail_Skb
-ovl_En_Jg
-ovl_En_Tru_Mt
-ovl_Obj_Um
-ovl_En_Neo_Reeba
-ovl_Bg_Mbar_Chair
-ovl_Bg_Ikana_Block
-ovl_Bg_Ikana_Mirror
-ovl_Bg_Ikana_Rotaryroom
-ovl_Bg_Dblue_Balance
-ovl_Bg_Dblue_Waterfall
-ovl_En_Kaizoku
-ovl_En_Ge2
-ovl_En_Ma_Yts
-ovl_En_Ma_Yto
-ovl_Obj_Tokei_Turret
-ovl_Bg_Dblue_Elevator
-ovl_Obj_Warpstone
-ovl_En_Zog
-ovl_Obj_Rotlift
-ovl_Obj_Jg_Gakki
-ovl_Bg_Inibs_Movebg
-ovl_En_Zot
-ovl_Obj_Tree
-ovl_Obj_Y2lift
-ovl_Obj_Y2shutter
-ovl_Obj_Boat
-ovl_Obj_Taru
-ovl_Obj_Hunsui
-ovl_En_Jc_Mato
-ovl_Mir_Ray3
-ovl_En_Zob
-ovl_Elf_Msg6
-ovl_Obj_Nozoki
-ovl_En_Toto
-ovl_En_Railgibud
-ovl_En_Baba
-ovl_En_Suttari
-ovl_En_Zod
-ovl_En_Kujiya
-ovl_En_Geg
-ovl_Obj_Kinoko
-ovl_Obj_Yasi
-ovl_En_Tanron1
-ovl_En_Tanron2
-ovl_En_Tanron3
-ovl_Obj_Chan
-ovl_En_Zos
-ovl_En_S_Goro
-ovl_En_Nb
-ovl_En_Ja
-ovl_Bg_F40_Block
-ovl_Bg_F40_Switch
-ovl_En_Po_Composer
-ovl_En_Guruguru
-ovl_Oceff_Wipe5
-ovl_En_Stone_heishi
-ovl_Oceff_Wipe6
-ovl_En_Scopenuts
-ovl_En_Scopecrow
-ovl_Oceff_Wipe7
-ovl_Eff_Kamejima_Wave
-ovl_En_Hg
-ovl_En_Hgo
-ovl_En_Zov
-ovl_En_Ah
-ovl_Obj_Hgdoor
-ovl_Bg_Ikana_Bombwall
-ovl_Bg_Ikana_Ray
-ovl_Bg_Ikana_Shutter
-ovl_Bg_Haka_Bombwall
-ovl_Bg_Haka_Tomb
-ovl_En_Sc_Ruppe
-ovl_Bg_Iknv_Doukutu
-ovl_Bg_Iknv_Obj
-ovl_En_Pamera
-ovl_Obj_HsStump
-ovl_En_Hidden_Nuts
-ovl_En_Zow
-ovl_En_Talk
-ovl_En_Al
-ovl_En_Tab
-ovl_En_Nimotsu
-ovl_En_Hit_Tag
-ovl_En_Ruppecrow
-ovl_En_Tanron4
-ovl_En_Tanron5
-ovl_En_Tanron6
-ovl_En_Daiku2
-ovl_En_Muto
-ovl_En_Baisen
-ovl_En_Heishi
-ovl_En_Demo_heishi
-ovl_En_Dt
-ovl_En_Cha
-ovl_Obj_Dinner
-ovl_Eff_Lastday
-ovl_Bg_Ikana_Dharma
-ovl_En_Akindonuts
-ovl_Eff_Stk
-ovl_En_Ig
-ovl_En_Rg
-ovl_En_Osk
-ovl_En_Sth2
-ovl_En_Yb
-ovl_En_Rz
-ovl_En_Scopecoin
-ovl_En_Bjt
-ovl_En_Bomjima
-ovl_En_Bomjimb
-ovl_En_Bombers
-ovl_En_Bombers2
-ovl_En_Bombal
-ovl_Obj_Moon_Stone
-ovl_Obj_Mu_Pict
-ovl_Bg_Ikninside
-ovl_Eff_Zoraband
-ovl_Obj_Kepn_Koya
-ovl_Obj_Usiyane
-ovl_En_Nnh
-ovl_Obj_Kzsaku
-ovl_Obj_Milk_Bin
-ovl_En_Kitan
-ovl_Bg_Astr_Bombwall
-ovl_Bg_Iknin_Susceil
-ovl_En_Bsb
-ovl_En_Recepgirl
-ovl_En_Thiefbird
-ovl_En_Jgame_Tsn
-ovl_Obj_Jgame_Light
-ovl_Obj_Yado
-ovl_Demo_Syoten
-ovl_Demo_Moonend
-ovl_Bg_Lbfshot
-ovl_Bg_Last_Bwall
-ovl_En_And
-ovl_En_Invadepoh_Demo
-ovl_Obj_Danpeilift
-ovl_En_Fall2
-ovl_Dm_Al
-ovl_Dm_An
-ovl_Dm_Ah
-ovl_Dm_Nb
-ovl_En_Drs
-ovl_En_Ending_Hero
-ovl_Dm_Bal
-ovl_En_Paper
-ovl_En_Hint_Skb
-ovl_Dm_Tag
-ovl_En_Bh
-ovl_En_Ending_Hero2
-ovl_En_Ending_Hero3
-ovl_En_Ending_Hero4
-ovl_En_Ending_Hero5
-ovl_En_Ending_Hero6
-ovl_Dm_Gm
-ovl_Obj_Swprize
-ovl_En_Invisible_Ruppe
-ovl_Obj_Ending
-ovl_En_Rsn
-gameplay_keep
-gameplay_field_keep
-gameplay_dangeon_keep
-gameplay_object_exchange_static
-object_link_boy
-object_link_child
-object_link_goron
-object_link_zora
-object_link_nuts
-object_mask_ki_tan
-object_mask_rabit
-object_mask_skj
-object_mask_truth
-object_mask_gibudo
-object_mask_json
-object_mask_kerfay
-object_mask_bigelf
-object_mask_kyojin
-object_mask_romerny
-object_mask_posthat
-object_mask_zacho
-object_mask_stone
-object_mask_bree
-object_mask_gero
-object_mask_yofukasi
-object_mask_meoto
-object_mask_dancer
-object_mask_bakuretu
-object_mask_bu_san
-object_mask_goron
-object_mask_zora
-object_mask_nuts
-object_mask_boy
-object_box
-object_okuta
-object_wallmaster
-object_dy_obj
-object_firefly
-object_dodongo
-object_niw
-object_tite
-object_ph
-object_dinofos
-object_zl1
-object_bubble
-object_test3
-object_famos
-object_st
-object_thiefbird
-object_bombf
-object_am
-object_dekubaba
-object_warp1
-object_b_heart
-object_dekunuts
-object_bb
-object_death
-object_hata
-object_wood02
-object_trap
-object_vm
-object_efc_star_field
-object_rd
-object_yukimura_obj
-object_horse_link_child
-object_syokudai
-object_efc_tw
-object_gi_key
-object_mir_ray
-object_ctower_rot
-object_bdoor
-object_sb
-object_gi_melody
-object_gi_heart
-object_gi_compass
-object_gi_bosskey
-object_gi_nuts
-object_gi_hearts
-object_gi_arrowcase
-object_gi_bombpouch
-object_in
-object_os_anime
-object_gi_bottle
-object_gi_stick
-object_gi_map
-object_oF1d_map
-object_ru2
-object_gi_magicpot
-object_gi_bomb_1
-object_ma2
-object_gi_purse
-object_rr
-object_gi_arrow
-object_gi_bomb_2
-object_gi_shield_2
-object_gi_hookshot
-object_gi_ocarina
-object_gi_milk
-object_ma1
-object_ny
-object_fr
-object_gi_bow
-object_gi_glasses
-object_gi_liquid
-object_ani
-object_gi_shield_3
-object_gi_bean
-object_gi_fish
-object_gi_longsword
-object_zo
-object_umajump
-object_mastergolon
-object_masterzoora
-object_aob
-object_ik
-object_ahg
-object_cne
-object_bji
-object_bba
-object_an1
-object_boj
-object_fz
-object_bob
-object_ge1
-object_yabusame_point
-object_d_hsblock
-object_d_lift
-object_mamenoki
-object_goroiwa
-object_toryo
-object_daiku
-object_nwc
-object_gm
-object_ms
-object_hs
-object_lightswitch
-object_kusa
-object_tsubo
-object_kanban
-object_owl
-object_mk
-object_fu
-object_gi_ki_tan_mask
-object_gi_mask18
-object_gi_rabit_mask
-object_gi_truth_mask
-object_stream
-object_mm
-object_js
-object_cs
-object_gi_soldout
-object_mag
-object_gi_golonmask
-object_gi_zoramask
-object_ka
-object_zg
-object_gi_m_arrow
-object_ds2
-object_fish
-object_gi_sutaru
-object_ssh
-object_bigslime
-object_bg
-object_bombiwa
-object_hintnuts
-object_rs
-object_gla
-object_geldb
-object_dog
-object_kibako2
-object_dns
-object_dnk
-object_gi_insect
-object_gi_ghost
-object_gi_soul
-object_f40_obj
-object_gi_rupy
-object_po_composer
-object_mu
-object_wf
-object_skb
-object_gs
-object_ps
-object_omoya_obj
-object_crow
-object_cow
-object_gi_sword_1
-object_zl4
-object_grasshopper
-object_boyo
-object_fwall
-object_jso
-object_knight
-object_icicle
-object_spdweb
-object_boss01
-object_boss02
-object_boss03
-object_boss04
-object_boss05
-object_boss07
-object_raf
-object_funen
-object_raillift
-object_numa_obj
-object_flowerpot
-object_spinyroll
-object_ice_block
-object_keikoku_demo
-object_slime
-object_pr
-object_f52_obj
-object_f53_obj
-object_kibako
-object_sek
-object_gmo
-object_bat
-object_sekihil
-object_sekihig
-object_sekihin
-object_sekihiz
-object_wiz
-object_ladder
-object_mkk
-object_keikoku_obj
-object_sichitai_obj
-object_dekucity_ana_obj
-object_rat
-object_water_effect
-object_dblue_object
-object_bal
-object_warp_uzu
-object_driftice
-object_fall
-object_hanareyama_obj
-object_crace_object
-object_dno
-object_obj_tokeidai
-object_eg
-object_tru
-object_trt
-object_hakugin_obj
-object_horse_game_check
-object_stk
-object_mnk
-object_gi_bottle_red
-object_tokei_tobira
-object_az
-object_twig
-object_dekucity_obj
-object_po_fusen
-object_racetsubo
-object_ha
-object_bigokuta
-object_open_obj
-object_fu_kaiten
-object_fu_mato
-object_mtoride
-object_osn
-object_tokei_step
-object_lotus
-object_tl
-object_dkjail_obj
-object_visiblock
-object_tsn
-object_ds2n
-object_fsn
-object_shn
-object_bigicicle
-object_gi_bottle_15
-object_tk
-object_market_obj
-object_gi_reserve00
-object_gi_reserve01
-object_lightblock
-object_takaraya_objects
-object_wdhand
-object_sdn
-object_snowwd
-object_giant
-object_comb
-object_hana
-object_boss_hakugin
-object_meganeana_obj
-object_gi_nutsmask
-object_stk2
-object_spot11_obj
-object_danpei_object
-object_dhouse
-object_hakaisi
-object_po
-object_snowman
-object_po_sisters
-object_pp
-object_goronswitch
-object_delf
-object_botihasira
-object_gi_bigbomb
-object_pst
-object_bsmask
-object_spidertent
-object_zoraegg
-object_kbt
-object_gg
-object_maruta
-object_ghaka
-object_oyu
-object_dnq
-object_dai
-object_kgy
-object_fb
-object_taisou
-object_gk
-object_haka_obj
-object_dnt
-object_yukiyama
-object_icefloe
-object_gi_gold_dust
-object_gi_bottle_16
-object_gi_bottle_22
-object_bee
-object_ot
-object_utubo
-object_dora
-object_gi_loach
-object_gi_seahorse
-object_bigpo
-object_hariko
-object_dnj
-object_sinkai_kabe
-object_kin2_obj
-object_ishi
-object_hakugin_demo
-object_jg
-object_gi_sword_2
-object_gi_sword_3
-object_gi_sword_4
-object_um
-object_rb
-object_mbar_obj
-object_ikana_obj
-object_kz
-object_tokei_turret
-object_zog
-object_rotlift
-object_posthouse_obj
-object_gi_mask09
-object_gi_mask14
-object_gi_mask15
-object_inibs_object
-object_tree
-object_kaizoku_obj
-object_gi_reserve_b_00
-object_gi_reserve_c_00
-object_zob
-object_milkbar
-object_dmask
-object_gi_reserve_c_01
-object_zod
-object_kumo30
-object_obj_yasi
-object_tanron1
-object_tanron2
-object_tanron3
-object_gi_magicmushroom
-object_obj_chan
-object_gi_mask10
-object_zos
-object_an2
-object_an3
-object_f40_switch
-object_lodmoon
-object_tro
-object_gi_mask12
-object_gi_mask23
-object_gi_bottle_21
-object_gi_camera
-object_kamejima
-object_nb
-object_harfgibud
-object_zov
-object_ah
-object_hgdoor
-object_dor01
-object_dor02
-object_dor03
-object_dor04
-object_last_obj
-object_redead_obj
-object_ikninside_obj
-object_iknv_obj
-object_pamera
-object_hsstump
-object_zm
-object_al
-object_tab
-object_secom_obj
-object_dt
-object_gi_mask03
-object_cha
-object_obj_dinner
-object_gi_reserve_b_01
-object_lastday
-object_bai
-object_ikn_demo
-object_gi_fieldmap
-object_big_fwall
-object_hunsui
-object_uch
-object_tanron4
-object_tanron5
-object_in2
-object_yb
-object_rz
-object_bjt
-object_taru
-object_moonston
-object_gi_schedule
-object_gi_stonemask
-object_zoraband
-object_kepn_koya
-object_obj_usiyane
-object_gi_mask05
-object_gi_mask11
-object_gi_mask20
-object_nnh
-object_kzsaku
-object_obj_milk_bin
-object_random_obj
-object_kujiya
-object_kitan
-object_gi_mask06
-object_gi_mask16
-object_astr_obj
-object_bsb
-object_fall2
-object_sth
-object_gi_mssa
-object_smtower
-object_gi_mask21
-object_yado_obj
-object_syoten
-object_moonend
-object_ob
-object_gi_bottle_04
-object_and
-object_obj_danpeilift
-object_drs
-object_msmo
-object_an4
-object_wdor01
-object_wdor02
-object_wdor03
-object_wdor04
-object_wdor05
-object_stk3
-object_kinsta1_obj
-object_kinsta2_obj
-object_bh
-object_gi_mask17
-object_gi_mask22
-object_lbfshot
-object_fusen
-object_ending_obj
-object_gi_mask13
-scene_texture_01
-scene_texture_02
-scene_texture_03
-scene_texture_04
-scene_texture_05
-scene_texture_06
-scene_texture_07
-scene_texture_08
-nintendo_rogo_static
-title_static
-parameter_static
-week_static
-daytelop_static
-ger_daytelop_static
-fra_daytelop_static
-esp_daytelop_static
-d2_fine_static
-d2_cloud_static
-d2_fine_pal_static
-elf_message_field
-elf_message_ydan
-Z2_20SICHITAI2
-Z2_20SICHITAI2_room_00
-Z2_20SICHITAI2_room_01
-Z2_20SICHITAI2_room_02
-Z2_WITCH_SHOP
-Z2_WITCH_SHOP_room_00
-Z2_LAST_BS
-Z2_LAST_BS_room_00
-Z2_HAKASHITA
-Z2_HAKASHITA_room_00
-Z2_HAKASHITA_room_01
-Z2_HAKASHITA_room_02
-Z2_HAKASHITA_room_03
-Z2_HAKASHITA_room_04
-Z2_AYASHIISHOP
-Z2_AYASHIISHOP_room_00
-Z2_AYASHIISHOP_room_01
-Z2_OMOYA
-Z2_OMOYA_room_00
-Z2_OMOYA_room_01
-Z2_OMOYA_room_02
-Z2_BOWLING
-Z2_BOWLING_room_00
-Z2_SONCHONOIE
-Z2_SONCHONOIE_room_00
-Z2_SONCHONOIE_room_01
-Z2_SONCHONOIE_room_02
-Z2_SONCHONOIE_room_03
-Z2_IKANA
-Z2_IKANA_room_00
-Z2_IKANA_room_01
-Z2_IKANA_room_02
-Z2_IKANA_room_03
-Z2_IKANA_room_04
-Z2_KAIZOKU
-Z2_KAIZOKU_room_00
-Z2_MILK_BAR
-Z2_MILK_BAR_room_00
-Z2_INISIE_N
-Z2_INISIE_N_room_00
-Z2_INISIE_N_room_01
-Z2_INISIE_N_room_02
-Z2_INISIE_N_room_03
-Z2_INISIE_N_room_04
-Z2_INISIE_N_room_05
-Z2_INISIE_N_room_06
-Z2_INISIE_N_room_07
-Z2_INISIE_N_room_08
-Z2_INISIE_N_room_09
-Z2_INISIE_N_room_10
-Z2_INISIE_N_room_11
-Z2_TAKARAYA
-Z2_TAKARAYA_room_00
-Z2_INISIE_R
-Z2_INISIE_R_room_00
-Z2_INISIE_R_room_01
-Z2_INISIE_R_room_02
-Z2_INISIE_R_room_03
-Z2_INISIE_R_room_04
-Z2_INISIE_R_room_05
-Z2_INISIE_R_room_06
-Z2_INISIE_R_room_07
-Z2_INISIE_R_room_08
-Z2_INISIE_R_room_09
-Z2_INISIE_R_room_10
-Z2_INISIE_R_room_11
-Z2_OKUJOU
-Z2_OKUJOU_room_00
-Z2_OPENINGDAN
-Z2_OPENINGDAN_room_00
-Z2_OPENINGDAN_room_01
-Z2_MITURIN
-Z2_MITURIN_room_00
-Z2_MITURIN_room_01
-Z2_MITURIN_room_02
-Z2_MITURIN_room_03
-Z2_MITURIN_room_04
-Z2_MITURIN_room_05
-Z2_MITURIN_room_06
-Z2_MITURIN_room_07
-Z2_MITURIN_room_08
-Z2_MITURIN_room_09
-Z2_MITURIN_room_10
-Z2_MITURIN_room_11
-Z2_MITURIN_room_12
-Z2_13HUBUKINOMITI
-Z2_13HUBUKINOMITI_room_00
-Z2_CASTLE
-Z2_CASTLE_room_00
-Z2_CASTLE_room_01
-Z2_CASTLE_room_02
-Z2_CASTLE_room_03
-Z2_CASTLE_room_04
-Z2_CASTLE_room_05
-Z2_CASTLE_room_06
-Z2_CASTLE_room_07
-Z2_CASTLE_room_08
-Z2_CASTLE_room_09
-Z2_DEKUTES
-Z2_DEKUTES_room_00
-Z2_MITURIN_BS
-Z2_MITURIN_BS_room_00
-Z2_SYATEKI_MIZU
-Z2_SYATEKI_MIZU_room_00
-Z2_HAKUGIN
-Z2_HAKUGIN_room_00
-Z2_HAKUGIN_room_01
-Z2_HAKUGIN_room_02
-Z2_HAKUGIN_room_03
-Z2_HAKUGIN_room_04
-Z2_HAKUGIN_room_05
-Z2_HAKUGIN_room_06
-Z2_HAKUGIN_room_07
-Z2_HAKUGIN_room_08
-Z2_HAKUGIN_room_09
-Z2_HAKUGIN_room_10
-Z2_HAKUGIN_room_11
-Z2_HAKUGIN_room_12
-Z2_HAKUGIN_room_13
-Z2_ROMANYMAE
-Z2_ROMANYMAE_room_00
-Z2_PIRATE
-Z2_PIRATE_room_00
-Z2_PIRATE_room_01
-Z2_PIRATE_room_02
-Z2_PIRATE_room_03
-Z2_PIRATE_room_04
-Z2_PIRATE_room_05
-Z2_PIRATE_room_06
-Z2_PIRATE_room_07
-Z2_PIRATE_room_08
-Z2_PIRATE_room_09
-Z2_PIRATE_room_10
-Z2_PIRATE_room_11
-Z2_PIRATE_room_12
-Z2_PIRATE_room_13
-Z2_PIRATE_room_14
-Z2_SYATEKI_MORI
-Z2_SYATEKI_MORI_room_00
-Z2_SINKAI
-Z2_SINKAI_room_00
-Z2_YOUSEI_IZUMI
-Z2_YOUSEI_IZUMI_room_00
-Z2_YOUSEI_IZUMI_room_01
-Z2_YOUSEI_IZUMI_room_02
-Z2_YOUSEI_IZUMI_room_03
-Z2_YOUSEI_IZUMI_room_04
-Z2_KINSTA1
-Z2_KINSTA1_room_00
-Z2_KINSTA1_room_01
-Z2_KINSTA1_room_02
-Z2_KINSTA1_room_03
-Z2_KINSTA1_room_04
-Z2_KINSTA1_room_05
-Z2_KINDAN2
-Z2_KINDAN2_room_00
-Z2_KINDAN2_room_01
-Z2_KINDAN2_room_02
-Z2_KINDAN2_room_03
-Z2_KINDAN2_room_04
-Z2_KINDAN2_room_05
-Z2_TENMON_DAI
-Z2_TENMON_DAI_room_00
-Z2_TENMON_DAI_room_01
-Z2_LAST_DEKU
-Z2_LAST_DEKU_room_00
-Z2_LAST_DEKU_room_01
-Z2_22DEKUCITY
-Z2_22DEKUCITY_room_00
-Z2_22DEKUCITY_room_01
-Z2_22DEKUCITY_room_02
-Z2_KAJIYA
-Z2_KAJIYA_room_00
-Z2_00KEIKOKU
-Z2_00KEIKOKU_room_00
-Z2_POSTHOUSE
-Z2_POSTHOUSE_room_00
-Z2_LABO
-Z2_LABO_room_00
-Z2_DANPEI2TEST
-Z2_DANPEI2TEST_room_00
-Z2_DANPEI2TEST_room_01
-Z2_16GORON_HOUSE
-Z2_16GORON_HOUSE_room_00
-Z2_16GORON_HOUSE_room_01
-Z2_33ZORACITY
-Z2_33ZORACITY_room_00
-Z2_8ITEMSHOP
-Z2_8ITEMSHOP_room_00
-Z2_F01
-Z2_F01_room_00
-Z2_INISIE_BS
-Z2_INISIE_BS_room_00
-Z2_30GYOSON
-Z2_30GYOSON_room_00
-Z2_31MISAKI
-Z2_31MISAKI_room_00
-Z2_TAKARAKUJI
-Z2_TAKARAKUJI_room_00
-Z2_TORIDE
-Z2_TORIDE_room_00
-Z2_FISHERMAN
-Z2_FISHERMAN_room_00
-Z2_GORONSHOP
-Z2_GORONSHOP_room_00
-Z2_DEKU_KING
-Z2_DEKU_KING_room_00
-Z2_LAST_GORON
-Z2_LAST_GORON_room_00
-Z2_LAST_GORON_room_01
-Z2_24KEMONOMITI
-Z2_24KEMONOMITI_room_00
-Z2_F01_B
-Z2_F01_B_room_00
-Z2_F01C
-Z2_F01C_room_00
-Z2_BOTI
-Z2_BOTI_room_00
-Z2_BOTI_room_01
-Z2_HAKUGIN_BS
-Z2_HAKUGIN_BS_room_00
-Z2_20SICHITAI
-Z2_20SICHITAI_room_00
-Z2_20SICHITAI_room_01
-Z2_20SICHITAI_room_02
-Z2_21MITURINMAE
-Z2_21MITURINMAE_room_00
-Z2_LAST_ZORA
-Z2_LAST_ZORA_room_00
-Z2_11GORONNOSATO2
-Z2_11GORONNOSATO2_room_00
-Z2_11GORONNOSATO2_room_01
-Z2_SEA
-Z2_SEA_room_00
-Z2_SEA_room_01
-Z2_SEA_room_02
-Z2_SEA_room_03
-Z2_SEA_room_04
-Z2_SEA_room_05
-Z2_SEA_room_06
-Z2_SEA_room_07
-Z2_SEA_room_08
-Z2_SEA_room_09
-Z2_SEA_room_10
-Z2_SEA_room_11
-Z2_SEA_room_12
-Z2_SEA_room_13
-Z2_SEA_room_14
-Z2_SEA_room_15
-Z2_35TAKI
-Z2_35TAKI_room_00
-Z2_REDEAD
-Z2_REDEAD_room_00
-Z2_REDEAD_room_01
-Z2_REDEAD_room_02
-Z2_REDEAD_room_03
-Z2_REDEAD_room_04
-Z2_REDEAD_room_05
-Z2_REDEAD_room_06
-Z2_REDEAD_room_07
-Z2_REDEAD_room_08
-Z2_REDEAD_room_09
-Z2_REDEAD_room_10
-Z2_REDEAD_room_11
-Z2_REDEAD_room_12
-Z2_REDEAD_room_13
-Z2_BANDROOM
-Z2_BANDROOM_room_00
-Z2_BANDROOM_room_01
-Z2_BANDROOM_room_02
-Z2_BANDROOM_room_03
-Z2_BANDROOM_room_04
-Z2_11GORONNOSATO
-Z2_11GORONNOSATO_room_00
-Z2_11GORONNOSATO_room_01
-Z2_GORON_HAKA
-Z2_GORON_HAKA_room_00
-Z2_SECOM
-Z2_SECOM_room_00
-Z2_SECOM_room_01
-Z2_10YUKIYAMANOMURA
-Z2_10YUKIYAMANOMURA_room_00
-Z2_TOUGITES
-Z2_TOUGITES_room_00
-Z2_DANPEI
-Z2_DANPEI_room_00
-Z2_DANPEI_room_01
-Z2_DANPEI_room_02
-Z2_DANPEI_room_03
-Z2_DANPEI_room_04
-Z2_DANPEI_room_05
-Z2_DANPEI_room_06
-Z2_DANPEI_room_07
-Z2_DANPEI_room_08
-Z2_IKANAMAE
-Z2_IKANAMAE_room_00
-Z2_DOUJOU
-Z2_DOUJOU_room_00
-Z2_MUSICHOUSE
-Z2_MUSICHOUSE_room_00
-Z2_IKNINSIDE
-Z2_IKNINSIDE_room_00
-Z2_IKNINSIDE_room_01
-Z2_MAP_SHOP
-Z2_MAP_SHOP_room_00
-Z2_F40
-Z2_F40_room_00
-Z2_F41
-Z2_F41_room_00
-Z2_10YUKIYAMANOMURA2
-Z2_10YUKIYAMANOMURA2_room_00
-Z2_10YUKIYAMANOMURA2_room_01
-Z2_14YUKIDAMANOMITI
-Z2_14YUKIDAMANOMITI_room_00
-Z2_12HAKUGINMAE
-Z2_12HAKUGINMAE_room_00
-Z2_17SETUGEN
-Z2_17SETUGEN_room_00
-Z2_17SETUGEN2
-Z2_17SETUGEN2_room_00
-Z2_SEA_BS
-Z2_SEA_BS_room_00
-Z2_RANDOM
-Z2_RANDOM_room_00
-Z2_RANDOM_room_01
-Z2_RANDOM_room_02
-Z2_RANDOM_room_03
-Z2_RANDOM_room_04
-Z2_RANDOM_room_05
-Z2_YADOYA
-Z2_YADOYA_room_00
-Z2_YADOYA_room_01
-Z2_YADOYA_room_02
-Z2_YADOYA_room_03
-Z2_YADOYA_room_04
-Z2_KONPEKI_ENT
-Z2_KONPEKI_ENT_room_00
-Z2_INSIDETOWER
-Z2_INSIDETOWER_room_00
-Z2_INSIDETOWER_room_01
-Z2_26SARUNOMORI
-Z2_26SARUNOMORI_room_00
-Z2_26SARUNOMORI_room_01
-Z2_26SARUNOMORI_room_02
-Z2_26SARUNOMORI_room_03
-Z2_26SARUNOMORI_room_04
-Z2_26SARUNOMORI_room_05
-Z2_26SARUNOMORI_room_06
-Z2_26SARUNOMORI_room_07
-Z2_26SARUNOMORI_room_08
-Z2_LOST_WOODS
-Z2_LOST_WOODS_room_00
-Z2_LOST_WOODS_room_01
-Z2_LOST_WOODS_room_02
-Z2_LAST_LINK
-Z2_LAST_LINK_room_00
-Z2_LAST_LINK_room_01
-Z2_LAST_LINK_room_02
-Z2_LAST_LINK_room_03
-Z2_LAST_LINK_room_04
-Z2_LAST_LINK_room_05
-Z2_LAST_LINK_room_06
-Z2_LAST_LINK_room_07
-Z2_SOUGEN
-Z2_SOUGEN_room_00
-Z2_BOMYA
-Z2_BOMYA_room_00
-Z2_KYOJINNOMA
-Z2_KYOJINNOMA_room_00
-Z2_KOEPONARACE
-Z2_KOEPONARACE_room_00
-Z2_GORONRACE
-Z2_GORONRACE_room_00
-Z2_TOWN
-Z2_TOWN_room_00
-Z2_ICHIBA
-Z2_ICHIBA_room_00
-Z2_BACKTOWN
-Z2_BACKTOWN_room_00
-Z2_CLOCKTOWER
-Z2_CLOCKTOWER_room_00
-Z2_ALLEY
-Z2_ALLEY_room_00
-SPOT00
-SPOT00_room_00
-KAKUSIANA
-KAKUSIANA_room_00
-KAKUSIANA_room_01
-KAKUSIANA_room_02
-KAKUSIANA_room_03
-KAKUSIANA_room_04
-KAKUSIANA_room_05
-KAKUSIANA_room_06
-KAKUSIANA_room_07
-KAKUSIANA_room_08
-KAKUSIANA_room_09
-KAKUSIANA_room_10
-KAKUSIANA_room_11
-KAKUSIANA_room_12
-KAKUSIANA_room_13
-KAKUSIANA_room_14
-bump_texture_static
-anime_model_1_static
-anime_model_2_static
-anime_model_3_static
-anime_model_4_static
-anime_model_5_static
-anime_model_6_static
-anime_texture_1_static
-anime_texture_2_static
-anime_texture_3_static
-anime_texture_4_static
-anime_texture_5_static
-anime_texture_6_static
-softsprite_matrix_static
diff --git a/Android/app/src/main/assets/assets/extractor/filelists/mm_gc_jp.txt b/Android/app/src/main/assets/assets/extractor/filelists/mm_gc_jp.txt
deleted file mode 100644
index f673b491a..000000000
--- a/Android/app/src/main/assets/assets/extractor/filelists/mm_gc_jp.txt
+++ /dev/null
@@ -1,1546 +0,0 @@
-makerom
-boot
-dmadata
-Audiobank
-Audioseq
-Audiotable
-kanji
-link_animetion
-icon_item_static_syms
-icon_item_24_static_syms
-icon_item_field_static
-icon_item_dungeon_static
-icon_item_gameover_static
-icon_item_jpn_static
-icon_item_vtx_static
-map_i_static
-map_grand_static
-item_name_static
-map_name_static
-icon_item_static_yar
-icon_item_24_static_yar
-schedule_dma_static_syms
-schedule_dma_static_yar
-schedule_static
-story_static
-do_action_static
-message_static
-message_texture_static
-nes_font_static
-message_data_static_jp
-staff_message_data_static
-code
-ovl_title
-ovl_select
-ovl_opening
-ovl_file_choose
-ovl_daytelop
-ovl_kaleido_scope
-ovl_player_actor
-ovl_En_Test
-ovl_En_GirlA
-ovl_En_Part
-ovl_En_Light
-ovl_En_Door
-ovl_En_Box
-ovl_En_Pametfrog
-ovl_En_Okuta
-ovl_En_Bom
-ovl_En_Wallmas
-ovl_En_Dodongo
-ovl_En_Firefly
-ovl_En_Horse
-ovl_En_Arrow
-ovl_En_Elf
-ovl_En_Niw
-ovl_En_Tite
-ovl_En_Peehat
-ovl_En_Holl
-ovl_En_Dinofos
-ovl_En_Hata
-ovl_En_Zl1
-ovl_En_Viewer
-ovl_En_Bubble
-ovl_Door_Shutter
-ovl_En_Boom
-ovl_En_Torch2
-ovl_En_Minifrog
-ovl_En_St
-ovl_Obj_Wturn
-ovl_En_River_Sound
-ovl_En_Ossan
-ovl_En_Famos
-ovl_En_Bombf
-ovl_En_Am
-ovl_En_Dekubaba
-ovl_En_M_Fire1
-ovl_En_M_Thunder
-ovl_Bg_Breakwall
-ovl_Door_Warp1
-ovl_Obj_Syokudai
-ovl_Item_B_Heart
-ovl_En_Dekunuts
-ovl_En_Bbfall
-ovl_Arms_Hook
-ovl_En_Bb
-ovl_Bg_Keikoku_Spr
-ovl_En_Wood02
-ovl_En_Death
-ovl_En_Minideath
-ovl_En_Vm
-ovl_Demo_Effect
-ovl_Demo_Kankyo
-ovl_En_Floormas
-ovl_En_Rd
-ovl_Bg_F40_Flift
-ovl_Obj_Mure
-ovl_En_Sw
-ovl_Object_Kankyo
-ovl_En_Horse_Link_Child
-ovl_Door_Ana
-ovl_En_Encount1
-ovl_Demo_Tre_Lgt
-ovl_En_Encount2
-ovl_En_Fire_Rock
-ovl_Bg_Ctower_Rot
-ovl_Mir_Ray
-ovl_En_Sb
-ovl_En_Bigslime
-ovl_En_Karebaba
-ovl_En_In
-ovl_En_Bom_Chu
-ovl_En_Horse_Game_Check
-ovl_En_Rr
-ovl_En_Fr
-ovl_Obj_Oshihiki
-ovl_Eff_Dust
-ovl_Bg_Umajump
-ovl_En_Insect
-ovl_En_Butte
-ovl_En_Fish
-ovl_Item_Etcetera
-ovl_Arrow_Fire
-ovl_Arrow_Ice
-ovl_Arrow_Light
-ovl_Obj_Kibako
-ovl_Obj_Tsubo
-ovl_En_Ik
-ovl_Demo_Shd
-ovl_En_Dns
-ovl_Elf_Msg
-ovl_En_Honotrap
-ovl_En_Tubo_Trap
-ovl_Obj_Ice_Poly
-ovl_En_Fz
-ovl_En_Kusa
-ovl_Obj_Bean
-ovl_Obj_Bombiwa
-ovl_Obj_Switch
-ovl_Obj_Lift
-ovl_Obj_Hsblock
-ovl_En_Okarina_Tag
-ovl_En_Goroiwa
-ovl_En_Daiku
-ovl_En_Nwc
-ovl_Item_Inbox
-ovl_En_Ge1
-ovl_Obj_Blockstop
-ovl_En_Sda
-ovl_En_Clear_Tag
-ovl_En_Gm
-ovl_En_Ms
-ovl_En_Hs
-ovl_Bg_Ingate
-ovl_En_Kanban
-ovl_En_Attack_Niw
-ovl_En_Mk
-ovl_En_Owl
-ovl_En_Ishi
-ovl_Obj_Hana
-ovl_Obj_Lightswitch
-ovl_Obj_Mure2
-ovl_En_Fu
-ovl_En_Stream
-ovl_En_Mm
-ovl_En_Weather_Tag
-ovl_En_Ani
-ovl_En_Js
-ovl_En_Okarina_Effect
-ovl_En_Mag
-ovl_Elf_Msg2
-ovl_Bg_F40_Swlift
-ovl_En_Kakasi
-ovl_Obj_Makeoshihiki
-ovl_Oceff_Spot
-ovl_En_Torch
-ovl_Shot_Sun
-ovl_Obj_Roomtimer
-ovl_En_Ssh
-ovl_Oceff_Wipe
-ovl_Effect_Ss_Dust
-ovl_Effect_Ss_Kirakira
-ovl_Effect_Ss_Bomb2
-ovl_Effect_Ss_Blast
-ovl_Effect_Ss_G_Spk
-ovl_Effect_Ss_D_Fire
-ovl_Effect_Ss_Bubble
-ovl_Effect_Ss_G_Ripple
-ovl_Effect_Ss_G_Splash
-ovl_Effect_Ss_G_Fire
-ovl_Effect_Ss_Lightning
-ovl_Effect_Ss_Dt_Bubble
-ovl_Effect_Ss_Hahen
-ovl_Effect_Ss_Stick
-ovl_Effect_Ss_Sibuki
-ovl_Effect_Ss_Stone1
-ovl_Effect_Ss_Hitmark
-ovl_Effect_Ss_Fhg_Flash
-ovl_Effect_Ss_K_Fire
-ovl_Effect_Ss_Solder_Srch_Ball
-ovl_Effect_Ss_Kakera
-ovl_Effect_Ss_Ice_Piece
-ovl_Effect_Ss_En_Ice
-ovl_Effect_Ss_Fire_Tail
-ovl_Effect_Ss_En_Fire
-ovl_Effect_Ss_Extra
-ovl_Effect_Ss_Dead_Db
-ovl_Effect_Ss_Dead_Dd
-ovl_Effect_Ss_Dead_Ds
-ovl_Oceff_Storm
-ovl_Obj_Demo
-ovl_En_Minislime
-ovl_En_Nutsball
-ovl_Oceff_Wipe2
-ovl_Oceff_Wipe3
-ovl_En_Dg
-ovl_En_Si
-ovl_Obj_Comb
-ovl_Obj_Kibako2
-ovl_En_Hs2
-ovl_Obj_Mure3
-ovl_En_Tg
-ovl_En_Wf
-ovl_En_Skb
-ovl_En_Gs
-ovl_Obj_Sound
-ovl_En_Crow
-ovl_En_Cow
-ovl_Oceff_Wipe4
-ovl_En_Zo
-ovl_Effect_Ss_Ice_Smoke
-ovl_Obj_Makekinsuta
-ovl_En_Ge3
-ovl_Obj_Hamishi
-ovl_En_Zl4
-ovl_En_Mm2
-ovl_Door_Spiral
-ovl_Obj_Pzlblock
-ovl_Obj_Toge
-ovl_Obj_Armos
-ovl_Obj_Boyo
-ovl_En_Grasshopper
-ovl_Obj_Grass
-ovl_Obj_Grass_Carry
-ovl_Obj_Grass_Unit
-ovl_Bg_Fire_Wall
-ovl_En_Bu
-ovl_En_Encount3
-ovl_En_Jso
-ovl_Obj_Chikuwa
-ovl_En_Knight
-ovl_En_Warp_tag
-ovl_En_Aob_01
-ovl_En_Boj_01
-ovl_En_Boj_02
-ovl_En_Boj_03
-ovl_En_Encount4
-ovl_En_Bom_Bowl_Man
-ovl_En_Syateki_Man
-ovl_Bg_Icicle
-ovl_En_Syateki_Crow
-ovl_En_Boj_04
-ovl_En_Cne_01
-ovl_En_Bba_01
-ovl_En_Bji_01
-ovl_Bg_Spdweb
-ovl_En_Mt_tag
-ovl_Boss_01
-ovl_Boss_02
-ovl_Boss_03
-ovl_Boss_04
-ovl_Boss_05
-ovl_Boss_06
-ovl_Boss_07
-ovl_Bg_Dy_Yoseizo
-ovl_En_Boj_05
-ovl_En_Sob1
-ovl_En_Go
-ovl_En_Raf
-ovl_Obj_Funen
-ovl_Obj_Raillift
-ovl_Bg_Numa_Hana
-ovl_Obj_Flowerpot
-ovl_Obj_Spinyroll
-ovl_Dm_Hina
-ovl_En_Syateki_Wf
-ovl_Obj_Skateblock
-ovl_Effect_En_Ice_Block
-ovl_Obj_Iceblock
-ovl_En_Bigpamet
-ovl_Bg_Dblue_Movebg
-ovl_En_Syateki_Dekunuts
-ovl_Elf_Msg3
-ovl_En_Fg
-ovl_Dm_Ravine
-ovl_Dm_Sa
-ovl_En_Slime
-ovl_En_Pr
-ovl_Obj_Toudai
-ovl_Obj_Entotu
-ovl_Obj_Bell
-ovl_En_Syateki_Okuta
-ovl_Obj_Shutter
-ovl_Dm_Zl
-ovl_En_Ru
-ovl_En_Elfgrp
-ovl_Dm_Tsg
-ovl_En_Baguo
-ovl_Obj_Vspinyroll
-ovl_Obj_Smork
-ovl_En_Test2
-ovl_En_Test3
-ovl_En_Test4
-ovl_En_Bat
-ovl_En_Sekihi
-ovl_En_Wiz
-ovl_En_Wiz_Brock
-ovl_En_Wiz_Fire
-ovl_Eff_Change
-ovl_Dm_Statue
-ovl_Obj_Fireshield
-ovl_Bg_Ladder
-ovl_En_Mkk
-ovl_Demo_Getitem
-ovl_En_Dnb
-ovl_En_Dnh
-ovl_En_Dnk
-ovl_En_Dnq
-ovl_Bg_Keikoku_Saku
-ovl_Obj_Hugebombiwa
-ovl_En_Firefly2
-ovl_En_Rat
-ovl_En_Water_Effect
-ovl_En_Kusa2
-ovl_Bg_Spout_Fire
-ovl_En_Dy_Extra
-ovl_En_Bal
-ovl_En_Ginko_Man
-ovl_En_Warp_Uzu
-ovl_Obj_Driftice
-ovl_En_Look_Nuts
-ovl_En_Mushi2
-ovl_En_Fall
-ovl_En_Mm3
-ovl_Bg_Crace_Movebg
-ovl_En_Dno
-ovl_En_Pr2
-ovl_En_Prz
-ovl_En_Jso2
-ovl_Obj_Etcetera
-ovl_En_Egol
-ovl_Obj_Mine
-ovl_Obj_Purify
-ovl_En_Tru
-ovl_En_Trt
-ovl_En_Test5
-ovl_En_Test6
-ovl_En_Az
-ovl_En_Estone
-ovl_Bg_Hakugin_Post
-ovl_Dm_Opstage
-ovl_Dm_Stk
-ovl_Dm_Char00
-ovl_Dm_Char01
-ovl_Dm_Char02
-ovl_Dm_Char03
-ovl_Dm_Char04
-ovl_Dm_Char05
-ovl_Dm_Char06
-ovl_Dm_Char07
-ovl_Dm_Char08
-ovl_Dm_Char09
-ovl_Obj_Tokeidai
-ovl_En_Mnk
-ovl_En_Egblock
-ovl_En_Guard_Nuts
-ovl_Bg_Hakugin_Bombwall
-ovl_Obj_Tokei_Tobira
-ovl_Bg_Hakugin_Elvpole
-ovl_En_Ma4
-ovl_En_Twig
-ovl_En_Po_Fusen
-ovl_En_Door_Etc
-ovl_En_Bigokuta
-ovl_Bg_Icefloe
-ovl_fbdemo_triforce
-ovl_fbdemo_wipe1
-ovl_fbdemo_wipe3
-ovl_fbdemo_wipe4
-ovl_fbdemo_wipe5
-ovl_Effect_Ss_Sbn
-ovl_Obj_Ocarinalift
-ovl_En_Time_Tag
-ovl_Bg_Open_Shutter
-ovl_Bg_Open_Spot
-ovl_Bg_Fu_Kaiten
-ovl_Obj_Aqua
-ovl_En_Elforg
-ovl_En_Elfbub
-ovl_En_Fu_Mato
-ovl_En_Fu_Kago
-ovl_En_Osn
-ovl_Bg_Ctower_Gear
-ovl_En_Trt2
-ovl_Obj_Tokei_Step
-ovl_Bg_Lotus
-ovl_En_Kame
-ovl_Obj_Takaraya_Wall
-ovl_Bg_Fu_Mizu
-ovl_En_Sellnuts
-ovl_Bg_Dkjail_Ivy
-ovl_Obj_Visiblock
-ovl_En_Takaraya
-ovl_En_Tsn
-ovl_En_Ds2n
-ovl_En_Fsn
-ovl_En_Shn
-ovl_En_Stop_heishi
-ovl_Obj_Bigicicle
-ovl_En_Lift_Nuts
-ovl_En_Tk
-ovl_Bg_Market_Step
-ovl_Obj_Lupygamelift
-ovl_En_Test7
-ovl_Obj_Lightblock
-ovl_Mir_Ray2
-ovl_En_Wdhand
-ovl_En_Gamelupy
-ovl_Bg_Danpei_Movebg
-ovl_En_Snowwd
-ovl_En_Pm
-ovl_En_Gakufu
-ovl_Elf_Msg4
-ovl_Elf_Msg5
-ovl_En_Col_Man
-ovl_En_Talk_Gibud
-ovl_En_Giant
-ovl_Obj_Snowball
-ovl_Boss_Hakugin
-ovl_En_Gb2
-ovl_En_Onpuman
-ovl_Bg_Tobira01
-ovl_En_Tag_Obj
-ovl_Obj_Dhouse
-ovl_Obj_Hakaisi
-ovl_Bg_Hakugin_Switch
-ovl_En_Snowman
-ovl_TG_Sw
-ovl_En_Po_Sisters
-ovl_En_Pp
-ovl_En_Hakurock
-ovl_En_Hanabi
-ovl_Obj_Dowsing
-ovl_Obj_Wind
-ovl_En_Racedog
-ovl_En_Kendo_Js
-ovl_Bg_Botihasira
-ovl_En_Fish2
-ovl_En_Pst
-ovl_En_Poh
-ovl_Obj_Spidertent
-ovl_En_Zoraegg
-ovl_En_Kbt
-ovl_En_Gg
-ovl_En_Maruta
-ovl_Obj_Snowball2
-ovl_En_Gg2
-ovl_Obj_Ghaka
-ovl_En_Dnp
-ovl_En_Dai
-ovl_Bg_Goron_Oyu
-ovl_En_Kgy
-ovl_En_Invadepoh
-ovl_En_Gk
-ovl_En_An
-ovl_En_Bee
-ovl_En_Ot
-ovl_En_Dragon
-ovl_Obj_Dora
-ovl_En_Bigpo
-ovl_Obj_Kendo_Kanban
-ovl_Obj_Hariko
-ovl_En_Sth
-ovl_Bg_Sinkai_Kabe
-ovl_Bg_Haka_Curtain
-ovl_Bg_Kin2_Bombwall
-ovl_Bg_Kin2_Fence
-ovl_Bg_Kin2_Picture
-ovl_Bg_Kin2_Shelf
-ovl_En_Rail_Skb
-ovl_En_Jg
-ovl_En_Tru_Mt
-ovl_Obj_Um
-ovl_En_Neo_Reeba
-ovl_Bg_Mbar_Chair
-ovl_Bg_Ikana_Block
-ovl_Bg_Ikana_Mirror
-ovl_Bg_Ikana_Rotaryroom
-ovl_Bg_Dblue_Balance
-ovl_Bg_Dblue_Waterfall
-ovl_En_Kaizoku
-ovl_En_Ge2
-ovl_En_Ma_Yts
-ovl_En_Ma_Yto
-ovl_Obj_Tokei_Turret
-ovl_Bg_Dblue_Elevator
-ovl_Obj_Warpstone
-ovl_En_Zog
-ovl_Obj_Rotlift
-ovl_Obj_Jg_Gakki
-ovl_Bg_Inibs_Movebg
-ovl_En_Zot
-ovl_Obj_Tree
-ovl_Obj_Y2lift
-ovl_Obj_Y2shutter
-ovl_Obj_Boat
-ovl_Obj_Taru
-ovl_Obj_Hunsui
-ovl_En_Jc_Mato
-ovl_Mir_Ray3
-ovl_En_Zob
-ovl_Elf_Msg6
-ovl_Obj_Nozoki
-ovl_En_Toto
-ovl_En_Railgibud
-ovl_En_Baba
-ovl_En_Suttari
-ovl_En_Zod
-ovl_En_Kujiya
-ovl_En_Geg
-ovl_Obj_Kinoko
-ovl_Obj_Yasi
-ovl_En_Tanron1
-ovl_En_Tanron2
-ovl_En_Tanron3
-ovl_Obj_Chan
-ovl_En_Zos
-ovl_En_S_Goro
-ovl_En_Nb
-ovl_En_Ja
-ovl_Bg_F40_Block
-ovl_Bg_F40_Switch
-ovl_En_Po_Composer
-ovl_En_Guruguru
-ovl_Oceff_Wipe5
-ovl_En_Stone_heishi
-ovl_Oceff_Wipe6
-ovl_En_Scopenuts
-ovl_En_Scopecrow
-ovl_Oceff_Wipe7
-ovl_Eff_Kamejima_Wave
-ovl_En_Hg
-ovl_En_Hgo
-ovl_En_Zov
-ovl_En_Ah
-ovl_Obj_Hgdoor
-ovl_Bg_Ikana_Bombwall
-ovl_Bg_Ikana_Ray
-ovl_Bg_Ikana_Shutter
-ovl_Bg_Haka_Bombwall
-ovl_Bg_Haka_Tomb
-ovl_En_Sc_Ruppe
-ovl_Bg_Iknv_Doukutu
-ovl_Bg_Iknv_Obj
-ovl_En_Pamera
-ovl_Obj_HsStump
-ovl_En_Hidden_Nuts
-ovl_En_Zow
-ovl_En_Talk
-ovl_En_Al
-ovl_En_Tab
-ovl_En_Nimotsu
-ovl_En_Hit_Tag
-ovl_En_Ruppecrow
-ovl_En_Tanron4
-ovl_En_Tanron5
-ovl_En_Tanron6
-ovl_En_Daiku2
-ovl_En_Muto
-ovl_En_Baisen
-ovl_En_Heishi
-ovl_En_Demo_heishi
-ovl_En_Dt
-ovl_En_Cha
-ovl_Obj_Dinner
-ovl_Eff_Lastday
-ovl_Bg_Ikana_Dharma
-ovl_En_Akindonuts
-ovl_Eff_Stk
-ovl_En_Ig
-ovl_En_Rg
-ovl_En_Osk
-ovl_En_Sth2
-ovl_En_Yb
-ovl_En_Rz
-ovl_En_Scopecoin
-ovl_En_Bjt
-ovl_En_Bomjima
-ovl_En_Bomjimb
-ovl_En_Bombers
-ovl_En_Bombers2
-ovl_En_Bombal
-ovl_Obj_Moon_Stone
-ovl_Obj_Mu_Pict
-ovl_Bg_Ikninside
-ovl_Eff_Zoraband
-ovl_Obj_Kepn_Koya
-ovl_Obj_Usiyane
-ovl_En_Nnh
-ovl_Obj_Kzsaku
-ovl_Obj_Milk_Bin
-ovl_En_Kitan
-ovl_Bg_Astr_Bombwall
-ovl_Bg_Iknin_Susceil
-ovl_En_Bsb
-ovl_En_Recepgirl
-ovl_En_Thiefbird
-ovl_En_Jgame_Tsn
-ovl_Obj_Jgame_Light
-ovl_Obj_Yado
-ovl_Demo_Syoten
-ovl_Demo_Moonend
-ovl_Bg_Lbfshot
-ovl_Bg_Last_Bwall
-ovl_En_And
-ovl_En_Invadepoh_Demo
-ovl_Obj_Danpeilift
-ovl_En_Fall2
-ovl_Dm_Al
-ovl_Dm_An
-ovl_Dm_Ah
-ovl_Dm_Nb
-ovl_En_Drs
-ovl_En_Ending_Hero
-ovl_Dm_Bal
-ovl_En_Paper
-ovl_En_Hint_Skb
-ovl_Dm_Tag
-ovl_En_Bh
-ovl_En_Ending_Hero2
-ovl_En_Ending_Hero3
-ovl_En_Ending_Hero4
-ovl_En_Ending_Hero5
-ovl_En_Ending_Hero6
-ovl_Dm_Gm
-ovl_Obj_Swprize
-ovl_En_Invisible_Ruppe
-ovl_Obj_Ending
-ovl_En_Rsn
-gameplay_keep
-gameplay_field_keep
-gameplay_dangeon_keep
-gameplay_object_exchange_static
-object_link_boy
-object_link_child
-object_link_goron
-object_link_zora
-object_link_nuts
-object_mask_ki_tan
-object_mask_rabit
-object_mask_skj
-object_mask_truth
-object_mask_gibudo
-object_mask_json
-object_mask_kerfay
-object_mask_bigelf
-object_mask_kyojin
-object_mask_romerny
-object_mask_posthat
-object_mask_zacho
-object_mask_stone
-object_mask_bree
-object_mask_gero
-object_mask_yofukasi
-object_mask_meoto
-object_mask_dancer
-object_mask_bakuretu
-object_mask_bu_san
-object_mask_goron
-object_mask_zora
-object_mask_nuts
-object_mask_boy
-object_box
-object_okuta
-object_wallmaster
-object_dy_obj
-object_firefly
-object_dodongo
-object_niw
-object_tite
-object_ph
-object_dinofos
-object_zl1
-object_bubble
-object_test3
-object_famos
-object_st
-object_thiefbird
-object_bombf
-object_am
-object_dekubaba
-object_warp1
-object_b_heart
-object_dekunuts
-object_bb
-object_death
-object_hata
-object_wood02
-object_trap
-object_vm
-object_efc_star_field
-object_rd
-object_yukimura_obj
-object_horse_link_child
-object_syokudai
-object_efc_tw
-object_gi_key
-object_mir_ray
-object_ctower_rot
-object_bdoor
-object_sb
-object_gi_melody
-object_gi_heart
-object_gi_compass
-object_gi_bosskey
-object_gi_nuts
-object_gi_hearts
-object_gi_arrowcase
-object_gi_bombpouch
-object_in
-object_os_anime
-object_gi_bottle
-object_gi_stick
-object_gi_map
-object_oF1d_map
-object_ru2
-object_gi_magicpot
-object_gi_bomb_1
-object_ma2
-object_gi_purse
-object_rr
-object_gi_arrow
-object_gi_bomb_2
-object_gi_shield_2
-object_gi_hookshot
-object_gi_ocarina
-object_gi_milk
-object_ma1
-object_ny
-object_fr
-object_gi_bow
-object_gi_glasses
-object_gi_liquid
-object_ani
-object_gi_shield_3
-object_gi_bean
-object_gi_fish
-object_gi_longsword
-object_zo
-object_umajump
-object_mastergolon
-object_masterzoora
-object_aob
-object_ik
-object_ahg
-object_cne
-object_bji
-object_bba
-object_an1
-object_boj
-object_fz
-object_bob
-object_ge1
-object_yabusame_point
-object_d_hsblock
-object_d_lift
-object_mamenoki
-object_goroiwa
-object_toryo
-object_daiku
-object_nwc
-object_gm
-object_ms
-object_hs
-object_lightswitch
-object_kusa
-object_tsubo
-object_kanban
-object_owl
-object_mk
-object_fu
-object_gi_ki_tan_mask
-object_gi_mask18
-object_gi_rabit_mask
-object_gi_truth_mask
-object_stream
-object_mm
-object_js
-object_cs
-object_gi_soldout
-object_mag
-object_gi_golonmask
-object_gi_zoramask
-object_ka
-object_zg
-object_gi_m_arrow
-object_ds2
-object_fish
-object_gi_sutaru
-object_ssh
-object_bigslime
-object_bg
-object_bombiwa
-object_hintnuts
-object_rs
-object_gla
-object_geldb
-object_dog
-object_kibako2
-object_dns
-object_dnk
-object_gi_insect
-object_gi_ghost
-object_gi_soul
-object_f40_obj
-object_gi_rupy
-object_po_composer
-object_mu
-object_wf
-object_skb
-object_gs
-object_ps
-object_omoya_obj
-object_crow
-object_cow
-object_gi_sword_1
-object_zl4
-object_grasshopper
-object_boyo
-object_fwall
-object_jso
-object_knight
-object_icicle
-object_spdweb
-object_boss01
-object_boss02
-object_boss03
-object_boss04
-object_boss05
-object_boss07
-object_raf
-object_funen
-object_raillift
-object_numa_obj
-object_flowerpot
-object_spinyroll
-object_ice_block
-object_keikoku_demo
-object_slime
-object_pr
-object_f52_obj
-object_f53_obj
-object_kibako
-object_sek
-object_gmo
-object_bat
-object_sekihil
-object_sekihig
-object_sekihin
-object_sekihiz
-object_wiz
-object_ladder
-object_mkk
-object_keikoku_obj
-object_sichitai_obj
-object_dekucity_ana_obj
-object_rat
-object_water_effect
-object_dblue_object
-object_bal
-object_warp_uzu
-object_driftice
-object_fall
-object_hanareyama_obj
-object_crace_object
-object_dno
-object_obj_tokeidai
-object_eg
-object_tru
-object_trt
-object_hakugin_obj
-object_horse_game_check
-object_stk
-object_mnk
-object_gi_bottle_red
-object_tokei_tobira
-object_az
-object_twig
-object_dekucity_obj
-object_po_fusen
-object_racetsubo
-object_ha
-object_bigokuta
-object_open_obj
-object_fu_kaiten
-object_fu_mato
-object_mtoride
-object_osn
-object_tokei_step
-object_lotus
-object_tl
-object_dkjail_obj
-object_visiblock
-object_tsn
-object_ds2n
-object_fsn
-object_shn
-object_bigicicle
-object_gi_bottle_15
-object_tk
-object_market_obj
-object_gi_reserve00
-object_gi_reserve01
-object_lightblock
-object_takaraya_objects
-object_wdhand
-object_sdn
-object_snowwd
-object_giant
-object_comb
-object_hana
-object_boss_hakugin
-object_meganeana_obj
-object_gi_nutsmask
-object_stk2
-object_spot11_obj
-object_danpei_object
-object_dhouse
-object_hakaisi
-object_po
-object_snowman
-object_po_sisters
-object_pp
-object_goronswitch
-object_delf
-object_botihasira
-object_gi_bigbomb
-object_pst
-object_bsmask
-object_spidertent
-object_zoraegg
-object_kbt
-object_gg
-object_maruta
-object_ghaka
-object_oyu
-object_dnq
-object_dai
-object_kgy
-object_fb
-object_taisou
-object_gk
-object_haka_obj
-object_dnt
-object_yukiyama
-object_icefloe
-object_gi_gold_dust
-object_gi_bottle_16
-object_gi_bottle_22
-object_bee
-object_ot
-object_utubo
-object_dora
-object_gi_loach
-object_gi_seahorse
-object_bigpo
-object_hariko
-object_dnj
-object_sinkai_kabe
-object_kin2_obj
-object_ishi
-object_hakugin_demo
-object_jg
-object_gi_sword_2
-object_gi_sword_3
-object_gi_sword_4
-object_um
-object_rb
-object_mbar_obj
-object_ikana_obj
-object_kz
-object_tokei_turret
-object_zog
-object_rotlift
-object_posthouse_obj
-object_gi_mask09
-object_gi_mask14
-object_gi_mask15
-object_inibs_object
-object_tree
-object_kaizoku_obj
-object_gi_reserve_b_00
-object_gi_reserve_c_00
-object_zob
-object_milkbar
-object_dmask
-object_gi_reserve_c_01
-object_zod
-object_kumo30
-object_obj_yasi
-object_tanron1
-object_tanron2
-object_tanron3
-object_gi_magicmushroom
-object_obj_chan
-object_gi_mask10
-object_zos
-object_an2
-object_an3
-object_f40_switch
-object_lodmoon
-object_tro
-object_gi_mask12
-object_gi_mask23
-object_gi_bottle_21
-object_gi_camera
-object_kamejima
-object_nb
-object_harfgibud
-object_zov
-object_ah
-object_hgdoor
-object_dor01
-object_dor02
-object_dor03
-object_dor04
-object_last_obj
-object_redead_obj
-object_ikninside_obj
-object_iknv_obj
-object_pamera
-object_hsstump
-object_zm
-object_al
-object_tab
-object_secom_obj
-object_dt
-object_gi_mask03
-object_cha
-object_obj_dinner
-object_gi_reserve_b_01
-object_lastday
-object_bai
-object_ikn_demo
-object_gi_fieldmap
-object_big_fwall
-object_hunsui
-object_uch
-object_tanron4
-object_tanron5
-object_in2
-object_yb
-object_rz
-object_bjt
-object_taru
-object_moonston
-object_gi_schedule
-object_gi_stonemask
-object_zoraband
-object_kepn_koya
-object_obj_usiyane
-object_gi_mask05
-object_gi_mask11
-object_gi_mask20
-object_nnh
-object_kzsaku
-object_obj_milk_bin
-object_random_obj
-object_kujiya
-object_kitan
-object_gi_mask06
-object_gi_mask16
-object_astr_obj
-object_bsb
-object_fall2
-object_sth
-object_gi_mssa
-object_smtower
-object_gi_mask21
-object_yado_obj
-object_syoten
-object_moonend
-object_ob
-object_gi_bottle_04
-object_and
-object_obj_danpeilift
-object_drs
-object_msmo
-object_an4
-object_wdor01
-object_wdor02
-object_wdor03
-object_wdor04
-object_wdor05
-object_stk3
-object_kinsta1_obj
-object_kinsta2_obj
-object_bh
-object_gi_mask17
-object_gi_mask22
-object_lbfshot
-object_fusen
-object_ending_obj
-object_gi_mask13
-scene_texture_01
-scene_texture_02
-scene_texture_03
-scene_texture_04
-scene_texture_05
-scene_texture_06
-scene_texture_07
-scene_texture_08
-nintendo_rogo_static
-title_static
-parameter_static
-week_static
-daytelop_static
-d2_fine_static
-d2_cloud_static
-d2_fine_pal_static
-elf_message_field
-elf_message_ydan
-Z2_20SICHITAI2
-Z2_20SICHITAI2_room_00
-Z2_20SICHITAI2_room_01
-Z2_20SICHITAI2_room_02
-Z2_WITCH_SHOP
-Z2_WITCH_SHOP_room_00
-Z2_LAST_BS
-Z2_LAST_BS_room_00
-Z2_HAKASHITA
-Z2_HAKASHITA_room_00
-Z2_HAKASHITA_room_01
-Z2_HAKASHITA_room_02
-Z2_HAKASHITA_room_03
-Z2_HAKASHITA_room_04
-Z2_AYASHIISHOP
-Z2_AYASHIISHOP_room_00
-Z2_AYASHIISHOP_room_01
-Z2_OMOYA
-Z2_OMOYA_room_00
-Z2_OMOYA_room_01
-Z2_OMOYA_room_02
-Z2_BOWLING
-Z2_BOWLING_room_00
-Z2_SONCHONOIE
-Z2_SONCHONOIE_room_00
-Z2_SONCHONOIE_room_01
-Z2_SONCHONOIE_room_02
-Z2_SONCHONOIE_room_03
-Z2_IKANA
-Z2_IKANA_room_00
-Z2_IKANA_room_01
-Z2_IKANA_room_02
-Z2_IKANA_room_03
-Z2_IKANA_room_04
-Z2_KAIZOKU
-Z2_KAIZOKU_room_00
-Z2_MILK_BAR
-Z2_MILK_BAR_room_00
-Z2_INISIE_N
-Z2_INISIE_N_room_00
-Z2_INISIE_N_room_01
-Z2_INISIE_N_room_02
-Z2_INISIE_N_room_03
-Z2_INISIE_N_room_04
-Z2_INISIE_N_room_05
-Z2_INISIE_N_room_06
-Z2_INISIE_N_room_07
-Z2_INISIE_N_room_08
-Z2_INISIE_N_room_09
-Z2_INISIE_N_room_10
-Z2_INISIE_N_room_11
-Z2_TAKARAYA
-Z2_TAKARAYA_room_00
-Z2_INISIE_R
-Z2_INISIE_R_room_00
-Z2_INISIE_R_room_01
-Z2_INISIE_R_room_02
-Z2_INISIE_R_room_03
-Z2_INISIE_R_room_04
-Z2_INISIE_R_room_05
-Z2_INISIE_R_room_06
-Z2_INISIE_R_room_07
-Z2_INISIE_R_room_08
-Z2_INISIE_R_room_09
-Z2_INISIE_R_room_10
-Z2_INISIE_R_room_11
-Z2_OKUJOU
-Z2_OKUJOU_room_00
-Z2_OPENINGDAN
-Z2_OPENINGDAN_room_00
-Z2_OPENINGDAN_room_01
-Z2_MITURIN
-Z2_MITURIN_room_00
-Z2_MITURIN_room_01
-Z2_MITURIN_room_02
-Z2_MITURIN_room_03
-Z2_MITURIN_room_04
-Z2_MITURIN_room_05
-Z2_MITURIN_room_06
-Z2_MITURIN_room_07
-Z2_MITURIN_room_08
-Z2_MITURIN_room_09
-Z2_MITURIN_room_10
-Z2_MITURIN_room_11
-Z2_MITURIN_room_12
-Z2_13HUBUKINOMITI
-Z2_13HUBUKINOMITI_room_00
-Z2_CASTLE
-Z2_CASTLE_room_00
-Z2_CASTLE_room_01
-Z2_CASTLE_room_02
-Z2_CASTLE_room_03
-Z2_CASTLE_room_04
-Z2_CASTLE_room_05
-Z2_CASTLE_room_06
-Z2_CASTLE_room_07
-Z2_CASTLE_room_08
-Z2_CASTLE_room_09
-Z2_DEKUTES
-Z2_DEKUTES_room_00
-Z2_MITURIN_BS
-Z2_MITURIN_BS_room_00
-Z2_SYATEKI_MIZU
-Z2_SYATEKI_MIZU_room_00
-Z2_HAKUGIN
-Z2_HAKUGIN_room_00
-Z2_HAKUGIN_room_01
-Z2_HAKUGIN_room_02
-Z2_HAKUGIN_room_03
-Z2_HAKUGIN_room_04
-Z2_HAKUGIN_room_05
-Z2_HAKUGIN_room_06
-Z2_HAKUGIN_room_07
-Z2_HAKUGIN_room_08
-Z2_HAKUGIN_room_09
-Z2_HAKUGIN_room_10
-Z2_HAKUGIN_room_11
-Z2_HAKUGIN_room_12
-Z2_HAKUGIN_room_13
-Z2_ROMANYMAE
-Z2_ROMANYMAE_room_00
-Z2_PIRATE
-Z2_PIRATE_room_00
-Z2_PIRATE_room_01
-Z2_PIRATE_room_02
-Z2_PIRATE_room_03
-Z2_PIRATE_room_04
-Z2_PIRATE_room_05
-Z2_PIRATE_room_06
-Z2_PIRATE_room_07
-Z2_PIRATE_room_08
-Z2_PIRATE_room_09
-Z2_PIRATE_room_10
-Z2_PIRATE_room_11
-Z2_PIRATE_room_12
-Z2_PIRATE_room_13
-Z2_PIRATE_room_14
-Z2_SYATEKI_MORI
-Z2_SYATEKI_MORI_room_00
-Z2_SINKAI
-Z2_SINKAI_room_00
-Z2_YOUSEI_IZUMI
-Z2_YOUSEI_IZUMI_room_00
-Z2_YOUSEI_IZUMI_room_01
-Z2_YOUSEI_IZUMI_room_02
-Z2_YOUSEI_IZUMI_room_03
-Z2_YOUSEI_IZUMI_room_04
-Z2_KINSTA1
-Z2_KINSTA1_room_00
-Z2_KINSTA1_room_01
-Z2_KINSTA1_room_02
-Z2_KINSTA1_room_03
-Z2_KINSTA1_room_04
-Z2_KINSTA1_room_05
-Z2_KINDAN2
-Z2_KINDAN2_room_00
-Z2_KINDAN2_room_01
-Z2_KINDAN2_room_02
-Z2_KINDAN2_room_03
-Z2_KINDAN2_room_04
-Z2_KINDAN2_room_05
-Z2_TENMON_DAI
-Z2_TENMON_DAI_room_00
-Z2_TENMON_DAI_room_01
-Z2_LAST_DEKU
-Z2_LAST_DEKU_room_00
-Z2_LAST_DEKU_room_01
-Z2_22DEKUCITY
-Z2_22DEKUCITY_room_00
-Z2_22DEKUCITY_room_01
-Z2_22DEKUCITY_room_02
-Z2_KAJIYA
-Z2_KAJIYA_room_00
-Z2_00KEIKOKU
-Z2_00KEIKOKU_room_00
-Z2_POSTHOUSE
-Z2_POSTHOUSE_room_00
-Z2_LABO
-Z2_LABO_room_00
-Z2_DANPEI2TEST
-Z2_DANPEI2TEST_room_00
-Z2_DANPEI2TEST_room_01
-Z2_16GORON_HOUSE
-Z2_16GORON_HOUSE_room_00
-Z2_16GORON_HOUSE_room_01
-Z2_33ZORACITY
-Z2_33ZORACITY_room_00
-Z2_8ITEMSHOP
-Z2_8ITEMSHOP_room_00
-Z2_F01
-Z2_F01_room_00
-Z2_INISIE_BS
-Z2_INISIE_BS_room_00
-Z2_30GYOSON
-Z2_30GYOSON_room_00
-Z2_31MISAKI
-Z2_31MISAKI_room_00
-Z2_TAKARAKUJI
-Z2_TAKARAKUJI_room_00
-Z2_TORIDE
-Z2_TORIDE_room_00
-Z2_FISHERMAN
-Z2_FISHERMAN_room_00
-Z2_GORONSHOP
-Z2_GORONSHOP_room_00
-Z2_DEKU_KING
-Z2_DEKU_KING_room_00
-Z2_LAST_GORON
-Z2_LAST_GORON_room_00
-Z2_LAST_GORON_room_01
-Z2_24KEMONOMITI
-Z2_24KEMONOMITI_room_00
-Z2_F01_B
-Z2_F01_B_room_00
-Z2_F01C
-Z2_F01C_room_00
-Z2_BOTI
-Z2_BOTI_room_00
-Z2_BOTI_room_01
-Z2_HAKUGIN_BS
-Z2_HAKUGIN_BS_room_00
-Z2_20SICHITAI
-Z2_20SICHITAI_room_00
-Z2_20SICHITAI_room_01
-Z2_20SICHITAI_room_02
-Z2_21MITURINMAE
-Z2_21MITURINMAE_room_00
-Z2_LAST_ZORA
-Z2_LAST_ZORA_room_00
-Z2_11GORONNOSATO2
-Z2_11GORONNOSATO2_room_00
-Z2_11GORONNOSATO2_room_01
-Z2_SEA
-Z2_SEA_room_00
-Z2_SEA_room_01
-Z2_SEA_room_02
-Z2_SEA_room_03
-Z2_SEA_room_04
-Z2_SEA_room_05
-Z2_SEA_room_06
-Z2_SEA_room_07
-Z2_SEA_room_08
-Z2_SEA_room_09
-Z2_SEA_room_10
-Z2_SEA_room_11
-Z2_SEA_room_12
-Z2_SEA_room_13
-Z2_SEA_room_14
-Z2_SEA_room_15
-Z2_35TAKI
-Z2_35TAKI_room_00
-Z2_REDEAD
-Z2_REDEAD_room_00
-Z2_REDEAD_room_01
-Z2_REDEAD_room_02
-Z2_REDEAD_room_03
-Z2_REDEAD_room_04
-Z2_REDEAD_room_05
-Z2_REDEAD_room_06
-Z2_REDEAD_room_07
-Z2_REDEAD_room_08
-Z2_REDEAD_room_09
-Z2_REDEAD_room_10
-Z2_REDEAD_room_11
-Z2_REDEAD_room_12
-Z2_REDEAD_room_13
-Z2_BANDROOM
-Z2_BANDROOM_room_00
-Z2_BANDROOM_room_01
-Z2_BANDROOM_room_02
-Z2_BANDROOM_room_03
-Z2_BANDROOM_room_04
-Z2_11GORONNOSATO
-Z2_11GORONNOSATO_room_00
-Z2_11GORONNOSATO_room_01
-Z2_GORON_HAKA
-Z2_GORON_HAKA_room_00
-Z2_SECOM
-Z2_SECOM_room_00
-Z2_SECOM_room_01
-Z2_10YUKIYAMANOMURA
-Z2_10YUKIYAMANOMURA_room_00
-Z2_TOUGITES
-Z2_TOUGITES_room_00
-Z2_DANPEI
-Z2_DANPEI_room_00
-Z2_DANPEI_room_01
-Z2_DANPEI_room_02
-Z2_DANPEI_room_03
-Z2_DANPEI_room_04
-Z2_DANPEI_room_05
-Z2_DANPEI_room_06
-Z2_DANPEI_room_07
-Z2_DANPEI_room_08
-Z2_IKANAMAE
-Z2_IKANAMAE_room_00
-Z2_DOUJOU
-Z2_DOUJOU_room_00
-Z2_MUSICHOUSE
-Z2_MUSICHOUSE_room_00
-Z2_IKNINSIDE
-Z2_IKNINSIDE_room_00
-Z2_IKNINSIDE_room_01
-Z2_MAP_SHOP
-Z2_MAP_SHOP_room_00
-Z2_F40
-Z2_F40_room_00
-Z2_F41
-Z2_F41_room_00
-Z2_10YUKIYAMANOMURA2
-Z2_10YUKIYAMANOMURA2_room_00
-Z2_10YUKIYAMANOMURA2_room_01
-Z2_14YUKIDAMANOMITI
-Z2_14YUKIDAMANOMITI_room_00
-Z2_12HAKUGINMAE
-Z2_12HAKUGINMAE_room_00
-Z2_17SETUGEN
-Z2_17SETUGEN_room_00
-Z2_17SETUGEN2
-Z2_17SETUGEN2_room_00
-Z2_SEA_BS
-Z2_SEA_BS_room_00
-Z2_RANDOM
-Z2_RANDOM_room_00
-Z2_RANDOM_room_01
-Z2_RANDOM_room_02
-Z2_RANDOM_room_03
-Z2_RANDOM_room_04
-Z2_RANDOM_room_05
-Z2_YADOYA
-Z2_YADOYA_room_00
-Z2_YADOYA_room_01
-Z2_YADOYA_room_02
-Z2_YADOYA_room_03
-Z2_YADOYA_room_04
-Z2_KONPEKI_ENT
-Z2_KONPEKI_ENT_room_00
-Z2_INSIDETOWER
-Z2_INSIDETOWER_room_00
-Z2_INSIDETOWER_room_01
-Z2_26SARUNOMORI
-Z2_26SARUNOMORI_room_00
-Z2_26SARUNOMORI_room_01
-Z2_26SARUNOMORI_room_02
-Z2_26SARUNOMORI_room_03
-Z2_26SARUNOMORI_room_04
-Z2_26SARUNOMORI_room_05
-Z2_26SARUNOMORI_room_06
-Z2_26SARUNOMORI_room_07
-Z2_26SARUNOMORI_room_08
-Z2_LOST_WOODS
-Z2_LOST_WOODS_room_00
-Z2_LOST_WOODS_room_01
-Z2_LOST_WOODS_room_02
-Z2_LAST_LINK
-Z2_LAST_LINK_room_00
-Z2_LAST_LINK_room_01
-Z2_LAST_LINK_room_02
-Z2_LAST_LINK_room_03
-Z2_LAST_LINK_room_04
-Z2_LAST_LINK_room_05
-Z2_LAST_LINK_room_06
-Z2_LAST_LINK_room_07
-Z2_SOUGEN
-Z2_SOUGEN_room_00
-Z2_BOMYA
-Z2_BOMYA_room_00
-Z2_KYOJINNOMA
-Z2_KYOJINNOMA_room_00
-Z2_KOEPONARACE
-Z2_KOEPONARACE_room_00
-Z2_GORONRACE
-Z2_GORONRACE_room_00
-Z2_TOWN
-Z2_TOWN_room_00
-Z2_ICHIBA
-Z2_ICHIBA_room_00
-Z2_BACKTOWN
-Z2_BACKTOWN_room_00
-Z2_CLOCKTOWER
-Z2_CLOCKTOWER_room_00
-Z2_ALLEY
-Z2_ALLEY_room_00
-SPOT00
-SPOT00_room_00
-KAKUSIANA
-KAKUSIANA_room_00
-KAKUSIANA_room_01
-KAKUSIANA_room_02
-KAKUSIANA_room_03
-KAKUSIANA_room_04
-KAKUSIANA_room_05
-KAKUSIANA_room_06
-KAKUSIANA_room_07
-KAKUSIANA_room_08
-KAKUSIANA_room_09
-KAKUSIANA_room_10
-KAKUSIANA_room_11
-KAKUSIANA_room_12
-KAKUSIANA_room_13
-KAKUSIANA_room_14
-bump_texture_static
-anime_model_1_static
-anime_model_2_static
-anime_model_3_static
-anime_model_4_static
-anime_model_5_static
-anime_model_6_static
-anime_texture_1_static
-anime_texture_2_static
-anime_texture_3_static
-anime_texture_4_static
-anime_texture_5_static
-anime_texture_6_static
-softsprite_matrix_static
diff --git a/Android/app/src/main/assets/assets/extractor/filelists/pal_oot.txt b/Android/app/src/main/assets/assets/extractor/filelists/pal_oot.txt
deleted file mode 100644
index 812d3ebdd..000000000
--- a/Android/app/src/main/assets/assets/extractor/filelists/pal_oot.txt
+++ /dev/null
@@ -1,1511 +0,0 @@
-makerom
-boot
-dmadata
-Audiobank
-Audioseq
-Audiotable
-link_animetion
-icon_item_static
-icon_item_24_static
-icon_item_field_static
-icon_item_dungeon_static
-icon_item_gameover_static
-icon_item_nes_static
-icon_item_ger_static
-icon_item_fra_static
-item_name_static
-map_name_static
-do_action_static
-message_static
-message_texture_static
-nes_font_static
-nes_message_data_static
-ger_message_data_static
-fra_message_data_static
-staff_message_data_static
-map_grand_static
-map_i_static
-map_48x85_static
-code
-n64dd
-ovl_title
-ovl_select
-ovl_opening
-ovl_file_choose
-ovl_kaleido_scope
-ovl_player_actor
-ovl_map_mark_data
-ovl_En_Test
-ovl_En_GirlA
-ovl_En_Part
-ovl_En_Light
-ovl_En_Door
-ovl_En_Box
-ovl_En_Poh
-ovl_En_Okuta
-ovl_En_Bom
-ovl_En_Wallmas
-ovl_En_Dodongo
-ovl_En_Firefly
-ovl_En_Horse
-ovl_En_Arrow
-ovl_En_Elf
-ovl_En_Niw
-ovl_En_Tite
-ovl_En_Reeba
-ovl_En_Peehat
-ovl_En_Holl
-ovl_En_Scene_Change
-ovl_En_Zf
-ovl_En_Hata
-ovl_Boss_Dodongo
-ovl_Boss_Goma
-ovl_En_Zl1
-ovl_En_Viewer
-ovl_En_Goma
-ovl_Bg_Pushbox
-ovl_En_Bubble
-ovl_Door_Shutter
-ovl_En_Dodojr
-ovl_En_Bdfire
-ovl_En_Boom
-ovl_En_Torch2
-ovl_En_Bili
-ovl_En_Tp
-ovl_En_St
-ovl_En_Bw
-ovl_En_Eiyer
-ovl_En_River_Sound
-ovl_En_Horse_Normal
-ovl_En_Ossan
-ovl_Bg_Treemouth
-ovl_Bg_Dodoago
-ovl_Bg_Hidan_Dalm
-ovl_Bg_Hidan_Hrock
-ovl_En_Horse_Ganon
-ovl_Bg_Hidan_Rock
-ovl_Bg_Hidan_Rsekizou
-ovl_Bg_Hidan_Sekizou
-ovl_Bg_Hidan_Sima
-ovl_Bg_Hidan_Syoku
-ovl_En_Xc
-ovl_Bg_Hidan_Curtain
-ovl_Bg_Spot00_Hanebasi
-ovl_En_Mb
-ovl_En_Bombf
-ovl_Bg_Hidan_Firewall
-ovl_Bg_Dy_Yoseizo
-ovl_En_Zl2
-ovl_Bg_Hidan_Fslift
-ovl_En_OE2
-ovl_Bg_Ydan_Hasi
-ovl_Bg_Ydan_Maruta
-ovl_Boss_Ganondrof
-ovl_En_Am
-ovl_En_Dekubaba
-ovl_En_M_Fire1
-ovl_En_M_Thunder
-ovl_Bg_Ddan_Jd
-ovl_Bg_Breakwall
-ovl_En_Jj
-ovl_En_Horse_Zelda
-ovl_Bg_Ddan_Kd
-ovl_Door_Warp1
-ovl_Obj_Syokudai
-ovl_Item_B_Heart
-ovl_En_Dekunuts
-ovl_Bg_Menkuri_Kaiten
-ovl_Bg_Menkuri_Eye
-ovl_En_Vali
-ovl_Bg_Mizu_Movebg
-ovl_Bg_Mizu_Water
-ovl_Arms_Hook
-ovl_En_fHG
-ovl_Bg_Mori_Hineri
-ovl_En_Bb
-ovl_Bg_Toki_Hikari
-ovl_En_Yukabyun
-ovl_Bg_Toki_Swd
-ovl_En_Fhg_Fire
-ovl_Bg_Mjin
-ovl_Bg_Hidan_Kousi
-ovl_Door_Toki
-ovl_Bg_Hidan_Hamstep
-ovl_En_Bird
-ovl_En_Wood02
-ovl_En_Lightbox
-ovl_En_Pu_box
-ovl_En_Trap
-ovl_En_Arow_Trap
-ovl_En_Vase
-ovl_En_Ta
-ovl_En_Tk
-ovl_Bg_Mori_Bigst
-ovl_Bg_Mori_Elevator
-ovl_Bg_Mori_Kaitenkabe
-ovl_Bg_Mori_Rakkatenjo
-ovl_En_Vm
-ovl_Demo_Effect
-ovl_Demo_Kankyo
-ovl_Bg_Hidan_Fwbig
-ovl_En_Floormas
-ovl_En_Heishi1
-ovl_En_Rd
-ovl_En_Po_Sisters
-ovl_Bg_Heavy_Block
-ovl_Bg_Po_Event
-ovl_Obj_Mure
-ovl_En_Sw
-ovl_Boss_Fd
-ovl_Object_Kankyo
-ovl_En_Du
-ovl_En_Fd
-ovl_En_Horse_Link_Child
-ovl_Door_Ana
-ovl_Bg_Spot02_Objects
-ovl_Bg_Haka
-ovl_Magic_Wind
-ovl_Magic_Fire
-ovl_En_Ru1
-ovl_Boss_Fd2
-ovl_En_Fd_Fire
-ovl_En_Dh
-ovl_En_Dha
-ovl_En_Rl
-ovl_En_Encount1
-ovl_Demo_Du
-ovl_Demo_Im
-ovl_Demo_Tre_Lgt
-ovl_En_Fw
-ovl_Bg_Vb_Sima
-ovl_En_Vb_Ball
-ovl_Bg_Haka_Megane
-ovl_Bg_Haka_MeganeBG
-ovl_Bg_Haka_Ship
-ovl_Bg_Haka_Sgami
-ovl_En_Heishi2
-ovl_En_Encount2
-ovl_En_Fire_Rock
-ovl_En_Brob
-ovl_Mir_Ray
-ovl_Bg_Spot09_Obj
-ovl_Bg_Spot18_Obj
-ovl_Boss_Va
-ovl_Bg_Haka_Tubo
-ovl_Bg_Haka_Trap
-ovl_Bg_Haka_Huta
-ovl_Bg_Haka_Zou
-ovl_Bg_Spot17_Funen
-ovl_En_Syateki_Itm
-ovl_En_Syateki_Man
-ovl_En_Tana
-ovl_En_Nb
-ovl_Boss_Mo
-ovl_En_Sb
-ovl_En_Bigokuta
-ovl_En_Karebaba
-ovl_Bg_Bdan_Objects
-ovl_Demo_Sa
-ovl_Demo_Go
-ovl_En_In
-ovl_En_Tr
-ovl_Bg_Spot16_Bombstone
-ovl_Bg_Hidan_Kowarerukabe
-ovl_Bg_Bombwall
-ovl_En_Ru2
-ovl_Obj_Dekujr
-ovl_Bg_Mizu_Uzu
-ovl_Bg_Spot06_Objects
-ovl_Bg_Ice_Objects
-ovl_Bg_Haka_Water
-ovl_En_Ma2
-ovl_En_Bom_Chu
-ovl_En_Horse_Game_Check
-ovl_Boss_Tw
-ovl_En_Rr
-ovl_En_Ba
-ovl_En_Bx
-ovl_En_Anubice
-ovl_En_Anubice_Fire
-ovl_Bg_Mori_Hashigo
-ovl_Bg_Mori_Hashira4
-ovl_Bg_Mori_Idomizu
-ovl_Bg_Spot16_Doughnut
-ovl_Bg_Bdan_Switch
-ovl_En_Ma1
-ovl_Boss_Ganon
-ovl_Boss_Sst
-ovl_En_Ny
-ovl_En_Fr
-ovl_Item_Shield
-ovl_Bg_Ice_Shelter
-ovl_En_Ice_Hono
-ovl_Item_Ocarina
-ovl_Magic_Dark
-ovl_Demo_6K
-ovl_En_Anubice_Tag
-ovl_Bg_Haka_Gate
-ovl_Bg_Spot15_Saku
-ovl_Bg_Jya_Goroiwa
-ovl_Bg_Jya_Zurerukabe
-ovl_Bg_Jya_Cobra
-ovl_Bg_Jya_Kanaami
-ovl_Fishing
-ovl_Obj_Oshihiki
-ovl_Bg_Gate_Shutter
-ovl_Eff_Dust
-ovl_Bg_Spot01_Fusya
-ovl_Bg_Spot01_Idohashira
-ovl_Bg_Spot01_Idomizu
-ovl_Bg_Po_Syokudai
-ovl_Bg_Ganon_Otyuka
-ovl_Bg_Spot15_Rrbox
-ovl_Bg_Umajump
-ovl_En_Insect
-ovl_En_Butte
-ovl_En_Fish
-ovl_Bg_Spot08_Iceblock
-ovl_Item_Etcetera
-ovl_Arrow_Fire
-ovl_Arrow_Ice
-ovl_Arrow_Light
-ovl_Obj_Kibako
-ovl_Obj_Tsubo
-ovl_En_Wonder_Item
-ovl_En_Ik
-ovl_Demo_Ik
-ovl_En_Skj
-ovl_En_Skjneedle
-ovl_En_G_Switch
-ovl_Demo_Ext
-ovl_Demo_Shd
-ovl_En_Dns
-ovl_Elf_Msg
-ovl_En_Honotrap
-ovl_En_Tubo_Trap
-ovl_Obj_Ice_Poly
-ovl_Bg_Spot03_Taki
-ovl_Bg_Spot07_Taki
-ovl_En_Fz
-ovl_En_Po_Relay
-ovl_Bg_Relay_Objects
-ovl_En_Diving_Game
-ovl_En_Kusa
-ovl_Obj_Bean
-ovl_Obj_Bombiwa
-ovl_Obj_Switch
-ovl_Obj_Elevator
-ovl_Obj_Lift
-ovl_Obj_Hsblock
-ovl_En_Okarina_Tag
-ovl_En_Yabusame_Mark
-ovl_En_Goroiwa
-ovl_En_Ex_Ruppy
-ovl_En_Toryo
-ovl_En_Daiku
-ovl_En_Nwc
-ovl_En_Blkobj
-ovl_Item_Inbox
-ovl_En_Ge1
-ovl_Obj_Blockstop
-ovl_En_Sda
-ovl_En_Clear_Tag
-ovl_En_Niw_Lady
-ovl_En_Gm
-ovl_En_Ms
-ovl_En_Hs
-ovl_Bg_Ingate
-ovl_En_Kanban
-ovl_En_Heishi3
-ovl_En_Syateki_Niw
-ovl_En_Attack_Niw
-ovl_Bg_Spot01_Idosoko
-ovl_En_Sa
-ovl_En_Wonder_Talk
-ovl_Bg_Gjyo_Bridge
-ovl_En_Ds
-ovl_En_Mk
-ovl_En_Bom_Bowl_Man
-ovl_En_Bom_Bowl_Pit
-ovl_En_Owl
-ovl_En_Ishi
-ovl_Obj_Hana
-ovl_Obj_Lightswitch
-ovl_Obj_Mure2
-ovl_En_Go
-ovl_En_Fu
-ovl_En_Changer
-ovl_Bg_Jya_Megami
-ovl_Bg_Jya_Lift
-ovl_Bg_Jya_Bigmirror
-ovl_Bg_Jya_Bombchuiwa
-ovl_Bg_Jya_Amishutter
-ovl_Bg_Jya_Bombiwa
-ovl_Bg_Spot18_Basket
-ovl_En_Ganon_Organ
-ovl_En_Siofuki
-ovl_En_Stream
-ovl_En_Mm
-ovl_En_Ko
-ovl_En_Kz
-ovl_En_Weather_Tag
-ovl_Bg_Sst_Floor
-ovl_En_Ani
-ovl_En_Ex_Item
-ovl_Bg_Jya_Ironobj
-ovl_En_Js
-ovl_En_Jsjutan
-ovl_En_Cs
-ovl_En_Md
-ovl_En_Hy
-ovl_En_Ganon_Mant
-ovl_En_Okarina_Effect
-ovl_En_Mag
-ovl_Door_Gerudo
-ovl_Elf_Msg2
-ovl_Demo_Gt
-ovl_En_Po_Field
-ovl_Efc_Erupc
-ovl_Bg_Zg
-ovl_En_Heishi4
-ovl_En_Zl3
-ovl_Boss_Ganon2
-ovl_En_Kakasi
-ovl_En_Takara_Man
-ovl_Obj_Makeoshihiki
-ovl_Oceff_Spot
-ovl_End_Title
-ovl_En_Torch
-ovl_Demo_Ec
-ovl_Shot_Sun
-ovl_En_Dy_Extra
-ovl_En_Wonder_Talk2
-ovl_En_Ge2
-ovl_Obj_Roomtimer
-ovl_En_Ssh
-ovl_En_Sth
-ovl_Oceff_Wipe
-ovl_Effect_Ss_Dust
-ovl_Effect_Ss_KiraKira
-ovl_Effect_Ss_Bomb
-ovl_Effect_Ss_Bomb2
-ovl_Effect_Ss_Blast
-ovl_Effect_Ss_G_Spk
-ovl_Effect_Ss_D_Fire
-ovl_Effect_Ss_Bubble
-ovl_Effect_Ss_G_Ripple
-ovl_Effect_Ss_G_Splash
-ovl_Effect_Ss_G_Magma
-ovl_Effect_Ss_G_Fire
-ovl_Effect_Ss_Lightning
-ovl_Effect_Ss_Dt_Bubble
-ovl_Effect_Ss_Hahen
-ovl_Effect_Ss_Stick
-ovl_Effect_Ss_Sibuki
-ovl_Effect_Ss_Sibuki2
-ovl_Effect_Ss_G_Magma2
-ovl_Effect_Ss_Stone1
-ovl_Effect_Ss_HitMark
-ovl_Effect_Ss_Fhg_Flash
-ovl_Effect_Ss_K_Fire
-ovl_Effect_Ss_Solder_Srch_Ball
-ovl_Effect_Ss_Kakera
-ovl_Effect_Ss_Ice_Piece
-ovl_Effect_Ss_En_Ice
-ovl_Effect_Ss_Fire_Tail
-ovl_Effect_Ss_En_Fire
-ovl_Effect_Ss_Extra
-ovl_Effect_Ss_Fcircle
-ovl_Effect_Ss_Dead_Db
-ovl_Effect_Ss_Dead_Dd
-ovl_Effect_Ss_Dead_Ds
-ovl_Effect_Ss_Dead_Sound
-ovl_Oceff_Storm
-ovl_En_Weiyer
-ovl_Bg_Spot05_Soko
-ovl_Bg_Jya_1flift
-ovl_Bg_Jya_Haheniron
-ovl_Bg_Spot12_Gate
-ovl_Bg_Spot12_Saku
-ovl_En_Hintnuts
-ovl_En_Nutsball
-ovl_Bg_Spot00_Break
-ovl_En_Shopnuts
-ovl_En_It
-ovl_En_GeldB
-ovl_Oceff_Wipe2
-ovl_Oceff_Wipe3
-ovl_En_Niw_Girl
-ovl_En_Dog
-ovl_En_Si
-ovl_Bg_Spot01_Objects2
-ovl_Obj_Comb
-ovl_Bg_Spot11_Bakudankabe
-ovl_Obj_Kibako2
-ovl_En_Dnt_Demo
-ovl_En_Dnt_Jiji
-ovl_En_Dnt_Nomal
-ovl_En_Guest
-ovl_Bg_Bom_Guard
-ovl_En_Hs2
-ovl_Demo_Kekkai
-ovl_Bg_Spot08_Bakudankabe
-ovl_Bg_Spot17_Bakudankabe
-ovl_Obj_Mure3
-ovl_En_Tg
-ovl_En_Mu
-ovl_En_Go2
-ovl_En_Wf
-ovl_En_Skb
-ovl_Demo_Gj
-ovl_Demo_Geff
-ovl_Bg_Gnd_Firemeiro
-ovl_Bg_Gnd_Darkmeiro
-ovl_Bg_Gnd_Soulmeiro
-ovl_Bg_Gnd_Nisekabe
-ovl_Bg_Gnd_Iceblock
-ovl_Bg_Ydan_Sp
-ovl_En_Gb
-ovl_En_Gs
-ovl_Bg_Mizu_Bwall
-ovl_Bg_Mizu_Shutter
-ovl_En_Daiku_Kakariko
-ovl_Bg_Bowl_Wall
-ovl_En_Wall_Tubo
-ovl_En_Po_Desert
-ovl_En_Crow
-ovl_Door_Killer
-ovl_Bg_Spot11_Oasis
-ovl_Bg_Spot18_Futa
-ovl_Bg_Spot18_Shutter
-ovl_En_Ma3
-ovl_En_Cow
-ovl_Bg_Ice_Turara
-ovl_Bg_Ice_Shutter
-ovl_En_Kakasi2
-ovl_En_Kakasi3
-ovl_Oceff_Wipe4
-ovl_En_Eg
-ovl_Bg_Menkuri_Nisekabe
-ovl_En_Zo
-ovl_Effect_Ss_Ice_Smoke
-ovl_Obj_Makekinsuta
-ovl_En_Ge3
-ovl_Obj_Timeblock
-ovl_Obj_Hamishi
-ovl_En_Zl4
-ovl_En_Mm2
-ovl_Bg_Jya_Block
-ovl_Obj_Warp2block
-gameplay_keep
-gameplay_field_keep
-gameplay_dangeon_keep
-gameplay_object_exchange_static
-object_link_boy
-object_link_child
-object_box
-object_human
-object_okuta
-object_poh
-object_wallmaster
-object_dy_obj
-object_firefly
-object_dodongo
-object_fire
-object_niw
-object_tite
-object_reeba
-object_peehat
-object_kingdodongo
-object_horse
-object_zf
-object_goma
-object_zl1
-object_gol
-object_bubble
-object_dodojr
-object_torch2
-object_bl
-object_tp
-object_oA1
-object_st
-object_bw
-object_ei
-object_horse_normal
-object_oB1
-object_o_anime
-object_spot04_objects
-object_ddan_objects
-object_hidan_objects
-object_horse_ganon
-object_oA2
-object_spot00_objects
-object_mb
-object_bombf
-object_sk2
-object_oE1
-object_oE_anime
-object_oE2
-object_ydan_objects
-object_gnd
-object_am
-object_dekubaba
-object_oA3
-object_oA4
-object_oA5
-object_oA6
-object_oA7
-object_jj
-object_oA8
-object_oA9
-object_oB2
-object_oB3
-object_oB4
-object_horse_zelda
-object_opening_demo1
-object_warp1
-object_b_heart
-object_dekunuts
-object_oE3
-object_oE4
-object_menkuri_objects
-object_oE5
-object_oE6
-object_oE7
-object_oE8
-object_oE9
-object_oE10
-object_oE11
-object_oE12
-object_vali
-object_oA10
-object_oA11
-object_mizu_objects
-object_fhg
-object_ossan
-object_mori_hineri1
-object_Bb
-object_toki_objects
-object_yukabyun
-object_zl2
-object_mjin
-object_mjin_flash
-object_mjin_dark
-object_mjin_flame
-object_mjin_ice
-object_mjin_soul
-object_mjin_wind
-object_mjin_oka
-object_haka_objects
-object_spot06_objects
-object_ice_objects
-object_relay_objects
-object_mori_hineri1a
-object_mori_hineri2
-object_mori_hineri2a
-object_mori_objects
-object_mori_tex
-object_spot08_obj
-object_warp2
-object_hata
-object_bird
-object_wood02
-object_lightbox
-object_pu_box
-object_trap
-object_vase
-object_im
-object_ta
-object_tk
-object_xc
-object_vm
-object_bv
-object_hakach_objects
-object_efc_crystal_light
-object_efc_fire_ball
-object_efc_flash
-object_efc_lgt_shower
-object_efc_star_field
-object_god_lgt
-object_light_ring
-object_triforce_spot
-object_medal
-object_bdan_objects
-object_sd
-object_rd
-object_po_sisters
-object_heavy_object
-object_gndd
-object_fd
-object_du
-object_fw
-object_horse_link_child
-object_spot02_objects
-object_haka
-object_ru1
-object_syokudai
-object_fd2
-object_dh
-object_rl
-object_efc_tw
-object_demo_tre_lgt
-object_gi_key
-object_mir_ray
-object_brob
-object_gi_jewel
-object_spot09_obj
-object_spot18_obj
-object_bdoor
-object_spot17_obj
-object_shop_dungen
-object_nb
-object_mo
-object_sb
-object_gi_melody
-object_gi_heart
-object_gi_compass
-object_gi_bosskey
-object_gi_medal
-object_gi_nuts
-object_sa
-object_gi_hearts
-object_gi_arrowcase
-object_gi_bombpouch
-object_in
-object_tr
-object_spot16_obj
-object_oE1s
-object_oE4s
-object_os_anime
-object_gi_bottle
-object_gi_stick
-object_gi_map
-object_oF1d_map
-object_ru2
-object_gi_shield_1
-object_dekujr
-object_gi_magicpot
-object_gi_bomb_1
-object_oF1s
-object_ma2
-object_gi_purse
-object_hni
-object_tw
-object_rr
-object_bxa
-object_anubice
-object_gi_gerudo
-object_gi_arrow
-object_gi_bomb_2
-object_gi_egg
-object_gi_scale
-object_gi_shield_2
-object_gi_hookshot
-object_gi_ocarina
-object_gi_milk
-object_ma1
-object_ganon
-object_sst
-object_ny
-object_fr
-object_gi_pachinko
-object_gi_boomerang
-object_gi_bow
-object_gi_glasses
-object_gi_liquid
-object_ani
-object_demo_6k
-object_gi_shield_3
-object_gi_letter
-object_spot15_obj
-object_jya_obj
-object_gi_clothes
-object_gi_bean
-object_gi_fish
-object_gi_saw
-object_gi_hammer
-object_gi_grass
-object_gi_longsword
-object_spot01_objects
-object_md
-object_km1
-object_kw1
-object_zo
-object_kz
-object_umajump
-object_masterkokiri
-object_masterkokirihead
-object_mastergolon
-object_masterzoora
-object_aob
-object_ik
-object_ahg
-object_cne
-object_gi_niwatori
-object_skj
-object_gi_bottle_letter
-object_bji
-object_bba
-object_gi_ocarina_0
-object_ds
-object_ane
-object_boj
-object_spot03_object
-object_spot07_object
-object_fz
-object_bob
-object_ge1
-object_yabusame_point
-object_gi_boots_2
-object_gi_seed
-object_gnd_magic
-object_d_elevator
-object_d_hsblock
-object_d_lift
-object_mamenoki
-object_goroiwa
-object_toryo
-object_daiku
-object_nwc
-object_blkobj
-object_gm
-object_ms
-object_hs
-object_ingate
-object_lightswitch
-object_kusa
-object_tsubo
-object_gi_gloves
-object_gi_coin
-object_kanban
-object_gjyo_objects
-object_owl
-object_mk
-object_fu
-object_gi_ki_tan_mask
-object_gi_redead_mask
-object_gi_skj_mask
-object_gi_rabit_mask
-object_gi_truth_mask
-object_ganon_objects
-object_siofuki
-object_stream
-object_mm
-object_fa
-object_os
-object_gi_eye_lotion
-object_gi_powder
-object_gi_mushroom
-object_gi_ticketstone
-object_gi_brokensword
-object_js
-object_cs
-object_gi_prescription
-object_gi_bracelet
-object_gi_soldout
-object_gi_frog
-object_mag
-object_door_gerudo
-object_gt
-object_efc_erupc
-object_zl2_anime1
-object_zl2_anime2
-object_gi_golonmask
-object_gi_zoramask
-object_gi_gerudomask
-object_ganon2
-object_ka
-object_ts
-object_zg
-object_gi_hoverboots
-object_gi_m_arrow
-object_ds2
-object_ec
-object_fish
-object_gi_sutaru
-object_gi_goddess
-object_ssh
-object_bigokuta
-object_bg
-object_spot05_objects
-object_spot12_obj
-object_bombiwa
-object_hintnuts
-object_rs
-object_spot00_break
-object_gla
-object_shopnuts
-object_geldb
-object_gr
-object_dog
-object_jya_iron
-object_jya_door
-object_spot01_objects2
-object_spot11_obj
-object_kibako2
-object_dns
-object_dnk
-object_gi_fire
-object_gi_insect
-object_gi_butterfly
-object_gi_ghost
-object_gi_soul
-object_bowl
-object_po_field
-object_demo_kekkai
-object_efc_doughnut
-object_gi_dekupouch
-object_ganon_anime1
-object_ganon_anime2
-object_ganon_anime3
-object_gi_rupy
-object_spot01_matoya
-object_spot01_matoyab
-object_po_composer
-object_mu
-object_wf
-object_skb
-object_gj
-object_geff
-object_haka_door
-object_gs
-object_ps
-object_bwall
-object_crow
-object_cow
-object_cob
-object_gi_sword_1
-object_door_killer
-object_ouke_haka
-object_timeblock
-object_zl4
-g_pn_01
-g_pn_02
-g_pn_03
-g_pn_04
-g_pn_05
-g_pn_06
-g_pn_07
-g_pn_08
-g_pn_09
-g_pn_10
-g_pn_11
-g_pn_12
-g_pn_13
-g_pn_14
-g_pn_15
-g_pn_16
-g_pn_17
-g_pn_18
-g_pn_19
-g_pn_20
-g_pn_21
-g_pn_22
-g_pn_23
-g_pn_24
-g_pn_25
-g_pn_26
-g_pn_27
-g_pn_28
-g_pn_29
-g_pn_30
-g_pn_31
-g_pn_32
-g_pn_33
-g_pn_34
-g_pn_35
-g_pn_36
-g_pn_37
-g_pn_38
-g_pn_39
-g_pn_40
-g_pn_41
-g_pn_42
-g_pn_43
-g_pn_44
-g_pn_45
-g_pn_46
-g_pn_47
-g_pn_48
-g_pn_49
-g_pn_50
-g_pn_51
-g_pn_52
-g_pn_53
-g_pn_54
-g_pn_55
-g_pn_56
-g_pn_57
-z_select_static
-nintendo_rogo_static
-title_static
-parameter_static
-vr_fine0_static
-vr_fine0_pal_static
-vr_fine1_static
-vr_fine1_pal_static
-vr_fine2_static
-vr_fine2_pal_static
-vr_fine3_static
-vr_fine3_pal_static
-vr_cloud0_static
-vr_cloud0_pal_static
-vr_cloud1_static
-vr_cloud1_pal_static
-vr_cloud2_static
-vr_cloud2_pal_static
-vr_cloud3_static
-vr_cloud3_pal_static
-vr_holy0_static
-vr_holy0_pal_static
-vr_holy1_static
-vr_holy1_pal_static
-vr_MDVR_static
-vr_MDVR_pal_static
-vr_MNVR_static
-vr_MNVR_pal_static
-vr_RUVR_static
-vr_RUVR_pal_static
-vr_LHVR_static
-vr_LHVR_pal_static
-vr_KHVR_static
-vr_KHVR_pal_static
-vr_K3VR_static
-vr_K3VR_pal_static
-vr_K4VR_static
-vr_K4VR_pal_static
-vr_K5VR_static
-vr_K5VR_pal_static
-vr_SP1a_static
-vr_SP1a_pal_static
-vr_MLVR_static
-vr_MLVR_pal_static
-vr_KKRVR_static
-vr_KKRVR_pal_static
-vr_KR3VR_static
-vr_KR3VR_pal_static
-vr_IPVR_static
-vr_IPVR_pal_static
-vr_KSVR_static
-vr_KSVR_pal_static
-vr_GLVR_static
-vr_GLVR_pal_static
-vr_ZRVR_static
-vr_ZRVR_pal_static
-vr_DGVR_static
-vr_DGVR_pal_static
-vr_ALVR_static
-vr_ALVR_pal_static
-vr_NSVR_static
-vr_NSVR_pal_static
-vr_LBVR_static
-vr_LBVR_pal_static
-vr_TTVR_static
-vr_TTVR_pal_static
-vr_FCVR_static
-vr_FCVR_pal_static
-elf_message_field
-elf_message_ydan
-ddan_scene
-ddan_room_0
-ddan_room_1
-ddan_room_2
-ddan_room_3
-ddan_room_4
-ddan_room_5
-ddan_room_6
-ddan_room_7
-ddan_room_8
-ddan_room_9
-ddan_room_10
-ddan_room_11
-ddan_room_12
-ddan_room_13
-ddan_room_14
-ddan_room_15
-ddan_room_16
-spot00_scene
-spot00_room_0
-spot01_scene
-spot01_room_0
-spot02_scene
-spot02_room_0
-spot02_room_1
-spot03_scene
-spot03_room_0
-spot03_room_1
-spot04_scene
-spot04_room_0
-spot04_room_1
-spot04_room_2
-spot05_scene
-spot05_room_0
-spot06_scene
-spot06_room_0
-spot07_scene
-spot07_room_0
-spot07_room_1
-spot08_scene
-spot08_room_0
-spot09_scene
-spot09_room_0
-spot10_scene
-spot10_room_0
-spot10_room_1
-spot10_room_2
-spot10_room_3
-spot10_room_4
-spot10_room_5
-spot10_room_6
-spot10_room_7
-spot10_room_8
-spot10_room_9
-spot11_scene
-spot11_room_0
-spot12_scene
-spot12_room_0
-spot12_room_1
-spot13_scene
-spot13_room_0
-spot13_room_1
-spot15_scene
-spot15_room_0
-spot16_scene
-spot16_room_0
-spot17_scene
-spot17_room_0
-spot17_room_1
-spot18_scene
-spot18_room_0
-spot18_room_1
-spot18_room_2
-spot18_room_3
-market_day_scene
-market_day_room_0
-market_night_scene
-market_night_room_0
-HIDAN_scene
-HIDAN_room_0
-HIDAN_room_1
-HIDAN_room_2
-HIDAN_room_3
-HIDAN_room_4
-HIDAN_room_5
-HIDAN_room_6
-HIDAN_room_7
-HIDAN_room_8
-HIDAN_room_9
-HIDAN_room_10
-HIDAN_room_11
-HIDAN_room_12
-HIDAN_room_13
-HIDAN_room_14
-HIDAN_room_15
-HIDAN_room_16
-HIDAN_room_17
-HIDAN_room_18
-HIDAN_room_19
-HIDAN_room_20
-HIDAN_room_21
-HIDAN_room_22
-HIDAN_room_23
-HIDAN_room_24
-HIDAN_room_25
-HIDAN_room_26
-Bmori1_scene
-Bmori1_room_0
-Bmori1_room_1
-Bmori1_room_2
-Bmori1_room_3
-Bmori1_room_4
-Bmori1_room_5
-Bmori1_room_6
-Bmori1_room_7
-Bmori1_room_8
-Bmori1_room_9
-Bmori1_room_10
-Bmori1_room_11
-Bmori1_room_12
-Bmori1_room_13
-Bmori1_room_14
-Bmori1_room_15
-Bmori1_room_16
-Bmori1_room_17
-Bmori1_room_18
-Bmori1_room_19
-Bmori1_room_20
-Bmori1_room_21
-Bmori1_room_22
-ydan_scene
-ydan_room_0
-ydan_room_1
-ydan_room_2
-ydan_room_3
-ydan_room_4
-ydan_room_5
-ydan_room_6
-ydan_room_7
-ydan_room_8
-ydan_room_9
-ydan_room_10
-ydan_room_11
-kenjyanoma_scene
-kenjyanoma_room_0
-tokinoma_scene
-tokinoma_room_0
-tokinoma_room_1
-link_home_scene
-link_home_room_0
-kokiri_shop_scene
-kokiri_shop_room_0
-MIZUsin_scene
-MIZUsin_room_0
-MIZUsin_room_1
-MIZUsin_room_2
-MIZUsin_room_3
-MIZUsin_room_4
-MIZUsin_room_5
-MIZUsin_room_6
-MIZUsin_room_7
-MIZUsin_room_8
-MIZUsin_room_9
-MIZUsin_room_10
-MIZUsin_room_11
-MIZUsin_room_12
-MIZUsin_room_13
-MIZUsin_room_14
-MIZUsin_room_15
-MIZUsin_room_16
-MIZUsin_room_17
-MIZUsin_room_18
-MIZUsin_room_19
-MIZUsin_room_20
-MIZUsin_room_21
-MIZUsin_room_22
-kokiri_home_scene
-kokiri_home_room_0
-kakusiana_scene
-kakusiana_room_0
-kakusiana_room_1
-kakusiana_room_2
-kakusiana_room_3
-kakusiana_room_4
-kakusiana_room_5
-kakusiana_room_6
-kakusiana_room_7
-kakusiana_room_8
-kakusiana_room_9
-kakusiana_room_10
-kakusiana_room_11
-kakusiana_room_12
-kakusiana_room_13
-entra_scene
-entra_room_0
-bdan_scene
-bdan_room_0
-bdan_room_1
-bdan_room_2
-bdan_room_3
-bdan_room_4
-bdan_room_5
-bdan_room_6
-bdan_room_7
-bdan_room_8
-bdan_room_9
-bdan_room_10
-bdan_room_11
-bdan_room_12
-bdan_room_13
-bdan_room_14
-bdan_room_15
-HAKAdan_scene
-HAKAdan_room_0
-HAKAdan_room_1
-HAKAdan_room_2
-HAKAdan_room_3
-HAKAdan_room_4
-HAKAdan_room_5
-HAKAdan_room_6
-HAKAdan_room_7
-HAKAdan_room_8
-HAKAdan_room_9
-HAKAdan_room_10
-HAKAdan_room_11
-HAKAdan_room_12
-HAKAdan_room_13
-HAKAdan_room_14
-HAKAdan_room_15
-HAKAdan_room_16
-HAKAdan_room_17
-HAKAdan_room_18
-HAKAdan_room_19
-HAKAdan_room_20
-HAKAdan_room_21
-HAKAdan_room_22
-moribossroom_scene
-moribossroom_room_0
-moribossroom_room_1
-syatekijyou_scene
-syatekijyou_room_0
-men_scene
-men_room_0
-men_room_1
-men_room_2
-men_room_3
-men_room_4
-men_room_5
-men_room_6
-men_room_7
-men_room_8
-men_room_9
-men_room_10
-shop1_scene
-shop1_room_0
-hairal_niwa_scene
-hairal_niwa_room_0
-ganon_tou_scene
-ganon_tou_room_0
-market_alley_scene
-market_alley_room_0
-spot20_scene
-spot20_room_0
-market_ruins_scene
-market_ruins_room_0
-entra_n_scene
-entra_n_room_0
-enrui_scene
-enrui_room_0
-market_alley_n_scene
-market_alley_n_room_0
-hiral_demo_scene
-hiral_demo_room_0
-kokiri_home3_scene
-kokiri_home3_room_0
-jyasinzou_scene
-jyasinzou_room_0
-jyasinzou_room_1
-jyasinzou_room_2
-jyasinzou_room_3
-jyasinzou_room_4
-jyasinzou_room_5
-jyasinzou_room_6
-jyasinzou_room_7
-jyasinzou_room_8
-jyasinzou_room_9
-jyasinzou_room_10
-jyasinzou_room_11
-jyasinzou_room_12
-jyasinzou_room_13
-jyasinzou_room_14
-jyasinzou_room_15
-jyasinzou_room_16
-jyasinzou_room_17
-jyasinzou_room_18
-jyasinzou_room_19
-jyasinzou_room_20
-jyasinzou_room_21
-jyasinzou_room_22
-jyasinzou_room_23
-jyasinzou_room_24
-jyasinzou_room_25
-jyasinzou_room_26
-jyasinzou_room_27
-jyasinzou_room_28
-ice_doukutu_scene
-ice_doukutu_room_0
-ice_doukutu_room_1
-ice_doukutu_room_2
-ice_doukutu_room_3
-ice_doukutu_room_4
-ice_doukutu_room_5
-ice_doukutu_room_6
-ice_doukutu_room_7
-ice_doukutu_room_8
-ice_doukutu_room_9
-ice_doukutu_room_10
-ice_doukutu_room_11
-malon_stable_scene
-malon_stable_room_0
-kakariko_scene
-kakariko_room_0
-bdan_boss_scene
-bdan_boss_room_0
-bdan_boss_room_1
-FIRE_bs_scene
-FIRE_bs_room_0
-FIRE_bs_room_1
-hut_scene
-hut_room_0
-daiyousei_izumi_scene
-daiyousei_izumi_room_0
-hakaana_scene
-hakaana_room_0
-yousei_izumi_tate_scene
-yousei_izumi_tate_room_0
-yousei_izumi_yoko_scene
-yousei_izumi_yoko_room_0
-golon_scene
-golon_room_0
-zoora_scene
-zoora_room_0
-drag_scene
-drag_room_0
-alley_shop_scene
-alley_shop_room_0
-night_shop_scene
-night_shop_room_0
-impa_scene
-impa_room_0
-labo_scene
-labo_room_0
-tent_scene
-tent_room_0
-nakaniwa_scene
-nakaniwa_room_0
-ddan_boss_scene
-ddan_boss_room_0
-ddan_boss_room_1
-ydan_boss_scene
-ydan_boss_room_0
-ydan_boss_room_1
-HAKAdan_bs_scene
-HAKAdan_bs_room_0
-HAKAdan_bs_room_1
-MIZUsin_bs_scene
-MIZUsin_bs_room_0
-MIZUsin_bs_room_1
-ganon_scene
-ganon_room_0
-ganon_room_1
-ganon_room_2
-ganon_room_3
-ganon_room_4
-ganon_room_5
-ganon_room_6
-ganon_room_7
-ganon_room_8
-ganon_room_9
-ganon_boss_scene
-ganon_boss_room_0
-jyasinboss_scene
-jyasinboss_room_0
-jyasinboss_room_1
-jyasinboss_room_2
-jyasinboss_room_3
-kokiri_home4_scene
-kokiri_home4_room_0
-kokiri_home5_scene
-kokiri_home5_room_0
-ganon_final_scene
-ganon_final_room_0
-kakariko3_scene
-kakariko3_room_0
-hakasitarelay_scene
-hakasitarelay_room_0
-hakasitarelay_room_1
-hakasitarelay_room_2
-hakasitarelay_room_3
-hakasitarelay_room_4
-hakasitarelay_room_5
-hakasitarelay_room_6
-shrine_scene
-shrine_room_0
-turibori_scene
-turibori_room_0
-shrine_n_scene
-shrine_n_room_0
-shrine_r_scene
-shrine_r_room_0
-ganontika_scene
-ganontika_room_0
-ganontika_room_1
-ganontika_room_2
-ganontika_room_3
-ganontika_room_4
-ganontika_room_5
-ganontika_room_6
-ganontika_room_7
-ganontika_room_8
-ganontika_room_9
-ganontika_room_10
-ganontika_room_11
-ganontika_room_12
-ganontika_room_13
-ganontika_room_14
-ganontika_room_15
-ganontika_room_16
-ganontika_room_17
-ganontika_room_18
-ganontika_room_19
-hakaana2_scene
-hakaana2_room_0
-gerudoway_scene
-gerudoway_room_0
-gerudoway_room_1
-gerudoway_room_2
-gerudoway_room_3
-gerudoway_room_4
-gerudoway_room_5
-HAKAdanCH_scene
-HAKAdanCH_room_0
-HAKAdanCH_room_1
-HAKAdanCH_room_2
-HAKAdanCH_room_3
-HAKAdanCH_room_4
-HAKAdanCH_room_5
-HAKAdanCH_room_6
-hairal_niwa_n_scene
-hairal_niwa_n_room_0
-bowling_scene
-bowling_room_0
-hakaana_ouke_scene
-hakaana_ouke_room_0
-hakaana_ouke_room_1
-hakaana_ouke_room_2
-hylia_labo_scene
-hylia_labo_room_0
-souko_scene
-souko_room_0
-souko_room_1
-souko_room_2
-miharigoya_scene
-miharigoya_room_0
-mahouya_scene
-mahouya_room_0
-takaraya_scene
-takaraya_room_0
-takaraya_room_1
-takaraya_room_2
-takaraya_room_3
-takaraya_room_4
-takaraya_room_5
-takaraya_room_6
-ganon_sonogo_scene
-ganon_sonogo_room_0
-ganon_sonogo_room_1
-ganon_sonogo_room_2
-ganon_sonogo_room_3
-ganon_sonogo_room_4
-ganon_demo_scene
-ganon_demo_room_0
-face_shop_scene
-face_shop_room_0
-kinsuta_scene
-kinsuta_room_0
-ganontikasonogo_scene
-ganontikasonogo_room_0
-ganontikasonogo_room_1
-bump_texture_static
-anime_model_1_static
-anime_model_2_static
-anime_model_3_static
-anime_model_4_static
-anime_model_5_static
-anime_model_6_static
-anime_texture_1_static
-anime_texture_2_static
-anime_texture_3_static
-anime_texture_4_static
-anime_texture_5_static
-anime_texture_6_static
-softsprite_matrix_static
\ No newline at end of file
diff --git a/Android/app/src/main/assets/assets/extractor/symbols/ActorList_MM.txt b/Android/app/src/main/assets/assets/extractor/symbols/ActorList_MM.txt
deleted file mode 100644
index f899e9afa..000000000
--- a/Android/app/src/main/assets/assets/extractor/symbols/ActorList_MM.txt
+++ /dev/null
@@ -1,691 +0,0 @@
-ACTOR_PLAYER
-ACTOR_EN_TEST
-ACTOR_EN_GIRLA
-ACTOR_EN_PART
-ACTOR_EN_LIGHT
-ACTOR_EN_DOOR
-ACTOR_EN_BOX
-ACTOR_EN_PAMETFROG
-ACTOR_EN_OKUTA
-ACTOR_EN_BOM
-ACTOR_EN_WALLMAS
-ACTOR_EN_DODONGO
-ACTOR_EN_FIREFLY
-ACTOR_EN_HORSE
-ACTOR_EN_ITEM00
-ACTOR_EN_ARROW
-ACTOR_EN_ELF
-ACTOR_EN_NIW
-ACTOR_EN_TITE
-ACTOR_UNSET_13
-ACTOR_EN_PEEHAT
-ACTOR_EN_BUTTE
-ACTOR_EN_INSECT
-ACTOR_EN_FISH
-ACTOR_EN_HOLL
-ACTOR_EN_DINOFOS
-ACTOR_EN_HATA
-ACTOR_EN_ZL1
-ACTOR_EN_VIEWER
-ACTOR_EN_BUBBLE
-ACTOR_DOOR_SHUTTER
-ACTOR_UNSET_1F
-ACTOR_EN_BOOM
-ACTOR_EN_TORCH2
-ACTOR_EN_MINIFROG
-ACTOR_UNSET_23
-ACTOR_EN_ST
-ACTOR_UNSET_25
-ACTOR_EN_A_OBJ
-ACTOR_OBJ_WTURN
-ACTOR_EN_RIVER_SOUND
-ACTOR_UNSET_29
-ACTOR_EN_OSSAN
-ACTOR_UNSET_2B
-ACTOR_UNSET_2C
-ACTOR_EN_FAMOS
-ACTOR_UNSET_2E
-ACTOR_EN_BOMBF
-ACTOR_UNSET_30
-ACTOR_UNSET_31
-ACTOR_EN_AM
-ACTOR_EN_DEKUBABA
-ACTOR_EN_M_FIRE1
-ACTOR_EN_M_THUNDER
-ACTOR_BG_BREAKWALL
-ACTOR_UNSET_37
-ACTOR_DOOR_WARP1
-ACTOR_OBJ_SYOKUDAI
-ACTOR_ITEM_B_HEART
-ACTOR_EN_DEKUNUTS
-ACTOR_EN_BBFALL
-ACTOR_ARMS_HOOK
-ACTOR_EN_BB
-ACTOR_BG_KEIKOKU_SPR
-ACTOR_UNSET_40
-ACTOR_EN_WOOD02
-ACTOR_UNSET_42
-ACTOR_EN_DEATH
-ACTOR_EN_MINIDEATH
-ACTOR_UNSET_45
-ACTOR_UNSET_46
-ACTOR_EN_VM
-ACTOR_DEMO_EFFECT
-ACTOR_DEMO_KANKYO
-ACTOR_EN_FLOORMAS
-ACTOR_UNSET_4B
-ACTOR_EN_RD
-ACTOR_BG_F40_FLIFT
-ACTOR_UNSET_4E
-ACTOR_OBJ_MURE
-ACTOR_EN_SW
-ACTOR_OBJECT_KANKYO
-ACTOR_UNSET_52
-ACTOR_UNSET_53
-ACTOR_EN_HORSE_LINK_CHILD
-ACTOR_DOOR_ANA
-ACTOR_UNSET_56
-ACTOR_UNSET_57
-ACTOR_UNSET_58
-ACTOR_UNSET_59
-ACTOR_UNSET_5A
-ACTOR_EN_ENCOUNT1
-ACTOR_DEMO_TRE_LGT
-ACTOR_UNSET_5D
-ACTOR_UNSET_5E
-ACTOR_EN_ENCOUNT2
-ACTOR_EN_FIRE_ROCK
-ACTOR_BG_CTOWER_ROT
-ACTOR_MIR_RAY
-ACTOR_UNSET_63
-ACTOR_EN_SB
-ACTOR_EN_BIGSLIME
-ACTOR_EN_KAREBABA
-ACTOR_EN_IN
-ACTOR_UNSET_68
-ACTOR_EN_RU
-ACTOR_EN_BOM_CHU
-ACTOR_EN_HORSE_GAME_CHECK
-ACTOR_EN_RR
-ACTOR_UNSET_6D
-ACTOR_UNSET_6E
-ACTOR_UNSET_6F
-ACTOR_UNSET_70
-ACTOR_UNSET_71
-ACTOR_UNSET_72
-ACTOR_EN_FR
-ACTOR_UNSET_74
-ACTOR_UNSET_75
-ACTOR_UNSET_76
-ACTOR_UNSET_77
-ACTOR_UNSET_78
-ACTOR_UNSET_79
-ACTOR_OBJ_OSHIHIKI
-ACTOR_EFF_DUST
-ACTOR_BG_UMAJUMP
-ACTOR_ARROW_FIRE
-ACTOR_ARROW_ICE
-ACTOR_ARROW_LIGHT
-ACTOR_ITEM_ETCETERA
-ACTOR_OBJ_KIBAKO
-ACTOR_OBJ_TSUBO
-ACTOR_UNSET_83
-ACTOR_EN_IK
-ACTOR_UNSET_85
-ACTOR_UNSET_86
-ACTOR_UNSET_87
-ACTOR_UNSET_88
-ACTOR_DEMO_SHD
-ACTOR_EN_DNS
-ACTOR_ELF_MSG
-ACTOR_EN_HONOTRAP
-ACTOR_EN_TUBO_TRAP
-ACTOR_OBJ_ICE_POLY
-ACTOR_EN_FZ
-ACTOR_EN_KUSA
-ACTOR_OBJ_BEAN
-ACTOR_OBJ_BOMBIWA
-ACTOR_OBJ_SWITCH
-ACTOR_UNSET_94
-ACTOR_OBJ_LIFT
-ACTOR_OBJ_HSBLOCK
-ACTOR_EN_OKARINA_TAG
-ACTOR_UNSET_98
-ACTOR_EN_GOROIWA
-ACTOR_UNSET_9A
-ACTOR_UNSET_9B
-ACTOR_EN_DAIKU
-ACTOR_EN_NWC
-ACTOR_ITEM_INBOX
-ACTOR_EN_GE1
-ACTOR_OBJ_BLOCKSTOP
-ACTOR_EN_SDA
-ACTOR_EN_CLEAR_TAG
-ACTOR_UNSET_A3
-ACTOR_EN_GM
-ACTOR_EN_MS
-ACTOR_EN_HS
-ACTOR_BG_INGATE
-ACTOR_EN_KANBAN
-ACTOR_UNSET_A9
-ACTOR_EN_ATTACK_NIW
-ACTOR_UNSET_AB
-ACTOR_UNSET_AC
-ACTOR_UNSET_AD
-ACTOR_EN_MK
-ACTOR_EN_OWL
-ACTOR_EN_ISHI
-ACTOR_OBJ_HANA
-ACTOR_OBJ_LIGHTSWITCH
-ACTOR_OBJ_MURE2
-ACTOR_UNSET_B4
-ACTOR_EN_FU
-ACTOR_UNSET_B6
-ACTOR_UNSET_B7
-ACTOR_EN_STREAM
-ACTOR_EN_MM
-ACTOR_UNSET_BA
-ACTOR_UNSET_BB
-ACTOR_EN_WEATHER_TAG
-ACTOR_EN_ANI
-ACTOR_UNSET_BE
-ACTOR_EN_JS
-ACTOR_UNSET_C0
-ACTOR_UNSET_C1
-ACTOR_UNSET_C2
-ACTOR_UNSET_C3
-ACTOR_EN_OKARINA_EFFECT
-ACTOR_EN_MAG
-ACTOR_ELF_MSG2
-ACTOR_BG_F40_SWLIFT
-ACTOR_UNSET_C8
-ACTOR_UNSET_C9
-ACTOR_EN_KAKASI
-ACTOR_OBJ_MAKEOSHIHIKI
-ACTOR_OCEFF_SPOT
-ACTOR_UNSET_CD
-ACTOR_EN_TORCH
-ACTOR_UNSET_CF
-ACTOR_SHOT_SUN
-ACTOR_UNSET_D1
-ACTOR_UNSET_D2
-ACTOR_OBJ_ROOMTIMER
-ACTOR_EN_SSH
-ACTOR_UNSET_D5
-ACTOR_OCEFF_WIPE
-ACTOR_OCEFF_STORM
-ACTOR_OBJ_DEMO
-ACTOR_EN_MINISLIME
-ACTOR_EN_NUTSBALL
-ACTOR_UNSET_DB
-ACTOR_UNSET_DC
-ACTOR_UNSET_DD
-ACTOR_UNSET_DE
-ACTOR_OCEFF_WIPE2
-ACTOR_OCEFF_WIPE3
-ACTOR_UNSET_E1
-ACTOR_EN_DG
-ACTOR_EN_SI
-ACTOR_OBJ_COMB
-ACTOR_OBJ_KIBAKO2
-ACTOR_UNSET_E6
-ACTOR_EN_HS2
-ACTOR_OBJ_MURE3
-ACTOR_EN_TG
-ACTOR_UNSET_EA
-ACTOR_UNSET_EB
-ACTOR_EN_WF
-ACTOR_EN_SKB
-ACTOR_UNSET_EE
-ACTOR_EN_GS
-ACTOR_OBJ_SOUND
-ACTOR_EN_CROW
-ACTOR_UNSET_F2
-ACTOR_EN_COW
-ACTOR_UNSET_F4
-ACTOR_UNSET_F5
-ACTOR_OCEFF_WIPE4
-ACTOR_UNSET_F7
-ACTOR_EN_ZO
-ACTOR_OBJ_MAKEKINSUTA
-ACTOR_EN_GE3
-ACTOR_UNSET_FB
-ACTOR_OBJ_HAMISHI
-ACTOR_EN_ZL4
-ACTOR_EN_MM2
-ACTOR_UNSET_FF
-ACTOR_DOOR_SPIRAL
-ACTOR_UNSET_101
-ACTOR_OBJ_PZLBLOCK
-ACTOR_OBJ_TOGE
-ACTOR_UNSET_104
-ACTOR_OBJ_ARMOS
-ACTOR_OBJ_BOYO
-ACTOR_UNSET_107
-ACTOR_UNSET_108
-ACTOR_EN_GRASSHOPPER
-ACTOR_UNSET_10A
-ACTOR_OBJ_GRASS
-ACTOR_OBJ_GRASS_CARRY
-ACTOR_OBJ_GRASS_UNIT
-ACTOR_UNSET_10E
-ACTOR_UNSET_10F
-ACTOR_BG_FIRE_WALL
-ACTOR_EN_BU
-ACTOR_EN_ENCOUNT3
-ACTOR_EN_JSO
-ACTOR_OBJ_CHIKUWA
-ACTOR_EN_KNIGHT
-ACTOR_EN_WARP_TAG
-ACTOR_EN_AOB_01
-ACTOR_EN_BOJ_01
-ACTOR_EN_BOJ_02
-ACTOR_EN_BOJ_03
-ACTOR_EN_ENCOUNT4
-ACTOR_EN_BOM_BOWL_MAN
-ACTOR_EN_SYATEKI_MAN
-ACTOR_UNSET_11E
-ACTOR_BG_ICICLE
-ACTOR_EN_SYATEKI_CROW
-ACTOR_EN_BOJ_04
-ACTOR_EN_CNE_01
-ACTOR_EN_BBA_01
-ACTOR_EN_BJI_01
-ACTOR_BG_SPDWEB
-ACTOR_UNSET_126
-ACTOR_UNSET_127
-ACTOR_EN_MT_TAG
-ACTOR_BOSS_01
-ACTOR_BOSS_02
-ACTOR_BOSS_03
-ACTOR_BOSS_04
-ACTOR_BOSS_05
-ACTOR_BOSS_06
-ACTOR_BOSS_07
-ACTOR_BG_DY_YOSEIZO
-ACTOR_UNSET_131
-ACTOR_EN_BOJ_05
-ACTOR_UNSET_133
-ACTOR_UNSET_134
-ACTOR_EN_SOB1
-ACTOR_UNSET_136
-ACTOR_UNSET_137
-ACTOR_EN_GO
-ACTOR_UNSET_139
-ACTOR_EN_RAF
-ACTOR_OBJ_FUNEN
-ACTOR_OBJ_RAILLIFT
-ACTOR_BG_NUMA_HANA
-ACTOR_OBJ_FLOWERPOT
-ACTOR_OBJ_SPINYROLL
-ACTOR_DM_HINA
-ACTOR_EN_SYATEKI_WF
-ACTOR_OBJ_SKATEBLOCK
-ACTOR_OBJ_ICEBLOCK
-ACTOR_EN_BIGPAMET
-ACTOR_EN_SYATEKI_DEKUNUTS
-ACTOR_ELF_MSG3
-ACTOR_EN_FG
-ACTOR_DM_RAVINE
-ACTOR_DM_SA
-ACTOR_EN_SLIME
-ACTOR_EN_PR
-ACTOR_OBJ_TOUDAI
-ACTOR_OBJ_ENTOTU
-ACTOR_OBJ_BELL
-ACTOR_EN_SYATEKI_OKUTA
-ACTOR_UNSET_150
-ACTOR_OBJ_SHUTTER
-ACTOR_DM_ZL
-ACTOR_EN_ELFGRP
-ACTOR_DM_TSG
-ACTOR_EN_BAGUO
-ACTOR_OBJ_VSPINYROLL
-ACTOR_OBJ_SMORK
-ACTOR_EN_TEST2
-ACTOR_EN_TEST3
-ACTOR_EN_TEST4
-ACTOR_EN_BAT
-ACTOR_EN_SEKIHI
-ACTOR_EN_WIZ
-ACTOR_EN_WIZ_BROCK
-ACTOR_EN_WIZ_FIRE
-ACTOR_EFF_CHANGE
-ACTOR_DM_STATUE
-ACTOR_OBJ_FIRESHIELD
-ACTOR_BG_LADDER
-ACTOR_EN_MKK
-ACTOR_DEMO_GETITEM
-ACTOR_UNSET_166
-ACTOR_EN_DNB
-ACTOR_EN_DNH
-ACTOR_EN_DNK
-ACTOR_EN_DNQ
-ACTOR_UNSET_16B
-ACTOR_BG_KEIKOKU_SAKU
-ACTOR_OBJ_HUGEBOMBIWA
-ACTOR_EN_FIREFLY2
-ACTOR_EN_RAT
-ACTOR_EN_WATER_EFFECT
-ACTOR_EN_KUSA2
-ACTOR_BG_SPOUT_FIRE
-ACTOR_UNSET_173
-ACTOR_BG_DBLUE_MOVEBG
-ACTOR_EN_DY_EXTRA
-ACTOR_EN_BAL
-ACTOR_EN_GINKO_MAN
-ACTOR_EN_WARP_UZU
-ACTOR_OBJ_DRIFTICE
-ACTOR_EN_LOOK_NUTS
-ACTOR_EN_MUSHI2
-ACTOR_EN_FALL
-ACTOR_EN_MM3
-ACTOR_BG_CRACE_MOVEBG
-ACTOR_EN_DNO
-ACTOR_EN_PR2
-ACTOR_EN_PRZ
-ACTOR_EN_JSO2
-ACTOR_OBJ_ETCETERA
-ACTOR_EN_EGOL
-ACTOR_OBJ_MINE
-ACTOR_OBJ_PURIFY
-ACTOR_EN_TRU
-ACTOR_EN_TRT
-ACTOR_UNSET_189
-ACTOR_UNSET_18A
-ACTOR_EN_TEST5
-ACTOR_EN_TEST6
-ACTOR_EN_AZ
-ACTOR_EN_ESTONE
-ACTOR_BG_HAKUGIN_POST
-ACTOR_DM_OPSTAGE
-ACTOR_DM_STK
-ACTOR_DM_CHAR00
-ACTOR_DM_CHAR01
-ACTOR_DM_CHAR02
-ACTOR_DM_CHAR03
-ACTOR_DM_CHAR04
-ACTOR_DM_CHAR05
-ACTOR_DM_CHAR06
-ACTOR_DM_CHAR07
-ACTOR_DM_CHAR08
-ACTOR_DM_CHAR09
-ACTOR_OBJ_TOKEIDAI
-ACTOR_UNSET_19D
-ACTOR_EN_MNK
-ACTOR_EN_EGBLOCK
-ACTOR_EN_GUARD_NUTS
-ACTOR_BG_HAKUGIN_BOMBWALL
-ACTOR_OBJ_TOKEI_TOBIRA
-ACTOR_BG_HAKUGIN_ELVPOLE
-ACTOR_EN_MA4
-ACTOR_EN_TWIG
-ACTOR_EN_PO_FUSEN
-ACTOR_EN_DOOR_ETC
-ACTOR_EN_BIGOKUTA
-ACTOR_BG_ICEFLOE
-ACTOR_OBJ_OCARINALIFT
-ACTOR_EN_TIME_TAG
-ACTOR_BG_OPEN_SHUTTER
-ACTOR_BG_OPEN_SPOT
-ACTOR_BG_FU_KAITEN
-ACTOR_OBJ_AQUA
-ACTOR_EN_ELFORG
-ACTOR_EN_ELFBUB
-ACTOR_UNSET_1B2
-ACTOR_EN_FU_MATO
-ACTOR_EN_FU_KAGO
-ACTOR_EN_OSN
-ACTOR_BG_CTOWER_GEAR
-ACTOR_EN_TRT2
-ACTOR_OBJ_TOKEI_STEP
-ACTOR_BG_LOTUS
-ACTOR_EN_KAME
-ACTOR_OBJ_TAKARAYA_WALL
-ACTOR_BG_FU_MIZU
-ACTOR_EN_SELLNUTS
-ACTOR_BG_DKJAIL_IVY
-ACTOR_UNSET_1BF
-ACTOR_OBJ_VISIBLOCK
-ACTOR_EN_TAKARAYA
-ACTOR_EN_TSN
-ACTOR_EN_DS2N
-ACTOR_EN_FSN
-ACTOR_EN_SHN
-ACTOR_UNSET_1C6
-ACTOR_EN_STOP_HEISHI
-ACTOR_OBJ_BIGICICLE
-ACTOR_EN_LIFT_NUTS
-ACTOR_EN_TK
-ACTOR_UNSET_1CB
-ACTOR_BG_MARKET_STEP
-ACTOR_OBJ_LUPYGAMELIFT
-ACTOR_EN_TEST7
-ACTOR_OBJ_LIGHTBLOCK
-ACTOR_MIR_RAY2
-ACTOR_EN_WDHAND
-ACTOR_EN_GAMELUPY
-ACTOR_BG_DANPEI_MOVEBG
-ACTOR_EN_SNOWWD
-ACTOR_EN_PM
-ACTOR_EN_GAKUFU
-ACTOR_ELF_MSG4
-ACTOR_ELF_MSG5
-ACTOR_EN_COL_MAN
-ACTOR_EN_TALK_GIBUD
-ACTOR_EN_GIANT
-ACTOR_OBJ_SNOWBALL
-ACTOR_BOSS_HAKUGIN
-ACTOR_EN_GB2
-ACTOR_EN_ONPUMAN
-ACTOR_BG_TOBIRA01
-ACTOR_EN_TAG_OBJ
-ACTOR_OBJ_DHOUSE
-ACTOR_OBJ_HAKAISI
-ACTOR_BG_HAKUGIN_SWITCH
-ACTOR_UNSET_1E5
-ACTOR_EN_SNOWMAN
-ACTOR_TG_SW
-ACTOR_EN_PO_SISTERS
-ACTOR_EN_PP
-ACTOR_EN_HAKUROCK
-ACTOR_EN_HANABI
-ACTOR_OBJ_DOWSING
-ACTOR_OBJ_WIND
-ACTOR_EN_RACEDOG
-ACTOR_EN_KENDO_JS
-ACTOR_BG_BOTIHASIRA
-ACTOR_EN_FISH2
-ACTOR_EN_PST
-ACTOR_EN_POH
-ACTOR_OBJ_SPIDERTENT
-ACTOR_EN_ZORAEGG
-ACTOR_EN_KBT
-ACTOR_EN_GG
-ACTOR_EN_MARUTA
-ACTOR_OBJ_SNOWBALL2
-ACTOR_EN_GG2
-ACTOR_OBJ_GHAKA
-ACTOR_EN_DNP
-ACTOR_EN_DAI
-ACTOR_BG_GORON_OYU
-ACTOR_EN_KGY
-ACTOR_EN_INVADEPOH
-ACTOR_EN_GK
-ACTOR_EN_AN
-ACTOR_UNSET_203
-ACTOR_EN_BEE
-ACTOR_EN_OT
-ACTOR_EN_DRAGON
-ACTOR_OBJ_DORA
-ACTOR_EN_BIGPO
-ACTOR_OBJ_KENDO_KANBAN
-ACTOR_OBJ_HARIKO
-ACTOR_EN_STH
-ACTOR_BG_SINKAI_KABE
-ACTOR_BG_HAKA_CURTAIN
-ACTOR_BG_KIN2_BOMBWALL
-ACTOR_BG_KIN2_FENCE
-ACTOR_BG_KIN2_PICTURE
-ACTOR_BG_KIN2_SHELF
-ACTOR_EN_RAIL_SKB
-ACTOR_EN_JG
-ACTOR_EN_TRU_MT
-ACTOR_OBJ_UM
-ACTOR_EN_NEO_REEBA
-ACTOR_BG_MBAR_CHAIR
-ACTOR_BG_IKANA_BLOCK
-ACTOR_BG_IKANA_MIRROR
-ACTOR_BG_IKANA_ROTARYROOM
-ACTOR_BG_DBLUE_BALANCE
-ACTOR_BG_DBLUE_WATERFALL
-ACTOR_EN_KAIZOKU
-ACTOR_EN_GE2
-ACTOR_EN_MA_YTS
-ACTOR_EN_MA_YTO
-ACTOR_OBJ_TOKEI_TURRET
-ACTOR_BG_DBLUE_ELEVATOR
-ACTOR_OBJ_WARPSTONE
-ACTOR_EN_ZOG
-ACTOR_OBJ_ROTLIFT
-ACTOR_OBJ_JG_GAKKI
-ACTOR_BG_INIBS_MOVEBG
-ACTOR_EN_ZOT
-ACTOR_OBJ_TREE
-ACTOR_OBJ_Y2LIFT
-ACTOR_OBJ_Y2SHUTTER
-ACTOR_OBJ_BOAT
-ACTOR_OBJ_TARU
-ACTOR_OBJ_HUNSUI
-ACTOR_EN_JC_MATO
-ACTOR_MIR_RAY3
-ACTOR_EN_ZOB
-ACTOR_ELF_MSG6
-ACTOR_OBJ_NOZOKI
-ACTOR_EN_TOTO
-ACTOR_EN_RAILGIBUD
-ACTOR_EN_BABA
-ACTOR_EN_SUTTARI
-ACTOR_EN_ZOD
-ACTOR_EN_KUJIYA
-ACTOR_EN_GEG
-ACTOR_OBJ_KINOKO
-ACTOR_OBJ_YASI
-ACTOR_EN_TANRON1
-ACTOR_EN_TANRON2
-ACTOR_EN_TANRON3
-ACTOR_OBJ_CHAN
-ACTOR_EN_ZOS
-ACTOR_EN_S_GORO
-ACTOR_EN_NB
-ACTOR_EN_JA
-ACTOR_BG_F40_BLOCK
-ACTOR_BG_F40_SWITCH
-ACTOR_EN_PO_COMPOSER
-ACTOR_EN_GURUGURU
-ACTOR_OCEFF_WIPE5
-ACTOR_EN_STONE_HEISHI
-ACTOR_OCEFF_WIPE6
-ACTOR_EN_SCOPENUTS
-ACTOR_EN_SCOPECROW
-ACTOR_OCEFF_WIPE7
-ACTOR_EFF_KAMEJIMA_WAVE
-ACTOR_EN_HG
-ACTOR_EN_HGO
-ACTOR_EN_ZOV
-ACTOR_EN_AH
-ACTOR_OBJ_HGDOOR
-ACTOR_BG_IKANA_BOMBWALL
-ACTOR_BG_IKANA_RAY
-ACTOR_BG_IKANA_SHUTTER
-ACTOR_BG_HAKA_BOMBWALL
-ACTOR_BG_HAKA_TOMB
-ACTOR_EN_SC_RUPPE
-ACTOR_BG_IKNV_DOUKUTU
-ACTOR_BG_IKNV_OBJ
-ACTOR_EN_PAMERA
-ACTOR_OBJ_HSSTUMP
-ACTOR_EN_HIDDEN_NUTS
-ACTOR_EN_ZOW
-ACTOR_EN_TALK
-ACTOR_EN_AL
-ACTOR_EN_TAB
-ACTOR_EN_NIMOTSU
-ACTOR_EN_HIT_TAG
-ACTOR_EN_RUPPECROW
-ACTOR_EN_TANRON4
-ACTOR_EN_TANRON5
-ACTOR_EN_TANRON6
-ACTOR_EN_DAIKU2
-ACTOR_EN_MUTO
-ACTOR_EN_BAISEN
-ACTOR_EN_HEISHI
-ACTOR_EN_DEMO_HEISHI
-ACTOR_EN_DT
-ACTOR_EN_CHA
-ACTOR_OBJ_DINNER
-ACTOR_EFF_LASTDAY
-ACTOR_BG_IKANA_DHARMA
-ACTOR_EN_AKINDONUTS
-ACTOR_EFF_STK
-ACTOR_EN_IG
-ACTOR_EN_RG
-ACTOR_EN_OSK
-ACTOR_EN_STH2
-ACTOR_EN_YB
-ACTOR_EN_RZ
-ACTOR_EN_SCOPECOIN
-ACTOR_EN_BJT
-ACTOR_EN_BOMJIMA
-ACTOR_EN_BOMJIMB
-ACTOR_EN_BOMBERS
-ACTOR_EN_BOMBERS2
-ACTOR_EN_BOMBAL
-ACTOR_OBJ_MOON_STONE
-ACTOR_OBJ_MU_PICT
-ACTOR_BG_IKNINSIDE
-ACTOR_EFF_ZORABAND
-ACTOR_OBJ_KEPN_KOYA
-ACTOR_OBJ_USIYANE
-ACTOR_EN_NNH
-ACTOR_OBJ_KZSAKU
-ACTOR_OBJ_MILK_BIN
-ACTOR_EN_KITAN
-ACTOR_BG_ASTR_BOMBWALL
-ACTOR_BG_IKNIN_SUSCEIL
-ACTOR_EN_BSB
-ACTOR_EN_RECEPGIRL
-ACTOR_EN_THIEFBIRD
-ACTOR_EN_JGAME_TSN
-ACTOR_OBJ_JGAME_LIGHT
-ACTOR_OBJ_YADO
-ACTOR_DEMO_SYOTEN
-ACTOR_DEMO_MOONEND
-ACTOR_BG_LBFSHOT
-ACTOR_BG_LAST_BWALL
-ACTOR_EN_AND
-ACTOR_EN_INVADEPOH_DEMO
-ACTOR_OBJ_DANPEILIFT
-ACTOR_EN_FALL2
-ACTOR_DM_AL
-ACTOR_DM_AN
-ACTOR_DM_AH
-ACTOR_DM_NB
-ACTOR_EN_DRS
-ACTOR_EN_ENDING_HERO
-ACTOR_DM_BAL
-ACTOR_EN_PAPER
-ACTOR_EN_HINT_SKB
-ACTOR_DM_TAG
-ACTOR_EN_BH
-ACTOR_EN_ENDING_HERO2
-ACTOR_EN_ENDING_HERO3
-ACTOR_EN_ENDING_HERO4
-ACTOR_EN_ENDING_HERO5
-ACTOR_EN_ENDING_HERO6
-ACTOR_DM_GM
-ACTOR_OBJ_SWPRIZE
-ACTOR_EN_INVISIBLE_RUPPE
-ACTOR_OBJ_ENDING
-ACTOR_EN_RSN
-ACTOR_ID_MAX
\ No newline at end of file
diff --git a/Android/app/src/main/assets/assets/extractor/symbols/ObjectList_MM.txt b/Android/app/src/main/assets/assets/extractor/symbols/ObjectList_MM.txt
deleted file mode 100644
index 93c17e298..000000000
--- a/Android/app/src/main/assets/assets/extractor/symbols/ObjectList_MM.txt
+++ /dev/null
@@ -1,643 +0,0 @@
-OBJECT_UNSET_0
-GAMEPLAY_KEEP
-GAMEPLAY_FIELD_KEEP
-GAMEPLAY_DANGEON_KEEP
-OBJECT_NB
-OBJECT_OKUTA
-OBJECT_CROW
-OBJECT_AH
-OBJECT_DY_OBJ
-OBJECT_WALLMASTER
-OBJECT_DODONGO
-OBJECT_FIREFLY
-OBJECT_BOX
-OBJECT_AL
-OBJECT_BUBBLE
-OBJECT_NIW
-OBJECT_LINK_BOY
-OBJECT_LINK_CHILD
-OBJECT_TITE
-OBJECT_TAB
-OBJECT_PH
-OBJECT_AND
-OBJECT_MSMO
-OBJECT_DINOFOS
-OBJECT_DRS
-OBJECT_ZL1
-OBJECT_AN4
-OBJECT_UNSET_1B
-OBJECT_TEST3
-OBJECT_FAMOS
-OBJECT_UNSET_1E
-OBJECT_UNSET_1F
-OBJECT_ST
-OBJECT_UNSET_21
-OBJECT_THIEFBIRD
-OBJECT_UNSET_23
-OBJECT_UNSET_24
-OBJECT_UNSET_25
-OBJECT_UNSET_26
-OBJECT_UNSET_27
-OBJECT_UNSET_28
-OBJECT_UNSET_29
-OBJECT_BOMBF
-OBJECT_UNSET_2B
-OBJECT_UNSET_2C
-OBJECT_UNSET_2D
-OBJECT_UNSET_2E
-OBJECT_UNSET_2F
-OBJECT_AM
-OBJECT_DEKUBABA
-OBJECT_UNSET_32
-OBJECT_UNSET_33
-OBJECT_UNSET_34
-OBJECT_UNSET_35
-OBJECT_UNSET_36
-OBJECT_UNSET_37
-OBJECT_UNSET_38
-OBJECT_UNSET_39
-OBJECT_UNSET_3A
-OBJECT_UNSET_3B
-OBJECT_UNSET_3C
-OBJECT_UNSET_3D
-OBJECT_WARP1
-OBJECT_B_HEART
-OBJECT_DEKUNUTS
-OBJECT_UNSET_41
-OBJECT_UNSET_42
-OBJECT_UNSET_43
-OBJECT_UNSET_44
-OBJECT_UNSET_45
-OBJECT_UNSET_46
-OBJECT_UNSET_47
-OBJECT_UNSET_48
-OBJECT_UNSET_49
-OBJECT_UNSET_4A
-OBJECT_UNSET_4B
-OBJECT_UNSET_4C
-OBJECT_UNSET_4D
-OBJECT_UNSET_4E
-OBJECT_UNSET_4F
-OBJECT_UNSET_50
-OBJECT_BB
-OBJECT_DEATH
-OBJECT_UNSET_53
-OBJECT_UNSET_54
-OBJECT_UNSET_55
-OBJECT_UNSET_56
-OBJECT_UNSET_57
-OBJECT_UNSET_58
-OBJECT_UNSET_59
-OBJECT_UNSET_5A
-OBJECT_UNSET_5B
-OBJECT_F40_OBJ
-OBJECT_PO_COMPOSER
-OBJECT_UNSET_5E
-OBJECT_HATA
-OBJECT_UNSET_60
-OBJECT_WOOD02
-OBJECT_UNSET_62
-OBJECT_UNSET_63
-OBJECT_TRAP
-OBJECT_UNSET_65
-OBJECT_UNSET_66
-OBJECT_UNSET_67
-OBJECT_UNSET_68
-OBJECT_UNSET_69
-OBJECT_VM
-OBJECT_UNSET_6B
-OBJECT_UNSET_6C
-OBJECT_UNSET_6D
-OBJECT_UNSET_6E
-OBJECT_UNSET_6F
-OBJECT_EFC_STAR_FIELD
-OBJECT_UNSET_71
-OBJECT_UNSET_72
-OBJECT_UNSET_73
-OBJECT_UNSET_74
-OBJECT_RD
-OBJECT_YUKIMURA_OBJ
-OBJECT_HEAVY_OBJECT
-OBJECT_UNSET_78
-OBJECT_UNSET_79
-OBJECT_UNSET_7A
-OBJECT_UNSET_7B
-OBJECT_UNSET_7C
-OBJECT_HORSE_LINK_CHILD
-OBJECT_UNSET_7E
-OBJECT_UNSET_7F
-OBJECT_SYOKUDAI
-OBJECT_UNSET_81
-OBJECT_UNSET_82
-OBJECT_UNSET_83
-OBJECT_EFC_TW
-OBJECT_UNSET_85
-OBJECT_GI_KEY
-OBJECT_MIR_RAY
-OBJECT_CTOWER_ROT
-OBJECT_UNSET_89
-OBJECT_BDOOR
-OBJECT_UNSET_8B
-OBJECT_UNSET_8C
-OBJECT_UNSET_8D
-OBJECT_SB
-OBJECT_GI_MELODY
-OBJECT_GI_HEART
-OBJECT_GI_COMPASS
-OBJECT_GI_BOSSKEY
-OBJECT_UNSET_93
-OBJECT_GI_NUTS
-OBJECT_UNSET_95
-OBJECT_GI_HEARTS
-OBJECT_GI_ARROWCASE
-OBJECT_GI_BOMBPOUCH
-OBJECT_IN
-OBJECT_UNSET_9A
-OBJECT_UNSET_9B
-OBJECT_UNSET_9C
-OBJECT_OS_ANIME
-OBJECT_GI_BOTTLE
-OBJECT_GI_STICK
-OBJECT_GI_MAP
-OBJECT_OF1D_MAP
-OBJECT_RU2
-OBJECT_UNSET_A3
-OBJECT_GI_MAGICPOT
-OBJECT_GI_BOMB_1
-OBJECT_UNSET_A6
-OBJECT_MA2
-OBJECT_GI_PURSE
-OBJECT_UNSET_A9
-OBJECT_UNSET_AA
-OBJECT_RR
-OBJECT_UNSET_AC
-OBJECT_UNSET_AD
-OBJECT_UNSET_AE
-OBJECT_GI_ARROW
-OBJECT_GI_BOMB_2
-OBJECT_UNSET_B1
-OBJECT_UNSET_B2
-OBJECT_GI_SHIELD_2
-OBJECT_GI_HOOKSHOT
-OBJECT_GI_OCARINA
-OBJECT_GI_MILK
-OBJECT_MA1
-OBJECT_UNSET_B8
-OBJECT_UNSET_B9
-OBJECT_UNSET_BA
-OBJECT_NY
-OBJECT_FR
-OBJECT_UNSET_BD
-OBJECT_UNSET_BE
-OBJECT_GI_BOW
-OBJECT_GI_GLASSES
-OBJECT_GI_LIQUID
-OBJECT_ANI
-OBJECT_GI_SHIELD_3
-OBJECT_UNSET_C4
-OBJECT_UNSET_C5
-OBJECT_GI_BEAN
-OBJECT_GI_FISH
-OBJECT_UNSET_C8
-OBJECT_UNSET_C9
-OBJECT_UNSET_CA
-OBJECT_GI_LONGSWORD
-OBJECT_UNSET_CC
-OBJECT_UNSET_CD
-OBJECT_UNSET_CE
-OBJECT_UNSET_CF
-OBJECT_ZO
-OBJECT_UNSET_D1
-OBJECT_UMAJUMP
-OBJECT_UNSET_D3
-OBJECT_UNSET_D4
-OBJECT_MASTERGOLON
-OBJECT_MASTERZOORA
-OBJECT_AOB
-OBJECT_IK
-OBJECT_AHG
-OBJECT_CNE
-OBJECT_UNSET_DB
-OBJECT_UNSET_DC
-OBJECT_AN3
-OBJECT_BJI
-OBJECT_BBA
-OBJECT_AN2
-OBJECT_UNSET_E1
-OBJECT_AN1
-OBJECT_BOJ
-OBJECT_FZ
-OBJECT_BOB
-OBJECT_GE1
-OBJECT_YABUSAME_POINT
-OBJECT_UNSET_E8
-OBJECT_UNSET_E9
-OBJECT_UNSET_EA
-OBJECT_UNSET_EB
-OBJECT_D_HSBLOCK
-OBJECT_D_LIFT
-OBJECT_MAMENOKI
-OBJECT_GOROIWA
-OBJECT_TORYO
-OBJECT_DAIKU
-OBJECT_NWC
-OBJECT_GM
-OBJECT_MS
-OBJECT_HS
-OBJECT_UNSET_F6
-OBJECT_LIGHTSWITCH
-OBJECT_KUSA
-OBJECT_TSUBO
-OBJECT_UNSET_FA
-OBJECT_UNSET_FB
-OBJECT_KANBAN
-OBJECT_OWL
-OBJECT_MK
-OBJECT_FU
-OBJECT_GI_KI_TAN_MASK
-OBJECT_UNSET_101
-OBJECT_GI_MASK18
-OBJECT_GI_RABIT_MASK
-OBJECT_GI_TRUTH_MASK
-OBJECT_UNSET_105
-OBJECT_STREAM
-OBJECT_MM
-OBJECT_UNSET_108
-OBJECT_UNSET_109
-OBJECT_UNSET_10A
-OBJECT_UNSET_10B
-OBJECT_UNSET_10C
-OBJECT_UNSET_10D
-OBJECT_UNSET_10E
-OBJECT_JS
-OBJECT_CS
-OBJECT_UNSET_111
-OBJECT_UNSET_112
-OBJECT_GI_SOLDOUT
-OBJECT_UNSET_114
-OBJECT_MAG
-OBJECT_UNSET_116
-OBJECT_UNSET_117
-OBJECT_UNSET_118
-OBJECT_GI_GOLONMASK
-OBJECT_GI_ZORAMASK
-OBJECT_UNSET_11B
-OBJECT_UNSET_11C
-OBJECT_KA
-OBJECT_UNSET_11E
-OBJECT_ZG
-OBJECT_UNSET_120
-OBJECT_GI_M_ARROW
-OBJECT_DS2
-OBJECT_UNSET_123
-OBJECT_FISH
-OBJECT_GI_SUTARU
-OBJECT_UNSET_126
-OBJECT_SSH
-OBJECT_BIGSLIME
-OBJECT_BG
-OBJECT_BOMBIWA
-OBJECT_HINTNUTS
-OBJECT_RS
-OBJECT_UNSET_12D
-OBJECT_GLA
-OBJECT_UNSET_12F
-OBJECT_GELDB
-OBJECT_UNSET_131
-OBJECT_DOG
-OBJECT_KIBAKO2
-OBJECT_DNS
-OBJECT_DNK
-OBJECT_UNSET_136
-OBJECT_GI_INSECT
-OBJECT_UNSET_138
-OBJECT_GI_GHOST
-OBJECT_GI_SOUL
-OBJECT_UNSET_13B
-OBJECT_UNSET_13C
-OBJECT_UNSET_13D
-OBJECT_UNSET_13E
-OBJECT_GI_RUPY
-OBJECT_MU
-OBJECT_WF
-OBJECT_SKB
-OBJECT_GS
-OBJECT_PS
-OBJECT_OMOYA_OBJ
-OBJECT_COW
-OBJECT_UNSET_147
-OBJECT_GI_SWORD_1
-OBJECT_UNSET_149
-OBJECT_UNSET_14A
-OBJECT_ZL4
-OBJECT_LINK_GORON
-OBJECT_LINK_ZORA
-OBJECT_GRASSHOPPER
-OBJECT_BOYO
-OBJECT_UNSET_150
-OBJECT_UNSET_151
-OBJECT_UNSET_152
-OBJECT_FWALL
-OBJECT_LINK_NUTS
-OBJECT_JSO
-OBJECT_KNIGHT
-OBJECT_ICICLE
-OBJECT_SPDWEB
-OBJECT_UNSET_159
-OBJECT_BOSS01
-OBJECT_BOSS02
-OBJECT_BOSS03
-OBJECT_BOSS04
-OBJECT_BOSS05
-OBJECT_BOSS06
-OBJECT_BOSS07
-OBJECT_RAF
-OBJECT_FUNEN
-OBJECT_RAILLIFT
-OBJECT_NUMA_OBJ
-OBJECT_FLOWERPOT
-OBJECT_SPINYROLL
-OBJECT_ICE_BLOCK
-OBJECT_UNSET_168
-OBJECT_KEIKOKU_DEMO
-OBJECT_SLIME
-OBJECT_PR
-OBJECT_F52_OBJ
-OBJECT_F53_OBJ
-OBJECT_UNSET_16E
-OBJECT_KIBAKO
-OBJECT_SEK
-OBJECT_GMO
-OBJECT_BAT
-OBJECT_SEKIHIL
-OBJECT_SEKIHIG
-OBJECT_SEKIHIN
-OBJECT_SEKIHIZ
-OBJECT_UNSET_177
-OBJECT_WIZ
-OBJECT_LADDER
-OBJECT_MKK
-OBJECT_UNSET_17B
-OBJECT_UNSET_17C
-OBJECT_UNSET_17D
-OBJECT_KEIKOKU_OBJ
-OBJECT_SICHITAI_OBJ
-OBJECT_DEKUCITY_ANA_OBJ
-OBJECT_RAT
-OBJECT_WATER_EFFECT
-OBJECT_UNSET_183
-OBJECT_DBLUE_OBJECT
-OBJECT_BAL
-OBJECT_WARP_UZU
-OBJECT_DRIFTICE
-OBJECT_FALL
-OBJECT_HANAREYAMA_OBJ
-OBJECT_CRACE_OBJECT
-OBJECT_DNO
-OBJECT_OBJ_TOKEIDAI
-OBJECT_EG
-OBJECT_TRU
-OBJECT_TRT
-OBJECT_HAKUGIN_OBJ
-OBJECT_HORSE_GAME_CHECK
-OBJECT_STK
-OBJECT_UNSET_193
-OBJECT_UNSET_194
-OBJECT_MNK
-OBJECT_GI_BOTTLE_RED
-OBJECT_TOKEI_TOBIRA
-OBJECT_AZ
-OBJECT_TWIG
-OBJECT_DEKUCITY_OBJ
-OBJECT_PO_FUSEN
-OBJECT_RACETSUBO
-OBJECT_HA
-OBJECT_BIGOKUTA
-OBJECT_OPEN_OBJ
-OBJECT_FU_KAITEN
-OBJECT_FU_MATO
-OBJECT_MTORIDE
-OBJECT_OSN
-OBJECT_TOKEI_STEP
-OBJECT_LOTUS
-OBJECT_TL
-OBJECT_DKJAIL_OBJ
-OBJECT_VISIBLOCK
-OBJECT_TSN
-OBJECT_DS2N
-OBJECT_FSN
-OBJECT_SHN
-OBJECT_BIGICICLE
-OBJECT_GI_BOTTLE_15
-OBJECT_TK
-OBJECT_MARKET_OBJ
-OBJECT_GI_RESERVE00
-OBJECT_GI_RESERVE01
-OBJECT_LIGHTBLOCK
-OBJECT_TAKARAYA_OBJECTS
-OBJECT_WDHAND
-OBJECT_SDN
-OBJECT_SNOWWD
-OBJECT_GIANT
-OBJECT_COMB
-OBJECT_HANA
-OBJECT_BOSS_HAKUGIN
-OBJECT_MEGANEANA_OBJ
-OBJECT_GI_NUTSMASK
-OBJECT_STK2
-OBJECT_SPOT11_OBJ
-OBJECT_DANPEI_OBJECT
-OBJECT_DHOUSE
-OBJECT_HAKAISI
-OBJECT_PO
-OBJECT_SNOWMAN
-OBJECT_PO_SISTERS
-OBJECT_PP
-OBJECT_GORONSWITCH
-OBJECT_DELF
-OBJECT_BOTIHASIRA
-OBJECT_GI_BIGBOMB
-OBJECT_PST
-OBJECT_BSMASK
-OBJECT_SPIDERTENT
-OBJECT_ZORAEGG
-OBJECT_KBT
-OBJECT_GG
-OBJECT_MARUTA
-OBJECT_GHAKA
-OBJECT_OYU
-OBJECT_DNQ
-OBJECT_DAI
-OBJECT_KGY
-OBJECT_FB
-OBJECT_TAISOU
-OBJECT_MASK_BU_SAN
-OBJECT_MASK_KI_TAN
-OBJECT_MASK_RABIT
-OBJECT_MASK_SKJ
-OBJECT_MASK_BAKURETU
-OBJECT_MASK_TRUTH
-OBJECT_GK
-OBJECT_HAKA_OBJ
-OBJECT_MASK_GORON
-OBJECT_MASK_ZORA
-OBJECT_MASK_NUTS
-OBJECT_MASK_BOY
-OBJECT_DNT
-OBJECT_YUKIYAMA
-OBJECT_ICEFLOE
-OBJECT_GI_GOLD_DUST
-OBJECT_GI_BOTTLE_16
-OBJECT_GI_BOTTLE_22
-OBJECT_BEE
-OBJECT_OT
-OBJECT_UTUBO
-OBJECT_DORA
-OBJECT_GI_LOACH
-OBJECT_GI_SEAHORSE
-OBJECT_BIGPO
-OBJECT_HARIKO
-OBJECT_DNJ
-OBJECT_SINKAI_KABE
-OBJECT_KIN2_OBJ
-OBJECT_ISHI
-OBJECT_HAKUGIN_DEMO
-OBJECT_JG
-OBJECT_GI_SWORD_2
-OBJECT_GI_SWORD_3
-OBJECT_GI_SWORD_4
-OBJECT_UM
-OBJECT_MASK_GIBUDO
-OBJECT_MASK_JSON
-OBJECT_MASK_KERFAY
-OBJECT_MASK_BIGELF
-OBJECT_RB
-OBJECT_MBAR_OBJ
-OBJECT_IKANA_OBJ
-OBJECT_KZ
-OBJECT_TOKEI_TURRET
-OBJECT_ZOG
-OBJECT_ROTLIFT
-OBJECT_POSTHOUSE_OBJ
-OBJECT_GI_MASK09
-OBJECT_GI_MASK14
-OBJECT_GI_MASK15
-OBJECT_INIBS_OBJECT
-OBJECT_TREE
-OBJECT_KAIZOKU_OBJ
-OBJECT_GI_RESERVE_B_00
-OBJECT_GI_RESERVE_C_00
-OBJECT_ZOB
-OBJECT_MILKBAR
-OBJECT_DMASK
-OBJECT_MASK_KYOJIN
-OBJECT_GI_RESERVE_C_01
-OBJECT_ZOD
-OBJECT_KUMO30
-OBJECT_OBJ_YASI
-OBJECT_MASK_ROMERNY
-OBJECT_TANRON1
-OBJECT_TANRON2
-OBJECT_TANRON3
-OBJECT_GI_MAGICMUSHROOM
-OBJECT_OBJ_CHAN
-OBJECT_GI_MASK10
-OBJECT_ZOS
-OBJECT_MASK_POSTHAT
-OBJECT_F40_SWITCH
-OBJECT_LODMOON
-OBJECT_TRO
-OBJECT_GI_MASK12
-OBJECT_GI_MASK23
-OBJECT_GI_BOTTLE_21
-OBJECT_GI_CAMERA
-OBJECT_KAMEJIMA
-OBJECT_HARFGIBUD
-OBJECT_ZOV
-OBJECT_HGDOOR
-OBJECT_UNSET_22D
-OBJECT_UNSET_22E
-OBJECT_UNSET_22F
-OBJECT_DOR01
-OBJECT_DOR02
-OBJECT_DOR03
-OBJECT_DOR04
-OBJECT_LAST_OBJ
-OBJECT_REDEAD_OBJ
-OBJECT_IKNINSIDE_OBJ
-OBJECT_IKNV_OBJ
-OBJECT_PAMERA
-OBJECT_HSSTUMP
-OBJECT_ZM
-OBJECT_BIG_FWALL
-OBJECT_SECOM_OBJ
-OBJECT_HUNSUI
-OBJECT_UCH
-OBJECT_TANRON4
-OBJECT_TANRON5
-OBJECT_DT
-OBJECT_GI_MASK03
-OBJECT_CHA
-OBJECT_OBJ_DINNER
-OBJECT_GI_RESERVE_B_01
-OBJECT_LASTDAY
-OBJECT_BAI
-OBJECT_IN2
-OBJECT_IKN_DEMO
-OBJECT_YB
-OBJECT_RZ
-OBJECT_MASK_ZACHO
-OBJECT_GI_FIELDMAP
-OBJECT_MASK_STONE
-OBJECT_BJT
-OBJECT_TARU
-OBJECT_MOONSTON
-OBJECT_MASK_BREE
-OBJECT_GI_SCHEDULE
-OBJECT_GI_STONEMASK
-OBJECT_ZORABAND
-OBJECT_KEPN_KOYA
-OBJECT_OBJ_USIYANE
-OBJECT_GI_MASK05
-OBJECT_GI_MASK11
-OBJECT_GI_MASK20
-OBJECT_NNH
-OBJECT_MASK_GERO
-OBJECT_MASK_YOFUKASI
-OBJECT_MASK_MEOTO
-OBJECT_MASK_DANCER
-OBJECT_KZSAKU
-OBJECT_OBJ_MILK_BIN
-OBJECT_RANDOM_OBJ
-OBJECT_KUJIYA
-OBJECT_KITAN
-OBJECT_GI_MASK06
-OBJECT_GI_MASK16
-OBJECT_ASTR_OBJ
-OBJECT_BSB
-OBJECT_FALL2
-OBJECT_STH
-OBJECT_GI_MSSA
-OBJECT_SMTOWER
-OBJECT_GI_MASK21
-OBJECT_YADO_OBJ
-OBJECT_SYOTEN
-OBJECT_MOONEND
-OBJECT_OB
-OBJECT_GI_BOTTLE_04
-OBJECT_OBJ_DANPEILIFT
-OBJECT_WDOR01
-OBJECT_WDOR02
-OBJECT_WDOR03
-OBJECT_STK3
-OBJECT_KINSTA1_OBJ
-OBJECT_KINSTA2_OBJ
-OBJECT_BH
-OBJECT_WDOR04
-OBJECT_WDOR05
-OBJECT_GI_MASK17
-OBJECT_GI_MASK22
-OBJECT_LBFSHOT
-OBJECT_FUSEN
-OBJECT_ENDING_OBJ
-OBJECT_GI_MASK13
diff --git a/Android/app/src/main/assets/assets/extractor/symbols/SymbolMap_MM.txt b/Android/app/src/main/assets/assets/extractor/symbols/SymbolMap_MM.txt
deleted file mode 100644
index 2a215dce1..000000000
--- a/Android/app/src/main/assets/assets/extractor/symbols/SymbolMap_MM.txt
+++ /dev/null
@@ -1 +0,0 @@
-801D1DE0 gIdentityMtx
\ No newline at end of file
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/icon_item_24_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/icon_item_24_static.xml
deleted file mode 100644
index 6bc8c740b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/icon_item_24_static.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <File Name="icon_item_24_static_yar" Segment="9">
-        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x0" />
-        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x900" />
-        <Texture Name="gQuestIconPieceOfHeartTex" OutName="piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200" />
-        <!-- Identical to gQuestIconPieceOfHeartTex -->
-        <Texture Name="gQuestIconPieceOfHeart2Tex" OutName="piece_of_heart_2_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00" />
-        <!-- Both identical to gQuestIconHeartContainerTex -->
-        <Texture Name="gQuestIconHeartContainer2Tex" OutName="heart_container_2_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400" />
-        <Texture Name="gQuestIconHeartContainer3Tex" OutName="heart_container_3_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00" />
-        <Texture Name="gQuestIconBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600" />
-        <Texture Name="gQuestIconCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00" />
-        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800" />
-        <!-- Identical to gQuestIconGoldSkulltulaTex -->
-        <Texture Name="gQuestIconGoldSkulltula2Tex" OutName="gold_skulltula_2_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100" />
-        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00" />
-        <Texture Name="gQuestIconSmallMagicJarTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300" />
-        <Texture Name="gQuestIconBigMagicJarTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00" />
-        <Texture Name="gQuestIconLinkHumanFaceTex" OutName="link_human_face_icon" Format="rgba16" Width="16" Height="16" Offset="0x7500"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/icon_item_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/icon_item_static.xml
deleted file mode 100644
index 52cf6a3a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/icon_item_static.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<Root>
-    <File Name="icon_item_static_yar" Segment="8">
-        <!-- Item icons -->
-        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x0000"/>
-        <Texture Name="gItemIconBowTex" OutName="bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
-        <Texture Name="gItemIconFireArrowTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000" />
-        <Texture Name="gItemIconIceArrowTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000" />
-        <Texture Name="gItemIconLightArrowTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000" />
-        <Texture Name="gItemIconFairyOcarinaTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000" />
-        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000" />
-        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000" />
-        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000" />
-        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000" />
-        <Texture Name="gItemIconMagicBeansTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000" />
-        <Texture Name="gItemIconSlingshotTex" OutName="slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000" />
-        <Texture Name="gItemIconPowderKegTex" OutName="powder_keg_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000" />
-        <Texture Name="gItemIconPictographBoxTex" OutName="picto_box_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000" />
-        <Texture Name="gItemIconLensofTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000" />
-        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000" />
-        <Texture Name="gItemIconGreatFairysSwordTex" OutName="great_fairys_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000" />
-        <!-- Visually looks like OoT's Hookshot Icon -->
-        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000" />
-
-        <!-- Bottled item icons -->
-        <Texture Name="gItemIconEmptyBottleTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000" />
-        <Texture Name="gItemIconRedPotionTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000" />
-        <Texture Name="gItemIconGreenPotionTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000" />
-        <Texture Name="gItemIconBluePotionTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000" />
-        <Texture Name="gItemIconBottledFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000" />
-        <Texture Name="gItemIconBottledDekuPrincessTex" OutName="bottled_deku_princess_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000" />
-        <Texture Name="gItemIconBottledFullMilkTex" OutName="bottled_full_milk_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000" />
-        <Texture Name="gItemIconBottledHalfMilkTex" OutName="bottled_half_milk_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000" />
-        <Texture Name="gItemIconBottledFishTex" OutName="bottled_fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000" />
-        <Texture Name="gItemIconBottledBugTex" OutName="bottled_bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000" />
-        <Texture Name="gItemIconBottledBlueFireTex" OutName="bottled_blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000" />
-        <Texture Name="gItemIconBottledPoeTex" OutName="bottled_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000" />
-        <Texture Name="gItemIconBottledBigPoeTex" OutName="bottled_big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000" />
-        <Texture Name="gItemIconSpringWaterTex" OutName="spring_water_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000" />
-        <Texture Name="gItemIconHotSpringWaterTex" OutName="hot_spring_water_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000" />
-        <Texture Name="gItemIconBottledZoraEggTex" OutName="bottled_zora_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000" />
-        <Texture Name="gItemIconBottledGoldDustTex" OutName="bottled_gold_dust_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000" />
-        <Texture Name="gItemIconBottledMushroomTex" OutName="bottled_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000" />
-        <Texture Name="gItemIconBottledSeahorseTex" OutName="bottled_seahorse_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000" />
-        <Texture Name="gItemIconChateauRomaniTex" OutName="chateau_romani_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000" />
-        <Texture Name="gItemIconBottledHylianLoachTex" OutName="bottled_hylian_loach_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000" />
-        <!-- Identical to gItemIconEmptyBottleTex -->
-        <Texture Name="gItemIconEmptyBottle2Tex" OutName="empty_bottle_2_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000" />
-
-        <!-- Trade Quest icons -->
-        <Texture Name="gItemIconLandDeedTex" OutName="land_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000" />
-        <Texture Name="gItemIconMoonsTearTex" OutName="moons_tear_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000" />
-        <Texture Name="gItemIconSwampDeedTex" OutName="swamp_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000" />
-        <Texture Name="gItemIconMountainDeedTex" OutName="mountain_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000" />
-        <Texture Name="gItemIconOceanDeedTex" OutName="ocean_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000" />
-        <Texture Name="gItemIconRoomKeyTex" OutName="room_key_icon" Format="rgba32" Width="32" Height="32" Offset="0x2D000" />
-        <Texture Name="gItemIconLetterToMamaTex" OutName="letter_to_mama_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000" />
-        <Texture Name="gItemIconLetterToKafeiTex" OutName="letter_to_kafei_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000" />
-        <Texture Name="gItemIconPendantOfMemoriesTex" OutName="pendant_of_memories_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000" />
-
-        <Texture Name="gItemIconTingleMapTex" OutName="tingle_map_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000" />
-
-        <!-- Mask icons -->
-        <Texture Name="gItemIconDekuMaskTex" OutName="deku_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000" />
-        <Texture Name="gItemIconGoronMaskTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000" />
-        <Texture Name="gItemIconZoraMaskTex" OutName="zora_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000" />
-        <Texture Name="gItemIconFierceDeityMaskTex" OutName="fierce_deity_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000" />
-        <Texture Name="gItemIconMaskOfTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000" />
-        <Texture Name="gItemIconKafeisMaskTex" OutName="kafeis_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000" />
-        <Texture Name="gItemIconAllNightMaskTex" OutName="all_night_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000" />
-        <Texture Name="gItemIconBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000" />
-        <Texture Name="gItemIconKeatonMaskTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000" />
-        <Texture Name="gItemIconGaroMaskTex" OutName="garo_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000" />
-        <Texture Name="gItemIconRomaniMaskTex" OutName="romani_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000" />
-        <Texture Name="gItemIconCircusLeaderMaskTex" OutName="circus_leader_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000" />
-        <Texture Name="gItemIconPostmansHatTex" OutName="postmans_hat_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000" />
-        <Texture Name="gItemIconCouplesMaskTex" OutName="couples_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000" />
-        <Texture Name="gItemIconGreatFairyMaskTex" OutName="great_fairy_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000" />
-        <Texture Name="gItemIconGibdoMaskTex" OutName="gibdo_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000" />
-        <Texture Name="gItemIconDonGeroMaskTex" OutName="don_gero_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000" />
-        <Texture Name="gItemIconKamaroMaskTex" OutName="kamaro_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000" />
-        <Texture Name="gItemIconCaptainsHatTex" OutName="captains_hat_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000" />
-        <Texture Name="gItemIconStoneMaskTex" OutName="stone_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000" />
-        <Texture Name="gItemIconBremenMaskTex" OutName="bremen_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000" />
-        <Texture Name="gItemIconBlastMaskTex" OutName="blast_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000" />
-        <Texture Name="gItemIconMaskOfScentsTex" OutName="mask_of_scents_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000" />
-        <Texture Name="gItemIconGiantsMaskTex" OutName="giants_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000" />
-
-        <!-- Upgrads/Misc icons -->
-        <Texture Name="gItemIconBowFireTex" OutName="bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000" />
-        <Texture Name="gItemIconBowIceTex" OutName="bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000" />
-        <Texture Name="gItemIconBowLightTex" OutName="bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000" />
-        <Texture Name="gItemIconKokiriSwordTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000" />
-        <Texture Name="gItemIconRazorSwordTex" OutName="razor_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000" />
-        <Texture Name="gItemIconGildedSwordTex" OutName="gilded_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000" />
-        <Texture Name="gItemIconFierceDeitySwordTex" OutName="fierce_deity_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000" />
-        <Texture Name="gItemIconHerosShieldTex" OutName="heros_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000" />
-        <Texture Name="gItemIconMirrorShieldTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000" />
-        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000" />
-        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000" />
-        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000" />
-        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000" />
-        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000" />
-        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000" />
-        <Texture Name="gItemIconDefaultWalletTex" OutName="default_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000" />
-        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x5A000" />
-        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x5B000" />
-        <Texture Name="gItemIconFishingRodTex" OutName="fishing_rod_icon" Format="rgba32" Width="32" Height="32" Offset="0x5C000" />
-        <Texture Name="gItemIconOdolwasRemainsTex" OutName="odolwas_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x5D000" />
-        <Texture Name="gItemIconGohtsRemainsTex" OutName="gohts_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x5E000" />
-        <Texture Name="gItemIconGyorgsRemainsTex" OutName="gyorgs_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x5F000" />
-        <Texture Name="gItemIconTwinmoldsRemainsTex" OutName="twinmolds_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x60000" />
-        <Texture Name="gItemIconBombersNotebookTex" OutName="bombers_notebook_icon" Format="rgba32" Width="32" Height="32" Offset="0x61000" />
-
-        <!-- ia8 icons -->
-        <Texture Name="gItemIconSongNoteTex" OutName="song_note_icon" Format="ia8" Width="16" Height="24" Offset="0x62000" />
-        <Texture Name="gItemIconHeartPiece1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x62180" />
-        <Texture Name="gItemIconHeartPiece2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x62A80" />
-        <Texture Name="gItemIconHeartPiece3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x63380" />
-
-        <!-- Cursors -->
-        <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x63C80"/>
-        <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x64100"/>
-        <Texture Name="gPauseMenuCursorTex" OutName="pause_menu_cursor" Format="ia8" Width="16" Height="16" Offset="0x64340" />
-
-        <!-- Divided Background Menu: First Row -->
-        <Texture Name="gPauseMasks00Tex" OutName="pause_masks_0_0" Format="ia8" Width="80" Height="32" Offset="0x64440" />
-        <Texture Name="gPauseMasks10JPNTex" OutName="pause_masks_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x64E40" />
-        <Texture Name="gPauseMasks20Tex" OutName="pause_masks_2_0" Format="ia8" Width="80" Height="32" Offset="0x65840" />
-        <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x66240" />
-        <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x66C40" />
-        <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x67640" />
-        <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x68040" />
-        <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x68A40" />
-        <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x69440" />
-        <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x69E40" />
-        <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x6A840" />
-        <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x6B240" />
-        <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x6BC40" />
-        <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x6C640" />
-        <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x6D040" />
-        <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x6DA40" />
-
-       <!-- Divided Background Menu: Second Row -->
-        <Texture Name="gPauseMasks01Tex" OutName="pause_masks_0_1" Format="ia8" Width="80" Height="32" Offset="0x6E440" />
-        <Texture Name="gPauseMasks11Tex" OutName="pause_masks_1_1" Format="ia8" Width="80" Height="32" Offset="0x6EE40" />
-        <Texture Name="gPauseMasks21Tex" OutName="pause_masks_2_1" Format="ia8" Width="80" Height="32" Offset="0x6F840" />
-        <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x70240" />
-        <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x70C40" />
-        <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x71640" />
-        <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x72040" />
-        <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x72A40" />
-        <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x73440" />
-        <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x73E40" />
-        <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x74840" />
-        <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x75240" />
-        <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x75C40" />
-        <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x76640" />
-        <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x77040" />
-
-        <!-- Divided Background Menu: Third Row -->
-        <Texture Name="gPauseMasks02Tex" OutName="pause_masks_0_2" Format="ia8" Width="80" Height="32" Offset="0x77A40" />
-        <Texture Name="gPauseMasks12Tex" OutName="pause_masks_1_2" Format="ia8" Width="80" Height="32" Offset="0x78440" />
-        <Texture Name="gPauseMasks22Tex" OutName="pause_masks_2_2" Format="ia8" Width="80" Height="32" Offset="0x78E40" />
-        <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x79840" />
-        <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x7A240" />
-        <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x7AC40" />
-        <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x7B640" />
-        <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x7C040" />
-        <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x7CA40" />
-        <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x7D440" />
-        <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x7DE40" />
-        <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x7E840" />
-        <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x7F240" />
-        <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x7FC40" />
-        <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x80640" />
-
-        <!-- Divided Background Menu: Fourth Row -->
-        <Texture Name="gPauseMasks03Tex" OutName="pause_masks_0_3" Format="ia8" Width="80" Height="32" Offset="0x81040" />
-        <Texture Name="gPauseMasks13Tex" OutName="pause_masks_1_3" Format="ia8" Width="80" Height="32" Offset="0x81A40" />
-        <Texture Name="gPauseMasks23Tex" OutName="pause_masks_2_3" Format="ia8" Width="80" Height="32" Offset="0x82440" />
-        <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x82E40" />
-        <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x83840" />
-        <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x84240" />
-        <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x84C40" />
-        <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x85640" />
-        <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x86040" />
-        <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x86A40" />
-        <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x87440" />
-        <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x87E40" />
-        <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x88840" />
-        <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x89240" />
-        <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x89C40" />
-
-        <!-- Divided Background Menu: Fifth Row -->
-        <Texture Name="gPauseMasks04Tex" OutName="pause_masks_0_4" Format="ia8" Width="80" Height="32" Offset="0x8A640" />
-        <Texture Name="gPauseMasks14Tex" OutName="pause_masks_1_4" Format="ia8" Width="80" Height="32" Offset="0x8B040" />
-        <Texture Name="gPauseMasks24Tex" OutName="pause_masks_2_4" Format="ia8" Width="80" Height="32" Offset="0x8BA40" />
-        <Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x8C440" />
-        <Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x8CE40" />
-        <Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x8D840" />
-        <Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x8E240" />
-        <Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x8EC40" />
-        <Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x8F640" />
-        <Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x90040" />
-        <Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x90A40" />
-        <Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x91440" />
-        <Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x91E40" />
-        <Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x92840" />
-        <Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x93240" />
-
-        <!-- Textures used by display lists extracted from icon_item_vtx_static -->
-        <Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x93C40"/>
-        <Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x93DC0"/>
-        <Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x93F40"/>
-        <Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x94240"/>
-        <Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x94900"/>
-        <Texture Name="gZButtonTex" OutName="z_button" Format="ia8" Width="24" Height="32" Offset="0x94FC0"/>
-        <Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x952C0"/>
-        <!-- unused -->
-        <Texture Name="gShowAMusicalNoteTex" OutName="show_a_musical_note" Format="ia8" Width="80" Height="16" Offset="0x955C0"/>
-        <Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x95AC0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/item_name_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/item_name_static.xml
deleted file mode 100644
index b9ff2a5ee..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/item_name_static.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<Root>
-    <!-- Item Names. Must be ia4 128x16 and ordered following `ItemId` -->
-    <File Name="item_name_static">
-        <!-- Main items -->
-        <Texture Name="gItemNameOcarinaOfTimeENGTex" OutName="item_name_ocarina_of_time_eng" Format="ia4" Width="128" Height="16" Offset="0x0" /> <!-- ITEM_OCARINA_OF_TIME -->
-        <Texture Name="gItemNameHerosBowENGTex" OutName="item_name_heros_bow_eng" Format="ia4" Width="128" Height="16" Offset="0x400" /> <!-- ITEM_BOW -->
-        <Texture Name="gItemNameFireArrowENGTex" OutName="item_name_fire_arrow_eng" Format="ia4" Width="128" Height="16" Offset="0x800" /> <!-- ITEM_ARROW_FIRE -->
-        <Texture Name="gItemNameIceArrowENGTex" OutName="item_name_ice_arrow_eng" Format="ia4" Width="128" Height="16" Offset="0xC00" /> <!-- ITEM_ARROW_ICE -->
-        <Texture Name="gItemNameLightArrowENGTex" OutName="item_name_light_arrow_eng" Format="ia4" Width="128" Height="16" Offset="0x1000" /> <!-- ITEM_ARROW_LIGHT -->
-        <Texture Name="gItemNameFairyOcarinaJPNTex" OutName="item_name_fairy_ocarina_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400" /> <!-- ITEM_OCARINA_FAIRY -->
-        <Texture Name="gItemNameBombENGTex" OutName="item_name_bomb_eng" Format="ia4" Width="128" Height="16" Offset="0x1800" /> <!-- ITEM_BOMB -->
-        <Texture Name="gItemNameBombchuENGTex" OutName="item_name_bombchu_eng" Format="ia4" Width="128" Height="16" Offset="0x1C00" /> <!-- ITEM_BOMBCHU -->
-        <Texture Name="gItemNameDekuStickENGTex" OutName="item_name_deku_stick_eng" Format="ia4" Width="128" Height="16" Offset="0x2000" /> <!-- ITEM_DEKU_STICK -->
-        <Texture Name="gItemNameDekuNutENGTex" OutName="item_name_deku_nut_eng" Format="ia4" Width="128" Height="16" Offset="0x2400" /> <!-- ITEM_DEKU_NUT -->
-        <Texture Name="gItemNameMagicBeansENGTex" OutName="item_name_magic_beans_eng" Format="ia4" Width="128" Height="16" Offset="0x2800" /> <!-- ITEM_MAGIC_BEANS -->
-        <!-- Swapped with slingshot -->
-        <Texture Name="gItemNameLongshotJPNTex" OutName="item_name_longshot_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00" /> <!-- ITEM_SLINGSHOT -->
-        <Texture Name="gItemNamePowderKegENGTex" OutName="item_name_powder_keg_eng" Format="ia4" Width="128" Height="16" Offset="0x3000" /> <!-- ITEM_POWDER_KEG -->
-        <Texture Name="gItemNamePictographBoxENGTex" OutName="item_name_pictograph_box_eng" Format="ia4" Width="128" Height="16" Offset="0x3400" /> <!-- ITEM_PICTOGRAPH_BOX -->
-        <Texture Name="gItemNameLensOfTruthENGTex" OutName="item_name_lens_of_truth_eng" Format="ia4" Width="128" Height="16" Offset="0x3800" /> <!-- ITEM_LENS_OF_TRUTH -->
-        <Texture Name="gItemNameHookshotENGTex" OutName="item_name_hookshot_eng" Format="ia4" Width="128" Height="16" Offset="0x3C00" /> <!-- ITEM_HOOKSHOT -->
-        <Texture Name="gItemNameGreatFairysSwordENGTex" OutName="item_name_great_fairys_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x4000" /> <!-- ITEM_SWORD_GREAT_FAIRY -->
-        <!-- Swapped with longshot -->
-        <Texture Name="gItemNameFairySlingshotJPNTex" OutName="item_name_fairy_slingshot_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400" /> <!-- ITEM_LONGSHOT -->
-
-        <!-- Bottled items -->
-        <Texture Name="gItemNameEmptyBottleENGTex" OutName="item_name_empty_bottle_eng" Format="ia4" Width="128" Height="16" Offset="0x4800" /> <!-- ITEM_BOTTLE -->
-        <Texture Name="gItemNameRedPotionENGTex" OutName="item_name_red_potion_eng" Format="ia4" Width="128" Height="16" Offset="0x4C00" /> <!-- ITEM_POTION_RED -->
-        <Texture Name="gItemNameGreenPotionENGTex" OutName="item_name_green_potion_eng" Format="ia4" Width="128" Height="16" Offset="0x5000" /> <!-- ITEM_POTION_GREEN -->
-        <Texture Name="gItemNameBluePotionENGTex" OutName="item_name_blue_potion_eng" Format="ia4" Width="128" Height="16" Offset="0x5400" /> <!-- ITEM_POTION_BLUE -->
-        <Texture Name="gItemNameFairyENGTex" OutName="item_name_fairy_eng" Format="ia4" Width="128" Height="16" Offset="0x5800" /> <!-- ITEM_FAIRY -->
-        <Texture Name="gItemNameDekuPrincessENGTex" OutName="item_name_deku_princess_eng" Format="ia4" Width="128" Height="16" Offset="0x5C00" /> <!-- ITEM_DEKU_PRINCESS -->
-        <Texture Name="gItemNameFullMilkENGTex" OutName="item_name_full_milk_eng" Format="ia4" Width="128" Height="16" Offset="0x6000" /> <!-- ITEM_MILK_BOTTLE -->
-        <Texture Name="gItemNameHalfMilkENGTex" OutName="item_name_half_milk_eng" Format="ia4" Width="128" Height="16" Offset="0x6400" /> <!-- ITEM_MILK_HALF -->
-        <Texture Name="gItemNameFishENGTex" OutName="item_name_fish_eng" Format="ia4" Width="128" Height="16" Offset="0x6800" /> <!-- ITEM_FISH -->
-        <Texture Name="gItemNameBugENGTex" OutName="item_name_bug_eng" Format="ia4" Width="128" Height="16" Offset="0x6C00" /> <!-- ITEM_BUG -->
-        <Texture Name="gItemNameBlueFireENGTex" OutName="item_name_blue_fire_eng" Format="ia4" Width="128" Height="16" Offset="0x7000" /> <!-- ITEM_BLUE_FIRE -->
-        <Texture Name="gItemNamePoeENGTex" OutName="item_name_poe_eng" Format="ia4" Width="128" Height="16" Offset="0x7400" /> <!-- ITEM_POE -->
-        <Texture Name="gItemNameBigPoeENGTex" OutName="item_name_big_poe_eng" Format="ia4" Width="128" Height="16" Offset="0x7800" /> <!-- ITEM_BIG_POE -->
-        <Texture Name="gItemNameSpringWaterENGTex" OutName="item_name_spring_water_eng" Format="ia4" Width="128" Height="16" Offset="0x7C00" /> <!-- ITEM_SPRING_WATER -->
-        <Texture Name="gItemNameHotSpringWaterENGTex" OutName="item_name_hot_spring_water_eng" Format="ia4" Width="128" Height="16" Offset="0x8000" /> <!-- ITEM_HOT_SPRING_WATER -->
-        <Texture Name="gItemNameZoraEggENGTex" OutName="item_name_zora_egg_eng" Format="ia4" Width="128" Height="16" Offset="0x8400" /> <!-- ITEM_ZORA_EGG -->
-        <Texture Name="gItemNameGoldDustENGTex" OutName="item_name_gold_dust_eng" Format="ia4" Width="128" Height="16" Offset="0x8800" /> <!-- ITEM_GOLD_DUST -->
-        <Texture Name="gItemNameMagicalMushroomENGTex" OutName="item_name_magical_mushroom_eng" Format="ia4" Width="128" Height="16" Offset="0x8C00" /> <!-- ITEM_MUSHROOM -->
-        <Texture Name="gItemNameSeaHorseENGTex" OutName="item_name_sea_horse_eng" Format="ia4" Width="128" Height="16" Offset="0x9000" /> <!-- ITEM_SEAHORSE -->
-        <Texture Name="gItemNameChateauRomaniENGTex" OutName="item_name_chateau_romani_eng" Format="ia4" Width="128" Height="16" Offset="0x9400" /> <!-- ITEM_CHATEAU -->
-        <Texture Name="gItemNameHylianLoachJPNTex" OutName="item_name_hylian_loach_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800" /> <!-- ITEM_HYLIAN_LOACH -->
-        <Texture Name="gItemNameObabasDrinkJPNTex" OutName="item_name_obabas_drink_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00" /> <!-- ITEM_OBABA_DRINK -->
-
-        <!-- Trade Items -->
-        <Texture Name="gItemNameMoonsTearENGTex" OutName="item_name_moons_tear_eng" Format="ia4" Width="128" Height="16" Offset="0xA000" /> <!-- ITEM_MOONS_TEAR -->
-        <Texture Name="gItemNameLandTitleDeedENGTex" OutName="item_name_land_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xA400" /> <!-- ITEM_DEED_LAND -->
-        <Texture Name="gItemNameSwampTitleDeedENGTex" OutName="item_name_swamp_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xA800" /> <!-- ITEM_DEED_SWAMP -->
-        <Texture Name="gItemNameMountainTitleDeedENGTex" OutName="item_name_mountain_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xAC00" /> <!-- ITEM_DEED_MOUNTAIN -->
-        <Texture Name="gItemNameOceanTitleDeedENGTex" OutName="item_name_ocean_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xB000" /> <!-- ITEM_DEED_OCEAN -->
-        <Texture Name="gItemNameRoomKeyENGTex" OutName="item_name_room_key_eng" Format="ia4" Width="128" Height="16" Offset="0xB400" /> <!-- ITEM_ROOM_KEY -->
-        <Texture Name="gItemNameSpecialDeliveryToMamaENGTex" OutName="item_name_special_delivery_to_mama_eng" Format="ia4" Width="128" Height="16" Offset="0xB800" /> <!-- ITEM_LETTER_MAMA -->
-        <Texture Name="gItemNameLetterToKafeiENGTex" OutName="item_name_letter_to_kafei_eng" Format="ia4" Width="128" Height="16" Offset="0xBC00" /> <!-- ITEM_LETTER_TO_KAFEI -->
-        <Texture Name="gItemNamePendantOfMemoriesENGTex" OutName="item_name_pendant_of_memories_eng" Format="ia4" Width="128" Height="16" Offset="0xC000" /> <!-- ITEM_PENDANT_OF_MEMORIES -->
-
-        <!-- Translates to Moon's Stone? Slightly different than the japanese translation of Moon's Tear. Replaces Tear with Stone, the same character used in Stone's Mask -->
-        <Texture Name="gItemNameMoonsStoneJPNTex" OutName="item_name_moons_stone_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400" /> <!-- ITEM_TINGLE_MAP -->
-
-        <!-- Masks -->
-        <Texture Name="gItemNameDekuMaskENGTex" OutName="item_name_deku_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xC800" /> <!-- ITEM_MASK_DEKU -->
-        <Texture Name="gItemNameGoronMaskENGTex" OutName="item_name_goron_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xCC00" /> <!-- ITEM_MASK_GORON -->
-        <Texture Name="gItemNameZoraMaskENGTex" OutName="item_name_zora_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xD000" /> <!-- ITEM_MASK_ZORA -->
-        <Texture Name="gItemNameFierceDeitysMaskENGTex" OutName="item_name_fierce_deitys_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xD400" /> <!-- ITEM_MASK_FIERCE_DEITY -->
-        <Texture Name="gItemNameMaskOfTruthENGTex" OutName="item_name_mask_of_truth_eng" Format="ia4" Width="128" Height="16" Offset="0xD800" /> <!-- ITEM_MASK_TRUTH -->
-        <Texture Name="gItemNameKafeisMaskENGTex" OutName="item_name_kafeis_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xDC00" /> <!-- ITEM_MASK_KAFEIS_MASK -->
-        <Texture Name="gItemNameAllNightMaskENGTex" OutName="item_name_all_night_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xE000" /> <!-- ITEM_MASK_ALL_NIGHT -->
-        <Texture Name="gItemNameBunnyHoodENGTex" OutName="item_name_bunny_hood_eng" Format="ia4" Width="128" Height="16" Offset="0xE400" /> <!-- ITEM_MASK_BUNNY -->
-        <Texture Name="gItemNameKeatonMaskENGTex" OutName="item_name_keaton_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xE800" /> <!-- ITEM_MASK_KEATON -->
-        <Texture Name="gItemNameGarosMaskENGTex" OutName="item_name_garos_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xEC00" /> <!-- ITEM_MASK_GARO -->
-        <Texture Name="gItemNameRomanisMaskENGTex" OutName="item_name_romanis_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xF000" /> <!-- ITEM_MASK_ROMANI -->
-        <Texture Name="gItemNameCircusLeadersMaskENGTex" OutName="item_name_circus_leaders_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xF400" /> <!-- ITEM_MASK_CIRCUS_LEADER -->
-        <Texture Name="gItemNamePostmansHatENGTex" OutName="item_name_postmans_hat_eng" Format="ia4" Width="128" Height="16" Offset="0xF800" /> <!-- ITEM_MASK_POSTMAN -->
-        <Texture Name="gItemNameCouplesMaskENGTex" OutName="item_name_couples_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xFC00" /> <!-- ITEM_MASK_COUPLE -->
-        <Texture Name="gItemNameGreatFairysMaskENGTex" OutName="item_name_great_fairys_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10000" /> <!-- ITEM_MASK_GREAT_FAIRY -->
-        <Texture Name="gItemNameGibdoMaskENGTex" OutName="item_name_gibdo_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10400" /> <!-- ITEM_MASK_GIBDO -->
-        <Texture Name="gItemNameDonGerosMaskENGTex" OutName="item_name_don_geros_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10800" /> <!-- ITEM_MASK_DON_GERO -->
-        <Texture Name="gItemNameKamarosMaskENGTex" OutName="item_name_kamaros_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10C00" /> <!-- ITEM_MASK_KAMARO -->
-        <Texture Name="gItemNameCaptainsHatENGTex" OutName="item_name_captains_hat_eng" Format="ia4" Width="128" Height="16" Offset="0x11000" /> <!-- ITEM_MASK_CAPTAIN -->
-        <Texture Name="gItemNameStoneMaskENGTex" OutName="item_name_stone_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x11400" /> <!-- ITEM_MASK_STONE -->
-        <Texture Name="gItemNameBremenMaskENGTex" OutName="item_name_bremen_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x11800" /> <!-- ITEM_MASK_BREMEN -->
-        <Texture Name="gItemNameBlastMaskENGTex" OutName="item_name_blast_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x11C00" /> <!-- ITEM_MASK_BLAST -->
-        <Texture Name="gItemNameMaskOfScentsENGTex" OutName="item_name_mask_of_scents_eng" Format="ia4" Width="128" Height="16" Offset="0x12000" /> <!-- ITEM_MASK_SCENTS -->
-        <Texture Name="gItemNameGiantsMaskENGTex" OutName="item_name_giants_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x12400" /> <!-- ITEM_MASK_GIANT -->
-
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameWindMedallionJPNTex" OutName="item_name_wind_medallion_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800" /> <!-- ITEM_BOW_FIRE -->
-        <Texture Name="gItemNameFireMedallionJPNTex" OutName="item_name_fire_medallion_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00" /> <!-- ITEM_BOW_ICE -->
-        <Texture Name="gItemNameIceMedallionJPNTex" OutName="item_name_ice_medallion_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000" /> <!-- ITEM_BOW_LIGHT -->
-
-        <!-- Equipment -->
-        <Texture Name="gItemNameKokiriSwordENGTex" OutName="item_name_kokiri_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x13400" /> <!-- ITEM_SWORD_KOKIRI -->
-        <Texture Name="gItemNameRazorSwordENGTex" OutName="item_name_razor_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x13800" /> <!-- ITEM_SWORD_RAZOR -->
-        <Texture Name="gItemNameGildedSwordENGTex" OutName="item_name_gilded_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x13C00" /> <!-- ITEM_SWORD_GILDED -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameBrokenGiantsKnifeJPNTex" OutName="item_name_broken_giants_knife_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000" /> <!-- ITEM_SWORD_DEITY -->
-        <Texture Name="gItemNameHerosShieldENGTex" OutName="item_name_heros_shield_eng" Format="ia4" Width="128" Height="16" Offset="0x14400" /> <!-- ITEM_SHIELD_HERO -->
-        <Texture Name="gItemNameMirrorShieldENGTex" OutName="item_name_mirror_shield_eng" Format="ia4" Width="128" Height="16" Offset="0x14800" /> <!-- ITEM_SHIELD_MIRROR -->
-
-        <!-- Upgrades -->
-        <Texture Name="gItemNameQuiver30ENGTex" OutName="item_name_quiver_30_eng" Format="ia4" Width="128" Height="16" Offset="0x14C00" /> <!-- ITEM_QUIVER_30 -->
-        <Texture Name="gItemNameQuiver40ENGTex" OutName="item_name_quiver_40_eng" Format="ia4" Width="128" Height="16" Offset="0x15000" /> <!-- ITEM_QUIVER_40 -->
-        <Texture Name="gItemNameQuiver50ENGTex" OutName="item_name_quiver_50_eng" Format="ia4" Width="128" Height="16" Offset="0x15400" /> <!-- ITEM_QUIVER_50 -->
-        <Texture Name="gItemNameBombBag20ENGTex" OutName="item_name_bomb_bag_20_eng" Format="ia4" Width="128" Height="16" Offset="0x15800" /> <!-- ITEM_BOMB_BAG_20 -->
-        <Texture Name="gItemNameBombBag30ENGTex" OutName="item_name_bomb_bag_30_eng" Format="ia4" Width="128" Height="16" Offset="0x15C00" /> <!-- ITEM_BOMB_BAG_30 -->
-        <Texture Name="gItemNameBombBag40ENGTex" OutName="item_name_bomb_bag_40_eng" Format="ia4" Width="128" Height="16" Offset="0x16000" /> <!-- ITEM_BOMB_BAG_40 -->
-
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameBigKey1JPNTex" OutName="item_name_big_key_1_jpn" Format="ia4" Width="128" Height="16" Offset="0x16400" /> <!-- ITEM_WALLET_DEFAULT -->
-        <Texture Name="gItemNameBigKey2JPNTex" OutName="item_name_big_key_2_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800" /> <!-- ITEM_WALLET_ADULT -->
-        <Texture Name="gItemNameBigKey3JPNTex" OutName="item_name_big_key_3_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00" /> <!-- ITEM_WALLET_GIANT -->
-        <Texture Name="gItemNameBigKey4JPNTex" OutName="item_name_big_key_4_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000" /> <!-- ITEM_FISHING_ROD -->
-
-        <!-- Boss remains -->
-        <Texture Name="gItemNameOdolwasRemainsENGTex" OutName="item_name_odolwas_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x17400" /> <!-- ITEM_REMAINS_ODOLWA -->
-        <Texture Name="gItemNameGohtsRemainsENGTex" OutName="item_name_gohts_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x17800" /> <!-- ITEM_REMAINS_GOHT -->
-        <Texture Name="gItemNameGyorgsRemainsENGTex" OutName="item_name_gyorgs_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x17C00" /> <!-- ITEM_REMAINS_GYORG -->
-        <Texture Name="gItemNameTwinmoldsRemainsENGTex" OutName="item_name_twinmolds_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x18000" /> <!-- ITEM_REMAINS_TWINMOLD -->
-
-        <!-- Songs -->
-        <Texture Name="gItemNameSonataOfAwakeningENGTex" OutName="item_name_sonata_of_awakening_eng" Format="ia4" Width="128" Height="16" Offset="0x18400" /> <!-- ITEM_SONG_SONATA -->
-        <Texture Name="gItemNameGoronLullabyENGTex" OutName="item_name_goron_lullaby_eng" Format="ia4" Width="128" Height="16" Offset="0x18800" /> <!-- ITEM_SONG_LULLABY -->
-        <Texture Name="gItemNameNewWaveBossaNovaENGTex" OutName="item_name_new_wave_bossa_nova_eng" Format="ia4" Width="128" Height="16" Offset="0x18C00" /> <!-- ITEM_SONG_NOVA -->
-        <Texture Name="gItemNameElegyOfEmptynessENGTex" OutName="item_name_elegy_of_emptiness_eng" Format="ia4" Width="128" Height="16" Offset="0x19000" /> <!-- ITEM_SONG_ELEGY -->
-        <Texture Name="gItemNameOathToOrderENGTex" OutName="item_name_oath_to_order_eng" Format="ia4" Width="128" Height="16" Offset="0x19400" /> <!-- ITEM_SONG_OATH -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameNocturneOfShadowJPNTex" OutName="item_name_nocturne_of_shadow_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800" /> <!-- ITEM_SONG_SARIA -->
-        <Texture Name="gItemNameSongOfTimeENGTex" OutName="item_name_song_of_time_eng" Format="ia4" Width="128" Height="16" Offset="0x19C00" /> <!-- ITEM_SONG_TIME -->
-        <Texture Name="gItemNameSongOfHealingENGTex" OutName="item_name_song_of_healing_eng" Format="ia4" Width="128" Height="16" Offset="0x1A000" /> <!-- ITEM_SONG_HEALING -->
-        <Texture Name="gItemNameEponasSongENGTex" OutName="item_name_eponas_song_eng" Format="ia4" Width="128" Height="16" Offset="0x1A400" /> <!-- ITEM_SONG_EPONA -->
-        <Texture Name="gItemNameSongOfSoaringENGTex" OutName="item_name_song_of_soaring_eng" Format="ia4" Width="128" Height="16" Offset="0x1A800" /> <!-- ITEM_SONG_SOARING -->
-        <Texture Name="gItemNameSongOfStormsENGTex" OutName="item_name_song_of_storms_eng" Format="ia4" Width="128" Height="16" Offset="0x1AC00" /> <!-- ITEM_SONG_STORMS -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameSunsSongJPNTex" OutName="item_name_suns_song_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000" /> <!-- ITEM_SONG_SUN -->
-
-        <!-- Misc -->
-        <Texture Name="gItemNameBombersNotebookENGTex" OutName="item_name_bombers_notebook_eng" Format="ia4" Width="128" Height="16" Offset="0x1B400" /> <!-- ITEM_BOMBERS_NOTEBOOK -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameGoldSkulltulaJPNTex" OutName="item_name_gold_skulltula_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800" /> <!-- ITEM_SKULL_TOKEN -->
-        <Texture Name="gItemNamePieceOfHeartENGTex" OutName="item_name_piece_of_heart_eng" Format="ia4" Width="128" Height="16" Offset="0x1BC00" /> <!-- ITEM_HEART_CONTAINER, Piece of Heart? -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNamePieceOfHeartJPNTex" OutName="item_name_piece_of_heart_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000" /> <!-- ITEM_HEART_PIECE -->
-        <!-- Identical to gItemNameSunsSongJPNTex -->
-        <Texture Name="gItemNameSunsSong2JPNTex" OutName="item_name_suns_song_2_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400" /> <!-- ITEM_71 -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameSongOfTimeJPNTex" OutName="item_name_song_of_time_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800" /> <!-- ITEM_72 -->
-        <Texture Name="gItemNameLullabyIntroENGTex" OutName="item_name_lullaby_intro_eng" Format="ia4" Width="128" Height="16" Offset="0x1CC00" /> <!-- ITEM_SONG_LULLABY_INTRO -->
-        <Texture Name="gItemNameBigKeyENGTex" OutName="item_name_big_key_eng" Format="ia4" Width="128" Height="16" Offset="0x1D000" /> <!-- ITEM_KEY_BOSS -->
-        <Texture Name="gItemNameCompassENGTex" OutName="item_name_compass_eng" Format="ia4" Width="128" Height="16" Offset="0x1D400" /> <!-- ITEM_COMPASS -->
-        <Texture Name="gItemNameDungeonMapENGTex" OutName="item_name_dungeon_map_eng" Format="ia4" Width="128" Height="16" Offset="0x1D800" /> <!-- ITEM_DUNGEON_MAP -->
-        <Texture Name="gItemNameStrayFairiesENGTex" OutName="item_name_stray_fairies_eng" Format="ia4" Width="128" Height="16" Offset="0x1DC00" /> <!-- ITEM_STRAY_FAIRIES -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/map_grand_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/map_grand_static.xml
deleted file mode 100644
index 94e51b350..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/map_grand_static.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<Root>
-    <File Name="map_grand_static">
-        <Blob Name="map_grand_static_Blob_000000" Size="0x0FF0" Offset="0x0" />
-        <Blob Name="map_grand_static_Blob_000FF0" Size="0x0FF0" Offset="0xFF0" />
-        <Blob Name="map_grand_static_Blob_001FE0" Size="0x0FF0" Offset="0x1FE0" />
-        <Blob Name="map_grand_static_Blob_002FD0" Size="0x0FF0" Offset="0x2FD0" />
-        <Blob Name="map_grand_static_Blob_003FC0" Size="0x0FF0" Offset="0x3FC0" />
-        <Blob Name="map_grand_static_Blob_004FB0" Size="0x0B40" Offset="0x4FB0" />
-        <Blob Name="map_grand_static_Blob_005AF0" Size="0x0FF0" Offset="0x5AF0" />
-        <Blob Name="map_grand_static_Blob_006AE0" Size="0x0FF0" Offset="0x6AE0" />
-        <Blob Name="map_grand_static_Blob_007AD0" Size="0x0FF0" Offset="0x7AD0" />
-        <Blob Name="map_grand_static_Blob_008AC0" Size="0x0FF0" Offset="0x8AC0" />
-        <Blob Name="map_grand_static_Blob_009AB0" Size="0x0420" Offset="0x9AB0" />
-        <Blob Name="map_grand_static_Blob_009ED0" Size="0x0FF0" Offset="0x9ED0" />
-        <Blob Name="map_grand_static_Blob_00AEC0" Size="0x0450" Offset="0xAEC0" />
-        <Blob Name="map_grand_static_Blob_00B310" Size="0x07A0" Offset="0xB310" />
-        <Blob Name="map_grand_static_Blob_00BAB0" Size="0x0FF0" Offset="0xBAB0" />
-        <Blob Name="map_grand_static_Blob_00CAA0" Size="0x0FF0" Offset="0xCAA0" />
-        <Blob Name="map_grand_static_Blob_00DA90" Size="0x0FF0" Offset="0xDA90" />
-        <Blob Name="map_grand_static_Blob_00EA80" Size="0x0780" Offset="0xEA80" />
-        <Blob Name="map_grand_static_Blob_00F200" Size="0x0800" Offset="0xF200" />
-        <Blob Name="map_grand_static_Blob_00FA00" Size="0x0850" Offset="0xFA00" />
-        <Blob Name="map_grand_static_Blob_010250" Size="0x0510" Offset="0x10250" />
-        <Blob Name="map_grand_static_Blob_010760" Size="0x0710" Offset="0x10760" />
-        <Blob Name="map_grand_static_Blob_010E70" Size="0x0AE0" Offset="0x10E70" />
-        <Blob Name="map_grand_static_Blob_011950" Size="0x0660" Offset="0x11950" />
-        <Blob Name="map_grand_static_Blob_011FB0" Size="0x0C60" Offset="0x11FB0" />
-        <Blob Name="map_grand_static_Blob_012C10" Size="0x0E10" Offset="0x12C10" />
-        <Blob Name="map_grand_static_Blob_013A20" Size="0x03E0" Offset="0x13A20" />
-        <Blob Name="map_grand_static_Blob_013E00" Size="0x05A0" Offset="0x13E00" />
-        <Blob Name="map_grand_static_Blob_0143A0" Size="0x0820" Offset="0x143A0" />
-        <Blob Name="map_grand_static_Blob_014BC0" Size="0x0440" Offset="0x14BC0" />
-        <Blob Name="map_grand_static_Blob_015000" Size="0x0590" Offset="0x15000" />
-        <Blob Name="map_grand_static_Blob_015590" Size="0x05A0" Offset="0x15590" />
-        <Blob Name="map_grand_static_Blob_015B30" Size="0x07A0" Offset="0x15B30" />
-        <Blob Name="map_grand_static_Blob_0162D0" Size="0x07A0" Offset="0x162D0" />
-        <Blob Name="map_grand_static_Blob_016A70" Size="0x0DF0" Offset="0x16A70" />
-        <Blob Name="map_grand_static_Blob_017860" Size="0x0850" Offset="0x17860" />
-        <Blob Name="map_grand_static_Blob_0180B0" Size="0x09C0" Offset="0x180B0" />
-        <Blob Name="map_grand_static_Blob_018A70" Size="0x0880" Offset="0x18A70" />
-        <Blob Name="map_grand_static_Blob_0192F0" Size="0x0660" Offset="0x192F0" />
-        <Blob Name="map_grand_static_Blob_019950" Size="0x0360" Offset="0x19950" />
-        <Blob Name="map_grand_static_Blob_019CB0" Size="0x0260" Offset="0x19CB0" />
-        <Blob Name="map_grand_static_Blob_019F10" Size="0x0960" Offset="0x19F10" />
-        <Blob Name="map_grand_static_Blob_01A870" Size="0x0350" Offset="0x1A870" />
-        <Blob Name="map_grand_static_Blob_01ABC0" Size="0x09B0" Offset="0x1ABC0" />
-        <Blob Name="map_grand_static_Blob_01B570" Size="0x0980" Offset="0x1B570" />
-        <Blob Name="map_grand_static_Blob_01BEF0" Size="0x0FF0" Offset="0x1BEF0" />
-        <Blob Name="map_grand_static_Blob_01CEE0" Size="0x0B20" Offset="0x1CEE0" />
-        <Blob Name="map_grand_static_Blob_01DA00" Size="0x0DA0" Offset="0x1DA00" />
-        <Blob Name="map_grand_static_Blob_01E7A0" Size="0x0820" Offset="0x1E7A0" />
-        <Blob Name="map_grand_static_Blob_01EFC0" Size="0x03E0" Offset="0x1EFC0" />
-        <Blob Name="map_grand_static_Blob_01F3A0" Size="0x0980" Offset="0x1F3A0" />
-        <Blob Name="map_grand_static_Blob_01FD20" Size="0x0960" Offset="0x1FD20" />
-        <Blob Name="map_grand_static_Blob_020680" Size="0x0760" Offset="0x20680" />
-        <Blob Name="map_grand_static_Blob_020DE0" Size="0x0960" Offset="0x20DE0" />
-        <Blob Name="map_grand_static_Blob_021740" Size="0x01D0" Offset="0x21740" />
-        <Blob Name="map_grand_static_Blob_021910" Size="0x0630" Offset="0x21910" />
-        <Blob Name="map_grand_static_Blob_021F40" Size="0x0680" Offset="0x21F40" />
-        <Blob Name="map_grand_static_Blob_0225C0" Size="0x07D0" Offset="0x225C0" />
-        <Blob Name="map_grand_static_Blob_022D90" Size="0x0870" Offset="0x22D90" />
-        <Blob Name="map_grand_static_Blob_023600" Size="0x0E60" Offset="0x23600" />
-        <Blob Name="map_grand_static_Blob_024460" Size="0x0710" Offset="0x24460" />
-        <Blob Name="map_grand_static_Blob_024B70" Size="0x0620" Offset="0x24B70" />
-        <Blob Name="map_grand_static_Blob_025190" Size="0x0620" Offset="0x25190" />
-        <Blob Name="map_grand_static_Blob_0257B0" Size="0x0680" Offset="0x257B0" />
-        <Blob Name="map_grand_static_Blob_025E30" Size="0x0620" Offset="0x25E30" />
-        <Blob Name="map_grand_static_Blob_026450" Size="0x0210" Offset="0x26450" />
-        <Blob Name="map_grand_static_Blob_026660" Size="0x04B0" Offset="0x26660" />
-        <Blob Name="map_grand_static_Blob_026B10" Size="0x0680" Offset="0x26B10" />
-        <Blob Name="map_grand_static_Blob_027190" Size="0x0350" Offset="0x27190" />
-        <Blob Name="map_grand_static_Blob_0274E0" Size="0x0660" Offset="0x274E0" />
-        <Blob Name="map_grand_static_Blob_027B40" Size="0x0350" Offset="0x27B40" />
-        <Blob Name="map_grand_static_Blob_027E90" Size="0x0500" Offset="0x27E90" />
-        <Blob Name="map_grand_static_Blob_028390" Size="0x06A0" Offset="0x28390" />
-        <Blob Name="map_grand_static_Blob_028A30" Size="0x05E0" Offset="0x28A30" />
-        <Blob Name="map_grand_static_Blob_029010" Size="0x0680" Offset="0x29010" />
-        <Blob Name="map_grand_static_Blob_029690" Size="0x0480" Offset="0x29690" />
-        <Blob Name="map_grand_static_Blob_029B10" Size="0x0AE0" Offset="0x29B10" />
-        <Blob Name="map_grand_static_Blob_02A5F0" Size="0x02D0" Offset="0x2A5F0" />
-        <Blob Name="map_grand_static_Blob_02A8C0" Size="0x0B90" Offset="0x2A8C0" />
-        <Blob Name="map_grand_static_Blob_02B450" Size="0x0DA0" Offset="0x2B450" />
-        <Blob Name="map_grand_static_Blob_02C1F0" Size="0x08C0" Offset="0x2C1F0" />
-        <Blob Name="map_grand_static_Blob_02CAB0" Size="0x0A30" Offset="0x2CAB0" />
-        <Blob Name="map_grand_static_Blob_02D4E0" Size="0x0130" Offset="0x2D4E0" />
-        <Blob Name="map_grand_static_Blob_02D610" Size="0x0C30" Offset="0x2D610" />
-        <Blob Name="map_grand_static_Blob_02E240" Size="0x08A0" Offset="0x2E240" />
-        <Blob Name="map_grand_static_Blob_02EAE0" Size="0x0F50" Offset="0x2EAE0" />
-        <Blob Name="map_grand_static_Blob_02FA30" Size="0x09B0" Offset="0x2FA30" />
-        <Blob Name="map_grand_static_Blob_0303E0" Size="0x07B0" Offset="0x303E0" />
-        <Blob Name="map_grand_static_Blob_030B90" Size="0x0960" Offset="0x30B90" />
-        <Blob Name="map_grand_static_Blob_0314F0" Size="0x0740" Offset="0x314F0" />
-        <Blob Name="map_grand_static_Blob_031C30" Size="0x0A00" Offset="0x31C30" />
-        <Blob Name="map_grand_static_Blob_032630" Size="0x0640" Offset="0x32630" />
-        <Blob Name="map_grand_static_Blob_032C70" Size="0x0A30" Offset="0x32C70" />
-        <Blob Name="map_grand_static_Blob_0336A0" Size="0x03D0" Offset="0x336A0" />
-        <Blob Name="map_grand_static_Blob_033A70" Size="0x0D00" Offset="0x33A70" />
-        <Blob Name="map_grand_static_Blob_034770" Size="0x0440" Offset="0x34770" />
-        <Blob Name="map_grand_static_Blob_034BB0" Size="0x03A0" Offset="0x34BB0" />
-        <Blob Name="map_grand_static_Blob_034F50" Size="0x0960" Offset="0x34F50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/map_i_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/map_i_static.xml
deleted file mode 100644
index 15e1a4348..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/map_i_static.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<Root>
-    <File Name="map_i_static">
-        <Blob Name="map_i_static_Blob_000000" Size="0x0FF0" Offset="0x0" />
-        <Blob Name="map_i_static_Blob_000FF0" Size="0x0FF0" Offset="0xFF0" />
-        <Blob Name="map_i_static_Blob_001FE0" Size="0x0FF0" Offset="0x1FE0" />
-        <Blob Name="map_i_static_Blob_002FD0" Size="0x0FF0" Offset="0x2FD0" />
-        <Blob Name="map_i_static_Blob_003FC0" Size="0x0FF0" Offset="0x3FC0" />
-        <Blob Name="map_i_static_Blob_004FB0" Size="0x01D0" Offset="0x4FB0" />
-        <Blob Name="map_i_static_Blob_005180" Size="0x01B0" Offset="0x5180" />
-        <Blob Name="map_i_static_Blob_005330" Size="0x01E0" Offset="0x5330" />
-        <Blob Name="map_i_static_Blob_005510" Size="0x0100" Offset="0x5510" />
-        <Blob Name="map_i_static_Blob_005610" Size="0x0060" Offset="0x5610" />
-        <Blob Name="map_i_static_Blob_005670" Size="0x01B0" Offset="0x5670" />
-        <Blob Name="map_i_static_Blob_005820" Size="0x0070" Offset="0x5820" />
-        <Blob Name="map_i_static_Blob_005890" Size="0x0130" Offset="0x5890" />
-        <Blob Name="map_i_static_Blob_0059C0" Size="0x01A0" Offset="0x59C0" />
-        <Blob Name="map_i_static_Blob_005B60" Size="0x0100" Offset="0x5B60" />
-        <Blob Name="map_i_static_Blob_005C60" Size="0x01B0" Offset="0x5C60" />
-        <Blob Name="map_i_static_Blob_005E10" Size="0x0120" Offset="0x5E10" />
-        <Blob Name="map_i_static_Blob_005F30" Size="0x0120" Offset="0x5F30" />
-        <Blob Name="map_i_static_Blob_006050" Size="0x0260" Offset="0x6050" />
-        <Blob Name="map_i_static_Blob_0062B0" Size="0x0150" Offset="0x62B0" />
-        <Blob Name="map_i_static_Blob_006400" Size="0x0220" Offset="0x6400" />
-        <Blob Name="map_i_static_Blob_006620" Size="0x0300" Offset="0x6620" />
-        <Blob Name="map_i_static_Blob_006920" Size="0x0110" Offset="0x6920" />
-        <Blob Name="map_i_static_Blob_006A30" Size="0x0110" Offset="0x6A30" />
-        <Blob Name="map_i_static_Blob_006B40" Size="0x0150" Offset="0x6B40" />
-        <Blob Name="map_i_static_Blob_006C90" Size="0x0120" Offset="0x6C90" />
-        <Blob Name="map_i_static_Blob_006DB0" Size="0x00C0" Offset="0x6DB0" />
-        <Blob Name="map_i_static_Blob_006E70" Size="0x00D0" Offset="0x6E70" />
-        <Blob Name="map_i_static_Blob_006F40" Size="0x0230" Offset="0x6F40" />
-        <Blob Name="map_i_static_Blob_007170" Size="0x00A0" Offset="0x7170" />
-        <Blob Name="map_i_static_Blob_007210" Size="0x01C0" Offset="0x7210" />
-        <Blob Name="map_i_static_Blob_0073D0" Size="0x0100" Offset="0x73D0" />
-        <Blob Name="map_i_static_Blob_0074D0" Size="0x0180" Offset="0x74D0" />
-        <Blob Name="map_i_static_Blob_007650" Size="0x0150" Offset="0x7650" />
-        <Blob Name="map_i_static_Blob_0077A0" Size="0x00B0" Offset="0x77A0" />
-        <Blob Name="map_i_static_Blob_007850" Size="0x0050" Offset="0x7850" />
-        <Blob Name="map_i_static_Blob_0078A0" Size="0x0040" Offset="0x78A0" />
-        <Blob Name="map_i_static_Blob_0078E0" Size="0x0170" Offset="0x78E0" />
-        <Blob Name="map_i_static_Blob_007A50" Size="0x0080" Offset="0x7A50" />
-        <Blob Name="map_i_static_Blob_007AD0" Size="0x0090" Offset="0x7AD0" />
-        <Blob Name="map_i_static_Blob_007B60" Size="0x00C0" Offset="0x7B60" />
-        <Blob Name="map_i_static_Blob_007C20" Size="0x0080" Offset="0x7C20" />
-        <Blob Name="map_i_static_Blob_007CA0" Size="0x00F0" Offset="0x7CA0" />
-        <Blob Name="map_i_static_Blob_007D90" Size="0x0110" Offset="0x7D90" />
-        <Blob Name="map_i_static_Blob_007EA0" Size="0x0100" Offset="0x7EA0" />
-        <Blob Name="map_i_static_Blob_007FA0" Size="0x0050" Offset="0x7FA0" />
-        <Blob Name="map_i_static_Blob_007FF0" Size="0x0090" Offset="0x7FF0" />
-        <Blob Name="map_i_static_Blob_008080" Size="0x0110" Offset="0x8080" />
-        <Blob Name="map_i_static_Blob_008190" Size="0x0060" Offset="0x8190" />
-        <Blob Name="map_i_static_Blob_0081F0" Size="0x0110" Offset="0x81F0" />
-        <Blob Name="map_i_static_Blob_008300" Size="0x0060" Offset="0x8300" />
-        <Blob Name="map_i_static_Blob_008360" Size="0x0090" Offset="0x8360" />
-        <Blob Name="map_i_static_Blob_0083F0" Size="0x0110" Offset="0x83F0" />
-        <Blob Name="map_i_static_Blob_008500" Size="0x00F0" Offset="0x8500" />
-        <Blob Name="map_i_static_Blob_0085F0" Size="0x0090" Offset="0x85F0" />
-        <Blob Name="map_i_static_Blob_008680" Size="0x0080" Offset="0x8680" />
-        <Blob Name="map_i_static_Blob_008700" Size="0x00F0" Offset="0x8700" />
-        <Blob Name="map_i_static_Blob_0087F0" Size="0x0050" Offset="0x87F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/map_name_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/map_name_static.xml
deleted file mode 100644
index d672cdc39..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/map_name_static.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Root>
-    <!-- Map Point Names. Must be ia4 128x16 and continguous with `ItemId` starting from `ITEM_MAP_POINT_GREAT_BAY` -->
-    <File Name="map_name_static">
-        <!-- First entries must be continguous with `RegionId` -->
-        <Texture Name="gMapPointGreatBayENGTex" OutName="map_point_great_bay_eng" Format="ia4" Width="128" Height="16" Offset="0x0" />                <!-- ITEM_MAP_POINT_GREAT_BAY -->
-        <Texture Name="gMapPointZoraHallENGTex" OutName="map_point_zora_hall_eng" Format="ia4" Width="128" Height="16" Offset="0x400" />              <!-- ITEM_MAP_POINT_ZORA_HALL -->
-        <Texture Name="gMapPointRomaniRanchENGTex" OutName="map_point_romani_ranch_eng" Format="ia4" Width="128" Height="16" Offset="0x800" />        <!-- ITEM_MAP_POINT_ROMANI_RANCH -->
-        <Texture Name="gMapPointDekuPalaceENGTex" OutName="map_point_deku_palace_eng" Format="ia4" Width="128" Height="16" Offset="0xC00" />          <!-- ITEM_MAP_POINT_DEKU_PALACE -->
-        <!-- Reused for both region and owl warp map point -->
-        <Texture Name="gMapPointWoodfallENGTex" OutName="map_point_woodfall_eng" Format="ia4" Width="128" Height="16" Offset="0x1000" />              <!-- ITEM_MAP_POINT_WOODFALL -->
-        <!-- Reused for both region and owl warp map point -->
-        <Texture Name="gMapPointClockTownENGTex" OutName="map_point_clock_town_eng" Format="ia4" Width="128" Height="16" Offset="0x1400" />           <!-- ITEM_MAP_POINT_CLOCK_TOWN -->
-        <!-- Reused for both region and owl warp map point -->
-        <Texture Name="gMapPointSnowheadENGTex" OutName="map_point_snowhead_eng" Format="ia4" Width="128" Height="16" Offset="0x1800" />              <!-- ITEM_MAP_POINT_SNOWHEAD -->
-        <Texture Name="gMapPointIkanaGraveyardENGTex" OutName="map_point_ikana_graveyard_eng" Format="ia4" Width="128" Height="16" Offset="0x1C00" /> <!-- ITEM_MAP_POINT_IKANA_GRAVEYARD -->
-        <!-- Reused for both region and owl warp map point -->
-        <Texture Name="gMapPointIkanaCanyonENGTex" OutName="map_point_ikana_canyon_eng" Format="ia4" Width="128" Height="16" Offset="0x2000" />       <!-- ITEM_MAP_POINT_IKANA_CANYON -->
-        <Texture Name="gMapPointGoronVillageENGTex" OutName="map_point_goron_village_eng" Format="ia4" Width="128" Height="16" Offset="0x2400" />     <!-- ITEM_MAP_POINT_GORON_VILLAGE -->
-        <!-- Reused for both region and owl warp map point -->
-        <Texture Name="gMapPointStoneTowerENGTex" OutName="map_point_stone_tower_eng" Format="ia4" Width="128" Height="16" Offset="0x2800" />         <!-- ITEM_MAP_POINT_STONE_TOWER -->
-        
-        <!-- Unique Owl Warp Map Points -->
-        <Texture Name="gMapPointGreatBayCoastENGTex" OutName="map_point_great_bay_coast_eng" Format="ia4" Width="128" Height="16" Offset="0x2C00" />    <!-- ITEM_MAP_POINT_GREAT_BAY_COAST -->
-        <Texture Name="gMapPointSouthernSwampENGTex" OutName="map_point_southern_swamp_eng" Format="ia4" Width="128" Height="16" Offset="0x3000" />     <!-- ITEM_MAP_POINT_SOUTHERN_SWAMP -->
-        <Texture Name="gMapPointMountainVillageENGTex" OutName="map_point_mountain_village_eng" Format="ia4" Width="128" Height="16" Offset="0x3400" /> <!-- ITEM_MAP_POINT_MOUNTAIN_VILLAGE -->
-        <Texture Name="gMapPointMilkRoadENGTex" OutName="map_point_milk_road_eng" Format="ia4" Width="128" Height="16" Offset="0x3800" />               <!-- ITEM_MAP_POINT_MILK_ROAD -->
-        <Texture Name="gMapPointZoraCapeENGTex" OutName="map_point_zora_cape_eng" Format="ia4" Width="128" Height="16" Offset="0x3C00" />               <!-- ITEM_MAP_POINT_ZORA_CAPE -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/schedule_dma_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/schedule_dma_static.xml
deleted file mode 100644
index 42f75f6d9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/archives/schedule_dma_static.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="schedule_dma_static_yar" Segment="7">
-        <Texture Name="gBombersNotebookPhotoAnjuTex" OutName="bombers_notebook_photo_anju" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="gBombersNotebookPhotoKafeiTex" OutName="bombers_notebook_photo_kafei" Format="rgba16" Width="32" Height="32" Offset="0x800" />
-        <Texture Name="gBombersNotebookPhotoCuriosityShopManTex" OutName="bombers_notebook_photo_curiosity_shop_man" Format="rgba16" Width="32" Height="32" Offset="0x1000" />
-        <Texture Name="gBombersNotebookPhotoBombShopLadyTex" OutName="bombers_notebook_photo_bomb_shop_lady" Format="rgba16" Width="32" Height="32" Offset="0x1800" />
-        <Texture Name="gBombersNotebookPhotoRomaniTex" OutName="bombers_notebook_photo_romani" Format="rgba16" Width="32" Height="32" Offset="0x2000" />
-        <Texture Name="gBombersNotebookPhotoCremiaTex" OutName="bombers_notebook_photo_cremia" Format="rgba16" Width="32" Height="32" Offset="0x2800" />
-        <Texture Name="gBombersNotebookPhotoMayorDotourTex" OutName="bombers_notebook_photo_mayor_dotour" Format="rgba16" Width="32" Height="32" Offset="0x3000" />
-        <Texture Name="gBombersNotebookPhotoMadameAromaTex" OutName="bombers_notebook_photo_madame_aroma" Format="rgba16" Width="32" Height="32" Offset="0x3800" />
-        <Texture Name="gBombersNotebookPhotoTotoTex" OutName="bombers_notebook_photo_toto" Format="rgba16" Width="32" Height="32" Offset="0x4000" />
-        <Texture Name="gBombersNotebookPhotoGormanTex" OutName="bombers_notebook_photo_gorman" Format="rgba16" Width="32" Height="32" Offset="0x4800" />
-        <Texture Name="gBombersNotebookPhotoPostmanTex" OutName="bombers_notebook_photo_postman" Format="rgba16" Width="32" Height="32" Offset="0x5000" />
-        <Texture Name="gBombersNotebookPhotoRosaSistersTex" OutName="bombers_notebook_photo_rosa_sisters" Format="rgba16" Width="32" Height="32" Offset="0x5800" />
-        <Texture Name="gBombersNotebookPhotoToiletHandTex" OutName="bombers_notebook_photo_toilet_hand" Format="rgba16" Width="32" Height="32" Offset="0x6000" />
-        <Texture Name="gBombersNotebookPhotoAnjusGrandmotherTex" OutName="bombers_notebook_photo_anjus_grandmother" Format="rgba16" Width="32" Height="32" Offset="0x6800" />
-        <Texture Name="gBombersNotebookPhotoKamaroTex" OutName="bombers_notebook_photo_kamaro" Format="rgba16" Width="32" Height="32" Offset="0x7000" />
-        <Texture Name="gBombersNotebookPhotoGrogTex" OutName="bombers_notebook_photo_grog" Format="rgba16" Width="32" Height="32" Offset="0x7800" />
-        <Texture Name="gBombersNotebookPhotoGormanBrothersTex" OutName="bombers_notebook_photo_gorman_brothers" Format="rgba16" Width="32" Height="32" Offset="0x8000" />
-        <Texture Name="gBombersNotebookPhotoShiroTex" OutName="bombers_notebook_photo_shiro" Format="rgba16" Width="32" Height="32" Offset="0x8800" />
-        <Texture Name="gBombersNotebookPhotoGuruGuruTex" OutName="bombers_notebook_photo_guru_guru" Format="rgba16" Width="32" Height="32" Offset="0x9000" />
-        <Texture Name="gBombersNotebookPhotoBombersTex" OutName="bombers_notebook_photo_bombers" Format="rgba16" Width="32" Height="32" Offset="0x9800" />
-        <Texture Name="gBombersNotebookPhotoMadameAromaBrightTex" OutName="bombers_notebook_photo_madame_aroma_bright" Format="rgba16" Width="32" Height="32" Offset="0xA000" /> <!-- Unused, slightly different pose to the used one -->
-        <Texture Name="gBombersNotebookEntryIconExclamationPointLargeTex" OutName="bombers_notebook_entry_icon_exclamation_point_large" Format="ia8" Width="32" Height="32" Offset="0xA800" /> <!-- Unused -->
-        <Texture Name="gBombersNotebookEntryIconMaskTex" OutName="bombers_notebook_entry_icon_mask" Format="ia8" Width="24" Height="28" Offset="0xAC00" />
-        <Texture Name="gBombersNotebookEntryIconRibbonTex" OutName="bombers_notebook_entry_icon_ribbon" Format="ia8" Width="32" Height="28" Offset="0xAEA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/audio/Audio.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/audio/Audio.xml
deleted file mode 100644
index ea72d02dd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/audio/Audio.xml
+++ /dev/null
@@ -1,3363 +0,0 @@
-<Root>
-    <File Name="code" OutName="audio" RangeStart="0x0">
-        <Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x138F10" SequenceTableOffset="0x1393C0" SampleBankTableOffset="0x139BD0" SequenceFontTableOffset="0x1391B0">
-            <Sequences>
-                <Sequence Name="Sequence_0"/>
-                <Sequence Name="Sequence_1"/>
-                <Sequence Name="Sequence_2"/>
-                <Sequence Name="Sequence_3"/>
-                <Sequence Name="Sequence_4"/>
-                <Sequence Name="Sequence_5"/>
-                <Sequence Name="Sequence_6"/>
-                <Sequence Name="Sequence_7"/>
-                <Sequence Name="Sequence_8"/>
-                <Sequence Name="Sequence_9"/>
-                <Sequence Name="Sequence_10"/>
-                <Sequence Name="Sequence_11"/>
-                <Sequence Name="Sequence_12"/>
-                <Sequence Name="Sequence_13"/>
-                <Sequence Name="Sequence_14"/>
-                <Sequence Name="Sequence_15"/>
-                <Sequence Name="Sequence_16"/>
-                <Sequence Name="Sequence_17"/>
-                <Sequence Name="Sequence_18"/>
-                <Sequence Name="Sequence_19"/>
-                <Sequence Name="Sequence_20"/>
-                <Sequence Name="Sequence_21"/>
-                <Sequence Name="Sequence_22"/>
-                <Sequence Name="Sequence_23"/>
-                <Sequence Name="Sequence_24"/>
-                <Sequence Name="Sequence_25"/>
-                <Sequence Name="Sequence_26"/>
-                <Sequence Name="Sequence_27"/>
-                <Sequence Name="Sequence_28"/>
-                <Sequence Name="Sequence_29"/>
-                <Sequence Name="Sequence_30"/>
-                <Sequence Name="Sequence_31"/>
-                <Sequence Name="Sequence_32"/>
-                <Sequence Name="Sequence_33"/>
-                <Sequence Name="Sequence_34"/>
-                <Sequence Name="Sequence_35"/>
-                <Sequence Name="Sequence_36"/>
-                <Sequence Name="Sequence_37"/>
-                <Sequence Name="Sequence_38"/>
-                <Sequence Name="Sequence_39"/>
-                <Sequence Name="Sequence_40"/>
-                <Sequence Name="Sequence_41"/>
-                <Sequence Name="Sequence_42"/>
-                <Sequence Name="Sequence_43"/>
-                <Sequence Name="Sequence_44"/>
-                <Sequence Name="Sequence_45"/>
-                <Sequence Name="Sequence_46"/>
-                <Sequence Name="Sequence_47"/>
-                <Sequence Name="Sequence_48"/>
-                <Sequence Name="Sequence_49"/>
-                <Sequence Name="Sequence_50"/>
-                <Sequence Name="Sequence_51"/>
-                <Sequence Name="Sequence_52"/>
-                <Sequence Name="Sequence_53"/>
-                <Sequence Name="Sequence_54"/>
-                <Sequence Name="Sequence_55"/>
-                <Sequence Name="Sequence_56"/>
-                <Sequence Name="Sequence_57"/>
-                <Sequence Name="Sequence_58"/>
-                <Sequence Name="Sequence_59"/>
-                <Sequence Name="Sequence_60"/>
-                <Sequence Name="Sequence_61"/>
-                <Sequence Name="Sequence_62"/>
-                <Sequence Name="Sequence_63"/>
-                <Sequence Name="Sequence_64"/>
-                <Sequence Name="Sequence_65"/>
-                <Sequence Name="Sequence_66"/>
-                <Sequence Name="Sequence_67"/>
-                <Sequence Name="Sequence_68"/>
-                <Sequence Name="Sequence_69"/>
-                <Sequence Name="Sequence_70"/>
-                <Sequence Name="Sequence_71"/>
-                <Sequence Name="Sequence_72"/>
-                <Sequence Name="Sequence_73"/>
-                <Sequence Name="Sequence_74"/>
-                <Sequence Name="Sequence_75"/>
-                <Sequence Name="Sequence_76"/>
-                <Sequence Name="Sequence_77"/>
-                <Sequence Name="Sequence_78"/>
-                <Sequence Name="Sequence_79"/>
-                <Sequence Name="Sequence_80"/>
-                <Sequence Name="Sequence_81"/>
-                <Sequence Name="Sequence_82"/>
-                <Sequence Name="Sequence_83"/>
-                <Sequence Name="Sequence_84"/>
-                <Sequence Name="Sequence_85"/>
-                <Sequence Name="Sequence_86"/>
-                <Sequence Name="Sequence_87"/>
-                <Sequence Name="Sequence_88"/>
-                <Sequence Name="Sequence_89"/>
-                <Sequence Name="Sequence_90"/>
-                <Sequence Name="Sequence_91"/>
-                <Sequence Name="Sequence_92"/>
-                <Sequence Name="Sequence_93"/>
-                <Sequence Name="Sequence_94"/>
-                <Sequence Name="Sequence_95"/>
-                <Sequence Name="Sequence_96"/>
-                <Sequence Name="Sequence_97"/>
-                <Sequence Name="Sequence_98"/>
-                <Sequence Name="Sequence_99"/>
-                <Sequence Name="Sequence_100"/>
-                <Sequence Name="Sequence_101"/>
-                <Sequence Name="Sequence_102"/>
-                <Sequence Name="Sequence_103"/>
-                <Sequence Name="Sequence_104"/>
-                <Sequence Name="Sequence_105"/>
-                <Sequence Name="Sequence_106"/>
-                <Sequence Name="Sequence_107"/>
-                <Sequence Name="Sequence_108"/>
-                <Sequence Name="Sequence_109"/>
-                <Sequence Name="Sequence_110"/>
-                <Sequence Name="Sequence_111"/>
-                <Sequence Name="Sequence_112"/>
-                <Sequence Name="Sequence_113"/>
-                <Sequence Name="Sequence_114"/>
-                <Sequence Name="Sequence_115"/>
-                <Sequence Name="Sequence_116"/>
-                <Sequence Name="Sequence_117"/>
-                <Sequence Name="Sequence_118"/>
-                <Sequence Name="Sequence_119"/>
-                <Sequence Name="Sequence_120"/>
-                <Sequence Name="Sequence_121"/>
-                <Sequence Name="Sequence_122"/>
-                <Sequence Name="Sequence_123"/>
-                <Sequence Name="Sequence_124"/>
-                <Sequence Name="Sequence_125"/>
-                <Sequence Name="Sequence_126"/>
-                <Sequence Name="Sequence_127"/>
-            </Sequences>
-            <Samples Bank="0">
-                <Sample Name="Sample_0">
-                    <Offset Version="MQDebug" At="0x0" LoopOffset="0x80"/>
-                </Sample>
-                <Sample Name="Sample_1">
-                    <Offset Version="MQDebug" At="0x0" LoopOffset="0xC0"/>
-                </Sample>
-                <Sample Name="Sample_2">
-                    <Offset Version="MQDebug" At="0x0" LoopOffset="0x1EA0"/>
-                </Sample>
-                <Sample Name="Sample_3">
-                    <Offset Version="MQDebug" At="0x6E0" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_4">
-                    <Offset Version="MQDebug" At="0x6E0" LoopOffset="0x1DA0"/>
-                </Sample>
-                <Sample Name="Sample_5">
-                    <Offset Version="MQDebug" At="0x8B0" LoopOffset="0x1A0"/>
-                </Sample>
-                <Sample Name="Sample_6">
-                    <Offset Version="MQDebug" At="0x8B0" LoopOffset="0x1E10"/>
-                </Sample>
-                <Sample Name="Sample_7">
-                    <Offset Version="MQDebug" At="0xDA0"/>
-                </Sample>
-                <Sample Name="Sample_8">
-                    <Offset Version="MQDebug" At="0x1870"/>
-                </Sample>
-                <Sample Name="Sample_9">
-                    <Offset Version="MQDebug" At="0x21B0"/>
-                </Sample>
-                <Sample Name="Sample_10">
-                    <Offset Version="MQDebug" At="0x2540"/>
-                </Sample>
-                <Sample Name="Sample_11">
-                    <Offset Version="MQDebug" At="0x2FF0"/>
-                </Sample>
-                <Sample Name="Sample_12">
-                    <Offset Version="MQDebug" At="0x4530"/>
-                </Sample>
-                <Sample Name="Sample_13">
-                    <Offset Version="MQDebug" At="0x4800"/>
-                </Sample>
-                <Sample Name="Sample_14">
-                    <Offset Version="MQDebug" At="0x5760"/>
-                </Sample>
-                <Sample Name="Sample_15">
-                    <Offset Version="MQDebug" At="0x72D0"/>
-                </Sample>
-                <Sample Name="Sample_16">
-                    <Offset Version="MQDebug" At="0x7AB0"/>
-                </Sample>
-                <Sample Name="Sample_17">
-                    <Offset Version="MQDebug" At="0x7B70"/>
-                </Sample>
-                <Sample Name="Sample_18">
-                    <Offset Version="MQDebug" At="0x8630"/>
-                </Sample>
-                <Sample Name="Sample_19">
-                    <Offset Version="MQDebug" At="0x9010"/>
-                </Sample>
-                <Sample Name="Sample_20">
-                    <Offset Version="MQDebug" At="0xA570"/>
-                </Sample>
-                <Sample Name="Sample_21">
-                    <Offset Version="MQDebug" At="0xAB90"/>
-                </Sample>
-                <Sample Name="Sample_22">
-                    <Offset Version="MQDebug" At="0x11260"/>
-                </Sample>
-                <Sample Name="Sample_23">
-                    <Offset Version="MQDebug" At="0x13A90" LoopOffset="0x7A0"/>
-                </Sample>
-                <Sample Name="Sample_24">
-                    <Offset Version="MQDebug" At="0x13A90" LoopOffset="0x14E0"/>
-                </Sample>
-                <Sample Name="Sample_25">
-                    <Offset Version="MQDebug" At="0x17360" LoopOffset="0x830"/>
-                </Sample>
-                <Sample Name="Sample_26">
-                    <Offset Version="MQDebug" At="0x17360" LoopOffset="0x1570"/>
-                </Sample>
-                <Sample Name="Sample_27">
-                    <Offset Version="MQDebug" At="0x1D040" LoopOffset="0x8C0"/>
-                </Sample>
-                <Sample Name="Sample_28">
-                    <Offset Version="MQDebug" At="0x1D040" LoopOffset="0x1450"/>
-                </Sample>
-                <Sample Name="Sample_29">
-                    <Offset Version="MQDebug" At="0x237D0" LoopOffset="0x990"/>
-                </Sample>
-                <Sample Name="Sample_30">
-                    <Offset Version="MQDebug" At="0x237D0" LoopOffset="0x2030"/>
-                </Sample>
-                <Sample Name="Sample_31">
-                    <Offset Version="MQDebug" At="0x237D0" LoopOffset="0x15B0"/>
-                </Sample>
-                <Sample Name="Sample_32">
-                    <Offset Version="MQDebug" At="0x293C0" LoopOffset="0x9D0"/>
-                </Sample>
-                <Sample Name="Sample_33">
-                    <Offset Version="MQDebug" At="0x293C0" LoopOffset="0x1180"/>
-                </Sample>
-                <Sample Name="Sample_34">
-                    <Offset Version="MQDebug" At="0x2D060" LoopOffset="0xA40"/>
-                </Sample>
-                <Sample Name="Sample_35">
-                    <Offset Version="MQDebug" At="0x2D060" LoopOffset="0x2140"/>
-                </Sample>
-                <Sample Name="Sample_36">
-                    <Offset Version="MQDebug" At="0x2E330"/>
-                </Sample>
-                <Sample Name="Sample_37">
-                    <Offset Version="MQDebug" At="0x2ECB0"/>
-                </Sample>
-                <Sample Name="Sample_38">
-                    <Offset Version="MQDebug" At="0x2F740"/>
-                </Sample>
-                <Sample Name="Sample_39">
-                    <Offset Version="MQDebug" At="0x2FFD0"/>
-                </Sample>
-                <Sample Name="Sample_40">
-                    <Offset Version="MQDebug" At="0x30A70" LoopOffset="0x1FB0"/>
-                </Sample>
-                <Sample Name="Sample_41">
-                    <Offset Version="MQDebug" At="0x30A70" LoopOffset="0x310"/>
-                </Sample>
-                <Sample Name="Sample_42">
-                    <Offset Version="MQDebug" At="0x314C0" LoopOffset="0x1EC0"/>
-                </Sample>
-                <Sample Name="Sample_43">
-                    <Offset Version="MQDebug" At="0x314C0" LoopOffset="0x330"/>
-                </Sample>
-                <Sample Name="Sample_44">
-                    <Offset Version="MQDebug" At="0x319F0"/>
-                </Sample>
-                <Sample Name="Sample_45">
-                    <Offset Version="MQDebug" At="0x31CA0"/>
-                </Sample>
-                <Sample Name="Sample_46">
-                    <Offset Version="MQDebug" At="0x33970"/>
-                </Sample>
-                <Sample Name="Sample_47">
-                    <Offset Version="MQDebug" At="0x367E0"/>
-                </Sample>
-                <Sample Name="Sample_48">
-                    <Offset Version="MQDebug" At="0x38810"/>
-                </Sample>
-                <Sample Name="Sample_49">
-                    <Offset Version="MQDebug" At="0x3A4E0"/>
-                </Sample>
-                <Sample Name="Sample_50">
-                    <Offset Version="MQDebug" At="0x3A670"/>
-                </Sample>
-                <Sample Name="Sample_51">
-                    <Offset Version="MQDebug" At="0x3F760" LoopOffset="0x2090"/>
-                </Sample>
-                <Sample Name="Sample_52">
-                    <Offset Version="MQDebug" At="0x3F760" LoopOffset="0x450"/>
-                </Sample>
-                <Sample Name="Sample_53">
-                    <Offset Version="MQDebug" At="0x431E0"/>
-                </Sample>
-                <Sample Name="Sample_54">
-                    <Offset Version="MQDebug" At="0x45B70"/>
-                </Sample>
-                <Sample Name="Sample_55">
-                    <Offset Version="MQDebug" At="0x47CE0"/>
-                </Sample>
-                <Sample Name="Sample_56">
-                    <Offset Version="MQDebug" At="0x4B560"/>
-                </Sample>
-                <Sample Name="Sample_57">
-                    <Offset Version="MQDebug" At="0x4CB70" LoopOffset="0x1F70"/>
-                </Sample>
-                <Sample Name="Sample_58">
-                    <Offset Version="MQDebug" At="0x4CB70" LoopOffset="0x590"/>
-                </Sample>
-                <Sample Name="Sample_59">
-                    <Offset Version="MQDebug" At="0x50210"/>
-                </Sample>
-                <Sample Name="Sample_60">
-                    <Offset Version="MQDebug" At="0x51B60"/>
-                </Sample>
-                <Sample Name="Sample_61">
-                    <Offset Version="MQDebug" At="0x53320"/>
-                </Sample>
-                <Sample Name="Sample_62">
-                    <Offset Version="MQDebug" At="0x53B40"/>
-                </Sample>
-                <Sample Name="Sample_63">
-                    <Offset Version="MQDebug" At="0x545D0"/>
-                </Sample>
-                <Sample Name="Sample_64">
-                    <Offset Version="MQDebug" At="0x54BE0"/>
-                </Sample>
-                <Sample Name="Sample_65">
-                    <Offset Version="MQDebug" At="0x55600" LoopOffset="0x1F30"/>
-                </Sample>
-                <Sample Name="Sample_66">
-                    <Offset Version="MQDebug" At="0x55600" LoopOffset="0x730"/>
-                </Sample>
-                <Sample Name="Sample_67">
-                    <Offset Version="MQDebug" At="0x56D70"/>
-                </Sample>
-                <Sample Name="Sample_68">
-                    <Offset Version="MQDebug" At="0x57CE0"/>
-                </Sample>
-                <Sample Name="Sample_69">
-                    <Offset Version="MQDebug" At="0x58AB0"/>
-                </Sample>
-                <Sample Name="Sample_70">
-                    <Offset Version="MQDebug" At="0x593F0" LoopOffset="0x2070"/>
-                </Sample>
-                <Sample Name="Sample_71">
-                    <Offset Version="MQDebug" At="0x593F0" LoopOffset="0x900"/>
-                </Sample>
-                <Sample Name="Sample_72">
-                    <Offset Version="MQDebug" At="0x5A110" LoopOffset="0x2210"/>
-                </Sample>
-                <Sample Name="Sample_73">
-                    <Offset Version="MQDebug" At="0x5A110" LoopOffset="0x920"/>
-                </Sample>
-                <Sample Name="Sample_74">
-                    <Offset Version="MQDebug" At="0x5A580"/>
-                </Sample>
-                <Sample Name="Sample_75">
-                    <Offset Version="MQDebug" At="0x5B490" LoopOffset="0x21F0"/>
-                </Sample>
-                <Sample Name="Sample_76">
-                    <Offset Version="MQDebug" At="0x5B490" LoopOffset="0x960"/>
-                </Sample>
-                <Sample Name="Sample_77">
-                    <Offset Version="MQDebug" At="0x5CE50"/>
-                </Sample>
-                <Sample Name="Sample_78">
-                    <Offset Version="MQDebug" At="0x5D810"/>
-                </Sample>
-                <Sample Name="Sample_79">
-                    <Offset Version="MQDebug" At="0x5EA00"/>
-                </Sample>
-                <Sample Name="Sample_80">
-                    <Offset Version="MQDebug" At="0x61150"/>
-                </Sample>
-                <Sample Name="Sample_81">
-                    <Offset Version="MQDebug" At="0x62780"/>
-                </Sample>
-                <Sample Name="Sample_82">
-                    <Offset Version="MQDebug" At="0x63C70" LoopOffset="0x21B0"/>
-                </Sample>
-                <Sample Name="Sample_83">
-                    <Offset Version="MQDebug" At="0x63C70" LoopOffset="0xAE0"/>
-                </Sample>
-                <Sample Name="Sample_84">
-                    <Offset Version="MQDebug" At="0x652F0"/>
-                </Sample>
-                <Sample Name="Sample_85">
-                    <Offset Version="MQDebug" At="0x65E80"/>
-                </Sample>
-                <Sample Name="Sample_86">
-                    <Offset Version="MQDebug" At="0x692B0"/>
-                </Sample>
-                <Sample Name="Sample_87">
-                    <Offset Version="MQDebug" At="0x6B570" LoopOffset="0x2230"/>
-                </Sample>
-                <Sample Name="Sample_88">
-                    <Offset Version="MQDebug" At="0x6B570" LoopOffset="0xB80"/>
-                </Sample>
-                <Sample Name="Sample_89">
-                    <Offset Version="MQDebug" At="0x6D6D0"/>
-                </Sample>
-                <Sample Name="Sample_90">
-                    <Offset Version="MQDebug" At="0x6DF70" LoopOffset="0x2250"/>
-                </Sample>
-                <Sample Name="Sample_91">
-                    <Offset Version="MQDebug" At="0x6DF70" LoopOffset="0xBC0"/>
-                </Sample>
-                <Sample Name="Sample_92">
-                    <Offset Version="MQDebug" At="0x6F0E0"/>
-                </Sample>
-                <Sample Name="Sample_93">
-                    <Offset Version="MQDebug" At="0x702E0"/>
-                </Sample>
-                <Sample Name="Sample_94">
-                    <Offset Version="MQDebug" At="0x711B0"/>
-                </Sample>
-                <Sample Name="Sample_95">
-                    <Offset Version="MQDebug" At="0x72660"/>
-                </Sample>
-                <Sample Name="Sample_96">
-                    <Offset Version="MQDebug" At="0x75310"/>
-                </Sample>
-                <Sample Name="Sample_97">
-                    <Offset Version="MQDebug" At="0x75720"/>
-                </Sample>
-                <Sample Name="Sample_98">
-                    <Offset Version="MQDebug" At="0x76900"/>
-                </Sample>
-                <Sample Name="Sample_99">
-                    <Offset Version="MQDebug" At="0x76D30"/>
-                </Sample>
-                <Sample Name="Sample_100">
-                    <Offset Version="MQDebug" At="0x77A20"/>
-                </Sample>
-                <Sample Name="Sample_101">
-                    <Offset Version="MQDebug" At="0x77D60"/>
-                </Sample>
-                <Sample Name="Sample_102">
-                    <Offset Version="MQDebug" At="0x797C0"/>
-                </Sample>
-                <Sample Name="Sample_103">
-                    <Offset Version="MQDebug" At="0x7AB10"/>
-                </Sample>
-                <Sample Name="Sample_104">
-                    <Offset Version="MQDebug" At="0x7C0A0" LoopOffset="0x1FD0"/>
-                </Sample>
-                <Sample Name="Sample_105">
-                    <Offset Version="MQDebug" At="0x7C0A0" LoopOffset="0xEF0"/>
-                </Sample>
-                <Sample Name="Sample_106">
-                    <Offset Version="MQDebug" At="0x80760"/>
-                </Sample>
-                <Sample Name="Sample_107">
-                    <Offset Version="MQDebug" At="0x814C0"/>
-                </Sample>
-                <Sample Name="Sample_108">
-                    <Offset Version="MQDebug" At="0x854B0"/>
-                </Sample>
-                <Sample Name="Sample_109">
-                    <Offset Version="MQDebug" At="0x89FA0"/>
-                </Sample>
-                <Sample Name="Sample_110">
-                    <Offset Version="MQDebug" At="0x8CC10"/>
-                </Sample>
-                <Sample Name="Sample_111">
-                    <Offset Version="MQDebug" At="0x8DE50"/>
-                </Sample>
-                <Sample Name="Sample_112">
-                    <Offset Version="MQDebug" At="0x8EF40"/>
-                </Sample>
-                <Sample Name="Sample_113">
-                    <Offset Version="MQDebug" At="0x932B0"/>
-                </Sample>
-                <Sample Name="Sample_114">
-                    <Offset Version="MQDebug" At="0x94DA0"/>
-                </Sample>
-                <Sample Name="Sample_115">
-                    <Offset Version="MQDebug" At="0x96F60"/>
-                </Sample>
-                <Sample Name="Sample_116">
-                    <Offset Version="MQDebug" At="0x98460"/>
-                </Sample>
-                <Sample Name="Sample_117">
-                    <Offset Version="MQDebug" At="0x99D20"/>
-                </Sample>
-                <Sample Name="Sample_118">
-                    <Offset Version="MQDebug" At="0x9C9C0"/>
-                </Sample>
-                <Sample Name="Sample_119">
-                    <Offset Version="MQDebug" At="0x9CED0" LoopOffset="0x2380"/>
-                </Sample>
-                <Sample Name="Sample_120">
-                    <Offset Version="MQDebug" At="0x9CED0" LoopOffset="0x1200"/>
-                </Sample>
-                <Sample Name="Sample_121">
-                    <Offset Version="MQDebug" At="0x9DF50"/>
-                </Sample>
-                <Sample Name="Sample_122">
-                    <Offset Version="MQDebug" At="0x9EE40"/>
-                </Sample>
-                <Sample Name="Sample_123">
-                    <Offset Version="MQDebug" At="0xA06C0"/>
-                </Sample>
-                <Sample Name="Sample_124">
-                    <Offset Version="MQDebug" At="0xA2100"/>
-                </Sample>
-                <Sample Name="Sample_125">
-                    <Offset Version="MQDebug" At="0xA3B30"/>
-                </Sample>
-                <Sample Name="Sample_126">
-                    <Offset Version="MQDebug" At="0xAC2E0"/>
-                </Sample>
-                <Sample Name="Sample_127">
-                    <Offset Version="MQDebug" At="0xAD170"/>
-                </Sample>
-                <Sample Name="Sample_128">
-                    <Offset Version="MQDebug" At="0xB08F0" LoopOffset="0x1FF0"/>
-                </Sample>
-                <Sample Name="Sample_129">
-                    <Offset Version="MQDebug" At="0xB08F0" LoopOffset="0x1630"/>
-                </Sample>
-                <Sample Name="Sample_130">
-                    <Offset Version="MQDebug" At="0xB2F90"/>
-                </Sample>
-                <Sample Name="Sample_131">
-                    <Offset Version="MQDebug" At="0xB6920"/>
-                </Sample>
-                <Sample Name="Sample_132">
-                    <Offset Version="MQDebug" At="0xB7340"/>
-                </Sample>
-                <Sample Name="Sample_133">
-                    <Offset Version="MQDebug" At="0xB8FF0"/>
-                </Sample>
-                <Sample Name="Sample_134">
-                    <Offset Version="MQDebug" At="0xBA9D0"/>
-                </Sample>
-                <Sample Name="Sample_135">
-                    <Offset Version="MQDebug" At="0xBEEB0"/>
-                </Sample>
-                <Sample Name="Sample_136">
-                    <Offset Version="MQDebug" At="0xC1000"/>
-                </Sample>
-                <Sample Name="Sample_137">
-                    <Offset Version="MQDebug" At="0xC3320" LoopOffset="0x2290"/>
-                </Sample>
-                <Sample Name="Sample_138">
-                    <Offset Version="MQDebug" At="0xC3320" LoopOffset="0x1890"/>
-                </Sample>
-                <Sample Name="Sample_139">
-                    <Offset Version="MQDebug" At="0xC52B0"/>
-                </Sample>
-                <Sample Name="Sample_140">
-                    <Offset Version="MQDebug" At="0xC5910"/>
-                </Sample>
-                <Sample Name="Sample_141">
-                    <Offset Version="MQDebug" At="0xC6980" LoopOffset="0x20D0"/>
-                </Sample>
-                <Sample Name="Sample_142">
-                    <Offset Version="MQDebug" At="0xC6980" LoopOffset="0x1930"/>
-                </Sample>
-                <Sample Name="Sample_143">
-                    <Offset Version="MQDebug" At="0xCB570"/>
-                </Sample>
-                <Sample Name="Sample_144">
-                    <Offset Version="MQDebug" At="0xCBDE0"/>
-                </Sample>
-                <Sample Name="Sample_145">
-                    <Offset Version="MQDebug" At="0xCC3D0"/>
-                </Sample>
-                <Sample Name="Sample_146">
-                    <Offset Version="MQDebug" At="0xCDD60"/>
-                </Sample>
-                <Sample Name="Sample_147">
-                    <Offset Version="MQDebug" At="0xCF9A0"/>
-                </Sample>
-                <Sample Name="Sample_148">
-                    <Offset Version="MQDebug" At="0xD67A0"/>
-                </Sample>
-                <Sample Name="Sample_149">
-                    <Offset Version="MQDebug" At="0xDA370"/>
-                </Sample>
-                <Sample Name="Sample_150">
-                    <Offset Version="MQDebug" At="0xDBA30" LoopOffset="0x2320"/>
-                </Sample>
-                <Sample Name="Sample_151">
-                    <Offset Version="MQDebug" At="0xDBA30" LoopOffset="0x1BE0"/>
-                </Sample>
-                <Sample Name="Sample_152">
-                    <Offset Version="MQDebug" At="0xE02C0"/>
-                </Sample>
-                <Sample Name="Sample_153">
-                    <Offset Version="MQDebug" At="0xE0900"/>
-                </Sample>
-                <Sample Name="Sample_154">
-                    <Offset Version="MQDebug" At="0xE1960"/>
-                </Sample>
-                <Sample Name="Sample_155">
-                    <Offset Version="MQDebug" At="0xE2A20"/>
-                </Sample>
-                <Sample Name="Sample_156">
-                    <Offset Version="MQDebug" At="0xE3BA0"/>
-                </Sample>
-                <Sample Name="Sample_157">
-                    <Offset Version="MQDebug" At="0xE5BB0"/>
-                </Sample>
-                <Sample Name="Sample_158">
-                    <Offset Version="MQDebug" At="0xE64A0"/>
-                </Sample>
-                <Sample Name="Sample_159">
-                    <Offset Version="MQDebug" At="0xE8AB0"/>
-                </Sample>
-                <Sample Name="Sample_160">
-                    <Offset Version="MQDebug" At="0xE9940"/>
-                </Sample>
-                <Sample Name="Sample_161">
-                    <Offset Version="MQDebug" At="0xEA700"/>
-                </Sample>
-                <Sample Name="Sample_162">
-                    <Offset Version="MQDebug" At="0xEB5D0"/>
-                </Sample>
-                <Sample Name="Sample_163">
-                    <Offset Version="MQDebug" At="0xEC280"/>
-                </Sample>
-                <Sample Name="Sample_164">
-                    <Offset Version="MQDebug" At="0xEDED0"/>
-                </Sample>
-                <Sample Name="Sample_165">
-                    <Offset Version="MQDebug" At="0xEE7A0"/>
-                </Sample>
-                <Sample Name="Sample_166">
-                    <Offset Version="MQDebug" At="0xF09A0"/>
-                </Sample>
-                <Sample Name="Sample_167">
-                    <Offset Version="MQDebug" At="0xF14B0"/>
-                </Sample>
-                <Sample Name="Sample_168">
-                    <Offset Version="MQDebug" At="0xF2B20"/>
-                </Sample>
-                <Sample Name="Sample_169">
-                    <Offset Version="MQDebug" At="0xF4810"/>
-                </Sample>
-                <Sample Name="Sample_170">
-                    <Offset Version="MQDebug" At="0xF4A30"/>
-                </Sample>
-                <Sample Name="Sample_171">
-                    <Offset Version="MQDebug" At="0xF4C10"/>
-                </Sample>
-                <Sample Name="Sample_172">
-                    <Offset Version="MQDebug" At="0xF9070"/>
-                </Sample>
-                <Sample Name="Sample_173">
-                    <Offset Version="MQDebug" At="0xFB3E0"/>
-                </Sample>
-                <Sample Name="Sample_174">
-                    <Offset Version="MQDebug" At="0xFBB20"/>
-                </Sample>
-                <Sample Name="Sample_175">
-                    <Offset Version="MQDebug" At="0xFD330"/>
-                </Sample>
-                <Sample Name="Sample_176">
-                    <Offset Version="MQDebug" At="0x100DD0"/>
-                </Sample>
-                <Sample Name="Sample_177">
-                    <Offset Version="MQDebug" At="0x102290"/>
-                </Sample>
-                <Sample Name="Sample_178">
-                    <Offset Version="MQDebug" At="0x104620"/>
-                </Sample>
-                <Sample Name="Sample_179">
-                    <Offset Version="MQDebug" At="0x107050"/>
-                </Sample>
-                <Sample Name="Sample_180">
-                    <Offset Version="MQDebug" At="0x108620"/>
-                </Sample>
-                <Sample Name="Sample_181">
-                    <Offset Version="MQDebug" At="0x10A780"/>
-                </Sample>
-                <Sample Name="Sample_182">
-                    <Offset Version="MQDebug" At="0x10B800"/>
-                </Sample>
-                <Sample Name="Sample_183">
-                    <Offset Version="MQDebug" At="0x10CA60"/>
-                </Sample>
-                <Sample Name="Sample_184">
-                    <Offset Version="MQDebug" At="0x10DB90"/>
-                </Sample>
-                <Sample Name="Sample_185">
-                    <Offset Version="MQDebug" At="0x10EAF0"/>
-                </Sample>
-                <Sample Name="Sample_186">
-                    <Offset Version="MQDebug" At="0x10FF20"/>
-                </Sample>
-                <Sample Name="Sample_187">
-                    <Offset Version="MQDebug" At="0x110920"/>
-                </Sample>
-                <Sample Name="Sample_188">
-                    <Offset Version="MQDebug" At="0x111BE0"/>
-                </Sample>
-                <Sample Name="Sample_189">
-                    <Offset Version="MQDebug" At="0x112A50"/>
-                </Sample>
-                <Sample Name="Sample_190">
-                    <Offset Version="MQDebug" At="0x1140E0"/>
-                </Sample>
-                <Sample Name="Sample_191">
-                    <Offset Version="MQDebug" At="0x114790"/>
-                </Sample>
-                <Sample Name="Sample_192">
-                    <Offset Version="MQDebug" At="0x114E20"/>
-                </Sample>
-                <Sample Name="Sample_193">
-                    <Offset Version="MQDebug" At="0x1166D0"/>
-                </Sample>
-                <Sample Name="Sample_194">
-                    <Offset Version="MQDebug" At="0x1195A0"/>
-                </Sample>
-                <Sample Name="Sample_195">
-                    <Offset Version="MQDebug" At="0x11AD20"/>
-                </Sample>
-                <Sample Name="Sample_196">
-                    <Offset Version="MQDebug" At="0x11DA10" LoopOffset="0x1D30"/>
-                </Sample>
-                <Sample Name="Sample_197">
-                    <Offset Version="MQDebug" At="0x11DA10" LoopOffset="0x2A70"/>
-                </Sample>
-                <Sample Name="Sample_198">
-                    <Offset Version="MQDebug" At="0x11EA00"/>
-                </Sample>
-                <Sample Name="Sample_199">
-                    <Offset Version="MQDebug" At="0x11FA20"/>
-                </Sample>
-                <Sample Name="Sample_200">
-                    <Offset Version="MQDebug" At="0x120FA0"/>
-                </Sample>
-                <Sample Name="Sample_201">
-                    <Offset Version="MQDebug" At="0x122370"/>
-                </Sample>
-                <Sample Name="Sample_202">
-                    <Offset Version="MQDebug" At="0x122E70"/>
-                </Sample>
-                <Sample Name="Sample_203">
-                    <Offset Version="MQDebug" At="0x124070"/>
-                </Sample>
-                <Sample Name="Sample_204">
-                    <Offset Version="MQDebug" At="0x1268E0"/>
-                </Sample>
-                <Sample Name="Sample_205">
-                    <Offset Version="MQDebug" At="0x127730"/>
-                </Sample>
-                <Sample Name="Sample_206">
-                    <Offset Version="MQDebug" At="0x128990"/>
-                </Sample>
-                <Sample Name="Sample_207">
-                    <Offset Version="MQDebug" At="0x1298F0"/>
-                </Sample>
-                <Sample Name="Sample_208">
-                    <Offset Version="MQDebug" At="0x12B5D0"/>
-                </Sample>
-                <Sample Name="Sample_209">
-                    <Offset Version="MQDebug" At="0x12E040"/>
-                </Sample>
-                <Sample Name="Sample_210">
-                    <Offset Version="MQDebug" At="0x130340"/>
-                </Sample>
-                <Sample Name="Sample_211">
-                    <Offset Version="MQDebug" At="0x1324D0"/>
-                </Sample>
-                <Sample Name="Sample_212">
-                    <Offset Version="MQDebug" At="0x1347A0"/>
-                </Sample>
-                <Sample Name="Sample_213">
-                    <Offset Version="MQDebug" At="0x136B70"/>
-                </Sample>
-                <Sample Name="Sample_214">
-                    <Offset Version="MQDebug" At="0x13D8F0"/>
-                </Sample>
-                <Sample Name="Sample_215">
-                    <Offset Version="MQDebug" At="0x148670" LoopOffset="0x2360"/>
-                </Sample>
-                <Sample Name="Sample_216">
-                    <Offset Version="MQDebug" At="0x148670" LoopOffset="0x31B0"/>
-                </Sample>
-                <Sample Name="Sample_217">
-                    <Offset Version="MQDebug" At="0x14E930"/>
-                </Sample>
-                <Sample Name="Sample_218">
-                    <Offset Version="MQDebug" At="0x14F570"/>
-                </Sample>
-                <Sample Name="Sample_219">
-                    <Offset Version="MQDebug" At="0x1501C0"/>
-                </Sample>
-                <Sample Name="Sample_220">
-                    <Offset Version="MQDebug" At="0x151570"/>
-                </Sample>
-                <Sample Name="Sample_221">
-                    <Offset Version="MQDebug" At="0x1535B0"/>
-                </Sample>
-                <Sample Name="Sample_222">
-                    <Offset Version="MQDebug" At="0x154750"/>
-                </Sample>
-                <Sample Name="Sample_223">
-                    <Offset Version="MQDebug" At="0x156730"/>
-                </Sample>
-                <Sample Name="Sample_224">
-                    <Offset Version="MQDebug" At="0x15D360" LoopOffset="0x1CC0"/>
-                </Sample>
-                <Sample Name="Sample_225">
-                    <Offset Version="MQDebug" At="0x15D360" LoopOffset="0x3530"/>
-                </Sample>
-                <Sample Name="Sample_226">
-                    <Offset Version="MQDebug" At="0x160600"/>
-                </Sample>
-                <Sample Name="Sample_227">
-                    <Offset Version="MQDebug" At="0x160C70"/>
-                </Sample>
-                <Sample Name="Sample_228">
-                    <Offset Version="MQDebug" At="0x160EE0"/>
-                </Sample>
-                <Sample Name="Sample_229">
-                    <Offset Version="MQDebug" At="0x162630"/>
-                </Sample>
-                <Sample Name="Sample_230">
-                    <Offset Version="MQDebug" At="0x163780"/>
-                </Sample>
-                <Sample Name="Sample_231">
-                    <Offset Version="MQDebug" At="0x164A40"/>
-                </Sample>
-                <Sample Name="Sample_232">
-                    <Offset Version="MQDebug" At="0x1655C0"/>
-                </Sample>
-                <Sample Name="Sample_233">
-                    <Offset Version="MQDebug" At="0x165E10"/>
-                </Sample>
-                <Sample Name="Sample_234">
-                    <Offset Version="MQDebug" At="0x166440"/>
-                </Sample>
-                <Sample Name="Sample_235">
-                    <Offset Version="MQDebug" At="0x167D90"/>
-                </Sample>
-                <Sample Name="Sample_236">
-                    <Offset Version="MQDebug" At="0x1697D0"/>
-                </Sample>
-                <Sample Name="Sample_237">
-                    <Offset Version="MQDebug" At="0x16B850"/>
-                </Sample>
-                <Sample Name="Sample_238">
-                    <Offset Version="MQDebug" At="0x16CF30"/>
-                </Sample>
-                <Sample Name="Sample_239">
-                    <Offset Version="MQDebug" At="0x16E5D0"/>
-                </Sample>
-                <Sample Name="Sample_240">
-                    <Offset Version="MQDebug" At="0x16FDF0"/>
-                </Sample>
-                <Sample Name="Sample_241">
-                    <Offset Version="MQDebug" At="0x170C00"/>
-                </Sample>
-                <Sample Name="Sample_242">
-                    <Offset Version="MQDebug" At="0x172180"/>
-                </Sample>
-                <Sample Name="Sample_243">
-                    <Offset Version="MQDebug" At="0x173AF0"/>
-                </Sample>
-                <Sample Name="Sample_244">
-                    <Offset Version="MQDebug" At="0x174F90"/>
-                </Sample>
-                <Sample Name="Sample_245">
-                    <Offset Version="MQDebug" At="0x176090"/>
-                </Sample>
-                <Sample Name="Sample_246">
-                    <Offset Version="MQDebug" At="0x1768B0"/>
-                </Sample>
-                <Sample Name="Sample_247">
-                    <Offset Version="MQDebug" At="0x1787C0"/>
-                </Sample>
-                <Sample Name="Sample_248">
-                    <Offset Version="MQDebug" At="0x17AF50"/>
-                </Sample>
-                <Sample Name="Sample_249">
-                    <Offset Version="MQDebug" At="0x17C5F0"/>
-                </Sample>
-                <Sample Name="Sample_250">
-                    <Offset Version="MQDebug" At="0x1805C0"/>
-                </Sample>
-                <Sample Name="Sample_251">
-                    <Offset Version="MQDebug" At="0x185470"/>
-                </Sample>
-                <Sample Name="Sample_252">
-                    <Offset Version="MQDebug" At="0x186A90"/>
-                </Sample>
-                <Sample Name="Sample_253">
-                    <Offset Version="MQDebug" At="0x188150"/>
-                </Sample>
-                <Sample Name="Sample_254">
-                    <Offset Version="MQDebug" At="0x18A6A0"/>
-                </Sample>
-                <Sample Name="Sample_255">
-                    <Offset Version="MQDebug" At="0x18CB50"/>
-                </Sample>
-                <Sample Name="Sample_256">
-                    <Offset Version="MQDebug" At="0x18DC40"/>
-                </Sample>
-                <Sample Name="Sample_257">
-                    <Offset Version="MQDebug" At="0x18F630"/>
-                </Sample>
-                <Sample Name="Sample_258">
-                    <Offset Version="MQDebug" At="0x190A20"/>
-                </Sample>
-                <Sample Name="Sample_259">
-                    <Offset Version="MQDebug" At="0x1927A0"/>
-                </Sample>
-                <Sample Name="Sample_260">
-                    <Offset Version="MQDebug" At="0x195E60"/>
-                </Sample>
-                <Sample Name="Sample_261">
-                    <Offset Version="MQDebug" At="0x198A10"/>
-                </Sample>
-                <Sample Name="Sample_262">
-                    <Offset Version="MQDebug" At="0x199200"/>
-                </Sample>
-                <Sample Name="Sample_263">
-                    <Offset Version="MQDebug" At="0x199980"/>
-                </Sample>
-                <Sample Name="Sample_264">
-                    <Offset Version="MQDebug" At="0x19A5F0"/>
-                </Sample>
-                <Sample Name="Sample_265">
-                    <Offset Version="MQDebug" At="0x1A0D90"/>
-                </Sample>
-                <Sample Name="Sample_266">
-                    <Offset Version="MQDebug" At="0x1A2D30"/>
-                </Sample>
-                <Sample Name="Sample_267">
-                    <Offset Version="MQDebug" At="0x1A3C40"/>
-                </Sample>
-                <Sample Name="Sample_268">
-                    <Offset Version="MQDebug" At="0x1A88A0"/>
-                </Sample>
-                <Sample Name="Sample_269">
-                    <Offset Version="MQDebug" At="0x1A9080"/>
-                </Sample>
-                <Sample Name="Sample_270">
-                    <Offset Version="MQDebug" At="0x1B09A0"/>
-                </Sample>
-                <Sample Name="Sample_271">
-                    <Offset Version="MQDebug" At="0x1B15A0"/>
-                </Sample>
-                <Sample Name="Sample_272">
-                    <Offset Version="MQDebug" At="0x1B5610"/>
-                </Sample>
-                <Sample Name="Sample_273">
-                    <Offset Version="MQDebug" At="0x1B7BF0"/>
-                </Sample>
-                <Sample Name="Sample_274">
-                    <Offset Version="MQDebug" At="0x1BD8E0"/>
-                </Sample>
-                <Sample Name="Sample_275">
-                    <Offset Version="MQDebug" At="0x1C0D40"/>
-                </Sample>
-                <Sample Name="Sample_276">
-                    <Offset Version="MQDebug" At="0x1C3040"/>
-                </Sample>
-                <Sample Name="Sample_277">
-                    <Offset Version="MQDebug" At="0x1C49D0"/>
-                </Sample>
-                <Sample Name="Sample_278">
-                    <Offset Version="MQDebug" At="0x1C75D0"/>
-                </Sample>
-                <Sample Name="Sample_279">
-                    <Offset Version="MQDebug" At="0x1CA900"/>
-                </Sample>
-                <Sample Name="Sample_280">
-                    <Offset Version="MQDebug" At="0x1CC4C0"/>
-                </Sample>
-                <Sample Name="Sample_281">
-                    <Offset Version="MQDebug" At="0x1CD430"/>
-                </Sample>
-                <Sample Name="Sample_282">
-                    <Offset Version="MQDebug" At="0x1D06C0"/>
-                </Sample>
-                <Sample Name="Sample_283">
-                    <Offset Version="MQDebug" At="0x1D0B80" LoopOffset="0x23C0"/>
-                </Sample>
-                <Sample Name="Sample_284">
-                    <Offset Version="MQDebug" At="0x1D0B80" LoopOffset="0x4730"/>
-                </Sample>
-                <Sample Name="Sample_285">
-                    <Offset Version="MQDebug" At="0x1D17F0" LoopOffset="0x23E0"/>
-                </Sample>
-                <Sample Name="Sample_286">
-                    <Offset Version="MQDebug" At="0x1D17F0" LoopOffset="0x4750"/>
-                </Sample>
-                <Sample Name="Sample_287">
-                    <Offset Version="MQDebug" At="0x1D1F50"/>
-                </Sample>
-                <Sample Name="Sample_288">
-                    <Offset Version="MQDebug" At="0x1D30F0"/>
-                </Sample>
-                <Sample Name="Sample_289">
-                    <Offset Version="MQDebug" At="0x1D5770"/>
-                </Sample>
-                <Sample Name="Sample_290">
-                    <Offset Version="MQDebug" At="0x1D60E0"/>
-                </Sample>
-                <Sample Name="Sample_291">
-                    <Offset Version="MQDebug" At="0x1D6B50"/>
-                </Sample>
-                <Sample Name="Sample_292">
-                    <Offset Version="MQDebug" At="0x1D86D0"/>
-                </Sample>
-                <Sample Name="Sample_293">
-                    <Offset Version="MQDebug" At="0x1D9450"/>
-                </Sample>
-                <Sample Name="Sample_294">
-                    <Offset Version="MQDebug" At="0x1DAE00" LoopOffset="0x2420"/>
-                </Sample>
-                <Sample Name="Sample_295">
-                    <Offset Version="MQDebug" At="0x1DAE00" LoopOffset="0x4850"/>
-                </Sample>
-                <Sample Name="Sample_296">
-                    <Offset Version="MQDebug" At="0x1DC810"/>
-                </Sample>
-                <Sample Name="Sample_297">
-                    <Offset Version="MQDebug" At="0x1DD590"/>
-                </Sample>
-                <Sample Name="Sample_298">
-                    <Offset Version="MQDebug" At="0x1DEE90"/>
-                </Sample>
-                <Sample Name="Sample_299">
-                    <Offset Version="MQDebug" At="0x1E0470"/>
-                </Sample>
-                <Sample Name="Sample_300">
-                    <Offset Version="MQDebug" At="0x1E1970"/>
-                </Sample>
-                <Sample Name="Sample_301">
-                    <Offset Version="MQDebug" At="0x1E25A0"/>
-                </Sample>
-                <Sample Name="Sample_302">
-                    <Offset Version="MQDebug" At="0x1E2DE0"/>
-                </Sample>
-                <Sample Name="Sample_303">
-                    <Offset Version="MQDebug" At="0x1E36F0"/>
-                </Sample>
-                <Sample Name="Sample_304">
-                    <Offset Version="MQDebug" At="0x1E4670"/>
-                </Sample>
-                <Sample Name="Sample_305">
-                    <Offset Version="MQDebug" At="0x1E5DB0"/>
-                </Sample>
-                <Sample Name="Sample_306">
-                    <Offset Version="MQDebug" At="0x1E6D70"/>
-                </Sample>
-                <Sample Name="Sample_307">
-                    <Offset Version="MQDebug" At="0x1E73C0"/>
-                </Sample>
-                <Sample Name="Sample_308">
-                    <Offset Version="MQDebug" At="0x1E91E0"/>
-                </Sample>
-                <Sample Name="Sample_309">
-                    <Offset Version="MQDebug" At="0x1EAB30"/>
-                </Sample>
-                <Sample Name="Sample_310">
-                    <Offset Version="MQDebug" At="0x1EC5F0"/>
-                </Sample>
-                <Sample Name="Sample_311">
-                    <Offset Version="MQDebug" At="0x1EDCF0"/>
-                </Sample>
-                <Sample Name="Sample_312">
-                    <Offset Version="MQDebug" At="0x1EF070"/>
-                </Sample>
-                <Sample Name="Sample_313">
-                    <Offset Version="MQDebug" At="0x1F2690"/>
-                </Sample>
-                <Sample Name="Sample_314">
-                    <Offset Version="MQDebug" At="0x1F3E20"/>
-                </Sample>
-                <Sample Name="Sample_315">
-                    <Offset Version="MQDebug" At="0x1F4B70"/>
-                </Sample>
-                <Sample Name="Sample_316">
-                    <Offset Version="MQDebug" At="0x1F6770"/>
-                </Sample>
-                <Sample Name="Sample_317">
-                    <Offset Version="MQDebug" At="0x1F77E0"/>
-                </Sample>
-                <Sample Name="Sample_318">
-                    <Offset Version="MQDebug" At="0x1F87A0"/>
-                </Sample>
-                <Sample Name="Sample_319">
-                    <Offset Version="MQDebug" At="0x1FA1F0"/>
-                </Sample>
-                <Sample Name="Sample_320">
-                    <Offset Version="MQDebug" At="0x1FAD30"/>
-                </Sample>
-                <Sample Name="Sample_321">
-                    <Offset Version="MQDebug" At="0x1FB0D0"/>
-                </Sample>
-                <Sample Name="Sample_322">
-                    <Offset Version="MQDebug" At="0x1FBD20"/>
-                </Sample>
-                <Sample Name="Sample_323">
-                    <Offset Version="MQDebug" At="0x1FC4C0"/>
-                </Sample>
-                <Sample Name="Sample_324">
-                    <Offset Version="MQDebug" At="0x1FD3F0"/>
-                </Sample>
-                <Sample Name="Sample_325">
-                    <Offset Version="MQDebug" At="0x1FDBC0"/>
-                </Sample>
-                <Sample Name="Sample_326">
-                    <Offset Version="MQDebug" At="0x1FE390"/>
-                </Sample>
-                <Sample Name="Sample_327">
-                    <Offset Version="MQDebug" At="0x1FF3F0"/>
-                </Sample>
-                <Sample Name="Sample_328">
-                    <Offset Version="MQDebug" At="0x200050"/>
-                </Sample>
-                <Sample Name="Sample_329">
-                    <Offset Version="MQDebug" At="0x2009F0"/>
-                </Sample>
-                <Sample Name="Sample_330">
-                    <Offset Version="MQDebug" At="0x2027D0"/>
-                </Sample>
-                <Sample Name="Sample_331">
-                    <Offset Version="MQDebug" At="0x2043E0"/>
-                </Sample>
-                <Sample Name="Sample_332">
-                    <Offset Version="MQDebug" At="0x206660"/>
-                </Sample>
-                <Sample Name="Sample_333">
-                    <Offset Version="MQDebug" At="0x208120"/>
-                </Sample>
-                <Sample Name="Sample_334">
-                    <Offset Version="MQDebug" At="0x208C00"/>
-                </Sample>
-                <Sample Name="Sample_335">
-                    <Offset Version="MQDebug" At="0x209A00"/>
-                </Sample>
-                <Sample Name="Sample_336">
-                    <Offset Version="MQDebug" At="0x20A380"/>
-                </Sample>
-                <Sample Name="Sample_337">
-                    <Offset Version="MQDebug" At="0x20B4A0"/>
-                </Sample>
-                <Sample Name="Sample_338">
-                    <Offset Version="MQDebug" At="0x20D5B0"/>
-                </Sample>
-                <Sample Name="Sample_339">
-                    <Offset Version="MQDebug" At="0x20F1A0"/>
-                </Sample>
-                <Sample Name="Sample_340">
-                    <Offset Version="MQDebug" At="0x20FBB0"/>
-                </Sample>
-                <Sample Name="Sample_341">
-                    <Offset Version="MQDebug" At="0x2112E0"/>
-                </Sample>
-                <Sample Name="Sample_342">
-                    <Offset Version="MQDebug" At="0x2117A0"/>
-                </Sample>
-                <Sample Name="Sample_343">
-                    <Offset Version="MQDebug" At="0x213510"/>
-                </Sample>
-                <Sample Name="Sample_344">
-                    <Offset Version="MQDebug" At="0x215040"/>
-                </Sample>
-                <Sample Name="Sample_345">
-                    <Offset Version="MQDebug" At="0x217170"/>
-                </Sample>
-                <Sample Name="Sample_346">
-                    <Offset Version="MQDebug" At="0x218B80"/>
-                </Sample>
-                <Sample Name="Sample_347">
-                    <Offset Version="MQDebug" At="0x219900"/>
-                </Sample>
-                <Sample Name="Sample_348">
-                    <Offset Version="MQDebug" At="0x21B470"/>
-                </Sample>
-                <Sample Name="Sample_349">
-                    <Offset Version="MQDebug" At="0x21C660"/>
-                </Sample>
-                <Sample Name="Sample_350">
-                    <Offset Version="MQDebug" At="0x21D430"/>
-                </Sample>
-                <Sample Name="Sample_351">
-                    <Offset Version="MQDebug" At="0x21E100"/>
-                </Sample>
-                <Sample Name="Sample_352">
-                    <Offset Version="MQDebug" At="0x21FF50"/>
-                </Sample>
-                <Sample Name="Sample_353">
-                    <Offset Version="MQDebug" At="0x222620"/>
-                </Sample>
-                <Sample Name="Sample_354">
-                    <Offset Version="MQDebug" At="0x2243A0"/>
-                </Sample>
-                <Sample Name="Sample_355">
-                    <Offset Version="MQDebug" At="0x226580"/>
-                </Sample>
-                <Sample Name="Sample_356">
-                    <Offset Version="MQDebug" At="0x227AC0"/>
-                </Sample>
-                <Sample Name="Sample_357">
-                    <Offset Version="MQDebug" At="0x229080"/>
-                </Sample>
-                <Sample Name="Sample_358">
-                    <Offset Version="MQDebug" At="0x22B010"/>
-                </Sample>
-                <Sample Name="Sample_359">
-                    <Offset Version="MQDebug" At="0x22CD50"/>
-                </Sample>
-                <Sample Name="Sample_360">
-                    <Offset Version="MQDebug" At="0x22EF10"/>
-                </Sample>
-                <Sample Name="Sample_361">
-                    <Offset Version="MQDebug" At="0x230F90"/>
-                </Sample>
-                <Sample Name="Sample_362">
-                    <Offset Version="MQDebug" At="0x233110"/>
-                </Sample>
-                <Sample Name="Sample_363">
-                    <Offset Version="MQDebug" At="0x234560"/>
-                </Sample>
-                <Sample Name="Sample_364">
-                    <Offset Version="MQDebug" At="0x235720"/>
-                </Sample>
-                <Sample Name="Sample_365">
-                    <Offset Version="MQDebug" At="0x237190"/>
-                </Sample>
-                <Sample Name="Sample_366">
-                    <Offset Version="MQDebug" At="0x238E50"/>
-                </Sample>
-                <Sample Name="Sample_367">
-                    <Offset Version="MQDebug" At="0x23A200"/>
-                </Sample>
-                <Sample Name="Sample_368">
-                    <Offset Version="MQDebug" At="0x23B270"/>
-                </Sample>
-                <Sample Name="Sample_369">
-                    <Offset Version="MQDebug" At="0x23CDA0"/>
-                </Sample>
-                <Sample Name="Sample_370">
-                    <Offset Version="MQDebug" At="0x23EF70"/>
-                </Sample>
-                <Sample Name="Sample_371">
-                    <Offset Version="MQDebug" At="0x240E20"/>
-                </Sample>
-                <Sample Name="Sample_372">
-                    <Offset Version="MQDebug" At="0x241260"/>
-                </Sample>
-                <Sample Name="Sample_373">
-                    <Offset Version="MQDebug" At="0x2423E0"/>
-                </Sample>
-                <Sample Name="Sample_374">
-                    <Offset Version="MQDebug" At="0x243E70"/>
-                </Sample>
-                <Sample Name="Sample_375">
-                    <Offset Version="MQDebug" At="0x245750"/>
-                </Sample>
-                <Sample Name="Sample_376">
-                    <Offset Version="MQDebug" At="0x245E40"/>
-                </Sample>
-                <Sample Name="Sample_377">
-                    <Offset Version="MQDebug" At="0x246780"/>
-                </Sample>
-                <Sample Name="Sample_378">
-                    <Offset Version="MQDebug" At="0x2479F0"/>
-                </Sample>
-                <Sample Name="Sample_379">
-                    <Offset Version="MQDebug" At="0x2492E0"/>
-                </Sample>
-                <Sample Name="Sample_380">
-                    <Offset Version="MQDebug" At="0x24AA40"/>
-                </Sample>
-                <Sample Name="Sample_381">
-                    <Offset Version="MQDebug" At="0x24CA20"/>
-                </Sample>
-                <Sample Name="Sample_382">
-                    <Offset Version="MQDebug" At="0x24E3C0"/>
-                </Sample>
-                <Sample Name="Sample_383">
-                    <Offset Version="MQDebug" At="0x24FCB0"/>
-                </Sample>
-                <Sample Name="Sample_384">
-                    <Offset Version="MQDebug" At="0x2513B0"/>
-                </Sample>
-                <Sample Name="Sample_385">
-                    <Offset Version="MQDebug" At="0x251EB0"/>
-                </Sample>
-                <Sample Name="Sample_386">
-                    <Offset Version="MQDebug" At="0x2539F0"/>
-                </Sample>
-                <Sample Name="Sample_387">
-                    <Offset Version="MQDebug" At="0x254180"/>
-                </Sample>
-                <Sample Name="Sample_388">
-                    <Offset Version="MQDebug" At="0x255CB0"/>
-                </Sample>
-                <Sample Name="Sample_389">
-                    <Offset Version="MQDebug" At="0x256720"/>
-                </Sample>
-                <Sample Name="Sample_390">
-                    <Offset Version="MQDebug" At="0x256CA0"/>
-                </Sample>
-                <Sample Name="Sample_391">
-                    <Offset Version="MQDebug" At="0x257B30"/>
-                </Sample>
-                <Sample Name="Sample_392">
-                    <Offset Version="MQDebug" At="0x258600"/>
-                </Sample>
-                <Sample Name="Sample_393">
-                    <Offset Version="MQDebug" At="0x258FF0"/>
-                </Sample>
-                <Sample Name="Sample_394">
-                    <Offset Version="MQDebug" At="0x25A450"/>
-                </Sample>
-                <Sample Name="Sample_395">
-                    <Offset Version="MQDebug" At="0x25B2A0"/>
-                </Sample>
-                <Sample Name="Sample_396">
-                    <Offset Version="MQDebug" At="0x25BB90"/>
-                </Sample>
-                <Sample Name="Sample_397">
-                    <Offset Version="MQDebug" At="0x25DB00"/>
-                </Sample>
-                <Sample Name="Sample_398">
-                    <Offset Version="MQDebug" At="0x25FD80"/>
-                </Sample>
-                <Sample Name="Sample_399">
-                    <Offset Version="MQDebug" At="0x262630"/>
-                </Sample>
-                <Sample Name="Sample_400">
-                    <Offset Version="MQDebug" At="0x264B20"/>
-                </Sample>
-                <Sample Name="Sample_401">
-                    <Offset Version="MQDebug" At="0x2651F0"/>
-                </Sample>
-                <Sample Name="Sample_402">
-                    <Offset Version="MQDebug" At="0x2665E0"/>
-                </Sample>
-                <Sample Name="Sample_403">
-                    <Offset Version="MQDebug" At="0x267E70"/>
-                </Sample>
-                <Sample Name="Sample_404">
-                    <Offset Version="MQDebug" At="0x26A7D0"/>
-                </Sample>
-                <Sample Name="Sample_405">
-                    <Offset Version="MQDebug" At="0x26F5F0"/>
-                </Sample>
-                <Sample Name="Sample_406">
-                    <Offset Version="MQDebug" At="0x270430"/>
-                </Sample>
-                <Sample Name="Sample_407">
-                    <Offset Version="MQDebug" At="0x271500"/>
-                </Sample>
-                <Sample Name="Sample_408">
-                    <Offset Version="MQDebug" At="0x2732E0"/>
-                </Sample>
-                <Sample Name="Sample_409">
-                    <Offset Version="MQDebug" At="0x273AF0"/>
-                </Sample>
-                <Sample Name="Sample_410">
-                    <Offset Version="MQDebug" At="0x275B90"/>
-                </Sample>
-                <Sample Name="Sample_411">
-                    <Offset Version="MQDebug" At="0x277160"/>
-                </Sample>
-                <Sample Name="Sample_412">
-                    <Offset Version="MQDebug" At="0x2786B0"/>
-                </Sample>
-                <Sample Name="Sample_413">
-                    <Offset Version="MQDebug" At="0x27B930"/>
-                </Sample>
-                <Sample Name="Sample_414">
-                    <Offset Version="MQDebug" At="0x280060"/>
-                </Sample>
-                <Sample Name="Sample_415">
-                    <Offset Version="MQDebug" At="0x284590"/>
-                </Sample>
-                <Sample Name="Sample_416">
-                    <Offset Version="MQDebug" At="0x286000"/>
-                </Sample>
-                <Sample Name="Sample_417">
-                    <Offset Version="MQDebug" At="0x28A690"/>
-                </Sample>
-                <Sample Name="Sample_418">
-                    <Offset Version="MQDebug" At="0x28CFA0"/>
-                </Sample>
-                <Sample Name="Sample_419">
-                    <Offset Version="MQDebug" At="0x28F270"/>
-                </Sample>
-                <Sample Name="Sample_420">
-                    <Offset Version="MQDebug" At="0x2917A0"/>
-                </Sample>
-                <Sample Name="Sample_421">
-                    <Offset Version="MQDebug" At="0x295040"/>
-                </Sample>
-                <Sample Name="Sample_422">
-                    <Offset Version="MQDebug" At="0x29A8F0"/>
-                </Sample>
-                <Sample Name="Sample_423">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x1C10"/>
-                </Sample>
-                <Sample Name="Sample_424">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x5CF0"/>
-                </Sample>
-                <Sample Name="Sample_425">
-                    <Offset Version="MQDebug" At="0x2A4740"/>
-                </Sample>
-                <Sample Name="Sample_426">
-                    <Offset Version="MQDebug" At="0x2AFCD0"/>
-                </Sample>
-                <Sample Name="Sample_427">
-                    <Offset Version="MQDebug" At="0x2B6570"/>
-                </Sample>
-                <Sample Name="Sample_428">
-                    <Offset Version="MQDebug" At="0x2B82E0"/>
-                </Sample>
-                <Sample Name="Sample_429">
-                    <Offset Version="MQDebug" At="0x2BB710"/>
-                </Sample>
-                <Sample Name="Sample_430">
-                    <Offset Version="MQDebug" At="0x2C08A0"/>
-                </Sample>
-                <Sample Name="Sample_431">
-                    <Offset Version="MQDebug" At="0x2C51D0" LoopOffset="0x320"/>
-                </Sample>
-                <Sample Name="Sample_432">
-                    <Offset Version="MQDebug" At="0x2C51D0" LoopOffset="0x6020"/>
-                </Sample>
-                <Sample Name="Sample_433">
-                    <Offset Version="MQDebug" At="0x2C6910"/>
-                </Sample>
-                <Sample Name="Sample_434">
-                    <Offset Version="MQDebug" At="0x2C7130" LoopOffset="0x860"/>
-                </Sample>
-                <Sample Name="Sample_435">
-                    <Offset Version="MQDebug" At="0x2C7130" LoopOffset="0x6080"/>
-                </Sample>
-                <Sample Name="Sample_436">
-                    <Offset Version="MQDebug" At="0x2C7D70" LoopOffset="0x880"/>
-                </Sample>
-                <Sample Name="Sample_437">
-                    <Offset Version="MQDebug" At="0x2C7D70" LoopOffset="0x60A0"/>
-                </Sample>
-                <Sample Name="Sample_438">
-                    <Offset Version="MQDebug" At="0x2C9200" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_439">
-                    <Offset Version="MQDebug" At="0x2C9200" LoopOffset="0x60C0"/>
-                </Sample>
-                <Sample Name="Sample_440">
-                    <Offset Version="MQDebug" At="0x2C9D30" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_441">
-                    <Offset Version="MQDebug" At="0x2C9D30" LoopOffset="0x60E0"/>
-                </Sample>
-                <Sample Name="Sample_442">
-                    <Offset Version="MQDebug" At="0x2CA730" LoopOffset="0x300"/>
-                </Sample>
-                <Sample Name="Sample_443">
-                    <Offset Version="MQDebug" At="0x2CA730" LoopOffset="0x6100"/>
-                </Sample>
-                <Sample Name="Sample_444">
-                    <Offset Version="MQDebug" At="0x2CADA0" LoopOffset="0xB80"/>
-                </Sample>
-                <Sample Name="Sample_445">
-                    <Offset Version="MQDebug" At="0x2CADA0" LoopOffset="0x6120"/>
-                </Sample>
-                <Sample Name="Sample_446">
-                    <Offset Version="MQDebug" At="0x2CC180" LoopOffset="0x1840"/>
-                </Sample>
-                <Sample Name="Sample_447">
-                    <Offset Version="MQDebug" At="0x2CC180" LoopOffset="0x6140"/>
-                </Sample>
-                <Sample Name="Sample_448">
-                    <Offset Version="MQDebug" At="0x2CD450" LoopOffset="0x1860"/>
-                </Sample>
-                <Sample Name="Sample_449">
-                    <Offset Version="MQDebug" At="0x2CD450" LoopOffset="0x6160"/>
-                </Sample>
-                <Sample Name="Sample_450">
-                    <Offset Version="MQDebug" At="0x2CF810" LoopOffset="0x1940"/>
-                </Sample>
-                <Sample Name="Sample_451">
-                    <Offset Version="MQDebug" At="0x2CF810" LoopOffset="0x6180"/>
-                </Sample>
-                <Sample Name="Sample_452">
-                    <Offset Version="MQDebug" At="0x2D0C60" LoopOffset="0x1960"/>
-                </Sample>
-                <Sample Name="Sample_453">
-                    <Offset Version="MQDebug" At="0x2D0C60" LoopOffset="0x61A0"/>
-                </Sample>
-                <Sample Name="Sample_454">
-                    <Offset Version="MQDebug" At="0x2D2490" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_455">
-                    <Offset Version="MQDebug" At="0x2D2490" LoopOffset="0x61C0"/>
-                </Sample>
-                <Sample Name="Sample_456">
-                    <Offset Version="MQDebug" At="0x2D2E90" LoopOffset="0x680"/>
-                </Sample>
-                <Sample Name="Sample_457">
-                    <Offset Version="MQDebug" At="0x2D2E90" LoopOffset="0x61E0"/>
-                </Sample>
-                <Sample Name="Sample_458">
-                    <Offset Version="MQDebug" At="0x2D3880" LoopOffset="0x6A0"/>
-                </Sample>
-                <Sample Name="Sample_459">
-                    <Offset Version="MQDebug" At="0x2D3880" LoopOffset="0x6200"/>
-                </Sample>
-                <Sample Name="Sample_460">
-                    <Offset Version="MQDebug" At="0x2D4550" LoopOffset="0x6C0"/>
-                </Sample>
-                <Sample Name="Sample_461">
-                    <Offset Version="MQDebug" At="0x2D4550" LoopOffset="0x6220"/>
-                </Sample>
-                <Sample Name="Sample_462">
-                    <Offset Version="MQDebug" At="0x2D5E20" LoopOffset="0x700"/>
-                </Sample>
-                <Sample Name="Sample_463">
-                    <Offset Version="MQDebug" At="0x2D5E20" LoopOffset="0x6240"/>
-                </Sample>
-                <Sample Name="Sample_464">
-                    <Offset Version="MQDebug" At="0x2D76A0"/>
-                </Sample>
-                <Sample Name="Sample_465">
-                    <Offset Version="MQDebug" At="0x2D8140"/>
-                </Sample>
-                <Sample Name="Sample_466">
-                    <Offset Version="MQDebug" At="0x2DA8A0"/>
-                </Sample>
-                <Sample Name="Sample_467">
-                    <Offset Version="MQDebug" At="0x2DB390"/>
-                </Sample>
-                <Sample Name="Sample_468">
-                    <Offset Version="MQDebug" At="0x2DCE60"/>
-                </Sample>
-                <Sample Name="Sample_469">
-                    <Offset Version="MQDebug" At="0x2DDA70"/>
-                </Sample>
-                <Sample Name="Sample_470">
-                    <Offset Version="MQDebug" At="0x2DE370"/>
-                </Sample>
-                <Sample Name="Sample_471">
-                    <Offset Version="MQDebug" At="0x2DE5E0"/>
-                </Sample>
-                <Sample Name="Sample_472">
-                    <Offset Version="MQDebug" At="0x2DE850"/>
-                </Sample>
-                <Sample Name="Sample_473">
-                    <Offset Version="MQDebug" At="0x2DECB0"/>
-                </Sample>
-                <Sample Name="Sample_474">
-                    <Offset Version="MQDebug" At="0x2DEED0"/>
-                </Sample>
-                <Sample Name="Sample_475">
-                    <Offset Version="MQDebug" At="0x2DF720"/>
-                </Sample>
-                <Sample Name="Sample_476">
-                    <Offset Version="MQDebug" At="0x2DFE90"/>
-                </Sample>
-                <Sample Name="Sample_477">
-                    <Offset Version="MQDebug" At="0x2E0A60"/>
-                </Sample>
-                <Sample Name="Sample_478">
-                    <Offset Version="MQDebug" At="0x2E1910"/>
-                </Sample>
-                <Sample Name="Sample_479">
-                    <Offset Version="MQDebug" At="0x2E42D0"/>
-                </Sample>
-                <Sample Name="Sample_480">
-                    <Offset Version="MQDebug" At="0x2E5E50"/>
-                </Sample>
-                <Sample Name="Sample_481">
-                    <Offset Version="MQDebug" At="0x2E6700"/>
-                </Sample>
-                <Sample Name="Sample_482">
-                    <Offset Version="MQDebug" At="0x2E6B00"/>
-                </Sample>
-                <Sample Name="Sample_483">
-                    <Offset Version="MQDebug" At="0x2E74B0"/>
-                </Sample>
-                <Sample Name="Sample_484">
-                    <Offset Version="MQDebug" At="0x2E89D0"/>
-                </Sample>
-                <Sample Name="Sample_485">
-                    <Offset Version="MQDebug" At="0x2E9610"/>
-                </Sample>
-                <Sample Name="Sample_486">
-                    <Offset Version="MQDebug" At="0x2EC210"/>
-                </Sample>
-                <Sample Name="Sample_487">
-                    <Offset Version="MQDebug" At="0x2ED150"/>
-                </Sample>
-                <Sample Name="Sample_488">
-                    <Offset Version="MQDebug" At="0x2EEAA0"/>
-                </Sample>
-                <Sample Name="Sample_489">
-                    <Offset Version="MQDebug" At="0x2F0600"/>
-                </Sample>
-                <Sample Name="Sample_490">
-                    <Offset Version="MQDebug" At="0x2F0BF0"/>
-                </Sample>
-                <Sample Name="Sample_491">
-                    <Offset Version="MQDebug" At="0x2F1780"/>
-                </Sample>
-                <Sample Name="Sample_492">
-                    <Offset Version="MQDebug" At="0x2F3850"/>
-                </Sample>
-                <Sample Name="Sample_493">
-                    <Offset Version="MQDebug" At="0x2F5360"/>
-                </Sample>
-                <Sample Name="Sample_494">
-                    <Offset Version="MQDebug" At="0x2F63A0"/>
-                </Sample>
-                <Sample Name="Sample_495">
-                    <Offset Version="MQDebug" At="0x2F68B0"/>
-                </Sample>
-                <Sample Name="Sample_496">
-                    <Offset Version="MQDebug" At="0x2F7490"/>
-                </Sample>
-                <Sample Name="Sample_497">
-                    <Offset Version="MQDebug" At="0x2F87D0"/>
-                </Sample>
-                <Sample Name="Sample_498">
-                    <Offset Version="MQDebug" At="0x2FC270"/>
-                </Sample>
-                <Sample Name="Sample_499">
-                    <Offset Version="MQDebug" At="0x2FFF70"/>
-                </Sample>
-                <Sample Name="Sample_500">
-                    <Offset Version="MQDebug" At="0x3030E0"/>
-                </Sample>
-                <Sample Name="Sample_501">
-                    <Offset Version="MQDebug" At="0x303670"/>
-                </Sample>
-                <Sample Name="Sample_502">
-                    <Offset Version="MQDebug" At="0x304E90"/>
-                </Sample>
-                <Sample Name="Sample_503">
-                    <Offset Version="MQDebug" At="0x306820"/>
-                </Sample>
-                <Sample Name="Sample_504">
-                    <Offset Version="MQDebug" At="0x308540"/>
-                </Sample>
-                <Sample Name="Sample_505">
-                    <Offset Version="MQDebug" At="0x309300"/>
-                </Sample>
-                <Sample Name="Sample_506">
-                    <Offset Version="MQDebug" At="0x309DD0"/>
-                </Sample>
-                <Sample Name="Sample_507">
-                    <Offset Version="MQDebug" At="0x30ACA0"/>
-                </Sample>
-                <Sample Name="Sample_508">
-                    <Offset Version="MQDebug" At="0x30C320"/>
-                </Sample>
-                <Sample Name="Sample_509">
-                    <Offset Version="MQDebug" At="0x30CF40"/>
-                </Sample>
-                <Sample Name="Sample_510">
-                    <Offset Version="MQDebug" At="0x30D5D0"/>
-                </Sample>
-                <Sample Name="Sample_511">
-                    <Offset Version="MQDebug" At="0x30E370"/>
-                </Sample>
-                <Sample Name="Sample_512">
-                    <Offset Version="MQDebug" At="0x30EEA0"/>
-                </Sample>
-                <Sample Name="Sample_513">
-                    <Offset Version="MQDebug" At="0x310730"/>
-                </Sample>
-                <Sample Name="Sample_514">
-                    <Offset Version="MQDebug" At="0x311590"/>
-                </Sample>
-                <Sample Name="Sample_515">
-                    <Offset Version="MQDebug" At="0x311B20"/>
-                </Sample>
-                <Sample Name="Sample_516">
-                    <Offset Version="MQDebug" At="0x312590"/>
-                </Sample>
-                <Sample Name="Sample_517">
-                    <Offset Version="MQDebug" At="0x3129E0"/>
-                </Sample>
-                <Sample Name="Sample_518">
-                    <Offset Version="MQDebug" At="0x3142D0"/>
-                </Sample>
-                <Sample Name="Sample_519">
-                    <Offset Version="MQDebug" At="0x317850"/>
-                </Sample>
-                <Sample Name="Sample_520">
-                    <Offset Version="MQDebug" At="0x31A100"/>
-                </Sample>
-                <Sample Name="Sample_521">
-                    <Offset Version="MQDebug" At="0x31C380"/>
-                </Sample>
-                <Sample Name="Sample_522">
-                    <Offset Version="MQDebug" At="0x31EE60"/>
-                </Sample>
-                <Sample Name="Sample_523">
-                    <Offset Version="MQDebug" At="0x31F980"/>
-                </Sample>
-                <Sample Name="Sample_524">
-                    <Offset Version="MQDebug" At="0x3205A0"/>
-                </Sample>
-                <Sample Name="Sample_525">
-                    <Offset Version="MQDebug" At="0x324A40"/>
-                </Sample>
-                <Sample Name="Sample_526">
-                    <Offset Version="MQDebug" At="0x324F90"/>
-                </Sample>
-                <Sample Name="Sample_527">
-                    <Offset Version="MQDebug" At="0x325BE0"/>
-                </Sample>
-                <Sample Name="Sample_528">
-                    <Offset Version="MQDebug" At="0x327550"/>
-                </Sample>
-                <Sample Name="Sample_529">
-                    <Offset Version="MQDebug" At="0x3294B0"/>
-                </Sample>
-                <Sample Name="Sample_530">
-                    <Offset Version="MQDebug" At="0x32A520"/>
-                </Sample>
-                <Sample Name="Sample_531">
-                    <Offset Version="MQDebug" At="0x32B240"/>
-                </Sample>
-                <Sample Name="Sample_532">
-                    <Offset Version="MQDebug" At="0x32F340"/>
-                </Sample>
-                <Sample Name="Sample_533">
-                    <Offset Version="MQDebug" At="0x330580"/>
-                </Sample>
-                <Sample Name="Sample_534">
-                    <Offset Version="MQDebug" At="0x3318C0"/>
-                </Sample>
-                <Sample Name="Sample_535">
-                    <Offset Version="MQDebug" At="0x332C80"/>
-                </Sample>
-                <Sample Name="Sample_536">
-                    <Offset Version="MQDebug" At="0x3381F0"/>
-                </Sample>
-                <Sample Name="Sample_537">
-                    <Offset Version="MQDebug" At="0x33B090"/>
-                </Sample>
-                <Sample Name="Sample_538">
-                    <Offset Version="MQDebug" At="0x33CB40"/>
-                </Sample>
-                <Sample Name="Sample_539">
-                    <Offset Version="MQDebug" At="0x341990"/>
-                </Sample>
-                <Sample Name="Sample_540">
-                    <Offset Version="MQDebug" At="0x342B90"/>
-                </Sample>
-                <Sample Name="Sample_541">
-                    <Offset Version="MQDebug" At="0x344EA0"/>
-                </Sample>
-                <Sample Name="Sample_542">
-                    <Offset Version="MQDebug" At="0x34A3D0"/>
-                </Sample>
-                <Sample Name="Sample_543">
-                    <Offset Version="MQDebug" At="0x34C430"/>
-                </Sample>
-                <Sample Name="Sample_544">
-                    <Offset Version="MQDebug" At="0x34E7C0"/>
-                </Sample>
-                <Sample Name="Sample_545">
-                    <Offset Version="MQDebug" At="0x352D10"/>
-                </Sample>
-                <Sample Name="Sample_546">
-                    <Offset Version="MQDebug" At="0x353AD0"/>
-                </Sample>
-                <Sample Name="Sample_547">
-                    <Offset Version="MQDebug" At="0x354560"/>
-                </Sample>
-                <Sample Name="Sample_548">
-                    <Offset Version="MQDebug" At="0x356A80"/>
-                </Sample>
-                <Sample Name="Sample_549">
-                    <Offset Version="MQDebug" At="0x358620"/>
-                </Sample>
-                <Sample Name="Sample_550">
-                    <Offset Version="MQDebug" At="0x35B680"/>
-                </Sample>
-                <Sample Name="Sample_551">
-                    <Offset Version="MQDebug" At="0x35F640"/>
-                </Sample>
-                <Sample Name="Sample_552">
-                    <Offset Version="MQDebug" At="0x362420"/>
-                </Sample>
-                <Sample Name="Sample_553">
-                    <Offset Version="MQDebug" At="0x3630C0"/>
-                </Sample>
-                <Sample Name="Sample_554">
-                    <Offset Version="MQDebug" At="0x366D60"/>
-                </Sample>
-                <Sample Name="Sample_555">
-                    <Offset Version="MQDebug" At="0x367B00"/>
-                </Sample>
-                <Sample Name="Sample_556">
-                    <Offset Version="MQDebug" At="0x36A580"/>
-                </Sample>
-                <Sample Name="Sample_557">
-                    <Offset Version="MQDebug" At="0x36B000"/>
-                </Sample>
-                <Sample Name="Sample_558">
-                    <Offset Version="MQDebug" At="0x36BA80"/>
-                </Sample>
-                <Sample Name="Sample_559">
-                    <Offset Version="MQDebug" At="0x36C410"/>
-                </Sample>
-                <Sample Name="Sample_560">
-                    <Offset Version="MQDebug" At="0x36CA80"/>
-                </Sample>
-                <Sample Name="Sample_561">
-                    <Offset Version="MQDebug" At="0x36DDD0"/>
-                </Sample>
-                <Sample Name="Sample_562">
-                    <Offset Version="MQDebug" At="0x36F130"/>
-                </Sample>
-                <Sample Name="Sample_563">
-                    <Offset Version="MQDebug" At="0x370080"/>
-                </Sample>
-                <Sample Name="Sample_564">
-                    <Offset Version="MQDebug" At="0x370A30"/>
-                </Sample>
-                <Sample Name="Sample_565">
-                    <Offset Version="MQDebug" At="0x371C50"/>
-                </Sample>
-                <Sample Name="Sample_566">
-                    <Offset Version="MQDebug" At="0x372FF0"/>
-                </Sample>
-                <Sample Name="Sample_567">
-                    <Offset Version="MQDebug" At="0x375050"/>
-                </Sample>
-                <Sample Name="Sample_568">
-                    <Offset Version="MQDebug" At="0x376D20"/>
-                </Sample>
-                <Sample Name="Sample_569">
-                    <Offset Version="MQDebug" At="0x378920"/>
-                </Sample>
-                <Sample Name="Sample_570">
-                    <Offset Version="MQDebug" At="0x37AD80"/>
-                </Sample>
-                <Sample Name="Sample_571">
-                    <Offset Version="MQDebug" At="0x37BCE0"/>
-                </Sample>
-                <Sample Name="Sample_572">
-                    <Offset Version="MQDebug" At="0x37E300"/>
-                </Sample>
-                <Sample Name="Sample_573">
-                    <Offset Version="MQDebug" At="0x37F0A0"/>
-                </Sample>
-                <Sample Name="Sample_574">
-                    <Offset Version="MQDebug" At="0x3804A0"/>
-                </Sample>
-                <Sample Name="Sample_575">
-                    <Offset Version="MQDebug" At="0x380A80"/>
-                </Sample>
-                <Sample Name="Sample_576">
-                    <Offset Version="MQDebug" At="0x381120"/>
-                </Sample>
-                <Sample Name="Sample_577">
-                    <Offset Version="MQDebug" At="0x381890"/>
-                </Sample>
-                <Sample Name="Sample_578">
-                    <Offset Version="MQDebug" At="0x382370"/>
-                </Sample>
-                <Sample Name="Sample_579">
-                    <Offset Version="MQDebug" At="0x382CD0"/>
-                </Sample>
-                <Sample Name="Sample_580">
-                    <Offset Version="MQDebug" At="0x383220"/>
-                </Sample>
-                <Sample Name="Sample_581">
-                    <Offset Version="MQDebug" At="0x386120"/>
-                </Sample>
-                <Sample Name="Sample_582">
-                    <Offset Version="MQDebug" At="0x386320"/>
-                </Sample>
-                <Sample Name="Sample_583">
-                    <Offset Version="MQDebug" At="0x386550"/>
-                </Sample>
-                <Sample Name="Sample_584">
-                    <Offset Version="MQDebug" At="0x386AE0"/>
-                </Sample>
-                <Sample Name="Sample_585">
-                    <Offset Version="MQDebug" At="0x387050"/>
-                </Sample>
-                <Sample Name="Sample_586">
-                    <Offset Version="MQDebug" At="0x3874B0"/>
-                </Sample>
-                <Sample Name="Sample_587">
-                    <Offset Version="MQDebug" At="0x387CA0"/>
-                </Sample>
-                <Sample Name="Sample_588">
-                    <Offset Version="MQDebug" At="0x388DA0"/>
-                </Sample>
-                <Sample Name="Sample_589">
-                    <Offset Version="MQDebug" At="0x38B6A0"/>
-                </Sample>
-                <Sample Name="Sample_590">
-                    <Offset Version="MQDebug" At="0x38C420"/>
-                </Sample>
-                <Sample Name="Sample_591">
-                    <Offset Version="MQDebug" At="0x38D300"/>
-                </Sample>
-                <Sample Name="Sample_592">
-                    <Offset Version="MQDebug" At="0x396B40"/>
-                </Sample>
-                <Sample Name="Sample_593">
-                    <Offset Version="MQDebug" At="0x397530"/>
-                </Sample>
-                <Sample Name="Sample_594">
-                    <Offset Version="MQDebug" At="0x397DB0"/>
-                </Sample>
-                <Sample Name="Sample_595">
-                    <Offset Version="MQDebug" At="0x3987C0"/>
-                </Sample>
-                <Sample Name="Sample_596">
-                    <Offset Version="MQDebug" At="0x399C00"/>
-                </Sample>
-                <Sample Name="Sample_597">
-                    <Offset Version="MQDebug" At="0x39AC40"/>
-                </Sample>
-                <Sample Name="Sample_598">
-                    <Offset Version="MQDebug" At="0x39B3B0"/>
-                </Sample>
-                <Sample Name="Sample_599">
-                    <Offset Version="MQDebug" At="0x39B700"/>
-                </Sample>
-                <Sample Name="Sample_600">
-                    <Offset Version="MQDebug" At="0x39CE50"/>
-                </Sample>
-                <Sample Name="Sample_601">
-                    <Offset Version="MQDebug" At="0x39D590"/>
-                </Sample>
-                <Sample Name="Sample_602">
-                    <Offset Version="MQDebug" At="0x39D9F0"/>
-                </Sample>
-                <Sample Name="Sample_603">
-                    <Offset Version="MQDebug" At="0x39F4B0"/>
-                </Sample>
-                <Sample Name="Sample_604">
-                    <Offset Version="MQDebug" At="0x3A0710"/>
-                </Sample>
-                <Sample Name="Sample_605">
-                    <Offset Version="MQDebug" At="0x3A0F30"/>
-                </Sample>
-                <Sample Name="Sample_606">
-                    <Offset Version="MQDebug" At="0x3A2400"/>
-                </Sample>
-                <Sample Name="Sample_607">
-                    <Offset Version="MQDebug" At="0x3A3090"/>
-                </Sample>
-                <Sample Name="Sample_608">
-                    <Offset Version="MQDebug" At="0x3A3500"/>
-                </Sample>
-                <Sample Name="Sample_609">
-                    <Offset Version="MQDebug" At="0x3A4340"/>
-                </Sample>
-                <Sample Name="Sample_610">
-                    <Offset Version="MQDebug" At="0x3A4CF0"/>
-                </Sample>
-                <Sample Name="Sample_611">
-                    <Offset Version="MQDebug" At="0x3AB8C0"/>
-                </Sample>
-                <Sample Name="Sample_612">
-                    <Offset Version="MQDebug" At="0x3AC4B0"/>
-                </Sample>
-                <Sample Name="Sample_613">
-                    <Offset Version="MQDebug" At="0x3AC6D0"/>
-                </Sample>
-                <Sample Name="Sample_614">
-                    <Offset Version="MQDebug" At="0x3AD6F0"/>
-                </Sample>
-                <Sample Name="Sample_615">
-                    <Offset Version="MQDebug" At="0x3ADEA0"/>
-                </Sample>
-                <Sample Name="Sample_616">
-                    <Offset Version="MQDebug" At="0x3AF120"/>
-                </Sample>
-                <Sample Name="Sample_617">
-                    <Offset Version="MQDebug" At="0x3AFC30"/>
-                </Sample>
-                <Sample Name="Sample_618">
-                    <Offset Version="MQDebug" At="0x3B1970"/>
-                </Sample>
-                <Sample Name="Sample_619">
-                    <Offset Version="MQDebug" At="0x3B1DA0"/>
-                </Sample>
-                <Sample Name="Sample_620">
-                    <Offset Version="MQDebug" At="0x3B2D90"/>
-                </Sample>
-                <Sample Name="Sample_621">
-                    <Offset Version="MQDebug" At="0x3B3240"/>
-                </Sample>
-                <Sample Name="Sample_622">
-                    <Offset Version="MQDebug" At="0x3B4690"/>
-                </Sample>
-                <Sample Name="Sample_623">
-                    <Offset Version="MQDebug" At="0x3B4D10"/>
-                </Sample>
-                <Sample Name="Sample_624">
-                    <Offset Version="MQDebug" At="0x3B9640"/>
-                </Sample>
-                <Sample Name="Sample_625">
-                    <Offset Version="MQDebug" At="0x3BA830"/>
-                </Sample>
-                <Sample Name="Sample_626">
-                    <Offset Version="MQDebug" At="0x3BB3C0"/>
-                </Sample>
-                <Sample Name="Sample_627">
-                    <Offset Version="MQDebug" At="0x3BCB80"/>
-                </Sample>
-                <Sample Name="Sample_628">
-                    <Offset Version="MQDebug" At="0x3BE0A0"/>
-                </Sample>
-                <Sample Name="Sample_629">
-                    <Offset Version="MQDebug" At="0x3BE6C0"/>
-                </Sample>
-                <Sample Name="Sample_630">
-                    <Offset Version="MQDebug" At="0x3BF500"/>
-                </Sample>
-            </Samples>
-            <Samples Bank="1">
-                <Sample Name="Sample_631">
-                    <Offset Version="MQDebug" At="0x2786B0" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_632">
-                    <Offset Version="MQDebug" At="0x2786B0" LoopOffset="0x370"/>
-                </Sample>
-                <Sample Name="Sample_633">
-                    <Offset Version="MQDebug" At="0x2786B0" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_634">
-                    <Offset Version="MQDebug" At="0x2786B0" LoopOffset="0x240"/>
-                </Sample>
-                <Sample Name="Sample_635">
-                    <Offset Version="MQDebug" At="0x2786B0" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_636">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x700"/>
-                </Sample>
-                <Sample Name="Sample_637">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x790"/>
-                </Sample>
-                <Sample Name="Sample_638">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x320"/>
-                </Sample>
-                <Sample Name="Sample_639">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x350"/>
-                </Sample>
-                <Sample Name="Sample_640">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x1B0"/>
-                </Sample>
-                <Sample Name="Sample_641">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_642">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_643">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0xDD0"/>
-                </Sample>
-                <Sample Name="Sample_644">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0xB70"/>
-                </Sample>
-                <Sample Name="Sample_645">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_646">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0x6B0"/>
-                </Sample>
-                <Sample Name="Sample_647">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0x9F0"/>
-                </Sample>
-                <Sample Name="Sample_648">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0x780"/>
-                </Sample>
-                <Sample Name="Sample_649">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_650">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0xD20"/>
-                </Sample>
-                <Sample Name="Sample_651">
-                    <Offset Version="MQDebug" At="0x284590" LoopOffset="0xC90"/>
-                </Sample>
-                <Sample Name="Sample_652">
-                    <Offset Version="MQDebug" At="0x284590" LoopOffset="0x630"/>
-                </Sample>
-                <Sample Name="Sample_653">
-                    <Offset Version="MQDebug" At="0x284590" LoopOffset="0x9D0"/>
-                </Sample>
-                <Sample Name="Sample_654">
-                    <Offset Version="MQDebug" At="0x284590" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_655">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x70"/>
-                </Sample>
-                <Sample Name="Sample_656">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x5A0"/>
-                </Sample>
-                <Sample Name="Sample_657">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x370"/>
-                </Sample>
-                <Sample Name="Sample_658">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_659">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x310"/>
-                </Sample>
-                <Sample Name="Sample_660">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_661">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_662">
-                    <Offset Version="MQDebug" At="0x28A690" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_663">
-                    <Offset Version="MQDebug" At="0x28A690" LoopOffset="0x240"/>
-                </Sample>
-                <Sample Name="Sample_664">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x3C0"/>
-                </Sample>
-                <Sample Name="Sample_665">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x450"/>
-                </Sample>
-                <Sample Name="Sample_666">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x8C0"/>
-                </Sample>
-                <Sample Name="Sample_667">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x720"/>
-                </Sample>
-                <Sample Name="Sample_668">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x4C0"/>
-                </Sample>
-                <Sample Name="Sample_669">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x3B0"/>
-                </Sample>
-                <Sample Name="Sample_670">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x450"/>
-                </Sample>
-                <Sample Name="Sample_671">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x4E0"/>
-                </Sample>
-                <Sample Name="Sample_672">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x950"/>
-                </Sample>
-                <Sample Name="Sample_673">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x7B0"/>
-                </Sample>
-                <Sample Name="Sample_674">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x550"/>
-                </Sample>
-                <Sample Name="Sample_675">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x440"/>
-                </Sample>
-                <Sample Name="Sample_676">
-                    <Offset Version="MQDebug" At="0x2917A0"/>
-                </Sample>
-                <Sample Name="Sample_677">
-                    <Offset Version="MQDebug" At="0x295040" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_678">
-                    <Offset Version="MQDebug" At="0x295040" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_679">
-                    <Offset Version="MQDebug" At="0x295040" LoopOffset="0x5C0"/>
-                </Sample>
-                <Sample Name="Sample_680">
-                    <Offset Version="MQDebug" At="0x295040" LoopOffset="0x2D0"/>
-                </Sample>
-                <Sample Name="Sample_681">
-                    <Offset Version="MQDebug" At="0x295040" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_682">
-                    <Offset Version="MQDebug" At="0x29A8F0"/>
-                </Sample>
-                <Sample Name="Sample_683">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_684">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x8A0"/>
-                </Sample>
-                <Sample Name="Sample_685">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x3C0"/>
-                </Sample>
-                <Sample Name="Sample_686">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x490"/>
-                </Sample>
-                <Sample Name="Sample_687">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x720"/>
-                </Sample>
-                <Sample Name="Sample_688">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x4B0"/>
-                </Sample>
-                <Sample Name="Sample_689">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x650"/>
-                </Sample>
-                <Sample Name="Sample_690">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x9E0"/>
-                </Sample>
-                <Sample Name="Sample_691">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x770"/>
-                </Sample>
-                <Sample Name="Sample_692">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x780"/>
-                </Sample>
-                <Sample Name="Sample_693">
-                    <Offset Version="MQDebug" At="0x2A4740" LoopOffset="0xD00"/>
-                </Sample>
-                <Sample Name="Sample_694">
-                    <Offset Version="MQDebug" At="0x2A4740" LoopOffset="0x120"/>
-                </Sample>
-                <Sample Name="Sample_695">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0x700"/>
-                </Sample>
-                <Sample Name="Sample_696">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0x670"/>
-                </Sample>
-                <Sample Name="Sample_697">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0x740"/>
-                </Sample>
-                <Sample Name="Sample_698">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0x6A0"/>
-                </Sample>
-                <Sample Name="Sample_699">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0xD50"/>
-                </Sample>
-                <Sample Name="Sample_700">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0x240"/>
-                </Sample>
-                <Sample Name="Sample_701">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0xC00"/>
-                </Sample>
-                <Sample Name="Sample_702">
-                    <Offset Version="MQDebug" At="0x2B6570" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_703">
-                    <Offset Version="MQDebug" At="0x2B6570" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_704">
-                    <Offset Version="MQDebug" At="0x2B6570" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_705">
-                    <Offset Version="MQDebug" At="0x2B82E0"/>
-                </Sample>
-                <Sample Name="Sample_706">
-                    <Offset Version="MQDebug" At="0x2BB710" LoopOffset="0xC00"/>
-                </Sample>
-                <Sample Name="Sample_707">
-                    <Offset Version="MQDebug" At="0x2BB710" LoopOffset="0xA10"/>
-                </Sample>
-                <Sample Name="Sample_708">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0xC20"/>
-                </Sample>
-                <Sample Name="Sample_709">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_710">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0x9D0"/>
-                </Sample>
-                <Sample Name="Sample_711">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0x500"/>
-                </Sample>
-                <Sample Name="Sample_712">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0x4E0"/>
-                </Sample>
-                <Sample Name="Sample_713">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0x8F0"/>
-                </Sample>
-                <Sample Name="Sample_714">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0xCB0"/>
-                </Sample>
-                <Sample Name="Sample_715">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_716">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0xA60"/>
-                </Sample>
-                <Sample Name="Sample_717">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0x590"/>
-                </Sample>
-                <Sample Name="Sample_718">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0x570"/>
-                </Sample>
-                <Sample Name="Sample_719">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0x980"/>
-                </Sample>
-                <Sample Name="Sample_720">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0xD40"/>
-                </Sample>
-                <Sample Name="Sample_721">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0xAE0"/>
-                </Sample>
-                <Sample Name="Sample_722">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_723">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0x620"/>
-                </Sample>
-                <Sample Name="Sample_724">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0x960"/>
-                </Sample>
-                <Sample Name="Sample_725">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0x6F0"/>
-                </Sample>
-                <Sample Name="Sample_726">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_727">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0xC90"/>
-                </Sample>
-                <Sample Name="Sample_728">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x650"/>
-                </Sample>
-                <Sample Name="Sample_729">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x7F0"/>
-                </Sample>
-                <Sample Name="Sample_730">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x240"/>
-                </Sample>
-                <Sample Name="Sample_731">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_732">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_733">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x520"/>
-                </Sample>
-                <Sample Name="Sample_734">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x2D0"/>
-                </Sample>
-                <Sample Name="Sample_735">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_736">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_737">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x730"/>
-                </Sample>
-                <Sample Name="Sample_738">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x6E0"/>
-                </Sample>
-                <Sample Name="Sample_739">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x200"/>
-                </Sample>
-                <Sample Name="Sample_740">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x2D0"/>
-                </Sample>
-                <Sample Name="Sample_741">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x560"/>
-                </Sample>
-                <Sample Name="Sample_742">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_743">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x490"/>
-                </Sample>
-                <Sample Name="Sample_744">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x820"/>
-                </Sample>
-                <Sample Name="Sample_745">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x5B0"/>
-                </Sample>
-                <Sample Name="Sample_746">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x5C0"/>
-                </Sample>
-                <Sample Name="Sample_747">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x110"/>
-                </Sample>
-                <Sample Name="Sample_748">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x750"/>
-                </Sample>
-                <Sample Name="Sample_749">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x270"/>
-                </Sample>
-                <Sample Name="Sample_750">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x340"/>
-                </Sample>
-                <Sample Name="Sample_751">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x5D0"/>
-                </Sample>
-                <Sample Name="Sample_752">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_753">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x500"/>
-                </Sample>
-                <Sample Name="Sample_754">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x890"/>
-                </Sample>
-                <Sample Name="Sample_755">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x620"/>
-                </Sample>
-                <Sample Name="Sample_756">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x630"/>
-                </Sample>
-                <Sample Name="Sample_757">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x180"/>
-                </Sample>
-                <Sample Name="Sample_758">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x7C0"/>
-                </Sample>
-                <Sample Name="Sample_759">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_760">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x3B0"/>
-                </Sample>
-                <Sample Name="Sample_761">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x640"/>
-                </Sample>
-                <Sample Name="Sample_762">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x3D0"/>
-                </Sample>
-                <Sample Name="Sample_763">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x570"/>
-                </Sample>
-                <Sample Name="Sample_764">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x900"/>
-                </Sample>
-                <Sample Name="Sample_765">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x690"/>
-                </Sample>
-                <Sample Name="Sample_766">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x6A0"/>
-                </Sample>
-                <Sample Name="Sample_767">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x1F0"/>
-                </Sample>
-                <Sample Name="Sample_768">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x830"/>
-                </Sample>
-                <Sample Name="Sample_769">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x350"/>
-                </Sample>
-                <Sample Name="Sample_770">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x420"/>
-                </Sample>
-                <Sample Name="Sample_771">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x6B0"/>
-                </Sample>
-                <Sample Name="Sample_772">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x440"/>
-                </Sample>
-                <Sample Name="Sample_773">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x5E0"/>
-                </Sample>
-                <Sample Name="Sample_774">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x970"/>
-                </Sample>
-                <Sample Name="Sample_775">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x700"/>
-                </Sample>
-                <Sample Name="Sample_776">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x710"/>
-                </Sample>
-                <Sample Name="Sample_777">
-                    <Offset Version="MQDebug" At="0x3EBAA0" LoopOffset="0x270"/>
-                </Sample>
-                <Sample Name="Sample_778">
-                    <Offset Version="MQDebug" At="0x3EBAA0" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_779">
-                    <Offset Version="MQDebug" At="0x3EBAA0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_780">
-                    <Offset Version="MQDebug" At="0x3EF2C0" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_781">
-                    <Offset Version="MQDebug" At="0x3EF2C0" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_782">
-                    <Offset Version="MQDebug" At="0x3F0780" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_783">
-                    <Offset Version="MQDebug" At="0x3F0780" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_784">
-                    <Offset Version="MQDebug" At="0x3F21D0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_785">
-                    <Offset Version="MQDebug" At="0x3F21D0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_786">
-                    <Offset Version="MQDebug" At="0x3F21D0" LoopOffset="0x650"/>
-                </Sample>
-                <Sample Name="Sample_787">
-                    <Offset Version="MQDebug" At="0x3F21D0" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_788">
-                    <Offset Version="MQDebug" At="0x3F21D0" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_789">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x430"/>
-                </Sample>
-                <Sample Name="Sample_790">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x4C0"/>
-                </Sample>
-                <Sample Name="Sample_791">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x930"/>
-                </Sample>
-                <Sample Name="Sample_792">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x790"/>
-                </Sample>
-                <Sample Name="Sample_793">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_794">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x420"/>
-                </Sample>
-                <Sample Name="Sample_795">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x4C0"/>
-                </Sample>
-                <Sample Name="Sample_796">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_797">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_798">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x440"/>
-                </Sample>
-                <Sample Name="Sample_799">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x550"/>
-                </Sample>
-                <Sample Name="Sample_800">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_801">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_802">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_803">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0x5E0"/>
-                </Sample>
-                <Sample Name="Sample_804">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0x550"/>
-                </Sample>
-                <Sample Name="Sample_805">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0x620"/>
-                </Sample>
-                <Sample Name="Sample_806">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0x580"/>
-                </Sample>
-                <Sample Name="Sample_807">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0xC30"/>
-                </Sample>
-                <Sample Name="Sample_808">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0x120"/>
-                </Sample>
-                <Sample Name="Sample_809">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0xAE0"/>
-                </Sample>
-                <Sample Name="Sample_810">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0x670"/>
-                </Sample>
-                <Sample Name="Sample_811">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0x5E0"/>
-                </Sample>
-                <Sample Name="Sample_812">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0x6B0"/>
-                </Sample>
-                <Sample Name="Sample_813">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0x610"/>
-                </Sample>
-                <Sample Name="Sample_814">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0xCC0"/>
-                </Sample>
-                <Sample Name="Sample_815">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0x1B0"/>
-                </Sample>
-                <Sample Name="Sample_816">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0xB70"/>
-                </Sample>
-                <Sample Name="Sample_817">
-                    <Offset Version="MQDebug" At="0x40A1A0" LoopOffset="0x790"/>
-                </Sample>
-                <Sample Name="Sample_818">
-                    <Offset Version="MQDebug" At="0x40A1A0" LoopOffset="0x820"/>
-                </Sample>
-                <Sample Name="Sample_819">
-                    <Offset Version="MQDebug" At="0x40A1A0" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_820">
-                    <Offset Version="MQDebug" At="0x40A1A0" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_821">
-                    <Offset Version="MQDebug" At="0x40E220" LoopOffset="0x8B0"/>
-                </Sample>
-                <Sample Name="Sample_822">
-                    <Offset Version="MQDebug" At="0x40E220" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_823">
-                    <Offset Version="MQDebug" At="0x40EBE0" LoopOffset="0x920"/>
-                </Sample>
-                <Sample Name="Sample_824">
-                    <Offset Version="MQDebug" At="0x40EBE0" LoopOffset="0x5A0"/>
-                </Sample>
-                <Sample Name="Sample_825">
-                    <Offset Version="MQDebug" At="0x40EBE0" LoopOffset="0x7A0"/>
-                </Sample>
-                <Sample Name="Sample_826">
-                    <Offset Version="MQDebug" At="0x411340" LoopOffset="0x990"/>
-                </Sample>
-                <Sample Name="Sample_827">
-                    <Offset Version="MQDebug" At="0x411340" LoopOffset="0x610"/>
-                </Sample>
-                <Sample Name="Sample_828">
-                    <Offset Version="MQDebug" At="0x411340" LoopOffset="0x810"/>
-                </Sample>
-                <Sample Name="Sample_829">
-                    <Offset Version="MQDebug" At="0x412620" LoopOffset="0xA00"/>
-                </Sample>
-                <Sample Name="Sample_830">
-                    <Offset Version="MQDebug" At="0x412620" LoopOffset="0x680"/>
-                </Sample>
-                <Sample Name="Sample_831">
-                    <Offset Version="MQDebug" At="0x412620" LoopOffset="0x880"/>
-                </Sample>
-                <Sample Name="Sample_832">
-                    <Offset Version="MQDebug" At="0x414C60" LoopOffset="0xA70"/>
-                </Sample>
-                <Sample Name="Sample_833">
-                    <Offset Version="MQDebug" At="0x414C60" LoopOffset="0x6F0"/>
-                </Sample>
-                <Sample Name="Sample_834">
-                    <Offset Version="MQDebug" At="0x414C60" LoopOffset="0x8F0"/>
-                </Sample>
-                <Sample Name="Sample_835">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0xA70"/>
-                </Sample>
-                <Sample Name="Sample_836">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x810"/>
-                </Sample>
-                <Sample Name="Sample_837">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_838">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_839">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_840">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x7B0"/>
-                </Sample>
-                <Sample Name="Sample_841">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0xAE0"/>
-                </Sample>
-                <Sample Name="Sample_842">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_843">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x540"/>
-                </Sample>
-                <Sample Name="Sample_844">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x370"/>
-                </Sample>
-                <Sample Name="Sample_845">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x350"/>
-                </Sample>
-                <Sample Name="Sample_846">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x490"/>
-                </Sample>
-                <Sample Name="Sample_847">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x2C0"/>
-                </Sample>
-                <Sample Name="Sample_848">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x820"/>
-                </Sample>
-                <Sample Name="Sample_849">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x930"/>
-                </Sample>
-                <Sample Name="Sample_850">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0xB00"/>
-                </Sample>
-                <Sample Name="Sample_851">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x8A0"/>
-                </Sample>
-                <Sample Name="Sample_852">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_853">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_854">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_855">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x840"/>
-                </Sample>
-                <Sample Name="Sample_856">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0xB70"/>
-                </Sample>
-                <Sample Name="Sample_857">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_858">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x5D0"/>
-                </Sample>
-                <Sample Name="Sample_859">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_860">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x3E0"/>
-                </Sample>
-                <Sample Name="Sample_861">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x520"/>
-                </Sample>
-                <Sample Name="Sample_862">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x350"/>
-                </Sample>
-                <Sample Name="Sample_863">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x8B0"/>
-                </Sample>
-                <Sample Name="Sample_864">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x9C0"/>
-                </Sample>
-                <Sample Name="Sample_865">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0xB90"/>
-                </Sample>
-                <Sample Name="Sample_866">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x930"/>
-                </Sample>
-                <Sample Name="Sample_867">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_868">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_869">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x5C0"/>
-                </Sample>
-                <Sample Name="Sample_870">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x8D0"/>
-                </Sample>
-                <Sample Name="Sample_871">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0xC00"/>
-                </Sample>
-                <Sample Name="Sample_872">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_873">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x660"/>
-                </Sample>
-                <Sample Name="Sample_874">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x490"/>
-                </Sample>
-                <Sample Name="Sample_875">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x470"/>
-                </Sample>
-                <Sample Name="Sample_876">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x5B0"/>
-                </Sample>
-                <Sample Name="Sample_877">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x3E0"/>
-                </Sample>
-                <Sample Name="Sample_878">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x940"/>
-                </Sample>
-                <Sample Name="Sample_879">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0xA50"/>
-                </Sample>
-                <Sample Name="Sample_880">
-                    <Offset Version="MQDebug" At="0x4264C0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_881">
-                    <Offset Version="MQDebug" At="0x4264C0" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_882">
-                    <Offset Version="MQDebug" At="0x4264C0" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_883">
-                    <Offset Version="MQDebug" At="0x4264C0" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_884">
-                    <Offset Version="MQDebug" At="0x427770" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_885">
-                    <Offset Version="MQDebug" At="0x427770" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_886">
-                    <Offset Version="MQDebug" At="0x427770" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_887">
-                    <Offset Version="MQDebug" At="0x427770" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_888">
-                    <Offset Version="MQDebug" At="0x427770" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_889">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_890">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_891">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0x3B0"/>
-                </Sample>
-                <Sample Name="Sample_892">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_893">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0x370"/>
-                </Sample>
-                <Sample Name="Sample_894">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_895">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_896">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x5C0"/>
-                </Sample>
-                <Sample Name="Sample_897">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x4D0"/>
-                </Sample>
-                <Sample Name="Sample_898">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_899">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x3F0"/>
-                </Sample>
-                <Sample Name="Sample_900">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_901">
-                    <Offset Version="MQDebug" At="0x435820" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_902">
-                    <Offset Version="MQDebug" At="0x435820" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_903">
-                    <Offset Version="MQDebug" At="0x435820" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_904">
-                    <Offset Version="MQDebug" At="0x437AD0" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_905">
-                    <Offset Version="MQDebug" At="0x437AD0" LoopOffset="0x240"/>
-                </Sample>
-                <Sample Name="Sample_906">
-                    <Offset Version="MQDebug" At="0x437AD0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_907">
-                    <Offset Version="MQDebug" At="0x437AD0" LoopOffset="0x120"/>
-                </Sample>
-                <Sample Name="Sample_908">
-                    <Offset Version="MQDebug" At="0x43BB30" LoopOffset="0x290"/>
-                </Sample>
-                <Sample Name="Sample_909">
-                    <Offset Version="MQDebug" At="0x43BB30" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_910">
-                    <Offset Version="MQDebug" At="0x43BB30" LoopOffset="0x2D0"/>
-                </Sample>
-                <Sample Name="Sample_911">
-                    <Offset Version="MQDebug" At="0x43BB30" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_912">
-                    <Offset Version="MQDebug" At="0x43BB30" LoopOffset="0x1B0"/>
-                </Sample>
-                <Sample Name="Sample_913">
-                    <Offset Version="MQDebug" At="0x43E560" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_914">
-                    <Offset Version="MQDebug" At="0x43E560" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_915">
-                    <Offset Version="MQDebug" At="0x43E560" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_916">
-                    <Offset Version="MQDebug" At="0x43E560" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_917">
-                    <Offset Version="MQDebug" At="0x43E560" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_918">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0xAE0"/>
-                </Sample>
-                <Sample Name="Sample_919">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x500"/>
-                </Sample>
-                <Sample Name="Sample_920">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_921">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x6E0"/>
-                </Sample>
-                <Sample Name="Sample_922">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x800"/>
-                </Sample>
-                <Sample Name="Sample_923">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x4B0"/>
-                </Sample>
-                <Sample Name="Sample_924">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x9C0"/>
-                </Sample>
-                <Sample Name="Sample_925">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0xB70"/>
-                </Sample>
-                <Sample Name="Sample_926">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0x590"/>
-                </Sample>
-                <Sample Name="Sample_927">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_928">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0x770"/>
-                </Sample>
-                <Sample Name="Sample_929">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0x890"/>
-                </Sample>
-                <Sample Name="Sample_930">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0x540"/>
-                </Sample>
-                <Sample Name="Sample_931">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0xA50"/>
-                </Sample>
-                <Sample Name="Sample_932">
-                    <Offset Version="MQDebug" At="0x4461A0" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_933">
-                    <Offset Version="MQDebug" At="0x4461A0" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_934">
-                    <Offset Version="MQDebug" At="0x44A130" LoopOffset="0x470"/>
-                </Sample>
-                <Sample Name="Sample_935">
-                    <Offset Version="MQDebug" At="0x44A130" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_936">
-                    <Offset Version="MQDebug" At="0x4520D0" LoopOffset="0xCA0"/>
-                </Sample>
-                <Sample Name="Sample_937">
-                    <Offset Version="MQDebug" At="0x4520D0" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_938">
-                    <Offset Version="MQDebug" At="0x45D9D0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_939">
-                    <Offset Version="MQDebug" At="0x45D9D0" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_940">
-                    <Offset Version="MQDebug" At="0x45D9D0" LoopOffset="0x3F0"/>
-                </Sample>
-                <Sample Name="Sample_941">
-                    <Offset Version="MQDebug" At="0x4608E0" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_942">
-                    <Offset Version="MQDebug" At="0x4608E0" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_943">
-                    <Offset Version="MQDebug" At="0x4608E0" LoopOffset="0x480"/>
-                </Sample>
-                <Sample Name="Sample_944">
-                    <Offset Version="MQDebug" At="0x464970" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_945">
-                    <Offset Version="MQDebug" At="0x464970" LoopOffset="0x80"/>
-                </Sample>
-                <Sample Name="Sample_946">
-                    <Offset Version="MQDebug" At="0x464970" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_947">
-                    <Offset Version="MQDebug" At="0x46AB90" LoopOffset="0x1A0"/>
-                </Sample>
-                <Sample Name="Sample_948">
-                    <Offset Version="MQDebug" At="0x46AB90" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_949">
-                    <Offset Version="MQDebug" At="0x46AB90" LoopOffset="0x370"/>
-                </Sample>
-                <Sample Name="Sample_950">
-                    <Offset Version="MQDebug" At="0x46E340" LoopOffset="0x110"/>
-                </Sample>
-                <Sample Name="Sample_951">
-                    <Offset Version="MQDebug" At="0x46E340" LoopOffset="0x3E0"/>
-                </Sample>
-                <Sample Name="Sample_952">
-                    <Offset Version="MQDebug" At="0x4728F0" LoopOffset="0x470"/>
-                </Sample>
-                <Sample Name="Sample_953">
-                    <Offset Version="MQDebug" At="0x4728F0" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_954">
-                    <Offset Version="MQDebug" At="0x473E10" LoopOffset="0x2D0"/>
-                </Sample>
-                <Sample Name="Sample_955">
-                    <Offset Version="MQDebug" At="0x473E10" LoopOffset="0x210"/>
-                </Sample>
-                <Sample Name="Sample_956">
-                    <Offset Version="MQDebug" At="0x478C20" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_957">
-                    <Offset Version="MQDebug" At="0x478C20" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_958">
-                    <Offset Version="MQDebug" At="0x478C20" LoopOffset="0xBA0"/>
-                </Sample>
-                <Sample Name="Sample_959">
-                    <Offset Version="MQDebug" At="0x480600" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_960">
-                    <Offset Version="MQDebug" At="0x480600" LoopOffset="0x3F0"/>
-                </Sample>
-                <Sample Name="Sample_961">
-                    <Offset Version="MQDebug" At="0x480600" LoopOffset="0x270"/>
-                </Sample>
-                <Sample Name="Sample_962">
-                    <Offset Version="MQDebug" At="0x483620" LoopOffset="0xDB0"/>
-                </Sample>
-                <Sample Name="Sample_963">
-                    <Offset Version="MQDebug" At="0x483620" LoopOffset="0x480"/>
-                </Sample>
-                <Sample Name="Sample_964">
-                    <Offset Version="MQDebug" At="0x483620" LoopOffset="0xAF0"/>
-                </Sample>
-                <Sample Name="Sample_965">
-                    <Offset Version="MQDebug" At="0x483620" LoopOffset="0x7D0"/>
-                </Sample>
-                <Sample Name="Sample_966">
-                    <Offset Version="MQDebug" At="0x483620" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_967">
-                    <Offset Version="MQDebug" At="0x4889B0" LoopOffset="0xE40"/>
-                </Sample>
-                <Sample Name="Sample_968">
-                    <Offset Version="MQDebug" At="0x4889B0" LoopOffset="0x510"/>
-                </Sample>
-                <Sample Name="Sample_969">
-                    <Offset Version="MQDebug" At="0x4889B0" LoopOffset="0xB80"/>
-                </Sample>
-                <Sample Name="Sample_970">
-                    <Offset Version="MQDebug" At="0x4889B0" LoopOffset="0x860"/>
-                </Sample>
-                <Sample Name="Sample_971">
-                    <Offset Version="MQDebug" At="0x4889B0" LoopOffset="0x490"/>
-                </Sample>
-                <Sample Name="Sample_972">
-                    <Offset Version="MQDebug" At="0x48E460"/>
-                </Sample>
-                <Sample Name="Sample_973">
-                    <Offset Version="MQDebug" At="0x491090"/>
-                </Sample>
-                <Sample Name="Sample_974">
-                    <Offset Version="MQDebug" At="0x493E70"/>
-                </Sample>
-                <Sample Name="Sample_975">
-                    <Offset Version="MQDebug" At="0x495240"/>
-                </Sample>
-                <Sample Name="Sample_976">
-                    <Offset Version="MQDebug" At="0x496610"/>
-                </Sample>
-                <Sample Name="Sample_977">
-                    <Offset Version="MQDebug" At="0x498B50"/>
-                </Sample>
-                <Sample Name="Sample_978">
-                    <Offset Version="MQDebug" At="0x49A670"/>
-                </Sample>
-                <Sample Name="Sample_979">
-                    <Offset Version="MQDebug" At="0x49BF60"/>
-                </Sample>
-                <Sample Name="Sample_980">
-                    <Offset Version="MQDebug" At="0x4A5780"/>
-                </Sample>
-                <Sample Name="Sample_981">
-                    <Offset Version="MQDebug" At="0x4AB940"/>
-                </Sample>
-                <Sample Name="Sample_982">
-                    <Offset Version="MQDebug" At="0x4AEF20"/>
-                </Sample>
-                <Sample Name="Sample_983">
-                    <Offset Version="MQDebug" At="0x4B0BA0"/>
-                </Sample>
-                <Sample Name="Sample_984">
-                    <Offset Version="MQDebug" At="0x4B0CD0"/>
-                </Sample>
-                <Sample Name="Sample_985">
-                    <Offset Version="MQDebug" At="0x4B4940"/>
-                </Sample>
-                <Sample Name="Sample_986">
-                    <Offset Version="MQDebug" At="0x4B6610" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_987">
-                    <Offset Version="MQDebug" At="0x4B6610" LoopOffset="0x80"/>
-                </Sample>
-                <Sample Name="Sample_988">
-                    <Offset Version="MQDebug" At="0x4B6610" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_989">
-                    <Offset Version="MQDebug" At="0x4B9CE0" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_990">
-                    <Offset Version="MQDebug" At="0x4B9CE0" LoopOffset="0x110"/>
-                </Sample>
-                <Sample Name="Sample_991">
-                    <Offset Version="MQDebug" At="0x4B9CE0" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_992">
-                    <Offset Version="MQDebug" At="0x4BE590" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_993">
-                    <Offset Version="MQDebug" At="0x4BE590" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_994">
-                    <Offset Version="MQDebug" At="0x4BE590" LoopOffset="0x1A0"/>
-                </Sample>
-                <Sample Name="Sample_995">
-                    <Offset Version="MQDebug" At="0x4BF5B0" LoopOffset="0x100"/>
-                </Sample>
-                <Sample Name="Sample_996">
-                    <Offset Version="MQDebug" At="0x4BF5B0" LoopOffset="0x230"/>
-                </Sample>
-                <Sample Name="Sample_997">
-                    <Offset Version="MQDebug" At="0x4BF5B0" LoopOffset="0x210"/>
-                </Sample>
-                <Sample Name="Sample_998">
-                    <Offset Version="MQDebug" At="0x4C0DA0" LoopOffset="0x170"/>
-                </Sample>
-                <Sample Name="Sample_999">
-                    <Offset Version="MQDebug" At="0x4C0DA0" LoopOffset="0x2A0"/>
-                </Sample>
-                <Sample Name="Sample_1000">
-                    <Offset Version="MQDebug" At="0x4C0DA0" LoopOffset="0x280"/>
-                </Sample>
-                <Sample Name="Sample_1001">
-                    <Offset Version="MQDebug" At="0x4C1CC0" LoopOffset="0x3A0"/>
-                </Sample>
-                <Sample Name="Sample_1002">
-                    <Offset Version="MQDebug" At="0x4C1CC0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_1003">
-                    <Offset Version="MQDebug" At="0x4CC1F0" LoopOffset="0x430"/>
-                </Sample>
-                <Sample Name="Sample_1004">
-                    <Offset Version="MQDebug" At="0x4CC1F0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_1005">
-                    <Offset Version="MQDebug" At="0x4D1CF0" LoopOffset="0x510"/>
-                </Sample>
-                <Sample Name="Sample_1006">
-                    <Offset Version="MQDebug" At="0x4D1CF0" LoopOffset="0x3F0"/>
-                </Sample>
-                <Sample Name="Sample_1007">
-                    <Offset Version="MQDebug" At="0x4D4230"/>
-                </Sample>
-                <Sample Name="Sample_1008">
-                    <Offset Version="MQDebug" At="0x4DEB10" LoopOffset="0x760"/>
-                </Sample>
-                <Sample Name="Sample_1009">
-                    <Offset Version="MQDebug" At="0x4DEB10" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_1010">
-                    <Offset Version="MQDebug" At="0x4E60A0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_1011">
-                    <Offset Version="MQDebug" At="0x4E60A0" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_1012">
-                    <Offset Version="MQDebug" At="0x4E60A0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_1013">
-                    <Offset Version="MQDebug" At="0x4E65F0"/>
-                </Sample>
-                <Sample Name="Sample_1014">
-                    <Offset Version="MQDebug" At="0x4EC650" LoopOffset="0x120"/>
-                </Sample>
-                <Sample Name="Sample_1015">
-                    <Offset Version="MQDebug" At="0x4EC650" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_1016">
-                    <Offset Version="MQDebug" At="0x4ED240" LoopOffset="0xC00"/>
-                </Sample>
-                <Sample Name="Sample_1017">
-                    <Offset Version="MQDebug" At="0x4ED240" LoopOffset="0x1E0"/>
-                </Sample>
-                <Sample Name="Sample_1018">
-                    <Offset Version="MQDebug" At="0x4ED240" LoopOffset="0x100"/>
-                </Sample>
-                <Sample Name="Sample_1019">
-                    <Offset Version="MQDebug" At="0x4ED240" LoopOffset="0x200"/>
-                </Sample>
-                <Sample Name="Sample_1020">
-                    <Offset Version="MQDebug" At="0x4EF640" LoopOffset="0x3E0"/>
-                </Sample>
-                <Sample Name="Sample_1021">
-                    <Offset Version="MQDebug" At="0x4EF640" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_1022">
-                    <Offset Version="MQDebug" At="0x4F3440" LoopOffset="0x450"/>
-                </Sample>
-                <Sample Name="Sample_1023">
-                    <Offset Version="MQDebug" At="0x4F3440" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_1024">
-                    <Offset Version="MQDebug" At="0x4F6280" LoopOffset="0x4E0"/>
-                </Sample>
-                <Sample Name="Sample_1025">
-                    <Offset Version="MQDebug" At="0x4F6280" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_1026">
-                    <Offset Version="MQDebug" At="0x4F8B20" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_1027">
-                    <Offset Version="MQDebug" At="0x4F8B20" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_1028">
-                    <Offset Version="MQDebug" At="0x4FADE0" LoopOffset="0x470"/>
-                </Sample>
-                <Sample Name="Sample_1029">
-                    <Offset Version="MQDebug" At="0x4FADE0" LoopOffset="0x3D0"/>
-                </Sample>
-                <Sample Name="Sample_1030">
-                    <Offset Version="MQDebug" At="0x4FD5B0" LoopOffset="0x4E0"/>
-                </Sample>
-                <Sample Name="Sample_1031">
-                    <Offset Version="MQDebug" At="0x4FD5B0" LoopOffset="0x440"/>
-                </Sample>
-                <Sample Name="Sample_1032">
-                    <Offset Version="MQDebug" At="0x500080" LoopOffset="0x550"/>
-                </Sample>
-                <Sample Name="Sample_1033">
-                    <Offset Version="MQDebug" At="0x500080" LoopOffset="0x4B0"/>
-                </Sample>
-                <Sample Name="Sample_1034">
-                    <Offset Version="MQDebug" At="0x500FD0" LoopOffset="0x960"/>
-                </Sample>
-                <Sample Name="Sample_1035">
-                    <Offset Version="MQDebug" At="0x500FD0" LoopOffset="0x5C0"/>
-                </Sample>
-                <Sample Name="Sample_1036">
-                    <Offset Version="MQDebug" At="0x501C90" LoopOffset="0xC90"/>
-                </Sample>
-                <Sample Name="Sample_1037">
-                    <Offset Version="MQDebug" At="0x501C90" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_1038">
-                    <Offset Version="MQDebug" At="0x50AA40" LoopOffset="0xD70"/>
-                </Sample>
-                <Sample Name="Sample_1039">
-                    <Offset Version="MQDebug" At="0x50AA40" LoopOffset="0x190"/>
-                </Sample>
-                <Sample Name="Sample_1040">
-                    <Offset Version="MQDebug" At="0x513220" LoopOffset="0xA80"/>
-                </Sample>
-                <Sample Name="Sample_1041">
-                    <Offset Version="MQDebug" At="0x513220" LoopOffset="0xDB0"/>
-                </Sample>
-                <Sample Name="Sample_1042">
-                    <Offset Version="MQDebug" At="0x5158C0" LoopOffset="0xB10"/>
-                </Sample>
-                <Sample Name="Sample_1043">
-                    <Offset Version="MQDebug" At="0x5158C0" LoopOffset="0xE40"/>
-                </Sample>
-                <Sample Name="Sample_1044">
-                    <Offset Version="MQDebug" At="0x517A50"/>
-                </Sample>
-                <Sample Name="Sample_1045">
-                    <Offset Version="MQDebug" At="0x51A230"/>
-                </Sample>
-                <Sample Name="Sample_1046">
-                    <Offset Version="MQDebug" At="0x51C3F0" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_1047">
-                    <Offset Version="MQDebug" At="0x51C3F0" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_1048">
-                    <Offset Version="MQDebug" At="0x51E2C0"/>
-                </Sample>
-                <Sample Name="Sample_1049">
-                    <Offset Version="MQDebug" At="0x522F10" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_1050">
-                    <Offset Version="MQDebug" At="0x522F10" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_1051">
-                    <Offset Version="MQDebug" At="0x527B70" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_1052">
-                    <Offset Version="MQDebug" At="0x527B70" LoopOffset="0x120"/>
-                </Sample>
-                <Sample Name="Sample_1053">
-                    <Offset Version="MQDebug" At="0x52A260"/>
-                </Sample>
-            </Samples>
-            <Samples Bank="2">
-                <Sample Name="Sample_1054">
-                    <Offset Version="MQDebug" At="0x0"/>
-                </Sample>
-                <Sample Name="Sample_1055">
-                    <Offset Version="MQDebug" At="0x2540"/>
-                </Sample>
-                <Sample Name="Sample_1056">
-                    <Offset Version="MQDebug" At="0x4800"/>
-                </Sample>
-                <Sample Name="Sample_1057">
-                    <Offset Version="MQDebug" At="0x72D0"/>
-                </Sample>
-                <Sample Name="Sample_1058">
-                    <Offset Version="MQDebug" At="0x7B70"/>
-                </Sample>
-                <Sample Name="Sample_1059">
-                    <Offset Version="MQDebug" At="0x8630"/>
-                </Sample>
-            </Samples>
-            <Soundfont Name="Soundfont_0" Index="0"/>
-            <Soundfont Name="Soundfont_1" Index="1"/>
-            <Soundfont Name="Soundfont_2" Index="2"/>
-            <Soundfont Name="Soundfont_3" Index="3"/>
-            <Soundfont Name="Soundfont_4" Index="4"/>
-            <Soundfont Name="Soundfont_5" Index="5"/>
-            <Soundfont Name="Soundfont_6" Index="6"/>
-            <Soundfont Name="Soundfont_7" Index="7"/>
-            <Soundfont Name="Soundfont_8" Index="8"/>
-            <Soundfont Name="Soundfont_9" Index="9"/>
-            <Soundfont Name="Soundfont_10" Index="10"/>
-            <Soundfont Name="Soundfont_11" Index="11"/>
-            <Soundfont Name="Soundfont_12" Index="12"/>
-            <Soundfont Name="Soundfont_13" Index="13"/>
-            <Soundfont Name="Soundfont_14" Index="14"/>
-            <Soundfont Name="Soundfont_15" Index="15"/>
-            <Soundfont Name="Soundfont_16" Index="16"/>
-            <Soundfont Name="Soundfont_17" Index="17"/>
-            <Soundfont Name="Soundfont_18" Index="18"/>
-            <Soundfont Name="Soundfont_19" Index="19"/>
-            <Soundfont Name="Soundfont_20" Index="20"/>
-            <Soundfont Name="Soundfont_21" Index="21"/>
-            <Soundfont Name="Soundfont_22" Index="22"/>
-            <Soundfont Name="Soundfont_23" Index="23"/>
-            <Soundfont Name="Soundfont_24" Index="24"/>
-            <Soundfont Name="Soundfont_25" Index="25"/>
-            <Soundfont Name="Soundfont_26" Index="26"/>
-            <Soundfont Name="Soundfont_27" Index="27"/>
-            <Soundfont Name="Soundfont_28" Index="28"/>
-            <Soundfont Name="Soundfont_29" Index="29"/>
-            <Soundfont Name="Soundfont_30" Index="30"/>
-            <Soundfont Name="Soundfont_31" Index="31"/>
-            <Soundfont Name="Soundfont_32" Index="32"/>
-            <Soundfont Name="Soundfont_33" Index="33"/>
-            <Soundfont Name="Soundfont_34" Index="34"/>
-            <Soundfont Name="Soundfont_35" Index="35"/>
-            <Soundfont Name="Soundfont_36" Index="36"/>
-            <Soundfont Name="Soundfont_37" Index="37"/>
-            <Soundfont Name="Soundfont_38" Index="38"/>
-            <Soundfont Name="Soundfont_39" Index="39"/>
-            <Soundfont Name="Soundfont_40" Index="40"/>
-        </Audio>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/actor.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/actor.xml
deleted file mode 100644
index 0320dbd71..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/actor.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="code" BaseAddress="0x800A6440" RangeStart="0x107218" RangeEnd="0x107238" OutName="actor">
-        <DList Name="D_801AEF88" Offset="0x107218"/>
-        <DList Name="D_801AEFA0" Offset="0x107230"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/debug_display.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/debug_display.xml
deleted file mode 100644
index 523a6e15e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/debug_display.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Root>
-    <File Name="code" BaseAddress="0x800A6440" RangeStart="0x1127E0" RangeEnd="0x1132A0" OutName="debug_display">
-        <Array Name="sDebugDisplay1Vtx" Count="36" Offset="0x1127E0">
-            <Vtx/>
-        </Array>
-        <DList Name="sDebugDisplay1DL" Offset="0x112A20"/>
-
-        <Array Name="sDebugDisplay2Vtx" Count="8" Offset="0x112A80">
-            <Vtx/>
-        </Array>
-        <DList Name="sDebugDisplay2DL" Offset="0x112B00"/>
-
-        <Array Name="sDebugDisplay3Vtx" Count="40" Offset="0x112B50">
-            <Vtx/>
-        </Array>
-        <DList Name="sDebugDisplay3DL" Offset="0x112DD0"/>
-
-        <Texture Name="sDebugDisplayCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x112E48"/>
-        <Texture Name="sDebugDisplayBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x112F48"/>
-        <Texture Name="sDebugDisplayCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x113048"/>
-        <Texture Name="sDebugDisplayCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x113148"/>
-
-        <Array Name="sDebugDisplaySpriteVtx" Count="4" Offset="0x113248">
-            <Vtx/>
-        </Array>
-        <DList Name="sDebugDisplaySpriteDL" Offset="0x113288"/>
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/eff_footmark.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/eff_footmark.xml
deleted file mode 100644
index fa6eff1bb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/eff_footmark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="code" BaseAddress="0x800A6440" RangeStart="0x1144A0" RangeEnd="0x114530" OutName="eff_footmark">
-        <Array Name="gEffFootprintVtx" Count="3" Offset="0x1144A0">
-            <Vtx/>
-        </Array>
-        <DList Name="gEffFootprintMaterialDL" Offset="0x1144D0"/>
-        <DList Name="gEffFootprintModelDL" Offset="0x114518"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/eff_shield_particle.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/eff_shield_particle.xml
deleted file mode 100644
index 0e67e8351..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/eff_shield_particle.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="code" BaseAddress="0x800A6440" RangeStart="0x106910" RangeEnd="0x106950" OutName="eff_shield_particle">
-        <Array Name="sEffShieldParticleVtx" Count="4" Offset="0x106910">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/fbdemo_circle.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/fbdemo_circle.xml
deleted file mode 100644
index ea5d503df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/fbdemo_circle.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Root>
-    <File Name="code" OutName="fbdemo_circle" BaseAddress="0x800A6440" RangeStart="0x11E070" RangeEnd="0x11E870">
-        <Texture Name="gCircleTex" Format="i4" Width="64" Height="64" Offset="0x11E070"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/sub_s.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/sub_s.xml
deleted file mode 100644
index 96238af03..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/code/sub_s.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="code" OutName="sub_s" BaseAddress="0x800A6440" RangeStart="0x11DFD0" RangeEnd="0x11E060" >
-        <DList Name="gShadowMaterialDL" Offset="0x11E010"/>
-        <DList Name="gShadowModelDL" Offset="0x11E030"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/do_action_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/do_action_static.xml
deleted file mode 100644
index 3fdd1e404..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/do_action_static.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Root>
-     <File Name="do_action_static" Segment="9">
-        <Texture Name="gDoActionAttackENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x0"/>
-        <Texture Name="gDoActionCheckENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x180"/>
-        <Texture Name="gDoActionEnterENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x300"/>
-        <Texture Name="gDoActionReturnENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x480"/>
-        <Texture Name="gDoActionOpenENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x600"/>
-        <Texture Name="gDoActionJumpENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x780"/>
-        <Texture Name="gDoActionDecideENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x900"/>
-        <Texture Name="gDoActionDiveENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
-        <Texture Name="gDoActionFasterENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
-        <Texture Name="gDoActionThrowENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
-
-        <!-- Unused and left untranslated from Japanese -->
-        <Texture Name="gDoActionNaviENGTex" OutName="navi_eng" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
-
-        <Texture Name="gDoActionClimbENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
-        <Texture Name="gDoActionDropENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
-        <Texture Name="gDoActionDownENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
-        <Texture Name="gDoActionQuitENGTex" OutName="quit_eng" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
-        <Texture Name="gDoActionSpeakENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
-        <Texture Name="gDoActionNextENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
-        <Texture Name="gDoActionGrabENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
-        <Texture Name="gDoActionStopENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
-        <Texture Name="gDoActionPutAwayENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
-
-        <!-- Unused and left untranslated from Japanese -->
-        <Texture Name="gDoActionReelENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
-
-        <Texture Name="gDoActionInfoENGTex" OutName="info_eng" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
-        <Texture Name="gDoActionWarpENGTex" OutName="warp_eng" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
-        <Texture Name="gDoActionSnapENGTex" OutName="snap_eng" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
-        <Texture Name="gDoActionExplodeENGTex" OutName="explode_eng" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
-        <Texture Name="gDoActionDanceENGTex" OutName="dance_eng" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
-        <Texture Name="gDoActionMarchENGTex" OutName="march_eng" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
-
-        <Texture Name="gDoActionNum1ENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
-        <Texture Name="gDoActionNum2ENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
-        <Texture Name="gDoActionNum3ENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
-        <Texture Name="gDoActionNum4ENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
-        <Texture Name="gDoActionNum5ENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
-        <Texture Name="gDoActionNum6ENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
-        <Texture Name="gDoActionNum7ENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
-        <Texture Name="gDoActionNum8ENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
-
-        <Texture Name="gDoActionCurlENGTex" OutName="curl_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
-        <Texture Name="gDoActionSurfaceENGTex" OutName="surface_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
-        <Texture Name="gDoActionSwimENGTex" OutName="swim_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
-        <Texture Name="gDoActionPunchENGTex" OutName="punch_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
-        <Texture Name="gDoActionPoundENGTex" OutName="pound_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
-
-        <!-- Unused and left untranslated from Japanese -->
-        <Texture Name="gDoActionHookENGTex" OutName="hook_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
-
-        <Texture Name="gDoActionShootENGTex" OutName="shoot_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
-     </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_dungeon_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_dungeon_static.xml
deleted file mode 100644
index 04ba39338..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_dungeon_static.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<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/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_field_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_field_static.xml
deleted file mode 100644
index 8fe3a9299..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_field_static.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<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/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_gameover_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_gameover_static.xml
deleted file mode 100644
index 405167b86..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_gameover_static.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="icon_item_gameover_static" Segment="12">
-        <Texture Name="gGameOverP1Tex" OutName="game_over_p1" Format="ia8" Width="64" Height="32" Offset="0x0"/>
-        <Texture Name="gGameOverP2Tex" OutName="game_over_p2" Format="ia8" Width="64" Height="32" Offset="0x800"/>
-        <Texture Name="gGameOverP3Tex" OutName="game_over_p3" Format="ia8" Width="64" Height="32" Offset="0x1000"/>
-        <Texture Name="gGameOverMaskTex" OutName="game_over_mask" Format="ia8" Width="64" Height="32" Offset="0x1800"/>
-        <Texture Name="gContinuePlayingJAPTex" OutName="continue_playing_jap" Format="ia8" Width="152" Height="16" Offset="0x2000"/>
-        <Texture Name="gContinuePlayingNESTex" OutName="continue_playing_nes" Format="ia8" Width="152" Height="16" Offset="0x2980"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_jpn_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_jpn_static.xml
deleted file mode 100644
index 9cda9d5e7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_jpn_static.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<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="ia4" Width="128" Height="16" Offset="0x0"/>
-        <Texture Name="gPauseSnowheadTitleENGTex" OutName="pause_snowhead_title_eng" Format="ia4" Width="128" Height="16" Offset="0x400"/>
-        <Texture Name="gPauseGreatBayTitleENGTex" OutName="pause_great_bay_title_eng" Format="ia4" Width="128" Height="16" Offset="0x800"/>
-        <Texture Name="gPauseStoneTowerTitleENGTex" OutName="pause_stone_tower_title_eng" Format="ia4" Width="128" Height="16" Offset="0xC00"/>
-
-        <!-- Pause Menu Info Panel To-> Textures -->
-        <Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia4" Width="64" Height="16" Offset="0x1000"/>
-        <Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia4" Width="64" Height="16" Offset="0x1200"/>
-        <Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia4" Width="96" Height="16" Offset="0x1400"/>
-        <Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia4" Width="128" Height="16" Offset="0x1700"/>
-        <Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia4" Width="128" Height="16" Offset="0x1B00"/>
-        <Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia4" Width="128" Height="16" Offset="0x1F00"/>
-        <Texture Name="gPauseToMasksENGTex" OutName="pause_to_masks_eng" Format="ia4" Width="128" Height="16" Offset="0x2300"/>
-        <Texture Name="gPauseToViewNotebookENGTex" OutName="pause_to_view_notebook_eng" Format="ia4" Width="96" Height="16" Offset="0x2700"/>
-
-        <!-- 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="0x2A00"/>
-        <Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x3400"/>
-        <Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x3E00"/>
-        <Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0x4800"/>
-        <Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x5200"/>
-        <Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x5C00"/>
-        <Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x6600"/>
-        <Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0x7000"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_vtx_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_vtx_static.xml
deleted file mode 100644
index 2c7bfe219..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/icon_item_vtx_static.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="archives/icon_item_static.xml" OutPath="assets/archives/icon_item_static"/>
-    <File Name="icon_item_vtx_static" Segment="11">
-        <DList Name="gItemNamePanelDL" Offset="0x0"/>
-        <DList Name="gZButtonIconDL" Offset="0x90"/>
-        <DList Name="gRButtonIconDL" Offset="0xE0"/>
-        <DList Name="gCButtonIconsDL" Offset="0x130"/>
-        <DList Name="gAButtonIconDL" Offset="0x188"/>
-        <DList Name="gBButtonIconDL" Offset="0x1E0"/>
-        <DList Name="gPromptCursorLeftDL" Offset="0x238"/>
-        <DList Name="gPromptCursorRightDL" Offset="0x288"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/message_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/message_static.xml
deleted file mode 100644
index 81024355b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/message_static.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-     <File Name="message_static" Segment="7">
-        <Texture Name="gMessageDefaultBackgroundTex" OutName="message_default_background" Format="ia4" Width="128" Height="64" Offset="0x0"/>
-        <Texture Name="gMessageSignBackgroundTex" OutName="message_sign_background" Format="ia4" Width="128" Height="64" Offset="0x1000"/>
-        <Texture Name="gMessageNoteStaffBackgroundTex" OutName="message_note_staff_background" Format="ia4" Width="128" Height="64" Offset="0x2000"/>
-        <Texture Name="gMessageFadingBackgroundTex" OutName="message_fading_background" Format="i4" Width="128" Height="64" Offset="0x3000"/>
-        <Texture Name="gMessageNotebookBackgroundTex" OutName="message_notebook_background" Format="i4" Width="128" Height="64" Offset="0x4000"/>
-        <Texture Name="gMessageContinueTriangleTex" OutName="message_continue_triangle" Format="i4" Width="16" Height="16" Offset="0x5000"/>
-        <Texture Name="gMessageEndSquareTex" OutName="message_end_square" Format="i4" Width="16" Height="16" Offset="0x5080"/>
-        <Texture Name="gMessageArrowTex" OutName="message_arrow" Format="i4" Width="16" Height="16" Offset="0x5100"/>
-     </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/message_texture_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/message_texture_static.xml
deleted file mode 100644
index d7ecf1745..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/message_texture_static.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-     <File Name="message_texture_static" Segment="9">
-        <Texture Name="gMessageXLeftTex" OutName="message_x_left" Format="i4" Width="96" Height="48" Offset="0x0"/>
-        <Texture Name="gMessageXRightTex" OutName="message_x_right" Format="i4" Width="96" Height="48" Offset="0x900"/>
-     </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/nes_font_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/nes_font_static.xml
deleted file mode 100644
index b021dbfdb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/nes_font_static.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<Root>
-     <File Name="nes_font_static">
-        <!-- The two-digit number after the prefix is the character's codepoint: the hexadecimal byte it corresponds to in the text data -->
-        <!-- "ASCII" block -->
-        <!-- Not actually either ASCII or JIS X 0201: 0x5C is the yen symbol, 0x7E the tilde, 0x7F the masculine ordinal indicator -->
-        <Texture Name="gMsgChar20SpaceTex" OutName="msg_char_20_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
-        <Texture Name="gMsgChar21ExclamationMarkTex" OutName="msg_char_21_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x80"/>
-        <Texture Name="gMsgChar22QuotationMarkTex" OutName="msg_char_22_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x100"/>
-        <Texture Name="gMsgChar23NumberSignTex" OutName="msg_char_23_number_sign" Format="i4" Width="16" Height="16" Offset="0x180"/>
-        <Texture Name="gMsgChar24DollarSignTex" OutName="msg_char_24_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x200"/>
-        <Texture Name="gMsgChar25PercentSignTex" OutName="msg_char_25_percent_sign" Format="i4" Width="16" Height="16" Offset="0x280"/>
-        <Texture Name="gMsgChar26AmpersandTex" OutName="msg_char_26_ampersand" Format="i4" Width="16" Height="16" Offset="0x300"/>
-        <Texture Name="gMsgChar27ApostropheTex" OutName="msg_char_27_apostrophe" Format="i4" Width="16" Height="16" Offset="0x380"/>
-        <Texture Name="gMsgChar28LeftParenthesesTex" OutName="msg_char_28_left_parentheses" Format="i4" Width="16" Height="16" Offset="0x400"/>
-        <Texture Name="gMsgChar29RightParenthesesTex" OutName="msg_char_29_right_parentheses" Format="i4" Width="16" Height="16" Offset="0x480"/>
-        <Texture Name="gMsgChar2AAsteriskTex" OutName="msg_char_2a_asterisk" Format="i4" Width="16" Height="16" Offset="0x500"/>
-        <Texture Name="gMsgChar2BPlusSignTex" OutName="msg_char_2b_plus_sign" Format="i4" Width="16" Height="16" Offset="0x580"/>
-        <Texture Name="gMsgChar2CCommaTex" OutName="msg_char_2c_comma" Format="i4" Width="16" Height="16" Offset="0x600"/>
-        <Texture Name="gMsgChar2DHyphenMinusTex" OutName="msg_char_2d_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x680"/>
-        <Texture Name="gMsgChar2EFullStopTex" OutName="msg_char_2e_full_stop" Format="i4" Width="16" Height="16" Offset="0x700"/>
-        <Texture Name="gMsgChar2FSolidusTex" OutName="msg_char_2f_solidus" Format="i4" Width="16" Height="16" Offset="0x780"/>
-        <Texture Name="gMsgChar30Digit0Tex" OutName="msg_char_30_digit_0" Format="i4" Width="16" Height="16" Offset="0x800"/>
-        <Texture Name="gMsgChar31Digit1Tex" OutName="msg_char_31_digit_1" Format="i4" Width="16" Height="16" Offset="0x880"/>
-        <Texture Name="gMsgChar32Digit2Tex" OutName="msg_char_32_digit_2" Format="i4" Width="16" Height="16" Offset="0x900"/>
-        <Texture Name="gMsgChar33Digit3Tex" OutName="msg_char_33_digit_3" Format="i4" Width="16" Height="16" Offset="0x980"/>
-        <Texture Name="gMsgChar34Digit4Tex" OutName="msg_char_34_digit_4" Format="i4" Width="16" Height="16" Offset="0xA00"/>
-        <Texture Name="gMsgChar35Digit5Tex" OutName="msg_char_35_digit_5" Format="i4" Width="16" Height="16" Offset="0xA80"/>
-        <Texture Name="gMsgChar36Digit6Tex" OutName="msg_char_36_digit_6" Format="i4" Width="16" Height="16" Offset="0xB00"/>
-        <Texture Name="gMsgChar37Digit7Tex" OutName="msg_char_37_digit_7" Format="i4" Width="16" Height="16" Offset="0xB80"/>
-        <Texture Name="gMsgChar38Digit8Tex" OutName="msg_char_38_digit_8" Format="i4" Width="16" Height="16" Offset="0xC00"/>
-        <Texture Name="gMsgChar39Digit9Tex" OutName="msg_char_39_digit_9" Format="i4" Width="16" Height="16" Offset="0xC80"/>
-        <Texture Name="gMsgChar3AColonTex" OutName="msg_char_3a_colon" Format="i4" Width="16" Height="16" Offset="0xD00"/>
-        <Texture Name="gMsgChar3BSemicolonTex" OutName="msg_char_3b_semicolon" Format="i4" Width="16" Height="16" Offset="0xD80"/>
-        <Texture Name="gMsgChar3CLessThanSignTex" OutName="msg_char_3c_less_than_sign" Format="i4" Width="16" Height="16" Offset="0xE00"/>
-        <Texture Name="gMsgChar3DEqualsSignTex" OutName="msg_char_3d_equals_sign" Format="i4" Width="16" Height="16" Offset="0xE80"/>
-        <Texture Name="gMsgChar3EGreaterThanSignTex" OutName="msg_char_3e_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0xF00"/>
-        <Texture Name="gMsgChar3FQuestionMarkTex" OutName="msg_char_3f_question_mark" Format="i4" Width="16" Height="16" Offset="0xF80"/>
-        <Texture Name="gMsgChar40CommercialAtTex" OutName="msg_char_40_commercial_at" Format="i4" Width="16" Height="16" Offset="0x1000"/>
-        <Texture Name="gMsgChar41LatinCapitalLetterATex" OutName="msg_char_41_latin_capital_letter_a" Format="i4" Width="16" Height="16" Offset="0x1080"/>
-        <Texture Name="gMsgChar42LatinCapitalLetterBTex" OutName="msg_char_42_latin_capital_letter_b" Format="i4" Width="16" Height="16" Offset="0x1100"/>
-        <Texture Name="gMsgChar43LatinCapitalLetterCTex" OutName="msg_char_43_latin_capital_letter_c" Format="i4" Width="16" Height="16" Offset="0x1180"/>
-        <Texture Name="gMsgChar44LatinCapitalLetterDTex" OutName="msg_char_44_latin_capital_letter_d" Format="i4" Width="16" Height="16" Offset="0x1200"/>
-        <Texture Name="gMsgChar45LatinCapitalLetterETex" OutName="msg_char_45_latin_capital_letter_e" Format="i4" Width="16" Height="16" Offset="0x1280"/>
-        <Texture Name="gMsgChar46LatinCapitalLetterFTex" OutName="msg_char_46_latin_capital_letter_f" Format="i4" Width="16" Height="16" Offset="0x1300"/>
-        <Texture Name="gMsgChar47LatinCapitalLetterGTex" OutName="msg_char_47_latin_capital_letter_g" Format="i4" Width="16" Height="16" Offset="0x1380"/>
-        <Texture Name="gMsgChar48LatinCapitalLetterHTex" OutName="msg_char_48_latin_capital_letter_h" Format="i4" Width="16" Height="16" Offset="0x1400"/>
-        <Texture Name="gMsgChar49LatinCapitalLetterITex" OutName="msg_char_49_latin_capital_letter_i" Format="i4" Width="16" Height="16" Offset="0x1480"/>
-        <Texture Name="gMsgChar4ALatinCapitalLetterJTex" OutName="msg_char_4a_latin_capital_letter_j" Format="i4" Width="16" Height="16" Offset="0x1500"/>
-        <Texture Name="gMsgChar4BLatinCapitalLetterKTex" OutName="msg_char_4b_latin_capital_letter_k" Format="i4" Width="16" Height="16" Offset="0x1580"/>
-        <Texture Name="gMsgChar4CLatinCapitalLetterLTex" OutName="msg_char_4c_latin_capital_letter_l" Format="i4" Width="16" Height="16" Offset="0x1600"/>
-        <Texture Name="gMsgChar4DLatinCapitalLetterMTex" OutName="msg_char_4d_latin_capital_letter_m" Format="i4" Width="16" Height="16" Offset="0x1680"/>
-        <Texture Name="gMsgChar4ELatinCapitalLetterNTex" OutName="msg_char_4e_latin_capital_letter_n" Format="i4" Width="16" Height="16" Offset="0x1700"/>
-        <Texture Name="gMsgChar4FLatinCapitalLetterOTex" OutName="msg_char_4f_latin_capital_letter_o" Format="i4" Width="16" Height="16" Offset="0x1780"/>
-        <Texture Name="gMsgChar50LatinCapitalLetterPTex" OutName="msg_char_50_latin_capital_letter_p" Format="i4" Width="16" Height="16" Offset="0x1800"/>
-        <Texture Name="gMsgChar51LatinCapitalLetterQTex" OutName="msg_char_51_latin_capital_letter_q" Format="i4" Width="16" Height="16" Offset="0x1880"/>
-        <Texture Name="gMsgChar52LatinCapitalLetterRTex" OutName="msg_char_52_latin_capital_letter_r" Format="i4" Width="16" Height="16" Offset="0x1900"/>
-        <Texture Name="gMsgChar53LatinCapitalLetterSTex" OutName="msg_char_53_latin_capital_letter_s" Format="i4" Width="16" Height="16" Offset="0x1980"/>
-        <Texture Name="gMsgChar54LatinCapitalLetterTTex" OutName="msg_char_54_latin_capital_letter_t" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
-        <Texture Name="gMsgChar55LatinCapitalLetterUTex" OutName="msg_char_55_latin_capital_letter_u" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
-        <Texture Name="gMsgChar56LatinCapitalLetterVTex" OutName="msg_char_56_latin_capital_letter_v" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
-        <Texture Name="gMsgChar57LatinCapitalLetterWTex" OutName="msg_char_57_latin_capital_letter_w" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
-        <Texture Name="gMsgChar58LatinCapitalLetterXTex" OutName="msg_char_58_latin_capital_letter_x" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
-        <Texture Name="gMsgChar59LatinCapitalLetterYTex" OutName="msg_char_59_latin_capital_letter_y" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
-        <Texture Name="gMsgChar5ALatinCapitalLetterZTex" OutName="msg_char_5a_latin_capital_letter_z" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
-        <Texture Name="gMsgChar5BLeftSquareBracketTex" OutName="msg_char_5b_left_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
-        <Texture Name="gMsgChar5CYenSignTex" OutName="msg_char_5c_yen_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
-        <Texture Name="gMsgChar5DRightSquareBracketTex" OutName="msg_char_5d_right_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
-        <Texture Name="gMsgChar5ECircumflexAccentTex" OutName="msg_char_5e_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
-        <Texture Name="gMsgChar5FLowLineTex" OutName="msg_char_5f_low_line" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
-        <Texture Name="gMsgChar60GraveAccentTex" OutName="msg_char_60_grave_accent" Format="i4" Width="16" Height="16" Offset="0x2000"/>
-        <Texture Name="gMsgChar61LatinSmallLetterATex" OutName="msg_char_61_latin_small_letter_a" Format="i4" Width="16" Height="16" Offset="0x2080"/>
-        <Texture Name="gMsgChar62LatinSmallLetterBTex" OutName="msg_char_62_latin_small_letter_b" Format="i4" Width="16" Height="16" Offset="0x2100"/>
-        <Texture Name="gMsgChar63LatinSmallLetterCTex" OutName="msg_char_63_latin_small_letter_c" Format="i4" Width="16" Height="16" Offset="0x2180"/>
-        <Texture Name="gMsgChar64LatinSmallLetterDTex" OutName="msg_char_64_latin_small_letter_d" Format="i4" Width="16" Height="16" Offset="0x2200"/>
-        <Texture Name="gMsgChar65LatinSmallLetterETex" OutName="msg_char_65_latin_small_letter_e" Format="i4" Width="16" Height="16" Offset="0x2280"/>
-        <Texture Name="gMsgChar66LatinSmallLetterFTex" OutName="msg_char_66_latin_small_letter_f" Format="i4" Width="16" Height="16" Offset="0x2300"/>
-        <Texture Name="gMsgChar67LatinSmallLetterGTex" OutName="msg_char_67_latin_small_letter_g" Format="i4" Width="16" Height="16" Offset="0x2380"/>
-        <Texture Name="gMsgChar68LatinSmallLetterHTex" OutName="msg_char_68_latin_small_letter_h" Format="i4" Width="16" Height="16" Offset="0x2400"/>
-        <Texture Name="gMsgChar69LatinSmallLetterITex" OutName="msg_char_69_latin_small_letter_i" Format="i4" Width="16" Height="16" Offset="0x2480"/>
-        <Texture Name="gMsgChar6ALatinSmallLetterJTex" OutName="msg_char_6a_latin_small_letter_j" Format="i4" Width="16" Height="16" Offset="0x2500"/>
-        <Texture Name="gMsgChar6BLatinSmallLetterKTex" OutName="msg_char_6b_latin_small_letter_k" Format="i4" Width="16" Height="16" Offset="0x2580"/>
-        <Texture Name="gMsgChar6CLatinSmallLetterLTex" OutName="msg_char_6c_latin_small_letter_l" Format="i4" Width="16" Height="16" Offset="0x2600"/>
-        <Texture Name="gMsgChar6DLatinSmallLetterMTex" OutName="msg_char_6d_latin_small_letter_m" Format="i4" Width="16" Height="16" Offset="0x2680"/>
-        <Texture Name="gMsgChar6ELatinSmallLetterNTex" OutName="msg_char_6e_latin_small_letter_n" Format="i4" Width="16" Height="16" Offset="0x2700"/>
-        <Texture Name="gMsgChar6FLatinSmallLetterOTex" OutName="msg_char_6f_latin_small_letter_o" Format="i4" Width="16" Height="16" Offset="0x2780"/>
-        <Texture Name="gMsgChar70LatinSmallLetterPTex" OutName="msg_char_70_latin_small_letter_p" Format="i4" Width="16" Height="16" Offset="0x2800"/>
-        <Texture Name="gMsgChar71LatinSmallLetterQTex" OutName="msg_char_71_latin_small_letter_q" Format="i4" Width="16" Height="16" Offset="0x2880"/>
-        <Texture Name="gMsgChar72LatinSmallLetterRTex" OutName="msg_char_72_latin_small_letter_r" Format="i4" Width="16" Height="16" Offset="0x2900"/>
-        <Texture Name="gMsgChar73LatinSmallLetterSTex" OutName="msg_char_73_latin_small_letter_s" Format="i4" Width="16" Height="16" Offset="0x2980"/>
-        <Texture Name="gMsgChar74LatinSmallLetterTTex" OutName="msg_char_74_latin_small_letter_t" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
-        <Texture Name="gMsgChar75LatinSmallLetterUTex" OutName="msg_char_75_latin_small_letter_u" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
-        <Texture Name="gMsgChar76LatinSmallLetterVTex" OutName="msg_char_76_latin_small_letter_v" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
-        <Texture Name="gMsgChar77LatinSmallLetterWTex" OutName="msg_char_77_latin_small_letter_w" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
-        <Texture Name="gMsgChar78LatinSmallLetterXTex" OutName="msg_char_78_latin_small_letter_x" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
-        <Texture Name="gMsgChar79LatinSmallLetterYTex" OutName="msg_char_79_latin_small_letter_y" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
-        <Texture Name="gMsgChar7ALatinSmallLetterZTex" OutName="msg_char_7a_latin_small_letter_z" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
-        <Texture Name="gMsgChar7BLeftCurlyBracketTex" OutName="msg_char_7b_left_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
-        <Texture Name="gMsgChar7CVerticalLineTex" OutName="msg_char_7c_vertical_line" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
-        <Texture Name="gMsgChar7DRightCurlyBracketTex" OutName="msg_char_7d_right_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
-        <Texture Name="gMsgChar7ETildeTex" OutName="msg_char_7e_tilde" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
-        <Texture Name="gMsgChar7FMasculineOrdinalIndicatorTex" OutName="msg_char_7f_masculine_ordinal_indicator" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
-
-        <!-- Accented character section -->
-        <!-- These do not conform to any standard encoding, but this section is much more regular and expansive than the corresponding one in Ocarina of Time -->
-        <Texture Name="gMsgChar80LatinCapitalLetterAWithGraveTex" OutName="msg_char_80_latin_capital_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3000"/>
-        <Texture Name="gMsgChar81LatinCapitalLetterAWithAcuteTex" OutName="msg_char_81_latin_capital_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3080"/>
-        <Texture Name="gMsgChar82LatinCapitalLetterAWithCircumflexTex" OutName="msg_char_82_latin_capital_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3100"/>
-        <Texture Name="gMsgChar83LatinCapitalLetterAWithDiaeresisTex" OutName="msg_char_83_latin_capital_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3180"/>
-        <Texture Name="gMsgChar84LatinCapitalLetterCWithCedillaTex" OutName="msg_char_84_latin_capital_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3200"/>
-        <Texture Name="gMsgChar85LatinCapitalLetterEWithGraveTex" OutName="msg_char_85_latin_capital_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3280"/>
-        <Texture Name="gMsgChar86LatinCapitalLetterEWithAcuteTex" OutName="msg_char_86_latin_capital_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3300"/>
-        <Texture Name="gMsgChar87LatinCapitalLetterEWithCircumflexTex" OutName="msg_char_87_latin_capital_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3380"/>
-        <Texture Name="gMsgChar88LatinCapitalLetterEWithDiaeresisTex" OutName="msg_char_88_latin_capital_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3400"/>
-        <Texture Name="gMsgChar89LatinCapitalLetterIWithGraveTex" OutName="msg_char_89_latin_capital_letter_i_with_grave" Format="i4" Width="16" Height="16" Offset="0x3480"/>
-        <Texture Name="gMsgChar8ALatinCapitalLetterIWithAcuteTex" OutName="msg_char_8a_latin_capital_letter_i_with_acute" Format="i4" Width="16" Height="16" Offset="0x3500"/>
-        <Texture Name="gMsgChar8BLatinCapitalLetterIWithCircumflexTex" OutName="msg_char_8b_latin_capital_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3580"/>
-        <Texture Name="gMsgChar8CLatinCapitalLetterIWithDiaeresisTex" OutName="msg_char_8c_latin_capital_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3600"/>
-        <Texture Name="gMsgChar8DLatinCapitalLetterNWithTildeTex" OutName="msg_char_8d_latin_capital_letter_n_with_tilde" Format="i4" Width="16" Height="16" Offset="0x3680"/>
-        <Texture Name="gMsgChar8ELatinCapitalLetterOWithGraveTex" OutName="msg_char_8e_latin_capital_letter_o_with_grave" Format="i4" Width="16" Height="16" Offset="0x3700"/>
-        <Texture Name="gMsgChar8FLatinCapitalLetterOWithAcuteTex" OutName="msg_char_8f_latin_capital_letter_o_with_acute" Format="i4" Width="16" Height="16" Offset="0x3780"/>
-        <Texture Name="gMsgChar90LatinCapitalLetterOWithCircumflexTex" OutName="msg_char_90_latin_capital_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3800"/>
-        <Texture Name="gMsgChar91LatinCapitalLetterOWithDiaeresisTex" OutName="msg_char_91_latin_capital_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3880"/>
-        <Texture Name="gMsgChar92LatinCapitalLetterUWithGraveTex" OutName="msg_char_92_latin_capital_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3900"/>
-        <Texture Name="gMsgChar93LatinCapitalLetterUWithAcuteTex" OutName="msg_char_93_latin_capital_letter_u_with_acute" Format="i4" Width="16" Height="16" Offset="0x3980"/>
-        <Texture Name="gMsgChar94LatinCapitalLetterUWithCircumflexTex" OutName="msg_char_94_latin_capital_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
-        <Texture Name="gMsgChar95LatinCapitalLetterUWithDiaeresisTex" OutName="msg_char_95_latin_capital_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
-        <Texture Name="gMsgChar96GreekSmallLetterBetaTex" OutName="msg_char_96_greek_small_letter_beta" Format="i4" Width="16" Height="16" Offset="0x3B00"/><!-- Likely meant to be eszett -->
-        <Texture Name="gMsgChar97LatinSmallLetterAWithGraveTex" OutName="msg_char_97_latin_small_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
-        <Texture Name="gMsgChar98LatinSmallLetterAWithAcuteTex" OutName="msg_char_98_latin_small_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
-        <Texture Name="gMsgChar99LatinSmallLetterAWithCircumflexTex" OutName="msg_char_99_latin_small_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
-        <Texture Name="gMsgChar9ALatinSmallLetterAWithDiaeresisTex" OutName="msg_char_9a_latin_small_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
-        <Texture Name="gMsgChar9BLatinSmallLetterCWithCedillaTex" OutName="msg_char_9b_latin_small_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
-        <Texture Name="gMsgChar9CLatinSmallLetterEWithGraveTex" OutName="msg_char_9c_latin_small_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
-        <Texture Name="gMsgChar9DLatinSmallLetterEWithAcuteTex" OutName="msg_char_9d_latin_small_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
-        <Texture Name="gMsgChar9ELatinSmallLetterEWithCircumflexTex" OutName="msg_char_9e_latin_small_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
-        <Texture Name="gMsgChar9FLatinSmallLetterEWithDiaeresisTex" OutName="msg_char_9f_latin_small_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
-        <Texture Name="gMsgCharA0LatinSmallLetterIWithGraveTex" OutName="msg_char_a0_latin_small_letter_i_with_grave" Format="i4" Width="16" Height="16" Offset="0x4000"/>
-        <Texture Name="gMsgCharA1LatinSmallLetterIWithAcuteTex" OutName="msg_char_a1_latin_small_letter_i_with_acute" Format="i4" Width="16" Height="16" Offset="0x4080"/>
-        <Texture Name="gMsgCharA2LatinSmallLetterIWithCircumflexTex" OutName="msg_char_a2_latin_small_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x4100"/>
-        <Texture Name="gMsgCharA3LatinSmallLetterIWithDiaeresisTex" OutName="msg_char_a3_latin_small_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x4180"/>
-        <Texture Name="gMsgCharA4LatinSmallLetterNWithTildeTex" OutName="msg_char_a4_latin_small_letter_n_with_tilde" Format="i4" Width="16" Height="16" Offset="0x4200"/>
-        <Texture Name="gMsgCharA5LatinSmallLetterOWithGraveTex" OutName="msg_char_a5_latin_small_letter_o_with_grave" Format="i4" Width="16" Height="16" Offset="0x4280"/>
-        <Texture Name="gMsgCharA6LatinSmallLetterOWithAcuteTex" OutName="msg_char_a6_latin_small_letter_o_with_acute" Format="i4" Width="16" Height="16" Offset="0x4300"/>
-        <Texture Name="gMsgCharA7LatinSmallLetterOWithCircumflexTex" OutName="msg_char_a7_latin_small_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x4380"/>
-        <Texture Name="gMsgCharA8LatinSmallLetterOWithDiaeresisTex" OutName="msg_char_a8_latin_small_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x4400"/>
-        <Texture Name="gMsgCharA9LatinSmallLetterUWithGraveTex" OutName="msg_char_a9_latin_small_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x4480"/>
-        <Texture Name="gMsgCharAALatinSmallLetterUWithAcuteTex" OutName="msg_char_aa_latin_small_letter_u_with_acute" Format="i4" Width="16" Height="16" Offset="0x4500"/>
-        <Texture Name="gMsgCharABLatinSmallLetterUWithCircumflexTex" OutName="msg_char_ab_latin_small_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x4580"/>
-        <Texture Name="gMsgCharACLatinSmallLetterUWithDiaeresisTex" OutName="msg_char_ac_latin_small_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x4600"/>
-        <Texture Name="gMsgCharADInvertedExclamationMarkTex" OutName="msg_char_ad_inverted_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x4680"/>
-        <Texture Name="gMsgCharAEInvertedQuestionMarkTex" OutName="msg_char_ae_inverted_question_mark" Format="i4" Width="16" Height="16" Offset="0x4700"/>
-        <Texture Name="gMsgCharAFFeminineOrdinalIndicatorTex" OutName="msg_char_af_feminine_ordinal_indicator" Format="i4" Width="16" Height="16" Offset="0x4780"/>
-
-        <!-- Controller buttons and target inverted triangle -->
-        <Texture Name="gMsgCharB0ButtonATex" OutName="msg_char_b0_button_a" Format="i4" Width="16" Height="16" Offset="0x4800"/>
-        <Texture Name="gMsgCharB1ButtonBTex" OutName="msg_char_b1_button_b" Format="i4" Width="16" Height="16" Offset="0x4880"/>
-        <Texture Name="gMsgCharB2ButtonCTex" OutName="msg_char_b2_button_c" Format="i4" Width="16" Height="16" Offset="0x4900"/>
-        <Texture Name="gMsgCharB3ButtonLTex" OutName="msg_char_b3_button_l" Format="i4" Width="16" Height="16" Offset="0x4980"/>
-        <Texture Name="gMsgCharB4ButtonRTex" OutName="msg_char_b4_button_r" Format="i4" Width="16" Height="16" Offset="0x4A00"/>
-        <Texture Name="gMsgCharB5ButtonZTex" OutName="msg_char_b5_button_z" Format="i4" Width="16" Height="16" Offset="0x4A80"/>
-        <Texture Name="gMsgCharB6ButtonCUpTex" OutName="msg_char_b6_button_c_up" Format="i4" Width="16" Height="16" Offset="0x4B00"/>
-        <Texture Name="gMsgCharB7ButtonCDownTex" OutName="msg_char_b7_button_c_down" Format="i4" Width="16" Height="16" Offset="0x4B80"/>
-        <Texture Name="gMsgCharB8ButtonCLeftTex" OutName="msg_char_b8_button_c_left" Format="i4" Width="16" Height="16" Offset="0x4C00"/>
-        <Texture Name="gMsgCharB9ButtonCRightTex" OutName="msg_char_b9_button_c_right" Format="i4" Width="16" Height="16" Offset="0x4C80"/>
-        <Texture Name="gMsgCharBAZTargetSignTex" OutName="msg_char_ba_z_target_sign" Format="i4" Width="16" Height="16" Offset="0x4D00"/>
-        <Texture Name="gMsgCharBBControlStickTex" OutName="msg_char_bb_control_stick" Format="i4" Width="16" Height="16" Offset="0x4D80"/>
-     </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/parameter_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/parameter_static.xml
deleted file mode 100644
index 2cbcb8124..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/parameter_static.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<Root>
-    <File Name="parameter_static" Segment="2">
-        <Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16" Offset="0x0"/>
-        <Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x100"/>
-        <Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16" Offset="0x200"/>
-        <Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x300"/>
-        <Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16" Offset="0x400"/>
-        <Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16" Offset="0x500"/>
-        <Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x600"/>
-        <Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16" Offset="0x700"/>
-        <Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x800"/>
-        <Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16" Offset="0x900"/>
-
-        <Texture Name="gFishermanMinigameTorchIconTex" OutName="fisherman_minigame_torch_icon" Format="ia8" Width="16" Height="30" Offset="0xA00"/>
-        <Texture Name="gSwordTrainingLogIconTex" OutName="sword_training_log_icon" Format="ia8" Width="24" Height="16" Offset="0xBE0"/>
-        <Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16" Offset="0xD60"/>
-        <Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16" Offset="0xE60"/>
-        <Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32" Offset="0xF60"/>
-        <Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32" Offset="0x1360"/>
-        <Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1760"/>
-        <Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1B60"/>
-        <Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1F60"/>
-        <Texture Name="gTimerClockIconTex" OutName="timer_clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2360"/>
-        <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2460"/>
-
-        <Texture Name="gOcarinaATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x24A0"/>
-        <Texture Name="gOcarinaCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x25A0"/>
-        <Texture Name="gOcarinaCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x26A0"/>
-        <Texture Name="gOcarinaCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x27A0"/>
-        <Texture Name="gOcarinaCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x28A0"/>
-        <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x29A0"/>
-
-        <Texture Name="gSceneTitleCardGradientTex" OutName="scene_title_card_gradient" Format="i8" Width="64" Height="1" Offset="0x2AA0"/>
-
-        <!-- All four versions of Tatl textures are identical -->
-        <Texture Name="gTatlCUpENGTex" OutName="tatl_c_up_eng" Format="ia4" Width="32" Height="12" Offset="0x2AE0"/>
-        <Texture Name="gTatlCUpGERTex" OutName="tatl_c_up_ger" Format="ia4" Width="32" Height="12" Offset="0x2BA0"/>
-        <Texture Name="gTatlCUpFRATex" OutName="tatl_c_up_fra" Format="ia4" Width="32" Height="12" Offset="0x2C60"/>
-        <Texture Name="gTatlCUpESPTex" OutName="tatl_c_up_esp" Format="ia4" Width="32" Height="12" Offset="0x2D20"/>
-
-        <Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16" Offset="0x2DE0"/>
-        <Texture Name="gGoldSkulltulaCounterIconTex" OutName="gold_skulltula_counter_icon" Format="rgba32" Width="24" Height="18" Offset="0x31E0"/>
-        <Texture Name="gBeaverRingIconTex" OutName="beaver_ring_icon" Format="rgba32" Width="24" Height="16" Offset="0x38A0"/>
-        <Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x3EA0"/>
-        <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x3F20"/>
-        <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x3FA0"/>
-
-        <!-- Looking through the lens of the pictograph box -->
-        <Texture Name="gPictoBoxFocusIconTex" OutName="picto_box_focus_icon" Format="i4" Width="32" Height="16" Offset="0x42A0"/>
-        <Texture Name="gPictoBoxFocusBorderTex" OutName="picto_box_focus_border" Format="ia4" Width="16" Height="16" Offset="0x43A0"/>
-        <Texture Name="gPictoBoxFocusTextTex" OutName="picto_box_focus_text" Format="i4" Width="32" Height="8" Offset="0x4420"/>
-
-        <Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16" Offset="0x44A0"/>
-        <Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16" Offset="0x4520"/>
-        <Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16" Offset="0x45A0"/>
-        <Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16" Offset="0x4620"/>
-        <Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16" Offset="0x46A0"/>
-        <Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16" Offset="0x4720"/>
-        <Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16" Offset="0x47A0"/>
-        <Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16" Offset="0x4820"/>
-        <Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16" Offset="0x48A0"/>
-        <Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16" Offset="0x4920"/>
-        <Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16" Offset="0x49A0"/>
-        <Texture Name="gStrayFairyMapCounterSlashTex" OutName="stray_fairy_map_counter_slash" Format="i8" Width="8" Height="16" Offset="0x4A20"/>
-
-        <Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8" Offset="0x4AA0"/>
-        <Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8" Offset="0x4AE0"/>
-        <Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8" Offset="0x4B20"/>
-        <Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8" Offset="0x4B60"/>
-        <Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8" Offset="0x4BA0"/>
-        <Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8" Offset="0x4BE0"/>
-        <Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8" Offset="0x4C20"/>
-        <Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8" Offset="0x4C60"/>
-        <Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8" Offset="0x4CA0"/>
-        <Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8" Offset="0x4CE0"/>
-        <Texture Name="gAmmoDigitHalfTex" OutName="ammo_digit_half" Format="ia8" Width="16" Height="8" Offset="0x4D20"/>
-
-        <Texture Name="gMagicMeterEndTex" OutName="magic_meter_end" Format="ia8" Width="8" Height="16" Offset="0x4DA0"/>
-        <Texture Name="gMagicMeterMidTex" OutName="magic_meter_mid" Format="ia8" Width="24" Height="16" Offset="0x4E20"/>
-        <Texture Name="gMagicMeterFillTex" OutName="magic_meter_fill" Format="i4" Width="16" Height="16" Offset="0x4FA0"/>
-
-        <!-- The analog clock from day one until midnight of the final day -->
-        <Texture Name="gThreeDayClockDiamondTex" OutName="three_day_clock_diamond" Format="ia8" Width="40" Height="32" Offset="0x4FE0"/>
-        <Texture Name="gThreeDayClockMoonHourTex" OutName="three_day_clock_moon_hour" Format="ia8" Width="24" Height="24" Offset="0x54E0"/>
-        <Texture Name="gThreeDayClockSunHourTex" OutName="three_day_clock_sun_hour" Format="ia8" Width="24" Height="24" Offset="0x5720"/>
-        <Texture Name="gThreeDayClockBorderTex" OutName="three_day_clock_border" Format="i4" Width="64" Height="48" Offset="0x5960"/>
-        <Texture Name="gThreeDayClockHourLinesTex" OutName="three_day_clock_hour_lines" Format="i4" Width="64" Height="35" Offset="0x5F60"/>
-        <Texture Name="gThreeDayClockStarMinuteTex" OutName="three_day_clock_star_minute" Format="i4" Width="16" Height="16" Offset="0x63C0"/>
-        <Texture Name="gThreeDayClockHour12Tex" OutName="three_day_clock_hour_12" Format="i4" Width="16" Height="11" Offset="0x6440"/>
-        <Texture Name="gThreeDayClockHour1Tex" OutName="three_day_clock_hour_1" Format="i4" Width="16" Height="11" Offset="0x6498"/>
-        <Texture Name="gThreeDayClockHour2Tex" OutName="three_day_clock_hour_2" Format="i4" Width="16" Height="11" Offset="0x64F0"/>
-        <Texture Name="gThreeDayClockHour3Tex" OutName="three_day_clock_hour_3" Format="i4" Width="16" Height="11" Offset="0x6548"/>
-        <Texture Name="gThreeDayClockHour4Tex" OutName="three_day_clock_hour_4" Format="i4" Width="16" Height="11" Offset="0x65A0"/>
-        <Texture Name="gThreeDayClockHour5Tex" OutName="three_day_clock_hour_5" Format="i4" Width="16" Height="11" Offset="0x65F8"/>
-        <Texture Name="gThreeDayClockHour6Tex" OutName="three_day_clock_hour_6" Format="i4" Width="16" Height="11" Offset="0x6650"/>
-        <Texture Name="gThreeDayClockHour7Tex" OutName="three_day_clock_hour_7" Format="i4" Width="16" Height="11" Offset="0x66A8"/>
-        <Texture Name="gThreeDayClockHour8Tex" OutName="three_day_clock_hour_8" Format="i4" Width="16" Height="11" Offset="0x6700"/>
-        <Texture Name="gThreeDayClockHour9Tex" OutName="three_day_clock_hour_9" Format="i4" Width="16" Height="11" Offset="0x6758"/>
-        <Texture Name="gThreeDayClockHour10Tex" OutName="three_day_clock_hour_10" Format="i4" Width="16" Height="11" Offset="0x67B0"/>
-        <Texture Name="gThreeDayClockHour11Tex" OutName="three_day_clock_hour_11" Format="i4" Width="16" Height="11" Offset="0x6808"/>
-
-        <!-- The digital clock until moon crash after midnight of the final day -->
-        <Texture Name="gFinalHoursClockDigit0Tex" OutName="final_hours_clock_digit_0" Format="i8" Width="8" Height="8" Offset="0x6860"/>
-        <Texture Name="gFinalHoursClockDigit1Tex" OutName="final_hours_clock_digit_1" Format="i8" Width="8" Height="8" Offset="0x68A0"/>
-        <Texture Name="gFinalHoursClockDigit2Tex" OutName="final_hours_clock_digit_2" Format="i8" Width="8" Height="8" Offset="0x68E0"/>
-        <Texture Name="gFinalHoursClockDigit3Tex" OutName="final_hours_clock_digit_3" Format="i8" Width="8" Height="8" Offset="0x6920"/>
-        <Texture Name="gFinalHoursClockDigit4Tex" OutName="final_hours_clock_digit_4" Format="i8" Width="8" Height="8" Offset="0x6960"/>
-        <Texture Name="gFinalHoursClockDigit5Tex" OutName="final_hours_clock_digit_5" Format="i8" Width="8" Height="8" Offset="0x69A0"/>
-        <Texture Name="gFinalHoursClockDigit6Tex" OutName="final_hours_clock_digit_6" Format="i8" Width="8" Height="8" Offset="0x69E0"/>
-        <Texture Name="gFinalHoursClockDigit7Tex" OutName="final_hours_clock_digit_7" Format="i8" Width="8" Height="8" Offset="0x6A20"/>
-        <Texture Name="gFinalHoursClockDigit8Tex" OutName="final_hours_clock_digit_8" Format="i8" Width="8" Height="8" Offset="0x6A60"/>
-        <Texture Name="gFinalHoursClockDigit9Tex" OutName="final_hours_clock_digit_9" Format="i8" Width="8" Height="8" Offset="0x6AA0"/>
-        <Texture Name="gFinalHoursClockColonTex" OutName="final_hours_clock_colon" Format="i8" Width="8" Height="8" Offset="0x6AE0"/>
-        <Texture Name="gFinalHoursClockFrameTex" OutName="final_hours_clock_frame" Format="ia4" Width="80" Height="13" Offset="0x6B20"/>
-
-        <Texture Name="gMinigameCountdownGoTex" OutName="minigame_countdown_go" Format="ia8" Width="40" Height="32" Offset="0x6D28"/>
-        <Texture Name="gMinigameCountdown1Tex" OutName="minigame_countdown_1" Format="ia8" Width="24" Height="32" Offset="0x7228"/>
-        <Texture Name="gMinigameCountdown2Tex" OutName="minigame_countdown_2" Format="ia8" Width="24" Height="32" Offset="0x7528"/>
-        <Texture Name="gMinigameCountdown3Tex" OutName="minigame_countdown_3" Format="ia8" Width="24" Height="32" Offset="0x7828"/>
-
-        <!-- The letters of "PERFECT!" -->
-        <Texture Name="gPerfectLetterPTex" OutName="letter_perfect_p" Format="i4" Width="32" Height="33" Offset="0x7B28"/>
-        <Texture Name="gPerfectLetterETex" OutName="letter_perfect_e" Format="i4" Width="32" Height="33" Offset="0x7D38"/>
-        <Texture Name="gPerfectLetterRTex" OutName="letter_perfect_r" Format="i4" Width="32" Height="33" Offset="0x7F48"/>
-        <Texture Name="gPerfectLetterFTex" OutName="letter_perfect_f" Format="i4" Width="32" Height="33" Offset="0x8158"/>
-        <Texture Name="gPerfectLetterCTex" OutName="letter_perfect_c" Format="i4" Width="32" Height="33" Offset="0x8368"/>
-        <Texture Name="gPerfectLetterTTex" OutName="letter_perfect_t" Format="i4" Width="32" Height="33" Offset="0x8578"/>
-        <Texture Name="gPerfectLetterExclamationTex" OutName="letter_perfect_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"/>
-        <Texture Name="gStrayFairyStoneTowerIconTex" OutName="stray_fairy_stone_tower_icon" Format="rgba32" Width="32" Height="24" Offset="0xAD98"/>
-        <Texture Name="gStrayFairyGlowingCircleIconTex" OutName="stray_fairy_glowing_circle_icon" Format="i4" Width="32" Height="24" Offset="0xB998"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/schedule_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/schedule_static.xml
deleted file mode 100644
index cf87038ce..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/schedule_static.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<Root>
-    <File Name="schedule_static" Segment="8">
-        <Texture Name="gBombersNotebookEntryIconExclamationPointTex" OutName="bombers_notebook_entry_icon_exlamation_point" Format="ia8" Width="16" Height="16" Offset="0x0000"/>
-        <Texture Name="gBombersNotebookStampTex" OutName="bombers_notebook_stamp" Format="ia8" Width="32" Height="48" Offset="0x0100"/>
-        <Texture Name="gBombersNotebookArrowTex" OutName="bombers_notebook_arrow" Format="ia8" Width="24" Height="16" Offset="0x0700"/>
-        <Texture Name="gBombersNotebookConnectorTex" OutName="bombers_notebook_connector" Format="ia8" Width="32" Height="14" Offset="0x0880"/>
-        <Texture Name="gBombersNotebookEmptyPhotoTex" OutName="bombers_notebook_empty_photo" Format="rgba16" Width="32" Height="32" Offset="0x0A40"/>
-        <Texture Name="gBombersNotebookEntryBoxEndTex" OutName="bombers_notebook_entry_end" Format="rgba16" Width="4" Height="16" Offset="0x1240"/>
-        <Texture Name="gBombersNotebookEntryBoxMiddleTex" OutName="bombers_notebook_entry_middle" Format="rgba16" Width="4" Height="16" Offset="0x12C0"/>
-        <Texture Name="gBombersNotebookSubColumnBoxTex" OutName="bombers_notebook_sub_column_box" Format="i4" Width="48" Height="1" Offset="0x1340"/>
-        <Texture Name="gBombersNotebookCircleTex" OutName="bombers_notebook_circle" Format="i4" Width="16" Height="16" Offset="0x1358"/>        
-        <Texture Name="gBombersNotebookBackgroundTex" OutName="bombers_notebook_background" Format="i8" Width="32" Height="32" Offset="0x13D8"/>
-        <Texture Name="gBombersNotebookHeaderBoxTex" OutName="bombers_notebook_header_box" Format="i8" Width="8" Height="24" Offset="0x17D8"/>
-        <Texture Name="gBombersNotebookLineTex" OutName="bombers_notebook_line" Format="i8" Width="8" Height="1" Offset="0x1898"/>
-        <Texture Name="gBombersNotebookBarSmallTex" OutName="bombers_notebook_bar_small" Format="i8" Width="8" Height="2" Offset="0x18A0"/> <!-- Unused -->
-        <Texture Name="gBombersNotebookBarTex" OutName="bombers_notebook_bar" Format="i8" Width="8" Height="4" Offset="0x18B0"/>
-        <Texture Name="gBombersNotebookCursorTex" OutName="bombers_notebook_cursor" Format="ia4" Width="16" Height="16" Offset="0x18D0"/>
-        <Texture Name="gBombersNoteoobkTimeOfDayBoxTex" OutName="bombers_notebook_time_of_day_box" Format="ia4" Width="64" Height="28" Offset="0x1950"/>
-        <Texture Name="gBombersNotebookTimeBoxLeftTex" OutName="bombers_notebook_time_box_left" Format="ia4" Width="16" Height="28" Offset="0x1CD0"/>
-        <Texture Name="gBombersNotebookTimeBoxRightTex" OutName="bombers_notebook_time_box_right" Format="ia4" Width="16" Height="28" Offset="0x1DB0"/>
-        <Texture Name="gBombersNotebookTimeBoxMiddleTex" OutName="bombers_notebook_time_box_middle" Format="ia4" Width="16" Height="28" Offset="0x1E90"/>
-        <Texture Name="gBombersNotebook1800Tex" OutName="bombers_notebook_1800" Format="ia4" Width="48" Height="11" Offset="0x1F70"/>
-        <Texture Name="gBombersNotebookDigit0Tex" OutName="bombers_notebook_digit_0" Format="i4" Width="16" Height="17" Offset="0x2078"/>
-        <Texture Name="gBombersNotebookDigit1Tex" OutName="bombers_notebook_digit_1" Format="i4" Width="16" Height="17" Offset="0x2100"/>
-        <Texture Name="gBombersNotebookDigit2Tex" OutName="bombers_notebook_digit_2" Format="i4" Width="16" Height="17" Offset="0x2188"/>
-        <Texture Name="gBombersNotebookDigit3Tex" OutName="bombers_notebook_digit_3" Format="i4" Width="16" Height="17" Offset="0x2210"/>
-        <Texture Name="gBombersNotebookDigit4Tex" OutName="bombers_notebook_digit_4" Format="i4" Width="16" Height="17" Offset="0x2298"/>
-        <Texture Name="gBombersNotebookDigit5Tex" OutName="bombers_notebook_digit_5" Format="i4" Width="16" Height="17" Offset="0x2320"/>
-        <Texture Name="gBombersNotebookDigit6Tex" OutName="bombers_notebook_digit_6" Format="i4" Width="16" Height="17" Offset="0x23A8"/>
-        <Texture Name="gBombersNotebookDigit7Tex" OutName="bombers_notebook_digit_7" Format="i4" Width="16" Height="17" Offset="0x2430"/>
-        <Texture Name="gBombersNotebookDigit8Tex" OutName="bombers_notebook_digit_8" Format="i4" Width="16" Height="17" Offset="0x24B8"/>
-        <Texture Name="gBombersNotebookDigit9Tex" OutName="bombers_notebook_digit_9" Format="i4" Width="16" Height="17" Offset="0x2540"/>
-        <Texture Name="gBombersNotebookColonTex" OutName="bombers_notebook_colon" Format="i4" Width="16" Height="17" Offset="0x25C8"/>
-
-        <!-- English -->
-        <Texture Name="gBombersNotebookDay1stENGTex" OutName="bombers_notebook_day_1st_eng" Format="ia8" Width="48" Height="22" Offset="0x2650"/>
-        <Texture Name="gBombersNotebookDay2ndENGTex" OutName="bombers_notebook_day_2nd_eng" Format="ia8" Width="48" Height="22" Offset="0x2A70"/>
-        <Texture Name="gBombersNotebookDayFinalENGTex" OutName="bombers_notebook_day_final_eng" Format="ia8" Width="48" Height="22" Offset="0x2E90"/>
-        <Texture Name="gBombersNotebookTimeOfDayENGTex" OutName="bombers_notebook_time_of_day_eng" Format="i4" Width="96" Height="20" Offset="0x32B0"/>
-
-        <!-- German -->
-        <Texture Name="gBombersNotebookDay1stGERTex" OutName="bombers_notebook_day_1st_ger" Format="ia8" Width="48" Height="22" Offset="0x3670"/>
-        <Texture Name="gBombersNotebookDay2ndGERTex" OutName="bombers_notebook_day_2nd_ger" Format="ia8" Width="48" Height="22" Offset="0x3A90"/>
-        <Texture Name="gBombersNotebookDayFinalGERTex" OutName="bombers_notebook_day_final_ger" Format="ia8" Width="48" Height="22" Offset="0x3EB0"/>
-        <Texture Name="gBombersNotebookTimeOfDayGERTex" OutName="bombers_notebook_time_of_day_ger" Format="i4" Width="96" Height="20" Offset="0x42D0"/>
-
-        <!-- French -->
-        <Texture Name="gBombersNotebookDay1stFRATex" OutName="bombers_notebook_day_1st_fra" Format="ia8" Width="48" Height="22" Offset="0x4690"/>
-        <Texture Name="gBombersNotebookDay2ndFRATex" OutName="bombers_notebook_day_2nd_fra" Format="ia8" Width="48" Height="22" Offset="0x4AB0"/>
-        <Texture Name="gBombersNotebookDayFinalFRATex" OutName="bombers_notebook_day_final_fra" Format="ia8" Width="48" Height="22" Offset="0x4ED0"/>
-        <Texture Name="gBombersNotebookTimeOfDayFRATex" OutName="bombers_notebook_time_of_day_fra" Format="i4" Width="96" Height="20" Offset="0x52F0"/>
-
-        <!-- Spanish -->
-        <Texture Name="gBombersNotebookDay1stSPATex" OutName="bombers_notebook_day_1st_spa" Format="ia8" Width="48" Height="22" Offset="0x56B0"/>
-        <Texture Name="gBombersNotebookDay2ndSPATex" OutName="bombers_notebook_day_2nd_spa" Format="ia8" Width="48" Height="22" Offset="0x5AD0"/>
-        <Texture Name="gBombersNotebookDayFinalSPATex" OutName="bombers_notebook_day_final_spa" Format="ia8" Width="48" Height="22" Offset="0x5EF0"/>
-        <Texture Name="gBombersNotebookTimeOfDaySPATex" OutName="bombers_notebook_time_of_day_spa" Format="i4" Width="96" Height="20" Offset="0x6310"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/week_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/week_static.xml
deleted file mode 100644
index e2b098410..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/interface/week_static.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="week_static" Segment="9">
-        <Texture Name="gClockDay1stTex" OutName="clock_day_1st" Format="i8" Width="48" Height="27" Offset="0x0"/>
-        <Texture Name="gClockDay2ndTex" OutName="clock_day_2nd" Format="i8" Width="48" Height="27" Offset="0x510"/>
-        <Texture Name="gClockDayFinalTex" OutName="clock_day_final" Format="i8" Width="48" Height="27" Offset="0xA20"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/daytelop_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/daytelop_static.xml
deleted file mode 100644
index 2c558404f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/daytelop_static.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <File Name="daytelop_static" Segment="9">
-        <Texture Name="gDaytelopFirstDayLeftNESTex" OutName="first_day_left_nes" Format="i4" Width="128" Height="64" Offset="0x0"/>
-        <Texture Name="gDaytelopFirstDayRightNESTex" OutName="first_day_right_nes" Format="i4" Width="128" Height="64" Offset="0x1000"/>
-
-        <Texture Name="gDaytelopSecondDayLeftNESTex" OutName="second_day_left_nes" Format="i4" Width="128" Height="64" Offset="0x2000"/>
-        <Texture Name="gDaytelopSecondDayRightNESTex" OutName="second_day_right_nes" Format="i4" Width="128" Height="64" Offset="0x3000"/>
-
-        <Texture Name="gDaytelopFinalDayLeftNESTex" OutName="final_day_left_nes" Format="i4" Width="128" Height="64" Offset="0x4000"/>
-        <Texture Name="gDaytelopFinalDayRightNESTex" OutName="final_day_right_nes" Format="i4" Width="128" Height="64" Offset="0x5000"/>
-
-        <Texture Name="gDaytelopNewDayLeftNESTex" OutName="new_day_left_nes" Format="i4" Width="128" Height="64" Offset="0x6000"/>
-        <Texture Name="gDaytelopNewDayRightNESTex" OutName="new_day_right_nes" Format="i4" Width="128" Height="64" Offset="0x7000"/>
-
-        <Texture Name="gDaytelop72HoursNESTex" OutName="72_hours_nes" Format="i4" Width="144" Height="32" Offset="0x8000"/>
-        <Texture Name="gDaytelop48HoursNESTex" OutName="48_hours_nes" Format="i4" Width="144" Height="32" Offset="0x8900"/>
-        <Texture Name="gDaytelop24HoursNESTex" OutName="24_hours_nes" Format="i4" Width="144" Height="32" Offset="0x9200"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/esp_daytelop_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/esp_daytelop_static.xml
deleted file mode 100644
index 2c55295dc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/esp_daytelop_static.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <File Name="esp_daytelop_static" Segment="9">
-        <Texture Name="gDaytelopFirstDayLeftESPTex" OutName="first_day_left_esp" Format="i4" Width="128" Height="64" Offset="0x0"/>
-        <Texture Name="gDaytelopFirstDayRightESPTex" OutName="first_day_right_esp" Format="i4" Width="128" Height="64" Offset="0x1000"/>
-
-        <Texture Name="gDaytelopSecondDayLeftESPTex" OutName="second_day_left_esp" Format="i4" Width="128" Height="64" Offset="0x2000"/>
-        <Texture Name="gDaytelopSecondDayRightESPTex" OutName="second_day_right_esp" Format="i4" Width="128" Height="64" Offset="0x3000"/>
-
-        <Texture Name="gDaytelopFinalDayLeftESPTex" OutName="final_day_left_esp" Format="i4" Width="128" Height="64" Offset="0x4000"/>
-        <Texture Name="gDaytelopFinalDayRightESPTex" OutName="final_day_right_esp" Format="i4" Width="128" Height="64" Offset="0x5000"/>
-
-        <Texture Name="gDaytelopNewDayLeftESPTex" OutName="new_day_left_esp" Format="i4" Width="128" Height="64" Offset="0x6000"/>
-        <Texture Name="gDaytelopNewDayRightESPTex" OutName="new_day_right_esp" Format="i4" Width="128" Height="64" Offset="0x7000"/>
-
-        <Texture Name="gDaytelop72HoursESPTex" OutName="72_hours_esp" Format="i4" Width="144" Height="32" Offset="0x8000"/>
-        <Texture Name="gDaytelop48HoursESPTex" OutName="48_hours_esp" Format="i4" Width="144" Height="32" Offset="0x8900"/>
-        <Texture Name="gDaytelop24HoursESPTex" OutName="24_hours_esp" Format="i4" Width="144" Height="32" Offset="0x9200"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/fra_daytelop_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/fra_daytelop_static.xml
deleted file mode 100644
index f855ddbe1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/fra_daytelop_static.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <File Name="fra_daytelop_static" Segment="9">
-        <Texture Name="gDaytelopFirstDayLeftFRATex" OutName="first_day_left_fra" Format="i4" Width="128" Height="64" Offset="0x0"/>
-        <Texture Name="gDaytelopFirstDayRightFRATex" OutName="first_day_right_fra" Format="i4" Width="128" Height="64" Offset="0x1000"/>
-
-        <Texture Name="gDaytelopSecondDayLeftFRATex" OutName="second_day_left_fra" Format="i4" Width="128" Height="64" Offset="0x2000"/>
-        <Texture Name="gDaytelopSecondDayRightFRATex" OutName="second_day_right_fra" Format="i4" Width="128" Height="64" Offset="0x3000"/>
-
-        <Texture Name="gDaytelopFinalDayLeftFRATex" OutName="final_day_left_fra" Format="i4" Width="128" Height="64" Offset="0x4000"/>
-        <Texture Name="gDaytelopFinalDayRightFRATex" OutName="final_day_right_fra" Format="i4" Width="128" Height="64" Offset="0x5000"/>
-
-        <Texture Name="gDaytelopNewDayLeftFRATex" OutName="new_day_left_fra" Format="i4" Width="128" Height="64" Offset="0x6000"/>
-        <Texture Name="gDaytelopNewDayRightFRATex" OutName="new_day_right_fra" Format="i4" Width="128" Height="64" Offset="0x7000"/>
-
-        <Texture Name="gDaytelop72HoursFRATex" OutName="72_hours_fra" Format="i4" Width="144" Height="32" Offset="0x8000"/>
-        <Texture Name="gDaytelop48HoursFRATex" OutName="48_hours_fra" Format="i4" Width="144" Height="32" Offset="0x8900"/>
-        <Texture Name="gDaytelop24HoursFRATex" OutName="24_hours_fra" Format="i4" Width="144" Height="32" Offset="0x9200"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/ger_daytelop_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/ger_daytelop_static.xml
deleted file mode 100644
index 398683f4b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/ger_daytelop_static.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <File Name="ger_daytelop_static" Segment="9">
-        <Texture Name="gDaytelopFirstDayLeftGERTex" OutName="first_day_left_ger" Format="i4" Width="128" Height="64" Offset="0x0"/>
-        <Texture Name="gDaytelopFirstDayRightGERTex" OutName="first_day_right_ger" Format="i4" Width="128" Height="64" Offset="0x1000"/>
-
-        <Texture Name="gDaytelopSecondDayLeftGERTex" OutName="second_day_left_ger" Format="i4" Width="128" Height="64" Offset="0x2000"/>
-        <Texture Name="gDaytelopSecondDayRightGERTex" OutName="second_day_right_ger" Format="i4" Width="128" Height="64" Offset="0x3000"/>
-
-        <Texture Name="gDaytelopFinalDayLeftGERTex" OutName="final_day_left_ger" Format="i4" Width="128" Height="64" Offset="0x4000"/>
-        <Texture Name="gDaytelopFinalDayRightGERTex" OutName="final_day_right_ger" Format="i4" Width="128" Height="64" Offset="0x5000"/>
-
-        <Texture Name="gDaytelopNewDayLeftGERTex" OutName="new_day_left_ger" Format="i4" Width="128" Height="64" Offset="0x6000"/>
-        <Texture Name="gDaytelopNewDayRightGERTex" OutName="new_day_right_ger" Format="i4" Width="128" Height="64" Offset="0x7000"/>
-
-        <Texture Name="gDaytelop72HoursGERTex" OutName="72_hours_ger" Format="i4" Width="144" Height="32" Offset="0x8000"/>
-        <Texture Name="gDaytelop48HoursGERTex" OutName="48_hours_ger" Format="i4" Width="144" Height="32" Offset="0x8900"/>
-        <Texture Name="gDaytelop24HoursGERTex" OutName="24_hours_ger" Format="i4" Width="144" Height="32" Offset="0x9200"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/link_animetion.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/link_animetion.xml
deleted file mode 100644
index f192ae1ae..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/link_animetion.xml
+++ /dev/null
@@ -1,699 +0,0 @@
-<Root>
-    <File Name="link_animetion" Segment="7">
-        <PlayerAnimationData Name="gPlayerAnim_al_fuwafuwa_modori_Data" FrameCount="54" Offset="0x0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_shitR_Data" FrameCount="8" Offset="0x1C50"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_tetunagu_loop_Data" FrameCount="40" Offset="0x2080"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_left_down_Data" FrameCount="65" Offset="0x3570"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_nigeru_Data" FrameCount="8" Offset="0x5780"/>
-        <PlayerAnimationData Name="gPlayerAnim_dl_kokeru_Data" FrameCount="14" Offset="0x5BB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_nozokikomi_Data" FrameCount="70" Offset="0x6310"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_free2free_Data" FrameCount="20" Offset="0x87C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_miseau_Data" FrameCount="40" Offset="0x9240"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_rebound_Data" FrameCount="11" Offset="0xA730"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cutterwaitB_Data" FrameCount="9" Offset="0xAD00"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cutterwaitC_Data" FrameCount="9" Offset="0xB1C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cutterwaitA_Data" FrameCount="9" Offset="0xB680"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_nozokikomi_wait_Data" FrameCount="35" Offset="0xBB40"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_somukeru_loop_Data" FrameCount="40" Offset="0xCDA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pull_start_Data" FrameCount="16" Offset="0xE290"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_push_wait_end_Data" FrameCount="11" Offset="0xEAF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_kaitenmiss_Data" FrameCount="28" Offset="0xF0C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_free2fighter_free_Data" FrameCount="20" Offset="0xFF70"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_futtobi_Data" FrameCount="40" Offset="0x109F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR_Data" FrameCount="13" Offset="0x11EE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_tamahakidf_Data" FrameCount="2" Offset="0x125B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_fish_in_Data" FrameCount="44" Offset="0x126C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_get_Data" FrameCount="12" Offset="0x13DD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_defense_long_hitR_Data" FrameCount="7" Offset="0x14420"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_defense_long_hitL_Data" FrameCount="8" Offset="0x147D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_defense_wait_Data" FrameCount="31" Offset="0x14C00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_rolling_kiru_endR_Data" FrameCount="14" Offset="0x15C40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kaoage_Data" FrameCount="15" Offset="0x163A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_link_twait_Data" FrameCount="45" Offset="0x16B80"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_link_nwait_Data" FrameCount="45" Offset="0x18310"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR_Data" FrameCount="19" Offset="0x19AA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_waitF_itemA_20f_Data" FrameCount="90" Offset="0x1A4A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_waitF_itemB_20f_Data" FrameCount="100" Offset="0x1D3C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_umanoru_Data" FrameCount="74" Offset="0x20820"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_right_up_Data" FrameCount="74" Offset="0x22EE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_bug_out_Data" FrameCount="131" Offset="0x255A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_end_Data" FrameCount="5" Offset="0x29A40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LRside_kiru_end_Data" FrameCount="11" Offset="0x29CE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LLside_kiru_end_Data" FrameCount="13" Offset="0x2A2B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_ee_Data" FrameCount="30" Offset="0x2A980"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pull_start_free_Data" FrameCount="16" Offset="0x2B940"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_maskoff_Data" FrameCount="10" Offset="0x2C1A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_mukinaoru_Data" FrameCount="10" Offset="0x2C6E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpierce_kiru_end_Data" FrameCount="10" Offset="0x2CC20"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_tobikakaru_Data" FrameCount="52" Offset="0x2D160"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_ononoki_Data" FrameCount="60" Offset="0x2ECA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_spotlight_Data" FrameCount="50" Offset="0x30C10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait_Data" FrameCount="20" Offset="0x32640"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_fishswim_Data" FrameCount="10" Offset="0x330C0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_033600" FrameCount="52" Offset="0x33600"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_miokuri_wait_Data" FrameCount="30" Offset="0x35140"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_hip_down_Data" FrameCount="28" Offset="0x36100"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_endAL_Data" FrameCount="27" Offset="0x36FB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_endAR_Data" FrameCount="28" Offset="0x37DE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_shit_Data" FrameCount="8" Offset="0x38C90"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_endAL_Data" FrameCount="35" Offset="0x390C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_endAR_Data" FrameCount="36" Offset="0x3A320"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_endBL_Data" FrameCount="35" Offset="0x3B600"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_endBR_Data" FrameCount="36" Offset="0x3C860"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_endBL_Data" FrameCount="56" Offset="0x3DB40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_endBR_Data" FrameCount="56" Offset="0x3F890"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lside_kiru_endR_Data" FrameCount="8" Offset="0x415E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Rside_kiru_endR_Data" FrameCount="18" Offset="0x41A10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_walk_endR_long_Data" FrameCount="11" Offset="0x428C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_walk_endL_long_Data" FrameCount="11" Offset="0x42E90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_shagamu_demo_Data" FrameCount="13" Offset="0x43460"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0435F0" FrameCount="40" Offset="0x43B30"/>
-        <PlayerAnimationData Name="gPlayerAnimData_044AE0" FrameCount="33" Offset="0x45020"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_Data" FrameCount="9" Offset="0x46170"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_turn_kiruR_Data" FrameCount="6" Offset="0x46630"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_turn_kiruL_Data" FrameCount="5" Offset="0x46960"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_take_out_Data" FrameCount="38" Offset="0x46C00"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_tatiagari_Data" FrameCount="110" Offset="0x47FF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_Data" FrameCount="20" Offset="0x4B990"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait2waitR_Data" FrameCount="6" Offset="0x4C410"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_kiru_end_Data" FrameCount="12" Offset="0x4C740"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_kiru_end_Data" FrameCount="9" Offset="0x4CD90"/>
-        <PlayerAnimationData Name="gPlayerAnimData_04CD10" FrameCount="30" Offset="0x4D250"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_gakkistart_Data" FrameCount="15" Offset="0x4E210"/>
-        <PlayerAnimationData Name="gPlayerAnim_nw_modoru_Data" FrameCount="20" Offset="0x4E9F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_short_landing_Data" FrameCount="16" Offset="0x4F470"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_shit_Data" FrameCount="8" Offset="0x4FCD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_swimtowait_Data" FrameCount="10" Offset="0x50100"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_fastrun_muti_Data" FrameCount="24" Offset="0x50640"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_landingR_Data" FrameCount="21" Offset="0x512D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_kiru_Data" FrameCount="5" Offset="0x51DD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_kiru_Data" FrameCount="5" Offset="0x52070"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_drinkend_Data" FrameCount="20" Offset="0x52310"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_stop_muti_Data" FrameCount="75" Offset="0x52D90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_wait_long_Data" FrameCount="89" Offset="0x554E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_look_hand_Data" FrameCount="35" Offset="0x58380"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_Data" FrameCount="2" Offset="0x595E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_walk_Data" FrameCount="21" Offset="0x596F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_okarina_warp_goal_Data" FrameCount="45" Offset="0x5A1F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_nozoki_Data" FrameCount="30" Offset="0x5B980"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_wait_Data" FrameCount="34" Offset="0x5C940"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_bug_in_Data" FrameCount="44" Offset="0x5DB10"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_doorB_open_Data" FrameCount="100" Offset="0x5F220"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_doorA_open_Data" FrameCount="100" Offset="0x62680"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kousan_Data" FrameCount="28" Offset="0x65AE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_typeD_20f_Data" FrameCount="138" Offset="0x66990"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kakeyori_wait_Data" FrameCount="20" Offset="0x6B1D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_fuwafuwa_Data" FrameCount="45" Offset="0x6BC50"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_furafura_Data" FrameCount="136" Offset="0x6D3E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_walk_long_Data" FrameCount="29" Offset="0x71B10"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_link_orosuu_Data" FrameCount="90" Offset="0x72A40"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_getA_Data" FrameCount="22" Offset="0x75960"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_getB_Data" FrameCount="22" Offset="0x764F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_gurd_Data" FrameCount="4" Offset="0x77080"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hammer_normal2long_Data" FrameCount="20" Offset="0x772A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_dakisime_loop_Data" FrameCount="40" Offset="0x77D20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_wait_end_Data" FrameCount="15" Offset="0x79210"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal_kiru_end_Data" FrameCount="8" Offset="0x799F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lrolling_kiru_end_Data" FrameCount="12" Offset="0x79E20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_nocarry_free_Data" FrameCount="9" Offset="0x7A470"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal_kiru_endR_Data" FrameCount="9" Offset="0x7A930"/>
-        <PlayerAnimationData Name="gPlayerAnimData_07A8B0" FrameCount="15" Offset="0x7ADF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_sita_wait_Data" FrameCount="30" Offset="0x7B5D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_down_slope_slip_end_free_Data" FrameCount="19" Offset="0x7C590"/>
-        <PlayerAnimationData Name="gPlayerAnimData_07CA50" FrameCount="20" Offset="0x7CF90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait_Data" FrameCount="89" Offset="0x7DA10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_fall_Data" FrameCount="37" Offset="0x808B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_Data" FrameCount="29" Offset="0x81C10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_normal2bom_Data" FrameCount="20" Offset="0x82B40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_kiru_start_Data" FrameCount="16" Offset="0x835C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_okarina_start_Data" FrameCount="12" Offset="0x83E20"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchBend_Data" FrameCount="10" Offset="0x84470"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchCend_Data" FrameCount="10" Offset="0x849B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchAend_Data" FrameCount="13" Offset="0x84EF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_front_hitR_Data" FrameCount="16" Offset="0x855C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_down_wake_Data" FrameCount="39" Offset="0x85E20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_throw_free_Data" FrameCount="21" Offset="0x87290"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_short_landing_free_Data" FrameCount="16" Offset="0x87D90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_walk_muti_Data" FrameCount="35" Offset="0x885F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_jumpATend_Data" FrameCount="13" Offset="0x89850"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_powerup_loop_Data" FrameCount="29" Offset="0x89F20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_fall_up_Data" FrameCount="86" Offset="0x8AE50"/>
-        <PlayerAnimationData Name="gPlayerAnim_o_get_mae_Data" FrameCount="50" Offset="0x8DB60"/>
-        <PlayerAnimationData Name="gPlayerAnim_om_get_mae_Data" FrameCount="50" Offset="0x8F590"/>
-        <PlayerAnimationData Name="gPlayerAnim_urusai_Data" FrameCount="51" Offset="0x90FC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_stop_Data" FrameCount="65" Offset="0x92A80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_heat2_20f_Data" FrameCount="25" Offset="0x94C90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_heat1_20f_Data" FrameCount="35" Offset="0x959B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_tewofuru_Data" FrameCount="22" Offset="0x96C10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_newside_jump_end_20f_Data" FrameCount="16" Offset="0x977A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_hold_Data" FrameCount="18" Offset="0x98000"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_goto_future_Data" FrameCount="110" Offset="0x98970"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_put_Data" FrameCount="21" Offset="0x9C310"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_wait2waitR_long_Data" FrameCount="6" Offset="0x9CE10"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_hanare_Data" FrameCount="35" Offset="0x9D140"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR_Data" FrameCount="12" Offset="0x9E3A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_wakare_Data" FrameCount="51" Offset="0x9E9F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_sagaru_Data" FrameCount="30" Offset="0xA04B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_back_hitR_Data" FrameCount="16" Offset="0xA1470"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_upR_Data" FrameCount="21" Offset="0xA1CD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_upL_Data" FrameCount="21" Offset="0xA27D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitL2defense_long_Data" FrameCount="3" Offset="0xA32D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitR2defense_long_Data" FrameCount="3" Offset="0xA3470"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_uma_rightup_Data" FrameCount="38" Offset="0xA3610"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_attack_Data" FrameCount="2" Offset="0xA4A00"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_otituku_w_Data" FrameCount="20" Offset="0xA4B10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kenmiru2_modori_Data" FrameCount="15" Offset="0xA5590"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_up_slope_slip_end_long_Data" FrameCount="19" Offset="0xA5D70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kaoage_wait_Data" FrameCount="20" Offset="0xA6770"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end_Data" FrameCount="18" Offset="0xA71F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end_Data" FrameCount="15" Offset="0xA7B60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_side_walk_Data" FrameCount="21" Offset="0xA8340"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_umamiage_loop_Data" FrameCount="44" Offset="0xA8E40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kakeyori_Data" FrameCount="20" Offset="0xAA550"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_omen_loop_Data" FrameCount="30" Offset="0xAAFD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end_Data" FrameCount="19" Offset="0xABF90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lnormal_kiru_Data" FrameCount="5" Offset="0xAC990"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_landing_roll_free_Data" FrameCount="32" Offset="0xACC30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_re_dead_attack_wait_Data" FrameCount="11" Offset="0xADCF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_stand_Data" FrameCount="33" Offset="0xAE2C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_talk_free_wait_Data" FrameCount="34" Offset="0xAF410"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_fish_miss_Data" FrameCount="21" Offset="0xB05E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_endR_Data" FrameCount="11" Offset="0xB10E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_endL_Data" FrameCount="11" Offset="0xB16B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_defense_ALL_Data" FrameCount="5" Offset="0xB1C80"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0B19E0" FrameCount="30" Offset="0xB1F20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_bow_shoot_next_Data" FrameCount="8" Offset="0xB2EE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pushing_Data" FrameCount="31" Offset="0xB3310"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pulling_Data" FrameCount="31" Offset="0xB4350"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_wait_Data" FrameCount="20" Offset="0xB5390"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_zeldamiru_wait_Data" FrameCount="25" Offset="0xB5E10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_Rside_swim_Data" FrameCount="34" Offset="0xB6B30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_Lside_swim_Data" FrameCount="34" Offset="0xB7D00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_bow_wait_Data" FrameCount="66" Offset="0xB8ED0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR_Data" FrameCount="11" Offset="0xBB160"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0BB1F0" FrameCount="30" Offset="0xBB730"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_250jump_start_Data" FrameCount="10" Offset="0xBC6F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_Data" FrameCount="29" Offset="0xBCC30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_hip_down_long_Data" FrameCount="28" Offset="0xBDB60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_side_walkR_long_Data" FrameCount="16" Offset="0xBEA10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_side_walkL_long_Data" FrameCount="16" Offset="0xBF270"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_landing_Data" FrameCount="21" Offset="0xBFAD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_hajikareru_Data" FrameCount="24" Offset="0xC05D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_rakka_Data" FrameCount="3" Offset="0xC1260"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end_Data" FrameCount="15" Offset="0xC1400"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR_Data" FrameCount="32" Offset="0xC1BE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_waitL_long_Data" FrameCount="29" Offset="0xC2CA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_waitR_long_Data" FrameCount="29" Offset="0xC3BD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_child_tunnel_end_Data" FrameCount="71" Offset="0xC4B00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_look_hand_wait_Data" FrameCount="20" Offset="0xC7030"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_endAL_Data" FrameCount="27" Offset="0xC7AB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_endAL_Data" FrameCount="27" Offset="0xC88E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_endAR_Data" FrameCount="27" Offset="0xC9710"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_endAR_Data" FrameCount="27" Offset="0xCA540"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_endBL_Data" FrameCount="56" Offset="0xCB370"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_endBL_Data" FrameCount="56" Offset="0xCD0C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_endBR_Data" FrameCount="56" Offset="0xCEE10"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_endBR_Data" FrameCount="56" Offset="0xD0B60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_hang_up_down_Data" FrameCount="11" Offset="0xD28B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_drink_demo_end_Data" FrameCount="50" Offset="0xD2E80"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_setmaskend_Data" FrameCount="3" Offset="0xD48B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitR_Data" FrameCount="29" Offset="0xD4A50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitL_Data" FrameCount="29" Offset="0xD5980"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_shitR_Data" FrameCount="8" Offset="0xD68B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_end_free_Data" FrameCount="5" Offset="0xD6CE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_drink_demo_start_Data" FrameCount="47" Offset="0xD6F80"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_jumpAT_Data" FrameCount="13" Offset="0xD8820"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_pierce_kiru_Data" FrameCount="4" Offset="0xD8EF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hook_shot_ready_Data" FrameCount="9" Offset="0xD9110"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal2fighter_Data" FrameCount="20" Offset="0xD95D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_dl_jibunmiru_Data" FrameCount="48" Offset="0xDA050"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_waitL2wait_long_Data" FrameCount="13" Offset="0xDB970"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_waitR2wait_long_Data" FrameCount="13" Offset="0xDC040"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_jump_water_fall_wait_Data" FrameCount="13" Offset="0xDC710"/>
-        <PlayerAnimationData Name="gPlayerAnim_rakuba_Data" FrameCount="33" Offset="0xDE8A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pulling_free_Data" FrameCount="31" Offset="0xDF9F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_bow_shoot_end_Data" FrameCount="16" Offset="0xE0A30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_nocarry_free_end_Data" FrameCount="7" Offset="0xE1290"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_elf_tobidasi_Data" FrameCount="52" Offset="0xE1640"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_rakkatyu_Data" FrameCount="20" Offset="0xE3180"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_free_Data" FrameCount="5" Offset="0xE3C00"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0E1EA0" FrameCount="18" Offset="0xE3EA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_standup_wait_Data" FrameCount="30" Offset="0xE4810"/>
-        <PlayerAnimationData Name="gPlayerAnim_bajyo_furikaeru_Data" FrameCount="60" Offset="0xE57D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_kyoro_loop_Data" FrameCount="62" Offset="0xE7740"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_hensin_Data" FrameCount="51" Offset="0xE97C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_sirimochi_wait_Data" FrameCount="25" Offset="0xEB280"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_Data" FrameCount="9" Offset="0xEBFA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_bajyo_walk_Data" FrameCount="35" Offset="0xEC460"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_45_turn_free_Data" FrameCount="10" Offset="0xED6C0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0EBC00" FrameCount="20" Offset="0xEDC00"/>
-        <PlayerAnimationData Name="gPlayerAnim_lost_horse2_Data" FrameCount="40" Offset="0xEE680"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_down_Data" FrameCount="29" Offset="0xEFB70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_electric_shock_Data" FrameCount="26" Offset="0xF0AA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_fighter2free_Data" FrameCount="20" Offset="0xF1840"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_back_to_past_Data" FrameCount="90" Offset="0xF22C0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0F31E0" FrameCount="12" Offset="0xF51E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_ozigi_modori_Data" FrameCount="11" Offset="0xF5830"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0F3E00" FrameCount="15" Offset="0xF5E00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit_Data" FrameCount="9" Offset="0xF65E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_damage_run_long_Data" FrameCount="20" Offset="0xF6AA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_up_free_Data" FrameCount="38" Offset="0xF7520"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_Data" FrameCount="6" Offset="0xF8910"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_jump_rollkiru_Data" FrameCount="11" Offset="0xF8C40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_walk_Data" FrameCount="35" Offset="0xF9210"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_landing_roll_Data" FrameCount="32" Offset="0xFA470"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_drink_demo_wait_Data" FrameCount="9" Offset="0xFB530"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_mimawasi_wait_Data" FrameCount="55" Offset="0xFB9F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_wait_Data" FrameCount="59" Offset="0xFD6C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_wait_Data" FrameCount="79" Offset="0xFF5B0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0FFF10" FrameCount="24" Offset="0x101F10"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_kubisime_Data" FrameCount="6" Offset="0x102BA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_hit_Data" FrameCount="16" Offset="0x102ED0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_run_long_Data" FrameCount="20" Offset="0x103730"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_Data" FrameCount="10" Offset="0x1044E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_15step_up_Data" FrameCount="66" Offset="0x104A20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_reboundR_Data" FrameCount="11" Offset="0x106CB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_startB_Data" FrameCount="50" Offset="0x107280"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_startA_Data" FrameCount="30" Offset="0x108CB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_startA_Data" FrameCount="30" Offset="0x109C70"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_startA_Data" FrameCount="30" Offset="0x10AC30"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_startB_Data" FrameCount="56" Offset="0x10BBF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_startB_Data" FrameCount="56" Offset="0x10D940"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_wait_free_Data" FrameCount="54" Offset="0x10F690"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiwait_Data" FrameCount="18" Offset="0x1112E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end_Data" FrameCount="11" Offset="0x111C50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_box_kick_Data" FrameCount="50" Offset="0x112220"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_furimuki_Data" FrameCount="80" Offset="0x113C50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_normal2free_Data" FrameCount="20" Offset="0x116630"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_Data" FrameCount="10" Offset="0x1170B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_kennasi_w_Data" FrameCount="20" Offset="0x1175F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_doorB_link_Data" FrameCount="100" Offset="0x119AA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_doorA_link_Data" FrameCount="100" Offset="0x11CF00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_get_itemA_Data" FrameCount="22" Offset="0x120360"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_get_itemB_Data" FrameCount="22" Offset="0x120EF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_read_end_Data" FrameCount="20" Offset="0x121A80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end_Data" FrameCount="12" Offset="0x122500"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_down_Data" FrameCount="178" Offset="0x122B50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_end_Data" FrameCount="10" Offset="0x128880"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_normal2fighter_free_Data" FrameCount="20" Offset="0x128DC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_Data" FrameCount="9" Offset="0x129840"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hatto_demo_Data" FrameCount="72" Offset="0x129D00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_silver_throw_Data" FrameCount="31" Offset="0x12C2B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_brake_end_Data" FrameCount="12" Offset="0x12D2F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_silver_carry_Data" FrameCount="80" Offset="0x12D940"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_up_slope_slip_end_Data" FrameCount="19" Offset="0x130320"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_ozigi_loop_Data" FrameCount="10" Offset="0x130D20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_startB_Data" FrameCount="56" Offset="0x131260"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_startA_Data" FrameCount="30" Offset="0x132FB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pull_end_free_Data" FrameCount="16" Offset="0x133F70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_backturn_jump_endR_Data" FrameCount="12" Offset="0x1347D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hook_fly_wait_Data" FrameCount="21" Offset="0x134E20"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_batabata_Data" FrameCount="14" Offset="0x135920"/>
-        <PlayerAnimationData Name="gPlayerAnim_sude_nwait_Data" FrameCount="45" Offset="0x136080"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_carryB_Data" FrameCount="36" Offset="0x137810"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_honoo2_Data" FrameCount="25" Offset="0x138AF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_honoo3_Data" FrameCount="60" Offset="0x139810"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_honoo1_Data" FrameCount="60" Offset="0x13B780"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_endL_free_Data" FrameCount="11" Offset="0x13D6F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_endR_free_Data" FrameCount="11" Offset="0x13DCC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hammer_long2long_Data" FrameCount="20" Offset="0x13E290"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_startA_Data" FrameCount="30" Offset="0x13ED10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_startB_Data" FrameCount="15" Offset="0x13FCD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_ken_miru_Data" FrameCount="26" Offset="0x1404B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_tamahaki_Data" FrameCount="8" Offset="0x141250"/>
-        <PlayerAnimationData Name="gPlayerAnim_om_get_Data" FrameCount="30" Offset="0x141680"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_gaku_Data" FrameCount="29" Offset="0x142640"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_ue_Data" FrameCount="10" Offset="0x143570"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_newroll_jump_end_20f_Data" FrameCount="13" Offset="0x143AB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_upL_Data" FrameCount="21" Offset="0x144180"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_upL_Data" FrameCount="21" Offset="0x144C80"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_upR_Data" FrameCount="21" Offset="0x145780"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_upR_Data" FrameCount="21" Offset="0x146280"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_ee_loop_Data" FrameCount="28" Offset="0x146D80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_walk2ready_Data" FrameCount="9" Offset="0x147F60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_sideL_Data" FrameCount="21" Offset="0x148420"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_sideR_Data" FrameCount="21" Offset="0x148F20"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_gakkistart_Data" FrameCount="12" Offset="0x149A20"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_rakkafinish_Data" FrameCount="11" Offset="0x14A070"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_light_bom_Data" FrameCount="12" Offset="0x14A640"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_hip_down_free_Data" FrameCount="28" Offset="0x14AC90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kakeyori_miokuri_Data" FrameCount="25" Offset="0x14BB40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_itemD1_20f_Data" FrameCount="70" Offset="0x14C860"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_itemD2_20f_Data" FrameCount="108" Offset="0x14ED10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_throw_Data" FrameCount="21" Offset="0x1525A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_push_start_Data" FrameCount="16" Offset="0x1530A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_jump_end_Data" FrameCount="8" Offset="0x153900"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_jump_end_Data" FrameCount="8" Offset="0x153D30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_brake_Data" FrameCount="12" Offset="0x154160"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_down_slope_slip_end_Data" FrameCount="19" Offset="0x1547B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_derth_rebirth_Data" FrameCount="230" Offset="0x1551B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hook_wait_Data" FrameCount="69" Offset="0x15CA20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_warp_Data" FrameCount="70" Offset="0x15EE40"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_drinkstart_Data" FrameCount="29" Offset="0x1612F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_Data" FrameCount="9" Offset="0x162220"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_okarina_walkB_Data" FrameCount="21" Offset="0x1626E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_kaze1_Data" FrameCount="56" Offset="0x1631E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_kaze3_Data" FrameCount="32" Offset="0x164F30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_kaze2_Data" FrameCount="9" Offset="0x165FF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_okarina_end_Data" FrameCount="12" Offset="0x1664B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_free_Data" FrameCount="29" Offset="0x166B00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_talk_free_Data" FrameCount="7" Offset="0x167A30"/>
-        <PlayerAnimationData Name="gPlayerAnim_spotlight_wait_Data" FrameCount="25" Offset="0x167DE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_Data" FrameCount="7" Offset="0x168B00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kenmiru1_wait_Data" FrameCount="20" Offset="0x168EB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kenmiru2_wait_Data" FrameCount="20" Offset="0x169930"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end_Data" FrameCount="17" Offset="0x16A3B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_wait_Data" FrameCount="54" Offset="0x16ACA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_jump200_Data" FrameCount="30" Offset="0x16C8F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_doorB_open_Data" FrameCount="100" Offset="0x16D8B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_doorA_open_Data" FrameCount="100" Offset="0x170D10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_LLside_kiru_endL_Data" FrameCount="11" Offset="0x174170"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_LRside_kiru_endR_Data" FrameCount="11" Offset="0x174740"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk_Data" FrameCount="21" Offset="0x174D10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end_Data" FrameCount="16" Offset="0x175810"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end_Data" FrameCount="13" Offset="0x176070"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_okarina_walk_Data" FrameCount="21" Offset="0x176740"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_hoo_Data" FrameCount="20" Offset="0x177240"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_landing_wait_Data" FrameCount="20" Offset="0x177CC0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_1746B0" FrameCount="15" Offset="0x178740"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_ue_wait_Data" FrameCount="40" Offset="0x178F20"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_jibun_miru_Data" FrameCount="43" Offset="0x17A410"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_waterroll_Data" FrameCount="18" Offset="0x17BAA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_waitF_heat1_20f_Data" FrameCount="36" Offset="0x17C410"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_waitF_heat2_20f_Data" FrameCount="24" Offset="0x17D6F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_fastrun_Data" FrameCount="24" Offset="0x17E380"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_unun_Data" FrameCount="29" Offset="0x17F010"/>
-        <PlayerAnimationData Name="gPlayerAnimData_17BEB0" FrameCount="20" Offset="0x17FF40"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_tereru_Data" FrameCount="24" Offset="0x1809C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait_free_Data" FrameCount="89" Offset="0x181650"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_slowrun_muti_Data" FrameCount="29" Offset="0x1844F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_deep_end_Data" FrameCount="32" Offset="0x185420"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_up_Data" FrameCount="29" Offset="0x1864E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_wait_Data" FrameCount="46" Offset="0x187410"/>
-        <PlayerAnimationData Name="gPlayerAnim_okarinatori_Data" FrameCount="22" Offset="0x188C30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_damage_run_Data" FrameCount="20" Offset="0x1897C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_run_Data" FrameCount="20" Offset="0x18A240"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_backturn_jump_Data" FrameCount="15" Offset="0x18ACC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kenmiru2_Data" FrameCount="35" Offset="0x18B4A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kenmiru1_Data" FrameCount="10" Offset="0x18C700"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_kyoro_Data" FrameCount="15" Offset="0x18CC40"/>
-        <PlayerAnimationData Name="gPlayerAnimData_189390" FrameCount="42" Offset="0x18D420"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_up_slope_slip_end_free_Data" FrameCount="19" Offset="0x18EA20"/>
-        <PlayerAnimationData Name="gPlayerAnim_d_link_orowait_Data" FrameCount="45" Offset="0x18F420"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_furimuki2_Data" FrameCount="45" Offset="0x190BB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_return_to_past_Data" FrameCount="80" Offset="0x192340"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_kakkufinish_Data" FrameCount="15" Offset="0x194D20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_rebound_longR_Data" FrameCount="13" Offset="0x195500"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_fuwafuwa_loop_Data" FrameCount="40" Offset="0x195BD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cutterwaitanim_Data" FrameCount="29" Offset="0x1970C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_maskoffstart_Data" FrameCount="15" Offset="0x197FF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_maskoffstart_Data" FrameCount="15" Offset="0x1987D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_maskoffstart_Data" FrameCount="15" Offset="0x198FB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_defense_hit_Data" FrameCount="8" Offset="0x199790"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_wait2swim_wait_Data" FrameCount="10" Offset="0x199BC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_nocarry_free_wait_Data" FrameCount="5" Offset="0x19A100"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_slowrun_Data" FrameCount="29" Offset="0x19A3A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_koutai_Data" FrameCount="35" Offset="0x19B2D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_goma_furimuki_Data" FrameCount="46" Offset="0x19C530"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_front_jump_endR_Data" FrameCount="21" Offset="0x19DD50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_give_other_Data" FrameCount="47" Offset="0x19E850"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_yes_Data" FrameCount="23" Offset="0x1A00F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitL2wait_Data" FrameCount="13" Offset="0x1A0D00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitR2wait_Data" FrameCount="13" Offset="0x1A13D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_gurad_Data" FrameCount="20" Offset="0x1A1AA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_waitF_typeD_20f_Data" FrameCount="138" Offset="0x1A2520"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_ice_down_Data" FrameCount="16" Offset="0x1A6D60"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_gakkiplay_Data" FrameCount="7" Offset="0x1A75C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_gakkiplay_Data" FrameCount="8" Offset="0x1A7970"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_1kyoro_Data" FrameCount="20" Offset="0x1A7DA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_miokuri_Data" FrameCount="30" Offset="0x1A8820"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_2kyoro_Data" FrameCount="20" Offset="0x1A97E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplay_Data" FrameCount="18" Offset="0x1AA260"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_umanoru_loop_Data" FrameCount="30" Offset="0x1AABD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_bug_miss_Data" FrameCount="13" Offset="0x1ABB90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_down_wake_Data" FrameCount="36" Offset="0x1AC260"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_push_wait_Data" FrameCount="10" Offset="0x1AD540"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_landing_roll_long_Data" FrameCount="32" Offset="0x1ADA80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_jump_end_Data" FrameCount="19" Offset="0x1AEE70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_jibunmiru_Data" FrameCount="100" Offset="0x1AF870"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_hit_Data" FrameCount="16" Offset="0x1B2CD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_up_Data" FrameCount="38" Offset="0x1B3530"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_wait_free_Data" FrameCount="20" Offset="0x1B4920"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_atozusari_Data" FrameCount="33" Offset="0x1B53A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_zeldamiru_Data" FrameCount="15" Offset="0x1B64F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_tame_Data" FrameCount="43" Offset="0x1B6CD0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_1B3FA0" FrameCount="45" Offset="0x1B8360"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hammer_long2free_Data" FrameCount="20" Offset="0x1B9AF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pull_end_Data" FrameCount="16" Offset="0x1BA570"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_push_end_Data" FrameCount="16" Offset="0x1BADD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_jump_Data" FrameCount="13" Offset="0x1BB630"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_last_hit_motion2_Data" FrameCount="28" Offset="0x1BBD00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_last_hit_motion1_Data" FrameCount="82" Offset="0x1BCBB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hook_fly_start_Data" FrameCount="9" Offset="0x1BF6A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_up_slope_slip_Data" FrameCount="10" Offset="0x1BFB60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitL_free_Data" FrameCount="29" Offset="0x1C00A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitR_free_Data" FrameCount="29" Offset="0x1C0FD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_pierce_kiru_endR_Data" FrameCount="9" Offset="0x1C1F00"/>
-        <PlayerAnimationData Name="gPlayerAnim_dl_yusaburu_Data" FrameCount="6" Offset="0x1C23C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_mimawasi_Data" FrameCount="15" Offset="0x1C26F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_right_down_Data" FrameCount="48" Offset="0x1C2ED0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_land2swim_wait_Data" FrameCount="27" Offset="0x1C47F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_bikkuri_Data" FrameCount="20" Offset="0x1C5620"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_standup_Data" FrameCount="78" Offset="0x1C60A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_upL_Data" FrameCount="21" Offset="0x1C8980"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_upR_Data" FrameCount="21" Offset="0x1C9480"/>
-        <PlayerAnimationData Name="gPlayerAnim_okiagaru_wait_Data" FrameCount="40" Offset="0x1C9F80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_side_walk_free_Data" FrameCount="29" Offset="0x1CB470"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_silver_wait_Data" FrameCount="71" Offset="0x1CC3A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_upL_Data" FrameCount="21" Offset="0x1CE8D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_upR_Data" FrameCount="21" Offset="0x1CF3D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_ha_Data" FrameCount="35" Offset="0x1CFED0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_defense_long_hit_Data" FrameCount="9" Offset="0x1D1130"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchBendR_Data" FrameCount="10" Offset="0x1D15F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchCendR_Data" FrameCount="10" Offset="0x1D1B30"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchAendR_Data" FrameCount="13" Offset="0x1D2070"/>
-        <PlayerAnimationData Name="gPlayerAnim_okiagaru_tatu_Data" FrameCount="41" Offset="0x1D2740"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_back_brake_Data" FrameCount="18" Offset="0x1D3CC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_front_jump_end_Data" FrameCount="21" Offset="0x1D4630"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_muku_Data" FrameCount="25" Offset="0x1D5B30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_side_walk_Data" FrameCount="29" Offset="0x1D6850"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_walk_Data" FrameCount="29" Offset="0x1D7780"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_downB_Data" FrameCount="12" Offset="0x1D86B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_downA_Data" FrameCount="5" Offset="0x1D8D00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_backspace_Data" FrameCount="13" Offset="0x1D8FA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_kamaeru_Data" FrameCount="15" Offset="0x1D9670"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_kei_wait_Data" FrameCount="30" Offset="0x1D9E50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_okarina_swing_Data" FrameCount="68" Offset="0x1DAE10"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_omen_Data" FrameCount="20" Offset="0x1DD1B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_negaeri_Data" FrameCount="55" Offset="0x1DDC30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_rolling_kiru_Data" FrameCount="13" Offset="0x1DF900"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_Tbox_open_Data" FrameCount="133" Offset="0x1DFFD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_powerup_Data" FrameCount="80" Offset="0x1E4570"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_itemC_20f_Data" FrameCount="93" Offset="0x1E6F50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_itemB_20f_Data" FrameCount="100" Offset="0x1EA000"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_itemA_20f_Data" FrameCount="90" Offset="0x1ED460"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_free_Data" FrameCount="20" Offset="0x1F0380"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end_Data" FrameCount="19" Offset="0x1F0E00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal_kiru_finsh_Data" FrameCount="6" Offset="0x1F1800"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_fall_wait_Data" FrameCount="61" Offset="0x1F1B30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_end_free_Data" FrameCount="10" Offset="0x1F3B20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end_Data" FrameCount="19" Offset="0x1F4060"/>
-        <PlayerAnimationData Name="gPlayerAnim_d_link_imanodare_Data" FrameCount="20" Offset="0x1F4A60"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_Tbox_open_Data" FrameCount="133" Offset="0x1F54E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR_Data" FrameCount="19" Offset="0x1F9A80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_jump100_Data" FrameCount="23" Offset="0x1FA480"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_furimuki2_wait_Data" FrameCount="30" Offset="0x1FB090"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_landing_free_Data" FrameCount="21" Offset="0x1FC050"/>
-        <PlayerAnimationData Name="gPlayerAnim_rakka_Data" FrameCount="57" Offset="0x1FCB50"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_okiagari_Data" FrameCount="365" Offset="0x1FE930"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_bashi_Data" FrameCount="55" Offset="0x20A840"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_bladeon_Data" FrameCount="9" Offset="0x20C510"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL_Data" FrameCount="18" Offset="0x20C9D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_long2bom_Data" FrameCount="20" Offset="0x20D340"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_side_walkL_free_Data" FrameCount="16" Offset="0x20DDC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_side_walkR_free_Data" FrameCount="16" Offset="0x20E620"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_back_walk_Data" FrameCount="16" Offset="0x20EE80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_defense_Data" FrameCount="5" Offset="0x20F6E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_koutai_wait_Data" FrameCount="20" Offset="0x20F980"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR_Data" FrameCount="15" Offset="0x210400"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_doorB_open_Data" FrameCount="100" Offset="0x210BE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_doorA_open_Data" FrameCount="100" Offset="0x214040"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_dakiau_Data" FrameCount="35" Offset="0x2174A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_backturn_jump_end_Data" FrameCount="7" Offset="0x218700"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpierce_kiru_Data" FrameCount="3" Offset="0x218AB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_get1_Data" FrameCount="40" Offset="0x218C50"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_get3_Data" FrameCount="20" Offset="0x21A140"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_get2_Data" FrameCount="20" Offset="0x21ABC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_m_wait_Data" FrameCount="40" Offset="0x21B640"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_baru_op2_Data" FrameCount="40" Offset="0x21CB30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_baru_op3_Data" FrameCount="25" Offset="0x21E020"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_baru_op1_Data" FrameCount="35" Offset="0x21ED40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hook_walk2ready_Data" FrameCount="9" Offset="0x21FFA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_jump_kiru_end_Data" FrameCount="20" Offset="0x220460"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR_Data" FrameCount="16" Offset="0x220EE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_fukitobu_Data" FrameCount="20" Offset="0x221740"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_deep_start_Data" FrameCount="50" Offset="0x2221C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_pierce_kiru_end_Data" FrameCount="9" Offset="0x223BF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkistart_Data" FrameCount="14" Offset="0x2240B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplayU_Data" FrameCount="9" Offset="0x224810"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplayR_Data" FrameCount="9" Offset="0x224CD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplayL_Data" FrameCount="9" Offset="0x225190"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplayD_Data" FrameCount="9" Offset="0x225650"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplayA_Data" FrameCount="9" Offset="0x225B10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_45_turn_Data" FrameCount="10" Offset="0x225FD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_wait_3_Data" FrameCount="30" Offset="0x226510"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_wait_2_Data" FrameCount="195" Offset="0x2274D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_wait_1_Data" FrameCount="208" Offset="0x22DAF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_startL_Data" FrameCount="11" Offset="0x2347D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_lost_horse_wait_Data" FrameCount="11" Offset="0x234DA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_link_tewatashi_Data" FrameCount="90" Offset="0x235370"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_newroll_jump_20f_Data" FrameCount="13" Offset="0x238290"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_free2freeB_Data" FrameCount="20" Offset="0x238960"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_jump_endL_Data" FrameCount="8" Offset="0x2393E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_jump_endR_Data" FrameCount="8" Offset="0x239810"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_maru_change_Data" FrameCount="11" Offset="0x239C40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_run_Data" FrameCount="16" Offset="0x23A210"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait_typeA_20f_Data" FrameCount="184" Offset="0x23AA70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait_typeB_20f_Data" FrameCount="187" Offset="0x240AC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait_typeC_20f_Data" FrameCount="200" Offset="0x246CB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_dl_jibunmiru_wait_Data" FrameCount="20" Offset="0x24D560"/>
-        <PlayerAnimationData Name="gPlayerAnim_sirimochi_Data" FrameCount="54" Offset="0x24DFE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_anchor2fighter_Data" FrameCount="34" Offset="0x24FC30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_tamashii1_Data" FrameCount="52" Offset="0x250E00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_tamashii3_Data" FrameCount="49" Offset="0x252940"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_tamashii2_Data" FrameCount="29" Offset="0x2542F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_side_walk_long_Data" FrameCount="29" Offset="0x255220"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_start_Data" FrameCount="11" Offset="0x256150"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_kakku_Data" FrameCount="12" Offset="0x256720"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_kiru_Data" FrameCount="5" Offset="0x256D70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_boom_throw_waitL_Data" FrameCount="29" Offset="0x257010"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_boom_throw_waitR_Data" FrameCount="29" Offset="0x257F40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kakeyori_mimawasi_Data" FrameCount="85" Offset="0x258E70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_hold2upL_Data" FrameCount="30" Offset="0x25BAF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_miageru_Data" FrameCount="20" Offset="0x25CAB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lrolling_kiru_Data" FrameCount="16" Offset="0x25D530"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Wrolling_kiru_Data" FrameCount="17" Offset="0x25DD90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_rolling_kiru_end_Data" FrameCount="16" Offset="0x25E680"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_Data" FrameCount="8" Offset="0x25EEE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cuttercatch_Data" FrameCount="6" Offset="0x25F310"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitL2defense_Data" FrameCount="3" Offset="0x25F640"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitR2defense_Data" FrameCount="3" Offset="0x25F7E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_koutai_kennuki_Data" FrameCount="25" Offset="0x25F980"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_carryB_wait_Data" FrameCount="55" Offset="0x2606A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitF_typeC_20f_Data" FrameCount="200" Offset="0x262370"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitF_typeB_20f_Data" FrameCount="187" Offset="0x268C20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitF_typeA_20f_Data" FrameCount="184" Offset="0x26EE10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_child_tunnel_start_Data" FrameCount="80" Offset="0x274E60"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_pikupiku_Data" FrameCount="10" Offset="0x277840"/>
-        <PlayerAnimationData Name="gPlayerAnim_lost_horse_Data" FrameCount="81" Offset="0x277D80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_wait_free_Data" FrameCount="72" Offset="0x27A7F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_rebound_long_Data" FrameCount="13" Offset="0x27CDA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_left_up_Data" FrameCount="70" Offset="0x27D470"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_put_free_Data" FrameCount="15" Offset="0x27F920"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal_kiru_Data" FrameCount="5" Offset="0x280100"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_wait3_Data" FrameCount="30" Offset="0x2803A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_wait2_Data" FrameCount="30" Offset="0x281360"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_wait1_Data" FrameCount="80" Offset="0x282320"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_free_Data" FrameCount="20" Offset="0x284D00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_turn_kiruR_end_Data" FrameCount="16" Offset="0x285780"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_turn_kiruL_end_Data" FrameCount="16" Offset="0x285FE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackC_Data" FrameCount="20" Offset="0x286840"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackB_Data" FrameCount="10" Offset="0x2872C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackA_Data" FrameCount="7" Offset="0x287800"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LRside_kiru_Data" FrameCount="6" Offset="0x287BB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LLside_kiru_Data" FrameCount="6" Offset="0x287EE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_fish_out_Data" FrameCount="120" Offset="0x288540"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_doorA_link_free_Data" FrameCount="100" Offset="0x28C410"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_free2bom_Data" FrameCount="20" Offset="0x28F870"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_doorB_link_free_Data" FrameCount="100" Offset="0x2902F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_wait_Data" FrameCount="73" Offset="0x293750"/>
-        <PlayerAnimationData Name="gPlayerAnim_d_link_orooro_Data" FrameCount="60" Offset="0x295D90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_hit_Data" FrameCount="9" Offset="0x297D00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_hold_free_Data" FrameCount="18" Offset="0x2981C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_dakiau_loop_Data" FrameCount="40" Offset="0x298B30"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchC_Data" FrameCount="20" Offset="0x29A020"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchB_Data" FrameCount="19" Offset="0x29AAA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchA_Data" FrameCount="12" Offset="0x29B4A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_down_slope_slip_end_long_Data" FrameCount="19" Offset="0x29BAF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_downB_Data" FrameCount="14" Offset="0x29C4F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_downA_Data" FrameCount="6" Offset="0x29CC50"/>
-        <PlayerAnimationData Name="gPlayerAnimData_297E90" FrameCount="30" Offset="0x29CF80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_bow_ready_Data" FrameCount="9" Offset="0x29DF40"/>
-        <PlayerAnimationData Name="gPlayerAnim_vs_yousei_Data" FrameCount="102" Offset="0x29E400"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_down_slope_slip_Data" FrameCount="10" Offset="0x2A1970"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_jump_Data" FrameCount="7" Offset="0x2A1EB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_jump_Data" FrameCount="7" Offset="0x2A2260"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_Tbox_open_Data" FrameCount="133" Offset="0x2A2610"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_Tbox_open_Data" FrameCount="133" Offset="0x2A6BB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_yurayura_Data" FrameCount="40" Offset="0x2AB150"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_Tbox_open_Data" FrameCount="133" Offset="0x2AC640"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_light_bom_end_Data" FrameCount="19" Offset="0x2B0BE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_return_to_future_Data" FrameCount="51" Offset="0x2B15E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_msbowait_Data" FrameCount="79" Offset="0x2B30A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_jump_water_fall_Data" FrameCount="31" Offset="0x2B5A00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_carryB_free_Data" FrameCount="17" Offset="0x2B6A40"/>
-        <PlayerAnimationData Name="gPlayerAnim_lkt_nwait_Data" FrameCount="45" Offset="0x2B7330"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lnormal_kiru_end_Data" FrameCount="9" Offset="0x2B8AC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackBend_Data" FrameCount="12" Offset="0x2B8F80"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackCend_Data" FrameCount="10" Offset="0x2B95D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackAend_Data" FrameCount="9" Offset="0x2B9B10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_re_dead_attack_Data" FrameCount="9" Offset="0x2B9FD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_hensin_loop_Data" FrameCount="48" Offset="0x2BA490"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_okarina_get_Data" FrameCount="30" Offset="0x2C41A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_electric_shock_end_Data" FrameCount="113" Offset="0x2C5160"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_normal2fighter_Data" FrameCount="20" Offset="0x2C8C90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_side_walkR_Data" FrameCount="16" Offset="0x2C9710"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_side_walkL_Data" FrameCount="16" Offset="0x2C9F70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL_Data" FrameCount="9" Offset="0x2CA7D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_gurad_wait_Data" FrameCount="10" Offset="0x2CAC90"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_setmask_Data" FrameCount="66" Offset="0x2CB1D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_front_jump_Data" FrameCount="10" Offset="0x2CD460"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_wakare_loop_Data" FrameCount="30" Offset="0x2CD9A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Wrolling_kiru_end_Data" FrameCount="12" Offset="0x2CE960"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_fighter2long_Data" FrameCount="20" Offset="0x2CEFB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_side_walk_Data" FrameCount="24" Offset="0x2CFA30"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_ozigi_Data" FrameCount="30" Offset="0x2D06C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackBendR_Data" FrameCount="6" Offset="0x2D1680"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackCendR_Data" FrameCount="3" Offset="0x2D19B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackAendR_Data" FrameCount="6" Offset="0x2D1B50"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cutterattack_Data" FrameCount="9" Offset="0x2D3400"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_hanare_loop_Data" FrameCount="40" Offset="0x2D38C0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_2C6350" FrameCount="45" Offset="0x2D4DB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_okiru_demo_Data" FrameCount="80" Offset="0x2D6540"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_Data" FrameCount="20" Offset="0x2D8F20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR_Data" FrameCount="10" Offset="0x2D99A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_dance_loop_Data" FrameCount="145" Offset="0x2D9EE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_drink_Data" FrameCount="15" Offset="0x2DEAD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_Data" FrameCount="35" Offset="0x2DF2B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_bouzen_Data" FrameCount="15" Offset="0x2E0510"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_kiru_walk_Data" FrameCount="21" Offset="0x2E0CF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_jump_kiru_finsh_Data" FrameCount="10" Offset="0x2E17F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_uma_leftup_Data" FrameCount="38" Offset="0x2E1D30"/>
-        <PlayerAnimationData Name="gPlayerAnim_okiagaru_Data" FrameCount="79" Offset="0x2E3120"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_keirei_Data" FrameCount="40" Offset="0x2E5A80"/>
-        <PlayerAnimationData Name="gPlayerAnimData_2D8510" FrameCount="66" Offset="0x2E6F70"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_umamiage_Data" FrameCount="30" Offset="0x2E9200"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_fall_up_free_Data" FrameCount="61" Offset="0x2EA1C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_hit_Data" FrameCount="10" Offset="0x2EC1B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_100step_up_Data" FrameCount="28" Offset="0x2EC6F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_150step_up_Data" FrameCount="45" Offset="0x2ED5A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_suwari1_Data" FrameCount="40" Offset="0x2EED30"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_suwari3_Data" FrameCount="30" Offset="0x2F0220"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_suwari2_Data" FrameCount="80" Offset="0x2F11E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_read_Data" FrameCount="100" Offset="0x2F3BC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_awase_Data" FrameCount="10" Offset="0x2F7020"/>
-        <PlayerAnimationData Name="gPlayerAnim_o_get_ato_Data" FrameCount="20" Offset="0x2F7560"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_yareyare_Data" FrameCount="48" Offset="0x2F7FE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_ue_wait_Data" FrameCount="30" Offset="0x2F9900"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_dakisime_Data" FrameCount="40" Offset="0x2FA8C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_newside_jump_20f_Data" FrameCount="14" Offset="0x2FBDB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_back_swim_Data" FrameCount="39" Offset="0x2FC510"/>
-        <PlayerAnimationData Name="gPlayerAnim_kolink_odoroki_demo_Data" FrameCount="60" Offset="0x2FD980"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_damage_run_free_Data" FrameCount="20" Offset="0x2FF8F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_kw_Data" FrameCount="20" Offset="0x300370"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_no_Data" FrameCount="25" Offset="0x300DF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_doorB_link_Data" FrameCount="100" Offset="0x301B10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_doorA_link_Data" FrameCount="100" Offset="0x304F70"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_somukeru_Data" FrameCount="8" Offset="0x3083D0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/locerrmsg.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/locerrmsg.xml
deleted file mode 100644
index c497d564a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/locerrmsg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- <Root>
-	<File Name="locerrmsg" Segment="1">
-		<Texture Name="gNotDesignedForSystemErrorTex" OutName="not_designed_for_system_error" Format="i4" Width="208" Height="16" Offset="0x0"/>
-	</File>
-</Root> -->
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/memerrmsg.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/memerrmsg.xml
deleted file mode 100644
index 26285fe46..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/memerrmsg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- <Root>
-	<File Name="memerrmsg" Segment="1">
-		<Texture Name="gExpansionPakNotInstalledErrorTex" OutName="expansion_pak_not_installed_error" Format="i4" Width="128" Height="37" Offset="0x0"/>
-		<Texture Name="gSeeInstructionBookletErrorTex" OutName="see_instruction_booklet_error" Format="i4" Width="128" Height="37" Offset="0x940"/>
-	</File>
-</Root> -->
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/nintendo_rogo_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/nintendo_rogo_static.xml
deleted file mode 100644
index ff6fc56fc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/nintendo_rogo_static.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="nintendo_rogo_static" Segment="1" Game="MM">
-        <Texture Name="gNintendo64LogoTextTex" OutName="nintendo_64_logo_text" Format="i8" Width="192" Height="32" Offset="0x0"/>
-        <Texture Name="gNintendo64LogoTextShineTex" OutName="nintendo_64_logo_text_shine" Format="i8" Width="32" Height="32" Offset="0x1800"/>
-        <DList Name="gNintendo64LogoNDL" Offset="0x2720"/>
-        <Texture Name="gNintendo64LogoNShineTex" OutName="nintendo_64_logo_n_shine" Format="i8" Width="32" Height="32" Offset="0x29C0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_01.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_01.xml
deleted file mode 100644
index edbb2d1c4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_01.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<Root>
-    <File Name="scene_texture_01" Segment="6">
-        <Texture Name="scene_texture_01_Tex_000000" OutName="tex_000000" Format="ci8" Width="16" Height="16" Offset="0x0"/>
-        <Texture Name="scene_texture_01_Tex_000100" OutName="tex_000100" Format="rgba16" Width="32" Height="32" Offset="0x100"/>
-        <Texture Name="scene_texture_01_Tex_000900" OutName="tex_000900" Format="ci8" Width="64" Height="16" Offset="0x900"/>
-        <Texture Name="scene_texture_01_Tex_000D00" OutName="tex_000D00" Format="ci8" Width="64" Height="16" Offset="0xD00"/>
-        <Texture Name="scene_texture_01_Tex_001100" OutName="tex_001100" Format="ci8" Width="16" Height="16" Offset="0x1100"/>
-        <Texture Name="scene_texture_01_Tex_001200" OutName="tex_001200" Format="ci8" Width="32" Height="16" Offset="0x1200"/>
-        <Texture Name="scene_texture_01_Tex_001400" OutName="tex_001400" Format="ci8" Width="32" Height="32" Offset="0x1400"/>
-        <Texture Name="scene_texture_01_Tex_001800" OutName="tex_001800" Format="rgba16" Width="16" Height="8" Offset="0x1800"/>
-        <Texture Name="scene_texture_01_Tex_001900" OutName="tex_001900" Format="ci8" Width="16" Height="16" Offset="0x1900"/>
-        <Texture Name="scene_texture_01_Tex_001A00" OutName="tex_001A00" Format="ci8" Width="32" Height="32" Offset="0x1A00"/>
-        <Texture Name="scene_texture_01_Tex_001E00" OutName="tex_001E00" Format="ci8" Width="32" Height="32" Offset="0x1E00"/>
-        <Texture Name="scene_texture_01_Tex_002200" OutName="tex_002200" Format="ci8" Width="16" Height="16" Offset="0x2200"/>
-        <Texture Name="scene_texture_01_Tex_002300" OutName="tex_002300" Format="ci8" Width="16" Height="32" Offset="0x2300"/>
-        <Texture Name="scene_texture_01_Tex_002500" OutName="tex_002500" Format="ci8" Width="16" Height="64" Offset="0x2500"/>
-        <Texture Name="scene_texture_01_Tex_002900" OutName="tex_002900" Format="ci8" Width="16" Height="64" Offset="0x2900"/>
-        <Texture Name="scene_texture_01_Tex_002D00" OutName="tex_002D00" Format="i8" Width="8" Height="8" Offset="0x2D00"/>
-        <!-- <Blob Name="scene_texture_01_Blob_002D40" Size="0x100" Offset="0x2D40"/> -->
-        <Texture Name="scene_texture_01_Tex_002E40" OutName="tex_002E40" Format="ci8" Width="16" Height="32" Offset="0x2E40"/>
-        <Texture Name="scene_texture_01_Tex_003040" OutName="tex_003040" Format="ci8" Width="32" Height="16" Offset="0x3040"/>
-        <Texture Name="scene_texture_01_Tex_003240" OutName="tex_003240" Format="ci8" Width="8" Height="8" Offset="0x3240"/>
-        <Texture Name="scene_texture_01_Tex_003280" OutName="tex_003280" Format="ci8" Width="32" Height="32" Offset="0x3280"/>
-        <Texture Name="scene_texture_01_Tex_003680" OutName="tex_003680" Format="ci8" Width="32" Height="32" Offset="0x3680"/>
-        <Texture Name="scene_texture_01_Tex_003A80" OutName="tex_003A80" Format="ci8" Width="16" Height="32" Offset="0x3A80"/>
-        <Texture Name="scene_texture_01_Tex_003C80" OutName="tex_003C80" Format="ci8" Width="32" Height="32" Offset="0x3C80"/>
-        <Texture Name="scene_texture_01_Tex_004080" OutName="tex_004080" Format="ci8" Width="32" Height="32" Offset="0x4080"/>
-        <Texture Name="scene_texture_01_Tex_004480" OutName="tex_004480" Format="ci8" Width="32" Height="8" Offset="0x4480"/>
-        <Texture Name="scene_texture_01_Tex_004580" OutName="tex_004580" Format="ci8" Width="16" Height="8" Offset="0x4580"/>
-        <Texture Name="scene_texture_01_Tex_004600" OutName="tex_004600" Format="ci8" Width="16" Height="16" Offset="0x4600"/>
-        <Texture Name="scene_texture_01_Tex_004700" OutName="tex_004700" Format="ci8" Width="16" Height="16" Offset="0x4700"/>
-        <Texture Name="scene_texture_01_Tex_004800" OutName="tex_004800" Format="ci8" Width="16" Height="64" Offset="0x4800"/>
-        <Texture Name="scene_texture_01_Tex_004C00" OutName="tex_004C00" Format="ci8" Width="16" Height="16" Offset="0x4C00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_02.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_02.xml
deleted file mode 100644
index a7219c31e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_02.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="scene_texture_02" Segment="6">
-        <Texture Name="scene_texture_02_Tex_000000" OutName="tex_000000" Format="ci8" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="scene_texture_02_Tex_000400" OutName="tex_000400" Format="ci8" Width="16" Height="32" Offset="0x400"/>
-        <Texture Name="scene_texture_02_Tex_000600" OutName="tex_000600" Format="ci8" Width="32" Height="8" Offset="0x600"/>
-        <Texture Name="scene_texture_02_Tex_000700" OutName="tex_000700" Format="ci8" Width="32" Height="32" Offset="0x700"/>
-        <Texture Name="scene_texture_02_Tex_000B00" OutName="tex_000B00" Format="ci8" Width="32" Height="32" Offset="0xB00"/>
-        <Texture Name="scene_texture_02_Tex_000F00" OutName="tex_000F00" Format="ci8" Width="32" Height="32" Offset="0xF00"/>
-        <Texture Name="scene_texture_02_Tex_001300" OutName="tex_001300" Format="ci8" Width="16" Height="64" Offset="0x1300"/>
-        <Texture Name="scene_texture_02_Tex_001700" OutName="tex_001700" Format="ci8" Width="16" Height="16" Offset="0x1700"/>
-        <Texture Name="scene_texture_02_Tex_001800" OutName="tex_001800" Format="ci8" Width="32" Height="32" Offset="0x1800"/>
-        <Texture Name="scene_texture_02_Tex_001C00" OutName="tex_001C00" Format="ci8" Width="16" Height="16" Offset="0x1C00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_03.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_03.xml
deleted file mode 100644
index fcd10b9a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_03.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="scene_texture_03" Segment="6">
-        <!-- Seems like various trees in different formats -->
-        <Blob Name="scene_texture_03_Blob_002D40" Size="0x4800" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_04.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_04.xml
deleted file mode 100644
index 6faf681ac..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_04.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="scene_texture_04" Segment="6">
-        <Texture Name="scene_texture_04_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
-        <Texture Name="scene_texture_04_Tex_001000" OutName="tex_001000" Format="rgba16" Width="32" Height="32" Offset="0x1000"/>
-        <Texture Name="scene_texture_04_Tex_001800" OutName="tex_001800" Format="rgba16" Width="32" Height="32" Offset="0x1800"/>
-        <Texture Name="scene_texture_04_Tex_002000" OutName="tex_002000" Format="rgba16" Width="16" Height="64" Offset="0x2000"/>
-        <Texture Name="scene_texture_04_Tex_002800" OutName="tex_002800" Format="rgba16" Width="16" Height="64" Offset="0x2800"/>
-        <Texture Name="scene_texture_04_Tex_003000" OutName="tex_003000" Format="i4" Width="64" Height="64" Offset="0x3000"/>
-        <Texture Name="scene_texture_04_Tex_003800" OutName="tex_003800" Format="i4" Width="64" Height="64" Offset="0x3800"/>
-        <Texture Name="scene_texture_04_Tex_004000" OutName="tex_004000" Format="i4" Width="32" Height="32" Offset="0x4000"/>
-        <Texture Name="scene_texture_04_Tex_004200" OutName="tex_004200" Format="rgba16" Width="32" Height="32" Offset="0x4200"/>
-        <Texture Name="scene_texture_04_Tex_004A00" OutName="tex_004A00" Format="rgba16" Width="32" Height="32" Offset="0x4A00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_05.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_05.xml
deleted file mode 100644
index d9ae4f2c3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_05.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <File Name="scene_texture_05" Segment="6">
-        <Texture Name="scene_texture_05_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="scene_texture_05_Tex_000800" OutName="tex_000800" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
-        <Texture Name="scene_texture_05_Tex_001000" OutName="tex_001000" Format="rgba16" Width="16" Height="64" Offset="0x1000"/>
-        <Texture Name="scene_texture_05_Tex_001800" OutName="tex_001800" Format="i4" Width="64" Height="64" Offset="0x1800"/>
-        <Texture Name="scene_texture_05_Tex_002000" OutName="tex_002000" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
-        <Texture Name="scene_texture_05_Tex_002800" OutName="tex_002800" Format="rgba16" Width="32" Height="32" Offset="0x2800"/>
-        <Texture Name="scene_texture_05_Tex_003000" OutName="tex_003000" Format="rgba16" Width="32" Height="32" Offset="0x3000"/>
-        <Texture Name="scene_texture_05_Tex_003800" OutName="tex_003800" Format="rgba16" Width="32" Height="32" Offset="0x3800"/>
-        <Texture Name="scene_texture_05_Tex_004000" OutName="tex_004000" Format="rgba16" Width="32" Height="32" Offset="0x4000"/>
-        <Texture Name="scene_texture_05_Tex_004800" OutName="tex_004800" Format="rgba16" Width="32" Height="32" Offset="0x4800"/>
-        <Texture Name="scene_texture_05_Tex_005000" OutName="tex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000"/>
-        <Texture Name="scene_texture_05_Tex_005800" OutName="tex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800"/>
-        <Texture Name="scene_texture_05_Tex_006000" OutName="tex_006000" Format="i4" Width="64" Height="64" Offset="0x6000"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_06.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_06.xml
deleted file mode 100644
index 1a2dfc2a0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_06.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="scene_texture_06" Segment="6">
-        <Texture Name="scene_texture_06_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
-        <Texture Name="scene_texture_06_Tex_000400" OutName="tex_000400" Format="ci4" Width="128" Height="32" Offset="0x400"/>
-        <Texture Name="scene_texture_06_TLUT_000C00" OutName="tlut_000C00" Format="rgba16" Width="4" Height="4" Offset="0xC00"/>
-        <Texture Name="scene_texture_06_Tex_000C20" OutName="tex_000C20" Format="ci4" Width="64" Height="64" Offset="0xC20"/>
-        <Texture Name="scene_texture_06_TLUT_001420" OutName="tlut_001420" Format="rgba16" Width="4" Height="4" Offset="0x1420"/>
-        <Texture Name="scene_texture_06_Tex_001440" OutName="tex_001440" Format="ci4" Width="64" Height="64" Offset="0x1440"/>
-        <Texture Name="scene_texture_06_TLUT_001C40" OutName="tlut_001C40" Format="rgba16" Width="4" Height="4" Offset="0x1C40"/>
-        <Texture Name="scene_texture_06_Tex_001C60" OutName="tex_001C60" Format="rgba16" Width="32" Height="32" Offset="0x1C60"/>
-        <Texture Name="scene_texture_06_Tex_002460" OutName="tex_002460" Format="rgba16" Width="32" Height="32" Offset="0x2460"/>
-        <Texture Name="scene_texture_06_Tex_002C60" OutName="tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2C60"/>
-        <Texture Name="scene_texture_06_Tex_003460" OutName="tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3460"/>
-        <Texture Name="scene_texture_06_Tex_003C60" OutName="tex_003C60" Format="i4" Width="64" Height="64" Offset="0x3C60"/>
-        <Texture Name="scene_texture_06_Tex_004460" OutName="tex_004460" Format="rgba16" Width="32" Height="32" Offset="0x4460"/>
-        <Texture Name="scene_texture_06_Tex_004C60" OutName="tex_004C60" Format="rgba16" Width="32" Height="32" Offset="0x4C60"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_07.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_07.xml
deleted file mode 100644
index 22f445990..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_07.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="scene_texture_07" Segment="6">
-        <!-- Empty file -->
-        <Blob Name="scene_texture_07_Blob_000" Size="0x10" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_08.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_08.xml
deleted file mode 100644
index 31e557347..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/scene_texture_08.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <File Name="scene_texture_08" Segment="6">
-        <Texture Name="scene_texture_08_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="scene_texture_08_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
-        <Texture Name="scene_texture_08_Tex_001000" OutName="tex_001000" Format="rgba16" Width="32" Height="32" Offset="0x1000"/>
-        <Texture Name="scene_texture_08_Tex_001800" OutName="tex_001800" Format="rgba16" Width="32" Height="32" Offset="0x1800"/>
-        <Texture Name="scene_texture_08_Tex_002000" OutName="tex_002000" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
-        <Texture Name="scene_texture_08_Tex_002800" OutName="tex_002800" Format="i4" Width="64" Height="64" Offset="0x2800"/>
-        <Texture Name="scene_texture_08_Tex_003000" OutName="tex_003000" Format="ia4" Width="64" Height="32" Offset="0x3000"/>
-        <Texture Name="scene_texture_08_Tex_003400" OutName="tex_003400" Format="ia8" Width="64" Height="32" Offset="0x3400"/>
-        <Texture Name="scene_texture_08_Tex_003C00" OutName="tex_003C00" Format="ia4" Width="64" Height="32" Offset="0x3C00"/>
-        <Texture Name="scene_texture_08_Tex_004000" OutName="tex_004000" Format="ia8" Width="64" Height="32" Offset="0x4000"/>
-        <Texture Name="scene_texture_08_Tex_004800" OutName="tex_004800" Format="rgba16" Width="32" Height="32" Offset="0x4800"/>
-        <Texture Name="scene_texture_08_Tex_005000" OutName="tex_005000" Format="ia4" Width="64" Height="64" Offset="0x5000"/>
-        <Texture Name="scene_texture_08_Tex_005800" OutName="tex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800"/>
-        <Texture Name="scene_texture_08_Tex_006000" OutName="tex_006000" Format="rgba16" Width="32" Height="32" Offset="0x6000"/>
-        <Texture Name="scene_texture_08_Tex_006800" OutName="tex_006800" Format="ia4" Width="64" Height="64" Offset="0x6800"/>
-        <Texture Name="scene_texture_08_Tex_007000" OutName="tex_007000" Format="rgba16" Width="32" Height="32" Offset="0x7000"/>
-        <Texture Name="scene_texture_08_Tex_007800" OutName="tex_007800" Format="rgba16" Width="32" Height="32" Offset="0x7800"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/skyboxes.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/skyboxes.xml
deleted file mode 100644
index 3e82f084f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/skyboxes.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <File Name="d2_fine_static">
-        <Texture Name="gClearSkybox1Tex" OutName="clear_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gClearSkybox2Tex" OutName="clear_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gClearSkybox3Tex" OutName="clear_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gClearSkybox4Tex" OutName="clear_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gClearSkybox5Tex" OutName="clear_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-    </File>
-
-    <File Name="d2_cloud_static">
-        <Texture Name="gCloudySkybox1Tex" OutName="cloudy_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gCloudySkybox2Tex" OutName="cloudy_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gCloudySkybox3Tex" OutName="cloudy_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gCloudySkybox4Tex" OutName="cloudy_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gCloudySkybox5Tex" OutName="cloudy_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-    </File>
-    <File Name="d2_fine_pal_static">
-        <Texture Name="gClearSkyboxTlue" OutName="clear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/story_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/story_static.xml
deleted file mode 100644
index 9a15d8c4f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/story_static.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="story_static" Segment="7">
-        <Texture Name="gStoryMaskFestivalTex" OutName="story_mask_festival" Format="ci8" Width="320" Height="240" TlutOffset="0x25800" Offset="0x0"/>
-        <Texture Name="gStoryGiantsLeavingTex" OutName="story_giants_leaving" Format="ci8" Width="320" Height="240" TlutOffset="0x25A00" Offset="0x12C00"/>
-        <Texture Name="gStoryMaskFestivalTLUT" OutName="story_mask_festival_tlut" Format="rgba16" Width="16" Height="16" Offset="0x25800"/>
-        <Texture Name="gStoryGiantsLeavingTLUT" OutName="story_giants_leaving_tlut" Format="rgba16" Width="16" Height="16" Offset="0x25A00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/title_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/title_static.xml
deleted file mode 100644
index b37d0befb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/misc/title_static.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<Root>
-    <File Name="title_static" Segment="1">
-        <Texture Name="gFileSelNoFileToCopyENGTex" OutName="no_file_to_copy_eng" Format="ia4" Width="128" Height="16" Offset="0x0"/>
-        <Texture Name="gFileSelNoFileToEraseENGTex" OutName="no_file_to_erase_eng" Format="ia4" Width="128" Height="16" Offset="0x400"/>
-        <Texture Name="gFileSelNoEmptyFileENGTex" OutName="no_empty_file_eng" Format="ia4" Width="128" Height="16" Offset="0x800"/>
-        <Texture Name="gFileSelFileEmptyENGTex" OutName="file_empty_eng" Format="ia4" Width="128" Height="16" Offset="0xC00"/>
-        <Texture Name="gFileSelFileInUseENGTex" OutName="file_in_use_eng" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
-
-        <Texture Name="gFileSelConnectorTex" OutName="connector" Format="ia8" Width="24" Height="16" Offset="0x1400"/>
-
-        <Texture Name="gFileSelCopyWhichFileENGTex" OutName="copy_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x1580"/>
-        <Texture Name="gFileSelCopyToWhichFileENGTex" OutName="copy_to_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x1D80"/>
-        <Texture Name="gFileSelAreYouSureCopyENGTex" OutName="are_you_sure_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x2580"/>
-        <Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x2D80"/>
-
-        <Texture Name="gFileSelPleaseSelectAFileENGTex" OutName="please_select_a_file_eng" Format="ia8" Width="128" Height="16" Offset="0x3580"/>
-        <Texture Name="gFileSelOpenThisFileENGTex" OutName="open_this_file_eng" Format="ia8" Width="128" Height="16" Offset="0x3D80"/>
-
-        <Texture Name="gFileSelEraseWhichFileENGTex" OutName="erase_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x4580"/>
-        <Texture Name="gFileSelAreYouSureEraseENGTex" OutName="are_you_sure_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x4D80"/>
-        <Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x5580"/>
-
-        <Texture Name="gFileSelNameENGTex" OutName="name_eng" Format="ia8" Width="56" Height="16" Offset="0x5D80"/>
-
-        <Texture Name="gFileSelDolbySurroundLogoENGTex" OutName="dolby_surround_logo_eng" Format="i8" Width="48" Height="17" Offset="0x6100"/>
-
-        <Texture Name="gFileSelDecideSaveENGTex" OutName="decide_save_eng" Format="ia8" Width="152" Height="16" Offset="0x6430"/>
-        <Texture Name="gFileSelDecideCancelENGTex" OutName="decide_cancel_eng" Format="ia8" Width="144" Height="16" Offset="0x6DB0"/>
-        <Texture Name="gFileSelPleaseWaitENGTex" OutName="please_wait_eng" Format="ia8" Width="144" Height="16" Offset="0x76B0"/>
-
-        <Texture Name="gFileSelOptionsENGTex" OutName="options_eng" Format="ia4" Width="128" Height="16" Offset="0x7FB0"/>
-
-        <Texture Name="gFileSelSurroundENGTex" OutName="surround_eng" Format="ia4" Width="48" Height="16" Offset="0x83B0"/>
-        <Texture Name="gFileSelHeadsetENGTex" OutName="headset_eng" Format="ia4" Width="48" Height="16" Offset="0x8530"/>
-        <Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia4" Width="48" Height="16" Offset="0x86B0"/>
-        <Texture Name="gFileSelSoundENGTex" OutName="sound_eng" Format="ia4" Width="64" Height="16" Offset="0x8830"/>
-        <Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia4" Width="48" Height="16" Offset="0x8A30"/>
-        <Texture Name="gFileSelTargetingENGTex" OutName="targeting_eng" Format="ia4" Width="64" Height="16" Offset="0x8BB0"/>
-        <Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia4" Width="48" Height="16" Offset="0x8DB0"/>
-        <Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia4" Width="48" Height="16" Offset="0x8F30"/>
-        <Texture Name="gFileSelCheckBrightnessENGTex" OutName="check_brightness_eng" Format="ia4" Width="96" Height="16" Offset="0x90B0"/>
-
-        <Texture Name="gFileSelWindow00Tex" OutName="window_00" Format="ia16" Width="64" Height="32" Offset="0x93B0"/>
-        <Texture Name="gFileSelWindow01Tex" OutName="window_01" Format="ia16" Width="64" Height="32" Offset="0xA3B0"/>
-        <Texture Name="gFileSelWindow02Tex" OutName="window_02" Format="ia16" Width="64" Height="32" Offset="0xB3B0"/>
-        <Texture Name="gFileSelWindow03Tex" OutName="window_03" Format="ia16" Width="48" Height="32" Offset="0xC3B0"/>
-        <Texture Name="gFileSelWindow10Tex" OutName="window_10" Format="ia16" Width="64" Height="32" Offset="0xCFB0"/>
-        <Texture Name="gFileSelWindow11Tex" OutName="window_11" Format="ia16" Width="64" Height="32" Offset="0xDFB0"/>
-        <Texture Name="gFileSelWindow12Tex" OutName="window_12" Format="ia16" Width="64" Height="32" Offset="0xEFB0"/>
-        <Texture Name="gFileSelWindow13Tex" OutName="window_13" Format="ia16" Width="48" Height="32" Offset="0xFFB0"/>
-        <Texture Name="gFileSelWindow20Tex" OutName="window_20" Format="ia16" Width="64" Height="32" Offset="0x10BB0"/>
-        <Texture Name="gFileSelWindow21Tex" OutName="window_21" Format="ia16" Width="64" Height="32" Offset="0x11BB0"/>
-        <Texture Name="gFileSelWindow22Tex" OutName="window_22" Format="ia16" Width="64" Height="32" Offset="0x12BB0"/>
-        <Texture Name="gFileSelWindow23Tex" OutName="window_23" Format="ia16" Width="48" Height="32" Offset="0x13BB0"/>
-        <Texture Name="gFileSelWindow30Tex" OutName="window_30" Format="ia16" Width="64" Height="32" Offset="0x147B0"/>
-        <Texture Name="gFileSelWindow31Tex" OutName="window_31" Format="ia16" Width="64" Height="32" Offset="0x157B0"/>
-        <Texture Name="gFileSelWindow32Tex" OutName="window_32" Format="ia16" Width="64" Height="32" Offset="0x167B0"/>
-        <Texture Name="gFileSelWindow33Tex" OutName="window_33" Format="ia16" Width="48" Height="32" Offset="0x177B0"/>
-        <Texture Name="gFileSelWindow40Tex" OutName="window_40" Format="ia16" Width="64" Height="32" Offset="0x183B0"/>
-        <Texture Name="gFileSelWindow41Tex" OutName="window_41" Format="ia16" Width="64" Height="32" Offset="0x193B0"/>
-        <Texture Name="gFileSelWindow42Tex" OutName="window_42" Format="ia16" Width="64" Height="32" Offset="0x1A3B0"/>
-        <Texture Name="gFileSelWindow43Tex" OutName="window_43" Format="ia16" Width="48" Height="32" Offset="0x1B3B0"/>
-
-        <Texture Name="gFileSelCopyButtonENGTex" OutName="copy_button_eng" Format="ia16" Width="64" Height="16" Offset="0x1BFB0"/>
-
-        <Texture Name="gFileSelFile1ButtonENGTex" OutName="file_1_button_eng" Format="ia16" Width="64" Height="16" Offset="0x1C7B0"/>
-        <Texture Name="gFileSelFile2ButtonENGTex" OutName="file_2_button_eng" Format="ia16" Width="64" Height="16" Offset="0x1CFB0"/>
-        <Texture Name="gFileSelFile3ButtonENGTex" OutName="file_3_button_eng" Format="ia16" Width="64" Height="16" Offset="0x1D7B0"/>
-
-        <Texture Name="gFileSelYesButtonENGTex" OutName="yes_button_eng" Format="ia16" Width="64" Height="16" Offset="0x1DFB0"/>
-        <Texture Name="gFileSelEraseButtonENGTex" OutName="erase_button_eng" Format="ia16" Width="64" Height="16" Offset="0x1E7B0"/>
-        <Texture Name="gFileSelENDButtonENGTex" OutName="end_button_eng" Format="ia16" Width="44" Height="16" Offset="0x1EFB0"/>
-        <Texture Name="gFileSelBackspaceButtonTex" OutName="backspace_button" Format="ia16" Width="28" Height="16" Offset="0x1F530"/>
-
-        <Texture Name="gFileSelFileNameBoxTex" OutName="file_name_box" Format="ia16" Width="108" Height="16" Offset="0x1F8B0"/>
-
-        <Texture Name="gFileSelFileInfoBox0Tex" OutName="file_info_box_0" Format="ia16" Width="36" Height="56" Offset="0x20630"/>
-        <Texture Name="gFileSelFileInfoBox1Tex" OutName="file_info_box_1" Format="ia16" Width="36" Height="56" Offset="0x215F0"/>
-        <Texture Name="gFileSelFileInfoBox2Tex" OutName="file_info_box_2" Format="ia16" Width="36" Height="56" Offset="0x225B0"/>
-        <Texture Name="gFileSelFileInfoBox3Tex" OutName="file_info_box_3" Format="ia16" Width="36" Height="56" Offset="0x23570"/>
-        <Texture Name="gFileSelFileInfoBox4Tex" OutName="file_info_box_4" Format="ia16" Width="24" Height="56" Offset="0x24530"/>
-
-        <Texture Name="gFileSelOptionsButtonENGTex" OutName="options_button_eng" Format="ia16" Width="64" Height="16" Offset="0x24FB0"/>
-
-        <Texture Name="gFileSelQuitButtonENGTex" OutName="quit_button_eng" Format="ia16" Width="64" Height="16" Offset="0x257B0"/>
-
-        <!-- Extension for owl save information -->
-        <Texture Name="gFileSelFileExtraInfoBox0Tex" OutName="file_extra_info_box_0" Format="ia16" Width="28" Height="56" Offset="0x25FB0"/>
-        <Texture Name="gFileSelFileExtraInfoBox1Tex" OutName="file_extra_info_box_1" Format="ia16" Width="28" Height="56" Offset="0x26BF0"/>
-
-        <!-- Used for closed owl save file -->
-        <Texture Name="gFileSelBlankButtonTex" OutName="file_blank_button" Format="ia16" Width="52" Height="16" Offset="0x27830"/>
-
-        <Texture Name="gFileSelOptionsDividerTex" OutName="options_divider" Format="ia4" Width="256" Height="2" Offset="0x27EB0"/>
-        <Texture Name="gFileSelBrightnessCheckTex" OutName="brightness_check" Format="ia4" Width="96" Height="16" Offset="0x27FB0"/>
-
-        <Texture Name="gFileSelBigButtonHighlightTex" OutName="big_button_highlight" Format="i8" Width="72" Height="24" Offset="0x282B0"/>
-        <Texture Name="gFileSelCharHighlightTex" OutName="char_highlight" Format="i8" Width="24" Height="24" Offset="0x28970"/>
-        <Texture Name="gFileSelMediumButtonHighlightTex" OutName="medium_button_highlight" Format="i8" Width="56" Height="24" Offset="0x28BB0"/>
-        <Texture Name="gFileSelSmallButtonHighlightTex" OutName="small_button_highlight" Format="i8" Width="40" Height="24" Offset="0x290F0"/>
-
-        <!-- Boss remains textures -->
-        <Texture Name="gFileSelOdolwasRemainsTex" OutName="odolwas_remains" Format="rgba32" Width="32" Height="32" Offset="0x294B0"/>
-        <Texture Name="gFileSelGohtsRemainsTex" OutName="gohts_remains" Format="rgba32" Width="32" Height="32" Offset="0x2A4B0"/>
-        <Texture Name="gFileSelGyorgsRemainsTex" OutName="gyorgs_remains" Format="rgba32" Width="32" Height="32" Offset="0x2B4B0"/>
-        <Texture Name="gFileSelTwinmoldsRemainsTex" OutName="twinmolds_remains" Format="rgba32" Width="32" Height="32" Offset="0x2C4B0"/>
-
-        <Texture Name="gFileSelOwlSaveIconTex" OutName="owl_save_icon" Format="rgba32" Width="24" Height="12" Offset="0x2D4B0"/>
-
-        <Texture Name="gFileSelFirstDayENGTex" OutName="first_day_eng" Format="i4" Width="48" Height="24" Offset="0x2D930"/>
-        <Texture Name="gFileSelSecondDayENGTex" OutName="second_day_eng" Format="i4" Width="48" Height="24" Offset="0x2DB70"/>
-        <Texture Name="gFileSelFinalDayENGTex" OutName="final_day_eng" Format="i4" Width="48" Height="24" Offset="0x2DDB0"/>
-
-        <Texture Name="gFileSelSaveXJPNTex" OutName="save_x_jpn" Format="i4" Width="32" Height="16" Offset="0x2DFF0"/>
-
-        <Texture Name="gFileSelMASKSENGTex" OutName="masks_eng" Format="i4" Width="64" Height="16" Offset="0x2E0F0"/>
-
-        <Texture Name="gFileSel0QuarterHeartENGTex" OutName="0_quarter_heart" Format="ia8" Width="24" Height="16" Offset="0x2E2F0"/>
-        <Texture Name="gFileSel1QuarterHeartENGTex" OutName="1_quarter_heart" Format="ia8" Width="24" Height="16" Offset="0x2E470"/>
-        <Texture Name="gFileSel2QuarterHeartENGTex" OutName="2_quarter_heart" Format="ia8" Width="24" Height="16" Offset="0x2E5F0"/>
-        <Texture Name="gFileSel3QuarterHeartENGTex" OutName="3_quarter_heart" Format="ia8" Width="24" Height="16" Offset="0x2E770"/>
-
-        <Texture Name="gFileSelRupeeTex" OutName="rupee" Format="ia8" Width="16" Height="16" Offset="0x2E8F0"/>
-
-        <DList Name="gFileSelWindow1DL" Offset="0x2E9F0"/>
-        <DList Name="gFileSelWindow2DL" Offset="0x2EC08"/>
-        <DList Name="gFileSelWindow3DL" Offset="0x2EE18"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/gameplay_dangeon_keep.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/gameplay_dangeon_keep.xml
deleted file mode 100644
index b4c92432d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/gameplay_dangeon_keep.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<Root>
-    <File Name="gameplay_dangeon_keep" Segment="5">
-        <DList Name="gDoorLockDL" Offset="0x140" /> <!-- Original name is "doorkagi_model" ("lock") -->
-        <DList Name="gDoorChainDL" Offset="0x230" /> <!-- Original name is "doorkusari_model" ("chain") -->
-        <Texture Name="gDoorLockTex" OutName="door_lock" Format="rgba16" Width="32" Height="32" Offset="0x2C0" />
-        <Texture Name="gBossDoorLockTex" OutName="boss_door_lock" Format="rgba16" Width="32" Height="32" Offset="0xAC0" />
-        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x12C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0022C8" OutName="tex_0022C8" Format="i4" Width="96" Height="85" Offset="0x22C8" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0032C8" OutName="tex_0032C8" Format="i4" Width="96" Height="85" Offset="0x32C8" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0042C8" OutName="tex_0042C8" Format="i4" Width="96" Height="85" Offset="0x42C8" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0052C8" OutName="tex_0052C8" Format="i4" Width="96" Height="85" Offset="0x52C8" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0062C8" OutName="tex_0062C8" Format="i4" Width="96" Height="85" Offset="0x62C8" />
-        <DList Name="gameplay_dangeon_keep_DL_007300" Offset="0x7300" />
-        <Collision Name="gameplay_dangeon_keep_Colheader_007498" Offset="0x7498" />
-        <DList Name="gameplay_dangeon_keep_DL_007650" Offset="0x7650" />
-        <DList Name="gameplay_dangeon_keep_DL_007890" Offset="0x7890" />
-        <DList Name="gameplay_dangeon_keep_DL_007980" Offset="0x7980" />
-        <DList Name="gameplay_dangeon_keep_DL_007A50" Offset="0x7A50" />
-        <DList Name="gameplay_dangeon_keep_DL_007B20" Offset="0x7B20" />
-        <DList Name="gameplay_dangeon_keep_DL_007BF0" Offset="0x7BF0" />
-        <DList Name="gRustyFloorSwitchDL" Offset="0x7E00" />
-        <Collision Name="gFloorSwitchCol" Offset="0x8018" />
-        <DList Name="gameplay_dangeon_keep_DL_0081D0" Offset="0x81D0" />
-        <DList Name="gEyeSwitchGoldDL" Offset="0x83F0" />
-        <DList Name="gEyeSwitchSilverDL" Offset="0x85F0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0086C0" OutName="tex_0086C0" Format="rgba16" Width="32" Height="32" Offset="0x86C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_008EC0" OutName="tex_008EC0" Format="rgba16" Width="32" Height="32" Offset="0x8EC0" />
-        <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x96C0" />
-        <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x9EC0" />
-        <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA6C0" />
-        <Texture Name="gEyeSwitchGoldOpenTex" OutName="eye_gold_open" Format="rgba16" Width="32" Height="32" Offset="0xAEC0" />
-        <Texture Name="gEyeSwitchSilverOpenTex" OutName="eye_silver_open" Format="rgba16" Width="32" Height="32" Offset="0xB6C0" />
-        <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xBEC0" />
-        <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC6C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00CEC0" OutName="tex_00CEC0" Format="rgba16" Width="32" Height="32" Offset="0xCEC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00D6C0" OutName="tex_00D6C0" Format="rgba16" Width="32" Height="32" Offset="0xD6C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00DEC0" OutName="tex_00DEC0" Format="rgba16" Width="32" Height="32" Offset="0xDEC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00E6C0" OutName="tex_00E6C0" Format="rgba16" Width="32" Height="32" Offset="0xE6C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00EEC0" OutName="tex_00EEC0" Format="i8" Width="32" Height="32" Offset="0xEEC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00F2C0" OutName="tex_00F2C0" Format="i8" Width="32" Height="32" Offset="0xF2C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00F6C0" OutName="tex_00F6C0" Format="rgba16" Width="32" Height="32" Offset="0xF6C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00FEC0" OutName="tex_00FEC0" Format="rgba16" Width="64" Height="32" Offset="0xFEC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_010EC0" OutName="tex_010EC0" Format="rgba16" Width="32" Height="64" Offset="0x10EC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_011EC0" OutName="tex_011EC0" Format="rgba16" Width="16" Height="16" Offset="0x11EC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0120C0" OutName="tex_0120C0" Format="rgba16" Width="16" Height="16" Offset="0x120C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0122C0" OutName="tex_0122C0" Format="rgba16" Width="32" Height="64" Offset="0x122C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0132C0" OutName="tex_0132C0" Format="rgba16" Width="64" Height="16" Offset="0x132C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_013AC0" OutName="tex_013AC0" Format="rgba16" Width="32" Height="32" Offset="0x13AC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0142C0" OutName="tex_0142C0" Format="rgba16" Width="32" Height="32" Offset="0x142C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_014AC0" OutName="tex_014AC0" Format="rgba16" Width="32" Height="32" Offset="0x14AC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0152C0" OutName="tex_0152C0" Format="rgba16" Width="32" Height="32" Offset="0x152C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_015AC0" OutName="tex_015AC0" Format="i8" Width="32" Height="32" Offset="0x15AC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_015EC0" OutName="tex_015EC0" Format="i8" Width="32" Height="32" Offset="0x15EC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0162C0" OutName="tex_0162C0" Format="i8" Width="64" Height="64" Offset="0x162C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0172C0" OutName="tex_0172C0" Format="rgba16" Width="32" Height="32" Offset="0x172C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_017AC0" OutName="tex_017AC0" Format="ia16" Width="4" Height="4" Offset="0x17AC0" />
-        <DList Name="gameplay_dangeon_keep_DL_017EA0" Offset="0x17EA0" /> <!-- pot displaylist -->
-        <DList Name="gameplay_dangeon_keep_DL_018090" Offset="0x18090" /> <!-- pot break shard displaylist -->
-        <DList Name="gameplay_dangeon_keep_DL_0182A0" Offset="0x182A0" />
-        <DList Name="gameplay_dangeon_keep_DL_0182A8" Offset="0x182A8" />
-        <Texture Name="gameplay_dangeon_keep_Tex_018350" OutName="tex_018350" Format="i8" Width="64" Height="64" Offset="0x18350" />
-        <Texture Name="gameplay_dangeon_keep_Tex_019350" OutName="tex_019350" Format="i8" Width="64" Height="64" Offset="0x19350" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01A350" OutName="tex_01A350" Format="i8" Width="64" Height="64" Offset="0x1A350" />
-        <TextureAnimation Name="gameplay_dangeon_keep_Matanimheader_01B370" Offset="0x1B370" />
-        <DList Name="gameplay_dangeon_keep_DL_01B500" Offset="0x1B500" />
-        <DList Name="gFloorSwitch1DL" Offset="0x1B508" />
-        <DList Name="gameplay_dangeon_keep_DL_01B780" Offset="0x1B780" />
-        <DList Name="gFloorSwitch2DL" Offset="0x1B788" />
-        <DList Name="gameplay_dangeon_keep_DL_01B9F0" Offset="0x1B9F0" />
-        <DList Name="gFloorSwitch3DL" Offset="0x1B9F8" />
-        <DList Name="gCrystalSwitchCoreDL" Offset="0x1BEE0" />
-        <DList Name="gCrystalSwitchDiamondDL" Offset="0x1BFB8" />
-        <DList Name="gCrystalSwitchBaseDL" Offset="0x1C058" />
-        <TextureAnimation Name="gCrystalSwitchTexAnim" Offset="0x1C118" />
-        <DList Name="gameplay_dangeon_keep_DL_01C220" Offset="0x1C220" />
-        <DList Name="gameplay_dangeon_keep_DL_01C228" Offset="0x1C228" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01C2D8" OutName="tex_01C2D8" Format="rgba16" Width="32" Height="64" Offset="0x1C2D8" />
-        <Collision Name="gameplay_dangeon_keep_Colheader_01D488" Offset="0x1D488" />
-        <DList Name="gameplay_dangeon_keep_DL_01D980" Offset="0x1D980" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01DC70" OutName="tex_01DC70" Format="rgba16" Width="32" Height="32" Offset="0x1DC70" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01E470" OutName="tex_01E470" Format="rgba16" Width="32" Height="32" Offset="0x1E470" />
-        <!-- snowhead(?) floor changing stone staircase stone textures -->
-        <Texture Name="gameplay_dangeon_keep_Tex_01EC70" OutName="tex_01EC70" Format="rgba16" Width="32" Height="32" Offset="0x1EC70" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01F470" OutName="tex_01F470" Format="i4" Width="64" Height="64" Offset="0x1F470" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01FC70" OutName="tex_01FC70" Format="i4" Width="64" Height="64" Offset="0x1FC70" />
-        <Texture Name="gameplay_dangeon_keep_Tex_020470" OutName="tex_020470" Format="i4" Width="64" Height="64" Offset="0x20470" />
-        <Texture Name="gameplay_dangeon_keep_Tex_020C70" OutName="tex_020C70" Format="i4" Width="64" Height="64" Offset="0x20C70" />
-        <!-- snowhead(?) floor changing stone staircase -->
-        <DList Name="gameplay_dangeon_keep_DL_0219E0" Offset="0x219E0" />
-
-        <!-- En_Warp_tag assets -->
-        <DList Name="gWarpTagGoronTrialBaseDL" Offset="0x21EF0" />
-        <Texture Name="gWarpTagRainbowTex" OutName="warptag_rainbow" Format="rgba32" Width="32" Height="32" Offset="0x21FF8" />
-        <TextureAnimation Name="gWarpTagRainbowTexAnim" Offset="0x23008" />
-        <Collision Name="gWarpTagGoronTrialBaseCol" Offset="0x2324C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/gameplay_field_keep.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/gameplay_field_keep.xml
deleted file mode 100644
index cc9d04e70..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/gameplay_field_keep.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Root>
-    <File Name="gameplay_field_keep" Segment="5">
-        <Texture Name="gameplay_field_keep_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="32" Offset="0x0" />
-        <Texture Name="gameplay_field_keep_Tex_000400" OutName="tex_000400" Format="rgba16" Width="32" Height="32" Offset="0x400" />
-        <DList Name="gameplay_field_keep_DL_000C40" Offset="0xC40" />
-        <Texture Name="gameplay_field_keep_Tex_000CD0" OutName="tex_000CD0" Format="ia16" Width="32" Height="64" Offset="0xCD0" />
-        <Animation Name="gameplay_field_keep_Anim_001D20" Offset="0x1D20" />
-        <DList Name="gameplay_field_keep_DL_001D30" Offset="0x1D30" />
-        <DList Name="gameplay_field_keep_DL_001DD0" Offset="0x1DD0" />
-        <DList Name="gameplay_field_keep_DL_001DE0" Offset="0x1DE0" />
-        <DList Name="gameplay_field_keep_DL_001E30" Offset="0x1E30" />
-        <DList Name="gameplay_field_keep_DL_001ED0" Offset="0x1ED0" />
-        <DList Name="gameplay_field_keep_DL_001EE0" Offset="0x1EE0" />
-        <Texture Name="gameplay_field_keep_Tex_001F30" OutName="tex_001F30" Format="rgba16" Width="32" Height="64" Offset="0x1F30" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F30" Type="Standard" EnumName="BUTTERFLY_LIMB_01" Offset="0x2F30" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F3C" Type="Standard" EnumName="BUTTERFLY_LIMB_02" Offset="0x2F3C" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F48" Type="Standard" EnumName="BUTTERFLY_LIMB_03" Offset="0x2F48" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F54" Type="Standard" EnumName="BUTTERFLY_LIMB_04" Offset="0x2F54" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F60" Type="Standard" EnumName="BUTTERFLY_LIMB_05" Offset="0x2F60" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F6C" Type="Standard" EnumName="BUTTERFLY_LIMB_06" Offset="0x2F6C" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F78" Type="Standard" EnumName="BUTTERFLY_LIMB_07" Offset="0x2F78" />
-        <Skeleton Name="gameplay_field_keep_Skel_002FA0" Type="Normal" LimbType="Standard" LimbNone="BUTTERFLY_LIMB_NONE" LimbMax="BUTTERFLY_LIMB_MAX" EnumName="ButterflyLimb" Offset="0x2FA0" />
-        <Texture Name="gameplay_field_keep_TLUT_002FB0" OutName="tlut_002FB0" Format="rgba16" Width="4" Height="4" Offset="0x2FB0" />
-        <Texture Name="gameplay_field_keep_Tex_002FD0" OutName="tex_002FD0" Format="ci4" Width="32" Height="64" Offset="0x2FD0" />
-        <Texture Name="gameplay_field_keep_Tex_0033D0" OutName="tex_0033D0" Format="ci4" Width="32" Height="64" Offset="0x33D0" />
-        <DList Name="gameplay_field_keep_DL_003870" Offset="0x3870" />
-        <DList Name="gameplay_field_keep_DL_003938" Offset="0x3938" />
-        <Collision Name="gameplay_field_keep_Colheader_003A60" Offset="0x3A60" />
-        <DList Name="gFieldWoodDoorFrameDL" Offset="0x3FD0" />
-        <DList Name="gFieldWoodDoorLeftDL" Offset="0x4050" />
-        <DList Name="gFieldWoodDoorRightDL" Offset="0x4228" />
-        <Texture Name="gameplay_field_keep_Tex_004400" OutName="tex_004400" Format="rgba16" Width="16" Height="16" Offset="0x4400" />
-        <Texture Name="gameplay_field_keep_Tex_004600" OutName="tex_004600" Format="rgba16" Width="16" Height="16" Offset="0x4600" />
-        <Texture Name="gFieldWoodDoorTex" OutName="wood_door" Format="i4" Width="64" Height="128" Offset="0x4800" />
-        <Texture Name="gameplay_field_keep_TLUT_005800" OutName="tlut_005800" Format="rgba16" Width="4" Height="4" Offset="0x5800" />
-        <Texture Name="gameplay_field_keep_Tex_005828" OutName="tex_005828" Format="ci4" Width="64" Height="64" Offset="0x5828" />
-        <DList Name="gameplay_field_keep_DL_0061E8" Offset="0x61E8" />
-        <DList Name="gameplay_field_keep_DL_006420" Offset="0x6420" />
-        <DList Name="gameplay_field_keep_DL_0066B0" Offset="0x66B0" />
-        <DList Name="gameplay_field_keep_DL_006760" Offset="0x6760" />
-        <Texture Name="gameplay_field_keep_Tex_006810" OutName="tex_006810" Format="rgba16" Width="32" Height="32" Offset="0x6810" />
-        <Texture Name="gameplay_field_keep_Tex_007010" OutName="tex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" />
-
-        <Array Name="gameplay_field_keepVtx_007810" Count="9" Offset="0x7810">
-            <Vtx/>
-        </Array>
-
-        <DList Name="gKusaBushType1DL" Offset="0x78A0" />
-        <DList Name="gKusaBushType2DL" Offset="0x7938" />
-
-        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0x79D0" />
-        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0x81D0" />
-        <DList Name="gFieldSandstormDL" Offset="0x89D0" />
-
-        <Texture Name="gameplay_field_keep_Tex_008A90" OutName="tex_008A90" Format="rgba16" Width="32" Height="32" Offset="0x8A90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/gameplay_keep.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/gameplay_keep.xml
deleted file mode 100644
index 5da957423..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/gameplay_keep.xml
+++ /dev/null
@@ -1,1553 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="assets/misc/link_animetion/"/>
-    <File Name="gameplay_keep" Segment="4">
-        <!-- Bottles -->
-        <Texture Name="gBottleTex" OutName="bottle" Format="i4" Width="16" Height="16" Offset="0x0" />
-        <DList Name="gBottleContentsDL" Offset="0x320" />
-        <DList Name="gBottleGlassDL" Offset="0x3E0" />
-        <Texture Name="gBottleContentsTex" OutName="bottle_contents" Format="i8" Width="16" Height="32" Offset="0x508" />
-        <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="i8" Width="8" Height="8" Offset="0x708" />
-
-        <!-- Hookshot -->
-        <DList Name="gHookshotChainDL" Offset="0x8D0" />
-        <Texture Name="gHookshotChainLinkTex" OutName="hookshot_chain_link" Format="rgba16" Width="16" Height="32" Offset="0x988" />
-
-        <!-- Swords -->
-        <DList Name="gRazorSwordHandlePart4DL" Offset="0x19B0" />
-        <DList Name="gRazorSwordHandlePart3DL" Offset="0x1B20" />
-        <DList Name="gRazorSwordHandlePart2DL" Offset="0x1BC8" />
-        <DList Name="gRazorSwordHandlePart1DL" Offset="0x1C60" />
-        <DList Name="gRazorSwordHandleDL" Offset="0x1D00" />
-        <DList Name="gRazorSwordBladePart7DL" Offset="0x1D28" />
-        <DList Name="gRazorSwordBladePart6DL" Offset="0x1DC8" />
-        <DList Name="gRazorSwordBladePart5DL" Offset="0x1E58" />
-        <DList Name="gRazorSwordBladePart4DL" Offset="0x1F08" />
-        <DList Name="gRazorSwordBladePart3DL" Offset="0x1FA8" />
-        <DList Name="gRazorSwordBladePart2DL" Offset="0x2038" />
-        <DList Name="gRazorSwordBladePart1DL" Offset="0x20C8" />
-        <DList Name="gRazorSwordBladeDL" Offset="0x2168" />
-        <DList Name="gKokiriSwordHandleDL" Offset="0x21A8" />
-        <DList Name="gKokiriSwordBladePart8DL" Offset="0x2480" />
-        <DList Name="gKokiriSwordBladePart7DL" Offset="0x2508" />
-        <DList Name="gKokiriSwordBladePart6DL" Offset="0x2590" />
-        <DList Name="gKokiriSwordBladePart5DL" Offset="0x2618" />
-        <DList Name="gKokiriSwordBladePart4DL" Offset="0x26A0" />
-        <DList Name="gKokiriSwordBladePart3DL" Offset="0x2728" />
-        <DList Name="gKokiriSwordBladePart2DL" Offset="0x27B0" />
-        <DList Name="gKokiriSwordBladePart1DL" Offset="0x2838" />
-        <DList Name="gKokiriSwordBladeDL" Offset="0x28C0" />
-        <Texture Name="gKokiriSwordHandleTLUT" OutName="kokiri_sword_handle_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2908" />
-        <Texture Name="gKokiriSwordHandlePommelTex" OutName="kokiri_sword_handle_pommel" Format="rgba16" Width="8" Height="8" Offset="0x2B08" />
-        <Texture Name="gRazorSwordHandleGripTex" OutName="razor_sword_handle_grip" Format="rgba16" Width="16" Height="16" Offset="0x2B88" />
-        <Texture Name="gKokiriSwordHandleCrossGuardTex" OutName="kokiri_sword_handle_cross_gaurd" Format="ci8" Width="8" Height="8" Offset="0x2D88" />
-        <Texture Name="gKokiriSwordHandleGripTex" OutName="kokiri_sword_handle_grip" Format="i8" Width="8" Height="8" Offset="0x2DC8" />
-        <Texture Name="gRazorSwordHandleDesignTex" OutName="razor_sword_handle_design" Format="rgba16" Width="16" Height="16" Offset="0x2E08" />
-        <Texture Name="gSwordMetalTex" OutName="sword_metal" Format="i8" Width="8" Height="8" Offset="0x3008" />
-        <DList Name="gKokiriSwordDL" Offset="0x3050" />
-        <DList Name="gRazorSwordDL" Offset="0x3060" />
-
-        <!-- 2S2H [Port] - Increase referenced texture's extraction size -->
-        <DList Name="gDekuStickDL" Offset="0x32B0" /> <!-- @bug Supplies the wrong size to gsDPLoadTextureBlock, meaning it uses part of gLinkPauseChildJointTable as if it were a texture. -->
-
-        <Array Name="gLinkMaskVtx" Count="157" Offset="0x3400"> <!-- Rendering the vertices shows the same shape as the Link Mask in object_stk -->
-            <Vtx/>
-        </Array>
-
-        <!-- Transformation Masks -->
-        <DList Name="gZoraMaskDL" Offset="0x5360" />
-        <DList Name="gDekuMaskDL" Offset="0x56C0" />
-        <DList Name="gGoronMaskDL" Offset="0x5A10" />
-        <Texture Name="gLinkMaskTLUT" OutName="link_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5DB8" /> <!-- Unused, leftover remnant same as the vertices -->
-        <Texture Name="gGoronMaskTLUT" OutName="goron_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5FB8" />
-        <Texture Name="gZoraMaskTLUT" OutName="zora_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x61B8" />
-        <Texture Name="gGoronMaskMouthTex" OutName="goron_mask_mouth" Format="ci8" Width="64" Height="32" Offset="0x63B8" />
-        <Texture Name="gGoronMaskInsideEyeTex" OutName="goron_mask_inside_eye" Format="ci8" Width="32" Height="32" Offset="0x6BB8" />
-        <Texture Name="gGoronMaskNoseEyebrowTex" OutName="goron_mask_nose_eyebrow" Format="ci8" Width="8" Height="8" Offset="0x6FB8" />
-        <Texture Name="gGoronMaskHairTex" OutName="goron_mask_hair" Format="ci8" Width="16" Height="16" Offset="0x6FF8" />
-        <Texture Name="gGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba32" Width="32" Height="32" Offset="0x70F8" />
-        <Texture Name="gDekuMaskEyeTex" OutName="deku_mask_eye" Format="rgba16" Width="64" Height="32" Offset="0x80F8" />
-        <Texture Name="gDekuMaskFaceTex" OutName="deku_mask_face" Format="rgba16" Width="16" Height="16" Offset="0x90F8" />
-        <Texture Name="gDekuMaskHairTex" OutName="deku_mask_hair" Format="rgba16" Width="32" Height="32" Offset="0x92F8" />
-        <Texture Name="gZoraMaskInsideEyeTex" OutName="zora_mask_inside_eye" Format="ci8" Width="32" Height="32" Offset="0x9AF8" />
-        <Texture Name="gZoraMaskMouthTex" OutName="zora_mask_mouth" Format="ci8" Width="32" Height="32" Offset="0x9EF8" />
-        <Texture Name="gZoraMaskNoseTex" OutName="zora_mask_nose" Format="ci8" Width="8" Height="8" Offset="0xA2F8" />
-        <Texture Name="gZoraMaskSpotsTex" OutName="zora_mask_spots" Format="ci8" Width="16" Height="32" Offset="0xA338" />
-        <Texture Name="gZoraMaskEyeTex" OutName="zora_mask_eye" Format="i8" Width="32" Height="32" Offset="0xA538" />
-
-        <!-- Fierce Deity Mask-->
-        <DList Name="gFierceDeityMaskDL" Offset="0xB260" />
-        <Texture Name="gFierceDeityMaskTLUT" OutName="fierce_deity_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0xB6B0" />
-        <Texture Name="gFierceDeityMaskHairTex" OutName="fierce_deity_mask_hair" Format="ci8" Width="32" Height="32" Offset="0xB8B0" />
-        <Texture Name="gFierceDeityMaskEyesTex" OutName="fierce_deity_mask_eyes" Format="ci8" Width="64" Height="32" Offset="0xBCB0" />
-        <Texture Name="gFierceDeityMaskMouthTex" OutName="fierce_deity_mask_mouth" Format="ci8" Width="32" Height="16" Offset="0xC4B0" />
-        <Texture Name="gFierceDeityMaskEarTex" OutName="fierce_deity_mask_ear" Format="ci8" Width="16" Height="16" Offset="0xC6B0" />
-        <Texture Name="gFierceDeityMaskHatTex" OutName="fierce_deity_mask_hat" Format="rgba16" Width="8" Height="8" Offset="0xC7B0" />
-
-        <Texture Name="gameplay_keep_Tex_00C830" OutName="tex_00C830" Format="rgba16" Width="16" Height="16" Offset="0xC830" />
-        <Texture Name="gameplay_keep_Tex_00CA30" OutName="tex_00CA30" Format="rgba16" Width="16" Height="16" Offset="0xCA30" />
-
-        <!-- 2S2H [Port] - gDekuStickDL loads this as a 16x16 texture, despite it being 8x8. We need to extract this extra 'garbage' data too -->
-        <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="16" Height="16" Offset="0xCC30" />
-
-        <!-- Leftover joint tables from Ocarina of Time's Pause Menu. -->
-        <Array Name="gLinkPauseChildJointTable" Count="24" Offset="0xCC70">
-            <Vector Type="s16" Dimensions="3"/>
-        </Array>
-        <Array Name="gLinkPauseChildDekuShieldJointTable" Count="24" Offset="0xCD00">
-            <Vector Type="s16" Dimensions="3"/>
-        </Array>
-        <Array Name="gLinkPauseAdultBgsJointTable" Count="24" Offset="0xCD90">
-            <Vector Type="s16" Dimensions="3"/>
-        </Array>
-        <Array Name="gLinkPauseAdultJointTable" Count="24" Offset="0xCE20">
-            <Vector Type="s16" Dimensions="3"/>
-        </Array>
-        <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0xCEB0">
-            <Vector Type="s16" Dimensions="3"/>
-        </Array>
-
-        <!-- Player Animations -->
-        <PlayerAnimation Name="gPlayerAnim_al_elf_tobidasi" Offset="0xCF40" />
-        <PlayerAnimation Name="gPlayerAnim_al_fuwafuwa" Offset="0xCF48" />
-        <PlayerAnimation Name="gPlayerAnim_al_fuwafuwa_loop" Offset="0xCF50" />
-        <PlayerAnimation Name="gPlayerAnim_al_fuwafuwa_modori" Offset="0xCF58" />
-        <PlayerAnimation Name="gPlayerAnim_al_gaku" Offset="0xCF60" />
-        <PlayerAnimation Name="gPlayerAnim_al_hensin" Offset="0xCF68" />
-        <PlayerAnimation Name="gPlayerAnim_al_hensin_loop" Offset="0xCF70" />
-        <PlayerAnimation Name="gPlayerAnim_al_no" Offset="0xCF78" />
-        <PlayerAnimation Name="gPlayerAnim_al_unun" Offset="0xCF80" />
-        <PlayerAnimation Name="gPlayerAnim_al_yareyare" Offset="0xCF88" />
-        <PlayerAnimation Name="gPlayerAnim_al_yes" Offset="0xCF90" />
-        <PlayerAnimation Name="gPlayerAnim_alink_dance_loop" Offset="0xCF98" />
-        <PlayerAnimation Name="gPlayerAnim_alink_ee" Offset="0xCFA0" />
-        <PlayerAnimation Name="gPlayerAnim_alink_ee_loop" Offset="0xCFA8" />
-        <PlayerAnimation Name="gPlayerAnim_alink_fukitobu" Offset="0xCFB0" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFB8" Offset="0xCFB8" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFC0" Offset="0xCFC0" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFC8" Offset="0xCFC8" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFD0" Offset="0xCFD0" />
-        <PlayerAnimation Name="gPlayerAnim_alink_kaitenmiss" Offset="0xCFD8" />
-        <PlayerAnimation Name="gPlayerAnim_alink_kyoro" Offset="0xCFE0" />
-        <PlayerAnimation Name="gPlayerAnim_alink_kyoro_loop" Offset="0xCFE8" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFF0" Offset="0xCFF0" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFF8" Offset="0xCFF8" />
-        <PlayerAnimation Name="gPlayerAnim_alink_ozigi" Offset="0xD000" />
-        <PlayerAnimation Name="gPlayerAnim_alink_ozigi_loop" Offset="0xD008" />
-        <PlayerAnimation Name="gPlayerAnim_alink_ozigi_modori" Offset="0xD010" />
-        <PlayerAnimation Name="gPlayerAnim_alink_powerup" Offset="0xD018" />
-        <PlayerAnimation Name="gPlayerAnim_alink_powerup_loop" Offset="0xD020" />
-        <PlayerAnimation Name="gPlayerAnim_alink_rakkatyu" Offset="0xD028" />
-        <PlayerAnimation Name="gPlayerAnim_alink_somukeru" Offset="0xD030" />
-        <PlayerAnimation Name="gPlayerAnim_alink_somukeru_loop" Offset="0xD038" />
-        <PlayerAnimation Name="gPlayerAnim_alink_tereru" Offset="0xD040" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D048" Offset="0xD048" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D050" Offset="0xD050" />
-        <PlayerAnimation Name="gPlayerAnim_alink_yurayura" Offset="0xD058" />
-        <PlayerAnimation Name="gPlayerAnim_bajyo_furikaeru" Offset="0xD060" />
-        <PlayerAnimation Name="gPlayerAnim_bajyo_walk" Offset="0xD068" />
-        <PlayerAnimation Name="gPlayerAnim_cl_dakisime" Offset="0xD070" />
-        <PlayerAnimation Name="gPlayerAnim_cl_dakisime_loop" Offset="0xD078" />
-        <PlayerAnimation Name="gPlayerAnim_cl_furafura" Offset="0xD080" />
-        <PlayerAnimation Name="gPlayerAnim_cl_hoo" Offset="0xD088" />
-        <PlayerAnimation Name="gPlayerAnim_cl_jibun_miru" Offset="0xD090" />
-        <PlayerAnimation Name="gPlayerAnim_cl_kubisime" Offset="0xD098" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D0A0" Offset="0xD0A0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_maskoff" Offset="0xD0A8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_msbowait" Offset="0xD0B0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_nigeru" Offset="0xD0B8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_ononoki" Offset="0xD0C0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_setmask" Offset="0xD0C8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_setmaskend" Offset="0xD0D0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_tewofuru" Offset="0xD0D8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_tobikakaru" Offset="0xD0E0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_uma_leftup" Offset="0xD0E8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_uma_rightup" Offset="0xD0F0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_umamiage" Offset="0xD0F8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_umamiage_loop" Offset="0xD100" />
-        <PlayerAnimation Name="gPlayerAnim_cl_umanoru" Offset="0xD108" />
-        <PlayerAnimation Name="gPlayerAnim_cl_umanoru_loop" Offset="0xD110" />
-        <PlayerAnimation Name="gPlayerAnim_cl_wakare" Offset="0xD118" />
-        <PlayerAnimation Name="gPlayerAnim_cl_wakare_loop" Offset="0xD120" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0xD128" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0xD130" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_bashi" Offset="0xD138" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorA_link" Offset="0xD140" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorB_link" Offset="0xD148" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_futtobi" Offset="0xD150" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_get1" Offset="0xD158" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_get2" Offset="0xD160" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_get3" Offset="0xD168" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_goto_future" Offset="0xD170" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai" Offset="0xD178" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_kennuki" Offset="0xD180" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_wait" Offset="0xD188" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi" Offset="0xD190" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi_wait" Offset="0xD198" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri" Offset="0xD1A0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri_wait" Offset="0xD1A8" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_nozoki" Offset="0xD1B0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_return_to_future" Offset="0xD1B8" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup" Offset="0xD1C0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup_wait" Offset="0xD1C8" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D1D0" Offset="0xD1D0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAL" Offset="0xD1D8" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAR" Offset="0xD1E0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBL" Offset="0xD1E8" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBR" Offset="0xD1F0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startA" Offset="0xD1F8" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startB" Offset="0xD200" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upL" Offset="0xD208" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upR" Offset="0xD210" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_defense_ALL" Offset="0xD218" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_okarina_walkB" Offset="0xD220" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_okarina_walk" Offset="0xD228" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_negaeri" Offset="0xD230" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_okiagari" Offset="0xD238" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_tatiagari" Offset="0xD240" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait1" Offset="0xD248" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait2" Offset="0xD250" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait3" Offset="0xD258" />
-        <PlayerAnimation Name="gPlayerAnim_d_link_imanodare" Offset="0xD260" />
-        <PlayerAnimation Name="gPlayerAnim_d_link_orooro" Offset="0xD268" />
-        <PlayerAnimation Name="gPlayerAnim_d_link_orowait" Offset="0xD270" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D278" Offset="0xD278" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D280" Offset="0xD280" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D288" Offset="0xD288" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D290" Offset="0xD290" />
-        <PlayerAnimation Name="gPlayerAnim_demo_link_nwait" Offset="0xD298" />
-        <PlayerAnimation Name="gPlayerAnim_demo_link_orosuu" Offset="0xD2A0" />
-        <PlayerAnimation Name="gPlayerAnim_demo_link_tewatashi" Offset="0xD2A8" />
-        <PlayerAnimation Name="gPlayerAnim_demo_link_twait" Offset="0xD2B0" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D2B8" Offset="0xD2B8" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D2C0" Offset="0xD2C0" />
-        <PlayerAnimation Name="gPlayerAnim_demo_pikupiku" Offset="0xD2C8" />
-        <PlayerAnimation Name="gPlayerAnim_demo_rakka" Offset="0xD2D0" />
-        <PlayerAnimation Name="gPlayerAnim_demo_suwari1" Offset="0xD2D8" />
-        <PlayerAnimation Name="gPlayerAnim_demo_suwari2" Offset="0xD2E0" />
-        <PlayerAnimation Name="gPlayerAnim_demo_suwari3" Offset="0xD2E8" />
-        <PlayerAnimation Name="gPlayerAnim_dl_jibunmiru" Offset="0xD2F0" />
-        <PlayerAnimation Name="gPlayerAnim_dl_jibunmiru_wait" Offset="0xD2F8" />
-        <PlayerAnimation Name="gPlayerAnim_dl_kokeru" Offset="0xD300" />
-        <PlayerAnimation Name="gPlayerAnim_dl_yusaburu" Offset="0xD308" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D310" Offset="0xD310" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D318" Offset="0xD318" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D320" Offset="0xD320" />
-        <PlayerAnimation Name="gPlayerAnim_kf_awase" Offset="0xD328" />
-        <PlayerAnimation Name="gPlayerAnim_kf_dakiau" Offset="0xD330" />
-        <PlayerAnimation Name="gPlayerAnim_kf_dakiau_loop" Offset="0xD338" />
-        <PlayerAnimation Name="gPlayerAnim_kf_hanare" Offset="0xD340" />
-        <PlayerAnimation Name="gPlayerAnim_kf_hanare_loop" Offset="0xD348" />
-        <PlayerAnimation Name="gPlayerAnim_kf_miseau" Offset="0xD350" />
-        <PlayerAnimation Name="gPlayerAnim_kf_omen" Offset="0xD358" />
-        <PlayerAnimation Name="gPlayerAnim_kf_omen_loop" Offset="0xD360" />
-        <PlayerAnimation Name="gPlayerAnim_kf_tetunagu_loop" Offset="0xD368" />
-        <PlayerAnimation Name="gPlayerAnim_kolink_odoroki_demo" Offset="0xD370" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_endL" Offset="0xD378" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR" Offset="0xD380" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_endR" Offset="0xD388" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL" Offset="0xD390" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR" Offset="0xD398" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR" Offset="0xD3A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL" Offset="0xD3A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR" Offset="0xD3B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR" Offset="0xD3B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_endR" Offset="0xD3C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR" Offset="0xD3C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_endR" Offset="0xD3D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR" Offset="0xD3D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_anchor2fighter" Offset="0xD3E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_brake" Offset="0xD3E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_hitR" Offset="0xD3F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_walk" Offset="0xD3F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_hit" Offset="0xD400" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitL" Offset="0xD408" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitR" Offset="0xD410" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_front_hitR" Offset="0xD418" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_landingR" Offset="0xD420" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR" Offset="0xD428" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_endR" Offset="0xD430" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR" Offset="0xD438" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_rolling_kiru_endR" Offset="0xD440" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkL" Offset="0xD448" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkR" Offset="0xD450" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense" Offset="0xD458" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense_long" Offset="0xD460" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL" Offset="0xD468" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense" Offset="0xD470" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense_long" Offset="0xD478" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR" Offset="0xD480" />
-        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitL" Offset="0xD488" />
-        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitR" Offset="0xD490" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_in" Offset="0xD498" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_miss" Offset="0xD4A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_out" Offset="0xD4A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_end" Offset="0xD4B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_start" Offset="0xD4B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_wait" Offset="0xD4C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_in" Offset="0xD4C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_miss" Offset="0xD4D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_out" Offset="0xD4D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_read" Offset="0xD4E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_read_end" Offset="0xD4E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_ready" Offset="0xD4F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_end" Offset="0xD4F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_next" Offset="0xD500" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_wait" Offset="0xD508" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_defense" Offset="0xD510" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_defense_wait" Offset="0xD518" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_side_walk" Offset="0xD520" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_walk2ready" Offset="0xD528" />
-        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_end" Offset="0xD530" />
-        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_start" Offset="0xD538" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_Tbox_open" Offset="0xD540" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_back_to_past" Offset="0xD548" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op1" Offset="0xD550" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op2" Offset="0xD558" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op3" Offset="0xD560" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_bikkuri" Offset="0xD568" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link" Offset="0xD570" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link_free" Offset="0xD578" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link" Offset="0xD580" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link_free" Offset="0xD588" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2" Offset="0xD590" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2_wait" Offset="0xD598" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki" Offset="0xD5A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemA" Offset="0xD5A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemB" Offset="0xD5B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_goma_furimuki" Offset="0xD5B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad" Offset="0xD5C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad_wait" Offset="0xD5C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_jibunmiru" Offset="0xD5D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori" Offset="0xD5D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_mimawasi" Offset="0xD5E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri" Offset="0xD5E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait" Offset="0xD5F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_wait" Offset="0xD5F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage" Offset="0xD600" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage_wait" Offset="0xD608" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1" Offset="0xD610" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1_wait" Offset="0xD618" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2" Offset="0xD620" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_modori" Offset="0xD628" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_wait" Offset="0xD630" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kousan" Offset="0xD638" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand" Offset="0xD640" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand_wait" Offset="0xD648" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi" Offset="0xD650" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi_wait" Offset="0xD658" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_return_to_past" Offset="0xD660" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_sita_wait" Offset="0xD668" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_ue" Offset="0xD670" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_ue_wait" Offset="0xD678" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_warp" Offset="0xD680" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru" Offset="0xD688" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru_wait" Offset="0xD690" />
-        <PlayerAnimation Name="gPlayerAnim_link_derth_rebirth" Offset="0xD698" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru" Offset="0xD6A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_end" Offset="0xD6A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh" Offset="0xD6B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end" Offset="0xD6B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru" Offset="0xD6C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_end" Offset="0xD6C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh" Offset="0xD6D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end" Offset="0xD6D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru" Offset="0xD6E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_end" Offset="0xD6E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh" Offset="0xD6F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end" Offset="0xD6F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru" Offset="0xD700" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_end" Offset="0xD708" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh" Offset="0xD710" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end" Offset="0xD718" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru" Offset="0xD720" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end" Offset="0xD728" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit" Offset="0xD730" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk" Offset="0xD738" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_start" Offset="0xD740" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait" Offset="0xD748" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end" Offset="0xD750" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_walk" Offset="0xD758" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru" Offset="0xD760" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru_end" Offset="0xD768" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump" Offset="0xD770" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_endL" Offset="0xD778" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_end" Offset="0xD780" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru" Offset="0xD788" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_end" Offset="0xD790" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh" Offset="0xD798" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end" Offset="0xD7A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump" Offset="0xD7A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_endR" Offset="0xD7B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_end" Offset="0xD7B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru" Offset="0xD7C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_end" Offset="0xD7C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh" Offset="0xD7D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end" Offset="0xD7D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru" Offset="0xD7E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru_end" Offset="0xD7E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump" Offset="0xD7F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_endR" Offset="0xD7F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_end" Offset="0xD800" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run" Offset="0xD808" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run_long" Offset="0xD810" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_hit" Offset="0xD818" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_fighter2long" Offset="0xD820" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump" Offset="0xD828" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_endR" Offset="0xD830" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_end" Offset="0xD838" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh" Offset="0xD840" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end" Offset="0xD848" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_rollkiru" Offset="0xD850" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_landing_roll_long" Offset="0xD858" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal2fighter" Offset="0xD860" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru" Offset="0xD868" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_endR" Offset="0xD870" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_end" Offset="0xD878" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh" Offset="0xD880" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end" Offset="0xD888" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru" Offset="0xD890" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_end" Offset="0xD898" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh" Offset="0xD8A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end" Offset="0xD8A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_jump_kiru_end" Offset="0xD8B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_side_walk" Offset="0xD8B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_startL" Offset="0xD8C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_start" Offset="0xD8C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait" Offset="0xD8D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait_end" Offset="0xD8D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_walk" Offset="0xD8E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_reboundR" Offset="0xD8E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound" Offset="0xD8F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_longR" Offset="0xD8F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_long" Offset="0xD900" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru" Offset="0xD908" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru_end" Offset="0xD910" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_run" Offset="0xD918" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_run_long" Offset="0xD920" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkL_long" Offset="0xD928" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkR_long" Offset="0xD930" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walk_long" Offset="0xD938" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL" Offset="0xD940" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL_end" Offset="0xD948" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR" Offset="0xD950" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR_end" Offset="0xD958" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitR_long" Offset="0xD960" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL2wait_long" Offset="0xD968" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL_long" Offset="0xD970" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR2wait_long" Offset="0xD978" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR_long" Offset="0xD980" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait_long" Offset="0xD988" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endL_long" Offset="0xD990" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endR_long" Offset="0xD998" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_long" Offset="0xD9A0" />
-        <!-- EXTRA ANIMS START -->
-        <!-- 
-        <PlayerAnimation Name="gPlayerAnim_link_gamecube_D9A8" Offset="0xD9A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_gamecube_D9B0" Offset="0xD9B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_gamecube_D9B8" Offset="0xD9B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_gamecube_D9C0" Offset="0xD9C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_gamecube_D9C8" Offset="0xD9C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_gamecube_D9D0" Offset="0xD9D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_gamecube_D9D8" Offset="0xD9D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_gamecube_D9E0" Offset="0xD9E0" />
-         -->
-        <!-- EXTRA ANIMS END -->
-        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2free" Offset="0xD9E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2long" Offset="0xD9F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_hammer_normal2long" Offset="0xD9F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_hatto_demo" Offset="0xDA00" />
-        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_start" Offset="0xDA08" />
-        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_wait" Offset="0xDA10" />
-        <PlayerAnimation Name="gPlayerAnim_link_hook_shot_ready" Offset="0xDA18" />
-        <PlayerAnimation Name="gPlayerAnim_link_hook_wait" Offset="0xDA20" />
-        <PlayerAnimation Name="gPlayerAnim_link_hook_walk2ready" Offset="0xDA28" />
-        <PlayerAnimation Name="gPlayerAnim_link_kei_wait" Offset="0xDA30" />
-        <PlayerAnimation Name="gPlayerAnim_link_keirei" Offset="0xDA38" />
-        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion1" Offset="0xDA40" />
-        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion2" Offset="0xDA48" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo1" Offset="0xDA50" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo2" Offset="0xDA58" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo3" Offset="0xDA60" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze1" Offset="0xDA68" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze2" Offset="0xDA70" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze3" Offset="0xDA78" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii1" Offset="0xDA80" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii2" Offset="0xDA88" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii3" Offset="0xDA90" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_tame" Offset="0xDA98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_100step_up" Offset="0xDAA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_150step_up" Offset="0xDAA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_250jump_start" Offset="0xDAB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn" Offset="0xDAB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn_free" Offset="0xDAC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_hold2upL" Offset="0xDAC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideL" Offset="0xDAD0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideR" Offset="0xDAD8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startA" Offset="0xDAE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startB" Offset="0xDAE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upL" Offset="0xDAF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upR" Offset="0xDAF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake" Offset="0xDB00" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake_end" Offset="0xDB08" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downA" Offset="0xDB10" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downB" Offset="0xDB18" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_down_wake" Offset="0xDB20" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_hit" Offset="0xDB28" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_run" Offset="0xDB30" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shitR" Offset="0xDB38" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shit" Offset="0xDB40" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_walk" Offset="0xDB48" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_backspace" Offset="0xDB50" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_box_kick" Offset="0xDB58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB" Offset="0xDB60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_free" Offset="0xDB68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_wait" Offset="0xDB70" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check" Offset="0xDB78" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end" Offset="0xDB80" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end_free" Offset="0xDB88" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check_free" Offset="0xDB90" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait" Offset="0xDB98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait_free" Offset="0xDBA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_down" Offset="0xDBA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAL" Offset="0xDBB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAR" Offset="0xDBB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBL" Offset="0xDBC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBR" Offset="0xDBC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startA" Offset="0xDBD0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startB" Offset="0xDBD8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upL" Offset="0xDBE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upR" Offset="0xDBE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_up" Offset="0xDBF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_damage_run_free" Offset="0xDBF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense" Offset="0xDC00" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end" Offset="0xDC08" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end_free" Offset="0xDC10" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_free" Offset="0xDC18" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_hit" Offset="0xDC20" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_kiru" Offset="0xDC28" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait" Offset="0xDC30" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait_free" Offset="0xDC38" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip" Offset="0xDC40" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end" Offset="0xDC48" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_free" Offset="0xDC50" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_long" Offset="0xDC58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock" Offset="0xDC60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock_end" Offset="0xDC68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_fall" Offset="0xDC70" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up" Offset="0xDC78" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up_free" Offset="0xDC80" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_wait" Offset="0xDC88" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_fighter2free" Offset="0xDC90" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_free2bom" Offset="0xDC98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_free2fighter_free" Offset="0xDCA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_free2freeB" Offset="0xDCA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_free2free" Offset="0xDCB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downA" Offset="0xDCB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downB" Offset="0xDCC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_down_wake" Offset="0xDCC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_hit" Offset="0xDCD0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shitR" Offset="0xDCD8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shit" Offset="0xDCE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_give_other" Offset="0xDCE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_hang_up_down" Offset="0xDCF0" />
-        <!-- EXTRA ANIMS START -->
-        <!-- 
-        <PlayerAnimation Name="gPlayerAnim_link_gamecube_DCF8" Offset="0xDCF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_gamecube_DD00" Offset="0xDD00" />
-         -->
-        <!-- EXTRA ANIMS END -->
-        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down" Offset="0xDD08" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_free" Offset="0xDD10" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_long" Offset="0xDD18" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_ice_down" Offset="0xDD20" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump" Offset="0xDD28" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold" Offset="0xDD30" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold_free" Offset="0xDD38" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up" Offset="0xDD40" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up_free" Offset="0xDD48" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait" Offset="0xDD50" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait_free" Offset="0xDD58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_landing" Offset="0xDD60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_free" Offset="0xDD68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll" Offset="0xDD70" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll_free" Offset="0xDD78" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_wait" Offset="0xDD80" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom" Offset="0xDD88" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom_end" Offset="0xDD90" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_long2bom" Offset="0xDD98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_newroll_jump_20f" Offset="0xDDA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_newroll_jump_end_20f" Offset="0xDDA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_newside_jump_20f" Offset="0xDDB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_newside_jump_end_20f" Offset="0xDDB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free" Offset="0xDDC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_end" Offset="0xDDC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_wait" Offset="0xDDD0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2bom" Offset="0xDDD8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter" Offset="0xDDE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter_free" Offset="0xDDE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2free" Offset="0xDDF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_end" Offset="0xDDF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_start" Offset="0xDE00" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_swing" Offset="0xDE08" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end" Offset="0xDE10" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end_free" Offset="0xDE18" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start" Offset="0xDE20" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start_free" Offset="0xDE28" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling" Offset="0xDE30" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling_free" Offset="0xDE38" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_push_end" Offset="0xDE40" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_push_start" Offset="0xDE48" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait" Offset="0xDE50" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait_end" Offset="0xDE58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pushing" Offset="0xDE60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_put" Offset="0xDE68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_put_free" Offset="0xDE70" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack" Offset="0xDE78" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack_wait" Offset="0xDE80" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run" Offset="0xDE88" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run_free" Offset="0xDE90" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump" Offset="0xDE98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_end" Offset="0xDEA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall" Offset="0xDEA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall_wait" Offset="0xDEB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing" Offset="0xDEB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing_free" Offset="0xDEC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkL_free" Offset="0xDEC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkR_free" Offset="0xDED0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk" Offset="0xDED8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk_free" Offset="0xDEE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_take_out" Offset="0xDEE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free" Offset="0xDEF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free_wait" Offset="0xDEF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_throw" Offset="0xDF00" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_throw_free" Offset="0xDF08" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip" Offset="0xDF10" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end" Offset="0xDF18" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_free" Offset="0xDF20" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_long" Offset="0xDF28" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitR" Offset="0xDF30" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeA_20f" Offset="0xDF38" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeB_20f" Offset="0xDF40" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeC_20f" Offset="0xDF48" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL2wait" Offset="0xDF50" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL_free" Offset="0xDF58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR2wait" Offset="0xDF60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR_free" Offset="0xDF68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait" Offset="0xDF70" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_free" Offset="0xDF78" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeA_20f" Offset="0xDF80" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeB_20f" Offset="0xDF88" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeC_20f" Offset="0xDF90" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk" Offset="0xDF98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL" Offset="0xDFA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL_free" Offset="0xDFA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR" Offset="0xDFB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR_free" Offset="0xDFB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_free" Offset="0xDFC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_okarina_warp_goal" Offset="0xDFC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_okiru_demo" Offset="0xDFD0" />
-        <PlayerAnimation Name="gPlayerAnim_link_shagamu_demo" Offset="0xDFD8" />
-        <PlayerAnimation Name="gPlayerAnim_link_silver_carry" Offset="0xDFE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_silver_throw" Offset="0xDFE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_silver_wait" Offset="0xDFF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_Lside_swim" Offset="0xDFF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_Rside_swim" Offset="0xE000" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_back_swim" Offset="0xE008" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_land2swim_wait" Offset="0xE010" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_15step_up" Offset="0xE018" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim" Offset="0xE020" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_end" Offset="0xE028" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_start" Offset="0xE030" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_down" Offset="0xE038" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_get" Offset="0xE040" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_hit" Offset="0xE048" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_wait" Offset="0xE050" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_wait2swim_wait" Offset="0xE058" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun" Offset="0xE060" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun_muti" Offset="0xE068" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump100" Offset="0xE070" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump200" Offset="0xE078" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun" Offset="0xE080" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun_muti" Offset="0xE088" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stand" Offset="0xE090" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stop" Offset="0xE098" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk" Offset="0xE0A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk_muti" Offset="0xE0A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_left_down" Offset="0xE0B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_left_up" Offset="0xE0B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_right_down" Offset="0xE0C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_right_up" Offset="0xE0C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_stop_muti" Offset="0xE0D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_1" Offset="0xE0D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_2" Offset="0xE0E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_3" Offset="0xE0E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat1_20f" Offset="0xE0F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat2_20f" Offset="0xE0F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemA_20f" Offset="0xE100" />
-        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemB_20f" Offset="0xE108" />
-        <PlayerAnimation Name="gPlayerAnim_link_waitF_typeD_20f" Offset="0xE110" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_heat1_20f" Offset="0xE118" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_heat2_20f" Offset="0xE120" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_itemA_20f" Offset="0xE128" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_itemB_20f" Offset="0xE130" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_itemC_20f" Offset="0xE138" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD1_20f" Offset="0xE140" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD2_20f" Offset="0xE148" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_typeD_20f" Offset="0xE150" />
-        <PlayerAnimation Name="gPlayerAnim_lkt_nwait" Offset="0xE158" />
-        <PlayerAnimation Name="gPlayerAnim_lost_horse2" Offset="0xE160" />
-        <PlayerAnimation Name="gPlayerAnim_lost_horse" Offset="0xE168" />
-        <PlayerAnimation Name="gPlayerAnim_lost_horse_wait" Offset="0xE170" />
-        <PlayerAnimation Name="gPlayerAnim_nw_modoru" Offset="0xE178" />
-        <PlayerAnimation Name="gPlayerAnim_o_get_ato" Offset="0xE180" />
-        <PlayerAnimation Name="gPlayerAnim_o_get_mae" Offset="0xE188" />
-        <PlayerAnimation Name="gPlayerAnim_okarinatori" Offset="0xE190" />
-        <PlayerAnimation Name="gPlayerAnim_okiagaru" Offset="0xE198" />
-        <PlayerAnimation Name="gPlayerAnim_okiagaru_tatu" Offset="0xE1A0" />
-        <PlayerAnimation Name="gPlayerAnim_okiagaru_wait" Offset="0xE1A8" />
-        <PlayerAnimation Name="gPlayerAnim_om_get" Offset="0xE1B0" />
-        <PlayerAnimation Name="gPlayerAnim_om_get_mae" Offset="0xE1B8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_Tbox_open" Offset="0xE1C0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_endAL" Offset="0xE1C8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_endAR" Offset="0xE1D0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_endBL" Offset="0xE1D8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_endBR" Offset="0xE1E0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_startA" Offset="0xE1E8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_startB" Offset="0xE1F0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_upL" Offset="0xE1F8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_upR" Offset="0xE200" />
-        <PlayerAnimation Name="gPlayerAnim_pg_doorA_open" Offset="0xE208" />
-        <PlayerAnimation Name="gPlayerAnim_pg_doorB_open" Offset="0xE210" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplayA" Offset="0xE218" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplayD" Offset="0xE220" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplayL" Offset="0xE228" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplayR" Offset="0xE230" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplayU" Offset="0xE238" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplay" Offset="0xE240" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkistart" Offset="0xE248" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiwait" Offset="0xE250" />
-        <PlayerAnimation Name="gPlayerAnim_pg_maru_change" Offset="0xE258" />
-        <PlayerAnimation Name="gPlayerAnim_pg_maskoffstart" Offset="0xE260" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchA" Offset="0xE268" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchAendR" Offset="0xE270" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchAend" Offset="0xE278" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchB" Offset="0xE280" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchBendR" Offset="0xE288" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchBend" Offset="0xE290" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchC" Offset="0xE298" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchCendR" Offset="0xE2A0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchCend" Offset="0xE2A8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_wait" Offset="0xE2B0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_Tbox_open" Offset="0xE2B8" />
-        <PlayerAnimation Name="gPlayerAnim_pn_attack" Offset="0xE2C0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_batabata" Offset="0xE2C8" />
-        <PlayerAnimation Name="gPlayerAnim_pn_doorA_open" Offset="0xE2D0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_doorB_open" Offset="0xE2D8" />
-        <PlayerAnimation Name="gPlayerAnim_pn_drink" Offset="0xE2E0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_drinkend" Offset="0xE2E8" />
-        <PlayerAnimation Name="gPlayerAnim_pn_drinkstart" Offset="0xE2F0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_gakkiplay" Offset="0xE2F8" />
-        <PlayerAnimation Name="gPlayerAnim_pn_gakkistart" Offset="0xE300" />
-        <PlayerAnimation Name="gPlayerAnim_pn_getA" Offset="0xE308" />
-        <PlayerAnimation Name="gPlayerAnim_pn_getB" Offset="0xE310" />
-        <PlayerAnimation Name="gPlayerAnim_pn_gurd" Offset="0xE318" />
-        <PlayerAnimation Name="gPlayerAnim_pn_kakku" Offset="0xE320" />
-        <PlayerAnimation Name="gPlayerAnim_pn_kakkufinish" Offset="0xE328" />
-        <PlayerAnimation Name="gPlayerAnim_pn_maskoffstart" Offset="0xE330" />
-        <PlayerAnimation Name="gPlayerAnim_pn_rakkafinish" Offset="0xE338" />
-        <PlayerAnimation Name="gPlayerAnim_pn_tamahaki" Offset="0xE340" />
-        <PlayerAnimation Name="gPlayerAnim_pn_tamahakidf" Offset="0xE348" />
-        <PlayerAnimation Name="gPlayerAnim_pz_Tbox_open" Offset="0xE350" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackA" Offset="0xE358" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackAendR" Offset="0xE360" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackAend" Offset="0xE368" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackB" Offset="0xE370" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackBendR" Offset="0xE378" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackBend" Offset="0xE380" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackC" Offset="0xE388" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackCendR" Offset="0xE390" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackCend" Offset="0xE398" />
-        <PlayerAnimation Name="gPlayerAnim_pz_bladeon" Offset="0xE3A0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_endAL" Offset="0xE3A8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_endAR" Offset="0xE3B0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_endBL" Offset="0xE3B8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_endBR" Offset="0xE3C0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_startA" Offset="0xE3C8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_startB" Offset="0xE3D0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_upL" Offset="0xE3D8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_upR" Offset="0xE3E0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cutterattack" Offset="0xE3E8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cuttercatch" Offset="0xE3F0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cutterwaitA" Offset="0xE3F8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cutterwaitB" Offset="0xE400" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cutterwaitC" Offset="0xE408" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cutterwaitanim" Offset="0xE410" />
-        <PlayerAnimation Name="gPlayerAnim_pz_doorA_open" Offset="0xE418" />
-        <PlayerAnimation Name="gPlayerAnim_pz_doorB_open" Offset="0xE420" />
-        <PlayerAnimation Name="gPlayerAnim_pz_fishswim" Offset="0xE428" />
-        <PlayerAnimation Name="gPlayerAnim_pz_gakkiplay" Offset="0xE430" />
-        <PlayerAnimation Name="gPlayerAnim_pz_gakkistart" Offset="0xE438" />
-        <PlayerAnimation Name="gPlayerAnim_pz_jumpAT" Offset="0xE440" />
-        <PlayerAnimation Name="gPlayerAnim_pz_jumpATend" Offset="0xE448" />
-        <PlayerAnimation Name="gPlayerAnim_pz_maskoffstart" Offset="0xE450" />
-        <PlayerAnimation Name="gPlayerAnim_pz_swimtowait" Offset="0xE458" />
-        <PlayerAnimation Name="gPlayerAnim_pz_wait" Offset="0xE460" />
-        <PlayerAnimation Name="gPlayerAnim_pz_waterroll" Offset="0xE468" />
-        <PlayerAnimation Name="gPlayerAnim_rakka" Offset="0xE470" />
-        <PlayerAnimation Name="gPlayerAnim_rakuba" Offset="0xE478" />
-        <PlayerAnimation Name="gPlayerAnim_sirimochi" Offset="0xE480" />
-        <PlayerAnimation Name="gPlayerAnim_sirimochi_wait" Offset="0xE488" />
-        <PlayerAnimation Name="gPlayerAnim_spotlight" Offset="0xE490" />
-        <PlayerAnimation Name="gPlayerAnim_spotlight_wait" Offset="0xE498" />
-        <PlayerAnimation Name="gPlayerAnim_sude_nwait" Offset="0xE4A0" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00E458" Offset="0xE4A8" />
-        <PlayerAnimation Name="gPlayerAnim_urusai" Offset="0xE4B0" />
-        <PlayerAnimation Name="gPlayerAnim_vs_yousei" Offset="0xE4B8" />
-        <PlayerAnimation Name="gPlayerAnim_L_1kyoro" Offset="0xE4C0" />
-        <PlayerAnimation Name="gPlayerAnim_L_2kyoro" Offset="0xE4C8" />
-        <PlayerAnimation Name="gPlayerAnim_L_bouzen" Offset="0xE4D0" />
-        <PlayerAnimation Name="gPlayerAnim_L_hajikareru" Offset="0xE4D8" />
-        <PlayerAnimation Name="gPlayerAnim_L_kamaeru" Offset="0xE4E0" />
-        <PlayerAnimation Name="gPlayerAnim_L_ken_miru" Offset="0xE4E8" />
-        <PlayerAnimation Name="gPlayerAnim_L_kennasi_w" Offset="0xE4F0" />
-        <PlayerAnimation Name="gPlayerAnim_L_kw" Offset="0xE4F8" />
-        <PlayerAnimation Name="gPlayerAnim_L_mukinaoru" Offset="0xE500" />
-        <PlayerAnimation Name="gPlayerAnim_L_okarina_get" Offset="0xE508" />
-        <PlayerAnimation Name="gPlayerAnim_L_sagaru" Offset="0xE510" />
-        <PlayerAnimation Name="gPlayerAnim_Link_ha" Offset="0xE518" />
-        <PlayerAnimation Name="gPlayerAnim_Link_m_wait" Offset="0xE520" />
-        <PlayerAnimation Name="gPlayerAnim_Link_miageru" Offset="0xE528" />
-        <PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0xE530" />
-        <PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0xE538" />
-        <PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0xE540" />
-
-        <DList Name="gameplay_keep_DL_00E5C0" Offset="0xE610" />
-
-        <!-- Deku Flower -->
-        <Collision Name="gPinkDekuFlowerCol" Offset="0xE760" />
-        <Animation Name="gDekuFlowerBounceAnim" Offset="0xEBCC" /> <!-- Original name is "dnp_boyoyon" ("bounce") -->
-        <DList Name="gPinkDekuFlowerIdleDL" Offset="0xEDD0" />
-        <DList Name="gPinkDekuFlowerBaseDL" Offset="0xF308" />
-        <DList Name="gPinkDekuFlowerCenterDL" Offset="0xF3A0" />
-        <DList Name="gPinkDekuFlowerBackLeftPetalDL" Offset="0xF488" />
-        <DList Name="gPinkDekuFlowerLeftLeafDL" Offset="0xF510" />
-        <DList Name="gPinkDekuFlowerFrontLeftPetalDL" Offset="0xF598" />
-        <DList Name="gPinkDekuFlowerRightLeafDL" Offset="0xF620" />
-        <DList Name="gPinkDekuFlowerBackRightPetalDL" Offset="0xF6A8" />
-        <DList Name="gPinkDekuFlowerFrontRightPetalDL" Offset="0xF730" />
-        <DList Name="gPinkDekuFlowerFrontLeafDL" Offset="0xF7B8" />
-        <DList Name="gPinkDekuFlowerBackLeafDL" Offset="0xF840" />
-        <Texture Name="gPinkDekuFlowerPetalAndCenterTex" OutName="pink_deku_flower_petal_and_center" Format="rgba16" Width="16" Height="32" Offset="0xF8C8" />
-        <Texture Name="gPinkDekuFlowerLeafAndCenterTex" OutName="pink_deku_flower_leaf_and_center" Format="rgba16" Width="16" Height="32" Offset="0xFCC8" />
-        <Texture Name="gPinkDekuFlowerBaseLeafTex" OutName="pink_deku_flower_base_leaf" Format="rgba16" Width="32" Height="32" Offset="0x100C8" />
-        <Texture Name="gGoldDekuFlowerPetalAndCenterTex" OutName="gold_deku_flower_petal_and_center" Format="rgba16" Width="16" Height="32" Offset="0x108C8" />
-        <Texture Name="gGoldDekuFlowerBaseLeafTex" OutName="gold_deku_flower_base_leaf" Format="rgba16" Width="32" Height="32" Offset="0x10CC8" />
-        <Limb Name="gPinkDekuFlowerBaseLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_BASE" Offset="0x114C8" />
-        <Limb Name="gPinkDekuFlowerCenterLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_CENTER" Offset="0x114D4" />
-        <Limb Name="gPinkDekuFlowerBackLeafLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_BACK_LEAF" Offset="0x114E0" />
-        <Limb Name="gPinkDekuFlowerFrontLeafLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_FRONT_LEAF" Offset="0x114EC" />
-        <Limb Name="gPinkDekuFlowerFrontRightPetalLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_FRONT_RIGHT_PETAL" Offset="0x114F8" />
-        <Limb Name="gPinkDekuFlowerBackRightPetalLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_BACK_RIGHT_PETAL" Offset="0x11504" />
-        <Limb Name="gPinkDekuFlowerRightLeafLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_RIGHT_LEAF" Offset="0x11510" />
-        <Limb Name="gPinkDekuFlowerFrontLeftPetalLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_FRONT_LEFT_PETAL" Offset="0x1151C" />
-        <Limb Name="gPinkDekuFlowerLeftLeafLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_LEFT_LEAF" Offset="0x11528" />
-        <Limb Name="gPinkDekuFlowerBackLeftPetalLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_BACK_LEFT_PETAL" Offset="0x11534" />
-        <Skeleton Name="gPinkDekuFlowerSkel" Type="Normal" LimbType="Standard" LimbNone="PINK_DEKU_FLOWER_LIMB_NONE" LimbMax="PINK_DEKU_FLOWER_LIMB_MAX" EnumName="PinkDekuFlowerLimb" Offset="0x11568" />
-        <Animation Name="gDekuFlowerRustleAnim" Offset="0x117F8" /> <!-- Original name is "dnp_zawa" ("rustling") -->
-        <Collision Name="gGoldDekuFlowerCol" Offset="0x11928" />
-        <DList Name="gGoldDekuFlowerIdleDL" Offset="0x11C20" />
-        <DList Name="gGoldDekuFlowerBaseDL" Offset="0x12200" />
-        <DList Name="gGoldDekuFlowerCenterDL" Offset="0x122B0" />
-        <DList Name="gGoldDekuFlowerBackLeftPetalDL" Offset="0x12358" />
-        <DList Name="gGoldDekuFlowerLeftPetalDL" Offset="0x123E0" />
-        <DList Name="gGoldDekuFlowerFrontLeftPetalDL" Offset="0x12468" />
-        <DList Name="gGoldDekuFlowerRightPetalDL" Offset="0x124F0" />
-        <DList Name="gGoldDekuFlowerBackRightPetalDL" Offset="0x12578" />
-        <DList Name="gGoldDekuFlowerFrontRightPetalDL" Offset="0x12600" />
-        <DList Name="gGoldDekuFlowerFrontPetalDL" Offset="0x12688" />
-        <DList Name="gGoldDekuFlowerBackPetalDL" Offset="0x12710" />
-        <Limb Name="gGoldDekuFlowerBaseLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_BASE" Offset="0x12798" />
-        <Limb Name="gGoldDekuFlowerCenterLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_CENTER" Offset="0x127A4" />
-        <Limb Name="gGoldDekuFlowerBackPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_BACK_PETAL" Offset="0x127B0" />
-        <Limb Name="gGoldDekuFlowerFrontPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_FRONT_PETAL" Offset="0x127BC" />
-        <Limb Name="gGoldDekuFlowerFrontRightPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_FRONT_RIGHT_PETAL" Offset="0x127C8" />
-        <Limb Name="gGoldDekuFlowerBackRightPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_BACK_RIGHT_PETAL" Offset="0x127D4" />
-        <Limb Name="gGoldDekuFlowerRightPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_RIGHT_PETAL" Offset="0x127E0" />
-        <Limb Name="gGoldDekuFlowerFrontLeftPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_FRONT_LEFT_PETAL" Offset="0x127EC" />
-        <Limb Name="gGoldDekuFlowerLeftPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_LEFT_PETAL" Offset="0x127F8" />
-        <Limb Name="gGoldDekuFlowerBackLeftPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_BACK_LEFT_PETAL" Offset="0x12804" />
-        <Skeleton Name="gGoldDekuFlowerSkel" Type="Flex" LimbType="Standard" LimbNone="GOLD_DEKU_FLOWER_LIMB_NONE" LimbMax="GOLD_DEKU_FLOWER_LIMB_MAX" EnumName="GoldDekuFlowerLimb" Offset="0x12838" />
-
-        <Animation Name="gameplay_keep_Anim_012860" Offset="0x128B0" />
-        <Animation Name="gameplay_keep_Anim_0128BC" Offset="0x1290C" />
-        <Texture Name="gameplay_keep_Tex_0128D0" OutName="tex_0128D0" Format="rgba16" Width="16" Height="128" Offset="0x12920" />
-        <Texture Name="gameplay_keep_Tex_0138D0" OutName="tex_0138D0" Format="rgba16" Width="32" Height="16" Offset="0x13920" />
-        <DList Name="gameplay_keep_DL_013FF0" Offset="0x14040" />
-        <DList Name="gameplay_keep_DL_014370" Offset="0x143C0" />
-        <Limb Name="gameplay_keep_Lodlimb_014510" Type="LOD" EnumName="ARROW_LIMB_1" Offset="0x14560" />
-        <Limb Name="gameplay_keep_Lodlimb_014520" Type="LOD" EnumName="ARROW_LIMB_2" Offset="0x14570" />
-        <Limb Name="gameplay_keep_Lodlimb_014530" Type="LOD" EnumName="ARROW_LIMB_3" Offset="0x14580" />
-        <Limb Name="gameplay_keep_Lodlimb_014540" Type="LOD" EnumName="ARROW_LIMB_4" Offset="0x14590" />
-        <Skeleton Name="gameplay_keep_Skel_014560" Type="Normal" LimbType="Standard" LimbNone="ARROW_LIMB_NONE" LimbMax="ARROW_LIMB_MAX" EnumName="ArrowLimb" Offset="0x145B0" />
-        <Texture Name="gameplay_keep_Tex_014570" OutName="tex_014570" Format="rgba32" Width="16" Height="32" Offset="0x145C0" />
-
-        <!-- Bomb -->
-        <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x14DC0" />
-        <DList Name="gBombBodyDL" Offset="0x15E00" />
-        <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x15E90" />
-        <DList Name="gBombCapDL" Offset="0x15FF0" />
-
-        <!-- Bombchu -->
-        <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x160B0" />
-        <DList Name="gBombchuDL" Offset="0x163B0" />
-        
-        <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x16520" />
-        <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x16D20" />
-        <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x17520" />
-        <Texture Name="gEffBombExplosion4Tex" OutName="eff_bomb_explosion_4" Format="ia16" Width="32" Height="32" Offset="0x17D20" />
-        <Texture Name="gEffBombExplosion5Tex" OutName="eff_bomb_explosion_5" Format="ia16" Width="32" Height="32" Offset="0x18520" />
-        <Texture Name="gEffBombExplosion6Tex" OutName="eff_bomb_explosion_6" Format="ia16" Width="32" Height="32" Offset="0x18D20" />
-        <Texture Name="gEffBombExplosion7Tex" OutName="eff_bomb_explosion_7" Format="ia16" Width="32" Height="32" Offset="0x19520" />
-        <Texture Name="gEffBombExplosion8Tex" OutName="eff_bomb_explosion_8" Format="ia16" Width="32" Height="32" Offset="0x19D20" />
-        <DList Name="gEffBombExplosion1DL" Offset="0x1A520" />
-        <DList Name="gEffBombExplosion2DL" Offset="0x1A588" />
-        <DList Name="gEffBombExplosion3DL" Offset="0x1A5E0" />
-        <DList Name="gEffFragments1DL" Offset="0x1A670" />
-        <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0x1A700" />
-        <Texture Name="gameplay_keep_Tex_01A8B0" OutName="tex_01A8B0" Format="i8" Width="16" Height="32" Offset="0x1A900" />
-        <Texture Name="gameplay_keep_Tex_01AAB0" OutName="tex_01AAB0" Format="i8" Width="16" Height="32" Offset="0x1AB00" />
-        <DList Name="gameplay_keep_DL_01ACF0" Offset="0x1AD40" />
-
-        <!-- Human Elegy of Emptiness Shell -->
-        <DList Name="gElegyShellHumanDL" Offset="0x1C480" /> <!-- Original name is "pls_zo_model" -->
-        <Texture Name="gElegyShellHumanMouthTex" OutName="elegy_shell_human_mouth" Format="rgba16" Width="32" Height="32" Offset="0x1CB48" />
-        <Texture Name="gElegyShellHumanEyeAndNoseTex" OutName="elegy_shell_human_eye_and_nose" Format="rgba16" Width="32" Height="64" Offset="0x1D348" />
-        <Texture Name="gElegyShellHumanNostrilsAndSkinTex" OutName="elegy_shell_human_nostrils_and_skin" Format="rgba16" Width="16" Height="8" Offset="0x1E348" />
-        <Texture Name="gElegyShellHumanBootsTex" OutName="elegy_shell_human_boots" Format="rgba16" Width="16" Height="16" Offset="0x1E448" />
-        <Texture Name="gElegyShellHumanPlatformTex" OutName="elegy_shell_human_platform" Format="rgba16" Width="8" Height="16" Offset="0x1E648" />
-        <Texture Name="gElegyShellBeltAndTunicTex" OutName="elegy_shell_human_belt_and_tunic" Format="rgba16" Width="32" Height="16" Offset="0x1E748" />
-        <Texture Name="gElegyShellHumanHairTex" OutName="elegy_shell_human_hair" Format="rgba16" Width="16" Height="16" Offset="0x1EB48" />
-
-        <DList Name="gCompassArrowDL" Offset="0x1ED50" />
-        <DList Name="gameplay_keep_DL_01ED90" Offset="0x1EDE0" />
-        <DList Name="gZTargetArrowDL" Offset="0x1F140" />
-        <Texture Name="gameplay_keep_Tex_01F200" OutName="tex_01F200" Format="i8" Width="8" Height="8" Offset="0x1F250" />
-        <DList Name="gEffFragments2DL" Offset="0x1F350" />
-        <Texture Name="gameplay_keep_Tex_01F340" OutName="tex_01F340" Format="ia8" Width="32" Height="32" Offset="0x1F390" />
-        <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0x1F790" />
-        <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0x1F810" />
-        <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0x1F910" />
-
-        <!-- Boulder Fragments -->
-        <DList Name="gBoulderFragmentsDL" Offset="0x1FA90" />
-        <Texture Name="gBoulderFragmentsTex" OutName="boulder_fragments" Format="rgba16" Width="32" Height="32" Offset="0x1FC30" />
-
-        <Animation Name="gameplay_keep_Anim_0204B4" Offset="0x20504" />
-        <Animation Name="gameplay_keep_Anim_0205A0" Offset="0x205F0" />
-        <Animation Name="gameplay_keep_Anim_020658" Offset="0x206A8" />
-        <DList Name="gameplay_keep_DL_020B30" Offset="0x20B80" />
-        <DList Name="gDoorLeftDL" Offset="0x20C08" />
-        <DList Name="gDoorRightDL" Offset="0x20D50" />
-        <Texture Name="gameplay_keep_Tex_020E38" OutName="tex_020E38" Format="rgba16" Width="32" Height="64" Offset="0x20E88" />
-        <DList Name="gameplay_keep_DL_0221B8" Offset="0x22208" />
-        <Texture Name="gameplay_keep_Tex_0222E8" OutName="tex_0222E8" Format="i4" Width="32" Height="64" Offset="0x22338" />
-        <Texture Name="gameplay_keep_Tex_0226E8" OutName="tex_0226E8" Format="i8" Width="8" Height="128" Offset="0x22738" />
-        <Limb Name="gameplay_keep_Standardlimb_022AE8" Type="Standard" EnumName="DOOR_LIMB_1" Offset="0x22B38" />
-        <Limb Name="gameplay_keep_Standardlimb_022AF4" Type="Standard" EnumName="DOOR_LIMB_2" Offset="0x22B44" />
-        <Limb Name="gameplay_keep_Standardlimb_022B00" Type="Standard" EnumName="DOOR_LIMB_3" Offset="0x22B50" />
-        <Limb Name="gameplay_keep_Standardlimb_022B0C" Type="Standard" EnumName="DOOR_LIMB_4" Offset="0x22B5C" />
-        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" LimbNone="DOOR_LIMB_NONE" LimbMax="DOOR_LIMB_MAX" EnumName="DoorLimb" Offset="0x22B78" />
-        <Animation Name="gameplay_keep_Anim_022BE8" Offset="0x22C38" />
-        <Animation Name="gameplay_keep_Anim_022CA8" Offset="0x22CF8" />
-        <Animation Name="gameplay_keep_Anim_022D90" Offset="0x22DE0" />
-        <Animation Name="gameplay_keep_Anim_022E68" Offset="0x22EB8" />
-        <Blob Name="gameplay_keep_zeroes_unk_00022E78" Size="0xA8" Offset="0x22EC8" />
-        <Animation Name="gameplay_keep_Anim_022FF0" Offset="0x23040" />
-        <Collision Name="gDoorCol" Offset="0x23150" />
-        <DList Name="gEffDustDL" Offset="0x23180" />
-        <DList Name="gEffFlash1DL" Offset="0x23260" />
-        <DList Name="gEffFlash2DL" Offset="0x232D8" />
-        <DList Name="gLightOrbMaterial1DL" Offset="0x23398" />
-        <DList Name="gLightOrbMaterial2DL" Offset="0x23408" />
-        <DList Name="gLightOrbModelDL" Offset="0x23478" />
-        <DList Name="gElectricSparkMaterialDL" Offset="0x234D0" />
-        <DList Name="gElectricSparkModelDL" Offset="0x23540" />
-        <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x23558" />
-
-        <!-- EnMThunder (Spin Attack and Sword Beams) -->
-        <!-- Spin Attack -->
-        <Texture Name="gSpinAttack1Tex" OutName="spin_attack_1" Format="i8" Width="64" Height="32" Offset="0x24560" />
-        <Texture Name="gSpinAttack2Tex" OutName="spin_attack_2" Format="i8" Width="64" Height="32" Offset="0x24D60" />
-        <DList Name="gSpinAttackDiskDL" Offset="0x258A0" />
-        <DList Name="gSpinAttackCylinderDL" Offset="0x259C0" />
-        <DList Name="gGreatSpinAttackDiskDL" Offset="0x25E20" />
-        <DList Name="gGreatSpinAttackCylinderDL" Offset="0x25F40" />
-        <Texture Name="gSpinAttackCharging1Tex" OutName="spin_attack_charging_1" Format="i8" Width="32" Height="32" Offset="0x26060" />
-        <Texture Name="gSpinAttackCharging2Tex" OutName="spin_attack_charging_2" Format="i8" Width="32" Height="32" Offset="0x26460" />
-        <DList Name="gSpinAttackChargingDL" Offset="0x26940" />
-        <!-- Sword Beam -->
-        <Texture Name="gSwordBeam1Tex" OutName="sword_beam_1" Format="i8" Width="32" Height="64" Offset="0x26A30" />
-        <Texture Name="gSwordBeam2Tex" OutName="sword_beam_2" Format="i8" Width="32" Height="64" Offset="0x27230" />
-        <DList Name="gSwordBeamDL" Offset="0x27CF0" />
-
-        <KeyFrameAnimation Name="gGameplayKeepKFAnim_281DC" Skel="0x2905C" Offset="0x2822C"/>
-
-        <DList Name="gameplay_keep_DL_0282D0" Offset="0x28320" />
-        <Texture Name="gameplay_keep_Tex_0283B8" OutName="tex_0283B8" Format="i4" Width="64" Height="64" Offset="0x28408" />
-        <Texture Name="gameplay_keep_Tex_028BB8" OutName="tex_028BB8" Format="i8" Width="32" Height="32" Offset="0x28C08" />
-        <TextureAnimation Name="gameplay_keep_Matanimheader_028FEC" Offset="0x2903C" />
-        <KeyFrameSkel Name="gGameplayKeepKFSkel_2900C" LimbType="Flex" Offset="0x2905C"/>
-        <Animation Name="gameplay_keep_Anim_029140" Offset="0x29190" />
-        <Texture Name="gameplay_keep_Tex_029150" OutName="tex_029150" Format="i8" Width="32" Height="64" Offset="0x291A0" />
-        <DList Name="gameplay_keep_DL_029990" Offset="0x299E0" />
-        <DList Name="gameplay_keep_DL_029A58" Offset="0x29AA8" />
-        <DList Name="gameplay_keep_DL_029B20" Offset="0x29B70" />
-        <DList Name="gameplay_keep_DL_029BE8" Offset="0x29C38" />
-        <DList Name="gameplay_keep_DL_029CB0" Offset="0x29D00" />
-        <DList Name="gameplay_keep_DL_029CF0" Offset="0x29D40" />
-        <DList Name="gameplay_keep_DL_029D10" Offset="0x29D60" /> <!-- Used in ObJ_Kinoko to radiate a purple glow -->
-        <Texture Name="gameplay_keep_Tex_029EF8" OutName="tex_029EF8" Format="rgba16" Width="32" Height="64" Offset="0x29F48" />
-        <Limb Name="gameplay_keep_Standardlimb_02AEF8" Type="Standard" EnumName="FAIRY_LIMB_1" Offset="0x2AF48" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF04" Type="Standard" EnumName="FAIRY_LIMB_2" Offset="0x2AF54" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF10" Type="Standard" EnumName="FAIRY_LIMB_3" Offset="0x2AF60" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF1C" Type="Standard" EnumName="FAIRY_LIMB_4" Offset="0x2AF6C" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF28" Type="Standard" EnumName="FAIRY_LIMB_5" Offset="0x2AF78" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF34" Type="Standard" EnumName="FAIRY_LIMB_6" Offset="0x2AF84" />
-        <Skeleton Name="gameplay_keep_Skel_02AF58" Type="Flex" LimbType="Standard" LimbNone="FAIRY_LIMB_NONE" LimbMax="FAIRY_LIMB_MAX" EnumName="FairyLimb" Offset="0x2AFA8" />
-        <Animation Name="gameplay_keep_Anim_02B2E8" Offset="0x2B338" />
-
-        <!-- Stray Fairy -->
-        <Animation Name="gStrayFairyFlyingAnim" Offset="0x2B4E4" /> <!-- Original name is "ys_fly01" -->
-        <DList Name="gStrayFairyRightFacingHeadDL" Offset="0x2B700" />
-        <DList Name="gStrayFairyLeftFacingHeadDL" Offset="0x2B798" />
-        <DList Name="gStrayFairyGlowDL" Offset="0x2B830" />
-        <DList Name="gStrayFairyTorsoDL" Offset="0x2B8D8" />
-        <DList Name="gStrayFairyLeftArmDL" Offset="0x2B970" />
-        <DList Name="gStrayFairyPelvisAndLegsDL" Offset="0x2BA08" />
-        <DList Name="gStrayFairyRightArmDL" Offset="0x2BAB8" />
-        <DList Name="gStrayFairyRightWingDL" Offset="0x2BB50" />
-        <DList Name="gStrayFairyLeftWingDL" Offset="0x2BBE8" />
-        <Texture Name="gStrayFairyRightFacingHeadTex" OutName="stray_fairy_right_facing_head" Format="ia8" Width="32" Height="32" Offset="0x2BC80" />
-        <Texture Name="gStrayFairyBodyTex" OutName="stray_fairy_body" Format="ia8" Width="16" Height="32" Offset="0x2C080" />
-        <Texture Name="gStrayFairyLeftFacingHeadTex" OutName="stray_fairy_left_facing_head" Format="ia8" Width="32" Height="32" Offset="0x2C280" />
-        <Texture Name="gStrayFairyWingTex" OutName="stray_fairy_wing" Format="ia8" Width="16" Height="16" Offset="0x2C680" />
-        <Texture Name="gStrayFairyGlowTex" OutName="stray_fairy_glow" Format="i4" Width="16" Height="16" Offset="0x2C780" />
-        <TextureAnimation Name="gStrayFairyClockTownTexAnim" Offset="0x2C868" />
-        <TextureAnimation Name="gStrayFairySnowheadTexAnim" Offset="0x2C8E0" />
-        <TextureAnimation Name="gStrayFairyWoodfallTexAnim" Offset="0x2C958" />
-        <TextureAnimation Name="gStrayFairyGreatBayTexAnim" Offset="0x2C9D0" />
-        <TextureAnimation Name="gStrayFairyStoneTowerTexAnim" Offset="0x2CA48" />
-        <Limb Name="gStrayFairyRightFacingHeadLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_RIGHT_FACING_HEAD" Offset="0x2CA58" />
-        <Limb Name="gStrayFairyLeftWingLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_LEFT_WING" Offset="0x2CA64" />
-        <Limb Name="gStrayFairyRightWingLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_RIGHT_WING" Offset="0x2CA70" />
-        <Limb Name="gStrayFairyGlowLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_GLOW" Offset="0x2CA7C" />
-        <Limb Name="gStrayFairyTorsoLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_TORSO" Offset="0x2CA88" />
-        <Limb Name="gStrayFairyRightArmLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_RIGHT_ARM" Offset="0x2CA94" />
-        <Limb Name="gStrayFairyPelvisAndLegsLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_PELVIS_AND_LEGS" Offset="0x2CAA0" />
-        <Limb Name="gStrayFairyLeftArmLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_LEFT_ARM" Offset="0x2CAAC" />
-        <Limb Name="gStrayFairyLeftFacingHeadLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_LEFT_FACING_HEAD" Offset="0x2CAB8" />
-        <Skeleton Name="gStrayFairySkel" Type="Flex" LimbType="Standard" LimbNone="STRAY_FAIRY_LIMB_NONE" LimbMax="STRAY_FAIRY_LIMB_MAX" EnumName="StrayFairyLimb" Offset="0x2CAE8" />
-
-        <Texture Name="gameplay_keep_Tex_02CAB0" OutName="tex_02CAB0" Format="i4" Width="16" Height="16" Offset="0x2CB00" />
-        <Texture Name="gameplay_keep_Tex_02CB30" OutName="tex_02CB30" Format="i8" Width="16" Height="16" Offset="0x2CB80" />
-        <Texture Name="gameplay_keep_Tex_02CC30" OutName="tex_02CC30" Format="rgba16" Width="32" Height="32" Offset="0x2CC80" />
-        <Texture Name="gameplay_keep_Tex_02D430" OutName="tex_02D430" Format="i8" Width="32" Height="64" Offset="0x2D480" />
-        <Texture Name="gameplay_keep_Tex_02DC30" OutName="tex_02DC30" Format="i8" Width="32" Height="64" Offset="0x2DC80" />
-        <DList Name="gameplay_keep_DL_02E510" Offset="0x2E560" />
-        <Animation Name="gameplay_keep_Anim_02E65C" Offset="0x2E6AC" />
-        <DList Name="gameplay_keep_DL_02E910" Offset="0x2E960" />
-        <DList Name="gameplay_keep_DL_02E9A8" Offset="0x2E9F8" />
-        <DList Name="gameplay_keep_DL_02EAB8" Offset="0x2EB08" />
-        <Texture Name="gameplay_keep_Tex_02EBC8" OutName="tex_02EBC8" Format="rgba16" Width="16" Height="16" Offset="0x2EC18" />
-        <Texture Name="gameplay_keep_Tex_02EDC8" OutName="tex_02EDC8" Format="rgba16" Width="32" Height="8" Offset="0x2EE18" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFC8" Type="Standard" EnumName="FISH_LIMB_1" Offset="0x2F018" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFD4" Type="Standard" EnumName="FISH_LIMB_2" Offset="0x2F024" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFE0" Type="Standard" EnumName="FISH_LIMB_3" Offset="0x2F030" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFEC" Type="Standard" EnumName="FISH_LIMB_4" Offset="0x2F03C" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFF8" Type="Standard" EnumName="FISH_LIMB_5" Offset="0x2F048" />
-        <Limb Name="gameplay_keep_Standardlimb_02F004" Type="Standard" EnumName="FISH_LIMB_6" Offset="0x2F054" />
-        <Skeleton Name="gameplay_keep_Skel_02F028" Type="Flex" LimbType="Standard" LimbNone="FISH_LIMB_NONE" LimbMax="FISH_LIMB_MAX" EnumName="FishLimb" Offset="0x2F078" />
-        <Animation Name="gameplay_keep_Anim_02F0EC" Offset="0x2F13C" />
-        <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x2F150" />
-
-        <DList Name="gEffShockwaveDL" Offset="0x30150" />
-        <Array Name="gEffShockwaveVtx" Count="4" Offset="0x301C0">
-            <Vtx/>
-        </Array>
-        <DList Name="gEffBubbleDL" Offset="0x30200" />
-
-        <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x302C0" />
-        <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x306C0" />
-        <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x30AC0" />
-        <Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x30EC0" />
-        <Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x312C0" />
-        <Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x316C0" />
-        <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x31AC0" />
-        <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x31EC0" />
-        <DList Name="gEffFireFootprintDL" Offset="0x322C0" />
-        <Texture Name="gameplay_keep_Tex_032310" OutName="tex_032310" Format="rgba32" Width="16" Height="64" Offset="0x32360" />
-        <Texture Name="gEffHitmarkWhiteMetal1Tex" OutName="eff_hitmark_white_metal_1" Format="i4" Width="32" Height="24" Offset="0x33360" />
-        <Texture Name="gEffHitmarkWhiteMetal2Tex" OutName="eff_hitmark_white_metal_2" Format="i4" Width="32" Height="24" Offset="0x334E0" />
-        <Texture Name="gEffHitmarkWhiteMetal3Tex" OutName="eff_hitmark_white_metal_3" Format="i4" Width="32" Height="24" Offset="0x33660" />
-        <Texture Name="gEffHitmarkWhiteMetal4Tex" OutName="eff_hitmark_white_metal_4" Format="i4" Width="32" Height="24" Offset="0x337E0" />
-        <Texture Name="gEffHitmarkWhiteMetal5Tex" OutName="eff_hitmark_white_metal_5" Format="i4" Width="32" Height="24" Offset="0x33960" />
-        <Texture Name="gEffHitmarkWhiteMetal6Tex" OutName="eff_hitmark_white_metal_6" Format="i4" Width="32" Height="24" Offset="0x33AE0" />
-        <Texture Name="gEffHitmarkWhiteMetal7Tex" OutName="eff_hitmark_white_metal_7" Format="i4" Width="32" Height="24" Offset="0x33C60" />
-        <Texture Name="gEffHitmarkWhiteMetal8Tex" OutName="eff_hitmark_white_metal_8" Format="i4" Width="32" Height="24" Offset="0x33DE0" />
-        <Texture Name="gEffHitmarkDust1Tex" OutName="eff_hitmark_dust_1" Format="i4" Width="32" Height="24" Offset="0x33F60" />
-        <Texture Name="gEffHitmarkDust2Tex" OutName="eff_hitmark_dust_2" Format="i4" Width="32" Height="24" Offset="0x340E0" />
-        <Texture Name="gEffHitmarkDust3Tex" OutName="eff_hitmark_dust_3" Format="i4" Width="32" Height="24" Offset="0x34260" />
-        <Texture Name="gEffHitmarkDust4Tex" OutName="eff_hitmark_dust_4" Format="i4" Width="32" Height="24" Offset="0x343E0" />
-        <Texture Name="gEffHitmarkDust5Tex" OutName="eff_hitmark_dust_5" Format="i4" Width="32" Height="24" Offset="0x34560" />
-        <Texture Name="gEffHitmarkDust6Tex" OutName="eff_hitmark_dust_6" Format="i4" Width="32" Height="24" Offset="0x346E0" />
-        <Texture Name="gEffHitmarkDust7Tex" OutName="eff_hitmark_dust_7" Format="i4" Width="32" Height="24" Offset="0x34860" />
-        <Texture Name="gEffHitmarkDust8Tex" OutName="eff_hitmark_dust_8" Format="i4" Width="32" Height="24" Offset="0x349E0" />
-        <Texture Name="gEffHitmarkRed1Tex" OutName="eff_hitmark_red_1" Format="i4" Width="32" Height="24" Offset="0x34B60" />
-        <Texture Name="gEffHitmarkRed2Tex" OutName="eff_hitmark_red_2" Format="i4" Width="32" Height="24" Offset="0x34CE0" />
-        <Texture Name="gEffHitmarkRed3Tex" OutName="eff_hitmark_red_3" Format="i4" Width="32" Height="24" Offset="0x34E60" />
-        <Texture Name="gEffHitmarkRed4Tex" OutName="eff_hitmark_red_4" Format="i4" Width="32" Height="24" Offset="0x34FE0" />
-        <Texture Name="gEffHitmarkRed5Tex" OutName="eff_hitmark_red_5" Format="i4" Width="32" Height="24" Offset="0x35160" />
-        <Texture Name="gEffHitmarkRed6Tex" OutName="eff_hitmark_red_6" Format="i4" Width="32" Height="24" Offset="0x352E0" />
-        <Texture Name="gEffHitmarkRed7Tex" OutName="eff_hitmark_red_7" Format="i4" Width="32" Height="24" Offset="0x35460" />
-        <Texture Name="gEffHitmarkRed8Tex" OutName="eff_hitmark_red_8" Format="i4" Width="32" Height="24" Offset="0x355E0" />
-        <DList Name="gEffHitmarkDL" Offset="0x35760" />
-        <Texture Name="gameplay_keep_Tex_0357B0" OutName="tex_0357B0" Format="ia8" Width="32" Height="64" Offset="0x35800" />
-        <Texture Name="gameplay_keep_Tex_035FB0" OutName="tex_035FB0" Format="ia8" Width="32" Height="64" Offset="0x36000" />
-        <Texture Name="gEffWaterRippleTex" OutName="eff_water_ripple" Format="i8" Width="64" Height="64" Offset="0x36800" />
-        <DList Name="gEffWaterRippleDL" Offset="0x37800" />
-        <DList Name="gEffSparkDL" Offset="0x378A0" />
-        <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x37940" />
-        <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x37E40" />
-        <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x38340" />
-        <Texture Name="gEffWaterSplash4Tex" OutName="eff_water_splash_4" Format="i8" Width="32" Height="40" Offset="0x38840" />
-        <Texture Name="gEffWaterSplash5Tex" OutName="eff_water_splash_5" Format="i8" Width="32" Height="40" Offset="0x38D40" />
-        <Texture Name="gEffWaterSplash6Tex" OutName="eff_water_splash_6" Format="i8" Width="32" Height="40" Offset="0x39240" />
-        <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x39740" />
-        <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x39C40" />
-        <DList Name="gEffWaterSplashDL" Offset="0x3A140" />
-        <Texture Name="gEffStone1Tex" OutName="eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x3A1E0" />
-        <Texture Name="gEffStone2Tex" OutName="eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x3A5E0" />
-        <Texture Name="gEffStone3Tex" OutName="eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x3A9E0" />
-        <Texture Name="gEffStone4Tex" OutName="eff_stone_4" Format="ia8" Width="32" Height="32" Offset="0x3ADE0" />
-        <Texture Name="gEffStone5Tex" OutName="eff_stone_5" Format="ia8" Width="32" Height="32" Offset="0x3B1E0" />
-        <Texture Name="gEffStone6Tex" OutName="eff_stone_6" Format="ia8" Width="32" Height="32" Offset="0x3B5E0" />
-        <Texture Name="gEffStone7Tex" OutName="eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x3B9E0" />
-        <Texture Name="gEffStone8Tex" OutName="eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x3BDE0" />
-        <DList Name="gEffStoneDL" Offset="0x3C1E0" />
-        <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i4" Width="32" Height="96" Offset="0x3C280" />
-        <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i4" Width="32" Height="96" Offset="0x3C880" />
-        <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i4" Width="32" Height="96" Offset="0x3CE80" />
-        <Texture Name="gEffLightning4Tex" OutName="eff_lightning_4" Format="i4" Width="32" Height="96" Offset="0x3D480" />
-        <Texture Name="gEffLightning5Tex" OutName="eff_lightning_5" Format="i4" Width="32" Height="96" Offset="0x3DA80" />
-        <Texture Name="gEffLightning6Tex" OutName="eff_lightning_6" Format="i4" Width="32" Height="96" Offset="0x3E080" />
-        <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i4" Width="32" Height="96" Offset="0x3E680" />
-        <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i4" Width="32" Height="96" Offset="0x3EC80" />
-        <DList Name="gEffLightningDL" Offset="0x3F280" />
-        <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x3F350" />
-        <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x3FB50" />
-        <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x40350" />
-        <Texture Name="gEffEnemyDeathFlame4Tex" OutName="eff_enemy_death_flame_4" Format="i8" Width="32" Height="64" Offset="0x40B50" />
-        <Texture Name="gEffEnemyDeathFlame5Tex" OutName="eff_enemy_death_flame_5" Format="i8" Width="32" Height="64" Offset="0x41350" />
-        <Texture Name="gEffEnemyDeathFlame6Tex" OutName="eff_enemy_death_flame_6" Format="i8" Width="32" Height="64" Offset="0x41B50" />
-        <Texture Name="gEffEnemyDeathFlame7Tex" OutName="eff_enemy_death_flame_7" Format="i8" Width="32" Height="64" Offset="0x42350" />
-        <Texture Name="gEffEnemyDeathFlame8Tex" OutName="eff_enemy_death_flame_8" Format="i8" Width="32" Height="64" Offset="0x42B50" />
-        <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x43350" />
-        <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x43B50" />
-        <DList Name="gEffEnemyDeathFlameDL" Offset="0x44350" />
-        <Texture Name="gameplay_keep_Tex_0443B0" OutName="tex_0443B0" Format="i8" Width="32" Height="32" Offset="0x44400" />
-        <Texture Name="gameplay_keep_Tex_0447B0" OutName="tex_0447B0" Format="i8" Width="32" Height="32" Offset="0x44800" />
-        <Texture Name="gameplay_keep_Tex_044BB0" OutName="tex_044BB0" Format="i8" Width="32" Height="32" Offset="0x44C00" />
-        <Texture Name="gEffIceFragmentTex" OutName="eff_ice_fragment" Format="i8" Width="32" Height="32" Offset="0x45000" />
-        <Texture Name="gameplay_keep_Tex_0453B0" OutName="tex_0453B0" Format="i8" Width="32" Height="32" Offset="0x45400" />
-
-        <!-- Goron Elegy of Emptiness Shell -->
-        <DList Name="gElegyShellGoronDL" Offset="0x48E40" /> <!-- Original name is "pgs_zo_model" -->
-        <Texture Name="gElegyShellGoronTLUT" OutName="elegy_shell_goron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4A4B0" />
-        <Texture Name="gElegyShellGoronSkinTex" OutName="elegy_shell_goron_skin" Format="ci8" Width="16" Height="16" Offset="0x4A6B0" />
-        <Texture Name="gElegyShellGoronHairTex" OutName="elegy_shell_goron_hair" Format="ci8" Width="16" Height="32" Offset="0x4A7B0" />
-        <Texture Name="gElegyShellGoronSideburnsAndBeardTex" OutName="elegy_shell_goron_sideburns_and_beard" Format="ci8" Width="16" Height="16" Offset="0x4A9B0" />
-        <Texture Name="gElegyShellGoronNostrilTex" OutName="elegy_shell_goron_nostril" Format="ci8" Width="8" Height="8" Offset="0x4AAB0" />
-        <Texture Name="gElegyShellGoronLipsTex" OutName="elegy_shell_goron_lips" Format="ci8" Width="8" Height="8" Offset="0x4AAF0" />
-        <Texture Name="gElegyShellGoronGlovePalmTex" OutName="elegy_shell_goron_glove_palm" Format="ci8" Width="16" Height="16" Offset="0x4AB30" />
-        <Texture Name="gElegyShellGoronGloveBackTex" OutName="elegy_shell_goron_glove_back" Format="ci8" Width="8" Height="16" Offset="0x4AC30" />
-        <Texture Name="gElegyShellGoronFingerAndToeTex" OutName="elegy_shell_goron_finger_and_toe" Format="ci8" Width="8" Height="16" Offset="0x4ACB0" />
-        <Texture Name="gElegyShellGoronSandalTopAndSideTex" OutName="elegy_shell_goron_sandal_top_and_side" Format="ci8" Width="8" Height="8" Offset="0x4AD30" />
-        <Texture Name="gElegyShellGoronChestTex" OutName="elegy_shell_goron_chest" Format="ci8" Width="32" Height="32" Offset="0x4AD70" />
-        <Texture Name="gElegyShellGoronBackTex" OutName="elegy_shell_goron_back" Format="ci8" Width="32" Height="64" Offset="0x4B170" />
-        <Texture Name="gElegyShellGoronGoronsRubyTattooTex" OutName="elegy_shell_goron_gorons_ruby_tattoo" Format="ci8" Width="32" Height="64" Offset="0x4B970" />
-        <Texture Name="gElegyShellGoronTribalTattooTex" OutName="elegy_shell_goron_tribal_tattoo" Format="ci8" Width="32" Height="64" Offset="0x4C170" />
-        <Texture Name="gElegyShellGoronLoinclothTex" OutName="elegy_shell_goron_loincloth" Format="ci8" Width="8" Height="16" Offset="0x4C970" />
-        <Texture Name="gElegyShellGoronEyeTex" OutName="elegy_shell_goron_eye" Format="ci8" Width="32" Height="32" Offset="0x4C9F0" />
-        <Texture Name="gElegyShellGoronScarTex" OutName="elegy_shell_goron_scar" Format="rgba16" Width="32" Height="64" Offset="0x4CDF0" />
-        <Texture Name="gElegyShellGoronNecklaceTex" OutName="elegy_shell_goron_necklace" Format="i8" Width="32" Height="32" Offset="0x4DDF0" />
-        <Texture Name="gElegyShellGoronPlatformTex" OutName="elegy_shell_goron_platform" Format="ci8" Width="8" Height="16" Offset="0x4E1F0" />
-
-        <Texture Name="gHookshotReticleTex" OutName="tex_04E220" Format="i8" Width="64" Height="64" Offset="0x4E270" />
-        <DList Name="gHookshotReticleDL" Offset="0x4F2A0" /> <!-- Original name might be "pointer_modelT" -->
-        <Texture Name="gameplay_keep_Tex_04F2C0" OutName="tex_04F2C0" Format="ia16" Width="32" Height="64" Offset="0x4F310" />
-        <DList Name="gEffIceFragment1DL" Offset="0x505A0" />
-        <DList Name="gEffIceFragment2MaterialDL" Offset="0x50698" />
-        <DList Name="gEffIceFragment2ModelDL" Offset="0x50730" />
-        <DList Name="gEffIceFragment3DL" Offset="0x50D60" />
-        <Texture Name="gEffIceSmokeTex" OutName="eff_ice_smoke" Format="i4" Width="32" Height="32" Offset="0x50ED0" />
-        <DList Name="gEffIceSmokeDL" Offset="0x51100" />
-        <DList Name="gFrozenSteamMaterialDL" Offset="0x511D0" />
-        <DList Name="gFrozenSteamModelDL" Offset="0x51288" />
-        <Animation Name="gameplay_keep_Anim_05140C" Offset="0x5145C" />
-        <DList Name="gameplay_keep_DL_051420" Offset="0x51470" />
-        <DList Name="gameplay_keep_DL_0514C0" Offset="0x51510" />
-        <DList Name="gameplay_keep_DL_0514D0" Offset="0x51520" />
-        <DList Name="gameplay_keep_DL_051510" Offset="0x51560" />
-        <DList Name="gameplay_keep_DL_0515B0" Offset="0x51600" />
-        <DList Name="gameplay_keep_DL_0515C0" Offset="0x51610" />
-        <DList Name="gameplay_keep_DL_051600" Offset="0x51650" />
-        <DList Name="gameplay_keep_DL_0516A0" Offset="0x516F0" />
-        <DList Name="gameplay_keep_DL_0516B0" Offset="0x51700" />
-        <DList Name="gameplay_keep_DL_0516F0" Offset="0x51740" />
-        <DList Name="gameplay_keep_DL_051790" Offset="0x517E0" />
-        <DList Name="gameplay_keep_DL_0517A0" Offset="0x517F0" />
-        <DList Name="gameplay_keep_DL_0517E0" Offset="0x51830" />
-        <DList Name="gameplay_keep_DL_051880" Offset="0x518D0" />
-        <DList Name="gameplay_keep_DL_051890" Offset="0x518E0" />
-        <DList Name="gameplay_keep_DL_0518D0" Offset="0x51920" />
-        <DList Name="gameplay_keep_DL_051970" Offset="0x519C0" />
-        <DList Name="gameplay_keep_DL_051980" Offset="0x519D0" />
-        <DList Name="gameplay_keep_DL_0519C0" Offset="0x51A10" />
-        <DList Name="gameplay_keep_DL_051A60" Offset="0x51AB0" />
-        <DList Name="gameplay_keep_DL_051A70" Offset="0x51AC0" />
-        <DList Name="gameplay_keep_DL_051AB0" Offset="0x51B00" />
-        <DList Name="gameplay_keep_DL_051B50" Offset="0x51BA0" />
-        <DList Name="gameplay_keep_DL_051B60" Offset="0x51BB0" />
-        <DList Name="gameplay_keep_DL_051BA0" Offset="0x51BF0" />
-        <DList Name="gameplay_keep_DL_051C50" Offset="0x51CA0" />
-        <DList Name="gameplay_keep_DL_051C60" Offset="0x51CB0" />
-        <Texture Name="gameplay_keep_Tex_051D30" OutName="tex_051D30" Format="rgba16" Width="16" Height="64" Offset="0x51D80" />
-        <Texture Name="gameplay_keep_Tex_052530" OutName="tex_052530" Format="rgba16" Width="8" Height="16" Offset="0x52580" />
-        <Limb Name="gameplay_keep_Standardlimb_052630" Type="Standard" EnumName="BUG_LIMB_01" Offset="0x52680" />
-        <Limb Name="gameplay_keep_Standardlimb_05263C" Type="Standard" EnumName="BUG_LIMB_02" Offset="0x5268C" />
-        <Limb Name="gameplay_keep_Standardlimb_052648" Type="Standard" EnumName="BUG_LIMB_03" Offset="0x52698" />
-        <Limb Name="gameplay_keep_Standardlimb_052654" Type="Standard" EnumName="BUG_LIMB_04" Offset="0x526A4" />
-        <Limb Name="gameplay_keep_Standardlimb_052660" Type="Standard" EnumName="BUG_LIMB_05" Offset="0x526B0" />
-        <Limb Name="gameplay_keep_Standardlimb_05266C" Type="Standard" EnumName="BUG_LIMB_06" Offset="0x526BC" />
-        <Limb Name="gameplay_keep_Standardlimb_052678" Type="Standard" EnumName="BUG_LIMB_07" Offset="0x526C8" />
-        <Limb Name="gameplay_keep_Standardlimb_052684" Type="Standard" EnumName="BUG_LIMB_08" Offset="0x526D4" />
-        <Limb Name="gameplay_keep_Standardlimb_052690" Type="Standard" EnumName="BUG_LIMB_09" Offset="0x526E0" />
-        <Limb Name="gameplay_keep_Standardlimb_05269C" Type="Standard" EnumName="BUG_LIMB_0A" Offset="0x526EC" />
-        <Limb Name="gameplay_keep_Standardlimb_0526A8" Type="Standard" EnumName="BUG_LIMB_0B" Offset="0x526F8" />
-        <Limb Name="gameplay_keep_Standardlimb_0526B4" Type="Standard" EnumName="BUG_LIMB_0C" Offset="0x52704" />
-        <Limb Name="gameplay_keep_Standardlimb_0526C0" Type="Standard" EnumName="BUG_LIMB_0D" Offset="0x52710" />
-        <Limb Name="gameplay_keep_Standardlimb_0526CC" Type="Standard" EnumName="BUG_LIMB_0E" Offset="0x5271C" />
-        <Limb Name="gameplay_keep_Standardlimb_0526D8" Type="Standard" EnumName="BUG_LIMB_0F" Offset="0x52728" />
-        <Limb Name="gameplay_keep_Standardlimb_0526E4" Type="Standard" EnumName="BUG_LIMB_10" Offset="0x52734" />
-        <Limb Name="gameplay_keep_Standardlimb_0526F0" Type="Standard" EnumName="BUG_LIMB_11" Offset="0x52740" />
-        <Limb Name="gameplay_keep_Standardlimb_0526FC" Type="Standard" EnumName="BUG_LIMB_12" Offset="0x5274C" />
-        <Limb Name="gameplay_keep_Standardlimb_052708" Type="Standard" EnumName="BUG_LIMB_13" Offset="0x52758" />
-        <Limb Name="gameplay_keep_Standardlimb_052714" Type="Standard" EnumName="BUG_LIMB_14" Offset="0x52764" />
-        <Limb Name="gameplay_keep_Standardlimb_052720" Type="Standard" EnumName="BUG_LIMB_15" Offset="0x52770" />
-        <Limb Name="gameplay_keep_Standardlimb_05272C" Type="Standard" EnumName="BUG_LIMB_16" Offset="0x5277C" />
-        <Limb Name="gameplay_keep_Standardlimb_052738" Type="Standard" EnumName="BUG_LIMB_17" Offset="0x52788" />
-        <Skeleton Name="gameplay_keep_Skel_0527A0" Type="Normal" LimbType="Standard" LimbNone="BUG_LIMB_NONE" LimbMax="BUG_LIMB_MAX" EnumName="BugLimb" Offset="0x527F0" />
-        <DList Name="gKakeraLeafMiddleDL" Offset="0x52840" />
-        <DList Name="gKakeraLeafTipDL" Offset="0x52900" />
-        <Texture Name="gameplay_keep_Tex_052940" OutName="tex_052940" Format="rgba16" Width="32" Height="32" Offset="0x52990" />
-        <Texture Name="gameplay_keep_Tex_053140" OutName="tex_053140" Format="rgba16" Width="32" Height="32" Offset="0x53190" />
-        <Texture Name="gameplay_keep_Tex_053940" OutName="tex_053940" Format="i4" Width="64" Height="64" Offset="0x53990" />
-        <Texture Name="gameplay_keep_Tex_054140" OutName="tex_054140" Format="i4" Width="64" Height="64" Offset="0x54190" />
-        <DList Name="gLensFlareCircleDL" Offset="0x54990" />
-        <DList Name="gLensFlareRingDL" Offset="0x549F8" />
-        <DList Name="gEffSparklesDL" Offset="0x54AE0" />
-        <Texture Name="gameplay_keep_Tex_054AF0" OutName="tex_054AF0" Format="i4" Width="16" Height="16" Offset="0x54B40" />
-        <DList Name="gameplay_keep_DL_054C90" Offset="0x54CE0" />
-        <Texture Name="gameplay_keep_Tex_054D90" OutName="tex_054D90" Format="i4" Width="16" Height="16" Offset="0x54DE0" />
-        <Texture Name="gameplay_keep_Tex_054E10" OutName="tex_054E10" Format="i8" Width="16" Height="16" Offset="0x54E60" />
-
-        <TextureAnimation Name="gameplay_keep_Matanimheader_054F18" Offset="0x54F68" />
-
-        <Texture Name="gameplay_keep_Tex_054F20" OutName="tex_054F20" Format="i8" Width="32" Height="32" Offset="0x54F70" />
-        <DList Name="gameplay_keep_DL_055360" Offset="0x553B0" />
-        <DList Name="gameplay_keep_DL_055620" Offset="0x55670" />
-        <DList Name="gameplay_keep_DL_055628" Offset="0x55678" />
-        <Texture Name="gameplay_keep_Tex_0557F0" OutName="tex_0557F0" Format="rgba16" Width="32" Height="32" Offset="0x55840" />
-        <Texture Name="gameplay_keep_Tex_055FF0" OutName="tex_055FF0" Format="i4" Width="64" Height="64" Offset="0x56040" />
-
-        <!-- Deku Elegy of Emptiness Shell -->
-        <DList Name="gElegyShellDekuDL" Offset="0x57B60" /> <!-- Original name is "pns_zo_model" -->
-        <Texture Name="gElegyShellDekuPlatformTex" OutName="elegy_shell_deku_platform" Format="rgba16" Width="8" Height="16" Offset="0x58038" />
-        <Texture Name="gElegyShellDekuSkinTex" OutName="elegy_shell_deku_skin" Format="rgba16" Width="16" Height="16" Offset="0x58138" />
-        <Texture Name="gElegyShellDekuLeafTex" OutName="elegy_shell_deku_leaf" Format="rgba16" Width="32" Height="32" Offset="0x58338" />
-        <Texture Name="gElegyShellDekuEyeTex" OutName="elegy_shell_deku_eye" Format="rgba16" Width="8" Height="8" Offset="0x58B38" />
-
-        <DList Name="gameplay_keep_DL_058BA0" Offset="0x58BF0" />
-        <Texture Name="gameplay_keep_Tex_058C30" OutName="tex_058C30" Format="rgba16" Width="16" Height="16" Offset="0x58C80" />
-        <Collision Name="gameplay_keep_Colheader_058F30" Offset="0x58F80" />
-        <DList Name="gameplay_keep_DL_0590E0" Offset="0x59130" />
-        <DList Name="gameplay_keep_DL_059310" Offset="0x59360" />
-        <Collision Name="gameplay_keep_Colheader_0594C8" Offset="0x59518" />
-        <DList Name="gameplay_keep_DL_059680" Offset="0x596D0" />
-        <Collision Name="gameplay_keep_Colheader_059840" Offset="0x59890" />
-        <DList Name="gameplay_keep_DL_0599F0" Offset="0x59A40" />
-        <Collision Name="gameplay_keep_Colheader_059BA0" Offset="0x59BF0" />
-        <DList Name="gameplay_keep_DL_059D50" Offset="0x59DA0" />
-        <Collision Name="gameplay_keep_Colheader_059F00" Offset="0x59F50" />
-        <DList Name="gameplay_keep_DL_05A0B0" Offset="0x5A100" />
-        <Collision Name="gameplay_keep_Colheader_05A270" Offset="0x5A2C0" />
-        <DList Name="gameplay_keep_DL_05A430" Offset="0x5A480" />
-        <DList Name="gameplay_keep_DL_05A600" Offset="0x5A650" />
-
-        <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x5A700" />
-        <DList Name="gHeartPieceInteriorDL" Offset="0x5AB00" />
-        <DList Name="gSignRectangularDL" Offset="0x5AF20" />
-        <DList Name="gSignDirectionalDL" Offset="0x5B480" />
-
-        <!-- Item Drops -->
-        <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x5B740" />
-        <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x5BF40" />
-        <Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x5C740" />
-        <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x5CF40" />
-        <Texture Name="gDropBombchuTex" OutName="drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x5D740" />
-        <Texture Name="gDropUnknownPouchTex" OutName="drop_unknown_pouch" Format="rgba16" Width="32" Height="32" Offset="0x5DF40" />
-        <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x5E740" />
-        <Texture Name="gDropHeartPieceTex" OutName="drop_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x5EF40" />
-        <DList Name="gItemDropDL" Offset="0x5F740" />
-        <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x5F810" />
-        <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x60010" />
-        <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x60810" />
-        <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x61010" />
-        <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x61810" />
-        
-        <!-- Rupees -->
-        <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x62010" />
-        <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x62030" />
-        <Texture Name="gRupeeRedTex" OutName="rupee_red" Format="rgba16" Width="4" Height="4" Offset="0x62050" />
-        <Texture Name="gRupeePurpleTex" OutName="rupee_purple" Format="rgba16" Width="4" Height="4" Offset="0x62070" />
-        <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x62090" />
-        <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x620B0" />
-        <DList Name="gRupeeDL" Offset="0x62310" />
-
-        <Texture Name="gRecoveryHeartTex" OutName="recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x623E0" />
-        <Texture Name="gBombTex" OutName="bomb" Format="rgba16" Width="32" Height="32" Offset="0x62BE0" />
-        <Texture Name="gArrowTex" OutName="arrow" Format="rgba16" Width="32" Height="32" Offset="0x633E0" />
-        <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x63BE0" />
-        <Texture Name="gRupeeLightBlueTex" OutName="rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x63C00" />
-        <Texture Name="gHeartContainerTex" OutName="heart_container" Format="rgba16" Width="32" Height="32" Offset="0x63C20" />
-        
-        <Texture Name="gameplay_keep_Tex_0643D0" OutName="tex_0643D0" Format="rgba16" Width="32" Height="32" Offset="0x64420" />
-        <Texture Name="gameplay_keep_Tex_064BD0" OutName="tex_064BD0" Format="rgba16" Width="32" Height="32" Offset="0x64C20" />
-        <Texture Name="gameplay_keep_Tex_0653D0" OutName="tex_0653D0" Format="rgba16" Width="32" Height="32" Offset="0x65420" />
-        <Texture Name="gameplay_keep_Tex_065BD0" OutName="tex_065BD0" Format="rgba16" Width="32" Height="32" Offset="0x65C20" />
-        <Texture Name="gameplay_keep_Tex_0663D0" OutName="tex_0663D0" Format="rgba16" Width="32" Height="32" Offset="0x66420" />
-        <Texture Name="gameplay_keep_Tex_066BD0" OutName="tex_066BD0" Format="rgba16" Width="64" Height="32" Offset="0x66C20" />
-        <Texture Name="gameplay_keep_Tex_067BD0" OutName="tex_067BD0" Format="rgba16" Width="32" Height="32" Offset="0x67C20" />
-        <Texture Name="gameplay_keep_Tex_0683D0" OutName="tex_0683D0" Format="rgba16" Width="32" Height="32" Offset="0x68420" />
-
-        <Texture Name="gSignRectangularSideTex" OutName="sign_rectangular_side" Format="rgba16" Width="32" Height="16" Offset="0x68C20" />
-        <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x69020" />
-        <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x69420" />
-        <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x69820" />
-
-        <DList Name="gameplay_keep_DL_06A800" Offset="0x6A850" />
-        <Texture Name="gameplay_keep_Tex_06A880" OutName="tex_06A880" Format="i8" Width="16" Height="16" Offset="0x6A8D0" />
-        <DList Name="gameplay_keep_DL_06AB30" Offset="0x6AB80" />
-        <Texture Name="gameplay_keep_Tex_06ABF8" OutName="tex_06ABF8" Format="rgba16" Width="36" Height="36" Offset="0x6AC48" />
-        <TextureAnimation Name="gameplay_keep_Matanimheader_06B6A0" Offset="0x6B6F0" />
-        <TextureAnimation Name="gameplay_keep_Matanimheader_06B730" Offset="0x6B780" />
-
-        <KeyFrameAnimation Name="gGameplayKeepKFAnim_6BB0C" Skel="0x6EBC0" Offset="0x6BB5C"/>
-
-        <DList Name="gameplay_keep_DL_06BFE0" Offset="0x6C030" />
-        <DList Name="gameplay_keep_DL_06C098" Offset="0x6C0E8" />
-        <DList Name="gameplay_keep_DL_06C1E8" Offset="0x6C238" />
-        <Texture Name="gameplay_keep_Tex_06C350" OutName="tex_06C350" Format="i4" Width="64" Height="64" Offset="0x6C3A0" />
-        <Texture Name="gameplay_keep_Tex_06CB50" OutName="tex_06CB50" Format="i4" Width="64" Height="64" Offset="0x6CBA0" />
-        <Texture Name="gameplay_keep_Tex_06D350" OutName="tex_06D350" Format="i4" Width="64" Height="64" Offset="0x6D3A0" />
-        <Texture Name="gameplay_keep_Tex_06DB50" OutName="tex_06DB50" Format="i4" Width="64" Height="64" Offset="0x6DBA0" />
-        <Texture Name="gameplay_keep_Tex_06E350" OutName="tex_06E350" Format="i4" Width="64" Height="64" Offset="0x6E3A0" />
-        
-        <KeyFrameSkel Name="gGameplayKeepKFSkel_6EB70" LimbType="Flex" Offset="0x6EBC0"/>
-
-        <Texture Name="gameplay_keep_Tex_06EB80" OutName="tex_06EB80" Format="i4" Width="64" Height="64" Offset="0x6EBD0" />
-        <DList Name="gameplay_keep_DL_06F380" Offset="0x6F3D0" />
-        <DList Name="gameplay_keep_DL_06F9F0" Offset="0x6FA40" />
-        <DList Name="gameplay_keep_DL_06FAE0" Offset="0x6FB30" />
-        <DList Name="gameplay_keep_DL_06FE20" Offset="0x6FE70" />
-        <DList Name="gameplay_keep_DL_06FF68" Offset="0x6FFB8" />
-        <Texture Name="gameplay_keep_Tex_0700B0" OutName="tex_0700B0" Format="rgba16" Width="16" Height="32" Offset="0x70100" />
-        <Texture Name="gameplay_keep_Tex_0704B0" OutName="tex_0704B0" Format="rgba16" Width="16" Height="16" Offset="0x70500" />
-        <DList Name="gFallingRainDropDL" Offset="0x70730" />
-
-        <!-- Popped Deku Bubbles (EffSsSbn) -->
-
-        <!-- Static Popped Bubbles, can't swap out textures (unused) -->
-        <DList Name="gEffPoppedDekuBubbleStaticDL" Offset="0x70780" />
-        <Texture Name="gEffPoppedDekuBubbleStaticMaskTex" OutName="eff_popped_deku_bubble_static_mask" Format="i4" Width="32" Height="32" Offset="0x70840" />
-        <Texture Name="gEffPoppedDekuBubbleStaticTex" OutName="eff_popped_deku_bubble_static" Format="i4" Width="64" Height="64" Offset="0x70A40" />
-        <TextureAnimation Name="gEffPoppedDekuBubbleStaticTexAnim" Offset="0x71248" />
-
-        <!-- Sliding Popped Deku Bubbles -->
-        <DList Name="gEffPoppedDekuBubbleSlidingDL" Offset="0x71280" />
-        <TextureAnimation Name="gEffPoppedDekuBubbleSlidingTexAnim" Offset="0x71348" /> <!-- Unused -->
-        <Texture Name="gEffPoppedDekuBubbleSliding1Tex" OutName="eff_popped_deku_bubble_sliding_1" Format="i4" Width="32" Height="64" Offset="0x71350" />
-        <Texture Name="gEffPoppedDekuBubbleSliding2Tex" OutName="eff_popped_deku_bubble_sliding_2" Format="i4" Width="32" Height="64" Offset="0x71750" />
-        <Texture Name="gEffPoppedDekuBubbleSliding3Tex" OutName="eff_popped_deku_bubble_sliding_3" Format="i4" Width="32" Height="64" Offset="0x71B50" />
-        <Texture Name="gEffPoppedDekuBubbleSliding4Tex" OutName="eff_popped_deku_bubble_sliding_4" Format="i4" Width="32" Height="64" Offset="0x71F50" />
-        <Texture Name="gEffPoppedDekuBubbleSliding5Tex" OutName="eff_popped_deku_bubble_sliding_5" Format="i4" Width="32" Height="64" Offset="0x72350" />
-        <Texture Name="gEffPoppedDekuBubbleSliding6Tex" OutName="eff_popped_deku_bubble_sliding_6" Format="i4" Width="32" Height="64" Offset="0x72750" />
-        <Texture Name="gEffPoppedDekuBubbleSliding7Tex" OutName="eff_popped_deku_bubble_sliding_7" Format="i4" Width="32" Height="64" Offset="0x72B50" />
-        <Texture Name="gEffPoppedDekuBubbleSliding8Tex" OutName="eff_popped_deku_bubble_sliding_8" Format="i4" Width="32" Height="64" Offset="0x72F50" />
-        <Texture Name="gEffPoppedDekuBubbleSliding9Tex" OutName="eff_popped_deku_bubble_sliding_9" Format="i4" Width="32" Height="64" Offset="0x73350" />
-        <Texture Name="gEffPoppedDekuBubbleSliding10Tex" OutName="eff_popped_deku_bubble_sliding_10" Format="i4" Width="32" Height="64" Offset="0x73750" />
-        <Texture Name="gEffPoppedDekuBubbleSliding11Tex" OutName="eff_popped_deku_bubble_sliding_11" Format="i4" Width="32" Height="64" Offset="0x73B50" />
-        <Texture Name="gEffPoppedDekuBubbleSliding12Tex" OutName="eff_popped_deku_bubble_sliding_12" Format="i4" Width="32" Height="64" Offset="0x73F50" />
-
-        <!-- Regular Popped Deku Bubbles -->
-        <DList Name="gEffPoppedDekuBubbleDL" Offset="0x74380" />
-        <TextureAnimation Name="gEffPoppedDekuBubbleTexAnim" Offset="0x74440" /> <!-- Empty and unused -->
-        <Texture Name="gEffPoppedDekuBubble1Tex" OutName="eff_popped_deku_bubble_1" Format="i4" Width="32" Height="64" Offset="0x74450" />
-        <Texture Name="gEffPoppedDekuBubble2Tex" OutName="eff_popped_deku_bubble_2" Format="i4" Width="32" Height="64" Offset="0x74850" />
-        <Texture Name="gEffPoppedDekuBubble3Tex" OutName="eff_popped_deku_bubble_3" Format="i4" Width="32" Height="64" Offset="0x74C50" />
-        <Texture Name="gEffPoppedDekuBubble4Tex" OutName="eff_popped_deku_bubble_4" Format="i4" Width="32" Height="64" Offset="0x75050" />
-        <Texture Name="gEffPoppedDekuBubble5Tex" OutName="eff_popped_deku_bubble_5" Format="i4" Width="32" Height="64" Offset="0x75450" />
-        <Texture Name="gEffPoppedDekuBubbleMaskTex" OutName="eff_popped_deku_bubble_mask" Format="i4" Width="32" Height="32" Offset="0x75850" /> <!-- Mask used for both normal and sliding bubbles -->
-
-        <DList Name="gSquareShadowDL" Offset="0x75A90" />
-        <Texture Name="gameplay_keep_Tex_075AA8" OutName="tex_075AA8" Format="i4" Width="16" Height="16" Offset="0x75AF8" />
-        <DList Name="gFootShadowDL" Offset="0x75B80" />
-        <Texture Name="gameplay_keep_Tex_075BC0" OutName="tex_075BC0" Format="ia16" Width="32" Height="64" Offset="0x75C10" />
-        <DList Name="gCircleShadowDL" Offset="0x76C10" />
-        <Texture Name="gameplay_keep_Tex_076C40" OutName="tex_076C40" Format="ia16" Width="32" Height="32" Offset="0x76C90" />
-        <DList Name="gHorseShadowDL" Offset="0x774D0" />
-        <Texture Name="gameplay_keep_Tex_0774D0" OutName="tex_0774D0" Format="i8" Width="16" Height="64" Offset="0x77520" />
-        <DList Name="gameplay_keep_DL_077990" Offset="0x779E0" />
-        <Texture Name="gameplay_keep_Tex_077A40" OutName="tex_077A40" Format="ia8" Width="32" Height="128" Offset="0x77A90" />
-        <DList Name="gameplay_keep_DL_078A80" Offset="0x78AD0" />
-        <Texture Name="gameplay_keep_Tex_078B10" OutName="tex_078B10" Format="rgba16" Width="32" Height="64" Offset="0x78B60" />
-
-        <!-- Sun Textures. These should be 64x64, but they get broken into pieces in gSunDL, and ZAPD cannot currently handle that. -->
-        <!-- #region 2S2H [Port] Treat these properly as 64x64 on extraction-->
-        <Texture Name="gSun1Tex" OutName="sun_1" Format="i4" Width="64" Height="64" Offset="0x79B60" />
-        <!-- <Texture Name="gSun1Tex" OutName="sun_1" Format="i4" Width="64" Height="31" Offset="0x79B60" /> -->
-        <Texture Name="gSun2Tex" OutName="sun_2" Format="i4" Width="64" Height="16" Offset="0x79F40" />
-        <Texture Name="gSun3Tex" OutName="sun_3" Format="i4" Width="64" Height="17" Offset="0x7A140" />
-        <Texture Name="gSunEvening1Tex" OutName="sun_evening_1" Format="i4" Width="64" Height="64" Offset="0x7A360" />
-        <!-- <Texture Name="gSunEvening1Tex" OutName="sun_evening_1" Format="i4" Width="64" Height="31" Offset="0x7A360" /> -->
-        <Texture Name="gSunEvening2Tex" OutName="sun_evening_2" Format="i4" Width="64" Height="16" Offset="0x7A740" />
-        <Texture Name="gSunEvening3Tex" OutName="sun_evening_3" Format="i4" Width="64" Height="17" Offset="0x7A940" />
-
-        <DList Name="gSunSparkleMaterialDL" Offset="0x7AB60" /> <!-- sun (sparkles when small) displaylist -->
-        <DList Name="gSunSparkleModelDL" Offset="0x7ABA8" />
-        <DList Name="gSunDL" Offset="0x7ABC0" />
-        <DList Name="gZTargetLockOnTriangleDL" Offset="0x7AE50" />
-
-        <!-- The clock that appears when the player is moving through, slowing down, or speeding up time with the Song of Time -->
-        <DList Name="gSongOfTimeClockDL" Offset="0x7B000" /> <!-- Original name is "disk_modelT" -->
-        <DList Name="gSongOfTimeClockEmptyDL" Offset="0x7B108" /> <!-- Probably was the opaque component for the above DL -->
-        <Texture Name="gSongOfTimeClockTopTex" OutName="song_of_time_clock_top" Format="i8" Width="64" Height="64" Offset="0x7B110" />
-        <Texture Name="gSongOfTimeClockBottomTex" OutName="song_of_time_clock_bottom" Format="i8" Width="64" Height="64" Offset="0x7C110" />
-
-        <DList Name="gameplay_keep_DL_07D260" Offset="0x7D2B0" />
-        <DList Name="gameplay_keep_DL_07D348" Offset="0x7D398" />
-        <Texture Name="gameplay_keep_Tex_07D350" OutName="tex_07D350" Format="i8" Width="16" Height="32" Offset="0x7D3A0" />
-
-        <Array Name="gameplay_keepVtx_07D550" Count="4" Offset="0x7D5A0">
-            <Vtx/>
-        </Array>
-
-        <DList Name="gEffFire1DL" Offset="0x7D5E0" />
-        <DList Name="gEffFire2DL" Offset="0x7D6A0" />
-        <Texture Name="gEffFireMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x7D760" />
-        <Texture Name="gEffFireTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x7DF60" />
-        <DList Name="gameplay_keep_DL_07E8C0" Offset="0x7E910" />
-        <Texture Name="gameplay_keep_Tex_07EA08" OutName="tex_07EA08" Format="i8" Width="32" Height="64" Offset="0x7EA58" />
-        <TextureAnimation Name="gameplay_keep_Matanimheader_07F218" Offset="0x7F268" />
-        <DList Name="gameplay_keep_DL_07F260" Offset="0x7F2B0" />
-        <Texture Name="gameplay_keep_Tex_07F2E8" OutName="tex_07F2E8" Format="ia16" Width="32" Height="64" Offset="0x7F338" />
-        <DList Name="gameplay_keep_DL_080FC0" Offset="0x81010" />
-        <DList Name="gameplay_keep_DL_080FC8" Offset="0x81018" />
-        <Texture Name="gameplay_keep_Tex_0813A0" OutName="tex_0813A0" Format="i8" Width="16" Height="32" Offset="0x813F0" />
-        <TextureAnimation Name="gameplay_keep_Matanimheader_0815D0" Offset="0x81620" />
-        <DList Name="gameplay_keep_DL_081620" Offset="0x81670" />
-        <DList Name="gameplay_keep_DL_081628" Offset="0x81678" />
-        <Texture Name="gameplay_keep_Tex_0816C0" OutName="tex_0816C0" Format="rgba16" Width="16" Height="32" Offset="0x81710" />
-
-        <KeyFrameAnimation Name="gGameplayKeepKFAnim_83534" Skel="0x85690" Offset="0x83584"/>
-
-        <DList Name="gameplay_keep_DL_084790" Offset="0x847E0" />
-        <DList Name="gameplay_keep_DL_0847E0" Offset="0x84830" />
-        <DList Name="gameplay_keep_DL_084850" Offset="0x848A0" />
-        <DList Name="gameplay_keep_DL_0848C0" Offset="0x84910" />
-        <DList Name="gameplay_keep_DL_084930" Offset="0x84980" />
-        <DList Name="gameplay_keep_DL_0849A0" Offset="0x849F0" />
-        <DList Name="gameplay_keep_DL_084A10" Offset="0x84A60" />
-        <DList Name="gameplay_keep_DL_084A80" Offset="0x84AD0" />
-        <DList Name="gameplay_keep_DL_084AF0" Offset="0x84B40" />
-        <DList Name="gameplay_keep_DL_084B60" Offset="0x84BB0" />
-        <DList Name="gameplay_keep_DL_084BD0" Offset="0x84C20" />
-        <DList Name="gameplay_keep_DL_084C48" Offset="0x84C98" />
-        <DList Name="gameplay_keep_DL_084CF0" Offset="0x84D40" />
-        <DList Name="gameplay_keep_DL_084D70" Offset="0x84DC0" />
-        <DList Name="gameplay_keep_DL_084DD8" Offset="0x84E28" />
-        <DList Name="gameplay_keep_DL_084E50" Offset="0x84EA0" />
-        <DList Name="gameplay_keep_DL_084EA0" Offset="0x84EF0" />
-        <DList Name="gameplay_keep_DL_084F10" Offset="0x84F60" />
-        <DList Name="gameplay_keep_DL_084F80" Offset="0x84FD0" />
-        <DList Name="gameplay_keep_DL_084FF0" Offset="0x85040" />
-        <DList Name="gameplay_keep_DL_085060" Offset="0x850B0" />
-        <DList Name="gameplay_keep_DL_0850D0" Offset="0x85120" />
-        <DList Name="gameplay_keep_DL_085140" Offset="0x85190" />
-        <DList Name="gameplay_keep_DL_0851B0" Offset="0x85200" />
-        <DList Name="gameplay_keep_DL_085220" Offset="0x85270" />
-        <DList Name="gameplay_keep_DL_085290" Offset="0x852E0" />
-        <DList Name="gameplay_keep_DL_085308" Offset="0x85358" />
-        <DList Name="gameplay_keep_DL_0853B0" Offset="0x85400" />
-        <DList Name="gameplay_keep_DL_085418" Offset="0x85468" />
-        <DList Name="gameplay_keep_DL_085490" Offset="0x854E0" />
-
-        <KeyFrameSkel Name="gGameplayKeepKFSkel_85640" LimbType="Flex" Offset="0x85690"/>
-
-        <!-- Zora Elegy of Emptiness Shell -->
-        <DList Name="gElegyShellZoraDL" Offset="0x890C0" /> <!-- Original name is "pzs_zo_model" -->
-        <Texture Name="gElegyShellZoraTLUT" OutName="elegy_shell_zora_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8A470" />
-        <Texture Name="gElegyShellZoraGuitarJawTex" OutName="elegy_shell_zora_guitar_jaw" Format="rgba16" Width="16" Height="16" Offset="0x8A670" />
-        <Texture Name="gElegyShellZoraGuitarEyeTex" OutName="elegy_shell_zora_guitar_eye" Format="rgba16" Width="16" Height="16" Offset="0x8A870" />
-        <Texture Name="gElegyShellZoraGuitarTeethTex" OutName="elegy_shell_zora_guitar_teeth" Format="rgba16" Width="16" Height="16" Offset="0x8AA70" />
-        <Texture Name="gElegyShellZoraGuitarSpinousTex" OutName="elegy_shell_zora_guitar_spinous" Format="rgba16" Width="16" Height="32" Offset="0x8AC70" />
-        <Texture Name="gElegyShellZoraGuitarBoneTex" OutName="elegy_shell_zora_guitar_bone" Format="rgba16" Width="16" Height="32" Offset="0x8B070" />
-        <Texture Name="gElegyShellZoraSkinTex" OutName="elegy_shell_zora_skin" Format="ci8" Width="8" Height="8" Offset="0x8B470" />
-        <Texture Name="gElegyShellZoraSpottedSkinTex" OutName="elegy_shell_zora_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x8B4B0" />
-        <Texture Name="gElegyShellZoraFingersTex" OutName="elegy_shell_zora_fingers" Format="ci8" Width="16" Height="16" Offset="0x8B8B0" />
-        <Texture Name="gElegyShellZoraBackAndHipSpottedSkinTex" OutName="elegy_shell_zora_back_and_hip_spotted_skin" Format="ci8" Width="32" Height="64" Offset="0x8B9B0" />
-        <Texture Name="gElegyShellZoraWristbandTex" OutName="elegy_shell_zora_wristband" Format="ci8" Width="8" Height="16" Offset="0x8C1B0" />
-        <Texture Name="gElegyShellZoraFinTex" OutName="elegy_shell_zora_fin" Format="ci8" Width="16" Height="16" Offset="0x8C230" />
-        <Texture Name="gElegyShellZoraEyeTex" OutName="elegy_shell_zora_eye" Format="ci8" Width="32" Height="32" Offset="0x8C330" />
-        <Texture Name="gElegyShellZoraMouthTex" OutName="elegy_shell_zora_mouth" Format="ci8" Width="32" Height="32" Offset="0x8C730" />
-        <Texture Name="gElegyShellZoraRibsTattooTex" OutName="elegy_shell_zora_ribs_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CB30" />
-        <Texture Name="gElegyShellZoraArrowTattooTex" OutName="elegy_shell_zora_arrow_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CD30" />
-        <Texture Name="gElegyShellZoraRightShoulderTattooTex" OutName="elegy_shell_zora_right_shoulder_tattoo" Format="ci8" Width="32" Height="32" Offset="0x8CF30" />
-        <Texture Name="gElegyShellZoraPlatformTex" OutName="elegy_shell_zora_platform" Format="rgba16" Width="8" Height="16" Offset="0x8D330" />
-
-        <Texture Name="gameplay_keep_Tex_08D3E0" OutName="tex_08D3E0" Format="i8" Width="64" Height="32" Offset="0x8D430" />
-
-        <!-- Dust Textures -->
-        <Texture Name="gEffDust1Tex" OutName="eff_dust_1" Format="i8" Width="32" Height="32" Offset="0x8DC30" />
-        <Texture Name="gEffDust2Tex" OutName="eff_dust_2" Format="i8" Width="32" Height="32" Offset="0x8E030" />
-        <Texture Name="gEffDust3Tex" OutName="eff_dust_3" Format="i8" Width="32" Height="32" Offset="0x8E430" />
-        <Texture Name="gEffDust4Tex" OutName="eff_dust_4" Format="i8" Width="32" Height="32" Offset="0x8E830" />
-        <Texture Name="gEffDust5Tex" OutName="eff_dust_5" Format="i8" Width="32" Height="32" Offset="0x8EC30" />
-        <Texture Name="gEffDust6Tex" OutName="eff_dust_6" Format="i8" Width="32" Height="32" Offset="0x8F030" />
-        <Texture Name="gEffDust7Tex" OutName="eff_dust_7" Format="i8" Width="32" Height="32" Offset="0x8F430" />
-        <Texture Name="gEffDust8Tex" OutName="eff_dust_8" Format="i8" Width="32" Height="32" Offset="0x8F830" />
-
-        <Texture Name="gameplay_keep_Tex_08FBE0" OutName="tex_08FBE0" Format="i8" Width="32" Height="64" Offset="0x8FC30" />
-        <Texture Name="gameplay_keep_Tex_0903E0" OutName="tex_0903E0" Format="i8" Width="32" Height="64" Offset="0x90430" />
-        <Texture Name="gameplay_keep_Tex_090BE0" OutName="tex_090BE0" Format="i8" Width="32" Height="64" Offset="0x90C30" />
-        <Texture Name="gameplay_keep_Tex_0913E0" OutName="tex_0913E0" Format="i8" Width="32" Height="64" Offset="0x91430" />
-        <Texture Name="gEffBubble1Tex" OutName="eff_bubble_1" Format="ia8" Width="16" Height="16" Offset="0x91C30" />
-        <Texture Name="gEffBubble2Tex" OutName="eff_bubble_2" Format="ia8" Width="16" Height="16" Offset="0x91D30" />
-
-        <!-- Electric spark textures from Zora-Form attack -->
-        <Texture Name="gElectricSpark1Tex" OutName="electric_spark_1" Format="i4" Width="32" Height="32" Offset="0x91E30" />
-        <Texture Name="gElectricSpark2Tex" OutName="electric_spark_2" Format="i4" Width="32" Height="32" Offset="0x92030" />
-        <Texture Name="gElectricSpark3Tex" OutName="electric_spark_3" Format="i4" Width="32" Height="32" Offset="0x92230" />
-        <Texture Name="gElectricSpark4Tex" OutName="electric_spark_4" Format="i4" Width="32" Height="32" Offset="0x92430" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ah.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ah.xml
deleted file mode 100644
index 71b031a01..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ah.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<Root>
-    <File Name="object_ah" Segment="6">
-        <Animation Name="object_ah_Anim_000968" Offset="0x968" /> <!-- Original name is "ah_deteike" (probably based on her Japanese dialogue, where she tells Kafei to "get out") -->
-        <Animation Name="object_ah_Anim_000DDC" Offset="0xDDC" /> <!-- Original name is "ah_suwari" ("sitting") -->
-        <Animation Name="object_ah_Anim_001860" Offset="0x1860" /> <!-- Original name is "ah_wait" -->
-        <Animation Name="object_ah_Anim_002280" Offset="0x2280" /> <!-- Original name is "ah_wait2deteike" -->
-        <DList Name="object_ah_DL_004A60" Offset="0x4A60" />
-        <DList Name="object_ah_DL_004B70" Offset="0x4B70" />
-        <DList Name="object_ah_DL_004C80" Offset="0x4C80" />
-        <DList Name="object_ah_DL_004E78" Offset="0x4E78" />
-        <DList Name="object_ah_DL_005010" Offset="0x5010" />
-        <DList Name="object_ah_DL_0050E8" Offset="0x50E8" />
-        <DList Name="object_ah_DL_005268" Offset="0x5268" />
-        <DList Name="object_ah_DL_005400" Offset="0x5400" />
-        <DList Name="object_ah_DL_0054D8" Offset="0x54D8" />
-        <DList Name="object_ah_DL_0055F0" Offset="0x55F0" />
-        <DList Name="object_ah_DL_005BA8" Offset="0x5BA8" />
-        <DList Name="object_ah_DL_005D88" Offset="0x5D88" />
-        <DList Name="object_ah_DL_005EB0" Offset="0x5EB0" />
-        <DList Name="object_ah_DL_006090" Offset="0x6090" />
-        <DList Name="object_ah_DL_0061B8" Offset="0x61B8" />
-        <Texture Name="object_ah_TLUT_0064B0" OutName="tlut_0064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0" />
-        <Texture Name="object_ah_Tex_0066B0" OutName="tex_0066B0" Format="ci8" Width="16" Height="16" Offset="0x66B0" />
-        <Texture Name="object_ah_Tex_0067B0" OutName="tex_0067B0" Format="ci8" Width="16" Height="16" Offset="0x67B0" />
-        <Texture Name="object_ah_Tex_0068B0" OutName="tex_0068B0" Format="ci8" Width="8" Height="8" Offset="0x68B0" />
-        <Texture Name="object_ah_Tex_0068F0" OutName="tex_0068F0" Format="ci8" Width="8" Height="8" Offset="0x68F0" />
-        <Texture Name="object_ah_Tex_006930" OutName="tex_006930" Format="ci8" Width="8" Height="8" Offset="0x6930" />
-        <Texture Name="object_ah_Tex_006970" OutName="tex_006970" Format="ci8" Width="16" Height="16" Offset="0x6970" />
-        <Texture Name="object_ah_Tex_006A70" OutName="tex_006A70" Format="ci8" Width="8" Height="8" Offset="0x6A70" />
-        <Texture Name="object_ah_Tex_006AB0" OutName="tex_006AB0" Format="ci8" Width="16" Height="16" Offset="0x6AB0" />
-        <Texture Name="object_ah_Tex_006BB0" OutName="tex_006BB0" Format="ci8" Width="8" Height="16" Offset="0x6BB0" />
-        <Texture Name="object_ah_Tex_006C30" OutName="tex_006C30" Format="i8" Width="8" Height="8" Offset="0x6C30" />
-        <Texture Name="object_ah_Tex_006C70" OutName="tex_006C70" Format="ci8" Width="16" Height="16" Offset="0x6C70" />
-        <Texture Name="object_ah_Tex_006D70" OutName="tex_006D70" Format="rgba16" Width="32" Height="32" Offset="0x6D70" />
-        <Texture Name="object_ah_Tex_007570" OutName="tex_007570" Format="rgba16" Width="32" Height="32" Offset="0x7570" />
-        <Texture Name="object_ah_Tex_007D70" OutName="tex_007D70" Format="rgba16" Width="32" Height="32" Offset="0x7D70" />
-        <Texture Name="object_ah_Tex_008570" OutName="tex_008570" Format="rgba16" Width="32" Height="32" Offset="0x8570" />
-        <Texture Name="object_ah_Tex_008D70" OutName="tex_008D70" Format="rgba16" Width="32" Height="32" Offset="0x8D70" />
-        <Texture Name="object_ah_Tex_009570" OutName="tex_009570" Format="rgba16" Width="32" Height="32" Offset="0x9570" />
-        <Limb Name="object_ah_Standardlimb_009D70" Type="Standard" EnumName="OBJECT_AH_LIMB_01" Offset="0x9D70" />
-        <Limb Name="object_ah_Standardlimb_009D7C" Type="Standard" EnumName="OBJECT_AH_LIMB_02" Offset="0x9D7C" />
-        <Limb Name="object_ah_Standardlimb_009D88" Type="Standard" EnumName="OBJECT_AH_LIMB_03" Offset="0x9D88" />
-        <Limb Name="object_ah_Standardlimb_009D94" Type="Standard" EnumName="OBJECT_AH_LIMB_04" Offset="0x9D94" />
-        <Limb Name="object_ah_Standardlimb_009DA0" Type="Standard" EnumName="OBJECT_AH_LIMB_05" Offset="0x9DA0" />
-        <Limb Name="object_ah_Standardlimb_009DAC" Type="Standard" EnumName="OBJECT_AH_LIMB_06" Offset="0x9DAC" />
-        <Limb Name="object_ah_Standardlimb_009DB8" Type="Standard" EnumName="OBJECT_AH_LIMB_07" Offset="0x9DB8" />
-        <Limb Name="object_ah_Standardlimb_009DC4" Type="Standard" EnumName="OBJECT_AH_LIMB_08" Offset="0x9DC4" />
-        <Limb Name="object_ah_Standardlimb_009DD0" Type="Standard" EnumName="OBJECT_AH_LIMB_09" Offset="0x9DD0" />
-        <Limb Name="object_ah_Standardlimb_009DDC" Type="Standard" EnumName="OBJECT_AH_LIMB_0A" Offset="0x9DDC" />
-        <Limb Name="object_ah_Standardlimb_009DE8" Type="Standard" EnumName="OBJECT_AH_LIMB_0B" Offset="0x9DE8" />
-        <Limb Name="object_ah_Standardlimb_009DF4" Type="Standard" EnumName="OBJECT_AH_LIMB_0C" Offset="0x9DF4" />
-        <Limb Name="object_ah_Standardlimb_009E00" Type="Standard" EnumName="OBJECT_AH_LIMB_0D" Offset="0x9E00" />
-        <Limb Name="object_ah_Standardlimb_009E0C" Type="Standard" EnumName="OBJECT_AH_LIMB_0E" Offset="0x9E0C" />
-        <Limb Name="object_ah_Standardlimb_009E18" Type="Standard" EnumName="OBJECT_AH_LIMB_0F" Offset="0x9E18" />
-        <Limb Name="object_ah_Standardlimb_009E24" Type="Standard" EnumName="OBJECT_AH_LIMB_10" Offset="0x9E24" />
-        <Skeleton Name="object_ah_Skel_009E70" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AH_LIMB_NONE" LimbMax="OBJECT_AH_LIMB_MAX" EnumName="ObjectAhLimb" Offset="0x9E70" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ahg.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ahg.xml
deleted file mode 100644
index 8233a5b27..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ahg.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<Root>
-    <!-- Assets for the bearded man from OOT, body is reused in MM for Cured Swamp Spider House Man (head substituted from overlay data). -->
-    <File Name="object_ahg" Segment="6">
-        <Texture Name="gAhgTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="gAhgHairLineTex" OutName="hair_line" Format="ci8" Width="16" Height="16" Offset="0x200" />
-        <Texture Name="gAhgHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x300" />
-        <Texture Name="gAhgEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x400" />
-        <Texture Name="gAhgSkinGradientTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x440"/>
-        <Texture Name="gAhgEyeOpenTex" OutName="eye_open" Format="ci8" Width="16" Height="16" Offset="0x480" TlutOffset="0x0"/>
-        <Texture Name="gAhgEyeHalfTex" OutName="eye_half" Format="ci8" Width="16" Height="16" Offset="0x580" TlutOffset="0x0"/>
-        <Texture Name="gAhgEyeClosedTex" OutName="eye_closed" Format="ci8" Width="16" Height="16" Offset="0x680" TlutOffset="0x0"/>
-        <Texture Name="gAhgFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x780" />
-        <Texture Name="gAhgShirtTex" OutName="shirt" Format="i8" Width="8" Height="8" Offset="0x880" />
-        <Texture Name="gAhgShoesTex" OutName="shoes" Format="i8" Width="8" Height="8" Offset="0x8C0" />
-        <Texture Name="gAhgBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="32" Height="16" Offset="0x900" />
-        <Texture Name="gAhgBeltLoopTex" OutName="belt_loop" Format="ci8" Width="16" Height="16" Offset="0xB00" />
-
-        <!-- This head is overwritten in EnSth draw. -->
-        <DList Name="gAhgBeardedHeadDL" Offset="0x2FF0" />
-        <DList Name="gAhgRightHandDL" Offset="0x3400" />
-        <DList Name="gAhgRightForearmDL" Offset="0x3570" />
-        <DList Name="gAhgRightUpperArmDL" Offset="0x36A0" />
-        <DList Name="gAhgLeftHandDL" Offset="0x37D8" />
-        <DList Name="gAhgLeftForearmDL" Offset="0x3948" />
-        <DList Name="gAhgLeftUpperArmDL" Offset="0x3A78" />
-        <DList Name="gAhgTorsoDL" Offset="0x3BB0" />
-        <DList Name="gAhgRightFootDL" Offset="0x3DD8" />
-        <DList Name="gAhgRightShinDL" Offset="0x3F18" />
-        <DList Name="gAhgRightThighDL" Offset="0x4048" />
-        <DList Name="gAhgLeftFootDL" Offset="0x4180" />
-        <DList Name="gAhgLeftShinDL" Offset="0x42C0" />
-        <DList Name="gAhgLeftThighDL" Offset="0x43F0" />
-        <DList Name="gAhgPelvisDL" Offset="0x4528" />
-
-        <!-- Assets for alternate heads for Ahg, left over from OOT (Unused). -->
-        <Texture Name="gAhg2TLUT" OutName="tlut2" Format="rgba16" Width="16" Height="12" Offset="0x46C8" />
-        <Texture Name="gAhgEar2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x4848" TlutOffset="0x46C8" />
-        <Texture Name="gAhgMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x4888" TlutOffset="0x46C8"  />
-        <Texture Name="gAhgEyeAndEyebrowTex" OutName="eye_with_eyebrow" Format="ci8" Width="16" Height="16" Offset="0x4A88" TlutOffset="0x46C8"  />
-        <Texture Name="gAhgRedHairTex" OutName="red_hair" Format="ci8" Width="8" Height="16" Offset="0x4B88" TlutOffset="0x46C8"  />
-        <DList Name="gAhgRedHeadDL" Offset="0x5408" />
-        <DList Name="gAhgShortHairHeadDL" Offset="0x5628" />
-
-        <Limb Name="gAhgPelvisLimb" Type="Standard" EnumName="AHG_LIMB_PELVIS" Offset="0x58A8" />
-        <Limb Name="gAhgLeftThighLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_THIGH" Offset="0x58B4" />
-        <Limb Name="gAhgLeftShinLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_SHIN" Offset="0x58C0" />
-        <Limb Name="gAhgLeftFootLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_FOOT" Offset="0x58CC" />
-        <Limb Name="gAhgRightThighLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_THIGH" Offset="0x58D8" />
-        <Limb Name="gAhgRightShinLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_SHIN" Offset="0x58E4" />
-        <Limb Name="gAhgRightFootLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_FOOT" Offset="0x58F0" />
-        <Limb Name="gAhgTorsoLimb" Type="Standard" EnumName="AHG_LIMB_CHEST" Offset="0x58FC" />
-        <Limb Name="gAhgLeftUpperArmLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_UPPER_ARM" Offset="0x5908" />
-        <Limb Name="gAhgLeftForearmLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_FOREARM" Offset="0x5914" />
-        <Limb Name="gAhgLeftHandLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_HAND" Offset="0x5920" />
-        <Limb Name="gAhgRightUpperArmLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_UPPER_ARM" Offset="0x592C" />
-        <Limb Name="gAhgRightForearmLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_FOREARM" Offset="0x5938" />
-        <Limb Name="gAhgRightHandLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_HAND" Offset="0x5944" />
-        <Limb Name="gAhgHeadLimb" Type="Standard" EnumName="AHG_LIMB_HEAD" Offset="0x5950" />
-        <Skeleton Name="gAhgSkel" Type="Flex" LimbType="Standard" LimbNone="AHG_LIMB_NONE" LimbMax="AHG_LIMB_MAX" EnumName="ObjectAhgLimb" Offset="0x5998" />
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_al.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_al.xml
deleted file mode 100644
index 790ca3d8a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_al.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Root>
-    <File Name="object_al" Segment="6">
-        <Animation Name="object_al_Anim_000C54" Offset="0xC54" /> <!-- Original name is "al_suwaruA" ("suwaru" = "to sit") -->
-        <DList Name="gMadameAromaRightFootDL" Offset="0x45F0" />
-        <DList Name="gMadameAromaLeftFootDL" Offset="0x4738" />
-        <DList Name="gMadameAromaLegsDL" Offset="0x4880" />
-        <DList Name="gMadameAromaLowerBodyDL" Offset="0x4A50" />
-        <DList Name="gMadameAromaMiddleBodyDL" Offset="0x4B30" />
-        <DList Name="gMadameAromaRightHairEdgeDL" Offset="0x4BF8" />
-        <DList Name="gMadameAromaRightHairDL" Offset="0x4D10" />
-        <DList Name="gMadameAromaLeftHairEdgeDL" Offset="0x4DD0" />
-        <DList Name="gMadameAromaLeftHairDL" Offset="0x4EE8" />
-        <DList Name="gMadameAromaHairLoopDL" Offset="0x4FA8" />
-        <DList Name="gMadameAromaHeadDL" Offset="0x50B0" />
-        <DList Name="gMadameAromaShawlRightLowerDL" Offset="0x5680" />
-        <DList Name="gMadameAromaShawlRightLowerMiddleDL" Offset="0x5728" />
-        <DList Name="gMadameAromaShawlLeftLowerDL" Offset="0x57D0" />
-        <DList Name="gMadameAromaShawlLeftLowerMiddleDL" Offset="0x5878" />
-        <DList Name="gMadameAromaShawlUpperDL" Offset="0x5920" />
-        <DList Name="gMadameAromaLeftHandDL" Offset="0x59E8" />
-        <DList Name="gMadameAromaLeftArmDL" Offset="0x5C10" />
-        <DList Name="gMadameAromaLeftShoulderDL" Offset="0x5D28" />
-        <DList Name="gMadameAromaRightHandDL" Offset="0x5E48" />
-        <DList Name="gMadameAromaRightArmDL" Offset="0x5FF8" />
-        <DList Name="gMadameAromaRightShoulderDL" Offset="0x6190" />
-        <DList Name="gMadameAromaUpperBodyDL" Offset="0x62B0" />
-        <DList Name="gMadameAromaNecklaceDL" Offset="0x64E0" />
-        <DList Name="gMadameAromaShawlMiddleDL" Offset="0x6598" />
-        <Texture Name="gMadameAromaTLUT" OutName="madame_aroma_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6638" />
-        <Texture Name="gMadameAromaSkinBlotchTex" OutName="madame_aroma_skin_blotch" Format="ci8" Width="8" Height="8" Offset="0x6838" />
-        <Texture Name="gMadameAromaEarsTex" OutName="madame_aroma_ears" Format="ci8" Width="8" Height="8" Offset="0x6878" />
-        <Texture Name="gMadameAromaHairToSkinTex" OutName="madame_aroma_hair_to_skin" Format="ci8" Width="16" Height="16" Offset="0x68B8" />
-        <Texture Name="gMadameAromaMouthTex" OutName="madame_aroma_mouth" Format="rgba16" Width="64" Height="32" Offset="0x69B8" />
-        <Texture Name="gMadameAromaEyesTex" OutName="madame_aroma_eyes" Format="rgba16" Width="32" Height="32" Offset="0x79B8" />
-        <Texture Name="gMadameAromaShoeTex" OutName="madame_aroma_shoe" Format="ci8" Width="32" Height="16" Offset="0x81B8" />
-        <Texture Name="gMadameAromaDressLowerTex" OutName="madame_aroma_dress_lower" Format="rgba16" Width="32" Height="32" Offset="0x83B8" />
-        <Texture Name="gMadameAromaHairHolderTex" OutName="madame_aroma_hair_holder" Format="rgba16" Width="8" Height="8" Offset="0x8BB8" />
-        <Texture Name="gMadameAromaFingersTex" OutName="madame_aroma_fingers" Format="ci8" Width="16" Height="16" Offset="0x8C38" />
-        <Texture Name="gMadameAromaChestTex" OutName="madame_aroma_chest" Format="ci8" Width="16" Height="16" Offset="0x8D38" />
-        <Texture Name="gMadameAromaEarringsTex" OutName="madame_aroma_earrings" Format="rgba16" Width="32" Height="64" Offset="0x8E38" />
-        <Texture Name="gMadameAromaRingTex" OutName="madame_aroma_ring" Format="rgba16" Width="8" Height="16" Offset="0x9E38" />
-        <Limb Name="gMadameAromaRootLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_ROOT" Offset="0x9F38" />
-        <Limb Name="gMadameAromaUpperBodyLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_UPPER_BODY" Offset="0x9F44" />
-        <Limb Name="gMadameAromaShawlMiddleLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_MIDDLE" Offset="0x9F50" />
-        <Limb Name="gMadameAromaNecklaceLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_NECKLACE" Offset="0x9F5C" />
-        <Limb Name="gMadameAromaRightShoulderLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_SHOULDER" Offset="0x9F68" />
-        <Limb Name="gMadameAromaRightArmLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_ARM" Offset="0x9F74" />
-        <Limb Name="gMadameAromaRightHandLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_HAND" Offset="0x9F80" />
-        <Limb Name="gMadameAromaLeftShoulderLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_SHOULDER" Offset="0x9F8C" />
-        <Limb Name="gMadameAromaLeftArmLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_ARM" Offset="0x9F98" />
-        <Limb Name="gMadameAromaLeftHandLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_HAND" Offset="0x9FA4" />
-        <Limb Name="gMadameAromaShawlUpperLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_UPPER" Offset="0x9FB0" />
-        <Limb Name="gMadameAromaShawlLeftLowerMiddleLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_LEFT_LOWER_MIDDLE" Offset="0x9FBC" />
-        <Limb Name="gMadameAromaShawlLeftLowerLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_LEFT_LOWER" Offset="0x9FC8" />
-        <Limb Name="gMadameAromaShawlRightLowerMiddleLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_RIGHT_LOWER_MIDDLE" Offset="0x9FD4" />
-        <Limb Name="gMadameAromaShawlRightLowerLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_RIGHT_LOWER" Offset="0x9FE0" />
-        <Limb Name="gMadameAromaHeadLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_HEAD" Offset="0x9FEC" />
-        <Limb Name="gMadameAromaHairLoopLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_HAIR_LOOP" Offset="0x9FF8" />
-        <Limb Name="gMadameAromaLeftHairLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_HAIR" Offset="0xA004" />
-        <Limb Name="gMadameAromaLeftHairEdgeLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_HAIR_EDGE" Offset="0xA010" />
-        <Limb Name="gMadameAromaRightHairLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_HAIR" Offset="0xA01C" />
-        <Limb Name="gMadameAromaRightHairEdgeLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_HAIR_EDGE" Offset="0xA028" />
-        <Limb Name="gMadameAromaMiddleBodyLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_MIDDLE_BODY" Offset="0xA034" />
-        <Limb Name="gMadameAromaLowerBodyLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LOWER_BODY" Offset="0xA040" />
-        <Limb Name="gMadameAromaLegsLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEGS" Offset="0xA04C" />
-        <Limb Name="gMadameAromaLeftFootLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_FOOT" Offset="0xA058" />
-        <Limb Name="gMadameAromaRightFootLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_FOOT" Offset="0xA064" />
-        <Skeleton Name="gMadameAromaSkel" Type="Flex" LimbType="Standard" LimbNone="MADAME_AROMA_LIMB_NONE" LimbMax="MADAME_AROMA_LIMB_MAX" EnumName="MadameAromaLimb" Offset="0xA0D8" />
-        <Animation Name="object_al_Anim_00A764" Offset="0xA764" /> <!-- Original name is "al_suwaruAtalk" -->
-        <Animation Name="object_al_Anim_00ACA0" Offset="0xACA0" /> <!-- Original name is "al_suwaruB2talk" -->
-        <Animation Name="object_al_Anim_00BCA4" Offset="0xBCA4" /> <!-- Original name is "al_suwaruBarayada" ("arayada" = "Oh no; Oh dear​") -->
-        <Animation Name="object_al_Anim_00CA28" Offset="0xCA28" /> <!-- Original name is "al_suwaruBtalk" -->
-        <Animation Name="object_al_Anim_00DBE0" Offset="0xDBE0" /> <!-- Original name is "al_suwaruBwait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_am.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_am.xml
deleted file mode 100644
index bec26eb3a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_am.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-    <File Name="object_am" Segment="6">
-        <Collision Name="object_am_Colheader_000118" Offset="0x118" /> <!-- Original name is "am_bgdatainfo" -->
-        <Animation Name="gArmosHopAnim" Offset="0x238" /> <!-- Original name is "am_jump" -->
-        <Animation Name="gArmosPushedBackAnim" Offset="0x33C" /> <!-- Original name is "am_mamori" ("protection; defense") -->
-        <DList Name="object_am_DL_0005D0" Offset="0x5D0" />
-        <DList Name="object_am_DL_0007A8" Offset="0x7A8" />
-        <DList Name="object_am_DL_0016C8" Offset="0x16C8" />
-        <DList Name="object_am_DL_002278" Offset="0x2278" />
-        <DList Name="object_am_DL_002550" Offset="0x2550" />
-        <Texture Name="object_am_Tex_002638" OutName="tex_002638" Format="i4" Width="32" Height="32" Offset="0x2638" />
-        <Texture Name="object_am_Tex_002838" OutName="tex_002838" Format="i4" Width="16" Height="32" Offset="0x2838" />
-        <Texture Name="object_am_Tex_002938" OutName="tex_002938" Format="rgba16" Width="16" Height="32" Offset="0x2938" />
-        <Texture Name="object_am_Tex_002D38" OutName="tex_002D38" Format="i4" Width="16" Height="32" Offset="0x2D38" />
-        <Texture Name="object_am_Tex_002E38" OutName="tex_002E38" Format="i4" Width="32" Height="32" Offset="0x2E38" />
-        <Texture Name="object_am_Tex_003038" OutName="tex_003038" Format="i4" Width="32" Height="32" Offset="0x3038" />
-        <Texture Name="object_am_Tex_003238" OutName="tex_003238" Format="rgba16" Width="32" Height="32" Offset="0x3238" />
-        <Texture Name="object_am_Tex_003A38" OutName="tex_003A38" Format="rgba16" Width="16" Height="16" Offset="0x3A38" />
-        <Texture Name="object_am_Tex_003C38" OutName="tex_003C38" Format="rgba16" Width="32" Height="32" Offset="0x3C38" />
-        <Texture Name="object_am_Tex_004438" OutName="tex_004438" Format="rgba16" Width="32" Height="32" Offset="0x4438" />
-        <Texture Name="object_am_Tex_004C38" OutName="tex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" />
-        <Texture Name="object_am_Tex_005438" OutName="tex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" />
-        <Texture Name="object_am_Tex_005478" OutName="tex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" />
-        <Limb Name="object_am_Standardlimb_005878" Type="Standard" EnumName="OBJECT_AM_LIMB_01" Offset="0x5878" />
-        <Limb Name="object_am_Standardlimb_005884" Type="Standard" EnumName="OBJECT_AM_LIMB_02" Offset="0x5884" />
-        <Limb Name="object_am_Standardlimb_005890" Type="Standard" EnumName="OBJECT_AM_LIMB_BODY" Offset="0x5890" />
-        <Limb Name="object_am_Standardlimb_00589C" Type="Standard" EnumName="OBJECT_AM_LIMB_04" Offset="0x589C" />
-        <Limb Name="object_am_Standardlimb_0058A8" Type="Standard" EnumName="OBJECT_AM_LIMB_05" Offset="0x58A8" />
-        <Limb Name="object_am_Standardlimb_0058B4" Type="Standard" EnumName="OBJECT_AM_LIMB_SHIELD" Offset="0x58B4" />
-        <Limb Name="object_am_Standardlimb_0058C0" Type="Standard" EnumName="OBJECT_AM_LIMB_07" Offset="0x58C0" />
-        <Limb Name="object_am_Standardlimb_0058CC" Type="Standard" EnumName="OBJECT_AM_LIMB_08" Offset="0x58CC" />
-        <Limb Name="object_am_Standardlimb_0058D8" Type="Standard" EnumName="OBJECT_AM_LIMB_SWORD" Offset="0x58D8" />
-        <Limb Name="object_am_Standardlimb_0058E4" Type="Standard" EnumName="OBJECT_AM_LIMB_0A" Offset="0x58E4" />
-        <Limb Name="object_am_Standardlimb_0058F0" Type="Standard" EnumName="OBJECT_AM_LIMB_0B" Offset="0x58F0" />
-        <Limb Name="object_am_Standardlimb_0058FC" Type="Standard" EnumName="OBJECT_AM_LIMB_BASE" Offset="0x58FC" />
-        <Limb Name="object_am_Standardlimb_005908" Type="Standard" EnumName="OBJECT_AM_LIMB_0D" Offset="0x5908" />
-        <Skeleton Name="object_am_Skel_005948" Type="Normal" LimbType="Standard" LimbNone="OBJECT_AM_LIMB_NONE" LimbMax="OBJECT_AM_LIMB_MAX" EnumName="ObjectAmLimb" Offset="0x5948" />
-        <Animation Name="gArmosTakeDamageAnim" Offset="0x5B3C" /> <!-- Original name is "am_yarare" ("to suffer damage") -->
-        <Collision Name="object_am_Colheader_005CF8" Offset="0x5CF8" /> <!-- Original name is "armos_test_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an1.xml
deleted file mode 100644
index 927fa848a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an1.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<Root>
-    <!-- Assets for Anju -->
-    <File Name="object_an1" Segment="6">
-        <Animation Name="gAnju1TasteAnim" Offset="0x1090" /> <!-- Original name is "an_ajimi" ("tasting; sampling​") -->
-        <Animation Name="gAnju1TasteEndAnim" Offset="0x144C" /> <!-- Original name is "an_ajimiend" -->
-
-        <Animation Name="gAnju1LookUpRelievedAnim" Offset="0x1E74" /> <!-- Original name is "an_aogu" ("to look up") -->
-        <Animation Name="gAnju1SurprisedAnim" Offset="0x26B4" /> <!-- Original name is "an_bikkuri" ("to be surprised") -->
-        <Animation Name="gAnju1WaitWithTrayAnim" Offset="0x341C" /> <!-- Original name is "an_obonwait" ("obon" = "tray") -->
-        <Animation Name="gAnju1WalkWithTrayAnim" Offset="0x3EA8" /> <!-- Original name is "an_obonwalk" -->
-        <Animation Name="gAnju1BowAnim" Offset="0x544C" /> <!-- Original name is "an_ojigit" ("bow; bowing") -->
-        <Animation Name="gAnju1CookAnim" Offset="0x65C8" /> <!-- Original name is "an_ryouri" ("cooking") -->
-        <Animation Name="gAnju1SitAnim" Offset="0x71E8" /> <!-- Original name is "an_suwaru" ("to sit") -->
-        <Animation Name="gAnju1SittingInDisbeliefAnim" Offset="0x7E08" /> <!-- Original name is "an_suzetsubou" ("su" = short for "suwaru", "zetsubou" = "despair; hopelessness​") -->
-        <Animation Name="gAnju1IdleAnim" Offset="0x8B6C" /> <!-- Original name is "an_wait" -->
-
-        <!-- Skeleton's Display lists -->
-        <DList Name="gAnju1Skirt4DL" Offset="0xBC20" />
-        <DList Name="gAnju1Skirt3DL" Offset="0xBD20" />
-        <DList Name="gAnju1Skirt2DL" Offset="0xBE60" />
-        <DList Name="gAnju1Skirt1DL" Offset="0xBF88" />
-        <DList Name="gAnju1LeftFootDL" Offset="0xC080" />
-        <DList Name="gAnju1LeftShinDL" Offset="0xC2E8" />
-        <DList Name="gAnju1LeftThighDL" Offset="0xC3C0" />
-        <DList Name="gAnju1RightFootDL" Offset="0xC480" />
-        <DList Name="gAnju1RightShinDL" Offset="0xC6E8" />
-        <DList Name="gAnju1RightThighDL" Offset="0xC7C0" />
-        <DList Name="gAnju1PelvisDL" Offset="0xC880" />
-        <DList Name="gAnju1HeadDL" Offset="0xC940" />
-        <DList Name="gAnju1RightHandDL" Offset="0xD030" />
-        <DList Name="gAnju1RightForearmDL" Offset="0xD208" />
-        <DList Name="gAnju1RightUpperArmDL" Offset="0xD320" />
-        <DList Name="gAnju1LeftHandDL" Offset="0xD440" />
-        <DList Name="gAnju1LeftForearmDL" Offset="0xD618" />
-        <DList Name="gAnju1LeftUpperArmDL" Offset="0xD730" />
-        <DList Name="gAnju1TorsoDL" Offset="0xD850" />
-
-        <!-- Skeleton's TLUTs -->
-        <Texture Name="gAnju1TLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0xDB20" />
-        <Texture Name="gAnju1EyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xDD20" />
-        <Texture Name="gAnju1MouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0xDF20" />
-
-        <!-- Skeleton's textures -->
-        <Texture Name="gAnju1SkinTex" OutName="anju_skin" Format="ci8" Width="8" Height="8" Offset="0xE120" />
-        <Texture Name="gAnju1HairTex" OutName="anju_hair" Format="ci8" Width="8" Height="16" Offset="0xE160" />
-        <Texture Name="gAnju1EyeOpenTex" OutName="anju_eye_open" Format="ci8" Width="32" Height="32" Offset="0xE1E0" TlutOffset="0xDD20" />
-        <Texture Name="gAnju1EarTex" OutName="anju_ear" Format="ci8" Width="16" Height="16" Offset="0xE5E0" />
-        <Texture Name="gAnju1MouthClosedTex" OutName="anju_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xE6E0" TlutOffset="0xDF20" />
-        <Texture Name="gAnju1ShirtButtonTex" OutName="anju_shirt_button" Format="ci8" Width="8" Height="8" Offset="0xE8E0" />
-        <Texture Name="gAnju1HandTex" OutName="anju_hand" Format="ci8" Width="16" Height="16" Offset="0xE920" />
-        <Texture Name="gAnju1SkirtTex" OutName="anju_skirt" Format="ci8" Width="32" Height="32" Offset="0xEA20" />
-        <Texture Name="gAnju1ShirtTex" OutName="anju_shirt" Format="ci8" Width="16" Height="16" Offset="0xEE20" />
-        <Texture Name="gAnju1SleeveTex" OutName="anju_sleeve" Format="ci8" Width="8" Height="16" Offset="0xEF20" />
-        <Texture Name="gAnju1EyeHalfTex" OutName="anju_eye_half" Format="ci8" Width="32" Height="32" Offset="0xEFA0" TlutOffset="0xDD20" />
-        <Texture Name="gAnju1EyeClosedTex" OutName="anju_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF3A0" TlutOffset="0xDD20" />
-        <Texture Name="gAnju1MouthHappyTex" OutName="anju_mouth_happy" Format="ci8" Width="32" Height="16" Offset="0xF7A0" TlutOffset="0xDF20" />
-        <Texture Name="gAnju1EyeSadTex" OutName="anju_eye_sad" Format="ci8" Width="32" Height="32" Offset="0xF9A0" TlutOffset="0xDD20" />
-        <Texture Name="gAnju1EyeComfortTex" OutName="anju_eye_comfort" Format="ci8" Width="32" Height="32" Offset="0xFDA0" TlutOffset="0xDD20" />
-        <Texture Name="gAnju1MouthOpenTex" OutName="anju_mouth_open" Format="ci8" Width="32" Height="16" Offset="0x101A0" TlutOffset="0xDF20" />
-        <Texture Name="gAnju1EyeRelievedClosedTex" OutName="anju_eye_relieved_closed" Format="ci8" Width="32" Height="32" Offset="0x103A0" TlutOffset="0xDD20" />
-
-        <!-- Empty -->
-        <DList Name="gAnju1EmptyDL" Offset="0x111E0" />
-
-        <!-- Food tray for Granny -->
-        <DList Name="gAnju1FoodTrayDL" Offset="0x111E8" /> <!-- Original name is "an_obon_model" -->
-        <Texture Name="gAnju1PlateTex" OutName="tray_plate" Format="i8" Width="32" Height="32" Offset="0x11928" />
-        <Texture Name="gAnju1Food1Tex" OutName="tray_food_1" Format="rgba16" Width="16" Height="16" Offset="0x11D28" />
-        <Texture Name="gAnju1Food2Tex" OutName="tray_food_2" Format="rgba16" Width="16" Height="16" Offset="0x11F28" />
-        <Texture Name="gAnju1CircleTex" OutName="tray_circle" Format="i8" Width="16" Height="16" Offset="0x12128" />
-        <Texture Name="gAnju1Steam1Tex" OutName="tray_steam_1" Format="i4" Width="16" Height="16" Offset="0x12228" />
-        <Texture Name="gAnju1Steam2Tex" OutName="tray_steam_2" Format="i8" Width="16" Height="16" Offset="0x122A8" />
-
-        <!-- <Blob Name="object_an1_Blob_0123A8" Size="0x10" Offset="0x123A8" /> -->
-
-        <!-- Chopsticks used for cooking -->
-        <DList Name="gAnju1ChopsticksDL" Offset="0x12478" /> <!-- Original name is "an_hashi_model" ("chopsticks​") -->
-
-        <!-- Skeleton's limbs -->
-        <Limb Name="gAnju1RootLimb" Type="Standard" EnumName="ANJU1_LIMB_ROOT" Offset="0x124D8" />
-        <Limb Name="gAnju1TorsoLimb" Type="Standard" EnumName="ANJU1_LIMB_TORSO" Offset="0x124E4" />
-        <Limb Name="gAnju1LeftUpperArmLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_UPPER_ARM" Offset="0x124F0" />
-        <Limb Name="gAnju1LeftForearmLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_FOREARM" Offset="0x124FC" />
-        <Limb Name="gAnju1LeftHandLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_HAND" Offset="0x12508" />
-        <Limb Name="gAnju1RightUpperArmLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_UPPER_ARM" Offset="0x12514" />
-        <Limb Name="gAnju1RightForearmLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_FOREARM" Offset="0x12520" />
-        <Limb Name="gAnju1RightHandLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_HAND" Offset="0x1252C" />
-        <Limb Name="gAnju1HeadLimb" Type="Standard" EnumName="ANJU1_LIMB_HEAD" Offset="0x12538" />
-        <Limb Name="gAnju1PelvisLimb" Type="Standard" EnumName="ANJU1_LIMB_PELVIS" Offset="0x12544" />
-        <Limb Name="gAnju1RightThighLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_THIGH" Offset="0x12550" />
-        <Limb Name="gAnju1RightShinLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_SHIN" Offset="0x1255C" />
-        <Limb Name="gAnju1RightFootLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_FOOT" Offset="0x12568" />
-        <Limb Name="gAnju1LeftThighLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_THIGH" Offset="0x12574" />
-        <Limb Name="gAnju1LeftShinLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_SHIN" Offset="0x12580" />
-        <Limb Name="gAnju1LeftFootLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_FOOT" Offset="0x1258C" />
-        <Limb Name="gAnju1Skirt1Limb" Type="Standard" EnumName="ANJU1_LIMB_SKIRT1" Offset="0x12598" />
-        <Limb Name="gAnju1Skirt2Limb" Type="Standard" EnumName="ANJU1_LIMB_SKIRT2" Offset="0x125A4" />
-        <Limb Name="gAnju1Skirt3Limb" Type="Standard" EnumName="ANJU1_LIMB_SKIRT3" Offset="0x125B0" />
-        <Limb Name="gAnju1Skirt4Limb" Type="Standard" EnumName="ANJU1_LIMB_SKIRT4" Offset="0x125BC" />
-
-        <!-- Skeleton -->
-        <Skeleton Name="gAnju1Skel" Type="Flex" LimbType="Standard" LimbNone="ANJU1_LIMB_NONE" LimbMax="ANJU1_LIMB_MAX" EnumName="Anju1Limb" Offset="0x12618" />
-
-        <Animation Name="gAnju1WalkAnim" Offset="0x13048" /> <!-- Original name is "an_walk" -->
-        <Animation Name="gAnju1HoldHandsAnim" Offset="0x13E1C" /> <!-- Holding hands with Kafei while kneeled --> <!-- Original name is "anj_tetunagu_loop" ("joined hands") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an2.xml
deleted file mode 100644
index f56be1431..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an2.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Assets for Anju on the rainy second day -->
-    <File Name="object_an2" Segment="6">
-        <!-- Empty -->
-        <DList Name="gAnju2EmptyDL" Offset="0x370" />
-
-        <!-- Umbrella -->
-        <DList Name="gAnju2UmbrellaDL" Offset="0x378" /> <!-- Original name is "an_kasa_model" ("umbrella; parasol") -->
-        <Texture Name="gAnju2UmbrellaCircleTex" OutName="umbrella_circle" Format="i8" Width="16" Height="16" Offset="0x578" />
-        <Texture Name="gAnju2UmbrellaDesignTex" OutName="umbrella_design" Format="i8" Width="32" Height="32" Offset="0x678" />
-
-        <!-- Animations holding the umbrella -->
-        <Animation Name="gAnju2UmbrellaCryAnim" Offset="0x1B80" /> <!-- Original name is "an_kasasuwarinaku" ("suwari" = "sitting", "naku" = "to cry; to weep; to sob") -->
-        <Animation Name="gAnju2UmbrellaIdleAnim" Offset="0x28DC" /> <!-- Original name is "an_kasawait" -->
-        <Animation Name="gAnju2UmbrellaSitAnim" Offset="0x38A0" /> <!-- Original name is "an_kasawait2suwaru" ("suwaru" = "to sit") -->
-        <Animation Name="gAnju2UmbrellaWalkAnim" Offset="0x42CC" /> <!-- Original name is "an_kasawalk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an3.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an3.xml
deleted file mode 100644
index a5268448c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an3.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Assets for Anju sweeping on the third day -->
-    <File Name="object_an3" Segment="6">
-        <!-- Empty -->
-        <DList Name="gAnju3EmptyDL" Offset="0x300" />
-
-        <!-- Broom -->
-        <DList Name="gAnju3BroomDL" Offset="0x308" /> <!-- Original name is "an_hoki_model" ("broom") -->
-        <Texture Name="gAnju3BroomCircleTex" OutName="broom_circle" Format="i8" Width="16" Height="16" Offset="0x4C8" />
-        <Texture Name="gAnju3BroomSideTex" OutName="broom_side" Format="rgba16" Width="8" Height="32" Offset="0x5C8" />
-        <Texture Name="gAnju3BroomBaseTex" OutName="broom_base" Format="rgba16" Width="8" Height="8" Offset="0x7C8" />
-
-        <!-- Broom-related animations -->
-        <Animation Name="gAnju3BroomSweepAnim" Offset="0x12C0" /> <!-- Original name is "an_hokihaku" ("haku" = "to sweep; to brush; to clean​") -->
-        <Animation Name="gAnju3BroomIdleAnim" Offset="0x201C" /> <!-- Original name is "an_hokiwait" -->
-        <Animation Name="gAnju3BroomWalkAnim" Offset="0x2A4C" /> <!-- Original name is "an_hokiwalk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an4.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an4.xml
deleted file mode 100644
index d159c3dd5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_an4.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<Root>
-    <!-- Assets for Anju in the Couple's Mask cutscene -->
-    <File Name="object_an4" Segment="6">
-        <Animation Name="gAnju4CombineMasks2Anim" Offset="0x41C" /> <!-- Original name is "anj_awase" ("to face; to be opposite (someone)") -->
-
-        <Animation Name="gAnju4HugAnim" Offset="0x13C8" /> <!-- Start hugging while kneeled --> <!-- Original name is "anj_dakiau" ("to embrace each other​") -->
-        <Animation Name="gAnju4HugLoopAnim" Offset="0x2550" /> <!-- hugging while kneeled --> <!-- Original name is "anj_dakiau_loop" -->
-
-        <Animation Name="gAnju4HugReleaseAnim" Offset="0x353C" /> <!-- Stop hugging while kneeled -->  <!-- Original name is "anj_hanare" ("to be separated; to be apart") -->
-        <Animation Name="gAnju4HugReleaseLoopAnim" Offset="0x4498" /> <!-- Original name is "anj_hanare_loop" -->
-
-        <Animation Name="gAnju4LookUpAnim" Offset="0x4A78" /> <!-- Original name is "anj_kaoage" ("raising face") -->
-        <Animation Name="gAnju4LookUpLoopAnim" Offset="0x506C" /> <!-- Original name is "anj_kaoage_loop" -->
-
-        <Animation Name="gAnju4CombineMasks1Anim" Offset="0x60B4" /> <!-- Shows Moon Mask to Kafei --> <!-- Original name is "anj_miseau" ("to show each other​") -->
-
-        <Animation Name="gAnju4MaskStandLoopAnim" Offset="0x6CC0" /> <!-- Holds the Moon Mask while standing --> <!-- Original name is "anj_mitume_loop" ("to stare (at); to gaze (at)") -->
-
-        <Animation Name="gAnju4MaskKneelAnim" Offset="0x7E3C" /> <!-- Holds the Moon Mask while kneeling --> <!-- Original name is "anj_omen" ("mask") -->
-        <Animation Name="gAnju4MaskKneelLoopAnim" Offset="0x88C0" /> <!-- Holds the Moon Mask while kneeled --> <!-- Original name is "anj_omen_loop" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_and.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_and.xml
deleted file mode 100644
index 69ffebc7b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_and.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<Root>
-    <!-- Assets for Anju in a wedding dress -->
-    <File Name="object_and" Segment="6">
-        <Animation Name="gAndStaticAnim" Offset="0xC8" /> <!-- Original name is "and_test" -->
-        <DList Name="gAndTrainDL" Offset="0x4670" />
-        <DList Name="gAndCalvesDL" Offset="0x4708" />
-        <DList Name="gAndShinsDL" Offset="0x47F0" />
-        <DList Name="gAndThighsDL" Offset="0x4998" />
-        <DList Name="gAndPelvisDL" Offset="0x4BE0" />
-        <DList Name="gAndLowerVeilDL" Offset="0x4D90" />
-        <DList Name="gAndUpperVeilDL" Offset="0x4E50" />
-        <DList Name="gAndVeilBaseDL" Offset="0x4F20" />
-        <DList Name="gAndHeadDL" Offset="0x5038" />
-        <DList Name="gAndBouquetDL" Offset="0x56C0" />
-        <DList Name="gAndCenterLeavesTipDL" Offset="0x5888" />
-        <DList Name="gAndCenterLeavesDL" Offset="0x5938" />
-        <DList Name="gAndRightLeavesTipDL" Offset="0x59C8" />
-        <DList Name="gAndRightLeavesDL" Offset="0x5A80" />
-        <DList Name="gAndLeftLeavesTipDL" Offset="0x5BA8" />
-        <DList Name="gAndLeftLeavesDL" Offset="0x5C60" />
-        <DList Name="gAndRightHandDL" Offset="0x5D80" />
-        <DList Name="gAndRightForearmDL" Offset="0x5F10" />
-        <DList Name="gAndRightUpperArmDL" Offset="0x5FF8" />
-        <DList Name="gAndLeftHandDL" Offset="0x6240" />
-        <DList Name="gAndLeftForearmDL" Offset="0x63D8" />
-        <DList Name="gAndLeftUpperArmDL" Offset="0x64C0" />
-        <DList Name="gAndSymbolDL" Offset="0x6708" />
-        <DList Name="gAndTorsoDL" Offset="0x67E0" />
-        <Texture Name="gAndSkinShadowTex" OutName="and_skin_shadow" Format="rgba16" Width="8" Height="8" Offset="0x6C30" />
-        <Texture Name="gAndHairTex" OutName="and_hair" Format="rgba16" Width="8" Height="16" Offset="0x6CB0" />
-        <Texture Name="gAndEarTex" OutName="and_ear" Format="rgba16" Width="16" Height="16" Offset="0x6DB0" />
-        <Texture Name="gAndFingersTex" OutName="and_fingers" Format="rgba16" Width="16" Height="16" Offset="0x6FB0" />
-        <Texture Name="gAndDressGradientTex" OutName="and_dress_gradient" Format="i8" Width="8" Height="8" Offset="0x71B0" />
-        <Texture Name="gAndDressSymbolTex" OutName="and_dress_symbol" Format="i8" Width="32" Height="32" Offset="0x71F0" />
-        <Texture Name="gAndPearlTex" OutName="and_pearl" Format="rgba16" Width="16" Height="16" Offset="0x75F0" />
-        <Texture Name="gAndLeavesTex" OutName="and_leaves" Format="rgba16" Width="32" Height="16" Offset="0x77F0" />
-        <Texture Name="gAndFlowerTex" OutName="and_flower" Format="rgba16" Width="16" Height="16" Offset="0x7BF0" />
-        <Texture Name="gAndEyeOpenTex" OutName="and_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x7DF0" />
-        <Texture Name="gAndEyeClosingTex" OutName="and_eye_closing" Format="rgba16" Width="32" Height="32" Offset="0x85F0" />
-        <Texture Name="gAndEyeClosedTex" OutName="and_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x8DF0" />
-        <Texture Name="gAndEyeOpeningTex" OutName="and_eye_opening" Format="rgba16" Width="32" Height="32" Offset="0x95F0" />
-        <Texture Name="gAndMouthNeutralTex" OutName="and_mouth_neutral" Format="rgba16" Width="32" Height="16" Offset="0x9DF0" />
-        <Texture Name="gAndMouthSmileTex" OutName="and_mouth_smile" Format="rgba16" Width="32" Height="16" Offset="0xA1F0" />
-        <Texture Name="gAndDressSpotsTex" OutName="and_dress_spots" Format="i8" Width="32" Height="64" Offset="0xA5F0" />
-        <Texture Name="gAndDressCircleTex" OutName="and_dress_circle" Format="i8" Width="32" Height="32" Offset="0xADF0" />
-        <Limb Name="gAndRootLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_ROOT" Offset="0xB1F0" />
-        <Limb Name="gAndTorsoLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_TORSO" Offset="0xB1FC" />
-        <Limb Name="gAndSymbolLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_SYMBOL" Offset="0xB208" />
-        <Limb Name="gAndLeftUpperArmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_UPPER_ARM" Offset="0xB214" />
-        <Limb Name="gAndLeftForearmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_FOREARM" Offset="0xB220" />
-        <Limb Name="gAndLeftHandLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_HAND" Offset="0xB22C" />
-        <Limb Name="gAndRightUpperArmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_UPPER_ARM" Offset="0xB238" />
-        <Limb Name="gAndRightForearmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_FOREARM" Offset="0xB244" />
-        <Limb Name="gAndRightHandLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_HAND" Offset="0xB250" />
-        <Limb Name="gAndBouquetLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_BOUQUET" Offset="0xB25C" />
-        <Limb Name="gAndLeftLeavesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_LEAVES" Offset="0xB268" />
-        <Limb Name="gAndLeftLeavesTipLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_LEAVES_TIP" Offset="0xB274" />
-        <Limb Name="gAndRightLeavesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_LEAVES" Offset="0xB280" />
-        <Limb Name="gAndRightLeavesTipLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_LEAVES_TIP" Offset="0xB28C" />
-        <Limb Name="gAndCenterLeavesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_CENTER_LEAVES" Offset="0xB298" />
-        <Limb Name="gAndCenterLeavesTipLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_CENTER_LEAVES_TIP" Offset="0xB2A4" />
-        <Limb Name="gAndVeilBaseLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_VEIL_BASE" Offset="0xB2B0" />
-        <Limb Name="gAndHeadLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_HEAD" Offset="0xB2BC" />
-        <Limb Name="gAndUpperVeilLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_UPPER_VEIL" Offset="0xB2C8" />
-        <Limb Name="gAndLowerVeilLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LOWER_VEIL" Offset="0xB2D4" />
-        <Limb Name="gAndPelvisLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_PELVIS" Offset="0xB2E0" />
-        <Limb Name="gAndThighsLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_THIGHS" Offset="0xB2EC" />
-        <Limb Name="gAndShinsLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_SHINS" Offset="0xB2F8" />
-        <Limb Name="gAndCalvesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_CALVES" Offset="0xB304" />
-        <Limb Name="gAndTrainLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_TRAIN" Offset="0xB310" />
-        <Skeleton Name="gAndSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AND_LIMB_NONE" LimbMax="OBJECT_AND_LIMB_MAX" EnumName="ObjectAndLimb" Offset="0xB380" />
-        <Animation Name="gAndWalkAnim" Offset="0xDA58" /> <!-- Original name is "wa_aruku" ("walk") -->
-        <Animation Name="gAndRaiseHandAnim" Offset="0xEE00" /> <!-- Original name is "wa_hidari" ("left; left hand side") -->
-        <Animation Name="gAndRaisedHandLoopAnim" Offset="0xF6C4" /> <!-- Original name is "wa_hidari_loop" -->
-        <Animation Name="gAndRaiseHeadAnim" Offset="0xFE64" /> <!-- Original name is "wa_kaoage" ("raising face") -->
-        <Animation Name="gAndRaisedHeadLoopAnim" Offset="0x1067C" /> <!-- Original name is "wa_kaoage_loop" -->
-        <Animation Name="gAndRaisedHandWalkAnim" Offset="0x11AFC" /> <!-- Original name is "wa_kaoaruki" (probably a combination of "kaoage" and "aruki") -->
-        <Animation Name="gAndIdleAnim" Offset="0x122D0" /> <!-- Original name is "wa_utumuki_loop" ("looking down") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ani.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ani.xml
deleted file mode 100644
index 8bc8aa5e3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ani.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<Root>
-    <File Name="object_ani" Segment="6">
-        <Animation Name="gAniTreeHangLosingBalanceAnim" Offset="0x7FC" /> <!-- Original name is "Ani_guratsuku" ("to be unsteady; to reel; to shake​") -->
-        <Animation Name="gAniFallOverHoldingFootAnim" Offset="0xC14" /> <!-- Original name is "Ani_itameru" ("to hurt; to injure; to cause pain") -->
-        <Animation Name="gAniHoldingFootWrithingInPainAnim" Offset="0x11CC" /> <!-- Original name is "Ani_itameru2" -->
-        <Animation Name="gAniUnusedSidesteppingAnim" Offset="0x1584" /> <!-- Original name is "Ani_kaniark" ("kami" = "crab", "ark" = probably short for "aruki", which is "to walk") -->
-        <Animation Name="gAniTreeHangingAnim" Offset="0x1D48" /> <!-- Original name is "Ani_ki01" ("tree") -->
-        <Animation Name="gAniTreeHangingReachAnim" Offset="0x27A0" /> <!-- Original name is "Ani_ki02" -->
-        <Limb Name="gAniPelvisLimb" Type="Standard" EnumName="ANI_LIMB_PELVIS" Offset="0x27B0" />
-        <Limb Name="gAniLeftThighLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_THIGH" Offset="0x27BC" />
-        <Limb Name="gAniLeftShinLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_SHIN" Offset="0x27C8" />
-        <Limb Name="gAniLeftFootLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_FOOT" Offset="0x27D4" />
-        <Limb Name="gAniRightThighLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_THIGH" Offset="0x27E0" />
-        <Limb Name="gAniRightShinLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_SHIN" Offset="0x27EC" />
-        <Limb Name="gAniRightFootLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_FOOT" Offset="0x27F8" />
-        <Limb Name="gAniTorsoLimb" Type="Standard" EnumName="ANI_LIMB_TORSO" Offset="0x2804" />
-        <Limb Name="gAniLeftUpperArmLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_UPPER_ARM" Offset="0x2810" />
-        <Limb Name="gAniLeftForearmLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_FOREARM" Offset="0x281C" />
-        <Limb Name="gAniLeftHandLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_HAND" Offset="0x2828" />
-        <Limb Name="gAniRightUpperArmLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_UPPER_ARM" Offset="0x2834" />
-        <Limb Name="gAniRightForearmLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_FOREARM" Offset="0x2840" />
-        <Limb Name="gAniRightHandLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_HAND" Offset="0x284C" />
-        <Limb Name="gAniHeadLimb" Type="Standard" EnumName="ANI_LIMB_HEAD" Offset="0x2858" />
-        <Skeleton Name="gAniSkel" Type="Flex" LimbType="Standard" LimbNone="ANI_LIMB_NONE" LimbMax="ANI_LIMB_MAX" EnumName="AniLimb" Offset="0x28A0" />
-        <DList Name="gAniRightHandDL" Offset="0x4860" />
-        <DList Name="gAniRightForearmDL" Offset="0x4A50" />
-        <DList Name="gAniRightUpperArmDL" Offset="0x4B38" />
-        <DList Name="gAniLeftHandDL" Offset="0x4C30" />
-        <DList Name="gAniLeftForearmDL" Offset="0x4E20" />
-        <DList Name="gAniLeftUpperArmDL" Offset="0x4F08" />
-        <DList Name="gAniTorsoDL" Offset="0x5000" />
-        <DList Name="gAniRightFootDL" Offset="0x5270" />
-        <DList Name="gAniRightShinDL" Offset="0x5420" />
-        <DList Name="gAniRightThighDL" Offset="0x5668" />
-        <DList Name="gAniLeftFootDL" Offset="0x5778" />
-        <DList Name="gAniLeftShinDL" Offset="0x5928" />
-        <DList Name="gAniLeftThighDL" Offset="0x5C50" />
-        <DList Name="gAniPelvisDL" Offset="0x5D60" />
-        <Texture Name="gAniGeneralTLUT" OutName="ani_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5E58" />
-        <Texture Name="gAniUnkGradientTex" OutName="ani_unk_gradient1" Format="ci8" Width="8" Height="8" Offset="0x6058" />
-        <Texture Name="gAniFingersTex" OutName="ani_fingers" Format="ci8" Width="8" Height="8" Offset="0x6098" />
-        <Texture Name="gAniShirtEdgeTex" OutName="ani_shirt_edge" Format="i8" Width="8" Height="8" Offset="0x60D8" />
-        <Texture Name="gAniSandleBuckleTex" OutName="ani_sandle_buckle" Format="ci8" Width="16" Height="16" Offset="0x6118" />
-        <Texture Name="gAniPantsTex" OutName="ani_pants" Format="ci8" Width="16" Height="16" Offset="0x6218" />
-        <Texture Name="gAniEyeTLUT" OutName="ani_eye_tlut" Format="rgba16" Width="16" Height="12" Offset="0x6318" />
-        <Texture Name="gAniOpenEyeTex" OutName="ani_open_eye" Format="ci8" Width="32" Height="32" Offset="0x6498" TlutOffset="0x6318" />
-        <Texture Name="gAniMouthTex" OutName="ani_mouth" Format="ci8" Width="16" Height="16" Offset="0x6898" />
-        <Texture Name="gAniUnkGradient2Tex" OutName="ani_unk_gradient2" Format="ci8" Width="8" Height="8" Offset="0x6998" />
-        <Texture Name="gAniEarTex" OutName="ani_ear" Format="ci8" Width="8" Height="8" Offset="0x69D8" />
-        <Texture Name="gAniHairTex" OutName="ani_hair" Format="ci8" Width="16" Height="16" Offset="0x6A18" />
-        <Texture Name="gAniClosingEyeTex" OutName="ani_closing_eye" Format="ci8" Width="32" Height="32" Offset="0x6B18" TlutOffset="0x6318"/>
-        <Texture Name="gAniClosedEyeTex" OutName="ani_closed_eye" Format="ci8" Width="32" Height="32" Offset="0x6F18" TlutOffset="0x6318"/>
-        <DList Name="gAniHeadDL" Offset="0x7B58" />
-
-        <!-- Only the first half of the animation is used by EnAni when knocked out of tree -->
-        <Animation Name="gAniLandingThenStandingUpAnim" Offset="0x9220" /> <!-- Original name is "Ani_oriru" ("to go down; to come down​") -->
-        <!-- used by EnOssan -->
-        <Animation Name="gAniHoldUpHandAnim" Offset="0x9734" /> <!-- Original name is "Ani_talk" -->
-        <Animation Name="gAniStandingNormalAnim" Offset="0x9D34" /> <!-- Original name is "Ani_wait" -->
-        <Animation Name="gAniHandBehindHeadApologyAnim" Offset="0xA460" /> <!-- Original name is "Ani_zorawait" -->
-        <!-- left over from OOT firetemple deathmountain cutscene, unused in MM -->
-        <Animation Name="gAniKnockBackAnim" Offset="0xA978" /> <!-- Original name is "ani_bikkuri" ("to be amazed; to be frightened") -->
-        <Animation Name="gAniKnockBackGettingUpAnim" Offset="0xB2B0" /> <!-- Original name is "ani_nanyarona" -->
-        <!-- left over from OOT sitting on roof, unused in MM -->
-        <Animation Name="gAniSittingBackAnim" Offset="0xB8AC" /> <!-- Original name is "ani_suwari_wait" ("sitting") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_aob.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_aob.xml
deleted file mode 100644
index 50de06ea0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_aob.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Assets for Mamamu Yan, the proprietor of the Doggy Racetrack. -->
-    <File Name="object_aob" Segment="6">
-        <!-- Unused dummied-out idle animation. Probably an OoT leftover, since her idle animation in that game has the same name. -->
-        <Animation Name="gMamamuYanUnusedIdleAnim" Offset="0x7C" /> <!-- Original name is "Aob_mastu" (probably a misspelling of "matsu" or "wait") -->
-
-        <!-- Mamamu Yan Limbs -->
-        <Limb Name="gMamamuYanDressLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_DRESS" Offset="0x90" />
-        <Limb Name="gMamamuYanLeftThighLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_THIGH" Offset="0x9C" />
-        <Limb Name="gMamamuYanLeftShinLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_SHIN" Offset="0xA8" />
-        <Limb Name="gMamamuYanLeftFootLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_FOOT" Offset="0xB4" />
-        <Limb Name="gMamamuYanRightThighLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_THIGH" Offset="0xC0" />
-        <Limb Name="gMamamuYanRightShinLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_SHIN" Offset="0xCC" />
-        <Limb Name="gMamamuYanRightFootLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_FOOT" Offset="0xD8" />
-        <Limb Name="gMamamuYanTorsoLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_TORSO" Offset="0xE4" />
-        <Limb Name="gMamamuYanLeftUpperArmLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_UPPER_ARM" Offset="0xF0" />
-        <Limb Name="gMamamuYanLeftForearmLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_FOREARM" Offset="0xFC" />
-        <Limb Name="gMamamuYanLeftHandLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_HAND" Offset="0x108" />
-        <Limb Name="gMamamuYanRightUpperArmLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_UPPER_ARM" Offset="0x114" />
-        <Limb Name="gMamamuYanRightForearmLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_FOREARM" Offset="0x120" />
-        <Limb Name="gMamamuYanRightHandLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_HAND" Offset="0x12C" />
-        <Limb Name="gMamamuYanHeadLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_HEAD" Offset="0x138" />
-
-        <!-- Mamamu Yan Skeleton -->
-        <Skeleton Name="gMamamuYanSkel" Type="Flex" LimbType="Standard" LimbNone="MAMAMU_YAN_LIMB_NONE" LimbMax="MAMAMU_YAN_LIMB_MAX" EnumName="MamamuYanLimb" Offset="0x180" />
-
-        <!-- Mamamu Yan Textures -->
-        <Texture Name="gMamamuYanTLUT" OutName="mamamu_yan_tlut" Format="rgba16" Width="16" Height="16" Offset="0x198" />
-        <Texture Name="gMamamuYanHairTex" OutName="mamamu_yan_hair" Format="ci8" Width="16" Height="16" Offset="0x398" />
-        <Texture Name="gMamamuYanSkinTex" OutName="mamamu_yan_skin" Format="ci8" Width="8" Height="8" Offset="0x498" />
-        <Texture Name="gMamamuYanEarTex" OutName="mamamu_yan_ear" Format="ci8" Width="16" Height="16" Offset="0x4D8" />
-        <Texture Name="gMamamuYanLipsTex" OutName="mamamu_yan_lips" Format="ci8" Width="8" Height="8" Offset="0x5D8" />
-        <Texture Name="gMamamuYanNostrilTex" OutName="mamamu_yan_nostril" Format="ci8" Width="8" Height="8" Offset="0x618" />
-        <Texture Name="gMamamuYanEyeOpenTex" OutName="mamamu_yan_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x658" /> 
-        <Texture Name="gMamamuYanEyeHalfTex" OutName="mamamu_yan_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xE58" /> 
-        <Texture Name="gMamamuYanEyeClosedTex" OutName="mamamu_yan_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1658" /> 
-        <Texture Name="gMamamuYanFingersTex" OutName="mamamu_yan_fingers" Format="ci8" Width="16" Height="16" Offset="0x1E58" />
-        <Texture Name="gMamamuYanSleevesTex" OutName="mamamu_yan_sleeves" Format="ci8" Width="8" Height="8" Offset="0x1F58" />
-        <Texture Name="gMamamuYanDressTex" OutName="mamamu_yan_dress" Format="ci8" Width="8" Height="8" Offset="0x1F98" />
-
-        <!-- Mamamu Yan Limb DisplayLists -->
-        <DList Name="gMamamuYanHeadDL" Offset="0x3D18" />
-        <DList Name="gMamamuYanRightHandDL" Offset="0x44D8" />
-        <DList Name="gMamamuYanRightForearmDL" Offset="0x46E0" />
-        <DList Name="gMamamuYanRightUpperArmDL" Offset="0x4810" />
-        <DList Name="gMamamuYanLeftHandDL" Offset="0x49B8" />
-        <DList Name="gMamamuYanLeftForearmDL" Offset="0x4BC0" />
-        <DList Name="gMamamuYanLeftUpperArmDL" Offset="0x4CF0" />
-        <DList Name="gMamamuYanTorsoDL" Offset="0x4E98" />
-        <DList Name="gMamamuYanRightFootDL" Offset="0x5138" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanRightShinDL" Offset="0x5208" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanRightThighDL" Offset="0x52D8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanLeftFootDL" Offset="0x53A8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanLeftShinDL" Offset="0x5478" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanLeftThighDL" Offset="0x5548" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanDressDL" Offset="0x5618" />
-
-        <!-- Mamamu Yan Animations -->
-        <Animation Name="gMamamuYanSurpriseStartAnim" Offset="0x58EC" /> <!-- Original name is "Aob_odoroku" ("surprise") -->
-        <Animation Name="gMamamuYanSurpriseLoopAnim" Offset="0x6040" /> <!-- Original name is "Aob_odorokuroop" -->
-        <Animation Name="gMamamuYanLaughStartAnim" Offset="0x68B4" /> <!-- Original name is "Aob_sikkari" (reference to her catchphrase in the Japanese text) -->
-        <Animation Name="gMamamuYanLaughLoopAnim" Offset="0x700C" /> <!-- Original name is "Aob_sikkariroop" -->
-        <Animation Name="gMamamuYanIdleAnim" Offset="0x7758" /> <!-- Original name is "Aob_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_astr_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_astr_obj.xml
deleted file mode 100644
index 233de785b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_astr_obj.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_astr_obj" Segment="6">
-        <Texture Name="object_astr_obj_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="object_astr_obj_Tex_000020" OutName="tex_000020" Format="rgba16" Width="32" Height="32" Offset="0x20" />
-        <Texture Name="object_astr_obj_Tex_000820" OutName="tex_000820" Format="ci4" Width="64" Height="64" Offset="0x820" />
-        <Texture Name="object_astr_obj_Tex_001020" OutName="tex_001020" Format="ia8" Width="64" Height="64" Offset="0x1020" />
-        <DList Name="object_astr_obj_DL_002170" Offset="0x2170" />
-        <DList Name="object_astr_obj_DL_002178" Offset="0x2178" /> <!-- Original name is "z2_tennmondai_hahen_model" ("tennmondai" = "astronomical observatory​", "hahen" = "fragment") -->
-        <DList Name="object_astr_obj_DL_0022E0" Offset="0x22E0" />
-        <DList Name="object_astr_obj_DL_002380" Offset="0x2380" /> <!-- Original name is "z2_tennmondai_kabe_model" ("tennmondai" = "astronomical observatory​", "kabe" = "wall") -->
-        <Collision Name="object_astr_obj_Colheader_002498" Offset="0x2498" /> <!-- Original name is "z2_tennmondai_kabe_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_az.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_az.xml
deleted file mode 100644
index 42e5bdc61..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_az.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<Root>
-    <!-- Assets for the Beaver Bros. -->
-    <File Name="object_az" Segment="6">
-        <!-- Older Beaver Limb DisplayLists -->
-        <DList Name="gBeaverOlderBrotherHeadDL" Offset="0x1B80" />
-        <DList Name="gBeaverOlderBrotherHairLeftDL" Offset="0x2098" />
-        <DList Name="gBeaverOlderBrotherHairBackDL" Offset="0x2120" />
-        <DList Name="gBeaverOlderBrotherHairRightDL" Offset="0x21A8" />
-        <DList Name="gBeaverOlderBrotherTeethDL" Offset="0x2230" />
-        <DList Name="gBeaverOlderBrotherLeftArmDL" Offset="0x22C8" />
-        <DList Name="gBeaverOlderBrotherRightArmDL" Offset="0x2418" />
-        <DList Name="gBeaverOlderBrotherInnerTubeDL" Offset="0x2568" />
-        <DList Name="gBeaverOlderBrotherTorsoDL" Offset="0x26D8" />
-        <DList Name="gBeaverOlderBrotherTailEndDL" Offset="0x27D0" />
-        <DList Name="gBeaverOlderBrotherTailBaseDL" Offset="0x28D8" />
-        <DList Name="gBeaverOlderBrotherLeftLegDL" Offset="0x2A08" />
-        <DList Name="gBeaverOlderBrotherRightLegDL" Offset="0x2B48" />
-        <DList Name="gBeaverOlderBrotherPelvisDL" Offset="0x2C88" />
-
-        <!-- Older Beaver Textures -->
-        <Texture Name="gBeaverOlderBrotherGoggleTex" OutName="beaver_older_brother_goggle" Format="rgba16" Width="32" Height="32" Offset="0x2DC8" />
-        <Texture Name="gBeaverOlderBrotherMouthTex" OutName="beaver_older_brother_mouth" Format="rgba16" Width="32" Height="32" Offset="0x35C8" />
-        <Texture Name="gBeaverOlderBrotherNoseTex" OutName="beaver_older_brother_nose" Format="rgba16" Width="16" Height="32" Offset="0x3DC8" />
-        <Texture Name="gBeaverOlderBrotherSkinTex" OutName="beaver_older_brother_skin" Format="rgba16" Width="16" Height="16" Offset="0x41C8" />
-        <Texture Name="gBeaverOlderBrotherGoggleStrapTex" OutName="beaver_older_brother_goggle_strap" Format="rgba16" Width="16" Height="16" Offset="0x43C8" />
-        <Texture Name="gBeaverOlderBrotherCapTex" OutName="beaver_older_brother_cap" Format="rgba16" Width="16" Height="16" Offset="0x45C8" />
-        <Texture Name="gBeaverOlderBrotherToothTex" OutName="beaver_older_brother_tooth" Format="rgba16" Width="8" Height="16" Offset="0x47C8" />
-        <Texture Name="gBeaverOlderBrotherHairTex" OutName="beaver_older_brother_hair" Format="rgba16" Width="32" Height="32" Offset="0x48C8" /> <!-- A completely transparent texture -->
-        <Texture Name="gBeaverOlderBrotherHandAndFootTex" OutName="beaver_older_brother_hand_and_foot" Format="rgba16" Width="32" Height="32" Offset="0x50C8" />
-        <Texture Name="gBeaverOlderBrotherTorsoTex" OutName="beaver_older_brother_torso" Format="rgba16" Width="32" Height="32" Offset="0x58C8" />
-        <Texture Name="gBeaverOlderBrotherInnerTubeTex" OutName="beaver_older_brother_inner_tube" Format="rgba16" Width="32" Height="32" Offset="0x60C8" />
-        <Texture Name="gBeaverOlderBrotherTailTex" OutName="beaver_older_brother_tail" Format="rgba16" Width="32" Height="32" Offset="0x68C8" />
-        <Texture Name="gBeaverOlderBrotherPantsTex" OutName="beaver_older_brother_pants" Format="rgba16" Width="16" Height="16" Offset="0x70C8" />
-
-        <!-- Older Beaver Limbs -->
-        <Limb Name="gBeaverOlderBrotherRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_ROOT" Offset="0x72C8" />
-        <Limb Name="gBeaverOlderBrotherPelvisRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_PELVIS_ROOT" Offset="0x72D4" />
-        <Limb Name="gBeaverOlderBrotherPelvisLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_PELVIS" Offset="0x72E0" />
-        <Limb Name="gBeaverOlderBrotherTorsoRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TORSO_ROOT" Offset="0x72EC" />
-        <Limb Name="gBeaverOlderBrotherHeadRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_HEAD_ROOT" Offset="0x72F8" />
-        <Limb Name="gBeaverOlderBrotherHeadLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_HEAD" Offset="0x7304" />
-        <Limb Name="gBeaverOlderBrotherTeethLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TEETH" Offset="0x7310" />
-        <Limb Name="gBeaverOlderBrotherHairRightLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_HAIR_RIGHT" Offset="0x731C" />
-        <Limb Name="gBeaverOlderBrotherHairLeftLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_HAIR_LEFT" Offset="0x7328" />
-        <Limb Name="gBeaverOlderBrotherHairBackLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_HAIR_BACK" Offset="0x7334" />
-        <Limb Name="gBeaverOlderBrotherLeftArmRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_LEFT_ARM_ROOT" Offset="0x7340" />
-        <Limb Name="gBeaverOlderBrotherLeftArmLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_LEFT_ARM" Offset="0x734C" />
-        <Limb Name="gBeaverOlderBrotherRightArmRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_RIGHT_ARM_ROOT" Offset="0x7358" />
-        <Limb Name="gBeaverOlderBrotherRightArmLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_RIGHT_ARM" Offset="0x7364" />
-        <Limb Name="gBeaverOlderBrotherTorsoLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TORSO" Offset="0x7370" />
-        <Limb Name="gBeaverOlderBrotherInnerTubeLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_INNER_TUBE" Offset="0x737C" />
-        <Limb Name="gBeaverOlderBrotherTailRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TAIL_ROOT" Offset="0x7388" />
-        <Limb Name="gBeaverOlderBrotherTailBaseLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TAIL_BASE" Offset="0x7394" />
-        <Limb Name="gBeaverOlderBrotherTailEndLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TAIL_END" Offset="0x73A0" />
-        <Limb Name="gBeaverOlderBrotherRightLegRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_RIGHT_LEG_ROOT" Offset="0x73AC" />
-        <Limb Name="gBeaverOlderBrotherRightLegLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_RIGHT_LEG" Offset="0x73B8" />
-        <Limb Name="gBeaverOlderBrotherLeftLegRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_LEFT_LEG_ROOT" Offset="0x73C4" />
-        <Limb Name="gBeaverOlderBrotherLeftLegLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_LEFT_LEG" Offset="0x73D0" />
-
-        <!-- Older Beaver Skeleton -->
-        <Skeleton Name="gBeaverOlderBrotherSkel" Type="Flex" LimbType="Standard" LimbNone="BEAVER_OLDER_BROTHER_LIMB_NONE" LimbMax="BEAVER_OLDER_BROTHER_LIMB_MAX" EnumName="BeaverOlderBrotherLimb" Offset="0x7438" />
-
-        <!-- Beaver Animations -->
-        <Animation Name="gBeaverGlitchyLimbSpinAnim" Offset="0x750C" /> <!-- Original name might be "bea_wait". Unused -->
-        <Animation Name="gBeaverLaughLeftAnim" Offset="0x7D3C" /> <!-- Original name is "bev_chukletoL" -->
-        <Animation Name="gBeaverLaughRightAnim" Offset="0x86AC" /> <!-- Original name is "bev_chukletoR" -->
-        <Animation Name="gBeaverSwimWithSpinningTailAnim" Offset="0x8960" /> <!-- Original name is "bev_propellerswim" -->
-        <Animation Name="gBeaverSwimWithRaisedTailAnim" Offset="0x8BB4" /> <!-- Unused variation of gBeaverSwimWithSpinningTailAnim where the tail just stays upright. Original name is "bev_propellerswim2" -->
-        <Animation Name="gBeaverSwimAnim" Offset="0x8EAC" /> <!-- Original name is "bev_swim" -->
-        <Animation Name="gBeaverTalkAnim" Offset="0x925C" /> <!-- Original name is "bev_talk1" -->
-        <Animation Name="gBeaverTalkWaveArmsAnim" Offset="0x9B4C" /> <!-- Original name is "bev_talk2" -->
-        <Animation Name="gBeaverTalkToLeftAnim" Offset="0xA25C" /> <!-- Original name is "bev_talktoL" -->
-        <Animation Name="gBeaverTalkToRightAnim" Offset="0xAAEC" /> <!-- Original name is "bev_talktoR" -->
-        <Animation Name="gBeaverBowAnim" Offset="0xB94C" /> <!-- Original name is "bev_thankyou" -->
-        <Animation Name="gBeaverIdleAnim" Offset="0xBCFC" /> <!-- Original name is "bev_wait" -->
-        <Animation Name="gBeaverIdleFaceLeftAnim" Offset="0xC0A0" /> <!-- Original name is "bev_waittoL" -->
-        <Animation Name="gBeaverIdleFaceRightAnim" Offset="0xC47C" /> <!-- Original name is "bev_waittoR" -->
-        <Animation Name="gBeaverWalkAnim" Offset="0xC94C" /> <!-- Original name is "bev_walk" -->
-
-        <!-- Younger Beaver Limb DisplayLists -->
-        <DList Name="gBeaverYoungerBrotherHeadDL" Offset="0xE670" />
-        <DList Name="gBeaverYoungerBrotherHairLeftDL" Offset="0xEB58" />
-        <DList Name="gBeaverYoungerBrotherHairRightDL" Offset="0xEBE0" />
-        <DList Name="gBeaverYoungerBrotherHairBackDL" Offset="0xEC68" />
-        <DList Name="gBeaverYoungerBrotherTeethDL" Offset="0xECF0" />
-        <DList Name="gBeaverYoungerBrotherLeftArmDL" Offset="0xED88" />
-        <DList Name="gBeaverYoungerBrotherRightArmDL" Offset="0xEEE0" />
-        <DList Name="gBeaverYoungerBrotherLogsDL" Offset="0xF030" />
-        <DList Name="gBeaverYoungerBrotherTorsoDL" Offset="0xF190" />
-        <DList Name="gBeaverYoungerBrotherTailEndDL" Offset="0xF2B0" />
-        <DList Name="gBeaverYoungerBrotherTailBaseDL" Offset="0xF3B8" />
-        <DList Name="gBeaverYoungerBrotherLeftLegDL" Offset="0xF4E8" />
-        <DList Name="gBeaverYoungerBrotherRightLegDL" Offset="0xF638" />
-        <DList Name="gBeaverYoungerBrotherPelvisDL" Offset="0xF788" />
-
-        <!-- Younger Beaver Textures -->
-        <Texture Name="gBeaverYoungerBrotherEye1Tex" OutName="beaver_younger_brother_eye_1" Format="rgba16" Width="32" Height="32" Offset="0xF918" />
-        <Texture Name="gBeaverYoungerBrotherEye2Tex" OutName="beaver_younger_brother_eye_2" Format="rgba16" Width="32" Height="32" Offset="0x10118" />
-        <Texture Name="gBeaverYoungerBrotherEye3Tex" OutName="beaver_younger_brother_eye_3" Format="rgba16" Width="32" Height="32" Offset="0x10918" />
-        <Texture Name="gBeaverYoungerBrotherEye4Tex" OutName="beaver_younger_brother_eye_4" Format="rgba16" Width="32" Height="32" Offset="0x11118" />
-        <Texture Name="gBeaverYoungerBrotherMouthTex" OutName="beaver_younger_brother_mouth" Format="rgba16" Width="32" Height="32" Offset="0x11918" />
-        <Texture Name="gBeaverYoungerBrotherNoseTex" OutName="beaver_younger_brother_nose" Format="rgba16" Width="16" Height="32" Offset="0x12118" />
-        <Texture Name="gBeaverYoungerBrotherSkinTex" OutName="beaver_younger_brother_skin" Format="rgba16" Width="16" Height="16" Offset="0x12518" />
-        <Texture Name="gBeaverYoungerBrotherClothesTex" OutName="beaver_younger_brother_clothes" Format="rgba16" Width="32" Height="32" Offset="0x12718" />
-        <Texture Name="gBeaverYoungerBrotherHairTex" OutName="beaver_younger_brother_hair" Format="rgba16" Width="32" Height="32" Offset="0x12F18" />
-        <Texture Name="gBeaverYoungerBrotherToothTex" OutName="beaver_younger_brother_tooth" Format="rgba16" Width="8" Height="16" Offset="0x13718" />
-        <Texture Name="gBeaverYoungerBrotherHandAndFootTex" OutName="beaver_younger_brother_hand_and_foot" Format="rgba16" Width="32" Height="32" Offset="0x13818" />
-        <Texture Name="gBeaverYoungerBrotherLogsEndTex" OutName="beaver_younger_brother_logs_end" Format="rgba16" Width="32" Height="32" Offset="0x14018" />
-        <Texture Name="gBeaverYoungerBrotherLogsTex" OutName="beaver_younger_brother_logs" Format="rgba16" Width="32" Height="32" Offset="0x14818" />
-        <Texture Name="gBeaverYoungerBrotherTailTex" OutName="beaver_younger_brother_tail" Format="rgba16" Width="32" Height="32" Offset="0x15018" />
-        <Texture Name="gBeaverYoungerBrotherTailSkinTex" OutName="beaver_younger_brother_tail_skin" Format="rgba16" Width="32" Height="32" Offset="0x15818" />
-        <Texture Name="gBeaverYoungerBrotherBeltRedTex" OutName="beaver_younger_brother_belt_red" Format="rgba16" Width="32" Height="32" Offset="0x16018" />
-        <Texture Name="gBeaverYoungerBrotherBeltGreenTex" OutName="beaver_younger_brother_belt_green" Format="rgba16" Width="32" Height="32" Offset="0x16818" />
-        <Texture Name="gBeaverYoungerBrotherBeltBlueTex" OutName="beaver_younger_brother_belt_blue" Format="rgba16" Width="32" Height="32" Offset="0x17018" />
-
-        <!-- Younger Beaver Limbs -->
-        <Limb Name="gBeaverYoungerBrotherRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_ROOT" Offset="0x17820" />
-        <Limb Name="gBeaverYoungerBrotherPelvisRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_PELVIS_ROOT" Offset="0x1782C" />
-        <Limb Name="gBeaverYoungerBrotherPelvisLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_PELVIS" Offset="0x17838" />
-        <Limb Name="gBeaverYoungerBrotherTorsoRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TORSO_ROOT" Offset="0x17844" />
-        <Limb Name="gBeaverYoungerBrotherHeadRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_HEAD_ROOT" Offset="0x17850" />
-        <Limb Name="gBeaverYoungerBrotherHeadLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_HEAD" Offset="0x1785C" />
-        <Limb Name="gBeaverYoungerBrotherTeethLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TEETH" Offset="0x17868" />
-        <Limb Name="gBeaverYoungerBrotherHairRightLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_HAIR_RIGHT" Offset="0x17874" />
-        <Limb Name="gBeaverYoungerBrotherHairLeftLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_HAIR_LEFT" Offset="0x17880" />
-        <Limb Name="gBeaverYoungerBrotherHairBackLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_HAIR_BACK" Offset="0x1788C" />
-        <Limb Name="gBeaverYoungerBrotherLeftArmRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_LEFT_ARM_ROOT" Offset="0x17898" />
-        <Limb Name="gBeaverYoungerBrotherLeftArmLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_LEFT_ARM" Offset="0x178A4" />
-        <Limb Name="gBeaverYoungerBrotherRightArmRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_RIGHT_ARM_ROOT" Offset="0x178B0" />
-        <Limb Name="gBeaverYoungerBrotherRightArmLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_RIGHT_ARM" Offset="0x178BC" />
-        <Limb Name="gBeaverYoungerBrotherTorsoLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TORSO" Offset="0x178C8" />
-        <Limb Name="gBeaverYoungerBrotherLogsLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_LOGS" Offset="0x178D4" />
-        <Limb Name="gBeaverYoungerBrotherTailRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TAIL_ROOT" Offset="0x178E0" />
-        <Limb Name="gBeaverYoungerBrotherTailBaseLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TAIL_BASE" Offset="0x178EC" />
-        <Limb Name="gBeaverYoungerBrotherTailEndLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TAIL_END" Offset="0x178F8" />
-        <Limb Name="gBeaverYoungerBrotherRightLegRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_RIGHT_LEG_ROOT" Offset="0x17904" />
-        <Limb Name="gBeaverYoungerBrotherRightLegLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_RIGHT_LEG" Offset="0x17910" />
-        <Limb Name="gBeaverYoungerBrotherLeftLegRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_LEFT_LEG_ROOT" Offset="0x1791C" />
-        <Limb Name="gBeaverYoungerBrotherLeftLegLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_LEFT_LEG" Offset="0x17928" />
-
-        <!-- Younger Beaver Skeleton -->
-        <Skeleton Name="gBeaverYoungerBrotherSkel" Type="Flex" LimbType="Standard" LimbNone="BEAVER_YOUNGER_BROTHER_LIMB_NONE" LimbMax="BEAVER_YOUNGER_BROTHER_LIMB_MAX" EnumName="BeaverYoungerBrotherLimb" Offset="0x17990" />
-        
-        <!-- Textures for the vortex and splashing effects that appear behind the beavers when they swim. -->
-        <Texture Name="gBeaverUnusedTLUT" OutName="beaver_unused_tlut" Format="rgba16" Width="4" Height="4" Offset="0x179A0" />
-        <Texture Name="gBeaverOlderBrotherTailVortexMaskTex" OutName="beaver_older_brother_tail_vortex_mask" Format="i4" Width="32" Height="64" Offset="0x179C0" />
-        <Texture Name="gBeaverOlderBrotherTailVortexTex" OutName="beaver_older_brother_tail_vortex" Format="i4" Width="64" Height="64" Offset="0x17DC0" />
-        <Texture Name="gBeaverYoungerBrotherTailVortexTex" OutName="beaver_younger_brother_tail_vortex" Format="i4" Width="64" Height="64" Offset="0x185C0" />
-        <Texture Name="gBeaverYoungerBrotherTailVortexMaskTex" OutName="beaver_younger_brother_tail_vortex_mask" Format="i4" Width="64" Height="64" Offset="0x18DC0" />
-        <Texture Name="gBeaverYoungerBrotherTailSplashTex" OutName="beaver_younger_brother_tail_splash" Format="i4" Width="64" Height="64" Offset="0x195C0" />
-        <Texture Name="gBeaverYoungerBrotherTailSplashMaskTex" OutName="beaver_younger_brother_tail_splash_mask" Format="i4" Width="64" Height="64" Offset="0x19DC0" />
-
-        <!-- DisplayLists and TextureAnimations for the vortex effect that appears behind the older beaver brother. All DisplayLists are the same besides a change in alpha. -->
-        <DList Name="gBeaverOlderBrotherTailVortex1DL" Offset="0x1A600" /> <!-- Original name is "vux_001_model" -->
-        <TextureAnimation Name="gBeaverOlderBrotherTailVortex1TexAnim" Offset="0x1A6E8" />
-        <DList Name="gBeaverOlderBrotherTailVortex2DL" Offset="0x1A730" /> <!-- Original name is "vux_002_model" -->
-        <TextureAnimation Name="gBeaverOlderBrotherTailVortex2TexAnim" Offset="0x1A818" />
-        <DList Name="gBeaverOlderBrotherTailVortex3DL" Offset="0x1A860" /> <!-- Original name is "vux_003_model" -->
-        <TextureAnimation Name="gBeaverOlderBrotherTailVortex3TexAnim" Offset="0x1A948" />
-        <DList Name="gBeaverOlderBrotherTailVortex4DL" Offset="0x1A990" /> <!-- Original name is "vux_004_model" -->
-        <TextureAnimation Name="gBeaverOlderBrotherTailVortex4TexAnim" Offset="0x1AA78" />
-        <DList Name="gBeaverOlderBrotherTailVortex5DL" Offset="0x1AAC0" /> <!-- Original name is "vux_005_model" -->
-        <TextureAnimation Name="gBeaverOlderBrotherTailVortex5TexAnim" Offset="0x1ABA8" />
-
-        <!-- DisplayLists for the vortex and splashing effects that appear behind the younger beaver brother. -->
-        <DList Name="gBeaverYoungerBrotherTailVortexDL" Offset="0x1ABF0" /> <!-- Original name is "vuz_01_model" -->
-        <DList Name="gBeaverYoungerBrotherTailSplashDL" Offset="0x1AD00" /> <!-- Original name is "vuz_02_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_b_heart.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_b_heart.xml
deleted file mode 100644
index 789f05b37..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_b_heart.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_b_heart" Segment="6">
-        <DList Name="object_b_heart_DL_000240" Offset="0x240" />
-        <DList Name="object_b_heart_DL_000348" Offset="0x348" />
-        <Texture Name="object_b_heart_Tex_0003C0" OutName="tex_0003C0" Format="i4" Width="32" Height="32" Offset="0x3C0" />
-        <Texture Name="object_b_heart_Tex_0005C0" OutName="tex_0005C0" Format="i4" Width="16" Height="16" Offset="0x5C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bai.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bai.xml
deleted file mode 100644
index 419f37b29..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bai.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <File Name="object_bai" Segment="6">
-        <Animation Name="object_bai_Anim_0008B4" Offset="0x8B4" /> <!-- Original name is "bai_talk01" -->
-        <Animation Name="object_bai_Anim_0011C0" Offset="0x11C0" /> <!-- Original name is "bai_wait01" -->
-        <DList Name="object_bai_DL_0049C0" Offset="0x49C0" />
-        <DList Name="object_bai_DL_004BA8" Offset="0x4BA8" />
-        <DList Name="object_bai_DL_004EC0" Offset="0x4EC0" />
-        <DList Name="object_bai_DL_004FF0" Offset="0x4FF0" />
-        <DList Name="object_bai_DL_0050F8" Offset="0x50F8" />
-        <DList Name="object_bai_DL_005410" Offset="0x5410" />
-        <DList Name="object_bai_DL_005540" Offset="0x5540" />
-        <DList Name="object_bai_DL_005648" Offset="0x5648" />
-        <DList Name="object_bai_DL_005A30" Offset="0x5A30" />
-        <DList Name="object_bai_DL_005EA8" Offset="0x5EA8" />
-        <DList Name="object_bai_DL_005FC8" Offset="0x5FC8" />
-        <DList Name="object_bai_DL_0060D0" Offset="0x60D0" />
-        <DList Name="object_bai_DL_0062F8" Offset="0x62F8" />
-        <DList Name="object_bai_DL_006410" Offset="0x6410" />
-        <DList Name="object_bai_DL_006518" Offset="0x6518" />
-        <DList Name="object_bai_DL_006740" Offset="0x6740" />
-        <Texture Name="object_bai_TLUT_006858" OutName="tlut_006858" Format="rgba16" Width="16" Height="16" Offset="0x6858" />
-        <Texture Name="object_bai_Tex_006A58" OutName="tex_006A58" Format="ci8" Width="32" Height="64" Offset="0x6A58" />
-        <Texture Name="object_bai_Tex_007258" OutName="tex_007258" Format="ci8" Width="8" Height="8" Offset="0x7258" />
-        <Texture Name="object_bai_Tex_007298" OutName="tex_007298" Format="ci8" Width="8" Height="8" Offset="0x7298" />
-        <Texture Name="object_bai_Tex_0072D8" OutName="tex_0072D8" Format="ci8" Width="8" Height="8" Offset="0x72D8" />
-        <Texture Name="object_bai_Tex_007318" OutName="tex_007318" Format="ci8" Width="8" Height="16" Offset="0x7318" />
-        <Texture Name="object_bai_Tex_007398" OutName="tex_007398" Format="ci8" Width="8" Height="8" Offset="0x7398" />
-        <Texture Name="object_bai_Tex_0073D8" OutName="tex_0073D8" Format="ci8" Width="16" Height="16" Offset="0x73D8" />
-        <Texture Name="object_bai_Tex_0074D8" OutName="tex_0074D8" Format="ci8" Width="16" Height="16" Offset="0x74D8" />
-        <Texture Name="object_bai_Tex_0075D8" OutName="tex_0075D8" Format="rgba16" Width="16" Height="16" Offset="0x75D8" />
-        <Limb Name="object_bai_Standardlimb_0077D8" Type="Standard" EnumName="OBJECT_BAI_LIMB_01" Offset="0x77D8" />
-        <Limb Name="object_bai_Standardlimb_0077E4" Type="Standard" EnumName="OBJECT_BAI_LIMB_02" Offset="0x77E4" />
-        <Limb Name="object_bai_Standardlimb_0077F0" Type="Standard" EnumName="OBJECT_BAI_LIMB_03" Offset="0x77F0" />
-        <Limb Name="object_bai_Standardlimb_0077FC" Type="Standard" EnumName="OBJECT_BAI_LIMB_04" Offset="0x77FC" />
-        <Limb Name="object_bai_Standardlimb_007808" Type="Standard" EnumName="OBJECT_BAI_LIMB_05" Offset="0x7808" />
-        <Limb Name="object_bai_Standardlimb_007814" Type="Standard" EnumName="OBJECT_BAI_LIMB_06" Offset="0x7814" />
-        <Limb Name="object_bai_Standardlimb_007820" Type="Standard" EnumName="OBJECT_BAI_LIMB_07" Offset="0x7820" />
-        <Limb Name="object_bai_Standardlimb_00782C" Type="Standard" EnumName="OBJECT_BAI_LIMB_08" Offset="0x782C" />
-        <Limb Name="object_bai_Standardlimb_007838" Type="Standard" EnumName="OBJECT_BAI_LIMB_09" Offset="0x7838" />
-        <Limb Name="object_bai_Standardlimb_007844" Type="Standard" EnumName="OBJECT_BAI_LIMB_0A" Offset="0x7844" />
-        <Limb Name="object_bai_Standardlimb_007850" Type="Standard" EnumName="OBJECT_BAI_LIMB_0B" Offset="0x7850" />
-        <Limb Name="object_bai_Standardlimb_00785C" Type="Standard" EnumName="OBJECT_BAI_LIMB_0C" Offset="0x785C" />
-        <Limb Name="object_bai_Standardlimb_007868" Type="Standard" EnumName="OBJECT_BAI_LIMB_0D" Offset="0x7868" />
-        <Limb Name="object_bai_Standardlimb_007874" Type="Standard" EnumName="OBJECT_BAI_LIMB_0E" Offset="0x7874" />
-        <Limb Name="object_bai_Standardlimb_007880" Type="Standard" EnumName="OBJECT_BAI_LIMB_0F" Offset="0x7880" />
-        <Limb Name="object_bai_Standardlimb_00788C" Type="Standard" EnumName="OBJECT_BAI_LIMB_10" Offset="0x788C" />
-        <Limb Name="object_bai_Standardlimb_007898" Type="Standard" EnumName="OBJECT_BAI_LIMB_11" Offset="0x7898" />
-        <Limb Name="object_bai_Standardlimb_0078A4" Type="Standard" EnumName="OBJECT_BAI_LIMB_12" Offset="0x78A4" />
-        <Limb Name="object_bai_Standardlimb_0078B0" Type="Standard" EnumName="OBJECT_BAI_LIMB_13" Offset="0x78B0" />
-        <Skeleton Name="object_bai_Skel_007908" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BAI_LIMB_NONE" LimbMax="OBJECT_BAI_LIMB_MAX" EnumName="ObjectBaiLimb" Offset="0x7908" />
-        <Animation Name="object_bai_Anim_008198" Offset="0x8198" /> <!-- Original name is "bai_wait02" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bal.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bal.xml
deleted file mode 100644
index c98ffb43d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bal.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<Root>
-    <!-- Object file for Tingle -->
-    <File Name="object_bal" Segment="6">
-
-        <!-- Animations 1 -->
-        <Animation Name="gTingleFloatIdleAnim" Offset="0x5FC" /> <!-- Original name is "bal_fly"-->
-        <Animation Name="gTingleFallAnim" Offset="0x840" /> <!-- Original name is "bal_fly2"-->
-        <Animation Name="gTingleSpinAnim" Offset="0xC78" /> <!-- Original name is "bal_kaiten" ("rotation; revolution; turn; spin​") -->
-        <Animation Name="gTingleFloatThrowConfettiAnim" Offset="0x1804" /> <!-- Original name is "bal_kami" ("paper​")-->
-
-        <!-- Model Pieces -->
-        <DList Name="gTinglePelvisDL" Offset="0x4000" />
-        <DList Name="gTingleLeftFootDL" Offset="0x4108" />
-        <DList Name="gTingleLeftShinDL" Offset="0x41E8" />
-        <DList Name="gTingleLeftThighDL" Offset="0x42A8" />
-        <DList Name="gTingleRightFootDL" Offset="0x4368" />
-        <DList Name="gTingleRightShinDL" Offset="0x4448" />
-        <DList Name="gTingleRightThighDL" Offset="0x4508" />
-        <DList Name="gTingleHeadDL" Offset="0x45C8" />
-        <DList Name="gTingleTorsoDL" Offset="0x4980" />
-        <DList Name="gTingleLeftHandDL" Offset="0x4BA0" />
-        <DList Name="gTingleMapDL" Offset="0x4CA0" />
-        <DList Name="gTingleLeftForearmDL" Offset="0x4D58" />
-        <DList Name="gTingleLeftUpperArmDL" Offset="0x4E40" />
-        <DList Name="gTingleRightHandDL" Offset="0x4F00" />
-        <DList Name="gTinglePenDL" Offset="0x5000" />
-        <DList Name="gTingleRightForearmDL" Offset="0x50F8" />
-        <DList Name="gTingleRightUpperArmDL" Offset="0x51E0" />
-        <DList Name="gTingleBalloonDL" Offset="0x52A0" />
-
-        <!-- Textures -->
-        <Texture Name="gTingleMapTLUT" OutName="tingle_map_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53B0" />
-        <Texture Name="gTingleBriefsTex" OutName="tingle_briefs" Format="rgba16" Width="16" Height="16" Offset="0x53D0" />
-        <Texture Name="gTingleTopFrontTex" OutName="tingle_top" Format="rgba16" Width="32" Height="32" Offset="0x55D0" />
-        <Texture Name="gTingleBalloonTex" OutName="tingle_balloon" Format="rgba16" Width="16" Height="16" Offset="0x5DD0" />
-        <Texture Name="gTingleBackpackTex" OutName="tingle_backpack" Format="rgba16" Width="8" Height="8" Offset="0x5FD0" />
-        <Texture Name="gTingleEyeOpenTex" OutName="tingle_eye_open" Format="rgba16" Width="32" Height="64" Offset="0x6050" />
-        <Texture Name="gTingleBodysuitTex" OutName="tingle_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x7050" />
-        <Texture Name="gTingleNostrilTex" OutName="tingle_nostril" Format="rgba16" Width="16" Height="16" Offset="0x70D0" />
-        <Texture Name="gTingleMouthTex" OutName="tingle_mouth" Format="rgba16" Width="64" Height="32" Offset="0x72D0" />
-        <Texture Name="gTingleNoseSideTex" OutName="tingle_nose" Format="rgba16" Width="16" Height="32" Offset="0x82D0" />
-        <Texture Name="gTingleHandTex" OutName="tingle_hand" Format="rgba16" Width="32" Height="16" Offset="0x86D0" />
-        <Texture Name="gTinglePenTopTex" OutName="tingle_pen_top" Format="rgba16" Width="16" Height="16" Offset="0x8AD0" />
-        <Texture Name="gTingleMapTex" OutName="tingle_map" Format="ci4" Width="64" Height="64" Offset="0x8CD0" />
-        <Texture Name="gTingleEyeClosedTex" OutName="tingle_eye_closed" Format="rgba16" Width="32" Height="64" Offset="0x94D0" />
-
-        <!-- Skeleton -->
-        <Limb Name="gTingleRootLimb" Type="Standard" EnumName="TINGLE_LIMB_ROOT" Offset="0xA4D0" />
-        <Limb Name="gTinglePelvisLimb" Type="Standard" EnumName="TINGLE_LIMB_PELVIS" Offset="0xA4DC" />
-        <Limb Name="gTingleUpperBodyRootLimb" Type="Standard" EnumName="TINGLE_LIMB_UPPER_BODY_ROOT" Offset="0xA4E8" />
-        <Limb Name="gTingleUpperBodyWrapperLimb" Type="Standard" EnumName="TINGLE_LIMB_UPPER_BODY_WRAPPER" Offset="0xA4F4" />
-        <Limb Name="gTingleBalloonRootLimb" Type="Standard" EnumName="TINGLE_LIMB_BALLOON_ROOT" Offset="0xA500" />
-        <Limb Name="gTingleBalloonLimb" Type="Standard" EnumName="TINGLE_LIMB_BALLOON" Offset="0xA50C" />
-        <Limb Name="gTingleRightArmRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_ARM_ROOT" Offset="0xA518" />
-        <Limb Name="gTingleRightArmWrapperLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_ARM_WRAPPER" Offset="0xA524" />
-        <Limb Name="gTingleRightUpperArmLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_UPPER_ARM" Offset="0xA530" />
-        <Limb Name="gTingleRightForearmLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_FOREARM" Offset="0xA53C" />
-        <Limb Name="gTingleRightHandRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_HAND_ROOT" Offset="0xA548" />
-        <Limb Name="gTingleRightHandLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_HAND" Offset="0xA554" />
-        <Limb Name="gTingleHeldPenLimb" Type="Standard" EnumName="TINGLE_LIMB_HELD_PEN" Offset="0xA560" />
-        <Limb Name="gTingleLeftArmRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_ARM_ROOT" Offset="0xA56C" />
-        <Limb Name="gTingleLeftArmWrapperLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_ARM_WRAPPER" Offset="0xA578" />
-        <Limb Name="gTingleLeftUpperArmLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_UPPER_ARM" Offset="0xA584" />
-        <Limb Name="gTingleLeftForearmLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_FOREARM" Offset="0xA590" />
-        <Limb Name="gTingleLeftHandRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_HAND_ROOT" Offset="0xA59C" />
-        <Limb Name="gTingleLeftHandLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_HAND" Offset="0xA5A8" />
-        <Limb Name="gTingleHeldMapLimb" Type="Standard" EnumName="TINGLE_LIMB_HELD_MAP" Offset="0xA5B4" />
-        <Limb Name="gTingleTorsoLimb" Type="Standard" EnumName="TINGLE_LIMB_TORSO" Offset="0xA5C0" />
-        <Limb Name="gTingleHeadLimb" Type="Standard" EnumName="TINGLE_LIMB_HEAD" Offset="0xA5CC" />
-        <Limb Name="gTingleRightLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_LEG_ROOT" Offset="0xA5D8" /> 
-        <Limb Name="gTingleRightThighLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_THIGH" Offset="0xA5E4" />
-        <Limb Name="gTingleRightLowerLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_LOWER_LEG_ROOT" Offset="0xA5F0" />
-        <Limb Name="gTingleRightShinLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_SHIN" Offset="0xA5FC" />
-        <Limb Name="gTingleRightFootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_FOOT" Offset="0xA608" />
-        <Limb Name="gTingleLeftLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_LEG_ROOT" Offset="0xA614" />
-        <Limb Name="gTingleLeftThighLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_THIGH" Offset="0xA620" />
-        <Limb Name="gTingleLeftLowerLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_LOWER_LEG_ROOT" Offset="0xA62C" />
-        <Limb Name="gTingleLeftShinLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_SHIN" Offset="0xA638" />
-        <Limb Name="gTingleLeftFootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_FOOT" Offset="0xA644" />
-        <Skeleton Name="gTingleSkel" Type="Flex" LimbType="Standard" LimbNone="TINGLE_LIMB_NONE" LimbMax="TINGLE_LIMB_MAX" EnumName="TingleLimb" Offset="0xA6D0" />
-
-        <!-- Animations 2 -->
-        <Animation Name="gTingleLandAnim" Offset="0xA7DC" /> <!-- Original name is "bal_put"-->
-        <Animation Name="gTingleTwistAnim" Offset="0xB1E8" /> <!-- Original name is "bal_talk" -->
-        <Animation Name="gTingleTalkAnim" Offset="0xB604" /> <!-- Original name is "bal_talk2" -->
-        <Animation Name="gTingleThrowConfettiAnim" Offset="0xC498" /> <!-- Original name is "bal_talk3" -->
-        <Animation Name="gTingleHappyDanceAnim" Offset="0xC8D8" /> <!-- Original name is "bal_talk4" -->
-        <Animation Name="gTingleFloatHideFaceAnim" Offset="0xCB78" /> <!-- Original name is "bal_tereru" ("to be shy; to be bashful") -->
-        <Animation Name="gTingleIdleAnim" Offset="0xD530" /> <!-- Original name is "bal_wait" -->
-		
-        <!-- Misc. -->
-        <DList Name="gTingleConfettiDL" Offset="0xD5A0" /> <!-- Original name is "bal_cube32_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bat.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bat.xml
deleted file mode 100644
index 5a685024e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bat.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Assets for ovl_En_Bat (Bad Bats) -->
-    <File Name="object_bat" Segment="6">
-        <DList Name="gBadBatSetupDL" Offset="0xA0" />
-        <DList Name="gBadBatBodyDL" Offset="0xC8" />
-
-        <!-- Wings used in manual animation -->
-        <DList Name="gBadBatWingsFrame0DL" Offset="0x1B0" />
-        <DList Name="gBadBatWingsFrame1DL" Offset="0x2A0" />
-        <DList Name="gBadBatWingsFrame2DL" Offset="0x390" />
-        <DList Name="gBadBatWingsFrame3DL" Offset="0x480" />
-        <DList Name="gBadBatWingsFrame4DL" Offset="0x570" />
-        <DList Name="gBadBatWingsFrame5DL" Offset="0x660" />
-        <DList Name="gBadBatWingsFrame6DL" Offset="0x750" />
-        <DList Name="gBadBatWingsFrame7DL" Offset="0x840" />
-        <DList Name="gBadBatWingsFrame8DL" Offset="0x930" />
-
-        <Texture Name="gBadBatWingTex" OutName="bad_bat_wing" Format="rgba16" Width="8" Height="16" Offset="0x9A0" />
-        <Texture Name="gBatBatBodyTex" OutName="bad_bat_body" Format="rgba16" Width="16" Height="16" Offset="0xAA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bb.xml
deleted file mode 100644
index e03cdb0e2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bb.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<Root>
-    <!-- Assets for red and blue Bubbles -->
-    <File Name="object_bb" Segment="6">
-        <!-- Bubble Animations -->
-        <Animation Name="gBubbleAttackAnim" Offset="0x184" /> <!-- Original name is "bb_atack" -->
-        <Animation Name="gBubblePainAnim" Offset="0x2AC" /> <!-- Original name might be "bb_damage". Unused. -->
-        <Animation Name="gBubbleFlyingAnim" Offset="0x444" /> <!-- Original name is "bb_fly" -->
-
-        <!-- Bubble Limb DisplayLimbs -->
-        <DList Name="gBubbleLeftWingWebbingDL" Offset="0xC20" />
-        <DList Name="gBubbleLeftWingBoneDL" Offset="0xCB0" />
-        <DList Name="gBubbleJawDL" Offset="0xD40" />
-        <DList Name="gBubbleCraniumDL" Offset="0xE08" />
-        <DList Name="gBubbleRightWingBoneDL" Offset="0x1100" />
-        <DList Name="gBubbleRightWingWebbingDL" Offset="0x1190" />
-
-        <!-- Bubble Textures -->
-        <Texture Name="gBubbleEyeSocketBottomTex" OutName="eye_socket_bottom" Format="rgba16" Width="16" Height="16" Offset="0x1220" />
-        <Texture Name="gBubbleNostrilTex" OutName="nostril" Format="rgba16" Width="8" Height="8" Offset="0x1420" />
-        <Texture Name="gBubbleEyeSocketTopAndJawTex" OutName="eye_socket_top_and_jaw" Format="rgba16" Width="4" Height="4" Offset="0x14A0" />
-        <Texture Name="gBubbleCraniumTopTex" OutName="cranium_top" Format="rgba16" Width="8" Height="8" Offset="0x14C0" />
-        <Texture Name="gBubbleCraniumSidesAndBackTex" OutName="cranium_sides_and_back" Format="rgba16" Width="8" Height="8" Offset="0x1540" />
-        <Texture Name="gBubbleEyeGlowTex" OutName="eye_glow" Format="rgba16" Width="8" Height="8" Offset="0x15C0" />
-        <Texture Name="gBubbleWingBoneTex" OutName="wing_bone" Format="rgba16" Width="16" Height="8" Offset="0x1640" />
-        <Texture Name="gBubbleWingWebbingTex" OutName="wing_webbing" Format="rgba16" Width="16" Height="16" Offset="0x1740" />
-
-        <!-- Bubble Limbs -->
-        <Limb Name="gBubbleRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_ROOT" Offset="0x1940" />
-        <Limb Name="gBubbleCraniumRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_CRANIUM_ROOT" Offset="0x194C" />
-        <Limb Name="gBubbleJawRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_JAW_ROOT" Offset="0x1958" />
-        <Limb Name="gBubbleJawLimb" Type="Standard" EnumName="BUBBLE_LIMB_JAW" Offset="0x1964" />
-        <Limb Name="gBubbleLeftWingRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_LEFT_WING_ROOT" Offset="0x1970" />
-        <Limb Name="gBubbleLeftWingWrapperLimb" Type="Standard" EnumName="BUBBLE_LIMB_LEFT_WING_WRAPPER" Offset="0x197C" />
-        <Limb Name="gBubbleLeftWingWebbingRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_LEFT_WING_WEBBING_ROOT" Offset="0x1988" />
-        <Limb Name="gBubbleLeftWingWebbingLimb" Type="Standard" EnumName="BUBBLE_LIMB_LEFT_WING_WEBBING" Offset="0x1994" />
-        <Limb Name="gBubbleLeftWingBoneLimb" Type="Standard" EnumName="BUBBLE_LIMB_LEFT_WING_BONE" Offset="0x19A0" />
-        <Limb Name="gBubbleRightWingRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_RIGHT_WING_ROOT" Offset="0x19AC" />
-        <Limb Name="gBubbleRightWingWrapperLimb" Type="Standard" EnumName="BUBBLE_LIMB_RIGHT_WING_WRAPPER" Offset="0x19B8" />
-        <Limb Name="gBubbleRightWingWebbingRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_RIGHT_WING_WEBBING_ROOT" Offset="0x19C4" />
-        <Limb Name="gBubbleRightWingWebbingLimb" Type="Standard" EnumName="BUBBLE_LIMB_RIGHT_WING_WEBBING" Offset="0x19D0" />
-        <Limb Name="gBubbleRightWingBoneLimb" Type="Standard" EnumName="BUBBLE_LIMB_RIGHT_WING_BONE" Offset="0x19DC" />
-        <Limb Name="gBubbleCraniumLimb" Type="Standard" EnumName="BUBBLE_LIMB_CRANIUM" Offset="0x19E8" />
-
-        <!-- Bubble Skeleton -->
-        <Skeleton Name="gBubbleSkel" Type="Normal" LimbType="Standard" LimbNone="BUBBLE_LIMB_NONE" LimbMax="BUBBLE_LIMB_MAX" EnumName="BubbleLimb" Offset="0x1A30" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bba.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bba.xml
deleted file mode 100644
index 54706c2e3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bba.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<Root>
-    <!-- Object for Bomb Shop Lady -->
-    <File Name="object_bba" Segment="6">
-        <!-- DLists -->
-        <DList Name="gBbaUpperLegsDL" Offset="0x2A80" />
-        <DList Name="gBbaRightHandDL" Offset="0x2B70" />
-        <DList Name="gBbaRightForearmDL" Offset="0x2D88" />
-        <DList Name="gBbaRightUpperArmDL" Offset="0x2E90" />
-        <DList Name="gBbaLeftHandDL" Offset="0x2FA0" />
-        <DList Name="gBbaLeftForearmDL" Offset="0x31B8" />
-        <DList Name="gBbaLeftUpperArmDL" Offset="0x32C0" />
-        <DList Name="gBbaTorsoDL" Offset="0x33D0" />
-        <DList Name="gBbaBagDL" Offset="0x3618" />
-        <DList Name="gBbaNeckDL" Offset="0x3760" />
-        <DList Name="gBbaHeadDL" Offset="0x3968" />
-        <DList Name="gBbaMiddleLegsDL" Offset="0x3F68" />
-        <DList Name="gBbaLowerLegsDL" Offset="0x4078" />
-        <DList Name="gBbaFeetDL" Offset="0x4180" />
-
-        <!-- Animations -->
-        <Animation Name="gBbaSwayAnim" Offset="0x4910" /> <!-- Original name is "sb_ending" -->
-        <Animation Name="gBbaKnockedOverAnim" Offset="0x5154" /> <!-- Original name is "sb_taore" ("to fall (over, down); to collapse; to take a fall") -->
-        <Animation Name="gBbaLyingDownAnim" Offset="0x58B8" /> <!-- Original name is "sb_taorewait" -->
-        <Animation Name="gBbaIdleHoldingBagAnim" Offset="0x5DC4" /> <!-- Original name is "sb_wait01" -->
-
-        <!-- Skeleton -->
-        <Limb Name="gBbaUpperLegsLimb" Type="Standard" EnumName="BBA_LIMB_UPPER_LEGS" Offset="0x5DE0" />
-        <Limb Name="gBbaMiddleLegsLimb" Type="Standard" EnumName="BBA_LIMB_MIDDLE_LEGS" Offset="0x5DEC" />
-        <Limb Name="gBbaLowerLegsLimb" Type="Standard" EnumName="BBA_LIMB_LOWER_LEGS" Offset="0x5DF8" />
-        <Limb Name="gBbaFeetLimb" Type="Standard" EnumName="BBA_LIMB_FEET" Offset="0x5E04" />
-        <Limb Name="gBbaUpperRootLimb" Type="Standard" EnumName="BBA_LIMB_UPPER_ROOT" Offset="0x5E10" />
-        <Limb Name="gBbaNeckLimb" Type="Standard" EnumName="BBA_LIMB_NECK" Offset="0x5E1C" />
-        <Limb Name="gBbaHeadLimb" Type="Standard" EnumName="BBA_LIMB_HEAD" Offset="0x5E28" />
-        <Limb Name="gBbaBagLimb" Type="Standard" EnumName="BBA_LIMB_BAG" Offset="0x5E34" />
-        <Limb Name="gBbaTorsoLimb" Type="Standard" EnumName="BBA_LIMB_TORSO" Offset="0x5E40" />
-        <Limb Name="gBbaLeftUpperArmLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_UPPER_ARM" Offset="0x5E4C" />
-        <Limb Name="gBbaLeftLowerArmRootLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_LOWER_ARM_ROOT" Offset="0x5E58" />
-        <Limb Name="gBbaLeftForearmLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_FOREARM" Offset="0x5E64" />
-        <Limb Name="gBbaLeftHandLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_HAND" Offset="0x5E70" />
-        <Limb Name="gBbaRightUpperArmLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_UPPER_ARM" Offset="0x5E7C" />
-        <Limb Name="gBbaRightLowerArmRootLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_LOWER_ARM_ROOT" Offset="0x5E88" />
-        <Limb Name="gBbaRightForearmLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_FOREARM" Offset="0x5E94" />
-        <Limb Name="gBbaRightHandLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_HAND" Offset="0x5EA0" />
-        <Skeleton Name="gBbaSkel" Type="Flex" LimbType="Standard" LimbNone="BBA_LIMB_NONE" LimbMax="BBA_LIMB_MAX" EnumName="BbaLimb" Offset="0x5EF0" />
-
-         <!-- Animations -->
-        <Animation Name="gBbaIdleAnim" Offset="0x6550" /> <!-- Original name is "sb_wait02" -->
-        <Animation Name="gBbaWalkingHoldingBagAnim" Offset="0x6B10" /> <!-- Original name is "sb_walk01" -->
-
-        <!-- TLUT -->
-        <Texture Name="gBbaTLUT" OutName="bba_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6B20" />
-
-        <!-- Unused Textures -->
-        <!-- These are just exact copies of the used textures -->
-        <Texture Name="gBbaHairSkin2Tex" OutName="bba_hair_skin_2" Format="ci8" Width="32" Height="32" Offset="0x6D20" TlutOffset="0x6B20" />
-        <Texture Name="gBbaEar2Tex" OutName="bba_ear_2" Format="ci8" Width="8" Height="8" Offset="0x7120" TlutOffset="0x6B20" />
-        <Texture Name="gBbaNostril2Tex" OutName="bba_nostril_2" Format="ci8" Width="8" Height="8" Offset="0x7160" TlutOffset="0x6B20" />
-        <Texture Name="gBbaEye2Tex" OutName="bba_eye_2" Format="rgba16" Width="32" Height="32" Offset="0x71A0"/>
-        <Texture Name="gBbaWrinkles2Tex" OutName="bba_wrinkles_2" Format="ci8" Width="32" Height="32" Offset="0x79A0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaCheek2Tex" OutName="bba_cheek_2" Format="ci8" Width="16" Height="16" Offset="0x7DA0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaSkin2Tex" OutName="bba_skin_2" Format="ci8" Width="8" Height="8" Offset="0x7EA0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaForehead2Tex" OutName="bba_forehead_2" Format="ci8" Width="32" Height="32" Offset="0x7EE0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaFingers2Tex" OutName="bba_fingers_2" Format="ci8" Width="16" Height="16" Offset="0x82E0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaShirt2Tex" OutName="bba_shirt_2" Format="ci8" Width="16" Height="16" Offset="0x83E0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaBag2Tex" OutName="bba_bag_2" Format="ci8" Width="16" Height="16" Offset="0x84E0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaSkirt2Tex" OutName="bba_skirt_2" Format="ci8" Width="16" Height="16" Offset="0x85E0" TlutOffset="0x6B20" />
-
-        <!-- Textures -->
-        <Texture Name="gBbaSkinTex" OutName="bba_skin" Format="ci8" Width="8" Height="8" Offset="0x86E0" />
-        <Texture Name="gBbaWrinklesTex" OutName="bba_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x8720" />
-        <Texture Name="gBbaHairSkinTex" OutName="bba_hair_skin" Format="ci8" Width="32" Height="32" Offset="0x8B20" />
-        <Texture Name="gBbaNostrilTex" OutName="bba_nostril" Format="ci8" Width="8" Height="8" Offset="0x8F20" />
-        <Texture Name="gBbaEarTex" OutName="bba_ear" Format="ci8" Width="8" Height="8" Offset="0x8F60" />
-        <Texture Name="gBbaFingersTex" OutName="bba_fingers" Format="ci8" Width="16" Height="16" Offset="0x8FA0" />
-        <Texture Name="gBbaBagTex" OutName="bba_bag" Format="ci8" Width="16" Height="16" Offset="0x90A0" />
-        <Texture Name="gBbaSkirtTex" OutName="bba_skirt" Format="ci8" Width="16" Height="16" Offset="0x91A0" />
-        <Texture Name="gBbaEyeTex" OutName="bba_eye" Format="rgba16" Width="32" Height="32" Offset="0x92A0" />
-        <Texture Name="gBbaCheekTex" OutName="bba_cheek" Format="ci8" Width="16" Height="16" Offset="0x9AA0" />
-        <Texture Name="gBbaForeheadTex" OutName="bba_forehead" Format="ci8" Width="32" Height="32" Offset="0x9BA0" />
-        <Texture Name="gBbaShirtTex" OutName="bba_shirt" Format="ci8" Width="16" Height="16" Offset="0x9FA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bdoor.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bdoor.xml
deleted file mode 100644
index 2e64110f5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bdoor.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="assets/objects/gameplay_dangeon_keep/"/>
-
-    <!-- Assets for Boss Doors -->
-    <File Name="object_bdoor" Segment="6">
-        <!-- Boss Door, Lock, and Chain DisplayLists -->
-        <DList Name="gBossDoorDL" Offset="0xC0" /> <!-- Original name is "bossdoor_model" -->
-        <DList Name="gBossDoorLockDL" Offset="0x400" /> <!-- Original name is "doorkagiboss_model" ("lock") -->
-        <DList Name="gBossDoorChainDL" Offset="0x530" /> <!-- Original name is "doorkusariboss_model" ("chain") -->
-
-        <!-- One of the Boss Door Textures -->
-        <Texture Name="gBossDoorSnowheadTex" OutName="boss_door_snowhead" Format="rgba16" Width="32" Height="64" Offset="0x5C0" />
-
-        <!-- Assets for an unused set of doors -->
-        <DList Name="gBossDoorUnusedDoor1LeftDL" Offset="0x1790" /> <!-- Original name is "i2_L_d1_model" -->
-        <DList Name="gBossDoorUnusedDoor1RightDL" Offset="0x1850" /> <!-- Original name is "i2_L_d1_2_model" -->
-        <Texture Name="gBossDoorUnusedDoor1Tex" OutName="boss_door_unused_door_1" Format="rgba16" Width="32" Height="64" Offset="0x1910" />
-        <DList Name="gBossDoorUnusedDoor2LeftDL" Offset="0x2A50" /> <!-- Original name is "i2_L_d2_model" -->
-        <DList Name="gBossDoorUnusedDoor2RightDL" Offset="0x2AF8" /> <!-- Original name is "i2_L_d2_2_model" -->
-        <Texture Name="gBossDoorUnusedDoor2Tex" OutName="boss_door_unused_door_2" Format="rgba16" Width="32" Height="64" Offset="0x2BA0" />
-
-        <!-- The rest of the Boss Door Textures -->
-        <Texture Name="gBossDoorStoneTowerTex" OutName="boss_door_stone_tower" Format="rgba16" Width="32" Height="64" Offset="0x3BA0" />
-        <Texture Name="gBossDoorGreatBayTex" OutName="boss_door_great_bay" Format="rgba16" Width="32" Height="64" Offset="0x4BA0" />
-        <Texture Name="gBossDoorWoodfallTex" OutName="boss_door_woodfall" Format="rgba16" Width="32" Height="64" Offset="0x5BA0" />
-
-        <!-- A default texture only used if a Boss Door is present outside of the four main dungeons, which is never the case in the final game. -->
-        <Texture Name="gBossDoorDefaultTex" OutName="boss_door_unused" Format="rgba16" Width="32" Height="64" Offset="0x6BA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bee.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bee.xml
deleted file mode 100644
index ab9699e84..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bee.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<Root>
-    <!-- Object for Bee -->
-    <File Name="object_bee" Segment="6">
-        <!-- Bee Animations -->
-        <Animation Name="gBeeFlyingAnim" Offset="0x5C" /> <!-- Original name is "bee_fyl" [sic] -->
-
-        <!-- Bee Limb DisplayLists -->
-        <DList Name="gBeeBodyDL" Offset="0x550" />
-        <DList Name="gBeeHeadDL" Offset="0x780" />
-        <DList Name="gBeeAntennaeDL" Offset="0x848" />
-        <DList Name="gBeeRightWingDL" Offset="0x918" />
-        <DList Name="gBeeLeftWingDL" Offset="0x9D0" />
-
-        <!-- Bee Textures -->
-        <Texture Name="gBeeWingTLUT" OutName="bee_wing_tlut" Format="rgba16" Width="4" Height="4" Offset="0xA88" />
-        <Texture Name="gBeeHeadTLUT" OutName="bee_head_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAA8" />
-        <Texture Name="gBeeBodyTLUT" OutName="bee_body_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAC8" />
-        <Texture Name="gBeeAntennaeTLUT" OutName="bee_antennae_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAE8" />
-        <Texture Name="gBeeWingTex" OutName="bee_wing" Format="ci4" Width="32" Height="32" Offset="0xB08" />
-        <Texture Name="gBeeHeadTex" OutName="bee_head" Format="ci4" Width="32" Height="32" Offset="0xD08" />
-        <Texture Name="gBeeBodyTex" OutName="bee_body" Format="ci4" Width="32" Height="32" Offset="0xF08" />
-        <Texture Name="gBeeAntennaeTex" OutName="bee_antennae" Format="ci4" Width="32" Height="32" Offset="0x1108" />
-
-        <!-- Bee Limbs -->
-        <Limb Name="gBeeRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_ROOT" Offset="0x1308" />
-        <Limb Name="gBeeWingsRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_WINGS_ROOT" Offset="0x1314" />
-        <Limb Name="gBeeLeftWingRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_LEFT_WING_ROOT" Offset="0x1320" />
-        <Limb Name="gBeeLeftWingLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_LEFT_WING" Offset="0x132C" />
-        <Limb Name="gBeeRightWingRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_RIGHT_WING_ROOT" Offset="0x1338" />
-        <Limb Name="gBeeRightWingLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_RIGHT_WING" Offset="0x1344" />
-        <Limb Name="gBeeBodyLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_BODY" Offset="0x1350" />
-        <Limb Name="gBeeAntennaeLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_ANTENNAE" Offset="0x135C" />
-        <Limb Name="gBeeHeadLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_HEAD" Offset="0x1368" />
-
-        <!-- Bee Skeleton -->
-        <Skeleton Name="gBeeSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BEE_LIMB_NONE" LimbMax="OBJECT_BEE_LIMB_MAX" EnumName="ObjectBeeLimb" Offset="0x1398" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bg.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bg.xml
deleted file mode 100644
index 9008fb381..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bg.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<Root>
-    <File Name="object_bg" Segment="6">
-        <!-- Animations -->
-        <Animation Name="object_bg_Anim_000968" Offset="0x968" /> <!-- Original name is "bg_asking" -->
-        <Animation Name="object_bg_Anim_000A00" Offset="0xA00" /> <!-- Original name is "bg_getup" -->
-        <Animation Name="object_bg_Anim_001384" Offset="0x1384" /> <!-- Original name is "bg_kunekune" ("wiggling; waving; swaying; twisting and turning​") -->
-        
-        <!-- Treasure Chest Shop Gal Limb DisplayLists -->
-        <DList Name="gTreasureChestShopGalHeadDL" Offset="0x3F50" />
-        <DList Name="gTreasureChestShopGalNeckDL" Offset="0x4558" />
-        <DList Name="gTreasureChestShopGalLeftHandDL" Offset="0x4768" />
-        <DList Name="gTreasureChestShopGalLeftForearmDL" Offset="0x4A38" />
-        <DList Name="gTreasureChestShopGalLeftUpperArmDL" Offset="0x4BC0" />
-        <DList Name="gTreasureChestShopGalRightHandDL" Offset="0x4EE0" />
-        <DList Name="gTreasureChestShopGalRightForearmDL" Offset="0x51B0" />
-        <DList Name="gTreasureChestShopGalRightUpperArmDL" Offset="0x5338" />
-        <DList Name="gTreasureChestShopGalTorsoDL" Offset="0x5658" />
-        <DList Name="gTreasureChestShopGalLeftFootDL" Offset="0x5978" />
-        <DList Name="gTreasureChestShopGalLeftShinDL" Offset="0x5B80" />
-        <DList Name="gTreasureChestShopGalLeftThighDL" Offset="0x5F20" />
-        <DList Name="gTreasureChestShopGalRightFootDL" Offset="0x6090" />
-        <DList Name="gTreasureChestShopGalRightShinDL" Offset="0x6298" />
-        <DList Name="gTreasureChestShopGalRightThighDL" Offset="0x6638" />
-        <DList Name="gTreasureChestShopGalHipsDL" Offset="0x67A8" />
-
-        <!-- Treasure Chest Shop Gal Textures -->
-        <Texture Name="gTreasureChestShopGalTLUT" OutName="treasure_cheat_shop_gal_tlut" Format="rgba16" Width="16" Height="16" Offset="0x68D8" />
-        <Texture Name="gTreasureChestShopGalHairTex" OutName="treasure_cheat_shop_gal_hair" Format="ci8" Width="32" Height="32" Offset="0x6AD8" />
-        <Texture Name="gTreasureChestShopGalHair2Tex" OutName="treasure_cheat_shop_gal_hair2" Format="ci8" Width="8" Height="16" Offset="0x6ED8" />
-        <Texture Name="gTreasureChestShopGalEyeOpenUpTex" OutName="treasure_cheat_shop_gal_eye_open_up" Format="ci8" Width="32" Height="32" Offset="0x6F58" />
-        <Texture Name="gTreasureChestShopGalEyeHalfUpTex" OutName="treasure_cheat_shop_gal_eye_half_up" Format="ci8" Width="32" Height="32" Offset="0x7358" />
-        <Texture Name="gTreasureChestShopGalEyeClosedTex" OutName="treasure_cheat_shop_gal_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7758" />
-        <Texture Name="gTreasureChestShopGalEyeOpenDownTex" OutName="treasure_cheat_shop_gal_eye_open_down" Format="ci8" Width="32" Height="32" Offset="0x7B58" />
-        <Texture Name="gTreasureChestShopGalEyeHalfDownTex" OutName="treasure_cheat_shop_gal_eye_half_down" Format="ci8" Width="32" Height="32" Offset="0x7F58" />
-        <Texture Name="gTreasureChestShopGalMouthTex" OutName="treasure_cheat_shop_gal_mouth" Format="ci8" Width="32" Height="32" Offset="0x8358" />
-        <Texture Name="gTreasureChestShopGalEarAndBellyButtonTex" OutName="treasure_cheat_shop_gal_ear_and_belly_button" Format="ci8" Width="16" Height="16" Offset="0x8758" />
-        <Texture Name="gTreasureChestShopGalSkinTex" OutName="treasure_cheat_shop_gal_skin" Format="ci8" Width="16" Height="16" Offset="0x8858" />
-        <Texture Name="gTreasureChestShopGalClothesTex" OutName="treasure_cheat_shop_gal_clothes" Format="ci8" Width="32" Height="32" Offset="0x8958" />
-        <Texture Name="gTreasureChestShopGalFingersTex" OutName="treasure_cheat_shop_gal_fingers" Format="ci8" Width="16" Height="16" Offset="0x8D58" /> 
-        
-        <!-- Treasure Chest Shop Gal Limbs -->
-        <Limb Name="gTreasureChestShopGalRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_ROOT" Offset="0x8E58" />
-        <Limb Name="gTreasureChestShopGalHipsLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_HIPS" Offset="0x8E64" />
-        <Limb Name="gTreasureChestShopGalTorsoLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_TORSO" Offset="0x8E70" />
-        <Limb Name="gTreasureChestShopGalNeckLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_NECK" Offset="0x8E7C" />
-        <Limb Name="gTreasureChestShopGalHeadLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_HEAD" Offset="0x8E88" />
-        <Limb Name="gTreasureChestShopGalLeftArmRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_ARM_ROOT" Offset="0x8E94" />
-        <Limb Name="gTreasureChestShopGalLeftUpperArmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_UPPER_ARM" Offset="0x8EA0" />
-        <Limb Name="gTreasureChestShopGalLeftForearmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_FOREARM" Offset="0x8EAC" />
-        <Limb Name="gTreasureChestShopGalLeftHandLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_HAND" Offset="0x8EB8" />
-        <Limb Name="gTreasureChestShopGalRightArmRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_ARM_ROOT" Offset="0x8EC4" />
-        <Limb Name="gTreasureChestShopGalRightUpperArmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_UPPER_ARM" Offset="0x8ED0" />
-        <Limb Name="gTreasureChestShopGalRightForearmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_FOREARM" Offset="0x8EDC" />
-        <Limb Name="gTreasureChestShopGalRightHandLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_HAND" Offset="0x8EE8" />
-        <Limb Name="gTreasureChestShopGalRightLegRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_LEG_ROOT" Offset="0x8EF4" />
-        <Limb Name="gTreasureChestShopGalRightThighLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_THIGH" Offset="0x8F00" />
-        <Limb Name="gTreasureChestShopGalRightShinLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_SHIN" Offset="0x8F0C" />
-        <Limb Name="gTreasureChestShopGalRightFootRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_FOOT_ROOT" Offset="0x8F18" />
-        <Limb Name="gTreasureChestShopGalRightFootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_FOOT" Offset="0x8F24" />
-        <Limb Name="gTreasureChestShopGalLeftLegRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_LEG_ROOT" Offset="0x8F30" />
-        <Limb Name="gTreasureChestShopGalLeftThighLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_THIGH" Offset="0x8F3C" />
-        <Limb Name="gTreasureChestShopGalLeftShinLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_SHIN" Offset="0x8F48" />
-        <Limb Name="gTreasureChestShopGalLeftFootRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_FOOT_ROOT" Offset="0x8F54" />
-        <Limb Name="gTreasureChestShopGalLeftFootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_FOOT" Offset="0x8F60" />
-        
-        <!-- Treasure Chest Shop Gal Skeleton -->
-        <Skeleton Name="gTreasureChestShopGalSkel" Type="Flex" LimbType="Standard" LimbNone="TREASURE_CHEST_SHOP_GAL_LIMB_NONE" LimbMax="TREASURE_CHEST_SHOP_GAL_LIMB_MAX" EnumName="TreasureChestShopGalLimb" Offset="0x8FC8" />
-        
-        <!-- Animations -->
-        <Animation Name="object_bg_Anim_009890" Offset="0x9890" /> <!-- Original name is "bg_newwait" -->
-        <Animation Name="object_bg_Anim_009F20" Offset="0x9F20" /> <!-- Original name is "bg_sleeping" -->
-        <Animation Name="object_bg_Anim_00A280" Offset="0xA280" /> <!-- Original name is "bg_tokune" (probably the English word "to" and "kunekune") -->
-        <Animation Name="object_bg_Anim_00AD98" Offset="0xAD98" /> <!-- Original name is "bg_up" -->
-        <Animation Name="object_bg_Anim_00B19C" Offset="0xB19C" /> <!-- Original name is "bg_wait" -->
-        
-        <!-- Mayor's receptionist DisplayLists -->
-        <DList Name="object_bg_DL_00D5E0" Offset="0xD5E0" />
-        <DList Name="object_bg_DL_00D780" Offset="0xD780" />
-        <DList Name="object_bg_DL_00DB38" Offset="0xDB38" />
-        <DList Name="object_bg_DL_00DCD8" Offset="0xDCD8" />
-        <DList Name="object_bg_DL_00E1C0" Offset="0xE1C0" />
-        <DList Name="object_bg_DL_00E3F8" Offset="0xE3F8" />
-        <DList Name="object_bg_DL_00E580" Offset="0xE580" />
-        <DList Name="object_bg_DL_00E758" Offset="0xE758" />
-        <DList Name="object_bg_DL_00E990" Offset="0xE990" />
-        <DList Name="object_bg_DL_00EB18" Offset="0xEB18" />
-        <DList Name="object_bg_DL_00ECF0" Offset="0xECF0" />
-        <DList Name="object_bg_DL_00EE50" Offset="0xEE50" />
-        <DList Name="object_bg_DL_00EFE8" Offset="0xEFE8" />
-        <DList Name="object_bg_DL_00F1F0" Offset="0xF1F0" />
-        <DList Name="object_bg_DL_00F350" Offset="0xF350" />
-        <DList Name="object_bg_DL_00F4E8" Offset="0xF4E8" />
-        
-        <!-- Mayor's receptionist Textures -->
-        <Texture Name="object_bg_TLUT_00F6F0" OutName="tlut_00F6F0" Format="rgba16" Width="16" Height="16" Offset="0xF6F0" />
-        <Texture Name="object_bg_Tex_00F8F0" OutName="tex_00F8F0" Format="ci8" Width="32" Height="32" Offset="0xF8F0" />
-        <Texture Name="object_bg_Tex_00FCF0" OutName="tex_00FCF0" Format="ci8" Width="32" Height="32" Offset="0xFCF0" />
-        <Texture Name="object_bg_Tex_0100F0" OutName="tex_0100F0" Format="ci8" Width="32" Height="32" Offset="0x100F0" />
-        <Texture Name="object_bg_Tex_0104F0" OutName="tex_0104F0" Format="ci8" Width="16" Height="32" Offset="0x104F0" />
-        <Texture Name="object_bg_Tex_0106F0" OutName="tex_0106F0" Format="ci8" Width="16" Height="16" Offset="0x106F0" />
-        <Texture Name="object_bg_Tex_0107F0" OutName="tex_0107F0" Format="ci8" Width="64" Height="32" Offset="0x107F0" />
-        <Texture Name="object_bg_Tex_010FF0" OutName="tex_010FF0" Format="ci8" Width="16" Height="16" Offset="0x10FF0" />
-        <Texture Name="object_bg_Tex_0110F0" OutName="tex_0110F0" Format="ci8" Width="32" Height="32" Offset="0x110F0" />
-        <Texture Name="object_bg_Tex_0114F0" OutName="tex_0114F0" Format="ci8" Width="16" Height="16" Offset="0x114F0" />
-        <Texture Name="object_bg_Tex_0115F0" OutName="tex_0115F0" Format="ci8" Width="32" Height="32" Offset="0x115F0" />
-
-        <!-- Mayor's receptionist Limbs -->
-        <Limb Name="object_bg_Standardlimb_0119F0" Type="Standard" EnumName="OBJECT_BG_2_LIMB_01" Offset="0x119F0" />
-        <Limb Name="object_bg_Standardlimb_0119FC" Type="Standard" EnumName="OBJECT_BG_2_LIMB_02" Offset="0x119FC" />
-        <Limb Name="object_bg_Standardlimb_011A08" Type="Standard" EnumName="OBJECT_BG_2_LIMB_03" Offset="0x11A08" />
-        <Limb Name="object_bg_Standardlimb_011A14" Type="Standard" EnumName="OBJECT_BG_2_LIMB_04" Offset="0x11A14" />
-        <Limb Name="object_bg_Standardlimb_011A20" Type="Standard" EnumName="OBJECT_BG_2_LIMB_05" Offset="0x11A20" />
-        <Limb Name="object_bg_Standardlimb_011A2C" Type="Standard" EnumName="OBJECT_BG_2_LIMB_06" Offset="0x11A2C" />
-        <Limb Name="object_bg_Standardlimb_011A38" Type="Standard" EnumName="OBJECT_BG_2_LIMB_07" Offset="0x11A38" />
-        <Limb Name="object_bg_Standardlimb_011A44" Type="Standard" EnumName="OBJECT_BG_2_LIMB_08" Offset="0x11A44" />
-        <Limb Name="object_bg_Standardlimb_011A50" Type="Standard" EnumName="OBJECT_BG_2_LIMB_09" Offset="0x11A50" />
-        <Limb Name="object_bg_Standardlimb_011A5C" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0A" Offset="0x11A5C" />
-        <Limb Name="object_bg_Standardlimb_011A68" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0B" Offset="0x11A68" />
-        <Limb Name="object_bg_Standardlimb_011A74" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0C" Offset="0x11A74" />
-        <Limb Name="object_bg_Standardlimb_011A80" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0D" Offset="0x11A80" />
-        <Limb Name="object_bg_Standardlimb_011A8C" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0E" Offset="0x11A8C" />
-        <Limb Name="object_bg_Standardlimb_011A98" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0F" Offset="0x11A98" />
-        <Limb Name="object_bg_Standardlimb_011AA4" Type="Standard" EnumName="OBJECT_BG_2_LIMB_10" Offset="0x11AA4" />
-        <Limb Name="object_bg_Standardlimb_011AB0" Type="Standard" EnumName="OBJECT_BG_2_LIMB_11" Offset="0x11AB0" />
-        <Limb Name="object_bg_Standardlimb_011ABC" Type="Standard" EnumName="OBJECT_BG_2_LIMB_12" Offset="0x11ABC" />
-        <Limb Name="object_bg_Standardlimb_011AC8" Type="Standard" EnumName="OBJECT_BG_2_LIMB_13" Offset="0x11AC8" />
-        <Limb Name="object_bg_Standardlimb_011AD4" Type="Standard" EnumName="OBJECT_BG_2_LIMB_14" Offset="0x11AD4" />
-        <Limb Name="object_bg_Standardlimb_011AE0" Type="Standard" EnumName="OBJECT_BG_2_LIMB_15" Offset="0x11AE0" />
-        <Limb Name="object_bg_Standardlimb_011AEC" Type="Standard" EnumName="OBJECT_BG_2_LIMB_16" Offset="0x11AEC" />
-        <Limb Name="object_bg_Standardlimb_011AF8" Type="Standard" EnumName="OBJECT_BG_2_LIMB_17" Offset="0x11AF8" />
-
-        <!--Mayor's receptionist Skeleton -->
-        <Skeleton Name="object_bg_Skel_011B60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BG_2_LIMB_NONE" LimbMax="OBJECT_BG_2_LIMB_MAX" EnumName="ObjectBg2Limb" Offset="0x11B60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bh.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bh.xml
deleted file mode 100644
index b4cc95393..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bh.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="object_bh" Segment="6">
-        <Animation Name="gBhFlyingAnim" Offset="0x74" /> <!-- Original name is "bh_fly" -->
-        <DList Name="gBhBodyDL" Offset="0x2B0" />
-        <DList Name="gBhRightWingToEdgeDL" Offset="0x3A0" />
-        <DList Name="gBhRightWingToBodyDL" Offset="0x450" />
-        <DList Name="gBhLeftWingToEdgeDL" Offset="0x4D8" />
-        <DList Name="gBhLeftWingToBodyDL" Offset="0x588" />
-        <Texture Name="gBhBodyTex" OutName="en_bh_body" Format="rgba16" Width="32" Height="32" Offset="0x610" />
-        <Texture Name="gBhWingTex" OutName="en_bh_wing" Format="rgba16" Width="64" Height="32" Offset="0xE10" />
-        <Limb Name="gBhBodyLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_BODY" Offset="0x1E10" />
-        <Limb Name="gBhRightWingToBodyLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_RIGHT_WING_TO_BODY" Offset="0x1E1C" />
-        <Limb Name="gBhRightWingToEdgeLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_RIGHT_WING_TO_EDGE" Offset="0x1E28" />
-        <Limb Name="gBhLeftWingToBodyLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_LEFT_WING_TO_BODY" Offset="0x1E34" />
-        <Limb Name="gBhLeftWingToEdgeLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_LEFT_WING_TO_EDGE" Offset="0x1E40" />
-        <Skeleton Name="gBhSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BH_LIMB_NONE" LimbMax="OBJECT_BH_LIMB_MAX" EnumName="ObjectBhLimb" Offset="0x1E60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_big_fwall.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_big_fwall.xml
deleted file mode 100644
index f1becbe8e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_big_fwall.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Ring Of Fire used during Garo's encounters -->
-    <File Name="object_big_fwall" Segment="6">
-        <Texture Name="gRingOfFireTex" OutName="ring_of_fire" Format="i8" Width="32" Height="64" Offset="0x0" />
-        <DList Name="gRingOfFireDL" Offset="0x9A0" /> <!-- Original name is "big_firewall_modelT" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigicicle.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigicicle.xml
deleted file mode 100644
index f02767256..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigicicle.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <File Name="object_bigicicle" Segment="6">
-        <Texture Name="object_bigicicle_Tex_000000" OutName="tex_000000" Format="i4" Width="64" Height="64" Offset="0x0" />
-        <Texture Name="object_bigicicle_Tex_000800" OutName="tex_000800" Format="i4" Width="16" Height="16" Offset="0x800" />
-        <DList Name="object_bigicicle_DL_0009B0" Offset="0x9B0" /> <!-- Original name is "trr_hahen_modelT" -->
-        <DList Name="object_bigicicle_DL_000B20" Offset="0xB20" /> <!-- Original name is "trr_hibi01_modelT" ("crack; fissure") -->
-        <DList Name="object_bigicicle_DL_000D60" Offset="0xD60" /> <!-- Original name is "trr_hibi02_modelT" -->
-        <DList Name="object_bigicicle_DL_000F40" Offset="0xF40" /> <!-- Original name is "trr_hibi03_modelT" -->
-        <DList Name="object_bigicicle_DL_0014F0" Offset="0x14F0" /> <!-- Original name is "trr_inside_modelT" -->
-        <TextureAnimation Name="object_bigicicle_Matanimheader_001678" Offset="0x1678" />
-        <DList Name="object_bigicicle_DL_001D10" Offset="0x1D10" />
-        <DList Name="object_bigicicle_DL_002530" Offset="0x2530" />
-        <DList Name="object_bigicicle_DL_002C20" Offset="0x2C20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigokuta.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigokuta.xml
deleted file mode 100644
index 7c2928b23..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigokuta.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<Root>
-    <File Name="object_bigokuta" Segment="6">
-        <Animation Name="gBigOctoRiseOutOfWaterAnim" Offset="0x444" /> <!-- Original name is "ocd_damagejump" -->
-        <Animation Name="gBigOctoDeathAnim" Offset="0xA74" /> <!-- Original name is "ocd_dead" -->
-        <Animation Name="gBigOctoHitAnim" Offset="0xD1C" /> <!-- Original name is "ocd_stop" -->
-        <Animation Name="gBigOctoIdleAnim" Offset="0x14B8" /> <!-- Original name is "ocd_wait" -->
-        <Animation Name="gBigOctoWalkAnim" Offset="0x1CA4" /> <!-- Original name is "ocd_walk" -->
-        <DList Name="gBigOctoBodyDL" Offset="0x4090" />
-        <DList Name="gBigOctoCenterSnoutDL" Offset="0x4158" />
-        <DList Name="gBigOctoLeftSnoutDL" Offset="0x42A8" />
-        <DList Name="gBigOctoRightSnoutDL" Offset="0x43D0" />
-        <DList Name="gBigOctoHeadShellDL" Offset="0x44F8" />
-        <DList Name="gBigOctoRightWeakPointDL" Offset="0x4AB8" />
-        <DList Name="gBigOctoLeftWeakPointDL" Offset="0x4CA0" />
-        <DList Name="gBigOctoRightTentacleBaseDL" Offset="0x4E10" />
-        <DList Name="gBigOctoRightTentacleTipDL" Offset="0x4EB8" />
-        <DList Name="gBigOctoLeftTentacleBaseDL" Offset="0x4F90" />
-        <DList Name="gBigOctoLeftTentacleTipDL" Offset="0x5038" />
-        <DList Name="gBigOctoBackRightArmBaseDL" Offset="0x5110" />
-        <DList Name="gBigOctoBackRightArmEndDL" Offset="0x51D0" />
-        <DList Name="gBigOctoBackLeftArmBaseDL" Offset="0x53B0" />
-        <DList Name="gBigOctoBackLeftArmEndDL" Offset="0x5470" />
-        <DList Name="gBigOctoFrontLeftArmBaseDL" Offset="0x5650" />
-        <DList Name="gBigOctoFrontLeftArmEndDL" Offset="0x5710" />
-        <DList Name="gBigOctoFrontRightArmBaseDL" Offset="0x58F0" />
-        <DList Name="gBigOctoFrontRightArmEndDL" Offset="0x59B0" />
-        <Texture Name="gBigOctoArmTopTex" OutName="big_octo_arm_top" Format="rgba16" Width="16" Height="16" Offset="0x5B90" />
-        <Texture Name="gBigOctoWeakPointCoverTex" OutName="big_octo_weak_point_cover" Format="rgba16" Width="8" Height="16" Offset="0x5D90" />
-        <Texture Name="gBigOctoEyeTex" OutName="big_octo_eye" Format="rgba16" Width="16" Height="16" Offset="0x5E90" />
-        <Texture Name="gBigOctoShellTex" OutName="big_octo_shell" Format="rgba16" Width="16" Height="16" Offset="0x6090" />
-        <Texture Name="gBigOctoHeadBaseTex" OutName="big_octo_head_base" Format="rgba16" Width="8" Height="8" Offset="0x6290" />
-        <Texture Name="gBigOctoBetweenEyesTex" OutName="big_octo_between_eyes" Format="rgba16" Width="8" Height="8" Offset="0x6310" />
-        <Texture Name="gBigOctoHeadUndersideTex" OutName="big_octo_head_underside" Format="rgba16" Width="16" Height="16" Offset="0x6390" />
-        <Texture Name="gBigOctoEyeShellTex" OutName="big_octo_eye_shell" Format="rgba16" Width="16" Height="16" Offset="0x6590" />
-        <Texture Name="gBigOctoSnoutEdgeTex" OutName="big_octo_snout_edge" Format="rgba16" Width="8" Height="16" Offset="0x6790" />
-        <Texture Name="gBigOctoArmBottomTex" OutName="big_octo_arm_bottom" Format="rgba16" Width="16" Height="16" Offset="0x6890" />
-        <Limb Name="gBigOctoBodyLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_BODY" Offset="0x6A90" />
-        <Limb Name="gBigOctoFrontRightArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_FRONT_ARM_BASE" Offset="0x6A9C" />
-        <Limb Name="gBigOctoFrontRightArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_FRONT_ARM_END" Offset="0x6AA8" />
-        <Limb Name="gBigOctoFrontLeftArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_FRONT_ARM_BASE" Offset="0x6AB4" />
-        <Limb Name="gBigOctoFrontLeftArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_FRONT_ARM_END" Offset="0x6AC0" />
-        <Limb Name="gBigOctoBackLeftArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_BACK_ARM_BASE" Offset="0x6ACC" />
-        <Limb Name="gBigOctoBackLeftArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_BACK_ARM_END" Offset="0x6AD8" />
-        <Limb Name="gBigOctoBackRightArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_BACK_ARM_BASE" Offset="0x6AE4" />
-        <Limb Name="gBigOctoBackRightArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_BACK_ARM_END" Offset="0x6AF0" />
-        <Limb Name="gBigOctoHeadShellLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_HEAD" Offset="0x6AFC" />
-        <Limb Name="gBigOctoLeftTentacleBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_TENTACLE_BASE" Offset="0x6B08" />
-        <Limb Name="gBigOctoLeftTentacleTipLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_TENTACLE_TIP" Offset="0x6B14" />
-        <Limb Name="gBigOctoRightTentacleBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_TENTACLE_BASE" Offset="0x6B20" />
-        <Limb Name="gBigOctoRightTentacleTipLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_TENTACLE_TIP" Offset="0x6B2C" />
-        <Limb Name="gBigOctoLeftWeakPointLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_WEAK_POINT" Offset="0x6B38" />
-        <Limb Name="gBigOctoRightWeakPointLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_WEAK_POINT" Offset="0x6B44" />
-        <Limb Name="gBigOctoCenterSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_CENTER_SNOUT" Offset="0x6B50" />
-        <Limb Name="gBigOctoRightSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_SNOUT" Offset="0x6B5C" />
-        <Limb Name="gBigOctoLeftSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_SNOUT" Offset="0x6B68" />
-        <Skeleton Name="gBigOctoSkel" Type="Flex" LimbType="Standard" LimbNone="BIGOKUTA_LIMB_NONE" LimbMax="BIGOKUTA_LIMB_MAX" EnumName="BigokutaLimb" Offset="0x6BC0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigpo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigpo.xml
deleted file mode 100644
index fbde9e8e5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigpo.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<Root>
-    <!-- Assets for Big Poes -->
-    <File Name="object_bigpo" Segment="6">
-        <Animation Name="gBigPoeSwingLampAttackAnim" Offset="0x158" /> <!-- Original name is "pog_atack" -->
-        <Animation Name="gBigPoeShockAnim" Offset="0x454" /> <!-- Original name is "pog_damage" -->
-        <Animation Name="gBigPoeBackpedalAnim" Offset="0x608" /> <!-- Original name is "pog_escape" -->
-        <Animation Name="gBigPoeFloatAnim" Offset="0x924" /> <!-- Original name is "pog_fly" -->
-        <Animation Name="gBigPoeAwakenSpawnAnim" Offset="0xF9C" /> <!-- Original name is "pog_start" -->
-        <Animation Name="gBigPoeAwakenStretchAnim" Offset="0x1360" /> <!-- Original name is "pog_wait" -->
-        <Texture Name="gBigPoeSoulFaceTex" OutName="bigpo_soul_face" Format="i8" Width="32" Height="64" Offset="0x1370" />
-        <DList Name="gBigPoeSoulDL" Offset="0x1BB0" /> <!-- Original name is "bigpo_soul_modelT" -->
-        <Texture Name="gBigPoeNecklaceSkullHalfTex" OutName="bigpo_skull_necklace" Format="rgba16" Width="16" Height="16" Offset="0x1C70" />
-        <Texture Name="gBigPoeLanternGlassTex" OutName="bigpo_lantern_glass" Format="rgba16" Width="16" Height="16" Offset="0x1E70" />
-        <Texture Name="gBigPoeTornRobeTex" OutName="bigpo_torn_robe" Format="rgba16" Width="32" Height="32" Offset="0x2070" />
-        <Texture Name="gBigPoeArmSectionTex" OutName="bigpo_arm_section" Format="rgba16" Width="16" Height="16" Offset="0x2870" />
-        <Texture Name="gBigPoeHoodEdgeTex" OutName="bigpo_hood_edge" Format="rgba16" Width="8" Height="8" Offset="0x2A70" />
-        <Texture Name="gBigPoeNecklaceBeadsTex" OutName="bigpo_necklace_beads" Format="rgba16" Width="16" Height="8" Offset="0x2AF0" />
-        <Texture Name="gBigPoeShawlTex" OutName="bigpo_shawl" Format="rgba16" Width="16" Height="16" Offset="0x2BF0" />
-        <Texture Name="gBigPoeGlowingEyeTex" OutName="bigpo_glowing_eye" Format="rgba16" Width="16" Height="16" Offset="0x2DF0" />
-        <!-- Carried over from object_po_field from OoT. Field Poes and Big Poes shared assets, -->
-        <!-- but certain DLists/Vtx were dropped, so some remain unused  -->
-        <!-- These 5 vtx were likely grouped as one, but they are separated out here for the used and unused sections -->
-        <Array Name="gFieldPoeLanternVtx" Count="33" Offset="0x2FF0">
-            <Vtx/>
-        </Array>
-        <Array Name="gFieldPoeBodyAndFaceVtx" Count="53" Offset="0x3200"> <!-- Unused -->
-            <Vtx/>
-        </Array>
-        <Array Name="gFieldPoeArmVtx" Count="36" Offset="0x3550">
-            <Vtx/>
-        </Array>
-        <Array Name="gFieldPoeCloakVtx" Count="55" Offset="0x3790"> <!-- Unused -->
-            <Vtx/>
-        </Array>
-        <Array Name="gFieldPoeFaceHoodRobeVtx" Count="106" Offset="0x3B00">
-            <Vtx/>
-        </Array>
-        <DList Name="gBigPoeLanternFallingDL" Offset="0x41A0" /> <!-- Original name is "pog_kantera_hahen_model" ("kantera" = "lantern", "hahen" = "fragment") -->
-        <DList Name="gBigPoeLanternMainDL" Offset="0x42C8" /> <!-- Original name is "poh_big_cantera" -->
-        <DList Name="gBigPoeLanternPurpleTopDL" Offset="0x43F8" />
-        <DList Name="gBigPoeHandDL" Offset="0x4488" />
-        <DList Name="gBigPoeSmallArmDL" Offset="0x4538" />
-        <DList Name="gBigPoeBigArmDL" Offset="0x45D8" />
-        <DList Name="gBigPoeArmAndGrowthDL" Offset="0x4680" />
-        <DList Name="gBigPoeMediumArmDL" Offset="0x4768" />
-        <DList Name="gBigPoeNecklaceHoodShawlDL" Offset="0x4808" />
-        <DList Name="gBigPoeFaceDL" Offset="0x4AE8" />
-        <DList Name="gBigPoeLowerRobeDL" Offset="0x4BD8" />
-        <Texture Name="gBigPoeCrispyPiecesTex" OutName="bigpo_crispy_pieces" Format="rgba16" Width="16" Height="16" Offset="0x4C98" />
-        <Texture Name="gBigPoeCrispyEyesTex" OutName="bigpo_crispy_eyes" Format="rgba16" Width="8" Height="8" Offset="0x4E98" />
-        <DList Name="gBigPoeCrispyBodyDL" Offset="0x58B8" />
-        <Limb Name="gBigPoeFaceLimb" Type="Standard" EnumName="BIG_POE_LIMB_FACE" Offset="0x5B88" />
-        <Limb Name="gBigPoeLeftUpperArmLimb" Type="Standard" EnumName="BIG_POE_LIMB_LEFT_UPPER_ARM" Offset="0x5B94" />
-        <Limb Name="gBigPoeLeftForearmLimb" Type="Standard" EnumName="BIG_POE_LIMB_LEFT_FOREARM" Offset="0x5BA0" />
-        <Limb Name="gBigPoeRightUpperArmLimb" Type="Standard" EnumName="BIG_POE_LIMB_RIGHT_UPPER_ARM" Offset="0x5BAC" />
-        <Limb Name="gBigPoeRightForearmLimb" Type="Standard" EnumName="BIG_POE_LIMB_RIGHT_FOREARM" Offset="0x5BB8" />
-        <Limb Name="gBigPoeRightHandLimb" Type="Standard" EnumName="BIG_POE_LIMB_RIGHT_HAND" Offset="0x5BC4" />
-        <Limb Name="gBigPoeLanternLimb" Type="Standard" EnumName="BIG_POE_LIMB_LANTERN" Offset="0x5BD0" />
-        <Limb Name="gBigPoeHatAndCloakLimb" Type="Standard" EnumName="BIG_POE_LIMB_HAT_AND_CLOAK" Offset="0x5BDC" />
-        <Limb Name="gBigPoeLowerRobeLimb" Type="Standard" EnumName="BIG_POE_LIMB_LOWER_ROBE" Offset="0x5BE8" />
-        <Skeleton Name="gBigPoeSkel" Type="Normal" LimbType="Standard" LimbNone="BIG_POE_LIMB_NONE" LimbMax="BIG_POE_LIMB_MAX" EnumName="BigPoeLimb" Offset="0x5C18" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigslime.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigslime.xml
deleted file mode 100644
index 93c2ef807..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bigslime.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<Root>
-    <!-- Assets for the Gekko, Minislime, and Bigslime -->
-    <File Name="object_bigslime" Segment="6">
-        <Animation Name="gGekkoFullFistPumpAnim" Offset="0x994" /> <!-- Original name is "bsl_aisatsuDEMO" ("greeting") -->
-        <Animation Name="gGekkoSurpriseJumpAnim" Offset="0x10F4" /> <!-- Original name is "bsl_bikkuri" ("to be surprised; to be frightened") -->
-        <Animation Name="gGekkoCallAnim" Offset="0x1B08" /> <!-- Original name is "bsl_callDEMO" -->
-        <Animation Name="gGekkoCrawlAnim" Offset="0x1E14" /> <!-- Original name is "bsl_clim" -->
-        <Animation Name="gGekkoFallInAirAnim" Offset="0x1F20" /> <!-- Original name is "bsl_climdamage" -->
-        <Animation Name="gGekkoFloorIdleAnim" Offset="0x225C" /> <!-- Original name is "bsl_climwait" -->
-        <Animation Name="gGekkoDamagedAnim" Offset="0x276C" /> <!-- Original name is "bsl_damage" -->
-        <Animation Name="gGekkoJumpUpAnim" Offset="0x2E0C" /> <!-- Original name is "bsl_flyjump" -->
-        <Animation Name="gGekkoRecoverAnim" Offset="0x30E4" /> <!-- Original name is "bsl_hukki" ("return; comeback") -->
-        <Animation Name="gGekkoJabPunchAnim" Offset="0x347C" /> <!-- Original name is "bsl_jabA" -->
-        <Animation Name="gGekkoJumpForwardAnim" Offset="0x39C4" /> <!-- Original name is "bsl_jump" -->
-        <Animation Name="gGekkoKickAnim" Offset="0x3F28" /> <!-- Original name is "bsl_kickA" -->
-        <Animation Name="gGekkoFallOnGroundAnim" Offset="0x4298" /> <!-- Original name is "bsl_rakka" ("fall; drop; descent") -->
-        <Animation Name="gGekkoStandingIdleAnim" Offset="0x4680" /> <!-- Original name is "bsl_ride" -->
-        <Animation Name="gGekkoJumpOnSnapperAnim" Offset="0x4894" /> <!-- Orignal name is "bsl_ridefuse" -->
-        <Animation Name="gGekkoQuickFistPumpAnim" Offset="0x4D50" /> <!-- Original name is "bsl_ridegogo" -->
-        <Animation Name="gGekkoSqueezeAnim" Offset="0x50B8" /> <!-- Original name is "bsl_ridejump" -->
-        <Animation Name="gGekkoLandOnSnapperAnim" Offset="0x52EC" /> <!-- Original name is "bsl_rideokiru" ("okiru" = "to get up; to rise") -->
-        <Animation Name="gGekkoWiggleAnim" Offset="0x5694" /> <!-- Original name is "bsl_riderakka" -->
-        <Animation Name="gGekkoKnockbackAnim" Offset="0x5D54" /> <!-- Original name is "bsl_standdamage" -->
-        <Animation Name="gGekkoLookAroundAnim" Offset="0x66B4" /> <!-- Original name is "bsl_standview" -->
-        <Animation Name="gGekkoNervousIdleAnim" Offset="0x69FC" /> <!-- Original name is "bsl_standwalk" -->
-        <Animation Name="gGekkoHookPunchAnim" Offset="0x70C4" /> <!-- Original name is "bsl_strertA" (maybe a severe mispelling of "straight", as in "straight punch"?) -->
-        <Animation Name="gGekkoSwimForwardAnim" Offset="0x7790" /> <!-- Original name is "bsl_swim" -->
-
-        <DList Name="gGekkoRightEyeDL" Offset="0x9D90" />
-        <DList Name="gGekkoLeftEyeDL" Offset="0x9FF0" />
-        <DList Name="gGekkoJawDL" Offset="0xA250" />
-        <DList Name="gGekkoHeadDL" Offset="0xA510" />
-        <DList Name="gGekkoRightHandDL" Offset="0xAAF8" />
-        <DList Name="gGekkoRightWristDL" Offset="0xABB0" />
-        <DList Name="gGekkoRightForearmDL" Offset="0xAC78" />
-        <DList Name="gGekkoRightUpperArmDL" Offset="0xAD88" />
-        <DList Name="gGekkoLeftHandDL" Offset="0xAE98" />
-        <DList Name="gGekkoLeftWristDL" Offset="0xAF50" />
-        <DList Name="gGekkoLeftForearmDL" Offset="0xB030" />
-        <DList Name="gGekkoLeftUpperArmDL" Offset="0xB140" />
-        <DList Name="gGekkoTorsoDL" Offset="0xB250" />
-        <DList Name="gGekkoRightFootDL" Offset="0xB4D8" />
-        <DList Name="gGekkoRightAnkleDL" Offset="0xB660" />
-        <DList Name="gGekkoRightShinDL" Offset="0xB770" />
-        <DList Name="gGekkoRightThighDL" Offset="0xB880" />
-        <DList Name="gGekkoLeftFootDL" Offset="0xB9A8" />
-        <DList Name="gGekkoLeftAnkleDL" Offset="0xBB30" />
-        <DList Name="gGekkoLeftShinDL" Offset="0xBC40" />
-        <DList Name="gGekkoLeftThighDL" Offset="0xBD50" />
-        <DList Name="gGekkoWaistDL" Offset="0xBE78" />
-
-        <Texture Name="gGekkoArmLegTLUT" OutName="gekko_arm_leg_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC028" />
-        <Texture Name="gGekkoBodyTLUT" OutName="gekko_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC228" />
-        <Texture Name="gGekkoHeadTLUT" OutName="gekko_head_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC428" />
-        
-        <Texture Name="gGekkoNostrilTex" OutName="gekko_nostril" Format="rgba16" Width="8" Height="8" Offset="0xC628" />
-        <Texture Name="gGekkoEyeTex" OutName="gekko_eye" Format="rgba16" Width="16" Height="16" Offset="0xC6A8" />
-        <Texture Name="gGekkoSpots1Tex" OutName="gekko_spots_1" Format="rgba16" Width="16" Height="16" Offset="0xC8A8" />
-        <Texture Name="gGekkoBellyTex" OutName="gekko_belly" Format="rgba16" Width="16" Height="32" Offset="0xCAA8" />
-        <Texture Name="gGekkoSpots2Tex" OutName="gekko_spots_2" Format="ci8" Width="16" Height="32" Offset="0xCEA8" />
-        <Texture Name="gGekkoToothTex" OutName="gekko_tooth" Format="rgba16" Width="16" Height="16" Offset="0xD0A8" />
-        <Texture Name="gGekkoMouthTex" OutName="gekko_mouth" Format="rgba16" Width="16" Height="8" Offset="0xD2A8" />
-        <Texture Name="gGekkoEyebrowTex" OutName="gekko_eyebrow" Format="rgba16" Width="8" Height="8" Offset="0xD3A8" />
-        <Texture Name="gGekkoFinTex" OutName="gekko_fin" Format="rgba16" Width="32" Height="16" Offset="0xD428" />
-        <Texture Name="gGekkoSpots3Tex" OutName="gekko_spots_3" Format="ci8" Width="32" Height="32" Offset="0xD828" />
-        <Texture Name="gGekkoSwirlTex" OutName="gekko_swirl" Format="ci8" Width="16" Height="32" Offset="0xDC28" />
-        
-        <Limb Name="gGekkoRootLimb" Type="Standard" EnumName="GEKKO_LIMB_ROOT" Offset="0xDE28" />
-        <Limb Name="gGekkoWaistLimb" Type="Standard" EnumName="GEKKO_LIMB_WAIST" Offset="0xDE34" />
-        <Limb Name="gGekkoLeftThighLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_THIGH" Offset="0xDE40" />
-        <Limb Name="gGekkoLeftShinLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_SHIN" Offset="0xDE4C" />
-        <Limb Name="gGekkoLeftAnkleLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_ANKLE" Offset="0xDE58" />
-        <Limb Name="gGekkoLeftFootLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_FOOT" Offset="0xDE64" />
-        <Limb Name="gGekkoRightThighLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_THIGH" Offset="0xDE70" />
-        <Limb Name="gGekkoRightShinLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_SHIN" Offset="0xDE7C" />
-        <Limb Name="gGekkoRightAnkleLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_ANKLE" Offset="0xDE88" />
-        <Limb Name="gGekkoRightFootLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_FOOT" Offset="0xDE94" />
-        <Limb Name="gGekkoTorsoLimb" Type="Standard" EnumName="GEKKO_LIMB_TORSO" Offset="0xDEA0" />
-        <Limb Name="gGekkoLeftUpperArmLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_UPPER_ARM" Offset="0xDEAC" />
-        <Limb Name="gGekkoLeftForearmLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_FOREARM" Offset="0xDEB8" />
-        <Limb Name="gGekkoLeftWristLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_WRIST" Offset="0xDEC4" />
-        <Limb Name="gGekkoLeftHandLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_HAND" Offset="0xDED0" />
-        <Limb Name="gGekkoRightUpperArmLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_UPPER_ARM" Offset="0xDEDC" />
-        <Limb Name="gGekkoRightForearmLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_FOREARM" Offset="0xDEE8" />
-        <Limb Name="gGekkoRightWristLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_WRIST" Offset="0xDEF4" />
-        <Limb Name="gGekkoRightHandLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_HAND" Offset="0xDF00" />
-        <Limb Name="gGekkoHeadLimb" Type="Standard" EnumName="GEKKO_LIMB_HEAD" Offset="0xDF0C" />
-        <Limb Name="gGekkoJawLimb" Type="Standard" EnumName="GEKKO_LIMB_JAW" Offset="0xDF18" />
-        <Limb Name="gGekkoLeftEyeLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_EYE" Offset="0xDF24" />
-        <Limb Name="gGekkoRightEyeLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_EYE" Offset="0xDF30" />
-        <Skeleton Name="gGekkoSkel" Type="Flex" LimbType="Standard" LimbNone="GEKKO_LIMB_NONE" LimbMax="GEKKO_LIMB_MAX" EnumName="GekkoLimb" Offset="0xDF98" />
-
-        <Animation Name="gGekkoWindupPunchAnim" Offset="0xF048" /> <!-- Original name is "bsl_upperA" -->
-        <Animation Name="gGekkoSwimUpAnim" Offset="0xF3F0" /> <!-- Original name is "bsl_upswim" -->
-        <Animation Name="gGekkoBoxingStanceAnim" Offset="0xF990" /> <!-- Original name is "bsl_waitA" -->
-        
-        <DList Name="gBigslimeBubbleDL" Offset="0xF9D0" /> <!-- Original name is "bsl_bable_model" -->
-        <DList Name="gBigslimeShockwaveDL" Offset="0xFB40" /> <!-- Original name is "bsl_coolwave_modelT" -->
-        <Texture Name="gBigslimeShockwave1Tex" OutName="bigslime_shockwave_1" Format="i4" Width="32" Height="64" Offset="0xFC28" />
-        <Blob Name="object_bigslime_zeroes_Blob_010028" Size="0x400" Offset="0x10028" />
-        <Texture Name="gBigslimeShockwave2Tex" OutName="bigslime_shockwave_2" Format="i4" Width="16" Height="16" Offset="0x10428" />
-        <Blob Name="object_bigslime_zeroes_Blob_0104A8" Size="0x88" Offset="0x104A8" />
-        
-        <DList Name="gBigslimeNormalMaterialDL" Offset="0x10530" />
-
-        <!-- Reads vtx from segment 9 set by sBigslimeDynamicVtx -->
-        <DList Name="gBigslimeModelDL" Offset="0x105E8" />
-        <!-- Reads vtx from segment 9 set by sBigslimeTargetVtx -->
-        <DList Name="gBigslimeFrozenMaterialDL" Offset="0x10B80" />
-
-        <TextureAnimation Name="gBigslimeFrozenTexAnim" Offset="0x10C48" />
-        <DList Name="gMinislimeFrozenDL" Offset="0x10DB0" /> <!-- Original name is "bsl_icepart_model" (the original asset exists in MM3D, along with an updated asset named "muddjelly_icepart") -->
-        <TextureAnimation Name="gMinislimeFrozenTexAnim" Offset="0x10EC8" />
-
-        <DList Name="gBigslimeIceShardDL" Offset="0x10F20" />
-        <DList Name="gBigslimeIceShardVtxDL" Offset="0x10FE0" /> <!-- Original name is probably "bsl_icepeace_model" (called "muddjelly_icepeace" in MM3D) -->
-        <TextureAnimation Name="gBigslimeIceShardTexAnim" Offset="0x11008" />
-        
-        <DList Name="gBigslimeShadowDL" Offset="0x11050" /> <!-- Original name is "bsl_kage_model" ("shadow; silhouette") -->
-        <DList Name="gMinislimeNormalDL" Offset="0x113B0" /> <!-- Original name is probably "bsl_smallgel_model" (called "muddjelly_smallgel" in MM3D) -->
-
-        <Texture Name="gBigslimeBubbleTex" OutName="bigslime_bubble" Format="i4" Width="16" Height="16" Offset="0x11580" />
-        <Texture Name="gBigslimeShadowTex" OutName="bigslime_shadow" Format="i8" Width="32" Height="32" Offset="0x11600" />
-        
-        <!-- Used also for minislime -->
-        <Texture Name="gBigslimeNormal1Tex" OutName="bigslime_normal_1" Format="rgba16" Width="32" Height="32" Offset="0x11A00" />
-        <Texture Name="gBigslimeNormal2Tex" OutName="bigslime_normal_2" Format="i4" Width="64" Height="64" Offset="0x12200" />
-        <Texture Name="gBigslimeFrozen1Tex" OutName="bigslime_frozen_1" Format="i4" Width="64" Height="64" Offset="0x12A00" />
-        <Texture Name="gBigslimeFrozen2Tex" OutName="bigslime_frozen_2" Format="i4" Width="32" Height="32" Offset="0x13200" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bji.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bji.xml
deleted file mode 100644
index 697ee565c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bji.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Root>
-    <File Name="object_bji" Segment="6">
-        <Animation Name="object_bji_Anim_00066C" Offset="0x66C" /> <!-- Original name is "Bji_fushigigaru" ("to be curious; to wonder; to marvel​") -->
-        <Animation Name="object_bji_Anim_000AB0" Offset="0xAB0" /> <!-- Original name is "Bji_talk" -->
-        <Animation Name="object_bji_Anim_000FDC" Offset="0xFDC" /> <!-- Original name is "Bji_wait01" -->
-        
-        <DList Name="gShikashiHeadDL" Offset="0x23A0" />
-        <DList Name="gShikashiRightHandDL" Offset="0x28D8" />
-        <DList Name="gShikashiRightForearmDL" Offset="0x2998" />
-        <DList Name="gShikashiRightArmDL" Offset="0x2A98" />
-        <DList Name="gShikashiLeftHandDL" Offset="0x2BA8" />
-        <DList Name="gShikashiLeftForearmDL" Offset="0x2C68" />
-        <DList Name="gShikashiLeftArmDL" Offset="0x2D68" />
-        <DList Name="gShikashiTorsoDL" Offset="0x2E78" />
-        <DList Name="gShikashiRightFootDL" Offset="0x30F0" />
-        <DList Name="gShikashiRightLegDL" Offset="0x31B0" />
-        <DList Name="gShikashiRightThighDL" Offset="0x3270" />
-        <DList Name="gShikashiLeftFootDL" Offset="0x3330" />
-        <DList Name="gShikashiLeftLegDL" Offset="0x33F0" />
-        <DList Name="gShikashiLeftThighDL" Offset="0x34B0" />
-        <DList Name="gShikashiPelvisDL" Offset="0x3570" />
-
-        <Texture Name="object_bji_TLUT_003730" OutName="tlut_003730" Format="rgba16" Width="16" Height="16" Offset="0x3730" />
-        <Texture Name="object_bji_TLUT_003930" OutName="tlut_003930" Format="rgba16" Width="16" Height="16" Offset="0x3930" />
-        <Texture Name="object_bji_TLUT_003B30" OutName="tlut_003B30" Format="rgba16" Width="16" Height="16" Offset="0x3B30" />
-        <Texture Name="object_bji_TLUT_003D30" OutName="tlut_003D30" Format="rgba16" Width="16" Height="16" Offset="0x3D30" />
-        <Texture Name="object_bji_TLUT_003F30" OutName="tlut_003F30" Format="rgba16" Width="16" Height="16" Offset="0x3F30" />
-        <Texture Name="object_bji_Tex_004130" OutName="tex_004130" Format="rgba16" Width="16" Height="16" Offset="0x4130" />
-        <Texture Name="object_bji_TLUT_004330" OutName="tlut_004330" Format="rgba16" Width="16" Height="16" Offset="0x4330" />
-        <Texture Name="object_bji_TLUT_004530" OutName="tlut_004530" Format="rgba16" Width="16" Height="16" Offset="0x4530" />
-        <Texture Name="object_bji_Tex_004730" OutName="tex_004730" Format="ci8" Width="8" Height="8" Offset="0x4730" />
-        <Texture Name="object_bji_Tex_004770" OutName="tex_004770" Format="ci8" Width="16" Height="16" Offset="0x4770" />
-        <Texture Name="object_bji_Tex_004870" OutName="tex_004870" Format="ci8" Width="8" Height="8" Offset="0x4870" />
-        <Texture Name="object_bji_Tex_0048B0" OutName="tex_0048B0" Format="ci8" Width="16" Height="16" Offset="0x48B0" />
-        <Texture Name="object_bji_Tex_0049B0" OutName="tex_0049B0" Format="ci8" Width="8" Height="8" Offset="0x49B0" />
-        <Texture Name="object_bji_Tex_0049F0" OutName="tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" />
-        <Texture Name="object_bji_Tex_004DF0" OutName="tex_004DF0" Format="ci8" Width="8" Height="8" Offset="0x4DF0" />
-        <Texture Name="object_bji_Tex_004E30" OutName="tex_004E30" Format="ci8" Width="8" Height="8" Offset="0x4E30" />
-        <Texture Name="object_bji_Tex_004E70" OutName="tex_004E70" Format="ci8" Width="32" Height="32" Offset="0x4E70" />
-        <Texture Name="object_bji_Tex_005270" OutName="tex_005270" Format="ci8" Width="32" Height="32" Offset="0x5270" />
-        
-        <!-- Unused Eye Texture Animation -->
-        <TextureAnimation Name="gShikashiEyeTexAnim" Offset="0x5694" />
-
-        <Limb Name="gShikashiPelvisLimb" Type="Standard" EnumName="SHIKASHI_LIMB_PELVIS" Offset="0x569C" />
-        <Limb Name="gShikashiLeftThighLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_THIGH" Offset="0x56A8" />
-        <Limb Name="gShikashiLeftLegLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_LEG" Offset="0x56B4" />
-        <Limb Name="gShikashiLeftFootLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_FOOT" Offset="0x56C0" />
-        <Limb Name="gShikashiRightThighLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_THIGH" Offset="0x56CC" />
-        <Limb Name="gShikashiRightLegLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_LEG" Offset="0x56D8" />
-        <Limb Name="gShikashiRightFootLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_FOOT" Offset="0x56E4" />
-        <Limb Name="gShikashiTorsoLimb" Type="Standard" EnumName="SHIKASHI_LIMB_TORSO" Offset="0x56F0" />
-        <Limb Name="gShikashiLeftArmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_ARM" Offset="0x56FC" />
-        <Limb Name="gShikashiLeftForearmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_FOREARM" Offset="0x5708" />
-        <Limb Name="gShikashiLeftHandLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_HAND" Offset="0x5714" />
-        <Limb Name="gShikashiRightArmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_ARM" Offset="0x5720" />
-        <Limb Name="gShikashiRightForearmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_FOREARM" Offset="0x572C" />
-        <Limb Name="gShikashiRightHandLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_HAND" Offset="0x5738" />
-        <Limb Name="gShikashiHeadLimb" Type="Standard" EnumName="SHIKASHI_LIMB_HEAD" Offset="0x5744" />
-        <Skeleton Name="gShikashiSkel" Type="Flex" LimbType="Standard" LimbNone="SHIKASHI_LIMB_NONE" LimbMax="SHIKASHI_LIMB_MAX" EnumName="ShikashiLimb" Offset="0x578C" />
-
-        <Animation Name="object_bji_Anim_005B58" Offset="0x5B58" /> <!-- Original name is "Bji_wait02" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bjt.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bjt.xml
deleted file mode 100644
index a4943f6ee..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bjt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Root>
-    <!-- ??? (Hand in Toilet) assets -->
-    <File Name="object_bjt" Segment="6">
-        <!-- ??? animations -->
-        <Animation Name="gToiletHandWaggingFingerAnim" Offset="0xFC" /><!-- Original name is "bjt_chigau" ("different/wrong") -->
-        <Animation Name="gToiletHandFistAnim" Offset="0x218" /><!-- Original name is "bjt_guu" ("fist") -->
-        <Animation Name="gToiletHandThumbsUpAnim" Offset="0x3A8" /><!-- Original name is "bjt_ok" (thumbs up, correct) -->
-        <Animation Name="gToiletHandOpenHandAnim" Offset="0x564" /><!-- Original name is "bjt_par" ("paper"? Open hand, palm up) -->
-        <Animation Name="gToiletHandWaitingAnim" Offset="0x7B8" /><!-- Original name is "bjt_wait" (flopping around grasping at air) -->
-
-        <!-- ??? model -->
-        <DList Name="gToiletHandIndexFingerDL" Offset="0x1570" />
-        <DList Name="gToiletHandThumbDL" Offset="0x1690" />
-        <DList Name="gToiletHandOtherFingersDL" Offset="0x17A0" />
-        <DList Name="gToiletHandPalmDL" Offset="0x18C8" />
-        <DList Name="gToiletHandArmDL" Offset="0x19E8" />
-        <Texture Name="gToiletHandFingersTex" OutName="toilet_hand_fingers" Format="rgba16" Width="32" Height="32" Offset="0x1AB0" />
-        <Texture Name="gToiletHandArmSkinTex" OutName="toilet_hand_arm_skin" Format="rgba16" Width="8" Height="8" Offset="0x22B0" />
-        <Limb Name="gToiletHandRootLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_ROOT" Offset="0x2330" />
-        <Limb Name="gToiletHandArmLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_ARM" Offset="0x233C" />
-        <Limb Name="gToiletHandPalmLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_PALM" Offset="0x2348" />
-        <Limb Name="gToiletHandOtherFingersLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_OTHER_FINGERS" Offset="0x2354" />
-        <Limb Name="gToiletHandThumbLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_THUMB" Offset="0x2360" />
-        <Limb Name="gToiletHandIndexFingerLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_INDEX_FINGER" Offset="0x236C" />
-        <Skeleton Name="gToiletHandSkel" Type="Flex" LimbType="Standard" LimbNone="TOILET_HAND_LIMB_NONE" LimbMax="TOILET_HAND_LIMB_MAX" EnumName="ToiletHandLimb" Offset="0x2390" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bob.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bob.xml
deleted file mode 100644
index 13edbe6fe..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bob.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<Root>
-    <File Name="object_bob" Segment="6">
-        <Limb Name="object_bob_Standardlimb_000000" Type="Standard" EnumName="OBJECT_BOB_LIMB_01" Offset="0x0" />
-        <Limb Name="object_bob_Standardlimb_00000C" Type="Standard" EnumName="OBJECT_BOB_LIMB_02" Offset="0xC" />
-        <Limb Name="object_bob_Standardlimb_000018" Type="Standard" EnumName="OBJECT_BOB_LIMB_03" Offset="0x18" />
-        <Limb Name="object_bob_Standardlimb_000024" Type="Standard" EnumName="OBJECT_BOB_LIMB_04" Offset="0x24" />
-        <Limb Name="object_bob_Standardlimb_000030" Type="Standard" EnumName="OBJECT_BOB_LIMB_05" Offset="0x30" />
-        <Limb Name="object_bob_Standardlimb_00003C" Type="Standard" EnumName="OBJECT_BOB_LIMB_06" Offset="0x3C" />
-        <Limb Name="object_bob_Standardlimb_000048" Type="Standard" EnumName="OBJECT_BOB_LIMB_07" Offset="0x48" />
-        <Limb Name="object_bob_Standardlimb_000054" Type="Standard" EnumName="OBJECT_BOB_LIMB_08" Offset="0x54" />
-        <Limb Name="object_bob_Standardlimb_000060" Type="Standard" EnumName="OBJECT_BOB_LIMB_09" Offset="0x60" />
-        <Limb Name="object_bob_Standardlimb_00006C" Type="Standard" EnumName="OBJECT_BOB_LIMB_0A" Offset="0x6C" />
-        <Limb Name="object_bob_Standardlimb_000078" Type="Standard" EnumName="OBJECT_BOB_LIMB_0B" Offset="0x78" />
-        <Limb Name="object_bob_Standardlimb_000084" Type="Standard" EnumName="OBJECT_BOB_LIMB_0C" Offset="0x84" />
-        <Limb Name="object_bob_Standardlimb_000090" Type="Standard" EnumName="OBJECT_BOB_LIMB_0D" Offset="0x90" />
-        <Limb Name="object_bob_Standardlimb_00009C" Type="Standard" EnumName="OBJECT_BOB_LIMB_0E" Offset="0x9C" />
-        <Limb Name="object_bob_Standardlimb_0000A8" Type="Standard" EnumName="OBJECT_BOB_LIMB_0F" Offset="0xA8" />
-        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOB_LIMB_NONE" LimbMax="OBJECT_BOB_LIMB_MAX" EnumName="ObjectBobLimb" Offset="0xF0" />
-        <Texture Name="object_bob_TLUT_000108" OutName="tlut_000108" Format="rgba16" Width="16" Height="16" Offset="0x108" />
-        <Texture Name="object_bob_Tex_000308" OutName="tex_000308" Format="ci8" Width="8" Height="8" Offset="0x308" />
-        <Texture Name="object_bob_Tex_000348" OutName="tex_000348" Format="ci8" Width="8" Height="8" Offset="0x348" />
-        <Texture Name="object_bob_Tex_000388" OutName="tex_000388" Format="ci8" Width="32" Height="32" Offset="0x388" />
-        <Texture Name="object_bob_Tex_000788" OutName="tex_000788" Format="ci8" Width="8" Height="8" Offset="0x788" />
-        <Texture Name="object_bob_Tex_0007C8" OutName="tex_0007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8" />
-        <Texture Name="object_bob_Tex_000FC8" OutName="tex_000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8" />
-        <Texture Name="object_bob_Tex_0017C8" OutName="tex_0017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8" />
-        <Texture Name="object_bob_Tex_001FC8" OutName="tex_001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" />
-        <Texture Name="object_bob_Tex_0020C8" OutName="tex_0020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" />
-        <Texture Name="object_bob_Tex_0021C8" OutName="tex_0021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" />
-        <Texture Name="object_bob_Tex_002208" OutName="tex_002208" Format="ci8" Width="16" Height="16" Offset="0x2208" />
-        <DList Name="object_bob_DL_003B78" Offset="0x3B78" />
-        <DList Name="object_bob_DL_003F68" Offset="0x3F68" />
-        <DList Name="object_bob_DL_0040B0" Offset="0x40B0" />
-        <DList Name="object_bob_DL_0041E0" Offset="0x41E0" />
-        <DList Name="object_bob_DL_004310" Offset="0x4310" />
-        <DList Name="object_bob_DL_004458" Offset="0x4458" />
-        <DList Name="object_bob_DL_004588" Offset="0x4588" />
-        <DList Name="object_bob_DL_0046B8" Offset="0x46B8" />
-        <DList Name="object_bob_DL_004A48" Offset="0x4A48" />
-        <DList Name="object_bob_DL_004B18" Offset="0x4B18" />
-        <DList Name="object_bob_DL_004BE8" Offset="0x4BE8" />
-        <DList Name="object_bob_DL_004C38" Offset="0x4C38" />
-        <DList Name="object_bob_DL_004D08" Offset="0x4D08" />
-        <DList Name="object_bob_DL_004DD8" Offset="0x4DD8" />
-        <DList Name="object_bob_DL_004E28" Offset="0x4E28" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boj.xml
deleted file mode 100644
index 2eb08a1ef..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boj.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<Root>
-    <File Name="object_boj" Segment="6">
-        <Animation Name="object_boj_Anim_00041C" Offset="0x41C" /> <!-- Original name is "Boj2_17" -->
-        <Animation Name="object_boj_Anim_0004D0" Offset="0x4D0" /> <!-- Original name is "Boj2_19" -->
-        <Animation Name="object_boj_Anim_00071C" Offset="0x71C" /> <!-- Original name is "Boj2_5" -->
-        <Animation Name="object_boj_Anim_0008C0" Offset="0x8C0" /> <!-- Original name is "Boj2_9" -->
-        <Animation Name="object_boj_Anim_000AC4" Offset="0xAC4" /> <!-- Original name is "Boj2_9_2" -->
-        <Animation Name="object_boj_Anim_001494" Offset="0x1494" /> <!-- Original name is "Boj_13" -->
-        <Animation Name="object_boj_Anim_001908" Offset="0x1908" /> <!-- Original name is "Boj_14" -->
-        <Animation Name="object_boj_Anim_002734" Offset="0x2734" /> <!-- Original name is "Boj_card_aka_talk" ("aka" = "red") -->
-        <Animation Name="object_boj_Anim_0033B0" Offset="0x33B0" /> <!-- Original name is "Boj_card_aka_wait" -->
-        <Animation Name="object_boj_Anim_004078" Offset="0x4078" /> <!-- Original name is "Boj_card_ao_wait" ("ao" = "blue") -->
-        <Animation Name="object_boj_Anim_0043F0" Offset="0x43F0" /> <!-- Original name is "Boj_ginkowait" ("ginko" = "bank") -->
-        <Animation Name="object_boj_Anim_004A7C" Offset="0x4A7C" /> <!-- Original name is "Boj_ginkoyobi" ("yobi" = "call; invitation") -->
-        <Animation Name="object_boj_Anim_004F40" Offset="0x4F40" /> <!-- Original name is "Boj_hanko" ("seal; stamp") -->
-        <Animation Name="object_boj_Anim_005CE4" Offset="0x5CE4" /> <!-- Original name is "Boj_juggling" -->
-        <Animation Name="object_boj_Anim_005D9C" Offset="0x5D9C" /> <!-- Original name is "Boj_matsu" ("to wait​") -->
-        <Texture Name="object_boj_TLUT_005DB0" OutName="tlut_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5DB0" />
-        <Texture Name="object_boj_Tex_005FB0" OutName="tex_005FB0" Format="ci8" Width="8" Height="16" Offset="0x5FB0" />
-        <Texture Name="object_boj_Tex_006030" OutName="tex_006030" Format="ci8" Width="8" Height="8" Offset="0x6030" />
-        <Texture Name="object_boj_Tex_006070" OutName="tex_006070" Format="ci8" Width="32" Height="16" Offset="0x6070" />
-        <Texture Name="object_boj_Tex_006270" OutName="tex_006270" Format="ci8" Width="8" Height="8" Offset="0x6270" />
-        <Texture Name="object_boj_Tex_0062B0" OutName="tex_0062B0" Format="ci8" Width="16" Height="16" Offset="0x62B0" />
-        <Texture Name="object_boj_Tex_0063B0" OutName="tex_0063B0" Format="ci8" Width="16" Height="16" Offset="0x63B0" />
-        <Texture Name="object_boj_Tex_0064B0" OutName="tex_0064B0" Format="ci8" Width="16" Height="16" Offset="0x64B0" />
-        <Texture Name="object_boj_Tex_0065B0" OutName="tex_0065B0" Format="ci8" Width="8" Height="8" Offset="0x65B0" />
-        <Texture Name="object_boj_Tex_0065F0" OutName="tex_0065F0" Format="i8" Width="16" Height="16" Offset="0x65F0" />
-        <Texture Name="object_boj_Tex_0066F0" OutName="tex_0066F0" Format="ci8" Width="8" Height="8" Offset="0x66F0" />
-        <Texture Name="object_boj_Tex_006730" OutName="tex_006730" Format="i8" Width="8" Height="8" Offset="0x6730" />
-        <DList Name="object_boj_DL_0083A0" Offset="0x83A0" />
-        <DList Name="object_boj_DL_008778" Offset="0x8778" />
-        <DList Name="object_boj_DL_0088C0" Offset="0x88C0" />
-        <DList Name="object_boj_DL_0089C8" Offset="0x89C8" />
-        <DList Name="object_boj_DL_008AD0" Offset="0x8AD0" />
-        <DList Name="object_boj_DL_008C18" Offset="0x8C18" />
-        <DList Name="object_boj_DL_008D20" Offset="0x8D20" />
-        <DList Name="object_boj_DL_008E28" Offset="0x8E28" />
-        <DList Name="object_boj_DL_009000" Offset="0x9000" />
-        <DList Name="object_boj_DL_009118" Offset="0x9118" />
-        <DList Name="object_boj_DL_009228" Offset="0x9228" />
-        <DList Name="object_boj_DL_009330" Offset="0x9330" />
-        <DList Name="object_boj_DL_009448" Offset="0x9448" />
-        <DList Name="object_boj_DL_009558" Offset="0x9558" />
-        <DList Name="object_boj_DL_009660" Offset="0x9660" />
-        <!-- <Blob Name="object_boj_Blob_009848" Size="0x1F8" Offset="0x9848" /> -->
-        <Texture Name="object_boj_Tex_009A40" OutName="tex_009A40" Format="ci8" Width="8" Height="8" Offset="0x9A40" />
-        <Texture Name="object_boj_Tex_009A80" OutName="tex_009A80" Format="ci8" Width="16" Height="16" Offset="0x9A80" />
-        <Texture Name="object_boj_Tex_009B80" OutName="tex_009B80" Format="ci8" Width="16" Height="16" Offset="0x9B80" />
-        <Texture Name="object_boj_Tex_009C80" OutName="tex_009C80" Format="ci8" Width="8" Height="16" Offset="0x9C80" />
-        <Texture Name="object_boj_Tex_009D00" OutName="tex_009D00" Format="ci8" Width="16" Height="16" Offset="0x9D00" />
-        <Texture Name="object_boj_Tex_009E00" OutName="tex_009E00" Format="ci8" Width="16" Height="16" Offset="0x9E00" />
-        <Texture Name="object_boj_Tex_009F00" OutName="tex_009F00" Format="ci8" Width="16" Height="16" Offset="0x9F00" />
-        <DList Name="object_boj_DL_00AF90" Offset="0xAF90" />
-        <DList Name="object_boj_DL_00B1D8" Offset="0xB1D8" /> <!-- object_ginko_limb15_dlist -->
-        <DList Name="object_boj_DL_00B3E8" Offset="0xB3E8" />
-        <DList Name="object_boj_DL_00B660" Offset="0xB660" />
-        <DList Name="object_boj_DL_00B878" Offset="0xB878" />
-        <DList Name="object_boj_DL_00BA28" Offset="0xBA28" />
-        <DList Name="object_boj_DL_00BA30" Offset="0xBA30" />
-        <Texture Name="object_boj_Tex_00BB88" OutName="tex_00BB88" Format="i8" Width="16" Height="16" Offset="0xBB88" />
-        <DList Name="object_boj_DL_00BCC8" Offset="0xBCC8" /> <!-- Original name is "jug_ball_model" -->
-        <Texture Name="object_boj_Tex_00BD50" OutName="tex_00BD50" Format="i8" Width="32" Height="32" Offset="0xBD50" />
-        <Limb Name="object_boj_Standardlimb_00C150" Type="Standard" EnumName="OBJECT_BOJ_LIMB_01" Offset="0xC150" />
-        <Limb Name="object_boj_Standardlimb_00C15C" Type="Standard" EnumName="OBJECT_BOJ_LIMB_02" Offset="0xC15C" />
-        <Limb Name="object_boj_Standardlimb_00C168" Type="Standard" EnumName="OBJECT_BOJ_LIMB_03" Offset="0xC168" />
-        <Limb Name="object_boj_Standardlimb_00C174" Type="Standard" EnumName="OBJECT_BOJ_LIMB_04" Offset="0xC174" />
-        <Limb Name="object_boj_Standardlimb_00C180" Type="Standard" EnumName="OBJECT_BOJ_LIMB_05" Offset="0xC180" />
-        <Limb Name="object_boj_Standardlimb_00C18C" Type="Standard" EnumName="OBJECT_BOJ_LIMB_06" Offset="0xC18C" />
-        <Limb Name="object_boj_Standardlimb_00C198" Type="Standard" EnumName="OBJECT_BOJ_LIMB_07" Offset="0xC198" />
-        <Limb Name="object_boj_Standardlimb_00C1A4" Type="Standard" EnumName="OBJECT_BOJ_LIMB_08" Offset="0xC1A4" />
-        <Limb Name="object_boj_Standardlimb_00C1B0" Type="Standard" EnumName="OBJECT_BOJ_LIMB_09" Offset="0xC1B0" />
-        <Limb Name="object_boj_Standardlimb_00C1BC" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0A" Offset="0xC1BC" />
-        <Limb Name="object_boj_Standardlimb_00C1C8" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0B" Offset="0xC1C8" />
-        <Limb Name="object_boj_Standardlimb_00C1D4" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0C" Offset="0xC1D4" />
-        <Limb Name="object_boj_Standardlimb_00C1E0" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0D" Offset="0xC1E0" />
-        <Limb Name="object_boj_Standardlimb_00C1EC" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0E" Offset="0xC1EC" />
-        <Limb Name="object_boj_Standardlimb_00C1F8" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0F" Offset="0xC1F8" />
-        <Skeleton Name="object_boj_Skel_00C240" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOJ_LIMB_NONE" LimbMax="OBJECT_BOJ_LIMB_MAX" EnumName="ObjectBojLimb" Offset="0xC240" /> <!-- object_ginko_skeleton -->
-        <Animation Name="object_boj_Anim_00DED8" Offset="0xDED8" /> <!-- Original name is "boj_door1" -->
-        <Animation Name="object_boj_Anim_00F920" Offset="0xF920" /> <!-- Original name is "boj_door2" -->
-        <Animation Name="object_boj_Anim_00FC1C" Offset="0xFC1C" /> <!-- Original name is "boj_walk1" -->
-        <Animation Name="object_boj_Anim_00FEE4" Offset="0xFEE4" /> <!-- Original name is "boj_walk2" -->
-        <Animation Name="object_boj_Anim_010330" Offset="0x10330" /> <!-- Original name is "boj_walk3" -->
-        <Animation Name="object_boj_Anim_010BDC" Offset="0x10BDC" /> <!-- Original name is "scm_harau" ("to drive away") -->
-        <Animation Name="object_boj_Anim_01139C" Offset="0x1139C" /> <!-- Original name is "scm_niwait" -->
-        <Animation Name="object_boj_Anim_011C38" Offset="0x11C38" /> <!-- Original name is "scm_odoroku" ("surprise") -->
-        <Animation Name="object_boj_Anim_011F84" Offset="0x11F84" /> <!-- Original name is "scm_teburarun" ("tebura" = "empty-handed​") -->
-        <Animation Name="object_boj_Anim_0128F4" Offset="0x128F4" /> <!-- Original name is "scm_teburawait" -->
-        <Animation Name="object_boj_Anim_012E84" Offset="0x12E84" /> <!-- Original name is "scm_yarare" ("to suffer damage") -->
-        <DList Name="gBombShopBagDL" Offset="0x13380" /> <!-- Original name is "seb_model" -->
-        <Texture Name="gBombShopBagTLUT" OutName="bomb_shop_bag_tlut" Format="rgba16" Width="16" Height="16" Offset="0x134C0" />
-        <Texture Name="gBombShopBagTex" OutName="bomb_shop_bag" Format="ci8" Width="16" Height="16" Offset="0x136C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bombf.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bombf.xml
deleted file mode 100644
index ca635875b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bombf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="object_bombf" Segment="6">
-        <!-- Bomb Flower DisplayLists -->
-        <DList Name="gBombFlowerLeavesDL" Offset="0x340"/> <!-- Original name is "bm_leaf_model" -->
-        <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/> <!-- Original name is "bm_flower_model" -->
-        <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/> <!-- Original name is "bm_leaf2_model" -->
-        
-        <!-- Bomb Flower DisplayList Textures -->
-        <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x5D8"/>
-        <Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0xDD8"/>
-        <Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x11D8"/>
-        <Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x19D8"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bombiwa.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bombiwa.xml
deleted file mode 100644
index 903d5bd40..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bombiwa.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="object_bombiwa" Segment="6">
-        <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="object_bombiwa_Tex_000020" OutName="tex_000020" Format="ci4" Width="64" Height="64" Offset="0x20" />
-        <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0" /> <!-- Original name is "obj_18b_stone_model" -->
-        <DList Name="object_bombiwa_DL_000AF0" Offset="0xAF0" />
-        <Texture Name="object_bombiwa_Tex_000C00" OutName="tex_000C00" Format="i4" Width="64" Height="64" Offset="0xC00" />
-        <DList Name="object_bombiwa_DL_001700" Offset="0x1700" /> <!-- Original name is "obj_bombstone_model" -->
-        <DList Name="object_bombiwa_DL_001800" Offset="0x1800" />
-        <DList Name="object_bombiwa_DL_001820" Offset="0x1820" />
-        <DList Name="object_bombiwa_DL_001990" Offset="0x1990" /> <!-- Original name is "g5_model" -->
-        <Texture Name="object_bombiwa_Tex_001A70" OutName="tex_001A70" Format="rgba16" Width="32" Height="32" Offset="0x1A70" />
-        <Texture Name="object_bombiwa_Tex_002270" OutName="tex_002270" Format="i4" Width="64" Height="64" Offset="0x2270" />
-        <DList Name="object_bombiwa_DL_002F60" Offset="0x2F60" /> <!-- Original name is "g2_model" -->
-        <DList Name="object_bombiwa_DL_003110" Offset="0x3110" />
-        <Texture Name="object_bombiwa_Tex_0031C0" OutName="tex_0031C0" Format="ia8" Width="16" Height="16" Offset="0x31C0" />
-        <Texture Name="object_bombiwa_Tex_0032C0" OutName="tex_0032C0" Format="rgba16" Width="32" Height="32" Offset="0x32C0" />
-        <Texture Name="object_bombiwa_Tex_003AC0" OutName="tex_003AC0" Format="i4" Width="64" Height="64" Offset="0x3AC0" />
-        <DList Name="object_bombiwa_DL_004560" Offset="0x4560" /> <!-- Original name is "g4_model" -->
-        <DList Name="object_bombiwa_DL_004688" Offset="0x4688" />
-        <Texture Name="object_bombiwa_Tex_004730" OutName="tex_004730" Format="ia8" Width="16" Height="16" Offset="0x4730" />
-        <Texture Name="object_bombiwa_Tex_004830" OutName="tex_004830" Format="rgba16" Width="32" Height="32" Offset="0x4830" />
-        <Texture Name="object_bombiwa_Tex_005030" OutName="tex_005030" Format="i4" Width="64" Height="64" Offset="0x5030" />
-        <DList Name="object_bombiwa_DL_005990" Offset="0x5990" /> <!-- Original name is "hahen_model" -->
-        <Texture Name="object_bombiwa_Tex_005A70" OutName="tex_005A70" Format="rgba16" Width="32" Height="32" Offset="0x5A70" />
-        <Texture Name="object_bombiwa_Tex_006270" OutName="tex_006270" Format="i4" Width="64" Height="64" Offset="0x6270" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss01.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss01.xml
deleted file mode 100644
index ff37d2bc9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss01.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<Root>
-    <!-- Assets for the Odolwa boss fight (Odolwa itself, its bugs and moths, its title card, etc.) -->
-    <File Name="object_boss01" Segment="6">
-        <!-- Odolwa Animations -->
-        <Animation Name="gOdolwaVerticalSlashAnim" Offset="0xC44" /> <!-- Original name is "jmp_at01" -->
-        <Animation Name="gOdolwaHorizontalSlashAnim" Offset="0x1884" /> <!-- Original name is "jmp_at02" -->
-        <Animation Name="gOdolwaAtAttentionAnim" Offset="0x1A14" /> <!-- Unused. Original name is "jmp_base" -->
-
-        <!-- Odolwa Limb DisplayLists -->
-        <DList Name="gOdolwaPelvisDL" Offset="0x5E80" />
-        <DList Name="gOdolwaHeadDL" Offset="0x5F98" />
-        <DList Name="gOdolwaCenterPlumeTipDL" Offset="0x61E8" />
-        <DList Name="gOdolwaCenterPlumeMiddleDL" Offset="0x62A8" />
-        <DList Name="gOdolwaCenterPlumeBaseDL" Offset="0x6368" />
-        <DList Name="gOdolwaLeftPlumeTipDL" Offset="0x6408" />
-        <DList Name="gOdolwaLeftPlumeMiddleDL" Offset="0x64C8" />
-        <DList Name="gOdolwaLeftPlumeBaseDL" Offset="0x6588" />
-        <DList Name="gOdolwaRightPlumeTipDL" Offset="0x6628" />
-        <DList Name="gOdolwaRightPlumeMiddleDL" Offset="0x66E8" />
-        <DList Name="gOdolwaRightPlumeBaseDL" Offset="0x67A8" />
-        <DList Name="gOdolwaLeftEarringDL" Offset="0x6848" />
-        <DList Name="gOdolwaRightEarringDL" Offset="0x68F8" />
-        <DList Name="gOdolwaSwordDL" Offset="0x69A8" />
-        <DList Name="gOdolwaRightHandDL" Offset="0x6B20" />
-        <DList Name="gOdolwaRightForearmDL" Offset="0x6CF8" />
-        <DList Name="gOdolwaRightBangleDL" Offset="0x6E50" />
-        <DList Name="gOdolwaRightUpperArmDL" Offset="0x6F40" />
-        <DList Name="gOdolwaShieldDL" Offset="0x70D0" />
-        <DList Name="gOdolwaLeftHandDL" Offset="0x71C0" />
-        <DList Name="gOdolwaLeftForearmDL" Offset="0x7398" />
-        <DList Name="gOdolwaLeftBangleDL" Offset="0x74F0" />
-        <DList Name="gOdolwaLeftUpperArmDL" Offset="0x75E0" />
-        <DList Name="gOdolwaTorsoDL" Offset="0x7770" />
-        <DList Name="gOdolwaLeftFootDL" Offset="0x7BD8" />
-        <DList Name="gOdolwaLeftShinDL" Offset="0x7E40" />
-        <DList Name="gOdolwaLeftThighDL" Offset="0x7FB0" />
-        <DList Name="gOdolwaRightFootDL" Offset="0x8128" />
-        <DList Name="gOdolwaRightShinDL" Offset="0x8390" />
-        <DList Name="gOdolwaRightThighDL" Offset="0x8500" />
-
-        <!-- Odolwa Textures -->
-        <Texture Name="gOdolwaPantsAndSwordHiltTLUT" OutName="odolwa_pants_and_sword_hilt_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8678" />
-        <Texture Name="gOdolwaFaceAndShoeTLUT" OutName="odolwa_face_and_shoe_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8698" />
-        <Texture Name="gOdolwaSkinTLUT" OutName="odolwa_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x86B8" />
-        <Texture Name="gOdolwaEarBangleAndShieldTLUT" OutName="odolwa_ear_bangle_and_shield_tlut" Format="rgba16" Width="4" Height="4" Offset="0x86D8" />
-        <Texture Name="gOdolwaClothTLUT" OutName="odolwa_cloth_tlut" Format="rgba16" Width="4" Height="4" Offset="0x86F8" />
-        <Texture Name="gOdolwaTorsoTLUT" OutName="odolwa_torso_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8718" />
-        <Texture Name="gOdolwaPantsAndSwordHiltTex" OutName="odolwa_pants_and_sword_hilt" Format="ci4" Width="64" Height="64" Offset="0x8738" />
-        <Texture Name="gOdolwaFaceAndShoeTex" OutName="odolwa_face_and_shoe" Format="ci4" Width="64" Height="64" Offset="0x8F38" />
-        <Texture Name="gOdolwaSkinTex" OutName="odolwa_skin" Format="ci4" Width="64" Height="64" Offset="0x9738" />
-        <Texture Name="gOdolwaEarBangleAndShieldTex" OutName="odolwa_ear_bangle_and_shield" Format="ci4" Width="64" Height="64" Offset="0x9F38" />
-        <Texture Name="gOdolwaEarringTex" OutName="odolwa_earring" Format="rgba16" Width="16" Height="16" Offset="0xA738" />
-        <Texture Name="gOdolwaPlumeTex" OutName="odolwa_plume" Format="rgba16" Width="16" Height="16" Offset="0xA938" />
-        <Texture Name="gOdolwaClothTex" OutName="odolwa_cloth" Format="ci4" Width="64" Height="64" Offset="0xAB38" />
-        <Texture Name="gOdolwaTorsoTex" OutName="odolwa_torso" Format="ci4" Width="64" Height="64" Offset="0xB338" />
-        <Texture Name="gOdolwaSwordBladeTex" OutName="odolwa_sword_blade" Format="rgba16" Width="16" Height="16" Offset="0xBB38" />
-
-        <!-- Assets for the trail that follows Odolwa's sword when he slashes -->
-        <Texture Name="gOdolwaSwordTrailTex" OutName="odolwa_sword_trail" Format="i8" Width="32" Height="32" Offset="0xBD38" />
-        <Texture Name="gOdolwaSwordTrailMaskTex" OutName="odolwa_sword_trail_mask" Format="i4" Width="32" Height="32" Offset="0xC138" />
-        <Array Name="gOdolwaSwordTrailVtx" Count="22" Offset="0xC338">
-            <Vtx/>
-        </Array>
-        <DList Name="gOdolwaSwordTrailDL" Offset="0xC498" />
-
-        <!-- Assets for Odolwa's glowing eyes -->
-        <DList Name="gOdolwaEyeDL" Offset="0xC5E0" />
-        <Texture Name="gOdolwaEyeTex" OutName="odolwa_eye" Format="i8" Width="16" Height="16" Offset="0xC668" />
-
-        <!-- DisplayLists for Odolwa's dynamic shadow -->
-        <DList Name="gOdolwaShadowMaterialDL" Offset="0xC7A8" />
-        <DList Name="gOdolwaShadowModelDL" Offset="0xC7C8" />
-
-        <!-- Odolwa Title Card -->
-        <Texture Name="gOdolwaTitleCardTex" OutName="odolwa_title_card" Format="ia8" Width="128" Height="40" Offset="0xC7F8" />
-
-        <!-- Assets for the moths Odolwa can summon -->
-        <DList Name="gOdolwaMothMaterialDL" Offset="0xDC58" />
-        <DList Name="gOdolwaMothModelDL" Offset="0xDCD0" />
-        <Texture Name="gOdolwaMothTex" OutName="odolwa_moth" Format="rgba16" Width="16" Height="32" Offset="0xDCE8" />
-
-        <!-- Assets for the blocks that fall from the ceiling during the Odolwa fight -->
-        <DList Name="gOdolwaFallingBlockDL" Offset="0xE3E8" /> <!-- Original name is "iwa01_model" ("rock; boulder") -->
-        <Texture Name="gOdolwaFallingBlockTLUT" OutName="odolwa_falling_block_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE558" />
-        <Texture Name="gOdolwaFallingBlockTex" OutName="odolwa_falling_block" Format="ci4" Width="64" Height="64" Offset="0xE578" />
-        
-        <!-- Odolwa Limbs -->
-        <Limb Name="gOdolwaRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_ROOT" Offset="0xED78" />
-        <Limb Name="gOdolwaPelvisLimb" Type="Standard" EnumName="ODOLWA_LIMB_PELVIS" Offset="0xED84" />
-        <Limb Name="gOdolwaRightLegRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_LEG_ROOT" Offset="0xED90" />
-        <Limb Name="gOdolwaRightThighLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_THIGH" Offset="0xED9C" />
-        <Limb Name="gOdolwaRightLowerLegRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_LOWER_LEG_ROOT" Offset="0xEDA8" />
-        <Limb Name="gOdolwaRightShinLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_SHIN" Offset="0xEDB4" />
-        <Limb Name="gOdolwaRightFootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_FOOT" Offset="0xEDC0" />
-        <Limb Name="gOdolwaLeftLegRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_LEG_ROOT" Offset="0xEDCC" />
-        <Limb Name="gOdolwaLeftThighLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_THIGH" Offset="0xEDD8" />
-        <Limb Name="gOdolwaLeftLowerLegRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_LOWER_LEG_ROOT" Offset="0xEDE4" />
-        <Limb Name="gOdolwaLeftShinLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_SHIN" Offset="0xEDF0" />
-        <Limb Name="gOdolwaLeftFootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_FOOT" Offset="0xEDFC" />
-        <Limb Name="gOdolwaUpperBodyRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_UPPER_BODY_ROOT" Offset="0xEE08" />
-        <Limb Name="gOdolwaUpperBodyWrapperLimb" Type="Standard" EnumName="ODOLWA_LIMB_UPPER_BODY_WRAPPER" Offset="0xEE14" />
-        <Limb Name="gOdolwaTorsoLimb" Type="Standard" EnumName="ODOLWA_LIMB_TORSO" Offset="0xEE20" />
-        <Limb Name="gOdolwaLeftArmRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_ARM_ROOT" Offset="0xEE2C" />
-        <Limb Name="gOdolwaLeftUpperArmLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_UPPER_ARM" Offset="0xEE38" />
-        <Limb Name="gOdolwaLeftLowerArmRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_LOWER_ARM_ROOT" Offset="0xEE44" />
-        <Limb Name="gOdolwaLeftForearmLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_FOREARM" Offset="0xEE50" />
-        <Limb Name="gOdolwaLeftBangleLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_BANGLE" Offset="0xEE5C" />
-        <Limb Name="gOdolwaLeftHandRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_HAND_ROOT" Offset="0xEE68" />
-        <Limb Name="gOdolwaLeftHandLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_HAND" Offset="0xEE74" />
-        <Limb Name="gOdolwaShieldLimb" Type="Standard" EnumName="ODOLWA_LIMB_SHIELD" Offset="0xEE80" />
-        <Limb Name="gOdolwaRightArmRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_ARM_ROOT" Offset="0xEE8C" />
-        <Limb Name="gOdolwaRightUpperArmLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_UPPER_ARM" Offset="0xEE98" />
-        <Limb Name="gOdolwaRightLowerArmRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_LOWER_ARM_ROOT" Offset="0xEEA4" />
-        <Limb Name="gOdolwaRightForearmLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_FOREARM" Offset="0xEEB0" />
-        <Limb Name="gOdolwaRightBangleLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_BANGLE" Offset="0xEEBC" />
-        <Limb Name="gOdolwaRightHandRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_HAND_ROOT" Offset="0xEEC8" />
-        <Limb Name="gOdolwaRightHandLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_HAND" Offset="0xEED4" />
-        <Limb Name="gOdolwaSwordLimb" Type="Standard" EnumName="ODOLWA_LIMB_SWORD" Offset="0xEEE0" />
-        <Limb Name="gOdolwaHeadLimb" Type="Standard" EnumName="ODOLWA_LIMB_HEAD" Offset="0xEEEC" />
-        <Limb Name="gOdolwaRightEarringRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_EARRING_ROOT" Offset="0xEEF8" />
-        <Limb Name="gOdolwaRightEarringLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_EARRING" Offset="0xEF04" />
-        <Limb Name="gOdolwaLeftEarringRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_EARRING_ROOT" Offset="0xEF10" />
-        <Limb Name="gOdolwaLeftEarringLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_EARRING" Offset="0xEF1C" />
-        <Limb Name="gOdolwaRightPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_PLUME_ROOT" Offset="0xEF28" />
-        <Limb Name="gOdolwaRightPlumeBaseLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_PLUME_BASE" Offset="0xEF34" />
-        <Limb Name="gOdolwaRightLowerPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_LOWER_PLUME_ROOT" Offset="0xEF40" />
-        <Limb Name="gOdolwaRightPlumeMiddleLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_PLUME_MIDDLE" Offset="0xEF4C" />
-        <Limb Name="gOdolwaRightPlumeTipLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_PLUME_TIP" Offset="0xEF58" />
-        <Limb Name="gOdolwaLeftPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_PLUME_ROOT" Offset="0xEF64" />
-        <Limb Name="gOdolwaLeftPlumeBaseLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_PLUME_BASE" Offset="0xEF70" />
-        <Limb Name="gOdolwaLeftLowerPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_LOWER_PLUME_ROOT" Offset="0xEF7C" />
-        <Limb Name="gOdolwaLeftPlumeMiddleLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_PLUME_MIDDLE" Offset="0xEF88" />
-        <Limb Name="gOdolwaLeftPlumeTipLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_PLUME_TIP" Offset="0xEF94" />
-        <Limb Name="gOdolwaCenterPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_CENTER_PLUME_ROOT" Offset="0xEFA0" />
-        <Limb Name="gOdolwaCenterPlumeBaseLimb" Type="Standard" EnumName="ODOLWA_LIMB_CENTER_PLUME_BASE" Offset="0xEFAC" />
-        <Limb Name="gOdolwaCenterLowerPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_CENTER_LOWER_PLUME_ROOT" Offset="0xEFB8" />
-        <Limb Name="gOdolwaCenterPlumeMiddleLimb" Type="Standard" EnumName="ODOLWA_LIMB_CENTER_PLUME_MIDDLE" Offset="0xEFC4" />
-        <Limb Name="gOdolwaCenterPlumeTipLimb" Type="Standard" EnumName="ODOLWA_LIMB_CENTER_PLUME_TIP" Offset="0xEFD0" />
-
-        <!-- Odolwa Skeleton -->
-        <Skeleton Name="gOdolwaSkel" Type="Flex" LimbType="Standard" LimbNone="ODOLWA_LIMB_NONE" LimbMax="ODOLWA_LIMB_MAX" EnumName="OdolwaLimb" Offset="0xF0A8" />
-
-        <!-- Odolwa Animations -->
-        <Animation Name="gOdolwaClimbAnim" Offset="0xF918" /> <!-- Unused and glitchy. Original name might be "jmp_crym" -->
-        <Animation Name="gOdolwaDamagedStartAnim" Offset="0xFDEC" /> <!-- Original name is "jmp_dam02" -->
-        <Animation Name="gOdolwaShieldGuardAnim" Offset="0xFF94" /> <!-- Original name is "jmp_def" -->
-        <Animation Name="gOdolwaSwordGuardAnim" Offset="0x10150" /> <!-- Original name is "jmp_def02" -->
-        <Animation Name="gOdolwaDamagedLoopAnim" Offset="0x10980" /> <!-- Original name is "jmp_dm01" -->
-        <Animation Name="gOdolwaDeathAnim" Offset="0x124CC" /> <!-- Original name is "jmp_down" -->
-        <Animation Name="gOdolwaMothSummonDanceAnim" Offset="0x12B70" /> <!-- Named "dance_bug" in MM3D, but it was probably renamed by Grezzo, since it doesn't fit with other names. -->
-        <Animation Name="gOdolwaCrouchAnim" Offset="0x12D10" /> <!-- Original name is "jmp_jmp01" -->
-        <Animation Name="gOdolwaJumpAnim" Offset="0x12EBC" /> <!-- Original name is "jmp_jmp02" -->
-        <Animation Name="gOdolwaFallingSlashAnim" Offset="0x13480" /> <!-- Original name is "jmp_jmp03" -->
-        <Animation Name="gOdolwaKickAnim" Offset="0x1407C" /> <!-- Original name is "jmp_kick" -->
-        <Animation Name="gOdolwaStunAnim" Offset="0x14F14" /> <!-- Original name is "jmp_piyo" ("weakly moving") -->
-        <Animation Name="gOdolwaShieldBashAnim" Offset="0x15A30" /> <!-- Original name is "jmp_punch" -->
-        <Animation Name="gOdolwaRunAnim" Offset="0x16168" /> <!-- Original name is "jmp_run" -->
-        <Animation Name="gOdolwaSpinAttackAnim" Offset="0x164CC" /> <!-- Original name is "jmp_spin" -->
-        <Animation Name="gOdolwaReadyAnim" Offset="0x18438" /> <!-- Original name is "jmp_stop" -->
-        <Animation Name="gOdolwaIntroSlashAnim" Offset="0x19C10" /> <!-- Original name is "jmp_stop02" -->
-        <Animation Name="gOdolwaSpinSwordAnim" Offset="0x1AAF4" /> <!-- MM3D name is "dance_roll", but it was probably renamed. Might have originally been "jmp_stop03" from surrounding context. -->
-        <Animation Name="gOdolwaVerticalHopAnim" Offset="0x1AF18" /> <!-- MM3D name is "dance_jump", but it was probably renamed. Might have originally been "jmp_stop04" from surrounding context. -->
-        <Animation Name="gOdolwaHipShakeDanceAnim" Offset="0x1BA94" /> <!-- MM3D name is "dance_moth", but it was probably renamed. Might have originally been "jmp_stop05" from surrounding context. -->
-        <Animation Name="gOdolwaUpAndDownDanceAnim" Offset="0x1C700" /> <!-- MM3D name is "dance_fire", but it was probably renamed. Might have originally been "jmp_stop06" from surrounding context. -->
-        <Animation Name="gOdolwaArmSwingDanceAnim" Offset="0x1CE88" /> <!-- Original name is "jmp_stop07" -->
-        <Animation Name="gOdolwaThurstAttackAnim" Offset="0x1D8C8" /> <!-- Original name is "jmp_stop08" -->
-        <Animation Name="gOdolwaDoubleSlashAnim" Offset="0x1E68C" /> <!-- Original name is "jmp_stop09" -->
-        <Animation Name="gOdolwaSideToSideHopAnim" Offset="0x1EEA8" /> <!-- Original name is "jmp_stop10" -->
-        <Animation Name="gOdolwaSideToSideDanceAnim" Offset="0x1F6A4" /> <!-- Not present in MM3D, but might have been originally named "jmp_stop11" from surrounding context. -->
-        <Animation Name="gOdolwaSpinDanceAnim" Offset="0x1FC10" /> <!-- Original name is "jmp_stop12" -->
-        <Animation Name="gOdolwaJumpDanceAnim" Offset="0x204AC" /> <!-- Not present in MM3D, but might have been originally named "jmp_stop13" from surrounding context. -->
-
-        <!-- Unused vertices of unknown purpose. They seem similar to the vertices used for the bug's body. -->
-        <Array Name="gOdolwaUnusedVtx" Count="16" Offset="0x206F0">
-            <Vtx/>
-        </Array>
-
-        <!-- Odolwa Bug Limb DisplayLists -->
-        <DList Name="gOdolwaBugLightBodyDL" Offset="0x21230" />
-        <DList Name="gOdolwaBugDarkBodyDL" Offset="0x213A8" />
-        <DList Name="gOdolwaBugFrontLeftUpperLegDL" Offset="0x21518" />
-        <DList Name="gOdolwaBugFrontLeftLowerLegDL" Offset="0x21538" />
-        <DList Name="gOdolwaBugBackRightUpperLegDL" Offset="0x21570" />
-        <DList Name="gOdolwaBugBackRightLowerLegDL" Offset="0x21590" />
-        <DList Name="gOdolwaBugBackLeftUpperLegDL" Offset="0x215C0" />
-        <DList Name="gOdolwaBugBackLeftLowerLegDL" Offset="0x215E0" />
-        <DList Name="gOdolwaBugMiddleRightUpperLegDL" Offset="0x21608" />
-        <DList Name="gOdolwaBugMiddleRightLowerLegDL" Offset="0x21628" />
-        <DList Name="gOdolwaBugMiddleLeftUpperLegDL" Offset="0x21658" />
-        <DList Name="gOdolwaBugMiddleLeftLowerLegDL" Offset="0x21678" />
-        <DList Name="gOdolwaBugFrontRightUpperLegDL" Offset="0x216A8" />
-        <DList Name="gOdolwaBugFrontRightLowerLegDL" Offset="0x216C8" />
-
-        <!-- Odolwa Bug Textures -->
-        <Texture Name="gOdolwaBugUndersideTLUT" OutName="odolwa_bug_underside_tlut" Format="rgba16" Width="4" Height="4" Offset="0x21700" />
-        <Texture Name="gOdolwaBugUndersideTex" OutName="odolwa_bug_underside" Format="ci4" Width="16" Height="32" Offset="0x21720" />
-        <Texture Name="gOdolwaBugBodyTex" OutName="odolwa_bug_body" Format="rgba16" Width="32" Height="32" Offset="0x21820" />
-        <Texture Name="gOdolwaBugLegTex" OutName="odolwa_bug_leg" Format="rgba16" Width="8" Height="8" Offset="0x22020" />
-
-        <!-- Material DisplayLists for the bug's legs. The bright one is only used for the cutscene where the bugs first fall down. -->
-        <DList Name="gOdolwaBugDullLegMaterialDL" Offset="0x220A0" />
-        <DList Name="gOdolwaBugBrightLegMaterialDL" Offset="0x22118" />
-
-        <!-- Odolwa Bug Limbs -->
-        <Limb Name="gOdolwaBugRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_ROOT" Offset="0x22190" />
-        <Limb Name="gOdolwaBugBodyLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BODY" Offset="0x2219C" />
-        <Limb Name="gOdolwaBugFrontRightLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_RIGHT_LEG_ROOT" Offset="0x221A8" />
-        <Limb Name="gOdolwaBugFrontRightUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x221B4" />
-        <Limb Name="gOdolwaBugFrontRightLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x221C0" />
-        <Limb Name="gOdolwaBugMiddleLeftLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_LEFT_LEG_ROOT" Offset="0x221CC" />
-        <Limb Name="gOdolwaBugMiddleLeftUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_LEFT_UPPER_LEG" Offset="0x221D8" />
-        <Limb Name="gOdolwaBugMiddleLeftLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_LEFT_LOWER_LEG" Offset="0x221E4" />
-        <Limb Name="gOdolwaBugMiddleRightLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_RIGHT_LEG_ROOT" Offset="0x221F0" />
-        <Limb Name="gOdolwaBugMiddleRightUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_RIGHT_UPPER_LEG" Offset="0x221FC" />
-        <Limb Name="gOdolwaBugMiddleRightLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_RIGHT_LOWER_LEG" Offset="0x22208" />
-        <Limb Name="gOdolwaBugBackLeftLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_LEFT_LEG_ROOT" Offset="0x22214" />
-        <Limb Name="gOdolwaBugBackLeftUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_LEFT_UPPER_LEG" Offset="0x22220" />
-        <Limb Name="gOdolwaBugBackLeftLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_LEFT_LOWER_LEG" Offset="0x2222C" />
-        <Limb Name="gOdolwaBugBackRightLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_RIGHT_LEG_ROOT" Offset="0x22238" />
-        <Limb Name="gOdolwaBugBackRightUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_RIGHT_UPPER_LEG" Offset="0x22244" />
-        <Limb Name="gOdolwaBugBackRightLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_RIGHT_LOWER_LEG" Offset="0x22250" />
-        <Limb Name="gOdolwaBugFrontLeftLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_LEFT_LEG_ROOT" Offset="0x2225C" />
-        <Limb Name="gOdolwaBugFrontLeftUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x22268" />
-        <Limb Name="gOdolwaBugFrontLeftLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x22274" />
-
-        <!-- Odolwa Bug Skeleton -->
-        <Skeleton Name="gOdolwaBugSkel" Type="Flex" LimbType="Standard" LimbNone="ODOLWA_BUG_LIMB_NONE" LimbMax="ODOLWA_BUG_LIMB_MAX" EnumName="OdolwaBugLimb" Offset="0x222D0" />
-
-        <!-- Odolwa Bug Animation -->
-        <Animation Name="gOdolwaBugCrawlAnim" Offset="0x22550" /> <!-- Original name is "mbug_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss02.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss02.xml
deleted file mode 100644
index 0f2fdd052..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss02.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<Root>
-    <!-- Assets for the Twinmold boss fight (Twinmold itself, the props in its arena, its title card, etc.)-->
-    <File Name="object_boss02" Segment="6">
-        <!-- DisplayLists and Textures for the dust that appears wherever Twinmold contacts the ground -->
-        <Texture Name="gTwinmoldDustMaskTex" OutName="dust_mask" Format="i4" Width="32" Height="32" Offset="0x0" />
-        <DList Name="gTwinmoldDustMaterialDL" Offset="0x230" />
-        <DList Name="gTwinmoldDustModelDL" Offset="0x2E0" />
-
-        <!-- Twinmold Textures -->
-        <Texture Name="gTwinmoldSkinTLUT" OutName="twinmold_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x300" />
-        <Texture Name="gTwinmoldSnoutTLUT" OutName="twinmold_snout_tlut" Format="rgba16" Width="4" Height="4" Offset="0x320" />
-        <Texture Name="gTwinmoldVeinsTLUT" OutName="twinmold_veins_tlut" Format="rgba16" Width="4" Height="4" Offset="0x340" />
-        <Texture Name="gTwinmoldUndersideTLUT" OutName="twinmold_underside_tlut" Format="rgba16" Width="4" Height="4" Offset="0x360" />
-        <Texture Name="gTwinmoldSpikeAndMandibleTLUT" OutName="twinmold_spike_and_mandible_tlut" Format="rgba16" Width="4" Height="4" Offset="0x380" />
-        <Texture Name="gTwinmoldRedSkinTex" OutName="twinmold_red_skin" Format="ci4" Width="64" Height="64" Offset="0x3A0" TlutOffset="0x300" />
-        <Texture Name="gTwinmoldEyeTex" OutName="twinmold_eye" Format="rgba16" Width="32" Height="32" Offset="0xBA0" />
-        <Texture Name="gTwinmoldSnoutTex" OutName="twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0x13A0" />
-        <Texture Name="gTwinmoldVeinsTex" OutName="twinmold_veins" Format="ci4" Width="64" Height="64" Offset="0x1BA0" />
-        <Texture Name="gTwinmoldTeethTex" OutName="twinmold_teeth" Format="rgba16" Width="16" Height="32" Offset="0x23A0" />
-        <Texture Name="gTwinmoldUndersideTex" OutName="twinmold_underside" Format="ci4" Width="64" Height="64" Offset="0x27A0" />
-        <Texture Name="gTwinmoldSpikeAndMandibleTex" OutName="twinmold_spike_and_mandible" Format="ci4" Width="64" Height="64" Offset="0x2FA0" />
-        <Texture Name="gTwinmoldAntennaTex" OutName="twinmold_antenna" Format="rgba16" Width="16" Height="16" Offset="0x37A0" />
-        <Texture Name="gTwinmoldTailGemTex" OutName="twinmold_tail_gem" Format="rgba16" Width="32" Height="32" Offset="0x39A0" />
-        <Texture Name="gTwinmoldBlueSkinTex" OutName="twinmold_blue_skin" Format="ci4" Width="64" Height="64" Offset="0x41A0" TlutOffset="0x300"/>
-
-        <!-- Unused, completely motionless Twinmold Head animation -->
-        <Animation Name="gTwinmoldHeadStationaryAnim" Offset="0x4A1C" />
-        
-        <!-- Twinmold Head Limb DisplayLists -->
-        <DList Name="gTwinmoldHeadDL" Offset="0x6160" />
-        <DList Name="gTwinmoldHeadLeftAntennaBackDL" Offset="0x6820" />
-        <DList Name="gTwinmoldHeadLeftAntennaFrontDL" Offset="0x68C8" />
-        <DList Name="gTwinmoldHeadRightAntennaBackDL" Offset="0x6970" />
-        <DList Name="gTwinmoldHeadRightAntennaFrontDL" Offset="0x6A18" />
-        <DList Name="gTwinmoldHeadLeftMandibleDL" Offset="0x6AC0" />
-        <DList Name="gTwinmoldHeadRightMandibleDL" Offset="0x6C68" />
-
-        <!-- DisplayLists and Textures for the destructible props in Twinmold's arena -->
-        <DList Name="gTwinmoldRuinPyramidDL" Offset="0x6FD0" />
-        <Texture Name="gTwinmoldRuinPyramidTLUT" OutName="ruin_pyramid_tlut" Format="rgba16" Width="4" Height="4" Offset="0x7158" />
-        <Texture Name="gTwinmoldRuinPyramidTex" OutName="ruin_pyramid" Format="ci4" Width="64" Height="64" Offset="0x7178" />
-        <DList Name="gRuinFragmentDL" Offset="0x7A88" />
-        <DList Name="gTwinmoldRuinPillarDL" Offset="0x7D18" />
-        <Texture Name="gTwinmoldRuinPillarTLUT" OutName="ruin_pillar_tlut" Format="rgba16" Width="4" Height="4" Offset="0x7E30" />
-        <Texture Name="gTwinmoldRuinPillarTex" OutName="ruin_pillar" Format="ci4" Width="64" Height="64" Offset="0x7E50" />
-        
-        <!-- Twinmold Title Card -->
-        <Texture Name="gTwinmoldTitleCardTex" OutName="twinmold_title_card" Format="ia8" Width="128" Height="40" Offset="0x8650" />
-
-        <!-- Twinmold Head Limbs -->
-        <Limb Name="gTwinmoldHeadRootLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_ROOT" Offset="0x9A50" />
-        <Limb Name="gTwinmoldHeadLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_HEAD" Offset="0x9A5C" />
-        <Limb Name="gTwinmoldHeadRightMandibleRootLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_RIGHT_MANDIBLE_ROOT" Offset="0x9A68" />
-        <Limb Name="gTwinmoldHeadRightMandibleLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_RIGHT_MANDIBLE" Offset="0x9A74" />
-        <Limb Name="gTwinmoldHeadLeftMandibleRootLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_MANDIBLE_ROOT" Offset="0x9A80" />
-        <Limb Name="gTwinmoldHeadLeftMandibleLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_MANDIBLE" Offset="0x9A8C" />
-        <Limb Name="gTwinmoldHeadRightAntennaRootLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_RIGHT_ANTENNA_ROOT" Offset="0x9A98" />
-        <Limb Name="gTwinmoldHeadRightAntennaBackLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_RIGHT_ANTENNA_BACK" Offset="0x9AA4" />
-        <Limb Name="gTwinmoldHeadRightAntennaFrontLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_RIGHT_ANTENNA_FRONT" Offset="0x9AB0" />
-        <Limb Name="gTwinmoldHeadLeftAntennaRootLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_ANTENNA_ROOT" Offset="0x9ABC" />
-        <Limb Name="gTwinmoldHeadLeftAntennaBackLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_ANTENNA_BACK" Offset="0x9AC8" />
-        <Limb Name="gTwinmoldHeadLeftAntennaFrontLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_ANTENNA_FRONT" Offset="0x9AD4" />
-
-        <!-- Twinmold Head Skeleton -->
-        <Skeleton Name="gTwinmoldHeadSkel" Type="Normal" LimbType="Standard" LimbNone="TWINMOLD_HEAD_LIMB_NONE" LimbMax="TWINMOLD_HEAD_LIMB_MAX" EnumName="TwinmoldHeadLimb" Offset="0x9B10" />
-
-        <!-- The only used animation for Twinmold's Head -->
-        <Animation Name="gTwinmoldHeadFlyAnim" Offset="0x9C78" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gTwinmoldUnusedTexAnim" Offset="0x9C90" />
-
-        <!-- Twinmold Body Limb DisplayLists -->
-        <DList Name="gTwinmoldBodySegment1DL" Offset="0xECF0" />
-        <DList Name="gTwinmoldBodySegment2DL" Offset="0xEF90" />
-        <DList Name="gTwinmoldBodySegment3DL" Offset="0xF310" />
-        <DList Name="gTwinmoldBodySegment4DL" Offset="0xF690" />
-        <DList Name="gTwinmoldBodySegment5DL" Offset="0xFA10" />
-        <DList Name="gTwinmoldBodySegment6DL" Offset="0xFD90" />
-        <DList Name="gTwinmoldBodySegment7DL" Offset="0x10110" />
-        <DList Name="gTwinmoldBodySegment8DL" Offset="0x10490" />
-        <DList Name="gTwinmoldBodySegment9DL" Offset="0x10810" />
-        <DList Name="gTwinmoldBodySegment10DL" Offset="0x10B90" />
-        <DList Name="gTwinmoldBodySegment11DL" Offset="0x10F10" />
-        <DList Name="gTwinmoldBodySegment12DL" Offset="0x11290" />
-        <DList Name="gTwinmoldBodySegment13DL" Offset="0x11610" />
-        <DList Name="gTwinmoldBodySegment14DL" Offset="0x11990" />
-        <DList Name="gTwinmoldBodySegment15DL" Offset="0x11D10" />
-        <DList Name="gTwinmoldBodySegment16DL" Offset="0x12090" />
-        <DList Name="gTwinmoldBodySegment17DL" Offset="0x12410" />
-        <DList Name="gTwinmoldBodySegment18DL" Offset="0x12790" />
-        <DList Name="gTwinmoldBodySegment19DL" Offset="0x12B10" />
-        <DList Name="gTwinmoldBodySegment20DL" Offset="0x12E90" />
-        <DList Name="gTwinmoldBodySegment21DL" Offset="0x13210" />
-        <DList Name="gTwinmoldBodyTailDL" Offset="0x13590" />
-
-        <!-- Twinmold Body Limbs -->
-        <Limb Name="gTwinmoldBodyRootLimb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_ROOT" Offset="0x13818" />
-        <Limb Name="gTwinmoldBodySegment1Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_1" Offset="0x13824" />
-        <Limb Name="gTwinmoldBodySegment2Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_2" Offset="0x13830" />
-        <Limb Name="gTwinmoldBodySegment3Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_3" Offset="0x1383C" />
-        <Limb Name="gTwinmoldBodySegment4Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_4" Offset="0x13848" />
-        <Limb Name="gTwinmoldBodySegment5Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_5" Offset="0x13854" />
-        <Limb Name="gTwinmoldBodySegment6Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_6" Offset="0x13860" />
-        <Limb Name="gTwinmoldBodySegment7Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_7" Offset="0x1386C" />
-        <Limb Name="gTwinmoldBodySegment8Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_8" Offset="0x13878" />
-        <Limb Name="gTwinmoldBodySegment9Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_9" Offset="0x13884" />
-        <Limb Name="gTwinmoldBodySegment10Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_10" Offset="0x13890" />
-        <Limb Name="gTwinmoldBodySegment11Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_11" Offset="0x1389C" />
-        <Limb Name="gTwinmoldBodySegment12Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_12" Offset="0x138A8" />
-        <Limb Name="gTwinmoldBodySegment13Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_13" Offset="0x138B4" />
-        <Limb Name="gTwinmoldBodySegment14Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_14" Offset="0x138C0" />
-        <Limb Name="gTwinmoldBodySegment15Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_15" Offset="0x138CC" />
-        <Limb Name="gTwinmoldBodySegment16Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_16" Offset="0x138D8" />
-        <Limb Name="gTwinmoldBodySegment17Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_17" Offset="0x138E4" />
-        <Limb Name="gTwinmoldBodySegment18Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_18" Offset="0x138F0" />
-        <Limb Name="gTwinmoldBodySegment19Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_19" Offset="0x138FC" />
-        <Limb Name="gTwinmoldBodySegment20Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_20" Offset="0x13908" />
-        <Limb Name="gTwinmoldBodySegment21Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_21" Offset="0x13914" />
-        <Limb Name="gTwinmoldBodyTailLimb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_TAIL" Offset="0x13920" />
-
-        <!-- Unused Twinmold Body Skeleton -->
-        <Skeleton Name="gTwinmoldBodySkel" Type="Flex" LimbType="Standard" LimbNone="TWINMOLD_BODY_LIMB_NONE" LimbMax="TWINMOLD_BODY_LIMB_MAX" EnumName="TwinmoldBodyLimb" Offset="0x13988" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss03.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss03.xml
deleted file mode 100644
index 0b4ab9aa2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss03.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<Root>
-    <!-- 
-        Gyorg, his title card, the small fishes he summons, the seaweed in his boss arena,
-        and the bubbles in his intro cutscene. Also contains an unused copy of Majora's Wrath's
-        whip assets, along with an unused duplicate of the small fishes.
-    -->
-    <File Name="object_boss03" Segment="6">
-        <Animation Name="gGyorgIdleAnim" Offset="0x88" /> <!-- Unused. Original name is "bus_base" -->
-
-        <!-- Unused Majora's Wrath Whip Texture -->
-        <Texture Name="gGyorgUnusedMajorasWrathWhipTex" OutName="unused_majoras_wrath_whip" Format="rgba16" Width="8" Height="16" Offset="0xA0" />
-
-        <!-- Unused Majora's Wrath Whip DisplayLists -->
-        <DList Name="gGyorgUnusedMajorasWrathWhipDL1" Offset="0x200" />
-        <DList Name="gGyorgUnusedMajorasWrathWhipDL2" Offset="0x278" />
-        <DList Name="gGyorgUnusedMajorasWrathWhipDL3" Offset="0x2A8" />
-
-        <!--Gyorg Limb DisplayLists -->
-        <DList Name="gGyorgHeadDL" Offset="0x3398" />
-        <DList Name="gGyorgJawDL" Offset="0x3A78" />
-        <DList Name="gGyorgUpperLeftFinDL" Offset="0x3E38" />
-        <DList Name="gGyorgLowerLeftFinDL" Offset="0x3FB8" />
-        <DList Name="gGyorgUpperRightFinDL" Offset="0x42D0" />
-        <DList Name="gGyorgLowerRightFinDL" Offset="0x4450" />
-        <DList Name="gGyorgUpperTrunkDL" Offset="0x4768" />
-        <DList Name="gGyorgLowerTrunkDL" Offset="0x4AC0" />
-        <DList Name="gGyorgTailDL" Offset="0x5010" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gGyorgUnused5388TexAnim" Offset="0x5388" />
-
-        <!-- Gyorg Textures -->
-        <Texture Name="gGyorgFinsSpikesAndJawTLUT" OutName="gyorg_fins_spikes_and_jaw_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5390" />
-        <Texture Name="gGyorgSidesTLUT" OutName="gyorg_sides_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53B0" />
-        <Texture Name="gGyorgMouthAndSpikeBacksideTLUT" OutName="gyorg_mouth_and_spike_backside_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53D0" />
-        <Texture Name="gGyorgBellyAndFinFleshTLUT" OutName="gyorg_belly_and_fin_flesh_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53F0" />
-        <Texture Name="gGyorgEyeTex" OutName="gyorg_eye" Format="rgba16" Width="32" Height="32" Offset="0x5410" />
-        <Texture Name="gGyorgFinsSpikesAndJawTex" OutName="gyorg_fins_spikes_and_jaw" Format="ci4" Width="64" Height="64" Offset="0x5C10" />
-        <Texture Name="gGyorgSidesTex" OutName="gyorg_sides" Format="ci4" Width="64" Height="64" Offset="0x6410" />
-        <Texture Name="gGyorgMouthAndSpikeBacksideTex" OutName="gyorg_mouth_and_spike_backside" Format="ci4" Width="64" Height="64" Offset="0x6C10" />
-        <Texture Name="gGyorgBellyAndFinFleshTex" OutName="gyorg_belly_and_fin_flesh" Format="ci4" Width="64" Height="64" Offset="0x7410" />
-        <Texture Name="gGyorgHornsTeethAndClawsTex" OutName="gyorg_horns_teeth_claws" Format="rgba16" Width="16" Height="16" Offset="0x7C10" />
-
-        <!-- Bubble DisplayLists (texture comes from gameplay_keep) -->
-        <DList Name="gGyorgBubbleMaterialDL" Offset="0x7E50" />
-        <DList Name="gGyorgBubbleModelDL" Offset="0x7EB0" />
-
-        <!-- Gyorg Title Card -->
-        <Texture Name="gGyorgTitleCardTex" OutName="gyorg_title_card" Format="ia8" Width="128" Height="40" Offset="0x7EC8" />
-
-        <!-- Gyorg Limbs -->
-        <Limb Name="gGyorgRootLimb" Type="Standard" EnumName="GYORG_LIMB_ROOT" Offset="0x92C8" />
-        <Limb Name="gGyorgHeadLimb" Type="Standard" EnumName="GYORG_LIMB_HEAD" Offset="0x92D4" />
-        <Limb Name="gGyorgBodyRootLimb" Type="Standard" EnumName="GYORG_LIMB_BODY_ROOT" Offset="0x92E0" />
-        <Limb Name="gGyorgUpperTrunkLimb" Type="Standard" EnumName="GYORG_LIMB_UPPER_TRUNK" Offset="0x92EC" />
-        <Limb Name="gGyorgLowerTrunkLimb" Type="Standard" EnumName="GYORG_LIMB_LOWER_TRUNK" Offset="0x92F8" />
-        <Limb Name="gGyorgTailLimb" Type="Standard" EnumName="GYORG_LIMB_TAIL" Offset="0x9304" />
-        <Limb Name="gGyorgRightFinRootLimb" Type="Standard" EnumName="GYORG_LIMB_RIGHT_FIN_ROOT" Offset="0x9310" />
-        <Limb Name="gGyorgUpperRightFinLimb" Type="Standard" EnumName="GYORG_LIMB_UPPER_RIGHT_FIN" Offset="0x931C" />
-        <Limb Name="gGyorgLowerRightFinLimb" Type="Standard" EnumName="GYORG_LIMB_LOWER_RIGHT_FIN" Offset="0x9328" />
-        <Limb Name="gGyorgLeftFinRootLimb" Type="Standard" EnumName="GYORG_LIMB_LEFT_FIN_ROOT" Offset="0x9334" />
-        <Limb Name="gGyorgUpperLeftFinLimb" Type="Standard" EnumName="GYORG_LIMB_UPPER_LEFT_FIN" Offset="0x9340" />
-        <Limb Name="gGyorgLowerLeftFinLimb" Type="Standard" EnumName="GYORG_LIMB_LOWER_LEFT_FIN" Offset="0x934C" />
-        <Limb Name="gGyorgJawRootLimb" Type="Standard" EnumName="GYORG_LIMB_JAW_ROOT" Offset="0x9358" />
-        <Limb Name="gGyorgJawLimb" Type="Standard" EnumName="GYORG_LIMB_JAW" Offset="0x9364" />
-
-        <!-- Gyorg Skeleton-->
-        <Skeleton Name="gGyorgSkel" Type="Flex" LimbType="Standard" LimbNone="GYORG_LIMB_NONE" LimbMax="GYORG_LIMB_MAX" EnumName="GyorgLimb" Offset="0x93A8" />
-
-        <!-- Gyorg Animations -->
-        <Animation Name="gGyorgFloppingAnim" Offset="0x9554" /> <!-- Original name is "bus_dead" -->
-        <Animation Name="gGyorgJumpingAnim" Offset="0x98F0" /> <!-- Unused. Original name is "bus_jump" -->
-        <Animation Name="gGyorgStunnedAnim" Offset="0x99D0" /> <!-- Original name is "bus_sibire" ("paralyzed") -->
-        <Animation Name="gGyorgBackingUpAnim" Offset="0x9C14" /> <!-- Original name is "bus_stop" -->
-        <Animation Name="gGyorgFastSwimmingAnim" Offset="0x9CF8" /> <!-- Original name is "bus_swim" -->
-        <Animation Name="gGyorgGentleSwimmingAnim" Offset="0xA020" /> <!-- Unused -->
-        <Animation Name="gGyorgTailSweepAnim" Offset="0xA134" /> <!-- Unused -->
-        <Animation Name="gGyorgCrawlingAnim" Offset="0xA6C8" />
-
-        <!-- Seaweed DisplayLists -->
-        <DList Name="gGyorgSeaweedPiece1DL" Offset="0xA8B0" />
-        <DList Name="gGyorgSeaweedPiece2DL" Offset="0xA948" />
-        <DList Name="gGyorgSeaweedPiece3DL" Offset="0xA978" />
-        <DList Name="gGyorgSeaweedPiece4DL" Offset="0xA9A8" />
-        <DList Name="gGyorgSeaweedPiece5DL" Offset="0xA9D8" />
-        <DList Name="gGyorgSeaweedTopDL" Offset="0xAA08" />
-
-        <!-- Seaweed Textures -->
-        <Texture Name="gGyorgSeaweedTopTLUT" OutName="gyorg_seaweed_top_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAAC0" />
-        <Texture Name="gGyorgSeaweedTLUT" OutName="gyord_seaweed_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAAE0" />
-        <Texture Name="gGyorgSeaweedTopTex" OutName="gyorg_seaweed_top" Format="ci4" Width="64" Height="64" Offset="0xAB00" />
-        <Texture Name="gGyorgSeaweedTex" OutName="gyorg_seaweed" Format="ci4" Width="64" Height="64" Offset="0xB300" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gGyorgUnusedBB00TexAnim" Offset="0xBB00" />
-
-        <!-- Unused Duplicate of Small Fish Limb DisplayLists -->
-        <DList Name="gUnusedGyorgSmallFishHeadDL" Offset="0xBD80" />
-        <DList Name="gUnusedGyorgSmallFishTrunkDL" Offset="0xBE40" />
-        <DList Name="gUnusedGyorgSmallFishRightFinDL" Offset="0xBF20" />
-        <DList Name="gUnusedGyorgSmallFishDorsalFinDL" Offset="0xBFD8" />
-        <DList Name="gUnusedGyorgSmallFishLeftFinDL" Offset="0xC0A8" />
-        <DList Name="gUnusedGyorgSmallFishTailFinDL" Offset="0xC160" />
-
-        <!-- Unused Duplicate of Small Fish Textures -->
-        <Texture Name="gUnusedGyorgSmallFishTLUT" OutName="unused_small_fish_tlut" Format="rgba16" Width="4" Height="4" Offset="0xC230" />
-        <Texture Name="gUnusedGyorgSmallFishTex" OutName="unused_small_fish" Format="ci4" Width="64" Height="64" Offset="0xC250" />
-
-        <!-- Small Fishes Limb DisplayLists -->
-        <DList Name="gGyorgSmallFishHeadDL" Offset="0xCCC0" />
-        <DList Name="gGyorgSmallFishTrunkDL" Offset="0xCD80" />
-        <DList Name="gGyorgSmallFishRightFinDL" Offset="0xCE60" />
-        <DList Name="gGyorgSmallFishDorsalFinDL" Offset="0xCF18" />
-        <DList Name="gGyorgSmallFishLeftFinDL" Offset="0xCFE8" />
-        <DList Name="gGyorgSmallFishTailFinDL" Offset="0xD0A0" />
-
-        <!-- Small Fishes Textures -->
-        <Texture Name="gGyorgSmallFishTLUT" OutName="small_fish_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD170" />
-        <Texture Name="gGyorgSmallFishTex" OutName="small_fish" Format="ci4" Width="64" Height="64" Offset="0xD190" />
-
-        <!-- Small Fishes Limbs -->
-        <Limb Name="gGyorgSmallFishRootLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_ROOT" Offset="0xD990" />
-        <Limb Name="gGyorgSmallFishBodyRootLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_BODY_ROOT" Offset="0xD99C" />
-        <Limb Name="gGyorgSmallFishTrunkRootLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_TRUNK_ROOT" Offset="0xD9A8" />
-        <Limb Name="gGyorgSmallFishTailFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_TAIL_FIN" Offset="0xD9B4" />
-        <Limb Name="gGyorgSmallFishTrunkLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_TRUNK" Offset="0xD9C0" />
-        <Limb Name="gGyorgSmallFishLeftFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_LEFT_FIN" Offset="0xD9CC" />
-        <Limb Name="gGyorgSmallFishDorsalFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_DORSAL_FIN" Offset="0xD9D8" />
-        <Limb Name="gGyorgSmallFishRightFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_RIGHT_FIN" Offset="0xD9E4" />
-        <Limb Name="gGyorgSmallFishHeadLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_HEAD" Offset="0xD9F0" />
-
-        <!-- Small Fishes Skeleton -->
-        <Skeleton Name="gGyorgSmallFishSkel" Type="Flex" LimbType="Standard" LimbNone="GYORG_SMALL_FISH_LIMB_NONE" LimbMax="GYORG_SMALL_FISH_LIMB_MAX" EnumName="GyorgSmallFishLimb" Offset="0xDA20" />
-
-        <!-- Small Fishes Animation -->
-        <Animation Name="gGyorgSmallFishSwimAnim" Offset="0xDAAC" /> <!-- Original name is "minibus_b_swim" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss04.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss04.xml
deleted file mode 100644
index d98083a64..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss04.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<Root>
-    <!-- Assets for Wart and its Bubbles -->
-    <File Name="object_boss04" Segment="6">
-        <!-- Wart Animation -->
-        <Animation Name="gWartIdleAnim" Offset="0x4C" /> <!-- Original name might be "wart". A 20-frame animation where he doesn't move at all. -->
-
-        <!-- Wart Limb DisplayLists -->
-        <DList Name="gWartShellDL" Offset="0x19B0" />
-        <DList Name="gWartBottomEyelidDL" Offset="0x1E58" />
-        <DList Name="gWartTopEyelidDL" Offset="0x1FC8" />
-        <DList Name="gWartEyeDL" Offset="0x2138" />
-
-        <!-- Wart Textures -->
-        <Texture Name="gWartShellTLUT" OutName="wart_shell_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2328" />
-        <Texture Name="gWartRidgesTLUT" OutName="wart_ridges_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2348" />
-        <Texture Name="gWartShellTex" OutName="wart_shell" Format="ci4" Width="64" Height="64" Offset="0x2368" />
-        <Texture Name="gWartRidgesTex" OutName="wart_ridges" Format="ci4" Width="8" Height="16" Offset="0x2B68" />
-        <Texture Name="gWartEyeTex" OutName="wart_eye" Format="rgba16" Width="32" Height="32" Offset="0x2BA8" />
-
-        <!-- Unused DisplayList that can be used to make Bubbles opaque -->
-        <DList Name="gWartBubbleOpaqueMaterialDL" Offset="0x33D8" />
-
-        <!-- Wart Bubble Texture and DisplayLists-->
-        <DList Name="gWartBubbleMaterialDL" Offset="0x3450" />
-        <DList Name="gWartBubbleModelDL" Offset="0x34C8" />
-        <Texture Name="gWartBubbleTex" OutName="wart_bubble" Format="rgba16" Width="32" Height="32" Offset="0x34E0" />
-
-        <!-- Wart and Bubble Shadow Texture and DisplayLists -->
-        <Texture Name="gWartShadowTex" OutName="wart_shadow" Format="ia16" Width="32" Height="32" Offset="0x3D10" />
-        <DList Name="gWartShadowMaterialDL" Offset="0x4510" />
-        <DList Name="gWartShadowModelDL" Offset="0x4550" />
-
-        <!-- Wart Limbs -->
-        <Limb Name="gWartRootLimb" Type="Standard" EnumName="WART_LIMB_ROOT" Offset="0x4568" />
-        <Limb Name="gWartBodyLimb" Type="Standard" EnumName="WART_LIMB_BODY" Offset="0x4574" />
-        <Limb Name="gWartEyeRootLimb" Type="Standard" EnumName="WART_LIMB_EYE_ROOT" Offset="0x4580" />
-        <Limb Name="gWartEyeLimb" Type="Standard" EnumName="WART_LIMB_EYE" Offset="0x458C" />
-        <Limb Name="gWartTopEyelidRootLimb" Type="Standard" EnumName="WART_LIMB_TOP_EYELID_ROOT" Offset="0x4598" />
-        <Limb Name="gWartTopEyelidLimb" Type="Standard" EnumName="WART_LIMB_TOP_EYELID" Offset="0x45A4" />
-        <Limb Name="gWartBottomEyelidRootLimb" Type="Standard" EnumName="WART_LIMB_BOTTOM_EYELID_ROOT" Offset="0x45B0" />
-        <Limb Name="gWartBottomEyelidLimb" Type="Standard" EnumName="WART_LIMB_BOTTOM_EYELID" Offset="0x45BC" />
-
-        <!-- Wart Skeleton -->
-        <Skeleton Name="gWartSkel" Type="Flex" LimbType="Standard" LimbNone="WART_LIMB_NONE" LimbMax="WART_LIMB_MAX" EnumName="WartLimb" Offset="0x45E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss05.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss05.xml
deleted file mode 100644
index 54dcd0e95..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss05.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<Root>
-    <!-- Assets for Bio Deku Baba. The "Head" in this file refers to both the chomping head attached to the lily pad as well as -->
-    <!-- the entity with legs and eyes that spawns from the head after it is detached. The same skeleton and limbs are used for -->
-    <!-- both of these; when the head is attached to the lily pad, the Boss_05 actor is responsible for hiding most of the limbs. -->
-    <File Name="object_boss05" Segment="6">
-        <!-- Bio Deku Baba Head Animations -->
-        <Animation Name="gBioDekuBabaHeadAttackAnim" Offset="0x6A4" /> <!-- Original name is "wdb_atackH" ("H" is almost certainly short for "head") -->
-        <Animation Name="gBioDekuBabaHeadChargeAnim" Offset="0xA5C" /> <!-- Original name is "wdb_atackwalkH" -->
-
-        <!-- Bio Deku Baba Lily Pad Animation. This animation is completely stationary, and all it does is position the limbs in -->
-        <!-- a certain way. The Boss_05 actor manually rotates the limbs to move the lily pad around. -->
-        <Animation Name="gBioDekuBabaLilyPadIdleAnim" Offset="0xABC" /> <!-- Original name might be "wdb_body" -->
-
-        <!-- Bio Deku Baba Lily Pad Limb DisplayLists -->
-        <DList Name="gBioDekuBabaLilyPadRootsDL" Offset="0x11C0" />
-        <DList Name="gBioDekuBabaLilyPadLeafDL" Offset="0x1288" />
-        <DList Name="gBioDekuBabaLilyPadUpperStemDL" Offset="0x1320" />
-        <DList Name="gBioDekuBabaLilyPadMiddleStemDL" Offset="0x13D0" />
-        <DList Name="gBioDekuBabaLilyPadRightUpperArmDL" Offset="0x14A0" />
-        <DList Name="gBioDekuBabaLilyPadRightLowerArmDL" Offset="0x1538" />
-        <DList Name="gBioDekuBabaLilyPadLeftUpperArmDL" Offset="0x15F0" />
-        <DList Name="gBioDekuBabaLilyPadLeftLowerArmDL" Offset="0x1688" />
-        <DList Name="gBioDekuBabaLilyPadLowerStemDL" Offset="0x1740" />
-
-        <!-- Bio Deku Baba Lily Pad Textures -->
-        <Texture Name="gBioDekuBabaLilyPadStemTex" OutName="bio_deku_baba_lily_pad_stem" Format="rgba16" Width="8" Height="8" Offset="0x17D0" />
-        <Texture Name="gBioDekuBabaLilyPadLeafTex" OutName="bio_deku_baba_lily_pad_leaf" Format="rgba16" Width="32" Height="32" Offset="0x1850" />
-        <Texture Name="gBioDekuBabaLilyPadRootsTex" OutName="bio_deku_baba_lily_pad_roots" Format="rgba16" Width="16" Height="32" Offset="0x2050" />
-
-        <!-- Bio Deku Baba Lily Pad Limbs -->
-        <Limb Name="gBioDekuBabaLilyPadRootsLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_ROOTS" Offset="0x2450" />
-        <Limb Name="gBioDekuBabaLilyPadUpperStemLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_UPPER_STEM" Offset="0x245C" />
-        <Limb Name="gBioDekuBabaLilyPadMiddleStemLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_MIDDLE_STEM" Offset="0x2468" />
-        <Limb Name="gBioDekuBabaLilyPadLowerStemLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_LOWER_STEM" Offset="0x2474" />
-        <Limb Name="gBioDekuBabaLilyPadLeftUpperArmLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_LEFT_UPPER_ARM" Offset="0x2480" />
-        <Limb Name="gBioDekuBabaLilyPadLeftLowerArmLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_LEFT_LOWER_ARM" Offset="0x248C" />
-        <Limb Name="gBioDekuBabaLilyPadRightUpperArmLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_RIGHT_UPPER_ARM" Offset="0x2498" />
-        <Limb Name="gBioDekuBabaLilyPadRightLowerArmLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_RIGHT_LOWER_ARM" Offset="0x24A4" />
-        <Limb Name="gBioDekuBabaLilyPadLeafLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_LEAF" Offset="0x24B0" />
-
-        <!-- Bio Deku Baba Lily Pad Skeleton -->
-        <Skeleton Name="gBioDekuBabaLilyPadSkel" Type="Flex" LimbType="Standard" LimbNone="BIO_DEKU_BABA_LILY_PAD_LIMB_NONE" LimbMax="BIO_DEKU_BABA_LILY_PAD_LIMB_MAX" EnumName="BioDekuBabaLilyPadLimb" Offset="0x24E0" />
-
-        <!-- Bio Deku Baba Head Animations -->
-        <Animation Name="gBioDekuBabaHeadDamagedAnim" Offset="0x2F0C" /> <!-- Original name is "wdb_damageH" -->
-        <Animation Name="gBioDekuBabaHeadSpotAnim" Offset="0x3448" /> <!-- Original name is "wdb_hakkenH" ("detection") -->
-        <Animation Name="gBioDekuBabaHeadRapidChompAnim" Offset="0x3500" /> <!-- Unused and one frame long. Original name is "wdb_head" -->
-
-        <!-- Bio Deku Baba Head Limb DisplayLists -->
-        <DList Name="gBioDekuBabaHeadBodyDL" Offset="0x4620" />
-        <DList Name="gBioDekuBabaHeadLeavesDL" Offset="0x46C8" />
-        <DList Name="gBioDekuBabaHeadRightUpperLegDL" Offset="0x4788" />
-        <DList Name="gBioDekuBabaHeadRightLowerLegDL" Offset="0x4830" />
-        <DList Name="gBioDekuBabaHeadRightFootDL" Offset="0x48F0" />
-        <DList Name="gBioDekuBabaHeadRightLowerEyestalkDL" Offset="0x49C0" />
-        <DList Name="gBioDekuBabaHeadRightUpperEyestalkDL" Offset="0x4A58" />
-        <DList Name="gBioDekuBabaHeadRightEyeDL" Offset="0x4B10" />
-        <DList Name="gBioDekuBabaHeadLeftLowerEyestalkDL" Offset="0x4C58" />
-        <DList Name="gBioDekuBabaHeadLeftUpperEyestalkDL" Offset="0x4CF0" />
-        <DList Name="gBioDekuBabaHeadLeftEyeDL" Offset="0x4DA8" />
-        <DList Name="gBioDekuBabaHeadLeftUpperLegDL" Offset="0x4EF8" />
-        <DList Name="gBioDekuBabaHeadLeftLowerLegDL" Offset="0x4FA0" />
-        <DList Name="gBioDekuBabaHeadLeftFootDL" Offset="0x5060" />
-        <DList Name="gBioDekuBabaHeadBackUpperLegDL" Offset="0x5130" />
-        <DList Name="gBioDekuBabaHeadBackLowerLegDL" Offset="0x51D8" />
-        <DList Name="gBioDekuBabaHeadBackFootDL" Offset="0x5298" />
-        <DList Name="gBioDekuBabaHeadUpperJawDL" Offset="0x5348" />
-        <DList Name="gBioDekuBabaHeadLowerJawDL" Offset="0x5460" />
-
-        <!-- Bio Deku Baba Head Textures -->
-        <Texture Name="gBioDekuBabaHeadLeavesTex" OutName="bio_deku_baba_head_leaves" Format="rgba16" Width="16" Height="16" Offset="0x5598" />
-        <Texture Name="gBioDekuBabaHeadJawOuterTex" OutName="bio_deku_baba_head_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x5798" />
-        <Texture Name="gBioDekuBabaHeadLegAndEyestalkTex" OutName="bio_deku_baba_head_leg_and_eyestalk" Format="rgba16" Width="8" Height="8" Offset="0x5B98" />
-        <Texture Name="gBioDekuBabaHeadJawInnerTex" OutName="bio_deku_baba_head_jaw_inner" Format="rgba16" Width="16" Height="16" Offset="0x5C18" />
-        <Texture Name="gBioDekuBabaHeadEyeTex" OutName="bio_deku_baba_head_eye" Format="rgba32" Width="16" Height="16" Offset="0x5E18" />
-
-        <!-- Texture Animation that cycles between white and gray to give the Bio Deku Baba's eyes a flashing effect -->
-        <TextureAnimation Name="gBioDekuBabaHeadEyeFlashTexAnim" Offset="0x6240" />
-
-        <!-- Bio Deku Baba Head Limbs -->
-        <Limb Name="gBioDekuBabaHeadBodyLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_BODY" Offset="0x6248" />
-        <Limb Name="gBioDekuBabaHeadLowerJawLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LOWER_JAW" Offset="0x6254" />
-        <Limb Name="gBioDekuBabaHeadUpperJawLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_UPPER_JAW" Offset="0x6260" />
-        <Limb Name="gBioDekuBabaHeadBackUpperLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_BACK_UPPER_LEG" Offset="0x626C" />
-        <Limb Name="gBioDekuBabaHeadBackLowerLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_BACK_LOWER_LEG" Offset="0x6278" />
-        <Limb Name="gBioDekuBabaHeadBackFootLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_BACK_FOOT" Offset="0x6284" />
-        <Limb Name="gBioDekuBabaHeadLeftUpperLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_UPPER_LEG" Offset="0x6290" />
-        <Limb Name="gBioDekuBabaHeadLeftLowerLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_LOWER_LEG" Offset="0x629C" />
-        <Limb Name="gBioDekuBabaHeadLeftFootLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_FOOT" Offset="0x62A8" />
-        <Limb Name="gBioDekuBabaHeadLeftLowerEyestalkLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_LOWER_EYESTALK" Offset="0x62B4" />
-        <Limb Name="gBioDekuBabaHeadLeftUpperEyestalkLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_UPPER_EYESTALK" Offset="0x62C0" />
-        <Limb Name="gBioDekuBabaHeadLeftEyeLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_EYE" Offset="0x62CC" />
-        <Limb Name="gBioDekuBabaHeadRightLowerEyestalkLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_LOWER_EYESTALK" Offset="0x62D8" />
-        <Limb Name="gBioDekuBabaHeadRightUpperEyestalkLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_UPPER_EYESTALK" Offset="0x62E4" />
-        <Limb Name="gBioDekuBabaHeadRightEyeLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_EYE" Offset="0x62F0" />
-        <Limb Name="gBioDekuBabaHeadRightUpperLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_UPPER_LEG" Offset="0x62FC" />
-        <Limb Name="gBioDekuBabaHeadRightLowerLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_LOWER_LEG" Offset="0x6308" />
-        <Limb Name="gBioDekuBabaHeadRightFootLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_FOOT" Offset="0x6314" />
-        <Limb Name="gBioDekuBabaHeadLeavesLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEAVES" Offset="0x6320" />
-
-        <!-- Bio Deku Baba Head Skeleton -->
-        <Skeleton Name="gBioDekuBabaHeadSkel" Type="Flex" LimbType="Standard" LimbNone="BIO_DEKU_BABA_HEAD_LIMB_NONE" LimbMax="BIO_DEKU_BABA_HEAD_LIMB_MAX" EnumName="BioDekuBabaHeadLimb" Offset="0x6378" />
-
-        <!-- Bio Deku Baba Head Animations -->
-        <Animation Name="gBioDekuBabaHeadChompAnim" Offset="0x6484" /> <!-- Original name is "wdb_pakupaku" ("repeatedly opening and closing (one's mouth)") -->
-        <Animation Name="gBioDekuBabaHeadTransformAnim" Offset="0x6E50" /> <!-- Original name is "wdb_startH" -->
-        <Animation Name="gBioDekuBabaHeadIdleAnim" Offset="0x7488" /> <!-- Original name is "wdb_waitH" -->
-        <Animation Name="gBioDekuBabaHeadWalkAnim" Offset="0x7908" /> <!-- Original name is "wdb_walkH" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss07.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss07.xml
deleted file mode 100644
index 2d3aa4fa1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss07.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<Root>
-    <!-- Assets for the Majora fight -->
-    <File Name="object_boss07" Segment="6">
-        <!-- Majora's Incarnation Animations -->
-        <Animation Name="gMajorasIncarnationPirouetteAnim" Offset="0x194" /> <!-- Original name is "last2_bd" (probably short for "ballet dance") -->
-        <Animation Name="gMajorasIncarnationEnergyBallAttackAnim" Offset="0x428" /> <!-- Original name is "last2_beam02" -->
-        <Animation Name="gMajorasIncarnationDamageAnim" Offset="0xD0C" /> <!-- Original name is "last2_dam" -->
-        <Animation Name="gMajorasIncarnationIntroDanceAnim" Offset="0x2C40" /> <!-- Original name is "last2_hensin" ("metamorphosis/transformation") -->
-        <Animation Name="gMajorasIncarnationJerkingAnim" Offset="0x2D84" /> <!-- Original name is "last2_hensin2" -->
-        <Animation Name="gMajorasIncarnationPumpingUpAnim" Offset="0x31E4" /> <!-- Original name is "last2_hensin3" -->
-        <Animation Name="gMajorasIncarnationFinalHitAnim" Offset="0x3854" /> <!-- Original name is "last2_hensin4" -->
-        <Animation Name="gMajorasIncarnationSquattingDanceAnim" Offset="0x3A64" /> <!-- Original name is "last2_kd" (probably short for "kosakku (Cossack) dance") -->
-        <Animation Name="gMajorasIncarnationStationaryAnim" Offset="0x3B3C" /> <!-- Unused. Original name is "last2_kihon" ("basic") -->
-
-        <!-- Majora's Incarnation Limb DisplayLists -->
-        <DList Name="gMajorasIncarnationEyestalkDL" Offset="0x7930" />
-        <DList Name="gMajorasIncarnationLeftFootDL" Offset="0x7B58" />
-        <DList Name="gMajorasIncarnationLeftShinDL" Offset="0x7CC0" />
-        <DList Name="gMajorasIncarnationLeftThighDL" Offset="0x7F48" />
-        <DList Name="gMajorasIncarnationLeftHandDL" Offset="0x80E0" />
-        <DList Name="gMajorasIncarnationLeftForearmDL" Offset="0x82D8" />
-        <DList Name="gMajorasIncarnationLeftUpperArmDL" Offset="0x8580" />
-        <DList Name="gMajorasIncarnationRightHandDL" Offset="0x87B8" />
-        <DList Name="gMajorasIncarnationRightForearmDL" Offset="0x89B0" />
-        <DList Name="gMajorasIncarnationRightUpperArmDL" Offset="0x8C58" />
-        <DList Name="gMajorasIncarnationRightFootDL" Offset="0x8E90" />
-        <DList Name="gMajorasIncarnationRightShinDL" Offset="0x8FF8" />
-        <DList Name="gMajorasIncarnationRightThighDL" Offset="0x9280" />
-        <DList Name="gMajorasIncarnationMaskDL" Offset="0x9418" />
-
-        <!-- Majora's Incarnation Limbs -->
-        <Limb Name="gMajorasIncarnationRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_ROOT" Offset="0x9820" />
-        <Limb Name="gMajorasIncarnationWrapperLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_WRAPPER" Offset="0x982C" />
-        <Limb Name="gMajorasIncarnationMaskLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_MASK" Offset="0x9838" />
-        <Limb Name="gMajorasIncarnationRightLegRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_LEG_ROOT" Offset="0x9844" />
-        <Limb Name="gMajorasIncarnationRightThighLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_THIGH" Offset="0x9850" />
-        <Limb Name="gMajorasIncarnationRightLowerLegRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_LOWER_LEG_ROOT" Offset="0x985C" />
-        <Limb Name="gMajorasIncarnationRightShinLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_SHIN" Offset="0x9868" />
-        <Limb Name="gMajorasIncarnationRightFootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_FOOT" Offset="0x9874" />
-        <Limb Name="gMajorasIncarnationRightArmRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_ARM_ROOT" Offset="0x9880" />
-        <Limb Name="gMajorasIncarnationRightUpperArmLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_UPPER_ARM" Offset="0x988C" />
-        <Limb Name="gMajorasIncarnationRightLowerArmRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_LOWER_ARM_ROOT" Offset="0x9898" />
-        <Limb Name="gMajorasIncarnationRightForearmLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_FOREARM" Offset="0x98A4" />
-        <Limb Name="gMajorasIncarnationRightHandLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_HAND" Offset="0x98B0" />
-        <Limb Name="gMajorasIncarnationLeftArmRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_ARM_ROOT" Offset="0x98BC" />
-        <Limb Name="gMajorasIncarnationLeftUpperArmLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_UPPER_ARM" Offset="0x98C8" />
-        <Limb Name="gMajorasIncarnationLeftLowerArmRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_LOWER_ARM_ROOT" Offset="0x98D4" />
-        <Limb Name="gMajorasIncarnationLeftForearmLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_FOREARM" Offset="0x98E0" />
-        <Limb Name="gMajorasIncarnationLeftHandLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_HAND" Offset="0x98EC" />
-        <Limb Name="gMajorasIncarnationLeftLegRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_LEG_ROOT" Offset="0x98F8" />
-        <Limb Name="gMajorasIncarnationLeftThighLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_THIGH" Offset="0x9904" />
-        <Limb Name="gMajorasIncarnationLeftLowerLegRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_LOWER_LEG_ROOT" Offset="0x9910" />
-        <Limb Name="gMajorasIncarnationLeftShinLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_SHIN" Offset="0x991C" />
-        <Limb Name="gMajorasIncarnationLeftFootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_FOOT" Offset="0x9928" />
-        <Limb Name="gMajorasIncarnationEyestalkLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_EYESTALK" Offset="0x9934" />
-
-        <!-- Majora's Incarnation Skeleton -->
-        <Skeleton Name="gMajorasIncarnationSkel" Type="Flex" LimbType="Standard" LimbNone="MAJORAS_INCARNATION_LIMB_NONE" LimbMax="MAJORAS_INCARNATION_LIMB_MAX" EnumName="MajorasIncarnationLimb" Offset="0x99A0" />
-
-        <!-- Majora's Incarnation Animations -->
-        <Animation Name="gMajorasIncarnationFallOverStartAnim" Offset="0x9C7C" /> <!-- Original name is "last2_koke" ("stupidity; a fool") -->
-        <Animation Name="gMajorasIncarnationFallOverLoopAnim" Offset="0x9EA8" /> <!-- Original name is "last2_koke2" -->
-        <Animation Name="gMajorasIncarnationMoonwalkAnim" Offset="0xA194" /> <!-- Original name is "last2_mw" (almost certainly short for "moonwalk") -->
-        <Animation Name="gMajorasIncarnationRunAnim" Offset="0xA400" /> <!-- Original name is "last2_run" -->
-        <Animation Name="gMajorasIncarnationTauntDance1Anim" Offset="0xA6AC" /> <!-- Original name is "last2_stop01" -->
-        <Animation Name="gMajorasIncarnationTauntDance2Anim" Offset="0xAB04" /> <!-- Original name is "last2_stop02" -->
-        <Animation Name="gMajorasIncarnationTauntJumpAnim" Offset="0xAD84" /> <!-- Original name is "last2_stop03" -->
-
-        <!-- Majora's Mask Animations -->
-        <Animation Name="gMajorasMaskJerkingAnim" Offset="0xAE40" /> <!-- Original name is "last3_dam" -->
-        <Animation Name="gMajorasMaskStationaryAnim" Offset="0xAEDC" /> <!-- Unused. Original name is "last3_kihon" ("basic") -->
-
-        <!-- Majora's Mask Tentacle Texture and DisplayLists -->
-        <Texture Name="gMajorasMaskTentacleTex" OutName="majoras_mask_tentacle" Format="rgba16" Width="8" Height="8" Offset="0xAEF0" />
-        <DList Name="gMajorasMaskTentacleMaterialDL" Offset="0xAFB0" />
-        <DList Name="gMajorasMaskTentacleModelDL" Offset="0xB020" />
-
-        <!-- Majora's Mask Limb DisplayLists -->
-        <DList Name="gMajorasMaskLeftSpike3DL" Offset="0xBB30" />
-        <DList Name="gMajorasMaskLeftSpike4DL" Offset="0xBBC0" />
-        <DList Name="gMajorasMaskRightSpike4DL" Offset="0xBC50" />
-        <DList Name="gMajorasMaskRightSpike3DL" Offset="0xBCE0" />
-        <DList Name="gMajorasMaskRightSpike2DL" Offset="0xBD70" />
-        <DList Name="gMajorasMaskRightSpike1DL" Offset="0xBE00" />
-        <DList Name="gMajorasMaskLeftSpike1DL" Offset="0xBE90" />
-        <DList Name="gMajorasMaskLeftSpike2DL" Offset="0xBF20" />
-        <DList Name="gMajorasMaskFaceDL" Offset="0xBFB0" />
-
-        <!-- Majora's Mask Beam Texture and DisplayList -->
-        <Texture Name="gMajorasMaskBeamTex" OutName="majoras_mask_beam" Format="i4" Width="32" Height="64" Offset="0xC298" />
-        <DList Name="gMajorasMaskBeamDL" Offset="0xC7D8" />
-
-        <!-- Majora's Mask Fire Textures and DisplayList -->
-        <Texture Name="gMajorasMaskFireTex" OutName="majoras_mask_fire" Format="i4" Width="32" Height="64" Offset="0xC8B8" />
-        <Texture Name="gMajorasMaskFireMaskTex" OutName="majoras_mask_fire_mask" Format="i4" Width="32" Height="32" Offset="0xCCB8" />
-        <DList Name="gMajorasMaskFireDL" Offset="0xCEE8" />
-
-        <!-- Boss Mask Textures -->
-        <Texture Name="gBossMaskOdolwaFaceTLUT" OutName="boss_mask_odolwa_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0xCFB0" />
-        <Texture Name="gBossMaskOdolwaEarTLUT" OutName="boss_mask_odolwa_ear_tlut" Format="rgba16" Width="4" Height="4" Offset="0xCFD0" />
-        <Texture Name="gBossMaskOdolwaPlumeTex" OutName="boss_mask_odolwa_plume" Format="rgba16" Width="16" Height="16" Offset="0xCFF0" />
-        <Texture Name="gBossMaskOdolwaFaceTex" OutName="boss_mask_odolwa_face" Format="ci4" Width="64" Height="64" Offset="0xD1F0" />
-        <Texture Name="gBossMaskOdolwaEarTex" OutName="boss_mask_odolwa_ear" Format="ci4" Width="64" Height="64" Offset="0xD9F0" />
-        <Texture Name="gBossMaskGyorgSkinTLUT" OutName="boss_mask_gyorg_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE1F0" />
-        <Texture Name="gBossMaskGyorgMouthTLUT" OutName="boss_mask_gyorg_mouth_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE210" />
-        <Texture Name="gBossMaskGyorgToothHornTLUT" OutName="boss_mask_gyorg_tooth_horn_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE230" />
-        <Texture Name="gBossMaskGyorgTwinmoldEyeTex" OutName="boss_mask_gyorg_twinmold_eye" Format="rgba16" Width="32" Height="32" Offset="0xE250" />
-        <Texture Name="gBossMaskGyorgSkinTex" OutName="boss_mask_gyorg_skin" Format="ci4" Width="64" Height="64" Offset="0xEA50" />
-        <Texture Name="gBossMaskGyorgMouthTex" OutName="boss_mask_gyorg_mouth" Format="ci4" Width="64" Height="64" Offset="0xF250" />
-        <Texture Name="gBossMaskGyorgToothHornTex" OutName="boss_mask_gyorg_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0xFA50" />
-        <Texture Name="gBossMaskGohtEyeTex" OutName="boss_mask_goht_eye" Format="rgba16" Width="32" Height="64" Offset="0xFAD0" />
-        <Texture Name="gBossMaskGohtTopPatternTex" OutName="boss_mask_goht_top_pattern" Format="rgba16" Width="32" Height="64" Offset="0x10AD0" />
-        <Texture Name="gBossMaskGohtTwinmoldPatternTex" OutName="boss_mask_goht_twinmold_pattern" Format="rgba16" Width="32" Height="64" Offset="0x11AD0" /> <!-- Used for the lower part of Goht's mask and for the mouth of Twinmold's mask -->
-        <Texture Name="gBossMaskGohtSpikeTwinmoldMandibleTex" OutName="boss_mask_goht_spike_twinmold_mandible" Format="rgba16" Width="32" Height="32" Offset="0x12AD0" />
-        <Texture Name="gBossMaskTwinmoldSkinTLUT" OutName="boss_mask_twinmold_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x132D0" />
-        <Texture Name="gBossMaskTwinmoldSnoutTLUT" OutName="boss_mask_twinmold_snout_tlut" Format="rgba16" Width="4" Height="4" Offset="0x132F0" />
-        <Texture Name="gBossMaskTwinmoldSkinTex" OutName="boss_mask_twinmold_skin" Format="ci4" Width="64" Height="64" Offset="0x13310" />
-        <Texture Name="gBossMaskTwinmoldSnoutTex" OutName="boss_mask_twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0x13B10" />
-
-        <!-- Boss Mask DisplayLists -->
-        <DList Name="gBossMaskOdolwaDL" Offset="0x149A0" />
-        <DList Name="gBossMaskGyorgDL" Offset="0x16090" />
-        <DList Name="gBossMaskGohtDL" Offset="0x17DE0" />
-        <DList Name="gBossMaskTwinmoldDL" Offset="0x19328" />
-
-        <!-- Majora's Mask Limbs. Spikes are numbered from top to bottom. -->
-        <Limb Name="gMajorasMaskRootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_ROOT" Offset="0x19B38" />
-        <Limb Name="gMajorasMaskFaceLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_FACE" Offset="0x19B44" />
-        <Limb Name="gMajorasMaskLeftSpike2RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE2_ROOT" Offset="0x19B50" />
-        <Limb Name="gMajorasMaskLeftSpike2Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE2" Offset="0x19B5C" />
-        <Limb Name="gMajorasMaskLeftSpike1RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE1_ROOT" Offset="0x19B68" />
-        <Limb Name="gMajorasMaskLeftSpike1Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE1" Offset="0x19B74" />
-        <Limb Name="gMajorasMaskRightSpike1RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE1_ROOT" Offset="0x19B80" />
-        <Limb Name="gMajorasMaskRightSpike1Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE1" Offset="0x19B8C" />
-        <Limb Name="gMajorasMaskRightSpike2RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE2_ROOT" Offset="0x19B98" />
-        <Limb Name="gMajorasMaskRightSpike2Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE2" Offset="0x19BA4" />
-        <Limb Name="gMajorasMaskRightSpike3RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE3_ROOT" Offset="0x19BB0" />
-        <Limb Name="gMajorasMaskRightSpike3Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE3" Offset="0x19BBC" />
-        <Limb Name="gMajorasMaskRightSpike4RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE4_ROOT" Offset="0x19BC8" />
-        <Limb Name="gMajorasMaskRightSpike4Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE4" Offset="0x19BD4" />
-        <Limb Name="gMajorasMaskLeftSpike4RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE4_ROOT" Offset="0x19BE0" />
-        <Limb Name="gMajorasMaskLeftSpike4Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE4" Offset="0x19BEC" />
-        <Limb Name="gMajorasMaskLeftSpike3RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE3_ROOT" Offset="0x19BF8" />
-        <Limb Name="gMajorasMaskLeftSpike3Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE3" Offset="0x19C04" />
-
-        <!-- Majora's Mask Skeleton -->
-        <Skeleton Name="gMajorasMaskSkel" Type="Normal" LimbType="Standard" LimbNone="MAJORAS_MASK_LIMB_NONE" LimbMax="MAJORAS_MASK_LIMB_MAX" EnumName="MajorasMaskLimb" Offset="0x19C58" />
-
-        <!-- Majora's Mask Animation -->
-        <Animation Name="gMajorasMaskFloatingAnim" Offset="0x19E48" /> <!-- Original name is "last3_stop" -->
-
-        <!-- Majora's Wrath Animations. For unused animations, we don't know what the whips are supposed to do, since their physics are controlled by the Boss07 actor.  -->
-        <Animation Name="gMajorasWrathFlipLeftAndSpinAnim" Offset="0x1AE1C" /> <!-- Unused. Original name is "last_ac01" -->
-        <Animation Name="gMajorasWrathDoubleKickAndJumpBackAnim" Offset="0x1C430" /> <!-- Unused. Original name is "last_ac02" -->
-        <Animation Name="gMajorasWrathBackflipUppercutAttackAnim" Offset="0x1CFF0" /> <!-- Unused. Original name is "last_ac03" -->
-        <Animation Name="gMajorasWrathHighKickAnim" Offset="0x1D974" /> <!-- Unused and almost identical to gMajorasWrathKickAnim. Original name is "last_ac04" -->
-        <Animation Name="gMajorasWrathDamageAnim" Offset="0x1DEB4" /> <!-- Original name is "last_dam" -->
-        <Animation Name="gMajorasWrathDeathAnim" Offset="0x22BB4" /> <!-- Original name is "last_dead" -->
-        <Animation Name="gMajorasWrathTiptoeWhipAttackAnim" Offset="0x23A44" /> <!-- Unused. Original name is "last_def" -->
-        <Animation Name="gMajorasWrathHeavyBreathingAnim" Offset="0x23DAC" /> <!-- Original name is "last_hen" (short for "metamorphosis/transformation") -->
-        <Animation Name="gMajorasWrathIntroAnim" Offset="0x25018" /> <!-- Original name is "last_hen2" -->
-        <Animation Name="gMajorasWrathBackflipAnim" Offset="0x25878" /> <!-- Original name is "last_jump" -->
-        <Animation Name="gMajorasWrathKickAnim" Offset="0x26204" /> <!-- Original name is "last_kick" -->
-        <Animation Name="gMajorasWrathReleaseTopAnim" Offset="0x269EC" /> <!-- Original name is "last_koma" ("spinning top") -->
-        <Animation Name="gMajorasWrathGrabAnim" Offset="0x26EA0" /> <!-- Original name is "last_link" -->
-        <Animation Name="gMajorasWrathThrowAnim" Offset="0x27270" /> <!-- Original name is "last_link2" -->
-
-        <!-- Majora's Wrath Limb DisplayLists -->
-        <DList Name="gMajorasWrathPelvisDL" Offset="0x2C350" />
-        <DList Name="gMajorasWrathHeadDL" Offset="0x2C4D0" />
-        <DList Name="gMajorasWrathThirdEyeDL" Offset="0x2CB48" />
-        <DList Name="gMajorasWrathTorsoDL" Offset="0x2CD40" />
-        <DList Name="gMajorasWrathLeftHandDL" Offset="0x2D1D0" />
-        <DList Name="gMajorasWrathLeftForearmDL" Offset="0x2D3C8" />
-        <DList Name="gMajorasWrathLeftUpperArmDL" Offset="0x2D670" />
-        <DList Name="gMajorasWrathRightHandDL" Offset="0x2D940" />
-        <DList Name="gMajorasWrathRightForearmDL" Offset="0x2DB38" />
-        <DList Name="gMajorasWrathRightUpperArmDL" Offset="0x2DDE0" />
-        <DList Name="gMajorasWrathRightFootDL" Offset="0x2E0B8" />
-        <DList Name="gMajorasWrathRightShinDL" Offset="0x2E220" />
-        <DList Name="gMajorasWrathRightThighDL" Offset="0x2E4A8" />
-        <DList Name="gMajorasWrathLeftFootDL" Offset="0x2E6D0" />
-        <DList Name="gMajorasWrathLeftShinDL" Offset="0x2E838" />
-        <DList Name="gMajorasWrathLeftThighDL" Offset="0x2EAC0" />
-
-        <!-- Majora's Wrath Whip Texture and DisplayLists -->
-        <Texture Name="gMajorasWrathWhipTex" OutName="majoras_wrath_whip" Format="rgba16" Width="8" Height="16" Offset="0x2ECF0" />
-        <DList Name="gMajorasWrathWhipMaterialDL" Offset="0x2EE50" />
-        <DList Name="gMajorasMaskWhipShadowMaterialDL" Offset="0x2EEC8" />
-        <DList Name="gMajorasWrathWhipModelDL" Offset="0x2EEF8" />
-
-        <!-- Majora's Wrath Shadow DisplayLists -->
-        <DList Name="gMajorasWrathShadowMaterialDL" Offset="0x2EF68" />
-        <DList Name="gMajorasWrathShadowModelDL" Offset="0x2EF88" />
-
-        <!-- DisplayList for the rays of light that emanate from Wrath's body when defeated -->
-        <DList Name="gMajorasWrathDeathLightModelDL" Offset="0x2EFE8" />
-
-        <!-- Majora's Wrath Top DisplayList-->
-        <DList Name="gMajorasWrathSpinningTopDL" Offset="0x2F640" />
-
-        <!-- Majora Title Cards -->
-        <Texture Name="gMajorasMaskTitleCardTex" OutName="majoras_mask_title_card" Format="ia8" Width="128" Height="40" Offset="0x2F840" />
-        <Texture Name="gMajorasIncarnationTitleCardTex" OutName="majoras_incarnation_title_card" Format="ia8" Width="128" Height="40" Offset="0x30C40" />
-        <Texture Name="gMajorasWrathTitleCardTex" OutName="majoras_wrath_title_card" Format="ia8" Width="128" Height="40" Offset="0x32040" />
-
-        <!-- Majora's Wrath Limbs -->
-        <Limb Name="gMajorasWrathRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_ROOT" Offset="0x33440" />
-        <Limb Name="gMajorasWrathPelvisLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_PELVIS" Offset="0x3344C" />
-        <Limb Name="gMajorasWrathLeftLegRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_LEG_ROOT" Offset="0x33458" />
-        <Limb Name="gMajorasWrathLeftThighLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_THIGH" Offset="0x33464" />
-        <Limb Name="gMajorasWrathLeftLowerLegRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_LOWER_LEG_ROOT" Offset="0x33470" />
-        <Limb Name="gMajorasWrathLeftShinLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_SHIN" Offset="0x3347C" />
-        <Limb Name="gMajorasWrathLeftFootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_FOOT" Offset="0x33488" />
-        <Limb Name="gMajorasWrathRightLegRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_LEG_ROOT" Offset="0x33494" />
-        <Limb Name="gMajorasWrathRightThighLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_THIGH" Offset="0x334A0" />
-        <Limb Name="gMajorasWrathRightLowerLegRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_LOWER_LEG_ROOT" Offset="0x334AC" />
-        <Limb Name="gMajorasWrathRightShinLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_SHIN" Offset="0x334B8" />
-        <Limb Name="gMajorasWrathRightFootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_FOOT" Offset="0x334C4" />
-        <Limb Name="gMajorasWrathTorsoRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_TORSO_ROOT" Offset="0x334D0" />
-        <Limb Name="gMajorasWrathTorsoLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_TORSO" Offset="0x334DC" />
-        <Limb Name="gMajorasWrathRightArmRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_ARM_ROOT" Offset="0x334E8" />
-        <Limb Name="gMajorasWrathRightUpperArmLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_UPPER_ARM" Offset="0x334F4" />
-        <Limb Name="gMajorasWrathRightLowerArmRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_LOWER_ARM_ROOT" Offset="0x33500" />
-        <Limb Name="gMajorasWrathRightForearmLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_FOREARM" Offset="0x3350C" />
-        <Limb Name="gMajorasWrathRightHandLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_HAND" Offset="0x33518" />
-        <Limb Name="gMajorasWrathLeftArmRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_ARM_ROOT" Offset="0x33524" />
-        <Limb Name="gMajorasWrathLeftUpperArmLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_UPPER_ARM" Offset="0x33530" />
-        <Limb Name="gMajorasWrathLeftLowerArmRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_LOWER_ARM_ROOT" Offset="0x3353C" />
-        <Limb Name="gMajorasWrathLeftForearmLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_FOREARM" Offset="0x33548" />
-        <Limb Name="gMajorasWrathLeftHandLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_HAND" Offset="0x33554" />
-        <Limb Name="gMajorasWrathHeadRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_HEAD_ROOT" Offset="0x33560" />
-        <Limb Name="gMajorasWrathHeadLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_HEAD" Offset="0x3356C" />
-        <Limb Name="gMajorasWrathThirdEyeLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_THIRD_EYE" Offset="0x33578" />
-
-        <!-- Majora's Wrath Skeleton -->
-        <Skeleton Name="gMajorasWrathSkel" Type="Flex" LimbType="Standard" LimbNone="MAJORAS_WRATH_LIMB_NONE" LimbMax="MAJORAS_WRATH_LIMB_MAX" EnumName="MajorasWrathLimb" Offset="0x335F0" />
-
-        <!-- Majora's Wrath Animations -->
-        <Animation Name="gMajorasWrathShortSingleWhipAttackAnim" Offset="0x33F80" /> <!-- Original name is "last_muti" ("whip") -->
-        <Animation Name="gMajorasWrathWhipFlurryAttackAnim" Offset="0x34E64" /> <!-- Original name is "last_muti2" -->
-        <Animation Name="gMajorasWrathDoubleWhipAttackAnim" Offset="0x358C4" /> <!-- Original name is "last_muti3" -->
-        <Animation Name="gMajorasWrathLongSingleWhipAttackAnim" Offset="0x36A7C" /> <!-- Original name is "last_muti4" -->
-        <Animation Name="gMajorasWrathTauntAnim" Offset="0x37ADC" /> <!-- Original name is "last_muti5" -->
-        <Animation Name="gMajorasWrathThreeAttackComboAnim" Offset="0x3918C" /> <!-- Original name is "last_muticombo" -->
-        <Animation Name="gMajorasWrathStunAnim" Offset="0x3B330" /> <!-- Original name is "last_piyo" ("weakly moving") -->
-        <Animation Name="gMajorasWrathSpinAttackAnim" Offset="0x3C4E0" /> <!-- Original name is "last_rolling" -->
-        <Animation Name="gMajorasWrathIdleAnim" Offset="0x3CBD0" /> <!-- Original name is "last_stop" -->
-        <Animation Name="gMajorasWrathFlipLeftAnim" Offset="0x3D224" /> <!-- Original name is "last_tombo1" ("somersault​") -->
-        <Animation Name="gMajorasWrathFlipRightAnim" Offset="0x3D7F0" /> <!-- Original name is "last_tombo2" -->
-        <Animation Name="gMajorasWrathSidestepAnim" Offset="0x3DD1C" /> <!-- Original name is "last_walk" -->
-
-        <!-- Majora Textures -->
-        <Texture Name="gMajoraBodyTex" OutName="majora_body" Format="rgba16" Width="32" Height="64" Offset="0x3DD30" />
-        <Texture Name="gMajoraStripesTex" OutName="majora_stripes" Format="rgba16" Width="32" Height="16" Offset="0x3ED30" />
-        <Texture Name="gMajorasWrathEyeTex" OutName="majoras_wrath_eye" Format="rgba16" Width="64" Height="32" Offset="0x3F130" />
-        <Texture Name="gMajorasWrathMouthTex" OutName="majoras_wrath_mouth" Format="rgba16" Width="32" Height="32" Offset="0x40130" />
-        <Texture Name="gMajorasWrathEarTex" OutName="majoras_wrath_ear" Format="rgba16" Width="16" Height="16" Offset="0x40930" />
-        <Texture Name="gMajoraVeinsTex" OutName="majora_veins" Format="rgba16" Width="32" Height="64" Offset="0x40B30" />
-        <Texture Name="gMajoraBloodshotEyeTex" OutName="majora_bloodshot_eye" Format="rgba16" Width="32" Height="32" Offset="0x41B30" />
-        <Texture Name="gMajorasMaskWithNormalEyesTex" OutName="majoras_mask_with_normal_eyes" Format="rgba16" Width="32" Height="64" Offset="0x42330" />
-        <Texture Name="gMajoraHandTex" OutName="majora_hand" Format="rgba16" Width="32" Height="64" Offset="0x43330" />
-        <Texture Name="gMajorasIncarnationMaskTex" OutName="majoras_incarnation_mask" Format="rgba16" Width="32" Height="64" Offset="0x44330" />
-        <Texture Name="gMajorasMaskSpikes1Tex" OutName="majoras_mask_spikes_1" Format="rgba16" Width="16" Height="16" Offset="0x45330" />
-        <Texture Name="gMajorasMaskSpikes2Tex" OutName="majoras_mask_spikes_2" Format="rgba16" Width="16" Height="16" Offset="0x45530" />
-        <Texture Name="gMajorasMaskSpikes3Tex" OutName="majoras_mask_spikes_3" Format="rgba16" Width="16" Height="16" Offset="0x45730" />
-        <Texture Name="gMajorasMaskSpikes4Tex" OutName="majoras_mask_spikes_4" Format="rgba16" Width="16" Height="16" Offset="0x45930" />
-        <Texture Name="gMajorasMaskWithDullEyesTex" OutName="majoras_mask_with_dull_eyes" Format="rgba16" Width="32" Height="64" Offset="0x45B30" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss_hakugin.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss_hakugin.xml
deleted file mode 100644
index 7c7232ecf..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boss_hakugin.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<Root>
-    <!-- Assets for the Goht boss fight (Goht itself, its title card, its lightning, its rocks, etc.) -->
-    <File Name="object_boss_hakugin" Segment="6">
-        <!-- Goht Animations -->
-        <Animation Name="gGohtThawAndBreakWallAnim" Offset="0x2054" /> <!-- Original name is "iceb_demo" -->
-        <Animation Name="gGohtWritheOnSideAnim" Offset="0x25B0" /> <!-- Unused. Original name is "iceb_dm01" -->
-        <Animation Name="gGohtTwitchOnSideAnim" Offset="0x28D0" /> <!-- Unused. Original name is "iceb_dm02" -->
-        <Animation Name="gGohtFallOnSideAnim" Offset="0x3088" /> <!-- Unused. Original name is "iceb_down" -->
-        <Animation Name="gGohtStationaryAnim" Offset="0x319C" /> <!-- Original name is "iceb_kihon" ("basic") -->
-
-        <!-- Goht Limb DisplayLists -->
-        <DList Name="gGohtPelvisDL" Offset="0x8030" />
-        <DList Name="gGohtBackLeftHoofDL" Offset="0x8380" />
-        <DList Name="gGohtBackLeftPasternDL" Offset="0x84C0" />
-        <DList Name="gGohtBackLeftShinDL" Offset="0x8590" />
-        <DList Name="gGohtBackLeftThighDL" Offset="0x8718" />
-        <DList Name="gGohtBackRightHoofDL" Offset="0x89B8" />
-        <DList Name="gGohtBackRightPasternDL" Offset="0x8AF8" />
-        <DList Name="gGohtBackRightShinDL" Offset="0x8BC8" />
-        <DList Name="gGohtBackRightThighDL" Offset="0x8D50" />
-        <DList Name="gGohtHeadDL" Offset="0x8FF0" />
-        <DList Name="gGohtJawDL" Offset="0x9748" />
-        <DList Name="gGohtThoraxDL" Offset="0x9948" />
-        <DList Name="gGohtFrontLeftHoofDL" Offset="0x9E18" />
-        <DList Name="gGohtFrontLeftLowerLegDL" Offset="0x9F58" />
-        <DList Name="gGohtFrontLeftUpperLegDL" Offset="0xA170" />
-        <DList Name="gGohtFrontRightHoofDL" Offset="0xA478" />
-        <DList Name="gGohtFrontRightLowerLegDL" Offset="0xA5B8" />
-        <DList Name="gGohtFrontRightUpperLegDL" Offset="0xA7D0" />
-
-        <!-- Goht Textures -->
-        <Texture Name="gGohtMachineryTex" OutName="goht_machinery" Format="rgba16" Width="32" Height="64" Offset="0xAAD8" />
-        <Texture Name="gGohtMetalPlateWithCirclePatternTex" OutName="goht_metal_plate_with_circle_pattern" Format="rgba16" Width="32" Height="64" Offset="0xBAD8" />
-        <Texture Name="gGohtMetalPlateWithMulticoloredPatternTex" OutName="goht_metal_plate_with_multicolored_pattern" Format="rgba16" Width="32" Height="64" Offset="0xCAD8" />
-        <Texture Name="gGohtEyeTex" OutName="goht_eye" Format="rgba16" Width="32" Height="64" Offset="0xDAD8" />
-        <Texture Name="gGohtFaceAndKneePatternTex" OutName="goht_face_and_knee_pattern" Format="rgba16" Width="32" Height="64" Offset="0xEAD8" />
-        <Texture Name="gGohtHornTex" OutName="goht_horn" Format="rgba16" Width="32" Height="32" Offset="0xFAD8" />
-
-        <!-- Assets for the small rocks that Goht kicks up, as well as the large rocks that surround him when he is defeated. -->
-        <DList Name="gGohtRockMaterialDL" Offset="0x10488" />
-        <DList Name="gGohtRockModelDL" Offset="0x10500" /> <!-- Original name is "boss_haku_rock_model" -->
-        <Texture Name="gGohtRockTex" OutName="goht_rock" Format="rgba16" Width="36" Height="36" Offset="0x10560" />
-
-        <!-- DisplayLists for the stalactites that fall from the ceiling. -->
-        <DList Name="gGohtStalactiteMaterialDL" Offset="0x11100" />
-        <DList Name="gGohtStalactiteModelDL" Offset="0x11178" /> <!-- Original name is "boss_haku_icicle_model" -->
-
-        <!-- Assets for the lightning that Goht can shoot. -->
-        <DList Name="gGohtLightningMaterialDL" Offset="0x11208" />
-        <DList Name="gGohtLightningModelDL" Offset="0x11278" /> <!-- Original name is "boss_hakugin_lightining_modelT" -->
-        <Texture Name="gGohtLightningTex" OutName="goht_lightning" Format="i4" Width="32" Height="96" Offset="0x11290" />
-
-        <!-- A large amount of zeroes that are unused and have seemingly no purpose. -->
-        <Blob Name="gGohtUnusedZeroesBlob" Size="0x600" Offset="0x11890" />
-        
-        <!-- Assets for the light orb that Goht can shoot at the player, or out of which he can shoot lightning. -->
-        <Texture Name="gGohtLightOrbTex" OutName="goht_light_orb" Format="i8" Width="64" Height="64" Offset="0x11E90" />
-        <DList Name="gGohtLightOrbMaterialDL" Offset="0x12ED0" />
-        <DList Name="gGohtLightOrbModelDL" Offset="0x12F40" /> <!-- Original name is "boss_hakugin_lightball_modelT" -->
-
-        <!-- Goht Limbs -->
-        <Limb Name="gGohtRootLimb" Type="Standard" EnumName="GOHT_LIMB_ROOT" Offset="0x12F58" />
-        <Limb Name="gGohtPelvisLimb" Type="Standard" EnumName="GOHT_LIMB_PELVIS" Offset="0x12F64" />
-        <Limb Name="gGohtThoraxRootLimb" Type="Standard" EnumName="GOHT_LIMB_THORAX_ROOT" Offset="0x12F70" />
-        <Limb Name="gGohtThoraxWrapperLimb" Type="Standard" EnumName="GOHT_LIMB_THORAX_WRAPPER" Offset="0x12F7C" />
-        <Limb Name="gGohtFrontRightLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_RIGHT_LEG_ROOT" Offset="0x12F88" />
-        <Limb Name="gGohtFrontRightUpperLegLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x12F94" />
-        <Limb Name="gGohtFrontRightLowerLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_RIGHT_LOWER_LEG_ROOT" Offset="0x12FA0" />
-        <Limb Name="gGohtFrontRightLowerLegLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x12FAC" />
-        <Limb Name="gGohtFrontRightHoofLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_RIGHT_HOOF" Offset="0x12FB8" />
-        <Limb Name="gGohtFrontLeftLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_LEFT_LEG_ROOT" Offset="0x12FC4" />
-        <Limb Name="gGohtFrontLeftUpperLegLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x12FD0" />
-        <Limb Name="gGohtFrontLeftLowerLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_LEFT_LOWER_LEG_ROOT" Offset="0x12FDC" />
-        <Limb Name="gGohtFrontLeftLowerLegLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x12FE8" />
-        <Limb Name="gGohtFrontLeftHoofLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_LEFT_HOOF" Offset="0x12FF4" />
-        <Limb Name="gGohtThoraxLimb" Type="Standard" EnumName="GOHT_LIMB_THORAX" Offset="0x13000" />
-        <Limb Name="gGohtHeadLimb" Type="Standard" EnumName="GOHT_LIMB_HEAD" Offset="0x1300C" />
-        <Limb Name="gGohtJawRootLimb" Type="Standard" EnumName="GOHT_LIMB_JAW_ROOT" Offset="0x13018" />
-        <Limb Name="gGohtJawLimb" Type="Standard" EnumName="GOHT_LIMB_JAW" Offset="0x13024" />
-        <Limb Name="gGohtBackRightLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_LEG_ROOT" Offset="0x13030" />
-        <Limb Name="gGohtBackRightLegWrapperLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_LEG_WRAPPER" Offset="0x1303C" />
-        <Limb Name="gGohtBackRightThighLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_THIGH" Offset="0x13048" />
-        <Limb Name="gGohtBackRightShinLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_SHIN" Offset="0x13054" />
-        <Limb Name="gGohtBackRightPasternRootLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_PASTERN_ROOT" Offset="0x13060" />
-        <Limb Name="gGohtBackRightPasternLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_PASTERN" Offset="0x1306C" />
-        <Limb Name="gGohtBackRightHoofLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_HOOF" Offset="0x13078" />
-        <Limb Name="gGohtBackLeftLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_LEG_ROOT" Offset="0x13084" />
-        <Limb Name="gGohtBackLeftLegWrapperLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_LEG_WRAPPER" Offset="0x13090" />
-        <Limb Name="gGohtBackLeftThighLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_THIGH" Offset="0x1309C" />
-        <Limb Name="gGohtBackLeftShinLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_SHIN" Offset="0x130A8" />
-        <Limb Name="gGohtBackLeftPasternRootLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_PASTERN_ROOT" Offset="0x130B4" />
-        <Limb Name="gGohtBackLeftPasternLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_PASTERN" Offset="0x130C0" />
-        <Limb Name="gGohtBackLeftHoofLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_HOOF" Offset="0x130CC" />
-
-        <!-- Goht Skeleton -->
-        <Skeleton Name="gGohtSkel" Type="Flex" LimbType="Standard" LimbNone="GOHT_LIMB_NONE" LimbMax="GOHT_LIMB_MAX" EnumName="GohtLimb" Offset="0x13158" />
-
-        <!-- Goht Animations -->
-        <Animation Name="gGohtFallDownAnim" Offset="0x134D0" /> <!-- Original name is "iceb_koke" ("folly; fool") -->
-        <Animation Name="gGohtRunAnim" Offset="0x13828" /> <!-- Original name is "iceb_run" -->
-        <Animation Name="gGohtGetUpFromSideAnim" Offset="0x14024" /> <!-- Unused. Original name is "iceb_up" -->
-
-        <!-- Goht Title Card -->
-        <Texture Name="gGohtTitleCardTex" OutName="goht_title_card" Format="ia8" Width="128" Height="40" Offset="0x14040" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_botihasira.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_botihasira.xml
deleted file mode 100644
index 0a2212760..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_botihasira.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_botihasira" Segment="6">
-        <DList Name="object_botihasira_DL_0004A0" Offset="0x4A0" /> <!-- Original name is "z2_botihasira_model" ("boti" = "graveyard", "hasira" = "post") -->
-        <DList Name="object_botihasira_DL_000628" Offset="0x628" />
-        <DList Name="object_botihasira_DL_000638" Offset="0x638" />
-        <Texture Name="object_botihasira_Tex_000648" OutName="tex_000648" Format="rgba16" Width="32" Height="64" Offset="0x648" />
-        <Texture Name="object_botihasira_Tex_001648" OutName="tex_001648" Format="rgba16" Width="32" Height="16" Offset="0x1648" />
-        <!-- <Blob Name="object_botihasira_Blob_001A48" Size="0x18" Offset="0x1A48" /> -->
-        <Collision Name="object_botihasira_Colheader_001BD8" Offset="0x1BD8" /> <!-- Original name is "z2_botihasira_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_box.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_box.xml
deleted file mode 100644
index 8bb2b7efe..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_box.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <File Name="object_box" Segment="6">
-        <Animation Name="gBoxBigChestOpenChildAnim" Offset="0x128" /> <!-- Original name is "cdemo_box_boxA" -->
-        <Animation Name="gBoxBigChestOpenAdultAnim" Offset="0x24C" /> <!-- Original name is "demo_box_boxA" -->
-        <Blob Name="object_box_zeroes_unk_0000025C" Size="0xF4" Offset="0x25C" />
-        <Animation Name="gBoxChestOpenAnim" Offset="0x43C" /> <!-- Original name is "demo_box_boxB" -->
-        <Blob Name="object_box_zeroes_unk_0000044C" Size="0x64" Offset="0x44C" />
-        <DList Name="gBoxChestBaseDL" Offset="0x6F0" />
-        <DList Name="gBoxChestBaseGildedDL" Offset="0xA50" />
-        <DList Name="gBoxChestBaseOrnateDL" Offset="0xDB0" />
-        <DList Name="gBoxChestLidDL" Offset="0x12E8" />
-        <DList Name="gBoxChestLidGildedDL" Offset="0x1850" />
-        <DList Name="gBoxChestLidOrnateDL" Offset="0x1D58" />
-        <Texture Name="gBoxChestLockTex" OutName="chest_lock" Format="rgba16" Width="32" Height="64" Offset="0x1E60" />
-        <Texture Name="gBoxChestCornerTex" OutName="chest_corner" Format="rgba16" Width="32" Height="32" Offset="0x2E60" />
-        <Texture Name="gBoxChestLockGildedTex" OutName="chest_lock_gilded" Format="rgba16" Width="32" Height="64" Offset="0x3660" />
-        <Texture Name="gBoxChestCornerGildedTex" OutName="chest_corner_gilded" Format="rgba16" Width="32" Height="32" Offset="0x4660" />
-        <Texture Name="gBoxChestLockOrnateTex" OutName="chest_lock_ornate" Format="rgba16" Width="32" Height="64" Offset="0x4E60" />
-        <Texture Name="gBoxChestCornerOrnateTex" OutName="chest_corner_ornate" Format="rgba16" Width="32" Height="32" Offset="0x5E60" />
-        <Limb Name="object_box_Standardlimb_006660" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_01" Offset="0x6660" />
-        <Limb Name="object_box_Standardlimb_00666C" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_02" Offset="0x666C" />
-        <Limb Name="object_box_Standardlimb_006678" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_03" Offset="0x6678" />
-        <Limb Name="object_box_Standardlimb_006684" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_04" Offset="0x6684" />
-        <Skeleton Name="gBoxChestSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BOX_CHEST_LIMB_NONE" LimbMax="OBJECT_BOX_CHEST_LIMB_MAX" EnumName="ObjectBoxChestLimb" Offset="0x66A0" />
-        <CurveAnimation Name="gBoxLightAdultCurveAnim" SkelOffset="0x7D78" Offset="0x6A20"/> <!-- Original name is "demo_tre_lgt_c_fcurve_data" -->
-        <CurveAnimation Name="gBoxLightChildCurveAnim" SkelOffset="0x7D78" Offset="0x6E30"/> <!-- Original name is "demo_tre_lgt_fcurve_data" -->
-        <Texture Name="gBoxLightTex" OutName="box_light" Format="i8" Width="64" Height="32" Offset="0x6E40" />
-        <DList Name="object_box_DL_007890" Offset="0x7890" />
-        <DList Name="object_box_DL_007978" Offset="0x7978" />
-        <DList Name="object_box_DL_007A40" Offset="0x7A40" />
-        <DList Name="object_box_DL_007B08" Offset="0x7B08" />
-        <DList Name="object_box_DL_007BD0" Offset="0x7BD0" />
-        <Limb Name="object_box_Curvelimb_007C98" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_01" Offset="0x7C98" />
-        <Limb Name="object_box_Curvelimb_007CA4" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_02" Offset="0x7CA4" />
-        <Limb Name="object_box_Curvelimb_007CB0" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_03" Offset="0x7CB0" />
-        <Limb Name="object_box_Curvelimb_007CBC" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_04" Offset="0x7CBC" />
-        <Limb Name="object_box_Curvelimb_007CC8" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_05" Offset="0x7CC8" />
-        <Limb Name="object_box_Curvelimb_007CD4" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_06" Offset="0x7CD4" />
-        <Limb Name="object_box_Curvelimb_007CE0" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_07" Offset="0x7CE0" />
-        <Limb Name="object_box_Curvelimb_007CEC" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_08" Offset="0x7CEC" />
-        <Limb Name="object_box_Curvelimb_007CF8" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_09" Offset="0x7CF8" />
-        <Limb Name="object_box_Curvelimb_007D04" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_10" Offset="0x7D04" />
-        <Limb Name="object_box_Curvelimb_007D10" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_11" Offset="0x7D10" />
-        <Limb Name="object_box_Curvelimb_007D1C" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_12" Offset="0x7D1C" />
-        <Limb Name="object_box_Curvelimb_007D28" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_13" Offset="0x7D28" />
-        <Limb Name="object_box_Curvelimb_007D34" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_14" Offset="0x7D34" />
-        <Skeleton Name="gBoxLightCurveSkel" Type="Curve" LimbType="Curve" LimbNone="OBJECT_BOX_LIGHT_LIMB_NONE" LimbMax="OBJECT_BOX_LIGHT_LIMB_MAX" EnumName="ObjectBoxLightLimb" Offset="0x7D78" />
-        <Animation Name="gBoxBigChestOpenGoronAnim" Offset="0x7E54" /> <!-- Original name is "pg_Tbox" -->
-        <Animation Name="gBoxBigChestOpenDekuAnim" Offset="0x7F30" /> <!-- Original name is "pn_Tbox" -->
-        <Blob Name="object_box_zeroes_unk_00007F40" Size="0xA0" Offset="0x7F40" />
-        <Collision Name="gBoxChestCol" Offset="0x80E8" /> <!-- Original name is "takara_hako_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boyo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boyo.xml
deleted file mode 100644
index 0084c4825..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_boyo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_boyo" Segment="6">
-        <DList Name="object_boyo_DL_000300" Offset="0x300" />
-        <Texture Name="object_boyo_Tex_000480" OutName="tex_000480" Format="rgba16" Width="32" Height="32" Offset="0x480" />
-        <Texture Name="object_boyo_Tex_000C80" OutName="tex_000C80" Format="rgba16" Width="16" Height="16" Offset="0xC80" />
-        <TextureAnimation Name="object_boyo_Matanimheader_000E88" Offset="0xE88" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bsb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bsb.xml
deleted file mode 100644
index 40bce73f2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bsb.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<Root>
-    <File Name="object_bsb" Segment="6">
-        <Animation Name="object_bsb_Anim_000400" Offset="0x400" /> <!-- Original name is "bsb_aita" ("Ouch!") -->
-        <Animation Name="object_bsb_Anim_000C50" Offset="0xC50" /> <!-- Original name is "bsb_atack" -->
-        <Animation Name="object_bsb_Anim_000FF0" Offset="0xFF0" /> <!-- Original name is "bsb_battlewalk" -->
-        <Animation Name="object_bsb_Anim_001390" Offset="0x1390" /> <!-- Original name is "bsb_damage" -->
-        <Animation Name="object_bsb_Anim_001CD8" Offset="0x1CD8" /> <!-- Original name is "bsb_demo_wait" -->
-        <Animation Name="object_bsb_Anim_001F90" Offset="0x1F90" /> <!-- Original name is "bsb_don" (onomatopoeic for "bang; bam; boom; thud") -->
-        <Animation Name="object_bsb_Anim_002590" Offset="0x2590" /> <!-- Original name is "bsb_dosuni" -->
-        <Animation Name="object_bsb_Anim_002AF4" Offset="0x2AF4" /> <!-- Original name is "bsb_down" -->
-        <Animation Name="object_bsb_Anim_003238" Offset="0x3238" /> <!-- Original name is "bsb_furi_wait" -->
-        <Animation Name="object_bsb_Anim_003E1C" Offset="0x3E1C" /> <!-- Original name is "bsb_furimuki" ("to turn around") -->
-        <Animation Name="object_bsb_Anim_004208" Offset="0x4208" /> <!-- Original name is "bsb_jidanda" ("to stamp one's feet (in frustration, impatience, etc.)") -->
-        <Animation Name="object_bsb_Anim_0043A4" Offset="0x43A4" /> <!-- Original name is "bsb_jump" -->
-        <Animation Name="object_bsb_Anim_004510" Offset="0x4510" /> <!-- Original name is "bsb_jumpTOdon" -->
-        <Animation Name="object_bsb_Anim_004894" Offset="0x4894" /> <!-- Original name is "bsb_kei_wait" -->
-        <Animation Name="object_bsb_Anim_004E2C" Offset="0x4E2C" /> <!-- Original name is "bsb_keirei" ("salute") -->
-        <Animation Name="object_bsb_Anim_005440" Offset="0x5440" /> <!-- Original name is "bsb_kiwo_wait" -->
-        <Animation Name="object_bsb_Anim_00606C" Offset="0x606C" /> <!-- Original name is "bsb_kiwotuke" ("standing at attention​") -->
-        <Animation Name="object_bsb_Anim_0065D8" Offset="0x65D8" /> <!-- Original name is "bsb_kyorokyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="object_bsb_Anim_006C48" Offset="0x6C48" /> <!-- Original name is "bsb_laugh" -->
-        <Animation Name="object_bsb_Anim_007120" Offset="0x7120" /> <!-- Original name is "bsb_matarei" -->
-        <Animation Name="object_bsb_Anim_007B18" Offset="0x7B18" /> <!-- Original name is "bsb_rajio" -->
-        <Animation Name="object_bsb_Anim_0086BC" Offset="0x86BC" /> <!-- Original name is "bsb_start" -->
-        <DList Name="object_bsb_DL_00A010" Offset="0xA010" />
-        <DList Name="object_bsb_DL_00A0D8" Offset="0xA0D8" />
-        <DList Name="object_bsb_DL_00A188" Offset="0xA188" />
-        <DList Name="object_bsb_DL_00A230" Offset="0xA230" />
-        <DList Name="object_bsb_DL_00A2F8" Offset="0xA2F8" />
-        <DList Name="object_bsb_DL_00A3A8" Offset="0xA3A8" />
-        <DList Name="object_bsb_DL_00A450" Offset="0xA450" />
-        <DList Name="object_bsb_DL_00A5D0" Offset="0xA5D0" />
-        <DList Name="object_bsb_DL_00A708" Offset="0xA708" />
-        <DList Name="object_bsb_DL_00AE20" Offset="0xAE20" />
-        <DList Name="object_bsb_DL_00AEA8" Offset="0xAEA8" />
-        <DList Name="object_bsb_DL_00B038" Offset="0xB038" />
-        <DList Name="object_bsb_DL_00B100" Offset="0xB100" />
-        <DList Name="object_bsb_DL_00B228" Offset="0xB228" />
-        <DList Name="object_bsb_DL_00B2F8" Offset="0xB2F8" />
-        <DList Name="object_bsb_DL_00B3C0" Offset="0xB3C0" />
-        <DList Name="object_bsb_DL_00B4E8" Offset="0xB4E8" />
-        <DList Name="object_bsb_DL_00B5B8" Offset="0xB5B8" />
-        <Texture Name="object_bsb_Tex_00B660" OutName="tex_00B660" Format="rgba16" Width="8" Height="16" Offset="0xB660" />
-        <Texture Name="object_bsb_Tex_00B760" OutName="tex_00B760" Format="rgba16" Width="8" Height="16" Offset="0xB760" />
-        <Texture Name="object_bsb_Tex_00B860" OutName="tex_00B860" Format="rgba16" Width="8" Height="8" Offset="0xB860" />
-        <Texture Name="object_bsb_Tex_00B8E0" OutName="tex_00B8E0" Format="rgba16" Width="16" Height="16" Offset="0xB8E0" />
-        <Texture Name="object_bsb_Tex_00BAE0" OutName="tex_00BAE0" Format="rgba16" Width="16" Height="8" Offset="0xBAE0" />
-        <Texture Name="object_bsb_Tex_00BBE0" OutName="tex_00BBE0" Format="rgba16" Width="8" Height="8" Offset="0xBBE0" />
-        <Texture Name="object_bsb_Tex_00BC60" OutName="tex_00BC60" Format="rgba16" Width="16" Height="16" Offset="0xBC60" />
-        <Texture Name="object_bsb_Tex_00BE60" OutName="tex_00BE60" Format="rgba16" Width="16" Height="16" Offset="0xBE60" />
-        <Texture Name="object_bsb_Tex_00C060" OutName="tex_00C060" Format="rgba16" Width="8" Height="16" Offset="0xC060" />
-        <Texture Name="object_bsb_Tex_00C160" OutName="tex_00C160" Format="rgba16" Width="8" Height="8" Offset="0xC160" />
-        <Texture Name="object_bsb_Tex_00C1E0" OutName="tex_00C1E0" Format="rgba16" Width="8" Height="8" Offset="0xC1E0" />
-        <TextureAnimation Name="object_bsb_Matanimheader_00C298" Offset="0xC298" />
-        <Limb Name="object_bsb_Standardlimb_00C2A0" Type="Standard" EnumName="OBJECT_BSB_LIMB_01" Offset="0xC2A0" />
-        <Limb Name="object_bsb_Standardlimb_00C2AC" Type="Standard" EnumName="OBJECT_BSB_LIMB_02" Offset="0xC2AC" />
-        <Limb Name="object_bsb_Standardlimb_00C2B8" Type="Standard" EnumName="OBJECT_BSB_LIMB_03" Offset="0xC2B8" />
-        <Limb Name="object_bsb_Standardlimb_00C2C4" Type="Standard" EnumName="OBJECT_BSB_LIMB_04" Offset="0xC2C4" />
-        <Limb Name="object_bsb_Standardlimb_00C2D0" Type="Standard" EnumName="OBJECT_BSB_LIMB_05" Offset="0xC2D0" />
-        <Limb Name="object_bsb_Standardlimb_00C2DC" Type="Standard" EnumName="OBJECT_BSB_LIMB_06" Offset="0xC2DC" />
-        <Limb Name="object_bsb_Standardlimb_00C2E8" Type="Standard" EnumName="OBJECT_BSB_LIMB_07" Offset="0xC2E8" />
-        <Limb Name="object_bsb_Standardlimb_00C2F4" Type="Standard" EnumName="OBJECT_BSB_LIMB_08" Offset="0xC2F4" />
-        <Limb Name="object_bsb_Standardlimb_00C300" Type="Standard" EnumName="OBJECT_BSB_LIMB_09" Offset="0xC300" />
-        <Limb Name="object_bsb_Standardlimb_00C30C" Type="Standard" EnumName="OBJECT_BSB_LIMB_0A" Offset="0xC30C" />
-        <Limb Name="object_bsb_Standardlimb_00C318" Type="Standard" EnumName="OBJECT_BSB_LIMB_0B" Offset="0xC318" />
-        <Limb Name="object_bsb_Standardlimb_00C324" Type="Standard" EnumName="OBJECT_BSB_LIMB_0C" Offset="0xC324" />
-        <Limb Name="object_bsb_Standardlimb_00C330" Type="Standard" EnumName="OBJECT_BSB_LIMB_0D" Offset="0xC330" />
-        <Limb Name="object_bsb_Standardlimb_00C33C" Type="Standard" EnumName="OBJECT_BSB_LIMB_0E" Offset="0xC33C" />
-        <Limb Name="object_bsb_Standardlimb_00C348" Type="Standard" EnumName="OBJECT_BSB_LIMB_0F" Offset="0xC348" />
-        <Limb Name="object_bsb_Standardlimb_00C354" Type="Standard" EnumName="OBJECT_BSB_LIMB_10" Offset="0xC354" />
-        <Limb Name="object_bsb_Standardlimb_00C360" Type="Standard" EnumName="OBJECT_BSB_LIMB_11" Offset="0xC360" />
-        <Limb Name="object_bsb_Standardlimb_00C36C" Type="Standard" EnumName="OBJECT_BSB_LIMB_12" Offset="0xC36C" />
-        <Limb Name="object_bsb_Standardlimb_00C378" Type="Standard" EnumName="OBJECT_BSB_LIMB_13" Offset="0xC378" />
-        <Limb Name="object_bsb_Standardlimb_00C384" Type="Standard" EnumName="OBJECT_BSB_LIMB_14" Offset="0xC384" />
-        <Skeleton Name="object_bsb_Skel_00C3E0" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BSB_LIMB_NONE" LimbMax="OBJECT_BSB_LIMB_MAX" EnumName="ObjectBsbLimb" Offset="0xC3E0" />
-        <Animation Name="object_bsb_Anim_00C790" Offset="0xC790" /> <!-- Original name is "bsb_tatsu" ("to stand; to rise; to stand up​") -->
-        <Animation Name="object_bsb_Anim_00CD88" Offset="0xCD88" /> <!-- Original name is "bsb_walk" -->
-        <Animation Name="object_bsb_Anim_00D3CC" Offset="0xD3CC" /> <!-- Original name is "bsb_yareyare" ("oh!; ah!; oh dear!; good grief!; dear me!") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bsmask.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bsmask.xml
deleted file mode 100644
index 92e8148e9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bsmask.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<Root>
-    <!-- Boss Remains -->
-    <File Name="object_bsmask" Segment="6">
-
-        <!-- Boss Remains Display Lists -->
-        <DList Name="gRemainsOdolwaDL" Offset="0x690" /> <!-- Original name is "face01_get_model" -->
-        <DList Name="gRemainsGyorgDL" Offset="0x1D80" /> <!-- Original name is "face02_get_model" -->
-        <DList Name="gRemainsGohtDL" Offset="0x3AD0" /> <!-- Original name is "face03_get_model" -->
-        <DList Name="gRemainsTwinmoldDL" Offset="0x5020" /> <!-- Original name is "face04_get_model" -->
-
-        <!-- Boss Remains TLUTs -->
-        <Texture Name="gRemainsOdolwaFaceTLUT" OutName="remains_odolwa_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5830" />
-        <Texture Name="gRemainsOdolwaEarTLUT" OutName="remains_odolwa_ear_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5850" />
-        <Texture Name="gRemainsGyorgSkinTLUT" OutName="remains_gyorg_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5870" />
-        <Texture Name="gRemainsGyorgMouthTLUT" OutName="remains_gyorg_mouth_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5890" />
-        <Texture Name="gRemainsGyorgToothHornTLUT" OutName="remains_gyorg_tooth_horn_tlut" Format="rgba16" Width="4" Height="4" Offset="0x58B0" />
-        <Texture Name="gRemainsTwinmoldSkinTLUT" OutName="remains_twinmold_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x58D0" />
-        <Texture Name="gRemainsTwinmoldSnoutTLUT" OutName="remains_twinmold_snout_tlut" Format="rgba16" Width="4" Height="4" Offset="0x58F0" />
-
-        <!-- Boss Remains Textures -->
-        <Texture Name="gRemainsOdolwaPlumeTex" OutName="remains_odolwa_plume" Format="rgba16" Width="16" Height="16" Offset="0x5910" />
-        <Texture Name="gRemainsOdolwaFaceTex" OutName="remains_odolwa_face" Format="ci4" Width="64" Height="64" Offset="0x5B10" />
-        <Texture Name="gRemainsOdolwaEarTex" OutName="remains_odolwa_ear" Format="ci4" Width="64" Height="64" Offset="0x6310" />
-        <Texture Name="gRemainsGyorgTwinmoldEyeTex" OutName="remains_gyorg_twinmold_eye" Format="rgba16" Width="32" Height="32" Offset="0x6B10" />
-        <Texture Name="gRemainsGyorgSkinTex" OutName="remains_gyorg_skin" Format="ci4" Width="64" Height="64" Offset="0x7310" />
-        <Texture Name="gRemainsGyorgMouthTex" OutName="remains_gyorg_mouth" Format="ci4" Width="64" Height="64" Offset="0x7B10" />
-        <Texture Name="gRemainsGyorgToothHornTex" OutName="remains_gyorg_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0x8310" />
-        <Texture Name="gRemainsGohtEyeTex" OutName="remains_goht_eye" Format="rgba16" Width="32" Height="64" Offset="0x8390" />
-        <Texture Name="gRemainsGohtTopPatternTex" OutName="remains_goht_top_pattern" Format="rgba16" Width="32" Height="64" Offset="0x9390" />
-        <!-- Used for the lower part of Goht's Remains for the mouth of Twinmold's Remains -->
-        <Texture Name="gRemainsGohtTwinmoldPatternTex" OutName="remains_goht_twinmold_pattern" Format="rgba16" Width="32" Height="64" Offset="0xA390" />
-        <Texture Name="gRemainsGohtSpikeTwinmoldMandibleTex" OutName="remains_goht_spike_twinmold_mandible" Format="rgba16" Width="32" Height="32" Offset="0xB390" />
-        <Texture Name="gRemainsTwinmoldSkinTex" OutName="remains_twinmold_skin" Format="ci4" Width="64" Height="64" Offset="0xBB90" />
-        <Texture Name="gRemainsTwinmoldSnoutTex" OutName="remains_twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0xC390" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bubble.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bubble.xml
deleted file mode 100644
index da2f01d47..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_bubble.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="object_bubble" Segment="6">
-        <Texture Name="gBubbleTex" OutName="bubble" Format="ia8" Width="64" Height="64" Offset="0x0" />
-        <DList Name="gBubbleDL" Offset="0x1000" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cha.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cha.xml
deleted file mode 100644
index 79b008353..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cha.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_cha" Segment="6">
-        <DList Name="object_cha_DL_000710" Offset="0x710" /> <!-- Original name is "cha_ki_model" -->
-        <DList Name="object_cha_DL_000958" Offset="0x958" /> <!-- Original name is "cha_kane_model" -->
-        <Texture Name="object_cha_TLUT_000B08" OutName="tlut_000B08" Format="rgba16" Width="16" Height="16" Offset="0xB08" />
-        <Texture Name="object_cha_Tex_000D08" OutName="tex_000D08" Format="ci8" Width="32" Height="32" Offset="0xD08" />
-        <Texture Name="object_cha_Tex_001108" OutName="tex_001108" Format="ci8" Width="32" Height="32" Offset="0x1108" />
-        <Texture Name="object_cha_Tex_001508" OutName="tex_001508" Format="ci8" Width="16" Height="16" Offset="0x1508" />
-        <Texture Name="object_cha_Tex_001608" OutName="tex_001608" Format="ci8" Width="32" Height="32" Offset="0x1608" />
-        <Texture Name="object_cha_Tex_001A08" OutName="tex_001A08" Format="rgba16" Width="16" Height="32" Offset="0x1A08" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cne.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cne.xml
deleted file mode 100644
index 135aae7a2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cne.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Root>
-    <!-- Object for Unusued Hyrule Market NPC -->
-    <File Name="object_cne" Segment="6">
-        <!-- The textures used by these limbs aren't 64-bit aligned -->
-        <Limb Name="gCnePelvisLimb" LimbType="Standard" EnumName="CNE_LIMB_PELVIS" Offset="0x0"/>
-        <Limb Name="gCneLeftThighLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_THIGH" Offset="0xC"/>
-        <Limb Name="gCneLeftShinLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_SHIN" Offset="0x18"/>
-        <Limb Name="gCneLeftFootLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_FOOT" Offset="0x24"/>
-        <Limb Name="gCneRightThighLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_THIGH" Offset="0x30"/>
-        <Limb Name="gCneRightShinLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_SHIN" Offset="0x3C"/>
-        <Limb Name="gCneRightFootLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_FOOT" Offset="0x48"/>
-        <Limb Name="gCneTorsoLimb" LimbType="Standard" EnumName="CNE_LIMB_TORSO" Offset="0x54"/>
-        <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_UPPER_ARM" Offset="0x60"/>
-        <Limb Name="gCneLeftForearmLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_FOREARM" Offset="0x6C"/>
-        <Limb Name="gCneLeftHandLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_HAND" Offset="0x78"/>
-        <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_UPPER_ARM" Offset="0x84"/>
-        <Limb Name="gCneRightForearmLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_FOREARM" Offset="0x90"/>
-        <Limb Name="gCneRightHandLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_HAND" Offset="0x9C"/>
-        <Limb Name="gCneHeadLimb" LimbType="Standard" EnumName="CNE_LIMB_HEAD" Offset="0xA8"/>
-
-        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" LimbNone="CNE_LIMB_NONE" LimbMax="CNE_LIMB_MAX" EnumName="CneLimb" Offset="0xF0"/>
-
-        <!-- 32-bit aligned textures. -->
-        <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
-        <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC"/>
-        <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C"/>
-        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C"/>
-        <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC"/>
-        <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC"/>
-        <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
-        <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC"/>
-
-        <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
-        <DList Name="gCneRightHandDL" Offset="0x1608"/>
-        <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
-        <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
-        <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
-        <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
-        <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
-        <DList Name="gCneTorsoDL" Offset="0x1B88"/>
-        <DList Name="gCneRightFootDL" Offset="0x1E50"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCneRightShinDL" Offset="0x1F18"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCneRightThighDL" Offset="0x1FE0"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCneLeftFootDL" Offset="0x20A8"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCneLeftShinDL" Offset="0x2170"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCneLeftThighDL" Offset="0x2238"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCnePelvisDL" Offset="0x2300"/>
-
-        <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
-        <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
-
-        <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_comb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_comb.xml
deleted file mode 100644
index 2bea4db20..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_comb.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Object for Beehive -->
-    <File Name="object_comb" Segment="6">
-        <!-- Beehive -->
-        <Texture Name="gBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <DList Name="gBeehiveDL" Offset="0xCB0" /> <!-- Original name is "hatisu_model" ("hive; beehive") -->
-
-        <!-- Beehive Fragment -->
-        <Texture Name="gBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0xE10" />
-        <DList Name="gBeehiveFragmentDL" Offset="0x1040" /> <!-- Original name is "hatisu_hahen_model" ("hahen" = "fragment; broken piece") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cow.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cow.xml
deleted file mode 100644
index 6895d6217..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cow.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Root>
-    <!-- Assets for cows -->
-    <File Name="object_cow" Segment="6">
-        <Animation Name="gCowChewAnim" Offset="0x1CC" /> <!-- Original name is "usi_mogmog" (onomatopoeia for chewing) -->
-
-        <!-- Cow Limb DisplayLists -->
-        <DList Name="gCowBodyDL" Offset="0x1A80" />
-        <DList Name="gCowHeadDL" Offset="0x1FE8" />
-        <DList Name="gCowNoseDL" Offset="0x2368" />
-        <DList Name="gCowNoseRingDL" Offset="0x2628" />
-        <DList Name="gCowJawDL" Offset="0x2760" />
-
-        <!-- Cow Palettes -->
-        <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880" />
-
-        <!-- Cow Textures -->
-        <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" />
-        <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" />
-        <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" />
-        <Texture Name="gCowSpotsTex" OutName="cow_spots" Format="i8" Width="64" Height="64" Offset="0x2CC0" />
-        <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" />
-        <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40" />
-        <Texture Name="gCowLegAndTailTex" OutName="cow_leg_and_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" />
-
-        <!-- Cow Limb DisplayLists -->
-        <Limb Name="gCowBodyLimb" Type="Standard" EnumName="COW_LIMB_BODY" Offset="0x3FC0" />
-        <Limb Name="gCowHeadLimb" Type="Standard" EnumName="COW_LIMB_HEAD" Offset="0x3FCC" />
-        <Limb Name="gCowJawLimb" Type="Standard" EnumName="COW_LIMB_JAW" Offset="0x3FD8" />
-        <Limb Name="gCowNoseLimb" Type="Standard" EnumName="COW_LIMB_NOSE" Offset="0x3FE4" />
-        <Limb Name="gCowNoseRingLimb" Type="Standard" EnumName="COW_LIMB_NOSE_RING" Offset="0x3FF0" />
-
-        <!-- Cow Skeleton -->
-        <Skeleton Name="gCowSkel" Type="Flex" LimbType="Standard" LimbNone="COW_LIMB_NONE" LimbMax="COW_LIMB_MAX" EnumName="CowLimb" Offset="0x4010" />
-
-        <Animation Name="gCowMooAnim" Offset="0x4264" /> <!-- Original name is "usi_mooo" -->
-        <Animation Name="gCowTailIdleAnim" Offset="0x4348" /> <!-- Original name is "ust_daran" ("loosely") -->
-
-        <!-- Cow Tail Limb DisplayLists -->
-        <DList Name="gCowTailBaseDL" Offset="0x46F0" />
-        <DList Name="gCowTailUpperDL" Offset="0x47D0" />
-        <DList Name="gCowTailMiddleDL" Offset="0x48D0" />
-        <DList Name="gCowTailLowerDL" Offset="0x49D0" />
-        <DList Name="gCowTailEndDL" Offset="0x4AD0" />
-
-        <!-- Cow Tail Limbs -->
-        <Limb Name="gCowTailBaseLimb" Type="Standard" EnumName="COW_TAIL_LIMB_BASE" Offset="0x4BE0" />
-        <Limb Name="gCowTailUpperLimb" Type="Standard" EnumName="COW_TAIL_LIMB_UPPER" Offset="0x4BEC" />
-        <Limb Name="gCowTailMiddleLimb" Type="Standard" EnumName="COW_TAIL_LIMB_MIDDLE" Offset="0x4BF8" />
-        <Limb Name="gCowTailLowerLimb" Type="Standard" EnumName="COW_TAIL_LIMB_LOWER" Offset="0x4C04" />
-        <Limb Name="gCowTailEndLimb" Type="Standard" EnumName="COW_TAIL_LIMB_END" Offset="0x4C10" />
-
-        <!-- Cow Tail Skeleton -->
-        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" LimbNone="COW_TAIL_LIMB_NONE" LimbMax="COW_TAIL_LIMB_MAX" EnumName="CowTailLimb" Offset="0x4C30" />
-
-        <Animation Name="gCowTailSwishAnim" Offset="0x4E98" /> <!-- Original name is "ust_furifuri" ("fluttery") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_crace_object.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_crace_object.xml
deleted file mode 100644
index 63dd9913d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_crace_object.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Assets for the sliding doors in the Deku Shrine -->
-    <File Name="object_crace_object" Segment="6">
-        <DList Name="gDekuShrineSlidingDoorDL" Offset="0x3A0" /> <!-- Original name is "Y2_DANPEI_shutter_model" -->
-        <Texture Name="gDekuShrineSlidingDoorTLUT" OutName="deku_shrine_sliding_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x540" />
-        <Texture Name="gDekuShrineSlidingDoorTex" OutName="deku_shrine_sliding_door" Format="ci4" Width="32" Height="128" Offset="0x560" />
-        <Collision Name="gDekuShrineSlidingDoorCol" Offset="0xE00" /> <!-- Original name is "Y2_DANPEI_shutter_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_crow.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_crow.xml
deleted file mode 100644
index 068ca790a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_crow.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Root>
-    <File Name="object_crow" Segment="6">
-        <Animation Name="gGuayFlyAnim" Offset="0xF0" /> <!-- Original name is "df_flygue" -->
-        <DList Name="gGuayBodyDL" Offset="0x490" />
-        <DList Name="gGuayRightWingTipDL" Offset="0x5E0" />
-        <DList Name="gGuayRightWingBodyDL" Offset="0x6B0" />
-        <DList Name="gGuayLeftWingTipDL" Offset="0x770" />
-        <DList Name="gGuayLeftWingBodyDL" Offset="0x840" />
-        <DList Name="gGuayTailDL" Offset="0x900" />
-        <DList Name="gGuayUpperTailDL" Offset="0x9A0" />
-        <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40" />
-        <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40" />
-        <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40" />
-        <Limb Name="gGuayRootLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_ROOT" Offset="0x1040" />
-        <Limb Name="gGuayBodyLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_BODY" Offset="0x104C" />
-        <Limb Name="gGuayRightWingBodyLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_RIGHT_WING_BODY" Offset="0x1058" />
-        <Limb Name="gGuayRightWingTipLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_RIGHT_WING_TIP" Offset="0x1064" />
-        <Limb Name="gGuayLeftWingBodyLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_LEFT_WING_BODY" Offset="0x1070" />
-        <Limb Name="gGuayLeftWingTipLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_LEFT_WING_TIP" Offset="0x107C" />
-        <Limb Name="gGuayUpperTailLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_UPPER_TAIL" Offset="0x1088" />
-        <Limb Name="gGuayTailLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_TAIL" Offset="0x1094" />
-        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_CROW_LIMB_NONE" LimbMax="OBJECT_CROW_LIMB_MAX" EnumName="ObjectCrowLimb" Offset="0x10C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cs.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cs.xml
deleted file mode 100644
index cc9dfbe74..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_cs.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<Root>
-    <File Name="object_cs" Segment="6">
-        <DList Name="object_cs_DL_000040" Offset="0x40" />
-        <Texture Name="object_cs_Tex_0000C0" OutName="tex_0000C0" Format="ia8" Width="64" Height="64" Offset="0xC0" />
-        <Animation Name="object_cs_Anim_001708" Offset="0x1708" /> <!-- Original name is "csn_atsume" ("to collect; to assemble; to gather​") -->
-        <Animation Name="object_cs_Anim_001A1C" Offset="0x1A1C" /> <!-- Original name is "csn_fly" -->
-        <Animation Name="object_cs_Anim_002044" Offset="0x2044" /> <!-- Original name is "csn_fukiya" ("blowgun; blowpipe; dart​") -->
-        <Animation Name="object_cs_Anim_0026B0" Offset="0x26B0" /> <!-- Original name is "csn_keirei" ("salute") -->
-        <Animation Name="object_cs_Anim_002930" Offset="0x2930" /> <!-- Original name is "csn_kinobori" ("tree climbing​") -->
-        <Animation Name="object_cs_Anim_0031C4" Offset="0x31C4" /> <!-- Original name is "csn_kyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="object_cs_Anim_00349C" Offset="0x349C" /> <!-- Original name is "csn_odoroku" ("surprise") -->
-        <Animation Name="object_cs_Anim_0036B0" Offset="0x36B0" /> <!-- Original name is "csn_run03" -->
-        <Animation Name="object_cs_Anim_003EE4" Offset="0x3EE4" /> <!-- Original name is "csn_senakamise" ("senaka" = "back (of the body)​", "mise" = "to show; to display​") -->
-        <Animation Name="object_cs_Anim_00433C" Offset="0x433C" /> <!-- Original name is "csn_senakatalk" -->
-        <Animation Name="object_cs_Anim_00478C" Offset="0x478C" /> <!-- Original name is "csn_senakawait" -->
-        <Animation Name="object_cs_Anim_004960" Offset="0x4960" /> <!-- Original name is "csn_shagamu" ("to squat; to crouch​") -->
-        <Animation Name="object_cs_Anim_004C1C" Offset="0x4C1C" /> <!-- Original name is "csn_suwari" ("sitting") -->
-        <Animation Name="object_cs_Anim_005128" Offset="0x5128" /> <!-- Original name is "csn_suwaripiyo" ("piyo" = "weakly moving") -->
-        <Animation Name="object_cs_Anim_0053F4" Offset="0x53F4" /> <!-- Original name is "csn_talk01" -->
-        <Animation Name="object_cs_Anim_0057C8" Offset="0x57C8" /> <!-- Original name is "csn_talk02" -->
-        <Animation Name="object_cs_Anim_005DC4" Offset="0x5DC4" /> <!-- Original name is "csn_talk03" -->
-        <Animation Name="object_cs_Anim_0060E8" Offset="0x60E8" /> <!-- Original name is "csn_tome" -->
-        <Animation Name="gBomberIdleAnim" Offset="0x64B8" /> <!-- Original name is "csn_wait01" -->
-        <DList Name="object_cs_DL_009130" Offset="0x9130" />
-        <DList Name="object_cs_DL_009478" Offset="0x9478" />
-        <DList Name="object_cs_DL_009578" Offset="0x9578" />
-        <DList Name="object_cs_DL_009678" Offset="0x9678" />
-        <DList Name="object_cs_DL_009C50" Offset="0x9C50" />
-        <DList Name="object_cs_DL_009D48" Offset="0x9D48" />
-        <DList Name="object_cs_DL_009E38" Offset="0x9E38" />
-        <DList Name="object_cs_DL_009F80" Offset="0x9F80" />
-        <DList Name="object_cs_DL_00A0C0" Offset="0xA0C0" />
-        <DList Name="object_cs_DL_00A1B8" Offset="0xA1B8" />
-        <DList Name="object_cs_DL_00A2A8" Offset="0xA2A8" />
-        <DList Name="object_cs_DL_00A3F0" Offset="0xA3F0" />
-        <DList Name="object_cs_DL_00A508" Offset="0xA508" />
-        <DList Name="object_cs_DL_00A650" Offset="0xA650" />
-        <DList Name="object_cs_DL_00A7E0" Offset="0xA7E0" />
-        <DList Name="object_cs_DL_00AA58" Offset="0xAA58" />
-        <DList Name="object_cs_DL_00ABA0" Offset="0xABA0" />
-        <DList Name="object_cs_DL_00AD30" Offset="0xAD30" />
-        <Texture Name="object_cs_TLUT_00B020" OutName="tlut_00B020" Format="rgba16" Width="16" Height="16" Offset="0xB020" />
-        <Texture Name="object_cs_TLUT_00B220" OutName="tlut_00B220" Format="rgba16" Width="16" Height="16" Offset="0xB220" />
-        <Texture Name="object_cs_TLUT_00B420" OutName="tlut_00B420" Format="rgba16" Width="16" Height="16" Offset="0xB420" />
-        <Texture Name="object_cs_Tex_00B620" OutName="tex_00B620" Format="ci8" Width="32" Height="16" Offset="0xB620" />
-        <Texture Name="object_cs_Tex_00B820" OutName="tex_00B820" Format="ci8" Width="8" Height="8" Offset="0xB820" />
-        <Texture Name="object_cs_Tex_00B860" OutName="tex_00B860" Format="ci8" Width="8" Height="8" Offset="0xB860" />
-        <Texture Name="object_cs_Tex_00B8A0" OutName="tex_00B8A0" Format="ci8" Width="16" Height="16" Offset="0xB8A0" />
-        <Texture Name="object_cs_Tex_00B9A0" OutName="tex_00B9A0" Format="ci8" Width="8" Height="8" Offset="0xB9A0" />
-        <Texture Name="object_cs_Tex_00B9E0" OutName="tex_00B9E0" Format="ci8" Width="16" Height="16" Offset="0xB9E0" />
-        <Texture Name="object_cs_Tex_00BAE0" OutName="tex_00BAE0" Format="ci8" Width="16" Height="16" Offset="0xBAE0" />
-        <Blob Name="object_cs_Blob_00BBE0" Size="0x400" Offset="0xBBE0" />
-        <Texture Name="object_cs_Tex_00BFE0" OutName="tex_00BFE0" Format="ci8" Width="8" Height="8" Offset="0xBFE0" />
-        <Texture Name="object_cs_Tex_00C020" OutName="tex_00C020" Format="ci8" Width="8" Height="8" Offset="0xC020" />
-        <Texture Name="object_cs_Tex_00C060" OutName="tex_00C060" Format="ci8" Width="8" Height="8" Offset="0xC060" />
-        <Texture Name="object_cs_Tex_00C0A0" OutName="tex_00C0A0" Format="ci8" Width="8" Height="16" Offset="0xC0A0" />
-        <Texture Name="object_cs_Tex_00C120" OutName="tex_00C120" Format="i8" Width="16" Height="16" Offset="0xC120" />
-        <Texture Name="object_cs_Tex_00C220" OutName="tex_00C220" Format="ci8" Width="16" Height="16" Offset="0xC220" />
-        <Blob Name="object_cs_Blob_00C320" Size="0x200" Offset="0xC320" />
-        <Texture Name="object_cs_Tex_00C520" OutName="tex_00C520" Format="rgba16" Width="32" Height="32" Offset="0xC520" />
-        <Texture Name="object_cs_Tex_00CD20" OutName="tex_00CD20" Format="rgba16" Width="32" Height="32" Offset="0xCD20" />
-        <Texture Name="object_cs_Tex_00D520" OutName="tex_00D520" Format="rgba16" Width="32" Height="32" Offset="0xD520" />
-        <Texture Name="object_cs_Tex_00DD20" OutName="tex_00DD20" Format="i8" Width="32" Height="32" Offset="0xDD20" />
-        <Texture Name="object_cs_Tex_00E120" OutName="tex_00E120" Format="i8" Width="16" Height="16" Offset="0xE120" />
-        <Texture Name="object_cs_Tex_00E220" OutName="tex_00E220" Format="i8" Width="32" Height="32" Offset="0xE220"/>
-        <Texture Name="object_cs_Tex_00E620" OutName="tex_00E620" Format="i8" Width="32" Height="32" Offset="0xE620" />
-        <Texture Name="object_cs_Tex_00EA20" OutName="tex_00EA20" Format="i8" Width="32" Height="32" Offset="0xEA20" />
-        <Texture Name="object_cs_Tex_00EE20" OutName="tex_00EE20" Format="i8" Width="32" Height="32" Offset="0xEE20" />
-        <Texture Name="object_cs_Tex_00F220" OutName="tex_00F220" Format="i8" Width="32" Height="32" Offset="0xF220" />
-        <Texture Name="object_cs_Tex_00F620" OutName="tex_00F620" Format="i8" Width="8" Height="8" Offset="0xF620" />
-        <TextureAnimation Name="object_cs_Matanimheader_00F6E4" Offset="0xF6E4" />
-        <Limb Name="object_cs_Standardlimb_00F6EC" Type="Standard" EnumName="OBJECT_CS_LIMB_01" Offset="0xF6EC" />
-        <Limb Name="object_cs_Standardlimb_00F6F8" Type="Standard" EnumName="OBJECT_CS_LIMB_02" Offset="0xF6F8" />
-        <Limb Name="object_cs_Standardlimb_00F704" Type="Standard" EnumName="OBJECT_CS_LIMB_03" Offset="0xF704" />
-        <Limb Name="object_cs_Standardlimb_00F710" Type="Standard" EnumName="OBJECT_CS_LIMB_04" Offset="0xF710" />
-        <Limb Name="object_cs_Standardlimb_00F71C" Type="Standard" EnumName="OBJECT_CS_LIMB_05" Offset="0xF71C" />
-        <Limb Name="object_cs_Standardlimb_00F728" Type="Standard" EnumName="OBJECT_CS_LIMB_06" Offset="0xF728" />
-        <Limb Name="object_cs_Standardlimb_00F734" Type="Standard" EnumName="OBJECT_CS_LIMB_07" Offset="0xF734" />
-        <Limb Name="object_cs_Standardlimb_00F740" Type="Standard" EnumName="OBJECT_CS_LIMB_08" Offset="0xF740" />
-        <Limb Name="object_cs_Standardlimb_00F74C" Type="Standard" EnumName="OBJECT_CS_LIMB_09" Offset="0xF74C" />
-        <Limb Name="object_cs_Standardlimb_00F758" Type="Standard" EnumName="OBJECT_CS_LIMB_0A" Offset="0xF758" />
-        <Limb Name="object_cs_Standardlimb_00F764" Type="Standard" EnumName="OBJECT_CS_LIMB_0B" Offset="0xF764" />
-        <Limb Name="object_cs_Standardlimb_00F770" Type="Standard" EnumName="OBJECT_CS_LIMB_0C" Offset="0xF770" />
-        <Limb Name="object_cs_Standardlimb_00F77C" Type="Standard" EnumName="OBJECT_CS_LIMB_0D" Offset="0xF77C" />
-        <Limb Name="object_cs_Standardlimb_00F788" Type="Standard" EnumName="OBJECT_CS_LIMB_0E" Offset="0xF788" />
-        <Limb Name="object_cs_Standardlimb_00F794" Type="Standard" EnumName="OBJECT_CS_LIMB_0F" Offset="0xF794" />
-        <Limb Name="object_cs_Standardlimb_00F7A0" Type="Standard" EnumName="OBJECT_CS_LIMB_10" Offset="0xF7A0" />
-        <Limb Name="object_cs_Standardlimb_00F7AC" Type="Standard" EnumName="OBJECT_CS_LIMB_11" Offset="0xF7AC" />
-        <Limb Name="object_cs_Standardlimb_00F7B8" Type="Standard" EnumName="OBJECT_CS_LIMB_12" Offset="0xF7B8" />
-        <Limb Name="object_cs_Standardlimb_00F7C4" Type="Standard" EnumName="OBJECT_CS_LIMB_13" Offset="0xF7C4" />
-        <Limb Name="object_cs_Standardlimb_00F7D0" Type="Standard" EnumName="OBJECT_CS_LIMB_14" Offset="0xF7D0" />
-        <Skeleton Name="object_cs_Skel_00F82C" Type="Flex" LimbType="Standard" LimbNone="OBJECT_CS_LIMB_NONE" LimbMax="OBJECT_CS_LIMB_MAX" EnumName="ObjectCsLimb" Offset="0xF82C" />
-        <Animation Name="object_cs_Anim_00FAF4" Offset="0xFAF4" /> <!-- Original name is "csn_wait02" -->
-        <Animation Name="object_cs_Anim_01007C" Offset="0x1007C" /> <!-- Original name is "csn_walk" -->
-        <Animation Name="object_cs_Anim_010B68" Offset="0x10B68" /> <!-- Original name is "csn_yarare" ("to suffer damage") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ctower_rot.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ctower_rot.xml
deleted file mode 100644
index 044443c98..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ctower_rot.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<Root>
-    <!-- Interior clocktower objects including the ceiling cog, rotating corridor, organ, center cog, stone doors, and water wheel  -->
-    <File Name="object_ctower_rot" Segment="6">
-        <!-- TLUTs -->
-        <Texture Name="gClockTowerCeilingCogWoodTLUT" OutName="clocktower_ceiling_cog_wood_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gClockTowerCeilingCogWoodMetalTLUT" OutName="clocktower_ceiling_cog_wood_metal_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20" />
-        <Texture Name="gClockTowerCooridorTLUT" OutName="clocktower_cooridor_tlut" Format="rgba16" Width="16" Height="16" Offset="0x40" />
-        <Texture Name="gClockTowerOrganTLUT" OutName="clocktower_organ_tlut" Format="rgba16" Width="16" Height="16" Offset="0x240" />
-        <Texture Name="gClockTowerStoneDoorTLUT" OutName="clocktower_stone_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x440" />
-
-        <!-- Textures -->
-
-        <!-- CeilingCog -->
-        <Texture Name="gClockTowerCeilingCogWoodTex" OutName="clocktower_ceiling_cog_wood" Format="ci4" Width="64" Height="64" Offset="0x460" />
-        <Texture Name="gClockTowerCeilingCogWoodMetalTex" OutName="clocktower_ceiling_cog_wood_metal" Format="ci4" Width="64" Height="64" Offset="0xC60" />
-        
-        <!-- Corridor -->
-        <Texture Name="gClockTowerCorridorStonePath1Tex" OutName="clocktower_corridor_stone_path_1" Format="ci8" Width="32" Height="32" Offset="0x1460" />
-        <Texture Name="gClockTowerCorridorStonePath2Tex" OutName="clocktower_corridor_stone_path_2" Format="ci8" Width="32" Height="32" Offset="0x1860" />
-        <Texture Name="gClockTowerCorridorStoneWallTex" OutName="clocktower_corridor_stone_wall" Format="ci8" Width="32" Height="64" Offset="0x1C60" />
-        <Texture Name="gClockTowerCorridorGrassyStoneWallTex" OutName="clocktower_corridor_grassy_stone_wall" Format="ci8" Width="32" Height="64" Offset="0x2460" />
-        <Texture Name="gClockTowerCorridorStonePillarTex" OutName="clocktower_corridor_stone_pillar" Format="ci8" Width="32" Height="64" Offset="0x2C60" />
-        <Texture Name="gClockTowerCorridorStoneCeilingTex" OutName="clocktower_corridor_stone_ceiling" Format="ci8" Width="32" Height="64" Offset="0x3460" />
-        <Texture Name="gClockTowerCorridorDirtPathTex" OutName="clocktower_corridor_dirt_path" Format="ci8" Width="32" Height="32" Offset="0x3C60" />
-        <Texture Name="gClockTowerCooridorFoliageTex" OutName="clocktower_corridor_foliage" Format="rgba16" Width="32" Height="64" Offset="0x4060" />
-        <Texture Name="gClockTowerCorridorWoodPillarTex" OutName="clocktower_corridor_wood_pillar" Format="ci8" Width="16" Height="64" Offset="0x5060" />
-        <Texture Name="gClockTowerCorridorWoodWallTex" OutName="clocktower_corridor_wood_wall" Format="ci8" Width="64" Height="32" Offset="0x5460" />
-        <Texture Name="gClockTowerCorridorGrassyCeilingTex" OutName="clocktower_corridor_grassy_ceiling" Format="ci8" Width="8" Height="64" Offset="0x5C60" />
-        <Texture Name="gClockTowerCorridorDirtTex" OutName="clocktower_corridor_dirt" Format="ci8" Width="32" Height="32" Offset="0x5E60" />
-        
-        <!-- Organ -->
-        <Texture Name="gClockTowerOrganBackTex" OutName="clocktower_organ_back" Format="ci8" Width="16" Height="128" Offset="0x6260" />
-        <Texture Name="gClockTowerOrganSeatLegsTex" OutName="clocktower_organ_seat_legs" Format="ia16" Width="32" Height="32" Offset="0x6A60" />
-        <Texture Name="gClockTowerOrganSeatCushionTex" OutName="clocktower_organ_seat_cushion" Format="ci8" Width="16" Height="16" Offset="0x7260" />
-        <Texture Name="gClockTowerOrganSeatBackTex" OutName="clocktower_organ_seat_back" Format="ia16" Width="32" Height="64" Offset="0x7360" />
-        <Texture Name="gClockTowerOrganPedalTex" OutName="clocktower_organ_pedal" Format="ia16" Width="16" Height="16" Offset="0x8360" />
-        <Texture Name="gClockTowerOrganWoodTex" OutName="clocktower_organ_wood" Format="i8" Width="32" Height="32" Offset="0x8560" />
-        <Texture Name="gClockTowerOrganMetalPiece1Tex" OutName="clocktower_organ_metal_piece_1" Format="ia8" Width="64" Height="64" Offset="0x8960" />
-        <Texture Name="gClockTowerOrganMetalPiece2Tex" OutName="clocktower_organ_metal_piece_2" Format="ia8" Width="64" Height="64" Offset="0x9960" />
-        <Texture Name="gClockTowerOrganMetalPiece3Tex" OutName="clocktower_organ_metal_piece_3" Format="ia16" Width="32" Height="32" Offset="0xA960" />
-        <Texture Name="gClockTowerOrganMetalPiece4Tex" OutName="clocktower_organ_metal_piece_4" Format="ia16" Width="32" Height="32" Offset="0xB160" />
-        <Texture Name="gClockTowerOrganMetalPiece5Tex" OutName="clocktower_organ_metal_piece_5" Format="ia16" Width="8" Height="64" Offset="0xB960" />
-        <Texture Name="gClockTowerOrganMetalPiece6Tex" OutName="clocktower_organ_metal_piece_6" Format="ia16" Width="32" Height="32" Offset="0xBD60" />
-        
-        <!-- CenterCog -->
-        <Texture Name="gClockTowerCenterCogBeamTex" OutName="clocktower_center_cog_beam" Format="rgba16" Width="32" Height="32" Offset="0xC560" />
-        <Texture Name="gClockTowerCenterCogTex" OutName="clocktower_center_cog" Format="ia8" Width="64" Height="64" Offset="0xCD60" />
-        
-        <!-- StoneDoors -->
-        <Texture Name="gClockTowerStoneDoorTex" OutName="clocktower_stone_door" Format="ci4" Width="64" Height="64" Offset="0xDD60" />
-        
-        <!-- Waterwheel -->
-        <Texture Name="gClockTowerWaterWheelWoodTex" OutName="clocktower_water_wheel_wood" Format="rgba16" Width="32" Height="32" Offset="0xE560" />
-        <Texture Name="gClockTowerWaterWheelGrassyWoodTex" OutName="clocktower_water_wheel_grassy_wood" Format="rgba16" Width="32" Height="32" Offset="0xED60" />
-        
-        <!-- Organ Pipes -->
-        <Texture Name="gClockTowerOrganPipesThinTex" OutName="clocktower_organ_pipes_thin" Format="ia4" Width="32" Height="32" Offset="0xF560" />
-        <Texture Name="gClockTowerOrganPipesThickTex" OutName="clocktower_organ_pipes_thick" Format="ia4" Width="32" Height="32" Offset="0xF760" />
-
-        <!-- Organ Keys -->
-        <!-- Keys get progressively blurrier-->
-        <Texture Name="gClockTowerOrganKeys1Tex" OutName="clocktower_organ_keys_1" Format="i4" Width="32" Height="16" Offset="0xF960" />
-        <Texture Name="gClockTowerOrganKeys2Tex" OutName="clocktower_organ_keys_2" Format="i4" Width="32" Height="16" Offset="0xFA60" />
-        <Texture Name="gClockTowerOrganKeys3Tex" OutName="clocktower_organ_keys_3" Format="i4" Width="32" Height="16" Offset="0xFB60" />
-        <Texture Name="gClockTowerOrganKeys4Tex" OutName="clocktower_organ_keys_4" Format="i4" Width="32" Height="16" Offset="0xFC60" />
-        
-        <!-- DLists and Collision -->
-
-        <!-- CeilingCog -->
-        <DList Name="gClockTowerEmpty1DL" Offset="0x10820" /> <!-- Original name is "w2_gia_modelT" (probably a mispelling of "gear") -->
-        <DList Name="gClockTowerCeilingCogDL" Offset="0x10828" /> <!-- Original name is "w2_gia_model" -->
-        
-        <!-- Corridor -->
-        <DList Name="gClockTowerCorridorFoliageDL" Offset="0x129D0" />
-        <DList Name="gClockTowerCorridorDL" Offset="0x12DA0" /> <!-- Original name is "w2_hineri_model" ("twist; spin") -->
-        <Collision Name="gClockTowerCorridorCol" Offset="0x142E8" /> <!-- Original name is "w2_hineri_bgdatainfo" -->
-        
-        <!-- Organ -->
-        <DList Name="gClockTowerOrganPipesDL" Offset="0x15F30" /> <!-- Original name is "w2_piano_modelT" -->
-        <DList Name="gClockTowerOrganDL" Offset="0x160A0" /> <!-- Original name is "w2_piano_model" -->
-        <Collision Name="gClockTowerOrganCol" Offset="0x16E70" /> <!-- Original name is "w2_piano_bgdatainfo" -->
-        
-        <!-- CenterCog -->
-        <DList Name="gClockTowerEmpty2DL" Offset="0x17010" /> <!-- Original name is "w2_shaft_modelT" -->
-        <DList Name="gClockTowerCenterCogDL" Offset="0x17018" /> <!-- Original name is "w2_shaft_model" -->
-        
-        <!-- StoneDoorMain -->
-        <DList Name="gClockTowerStoneDoorMainDL" Offset="0x17220" /> <!-- Original name is "w2_shatter_higashi_model" ("higashi" = "east") -->
-        <Collision Name="gClockTowerStoneDoorMainCol" Offset="0x17410" /> <!-- Original name is "w2_shatter_higashi_bgdatainfo" -->
-        
-        <!-- StoneDoor -->
-        <DList Name="gClockTowerStoneDoorDL" Offset="0x174E0" /> <!-- Original name is "w2_shatter_nishi_model" ("nishi" = "west") -->
-        <Collision Name="gClockTowerStoneDoorCol" Offset="0x17650" /> <!-- Original name is "w2_shatter_nishi_bgdatainfo" -->
-        
-        <!-- WaterWheel -->
-        <DList Name="gClockTowerEmpty3DL" Offset="0x18110" /> <!-- Original name is "w2_suisha_modelT" ("water wheel") -->
-        <DList Name="gClockTowerWaterWheelDL" Offset="0x18118" /> <!-- Original name is "w2_suisha_model" -->
-        <Collision Name="gClockTowerWaterWheelCol" Offset="0x18588" /> <!-- Original name is "w2_suisha_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_d_hsblock.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_d_hsblock.xml
deleted file mode 100644
index ee61d0a54..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_d_hsblock.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Assets for the hookshot post -->
-    <File Name="object_d_hsblock" Segment="6">
-        <DList Name="gHookshotPostDL" Offset="0x210" /> <!-- Original name is "field_fshot_model" -->
-        <DList Name="gHookshotTargetDL" Offset="0x470" /> <!-- Original name is "field_fshot2_model" -->
-        <Collision Name="gHookshotTargetCol" Offset="0x578" /> <!-- Original name is "field_fshot2_bgdatainfo" -->
-        <Collision Name="gHookshotPostCol" Offset="0x730" /> <!-- Original name is "field_fshot_bgdatainfo" -->
-        <Texture Name="gHookshotTargetTex" OutName="tex_000760" Format="i4" Width="64" Height="64" Offset="0x760" />
-        <Texture Name="gHookshotPostTex" OutName="tex_000F60" Format="i8" Width="32" Height="64" Offset="0xF60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_d_lift.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_d_lift.xml
deleted file mode 100644
index 868eccd85..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_d_lift.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_d_lift" Segment="6">
-        <DList Name="object_d_lift_DL_000180" Offset="0x180" />
-        <Texture Name="object_d_lift_Tex_000298" OutName="tex_000298" Format="rgba16" Width="32" Height="32" Offset="0x298" />
-        <Collision Name="object_d_lift_Colheader_000BA0" Offset="0xBA0" />
-        <DList Name="gDampeGraveBrownElevatorDL" Offset="0xD10" /> <!-- Original name is "lift_l_model" -->
-        <Collision Name="gDampeGraveBrownElevatorCol" Offset="0xF00" /> <!-- Original name is "lift_l_bgdatainfo" -->
-        <Texture Name="gDampeGraveBrownElevatorSideTex" OutName="brown_elevator_side" Format="i8" Width="64" Height="16" Offset="0xF30" />
-        <Texture Name="gDampeGraveBrownElevatorTopBottomTex" OutName="brown_elevator_top_bottom" Format="i8" Width="64" Height="64" Offset="0x1330" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dai.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dai.xml
deleted file mode 100644
index 927e3f1e1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dai.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<Root>
-    <File Name="object_dai" Segment="6">
-        <Texture Name="object_dai_Tex_000000" OutName="tex_000000" Format="i4" Width="32" Height="32" Offset="0x0" />
-        <DList Name="object_dai_DL_000230" Offset="0x230" />
-        <DList Name="object_dai_DL_0002E8" Offset="0x2E8" /> <!-- Original name is "dai_ball_modelT" -->
-        <Animation Name="object_dai_Anim_000CEC" Offset="0xCEC" /> <!-- Original name is "dg_haku" ("to breathe out​") -->
-        <Animation Name="object_dai_Anim_0010F8" Offset="0x10F8" /> <!-- Original name is "dg_iare" ("are" = "huh?; eh?"") -->
-        <Animation Name="object_dai_Anim_0014BC" Offset="0x14BC" /> <!-- Original name is "dg_iareend" -->
-        <Animation Name="object_dai_Anim_001E44" Offset="0x1E44" /> <!-- Original name is "dg_iareloop" -->
-        <Animation Name="object_dai_Anim_002E58" Offset="0x2E58" /> <!-- Original name is "dg_inemuri" ("nemuri" = "to fall asleep") -->
-        <Animation Name="object_dai_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "dg_isuwaru" ("suwari" = "to sit" )-->
-        <Animation Name="object_dai_Anim_0040E0" Offset="0x40E0" /> <!-- Original name is "dg_isuwaruloop" -->
-        <Animation Name="object_dai_Anim_0048B4" Offset="0x48B4" /> <!-- Original name is "dg_iwait" -->
-        <Animation Name="object_dai_Anim_005100" Offset="0x5100" /> <!-- Original name is "dg_iwalk" -->
-        <Animation Name="object_dai_Anim_00563C" Offset="0x563C" /> <!-- Original name is "dg_korogeoti" ("to fall off; to tumble down​") -->
-        <Animation Name="object_dai_Anim_006590" Offset="0x6590" /> <!-- Original name is "dg_marumari" ("to roll into a ball") -->
-        <Animation Name="object_dai_Anim_0069DC" Offset="0x69DC" /> <!-- Original name is "dg_modoru" ("to return; to go back​") -->
-        <Animation Name="object_dai_Anim_007354" Offset="0x7354" /> <!-- Original name is "dg_tame" ("to amass; to accumulate; to store​") -->
-        <Animation Name="object_dai_Anim_0079E4" Offset="0x79E4" /> <!-- Original name is "dg_wait" -->
-        <DList Name="object_dai_DL_008710" Offset="0x8710" />
-        <DList Name="object_dai_DL_0087B8" Offset="0x87B8" />
-        <DList Name="object_dai_DL_0089D8" Offset="0x89D8" />
-        <DList Name="object_dai_DL_008B00" Offset="0x8B00" />
-        <Texture Name="object_dai_TLUT_008C58" OutName="tlut_008C58" Format="rgba16" Width="16" Height="16" Offset="0x8C58" />
-        <Texture Name="object_dai_Tex_008E58" OutName="tex_008E58" Format="ci8" Width="32" Height="32" Offset="0x8E58" />
-        <Texture Name="object_dai_Tex_009258" OutName="tex_009258" Format="ci8" Width="8" Height="8" Offset="0x9258" />
-        <Texture Name="object_dai_Tex_009298" OutName="tex_009298" Format="ci8" Width="32" Height="16" Offset="0x9298" />
-        <Texture Name="object_dai_Tex_009498" OutName="tex_009498" Format="rgba16" Width="16" Height="16" Offset="0x9498" />
-        <Texture Name="object_dai_Tex_009698" OutName="tex_009698" Format="ci8" Width="8" Height="8" Offset="0x9698" />
-        <DList Name="object_dai_DL_00C538" Offset="0xC538" />
-        <DList Name="object_dai_DL_00C5D8" Offset="0xC5D8" />
-        <DList Name="object_dai_DL_00C9B8" Offset="0xC9B8" />
-        <DList Name="object_dai_DL_00D068" Offset="0xD068" />
-        <DList Name="object_dai_DL_00D400" Offset="0xD400" />
-        <DList Name="object_dai_DL_00D588" Offset="0xD588" />
-        <DList Name="object_dai_DL_00D6C0" Offset="0xD6C0" />
-        <DList Name="object_dai_DL_00D948" Offset="0xD948" />
-        <DList Name="object_dai_DL_00DAD0" Offset="0xDAD0" />
-        <DList Name="object_dai_DL_00DC08" Offset="0xDC08" />
-        <DList Name="object_dai_DL_00DE18" Offset="0xDE18" />
-        <DList Name="object_dai_DL_00DF78" Offset="0xDF78" />
-        <DList Name="object_dai_DL_00E068" Offset="0xE068" />
-        <DList Name="object_dai_DL_00E1A0" Offset="0xE1A0" />
-        <DList Name="object_dai_DL_00E470" Offset="0xE470" />
-        <DList Name="object_dai_DL_00E560" Offset="0xE560" />
-        <DList Name="object_dai_DL_00E698" Offset="0xE698" />
-        <Texture Name="object_dai_TLUT_00E8F0" OutName="tlut_00E8F0" Format="rgba16" Width="16" Height="16" Offset="0xE8F0" />
-        <Texture Name="object_dai_Tex_00EAF0" OutName="tex_00EAF0" Format="ci8" Width="16" Height="16" Offset="0xEAF0" />
-        <Texture Name="object_dai_Tex_00EBF0" OutName="tex_00EBF0" Format="ci8" Width="16" Height="16" Offset="0xEBF0" />
-        <Texture Name="object_dai_Tex_00ECF0" OutName="tex_00ECF0" Format="ci8" Width="32" Height="32" Offset="0xECF0" />
-        <Texture Name="object_dai_Tex_00F0F0" OutName="tex_00F0F0" Format="ci8" Width="32" Height="16" Offset="0xF0F0" />
-        <Texture Name="object_dai_Tex_00F2F0" OutName="tex_00F2F0" Format="ci8" Width="32" Height="32" Offset="0xF2F0" />
-        <Texture Name="object_dai_Tex_00F6F0" OutName="tex_00F6F0" Format="ci8" Width="8" Height="8" Offset="0xF6F0" />
-        <Texture Name="object_dai_Tex_00F730" OutName="tex_00F730" Format="ci8" Width="8" Height="16" Offset="0xF730" />
-        <Texture Name="object_dai_Tex_00F7B0" OutName="tex_00F7B0" Format="ci8" Width="32" Height="64" Offset="0xF7B0" />
-        <Texture Name="object_dai_Tex_00FFB0" OutName="tex_00FFB0" Format="ci8" Width="16" Height="16" Offset="0xFFB0" />
-        <Texture Name="object_dai_Tex_0100B0" OutName="tex_0100B0" Format="rgba16" Width="8" Height="8" Offset="0x100B0" />
-        <Texture Name="object_dai_Tex_010130" OutName="tex_010130" Format="rgba16" Width="16" Height="16" Offset="0x10130" />
-        <Texture Name="object_dai_Tex_010330" OutName="tex_010330" Format="rgba16" Width="8" Height="8" Offset="0x10330" />
-        <Texture Name="object_dai_Tex_0103B0" OutName="tex_0103B0" Format="rgba16" Width="32" Height="16" Offset="0x103B0" />
-        <Texture Name="object_dai_Tex_0107B0" OutName="tex_0107B0" Format="rgba16" Width="32" Height="32" Offset="0x107B0" />
-        <Texture Name="object_dai_Tex_010FB0" OutName="tex_010FB0" Format="rgba16" Width="32" Height="32" Offset="0x10FB0" />
-        <Texture Name="object_dai_Tex_0117B0" OutName="tex_0117B0" Format="rgba16" Width="32" Height="32" Offset="0x117B0" />
-        <Texture Name="object_dai_Tex_011FB0" OutName="tex_011FB0" Format="rgba16" Width="32" Height="32" Offset="0x11FB0" />
-        <Texture Name="object_dai_Tex_0127B0" OutName="tex_0127B0" Format="rgba16" Width="32" Height="32" Offset="0x127B0" />
-        <Limb Name="object_dai_Standardlimb_012FB0" Type="Standard" EnumName="OBJECT_DAI_LIMB_01" Offset="0x12FB0" />
-        <Limb Name="object_dai_Standardlimb_012FBC" Type="Standard" EnumName="OBJECT_DAI_LIMB_02" Offset="0x12FBC" />
-        <Limb Name="object_dai_Standardlimb_012FC8" Type="Standard" EnumName="OBJECT_DAI_LIMB_03" Offset="0x12FC8" />
-        <Limb Name="object_dai_Standardlimb_012FD4" Type="Standard" EnumName="OBJECT_DAI_LIMB_04" Offset="0x12FD4" />
-        <Limb Name="object_dai_Standardlimb_012FE0" Type="Standard" EnumName="OBJECT_DAI_LIMB_05" Offset="0x12FE0" />
-        <Limb Name="object_dai_Standardlimb_012FEC" Type="Standard" EnumName="OBJECT_DAI_LIMB_06" Offset="0x12FEC" />
-        <Limb Name="object_dai_Standardlimb_012FF8" Type="Standard" EnumName="OBJECT_DAI_LIMB_07" Offset="0x12FF8" />
-        <Limb Name="object_dai_Standardlimb_013004" Type="Standard" EnumName="OBJECT_DAI_LIMB_08" Offset="0x13004" />
-        <Limb Name="object_dai_Standardlimb_013010" Type="Standard" EnumName="OBJECT_DAI_LIMB_09" Offset="0x13010" />
-        <Limb Name="object_dai_Standardlimb_01301C" Type="Standard" EnumName="OBJECT_DAI_LIMB_0A" Offset="0x1301C" />
-        <Limb Name="object_dai_Standardlimb_013028" Type="Standard" EnumName="OBJECT_DAI_LIMB_0B" Offset="0x13028" />
-        <Limb Name="object_dai_Standardlimb_013034" Type="Standard" EnumName="OBJECT_DAI_LIMB_0C" Offset="0x13034" />
-        <Limb Name="object_dai_Standardlimb_013040" Type="Standard" EnumName="OBJECT_DAI_LIMB_0D" Offset="0x13040" />
-        <Limb Name="object_dai_Standardlimb_01304C" Type="Standard" EnumName="OBJECT_DAI_LIMB_0E" Offset="0x1304C" />
-        <Limb Name="object_dai_Standardlimb_013058" Type="Standard" EnumName="OBJECT_DAI_LIMB_0F" Offset="0x13058" />
-        <Limb Name="object_dai_Standardlimb_013064" Type="Standard" EnumName="OBJECT_DAI_LIMB_10" Offset="0x13064" />
-        <Limb Name="object_dai_Standardlimb_013070" Type="Standard" EnumName="OBJECT_DAI_LIMB_11" Offset="0x13070" />
-        <Limb Name="object_dai_Standardlimb_01307C" Type="Standard" EnumName="OBJECT_DAI_LIMB_12" Offset="0x1307C" />
-        <Skeleton Name="object_dai_Skel_0130D0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DAI_LIMB_NONE" LimbMax="OBJECT_DAI_LIMB_MAX" EnumName="ObjectDaiLimb" Offset="0x130D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_daiku.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_daiku.xml
deleted file mode 100644
index 0152a6e7d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_daiku.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<Root>
-    <File Name="object_daiku" Segment="6">
-        <Animation Name="object_daiku_Anim_000600" Offset="0x600" /> <!-- Original name is "dk2_hanasi" ("talk") -->
-        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44" /> <!-- Original name is "dk2_hashiru" ("to run​") -->
-        <Animation Name="object_daiku_Anim_001114" Offset="0x1114" /> <!-- Original name is "dk2_katugi" ("to carry") -->
-        <Animation Name="object_daiku_Anim_001A24" Offset="0x1A24" /> <!-- Original name is "dk2_kowasu" ("to break; to destroy; to demolish​") -->
-        <Animation Name="object_daiku_Anim_002134" Offset="0x2134" /> <!-- Original name is "dk2_kowasu2wait" -->
-        <Animation Name="object_daiku_Anim_002FA0" Offset="0x2FA0" /> <!-- Original name is "dk2_matsu" ("to wait​") -->
-        <Texture Name="object_daiku_TLUT_002FB0" OutName="tlut_002FB0" Format="rgba16" Width="16" Height="16" Offset="0x2FB0" />
-        <Texture Name="object_daiku_Tex_0031B0" OutName="tex_0031B0" Format="ci8" Width="8" Height="8" Offset="0x31B0" />
-        <Texture Name="object_daiku_Tex_0031F0" OutName="tex_0031F0" Format="ci8" Width="16" Height="16" Offset="0x31F0" />
-        <Texture Name="object_daiku_Tex_0032F0" OutName="tex_0032F0" Format="rgba16" Width="4" Height="4" Offset="0x32F0" />
-        <Texture Name="object_daiku_Tex_003310" OutName="tex_003310" Format="ci8" Width="8" Height="16" Offset="0x3310" />
-        <Texture Name="object_daiku_Tex_003390" OutName="tex_003390" Format="ci8" Width="8" Height="8" Offset="0x3390" />
-        <Texture Name="object_daiku_Tex_0033D0" OutName="tex_0033D0" Format="ci8" Width="16" Height="16" Offset="0x33D0" />
-        <Texture Name="object_daiku_Tex_0034D0" OutName="tex_0034D0" Format="ci8" Width="8" Height="8" Offset="0x34D0" />
-        <Texture Name="object_daiku_Tex_003510" OutName="tex_003510" Format="rgba16" Width="32" Height="32" Offset="0x3510" />
-        <Texture Name="object_daiku_Tex_003D10" OutName="tex_003D10" Format="ci8" Width="16" Height="16" Offset="0x3D10" />
-        <Texture Name="object_daiku_Tex_003E10" OutName="tex_003E10" Format="ci8" Width="8" Height="8" Offset="0x3E10" />
-        <Texture Name="object_daiku_Tex_003E50" OutName="tex_003E50" Format="ci8" Width="8" Height="8" Offset="0x3E50" />
-        <Texture Name="object_daiku_Tex_003E90" OutName="tex_003E90" Format="ci8" Width="8" Height="8" Offset="0x3E90" />
-        <DList Name="object_daiku_DL_006980" Offset="0x6980" />
-        <DList Name="object_daiku_DL_006D70" Offset="0x6D70" />
-        <DList Name="object_daiku_DL_006E80" Offset="0x6E80" />
-        <DList Name="object_daiku_DL_006FB0" Offset="0x6FB0" />
-        <DList Name="object_daiku_DL_0070C0" Offset="0x70C0" />
-        <DList Name="object_daiku_DL_0071E0" Offset="0x71E0" />
-        <DList Name="object_daiku_DL_007700" Offset="0x7700" />
-        <DList Name="object_daiku_DL_007A10" Offset="0x7A10" />
-        <DList Name="object_daiku_DL_007B40" Offset="0x7B40" />
-        <DList Name="object_daiku_DL_007C70" Offset="0x7C70" />
-        <DList Name="object_daiku_DL_007DE0" Offset="0x7DE0" />
-        <DList Name="object_daiku_DL_007F10" Offset="0x7F10" />
-        <DList Name="object_daiku_DL_008040" Offset="0x8040" />
-        <DList Name="object_daiku_DL_0081B0" Offset="0x81B0" />
-        <DList Name="object_daiku_DL_0083A0" Offset="0x83A0" />
-        <DList Name="object_daiku_DL_008648" Offset="0x8648" />
-        <DList Name="object_daiku_DL_008758" Offset="0x8758" />
-        <DList Name="object_daiku_DL_008870" Offset="0x8870" />
-        <DList Name="object_daiku_DL_008B20" Offset="0x8B20" />
-        <DList Name="object_daiku_DL_008C30" Offset="0x8C30" />
-        <DList Name="object_daiku_DL_008EC8" Offset="0x8EC8" /> <!-- Original name is "dk2_hashira_model" -->
-        <Texture Name="object_daiku_TLUT_008FA8" OutName="tlut_008FA8" Format="rgba16" Width="16" Height="16" Offset="0x8FA8" />
-        <Texture Name="object_daiku_Tex_0091A8" OutName="tex_0091A8" Format="ci8" Width="16" Height="16" Offset="0x91A8" />
-        <DList Name="object_daiku_DL_009638" Offset="0x9638" /> <!-- Original name is "dk2_2_turuhashi_model" -->
-        <Texture Name="object_daiku_TLUT_0097B0" OutName="tlut_0097B0" Format="rgba16" Width="16" Height="16" Offset="0x97B0" />
-        <Texture Name="object_daiku_Tex_0099B0" OutName="tex_0099B0" Format="i8" Width="32" Height="32" Offset="0x99B0" />
-        <Texture Name="object_daiku_Tex_009DB0" OutName="tex_009DB0" Format="ci8" Width="16" Height="16" Offset="0x9DB0" />
-        <DList Name="object_daiku_DL_00A390" Offset="0xA390" />
-        <Texture Name="object_daiku_TLUT_00A4D0" OutName="tlut_00A4D0" Format="rgba16" Width="16" Height="16" Offset="0xA4D0" />
-        <Texture Name="object_daiku_Tex_00A6D0" OutName="tex_00A6D0" Format="ci8" Width="8" Height="16" Offset="0xA6D0" />
-        <Limb Name="object_daiku_Standardlimb_00A750" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_01" Offset="0xA750" />
-        <Limb Name="object_daiku_Standardlimb_00A75C" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_02" Offset="0xA75C" />
-        <Limb Name="object_daiku_Standardlimb_00A768" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_03" Offset="0xA768" />
-        <Limb Name="object_daiku_Standardlimb_00A774" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_04" Offset="0xA774" />
-        <Limb Name="object_daiku_Standardlimb_00A780" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_05" Offset="0xA780" />
-        <Limb Name="object_daiku_Standardlimb_00A78C" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_06" Offset="0xA78C" />
-        <Limb Name="object_daiku_Standardlimb_00A798" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_07" Offset="0xA798" />
-        <Limb Name="object_daiku_Standardlimb_00A7A4" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_08" Offset="0xA7A4" />
-        <Limb Name="object_daiku_Standardlimb_00A7B0" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_09" Offset="0xA7B0" />
-        <Limb Name="object_daiku_Standardlimb_00A7BC" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0A" Offset="0xA7BC" />
-        <Limb Name="object_daiku_Standardlimb_00A7C8" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0B" Offset="0xA7C8" />
-        <Limb Name="object_daiku_Standardlimb_00A7D4" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0C" Offset="0xA7D4" />
-        <Limb Name="object_daiku_Standardlimb_00A7E0" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0D" Offset="0xA7E0" />
-        <Limb Name="object_daiku_Standardlimb_00A7EC" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0E" Offset="0xA7EC" />
-        <Limb Name="object_daiku_Standardlimb_00A7F8" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0F" Offset="0xA7F8" />
-        <Limb Name="object_daiku_Standardlimb_00A804" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_10" Offset="0xA804" />
-        <Skeleton Name="object_daiku_Skel_00A850" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DAIKU_LIMB_NONE" LimbMax="OBJECT_DAIKU_LIMB_MAX" EnumName="ObjectDaikuLimb" Offset="0xA850" />
-        <Animation Name="object_daiku_Anim_00ACD0" Offset="0xACD0" /> <!-- Original name is "dk2_roya" -->
-        <Animation Name="object_daiku_Anim_00B690" Offset="0xB690" /> <!-- Original name is "dk2_shiji" (perhaps "instructions; directions​"?) -->
-        <Animation Name="object_daiku_Anim_00BEAC" Offset="0xBEAC" /> <!-- Original name is "dk2_shiji02" -->
-        <Animation Name="object_daiku_Anim_00C234" Offset="0xC234" /> <!-- Original name is "dk2_suwari" ("sitting") -->
-        <Animation Name="object_daiku_Anim_00C92C" Offset="0xC92C" /> <!-- Original name is "dk2_tasuke" ("to save; to rescue​") -->
-        <Animation Name="object_daiku_Anim_00D328" Offset="0xD328" /> <!-- Original name is "dk2_turuwait" ("turu" = "to hang; to suspend; to sling") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_danpei_object.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_danpei_object.xml
deleted file mode 100644
index 8e86f2f79..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_danpei_object.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <File Name="object_danpei_object" Segment="6">
-        <DList Name="object_danpei_object_DL_000300" Offset="0x300" />
-        <Texture Name="object_danpei_object_TLUT_000438" OutName="tlut_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" />
-        <Texture Name="object_danpei_object_Tex_000458" OutName="tex_000458" Format="ci4" Width="64" Height="64" Offset="0x458" />
-        <Collision Name="object_danpei_object_Colheader_000D60" Offset="0xD60" /> <!-- Original name is "y2_kanokefuta_bgdatainfo" -->
-        <DList Name="object_danpei_object_DL_0012C0" Offset="0x12C0" /> <!-- Original name is "Y2_DP2_RASENsita_model" ("rasen" = "spiral", "sita" = "below") -->
-        <DList Name="object_danpei_object_DL_002110" Offset="0x2110" /> <!-- Original name is "Y2_DP2_RASENue_model" ("ue" = "above") -->
-        <Texture Name="object_danpei_object_TLUT_002B10" OutName="tlut_002B10" Format="rgba16" Width="16" Height="16" Offset="0x2B10" />
-        <Texture Name="object_danpei_object_Tex_002D10" OutName="tex_002D10" Format="ci8" Width="32" Height="64" Offset="0x2D10" />
-        <Texture Name="object_danpei_object_Tex_003510" OutName="tex_003510" Format="ci8" Width="32" Height="32" Offset="0x3510" />
-        <Texture Name="object_danpei_object_Tex_003910" OutName="tex_003910" Format="ci8" Width="32" Height="32" Offset="0x3910" />
-        <Texture Name="object_danpei_object_Tex_003D10" OutName="tex_003D10" Format="ci8" Width="16" Height="16" Offset="0x3D10" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dblue_object.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dblue_object.xml
deleted file mode 100644
index 63d28bd33..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dblue_object.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<Root>
-    <!-- Assets for interactive elements in Great Bay Temple, i.e., waterwheels, seesaws, whirlpools, waterfalls, doors, etc. -->
-    <File Name="object_dblue_object" Segment="6">
-        <!-- DisplayLists and Collision for the elevator platforms. -->
-        <DList Name="gGreatBayTempleObjectElevatorEmptyDL" Offset="0x2C0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectElevatorDL" Offset="0x2C8" /> <!-- Original name is "m2_KON_ELE_model" -->
-        <Collision Name="gGreatBayTempleObjectElevatorCol" Offset="0x5C4" /> <!-- Original name is "m2_KON_ELE_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the rotating waterwheel with two platforms. -->
-        <DList Name="gGreatBayTempleObjectWaterwheelWithPlatformsEmptyDL" Offset="0x1E60" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectWaterwheelWithPlatformsDL" Offset="0x1E68" /> <!-- Original name is "m2_KON_GEAR09_model" -->
-        <Collision Name="gGreatBayTempleObjectWaterwheelWithPlatformsCol" Offset="0x2E78" /> <!-- Original name is "m2_KON_GEAR09_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the ice stalactites that can be thawed with Fire Arrows.  -->
-        <DList Name="gGreatBayTempleObjectIceStalactiteRimDL" Offset="0x3250" />
-        <DList Name="gGreatBayTempleObjectIceStalactiteDL" Offset="0x3358" /> <!-- Original name is "m2_KON_ICE_model" -->
-        <Collision Name="gGreatBayTempleObjectIceStalactiteCol" Offset="0x3540" /> <!-- Unused. Original name is "m2_KON_ICE_bgdatainfo" -->
-
-        <!-- DisplayLists for the frozen version of the waterfall that briefly appears when you hit it with an Ice Arrow. -->
-        <DList Name="gGreatBayTempleObjectFrozenWaterfallDL" Offset="0x3770" />
-        <DList Name="gGreatBayTempleObjectFrozenWaterfallEmptyDL" Offset="0x38D0" /> <!-- Probably was the opaque component for the above DL -->
-
-        <!-- DisplayLists and Collision for the rotating gear shaft, both with and without two platforms. -->
-        <DList Name="gGreatBayTempleObjectGearShaftWithPlatformsEmptyDL" Offset="0x4840" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectGearShaftWithPlatformsDL" Offset="0x4848" /> <!-- Original name is "m2_KON_Screw_model" -->
-        <DList Name="gGreatBayTempleObjectGearShaftEmptyDL" Offset="0x52B0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectGearShaftDL" Offset="0x52B8" /> <!-- Original name is "m2_KON_ScrewFor8_model" -->
-        <Collision Name="gGreatBayTempleObjectGearShaftWithPlatformsCol" Offset="0x5D28" /> <!-- Original name is "m2_KON_Screw_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the switches that can be pushed or pulled. -->
-        <DList Name="gGreatBayTempleObjectOneWaySwitchEmptyDL" Offset="0x61B0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectOneWaySwitchDL" Offset="0x61B8" /> <!-- Original name is "m2_KON_Sen_model" (perhaps "tap; faucet") -->
-        <DList Name="gGreatBayTempleObjectTwoWaySwitchEmptyDL" Offset="0x69D0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectTwoWaySwitchDL" Offset="0x69D8" /> <!-- Original name is "m2_KON_SenP2_model" -->
-        <Collision Name="gGreatBayTempleObjectTwoWaySwitchCol" Offset="0x6EA8" /> <!-- Original name is "m2_KON_SenP2_bgdatainfo" -->
-        <Collision Name="gGreatBayTempleObjectOneWaySwitchCol" Offset="0x714C" /> <!-- Original name is "m2_KON_Sen_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the giant waterwheel near the start of the dungeon. -->
-        <DList Name="gGreatBayTempleObjectWaterwheelEmptyDL" Offset="0x8770" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectWaterwheelDL" Offset="0x8778" /> <!-- Original name is "m2_KON_SuisyaFor0_model" ("waterwheel") -->
-        <DList Name="gGreatBayTempleObjectWaterwheelWithFakeGearEmptyDL" Offset="0xA520" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectWaterwheelWithFakeGearDL" Offset="0xA528" /> <!-- Original name is "m2_KON_SuisyaFor8_model" -->
-        <Collision Name="gGreatBayTempleObjectWaterwheelCol" Offset="0xAED0" /> <!-- Original name is "m2_KON_SuisyaFor8_bgdatainfo" -->
-
-        <!-- DisplayLists and TextureAnimation for the waterfalls that can be frozen with Ice Arrows. -->
-        <DList Name="gGreatBayTempleObjectWaterfallDL" Offset="0xB280" /> <!-- Original name is "m2_KON_TAKI_modelT" ("waterfall​") -->
-        <DList Name="gGreatBayTempleObjectWaterfallEmptyDL" Offset="0xB430" /> <!-- Probably was the opaque component for the above DL -->
-        <TextureAnimation Name="gGreatBayTempleObjectWaterfallTexAnim" Offset="0xB448" />
-
-        <!-- DisplayLists and Collision for the "shaft" of the seesaw, i.e., the bar that connects the two platforms. -->
-        <DList Name="gGreatBayTempleObjectSeesawShaftEmptyDL" Offset="0xB8F0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectSeesawShaftDL" Offset="0xB8F8" /> <!-- Original name is "m2_KON_TENBIN_model" ("(balance) scales​") -->
-        <Collision Name="gGreatBayTempleObjectSeesawShaftCol" Offset="0xBC08" /> <!-- Original name is "m2_KON_TENBIN_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the large seesaw platform. -->
-        <DList Name="gGreatBayTempleObjectLargeSeesawPlatformEmptyDL" Offset="0xBF40" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectLargeSeesawPlatformDL" Offset="0xBF48" /> <!-- Original name is "m2_KON_TENBINstepBIG_model" -->
-        <Collision Name="gGreatBayTempleObjectLargeSeesawPlatformCol" Offset="0xC180" /> <!-- Original name is "m2_KON_TENBINstepBIG_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the small seesaw platform. -->
-        <DList Name="gGreatBayTempleObjectSmallSeesawPlatformEmptyDL" Offset="0xC4B0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectSmallSeesawPlatformDL" Offset="0xC4B8" /> <!-- Original name is "m2_KON_TENBINstepSML_model" -->
-        <Collision Name="gGreatBayTempleObjectSmallSeesawPlatformCol" Offset="0xC700" /> <!-- Original name is "m2_KON_TENBINstepSML_bgdatainfo" -->
-
-        <!-- DisplayLists and TextureAnimation for the large whirlpool at the bottom of the main room. -->
-        <DList Name="gGreatBayTempleObjectWhirlpoolDL" Offset="0xCAA0" /> <!-- Original name is "m2_KON_UZUdis_modelT" ("whirlpool; swirl") -->
-        <DList Name="gGreatBayTempleObjectWhirlpoolEmptyDL" Offset="0xCC08" /> <!-- Probably was the opaque component for the above DL -->
-        <TextureAnimation Name="gGreatBayTempleObjectWhirlpoolTexAnim" Offset="0xCC18" />
-
-        <!-- DisplayLists and TextureAnimation for the splashing effect created when water hits a waterwheel. -->
-        <DList Name="gGreatBayTempleObjectWaterwheelSplashDL" Offset="0xCD10" /> <!-- Original name is "m2_KON_sibukiG_modelT" (probably "splash" + GEAR) -->
-        <DList Name="gGreatBayTempleObjectWaterwheelSplashEmptyDL" Offset="0xCDD8" /> <!-- Probably was the opaque component for the above DL -->
-        <TextureAnimation Name="gGreatBayTempleObjectWaterwheelSplashTexAnim" Offset="0xCE00" />
-        
-        <!-- DisplayLists and TextureAnimation for the splashing effect created when water hits a seesaw platform. -->
-        <DList Name="gGreatBayTempleObjectSeesawSplashDL" Offset="0xD110" /> <!-- Original name is "m2_KON_sibukiT_modelT" (probably "splash" + TENBIN) -->
-        <DList Name="gGreatBayTempleObjectSeesawSplashEmptyDL" Offset="0xD220" /> <!-- Probably was the opaque component for the above DL -->
-        <TextureAnimation Name="gGreatBayTempleObjectSeesawSplashTexAnim" Offset="0xD250" />
-
-        <Collision Name="gGreatBayTempleObjectUnusedCol" Offset="0xD3DC" /> <!-- Original name is probably "m2_SEAuzuuzu2_bgdatainfo" ("itching to do something; impatient") -->
-
-        <!-- Textures for all the Great Bay Temple objects. -->
-        <Texture Name="gGreatBayTempleObjectOneWaySwitchTLUT" OutName="great_bay_temple_object_one_way_switch_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD410" />
-        <Texture Name="gGreatBayTempleObjectUnused1TLUT" OutName="great_bay_temple_object_unused_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0xD430" />
-        <Texture Name="gGreatBayTempleObjectUnused2TLUT" OutName="great_bay_temple_object_unused_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xD450" />
-        <Texture Name="gGreatBayTempleObjectUnused3TLUT" OutName="great_bay_temple_object_unused_tlut_3" Format="rgba16" Width="4" Height="4" Offset="0xD470" />
-        <Texture Name="gGreatBayTempleObjectUnused4TLUT" OutName="great_bay_temple_object_unused_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0xD490" />
-        <Texture Name="gGreatBayTempleObjectUnused5TLUT" OutName="great_bay_temple_object_unused_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xD4B0" />
-        <Texture Name="gGreatBayTempleObjectUnused6TLUT" OutName="great_bay_temple_object_unused_tlut_6" Format="rgba16" Width="4" Height="4" Offset="0xD4D0" />
-        <Texture Name="gGreatBayTempleObjectUnused7TLUT" OutName="great_bay_temple_object_unused_tlut_7" Format="rgba16" Width="4" Height="4" Offset="0xD4F0" />
-        <Texture Name="gGreatBayTempleObjectUnused8TLUT" OutName="great_bay_temple_object_unused_tlut_8" Format="rgba16" Width="4" Height="4" Offset="0xD510" />
-        <Texture Name="gGreatBayTempleObjectUnusedGearTLUT" OutName="great_bay_temple_object_unused_gear_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD530" />
-        <Texture Name="gGreatBayTempleObjectUnused9TLUT" OutName="great_bay_temple_object_unused_tlut_9" Format="rgba16" Width="4" Height="4" Offset="0xD550" />
-        <Texture Name="gGreatBayTempleObjectUnused10TLUT" OutName="great_bay_temple_object_unused_tlut_10" Format="rgba16" Width="4" Height="4" Offset="0xD570" />
-        <Texture Name="gGreatBayTempleObjectUnused11TLUT" OutName="great_bay_temple_object_unused_tlut_11" Format="rgba16" Width="4" Height="4" Offset="0xD590" />
-        <Texture Name="gGreatBayTempleObjectUnused12TLUT" OutName="great_bay_temple_object_unused_tlut_12" Format="rgba16" Width="4" Height="4" Offset="0xD5B0" />
-        <Texture Name="gGreatBayTempleObjectUnused13TLUT" OutName="great_bay_temple_object_unused_tlut_13" Format="rgba16" Width="4" Height="4" Offset="0xD5D0" />
-        <Texture Name="gGreatBayTempleObjectUnused14TLUT" OutName="great_bay_temple_object_unused_tlut_14" Format="rgba16" Width="4" Height="4" Offset="0xD5F0" />
-        <Texture Name="gGreatBayTempleObjectUnused15TLUT" OutName="great_bay_temple_object_unused_tlut_15" Format="rgba16" Width="4" Height="4" Offset="0xD610" />
-        <Texture Name="gGreatBayTempleObjectUnusedDarkMetalTLUT" OutName="great_bay_temple_object_unused_dark_metal_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD630" />
-        <Texture Name="gGreatBayTempleObjectUnused16TLUT" OutName="great_bay_temple_object_unused_tlut_16" Format="rgba16" Width="4" Height="4" Offset="0xD650" />
-        <Texture Name="gGreatBayTempleObjectUnusedPaddleTLUT" OutName="great_bay_temple_object_unused_paddle_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD670" /> 
-        <Texture Name="gGreatBayTempleObjectUnused17TLUT" OutName="great_bay_temple_object_unused_tlut_17" Format="rgba16" Width="4" Height="4" Offset="0xD690" /> 
-        <Texture Name="gGreatBayTempleObjectUnused18TLUT" OutName="great_bay_temple_object_unused_tlut_18" Format="rgba16" Width="4" Height="4" Offset="0xD6B0" />
-        <Texture Name="gGreatBayTempleObjectUnused19TLUT" OutName="great_bay_temple_object_unused_tlut_19" Format="rgba16" Width="4" Height="4" Offset="0xD6D0" />
-        <Texture Name="gGreatBayTempleObjectUnused20TLUT" OutName="great_bay_temple_object_unused_tlut_20" Format="rgba16" Width="4" Height="4" Offset="0xD6F0" /> 
-        <Texture Name="gGreatBayTempleObjectUnused21TLUT" OutName="great_bay_temple_object_unused_tlut_21" Format="rgba16" Width="4" Height="4" Offset="0xD710" /> 
-        <Texture Name="gGreatBayTempleObjectUnused22TLUT" OutName="great_bay_temple_object_unused_tlut_22" Format="rgba16" Width="4" Height="4" Offset="0xD730" /> 
-        <Texture Name="gGreatBayTempleObjectUnused23TLUT" OutName="great_bay_temple_object_unused_tlut_23" Format="rgba16" Width="4" Height="4" Offset="0xD750" /> 
-        <Texture Name="gGreatBayTempleObjectUnused24TLUT" OutName="great_bay_temple_object_unused_tlut_24" Format="rgba16" Width="4" Height="4" Offset="0xD770" /> 
-        <Texture Name="gGreatBayTempleObjectUnused25TLUT" OutName="great_bay_temple_object_unused_tlut_25" Format="rgba16" Width="4" Height="4" Offset="0xD790" /> 
-        <Texture Name="gGreatBayTempleObjectUnused26TLUT" OutName="great_bay_temple_object_unused_tlut_26" Format="rgba16" Width="4" Height="4" Offset="0xD7B0" /> 
-        <Texture Name="gGreatBayTempleObjectUnused27TLUT" OutName="great_bay_temple_object_unused_tlut_27" Format="rgba16" Width="4" Height="4" Offset="0xD7D0" /> 
-        <Texture Name="gGreatBayTempleObjectUnused28TLUT" OutName="great_bay_temple_object_unused_tlut_28" Format="rgba16" Width="4" Height="4" Offset="0xD7F0" /> 
-        <Texture Name="gGreatBayTempleObjectUnused29TLUT" OutName="great_bay_temple_object_unused_tlut_29" Format="rgba16" Width="4" Height="4" Offset="0xD810" /> 
-        <Texture Name="gGreatBayTempleObjectUnused30TLUT" OutName="great_bay_temple_object_unused_tlut_30" Format="rgba16" Width="4" Height="4" Offset="0xD830" /> 
-        <Texture Name="gGreatBayTempleObjectLargeSeesawPlatformTLUT" OutName="great_bay_temple_object_large_seesaw_platform_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD850" />
-        <Texture Name="gGreatBayTempleObjectUnused31TLUT" OutName="great_bay_temple_object_unused_tlut_31" Format="rgba16" Width="4" Height="4" Offset="0xD870" />
-        <Texture Name="gGreatBayTempleObjectUnused32TLUT" OutName="great_bay_temple_object_unused_tlut_32" Format="rgba16" Width="4" Height="4" Offset="0xD890" />
-        <Texture Name="gGreatBayTempleObjectUnused33TLUT" OutName="great_bay_temple_object_unused_tlut_33" Format="rgba16" Width="4" Height="4" Offset="0xD8B0" />
-        <Texture Name="gGreatBayTempleObjectPlatformSideAndSeesawShaftTex" OutName="great_bay_temple_object_platform_side_and_seesaw_shaft" Format="rgba16" Width="16" Height="64" Offset="0xD8D0" />
-        <Texture Name="gGreatBayTempleObjectElevatorRiserTex" OutName="great_bay_temple_object_elevator_riser" Format="rgba16" Width="8" Height="16" Offset="0xE0D0" />
-        <Texture Name="gGreatBayTempleObjectPlatformAndWaterwheelBladeTex" OutName="great_bay_temple_object_platform_and_waterwheel_blade" Format="rgba16" Width="32" Height="64" Offset="0xE1D0" />
-        <Texture Name="gGreatBayTempleObjectDarkMetalTex" OutName="great_bay_temple_object_dark_metal" Format="rgba16" Width="16" Height="32" Offset="0xF1D0" />
-        <Texture Name="gGreatBayTempleObjectShaftTex" OutName="great_bay_temple_object_shaft" Format="rgba16" Width="16" Height="64" Offset="0xF5D0" />
-        <Texture Name="gGreatBayTempleObjectGearTex" OutName="great_bay_temple_object_gear" Format="rgba16" Width="16" Height="32" Offset="0xFDD0" />
-        <Texture Name="gGreatBayTempleObjectPaddleTex" OutName="great_bay_temple_object_paddle" Format="rgba16" Width="32" Height="64" Offset="0x101D0" />
-        <Texture Name="gGreatBayTempleObjectSwitchKnobTex" OutName="great_bay_temple_object_switch_knob" Format="rgba16" Width="32" Height="32" Offset="0x111D0" />
-        <Texture Name="gGreatBayTempleObjectOneWaySwitchTex" OutName="great_bay_temple_object_one_way_switch" Format="ci4" Width="8" Height="16" Offset="0x119D0" />
-        <Texture Name="gGreatBayTempleObjectSwitchSideTex" OutName="great_bay_temple_object_switch_side" Format="rgba16" Width="32" Height="32" Offset="0x11A10" />
-        <Texture Name="gGreatBayTempleObjectUnusedGearTex" OutName="great_bay_temple_object_unused_gear" Format="ci4" Width="48" Height="36" Offset="0x12210" TlutOffset="0xD530" />
-        <Texture Name="gGreatBayTempleObjectUnusedDarkMetalTex" OutName="great_bay_temple_object_unused_dark_metal" Format="ci4" Width="32" Height="32" Offset="0x12570" TlutOffset="0xD630" />
-        <Texture Name="gGreatBayTempleObjectUnusedShaftTex" OutName="great_bay_temple_object_unused_shaft" Format="rgba16" Width="32" Height="64" Offset="0x12770" />
-        <Texture Name="gGreatBayTempleObjectUnusedPaddleTex" OutName="great_bay_temple_object_unused_paddle" Format="ci4" Width="32" Height="128" Offset="0x13770" TlutOffset="0xD670" />
-        <Texture Name="gGreatBayTempleObjectLargeSeesawPlatformTex" OutName="great_bay_temple_object_large_seesaw_platform" Format="ci4" Width="64" Height="64" Offset="0x13F70" />
-        <Texture Name="gGreatBayTempleObjectHorizontalWaterFoamTex" OutName="great_bay_temple_object_horizontal_water_foam" Format="rgba16" Width="32" Height="32" Offset="0x14770" />
-        <Texture Name="gGreatBayTempleObjectIceTex" OutName="great_bay_temple_object_ice" Format="rgba16" Width="32" Height="32" Offset="0x14F70" />
-        <Texture Name="gGreatBayTempleObjectIceStalactiteRimMaskTex" OutName="great_bay_temple_object_ice_stalactite_rim_mask" Format="ia8" Width="32" Height="64" Offset="0x15770" />
-        <Texture Name="gGreatBayTempleObjectWaterfallWaterTex" OutName="great_bay_temple_object_waterfall_water" Format="rgba16" Width="32" Height="32" Offset="0x15F70" />
-        <Texture Name="gGreatBayTempleObjectVerticalWaterFoamTex" OutName="great_bay_temple_object_vertical_water_foam" Format="rgba16" Width="32" Height="32" Offset="0x16770" />
-        <Texture Name="gGreatBayTempleObjectWhirpoolWaterTex" OutName="great_bay_temple_object_whirlpool_water" Format="rgba16" Width="32" Height="32" Offset="0x16F70" />
-        <Texture Name="gGreatBayTempleObjectSplashScrollTex" OutName="great_bay_temple_object_splash_scroll" Format="ia8" Width="32" Height="32" Offset="0x17770" />
-
-        <!-- Assets for the doors in Great Bay Temple. -->
-        <DList Name="gGreatBayTempleObjectDoorDL" Offset="0x17D00" /> <!-- Original name is "m2_KON_shuter1_model" -->
-        <Texture Name="gGreatBayTempleObjectDoorTex" OutName="great_bay_temple_object_door" Format="rgba16" Width="32" Height="64" Offset="0x17E58" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_death.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_death.xml
deleted file mode 100644
index 6c75cc824..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_death.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<Root>
-    <File Name="object_death" Segment="6">
-        <Animation Name="gGomessScytheSwingAnim" Offset="0xE64" />
-        <Animation Name="object_death_Anim_0015B4" Offset="0x15B4" />   <!-- Start bats attack    -->
-        <Animation Name="object_death_Anim_001834" Offset="0x1834" />   <!-- Continue bats attack -->
-        <Animation Name="gGomessDamagedAnim" Offset="0x1F80" />
-        <Animation Name="gGomessBeginDeathAnim" Offset="0x2DE8" />
-        <Animation Name="gGomessDeathAnim" Offset="0x352C" />
-        <Animation Name="gGomessFloatAnim" Offset="0x3CAC" />
-        <DList Name="object_death_DL_006B80" Offset="0x6B80" />
-        <DList Name="object_death_DL_006D18" Offset="0x6D18" />
-        <DList Name="object_death_DL_006E08" Offset="0x6E08" />
-        <DList Name="object_death_DL_006F88" Offset="0x6F88" /> <!-- Original name is "d13_kama_model" ("sickle​") -->
-        <DList Name="object_death_DL_0073D0" Offset="0x73D0" /> <!-- Original name is "d13_kamahaA_model" -->
-        <DList Name="object_death_DL_0074B8" Offset="0x74B8" />
-        <DList Name="object_death_DL_007560" Offset="0x7560" />
-        <DList Name="object_death_DL_007638" Offset="0x7638" />
-        <DList Name="object_death_DL_007710" Offset="0x7710" />
-        <DList Name="object_death_DL_007818" Offset="0x7818" />
-        <DList Name="object_death_DL_007998" Offset="0x7998" />
-        <DList Name="object_death_DL_007A40" Offset="0x7A40" />
-        <DList Name="object_death_DL_007CD0" Offset="0x7CD0" />
-        <DList Name="object_death_DL_007ED0" Offset="0x7ED0" />
-        <DList Name="object_death_DL_0082C0" Offset="0x82C0" />
-        <DList Name="object_death_DL_008370" Offset="0x8370" />
-        <DList Name="object_death_DL_008428" Offset="0x8428" />
-        <DList Name="object_death_DL_0084E0" Offset="0x84E0" />
-        <DList Name="object_death_DL_008598" Offset="0x8598" />
-        <DList Name="object_death_DL_008638" Offset="0x8638" />
-        <Texture Name="object_death_Tex_008788" OutName="tex_008788" Format="rgba16" Width="32" Height="32" Offset="0x8788" />
-        <Texture Name="object_death_Tex_008F88" OutName="tex_008F88" Format="rgba16" Width="8" Height="8" Offset="0x8F88" />
-        <Texture Name="object_death_Tex_009008" OutName="tex_009008" Format="rgba16" Width="8" Height="16" Offset="0x9008" />
-        <Texture Name="object_death_Tex_009108" OutName="tex_009108" Format="rgba16" Width="8" Height="8" Offset="0x9108" />
-        <Texture Name="object_death_Tex_009188" OutName="tex_009188" Format="rgba16" Width="16" Height="8" Offset="0x9188" />
-        <Texture Name="object_death_Tex_009288" OutName="tex_009288" Format="rgba16" Width="8" Height="8" Offset="0x9288" />
-        <Texture Name="object_death_Tex_009308" OutName="tex_009308" Format="rgba16" Width="8" Height="8" Offset="0x9308" />
-        <Texture Name="object_death_Tex_009388" OutName="tex_009388" Format="rgba16" Width="16" Height="16" Offset="0x9388" />
-        <Texture Name="object_death_Tex_009588" OutName="tex_009588" Format="rgba16" Width="4" Height="8" Offset="0x9588" />
-        <Texture Name="object_death_Tex_0095C8" OutName="tex_0095C8" Format="rgba16" Width="16" Height="16" Offset="0x95C8" />
-        <Texture Name="object_death_Tex_0097C8" OutName="tex_0097C8" Format="rgba16" Width="4" Height="8" Offset="0x97C8" />
-        <Texture Name="object_death_Tex_009808" OutName="tex_009808" Format="i4" Width="16" Height="16" Offset="0x9808" />
-        <DList Name="gGomessCoreDL" Offset="0x9988" />
-        <Texture Name="gGomessCoreTex" OutName="gomess_core" Format="i4" Width="16" Height="16" Offset="0x9AA0" />
-        <DList Name="gGomessBatsGuardingCoreDL" Offset="0x9BA0" />
-        <Texture Name="gGomessBatsGuardingCoreTex" OutName="gomess_bats_guarding_core" Format="rgba16" Width="16" Height="16" Offset="0x9C40" />
-        <DList Name="gGomessBatMaterialDL" Offset="0x9F10" />
-        <DList Name="gGomessBatFrame1DL" Offset="0x9F88" />
-        <DList Name="gGomessBatFrame2DL" Offset="0xA088" />
-        <DList Name="gGomessBatFrame3DL" Offset="0xA188" />
-        <DList Name="gGomessBatFrame4DL" Offset="0xA288" />
-        <DList Name="gGomessBatFrame5DL" Offset="0xA388" />
-        <DList Name="gGomessBatFrame6DL" Offset="0xA488" />
-        <DList Name="gGomessBatFrame7DL" Offset="0xA588" />
-        <DList Name="gGomessBatFrame8DL" Offset="0xA688" />
-        <DList Name="gGomessBatFrame9DL" Offset="0xA788" />
-        <Texture Name="gGomessBatTex" OutName="gomess_bat" Format="rgba16" Width="32" Height="16" Offset="0xA7B8" />
-        <Limb Name="object_death_Standardlimb_00ABB8" Type="Standard" EnumName="GOMESS_LIMB_1" Offset="0xABB8" />
-        <Limb Name="object_death_Standardlimb_00ABC4" Type="Standard" EnumName="GOMESS_LIMB_CORE_POS" Offset="0xABC4" />
-        <Limb Name="object_death_Standardlimb_00ABD0" Type="Standard" EnumName="GOMESS_LIMB_LOWER_BODY" Offset="0xABD0" />
-        <Limb Name="object_death_Standardlimb_00ABDC" Type="Standard" EnumName="GOMESS_LIMB_TORSO" Offset="0xABDC" />
-        <Limb Name="object_death_Standardlimb_00ABE8" Type="Standard" EnumName="GOMESS_LIMB_COLLAR" Offset="0xABE8" />
-        <Limb Name="object_death_Standardlimb_00ABF4" Type="Standard" EnumName="GOMESS_LIMB_HEAD_LOWER" Offset="0xABF4" />
-        <Limb Name="object_death_Standardlimb_00AC00" Type="Standard" EnumName="GOMESS_LIMB_HEAD_UPPER" Offset="0xAC00" />
-        <Limb Name="object_death_Standardlimb_00AC0C" Type="Standard" EnumName="GOMESS_LIMB_8" Offset="0xAC0C" />  <!-- Antenna thing, 4 parts -->
-        <Limb Name="object_death_Standardlimb_00AC18" Type="Standard" EnumName="GOMESS_LIMB_9" Offset="0xAC18" />
-        <Limb Name="object_death_Standardlimb_00AC24" Type="Standard" EnumName="GOMESS_LIMB_10" Offset="0xAC24" />
-        <Limb Name="object_death_Standardlimb_00AC30" Type="Standard" EnumName="GOMESS_LIMB_11" Offset="0xAC30" />
-        <Limb Name="object_death_Standardlimb_00AC3C" Type="Standard" EnumName="GOMESS_LIMB_CLOAK_UPPER" Offset="0xAC3C" />
-        <Limb Name="object_death_Standardlimb_00AC48" Type="Standard" EnumName="GOMESS_LIMB_CLOAK_LOWER" Offset="0xAC48" />
-        <Limb Name="object_death_Standardlimb_00AC54" Type="Standard" EnumName="GOMESS_LIMB_UPPER_ARM_LEFT" Offset="0xAC54" />
-        <Limb Name="object_death_Standardlimb_00AC60" Type="Standard" EnumName="GOMESS_LIMB_FOREARM_LEFT" Offset="0xAC60" />
-        <Limb Name="object_death_Standardlimb_00AC6C" Type="Standard" EnumName="GOMESS_LIMB_HAND_LEFT" Offset="0xAC6C" />
-        <Limb Name="object_death_Standardlimb_00AC78" Type="Standard" EnumName="GOMESS_LIMB_UPPER_ARM_RIGHT" Offset="0xAC78" />
-        <Limb Name="object_death_Standardlimb_00AC84" Type="Standard" EnumName="GOMESS_LIMB_FOREARM_RIGHT" Offset="0xAC84" />
-        <Limb Name="object_death_Standardlimb_00AC90" Type="Standard" EnumName="GOMESS_LIMB_HAND_RIGHT" Offset="0xAC90" />
-        <Limb Name="object_death_Standardlimb_00AC9C" Type="Standard" EnumName="GOMESS_LIMB_SCYTHE_HANDLE" Offset="0xAC9C" />
-        <Limb Name="object_death_Standardlimb_00ACA8" Type="Standard" EnumName="GOMESS_LIMB_SCYTHE_BLADE" Offset="0xACA8" />
-        <Skeleton Name="gGomessSkel" Type="Flex" LimbType="Standard" LimbNone="GOMESS_LIMB_NONE" LimbMax="GOMESS_LIMB_MAX" EnumName="GomessSkelLimbs" Offset="0xAD08" />
-        <Animation Name="object_death_Anim_00B284" Offset="0xB284" />   <!-- Intro anim 1 -->
-        <Animation Name="gGomessScytheSpinAnim" Offset="0xB508" />
-        <Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" />   <!-- Intro anim 2 -->
-        <TextureAnimation Name="gGomessCoreMatAnim" Offset="0xCB84" />
-        <TextureAnimation Name="gGomessBodyMatAnim" Offset="0xCBC0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekubaba.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekubaba.xml
deleted file mode 100644
index 053b82f61..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekubaba.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-    <!-- Deku Baba and withered Deku Baba assets. Identical to OoT -->
-    <File Name="object_dekubaba" Segment="6">
-
-        <!-- Deku Baba animations -->
-        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/> <!-- Original name is "db_P_kougeki" ("attack; assault") -->
-        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/> <!-- Original name is "db_P_tobidasu" ("to appear (suddenly)​") -->
-
-        <!-- Deku Baba body DLists (not all are limb DLists) -->
-        <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
-        <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
-        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/> <!-- Original name is "db_ha_model" ("leaf; blade of grass") -->
-        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/> <!-- Original name is "db_miki1_model" ("miki" = "trunk") -->
-        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/> <!-- Original name is "db_miki2_model" -->
-        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/> <!-- Original name is "db_miki3_model" -->
-
-        <!-- Deku Baba body textures -->
-        <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
-        <Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
-        <Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
-        <Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
-        <Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
-
-        <!-- Deku Baba limbs (upper/lower is only based on the "tongue" being in the lower) -->
-        <Limb Name="gDekuBabaRootLimb" Type="Standard" EnumName="DEKUBABA_LIMB_ROOT" Offset="0x29D0" />
-        <Limb Name="gDekuBabaUpperJawRootLimb" Type="Standard" EnumName="DEKUBABA_LIMB_UPPER_JAW_ROOT" Offset="0x29DC" />
-        <Limb Name="gDekuBabaUpperJawRooWrappertLimb" Type="Standard" EnumName="DEKUBABA_LIMB_UPPER_JAW_WRAPPER" Offset="0x29E8" />
-        <Limb Name="gDekuBabaUpperJawLimb" Type="Standard" EnumName="DEKUBABA_LIMB_UPPER_JAW" Offset="0x29F4" />
-        <Limb Name="gDekuBabaLowerJawRootLimb" Type="Standard" EnumName="DEKUBABA_LIMB_LOWER_JAW_ROOT" Offset="0x2A00" />
-        <Limb Name="gDekuBabaLowerJawWrapperLimb" Type="Standard" EnumName="DEKUBABA_LIMB_LOWER_JAW_WRAPPER" Offset="0x2A0C" />
-        <Limb Name="gDekuBabaLowerJawLimb" Type="Standard" EnumName="DEKUBABA_LIMB_LOWER_JAW" Offset="0x2A18" />
-
-        <!-- Deku Baba skeleton (only used for jaws) -->
-        <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" LimbNone="DEKUBABA_LIMB_NONE" LimbMax="DEKUBABA_LIMB_MAX" EnumName="DekuBabaLimb" Offset="0x2A40" />
-
-        <!-- Deku Baba stick drop -->
-        <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
-        <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekucity_ana_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekucity_ana_obj.xml
deleted file mode 100644
index 620c34a04..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekucity_ana_obj.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_dekucity_ana_obj" Segment="6">
-        <DList Name="object_dekucity_ana_obj_DL_000040" Offset="0x40" />
-        <Texture Name="object_dekucity_ana_obj_Tex_000100" OutName="tex_000100" Format="rgba16" Width="32" Height="32" Offset="0x100" />
-        <Texture Name="object_dekucity_ana_obj_Tex_000900" OutName="tex_000900" Format="i4" Width="64" Height="64" Offset="0x900" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekucity_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekucity_obj.xml
deleted file mode 100644
index 2d1da14a0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekucity_obj.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <File Name="object_dekucity_obj" Segment="6">
-        <Collision Name="object_dekucity_obj_Colheader_0002AC" Offset="0x2AC" /> <!-- Original name is "z2_22_DOKUcode_bgdatainfo" ("doku" = "poison") -->
-        <DList Name="object_dekucity_obj_DL_0004E0" Offset="0x4E0" /> <!-- Original name is "z2_22_DOKUwter_modelT" -->
-        <DList Name="object_dekucity_obj_DL_000610" Offset="0x610" />
-        <Texture Name="object_dekucity_obj_Tex_000618" OutName="tex_000618" Format="rgba16" Width="32" Height="32" Offset="0x618" />
-        <TextureAnimation Name="object_dekucity_obj_Matanimheader_000E28" Offset="0xE28" />
-        <DList Name="object_dekucity_obj_DL_001030" Offset="0x1030" /> <!-- Original name is "z2_22_wter_modelT" -->
-        <DList Name="object_dekucity_obj_DL_001160" Offset="0x1160" />
-        <Texture Name="object_dekucity_obj_Tex_001168" OutName="tex_001168" Format="rgba16" Width="32" Height="32" Offset="0x1168" />
-        <TextureAnimation Name="object_dekucity_obj_Matanimheader_001978" Offset="0x1978" />
-        <DList Name="object_dekucity_obj_DL_001D80" Offset="0x1D80" />
-        <DList Name="object_dekucity_obj_DL_001ED8" Offset="0x1ED8" /> <!-- Original name is "z2_22_yama01_model" ("yama" = "mountain; hill​") -->
-        <Texture Name="object_dekucity_obj_Tex_002008" OutName="tex_002008" Format="rgba16" Width="16" Height="64" Offset="0x2008" />
-        <Texture Name="object_dekucity_obj_Tex_002808" OutName="tex_002808" Format="rgba16" Width="32" Height="32" Offset="0x2808" />
-        <Texture Name="object_dekucity_obj_Tex_003008" OutName="tex_003008" Format="i4" Width="64" Height="64" Offset="0x3008" />
-        <TextureAnimation Name="object_dekucity_obj_Matanimheader_003820" Offset="0x3820" />
-        <DList Name="object_dekucity_obj_DL_003990" Offset="0x3990" />
-        <DList Name="object_dekucity_obj_DL_003998" Offset="0x3998" /> <!-- Original name is "z2_22_yama02_model" -->
-        <Texture Name="object_dekucity_obj_Tex_003AC0" OutName="tex_003AC0" Format="rgba16" Width="16" Height="32" Offset="0x3AC0" />
-        <Texture Name="object_dekucity_obj_Tex_003EC0" OutName="tex_003EC0" Format="rgba16" Width="32" Height="32" Offset="0x3EC0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekunuts.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekunuts.xml
deleted file mode 100644
index 909231a77..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dekunuts.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<Root>
-    <!-- Assets for Deku Scrubs and their flowers -->
-    <File Name="object_dekunuts" Segment="6">
-        <Animation Name="gDekuScrubSpitAnim" Offset="0x168" /> <!-- Original name is "dn_atack" -->
-
-        <!-- Deku Scrub Limb DisplayLists -->
-        <DList Name="gDekuScrubRightFootDL" Offset="0xA00" />
-        <DList Name="gDekuScrubRightLegDL" Offset="0xAA8" />
-        <DList Name="gDekuScrubLeftFootDL" Offset="0xB40" />
-        <DList Name="gDekuScrubLeftLegDL" Offset="0xBE8" />
-        <DList Name="gDekuScrubSnoutDL" Offset="0xC80" />
-        <DList Name="gDekuScrubCrestDL" Offset="0xD90" />
-        <DList Name="gDekuScrubHeaddressDL" Offset="0xE30" />
-        <DList Name="gDekuScrubHeadDL" Offset="0xF20" />
-        <DList Name="gDekuScrubBodyDL" Offset="0x1050" />
-
-        <!-- Deku Scrub Textures -->
-        <Texture Name="gDekuScrubSnoutTex" OutName="deku_scrub_snout" Format="rgba16" Width="8" Height="8" Offset="0x10F0" />
-        <Texture Name="gDekuScrubMouthTex" OutName="deku_scrub_mouth" Format="rgba16" Width="8" Height="8" Offset="0x1170" />
-        <Texture Name="gDekuScrubLeafTex" OutName="deku_scrub_leaf" Format="rgba16" Width="32" Height="32" Offset="0x11F0" />
-        <Texture Name="gDekuScrubEyeTex" OutName="deku_scrub_eye" Format="rgba16" Width="8" Height="8" Offset="0x19F0" />
-        <Texture Name="gDekuScrubSkinTex" OutName="deku_scrub_skin" Format="rgba16" Width="16" Height="16" Offset="0x1A70" />
-
-        <!-- Deku Scrub Flower and Flower Fragment DisplayLists and Textures -->
-        <DList Name="gDekuScrubFlowerDL" Offset="0x1E50" />
-        <DList Name="gDekuScrubFlowerFragmentDL" Offset="0x1F50" />
-        <Texture Name="gDekuScrubFlowerFragmentTex" OutName="deku_scrub_flower_fragment" Format="rgba16" Width="16" Height="32" Offset="0x1FD8" />
-
-        <!-- Deku Scrub Limbs -->
-        <Limb Name="gDekuScrubBodyLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_BODY" Offset="0x23D8" />
-        <Limb Name="gDekuScrubHeadLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_HEAD" Offset="0x23E4" />
-        <Limb Name="gDekuScrubHeaddressLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_HEADDRESS" Offset="0x23F0" />
-        <Limb Name="gDekuScrubCrestLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_CREST" Offset="0x23FC" />
-        <Limb Name="gDekuScrubSnoutLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_SNOUT" Offset="0x2408" />
-        <Limb Name="gDekuScrubLeftLegLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_LEFT_LEG" Offset="0x2414" />
-        <Limb Name="gDekuScrubLeftFootLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_LEFT_FOOT" Offset="0x2420" />
-        <Limb Name="gDekuScrubRightLegLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_RIGHT_LEG" Offset="0x242C" />
-        <Limb Name="gDekuScrubRightFootLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_RIGHT_FOOT" Offset="0x2438" />
-
-        <!-- Deku Scrub Skeleton -->
-        <Skeleton Name="gDekuScrubSkel" Type="Normal" LimbType="Standard" LimbNone="DEKU_SCRUB_LIMB_NONE" LimbMax="DEKU_SCRUB_LIMB_MAX" EnumName="DekuScrubLimb" Offset="0x2468" />
-
-        <!-- Deku Scrub Animations -->
-        <Animation Name="gDekuScrubDamageAnim" Offset="0x259C" /> <!-- Original name is "dn_damage" -->
-        <Animation Name="gDekuScrubStandingIdleAnim" Offset="0x2950" /> <!-- Original name is "dn_demowait" -->
-        <Animation Name="gDekuScrubBurrowAnim" Offset="0x2A5C" /> <!-- Original name is "dn_dig" -->
-        <Animation Name="gDekuScrubDieAnim" Offset="0x2BD4" /> <!-- Original name is "dn_down" -->
-        <Animation Name="gDekuScrubUnburrowAnim" Offset="0x2DD4" /> <!-- Original name is "dn_jump" -->
-        <Animation Name="gDekuScrubLookAroundAnim" Offset="0x2FA4" /> <!-- Original name is "dn_lookaround" -->
-        <Animation Name="gDekuScrubUpAnim" Offset="0x3180" /> <!-- Original name is "dn_start" -->
-        <Animation Name="gDekuScrubIdleAnim" Offset="0x326C" /> <!-- Original name is "dn_wait" -->
-        <Animation Name="gDekuScrubPantingAnim" Offset="0x33E4" /> <!-- Original name is "dn_wait02" -->
-        <Animation Name="gDekuScrubRunAnim" Offset="0x3780" /> <!-- Original name is "dn_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_delf.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_delf.xml
deleted file mode 100644
index 85f3138e1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_delf.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<Root>
-    <File Name="object_delf" Segment="6">
-        <Animation Name="object_delf_Anim_00046C" Offset="0x46C" /> <!-- Original name is "chat_bikkuri" -->
-        <Animation Name="object_delf_Anim_00065C" Offset="0x65C" /> <!-- Original name is "chat_bikkuri_wait" -->
-        <Animation Name="object_delf_Anim_0008E0" Offset="0x8E0" /> <!-- Original name is "chat_deru" -->
-        <Animation Name="object_delf_Anim_000A94" Offset="0xA94" /> <!-- Original name is "chat_deru_wait" -->
-        <Animation Name="object_delf_Anim_000E44" Offset="0xE44" /> <!-- Original name is "chat_fly_loop" -->
-        <Animation Name="object_delf_Anim_0010F8" Offset="0x10F8" /> <!-- Original name is "chat_hena_wait" -->
-        <Animation Name="object_delf_Anim_001410" Offset="0x1410" /> <!-- Original name is "chat_henahena" -->
-        <Animation Name="object_delf_Anim_001754" Offset="0x1754" /> <!-- Original name is "chat_mae_wait" -->
-        <Animation Name="object_delf_Anim_00199C" Offset="0x199C" /> <!-- Original name is "chat_modoru" -->
-        <Animation Name="object_delf_Anim_001B28" Offset="0x1B28" /> <!-- Original name is "chat_nani_to_fly" -->
-        <Animation Name="object_delf_Anim_001ED4" Offset="0x1ED4" /> <!-- Original name is "chat_nani_wait" -->
-        <Animation Name="object_delf_Anim_003148" Offset="0x3148" /> <!-- Original name is "chat_okarina_play" -->
-        <Animation Name="object_delf_Anim_00377C" Offset="0x377C" /> <!-- Original name is "chat_okarina_wait" -->
-        <Animation Name="object_delf_Anim_003BB4" Offset="0x3BB4" /> <!-- Original name is "chat_sowasowa" -->
-        <Animation Name="object_delf_Anim_003FAC" Offset="0x3FAC" /> <!-- Original name is "elf_amayadori" -->
-        <Animation Name="object_delf_Anim_0042E8" Offset="0x42E8" /> <!-- Original name is "elf_amayadori2" -->
-        <Animation Name="object_delf_Anim_004798" Offset="0x4798" /> <!-- Original name is "elf_amayadori_loop" -->
-        <Animation Name="object_delf_Anim_004C44" Offset="0x4C44" /> <!-- Original name is "elf_amayadori_loop2" -->
-        <Animation Name="object_delf_Anim_004FF4" Offset="0x4FF4" /> <!-- Original name is "elf_attack_1a" -->
-        <Animation Name="object_delf_Anim_0053A4" Offset="0x53A4" /> <!-- Original name is "elf_attack_1b" -->
-        <Animation Name="object_delf_Anim_005B68" Offset="0x5B68" /> <!-- Original name is "elf_attack_2a" -->
-        <Animation Name="object_delf_Anim_006328" Offset="0x6328" /> <!-- Original name is "elf_attack_1b" -->
-        <Animation Name="object_delf_Anim_006614" Offset="0x6614" /> <!-- Original name is "elf_bata_wait" -->
-        <Animation Name="object_delf_Anim_006B28" Offset="0x6B28" /> <!-- Original name is "elf_boo" -->
-        <Animation Name="object_delf_Anim_006D74" Offset="0x6D74" /> <!-- Original name is "elf_guru1" -->
-        <Animation Name="object_delf_Anim_00706C" Offset="0x706C" /> <!-- Original name is "elf_guru1_loop" -->
-        <Animation Name="object_delf_Anim_0072B0" Offset="0x72B0" /> <!-- Original name is "elf_guru2" -->
-        <Animation Name="object_delf_Anim_007570" Offset="0x7570" /> <!-- Original name is "elf_guru2_loop" -->
-        <Animation Name="object_delf_Anim_007B04" Offset="0x7B04" /> <!-- Original name is "elf_haigo_1" -->
-        <Animation Name="object_delf_Anim_0080A4" Offset="0x80A4" /> <!-- Original name is "elf_haigo_2" -->
-        <Animation Name="object_delf_Anim_00859C" Offset="0x859C" /> <!-- Original name is "elf_haigo_wait_1" -->
-        <Animation Name="object_delf_Anim_008A44" Offset="0x8A44" /> <!-- Original name is "elf_haigo_wait_2" -->
-        <Animation Name="object_delf_Anim_009010" Offset="0x9010" /> <!-- Original name is "elf_hataku" -->
-        <Animation Name="object_delf_Anim_0091BC" Offset="0x91BC" /> <!-- Original name is "elf_hataku_kaodasi" -->
-        <Animation Name="object_delf_Anim_0094B0" Offset="0x94B0" /> <!-- Original name is "elf_hataku_kaodasi_loop" -->
-        <Animation Name="object_delf_Anim_0097C4" Offset="0x97C4" /> <!-- Original name is "elf_hataku_loop" -->
-        <Animation Name="object_delf_Anim_009C4C" Offset="0x9C4C" /> <!-- Original name is "elf_hataku_mawarikomi" -->
-        <Animation Name="object_delf_Anim_009F40" Offset="0x9F40" /> <!-- Original name is "elf_hataku_mawarikomi_loop" -->
-        <Animation Name="object_delf_Anim_00A2A4" Offset="0xA2A4" /> <!-- Original name is "elf_hayai_turn" -->
-        <Animation Name="object_delf_Anim_00A4B4" Offset="0xA4B4" /> <!-- Original name is "elf_ht_wait" -->
-        <Animation Name="object_delf_Anim_00A7B4" Offset="0xA7B4" /> <!-- Original name is "elf_ikari" -->
-        <Animation Name="object_delf_Anim_00AF78" Offset="0xAF78" /> <!-- Original name is "elf_kakureru" -->
-        <Animation Name="object_delf_Anim_00B2B8" Offset="0xB2B8" /> <!-- Original name is "elf_kakureru_loop" -->
-        <Animation Name="object_delf_Anim_00BCD8" Offset="0xBCD8" /> <!-- Original name is "elf_kizetu" -->
-        <Animation Name="object_delf_Anim_00BDFC" Offset="0xBDFC" /> <!-- Original name is "elf_maederu" -->
-        <Animation Name="object_delf_Anim_00C0BC" Offset="0xC0BC" /> <!-- Original name is "elf_maederu_loop" -->
-        <Animation Name="object_delf_Anim_00C248" Offset="0xC248" /> <!-- Original name is "elf_mawarikomi" -->
-        <Animation Name="object_delf_Anim_00C588" Offset="0xC588" /> <!-- Original name is "elf_mawarikomi_loop" -->
-        <Animation Name="object_delf_Anim_00C690" Offset="0xC690" /> <!-- Original name is "elf_miwoyoseau" -->
-        <Animation Name="object_delf_Anim_00C790" Offset="0xC790" /> <!-- Original name is "elf_miwoyoseau2" -->
-        <Animation Name="object_delf_Anim_00CCD4" Offset="0xCCD4" /> <!-- Original name is "elf_modoru" -->
-        <Animation Name="object_delf_Anim_00CEE0" Offset="0xCEE0" /> <!-- Original name is "elf_nanikairu2" -->
-        <Animation Name="object_delf_Anim_00D260" Offset="0xD260" /> <!-- Original name is "elf_nanikairu_loop2" -->
-        <Animation Name="object_delf_Anim_00E024" Offset="0xE024" /> <!-- Original name is "elf_okizari" -->
-        <Animation Name="object_delf_Anim_00EB18" Offset="0xEB18" /> <!-- Original name is "elf_okizari_no" -->
-        <Animation Name="object_delf_Anim_00EBB0" Offset="0xEBB0" /> <!-- Original name is "elf_okizari_sakebu" -->
-        <Animation Name="object_delf_Anim_00EE30" Offset="0xEE30" /> <!-- Original name is "elf_okizari_sakebu_wait" -->
-        <Animation Name="object_delf_Anim_00F0D0" Offset="0xF0D0" /> <!-- Original name is "elf_okizari_wait" -->
-        <Animation Name="object_delf_Anim_00FB30" Offset="0xFB30" /> <!-- Original name is "elf_sakimawari_1" -->
-        <Animation Name="object_delf_Anim_010590" Offset="0x10590" /> <!-- Original name is "elf_sakimawari_2" -->
-        <Animation Name="object_delf_Anim_01088C" Offset="0x1088C" /> <!-- Original name is "elf_samui" -->
-        <Animation Name="object_delf_Anim_011088" Offset="0x11088" /> <!-- Original name is "elf_seisi_1" -->
-        <Animation Name="object_delf_Anim_0118FC" Offset="0x118FC" /> <!-- Original name is "elf_seisi_2" -->
-        <Animation Name="object_delf_Anim_011C70" Offset="0x11C70" /> <!-- Original name is "elf_seisi_taiki_1" -->
-        <Animation Name="object_delf_Anim_011FE0" Offset="0x11FE0" /> <!-- Original name is "elf_seisi_taiki_2" -->
-        <Animation Name="object_delf_Anim_012388" Offset="0x12388" /> <!-- Original name is "elf_seisi_wait_1" -->
-        <Animation Name="object_delf_Anim_012738" Offset="0x12738" /> <!-- Original name is "elf_seisi_wait_2" -->
-        <Animation Name="object_delf_Anim_012BBC" Offset="0x12BBC" /> <!-- Original name is "elf_urusai" -->
-        <Animation Name="object_delf_Anim_012EF8" Offset="0x12EF8" /> <!-- Original name is "elf_urusai_wait" -->
-        <Animation Name="object_delf_Anim_013040" Offset="0x13040" /> <!-- Original name is "elf_usirohiku" -->
-        <Animation Name="object_delf_Anim_013378" Offset="0x13378" /> <!-- Original name is "elf_usirohiku_loop" -->
-        <Animation Name="object_delf_Anim_013BE0" Offset="0x13BE0" /> <!-- Original name is "elf_vs_yousei" -->
-        <Animation Name="object_delf_Anim_013E80" Offset="0x13E80" /> <!-- Original name is "elf_vs_yousei_wait" -->
-        <Animation Name="object_delf_Anim_014190" Offset="0x14190" /> <!-- Original name is "elf_yokeru" -->
-        <Animation Name="object_delf_Anim_01447C" Offset="0x1447C" /> <!-- Original name is "elf_yokeru_loop" -->
-        <Animation Name="object_delf_Anim_01498C" Offset="0x1498C" /> <!-- Original name is "elf_yorisou" -->
-        <Animation Name="object_delf_Anim_014E9C" Offset="0x14E9C" /> <!-- Original name is "elf_yorisou_loop" -->
-        <Animation Name="object_delf_Anim_015114" Offset="0x15114" /> <!-- Original name is "elf_yururi_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dhouse.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dhouse.xml
deleted file mode 100644
index a5894a4df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dhouse.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Root>
-    <File Name="object_dhouse" Segment="6">
-        <Texture Name="object_dhouse_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="object_dhouse_TLUT_000020" OutName="tlut_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" />
-        <Texture Name="object_dhouse_Tex_000040" OutName="tex_000040" Format="ci4" Width="64" Height="64" Offset="0x40" />
-        <Texture Name="object_dhouse_Tex_000840" OutName="tex_000840" Format="rgba16" Width="32" Height="32" Offset="0x840" />
-        <Texture Name="object_dhouse_Tex_001040" OutName="tex_001040" Format="rgba16" Width="64" Height="32" Offset="0x1040" />
-        <Texture Name="object_dhouse_Tex_002040" OutName="tex_002040" Format="ci4" Width="64" Height="64" Offset="0x2040" />
-        <Texture Name="object_dhouse_Tex_002840" OutName="tex_002840" Format="rgba16" Width="32" Height="32" Offset="0x2840" />
-        <Texture Name="object_dhouse_Tex_003040" OutName="tex_003040" Format="i4" Width="64" Height="64" Offset="0x3040" />
-        <DList Name="object_dhouse_DL_004920" Offset="0x4920" />
-        <DList Name="object_dhouse_DL_004928" Offset="0x4928" /> <!-- Original name is "z2_broken_dhouse_model" -->
-        <DList Name="object_dhouse_DL_005A70" Offset="0x5A70" />
-        <DList Name="object_dhouse_DL_005A78" Offset="0x5A78" /> <!-- Original name is "z2_dhouse_model" -->
-        <DList Name="object_dhouse_DL_006CE0" Offset="0x6CE0" />
-        <DList Name="object_dhouse_DL_006E28" Offset="0x6E28" /> <!-- Original name is "d_hahen_01_model" -->
-        <DList Name="object_dhouse_DL_006EF8" Offset="0x6EF8" />
-        <DList Name="object_dhouse_DL_0070A8" Offset="0x70A8" /> <!-- Original name is "d_hahen_02_model" -->
-        <DList Name="object_dhouse_DL_007190" Offset="0x7190" />
-        <DList Name="object_dhouse_DL_007348" Offset="0x7348" /> <!-- Original name is "d_hahen_03_model" -->
-        <DList Name="object_dhouse_DL_007438" Offset="0x7438" />
-        <DList Name="object_dhouse_DL_007568" Offset="0x7568" /> <!-- Original name is "d_hahen_04_model" -->
-        <DList Name="object_dhouse_DL_007638" Offset="0x7638" />
-        <DList Name="object_dhouse_DL_007780" Offset="0x7780" /> <!-- Original name is "d_hahen_05_model" -->
-        <DList Name="object_dhouse_DL_007850" Offset="0x7850" />
-        <DList Name="object_dhouse_DL_007A00" Offset="0x7A00" /> <!-- Original name is "d_hahen_06_model" -->
-        <DList Name="object_dhouse_DL_007AE8" Offset="0x7AE8" />
-        <DList Name="object_dhouse_DL_007C98" Offset="0x7C98" /> <!-- Original name is "d_hahen_07_model" -->
-        <Collision Name="object_dhouse_Colheader_008040" Offset="0x8040" /> <!-- Original name is "z2_dhouse_hahen_bgdatainfo" -->
-        <DList Name="object_dhouse_DL_0081D0" Offset="0x81D0" />
-        <DList Name="object_dhouse_DL_0081D8" Offset="0x81D8" /> <!-- Original name is "z2_small_hahen_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dinofos.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dinofos.xml
deleted file mode 100644
index c3c575b0f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dinofos.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<Root>
-    <!-- Object for Dinolfos -->
-    <File Name="object_dinofos" Segment="6">
-        <Animation Name="gDinolfosWalkAnim" Offset="0x580" /> <!-- Original name is "zf2_aruku" -->
-        <Animation Name="gDinolfosLandAnim" Offset="0xAF0" /> <!-- Original name is "zf2_chakuti" -->
-        <Animation Name="gDinolfosFireStartAnim" Offset="0x1040" /> <!-- Original name is "zf2_fire1" -->
-        <Animation Name="gDinolfosFireLoopAnim" Offset="0x13C0" /> <!-- Original name is "zf2_fire2" -->
-        <Animation Name="gDinolfosFireEndAnim" Offset="0x17B8" /> <!-- Original name is "zf2_fire3" -->
-        <Animation Name="gDinolfosJumpAnim" Offset="0x1CCC" /> <!-- Original name is "zf2_jump" -->
-        <Animation Name="gDinolfosAttackAnim" Offset="0x25B4" /> <!-- Original name is "zf2_kiru" -->
-        <Animation Name="gDinolfosIdleAnim" Offset="0x2E40" /> <!-- Original name is "zf2_matsu" -->
-
-        <DList Name="gDinolfosKnifeDL" Offset="0x5B10" />
-        <DList Name="gDinolfosLowerTailDL" Offset="0x5D00" />
-        <DList Name="gDinolfosUpperTailDL" Offset="0x5E60" />
-        <DList Name="gDinolfosUpperBodyDL" Offset="0x5FC8" />
-        <DList Name="gDinolfosNeckDL" Offset="0x61F8" />
-        <DList Name="gDinolfosHeadDL" Offset="0x6440" />
-        <DList Name="gDinolfosJawDL" Offset="0x6930" />
-        <DList Name="gDinolfosRightUpperArmDL" Offset="0x6C28" />
-        <DList Name="gDinolfosRightForearmDL" Offset="0x6D68" />
-        <DList Name="gDinolfosRightHandDL" Offset="0x6E58" />
-        <DList Name="gDinolfosLeftUpperArmDL" Offset="0x70A0" />
-        <DList Name="gDinolfosLeftForearmDL" Offset="0x71E0" />
-        <DList Name="gDinolfosLeftHandDL" Offset="0x72D0" />
-        <DList Name="gDinolfosLowerBodyDL" Offset="0x7450" />
-        <DList Name="gDinolfosRightUpperLegDL" Offset="0x7690" />
-        <DList Name="gDinolfosRightLowerLegDL" Offset="0x78E0" />
-        <DList Name="gDinolfosRightClawsDL" Offset="0x7AC8" />
-        <DList Name="gDinolfosLeftUpperLegDL" Offset="0x7C20" />
-        <DList Name="gDinolfosLeftLowerLegDL" Offset="0x7E70" />
-        <DList Name="gDinolfosLeftClawsDL" Offset="0x8058" />
-
-        <Texture Name="gDinolfosTLUT" OutName="dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x81B0" />
-        <Texture Name="gDinolfosSkinTex" OutName="dinolfos_skin" Format="ci8" Width="16" Height="16" Offset="0x83B0" />
-        <Texture Name="gDinolfosScaleTex" OutName="dinolfos_scale" Format="rgba16" Width="16" Height="16" Offset="0x84B0" />
-        <Texture Name="gDinolfosArmorTex" OutName="dinolfos_armor" Format="rgba16" Width="16" Height="16" Offset="0x86B0" />
-        <Texture Name="gDinolfosSpikeTex" OutName="dinolfos_spike" Format="rgba16" Width="8" Height="8" Offset="0x88B0" />
-        <Texture Name="gDinolfosInnerMouthTex" OutName="dinolfos_inner_mouth" Format="rgba16" Width="16" Height="16" Offset="0x8930" />
-        <Texture Name="gDinolfosKnifeHoleTex" OutName="dinolfos_knife_hole" Format="rgba16" Width="8" Height="8" Offset="0x8B30" />
-        <Texture Name="gDinolfosJawTex" OutName="dinolfos_jaw" Format="rgba16" Width="8" Height="16" Offset="0x8BB0" />
-        <Texture Name="gDinolfosEyeHoleTex" OutName="dinolfos_eye_hole" Format="rgba16" Width="16" Height="8" Offset="0x8CB0" />
-        <Texture Name="gDinolfosClawTex" OutName="dinolfos_claw" Format="rgba16" Width="8" Height="8" Offset="0x8DB0" />
-        <Texture Name="gDinolfosEyeOpenTex" OutName="dinolfos_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x8E30" />
-        <Texture Name="gDinolfosEyeHalfTex" OutName="dinolfos_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x9030" />
-        <Texture Name="gDinolfosEyeClosedTex" OutName="dinolfos_eye_closed" Format="rgba16" Width="16" Height="16" Offset="0x9230" />
-
-        <Limb Name="gDinolfosLowerBodyLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LOWER_BODY" Offset="0x9430" />
-        <Limb Name="gDinolfosLeftUpperLegLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_UPPER_LEG" Offset="0x943C" />
-        <Limb Name="gDinolfosLeftLowerLegLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_LOWER_LEG" Offset="0x9448" />
-        <Limb Name="gDinolfosLeftClawsLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_CLAWS" Offset="0x9454" />
-        <Limb Name="gDinolfosRightUpperLegLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_UPPER_LEG" Offset="0x9460" />
-        <Limb Name="gDinolfosRightLowerLegLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_LOWER_LEG" Offset="0x946C" />
-        <Limb Name="gDinolfosRightClawsLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_CLAWS" Offset="0x9478" />
-        <Limb Name="gDinolfosUpperBodyLimb" Type="Standard" EnumName="DINOLFOS_LIMB_UPPER_BODY" Offset="0x9484" />
-        <Limb Name="gDinolfosLeftUpperArmLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_UPPER_ARM" Offset="0x9490" />
-        <Limb Name="gDinolfosLeftForearmLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_FOREARM" Offset="0x949C" />
-        <Limb Name="gDinolfosLeftHandLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_HAND" Offset="0x94A8" />
-        <Limb Name="gDinolfosRightUpperArmLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_UPPER_ARM" Offset="0x94B4" />
-        <Limb Name="gDinolfosRightForearmLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_FOREARM" Offset="0x94C0" />
-        <Limb Name="gDinolfosRightHandLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_HAND" Offset="0x94CC" />
-        <Limb Name="gDinolfosNeckLimb" Type="Standard" EnumName="DINOLFOS_LIMB_NECK" Offset="0x94D8" />
-        <Limb Name="gDinolfosHeadLimb" Type="Standard" EnumName="DINOLFOS_LIMB_HEAD" Offset="0x94E4" />
-        <Limb Name="gDinolfosJawLimb" Type="Standard" EnumName="DINOLFOS_LIMB_JAW" Offset="0x94F0" />
-        <Limb Name="gDinolfosUpperTailLimb" Type="Standard" EnumName="DINOLFOS_LIMB_UPPER_TAIL" Offset="0x94FC" />
-        <Limb Name="gDinolfosLowerTailLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LOWER_TAIL" Offset="0x9508" />
-        <Limb Name="gDinolfosKnifeLimb" Type="Standard" EnumName="DINOLFOS_LIMB_KNIFE" Offset="0x9514" />
-        <Skeleton Name="gDinolfosSkel" Type="Flex" LimbType="Standard" LimbNone="DINOLFOS_LIMB_NONE" LimbMax="DINOLFOS_LIMB_MAX" EnumName="DinolfosLimb" Offset="0x9570" />
-
-        <Animation Name="gDinolfosCryAnim" Offset="0x9B70" /> <!-- Original name is "zf2_sakebi" -->
-        <Animation Name="gDinolfosDieAnim" Offset="0xABD0" /> <!-- Original name is "zf2_lowerlegi" -->
-        <Animation Name="gDinolfosIntroAnim" Offset="0xC974" /> <!-- Original name is "zf2_startDEMO" -->
-        <Animation Name="gDinolfosHitAnim" Offset="0xD21C" /> <!-- Original name is "zf2_yarare" -->
-        <Animation Name="gDinolfosSidestepAnim" Offset="0xD62C" /> <!-- Original name is "zf2_yokoaruki" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dkjail_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dkjail_obj.xml
deleted file mode 100644
index 0827c3814..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dkjail_obj.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Assets for the ivy jail -->
-    <File Name="object_dkjail_obj" Segment="6">
-        <DList Name="gDkjailIvyDL" Offset="0x80" /> <!-- Original name is "m2_Mn_TUTA_modelT" -->
-        <DList Name="gDkjailEmptyDL" Offset="0x150" />
-        <Texture Name="gDkjailIvyTex" OutName="dkjail_ivy" Format="rgba16" Width="32" Height="32" Offset="0x158" />
-        <Texture Name="gDkjailMaskTex" OutName="dkjail_mask" Format="ia8" Width="32" Height="64" Offset="0x958" />
-        <Collision Name="gDkjailCol" Offset="0x11A8" /> <!-- Original name is "m2_Mn_TUTA_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dmask.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dmask.xml
deleted file mode 100644
index 29f245b1b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dmask.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="object_dmask" Segment="6">
-        <Animation Name="object_dmask_Anim_00017C" Offset="0x17C" /> <!-- Original name is "gbm_fall" -->
-        <Animation Name="object_dmask_Anim_0001A8" Offset="0x1A8" /> <!-- Original name is "gbm_normal" -->
-        <Limb Name="object_dmask_Standardlimb_01C0" Type="Standard" Offset="0x1C0" />
-        <Skeleton Name="object_dmask_Skel_001D0" Type="Flex" LimbType="Standard" Offset="0x1D0" />
-        <DList Name="object_dmask_DL_000430" Offset="0x430" />
-        <Texture Name="object_dmask_Tex_000578" OutName="tex_000578" Format="i8" Width="64" Height="32" Offset="0x578" />
-        <Texture Name="object_dmask_Tex_000D78" OutName="tex_000D78" Format="i8" Width="32" Height="16" Offset="0xD78" />
-        <Animation Name="object_dmask_Anim_001090" Offset="0x1090" /> <!-- Original name is "gmask_rakka" -->
-        <Limb Name="object_dmask_Standardlimb_010A0" Type="Standard" Offset="0x10A0" />
-        <Skeleton Name="object_dmask_Skel_010B0" Type="Normal" LimbType="Standard" Offset="0x10B0" />
-        <Animation Name="object_dmask_Anim_0011A0" Offset="0x11A0" /> <!-- Original name is "mjm_suteru" -->
-        <Animation Name="object_dmask_Anim_0013A4" Offset="0x13A4" /> <!-- Original name is "mjm_suteru_loop" -->
-        <Limb Name="object_dmask_Standardlimb_013C0" Type="Standard" Offset="0x13C0" />
-        <Skeleton Name="object_dmask_Skel_013D0" Type="Normal" LimbType="Standard" Offset="0x13D0" />
-        <DList Name="object_dmask_DL_001E70" Offset="0x1E70" />
-        <Texture Name="object_dmask_Tex_002220" OutName="tex_002220" Format="rgba16" Width="32" Height="64" Offset="0x2220" />
-        <Texture Name="object_dmask_Tex_003220" OutName="tex_003220" Format="rgba16" Width="16" Height="16" Offset="0x3220" />
-        <Texture Name="object_dmask_Tex_003420" OutName="tex_003420" Format="rgba16" Width="16" Height="16" Offset="0x3420" />
-        <Texture Name="object_dmask_Tex_003620" OutName="tex_003620" Format="rgba16" Width="16" Height="16" Offset="0x3620" />
-        <Texture Name="object_dmask_Tex_003820" OutName="tex_003820" Format="rgba16" Width="16" Height="16" Offset="0x3820" />
-        <Texture Name="object_dmask_Tex_003A20" OutName="tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x3A20" />
-        <Animation Name="object_dmask_Anim_004288" Offset="0x4288" /> <!-- Original name is "pzmask_taoreru" -->
-        <Limb Name="object_dmask_Standardlimb_042A0" Type="Standard" Offset="0x42A0" />
-        <Skeleton Name="object_dmask_Skel_042B0" Type="Normal" LimbType="Standard" Offset="0x42B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnj.xml
deleted file mode 100644
index f7f9d830c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnj.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<Root>
-    <!-- Assets for the Deku Butler -->
-    <File Name="object_dnj" Segment="6">
-        <!-- Deku Butler Animations -->
-        <Animation Name="gDekuButlerStartRaceStartAnim" Offset="0x470" /> <!-- Original name is "dnj_douzoR" (named after the line he says when the race starts in the Japanese text)-->
-        <Animation Name="gDekuButlerStartRaceEndAnim" Offset="0x8F0" /> <!-- Original name is "dnj_douzoTOwaitR" -->
-        <Animation Name="gDekuButlerFlyAnim" Offset="0xF6C" /> <!-- Original name is "dnj_flyR" -->
-        <Animation Name="gDekuButlerFarewellAnim" Offset="0x1A50" /> <!-- Original name is "dnj_goodbye" -->
-        <Animation Name="gDekuButlerGreetingAnim" Offset="0x2530" /> <!-- Original name is "dnj_hello" -->
-        <Animation Name="gDekuButlerGreetingWithCandleAnim" Offset="0x3320" /> <!-- Original name is "dnj_helloR" -->
-        <Animation Name="gDekuButlerPrayerLoopAnim" Offset="0x36D0" /> <!-- Original name is "dnj_inori" ("prayer; supplication") -->
-        <Animation Name="gDekuButlerCloseParasolAnim" Offset="0x41CC" /> <!-- Original name is "dnj_kasacloseR" ("kasa" = "umbrella; parasol") -->
-        <Animation Name="gDekuButlerOpenParasolAnim" Offset="0x4DD8" /> <!-- Original name is "dnj_kasaopenR" -->
-        <Animation Name="gDekuButlerShockStartAnim" Offset="0x51E4" /> <!-- Original name is "dnj_kosinukasu" ("to be unable to stand due to fear/surprise") -->
-        <Animation Name="gDekuButlerShockLoopAnim" Offset="0x5E20" /> <!-- Original name is "dnj_kosinukasu_loop" -->
-        <Animation Name="gDekuButlerImploreLoopAnim" Offset="0x5F98" /> <!-- Original name is "dnj_oisame" ("o" = "king", "isame" = "to admonish; to advise") -->
-        <Animation Name="gDekuButlerImploreEndAnim" Offset="0x6488" /> <!-- Original name is "dnj_oisameTOwait" -->
-        <Animation Name="gDekuButlerGrieveAnim" Offset="0x6F84" /> <!-- Original name is "dnj_rakutan_loop" ("despondency; disappointment​")-->
-        <Animation Name="gDekuButlerTalkAnim" Offset="0x73E4" /> <!-- Original name is "dnj_talk" -->
-        <Animation Name="gDekuButlerTalkWithParasolAndCandleAnim" Offset="0x77A8" /> <!-- Original name is "dnj_talkR" -->
-        <Animation Name="gDekuButlerIdleAnim" Offset="0x7CA4" /> <!-- Original name is "dnj_wait" -->
-        <Animation Name="gDekuButlerIdleWithCandleAnim" Offset="0x8324" /> <!-- Original name is "dnj_waitR" -->
-        <Animation Name="gDekuButlerPrayerStartAnim" Offset="0x8AE4" /> <!-- Original name is "dnj_waitTOinori" -->
-        <Animation Name="gDekuButlerImploreStartAnim" Offset="0x9100" /> <!-- Original name is "dnj_waitTOoisame" -->
-
-        <!-- Deku Butler Limb DisplayLists -->
-        <DList Name="gDekuButlerEyesDL" Offset="0xB7C0" />
-        <DList Name="gDekuButlerUpperBodyDL" Offset="0xB850" />
-        <DList Name="gDekuButlerLeftForearmDL" Offset="0xBC68" />
-        <DList Name="gDekuButlerLeftHandDL" Offset="0xBDD8" />
-        <DList Name="gDekuButlerCandleDL" Offset="0xBEF0" />
-        <DList Name="gDekuButlerCandleWickDL" Offset="0xC118" />
-        <DList Name="gDekuButlerLeftUpperArmDL" Offset="0xC1A0" />
-        <DList Name="gDekuButlerSnoutDL" Offset="0xC248" />
-        <DList Name="gDekuButlerRightMustacheCurlDL" Offset="0xC370" />
-        <DList Name="gDekuButlerRightMustacheBaseDL" Offset="0xC450" />
-        <DList Name="gDekuButlerLeftMustacheCurlDL" Offset="0xC4E0" />
-        <DList Name="gDekuButlerLeftMustacheBaseDL" Offset="0xC5C0" />
-        <DList Name="gDekuButlerRightForearmDL" Offset="0xC650" />
-        <DList Name="gDekuButlerRightHandDL" Offset="0xC7C0" />
-        <DList Name="gDekuButlerParasolUpperPetalsDL" Offset="0xC8D8" />
-        <DList Name="gDekuButlerParasolMiddlePetalsDL" Offset="0xC988" />
-        <DList Name="gDekuButlerParasolLowerPetalsDL" Offset="0xCA38" />
-        <DList Name="gDekuButlerParasolHandleDL" Offset="0xCAE8" />
-        <DList Name="gDekuButlerRightUpperArmDL" Offset="0xCBE8" />
-        <DList Name="gDekuButlerPelvisDL" Offset="0xCC90" />
-        <DList Name="gDekuButlerLeftShinDL" Offset="0xCD48" />
-        <DList Name="gDekuButlerLeftFootDL" Offset="0xCE00" />
-        <DList Name="gDekuButlerLeftThighDL" Offset="0xCEC8" />
-        <DList Name="gDekuButlerRightShinDL" Offset="0xCF88" />
-        <DList Name="gDekuButlerRightFootDL" Offset="0xD040" />
-        <DList Name="gDekuButlerRightThighDL" Offset="0xD108" />
-
-        <!-- Deku Butler Textures -->
-        <Texture Name="gDekuButlerEyeTex" OutName="deku_butler_eye" Format="rgba16" Width="16" Height="16" Offset="0xD1C8" />
-        <Texture Name="gDekuButlerBodyAndCandleHolderTex" OutName="deku_butler_body_and_candle_holder" Format="rgba16" Width="16" Height="16" Offset="0xD3C8" />
-        <Texture Name="gDekuButlerMouthTex" OutName="deku_butler_mouth" Format="rgba16" Width="8" Height="8" Offset="0xD5C8" />
-        <Texture Name="gDekuButlerLeafTex" OutName="deku_butler_leaf" Format="rgba16" Width="16" Height="16" Offset="0xD648" />
-        <Texture Name="gDekuButlerParasolPetalTex" OutName="deku_butler_parasol_petal" Format="rgba16" Width="16" Height="32" Offset="0xD848" />
-        <Texture Name="gDekuButlerCandleTex" OutName="deku_butler_candle" Format="rgba16" Width="16" Height="8" Offset="0xDC48" />
-        <Texture Name="gDekuButlerHairTex" OutName="deku_butler_hair" Format="rgba16" Width="16" Height="16" Offset="0xDD48" />
-        <Texture Name="gDekuButlerBowtieCenterTex" OutName="deku_butler_bowtie_center" Format="rgba16" Width="8" Height="16" Offset="0xDF48" />
-
-        <!-- Deku Butler Limbs -->
-        <Limb Name="gDekuButlerRootLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_ROOT" Offset="0xE048" />
-        <Limb Name="gDekuButlerPelvisLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PELVIS" Offset="0xE054" />
-        <Limb Name="gDekuButlerRightThighLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_THIGH" Offset="0xE060" />
-        <Limb Name="gDekuButlerRightShinLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_SHIN" Offset="0xE06C" />
-        <Limb Name="gDekuButlerRightFootLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_FOOT" Offset="0xE078" />
-        <Limb Name="gDekuButlerLeftThighLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_THIGH" Offset="0xE084" />
-        <Limb Name="gDekuButlerLeftShinLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_SHIN" Offset="0xE090" />
-        <Limb Name="gDekuButlerLeftFootLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_FOOT" Offset="0xE09C" />
-        <Limb Name="gDekuButlerEyesLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_EYES" Offset="0xE0A8" />
-        <Limb Name="gDekuButlerRightUpperArmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_UPPER_ARM" Offset="0xE0B4" />
-        <Limb Name="gDekuButlerRightForearmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_FOREARM" Offset="0xE0C0" />
-        <Limb Name="gDekuButlerRightHandLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_HAND" Offset="0xE0CC" />
-        <Limb Name="gDekuButlerParasolHandleLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_HANDLE" Offset="0xE0D8" />
-        <Limb Name="gDekuButlerParasolUpperPetalsLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_UPPER_PETALS" Offset="0xE0E4" />
-        <Limb Name="gDekuButlerParasolLowerPetalsLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_LOWER_PETALS" Offset="0xE0F0" />
-        <Limb Name="gDekuButlerParasolMiddlePetalsLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_MIDDLE_PETALS" Offset="0xE0FC" />
-        <Limb Name="gDekuButlerSnoutLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_SNOUT" Offset="0xE108" />
-        <Limb Name="gDekuButlerLeftMustacheBaseLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_MUSTACHE_BASE" Offset="0xE114" />
-        <Limb Name="gDekuButlerLeftMustacheCurlLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_MUSTACHE_CURL" Offset="0xE120" />
-        <Limb Name="gDekuButlerRightMustacheBaseLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_MUSTACHE_BASE" Offset="0xE12C" />
-        <Limb Name="gDekuButlerRightMustacheCurlLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_MUSTACHE_CURL" Offset="0xE138" />
-        <Limb Name="gDekuButlerLeftUpperArmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_UPPER_ARM" Offset="0xE144" />
-        <Limb Name="gDekuButlerLeftForearmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_FOREARM" Offset="0xE150" />
-        <Limb Name="gDekuButlerLeftHandLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_HAND" Offset="0xE15C" />
-        <Limb Name="gDekuButlerCandleLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_CANDLE" Offset="0xE168" />
-        <Limb Name="gDekuButlerCandleWickLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_CANDLE_WICK" Offset="0xE174" />
-        <Limb Name="gDekuButlerUpperBodyLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_UPPER_BODY" Offset="0xE180" />
-
-        <!-- Deku Butler Skeleton -->
-        <Skeleton Name="gDekuButlerSkel" Type="Flex" LimbType="Standard" LimbNone="DEKU_BUTLER_LIMB_NONE" LimbMax="DEKU_BUTLER_LIMB_MAX" EnumName="DekuButlerLimb" Offset="0xE1F8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnk.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnk.xml
deleted file mode 100644
index 0e35b1f97..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnk.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<Root>
-    <!-- Assets for Deku Palace Guards -->
-    <File Name="object_dnk" Segment="6">
-        <Animation Name="gDekuPalaceGuardAttackAnim" Offset="0x31C" /> <!-- Original name is "dnk_attack" -->
-        <Animation Name="gDekuPalaceGuardDigAnim" Offset="0x430" /> <!-- Original name is "dnk_dig" -->
-        <Animation Name="gDekuPalaceGuardHappyAnim" Offset="0x6CC" /> <!-- Original name is "dnk_happy" -->
-        <Animation Name="gDekuPalaceGuardJumpAnim" Offset="0x894" /> <!-- Original name is "dnk_jump" -->
-        <Animation Name="gDekuPalaceGuardStartAnim" Offset="0xB70" /> <!-- Original name is "dnk_start" -->
-        <Texture Name="gDekuPalaceGuardLeafTorsoTex" OutName="deku_palace_guard_leaf_torso" Format="rgba16" Width="32" Height="32" Offset="0xB80" />
-        <Texture Name="gDekuPalaceGuardFootTex" OutName="deku_palace_guard_foot" Format="rgba16" Width="16" Height="16" Offset="0x1380" />
-        <Texture Name="gDekuPalaceGuardHeadTex" OutName="deku_palace_guard_head" Format="rgba16" Width="8" Height="8" Offset="0x1580" />
-        <Texture Name="gDekuPalaceGuardMouthTex" OutName="deku_palace_guard_mouth" Format="rgba16" Width="8" Height="8" Offset="0x1600" />
-        <Texture Name="gDekuPalaceGuardEyeOpenTex" OutName="deku_palace_guard_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x1680" />
-        <Texture Name="gDekuPalaceGuardEyeHalfTex" OutName="deku_palace_guard_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x1700" />
-        <Texture Name="gDekuPalaceGuardEyeClosedTex" OutName="deku_palace_guard_eye_closed" Format="rgba16" Width="8" Height="8" Offset="0x1780" />
-        <DList Name="gDekuPalaceGuardRightLeafDL" Offset="0x1DD0" />
-        <DList Name="gDekuPalaceGuardRightLeaf2DL" Offset="0x1E58" />
-        <DList Name="gDekuPalaceGuardLeftLeafDL" Offset="0x1E68" />
-        <DList Name="gDekuPalaceGuardLeftLeaf2DL" Offset="0x1EF0" />
-        <DList Name="gDekuPalaceGuardRearLeafDL" Offset="0x1F00" />
-        <DList Name="gDekuPalaceGuardRearLeaf2DL" Offset="0x1F90" />
-        <DList Name="gDekuPalaceGuardCenterLeafDL" Offset="0x1FA0" />
-        <DList Name="gDekuPalaceGuardCenterLeaf2DL" Offset="0x2030" />
-        <DList Name="gDekuPalaceGuardTorsoDL" Offset="0x2040" />
-        <DList Name="gDekuPalaceGuardTorso2DL" Offset="0x20F0" />
-        <DList Name="gDekuPalaceGuardEyesDL" Offset="0x2100" />
-        <DList Name="gDekuPalaceGuardEyes2DL" Offset="0x2188" />
-        <DList Name="gDekuPalaceGuardRightFootDL" Offset="0x2198" />
-        <DList Name="gDekuPalaceGuardRightFoot2DL" Offset="0x2240" />
-        <DList Name="gDekuPalaceGuardLeftFootDL" Offset="0x2250" />
-        <DList Name="gDekuPalaceGuardLeftFoot2DL" Offset="0x22F8" />
-        <DList Name="gDekuPalaceGuardHeadDL" Offset="0x2308" />
-        <DList Name="gDekuPalaceGuardHead2DL" Offset="0x2400" />
-        <DList Name="gDekuPalaceGuardSnoutDL" Offset="0x2410" />
-        <DList Name="gDekuPalaceGuardSnout2DL" Offset="0x2510" />
-        <DList Name="gDekuPalaceGuardFlowerDL" Offset="0x2700" />
-        <Limb Name="gDekuPalaceGuardTorsoLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_TORSO" Offset="0x27A8" />
-        <Limb Name="gDekuPalaceGuardHeadLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_HEAD" Offset="0x27B4" />
-        <Limb Name="gDekuPalaceGuardLeftLeafLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_LEFT_LEAF" Offset="0x27C0" />
-        <Limb Name="gDekuPalaceGuardRightLeafLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_RIGHT_LEAF" Offset="0x27CC" />
-        <Limb Name="gDekuPalaceGuardCenterLeafLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_CENTER_LEAF" Offset="0x27D8" />
-        <Limb Name="gDekuPalaceGuardRearLeafLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_REAR_LEAF" Offset="0x27E4" />
-        <Limb Name="gDekuPalaceGuardSnoutLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_SNOUT" Offset="0x27F0" />
-        <Limb Name="gDekuPalaceGuardEyesLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_EYES" Offset="0x27FC" />
-        <Limb Name="gDekuPalaceGuardLeftFootLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_LEFT_FOOT" Offset="0x2808" />
-        <Limb Name="gDekuPalaceGuardRightFootLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_RIGHT_FOOT" Offset="0x2814" />
-        <Skeleton Name="gDekuPalaceGuardSkel" Type="Normal" LimbType="Standard" LimbNone="DEKU_PALACE_GUARD_LIMB_NONE" LimbMax="DEKU_PALACE_GUARD_LIMB_MAX" EnumName="DekuPalaceGuardLimb" Offset="0x2848" />
-        <Animation Name="gDekuPalaceGuardWaitAnim" Offset="0x2A08" /> <!-- Original name is "dnk_wait" -->
-        <Animation Name="gDekuPalaceGuardWalkAnim" Offset="0x2B6C" /> <!-- Original name is "dnk_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dno.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dno.xml
deleted file mode 100644
index e5b3323dc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dno.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<Root>
-    <!-- Assets for the Deku King -->
-    <File Name="object_dno" Segment="6">
-        <!-- Deku King Animations -->
-        <Animation Name="gDekuKingJumpedOnStartAnim" Offset="0x6F0" /> <!-- Original name is "dno_attack2" -->
-        <Animation Name="gDekuKingJumpedOnLoopAnim" Offset="0xBF8" /> <!-- Original name is "dno_attack2_loop" -->
-        <Animation Name="gDekuKingSpinScepterAnim" Offset="0x1100" /> <!-- Original name is "dno_batton" -->
-        <Animation Name="gDekuKingMarchAnim" Offset="0x1AEC" /> <!-- Original name is "dno_battonwalk" -->
-        <Animation Name="gDekuKingJumpedOnEndAnim" Offset="0x2690" /> <!-- Original name is "dno_gaku" -->
-        <Animation Name="gDekuKingLyingDownTwitchAnim" Offset="0x3408" /> <!-- Original name is "dno_gaku_loop" -->
-        <Animation Name="gDekuKingLaughAnim" Offset="0x3DBC" /> <!-- Original name is "dno_gebohaha" (onomatopoetic for a boisterous laugh) -->
-        <Animation Name="gDekuKingJumpAnim" Offset="0x47B8" /> <!-- Original name is "dno_gogojump" -->
-        <Animation Name="gDekuKingIntimidateAnim" Offset="0x4EA0" /> <!-- Original name is "dno_horehore" -->
-        <Animation Name="gDekuKingWailStartAnim" Offset="0x5284" /> <!-- Original name is "dno_jidaTOnage" -->
-        <Animation Name="gDekuKingFootStampLoopAnim" Offset="0x5A14" /> <!-- Original name is "dno_jidanda" ("to stamp one's feet (in frustration, impatience, etc.)​") -->
-        <Animation Name="gDekuKingFootStampStartAnim" Offset="0x5E18" /> <!-- Original name is "dno_nageTOjida" -->
-        <Animation Name="gDekuKingWailLoopAnim" Offset="0x6984" /> <!-- Original name is "dno_nageki" ("grief; lamentation​") -->
-        <Animation Name="gDekuKingSurpriseAnim" Offset="0x7528" /> <!-- Original name is "dno_oh" -->
-        <Animation Name="gDekuKingIdleAnim" Offset="0x8328" /> <!-- Original name is "dno_wait" -->
-
-        <!-- Deku King Textures -->
-        <Texture Name="gDekuKingBodyTex" OutName="deku_king_body" Format="rgba16" Width="16" Height="16" Offset="0x8340" />
-        <Texture Name="gDekuKingMustacheAndLoinclothLeafTex" OutName="deku_king_mustache_and_loincloth_leaf" Format="rgba16" Width="16" Height="16" Offset="0x8540" />
-        <Texture Name="gDekuKingCrownTex" OutName="deku_king_crown" Format="rgba16" Width="32" Height="32" Offset="0x8740" />
-        <Texture Name="gDekuKingLeavesTex" OutName="deku_king_leaves" Format="rgba16" Width="32" Height="64" Offset="0x8F40" />
-        <Texture Name="gDekuKingBeardLeavesTex" OutName="deku_king_beard_leaves" Format="rgba16" Width="32" Height="32" Offset="0x9F40" />
-        <Texture Name="gDekuKingEyeTex" OutName="deku_king_eye" Format="rgba16" Width="16" Height="16" Offset="0xA740" />
-        <Texture Name="gDekuKingScepterTipTex" OutName="deku_king_scepter_tip" Format="rgba16" Width="8" Height="8" Offset="0xA940" />
-        <Texture Name="gDekuKingScepterPetalTex" OutName="deku_king_scepter_petal" Format="rgba16" Width="16" Height="16" Offset="0xA9C0" />
-        <Texture Name="gDekuKingSnoutTex" OutName="deku_king_snout" Format="rgba16" Width="8" Height="8" Offset="0xABC0" />
-        <Texture Name="gDekuKingMouthTex" OutName="deku_king_mouth" Format="rgba16" Width="8" Height="8" Offset="0xAC40" />
-
-        <!-- Deku King Limb DisplayLists -->
-        <DList Name="gDekuKingCrownDL" Offset="0xC9B0" />
-        <DList Name="gDekuKingCrownLeavesDL" Offset="0xCB70" />
-        <DList Name="gDekuKingUpperBodyDL" Offset="0xCC10" />
-        <DList Name="gDekuKingEyesDL" Offset="0xCE38" />
-        <DList Name="gDekuKingLeftHandDL" Offset="0xCED0" />
-        <DList Name="gDekuKingLeftForearmDL" Offset="0xCFA8" />
-        <DList Name="gDekuKingLeftForearmLowerLeavesDL" Offset="0xD050" />
-        <DList Name="gDekuKingLeftForearmUpperLeavesDL" Offset="0xD140" />
-        <DList Name="gDekuKingLeftUpperArmDL" Offset="0xD230" />
-        <DList Name="gDekuKingLeftUpperArmLowerLeavesDL" Offset="0xD2E8" />
-        <DList Name="gDekuKingLeftUpperArmUpperLeavesDL" Offset="0xD3D8" />
-        <DList Name="gDekuKingSnoutDL" Offset="0xD4C8" />
-        <DList Name="gDekuKingRightLowerMustacheDL" Offset="0xD668" />
-        <DList Name="gDekuKingRightUpperMustacheDL" Offset="0xD758" />
-        <DList Name="gDekuKingLeftLowerMustacheDL" Offset="0xD848" />
-        <DList Name="gDekuKingLeftUpperMustacheDL" Offset="0xD938" />
-        <DList Name="gDekuKingRightHandDL" Offset="0xDA28" />
-        <DList Name="gDekuKingScepterDL" Offset="0xDB00" />
-        <DList Name="gDekuKingRightForearmDL" Offset="0xDCA8" />
-        <DList Name="gDekuKingRightForearmLowerLeavesDL" Offset="0xDD50" />
-        <DList Name="gDekuKingRightForearmUpperLeavesDL" Offset="0xDE40" />
-        <DList Name="gDekuKingRightUpperArmDL" Offset="0xDF30" />
-        <DList Name="gDekuKingRightUpperArmLowerLeavesDL" Offset="0xDFE8" />
-        <DList Name="gDekuKingRightUpperArmUpperLeavesDL" Offset="0xE0D8" />
-        <DList Name="gDekuKingPelvisDL" Offset="0xE1C8" />
-        <DList Name="gDekuKingRightFootDL" Offset="0xE318" />
-        <DList Name="gDekuKingRightShinDL" Offset="0xE420" />
-        <DList Name="gDekuKingRightThighDL" Offset="0xE538" />
-        <DList Name="gDekuKingLeftFootDL" Offset="0xE630" />
-        <DList Name="gDekuKingLeftShinDL" Offset="0xE738" />
-        <DList Name="gDekuKingLeftThighDL" Offset="0xE850" />
-
-        <!-- Deku King Limbs -->
-        <Limb Name="gDekuKingRootLimb" Type="Standard" EnumName="DEKU_KING_LIMB_ROOT" Offset="0xE948" />
-        <Limb Name="gDekuKingPelvisLimb" Type="Standard" EnumName="DEKU_KING_LIMB_PELVIS" Offset="0xE954" />
-        <Limb Name="gDekuKingLeftThighLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_THIGH" Offset="0xE960" />
-        <Limb Name="gDekuKingLeftShinLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_SHIN" Offset="0xE96C" />
-        <Limb Name="gDekuKingLeftFootLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_FOOT" Offset="0xE978" />
-        <Limb Name="gDekuKingRightThighLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_THIGH" Offset="0xE984" />
-        <Limb Name="gDekuKingRightShinLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_SHIN" Offset="0xE990" />
-        <Limb Name="gDekuKingRightFootLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_FOOT" Offset="0xE99C" />
-        <Limb Name="gDekuKingUpperBodyLimb" Type="Standard" EnumName="DEKU_KING_LIMB_UPPER_BODY" Offset="0xE9A8" />
-        <Limb Name="gDekuKingRightUpperArmLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_UPPER_ARM" Offset="0xE9B4" />
-        <Limb Name="gDekuKingRightUpperArmUpperLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_UPPER_ARM_UPPER_LEAVES" Offset="0xE9C0" />
-        <Limb Name="gDekuKingRightUpperArmLowerLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_UPPER_ARM_LOWER_LEAVES" Offset="0xE9CC" />
-        <Limb Name="gDekuKingRightForearmLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_FOREARM" Offset="0xE9D8" />
-        <Limb Name="gDekuKingRightForearmUpperLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_FOREARM_UPPER_LEAVES" Offset="0xE9E4" />
-        <Limb Name="gDekuKingRightForearmLowerLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_FOREARM_LOWER_LEAVES" Offset="0xE9F0" />
-        <Limb Name="gDekuKingRightHandLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_HAND" Offset="0xE9FC" />
-        <Limb Name="gDekuKingScepterLimb" Type="Standard" EnumName="DEKU_KING_LIMB_SCEPTER" Offset="0xEA08" />
-        <Limb Name="gDekuKingSnoutLimb" Type="Standard" EnumName="DEKU_KING_LIMB_SNOUT" Offset="0xEA14" />
-        <Limb Name="gDekuKingLeftUpperMustacheLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_UPPER_MUSTACHE" Offset="0xEA20" />
-        <Limb Name="gDekuKingLeftLowerMustacheLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_LOWER_MUSTACHE" Offset="0xEA2C" />
-        <Limb Name="gDekuKingRightUpperMustacheLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_UPPER_MUSTACHE" Offset="0xEA38" />
-        <Limb Name="gDekuKingRightLowerMustacheLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_LOWER_MUSTACHE" Offset="0xEA44" />
-        <Limb Name="gDekuKingLeftUpperArmLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_UPPER_ARM" Offset="0xEA50" />
-        <Limb Name="gDekuKingLeftUpperArmUpperLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_UPPER_ARM_UPPER_LEAVES" Offset="0xEA5C" />
-        <Limb Name="gDekuKingLeftUpperArmLowerLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_UPPER_ARM_LOWER_LEAVES" Offset="0xEA68" />
-        <Limb Name="gDekuKingLeftForearmLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_FOREARM" Offset="0xEA74" />
-        <Limb Name="gDekuKingLeftForearmUpperLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_FOREARM_UPPER_LEAVES" Offset="0xEA80" />
-        <Limb Name="gDekuKingLeftForearmLowerLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_FOREARM_LOWER_LEAVES" Offset="0xEA8C" />
-        <Limb Name="gDekuKingLeftHandLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_HAND" Offset="0xEA98" />
-        <Limb Name="gDekuKingEyesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_EYES" Offset="0xEAA4" />
-        <Limb Name="gDekuKingCrownLimb" Type="Standard" EnumName="DEKU_KING_LIMB_CROWN" Offset="0xEAB0" />
-        <Limb Name="gDekuKingCrownLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_CROWN_LEAVES" Offset="0xEABC" />
-
-        <!-- Deku King Skeleton -->
-        <Skeleton Name="gDekuKingSkel" Type="Flex" LimbType="Standard" LimbNone="DEKU_KING_LIMB_NONE" LimbMax="DEKU_KING_LIMB_MAX" EnumName="DekuKingLimb" Offset="0xEB48" />
-
-        <!-- Deku King Animation -->
-        <Animation Name="gDekuKingPointScepterAnim" Offset="0xF504" /> <!-- Original name is "dno_yubisashi" ("pointing at") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnq.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnq.xml
deleted file mode 100644
index 4a21dbfef..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnq.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<Root>
-    <!-- Assets for the Deku Princess. -->
-    <File Name="object_dnq" Segment="6">
-        <!-- Deku Princess Animations -->
-        <Animation Name="gDekuPrincessJumpKickAnim" Offset="0x7D8" /> <!-- Original name is "dnq_atack" -->
-        <Animation Name="gDekuPrincessJumpAnim" Offset="0x125C" /> <!-- Original name is "dnq_attack1" -->
-        <Animation Name="gDekuPrincessBounceStartAnim" Offset="0x17F8" /> <!-- Original name is "dnq_attack2" -->
-        <Animation Name="gDekuPrincessBounceLoopAnim" Offset="0x1C1C" /> <!-- Original name is "dnq_attack2_loop" -->
-        <Animation Name="gDekuPrincessHurryAnim" Offset="0x21DC" /> <!-- Original name is "dnq_awate" ("to hurry; to rush; to hasten") -->
-        <Animation Name="gDekuPrincessHurryEndAnim" Offset="0x26B8" /> <!-- Original name is "dnq_awateTOwait" -->
-        <Animation Name="gDekuPrincessScoldAnim" Offset="0x4D08" /> <!-- Original name is "dnq_baka" ("idiot; moron; fool") -->
-        <Animation Name="gDekuPrincessGlareStartAnim" Offset="0x57AC" /> <!-- Original name is "dnq_gekido" ("rage; fury​") -->
-        <Animation Name="gDekuPrincessGlareLoopAnim" Offset="0x625C" /> <!-- Origianl name is "dnq_gekido_loop" -->
-        <Animation Name="gDekuPrincessThinkLoopAnim" Offset="0x674C" /> <!-- Original name is "dnq_hatena" ("question") -->
-        <Animation Name="gDekuPrincessArmsTogetherLoopAnim" Offset="0x6B74" /> <!-- Original name is "dnq_ho" -->
-        <Animation Name="gDekuPrincessLaughStartAnim" Offset="0x71F4" /> <!-- Original name is "dnq_hoTOhohoho" -->
-        <Animation Name="gDekuPrincessLaughLoopAnim" Offset="0x7960" /> <!-- Original name is "dnq_hohoho" -->
-        <Animation Name="gDekuPrincessTurnAroundAnim" Offset="0x8588" /> <!-- Original name is "dnq_maji" (from her Japanese dialogue, like "really?!" or "seriously?!")-->
-        <Animation Name="gDekuPrincessAngryStartAnim" Offset="0x923C" /> <!-- Original name is "dnq_okoru" ("to get angry; to get mad​") -->
-        <Animation Name="gDekuPrincessAngryLoopAnim" Offset="0x9AA0" /> <!-- Original name is "dnq_okoru_loop" -->
-        <Animation Name="gDekuPrincessBowAnim" Offset="0xA900" /> <!-- Original name is "dnq_orei" ("bow") -->
-        <Animation Name="gDekuPrincessRunAnim" Offset="0xAEB8" /> <!-- Original name is "dnq_run" -->
-        <Animation Name="gDekuPrincessIdleAnim" Offset="0xB324" /> <!-- Original name is "dnq_wait" -->
-        <Animation Name="gDekuPrincessThinkStartAnim" Offset="0xB754" /> <!-- Original name is "dnq_waitTOhatena" -->
-        <Animation Name="gDekuPrincessArmsTogetherStartAnim" Offset="0xBAD8" /> <!-- Original name is "dnq_waitTOho" -->
-
-        <!-- Deku Princess Limb DisplayLists -->
-        <DList Name="gDekuPrincessHeadDL" Offset="0xD670" />
-        <DList Name="gDekuPrincessEyesDL" Offset="0xD978" />
-        <DList Name="gDekuPrincessHair9DL" Offset="0xDA08" />
-        <DList Name="gDekuPrincessHair8DL" Offset="0xDAA0" />
-        <DList Name="gDekuPrincessHair7DL" Offset="0xDB38" />
-        <DList Name="gDekuPrincessHair6DL" Offset="0xDBD0" />
-        <DList Name="gDekuPrincessHair5DL" Offset="0xDC68" />
-        <DList Name="gDekuPrincessHair4DL" Offset="0xDD00" />
-        <DList Name="gDekuPrincessHair3DL" Offset="0xDD98" />
-        <DList Name="gDekuPrincessHair2DL" Offset="0xDE30" />
-        <DList Name="gDekuPrincessHair1DL" Offset="0xDEC8" />
-        <DList Name="gDekuPrincessSnoutDL" Offset="0xE018" />
-        <DList Name="gDekuPrincessRightEarringDL" Offset="0xE1C8" />
-        <DList Name="gDekuPrincessLeftEarringDL" Offset="0xE260" />
-        <DList Name="gDekuPrincessNeckDL" Offset="0xE2F8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gDekuPrincessTorsoDL" Offset="0xE340" />
-        <DList Name="gDekuPrincessRightSleeveEndDL" Offset="0xE410" />
-        <DList Name="gDekuPrincessRightForearmDL" Offset="0xE530" />
-        <DList Name="gDekuPrincessRightUpperArmDL" Offset="0xE650" />
-        <DList Name="gDekuPrincessLeftSleeveEndDL" Offset="0xE768" />
-        <DList Name="gDekuPrincessLeftForearmDL" Offset="0xE888" />
-        <DList Name="gDekuPrincessLeftUpperArmDL" Offset="0xE9A8" />
-        <DList Name="gDekuPrincessDressDL" Offset="0xEAC0" />
-        <DList Name="gDekuPrincessDressTrainDL" Offset="0xEBD8" />
-
-        <!-- Deku Princess Textures -->
-        <Texture Name="gDekuPrincessPetalTex" OutName="deku_princess_petal" Format="rgba16" Width="16" Height="32" Offset="0xECD0" />
-        <Texture Name="gDekuPrincessHairLeafTex" OutName="deku_princess_hair_leaf" Format="rgba16" Width="16" Height="32" Offset="0xF0D0" />
-        <Texture Name="gDekuPrincessHeadTex" OutName="deku_princess_head" Format="rgba16" Width="4" Height="16" Offset="0xF4D0" />
-        <Texture Name="gDekuPrincessMouthTex" OutName="deku_princess_mouth" Format="rgba16" Width="8" Height="8" Offset="0xF550" />
-        <Texture Name="gDekuPrincessFaceTex" OutName="deku_princess_face" Format="rgba16" Width="16" Height="16" Offset="0xF5D0" />
-        <Texture Name="gDekuPrincessDressTex" OutName="deku_princess_dress" Format="rgba16" Width="32" Height="32" Offset="0xF7D0" />
-        <Texture Name="gDekuPrincessSleeveTex" OutName="deku_princess_sleeve" Format="rgba16" Width="16" Height="32" Offset="0xFFD0" />
-        <Texture Name="gDekuPrincessEyeOpenTex" OutName="deku_princess_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x103D0" />
-        <Texture Name="gDekuPrincessEyeHalfTex" OutName="deku_princess_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x105D0" />
-        <Texture Name="gDekuPrincessEyeClosedTex" OutName="deku_princess_eye_closed" Format="rgba16" Width="16" Height="16" Offset="0x107D0" />
-        <Texture Name="gDekuPrincessEyeAngryTex" OutName="deku_princess_eye_angry" Format="rgba16" Width="16" Height="16" Offset="0x109D0" />
-
-        <!-- Deku Princess Limbs -->
-        <Limb Name="gDekuPrincessRootLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_ROOT" Offset="0x10BD0" />
-        <Limb Name="gDekuPrincessDressLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_DRESS" Offset="0x10BDC" />
-        <Limb Name="gDekuPrincessDressTrainLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_DRESS_TRAIN" Offset="0x10BE8" />
-        <Limb Name="gDekuPrincessTorsoLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_TORSO" Offset="0x10BF4" />
-        <Limb Name="gDekuPrincessLeftUpperArmLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_LEFT_UPPER_ARM" Offset="0x10C00" />
-        <Limb Name="gDekuPrincessLeftForearmLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_LEFT_FOREARM" Offset="0x10C0C" />
-        <Limb Name="gDekuPrincessLeftSleeveEndLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_LEFT_SLEEVE_END" Offset="0x10C18" />
-        <Limb Name="gDekuPrincessRightUpperArmLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_RIGHT_UPPER_ARM" Offset="0x10C24" />
-        <Limb Name="gDekuPrincessRightForearmLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_RIGHT_FOREARM" Offset="0x10C30" />
-        <Limb Name="gDekuPrincessRightSleeveEndLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_RIGHT_SLEEVE_END" Offset="0x10C3C" />
-        <Limb Name="gDekuPrincessNeckLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_NECK" Offset="0x10C48" />
-        <Limb Name="gDekuPrincessHeadLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HEAD" Offset="0x10C54" />
-        <Limb Name="gDekuPrincessLeftEarringLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_LEFT_EARRING" Offset="0x10C60" />
-        <Limb Name="gDekuPrincessRightEarringLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_RIGHT_EARRING" Offset="0x10C6C" />
-        <Limb Name="gDekuPrincessSnoutLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_SNOUT" Offset="0x10C78" />
-        <Limb Name="gDekuPrincessHair1Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_1" Offset="0x10C84" />
-        <Limb Name="gDekuPrincessHair2Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_2" Offset="0x10C90" />
-        <Limb Name="gDekuPrincessHair3Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_3" Offset="0x10C9C" />
-        <Limb Name="gDekuPrincessHair4Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_4" Offset="0x10CA8" />
-        <Limb Name="gDekuPrincessHair5Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_5" Offset="0x10CB4" />
-        <Limb Name="gDekuPrincessHair6Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_6" Offset="0x10CC0" />
-        <Limb Name="gDekuPrincessHair7Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_7" Offset="0x10CCC" />
-        <Limb Name="gDekuPrincessHair8Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_8" Offset="0x10CD8" />
-        <Limb Name="gDekuPrincessHair9Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_9" Offset="0x10CE4" />
-        <Limb Name="gDekuPrincessEyesLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_EYES" Offset="0x10CF0" />
-
-        <!-- Deku Princess Skeleton -->
-        <Skeleton Name="gDekuPrincessSkel" Type="Flex" LimbType="Standard" LimbNone="DEKU_PRINCESS_LIMB_NONE" LimbMax="DEKU_PRINCESS_LIMB_MAX" EnumName="DekuPrincessLimb" Offset="0x10D60" />
-
-        <!-- Deku Princess Animations -->
-        <Animation Name="gDekuPrincessWalkAnim" Offset="0x115B8" /> <!-- Original name is "dnq_walk" -->
-        <Animation Name="gDekuPrincessGreetingAnim" Offset="0x12428" /> <!-- Original name is "dnq_yorosiku" (probably short for "pleased to meet you") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dns.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dns.xml
deleted file mode 100644
index 903dfba6c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dns.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<Root>
-    <!-- Assets for the King's Chamber Deku Guards -->
-    <File Name="object_dns" Segment="6">
-        <Animation Name="gKingsChamberDekuGuardDanceAnim" Offset="0x2A8" /> <!-- Original name is "dns_dance" -->
-        <Animation Name="gKingsChamberDekuGuardFlipAnim" Offset="0x734" /> <!-- Original name is "dns_dancejump" -->
-        <Animation Name="gKingsChamberDekuGuardSurpriseStartAnim" Offset="0x8F4" /> <!-- Original name is "dns_furueru" ("to shiver") -->
-        <Animation Name="gKingsChamberDekuGuardSurpriseLoopAnim" Offset="0xBD8" />
-        <Animation Name="gKingsChamberDekuGuardRunStartAnim" Offset="0xD58" /> <!-- Original name is "dns_hasiru" ("to run") -->
-        <Animation Name="gKingsChamberDekuGuardRunLoopAnim" Offset="0xFEC" />
-        <DList Name="gKingsChamberDekuGuardRightFootDL" Offset="0x1640" />
-        <DList Name="gKingsChamberDekuGuardLeftFootDL" Offset="0x16F0" />
-        <DList Name="gKingsChamberDekuGuardSnoutDL" Offset="0x17A0" />
-        <DList Name="gKingsChamberDekuGuardHeadDL" Offset="0x18B8" />
-        <DList Name="gKingsChamberDekuGuardStalkDL" Offset="0x19B8" />
-        <DList Name="gKingsChamberDekuGuardEyesDL" Offset="0x1A50" />
-        <DList Name="gKingsChamberDekuGuardTorsoDL" Offset="0x1AD8" />
-        <DList Name="gKingsChamberDekuGuardLeftMustacheDL" Offset="0x1B90" />
-        <DList Name="gKingsChamberDekuGuardRightMustacheDL" Offset="0x1C20" />
-        <DList Name="gKingsChamberDekuGuardLeftLeafDL" Offset="0x1CB0" />
-        <DList Name="gKingsChamberDekuGuardCenterLeafDL" Offset="0x1D40" />
-        <DList Name="gKingsChamberDekuGuardRightLeafDL" Offset="0x1DD8" />
-        <Texture Name="gKingsChamberDekuGuardLeafTex" OutName="kings_chamber_deku_guard_leaf" Format="rgba16" Width="32" Height="32" Offset="0x1E68" />
-        <Texture Name="gKingsChamberDekuGuardBodyTex" OutName="kings_chamber_deku_guard_body" Format="rgba16" Width="16" Height="16" Offset="0x2668" />
-        <Texture Name="gKingsChamberDekuGuardMouthTex" OutName="kings_chamber_deku_guard_mouth" Format="rgba16" Width="8" Height="8" Offset="0x2868" />
-        <Texture Name="gKingsChamberDekuGuardEyeOpenTex" OutName="kings_chamber_deku_guard_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x28E8" />" Format="rgba16" Width="8" Height="8" Offset="0x28E8" />
-        <Texture Name="gKingsChamberDekuGuardEyeHalfTex" OutName="kings_chamber_deku_guard_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x2968" />
-        <Texture Name="gKingsChamberDekuGuardEyeClosedTex" OutName="kings_chamber_deku_guard_eye_closed" Format="rgba16" Width="8" Height="8" Offset="0x29E8" />
-        <DList Name="gKingsChamberDekuGuardDekuFlowerDL" Offset="0x2C48" />
-        <Limb Name="gKingsChamberDekuGuardTorsoLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_TORSO" Offset="0x2D18" />
-        <Limb Name="gKingsChamberDekuGuardHeadLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_HEAD" Offset="0x2D24" />
-        <Limb Name="gKingsChamberDekuGuardStalkLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_STALK" Offset="0x2D30" />
-        <Limb Name="gKingsChamberDekuGuardLeftLeafLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_LEFT_LEAF" Offset="0x2D3C" />
-        <Limb Name="gKingsChamberDekuGuardRightLeafLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_RIGHT_LEAF" Offset="0x2D48" />
-        <Limb Name="gKingsChamberDekuGuardCenterLeafLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_CENTER_LEAF" Offset="0x2D54" />
-        <Limb Name="gKingsChamberDekuGuardSnoutLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_SNOUT" Offset="0x2D60" />
-        <Limb Name="gKingsChamberDekuGuardRightMustacheLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_RIGHT_MUSTACHE" Offset="0x2D6C" />
-        <Limb Name="gKingsChamberDekuGuardLeftMustacheLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_LEFT_MUSTACHE" Offset="0x2D78" />
-        <Limb Name="gKingsChamberDekuGuardEyesLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_EYES" Offset="0x2D84" />
-        <Limb Name="gKingsChamberDekuGuardLeftFootLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_LEFT_FOOT" Offset="0x2D90" />
-        <Limb Name="gKingsChamberDekuGuardRightFootLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_RIGHT_FOOT" Offset="0x2D9C" />
-        <Skeleton Name="gKingsChamberDekuGuardSkel" Type="Normal" LimbType="Standard" LimbNone="KINGS_CHAMBER_DEKU_GUARD_LIMB_NONE" LimbMax="KINGS_CHAMBER_DEKU_GUARD_LIMB_MAX" EnumName="KingsChamberDekuGuardLimb" Offset="0x2DD8" />
-        <Animation Name="gKingsChamberDekuGuardIdleAnim" Offset="0x3310" /> <!-- Original name is "dns_wait" -->
-        <Animation Name="gKingsChamberDekuGuardWalkAnim" Offset="0x34EC" /> <!-- Original name is "dns_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnt.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnt.xml
deleted file mode 100644
index 658720258..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dnt.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<Root>
-    <!-- Assets for business scrubs -->
-    <File Name="object_dnt" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gBusinessScrubShockedPoundAnim" Offset="0x994" /> <!-- Original name is "dnt_banban" -->
-        <Animation Name="gBusinessScrubTakeOffHatAnim" Offset="0x12F4" /> <!-- Original name is "dnt_boyon" -->
-
-        <!-- Additional Eyes DLs -->
-        <DList Name="gBusinessScrubEyesWideDL" Offset="0x1350" />
-        <DList Name="gBusinessScrubEyesSquintDL" Offset="0x1420" />
-
-        <!-- Animations -->
-        <Animation Name="gBusinessScrubFlyLoopAnim" Offset="0x1BC8" /> <!-- Original name is "dnt_fly" -->
-        <Animation Name="gBusinessScrubShockedShakeHeadAnim" Offset="0x1E2C" /> <!-- Original name is "dnt_iyaiya" -->
-        <Animation Name="gBusinessScrubShockedEndAnim" Offset="0x2268" /> <!-- Original name is "dnt_iyaiyaTOmuun" -->
-        <Animation Name="gBusinessScrubFlyEndAnim" Offset="0x2670" /> <!-- Original name is "dnt_kouka" -->
-        <Animation Name="gBusinessScrubBurrowAnim" Offset="0x29E8" /> <!-- Original name is "dnt_moguru" -->
-        <Animation Name="gBusinessScrubThinkAnim" Offset="0x2F08" /> <!-- Original name is "dnt_muun" -->
-        <Animation Name="gBusinessScrubShockedStartAnim" Offset="0x3438" /> <!-- Original name is "dnt_nooo" -->
-        <Animation Name="gBusinessScrubExcitedLoopAnim" Offset="0x38CC" /> <!-- Original name is "dnt_onedari" -->
-        <Animation Name="gBusinessScrubExcitedEndAnim" Offset="0x3CC0" /> <!-- Original name is "dnt_onedariTOwait" -->
-        <TextureAnimation Name="gBusinessScrubEmptyTexAnim" Offset="0x3CD0" />
-        <Animation Name="gBusinessScrubFlyStartAnim" Offset="0x4700" /> <!-- Original name is "dnt_spoon" -->
-        <Animation Name="gBusinessScrubRiseUpAnim" Offset="0x4AA0" /> <!-- Original name is "dnt_tobidasu01" -->
-        <Animation Name="gBusinessScrubJumpAnim" Offset="0x4E38" /> <!-- Original name is "dnt_tobidasu02" -->
-        <Animation Name="gBusinessScrubStandingAnim" Offset="0x5488" /> <!-- Original name is "dnt_wait" -->
-        <Animation Name="gBusinessScrubBobAnim" Offset="0x577C" /> <!-- Original name is "dnt_wait02" --> <!-- used as the idle anim when half burrowed into a deku flower-->
-        <Animation Name="gBusinessScrubExcitedStartAnim" Offset="0x5CA8" /> <!-- Original name is "dnt_waitTOonedari" -->
-
-        <!-- DLs -->
-        <DList Name="gBusinessScrubHeadDL" Offset="0x7EA0" />
-        <DList Name="gBusinessScrubLeftArmBagDL" Offset="0x8048" />
-        <DList Name="gBusinessScrubEyesDL" Offset="0x8290" />
-        <DList Name="gBusinessScrubScalpDL" Offset="0x8320" />
-        <DList Name="gBusinessScrubHatDL" Offset="0x8438" />
-        <DList Name="gBusinessScrubHairDL" Offset="0x85D8" />
-        <DList Name="gBusinessScrubLeftEarDL" Offset="0x8688" />
-        <DList Name="gBusinessScrubLeftHandDL" Offset="0x8718" />
-        <DList Name="gBusinessScrubLeftHandBagDL" Offset="0x8838" />
-        <DList Name="gBusinessScrubLeftForearmDL" Offset="0x8A48" />
-        <DList Name="gBusinessScrubLeftUpperArmDL" Offset="0x8B60" />
-        <DList Name="gBusinessScrubRightHandHatDL" Offset="0x8C10" />
-        <DList Name="gBusinessScrubRightHandDL" Offset="0x8DB0" />
-        <DList Name="gBusinessScrubRightHandBagDL" Offset="0x8ED0" />
-        <DList Name="gBusinessScrubRightForearmDL" Offset="0x90E8" />
-        <DList Name="gBusinessScrubRightUpperArmDL" Offset="0x9200" />
-        <DList Name="gBusinessScrubRightMustacheDL" Offset="0x92B0" />
-        <DList Name="gBusinessScrubRightEarDL" Offset="0x9340" />
-        <DList Name="gBusinessScrubSnoutDL" Offset="0x93D0" />
-        <DList Name="gBusinessScrubBodyDL" Offset="0x94E8" />
-        <DList Name="gBusinessScrubLeftFootDL" Offset="0x9630" />
-        <DList Name="gBusinessScrubLeftShinDL" Offset="0x9740" />
-        <DList Name="gBusinessScrubLeftThighDL" Offset="0x9838" />
-        <DList Name="gBusinessScrubRightFootDL" Offset="0x98D8" />
-        <DList Name="gBusinessScrubRightShinDL" Offset="0x99E8" />
-        <DList Name="gBusinessScrubRightThighDL" Offset="0x9AE0" />
-
-        <!-- Textures -->
-        <Texture Name="gBusinessScrubSkinTex" OutName="business_scrub_skin" Format="rgba16" Width="16" Height="16" Offset="0x9B80" />
-        <Texture Name="gBusinessScrubLeafTex" OutName="business_scrub_leaf" Format="rgba16" Width="16" Height="16" Offset="0x9D80" />
-        <Texture Name="gBusinessScrubBagOpeningTex" OutName="business_scrub_bag_opening" Format="rgba16" Width="8" Height="16" Offset="0x9F80" />
-        <Texture Name="gBusinessScrubBagCordTex" OutName="business_scrub_bag_cord" Format="rgba16" Width="8" Height="16" Offset="0xA080" />
-        <Texture Name="gBusinessScrubBagTex" OutName="business_scrub_bag" Format="rgba16" Width="2" Height="16" Offset="0xA180" />
-        <Texture Name="gBusinessScrubHatTex" OutName="business_scrub_hat" Format="rgba16" Width="8" Height="8" Offset="0xA1C0" />
-        <Texture Name="gBusinessScrubHatLeafTex" OutName="business_scrub_hat_leaf" Format="rgba16" Width="8" Height="16" Offset="0xA240" />
-        <Texture Name="gBusinessScrubHairTex" OutName="business_scrub_hair" Format="rgba16" Width="16" Height="32" Offset="0xA340" />
-        <Texture Name="gBusinessScrubScalpTex" OutName="business_scrub_scalp" Format="rgba16" Width="8" Height="8" Offset="0xA740" />
-        <Texture Name="gBusinessScrubSnoutTex" OutName="business_scrub_snout" Format="rgba16" Width="16" Height="8" Offset="0xA7C0" />
-        <Texture Name="gBusinessScrubEyeTex" OutName="business_scrub_eye" Format="rgba16" Width="16" Height="16" Offset="0xA8C0" />
-
-        <!-- Skeleton -->
-        <Limb Name="gBusinessScrubRootLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_ROOT" Offset="0xAAC0" />
-        <Limb Name="gBusinessScrubBodyLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_BODY" Offset="0xAACC" />
-        <Limb Name="gBusinessScrubRightThighLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_THIGH" Offset="0xAAD8" />
-        <Limb Name="gBusinessScrubRightShinLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_SHIN" Offset="0xAAE4" />
-        <Limb Name="gBusinessScrubRightFootLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_FOOT" Offset="0xAAF0" />
-        <Limb Name="gBusinessScrubLeftThighLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_THIGH" Offset="0xAAFC" />
-        <Limb Name="gBusinessScrubLeftShinLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_SHIN" Offset="0xAB08" />
-        <Limb Name="gBusinessScrubLeftFootLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_FOOT" Offset="0xAB14" />
-        <Limb Name="gBusinessScrubHeadLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_HEAD" Offset="0xAB20" />
-        <Limb Name="gBusinessScrubSnoutLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_SNOUT" Offset="0xAB2C" />
-        <Limb Name="gBusinessScrubRightLeafLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_LEAF" Offset="0xAB38" />
-        <Limb Name="gBusinessScrubRightMustacheLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_MUSTACHE" Offset="0xAB44" />
-        <Limb Name="gBusinessScrubRightUpperArmLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_UPPER_ARM" Offset="0xAB50" />
-        <Limb Name="gBusinessScrubRightForearmLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_FOREARM" Offset="0xAB5C" />
-        <Limb Name="gBusinessScrubRightHandHatLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_HAND_HAT" Offset="0xAB68" />
-        <Limb Name="gBusinessScrubRightHandBagLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_HAND_BAG" Offset="0xAB74" />
-        <Limb Name="gBusinessScrubRightHandLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_HAND" Offset="0xAB80" />
-        <Limb Name="gBusinessScrubLeftUpperArmLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_UPPER_ARM" Offset="0xAB8C" />
-        <Limb Name="gBusinessScrubLeftForearmLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_FOREARM" Offset="0xAB98" />
-        <Limb Name="gBusinessScrubLeftHandLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_HAND" Offset="0xABA4" />
-        <Limb Name="gBusinessScrubLeftHandBagLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_HAND_BAG" Offset="0xABB0" />
-        <Limb Name="gBusinessScrubLeftLeafLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_LEAF" Offset="0xABBC" />
-        <Limb Name="gBusinessScrubScalpLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_SCALP" Offset="0xABC8" />
-        <Limb Name="gBusinessScrubHairLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_HAIR" Offset="0xABD4" />
-        <Limb Name="gBusinessScrubHatLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_HAT" Offset="0xABE0" />
-        <Limb Name="gBusinessScrubEyesLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_EYES" Offset="0xABEC" />
-        <Limb Name="gBusinessScrubLeftArmBagLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_ARM_BAG" Offset="0xABF8" />
-        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" LimbNone="BUSINESS_SCRUB_LIMB_NONE" LimbMax="BUSINESS_SCRUB_LIMB_MAX" EnumName="BusinessScrubLimb" Offset="0xAC70" />
-
-        <Animation Name="gBusinessScrubWalkAnim" Offset="0xB0B4" /> <!-- Original name is "dnt_walk" -->
-
-        <!-- An exact copy of gBusinessScrubEyeTex -->
-        <Texture Name="gBusinessScrubEye2Tex" OutName="business_scrub_eye_2" Format="rgba16" Width="16" Height="16" Offset="0xB0D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dodongo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dodongo.xml
deleted file mode 100644
index cc9b41e25..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dodongo.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<Root>
-    <File Name="object_dodongo" Segment="6">
-        <Animation Name="object_dodongo_Anim_0013C4" Offset="0x13C4" /> <!-- Original name is "da_die" -->
-        <Animation Name="object_dodongo_Anim_0015F4" Offset="0x15F4" />
-        <Animation Name="object_dodongo_Anim_001A44" Offset="0x1A44" /> <!-- Original name is "da_dmg" -->
-        <Animation Name="object_dodongo_Anim_001F44" Offset="0x1F44" /> <!-- Original name is "da_dmg_wait" -->
-        <Animation Name="object_dodongo_Anim_0028F0" Offset="0x28F0" /> <!-- Original name is "da_fire" -->
-        <Animation Name="object_dodongo_Anim_003088" Offset="0x3088" /> <!-- Original name is "da_fire_wait" -->
-        <Animation Name="object_dodongo_Anim_003368" Offset="0x3368" />
-        <Animation Name="object_dodongo_Anim_003B14" Offset="0x3B14" /> <!-- Original name is "da_right" -->
-        <Animation Name="object_dodongo_Anim_0042C4" Offset="0x42C4" /> <!-- Original name is "da_left" -->
-        <Animation Name="object_dodongo_Anim_004C20" Offset="0x4C20" /> <!-- Original name is "da_wait" -->
-        <DList Name="object_dodongo_DL_006640" Offset="0x6640" />
-        <DList Name="object_dodongo_DL_006750" Offset="0x6750" />
-        <DList Name="object_dodongo_DL_006860" Offset="0x6860" />
-        <DList Name="object_dodongo_DL_006960" Offset="0x6960" />
-        <DList Name="object_dodongo_DL_006AA0" Offset="0x6AA0" />
-        <DList Name="object_dodongo_DL_006BA8" Offset="0x6BA8" />
-        <DList Name="object_dodongo_DL_006CA8" Offset="0x6CA8" />
-        <DList Name="object_dodongo_DL_006D88" Offset="0x6D88" />
-        <DList Name="object_dodongo_DL_006FD8" Offset="0x6FD8" />
-        <DList Name="object_dodongo_DL_007198" Offset="0x7198" />
-        <DList Name="object_dodongo_DL_007298" Offset="0x7298" />
-        <DList Name="object_dodongo_DL_0073A8" Offset="0x73A8" />
-        <Texture Name="object_dodongo_Tex_0074B8" OutName="tex_0074B8" Format="rgba16" Width="16" Height="16" Offset="0x74B8" />
-        <Texture Name="object_dodongo_Tex_0076B8" OutName="tex_0076B8" Format="rgba16" Width="8" Height="16" Offset="0x76B8" />
-        <Texture Name="object_dodongo_Tex_0077B8" OutName="tex_0077B8" Format="rgba16" Width="8" Height="16" Offset="0x77B8" />
-        <Texture Name="object_dodongo_Tex_0078B8" OutName="tex_0078B8" Format="rgba16" Width="32" Height="16" Offset="0x78B8" />
-        <Texture Name="object_dodongo_Tex_007CB8" OutName="tex_007CB8" Format="rgba16" Width="16" Height="32" Offset="0x7CB8" />
-        <Texture Name="object_dodongo_Tex_0080B8" OutName="tex_0080B8" Format="rgba16" Width="8" Height="8" Offset="0x80B8" />
-        <Limb Name="object_dodongo_Standardlimb_008138" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_01" Offset="0x8138" />
-        <Limb Name="object_dodongo_Standardlimb_008144" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_02" Offset="0x8144" />
-        <Limb Name="object_dodongo_Standardlimb_008150" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_03" Offset="0x8150" />
-        <Limb Name="object_dodongo_Standardlimb_00815C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_04" Offset="0x815C" />
-        <Limb Name="object_dodongo_Standardlimb_008168" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_05" Offset="0x8168" />
-        <Limb Name="object_dodongo_Standardlimb_008174" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_06" Offset="0x8174" />
-        <Limb Name="object_dodongo_Standardlimb_008180" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_07" Offset="0x8180" />
-        <Limb Name="object_dodongo_Standardlimb_00818C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_08" Offset="0x818C" />
-        <Limb Name="object_dodongo_Standardlimb_008198" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_09" Offset="0x8198" />
-        <Limb Name="object_dodongo_Standardlimb_0081A4" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0A" Offset="0x81A4" />
-        <Limb Name="object_dodongo_Standardlimb_0081B0" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0B" Offset="0x81B0" />
-        <Limb Name="object_dodongo_Standardlimb_0081BC" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0C" Offset="0x81BC" />
-        <Limb Name="object_dodongo_Standardlimb_0081C8" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0D" Offset="0x81C8" />
-        <Limb Name="object_dodongo_Standardlimb_0081D4" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0E" Offset="0x81D4" />
-        <Limb Name="object_dodongo_Standardlimb_0081E0" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0F" Offset="0x81E0" />
-        <Limb Name="object_dodongo_Standardlimb_0081EC" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_10" Offset="0x81EC" />
-        <Limb Name="object_dodongo_Standardlimb_0081F8" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_11" Offset="0x81F8" />
-        <Limb Name="object_dodongo_Standardlimb_008204" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_12" Offset="0x8204" />
-        <Limb Name="object_dodongo_Standardlimb_008210" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_13" Offset="0x8210" />
-        <Limb Name="object_dodongo_Standardlimb_00821C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_14" Offset="0x821C" />
-        <Limb Name="object_dodongo_Standardlimb_008228" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_15" Offset="0x8228" />
-        <Limb Name="object_dodongo_Standardlimb_008234" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_16" Offset="0x8234" />
-        <Limb Name="object_dodongo_Standardlimb_008240" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_17" Offset="0x8240" />
-        <Limb Name="object_dodongo_Standardlimb_00824C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_18" Offset="0x824C" />
-        <Limb Name="object_dodongo_Standardlimb_008258" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_19" Offset="0x8258" />
-        <Limb Name="object_dodongo_Standardlimb_008264" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1A" Offset="0x8264" />
-        <Limb Name="object_dodongo_Standardlimb_008270" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1B" Offset="0x8270" />
-        <Limb Name="object_dodongo_Standardlimb_00827C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1C" Offset="0x827C" />
-        <Limb Name="object_dodongo_Standardlimb_008288" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1D" Offset="0x8288" />
-        <Limb Name="object_dodongo_Standardlimb_008294" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1E" Offset="0x8294" />
-        <Skeleton Name="object_dodongo_Skel_008318" Type="Normal" LimbType="Standard" LimbNone="OBJECT_DODONGO_LIMB_NONE" LimbMax="OBJECT_DODONGO_LIMB_MAX" EnumName="ObjectDodongoLimb" Offset="0x8318" />
-        <Animation Name="object_dodongo_Anim_008B1C" Offset="0x8B1C" /> <!-- Original name is "da_walk" -->
-        <Animation Name="object_dodongo_Anim_008DE0" Offset="0x8DE0" /> <!-- Original name is "da_walk_start" -->
-        <Animation Name="object_dodongo_Anim_009088" Offset="0x9088" /> <!-- Original name is "da_walk_end" -->
-        
-        <!-- Fire Effect Textures -->
-        <Texture Name="gDodongoFire0Tex" OutName="dodongo_fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
-        <Texture Name="gDodongoFire1Tex" OutName="dodongo_fire_1" Format="i4" Width="32" Height="32" Offset="0x92A0"/>
-        <Texture Name="gDodongoFire2Tex" OutName="dodongo_fire_2" Format="i4" Width="32" Height="32" Offset="0x94A0"/>
-        <Texture Name="gDodongoFire3Tex" OutName="dodongo_fire_3" Format="i4" Width="32" Height="32" Offset="0x96A0"/>
-
-        <DList Name="gDodongoFireDL" Offset="0x98A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dog.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dog.xml
deleted file mode 100644
index d0f306b24..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dog.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Assets for dogs and the arrow that appears over your selected dog in the Doggy Racetrack -->
-    <File Name="object_dog" Segment="6">
-        <!-- Unused Selection Arrow with a Texture Animation -->
-        <DList Name="gDogSelectionArrowAnimatedDL" Offset="0x170" /> <!-- Original name is "cursor_00_anim_model" -->
-        <DList Name="gDogSelectionArrowAnimatedEmptyDL" Offset="0x250" /> <!-- Original name is "cursor_00_anim_modelT" -->
-        <Texture Name="gDogSelectionArrowAnimatedTex" OutName="dog_selection_arrow_animated" Format="i8" Width="8" Height="32" Offset="0x258" />
-        <TextureAnimation Name="gDogSelectionArrowTexAnim" Offset="0x3C4" />
-
-        <!-- Selection Arrow DisplayLists and Texture -->
-        <DList Name="gDogSelectionArrowDL" Offset="0x550" /> <!-- Original name is "cursor_00_none_model" -->
-        <DList Name="gDogSelectionArrowEmptyDL" Offset="0x618" /> <!-- Original name is "cursor_00_none_modelT" -->
-        <Texture Name="gDogSelectionArrowTex" OutName="dog_selection_arrow" Format="i4" Width="16" Height="32" Offset="0x620" />
-
-        <!-- Dog Animations -->
-        <Animation Name="gDogBarkAnim" Offset="0x998" /> <!-- Original name is "dog_bark" -->
-        <Animation Name="gDogLyingDownAnim" Offset="0x1048" /> <!-- Original name is "dog_fuse" ("lying on the ground") -->
-        <Animation Name="gDogLyingDownLoopAnim" Offset="0x1348" /> <!-- Original name is "dog_fusetamama" ("lying on the ground continues") -->
-        <Animation Name="gDogJumpAnim" Offset="0x1560" /> <!-- Original name is "dog_jump" -->
-        <Animation Name="gDogJumpAttackAnim" Offset="0x17C0" /> <!-- Original name is "dog_jump2" -->
-        <Animation Name="gDogLongJumpAnim" Offset="0x1A84" /> <!-- Original name is "dog_longjump" -->
-        <Animation Name="gDogRunAnim" Offset="0x1BD8" /> <!-- Original name is "dog_run" -->
-        <Animation Name="gDogSitAnim" Offset="0x1FB0" /> <!-- Original name is "dog_sit" -->
-        <Animation Name="gDogWalkAnim" Offset="0x21C8" /> <!-- Original name is "dog_walk" -->
-
-        <!-- Dog Textures -->
-        <Texture Name="gDogFur1Tex" OutName="dog_fur_1" Format="rgba16" Width="32" Height="32" Offset="0x21E0" /> <!-- Lower body, legs, and tail -->
-        <Texture Name="gDogFur2Tex" OutName="dog_fur_2" Format="rgba16" Width="32" Height="32" Offset="0x29E0" /> <!-- Front of ears, back of the tail, and around the feet-->
-        <Texture Name="gDogFur3Tex" OutName="dog_fur_3" Format="rgba16" Width="32" Height="32" Offset="0x31E0" /> <!-- Upper body, top of head-->
-        <Texture Name="gDogFaceAndEyeTex" OutName="dog_face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x39E0" />
-        <Texture Name="gDogFaceAndNoseTex" OutName="dog_face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x41E0" />
-        <Texture Name="gDogFur4Tex" OutName="dog_fur_4" Format="rgba16" Width="32" Height="32" Offset="0x49E0" /> <!-- Back of ears, side of head, and part of front body-->
-        <Texture Name="gDogPawTex" OutName="dog_paw" Format="rgba16" Width="16" Height="16" Offset="0x51E0" />
-        <Texture Name="gDogFaceHairTex" OutName="dog_face_hair" Format="rgba16" Width="32" Height="32" Offset="0x53E0" />
-
-        <!-- Dog Limb DisplayLists -->
-        <DList Name="gDogHeadDL" Offset="0x6F40" />
-        <DList Name="gDogRightFaceHairDL" Offset="0x72A8" />
-        <DList Name="gDogLeftFaceHairDL" Offset="0x7348" />
-        <DList Name="gDogBodyFrontDL" Offset="0x73E8" />
-        <DList Name="gDogFrontRightLegDL" Offset="0x7600" />
-        <DList Name="gDogFrontLeftLegDL" Offset="0x77B0" />
-        <DList Name="gDogBodyBackDL" Offset="0x7960" />
-        <DList Name="gDogBackRightLegDL" Offset="0x7B00" />
-        <DList Name="gDogBackLeftLegDL" Offset="0x7CB0" />
-        <DList Name="gDogTailDL" Offset="0x7E60" />
-
-        <!-- Dog Limbs -->
-        <Limb Name="gDogRootLimb" Type="Standard" EnumName="DOG_LIMB_ROOT" Offset="0x8030" />
-        <Limb Name="gDogBodyBackLimb" Type="Standard" EnumName="DOG_LIMB_BODY_BACK" Offset="0x803C" />
-        <Limb Name="gDogBodyFrontLimb" Type="Standard" EnumName="DOG_LIMB_BODY_FRONT" Offset="0x8048" />
-        <Limb Name="gDogHeadRootLimb" Type="Standard" EnumName="DOG_LIMB_HEAD_ROOT" Offset="0x8054" />
-        <Limb Name="gDogHeadLimb" Type="Standard" EnumName="DOG_LIMB_HEAD" Offset="0x8060" />
-        <Limb Name="gDogRightFaceHairLimb" Type="Standard" EnumName="DOG_LIMB_RIGHT_FACE_HAIR" Offset="0x806C" />
-        <Limb Name="gDogLeftFaceHairLimb" Type="Standard" EnumName="DOG_LIMB_LEFT_FACE_HAIR" Offset="0x8078" />
-        <Limb Name="gDogFrontRightLegLimb" Type="Standard" EnumName="DOG_LIMB_FRONT_RIGHT_LEG" Offset="0x8084" />
-        <Limb Name="gDogFrontLeftLegLimb" Type="Standard" EnumName="DOG_LIMB_FRONT_LEFT_LEG" Offset="0x8090" />
-        <Limb Name="gDogBackRightLegLimb" Type="Standard" EnumName="DOG_LIMB_BACK_RIGHT_LEG" Offset="0x809C" />
-        <Limb Name="gDogBackLeftLegLimb" Type="Standard" EnumName="DOG_LIMB_BACK_LEFT_LEG" Offset="0x80A8" />
-        <Limb Name="gDogTailLimb" Type="Standard" EnumName="DOG_LIMB_TAIL" Offset="0x80B4" />
-
-        <!-- Dog Skeleton -->
-        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" LimbNone="DOG_LIMB_NONE" LimbMax="DOG_LIMB_MAX" EnumName="DogLimb" Offset="0x80F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor01.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor01.xml
deleted file mode 100644
index 727949d60..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor01.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Astral Observatory / Marine Research Lab Door (Bland metal door) -->
-    <File Name="object_dor01" Segment="6">
-        <DList Name="gObservatoryLabDoorEmptyDL" Offset="0x440" /> <!-- Original name is "z2_dor01_modelT" -->
-        <DList Name="gObservatoryLabDoorDL" Offset="0x448" /> <!-- Original name is "z2_dor01_model" -->
-        <Texture Name="gObservatoryLabDoorTex" OutName="observatory_lab_door" Format="rgba16" Width="16" Height="128" Offset="0x650" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor02.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor02.xml
deleted file mode 100644
index 402fdd499..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor02.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Assets for a zora hall door -->
-    <File Name="object_dor02" Segment="6">
-        <DList Name="gZoraHallDoorEmptyDL" Offset="0x420"/> <!-- Original name is "z2_dor02_modelT" -->
-        <DList Name="gZoraHallDoorDL" Offset="0x428"/> <!-- Original name is "z2_dor02_model" -->
-        <Texture Name="gZoraHallDoorTex" OutName="zora_hall_door" Format="rgba16" Width="32" Height="64" Offset="0x610"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor03.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor03.xml
deleted file mode 100644
index c7971db0c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor03.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="object_dor03" Segment="6">
-        <DList Name="gSwampDoorDL" Offset="0x3C0" /> <!-- Original name is "z2_dor03_model" -->
-        <Texture Name="gSwampDoorTex" OutName="swamp_door" Format="rgba16" Width="32" Height="64" Offset="0x4D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor04.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor04.xml
deleted file mode 100644
index afb348c7d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dor04.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Assets for the magic hag potion shop door -->
-    <File Name="object_dor04" Segment="6">
-        <DList Name="gMagicHagPotionShopDoorEmptyDL" Offset="0x460"/> <!-- Original name is "z2_dor04_modelT" -->
-        <DList Name="gMagicHagPotionShopDoorDL" Offset="0x468"/> <!-- Original name is "z2_dor04_model" -->
-        <Texture Name="gMagicHagPotionShopDoorTex" OutName="magic_hag_potion_shop_door" Format="rgba16" Width="64" Height="32" Offset="0x658"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dora.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dora.xml
deleted file mode 100644
index 09732ba0a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dora.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Object for the Gong and KendoKanban board in the Swordsman's School -->
-    <File Name="object_dora" Segment="6">
-        <DList Name="gKendoKanbanDL" Offset="0x180" /> <!-- Original name is "djo_kanban_model" -->
-        <Texture Name="gKendoKanbanFrontTex" OutName="kendo_kanban_front" Format="rgba16" Width="32" Height="64" Offset="0x280" />
-        <Texture Name="gKendoKanbanSideTex" OutName="kendo_kanban_side" Format="rgba16" Width="32" Height="32" Offset="0x1280" />
-        <DList Name="gKendoKanbanTopRightDL" Offset="0x2080" /> <!-- Original name is "ita_tR_model" -->
-        <DList Name="gKendoKanbanTopLeftDL" Offset="0x2180" /> <!-- Original name is "ita_tL_model" -->
-        <DList Name="gKendoKanbanBottomLeftDL" Offset="0x2280" /> <!-- Original name is "ita_bL_model" -->
-        <DList Name="gKendoKanbanBottomRightDL" Offset="0x2380" /> <!-- Original name is "ita_bR_model" -->
-        <Texture Name="gKendoKanbanSplitFrontTex" OutName="kendo_kanban_front_split_alt" Format="rgba16" Width="32" Height="64" Offset="0x2480" />
-        <Texture Name="gKendoKanbanSplitSideTex" OutName="kendo_kanban_side_split_alt" Format="rgba16" Width="32" Height="32" Offset="0x3480" />
-        <DList Name="gDoraGongDL" Offset="0x3FD0" /> <!-- Original name is "dora_hontai_model" -->
-        <DList Name="gDoraChainDL" Offset="0x4160" /> <!-- Original name is "kusariT_model" -->
-        <Texture Name="gDoraGongTex" OutName="dora_gong" Format="rgba16" Width="32" Height="32" Offset="0x4208" />
-        <Texture Name="gDoraChainTex" OutName="dora_chain" Format="rgba16" Width="16" Height="64" Offset="0x4A08" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_driftice.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_driftice.xml
deleted file mode 100644
index c380c09c1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_driftice.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_driftice" Segment="6">
-        <Texture Name="object_driftice_Tex_000000" OutName="tex_000000" Format="rgba16" Width="64" Height="8" Offset="0x0" />
-        <Texture Name="object_driftice_TLUT_000400" OutName="tlut_000400" Format="rgba16" Width="4" Height="4" Offset="0x400" />
-        <Texture Name="object_driftice_TLUT_000420" OutName="tlut_000420" Format="rgba16" Width="4" Height="4" Offset="0x420" />
-        <Texture Name="object_driftice_Tex_000440" OutName="tex_000440" Format="ci4" Width="64" Height="64" Offset="0x440" />
-        <Texture Name="object_driftice_Tex_000C40" OutName="tex_000C40" Format="ci4" Width="64" Height="64" Offset="0xC40" />
-        <DList Name="object_driftice_DL_0016A0" Offset="0x16A0" /> <!-- Original name is "obj_iceblock_model" -->
-        <Collision Name="object_driftice_Colheader_001AA8" Offset="0x1AA8" /> <!-- Original name is "obj_iceblock_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_drs.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_drs.xml
deleted file mode 100644
index ef9788fd5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_drs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Object for the mannequin inside Anju's room which holds her wedding dress --> 
-    <File Name="object_drs" Segment="6">
-        <Animation Name="gWeddingDressMannequinIdleAnim" Offset="0x1C" /> <!-- Original name is "drs_kihon" -->
-        <DList Name="gWeddingDressMannequinDL" Offset="0x3120" />
-        <DList Name="gWeddingDressMannequinPatternDL" Offset="0x3EA8" />
-        <DList Name="gWeddingDressMannequinMaskDL" Offset="0x3F80" />
-        <Texture Name="gWeddingDressMannequinWoodTex" OutName="wood" Format="rgba16" Width="16" Height="16" Offset="0x4008" />
-        <Texture Name="gWeddingDressMannequinWoodCornerTex" OutName="wood_corner" Format="rgba16" Width="16" Height="16" Offset="0x4208" />
-        <Texture Name="gWeddingDressMannequinShoulderGradientTex" OutName="drs_shoulder_gradient" Format="i8" Width="8" Height="8" Offset="0x4408" />
-        <Texture Name="gWeddingDressMannequinPatternTex" OutName="pattern" Format="i8" Width="32" Height="32" Offset="0x4448" />
-        <Texture Name="gWeddingDressMannequinVineTex" OutName="vine" Format="rgba16" Width="32" Height="16" Offset="0x4848" />
-        <Texture Name="gWeddingDressMannequinFlowerTex" OutName="flower" Format="rgba16" Width="16" Height="16" Offset="0x4C48" />
-        <Texture Name="gWeddingDressMannequinFabricHighlightsTex" OutName="fabric_highlight" Format="i8" Width="32" Height="64" Offset="0x4E48" />
-        <Texture Name="gWeddingDressMannequinFabricSheerTex" OutName="fabric_sheer" Format="i8" Width="32" Height="32" Offset="0x5648" />
-        <Limb Name="gWeddingDressMannequinLimb" Type="Standard" EnumName="WEDDING_DRESS_MANNEQUIN_LIMB" Offset="0x5A48" />
-        <Limb Name="gWeddingDressMannequinMaskLimb" Type="Standard" EnumName="WEDDING_DRESS_MANNEQUIN_LIMB_MASK" Offset="0x5A54" />
-        <Limb Name="gWeddingDressMannequinPatternLimb" Type="Standard" EnumName="WEDDING_DRESS_MANNEQUIN_LIMB_PATTERN" Offset="0x5A60" />
-        <Skeleton Name="gWeddingDressMannequinSkel" Type="Flex" LimbType="Standard" LimbNone="WEDDING_DRESS_MANNEQUIN_LIMB_NONE" LimbMax="WEDDING_DRESS_MANNEQUIN_LIMB_MAX" EnumName="WeddingDressMannequinLimb" Offset="0x5A78" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ds2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ds2.xml
deleted file mode 100644
index 0eb35db79..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ds2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Root>
-    <File Name="object_ds2" Segment="6">
-        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4" /> <!-- Original name is "ds2_matsu" -->
-        <DList Name="object_ds2_DL_001990" Offset="0x1990" />
-        <DList Name="object_ds2_DL_001C98" Offset="0x1C98" />
-        <DList Name="object_ds2_DL_002188" Offset="0x2188" />
-        <DList Name="object_ds2_DL_0022B0" Offset="0x22B0" />
-        <DList Name="object_ds2_DL_002480" Offset="0x2480" />
-        <DList Name="object_ds2_DL_002610" Offset="0x2610" />
-        <DList Name="object_ds2_DL_002738" Offset="0x2738" />
-        <DList Name="object_ds2_DL_002908" Offset="0x2908" />
-        <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98" />
-        <Texture Name="object_ds2_Tex_002C98" OutName="tex_002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" />
-        <Texture Name="object_ds2_Tex_002D98" OutName="tex_002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" />
-        <Texture Name="object_ds2_Tex_002DD8" OutName="tex_002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" />
-        <Texture Name="object_ds2_Tex_002ED8" OutName="tex_002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" />
-        <!-- <Blob Name="object_ds2_Blob_0030D8" Size="0xC00" Offset="0x30D8" /> -->
-        <Texture Name="object_ds2_Tex_003CD8" OutName="tex_003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" />
-        <Texture Name="object_ds2_Tex_003DD8" OutName="tex_003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" />
-        <Texture Name="object_ds2_Tex_003ED8" OutName="tex_003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" />
-        <Texture Name="object_ds2_Tex_003FD8" OutName="tex_003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" />
-        <Limb Name="object_ds2_Standardlimb_0041D8" Type="Standard" EnumName="OBJECT_DS2_LIMB_01" Offset="0x41D8" />
-        <Limb Name="object_ds2_Standardlimb_0041E4" Type="Standard" EnumName="OBJECT_DS2_LIMB_02" Offset="0x41E4" />
-        <Limb Name="object_ds2_Standardlimb_0041F0" Type="Standard" EnumName="OBJECT_DS2_LIMB_03" Offset="0x41F0" />
-        <Limb Name="object_ds2_Standardlimb_0041FC" Type="Standard" EnumName="OBJECT_DS2_LIMB_04" Offset="0x41FC" />
-        <Limb Name="object_ds2_Standardlimb_004208" Type="Standard" EnumName="OBJECT_DS2_LIMB_05" Offset="0x4208" />
-        <Limb Name="object_ds2_Standardlimb_004214" Type="Standard" EnumName="OBJECT_DS2_LIMB_06" Offset="0x4214" />
-        <Limb Name="object_ds2_Standardlimb_004220" Type="Standard" EnumName="OBJECT_DS2_LIMB_07" Offset="0x4220" />
-        <Limb Name="object_ds2_Standardlimb_00422C" Type="Standard" EnumName="OBJECT_DS2_LIMB_08" Offset="0x422C" />
-        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DS2_LIMB_NONE" LimbMax="OBJECT_DS2_LIMB_MAX" EnumName="ObjectDs2Limb" Offset="0x4258" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ds2n.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ds2n.xml
deleted file mode 100644
index e4757de31..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ds2n.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<Root>
-    <!-- Unused Potion Shop Seller from OoT, in that game (Ossan -> object_ds2) -->
-    <File Name="object_ds2n" Segment="6">
-        <!-- [object_ds2] still exists as a copy from OoT in MM, but unused, this has a different skeleton with legs -->
-        <!-- Difficult to document, might have made mistakes -->
-
-        <DList Name="gDs2nTorsoDL" Offset="0x2420" />
-        <DList Name="gDs2nHeadDL" Offset="0x2740" />
-        <DList Name="gDs2nRightUpperArmDL" Offset="0x2C20" />
-        <DList Name="gDs2nRightForearmDL" Offset="0x2D38" />
-        <DList Name="gDs2nRightHandDL" Offset="0x2F68" />
-        <DList Name="gDs2nLeftUpperArmDL" Offset="0x30E0" />
-        <DList Name="gDs2nLeftForearmDL" Offset="0x31F8" />
-        <DList Name="gDs2nLeftHandDL" Offset="0x33B0" />
-        <DList Name="gDs2nHipsDL" Offset="0x3528" />
-        <DList Name="gDs2nRightThighDL" Offset="0x35F0" /> 
-        <DList Name="gDs2nRightShinDL" Offset="0x36D0" />
-        <DList Name="gDs2nRightFootDL" Offset="0x37A8" />
-        <DList Name="gDs2nLeftThighDL" Offset="0x3988" />
-        <DList Name="gDs2nLeftShinDL" Offset="0x3A68" />
-        <DList Name="gDs2nLeftFootDL" Offset="0x3B40" />
-        
-        <Texture Name="gDs2nMainTLUT" OutName="main_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3CD8" />
-        <Texture Name="gDs2nFingersTLUT" OutName="fingers_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3ED8" />
-        <Texture Name="gDs2nEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x40D8" />
-        <Texture Name="gDs2nPantsAndShirtBottomTex" OutName="pants_and_shirt_bottom" Format="rgba16" Width="16" Height="16" Offset="0x42D8" />
-        <Texture Name="gDs2nShoesTex" OutName="shoes" Format="rgba16" Width="16" Height="32" Offset="0x44D8" />
-
-        <!-- Unused Belt/Tie Texture, kinda looks like a Karate belt. -->
-        <Texture Name="gDs2nBeltTieTex" OutName="belt_tie" Format="ci8" Width="32" Height="32" Offset="0x48D8" TlutOffset="0x3CD8"/>
-
-        <!-- These two eye textures are corrupted, they extract and draw broken in-game.
-            The half tex: the blue iris is olive greenish and whites of the eyes are blended blue, with scatter of random pixels.
-            The closed has an extra dot of black in the center of the eye lid. -->
-        <Texture Name="gDs2nEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x4CD8" TlutOffset="0x40D8"/>
-        <Texture Name="gDs2nEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x50D8" TlutOffset="0x40D8"/>
-
-        <Texture Name="gDs2nFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x54D8" TlutOffset="0x3ED8" />
-        <Texture Name="gDs2nSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x55D8" />
-        <Texture Name="gDs2nHairTex" OutName="hair" Format="rgba16" Width="16" Height="16" Offset="0x5618" />
-        <Texture Name="gDs2nHairlineTex" OutName="hairline" Format="ci8" Width="16" Height="16" Offset="0x5818" />
-        <Texture Name="gDs2nShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="16" Height="32" Offset="0x5918" />
-        <Texture Name="gDs2nVestTex" OutName="vest" Format="rgba16" Width="16" Height="16" Offset="0x5B18" />
-        <Texture Name="gDs2nShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0x5D18" />
-        <Texture Name="gDs2nEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x5E18" TlutOffset="0x40D8" />
-
-        <Texture Name="gDs2nMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6218" TlutOffset="0x3CD8" />
-
-        <!-- 6418 -> 6450: unknown small data -->
-
-        <!-- Unused and unreferenced. Exact copies of the above used textures. -->
-        <Texture Name="gDs2nMain2TLUT" OutName="main2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6450" />
-        <Texture Name="gDs2nFingers2TLUT" OutName="fingers2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6650" />
-        <Texture Name="gDs2nEyes2TLUT" OutName="eyes2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6850" />
-        <Texture Name="gDs2nPantsAndShirtBottom2Tex" OutName="pants_and_shirt_bottom2" Format="rgba16" Width="16" Height="16" Offset="0x6A50" />
-        <Texture Name="gDs2nShoes2Tex" OutName="shoes2" Format="rgba16" Width="16" Height="32" Offset="0x6C50" />
-        <Texture Name="gDs2nFingers2Tex" OutName="fingers2" Format="ci8" Width="16" Height="16" Offset="0x7050" TlutOffset="0x6650" />
-        <Texture Name="gDs2nSkinGradient2Tex" OutName="skin_gradient2" Format="ci8" Width="8" Height="8" Offset="0x7150" TlutOffset="0x6450"/>
-        <Texture Name="gDs2nHair2Tex" OutName="hair2" Format="rgba16" Width="16" Height="16" Offset="0x7190" />
-        <Texture Name="gDs2nHairline2Tex" OutName="hairline2" Format="ci8" Width="16" Height="16" Offset="0x7390" TlutOffset="0x6450"/>
-        <Texture Name="gDs2nShirtButtons2Tex" OutName="shirt_buttons2" Format="ci8" Width="16" Height="32" Offset="0x7490" TlutOffset="0x6450"/>
-        <Texture Name="gDs2nVest2Tex" OutName="vest2" Format="rgba16" Width="16" Height="16" Offset="0x7690" />
-        <Texture Name="gDs2nShirt2Tex" OutName="shirt2" Format="ci8" Width="16" Height="16" Offset="0x7890" TlutOffset="0x6450" />
-
-        <Texture Name="gDs2nEyeOpen2Tex" OutName="eye_open2" Format="ci8" Width="32" Height="32" Offset="0x7990" TlutOffset="0x6850" />
-        <Texture Name="gDs2nMouthOpen2Tex" OutName="mouth_open2" Format="ci8" Width="32" Height="16" Offset="0x7D90" TlutOffset="0x6450" />
-        
-        <Animation Name="gDs2nIdleAnim" Offset="0x8038" /> <!-- Original name is "ds2n_wait" -->
-
-        <!-- z64Utils cannot render this skeleton, no idea what the three limbs with no DL are for, our actor doesnt use them -->
-        <Limb Name="gDs2nHipsLimb" Type="Standard" EnumName="DS2N_LIMB_HIPS" Offset="0x8050" />
-        <Limb Name="gDs2nLeftThighLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_THIGH" Offset="0x805C" />
-        <Limb Name="gDs2nLeftShinLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_SHIN" Offset="0x8068" />
-        <Limb Name="gDs2nLeftFootLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_FOOT" Offset="0x8074" />
-        <Limb Name="gDs2nRightThighLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_THIGH" Offset="0x8080" />
-        <Limb Name="gDs2nRightShinLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_SHIN" Offset="0x808C" />
-        <Limb Name="gDs2nRightFootLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_FOOT" Offset="0x8098" />
-        <Limb Name="gDs2nLimb_008098" Type="Standard" EnumName="DS2N_LIMB_08" Offset="0x80A4" /> <!-- these three have no DL -->
-        <Limb Name="gDs2nLimb_0080B0" Type="Standard" EnumName="DS2N_LIMB_09" Offset="0x80B0" />
-        <Limb Name="gDs2nLimb_0080BC" Type="Standard" EnumName="DS2N_LIMB_0A" Offset="0x80BC" />
-        <Limb Name="gDs2nTorsoLimb" Type="Standard" EnumName="DS2N_LIMB_TORSO" Offset="0x80C8" />
-        <Limb Name="gDs2nLeftUpperArmLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_UPPER_ARM" Offset="0x80D4" />
-        <Limb Name="gDs2nLeftForearmLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_FOREARM" Offset="0x80E0" />
-        <Limb Name="gDs2nLeftHandLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_HAND" Offset="0x80EC" />
-        <Limb Name="gDs2nRightUpperArmLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_UPPER_ARM" Offset="0x80F8" />
-        <Limb Name="gDs2nRightForearmLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_FOREARM" Offset="0x8104" />
-        <Limb Name="gDs2nRightHandLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_HAND" Offset="0x8110" />
-        <Limb Name="gDs2nHeadLimb" Type="Standard" EnumName="DS2N_LIMB_HEAD" Offset="0x811C" />
-        <Skeleton Name="gDs2nSkel" Type="Flex" LimbType="Standard" LimbNone="DS2N_LIMB_NONE" LimbMax="DS2N_LIMB_MAX" EnumName="Ds2nLimb" Offset="0x8170" />
-
-        <!-- 8 bytes: 0x11 followed by zeros  <Blob Name="gDs2n_Blob_008178" Size="0x8" Offset="0x8178" /> -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dt.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dt.xml
deleted file mode 100644
index 3acf0c442..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dt.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<Root>
-    <File Name="object_dt" Segment="6">
-        <Animation Name="object_dt_Anim_0005A4" Offset="0x5A4" /> <!-- Original name is "dt_aiya" -->
-        <Animation Name="object_dt_Anim_000854" Offset="0x854" /> <!-- Original name is "dt_aiya2yomesan" -->
-        <Animation Name="object_dt_Anim_000BE0" Offset="0xBE0" /> <!-- Original name is "dt_arigato" -->
-        <Animation Name="object_dt_Anim_000DA8" Offset="0xDA8" /> <!-- Original name is "dt_mojimoji" -->
-        <Animation Name="object_dt_Anim_00112C" Offset="0x112C" /> <!-- Original name is "dt_wait" -->
-        <DList Name="object_dt_DL_004DB0" Offset="0x4DB0" />
-        <DList Name="object_dt_DL_005130" Offset="0x5130" />
-        <DList Name="object_dt_DL_0054C8" Offset="0x54C8" />
-        <DList Name="object_dt_DL_005AF8" Offset="0x5AF8" />
-        <DList Name="object_dt_DL_005DB0" Offset="0x5DB0" />
-        <DList Name="object_dt_DL_005E70" Offset="0x5E70" />
-        <DList Name="object_dt_DL_006018" Offset="0x6018" />
-        <DList Name="object_dt_DL_006140" Offset="0x6140" />
-        <DList Name="object_dt_DL_006258" Offset="0x6258" />
-        <DList Name="object_dt_DL_0063B8" Offset="0x63B8" />
-        <DList Name="object_dt_DL_0064E0" Offset="0x64E0" />
-        <DList Name="object_dt_DL_0065F8" Offset="0x65F8" />
-        <DList Name="object_dt_DL_006800" Offset="0x6800" />
-        <DList Name="object_dt_DL_006928" Offset="0x6928" />
-        <Texture Name="object_dt_TLUT_006A50" OutName="tlut_006A50" Format="rgba16" Width="16" Height="16" Offset="0x6A50" />
-        <Texture Name="object_dt_TLUT_006C50" OutName="tlut_006C50" Format="rgba16" Width="16" Height="16" Offset="0x6C50" />
-        <Texture Name="object_dt_TLUT_006E50" OutName="tlut_006E50" Format="rgba16" Width="16" Height="16" Offset="0x6E50" />
-        <Texture Name="object_dt_Tex_007050" OutName="tex_007050" Format="ci8" Width="8" Height="8" Offset="0x7050" />
-        <Texture Name="object_dt_Tex_007090" OutName="tex_007090" Format="ci8" Width="16" Height="16" Offset="0x7090" />
-        <Texture Name="object_dt_Tex_007190" OutName="tex_007190" Format="ci8" Width="8" Height="8" Offset="0x7190" />
-        <Texture Name="object_dt_Tex_0071D0" OutName="tex_0071D0" Format="ci8" Width="8" Height="8" Offset="0x71D0" />
-        <Texture Name="object_dt_Tex_007210" OutName="tex_007210" Format="rgba16" Width="8" Height="16" Offset="0x7210" />
-        <Texture Name="object_dt_Tex_007310" OutName="tex_007310" Format="ci8" Width="8" Height="8" Offset="0x7310" />
-        <Texture Name="gDotourEyeShockTex" OutName="dotour_eye_shock" Format="ci8" Width="32" Height="32" Offset="0x7350" TlutOffset="0x6C50" /> 
-        <Texture Name="gDotourEyebrowHighTex" OutName="dotour_eyebrow_high" Format="ci8" Width="16" Height="16" Offset="0x7750" TlutOffset="0x6E50" />
-        <Texture Name="object_dt_Tex_007850" OutName="tex_007850" Format="ci8" Width="32" Height="32" Offset="0x7850" />
-        <Texture Name="object_dt_Tex_007C50" OutName="tex_007C50" Format="ci8" Width="16" Height="16" Offset="0x7C50" />
-        <Texture Name="object_dt_Tex_007D50" OutName="tex_007D50" Format="ci8" Width="32" Height="32" Offset="0x7D50" />
-        <Texture Name="object_dt_Tex_008150" OutName="tex_008150" Format="ci8" Width="8" Height="8" Offset="0x8150" />
-        <Texture Name="object_dt_Tex_008190" OutName="tex_008190" Format="ci8" Width="32" Height="16" Offset="0x8190" />
-        <Texture Name="object_dt_Tex_008390" OutName="tex_008390" Format="rgba16" Width="32" Height="64" Offset="0x8390" />
-        <Texture Name="object_dt_Tex_009390" OutName="tex_009390" Format="rgba16" Width="16" Height="16" Offset="0x9390" />
-        <Texture Name="gDotourEyeOpenTex" OutName="dotour_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9590" TlutOffset="0x6C50" />
-        <Texture Name="object_dt_Tex_009990" OutName="tex_009990" Format="rgba16" Width="16" Height="32" Offset="0x9990" />
-        <Texture Name="object_dt_Tex_009D90" OutName="tex_009D90" Format="rgba16" Width="16" Height="16" Offset="0x9D90" />
-        <Texture Name="gDotourEyeClosedTex" OutName="dotour_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9F90" TlutOffset="0x6C50" />
-        <Texture Name="gDotourEyebrowMidTex" OutName="dotour_eyebrow_mid" Format="ci8" Width="16" Height="16" Offset="0xA390" TlutOffset="0x6E50" />
-        <Texture Name="gDotourEyebrowLowTex" OutName="dotour_eyebrow_low" Format="ci8" Width="16" Height="16" Offset="0xA490" TlutOffset="0x6E50" />
-        <Texture Name="object_dt_Tex_00A590" OutName="tex_00A590" Format="rgba16" Width="16" Height="16" Offset="0xA590" />
-        <Texture Name="gDotourEyeLookDownTex" OutName="dotour_eye_look_down" Format="ci8" Width="32" Height="32" Offset="0xA790" TlutOffset="0x6C50" />
-        <Texture Name="gDotourEyeSquintTex" OutName="dotour_eye_squint" Format="ci8" Width="32" Height="32" Offset="0xAB90" TlutOffset="0x6C50" />
-        <TextureAnimation Name="object_dt_Matanimheader_00AFDC" Offset="0xAFDC" />
-        <Limb Name="object_dt_Standardlimb_00AFEC" Type="Standard" EnumName="OBJECT_DT_LIMB_01" Offset="0xAFEC" />
-        <Limb Name="object_dt_Standardlimb_00AFF8" Type="Standard" EnumName="OBJECT_DT_LIMB_02" Offset="0xAFF8" />
-        <Limb Name="object_dt_Standardlimb_00B004" Type="Standard" EnumName="OBJECT_DT_LIMB_03" Offset="0xB004" />
-        <Limb Name="object_dt_Standardlimb_00B010" Type="Standard" EnumName="OBJECT_DT_LIMB_04" Offset="0xB010" />
-        <Limb Name="object_dt_Standardlimb_00B01C" Type="Standard" EnumName="OBJECT_DT_LIMB_05" Offset="0xB01C" />
-        <Limb Name="object_dt_Standardlimb_00B028" Type="Standard" EnumName="OBJECT_DT_LIMB_06" Offset="0xB028" />
-        <Limb Name="object_dt_Standardlimb_00B034" Type="Standard" EnumName="OBJECT_DT_LIMB_07" Offset="0xB034" />
-        <Limb Name="object_dt_Standardlimb_00B040" Type="Standard" EnumName="OBJECT_DT_LIMB_08" Offset="0xB040" />
-        <Limb Name="object_dt_Standardlimb_00B04C" Type="Standard" EnumName="OBJECT_DT_LIMB_09" Offset="0xB04C" />
-        <Limb Name="object_dt_Standardlimb_00B058" Type="Standard" EnumName="OBJECT_DT_LIMB_0A" Offset="0xB058" />
-        <Limb Name="object_dt_Standardlimb_00B064" Type="Standard" EnumName="OBJECT_DT_LIMB_0B" Offset="0xB064" />
-        <Limb Name="object_dt_Standardlimb_00B070" Type="Standard" EnumName="OBJECT_DT_LIMB_0C" Offset="0xB070" />
-        <Limb Name="object_dt_Standardlimb_00B07C" Type="Standard" EnumName="OBJECT_DT_LIMB_0D" Offset="0xB07C" />
-        <Limb Name="object_dt_Standardlimb_00B088" Type="Standard" EnumName="OBJECT_DT_LIMB_0E" Offset="0xB088" />
-        <Skeleton Name="object_dt_Skel_00B0CC" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DT_LIMB_NONE" LimbMax="OBJECT_DT_LIMB_MAX" EnumName="ObjectDtLimb" Offset="0xB0CC" />
-        <Animation Name="object_dt_Anim_00B500" Offset="0xB500" /> <!-- Original name is "dt_yome2arigato" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dy_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dy_obj.xml
deleted file mode 100644
index b321240cc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_dy_obj.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<Root>
-    <!-- Great Fairy assets -->
-    <File Name="object_dy_obj" Segment="6">
-        <!-- Great Fairy animations -->
-        <Animation Name="gGreatFairyStartGivingUpgradeAnim" Offset="0x129C" /> <!-- Original name is "be_mahoukousi" -->
-        <Animation Name="gGreatFairyGivingUpgradeAnim" Offset="0x2338" /> <!-- Original name is "be_mahoukousi_loop" -->
-        <Animation Name="gGreatFairyAnim_0027B0" Offset="0x27B0" /> <!-- Original name is "be_syutugen" --> <!-- unused -->
-        <Animation Name="gGreatFairyLayDownTransitionAnim" Offset="0x45FC" /> <!-- Original name is "be_utubuse" -->
-        <Animation Name="gGreatFairyLayingDownAnim" Offset="0x5238" /> <!-- Original name is "be_utubuse_loop" -->
-        <Animation Name="gGreatFairyTeachSpinAttackAnim" Offset="0x5E20" /> <!-- Original name is "bigelf_denjyu" ("instruction") -->
-        <Animation Name="gGreatFairyClappingAnim" Offset="0x6DE4" /> <!-- Original name is "bigelf_hakusyu" ("applause") -->
-        <Animation Name="gGreatFairyShowingItemAnim" Offset="0x8090" /> <!-- Original name is "bigelf_itemdasu" -->
-        <Animation Name="gGreatFairySpinLayDownAnim" Offset="0xC500" /> <!-- Original name is "bigelf_syutugen" -->
-        <Animation Name="gGreatFairyArmsFoldedAnim" Offset="0xD15C" /> <!-- Original name is "bigelf_udegumi" ("arms crossed") -->
-
-        <!-- Great Fairy particles -->
-        <DList Name="gGreatFairyParticleSetupDL" Offset="0xD1B0" />
-        <DList Name="gGreatFairyParticleDL" Offset="0xD228" />
-        <Texture Name="gGreatFairyParticleTex" OutName="great_fairy_particle" Format="i4" Width="32" Height="32" Offset="0xD240" />
-
-        <!-- Great Fairy spiral beam -->
-        <Texture Name="gGreatFairySpiralBeamPatternTex" OutName="spiral_beam_pattern" Format="i8" Width="16" Height="16" Offset="0xD440" />
-        <Texture Name="gGreatFairySpiralBeamGradientTex" OutName="spiral_beam_gradient" Format="i8" Width="32" Height="64" Offset="0xD540" />
-        <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0xDD40">
-            <Vtx/>
-        </Array>
-        <DList Name="gGreatFairySpiralBeamDL" Offset="0xDEF0" /> <!-- Original name is "efc_g_fairly_modelT" -->
-
-        <!-- Great Fairy model -->
-        <!-- Displaylists -->
-        <DList Name="gGreatFairyWaistDL" Offset="0x13810" />
-        <DList Name="gGreatFairyTorsoDL" Offset="0x13928" />
-        <DList Name="gGreatFairyHeadDL" Offset="0x13CF8" />
-        <DList Name="gGreatFairyRightHairLowerPartDL" Offset="0x142E0" />
-        <DList Name="gGreatFairyRightHairMiddlePartDL" Offset="0x143F0" />
-        <DList Name="gGreatFairyRightHairUpperPartDL" Offset="0x14578" />
-        <DList Name="gGreatFairyRightHairTipDL" Offset="0x14670" />
-        <DList Name="gGreatFairyLeftHairLowerPartDL" Offset="0x14760" />
-        <DList Name="gGreatFairyLeftHairMiddlePartDL" Offset="0x14908" />
-        <DList Name="gGreatFairyLeftHairUpperPartDL" Offset="0x14A00" />
-        <DList Name="gGreatFairyLeftHairTipDL" Offset="0x14B88" />
-        <DList Name="gGreatFairyMiddleHairLowerPartDL" Offset="0x14C78" />
-        <DList Name="gGreatFairyMiddleHairMiddlePartDL" Offset="0x14E08" />
-        <DList Name="gGreatFairyMiddleHairUpperPartDL" Offset="0x14F08" />
-        <DList Name="gGreatFairyMiddleHairTipDL" Offset="0x15008" />
-        <DList Name="gGreatFairyRightUpperArmDL" Offset="0x150F8" />
-        <DList Name="gGreatFairyRightForearmDL" Offset="0x15220" />
-        <DList Name="gGreatFairyRightHandDL" Offset="0x153B8" />
-        <DList Name="gGreatFairyLeftUpperArmDL" Offset="0x15598" />
-        <DList Name="gGreatFairyLeftForearmDL" Offset="0x156C0" />
-        <DList Name="gGreatFairyLeftHandDL" Offset="0x158E8" />
-        <DList Name="gGreatFairyRightThighDL" Offset="0x15AC8" />
-        <DList Name="gGreatFairyRightLowerLegDL" Offset="0x15E88" />
-        <DList Name="gGreatFairyRightFootDL" Offset="0x15FE8" />
-        <DList Name="gGreatFairyLeftThighDL" Offset="0x160F8" />
-        <DList Name="gGreatFairyLeftLowerLegDL" Offset="0x16360" />
-        <DList Name="gGreatFairyLeftFootDL" Offset="0x164B8" />
-
-        <!-- Textures -->
-        <Texture Name="object_dy_obj_TLUT_0165C8" OutName="tlut_0165C8" Format="rgba16" Width="16" Height="16" Offset="0x165C8" />
-        <Texture Name="object_dy_obj_Tex_0167C8" OutName="tex_0167C8" Format="ci8" Width="8" Height="8" Offset="0x167C8" />
-        <Texture Name="object_dy_obj_Tex_016808" OutName="tex_016808" Format="ci8" Width="8" Height="8" Offset="0x16808" />
-        <Texture Name="object_dy_obj_Tex_016848" OutName="tex_016848" Format="ci8" Width="32" Height="64" Offset="0x16848" />
-        <Texture Name="object_dy_obj_Tex_017048" OutName="tex_017048" Format="ci8" Width="8" Height="8" Offset="0x17048" />
-        <Texture Name="object_dy_obj_Tex_017088" OutName="tex_017088" Format="ci8" Width="32" Height="32" Offset="0x17088" />
-        <Texture Name="object_dy_obj_Tex_017488" OutName="tex_017488" Format="ci8" Width="32" Height="32" Offset="0x17488" />
-        <Texture Name="object_dy_obj_Tex_017888" OutName="tex_017888" Format="ci8" Width="16" Height="16" Offset="0x17888" />
-        <Texture Name="object_dy_obj_Tex_017988" OutName="tex_017988" Format="rgba16" Width="32" Height="16" Offset="0x17988" />
-
-        <Texture Name="object_dy_obj_Tex_017D88" OutName="tex_017D88" Format="rgba16" Width="32" Height="32" Offset="0x17D88" />
-        <Texture Name="object_dy_obj_Tex_018588" OutName="tex_018588" Format="rgba16" Width="32" Height="32" Offset="0x18588" />
-        <Texture Name="object_dy_obj_Tex_018D88" OutName="tex_018D88" Format="rgba16" Width="32" Height="32" Offset="0x18D88" />
-        <Texture Name="object_dy_obj_Tex_019588" OutName="tex_019588" Format="rgba16" Width="32" Height="32" Offset="0x19588" />
-        <Texture Name="object_dy_obj_Tex_019D88" OutName="tex_019D88" Format="rgba16" Width="32" Height="32" Offset="0x19D88" />
-        <Texture Name="gGreatFairyMouthClosedTex" OutName="great_fairy_mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x1A588" />
-        <Texture Name="gGreatFairyMouthOpenTex" OutName="great_fairy_mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1B588" />
-        <Texture Name="object_dy_obj_Tex_01C588" OutName="tex_01C588" Format="i8" Width="16" Height="16" Offset="0x1C588" />
-
-        <TextureAnimation Name="gGreatFairyAppearenceTexAnim" Offset="0x1C6F4" />
-
-        <!-- Great Fairy Skeleton -->
-        <Limb Name="gGreatFairyWaistLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_WAIST" Offset="0x1C704" />
-        <Limb Name="gGreatFairyLeftThighLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_THIGH" Offset="0x1C710" />
-        <Limb Name="gGreatFairyLeftLowerLegLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_LOWER_LEG" Offset="0x1C71C" />
-        <Limb Name="gGreatFairyLeftFootLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_FOOT" Offset="0x1C728" />
-        <Limb Name="gGreatFairyRightThighLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_THIGH" Offset="0x1C734" />
-        <Limb Name="gGreatFairyRightLowerLegLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_LOWER_LEG" Offset="0x1C740" />
-        <Limb Name="gGreatFairyRightFootLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_FOOT" Offset="0x1C74C" />
-        <Limb Name="gGreatFairyTorsoLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_TORSO" Offset="0x1C758" />
-        <Limb Name="gGreatFairyLeftUpperArmLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_UPPER_ARM" Offset="0x1C764" />
-        <Limb Name="gGreatFairyLeftForearmLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_FOREARM" Offset="0x1C770" />
-        <Limb Name="gGreatFairyLeftHandLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_HAND" Offset="0x1C77C" />
-        <Limb Name="gGreatFairyRightUpperArmLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_UPPER_ARM" Offset="0x1C788" />
-        <Limb Name="gGreatFairyRightForearmLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_FOREARM" Offset="0x1C794" />
-        <Limb Name="gGreatFairyRightHandLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_HAND" Offset="0x1C7A0" />
-        <Limb Name="gGreatFairyHeadLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_HEAD" Offset="0x1C7AC" />
-        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_MIDDLE_HAIR_LOWER_PART" Offset="0x1C7B8" />
-        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_MIDDLE_HAIR_MIDDLE_PART" Offset="0x1C7C4" />
-        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_MIDDLE_HAIR_UPPER_PART" Offset="0x1C7D0" />
-        <Limb Name="gGreatFairyMiddleHairTipLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_MIDDLE_HAIR_TIP" Offset="0x1C7DC" />
-        <Limb Name="gGreatFairyLeftHairLowerPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_HAIR_LOWER_PART" Offset="0x1C7E8" />
-        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_HAIR_MIDDLE_PART" Offset="0x1C7F4" />
-        <Limb Name="gGreatFairyLeftHairUpperPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_HAIR_UPPER_PART" Offset="0x1C800" />
-        <Limb Name="gGreatFairyLeftHairTipLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_HAIR_TIP" Offset="0x1C80C" />
-        <Limb Name="gGreatFairyRightHairLowerPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_HAIR_LOWER_PART" Offset="0x1C818" />
-        <Limb Name="gGreatFairyRightHairMiddlePartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_HAIR_MIDDLE_PART" Offset="0x1C824" />
-        <Limb Name="gGreatFairyRightHairUpperPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_HAIR_UPPER_PART" Offset="0x1C830" />
-        <Limb Name="gGreatFairyRightHairTipLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_HAIR_TIP" Offset="0x1C83C" />
-        <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" LimbNone="GREAT_FAIRY_LIMB_NONE" LimbMax="GREAT_FAIRY_LIMB_MAX" EnumName="GreatFairyLimb" Offset="0x1C8B4" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_efc_star_field.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_efc_star_field.xml
deleted file mode 100644
index 90ea17929..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_efc_star_field.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_efc_star_field" Segment="6">
-        <DList Name="object_efc_star_field_DL_000080" Offset="0x80" /> <!-- Original name is "efc_star_field_modelT" -->
-        <Texture Name="object_efc_star_field_Tex_000108" OutName="tex_000108" Format="i8" Width="16" Height="64" Offset="0x108" />
-        <DList Name="object_efc_star_field_DL_000DE0" Offset="0xDE0" /> <!-- Original name is "demo_rock_model" -->
-        <Texture Name="object_efc_star_field_Tex_000FD0" OutName="tex_000FD0" Format="i4" Width="64" Height="64" Offset="0xFD0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_efc_tw.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_efc_tw.xml
deleted file mode 100644
index c28ae3c81..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_efc_tw.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_efc_tw" Segment="6">
-        <CurveAnimation Name="gTimewarpAnim" SkelOffset="0x12E8" Offset="0x50" />
-
-        <Array Name="gTimewarpVtx" Count="21" Offset="0x60" >
-            <Vtx/>
-        </Array>
-
-        <DList Name="gTimewarpDL" Offset="0x1B0" /> <!-- Original name is "top_fc_mdl" -->
-        <Texture Name="gTimewarpTex" OutName="timewarp" Format="i8" Width="64" Height="64" Offset="0x2C8" />
-
-        <Limb Name="gTimewarp1Limb" Type="Curve" EnumName="TIMEWARP_LIMB_1" Offset="0x12C8" />
-        <Limb Name="gTimewarp2Limb" Type="Curve" EnumName="TIMEWARP_LIMB_2" Offset="0x12D4" />
-        <Skeleton Name="gTimewarpSkel" Type="Curve" LimbType="Curve" LimbNone="TIMEWARP_LIMB_NONE" LimbMax="TIMEWARP_LIMB_MAX" EnumName="TimewarpLimb" Offset="0x12E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_eg.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_eg.xml
deleted file mode 100644
index a79ff6332..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_eg.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<Root>
-    <!-- Assets for the Eyegore enemy and associated props -->
-    <File Name="object_eg" Segment="6">
-        <!-- Display lists and textures for Eyegore's effects -->
-        <DList Name="gEyegoreEffectImpactDL" Offset="0x40" /> <!-- Original name is "grid1_model" -->
-        <Texture Name="gEyegoreEffectImpactTex" OutName="eyegore_effect_impact" Format="ia8" Width="64" Height="64" Offset="0xC0" />
-        <TextureAnimation Name="gEyegoreEmpty1TexAnim" Offset="0x10C0" />
-        <DList Name="gEyegoreEffectLargeBodyPieceDL" Offset="0x1170" /> <!-- Original name is "baku_shape1_model" -->
-        <Texture Name="gEyegoreEffectLargeBodyPieceTex" OutName="eyegore_effect_large_piece" Format="rgba16" Width="8" Height="16" Offset="0x1210" />
-        <DList Name="gEyegoreEffectSmallBodyPieceDL" Offset="0x13B0" /> <!-- Original name is "baku_shape2_model" -->
-        <Texture Name="gEyegoreEffectSmallBodyPieceTex" OutName="eyegore_effect_small_piece" Format="rgba16" Width="8" Height="16" Offset="0x1450" />
-        <DList Name="gEyegoreEmpty1DL" Offset="0x1690" />
-
-        <!-- Assets for Eyegore's destructible pillars (unused) -->
-        <DList Name="gEyegoreBlockDL" Offset="0x1698" />
-        <Collision Name="gEyegoreBlockCol" Offset="0x1820" /> <!-- Original name is "eg_block1_bgdatainfo" -->
-        <DList Name="gEyegoreEmpty2DL" Offset="0x1910" />
-        <DList Name="gEyegoreEffectSolidDebrisDL" Offset="0x1918" /> <!-- Original name is "eg_block2_model" -->
-        <Texture Name="gEyegoreEffectSolidDebrisTex" OutName="eyegore_effect_solid_debris" Format="rgba16" Width="16" Height="16" Offset="0x19B0" />
-        <TextureAnimation Name="gEyegoreEmpty2TexAnim" Offset="0x1BB0" />
-        <DList Name="gEyegoreEmpty3DL" Offset="0x1BF0" />
-        <DList Name="gEyegoreEffectFlatDebrisDL" Offset="0x1BF8" />
-        <Texture Name="gEyegoreEffectFlatDebrisTex" OutName="eyegore_effect_flat_debris" Format="rgba16" Width="16" Height="16" Offset="0x1C78" />
-        <TextureAnimation Name="gEyegoreEmpty3TexAnim" Offset="0x1E80" />
-
-        <!-- Slam attack animation -->
-        <Animation Name="gEyegoreSlamAnim" Offset="0x2460" /> <!-- Original name is "eg_atack01" -->
-
-        <!-- Unused vertex mesh. Purpose unknown. -->
-        <Array Name="gEyegoreUnusedVtx" Count="464" Offset="0x2470"> <!-- type is uncertain -->
-            <Vtx/>
-        </Array>
-
-        <!-- Display list for Eyegore's laser attack -->
-        <DList Name="gEyegoreLaserDL" Offset="0x41F0" /> <!-- Original name is "eg_sen_SCR1_F_model" -->
-        
-        <!-- Several unused textures that look to come from object_vm. Purpose unknown. -->
-        <Texture Name="gEyegoreBeamosBodyGradientTex" OutName="eyegore_beamos_body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x4280" />
-        <Texture Name="gEyegoreBeamosGrayMetalTex" OutName="eyegore_beamos_gray_metal" Format="i4" Width="16" Height="32" Offset="0x4300" />
-        <Texture Name="gEyegoreBeamosBoltAndMetalTex" OutName="eyegore_beamos_bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x4400" />
-        <Texture Name="gEyegoreBeamosInnerEyeLidTex" OutName="eyegore_beamos_inner_eye_lid" Format="rgba16" Width="16" Height="8" Offset="0x4800" />
-        <Texture Name="gEyegoreBeamosEyeOutlineTex" OutName="eyegore_beamos_eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x4900" />
-        <Texture Name="gEyegoreBeamosEyeTex" OutName="eyegore_beamos_eye" Format="rgba16" Width="32" Height="16" Offset="0x4B00" />
-        <Texture Name="gEyegoreBeamosBodyTex" OutName="eyegore_beamos_body" Format="rgba16" Width="16" Height="16" Offset="0x4F00" />
-
-        <!-- Animated texture for Eyegore's laser attack. Uses gEyegoreEyeLaserTexAnim. -->
-        <Texture Name="gEyegoreLaserTex" OutName="eyegore_laser" Format="rgba16" Width="8" Height="8" Offset="0x5100" />
-
-        <!-- Unused teeth texture that looks to come from object_vm. Purpose unknown. -->
-        <Texture Name="gEyegoreBeamosTeethTex" OutName="eyegore_beamos_teeth" Format="rgba16" Width="32" Height="32" Offset="0x5180" />
-
-        <!-- Eyegore limb display lists -->
-        <DList Name="gEyegoreHipsDL" Offset="0x7C80" />
-        <DList Name="gEyegoreFauldsDL" Offset="0x7DF8" />
-        <DList Name="gEyegoreRightShinDL" Offset="0x7EB0" />
-        <DList Name="gEyegoreRightFootDL" Offset="0x7FF0" />
-        <DList Name="gEyegoreRightThighDL" Offset="0x8180" />
-        <DList Name="gEyegoreLeftShinDL" Offset="0x82F0" />
-        <DList Name="gEyegoreLeftFootDL" Offset="0x8430" />
-        <DList Name="gEyegoreLeftThighDL" Offset="0x85C0" />
-        <DList Name="gEyegoreHeadDL" Offset="0x8730" />
-        <DList Name="gEyegoreEyeballDL" Offset="0x88E0" />
-        <DList Name="gEyegoreEyeColliderLimbDL" Offset="0x89F8" />
-        <DList Name="gEyegoreLaserAttachLimbDL" Offset="0x8A40" />
-        <DList Name="gEyegorePupilDL" Offset="0x8A88" />
-        <DList Name="gEyegoreLowerEyelidDL" Offset="0x8B28" />
-        <DList Name="gEyegoreUpperEyelidDL" Offset="0x8C28" />
-        <DList Name="gEyegoreRightHandDL" Offset="0x8D28" />
-        <DList Name="gEyegoreRightShoulderDL" Offset="0x8E40" />
-        <DList Name="gEyegoreRightArmDL" Offset="0x8ED8" />
-        <DList Name="gEyegoreLeftHandDL" Offset="0x90A0" />
-        <DList Name="gEyegoreLeftShoulderDL" Offset="0x91B8" />
-        <DList Name="gEyegoreLeftArmDL" Offset="0x9250" />
-        <DList Name="gEyegoreTorsoDL" Offset="0x9418" />
-
-        <!-- Texture animation for Eyegore's eye and laser -->
-        <TextureAnimation Name="gEyegoreEyeLaserTexAnim" Offset="0x94E4" />
-
-        <!-- Eyegore limbs -->
-        <Limb Name="gEyegoreRootLimb" Type="Standard" EnumName="EYEGORE_LIMB_ROOT" Offset="0x94F4" />
-        <Limb Name="gEyegoreTorsoLimb" Type="Standard" EnumName="EYEGORE_LIMB_TORSO" Offset="0x9500" />
-        <Limb Name="gEyegoreHeadLimb" Type="Standard" EnumName="EYEGORE_LIMB_HEAD" Offset="0x950C" />
-        <Limb Name="gEyegoreLeftShoulderLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_SHOULDER" Offset="0x9518" /> 
-        <Limb Name="gEyegoreLeftArmLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_ARM" Offset="0x9524" /> 
-        <Limb Name="gEyegoreLeftHandLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_HAND" Offset="0x9530" /> 
-        <Limb Name="gEyegoreRightShoulderLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_SHOULDER" Offset="0x953C" /> 
-        <Limb Name="gEyegoreRightArmLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_ARM" Offset="0x9548" /> 
-        <Limb Name="gEyegoreRightHandLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_HAND" Offset="0x9554" /> 
-        <Limb Name="gEyegoreUpperEyelidLimb" Type="Standard" EnumName="EYEGORE_LIMB_UPPER_EYELID" Offset="0x9560" /> 
-        <Limb Name="gEyegoreLowerEyelidLimb" Type="Standard" EnumName="EYEGORE_LIMB_LOWER_EYELID" Offset="0x956C" /> 
-        <Limb Name="gEyegorePupilLimb" Type="Standard" EnumName="EYEGORE_LIMB_PUPIL" Offset="0x9578" /> 
-        <Limb Name="gEyegoreLaserAttachLimb" Type="Standard" EnumName="EYEGORE_LIMB_LASER_ATTACH" Offset="0x9584" /> 
-        <Limb Name="gEyegoreEyeColliderLimb" Type="Standard" EnumName="EYEGORE_LIMB_EYE_COLLIDER" Offset="0x9590" /> 
-        <Limb Name="gEyegoreEyeballLimb" Type="Standard" EnumName="EYEGORE_LIMB_EYEBALL" Offset="0x959C" /> 
-        <Limb Name="gEyegoreHipsLimb" Type="Standard" EnumName="EYEGORE_LIMB_HIPS" Offset="0x95A8" /> 
-        <Limb Name="gEyegoreLeftThighLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_THIGH" Offset="0x95B4" /> 
-        <Limb Name="gEyegoreLeftShinLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_SHIN" Offset="0x95C0" /> 
-        <Limb Name="gEyegoreLeftFootLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_FOOT" Offset="0x95CC" /> 
-        <Limb Name="gEyegoreRightThighLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_THIGH" Offset="0x95D8" /> 
-        <Limb Name="gEyegoreRightShinLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_SHIN" Offset="0x95E4" /> 
-        <Limb Name="gEyegoreRightFootLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_FOOT" Offset="0x95F0" /> 
-        <Limb Name="gEyegoreFauldsLimb" Type="Standard" EnumName="EYEGORE_LIMB_FAULDS" Offset="0x95FC" /> 
-
-        <!-- Eyegore skeleton -->
-        <Skeleton Name="gEyegoreSkel" Type="Flex" LimbType="Standard" LimbNone="EYEGORE_LIMB_NONE" LimbMax="EYEGORE_LIMB_MAX" EnumName="EyegoreLimb" Offset="0x9664" />
-
-        <!-- Various fight animations -->
-        <Animation Name="gEyegoreSlamWaitAnim" Offset="0x9D2C" /> <!-- Original name is "eg_atack02" -->
-        <Animation Name="gEyegoreSlamEndAnim" Offset="0xA204" /> <!-- Original name is "eg_atack03" -->
-        <Animation Name="gEyegoreLaserAnim" Offset="0xA484" /> <!-- Original name is "eg_beam" -->
-        <Animation Name="gEyegoreUnusedLaserEndAnim" Offset="0xA73C" /> <!-- Original name is "eg_beamTOwalk" -->
-        <Animation Name="gEyegoreDamagedAnim" Offset="0xADF8" /> <!-- Original name is "eg_damage" -->
-        <Animation Name="gEyegoreDeathAnim" Offset="0xBC60" /> <!-- Original name is "eg_dead" -->
-        <Animation Name="gEyegoreRetreatAnim" Offset="0xBEB8" /> <!-- Original name is "eg_escape" -->
-        <Animation Name="gEyegoreLeftPunchAnim" Offset="0xC434" /> <!-- Original name is "eg_hatakiL" -->
-        <Animation Name="gEyegoreRightPunchAnim" Offset="0xC9B4" /> <!-- Original name is "eg_hatakiR" -->
-        <Animation Name="gEyegoreStunnedAnim" Offset="0xCC4C" /> <!-- Original name is "eg_mahi" -->
-        <Animation Name="gEyegoreStunEndAnim" Offset="0xCE54" /> <!-- Original name is "eg_mahiTOwalk" -->
-        <Animation Name="gEyegoreSitAnim" Offset="0xD3D8" /> <!-- Original name is "eg_nemuru" -->
-
-        <!-- Unused stone display list and texture. It's a copy of the stone in object_efc_star_field. -->
-        <DList Name="gEyegoreUnusedStoneDL" Offset="0xDCC0" />
-        <Texture Name="gEyegoreUnusedStoneTex" OutName="eyegore_unused_stone" Format="i4" Width="64" Height="64" Offset="0xDEA8" />
-
-        <!-- Various walking and idle animations. Contains several unused ones. -->
-        <Animation Name="gEyegoreUnusedChaseAnim" Offset="0xEA10" /> <!-- Original name is "eg_run" -->
-        <Animation Name="gEyegoreStandAnim" Offset="0xEE4C" /> <!-- Original name is "eg_start" -->
-        <Animation Name="gEyegoreUnusedWalkAnim" Offset="0xF524" /> <!-- Original name is "eg_turn" -->
-        <Animation Name="gEyegoreUnusedIdleAnim" Offset="0xFB0C" /> <!-- Original name is "eg_wait" -->
-        <Animation Name="gEyegoreWalkAnim" Offset="0x100C0" /> <!-- Original name is "eg_walk" -->
-
-        <!-- Display list and texture for the stones created by Eyegore's attacks -->
-        <DList Name="gEyegoreStoneDL" Offset="0x10240" /> <!-- Original name is "iwaA_cube1_model" -->
-        <Texture Name="gEyegoreStoneTex" OutName="eyegore_stone" Format="rgba16" Width="36" Height="36" Offset="0x10310" />
-
-        <!-- Duplicate of gEyegoreEffectImpactTex -->
-        <Texture Name="gEyegoreDuplicateEffectImpactTex" OutName="eyegore_duplicate_effect_impact" Format="ia8" Width="64" Height="64" Offset="0x10D30" />
-
-        <!-- Textures for Eyegore's body -->
-        <Texture Name="gEyegoreDarkBodyTex" OutName="eyegore_dark_body" Format="rgba16" Width="8" Height="16" Offset="0x11D30" />
-        <Texture Name="gEyegoreBlockTex" OutName="eyegore_block" Format="rgba16" Width="16" Height="16" Offset="0x11E30" />
-        <Texture Name="gEyegoreClawTex" OutName="eyegore_claw" Format="rgba16" Width="4" Height="4" Offset="0x12030" />
-        <Texture Name="gEyegoreLightBodyTex" OutName="eyegore_light_body" Format="rgba16" Width="8" Height="16" Offset="0x12050" />
-        <Texture Name="gEyegoreArmorTex" OutName="eyegore_armor" Format="rgba16" Width="8" Height="8" Offset="0x12150" />
-        <Texture Name="gEyegoreHeadTex" OutName="eyegore_head" Format="i4" Width="16" Height="32" Offset="0x121D0" />
-        <Texture Name="gEyegorePupilTex" OutName="eyegore_pupil" Format="rgba16" Width="16" Height="32" Offset="0x122D0" />
-
-        <!-- Duplicate of gEyegoreStoneTex -->
-        <Texture Name="gEyegoreDuplicateStoneTex" OutName="eyegore_duplicate_stone" Format="rgba16" Width="36" Height="36" Offset="0x126D0" />
-        
-        <!-- Animated texture for Eyegore's eye. Uses gEyegoreEyeLaserTexAnim. -->
-        <Texture Name="gEyegoreEyeballTex" OutName="eyegore_eyeball" Format="i4" Width="16" Height="32" Offset="0x130F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ending_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ending_obj.xml
deleted file mode 100644
index f8902e353..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ending_obj.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <File Name="object_ending_obj" Segment="6">
-        <DList Name="object_ending_obj_DL_0003D0" Offset="0x3D0" /> <!-- Original name is "lost_woods_light_u_modelT" -->
-        <DList Name="object_ending_obj_DL_0005E0" Offset="0x5E0" />
-        <Texture Name="object_ending_obj_Tex_0005E8" OutName="tex_0005E8" Format="i8" Width="32" Height="64" Offset="0x5E8" />
-        <Texture Name="object_ending_obj_Tex_000DE8" OutName="tex_000DE8" Format="i8" Width="8" Height="64" Offset="0xDE8" />
-        <Texture Name="object_ending_obj_Tex_000FE8" OutName="tex_000FE8" Format="ia8" Width="64" Height="64" Offset="0xFE8" />
-        <TextureAnimation Name="object_ending_obj_Matanimheader_001FF8" Offset="0x1FF8" />
-        <DList Name="object_ending_obj_DL_0031A0" Offset="0x31A0" /> <!-- Original name is "z2_lost_woods_end_modelT" -->
-        <DList Name="object_ending_obj_DL_003440" Offset="0x3440" /> <!-- Original name is "z2_lost_woods_end_model" -->
-        <Texture Name="object_ending_obj_Tex_003958" OutName="tex_003958" Format="ia4" Width="128" Height="64" Offset="0x3958" />
-        <Texture Name="object_ending_obj_Tex_004958" OutName="tex_004958" Format="rgba16" Width="32" Height="32" Offset="0x4958" />
-        <Texture Name="object_ending_obj_Tex_005158" OutName="tex_005158" Format="ia16" Width="16" Height="64" Offset="0x5158" />
-        <Texture Name="object_ending_obj_Tex_005958" OutName="tex_005958" Format="ia16" Width="8" Height="32" Offset="0x5958" />
-        <Texture Name="object_ending_obj_Tex_005B58" OutName="tex_005B58" Format="rgba16" Width="16" Height="16" Offset="0x5B58" />
-        <Texture Name="object_ending_obj_Tex_005D58" OutName="tex_005D58" Format="ia16" Width="32" Height="32" Offset="0x5D58" />
-        <Texture Name="object_ending_obj_Tex_006558" OutName="tex_006558" Format="ia8" Width="64" Height="64" Offset="0x6558" />
-        <Texture Name="object_ending_obj_Tex_007558" OutName="tex_007558" Format="ia8" Width="8" Height="16" Offset="0x7558" />
-        <Texture Name="object_ending_obj_Tex_0075D8" OutName="tex_0075D8" Format="i8" Width="32" Height="64" Offset="0x75D8" />
-        <Texture Name="object_ending_obj_Tex_007DD8" OutName="tex_007DD8" Format="i4" Width="64" Height="64" Offset="0x7DD8" />
-        <Texture Name="object_ending_obj_Tex_0085D8" OutName="tex_0085D8" Format="i4" Width="32" Height="32" Offset="0x85D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f40_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f40_obj.xml
deleted file mode 100644
index 636a80682..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f40_obj.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Root>
-    <!-- 
-        Assets for Stone Tower platforms. These platforms include the cubes moved by pressing the switches in 
-        Stone Tower and two unused platforms.
-    -->
-    <File Name="object_f40_obj" Segment="6">
-        <Texture Name="gStoneTowerPlatformsTopTex" OutName="stone_tower_platforms_top" Format="i8" Width="64" Height="64" Offset="0x0" /> <!-- Unused -->
-        <Texture Name="gStoneTowerPlatformsSidesTex" OutName="stone_tower_platforms_sides" Format="rgba16" Width="32" Height="64" Offset="0x1000" /> <!-- Unused -->
-        
-        <Texture Name="gStoneTowerBlockBackgroundTex" OutName="stone_tower_block_background" Format="rgba16" Width="32" Height="32" Offset="0x2000" />
-        <Texture Name="gStoneTowerBlockPatternTex" OutName="stone_tower_block_pattern" Format="i4" Width="32" Height="128" Offset="0x2800" />
-        <Texture Name="gStoneTowerBlockSidesTex" OutName="stone_tower_block_sides" Format="i4" Width="64" Height="64" Offset="0x3000" />
-        
-        <DList Name="gStoneTowerVerticallyOscillatingPlatformEmptyDL" Offset="0x3B00" />
-        <DList Name="gStoneTowerVerticallyOscillatingPlatformDL" Offset="0x3B08" /> <!-- Unused -->
-        <Collision Name="gStoneTowerVerticallyOscillatingPlatformCol" Offset="0x3E80" /> <!-- Unused -->
-        
-        <DList Name="gStoneTowerTempleSquareElevatorEmptyDL" Offset="0x4030" />
-        <DList Name="gStoneTowerTempleSquareElevatorDL" Offset="0x4038" /> <!-- Unused -->
-        <Collision Name="gStoneTowerTempleSquareElevatorCol" Offset="0x4240" /> <!-- Unused -->
-        
-        <DList Name="gStoneTowerBlockDL" Offset="0x43D0" />
-        <Collision Name="gStoneTowerBlockCol" Offset="0x4640" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f40_switch.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f40_switch.xml
deleted file mode 100644
index 6be5a5bd5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f40_switch.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Object for Stone Tower Switch -->
-    <File Name="object_f40_switch" Segment="6">
-        <Collision Name="gStoneTowerFloorSwitchCol" Offset="0x118" /> <!-- Original name is "f40_switch_1_bgdatainfo" -->
-        <DList Name="gStoneTowerFloorSwitchOutlineDL" Offset="0x390" /> <!-- Original name is "z2_switch_lb_modelT" -->
-        <DList Name="gStoneTowerFloorSwitchDL" Offset="0x438" /> <!-- Original name is "z2_switch_lb_model" -->
-        <Texture Name="gStoneTowerFloorSwitchOutlineTex" OutName="stone_tower_switch_outline" Format="rgba16" Width="16" Height="64" Offset="0x4E8" />
-        <Texture Name="gStoneTowerFloorSwitchTex" OutName="stone_tower_switch" Format="ia8" Width="16" Height="16" Offset="0xCE8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f52_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f52_obj.xml
deleted file mode 100644
index 0da643be0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f52_obj.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_f52_obj" Segment="6">
-        <DList Name="object_f52_obj_DL_000570" Offset="0x570" /> <!-- Bell post. Original name is "bw_01_model" -->
-        <DList Name="object_f52_obj_DL_000698" Offset="0x698" /> <!-- Bell. Original name is "bk_model" -->
-        <DList Name="object_f52_obj_DL_0007A8" Offset="0x7A8" /> <!-- Bell Base -->
-        <DList Name="object_f52_obj_DL_000840" Offset="0x840" /> <!-- Bell Shadow. Original name is "bqT_model" -->
-        <DList Name="object_f52_obj_DL_0008D0" Offset="0x8D0" /> <!-- Bell Hook. Original name is "bhT_model" -->
-        <DList Name="object_f52_obj_DL_000960" Offset="0x960" /> <!-- Bell Designs -->
-        <Texture Name="object_f52_obj_Tex_000A10" OutName="tex_000A10" Format="rgba16" Width="32" Height="16" Offset="0xA10" />
-        <Texture Name="object_f52_obj_Tex_000E10" OutName="tex_000E10" Format="ia16" Width="16" Height="16" Offset="0xE10" />
-        <Texture Name="object_f52_obj_Tex_001010" OutName="tex_001010" Format="rgba16" Width="32" Height="16" Offset="0x1010" />
-        <Texture Name="object_f52_obj_Tex_001410" OutName="tex_001410" Format="rgba16" Width="16" Height="32" Offset="0x1410" />
-        <Texture Name="object_f52_obj_Tex_001810" OutName="tex_001810" Format="rgba16" Width="8" Height="16" Offset="0x1810" />
-        <Collision Name="object_f52_obj_Colheader_001BA8" Offset="0x1BA8" /> <!-- Original name is "z2_bell_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f53_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f53_obj.xml
deleted file mode 100644
index d93048a9d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_f53_obj.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Root>
-    <File Name="object_f53_obj" Segment="6">
-        <DList Name="object_f53_obj_DL_000090" Offset="0x90" /> <!-- Original name is "z2_entotu_modelT" -->
-        <DList Name="object_f53_obj_DL_000148" Offset="0x148" />
-        <DList Name="object_f53_obj_DL_000158" Offset="0x158" />
-        <Texture Name="object_f53_obj_Tex_000168" OutName="tex_000168" Format="rgba16" Width="32" Height="64" Offset="0x168" />
-        <DList Name="gBankShutterDL" Offset="0x11E0" />
-        <Texture Name="object_f53_obj_Tex_001278" OutName="tex_001278" Format="rgba16" Width="32" Height="32" Offset="0x1278" />
-        <!-- <Blob Name="object_f53_obj_Blob_001A78" Size="0x78" Offset="0x1A78" /> -->
-        <DList Name="object_f53_obj_DL_001AF0" Offset="0x1AF0" /> <!-- Original name is "z2_smork_modelT" -->
-        <DList Name="object_f53_obj_DL_001BF0" Offset="0x1BF0" />
-        <DList Name="object_f53_obj_DL_001C00" Offset="0x1C00" />
-        <Texture Name="object_f53_obj_Tex_001C10" OutName="tex_001C10" Format="ia8" Width="32" Height="32" Offset="0x1C10" />
-        <!-- <Blob Name="object_f53_obj_Blob_0022D0" Size="0xE0" Offset="0x22D0" /> -->
-        <DList Name="object_f53_obj_DL_0023B0" Offset="0x23B0" />
-        <DList Name="object_f53_obj_DL_0024C8" Offset="0x24C8" />
-        <DList Name="object_f53_obj_DL_0024D8" Offset="0x24D8" />
-        <DList Name="object_f53_obj_DL_0024E8" Offset="0x24E8" />
-        <DList Name="object_f53_obj_DL_002648" Offset="0x2648" />
-        <DList Name="object_f53_obj_DL_002658" Offset="0x2658" />
-        <Texture Name="object_f53_obj_Tex_002668" OutName="tex_002668" Format="rgba16" Width="32" Height="32" Offset="0x2668" />
-        <Texture Name="object_f53_obj_Tex_002E68" OutName="tex_002E68" Format="ia8" Width="32" Height="32" Offset="0x2E68" />
-        <Texture Name="object_f53_obj_Tex_003268" OutName="tex_003268" Format="i4" Width="32" Height="128" Offset="0x3268" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fall.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fall.xml
deleted file mode 100644
index 04c1ff058..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fall.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<Root>
-    <!--
-        Contains the high-detail moon used in cutscenes and in Termina Field,
-        the debris that rises from the ground as the moon is crashing, the
-        ball of fire that surrounds the moon when it is crashing, and the ring
-        of fire that expands outward when the moon is almost done crashing.
-    -->
-    <File Name="object_fall" Segment="6">
-        <!-- Debris -->
-        <DList Name="gMoonEmpty1DL" Offset="0x190" /> <!-- Was likely going to be used with gMoonDebrisModel1DL before they made all debris use the same material -->
-        <DList Name="gMoonDebrisMaterialDL" Offset="0x198" />
-        <DList Name="gMoonDebrisModel1DL" Offset="0x220" /> <!-- Original name is "at_dust_01_model" -->
-        <Texture Name="gMoonDebrisTex" OutName="moon_debris" Format="i8" Width="16" Height="16" Offset="0x260" />
-        <DList Name="gMoonEmpty2DL" Offset="0x420" /> <!-- Was likely going to be used with gMoonDebrisModel2DL before they made all debris use the same material -->
-        <DList Name="gMoonDebrisModel2DL" Offset="0x428" /> <!-- Original name is "at_dust_02_model" -->
-        <DList Name="gMoonEmpty3DL" Offset="0x490" /> <!-- Was likely going to be used with gMoonDebrisModel3DL before they made all debris use the same material -->
-        <DList Name="gMoonDebrisModel3DL" Offset="0x498" /> <!-- Original name is "at_dust_03_model" -->
-
-        <!-- Fireball Vertices -->
-        <Array Name="gMoonFireballVtx" Count="209" Offset="0x4C0">
-            <Vtx/>
-        </Array>
-        
-        <!-- Fireball DisplayList -->
-        <DList Name="gMoonFireballDL" Offset="0x11D0" /> <!-- Original name is "moon_fall_model" -->
-
-        <!-- Fireball Textures -->
-        <Texture Name="gMoonFireballFlecksTex" OutName="moon_fireball_flecks" Format="i8" Width="64" Height="64" Offset="0x1688" />
-        <Texture Name="gMoonFireballFlamesTex" OutName="moon_fireball_flames" Format="i4" Width="64" Height="64" Offset="0x2688" />
-        <Texture Name="gMoonFireballMaskTex" OutName="moon_fireball_mask" Format="i4" Width="64" Height="64" Offset="0x2E88" />
-
-        <!-- Fire Ring DisplayList -->
-        <DList Name="gMoonFireRingDL" Offset="0x3C30" /> <!-- Original name is "moon_fall2_model" -->
-
-        <!-- Fire Ring Textures -->
-        <Texture Name="gMoonFireRingFlamesTex" OutName="moon_fire_ring_flames" Format="i8" Width="32" Height="64" Offset="0x3E28" />
-        <Texture Name="gMoonFireRingMaskTex" OutName="moon_fire_ring_mask" Format="i8" Width="32" Height="64" Offset="0x4628" />
-
-        <!-- Fire Ring Texture Animation -->
-        <TextureAnimation Name="gMoonFireRingTexAnim" Offset="0x4E38" />
-
-        <!-- Unused Fireball Texture Animation -->
-        <TextureAnimation Name="gMoonUnusedFireballTexAnim" Offset="0x4E58" /> <!-- Almost certainly scrapped for just doing the TwoTexScrolls manually in EnFall_Fireball_Draw -->
-
-        <!-- Moon DisplayList -->
-        <DList Name="gMoonDL" Offset="0x77F0" /> <!-- Original name is "moon" -->
-
-        <!-- Moon Textures -->
-        <Texture Name="gMoonFarSideTLUT" OutName="moon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x82F8" />
-        <Texture Name="gMoonFaceTLUT" OutName="moon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8318" />
-        <Texture Name="gMoonEyeTex" OutName="moon_eye" Format="rgba16" Width="32" Height="32" Offset="0x8338" />
-        <Texture Name="gMoonTeethTex" OutName="moon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x8B38" />
-        <Texture Name="gMoonFarSideTex" OutName="moon_far_side" Format="ci4" Width="64" Height="64" Offset="0x9B38" />
-        <Texture Name="gMoonFaceTex" OutName="moon_face" Format="ci4" Width="64" Height="64" Offset="0xA338" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fall2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fall2.xml
deleted file mode 100644
index c6e4483a8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fall2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<Root>
-    <!--
-        Open-mouth version of the moon and the "warp beam" that emerges from the
-        moon's mouth, both used in the cutscene before warping to the moon.
-    -->
-    <File Name="object_fall2" Segment="6">
-        <DList Name="gOpenMouthMoonDL" Offset="0x2970" /> <!-- Original name is "moon_open" -->
-        <Texture Name="gOpenMouthMoonFarSideTLUT" OutName="open_mouth_moon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x34A8" />
-        <Texture Name="gOpenMouthMoonFaceTLUT" OutName="open_mouth_moon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x34C8" />
-        <Texture Name="gOpenMouthMoonEyesTex" OutName="open_mouth_moon_eyes" Format="rgba16" Width="32" Height="32" Offset="0x34E8" />
-        <Texture Name="gOpenMouthMoonFarSideTex" OutName="open_mouth_moon_far_side" Format="ci4" Width="64" Height="64" Offset="0x3CE8" />
-        <Texture Name="gOpenMouthMoonFaceTex" OutName="open_mouth_moon_face" Format="ci4" Width="64" Height="64" Offset="0x44E8" />
-        <Texture Name="gOpenMouthMoonTeethTex" OutName="open_mouth_moon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x4CE8" />
-        
-        <KeyFrameAnimation Name="gFall2FKAnim_5EF4" Skel="0x8898" Offset="0x5EF4"/>
-        <KeyFrameSkel Name="gFall2KFSkel_8898" LimbType="Flex" Offset="0x8898"/>
-
-        <Array Name="object_fall2_Vtx_005F10" Count="239" Offset="0x5F10">
-            <Vtx />
-        </Array>
-        <DList Name="object_fall2_DL_006E00" Offset="0x6E00" />
-        <DList Name="object_fall2_DL_006EF0" Offset="0x6EF0" />
-        <DList Name="object_fall2_DL_006FF8" Offset="0x6FF8" />
-        <DList Name="object_fall2_DL_007100" Offset="0x7100" />
-        <DList Name="object_fall2_DL_007208" Offset="0x7208" />
-        <DList Name="object_fall2_DL_007310" Offset="0x7310" />
-        <DList Name="object_fall2_DL_007418" Offset="0x7418" />
-        <DList Name="object_fall2_DL_007520" Offset="0x7520" />
-        <DList Name="object_fall2_DL_007628" Offset="0x7628" />
-        <DList Name="object_fall2_DL_007730" Offset="0x7730" />
-        <Texture Name="object_fall2_Tex_007838" OutName="tex_007838" Format="i4" Width="64" Height="64" Offset="0x7838" />
-        <Texture Name="object_fall2_Tex_008038" OutName="tex_008038" Format="i4" Width="64" Height="64" Offset="0x8038" />
-        <TextureAnimation Name="object_fall2_Matanimheader_008840" Offset="0x8840" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_famos.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_famos.xml
deleted file mode 100644
index f62604424..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_famos.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Root>
-    <!-- Death Armos: flying statues in Inverted Stone Tower Temple -->
-    <File Name="object_famos" Segment="6">
-        <Animation Name="gFamosShakeAnim" Offset="0xF8" /> <!-- Original name is "fam_aizu" -->
-        <DList Name="gFamosHelmetDL" Offset="0x12B0" />
-        <DList Name="gFamosMainBodyDL" Offset="0x1528" />
-        <DList Name="gFamosShieldDL" Offset="0x1C88" />
-        <DList Name="gFamosSwordDL" Offset="0x1DE8" />
-        <DList Name="gFamosLightSwitchDL" Offset="0x1FA8" />
-        <Texture Name="gFamosBodyTLUT" OutName="body_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2068" />
-        <Texture Name="gFamosBottomTLUT" OutName="bottom_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2088" />
-        <Texture Name="gFamosShieldTLUT" OutName="shield_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20A8" />
-        <Texture Name="gFamosSwordHiltTLUT" OutName="sword_hilt_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20C8" />
-        <Texture Name="gFamosMainBodyTex" OutName="famos_main_body" Format="ci4" Width="64" Height="64" Offset="0x20E8" />
-        <Texture Name="gFamosBottomTex" OutName="famos_bottom" Format="ci4" Width="32" Height="32" Offset="0x28E8" />
-        <Texture Name="gFamosShieldTex" OutName="famos_shield" Format="ci4" Width="64" Height="64" Offset="0x2AE8" />
-        <Texture Name="gFamosSwordHiltTex" OutName="famos_sword_hilt" Format="ci4" Width="32" Height="32" Offset="0x32E8" />
-        <Texture Name="gFamosLightSwitchTex" OutName="famos_light_switch" Format="rgba16" Width="32" Height="32" Offset="0x34E8" />
-
-        <Limb Name="gFamosBodyLimb" Type="Standard" EnumName="FAMOS_LIMB_BODY" Offset="0x3CE8" />
-        <Limb Name="gFamosEmblemLimb" Type="Standard" EnumName="FAMOS_LIMB_EMBLEM" Offset="0x3CF4" />
-        <Limb Name="gFamosSwordLimb" Type="Standard" EnumName="FAMOS_LIMB_SWORD" Offset="0x3D00" />
-        <Limb Name="gFamosShieldLimb" Type="Standard" EnumName="FAMOS_LIMB_SHIELD" Offset="0x3D0C" />
-        <Limb Name="gFamosHeadLimb" Type="Standard" EnumName="FAMOS_LIMB_HEAD" Offset="0x3D18" />
-        <Skeleton Name="gFamosSkel" Type="Normal" LimbType="Standard" LimbNone="FAMOS_LIMB_NONE" LimbMax="FAMOS_LIMB_MAX" EnumName="FamosLimb" Offset="0x3D38" />
-
-        <Animation Name="gFamosIdleAnim" Offset="0x3DC8" /> <!-- Original name is "fam_dosun" -->
-        <TextureAnimation Name="gFamosNormalGlowingEmblemTexAnim" Offset="0x3E30" />
-        <TextureAnimation Name="gFamosFlippedGlowingEmblemTexAnim" Offset="0x3E38" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fb.xml
deleted file mode 100644
index 59ecaf9e5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fb.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<Root>
-    <File Name="object_fb" Segment="6">
-        <Animation Name="object_fb_Anim_0006D8" Offset="0x6D8" /> <!-- Original name is "fb_eat" -->
-        <Animation Name="object_fb_Anim_0007D4" Offset="0x7D4" /> <!-- Original name is "fb_fastswim" -->
-        <Animation Name="object_fb_Anim_000ACC" Offset="0xACC" /> <!-- Original name is "fb_neweat" -->
-        <Animation Name="object_fb_Anim_001174" Offset="0x1174" /> <!-- Original name is "fb_spitout" -->
-        <Animation Name="object_fb_Anim_0013AC" Offset="0x13AC" /> <!-- Original name is "fb_swim" -->
-        <DList Name="object_fb_DL_002000" Offset="0x2000" />
-        <DList Name="object_fb_DL_002088" Offset="0x2088" />
-        <DList Name="object_fb_DL_002110" Offset="0x2110" />
-        <DList Name="object_fb_DL_0021A8" Offset="0x21A8" />
-        <DList Name="object_fb_DL_002230" Offset="0x2230" />
-        <DList Name="object_fb_DL_002388" Offset="0x2388" />
-        <DList Name="object_fb_DL_002418" Offset="0x2418" />
-        <DList Name="object_fb_DL_0024A8" Offset="0x24A8" />
-        <DList Name="object_fb_DL_0025F8" Offset="0x25F8" />
-        <DList Name="object_fb_DL_002690" Offset="0x2690" />
-        <DList Name="object_fb_DL_002730" Offset="0x2730" />
-        <DList Name="object_fb_DL_0027B8" Offset="0x27B8" />
-        <DList Name="object_fb_DL_002870" Offset="0x2870" />
-        <DList Name="object_fb_DL_002930" Offset="0x2930" />
-        <DList Name="object_fb_DL_0029F0" Offset="0x29F0" />
-        <DList Name="object_fb_DL_002AD8" Offset="0x2AD8" />
-        <DList Name="object_fb_DL_002B98" Offset="0x2B98" />
-        <DList Name="object_fb_DL_002C20" Offset="0x2C20" />
-        <Texture Name="object_fb_Tex_002D20" OutName="tex_002D20" Format="rgba16" Width="32" Height="16" Offset="0x2D20" />
-        <Texture Name="object_fb_Tex_003120" OutName="tex_003120" Format="rgba16" Width="16" Height="32" Offset="0x3120" />
-        <Texture Name="object_fb_Tex_003520" OutName="tex_003520" Format="rgba16" Width="32" Height="16" Offset="0x3520" />
-        <Texture Name="object_fb_Tex_003920" OutName="tex_003920" Format="rgba16" Width="64" Height="32" Offset="0x3920" />
-        <Texture Name="object_fb_Tex_004920" OutName="tex_004920" Format="rgba16" Width="16" Height="16" Offset="0x4920" />
-        <Texture Name="object_fb_Tex_004B20" OutName="tex_004B20" Format="rgba16" Width="32" Height="16" Offset="0x4B20" />
-        <Texture Name="object_fb_Tex_004F20" OutName="tex_004F20" Format="rgba16" Width="8" Height="16" Offset="0x4F20" />
-        <Texture Name="object_fb_Tex_005020" OutName="tex_005020" Format="rgba16" Width="32" Height="32" Offset="0x5020" />
-        <Texture Name="object_fb_Tex_005820" OutName="tex_005820" Format="rgba16" Width="32" Height="32" Offset="0x5820" />
-        <Limb Name="object_fb_Standardlimb_006020" Type="Standard" EnumName="OBJECT_FB_LIMB_01" Offset="0x6020" />
-        <Limb Name="object_fb_Standardlimb_00602C" Type="Standard" EnumName="OBJECT_FB_LIMB_02" Offset="0x602C" />
-        <Limb Name="object_fb_Standardlimb_006038" Type="Standard" EnumName="OBJECT_FB_LIMB_03" Offset="0x6038" />
-        <Limb Name="object_fb_Standardlimb_006044" Type="Standard" EnumName="OBJECT_FB_LIMB_04" Offset="0x6044" />
-        <Limb Name="object_fb_Standardlimb_006050" Type="Standard" EnumName="OBJECT_FB_LIMB_05" Offset="0x6050" />
-        <Limb Name="object_fb_Standardlimb_00605C" Type="Standard" EnumName="OBJECT_FB_LIMB_06" Offset="0x605C" />
-        <Limb Name="object_fb_Standardlimb_006068" Type="Standard" EnumName="OBJECT_FB_LIMB_07" Offset="0x6068" />
-        <Limb Name="object_fb_Standardlimb_006074" Type="Standard" EnumName="OBJECT_FB_LIMB_08" Offset="0x6074" />
-        <Limb Name="object_fb_Standardlimb_006080" Type="Standard" EnumName="OBJECT_FB_LIMB_09" Offset="0x6080" />
-        <Limb Name="object_fb_Standardlimb_00608C" Type="Standard" EnumName="OBJECT_FB_LIMB_0A" Offset="0x608C" />
-        <Limb Name="object_fb_Standardlimb_006098" Type="Standard" EnumName="OBJECT_FB_LIMB_0B" Offset="0x6098" />
-        <Limb Name="object_fb_Standardlimb_0060A4" Type="Standard" EnumName="OBJECT_FB_LIMB_0C" Offset="0x60A4" />
-        <Limb Name="object_fb_Standardlimb_0060B0" Type="Standard" EnumName="OBJECT_FB_LIMB_0D" Offset="0x60B0" />
-        <Limb Name="object_fb_Standardlimb_0060BC" Type="Standard" EnumName="OBJECT_FB_LIMB_0E" Offset="0x60BC" />
-        <Limb Name="object_fb_Standardlimb_0060C8" Type="Standard" EnumName="OBJECT_FB_LIMB_0F" Offset="0x60C8" />
-        <Limb Name="object_fb_Standardlimb_0060D4" Type="Standard" EnumName="OBJECT_FB_LIMB_10" Offset="0x60D4" />
-        <Limb Name="object_fb_Standardlimb_0060E0" Type="Standard" EnumName="OBJECT_FB_LIMB_11" Offset="0x60E0" />
-        <Limb Name="object_fb_Standardlimb_0060EC" Type="Standard" EnumName="OBJECT_FB_LIMB_12" Offset="0x60EC" />
-        <Limb Name="object_fb_Standardlimb_0060F8" Type="Standard" EnumName="OBJECT_FB_LIMB_13" Offset="0x60F8" />
-        <Limb Name="object_fb_Standardlimb_006104" Type="Standard" EnumName="OBJECT_FB_LIMB_14" Offset="0x6104" />
-        <Limb Name="object_fb_Standardlimb_006110" Type="Standard" EnumName="OBJECT_FB_LIMB_15" Offset="0x6110" />
-        <Limb Name="object_fb_Standardlimb_00611C" Type="Standard" EnumName="OBJECT_FB_LIMB_16" Offset="0x611C" />
-        <Limb Name="object_fb_Standardlimb_006128" Type="Standard" EnumName="OBJECT_FB_LIMB_17" Offset="0x6128" />
-        <Skeleton Name="object_fb_Skel_006190" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FB_LIMB_NONE" LimbMax="OBJECT_FB_LIMB_MAX" EnumName="ObjectFbLimb" Offset="0x6190" />
-        <DList Name="object_fb_DL_0061E0" Offset="0x61E0" />
-        <Texture Name="object_fb_Tex_0062A8" OutName="tex_0062A8" Format="i4" Width="32" Height="64" Offset="0x62A8" />
-        <Texture Name="object_fb_Tex_0066A8" OutName="tex_0066A8" Format="i4" Width="64" Height="64" Offset="0x66A8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_firefly.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_firefly.xml
deleted file mode 100644
index 93e5640b6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_firefly.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<Root>
-    <File Name="object_firefly" Segment="6">
-    
-        <!-- Assets for the Fire Keese-->
-
-        <!-- Fire Keese Flying Animation-->
-        <Animation Name="gFireKeeseFlyAnim" Offset="0x17C" /> <!-- Original name is "firefly_foot_fly" -->
-
-        <!--Fire Keese Textures-->
-        <Texture Name="gFireKeeseBodyTex" OutName="fire_keese_body" Format="rgba16" Width="8" Height="8" Offset="0x210" />
-        <Texture Name="gFireKeeseEyeTex" OutName="fire_keese_eye" Format="rgba16" Width="8" Height="8" Offset="0x290" />
-        <Texture Name="gFireKeeseEarTex" OutName="fire_keese_ear" Format="rgba16" Width="16" Height="8" Offset="0x310" />
-        <Texture Name="gFireKeeseTalonTex" OutName="fire_keese_talon" Format="rgba16" Width="8" Height="16" Offset="0x410" />
-        <Texture Name="gFireKeeseWingTex" OutName="fire_keese_wing" Format="rgba16" Width="4" Height="16" Offset="0x510" />
-
-        <!--Regular Keese Textures-->
-        <Texture Name="gKeeseRedEyeTex" OutName="keese_red_eye" Format="rgba16" Width="8" Height="8" Offset="0x190" />
-        <Texture Name="gKeeseBodyTex" OutName="keese_body" Format="rgba16" Width="8" Height="8" Offset="0x590" />
-        <Texture Name="gKeeseTalonTex" OutName="keese_talon" Format="rgba16" Width="8" Height="16" Offset="0x610" />
-        <Texture Name="gKeeseWingTex" OutName="keese_wing" Format="rgba16" Width="4" Height="16" Offset="0x710" />
-        <Texture Name="gKeeseEarTex" OutName="keese_ear" Format="rgba16" Width="16" Height="8" Offset="0x790" />
-
-        <!--DLists-->
-        <DList Name="gFireKeeseHeadDL" Offset="0xD30" />
-        <DList Name="gFireKeeseBodyDL" Offset="0xF40" />
-        <DList Name="gFireKeeseLeftFootDL" Offset="0x1038" />
-        <DList Name="gFireKeeseRightFootDL" Offset="0x1100" />
-        <DList Name="gFireKeeseRightWingStartDL" Offset="0x11C8" />
-        <DList Name="gFireKeeseRightWingMidDL" Offset="0x1290" />
-        <DList Name="gFireKeeseRightWingEndDL" Offset="0x1358" />
-        <DList Name="gFireKeeseLeftWingEndDL" Offset="0x1420" />
-        <DList Name="gFireKeeseLeftWingMidDL" Offset="0x14E8" />
-        <DList Name="gFireKeeseLeftWingStartDL" Offset="0x15B0" />
-        <DList Name="gKeeseRedEyesDL" Offset="0x1678" />
-
-        <!--Limbs for the whole thing-->
-        <Limb Name="gFireKeeseRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_ROOT" Offset="0x1708" />
-        <Limb Name="gFireKeeseRootWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_ROOT_WRAPPER" Offset="0x1714" />
-
-        <!--Root Limb for all feet-->
-        <Limb Name="gFireKeeseFeetRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_FEET_ROOT" Offset="0x1720" />
-
-        <!--Right Foot Limbs-->
-        <Limb Name="gFireKeeseRightFootRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_FOOT_ROOT" Offset="0x172C" />
-        <Limb Name="gFirekeeseRightFootWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_FOOT_WRAPPER" Offset="0x1738" />
-        <Limb Name="gFireKeeseRightFootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_FOOT" Offset="0x1744" />
-
-        <!--Left Foot Limbs-->
-        <Limb Name="gFireKeeseLeftFootRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_FOOT_ROOT" Offset="0x1750" />
-        <Limb Name="gFireKeeseLeftFootWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_FOOT_WRAPPER" Offset="0x175C" />
-        <Limb Name="gFireKeeseLeftFootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_FOOT" Offset="0x1768" />
-
-        <!--Body Limb-->
-        <Limb Name="gFireKeeseBodyLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_BODY" Offset="0x1774" />
-
-        <!--Left Wing Limbs-->
-        <Limb Name="gFireKeeseLeftWingRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_ROOT" Offset="0x1780" />
-        <Limb Name="gFireKeeseLeftWingWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_WRAPPER" Offset="0x178C" />
-        <Limb Name="gFireKeeseLeftWingEndMidRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_END_MID_ROOT" Offset="0x1798" />
-        <Limb Name="gFireKeeseLeftWingEndRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_END_ROOT" Offset="0x17A4" />
-        <Limb Name="gFireKeeseLeftWingEndLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_END" Offset="0x17B0" />
-        <Limb Name="gFireKeeseLeftWingMidLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_MID" Offset="0x17BC" />
-        <Limb Name="gFireKeeseLeftWingStartLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_START" Offset="0x17C8" />
-
-        <!--Right Wing Limbs-->
-        <Limb Name="gFireKeeseRightWingRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_ROOT" Offset="0x17D4" />
-        <Limb Name="gFireKeeseRightWingWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_WRAPPER" Offset="0x17E0" />
-        <Limb Name="gFireKeeseRightWingEndMidRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_END_MID_ROOT" Offset="0x17EC" />
-        <Limb Name="gFireKeeseRightWingEndRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_END_ROOT" Offset="0x17F8" />
-        <Limb Name="gFireKeeseRightWingEndLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_END" Offset="0x1804" />
-        <Limb Name="gFireKeeseRightWingMidLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_MID" Offset="0x1810" />
-        <Limb Name="gFireKeeseRightWingStartLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_START" Offset="0x181C" />
-
-        <!--Head Limbs-->
-        <Limb Name="gFireKeeseHeadRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_HEAD_ROOT" Offset="0x1828" />
-        <Limb Name="gFireKeeseHeadWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_HEAD_WRAPPER" Offset="0x1834" />
-        <Limb Name="gFireKeeseHeadLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_HEAD" Offset="0x1840" />
-
-        <!--Skeleton-->
-        <Skeleton Name="gFireKeeseSkel" Type="Normal" LimbType="Standard" LimbNone="FIRE_KEESE_LIMB_NONE" LimbMax="FIRE_KEESE_LIMB_MAX" EnumName="FireKeeseLimb" Offset="0x18B8" />
-        
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fish.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fish.xml
deleted file mode 100644
index 318cb53d5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fish.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<Root>
-    <!-- Assets for fishing -->
-    <File Name="object_fish" Segment="6">
-
-        <!-- Bass -->
-
-        <!-- Bass Animations -->
-        <Animation Name="gFishingBassAnim" Offset="0x7C" /> <!-- Original name is "basu" -->
-
-        <!-- Bass DLs -->
-        <DList Name="gFishingBassTailFinDL" Offset="0x940" />
-        <DList Name="gFishingBassBackSegmentEndDL" Offset="0x9E8" />
-        <DList Name="gFishingBassTopRearFinDL" Offset="0xB00" />
-        <DList Name="gFishingBassBottomRearFinDL" Offset="0xBA0" />
-        <DList Name="gFishingBassBackSegmentDL" Offset="0xC40" />
-        <DList Name="gFishingBassTopFrontFinDL" Offset="0xE30" />
-        <DList Name="gFishingBassBottomFrontFinDL" Offset="0xED0" />
-        <DList Name="gFishingBassMiddleSegmentDL" Offset="0xF70" />
-        <DList Name="gFishingBassHeadDL" Offset="0x10A0" />
-        <DList Name="gFishingBassLeftPectoralFinDL" Offset="0x1260" />
-        <DList Name="gFishingBassRightPectoralFinDL" Offset="0x1300" />
-        <DList Name="gFishingBassJawDL" Offset="0x13A0" />
-
-        <!-- Bass Textures -->
-        <Texture Name="gFishingBassTailFinTex" OutName="fishing_bass_tail_fin" Format="rgba16" Width="16" Height="16" Offset="0x14D0" />
-        <Texture Name="gFishingBassTopScalesTex" OutName="fishing_bass_top_scales" Format="rgba16" Width="16" Height="16" Offset="0x16D0" />
-        <Texture Name="gFishingBassBottomScalesTex" OutName="fishing_bass_bottom_scales" Format="rgba16" Width="16" Height="16" Offset="0x18D0" />
-        <Texture Name="gFishingBassHeadTex" OutName="fishing_bass_head" Format="rgba16" Width="32" Height="32" Offset="0x1AD0" />
-        <Texture Name="gFishingBassFinTex" OutName="fishing_bass_fin" Format="rgba16" Width="16" Height="16" Offset="0x22D0" />
-        <Texture Name="gFishingBassUnusedFinTex" OutName="fishing_bass_unused_fin" Format="rgba16" Width="16" Height="16" Offset="0x24D0" />
-        <Texture Name="gFishingBassSpinyFinTex" OutName="fishing_bass_spiny_fin" Format="rgba16" Width="16" Height="16" Offset="0x26D0" />
-
-        <!-- Bass Limbs and Skel -->
-        <Limb Name="gFishingBassHeadLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_HEAD" Offset="0x28D0" />
-        <Limb Name="gFishingBassMiddleSegmentRootLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_MIDDLE_SEGMENT_ROOT" Offset="0x28DC" />
-        <Limb Name="gFishingBassBackSegmentRootLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_BACK_SEGMENT_ROOT" Offset="0x28E8" />
-        <Limb Name="gFishingBassEndRootLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_END_ROOT" Offset="0x28F4" />
-        <Limb Name="gFishingBassTailFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_TAIL_FIN" Offset="0x2900" />
-        <Limb Name="gFishingBassBackSegmentEndLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_BACK_SEGMENT_END" Offset="0x290C" />
-        <Limb Name="gFishingBassBackSegmentLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_BACK_SEGMENT" Offset="0x2918" />
-        <Limb Name="gFishingBassTopRearFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_TOP_REAR_FIN" Offset="0x2924" />
-        <Limb Name="gFishingBassBottomRearFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_BOTTOM_REAR_FIN" Offset="0x2930" />
-        <Limb Name="gFishingBassMiddleSegmentLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_MIDDLE_SEGMENT" Offset="0x293C" />
-        <Limb Name="gFishingBassTopFrontFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_TOP_FRONT_FIN" Offset="0x2948" />
-        <Limb Name="gFishingBassBottomFrontFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_BOTTOM_FRONT_FIN" Offset="0x2954" />
-        <Limb Name="gFishingBassJawLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_JAW" Offset="0x2960" />
-        <Limb Name="gFishingBassRightPectoralFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_RIGHT_PECTORAL_FIN" Offset="0x296C" />
-        <Limb Name="gFishingBassLeftPectoralFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_LEFT_PECTORAL_FIN" Offset="0x2978" />
-        <Skeleton Name="gFishingBassSkel" Type="Flex" LimbType="Standard" LimbNone="FISHING_BASS_LIMB_NONE" LimbMax="FISHING_BASS_LIMB_MAX" EnumName="FishingBassLimb" Offset="0x29C0" />
-
-
-        <!-- Old Lure -->
-
-        <!-- Old Lure Textures -->
-        <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0" />
-        <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0" />
-        
-        <!-- Old Lure DLs -->
-        <DList Name="gFishingOldLureDL" Offset="0x2BD0" />
-
-
-        <!-- Stream Splash -->
-
-        <!-- Stream Splash Textures -->
-        <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0" />
-        <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0" />
-
-        <!-- Stream Splash DLs-->
-        <DList Name="gFishingStreamSplashDL" Offset="0x3230" />
-
-
-        <!-- Bubble -->
-
-        <!-- Bubble Textures-->
-        <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320" />
-
-        <!-- Bubble DLs-->
-        <DList Name="gFishingBubbleMaterialDL" Offset="0x3460" />
-        <DList Name="gFishingBubbleModelDL" Offset="0x34C0" />
-
-
-        <!-- Dust Splash -->
-
-        <!-- Dust Splash Texture-->
-        <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0" />
-
-        <!-- Dust Splash DLs-->
-        <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610" />
-        <DList Name="gFishingDustSplashModelDL" Offset="0x3680" />
-
-
-        <!-- Line -->
-
-        <!-- Line DLs -->
-        <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0" />
-        <DList Name="gFishingLineModelDL" Offset="0x3710" />
-
-
-        <!-- Raindrop -->
-
-        <!-- Raindrop DLs -->
-        <DList Name="gFishingRainDropModelDL" Offset="0x3760" />
-
-
-        <!-- Rain Splash -->
-
-        <!-- Rain Splash Textures -->
-        <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778" />
-        
-        <!-- Rain Splash DLs -->
-        <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8" />
-        <DList Name="gFishingRainSplashModelDL" Offset="0x3A18" />
-
-
-        <!-- Owner -->
-
-        <!-- Owner Animations -->
-        <Animation Name="gFishingOwnerAnim" Offset="0x453C" /> <!-- Original name is "fs_matsu" -->
-
-        <!-- Owner DLs -->
-        <DList Name="gFishingOwnerTorsoDL" Offset="0x6F60" />
-        <DList Name="gFishingOwnerHairDL" Offset="0x7350" />
-        <DList Name="gFishingOwnerHatDL" Offset="0x74C8" /> <!-- Original name is "fs_cap_model" -->
-        <DList Name="gFishingOwnerHeadDL" Offset="0x76B8" />
-        <DList Name="gFishingOwnerRightUpperArmDL" Offset="0x7CF8" />
-        <DList Name="gFishingOwnerRightForearmDL" Offset="0x7E48" />
-        <DList Name="gFishingOwnerRightHandDL" Offset="0x7F78" />
-        <DList Name="gFishingOwnerLeftUpperArmDL" Offset="0x8138" />
-        <DList Name="gFishingOwnerLeftForearmDL" Offset="0x8288" />
-        <DList Name="gFishingOwnerLeftHandDL" Offset="0x83B8" />
-
-        <!-- Owner Limbs and Skel -->
-        <Limb Name="gFishingOwnerTorsoLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_TORSO" Offset="0x8578" />
-        <Limb Name="gFishingOwnerLeftUpperArmLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_LEFT_UPPER_ARM" Offset="0x8584" />
-        <Limb Name="gFishingOwnerLeftForearmLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_LEFT_FOREARM" Offset="0x8590" />
-        <Limb Name="gFishingOwnerLeftHandLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_LEFT_HAND" Offset="0x859C" />
-        <Limb Name="gFishingOwnerRightUpperArmLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_RIGHT_UPPER_ARM" Offset="0x85A8" />
-        <Limb Name="gFishingOwnerRightForearmLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_RIGHT_FOREARM" Offset="0x85B4" />
-        <Limb Name="gFishingOwnerRightHandLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_RIGHT_HAND" Offset="0x85C0" />
-        <Limb Name="gFishingOwnerHeadLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_HEAD" Offset="0x85CC" />
-        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" LimbNone="FISHING_OWNER_LIMB_NONE" LimbMax="FISHING_OWNER_LIMB_MAX" EnumName="FishingOwnerLimb" Offset="0x85F8" />
-
-
-        <!-- Ripple -->
-
-        <!-- Ripple DLs -->
-        <DList Name="gFishingRippleMaterialDL" Offset="0x8610" />
-        <DList Name="gFishingRippleModelDL" Offset="0x8678" />
-
-
-        <!-- Water Dust -->
-
-        <!-- Water Dust Textures-->
-        <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690" />
-
-        <!-- Water Dust DLs -->
-        <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0" />
-        <DList Name="gFishingWaterDustModelDL" Offset="0x8970" /> <!-- Original name is "fs_smoke_modelT" -->
-
-        <!-- Owner -->
-
-        <!-- Owner Textures -->
-        <Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990" />
-        <Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerEarTex" OutName="fishing_owner_ear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990" />
-
-
-        <!-- Sinking Lure -->
-
-        <!-- Sinking Lure Textures -->
-        <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910" />
-
-        <!-- Sinking Lure DLs -->
-        <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950" />
-        <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0" />
-
-
-        <!-- Group Fish -->
-
-        <!-- Group Fish Texture -->
-        <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0" />
-
-        <!-- Group Fish DLs -->
-        <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220" />
-        <DList Name="gFishingGroupFishModelDL" Offset="0xC298" /> <!-- Original name is "minnow_model" -->
-
-
-        <!-- Unused Rock -->
-
-        <!-- Unused Rock DLs -->
-        <DList Name="gFishingUnusedRockDL" Offset="0xC650" />
-
-        <!-- Unused Rock Textures -->
-        <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780" />
-
-
-        <!-- Loach -->
-
-        <!-- Loach Animations -->
-        <Animation Name="gFishingLoachAnim" Offset="0xCFE0" /> <!-- Original name is "nz_namazu" -->
-
-        <!-- Loach DLs -->
-        <DList Name="gFishingLoachHeadDL" Offset="0xDED0" />
-        <DList Name="gFishingLoachLowerFrontFinDL" Offset="0xDFA8" />
-        <DList Name="gFishingLoachFrontSegmentDL" Offset="0xE048" />
-        <DList Name="gFishingLoachMiddleSegmentDL" Offset="0xE168" />
-        <DList Name="gFishingLoachLowerBackFinDL" Offset="0xE460" />
-        <DList Name="gFishingLoachBackSegmentDL" Offset="0xE500" />
-        <DList Name="gFishingLoachTailFinDL" Offset="0xE808" />
-        <DList Name="gFishingLoachTailSegmentDL" Offset="0xE8B0" />
-        <DList Name="gFishingLoachRightPectoralFinDL" Offset="0xEB28" />
-        <DList Name="gFishingLoachLeftPectoralFinDL" Offset="0xEBC8" />
-        <DList Name="gFishingLoachJawDL" Offset="0xEC68" />
-
-        <!-- Loach Textures -->
-        <Texture Name="gFishingLoachTopScalesTex" OutName="fishing_loach_top_scales" Format="rgba16" Width="32" Height="32" Offset="0xED28" />
-        <Texture Name="gFishingLoachBottomScalesTex" OutName="fishing_loach_bottom_scales" Format="rgba16" Width="32" Height="32" Offset="0xF528" />
-        <Texture Name="gFishingLoachGillTex" OutName="fishing_loach_gill" Format="rgba16" Width="32" Height="32" Offset="0xFD28" />
-        <Texture Name="gFishingLoachHeadTex" OutName="fishing_loach_head" Format="rgba16" Width="32" Height="32" Offset="0x10528" />
-        <Texture Name="gFishingLoachTopFinTex" OutName="fishing_loach_top_fin" Format="rgba16" Width="8" Height="8" Offset="0x10D28" />
-        <Texture Name="gFishingLoachFinTex" OutName="fishing_loach_fin" Format="rgba16" Width="16" Height="16" Offset="0x10DA8" />
-
-        <!-- Loach Limbs and Skel -->
-        <Limb Name="gFishingLoachHeadLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_HEAD" Offset="0x10FA8" />
-        <Limb Name="gFishingLoachLowerFrontFinLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_LOWER_FRONT_FIN" Offset="0x10FB4" />
-        <Limb Name="gFishingLoachMiddleSegmentLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_MIDDLE_SEGMENT" Offset="0x10FC0" />
-        <Limb Name="gFishingLoachLowerBackFinLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_LOWER_BACK_FIN" Offset="0x10FCC" />
-        <Limb Name="gFishingLoachTailFinLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_TAIL_FIN" Offset="0x10FD8" />
-        <Limb Name="gFishingLoachTailSegmentLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_TAIL_SEGMENT" Offset="0x10FE4" />
-        <Limb Name="gFishingLoachBackSegmentLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_BACK_SEGMENT" Offset="0x10FF0" />
-        <Limb Name="gFishingLoachFrontSegmentLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_FRONT_SEGMENT" Offset="0x10FFC" />
-        <Limb Name="gFishingLoachLeftPectoralFinLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_LEFT_PECTORAL_FIN" Offset="0x11008" />
-        <Limb Name="gFishingLoachRightPectoralFinLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_RIGHT_PECTORAL_FIN" Offset="0x11014" />
-        <Limb Name="gFishingLoachJawLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_JAW" Offset="0x11020" />
-        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" LimbNone="FISHING_LOACH_LIMB_NONE" LimbMax="FISHING_LOACH_LIMB_MAX" EnumName="FishingLoachLimb" Offset="0x11058" />
-
-
-        <!-- Fishing Rod -->
-
-        <!-- Fishing Rod Textures -->
-        <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070" />
-        <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170" />
-        <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270" />
-
-        <!-- Fishing Rod DLs -->
-        <DList Name="gFishingRodSetupDL" Offset="0x113D0" />
-        <DList Name="gFishingRodSegmentDL" Offset="0x11410" /> <!-- Original name is "rod_model" -->
-
-
-        <!-- Lure -->
-
-        <!-- Lure Textures -->
-        <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440" />
-        <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40" />
-        
-        <!-- Lure DLs -->
-        <DList Name="gFishingLureHookDL" Offset="0x12160" /> <!-- Original name is "rua_hari_model" -->
-        <DList Name="gFishingLureFloatDL" Offset="0x121F0" /> <!-- Original name is "rua_body_model" -->
-
-
-        <!-- Lily Pad and Rock -->
-
-        <!-- Lily Pad and Rock Textures -->
-        <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0" />
-        <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0" />
-
-        <!-- Lily Pad and Rock DLs -->
-        <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330" />
-        <DList Name="gFishingLilyPadModelDL" Offset="0x133B0" /> <!-- Original name is "turi_hasu_model" -->
-        <DList Name="gFishingRockMaterialDL" Offset="0x13590" />
-        <DList Name="gFishingRockModelDL" Offset="0x13610" />
-
-
-        <!-- Wood Post -->
-
-        <!-- Wood Post Textures -->
-        <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660" />
-
-        <!-- Wood Post DLs -->
-        <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50" />
-        <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0" />
-
-
-        <!-- Reed -->
-
-        <!-- Reed DLs -->
-        <DList Name="gFishingReedMaterialDL" Offset="0x14030" />
-        <DList Name="gFishingReedModelDL" Offset="0x140B0" /> <!-- Original name is "turi_kusa_model" -->
-
-
-        <!-- Aquarium -->
-
-        <!-- Aquarium Textures -->
-        <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0" />
-        <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0" />
-        <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0" />
-
-        <!-- Aquarium DLs -->
-        <DList Name="gFishingAquariumBottomDL" Offset="0x153D0" />
-        <DList Name="gFishingAquariumContainerDL" Offset="0x15470" /> <!-- Original name is "turi_suisou_modelT" -->
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_flowerpot.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_flowerpot.xml
deleted file mode 100644
index 01d16b663..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_flowerpot.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_flowerpot" Segment="6">
-        <Texture Name="object_flowerpot_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="32" Offset="0x0" />
-        <Texture Name="object_flowerpot_Tex_000400" OutName="tex_000400" Format="rgba16" Width="16" Height="32" Offset="0x400" />
-        <Texture Name="object_flowerpot_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800" />
-        <DList Name="object_flowerpot_DL_0012E0" Offset="0x12E0" /> <!-- Original name is "hati01_model" -->
-        <DList Name="object_flowerpot_DL_001408" Offset="0x1408" /> <!-- Original name is "kusa_nearT_model" -->
-        <DList Name="object_flowerpot_DL_0014F0" Offset="0x14F0" /> <!-- Original name is "haT_model" -->
-        <DList Name="object_flowerpot_DL_0015B0" Offset="0x15B0" /> <!-- Original name is "hati02_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fr.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fr.xml
deleted file mode 100644
index 3262c6782..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fr.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<Root>
-    <!-- Object for the choir frogs and unused hostile(?) frog -->
-    <File Name="object_fr" Segment="6">
-        <Animation Name="gFrogJumpAnim" Offset="0x7BC" /> <!-- Original name is "Jump" -->
-        <Animation Name="gFrogDanceAnim" Offset="0x11C0" /> <!-- Original name is "swing" -->
-        <Animation Name="gFrogIdleAnim" Offset="0x1534" /> <!-- Original name is "wait" -->
-        <Texture Name="gFrogLimbPatternTex" OutName="frog_limb_pattern" Format="rgba16" Width="32" Height="32" Offset="0x1550" />
-        <Texture Name="gFrogQuestionMarkTex" OutName="frog_question_mark" Format="rgba16" Width="50" Height="74" Offset="0x1D50" />
-        <Texture Name="gFrogNostrilTex" OutName="frog_nostril" Format="i8" Width="16" Height="16" Offset="0x3AA0" />
-        <Texture Name="gFrogLowerInnerMouthTex" OutName="frog_lower_inner_mouth" Format="rgba16" Width="32" Height="32" Offset="0x3BA0" />
-        <Texture Name="gFrogUpperInnerMouthTex" OutName="frog_upper_inner_mouth" Format="rgba16" Width="32" Height="32" Offset="0x43A0" />
-        <Texture Name="gFrogSkinTex" OutName="frog_skin" Format="rgba16" Width="16" Height="16" Offset="0x4BA0" />
-        <Texture Name="gFrogUpperBodyPatternTex" OutName="frog_upper_body_pattern" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" />
-        <Texture Name="gFrogLowerBodyPatternTex" OutName="frog_lower_body_pattern" Format="i8" Width="32" Height="32" Offset="0x55A0" />
-        <Texture Name="gFrogIrisOpenTex" OutName="frog_iris_open" Format="rgba16" Width="16" Height="16" Offset="0x59A0" />
-        <Texture Name="gFrogIrisClosedTex" OutName="frog_iris_closed" Format="rgba16" Width="16" Height="16" Offset="0x5BA0" />
-        <Texture Name="gFrogEyeTex" OutName="frog_eye" Format="ia16" Width="32" Height="32" Offset="0x5DA0" />
-        <Texture Name="gFrogHandAndToeTex" OutName="frog_hand_and_toe" Format="ia16" Width="32" Height="32" Offset="0x65A0" />
-        <DList Name="gFrogRightEyeDL" Offset="0x8EC0" />
-        <DList Name="gFrogLeftEyeDL" Offset="0x8F60" />
-        <DList Name="gFrogHeadDL" Offset="0x9000" />
-        <DList Name="gFrogRightIrisDL" Offset="0x9328" />
-        <DList Name="gFrogLeftIrisDL" Offset="0x93C8" />
-        <DList Name="gFrogJawDL" Offset="0x9468" />
-        <DList Name="gFrogUpperBodyDL" Offset="0x95A0" />
-        <DList Name="gFrogLeftForearmDL" Offset="0x98B8" />
-        <DList Name="gFrogLeftHandDL" Offset="0x9AE0" />
-        <DList Name="gFrogLeftUpperArmDL" Offset="0x9B80" />
-        <DList Name="gFrogRightForearmDL" Offset="0x9D88" />
-        <DList Name="gFrogRightHandDL" Offset="0x9FB0" />
-        <DList Name="gFrogRightUpperArmDL" Offset="0xA050" />
-        <DList Name="gFrogLowerBodyDL" Offset="0xA258" />
-        <DList Name="gFrogRightHeelDL" Offset="0xA428" />
-        <DList Name="gFrogRightToeDL" Offset="0xA6B8" />
-        <DList Name="gFrogRightShinDL" Offset="0xA758" />
-        <DList Name="gFrogRightThighDL" Offset="0xA978" />
-        <DList Name="gFrogLeftHeelDL" Offset="0xABA8" />
-        <DList Name="gFrogLeftToeDL" Offset="0xAE38" />
-        <DList Name="gFrogLeftShinDL" Offset="0xAED8" />
-        <DList Name="gFrogLeftThighDL" Offset="0xB0F8" />
-        <DList Name="gFrogDustMaterialDL" Offset="0xB328" />
-        <DList Name="gFrogDustModelDL" Offset="0xB338" />
-        <Limb Name="gFrogLowerBodyLimb" Type="Standard" EnumName="FROG_LIMB_LOWER_BODY" Offset="0xB3C8" />
-        <Limb Name="gFrogUpperBodyLimb" Type="Standard" EnumName="FROG_LIMB_UPPER_BODY" Offset="0xB3D4" />
-        <Limb Name="gFrogHeadRootLimb" Type="Standard" EnumName="FROG_LIMB_HEAD_ROOT" Offset="0xB3E0" />
-        <Limb Name="gFrogHeadLimb" Type="Standard" EnumName="FROG_LIMB_HEAD" Offset="0xB3EC" />
-        <Limb Name="gFrogRightIrisLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_IRIS" Offset="0xB3F8" />
-        <Limb Name="gFrogJawLimb" Type="Standard" EnumName="FROG_LIMB_JAW" Offset="0xB404" />
-        <Limb Name="gFrogRightEyeLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_EYE" Offset="0xB410" />
-        <Limb Name="gFrogLeftEyeLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_EYE" Offset="0xB41C" />
-        <Limb Name="gFrogLeftIrisLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_IRIS" Offset="0xB428" />
-        <Limb Name="gFrogLeftUpperArmLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_UPPER_ARM" Offset="0xB434" />
-        <Limb Name="gFrogLeftForearmLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_FOREARM" Offset="0xB440" />
-        <Limb Name="gFrogLeftHandLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_HAND" Offset="0xB44C" />
-        <Limb Name="gFrogRightUpperArmLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_UPPER_ARM" Offset="0xB458" />
-        <Limb Name="gFrogRightForearmLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_FOREARM" Offset="0xB464" />
-        <Limb Name="gFrogRightHandLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_HAND" Offset="0xB470" />
-        <Limb Name="gFrogRightThighLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_THIGH" Offset="0xB47C" />
-        <Limb Name="gFrogRightShinLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_SHIN" Offset="0xB488" />
-        <Limb Name="gFrogRightHeelLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_HEEL" Offset="0xB494" />
-        <Limb Name="gFrogRightToesLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_TOES" Offset="0xB4A0" />
-        <Limb Name="gFrogLeftThighLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_THIGH" Offset="0xB4AC" />
-        <Limb Name="gFrogLeftShinLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_SHIN" Offset="0xB4B8" />
-        <Limb Name="gFrogLeftHeelLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_HEEL" Offset="0xB4C4" />
-        <Limb Name="gFrogLeftToesLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_TOES" Offset="0xB4D0" />
-        <Skeleton Name="gFrogSkel" Type="Flex" LimbType="Standard" LimbNone="FROG_LIMB_NONE" LimbMax="FROG_LIMB_MAX" EnumName="FrogLimb" Offset="0xB538" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fsn.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fsn.xml
deleted file mode 100644
index 5ca67c207..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fsn.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<Root>
-    <!-- Object for the Curisoity Shop Man -->
-    <File Name="object_fsn" Segment="6">
-        <!-- DLists -->
-        <DList Name="gFsnTorsoDL" Offset="0x2A20" />
-        <DList Name="gFsnToupeeDL" Offset="0x2D88" />
-        <DList Name="gFsnHeadDL" Offset="0x2EF0" />
-        <DList Name="gFsnRightUpperArmDL" Offset="0x34C8" />
-        <DList Name="gFsnRightForearmDL" Offset="0x3600" />
-        <DList Name="gFsnRightHandDL" Offset="0x3718" />
-        <DList Name="gFsnLeftUpperArmDL" Offset="0x3860" />
-        <DList Name="gFsnLeftForearmDL" Offset="0x3998" />
-        <DList Name="gFsnLeftHandDL" Offset="0x3AB0" />
-        <DList Name="gFsnPelvisDL" Offset="0x3BF8" />
-        <DList Name="gFsnRightThighDL" Offset="0x3CF0" />
-        <DList Name="gFsnRightShinDL" Offset="0x3DD8" />
-        <DList Name="gFsnRightFootDL" Offset="0x3F20" />
-        <DList Name="gFsnLeftThighDL" Offset="0x3FF8" />
-        <DList Name="gFsnLeftShinDL" Offset="0x40E0" />
-        <DList Name="gFsnLeftFootDL" Offset="0x4228" />
-
-        <!-- TLUTs -->
-        <Texture Name="gFsnHandTLUT" OutName="fsn_hand_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4300" />
-        <Texture Name="gFsnSkinTLUT" OutName="fsn_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4500" />
-        <Texture Name="gFsnShirtTLUT" OutName="fsn_shirt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4700" />
-        <Texture Name="gFsnHairTLUT" OutName="fsn_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4900" />
-        <Texture Name="gFsnEyeTLUT" OutName="fsn_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4B00" />
-        <Texture Name="gFsnEarTLUT" OutName="fsn_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4D00" />
-        <Texture Name="gFsnHairSkinTLUT" OutName="fsn_hair_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4F00" />
-        <Texture Name="gFsnMouthTLUT" OutName="fsn_mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5100" />
-        <Texture Name="gFsnNostrilTLUT" OutName="fsn_nostril_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300" />
-
-        <!-- Textures -->
-        <Texture Name="gFsnHandTex" OutName="fsn_hand" Format="ci8" Width="16" Height="16" Offset="0x5500" />
-        <Texture Name="gFsnSkinTex" OutName="fsn_skin" Format="ci8" Width="8" Height="8" Offset="0x5600" />
-        <Texture Name="gFsnShirtTex" OutName="fsn_shirt" Format="ci8" Width="8" Height="16" Offset="0x5640" />
-        <Texture Name="gFsnPantsTex" OutName="fsn_pants" Format="rgba16" Width="16" Height="16" Offset="0x56C0" />
-        <Texture Name="gFsnBootsTex" OutName="fsn_boots" Format="rgba16" Width="16" Height="16" Offset="0x58C0" />
-        <Texture Name="gFsnHairTex" OutName="fsn_hair" Format="ci8" Width="16" Height="16" Offset="0x5AC0" />
-        <Texture Name="gFsnEyeOpenTex" OutName="fsn_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5BC0" /> 
-        <Texture Name="gFsnEarTex" OutName="fsn_ear" Format="ci8" Width="8" Height="8" Offset="0x5FC0" />
-        <Texture Name="gFsnHairSkinTex" OutName="fsn_hair_and_skin" Format="ci8" Width="16" Height="16" Offset="0x6000" />
-        <Texture Name="gFsnMouthTex" OutName="fsn_mouth" Format="ci8" Width="32" Height="32" Offset="0x6100" />
-        <Texture Name="gFsnNostrilTex" OutName="fsn_nostril" Format="ci8" Width="8" Height="8" Offset="0x6500" />
-        <Texture Name="gFsnVestTex" OutName="fsn_vest" Format="rgba16" Width="32" Height="32" Offset="0x6540" />
-        <Texture Name="gFsnEyeHalfTex" OutName="fsn_eye_half" Format="ci8" Width="32" Height="32" Offset="0x6D40" />
-        <Texture Name="gFsnEyeClosedTex" OutName="fsn_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7140" />
-        
-        <!-- Unused -->
-        <!-- <Blob Name="object_fsn_Blob_007540" Size="0x1100" Offset="0x7540" /> -->
-
-        <Texture Name="gFsnUnusedEyeOpenTex" OutName="fsn_unused_eye_open" Format="rgba32" Width="32" Height="32" Offset="0x8640" />
-        <Texture Name="gFsnUnusedEyeHalfTex" OutName="fsn_unused_eye_half" Format="rgba32" Width="32" Height="32" Offset="0x9640" />
-        <Texture Name="gFsnUnusedEyeClosedTex" OutName="fsn_unused_eye_closed" Format="rgba32" Width="32" Height="32" Offset="0xA640" />
-
-        <!-- Unused Eye Texture Animation -->
-        <TextureAnimation Name="gFsnEyeTexAnim" Offset="0xB664" />
-        
-        <!-- Animations -->
-        <Animation Name="gFsnSlamCounterStartAnim" Offset="0xB9D8" /> <!-- Original name is "fsn_dekuwait01" -->
-        <Animation Name="gFsnSlamCounterLoopAnim" Offset="0xC26C" /> <!-- Original name is "fsn_dekuwait02" -->
-        <Animation Name="gFsnTurnAroundAnim" Offset="0xC58C" /> <!-- Original name is "fsn_furimuki" -->
-        <Animation Name="gFsnHandOnFaceStartAnim" Offset="0xCB3C" /> <!-- Original name is "fsn_goronwait01" -->
-        <Animation Name="gFsnHandOnFaceLoopAnim" Offset="0xD354" /> <!-- Original name is "fsn_goronwait02" -->
-        <Animation Name="gFsnMakeOfferAnim" Offset="0xDE34" /> <!-- Original name is "fsn_kane" -->
-        <Animation Name="gFsnHandsOnCounterStartAnim" Offset="0xE3EC" /> <!-- Original name is "fsn_nwait01" -->
-        <Animation Name="gFsnHandsOnCounterLoopAnim" Offset="0xF00C" /> <!-- Original name is "fsn_nwait02" -->
-
-        <!-- Glasses DLists -->
-        <DList Name="gFsnGlassesFrameDL" Offset="0xF180" />
-        <DList Name="gFsnGlassesLensesDL" Offset="0xF218" />
-
-        <!-- Glasses Textures -->
-        <Texture Name="gFsnGlassesLensesTex" OutName="fsn_glasses_lenses" Format="rgba16" Width="32" Height="32" Offset="0xF2B0" />
-        <Texture Name="gFsnGlassesFrameTex" OutName="fsn_glasses_frame" Format="rgba16" Width="8" Height="8" Offset="0xFAB0" />
-        
-        <!-- <Blob Name="object_fsn_Blob_00FB30" Size="0x3040" Offset="0xFB30" /> -->
-        
-        <!-- Animations -->
-        <Animation Name="gFsnIdleAnim" Offset="0x12C34" /> <!-- Original name is "fsn_wait" -->
-        <Animation Name="gFsnScratchBackAnim" Offset="0x131FC" /> <!-- Original name is "fsn_wait01" -->
-
-        <!-- Limbs -->
-        <Limb Name="gFsnPelvisLimb" Type="Standard" EnumName="FSN_LIMB_PELVIS" Offset="0x13210" />
-        <Limb Name="gFsnLeftThighLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_THIGH" Offset="0x1321C" />
-        <Limb Name="gFsnLeftShinLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_SHIN" Offset="0x13228" />
-        <Limb Name="gFsnLeftFootLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_FOOT" Offset="0x13234" />
-        <Limb Name="gFsnRightThighLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_THIGH" Offset="0x13240" />
-        <Limb Name="gFsnRightShinLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_SHIN" Offset="0x1324C" />
-        <Limb Name="gFsnRightFootLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_FOOT" Offset="0x13258" />
-        <Limb Name="gFsnTorsoLimb" Type="Standard" EnumName="FSN_LIMB_TORSO" Offset="0x13264" />
-        <Limb Name="gFsnLeftUpperArmLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_UPPER_ARM" Offset="0x13270" />
-        <Limb Name="gFsnLeftForearmLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_FOREARM" Offset="0x1327C" />
-        <Limb Name="gFsnLeftHandLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_HAND" Offset="0x13288" />
-        <Limb Name="gFsnRightUpperArmLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_UPPER_ARM" Offset="0x13294" />
-        <Limb Name="gFsnRightForearmLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_FOREARM" Offset="0x132A0" />
-        <Limb Name="gFsnRightHandLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_HAND" Offset="0x132AC" />
-        <Limb Name="gFsnHeadRootLimb" Type="Standard" EnumName="FSN_LIMB_HEAD_ROOT" Offset="0x132B8" />
-        <Limb Name="gFsnHeadLimb" Type="Standard" EnumName="FSN_LIMB_HEAD" Offset="0x132C4" />
-        <Limb Name="gFsnToupeeLimb" Type="Standard" EnumName="FSN_LIMB_TOUPEE" Offset="0x132D0" />
-
-        <!-- Skeleton -->
-        <!-- @bug: gFsnSkel specifies 18 limbs but only 17 exist, ZAPD breaks if gFsnLimbs is not extracted manually -->
-        <LimbTable Name="gFsnLimbs" LimbType="Standard" Count="17" Offset="0x132DC"/>
-        <Skeleton Name="gFsnSkel" Type="Flex" LimbType="Standard" LimbNone="FSN_LIMB_NONE" LimbMax="FSN_LIMB_MAX" EnumName="FsnLimb" Offset="0x13320" />
-
-        <!-- Animations -->
-        <Animation Name="gFsnLeanForwardStartAnim" Offset="0x138B0" /> <!-- Original name is "fsn_zorawait01" -->
-        <Animation Name="gFsnLeanForwardLoopAnim" Offset="0x1430C" /> <!-- Original name is "fsn_zorawait02" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fu.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fu.xml
deleted file mode 100644
index c70db90e8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fu.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<Root>
-    <File Name="object_fu" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gGuruGuruPlayAndMoveHeadAnim" Offset="0x57C"/> <!-- Original name is "are_are" -->
-        <Animation Name="gGuruGuruPlayStillAnim" Offset="0xB04"/> <!-- Original name is "fu_mawasu" -->
-
-        <!-- Guru Guru Limb DisplayLists -->
-        <DList Name="gGuruGuruHornDL" Offset="0x3130"/>
-        <DList Name="gGuruGuruChestAndMusicBoxPipeDL" Offset="0x3320"/>
-        <DList Name="gGuruGuruHeadDL" Offset="0x36A0"/>
-        <DList Name="gGuruGuruRightShoulderDL" Offset="0x3BD8"/>
-        <DList Name="gGuruGuruRightArmDL" Offset="0x3D08"/>
-        <DList Name="gGuruGuruRightHandAndCrankDL" Offset="0x3E38"/>
-        <DList Name="gGuruGuruLeftArmAndMusicBoxDL" Offset="0x40E0"/>
-        <DList Name="gGuruGuruBlueTriangleDL" Offset="0x4390"/>
-        <DList Name="gGuruGuruTorsoDL" Offset="0x4460"/>
-        <DList Name="gGuruGuruRightThighDL" Offset="0x4570"/>
-        <DList Name="gGuruGuruRightLegDL" Offset="0x4690"/>
-        <DList Name="gGuruGuruRightFootDL" Offset="0x47E0"/>
-        <DList Name="gGuruGuruLeftThighDL" Offset="0x48E8"/>
-        <DList Name="gGuruGuruLeftLegDL" Offset="0x4A08"/>
-        <DList Name="gGuruGuruLeftFootDL" Offset="0x4B58"/>
-
-        <!-- Textures -->
-        <Texture Name="gGuruGuruClothesTLUT" OutName="guru_guru_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
-        <Texture Name="gGuruGuruSkinTLUT" OutName="guru_guru_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
-        <Texture Name="gGuruGuruPantsTex" OutName="guru_guru_pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
-        <Texture Name="gGuruGuruHeadSkinTex" OutName="guru_guru_head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruMusicBoxTex" OutName="guru_guru_music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
-        <Texture Name="gGuruGuruFingersAndToesTex" OutName="guru_guru_fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruEarTex" OutName="guru_guru_ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruUpperHornAndCrankTex" OutName="guru_guru_upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
-        <Texture Name="gGuruGuruShirtTex" OutName="guru_guru_shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
-        <Texture Name="gGuruGuruHornAndPipeTex" OutName="guru_guru_horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
-        <Texture Name="gGuruGuruEyeClosedTex" OutName="guru_guru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruEyeAngryTex" OutName="guru_guru_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruMouthOpenTex" OutName="guru_guru_mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruMouthAngryTex" OutName="guru_guru_mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruHairTex" OutName="guru_guru_hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
-
-        <!-- Guru Guru Limbs -->
-        <Limb Name="gGuruGuruTorsoLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_TORSO" Offset="0x6BA0"/>
-        <Limb Name="gGuruGuruLeftThighLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_THIGH" Offset="0x6BAC"/>
-        <Limb Name="gGuruGuruLeftLegLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_LEG" Offset="0x6BB8"/>
-        <Limb Name="gGuruGuruLeftFootLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_FOOT" Offset="0x6BC4"/>
-        <Limb Name="gGuruGuruRightThighLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_THIGH" Offset="0x6BD0"/>
-        <Limb Name="gGuruGuruRightLegLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_LEG" Offset="0x6BDC"/>
-        <Limb Name="gGuruGuruRightFootLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_FOOT" Offset="0x6BE8"/>
-        <Limb Name="gGuruGuruChestAndMusicBoxPipeLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_CHEST_AND_MUSIC_BOX_PIPE" Offset="0x6BF4"/>
-        <Limb Name="gGuruGuruLeftArmAndMusicBoxLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_ARM_AND_MUSIC_BOX" Offset="0x6C00"/>
-        <Limb Name="gGuruGuruTriangleLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_TRIANGLE" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
-        <Limb Name="gGuruGuruRightShoulderLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_SHOULDER" Offset="0x6C18"/>
-        <Limb Name="gGuruGuruRightArmLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT" Offset="0x6C24"/>
-        <Limb Name="gGuruGuruRightHandAndCrankLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_HAND_AND_CRANK" Offset="0x6C30"/>
-        <Limb Name="gGuruGuruHeadLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_HEAD" Offset="0x6C3C"/>
-        <Limb Name="gGuruGuruHornLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_HORN" Offset="0x6C48"/>
-
-        <!-- Guru Guru Skeleton -->
-        <Skeleton Name="gGuruGuruSkel" Type="Flex" LimbType="Standard" LimbNone="GURU_GURU_LIMB_NONE" LimbMax="GURU_GURU_LIMB_MAX" EnumName="GuruGuruLimb" Offset="0x6C90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fu_kaiten.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fu_kaiten.xml
deleted file mode 100644
index ad277bb26..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fu_kaiten.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="object_fu_kaiten" Segment="6">
-        <DList Name="object_fu_kaiten_DL_0005D0" Offset="0x5D0" /> <!-- Original name is "dai_model" -->
-        <Texture Name="object_fu_kaiten_TLUT_000858" OutName="tlut_000858" Format="rgba16" Width="4" Height="4" Offset="0x858" />
-        <Texture Name="object_fu_kaiten_Tex_000878" OutName="tex_000878" Format="ci4" Width="64" Height="64" Offset="0x878" />
-        <Texture Name="object_fu_kaiten_Tex_001078" OutName="tex_001078" Format="rgba16" Width="16" Height="64" Offset="0x1078" />
-        <Texture Name="object_fu_kaiten_Tex_001878" OutName="tex_001878" Format="rgba16" Width="32" Height="32" Offset="0x1878" />
-        <Texture Name="object_fu_kaiten_Tex_002078" OutName="tex_002078" Format="rgba16" Width="32" Height="32" Offset="0x2078" />
-        <Collision Name="object_fu_kaiten_Colheader_002D30" Offset="0x2D30" /> <!-- Original name is "z2_bowling_dai_bgdatainfo" -->
-        <DList Name="object_fu_kaiten_DL_002EB0" Offset="0x2EB0" /> <!-- Original name is "z2_bowling_mizu_modelT" -->
-        <DList Name="object_fu_kaiten_DL_002FB0" Offset="0x2FB0" />
-        <DList Name="object_fu_kaiten_DL_002FC0" Offset="0x2FC0" />
-        <Texture Name="object_fu_kaiten_Tex_002FD0" OutName="tex_002FD0" Format="rgba16" Width="32" Height="32" Offset="0x2FD0" />
-        <TextureAnimation Name="object_fu_kaiten_Matanimheader_0037D8" Offset="0x37D8" />
-        <!-- <Blob Name="object_fu_kaiten_Blob_0037E0" Size="0x18" Offset="0x37E0" /> -->
-        <Collision Name="object_fu_kaiten_Colheader_0037F8" Offset="0x37F8" /> <!-- Original name is "z2_bowling_mizu_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fu_mato.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fu_mato.xml
deleted file mode 100644
index bedf6906f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fu_mato.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<Root>
-    <File Name="object_fu_mato" Segment="6">
-        <DList Name="object_fu_mato_DL_0006A0" Offset="0x6A0" /> <!-- Original name is "kago1_model" -->
-        <DList Name="object_fu_mato_DL_000740" Offset="0x740" /> <!-- Original name is "kago2_model" -->
-        <DList Name="object_fu_mato_DL_0007E0" Offset="0x7E0" /> <!-- Original name is "kago3_model" -->
-        <DList Name="object_fu_mato_DL_000880" Offset="0x880" /> <!-- Original name is "kago4_model" -->
-        <DList Name="object_fu_mato_DL_000920" Offset="0x920" /> <!-- Original name is "kago5_model" -->
-        <DList Name="object_fu_mato_DL_0009C0" Offset="0x9C0" /> <!-- Original name is "kago6_model" -->
-        <Texture Name="object_fu_mato_Tex_000A60" OutName="tex_000A60" Format="rgba16" Width="32" Height="32" Offset="0xA60" />
-        <Collision Name="object_fu_mato_Colheader_0015C0" Offset="0x15C0" /> <!-- Original name is "z2_bowling_kago_bgdatainfo" -->
-        <DList Name="object_fu_mato_DL_001C80" Offset="0x1C80" /> <!-- Original name is "mato1_model" -->
-        <DList Name="object_fu_mato_DL_001D68" Offset="0x1D68" /> <!-- Original name is "mato2_model" -->
-        <DList Name="object_fu_mato_DL_001E50" Offset="0x1E50" /> <!-- Original name is "mato3_model" -->
-        <DList Name="object_fu_mato_DL_001F38" Offset="0x1F38" /> <!-- Original name is "mato4_model" -->
-        <DList Name="object_fu_mato_DL_002020" Offset="0x2020" /> <!-- Original name is "mato5_model" -->
-        <DList Name="object_fu_mato_DL_002108" Offset="0x2108" /> <!-- Original name is "mato6_model" -->
-        <Collision Name="object_fu_mato_Colheader_0023D4" Offset="0x23D4" /> <!-- Original name is "z2_bowling_mato_bgdatainfo" -->
-        <DList Name="object_fu_mato_DL_002720" Offset="0x2720" /> <!-- Original name is "mato_model" -->
-        <Texture Name="object_fu_mato_Tex_002850" OutName="tex_002850" Format="rgba16" Width="16" Height="16" Offset="0x2850" />
-        <Texture Name="object_fu_mato_Tex_002A50" OutName="tex_002A50" Format="rgba16" Width="16" Height="64" Offset="0x2A50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_funen.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_funen.xml
deleted file mode 100644
index 0f9d0a484..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_funen.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Object for Stone Tower Smoke -->
-    <File Name="object_funen" Segment="6">
-        <DList Name="gStoneTowerSmokeDL" Offset="0xD0" /> <!-- Original name is "obj_smork_modelT" -->
-        <Texture Name="gStoneTowerSmokeTex" OutName="stone_tower_smoke" Format="ia8" Width="32" Height="32" Offset="0x1C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fusen.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fusen.xml
deleted file mode 100644
index 2ee47097a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fusen.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_fusen" Segment="6">
-        <DList Name="gMajoraBalloonDL" Offset="0xA00" /> <!-- Original name is "sphere1_model" -->
-        <DList Name="gMajoraBalloonKnotDL" Offset="0xD78" /> <!-- Original name is "musubu_model" -->
-        <Texture Name="object_fusen_Tex_000E08" OutName="tex_000E08" Format="rgba16" Width="32" Height="32" Offset="0xE08" />
-        <Collision Name="object_fusen_Colheader_002420" Offset="0x2420" /> <!-- Original name is "zako_fusen_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fwall.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fwall.xml
deleted file mode 100644
index a4311c173..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fwall.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Root>
-    <File Name="object_fwall" Segment="6">
-        <DList Name="object_fwall_DL_000040" Offset="0x40" /> <!-- Original name is "m_Ffirewall_model" -->
-        
-        <!-- 0xA0 to 0x3520 are leftover textures from the OOT fire jet elevator in Fire Temple -->
-        <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="fwall_fire_temple_big_vertical_flame_0" Format="ia8" Width="24" Height="80" Offset="0xA0" /> 
-        <Texture Name="gFireTempleBigVerticalFlame1Tex" OutName="fwall_fire_temple_big_vertical_flame_1" Format="ia8" Width="24" Height="80" Offset="0x820" />
-        <Texture Name="gFireTempleBigVerticalFlame2Tex" OutName="fwall_fire_temple_big_vertical_flame_2" Format="ia8" Width="24" Height="80" Offset="0xFA0" />
-        <Texture Name="gFireTempleBigVerticalFlame3Tex" OutName="fwall_fire_temple_big_vertical_flame_3" Format="ia8" Width="24" Height="80" Offset="0x1720" />
-        <Texture Name="gFireTempleBigVerticalFlame4Tex" OutName="fwall_fire_temple_big_vertical_flame_4" Format="ia8" Width="24" Height="80" Offset="0x1EA0" />
-        <Texture Name="gFireTempleBigVerticalFlame5Tex" OutName="fwall_fire_temple_big_vertical_flame_5" Format="ia8" Width="24" Height="80" Offset="0x2620" />
-        <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="fwall_fire_temple_big_vertical_flame_6" Format="ia8" Width="24" Height="80" Offset="0x2DA0" />
-        <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="fwall_fire_temple_big_vertical_flame_7" Format="ia8" Width="24" Height="80" Offset="0x3520" />
-        
-        <Texture Name="gFwallFireball0Tex" OutName="fwall_fireball_0" Format="ia8" Width="32" Height="32" Offset="0x3CA0" />
-        <Texture Name="gFwallFireball1Tex" OutName="fwall_fireball_1" Format="ia8" Width="32" Height="32" Offset="0x40A0" />
-        <Texture Name="gFwallFireball2Tex" OutName="fwall_fireball_2" Format="ia8" Width="32" Height="32" Offset="0x44A0" />
-        <Texture Name="gFwallFireball3Tex" OutName="fwall_fireball_3" Format="ia8" Width="32" Height="32" Offset="0x48A0" />
-        <Texture Name="gFwallFireball4Tex" OutName="fwall_fireball_4" Format="ia8" Width="32" Height="32" Offset="0x4CA0" />
-        <Texture Name="gFwallFireball5Tex" OutName="fwall_fireball_5" Format="ia8" Width="32" Height="32" Offset="0x50A0" />
-        <Texture Name="gFwallFireball6Tex" OutName="fwall_fireball_6" Format="ia8" Width="32" Height="32" Offset="0x54A0" />
-        <Texture Name="gFwallFireball7Tex" OutName="fwall_fireball_7" Format="ia8" Width="32" Height="32" Offset="0x58A0" />        
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fz.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fz.xml
deleted file mode 100644
index 0c0b2ce2b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_fz.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_fz" Segment="6">
-        <DList Name="object_fz_DL_001130" Offset="0x1130" />
-        <DList Name="object_fz_DL_0021A0" Offset="0x21A0" />
-        <DList Name="object_fz_DL_002CA0" Offset="0x2CA0" />
-        <Texture Name="object_fz_Tex_002E70" OutName="tex_002E70" Format="i4" Width="32" Height="32" Offset="0x2E70" />
-        <DList Name="object_fz_DL_0030A0" Offset="0x30A0" />
-        <DList Name="object_fz_DL_003158" Offset="0x3158" />
-        <DList Name="object_fz_DL_003260" Offset="0x3260" />
-        <DList Name="object_fz_DL_0033F0" Offset="0x33F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ge1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ge1.xml
deleted file mode 100644
index db123e78c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ge1.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<Root>
-    <!-- Assets for white-clothed Gerudo -->
-    <File Name="object_ge1" Segment="6">
-        <!-- White-clothed Gerudo Animations -->
-        <Animation Name="gGerudoWhiteStandingHeadBowedAnim" Offset="0x594" /><!-- Original name may be "gb_ie" ("home")? -->
-        <Animation Name="gGerudoWhiteSaluteAnim" Offset="0xABC" /><!-- Original name is "gb_keirei" ("salute/bow") -->
-        <Animation Name="gGerudoWhiteStiffeningAnim" Offset="0xCF8" /><!-- Original name is "gb_kochoku" ("stiffening/rigidity") -->
-        <Animation Name="gGerudoWhiteStiffShiveringAnim" Offset="0x13CC" /><!-- Original name is "gb_kochoku_loop" ("stiffening loop") -->
-        <Animation Name="gGerudoWhiteTrudgingOffAnim" Offset="0x202C" /><!-- Original name is "gb_tobotobo" ("totteringly/trudgingly") -->
-        <Animation Name="gGerudoWhiteGreatBayCutsceneAnim" Offset="0x2148" /><!-- one frame used for each part of Great Bay Temple first entry cutscene. Original name is "gb_twister" -->
-        <Animation Name="gGerudoWhiteExcitedClappingAnim" Offset="0x2954" /><!-- Original name is "gb_wakuwaku", ("excited") -->
-        <Animation Name="gGerudoWhiteUnfoldingArmsAnim" Offset="0x2AD8" /><!-- Original name is "ge1_hanasi" ("talk") -->
-
-        <!-- From here to the end this file is identical to OoT's object_ge1, offset 0x0-0x9860 -->
-        <Animation Name="gGerudoWhiteArmsFoldedAnim" Offset="0x2B98" /><!-- Original name is "ge1_matsu" ("waiting") -->
-
-        <!-- White-clothed Gerudo Limbs -->
-        <Limb Name="gGerudoWhiteWaistLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_WAIST" Offset="0x2BB0" />
-        <Limb Name="gGerudoWhiteLeftThighLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_THIGH" Offset="0x2BBC" />
-        <Limb Name="gGerudoWhiteLeftShinLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_LOWER_LEG" Offset="0x2BC8" />
-        <Limb Name="gGerudoWhiteLeftFootLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_FOOT" Offset="0x2BD4" />
-        <Limb Name="gGerudoWhiteRightThighLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_THIGH" Offset="0x2BE0" />
-        <Limb Name="gGerudoWhiteRightShinLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_LOWER_LEG" Offset="0x2BEC" />
-        <Limb Name="gGerudoWhiteRightFootLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_FOOT" Offset="0x2BF8" />
-        <Limb Name="gGerudoWhiteTorsoLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_TORSO" Offset="0x2C04" />
-        <Limb Name="gGerudoWhiteLeftUpperArmLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_UPPER_ARM" Offset="0x2C10" />
-        <Limb Name="gGerudoWhiteLeftForearmLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_FOREARM" Offset="0x2C1C" />
-        <Limb Name="gGerudoWhiteLeftHandLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_HAND" Offset="0x2C28" />
-        <Limb Name="gGerudoWhiteRightUpperArmLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_UPPER_ARM" Offset="0x2C34" />
-        <Limb Name="gGerudoWhiteRightForearmLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_FOREARM" Offset="0x2C40" />
-        <Limb Name="gGerudoWhiteRightHandLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_HAND" Offset="0x2C4C" />
-        <Limb Name="gGerudoWhiteHeadLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_HEAD" Offset="0x2C58" />
-
-        <!-- White-clothed Gerudo Skeleton -->
-        <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" LimbNone="GERUDO_WHITE_LIMB_NONE" LimbMax="GERUDO_WHITE_LIMB_MAX" EnumName="GerudoWhiteLimb" Offset="0x2CA0" />
-
-        <Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2CB8" />
-        <Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2EB8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x2EF8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x2FF8" TlutOffset="0x2CB8" />
-
-        <!-- White-clothed Gerudo Eye Textures -->
-        <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3078"/>
-        <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x3878"/>
-        <Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4078"/>
-
-        <Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x4C78" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x4CF8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x4DF8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x4EF8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x4FF8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x5038" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x50B8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x50F8" />
-
-        <!-- White-clothed Gerudo Hair Textures -->
-        <Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5178" />
-        <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x5378" TlutOffset="0x5178" />
-
-        <!-- White-clothed Gerudo Limb DisplayLists -->
-        <DList Name="gGerudoWhiteWaistDL" Offset="0x7F78" />
-        <DList Name="gGerudoWhiteLeftThighDL" Offset="0x85A8" />
-        <DList Name="gGerudoWhiteLeftShinDL" Offset="0x89B0" />
-        <DList Name="gGerudoWhiteLeftFootDL" Offset="0x8B58" />
-        <DList Name="gGerudoWhiteRightThighDL" Offset="0x8C88" />
-        <DList Name="gGerudoWhiteRightShinDL" Offset="0x8E80" />
-        <DList Name="gGerudoWhiteRightFootDL" Offset="0x9028" />
-        <DList Name="gGerudoWhiteTorsoDL" Offset="0x9158" />
-        <DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x9350" />
-        <DList Name="gGerudoWhiteLeftForearmDL" Offset="0x9440" />
-        <DList Name="gGerudoWhiteLeftHandDL" Offset="0x9570" />
-        <DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x97C0" />
-        <DList Name="gGerudoWhiteRightForearmDL" Offset="0x9A20" />
-        <DList Name="gGerudoWhiteRightHandDL" Offset="0x9B50" />
-        <DList Name="gGerudoWhiteHeadDL" Offset="0x9D18" />
-
-        <!-- White-clothed Gerudo Hairstyle DisplayLists -->
-        <DList Name="gGerudoWhiteHairstyleBobDL" Offset="0xBB08" />
-        <DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0xBDA0" />
-        <DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0xC000" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_geldb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_geldb.xml
deleted file mode 100644
index 3b5dfa4ea..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_geldb.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<Root>
-    <!-- Assets for Gerudo wearing red, i.e. Aveil -->
-    <File Name="object_geldb" Segment="6">
-        <Animation Name="gGerudoRedBegAnim" Offset="0x734" /> <!-- Original name is "ga_asonde" begging? "idle"? -->
-        <Animation Name="gGerudoRedDismissAnim" Offset="0xCB0" /> <!-- Original name is "ga_hayaku" "hurry" -->
-        <Animation Name="gGerudoRedTurnHeadAnim" Offset="0xEE0" /> <!-- Original name is "ga_matu" "wait" -->
-        <Animation Name="gGerudoRedWaitAnim" Offset="0x14CC" /> <!-- Original name is "ga_matu_loop" "wait_loop" -->
-        <Animation Name="gGerudoRedDemandAnim" Offset="0x1AC8" /> <!-- hands on hips leaning forward (demanding?). Original name is "ga_naniyatte" -->
-        <Animation Name="gGerudoRedRunAwayAnim" Offset="0x1DFC" /> <!-- Running away from the bees. Original name is "ga_nigedasu" -->
-        <Animation Name="gGerudoRedHandOnHipWaitAnim" Offset="0x1EFC" /> <!-- Single frame pose with hand on hip. Original name is "gelb_wait" -->
-        <Animation Name="gGerudoRedWalkAnim" Offset="0x28A0" /> <!-- Walking. Original name is "gelb_walk" -->
-
-        <!-- Model, same as OoT object_geldb 0x2500-0xA470 -->
-        <Texture Name="gGerudoRed1TLUT" OutName="gerudo_red_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x28B0" />
-        <Texture Name="gGerudoRedSkinShadowTex" OutName="gerudo_red_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x2AB0" TlutOffset="0x28B0" />
-        <Texture Name="gGerudoRedDarkRedFabricTex" OutName="gerudo_red_dark_red_fabric" Format="ci8" Width="8" Height="8" Offset="0x2AF0" TlutOffset="0x28B0" />
-        <Texture Name="gGerudoRedYellowJewel1Tex" OutName="gerudo_red_yellow_jewel_1" Format="ci8" Width="16" Height="16" Offset="0x2B30" /> <!-- also used for gauntlets and greaves -->
-        <Texture Name="gGerudoRedGerudoPatternFabricTex" OutName="gerudo_red_gerudo_pattern_fabric" Format="i8" Width="16" Height="16" Offset="0x2C30" />
-        <Texture Name="gGerudoRedMidriffTex" OutName="gerudo_red_midriff" Format="ci8" Width="16" Height="16" Offset="0x2D30" TlutOffset="0x28B0" />
-        <Texture Name="gGerudoTrousersTex" OutName="gerudo_red_trousers" Format="i8" Width="16" Height="16" Offset="0x2E30" />
-        <Texture Name="gGerudoMail1Tex" OutName="gerudo_red_mail_1" Format="i8" Width="8" Height="16" Offset="0x2F30" />
-        <DList Name="gGerudoRedTorsoDL" Offset="0x4C90" />
-        <DList Name="gGerudoRedRightUpperArmDL" Offset="0x5110" />
-        <DList Name="gGerudoRedRightForearmDL" Offset="0x5248" />
-        <DList Name="gGerudoRedLeftUpperArmDL" Offset="0x5470" />
-        <DList Name="gGerudoRedLeftForearmDL" Offset="0x55A8" />
-        <DList Name="gGerudoRedPelvisDL" Offset="0x57D0" />
-        <DList Name="gGerudoRedRightThighDL" Offset="0x59F0" />
-        <DList Name="gGerudoRedRightLowerLegDL" Offset="0x5AF0" />
-        <DList Name="gGerudoRedLeftThighDL" Offset="0x5D60" />
-        <DList Name="gGerudoRedLeftLowerLegDL" Offset="0x5E60" />
-        <Texture Name="gGerudoRed2TLUT" OutName="gerudo_red_2_tlut" Format="rgba16" Width="18" Height="14" Offset="0x60E0" />
-        <Texture Name="gGerudoRedSkinGradientTex" OutName="gerudo_red_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x62D8" /> <!-- also used on head -->
-        <Texture Name="gGerudoRedEarTex" OutName="gerudo_red_ear" Format="ci8" Width="8" Height="16" Offset="0x6318" />
-        <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x6398" TlutOffset="0x60E0" />
-        <Texture Name="gGerudoRedVeilFabricTex" OutName="gerudo_red_veil_fabric" Format="i8" Width="16" Height="16" Offset="0x6798" />
-        <Texture Name="gGerudoRedShoeUpperTex" OutName="gerudo_red_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x6898" />
-        <Texture Name="gGerudoRedShoeSoleTex" OutName="gerudo_red_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x6918" />
-        <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x6958" TlutOffset="0x60E0" />
-        <Texture Name="gGerudoRedMail2Tex" OutName="gerudo_red_mail_2" Format="i8" Width="8" Height="16" Offset="0x6D58" />
-        <Texture Name="gGerudoRedHairTex" OutName="gerudo_red_hair" Format="ci8" Width="16" Height="16" Offset="0x6DD8" />
-        <Texture Name="gGerudoRedFingersTex" OutName="gerudo_red_fingers" Format="ci8" Width="16" Height="16" Offset="0x6ED8" />
-        <Texture Name="gGerudoRedYellowJewel2Tex" OutName="gerudo_red_yellow_jewel_2" Format="ci8" Width="16" Height="16" Offset="0x6FD8" /> <!-- used for head and sword guards -->
-        <Texture Name="gGerudoRedEyeClosedTex" OutName="gerudo_red_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x70D8" TlutOffset="0x60E0" />
-        <DList Name="gGerudoRedLeftFootDL" Offset="0x92F8" />
-        <DList Name="gGerudoRedRightFootDL" Offset="0x94B8" />
-        <DList Name="gGerudoRedLeftHandDL" Offset="0x9678" />
-        <DList Name="gGerudoRedLeftSwordDL" Offset="0x9810" />
-        <DList Name="gGerudoRedRightHandDL" Offset="0x99E8" />
-        <DList Name="gGerudoRedRightSwordDL" Offset="0x9B80" />
-        <DList Name="gGerudoRedVeilDL" Offset="0x9D58" />
-        <DList Name="gGerudoRedPonytailDL" Offset="0x9E10" />
-        <DList Name="gGerudoRedHeadDL" Offset="0x9F00" />
-
-        <Limb Name="gGerudoRedRootLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_ROOT" Offset="0xA698" />
-        <Limb Name="gGerudoRedTorsoLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_TORSO" Offset="0xA6A4" />
-        <Limb Name="gGerudoRedNeckLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_NECK" Offset="0xA6B0" />
-        <Limb Name="gGerudoRedPonytailLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_PONYTAIL" Offset="0xA6BC" />
-        <Limb Name="gGerudoRedVeilLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_VEIL" Offset="0xA6C8" />
-        <Limb Name="gGerudoRedHeadLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_HEAD" Offset="0xA6D4" />
-        <Limb Name="gGerudoRedRightUpperArmLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_UPPER_ARM" Offset="0xA6E0" />
-        <Limb Name="gGerudoRedRightForearmLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_FOREARM" Offset="0xA6EC" />
-        <Limb Name="gGerudoRedRightWristLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_WRIST" Offset="0xA6F8" />
-        <Limb Name="gGerudoRedRightHandLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_HAND" Offset="0xA704" />
-        <Limb Name="gGerudoRedRightSwordLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_SWORD" Offset="0xA710" />
-        <Limb Name="gGerudoRedLeftUpperArmLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_UPPER_ARM" Offset="0xA71C" />
-        <Limb Name="gGerudoRedLeftForearmLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_FOREARM" Offset="0xA728" />
-        <Limb Name="gGerudoRedLeftWristLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_WRIST" Offset="0xA734" />
-        <Limb Name="gGerudoRedLeftHandLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_HAND" Offset="0xA740" />
-        <Limb Name="gGerudoRedLeftSwordLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_SWORD" Offset="0xA74C" />
-        <Limb Name="gGerudoRedLeftThighLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_THIGH" Offset="0xA758" />
-        <Limb Name="gGerudoRedLeftLowerLegLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_LOWER_LEG" Offset="0xA764" />
-        <Limb Name="gGerudoRedLeftFootLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_FOOT" Offset="0xA770" />
-        <Limb Name="gGerudoRedRightThighLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_THIGH" Offset="0xA77C" />
-        <Limb Name="gGerudoRedRightLowerLegLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_LOWER_LEG" Offset="0xA788" />
-        <Limb Name="gGerudoRedRightFootLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_FOOT" Offset="0xA794" />
-        <Limb Name="gGerudoRedPelvisLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_PELVIS" Offset="0xA7A0" />
-        <Skeleton Name="gGerudoRedSkel" Type="Flex" LimbType="Standard" LimbNone="GERUDO_RED_LIMB_NONE" LimbMax="GERUDO_RED_LIMB_MAX" EnumName="GerudoRedLimb" Offset="0xA808" />
-
-        <!-- Same as OoT object_geldb 0xAE10-end -->
-        <Animation Name="gGerudoRedStandAnim" Offset="0xAA8C" /> <!-- Original name is "geldB_talk" -->
-        <Animation Name="gGerudoRedNeutralAnim" Offset="0xB0E4" /> <!-- Original name is "geldB_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gg.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gg.xml
deleted file mode 100644
index 45fe1b172..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gg.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<Root>
-    <File Name="object_gg" Segment="6">
-        <DList Name="object_gg_DL_003BA0" Offset="0x3BA0" />
-        <DList Name="object_gg_DL_003EC0" Offset="0x3EC0" />
-        <DList Name="object_gg_DL_004578" Offset="0x4578" />
-        <DList Name="object_gg_DL_004890" Offset="0x4890" />
-        <DList Name="object_gg_DL_004B08" Offset="0x4B08" />
-        <DList Name="object_gg_DL_004B50" Offset="0x4B50" />
-        <DList Name="object_gg_DL_004C48" Offset="0x4C48" />
-        <DList Name="object_gg_DL_004F08" Offset="0x4F08" />
-        <DList Name="object_gg_DL_005050" Offset="0x5050" />
-        <DList Name="object_gg_DL_0050E0" Offset="0x50E0" />
-        <DList Name="object_gg_DL_0051D8" Offset="0x51D8" />
-        <DList Name="object_gg_DL_005498" Offset="0x5498" />
-        <DList Name="object_gg_DL_0055D8" Offset="0x55D8" />
-        <DList Name="object_gg_DL_005670" Offset="0x5670" />
-        <DList Name="object_gg_DL_005730" Offset="0x5730" />
-        <DList Name="object_gg_DL_005828" Offset="0x5828" />
-        <DList Name="object_gg_DL_0058E8" Offset="0x58E8" />
-        <Texture Name="object_gg_Tex_0059E0" OutName="tex_0059E0" Format="i8" Width="16" Height="16" Offset="0x59E0" />
-        <Texture Name="object_gg_Tex_005AE0" OutName="tex_005AE0" Format="i8" Width="8" Height="8" Offset="0x5AE0" />
-        <Texture Name="object_gg_Tex_005B20" OutName="tex_005B20" Format="i8" Width="8" Height="8" Offset="0x5B20" />
-        <Texture Name="object_gg_Tex_005B60" OutName="tex_005B60" Format="i8" Width="32" Height="64" Offset="0x5B60" />
-        <Texture Name="object_gg_Tex_006360" OutName="tex_006360" Format="i8" Width="32" Height="32" Offset="0x6360" />
-        <Texture Name="object_gg_Tex_006760" OutName="tex_006760" Format="i8" Width="8" Height="32" Offset="0x6760" />
-        <Texture Name="object_gg_Tex_006860" OutName="tex_006860" Format="i8" Width="16" Height="32" Offset="0x6860" />
-        <Texture Name="object_gg_Tex_006A60" OutName="tex_006A60" Format="i8" Width="8" Height="16" Offset="0x6A60" />
-        <Texture Name="object_gg_Tex_006AE0" OutName="tex_006AE0" Format="i8" Width="16" Height="16" Offset="0x6AE0" />
-        <Texture Name="object_gg_Tex_006BE0" OutName="tex_006BE0" Format="i8" Width="8" Height="16" Offset="0x6BE0" />
-        <Texture Name="object_gg_Tex_006C60" OutName="tex_006C60" Format="i8" Width="8" Height="8" Offset="0x6C60" />
-        <Texture Name="object_gg_Tex_006CA0" OutName="tex_006CA0" Format="i8" Width="8" Height="16" Offset="0x6CA0" />
-        <Texture Name="object_gg_Tex_006D20" OutName="tex_006D20" Format="i8" Width="16" Height="16" Offset="0x6D20" />
-        <Texture Name="object_gg_Tex_006E20" OutName="tex_006E20" Format="i8" Width="32" Height="64" Offset="0x6E20" />
-        <Texture Name="object_gg_Tex_007620" OutName="tex_007620" Format="i8" Width="32" Height="64" Offset="0x7620" />
-        <Texture Name="object_gg_Tex_007E20" OutName="tex_007E20" Format="rgba16" Width="32" Height="64" Offset="0x7E20" />
-        <Texture Name="object_gg_Tex_008E20" OutName="tex_008E20" Format="i8" Width="8" Height="8" Offset="0x8E20" />
-        <Texture Name="object_gg_Tex_008E60" OutName="tex_008E60" Format="i8" Width="32" Height="32" Offset="0x8E60" />
-        <Texture Name="object_gg_Tex_009260" OutName="tex_009260" Format="i8" Width="32" Height="32" Offset="0x9260" />
-        <Texture Name="object_gg_Tex_009660" OutName="tex_009660" Format="i8" Width="32" Height="32" Offset="0x9660" />
-        <Texture Name="object_gg_Tex_009A60" OutName="tex_009A60" Format="i8" Width="32" Height="32" Offset="0x9A60" />
-        <Texture Name="object_gg_Tex_009E60" OutName="tex_009E60" Format="i8" Width="32" Height="32" Offset="0x9E60" />
-        <Animation Name="object_gg_Anim_00A4B4" Offset="0xA4B4" /> <!-- Original name is "gg_2um" -->
-        <TextureAnimation Name="object_gg_Matanimheader_00A4F4" Offset="0xA4F4" />
-        <Animation Name="object_gg_Anim_00AF40" Offset="0xAF40" /> <!-- Original name is "gg_fly" -->
-        <Animation Name="object_gg_Anim_00B560" Offset="0xB560" /> <!-- Original name is "gg_gokyu" -->
-        <Animation Name="object_gg_Anim_00BAF0" Offset="0xBAF0" /> <!-- Original name is "gg_kongan" -->
-        <Animation Name="object_gg_Anim_00CDA0" Offset="0xCDA0" /> <!-- Original name is "gg_kyorokyoro" -->
-        <Animation Name="object_gg_Anim_00D174" Offset="0xD174" /> <!-- Original name is "gg_munen" -->
-        <Animation Name="object_gg_Anim_00D528" Offset="0xD528" /> <!-- Original name is "gg_odoroki" -->
-        <Animation Name="object_gg_Anim_00D99C" Offset="0xD99C" /> <!-- Original name is "gg_otakebi" -->
-        <Animation Name="object_gg_Anim_00E2A4" Offset="0xE2A4" /> <!-- Original name is "gg_otakebi_loop" -->
-        <Animation Name="object_gg_Anim_00E86C" Offset="0xE86C" /> <!-- Original name is "gg_um" -->
-        <Animation Name="object_gg_Anim_00ECC0" Offset="0xECC0" /> <!-- Original name is "gg_unadareru" -->
-        <Animation Name="object_gg_Anim_00F578" Offset="0xF578" /> <!-- Original name is "gg_wait" -->
-        <Limb Name="object_gg_Standardlimb_00F590" Type="Standard" EnumName="OBJECT_GG_LIMB_01" Offset="0xF590" />
-        <Limb Name="object_gg_Standardlimb_00F59C" Type="Standard" EnumName="OBJECT_GG_LIMB_02" Offset="0xF59C" />
-        <Limb Name="object_gg_Standardlimb_00F5A8" Type="Standard" EnumName="OBJECT_GG_LIMB_03" Offset="0xF5A8" />
-        <Limb Name="object_gg_Standardlimb_00F5B4" Type="Standard" EnumName="OBJECT_GG_LIMB_04" Offset="0xF5B4" />
-        <Limb Name="object_gg_Standardlimb_00F5C0" Type="Standard" EnumName="OBJECT_GG_LIMB_05" Offset="0xF5C0" />
-        <Limb Name="object_gg_Standardlimb_00F5CC" Type="Standard" EnumName="OBJECT_GG_LIMB_06" Offset="0xF5CC" />
-        <Limb Name="object_gg_Standardlimb_00F5D8" Type="Standard" EnumName="OBJECT_GG_LIMB_07" Offset="0xF5D8" />
-        <Limb Name="object_gg_Standardlimb_00F5E4" Type="Standard" EnumName="OBJECT_GG_LIMB_08" Offset="0xF5E4" />
-        <Limb Name="object_gg_Standardlimb_00F5F0" Type="Standard" EnumName="OBJECT_GG_LIMB_09" Offset="0xF5F0" />
-        <Limb Name="object_gg_Standardlimb_00F5FC" Type="Standard" EnumName="OBJECT_GG_LIMB_0A" Offset="0xF5FC" />
-        <Limb Name="object_gg_Standardlimb_00F608" Type="Standard" EnumName="OBJECT_GG_LIMB_0B" Offset="0xF608" />
-        <Limb Name="object_gg_Standardlimb_00F614" Type="Standard" EnumName="OBJECT_GG_LIMB_0C" Offset="0xF614" />
-        <Limb Name="object_gg_Standardlimb_00F620" Type="Standard" EnumName="OBJECT_GG_LIMB_0D" Offset="0xF620" />
-        <Limb Name="object_gg_Standardlimb_00F62C" Type="Standard" EnumName="OBJECT_GG_LIMB_0E" Offset="0xF62C" />
-        <Limb Name="object_gg_Standardlimb_00F638" Type="Standard" EnumName="OBJECT_GG_LIMB_0F" Offset="0xF638" />
-        <Limb Name="object_gg_Standardlimb_00F644" Type="Standard" EnumName="OBJECT_GG_LIMB_10" Offset="0xF644" />
-        <Limb Name="object_gg_Standardlimb_00F650" Type="Standard" EnumName="OBJECT_GG_LIMB_11" Offset="0xF650" />
-        <Limb Name="object_gg_Standardlimb_00F65C" Type="Standard" EnumName="OBJECT_GG_LIMB_12" Offset="0xF65C" />
-        <Limb Name="object_gg_Standardlimb_00F668" Type="Standard" EnumName="OBJECT_GG_LIMB_13" Offset="0xF668" />
-        <Skeleton Name="object_gg_Skel_00F6C0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GG_LIMB_NONE" LimbMax="OBJECT_GG_LIMB_MAX" EnumName="ObjectGgLimb" Offset="0xF6C0" />
-        <Animation Name="object_gg_Anim_0100C8" Offset="0x100C8" /> <!-- Original name is "gg_yurayura" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ghaka.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ghaka.xml
deleted file mode 100644
index 91ae8fa4f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ghaka.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_ghaka" Segment="6">
-        <Collision Name="object_ghaka_Colheader_0000E8" Offset="0xE8" /> <!-- Original name is "goron_hakaisi_bgdatainfo" -->
-        <DList Name="object_ghaka_DL_001980" Offset="0x1980" />
-        <DList Name="object_ghaka_DL_001A20" Offset="0x1A20" /> <!-- Original name is "z2_goron_hakaisi_model" -->
-        <Texture Name="object_ghaka_Tex_002020" OutName="tex_002020" Format="i8" Width="32" Height="64" Offset="0x2020" />
-        <Texture Name="object_ghaka_Tex_002820" OutName="tex_002820" Format="ia16" Width="16" Height="16" Offset="0x2820" />
-        <Texture Name="object_ghaka_Tex_002A20" OutName="tex_002A20" Format="rgba16" Width="32" Height="32" Offset="0x2A20" />
-        <Texture Name="object_ghaka_Tex_003220" OutName="tex_003220" Format="rgba16" Width="32" Height="32" Offset="0x3220" />
-        <Collision Name="object_ghaka_Colheader_003CD0" Offset="0x3CD0" /> <!-- Original name is "z2_goron_hakaisi_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_arrow.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_arrow.xml
deleted file mode 100644
index 5fcfeb6eb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_arrow.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Arrow -->
-    <File Name="object_gi_arrow" Segment="6">
-
-        <!-- Arrow Drop Display Lists -->
-        <DList Name="gGiArrowSmallDL" Offset="0x340" />
-        <DList Name="gGiArrowMediumDL" Offset="0xB90" />
-        <DList Name="gGiArrowLargeDL" Offset="0x1830" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_arrowcase.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_arrowcase.xml
deleted file mode 100644
index 87d8c29fb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_arrowcase.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Quiver Upgrades -->
-    <File Name="object_gi_arrowcase" Segment="6">
-
-        <!-- Quiver Upgrades Color Display Lists -->
-        <DList Name="gGiQuiver30InnerColorDL" Offset="0x8D0" />
-        <DList Name="gGiQuiver40InnerColorDL" Offset="0x8F0" />
-        <DList Name="gGiQuiver50InnerColorDL" Offset="0x910" />
-        <DList Name="gGiQuiver30OuterColorDL" Offset="0x930" />
-        <DList Name="gGiQuiver40OuterColorDL" Offset="0x950" />
-        <DList Name="gGiQuiver50OuterColorDL" Offset="0x970" />
-
-        <!-- Quiver Upgrades Common Display Lists -->
-        <DList Name="gGiQuiverInnerDL" Offset="0x990" />
-        <DList Name="gGiQuiverOuterDL" Offset="0xA80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bean.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bean.xml
deleted file mode 100644
index ed9d2b7a6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bean.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bean -->
-    <File Name="object_gi_bean" Segment="6">
-
-        <!-- Bean Display Lists -->
-        <DList Name="gGiBeanDL" Offset="0x580" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bigbomb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bigbomb.xml
deleted file mode 100644
index 042736edc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bigbomb.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Powder Keg -->
-    <File Name="object_gi_bigbomb" Segment="6">
-
-        <!-- Powder Keg Display Lists -->
-        <DList Name="gGiPowderKegGoronSkullAndFuseDL" Offset="0xBC0" />
-        <DList Name="gGiPowderKegBarrelDL" Offset="0xDA0" />
-
-        <!-- Powder Key TLUT -->
-        <Texture Name="gGiPowderKegBarrelTLUT" OutName="gi_powder_keg_barrel_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF30" />
-
-        <!-- Powder Keg Textures -->
-        <Texture Name="gGiPowderKegGoronSkullTex" OutName="gi_powder_keg_goron_skull" Format="ia8" Width="16" Height="32" Offset="0x1130" />
-        <Texture Name="gGiPowderKegBarrelTex" OutName="gi_powder_keg_barrel" Format="ci8" Width="32" Height="32" Offset="0x1330" />
-        <Texture Name="gGiPowderKegFuseTex" OutName="gi_powder_keg_fuse" Format="i8" Width="32" Height="16" Offset="0x1730" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bomb_1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bomb_1.xml
deleted file mode 100644
index 174927ca6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bomb_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bomb -->
-    <File Name="object_gi_bomb_1" Segment="6">
-
-        <!-- Bomb Display Lists -->
-        <DList Name="gGiBombDL" Offset="0x9A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bomb_2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bomb_2.xml
deleted file mode 100644
index f5b3af67f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bomb_2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bombchu -->
-    <File Name="object_gi_bomb_2" Segment="6">
-
-        <!-- Bombchu Display Lists -->
-        <DList Name="gGiBombchuDL" Offset="0x4B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bombpouch.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bombpouch.xml
deleted file mode 100644
index 2e9969cbd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bombpouch.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bomb Bag Upgrades -->
-    <File Name="object_gi_bombpouch" Segment="6">
-
-        <!-- Bomb Bag Upgrade Color Display Lists -->
-        <DList Name="gGiBombBag20BagColorDL" Offset="0xAD0" />
-        <DList Name="gGiBombBag30BagColorDL" Offset="0xAF0" />
-        <DList Name="gGiBombBag40BagColorDL" Offset="0xB10" />
-        <DList Name="gGiBombBag20RingColorDL" Offset="0xB30" />
-        <DList Name="gGiBombBag30RingColorDL" Offset="0xB50" />
-        <DList Name="gGiBombBag40RingColorDL" Offset="0xB70" />
-
-        <!-- Bomb Bag Upgrade Common Display Lists -->
-        <DList Name="gGiBombBagDL" Offset="0xB90" />
-        <DList Name="gGiBombBagRingDL" Offset="0xD98" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bosskey.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bosskey.xml
deleted file mode 100644
index 5d4bda5c0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bosskey.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Dungeon Boss Key -->
-    <File Name="object_gi_bosskey" Segment="6">
-
-        <!-- Dungeon Boss Key Display Lists -->
-        <DList Name="gGiBossKeyDL" Offset="0xCA0" />
-        <DList Name="gGiBossKeyGemDL" Offset="0xF08" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle.xml
deleted file mode 100644
index e978697ab..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Empty Bottle -->
-    <File Name="object_gi_bottle" Segment="6">
-
-        <!-- Empty Bottle Display Lists -->
-        <DList Name="gGiEmptyBottleCorkDL" Offset="0x670" />
-        <DList Name="gGiEmptyBottleGlassDL" Offset="0x750" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_04.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_04.xml
deleted file mode 100644
index ab90eb89d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_04.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Fairy -->
-    <File Name="object_gi_bottle_04" Segment="6">
-
-        <!-- Bottled Fairy Billboard Mtx Rotation -->
-        <Mtx Name="gGiFairyBottleBillboardRotMtx" Offset="0x7B0" />
-
-        <!-- Bottled Fairy Display Lists -->
-        <DList Name="gGiFairyBottleContentsDL" Offset="0x7F0" />
-        <DList Name="gGiFairyBottleGlassCorkDL" Offset="0x8B8" />
-        <DList Name="gGiFairyBottleEmptyDL" Offset="0xB10" />
-
-        <!-- Bottled Fairy Textures -->
-        <Texture Name="gGiFairyBottleCorkTex" OutName="gi_fairy_bottle_cork" Format="i8" Width="16" Height="16" Offset="0xB18" />
-        <Texture Name="gGiFairyBottleFairyTex" OutName="gi_fairy_bottle_fairy" Format="ia8" Width="32" Height="32" Offset="0xC18" />
-        <Texture Name="gGiFairyBottleGlassTex" OutName="gi_fairy_bottle_glass" Format="i4" Width="32" Height="32" Offset="0x1018" />
-
-        <!-- Bottled Fairy Texture Animation -->
-        <TextureAnimation Name="gGiFairyBottleTexAnim" Offset="0x1254" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_15.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_15.xml
deleted file mode 100644
index 486e042a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_15.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Zora Egg -->
-    <File Name="object_gi_bottle_15" Segment="6">
-
-        <!-- Bottled Zora Egg Display Lists -->
-        <DList Name="gGiZoraEggBottleGlassAndCorkDL" Offset="0xCF0" />
-        <DList Name="gGiZoraEggBottleContentsDL" Offset="0x1010" />
-
-        <!-- Bottled Zora Egg Textures -->
-        <Texture Name="gGiZoraEggBottleCorkTex" OutName="gi_zora_egg_bottle_cork" Format="i8" Width="16" Height="16" Offset="0x10F8" />
-        <Texture Name="gGiZoraEggBottleContentsTex" OutName="gi_zora_egg_bottle_contents" Format="rgba16" Width="32" Height="32" Offset="0x11F8" />
-        <Texture Name="gGiZoraEggBottleGlass1Tex" OutName="gi_zora_egg_bottle_glass_1" Format="i8" Width="32" Height="32" Offset="0x19F8" />
-        <Texture Name="gGiZoraEggBottleGlass2Tex" OutName="gi_zora_egg_bottle_glass_2" Format="i4" Width="32" Height="32" Offset="0x1DF8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_16.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_16.xml
deleted file mode 100644
index ab736f087..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Seahorse -->
-    <File Name="object_gi_bottle_16" Segment="6">
-
-        <!-- Bottled Seahorse Display Lists -->
-        <DList Name="gGiSeahorseBottleGlassAndCorkDL" Offset="0x9A0" />
-        <DList Name="gGiSeahorseBottleEmptyDL" Offset="0xD18" />
-
-        <!-- Bottled Seahorse Textures -->
-        <Texture Name="gGiSeahorseBottleCorkTex" OutName="gi_seahorse_bottle_cork" Format="i8" Width="32" Height="32" Offset="0xD20" />
-        <Texture Name="gGiSeahorseBottleGlassTex" OutName="gi_seahorse_bottle_glass" Format="i4" Width="32" Height="32" Offset="0x1120" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_21.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_21.xml
deleted file mode 100644
index 32cbd8e75..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_21.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Chateau Romani -->
-    <File Name="object_gi_bottle_21" Segment="6">
-
-        <!-- Bottled Chateau Romani: Display Lists -->
-        <DList Name="gGiChateauRomaniBottleDL" Offset="0xA50" />
-        <DList Name="gGiChateauRomaniBottleEmptyDL" Offset="0xE90" />
-
-        <!-- Bottled Chateau Romani: Display Lists -->
-        <Texture Name="gGiChateauRomaniBottleCorkTex" OutName="gi_chateau_romani_bottle_cork" Format="i8" Width="16" Height="16" Offset="0xE98" />
-        <Texture Name="gGiChateauRomaniBottleLabelTex" OutName="gi_chateau_romani_bottle_label" Format="i4" Width="96" Height="64" Offset="0xF98" />
-        <Texture Name="gGiChateauRomaniBottleGlassTex" OutName="gi_chateau_romani_bottle_glass" Format="i4" Width="16" Height="32" Offset="0x1B98" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_22.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_22.xml
deleted file mode 100644
index bbc2ea452..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_22.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Hylian Loach -->
-    <File Name="object_gi_bottle_22" Segment="6">
-
-        <!-- Bottled Hylian Loach Display Lists -->
-        <DList Name="gGiHylianLoachBottleGlassCorkWaterDL" Offset="0xC90" />
-        <DList Name="gGiHylianLoachBottleContentsDL" Offset="0xFB8" />
-
-        <!-- Bottled Hylian Loach Textures -->
-        <Texture Name="gGiHylianLoachBottleCorkTex" OutName="gi_hylian_loach_bottle_cork" Format="i8" Width="32" Height="32" Offset="0x11C0" />
-        <Texture Name="gGiHylianLoachBottleLoachTex" OutName="gi_hylian_loach_bottle_loach" Format="i8" Width="16" Height="16" Offset="0x15C0" />
-        <Texture Name="gGiHylianLoachBottleGlassTex" OutName="gi_hylian_loach_bottle_glass" Format="i4" Width="32" Height="32" Offset="0x16C0" />
-        <Texture Name="gGiHylianLoachBottleWaterTex" OutName="gi_hylian_loach_bottle_water" Format="i4" Width="32" Height="32" Offset="0x18C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_red.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_red.xml
deleted file mode 100644
index b52781d8d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bottle_red.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Red Potion -->
-    <File Name="object_gi_bottle_red" Segment="6">
-
-        <!-- Bottled Red Potion Display Lists -->
-        <DList Name="gGiRedPotionBottleDL" Offset="0x9B0" />
-        <DList Name="gGiRedPotionBottleEmptyDL" Offset="0xCC0" />
-
-        <!-- Bottled Red Potion Textures -->
-        <Texture Name="gGiRedPotionBottleCorkTex" OutName="gi_red_potion_bottle_cork" Format="i8" Width="16" Height="16" Offset="0xCC8" />
-        <Texture Name="gGiRedPotionBottleGlassPotionTex" OutName="gi_red_potion_bottle_glass_potion" Format="i4" Width="32" Height="32" Offset="0xDC8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bow.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bow.xml
deleted file mode 100644
index f5ba88dfa..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_bow.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bow -->
-    <File Name="object_gi_bow" Segment="6">
-
-        <!-- Bow Display Lists -->
-        <DList Name="gGiBowHandleDL" Offset="0xC80" />
-        <DList Name="gGiBowStringDL" Offset="0xF40" />
-
-        <!-- Bow Textures -->
-        <Texture Name="gGiBowHandleTex" OutName="gi_bow_handle" Format="i8" Width="16" Height="32" Offset="0xFF0" />
-        <Texture Name="gGiBowStringTex" OutName="gi_bow_string" Format="i8" Width="16" Height="16" Offset="0x11F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_camera.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_camera.xml
deleted file mode 100644
index 5e94bf88b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_camera.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Picto Box -->
-    <File Name="object_gi_camera" Segment="6">
-
-        <!-- Picto Box Display Lists -->
-        <DList Name="gGiPictoBoxBodyAndLensDL" Offset="0xBC0" />
-        <DList Name="gGiPictoBoxFrameDL" Offset="0xEC8" />
-
-        <!-- Picto Box Textures -->
-        <Texture Name="gGiPictoBoxLensZoomRingTex" OutName="gi_picto_box_lens_zoom_ring" Format="i8" Width="32" Height="32" Offset="0x1058" />
-        <Texture Name="gGiPictoBoxFrameTex" OutName="gi_picto_box_frame" Format="i8" Width="32" Height="16" Offset="0x1458" />
-        <Texture Name="gGiPictoBoxBodyAndLensGlassTex" OutName="gi_picto_box_body_and_lens_glass" Format="i4" Width="32" Height="32" Offset="0x1658" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_compass.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_compass.xml
deleted file mode 100644
index 9c724fc59..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_compass.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Dungeon Compass -->
-    <File Name="object_gi_compass" Segment="6">
-
-        <!-- Dungeon Compass Display Lists -->
-        <DList Name="gGiCompassDL" Offset="0x960" />
-        <DList Name="gGiCompassGlassDL" Offset="0xC50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_fieldmap.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_fieldmap.xml
deleted file mode 100644
index f4d6369a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_fieldmap.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Tingle Map -->
-    <File Name="object_gi_fieldmap" Segment="6">
-
-        <!-- Tingle Map Display Lists -->
-        <DList Name="gGiTingleMapEmptyDL" Offset="0x6E0" />
-        <DList Name="gGiTingleMapDL" Offset="0x6E8" />
-
-        <!-- Tingle Map Textures -->
-        <Texture Name="gGiTingleMapLeftInscriptionsTex" OutName="gi_tingle_map_left_inscriptions" Format="i8" Width="32" Height="40" Offset="0xA20" />
-        <Texture Name="gGiTingleMapRightInscriptionsTex" OutName="gi_tingle_map_right_inscriptions" Format="i8" Width="32" Height="40" Offset="0xF20" />
-        <Texture Name="gGiTingleMapScrollHandleTex" OutName="gi_tingle_map_scroll_handle" Format="i8" Width="32" Height="32" Offset="0x1420" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_fish.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_fish.xml
deleted file mode 100644
index 7c9f4be1f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_fish.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Fish Container (in a bottle) -->
-    <File Name="object_gi_fish" Segment="6">
-
-        <!-- Fish Container Display Lists -->
-        <DList Name="gGiFishContainerDL" Offset="0x600" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_ghost.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_ghost.xml
deleted file mode 100644
index 3ea6ca582..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_ghost.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Poe Container (small and big poes inside a bottle) -->
-    <File Name="object_gi_ghost" Segment="6">
-
-        <!-- Poe Container Textures -->
-        <Texture Name="gGiPoeContainerFlameTex" OutName="gi_poe_container_flame" Format="i8" Width="16" Height="32" Offset="0x0" />
-        <Texture Name="gGiPoeContainerPatternTex" OutName="gi_poe_container_pattern" Format="i8" Width="16" Height="32" Offset="0x200" />
-
-        <!-- Poe Container Color Display Lists -->
-        <DList Name="gGiPoeContainerPoeColorDL" Offset="0x950" />
-        <DList Name="gGiPoeContainerBigPoeColorDL" Offset="0x970" />
-
-        <!-- Poe Container Common Display Lists -->
-        <DList Name="gGiPoeContainerLidDL" Offset="0x990" />
-        <DList Name="gGiPoeContainerGlassDL" Offset="0xBE0" />
-        <DList Name="gGiPoeContainerContentsDL" Offset="0xCF0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_glasses.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_glasses.xml
deleted file mode 100644
index e089e2c8d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_glasses.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Lens of Truth -->
-    <File Name="object_gi_glasses" Segment="6">
-
-        <!-- Lens of Truth Display Lists -->
-        <DList Name="gGiLensDL" Offset="0xD80" />
-        <DList Name="gGiLensGlassDL" Offset="0x1010" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_gold_dust.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_gold_dust.xml
deleted file mode 100644
index 523134bae..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_gold_dust.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Powdered Gold Dust (not inside a bottle) -->
-    <File Name="object_gi_gold_dust" Segment="6">
-
-        <!-- Powdered Gold Dust Display Lists -->
-        <DList Name="gGiGoldDustPowderEmptyDL" Offset="0x880" />
-        <DList Name="gGiGoldDustPowderDL" Offset="0x888" />
-
-        <!-- Powdered Gold Dust Textures -->
-        <Texture Name="gGiGoldDustPowderClothTex" OutName="gi_gold_dust_powder_cloth" Format="i8" Width="32" Height="32" Offset="0xB40" />
-        <Texture Name="gGiGoldDustPowderContentTex" OutName="gi_gold_dust_powder_content" Format="i4" Width="32" Height="32" Offset="0xF40" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_golonmask.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_golonmask.xml
deleted file mode 100644
index 87e65396e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_golonmask.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Goron Mask -->
-    <File Name="object_gi_golonmask" Segment="6">
-
-        <!-- Goron Mask Display Lists -->
-        <DList Name="gGiGoronMaskDL" Offset="0xBA0" />
-        <DList Name="gGiGoronMaskEmptyDL" Offset="0x10D0" />
-
-        <!-- Goron Mask Textures -->
-        <Texture Name="gGiGoronMaskEyeTex" OutName="gi_goron_mask_eye" Format="ia8" Width="32" Height="32" Offset="0x10D8" />
-        <Texture Name="gGiGoronMaskMouthTex" OutName="gi_goron_mask_mouth" Format="ia8" Width="64" Height="32" Offset="0x14D8" />
-        <Texture Name="gGiGoronMaskNoseEyebrowTex" OutName="gi_goron_mask_nose_eyebrow" Format="ia8" Width="8" Height="8" Offset="0x1CD8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_heart.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_heart.xml
deleted file mode 100644
index 1d9e72459..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_heart.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Recovery Heart -->
-    <File Name="object_gi_heart" Segment="6">
-
-        <!-- Recovery Heart Display Lists -->
-        <DList Name="gGiRecoveryHeartDL" Offset="0xE0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_hearts.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_hearts.xml
deleted file mode 100644
index 0f5387cae..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_hearts.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Heart Upgrades -->
-    <File Name="object_gi_hearts" Segment="6">
-
-        <!-- Heart Upgrade Display Lists -->
-        <DList Name="gGiHeartBorderDL" Offset="0x1290" />
-        <DList Name="gGiHeartContainerDL" Offset="0x1470" />
-        <DList Name="gGiHeartPieceDL" Offset="0x1590" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_hookshot.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_hookshot.xml
deleted file mode 100644
index 54dbcdd74..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_hookshot.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Hookshot -->
-    <File Name="object_gi_hookshot" Segment="6">
-
-        <!-- Hookshot Display Lists -->
-        <DList Name="gGiHookshotDL" Offset="0xA10" />
-        <DList Name="gGiHookshotEmptyDL" Offset="0xE48" />
-
-        <!-- Hookshot Textures -->
-        <Texture Name="gGiHookshot1Tex" OutName="gi_hookshot_1" Format="i8" Width="32" Height="32" Offset="0xE50" />
-        <Texture Name="gGiHookshot2Tex" OutName="gi_hookshot_2" Format="i4" Width="32" Height="32" Offset="0x1250" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_insect.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_insect.xml
deleted file mode 100644
index bba46991d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_insect.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bug Container (inside a bottle) -->
-    <File Name="object_gi_insect" Segment="6">
-
-        <!-- Bug Container Display Lists -->
-        <DList Name="gGiBugContainerContentsDL" Offset="0x830" /> <!-- bug, green cover, handle -->
-        <DList Name="gGiBugContainerGlassDL" Offset="0xB20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_key.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_key.xml
deleted file mode 100644
index 2f4511f1d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_key.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Dungeon Small Key -->
-    <File Name="object_gi_key" Segment="6">
-
-        <!-- Dungeon Small Key Display Lists -->
-        <DList Name="gGiSmallKeyDL" Offset="0x800" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_ki_tan_mask.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_ki_tan_mask.xml
deleted file mode 100644
index 3898630da..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_ki_tan_mask.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Keaton Mask -->
-    <File Name="object_gi_ki_tan_mask" Segment="6">
-
-        <!-- Keaton Mask Textures -->
-        <Texture Name="gGiKeatonMaskEyeTex" OutName="gi_keaton_mask_eye" Format="ia8" Width="8" Height="32" Offset="0x0" />
-
-        <!-- Keaton Mask Display Lists -->
-        <DList Name="gGiKeatonMaskDL" Offset="0xAC0" />
-        <DList Name="gGiKeatonMaskEyesDL" Offset="0xD50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_liquid.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_liquid.xml
deleted file mode 100644
index ed26c4267..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_liquid.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Potion Containers (refills) -->
-    <File Name="object_gi_liquid" Segment="6">
-
-        <!-- Potion Containers Textures -->
-        <Texture Name="gGiPotionContainerGreenPatternTex" OutName="gi_potion_container_green_pattern" Format="ia8" Width="16" Height="32" Offset="0x0" />
-        <Texture Name="gGiPotionContainerRedPatternTex" OutName="gi_potion_container_red_pattern" Format="ia8" Width="16" Height="32" Offset="0x200" />
-        <Texture Name="gGiPotionContainerBluePatternTex" OutName="gi_potion_container_blue_pattern" Format="ia8" Width="16" Height="32" Offset="0x400" />
-
-        <!-- Potion Containers Color Display Lists -->
-        <DList Name="gGiPotionContainerGreenPotColorDL" Offset="0x1270" />
-        <DList Name="gGiPotionContainerRedPotColorDL" Offset="0x1290" />
-        <DList Name="gGiPotionContainerBluePotColorDL" Offset="0x12B0" />
-        <DList Name="gGiPotionContainerGreenLiquidColorDL" Offset="0x12D0" />
-        <DList Name="gGiPotionContainerRedLiquidColorDL" Offset="0x12F0" />
-        <DList Name="gGiPotionContainerBlueLiquidColorDL" Offset="0x1310" />
-        <DList Name="gGiPotionContainerGreenPatternColorDL" Offset="0x1330" />
-        <DList Name="gGiPotionContainerRedPatternColorDL" Offset="0x1388" />
-        <DList Name="gGiPotionContainerBluePatternColorDL" Offset="0x13E0" />
-
-        <!-- Potion Containers Common Display Lists -->
-        <DList Name="gGiPotionContainerPotDL" Offset="0x1438" />
-        <DList Name="gGiPotionContainerLiquidDL" Offset="0x1790" />
-        <DList Name="gGiPotionContainerPatternDL" Offset="0x1848" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_loach.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_loach.xml
deleted file mode 100644
index 4ffcbfe73..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_loach.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Hylian Loach (not inside a bottle) -->
-    <File Name="object_gi_loach" Segment="6">
-
-        <!-- Hylian Loach Display Lists -->
-        <DList Name="gGiHylianLoachDL" Offset="0x7F0" />
-        <DList Name="gGiHylianLoachEmptyDL" Offset="0xD30" />
-
-        <!-- Hylian Loach Textures -->
-        <Texture Name="gGiHylianLoachBodyTex" OutName="gi_hylian_loach_body" Format="i8" Width="32" Height="32" Offset="0xD38" />
-        <Texture Name="gGiHylianLoachSideFinTex" OutName="gi_hylian_loach_side_fin" Format="ia8" Width="16" Height="16" Offset="0x1138" />
-        <Texture Name="gGiHylianLoachBackFinTex" OutName="gi_hylian_loach_back_fin" Format="ia8" Width="16" Height="16" Offset="0x1238" />
-        <Texture Name="gGiHylianLoachEyeTex" OutName="gi_hylian_loach_eye" Format="ia8" Width="16" Height="16" Offset="0x1338" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_longsword.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_longsword.xml
deleted file mode 100644
index 5385b9639..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_longsword.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Biggoron Sword (remnant of OoT) -->
-    <File Name="object_gi_longsword" Segment="6">
-
-        <!-- Biggoron Sword Display Lists -->
-        <DList Name="gGiBiggoronSwordDL" Offset="0x600" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_m_arrow.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_m_arrow.xml
deleted file mode 100644
index 595ad25d6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_m_arrow.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Magic Arrow -->
-    <File Name="object_gi_m_arrow" Segment="6">
-
-    <!-- Magic Arrow Color Display Lists -->
-        <DList Name="gGiMagicArrowFireColorDL" Offset="0xCA0" />
-        <DList Name="gGiMagicArrowIceColorDL" Offset="0xCC0" />
-        <DList Name="gGiMagicArrowLightColorDL" Offset="0xCE0" />
-
-        <!-- Magic Arrow Common Display Lists -->
-        <DList Name="gGiMagicArrowAmmoDL" Offset="0xAE0" /> <!-- the arrow itself -->
-        <DList Name="gGiMagicArrowGlowDL" Offset="0xD00" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_magicmushroom.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_magicmushroom.xml
deleted file mode 100644
index 1d26dfa63..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_magicmushroom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Magic Mushroom -->
-    <File Name="object_gi_magicmushroom" Segment="6">
-
-        <!-- Magic Mushroom Display Lists -->
-        <DList Name="gGiMagicMushroomDL" Offset="0x640" />
-        <DList Name="gGiMagicMushroomEmptyDL" Offset="0x958" />
-
-        <!-- Magic Mushroom Textures -->
-        <Texture Name="gGiMagicMushroomPinkBackgroundTex" OutName="gi_mushroom_pink_background" Format="i4" Width="16" Height="16" Offset="0x960" />
-        <Texture Name="gGiMagicMushroomBluePatternTex" OutName="gi_mushroom_blue_pattern" Format="i4" Width="32" Height="32" Offset="0x9E0" />
-        <Texture Name="gGiMagicMushroomStemTex" OutName="gi_mushroom_stem" Format="i4" Width="32" Height="32" Offset="0xBE0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_magicpot.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_magicpot.xml
deleted file mode 100644
index 459f010f4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_magicpot.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Magic Jar -->
-    <File Name="object_gi_magicpot" Segment="6">
-
-        <!-- Magic Jar Display Lists -->
-        <DList Name="gGiMagicJarSmallDL" Offset="0x580" />
-        <DList Name="gGiMagicJarLargeDL" Offset="0xEE0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_map.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_map.xml
deleted file mode 100644
index c0cb2e070..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_map.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Dungeon Map and Stone of Agony -->
-    <File Name="object_gi_map" Segment="6">
-
-        <!-- Dungeon Map Display Lists -->
-        <DList Name="gGiDungeonMapDL" Offset="0x3C0" />
-
-        <!-- Stone of Agony Display Lists -->
-        <DList Name="gGiStoneOfAgonyDL" Offset="0xB70" /> <!-- remnant of OoT -->
-
-        <!-- Dungeon Map Textures -->
-        <Texture Name="gGiDungeonMapInscriptionsTex" OutName="gi_dungeon_map_inscriptions" Format="i8" Width="32" Height="32" Offset="0xD60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask03.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask03.xml
deleted file mode 100644
index 3bc62ba8e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask03.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Fierce Deity Mask -->
-    <File Name="object_gi_mask03" Segment="6">
-
-        <!-- Fierce Deity Mask Display Lists -->
-        <DList Name="gGiFierceDeityMaskHairAndHatDL" Offset="0x9B0" />
-        <DList Name="gGiFierceDeityMaskFaceDL" Offset="0xB90" />
-
-        <!-- Fierce Deity Mask TLUTs -->
-        <Texture Name="gGiFierceDeityMaskMouthAndEarTLUT" OutName="gi_fierce_deity_mask_mouth_and_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF70" />
-        <Texture Name="gGiFierceDeityMaskEyeTLUT" OutName="gi_fierce_deity_mask_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1170" />
-
-        <!-- Fierce Deity Mask Textures -->
-        <Texture Name="gGiFierceDeityMaskMouthTex" OutName="gi_fierce_deity_mask_mouth" Format="ci8" Width="32" Height="16" Offset="0x1370" />
-        <Texture Name="gGiFierceDeityMaskEarTex" OutName="gi_fierce_deity_mask_ear" Format="ci8" Width="16" Height="16" Offset="0x1570" />
-        <Texture Name="gGiFierceDeityMaskEyeTex" OutName="gi_fierce_deity_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1670" />
-        <Texture Name="gGiFierceDeityMaskHatTex" OutName="gi_fierce_deity_mask_hat" Format="i8" Width="8" Height="8" Offset="0x1A70" />
-        <Texture Name="gGiFierceDeityMaskHairTex" OutName="gi_fierce_deity_mask_hair" Format="i8" Width="32" Height="32" Offset="0x1AB0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask05.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask05.xml
deleted file mode 100644
index c6bf0baad..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask05.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Kafei's Mask -->
-    <File Name="object_gi_mask05" Segment="6">
-
-        <!-- Kafei's Mask Display Lists -->
-        <DList Name="gGiKafeiMaskEmptyDL" Offset="0x1040" />
-        <DList Name="gGiKafeiMaskDL" Offset="0x1048" />
-
-        <!-- Kafei's Mask TLUTs -->
-        <Texture Name="gGiKafeiMaskTLUT" OutName="gi_kafei_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1638" />
-
-        <!-- Kafei's Mask Textures -->
-        <Texture Name="gGiKafeiMaskLowerHairTex" OutName="gi_kafei_mask_lower_hair" Format="ci8" Width="8" Height="16" Offset="0x1838" />
-        <Texture Name="gGiKafeiMaskUpperHairTex" OutName="gi_kafei_mask_upper_hair" Format="ci8" Width="8" Height="16" Offset="0x18B8" />
-        <Texture Name="gGiKafeiMaskEyeMouthTex" OutName="gi_kafei_mask_eye_mouth" Format="ci8" Width="16" Height="16" Offset="0x1938" />
-        <Texture Name="gGiKafeiMaskEyebrowTex" OutName="gi_kafei_mask_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x1A38" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask06.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask06.xml
deleted file mode 100644
index 7d24b1d92..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask06.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <!-- Get Item Draw: All Night's Mask -->
-    <File Name="object_gi_mask06" Segment="6">
-
-        <!-- All Night's Mask Display Lists -->
-        <DList Name="gGiAllNightMaskFaceDL" Offset="0x6F0" />
-        <DList Name="gGiAllNightMaskEyesDL" Offset="0x968" />
-
-        <!-- All Night's Mask TLUT -->
-        <Texture Name="gGiAllNightMaskEyeTLUT" OutName="gi_all_night_mask_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAD8" />
-
-        <!-- All Night's Mask Textures -->
-        <Texture Name="gGiAllNightMaskEyeTex" OutName="gi_all_night_mask_eye" Format="ci8" Width="32" Height="32" Offset="0xCD8" />
-        <Texture Name="gGiAllNightMaskFacePattern1Tex" OutName="gi_all_night_mask_face_pattern_1" Format="i8" Width="32" Height="32" Offset="0x10D8" />
-        <Texture Name="gGiAllNightMaskFacePattern2Tex" OutName="gi_all_night_mask_face_pattern_2" Format="i4" Width="64" Height="32" Offset="0x14D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask09.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask09.xml
deleted file mode 100644
index 76efc6922..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask09.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Garo's Mask -->
-    <File Name="object_gi_mask09" Segment="6">
-
-        <!-- Garo's Mask Display Lists -->
-        <DList Name="gGiGarosMaskFaceDL" Offset="0x7A0" />
-        <DList Name="gGiGarosMaskCloakDL" Offset="0x8F0" />
-
-        <!-- Garo's Mask TLUT -->
-        <Texture Name="gGiGarosMaskCloakTLUT" OutName="gi_garos_mask_cloak_tlut" Format="rgba16" Width="16" Height="16" Offset="0xDA0" />
-
-        <!-- Garo's Mask Texture -->
-        <Texture Name="gGiGarosMaskEyeTex" OutName="gi_garo_mask_eye" Format="i8" Width="16" Height="16" Offset="0xFA0" />
-        <Texture Name="gGiGarosMaskUpperSidePatternTex" OutName="gi_garo_mask_upper_side_pattern" Format="ci8" Width="16" Height="8" Offset="0x10A0" />
-        <Texture Name="gGiGarosMaskFrontPatternTex" OutName="gi_garo_mask_front_pattern" Format="ci8" Width="16" Height="32" Offset="0x1120" />
-        <Texture Name="gGiGarosMaskLowerSidePatternTex" OutName="gi_garo_mask_lower_side_pattern" Format="ci8" Width="32" Height="32" Offset="0x1320" />
-        <Texture Name="gGiGarosMaskTopPatternTex" OutName="gi_garo_mask_top_pattern" Format="ci8" Width="8" Height="8" Offset="0x1720" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask10.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask10.xml
deleted file mode 100644
index e7083f94b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask10.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Romani's Mask -->
-    <File Name="object_gi_mask10" Segment="6">
-
-        <!-- Romani's Mask Display Lists -->
-        <DList Name="gGiRomaniMaskNoseEyeDL" Offset="0xA30" />
-        <DList Name="gGiRomaniMaskCapDL" Offset="0xB60" />
-
-        <!-- Romani's Mask Textures -->
-        <Texture Name="gGiRomaniMaskSpotsTex" OutName="gi_romani_mask_spots" Format="i8" Width="32" Height="64" Offset="0xF38" />
-        <Texture Name="gGiRomaniMaskPlainTex" OutName="gi_romani_mask_plain" Format="i8" Width="16" Height="8" Offset="0x1738" />
-        <Texture Name="gGiRomaniMaskNoseTex" OutName="gi_romani_mask_nose" Format="ia8" Width="16" Height="16" Offset="0x17B8" />
-        <Texture Name="gGiRomaniMaskEyeTex" OutName="gi_romani_mask_eye" Format="ia8" Width="32" Height="32" Offset="0x18B8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask11.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask11.xml
deleted file mode 100644
index e7b175b4d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask11.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Circus Leader Mask -->
-    <File Name="object_gi_mask11" Segment="6">
-
-        <!-- Circus Leader Mask Display Lists -->
-        <DList Name="gGiCircusLeaderMaskEyebrowsDL" Offset="0xB50" />
-        <DList Name="gGiCircusLeaderMaskFaceDL" Offset="0xC00" />
-
-        <!-- Circus Leader Mask TLUTs -->
-        <Texture Name="gGiCircusLeaderMaskFaceTLUT" OutName="gi_circus_leader_mask_face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x11D0" />
-
-        <!-- Circus Leader Mask Textures -->
-        <Texture Name="gGiCircusLeaderMaskEyebrowTex" OutName="gi_circus_leader_mask_eyebrow" Format="rgba32" Width="16" Height="16" Offset="0x13D0" />
-        <Texture Name="gGiCircusLeaderMaskHairTex" OutName="gi_circus_leader_mask_hair" Format="ci8" Width="8" Height="8" Offset="0x17D0" />
-        <Texture Name="gGiCircusLeaderMaskEarTex" OutName="gi_circus_leader_mask_ear" Format="ci8" Width="8" Height="8" Offset="0x1810" />
-        <Texture Name="gGiCircusLeaderMaskEyeTex" OutName="gi_circus_leader_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1850" />
-        <Texture Name="gGiCircusLeaderMaskHairlineTex" OutName="gi_circus_leader_mask_hairline" Format="ci8" Width="16" Height="16" Offset="0x1C50" />
-        <Texture Name="gGiCircusLeaderMaskSideBurnTex" OutName="gi_circus_leader_mask_sideburn" Format="ci8" Width="16" Height="16" Offset="0x1D50" />
-        <Texture Name="gGiCircusLeaderMaskSkinTex" OutName="gi_circus_leader_mask_skin" Format="ci8" Width="8" Height="8" Offset="0x1E50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask12.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask12.xml
deleted file mode 100644
index 2f1508b9d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Postman's Hat -->
-    <File Name="object_gi_mask12" Segment="6">
-
-        <!-- Postman's Hat Display Lists -->
-        <DList Name="gGiPostmanHatBunnyLogoDL" Offset="0x570" />
-        <DList Name="gGiPostmanHatCapDL" Offset="0x608" />
-
-        <!-- Postman's Hat Textures -->
-        <Texture Name="gGiPostmanHatBunnyLogoTex" OutName="gi_postman_hat_bunny_logo" Format="ia8" Width="32" Height="32" Offset="0x900" />
-        <Texture Name="gGiPostmanHatCapTex" OutName="gi_postman_hat_cap" Format="i4" Width="32" Height="32" Offset="0xD00" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask13.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask13.xml
deleted file mode 100644
index 8f5e7bf8f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask13.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Couple's Mask -->
-    <File Name="object_gi_mask13" Segment="6">
-
-        <!-- Couple's Mask Display Lists -->
-        <DList Name="gGiCouplesMaskHalfDL" Offset="0x5A0" />
-        <DList Name="gGiCouplesMaskFullDL" Offset="0x6A0" />
-
-        <!-- Couple's Mask Display Lists -->
-        <Texture Name="gGiCouplesMaskLeftInscriptionTex" OutName="gi_couples_mask_left_inscription" Format="i8" Width="32" Height="64" Offset="0x900" />
-        <Texture Name="gGiCouplesMaskRightInscriptionTex" OutName="gi_couples_mask_right_inscription" Format="i4" Width="32" Height="64" Offset="0x1100" />
-        <Texture Name="gGiCouplesMaskBackgroundTex" OutName="gi_couples_mask_background" Format="i4" Width="16" Height="32" Offset="0x1500" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask14.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask14.xml
deleted file mode 100644
index 0b9b5be28..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask14.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Great Fairy Mask -->
-    <File Name="object_gi_mask14" Segment="6">
-
-        <!-- Great Fairy Mask Display Lists -->
-        <DList Name="gGiGreatFairyMaskLeavesDL" Offset="0xED0" />
-        <DList Name="gGiGreatFairyMaskFaceDL" Offset="0x1000" />
-
-        <!-- Great Fairy Mask Textures -->
-        <Texture Name="gGiGreatFairyMaskHairTex" OutName="gi_great_fairy_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x1300" />
-        <Texture Name="gGiGreatFairyMaskLeafTex" OutName="gi_great_fairy_mask_leaf" Format="ia8" Width="32" Height="16" Offset="0x1500" />
-        <Texture Name="gGiGreatFairyMaskEyeTex" OutName="gi_great_fairy_mask_eye" Format="rgba16" Width="24" Height="24" Offset="0x1700" />
-        <Texture Name="gGiGreatFairyMaskMouthTex" OutName="gi_great_fairy_mask_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1B80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask15.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask15.xml
deleted file mode 100644
index 1f29f1bef..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask15.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Gibdo Mask -->
-    <File Name="object_gi_mask15" Segment="6">
-
-        <!-- Gibdo Mask Display Lists -->
-        <DList Name="gGiGibdoMaskDL" Offset="0xB30" />
-        <DList Name="gGiGibdoMaskEmptyDL" Offset="0xF58" />
-
-        <!-- Gibdo Mask Textures -->
-        <Texture Name="gGiGibdoMaskWrapPattern1Tex" OutName="gi_gibdo_mask_wrap_pattern_1" Format="i8" Width="64" Height="32" Offset="0xF60" />
-        <Texture Name="gGiGibdoMaskWrapPattern2Tex" OutName="gi_gibdo_mask_wrap_pattern_2" Format="ia8" Width="32" Height="16" Offset="0x1760" />
-        <Texture Name="gGiGibdoMaskEyeTex" OutName="gi_gibdo_mask_eye" Format="ia8" Width="32" Height="16" Offset="0x1960" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask16.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask16.xml
deleted file mode 100644
index 4a0650cdd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask16.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Don Gero Mask -->
-    <File Name="object_gi_mask16" Segment="6">
-
-        <!-- Don Gero Mask Display Lists -->
-        <DList Name="gGiDonGeroMaskBodyDL" Offset="0x1040" />
-        <DList Name="gGiDonGeroMaskFaceDL" Offset="0x1438" />
-
-        <!-- Don Gero Mask Textures -->
-        <Texture Name="gGiDonGeroMaskToesTex" OutName="gi_don_gero_mask_toes" Format="ia8" Width="16" Height="32" Offset="0x1590" />
-        <Texture Name="gGiDonGeroMaskFrillsTex" OutName="gi_don_gero_mask_frills" Format="ia8" Width="32" Height="16" Offset="0x1790" />
-        <Texture Name="gGiDonGeroMaskEyeTex" OutName="gi_don_gero_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x1990" />
-        <Texture Name="gGiDonGeroMaskNostrilTex" OutName="gi_don_gero_mask_face" Format="rgba16" Width="16" Height="32" Offset="0x1B90" />
-        <Texture Name="gGiDonGeroMaskMouthTex" OutName="gi_don_gero_mask_mouth" Format="i4" Width="16" Height="8" Offset="0x1F90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask17.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask17.xml
deleted file mode 100644
index a4df99986..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask17.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Kamaro Mask -->
-    <File Name="object_gi_mask17" Segment="6">
-
-        <!-- Kamaro Mask Display Lists -->
-        <DList Name="gGiKamaroMaskEmptyDL" Offset="0xFD0" />
-        <DList Name="gGiKamaroMaskDL" Offset="0xFD8" />
-
-        <!-- Kamaro Mask TLUT -->
-        <Texture Name="gGiKamaroMaskTLUT" OutName="kamaro_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1650" />
-
-        <!-- Kamaro Mask Textures -->
-        <Texture Name="gGiKamaroMaskStitchesTex" OutName="gi_kamaro_mask_stitches" Format="ci8" Width="16" Height="16" Offset="0x1850" />
-        <Texture Name="gGiKamaroMaskEyeTex" OutName="gi_kamaro_mask_eye" Format="ci8" Width="16" Height="16" Offset="0x1950" />
-        <Texture Name="gGiKamaroMaskSpotTex" OutName="gi_kamaro_mask_spot" Format="ci8" Width="8" Height="8" Offset="0x1A50" />
-        <Texture Name="gGiKamaroMaskHairChinTex" OutName="gi_kamaro_mask_hair_chin" Format="ci8" Width="16" Height="16" Offset="0x1A90" />
-        <Texture Name="gGiKamaroMaskNoseEarTex" OutName="gi_kamaro_mask_nose_ear" Format="ci8" Width="8" Height="8" Offset="0x1B90" />
-        <Texture Name="gGiKamaroMaskPonytailTex" OutName="gi_kamaro_mask_ponytail" Format="ci8" Width="8" Height="16" Offset="0x1BD0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask18.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask18.xml
deleted file mode 100644
index ad0364290..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask18.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Captains Hat -->
-    <File Name="object_gi_mask18" Segment="6">
-
-        <!-- Captains Hat Display Lists -->
-        <DList Name="gGiCaptainsHatFaceDL" Offset="0xCF0" />
-        <DList Name="gGiCaptainsHatBodyDL" Offset="0xFA0" />
-
-        <!-- Captains Hat TLUT -->
-        <Texture Name="gGiCaptainsHatBodyTLUT" OutName="gi_captains_hat_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x12F8" />
-
-        <!-- Captains Hat Textures -->
-        <Texture Name="gGiCaptainsHatHoodTex" OutName="gi_captains_hat_hood" Format="ci8" Width="16" Height="16" Offset="0x14F8" />
-        <Texture Name="gGiCaptainsHatHandTex" OutName="gi_captains_hat_hand" Format="ci8" Width="8" Height="16" Offset="0x15F8" />
-        <Texture Name="gGiCaptainsHatArmTex" OutName="gi_captains_hat_arm" Format="ci8" Width="8" Height="8" Offset="0x1678" />
-        <Texture Name="gGiCaptainsHatRibTex" OutName="gi_captains_hat_rib" Format="rgba16" Width="8" Height="16" Offset="0x16B8" />
-        <Texture Name="gGiCaptainsHatFaceTex" OutName="gi_captains_hat_face" Format="i4" Width="16" Height="32" Offset="0x17B8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask20.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask20.xml
deleted file mode 100644
index f04bb157e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask20.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bremen Mask -->
-    <File Name="object_gi_mask20" Segment="6">
-
-        <!-- Bremen Mask Display Lists -->
-        <DList Name="gGiBremenMaskEmptyDL" Offset="0x800" />
-        <DList Name="gGiBremenMaskDL" Offset="0x808" />
-
-        <!-- Bremen Mask TLUTs -->
-        <Texture Name="gGiBremenMaskTLUT" OutName="gi_bremen_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC80" />
-
-        <!-- Bremen Mask Textures -->
-        <Texture Name="gGiBremenMaskFeathersTex" OutName="gi_bremen_mask_feathers" Format="ia8" Width="48" Height="24" Offset="0xE80" />
-        <Texture Name="gGiBremenMaskBeakBaseTex" OutName="gi_bremen_mask_beak_base" Format="ci8" Width="16" Height="16" Offset="0x1300" />
-        <Texture Name="gGiBremenMaskBeakNostrilTex" OutName="gi_bremen_mask_beak_nostril" Format="ci8" Width="8" Height="8" Offset="0x1400" />
-        <Texture Name="gGiBremenMaskEyeTex" OutName="gi_bremen_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1440" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask21.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask21.xml
deleted file mode 100644
index 4696963ad..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Blast Mask -->
-    <File Name="object_gi_mask21" Segment="6">
-
-        <!-- Blast Mask Display Lists -->
-        <DList Name="gGiBlastMaskDL" Offset="0x830" />
-        <DList Name="gGiBlastMaskEmptyDL" Offset="0xAA8" />
-
-        <!-- Blast Mask Textures -->
-        <Texture Name="gGiBlastMaskSkullTex" OutName="gi_blast_mask_skull" Format="i4" Width="64" Height="64" Offset="0xAB0" />
-        <Texture Name="gGiBlastMaskBombTex" OutName="gi_blast_mask_bomb" Format="i4" Width="16" Height="32" Offset="0x12B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask22.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask22.xml
deleted file mode 100644
index 54b0c5595..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask22.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Mask of Scents -->
-    <File Name="object_gi_mask22" Segment="6">
-
-        <!-- Mask of Scents Display Lists -->
-        <DList Name="gGiMaskOfScentsTeethDL" Offset="0x880" />
-        <DList Name="gGiMaskOfScentsFaceDL" Offset="0x918" />
-
-        <!-- Mask of Scents TLUTs -->
-        <Texture Name="gGiMaskOfScentsTLUT" OutName="gi_mask_of_scents_tlut" Format="rgba16" Width="16" Height="16" Offset="0xD58" />
-
-        <!-- Mask of Scents Textures -->
-        <Texture Name="gGiMaskOfScentsSpotTex" OutName="gi_mask_of_scents_spot" Format="ci8" Width="8" Height="8" Offset="0xF58" />
-        <Texture Name="gGiMaskOfScentsEyeShadowTex" OutName="gi_mask_of_scents_eye_shadow" Format="ci8" Width="16" Height="16" Offset="0xF98" />
-        <Texture Name="gGiMaskOfScentsNostrilTex" OutName="gi_mask_of_scents_nostril" Format="ci8" Width="16" Height="32" Offset="0x1098" />
-        <Texture Name="gGiMaskOfScentsMouthTex" OutName="gi_mask_of_scents_mouth" Format="ci8" Width="8" Height="8" Offset="0x1298" />
-        <Texture Name="gGiMaskOfScentsEyeTex" OutName="gi_mask_of_scents_eye" Format="rgba16" Width="16" Height="16" Offset="0x12D8" />
-        <Texture Name="gGiMaskOfScentsToothTex" OutName="gi_mask_of_scents_tooth" Format="i8" Width="16" Height="32" Offset="0x14D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask23.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask23.xml
deleted file mode 100644
index 6efa0147b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mask23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Giant's Mask -->
-    <File Name="object_gi_mask23" Segment="6">
-
-        <!-- Giant's Mask Display List -->
-        <DList Name="gGiGiantMaskDL" Offset="0x8C0" />
-        <DList Name="gGiGiantMaskEmptyDL" Offset="0xC00" />
-
-        <!-- Giant's Mask Textures -->
-        <Texture Name="gGiGiantMaskEyeTex" OutName="gi_giant_mask_eye" Format="i8" Width="32" Height="64" Offset="0xC08" />
-        <Texture Name="gGiGiantMaskMouthTex" OutName="gi_giant_mask_mouth" Format="i8" Width="24" Height="11" Offset="0x1408" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_melody.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_melody.xml
deleted file mode 100644
index 4d4696528..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_melody.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: OoT Songs -->
-    <File Name="object_gi_melody" Segment="6">
-
-        <!-- OoT Songs Display Lists -->
-        <DList Name="gGiMinuetColorDL" Offset="0xA80" />
-        <DList Name="gGiBoleroColorDL" Offset="0xA90" />
-        <DList Name="gGiSerenadeColorDL" Offset="0xAA0" />
-        <DList Name="gGiRequiemColorDL" Offset="0xAB0" />
-        <DList Name="gGiNocturneColorDL" Offset="0xAC0" />
-        <DList Name="gGiPreludeColorDL" Offset="0xAD0" />
-        <DList Name="gGiSongNoteDL" Offset="0xAE0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_milk.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_milk.xml
deleted file mode 100644
index 0e2c37efa..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_milk.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bottled Milk -->
-    <File Name="object_gi_milk" Segment="6">
-
-        <!-- Bottled Milk Textures -->
-        <Texture Name="gGiMilkBottleLabelTex" OutName="gi_milk_bottle_label" Format="i8" Width="72" Height="24" Offset="0x0" />
-
-        <!-- Bottled Milk Display Lists -->
-        <DList Name="gGiMilkBottleContentsDL" Offset="0x1060" /> <!-- Milk, Label, Cork -->
-        <DList Name="gGiMilkBottleGlassDL" Offset="0x1288" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mssa.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mssa.xml
deleted file mode 100644
index ce1ae8c42..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_mssa.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Sun Mask -->
-    <File Name="object_gi_mssa" Segment="6">
-
-        <!-- Sun Mask Display List -->
-        <DList Name="gGiSunMaskEyesSidePatternsDL" Offset="0xC00" /> <!-- Both the eyes and side patterns -->
-        <DList Name="gGiSunMaskFaceDL" Offset="0xDF0" />
-
-        <!-- Sun Mask Textures -->
-        <Texture Name="gGiSunMaskEyeTex" OutName="gi_sun_mask_eye" Format="i4" Width="16" Height="16" Offset="0x10F0" />
-        <Texture Name="gGiSunMaskSidePatternsTex" OutName="gi_sun_mask_side_patterns" Format="i4" Width="16" Height="16" Offset="0x1170" />
-        <Texture Name="gGiSunMaskFacePatternsTex" OutName="gi_sun_mask_face_patterns" Format="i4" Width="16" Height="16" Offset="0x11F0" />
-        <Texture Name="gGiSunMaskManeSwirlTex" OutName="gi_sun_mask_mane_swirl" Format="i4" Width="32" Height="32" Offset="0x1270" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_nuts.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_nuts.xml
deleted file mode 100644
index d142cc8bd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_nuts.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Deku Nut -->
-    <File Name="object_gi_nuts" Segment="6">
-
-        <!-- Deku Nut Textures -->
-        <Texture Name="gGiNutShellTex" OutName="gi_nut_shell" Format="i8" Width="32" Height="32" Offset="0x0" />
-
-        <!-- Deku Nut Display Lists -->
-        <DList Name="gGiNutDL" Offset="0xE90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_nutsmask.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_nutsmask.xml
deleted file mode 100644
index c6df5804a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_nutsmask.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Deku Mask -->
-    <File Name="object_gi_nutsmask" Segment="6">
-
-        <!-- Deku Mask Display Lists -->
-        <DList Name="gGiDekuMaskDL" Offset="0xB50" />
-        <DList Name="gGiDekuMaskEmptyDL" Offset="0xF20" />
-
-        <!-- Deku Mask Textures -->
-        <Texture Name="gGiDekuMaskHairTex" OutName="gi_deku_mask_hair" Format="i8" Width="32" Height="32" Offset="0xF28" />
-        <Texture Name="gGiDekuMaskFaceTex" OutName="gi_deku_mask_face" Format="i8" Width="16" Height="16" Offset="0x1328" />
-        <Texture Name="gGiDekuMaskEyeTex" OutName="gi_deku_mask_eye" Format="ia8" Width="64" Height="32" Offset="0x1428" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_ocarina.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_ocarina.xml
deleted file mode 100644
index 5856529e6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_ocarina.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Ocarina of Time -->
-    <File Name="object_gi_ocarina" Segment="6">
-
-        <!-- Ocarina of Time Textures -->
-        <Texture Name="gGiOcarinaOfTimeHoleTex" OutName="gi_ocarina_of_time_hole" Format="i8" Width="16" Height="16" Offset="0x0" />
-
-        <!-- Ocarina of Time Display Lists -->
-        <DList Name="gGiOcarinaOfTimeDL" Offset="0x8C0" />
-        <DList Name="gGiOcarinaOfTimeHolesDL" Offset="0xAF8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_purse.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_purse.xml
deleted file mode 100644
index d24da1add..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_purse.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Wallet -->
-    <File Name="object_gi_purse" Segment="6">
-
-        <!-- Wallet Textures -->
-        <Texture Name="gGiWalletTex" OutName="gi_wallet" Format="i8" Width="64" Height="64" Offset="0x0" />
-
-        <!-- Wallet Color Display Lists -->
-        <DList Name="gGiAdultWalletColorDL" Offset="0x1750" />
-        <DList Name="gGiGiantsWalletColorDL" Offset="0x1770" />
-        <DList Name="gGiAdultWalletRupeeOuterColorDL" Offset="0x1790" />
-        <DList Name="gGiAdultWalletStringColorDL" Offset="0x17B0" />
-        <DList Name="gGiAdultWalletRupeeInnerColorDL" Offset="0x17D0" />
-        <DList Name="gGiGiantsWalletRupeeOuterColorDL" Offset="0x17F0" />
-        <DList Name="gGiGiantsWalletStringColorDL" Offset="0x1810" />
-        <DList Name="gGiGiantsWalletRupeeInnerColorDL" Offset="0x1830" />
-
-        <!-- Wallet Common Display Lists -->
-        <DList Name="gGiWalletDL" Offset="0x1850" />
-        <DList Name="gGiWalletRupeeOuterDL" Offset="0x19A0" />
-        <DList Name="gGiWalletStringDL" Offset="0x1A28" />
-        <DList Name="gGiWalletRupeeInnerDL" Offset="0x1AD8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_rabit_mask.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_rabit_mask.xml
deleted file mode 100644
index 16f536976..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_rabit_mask.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bunny Hood -->
-    <File Name="object_gi_rabit_mask" Segment="6">
-
-        <!-- Bunny Hood Textures -->
-        <Texture Name="gGiBunnyHoodEyeTex" OutName="gi_bunny_hood_eye" Format="ia8" Width="16" Height="16" Offset="0x0" />
-
-        <!-- Bunny Hood Display Lists -->
-        <DList Name="gGiBunnyHoodDL" Offset="0xBC0" />
-        <DList Name="gGiBunnyHoodEyesDL" Offset="0xE58" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve00.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve00.xml
deleted file mode 100644
index 3476ab719..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve00.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Moon's Tear -->
-    <File Name="object_gi_reserve00" Segment="6">
-
-        <!-- Moon's Tear Identity Mtx (unused) -->
-        <Mtx Name="gGiMoonsTearIdentityMtx" Offset="0xC40" />
-
-        <!-- Moon's Tear Display Lists -->
-        <DList Name="gGiMoonsTearGlowDL" Offset="0xC80" />
-        <DList Name="gGiMoonsTearItemDL" Offset="0xD78" />
-
-        <!-- Moon's Tear Textures -->
-        <Texture Name="gGiMoonsTearItem1Tex" OutName="gi_moons_tear_item_1" Format="i8" Width="32" Height="32" Offset="0x1048" />
-        <Texture Name="gGiMoonsTearItem2Tex" OutName="gi_moons_tear_item_2" Format="i8" Width="32" Height="32" Offset="0x1448" />
-        <Texture Name="gGiMoonsTearGlowTex" OutName="gi_moons_tear_glow" Format="i8" Width="32" Height="32" Offset="0x1848" />
-
-        <!-- Moon's Tear Texture Animation -->
-        <TextureAnimation Name="gGiMoonsTearTexAnim" Offset="0x1C60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve01.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve01.xml
deleted file mode 100644
index 5c6bb4d18..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve01.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Title Deeds -->
-    <File Name="object_gi_reserve01" Segment="6">
-
-        <!-- Title Deed Common Display Lists -->
-        <DList Name="gGiTitleDeedSealAndRibbonDL" Offset="0x600" />
-        <DList Name="gGiTitleDeedPaperDL" Offset="0x788" />
-        <DList Name="gGiTitleDeedEmptyDL" Offset="0xA08" />
-
-        <!-- Title Deed Color Display Lists -->
-        <DList Name="gGiTitleDeedLandColorDL" Offset="0x968" />
-        <DList Name="gGiTitleDeedSwampColorDL" Offset="0x990" />
-        <DList Name="gGiTitleDeedMountainColorDL" Offset="0x9B8" />
-        <DList Name="gGiTitleDeedOceanColorDL" Offset="0x9E0" />
-
-        <!-- Title Deed Textures -->
-        <Texture Name="gGiTitleDeedRightInscriptionsTex" OutName="gi_title_deed_right_inscriptions" Format="i8" Width="32" Height="32" Offset="0xA10" />
-        <Texture Name="gGiTitleDeedLeftInscriptionsTex" OutName="gi_title_deed_left_inscriptions" Format="i8" Width="32" Height="32" Offset="0xE10" />
-        <Texture Name="gGiTitleDeedSealAndRibbonTex" OutName="gi_title_deed_seal_and_ribbon" Format="i8" Width="32" Height="32" Offset="0x1210" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_b_00.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_b_00.xml
deleted file mode 100644
index 1e2c37821..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_b_00.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Room Key -->
-    <File Name="object_gi_reserve_b_00" Segment="6">
-
-        <!-- Room Key Display Lists -->
-        <DList Name="gGiRoomKeyDL" Offset="0x7D0" />
-        <DList Name="gGiRoomKeyEmptyDL" Offset="0xC20" />
-
-        <!-- Room Key Textures -->
-        <Texture Name="gGiRoomKeyInscriptionsTex" OutName="gi_room_key_inscriptions" Format="i4" Width="64" Height="16" Offset="0xC28" />
-        <Texture Name="gGiRoomKeyBackgroundTex" OutName="gi_room_key_background" Format="i4" Width="32" Height="32" Offset="0xE28" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_b_01.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_b_01.xml
deleted file mode 100644
index 2bd1b2af2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_b_01.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Letter to Mama -->
-    <File Name="object_gi_reserve_b_01" Segment="6">
-
-        <!-- Letter to Mama Display Lists -->
-        <DList Name="gGiLetterToMamaInscriptionsDL" Offset="0x820" />
-        <DList Name="gGiLetterToMamaEnvelopeLetterDL" Offset="0x948" />
-
-        <!-- Letter to Mama Textures -->
-        <Texture Name="gGiLetterToMamaPostalAddressTex" OutName="gi_letter_to_mama_postal_address" Format="i4" Width="32" Height="16" Offset="0xCD8" />
-        <Texture Name="gGiLetterToMamaStampTex" OutName="gi_letter_to_mama_stamp" Format="ia16" Width="24" Height="32" Offset="0xDD8" />
-        <Texture Name="gGiLetterToMamaPattern1Tex" OutName="gi_letter_to_mama_pattern_1" Format="i8" Width="16" Height="32" Offset="0x13D8" />
-        <Texture Name="gGiLetterToMamaPattern2Tex" OutName="gi_letter_to_mama_pattern_2" Format="i4" Width="16" Height="32" Offset="0x15D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_c_00.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_c_00.xml
deleted file mode 100644
index f9cca9676..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_c_00.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Letter To Kafei -->
-    <File Name="object_gi_reserve_c_00" Segment="6">
-
-        <!-- Letter To Kafei Display Lists -->
-        <DList Name="gGiLetterToKafeiInscriptionsDL" Offset="0x4A0" />
-        <DList Name="gGiLetterToKafeiEnvelopeLetterDL" Offset="0x5F0" />
-
-        <!-- Letter To Kafei Textures -->
-        <Texture Name="gGiLetterToKafeiLetterBackgroundTex" OutName="gi_letter_to_kafei_background" Format="i8" Width="16" Height="16" Offset="0x760" />
-        <Texture Name="gGiLetterToKafeiLetterInscriptionsTex" OutName="gi_letter_to_kafei_letter_inscriptions" Format="i4" Width="32" Height="8" Offset="0x860" />
-        <Texture Name="gGiLetterToKafeiEnvelopeInscriptionsTex" OutName="gi_letter_to_kafei_inscriptions" Format="i4" Width="128" Height="32" Offset="0x8E0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_c_01.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_c_01.xml
deleted file mode 100644
index b88f74df5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_reserve_c_01.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Pendant of Memories -->
-    <File Name="object_gi_reserve_c_01" Segment="6">
-
-        <!-- Pendant of Memories Display Lists -->
-        <DList Name="gGiPendantOfMemoriesDL" Offset="0x750" />
-        <DList Name="gGiPendantOfMemoriesEmptyDL" Offset="0xC78" />
-
-        <!-- Pendant of Memories Textures -->
-        <Texture Name="gGiPendantOfMemoriesBlankTex" OutName="gi_pendant_of_memories_blank" Format="i8" Width="16" Height="8" Offset="0xC80" />
-        <Texture Name="gGiPendantOfMemoriesBackgroundTex" OutName="gi_pendant_of_memories_background" Format="i4" Width="32" Height="32" Offset="0xD00" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_rupy.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_rupy.xml
deleted file mode 100644
index 98d5714d6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_rupy.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Rupee -->
-    <File Name="object_gi_rupy" Segment="6">
-
-        <!-- Rupee Color Display Lists -->
-        <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x4A0" />
-        <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x4C0" />
-        <DList Name="gGiRedRupeeInnerColorDL" Offset="0x4E0" />
-        <DList Name="gGiPurpleRupeeInnerColorDL" Offset="0x500" />
-        <DList Name="gGiSilverRupeeInnerColorDL" Offset="0x520" />
-        <DList Name="gGiGoldRupeeInnerColorDL" Offset="0x540" />
-        <DList Name="gGiGreenRupeeOuterColorDL" Offset="0x560" />
-        <DList Name="gGiBlueRupeeOuterColorDL" Offset="0x580" />
-        <DList Name="gGiRedRupeeOuterColorDL" Offset="0x5A0" />
-        <DList Name="gGiPurpleRupeeOuterColorDL" Offset="0x5C0" />
-        <DList Name="gGiSilverRupeeOuterColorDL" Offset="0x5E0" />
-        <DList Name="gGiGoldRupeeOuterColorDL" Offset="0x600" />
-
-        <!-- Rupee Common Display Lists -->
-        <DList Name="gGiRupeeInnerDL" Offset="0x620" />
-        <DList Name="gGiRupeeOuterDL" Offset="0x730" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_schedule.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_schedule.xml
deleted file mode 100644
index 9350bdcc3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_schedule.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bomber's Notebook -->
-    <File Name="object_gi_schedule" Segment="6">
-
-        <!-- Bomber's Notebook Display Lists -->
-        <DList Name="gGiBombersNotebookDL" Offset="0x6C0" />
-        <DList Name="gGiBombersNotebookEmptyDL" Offset="0xB78" />
-
-        <!-- Bomber's Notebook Textures -->
-        <Texture Name="gGiBombersNotebookPagesTex" OutName="gi_bombers_notebook_pages" Format="i4" Width="16" Height="8" Offset="0xB80" />
-        <Texture Name="gGiBombersNotebookCoverBorderTex" OutName="gi_bombers_notebook_cover_border" Format="i4" Width="64" Height="32" Offset="0xBC0" />
-        <Texture Name="gGiBombersNotebookCoverTex" OutName="gi_bombers_notebook_cover" Format="i8" Width="32" Height="32" Offset="0xFC0" />
-        <Texture Name="gGiBombersNotebookLabelTex" OutName="gi_bombers_notebook_label" Format="i4" Width="32" Height="64" Offset="0x13C0" />
-        <Texture Name="gGiBombersNotebookBindingsTex" OutName="gi_bombers_notebook_bindings" Format="i4" Width="16" Height="32" Offset="0x17C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_seahorse.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_seahorse.xml
deleted file mode 100644
index acc1e184d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_seahorse.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Seahorse (not inside a bottle) -->
-    <File Name="object_gi_seahorse" Segment="6">
-
-        <!-- Seahorse Billboard Mtx Rotation -->
-        <Mtx Name="gGiSeahorseBillboardRotMtx" Offset="0xA50" />
-
-        <!-- Seahorse Display Lists -->
-        <DList Name="gGiSeahorseGlowDL" Offset="0xA90" />
-        <DList Name="gGiSeahorseBodyDL" Offset="0xB20" />
-        <DList Name="gGiSeahorseEmptyDL" Offset="0xF08" />
-
-        <!-- Seahorse Textures -->
-        <Texture Name="gGiSeahorseEyeTex" OutName="gi_seahorse_eye" Format="ia8" Width="16" Height="8" Offset="0xF10" />
-        <Texture Name="gGiSeahorseGlowTex" OutName="gi_seahorse_glow" Format="i4" Width="16" Height="8" Offset="0xF90" />
-        <Texture Name="gGiSeahorseTorsoTailTex" OutName="gi_seahorse_torso_tail" Format="i8" Width="32" Height="32" Offset="0xFD0" />
-        <Texture Name="gGiSeahorseFinTex" OutName="gi_seahorse_fin" Format="ia8" Width="32" Height="32" Offset="0x13D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_shield_2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_shield_2.xml
deleted file mode 100644
index e3b990bcf..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_shield_2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Hero's Shield -->
-    <File Name="object_gi_shield_2" Segment="6">
-
-        <!-- Hero's Shield Display Lists -->
-        <DList Name="gGiHerosShieldDL" Offset="0x9F0" />
-        <DList Name="gGiHerosShieldEmblemDL" Offset="0xD28" />
-
-        <!-- Hero's Shield Textures -->
-        <Texture Name="gGiHerosShieldEmblem1Tex" OutName="gi_heros_shield_emblem_1" Format="i8" Width="32" Height="64" Offset="0xEB8" />
-        <Texture Name="gGiHerosShieldBase1Tex" OutName="gi_heros_shield_base_1" Format="i4" Width="16" Height="32" Offset="0x16B8" />
-        <Texture Name="gGiHerosShieldEmblem2Tex" OutName="gi_heros_shield_emblem_2" Format="i8" Width="32" Height="48" Offset="0x17B8" />
-        <Texture Name="gGiHerosShieldBase2Tex" OutName="gi_heros_shield_base_2" Format="i4" Width="16" Height="32" Offset="0x1DB8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_shield_3.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_shield_3.xml
deleted file mode 100644
index 19f23203b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_shield_3.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Mirror Shield -->
-    <File Name="object_gi_shield_3" Segment="6">
-
-        <!-- Mirror Shield Display Lists -->
-        <DList Name="gGiMirrorShieldDL" Offset="0x770" />
-        <DList Name="gGiMirrorShieldEmptyDL" Offset="0xBF8" />
-
-        <!-- Mirror Shield Textures -->
-        <Texture Name="gGiMirrorShieldHandleTex" OutName="gi_mirror_shield_handle" Format="i4" Width="32" Height="32" Offset="0xC00" />
-        <Texture Name="gGiMirrorShieldFaceSymbolTex" OutName="gi_mirror_shield_face_symbol" Format="i8" Width="32" Height="64" Offset="0xE00" />
-        <Texture Name="gGiMirrorShieldFaceBackgroundTex" OutName="gi_mirror_shield_face_background" Format="i8" Width="32" Height="32" Offset="0x1600" />
-        <Texture Name="gGiMirrorShieldPatternTex" OutName="gi_mirror_shield_pattern" Format="i4" Width="32" Height="32" Offset="0x1A00" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_soldout.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_soldout.xml
deleted file mode 100644
index 109a65072..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_soldout.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Soldout (unused) -->
-    <File Name="object_gi_soldout" Segment="6">
-
-        <!-- Soldout Textures -->
-        <Texture Name="gGiSoldOutTex" OutName="gi_sold_out" Format="ia8" Width="32" Height="32" Offset="0x0" />
-
-        <!-- Soldout Display Lists -->
-        <DList Name="gGiSoldOutDL" Offset="0x440" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_soul.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_soul.xml
deleted file mode 100644
index 942062535..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_soul.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Fairy Container (not using the cork bottle model) -->
-    <File Name="object_gi_soul" Segment="6">
-
-        <!-- Fairy Container Textures -->
-        <Texture Name="gGiFairyContainerFairyTex" OutName="gi_fairy_container_fairy" Format="i8" Width="32" Height="32" Offset="0x0" />
-
-        <!-- Fairy Container Display Lists -->
-        <DList Name="gGiFairyContainerBaseCapDL" Offset="0xBD0" />
-        <DList Name="gGiFairyContainerGlassDL" Offset="0xDB8" />
-        <DList Name="gGiFairyContainerContentsDL" Offset="0xEF0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_stick.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_stick.xml
deleted file mode 100644
index 859e4f641..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_stick.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Deku Stick -->
-    <File Name="object_gi_stick" Segment="6">
-
-        <!-- Deku Stick Display Lists -->
-        <DList Name="gGiStickDL" Offset="0x4D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_stonemask.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_stonemask.xml
deleted file mode 100644
index 497ace2df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_stonemask.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Stone Mask -->
-    <File Name="object_gi_stonemask" Segment="6">
-
-        <!-- Stone Mask Display Lists -->
-        <DList Name="gGiStoneMaskDL" Offset="0xA10" />
-        <DList Name="gGiStoneMaskEmptyDL" Offset="0xE48" />
-
-        <!-- Stone Mask Textures -->
-        <Texture Name="gGiStoneMaskFaceTex" OutName="gi_stone_mask_face" Format="i8" Width="16" Height="16" Offset="0xE50" />
-        <Texture Name="gGiStoneMaskEyeTex" OutName="gi_stone_mask_eye" Format="i8" Width="32" Height="32" Offset="0xF50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sutaru.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sutaru.xml
deleted file mode 100644
index 1a425dd2a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sutaru.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Skull Token -->
-    <File Name="object_gi_sutaru" Segment="6">
-
-        <!-- Skull Token Display Lists -->
-        <DList Name="gGiSkulltulaTokenDL" Offset="0x330" />
-        <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x438" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_1.xml
deleted file mode 100644
index 3f1bd41c0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_1.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Kokiri Sword -->
-    <File Name="object_gi_sword_1" Segment="6">
-
-        <!-- Kokiri Sword Display Lists -->
-        <DList Name="gGiKokiriSwordGuardDL" Offset="0x850" />
-        <DList Name="gGiKokiriSwordBladeHiltDL" Offset="0x998" />
-
-        <!-- Kokiri Sword Textures -->
-        <Texture Name="gGiKokiriSwordGuardTex" OutName="gi_kokiri_sword_guard" Format="i8" Width="8" Height="8" Offset="0xD58" />
-        <Texture Name="gGiKokiriSwordHiltTex" OutName="gi_kokiri_sword_hilt" Format="i8" Width="24" Height="24" Offset="0xD98" />
-        <Texture Name="gGiKokiriSwordBladeTex" OutName="gi_kokiri_sword_blade" Format="i8" Width="24" Height="24" Offset="0xFD8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_2.xml
deleted file mode 100644
index 6a2bb445b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Razor Sword -->
-    <File Name="object_gi_sword_2" Segment="6">
-
-        <!-- Razor Sword Display Lists -->
-        <DList Name="gGiRazorSwordEmptyDL" Offset="0xC00" />
-        <DList Name="gGiRazorSwordDL" Offset="0xC08" />
-
-        <!-- Razor Sword Textures -->
-        <Texture Name="gGiRazorSwordHiltTex" OutName="gi_razor_sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x1120" />
-        <Texture Name="gGiRazorSwordBladeTex" OutName="gi_razor_sword_blade" Format="rgba16" Width="16" Height="16" Offset="0x1320" />
-        <Texture Name="gGiRazorSwordSpotTex" OutName="gi_razor_sword_spot" Format="i8" Width="8" Height="8" Offset="0x1520" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_3.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_3.xml
deleted file mode 100644
index b347c33cf..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_3.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Gilded Sword -->
-    <File Name="object_gi_sword_3" Segment="6">
-
-        <!-- Gilded Sword Display Lists -->
-        <DList Name="gGiGildedSwordEmptyDL" Offset="0x9E0" />
-        <DList Name="gGiGildedSwordDL" Offset="0x9E8" />
-
-        <!-- Gilded Sword Textures -->
-        <Texture Name="gGiGildedSwordHiltTex" OutName="gi_gilded_sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0xF58" />
-        <Texture Name="gGiGildedSwordSpotTex" OutName="gi_gilded_sword_spot" Format="i8" Width="8" Height="8" Offset="0x1158" />
-        <Texture Name="gGiGildedSwordBladePommelTex" OutName="gi_gilded_sword_blade_pommel" Format="i8" Width="16" Height="16" Offset="0x1198" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_4.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_4.xml
deleted file mode 100644
index 082c27e2a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_sword_4.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Great Fairys Sword -->
-    <File Name="object_gi_sword_4" Segment="6">
-        
-        <!-- 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 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/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_truth_mask.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_truth_mask.xml
deleted file mode 100644
index cbc818cea..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_truth_mask.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Mask Of Truth -->
-    <File Name="object_gi_truth_mask" Segment="6">
-
-        <!-- Mask of Truth Textures -->
-        <Texture Name="gGiMaskOfTruthEyebrowTriangleTex" OutName="gi_mask_of_truth_eyebrow_triangle" Format="i8" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="gGiMaskOfTruthSideEtchingTex" OutName="gi_mask_of_truth_side_etching" Format="i8" Width="32" Height="32" Offset="0x400" />
-
-        <!-- Mask of Truth Display Lists -->
-        <DList Name="gGiMaskOfTruthDL" Offset="0x13D0" />
-        <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_zoramask.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_zoramask.xml
deleted file mode 100644
index 7deefdf71..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gi_zoramask.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Zora Mask -->
-    <File Name="object_gi_zoramask" Segment="6">
-
-        <!-- Zora Mask Display Lists -->
-        <DList Name="gGiZoraMaskDL" Offset="0x7D0" />
-        <DList Name="gGiZoraMaskEmptyDL" Offset="0xC10" />
-
-        <!-- Zora Mask Textures -->
-        <Texture Name="gGiZoraMaskNoseTex" OutName="gi_zora_mask_nose" Format="i8" Width="8" Height="8" Offset="0xC18" />
-        <Texture Name="gGiZoraMaskSpots1Tex" OutName="gi_zora_mask_spots_1" Format="i8" Width="16" Height="32" Offset="0xC58" />
-        <Texture Name="gGiZoraMaskEyeTex" OutName="gi_zora_mask_eye" Format="i8" Width="32" Height="32" Offset="0xE58" />
-        <Texture Name="gGiZoraMaskMouthTex" OutName="gi_zora_mask_mouth" Format="i8" Width="32" Height="32" Offset="0x1258" />
-        <Texture Name="gGiZoraMaskSpots2Tex" OutName="gi_zora_mask_spots_2" Format="i4" Width="16" Height="32" Offset="0x1658" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_giant.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_giant.xml
deleted file mode 100644
index 491cd0cb0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_giant.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<Root>
-    <!-- Object for the Four Giants -->
-    <File Name="object_giant" Segment="6">
-        <Animation Name="gGiantLargeStrideAnim" Offset="0x2168" /> <!-- Original name is "kya_testwalk" -->
-
-        <!-- Giant Body Vertices. Contains everything but the beard. -->
-        <Array Name="gGiantBodyVtx" Count="444" Offset="0x2180">
-            <Vtx/>
-        </Array>
-        
-        <!-- Giant Unused Beard Vertices. An exact duplicate of the beard vertices that are actually used. -->
-        <Array Name="gGiantUnusedBeardVtx" Count="9" Offset="0x3D40">
-            <Vtx/>
-        </Array>
-
-        <!-- Giant Limb DisplayLists -->
-        <DList Name="gGiantHeadDL" Offset="0x3DD0" />
-        <DList Name="gGiantRightThighDL" Offset="0x40C0" />
-        <DList Name="gGiantRightShinDL" Offset="0x4200" />
-        <DList Name="gGiantRightFootDL" Offset="0x4438" />
-        <DList Name="gGiantLeftThighDL" Offset="0x4560" />
-        <DList Name="gGiantLeftShinDL" Offset="0x46A0" />
-        <DList Name="gGiantLeftFootDL" Offset="0x48D8" />
-        <DList Name="gGiantRightShoulderDL" Offset="0x4A00" />
-        <DList Name="gGiantRightUpperArmDL" Offset="0x4B10" />
-        <DList Name="gGiantRightForearmDL" Offset="0x4C38" />
-        <DList Name="gGiantRightHandDL" Offset="0x4D58" />
-        <DList Name="gGiantLeftShoulderDL" Offset="0x4EC0" />
-        <DList Name="gGiantLeftUpperArmDL" Offset="0x4FD0" />
-        <DList Name="gGiantLeftForearmDL" Offset="0x50F8" />
-        <DList Name="gGiantLeftHandDL" Offset="0x5218" />
-
-        <!-- Giant Textures -->
-        <Texture Name="gGiantTLUT" OutName="giant_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5380" />
-        <Texture Name="gGiantFootTex" OutName="giant_foot" Format="ci8" Width="16" Height="16" Offset="0x5580" />
-        <Texture Name="gGiantShinTex" OutName="giant_shin" Format="ci8" Width="16" Height="16" Offset="0x5680" />
-        <Texture Name="gGiantForearmAndKneeTex" OutName="giant_forearm_and_knee" Format="ci8" Width="16" Height="16" Offset="0x5780" />
-        <Texture Name="gGiantUpperArmAndThighTex" OutName="giant_upper_arm_and_thigh" Format="ci8" Width="16" Height="16" Offset="0x5880" />
-        <Texture Name="gGiantHandTex" OutName="giant_hand" Format="ci8" Width="16" Height="16" Offset="0x5980" />
-        <Texture Name="gGiantFaceEyeOpenTex" OutName="giant_face_eye_open" Format="ci8" Width="32" Height="64" Offset="0x5A80" TlutOffset="0x5380" />
-        <Texture Name="gGiantFaceEyeHalfTex" OutName="giant_face_eye_half" Format="ci8" Width="32" Height="64" Offset="0x6280" TlutOffset="0x5380" />
-        <Texture Name="gGiantFaceEyeClosedTex" OutName="giant_face_eye_closed" Format="ci8" Width="32" Height="64" Offset="0x6A80" TlutOffset="0x5380" />
-        <Texture Name="gGiantGroinTex" OutName="giant_groin" Format="ci8" Width="16" Height="16" Offset="0x7280" />
-        <Texture Name="gGiantHairTex" OutName="giant_hair" Format="ci8" Width="16" Height="32" Offset="0x7380" />
-
-        <!-- Giant Beard Vertices, DisplayList, and Texture -->
-        <Array Name="gGiantBeardVtx" Count="9" Offset="0x7580">
-            <Vtx/>
-        </Array>
-        <DList Name="gGiantBeardDL" Offset="0x7610" />
-        <Texture Name="gGiantBeardTex" OutName="giant_beard" Format="rgba16" Width="16" Height="16" Offset="0x76C0" />
-
-        <!-- Giant Limbs -->
-        <Limb Name="gGiantHeadLimb" Type="Standard" EnumName="GIANT_LIMB_HEAD" Offset="0x78C0" />
-        <Limb Name="gGiantLeftThighLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_THIGH" Offset="0x78CC" />
-        <Limb Name="gGiantLeftShinLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_SHIN" Offset="0x78D8" />
-        <Limb Name="gGiantLeftFootLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_FOOT" Offset="0x78E4" />
-        <Limb Name="gGiantRightThighLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_THIGH" Offset="0x78F0" />
-        <Limb Name="gGiantRightShinLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_SHIN" Offset="0x78FC" />
-        <Limb Name="gGiantRightFootLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_FOOT" Offset="0x7908" />
-        <Limb Name="gGiantLeftShoulderLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_SHOULDER" Offset="0x7914" />
-        <Limb Name="gGiantLeftUpperArmLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_UPPER_ARM" Offset="0x7920" />
-        <Limb Name="gGiantLeftForearmLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_FOREARM" Offset="0x792C" />
-        <Limb Name="gGiantLeftHandLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_HAND" Offset="0x7938" />
-        <Limb Name="gGiantRightShoulderLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_SHOULDER" Offset="0x7944" />
-        <Limb Name="gGiantRightUpperArmLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_UPPER_ARM" Offset="0x7950" />
-        <Limb Name="gGiantRightForearmLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_FOREARM" Offset="0x795C" />
-        <Limb Name="gGiantRightHandLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_HAND" Offset="0x7968" />
-
-        <!-- Giant Skeleton -->
-        <Skeleton Name="gGiantSkel" Type="Flex" LimbType="Standard" LimbNone="GIANT_LIMB_NONE" LimbMax="GIANT_LIMB_MAX" EnumName="EnGiantLimb" Offset="0x79B0" />
-
-        <!-- Giant Animations -->
-        <Animation Name="gGiantLookUpStartAnim" Offset="0x8394" /> <!-- Original name is "kyo_kaoage" ("raising face") -->
-        <Animation Name="gGiantLookUpLoopAnim" Offset="0x96E4" /> <!-- Original name is "kyo_kaoage_loop" -->
-        <Animation Name="gGiantBigCallStartAnim" Offset="0xA1C4" /> <!-- Original name is "kyo_sakebi" ("cry"). Stretches his arms outward -->
-        <Animation Name="gGiantSmallCallStartAnim" Offset="0xACA4" /> <!-- Original name is "kyo_sakebi2" ("cry2"). Places his hands over his mouth -->
-        <Animation Name="gGiantSmallCallLoopAnim" Offset="0xB784" /> <!-- Original name is "kyo_sakebi2_loop" -->
-        <Animation Name="gGiantSmallCallEndAnim" Offset="0xC5D4" /> <!-- Original name is "kyo_sakebi2_modori" ("cry2 return") -->
-        <Animation Name="gGiantBigCallLoopAnim" Offset="0xD040" /> <!-- Original name is "kyo_sakebi_loop" -->
-        <Animation Name="gGiantBigCallEndAnim" Offset="0xDE84" /> <!-- Original name is "kyo_sakebi_modori" ("cry return") -->
-        <Animation Name="gGiantFallingOverAnim" Offset="0x102A4" /> <!-- Original name is "kyo_taoreru" ("falling over") -->
-        <Animation Name="gGiantRaisedArmsStartAnim" Offset="0x116E4" /> <!-- Original name is "kyo_teage" ("raising arm") -->
-        <Animation Name="gGiantRaisedArmsLoopAnim" Offset="0x12A38" /> <!-- Original name is "kyo_teage_loop" -->
-        <Animation Name="gGiantStruggleStartAnim" Offset="0x13004" /> <!-- Original name is "kyo_tukisasae" ("holding up the moon") -->
-        <Animation Name="gGiantStruggleLoopAnim" Offset="0x13FE8" /> <!-- Original name is "kyo_tukisasae_loop" -->
-        <Animation Name="gGiantIdleAnim" Offset="0x15334" /> <!-- Original name is "kyo_wait" -->
-        <Animation Name="gGiantWalkingAnim" Offset="0x17944" /> <!-- Original name is "kyo_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gk.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gk.xml
deleted file mode 100644
index 40abd45a2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gk.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Root>
-    <File Name="object_gk" Segment="6">
-        <DList Name="object_gk_DL_002E30" Offset="0x2E30" />
-        <DList Name="object_gk_DL_0031B0" Offset="0x31B0" />
-        <DList Name="object_gk_DL_0038B0" Offset="0x38B0" />
-        <DList Name="object_gk_DL_0039D0" Offset="0x39D0" />
-        <DList Name="object_gk_DL_003AC0" Offset="0x3AC0" />
-        <DList Name="object_gk_DL_003D60" Offset="0x3D60" />
-        <DList Name="object_gk_DL_003F68" Offset="0x3F68" />
-        <DList Name="object_gk_DL_004088" Offset="0x4088" />
-        <DList Name="object_gk_DL_004218" Offset="0x4218" />
-        <DList Name="object_gk_DL_004498" Offset="0x4498" />
-        <DList Name="object_gk_DL_0045B8" Offset="0x45B8" />
-        <DList Name="object_gk_DL_004748" Offset="0x4748" />
-        <DList Name="object_gk_DL_0047D8" Offset="0x47D8" />
-        <DList Name="object_gk_DL_0048C0" Offset="0x48C0" />
-        <DList Name="object_gk_DL_0049F0" Offset="0x49F0" />
-        <DList Name="object_gk_DL_004CB8" Offset="0x4CB8" />
-        <DList Name="object_gk_DL_004DA0" Offset="0x4DA0" />
-        <DList Name="object_gk_DL_004ED0" Offset="0x4ED0" />
-        <TextureAnimation Name="object_gk_Matanimheader_005144" Offset="0x5144" />
-        <Animation Name="object_gk_Anim_005EDC" Offset="0x5EDC" /> <!-- Original name is "gk_furafura" -->
-        <DList Name="object_gk_DL_006680" Offset="0x6680" />
-        <DList Name="object_gk_DL_006688" Offset="0x6688" /> <!-- Original name is "gk_iwa_obj_model" -->
-        <Animation Name="object_gk_Anim_00787C" Offset="0x787C" /> <!-- Oriignal name is "gk_naki" -->
-        <Limb Name="object_gk_Standardlimb_007890" Type="Standard" EnumName="OBJECT_GK_LIMB_01" Offset="0x7890" />
-        <Limb Name="object_gk_Standardlimb_00789C" Type="Standard" EnumName="OBJECT_GK_LIMB_02" Offset="0x789C" />
-        <Limb Name="object_gk_Standardlimb_0078A8" Type="Standard" EnumName="OBJECT_GK_LIMB_03" Offset="0x78A8" />
-        <Limb Name="object_gk_Standardlimb_0078B4" Type="Standard" EnumName="OBJECT_GK_LIMB_04" Offset="0x78B4" />
-        <Limb Name="object_gk_Standardlimb_0078C0" Type="Standard" EnumName="OBJECT_GK_LIMB_05" Offset="0x78C0" />
-        <Limb Name="object_gk_Standardlimb_0078CC" Type="Standard" EnumName="OBJECT_GK_LIMB_06" Offset="0x78CC" />
-        <Limb Name="object_gk_Standardlimb_0078D8" Type="Standard" EnumName="OBJECT_GK_LIMB_07" Offset="0x78D8" />
-        <Limb Name="object_gk_Standardlimb_0078E4" Type="Standard" EnumName="OBJECT_GK_LIMB_08" Offset="0x78E4" />
-        <Limb Name="object_gk_Standardlimb_0078F0" Type="Standard" EnumName="OBJECT_GK_LIMB_09" Offset="0x78F0" />
-        <Limb Name="object_gk_Standardlimb_0078FC" Type="Standard" EnumName="OBJECT_GK_LIMB_0A" Offset="0x78FC" />
-        <Limb Name="object_gk_Standardlimb_007908" Type="Standard" EnumName="OBJECT_GK_LIMB_0B" Offset="0x7908" />
-        <Limb Name="object_gk_Standardlimb_007914" Type="Standard" EnumName="OBJECT_GK_LIMB_0C" Offset="0x7914" />
-        <Limb Name="object_gk_Standardlimb_007920" Type="Standard" EnumName="OBJECT_GK_LIMB_0D" Offset="0x7920" />
-        <Limb Name="object_gk_Standardlimb_00792C" Type="Standard" EnumName="OBJECT_GK_LIMB_0E" Offset="0x792C" />
-        <Limb Name="object_gk_Standardlimb_007938" Type="Standard" EnumName="OBJECT_GK_LIMB_0F" Offset="0x7938" />
-        <Limb Name="object_gk_Standardlimb_007944" Type="Standard" EnumName="OBJECT_GK_LIMB_10" Offset="0x7944" />
-        <Limb Name="object_gk_Standardlimb_007950" Type="Standard" EnumName="OBJECT_GK_LIMB_11" Offset="0x7950" />
-        <Limb Name="object_gk_Standardlimb_00795C" Type="Standard" EnumName="OBJECT_GK_LIMB_12" Offset="0x795C" />
-        <Limb Name="object_gk_Standardlimb_007968" Type="Standard" EnumName="OBJECT_GK_LIMB_13" Offset="0x7968" />
-        <Skeleton Name="object_gk_Skel_0079C0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GK_LIMB_NONE" LimbMax="OBJECT_GK_LIMB_MAX" EnumName="ObjectGkLimb" Offset="0x79C0" />
-        <Animation Name="object_gk_Anim_007DC4" Offset="0x7DC4" /> <!-- Original name is "gk_sleep" -->
-        <Animation Name="object_gk_Anim_008774" Offset="0x8774" /> <!-- Original name is "gk_stand_wait" -->
-        <Animation Name="object_gk_Anim_0092C0" Offset="0x92C0" /> <!-- Original name is "gk_talk" -->
-        <Animation Name="object_gk_Anim_009638" Offset="0x9638" /> <!-- Original name is "gk_wait" -->
-        <Animation Name="object_gk_Anim_009858" Offset="0x9858" /> <!-- Original name is "gkid_dada" -->
-        <Animation Name="object_gk_Anim_009D88" Offset="0x9D88" /> <!-- Original name is "gkid_dada_loop" -->
-        <Animation Name="object_gk_Anim_00A21C" Offset="0xA21C" /> <!-- Original name is "gkid_dada_modori" -->
-        <Animation Name="object_gk_Anim_00AAEC" Offset="0xAAEC" /> <!-- Original name is "gkid_dakko" -->
-        <Animation Name="object_gk_Anim_00AE34" Offset="0xAE34" /> <!-- Original name is "gkid_run_loop" -->
-        <Animation Name="object_gk_Anim_00BD90" Offset="0xBD90" /> <!-- Original name is "gkid_utau" -->
-        <Animation Name="object_gk_Anim_00C308" Offset="0xC308" /> <!-- Original name is "gkid_utau_loop" -->
-        <Texture Name="object_gk_TLUT_00C320" OutName="tlut_00C320" Format="rgba16" Width="16" Height="16" Offset="0xC320" />
-        <!-- <Blob Name="object_gk_Blob_00C520" Size="0x1900" Offset="0xC520" /> -->
-        <Texture Name="object_gk_Tex_00DE20" OutName="tex_00DE20" Format="ci8" Width="8" Height="8" Offset="0xDE20" />
-        <Texture Name="object_gk_Tex_00DE60" OutName="tex_00DE60" Format="ci8" Width="16" Height="16" Offset="0xDE60" />
-        <Texture Name="object_gk_Tex_00DF60" OutName="tex_00DF60" Format="ci8" Width="16" Height="32" Offset="0xDF60" />
-        <Texture Name="object_gk_Tex_00E160" OutName="tex_00E160" Format="ci8" Width="32" Height="16" Offset="0xE160" />
-        <Texture Name="object_gk_Tex_00E360" OutName="tex_00E360" Format="ci8" Width="32" Height="32" Offset="0xE360" />
-        <Texture Name="object_gk_Tex_00E760" OutName="tex_00E760" Format="ci8" Width="8" Height="8" Offset="0xE760" />
-        <Texture Name="object_gk_Tex_00E7A0" OutName="tex_00E7A0" Format="ci8" Width="32" Height="64" Offset="0xE7A0" />
-        <Texture Name="object_gk_Tex_00EFA0" OutName="tex_00EFA0" Format="ci8" Width="16" Height="16" Offset="0xEFA0" />
-        <Texture Name="object_gk_Tex_00F0A0" OutName="tex_00F0A0" Format="ci8" Width="32" Height="32" Offset="0xF0A0" />
-        <Texture Name="object_gk_Tex_00F4A0" OutName="tex_00F4A0" Format="rgba16" Width="8" Height="8" Offset="0xF4A0" />
-        <Texture Name="object_gk_Tex_00F520" OutName="tex_00F520" Format="rgba16" Width="16" Height="16" Offset="0xF520" />
-        <Texture Name="object_gk_Tex_00F720" OutName="tex_00F720" Format="rgba16" Width="32" Height="32" Offset="0xF720" />
-        <Texture Name="object_gk_Tex_00FF20" OutName="tex_00FF20" Format="rgba16" Width="32" Height="32" Offset="0xFF20" />
-        <Texture Name="object_gk_Tex_010720" OutName="tex_010720" Format="rgba16" Width="32" Height="32" Offset="0x10720" />
-        <Texture Name="object_gk_Tex_010F20" OutName="tex_010F20" Format="rgba16" Width="32" Height="32" Offset="0x10F20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gla.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gla.xml
deleted file mode 100644
index 45da7754a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gla.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<Root>
-    <!-- object for the assets for ovl_En_Ge2 (Purple-clad Gerudo) -->
-    <File Name="object_gla" Segment="6">
-        <Animation Name="gGerudoPurpleRunningAwayCutsceneAnim" Offset="0x30C" /><!-- Original name is "g_yari_nigedasu" -->
-        <Animation Name="gGerudoPurpleGreatBayCutsceneAnim" Offset="0x460" /><!-- Original name is "g_yari_twister" -->
-
-        <!-- Identical to OoT's object_gla from here to the end -->
-        <Animation Name="gGerudoPurpleHorizontalSlashAnim" Offset="0x794" /><!-- Unused. Original name is "geldA_attack" -->
-        <Animation Name="gGerudoPurpleSlashToStandingAnim" Offset="0xBF0" /><!-- Usused. Original name is "geldA_attack_end" -->
-        <Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x1664" /><!-- Original name is "geldA_down" -->
-        <Animation Name="gGerudoPurpleStandingToCrouchAnim" Offset="0x1A40" /><!-- Unused. Original name is "geldA_find" -->
-        <Animation Name="gGerudoPurpleCrouchingLookAroundAnim" Offset="0x1FAC" /><!-- Unused. Original name is "geldA_find_wait" -->
-
-        <DList Name="gGerudoPurpleTorsoDL" Offset="0x39B0" />
-        <DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3E50" />
-        <DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3F88" />
-        <DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x4188" />
-        <DList Name="gGerudoPurpleRightForearmDL" Offset="0x42C0" />
-        <DList Name="gGerudoPurpleWaistDL" Offset="0x44C0" />
-        <DList Name="gGerudoPurpleRightThighDL" Offset="0x4658" />
-        <DList Name="gGerudoPurpleRightShinDL" Offset="0x4768" />
-        <DList Name="gGerudoPurpleLeftThighDL" Offset="0x4928" />
-        <DList Name="gGerudoPurpleLeftShinDL" Offset="0x4A38" />
-        <Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4BF8" />
-        <Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4DF8" TlutOffset="0x4BF8" />
-        <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x4E38" TlutOffset="0x4BF8" />
-        <Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4E78" TlutOffset="0x4BF8" />
-        <Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4F78" TlutOffset="0x4BF8" />
-        <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x5078" />
-        <Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x5178" />
-        <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x5328" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x5368" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x53E8" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleGlaiveGuardTex" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x57E8" />
-        <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x5828" />
-        <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x5928" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x59A8" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x59E8" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5DE8" />
-        <Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x5E68" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5F68" />
-        <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x6068" TlutOffset="0x5178" />
-        <DList Name="gGerudoPurpleRightHandDL" Offset="0x7DE8" />
-        <DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FA8" />
-        <DList Name="gGerudoPurpleLeftHandDL" Offset="0x8168" />
-        <DList Name="gGerudoPurpleLeftFootDL" Offset="0x82D0" />
-        <DList Name="gGerudoPurpleRightFootDL" Offset="0x8438" />
-        <DList Name="gGerudoPurpleVeilDL" Offset="0x8628" />
-        <DList Name="gGerudoPurplePonytailDL" Offset="0x86E0" />
-        <DList Name="gGerudoPurpleHeadDL" Offset="0x87D0" />
-        <Limb Name="gGerudoPurpleRootLimb" Type="Standard" EnumName="GERUDO_PURPLE_ROOT_LIMB" Offset="0x8C88" />
-        <Limb Name="gGerudoPurpleTorsoLimb" Type="Standard" EnumName="GERUDO_PURPLE_TORSO_LIMB" Offset="0x8C94" />
-        <Limb Name="gGerudoPurpleNeckLimb" Type="Standard" EnumName="GERUDO_PURPLE_NECK_LIMB" Offset="0x8CA0" />
-        <Limb Name="gGerudoPurplePonytailLimb" Type="Standard" EnumName="GERUDO_PURPLE_PONYTAIL_LIMB" Offset="0x8CAC" />
-        <Limb Name="gGerudoPurpleVeilLimb" Type="Standard" EnumName="GERUDO_PURPLE_VEIL_LIMB" Offset="0x8CB8" />
-        <Limb Name="gGerudoPurpleHeadLimb" Type="Standard" EnumName="GERUDO_PURPLE_HEAD_LIMB" Offset="0x8CC4" />
-        <Limb Name="gGerudoPurpleRightUpperArmLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_UPPER_ARM_LIMB" Offset="0x8CD0" />
-        <Limb Name="gGerudoPurpleRightForearmLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_FOREARM_LIMB" Offset="0x8CDC" />
-        <Limb Name="gGerudoPurpleRightWristLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_WRIST_LIMB" Offset="0x8CE8" />
-        <Limb Name="gGerudoPurpleRightHandLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_HAND_LIMB" Offset="0x8CF4" />
-        <Limb Name="gGerudoPurpleGlaiveLimb" Type="Standard" EnumName="GERUDO_PURPLE_GLAIVE_LIMB" Offset="0x8D00" />
-        <Limb Name="gGerudoPurpleLeftUpperArmLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_UPPER_ARM_LIMB" Offset="0x8D0C" />
-        <Limb Name="gGerudoPurpleLeftForearmLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_FOREARM_LIMB" Offset="0x8D18" />
-        <Limb Name="gGerudoPurpleLeftHandLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_HAND_LIMB" Offset="0x8D24" />
-        <Limb Name="gGerudoPurpleLeftThighLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_THIGH_LIMB" Offset="0x8D30" />
-        <Limb Name="gGerudoPurpleLeftShinLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_SHIN_LIMB" Offset="0x8D3C" />
-        <Limb Name="gGerudoPurpleLeftFootLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_FOOT_LIMB" Offset="0x8D48" />
-        <Limb Name="gGerudoPurpleRightThighLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_THIGH_LIMB" Offset="0x8D54" />
-        <Limb Name="gGerudoPurpleRightShinLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_SHIN_LIMB" Offset="0x8D60" />
-        <Limb Name="gGerudoPurpleRightFootLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_FOOT_LIMB" Offset="0x8D6C" />
-        <Limb Name="gGerudoPurpleWaistLimb" Type="Standard" EnumName="GERUDO_PURPLE_WAIST_LIMB" Offset="0x8D78" />
-        <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" LimbNone="GERUDO_PURPLE_LIMB_NONE" LimbMax="GERUDO_PURPLE_LIMB_MAX" EnumName="GerudoPurpleLimb" Offset="0x8DD8" />
-
-        <Animation Name="gGerudoPurpleChargingAnim" Offset="0x91D0" /><!-- Original name is "geldA_run" -->
-        <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x9D1C" /><!-- Original name is "geldA_wait" -->
-        <Animation Name="gGerudoPurpleWalkingAnim" Offset="0xA344" /><!-- Original name is "geldA_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gm.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gm.xml
deleted file mode 100644
index 80edb8aeb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gm.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <!-- This file is empty -->
-    <File Name="object_gm" Segment="6">
-        <Blob Name="gGmEmptyBlob" Size="0x10" Offset="0x0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gmo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gmo.xml
deleted file mode 100644
index eaee120b3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gmo.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Assets for Nejiron -->
-    <File Name="object_gmo" Segment="6">
-        <Animation Name="gNejironIdleAnim" Offset="0x18" /> <!-- Original name might be "gm_default" -->
-        <DList Name="gNejironBodyDL" Offset="0xB70" />
-        <DList Name="gNejironEyesDL" Offset="0xE38" />
-        <Texture Name="gNejironBodyTLUT" OutName="nejiron_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0xEC8" />
-        <Texture Name="gNejironBodyTex" OutName="nejiron_body" Format="ci8" Width="32" Height="32" Offset="0x10C8" />
-        <Texture Name="gNejironEyeOpenTex" OutName="nejiron_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x14C8" />
-        <Texture Name="gNejironEyeHalfTex" OutName="nejiron_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x18C8" />
-        <Texture Name="gNejironEyeClosedTex" OutName="nejiron_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x1CC8" />
-        <Limb Name="gNejironBodyLimb" Type="Standard" EnumName="NEJIRON_LIMB_BODY" Offset="0x20C8" />
-        <Limb Name="gNejironEyeLimb" Type="Standard" EnumName="NEJIRON_LIMB_EYES" Offset="0x20D4" />
-        <Skeleton Name="gNejironSkel" Type="Normal" LimbType="Standard" LimbNone="NEJIRON_LIMB_NONE" LimbMax="NEJIRON_LIMB_MAX" EnumName="NejironLimb" Offset="0x20E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_goroiwa.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_goroiwa.xml
deleted file mode 100644
index df6aa04bb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_goroiwa.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="object_goroiwa" Segment="6">
-        <DList Name="object_goroiwa_DL_0003B0" Offset="0x3B0" /> <!-- Original name is "Z2_goron_hahenAT_model" -->
-        <Texture Name="object_goroiwa_Tex_000520" OutName="tex_000520" Format="rgba16" Width="32" Height="32" Offset="0x520" />
-        <Texture Name="object_goroiwa_Tex_000D20" OutName="tex_000D20" Format="rgba16" Width="32" Height="32" Offset="0xD20" />
-        <Texture Name="object_goroiwa_Tex_001520" OutName="tex_001520" Format="rgba16" Width="32" Height="64" Offset="0x1520" />
-        <DList Name="object_goroiwa_DL_0028E0" Offset="0x28E0" /> <!-- Original name is "Z2_goron_hahenBT_model" -->
-        <DList Name="object_goroiwa_DL_002D70" Offset="0x2D70" /> <!-- Original name is "Z2_goron_hahenCT_model" -->
-        <DList Name="object_goroiwa_DL_0032E0" Offset="0x32E0" /> <!-- Original name is "Z2_goron_halfAT_model" -->
-        <DList Name="object_goroiwa_DL_003B40" Offset="0x3B40" /> <!-- Original name is "Z2_gorongoroiwa_model" -->
-        <DList Name="object_goroiwa_DL_0042B0" Offset="0x42B0" /> <!-- Original name is "Z2_new_hahenA_model" -->
-        <DList Name="object_goroiwa_DL_004960" Offset="0x4960" /> <!-- Original name is "Z2_new_hahenB_model" -->
-        <DList Name="object_goroiwa_DL_004EF0" Offset="0x4EF0" /> <!-- Original name is "Z2_new_hahenC_model" -->
-        <DList Name="object_goroiwa_DL_005C20" Offset="0x5C20" /> <!-- Original name is "Z2_newgoroiwa_model" -->
-        <Texture Name="object_goroiwa_TLUT_005EE0" OutName="tlut_005EE0" Format="rgba16" Width="4" Height="4" Offset="0x5EE0" />
-        <Texture Name="object_goroiwa_TLUT_005F00" OutName="tlut_005F00" Format="rgba16" Width="4" Height="4" Offset="0x5F00" />
-        <Texture Name="object_goroiwa_Tex_005F20" OutName="tex_005F20" Format="ci4" Width="64" Height="64" Offset="0x5F20" />
-        <Texture Name="object_goroiwa_Tex_006720" OutName="tex_006720" Format="ci4" Width="64" Height="64" Offset="0x6720" />
-        <DList Name="object_goroiwa_DL_0072F0" Offset="0x72F0" /> <!-- Original name is "Z2_snow_hahenA_model" -->
-        <DList Name="object_goroiwa_DL_0077D0" Offset="0x77D0" /> <!-- Original name is "Z2_snow_hahenB_model" -->
-        <DList Name="object_goroiwa_DL_007C60" Offset="0x7C60" /> <!-- Original name is "Z2_snow_hahenC_model" -->
-        <DList Name="object_goroiwa_DL_0082D0" Offset="0x82D0" /> <!-- Original name is "Z2_snow_halfA_model" -->
-        <DList Name="object_goroiwa_DL_008B90" Offset="0x8B90" /> <!-- Original name is "Z2_snowgoroniwa_model" -->
-        <!-- <Blob Name="object_goroiwa_Blob_008D80" Size="0x20" Offset="0x8D80" /> -->
-        <Texture Name="object_goroiwa_Tex_008DA0" OutName="tex_008DA0" Format="rgba16" Width="32" Height="64" Offset="0x8DA0" />
-        <!-- <Blob Name="object_goroiwa_Blob_009DA0" Size="0x800" Offset="0x9DA0" /> -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_goronswitch.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_goronswitch.xml
deleted file mode 100644
index 2f7592664..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_goronswitch.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="object_goronswitch" Segment="6">
-        <DList Name="object_goronswitch_DL_000260" Offset="0x260" /> <!-- Original name is "i2_H_swit1_modelT" -->
-        <DList Name="object_goronswitch_DL_000268" Offset="0x268" /> <!-- Original name is "i2_H_swit1_model" -->
-        <Collision Name="object_goronswitch_Colheader_0005C8" Offset="0x5C8" /> <!-- Original name is "i2_h_swit1_bgdatainfo" -->
-        <DList Name="object_goronswitch_DL_0007D0" Offset="0x7D0" /> <!-- Original name is "i2_H_swit2_modelT" -->
-        <DList Name="object_goronswitch_DL_0007D8" Offset="0x7D8" /> <!-- Original name is "i2_H_swit2_model" -->
-        <Texture Name="object_goronswitch_TLUT_000970" OutName="tlut_000970" Format="rgba16" Width="4" Height="4" Offset="0x970" />
-        <Texture Name="object_goronswitch_TLUT_000990" OutName="tlut_000990" Format="rgba16" Width="4" Height="4" Offset="0x990" />
-        <Texture Name="object_goronswitch_Tex_0009B0" OutName="tex_0009B0" Format="i8" Width="64" Height="64" Offset="0x9B0" />
-        <Texture Name="object_goronswitch_Tex_0019B0" OutName="tex_0019B0" Format="ci4" Width="64" Height="64" Offset="0x19B0" />
-        <Texture Name="object_goronswitch_Tex_0021B0" OutName="tex_0021B0" Format="ci4" Width="64" Height="64" Offset="0x21B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_grasshopper.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_grasshopper.xml
deleted file mode 100644
index f08536c90..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_grasshopper.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<Root>
-    <!-- Assets for Dragonflies. -->
-    <File Name="object_grasshopper" Segment="6">
-        <!-- Dragonfly Animations -->
-        <Animation Name="gDragonflyAttackAnim" Offset="0x66C" /> <!-- Original name is "kdz_attack" -->
-        <Animation Name="gDragonflyDeadAnim" Offset="0x8D4" /> <!-- Original name is "kdz_dead_hit" -->
-        <Animation Name="gDragonflyFallAnim" Offset="0x9E0" /> <!-- Original name is "kdz_down" -->
-        <Animation Name="gDragonflyFlyAnim" Offset="0xF9C" /> <!-- Original name is "kdz_fly" -->
-
-        <!-- Dragonfly Textures -->
-        <Texture Name="gDragonflyMouthAndTailSegmentUndersideTex" OutName="dragonfly_mouth_and_tail_segment_underside" Format="rgba16" Width="8" Height="8" Offset="0xFB0" />
-        <Texture Name="gDragonflyTailBackTex" OutName="dragonfly_tail_back" Format="rgba16" Width="16" Height="32" Offset="0x1030" />
-        <Texture Name="gDragonflyThoraxBackAndLegsTex" OutName="dragonfly_thorax_back_and_legs" Format="rgba16" Width="16" Height="16" Offset="0x1430" />
-        <Texture Name="gDragonflyStripeTex" OutName="dragonfly_stripe" Format="rgba16" Width="8" Height="8" Offset="0x1630" />
-        <Texture Name="gDragonflyHeadAndTailTipTex" OutName="dragonfly_head_and_tail_tip" Format="rgba16" Width="32" Height="8" Offset="0x16B0" />
-        <Texture Name="gDragonflyThoraxSidesTex" OutName="dragonfly_thorax_sides" Format="rgba16" Width="16" Height="8" Offset="0x18B0" />
-        <Texture Name="gDragonflyWingTex" OutName="dragonfly_wing" Format="rgba16" Width="8" Height="8" Offset="0x19B0" />
-        <Texture Name="gDragonflyEyeTex" OutName="dragonfly_eye" Format="rgba16" Width="8" Height="8" Offset="0x1A30" />
-        <Texture Name="gDragonflyFaceTex" OutName="dragonfly_face" Format="rgba16" Width="16" Height="16" Offset="0x1AB0" />
-        
-        <!-- Dragonfly Limb DisplayLists -->
-        <DList Name="gDragonflyBackRightFootDL" Offset="0x2BE0" />
-        <DList Name="gDragonflyBackLeftLowerLegDL" Offset="0x2C70" />
-        <DList Name="gDragonflyBackRightLowerLegDL" Offset="0x2D00" />
-        <DList Name="gDragonflyFrontLeftUpperLegDL" Offset="0x2D90" />
-        <DList Name="gDragonflyFrontRightUpperLegDL" Offset="0x2E28" />
-        <DList Name="gDragonflyFrontLeftLowerLegDL" Offset="0x2EC0" />
-        <DList Name="gDragonflyFrontRightLowerLegDL" Offset="0x2F50" />
-        <DList Name="gDragonflyLeftWingDL" Offset="0x2FE0" />
-        <DList Name="gDragonflyRightWingDL" Offset="0x3078" />
-        <DList Name="gDragonflyBackRightUpperLegDL" Offset="0x3110" />
-        <DList Name="gDragonflyBackLeftUpperLegDL" Offset="0x31A8" />
-        <DList Name="gDragonflyTailTipDL" Offset="0x3240" />
-        <DList Name="gDragonflyTailSegment4DL" Offset="0x32E8" />
-        <DList Name="gDragonflyTailSegment3DL" Offset="0x33E0" />
-        <DList Name="gDragonflyTailSegment2DL" Offset="0x3520" />
-        <DList Name="gDragonflyTailSegment1DL" Offset="0x3660" />
-        <DList Name="gDragonflyThoraxDL" Offset="0x3798" />
-        <DList Name="gDragonflyJawDL" Offset="0x3900" />
-        <DList Name="gDragonflyHeadDL" Offset="0x39E0" />
-        <DList Name="gDragonflyBackLeftFootDL" Offset="0x3BE0" />
-        <DList Name="gDragonflyFrontLeftFootDL" Offset="0x3C70" />
-        <DList Name="gDragonflyFrontRightFootDL" Offset="0x3D00" />
-
-        <!-- Dragonfly Limbs -->
-        <Limb Name="gDragonflyRootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_ROOT" Offset="0x3D90" />
-        <Limb Name="gDragonflyTailSegment1Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_1" Offset="0x3D9C" />
-        <Limb Name="gDragonflyTailSegment2Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_2" Offset="0x3DA8" />
-        <Limb Name="gDragonflyTailSegment3Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_3" Offset="0x3DB4" />
-        <Limb Name="gDragonflyTailSegment4Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_4" Offset="0x3DC0" />
-        <Limb Name="gDragonflyTailTipLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_TIP" Offset="0x3DCC" />
-        <Limb Name="gDragonflyThoraxLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_THORAX" Offset="0x3DD8" />
-        <Limb Name="gDragonflyLeftWingLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_LEFT_WING" Offset="0x3DE4" />
-        <Limb Name="gDragonflyRightWingLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_RIGHT_WING" Offset="0x3DF0" />
-        <Limb Name="gDragonflyBackLeftUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_UPPER_LEG" Offset="0x3DFC" />
-        <Limb Name="gDragonflyBackLeftLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_LOWER_LEG" Offset="0x3E08" />
-        <Limb Name="gDragonflyBackLeftFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_FOOT" Offset="0x3E14" />
-        <Limb Name="gDragonflyBackRightUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_UPPER_LEG" Offset="0x3E20" />
-        <Limb Name="gDragonflyBackRightLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_LOWER_LEG" Offset="0x3E2C" />
-        <Limb Name="gDragonflyBackRightFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_FOOT" Offset="0x3E38" />
-        <Limb Name="gDragonflyFrontLeftUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x3E44" />
-        <Limb Name="gDragonflyFrontLeftLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x3E50" />
-        <Limb Name="gDragonflyFrontLeftFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_FOOT" Offset="0x3E5C" />
-        <Limb Name="gDragonflyFrontRightUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x3E68" />
-        <Limb Name="gDragonflyFrontRightLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x3E74" />
-        <Limb Name="gDragonflyFrontRightFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_FOOT" Offset="0x3E80" />
-        <Limb Name="gDragonflyHeadLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_HEAD" Offset="0x3E8C" />
-        <Limb Name="gDragonflyJawLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_JAW" Offset="0x3E98" />
-
-        <!-- Dragonfly Skeleton -->
-        <Skeleton Name="gDragonflySkel" Type="Normal" LimbType="Standard" LimbNone="DRAGONFLY_LIMB_NONE" LimbMax="DRAGONFLY_LIMB_MAX" EnumName="DragonflyLimb" Offset="0x3F00" />
-
-        <!-- Dragonfly Animations -->
-        <Animation Name="gDragonflyRaiseTailAnim" Offset="0x42F0" /> <!-- Original name is "kdz_hight" -->
-        <Animation Name="gDragonflyDamageAnim" Offset="0x47AC" /> <!-- Original name is "kdz_hit" -->
-        <Animation Name="gDragonflyLowerTailAnim" Offset="0x4BC8" /> <!-- Original name is "kdz_low" -->
-        <Animation Name="gDragonflyHoverAnim" Offset="0x524C" /> <!-- Original name is "kdz_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gs.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gs.xml
deleted file mode 100644
index eebe60035..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_gs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Assets for the Gossip Stones. -->
-    <File Name="object_gs" Segment="6">
-        <Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0" />
-        <DList Name="gGossipStoneMaterialDL" Offset="0x950" />
-        <DList Name="gGossipStoneDL" Offset="0x9D0" />
-        <DList Name="gGossipStoneBottomModelDL" Offset="0xA60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ha.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ha.xml
deleted file mode 100644
index 860b592df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ha.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<Root>
-    <!-- Assets for Cremia's Donkeys and Gorman Brothers' Horses -->
-    <File Name="object_ha" Segment="6">
-
-        <Animation Name="gHorseUnusedAnim" Offset="0xC4" /> <!-- Original name is "ha_default" -->
-
-        <!-- Gorman Brothers' Horses -->
-
-        <!-- Gorman Brothers' Horses' DLs -->
-
-        <DList Name="gHorseBanditRightHindFootDL" Offset="0x30C0" />
-        <DList Name="gHorseBanditRightHindCannonDL" Offset="0x3418" />
-        <DList Name="gHorseBanditRightHindStifleDL" Offset="0x35D8" />
-        <DList Name="gHorseBanditRightHindThighDL" Offset="0x37A8" />
-        <DList Name="gHorseBanditLeftHindFootDL" Offset="0x3A68" />
-        <DList Name="gHorseBanditLeftHindCannonDL" Offset="0x3DB8" />
-        <DList Name="gHorseBanditLeftHindStifleDL" Offset="0x3F78" />
-        <DList Name="gHorseBanditLeftHindThighDL" Offset="0x4150" />
-        <DList Name="gHorseBanditTailEndDL" Offset="0x44C0" />
-        <DList Name="gHorseBanditTailMiddleDL" Offset="0x4628" />
-        <DList Name="gHorseBanditTailDockDL" Offset="0x47A8" />
-        <DList Name="gHorseBanditPelvisDL" Offset="0x4880" />
-        <DList Name="gHorseBanditRightFrontFootDL" Offset="0x4CA8" />
-        <DList Name="gHorseBanditRightFrontCannonDL" Offset="0x5000" />
-        <DList Name="gHorseBanditRightFrontForearmDL" Offset="0x51C0" />
-        <DList Name="gHorseBanditRightFrontLegRootDL" Offset="0x5390" />
-        <DList Name="gHorseBanditHeadDL" Offset="0x5450" />
-        <DList Name="gHorseBanditUpperNeckDL" Offset="0x5E08" />
-        <DList Name="gHorseBanditLowerNeckDL" Offset="0x5F98" />
-        <DList Name="gHorseBanditLeftFrontFootDL" Offset="0x6220" />
-        <DList Name="gHorseBanditLeftFrontCannonDL" Offset="0x6538" />
-        <DList Name="gHorseBanditLeftFrontForearmDL" Offset="0x6708" />
-        <DList Name="gHorseBanditLeftFrontLegRootDL" Offset="0x68E8" />
-        <DList Name="gHorseBanditTorsoDL" Offset="0x69A8" />
-
-        <!-- Gorman Brothers' Horses' Textures -->
-
-        <Texture Name="gHorseBanditTLUT" OutName="horse_bandit_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6E58" />
-        <Texture Name="gHorseBanditMaskTex" OutName="horse_bandit_mask" Format="ci8" Width="16" Height="16" Offset="0x7058" />
-        <Texture Name="gHorseBanditSpottedDetailTex" OutName="horse_bandit_spotted_detail" Format="ci8" Width="16" Height="32" Offset="0x7158" />
-        <Texture Name="gHorseBanditEyebrowTex" OutName="horse_bandit_eyebrow" Format="rgba16" Width="16" Height="16" Offset="0x7358" />
-        <Texture Name="gHorseBanditTeethTex" OutName="horse_bandit_teeth" Format="ci8" Width="16" Height="16" Offset="0x7558" />
-        <Texture Name="gHorseBanditTailAndFeetTex" OutName="horse_bandit_tail_and_feet" Format="ci8" Width="16" Height="16" Offset="0x7658" />
-        <Texture Name="gHorseBanditEyeTex" OutName="horse_bandit_eye" Format="rgba16" Width="32" Height="32" Offset="0x7758" />
-        <Texture Name="gHorseBanditMouthTex" OutName="horse_bandit_mouth" Format="ci8" Width="32" Height="32" Offset="0x7F58" />
-        <Texture Name="gHorseBanditSpottedSkinTex" OutName="horse_bandit_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x8358" />
-        <Texture Name="gHorseBanditTasselTex" OutName="horse_bandit_tassel" Format="rgba16" Width="8" Height="16" Offset="0x8758" />
-        <Texture Name="gHorseBanditSaddleSideTex" OutName="horse_bandit_saddle_side" Format="ci8" Width="16" Height="16" Offset="0x8858" />
-        <Texture Name="gHorseBanditSaddleTopTex" OutName="horse_bandit_saddle_top" Format="ci8" Width="16" Height="16" Offset="0x8958" />
-        <Texture Name="gHorseBanditSaddleBackTex" OutName="horse_bandit_saddle_back" Format="ci8" Width="8" Height="16" Offset="0x8A58" />
-
-        <!-- Gorman Brothers' Horses' Limbs and Skel -->
-
-        <Limb Name="gHorseBanditRootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_ROOT" Offset="0x8AD8" />
-        <Limb Name="gHorseBanditPelvisLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_PELVIS" Offset="0x8AE4" />
-        <Limb Name="gHorseBanditTorsoLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_TORSO" Offset="0x8AF0" />
-        <Limb Name="gHorseBanditLeftFrontLegRootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_FRONT_LEG_ROOT" Offset="0x8AFC" />
-        <Limb Name="gHorseBanditLeftFrontForearmLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_FRONT_FOREARM" Offset="0x8B08" />
-        <Limb Name="gHorseBanditLeftFrontCannonLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_FRONT_CANNON" Offset="0x8B14" />
-        <Limb Name="gHorseBanditLeftFrontFootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_FRONT_FOOT" Offset="0x8B20" />
-        <Limb Name="gHorseBanditLowerNeckLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LOWER_NECK" Offset="0x8B2C" />
-        <Limb Name="gHorseBanditUpperNeckLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_UPPER_NECK" Offset="0x8B38" />
-        <Limb Name="gHorseBanditHeadLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_HEAD" Offset="0x8B44" />
-        <Limb Name="gHorseBanditRightFrontLegRootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_FRONT_LEG_ROOT" Offset="0x8B50" />
-        <Limb Name="gHorseBanditRightFrontForearmLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_FRONT_FOREARM" Offset="0x8B5C" />
-        <Limb Name="gHorseBanditRightFrontCannonLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_FRONT_CANNON" Offset="0x8B68" />
-        <Limb Name="gHorseBanditRightFrontFootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_FRONT_FOOT" Offset="0x8B74" />
-        <Limb Name="gHorseBanditTailDockLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_TAIL_DOCK" Offset="0x8B80" />
-        <Limb Name="gHorseBanditTailMiddleLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_TAIL_MIDDLE" Offset="0x8B8C" />
-        <Limb Name="gHorseBanditTailEndLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_TAIL_END" Offset="0x8B98" />
-        <Limb Name="gHorseBanditLeftHindThighLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_HIND_THIGH" Offset="0x8BA4" />
-        <Limb Name="gHorseBanditLeftHindStifleLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_HIND_STIFLE" Offset="0x8BB0" />
-        <Limb Name="gHorseBanditLeftHindCannonLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_HIND_CANNON" Offset="0x8BBC" />
-        <Limb Name="gHorseBanditLeftHindFootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_HIND_FOOT" Offset="0x8BC8" />
-        <Limb Name="gHorseBanditRightHindThighLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_HIND_THIGH" Offset="0x8BD4" />
-        <Limb Name="gHorseBanditRightHindStifleLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_HIND_STIFLE" Offset="0x8BE0" />
-        <Limb Name="gHorseBanditRightHindCannonLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_HIND_CANNON" Offset="0x8BEC" />
-        <Limb Name="gHorseBanditRightHindFootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_HIND_FOOT" Offset="0x8BF8" />
-        <Skeleton Name="gHorseBanditSkel" Type="Flex" LimbType="Standard" LimbNone="HORSE_BANDIT_LIMB_NONE" LimbMax="HORSE_BANDIT_LIMB_MAX" EnumName="DonkeyBanditLimb" Offset="0x8C68" />
-
-        <!-- Horse/Donkey Animations -->
-
-        <Animation Name="gHorseGallopAnim" Offset="0x9208" /> <!-- Original name is "ha_fastrun" -->
-        <Animation Name="gHorseJumpLowAnim" Offset="0x9858" /> <!-- Original name is "ha_jump100" -->
-        <Animation Name="gHorseJumpHighAnim" Offset="0xA05C" /> <!-- Original name is "ha_jump200" -->
-        <Animation Name="gHorseTrotAnim" Offset="0xA650" /> <!-- Original name is "ha_slowrun" -->
-        <Animation Name="gHorseWhinnyAnim" Offset="0xB00C" /> <!-- Original name is "ha_stand" -->
-        <Animation Name="gHorseStopAnim" Offset="0xB9C8" /> <!-- Original name is "ha_stop" -->
-        <Animation Name="gHorseIdleAnim" Offset="0xC850" /> <!-- Original name is "ha_wait" -->
-        <Animation Name="gHorseShakeHeadAnim" Offset="0xCE70" /> <!-- Original name is "ha_wait02" -->
-        <Animation Name="gHorseWalkAnim" Offset="0xD648" /> <!-- Original name is "ha_walk" -->
-
-        <!-- Cremia's Donkey -->
-        
-        <!-- Cremia's Donkey DLs -->
-
-        <DList Name="gDonkeyRightHindFootDL" Offset="0x100B0" />
-        <DList Name="gDonkeyRightHindCannonDL" Offset="0x10258" />
-        <DList Name="gDonkeyRightHindStifleDL" Offset="0x103F0" />
-        <DList Name="gDonkeyRightHindThighDL" Offset="0x105C8" />
-        <DList Name="gDonkeyLeftHindFootDL" Offset="0x107A8" />
-        <DList Name="gDonkeyLeftHindCannonDL" Offset="0x10940" />
-        <DList Name="gDonkeyLeftHindStifleDL" Offset="0x10AE0" />
-        <DList Name="gDonkeyLeftHindThighDL" Offset="0x10CB8" />
-        <DList Name="gDonkeyTailEndDL" Offset="0x10E88" />
-        <DList Name="gDonkeyTailMiddleDL" Offset="0x10FE0" />
-        <DList Name="gDonkeyTailDockDL" Offset="0x11160" />
-        <DList Name="gDonkeyPelvisDL" Offset="0x11228" />
-        <DList Name="gDonkeyRightFrontFootDL" Offset="0x11378" />
-        <DList Name="gDonkeyRightFrontCannonDL" Offset="0x11518" />
-        <DList Name="gDonkeyRightFrontForearmDL" Offset="0x116A8" />
-        <DList Name="gDonkeyRightFrontLegRootDL" Offset="0x11888" />
-        <DList Name="gDonkeyHeadDL" Offset="0x11948" />
-        <DList Name="gDonkeyUpperNeckDL" Offset="0x11E08" />
-        <DList Name="gDonkeyLowerNeckDL" Offset="0x11F90" />
-        <DList Name="gDonkeyLeftFrontFootDL" Offset="0x122C0" />
-        <DList Name="gDonkeyLeftFrontCannonDL" Offset="0x12460" />
-        <DList Name="gDonkeyLeftFrontForearmDL" Offset="0x125E8" />
-        <DList Name="gDonkeyLeftFrontLegRootDL" Offset="0x127D0" />
-        <DList Name="gDonkeyTorsoDL" Offset="0x12890" />
-
-        <!-- Cremia's Donkey Textures -->
-
-        <Texture Name="gDonkeyTLUT" OutName="donkey_tlut" Format="rgba16" Width="16" Height="16" Offset="0x12D48" />
-        <Texture Name="gDonkeyMouthTex" OutName="donkey_mouth" Format="ci8" Width="32" Height="32" Offset="0x12F48" />
-        <Texture Name="gDonkeyHeadTex" OutName="donkey_head" Format="ci8" Width="32" Height="32" Offset="0x13348" />
-        <Texture Name="gDonkeyEyeTex" OutName="donkey_eye" Format="rgba32" Width="32" Height="32" Offset="0x13748" />
-        <Texture Name="gDonkeyManeTex" OutName="donkey_mane" Format="ci8" Width="16" Height="32" Offset="0x14748" />
-        <Texture Name="gDonkeySkinTex" OutName="donkey_skin" Format="ci8" Width="32" Height="32" Offset="0x14948" />
-        <Texture Name="gDonkeyHarnessTex" OutName="donkey_harness" Format="ci8" Width="16" Height="16" Offset="0x14D48" />
-        <Texture Name="gDonkeyTailAndFeetTex" OutName="donkey_tail_and_feet" Format="ci8" Width="16" Height="16" Offset="0x14E48" />
-    
-        <!-- Cremia's Donkey Limbs and Skel-->
-
-        <Limb Name="gDonkeyRootLimb" Type="Standard" EnumName="DONKEY_LIMB_ROOT" Offset="0x14F48" />
-        <Limb Name="gDonkeyPelvisLimb" Type="Standard" EnumName="DONKEY_LIMB_PELVIS" Offset="0x14F54" />
-        <Limb Name="gDonkeyTorsoLimb" Type="Standard" EnumName="DONKEY_LIMB_TORSO" Offset="0x14F60" />
-        <Limb Name="gDonkeyLeftFrontLegRootLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_FRONT_LEG_ROOT" Offset="0x14F6C" />
-        <Limb Name="gDonkeyLeftFrontForearmLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_FRONT_FOREARM" Offset="0x14F78" />
-        <Limb Name="gDonkeyLeftFrontCannonLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_FRONT_CANNON" Offset="0x14F84" />
-        <Limb Name="gDonkeyLeftFrontFootLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_FRONT_FOOT" Offset="0x14F90" />
-        <Limb Name="gDonkeyLowerNeckLimb" Type="Standard" EnumName="DONKEY_LIMB_LOWER_NECK" Offset="0x14F9C" />
-        <Limb Name="gDonkeyUpperNeckLimb" Type="Standard" EnumName="DONKEY_LIMB_UPPER_NECK" Offset="0x14FA8" />
-        <Limb Name="gDonkeyHeadLimb" Type="Standard" EnumName="DONKEY_LIMB_HEAD" Offset="0x14FB4" />
-        <Limb Name="gDonkeyRightFrontLegRootLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_FRONT_LEG_ROOT" Offset="0x14FC0" />
-        <Limb Name="gDonkeyRightFrontForearmLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_FRONT_FOREARM" Offset="0x14FCC" />
-        <Limb Name="gDonkeyRightFrontCannonLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_FRONT_CANNON" Offset="0x14FD8" />
-        <Limb Name="gDonkeyRightFrontFootLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_FRONT_FOOT" Offset="0x14FE4" />
-        <Limb Name="gDonkeyTailDockLimb" Type="Standard" EnumName="DONKEY_LIMB_TAIL_DOCK" Offset="0x14FF0" />
-        <Limb Name="gDonkeyTailMiddleLimb" Type="Standard" EnumName="DONKEY_LIMB_TAIL_MIDDLE" Offset="0x14FFC" />
-        <Limb Name="gDonkeyTailEndLimb" Type="Standard" EnumName="DONKEY_LIMB_TAIL_END" Offset="0x15008" />
-        <Limb Name="gDonkeyLeftHindThighLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_HIND_THIGH" Offset="0x15014" />
-        <Limb Name="gDonkeyLeftHindStifleLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_HIND_STIFLE" Offset="0x15020" />
-        <Limb Name="gDonkeyLeftHindCannonLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_HIND_CANNON" Offset="0x1502C" />
-        <Limb Name="gDonkeyLeftHindFootLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_HIND_FOOT" Offset="0x15038" />
-        <Limb Name="gDonkeyRightHindThighLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_HIND_THIGH" Offset="0x15044" />
-        <Limb Name="gDonkeyRightHindStifleLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_HIND_STIFLE" Offset="0x15050" />
-        <Limb Name="gDonkeyRightHindCannonLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_HIND_CANNON" Offset="0x1505C" />
-        <Limb Name="gDonkeyRightHindFootLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_HIND_FOOT" Offset="0x15068" />
-        <Skeleton Name="gDonkeySkel" Type="Flex" LimbType="Standard" LimbNone="DONKEY_LIMB_NONE" LimbMax="DONKEY_LIMB_MAX" EnumName="DonkeyLimb" Offset="0x150D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_haka_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_haka_obj.xml
deleted file mode 100644
index 2746eb690..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_haka_obj.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Root>
-    <File Name="object_haka_obj" Segment="6">
-        <DList Name="object_haka_obj_DL_000040" Offset="0x40" /> <!-- Original name is "Y2_bakuKABE_model" -->
-        <Collision Name="object_haka_obj_Colheader_000148" Offset="0x148" /> <!-- Original name is "Y2_bakuKABE_bgdatainfo" -->
-        <DList Name="object_haka_obj_DL_0007B0" Offset="0x7B0" /> <!-- Original name is "Y2_hakaishi_model" -->
-        <Collision Name="object_haka_obj_Colheader_000EE8" Offset="0xEE8" /> <!-- Original name is "Y2_hakaishi_bgdatainfo" -->
-        <DList Name="object_haka_obj_DL_000F70" Offset="0xF70" /> <!-- Original name is "Y2_hakashita00_meganeOBJ_model" -->
-        <DList Name="object_haka_obj_DL_001200" Offset="0x1200" /> <!-- Original name is "Y2_hakashita03_meganeOBJ_model" -->
-        <DList Name="object_haka_obj_DL_001410" Offset="0x1410" /> <!-- Original name is "Y2_hakashitaMAKU_model" -->
-        <Collision Name="object_haka_obj_Colheader_001588" Offset="0x1588" /> <!-- Original name is "Y2_hakashitaMAKU_bgdatainfo" -->
-        <DList Name="object_haka_obj_DL_001680" Offset="0x1680" /> <!-- Original name is "Y2_kakera_model" -->
-        <Texture Name="object_haka_obj_TLUT_001800" OutName="tlut_001800" Format="rgba16" Width="16" Height="16" Offset="0x1800" />
-        <Texture Name="object_haka_obj_TLUT_001A00" OutName="tlut_001A00" Format="rgba16" Width="4" Height="4" Offset="0x1A00" />
-        <Texture Name="object_haka_obj_TLUT_001A20" OutName="tlut_001A20" Format="rgba16" Width="4" Height="4" Offset="0x1A20" />
-        <Texture Name="object_haka_obj_TLUT_001A40" OutName="tlut_001A40" Format="rgba16" Width="16" Height="16" Offset="0x1A40" />
-        <Texture Name="object_haka_obj_Tex_001C40" OutName="tex_001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" />
-        <Texture Name="object_haka_obj_Tex_002040" OutName="tex_002040" Format="ci8" Width="32" Height="32" Offset="0x2040" />
-        <Texture Name="object_haka_obj_Tex_002440" OutName="tex_002440" Format="rgba16" Width="32" Height="32" Offset="0x2440" />
-        <Texture Name="object_haka_obj_Tex_002C40" OutName="tex_002C40" Format="ci4" Width="64" Height="64" Offset="0x2C40" />
-        <Texture Name="object_haka_obj_Tex_003440" OutName="tex_003440" Format="ci4" Width="64" Height="64" Offset="0x3440" />
-        <Texture Name="object_haka_obj_Tex_003C40" OutName="tex_003C40" Format="ci8" Width="32" Height="64" Offset="0x3C40" />
-        <Texture Name="object_haka_obj_Tex_004440" OutName="tex_004440" Format="ci8" Width="32" Height="32" Offset="0x4440" />
-        <Texture Name="object_haka_obj_Tex_004840" OutName="tex_004840" Format="rgba16" Width="64" Height="8" Offset="0x4840" />
-        <Texture Name="object_haka_obj_Tex_004C40" OutName="tex_004C40" Format="rgba16" Width="16" Height="16" Offset="0x4C40" />
-        <Texture Name="object_haka_obj_Tex_004E40" OutName="tex_004E40" Format="rgba16" Width="32" Height="32" Offset="0x4E40" />
-        <Texture Name="object_haka_obj_Tex_005640" OutName="tex_005640" Format="i4" Width="64" Height="64" Offset="0x5640" />
-        <Texture Name="object_haka_obj_Tex_005E40" OutName="tex_005E40" Format="rgba16" Width="32" Height="32" Offset="0x5E40" />
-        <Texture Name="object_haka_obj_Tex_006640" OutName="tex_006640" Format="i4" Width="64" Height="64" Offset="0x6640" />
-        <Texture Name="object_haka_obj_Tex_006E40" OutName="tex_006E40" Format="rgba16" Width="32" Height="32" Offset="0x6E40" />
-        <Texture Name="object_haka_obj_Tex_007640" OutName="tex_007640" Format="i4" Width="32" Height="32" Offset="0x7640" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hakaisi.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hakaisi.xml
deleted file mode 100644
index c0e200ea7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hakaisi.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <File Name="object_hakaisi" Segment="6">
-        <Texture Name="object_hakaisi_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="object_hakaisi_Tex_000200" OutName="tex_000200" Format="i8" Width="8" Height="32" Offset="0x200" />
-        <Texture Name="object_hakaisi_Tex_000300" OutName="tex_000300" Format="rgba16" Width="16" Height="16" Offset="0x300" />
-        <Texture Name="object_hakaisi_Tex_000500" OutName="tex_000500" Format="rgba16" Width="32" Height="64" Offset="0x500" />
-        <Texture Name="object_hakaisi_Tex_001500" OutName="tex_001500" Format="rgba16" Width="16" Height="64" Offset="0x1500" />
-        <DList Name="object_hakaisi_DL_001F10" Offset="0x1F10" /> <!-- Original name is "hahen01_model" -->
-        <DList Name="object_hakaisi_DL_0021B0" Offset="0x21B0" /> <!-- Original name is "hahen02_model" -->
-        <DList Name="object_hakaisi_DL_002650" Offset="0x2650" /> <!-- Original name is "haka_model" -->
-        <DList Name="object_hakaisi_DL_0029C0" Offset="0x29C0" /> <!-- Original name is "haka02_model" -->
-        <DList Name="object_hakaisi_DL_002CC0" Offset="0x2CC0" /> <!-- Original name is "haka03_model" -->
-        <Collision Name="object_hakaisi_Colheader_002FC4" Offset="0x2FC4" /> <!-- Original name is "z2_haka_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hakugin_demo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hakugin_demo.xml
deleted file mode 100644
index 1de3cd695..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hakugin_demo.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Animations for Gorons during the arrival of spring cutscene -->
-    <File Name="object_hakugin_demo" Segment="6">
-        <Animation Name="gGoronSpringShowAnim" Offset="0x1420" /> <!-- Original name is "goron_hora" -->
-        <Animation Name="gGoronSpringShowLoopAnim" Offset="0x1A4C" /> <!-- Original name is "goron_hora_loop" -->
-        <Animation Name="gGoronSpringLookAroundAnim" Offset="0x2704" /> <!-- Original name is "goron_mimawasu" -->
-        <Animation Name="gGoronSpringLookAroundLoopAnim" Offset="0x3378" /> <!-- Original name is "goron_mimawasu_loop" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hakugin_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hakugin_obj.xml
deleted file mode 100644
index 883a954a6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hakugin_obj.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<Root>
-    <File Name="object_hakugin_obj" Segment="6">
-        <DList Name="object_hakugin_obj_DL_000120" Offset="0x120" />
-        <DList Name="object_hakugin_obj_DL_000128" Offset="0x128" /> <!-- Original name is "i2_H_shutter1_model" -->
-        <Texture Name="object_hakugin_obj_TLUT_000310" OutName="tlut_000310" Format="rgba16" Width="4" Height="4" Offset="0x310" />
-        <Texture Name="object_hakugin_obj_Tex_000330" OutName="tex_000330" Format="ci4" Width="64" Height="64" Offset="0x330" />
-        <DList Name="object_hakugin_obj_DL_000D30" Offset="0xD30" />
-        <DList Name="object_hakugin_obj_DL_000D38" Offset="0xD38" />
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_000E48" Offset="0xE48" />
-        <Texture Name="object_hakugin_obj_TLUT_000E50" OutName="tlut_000E50" Format="rgba16" Width="4" Height="4" Offset="0xE50" />
-        <Texture Name="object_hakugin_obj_Tex_000E70" OutName="tex_000E70" Format="ci4" Width="64" Height="64" Offset="0xE70" />
-        <DList Name="object_hakugin_obj_DL_0016D0" Offset="0x16D0" />
-        <DList Name="object_hakugin_obj_DL_0016D8" Offset="0x16D8" /> <!-- Original name is "i2_haku041_model" -->
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_0017A8" Offset="0x17A8" />
-        <Texture Name="object_hakugin_obj_TLUT_0017B0" OutName="tlut_0017B0" Format="rgba16" Width="4" Height="4" Offset="0x17B0" />
-        <Texture Name="object_hakugin_obj_Tex_0017D0" OutName="tex_0017D0" Format="ci4" Width="64" Height="64" Offset="0x17D0" />
-        <DList Name="object_hakugin_obj_DL_002010" Offset="0x2010" />
-        <DList Name="object_hakugin_obj_DL_002018" Offset="0x2018" /> <!-- Original name is "i2_haku071_model" -->
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_0020E8" Offset="0x20E8" />
-        <Texture Name="object_hakugin_obj_TLUT_0020F0" OutName="tlut_0020F0" Format="rgba16" Width="4" Height="4" Offset="0x20F0" />
-        <Texture Name="object_hakugin_obj_Tex_002110" OutName="tex_002110" Format="ci4" Width="64" Height="64" Offset="0x2110" />
-        <DList Name="object_hakugin_obj_DL_002970" Offset="0x2970" />
-        <DList Name="object_hakugin_obj_DL_002978" Offset="0x2978" /> <!-- Original name is "i2_haku081_model" -->
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_002A58" Offset="0x2A58" />
-        <DList Name="object_hakugin_obj_DL_0035A0" Offset="0x35A0" />
-        <DList Name="object_hakugin_obj_DL_0035A8" Offset="0x35A8" /> <!-- Original name is "i2_haku091_model" -->
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_003888" Offset="0x3888" />
-        <Texture Name="object_hakugin_obj_TLUT_003890" OutName="tlut_003890" Format="rgba16" Width="4" Height="4" Offset="0x3890" />
-        <Texture Name="object_hakugin_obj_TLUT_0038B0" OutName="tlut_0038B0" Format="rgba16" Width="4" Height="4" Offset="0x38B0" />
-        <Texture Name="object_hakugin_obj_Tex_0038D0" OutName="tex_0038D0" Format="ci4" Width="64" Height="64" Offset="0x38D0" />
-        <Texture Name="object_hakugin_obj_Tex_0040D0" OutName="tex_0040D0" Format="ci4" Width="64" Height="64" Offset="0x40D0" />
-        <DList Name="object_hakugin_obj_DL_004920" Offset="0x4920" />
-        <DList Name="object_hakugin_obj_DL_004928" Offset="0x4928" /> <!-- Original name is "i2_haku0a1_model" -->
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_0049F8" Offset="0x49F8" />
-        <Texture Name="object_hakugin_obj_TLUT_004A00" OutName="tlut_004A00" Format="rgba16" Width="4" Height="4" Offset="0x4A00" />
-        <Texture Name="object_hakugin_obj_Tex_004A20" OutName="tex_004A20" Format="ci4" Width="64" Height="64" Offset="0x4A20" />
-        <DList Name="object_hakugin_obj_DL_005260" Offset="0x5260" />
-        <DList Name="object_hakugin_obj_DL_005268" Offset="0x5268" />
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_005338" Offset="0x5338" />
-        <Texture Name="object_hakugin_obj_TLUT_005340" OutName="tlut_005340" Format="rgba16" Width="4" Height="4" Offset="0x5340" />
-        <Texture Name="object_hakugin_obj_Tex_005360" OutName="tex_005360" Format="ci4" Width="64" Height="64" Offset="0x5360" />
-        <DList Name="object_hakugin_obj_DL_006120" Offset="0x6120" />
-        <DList Name="object_hakugin_obj_DL_006128" Offset="0x6128" /> <!-- Original name is "i2_H_RASENsita_model" -->
-        <Texture Name="object_hakugin_obj_TLUT_0064C0" OutName="tlut_0064C0" Format="rgba16" Width="4" Height="4" Offset="0x64C0" />
-        <Texture Name="object_hakugin_obj_TLUT_0064E0" OutName="tlut_0064E0" Format="rgba16" Width="4" Height="4" Offset="0x64E0" />
-        <Texture Name="object_hakugin_obj_TLUT_006500" OutName="tlut_006500" Format="rgba16" Width="4" Height="4" Offset="0x6500" />
-        <Texture Name="object_hakugin_obj_Tex_006520" OutName="tex_006520" Format="ci4" Width="64" Height="64" Offset="0x6520" />
-        <Texture Name="object_hakugin_obj_Tex_006D20" OutName="tex_006D20" Format="ci4" Width="64" Height="64" Offset="0x6D20" />
-        <Texture Name="object_hakugin_obj_Tex_007520" OutName="tex_007520" Format="rgba16" Width="32" Height="32" Offset="0x7520" />
-        <Texture Name="object_hakugin_obj_Tex_007D20" OutName="tex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" />
-        <Texture Name="object_hakugin_obj_Tex_008520" OutName="tex_008520" Format="ci4" Width="64" Height="64" Offset="0x8520" />
-        <DList Name="object_hakugin_obj_DL_009270" Offset="0x9270" />
-        <DList Name="object_hakugin_obj_DL_009278" Offset="0x9278" /> <!-- Original name is "i2_H_RASENue_model" -->
-        <DList Name="object_hakugin_obj_DL_009650" Offset="0x9650" />
-        <DList Name="object_hakugin_obj_DL_009658" Offset="0x9658" /> <!-- Original name is "i2_bomH1_model" -->
-        <Collision Name="object_hakugin_obj_Colheader_009768" Offset="0x9768" /> <!-- Original name is "i2_bomH1_bgdatainfo" -->
-        <DList Name="object_hakugin_obj_DL_009830" Offset="0x9830" /> <!-- Original name is "i2_bomH1_sep_model" -->
-        <DList Name="object_hakugin_obj_DL_0099A0" Offset="0x99A0" />
-        <DList Name="object_hakugin_obj_DL_0099A8" Offset="0x99A8" />
-        <Collision Name="object_hakugin_obj_Colheader_009AF0" Offset="0x9AF0" />
-        <Texture Name="object_hakugin_obj_TLUT_009B20" OutName="tlut_009B20" Format="rgba16" Width="4" Height="4" Offset="0x9B20" />
-        <Texture Name="object_hakugin_obj_TLUT_009B40" OutName="tlut_009B40" Format="rgba16" Width="4" Height="4" Offset="0x9B40" />
-        <Texture Name="object_hakugin_obj_Tex_009B60" OutName="tex_009B60" Format="ci4" Width="64" Height="64" Offset="0x9B60" />
-        <Texture Name="object_hakugin_obj_Tex_00A360" OutName="tex_00A360" Format="ci4" Width="64" Height="64" Offset="0xA360" />
-        <DList Name="object_hakugin_obj_DL_00ACB0" Offset="0xACB0" />
-        <DList Name="object_hakugin_obj_DL_00ACB8" Offset="0xACB8" /> <!-- Original name is "i2_elvH1_model" -->
-        <Texture Name="object_hakugin_obj_TLUT_00AE18" OutName="tlut_00AE18" Format="rgba16" Width="4" Height="4" Offset="0xAE18" />
-        <Texture Name="object_hakugin_obj_TLUT_00AE38" OutName="tlut_00AE38" Format="rgba16" Width="4" Height="4" Offset="0xAE38" />
-        <Texture Name="object_hakugin_obj_Tex_00AE58" OutName="tex_00AE58" Format="ci4" Width="64" Height="64" Offset="0xAE58" />
-        <Texture Name="object_hakugin_obj_Tex_00B658" OutName="tex_00B658" Format="ci4" Width="64" Height="64" Offset="0xB658" />
-        <Collision Name="object_hakugin_obj_Colheader_00BF40" Offset="0xBF40" /> <!-- Original name is "i2_elvH1_bgdatainfo" -->
-        <DList Name="object_hakugin_obj_DL_00C1A0" Offset="0xC1A0" />
-        <DList Name="object_hakugin_obj_DL_00C1A8" Offset="0xC1A8" /> <!-- Original name is "i2_icecol1_model" -->
-        <DList Name="object_hakugin_obj_DL_00C560" Offset="0xC560" />
-        <DList Name="object_hakugin_obj_DL_00C568" Offset="0xC568" /> <!-- Original name is "i2_icecol2_model" -->
-        <DList Name="object_hakugin_obj_DL_00CA30" Offset="0xCA30" />
-        <DList Name="object_hakugin_obj_DL_00CA38" Offset="0xCA38" /> <!-- Original name is "i2_icecolA_model" -->
-        <DList Name="object_hakugin_obj_DL_00CEC0" Offset="0xCEC0" />
-        <DList Name="object_hakugin_obj_DL_00CEC8" Offset="0xCEC8" /> <!-- Original name is "i2_icecolB_model" -->
-        <DList Name="object_hakugin_obj_DL_00D090" Offset="0xD090" />
-        <DList Name="object_hakugin_obj_DL_00D098" Offset="0xD098" /> <!-- Original name is "i2_icecolB_sep_model" -->
-        <Collision Name="object_hakugin_obj_Colheader_00D3B0" Offset="0xD3B0" />
-        <Texture Name="object_hakugin_obj_TLUT_00D3E0" OutName="tlut_00D3E0" Format="rgba16" Width="4" Height="4" Offset="0xD3E0" />
-        <!-- <Blob Name="object_hakugin_obj_Blob_00D400" Size="0x40" Offset="0xD400" /> -->
-        <Texture Name="object_hakugin_obj_Tex_00D440" OutName="tex_00D440" Format="rgba16" Width="64" Height="32" Offset="0xD440" />
-        <Texture Name="object_hakugin_obj_Tex_00E440" OutName="tex_00E440" Format="ci4" Width="64" Height="64" Offset="0xE440" />
-        <Texture Name="object_hakugin_obj_Tex_00EC40" OutName="tex_00EC40" Format="i4" Width="64" Height="64" Offset="0xEC40" />
-        <Texture Name="object_hakugin_obj_Tex_00F440" OutName="tex_00F440" Format="i4" Width="64" Height="64" Offset="0xF440" />
-        <Texture Name="object_hakugin_obj_Tex_00FC40" OutName="tex_00FC40" Format="rgba16" Width="32" Height="32" Offset="0xFC40" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hana.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hana.xml
deleted file mode 100644
index 79593345a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hana.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="assets/objects/gameplay_field_keep/"/>
-    <!-- Assets for the orange graveyard flowers -->
-    <File Name="object_hana" Segment="6">
-        <!-- Each of these is a single flower out of the 3 -->
-        <DList Name="gGraveyardFlower1DL" Offset="0x0" />
-        <DList Name="gGraveyardFlower2DL" Offset="0xA0" />
-        <DList Name="gGraveyardFlower3DL" Offset="0x140" />
-
-        <!-- Each of these is a single leaf out of the 5 -->
-        <DList Name="gGraveyardFlowerLeaf1DL" Offset="0x1E0" />
-        <DList Name="gGraveyardFlowerLeaf2DL" Offset="0x280" />
-        <DList Name="gGraveyardFlowerLeaf3DL" Offset="0x320" />
-        <DList Name="gGraveyardFlowerLeaf4DL" Offset="0x3C0" />
-        <DList Name="gGraveyardFlowerLeaf5DL" Offset="0x460" />
-
-        <!-- This DL combines all the other DLs to make the whole object -->
-        <DList Name="gGraveyardFlowersDL" Offset="0x500" /> <!-- Original name is "flower1_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hanareyama_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hanareyama_obj.xml
deleted file mode 100644
index 62cf67540..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hanareyama_obj.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<Root>
-    <File Name="object_hanareyama_obj" Segment="6">
-        <DList Name="object_hanareyama_obj_DL_000000" Offset="0x0" />
-        <DList Name="object_hanareyama_obj_DL_000020" Offset="0x20" />
-        <DList Name="object_hanareyama_obj_DL_000D70" Offset="0xD70" />
-        <DList Name="object_hanareyama_obj_DL_000E30" Offset="0xE30" />
-        <DList Name="object_hanareyama_obj_DL_000EF0" Offset="0xEF0" />
-        <DList Name="object_hanareyama_obj_DL_000FB8" Offset="0xFB8" />
-        <DList Name="object_hanareyama_obj_DL_001078" Offset="0x1078" />
-        <DList Name="object_hanareyama_obj_DL_001138" Offset="0x1138" />
-        <DList Name="object_hanareyama_obj_DL_001200" Offset="0x1200" />
-        <DList Name="object_hanareyama_obj_DL_0012C0" Offset="0x12C0" />
-        <DList Name="object_hanareyama_obj_DL_001380" Offset="0x1380" />
-        <DList Name="object_hanareyama_obj_DL_001448" Offset="0x1448" />
-        <DList Name="object_hanareyama_obj_DL_001508" Offset="0x1508" />
-        <DList Name="object_hanareyama_obj_DL_0015C8" Offset="0x15C8" />
-        <DList Name="object_hanareyama_obj_DL_001690" Offset="0x1690" />
-        <DList Name="object_hanareyama_obj_DL_001750" Offset="0x1750" />
-        <DList Name="object_hanareyama_obj_DL_001810" Offset="0x1810" />
-        <DList Name="object_hanareyama_obj_DL_0018D8" Offset="0x18D8" />
-        <DList Name="object_hanareyama_obj_DL_001998" Offset="0x1998" />
-        <DList Name="object_hanareyama_obj_DL_001A58" Offset="0x1A58" />
-        <DList Name="object_hanareyama_obj_DL_001B20" Offset="0x1B20" />
-        <DList Name="object_hanareyama_obj_DL_001BE0" Offset="0x1BE0" />
-        <DList Name="object_hanareyama_obj_DL_001CA0" Offset="0x1CA0" />
-        <DList Name="object_hanareyama_obj_DL_001D68" Offset="0x1D68" />
-        <DList Name="object_hanareyama_obj_DL_001E28" Offset="0x1E28" />
-        <DList Name="object_hanareyama_obj_DL_001EE8" Offset="0x1EE8" />
-        <DList Name="object_hanareyama_obj_DL_001FB0" Offset="0x1FB0" />
-        <DList Name="object_hanareyama_obj_DL_002070" Offset="0x2070" />
-        <DList Name="object_hanareyama_obj_DL_002130" Offset="0x2130" />
-        <DList Name="object_hanareyama_obj_DL_0021F0" Offset="0x21F0" />
-        <DList Name="object_hanareyama_obj_DL_0022B0" Offset="0x22B0" />
-        <DList Name="object_hanareyama_obj_DL_002370" Offset="0x2370" />
-        <DList Name="object_hanareyama_obj_DL_002430" Offset="0x2430" />
-        <DList Name="object_hanareyama_obj_DL_0024F0" Offset="0x24F0" />
-        <DList Name="object_hanareyama_obj_DL_0025B0" Offset="0x25B0" />
-        <DList Name="object_hanareyama_obj_DL_002670" Offset="0x2670" />
-        <DList Name="object_hanareyama_obj_DL_002730" Offset="0x2730" />
-        <DList Name="object_hanareyama_obj_DL_0027F0" Offset="0x27F0" />
-        <DList Name="object_hanareyama_obj_DL_0028B0" Offset="0x28B0" />
-        <DList Name="object_hanareyama_obj_DL_002970" Offset="0x2970" />
-        <DList Name="object_hanareyama_obj_DL_002A30" Offset="0x2A30" />
-        <DList Name="object_hanareyama_obj_DL_002AF0" Offset="0x2AF0" />
-        <DList Name="object_hanareyama_obj_DL_002BB0" Offset="0x2BB0" />
-        <DList Name="object_hanareyama_obj_DL_002C70" Offset="0x2C70" />
-        <DList Name="object_hanareyama_obj_DL_002D30" Offset="0x2D30" />
-        <DList Name="object_hanareyama_obj_DL_002DF0" Offset="0x2DF0" />
-        <DList Name="object_hanareyama_obj_DL_002EB0" Offset="0x2EB0" />
-        <DList Name="object_hanareyama_obj_DL_002F78" Offset="0x2F78" />
-        <DList Name="object_hanareyama_obj_DL_003038" Offset="0x3038" />
-        <DList Name="object_hanareyama_obj_DL_0030F8" Offset="0x30F8" />
-        <DList Name="object_hanareyama_obj_DL_0031B8" Offset="0x31B8" />
-        <DList Name="object_hanareyama_obj_DL_003278" Offset="0x3278" />
-        <DList Name="object_hanareyama_obj_DL_003338" Offset="0x3338" />
-        <DList Name="object_hanareyama_obj_DL_0033F8" Offset="0x33F8" />
-        <DList Name="object_hanareyama_obj_DL_0034B8" Offset="0x34B8" />
-        <DList Name="object_hanareyama_obj_DL_003578" Offset="0x3578" />
-        <Texture Name="object_hanareyama_obj_Tex_003638" OutName="tex_003638" Format="i4" Width="64" Height="64" Offset="0x3638" />
-        <Texture Name="object_hanareyama_obj_Tex_003E38" OutName="tex_003E38" Format="rgba16" Width="32" Height="32" Offset="0x3E38" />
-        <Array Name="object_hanareyama_obj_DLArray_004638" Count="54" Offset="0x4638">
-            <Pointer Type="Gfx"/>
-        </Array>
-        <Array Name="object_hanareyama_obj_Vec_004710" Count="54" Offset="0x4710">
-            <Vector Type="s16" Dimensions="3" />
-        </Array>
-        <Collision Name="object_hanareyama_obj_Colheader_004D8C" Offset="0x4D8C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_harfgibud.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_harfgibud.xml
deleted file mode 100644
index 437e3b70d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_harfgibud.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<Root>
-    <!-- Object for the Pamela's father, both human and gibdo form-->
-    <File Name="object_harfgibud" Segment="6">
-
-        <!-- Gibdo Form -->
-        <Animation Name="gPamelasFatherLeanForwardAnim" Offset="0x370" /> <!-- Original name is "hg_garuru" -->
-        <Animation Name="gPamelasFatherReachForwardAnim" Offset="0x1138" /> <!-- Original name is "hg_garuru_loop" -->
-        <Animation Name="gPamelasFatherCurlUpAnim" Offset="0x15D4" /> <!-- Original name is "hg_kurusimu" -->
-        <Animation Name="gPamelasFatherCrouchedPanicAnim" Offset="0x1960" /> <!-- Original name is "hg_kurusimu_loop" -->
-        <Animation Name="gPamelasFatherIdleAnim" Offset="0x260C" /> <!-- Original name is "hg_wait" -->
-
-        <DList Name="gPamelasFatherGibdoPelvisDL" Offset="0x5790" />
-        <DList Name="gPamelasFatherGibdoRightFootDL" Offset="0x5878" />
-        <DList Name="gPamelasFatherGibdoRightLegDL" Offset="0x5978" />
-        <DList Name="gPamelasFatherGibdoRightThighDL" Offset="0x5A60" />
-        <DList Name="gPamelasFatherGibdoLeftFootDL" Offset="0x5B50" />
-        <DList Name="gPamelasFatherGibdoLeftLegDL" Offset="0x5C50" />
-        <DList Name="gPamelasFatherGibdoLeftThighDL" Offset="0x5D38" />
-        <DList Name="gPamelasFatherGibdoEyebrowsDL" Offset="0x5E28" />
-        <DList Name="gPamelasFatherGibdoHeadDL" Offset="0x5ED0" />
-        <DList Name="gPamelasFatherGibdoChestDL" Offset="0x65B0" />
-        <DList Name="gPamelasFatherGibdoRightHandDL" Offset="0x67C8" />
-        <DList Name="gPamelasFatherGibdoRightForearmDL" Offset="0x6988" />
-        <DList Name="gPamelasFatherGibdoRightUpperArmDL" Offset="0x6B80" />
-        <DList Name="gPamelasFatherGibdoLeftHandDL" Offset="0x6C80" />
-        <DList Name="gPamelasFatherGibdoLeftForearmDL" Offset="0x6DB8" />
-        <DList Name="gPamelasFatherGibdoLeftUpperArmDL" Offset="0x6EA0" />
-        <DList Name="gPamelasFatherGibdoAbdomenDL" Offset="0x6F98" />
-
-        <Texture Name="gPamelasFatherGibdoTLUT" OutName="pamelas_father_gibdo__tlut" Format="rgba16" Width="16" Height="16" Offset="0x70A0" />
-        <Texture Name="gPamelasFatherGibdoBandageWrappingsTex" OutName="gibdo_bandage_wrappings" Format="i8" Width="64" Height="32" Offset="0x72A0" />
-        <Texture Name="gPamelasFatherGibdoSkinGradientTex" OutName="gibdo_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x7AA0" />
-        <Texture Name="gPamelasFatherGibdoSideHairTex" OutName="gibdo_side_hair" Format="ci8" Width="8" Height="16" Offset="0x7AE0" />
-        <Texture Name="gPamelasFatherGibdoEarTex" OutName="gibdo_ear" Format="ci8" Width="8" Height="8" Offset="0x7B60" />
-        <Texture Name="gPamelasFatherGibdoLipTex" OutName="gibdo_lip" Format="ci8" Width="8" Height="8" Offset="0x7BA0" />
-        <Texture Name="gPamelasFatherGibdoBloodshotEyeTex" OutName="gibdo_bloodshot_eye" Format="ci8" Width="32" Height="32" Offset="0x7BE0" />
-        <Texture Name="gPamelasFatherGibdoHairTex" OutName="gibdo_hair" Format="ci8" Width="16" Height="16" Offset="0x7FE0" />
-        <Texture Name="gPamelasFatherGibdoEyebrowTex" OutName="gibdo_eyebrow" Format="rgba16" Width="16" Height="16" Offset="0x80E0" />
-        <Texture Name="gPamelasFatherGibdoLabCoatSleeveTex" OutName="gibdo_lab_coat_sleeve" Format="i8" Width="8" Height="8" Offset="0x82E0" />
-        <Texture Name="gPamelasFatherGibdoShirtPieceTex" OutName="gibdo_shirt_piece" Format="rgba16" Width="8" Height="8" Offset="0x8320" />
-        <Texture Name="gPamelasFatherGibdoFingernailTex" OutName="gibdo_fingernail" Format="ci8" Width="16" Height="8" Offset="0x83A0" />
-        <Texture Name="gPamelasFatherGibdoLabCoatCuffTex" OutName="gibdo_lab_coat_cuff" Format="i8" Width="8" Height="8" Offset="0x8420" />
-
-        <Limb Name="gPamelasFatherGibdoRootLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_ROOT" Offset="0x8460" />
-        <Limb Name="gPamelasFatherGibdoAbdomenLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_ABDOMEN" Offset="0x846C" />
-        <Limb Name="gPamelasFatherGibdoChestLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_CHEST" Offset="0x8478" />
-        <Limb Name="gPamelasFatherGibdoLeftUpperArmLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_UPPER_ARM" Offset="0x8484" />
-        <Limb Name="gPamelasFatherGibdoLeftForearmLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_FOREARM" Offset="0x8490" />
-        <Limb Name="gPamelasFatherGibdoLeftHandLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_HAND" Offset="0x849C" />
-        <Limb Name="gPamelasFatherGibdoRightUpperArmLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_UPPER_ARM" Offset="0x84A8" />
-        <Limb Name="gPamelasFatherGibdoRightForearmLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_FOREARM" Offset="0x84B4" />
-        <Limb Name="gPamelasFatherGibdoRightHandLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_HAND" Offset="0x84C0" />
-        <Limb Name="gPamelasFatherGibdoEyebrowsLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_EYEBROWS" Offset="0x84CC" />
-        <Limb Name="gPamelasFatherGibdoHeadLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_HEAD" Offset="0x84D8" />
-        <Limb Name="gPamelasFatherGibdoPelvisLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_PELVIS" Offset="0x84E4" />
-        <Limb Name="gPamelasFatherGibdoLeftThighLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_THIGH" Offset="0x84F0" />
-        <Limb Name="gPamelasFatherGibdoLeftShinLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_SHIN" Offset="0x84FC" />
-        <Limb Name="gPamelasFatherGibdoLeftFootLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_FOOT" Offset="0x8508" />
-        <Limb Name="gPamelasFatherGibdoRightThighLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_THIGH" Offset="0x8514" />
-        <Limb Name="gPamelasFatherGibdoRightShinLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_SHIN" Offset="0x8520" />
-        <Limb Name="gPamelasFatherGibdoRightFootLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_FOOT" Offset="0x852C" />
-        <Skeleton Name="gPamelasFatherGibdoSkel" Type="Flex" LimbType="Standard" LimbNone="PAMELAS_FATHER_GIBDO_LIMB_NONE" LimbMax="PAMELAS_FATHER_GIBDO_LIMB_MAX" EnumName="PamelasFatherGibdoLimb" Offset="0x8580" />
-
-        <Animation Name="gPamelasFatherLurchForwardAnim" Offset="0x9D44" /> <!-- Original name is "hg_walk" -->
-        <Animation Name="gPamelasFatherRecoilFromHitAnim" Offset="0xA164" /> <!-- Original name is "hg_yarare" -->
-        <Animation Name="gPamelasFatherPanicAnim" Offset="0xAE1C" /> <!-- Original name is "hg_yurayura" -->
-        <TextureAnimation Name="gPamelasFatherEyeTexAnim" Offset="0xAE50" />
-        <Animation Name="gPamelasFatherArmsFoldedAnim" Offset="0xB644" /> <!-- Original name is "hgo_wait" -->
-
-        <DList Name="gPamelasFatherHumanPelvisDL" Offset="0xE860" />
-        <DList Name="gPamelasFatherHumanRightFootDL" Offset="0xE9E0" />
-        <DList Name="gPamelasFatherHumanRightShinDL" Offset="0xEB28" />
-        <DList Name="gPamelasFatherHumanRightThighDL" Offset="0xEC48" />
-        <DList Name="gPamelasFatherHumanLeftFootDL" Offset="0xEE50" />
-        <DList Name="gPamelasFatherHumanLeftShinDL" Offset="0xEF98" />
-        <DList Name="gPamelasFatherHumanLeftThighDL" Offset="0xF0B8" />
-        <DList Name="gPamelasFatherHumanEyebrowsDL" Offset="0xF248" />
-        <DList Name="gPamelasFatherHumanHeadDL" Offset="0xF2F0" />
-        <DList Name="gPamelasFatherHumanChestDL" Offset="0xF838" />
-        <DList Name="gPamelasFatherHumanRightHandDL" Offset="0xFAA8" />
-        <DList Name="gPamelasFatherHumanRightForearmDL" Offset="0xFC10" />
-        <DList Name="gPamelasFatherHumanRightUpperArmDL" Offset="0xFE08" />
-        <DList Name="gPamelasFatherHumanLeftHandDL" Offset="0xFF10" />
-        <DList Name="gPamelasFatherHumanLeftForearmDL" Offset="0x10078" />
-        <DList Name="gPamelasFatherHumanLeftUpperArmDL" Offset="0x102B8" />
-        <DList Name="gPamelasFatherHumanAbdomenDL" Offset="0x103C0" />
-
-        <Texture Name="gPamelasFatherHumanTLUT" OutName="human_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10578" />
-        <Texture Name="gPamelasFatherHumanSkinGradientTex" OutName="human_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x10778" />
-        <Texture Name="gPamelasFatherHumanHandTex" OutName="human_hand" Format="ci8" Width="16" Height="16" Offset="0x107B8" />
-        <Texture Name="gPamelasFatherHumanSideHairTex" OutName="human_side_hair" Format="ci8" Width="8" Height="16" Offset="0x108B8" />
-        <Texture Name="gPamelasFatherHumanEarTex" OutName="human_ear" Format="ci8" Width="8" Height="8" Offset="0x10938" />
-        <Texture Name="gPamelasFatherHumanBeltTex" OutName="human_belt" Format="ci8" Width="32" Height="16" Offset="0x10978" />
-        <Texture Name="gPamelasFatherHumanLipTex" OutName="human_lip" Format="ci8" Width="8" Height="8" Offset="0x10B78" />
-        <Texture Name="gPamelasFatherHumanShirtTex" OutName="human_shirt" Format="rgba16" Width="8" Height="16" Offset="0x10BB8" />
-        <Texture Name="gPamelasFatherHumanEyebrowTex" OutName="human_eyebrow" Format="rgba16" Width="16" Height="16" Offset="0x10CB8" />
-        <Texture Name="gPamelasFatherHumanLabCoatTex" OutName="human_lab_coat" Format="i8" Width="8" Height="8" Offset="0x10EB8" />
-        <Texture Name="gPamelasFatherHumanSockTex" OutName="human_sock" Format="rgba16" Width="16" Height="16" Offset="0x10EF8" />
-        <Texture Name="gPamelasFatherHumanLabCoatCuffTex" OutName="human_lab_coat_cuff" Format="i8" Width="8" Height="8" Offset="0x110F8" />
-        <Texture Name="gPamelasFatherHumanEyeOpenTex" OutName="human_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x11138" />
-        <Texture Name="gPamelasFatherHumanEyeHalfTex" OutName="human_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x11938" />
-        <Texture Name="gPamelasFatherHumanEyeClosedTex" OutName="human_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x12138" />
-
-        <Limb Name="gPamelasFatherHumanRootLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_ROOT" Offset="0x12938" />
-        <Limb Name="gPamelasFatherHumanAbdomenLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_ABDOMEN" Offset="0x12944" />
-        <Limb Name="gPamelasFatherHumanChestLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_CHEST" Offset="0x12950" />
-        <Limb Name="gPamelasFatherHumanLeftUpperArmLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_UPPER_ARM" Offset="0x1295C" />
-        <Limb Name="gPamelasFatherHumanLeftForearmLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_FOREARM" Offset="0x12968" />
-        <Limb Name="gPamelasFatherHumanLeftHandLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_HAND" Offset="0x12974" />
-        <Limb Name="gPamelasFatherHumanRightUpperArmLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_UPPER_ARM" Offset="0x12980" />
-        <Limb Name="gPamelasFatherHumanRightForearmLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_FOREARM" Offset="0x1298C" />
-        <Limb Name="gPamelasFatherHumanRightHandLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_HAND" Offset="0x12998" />
-        <Limb Name="gPamelasFatherHumanEyebrowsLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_EYEBROWS" Offset="0x129A4" />
-        <Limb Name="gPamelasFatherHumanHeadLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_HEAD" Offset="0x129B0" />
-        <Limb Name="gPamelasFatherHumanPelvisLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_PELVIS" Offset="0x129BC" />
-        <Limb Name="gPamelasFatherHumanLeftThighLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_THIGH" Offset="0x129C8" />
-        <Limb Name="gPamelasFatherHumanLeftLegLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_SHIN" Offset="0x129D4" />
-        <Limb Name="gPamelasFatherHumanLeftFootLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_FOOT" Offset="0x129E0" />
-        <Limb Name="gPamelasFatherHumanRightThighLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_THIGH" Offset="0x129EC" />
-        <Limb Name="gPamelasFatherHumanRightLegLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_SHIN" Offset="0x129F8" />
-        <Limb Name="gPamelasFatherHumanRightFootLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_FOOT" Offset="0x12A04" />
-        <Skeleton Name="gPamelasFatherHumanSkel" Type="Flex" LimbType="Standard" LimbNone="PAMELAS_FATHER_HUMAN_LIMB_NONE" LimbMax="PAMELAS_FATHER_HUMAN_LIMB_MAX" EnumName="PamelasFatherHumanLimb" Offset="0x12A58" />
-
-        <Animation Name="gPamelasFatherAstonishedAnim" Offset="0x13684" /> <!-- Original name is "ho_bozen_loop" -->
-        <Animation Name="gPamelasFatherReachDownToLiftAnim" Offset="0x14220" /> <!-- Original name is "ho_siawase" -->
-        <Animation Name="gPamelasFatherTossAnim" Offset="0x14A9C" /> <!-- Original name is "ho_siawase_loop" -->
-        <Animation Name="gPamelasFatherKneelDownAndHugAnim" Offset="0x152EC" /> <!-- Original name is "ho_uketome" -->
-        <Animation Name="gPamelasFatherConsoleAnim" Offset="0x15C70" /> <!-- Original name is "ho_uketome_loop" -->
-        <Animation Name="gPamelasFatherConsoleHeadUpAnim" Offset="0x165F0" /> <!-- Original name is "ho_watasiwa" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hariko.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hariko.xml
deleted file mode 100644
index 9af628304..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hariko.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Object for the Clock Town cow statues -->
-    <File Name="object_hariko" Segment="6">
-        <DList Name="gHarikoBodyDL" Offset="0x80" /> <!-- Original name is "hariko_body_model" -->
-        <DList Name="gHarikoFaceDL" Offset="0x110" /> <!-- Original name is "hariko_atamaT_model" -->
-        <Texture Name="gHarikoBodyTex" OutName="hariko_body" Format="rgba16" Width="8" Height="8" Offset="0x1A0" />
-        <Texture Name="gHarikoFaceTex" OutName="hariko_face" Format="rgba16" Width="16" Height="16" Offset="0x220" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hata.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hata.xml
deleted file mode 100644
index cbee285e3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hata.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<Root>
-    <File Name="object_hata" Segment="6">
-        <!-- Flagpole Collision -->
-        <Collision Name="gFlagpoleCol" Offset="0xC0" /> <!-- Original name is "hata_bgdatainfo" -->
-
-        <!-- Flagpole Animation -->
-        <Animation Name="gFlagpoleFlapAnim" Offset="0x444" /> <!-- Original name is "ht_hata" -->
-
-        <!-- Flagpole Textures -->
-        <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole" Format="rgba16" Width="32" Height="32" Offset="0x460" />
-        <Texture Name="gFlagpoleTopTex" OutName="flagpole_top" Format="rgba16" Width="32" Height="32" Offset="0xC60" />
-        <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag" Format="ia8" Width="128" Height="32" Offset="0x1460" />
-
-        <!-- Flagpole DLists -->
-        <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
-        <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
-        <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
-        <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
-        <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
-        <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
-        <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
-        <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
-        <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
-
-        <!-- Flagpole Limbs -->
-        <Limb Name="gFlagpolePoleBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_BASE" Offset="0x2E90" />
-        <Limb Name="gFlagpolePoleLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_POLE" Offset="0x2E9C" />
-        <Limb Name="gFlagpoleFlag1BaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_BASE" Offset="0x2EA8" />
-        <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_END_BASE" Offset="0x2EB4" />
-        <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_MID_BASE" Offset="0x2EC0" />
-        <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_MID_BASE" Offset="0x2ECC" />
-        <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_END_BASE" Offset="0x2ED8" />
-        <Limb Name="gFlagpoleFlag1FlyEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_END" Offset="0x2EE4" />
-        <Limb Name="gFlagpoleFlag1FlyMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_MID" Offset="0x2EF0" />
-        <Limb Name="gFlagpoleFlag1HoistMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_MID" Offset="0x2EFC" />
-        <Limb Name="gFlagpoleFlag1HoistEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_END" Offset="0x2F08" />
-        <Limb Name="gFlagpoleFlag2BaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_BASE" Offset="0x2F14" />
-        <Limb Name="gFlagpoleFlag2HoistEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_END_BASE" Offset="0x2F20" />
-        <Limb Name="gFlagpoleFlag2HoistMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_MID_BASE" Offset="0x2F2C" />
-        <Limb Name="gFlagpoleFlag2FlyMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_MID_BASE" Offset="0x2F38" />
-        <Limb Name="gFlagpoleFlag2FlyEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_END_BASE" Offset="0x2F44" />
-        <Limb Name="gFlagpoleFlag2FlyEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_END" Offset="0x2F50" />
-        <Limb Name="gFlagpoleFlag2FlyMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_MID" Offset="0x2F5C" />
-        <Limb Name="gFlagpoleFlag2HoistMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_MID" Offset="0x2F68" />
-        <Limb Name="gFlagpoleFlag2HoistEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_END" Offset="0x2F74" />
-
-        <!-- Flagpole Skeleton -->
-        <Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" LimbNone="FLAGPOLE_LIMB_NONE" LimbMax="FLAGPOLE_LIMB_MAX" EnumName="FlagpoleLimb" Offset="0x2FD0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hgdoor.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hgdoor.xml
deleted file mode 100644
index 8a0bb4c70..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hgdoor.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_hgdoor" Segment="6">
-        <Texture Name="object_hgdoor_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="32" Offset="0x0" />
-        <Texture Name="object_hgdoor_Tex_000400" OutName="tex_000400" Format="rgba16" Width="32" Height="64" Offset="0x400" />
-        <Texture Name="object_hgdoor_Tex_001400" OutName="tex_001400" Format="i8" Width="8" Height="32" Offset="0x1400" />
-        <DList Name="object_hgdoor_DL_001670" Offset="0x1670" /> <!-- Original name is "tobira_left_model" -->
-        <DList Name="object_hgdoor_DL_001768" Offset="0x1768" /> <!-- Original name is "huda_l_model" -->
-        <Collision Name="object_hgdoor_Colheader_0018C0" Offset="0x18C0" /> <!-- Original name is "z2_music_box_house_t_l_bgdatainfo" -->
-        <DList Name="object_hgdoor_DL_001AB0" Offset="0x1AB0" /> <!-- Original name is "tobira_right_model" -->
-        <DList Name="object_hgdoor_DL_001BA8" Offset="0x1BA8" /> <!-- Original name is "huda_r_model" -->
-        <Collision Name="object_hgdoor_Colheader_001D10" Offset="0x1D10" /> <!-- Original name is "z2_music_box_house_t_r_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hintnuts.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hintnuts.xml
deleted file mode 100644
index 99ea55d87..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hintnuts.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-    <File Name="object_hintnuts" Segment="6">
-        <Animation Name="object_hintnuts_Anim_000168" Offset="0x168" /> <!-- Original name is "dnh_atack" -->
-        <DList Name="object_hintnuts_DL_000B30" Offset="0xB30" />
-        <DList Name="object_hintnuts_DL_000C68" Offset="0xC68" />
-        <DList Name="object_hintnuts_DL_000D10" Offset="0xD10" />
-        <DList Name="object_hintnuts_DL_000E28" Offset="0xE28" />
-        <DList Name="object_hintnuts_DL_000EC8" Offset="0xEC8" />
-        <DList Name="object_hintnuts_DL_000F78" Offset="0xF78" />
-        <DList Name="object_hintnuts_DL_001028" Offset="0x1028" />
-        <DList Name="object_hintnuts_DL_0010C8" Offset="0x10C8" />
-        <DList Name="object_hintnuts_DL_001208" Offset="0x1208" />
-        <DList Name="object_hintnuts_DL_0012F0" Offset="0x12F0" /> <!-- Original name is "dnh_ball_model" -->
-        <DList Name="object_hintnuts_DL_0014E0" Offset="0x14E0" />
-        <Texture Name="object_hintnuts_Tex_0015A8" OutName="tex_0015A8" Format="rgba16" Width="32" Height="32" Offset="0x15A8" />
-        <Texture Name="object_hintnuts_Tex_001DA8" OutName="tex_001DA8" Format="rgba16" Width="16" Height="16" Offset="0x1DA8" />
-        <Texture Name="object_hintnuts_Tex_001FA8" OutName="tex_001FA8" Format="rgba16" Width="8" Height="8" Offset="0x1FA8" />
-        <Texture Name="object_hintnuts_Tex_002028" OutName="tex_002028" Format="rgba16" Width="8" Height="8" Offset="0x2028" />
-        <Texture Name="object_hintnuts_Tex_0020A8" OutName="tex_0020A8" Format="rgba16" Width="8" Height="8" Offset="0x20A8" />
-        <Texture Name="object_hintnuts_Tex_002128" OutName="tex_002128" Format="rgba16" Width="16" Height="16" Offset="0x2128" />
-        <Limb Name="object_hintnuts_Standardlimb_002328" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_01" Offset="0x2328" />
-        <Limb Name="object_hintnuts_Standardlimb_002334" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_02" Offset="0x2334" />
-        <Limb Name="object_hintnuts_Standardlimb_002340" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_03" Offset="0x2340" />
-        <Limb Name="object_hintnuts_Standardlimb_00234C" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_04" Offset="0x234C" />
-        <Limb Name="object_hintnuts_Standardlimb_002358" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_05" Offset="0x2358" />
-        <Limb Name="object_hintnuts_Standardlimb_002364" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_06" Offset="0x2364" />
-        <Limb Name="object_hintnuts_Standardlimb_002370" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_07" Offset="0x2370" />
-        <Limb Name="object_hintnuts_Standardlimb_00237C" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_08" Offset="0x237C" />
-        <Limb Name="object_hintnuts_Standardlimb_002388" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_09" Offset="0x2388" />
-        <Skeleton Name="object_hintnuts_Skel_0023B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HINTNUTS_LIMB_NONE" LimbMax="OBJECT_HINTNUTS_LIMB_MAX" EnumName="ObjectHintnutsLimb" Offset="0x23B8" />
-        <Animation Name="object_hintnuts_Anim_0024CC" Offset="0x24CC" /> <!-- Original name is "dnh_dig" -->
-        <Animation Name="object_hintnuts_Anim_0026C4" Offset="0x26C4" /> <!-- Original name is "dnh_jump" -->
-        <Animation Name="object_hintnuts_Anim_002894" Offset="0x2894" /> <!-- Original name is "dnh_lookaround" -->
-        <Animation Name="object_hintnuts_Anim_0029BC" Offset="0x29BC" /> <!-- Original name is "dnh_mahi" -->
-        <Animation Name="object_hintnuts_Anim_002B90" Offset="0x2B90" /> <!-- Original name is "dnh_start" -->
-        <Animation Name="object_hintnuts_Anim_002E84" Offset="0x2E84" /> <!-- Original name is "dnh_talk" -->
-        <Animation Name="object_hintnuts_Anim_002F7C" Offset="0x2F7C" /> <!-- Original name is "dnh_wait" -->
-        <Animation Name="object_hintnuts_Anim_003128" Offset="0x3128" /> <!-- Original name is "dnh_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_horse_game_check.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_horse_game_check.xml
deleted file mode 100644
index fd5e2f398..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_horse_game_check.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_horse_game_check" Segment="6">
-        <Texture Name="object_horse_game_check_Tex_000048" OutName="tex_000048" Format="i8" Width="64" Height="64" Offset="0x48" />
-        <DList Name="object_horse_game_check_DL_001048" Offset="0x1048" />
-        <DList Name="object_horse_game_check_DL_0013A0" Offset="0x13A0" />
-        <DList Name="object_horse_game_check_DL_0014B0" Offset="0x14B0" />
-        <Texture Name="object_horse_game_check_Tex_001590" OutName="tex_001590" Format="ia4" Width="64" Height="64" Offset="0x1590" />
-        <Texture Name="object_horse_game_check_Tex_001D90" OutName="tex_001D90" Format="rgba16" Width="32" Height="32" Offset="0x1D90" />
-        <Texture Name="object_horse_game_check_Tex_002590" OutName="tex_002590" Format="i8" Width="64" Height="32" Offset="0x2590" />
-        <Collision Name="object_horse_game_check_Colheader_002FB8" Offset="0x2FB8" />
-        <DList Name="object_horse_game_check_DL_003030" Offset="0x3030" /> <!-- Original name is "z2_umajamp_modelT" -->
-        <DList Name="object_horse_game_check_DL_0030C0" Offset="0x30C0" />
-        <Texture Name="object_horse_game_check_Tex_0030C8" OutName="tex_0030C8" Format="rgba16" Width="32" Height="32" Offset="0x30C8" />
-        <Collision Name="object_horse_game_check_Colheader_003918" Offset="0x3918" /> <!-- Original name is "z2_umajamp_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_horse_link_child.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_horse_link_child.xml
deleted file mode 100644
index 535ea1d86..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_horse_link_child.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<Root>
-    <!-- Epona -->
-    <File Name="object_horse_link_child" Segment="6">
-        <DList Name="object_horse_link_child_DL_000C70" Offset="0xC70" />
-        <DList Name="object_horse_link_child_DL_001028" Offset="0x1028" />
-        <DList Name="object_horse_link_child_DL_0010D8" Offset="0x10D8" />
-        <DList Name="object_horse_link_child_DL_0011E8" Offset="0x11E8" />
-        <DList Name="object_horse_link_child_DL_001298" Offset="0x1298" />
-        <DList Name="object_horse_link_child_DL_0013A8" Offset="0x13A8" />
-        <DList Name="object_horse_link_child_DL_0014B8" Offset="0x14B8" />
-        <DList Name="object_horse_link_child_DL_001568" Offset="0x1568" />
-        <DList Name="object_horse_link_child_DL_001678" Offset="0x1678" />
-
-        <Texture Name="gEponaTLUT" OutName="epona_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728" />
-
-        <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728" />
-        <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728" />
-        <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728" />
-
-        <Texture Name="object_horse_link_child_Tex_001F28" OutName="tex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" />
-        <Texture Name="object_horse_link_child_Tex_001F68" OutName="tex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" />
-        <Texture Name="object_horse_link_child_Tex_002168" OutName="tex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" />
-        <Texture Name="object_horse_link_child_Tex_002368" OutName="tex_002368" Format="rgba16" Width="16" Height="16" Offset="0x2368" />
-        <Texture Name="object_horse_link_child_Tex_002568" OutName="tex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" />
-        <Texture Name="object_horse_link_child_Tex_002588" OutName="tex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" />
-        <Texture Name="object_horse_link_child_Tex_002788" OutName="tex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" />
-
-        <Animation Name="gEponaGallopAnim" Offset="0x2F98" /> <!-- Original name is "hlc_anim_fastrun_30" -->
-        <Animation Name="object_horse_link_child_Anim_0035B0" Offset="0x35B0" /> <!-- Original name is "hlc_anim_jump100" -->
-        <Animation Name="object_horse_link_child_Anim_003D38" Offset="0x3D38" /> <!-- Original name is "hlc_anim_jump200" -->
-        <Animation Name="gEponaTrotAnim" Offset="0x43AC" /> <!-- Original name is "hlc_anim_slowrun_30" -->
-        <Animation Name="object_horse_link_child_Anim_004DE8" Offset="0x4DE8" /> <!-- Original name is "hlc_anim_stand" -->
-        <Animation Name="object_horse_link_child_Anim_005F64" Offset="0x5F64" /> <!-- Original name is "hlc_anim_stop" -->
-        <Animation Name="gEponaIdleAnim" Offset="0x6D44" /> <!-- Original name is "hlc_anim_wait" -->
-        <Animation Name="gEponaWhinnyAnim" Offset="0x7468" /> <!-- Original name is "hlc_anim_wait02" -->
-        <Animation Name="gEponaWalkAnim" Offset="0x7D50" /> <!-- Original name is "hlc_anim_walk_30" -->
-
-        <!-- <Blob Name="object_horse_link_child_Blob_007D60" Size="0x2388" Offset="0x7D60" /> -->
-
-        <!-- z64Utils will not render because of skin type skeleton -->
-        <Limb Name="object_horse_link_child_Skinlimb_00A0E8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_01" Offset="0xA0E8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A0F8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_02" Offset="0xA0F8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A108" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_03" Offset="0xA108" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A118" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_04" Offset="0xA118" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A128" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_05" Offset="0xA128" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A138" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_06" Offset="0xA138" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A148" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_07" Offset="0xA148" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A158" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_08" Offset="0xA158" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A168" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_09" Offset="0xA168" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A178" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0A" Offset="0xA178" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A188" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0B" Offset="0xA188" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A198" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0C" Offset="0xA198" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1A8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0D" Offset="0xA1A8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1B8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0E" Offset="0xA1B8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1C8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0F" Offset="0xA1C8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1D8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_10" Offset="0xA1D8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1E8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_11" Offset="0xA1E8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1F8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_12" Offset="0xA1F8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A208" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_13" Offset="0xA208" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A218" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_14" Offset="0xA218" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A228" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_15" Offset="0xA228" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A238" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_16" Offset="0xA238" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A248" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_17" Offset="0xA248" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A258" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_18" Offset="0xA258" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A268" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_19" Offset="0xA268" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A278" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1A" Offset="0xA278" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A288" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1B" Offset="0xA288" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A298" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1C" Offset="0xA298" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2A8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1D" Offset="0xA2A8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2B8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1E" Offset="0xA2B8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2C8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1F" Offset="0xA2C8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2D8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_20" Offset="0xA2D8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2E8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_21" Offset="0xA2E8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2F8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_22" Offset="0xA2F8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A308" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_23" Offset="0xA308" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A318" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_24" Offset="0xA318" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A328" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_25" Offset="0xA328" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A338" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_26" Offset="0xA338" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A348" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_27" Offset="0xA348" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A358" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_28" Offset="0xA358" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A368" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_29" Offset="0xA368" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A378" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2A" Offset="0xA378" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A388" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2B" Offset="0xA388" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A398" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2C" Offset="0xA398" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A3A8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2D" Offset="0xA3A8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A3B8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2E" Offset="0xA3B8" />
-        <Skeleton Name="gEponaSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_HORSE_LINK_CHILD_LIMB_NONE" LimbMax="OBJECT_HORSE_LINK_CHILD_LIMB_MAX" EnumName="ObjectHorseLinkChildLimb" Offset="0xA480" />
-
-        <Animation Name="object_horse_link_child_Anim_00A8DC" Offset="0xA8DC" /> <!-- Original name is "hlc_inanaki" -->
-        <Animation Name="object_horse_link_child_Anim_00AD08" Offset="0xAD08" /> <!-- Original name is "hlc_inanaki_modori" -->
-        <Animation Name="object_horse_link_child_Anim_00B3E0" Offset="0xB3E0" /> <!-- Original name is "hlc_inanaki_wait" -->
-        <Animation Name="object_horse_link_child_Anim_00BDE0" Offset="0xBDE0" /> <!-- Original name is "hlc_lost_house2" -->
-        <Animation Name="object_horse_link_child_Anim_00D178" Offset="0xD178" /> <!-- Original name is "hlc_lost_house_inanaki" -->
-        <Animation Name="object_horse_link_child_Anim_00D4E8" Offset="0xD4E8" /> <!-- Original name is "hlc_lost_house_inanaki_run" -->
-
-        <DList Name="object_horse_link_child_DL_00D500" Offset="0xD500" />
-        <!-- skin textures -->
-        <Texture Name="object_horse_link_child_Tex_00DAF0" OutName="tex_00DAF0" Format="rgba16" Width="16" Height="16" Offset="0xDAF0" />
-        <Texture Name="object_horse_link_child_Tex_00DCF0" OutName="tex_00DCF0" Format="rgba16" Width="32" Height="32" Offset="0xDCF0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hs.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hs.xml
deleted file mode 100644
index be333f1dc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hs.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<Root>
-    <!-- Grog: the Cucco keeper, you raise his Cucco chicks into adults to earn the Bunny Hood mask -->
-    <File Name="object_hs" Segment="6">
-        <Animation Name="gHsShiveringAnim" Offset="0x304" /> <!-- Original name is "h_purupuru" (onomatopoeic for "shivering"), unused -->
-        <Animation Name="gHsPleadingAnim" Offset="0x528" /> <!-- Original name is "h_tanomuu" ("to beg"), unused -->
-        <Animation Name="gHsIdleAnim" Offset="0x5C0" /> <!-- Original name is "h_matsu" ("to wait") -->
-        <DList Name="object_hs_DL_003760" Offset="0x3760" />
-        <DList Name="object_hs_DL_003AB0" Offset="0x3AB0" />
-        <DList Name="object_hs_DL_004140" Offset="0x4140" />
-        <DList Name="object_hs_DL_0042A0" Offset="0x42A0" />
-        <DList Name="object_hs_DL_004380" Offset="0x4380" />
-        <DList Name="object_hs_DL_004728" Offset="0x4728" />
-        <DList Name="object_hs_DL_004860" Offset="0x4860" />
-        <DList Name="object_hs_DL_004960" Offset="0x4960" />
-        <DList Name="object_hs_DL_004AB8" Offset="0x4AB8" />
-        <DList Name="object_hs_DL_004BF0" Offset="0x4BF0" />
-        <DList Name="gHsEndDL" Offset="0x4CF0" />
-        <DList Name="object_hs_DL_004CF8" Offset="0x4CF8" />
-        <Texture Name="object_hs_TLUT_004E50" OutName="tlut_004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50" />
-        <Texture Name="gHsRibsTex" OutName="ribs" Format="ci8" Width="16" Height="32" Offset="0x5050" />
-        <Texture Name="gHsEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x5250" />
-        <Texture Name="gHsMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x5290" />
-        <Texture Name="gHsEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x5490" />
-        <Texture Name="gHsPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5890" />
-        <Texture Name="gHsFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x5990" />
-        <Texture Name="gHsBraceletTex" OutName="bracelet" Format="rgba16" Width="4" Height="4" Offset="0x5A90" />
-        <Texture Name="gHsCuccoFeedBagTex" OutName="cucco_feed_bag" Format="ci8" Width="8" Height="8" Offset="0x5AB0" />
-        <Texture Name="gHsChairBoxTex" OutName="chair_box" Format="ci8" Width="32" Height="32" Offset="0x5AF0" />
-        <Texture Name="gHsAbsTex" OutName="abs" Format="ci8" Width="8" Height="16" Offset="0x5EF0" />
-        <Texture Name="gHsBackTex" OutName="back" Format="ci8" Width="16" Height="32" Offset="0x5F70" />
-        <Limb Name="gHsRootLimb" Type="Standard" EnumName="HS_LIMB_ROOT" Offset="0x6170" />
-        <Limb Name="gHsLeftUpperArmLimb" Type="Standard" EnumName="HS_LIMB_LEFT_UPPER_ARM" Offset="0x617C" />
-        <Limb Name="gHsLeftForearmLimb" Type="Standard" EnumName="HS_LIMB_LEFT_FOREARM" Offset="0x6188" />
-        <Limb Name="gHsLeftHandLimb" Type="Standard" EnumName="HS_LIMB_LEFT_HAND" Offset="0x6194" />
-        <Limb Name="gHsRightUpperArmLimb" Type="Standard" EnumName="HS_LIMB_RIGHT_UPPER_ARM" Offset="0x61A0" />
-        <Limb Name="gHsRightForearmLimb" Type="Standard" EnumName="HS_LIMB_RIGHT_FOREARM" Offset="0x61AC" />
-        <Limb Name="gHsRightHandLimb" Type="Standard" EnumName="HS_LIMB_RIGHT_HAND" Offset="0x61B8" />
-        <Limb Name="gHsHeadRootLimb" Type="Standard" EnumName="HS_LIMB_HEAD_ROOT" Offset="0x61C4" />
-        <Limb Name="gHsHeadLimb" Type="Standard" EnumName="HS_LIMB_HEAD" Offset="0x61D0" />
-        <Limb Name="gHsHairSpikesLimb" Type="Standard" EnumName="HS_LIMB_HAIR_SPIKES" Offset="0x61DC" />
-        <!-- this limb is nulled in the override limb function -->
-        <Limb Name="gHsHiddenHairLimb" Type="Standard" EnumName="HS_LIMB_HIDDEN_HAIR" Offset="0x61E8" />
-        <!-- both of these use the same display list, which is just an end display list, unfinished content? -->
-        <Limb Name="object_hs_Standardlimb_0061F4" Type="Standard" EnumName="OBJECT_HS_LIMB_0C" Offset="0x61F4" />
-        <Limb Name="object_hs_Standardlimb_006200" Type="Standard" EnumName="OBJECT_HS_LIMB_0D" Offset="0x6200" />
-        <!-- shoulders down to toes plus box hes sitting on -->
-        <Limb Name="gHsChestAndLowerBodyPlusBoxLimb" Type="Standard" EnumName="HS_LIMB_LOWER_BODY_PLUS_BOX" Offset="0x620C" />
-        <Limb Name="gHsCuccoFeedBagsLimb" Type="Standard" EnumName="HS_LIMB_CUCCO_FEED_BAGS" Offset="0x6218" />
-        <Skeleton Name="gHsSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HS_LIMB_NONE" LimbMax="OBJECT_HS_LIMB_MAX" EnumName="ObjectHsLimb" Offset="0x6260" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hsstump.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hsstump.xml
deleted file mode 100644
index f8e466603..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hsstump.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_hsstump" Segment="6">
-        <DList Name="object_hsstump_DL_0003B0" Offset="0x3B0" />
-        <DList Name="object_hsstump_DL_0003B8" Offset="0x3B8" /> <!-- Original name is "z2_miki_model" -->
-        <Texture Name="object_hsstump_Tex_0005A0" OutName="tex_0005A0" Format="rgba16" Width="16" Height="16" Offset="0x5A0" />
-        <Texture Name="object_hsstump_TLUT_0007A0" OutName="tlut_0007A0" Format="rgba16" Width="4" Height="4" Offset="0x7A0" />
-        <Texture Name="object_hsstump_Tex_0007C0" OutName="tex_0007C0" Format="ci4" Width="64" Height="64" Offset="0x7C0" />
-        <Collision Name="object_hsstump_Colheader_0011B0" Offset="0x11B0" /> <!-- Original name is "z2_miki_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hunsui.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hunsui.xml
deleted file mode 100644
index a97f8f094..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_hunsui.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_hunsui" Segment="6">
-        <DList Name="object_hunsui_DL_000220" Offset="0x220" /> <!-- Original name might be "m2_SEAhunsui_4_modelT" -->
-        <Texture Name="object_hunsui_Tex_0003E0" OutName="tex_0003E0" Format="rgba16" Width="32" Height="32" Offset="0x3E0" />
-        <TextureAnimation Name="object_hunsui_Matanimheader_000BF0" Offset="0xBF0" />
-        <Collision Name="object_hunsui_Colheader_000C74" Offset="0xC74" /> <!-- Original name might be "m2_SEAhunsui_4_bgdatainfo" -->
-        <DList Name="object_hunsui_DL_000EC0" Offset="0xEC0" /> <!-- Original name might be "m2_SEAhunsui20_5_modelT" -->
-        <Texture Name="object_hunsui_Tex_001078" OutName="tex_001078" Format="rgba16" Width="32" Height="32" Offset="0x1078" />
-        <TextureAnimation Name="object_hunsui_Matanimheader_001888" Offset="0x1888" />
-        <Collision Name="object_hunsui_Colheader_00190C" Offset="0x190C" /> <!-- Original name might be "m2_SEAhunsui20_5_bgdatainfo". Unused duplicate of object_hunsui_Colheader_000C74 -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ice_block.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ice_block.xml
deleted file mode 100644
index 4b5cd47d4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ice_block.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="object_ice_block" Segment="6">
-        <!-- IceArrow Freezes ChuChu into a Pushable/Climbable Cube block -->
-        <DList Name="gIceBlockCubeDL" Offset="0x1A0" /> <!-- Original name is "ic_block_modelT" -->
-        <DList Name="gIceBlockCubeEndDL" Offset="0x310" /> <!-- Original name is "ic_block_model" -->
-        <!-- this TexAnim is for the cube surface -->
-        <TextureAnimation Name="gIceBlockCubeSublimatingAirTexAnim" Offset="0x328" />
-        <Collision Name="gIceBlockCol" Offset="0x438" /> <!-- Original name is "ic_block_bgdatainfo" -->
-
-        <!-- IceArrow Freezes Octarock into a floating Iceberg platform -->
-        <DList Name="gIceBlockIceBergDL" Offset="0x7F0" /> <!-- Original name is "ic_blockdai_modelT" -->
-        <DList Name="gIceBlockIceBergEndDL" Offset="0x9B8" /> <!-- Original name is "ic_blockdai_model" -->
-        <!-- this TexAnim is for the iceberg surface -->
-        <TextureAnimation Name="gIceBlockIceBergSublimatingAirTexAnim" Offset="0x9D0" />
-
-        <!-- Shard of Ice thrown off of IceBlock (EffectEnIceBlock) -->
-        <!--   IceArrow creates frozen block or platform, throws shards during growing animation -->
-        <!-- too big to be a snow flake, more like thin block of ice, better described as "Chip", or "Shard" or "Plate" -->
-        <DList Name="gIceBlockShardEffectEndDL" Offset="0xA30" /> <!-- Original name is "ic_kakera_modelT" -->
-        <DList Name="gIceBlockShardEffectDL" Offset="0xA38" /> <!-- Original name is "ic_kakera_model" -->
-
-        <!-- These two appear to be identical (but different hash) -->
-        <!-- first is used in CubeDL and ShardDL -->
-        <Texture Name="gIceBlockIce1Tex" OutName="iceblock_ice_1" Format="i4" Width="64" Height="64" Offset="0xAE0" />
-        <!-- second is used in CubeDL and IceBergDL -->
-        <Texture Name="gIceBlockIce2Tex" OutName="iceblock_ice_2" Format="i4" Width="64" Height="64" Offset="0x12E0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_icefloe.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_icefloe.xml
deleted file mode 100644
index 0440fa4bb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_icefloe.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_icefloe" Segment="6">
-        <DList Name="gIcefloeIcePlatformDL" Offset="0x1E0" /> <!-- Original name is "w_ice_model" -->
-        <Texture Name="gIcefloePlatformTex" OutName="icefloe_iceplatform" Format="rgba16" Width="32" Height="32" Offset="0x2C8" />
-        <Collision Name="gIcefloePlatformCol" Offset="0xC90" /> <!-- Original name is "w_ice_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_icicle.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_icicle.xml
deleted file mode 100644
index d3275aa46..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_icicle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Icicles -->
-    <File Name="object_icicle" Segment="6">
-        <DList Name="gIcicleDL" Offset="0xD0" /> <!-- Original name is "ice_turara_model" -->
-        <Collision Name="gIcicleCol" Offset="0x294" /> <!-- Original name is "ice_turara_bgdatainfo" -->
-        <Texture Name="gIcicleTex" OutName="icicle" Format="i8" Width="64" Height="64" Offset="0x2C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ik.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ik.xml
deleted file mode 100644
index af271f081..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ik.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<Root>
-    <!-- This is the object for the Iron Knuckle Enemy -->
-    <File Name="object_ik" Segment="6">
-        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0xCE8" /> <!-- Original name is "ironknack_attackA" -->
-        <Animation Name="gIronKnuckleRecoverVerticalAttackAnim" Offset="0x15F8" /> <!-- Original name is "ironknack_attackA_end" -->
-        <Animation Name="gIronKnuckleEndVerticalAttackAnim" Offset="0x1ABC" /> <!-- Original name is "ironknack_attackA_hit" -->
-        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x2484" /> <!-- Original name is "ironknack_attackB" -->
-        <Animation Name="gIronKnuckleEndHorizontalAttackAnim" Offset="0x2E7C" /> <!-- Original name is "ironknack_attackB_end" -->
-        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x367C" /> <!-- Original name is "ironknack_back_hit" -->
-        <Animation Name="gIronKnuckleBlockAnim" Offset="0x391C" /> <!-- Original name is "ironknack_defense" -->
-        <Animation Name="gIronKnuckleDeathAnim" Offset="0x4A04" /> <!-- Original name is "ironknack_down" -->
-        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x5254" /> <!-- Original name is "ironknack_front_hit" -->
-        <Animation Name="gIronKnuckleRunAnim" Offset="0x57F4" /> <!-- Original name is "ironknack_run" -->
-        <Animation Name="gIronKnuckleWalkAnim" Offset="0x6294" /> <!-- Original name is "ironknack_walk" -->
-        <Array Name="gObjectIkVtx_0062B0" Count="889" Offset="0x62B0">
-            <Vtx/>
-        </Array>
-        <DList Name="gIronKnuckleArmorFrontDL" Offset="0x9A40" /> <!-- Original name is "ironknack_front_armer" -->
-        <DList Name="gIronKnuckleArmorBackDL" Offset="0x9BC8" /> <!-- Original name is "ironknack_back_armer" -->
-        <DList Name="gIronKnuckleAxeDL" Offset="0x9D20" />
-        <DList Name="gIronKnuckleRightHandDL" Offset="0x9FD8" />
-        <DList Name="gIronKnuckleLowerRightPauldronDL" Offset="0xA130" /> <!-- Original name is "ironknack_Rshoulder_b" -->
-        <DList Name="gIronKnuckleLeftHandDL" Offset="0xA1F0" />
-        <DList Name="gIronKnuckleLowerLeftPauldronDL" Offset="0xA348" /> <!-- Original name is "ironknack_Lshoulder_b" -->
-        <DList Name="gIronKnuckleUpperRightPauldronDL" Offset="0xA408" /> <!-- Original name is "ironknack_Rshoulder" -->
-        <DList Name="gIronKnuckleUpperLeftPauldronDL" Offset="0xA4F0" /> <!-- Original name is "ironknack_Lshoulder" -->
-        <DList Name="gIronKnuckleFrontTorsoArmorMarkingDL" Offset="0xA5D8" />
-        <DList Name="gIronKnuckleRearTorsoArmorMarkingDL" Offset="0xA6D0" />
-        <DList Name="gIronKnuckleRivetsMarking1DL" Offset="0xA780" />
-        <DList Name="gIronKnuckleRivetsMarking2DL" Offset="0xA820" />
-        <DList Name="gIronKnuckleBasMarkingDL" Offset="0xBF80" /> <!-- Original name is "ironknack_head" -->
-        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0xC200" />
-        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0xCF08" />
-        <DList Name="gIronKnuckleTanArmorMaterialDL" Offset="0xD038" />
-        <DList Name="gIronKnuckleBronzeArmorMaterialDL" Offset="0xD050" />
-        <DList Name="gIronKnuckleSilverArmorMaterialDL" Offset="0xD068" />
-        <DList Name="gIronKnuckleBlackArmorMaterialDL" Offset="0xD080" />
-        <DList Name="gIronKnuckleBrownArmorMaterialDL" Offset="0xD098" />
-        <DList Name="gIronKnuckleWhiteArmorMaterialDL" Offset="0xD0B0" />
-        <DList Name="gIronKnuckleGoldArmorMaterialDL" Offset="0xD0C8" />
-        <DList Name="gIronKnuckleTorsoDL" Offset="0xEC20" />
-        <DList Name="gIronKnuckleVambraceLeftDL" Offset="0xEFD8" />
-        <DList Name="gIronKnuckleArmLeftDL" Offset="0xF270" />
-        <DList Name="gIronKnuckleVambraceRightDL" Offset="0xF3F8" />
-        <DList Name="gIronKnuckleArmRightDL" Offset="0xF690" />
-        <DList Name="gIronKnuckleHandDL" Offset="0xF818" />
-        <DList Name="gIronKnuckleWaistDL" Offset="0xF8E0" />
-        <DList Name="gIronKnucklePauldronLeftDL" Offset="0xFC20" />
-        <DList Name="gIronKnuckleBootTipLeftDL" Offset="0xFD68" />
-        <DList Name="gIronKnuckleWaistArmorLeftDL" Offset="0xFFA8" />
-        <DList Name="gIronKnucklePauldronRightDL" Offset="0x10358" />
-        <DList Name="gIronKnuckleBootTipRightDL" Offset="0x104A0" />
-        <DList Name="gIronKnuckleWaistArmorRightDL" Offset="0x106E0" />
-        <Texture Name="gIronKnuckleChainMailTLUT" OutName="iron_knuckle_chain_mail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10A30" />
-        <Texture Name="gIronKnuckleRivet1Tex" OutName="iron_knuckle_rivet_1" Format="ia16" Width="16" Height="16" Offset="0x10C30" />
-        <Texture Name="gIronKnuckleHair1Tex" OutName="iron_knuckle_hair_1" Format="ci8" Width="16" Height="16" Offset="0x10E30" />
-        <Texture Name="gIronKnuckleAxePomelJewel1Tex" OutName="iron_knuckle_axe_pomel_1_jewel" Format="ci8" Width="16" Height="16" Offset="0x10F30" />
-        <!-- Odd size-->
-        <Texture Name="gIronKnuckleAxeTLUT" OutName="iron_knuckle_axe_tlut" Format="rgba16" Width="183" Height="1" Offset="0x11030" />
-        <Texture Name="gIronKnuckleFireTex" OutName="iron_knuckle_fire" Format="i4" Width="32" Height="64" Offset="0x111A0" />
-        <Texture Name="gIronKnuckleRivet2Tex" OutName="iron_knuckle_rivet_2" Format="ia8" Width="32" Height="32" Offset="0x115A0" />
-        <Texture Name="gIronKnuckleBlockPatternTex" OutName="iron_knuckle_block_pattern" Format="rgba16" Width="16" Height="16" Offset="0x119A0" />
-        <Texture Name="gIronKnuckleChainMailTex" OutName="iron_knuckle_chain_mail" Format="rgba16" Width="16" Height="16" Offset="0x11BA0" />
-        <Texture Name="gIronKnuckleArmorEmblemTex" OutName="iron_knuckle_emblem" Format="ia16" Width="32" Height="32" Offset="0x11DA0" />
-        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="iron_knuckle_gerudo_eye" Format="rgba16" Width="32" Height="32" Offset="0x125A0" />
-        <Texture Name="gIronKnuckleChestJewelTex" OutName="iron_knuckle_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x12DA0" />
-        <Texture Name="gIronKnuckleArmorRivet2Tex" OutName="iron_knuckle_armor_rivet_2" Format="ia8" Width="16" Height="16" Offset="0x12EA0" />
-        <!-- Odd size-->
-        <Texture Name="gIronKnuckleArmorTLUT" OutName="iron_knuckle_armor_tlut" Format="rgba16" Width="120" Height="1" Offset="0x12FA0" />
-        <Texture Name="gIronKnuckleForeheadJewelTex" OutName="iron_knuckle_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x13090" />
-        <Texture Name="gIronKnuckleGerudoSkinTex" OutName="iron_knuckle_gerudo_skin" Format="ci8" Width="8" Height="8" Offset="0x13190" />
-        <Texture Name="gIronKnuckleHair2Tex" OutName="iron_knuckle_hair_2" Format="ci8" Width="16" Height="16" Offset="0x131D0" />
-        <Texture Name="gIronKnuckleEarTex" OutName="iron_knuckle_ear" Format="ci8" Width="8" Height="16" Offset="0x132D0" />
-        <Texture Name="gIronKnuckleForeheadDecal1Tex" OutName="iron_knuckle_forehead_decal_1" Format="ci8" Width="8" Height="16" Offset="0x13350" />
-        <Texture Name="gIronKnuckleForeheadDecal2Tex" OutName="iron_knuckle_forehead_decal_2" Format="ci8" Width="16" Height="16" Offset="0x133D0" />
-        <Limb Name="gIronKnuckleRootLimb" Type="Standard" EnumName="IRON_KNUCKLE_LIMB_ROOT" Offset="0x134D0" />
-        <Limb Name="gIronKnuckleTassetCenterLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_CENTER" Type="Standard" Offset="0x134DC" />
-        <Limb Name="gIronKnuckleTassetRightLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_RIGHT" Type="Standard" Offset="0x134E8" />
-        <Limb Name="gIronKnuckleRightLegLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_LEG" Type="Standard" Offset="0x134F4" />
-        <Limb Name="gIronKnuckleRightFootLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_FOOT" Type="Standard" Offset="0x13500" />
-        <Limb Name="gIronKnuckleTassetLeftLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_LEFT" Type="Standard" Offset="0x1350C" />
-        <Limb Name="gIronKnuckleLeftLegLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_LEG" Type="Standard" Offset="0x13518" />
-        <Limb Name="gIronKnuckleLeftFootLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_FOOT" Type="Standard" Offset="0x13524" />
-        <Limb Name="gIronKnuckleUpperBodyRoot" EnumName="IRON_KNUCKLE_LIMB_UPPER_BODY_ROOT" Type="Standard" Offset="0x13530" />
-        <Limb Name="gIronKnuckleUnkRootLimb" EnumName="IRON_KNUCKLE_LIMB_UNK_ROOT" Type="Standard" Offset="0x1353C" />
-        <Limb Name="gIronKnuckleHeadRootLimb" EnumName="IRON_KNUCKLE_LIMB_HEAD_ROOT" Type="Standard" Offset="0x13548" />
-        <Limb Name="gIronKnuckleHelmetArmorLimb" EnumName="IRON_KNUCKLE_LIMB_HELMET_ARMOR" Type="Standard" Offset="0x13554" />
-        <Limb Name="gIronKnuckleHeadLimb" EnumName="IRON_KNUCKLE_LIMB_HEAD" Type="Standard" Offset="0x13560" />
-        <Limb Name="gIronKnuckleRightUpperArmLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_UPPER_ARM" Type="Standard" Offset="0x1356C" />
-        <Limb Name="gIronKnuckleRightForearmLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_FOREARM" Type="Standard" Offset="0x13578" />
-        <Limb Name="gIronKnuckleAxeRootLimb" EnumName="IRON_KNUCKLE_LIMB_AXE_ROOT" Type="Standard" Offset="0x13584" />
-        <Limb Name="gIronKnuckleAxeLimb" EnumName="IRON_KNUCKLE_LIMB_AXE" Type="Standard" Offset="0x13590" />
-        <Limb Name="gIronKnuckleRightHandLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_HAND" Type="Standard" Offset="0x1359C" />
-        <Limb Name="gIronKnuckleLeftUpperArmLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_UPPER_ARM" Type="Standard" Offset="0x135A8" />
-        <Limb Name="gIronKnuckleLeftForearmLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_FOREARM" Type="Standard" Offset="0x135B4" />
-        <Limb Name="gIronKnuckleLeftHandLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_HAND" Type="Standard" Offset="0x135C0" />
-        <Limb Name="gIronKnuckleUpperLeftPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_UPPER_LEFT_PAULDRON" Type="Standard" Offset="0x135CC" />
-        <Limb Name="gIronKnuckleLowerLeftPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_LOWER_LEFT_PAULDRON" Type="Standard" Offset="0x135D8" />
-        <Limb Name="gIronKnuckleUpperRightPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_UPPER_RIGHT_PAULDRON" Type="Standard" Offset="0x135E4" />
-        <Limb Name="gIronKnuckleLowerRightPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_LOWER_RIGHT_PAULDRON" Type="Standard" Offset="0x135F0" />
-        <Limb Name="gIronKnuckleChestArmorFrontLimb" EnumName="IRON_KNUCKLE_LIMB_CHEST_ARMOR_FRONT" Type="Standard" Offset="0x135FC" />
-        <Limb Name="gIronKnuckleChestArmorBackLimb" EnumName="IRON_KNUCKLE_LIMB_CHEST_ARMOR_BACK" Type="Standard" Offset="0x13608" />
-        <Limb Name="gIronKnuckleTorsoLimb" EnumName="IRON_KNUCKLE_LIMB_TORSO" Type="Standard" Offset="0x13614" />
-        <Limb Name="gIronKnuckleWaistLimb" EnumName="IRON_KNUCKLE_LIMB_WAIST" Type="Standard" Offset="0x13620" />
-        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" LimbNone="IRON_KNUCKLE_LIMB_NONE" LimbMax="IRON_KNUCKLE_LIMB_MAX" EnumName="IronKnuckleLimb" Offset="0x136A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ikana_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ikana_obj.xml
deleted file mode 100644
index 0b67e7757..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ikana_obj.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<Root>
-    <File Name="object_ikana_obj" Segment="6">
-        <DList Name="object_ikana_obj_DL_000040" Offset="0x40" /> <!-- Original name is "m2_IKA_BOMBfl_modelT" -->
-        <DList Name="object_ikana_obj_DL_000048" Offset="0x48" /> <!-- Original name is "m2_IKA_BOMBfl_model" -->
-        <Collision Name="object_ikana_obj_Colheader_000128" Offset="0x128" /> <!-- Original name is "m2_IKA_BOMBfl_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_000280" Offset="0x280" /> <!-- Original name is "m2_IKA_BOMBhahen_modelT" -->
-        <DList Name="object_ikana_obj_DL_000288" Offset="0x288" /> <!-- Original name is "m2_IKA_BOMBhahen_model" -->
-        <DList Name="object_ikana_obj_DL_000370" Offset="0x370" /> <!-- Original name is "m2_IKA_BOMBwall_modelT" -->
-        <DList Name="object_ikana_obj_DL_000378" Offset="0x378" /> <!-- Original name is "m2_IKA_BOMBwall_model" -->
-        <Collision Name="object_ikana_obj_Colheader_000488" Offset="0x488" /> <!-- Original name is "m2_IKA_BOMBwall_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_0008C0" Offset="0x8C0" /> <!-- Original name is "m2_IKA_Dalma_modelT" -->
-        <DList Name="gStoneTowerTemplePunchablePillarDL" Offset="0x8C8" /> <!-- Original name is "m2_IKA_Dalma_model" -->
-        <Collision Name="gStoneTowerTemplePunchablePillarCol" Offset="0xC50" /> <!-- Original name is "m2_IKA_Dalma_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_000CE0" Offset="0xCE0" /> <!-- Not present in MM3D, but it was probably named "m2_IKA_KOUSI_modelT" based on the rest of this object. -->
-        <DList Name="object_ikana_obj_DL_000CE8" Offset="0xCE8" /> <!-- Original name is "m2_IKA_KOUSI_model" -->
-        <Collision Name="object_ikana_obj_Colheader_000F28" Offset="0xF28" /> <!-- Original name is "m2_IKA_KOUSI_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_001100" Offset="0x1100" /> <!-- Original name is "m2_IKA_LIGHT_modelT" -->
-        <DList Name="object_ikana_obj_DL_001210" Offset="0x1210" /> <!-- Original name is "m2_IKA_LIGHT_model" -->
-        <TextureAnimation Name="object_ikana_obj_Matanimheader_001228" Offset="0x1228" />
-        <DList Name="gStoneTowerTempleMirrorLightAbsorptionDL" Offset="0x14B0" /> <!-- Original name is "m2_IKA_MRin_modelT" -->
-        <DList Name="object_ikana_obj_DL_001660" Offset="0x1660" /> <!-- Original name is "m2_IKA_MRin_model" -->
-        <TextureAnimation Name="gStoneTowerTempleMirrorLightAbsorptionTexAnim" Offset="0x1678" />
-        <DList Name="gStoneTowerTempleMirrorLightEmissionDL" Offset="0x1880" /> <!-- Original name is "m2_IKA_MRout_modelT" -->
-        <DList Name="object_ikana_obj_DL_001AC0" Offset="0x1AC0" /> <!-- Original name is "m2_IKA_MRout_model" -->
-        <TextureAnimation Name="gStoneTowerTempleMirrorLightEmissionTexAnim" Offset="0x1AD8" />
-        <DList Name="object_ikana_obj_DL_001E10" Offset="0x1E10" /> <!-- Original name is "m2_IKA_Mirror_modelT" -->
-        <DList Name="gStoneTowerTempleMirrorDL" Offset="0x1E18" /> <!-- Original name is "m2_IKA_Mirror_model" -->
-        <Collision Name="gStoneTowerTempleMirrorCol" Offset="0x2358" /> <!-- Original name is "m2_IKA_Mirror_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_004710" Offset="0x4710" /> <!-- Not present in MM3D, but it was probably named "m2_IKA_room05_modelT" based on the rest of this object. -->
-        <DList Name="object_ikana_obj_DL_0048A0" Offset="0x48A0" /> <!-- Original name is "m2_IKA_room05_model" -->
-        <Collision Name="object_ikana_obj_Colheader_006368" Offset="0x6368" /> <!-- Original name is "m2_IKA_room05_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_007360" Offset="0x7360" /> <!-- Not present in MM3D, but it was probably named "m2_IKA_room06_modelT" based on the rest of this object. -->
-        <DList Name="object_ikana_obj_DL_007448" Offset="0x7448" /> <!-- Original name is "m2_IKA_room06_model" -->
-        <TextureAnimation Name="object_ikana_obj_Matanimheader_007B68" Offset="0x7B68" />
-        <Collision Name="object_ikana_obj_Colheader_0084F8" Offset="0x84F8" /> <!-- Original name is "m2_IKA_room06_bgdatainfo" -->
-        <Texture Name="object_ikana_obj_TLUT_008530" OutName="tlut_008530" Format="rgba16" Width="4" Height="4" Offset="0x8530" />
-        <!-- <Blob Name="object_ikana_obj_Blob_008550" Size="0x40" Offset="0x8550" /> -->
-        <Texture Name="object_ikana_obj_TLUT_008590" OutName="tlut_008590" Format="rgba16" Width="4" Height="4" Offset="0x8590" />
-        <Texture Name="object_ikana_obj_Tex_0085B0" OutName="tex_0085B0" Format="rgba16" Width="16" Height="16" Offset="0x85B0" />
-        <Texture Name="object_ikana_obj_Tex_0087B0" OutName="tex_0087B0" Format="ci4" Width="64" Height="64" Offset="0x87B0" />
-        <Texture Name="gStoneTowerTemplePunchablePillarTex" OutName="stone_tower_temple_punchable_pillar" Format="rgba16" Width="32" Height="64" Offset="0x8FB0" />
-        <Texture Name="gStoneTowerTempleMirrorFrameTex" OutName="stone_tower_temple_mirror_frame" Format="rgba16" Width="16" Height="16" Offset="0x9FB0" />
-        <Texture Name="object_ikana_obj_Tex_00A1B0" OutName="tex_00A1B0" Format="rgba16" Width="16" Height="16" Offset="0xA1B0" />
-        <Texture Name="object_ikana_obj_Tex_00A3B0" OutName="tex_00A3B0" Format="rgba16" Width="32" Height="32" Offset="0xA3B0" />
-        <Texture Name="object_ikana_obj_Tex_00ABB0" OutName="tex_00ABB0" Format="rgba16" Width="32" Height="32" Offset="0xABB0" />
-        <Texture Name="object_ikana_obj_Tex_00B3B0" OutName="tex_00B3B0" Format="rgba16" Width="16" Height="16" Offset="0xB3B0" />
-        <Texture Name="object_ikana_obj_Tex_00B5B0" OutName="tex_00B5B0" Format="rgba16" Width="32" Height="32" Offset="0xB5B0" />
-        <Texture Name="object_ikana_obj_Tex_00BDB0" OutName="tex_00BDB0" Format="ci4" Width="16" Height="128" Offset="0xBDB0" />
-        <Texture Name="object_ikana_obj_Tex_00C1B0" OutName="tex_00C1B0" Format="rgba16" Width="16" Height="64" Offset="0xC1B0" />
-        <Texture Name="object_ikana_obj_Tex_00C9B0" OutName="tex_00C9B0" Format="ia8" Width="32" Height="64" Offset="0xC9B0" />
-        <Texture Name="object_ikana_obj_Tex_00D1B0" OutName="tex_00D1B0" Format="rgba16" Width="16" Height="64" Offset="0xD1B0" />
-        <Texture Name="object_ikana_obj_Tex_00D9B0" OutName="tex_00D9B0" Format="rgba16" Width="32" Height="32" Offset="0xD9B0" />
-        <Texture Name="object_ikana_obj_Tex_00E1B0" OutName="tex_00E1B0" Format="ia8" Width="32" Height="64" Offset="0xE1B0" />
-        <Texture Name="gStoneTowerTempleLightRaysTex" OutName="stone_tower_temple_light_rays" Format="ia16" Width="16" Height="64" Offset="0xE9B0" />
-        <Texture Name="gStoneTowerTempleLightPatternTex" OutName="stone_tower_temple_light_pattern" Format="rgba16" Width="32" Height="32" Offset="0xF1B0" />
-        <Texture Name="gStoneTowerTempleMirrorEmissionLightRaysTex" OutName="stone_tower_temple_mirror_emission_light_rays" Format="ia16" Width="16" Height="64" Offset="0xF9B0" />
-        <Texture Name="gStoneTowerTempleMirrorSurfaceTex" OutName="stone_tower_temple_mirror_surface" Format="rgba16" Width="32" Height="32" Offset="0x101B0" />
-        <Texture Name="gStoneTowerEmblemFrameTex" OutName="stone_tower_temple_emblem_frame" Format="ia8" Width="32" Height="64" Offset="0x109B0" />
-        <Texture Name="object_ikana_obj_Tex_0111B0" OutName="tex_0111B0" Format="rgba16" Width="32" Height="32" Offset="0x111B0" />
-        <Texture Name="object_ikana_obj_Tex_0119B0" OutName="tex_0119B0" Format="rgba16" Width="32" Height="32" Offset="0x119B0" />
-        <DList Name="object_ikana_obj_DL_012B70" Offset="0x12B70" /> <!-- Original name is probably "m2_IKA_RASENsita_model" (the model is just a green cube in MM3D) -->
-        <DList Name="object_ikana_obj_DL_013EA0" Offset="0x13EA0" /> <!-- Original name is probably "m2_IKA_RASENue_modelT" (the model is just a green cube in MM3D) -->
-        <DList Name="object_ikana_obj_DL_013EA8" Offset="0x13EA8" /> <!-- Original name is probably "m2_IKA_RASENue_model" (the model is just a green cube in MM3D) -->
-        <DList Name="object_ikana_obj_DL_014A40" Offset="0x14A40" /> <!-- Original name is "m2_IKA_shutter_model" -->
-        <Texture Name="object_ikana_obj_Tex_014BA0" OutName="tex_014BA0" Format="rgba16" Width="32" Height="64" Offset="0x14BA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ikn_demo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ikn_demo.xml
deleted file mode 100644
index bbb803499..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ikn_demo.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<Root>
-    <File Name="object_ikn_demo" Segment="6">
-        <!-- <Blob Name="object_ikn_demo_Blob_000000" Size="0x10" Offset="0x0" /> -->
-        <Animation Name="object_ikn_demo_Anim_0000B8" Offset="0xB8" /> <!-- Original name is "osk_default" -->
-        <DList Name="object_ikn_demo_DL_001D20" Offset="0x1D20" />
-        <DList Name="object_ikn_demo_DL_002128" Offset="0x2128" />
-        <DList Name="object_ikn_demo_DL_002208" Offset="0x2208" />
-        <DList Name="object_ikn_demo_DL_0022D0" Offset="0x22D0" />
-        <DList Name="object_ikn_demo_DL_002420" Offset="0x2420" />
-        <DList Name="object_ikn_demo_DL_0024E0" Offset="0x24E0" />
-        <DList Name="object_ikn_demo_DL_0025B0" Offset="0x25B0" />
-        <DList Name="object_ikn_demo_DL_002670" Offset="0x2670" />
-        <DList Name="object_ikn_demo_DL_002740" Offset="0x2740" />
-        <DList Name="object_ikn_demo_DL_002858" Offset="0x2858" />
-        <DList Name="object_ikn_demo_DL_002970" Offset="0x2970" />
-        <DList Name="object_ikn_demo_DL_0029F8" Offset="0x29F8" />
-        <DList Name="object_ikn_demo_DL_002A80" Offset="0x2A80" />
-        <DList Name="object_ikn_demo_DL_002B08" Offset="0x2B08" />
-        <DList Name="object_ikn_demo_DL_002B90" Offset="0x2B90" />
-        <DList Name="object_ikn_demo_DL_002C68" Offset="0x2C68" />
-        <Texture Name="object_ikn_demo_Tex_002D50" OutName="tex_002D50" Format="rgba16" Width="4" Height="4" Offset="0x2D50" />
-        <Texture Name="object_ikn_demo_Tex_002D70" OutName="tex_002D70" Format="rgba16" Width="8" Height="16" Offset="0x2D70" />
-        <Texture Name="object_ikn_demo_Tex_002E70" OutName="tex_002E70" Format="rgba16" Width="8" Height="16" Offset="0x2E70" />
-        <Texture Name="object_ikn_demo_Tex_002F70" OutName="tex_002F70" Format="rgba16" Width="8" Height="16" Offset="0x2F70" />
-        <Texture Name="object_ikn_demo_Tex_003070" OutName="tex_003070" Format="rgba16" Width="8" Height="8" Offset="0x3070" />
-        <Texture Name="object_ikn_demo_Tex_0030F0" OutName="tex_0030F0" Format="rgba16" Width="16" Height="16" Offset="0x30F0" />
-        <Texture Name="object_ikn_demo_Tex_0032F0" OutName="tex_0032F0" Format="rgba16" Width="16" Height="16" Offset="0x32F0" />
-        <Texture Name="object_ikn_demo_Tex_0034F0" OutName="tex_0034F0" Format="rgba16" Width="16" Height="8" Offset="0x34F0" />
-        <Texture Name="object_ikn_demo_Tex_0035F0" OutName="tex_0035F0" Format="rgba16" Width="16" Height="16" Offset="0x35F0" />
-        <Limb Name="object_ikn_demo_Standardlimb_0037F0" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_01" Offset="0x37F0" />
-        <Limb Name="object_ikn_demo_Standardlimb_0037FC" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_02" Offset="0x37FC" />
-        <Limb Name="object_ikn_demo_Standardlimb_003808" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_03" Offset="0x3808" />
-        <Limb Name="object_ikn_demo_Standardlimb_003814" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_04" Offset="0x3814" />
-        <Limb Name="object_ikn_demo_Standardlimb_003820" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_05" Offset="0x3820" />
-        <Limb Name="object_ikn_demo_Standardlimb_00382C" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_06" Offset="0x382C" />
-        <Limb Name="object_ikn_demo_Standardlimb_003838" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_07" Offset="0x3838" />
-        <Limb Name="object_ikn_demo_Standardlimb_003844" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_08" Offset="0x3844" />
-        <Limb Name="object_ikn_demo_Standardlimb_003850" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_09" Offset="0x3850" />
-        <Limb Name="object_ikn_demo_Standardlimb_00385C" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0A" Offset="0x385C" />
-        <Limb Name="object_ikn_demo_Standardlimb_003868" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0B" Offset="0x3868" />
-        <Limb Name="object_ikn_demo_Standardlimb_003874" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0C" Offset="0x3874" />
-        <Limb Name="object_ikn_demo_Standardlimb_003880" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0D" Offset="0x3880" />
-        <Limb Name="object_ikn_demo_Standardlimb_00388C" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0E" Offset="0x388C" />
-        <Limb Name="object_ikn_demo_Standardlimb_003898" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0F" Offset="0x3898" />
-        <Limb Name="object_ikn_demo_Standardlimb_0038A4" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_10" Offset="0x38A4" />
-        <Skeleton Name="object_ikn_demo_Skel_0038F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_1_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_1_LIMB_MAX" EnumName="ObjectIknDemo1Limb" Offset="0x38F0" />
-        <Animation Name="object_ikn_demo_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "osk_hanasu_loop" -->
-        <Animation Name="object_ikn_demo_Anim_004208" Offset="0x4208" /> <!-- Original name is "osk_hanasu_wait" -->
-        <Animation Name="object_ikn_demo_Anim_004514" Offset="0x4514" /> <!-- Original name is "osk_okoru_loop" -->
-        <Animation Name="object_ikn_demo_Anim_004A58" Offset="0x4A58" /> <!-- Original name is "osk_okoru_wait" -->
-        <Animation Name="object_ikn_demo_Anim_0065D8" Offset="0x65D8" /> <!-- Original name is "osk_utau_loop" -->
-        <Animation Name="object_ikn_demo_Anim_0067B8" Offset="0x67B8" /> <!-- Original name is "sk1_bibiru_loop" -->
-        <Animation Name="object_ikn_demo_Anim_006808" Offset="0x6808" /> <!-- Original name is "sk1_default" -->
-        <DList Name="object_ikn_demo_DL_0072F0" Offset="0x72F0" />
-        <DList Name="object_ikn_demo_DL_007680" Offset="0x7680" />
-        <DList Name="object_ikn_demo_DL_0077B0" Offset="0x77B0" />
-        <DList Name="object_ikn_demo_DL_0078E0" Offset="0x78E0" />
-        <DList Name="object_ikn_demo_DL_007988" Offset="0x7988" />
-        <DList Name="object_ikn_demo_DL_007A38" Offset="0x7A38" />
-        <Limb Name="object_ikn_demo_Standardlimb_007AE8" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_01" Offset="0x7AE8" />
-        <Limb Name="object_ikn_demo_Standardlimb_007AF4" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_02" Offset="0x7AF4" />
-        <Limb Name="object_ikn_demo_Standardlimb_007B00" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_03" Offset="0x7B00" />
-        <Limb Name="object_ikn_demo_Standardlimb_007B0C" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_04" Offset="0x7B0C" />
-        <Limb Name="object_ikn_demo_Standardlimb_007B18" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_05" Offset="0x7B18" />
-        <Limb Name="object_ikn_demo_Standardlimb_007B24" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_06" Offset="0x7B24" />
-        <Skeleton Name="object_ikn_demo_Skel_007B48" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_2_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_2_LIMB_MAX" EnumName="ObjectIknDemo2Limb" Offset="0x7B48" />
-        <Animation Name="object_ikn_demo_Anim_0081A8" Offset="0x81A8" /> <!-- Original name is "sk1_hajikareru" -->
-        <Animation Name="object_ikn_demo_Anim_0083F4" Offset="0x83F4" /> <!-- Original name is "sk1_hajikareru_loop" -->
-        <Animation Name="object_ikn_demo_Anim_008724" Offset="0x8724" /> <!-- Original name is "sk1_hebo" -->
-        <Animation Name="object_ikn_demo_Anim_008AF4" Offset="0x8AF4" /> <!-- Original name is "sk1_hebo_loop" -->
-        <Animation Name="object_ikn_demo_Anim_008CEC" Offset="0x8CEC" /> <!-- Original name is "sk1_odoroku" -->
-        <Animation Name="object_ikn_demo_Anim_008F1C" Offset="0x8F1C" /> <!-- Original name is "sk1_odoroku_loop" -->
-        <Animation Name="object_ikn_demo_Anim_009044" Offset="0x9044" /> <!-- Original name is "sk1_sagaru" -->
-        <Animation Name="object_ikn_demo_Anim_009254" Offset="0x9254" /> <!-- Original name is "sk1_sagaru_loop" -->
-        <Animation Name="object_ikn_demo_Anim_0098E4" Offset="0x98E4" /> <!-- Original name is "sk1_syutugen_loop" -->
-        <Animation Name="object_ikn_demo_Anim_009A44" Offset="0x9A44" /> <!-- Original name is "sk1_warau" -->
-        <Animation Name="object_ikn_demo_Anim_009CC8" Offset="0x9CC8" /> <!-- Original name is "sk1_warau_loop" -->
-        <Animation Name="object_ikn_demo_Anim_009EA8" Offset="0x9EA8" /> <!-- Original name is "sk2_bibiru_loop" -->
-        <Animation Name="object_ikn_demo_Anim_009F00" Offset="0x9F00" /> <!-- Original name is "sk2_default" -->
-        <DList Name="object_ikn_demo_DL_00AB80" Offset="0xAB80" />
-        <DList Name="object_ikn_demo_DL_00AEA0" Offset="0xAEA0" />
-        <DList Name="object_ikn_demo_DL_00B028" Offset="0xB028" />
-        <DList Name="object_ikn_demo_DL_00B1B0" Offset="0xB1B0" />
-        <DList Name="object_ikn_demo_DL_00B258" Offset="0xB258" />
-        <DList Name="object_ikn_demo_DL_00B308" Offset="0xB308" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B430" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_01" Offset="0xB430" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B43C" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_02" Offset="0xB43C" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B448" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_03" Offset="0xB448" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B454" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_04" Offset="0xB454" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B460" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_05" Offset="0xB460" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B46C" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_06" Offset="0xB46C" />
-        <Skeleton Name="object_ikn_demo_Skel_00B490" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_3_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_3_LIMB_MAX" EnumName="ObjectIknDemo3Limb" Offset="0xB490" />
-        <Animation Name="object_ikn_demo_Anim_00B704" Offset="0xB704" /> <!-- Original name is "sk2_hajiku" -->
-        <Animation Name="object_ikn_demo_Anim_00B8C0" Offset="0xB8C0" /> <!-- Original name is "sk2_hajiku_loop" -->
-        <Animation Name="object_ikn_demo_Anim_00B9E4" Offset="0xB9E4" /> <!-- Original name is "sk2_hiku" -->
-        <Animation Name="object_ikn_demo_Anim_00BDB4" Offset="0xBDB4" /> <!-- Original name is "sk2_hiku_loop" -->
-        <Animation Name="object_ikn_demo_Anim_00BF04" Offset="0xBF04" /> <!-- Original name is "sk2_maee" -->
-        <Animation Name="object_ikn_demo_Anim_00C154" Offset="0xC154" /> <!-- Original name is "sk2_maee_loop" -->
-        <Animation Name="object_ikn_demo_Anim_00C2C4" Offset="0xC2C4" /> <!-- Original name is "sk2_muu" -->
-        <Animation Name="object_ikn_demo_Anim_00C59C" Offset="0xC59C" /> <!-- Original name is "sk2_muu_loop" -->
-        <Animation Name="object_ikn_demo_Anim_00C804" Offset="0xC804" /> <!-- Original name is "sk2_nani" -->
-        <Animation Name="object_ikn_demo_Anim_00CA74" Offset="0xCA74" /> <!-- Original name is "sk2_nani_loop" -->
-        <Animation Name="object_ikn_demo_Anim_00CD28" Offset="0xCD28" /> <!-- Original name is "sk2_odoroku" -->
-        <Animation Name="object_ikn_demo_Anim_00D044" Offset="0xD044" /> <!-- Original name is "sk2_odoroku_loop' "-->
-        <Texture Name="object_ikn_demo_Tex_00D060" OutName="tex_00D060" Format="rgba16" Width="8" Height="8" Offset="0xD060" />
-        <!-- <Blob Name="object_ikn_demo_Blob_00D0E0" Size="0x100" Offset="0xD0E0" /> -->
-        <Texture Name="object_ikn_demo_Tex_00D1E0" OutName="tex_00D1E0" Format="rgba16" Width="16" Height="16" Offset="0xD1E0" />
-        <!-- <Blob Name="object_ikn_demo_Blob_00D3E0" Size="0x100" Offset="0xD3E0" /> -->
-        <Texture Name="object_ikn_demo_Tex_00D4E0" OutName="tex_00D4E0" Format="rgba16" Width="4" Height="4" Offset="0xD4E0" />
-        <!-- <Blob Name="object_ikn_demo_Blob_00D500" Size="0x100" Offset="0xD500" /> -->
-        <Texture Name="object_ikn_demo_Tex_00D600" OutName="tex_00D600" Format="rgba16" Width="16" Height="16" Offset="0xD600" />
-        <!-- <Blob Name="object_ikn_demo_Blob_00D800" Size="0x100" Offset="0xD800" /> -->
-        <Texture Name="object_ikn_demo_Tex_00D900" OutName="tex_00D900" Format="rgba16" Width="4" Height="8" Offset="0xD900" />
-        <Texture Name="object_ikn_demo_Tex_00D940" OutName="tex_00D940" Format="rgba16" Width="8" Height="16" Offset="0xD940" />
-        <!-- <Blob Name="object_ikn_demo_Blob_00DA40" Size="0x240" Offset="0xDA40" /> -->
-        <Texture Name="object_ikn_demo_Tex_00DC80" OutName="tex_00DC80" Format="ia8" Width="8" Height="8" Offset="0xDC80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ikninside_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ikninside_obj.xml
deleted file mode 100644
index 26d1e1206..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ikninside_obj.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Root>
-    <File Name="object_ikninside_obj" Segment="6">
-        <DList Name="object_ikninside_obj_DL_000590" Offset="0x590" /> <!-- Original name is "w2_RASENsite_model" -->
-        <DList Name="object_ikninside_obj_DL_000EA0" Offset="0xEA0" /> <!-- Original name is "w2_RASENue_model" -->
-        <Texture Name="object_ikninside_obj_Tex_001120" OutName="tex_001120" Format="rgba16" Width="32" Height="64" Offset="0x1120" />
-        <Texture Name="object_ikninside_obj_Tex_002120" OutName="tex_002120" Format="rgba16" Width="32" Height="64" Offset="0x2120" />
-        <Texture Name="object_ikninside_obj_Tex_003120" OutName="tex_003120" Format="rgba16" Width="32" Height="64" Offset="0x3120" />
-        <DList Name="object_ikninside_obj_DL_004440" Offset="0x4440" /> <!-- Original name is "w2_ikn_marutobira_model" -->
-        <Texture Name="object_ikninside_obj_TLUT_004620" OutName="tlut_004620" Format="rgba16" Width="16" Height="16" Offset="0x4620" />
-        <Texture Name="object_ikninside_obj_Tex_004820" OutName="tex_004820" Format="ci8" Width="32" Height="64" Offset="0x4820" />
-        <Texture Name="object_ikninside_obj_Tex_005020" OutName="tex_005020" Format="ci8" Width="16" Height="32" Offset="0x5020" />
-        <DList Name="object_ikninside_obj_DL_005260" Offset="0x5260" /> <!-- Original name is "w2_ikn_zenetu_model" -->
-        <Texture Name="object_ikninside_obj_Tex_0052F0" OutName="tex_0052F0" Format="ia16" Width="16" Height="64" Offset="0x52F0" />
-        <!-- <Blob Name="object_ikninside_obj_Blob_005AF0" Size="0x220" Offset="0x5AF0" /> -->
-        <Texture Name="object_ikninside_obj_Tex_005D10" OutName="tex_005D10" Format="ia16" Width="32" Height="32" Offset="0x5D10" />
-        <!-- <Blob Name="object_ikninside_obj_Blob_006510" Size="0x20" Offset="0x6510" /> -->
-        <Texture Name="object_ikninside_obj_Tex_006530" OutName="tex_006530" Format="rgba16" Width="32" Height="64" Offset="0x6530" />
-        <Texture Name="object_ikninside_obj_Tex_007530" OutName="tex_007530" Format="rgba16" Width="32" Height="16" Offset="0x7530" />
-        <Texture Name="object_ikninside_obj_Tex_007930" OutName="tex_007930" Format="i4" Width="64" Height="64" Offset="0x7930" />
-        <Texture Name="object_ikninside_obj_Tex_008130" OutName="tex_008130" Format="ia16" Width="16" Height="32" Offset="0x8130" />
-        <Texture Name="object_ikninside_obj_Tex_008530" OutName="tex_008530" Format="rgba16" Width="32" Height="32" Offset="0x8530" />
-        <Texture Name="object_ikninside_obj_Tex_008D30" OutName="tex_008D30" Format="rgba16" Width="32" Height="32" Offset="0x8D30" />
-        <Texture Name="object_ikninside_obj_Tex_009530" OutName="tex_009530" Format="rgba16" Width="16" Height="64" Offset="0x9530" />
-        <Texture Name="object_ikninside_obj_Tex_009D30" OutName="tex_009D30" Format="rgba16" Width="32" Height="32" Offset="0x9D30" />
-        <DList Name="object_ikninside_obj_DL_00A5A0" Offset="0xA5A0" /> <!-- Original name is "w2_ikn_hahen_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00A5A8" Offset="0xA5A8" /> <!-- Original name is "w2_ikn_hahen_model" -->
-        <DList Name="object_ikninside_obj_DL_00A740" Offset="0xA740" /> <!-- Original name is "w2_ikn_hahen2_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00A748" Offset="0xA748" /> <!-- Original name is "w2_ikn_hahen2_model" -->
-        <DList Name="object_ikninside_obj_DL_00AB10" Offset="0xAB10" /> <!-- Original name is "w2_ikn_hikari_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00AD50" Offset="0xAD50" /> <!-- Original name is "w2_ikn_hikari_model" -->
-        <DList Name="object_ikninside_obj_DL_00AEC0" Offset="0xAEC0" /> <!-- Original name is "w2_ikn_hikari2_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00B0A8" Offset="0xB0A8" /> <!-- Original name is "w2_ikn_hikari2_model" -->
-        <Texture Name="object_ikninside_obj_Tex_00B0B0" OutName="tex_00B0B0" Format="ia16" Width="32" Height="32" Offset="0xB0B0" />
-        <Texture Name="object_ikninside_obj_Tex_00B8B0" OutName="tex_00B8B0" Format="ia16" Width="16" Height="32" Offset="0xB8B0" />
-        <TextureAnimation Name="object_ikninside_obj_Matanimheader_00BCB8" Offset="0xBCB8" />
-        <TextureAnimation Name="object_ikninside_obj_Matanimheader_00BCC8" Offset="0xBCC8" />
-        <DList Name="object_ikninside_obj_DL_00C300" Offset="0xC300" /> <!-- Original name is "w2_ikn_turitenjo_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00C308" Offset="0xC308" /> <!-- Original name is "w2_ikn_turitenjo_model" -->
-        <TextureAnimation Name="object_ikninside_obj_Matanimheader_00C670" Offset="0xC670" />
-        <Collision Name="object_ikninside_obj_Colheader_00CBAC" Offset="0xCBAC" /> <!-- Original name is "w2_ikn_turitenjo_bgdatainfo" -->
-        <DList Name="object_ikninside_obj_DL_00CC70" Offset="0xCC70" /> <!-- Original name is "w2_ikn_yuka_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00CC78" Offset="0xCC78" /> <!-- Original name is "w2_ikn_yuka_model" -->
-        <Texture Name="object_ikninside_obj_Tex_00CD60" OutName="tex_00CD60" Format="rgba16" Width="16" Height="64" Offset="0xCD60" />
-        <Texture Name="object_ikninside_obj_Tex_00D560" OutName="tex_00D560" Format="i4" Width="64" Height="64" Offset="0xD560" />
-        <TextureAnimation Name="object_ikninside_obj_Matanimheader_00DD70" Offset="0xDD70" />
-        <Collision Name="object_ikninside_obj_Colheader_00DE48" Offset="0xDE48" /> <!-- Original name is "w2_ikn_yuka_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_iknv_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_iknv_obj.xml
deleted file mode 100644
index 5c54c71da..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_iknv_obj.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Root>
-    <File Name="object_iknv_obj" Segment="6">
-        <Texture Name="object_iknv_obj_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="object_iknv_obj_Tex_000020" OutName="tex_000020" Format="rgba16" Width="32" Height="32" Offset="0x20" />
-        <Texture Name="object_iknv_obj_Tex_000820" OutName="tex_000820" Format="ci4" Width="32" Height="128" Offset="0x820" />
-        <Texture Name="object_iknv_obj_Tex_001020" OutName="tex_001020" Format="rgba16" Width="64" Height="32" Offset="0x1020" />
-        <Texture Name="object_iknv_obj_Tex_002020" OutName="tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" />
-        <Texture Name="object_iknv_obj_Tex_002820" OutName="tex_002820" Format="rgba16" Width="16" Height="16" Offset="0x2820" />
-        <Texture Name="object_iknv_obj_Tex_002A20" OutName="tex_002A20" Format="rgba16" Width="8" Height="8" Offset="0x2A20" />
-        <Texture Name="object_iknv_obj_Tex_002AA0" OutName="tex_002AA0" Format="rgba16" Width="16" Height="16" Offset="0x2AA0" />
-        <Texture Name="object_iknv_obj_Tex_002CA0" OutName="tex_002CA0" Format="rgba16" Width="8" Height="8" Offset="0x2CA0" />
-        <Texture Name="object_iknv_obj_Tex_002D20" OutName="tex_002D20" Format="rgba16" Width="4" Height="4" Offset="0x2D20" />
-        <Texture Name="object_iknv_obj_Tex_002D40" OutName="tex_002D40" Format="ia8" Width="16" Height="16" Offset="0x2D40" />
-        <Texture Name="object_iknv_obj_Tex_002E40" OutName="tex_002E40" Format="rgba16" Width="32" Height="64" Offset="0x2E40" />
-        <Texture Name="object_iknv_obj_Tex_003E40" OutName="tex_003E40" Format="rgba16" Width="32" Height="16" Offset="0x3E40" />
-        <Texture Name="object_iknv_obj_TLUT_004240" OutName="tlut_004240" Format="rgba16" Width="4" Height="4" Offset="0x4240" />
-        <Texture Name="object_iknv_obj_Tex_004260" OutName="tex_004260" Format="rgba16" Width="32" Height="32" Offset="0x4260" />
-        <Texture Name="object_iknv_obj_Tex_004A60" OutName="tex_004A60" Format="rgba16" Width="32" Height="32" Offset="0x4A60" />
-        <Texture Name="object_iknv_obj_Tex_005260" OutName="tex_005260" Format="i4" Width="64" Height="64" Offset="0x5260" />
-        <Texture Name="object_iknv_obj_Tex_005A60" OutName="tex_005A60" Format="i4" Width="64" Height="64" Offset="0x5A60" />
-        <Texture Name="object_iknv_obj_Tex_006260" OutName="tex_006260" Format="ci4" Width="32" Height="128" Offset="0x6260" />
-        <Texture Name="object_iknv_obj_Tex_006A60" OutName="tex_006A60" Format="i8" Width="16" Height="16" Offset="0x6A60" />
-        <Texture Name="object_iknv_obj_Tex_006B60" OutName="tex_006B60" Format="rgba16" Width="32" Height="32" Offset="0x6B60" />
-        <Texture Name="object_iknv_obj_Tex_007360" OutName="tex_007360" Format="i8" Width="32" Height="64" Offset="0x7360" />
-        <Texture Name="object_iknv_obj_Tex_007B60" OutName="tex_007B60" Format="rgba16" Width="32" Height="32" Offset="0x7B60" />
-        <Texture Name="object_iknv_obj_Tex_008360" OutName="tex_008360" Format="i8" Width="32" Height="128" Offset="0x8360" />
-        <DList Name="object_iknv_obj_DL_00DB60" Offset="0xDB60" /> <!-- Original name is "z2_dokuana_modelT" -->
-        <DList Name="object_iknv_obj_DL_00DDD8" Offset="0xDDD8" /> <!-- Original name is "z2_dokuana_model" -->
-        <TextureAnimation Name="object_iknv_obj_Matanimheader_00F1C0" Offset="0xF1C0" />
-        <DList Name="object_iknv_obj_DL_010D90" Offset="0x10D90" /> <!-- Original name is "z2_doukutu_modelT" -->
-        <DList Name="object_iknv_obj_DL_010D98" Offset="0x10D98" /> <!-- Original name is "z2_doukutu_model" -->
-        <!-- <Blob Name="object_iknv_obj_Blob_0113E0" Size="0x10" Offset="0x113E0" /> -->
-        <DList Name="object_iknv_obj_DL_0115E0" Offset="0x115E0" /> <!-- Original name is "z2_doumizu_modelT" -->
-        <DList Name="object_iknv_obj_DL_011788" Offset="0x11788" /> <!-- Original name is "z2_doumizu_model" -->
-        <TextureAnimation Name="object_iknv_obj_Matanimheader_0117A0" Offset="0x117A0" />
-        <Collision Name="object_iknv_obj_Colheader_0117C8" Offset="0x117C8" /> <!-- Original name is "z2_doumizu_bgdatainfo" -->
-        <DList Name="object_iknv_obj_DL_011880" Offset="0x11880" /> <!-- Original name is "z2_ikiriguti_modelT" -->
-        <DList Name="object_iknv_obj_DL_011950" Offset="0x11950" /> <!-- Original name is "z2_ikiriguti_model" -->
-        <Collision Name="object_iknv_obj_Colheader_0119D4" Offset="0x119D4" /> <!-- Original name is "z2_ikiriguti_bgdatainfo" -->
-        <DList Name="object_iknv_obj_DL_011E70" Offset="0x11E70" />
-        <DList Name="object_iknv_obj_DL_011F40" Offset="0x11F40" />
-        <DList Name="object_iknv_obj_DL_012020" Offset="0x12020" />
-        <DList Name="object_iknv_obj_DL_0120F0" Offset="0x120F0" />
-        <DList Name="object_iknv_obj_DL_0121C8" Offset="0x121C8" />
-        <DList Name="object_iknv_obj_DL_012298" Offset="0x12298" />
-        <DList Name="object_iknv_obj_DL_012368" Offset="0x12368" />
-        <DList Name="object_iknv_obj_DL_012440" Offset="0x12440" />
-        <DList Name="object_iknv_obj_DL_012460" Offset="0x12460" />
-        <DList Name="object_iknv_obj_DL_012480" Offset="0x12480" />
-        <DList Name="object_iknv_obj_DL_0124A0" Offset="0x124A0" />
-        <DList Name="object_iknv_obj_DL_0124C0" Offset="0x124C0" />
-        <DList Name="object_iknv_obj_DL_0124E0" Offset="0x124E0" />
-        <DList Name="object_iknv_obj_DL_012500" Offset="0x12500" />
-        <DList Name="object_iknv_obj_DL_012518" Offset="0x12518" />
-        <DList Name="object_iknv_obj_DL_012528" Offset="0x12528" />
-        <DList Name="object_iknv_obj_DL_012538" Offset="0x12538" />
-        <DList Name="object_iknv_obj_DL_012550" Offset="0x12550" />
-        <DList Name="object_iknv_obj_DL_0125E0" Offset="0x125E0" />
-        <DList Name="object_iknv_obj_DL_0126D0" Offset="0x126D0" />
-        <DList Name="object_iknv_obj_DL_012700" Offset="0x12700" /> <!-- Original name is "z2_ikkawa_modelT" -->
-        <TextureAnimation Name="object_iknv_obj_Matanimheader_012728" Offset="0x12728" />
-        <Collision Name="object_iknv_obj_Colheader_012788" Offset="0x12788" /> <!-- Original name is "z2_ikkawa_bgdatainfo" -->
-        <DList Name="object_iknv_obj_DL_012880" Offset="0x12880" /> <!-- Original name is "z2_ikkawa_c_model" -->
-        <DList Name="object_iknv_obj_DL_0129C0" Offset="0x129C0" /> <!-- Not present in MM3D, but it was probably named "z2_iwado_model" based on the rest of this object. -->
-        <DList Name="object_iknv_obj_DL_0129C8" Offset="0x129C8" /> <!-- Original name is "z2_iwado_model" -->
-        <Collision Name="object_iknv_obj_Colheader_012CA4" Offset="0x12CA4" /> <!-- Original name is "z2_iwado_bgdatainfo" -->
-        <DList Name="object_iknv_obj_DL_013050" Offset="0x13050" /> <!-- Original name is "z2_suisya_modelT" -->
-        <DList Name="object_iknv_obj_DL_013058" Offset="0x13058" /> <!-- Original name is "z2_suisya_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_in.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_in.xml
deleted file mode 100644
index ee7ceb3a0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_in.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<Root>
-    <File Name="object_in" Segment="6">
-        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4" /> <!-- Original name is "in2_fusagu" -->
-        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0" /> <!-- Original name is "in2_kachi" -->
-        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0" /> <!-- Original name is "in2_kuyasii" -->
-        <TextureAnimation Name="object_in_Matanimheader_001C30" Offset="0x1C30" />
-        <Animation Name="object_in_Anim_001D10" Offset="0x1D10" /> <!-- Original name is "in_matsu1" -->
-        <!-- <Blob Name="object_in_Blob_001D20" Size="0x1738" Offset="0x1D20" /> -->
-        <Texture Name="object_in_Tex_003520" OutName="tex_003520" Format="ci8" Width="8" Height="8" Offset="0x3520" />
-        <Texture Name="object_in_Tex_0035E0" OutName="tex_0035E0" Format="ci8" Width="32" Height="32" Offset="0x35E0" />
-        <Texture Name="object_in_Tex_0039E0" OutName="tex_0039E0" Format="rgba16" Width="16" Height="16" Offset="0x39E0" />
-        <Texture Name="object_in_Tex_003BE0" OutName="tex_003BE0" Format="ci8" Width="16" Height="16" Offset="0x3BE0" />
-        <Texture Name="object_in_Tex_003CE0" OutName="tex_003CE0" Format="ci8" Width="16" Height="16" Offset="0x3CE0" />
-        <Texture Name="object_in_Tex_003DE0" OutName="tex_003DE0" Format="i8" Width="8" Height="8" Offset="0x3DE0" />
-        <Texture Name="object_in_Tex_003E20" OutName="tex_003E20" Format="rgba16" Width="8" Height="16" Offset="0x3E20" />
-        <Texture Name="object_in_Tex_003F20" OutName="tex_003F20" Format="ci8" Width="16" Height="32" Offset="0x3F20" />
-        <Texture Name="object_in_Tex_004120" OutName="tex_004120" Format="rgba16" Width="8" Height="16" Offset="0x4120" />
-        <Texture Name="object_in_Tex_004220" OutName="tex_004220" Format="ci8" Width="8" Height="16" Offset="0x4220" />
-        <Texture Name="object_in_Tex_0042A0" OutName="tex_0042A0" Format="ci8" Width="16" Height="16" Offset="0x42A0" />
-        <Texture Name="object_in_Tex_0043E0" OutName="tex_0043E0" Format="ci8" Width="32" Height="32" Offset="0x43E0" />
-        <Texture Name="object_in_Tex_0047E0" OutName="tex_0047E0" Format="ci8" Width="8" Height="8" Offset="0x47E0" />
-        <Texture Name="object_in_Tex_004820" OutName="tex_004820" Format="ci8" Width="32" Height="32" Offset="0x4820" />
-        <Texture Name="object_in_Tex_004C20" OutName="tex_004C20" Format="ci8" Width="32" Height="32" Offset="0x4C20" />
-        <DList Name="object_in_DL_006780" Offset="0x6780" />
-        <DList Name="object_in_DL_0073E8" Offset="0x73E8" />
-        <DList Name="object_in_DL_007510" Offset="0x7510" />
-        <DList Name="object_in_DL_007638" Offset="0x7638" />
-        <DList Name="object_in_DL_007730" Offset="0x7730" />
-        <DList Name="object_in_DL_0078D0" Offset="0x78D0" />
-        <DList Name="object_in_DL_007A70" Offset="0x7A70" />
-        <DList Name="object_in_DL_007C48" Offset="0x7C48" />
-        <DList Name="object_in_DL_00A0B8" Offset="0xA0B8" />
-        <DList Name="object_in_DL_00A2B8" Offset="0xA2B8" />
-        <DList Name="object_in_DL_00A4B0" Offset="0xA4B0" />
-        <DList Name="object_in_DL_00A748" Offset="0xA748" />
-        <DList Name="object_in_DL_00AAC8" Offset="0xAAC8" />
-        <DList Name="object_in_DL_00ACC0" Offset="0xACC0" />
-        <DList Name="object_in_DL_00AF58" Offset="0xAF58" />
-        <DList Name="object_in_DL_00B2D8" Offset="0xB2D8" />
-        <DList Name="object_in_DL_00B410" Offset="0xB410" />
-        <DList Name="object_in_DL_00B570" Offset="0xB570" />
-        <DList Name="object_in_DL_00B718" Offset="0xB718" />
-        <DList Name="object_in_DL_00B8D0" Offset="0xB8D0" />
-        <Texture Name="object_in_TLUT_00BA78" OutName="tlut_00BA78" Format="rgba16" Width="16" Height="16" Offset="0xBA78" />
-        <!-- <Blob Name="object_in_Blob_00BC78" Size="0x400" Offset="0xBC78" /> -->
-        <Texture Name="object_in_TLUT_00C078" OutName="tlut_00C078" Format="rgba16" Width="16" Height="16" Offset="0xC078" />
-        <Texture Name="object_in_TLUT_00C278" OutName="tlut_00C278" Format="rgba16" Width="16" Height="16" Offset="0xC278" />
-        <!-- <Blob Name="object_in_Blob_00C478" Size="0x200" Offset="0xC478" /> -->
-        <Texture Name="object_in_Tex_00C678" OutName="tex_00C678" Format="ci8" Width="8" Height="8" Offset="0xC678" />
-        <!-- <Blob Name="object_in_Blob_00C6B8" Size="0x640" Offset="0xC6B8" /> -->
-        <Texture Name="object_in_Tex_00CCF8" OutName="tex_00CCF8" Format="ci8" Width="16" Height="32" Offset="0xCCF8" />
-        <Texture Name="object_in_Tex_00CEF8" OutName="tex_00CEF8" Format="ci8" Width="16" Height="16" Offset="0xCEF8" />
-        <!-- <Blob Name="object_in_Blob_00CFF8" Size="0x100" Offset="0xCFF8" /> -->
-        <Texture Name="object_in_Tex_00D0F8" OutName="tex_00D0F8" Format="i8" Width="8" Height="8" Offset="0xD0F8" />
-        <Texture Name="object_in_Tex_00D138" OutName="tex_00D138" Format="i8" Width="32" Height="32" Offset="0xD138" />
-        <Texture Name="object_in_Tex_00D538" OutName="tex_00D538" Format="i8" Width="8" Height="8" Offset="0xD538" />
-        <Texture Name="object_in_Tex_00D578" OutName="tex_00D578" Format="i8" Width="8" Height="8" Offset="0xD578" />
-        <Texture Name="object_in_TLUT_00D5B8" OutName="tlut_00D5B8" Format="rgba16" Width="16" Height="16" Offset="0xD5B8" />
-        <Texture Name="object_in_Tex_00D7B8" OutName="tex_00D7B8" Format="rgba16" Width="16" Height="16" Offset="0xD7B8" />
-        <Texture Name="object_in_Tex_00D9B8" OutName="tex_00D9B8" Format="ci8" Width="8" Height="8" Offset="0xD9B8" />
-        <Texture Name="object_in_Tex_00D9F8" OutName="tex_00D9F8" Format="ci8" Width="8" Height="8" Offset="0xD9F8" />
-        <Texture Name="object_in_Tex_00DA38" OutName="tex_00DA38" Format="ci8" Width="8" Height="8" Offset="0xDA38" />
-        <Texture Name="object_in_Tex_00DA78" OutName="tex_00DA78" Format="ci8" Width="16" Height="32" Offset="0xDA78" />
-        <Texture Name="object_in_Tex_00DC78" OutName="tex_00DC78" Format="ci8" Width="16" Height="16" Offset="0xDC78" />
-        <Texture Name="object_in_Tex_00DD78" OutName="tex_00DD78" Format="ci8" Width="16" Height="16" Offset="0xDD78" />
-        <Texture Name="object_in_Tex_00DE78" OutName="tex_00DE78" Format="ci8" Width="8" Height="8" Offset="0xDE78" />
-        <!-- <Blob Name="object_in_Blob_00DEB8" Size="0x800" Offset="0xDEB8" /> -->
-        <Texture Name="object_in_Tex_00E6B8" OutName="tex_00E6B8" Format="rgba16" Width="32" Height="32" Offset="0xE6B8" />
-        <!-- <Blob Name="object_in_Blob_00EEB8" Size="0x800" Offset="0xEEB8" /> -->
-        <Texture Name="object_in_Tex_00F6B8" OutName="tex_00F6B8" Format="ci8" Width="16" Height="16" Offset="0xF6B8" />
-        <Texture Name="object_in_Tex_00F7B8" OutName="tex_00F7B8" Format="ci8" Width="16" Height="32" Offset="0xF7B8" />
-        <Texture Name="object_in_Tex_00F9B8" OutName="tex_00F9B8" Format="ci8" Width="16" Height="16" Offset="0xF9B8" />
-        <Texture Name="object_in_Tex_00FAB8" OutName="tex_00FAB8" Format="ci8" Width="16" Height="16" Offset="0xFAB8" />
-        <Texture Name="object_in_Tex_00FBB8" OutName="tex_00FBB8" Format="ci8" Width="16" Height="16" Offset="0xFBB8" />
-        <Texture Name="object_in_Tex_00FCB8" OutName="tex_00FCB8" Format="ci8" Width="16" Height="16" Offset="0xFCB8" />
-        <Texture Name="object_in_Tex_00FDB8" OutName="tex_00FDB8" Format="ci8" Width="8" Height="8" Offset="0xFDB8" />
-        <Texture Name="object_in_Tex_00FDF8" OutName="tex_00FDF8" Format="ci8" Width="8" Height="8" Offset="0xFDF8" />
-        <DList Name="object_in_DL_012A78" Offset="0x12A78" />
-        <DList Name="object_in_DL_012DF8" Offset="0x12DF8" />
-        <DList Name="object_in_DL_013440" Offset="0x13440" />
-        <DList Name="object_in_DL_013540" Offset="0x13540" />
-        <DList Name="object_in_DL_013670" Offset="0x13670" />
-        <DList Name="object_in_DL_0137A0" Offset="0x137A0" />
-        <DList Name="object_in_DL_0138D0" Offset="0x138D0" />
-        <DList Name="object_in_DL_013A00" Offset="0x13A00" />
-        <DList Name="object_in_DL_013DE0" Offset="0x13DE0" />
-        <DList Name="object_in_DL_013F10" Offset="0x13F10" />
-        <DList Name="object_in_DL_014040" Offset="0x14040" />
-        <DList Name="object_in_DL_014420" Offset="0x14420" />
-        <DList Name="object_in_DL_0145D8" Offset="0x145D8" />
-        <DList Name="object_in_DL_014710" Offset="0x14710" />
-        <DList Name="object_in_DL_014860" Offset="0x14860" />
-        <DList Name="object_in_DL_0149A8" Offset="0x149A8" />
-        <DList Name="object_in_DL_014AE0" Offset="0x14AE0" />
-        <DList Name="object_in_DL_014C30" Offset="0x14C30" />
-        <Limb Name="object_in_Standardlimb_014D78" Type="Standard" EnumName="OBJECT_IN_LIMB_01" Offset="0x14D78" />
-        <Limb Name="object_in_Standardlimb_014D84" Type="Standard" EnumName="OBJECT_IN_LIMB_02" Offset="0x14D84" />
-        <Limb Name="object_in_Standardlimb_014D90" Type="Standard" EnumName="OBJECT_IN_LIMB_03" Offset="0x14D90" />
-        <Limb Name="object_in_Standardlimb_014D9C" Type="Standard" EnumName="OBJECT_IN_LIMB_04" Offset="0x14D9C" />
-        <Limb Name="object_in_Standardlimb_014DA8" Type="Standard" EnumName="OBJECT_IN_LIMB_05" Offset="0x14DA8" />
-        <Limb Name="object_in_Standardlimb_014DB4" Type="Standard" EnumName="OBJECT_IN_LIMB_06" Offset="0x14DB4" />
-        <Limb Name="object_in_Standardlimb_014DC0" Type="Standard" EnumName="OBJECT_IN_LIMB_07" Offset="0x14DC0" />
-        <Limb Name="object_in_Standardlimb_014DCC" Type="Standard" EnumName="OBJECT_IN_LIMB_08" Offset="0x14DCC" />
-        <Limb Name="object_in_Standardlimb_014DD8" Type="Standard" EnumName="OBJECT_IN_LIMB_09" Offset="0x14DD8" />
-        <Limb Name="object_in_Standardlimb_014DE4" Type="Standard" EnumName="OBJECT_IN_LIMB_0A" Offset="0x14DE4" />
-        <Limb Name="object_in_Standardlimb_014DF0" Type="Standard" EnumName="OBJECT_IN_LIMB_0B" Offset="0x14DF0" />
-        <Limb Name="object_in_Standardlimb_014DFC" Type="Standard" EnumName="OBJECT_IN_LIMB_0C" Offset="0x14DFC" />
-        <Limb Name="object_in_Standardlimb_014E08" Type="Standard" EnumName="OBJECT_IN_LIMB_0D" Offset="0x14E08" />
-        <Limb Name="object_in_Standardlimb_014E14" Type="Standard" EnumName="OBJECT_IN_LIMB_0E" Offset="0x14E14" />
-        <Limb Name="object_in_Standardlimb_014E20" Type="Standard" EnumName="OBJECT_IN_LIMB_0F" Offset="0x14E20" />
-        <Limb Name="object_in_Standardlimb_014E2C" Type="Standard" EnumName="OBJECT_IN_LIMB_10" Offset="0x14E2C" />
-        <Limb Name="object_in_Standardlimb_014E38" Type="Standard" EnumName="OBJECT_IN_LIMB_11" Offset="0x14E38" />
-        <Limb Name="object_in_Standardlimb_014E44" Type="Standard" EnumName="OBJECT_IN_LIMB_12" Offset="0x14E44" />
-        <Limb Name="object_in_Standardlimb_014E50" Type="Standard" EnumName="OBJECT_IN_LIMB_13" Offset="0x14E50" />
-        <Skeleton Name="object_in_Skel_014EA8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IN_LIMB_NONE" LimbMax="OBJECT_IN_LIMB_MAX" EnumName="ObjectInLimb" Offset="0x14EA8" />
-        <Animation Name="object_in_Anim_014F8C" Offset="0x14F8C" /> <!-- Original name is "in_matsu2" -->
-        <Animation Name="object_in_Anim_015918" Offset="0x15918" /> <!-- Original name is "in_shigoto" -->
-        <Animation Name="object_in_Anim_015E38" Offset="0x15E38" /> <!-- Original name is "ingo_anim_fastrun" -->
-        <Animation Name="object_in_Anim_016484" Offset="0x16484" /> <!-- Original name is "ingo_anim_fastrun_muti" -->
-        <Animation Name="object_in_Anim_016A60" Offset="0x16A60" /> <!-- Original name is "ingo_anim_slowrun" -->
-        <Animation Name="object_in_Anim_0170DC" Offset="0x170DC" /> <!-- Original name is "ingo_anim_slowrun_muti" -->
-        <Animation Name="object_in_Anim_0177AC" Offset="0x177AC" /> <!-- Original name is "ingo_anim_stop" -->
-        <Animation Name="object_in_Anim_018240" Offset="0x18240" /> <!-- Original name is "ingo_anim_stop_muti" -->
-        <Animation Name="object_in_Anim_0187C8" Offset="0x187C8" /> <!-- Original name is "ingo_anim_wait1" -->
-        <Animation Name="object_in_Anim_0198A8" Offset="0x198A8" /> <!-- Original name is "ingo_anim_wait2" -->
-        <Animation Name="object_in_Anim_019EB4" Offset="0x19EB4" /> <!-- Original name is "ingo_jump" -->
-        <Animation Name="object_in_Anim_01A140" Offset="0x1A140" /> <!-- Original name is "ingo_run1" -->
-        <Animation Name="object_in_Anim_01B3C4" Offset="0x1B3C4" /> <!-- Original name is "ingo_tyakuti" -->
-        <Animation Name="object_in_Anim_01B904" Offset="0x1B904" /> <!-- Original name is "ingo_wait1" -->
-        <Animation Name="object_in_Anim_01C0B0" Offset="0x1C0B0" /> <!-- Original name is "ingo_walk_loop" -->
-        <DList Name="object_in_DL_01C520" Offset="0x1C520" />
-        <DList Name="object_in_DL_01C528" Offset="0x1C528" />
-        <Texture Name="object_in_TLUT_01C8F0" OutName="tlut_01C8F0" Format="rgba16" Width="16" Height="16" Offset="0x1C8F0" />
-        <Texture Name="object_in_Tex_01CAF0" OutName="tex_01CAF0" Format="ci8" Width="8" Height="8" Offset="0x1CAF0" />
-        <Texture Name="object_in_Tex_01CB30" OutName="tex_01CB30" Format="ci8" Width="16" Height="8" Offset="0x1CB30" />
-        <Texture Name="object_in_Tex_01CBB0" OutName="tex_01CBB0" Format="ci8" Width="16" Height="16" Offset="0x1CBB0" />
-        <Texture Name="object_in_Tex_01CCB0" OutName="tex_01CCB0" Format="rgba16" Width="16" Height="16" Offset="0x1CCB0" />
-        <Texture Name="object_in_Tex_01CEB0" OutName="tex_01CEB0" Format="ci8" Width="8" Height="32" Offset="0x1CEB0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_in2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_in2.xml
deleted file mode 100644
index e903185b4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_in2.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<Root>
-    <File Name="object_in2" Segment="6">
-        <Animation Name="object_in2_Anim_000084" Offset="0x84" /> <!-- Original name is "in2_kihon" -->
-        <DList Name="object_in2_DL_002D60" Offset="0x2D60" />
-        <DList Name="object_in2_DL_003060" Offset="0x3060" />
-        <DList Name="object_in2_DL_0035B0" Offset="0x35B0" />
-        <DList Name="object_in2_DL_0036A8" Offset="0x36A8" />
-        <DList Name="object_in2_DL_0037D0" Offset="0x37D0" />
-        <DList Name="object_in2_DL_0038F8" Offset="0x38F8" />
-        <DList Name="object_in2_DL_003A10" Offset="0x3A10" />
-        <DList Name="object_in2_DL_003B28" Offset="0x3B28" />
-        <DList Name="object_in2_DL_003EA0" Offset="0x3EA0" />
-        <DList Name="object_in2_DL_003FB8" Offset="0x3FB8" />
-        <DList Name="object_in2_DL_0040D0" Offset="0x40D0" />
-        <DList Name="object_in2_DL_004448" Offset="0x4448" />
-        <DList Name="object_in2_DL_0045C8" Offset="0x45C8" />
-        <DList Name="object_in2_DL_0046C0" Offset="0x46C0" />
-        <DList Name="object_in2_DL_0047C8" Offset="0x47C8" />
-        <DList Name="object_in2_DL_0048F8" Offset="0x48F8" />
-        <DList Name="object_in2_DL_0049F0" Offset="0x49F0" />
-        <DList Name="object_in2_DL_004AF8" Offset="0x4AF8" />
-        <Texture Name="object_in2_Tex_004C28" OutName="tex_004C28" Format="rgba16" Width="16" Height="16" Offset="0x4C28" />
-        <Texture Name="object_in2_TLUT_004E28" OutName="tlut_004E28" Format="rgba16" Width="16" Height="16" Offset="0x4E28" />
-        <Texture Name="object_in2_Tex_005028" OutName="tex_005028" Format="ci8" Width="32" Height="32" Offset="0x5028" />
-        <Texture Name="object_in2_Tex_005428" OutName="tex_005428" Format="ci8" Width="8" Height="8" Offset="0x5428" />
-        <Texture Name="object_in2_Tex_005468" OutName="tex_005468" Format="ci8" Width="8" Height="8" Offset="0x5468" />
-        <Texture Name="object_in2_Tex_0054A8" OutName="tex_0054A8" Format="ci8" Width="32" Height="32" Offset="0x54A8" />
-        <Texture Name="object_in2_Tex_0058A8" OutName="tex_0058A8" Format="rgba16" Width="16" Height="16" Offset="0x58A8" />
-        <Texture Name="object_in2_Tex_005AA8" OutName="tex_005AA8" Format="ci8" Width="16" Height="16" Offset="0x5AA8" />
-        <Texture Name="object_in2_Tex_005BA8" OutName="tex_005BA8" Format="ci8" Width="16" Height="16" Offset="0x5BA8" />
-        <Texture Name="object_in2_Tex_005CA8" OutName="tex_005CA8" Format="i8" Width="8" Height="8" Offset="0x5CA8" />
-        <Texture Name="object_in2_Tex_005CE8" OutName="tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CE8" />
-        <Texture Name="object_in2_Tex_0060E8" OutName="tex_0060E8" Format="ci8" Width="16" Height="32" Offset="0x60E8" />
-        <Texture Name="object_in2_Tex_0062E8" OutName="tex_0062E8" Format="ci8" Width="16" Height="16" Offset="0x62E8" />
-        <Texture Name="object_in2_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="8" Height="8" Offset="0x63E8" />
-        <Texture Name="object_in2_Tex_006428" OutName="tex_006428" Format="ci8" Width="16" Height="16" Offset="0x6428" />
-        <Texture Name="object_in2_Tex_006528" OutName="tex_006528" Format="ci8" Width="16" Height="16" Offset="0x6528" />
-        <Texture Name="object_in2_Tex_006628" OutName="tex_006628" Format="i8" Width="16" Height="16" Offset="0x6628" />
-        <Texture Name="object_in2_Tex_006728" OutName="tex_006728" Format="i8" Width="16" Height="16" Offset="0x6728" />
-        <Texture Name="object_in2_Tex_006828" OutName="tex_006828" Format="ci8" Width="32" Height="32" Offset="0x6828" />
-        <Texture Name="object_in2_Tex_006C28" OutName="tex_006C28" Format="ci8" Width="8" Height="8" Offset="0x6C28" />
-        <Texture Name="object_in2_Tex_006C68" OutName="tex_006C68" Format="ci8" Width="32" Height="32" Offset="0x6C68" />
-        <Texture Name="object_in2_Tex_007068" OutName="tex_007068" Format="ci8" Width="8" Height="8" Offset="0x7068" />
-        <DList Name="object_in2_DL_007198" Offset="0x7198" />
-        <DList Name="object_in2_DL_0071A0" Offset="0x71A0" />
-        <Texture Name="object_in2_Tex_007260" OutName="tex_007260" Format="rgba16" Width="16" Height="16" Offset="0x7260" />
-        <DList Name="object_in2_DL_007520" Offset="0x7520" />
-        <DList Name="object_in2_DL_007528" Offset="0x7528" />
-        <Texture Name="object_in2_Tex_007680" OutName="tex_007680" Format="i8" Width="16" Height="16" Offset="0x7680" />
-        <Limb Name="object_in2_Standardlimb_007780" Type="Standard" EnumName="OBJECT_IN2_LIMB_01" Offset="0x7780" />
-        <Limb Name="object_in2_Standardlimb_00778C" Type="Standard" EnumName="OBJECT_IN2_LIMB_02" Offset="0x778C" />
-        <Limb Name="object_in2_Standardlimb_007798" Type="Standard" EnumName="OBJECT_IN2_LIMB_03" Offset="0x7798" />
-        <Limb Name="object_in2_Standardlimb_0077A4" Type="Standard" EnumName="OBJECT_IN2_LIMB_04" Offset="0x77A4" />
-        <Limb Name="object_in2_Standardlimb_0077B0" Type="Standard" EnumName="OBJECT_IN2_LIMB_05" Offset="0x77B0" />
-        <Limb Name="object_in2_Standardlimb_0077BC" Type="Standard" EnumName="OBJECT_IN2_LIMB_06" Offset="0x77BC" />
-        <Limb Name="object_in2_Standardlimb_0077C8" Type="Standard" EnumName="OBJECT_IN2_LIMB_07" Offset="0x77C8" />
-        <Limb Name="object_in2_Standardlimb_0077D4" Type="Standard" EnumName="OBJECT_IN2_LIMB_08" Offset="0x77D4" />
-        <Limb Name="object_in2_Standardlimb_0077E0" Type="Standard" EnumName="OBJECT_IN2_LIMB_09" Offset="0x77E0" />
-        <Limb Name="object_in2_Standardlimb_0077EC" Type="Standard" EnumName="OBJECT_IN2_LIMB_0A" Offset="0x77EC" />
-        <Limb Name="object_in2_Standardlimb_0077F8" Type="Standard" EnumName="OBJECT_IN2_LIMB_0B" Offset="0x77F8" />
-        <Limb Name="object_in2_Standardlimb_007804" Type="Standard" EnumName="OBJECT_IN2_LIMB_0C" Offset="0x7804" />
-        <Limb Name="object_in2_Standardlimb_007810" Type="Standard" EnumName="OBJECT_IN2_LIMB_0D" Offset="0x7810" />
-        <Limb Name="object_in2_Standardlimb_00781C" Type="Standard" EnumName="OBJECT_IN2_LIMB_0E" Offset="0x781C" />
-        <Limb Name="object_in2_Standardlimb_007828" Type="Standard" EnumName="OBJECT_IN2_LIMB_0F" Offset="0x7828" />
-        <Limb Name="object_in2_Standardlimb_007834" Type="Standard" EnumName="OBJECT_IN2_LIMB_10" Offset="0x7834" />
-        <Limb Name="object_in2_Standardlimb_007840" Type="Standard" EnumName="OBJECT_IN2_LIMB_11" Offset="0x7840" />
-        <Limb Name="object_in2_Standardlimb_00784C" Type="Standard" EnumName="OBJECT_IN2_LIMB_12" Offset="0x784C" />
-        <Limb Name="object_in2_Standardlimb_007858" Type="Standard" EnumName="OBJECT_IN2_LIMB_13" Offset="0x7858" />
-        <Skeleton Name="object_in2_Skel_0078B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IN2_LIMB_NONE" LimbMax="OBJECT_IN2_LIMB_MAX" EnumName="ObjectIn2Limb" Offset="0x78B0" />
-        <Animation Name="object_in2_Anim_008090" Offset="0x8090" /> <!-- Original name is "in2_suwarukard" -->
-        <Animation Name="object_in2_Anim_00898C" Offset="0x898C" /> <!-- Original name is "in2_suwarunomu" -->
-        <Animation Name="object_in2_Anim_009450" Offset="0x9450" /> <!-- Original name is "in2_suwaruokoru" -->
-        <Animation Name="object_in2_Anim_009CDC" Offset="0x9CDC" /> <!-- Original name is "in2_suwaruwait" -->
-        <Animation Name="object_in2_Anim_00A5E0" Offset="0xA5E0" /> <!-- Original name is "in2_suwaruwait2" -->
-        <Animation Name="object_in2_Anim_00A70C" Offset="0xA70C" /> <!-- Original name is "in2_suwaruwait3" -->
-        <Animation Name="object_in2_Anim_00AD18" Offset="0xAD18" /> <!-- Original name is "in2_walk" -->
-        <Animation Name="object_in2_Anim_00B8B0" Offset="0xB8B0" /> <!-- Original name is "in2_walk2suwaru" -->
-        <Animation Name="object_in2_Anim_00B990" Offset="0xB990" /> <!-- Original name is "in2_matsu1" -->
-        <Animation Name="object_in2_Anim_00BA80" Offset="0xBA80" /> <!-- Original name is "in_neru1" -->
-        <Animation Name="object_in2_Anim_00C03C" Offset="0xC03C" /> <!-- Original name is "in_pekopeko" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_inibs_object.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_inibs_object.xml
deleted file mode 100644
index db78735fb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_inibs_object.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<Root>
-    <!-- Assets for Twinmold's Arena -->
-    <File Name="object_inibs_object" Segment="6">
-        <!-- Assets for the version of the arena when the player is using the Giant's Mask -->
-        <DList Name="gTwinmoldArenaGiantModeCenterPlatformDL" Offset="0x1C10" />
-        <DList Name="gTwinmoldArenaGiantModeSandDL" Offset="0x1DC0" />
-        <TextureAnimation Name="gTwinmoldArenaGiantModeSandTexAnim" Offset="0x2598" />
-        <Collision Name="gTwinmoldArenaGiantModeArenaCol" Offset="0x4BA0" /> <!-- Unused. Attempting to use it severely slows down the game. -->
-
-        <!-- Assets for the normal version of the arena -->
-        <DList Name="gTwinmoldArenaNormalModeCenterPlatformDL" Offset="0x6140" />
-        <DList Name="gTwinmoldArenaNormalModeSandDL" Offset="0x62D8" />
-        <TextureAnimation Name="gTwinmoldArenaNormalModeSandTexAnim" Offset="0x6858" />
-        <Collision Name="gTwinmoldArenaNormalModeArenaCol" Offset="0x8EF4" /> <!-- Unused. Attempting to use it severely slows down the game. -->
-
-        <!-- Assets for unused pillars and walls -->
-        <DList Name="gTwinmoldArenaEmpty1DL" Offset="0x90A0" /> <!-- Probably intended to be used as the xluDList for the pillar below. -->
-        <DList Name="gTwinmoldArenaUnusedTwistedPillarDL" Offset="0x90A8" />
-        <Collision Name="gTwinmoldArenaUnusedTwistedPillarCol" Offset="0x930C" />
-        <DList Name="gTwinmoldArenaEmpty2DL" Offset="0x9460" /> <!-- Probably intended to be used as the xluDList for the pillar below. -->
-        <DList Name="gTwinmoldArenaUnusedTrapezoidalPillarDL" Offset="0x9468" />
-        <Collision Name="gTwinmoldArenaUnusedTrapezoidalPillarCol" Offset="0x9600" />
-        <DList Name="gTwinmoldArenaEmpty3DL" Offset="0x9A90" /> <!-- Probably intended to be used as the xluDList for the pillar below. -->
-        <DList Name="gTwinmoldArenaUnusedClawShapedPillarDL" Offset="0x9A98" />
-        <Collision Name="gTwinmoldArenaUnusedClawShapedPillarCol" Offset="0x9EA8" />
-        <DList Name="gTwinmoldArenaEmpty4DL" Offset="0xA020" /> <!-- Probably intended to be used as the xluDList for the wall below. -->
-        <DList Name="gTwinmoldArenaUnusedWallDL" Offset="0xA028" />
-        <Collision Name="gTwinmoldArenaUnusedWallCol" Offset="0xA200" />
-        <DList Name="gTwinmoldArenaEmpty5DL" Offset="0xA430" /> <!-- Probably intended to be used as the xluDList for the wall below. -->
-        <DList Name="gTwinmoldArenaUnusedWallCornerDL" Offset="0xA438" />
-        <Collision Name="gTwinmoldArenaUnusedWallCornerCol" Offset="0xA6A8" />
-
-        <!-- Textures for Twinmold's Arena -->
-        <Texture Name="gTwinmoldArenaCenterPlatformBrickTex" OutName="twinmold_arena_center_platform_brick" Format="rgba16" Width="32" Height="32" Offset="0xA6E0" />
-        <Texture Name="gTwinmoldArenaCenterPlatformEmblemTex" OutName="twinmold_arena_center_platform_emblem" Format="rgba16" Width="32" Height="32" Offset="0xAEE0" />
-        <Texture Name="gTwinmoldArenaCenterPlatformSlopesAndWallSidesTex" OutName="twinmold_arena_center_platform_slopes_and_wall_sides" Format="rgba16" Width="32" Height="64" Offset="0xB6E0" />
-        <Texture Name="gTwinmoldArenaPillarSidesTex" OutName="twinmold_arena_pillar_sides" Format="rgba16" Width="32" Height="32" Offset="0xC6E0" />
-        <Texture Name="gTwinmoldArenaTwistedPillarTopTex" OutName="twinmold_arena_twisted_pillar_top" Format="rgba16" Width="32" Height="32" Offset="0xCEE0" />
-        <Texture Name="gTwinmoldArenaWallTopAndClawPillarInteriorTex" OutName="twinmold_arena_wall_top_and_claw_pillar_interior" Format="rgba16" Width="32" Height="32" Offset="0xD6E0" />
-        <Texture Name="gTwinmoldArenaSandTex" OutName="twinmold_arena_sand" Format="rgba16" Width="32" Height="32" Offset="0xDEE0" />
-        <Texture Name="gTwinmoldArenaSandDetailTex" OutName="twinmold_arena_sand_detail" Format="rgba16" Width="32" Height="32" Offset="0xE6E0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ishi.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ishi.xml
deleted file mode 100644
index 5f53b90ac..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ishi.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Object for small rocks -->
-    <File Name="object_ishi" Segment="6">
-        <Texture Name="gSmallRockTex" OutName="small_rock" Format="rgba16" Width="32" Height="32" Offset="0x1B0" />
-        <DList Name="gSmallRockDL" Offset="0x9B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_jg.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_jg.xml
deleted file mode 100644
index c3e1ac18a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_jg.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<Root>
-    <File Name="object_jg" Segment="6">
-        <!-- Goron Elder Limb DisplayLists -->
-        <DList Name="gGoronElderPelvisDL" Offset="0x3C50" />
-        <DList Name="gGoronElderRightShinDL" Offset="0x3DC8" />
-        <DList Name="gGoronElderRightFootDL" Offset="0x4068" />
-        <DList Name="gGoronElderRightThighDL" Offset="0x4410" />
-        <DList Name="gGoronElderLeftShinDL" Offset="0x4688" />
-        <DList Name="gGoronElderLeftFootDL" Offset="0x4928" />
-        <DList Name="gGoronElderLeftThighDL" Offset="0x4CD0" />
-        <DList Name="gGoronElderHeadDL" Offset="0x4F50" />
-        <DList Name="gGoronElderLowerBeardDL" Offset="0x5440" />
-        <DList Name="gGoronElderUpperBeardDL" Offset="0x54F0" />
-        <DList Name="gGoronElderLowerLipDL" Offset="0x55A8" />
-        <DList Name="gGoronElderHairBackDL" Offset="0x5770" />
-        <DList Name="gGoronElderRightHairEndDL" Offset="0x5968" />
-        <DList Name="gGoronElderLeftHairEndDL" Offset="0x5A48" />
-        <DList Name="gGoronElderUpperTorsoDL" Offset="0x5B28" />
-        <DList Name="gGoronElderRightForearmDL" Offset="0x5EE8" />
-        <DList Name="gGoronElderRightFingersDL" Offset="0x6018" />
-        <DList Name="gGoronElderRightHandAndThumbDL" Offset="0x6130" />
-        <DList Name="gGoronElderRightShoulderAndUpperArmDL" Offset="0x6378" />
-        <DList Name="gGoronElderLeftForearmDL" Offset="0x6678" />
-        <DList Name="gGoronElderLeftFingersDL" Offset="0x67A8" />
-        <DList Name="gGoronElderLeftHandAndThumbDL" Offset="0x68C0" />
-        <DList Name="gGoronElderLeftShoulderAndUpperArmDL" Offset="0x6B08" />
-        <DList Name="gGoronElderLowerTorsoDL" Offset="0x6E08" />
-
-        <!-- Goron Elder Animations -->
-        <Animation Name="gGoronElderThinkingAnim" Offset="0x77CC" /> <!-- Original name is "jg_are_loop" ("huh?") -->
-        <Animation Name="gGoronElderWalkAnim" Offset="0x9440" /> <!-- Original name is "jg_aruku" ("walk") -->
-        <Animation Name="gGoronElderCradleAnim" Offset="0xA07C" /> <!-- Original name is "jg_dakko" ("hug") -->
-
-        <!-- Drum DisplayList and Textures -->
-        <DList Name="gGoronElderDrumDL" Offset="0xA3B0" />
-        <Texture Name="gGoronElderDrumSidesTex" OutName="goron_elder_drum_sides" Format="rgba16" Width="32" Height="32" Offset="0xA530" />
-        <Texture Name="gGoronElderDrumTopTex" OutName="goron_elder_drum_top" Format="rgba16" Width="16" Height="16" Offset="0xAD30" />
-        
-        <!-- Goron Elder Animations -->
-        <Animation Name="gGoronElderWavingAnim" Offset="0xBDD8" /> <!-- Original name is "jg_iran" ("refuse") -->
-        <Animation Name="gGoronElderHeadShakeAnim" Offset="0xC7A8" /> <!-- Original name is "jg_kubifuri" ("head shake") -->
-        <Animation Name="gGoronElderRememberingAnim" Offset="0xD630" /> <!-- Original name is "jg_mouichido" ("once more time") -->
-        <Animation Name="gGoronElderSurpriseStartAnim" Offset="0xDB54" /> <!-- Original name is "jg_odoroki" ("surprise") -->
-        <Animation Name="gGoronElderSurpriseLoopAnim" Offset="0xE8FC" /> <!-- Original name is "jg_odorokiLoop" -->
-        <Animation Name="gGoronElderStrongRememberingAnim" Offset="0xFE48" /> <!-- Original name is "jg_soujyatta" (something like "it was this way") -->
-        <Animation Name="gGoronElderTakeOutDrumAnim" Offset="0x11F50" /> <!-- Original name is "jg_taiko_dasu" ("get out drum") -->
-        <Animation Name="gGoronElderDrumIdleAnim" Offset="0x129F4" /> <!-- Original name is "jg_taiko_loop" ("drum loop") -->
-        <Animation Name="gGoronElderPlayingDrumAnim" Offset="0x13DD8" /> <!-- Original name is "jg_taiko_tataku" ("playing the drum") -->
-        <Animation Name="gGoronElderAngryAnim" Offset="0x1436C" /> <!-- Original name is "jg_takaburu" ("to become worked up") -->
-
-        <!-- Goron Elder Textures -->
-        <Texture Name="gGoronElderTLUT" OutName="goron_elder_palette" Format="rgba16" Width="16" Height="16" Offset="0x14380" />
-        <Texture Name="gGoronElderSkinTex" OutName="goron_elder_skin" Format="ci8" Width="8" Height="8" Offset="0x14580" />
-        <Texture Name="gGoronElderToesTex" OutName="goron_elder_toes" Format="ci8" Width="32" Height="16" Offset="0x145C0" />
-        <Texture Name="gGoronElderFootBottomTex" OutName="goron_elder_foot_bottom" Format="ci8" Width="32" Height="32" Offset="0x147C0" />
-        <Texture Name="gGoronElderVeinsTex" OutName="goron_elder_veins" Format="ci8" Width="32" Height="32" Offset="0x14BC0" />
-        <Texture Name="gGoronElderSpotsTex" OutName="goron_elder_spots" Format="ci8" Width="16" Height="16" Offset="0x14FC0" />
-        <Texture Name="gGoronElderLowerLipTex" OutName="goron_elder_lower_lip" Format="rgba16" Width="8" Height="16" Offset="0x150C0" />
-        <Texture Name="gGoronElderLipTex" OutName="goron_elder_lip" Format="rgba16" Width="8" Height="8" Offset="0x151C0" />
-        <Texture Name="gGoronElderHairTex" OutName="goron_elder_hair" Format="rgba16" Width="16" Height="32" Offset="0x15240" />
-        <Texture Name="gGoronElderNostrilAndBellyButtonTex" OutName="goron_elder_nostril_and_belly_button" Format="ci8" Width="8" Height="8" Offset="0x15640" />
-        <Texture Name="gGoronElderCheekTex" OutName="goron_elder_cheek" Format="ci8" Width="8" Height="8" Offset="0x15680" />
-        <Texture Name="gGoronElderBrowTex" OutName="goron_elder_brow" Format="ci8" Width="8" Height="8" Offset="0x156C0" />
-        <Texture Name="gGoronElderHairEndTex" OutName="goron_elder_hair_end" Format="rgba16" Width="32" Height="64" Offset="0x15700" />
-        <Texture Name="gGoronElderFingersTex" OutName="goron_elder_fingers" Format="ci8" Width="16" Height="16" Offset="0x16700" />
-        <Texture Name="gGoronElderGoronRubyTattooTex" OutName="goron_elder_goron_ruby_tattoo" Format="ci8" Width="16" Height="32" Offset="0x16800" />
-        <Texture Name="gGoronElderChestTex" OutName="goron_elder_chest" Format="ci8" Width="32" Height="32" Offset="0x16A00" />
-        <Texture Name="gGoronElderBackTex" OutName="goron_elder_back" Format="ci8" Width="32" Height="64" Offset="0x16E00" />
-
-        <!-- Goron Elder Animations -->
-        <Animation Name="gGoronElderDepressedAnim" Offset="0x18CE4" /> <!-- Original name is "jg_u_m_loop" -->
-        <Animation Name="gGoronElderIdleAnim" Offset="0x1ADC0" /> <!-- Original name is "jg_wait" -->
-
-        <!-- Goron Elder Limbs -->
-        <Limb Name="gGoronElderRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_ROOT" Offset="0x1ADD0" />
-        <Limb Name="gGoronElderUpperBodyRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_UPPER_BODY_ROOT" Offset="0x1ADDC" />
-        <Limb Name="gGoronElderLowerTorsoLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LOWER_TORSO" Offset="0x1ADE8" />
-        <Limb Name="gGoronElderUpperTorsoLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_UPPER_TORSO" Offset="0x1ADF4" />
-        <Limb Name="gGoronElderLeftArmRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_ARM_ROOT" Offset="0x1AE00" />
-        <Limb Name="gGoronElderLeftShoulderAndUpperArmLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_SHOULDER_AND_UPPER_ARM" Offset="0x1AE0C" />
-        <Limb Name="gGoronElderLeftForearmLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_FOREARM" Offset="0x1AE18" />
-        <Limb Name="gGoronElderLeftWristLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_WRIST" Offset="0x1AE24" />
-        <Limb Name="gGoronElderLeftHandAndThumbLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_HAND_AND_THUMB" Offset="0x1AE30" />
-        <Limb Name="gGoronElderLeftFingersLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_FINGERS" Offset="0x1AE3C" />
-        <Limb Name="gGoronElderRightArmRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_ARM_ROOT" Offset="0x1AE48" />
-        <Limb Name="gGoronElderRightShoulderAndUpperArmLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_SHOULDER_AND_UPPER_ARM" Offset="0x1AE54" />
-        <Limb Name="gGoronElderRightForearmLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_FOREARM" Offset="0x1AE60" />
-        <Limb Name="gGoronElderRightWristLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_WRIST" Offset="0x1AE6C" />
-        <Limb Name="gGoronElderRightHandAndThumbLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_HAND_AND_THUMB" Offset="0x1AE78" />
-        <Limb Name="gGoronElderRightFingersLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_FINGERS" Offset="0x1AE84" />
-        <Limb Name="gGoronElderNeckLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_NECK" Offset="0x1AE90" />
-        <Limb Name="gGoronElderLeftHairEndLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_HAIR_END" Offset="0x1AE9C" />
-        <Limb Name="gGoronElderRightHairEndLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_HAIR_END" Offset="0x1AEA8" />
-        <Limb Name="gGoronElderHairBackLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_HAIR_BACK" Offset="0x1AEB4" />
-        <Limb Name="gGoronElderHeadLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_HEAD" Offset="0x1AEC0" />
-        <Limb Name="gGoronElderLowerLipLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LOWER_LIP" Offset="0x1AECC" />
-        <Limb Name="gGoronElderBeardRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_BEARD_ROOT" Offset="0x1AED8" />
-        <Limb Name="gGoronElderUpperBeardLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_UPPER_BEARD" Offset="0x1AEE4" />
-        <Limb Name="gGoronElderLowerBeardLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LOWER_BEARD" Offset="0x1AEF0" />
-        <Limb Name="gGoronElderPelvisLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_PELVIS" Offset="0x1AEFC" />
-        <Limb Name="gGoronElderLeftLegRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_LEG_ROOT" Offset="0x1AF08" />
-        <Limb Name="gGoronElderLeftThighLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_THIGH" Offset="0x1AF14" />
-        <Limb Name="gGoronElderLeftShinLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_SHIN" Offset="0x1AF20" />
-        <Limb Name="gGoronElderLeftFootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_FOOT" Offset="0x1AF2C" />
-        <Limb Name="gGoronElderRightLegRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_LEG_ROOT" Offset="0x1AF38" />
-        <Limb Name="gGoronElderRightThighLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_THIGH" Offset="0x1AF44" />
-        <Limb Name="gGoronElderRightShinLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_SHIN" Offset="0x1AF50" />
-        <Limb Name="gGoronElderRightFootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_FOOT" Offset="0x1AF5C" />
-
-        <!-- Goron Elder Skeleton -->
-        <Skeleton Name="gGoronElderSkel" Type="Flex" LimbType="Standard" LimbNone="GORON_ELDER_LIMB_NONE" LimbMax="GORON_ELDER_LIMB_MAX" EnumName="GoronElderLimb" Offset="0x1AFF0" />
-
-        <!-- Drum Animation, Limb, and Skeleton -->
-        <Animation Name="gGoronElderDrumTakeOutAnim" Offset="0x1B1E8" /> <!-- Original name is "jggakki_dasu" ("get out") -->
-        <Limb Name="gGoronElderDrumLimb" Type="Standard" EnumName="GORON_ELDER_DRUM_LIMB_ROOT" Offset="0x1B200" />
-        <Skeleton Name="gGoronElderDrumSkel" Type="Normal" LimbType="Standard" LimbNone="GORON_ELDER_DRUM_LIMB_NONE" LimbMax="GORON_ELDER_DRUM_LIMB_MAX" EnumName="GoronElderDrumLimb" Offset="0x1B210" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_js.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_js.xml
deleted file mode 100644
index 6d93f7ac2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_js.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<Root>
-    <File Name="object_js" Segment="6">
-        <Animation Name="object_js_Anim_00016C" Offset="0x16C" /> <!-- Original name is "js_chigau" -->
-        <Animation Name="object_js_Anim_0003DC" Offset="0x3DC" /> <!-- Original name is "js_chigau2wait" -->
-        <Animation Name="object_js_Anim_000AD4" Offset="0xAD4" /> <!-- Original name is "js_furueru" -->
-        <Animation Name="object_js_Anim_000C7C" Offset="0xC7C" /> <!-- Original name is "js_maido" -->
-        <Animation Name="object_js_Anim_000F4C" Offset="0xF4C" /> <!-- Original name is "js_matsu" -->
-        <DList Name="object_js_DL_003F30" Offset="0x3F30" />
-        <DList Name="object_js_DL_004510" Offset="0x4510" />
-        <DList Name="object_js_DL_004688" Offset="0x4688" />
-        <DList Name="object_js_DL_004868" Offset="0x4868" />
-        <DList Name="object_js_DL_004B60" Offset="0x4B60" />
-        <DList Name="object_js_DL_004EA0" Offset="0x4EA0" />
-        <DList Name="object_js_DL_004FD0" Offset="0x4FD0" />
-        <DList Name="object_js_DL_005178" Offset="0x5178" />
-        <DList Name="object_js_DL_0052D8" Offset="0x52D8" />
-        <DList Name="object_js_DL_005408" Offset="0x5408" />
-        <DList Name="object_js_DL_0055B0" Offset="0x55B0" />
-        <Texture Name="object_js_TLUT_005710" OutName="tlut_005710" Format="rgba16" Width="16" Height="16" Offset="0x5710" />
-        <Texture Name="object_js_Tex_005910" OutName="tex_005910" Format="ci8" Width="8" Height="16" Offset="0x5910" />
-        <Texture Name="object_js_Tex_005990" OutName="tex_005990" Format="ci8" Width="16" Height="16" Offset="0x5990" />
-        <Texture Name="object_js_Tex_005A90" OutName="tex_005A90" Format="ci8" Width="32" Height="16" Offset="0x5A90" />
-        <Texture Name="object_js_Tex_005C90" OutName="tex_005C90" Format="ci8" Width="8" Height="8" Offset="0x5C90" />
-        <Texture Name="object_js_Tex_005CD0" OutName="tex_005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" />
-        <Texture Name="object_js_Tex_0060D0" OutName="tex_0060D0" Format="ci8" Width="16" Height="16" Offset="0x60D0" />
-        <Texture Name="object_js_Tex_0061D0" OutName="tex_0061D0" Format="ci8" Width="16" Height="32" Offset="0x61D0" />
-        <Texture Name="object_js_Tex_0063D0" OutName="tex_0063D0" Format="ci8" Width="16" Height="32" Offset="0x63D0" />
-        <Texture Name="object_js_Tex_0065D0" OutName="tex_0065D0" Format="ci8" Width="16" Height="32" Offset="0x65D0" />
-        <Texture Name="object_js_Tex_0067D0" OutName="tex_0067D0" Format="ci8" Width="16" Height="16" Offset="0x67D0" />
-        <Limb Name="object_js_Standardlimb_0068D0" Type="Standard" EnumName="OBJECT_JS_LIMB_01" Offset="0x68D0" />
-        <Limb Name="object_js_Standardlimb_0068DC" Type="Standard" EnumName="OBJECT_JS_LIMB_02" Offset="0x68DC" />
-        <Limb Name="object_js_Standardlimb_0068E8" Type="Standard" EnumName="OBJECT_JS_LIMB_03" Offset="0x68E8" />
-        <Limb Name="object_js_Standardlimb_0068F4" Type="Standard" EnumName="OBJECT_JS_LIMB_04" Offset="0x68F4" />
-        <Limb Name="object_js_Standardlimb_006900" Type="Standard" EnumName="OBJECT_JS_LIMB_05" Offset="0x6900" />
-        <Limb Name="object_js_Standardlimb_00690C" Type="Standard" EnumName="OBJECT_JS_LIMB_06" Offset="0x690C" />
-        <Limb Name="object_js_Standardlimb_006918" Type="Standard" EnumName="OBJECT_JS_LIMB_07" Offset="0x6918" />
-        <Limb Name="object_js_Standardlimb_006924" Type="Standard" EnumName="OBJECT_JS_LIMB_08" Offset="0x6924" />
-        <Limb Name="object_js_Standardlimb_006930" Type="Standard" EnumName="OBJECT_JS_LIMB_09" Offset="0x6930" />
-        <Limb Name="object_js_Standardlimb_00693C" Type="Standard" EnumName="OBJECT_JS_LIMB_0A" Offset="0x693C" />
-        <Limb Name="object_js_Standardlimb_006948" Type="Standard" EnumName="OBJECT_JS_LIMB_0B" Offset="0x6948" />
-        <Limb Name="object_js_Standardlimb_006954" Type="Standard" EnumName="OBJECT_JS_LIMB_0C" Offset="0x6954" />
-        <Skeleton Name="object_js_Skel_006990" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JS_LIMB_NONE" LimbMax="OBJECT_JS_LIMB_MAX" EnumName="ObjectJsLimb" Offset="0x6990" />
-        <Collision Name="object_js_Colheader_0069E8" Offset="0x69E8" /> <!-- Original name is "test_floor_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_jso.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_jso.xml
deleted file mode 100644
index d94ffdafe..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_jso.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<Root>
-    <!-- Assets for Garos and the Garo Master -->
-    <File Name="object_jso" Segment="6">
-        <!-- Unused Empty Texture Animations -->
-        <TextureAnimation Name="gGaroEmpty1TexAnim" Offset="0x0" />
-        <TextureAnimation Name="gGaroEmpty2TexAnim" Offset="0x10" />
-
-        <!-- Garo Master Limb DisplayLists -->
-        <DList Name="gGaroMasterLeftThighDL" Offset="0x1210" />
-        <DList Name="gGaroMasterLeftShinDL" Offset="0x1348" />
-        <DList Name="gGaroMasterLeftFootDL" Offset="0x13F8" />
-        <DList Name="gGaroMasterRightThighDL" Offset="0x1508" />
-        <DList Name="gGaroMasterRightShinDL" Offset="0x1640" />
-        <DList Name="gGaroMasterRightFootDL" Offset="0x16F0" />
-        <DList Name="gGaroMasterTorsoDL" Offset="0x1800" />
-        <DList Name="gGaroMasterHeadDL" Offset="0x1908" />
-        <DList Name="gGaroMasterRobeTopDL" Offset="0x1A18" />
-        <DList Name="gGaroMasterRobeFrontDL" Offset="0x1B00" />
-        <DList Name="gGaroMasterRobeRightDL" Offset="0x1C48" />
-        <DList Name="gGaroMasterRobeLeftDL" Offset="0x1D78" />
-        <DList Name="gGaroMasterRobeBackDL" Offset="0x1EA8" />
-        <DList Name="gGaroMasterRightArmDL" Offset="0x1FA8" />
-        <DList Name="gGaroMasterRightSwordDL" Offset="0x1FF8" />
-        <DList Name="gGaroMasterLeftArmDL" Offset="0x20B0" />
-        <DList Name="gGaroMasterLeftSwordDL" Offset="0x2100" />
-
-        <!-- Garo Master Textures -->
-        <Texture Name="gGaroMasterUnusedLegWrappingTex" OutName="garo_master_unused_leg_wrapping" Format="rgba16" Width="8" Height="16" Offset="0x21B8" /> <!-- unused duplicate of gGaroLegWrappingTex -->
-        <Texture Name="gGaroMasterRobeFrontTex" OutName="garo_master_robe_front" Format="rgba16" Width="16" Height="16" Offset="0x22B8" />
-        <Texture Name="gGaroMasterShinTex" OutName="garo_master_shin" Format="rgba16" Width="8" Height="16" Offset="0x24B8" />
-        <Texture Name="gGaroMasterDuplicateEyeTex" OutName="garo_master_duplicate_eye" Format="rgba16" Width="8" Height="8" Offset="0x25B8" /> <!-- unused duplicate of gGaroMasterEyeTex -->
-        <Texture Name="gGaroMasterSwordTex" OutName="garo_master_sword" Format="rgba16" Width="4" Height="4" Offset="0x2638" />
-        <Texture Name="gGaroMasterRobeTex" OutName="garo_master_robe" Format="rgba16" Width="8" Height="32" Offset="0x2658" />
-        <Texture Name="gGaroMasterClothingTLUT" OutName="garo_master_clothing_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2858" />
-        <Texture Name="gGaroMasterMaskTLUT" OutName="garo_master_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2A58" />
-        <Texture Name="gGaroMasterClothingTex" OutName="garo_master_clothing" Format="ci8" Width="16" Height="16" Offset="0x2C58" />
-        <Texture Name="gGaroMasterMaskTex" OutName="garo_master_mask" Format="ci8" Width="16" Height="16" Offset="0x2D58" />
-
-        <!-- Garo Master Eyes Texture and DisplayList -->
-        <DList Name="gGaroMasterEyesDL" Offset="0x2ED8" />
-        <Texture Name="gGaroMasterEyeTex" OutName="garo_master_eye" Format="rgba16" Width="8" Height="8" Offset="0x2FB8" />
-
-        <!-- Garo Master Limbs -->
-        <Limb Name="gGaroMasterRootLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROOT" Offset="0x3038" />
-        <Limb Name="gGaroMasterTorsoLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_TORSO" Offset="0x3044" />
-        <Limb Name="gGaroMasterLeftArmLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LEFT_ARM" Offset="0x3050" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <Limb Name="gGaroMasterLeftSwordLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LEFT_SWORD" Offset="0x305C" />
-        <Limb Name="gGaroMasterRightArmLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_RIGHT_ARM" Offset="0x3068" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <Limb Name="gGaroMasterRightSwordLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_RIGHT_SWORD" Offset="0x3074" />
-        <Limb Name="gGaroMasterRobeTopLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROBE_TOP" Offset="0x3080" />
-        <Limb Name="gGaroMasterRobeBackLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROBE_BACK" Offset="0x308C" />
-        <Limb Name="gGaroMasterRobeLeftLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROBE_LEFT" Offset="0x3098" />
-        <Limb Name="gGaroMasterRobeRightLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROBE_RIGHT" Offset="0x30A4" />
-        <Limb Name="gGaroMasterRobeFrontLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROBE_FRONT" Offset="0x30B0" />
-        <Limb Name="gGaroMasterHeadLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_HEAD" Offset="0x30BC" />
-        <Limb Name="gGaroMasterLowerBodyRootLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LOWER_BODY_ROOT" Offset="0x30C8" />
-        <Limb Name="gGaroMasterRightThighLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_RIGHT_THIGH" Offset="0x30D4" />
-        <Limb Name="gGaroMasterRightShinLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_RIGHT_SHIN" Offset="0x30E0" />
-        <Limb Name="gGaroMasterRightFootLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_RIGHT_FOOT" Offset="0x30EC" />
-        <Limb Name="gGaroMasterLeftThighLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LEFT_THIGH" Offset="0x30F8" />
-        <Limb Name="gGaroMasterLeftShinLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LEFT_SHIN" Offset="0x3104" />
-        <Limb Name="gGaroMasterLeftFootLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LEFT_FOOT" Offset="0x3110" />
-
-        <!-- Garo Master Skeleton -->
-        <Skeleton Name="gGaroMasterSkel" Type="Flex" LimbType="Standard" LimbNone="GARO_MASTER_LIMB_NONE" LimbMax="GARO_MASTER_LIMB_MAX" EnumName="GaroMasterLimb" Offset="0x3168" />
-
-        <!-- Garo and Garo Master Animations -->
-        <Animation Name="gGaroStaticJumpPoseAnim" Offset="0x3238" /> <!-- Unused, one-frame long animation of the Garo jumping or falling. Original name is "jsk_pose" -->
-        <Animation Name="gGaroDashAttackAnim" Offset="0x3530" /> <!-- Original name is "jso_attack1" -->
-        <Animation Name="gGaroSlashStartAnim" Offset="0x378C" /> <!-- Original name is "jso_attack2" -->
-        <Animation Name="gGaroSlashLoopAnim" Offset="0x38AC" /> <!-- Original name is "jso_attack_wait" -->
-        <Animation Name="gGaroJumpBackAnim" Offset="0x3D5C" /> <!-- Original name is "jso_back" -->
-        <Animation Name="gGaroTakeOutBombAnim" Offset="0x4018" /> <!-- Original name is "jso_bomb" -->
-        <Animation Name="gGaroLandAnim" Offset="0x4384" /> <!-- Original name is "jso_chakuchiD" ("chakuchi" = "landing", "D" is probably short for "demo") -->
-        <Animation Name="gGaroDamagedAnim" Offset="0x44F8" /> <!-- Original name is "jso_damage" -->
-        <Animation Name="gGaroGuardAnim" Offset="0x4858" /> <!-- Original name is "jso_defense" -->
-        <Animation Name="gGaroAppearAndDrawSwordsAnim" Offset="0x5778" /> <!-- Original name is "jso_demo_start" -->
-        <Animation Name="gGaroFallDownAnim" Offset="0x5D5C" /> <!-- Original name is "jso_down" -->
-        <Animation Name="gGaroKnockedBackAnim" Offset="0x603C" /> <!-- Original name is "jso_hajiku" ("repelled" or "bounced back") -->
-        <Animation Name="gGaroTrembleAnim" Offset="0x63A4" /> <!-- Original name is "jso_henahena" (onomatopoeic for "weakly; helplessly​") -->
-        <Animation Name="gGaroCollapseAnim" Offset="0x67F0" /> <!-- Original name is "jso_hetari" ("to sink down to the floor") -->
-        <Animation Name="gGaroDrawSwordsAnim" Offset="0x70BC" /> <!-- Original name is "jso_jakin" (possibly onomatopoeic for drawing a sword from a sheath) -->
-        <Animation Name="gGaroJumpDownAnim" Offset="0x71E0" /> <!-- Original name is "jso_jumpD" -->
-        <Animation Name="gGaroSpinAttackAnim" Offset="0x72AC" /> <!-- Original name is "jso_kaiten" ("rotation; turn; spin") -->
-        <Animation Name="gGaroLookAroundAnim" Offset="0x788C" /> <!-- Original name is "jso_kyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="gGaroCowerAnim" Offset="0x7B04" /> <!-- Original name is "jso_ororo" (possibly onomatopoeic for "in a panic; helplessly" or "sobbing; tearfully") -->
-        <Animation Name="gGaroAppearAnim" Offset="0x81F4" /> <!-- Original name is "jso_start" -->
-
-        <!-- Garo Limb DisplayLists -->
-        <DList Name="gGaroLeftThighDL" Offset="0x8F50" />
-        <DList Name="gGaroLeftShinDL" Offset="0x9008" />
-        <DList Name="gGaroLeftFootDL" Offset="0x90C0" />
-        <DList Name="gGaroRightThighDL" Offset="0x9190" />
-        <DList Name="gGaroRightShinDL" Offset="0x9248" />
-        <DList Name="gGaroRightFootDL" Offset="0x9300" />
-        <DList Name="gGaroTorsoDL" Offset="0x93D0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gGaroHeadDL" Offset="0x9428" />
-        <DList Name="gGaroRobeTopDL" Offset="0x94E0" />
-        <DList Name="gGaroRobeFrontDL" Offset="0x9758" />
-        <DList Name="gGaroRobeRightDL" Offset="0x98C8" />
-        <DList Name="gGaroRobeLeftDL" Offset="0x99B8" />
-        <DList Name="gGaroRobeBackDL" Offset="0x9AA8" />
-        <DList Name="gGaroRightArmDL" Offset="0x9B80" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gGaroRightSwordDL" Offset="0x9BD8" />
-        <DList Name="gGaroLeftArmDL" Offset="0x9C98" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gGaroLeftSwordDL" Offset="0x9CF0" />
-
-        <!-- Garo Textures -->
-        <Texture Name="gGaroLegWrappingTex" OutName="garo_leg_wrapping" Format="rgba16" Width="8" Height="16" Offset="0x9DB0" />
-        <Texture Name="gGaroThighTex" OutName="garo_thigh" Format="rgba16" Width="8" Height="8" Offset="0x9EB0" />
-        <Texture Name="gGaroRobeFrontTex" OutName="garo_robe_front" Format="rgba16" Width="16" Height="32" Offset="0x9F30" />
-        <Texture Name="gGaroRobeTex" OutName="garo_robe" Format="rgba16" Width="16" Height="16" Offset="0xA330" />
-        <Texture Name="gGaroRobeStitchingTex" OutName="garo_robe_stitching" Format="rgba16" Width="16" Height="8" Offset="0xA530" />
-        <Texture Name="gGaroRobeTopTex" OutName="garo_robe_top" Format="rgba16" Width="8" Height="8" Offset="0xA630" />
-        <Texture Name="gGaroEyesTex" OutName="garo_eyes" Format="rgba16" Width="16" Height="16" Offset="0xA6B0" />
-        <Texture Name="gGaroSwordTex" OutName="garo_sword" Format="rgba16" Width="4" Height="4" Offset="0xA8B0" />
-
-        <!-- Garo Limbs -->
-        <Limb Name="gGaroRootLimb" Type="Standard" EnumName="GARO_LIMB_ROOT" Offset="0xA8D0" />
-        <Limb Name="gGaroTorsoLimb" Type="Standard" EnumName="GARO_LIMB_TORSO" Offset="0xA8DC" />
-        <Limb Name="gGaroLeftArmLimb" Type="Standard" EnumName="GARO_LIMB_LEFT_ARM" Offset="0xA8E8" />
-        <Limb Name="gGaroLeftSwordLimb" Type="Standard" EnumName="GARO_LIMB_LEFT_SWORD" Offset="0xA8F4" />
-        <Limb Name="gGaroRightArmLimb" Type="Standard" EnumName="GARO_LIMB_RIGHT_ARM" Offset="0xA900" />
-        <Limb Name="gGaroRightSwordLimb" Type="Standard" EnumName="GARO_LIMB_RIGHT_SWORD" Offset="0xA90C" />
-        <Limb Name="gGaroRobeTopLimb" Type="Standard" EnumName="GARO_LIMB_ROBE_TOP" Offset="0xA918" />
-        <Limb Name="gGaroRobeBackLimb" Type="Standard" EnumName="GARO_LIMB_ROBE_BACK" Offset="0xA924" />
-        <Limb Name="gGaroRobeLeftLimb" Type="Standard" EnumName="GARO_LIMB_ROBE_LEFT" Offset="0xA930" />
-        <Limb Name="gGaroRobeRightLimb" Type="Standard" EnumName="GARO_LIMB_ROBE_RIGHT" Offset="0xA93C" />
-        <Limb Name="gGaroRobeFrontLimb" Type="Standard" EnumName="GARO_LIMB_ROBE_FRONT" Offset="0xA948" />
-        <Limb Name="gGaroHeadLimb" Type="Standard" EnumName="GARO_LIMB_HEAD" Offset="0xA954" />
-        <Limb Name="gGaroLowerBodyRootLimb" Type="Standard" EnumName="GARO_LIMB_LOWER_BODY_ROOT" Offset="0xA960" />
-        <Limb Name="gGaroRightThighLimb" Type="Standard" EnumName="GARO_LIMB_RIGHT_THIGH" Offset="0xA96C" />
-        <Limb Name="gGaroRightShinLimb" Type="Standard" EnumName="GARO_LIMB_RIGHT_SHIN" Offset="0xA978" />
-        <Limb Name="gGaroRightFootLimb" Type="Standard" EnumName="GARO_LIMB_RIGHT_FOOT" Offset="0xA984" />
-        <Limb Name="gGaroLeftThighLimb" Type="Standard" EnumName="GARO_LIMB_LEFT_THIGH" Offset="0xA990" />
-        <Limb Name="gGaroLeftShinLimb" Type="Standard" EnumName="GARO_LIMB_LEFT_SHIN" Offset="0xA99C" />
-        <Limb Name="gGaroLeftFootLimb" Type="Standard" EnumName="GARO_LIMB_LEFT_FOOT" Offset="0xA9A8" />
-
-        <!-- Garo Skeleton -->
-        <Skeleton Name="gGaroSkel" Type="Flex" LimbType="Standard" LimbNone="GARO_LIMB_NONE" LimbMax="GARO_LIMB_MAX" EnumName="GaroLimb" Offset="0xAA00" />
-
-        <!-- Garo and Garo Master Animations -->
-        <Animation Name="gGaroIdleAnim" Offset="0xAE80" /> <!-- Original name is "jso_wait" -->
-        <Animation Name="gGaroLaughAnim" Offset="0xB1DC" /> <!-- Original name is "jso_waitD" -->
-        <Animation Name="gGaroBounceAnim" Offset="0xB5F0" /> <!-- Original name is "jso_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ka.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ka.xml
deleted file mode 100644
index 914617b41..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ka.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Root>
-    <!-- Assets for Pierre, the scarecrow -->
-    <File Name="object_ka" Segment="6">
-        <Animation Name="object_ka_Anim_000214" Offset="0x214" /> <!-- Original name is "dance" -->
-        <DList Name="object_ka_DL_001550" Offset="0x1550" />
-        <DList Name="object_ka_DL_001600" Offset="0x1600" />
-        <DList Name="object_ka_DL_0017D8" Offset="0x17D8" />
-        <DList Name="object_ka_DL_001878" Offset="0x1878" />
-        <DList Name="object_ka_DL_001918" Offset="0x1918" />
-        <DList Name="object_ka_DL_0019B8" Offset="0x19B8" />
-        <DList Name="object_ka_DL_001CD8" Offset="0x1CD8" />
-        <DList Name="object_ka_DL_001F68" Offset="0x1F68" />
-        <DList Name="object_ka_DL_002020" Offset="0x2020" />
-        <DList Name="object_ka_DL_0020C0" Offset="0x20C0" />
-        <DList Name="object_ka_DL_002160" Offset="0x2160" />
-        <DList Name="object_ka_DL_002200" Offset="0x2200" />
-        <DList Name="object_ka_DL_0022A0" Offset="0x22A0" />
-        <DList Name="object_ka_DL_002340" Offset="0x2340" />
-        <DList Name="object_ka_DL_002430" Offset="0x2430" />
-        <DList Name="object_ka_DL_0024D0" Offset="0x24D0" />
-        <DList Name="object_ka_DL_002570" Offset="0x2570" />
-        <DList Name="object_ka_DL_002610" Offset="0x2610" />
-        <DList Name="object_ka_DL_0027A0" Offset="0x27A0" />
-        <DList Name="object_ka_DL_002890" Offset="0x2890" />
-        <DList Name="object_ka_DL_002930" Offset="0x2930" />
-        <DList Name="object_ka_DL_0029D0" Offset="0x29D0" />
-        <DList Name="object_ka_DL_002A70" Offset="0x2A70" />
-        <Texture Name="object_ka_Tex_002C00" OutName="tex_002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00" />
-        <Texture Name="object_ka_Tex_003400" OutName="tex_003400" Format="rgba16" Width="32" Height="32" Offset="0x3400" />
-        <Texture Name="object_ka_Tex_003C00" OutName="tex_003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00" />
-        <Texture Name="object_ka_Tex_004400" OutName="tex_004400" Format="rgba16" Width="32" Height="32" Offset="0x4400" />
-        <Texture Name="object_ka_Tex_004C00" OutName="tex_004C00" Format="rgba16" Width="32" Height="32" Offset="0x4C00" />
-        <Texture Name="object_ka_Tex_005400" OutName="tex_005400" Format="rgba16" Width="32" Height="32" Offset="0x5400" />
-        <Texture Name="object_ka_Tex_005C00" OutName="tex_005C00" Format="rgba16" Width="32" Height="32" Offset="0x5C00" />
-        <Limb Name="object_ka_Standardlimb_006400" Type="Standard" EnumName="OBJECT_KA_LIMB_01" Offset="0x6400" />
-        <Limb Name="object_ka_Standardlimb_00640C" Type="Standard" EnumName="OBJECT_KA_LIMB_02" Offset="0x640C" />
-        <Limb Name="object_ka_Standardlimb_006418" Type="Standard" EnumName="OBJECT_KA_LIMB_03" Offset="0x6418" />
-        <Limb Name="object_ka_Standardlimb_006424" Type="Standard" EnumName="OBJECT_KA_LIMB_04" Offset="0x6424" />
-        <Limb Name="object_ka_Standardlimb_006430" Type="Standard" EnumName="OBJECT_KA_LIMB_05" Offset="0x6430" />
-        <Limb Name="object_ka_Standardlimb_00643C" Type="Standard" EnumName="OBJECT_KA_LIMB_06" Offset="0x643C" />
-        <Limb Name="object_ka_Standardlimb_006448" Type="Standard" EnumName="OBJECT_KA_LIMB_07" Offset="0x6448" />
-        <Limb Name="object_ka_Standardlimb_006454" Type="Standard" EnumName="OBJECT_KA_LIMB_08" Offset="0x6454" />
-        <Limb Name="object_ka_Standardlimb_006460" Type="Standard" EnumName="OBJECT_KA_LIMB_09" Offset="0x6460" />
-        <Limb Name="object_ka_Standardlimb_00646C" Type="Standard" EnumName="OBJECT_KA_LIMB_0A" Offset="0x646C" />
-        <Limb Name="object_ka_Standardlimb_006478" Type="Standard" EnumName="OBJECT_KA_LIMB_0B" Offset="0x6478" />
-        <Limb Name="object_ka_Standardlimb_006484" Type="Standard" EnumName="OBJECT_KA_LIMB_0C" Offset="0x6484" />
-        <Limb Name="object_ka_Standardlimb_006490" Type="Standard" EnumName="OBJECT_KA_LIMB_0D" Offset="0x6490" />
-        <Limb Name="object_ka_Standardlimb_00649C" Type="Standard" EnumName="OBJECT_KA_LIMB_0E" Offset="0x649C" />
-        <Limb Name="object_ka_Standardlimb_0064A8" Type="Standard" EnumName="OBJECT_KA_LIMB_0F" Offset="0x64A8" />
-        <Limb Name="object_ka_Standardlimb_0064B4" Type="Standard" EnumName="OBJECT_KA_LIMB_10" Offset="0x64B4" />
-        <Limb Name="object_ka_Standardlimb_0064C0" Type="Standard" EnumName="OBJECT_KA_LIMB_11" Offset="0x64C0" />
-        <Limb Name="object_ka_Standardlimb_0064CC" Type="Standard" EnumName="OBJECT_KA_LIMB_12" Offset="0x64CC" />
-        <Limb Name="object_ka_Standardlimb_0064D8" Type="Standard" EnumName="OBJECT_KA_LIMB_13" Offset="0x64D8" />
-        <Limb Name="object_ka_Standardlimb_0064E4" Type="Standard" EnumName="OBJECT_KA_LIMB_14" Offset="0x64E4" />
-        <Limb Name="object_ka_Standardlimb_0064F0" Type="Standard" EnumName="OBJECT_KA_LIMB_15" Offset="0x64F0" />
-        <Limb Name="object_ka_Standardlimb_0064FC" Type="Standard" EnumName="OBJECT_KA_LIMB_16" Offset="0x64FC" />
-        <Limb Name="object_ka_Standardlimb_006508" Type="Standard" EnumName="OBJECT_KA_LIMB_17" Offset="0x6508" />
-        <Limb Name="object_ka_Standardlimb_006514" Type="Standard" EnumName="OBJECT_KA_LIMB_18" Offset="0x6514" />
-        <Limb Name="object_ka_Standardlimb_006520" Type="Standard" EnumName="OBJECT_KA_LIMB_19" Offset="0x6520" />
-        <Limb Name="object_ka_Standardlimb_00652C" Type="Standard" EnumName="OBJECT_KA_LIMB_1A" Offset="0x652C" />
-        <Limb Name="object_ka_Standardlimb_006538" Type="Standard" EnumName="OBJECT_KA_LIMB_1B" Offset="0x6538" />
-        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KA_LIMB_NONE" LimbMax="OBJECT_KA_LIMB_MAX" EnumName="ObjectKaLimb" Offset="0x65B0" />
-        <Animation Name="object_ka_Anim_00686C" Offset="0x686C" /> <!-- Original name is "ka_basicdance" -->
-        <Animation Name="object_ka_Anim_006A6C" Offset="0x6A6C" /> <!-- Original name is "ka_dance" (this animation was removed in MM3D, but it's present in OoT3D) -->
-        <Animation Name="object_ka_Anim_0071EC" Offset="0x71EC" /> <!-- Original name is "ka_hello" -->
-        <Animation Name="object_ka_Anim_007444" Offset="0x7444" /> <!-- Original name is "ka_newwait" -->
-        <Animation Name="object_ka_Anim_007B90" Offset="0x7B90" /> <!-- Original name is "ka_onegai" -->
-        <Animation Name="object_ka_Anim_0081A4" Offset="0x81A4" /> <!-- Original name is "ka_turndance" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kaizoku_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kaizoku_obj.xml
deleted file mode 100644
index c13f32125..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kaizoku_obj.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-    <File Name="object_kaizoku_obj" Segment="6">
-        <DList Name="object_kaizoku_obj_DL_0001A0" Offset="0x1A0" /> <!-- Original name is "Y2_KaizokuShutter_model" -->
-        <Texture Name="object_kaizoku_obj_Tex_000300" OutName="tex_000300" Format="rgba16" Width="32" Height="64" Offset="0x300" />
-        <DList Name="gPirateLiftPlatformDL" Offset="0x1680" />
-        <Collision Name="gPirateLiftPlatformCol" Offset="0x19B0" />
-        <Texture Name="object_kaizoku_obj_Tex_0019E0" OutName="tex_0019E0" Format="rgba16" Width="64" Height="32" Offset="0x19E0" />
-        <Texture Name="object_kaizoku_obj_Tex_0029E0" OutName="tex_0029E0" Format="rgba16" Width="16" Height="32" Offset="0x29E0" />
-        <Texture Name="object_kaizoku_obj_Tex_002DE0" OutName="tex_002DE0" Format="rgba16" Width="16" Height="16" Offset="0x2DE0" />
-        <DList Name="gPirateBarredShutterDL" Offset="0x32A0" /> <!-- Original name is "Y2_AMIdoor_model" -->
-        <Collision Name="gPirateBarredShutterCol" Offset="0x35B0" /> <!-- Original name is "Y2_AMIdoor_bgdatainfo" -->
-        <Texture Name="object_kaizoku_obj_Tex_0035E0" OutName="tex_0035E0" Format="rgba16" Width="32" Height="64" Offset="0x35E0" />
-        <Texture Name="object_kaizoku_obj_Tex_0045E0" OutName="tex_0045E0" Format="rgba16" Width="32" Height="32" Offset="0x45E0" />
-        <Texture Name="object_kaizoku_obj_Tex_004DE0" OutName="tex_004DE0" Format="rgba16" Width="32" Height="16" Offset="0x4DE0" />
-        <DList Name="gPirateGratedShutterDL" Offset="0x5720" /> <!-- Original name is "Y2_AMIshutter_model" -->
-        <Collision Name="gPirateGratedShutterCol" Offset="0x5EC8" /> <!-- Original name is "Y2_AMIshutter_bgdatainfo" -->
-        <Texture Name="object_kaizoku_obj_TLUT_005F00" OutName="tlut_005F00" Format="rgba16" Width="4" Height="4" Offset="0x5F00" />
-        <Texture Name="object_kaizoku_obj_Tex_005F20" OutName="tex_005F20" Format="ci4" Width="64" Height="64" Offset="0x5F20" />
-        <DList Name="object_kaizoku_obj_DL_007630" Offset="0x7630" /> <!-- Original name is "Y2_boat_model" -->
-        <Texture Name="object_kaizoku_obj_TLUT_0083C8" OutName="tlut_0083C8" Format="rgba16" Width="16" Height="16" Offset="0x83C8" />
-        <Texture Name="object_kaizoku_obj_TLUT_0085C8" OutName="tlut_0085C8" Format="rgba16" Width="4" Height="4" Offset="0x85C8" />
-        <Texture Name="object_kaizoku_obj_TLUT_0085E8" OutName="tlut_0085E8" Format="rgba16" Width="4" Height="4" Offset="0x85E8" />
-        <Texture Name="object_kaizoku_obj_Tex_008608" OutName="tex_008608" Format="ci8" Width="16" Height="32" Offset="0x8608" />
-        <Texture Name="object_kaizoku_obj_Tex_008808" OutName="tex_008808" Format="ci8" Width="32" Height="16" Offset="0x8808" />
-        <Texture Name="object_kaizoku_obj_Tex_008A08" OutName="tex_008A08" Format="ci8" Width="16" Height="16" Offset="0x8A08" />
-        <Texture Name="object_kaizoku_obj_Tex_008B08" OutName="tex_008B08" Format="ci4" Width="32" Height="32" Offset="0x8B08" />
-        <Texture Name="object_kaizoku_obj_Tex_008D08" OutName="tex_008D08" Format="ci8" Width="32" Height="32" Offset="0x8D08" />
-        <Texture Name="object_kaizoku_obj_Tex_009108" OutName="tex_009108" Format="ci8" Width="32" Height="32" Offset="0x9108" />
-        <Texture Name="object_kaizoku_obj_Tex_009508" OutName="tex_009508" Format="ci4" Width="4" Height="4" Offset="0x9508" />
-        <Collision Name="object_kaizoku_obj_Colheader_009A88" Offset="0x9A88" /> <!-- Original name is "Y2_boat_bgdatainfo" -->
-        <DList Name="gPiratesFortressDoorDL" Offset="0x9F20" /> <!-- Original name is "Y2_KaizokuDoor_model" -->
-        <Texture Name="gPiratesFortressDoorTex" OutName="door" Format="rgba16" Width="16" Height="64" Offset="0xA210" />
-        <Texture Name="object_kaizoku_obj_Tex_00AA10" OutName="tex_00AA10" Format="i4" Width="32" Height="32" Offset="0xAA10" />
-        <DList Name="object_kaizoku_obj_DL_00AD50" Offset="0xAD50" /> <!-- Original name is "Y2_kibako_model" -->
-        <Texture Name="object_kaizoku_obj_TLUT_00AF38" OutName="tlut_00AF38" Format="rgba16" Width="4" Height="4" Offset="0xAF38" />
-        <Texture Name="object_kaizoku_obj_TLUT_00AF58" OutName="tlut_00AF58" Format="rgba16" Width="4" Height="4" Offset="0xAF58" />
-        <Texture Name="object_kaizoku_obj_Tex_00AF78" OutName="tex_00AF78" Format="ci4" Width="32" Height="64" Offset="0xAF78" />
-        <Texture Name="object_kaizoku_obj_Tex_00B378" OutName="tex_00B378" Format="ci4" Width="32" Height="64" Offset="0xB378" />
-        <Collision Name="object_kaizoku_obj_Colheader_00B868" Offset="0xB868" /> <!-- Original name is "Y2_kibako_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kamejima.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kamejima.xml
deleted file mode 100644
index 272a541be..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kamejima.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<Root>
-    <!-- Assest for the giant turtle and wave he creates -->
-    <File Name="object_kamejima" Segment="6">
-        <!-- Turtle Wave -->
-        <Array Name="gTurtleWaveVtx" Count="20" Offset="0x0">
-            <Vtx/>
-        </Array>
-        <DList Name="gTurtleWaveDL" Offset="0x140" /> <!-- Original name is "efc_wave_model" -->
-        <Texture Name="gTurtleWaveUnusedTex" OutName="turtle_wave_unused" Format="i8" Width="32" Height="64" Offset="0x2D8" />
-        <Texture Name="gTurtleWaveTex" OutName="turtle_wave" Format="i8" Width="64" Height="64" Offset="0xAD8" />
-        <TextureAnimation Name="gTurtleWaveTexAnim" Offset="0x1AF0" />
-
-
-        <!-- Turtle -->
-        <Collision Name="gTurtleZoraCapeAsleepCol" Offset="0x2328" /> <!-- Original name is "kam_all_bgdatainfo" -->
-        <TextureAnimation Name="gTurtleEmptyTexAnim" Offset="0x2360"/>
-        <Collision Name="gTurtleZoraCapeAwakeCol" Offset="0x2470" /> <!-- Original name is "kam_kamebgbox_bgdatainfo" -->
-        <Collision Name="gTurtleUnusedCol" Offset="0x2E04" /> <!-- Original name might be "kam_kamebg_bgdatainfo"? MM3D has this, but the collision vertices do not match at all. -->
-        
-        <Animation Name="gTurtleGlitchy1Anim" Offset="0x3980" /> <!-- Original name is "kam_laugh" -->
-        <Animation Name="gTurtleCoughAnim" Offset="0x47B8" /> <!-- Original name is "kam_laughlong" -->
-        <Animation Name="gTurtleIdleAnim" Offset="0x48B0" /> <!-- Original name is "kam_mezame" -->
-
-        <DList Name="gTurtleAsleepDL" Offset="0x4E70" /> <!-- When asleep, the turtle looks like a giant rock. Original name is "kam_sima_3_model" -->
-
-        <Texture Name="gTurtleAsleepTLUT" OutName="turtle_asleep_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5248" />
-        <Texture Name="gTurtleAsleepGrassTex" OutName="turtle_asleep_grass" Format="ci8" Width="32" Height="32" Offset="0x5448" />
-        <Texture Name="gTurtleAsleepGrassDirtTex" OutName="turtle_asleep_grass_dirt" Format="ci8" Width="64" Height="32" Offset="0x5848" />
-
-        <Animation Name="gTurtleSwimAnim" Offset="0x6980" /> <!-- Original name is "kam_swim" -->
-
-        <DList Name="gTurtleShellDL" Offset="0x8760" />
-        <DList Name="gTurtleFrontLeftUpperFlipperDL" Offset="0x8E18" />
-        <DList Name="gTurtleFrontLeftLowerFlipperDL" Offset="0x90E8" />
-        <DList Name="gTurtleFrontLeftEndFlipperDL" Offset="0x9278" />
-        <DList Name="gTurtleFrontRightUpperFlipperDL" Offset="0x93E8" />
-        <DList Name="gTurtleFrontRightLowerFlipperDL" Offset="0x96B8" />
-        <DList Name="gTurtleFrontRightEndFlipperDL" Offset="0x9848" />
-        <DList Name="gTurtleBackRightFlipperDL" Offset="0x99B8" />
-        <DList Name="gTurtleBackLeftFlipperDL" Offset="0x9C38" />
-        <DList Name="gTurtleTailDL" Offset="0x9E38" />
-        <DList Name="gTurtleNeckDL" Offset="0x9F18" />
-        <DList Name="gTurtleHeadDL" Offset="0xA118" />
-        <DList Name="gTurtleUpperMouthDL" Offset="0xA4B8" />
-        <DList Name="gTurtleLowerMouthDL" Offset="0xA7C8" />
-
-        <Texture Name="gTurtleSkinTLUT" OutName="turtle_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAAD8" />
-        <Texture Name="gTurtleTLUT" OutName="turtle_tlut" Format="rgba16" Width="16" Height="16" Offset="0xACD8" />
-        <Texture Name="gTurtleNostrilTex" OutName="turtle_nostril" Format="ci8" Width="32" Height="32" Offset="0xAED8" />
-        <Texture Name="gTurtleInsideUpperMouthTex" OutName="turtle_inside_upper_mouth" Format="ci8" Width="16" Height="16" Offset="0xB2D8" />
-        <Texture Name="gTurtleInsideLowerMouthTex" OutName="turtle_inside_lower_mouth" Format="ci8" Width="16" Height="32" Offset="0xB3D8"/>
-        <Texture Name="gTurtleSpottedSkinTex" OutName="turtle_spotted_skin" Format="ci8" Width="64" Height="32" Offset="0xB5D8"/>
-        <Texture Name="gTurtleSkinTex" OutName="turtle_skin" Format="ci8" Width="16" Height="16" Offset="0xBDD8" />
-        <Texture Name="gTurtleEyeOpenStraightTex" OutName="turtle_eye_open_straight" Format="ci8" Width="32" Height="32" Offset="0xBED8" TlutOffset="0xAAD8"/>
-        <Texture Name="gTurtleEyeHalfStraightTex" OutName="turtle_eye_half_straight" Format="ci8" Width="32" Height="32" Offset="0xC2D8" TlutOffset="0xAAD8"/>
-        <Texture Name="gTurtleEyeClosedTex" OutName="turtle_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xC6D8" TlutOffset="0xAAD8"/>
-        <Texture Name="gTurtleEyeHalfLeftTex" OutName="turtle_eye_half_left" Format="ci8" Width="32" Height="32" Offset="0xCAD8" TlutOffset="0xAAD8"/>
-        <Texture Name="gTurtleEyeOpenRightTex" OutName="turtle_eye_half_right" Format="ci8" Width="32" Height="32" Offset="0xCED8" TlutOffset="0xAAD8"/>
-        <Texture Name="gTurtleEyeOpenLeftTex" OutName="turtle_eye_half_left_2" Format="ci8" Width="32" Height="32" Offset="0xD2D8" TlutOffset="0xAAD8"/>
-
-        <Texture Name="gTurtleHeadTex" OutName="turtle_head" Format="ci8" Width="16" Height="16" Offset="0xD6D8"/>
-        <Texture Name="gTurtleShellGrassTex" OutName="turtle_shell_grass" Format="ci8" Width="32" Height="64" Offset="0xD7D8" />
-        <Texture Name="gTurtleShellScutesTex" OutName="turtle_shell_scutes" Format="ci8" Width="32" Height="32" Offset="0xDFD8"/>
-        <Texture Name="gTurtleShellBottomTex" OutName="turtle_shell_bottom" Format="ci8" Width="16" Height="32" Offset="0xE3D8"/>
-
-        <Limb Name="gTurtleRootLimb" Type="Standard" EnumName="TURTLE_LIMB_ROOT" Offset="0xE5D8" />
-        <Limb Name="gTurtleShellLimb" Type="Standard" EnumName="TURTLE_LIMB_SHELL" Offset="0xE5E4" />
-        <Limb Name="gTurtleNeckHeadRootLimb" Type="Standard" EnumName="TURTLE_LIMB_NECK_HEAD_ROOT" Offset="0xE5F0" />
-        <Limb Name="gTurtleNeckLimb" Type="Standard" EnumName="TURTLE_LIMB_NECK" Offset="0xE5FC" />
-        <Limb Name="gTurtleHeadLimb" Type="Standard" EnumName="TURTLE_LIMB_HEAD" Offset="0xE608" />
-        <Limb Name="gTurtleUpperMouthLimb" Type="Standard" EnumName="TURTLE_LIMB_UPPER_MOUTH" Offset="0xE614" />
-        <Limb Name="gTurtleLowerMouthRootLimb" Type="Standard" EnumName="TURTLE_LIMB_LOWER_MOUTH_ROOT" Offset="0xE620" />
-        <Limb Name="gTurtleLowerMouthLimb" Type="Standard" EnumName="TURTLE_LIMB_LOWER_MOUTH" Offset="0xE62C" />
-        <Limb Name="gTurtleBackLeftFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_LEFT_FLIPPER_ROOT" Offset="0xE638" />
-        <Limb Name="gTurtleBackLeftFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_LEFT_FLIPPER" Offset="0xE644" />
-        <Limb Name="gTurtleBackRightFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_RIGHT_FLIPPER_ROOT" Offset="0xE650" />
-        <Limb Name="gTurtleBackRightFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_RIGHT_FLIPPER" Offset="0xE65C" />
-        <Limb Name="gTurtleTailRootLimb" Type="Standard" EnumName="TURTLE_TAIL_ROOT_LIMB" Offset="0xE668" />
-        <Limb Name="gTurtleTailLimb" Type="Standard" EnumName="TURTLE_TAIL_LIMB" Offset="0xE674" />
-        <Limb Name="gTurtleTailEndRootLimb" Type="Standard" EnumName="TURTLE_TAIL_END_ROOT_LIMB" Offset="0xE680" />
-        <Limb Name="gTurtleFrontLeftFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_FLIPPER_ROOT" Offset="0xE68C" />
-        <Limb Name="gTurtleFrontLeftUpperFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_UPPER_FLIPPER" Offset="0xE698" />
-        <Limb Name="gTurtleFrontLeftLowerFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_LOWER_FLIPPER" Offset="0xE6A4" />
-        <Limb Name="gTurtleFrontLeftEndFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_END_FLIPPER" Offset="0xE6B0" />
-        <Limb Name="gTurtleFrontRightFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_FLIPPER_ROOT" Offset="0xE6BC" />
-        <Limb Name="gTurtleFrontRightUpperFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_UPPER_FLIPPER" Offset="0xE6C8" />
-        <Limb Name="gTurtleFrontRightLowerFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_LOWER_FLIPPER" Offset="0xE6D4" />
-        <Limb Name="gTurtleFrontRightEndFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_END_FLIPPER" Offset="0xE6E0" />
-        <Skeleton Name="gTurtleSkel" Type="Flex" LimbType="Standard" LimbNone="TURTLE_LIMB_NONE" LimbMax="TURTLE_LIMB_MAX" EnumName="TurtleLimb" Offset="0xE748" />
-
-        <Animation Name="gTurtleGlitchy2Anim" Offset="0xEF98" /> <!-- Original name is "kam_talk" -->
-        <Animation Name="gTurtleSpeak1Anim" Offset="0x100CC" /> <!-- Original name is "kam_talklong" -->
-        <Animation Name="gTurtleGlitchyRaiseHeadAnim" Offset="0x10918" /> <!-- Original name is "kam_unazuku" -->
-        <Animation Name="gTurtleSpeak2Anim" Offset="0x119D4" /> <!-- Original name is "kam_unazukulong" -->
-        <Animation Name="gTurtleFloatAnim" Offset="0x12260" /> <!-- Original name is "kam_wait" -->
-        <Animation Name="gTurtleGlitchyLookAroundAnim" Offset="0x13264" /> <!-- Original name is "kam_yawn" -->
-        <Animation Name="gTurtleYawnAnim" Offset="0x14E8C" /> <!-- Original name is "kam_yawnlong" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kanban.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kanban.xml
deleted file mode 100644
index e5baa90ee..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kanban.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Assets for cuttable signs -->
-    <File Name="object_kanban" Segment="6">
-        <DList Name="gSignMaterialDL" Offset="0xC30" />
-        <DList Name="gSignUpperSideLeftModelDL" Offset="0xCB0" /> <!-- Original name is "kanban_L_top_R_model" -->
-        <DList Name="gSignLeftSideUpperModelDL" Offset="0xDB8" /> <!-- Original name is "kanban_L_top_L_model" -->
-        <DList Name="gSignLeftSideLowerModelDL" Offset="0xE78" /> <!-- Original name is "kanban_L_bottom_L_model" -->
-        <DList Name="gSignRightSideUpperModelDL" Offset="0xF38" /> <!-- Original name is "kanban_R_top_R_model" -->
-        <DList Name="gSignRightSideLowerModelDL" Offset="0xFF8" /> <!-- Original name is "kanban_R_bottom_R_model" -->
-        <DList Name="gSignLowerSideLeftModelDL" Offset="0x10B8" /> <!-- Original name is "kanban_L_bottom_R_model" -->
-        <DList Name="gSignUpperSideRightModelDL" Offset="0x11C0" /> <!-- Original name is "kanban_R_top_L_model" -->
-        <DList Name="gSignLowerSideRightModelDL" Offset="0x12C8" /> <!-- Original name is "kanban_R_bottom_L_model" -->
-        <DList Name="gSignPostUpperModelDL" Offset="0x13D0" /> <!-- Original name is "kanban_bo_top_model" -->
-        <DList Name="gSignPostLowerModelDL" Offset="0x1488" /> <!-- Original name is "kanban_bo_center_model" -->
-        <DList Name="gSignPostStandModelDL" Offset="0x1540" /> <!-- Original name is "kanban_bo_bottom_model" -->
-        <DList Name="gSignParticleDL" Offset="0x1630" /> <!-- Original name is "kanban_eff_modelT" -->
-        <Texture Name="gSignParticleTex" OutName="sign_particle" Format="i8" Width="16" Height="16" Offset="0x16B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kbt.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kbt.xml
deleted file mode 100644
index bf6078da8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kbt.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Root>
-    <File Name="object_kbt" Segment="6">
-        <Animation Name="object_kbt_Anim_000670" Offset="0x670" /> <!-- Original name is "kbt_neru" -->
-        <Animation Name="object_kbt_Anim_000FE8" Offset="0xFE8" /> <!-- Original name is "kbt_nerutalk" -->
-        <Animation Name="object_kbt_Anim_001674" Offset="0x1674" /> <!-- Original name is "kbt_niramitalk" -->
-        <Animation Name="object_kbt_Anim_001940" Offset="0x1940" /> <!-- Original name is "kbt_niramu" -->
-        <Animation Name="object_kbt_Anim_001BF4" Offset="0x1BF4" /> <!-- Original name is "kbt_niramu02" -->
-        <Animation Name="object_kbt_Anim_002084" Offset="0x2084" /> <!-- Original name is "kbt_okiru" -->
-        <Animation Name="object_kbt_Anim_002710" Offset="0x2710" /> <!-- Original name is "kbt_talk01" -->
-        <Animation Name="object_kbt_Anim_002DE0" Offset="0x2DE0" /> <!-- Original name is "kbt_talk02" -->
-        <Animation Name="object_kbt_Anim_003414" Offset="0x3414" /> <!-- Original name is "kbt_talk03" -->
-        <Animation Name="object_kbt_Anim_003D24" Offset="0x3D24" /> <!-- Original name is "kbt_talk04" -->
-        <Animation Name="object_kbt_Anim_004274" Offset="0x4274" /> <!-- Original name is "kbt_testwait" -->
-        <DList Name="object_kbt_DL_007550" Offset="0x7550" />
-        <DList Name="object_kbt_DL_0076F8" Offset="0x76F8" />
-        <DList Name="object_kbt_DL_0077E0" Offset="0x77E0" />
-        <DList Name="object_kbt_DL_007940" Offset="0x7940" />
-        <DList Name="object_kbt_DL_007AE8" Offset="0x7AE8" />
-        <DList Name="object_kbt_DL_007C68" Offset="0x7C68" />
-        <DList Name="object_kbt_DL_007D50" Offset="0x7D50" />
-        <DList Name="object_kbt_DL_007E38" Offset="0x7E38" />
-        <DList Name="object_kbt_DL_008150" Offset="0x8150" />
-        <DList Name="object_kbt_DL_008738" Offset="0x8738" />
-        <DList Name="object_kbt_DL_008810" Offset="0x8810" />
-        <DList Name="object_kbt_DL_0088E8" Offset="0x88E8" />
-        <DList Name="object_kbt_DL_008A60" Offset="0x8A60" />
-        <DList Name="object_kbt_DL_008C48" Offset="0x8C48" />
-        <DList Name="object_kbt_DL_008D20" Offset="0x8D20" />
-        <DList Name="object_kbt_DL_008E98" Offset="0x8E98" />
-        <Texture Name="object_kbt_TLUT_009078" OutName="tlut_009078" Format="rgba16" Width="16" Height="16" Offset="0x9078" />
-        <Texture Name="object_kbt_Tex_009278" OutName="tex_009278" Format="i8" Width="16" Height="16" Offset="0x9278" />
-        <Texture Name="object_kbt_Tex_009378" OutName="tex_009378" Format="ci8" Width="16" Height="16" Offset="0x9378" />
-        <Texture Name="object_kbt_Tex_009478" OutName="tex_009478" Format="rgba16" Width="16" Height="16" Offset="0x9478" />
-        <Texture Name="object_kbt_Tex_009678" OutName="tex_009678" Format="rgba16" Width="32" Height="32" Offset="0x9678" />
-        <Texture Name="object_kbt_Tex_009E78" OutName="tex_009E78" Format="ci8" Width="8" Height="8" Offset="0x9E78" />
-        <Texture Name="object_kbt_Tex_009EB8" OutName="tex_009EB8" Format="ci8" Width="8" Height="8" Offset="0x9EB8" />
-        <Texture Name="object_kbt_Tex_009EF8" OutName="tex_009EF8" Format="rgba16" Width="8" Height="8" Offset="0x9EF8" />
-        <Texture Name="object_kbt_Tex_009F78" OutName="tex_009F78" Format="ci8" Width="16" Height="16" Offset="0x9F78" />
-        <Texture Name="object_kbt_Tex_00A078" OutName="tex_00A078" Format="rgba16" Width="8" Height="8" Offset="0xA078" />
-        <Texture Name="object_kbt_Tex_00A0F8" OutName="tex_00A0F8" Format="ci8" Width="16" Height="16" Offset="0xA0F8" />
-        <Texture Name="object_kbt_Tex_00A1F8" OutName="tex_00A1F8" Format="ci8" Width="16" Height="16" Offset="0xA1F8" />
-        <Texture Name="object_kbt_Tex_00A2F8" OutName="tex_00A2F8" Format="ci8" Width="8" Height="8" Offset="0xA2F8" />
-        <Texture Name="object_kbt_Tex_00A338" OutName="tex_00A338" Format="rgba16" Width="8" Height="8" Offset="0xA338" />
-        <Texture Name="object_kbt_Tex_00A3B8" OutName="tex_00A3B8" Format="ci8" Width="16" Height="32" Offset="0xA3B8" />
-        <Texture Name="object_kbt_Tex_00A5B8" OutName="tex_00A5B8" Format="rgba16" Width="32" Height="32" Offset="0xA5B8" />
-        <Texture Name="object_kbt_Tex_00ADB8" OutName="tex_00ADB8" Format="rgba16" Width="32" Height="32" Offset="0xADB8" />
-        <Texture Name="object_kbt_Tex_00B5B8" OutName="tex_00B5B8" Format="rgba16" Width="32" Height="32" Offset="0xB5B8" />
-        <Texture Name="object_kbt_Tex_00BDB8" OutName="tex_00BDB8" Format="rgba16" Width="32" Height="32" Offset="0xBDB8" />
-        <Texture Name="object_kbt_Tex_00C5B8" OutName="tex_00C5B8" Format="rgba16" Width="32" Height="32" Offset="0xC5B8" />
-        <Texture Name="object_kbt_Tex_00CDB8" OutName="tex_00CDB8" Format="rgba16" Width="32" Height="32" Offset="0xCDB8" />
-        <Texture Name="object_kbt_Tex_00D5B8" OutName="tex_00D5B8" Format="rgba16" Width="32" Height="32" Offset="0xD5B8" />
-        <Limb Name="object_kbt_Standardlimb_00DDB8" Type="Standard" EnumName="OBJECT_KBT_LIMB_01" Offset="0xDDB8" />
-        <Limb Name="object_kbt_Standardlimb_00DDC4" Type="Standard" EnumName="OBJECT_KBT_LIMB_02" Offset="0xDDC4" />
-        <Limb Name="object_kbt_Standardlimb_00DDD0" Type="Standard" EnumName="OBJECT_KBT_LIMB_03" Offset="0xDDD0" />
-        <Limb Name="object_kbt_Standardlimb_00DDDC" Type="Standard" EnumName="OBJECT_KBT_LIMB_04" Offset="0xDDDC" />
-        <Limb Name="object_kbt_Standardlimb_00DDE8" Type="Standard" EnumName="OBJECT_KBT_LIMB_05" Offset="0xDDE8" />
-        <Limb Name="object_kbt_Standardlimb_00DDF4" Type="Standard" EnumName="OBJECT_KBT_LIMB_06" Offset="0xDDF4" />
-        <Limb Name="object_kbt_Standardlimb_00DE00" Type="Standard" EnumName="OBJECT_KBT_LIMB_07" Offset="0xDE00" />
-        <Limb Name="object_kbt_Standardlimb_00DE0C" Type="Standard" EnumName="OBJECT_KBT_LIMB_08" Offset="0xDE0C" />
-        <Limb Name="object_kbt_Standardlimb_00DE18" Type="Standard" EnumName="OBJECT_KBT_LIMB_09" Offset="0xDE18" />
-        <Limb Name="object_kbt_Standardlimb_00DE24" Type="Standard" EnumName="OBJECT_KBT_LIMB_0A" Offset="0xDE24" />
-        <Limb Name="object_kbt_Standardlimb_00DE30" Type="Standard" EnumName="OBJECT_KBT_LIMB_0B" Offset="0xDE30" />
-        <Limb Name="object_kbt_Standardlimb_00DE3C" Type="Standard" EnumName="OBJECT_KBT_LIMB_0C" Offset="0xDE3C" />
-        <Limb Name="object_kbt_Standardlimb_00DE48" Type="Standard" EnumName="OBJECT_KBT_LIMB_0D" Offset="0xDE48" />
-        <Limb Name="object_kbt_Standardlimb_00DE54" Type="Standard" EnumName="OBJECT_KBT_LIMB_0E" Offset="0xDE54" />
-        <Limb Name="object_kbt_Standardlimb_00DE60" Type="Standard" EnumName="OBJECT_KBT_LIMB_0F" Offset="0xDE60" />
-        <Limb Name="object_kbt_Standardlimb_00DE6C" Type="Standard" EnumName="OBJECT_KBT_LIMB_10" Offset="0xDE6C" />
-        <Limb Name="object_kbt_Standardlimb_00DE78" Type="Standard" EnumName="OBJECT_KBT_LIMB_11" Offset="0xDE78" />
-        <Limb Name="object_kbt_Standardlimb_00DE84" Type="Standard" EnumName="OBJECT_KBT_LIMB_12" Offset="0xDE84" />
-        <Limb Name="object_kbt_Standardlimb_00DE90" Type="Standard" EnumName="OBJECT_KBT_LIMB_13" Offset="0xDE90" />
-        <Skeleton Name="object_kbt_Skel_00DEE8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KBT_LIMB_NONE" LimbMax="OBJECT_KBT_LIMB_MAX" EnumName="ObjectKbtLimb" Offset="0xDEE8" />
-        <Animation Name="object_kbt_Anim_00E7BC" Offset="0xE7BC" /> <!-- Original name is "kbt_wait01" -->
-        <Animation Name="object_kbt_Anim_00F0C8" Offset="0xF0C8" /> <!-- Original name is "kbt_wait02" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_keikoku_demo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_keikoku_demo.xml
deleted file mode 100644
index b9433a48f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_keikoku_demo.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Trees and the ground of the Lost woods (DmOpstage actor) -->
-    <!-- (DmRavine) uses it as an object, but does not draw or use any of its assets as far as I can tell -->
-    <File Name="object_keikoku_demo" Segment="6">
-        <!-- the following textures have duplicates in Z2_LOSTWOODS scene:  -->
-        <!--   gKeikokuDemoYellowFlowersOnGrassTex, gKeikokuDemoFallLeavesOnGrassTex, unused: gKeikokuDemoWrinkledBarkTex -->
-
-        <!-- DmOpstage draws both an empty XLU and non-empty OPA at the same time, each version has its own empty DL instead of reusing. -->
-        <DList Name="gKeikokuDemoFloorEmptyDL" Offset="0x970" />
-        <DList Name="gKeikokuDemoFloorDL" Offset="0x978" /> <!-- Original name is "daichi_model" -->
-
-        <!-- DmOpstage type DMOPSTAGE_TYPE_GROUND textures -->
-        <Texture Name="gKeikokuDemoYellowFlowersOnGrassTex" OutName="yellow_flowers_on_grass" Format="rgba16" Width="32" Height="32" Offset="0xC50" />
-        <Texture Name="gKeikokuDemoFallLeavesOnGrassTex" OutName="fall_leaves_on_grass" Format="rgba16" Width="32" Height="32" Offset="0x1450" />
-
-        <!-- DmOpstage type DMOPSTAGE_TYPE_GROUND Dyna Collider -->
-        <Collision Name="gKeikokuDemoFloorCol" Offset="0x1C98" /> <!-- Original name is "daichi_bgdatainfo" -->
-
-        <DList Name="gKeikokuDemoTallTreeWithRootBaseEmptyDL" Offset="0x2870" />
-        <DList Name="gKeikokuDemoTallTreeWithRootBaseDL" Offset="0x2878" /> <!-- Original name is "lost_woods_wood1_model" -->
-        <DList Name="gKeikokuDemoTallTreeCutEmptyDL" Offset="0x3060" />
-        <DList Name="gKeikokuDemoTallTreeCutDL" Offset="0x3068" /> <!-- Original name is "lost_woods_wood2_model" -->
-        <DList Name="gKeikokuDemoTallTreeStraightEmptyDL" Offset="0x3720" />
-        <DList Name="gKeikokuDemoTallTreeStraightDL" Offset="0x3728" /> <!-- Original name is "lost_woods_wood3_model" -->
-        <Texture Name="gKeikokuDemoTreeLeavesTex" OutName="tree_leaves" Format="ia16" Width="32" Height="32" Offset="0x3930" />
-        <Texture Name="gKeikokuDemoTreeCutEndGrainTex" OutName="cut_end_grain" Format="rgba16" Width="32" Height="32" Offset="0x4130" />
-
-        <!-- From this point on, all assets are unused. -->
-        
-        <!-- Side texture of raised bed of clover, clover on top of stems seen from side. -->
-        <Texture Name="gKeikokuDemoCloverEdgeTex" OutName="clover_edge" Format="rgba16" Width="64" Height="16" Offset="0x4930" />
-        <!-- Top texture of bed of clover (like the kind of raised grass that hide gold skultula). -->
-        <Texture Name="gKeikokuDemoCloverTopTex" OutName="clover_top" Format="rgba16" Width="32" Height="32" Offset="0x5130" />
-        <!-- Darker brown wrinkly bark with moss on I think, low resolution so not sure.  -->
-        <Texture Name="gKeikokuDemoDarkMossyBarkTex" OutName="dark_mossy_bark" Format="rgba16" Width="32" Height="32" Offset="0x5930" />
-        <Texture Name="gKeikokuDemoDarkGreenMossTex" OutName="dark_moss" Format="rgba16" Width="16" Height="16" Offset="0x6130" />
-        <!-- Bright tan wrinkly bark with moss on I think, low resolution so not sure. -->
-        <Texture Name="gKeikokuDemoBrightMossyBarkTex" OutName="bright_mossy_bark" Format="rgba16" Width="32" Height="32" Offset="0x6330" />
-        <!-- This dirt wall looks similar to OoT:Kokiri forest wall, but brighter sand color.  -->
-        <Texture Name="gKeikokuDemoDirtWallTex" OutName="dirt_wall" Format="rgba16" Width="32" Height="64" Offset="0x6B30" />
-        <!-- Does NOT look like the wall of trees from Lostwoods. -->
-        <Texture Name="gKeikokuDemoTreeWallBackdropTex" OutName="tree_wall_backdrop" Format="i4" Width="64" Height="64" Offset="0x7B30" />
-
-        <Texture Name="gKeikokuDemoHangingMossTex" OutName="hanging_moss" Format="rgba16" Width="32" Height="32" Offset="0x8330" />
-        <Texture Name="gKeikokuDemoStumpRingsDarkTex" OutName="stump_rings_dark" Format="rgba16" Width="32" Height="32" Offset="0x8B30" />
-
-        <!-- Might be mistyped, looks like pink rings to match the following stump rings texture, but pink. -->
-        <Texture Name="gKeikokuDemoStumpRingsPinkTex" OutName="stump_rings_pink" Format="rgba16" Width="16" Height="32" Offset="0x9330" />
-        <!-- Looks like a duplicate of gKeikokuDemoTreeCutEndGrainTex, but rotated clockwise 90deg. -->
-        <Texture Name="gKeikokuDemoTreeCutEndGrain2Tex" OutName="stump_rings" Format="rgba16" Width="32" Height="32" Offset="0x9730" />
-
-        <!-- Duplicates of used textures: -->
-        <Texture Name="gKeikokuDemoYellowFlowersOnGrass2Tex" OutName="yellow_flowers_on_grass2" Format="rgba16" Width="32" Height="32" Offset="0x9F30" />
-        <Texture Name="gKeikokuDemoFallLeavesOnGrass2Tex" OutName="fall_leaves_on_grass2" Format="rgba16" Width="32" Height="32" Offset="0xA730" />
-
-        <Texture Name="gKeikokuDemoYoungerBarkTex" OutName="younger_bark" Format="rgba16" Width="16" Height="64" Offset="0xAF30" />
-        <Texture Name="gKeikokuDemoWrinkledBarkTex" OutName="wrinkled_bark" Format="i4" Width="64" Height="64" Offset="0xB730" />
-        <!-- Could be moss, could be leaves, could be dying grass, hard to tell. -->
-        <Texture Name="gKeikokuDemoGreenSludgeTex" OutName="green_sludge" Format="rgba16" Width="32" Height="32" Offset="0xBF30" />
-        <!-- This might be something else, nothing else looked any more accurate. -->
-        <Texture Name="gKeikokuDemoWhiteYellowArtifactTex" OutName="white_yellow_artifact" Format="rgba16" Width="16" Height="32" Offset="0xC730" />
-        <!-- Seems to be a dimmer version of the bright yellow on grass texture. -->
-        <Texture Name="gKeikokuDemoDullYellowFlowersOnGrassTex" OutName="dull_yellow_flowers_on_grass" Format="rgba16" Width="32" Height="32" Offset="0xCB30" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_keikoku_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_keikoku_obj.xml
deleted file mode 100644
index b6d61e91f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_keikoku_obj.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Root>
-    <File Name="object_keikoku_obj" Segment="6">
-        <DList Name="object_keikoku_obj_DL_000100" Offset="0x100" />
-        <TextureAnimation Name="object_keikoku_obj_Matanimheader_0001F8" Offset="0x1F8" />
-        <DList Name="object_keikoku_obj_DL_000300" Offset="0x300" />
-        <TextureAnimation Name="object_keikoku_obj_Matanimheader_0003F8" Offset="0x3F8" />
-        <DList Name="object_keikoku_obj_DL_000500" Offset="0x500" />
-        <TextureAnimation Name="object_keikoku_obj_Matanimheader_0005F8" Offset="0x5F8" />
-        <Texture Name="object_keikoku_obj_Tex_000600" OutName="tex_000600" Format="i4" Width="64" Height="64" Offset="0x600" />
-        <Texture Name="object_keikoku_obj_Tex_000E00" OutName="tex_000E00" Format="i4" Width="64" Height="64" Offset="0xE00" />
-        <DList Name="object_keikoku_obj_DL_001640" Offset="0x1640" /> <!-- Original name is "g2T_model" -->
-        <Texture Name="object_keikoku_obj_Tex_001780" OutName="tex_001780" Format="ia4" Width="32" Height="128" Offset="0x1780" />
-        <Texture Name="object_keikoku_obj_Tex_001F80" OutName="tex_001F80" Format="ia4" Width="16" Height="64" Offset="0x1F80" />
-        <Texture Name="object_keikoku_obj_Tex_002180" OutName="tex_002180" Format="ia8" Width="8" Height="32" Offset="0x2180" />
-        <Collision Name="object_keikoku_obj_Colheader_002300" Offset="0x2300" /> <!-- Original name is "z2_00_saku01_bgdatainfo" -->
-        <DList Name="object_keikoku_obj_DL_0027D0" Offset="0x27D0" />
-        <DList Name="object_keikoku_obj_DL_0027D8" Offset="0x27D8" /> <!-- Original name is "z2_00_yama01_model" -->
-        <Texture Name="object_keikoku_obj_Tex_002A78" OutName="tex_002A78" Format="rgba16" Width="16" Height="64" Offset="0x2A78" />
-        <Texture Name="object_keikoku_obj_Tex_003278" OutName="tex_003278" Format="rgba16" Width="32" Height="32" Offset="0x3278" />
-        <Texture Name="object_keikoku_obj_Tex_003A78" OutName="tex_003A78" Format="i4" Width="64" Height="64" Offset="0x3A78" />
-        <TextureAnimation Name="object_keikoku_obj_Matanimheader_004290" Offset="0x4290" />
-        <DList Name="object_keikoku_obj_DL_0044A0" Offset="0x44A0" />
-        <DList Name="object_keikoku_obj_DL_0044A8" Offset="0x44A8" /> <!-- Original name is "z2_00_yama02_model" -->
-        <Texture Name="object_keikoku_obj_Tex_004618" OutName="tex_004618" Format="rgba16" Width="16" Height="32" Offset="0x4618" />
-        <Texture Name="object_keikoku_obj_Tex_004A18" OutName="tex_004A18" Format="rgba16" Width="32" Height="32" Offset="0x4A18" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kepn_koya.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kepn_koya.xml
deleted file mode 100644
index cc14f0556..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kepn_koya.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="object_kepn_koya" Segment="6">
-        <DList Name="object_kepn_koya_DL_003470" Offset="0x3470" /> <!-- Original name is "w2_kepn_koya_modelT" -->
-        <DList Name="object_kepn_koya_DL_003478" Offset="0x3478" /> <!-- Original name is "w2_kepn_koya_model" -->
-        <Texture Name="object_kepn_koya_TLUT_005118" OutName="tlut_005118" Format="rgba16" Width="16" Height="16" Offset="0x5118" />
-        <Texture Name="object_kepn_koya_Tex_005318" OutName="tex_005318" Format="ci8" Width="16" Height="16" Offset="0x5318" />
-        <Texture Name="object_kepn_koya_Tex_005418" OutName="tex_005418" Format="ci8" Width="64" Height="32" Offset="0x5418" />
-        <Texture Name="object_kepn_koya_Tex_005C18" OutName="tex_005C18" Format="ci8" Width="32" Height="64" Offset="0x5C18" />
-        <Texture Name="object_kepn_koya_Tex_006418" OutName="tex_006418" Format="ci8" Width="16" Height="32" Offset="0x6418" />
-        <Texture Name="object_kepn_koya_Tex_006618" OutName="tex_006618" Format="ci8" Width="16" Height="32" Offset="0x6618" />
-        <Texture Name="object_kepn_koya_Tex_006818" OutName="tex_006818" Format="ci8" Width="32" Height="16" Offset="0x6818" />
-        <Texture Name="object_kepn_koya_Tex_006A18" OutName="tex_006A18" Format="ci8" Width="64" Height="16" Offset="0x6A18" />
-        <Texture Name="object_kepn_koya_Tex_006E18" OutName="tex_006E18" Format="ci8" Width="32" Height="32" Offset="0x6E18" />
-        <Texture Name="object_kepn_koya_Tex_007218" OutName="tex_007218" Format="rgba16" Width="8" Height="8" Offset="0x7218" />
-        <Texture Name="object_kepn_koya_Tex_007298" OutName="tex_007298" Format="ci8" Width="8" Height="8" Offset="0x7298" />
-        <Collision Name="object_kepn_koya_Colheader_00805C" Offset="0x805C" /> <!-- Original name is "w2_kepn_koya_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kgy.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kgy.xml
deleted file mode 100644
index b83234b8c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kgy.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<Root>
-    <File Name="object_kgy" Segment="6">
-        <Animation Name="object_kgy_Anim_0008FC" Offset="0x8FC" /> <!-- Original name is "kgy_abareru" -->
-        <Animation Name="object_kgy_Anim_001764" Offset="0x1764" /> <!-- Original name is "kgy_katsugu" -->
-        <Animation Name="object_kgy_Anim_001EA4" Offset="0x1EA4" /> <!-- Original name is "kgy_muki" -->
-        <Animation Name="object_kgy_Anim_00292C" Offset="0x292C" /> <!-- Original name is "kgy_mukiwait" -->
-        <Animation Name="object_kgy_Anim_003334" Offset="0x3334" /> <!-- Original name is "kgy_tataku" -->
-        <Animation Name="object_kgy_Anim_003D88" Offset="0x3D88" /> <!-- Original name is "kgy_tataku02" -->
-        <Animation Name="object_kgy_Anim_0042E4" Offset="0x42E4" /> <!-- Original name is "kgy_utsumuki" -->
-        <Animation Name="object_kgy_Anim_004B98" Offset="0x4B98" /> <!-- Original name is "kgy_wait01" -->
-        <DList Name="object_kgy_DL_009C80" Offset="0x9C80" />
-        <DList Name="object_kgy_DL_009DA0" Offset="0x9DA0" />
-        <DList Name="object_kgy_DL_009F28" Offset="0x9F28" />
-        <DList Name="object_kgy_DL_00A0A0" Offset="0xA0A0" />
-        <DList Name="object_kgy_DL_00A1C0" Offset="0xA1C0" />
-        <DList Name="object_kgy_DL_00A300" Offset="0xA300" />
-        <DList Name="object_kgy_DL_00A490" Offset="0xA490" />
-        <DList Name="object_kgy_DL_00A618" Offset="0xA618" />
-        <DList Name="object_kgy_DL_00A790" Offset="0xA790" />
-        <DList Name="object_kgy_DL_00A998" Offset="0xA998" />
-        <DList Name="object_kgy_DL_00AD60" Offset="0xAD60" />
-        <DList Name="object_kgy_DL_00B028" Offset="0xB028" />
-        <DList Name="object_kgy_DL_00B130" Offset="0xB130" />
-        <DList Name="object_kgy_DL_00B280" Offset="0xB280" />
-        <DList Name="object_kgy_DL_00B3C8" Offset="0xB3C8" />
-        <DList Name="object_kgy_DL_00B678" Offset="0xB678" />
-        <DList Name="object_kgy_DL_00B7B8" Offset="0xB7B8" />
-        <DList Name="object_kgy_DL_00B978" Offset="0xB978" />
-        <Texture Name="object_kgy_TLUT_00BC28" OutName="tlut_00BC28" Format="rgba16" Width="16" Height="16" Offset="0xBC28" />
-        <Texture Name="object_kgy_Tex_00BE28" OutName="tex_00BE28" Format="rgba16" Width="32" Height="32" Offset="0xBE28" />
-        <Texture Name="object_kgy_Tex_00C628" OutName="tex_00C628" Format="ci8" Width="16" Height="16" Offset="0xC628" />
-        <Texture Name="object_kgy_Tex_00C728" OutName="tex_00C728" Format="ci8" Width="16" Height="16" Offset="0xC728" />
-        <Texture Name="object_kgy_Tex_00C828" OutName="tex_00C828" Format="ci8" Width="32" Height="32" Offset="0xC828" />
-        <Texture Name="object_kgy_Tex_00CC28" OutName="tex_00CC28" Format="ci8" Width="32" Height="32" Offset="0xCC28" />
-        <Texture Name="object_kgy_Tex_00D028" OutName="tex_00D028" Format="rgba16" Width="32" Height="32" Offset="0xD028" />
-        <Texture Name="object_kgy_Tex_00D828" OutName="tex_00D828" Format="ci8" Width="16" Height="16" Offset="0xD828" />
-        <Texture Name="object_kgy_Tex_00D928" OutName="tex_00D928" Format="rgba16" Width="32" Height="32" Offset="0xD928" />
-        <Texture Name="object_kgy_Tex_00E128" OutName="tex_00E128" Format="ci8" Width="16" Height="16" Offset="0xE128" />
-        <Texture Name="object_kgy_Tex_00E228" OutName="tex_00E228" Format="i8" Width="32" Height="32" Offset="0xE228" />
-        <Texture Name="object_kgy_Tex_00E628" OutName="tex_00E628" Format="ci8" Width="16" Height="16" Offset="0xE628" />
-        <DList Name="object_kgy_DL_00E8E8" Offset="0xE8E8" />
-        <DList Name="object_kgy_DL_00E8F0" Offset="0xE8F0" /> <!-- Original name is "swordA_model" -->
-        <TextureAnimation Name="object_kgy_Matanimheader_00EE58" Offset="0xEE58" />
-        <DList Name="object_kgy_DL_00F178" Offset="0xF178" />
-        <DList Name="object_kgy_DL_00F180" Offset="0xF180" /> <!-- Original name is "swordB_model" -->
-        <TextureAnimation Name="object_kgy_Matanimheader_00F6A0" Offset="0xF6A0" />
-        <Texture Name="object_kgy_Tex_00F6B0" OutName="tex_00F6B0" Format="i8" Width="16" Height="16" Offset="0xF6B0" />
-        <Limb Name="object_kgy_Standardlimb_00F7B0" Type="Standard" EnumName="OBJECT_KGY_LIMB_01" Offset="0xF7B0" />
-        <Limb Name="object_kgy_Standardlimb_00F7BC" Type="Standard" EnumName="OBJECT_KGY_LIMB_02" Offset="0xF7BC" />
-        <Limb Name="object_kgy_Standardlimb_00F7C8" Type="Standard" EnumName="OBJECT_KGY_LIMB_03" Offset="0xF7C8" />
-        <Limb Name="object_kgy_Standardlimb_00F7D4" Type="Standard" EnumName="OBJECT_KGY_LIMB_04" Offset="0xF7D4" />
-        <Limb Name="object_kgy_Standardlimb_00F7E0" Type="Standard" EnumName="OBJECT_KGY_LIMB_05" Offset="0xF7E0" />
-        <Limb Name="object_kgy_Standardlimb_00F7EC" Type="Standard" EnumName="OBJECT_KGY_LIMB_06" Offset="0xF7EC" />
-        <Limb Name="object_kgy_Standardlimb_00F7F8" Type="Standard" EnumName="OBJECT_KGY_LIMB_07" Offset="0xF7F8" />
-        <Limb Name="object_kgy_Standardlimb_00F804" Type="Standard" EnumName="OBJECT_KGY_LIMB_08" Offset="0xF804" />
-        <Limb Name="object_kgy_Standardlimb_00F810" Type="Standard" EnumName="OBJECT_KGY_LIMB_09" Offset="0xF810" />
-        <Limb Name="object_kgy_Standardlimb_00F81C" Type="Standard" EnumName="OBJECT_KGY_LIMB_0A" Offset="0xF81C" />
-        <Limb Name="object_kgy_Standardlimb_00F828" Type="Standard" EnumName="OBJECT_KGY_LIMB_0B" Offset="0xF828" />
-        <Limb Name="object_kgy_Standardlimb_00F834" Type="Standard" EnumName="OBJECT_KGY_LIMB_0C" Offset="0xF834" />
-        <Limb Name="object_kgy_Standardlimb_00F840" Type="Standard" EnumName="OBJECT_KGY_LIMB_0D" Offset="0xF840" />
-        <Limb Name="object_kgy_Standardlimb_00F84C" Type="Standard" EnumName="OBJECT_KGY_LIMB_0E" Offset="0xF84C" />
-        <Limb Name="object_kgy_Standardlimb_00F858" Type="Standard" EnumName="OBJECT_KGY_LIMB_0F" Offset="0xF858" />
-        <Limb Name="object_kgy_Standardlimb_00F864" Type="Standard" EnumName="OBJECT_KGY_LIMB_10" Offset="0xF864" />
-        <Limb Name="object_kgy_Standardlimb_00F870" Type="Standard" EnumName="OBJECT_KGY_LIMB_11" Offset="0xF870" />
-        <Limb Name="object_kgy_Standardlimb_00F87C" Type="Standard" EnumName="OBJECT_KGY_LIMB_12" Offset="0xF87C" />
-        <Limb Name="object_kgy_Standardlimb_00F888" Type="Standard" EnumName="OBJECT_KGY_LIMB_13" Offset="0xF888" />
-        <Limb Name="object_kgy_Standardlimb_00F894" Type="Standard" EnumName="OBJECT_KGY_LIMB_14" Offset="0xF894" />
-        <Limb Name="object_kgy_Standardlimb_00F8A0" Type="Standard" EnumName="OBJECT_KGY_LIMB_15" Offset="0xF8A0" />
-        <Limb Name="object_kgy_Standardlimb_00F8AC" Type="Standard" EnumName="OBJECT_KGY_LIMB_16" Offset="0xF8AC" />
-        <Skeleton Name="object_kgy_Skel_00F910" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KGY_LIMB_NONE" LimbMax="OBJECT_KGY_LIMB_MAX" EnumName="ObjectKgyLimb" Offset="0xF910" />
-        <Animation Name="object_kgy_Anim_0101F0" Offset="0x101F0" /> <!-- Original name is "kgy_wait02" -->
-        <Animation Name="object_kgy_Anim_010B84" Offset="0x10B84" /> <!-- Original name is "kgy_yorokobu" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kibako.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kibako.xml
deleted file mode 100644
index 2cdd6ce36..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kibako.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Object for small wooden crate -->
-    <File Name="object_kibako" Segment="6">
-        <Texture Name="gSmallCrateTex" OutName="small_crate" Format="rgba16" Width="32" Height="64" Offset="0x0" />
-        <DList Name="gSmallCrateDL" Offset="0x1180" /> <!-- Original name is "field_kibako_model" -->
-        <Texture Name="gSmallCrateFragmentTex" OutName="small_crate_fragment" Format="rgba16" Width="64" Height="16" Offset="0x1240" />
-        <DList Name="gSmallCrateFragmentDL" Offset="0x1A70" /> <!-- Original name is "field_kibako_hahen_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kibako2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kibako2.xml
deleted file mode 100644
index 180038e82..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kibako2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Object for large wooden crate -->
-    <File Name="object_kibako2" Segment="6">
-        <Texture Name="gLargeCrateTLUT" OutName="large_crate_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gLargeCrateTopTex" OutName="large_crate_top" Format="ci4" Width="32" Height="64" Offset="0x20" />
-        <Texture Name="gLargeCrateSidesTex" OutName="large_crate_sides" Format="ci4" Width="32" Height="64" Offset="0x420" />
-        <DList Name="gLargeCrateDL" Offset="0x960" /> <!-- Original name is "CIkibako_model" -->
-        <Collision Name="gLargeCrateCol" Offset="0xB70" /> <!-- Original name is "CIkibako_bgdatainfo" -->
-        <Texture Name="gLargeCrateFragmentTLUT" OutName="large_crate_fragment_tlut" Format="rgba16" Width="4" Height="4" Offset="0xBA0" />
-        <Texture Name="gLargeCrateFragmentTex" OutName="large_crate_fragment" Format="ci4" Width="32" Height="64" Offset="0xBC0" />
-        <DList Name="gLargeCrateFragment1DL" Offset="0x1040" /> <!-- Original name is "CIkibako_hahen_model" -->
-        <DList Name="gLargeCrateFragment2DL" Offset="0x1100" /> <!-- Original name is "CIkibako_hahen2_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kin2_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kin2_obj.xml
deleted file mode 100644
index 6e63f19cd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kin2_obj.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Root>
-    <!-- 
-        Assets for Ocean Spider House's bombable wall, Skullkid's painting, fireplace grate on the path to the Heart
-        Piece, bookshelves and chests of drawers.
-    -->
-    <File Name="object_kin2_obj" Segment="6">
-        <DList Name="gOceanSpiderHouseEmpty1DL" Offset="0x120" /> <!-- Not present in MM3D, but it was probably named "m2_KIN_BOMBhahen_modelT" based on the rest of this object. -->
-        <DList Name="gOceanSpiderHouseBombableWallDebrisDL" Offset="0x128" /> <!-- Original name is "m2_KIN_BOMBhahen_model" -->
-
-        <DList Name="gOceanSpiderHouseBombableWallCrackDL" Offset="0x2C0" /> <!-- Not present in MM3D, but it was probably named "m2_KIN_BOMBwall_modelT" based on the rest of this object. -->
-        <DList Name="gOceanSpiderHouseBombableWallDL" Offset="0x360" /> <!-- Original name is "m2_KIN_BOMBwall_model" -->
-        <Collision Name="gOceanSpiderHouseBombableWallCol" Offset="0x490" /> <!-- Original name is "m2_KIN_BOMBwall_bgdatainfo" -->
-
-        <DList Name="gOceanSpiderHouseEmpty2DL" Offset="0x650" /> <!-- Original name is "m2_KIN_GAKU_modelT" -->
-        <DList Name="gOceanSpiderHouseSkullkidPaintingDL" Offset="0x658" /> <!-- Original name is "m2_KIN_GAKU_model" -->
-        <Collision Name="gOceanSpiderHouseSkullkidPaintingCol" Offset="0x798" /> <!-- Original name is "m2_KIN_GAKU_bgdatainfo" -->
-
-        <DList Name="gOceanSpiderHouseEmpty3DL" Offset="0x820" /> <!-- Original name is "m2_KIN_SAKU_modelT" -->
-        <DList Name="gOceanSpiderHouseFireplaceGrateDL" Offset="0x828" /> <!-- Original name is "m2_KIN_SAKU_model" -->
-        <Collision Name="gOceanSpiderHouseFireplaceGrateCol" Offset="0x908" /> <!-- Original name is "m2_KIN_SAKU_bgdatainfo" -->
-        
-        <DList Name="gOceanSpiderHouseEmpty4DL" Offset="0xCA0" /> <!-- Original name is "m2_KIN_TANAbig_modelT" -->
-        <DList Name="gOceanSpiderHouseBookshelfDL" Offset="0xCA8" /> <!-- Original name is "m2_KIN_TANAbig_model"-->
-        <Collision Name="gOceanSpiderHouseBookshelfCol" Offset="0xF80" /> <!-- Original name is "m2_KIN_TANAbig_bgdatainfo" -->
-        
-        <DList Name="gOceanSpiderHouseEmpty5DL" Offset="0x10F0" /> <!-- Original name is "m2_KIN_TANAsmall_modelT" -->
-        <DList Name="gOceanSpiderHouseChestOfDrawersDL" Offset="0x10F8" /> <!-- Original name is "m2_KIN_TANAsmall_model" -->
-        <Collision Name="gOceanSpiderHouseChestOfDrawersCol" Offset="0x1328" /> <!-- Original name is "m2_KIN_TANAsmall_bgdatainfo" -->
-        
-        <Texture Name="gOceanSpiderHouseUnused1TLUT" OutName="ocean_spider_house_unused_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x1360" />
-        <Texture Name="gOceanSpiderHouseTLUT" OutName="ocean_spider_house_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1380" />
-        <Texture Name="gOceanSpiderHouseUnused2TLUT" OutName="ocean_spider_house_unused_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x13A0" />
-        
-        <Texture Name="gOceanSpiderHouseBombableWallCrackTex" OutName="ocean_spider_house_bombable_wall_crack" Format="ia8" Width="64" Height="64" Offset="0x13C0" />
-        <Texture Name="gOceanSpiderHouseBookshelfWoodTex" OutName="ocean_spider_house_bookshelf_wood" Format="rgba16" Width="32" Height="32" Offset="0x23C0" />
-        <Texture Name="gOceanSpiderHouseFireplaceGrateTex" OutName="ocean_spider_house_fireplace_grate" Format="rgba16" Width="32" Height="32" Offset="0x2BC0" />
-        <Texture Name="gOceanSpiderHouseSkullkidPaintingTex" OutName="ocean_spider_house_skullkid_painting" Format="ci4" Width="64" Height="64" Offset="0x33C0" />
-        
-        <Texture Name="gOceanSpiderHouseChestOfDrawersFrontTex" OutName="ocean_spider_house_chest_of_drawers_front" Format="rgba16" Width="32" Height="64" Offset="0x3BC0" />
-        <Texture Name="gOceanSpiderHouseChestOfDrawersBackTex" OutName="ocean_spider_house_chest_of_drawers_back" Format="rgba16" Width="32" Height="64" Offset="0x4BC0" />
-        <Texture Name="gOceanSpiderHouseChestOfDrawersTopTex" OutName="ocean_spider_house_chest_of_drawers_top" Format="rgba16" Width="32" Height="32" Offset="0x5BC0" />
-        
-        <Texture Name="gOceanSpiderHouseBookshelfBooksTex" OutName="ocean_spider_house_bookshelf_books" Format="rgba16" Width="32" Height="64" Offset="0x63C0" />
-        
-        <Texture Name="gOceanSpiderHouseBombableWallDebrisTex1" OutName="ocean_spider_house_debris_1" Format="rgba16" Width="32" Height="32" Offset="0x73C0" />
-        <Texture Name="gOceanSpiderHouseBombableWallDebrisTex2" OutName="ocean_spider_house_debris_2" Format="i4" Width="64" Height="64" Offset="0x7BC0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kinsta1_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kinsta1_obj.xml
deleted file mode 100644
index d2a55b04d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kinsta1_obj.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Swamp Spider House Sliding Door -->
-    <File Name="object_kinsta1_obj" Segment="6">
-        <DList Name="gSwampSpiderHouseSlidingDoorEmptyDL" Offset="0x190" /> <!-- Original name is "m2_KIN1_shutter_modelT" -->
-        <DList Name="gSwampSpiderHouseSlidingDoorDL" Offset="0x198" /> <!-- Original name is "m2_KIN1_shutter_model" -->
-        <Texture Name="gSwampSpiderHouseSlidingDoorTex" OutName="swamp_spider_house_sliding_door" Format="rgba16" Width="32" Height="64" Offset="0x2F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kinsta2_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kinsta2_obj.xml
deleted file mode 100644
index 66bec962d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kinsta2_obj.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Object for Oceanside Spider House Door -->
-    <File Name="object_kinsta2_obj" Segment="6">
-        <DList Name="gOceansideSpiderHouseDoorDL" Offset="0x310" /> <!-- Original name is "m2_Kin2DOOR_model" -->
-        <Texture Name="gOceansideSpiderHouseDoorTex" OutName="oceanside_spider_house_door" Format="rgba16" Width="32" Height="64" Offset="0x4E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kitan.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kitan.xml
deleted file mode 100644
index cd7db0005..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kitan.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Root>
-    <File Name="object_kitan" Segment="6">
-        <Animation Name="object_kitan_Anim_000CE8" Offset="0xCE8" /> <!-- Original name is "kt_hohoho" -->
-        <Animation Name="object_kitan_Anim_00190C" Offset="0x190C" /> <!-- Original name is "kt_laugh" -->
-        <Animation Name="object_kitan_Anim_002770" Offset="0x2770" /> <!-- Original name is "kt_wait" -->
-        <DList Name="object_kitan_DL_004C40" Offset="0x4C40" />
-        <DList Name="object_kitan_DL_004DF0" Offset="0x4DF0" />
-        <DList Name="object_kitan_DL_005160" Offset="0x5160" />
-        <DList Name="object_kitan_DL_005628" Offset="0x5628" />
-        <DList Name="object_kitan_DL_005928" Offset="0x5928" />
-        <DList Name="object_kitan_DL_005B48" Offset="0x5B48" />
-        <DList Name="object_kitan_DL_005E48" Offset="0x5E48" />
-        <DList Name="object_kitan_DL_006068" Offset="0x6068" />
-        <DList Name="object_kitan_DL_0063E8" Offset="0x63E8" />
-        <DList Name="object_kitan_DL_0065E0" Offset="0x65E0" />
-        <DList Name="object_kitan_DL_0066A8" Offset="0x66A8" />
-        <DList Name="object_kitan_DL_006810" Offset="0x6810" />
-        <DList Name="object_kitan_DL_006990" Offset="0x6990" />
-        <DList Name="object_kitan_DL_006A58" Offset="0x6A58" />
-        <DList Name="object_kitan_DL_006BC0" Offset="0x6BC0" />
-        <DList Name="object_kitan_DL_006D40" Offset="0x6D40" />
-        <DList Name="object_kitan_DL_006E08" Offset="0x6E08" />
-        <DList Name="object_kitan_DL_006F70" Offset="0x6F70" />
-        <DList Name="object_kitan_DL_0070F0" Offset="0x70F0" />
-        <DList Name="object_kitan_DL_007470" Offset="0x7470" />
-        <Texture Name="object_kitan_TLUT_007668" OutName="tlut_007668" Format="rgba16" Width="16" Height="16" Offset="0x7668" />
-        <Texture Name="object_kitan_Tex_007868" OutName="tex_007868" Format="ci8" Width="32" Height="16" Offset="0x7868" />
-        <Texture Name="object_kitan_Tex_007A68" OutName="tex_007A68" Format="ci8" Width="16" Height="16" Offset="0x7A68" />
-        <Texture Name="object_kitan_Tex_007B68" OutName="tex_007B68" Format="ci8" Width="16" Height="16" Offset="0x7B68" />
-        <Texture Name="object_kitan_Tex_007C68" OutName="tex_007C68" Format="ci8" Width="16" Height="16" Offset="0x7C68" />
-        <Texture Name="object_kitan_Tex_007D68" OutName="tex_007D68" Format="ci8" Width="16" Height="16" Offset="0x7D68" />
-        <Limb Name="object_kitan_Standardlimb_007E68" Type="Standard" EnumName="OBJECT_KITAN_LIMB_01" Offset="0x7E68" />
-        <Limb Name="object_kitan_Standardlimb_007E74" Type="Standard" EnumName="OBJECT_KITAN_LIMB_02" Offset="0x7E74" />
-        <Limb Name="object_kitan_Standardlimb_007E80" Type="Standard" EnumName="OBJECT_KITAN_LIMB_03" Offset="0x7E80" />
-        <Limb Name="object_kitan_Standardlimb_007E8C" Type="Standard" EnumName="OBJECT_KITAN_LIMB_04" Offset="0x7E8C" />
-        <Limb Name="object_kitan_Standardlimb_007E98" Type="Standard" EnumName="OBJECT_KITAN_LIMB_05" Offset="0x7E98" />
-        <Limb Name="object_kitan_Standardlimb_007EA4" Type="Standard" EnumName="OBJECT_KITAN_LIMB_06" Offset="0x7EA4" />
-        <Limb Name="object_kitan_Standardlimb_007EB0" Type="Standard" EnumName="OBJECT_KITAN_LIMB_07" Offset="0x7EB0" />
-        <Limb Name="object_kitan_Standardlimb_007EBC" Type="Standard" EnumName="OBJECT_KITAN_LIMB_08" Offset="0x7EBC" />
-        <Limb Name="object_kitan_Standardlimb_007EC8" Type="Standard" EnumName="OBJECT_KITAN_LIMB_09" Offset="0x7EC8" />
-        <Limb Name="object_kitan_Standardlimb_007ED4" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0A" Offset="0x7ED4" />
-        <Limb Name="object_kitan_Standardlimb_007EE0" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0B" Offset="0x7EE0" />
-        <Limb Name="object_kitan_Standardlimb_007EEC" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0C" Offset="0x7EEC" />
-        <Limb Name="object_kitan_Standardlimb_007EF8" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0D" Offset="0x7EF8" />
-        <Limb Name="object_kitan_Standardlimb_007F04" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0E" Offset="0x7F04" />
-        <Limb Name="object_kitan_Standardlimb_007F10" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0F" Offset="0x7F10" />
-        <Limb Name="object_kitan_Standardlimb_007F1C" Type="Standard" EnumName="OBJECT_KITAN_LIMB_10" Offset="0x7F1C" />
-        <Limb Name="object_kitan_Standardlimb_007F28" Type="Standard" EnumName="OBJECT_KITAN_LIMB_11" Offset="0x7F28" />
-        <Limb Name="object_kitan_Standardlimb_007F34" Type="Standard" EnumName="OBJECT_KITAN_LIMB_12" Offset="0x7F34" />
-        <Limb Name="object_kitan_Standardlimb_007F40" Type="Standard" EnumName="OBJECT_KITAN_LIMB_13" Offset="0x7F40" />
-        <Limb Name="object_kitan_Standardlimb_007F4C" Type="Standard" EnumName="OBJECT_KITAN_LIMB_14" Offset="0x7F4C" />
-        <Skeleton Name="object_kitan_Skel_007FA8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KITAN_LIMB_NONE" LimbMax="OBJECT_KITAN_LIMB_MAX" EnumName="ObjectKitanLimb" Offset="0x7FA8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_knight.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_knight.xml
deleted file mode 100644
index 2a8595627..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_knight.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<Root>
-    <!--
-        Assets for Igos du Ikana and his aides.
-        A note about the original animation names; in MM3D, they split them up into two into two nearly-identical but
-        incompatible sets of animations. For example, there is an animation named "nsk_king_front_damage" for the king,
-        and an animation named "nsk_zako_front_damage" for the aides. In the original game, the animations are used
-        for *both* the king and his aides, so for the animation names, I just removed "king" or "zako" from the name
-        under the assumption that Grezzo were probably the ones who added the qualifier to the names.
-    -->
-    <File Name="object_knight" Segment="6">
-        <Animation Name="object_knight_Anim_0005A8" Offset="0x5A8" /> <!-- Original name is probably "nsk_aramaD" -->
-        <Animation Name="object_knight_Anim_0009E0" Offset="0x9E0" /> <!-- Original name is probably "nsk_araraD" -->
-        <Animation Name="object_knight_Anim_000D9C" Offset="0xD9C" /> <!-- Original name is probably "nsk_back_damage" -->
-        <Animation Name="object_knight_Anim_001CDC" Offset="0x1CDC" /> <!-- Original name is probably "nsk_back_down" -->
-        <Animation Name="object_knight_Anim_002174" Offset="0x2174" /> <!-- Original name is probably "nsk_back_jump" -->
-        <Animation Name="object_knight_Anim_003008" Offset="0x3008" /> <!-- Original name is probably "nsk_bunri" -->
-        <Animation Name="object_knight_Anim_0031F0" Offset="0x31F0" /> <!-- Original name is probably "nsk_defend" -->
-        <Animation Name="object_knight_Anim_003650" Offset="0x3650" /> <!-- Original name is probably "nsk_fighting_run" -->
-        <Animation Name="object_knight_Anim_0040E0" Offset="0x40E0" /> <!-- Original name is probably "nsk_fighting_wait" -->
-        <Animation Name="object_knight_Anim_004620" Offset="0x4620" /> <!-- Original name is probably "nsk_fighting_walk" -->
-        <Animation Name="object_knight_Anim_004974" Offset="0x4974" /> <!-- Original name is probably "nsk_front_damage" -->
-        <Animation Name="object_knight_Anim_005D30" Offset="0x5D30" /> <!-- Original name is probably "nsk_front_down" -->
-        <Animation Name="object_knight_Anim_005E78" Offset="0x5E78" /> <!-- Original name is probably "nsk_furufuruD" -->
-        <Animation Name="object_knight_Anim_006754" Offset="0x6754" /> <!-- Original name is probably "nsk_gabaBD" -->
-        <Animation Name="object_knight_Anim_006EF8" Offset="0x6EF8" /> <!-- Original name is probably "nsk_gabaD" -->
-        <Animation Name="object_knight_Anim_0079D4" Offset="0x79D4" /> <!-- Original name is probably "nsk_gattai" -->
-        <Animation Name="object_knight_Anim_008390" Offset="0x8390" /> <!-- Original name is probably "nsk_goD" -->
-        <Animation Name="object_knight_Anim_008524" Offset="0x8524" /> <!-- Original name is probably "nsk_guardA" -->
-        <Animation Name="object_knight_Anim_0089E4" Offset="0x89E4" /> <!-- Original name is probably "nsk_guardB" -->
-        <Animation Name="object_knight_Anim_008D80" Offset="0x8D80" /> <!-- Original name is probably "nsk_haiteru" -->
-        <Animation Name="object_knight_Anim_009538" Offset="0x9538" /> <!-- Original name is probably "nsk_haku" -->
-        <Animation Name="object_knight_Anim_009D8C" Offset="0x9D8C" /> <!-- Original name is probably "nsk_jakinD" -->
-        <Animation Name="object_knight_Anim_00A530" Offset="0xA530" /> <!-- Original name is probably "nsk_jakinTOsekiD" -->
-        <Animation Name="object_knight_Anim_00A88C" Offset="0xA88C" /> <!-- Original name is probably "nsk_jidandaD" -->
-        <Animation Name="object_knight_Anim_00AB68" Offset="0xAB68" /> <!-- Original name is probably "nsk_jump" -->
-        <Animation Name="object_knight_Anim_00AFAC" Offset="0xAFAC" /> <!-- Original name is probably "nsk_jump_kiru" -->
-        <Animation Name="object_knight_Anim_00B5D4" Offset="0xB5D4" /> <!-- Original name is probably "nsk_jump_kiru_end" -->
-        <Animation Name="object_knight_Anim_00BCF4" Offset="0xBCF4" /> <!-- Original name is probably "nsk_koteL" -->
-        <Animation Name="object_knight_Anim_00C384" Offset="0xC384" /> <!-- Original name is probably "nsk_koteR" -->
-        <Animation Name="object_knight_Anim_00C7F0" Offset="0xC7F0" /> <!-- Original name is probably "nsk_kunekuneaD" -->
-        <Animation Name="object_knight_Anim_00CDE0" Offset="0xCDE0" /> <!-- Original name is probably "nsk_laugh" -->
-        <Animation Name="object_knight_Anim_00D870" Offset="0xD870" /> <!-- Original name is probably "nsk_laughD" -->
-        <Animation Name="object_knight_Anim_00DDCC" Offset="0xDDCC" /> <!-- Original name is probably "nsk_march" -->
-        <Animation Name="object_knight_Anim_00E15C" Offset="0xE15C" /> <!-- Original name is probably "nsk_modoru" -->
-        <Animation Name="object_knight_Anim_00E45C" Offset="0xE45C" /> <!-- Original name is probably "nsk_muzumuzuwalk" -->
-        <Animation Name="object_knight_Anim_00E7F4" Offset="0xE7F4" /> <!-- Original name is probably "nsk_nunuBD" -->
-        <Animation Name="object_knight_Anim_00EA90" Offset="0xEA90" /> <!-- Original name is probably "nsk_nunuD" -->
-        <Animation Name="object_knight_Anim_00EF44" Offset="0xEF44" /> <!-- Original name is probably "nsk_side_walk" -->
-        <Animation Name="object_knight_Anim_00F90C" Offset="0xF90C" /> <!-- Original name is probably "nsk_sonicgiri" -->
-        <Animation Name="object_knight_Anim_00FC78" Offset="0xFC78" /> <!-- Original name is probably "nsk_suwariwaitD" -->
-        <Animation Name="object_knight_Anim_01024C" Offset="0x1024C" /> <!-- Original name is probably "nsk_suwaru02D" -->
-        <Animation Name="object_knight_Anim_010E98" Offset="0x10E98" /> <!-- Original name is probably "nsk_suwaruD" -->
-        <Animation Name="object_knight_Anim_011298" Offset="0x11298" /> <!-- Original name is probably "nsk_tategiri" -->
-        <Animation Name="object_knight_Anim_011AAC" Offset="0x11AAC" /> <!-- Original name is probably "nsk_tategiri_kaburu" -->
-        <DList Name="object_knight_DL_012400" Offset="0x12400" />
-        <Texture Name="object_knight_Tex_012760" OutName="tex_012760" Format="rgba16" Width="16" Height="16" Offset="0x12760" />
-        <Texture Name="object_knight_Tex_012960" OutName="tex_012960" Format="rgba16" Width="16" Height="16" Offset="0x12960" />
-        <Texture Name="object_knight_Tex_012B60" OutName="tex_012B60" Format="rgba16" Width="8" Height="8" Offset="0x12B60" />
-        <Texture Name="object_knight_Tex_012BE0" OutName="tex_012BE0" Format="ia16" Width="8" Height="8" Offset="0x12BE0" />
-        <DList Name="object_knight_DL_012DB0" Offset="0x12DB0" />
-        <Texture Name="object_knight_Tex_012EC0" OutName="tex_012EC0" Format="rgba16" Width="8" Height="16" Offset="0x12EC0" />
-        <Texture Name="object_knight_Tex_012FC0" OutName="tex_012FC0" Format="rgba16" Width="4" Height="4" Offset="0x12FC0" />
-        <DList Name="object_knight_DL_013020" Offset="0x13020" />
-        <DList Name="object_knight_DL_0153E0" Offset="0x153E0" />
-        <DList Name="object_knight_DL_0154B0" Offset="0x154B0" />
-        <DList Name="object_knight_DL_0155A0" Offset="0x155A0" />
-        <DList Name="object_knight_DL_015660" Offset="0x15660" />
-        <DList Name="object_knight_DL_015730" Offset="0x15730" />
-        <DList Name="object_knight_DL_015820" Offset="0x15820" />
-        <DList Name="object_knight_DL_0158E0" Offset="0x158E0" />
-        <DList Name="object_knight_DL_015A40" Offset="0x15A40" />
-        <DList Name="object_knight_DL_015AE0" Offset="0x15AE0" />
-        <DList Name="object_knight_DL_015B88" Offset="0x15B88" />
-        <DList Name="object_knight_DL_015D78" Offset="0x15D78" />
-        <DList Name="object_knight_DL_015E38" Offset="0x15E38" />
-        <DList Name="object_knight_DL_015ED8" Offset="0x15ED8" />
-        <DList Name="object_knight_DL_016310" Offset="0x16310" />
-        <DList Name="object_knight_DL_0163C8" Offset="0x163C8" />
-        <DList Name="object_knight_DL_016478" Offset="0x16478" />
-        <DList Name="object_knight_DL_016530" Offset="0x16530" />
-        <DList Name="object_knight_DL_0165F0" Offset="0x165F0" />
-        <DList Name="object_knight_DL_0166D8" Offset="0x166D8" />
-        <DList Name="object_knight_DL_016810" Offset="0x16810" />
-        <DList Name="object_knight_DL_0169C8" Offset="0x169C8" />
-        <DList Name="object_knight_DL_016AD0" Offset="0x16AD0" />
-        <DList Name="object_knight_DL_016B90" Offset="0x16B90" />
-        <DList Name="object_knight_DL_016C78" Offset="0x16C78" />
-        <DList Name="object_knight_DL_016DB0" Offset="0x16DB0" />
-        <DList Name="object_knight_DL_016F70" Offset="0x16F70" />
-        <Texture Name="object_knight_Tex_017078" OutName="tex_017078" Format="rgba16" Width="16" Height="16" Offset="0x17078" />
-        <Texture Name="object_knight_Tex_017278" OutName="tex_017278" Format="rgba16" Width="4" Height="4" Offset="0x17278" />
-        <Texture Name="object_knight_Tex_017298" OutName="tex_017298" Format="rgba16" Width="4" Height="8" Offset="0x17298" />
-        <Texture Name="object_knight_Tex_0172D8" OutName="tex_0172D8" Format="rgba16" Width="8" Height="8" Offset="0x172D8" />
-        <Texture Name="object_knight_Tex_017358" OutName="tex_017358" Format="rgba16" Width="16" Height="16" Offset="0x17358" />
-        <Texture Name="object_knight_Tex_017558" OutName="tex_017558" Format="rgba16" Width="8" Height="8" Offset="0x17558" />
-        <Texture Name="object_knight_Tex_0175D8" OutName="tex_0175D8" Format="rgba16" Width="8" Height="16" Offset="0x175D8" />
-        <Texture Name="object_knight_Tex_0176D8" OutName="tex_0176D8" Format="rgba16" Width="16" Height="16" Offset="0x176D8" />
-        <Texture Name="object_knight_Tex_0178D8" OutName="tex_0178D8" Format="rgba16" Width="16" Height="16" Offset="0x178D8" />
-        <Texture Name="object_knight_Tex_017AD8" OutName="tex_017AD8" Format="rgba16" Width="8" Height="16" Offset="0x17AD8" />
-        <Texture Name="object_knight_Tex_017BD8" OutName="tex_017BD8" Format="rgba16" Width="16" Height="16" Offset="0x17BD8" />
-        <Texture Name="object_knight_Tex_017DD8" OutName="tex_017DD8" Format="rgba16" Width="8" Height="32" Offset="0x17DD8" />
-        <Texture Name="object_knight_Tex_017FD8" OutName="tex_017FD8" Format="ia8" Width="8" Height="8" Offset="0x17FD8" />
-        <Texture Name="object_knight_Tex_018018" OutName="tex_018018" Format="i4" Width="16" Height="16" Offset="0x18018" />
-        <Texture Name="object_knight_Tex_018098" OutName="tex_018098" Format="i8" Width="64" Height="32" Offset="0x18098" />
-        <DList Name="object_knight_DL_0188F8" Offset="0x188F8" />
-        <DList Name="object_knight_DL_0189F0" Offset="0x189F0" />
-        <DList Name="object_knight_DL_018AF0" Offset="0x18AF0" />
-        <TextureAnimation Name="object_knight_Matanimheader_018BC4" Offset="0x18BC4" />
-        <Array Name="object_knight_Vtx_018BD0" Count="18" Offset="0x18BD0">
-            <Vtx/>
-        </Array>
-        <DList Name="object_knight_DL_018CF0" Offset="0x18CF0" /> <!-- Original name is "w2_hikari_naname_modelT" -->
-        <DList Name="object_knight_DL_018DE0" Offset="0x18DE0" /> <!-- Original name is "w2_hikari_naname2_modelT" -->
-        <DList Name="object_knight_DL_018E50" Offset="0x18E50" />
-        <Texture Name="object_knight_Tex_018E58" OutName="tex_018E58" Format="ia8" Width="16" Height="16" Offset="0x18E58" />
-        <Texture Name="object_knight_Tex_018F58" OutName="tex_018F58" Format="ia16" Width="16" Height="32" Offset="0x18F58" />
-        <TextureAnimation Name="object_knight_Matanimheader_019360" Offset="0x19360" />
-        <DList Name="object_knight_DL_0193A8" Offset="0x193A8" />
-        <DList Name="object_knight_DL_0193B0" Offset="0x193B0" /> <!-- Original name is "w2_ikn_katen_model" -->
-        <Texture Name="object_knight_Tex_019470" OutName="tex_019470" Format="rgba16" Width="4" Height="4" Offset="0x19470" />
-        <Texture Name="object_knight_Tex_019490" OutName="tex_019490" Format="i8" Width="32" Height="64" Offset="0x19490" />
-        <DList Name="object_knight_DL_01D380" Offset="0x1D380" />
-        <DList Name="object_knight_DL_01D4C0" Offset="0x1D4C0" />
-        <DList Name="object_knight_DL_01D650" Offset="0x1D650" />
-        <DList Name="object_knight_DL_01D710" Offset="0x1D710" />
-        <DList Name="object_knight_DL_01D870" Offset="0x1D870" />
-        <DList Name="object_knight_DL_01DA00" Offset="0x1DA00" />
-        <DList Name="object_knight_DL_01DAC0" Offset="0x1DAC0" />
-        <DList Name="object_knight_DL_01DC00" Offset="0x1DC00" />
-        <DList Name="object_knight_DL_01DCA0" Offset="0x1DCA0" />
-        <DList Name="object_knight_DL_01DD48" Offset="0x1DD48" />
-        <DList Name="object_knight_DL_01DF88" Offset="0x1DF88" />
-        <DList Name="object_knight_DL_01E050" Offset="0x1E050" />
-        <DList Name="object_knight_DL_01E0A0" Offset="0x1E0A0" />
-        <DList Name="object_knight_DL_01E878" Offset="0x1E878" />
-        <DList Name="object_knight_DL_01EAA8" Offset="0x1EAA8" />
-        <DList Name="object_knight_DL_01EB40" Offset="0x1EB40" />
-        <DList Name="object_knight_DL_01EBD8" Offset="0x1EBD8" />
-        <DList Name="object_knight_DL_01EC98" Offset="0x1EC98" />
-        <DList Name="object_knight_DL_01EDE0" Offset="0x1EDE0" />
-        <DList Name="object_knight_DL_01EF68" Offset="0x1EF68" />
-        <DList Name="object_knight_DL_01F188" Offset="0x1F188" />
-        <DList Name="object_knight_DL_01F248" Offset="0x1F248" />
-        <DList Name="object_knight_DL_01F308" Offset="0x1F308" />
-        <DList Name="object_knight_DL_01F3C0" Offset="0x1F3C0" />
-        <DList Name="object_knight_DL_01F5C0" Offset="0x1F5C0" />
-        <DList Name="object_knight_DL_01F828" Offset="0x1F828" />
-        <Texture Name="object_knight_Tex_01F8E8" OutName="tex_01F8E8" Format="rgba16" Width="8" Height="16" Offset="0x1F8E8" />
-        <Texture Name="object_knight_Tex_01F9E8" OutName="tex_01F9E8" Format="rgba16" Width="8" Height="16" Offset="0x1F9E8" />
-        <Texture Name="object_knight_Tex_01FAE8" OutName="tex_01FAE8" Format="rgba16" Width="16" Height="8" Offset="0x1FAE8" />
-        <Texture Name="object_knight_Tex_01FBE8" OutName="tex_01FBE8" Format="ia8" Width="16" Height="16" Offset="0x1FBE8" />
-        <Texture Name="object_knight_Tex_01FCE8" OutName="tex_01FCE8" Format="rgba16" Width="8" Height="16" Offset="0x1FCE8" />
-        <Texture Name="object_knight_Tex_01FDE8" OutName="tex_01FDE8" Format="rgba16" Width="16" Height="16" Offset="0x1FDE8" />
-        <Limb Name="object_knight_Standardlimb_01FFE8" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_01" Offset="0x1FFE8" />
-        <Limb Name="object_knight_Standardlimb_01FFF4" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_02" Offset="0x1FFF4" />
-        <Limb Name="object_knight_Standardlimb_020000" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_03" Offset="0x20000" />
-        <Limb Name="object_knight_Standardlimb_02000C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_04" Offset="0x2000C" />
-        <Limb Name="object_knight_Standardlimb_020018" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_05" Offset="0x20018" />
-        <Limb Name="object_knight_Standardlimb_020024" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_06" Offset="0x20024" />
-        <Limb Name="object_knight_Standardlimb_020030" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_07" Offset="0x20030" />
-        <Limb Name="object_knight_Standardlimb_02003C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_08" Offset="0x2003C" />
-        <Limb Name="object_knight_Standardlimb_020048" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_09" Offset="0x20048" />
-        <Limb Name="object_knight_Standardlimb_020054" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0A" Offset="0x20054" />
-        <Limb Name="object_knight_Standardlimb_020060" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0B" Offset="0x20060" />
-        <Limb Name="object_knight_Standardlimb_02006C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0C" Offset="0x2006C" />
-        <Limb Name="object_knight_Standardlimb_020078" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0D" Offset="0x20078" />
-        <Limb Name="object_knight_Standardlimb_020084" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0E" Offset="0x20084" />
-        <Limb Name="object_knight_Standardlimb_020090" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0F" Offset="0x20090" />
-        <Limb Name="object_knight_Standardlimb_02009C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_10" Offset="0x2009C" />
-        <Limb Name="object_knight_Standardlimb_0200A8" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_11" Offset="0x200A8" />
-        <Limb Name="object_knight_Standardlimb_0200B4" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_12" Offset="0x200B4" />
-        <Limb Name="object_knight_Standardlimb_0200C0" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_13" Offset="0x200C0" />
-        <Limb Name="object_knight_Standardlimb_0200CC" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_14" Offset="0x200CC" />
-        <Limb Name="object_knight_Standardlimb_0200D8" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_15" Offset="0x200D8" />
-        <Limb Name="object_knight_Standardlimb_0200E4" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_16" Offset="0x200E4" />
-        <Limb Name="object_knight_Standardlimb_0200F0" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_17" Offset="0x200F0" />
-        <Limb Name="object_knight_Standardlimb_0200FC" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_18" Offset="0x200FC" />
-        <Limb Name="object_knight_Standardlimb_020108" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_19" Offset="0x20108" />
-        <Limb Name="object_knight_Standardlimb_020114" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_1A" Offset="0x20114" />
-        <Limb Name="object_knight_Standardlimb_020120" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_1B" Offset="0x20120" />
-        <Limb Name="object_knight_Standardlimb_02012C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_1C" Offset="0x2012C" />
-        <Skeleton Name="object_knight_Skel_0201A8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KNIGHT_1_LIMB_NONE" LimbMax="OBJECT_KNIGHT_1_LIMB_MAX" EnumName="ObjectKnight1Limb" Offset="0x201A8" />
-        <Limb Name="object_knight_Standardlimb_0201B4" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_01" Offset="0x201B4" />
-        <Limb Name="object_knight_Standardlimb_0201C0" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_02" Offset="0x201C0" />
-        <Limb Name="object_knight_Standardlimb_0201CC" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_03" Offset="0x201CC" />
-        <Limb Name="object_knight_Standardlimb_0201D8" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_04" Offset="0x201D8" />
-        <Limb Name="object_knight_Standardlimb_0201E4" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_05" Offset="0x201E4" />
-        <Limb Name="object_knight_Standardlimb_0201F0" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_06" Offset="0x201F0" />
-        <Limb Name="object_knight_Standardlimb_0201FC" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_07" Offset="0x201FC" />
-        <Limb Name="object_knight_Standardlimb_020208" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_08" Offset="0x20208" />
-        <Limb Name="object_knight_Standardlimb_020214" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_09" Offset="0x20214" />
-        <Limb Name="object_knight_Standardlimb_020220" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0A" Offset="0x20220" />
-        <Limb Name="object_knight_Standardlimb_02022C" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0B" Offset="0x2022C" />
-        <Limb Name="object_knight_Standardlimb_020238" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0C" Offset="0x20238" />
-        <Limb Name="object_knight_Standardlimb_020244" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0D" Offset="0x20244" />
-        <Limb Name="object_knight_Standardlimb_020250" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0E" Offset="0x20250" />
-        <Limb Name="object_knight_Standardlimb_02025C" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0F" Offset="0x2025C" />
-        <Limb Name="object_knight_Standardlimb_020268" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_10" Offset="0x20268" />
-        <Limb Name="object_knight_Standardlimb_020274" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_11" Offset="0x20274" />
-        <Limb Name="object_knight_Standardlimb_020280" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_12" Offset="0x20280" />
-        <Limb Name="object_knight_Standardlimb_02028C" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_13" Offset="0x2028C" />
-        <Limb Name="object_knight_Standardlimb_020298" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_14" Offset="0x20298" />
-        <Limb Name="object_knight_Standardlimb_0202A4" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_15" Offset="0x202A4" />
-        <Limb Name="object_knight_Standardlimb_0202B0" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_16" Offset="0x202B0" />
-        <Limb Name="object_knight_Standardlimb_0202BC" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_17" Offset="0x202BC" />
-        <Limb Name="object_knight_Standardlimb_0202C8" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_18" Offset="0x202C8" />
-        <Limb Name="object_knight_Standardlimb_0202D4" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_19" Offset="0x202D4" />
-        <Limb Name="object_knight_Standardlimb_0202E0" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_1A" Offset="0x202E0" />
-        <Limb Name="object_knight_Standardlimb_0202EC" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_1B" Offset="0x202EC" />
-        <Limb Name="object_knight_Standardlimb_0202F8" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_1C" Offset="0x202F8" />
-        <Skeleton Name="object_knight_Skel_020374" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KNIGHT_2_LIMB_NONE" LimbMax="OBJECT_KNIGHT_2_LIMB_MAX" EnumName="ObjectKnight2Limb" Offset="0x20374" />
-        <Animation Name="object_knight_Anim_020950" Offset="0x20950" /> <!-- Original name is probably "nsk_tategiri_tame" -->
-        <Animation Name="object_knight_Anim_02105C" Offset="0x2105C" /> <!-- Original name is probably "nsk_towaitBD" -->
-        <Animation Name="object_knight_Anim_021B10" Offset="0x21B10" /> <!-- Original name is probably "nsk_walkD" -->
-        <Animation Name="object_knight_Anim_021E34" Offset="0x21E34" /> <!-- Original name is probably "nsk_whyD" -->
-        <Animation Name="object_knight_Anim_022728" Offset="0x22728" /> <!-- Original name is probably "nsk_yokogiri" -->
-        <Animation Name="object_knight_Anim_022CAC" Offset="0x22CAC" /> <!-- Original name is probably "nsk_yokogiri_kime" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kujiya.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kujiya.xml
deleted file mode 100644
index f657e8bd8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kujiya.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Root>
-    <!-- Object for Lottery Shop -->
-    <File Name="object_kujiya" Segment="6">
-        <Mtx Name="gLotteryShopMaskPosMtx" Offset="0x2A40" />
-        <DList Name="gLotteryShopCylinderDL" Offset="0x2A80" />
-        <DList Name="gLotteryShopBackSignDL" Offset="0x3030" />
-        <DList Name="gLotteryShopOpenBoxDL" Offset="0x3248" />
-        <DList Name="gLotteryShopScrollingEffectsDL" Offset="0x3358" />
-        <DList Name="gLotteryShopRedRupeesDL" Offset="0x34A8" />
-        <DList Name="gLotteryShopGreenRupeesDL" Offset="0x35B8" />
-        <DList Name="gLotteryShopBlueRupeesDL" Offset="0x36B0" />
-        <DList Name="gLotteryShopTargetArrowAndSignDL" Offset="0x37C0" />
-        <DList Name="gLotteryShopScrollingArrowDL" Offset="0x3C80" />
-
-        <!-- Uses the billboard mtx and gLotteryShopMaskPosMtx -->
-        <DList Name="gLotteryShopMaskDL" Offset="0x3D58" />
-
-        <Texture Name="gLotteryShopSignTextTex" OutName="lottery_shop_sign_text" Format="i8" Width="64" Height="16" Offset="0x3E68" />
-        <Texture Name="gLotteryShopMaskTex" OutName="lottery_shop_mask" Format="rgba16" Width="16" Height="32" Offset="0x4268" />
-        <Texture Name="gLotteryShopGradientTex" OutName="lottery_shop_gradient" Format="i8" Width="4" Height="4" Offset="0x4668" /><!-- Used for box and target -->
-        <Texture Name="gLotteryShopCylinderTopBottomTex" OutName="lottery_shop_cylinder_top_bottom" Format="rgba16" Width="16" Height="32" Offset="0x4678" />
-        <Texture Name="gLotteryShopCylinderMiddleStripesTex" OutName="lottery_shop_cylinder_middle_stripes" Format="rgba16" Width="16" Height="32" Offset="0x4A78" />
-        <Texture Name="gLotteryShopSignBorderTex" OutName="lottery_shop_sign_border" Format="rgba16" Width="16" Height="64" Offset="0x4E78" />
-        <Texture Name="gLotteryShopBoxBaseTex" OutName="lottery_shop_box_base" Format="rgba16" Width="16" Height="16" Offset="0x5678" />
-        <Texture Name="gLotteryShopRainbowTex" OutName="lottery_shop_rainbow" Format="rgba16" Width="4" Height="32" Offset="0x5878" />
-        <Texture Name="gLotteryShopRupeesTex" OutName="lottery_shop_rupees" Format="rgba16" Width="32" Height="32" Offset="0x5978" />
-
-        <!-- All used to scroll the rainbow texture -->
-        <TextureAnimation Name="gLotteryShopTexAnim" Offset="0x6198" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kumo30.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kumo30.xml
deleted file mode 100644
index 3a74c0988..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kumo30.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="object_kumo30" Segment="6">
-        <DList Name="object_kumo30_DL_000A50" Offset="0xA50" /> <!-- Original name is "konpeki_mist1_FT_model" -->
-        <DList Name="object_kumo30_DL_000C98" Offset="0xC98" /> <!-- Original name is "konpeki_mist3_FT_model" -->
-        <Texture Name="object_kumo30_Tex_000E80" OutName="tex_000E80" Format="i8" Width="64" Height="64" Offset="0xE80" />
-        <Texture Name="object_kumo30_Tex_001E80" OutName="tex_001E80" Format="i4" Width="32" Height="32" Offset="0x1E80" />
-        <Texture Name="object_kumo30_Tex_002080" OutName="tex_002080" Format="i4" Width="64" Height="64" Offset="0x2080" />
-        <TextureAnimation Name="object_kumo30_Matanimheader_002890" Offset="0x2890" />
-        <DList Name="object_kumo30_DL_002A40" Offset="0x2A40" /> <!-- Original name is "z2_30_kumo_model" -->
-        <Texture Name="object_kumo30_Tex_002B58" OutName="tex_002B58" Format="i8" Width="32" Height="32" Offset="0x2B58" />
-        <Texture Name="object_kumo30_Tex_002F58" OutName="tex_002F58" Format="i8" Width="32" Height="32" Offset="0x2F58" />
-        <TextureAnimation Name="object_kumo30_Matanimheader_003368" Offset="0x3368" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kusa.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kusa.xml
deleted file mode 100644
index 362e47114..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kusa.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="object_kusa" Segment="6">
-        <DList Name="gKusaSproutDL" Offset="0x140" /> <!-- Original name is "obj_kusa01_model" -->
-        <DList Name="gKusaStumpDL" Offset="0x2E0" /> <!-- Original name is "obj_kusa03_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kz.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kz.xml
deleted file mode 100644
index 6295d7b1d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kz.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<Root>
-    <File Name="object_kz" Segment="6">
-        <Animation Name="object_kz_Anim_0003CC" Offset="0x3CC" /> <!-- Original name is "kz_attackA" -->
-        <Animation Name="object_kz_Anim_000F5C" Offset="0xF5C" /> <!-- Original name is "kz_attackB" -->
-        <Animation Name="object_kz_Anim_001390" Offset="0x1390" /> <!-- Original name is "kz_back_ten" -->
-        <Animation Name="object_kz_Anim_001578" Offset="0x1578" /> <!-- Original name is "kz_defense" -->
-        <Animation Name="object_kz_Anim_001E9C" Offset="0x1E9C" /> <!-- Original name is "kz_doron" -->
-        <Animation Name="object_kz_Anim_002730" Offset="0x2730" /> <!-- Original name is "kz_down" -->
-        <Animation Name="object_kz_Anim_002BA0" Offset="0x2BA0" /> <!-- Original name is "kz_downwait" -->
-        <Animation Name="object_kz_Anim_003A3C" Offset="0x3A3C" /> <!-- Original name is "kz_downwake" -->
-        <Animation Name="object_kz_Anim_0043E4" Offset="0x43E4" /> <!-- Original name is "kz_getout" -->
-        <Animation Name="object_kz_Anim_004860" Offset="0x4860" /> <!-- Original name is "kz_hit" -->
-        <Animation Name="object_kz_Anim_005644" Offset="0x5644" /> <!-- Original name is "kz_kime" -->
-        <Animation Name="object_kz_Anim_0058B8" Offset="0x58B8" /> <!-- Original name is "kz_run" -->
-
-        <Texture Name="object_kz_TLUT_0058D0" OutName="tlut_0058D0" Format="rgba16" Width="16" Height="16" Offset="0x58D0" />
-        <Texture Name="object_kz_Tex_005AD0" OutName="tex_005AD0" Format="ci8" Width="8" Height="8" Offset="0x5AD0" />
-        <Texture Name="object_kz_Tex_005B10" OutName="tex_005B10" Format="ci8" Width="8" Height="8" Offset="0x5B10" />
-        <Texture Name="object_kz_Tex_005B50" OutName="tex_005B50" Format="ci8" Width="16" Height="16" Offset="0x5B50" />
-        <Texture Name="object_kz_Tex_005C50" OutName="tex_005C50" Format="i8" Width="16" Height="16" Offset="0x5C50" />
-        <Texture Name="object_kz_Tex_005D50" OutName="tex_005D50" Format="ci8" Width="16" Height="16" Offset="0x5D50" />
-        <Texture Name="object_kz_Tex_005E50" OutName="tex_005E50" Format="i8" Width="16" Height="16" Offset="0x5E50" />
-        <Texture Name="object_kz_Tex_005F50" OutName="tex_005F50" Format="i8" Width="8" Height="16" Offset="0x5F50" />
-
-        <DList Name="object_kz_DL_007CB0" Offset="0x7CB0" />
-        <DList Name="object_kz_DL_008130" Offset="0x8130" />
-        <DList Name="object_kz_DL_008268" Offset="0x8268" />
-        <DList Name="object_kz_DL_008490" Offset="0x8490" />
-        <DList Name="object_kz_DL_0085C8" Offset="0x85C8" />
-        <DList Name="object_kz_DL_0087F0" Offset="0x87F0" />
-        <DList Name="object_kz_DL_008A10" Offset="0x8A10" />
-        <DList Name="object_kz_DL_008B10" Offset="0x8B10" />
-        <DList Name="object_kz_DL_008D80" Offset="0x8D80" />
-        <DList Name="object_kz_DL_008E80" Offset="0x8E80" />
-
-        <!-- <Texture Name="object_kz_TLUT_009100" OutName="tlut_009100" Format="rgba16" Width="16" Height="16" Offset="0x9100" /> -->
-        <!-- <Blob Name="object_kz_Blob_009300" Size="0x38" Offset="0x9300" /> -->
-        <Texture Name="object_kz_Tex_009338" OutName="tex_009338" Format="ci8" Width="8" Height="16" Offset="0x9338" />
-        <Texture Name="gKaizokuEyeOpenTex" OutName="kaizoku_eye_open" Format="ci8" Width="32" Height="32" Offset="0x93B8" TlutOffset="0x9100" />
-        <Texture Name="object_kz_Tex_0097B8" OutName="tex_0097B8" Format="i8" Width="16" Height="16" Offset="0x97B8" />
-        <Texture Name="object_kz_Tex_0098B8" OutName="tex_0098B8" Format="ci8" Width="8" Height="16" Offset="0x98B8" />
-        <Texture Name="object_kz_Tex_009938" OutName="tex_009938" Format="ci8" Width="8" Height="8" Offset="0x9938" />
-        <Texture Name="gKaizokuEyeHalfTex" OutName="kaizoku_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9978" TlutOffset="0x9100" />
-        <Texture Name="object_kz_Tex_009D78" OutName="tex_009D78" Format="i8" Width="8" Height="16" Offset="0x9D78" />
-        <Texture Name="object_kz_Tex_009DF8" OutName="tex_009DF8" Format="ci8" Width="16" Height="16" Offset="0x9DF8" />
-        <Texture Name="object_kz_Tex_009EF8" OutName="tex_009EF8" Format="ci8" Width="16" Height="16" Offset="0x9EF8" />
-        <Texture Name="object_kz_Tex_009FF8" OutName="tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" />
-        <Texture Name="gKaizokuEyeClosedTex" OutName="kaizoku_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9100" />
-
-        <DList Name="object_kz_DL_00C318" Offset="0xC318" />
-        <DList Name="object_kz_DL_00C4D8" Offset="0xC4D8" />
-        <DList Name="object_kz_DL_00C698" Offset="0xC698" />
-        <DList Name="object_kz_DL_00C830" Offset="0xC830" />
-        <DList Name="object_kz_DL_00CA08" Offset="0xCA08" />
-        <DList Name="object_kz_DL_00CBA0" Offset="0xCBA0" />
-        <DList Name="object_kz_DL_00CD78" Offset="0xCD78" />
-        <DList Name="object_kz_DL_00CE30" Offset="0xCE30" />
-        <DList Name="object_kz_DL_00CF20" Offset="0xCF20" />
-
-        <Limb Name="object_kz_Standardlimb_00D6B8" Type="Standard" EnumName="KAIZOKU_LIMB_01" Offset="0xD6B8" />
-        <Limb Name="object_kz_Standardlimb_00D6C4" Type="Standard" EnumName="KAIZOKU_LIMB_02" Offset="0xD6C4" />
-        <Limb Name="object_kz_Standardlimb_00D6D0" Type="Standard" EnumName="KAIZOKU_LIMB_03" Offset="0xD6D0" />
-        <Limb Name="object_kz_Standardlimb_00D6DC" Type="Standard" EnumName="KAIZOKU_LIMB_04" Offset="0xD6DC" />
-        <Limb Name="object_kz_Standardlimb_00D6E8" Type="Standard" EnumName="KAIZOKU_LIMB_05" Offset="0xD6E8" />
-        <Limb Name="object_kz_Standardlimb_00D6F4" Type="Standard" EnumName="KAIZOKU_LIMB_06" Offset="0xD6F4" />
-        <Limb Name="object_kz_Standardlimb_00D700" Type="Standard" EnumName="KAIZOKU_LIMB_07" Offset="0xD700" />
-        <Limb Name="object_kz_Standardlimb_00D70C" Type="Standard" EnumName="KAIZOKU_LIMB_08" Offset="0xD70C" />
-        <Limb Name="object_kz_Standardlimb_00D718" Type="Standard" EnumName="KAIZOKU_LIMB_09" Offset="0xD718" />
-        <Limb Name="object_kz_Standardlimb_00D724" Type="Standard" EnumName="KAIZOKU_LIMB_0A" Offset="0xD724" />
-        <Limb Name="object_kz_Standardlimb_00D730" Type="Standard" EnumName="KAIZOKU_LIMB_R_SWORD" Offset="0xD730" />
-        <Limb Name="object_kz_Standardlimb_00D73C" Type="Standard" EnumName="KAIZOKU_LIMB_0C" Offset="0xD73C" />
-        <Limb Name="object_kz_Standardlimb_00D748" Type="Standard" EnumName="KAIZOKU_LIMB_0D" Offset="0xD748" />
-        <Limb Name="object_kz_Standardlimb_00D754" Type="Standard" EnumName="KAIZOKU_LIMB_0E" Offset="0xD754" />
-        <Limb Name="object_kz_Standardlimb_00D760" Type="Standard" EnumName="KAIZOKU_LIMB_0F" Offset="0xD760" />
-        <Limb Name="object_kz_Standardlimb_00D76C" Type="Standard" EnumName="KAIZOKU_LIMB_10" Offset="0xD76C" />
-        <Limb Name="object_kz_Standardlimb_00D778" Type="Standard" EnumName="KAIZOKU_LIMB_11" Offset="0xD778" />
-        <Limb Name="object_kz_Standardlimb_00D784" Type="Standard" EnumName="KAIZOKU_LIMB_12" Offset="0xD784" />
-        <Limb Name="object_kz_Standardlimb_00D790" Type="Standard" EnumName="KAIZOKU_LIMB_L_FOOT" Offset="0xD790" />
-        <Limb Name="object_kz_Standardlimb_00D79C" Type="Standard" EnumName="KAIZOKU_LIMB_14" Offset="0xD79C" />
-        <Limb Name="object_kz_Standardlimb_00D7A8" Type="Standard" EnumName="KAIZOKU_LIMB_15" Offset="0xD7A8" />
-        <Limb Name="object_kz_Standardlimb_00D7B4" Type="Standard" EnumName="KAIZOKU_LIMB_R_FOOT" Offset="0xD7B4" />
-        <Limb Name="object_kz_Standardlimb_00D7C0" Type="Standard" EnumName="KAIZOKU_LIMB_17" Offset="0xD7C0" />
-        <Skeleton Name="gKaizokuSkel" Type="Flex" LimbType="Standard" LimbNone="KAIZOKU_LIMB_NONE" LimbMax="KAIZOKU_LIMB_MAX" EnumName="KaizokuLimb" Offset="0xD828" />
-
-        <Animation Name="object_kz_Anim_00DBE4" Offset="0xDBE4" /> <!-- Original name is "kz_side_walk" -->
-        <Animation Name="object_kz_Anim_00E1C8" Offset="0xE1C8" /> <!-- Original name is "kz_start" -->
-        <Animation Name="object_kz_Anim_00E8BC" Offset="0xE8BC" /> <!-- Original name is "kz_syuta" -->
-        <Animation Name="object_kz_Anim_00ED1C" Offset="0xED1C" /> <!-- Original name is "kz_syutawait" -->
-        <Animation Name="object_kz_Anim_00EF9C" Offset="0xEF9C" /> <!-- Original name is "kz_talk" -->
-        <Animation Name="object_kz_Anim_00F288" Offset="0xF288" /> <!-- Original name is "kz_togetout" -->
-        <Animation Name="object_kz_Anim_00F8E4" Offset="0xF8E4" /> <!-- Original name is "kz_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kzsaku.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kzsaku.xml
deleted file mode 100644
index fa157409e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_kzsaku.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Underwater grate -->
-    <File Name="object_kzsaku" Segment="6">
-        <DList Name="gUnderwaterGrateDL" Offset="0x40" /> <!-- Original name is "kz_saku_model" -->
-        <Texture Name="gUnderwaterGrateTex" OutName="underwater_grate" Format="ia8" Width="32" Height="128" Offset="0xD0" />
-        <Collision Name="gUnderwaterGrateCol" Offset="0x1118" /> <!-- Original name is "z2_30_saku_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ladder.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ladder.xml
deleted file mode 100644
index 2fc01e5bf..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ladder.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <!-- Object for Wooden Ladder -->
-    <File Name="object_ladder" Segment="6">
-        <!-- Wooden Ladder with 12 Rungs -->
-        <DList Name="gWoodenLadder12RungDL" Offset="0xA0" /> <!-- Original name is "m2_HASIGO_45_model" -->
-        <Collision Name="gWoodenLadder12RungCol" Offset="0x1D8" /> <!-- Original name is "m2_HASIGO_45_bgdatainfo" -->
-
-        <!-- Wooden Ladder with 16 Rungs -->
-        <DList Name="gWoodenLadder16RungDL" Offset="0x2D0" /> <!-- Original name is "m2_HASIGO_60_model" -->
-        <Collision Name="gWoodenLadder16RungCol" Offset="0x408" /> <!-- Original name is "m2_HASIGO_60_bgdatainfo" -->
-
-        <!-- Wooden Ladder with 20 Rungs -->
-        <DList Name="gWoodenLadder20RungDL" Offset="0x500" /> <!-- Original name is "m2_HASIGO_75_model" -->
-        <Collision Name="gWoodenLadder20RungCol" Offset="0x638" /> <!-- Original name is "m2_HASIGO_75_bgdatainfo" -->
-
-        <!-- Wooden Ladder with 24 Rungs -->
-        <DList Name="gWoodenLadder24RungDL" Offset="0x730" /> <!-- Original name is "m2_HASIGO_90_model" -->
-        <Collision Name="gWoodenLadder24RungCol" Offset="0x868" /> <!-- Original name is "m2_HASIGO_90_bgdatainfo" -->
-
-        <!-- Wooden Ladder Texture -->
-        <Texture Name="gWoodenLadderTex" OutName="wooden_ladder" Format="rgba16" Width="32" Height="32" Offset="0x8A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_last_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_last_obj.xml
deleted file mode 100644
index bd452a408..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_last_obj.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <File Name="object_last_obj" Segment="6">
-        <DList Name="object_last_obj_DL_000090" Offset="0x90" />
-        <DList Name="object_last_obj_DL_000098" Offset="0x98" /> <!-- Original name is "i2_bomH1_sep__L_model" -->
-        <DList Name="object_last_obj_DL_0001A0" Offset="0x1A0" />
-        <DList Name="object_last_obj_DL_0001A8" Offset="0x1A8" /> <!-- Original name is "i2_last_L031_model" -->
-        <Collision Name="object_last_obj_Colheader_000288" Offset="0x288" /> <!-- Original name is "i2_last_L031_bgdatainfo" -->
-        <Texture Name="object_last_obj_Tex_0002C0" OutName="tex_0002C0" Format="rgba16" Width="32" Height="64" Offset="0x2C0" />
-        <DList Name="object_last_obj_DL_001310" Offset="0x1310" />
-        <DList Name="object_last_obj_DL_001318" Offset="0x1318" /> <!-- Original name is "i2_last_L041_model" -->
-        <Collision Name="object_last_obj_Colheader_001450" Offset="0x1450" /> <!-- Original name is "i2_last_L041_bgdatainfo" -->
-        <!-- <Blob Name="object_last_obj_Blob_00147C" Size="0x284" Offset="0x147C" /> -->
-        <Texture Name="object_last_obj_TLUT_001700" OutName="tlut_001700" Format="rgba16" Width="4" Height="4" Offset="0x1700" />
-        <!-- <Blob Name="object_last_obj_Blob_001720" Size="0x180" Offset="0x1720" /> -->
-        <Texture Name="object_last_obj_Tex_0018A0" OutName="tex_0018A0" Format="rgba16" Width="32" Height="32" Offset="0x18A0" />
-        <!-- <Blob Name="object_last_obj_Blob_0020A0" Size="0x1000" Offset="0x20A0" /> -->
-        <Texture Name="object_last_obj_Tex_0030A0" OutName="tex_0030A0" Format="ci4" Width="64" Height="64" Offset="0x30A0" />
-        <DList Name="object_last_obj_DL_0039C0" Offset="0x39C0" /> <!-- Original name is "i2_L_shutter1_model" -->
-        <Texture Name="object_last_obj_Tex_003B20" OutName="tex_003B20" Format="rgba16" Width="32" Height="64" Offset="0x3B20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lastday.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lastday.xml
deleted file mode 100644
index 4c6b5fdb4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lastday.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <File Name="object_lastday" Segment="6">
-        <Array Name="object_lastday_Vtx_000000" Count="6" Offset="0x0">
-            <Vtx/>
-        </Array>
-        <DList Name="object_lastday_DL_000060" Offset="0x60" /> <!-- Original name is "houkai_core_model" -->
-        <TextureAnimation Name="object_lastday_Matanimheader_000148" Offset="0x148" />
-        <DList Name="object_lastday_DL_000210" Offset="0x210" /> <!-- Original name is "houkai_fire_model" -->
-        <TextureAnimation Name="object_lastday_Matanimheader_000308" Offset="0x308" />
-        <DList Name="object_lastday_DL_000370" Offset="0x370" /> <!-- Original name is "houkai_horizon_model" -->
-        <TextureAnimation Name="object_lastday_Matanimheader_000448" Offset="0x448" />
-        <DList Name="object_lastday_DL_000510" Offset="0x510" /> <!-- Original name is "houkai_smoke_model" -->
-        <TextureAnimation Name="object_lastday_Matanimheader_000608" Offset="0x608" />
-        <Texture Name="object_lastday_Tex_000610" OutName="tex_000610" Format="ia16" Width="32" Height="32" Offset="0x610" />
-        <Texture Name="object_lastday_Tex_000E10" OutName="tex_000E10" Format="i8" Width="64" Height="32" Offset="0xE10" />
-        <Texture Name="object_lastday_Tex_001610" OutName="tex_001610" Format="i8" Width="32" Height="64" Offset="0x1610" />
-        <Texture Name="object_lastday_Tex_001E10" OutName="tex_001E10" Format="i8" Width="32" Height="32" Offset="0x1E10" />
-        <Texture Name="object_lastday_Tex_002210" OutName="tex_002210" Format="i8" Width="64" Height="32" Offset="0x2210" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lbfshot.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lbfshot.xml
deleted file mode 100644
index 881f877b6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lbfshot.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_lbfshot" Segment="6">
-        <DList Name="object_lbfshot_DL_000220" Offset="0x220" /> <!-- Original name is "z2_lbfshot_modelT" -->
-        <DList Name="object_lbfshot_DL_000228" Offset="0x228" /> <!-- Original name is "z2_lbfshot_model" -->
-        <Texture Name="object_lbfshot_Tex_000340" OutName="tex_000340" Format="rgba16" Width="16" Height="64" Offset="0x340" />
-        <Texture Name="object_lbfshot_Tex_000B40" OutName="tex_000B40" Format="rgba16" Width="32" Height="32" Offset="0xB40" />
-        <Collision Name="object_lbfshot_Colheader_0014D8" Offset="0x14D8" /> <!-- Original name is "z2_lbfshot_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lightblock.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lightblock.xml
deleted file mode 100644
index 07c5da688..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lightblock.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Object for the Sun Block -->
-    <File Name="object_lightblock" Segment="6">
-        <DList Name="gSunBlockEmptyDL" Offset="0x170" /> <!-- Original name is "z2_brick_light_modelT" -->
-        <DList Name="gSunBlockDL" Offset="0x178" /> <!-- Original name is "z2_brick_light_model" -->
-        <Texture Name="gSunBlockTLUT" OutName="sun_block_tlut" Format="rgba16" Width="4" Height="4" Offset="0x258" />
-        <Texture Name="gSunBlockTex" OutName="sun_block" Format="ci4" Width="64" Height="64" Offset="0x278" />
-        <Collision Name="gSunBlockCol" Offset="0xB80" /> <!-- Original name is "z2_brick_light_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lightswitch.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lightswitch.xml
deleted file mode 100644
index a8b26bc51..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lightswitch.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_lightswitch" Segment="6">
-        <DList Name="object_lightswitch_DL_000260" Offset="0x260" /> <!-- Original name is "switch_8_model" -->
-        <DList Name="object_lightswitch_DL_000398" Offset="0x398" /> <!-- Original name is "switch_8_fire1_model" -->
-        <!-- a square, geometry only -->
-        <DList Name="object_lightswitch_DL_000408" Offset="0x408" /> <!-- Original name is "switch_8_fire2_model" -->
-        <Texture Name="object_lightswitch_Tex_000420" OutName="tex_000420" Format="rgba16" Width="32" Height="32" Offset="0x420" /> <!-- eyes open -->
-        <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20" /> <!-- eyes closed -->
-        <Texture Name="object_lightswitch_Tex_001420" OutName="tex_001420" Format="rgba16" Width="32" Height="32" Offset="0x1420" /> <!-- eyes open, smiling -->
-        <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_boy.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_boy.xml
deleted file mode 100644
index 2fe50d9bc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_boy.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<Root>
-    <File Name="object_link_boy" Segment="6">
-        <Texture Name="object_link_boy_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="object_link_boy_TLUT_000200" OutName="tlut_000200" Format="rgba16" Width="16" Height="16" Offset="0x200" />
-        <Texture Name="gLinkFierceDeityHandHoldingTLUT" OutName="hand_holding_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400" />
-        <Texture Name="object_link_boy_Tex_000600" OutName="tex_000600" Format="ci8" Width="16" Height="32" Offset="0x600" TlutOffset="0x0" />
-        <Texture Name="object_link_boy_Tex_000800" OutName="tex_000800" Format="ci8" Width="16" Height="32" Offset="0x800" />
-        <Texture Name="gLinkFierceDeityHandHoldingTex" OutName="hand_holding" Format="ci8" Width="16" Height="16" Offset="0xA00" TlutOffset="0x400" />
-        <Texture Name="object_link_boy_Tex_000B00" OutName="tex_000B00" Format="i8" Width="16" Height="16" Offset="0xB00" />
-
-        <DList Name="gLinkFierceDeityWaistDL" Offset="0x49E0" />
-        <DList Name="gLinkFierceDeityRightThighDL" Offset="0x4C50" />
-        <DList Name="gLinkFierceDeityRightShinDL" Offset="0x4F48" />
-        <DList Name="gLinkFierceDeityRightFootDL" Offset="0x5190" />
-        <DList Name="gLinkFierceDeityLeftThighDL" Offset="0x52A0" />
-        <DList Name="gLinkFierceDeityLeftShinDL" Offset="0x55D0" />
-        <DList Name="gLinkFierceDeityLeftFootDL" Offset="0x5818" />
-        <DList Name="gLinkFierceDeityHatDL" Offset="0x5928" />
-        <DList Name="gLinkFierceDeityHeadDL" Offset="0x5A78" />
-        <DList Name="object_link_boy_DL_0060E8" Offset="0x60E8" />
-        <DList Name="gLinkFierceDeityTorsoDL" Offset="0x6148" />
-        <DList Name="object_link_boy_DL_006370" Offset="0x6370" />
-        <DList Name="gLinkFierceDeityRightShoulderDL" Offset="0x6410" />
-        <DList Name="gLinkFierceDeityRightForearmDL" Offset="0x65E0" />
-        <DList Name="gLinkFierceDeityRightHandDL" Offset="0x67D8" />
-        <DList Name="gLinkFierceDeityLeftShoulderDL" Offset="0x6A58" />
-        <DList Name="gLinkFierceDeityLeftForearmDL" Offset="0x6C38" />
-        <DList Name="gLinkFierceDeityLeftHandDL" Offset="0x6EB8" />
-        <!-- Unused leftover from OoT -->
-        <DList Name="gLinkFierceDeityLeftHandHoldBottleDL" Offset="0x7820" />
-        <DList Name="object_link_boy_DL_007A50" Offset="0x7A50" />
-        <DList Name="gLinkFierceDeityBottleDL" Offset="0x7AD0" />
-        <DList Name="gLinkFierceDeitySwordDL" Offset="0x7F28" />
-        <DList Name="gLinkFierceDeityLeftHandHoldingSwordDL" Offset="0x80F0" />
-        <DList Name="gLinkFierceDeityEmptyDL" Offset="0x8100" />
-
-        <Texture Name="object_link_boy_TLUT_008108" OutName="tlut_008108" Format="rgba16" Width="4" Height="4" Offset="0x8108" />
-        <Texture Name="object_link_boy_TLUT_008128" OutName="tlut_008128" Format="rgba16" Width="4" Height="4" Offset="0x8128" />
-        <Texture Name="object_link_boy_TLUT_008148" OutName="tlut_008148" Format="rgba16" Width="4" Height="4" Offset="0x8148" />
-        <Texture Name="object_link_boy_TLUT_008168" OutName="tlut_008168" Format="rgba16" Width="4" Height="4" Offset="0x8168" />
-        <Texture Name="object_link_boy_TLUT_008188" OutName="tlut_008188" Format="rgba16" Width="4" Height="4" Offset="0x8188" />
-        <Texture Name="object_link_boy_TLUT_0081A8" OutName="tlut_0081A8" Format="rgba16" Width="4" Height="4" Offset="0x81A8" />
-        <Texture Name="gLinkFierceDeityHandTLUT" OutName="hand_tlut" Format="rgba16" Width="4" Height="4" Offset="0x81C8" />
-        <Texture Name="object_link_boy_TLUT_0081E8" OutName="tlut_0081E8" Format="rgba16" Width="4" Height="4" Offset="0x81E8" />
-        <Texture Name="object_link_boy_Tex_008208" OutName="tex_008208" Format="rgba16" Width="16" Height="16" Offset="0x8208" />
-        <Texture Name="object_link_boy_Tex_008408" OutName="tex_008408" Format="ci4" Width="16" Height="16" Offset="0x8408" />
-        <Texture Name="object_link_boy_Tex_008488" OutName="tex_008488" Format="rgba16" Width="16" Height="32" Offset="0x8488" />
-        <Texture Name="object_link_boy_Tex_008888" OutName="tex_008888" Format="rgba16" Width="32" Height="16" Offset="0x8888" />
-        <Texture Name="object_link_boy_Tex_008C88" OutName="tex_008C88" Format="ci4" Width="16" Height="16" Offset="0x8C88" />
-        <Texture Name="object_link_boy_Tex_008D08" OutName="tex_008D08" Format="ci4" Width="32" Height="32" Offset="0x8D08" />
-        <Texture Name="object_link_boy_Tex_008F08" OutName="tex_008F08" Format="ci4" Width="64" Height="64" Offset="0x8F08" />
-        <Texture Name="gLinkFierceDeityEyesTex" OutName="eyes" Format="rgba16" Width="64" Height="32" Offset="0x9708" />
-        <Texture Name="object_link_boy_Tex_00A708" OutName="tex_00A708" Format="ci4" Width="32" Height="32" Offset="0xA708" />
-        <Texture Name="gLinkFierceDeityMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0xA908" />
-        <Texture Name="gLinkFierceDeityEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xAD08" />
-        <Texture Name="object_link_boy_Tex_00AF08" OutName="tex_00AF08" Format="ci4" Width="32" Height="32" Offset="0xAF08" />
-        <Texture Name="gLinkFierceDeityHandTex" OutName="hand" Format="ci4" Width="16" Height="16" Offset="0xB108" TlutOffset="0x81C8" />
-        <Texture Name="object_link_boy_Tex_00B188" OutName="tex_00B188" Format="ci4" Width="64" Height="64" Offset="0xB188" />
-
-        <!-- TODO this texture should be 50x75 but the u64 type of textures makes this not match currently -->
-        <Texture Name="object_link_boy_Tex_00B988" OutName="tex_00B988" Format="rgba16" Width="50" Height="74" Offset="0xB988" />
-
-        <Limb Name="gLinkFierceDeityRootLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_ROOT" Offset="0xD6D4" />
-        <Limb Name="gLinkFierceDeityWaistLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_WAIST" Offset="0xD6E4" />
-        <Limb Name="gLinkFierceDeityLowerRootLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LOWER_ROOT" Offset="0xD6F4" />
-        <Limb Name="gLinkFierceDeityRightThighLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_THIGH" Offset="0xD704" />
-        <Limb Name="gLinkFierceDeityRightShinLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_SHIN" Offset="0xD714" />
-        <Limb Name="gLinkFierceDeityRightFootLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_FOOT" Offset="0xD724" />
-        <Limb Name="gLinkFierceDeityLeftThighLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_THIGH" Offset="0xD734" />
-        <Limb Name="gLinkFierceDeityLeftShinLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_SHIN" Offset="0xD744" />
-        <Limb Name="gLinkFierceDeityLeftFootLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_FOOT" Offset="0xD754" />
-        <Limb Name="gLinkFierceDeityUpperRootLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_UPPER_ROOT" Offset="0xD764" />
-        <Limb Name="gLinkFierceDeityHeadLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_HEAD" Offset="0xD774" />
-        <Limb Name="gLinkFierceDeityHatLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_HAT" Offset="0xD784" />
-        <Limb Name="gLinkFierceDeityCollarLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_COLLAR" Offset="0xD794" />
-        <Limb Name="gLinkFierceDeityLeftShoulderLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_SHOULDER" Offset="0xD7A4" />
-        <Limb Name="gLinkFierceDeityLeftForearmLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_FOREARM" Offset="0xD7B4" />
-        <Limb Name="gLinkFierceDeityLeftHandLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_HAND" Offset="0xD7C4" />
-        <Limb Name="gLinkFierceDeityRightShoulderLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_SHOULDER" Offset="0xD7D4" />
-        <Limb Name="gLinkFierceDeityRightForearmLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_FOREARM" Offset="0xD7E4" />
-        <Limb Name="gLinkFierceDeityRightHandLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_HAND" Offset="0xD7F4" />
-        <Limb Name="gLinkFierceDeitySheathLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_SHEATH" Offset="0xD804" />
-        <Limb Name="gLinkFierceDeityTorsoLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_TORSO" Offset="0xD814" />
-        <Skeleton Name="gLinkFierceDeitySkel" Type="Flex" LimbType="LOD" LimbNone="LINK_FIERCE_DEITY_LIMB_NONE" LimbMax="LINK_FIERCE_DEITY_LIMB_MAX" EnumName="LinkFierceDeityLimb" Offset="0xD878" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_child.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_child.xml
deleted file mode 100644
index 3a1998458..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_child.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<Root>
-    <File Name="object_link_child" Segment="6">
-        <Texture Name="gLinkHumanEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x800" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesClosedTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesRollUpTex" OutName="eyes_roll_up" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesRollDownTex" OutName="eyes_roll_down" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5000" />
-        <Texture Name="object_link_child_Tex_003800" OutName="tex_003800" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5000" />
-
-        <Texture Name="gLinkHumanMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5200" />
-        <Texture Name="gLinkHumanMouthTeethTex" OutName="mouth_teeth" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5200" />
-        <Texture Name="gLinkHumanMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5200" />
-        <Texture Name="gLinkHumanMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5200" />
-
-        <Texture Name="gLinkHumanSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5000" />
-        <Texture Name="gLinkHumanMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5200" />
-
-        <Texture Name="object_link_child_Tex_005400" OutName="tex_005400" Format="rgba16" Width="8" Height="16" Offset="0x5400" />
-        <Texture Name="object_link_child_Tex_005500" OutName="tex_005500" Format="ci8" Width="8" Height="8" Offset="0x5500" />
-        <Texture Name="object_link_child_Tex_005540" OutName="tex_005540" Format="ci8" Width="16" Height="16" Offset="0x5540" />
-        <Texture Name="gLinkHumanEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5640" />
-        <Texture Name="gLinkHumanBeltClaspTex" OutName="belt_clasp" Format="rgba16" Width="32" Height="16" Offset="0x5740" />
-        <Texture Name="gLinkHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="16" Offset="0x5B40" />
-        <Texture Name="object_link_child_Tex_005C40" OutName="tex_005C40" Format="i8" Width="16" Height="16" Offset="0x5C40" />
-        <Texture Name="object_link_child_Tex_005D40" OutName="tex_005D40" Format="i8" Width="8" Height="8" Offset="0x5D40" />
-        <Texture Name="object_link_child_Tex_005D80" OutName="tex_005D80" Format="i8" Width="8" Height="16" Offset="0x5D80" />
-        <Texture Name="object_link_child_Tex_005E00" OutName="tex_005E00" Format="rgba16" Width="16" Height="32" Offset="0x5E00" />
-        <Texture Name="object_link_child_Tex_006200" OutName="tex_006200" Format="rgba16" Width="32" Height="32" Offset="0x6200" />
-        <Texture Name="object_link_child_Tex_006A00" OutName="tex_006A00" Format="ci8" Width="16" Height="16" Offset="0x6A00" />
-        <Texture Name="object_link_child_Tex_006B00" OutName="tex_006B00" Format="rgba16" Width="16" Height="16" Offset="0x6B00" />
-        <!-- <Blob Name="object_link_child_Blob_006D00" Size="0xA00" Offset="0x6D00" /> -->
-        <Texture Name="object_link_child_Tex_007700" OutName="tex_007700" Format="rgba16" Width="16" Height="16" Offset="0x1DB48" />
-
-        <DList Name="gLinkHumanRightThighDL" Offset="0xB160" />
-        <DList Name="gLinkHumanRightShinDL" Offset="0xB338" />
-        <DList Name="gLinkHumanRightFootDL" Offset="0xB578" />
-        <DList Name="gLinkHumanLeftThighDL" Offset="0xB688" />
-        <DList Name="gLinkHumanLeftShinDL" Offset="0xB860" />
-        <DList Name="gLinkHumanLeftFootDL" Offset="0xBAA0" />
-        <DList Name="gLinkHumanWaistDL" Offset="0xBBB0" />
-        <DList Name="gLinkHumanCollarDL" Offset="0xBD88" />
-        <DList Name="gLinkHumanTorsoDL" Offset="0xBE48" />
-        <DList Name="gLinkHumanHeadDL" Offset="0xC1E8" />
-        <DList Name="gLinkHumanHatDL" Offset="0xC8A8" />
-        <!-- Unused sword in scabbard -->
-        <DList Name="gLinkHumanSwordScabbardDL" Offset="0xC9C8" />
-        <DList Name="gLinkHumanRightShoulderDL" Offset="0xCAE0" />
-        <DList Name="gLinkHumanRightForearmDL" Offset="0xCD08" />
-        <DList Name="gLinkHumanRightHandOpenDL" Offset="0xCE58" />
-        <DList Name="gLinkHumanLeftShoulderDL" Offset="0xCFB0" />
-        <DList Name="gLinkHumanLeftForearmDL" Offset="0xD1D8" />
-        <DList Name="gLinkHumanLeftHandOpenDL" Offset="0xD328" />
-
-        <Texture Name="gLinkHumanOcarinaTex" OutName="ocarina" Format="rgba16" Width="32" Height="16" Offset="0xD480" />
-        <!-- <Blob Name="object_link_child_Blob_00DA80" Size="0x88" Offset="0xDA80" /> -->
-        <Texture Name="object_link_child_Tex_00DB08" OutName="tex_00DB08" Format="ci8" Width="16" Height="16" Offset="0xD908" />
-
-        <!-- <Blob Name="object_link_child_Blob_00DC08" Size="0x360" Offset="0xDC08" /> -->
-        <DList Name="gLinkHumanLeftHandClosedDL" Offset="0xDFC8" />
-        <!-- <Blob Name="object_link_child_Blob_00E2E8" Size="0x1F0" Offset="0xE2E8" /> -->
-        <DList Name="gLinkHumanRightHandClosedDL" Offset="0xE538" />
-
-        <DList Name="gLinkHumanRightHandHoldingOcarinaDL" Offset="0xEB18" />
-        <DList Name="object_link_child_DL_00F1D8" Offset="0xEFD8" />
-        <DList Name="object_link_child_DL_00F548" Offset="0xF348" />
-        <DList Name="object_link_child_DL_00F998" Offset="0xF798" />
-        <DList Name="object_link_child_DL_00FD08" Offset="0xFB08" />
-        <!-- Duplicated of gLinkHumanRightHandHoldingOcarinaDL -->
-        <DList Name="object_link_child_DL_0102E8" Offset="0x100E8" />
-
-        <DList Name="object_link_child_DL_015F98" Offset="0x15D98" />
-        <DList Name="object_link_child_DL_016048" Offset="0x15E48" />
-        <DList Name="object_link_child_DL_016058" Offset="0x15E58" />
-        <DList Name="object_link_child_DL_0161C8" Offset="0x15FC8" />
-        <DList Name="object_link_child_DL_016270" Offset="0x16070" />
-        <DList Name="object_link_child_DL_016320" Offset="0x16120" />
-        <DList Name="object_link_child_DL_0163D0" Offset="0x161D0" />
-        <DList Name="gLinkHumanMirrorShieldDL" Offset="0x16280" />
-
-        <DList Name="object_link_child_DL_0164B8" Offset="0x162B8" />
-        <DList Name="object_link_child_DL_016608" Offset="0x16408" />
-        <DList Name="object_link_child_DL_0166F8" Offset="0x164F8" />
-        <DList Name="object_link_child_DL_0167D0" Offset="0x165D0" />
-        <DList Name="gLinkHumanGreatFairysSwordDL" Offset="0x16698" />
-        <DList Name="object_link_child_DL_0168C0" Offset="0x166C0" />
-        <DList Name="object_link_child_DL_016950" Offset="0x16750" />
-        <DList Name="object_link_child_DL_0169E0" Offset="0x167E0" />
-        <DList Name="gLinkHumanGildedSwordSheathDL" Offset="0x16980" />
-        <DList Name="object_link_child_DL_016BA0" Offset="0x169A0" />
-        <DList Name="object_link_child_DL_016C88" Offset="0x16A88" />
-        <DList Name="object_link_child_DL_016D58" Offset="0x16B58" />
-        <DList Name="object_link_child_DL_016E10" Offset="0x16C10" />
-        <DList Name="object_link_child_DL_016F38" Offset="0x16D38" />
-        <DList Name="object_link_child_DL_016FC8" Offset="0x16DC8" />
-        <DList Name="gLinkHumanGildedSwordHandleDL" Offset="0x16E58" />
-        <DList Name="object_link_child_DL_017090" Offset="0x16E90" />
-        <DList Name="object_link_child_DL_017130" Offset="0x16F30" />
-        <DList Name="object_link_child_DL_0171D0" Offset="0x16FD0" />
-        <DList Name="object_link_child_DL_017270" Offset="0x17070" />
-        <DList Name="gLinkHumanGildedSwordBladeDL" Offset="0x17110" />
-        <DList Name="gLinkHumanRazorSwordSheathDL" Offset="0x17138" />
-        <DList Name="gLinkHumanHerosShieldDL" Offset="0x17258" />
-        <DList Name="gLinkHumanKokiriSwordSheathDL" Offset="0x17500" />
-        <DList Name="object_link_child_DL_017818" Offset="0x17618" />
-        <DList Name="gLinkHumanHookshotDL" Offset="0x17668" />
-        <DList Name="object_link_child_DL_017B40" Offset="0x17950" />
-        <DList Name="gLinkHumanBowDL" Offset="0x17FD8" />
-        <DList Name="object_link_child_DL_018490" Offset="0x182A0" />
-
-        <Texture Name="object_link_child_TLUT_018A40" OutName="tlut_018A40" Format="rgba16" Width="16" Height="16" Offset="0x18850" />
-        <Texture Name="gLinkHumanHerosShieldFrontTLUT" OutName="hylian_shield_front_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18A50" />
-        <Texture Name="gLinkHumanHerosShieldBackTLUT" OutName="hylian_shield_back_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18C50" />
-        <Texture Name="gLinkHumanShieldHandleTLUT" OutName="shield_handle_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18E50" />
-        <Texture Name="object_link_child_Tex_019240" OutName="tex_019240" Format="ci8" Width="8" Height="8" Offset="0x19050" />
-        <Texture Name="gLinkHumanHerosShieldFrontUpperTex" OutName="hylian_shield_front_upper" Format="ci8" Width="64" Height="32" Offset="0x19090" TlutOffset="0x18A50" />
-        <Texture Name="object_link_child_Tex_019A80" OutName="tex_019A80" Format="ci8" Width="32" Height="64" Offset="0x19890" />
-        <Texture Name="object_link_child_Tex_01A280" OutName="tex_01A280" Format="ci8" Width="16" Height="16" Offset="0x1A090" />
-        <Texture Name="object_link_child_Tex_01A380" OutName="tex_01A380" Format="rgba16" Width="64" Height="32" Offset="0x1A190" />
-        <Texture Name="object_link_child_Tex_01B380" OutName="tex_01B380" Format="ci8" Width="16" Height="16" Offset="0x1B190" />
-        <Texture Name="gLinkHumanHerosShieldFrontLowerTex" OutName="hylian_shield_front_lower" Format="ci8" Width="64" Height="32" Offset="0x1B290" TlutOffset="0x18A50" />
-        <Texture Name="gLinkHumanHerosShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0x1BA90" TlutOffset="0x18C50" />
-        <Texture Name="gLinkHumanShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0x1BC90" TlutOffset="0x18E50" />
-        <Texture Name="object_link_child_Tex_01BF00" OutName="tex_01BF00" Format="rgba16" Width="8" Height="8" Offset="0x1BD10" />
-        <Texture Name="object_link_child_Tex_01BF80" OutName="tex_01BF80" Format="rgba16" Width="16" Height="16" Offset="0x1BD90" />
-        <Texture Name="object_link_child_Tex_01C180" OutName="tex_01C180" Format="rgba16" Width="16" Height="16" Offset="0x1BF90" />
-        <Texture Name="object_link_child_Tex_01C380" OutName="tex_01C380" Format="rgba16" Width="8" Height="8" Offset="0x1C190" />
-        <Texture Name="object_link_child_Tex_01C400" OutName="tex_01C400" Format="rgba16" Width="16" Height="32" Offset="0x1C210" />
-        <Texture Name="object_link_child_Tex_01C800" OutName="tex_01C800" Format="rgba16" Width="16" Height="8" Offset="0x1C610" />
-        <Texture Name="object_link_child_Tex_01C900" OutName="tex_01C900" Format="rgba16" Width="16" Height="16" Offset="0x1C710" />
-        <Texture Name="object_link_child_Tex_01CB00" OutName="tex_01CB00" Format="i8" Width="32" Height="64" Offset="0x1C910" />
-        <Texture Name="object_link_child_Tex_01D300" OutName="tex_01D300" Format="i8" Width="8" Height="8" Offset="0x1D110" />
-        <Texture Name="object_link_child_Tex_01D340" OutName="tex_01D340" Format="i8" Width="16" Height="16" Offset="0x1D150" />
-        <Texture Name="object_link_child_Tex_01D440" OutName="tex_01D440" Format="i8" Width="32" Height="32" Offset="0x1D250" />
-        <DList Name="object_link_child_DL_01D960" Offset="0x1D770" />
-
-        <DList Name="gLinkHumanSheathEmptyDL" Offset="0x1D8A0" />
-
-        <Mtx Name="gLinkHumanSheathedKokiriSwordMtx" Offset="0x1D8A8" />
-        <DList Name="gLinkHumanSheathedKokiriSwordDL" Offset="0x1D8E8" />
-
-        <Mtx Name="gLinkHumanSheathedRazorSwordMtx" Offset="0x1D910" />
-        <DList Name="gLinkHumanSheathedRazorSwordDL" Offset="0x1D950" />
-        <DList Name="gLinkHumanSheathedGildedSwordDL" Offset="0x1D970" />
-        <Mtx Name="gLinkHumanHerosShieldMtx" Offset="0x1D998" />
-        <DList Name="gLinkHumanHerosShieldWithMtxDL" Offset="0x1D9D8" />
-        <Mtx Name="gLinkHumanMirrorShieldMtx" Offset="0x1D9E8" />
-        <DList Name="gLinkHumanMirrorShieldWithMtxDL" Offset="0x1DA28" />
-
-        <DList Name="gLinkHumanRightHandHoldingHerosShieldDL" Offset="0x1DA38" />
-        <DList Name="object_link_child_DL_01DC38" Offset="0x1DA48" />
-        <DList Name="gLinkHumanRightHandHoldingMirrorShieldDL" Offset="0x1DA58" />
-        <DList Name="object_link_child_DL_01DC58" Offset="0x1DA68" />
-        <DList Name="gLinkHumanLeftHandHoldingKokiriSwordDL" Offset="0x1DA78" />
-        <DList Name="object_link_child_DL_01DC78" Offset="0x1DA88" />
-        <DList Name="gLinkHumanLeftHandHoldingRazorSwordDL" Offset="0x1DA98" />
-        <DList Name="object_link_child_DL_01DC98" Offset="0x1DAA8" />
-        <DList Name="gLinkHumanLeftHandHoldingGildedSwordDL" Offset="0x1DAB8" />
-        <DList Name="object_link_child_DL_01DCC0" Offset="0x1DAD0" />
-        <DList Name="gLinkHumanLeftHandHoldingGreatFairysSwordDL" Offset="0x1DAE8" />
-        <DList Name="object_link_child_DL_01DCE8" Offset="0x1DAF8" />
-        <DList Name="gLinkHumanRightHandHoldingHookshotDL" Offset="0x1DB08" />
-        <DList Name="object_link_child_DL_01DD08" Offset="0x1DB18" />
-        <DList Name="gLinkHumanRightHandHoldingBowDL" Offset="0x1DB28" />
-        <DList Name="object_link_child_DL_01DD28" Offset="0x1DB38" />
-
-        <DList Name="gLinkHumanLeftHandHoldBottleDL" Offset="0x1DFB8" />
-
-        <Limb Name="gLinkHumanRootLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_ROOT" Offset="0x1E0B0" />
-        <Limb Name="gLinkHumanWaistLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_WAIST" Offset="0x1E0C0" />
-        <Limb Name="gLinkHumanLowerRootLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LOWER_ROOT" Offset="0x1E0D0" />
-        <Limb Name="gLinkHumanRightThighLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_THIGH" Offset="0x1E0E0" />
-        <Limb Name="gLinkHumanRightShinLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_SHIN" Offset="0x1E0F0" />
-        <Limb Name="gLinkHumanRightFootLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_FOOT" Offset="0x1E100" />
-        <Limb Name="gLinkHumanLeftThighLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_THIGH" Offset="0x1E110" />
-        <Limb Name="gLinkHumanLeftShinLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_SHIN" Offset="0x1E120" />
-        <Limb Name="gLinkHumanLeftFootLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_FOOT" Offset="0x1E130" />
-        <Limb Name="gLinkHumanUpperRootLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_UPPER_ROOT" Offset="0x1E140" />
-        <Limb Name="gLinkHumanHeadLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_HEAD" Offset="0x1E150" />
-        <Limb Name="gLinkHumanHatLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_HAT" Offset="0x1E160" />
-        <Limb Name="gLinkHumanCollarLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_COLLAR" Offset="0x1E170" />
-        <Limb Name="gLinkHumanLeftShoulderLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_SHOULDER" Offset="0x1E180" />
-        <Limb Name="gLinkHumanLeftForearmLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_FOREARM" Offset="0x1E190" />
-        <Limb Name="gLinkHumanLeftHandLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_HAND" Offset="0x1E1A0" />
-        <Limb Name="gLinkHumanRightShoulderLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_SHOULDER" Offset="0x1E1B0" />
-        <Limb Name="gLinkHumanRightForearmLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_FOREARM" Offset="0x1E1C0" />
-        <Limb Name="gLinkHumanRightHandLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_HAND" Offset="0x1E1D0" />
-        <Limb Name="gLinkHumanSheathLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_SHEATH" Offset="0x1E1E0" />
-        <Limb Name="gLinkHumanTorsoLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_TORSO" Offset="0x1E1F0" />
-        <Skeleton Name="gLinkHumanSkel" Type="Flex" LimbType="LOD" LimbNone="LINK_HUMAN_LIMB_NONE" LimbMax="LINK_HUMAN_LIMB_MAX" EnumName="LinkHumanLimb" Offset="0x1E254" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_goron.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_goron.xml
deleted file mode 100644
index b6dd7fe6f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_goron.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<Root>
-    <File Name="object_link_goron" Segment="6">
-        <Texture Name="gLinkGoronEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0" TlutOffset="0x2200" />
-        <Texture Name="gLinkGoronEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x800" TlutOffset="0x2200" />
-        <Texture Name="gLinkGoronEyesClosedTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x2200" />
-        <Texture Name="gLinkGoronEyesSurprisedTex" OutName="eyes_surprised" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x2200" />
-
-        <Texture Name="object_link_goron_TLUT_002000" OutName="tlut_002000" Format="rgba16" Width="16" Height="16" Offset="0x2000" />
-        <Texture Name="gLinkGoronSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2200" />
-
-        <Texture Name="object_link_goron_Tex_002400" OutName="tex_002400" Format="rgba16" Width="8" Height="32" Offset="0x2400" />
-        <Texture Name="object_link_goron_Tex_002600" OutName="tex_002600" Format="ci8" Width="16" Height="16" Offset="0x2600" />
-        <Texture Name="object_link_goron_Tex_002700" OutName="tex_002700" Format="rgba16" Width="8" Height="8" Offset="0x2700" />
-        <Texture Name="object_link_goron_Tex_002780" OutName="tex_002780" Format="rgba16" Width="8" Height="16" Offset="0x2780" />
-        <Texture Name="object_link_goron_Tex_002880" OutName="tex_002880" Format="rgba16" Width="8" Height="8" Offset="0x2880" />
-        <Texture Name="object_link_goron_Tex_002900" OutName="tex_002900" Format="ci8" Width="8" Height="8" Offset="0x2900" />
-        <Texture Name="object_link_goron_Tex_002940" OutName="tex_002940" Format="rgba16" Width="32" Height="16" Offset="0x2940" />
-        <Texture Name="object_link_goron_Tex_002D40" OutName="tex_002D40" Format="rgba16" Width="16" Height="32" Offset="0x2D40" />
-        <Texture Name="object_link_goron_Tex_003140" OutName="tex_003140" Format="ci8" Width="32" Height="64" Offset="0x3140" />
-        <Texture Name="object_link_goron_Tex_003940" OutName="tex_003940" Format="ci8" Width="16" Height="16" Offset="0x3940" />
-        <Texture Name="object_link_goron_Tex_003A40" OutName="tex_003A40" Format="ci8" Width="32" Height="32" Offset="0x3A40" />
-        <Texture Name="object_link_goron_Tex_003E40" OutName="tex_003E40" Format="ci8" Width="32" Height="32" Offset="0x3E40" />
-        <Texture Name="object_link_goron_Tex_004240" OutName="tex_004240" Format="ci8" Width="8" Height="32" Offset="0x4240" />
-        <Texture Name="object_link_goron_Tex_004340" OutName="tex_004340" Format="i8" Width="8" Height="8" Offset="0x4340" />
-
-        <DList Name="gLinkGoronRightThighDL" Offset="0x8140" />
-        <DList Name="gLinkGoronRightShinDL" Offset="0x8230" />
-        <DList Name="gLinkGoronRightFootDL" Offset="0x8500" />
-        <DList Name="gLinkGoronLeftThighDL" Offset="0x86A0" />
-        <DList Name="gLinkGoronLeftShinDL" Offset="0x8790" />
-        <DList Name="gLinkGoronLeftFootDL" Offset="0x8A60" />
-        <DList Name="gLinkGoronWaistDL" Offset="0x8C00" />
-        <DList Name="gLinkGoronCollarDL" Offset="0x8C98" />
-        <DList Name="gLinkGoronTorsoDL" Offset="0x8F18" />
-        <DList Name="gLinkGoronHeadDL" Offset="0x91F0" />
-        <DList Name="gLinkGoronHatDL" Offset="0x9898" />
-        <DList Name="gLinkGoronSheathDL" Offset="0x99D8" />
-        <DList Name="gLinkGoronRightShoulderDL" Offset="0x9A98" />
-        <DList Name="gLinkGoronRightForearmDL" Offset="0x9C18" />
-        <DList Name="gLinkGoronRightHandOpenDL" Offset="0x9EF8" />
-        <DList Name="gLinkGoronLeftShoulderDL" Offset="0xA0A0" />
-        <DList Name="gLinkGoronLeftForearmDL" Offset="0xA220" />
-        <DList Name="gLinkGoronLeftHandOpenDL" Offset="0xA500" />
-        <DList Name="gLinkGoronCurledDL" Offset="0xBDD8" />
-        <DList Name="object_link_goron_DL_00C540" Offset="0xC540" /> <!-- Original name is "lg_spike_model" -->
-
-        <Texture Name="object_link_goron_Tex_00C6B8" OutName="tex_00C6B8" Format="ci8" Width="32" Height="64" Offset="0xC6B8" />
-        <Texture Name="object_link_goron_Tex_00CEB8" OutName="tex_00CEB8" Format="rgba16" Width="8" Height="16" Offset="0xCEB8" />
-        <Texture Name="object_link_goron_Tex_00CFB8" OutName="tex_00CFB8" Format="ci8" Width="16" Height="16" Offset="0xCFB8" />
-        <Texture Name="object_link_goron_Tex_00D0B8" OutName="tex_00D0B8" Format="rgba16" Width="16" Height="16" Offset="0xD0B8" />
-        <Texture Name="object_link_goron_Tex_00D2B8" OutName="tex_00D2B8" Format="rgba16" Width="8" Height="16" Offset="0xD2B8" />
-        <Texture Name="object_link_goron_Tex_00D3B8" OutName="tex_00D3B8" Format="rgba16" Width="8" Height="16" Offset="0xD3B8" />
-        <Texture Name="object_link_goron_Tex_00D4B8" OutName="tex_00D4B8" Format="rgba16" Width="16" Height="32" Offset="0xD4B8" />
-        <Texture Name="object_link_goron_Tex_00D8B8" OutName="tex_00D8B8" Format="i8" Width="8" Height="8" Offset="0xD8B8" />
-        <DList Name="gLinkGoronLeftHandClosedDL" Offset="0xDE68" />
-        <Texture Name="object_link_goron_Tex_00E078" OutName="tex_00E078" Format="rgba16" Width="16" Height="16" Offset="0xE078" />
-        <DList Name="gLinkGoronRightHandClosedDL" Offset="0xE7E8" />
-        <DList Name="object_link_goron_DL_00FC18" Offset="0xFC18" />
-        <DList Name="object_link_goron_DL_00FCF0" Offset="0xFCF0" />
-        <DList Name="object_link_goron_DL_00FF18" Offset="0xFF18" />
-        <DList Name="object_link_goron_DL_010140" Offset="0x10140" />
-        <DList Name="object_link_goron_DL_010368" Offset="0x10368" />
-        <DList Name="object_link_goron_DL_010590" Offset="0x10590" />
-        <Texture Name="object_link_goron_TLUT_0107B8" OutName="tlut_0107B8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" />
-        <Texture Name="object_link_goron_Tex_0109B8" OutName="tex_0109B8" Format="ci8" Width="16" Height="16" Offset="0x109B8" />
-        <Texture Name="object_link_goron_Tex_010AB8" OutName="tex_010AB8" Format="ci8" Width="16" Height="8" Offset="0x10AB8" />
-        <Texture Name="object_link_goron_Tex_010B38" OutName="tex_010B38" Format="ci8" Width="16" Height="16" Offset="0x10B38" />
-        <Texture Name="object_link_goron_Tex_010C38" OutName="tex_010C38" Format="ci8" Width="32" Height="32" Offset="0x10C38" />
-        <DList Name="gLinkGoronLeftHandHoldBottleDL" Offset="0x11468" />
-        <Texture Name="object_link_goron_Tex_011628" OutName="tex_011628" Format="ci8" Width="16" Height="16" Offset="0x11628" />
-        <Texture Name="object_link_goron_Tex_011728" OutName="tex_011728" Format="rgba16" Width="8" Height="32" Offset="0x11728" />
-        <DList Name="gLinkGoronGoronPunchEffectDL" Offset="0x11AB8" />
-        <Texture Name="object_link_goron_Tex_011C10" OutName="tex_011C10" Format="i4" Width="32" Height="32" Offset="0x11C10" />
-        <Texture Name="object_link_goron_Tex_011E10" OutName="tex_011E10" Format="i4" Width="64" Height="64" Offset="0x11E10" />
-        <DList Name="object_link_goron_DL_0127B0" Offset="0x127B0" /> <!-- Original name is "grt_01_model" -->
-        <Texture Name="object_link_goron_Tex_012930" OutName="tex_012930" Format="i4" Width="64" Height="64" Offset="0x12930" />
-        <TextureAnimation Name="object_link_goron_Matanimheader_013138" Offset="0x13138" />
-        <DList Name="object_link_goron_DL_0134D0" Offset="0x134D0" /> <!-- Original name is "grt_02_model" -->
-        <Texture Name="object_link_goron_Tex_013660" OutName="tex_013660" Format="i4" Width="64" Height="64" Offset="0x13660" />
-        <Texture Name="object_link_goron_Tex_013E60" OutName="tex_013E60" Format="i4" Width="64" Height="64" Offset="0x13E60" />
-        <TextureAnimation Name="object_link_goron_Matanimheader_014684" Offset="0x14684" />
-        <DList Name="gLinkGoronRollingSpikesAndEffectDL" Offset="0x14690" />
-        <DList Name="object_link_goron_DL_016A88" Offset="0x16A88" />
-        <DList Name="object_link_goron_DL_017180" Offset="0x17180" />
-        <DList Name="object_link_goron_DL_017620" Offset="0x17620" />
-
-        <Limb Name="gLinkGoronShieldingRootLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_ROOT" Offset="0x17778" />
-        <Limb Name="gLinkGoronShieldingBodyLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_BODY" Offset="0x17784" />
-        <Limb Name="gLinkGoronShieldingHeadLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_HEAD" Offset="0x17790" />
-        <Limb Name="gLinkGoronShieldingArmsAndLegsLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_ARMS_AND_LEGS" Offset="0x1779C" />
-        <Skeleton Name="gLinkGoronShieldingSkel" Type="Flex" LimbType="Standard" LimbNone="LINK_GORON_SHIELDING_LIMB_NONE" LimbMax="LINK_GORON_SHIELDING_LIMB_MAX" EnumName="LinkGoronShieldingLimb" Offset="0x177B8" />
-
-        <Animation Name="gLinkGoronShieldingAnim" Offset="0x178D0" /> <!-- Original name is "pg_gurdmotion" -->
-
-        <Limb Name="gLinkGoronRootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_ROOT" Offset="0x178E0" />
-        <Limb Name="gLinkGoronWaistLimb" Type="LOD" EnumName="LINK_GORON_LIMB_WAIST" Offset="0x178F0" />
-        <Limb Name="gLinkGoronLowerRootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LOWER_ROOT" Offset="0x17900" />
-        <Limb Name="gLinkGoronRightThighLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_THIGH" Offset="0x17910" />
-        <Limb Name="gLinkGoronRightShinLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_SHIN" Offset="0x17920" />
-        <Limb Name="gLinkGoronRightFootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_FOOT" Offset="0x17930" />
-        <Limb Name="gLinkGoronLeftThighLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_THIGH" Offset="0x17940" />
-        <Limb Name="gLinkGoronLeftShinLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_SHIN" Offset="0x17950" />
-        <Limb Name="gLinkGoronLeftFootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_FOOT" Offset="0x17960" />
-        <Limb Name="gLinkGoronUpperRootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_UPPER_ROOT" Offset="0x17970" />
-        <Limb Name="gLinkGoronHeadLimb" Type="LOD" EnumName="LINK_GORON_LIMB_HEAD" Offset="0x17980" />
-        <Limb Name="gLinkGoronHatLimb" Type="LOD" EnumName="LINK_GORON_LIMB_HAT" Offset="0x17990" />
-        <Limb Name="gLinkGoronCollarLimb" Type="LOD" EnumName="LINK_GORON_LIMB_COLLAR" Offset="0x179A0" />
-        <Limb Name="gLinkGoronLeftShoulderLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_SHOULDER" Offset="0x179B0" />
-        <Limb Name="gLinkGoronLeftForearmLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_FOREARM" Offset="0x179C0" />
-        <Limb Name="gLinkGoronLeftHandLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_HAND" Offset="0x179D0" />
-        <Limb Name="gLinkGoronRightShoulderLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_SHOULDER" Offset="0x179E0" />
-        <Limb Name="gLinkGoronRightForearmLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_FOREARM" Offset="0x179F0" />
-        <Limb Name="gLinkGoronRightHandLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_HAND" Offset="0x17A00" />
-        <Limb Name="gLinkGoronSheathLimb" Type="LOD" EnumName="LINK_GORON_LIMB_SHEATH" Offset="0x17A10" />
-        <Limb Name="gLinkGoronTorsoLimb" Type="LOD" EnumName="LINK_GORON_LIMB_TORSO" Offset="0x17A20" />
-        <Skeleton Name="gLinkGoronSkel" Type="Flex" LimbType="Standard" LimbNone="LINK_GORON_LIMB_NONE" LimbMax="LINK_GORON_LIMB_MAX" EnumName="LinkGoronLimb" Offset="0x17A84" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_nuts.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_nuts.xml
deleted file mode 100644
index 9247d3db4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_nuts.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<Root>
-    <File Name="object_link_nuts" Segment="6">
-        <DList Name="gLinkDekuRightThighDL" Offset="0x25D0" />
-        <DList Name="gLinkDekuRightShinDL" Offset="0x26D8" />
-        <DList Name="gLinkDekuRightFootDL" Offset="0x27E0" />
-        <DList Name="gLinkDekuLeftThighDL" Offset="0x28F8" />
-        <DList Name="gLinkDekuLeftShinDL" Offset="0x2A00" />
-        <DList Name="gLinkDekuLeftFootDL" Offset="0x2B08" />
-        <DList Name="gLinkDekuWaistDL" Offset="0x2C20" />
-        <DList Name="gLinkDekuCollarDL" Offset="0x2DD8" />
-        <DList Name="gLinkDekuTorsoDL" Offset="0x2E98" />
-        <DList Name="gLinkDekuHeadDL" Offset="0x2FD0" />
-        <DList Name="gLinkDekuHatDL" Offset="0x3488" />
-        <DList Name="gLinkDekuSheathDL" Offset="0x35F0" />
-        <DList Name="gLinkDekuRightShoulderDL" Offset="0x36B0" />
-        <DList Name="gLinkDekuRightForearmDL" Offset="0x37B8" />
-        <DList Name="gLinkDekuRightHandDL" Offset="0x38C0" />
-        <DList Name="gLinkDekuLeftShoulderDL" Offset="0x39B0" />
-        <DList Name="gLinkDekuLeftForearmDL" Offset="0x3AB8" />
-        <DList Name="gLinkDekuLeftHandDL" Offset="0x3BC0" />
-
-        <Texture Name="object_link_nuts_TLUT_003CB0" OutName="tlut_003CB0" Format="rgba16" Width="16" Height="16" Offset="0x3CB0" />
-        <Texture Name="object_link_nuts_TLUT_003EB0" OutName="tlut_003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0" />
-        <Texture Name="object_link_nuts_Tex_0040B0" OutName="tex_0040B0" Format="ci8" Width="16" Height="16" Offset="0x40B0" />
-        <Texture Name="object_link_nuts_Tex_0041B0" OutName="tex_0041B0" Format="ci8" Width="16" Height="16" Offset="0x41B0" />
-        <Texture Name="object_link_nuts_Tex_0042B0" OutName="tex_0042B0" Format="ci8" Width="16" Height="16" Offset="0x42B0" />
-        <Texture Name="object_link_nuts_Tex_0043B0" OutName="tex_0043B0" Format="ci8" Width="16" Height="16" Offset="0x43B0" />
-        <Texture Name="object_link_nuts_Tex_0044B0" OutName="tex_0044B0" Format="ci8" Width="32" Height="32" Offset="0x44B0" />
-        <Texture Name="object_link_nuts_Tex_0048B0" OutName="tex_0048B0" Format="rgba16" Width="64" Height="32" Offset="0x48B0" />
-        <Texture Name="object_link_nuts_Tex_0058B0" OutName="tex_0058B0" Format="ci8" Width="16" Height="16" Offset="0x58B0" />
-        <DList Name="object_link_nuts_DL_007390" Offset="0x7390" />
-        <DList Name="object_link_nuts_DL_007548" Offset="0x7548" />
-        <DList Name="object_link_nuts_DL_0076A0" Offset="0x76A0" />
-        <DList Name="object_link_nuts_DL_0077D0" Offset="0x77D0" />
-        <DList Name="object_link_nuts_DL_007900" Offset="0x7900" />
-        <DList Name="object_link_nuts_DL_007A28" Offset="0x7A28" />
-        <Texture Name="object_link_nuts_Tex_007B80" OutName="tex_007B80" Format="rgba16" Width="16" Height="16" Offset="0x7B80" />
-        <DList Name="object_link_nuts_DL_008660" Offset="0x8660" />
-        <DList Name="object_link_nuts_DL_008760" Offset="0x8760" />
-        <DList Name="object_link_nuts_DL_008860" Offset="0x8860" />
-        <DList Name="object_link_nuts_DL_008908" Offset="0x8908" />
-        <DList Name="object_link_nuts_DL_0089F0" Offset="0x89F0" />
-        <DList Name="gLinkDekuClosedFlowerDL" Offset="0x8AA0" />
-        <DList Name="object_link_nuts_DL_008AB8" Offset="0x8AB8" />
-        <DList Name="object_link_nuts_DL_008BA0" Offset="0x8BA0" />
-        <DList Name="gLinkDekuOpenFlowerDL" Offset="0x8C50" />
-        <Texture Name="object_link_nuts_Tex_008C68" OutName="tex_008C68" Format="rgba16" Width="16" Height="16" Offset="0x8C68" />
-        <Texture Name="object_link_nuts_Tex_008E68" OutName="tex_008E68" Format="rgba16" Width="16" Height="16" Offset="0x8E68" />
-        <Texture Name="object_link_nuts_Tex_009068" OutName="tex_009068" Format="rgba16" Width="8" Height="8" Offset="0x9068" />
-        <DList Name="object_link_nuts_DL_009AB8" Offset="0x9AB8" />
-        <DList Name="object_link_nuts_DL_009C48" Offset="0x9C48" />
-        <DList Name="object_link_nuts_DL_009DB8" Offset="0x9DB8" />
-        <DList Name="object_link_nuts_DL_00A348" Offset="0xA348" />
-        <Texture Name="object_link_nuts_Tex_00A4E0" OutName="tex_00A4E0" Format="rgba16" Width="32" Height="64" Offset="0xA4E0" />
-        <DList Name="object_link_nuts_DL_00B690" Offset="0xB690" />
-        <Texture Name="object_link_nuts_Tex_00B780" OutName="tex_00B780" Format="ci8" Width="16" Height="16" Offset="0xB780" />
-
-        <Limb Name="gLinkDekuRootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_ROOT" Offset="0xB880" />
-        <Limb Name="gLinkDekuWaistLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_WAIST" Offset="0xB890" />
-        <Limb Name="gLinkDekuLowerRootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LOWER_ROOT" Offset="0xB8A0" />
-        <Limb Name="gLinkDekuRightThighLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_THIGH" Offset="0xB8B0" />
-        <Limb Name="gLinkDekuRightShinLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_SHIN" Offset="0xB8C0" />
-        <Limb Name="gLinkDekuRightFootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_FOOT" Offset="0xB8D0" />
-        <Limb Name="gLinkDekuLeftThighLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_THIGH" Offset="0xB8E0" />
-        <Limb Name="gLinkDekuLeftShinLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_SHIN" Offset="0xB8F0" />
-        <Limb Name="gLinkDekuLeftFootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_FOOT" Offset="0xB900" />
-        <Limb Name="gLinkDekuUpperRootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_UPPER_ROOT" Offset="0xB910" />
-        <Limb Name="gLinkDekuHeadLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_HEAD" Offset="0xB920" />
-        <Limb Name="gLinkDekuHatLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_HAT" Offset="0xB930" />
-        <Limb Name="gLinkDekuCollarLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_COLLAR" Offset="0xB940" />
-        <Limb Name="gLinkDekuLeftShoulderLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_SHOULDER" Offset="0xB950" />
-        <Limb Name="gLinkDekuLeftForearmLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_FOREARM" Offset="0xB960" />
-        <Limb Name="gLinkDekuLeftHandLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_HAND" Offset="0xB970" />
-        <Limb Name="gLinkDekuRightShoulderLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_SHOULDER" Offset="0xB980" />
-        <Limb Name="gLinkDekuRightForearmLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_FOREARM" Offset="0xB990" />
-        <Limb Name="gLinkDekuRightHandLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_HAND" Offset="0xB9A0" />
-        <Limb Name="gLinkDekuSheathLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_SHEATH" Offset="0xB9B0" />
-        <Limb Name="gLinkDekuTorsoLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_TORSO" Offset="0xB9C0" />
-        <Skeleton Name="gLinkDekuSkel" Type="Flex" LimbType="LOD" LimbNone="LINK_DEKU_LIMB_NONE" LimbMax="LINK_DEKU_LIMB_MAX" EnumName="LinkDekuLimb" Offset="0xBA24" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_zora.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_zora.xml
deleted file mode 100644
index be4c54274..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_link_zora.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<Root>
-    <File Name="object_link_zora" Segment="6">
-        <Texture Name="gLinkZoraEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x800" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesClosedTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesRollUpTex" OutName="eyes_roll_up" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesRollDownTex" OutName="eyes_roll_down" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5200" />
-        <Texture Name="object_link_zora_Tex_003800" OutName="tex_003800" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5200" />
-
-        <Texture Name="gLinkZoraMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5200" />
-        <Texture Name="object_link_zora_Tex_004400" OutName="tex_004400" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5200" />
-
-        <Texture Name="object_link_zora_TLUT_005000" OutName="tlut_005000" Format="rgba16" Width="16" Height="16" Offset="0x5000" />
-        <Texture Name="gLinkZoraSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5200" />
-
-        <Texture Name="object_link_zora_Tex_005400" OutName="tex_005400" Format="ci8" Width="32" Height="32" Offset="0x5400" />
-        <Texture Name="object_link_zora_Tex_005800" OutName="tex_005800" Format="ci8" Width="16" Height="16" Offset="0x5800" />
-        <Texture Name="object_link_zora_Tex_005900" OutName="tex_005900" Format="ci8" Width="16" Height="16" Offset="0x5900" />
-        <Texture Name="object_link_zora_Tex_005A00" OutName="tex_005A00" Format="ci8" Width="8" Height="16" Offset="0x5A00" />
-        <Texture Name="object_link_zora_Tex_005A80" OutName="tex_005A80" Format="ci8" Width="8" Height="16" Offset="0x5A80" />
-        <Texture Name="object_link_zora_Tex_005B00" OutName="tex_005B00" Format="ci8" Width="32" Height="16" Offset="0x5B00" />
-        <Texture Name="object_link_zora_Tex_005D00" OutName="tex_005D00" Format="ci8" Width="16" Height="32" Offset="0x5D00" />
-        <Texture Name="object_link_zora_Tex_005F00" OutName="tex_005F00" Format="ci8" Width="16" Height="16" Offset="0x5F00" />
-        <Texture Name="object_link_zora_Tex_006000" OutName="tex_006000" Format="ci8" Width="16" Height="16" Offset="0x6000" />
-        <Texture Name="object_link_zora_Tex_006100" OutName="tex_006100" Format="ci8" Width="8" Height="16" Offset="0x6100" />
-        <Texture Name="object_link_zora_Tex_006180" OutName="tex_006180" Format="ci8" Width="8" Height="8" Offset="0x6180" />
-        <Texture Name="object_link_zora_Tex_0061C0" OutName="tex_0061C0" Format="ci8" Width="16" Height="16" Offset="0x61C0" />
-
-        <DList Name="gLinkZoraRightThighDL" Offset="0x9E00" />
-        <DList Name="gLinkZoraRightShinDL" Offset="0xA108" />
-        <DList Name="gLinkZoraRightFootDL" Offset="0xA370" />
-        <DList Name="gLinkZoraLeftThighDL" Offset="0xA4A0" />
-        <DList Name="gLinkZoraLeftShinDL" Offset="0xA7A8" />
-        <DList Name="gLinkZoraLeftFootDL" Offset="0xAA10" />
-        <DList Name="gLinkZoraWaistDL" Offset="0xAB40" />
-        <DList Name="gLinkZoraCollarDL" Offset="0xAD38" />
-        <DList Name="gLinkZoraTorsoDL" Offset="0xADF0" />
-        <DList Name="gLinkZoraHeadDL" Offset="0xB170" />
-        <DList Name="gLinkZoraHatDL" Offset="0xB630" />
-        <DList Name="gLinkZoraSheathDL" Offset="0xB768" />
-        <DList Name="gLinkZoraRightShoulderDL" Offset="0xB820" />
-        <DList Name="gLinkZoraRightForearmDL" Offset="0xB990" />
-        <DList Name="gLinkZoraRightHandClosedDL" Offset="0xBBE0" />
-        <DList Name="gLinkZoraLeftShoulderDL" Offset="0xBEE8" />
-        <DList Name="gLinkZoraLeftForearmDL" Offset="0xC020" />
-        <DList Name="gLinkZoraLeftHandClosedDL" Offset="0xC270" />
-
-        <Texture Name="object_link_zora_TLUT_00C578" OutName="tlut_00C578" Format="rgba16" Width="16" Height="16" Offset="0xC578" />
-        <Texture Name="object_link_zora_Tex_00C778" OutName="tex_00C778" Format="ci8" Width="16" Height="32" Offset="0xC778" />
-        <Texture Name="object_link_zora_Tex_00C978" OutName="tex_00C978" Format="ci8" Width="16" Height="16" Offset="0xC978" />
-        <DList Name="object_link_zora_DL_00CC38" Offset="0xCC38" />
-        <DList Name="object_link_zora_DL_00CDA0" Offset="0xCDA0" />
-        <DList Name="object_link_zora_DL_00E088" Offset="0xE088" />
-        <DList Name="object_link_zora_DL_00E2A0" Offset="0xE2A0" />
-        <Texture Name="object_link_zora_Tex_00E678" OutName="tex_00E678" Format="ci8" Width="16" Height="16" Offset="0xE678" />
-        <Texture Name="object_link_zora_Tex_00E778" OutName="tex_00E778" Format="ci8" Width="16" Height="16" Offset="0xE778" />
-        <Texture Name="object_link_zora_Tex_00E878" OutName="tex_00E878" Format="ci8" Width="8" Height="16" Offset="0xE878" />
-        <Texture Name="object_link_zora_Tex_00E8F8" OutName="tex_00E8F8" Format="rgba16" Width="16" Height="16" Offset="0xE8F8" />
-        <Texture Name="object_link_zora_Tex_00EAF8" OutName="tex_00EAF8" Format="rgba16" Width="16" Height="16" Offset="0xEAF8" />
-        <Texture Name="object_link_zora_Tex_00ECF8" OutName="tex_00ECF8" Format="rgba16" Width="16" Height="16" Offset="0xECF8" />
-        <Texture Name="object_link_zora_Tex_00EEF8" OutName="tex_00EEF8" Format="rgba16" Width="16" Height="32" Offset="0xEEF8" />
-        <Texture Name="object_link_zora_Tex_00F2F8" OutName="tex_00F2F8" Format="rgba16" Width="16" Height="32" Offset="0xF2F8" />
-        <DList Name="gLinkZoraRightHandOpenDL" Offset="0xFBB8" />
-        <DList Name="gLinkZoraLeftHandOpenDL" Offset="0xFDF0" />
-        <Texture Name="object_link_zora_Tex_010028" OutName="tex_010028" Format="rgba16" Width="16" Height="16" Offset="0x10028" />
-        <Texture Name="object_link_zora_Tex_010228" OutName="tex_010228" Format="rgba16" Width="16" Height="32" Offset="0x10228" />
-        <DList Name="object_link_zora_DL_010868" Offset="0x10868" />
-        <DList Name="object_link_zora_DL_010978" Offset="0x10978" />
-        <DList Name="gLinkZoraLeftHandHoldBottleDL" Offset="0x10D08" />
-        <DList Name="object_link_zora_DL_0110A8" Offset="0x110A8" />
-
-        <Array Name="object_link_zora_Vtx_011210" Count="80" Offset="0x011210">
-            <Vtx/>
-        </Array>
-        <Array Name="object_link_zora_U8_011710" Count="80" Offset="0x011710">
-            <Scalar Type="x8"/>
-        </Array>
-
-        <DList Name="object_link_zora_DL_011760" Offset="0x11760" /> <!-- Original name is "zora_thunder_modelT" -->
-        <DList Name="object_link_zora_DL_011A58" Offset="0x11A58" />
-        <Texture Name="object_link_zora_Tex_011A60" OutName="tex_011A60" Format="i8" Width="64" Height="32" Offset="0x11A60" />
-        <Texture Name="object_link_zora_Tex_012260" OutName="tex_012260" Format="i8" Width="32" Height="64" Offset="0x12260" />
-
-        <TextureAnimation Name="object_link_zora_Matanimheader_012A68" Offset="0x12A68" />
-        <TextureAnimation Name="object_link_zora_Matanimheader_012A80" Offset="0x12A80" />
-
-        <Limb Name="gLinkZoraRootLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_ROOT" Offset="0x12A90" />
-        <Limb Name="gLinkZoraWaistLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_WAIST" Offset="0x12AA0" />
-        <Limb Name="gLinkZoraLowerRootLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LOWER_ROOT" Offset="0x12AB0" />
-        <Limb Name="gLinkZoraRightThighLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_THIGH" Offset="0x12AC0" />
-        <Limb Name="gLinkZoraRightShinLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_SHIN" Offset="0x12AD0" />
-        <Limb Name="gLinkZoraRightFootLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_FOOT" Offset="0x12AE0" />
-        <Limb Name="gLinkZoraLeftThighLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_THIGH" Offset="0x12AF0" />
-        <Limb Name="gLinkZoraLeftShinLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_SHIN" Offset="0x12B00" />
-        <Limb Name="gLinkZoraLeftFootLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_FOOT" Offset="0x12B10" />
-        <Limb Name="gLinkZoraUpperRootLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_UPPER_ROOT" Offset="0x12B20" />
-        <Limb Name="gLinkZoraHeadLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_HEAD" Offset="0x12B30" />
-        <Limb Name="gLinkZoraHatLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_HAT" Offset="0x12B40" />
-        <Limb Name="gLinkZoraCollarLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_COLLAR" Offset="0x12B50" />
-        <Limb Name="gLinkZoraLeftShoulderLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_SHOULDER" Offset="0x12B60" />
-        <Limb Name="gLinkZoraLeftForearmLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_FOREARM" Offset="0x12B70" />
-        <Limb Name="gLinkZoraLeftHandLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_HAND" Offset="0x12B80" />
-        <Limb Name="gLinkZoraRightShoulderLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_SHOULDER" Offset="0x12B90" />
-        <Limb Name="gLinkZoraRightForearmLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_FOREARM" Offset="0x12BA0" />
-        <Limb Name="gLinkZoraRightHandLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_HAND" Offset="0x12BB0" />
-        <Limb Name="gLinkZoraSheathLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_SHEATH" Offset="0x12BC0" />
-        <Limb Name="gLinkZoraTorsoLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_TORSO" Offset="0x12BD0" />
-        <Skeleton Name="gLinkZoraSkel" Type="Flex" LimbType="LOD" LimbNone="LINK_ZORA_LIMB_NONE" LimbMax="LINK_ZORA_LIMB_MAX" EnumName="LinkZoraLimb" Offset="0x12C34" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lodmoon.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lodmoon.xml
deleted file mode 100644
index 0756c3300..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lodmoon.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Low detail version of the moon used during gameplay (except in Termina Field) -->
-    <File Name="object_lodmoon" Segment="6">
-        <DList Name="gLodmoonEyesDL" Offset="0x10E0" />
-        <DList Name="gLodmoonMoonDL" Offset="0x1158" />
-        <Texture Name="gLodmoonFaceTLUT" OutName="lodmoon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x15D8" />
-        <Texture Name="gLodmoonFarSideTLUT" OutName="lodmoon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x15F8" />
-        <Texture Name="gLodmoonEyesTex" OutName="lodmoon_eyes" Format="rgba16" Width="32" Height="32" Offset="0x1618" />
-        <Texture Name="gLodmoonTeethTex" OutName="lodmoon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x1E18" />
-        <Texture Name="gLodmoonFaceTex" OutName="lodmoon_face" Format="ci4" Width="64" Height="64" Offset="0x2E18" />
-        <Texture Name="gLodmoonFarSideTex" OutName="lodmoon_far_side" Format="ci4" Width="64" Height="64" Offset="0x3618" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lotus.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lotus.xml
deleted file mode 100644
index 923218811..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_lotus.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Assets for Lily Pads -->
-    <File Name="object_lotus" Segment="6">
-        <DList Name="gLilyPadDL" Offset="0x40" /> <!-- Original name is "z2_hasu_model" ("lotus​") -->
-        <Texture Name="gLilyPadTLUT" OutName="lily_pad_tlut" Format="rgba16" Width="4" Height="4" Offset="0x100" />
-        <Texture Name="gLilyPadTex" OutName="lily_pad" Format="ci4" Width="64" Height="64" Offset="0x120" />
-        <Collision Name="gLilyPadCol" Offset="0xA20" /> <!-- Original name is "z2_hasu_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ma1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ma1.xml
deleted file mode 100644
index b0b1435bc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ma1.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<Root>
-    <!-- Assets for Romani -->
-    <File Name="object_ma1" Segment="6">
-        <!-- Romani's Bow DisplayList and Textures -->
-        <DList Name="gRomaniBowDL" Offset="0x3B0" />
-        <Texture Name="gRomaniBowTLUT" OutName="romani_bow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5E0" />
-        <Texture Name="gRomaniBowHandleTex" OutName="romani_bow_handle" Format="ci8" Width="16" Height="16" Offset="0x7E0" />
-        <Texture Name="gRomaniBowLimbTex" OutName="romani_bow_limb" Format="ci8" Width="8" Height="8" Offset="0x8E0" />
-        
-        <!-- Romani's Wooden Box DisplayList and Textures. She sits on it after being abducted by the aliens. -->
-        <DList Name="gRomaniWoodenBoxDL" Offset="0xA20" />
-        <Texture Name="gRomaniWoodenBoxTex" OutName="romani_wooden_box" Format="rgba16" Width="32" Height="64" Offset="0xAD0" />
-
-        <!-- Romani Animation -->
-        <Animation Name="gRomaniLookAroundAnim" Offset="0x2A8C" /> <!-- Original name is "rm_kyoro" (onomatopoeic for "looking around restlessly") -->
-
-        <!-- Romani Sleeping DisplayList and Textures -->
-        <DList Name="gRomaniSleepingDL" Offset="0x43A0" />
-        <Texture Name="gRomaniSleepingTLUT" OutName="romani_sleeping_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4CF8" />
-        <Texture Name="gRomaniSleepingDressTex" OutName="romani_sleeping_dress" Format="ci8" Width="16" Height="16" Offset="0x4EF8" />
-        <Texture Name="gRomaniSleepingSkinTex" OutName="romani_sleeping_skin" Format="ci8" Width="8" Height="8" Offset="0x4FF8" />
-        <Texture Name="gRomaniSleepingEarTex" OutName="romani_sleeping_ear" Format="ci8" Width="8" Height="8" Offset="0x5038" />
-        <Texture Name="gRomaniSleepingHairTex" OutName="romani_sleeping_hair" Format="ci8" Width="16" Height="16" Offset="0x5078" />
-        <Texture Name="gRomaniSleepingHandTex" OutName="romani_sleeping_hand" Format="ci8" Width="16" Height="16" Offset="0x5178" />
-        <Texture Name="gRomaniSleepingDressPatternAndPillowTex" OutName="romani_sleeping_dress_pattern_and_pillow" Format="ci8" Width="8" Height="16" Offset="0x5278" />
-        <Texture Name="gRomaniSleepingEyeTex" OutName="romani_sleeping_eye" Format="rgba16" Width="32" Height="32" Offset="0x52F8" />
-        <Texture Name="gRomaniSleepingBlanketTex" OutName="romani_sleeping_blanket" Format="rgba16" Width="16" Height="128" Offset="0x5AF8" />
-        <Texture Name="gRomaniSleepingMouthTex" OutName="romani_sleeping_mouth" Format="rgba16" Width="32" Height="16" Offset="0x6AF8" />
-
-        <!-- Romani Animations -->
-        <Animation Name="gRomaniRunAnim" Offset="0x7328" /> <!-- Original anme is "rm_run" -->
-        <Animation Name="gRomaniSittingAnim" Offset="0x7D98" /> <!-- Original name is "rm_swari" ("sitting") -->
-        <Animation Name="gRomaniSittingHeadShakeAnim" Offset="0x852C" /> <!-- Original name is "rm_swariatamafuri" ("sitting head shake") -->
-        <Animation Name="gRomaniSittingLookDownAnim" Offset="0x8F6C" /> <!-- Original name is "rm_swariutumuku" ("sitting" and "to hang one's head") -->
-        <Animation Name="gRomaniIdleAnim" Offset="0x9E58" /> <!-- Original name is "rm_wait" -->
-
-        <!-- Romani Limb DisplayLists -->
-        <DList Name="gRomaniTorsoDL" Offset="0xD060" />
-        <DList Name="gRomaniRightUpperArmDL" Offset="0xD440" />
-        <DList Name="gRomaniRightForearmDL" Offset="0xD688" />
-        <DList Name="gRomaniRightHandDL" Offset="0xD7A0" />
-        <DList Name="gRomaniLeftUpperArmDL" Offset="0xD980" />
-        <DList Name="gRomaniLeftForearmDL" Offset="0xDBC8" />
-        <DList Name="gRomaniLeftHandDL" Offset="0xDCE0" />
-        <DList Name="gRomaniHeadDL" Offset="0xDEC0" />
-        <DList Name="gRomaniUpperHairDL" Offset="0xE410" />
-        <DList Name="gRomaniLowerHairDL" Offset="0xE510" />
-        <DList Name="gRomaniDress1DL" Offset="0xE618" />
-        <DList Name="gRomaniDress2DL" Offset="0xE710" />
-        <DList Name="gRomaniDress3DL" Offset="0xE838" />
-        <DList Name="gRomaniDress4DL" Offset="0xE980" />
-        <DList Name="gRomaniPelvisDL" Offset="0xEA80" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gRomaniRightThighDL" Offset="0xEAC8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gRomaniRightShinDL" Offset="0xEB88" />
-        <DList Name="gRomaniRightFootDL" Offset="0xED08" />
-        <DList Name="gRomaniLeftThighDL" Offset="0xEE28" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gRomaniLeftShinDL" Offset="0xEEE8" />
-        <DList Name="gRomaniLeftFootDL" Offset="0xF068" />
-        
-        <!-- Romani Textures -->
-        <Texture Name="gRomaniTLUT" OutName="romani_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF188" />
-        <Texture Name="gRomaniDressTex" OutName="romani_dress" Format="ci8" Width="16" Height="16" Offset="0xF388" />
-        <Texture Name="gRomaniSkinTex" OutName="romani_skin" Format="ci8" Width="8" Height="8" Offset="0xF488" />
-        <Texture Name="gRomaniEarTex" OutName="romani_ear" Format="ci8" Width="8" Height="8" Offset="0xF4C8" />
-        <Texture Name="gRomaniHairTex" OutName="romani_hair" Format="ci8" Width="16" Height="16" Offset="0xF508" />
-        <Texture Name="gRomaniShawlTex" OutName="romani_shawl" Format="ci8" Width="8" Height="8" Offset="0xF608" />
-        <Texture Name="gRomaniBroochTex" OutName="romani_brooch" Format="rgba16" Width="16" Height="32" Offset="0xF648" />
-        <Texture Name="gRomaniHandTex" OutName="romani_hand" Format="ci8" Width="16" Height="16" Offset="0xFA48" />
-        <Texture Name="gRomaniBootTex" OutName="romani_boot" Format="ci8" Width="64" Height="16" Offset="0xFB48" />
-        <Texture Name="gRomaniDressPatternTex" OutName="romani_dress_pattern" Format="ci8" Width="8" Height="16" Offset="0xFF48" />
-        <Texture Name="gRomaniEyeOpenTex" OutName="romani_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" />
-        <Texture Name="gRomaniEyeHalfTex" OutName="romani_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x107C8" />
-        <Texture Name="gRomaniEyeClosedTex" OutName="romani_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x10FC8" />
-        <Texture Name="gRomaniEyeHappyTex" OutName="romani_eye_happy" Format="rgba16" Width="32" Height="32" Offset="0x117C8" />
-        <Texture Name="gRomaniEyeSadTex" OutName="romani_eye_sad" Format="rgba16" Width="32" Height="32" Offset="0x11FC8" />
-        <Texture Name="gRomaniMouthHappyTex" OutName="romani_mouth_happy" Format="rgba16" Width="32" Height="16" Offset="0x127C8" />
-        <Texture Name="gRomaniMouthFrownTex" OutName="romani_mouth_frown" Format="rgba16" Width="32" Height="16" Offset="0x12BC8" />
-        <Texture Name="gRomaniMouthHangingOpenTex" OutName="romani_mouth_hanging_open" Format="rgba16" Width="32" Height="16" Offset="0x12FC8" />
-        <Texture Name="gRomaniMouthSmileTex" OutName="romani_mouth_smile" Format="rgba16" Width="32" Height="16" Offset="0x133C8" />
-
-        <!-- Romani Limbs -->
-        <Limb Name="gRomaniRootLimb" Type="Standard" EnumName="ROMANI_LIMB_ROOT" Offset="0x137C8" />
-        <Limb Name="gRomaniPelvisLimb" Type="Standard" EnumName="ROMANI_LIMB_PELVIS" Offset="0x137D4" />
-        <Limb Name="gRomaniLeftThighLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_THIGH" Offset="0x137E0" />
-        <Limb Name="gRomaniLeftShinLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_SHIN" Offset="0x137EC" />
-        <Limb Name="gRomaniLeftFootLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_FOOT" Offset="0x137F8" />
-        <Limb Name="gRomaniRightThighLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_THIGH" Offset="0x13804" />
-        <Limb Name="gRomaniRightShinLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_SHIN" Offset="0x13810" />
-        <Limb Name="gRomaniRightFootLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_FOOT" Offset="0x1381C" />
-        <Limb Name="gRomaniDress1Limb" Type="Standard" EnumName="ROMANI_LIMB_DRESS_1" Offset="0x13828" />
-        <Limb Name="gRomaniDress2Limb" Type="Standard" EnumName="ROMANI_LIMB_DRESS_2" Offset="0x13834" />
-        <Limb Name="gRomaniDress3Limb" Type="Standard" EnumName="ROMANI_LIMB_DRESS_3" Offset="0x13840" />
-        <Limb Name="gRomaniDress4Limb" Type="Standard" EnumName="ROMANI_LIMB_DRESS_4" Offset="0x1384C" />
-        <Limb Name="gRomaniTorsoLimb" Type="Standard" EnumName="ROMANI_LIMB_TORSO" Offset="0x13858" />
-        <Limb Name="gRomaniHeadLimb" Type="Standard" EnumName="ROMANI_LIMB_HEAD" Offset="0x13864" />
-        <Limb Name="gRomaniUpperHairLimb" Type="Standard" EnumName="ROMANI_LIMB_UPPER_HAIR" Offset="0x13870" />
-        <Limb Name="gRomaniLowerHairLimb" Type="Standard" EnumName="ROMANI_LIMB_LOWER_HAIR" Offset="0x1387C" />
-        <Limb Name="gRomaniLeftUpperArmLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_UPPER_ARM" Offset="0x13888" />
-        <Limb Name="gRomaniLeftForearmLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_FOREARM" Offset="0x13894" />
-        <Limb Name="gRomaniLeftHandLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_HAND" Offset="0x138A0" />
-        <Limb Name="gRomaniRightUpperArmLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_UPPER_ARM" Offset="0x138AC" />
-        <Limb Name="gRomaniRightForearmLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_FOREARM" Offset="0x138B8" />
-        <Limb Name="gRomaniRightHandLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_HAND" Offset="0x138C4" />
-
-        <!-- Romani Skeleton -->
-        <Skeleton Name="gRomaniSkel" Type="Flex" LimbType="Standard" LimbNone="ROMANI_LIMB_NONE" LimbMax="ROMANI_LIMB_MAX" EnumName="RomaniLimb" Offset="0x13928" />
-
-        <!-- Romani Animations -->
-        <Animation Name="gRomaniWalkAnim" Offset="0x14088" /> <!-- Original name is "rm_walk" -->
-        <Animation Name="gRomaniShootBowAnim" Offset="0x15B7C" /> <!-- Original name is "rm_yumiuti" ("shooting a bow") -->
-        <Animation Name="gRomaniAbductedAnim" Offset="0x16588" /> <!-- Original name is "romani_capture_loop" -->
-        <Animation Name="gRomaniTurnAroundAndFlickHairAnim" Offset="0x180DC" /> <!-- Original name is "romani_furimuki" ("to turn around") -->
-        <Animation Name="gRomaniSingStartAnim" Offset="0x18948" /> <!-- Original name is "romani_utau" ("sing") -->
-        <Animation Name="gRomaniSingLoopAnim" Offset="0x1B76C" /> <!-- Original name is "romani_utau_loop" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ma2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ma2.xml
deleted file mode 100644
index 0d528b37b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ma2.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<Root>
-    <!-- Assets for Cremia -->
-    <File Name="object_ma2" Segment="6">
-        <!-- Cremia Animations -->
-        <Animation Name="gCremiaSpreadArmsLoopAnim" Offset="0xCC0" /> <!-- Original name is "kl_aogu" ("to look up") -->
-        <Animation Name="gCremiaHugStartAnim" Offset="0x1FD0" /> <!-- Original name is "kl_dakisime" ("to hug someone close") -->
-        <Animation Name="gCremiaHugLoopAnim" Offset="0x30B4" /> <!-- Original name is "kl_dakisime_loop" -->
-        <Animation Name="gCremiaSittingLookDownAnim" Offset="0x3D54" /> <!-- Original name is "kl_gakkurisuwari" ("heartbroken" + "sitting") -->
-        <Animation Name="gCremiaClapAnim" Offset="0x4370" /> <!-- Original name is "kl_hakusyu_loop" ("applause") -->
-        <Animation Name="gCremiaThinkAnim" Offset="0x5314" /> <!-- Original name is "kl_kangaeru" ("thinking/contemplating") -->
-
-        <!-- Cremia's Wooden Box DisplayList and Textures. She sits on it when petting the cows in the barn. -->
-        <DList Name="gCremiaWoodenBoxDL" Offset="0x5430" />
-        <Texture Name="gCremiaWoodenBoxTex" OutName="cremia_wooden_box" Format="rgba16" Width="32" Height="64" Offset="0x54E0" />
-
-        <!-- Cremia Animations -->
-        <Animation Name="gCremiaSittingAnim" Offset="0x70EC" /> <!-- Original name is "kl_suwari" ("sitting") -->
-        <Animation Name="gCremiaSittingPetCowAnim" Offset="0x7E28" /> <!-- Original name is "kl_usinades" ("cow" + "stroke" + first letter of "sitting"?) -->
-        <Animation Name="gCremiaPetCowAnim" Offset="0x93E8" /> <!-- Original name is "kl_usinadet" -->
-        <Animation Name="gCremiaIdleAnim" Offset="0xA174" /> <!-- Original name is "kl_wait" -->
-        <Animation Name="gCremiaSpreadArmsStartAnim" Offset="0xAF7C" /> <!-- Original name is "kl_wait2aogu" -->
-
-        <!-- Cremia Limb DisplayLists -->
-        <DList Name="gCremiaDress1DL" Offset="0xE170" />
-        <DList Name="gCremiaDress2DL" Offset="0xE370" />
-        <DList Name="gCremiaDress3DL" Offset="0xE4E0" />
-        <DList Name="gCremiaDress4DL" Offset="0xE6E8" />
-        <DList Name="gCremiaPelvisDL" Offset="0xE7F0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCremiaRightThighDL" Offset="0xE8B0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCremiaRightShinDL" Offset="0xE940" />
-        <DList Name="gCremiaRightFootDL" Offset="0xEA20" />
-        <DList Name="gCremiaLeftThighDL" Offset="0xEB30" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCremiaLeftShinDL" Offset="0xEBC0" />
-        <DList Name="gCremiaLeftFootDL" Offset="0xECA0" />
-        <DList Name="gCremiaTorsoDL" Offset="0xEDB0" />
-        <DList Name="gCremiaHeadDL" Offset="0xF108" />
-        <DList Name="gCremiaHairEndDL" Offset="0xF5A0" />
-        <DList Name="gCremiaRightUpperArmDL" Offset="0xF6E8" />
-        <DList Name="gCremiaRightForearmDL" Offset="0xF8F8" />
-        <DList Name="gCremiaRightHandDL" Offset="0xF9E0" />
-        <DList Name="gCremiaLeftUpperArmDL" Offset="0xFBA8" />
-        <DList Name="gCremiaLeftForearmDL" Offset="0xFDB0" />
-        <DList Name="gCremiaLeftHandDL" Offset="0xFE98" />
-
-        <!-- Cremia Textures -->
-        <Texture Name="gCremiaTLUT" OutName="cremia_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10018" />
-        <Texture Name="gCremiaSkinArmsTex" OutName="cremia_skin_arms" Format="rgba16" Width="8" Height="8" Offset="0x10218" />
-        <Texture Name="gCremiaSkinHeadTex" OutName="cremia_skin_head" Format="rgba16" Width="8" Height="8" Offset="0x10298" />
-        <Texture Name="gCremiaBootTex" OutName="cremia_boot" Format="ci8" Width="64" Height="16" Offset="0x10318" />
-        <Texture Name="gCremiaEarTex" OutName="cremia_ear" Format="rgba16" Width="16" Height="16" Offset="0x10718" />
-        <Texture Name="gCremiaHairTex" OutName="cremia_hair" Format="ci8" Width="16" Height="16" Offset="0x10918" />
-        <Texture Name="gCremiaShawlTex" OutName="cremia_shawl" Format="ci8" Width="8" Height="8" Offset="0x10A18" />
-        <Texture Name="gCremiaBroochTex" OutName="cremia_brooch" Format="rgba16" Width="16" Height="32" Offset="0x10A58" />
-        <Texture Name="gCremiaShirtTex" OutName="cremia_shirt" Format="ci8" Width="16" Height="16" Offset="0x10E58" />
-        <Texture Name="gCremiaSleevesTex" OutName="cremia_sleeves" Format="ci8" Width="8" Height="16" Offset="0x10F58" />
-        <Texture Name="gCremiaBeltTex" OutName="cremia_belt" Format="ci8" Width="32" Height="16" Offset="0x10FD8" />
-        <Texture Name="gCremiaDressPatternTex" OutName="cremia_dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x111D8" />
-        <Texture Name="gCremiaDressTex" OutName="cremia_dress" Format="ci8" Width="16" Height="16" Offset="0x113D8" />
-        <Texture Name="gCremiaApronTex" OutName="cremia_apron" Format="rgba16" Width="16" Height="32" Offset="0x114D8" />
-        <Texture Name="gCremiaHandTex" OutName="cremia_hand" Format="rgba16" Width="16" Height="16" Offset="0x118D8" />
-        <Texture Name="gCremiaEyeOpenTex" OutName="cremia_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x11AD8" />
-        <Texture Name="gCremiaEyeHalfTex" OutName="cremia_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x122D8" />
-        <Texture Name="gCremiaEyeClosedTex" OutName="cremia_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x12AD8" />
-        <Texture Name="gCremiaEyeHappyTex" OutName="cremia_eye_happy" Format="rgba16" Width="32" Height="32" Offset="0x132D8" />
-        <Texture Name="gCremiaEyeAngryTex" OutName="cremia_eye_angry" Format="rgba16" Width="32" Height="32" Offset="0x13AD8" />
-        <Texture Name="gCremiaEyeSadTex" OutName="cremia_eye_sad" Format="rgba16" Width="32" Height="32" Offset="0x142D8" />
-        <Texture Name="gCremiaMouthNormalTex" OutName="cremia_mouth_normal" Format="rgba16" Width="32" Height="16" Offset="0x14AD8" />
-        <Texture Name="gCremiaMouthSlightSmileTex" OutName="cremia_mouth_slight_smile" Format="rgba16" Width="32" Height="16" Offset="0x14ED8" />
-        <Texture Name="gCremiaMouthFrownTex" OutName="cremia_mouth_frown" Format="rgba16" Width="32" Height="16" Offset="0x152D8" />
-        <Texture Name="gCremiaMouthHangingOpenTex" OutName="cremia_mouth_hanging_open" Format="rgba16" Width="32" Height="16" Offset="0x156D8" />
-        
-        <!-- Cremia Limbs -->
-        <Limb Name="gCremiaRootLimb" Type="Standard" EnumName="CREMIA_LIMB_ROOT" Offset="0x15AD8" />
-        <Limb Name="gCremiaTorsoLimb" Type="Standard" EnumName="CREMIA_LIMB_TORSO" Offset="0x15AE4" />
-        <Limb Name="gCremiaLeftUpperArmLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_UPPER_ARM" Offset="0x15AF0" />
-        <Limb Name="gCremiaLeftForearmLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_FOREARM" Offset="0x15AFC" />
-        <Limb Name="gCremiaLeftHandLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_HAND" Offset="0x15B08" />
-        <Limb Name="gCremiaRightUpperArmLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_UPPER_ARM" Offset="0x15B14" />
-        <Limb Name="gCremiaRightForearmLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_FOREARM" Offset="0x15B20" />
-        <Limb Name="gCremiaRightHandLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_HAND" Offset="0x15B2C" />
-        <Limb Name="gCremiaHeadLimb" Type="Standard" EnumName="CREMIA_LIMB_HEAD" Offset="0x15B38" />
-        <Limb Name="gCremiaHairEndLimb" Type="Standard" EnumName="CREMIA_LIMB_HAIR_END" Offset="0x15B44" />
-        <Limb Name="gCremiaPelvisLimb" Type="Standard" EnumName="CREMIA_LIMB_PELVIS" Offset="0x15B50" />
-        <Limb Name="gCremiaLeftThighLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_THIGH" Offset="0x15B5C" />
-        <Limb Name="gCremiaLeftShinLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_SHIN" Offset="0x15B68" />
-        <Limb Name="gCremiaLeftFootLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_FOOT" Offset="0x15B74" />
-        <Limb Name="gCremiaRightThighLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_THIGH" Offset="0x15B80" />
-        <Limb Name="gCremiaRightShinLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_SHIN" Offset="0x15B8C" />
-        <Limb Name="gCremiaRightFootLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_FOOT" Offset="0x15B98" />
-        <Limb Name="gCremiaDress1Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_1" Offset="0x15BA4" />
-        <Limb Name="gCremiaDress2Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_2" Offset="0x15BB0" />
-        <Limb Name="gCremiaDress3Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_3" Offset="0x15BBC" />
-        <Limb Name="gCremiaDress4Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_4" Offset="0x15BC8" />
-        
-        <!-- Cremia Skeleton -->
-        <Skeleton Name="gCremiaSkel" Type="Flex" LimbType="Standard" LimbNone="CREMIA_LIMB_NONE" LimbMax="CREMIA_LIMB_MAX" EnumName="CremiaLimb" Offset="0x15C28" />
-
-        <!-- Cremia Animation -->
-        <Animation Name="gCremiaWalkAnim" Offset="0x16720" /> <!-- Original name is "kl_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mag.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mag.xml
deleted file mode 100644
index 05207743b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mag.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Root>
-    <!-- Textures for the title screen -->
-    <File Name="object_mag" Segment="6">
-        <Texture Name="gTitleScreenZeldaLogoTex" OutName="title_screen_zelda_logo" Format="rgba32" Width="144" Height="64" Offset="0x0"/>
-        <Texture Name="gTitleScreenMajorasMaskSubtitleTex" OutName="title_screen_majoras_mask_subtitle" Format="i8" Width="104" Height="16" Offset="0x9000"/>
-        <Texture Name="gTitleScreenMajorasMaskSubtitleMaskTex" OutName="title_screen_majoras_mask_subtitle_mask" Format="i8" Width="104" Height="16" Offset="0x9680"/><!-- Masking the flame effect -->
-        <Texture Name="gTitleScreenTheLegendOfTextTex" OutName="title_screen_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x9D00"/>
-    
-        <Texture Name="gTitleScreenDisplayEffectMask00Tex" OutName="title_screen_display_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x9F40"/>
-        <Texture Name="gTitleScreenDisplayEffectMask01Tex" OutName="title_screen_display_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0xA740"/>
-        <Texture Name="gTitleScreenDisplayEffectMask10Tex" OutName="title_screen_display_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0xAF40"/>
-        <Texture Name="gTitleScreenDisplayEffectMask11Tex" OutName="title_screen_display_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0xB740"/>
-        <Texture Name="gTitleScreenDisplayEffectMask02Tex" OutName="title_screen_display_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0xBF40"/>
-        <Texture Name="gTitleScreenDisplayEffectMask12Tex" OutName="title_screen_display_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0xC740"/>
-
-        <Texture Name="gTitleScreenAppearEffectMask00Tex" OutName="title_screen_appear_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0xCF40"/>
-        <Texture Name="gTitleScreenAppearEffectMask01Tex" OutName="title_screen_appear_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0xD740"/>
-        <Texture Name="gTitleScreenAppearEffectMask10Tex" OutName="title_screen_appear_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0xDF40"/>
-        <Texture Name="gTitleScreenAppearEffectMask11Tex" OutName="title_screen_appear_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0xE740"/>
-        <Texture Name="gTitleScreenAppearEffectMask02Tex" OutName="title_screen_appear_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0xEF40"/>
-        <Texture Name="gTitleScreenAppearEffectMask12Tex" OutName="title_screen_appear_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0xF740"/>
-
-        <Texture Name="gTitleScreenFlame0Tex" OutName="title_screen_flame_0" Format="i8" Width="32" Height="32" Offset="0xFF40"/>
-        <Texture Name="gTitleScreenFlame1Tex" OutName="title_screen_flame_1" Format="i8" Width="32" Height="32" Offset="0x10340"/>
-        <Texture Name="gTitleScreenFlame2Tex" OutName="title_screen_flame_2" Format="i8" Width="32" Height="32" Offset="0x10740"/>
-        <Texture Name="gTitleScreenFlame3Tex" OutName="title_screen_flame_3" Format="i8" Width="32" Height="32" Offset="0x10B40"/>
-
-        <Texture Name="gTitleScreenCopyright2000NintendoTex" OutName="title_screen_copyright_2000_nintendo_text" Format="i8" Width="200" Height="16" Offset="0x10F40"/>
-        <Texture Name="gTitleScreenControllerNotConnectedTextTex" OutName="title_screen_controller_not_connected_text" Format="i4" Width="256" Height="9" Offset="0x11BC0"/>
-        <Texture Name="gTitleScreenInsertControllerTextTex" OutName="title_screen_insert_controller_text" Format="i4" Width="144" Height="9" Offset="0x12040"/>
-        <Texture Name="gTitleScreenMajorasMaskTex" OutName="title_screen_majoras_mask" Format="rgba32" Width="128" Height="112" Offset="0x122C8"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mamenoki.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mamenoki.xml
deleted file mode 100644
index 9fa5b6832..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mamenoki.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_mamenoki" Segment="6">
-        <DList Name="object_mamenoki_DL_000090" Offset="0x90" /> <!-- Original name is "c_mame_jr_model" -->
-        <DList Name="object_mamenoki_DL_0002D0" Offset="0x2D0" /> <!-- Original name is "c_mame_lift_model" -->
-        <Collision Name="object_mamenoki_Colheader_0004BC" Offset="0x4BC" /> <!-- Original name is "c_mame_lift_bgdatainfo" -->
-        <DList Name="object_mamenoki_DL_000530" Offset="0x530" /> <!-- Original name is "c_mame_place_model" -->
-        <Texture Name="object_mamenoki_Tex_0005C0" OutName="tex_0005C0" Format="rgba16" Width="32" Height="32" Offset="0x5C0" />
-        <Texture Name="object_mamenoki_Tex_000DC0" OutName="tex_000DC0" Format="rgba16" Width="16" Height="32" Offset="0xDC0" />
-        <Texture Name="object_mamenoki_Tex_0011C0" OutName="tex_0011C0" Format="rgba16" Width="32" Height="32" Offset="0x11C0" />
-        <Texture Name="object_mamenoki_Tex_0019C0" OutName="tex_0019C0" Format="rgba16" Width="16" Height="32" Offset="0x19C0" />
-        <Texture Name="object_mamenoki_Tex_001DC0" OutName="tex_001DC0" Format="rgba16" Width="32" Height="16" Offset="0x1DC0" />
-        <DList Name="object_mamenoki_DL_002200" Offset="0x2200" />
-        <DList Name="object_mamenoki_DL_002208" Offset="0x2208" />
-        <Texture Name="object_mamenoki_Tex_002298" OutName="tex_002298" Format="i8" Width="32" Height="32" Offset="0x2298" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_market_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_market_obj.xml
deleted file mode 100644
index 8ad9436cc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_market_obj.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<Root>
-    <!-- Assets for most of the West Clock Town Market (the section with the shops and the bank) -->
-    <File Name="object_market_obj" Segment="6">
-        <!-- West Clock Town Market Textures -->
-        <Texture Name="gWestClockTownMarketWhitePlasterTLUT" OutName="west_clock_town_market_white_plaster_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gWestClockTownMarketYellowPlasterTLUT" OutName="west_clock_town_market_yellow_plaster_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20" />
-        <Texture Name="gWestClockTownMarketBrownPlasterTLUT" OutName="west_clock_town_market_brown_plaster_tlut" Format="rgba16" Width="4" Height="4" Offset="0x40" />
-        <Texture Name="gWestClockTownMarketStrawTLUT" OutName="west_clock_town_market_straw_tlut" Format="rgba16" Width="4" Height="4" Offset="0x60" />
-        <Texture Name="gWestClockTownMarketStrawFringeTLUT" OutName="west_clock_town_market_straw_fringe_tlut" Format="rgba16" Width="4" Height="4" Offset="0x80" />
-        <Texture Name="gWestClockTownMarketBrownPatternedPlasterTLUT" OutName="west_clock_town_market_brown_patterned_plaster_tlut" Format="rgba16" Width="4" Height="4" Offset="0xA0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster1TLUT" OutName="west_clock_town_market_yellow_patterned_plaster_1_tlut" Format="rgba16" Width="4" Height="4" Offset="0xC0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster2TLUT" OutName="west_clock_town_market_yellow_patterned_plaster_2_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster1TLUT" OutName="west_clock_town_market_white_patterned_plaster_1_tlut" Format="rgba16" Width="4" Height="4" Offset="0x100" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster2TLUT" OutName="west_clock_town_market_white_patterned_plaster_2_tlut" Format="rgba16" Width="4" Height="4" Offset="0x120" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster3TLUT" OutName="west_clock_town_market_yellow_patterned_plaster_3_tlut" Format="rgba16" Width="4" Height="4" Offset="0x140" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster4TLUT" OutName="west_clock_town_market_yellow_patterned_plaster_4_tlut" Format="rgba16" Width="4" Height="4" Offset="0x160" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster5TLUT" OutName="west_clock_town_market_yellow_patterned_plaster_5_tlut" Format="rgba16" Width="4" Height="4" Offset="0x180" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster3TLUT" OutName="west_clock_town_market_white_patterned_plaster_3_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1A0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster4TLUT" OutName="west_clock_town_market_white_patterned_plaster_4_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1C0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster5TLUT" OutName="west_clock_town_market_white_patterned_plaster_5_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1E0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster6TLUT" OutName="west_clock_town_market_white_patterned_plaster_6_tlut" Format="rgba16" Width="4" Height="4" Offset="0x200" />
-        <Texture Name="gWestClockTownMarketCowFrontTLUT" OutName="west_clock_town_market_cow_front_tlut" Format="rgba16" Width="16" Height="16" Offset="0x220" />
-        <Texture Name="gWestClockTownMarketCuriosityShopSignTex" OutName="west_clock_town_market_curiosity_shop_sign" Format="rgba16" Width="32" Height="64" Offset="0x420" />
-        <Texture Name="gWestClockTownMarketBombShopSignTex" OutName="west_clock_town_market_bomb_shop_sign" Format="rgba16" Width="32" Height="64" Offset="0x1420" />
-        <Texture Name="gWestClockTownMarketWhitePlasterTex" OutName="west_clock_town_market_white_plaster" Format="ci4" Width="64" Height="64" Offset="0x2420" />
-        <Texture Name="gWestClockTownMarketClockTownBankSignTex" OutName="west_clock_town_market_clock_town_bank_sign" Format="rgba16" Width="32" Height="63" Offset="0x2C20" />
-        <Texture Name="gWestClockTownMarketTradingPostSignTex" OutName="west_clock_town_market_trading_post_sign" Format="rgba16" Width="32" Height="64" Offset="0x3BE0" />
-        <Texture Name="gWestClockTownMarketYellowPlasterTex" OutName="west_clock_town_market_yellow_plaster" Format="ci4" Width="64" Height="64" Offset="0x4BE0" />
-        <Texture Name="gWestClockTownMarketBrownPlasterTex" OutName="west_clock_town_market_brown_plaster" Format="ci4" Width="64" Height="64" Offset="0x53E0" />
-        <Texture Name="gWestClockTownMarketBankAndDoorFrameTex" OutName="west_clock_town_market_bank_and_door_frame" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" />
-        <Texture Name="gWestClockTownMarketGroundTex" OutName="west_clock_town_market_ground" Format="rgba16" Width="32" Height="32" Offset="0x63E0" />
-        <Texture Name="gWestClockTownBrickBelowWhitePlasterTex" OutName="west_clock_town_market_brick_below_white_plaster" Format="rgba16" Width="64" Height="32" Offset="0x6BE0" />
-        <Texture Name="gWestClockTownMarketStrawTex" OutName="west_clock_town_market_straw" Format="ci4" Width="64" Height="64" Offset="0x7BE0" />
-        <Texture Name="gWestClockTownBrickBelowYellowPlasterTex" OutName="west_clock_town_market_brick_below_yellow_plaster" Format="rgba16" Width="64" Height="32" Offset="0x83E0" />
-        <Texture Name="gWestClockTownBrickBelowBrownPlasterTex" OutName="west_clock_town_market_brick_below_brown_plaster" Format="rgba16" Width="64" Height="32" Offset="0x93E0" />
-        <Texture Name="gWestClockTownMarketStrawFringeTex" OutName="west_clock_town_market_straw_fringe" Format="ci4" Width="64" Height="32" Offset="0xA3E0" />
-        <Texture Name="gWestClockTownMarketBankDoorTex" OutName="west_clock_town_market_bank_door" Format="i4" Width="32" Height="32" Offset="0xA7E0" />
-        <Texture Name="gWestClockTownMarketBrownPatternedPlasterTex" OutName="west_clock_town_market_brown_patterned_plaster" Format="ci4" Width="32" Height="64" Offset="0xA9E0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster1Tex" OutName="west_clock_town_market_yellow_patterned_plaster_1" Format="ci4" Width="64" Height="64" Offset="0xADE0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster2Tex" OutName="west_clock_town_market_yellow_patterned_plaster_2" Format="ci4" Width="64" Height="64" Offset="0xB5E0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster1Tex" OutName="west_clock_town_market_white_patterned_plaster_1" Format="ci4" Width="64" Height="64" Offset="0xBDE0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster2Tex" OutName="west_clock_town_market_white_patterned_plaster_2" Format="ci4" Width="64" Height="64" Offset="0xC5E0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster3Tex" OutName="west_clock_town_market_yellow_patterned_plaster_3" Format="ci4" Width="64" Height="64" Offset="0xCDE0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster4Tex" OutName="west_clock_town_market_yellow_patterned_plaster_4" Format="ci4" Width="64" Height="64" Offset="0xD5E0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster5Tex" OutName="west_clock_town_market_yellow_patterned_plaster_5" Format="ci4" Width="64" Height="64" Offset="0xDDE0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster3Tex" OutName="west_clock_town_market_white_patterned_plaster_3" Format="ci4" Width="64" Height="64" Offset="0xE5E0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster4Tex" OutName="west_clock_town_market_white_patterned_plaster_4" Format="ci4" Width="64" Height="64" Offset="0xEDE0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster5Tex" OutName="west_clock_town_market_white_patterned_plaster_5" Format="ci4" Width="64" Height="64" Offset="0xF5E0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster6Tex" OutName="west_clock_town_market_white_patterned_plaster_6" Format="ci4" Width="64" Height="64" Offset="0xFDE0" />
-        <Texture Name="gWestClockTownMarketPoleTex" OutName="west_clock_town_market_pole" Format="rgba16" Width="32" Height="16" Offset="0x105E0" />
-        <Texture Name="gWestClockTownMarketBrickEdgedGroundTex" OutName="west_clock_town_market_brick_edged_ground" Format="rgba16" Width="32" Height="64" Offset="0x109E0" />
-        <Texture Name="gWestClockTownMarketStairRiserTex" OutName="west_clock_town_market_stair_riser" Format="rgba16" Width="32" Height="16" Offset="0x119E0" />
-        <Texture Name="gWestClockTownMarketFlowerBedTopTex" OutName="west_clock_town_market_flower_bed_top" Format="rgba16" Width="32" Height="32" Offset="0x11DE0" />
-        <Texture Name="gWestClockTownMarketFlowerBedSidesTex" OutName="west_clock_town_market_flower_bed_sides" Format="rgba16" Width="32" Height="32" Offset="0x125E0" />
-        <Texture Name="gWestClockTownMarketSafeTex" OutName="west_clock_town_market_safe" Format="rgba16" Width="32" Height="32" Offset="0x12DE0" />
-        <Texture Name="gWestClockTownMarketRugTex" OutName="west_clock_town_market_rug" Format="rgba16" Width="64" Height="16" Offset="0x135E0" />
-        <Texture Name="gWestClockTownMarketBankCurtainTex" OutName="west_clock_town_market_bank_curtain" Format="ia8" Width="32" Height="32" Offset="0x13DE0" />
-        <Texture Name="gWestClockTownMarketCowFrontTex" OutName="west_clock_town_market_cow_front" Format="ci8" Width="8" Height="8" Offset="0x141E0" />
-        <Texture Name="gWestClockTownMarketCowBodyTex" OutName="west_clock_town_market_cow_body" Format="i8" Width="8" Height="8" Offset="0x14220" />
-        <Texture Name="gWestClockTownMarketBankAdvertisementsTex" OutName="west_clock_town_market_bank_advertisements" Format="i4" Width="64" Height="32" Offset="0x14260" />
-        <Texture Name="gWestClockTownMarketSafeWheelAndHandleTex" OutName="west_clock_town_market_safe_wheel_and_handle" Format="rgba16" Width="16" Height="16" Offset="0x14660" />
-
-        <!-- West Clock Town Market DisplayLists -->
-        <DList Name="gWestClockTownMarketBankAdvertisementsAndDoorNightDL" Offset="0x18C60" /> <!-- The door is not interactive, and it's not visible in-game. -->
-        <DList Name="gWestClockTownMarketNightDL" Offset="0x18DA0" />
-        <DList Name="gWestClockTownMarketBankAdvertisementsAndDoorDayDL" Offset="0x1EF10" /> <!-- The door is not interactive, and it's not visible in-game. -->
-        <DList Name="gWestClockTownMarketDayDL" Offset="0x1F050" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_maruta.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_maruta.xml
deleted file mode 100644
index c44907b1d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_maruta.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_maruta" Segment="6">
-        <Texture Name="object_maruta_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="object_maruta_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800" />
-        <Texture Name="object_maruta_Tex_001000" OutName="tex_001000" Format="rgba16" Width="32" Height="32" Offset="0x1000" />
-        <DList Name="object_maruta_DL_002220" Offset="0x2220" /> <!-- Original name is "parts_1_model" -->
-        <DList Name="object_maruta_DL_0023D0" Offset="0x23D0" /> <!-- Original name is "parts_2_model" -->
-        <DList Name="object_maruta_DL_002568" Offset="0x2568" /> <!-- Original name is "parts_3_model" -->
-        <DList Name="object_maruta_DL_002660" Offset="0x2660" /> <!-- Original name is "parts_4_model" -->
-        <DList Name="object_maruta_DL_002758" Offset="0x2758" /> <!-- Original name is "parts_5_model" -->
-        <DList Name="object_maruta_DL_002850" Offset="0x2850" /> <!-- Original name is "parts_6_model" -->
-        <DList Name="object_maruta_DL_002948" Offset="0x2948" /> <!-- Original name is "parts_7_model" -->
-        <DList Name="object_maruta_DL_002AE0" Offset="0x2AE0" /> <!-- Original name is "parts_8_model" -->
-        <DList Name="object_maruta_DL_002EC0" Offset="0x2EC0" /> <!-- Original name is "kiretenaimaruta_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bakuretu.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bakuretu.xml
deleted file mode 100644
index 2eed78171..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bakuretu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_mask_bakuretu" Segment="10">
-        <DList Name="object_mask_bakuretu_DL_000440" Offset="0x440" />
-        <DList Name="object_mask_bakuretu_DL_0005C0" Offset="0x5C0" />
-        <Texture Name="object_mask_bakuretu_Tex_0007B0" OutName="tex_0007B0" Format="i8" Width="32" Height="32" Offset="0x7B0" />
-        <Texture Name="object_mask_bakuretu_Tex_000BB0" OutName="tex_000BB0" Format="i8" Width="8" Height="8" Offset="0xBB0" />
-        <Texture Name="object_mask_bakuretu_Tex_000BF0" OutName="tex_000BF0" Format="i4" Width="32" Height="32" Offset="0xBF0" />
-        <Texture Name="object_mask_bakuretu_Tex_000DF0" OutName="tex_000DF0" Format="i8" Width="32" Height="32" Offset="0xDF0" />
-        <TextureAnimation Name="object_mask_bakuretu_Matanimheader_0011F8" Offset="0x11F8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bigelf.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bigelf.xml
deleted file mode 100644
index 762d11808..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bigelf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_mask_bigelf" Segment="10">
-        <DList Name="object_mask_bigelf_DL_0016F0" Offset="0x16F0" />
-        <Texture Name="object_mask_bigelf_TLUT_002130" OutName="tlut_002130" Format="rgba16" Width="16" Height="16" Offset="0x2130" />
-        <Texture Name="object_mask_bigelf_Tex_002330" OutName="tex_002330" Format="ci8" Width="8" Height="8" Offset="0x2330" />
-        <Texture Name="object_mask_bigelf_Tex_002370" OutName="tex_002370" Format="ci8" Width="32" Height="32" Offset="0x2370" />
-        <Texture Name="object_mask_bigelf_Tex_002770" OutName="tex_002770" Format="ci8" Width="64" Height="32" Offset="0x2770" />
-        <Texture Name="object_mask_bigelf_Tex_002F70" OutName="tex_002F70" Format="ci8" Width="16" Height="16" Offset="0x2F70" />
-        <Texture Name="object_mask_bigelf_Tex_003070" OutName="tex_003070" Format="ci8" Width="8" Height="8" Offset="0x3070" />
-        <Texture Name="object_mask_bigelf_Tex_0030B0" OutName="tex_0030B0" Format="rgba16" Width="32" Height="16" Offset="0x30B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_boy.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_boy.xml
deleted file mode 100644
index e0f93797e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_boy.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_mask_boy" Segment="10">
-        <DList Name="object_mask_boy_DL_000900" Offset="0x900" />
-        <Texture Name="object_mask_boy_TLUT_000D50" OutName="tlut_000D50" Format="rgba16" Width="16" Height="16" Offset="0xD50" />
-        <Texture Name="object_mask_boy_Tex_000F50" OutName="tex_000F50" Format="ci8" Width="32" Height="32" Offset="0xF50" />
-        <Texture Name="object_mask_boy_Tex_001350" OutName="tex_001350" Format="ci8" Width="64" Height="32" Offset="0x1350" />
-        <Texture Name="object_mask_boy_Tex_001B50" OutName="tex_001B50" Format="ci8" Width="32" Height="32" Offset="0x1B50" />
-        <Texture Name="object_mask_boy_Tex_001F50" OutName="tex_001F50" Format="ci8" Width="16" Height="16" Offset="0x1F50" />
-        <Texture Name="object_mask_boy_Tex_002050" OutName="tex_002050" Format="rgba16" Width="8" Height="8" Offset="0x2050" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bree.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bree.xml
deleted file mode 100644
index 9fda443c8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bree.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_mask_bree" Segment="10">
-        <DList Name="object_mask_bree_DL_0003C0" Offset="0x3C0" />
-        <Texture Name="object_mask_bree_TLUT_000658" OutName="tlut_000658" Format="rgba16" Width="16" Height="16" Offset="0x658" />
-        <Texture Name="object_mask_bree_Tex_000858" OutName="tex_000858" Format="ci8" Width="32" Height="32" Offset="0x858" />
-        <Texture Name="object_mask_bree_Tex_000C58" OutName="tex_000C58" Format="ci8" Width="16" Height="16" Offset="0xC58" />
-        <Texture Name="object_mask_bree_Tex_000D58" OutName="tex_000D58" Format="ci8" Width="8" Height="8" Offset="0xD58" />
-        <Texture Name="object_mask_bree_Tex_000D98" OutName="tex_000D98" Format="rgba16" Width="64" Height="32" Offset="0xD98" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bu_san.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bu_san.xml
deleted file mode 100644
index 621e748ed..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_bu_san.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_mask_bu_san" Segment="10">
-        <DList Name="object_mask_bu_san_DL_000710" Offset="0x710" />
-        <Texture Name="object_mask_bu_san_TLUT_000B68" OutName="tlut_000B68" Format="rgba16" Width="16" Height="16" Offset="0xB68" />
-        <Texture Name="object_mask_bu_san_Tex_000D68" OutName="tex_000D68" Format="ci8" Width="8" Height="8" Offset="0xD68" />
-        <Texture Name="object_mask_bu_san_Tex_000DA8" OutName="tex_000DA8" Format="rgba16" Width="8" Height="16" Offset="0xDA8" />
-        <Texture Name="object_mask_bu_san_Tex_000EA8" OutName="tex_000EA8" Format="ci8" Width="16" Height="16" Offset="0xEA8" />
-        <Texture Name="object_mask_bu_san_Tex_000FA8" OutName="tex_000FA8" Format="ci8" Width="16" Height="32" Offset="0xFA8" />
-        <Texture Name="object_mask_bu_san_Tex_0011A8" OutName="tex_0011A8" Format="ci8" Width="8" Height="8" Offset="0x11A8" />
-        <Texture Name="object_mask_bu_san_Tex_0011E8" OutName="tex_0011E8" Format="rgba16" Width="16" Height="16" Offset="0x11E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_dancer.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_dancer.xml
deleted file mode 100644
index a2a37c958..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_dancer.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_mask_dancer" Segment="10">
-        <DList Name="object_mask_dancer_DL_000EF0" Offset="0xEF0" />
-        <Texture Name="object_mask_dancer_TLUT_001548" OutName="tlut_001548" Format="rgba16" Width="16" Height="16" Offset="0x1548" />
-        <Texture Name="object_mask_dancer_Tex_001748" OutName="tex_001748" Format="ci8" Width="16" Height="16" Offset="0x1748" />
-        <Texture Name="object_mask_dancer_Tex_001848" OutName="tex_001848" Format="ci8" Width="8" Height="8" Offset="0x1848" />
-        <Texture Name="object_mask_dancer_Tex_001888" OutName="tex_001888" Format="ci8" Width="16" Height="16" Offset="0x1888" />
-        <Texture Name="object_mask_dancer_Tex_001988" OutName="tex_001988" Format="ci8" Width="8" Height="8" Offset="0x1988" />
-        <Texture Name="object_mask_dancer_Tex_0019C8" OutName="tex_0019C8" Format="ci8" Width="16" Height="16" Offset="0x19C8" />
-        <Texture Name="object_mask_dancer_Tex_001AC8" OutName="tex_001AC8" Format="ci8" Width="8" Height="16" Offset="0x1AC8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_gero.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_gero.xml
deleted file mode 100644
index b6f4a6117..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_gero.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Object for Don Gero's Mask-->
-    <File Name="object_mask_gero" Segment="10">
-        <DList Name="gDonGeroMaskDL" Offset="0xDC0" />
-        <Texture Name="gDonGeroMaskTLUT" OutName="don_gero_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1388" />
-        <Texture Name="gDonGeroMaskBottomTex" OutName="don_gero_mask_bottom" Format="ci8" Width="16" Height="16" Offset="0x1588" />
-        <Texture Name="gDonGeroMaskToesTex" OutName="don_gero_mask_toes" Format="rgba16" Width="32" Height="32" Offset="0x1688" />
-        <Texture Name="gDonGeroMaskTopTex" OutName="don_gero_mask_top" Format="ci8" Width="16" Height="16" Offset="0x1E88" />
-        <Texture Name="gDonGeroMaskNostrilTex" OutName="don_gero_mask_nostril" Format="ci8" Width="32" Height="32" Offset="0x1F88" />
-        <Texture Name="gDonGeroMaskMouthTex" OutName="don_gero_mask_mouth" Format="ci8" Width="16" Height="16" Offset="0x2388" />
-        <Texture Name="gDonGeroMaskFrillsTex" OutName="don_gero_mask_frills" Format="rgba16" Width="32" Height="32" Offset="0x2488" />
-        <Texture Name="gDonGeroMaskEyeTex" OutName="don_gero_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x2C88" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_gibudo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_gibudo.xml
deleted file mode 100644
index 76bf2b3de..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_gibudo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_mask_gibudo" Segment="10">
-        <DList Name="object_mask_gibudo_DL_000250" Offset="0x250" />
-        <Texture Name="object_mask_gibudo_Tex_000398" OutName="tex_000398" Format="i8" Width="64" Height="32" Offset="0x398" />
-        <Texture Name="object_mask_gibudo_Tex_000B98" OutName="tex_000B98" Format="i8" Width="32" Height="16" Offset="0xB98" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_goron.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_goron.xml
deleted file mode 100644
index 56a67218e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_goron.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_mask_goron" Segment="10">
-        <Texture Name="object_mask_goron_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="object_mask_goron_Tex_000200" OutName="tex_000200" Format="ci8" Width="32" Height="64" Offset="0x200" />
-        <Texture Name="object_mask_goron_Tex_000A00" OutName="tex_000A00" Format="ci8" Width="8" Height="8" Offset="0xA00" />
-        <Texture Name="object_mask_goron_Tex_000A40" OutName="tex_000A40" Format="ci8" Width="16" Height="16" Offset="0xA40" />
-        <Texture Name="object_mask_goron_Tex_000B40" OutName="tex_000B40" Format="ci8" Width="32" Height="32" Offset="0xB40" />
-        <DList Name="object_mask_goron_DL_0014A0" Offset="0x14A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_json.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_json.xml
deleted file mode 100644
index 1a5c10eb1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_json.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_mask_json" Segment="10">
-        <DList Name="object_mask_json_DL_0004C0" Offset="0x4C0" />
-        <Texture Name="object_mask_json_TLUT_0008A0" OutName="tlut_0008A0" Format="rgba16" Width="16" Height="16" Offset="0x8A0" />
-        <Texture Name="object_mask_json_Tex_000AA0" OutName="tex_000AA0" Format="rgba16" Width="16" Height="16" Offset="0xAA0" />
-        <Texture Name="object_mask_json_Tex_000CA0" OutName="tex_000CA0" Format="ci8" Width="16" Height="8" Offset="0xCA0" />
-        <Texture Name="object_mask_json_Tex_000D20" OutName="tex_000D20" Format="ci8" Width="16" Height="32" Offset="0xD20" />
-        <Texture Name="object_mask_json_Tex_000F20" OutName="tex_000F20" Format="ci8" Width="32" Height="32" Offset="0xF20" />
-        <Texture Name="object_mask_json_Tex_001320" OutName="tex_001320" Format="ci8" Width="8" Height="8" Offset="0x1320" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_kerfay.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_kerfay.xml
deleted file mode 100644
index d80b8eaf0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_kerfay.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Assets for Kafei's Mask -->
-    <File Name="object_mask_kerfay" Segment="10">
-        <DList Name="gKafeisMaskDL" Offset="0xD40" />
-
-        <Texture Name="gKafeisMaskTLUT" OutName="kafeis_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1140" />
-        <Texture Name="gKafeisMaskHoleTex" OutName="hole" Format="ci8" Width="16" Height="16" Offset="0x1340" TlutOffset="0x1140" />
-        <Texture Name="gKafeisMaskHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x1440" TlutOffset="0x1140" />
-        <Texture Name="gKafeisMaskHairPartAndUndersideTex" OutName="hair_part_and_underside" Format="ci8" Width="8" Height="16" Offset="0x14C0" TlutOffset="0x1140" />
-        <Texture Name="gKafeisMaskEyebrowTex" OutName="eyebrow" Format="ci8" Width="16" Height="8" Offset="0x1540" TlutOffset="0x1140" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_ki_tan.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_ki_tan.xml
deleted file mode 100644
index f0322cc83..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_ki_tan.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_mask_ki_tan" Segment="10">
-        <DList Name="object_mask_ki_tan_DL_0004A0" Offset="0x4A0" />
-        <Texture Name="object_mask_ki_tan_TLUT_000688" OutName="tlut_000688" Format="rgba16" Width="16" Height="16" Offset="0x688" />
-        <Texture Name="object_mask_ki_tan_Tex_000888" OutName="tex_000888" Format="ci8" Width="32" Height="16" Offset="0x888" />
-        <Texture Name="object_mask_ki_tan_Tex_000A88" OutName="tex_000A88" Format="ci8" Width="8" Height="8" Offset="0xA88" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_kyojin.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_kyojin.xml
deleted file mode 100644
index cd07a57fd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_kyojin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="object_mask_kyojin" Segment="10">
-        <DList Name="object_mask_kyojin_DL_000380" Offset="0x380" />
-        <Texture Name="object_mask_kyojin_Tex_000498" OutName="tex_000498" Format="i4" Width="64" Height="64" Offset="0x498" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_meoto.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_meoto.xml
deleted file mode 100644
index 069e521e0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_meoto.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_mask_meoto" Segment="10">
-        <DList Name="object_mask_meoto_DL_0005A0" Offset="0x5A0" />
-        <Texture Name="object_mask_meoto_Tex_0008C8" OutName="tex_0008C8" Format="i8" Width="32" Height="64" Offset="0x8C8" />
-        <Texture Name="object_mask_meoto_Tex_0010C8" OutName="tex_0010C8" Format="i8" Width="32" Height="64" Offset="0x10C8" />
-        <Texture Name="object_mask_meoto_Tex_0018C8" OutName="tex_0018C8" Format="i8" Width="32" Height="32" Offset="0x18C8" />
-        <TextureAnimation Name="object_mask_meoto_Matanimheader_001CD8" Offset="0x1CD8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_nuts.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_nuts.xml
deleted file mode 100644
index 6a0eaf26d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_nuts.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_mask_nuts" Segment="10">
-        <Texture Name="object_mask_nuts_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="object_mask_nuts_Tex_000800" OutName="tex_000800" Format="rgba16" Width="16" Height="16" Offset="0x800" />
-        <Texture Name="object_mask_nuts_Tex_000A00" OutName="tex_000A00" Format="rgba16" Width="32" Height="32" Offset="0xA00" />
-        <DList Name="object_mask_nuts_DL_001D90" Offset="0x1D90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_posthat.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_posthat.xml
deleted file mode 100644
index bccbfb301..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_posthat.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_mask_posthat" Segment="10">
-        <DList Name="object_mask_posthat_DL_000290" Offset="0x290" />
-        <Texture Name="object_mask_posthat_TLUT_000488" OutName="tlut_000488" Format="rgba16" Width="16" Height="16" Offset="0x488" />
-        <Texture Name="object_mask_posthat_Tex_000688" OutName="tex_000688" Format="i4" Width="16" Height="16" Offset="0x688" />
-        <Texture Name="object_mask_posthat_Tex_000708" OutName="tex_000708" Format="ci8" Width="32" Height="32" Offset="0x708" />
-        <Texture Name="object_mask_posthat_Tex_000B08" OutName="tex_000B08" Format="ci8" Width="8" Height="8" Offset="0xB08" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_rabit.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_rabit.xml
deleted file mode 100644
index a4a1f5c0c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_rabit.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_mask_rabit" Segment="10">
-        <DList Name="object_mask_rabit_DL_000610" Offset="0x610" />
-        <Texture Name="object_mask_rabit_Tex_0009A0" OutName="tex_0009A0" Format="rgba16" Width="16" Height="16" Offset="0x9A0" />
-        <Texture Name="object_mask_rabit_Tex_000BA0" OutName="tex_000BA0" Format="rgba16" Width="16" Height="32" Offset="0xBA0" />
-        <Texture Name="object_mask_rabit_Tex_000FA0" OutName="tex_000FA0" Format="rgba16" Width="16" Height="32" Offset="0xFA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_romerny.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_romerny.xml
deleted file mode 100644
index 603feef0d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_romerny.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_mask_romerny" Segment="10">
-        <DList Name="object_mask_romerny_DL_0007A0" Offset="0x7A0" />
-        <Texture Name="object_mask_romerny_TLUT_000B88" OutName="tlut_000B88" Format="rgba16" Width="16" Height="16" Offset="0xB88" />
-        <Texture Name="object_mask_romerny_Tex_000D88" OutName="tex_000D88" Format="i4" Width="64" Height="64" Offset="0xD88" />
-        <Texture Name="object_mask_romerny_Tex_001588" OutName="tex_001588" Format="ci8" Width="16" Height="16" Offset="0x1588" />
-        <Texture Name="object_mask_romerny_Tex_001688" OutName="tex_001688" Format="ci8" Width="16" Height="16" Offset="0x1688" />
-        <Texture Name="object_mask_romerny_Tex_001788" OutName="tex_001788" Format="rgba16" Width="16" Height="16" Offset="0x1788" />
-        <Texture Name="object_mask_romerny_Tex_001988" OutName="tex_001988" Format="ci8" Width="8" Height="16" Offset="0x1988" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_skj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_skj.xml
deleted file mode 100644
index 457cd94f2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_skj.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_mask_skj" Segment="10">
-        <DList Name="object_mask_skj_DL_0009F0" Offset="0x9F0" />
-        <Texture Name="object_mask_skj_TLUT_000FA0" OutName="tlut_000FA0" Format="rgba16" Width="16" Height="16" Offset="0xFA0" />
-        <Texture Name="object_mask_skj_Tex_0011A0" OutName="tex_0011A0" Format="ci8" Width="16" Height="16" Offset="0x11A0" />
-        <Texture Name="object_mask_skj_Tex_0012A0" OutName="tex_0012A0" Format="ci8" Width="8" Height="16" Offset="0x12A0" />
-        <Texture Name="object_mask_skj_Tex_001320" OutName="tex_001320" Format="ci8" Width="8" Height="8" Offset="0x1320" />
-        <Texture Name="object_mask_skj_Tex_001360" OutName="tex_001360" Format="ci8" Width="16" Height="16" Offset="0x1360" />
-        <Texture Name="object_mask_skj_Tex_001460" OutName="tex_001460" Format="rgba16" Width="8" Height="16" Offset="0x1460" />
-        <Texture Name="object_mask_skj_Tex_001560" OutName="tex_001560" Format="rgba16" Width="16" Height="8" Offset="0x1560" />
-        <Texture Name="object_mask_skj_Tex_001660" OutName="tex_001660" Format="rgba16" Width="8" Height="8" Offset="0x1660" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_stone.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_stone.xml
deleted file mode 100644
index 24f67d1df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_stone.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_mask_stone" Segment="10">
-        <DList Name="object_mask_stone_DL_000820" Offset="0x820" />
-        <Texture Name="object_mask_stone_Tex_000B40" OutName="tex_000B40" Format="i8" Width="16" Height="16" Offset="0xB40" />
-        <Texture Name="object_mask_stone_Tex_000C40" OutName="tex_000C40" Format="i8" Width="32" Height="32" Offset="0xC40" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_truth.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_truth.xml
deleted file mode 100644
index 3fed737a2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_truth.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="object_mask_truth" Segment="10">
-        <DList Name="object_mask_truth_DL_0001A0" Offset="0x1A0" />
-        <Texture Name="object_mask_truth_Tex_000298" OutName="tex_000298" Format="rgba16" Width="32" Height="64" Offset="0x298" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_yofukasi.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_yofukasi.xml
deleted file mode 100644
index 990543e1b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_yofukasi.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_mask_yofukasi" Segment="10">
-        <DList Name="object_mask_yofukasi_DL_000490" Offset="0x490" />
-        <Texture Name="object_mask_yofukasi_Tex_0006A0" OutName="tex_0006A0" Format="rgba16" Width="32" Height="32" Offset="0x6A0" />
-        <Texture Name="object_mask_yofukasi_Tex_000EA0" OutName="tex_000EA0" Format="i8" Width="32" Height="32" Offset="0xEA0" />
-        <Texture Name="object_mask_yofukasi_Tex_0012A0" OutName="tex_0012A0" Format="i8" Width="64" Height="32" Offset="0x12A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_zacho.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_zacho.xml
deleted file mode 100644
index ae63753de..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_zacho.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_mask_zacho" Segment="10">
-        <DList Name="object_mask_zacho_DL_000700" Offset="0x700" />
-        <Texture Name="object_mask_zacho_TLUT_000BC8" OutName="tlut_000BC8" Format="rgba16" Width="16" Height="16" Offset="0xBC8" />
-        <Texture Name="object_mask_zacho_Tex_000DC8" OutName="tex_000DC8" Format="rgba16" Width="16" Height="16" Offset="0xDC8" />
-        <Texture Name="object_mask_zacho_Tex_000FC8" OutName="tex_000FC8" Format="ci8" Width="8" Height="8" Offset="0xFC8" />
-        <Texture Name="object_mask_zacho_Tex_001008" OutName="tex_001008" Format="ci8" Width="8" Height="8" Offset="0x1008" />
-        <Texture Name="object_mask_zacho_Tex_001048" OutName="tex_001048" Format="ci8" Width="32" Height="32" Offset="0x1048" />
-        <Texture Name="object_mask_zacho_Tex_001448" OutName="tex_001448" Format="ci8" Width="16" Height="16" Offset="0x1448" />
-        <Texture Name="object_mask_zacho_Tex_001548" OutName="tex_001548" Format="ci8" Width="16" Height="16" Offset="0x1548" />
-        <Texture Name="object_mask_zacho_Tex_001648" OutName="tex_001648" Format="ci8" Width="8" Height="8" Offset="0x1648" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_zora.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_zora.xml
deleted file mode 100644
index c2e07cde2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mask_zora.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_mask_zora" Segment="10">
-        <Texture Name="object_mask_zora_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="object_mask_zora_Tex_000200" OutName="tex_000200" Format="ci8" Width="32" Height="32" Offset="0x200" />
-        <Texture Name="object_mask_zora_Tex_000600" OutName="tex_000600" Format="ci8" Width="16" Height="32" Offset="0x600" />
-        <Texture Name="object_mask_zora_Tex_000800" OutName="tex_000800" Format="ci8" Width="8" Height="8" Offset="0x800" />
-        <Texture Name="object_mask_zora_Tex_000840" OutName="tex_000840" Format="ci8" Width="16" Height="32" Offset="0x840" />
-        <DList Name="object_mask_zora_DL_000DB0" Offset="0xDB0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mastergolon.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mastergolon.xml
deleted file mode 100644
index 481fb7cde..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mastergolon.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <!-- Object for the Goron Shopkeeper's animation -->
-    <File Name="object_mastergolon" Segment="6">
-        <Animation Name="gGoronShopkeeperAnim" Offset="0xFC" /> <!-- Original name is "oF1d_omise" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_masterzoora.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_masterzoora.xml
deleted file mode 100644
index 5a72744da..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_masterzoora.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <!-- Object for the Zora Shopkeeper's animation -->
-    <File Name="object_masterzoora" Segment="6">
-        <Animation Name="gZoraShopkeeperAnim" Offset="0x78C" /> <!-- Original name is "zo_omise" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mbar_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mbar_obj.xml
deleted file mode 100644
index b1a816f47..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mbar_obj.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_mbar_obj" Segment="6">
-        <DList Name="object_mbar_obj_DL_000280" Offset="0x280" />
-        <DList Name="object_mbar_obj_DL_000288" Offset="0x288" />
-        <Texture Name="object_mbar_obj_Tex_000408" OutName="tex_000408" Format="i8" Width="32" Height="64" Offset="0x408" />
-        <Texture Name="object_mbar_obj_Tex_000C08" OutName="tex_000C08" Format="i8" Width="32" Height="32" Offset="0xC08" />
-        <Texture Name="object_mbar_obj_Tex_001008" OutName="tex_001008" Format="ia16" Width="16" Height="64" Offset="0x1008" />
-        <Collision Name="object_mbar_obj_Colheader_0019B4" Offset="0x19B4" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_meganeana_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_meganeana_obj.xml
deleted file mode 100644
index 457c937bd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_meganeana_obj.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_meganeana_obj" Segment="6">
-        <DList Name="object_meganeana_obj_DL_000080" Offset="0x80" />
-        <DList Name="object_meganeana_obj_DL_000110" Offset="0x110" />
-        <Texture Name="object_meganeana_obj_Tex_0001D0" OutName="tex_0001D0" Format="rgba16" Width="32" Height="16" Offset="0x1D0" />
-        <Texture Name="object_meganeana_obj_Tex_0005D0" OutName="tex_0005D0" Format="i4" Width="64" Height="64" Offset="0x5D0" />
-        <Texture Name="object_meganeana_obj_Tex_000DD0" OutName="tex_000DD0" Format="rgba16" Width="32" Height="32" Offset="0xDD0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_milkbar.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_milkbar.xml
deleted file mode 100644
index f3e732514..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_milkbar.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Root>
-    <File Name="object_milkbar" Segment="6">
-        <DList Name="object_milkbar_DL_000100" Offset="0x100" /> <!-- Original name is "z2_milk_bar_light_1_modelT" -->
-        <DList Name="object_milkbar_DL_000240" Offset="0x240" />
-        <Texture Name="object_milkbar_Tex_000248" OutName="tex_000248" Format="ia16" Width="16" Height="16" Offset="0x248" />
-        <Texture Name="object_milkbar_Tex_000448" OutName="tex_000448" Format="ia8" Width="16" Height="16" Offset="0x448" />
-        <DList Name="object_milkbar_DL_000650" Offset="0x650" /> <!-- Original name is "z2_milk_bar_light_2_modelT" -->
-        <DList Name="object_milkbar_DL_000790" Offset="0x790" />
-        <Texture Name="object_milkbar_Tex_000798" OutName="tex_000798" Format="ia16" Width="16" Height="16" Offset="0x798" />
-        <Texture Name="object_milkbar_Tex_000998" OutName="tex_000998" Format="ia8" Width="16" Height="16" Offset="0x998" />
-        <DList Name="object_milkbar_DL_000B80" Offset="0xB80" /> <!-- Original name is "z2_milk_bar_light_3_modelT" -->
-        <DList Name="object_milkbar_DL_000CC0" Offset="0xCC0" />
-        <Texture Name="object_milkbar_Tex_000CC8" OutName="tex_000CC8" Format="ia16" Width="16" Height="16" Offset="0xCC8" />
-        <Texture Name="object_milkbar_Tex_000EC8" OutName="tex_000EC8" Format="ia8" Width="16" Height="16" Offset="0xEC8" />
-        <DList Name="object_milkbar_DL_0010D0" Offset="0x10D0" /> <!-- Original name is "z2_milk_bar_light_4_modelT" -->
-        <DList Name="object_milkbar_DL_001210" Offset="0x1210" />
-        <Texture Name="object_milkbar_Tex_001218" OutName="tex_001218" Format="ia16" Width="16" Height="16" Offset="0x1218" />
-        <Texture Name="object_milkbar_Tex_001418" OutName="tex_001418" Format="ia8" Width="16" Height="16" Offset="0x1418" />
-        <DList Name="object_milkbar_DL_0015E0" Offset="0x15E0" /> <!-- Original name is "z2_milk_bar_light_5_modelT" -->
-        <DList Name="object_milkbar_DL_0016B8" Offset="0x16B8" />
-        <Texture Name="object_milkbar_Tex_0016C0" OutName="tex_0016C0" Format="ia16" Width="16" Height="16" Offset="0x16C0" />
-        <Texture Name="object_milkbar_Tex_0018C0" OutName="tex_0018C0" Format="ia8" Width="16" Height="16" Offset="0x18C0" />
-        <DList Name="object_milkbar_DL_002BA0" Offset="0x2BA0" /> <!-- Not present in MM3D, but it was probably named "z2_milk_bar_stage_1_modelT" based on the rest of this object. -->
-        <DList Name="object_milkbar_DL_002CD0" Offset="0x2CD0" /> <!-- Original name is "z2_milk_bar_stage_1_model" -->
-        <Texture Name="object_milkbar_Tex_003320" OutName="tex_003320" Format="i8" Width="64" Height="64" Offset="0x3320" />
-        <Texture Name="object_milkbar_Tex_004320" OutName="tex_004320" Format="i8" Width="32" Height="32" Offset="0x4320" />
-        <Texture Name="object_milkbar_Tex_004720" OutName="tex_004720" Format="ia16" Width="16" Height="32" Offset="0x4720" />
-        <Texture Name="object_milkbar_Tex_004B20" OutName="tex_004B20" Format="i8" Width="32" Height="32" Offset="0x4B20" />
-        <Texture Name="object_milkbar_Tex_004F20" OutName="tex_004F20" Format="ia16" Width="32" Height="32" Offset="0x4F20" />
-        <Texture Name="object_milkbar_Tex_005720" OutName="tex_005720" Format="i8" Width="32" Height="32" Offset="0x5720" />
-        <Texture Name="object_milkbar_Tex_005B20" OutName="tex_005B20" Format="i8" Width="8" Height="8" Offset="0x5B20" />
-        <Texture Name="object_milkbar_Tex_005B60" OutName="tex_005B60" Format="i8" Width="16" Height="32" Offset="0x5B60" />
-        <Texture Name="object_milkbar_Tex_005D60" OutName="tex_005D60" Format="i4" Width="16" Height="32" Offset="0x5D60" />
-        <Texture Name="object_milkbar_Tex_005E60" OutName="tex_005E60" Format="i8" Width="32" Height="32" Offset="0x5E60" />
-        <Texture Name="object_milkbar_Tex_006260" OutName="tex_006260" Format="i4" Width="32" Height="32" Offset="0x6260" />
-        <Collision Name="object_milkbar_Colheader_006688" Offset="0x6688" /> <!-- Original name is "z2_milk_bar_stage_1_bgdatainfo" -->
-        <Mtx Name="object_milkbar_Mtx_0075E0" Offset="0x75E0" />
-        <Mtx Name="object_milkbar_Mtx_007620" Offset="0x7620" />
-        <Mtx Name="object_milkbar_Mtx_007660" Offset="0x7660" />
-        <DList Name="object_milkbar_DL_0076A0" Offset="0x76A0" /> <!-- Original name is "z2_milk_bar_stage_2_modelT" -->
-        <DList Name="object_milkbar_DL_007918" Offset="0x7918" /> <!-- Original name is "z2_milk_bar_stage_2_model" -->
-        <Texture Name="object_milkbar_Tex_007FA0" OutName="tex_007FA0" Format="ia16" Width="64" Height="32" Offset="0x7FA0" />
-        <Texture Name="object_milkbar_Tex_008FA0" OutName="tex_008FA0" Format="rgba16" Width="32" Height="32" Offset="0x8FA0" />
-        <Texture Name="object_milkbar_Tex_0097A0" OutName="tex_0097A0" Format="rgba16" Width="32" Height="32" Offset="0x97A0" />
-        <Texture Name="object_milkbar_Tex_009FA0" OutName="tex_009FA0" Format="ia16" Width="32" Height="32" Offset="0x9FA0" />
-        <Texture Name="object_milkbar_Tex_00A7A0" OutName="tex_00A7A0" Format="i8" Width="32" Height="32" Offset="0xA7A0" />
-        <Texture Name="object_milkbar_Tex_00ABA0" OutName="tex_00ABA0" Format="ia16" Width="32" Height="32" Offset="0xABA0" />
-        <Texture Name="object_milkbar_Tex_00B3A0" OutName="tex_00B3A0" Format="ia8" Width="32" Height="128" Offset="0xB3A0" />
-        <Texture Name="object_milkbar_Tex_00C3A0" OutName="tex_00C3A0" Format="ia8" Width="64" Height="64" Offset="0xC3A0" />
-        <Texture Name="object_milkbar_Tex_00D3A0" OutName="tex_00D3A0" Format="ia16" Width="64" Height="32" Offset="0xD3A0" />
-        <Texture Name="object_milkbar_Tex_00E3A0" OutName="tex_00E3A0" Format="i8" Width="8" Height="8" Offset="0xE3A0" />
-        <Texture Name="object_milkbar_TLUT_00E3E0" OutName="tlut_00E3E0" Format="rgba16" Width="16" Height="16" Offset="0xE3E0" />
-        <Texture Name="object_milkbar_Tex_00E5E0" OutName="tex_00E5E0" Format="rgba16" Width="32" Height="32" Offset="0xE5E0" />
-        <Texture Name="object_milkbar_Tex_00EDE0" OutName="tex_00EDE0" Format="ci8" Width="32" Height="32" Offset="0xEDE0" />
-        <Texture Name="object_milkbar_Tex_00F1E0" OutName="tex_00F1E0" Format="ia16" Width="32" Height="32" Offset="0xF1E0" />
-        <Texture Name="object_milkbar_Tex_00F9E0" OutName="tex_00F9E0" Format="i4" Width="64" Height="64" Offset="0xF9E0" />
-        <Texture Name="object_milkbar_Tex_0101E0" OutName="tex_0101E0" Format="i8" Width="32" Height="32" Offset="0x101E0" />
-        <TextureAnimation Name="object_milkbar_Matanimheader_0105F8" Offset="0x105F8" />
-        <DList Name="object_milkbar_DL_010D60" Offset="0x10D60" />
-        <DList Name="object_milkbar_DL_010D68" Offset="0x10D68" />
-        <Texture Name="object_milkbar_Tex_0110A8" OutName="tex_0110A8" Format="i8" Width="32" Height="32" Offset="0x110A8" />
-        <Texture Name="object_milkbar_Tex_0114A8" OutName="tex_0114A8" Format="ia16" Width="16" Height="32" Offset="0x114A8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mir_ray.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mir_ray.xml
deleted file mode 100644
index c0b1cf6f2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mir_ray.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_mir_ray" Segment="6">
-        <DList Name="object_mir_ray_DL_000160" Offset="0x160" />
-        <DList Name="object_mir_ray_DL_000168" Offset="0x168" /> <!-- Original name is "cl_sMLightSyl_model" -->
-        <Texture Name="object_mir_ray_Tex_000270" OutName="tex_000270" Format="i4" Width="16" Height="16" Offset="0x270" />
-        <Texture Name="object_mir_ray_Tex_0002F0" OutName="tex_0002F0" Format="i4" Width="16" Height="32" Offset="0x2F0" />
-        <TextureAnimation Name="object_mir_ray_Matanimheader_0003F8" Offset="0x3F8" />
-        <DList Name="object_mir_ray_DL_0004B0" Offset="0x4B0" />
-        <DList Name="object_mir_ray_DL_000550" Offset="0x550" />
-        <Texture Name="object_mir_ray_Tex_000558" OutName="tex_000558" Format="i8" Width="32" Height="64" Offset="0x558" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mk.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mk.xml
deleted file mode 100644
index 0db6c703d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mk.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<Root>
-    <!-- Assets for the Marine Researcher -->
-    <File Name="object_mk" Segment="6">
-        <Animation Name="gMarineResearcherHeadWaggleAnim" Offset="0x438" /> <!-- Original name is "lake_dameja" -->
-        <Animation Name="gMarineResearcherYellAnim" Offset="0x7D8" /> <!-- Original name is "lake_isogunoja" -->
-        <Animation Name="gMarineResearcherShakeInFearAnim" Offset="0x10F4" /> <!-- Original name is "lake_sorewa" -->
-        <Animation Name="gMarineResearcherStrokeChinAnim" Offset="0x1964" /> <!-- Original name is "lake_u_m" -->
-        <Animation Name="gMarineResearcherIdleAnim" Offset="0x1C38" /> <!-- Original name is "mk_matsu" -->
-        <DList Name="gMarineResearcherMidTorsoDL" Offset="0x4320" />
-        <DList Name="gMarineResearcherUpperTorsoDL" Offset="0x4610" />
-        <DList Name="gMarineResearcherNeckDL" Offset="0x4960" />
-        <DList Name="gMarineResearcherHeadDL" Offset="0x4A78" />
-        <DList Name="gMarineResearcherMouthDL" Offset="0x5180" />
-        <DList Name="gMarineResearcherRightShoulderDL" Offset="0x5500" />
-        <DList Name="gMarineResearcherRightArmDL" Offset="0x5630" />
-        <DList Name="gMarineResearcherRightHandDL" Offset="0x5760" />
-        <DList Name="gMarineResearcherLeftShoulderDL" Offset="0x58B0" />
-        <DList Name="gMarineResearcherLeftArmDL" Offset="0x59E0" />
-        <DList Name="gMarineResearcherLeftHandDL" Offset="0x5B10" />
-        <DList Name="gMarineResearcherLowerTorsoDL" Offset="0x5C60" />
-        <Texture Name="gMarineResearcherTLUT" OutName="marine_researcher_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5DE0" />
-        <Texture Name="gMarineResearcherChestSkinTex" OutName="marine_researcher_chest_skin" Format="ci8" Width="8" Height="8" Offset="0x5FE0" />
-        <Texture Name="gMarineResearcherMouthTex" OutName="marine_researcher_mouth" Format="ci8" Width="16" Height="16" Offset="0x6020" />
-        <Texture Name="gMarineResearcherLipsTex" OutName="marine_researcher_lips" Format="ci8" Width="8" Height="8" Offset="0x6120" />
-        <Texture Name="gMarineResearcherJacketTex" OutName="marine_researcher_jacket" Format="ci8" Width="8" Height="8" Offset="0x6160" />
-        <Texture Name="gMarineResearcherHairTex" OutName="marine_researcher_hair" Format="ci8" Width="8" Height="16" Offset="0x61A0" />
-        <Texture Name="gMarineResearcherEyeTex" OutName="marine_researcher_eye" Format="rgba16" Width="32" Height="32" Offset="0x6220" />
-        <Texture Name="gMarineResearcherNostrilTex" OutName="marine_researcher_nostril" Format="ci8" Width="8" Height="8" Offset="0x6A20" />
-        <Texture Name="gMarineResearcherEarTex" OutName="marine_researcher_ear" Format="ci8" Width="8" Height="8" Offset="0x6A60" />
-        <Texture Name="gMarineResearcherShirtTex" OutName="marine_researcher_shirt" Format="ci8" Width="8" Height="8" Offset="0x6AA0" />
-        <Texture Name="gMarineResearcherFingersTex" OutName="marine_researcher_fingers" Format="ci8" Width="16" Height="16" Offset="0x6AE0" />
-        <Limb Name="gMarineResearcherLowerTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LOWER_TORSO" Offset="0x6BE0" />
-        <Limb Name="gMarineResearcherMidTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_MID_TORSO" Offset="0x6BEC" />
-        <Limb Name="gMarineResearcherLeftShoulderLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LEFT_SHOULDER" Offset="0x6BF8" />
-        <Limb Name="gMarineResearcherLeftArmLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LEFT_ARM" Offset="0x6C04" />
-        <Limb Name="gMarineResearcherLeftHandLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LEFT_HAND" Offset="0x6C10" />
-        <Limb Name="gMarineResearcherRightShoulderLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_RIGHT_SHOULDER" Offset="0x6C1C" />
-        <Limb Name="gMarineResearcherRightArmLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_RIGHT_ARM" Offset="0x6C28" />
-        <Limb Name="gMarineResearcherRightHandLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_RIGHT_HAND" Offset="0x6C34" />
-        <Limb Name="gMarineResearcherUpperTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_UPPER_TORSO" Offset="0x6C40" />
-        <Limb Name="gMarineResearcherNeckLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_NECK" Offset="0x6C4C" />
-        <Limb Name="gMarineResearcherHeadLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_HEAD" Offset="0x6C58" />
-        <Limb Name="gMarineResearcherMouthLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_MOUTH" Offset="0x6C64" />
-        <Skeleton Name="gMarineResearcherSkel" Type="Flex" LimbType="Standard" LimbNone="MARINE_RESEARCHER_LIMB_NONE" LimbMax="MARINE_RESEARCHER_LIMB_MAX" EnumName="MarineResearcherLimb" Offset="0x6CA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mkk.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mkk.xml
deleted file mode 100644
index 445d26f0d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mkk.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Object for Black and White Boes -->
-    <File Name="object_mkk" Segment="6">
-        <DList Name="gBlackBoeBodyMaterialDL" Offset="0x30" />
-        <DList Name="gBlackBoeBodyModelDL" Offset="0xB0" />
-        <DList Name="gBlackBoeEndDL" Offset="0xC8" />
-        <DList Name="gBlackBoeEyesDL" Offset="0x140" />
-        <DList Name="gWhiteBoeBodyMaterialDL" Offset="0x1F0" />
-        <DList Name="gWhiteBoeBodyModelDL" Offset="0x278" />
-        <DList Name="gWhiteBoeEndDL" Offset="0x290" />
-        <DList Name="gWhiteBoeEyesDL" Offset="0x310" />
-        <Texture Name="gBlackBoeTex" OutName="black_boe" Format="i4" Width="16" Height="16" Offset="0x390" />
-        <Texture Name="gWhiteBoeTex" OutName="white_boe" Format="i4" Width="16" Height="16" Offset="0x410" />
-        <Texture Name="gBoeEyeTex" OutName="boe_eye" Format="rgba16" Width="8" Height="8" Offset="0x490" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mm.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mm.xml
deleted file mode 100644
index b7b727d4e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<Root>
-    <File Name="object_mm" Segment="6">
-        <Animation Name="object_mm_Anim_000468" Offset="0x468" /> <!-- Original name is "hasiruu" -->
-        <Animation Name="object_mm_Anim_00099C" Offset="0x99C" /> <!-- Original name is "mm_kunou" -->
-        <Animation Name="object_mm_Anim_000FC4" Offset="0xFC4" /> <!-- Original name is "mm_neru" -->
-        <Animation Name="object_mm_Anim_001F84" Offset="0x1F84" /> <!-- Original name is "mm_postcheck" -->
-        <Animation Name="object_mm_Anim_002238" Offset="0x2238" /> <!-- Original name is "mm_run01" -->
-        <Texture Name="object_mm_TLUT_002250" OutName="tlut_002250" Format="rgba16" Width="16" Height="16" Offset="0x2250" />
-        <Texture Name="object_mm_Tex_002450" OutName="tex_002450" Format="ci8" Width="8" Height="8" Offset="0x2450" />
-        <Texture Name="object_mm_Tex_002490" OutName="tex_002490" Format="ci8" Width="8" Height="8" Offset="0x2490" />
-        <Texture Name="object_mm_Tex_0024D0" OutName="tex_0024D0" Format="ci8" Width="8" Height="8" Offset="0x24D0" />
-        <Texture Name="object_mm_Tex_002510" OutName="tex_002510" Format="ci8" Width="8" Height="8" Offset="0x2510" />
-        <Texture Name="object_mm_Tex_002550" OutName="tex_002550" Format="ci8" Width="16" Height="16" Offset="0x2550" />
-        <Texture Name="object_mm_Tex_002650" OutName="tex_002650" Format="ci8" Width="16" Height="16" Offset="0x2650" />
-        <Texture Name="object_mm_Tex_002750" OutName="tex_002750" Format="ci8" Width="32" Height="16" Offset="0x2750" />
-        <Texture Name="object_mm_Tex_002950" OutName="tex_002950" Format="ci8" Width="32" Height="16" Offset="0x2950" />
-        <Texture Name="object_mm_Tex_002B50" OutName="tex_002B50" Format="ci8" Width="16" Height="16" Offset="0x2B50" />
-        <Texture Name="object_mm_Tex_002C50" OutName="tex_002C50" Format="ci8" Width="32" Height="16" Offset="0x2C50" />
-        <Texture Name="object_mm_Tex_002E50" OutName="tex_002E50" Format="ci8" Width="16" Height="16" Offset="0x2E50" />
-        <DList Name="object_mm_DL_005B30" Offset="0x5B30" />
-        <DList Name="object_mm_DL_005E70" Offset="0x5E70" />
-        <DList Name="object_mm_DL_006598" Offset="0x6598" />
-        <DList Name="object_mm_DL_0066D0" Offset="0x66D0" />
-        <DList Name="object_mm_DL_006808" Offset="0x6808" />
-        <DList Name="object_mm_DL_006A10" Offset="0x6A10" />
-        <DList Name="object_mm_DL_006B48" Offset="0x6B48" />
-        <DList Name="object_mm_DL_006C80" Offset="0x6C80" />
-        <DList Name="object_mm_DL_006E88" Offset="0x6E88" />
-        <DList Name="object_mm_DL_006F20" Offset="0x6F20" />
-        <DList Name="object_mm_DL_007188" Offset="0x7188" />
-        <DList Name="object_mm_DL_0072F8" Offset="0x72F8" />
-        <DList Name="object_mm_DL_007430" Offset="0x7430" />
-        <DList Name="object_mm_DL_007610" Offset="0x7610" />
-        <DList Name="object_mm_DL_007780" Offset="0x7780" />
-        <DList Name="object_mm_DL_008348" Offset="0x8348" /> <!-- Original name is "mm_letter_model" -->
-        <DList Name="object_mm_DL_0083E0" Offset="0x83E0" /> <!-- Original name is "mm_bag_model" -->
-        <DList Name="object_mm_DL_0085C8" Offset="0x85C8" /> <!-- Original name is "mm_cap_model" -->
-        <Texture Name="object_mm_Tex_008778" OutName="tex_008778" Format="rgba16" Width="8" Height="8" Offset="0x8778" />
-        <Texture Name="object_mm_Tex_0087F8" OutName="tex_0087F8" Format="rgba16" Width="16" Height="16" Offset="0x87F8" />
-        <Texture Name="object_mm_Tex_0089F8" OutName="tex_0089F8" Format="rgba16" Width="32" Height="32" Offset="0x89F8" />
-        <Texture Name="object_mm_Tex_0091F8" OutName="tex_0091F8" Format="i8" Width="32" Height="32" Offset="0x91F8" />
-        <Limb Name="object_mm_Standardlimb_0095F8" Type="Standard" EnumName="OBJECT_MM_LIMB_01" Offset="0x95F8" />
-        <Limb Name="object_mm_Standardlimb_009604" Type="Standard" EnumName="OBJECT_MM_LIMB_02" Offset="0x9604" />
-        <Limb Name="object_mm_Standardlimb_009610" Type="Standard" EnumName="OBJECT_MM_LIMB_03" Offset="0x9610" />
-        <Limb Name="object_mm_Standardlimb_00961C" Type="Standard" EnumName="OBJECT_MM_LIMB_04" Offset="0x961C" />
-        <Limb Name="object_mm_Standardlimb_009628" Type="Standard" EnumName="OBJECT_MM_LIMB_05" Offset="0x9628" />
-        <Limb Name="object_mm_Standardlimb_009634" Type="Standard" EnumName="OBJECT_MM_LIMB_06" Offset="0x9634" />
-        <Limb Name="object_mm_Standardlimb_009640" Type="Standard" EnumName="OBJECT_MM_LIMB_07" Offset="0x9640" />
-        <Limb Name="object_mm_Standardlimb_00964C" Type="Standard" EnumName="OBJECT_MM_LIMB_08" Offset="0x964C" />
-        <Limb Name="object_mm_Standardlimb_009658" Type="Standard" EnumName="OBJECT_MM_LIMB_09" Offset="0x9658" />
-        <Limb Name="object_mm_Standardlimb_009664" Type="Standard" EnumName="OBJECT_MM_LIMB_0A" Offset="0x9664" />
-        <Limb Name="object_mm_Standardlimb_009670" Type="Standard" EnumName="OBJECT_MM_LIMB_0B" Offset="0x9670" />
-        <Limb Name="object_mm_Standardlimb_00967C" Type="Standard" EnumName="OBJECT_MM_LIMB_0C" Offset="0x967C" />
-        <Limb Name="object_mm_Standardlimb_009688" Type="Standard" EnumName="OBJECT_MM_LIMB_0D" Offset="0x9688" />
-        <Limb Name="object_mm_Standardlimb_009694" Type="Standard" EnumName="OBJECT_MM_LIMB_0E" Offset="0x9694" />
-        <Limb Name="object_mm_Standardlimb_0096A0" Type="Standard" EnumName="OBJECT_MM_LIMB_0F" Offset="0x96A0" />
-        <Skeleton Name="object_mm_Skel_0096E8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MM_LIMB_NONE" LimbMax="OBJECT_MM_LIMB_MAX" EnumName="ObjectMmLimb" Offset="0x96E8" />
-        <Animation Name="object_mm_Anim_0099B4" Offset="0x99B4" /> <!-- Original name is "mm_runwait" -->
-        <Animation Name="object_mm_Anim_00A4E0" Offset="0xA4E0" /> <!-- Original name is "mm_tatsu" -->
-        <Animation Name="object_mm_Anim_00A8D8" Offset="0xA8D8" /> <!-- Original name is "mm_uzukumaru" -->
-        <Animation Name="object_mm_Anim_00B09C" Offset="0xB09C" /> <!-- Original name is "mm_wait01" -->
-        <Animation Name="object_mm_Anim_00BA78" Offset="0xBA78" /> <!-- Original name is "mm_watasu" -->
-        <Animation Name="object_mm_Anim_00C32C" Offset="0xC32C" /> <!-- Original name is "mm_watasuwait" -->
-        <Animation Name="object_mm_Anim_00C640" Offset="0xC640" /> <!-- Original name is "mm_yoru" -->
-        <Animation Name="object_mm_Anim_00CD90" Offset="0xCD90" /> <!-- Original name is "uttekure" -->
-        <Animation Name="object_mm_Anim_00DA50" Offset="0xDA50" /> <!-- Original name is "yorokobi_long" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mnk.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mnk.xml
deleted file mode 100644
index 794069ee7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mnk.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<Root>
-    <File Name="object_mnk" Segment="6">
-        <DList Name="object_mnk_DL_000F50" Offset="0xF50" />
-        <DList Name="object_mnk_DL_000F58" Offset="0xF58" /> <!-- Original name is "z2_25_tubo_model" -->
-        <Texture Name="object_mnk_TLUT_001620" OutName="tlut_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" />
-        <Texture Name="object_mnk_Tex_001820" OutName="tex_001820" Format="ci8" Width="16" Height="64" Offset="0x1820" />
-        <Texture Name="object_mnk_Tex_001C20" OutName="tex_001C20" Format="ci8" Width="16" Height="16" Offset="0x1C20" />
-        <Texture Name="object_mnk_Tex_001D20" OutName="tex_001D20" Format="ci8" Width="16" Height="16" Offset="0x1D20" />
-        <Texture Name="object_mnk_Tex_001E20" OutName="tex_001E20" Format="ci8" Width="16" Height="128" Offset="0x1E20" />
-        <Texture Name="object_mnk_Tex_002620" OutName="tex_002620" Format="rgba16" Width="32" Height="32" Offset="0x2620" />
-        <TextureAnimation Name="object_mnk_Matanimheader_002E28" Offset="0x2E28" />
-        <Collision Name="object_mnk_Colheader_0033E8" Offset="0x33E8" /> <!-- Original name is "z2_25_tubo_bgdatainfo" -->
-        <Animation Name="object_mnk_Anim_003504" Offset="0x3504" /> <!-- Original name is "mnk_hashira_hatena" -->
-        <Animation Name="object_mnk_Anim_003584" Offset="0x3584" /> <!-- Original name is "mnk_hashira_mogaku" -->
-        <Animation Name="object_mnk_Anim_0037E8" Offset="0x37E8" /> <!-- Original name is "mnk_hashira_sadtalk" -->
-        <Animation Name="object_mnk_Anim_003854" Offset="0x3854" /> <!-- Original name is "mnk_hashira_sing" -->
-        <DList Name="object_mnk_DL_003C70" Offset="0x3C70" />
-        <DList Name="object_mnk_DL_003D40" Offset="0x3D40" />
-        <DList Name="object_mnk_DL_003DF8" Offset="0x3DF8" />
-        <Texture Name="object_mnk_Tex_003F10" OutName="tex_003F10" Format="rgba16" Width="16" Height="128" Offset="0x3F10" />
-        <Texture Name="object_mnk_Tex_004F10" OutName="tex_004F10" Format="rgba16" Width="16" Height="16" Offset="0x4F10" />
-        <Limb Name="object_mnk_Standardlimb_005110" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_01" Offset="0x5110" />
-        <Limb Name="object_mnk_Standardlimb_00511C" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_02" Offset="0x511C" />
-        <Limb Name="object_mnk_Standardlimb_005128" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_03" Offset="0x5128" />
-        <Limb Name="object_mnk_Standardlimb_005134" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_04" Offset="0x5134" />
-        <Skeleton Name="gMonkeyTiedUpPoleSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_1_LIMB_NONE" LimbMax="OBJECT_MNK_1_LIMB_MAX" EnumName="ObjectMnk1Limb" Offset="0x5150" />
-        <Animation Name="object_mnk_Anim_005194" Offset="0x5194" /> <!-- Original name is "mnk_hashira_swing" -->
-        <Animation Name="object_mnk_Anim_0052C4" Offset="0x52C4" /> <!-- Original name is "mnk_hashira_tiedNO" -->
-        <Animation Name="object_mnk_Anim_005390" Offset="0x5390" /> <!-- Original name is "mnk_hashira_tiedtalk" -->
-        <Animation Name="object_mnk_Anim_005414" Offset="0x5414" /> <!-- Original name is "mnk_hashira_tiedtalkroud" -->
-        <Animation Name="object_mnk_Anim_0054B4" Offset="0x54B4" /> <!-- Original name is "mnk_hashira_tiedwait" -->
-        <Animation Name="object_mnk_Anim_005A08" Offset="0x5A08" /> <!-- Original name is "mnk_chuugaeri" -->
-        <Animation Name="object_mnk_Anim_0062D8" Offset="0x62D8" /> <!-- Original name is "mnk_hang_guttari" -->
-        <Animation Name="object_mnk_Anim_007380" Offset="0x7380" /> <!-- Original name is "mnk_hang_hikiage" -->
-        <Animation Name="gMonkeyHangingStruggleAnim" Offset="0x82C8" /> <!-- Original name is "mnk_hang_mogaku" -->
-        <Animation Name="object_mnk_Anim_008814" Offset="0x8814" /> <!-- Original name is "mnk_highjump" -->
-        <Animation Name="object_mnk_Anim_0095B4" Offset="0x95B4" /> <!-- Original name is "mnk_hitting" -->
-        <Animation Name="object_mnk_Anim_0099B0" Offset="0x99B0" /> <!-- Original name is "mnk_hop" -->
-        <Animation Name="object_mnk_Anim_009CC0" Offset="0x9CC0" /> <!-- Original name is "mnk_minijump" -->
-        <Animation Name="object_mnk_Anim_009FE0" Offset="0x9FE0" /> <!-- Original name is "mnk_run" -->
-        <Animation Name="object_mnk_Anim_00B864" Offset="0xB864" /> <!-- Original name is "mnk_scratch" -->
-        <Animation Name="object_mnk_Anim_00C23C" Offset="0xC23C" /> <!-- Original name is "mnk_tied_NO" -->
-        <Animation Name="object_mnk_Anim_00CAE8" Offset="0xCAE8" /> <!-- Original name is "mnk_tied_hatena" -->
-        <Animation Name="object_mnk_Anim_00CD4C" Offset="0xCD4C" /> <!-- Original name is "mnk_tied_legswing" -->
-        <Animation Name="object_mnk_Anim_00D1C8" Offset="0xD1C8" /> <!-- Original name is "mnk_tied_mogaku" -->
-        <Animation Name="object_mnk_Anim_00EC44" Offset="0xEC44" /> <!-- Original name is "mnk_tied_sadtalk" -->
-        <Animation Name="object_mnk_Anim_00F248" Offset="0xF248" /> <!-- Original name is "mnk_tied_sing" -->
-        <Animation Name="object_mnk_Anim_00F9A4" Offset="0xF9A4" /> <!-- Original name is "mnk_tied_talk" -->
-        <Animation Name="object_mnk_Anim_00FE34" Offset="0xFE34" /> <!-- Original name is "mnk_tied_talkroud" -->
-        <Animation Name="object_mnk_Anim_010298" Offset="0x10298" /> <!-- Original name is "mnk_tied_wait" -->
-        <Animation Name="object_mnk_Anim_0105DC" Offset="0x105DC" /> <!-- Original name is "mnk_wait"-->
-        <DList Name="object_mnk_DL_012770" Offset="0x12770" />
-        <DList Name="object_mnk_DL_012918" Offset="0x12918" />
-        <DList Name="object_mnk_DL_0129D0" Offset="0x129D0" />
-        <DList Name="object_mnk_DL_012A60" Offset="0x12A60" />
-        <DList Name="object_mnk_DL_012C10" Offset="0x12C10" />
-        <DList Name="object_mnk_DL_012E60" Offset="0x12E60" />
-        <DList Name="object_mnk_DL_012F48" Offset="0x12F48" />
-        <DList Name="object_mnk_DL_0132A8" Offset="0x132A8" />
-        <DList Name="object_mnk_DL_013430" Offset="0x13430" />
-        <DList Name="object_mnk_DL_013550" Offset="0x13550" />
-        <DList Name="object_mnk_DL_013660" Offset="0x13660" />
-        <DList Name="object_mnk_DL_013818" Offset="0x13818" />
-        <DList Name="object_mnk_DL_013938" Offset="0x13938" />
-        <DList Name="object_mnk_DL_013A48" Offset="0x13A48" />
-        <DList Name="object_mnk_DL_013C00" Offset="0x13C00" />
-        <DList Name="object_mnk_DL_013E80" Offset="0x13E80" />
-        <DList Name="object_mnk_DL_014080" Offset="0x14080" />
-        <DList Name="object_mnk_DL_014310" Offset="0x14310" />
-        <DList Name="object_mnk_DL_014590" Offset="0x14590" />
-        <DList Name="object_mnk_DL_014790" Offset="0x14790" />
-        <Texture Name="object_mnk_TLUT_014A20" OutName="tlut_014A20" Format="rgba16" Width="16" Height="16" Offset="0x14A20" />
-        <Texture Name="object_mnk_Tex_014C20" OutName="tex_014C20" Format="ci8" Width="32" Height="32" Offset="0x14C20" />
-        <Texture Name="object_mnk_Tex_015020" OutName="tex_015020" Format="ci8" Width="32" Height="64" Offset="0x15020" />
-        <Texture Name="object_mnk_Tex_015820" OutName="tex_015820" Format="ci8" Width="16" Height="16" Offset="0x15820" />
-        <Texture Name="object_mnk_Tex_015920" OutName="tex_015920" Format="ci8" Width="32" Height="64" Offset="0x15920" />
-        <Texture Name="object_mnk_Tex_016120" OutName="tex_016120" Format="ci8" Width="32" Height="64" Offset="0x16120" />
-        <Texture Name="object_mnk_Tex_016920" OutName="tex_016920" Format="ci8" Width="32" Height="64" Offset="0x16920" />
-        <Texture Name="object_mnk_Tex_017120" OutName="tex_017120" Format="ci8" Width="32" Height="64" Offset="0x17120" />
-        <Texture Name="object_mnk_Tex_017920" OutName="tex_017920" Format="ci8" Width="32" Height="64" Offset="0x17920" />
-        <Texture Name="object_mnk_Tex_018120" OutName="tex_018120" Format="ci8" Width="32" Height="64" Offset="0x18120" />
-        <Texture Name="object_mnk_Tex_018920" OutName="tex_018920" Format="ci8" Width="16" Height="16" Offset="0x18920" />
-        <Texture Name="object_mnk_Tex_018A20" OutName="tex_018A20" Format="ci8" Width="32" Height="32" Offset="0x18A20" />
-        <Texture Name="object_mnk_Tex_018E20" OutName="tex_018E20" Format="ci8" Width="16" Height="16" Offset="0x18E20" />
-        <Texture Name="object_mnk_Tex_018F20" OutName="tex_018F20" Format="rgba16" Width="32" Height="32" Offset="0x18F20" />
-        <Texture Name="object_mnk_Tex_019720" OutName="tex_019720" Format="ci8" Width="16" Height="16" Offset="0x19720" />
-        <Texture Name="object_mnk_Tex_019820" OutName="tex_019820" Format="ci8" Width="16" Height="16" Offset="0x19820" />
-        <Texture Name="object_mnk_Tex_019920" OutName="tex_019920" Format="ci8" Width="16" Height="16" Offset="0x19920" />
-        <!-- <Blob Name="object_mnk_Blob_019A20" Size="0x8" Offset="0x19A20" /> -->
-        <Limb Name="object_mnk_Standardlimb_019A28" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_01" Offset="0x19A28" />
-        <Limb Name="object_mnk_Standardlimb_019A34" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_02" Offset="0x19A34" />
-        <Limb Name="object_mnk_Standardlimb_019A40" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_03" Offset="0x19A40" />
-        <Limb Name="object_mnk_Standardlimb_019A4C" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_04" Offset="0x19A4C" />
-        <Limb Name="object_mnk_Standardlimb_019A58" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_05" Offset="0x19A58" />
-        <Limb Name="object_mnk_Standardlimb_019A64" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_06" Offset="0x19A64" />
-        <Limb Name="object_mnk_Standardlimb_019A70" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_07" Offset="0x19A70" />
-        <Limb Name="object_mnk_Standardlimb_019A7C" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_08" Offset="0x19A7C" />
-        <Limb Name="object_mnk_Standardlimb_019A88" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_09" Offset="0x19A88" />
-        <Limb Name="object_mnk_Standardlimb_019A94" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0A" Offset="0x19A94" />
-        <Limb Name="object_mnk_Standardlimb_019AA0" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0B" Offset="0x19AA0" />
-        <Limb Name="object_mnk_Standardlimb_019AAC" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0C" Offset="0x19AAC" />
-        <Limb Name="object_mnk_Standardlimb_019AB8" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0D" Offset="0x19AB8" />
-        <Limb Name="object_mnk_Standardlimb_019AC4" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0E" Offset="0x19AC4" />
-        <Limb Name="object_mnk_Standardlimb_019AD0" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0F" Offset="0x19AD0" />
-        <Limb Name="object_mnk_Standardlimb_019ADC" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_10" Offset="0x19ADC" />
-        <Limb Name="object_mnk_Standardlimb_019AE8" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_11" Offset="0x19AE8" />
-        <Limb Name="object_mnk_Standardlimb_019AF4" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_12" Offset="0x19AF4" />
-        <Limb Name="object_mnk_Standardlimb_019B00" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_13" Offset="0x19B00" />
-        <Limb Name="object_mnk_Standardlimb_019B0C" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_14" Offset="0x19B0C" />
-        <Limb Name="object_mnk_Standardlimb_019B18" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_15" Offset="0x19B18" />
-        <Limb Name="object_mnk_Standardlimb_019B24" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_16" Offset="0x19B24" />
-        <Skeleton Name="gMonkeySkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_2_LIMB_NONE" LimbMax="OBJECT_MNK_2_LIMB_MAX" EnumName="ObjectMnk2Limb" Offset="0x19B88" />
-        <Animation Name="object_mnk_Anim_01A4F8" Offset="0x1A4F8" /> <!-- Original name is "mnk_onnikiruze" -->
-        <Animation Name="object_mnk_Anim_01B468" Offset="0x1B468" /> <!-- Original name is "mnk_wakatte" -->
-        <Animation Name="object_mnk_Anim_01BB0C" Offset="0x1BB0C" /> <!-- Original name is "mnk_wakatte_loop" -->
-        <Animation Name="object_mnk_Anim_01C17C" Offset="0x1C17C" /> <!-- Original name is "mnk_wakatte_modori" -->
-        <Animation Name="object_mnk_Anim_01C1B8" Offset="0x1C1B8" /> <!-- Original name is "mnk_rope_guttari" -->
-        <Animation Name="object_mnk_Anim_01C1F8" Offset="0x1C1F8" /> <!-- Original name is "mnk_rope_hikiage" -->
-        <Animation Name="gMonkeyHangingRopeStruggleAnim" Offset="0x1C3B4" /> <!-- Original name is "mnk_rope_mogaku_mdl" -->
-        <DList Name="object_mnk_DL_01C660" Offset="0x1C660" />
-        <DList Name="object_mnk_DL_01C770" Offset="0x1C770" />
-        <DList Name="object_mnk_DL_01C818" Offset="0x1C818" />
-        <Texture Name="object_mnk_Tex_01C8E8" OutName="tex_01C8E8" Format="rgba16" Width="16" Height="16" Offset="0x1C8E8" />
-        <Texture Name="object_mnk_Tex_01CAE8" OutName="tex_01CAE8" Format="rgba16" Width="32" Height="32" Offset="0x1CAE8" />
-        <Texture Name="object_mnk_Tex_01D2E8" OutName="tex_01D2E8" Format="rgba16" Width="16" Height="16" Offset="0x1D2E8" />
-        <Limb Name="object_mnk_Standardlimb_01D4E8" Type="Standard" EnumName="OBJECT_MNK_3_LIMB_01" Offset="0x1D4E8" />
-        <Limb Name="object_mnk_Standardlimb_01D4F4" Type="Standard" EnumName="OBJECT_MNK_3_LIMB_02" Offset="0x1D4F4" />
-        <Limb Name="object_mnk_Standardlimb_01D500" Type="Standard" EnumName="OBJECT_MNK_3_LIMB_03" Offset="0x1D500" />
-        <Skeleton Name="gMonkeyHangingRopeSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_3_LIMB_NONE" LimbMax="OBJECT_MNK_3_LIMB_MAX" EnumName="ObjectMnk3Limb" Offset="0x1D518" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_moonend.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_moonend.xml
deleted file mode 100644
index de643308b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_moonend.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<Root>
-    <File Name="object_moonend" Segment="6">
-        <!--<Blob Name="object_moonend_Blob_000000" Size="0x1214" Offset="0x0" />
-        <Blob Name="object_moonend_Blob_001214" Size="0x1C" Offset="0x1214" />-->
-        <KeyFrameAnimation Name="gMoonendKFAnim_1214" Skel="0xB5A0" Offset="0x1214"/>
-        <DList Name="object_moonend_DL_0055F0" Offset="0x55F0" />
-        <DList Name="object_moonend_DL_0061F8" Offset="0x61F8" />
-        <DList Name="object_moonend_DL_006460" Offset="0x6460" />
-        <DList Name="object_moonend_DL_006588" Offset="0x6588" />
-        <DList Name="object_moonend_DL_0066B0" Offset="0x66B0" />
-        <DList Name="object_moonend_DL_0067D8" Offset="0x67D8" />
-        <DList Name="object_moonend_DL_006900" Offset="0x6900" />
-        <DList Name="object_moonend_DL_006A28" Offset="0x6A28" />
-        <DList Name="object_moonend_DL_006B50" Offset="0x6B50" />
-        <Texture Name="object_moonend_TLUT_006CF0" OutName="tlut_006CF0" Format="rgba16" Width="4" Height="4" Offset="0x6CF0" />
-        <Texture Name="object_moonend_TLUT_006D10" OutName="tlut_006D10" Format="rgba16" Width="4" Height="4" Offset="0x6D10" />
-        <Texture Name="object_moonend_Tex_006D30" OutName="tex_006D30" Format="rgba16" Width="32" Height="32" Offset="0x6D30" />
-        <Texture Name="object_moonend_Tex_007530" OutName="tex_007530" Format="rgba16" Width="64" Height="32" Offset="0x7530" />
-        <Texture Name="object_moonend_Tex_008530" OutName="tex_008530" Format="ci4" Width="64" Height="64" Offset="0x8530" />
-        <Texture Name="object_moonend_Tex_008D30" OutName="tex_008D30" Format="ci4" Width="64" Height="64" Offset="0x8D30" />
-        <Texture Name="object_moonend_Tex_009530" OutName="tex_009530" Format="i8" Width="64" Height="64" Offset="0x9530" />
-        <Texture Name="object_moonend_Tex_00A530" OutName="tex_00A530" Format="i8" Width="64" Height="64" Offset="0xA530" />
-        <TextureAnimation Name="object_moonend_Matanimheader_00B540" Offset="0xB540" />
-
-        <KeyFrameSkel Name="gMoonendKFSkel_B5A0" LimbType="Flex" Offset="0xB5A0"/>
-
-        <!--<Blob Name="object_moonend_Blob_00B550" Size="0x50" Offset="0xB550" />
-        <Blob Name="object_moonend_Blob_00B5A0" Size="0x170" Offset="0xB5A0" />-->
-
-        <DList Name="object_moonend_DL_00CCF0" Offset="0xCCF0" />
-        <DList Name="object_moonend_DL_00CF58" Offset="0xCF58" />
-        <DList Name="object_moonend_DL_00D080" Offset="0xD080" />
-        <DList Name="object_moonend_DL_00D1A8" Offset="0xD1A8" />
-        <DList Name="object_moonend_DL_00D2D0" Offset="0xD2D0" />
-        <DList Name="object_moonend_DL_00D3F8" Offset="0xD3F8" />
-        <DList Name="object_moonend_DL_00D520" Offset="0xD520" />
-        <Texture Name="object_moonend_Tex_00D648" OutName="tex_00D648" Format="i8" Width="64" Height="64" Offset="0xD648" />
-        <TextureAnimation Name="object_moonend_Matanimheader_00E650" Offset="0xE650" />
-        <!-- <Blob Name="object_moonend_Blob_00E658" Size="0x48" Offset="0xE658" /> -->
-        <DList Name="object_moonend_DL_00EB00" Offset="0xEB00" />
-        <Texture Name="object_moonend_Tex_00EC58" OutName="tex_00EC58" Format="i8" Width="64" Height="64" Offset="0xEC58" />
-        <DList Name="object_moonend_DL_010C40" Offset="0x10C40" /> <!-- Original name is "rainbow_model" -->
-        <Texture Name="object_moonend_Tex_0111E0" OutName="tex_0111E0" Format="i8" Width="64" Height="64" Offset="0x111E0" />
-        <Texture Name="object_moonend_Tex_0121E0" OutName="tex_0121E0" Format="i8" Width="32" Height="64" Offset="0x121E0" />
-        <TextureAnimation Name="object_moonend_Matanimheader_0129F0" Offset="0x129F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_moonston.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_moonston.xml
deleted file mode 100644
index 2945469f2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_moonston.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!--
-        The Moon's Tear that can be seen falling from the telescope,
-        along with its associated fire trail.
-    -->
-    <File Name="object_moonston" Segment="6">
-        <DList Name="gFallingMoonsTearDL" Offset="0x400" /> <!-- Original name is "moon_stone_g1_FT_model" -->
-        <DList Name="gFallingMoonsTearFireDL" Offset="0x4C8" /> <!-- Original name is "moon_stone_g2_FT_model" -->
-        <Texture Name="gFallingMoonsTearTex" OutName="falling_moons_tear" Format="i8" Width="32" Height="32" Offset="0x608" />
-        <Texture Name="gFallingMoonsTearFireTex" OutName="falling_moons_tear_fire" Format="i8" Width="32" Height="64" Offset="0xA08" />
-        <TextureAnimation Name="gFallingMoonsTearTexAnim" Offset="0x1220" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ms.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ms.xml
deleted file mode 100644
index 1b3f86145..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ms.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<Root>
-    <File Name="object_ms" Segment="6">
-        <!-- Bean Salesman Animations -->
-        <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/> <!-- Original name is "ms_matsu" -->
-
-        <!-- Bean Salesman Limb DisplayLists -->
-        <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
-        <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
-        <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
-        <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
-        <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
-        <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
-        <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
-
-        <!-- Bean Salesman Palettes -->
-        <Texture Name="gBeanSalesmanTLUT" OutName="bean_salesman_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
-
-        <!-- Bean Salesman DisplayList Textures -->
-        <Texture Name="gBeanSalesmanBackOfHandTex" OutName="bean_salesman_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanTattooTex" OutName="bean_salesman_tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanMouthTex" OutName="bean_salesman_mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanEarTex" OutName="bean_salesman_ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanNoseTex" OutName="bean_salesman_nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanEyeTex" OutName="bean_salesman_eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanPantsTex" OutName="bean_salesman_pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanShoeTex" OutName="bean_salesman_shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanSkinGradientTex" OutName="bean_salesman_skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanBeanbagTex" OutName="bean_salesman_beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
-
-        <!-- Bean Salesman Limbs -->
-        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_ROOT" Offset="0x3D40"/>
-        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_LEFT_UPPER_ARM" Offset="0x3D4C"/>
-        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_LEFT_FOREARM" Offset="0x3D58"/>
-        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_LEFT_HAND" Offset="0x3D64"/>
-        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_HEAD" Offset="0x3D70"/>
-        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_MOUTH" Offset="0x3D7C"/>
-        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_BODY" Offset="0x3D88"/>
-        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_BEANBAG" Offset="0x3D94"/>
-
-        <!-- Bean Salesman Skeleton -->
-        <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" LimbNone="BEAN_SALESMAN_LIMB_NONE" LimbMax="BEAN_SALESMAN_LIMB_MAX" EnumName="BeanSalesmanLimb" Offset="0x3DC0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_msmo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_msmo.xml
deleted file mode 100644
index 6bfd0e46d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_msmo.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Object for the Moon Mask -->
-    <File Name="object_msmo" Segment="6">
-        <DList Name="gMoonMaskDL" Offset="0xE70" />
-        <Texture Name="gMoonMaskEyeTex" OutName="eye" Format="i8" Width="16" Height="16" Offset="0x1320" />
-        <Texture Name="gMoonMaskPatternTex" OutName="pattern" Format="i8" Width="16" Height="16" Offset="0x1420" />
-        <Texture Name="gMoonMaskSilverTex" OutName="silver" Format="i8" Width="16" Height="16" Offset="0x1520" />
-        <Texture Name="gMoonMaskGoldTex" OutName="gold" Format="i4" Width="16" Height="16" Offset="0x1620" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mtoride.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mtoride.xml
deleted file mode 100644
index af1d2d2ed..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mtoride.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<Root>
-    <!-- Assets for Woodfall scene objects (temple, water, walls, etc.) -->
-    <File Name="object_mtoride" Segment="6">
-        <!-- Textures for the Woodfall scenery. -->
-        <Texture Name="gWoodfallSceneryUnusedTLUT" OutName="woodfall_scenery_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="gWoodfallSceneryBranchAndLeavesTLUT" OutName="woodfall_scenery_branch_and_leaves_tlut" Format="rgba16" Width="4" Height="4" Offset="0x200" />
-        <Texture Name="gWoodfallSceneryTreeRingTex" OutName="woodfall_scenery_tree_ring" Format="rgba16" Width="16" Height="16" Offset="0x220" />
-        <Texture Name="gWoodfallSceneryBranchAndLeavesTex" OutName="woodfall_scenery_branch_and_leaves" Format="ci4" Width="32" Height="128" Offset="0x420" />
-        <Texture Name="gWoodfallSceneryEntranceGradientTex" OutName="woodfall_scenery_entrance_gradient" Format="ia8" Width="32" Height="8" Offset="0xC20" />
-        <Texture Name="gWoodfallSceneryTempleEdgeAndRampAndPlatformTopTex" OutName="woodfall_scenery_temple_edges_and_ramp_and_platform_top" Format="rgba16" Width="32" Height="32" Offset="0xD20" />
-        <Texture Name="gWoodfallSceneryTempleEntranceAndRampSidesTex" OutName="woodfall_scenery_temple_entrance_and_ramp_sides" Format="rgba16" Width="32" Height="64" Offset="0x1520" />
-        <Texture Name="gWoodfallSceneryTempleSidesTex" OutName="woodfall_scenery_temple_sides" Format="rgba16" Width="32" Height="64" Offset="0x2520" />
-        <Texture Name="gWoodfallSceneryTempleFloorAndTopTex" OutName="woodfall_scenery_temple_floor_and_top" Format="rgba16" Width="32" Height="32" Offset="0x3520" />
-        <Texture Name="gWoodfallSceneryTreeBarkTex" OutName="woodfall_scenery_tree_bark" Format="rgba16" Width="32" Height="64" Offset="0x3D20" />
-        <Texture Name="gWoodfallSceneryFaceDesignTex" OutName="woodfall_scenery_face_design" Format="rgba16" Width="32" Height="64" Offset="0x4D20" />
-        <Texture Name="gWoodfallSceneryPoisonWaterTex" OutName="woodfall_scenery_poison_water" Format="rgba16" Width="32" Height="32" Offset="0x5D20" />
-        <Texture Name="gWoodfallSceneryPoisonWallsScrollTex" OutName="woodfall_scenery_poison_walls_scroll" Format="rgba16" Width="32" Height="32" Offset="0x6520" />
-        <Texture Name="gWoodfallSceneryPoisonWallsTex" OutName="woodfall_scenery_poison_walls" Format="rgba16" Width="32" Height="32" Offset="0x6D20" />
-        <Texture Name="gWoodfallSceneryPurifiedWalls1Tex" OutName="woodfall_scenery_purified_walls_1" Format="rgba16" Width="16" Height="32" Offset="0x7520" />
-        <Texture Name="gWoodfallSceneryPurifiedWalls2Tex" OutName="woodfall_scenery_purified_walls_2" Format="rgba16" Width="32" Height="32" Offset="0x7920" />
-        <Texture Name="gWoodfallSceneryFloorBackgroundTex" OutName="woodfall_scenery_floor_background" Format="rgba16" Width="32" Height="32" Offset="0x8120" />
-        <Texture Name="gWoodfallSceneryFloorForegroundTex" OutName="woodfall_scenery_floor_foreground" Format="rgba16" Width="32" Height="32" Offset="0x8920" />
-        <Texture Name="gWoodfallSceneryPurifiedWaterTex" OutName="woodfall_scenery_purified_water" Format="rgba16" Width="32" Height="32" Offset="0x9120" />
-
-        <!-- Assets for the poison water whose vertices are dynamically adjusted when Woodfall Temple is raised. -->
-        <DList Name="gWoodfallSceneryDynamicPoisonWaterEmptyDL" Offset="0x9920" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gWoodfallSceneryDynamicPoisonWaterDL" Offset="0x9928" />
-        <TextureAnimation Name="gWoodfallSceneryDynamicPoisonWaterTexAnim" Offset="0x9D70" />
-
-        <!-- When walking or swimming in poisoned Woodfall, this collision is responsible for damaging the player. -->
-        <Collision Name="gWoodfallSceneryPoisonWaterDamageCol" Offset="0x9E4C" />
-        
-        <!-- Assets for the walls of Woodfall when the swamp is still poisoned. -->
-        <DList Name="gWoodfallSceneryPoisonWallsEmptyDL" Offset="0xA390" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gWoodfallSceneryPoisonWallsDL" Offset="0xA398" /> <!-- Original name is "z2_21_DOKUkabe_model" ("doku" = "poison", "kabe" = "wall") -->
-        <TextureAnimation Name="gWoodfallSceneryPoisonWallsTexAnim" Offset="0xA5C0" />
-
-        <!-- Assets for the static poison water in Woodfall. -->
-        <DList Name="gWoodfallSceneryPoisonWaterEmptyDL" Offset="0xA8F0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gWoodfallSceneryPoisonWaterDL" Offset="0xA8F8" /> <!-- Original name is "z2_21_DOKUwater_model" -->
-        <TextureAnimation Name="gWoodfallSceneryPoisonWaterTexAnim" Offset="0xAA50" />
-
-        <!-- Assets for the walls of Woodfall when the swamp is purified. -->
-        <DList Name="gWoodfallSceneryPurifiedWallsEmptyDL" Offset="0xAF90" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gWoodfallSceneryPurifiedWallsDL" Offset="0xAF98" /> <!-- Original name is "z2_21_kabe_model" -->
-        <TextureAnimation Name="gWoodfallSceneryPurifiedWallsTexAnim" Offset="0xB1A0" />
-
-        <!-- DisplayLists for Woodfall Temple. -->
-        <DList Name="gWoodfallSceneryTempleEntrancesDL" Offset="0xDE50" />
-        <DList Name="gWoodfallSceneryTempleDL" Offset="0xDF18" /> <!-- Original name is "z2_21_toride_model" ("fort, fortress") -->
-
-        <!-- Assets for the water the flows over Woodfall Temple during the cutscene where it rises from the water. -->
-        <DList Name="gWoodfallSceneryWaterFlowingOverTempleDL" Offset="0xF3C0" /> <!-- Original name is "z2_21_toride2_modelT" -->
-        <DList Name="gWoodfallSceneryWaterFlowingOverTempleEmptyDL" Offset="0xF758" /> <!-- Probably was the opaque component for the above DL -->
-        <TextureAnimation Name="gWoodfallSceneryWaterFlowingOverTempleTexAnim" Offset="0xF768" />
-
-        <!-- Assets for the ramp and platform that appear next to Woodfall Temple when the swamp is purified. -->
-        <DList Name="gWoodfallSceneryTempleRampAndPlatformEmptyDL" Offset="0xFAE0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gWoodfallSceneryTempleRampAndPlatformDL" Offset="0xFAE8" /> <!-- Original name is "z2_21_toride3_model" -->
-        <Collision Name="gWoodfallSceneryTempleRampAndPlatformCol" Offset="0xFE5C" />
-
-        <!-- The collision for Woodfall Temple and an empty texture animation that was seemingly intended to be used with the temple. -->
-        <!-- texture animation doesnt exist? (or fe88) -->
-        <TextureAnimation Name="gWoodfallSceneryTempleTexAnim" Offset="0xFE88" />
-        <Collision Name="gWoodfallSceneryTempleCol" Offset="0x10C24" />
-
-        <!-- Assets for the purified water in Woodfall, as well as the floor visible beneath the water. -->
-        <DList Name="gWoodfallSceneryPurifiedWaterDL" Offset="0x10ED0" /> <!-- Original name is "z2_21_water_modelT" -->
-        <DList Name="gWoodfallSceneryFloorDL" Offset="0x10FB8" /> <!-- Original name is "z2_21_water_model" -->
-        <TextureAnimation Name="gWoodfallSceneryPurifiedWaterTexAnim" Offset="0x11098" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mu.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mu.xml
deleted file mode 100644
index a72b184c1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_mu.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<Root>
-    <!-- Assets for Honey & Darling -->
-    <File Name="object_mu" Segment="6">
-        <Animation Name="gHoneyAndDarlingCupCheeksLoopAnim" Offset="0x1F74" /> <!-- Original name is "tg_betabeta" -->
-        <Animation Name="gHoneyAndDarlingHugLoopAnim" Offset="0x2F64" /> <!-- Original name is "tg_dakisime" -->
-        <Animation Name="gHoneyAndDarlingGameDanceLoopAnim" Offset="0x4904" /> <!-- Original name is "tg_dance" -->
-        <Animation Name="gHoneyAndDarlingHoldHandsLoopAnim" Offset="0x5304" /> <!-- Original name is "tg_ityaita" -->
-        <Animation Name="gHoneyAndDarlingIdleAnim" Offset="0x53E0" /> <!-- Original name is "tg_matsu" -->
-        <Texture Name="gHoneyAndDarlingTLUT" OutName="honey_and_darling_tlut" Format="rgba16" Width="16" Height="16" Offset="0x53F0" />
-        <Texture Name="gHoneyAndDarlingShirtsAndShoesTex" OutName="honey_and_darling_shirts_and_shoes" Format="i8" Width="16" Height="16" Offset="0x55F0" />
-        <Texture Name="gHoneyAndDarlingWomanDressTex" OutName="honey_and_darling_woman_dress" Format="ci8" Width="16" Height="16" Offset="0x56F0" />
-        <Texture Name="gHoneyAndDarlingJointShadeTex" OutName="honey_and_darling_joint_shade" Format="i8" Width="8" Height="8" Offset="0x57F0" /> <!-- For the man's shoulders, elbows, and knees, and the woman's elbows -->
-        <Texture Name="gHoneyAndDarlingHeadSkinTex" OutName="honey_and_darling_head_skin" Format="ci8" Width="8" Height="8" Offset="0x5830" /> <!-- For their necks, under chin, noses, cheeks, and foreheads -->
-        <Texture Name="gHoneyAndDarlingManHairTex" OutName="honey_and_darling_man_hair" Format="ci8" Width="16" Height="16" Offset="0x5870" /> 
-        <Texture Name="gHoneyAndDarlingEarTex" OutName="honey_and_darling_ear" Format="ci8" Width="8" Height="8" Offset="0x5970" />
-        <Texture Name="gHoneyAndDarlingMouthTex" OutName="honey_and_darling_mouth" Format="ci8" Width="32" Height="16" Offset="0x59B0" />
-        <Texture Name="gHoneyAndDarlingManEyeTex" OutName="honey_and_darling_man_eye" Format="ci8" Width="32" Height="32" Offset="0x5BB0" />
-        <Texture Name="gHoneyAndDarlingHandTex" OutName="honey_and_darling_hand" Format="ci8" Width="8" Height="8" Offset="0x5FB0" />
-        <Texture Name="gHoneyAndDarlingWomanHairTex" OutName="honey_and_darling_woman_hair" Format="ci8" Width="8" Height="16" Offset="0x5FF0" />
-        <Texture Name="gHoneyAndDarlingWomanEyeTex" OutName="honey_and_darling_woman_eye" Format="ci8" Width="32" Height="32" Offset="0x6070" />
-        <DList Name="gHoneyAndDarlingLegsDL" Offset="0x9370" />
-        <DList Name="gHoneyAndDarlingWomanHeadDL" Offset="0x96C8" />
-        <DList Name="gHoneyAndDarlingWomanRightHandDL" Offset="0x9BC8" />
-        <DList Name="gHoneyAndDarlingWomanRightForearmDL" Offset="0x9D10" />
-        <DList Name="gHoneyAndDarlingWomanRightUpperArmDL" Offset="0x9E10" />
-        <DList Name="gHoneyAndDarlingWomanLeftHandDL" Offset="0x9F10" />
-        <DList Name="gHoneyAndDarlingWomanLeftForearmDL" Offset="0xA058" />
-        <DList Name="gHoneyAndDarlingWomanLeftUpperArmDL" Offset="0xA158" />
-        <DList Name="gHoneyAndDarlingWomanTorsoDL" Offset="0xA258" />
-        <DList Name="gHoneyAndDarlingManTorsoDL" Offset="0xA3C8" />
-        <DList Name="gHoneyAndDarlingManHeadDL" Offset="0xA510" />
-        <DList Name="gHoneyAndDarlingManRightUpperArmDL" Offset="0xAA10" />
-        <DList Name="gHoneyAndDarlingManRightForearmDL" Offset="0xAB10" />
-        <DList Name="gHoneyAndDarlingManRightHandDL" Offset="0xAC10" />
-        <DList Name="gHoneyAndDarlingManLeftUpperArmDL" Offset="0xAD58" />
-        <DList Name="gHoneyAndDarlingManLeftForearmDL" Offset="0xAE58" />
-        <DList Name="gHoneyAndDarlingManLeftHandDL" Offset="0xAF58" />
-        <DList Name="gHoneyAndDarlingHeartMaterialDL" Offset="0xB0A0" />
-        <DList Name="gHoneyAndDarlingHeartModelDL" Offset="0xB0E0" />
-        <Limb Name="gHoneyAndDarlingLegsLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_LEGS" Offset="0xB170" />
-        <Limb Name="gHoneyAndDarlingManTorsoLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_TORSO" Offset="0xB17C" />
-        <Limb Name="gHoneyAndDarlingManLeftUpperArmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_LEFT_UPPER_ARM" Offset="0xB188" />
-        <Limb Name="gHoneyAndDarlingManLeftForearmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_LEFT_FOREARM" Offset="0xB194" />
-        <Limb Name="gHoneyAndDarlingManLeftHandLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_LEFT_HAND" Offset="0xB1A0" />
-        <Limb Name="gHoneyAndDarlingManRightUpperArmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_RIGHT_UPPER_ARM" Offset="0xB1AC" />
-        <Limb Name="gHoneyAndDarlingManRightForearmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_RIGHT_FOREARM" Offset="0xB1B8" />
-        <Limb Name="gHoneyAndDarlingManRightHandLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_RIGHT_HAND" Offset="0xB1C4" />
-        <Limb Name="gHoneyAndDarlingManHeadLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_HEAD" Offset="0xB1D0" />
-        <Limb Name="gHoneyAndDarlingWomanRootLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_ROOT" Offset="0xB1DC" />
-        <Limb Name="gHoneyAndDarlingWomanTorsoLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_TORSO" Offset="0xB1E8" />
-        <Limb Name="gHoneyAndDarlingWomanLeftUpperArmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_LEFT_UPPER_ARM" Offset="0xB1F4" />
-        <Limb Name="gHoneyAndDarlingWomanLeftForearmRootLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_LEFT_FOREARM_ROOT" Offset="0xB200" />
-        <Limb Name="gHoneyAndDarlingWomanLeftForearmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_LEFT_FOREARM" Offset="0xB20C" />
-        <Limb Name="gHoneyAndDarlingWomanLeftHandLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_LEFT_HAND" Offset="0xB218" />
-        <Limb Name="gHoneyAndDarlingWomanRightUpperArmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_RIGHT_UPPER_ARM" Offset="0xB224" />
-        <Limb Name="gHoneyAndDarlingWomanRightForearmRootLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_RIGHT_FOREARM_ROOT" Offset="0xB230" />
-        <Limb Name="gHoneyAndDarlingWomanRightForearmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_RIGHT_FOREARM" Offset="0xB23C" />
-        <Limb Name="gHoneyAndDarlingWomanRightHandLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_RIGHT_HAND" Offset="0xB248" />
-        <Limb Name="gHoneyAndDarlingWomanHeadLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_HEAD" Offset="0xB254" />
-        <Skeleton Name="gHoneyAndDarlingSkel" Type="Flex" LimbType="Standard" LimbNone="HONEY_AND_DARLING_LIMB_NONE" LimbMax="HONEY_AND_DARLING_LIMB_MAX" EnumName="HoneyAndDarlingLimb" Offset="0xB2B0" />
-        <Animation Name="gHoneyAndDarlingSurpiseAnim" Offset="0xBAC4" /> <!-- Original name is "tg_odoroku" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_nb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_nb.xml
deleted file mode 100644
index f169abed9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_nb.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<Root>
-    <!-- Assets for Anju's Grandma -->
-    <File Name="object_nb" Segment="6">
-        <!-- Anju's Grandma Animations-->
-        <Animation Name="gNbTalkAnim" Offset="0x290" /> <!-- Original name is "nb_talk01" -->
-        <Animation Name="gNbAngryAnim" Offset="0x52C" /> <!-- Original name is "nb_talk02" -->
-        <Animation Name="gNbRelievedAnim" Offset="0x6D4" /> <!-- Original name is "nb_talk03" -->
-        <Animation Name="gNbIdleAnim" Offset="0x990" /> <!-- Original name is "nb_wait01" -->
-
-        <!-- Anju's Grandma DisplayLists -->
-        <DList Name="gNbWheelchairDL" Offset="0x4A70" /> <!-- Includes legs -->
-        <DList Name="gNbRightWheelDL" Offset="0x5170" />
-        <DList Name="gNbLeftWheelDL" Offset="0x5430" />
-        <DList Name="gNbTorsoDL" Offset="0x56F0" />
-        <DList Name="gNbNeckDL" Offset="0x5988" />
-        <DList Name="gNbHeadDL" Offset="0x5AA8" />
-        <DList Name="gNbArmsBookDL" Offset="0x6390" />
-
-        <!-- Anju's Grandma TLUTs -->
-        <Texture Name="object_nb_TLUT_006910" OutName="tlut_006910" Format="rgba16" Width="16" Height="16" Offset="0x6910" />
-        <Texture Name="object_nb_TLUT_006B10" OutName="tlut_006B10" Format="rgba16" Width="16" Height="16" Offset="0x6B10" />
-        <Texture Name="gNbTigerTLUT" OutName="nb_tiger_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6D10" />
-
-        <!-- Anju's Grandma Textures -->
-        <Texture Name="gNbSkinTex" OutName="nb_skin" Format="ci8" Width="8" Height="8" Offset="0x6F10" TlutOffset="0x6910" />
-        <Texture Name="gNbEarTex" OutName="nb_ear" Format="ci8" Width="16" Height="16" Offset="0x6F50" TlutOffset="0x6910" />
-        <Texture Name="object_nb_Tex_007050" OutName="tex_007050" Format="ci8" Width="16" Height="16" Offset="0x7050" TlutOffset="0x6910" />
-        <Texture Name="gNbUpperEyelidTex" OutName="nb_upper_eyelid" Format="ci8" Width="16" Height="8" Offset="0x7150" TlutOffset="0x6910" />
-        <Texture Name="gNbHairTex" OutName="nb_hair" Format="ci8" Width="16" Height="32" Offset="0x71D0" TlutOffset="0x6B10" />
-        <Texture Name="gNbEyeTex" OutName="nb_eye" Format="ci8" Width="16" Height="8" Offset="0x73D0" TlutOffset="0x6910" />
-        <Texture Name="gNbLowerEyelidTex" OutName="nb_lower_eyelid" Format="ci8" Width="16" Height="8" Offset="0x7450" TlutOffset="0x6910" />
-        <Texture Name="object_nb_Tex_0074D0" OutName="tex_0074D0" Format="ci8" Width="16" Height="8" Offset="0x74D0" TlutOffset="0x6D10" />
-        <Texture Name="object_nb_Tex_007550" OutName="tex_007550" Format="ci8" Width="16" Height="16" Offset="0x7550" TlutOffset="0x6B10" />
-        <Texture Name="object_nb_Tex_007650" OutName="tex_007650" Format="i8" Width="16" Height="16" Offset="0x7650" />
-        <Texture Name="object_nb_Tex_007750" OutName="tex_007750" Format="rgba16" Width="8" Height="8" Offset="0x7750" />
-        <Texture Name="object_nb_Tex_0077D0" OutName="tex_0077D0" Format="ci8" Width="16" Height="16" Offset="0x77D0" TlutOffset="0x6B10" />
-        <Texture Name="object_nb_Tex_0078D0" OutName="tex_0078D0" Format="ci8" Width="16" Height="16" Offset="0x78D0" TlutOffset="0x6B10" />
-        <Texture Name="object_nb_Tex_0079D0" OutName="tex_0079D0" Format="ci8" Width="32" Height="16" Offset="0x79D0" TlutOffset="0x6B10" />
-        <Texture Name="gNbBookCoverTex" OutName="nb_book_cover" Format="ci8" Width="16" Height="16" Offset="0x7BD0" TlutOffset="0x6B10" />
-        <Texture Name="gNbSkirtTex" OutName="nb_skirt" Format="ci8" Width="16" Height="16" Offset="0x7CD0" TlutOffset="0x6910" />
-        <Texture Name="gNbBookPageTex" OutName="nb_book_page" Format="ci8" Width="16" Height="16" Offset="0x7DD0" TlutOffset="0x6D10" />
-        <Texture Name="gNbFingersTex" OutName="nb_fingers" Format="ci8" Width="16" Height="16" Offset="0x7ED0" TlutOffset="0x6910" />
-        <Texture Name="gNbTigerTex" OutName="nb_tiger" Format="ci8" Width="32" Height="64" Offset="0x7FD0" TlutOffset="0x6D10" />
-        <Texture Name="object_nb_Tex_0087D0" OutName="tex_0087D0" Format="ci8" Width="32" Height="32" Offset="0x87D0" TlutOffset="0x6B10" />
-
-        <!-- Anju's Grandma Limbs -->
-        <Limb Name="gNbWheelchairLimb" Type="Standard" EnumName="NB_LIMB_WHEELCHAIR" Offset="0x8BD0" />
-        <Limb Name="gNbTorsoLimb" Type="Standard" EnumName="NB_LIMB_TORSO" Offset="0x8BDC" />
-        <Limb Name="gNbArmsBookLimb" Type="Standard" EnumName="NB_LIMB_ARMS_BOOK" Offset="0x8BE8" />
-        <Limb Name="gNbNeckLimb" Type="Standard" EnumName="NB_LIMB_NECK" Offset="0x8BF4" />
-        <Limb Name="gNbHeadLimb" Type="Standard" EnumName="NB_LIMB_HEAD" Offset="0x8C00" />
-        <Limb Name="gNbLeftWheelLimb" Type="Standard" EnumName="NB_LIMB_LEFT_WHEEL" Offset="0x8C0C" />
-        <Limb Name="gNbRightWheelLimb" Type="Standard" EnumName="NB_LIMB_RIGHT_WHEEL" Offset="0x8C18" />
-
-        <!-- Anju's Grandma Skeleton -->
-        <Skeleton Name="gNbSkel" Type="Flex" LimbType="Standard" LimbNone="NB_LIMB_NONE" LimbMax="NB_LIMB_MAX" EnumName="NbLimb" Offset="0x8C40" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_niw.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_niw.xml
deleted file mode 100644
index fcc178dde..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_niw.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-    <!-- Cucco: zelda name for chicken, "Niw" likely short for "Niwatori" -->
-    <File Name="object_niw" Segment="6">
-        <Animation Name="gNiwIdleAnim" Offset="0xE8" /> <!-- Original name is "nw_wait" -->
-        <DList Name="gNiwNeckDL" Offset="0x9C0" />
-        <DList Name="gNiwHeadDL" Offset="0xA98" />
-        <DList Name="gNiwTailDL" Offset="0xDF0" />
-        <DList Name="gNiwWingLeftDL" Offset="0xFD0" />
-        <DList Name="gNiwFootLeftDL" Offset="0x1088" />
-        <DList Name="gNiwWingRightDL" Offset="0x1128" />
-        <DList Name="gNiwFootRightDL" Offset="0x11E0" />
-        <Texture Name="gNiwEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x1280" />
-        <Texture Name="gNiwHeadFeathersTex" OutName="head_feathers" Format="rgba16" Width="8" Height="16" Offset="0x1480" />
-        <Texture Name="gNiwBaseFeathersTex" OutName="base_feathers" Format="rgba16" Width="8" Height="8" Offset="0x1580" />
-        <Texture Name="gNiwBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x1600" />
-        <Texture Name="gNiwCombTex" OutName="comb" Format="rgba16" Width="16" Height="16" Offset="0x1680" />
-        <Texture Name="gNiwTailFeathersTex" OutName="tail_feathers" Format="rgba16" Width="32" Height="32" Offset="0x1880" />
-        <Texture Name="gNiwFootTex" OutName="foot" Format="rgba16" Width="8" Height="16" Offset="0x2080" />
-        <Texture Name="gNiwFeatherTex" OutName="feather" Format="rgba16" Width="16" Height="16" Offset="0x2180" />
-        <DList Name="gNiwFeatherMaterialDL" Offset="0x23B0" />
-        <DList Name="gNiwFeatherDL" Offset="0x2428" /> <!-- Original name is "nw_hane_model" -->
-
-        <Limb Name="gNiwRootLimb" LimbType="Standard" EnumName="NIW_LIMB_ROOT" Offset="0x2440"/>
-        <Limb Name="gNiwLimb_244C" LimbType="Standard" EnumName="NIW_LIMB_2" Offset="0x244C"/>
-        <Limb Name="gNiwLimb_2458" LimbType="Standard" EnumName="NIW_LIMB_3" Offset="0x2458"/>
-        <Limb Name="gNiwTailAndUndersideLimb" LimbType="Standard" EnumName="NIW_LIMB_UNDER_SIDE" Offset="0x2464"/>
-        <Limb Name="gNiwLeftFootRootLimb" LimbType="Standard" EnumName="NIW_LIMB_LEFT_FOOT_ROOT" Offset="0x2470"/>
-        <Limb Name="gNiwLeftFootLimb" LimbType="Standard" EnumName="NIW_LIMB_LEFT_FOOT" Offset="0x247C"/>
-        <Limb Name="gNiwLeftWingRootLimb" LimbType="Standard" EnumName="NIW_LIMB_LEFT_WING_ROOT" Offset="0x2488"/>
-        <Limb Name="gNiwLeftWingLimb" LimbType="Standard" EnumName="NIW_LIMB_LEFT_WING" Offset="0x2494"/>
-        <Limb Name="gNiwRightFootRootLimb" LimbType="Standard" EnumName="NIW_LIMB_RIGHT_FOOT_ROOT" Offset="0x24A0"/>
-        <Limb Name="gNiwRightFootLimb" LimbType="Standard" EnumName="NIW_LIMB_RIGHT_FOOT" Offset="0x24AC"/>
-        <Limb Name="gNiwRightWingRootLimb" LimbType="Standard" EnumName="NIW_LIMB_RIGHT_WING_ROOT" Offset="0x24B8"/>
-        <Limb Name="gNiwRightWingLimb" LimbType="Standard" EnumName="NIW_LIMB_RIGHT_WING" Offset="0x24C4"/>
-        <Limb Name="gNiwUpperBodyRootLimb" LimbType="Standard" EnumName="NIW_LIMB_UPPER_BODY" Offset="0x24D0"/>
-        <Limb Name="gNiwNeckLimb" LimbType="Standard" EnumName="NIW_LIMB_NECK" Offset="0x24DC"/>
-        <Limb Name="gNiwHeadLimb" LimbType="Standard" EnumName="NIW_LIMB_HEAD" Offset="0x24E8"/>
-        <Skeleton Name="gNiwSkel" Type="Flex" LimbType="Standard" LimbNone="NIW_LIMB_NONE" LimbMax="NIW_LIMB_MAX" EnumName="ObjectNiwLimb" Offset="0x2530" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_nnh.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_nnh.xml
deleted file mode 100644
index 3a806c792..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_nnh.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Son of the butler cursed into the corpse/body of a dead tree by Skullkid-->
-    <!--    the player walks past before meeting the Happy Mask Salesman -->
-    <File Name="object_nnh" Segment="6">
-        <DList Name="gButlerSonMainBodyDL" Offset="0x1510" /> <!-- Original name is "nnh_body_model" -->
-        <Texture Name="gButlerSonTLUT" OutName="tlut_001AA0" Format="rgba16" Width="16" Height="16" Offset="0x1AA0" />
-
-        <!-- Similar to MainBodyTex but with dark green mold under the roots -->
-        <Texture Name="gButlerSonRootTex" OutName="roots" Format="ci8" Width="16" Height="16" Offset="0x1CA0" />
-        <Texture Name="gButlerSonMainBodyTex" OutName="body" Format="ci8" Width="16" Height="16" Offset="0x1DA0" />
-        <Texture Name="gButlerSonWholeLeafTex" OutName="whole_leaf" Format="rgba16" Width="32" Height="32" Offset="0x1EA0" />
-        <!-- Only his top left leaf has this circular cutout -->
-        <Texture Name="gButlerSonCutoutLeafTex" OutName="cutout_leaf" Format="rgba16" Width="32" Height="32" Offset="0x26A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_numa_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_numa_obj.xml
deleted file mode 100644
index ea2aa74a6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_numa_obj.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<Root>
-    <!-- Assets for actors in Woodfall Temple (doors, staircases, the wooden flower, poisoned/purified water) -->
-    <File Name="object_numa_obj" Segment="6">
-        <DList Name="object_numa_obj_DL_0007A0" Offset="0x7A0" /> <!-- Original name is "m2_NumaRasenSita_modelT" -->
-        <DList Name="object_numa_obj_DL_0007A8" Offset="0x7A8" /> <!-- Original name is "m2_NumaRasenSita_model" -->
-        <DList Name="object_numa_obj_DL_0014C0" Offset="0x14C0" /> <!-- Original name is "m2_NumaRasenSita_PT_modelT" -->
-        <DList Name="object_numa_obj_DL_0014C8" Offset="0x14C8" /> <!-- Original name is "m2_NumaRasenSita_PT_model" -->
-        <Texture Name="object_numa_obj_Tex_001D60" OutName="tex_001D60" Format="rgba16" Width="32" Height="64" Offset="0x1D60" />
-        <Texture Name="object_numa_obj_Tex_002D60" OutName="tex_002D60" Format="rgba16" Width="32" Height="32" Offset="0x2D60" />
-        <Texture Name="object_numa_obj_Tex_003560" OutName="tex_003560" Format="rgba16" Width="32" Height="32" Offset="0x3560" />
-        <DList Name="object_numa_obj_DL_004440" Offset="0x4440" /> <!-- Original name is "m2_NumaRasenUe_modelT" -->
-        <DList Name="object_numa_obj_DL_004448" Offset="0x4448" /> <!-- Original name is "m2_NumaRasenUe_model" -->
-        <DList Name="object_numa_obj_DL_0051B0" Offset="0x51B0" /> <!-- Original name is "m2_NumaRasenUe_PT_modelT" -->
-        <DList Name="object_numa_obj_DL_0051B8" Offset="0x51B8" /> <!-- Original name is "m2_NumaRasenUe_PT_model" -->
-        <DList Name="gWoodfallDoorDL" Offset="0x5DF0" />
-        <Texture Name="object_numa_obj_Tex_005FC0" OutName="tex_005FC0" Format="rgba16" Width="32" Height="64" Offset="0x5FC0" />
-        <DList Name="object_numa_obj_DL_007150" Offset="0x7150" /> <!-- Original name is "m2_N_shutter1_model" -->
-        <Texture Name="object_numa_obj_Tex_0072B0" OutName="tex_0072B0" Format="rgba16" Width="32" Height="64" Offset="0x72B0" />
-        <DList Name="object_numa_obj_DL_008440" Offset="0x8440" /> <!-- Original name is "m2_N_shutter2_model" -->
-        <Texture Name="object_numa_obj_Tex_0085A0" OutName="tex_0085A0" Format="rgba16" Width="32" Height="64" Offset="0x85A0" />
-
-        <!-- Wooden Flower -->
-        <Collision Name="gWoodenFlowerOpenedFlowerCol" Offset="0x9FE0" /> <!-- Original name is "m2_N_HANAafter_bgdatainfo" -->
-        <Collision Name="gWoodenFlowerClosedFlowerCol" Offset="0xA740" /> <!-- Original name is "m2_N_HANAdefault_bgdatainfo" -->
-        <DList Name="gWoodenFlowerEmpty1DL" Offset="0xAB80" /> <!-- Original name might be "m2_N_HANAin_modelT", may have originally been for transparency? -->
-        <DList Name="gWoodenFlowerInnerPetalDL" Offset="0xAB88" /> <!-- Original name is "m2_N_HANAin_model" -->
-        <DList Name="gWoodenFlowerEmpty2DL" Offset="0xB920" /> <!-- Original name might be "m2_N_HANAkuki_modelT", may have originally been for transparency? -->
-        <DList Name="gWoodenFlowerStalkDL" Offset="0xB928" /> <!-- Original name is "m2_N_HANAkuki_model" -->
-        <DList Name="gWoodenFlowerEmpty3DL" Offset="0xBE50" /> <!-- Original name might be "m2_N_HANAout_modelT", may have originally been for transparency? -->
-        <DList Name="gWoodenFlowerOuterPetalDL" Offset="0xBE58" /> <!-- Original name is "m2_N_HANAout_model" -->
-        <Texture Name="gWoodenFlowerPetalSidesTex" OutName="wooden_flower_petal_sides" Format="rgba16" Width="32" Height="32" Offset="0xBFD0" />
-        <Texture Name="gWoodenFlowerInnerPetalTopTex" OutName="wooden_flower_inner_petal_top" Format="rgba16" Width="32" Height="64" Offset="0xC7D0" />
-        <Texture Name="gWoodenFlowerInnerPetalBottomTex" OutName="wooden_flower_inner_petal_bottom" Format="rgba16" Width="32" Height="64" Offset="0xD7D0" />
-        <Texture Name="gWoodenFlowerStalkTopTex" OutName="wooden_flower_stalk_top" Format="rgba16" Width="32" Height="64" Offset="0xE7D0" />
-        <Texture Name="gWoodenFlowerStalkSidesTex" OutName="wooden_flower_stalk_sides" Format="rgba16" Width="32" Height="64" Offset="0xF7D0" />
-        <Texture Name="gWoodenFlowerOuterPetalTopTex" OutName="wooden_flower_outer_petal_top" Format="rgba16" Width="32" Height="64" Offset="0x107D0" />
-        <Texture Name="gWoodenFlowerOuterPetalBottomTex" OutName="wooden_flower_outer_petal_bottom" Format="rgba16" Width="32" Height="64" Offset="0x117D0" />
-
-        <Collision Name="object_numa_obj_Colheader_012818" Offset="0x12818" /> <!-- Original name is "m2_N_DOKUcode_bgdatainfo" -->
-        <DList Name="object_numa_obj_DL_0128E0" Offset="0x128E0" /> <!-- Original name is "m2_N_DOKUwater_modelT" -->
-        <DList Name="object_numa_obj_DL_0129C0" Offset="0x129C0" />
-        <DList Name="object_numa_obj_DL_012A60" Offset="0x12A60" /> <!-- Original name is "m2_N_DOKUwater03_modelT" -->
-        <DList Name="object_numa_obj_DL_012B40" Offset="0x12B40" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_012B58" Offset="0x12B58" />
-        <DList Name="object_numa_obj_DL_012BF0" Offset="0x12BF0" /> <!-- Original name is "m2_N_DOKUwater05_modelT" -->
-        <DList Name="object_numa_obj_DL_012CD0" Offset="0x12CD0" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_012CE8" Offset="0x12CE8" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_012CF8" Offset="0x12CF8" />
-        <DList Name="object_numa_obj_DL_012D90" Offset="0x12D90" /> <!-- Original name is "m2_N_water_modelT" -->
-        <DList Name="object_numa_obj_DL_012E70" Offset="0x12E70" />
-        <DList Name="object_numa_obj_DL_012F10" Offset="0x12F10" /> <!-- Original name is "m2_N_water03_modelT" -->
-        <DList Name="object_numa_obj_DL_012FF0" Offset="0x12FF0" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_013008" Offset="0x13008" />
-        <DList Name="object_numa_obj_DL_0130A0" Offset="0x130A0" /> <!-- Original name is "m2_N_water05_modelT" -->
-        <DList Name="object_numa_obj_DL_013180" Offset="0x13180" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_013198" Offset="0x13198" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_0131A8" Offset="0x131A8" />
-        <Texture Name="object_numa_obj_Tex_0131B0" OutName="tex_0131B0" Format="rgba16" Width="32" Height="32" Offset="0x131B0" />
-        <Texture Name="object_numa_obj_Tex_0139B0" OutName="tex_0139B0" Format="rgba16" Width="32" Height="32" Offset="0x139B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_nwc.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_nwc.xml
deleted file mode 100644
index 8c67159ce..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_nwc.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Root>
-    <!-- Cucco Chick: the little baby Cucco you find and raise in the Cucco Shack -->
-    <File Name="object_nwc" Segment="6">
-        <DList Name="gNwcEndDL" Offset="0x2E0" />
-        <DList Name="gNwcBodyDL" Offset="0x2E8" />
-        <Texture Name="gNwcBodyTex" OutName="body" Format="rgba16" Width="8" Height="8" Offset="0x4D0" />
-        <Texture Name="gNwcBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x550" />
-        <!-- Wing texture is reused for tail feathers -->
-        <Texture Name="gNwcWingTex" OutName="wing" Format="rgba16" Width="16" Height="16" Offset="0x5D0" />
-        <Texture Name="gNwcEyeOpenTex" OutName="eye_opened" Format="rgba16" Width="16" Height="16" Offset="0x7D0" />
-        <Texture Name="gNwcEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="16" Height="16" Offset="0x9D0" />
-        
-        <!-- **************************************************************************************** -->
-        <!-- *** Beyond this point is unused content, including broken display lists and textures *** -->
-        <!-- **************************************************************************************** -->
-
-        <!-- this blinking animated texture seems unused, as the actor cycles through blinking with code -->
-        <TextureAnimation Name="gNwcBlinkTexAnim" Offset="0xBEC" />
-        <!-- unused multi-colored texture? -->
-        <Texture Name="object_nwc_Tex_000C00" OutName="tex_000C00" Format="rgba16" Width="32" Height="32" Offset="0xC00" />
-        <DList Name="object_nwc_DL_001440" Offset="0x1440" />
-        <DList Name="object_nwc_DL_0014B8" Offset="0x14B8" />
-        <DList Name="object_nwc_DL_001520" Offset="0x1520" />
-        <!-- dark gold ball texture -->
-        <Texture Name="object_nwc_Tex_001550" OutName="tex_001550" Format="rgba16" Width="16" Height="16" Offset="0x1550" />
-        <!-- gold color pallet? -->
-        <Texture Name="object_nwc_Tex_001750" OutName="tex_001750" Format="rgba16" Width="4" Height="4" Offset="0x1750" />
-      
-        <!-- both of these display lists use the dark gold ball texture -->
-        <DList Name="object_nwc_DL_001860" Offset="0x1860" />
-        <DList Name="object_nwc_DL_0018D0" Offset="0x18D0" />
-
-        <!-- draws two untextured triangles like jack-o-lantern eyes -->
-        <DList Name="object_nwc_DL_001940" Offset="0x1940" />
-
-        <!-- both of these display lists use the yellow pallet texture -->
-        <DList Name="object_nwc_DL_001960" Offset="0x1960" />
-        <DList Name="object_nwc_DL_0019B8" Offset="0x19B8" />
-
-        <!-- in z64utils draws a un-textured tetrahedron -->
-        <DList Name="object_nwc_DL_001A10" Offset="0x1A10" />
-
-        <!-- contains an unsupported texture (i16) used in an unused display list ( @ 0x1B80 ) -->
-        <!-- is type G_IM_FMT_I, G_IM_SIZ_16b, dimensions are best guesses from Texture64 renders -->
-        <Texture Name="object_nwc_Tex_001A40" OutName="broken_tex_gimfmti_001A40" Format="ia16" Width="8" Height="16" Offset="0x1A40" />
-
-        <!-- Z64Utils throws an error for this DL because of the above texture -->
-        <DList Name="object_nwc_DL_001B80" Offset="0x1B80" />
-
-        <!-- requires unassigned segment 0x01 matrix to render, no idea what its doing -->
-        <DList Name="object_nwc_DL_001BE8" Offset="0x1BE8" />
-        <!-- loads a dark spot from gameplay keep -->
-        <DList Name="object_nwc_DL_001C10" Offset="0x1C10" />
-        <!-- unused DL produces a yellow textured triangle -->
-        <DList Name="object_nwc_DL_001C58" Offset="0x1C58" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ny.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ny.xml
deleted file mode 100644
index 3f2d3a908..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ny.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_ny" Segment="6">
-        <DList Name="object_ny_DL_000030" Offset="0x30" /> <!-- Original name is "ksl_kusari_modelT" -->
-        <DList Name="object_ny_DL_0000B8" Offset="0xB8" />
-        <Texture Name="object_ny_Tex_0000C0" OutName="tex_0000C0" Format="rgba16" Width="8" Height="16" Offset="0xC0" />
-        <Texture Name="object_ny_Tex_0001C0" OutName="tex_0001C0" Format="rgba16" Width="16" Height="16" Offset="0x1C0" />
-        <Texture Name="object_ny_Tex_0003C0" OutName="tex_0003C0" Format="rgba16" Width="32" Height="32" Offset="0x3C0" />
-        <Texture Name="object_ny_Tex_000BC0" OutName="tex_000BC0" Format="rgba16" Width="32" Height="32" Offset="0xBC0" />
-        <DList Name="object_ny_DL_001F90" Offset="0x1F90" />
-        <DList Name="object_ny_DL_002068" Offset="0x2068" />
-        <DList Name="object_ny_DL_002188" Offset="0x2188" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_oF1d_map.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_oF1d_map.xml
deleted file mode 100644
index 27270fb7f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_oF1d_map.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<Root>
-    <!-- Object file for Gorons -->
-    <File Name="object_oF1d_map" Segment="6">
-        <!-- Snowball -->
-        <!-- Large Snowball Fragment -->
-        <DList Name="gGoronLargeSnowballFragmentMaterialDL" Offset="0x3D0" />
-        <DList Name="gGoronLargeSnowballFragmentModelDL" Offset="0x458" />
-
-        <!-- Medium Snowball Fragment -->
-        <DList Name="gGoronMediumSnowballFragmentMaterialDL" Offset="0x8C0" />
-        <DList Name="gGoronMediumSnowballFragmentModelDL" Offset="0x948" />
-
-        <!-- Small Snowball Fragment -->
-        <DList Name="gGoronSmallSnowballFragmentMaterialDL" Offset="0xD50" />
-        <DList Name="gGoronSmallSnowballFragmentModelDL" Offset="0xDD8" />
-
-        <DList Name="gGoronSnowballDL" Offset="0x1560" /> <!-- Original name is "of1_snowgoroniwa_model" -->
-        <Blob Name="object_oF1d_map_Blob_001750" Size="0x20" Offset="0x1750" />
-        <Texture Name="gGoronSnowBallTex" OutName="goron_snow" Format="rgba16" Width="32" Height="64" Offset="0x1770" />
-        <Blob Name="object_oF1d_map_Blob_002770" Size="0x800" Offset="0x2770" />
-
-        <!-- Steam -->
-        <Texture Name="gGoronSteamTex" OutName="goron_steam" Format="i4" Width="32" Height="32" Offset="0x2F70" />
-        <DList Name="gGoronSteamMaterialDL" Offset="0x31A0" />
-        <DList Name="gGoronSteamModelDL" Offset="0x3258" />
-
-        <!-- Unused -->
-        <DList Name="object_oF1d_map_DL_003280" Offset="0x3280" />
-        <DList Name="object_oF1d_map_DL_003298" Offset="0x3298" />
-
-        <DList Name="object_oF1d_map_DL_003330" Offset="0x3330" />
-        <DList Name="object_oF1d_map_DL_003340" Offset="0x3340" />
-
-        <!-- Animations -->
-        <Animation Name="gGoronCoverEarsAnim" Offset="0x3650" /> <!-- Original name is "goron_urusaina" -->
-        <Animation Name="gGoronDropKegAnim" Offset="0x39D8" /> <!-- Original name is "gr_gift_bom" -->
-        <Animation Name="gGoronShiverAnim" Offset="0x3E28" /> <!-- Original name is "gr_samui" -->
-
-        <!-- Don Gero's Mask -->
-        <DList Name="gGoronDonGeroMaskDL" Offset="0x4DB0" />
-        <Texture Name="gGoronDonGeroMaskTLUT" OutName="goron_don_gero_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5340" />
-        <Texture Name="gGoronDonGeroMaskBottomTex" OutName="goron_don_gero_mask_bottom" Format="ci8" Width="16" Height="16" Offset="0x5540" />
-        <Texture Name="gGoronDonGeroMaskToesTex" OutName="goron_don_gero_mask_toes" Format="rgba16" Width="32" Height="32" Offset="0x5640" />
-        <Texture Name="gGoronDonGeroMaskTopTex" OutName="goron_don_gero_mask_top" Format="ci8" Width="16" Height="16" Offset="0x5E40" />
-        <Texture Name="gGoronDonGeroMaskNostrilTex" OutName="goron_don_gero_mask_nostril" Format="ci8" Width="32" Height="32" Offset="0x5F40" />
-        <Texture Name="gGoronDonGeroMaskMouthTex" OutName="goron_don_gero_mask_mouth" Format="ci8" Width="16" Height="16" Offset="0x6340" />
-        <Texture Name="gGoronDonGeroMaskFrillsTex" OutName="goron_don_gero_mask_frills" Format="rgba16" Width="32" Height="32" Offset="0x6440" />
-        <Texture Name="gGoronDonGeroMaskEyeTex" OutName="goron_don_gero_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x6C40" />
-
-        <!-- Scared -->
-        <!-- Unused leftover from OoT -->
-        <DList Name="gGoronEmptyDL" Offset="0x7A60" />
-        <DList Name="gGoronScaredDL" Offset="0x7A68" />
-        <Texture Name="gGoronScaredTLUT" OutName="goron_scared_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7EF0" />
-        <Texture Name="gGoronScaredSkinTex" OutName="goron_scared_skin" Format="ci8" Width="16" Height="16" Offset="0x80F0" />
-        <Texture Name="gGoronScaredBellyButtonTex" OutName="goron_scared_belly_button" Format="ci8" Width="8" Height="8" Offset="0x81F0" />
-        <Texture Name="gGoronScaredBottomTex" OutName="goron_scared_bottom" Format="ci8" Width="8" Height="16" Offset="0x8230" />
-        <Texture Name="gGoronScaredRocksTex" OutName="goron_scared_rocks" Format="ci8" Width="32" Height="64" Offset="0x82B0" />
-        <Texture Name="gGoronScaredHairTex" OutName="goron_scared_hair" Format="ci8" Width="16" Height="16" Offset="0x8AB0" />
-
-        <!-- Rolled Up -->
-        <DList Name="gGoronEmpty2DL" Offset="0x91A0" />
-        <DList Name="gGoronRolledUpDL" Offset="0x91A8" /> <!-- Original name is "oF1d_iwa2_model" -->
-        <Texture Name="gGoronRolledUpTLUT" OutName="goron_rolled_up_tlut" Format="rgba16" Width="16" Height="16" Offset="0x94E0" />
-        <Texture Name="gGoronRolledUpSkinTex" OutName="goron_rolled_up_skin" Format="ci8" Width="16" Height="16" Offset="0x96E0" />
-        <Texture Name="gGoronRolledUpBellyButtonTex" OutName="goron_rolled_up_belly_button" Format="ci8" Width="8" Height="8" Offset="0x97E0" />
-        <Texture Name="gGoronRolledUpBottomTex" OutName="goron_rolled_up_bottom" Format="ci8" Width="8" Height="16" Offset="0x9820" />
-        <Texture Name="gGoronRolledUpRocksTex" OutName="goron_rolled_up_rocks" Format="ci8" Width="32" Height="64" Offset="0x98A0" />
-
-        <!-- Animation -->
-        <Animation Name="gGoronTPoseAnim" Offset="0xA118" /> <!-- Original name is "ng_kihon" -->
-
-        <!-- DLists -->
-        <DList Name="gGoronBodyDL" Offset="0xCC50" />
-        <DList Name="gGoronHeadDL" Offset="0xCF70" />
-        <DList Name="gGoronRightUpperArmDL" Offset="0xD688" />
-        <DList Name="gGoronRightForearmDL" Offset="0xD808" />
-        <DList Name="gGoronRightHandDL" Offset="0xD938" />
-        <DList Name="gGoronLeftUpperArmDL" Offset="0xDBB8" />
-        <DList Name="gGoronLeftForearmDL" Offset="0xDD38" />
-        <DList Name="gGoronLeftHandDL" Offset="0xDE68" />
-        <DList Name="gGoronPelvisDL" Offset="0xE070" />
-        <DList Name="gGoronRightThighDL" Offset="0xE130" />
-        <DList Name="gGoronRightShinDL" Offset="0xE218" />
-        <DList Name="gGoronRightFootDL" Offset="0xE348" />
-        <DList Name="gGoronLeftThighDL" Offset="0xE610" />
-        <DList Name="gGoronLeftShinDL" Offset="0xE6F8" />
-        <DList Name="gGoronLeftFootDL" Offset="0xE828" />
-
-        <!-- Textures -->
-        <Texture Name="gGoronTLUT" OutName="goron_tlut" Format="rgba16" Width="16" Height="16" Offset="0xEA78" />
-        <Texture Name="gGoronEyeTLUT" OutName="goron_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xEC78" />
-        <Texture Name="gGoronSkinTex" OutName="goron_skin" Format="ci8" Width="16" Height="16" Offset="0xEE78" />
-        <Texture Name="gGoronFingersTex" OutName="goron_fingers" Format="ci8" Width="16" Height="16" Offset="0xEF78" />
-        <Texture Name="gGoronTatooTex" OutName="goron_tatoo" Format="ci8" Width="32" Height="32" Offset="0xF078" />
-        <Texture Name="gGoronToesTex" OutName="goron_toes" Format="ci8" Width="32" Height="16" Offset="0xF478" />
-        <Texture Name="gGoronFootTex" OutName="goron_foot" Format="ci8" Width="32" Height="32" Offset="0xF678" />
-        <Texture Name="gGoronNostrilTex" OutName="goron_nostril" Format="ci8" Width="8" Height="8" Offset="0xFA78" />
-        <Texture Name="gGoronBottomTex" OutName="goron_bottom" Format="ci8" Width="8" Height="16" Offset="0xFAB8" />
-        <Texture Name="gGoronsRocksTex" OutName="goron_rocks" Format="ci8" Width="32" Height="64" Offset="0xFB38" />
-        <Texture Name="gGoronHairTex" OutName="goron_hair" Format="ci8" Width="16" Height="16" Offset="0x10338" />
-        <Texture Name="gGoronEyeOpenTex" OutName="goron_eye_open" Format="ci8" Width="32" Height="32" Offset="0x10438" />
-        <Texture Name="gGoronEyeClosed2Tex" OutName="goron_eye_closed2" Format="ci8" Width="32" Height="32" Offset="0x10838" />
-        <Texture Name="gGoronEyeHalfTex" OutName="goron_eye_half" Format="ci8" Width="32" Height="32" Offset="0x10C38" />
-        <Texture Name="gGoronEyeClosedTex" OutName="goron_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x11038" />
-        <Texture Name="gGoronLipsTex" OutName="goron_lips" Format="rgba16" Width="8" Height="8" Offset="0x11438" />
-        <Texture Name="gGoronDimpleTex" OutName="goron_dimple" Format="ci8" Width="16" Height="16" Offset="0x114B8" />
-        <Texture Name="gGoronBeardTex" OutName="goron_beard" Format="rgba16" Width="32" Height="16" Offset="0x115B8" />
-
-        <!-- Skeleton -->
-        <Limb Name="gGoronRootLimb" Type="Standard" EnumName="GORON_LIMB_ROOT" Offset="0x119B8" />
-        <Limb Name="gGoronPelvisLimb" Type="Standard" EnumName="GORON_LIMB_PELVIS" Offset="0x119C4" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <Limb Name="gGoronLegsRootLimb" Type="Standard" EnumName="GORON_LIMB_LEGS_ROOT" Offset="0x119D0" />
-        <Limb Name="gGoronLeftThighLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_THIGH" Offset="0x119DC" />
-        <Limb Name="gGoronLeftShinLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_SHIN" Offset="0x119E8" />
-        <Limb Name="gGoronLeftFootLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_FOOT" Offset="0x119F4" />
-        <Limb Name="gGoronRightThighLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_THIGH" Offset="0x11A00" />
-        <Limb Name="gGoronRightShinLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_SHIN" Offset="0x11A0C" />
-        <Limb Name="gGoronRightFootLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_FOOT" Offset="0x11A18" />
-        <Limb Name="gGoronBodyLimb" Type="Standard" EnumName="GORON_LIMB_BODY" Offset="0x11A24" />
-        <Limb Name="gGoronLeftUpperArmLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_UPPER_ARM" Offset="0x11A30" />
-        <Limb Name="gGoronLeftForearmLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_FOREARM" Offset="0x11A3C" />
-        <Limb Name="gGoronLeftHandLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_HAND" Offset="0x11A48" />
-        <Limb Name="gGoronRightUpperArmLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_UPPER_ARM" Offset="0x11A54" />
-        <Limb Name="gGoronRightForearmLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_FOREARM" Offset="0x11A60" />
-        <Limb Name="gGoronRightHandLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_HAND" Offset="0x11A6C" />
-        <Limb Name="gGoronHeadLimb" Type="Standard" EnumName="GORON_LIMB_HEAD" Offset="0x11A78" />
-        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" LimbNone="GORON_LIMB_NONE" LimbMax="GORON_LIMB_MAX" EnumName="GoronLimb" Offset="0x11AC8" />
-
-        <!-- Animations -->
-        <Animation Name="gGoronLyingDownIdleAnim" Offset="0x11D98" /> <!-- Original name is "oF1d_chyu_goron" -->
-        <Animation Name="gGoronUnrollAnim" Offset="0x12DE0" /> <!-- Original name is "oF1d_konnnichiwa" -->
-        <Animation Name="gGoronShiveringSurprisedAnim" Offset="0x135E8" /> <!-- Original name is "ofx_odoroku" -->
-        <Animation Name="gGoronStandingHandTappingAnim" Offset="0x13DB0" /> <!-- Original name is "ofx_uri" -->
-        <Animation Name="gGoronSleepyAnim" Offset="0x143AC" /> <!-- Original name is "ofx_wabi" -->
-        <Animation Name="gGoronStandingIdleAnim" Offset="0x14CE0" /> <!-- Original name is "ofx_wait01" -->
-
-        <!-- Dust -->
-        <DList Name="gGoronDustMaterialDL" Offset="0x14CF0" />
-        <DList Name="gGoronDustModelDL" Offset="0x14D00" /> <!-- Original name might be "snowgoron_effct_set" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ob.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ob.xml
deleted file mode 100644
index 1d4447de5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ob.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<Root>
-    <!-- Object for MoonChild and his four Masks -->
-    <File Name="object_ob" Segment="6">
-    
-        <!-- Moonchild Mask DisplayLists -->
-        <DList Name="gMoonChildOdolwasMaskDL" Offset="0x690" />
-        <DList Name="gMoonChildGyorgsMaskDL" Offset="0x1D80" />
-        <DList Name="gMoonChildGohtsMaskDL" Offset="0x3AD0" />
-        <DList Name="gMoonChildTwinmoldsMaskDL" Offset="0x5020" />
-        <DList Name="gMoonChildMajorasMaskDL" Offset="0x6380" /> <!-- Original name is "mjk_evilmask_model" -->
-        <DList Name="gMoonChildMajorasMaskEyesDL" Offset="0x6730" /> <!-- Original name is "mjk_evLIGHTeye_model" -->
-
-        <!-- Moonchild Mask Textures -->
-        <Texture Name="gMoonChildMajorasMaskTex" OutName="moonchild_majoras_mask" Format="rgba16" Width="32" Height="64" Offset="0x67E0" />
-        <Texture Name="gMoonChildMajorasMaskSpike1Tex" OutName="moonchild_majoras_mask_spike_1" Format="rgba16" Width="16" Height="16" Offset="0x77E0" />
-        <Texture Name="gMoonChildMajorasMaskSpike2Tex" OutName="moonchild_majoras_mask_spike_2" Format="rgba16" Width="16" Height="16" Offset="0x79E0" />
-        <Texture Name="gMoonChildMajorasMaskSpike3Tex" OutName="moonchild_majoras_mask_spike_3" Format="rgba16" Width="16" Height="16" Offset="0x7BE0" />
-        <Texture Name="gMoonChildMajorasMaskSpike4Tex" OutName="moonchild_majoras_mask_spike_4" Format="rgba16" Width="16" Height="16" Offset="0x7DE0" />
-        <Texture Name="gMoonChildMajorasMaskBackTex" OutName="moonchild_majoras_mask_back" Format="rgba16" Width="32" Height="32" Offset="0x7FE0" />
-        <Texture Name="gMoonChildMajorasMaskEyesTex" OutName="moonchild_majoras_mask_eyes" Format="rgba16" Width="32" Height="32" Offset="0x87E0" />
-        <Texture Name="gMoonChildOdolwasMaskFaceTLUT" OutName="moonchild_odolwas_mask_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8FE0" />
-        <Texture Name="gMoonChildOdolwasMaskEarTLUT" OutName="moonchild_odolwas_mask_ear_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9000" />
-        <Texture Name="gMoonChildGyorgsMaskSkinTLUT" OutName="moonchild_gyorgs_mask_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9020" />
-        <Texture Name="gMoonChildGyorgsMaskMouthTLUT" OutName="moonchild_gyorgs_mask_mouth_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9040" />
-        <Texture Name="gMoonChildGyorgsMaskToothHornTLUT" OutName="moonchild_gyorgs_mask_tooth_horn_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9060" />
-        <Texture Name="gMoonChildTwinmoldsMaskSkinTLUT" OutName="moonchild_twinmolds_mask_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9080" />
-        <Texture Name="gMoonChildTwinmoldsMaskSnoutTLUT" OutName="moonchild_twinmolds_snout_tlut" Format="rgba16" Width="4" Height="4" Offset="0x90A0" />
-        <Texture Name="gMoonChildOdolwasMaskPlumeTex" OutName="moonchild_odolwas_mask_plume" Format="rgba16" Width="16" Height="16" Offset="0x90C0" />
-        <Texture Name="gMoonChildOdolwasMaskFaceTex" OutName="moonchild_odolwas_mask_face" Format="ci4" Width="64" Height="64" Offset="0x92C0" />
-        <Texture Name="gMoonChildOdolwasMaskEarTex" OutName="moonchild_odolwas_mask_ear" Format="ci4" Width="64" Height="64" Offset="0x9AC0" />
-        <Texture Name="gMoonChildGyorgsTwinmoldsMaskEyeTex" OutName="moonchild_gyorgs_twinmolds_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0xA2C0" />
-        <Texture Name="gMoonChildGyorgsMaskSkinTex" OutName="moonchild_gyorgs_mask_skin" Format="ci4" Width="64" Height="64" Offset="0xAAC0" />
-        <Texture Name="gMoonChildGyorgsMaskMouthTex" OutName="moonchild_gyorgs_mask_mouth" Format="ci4" Width="64" Height="64" Offset="0xB2C0" />
-        <Texture Name="gMoonChildGyorgsMaskToothHornTex" OutName="moonchild_gyorgs_mask_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0xBAC0" />
-        <Texture Name="gMoonChildGohtsMaskEyeTex" OutName="moonchild_gohts_mask_eye" Format="rgba16" Width="32" Height="64" Offset="0xBB40" />
-        <Texture Name="gMoonChildGohtsMaskTopPatternTex" OutName="moonchild_gohts_mask_top_pattern" Format="rgba16" Width="32" Height="64" Offset="0xCB40" />
-        <Texture Name="gMoonChildGohtsTwinmoldsMaskPatternTex" OutName="moonchild_goht_twinmold_mask_pattern" Format="rgba16" Width="32" Height="64" Offset="0xDB40" />
-        <Texture Name="gMoonChildGohtsMaskSpikeTwinmoldsMaskMandibleTex" OutName="moonchild_gohts_mask_spike_twinmolds_mask_mandible" Format="rgba16" Width="32" Height="32" Offset="0xEB40" />
-        <Texture Name="gMoonChildTwinmoldsMaskSkinTex" OutName="moonchild_twinmolds_mask_skin" Format="ci4" Width="64" Height="64" Offset="0xF340" />
-        <Texture Name="gMoonChildTwinmoldsMaskSnoutTex" OutName="moonchild_twinmolds_mask_snout" Format="ci4" Width="64" Height="64" Offset="0xFB40" />
-
-        <!-- Moonchild Moving Animations -->
-        <Animation Name="gMoonChildWalkingAnim" Offset="0x10880" /> <!-- Original name is "mjk_run" -->
-        <Animation Name="gMoonChildRunningAnim" Offset="0x10CD8" /> <!-- Original name is "mjk_run2" -->
-
-        <!-- Moonchild DisplayLists -->
-        <DList Name="gMoonChildPelvisDL" Offset="0x14190" />
-        <DList Name="gMoonChildLeftThighDL" Offset="0x142C0" />
-        <DList Name="gMoonChildLeftLegDL" Offset="0x144D0" />
-        <DList Name="gMoonChildLeftFootDL" Offset="0x14638" />
-        <DList Name="gMoonChildRightThighDL" Offset="0x147A0" />
-        <DList Name="gMoonChildRightLegDL" Offset="0x149B0" />
-        <DList Name="gMoonChildRightFootDL" Offset="0x14B18" />
-        <DList Name="gMoonChildChestBottomDL" Offset="0x14C80" />
-        <DList Name="gMoonChildChestDL" Offset="0x14DA0" />
-        <DList Name="gMoonChildHeadDL" Offset="0x14F18" />
-        <DList Name="gMoonChildLeftArmDL" Offset="0x15380" />
-        <DList Name="gMoonChildLeftForearmDL" Offset="0x154B0" />
-        <DList Name="gMoonChildLeftHandDL" Offset="0x155D0" />
-        <DList Name="gMoonChildRightArmDL" Offset="0x15758" />
-        <DList Name="gMoonChildRightForearmDL" Offset="0x15888" />
-        <DList Name="gMoonChildRightHandDL" Offset="0x159A8" />
-
-        <!-- Moonchild Textures -->
-        <Texture Name="gMoonChildTLUT" OutName="moonchild_tlut" Format="rgba16" Width="16" Height="16" Offset="0x15B28" />
-        <Texture Name="gMoonChildFingersTex" OutName="moonchild_fingers" Format="ci8" Width="16" Height="16" Offset="0x15D28" />
-        <Texture Name="gMoonChildThighSkinTex" OutName="moonchild_thigh_skin" Format="ci8" Width="8" Height="8" Offset="0x15E28" />
-        <Texture Name="gMoonChildTshirtDetailTex" OutName="moonchild_tshirt_detail" Format="ci8" Width="16" Height="32" Offset="0x15E68" />
-        <Texture Name="gMoonChildHairTex" OutName="moonchild_hair" Format="ci8" Width="8" Height="16" Offset="0x16068" />
-        <Texture Name="gMoonChildEarTex" OutName="moonchild_ear" Format="ci8" Width="8" Height="8" Offset="0x160E8" />
-        <Texture Name="gMoonChildBackHairTex" OutName="moonchild_back_hair" Format="ci8" Width="8" Height="16" Offset="0x16128" />
-        <Texture Name="gMoonChildTshirtNecklineTex" OutName="moonchild_tshirt_neckline" Format="ci8" Width="16" Height="32" Offset="0x161A8" />
-
-        <!-- Moonchild Limbs -->
-        <Limb Name="gMoonChildRootLimb" Type="Standard" EnumName="MOONCHILD_LIMB_ROOT" Offset="0x163A8" />
-        <Limb Name="gMoonChildWaistLimb" Type="Standard" EnumName="MOONCHILD_LIMB_WAIST" Offset="0x163B4" />
-        <Limb Name="gMoonChildTorsoLimb" Type="Standard" EnumName="MOONCHILD_LIMB_TORSO" Offset="0x163C0" />
-        <Limb Name="gMoonChildLeftUpperArmLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_UPPER_ARM" Offset="0x163CC" />
-        <Limb Name="gMoonChildLeftForearmLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_FOREARM" Offset="0x163D8" />
-        <Limb Name="gMoonChildLeftHandLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_HAND" Offset="0x163E4" />
-        <Limb Name="gMoonChildRightUpperArmLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_UPPER_ARM" Offset="0x163F0" />
-        <Limb Name="gMoonChildRightForearmLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_FOREARM" Offset="0x163FC" />
-        <Limb Name="gMoonChildRightHandLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_HAND" Offset="0x16408" />
-        <Limb Name="gMoonChildHeadLimb" Type="Standard" EnumName="MOONCHILD_LIMB_HEAD" Offset="0x16414" />
-        <Limb Name="gMoonChildPelvisLimb" Type="Standard" EnumName="MOONCHILD_LIMB_PELVIS" Offset="0x16420" />
-        <Limb Name="gMoonChildLeftThighLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_THIGH" Offset="0x1642C" />
-        <Limb Name="gMoonChildLeftShinLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_SHIN" Offset="0x16438" />
-        <Limb Name="gMoonChildLeftFootLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_FOOT" Offset="0x16444" />
-        <Limb Name="gMoonChildRightThighLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_THIGH" Offset="0x16450" />
-        <Limb Name="gMoonChildRightShinLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_SHIN" Offset="0x1645C" />
-        <Limb Name="gMoonChildRightFootLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_FOOT" Offset="0x16468" />
-
-        <!-- Moonchild Skeleton -->
-        <Skeleton Name="gMoonChildSkel" Type="Flex" LimbType="Standard" LimbNone="MOONCHILD_LIMB_NONE" LimbMax="MOONCHILD_LIMB_MAX" EnumName="MoonchildLimb" Offset="0x164B8" />
-
-        <!-- Moonchild Mask Still Animations -->
-        <Animation Name="gMoonChildGettingUpAnim" Offset="0x16F58" /> <!-- Original name is "mjk_suwari2wait" -->
-        <Animation Name="gMoonChildSittingAnim" Offset="0x1764C" /> <!-- Original name is "mjk_suwariloop" -->
-        <Animation Name="gMoonChildStandingAnim" Offset="0x17E98" /> <!-- Original name is "mjk_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_chan.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_chan.xml
deleted file mode 100644
index 108669b0e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_chan.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Object for the Goron Shrine Chandelier -->
-    <File Name="object_obj_chan" Segment="6">
-        <DList Name="gChandelierPotHolderDL" Offset="0xA10" /> <!-- Original name is "z2_16_tubo01_modelT" -->
-        <DList Name="gChandelierCenterDL" Offset="0xAF0" /> <!-- Original name is "z2_16_tubo01_model" -->
-        <Texture Name="gChandelierCenterBottomTex" OutName="chandelier_center_bottom" Format="rgba16" Width="32" Height="32" Offset="0xD80" />
-        <Texture Name="gChandelierCenterTopTex" OutName="chandelier_center_top" Format="rgba16" Width="32" Height="32" Offset="0x1580" />
-        <Texture Name="gChandelierChainTex" OutName="chandelier_chain" Format="ia4" Width="16" Height="32" Offset="0x1D80" />
-        <Texture Name="gChandelierPotHolderTex" OutName="chandelier_pot_holder" Format="i8" Width="32" Height="8" Offset="0x1E80" />
-        <DList Name="gChandelierEmptyDL" Offset="0x2350" /> <!-- Original name is "z2_16_tubo02_modelT" -->
-        <DList Name="gChandelierPotDL" Offset="0x2358" /> <!-- Original name is "z2_16_tubo02_model" -->
-        <Texture Name="gChandelierPotTex" OutName="chandelier_pot" Format="rgba16" Width="32" Height="64" Offset="0x24F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_danpeilift.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_danpeilift.xml
deleted file mode 100644
index 882ce1bce..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_danpeilift.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_obj_danpeilift" Segment="6">
-        <DList Name="object_obj_danpeilift_DL_000180" Offset="0x180" /> <!-- Original name is "Y2_DANPEI_lift_model2" -->
-        <Texture Name="object_obj_danpeilift_Tex_000298" OutName="tex_000298" Format="rgba16" Width="32" Height="32" Offset="0x298" />
-        <Collision Name="object_obj_danpeilift_Colheader_000BA0" Offset="0xBA0" /> <!-- Original name is "Y2_DANPEI_lift_bgdatainfo2" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_dinner.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_dinner.xml
deleted file mode 100644
index f73716464..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_dinner.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_obj_dinner" Segment="6">
-        <DList Name="object_obj_dinner_DL_0011E0" Offset="0x11E0" /> <!-- Original name is "obj_dinner_model" -->
-        <DList Name="object_obj_dinner_DL_001AA0" Offset="0x1AA0" /> <!-- Original name might be "objT_model" -->
-        <Texture Name="object_obj_dinner_Tex_001B38" OutName="tex_001B38" Format="rgba16" Width="4" Height="32" Offset="0x1B38" />
-        <Texture Name="object_obj_dinner_Tex_001C38" OutName="tex_001C38" Format="rgba16" Width="16" Height="16" Offset="0x1C38" />
-        <Texture Name="object_obj_dinner_Tex_001E38" OutName="tex_001E38" Format="rgba16" Width="16" Height="16" Offset="0x1E38" />
-        <Texture Name="object_obj_dinner_Tex_002038" OutName="tex_002038" Format="rgba16" Width="16" Height="16" Offset="0x2038" />
-        <Texture Name="object_obj_dinner_Tex_002238" OutName="tex_002238" Format="rgba16" Width="16" Height="32" Offset="0x2238" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_milk_bin.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_milk_bin.xml
deleted file mode 100644
index e67e0b15f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_milk_bin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_obj_milk_bin" Segment="6">
-        <DList Name="gMilkBinMilkJarDL" Offset="0x4B0" /> <!-- Original name is "obj_mlk_simplebin_model" -->
-        <Texture Name="object_obj_milk_bin_TLUT_0007C0" OutName="tlut_0007C0" Format="rgba16" Width="16" Height="16" Offset="0x7C0" />
-        <Texture Name="object_obj_milk_bin_Tex_0009C0" OutName="tex_0009C0" Format="ci8" Width="8" Height="8" Offset="0x9C0" />
-        <Texture Name="object_obj_milk_bin_Tex_000A00" OutName="tex_000A00" Format="ci8" Width="32" Height="64" Offset="0xA00" />
-        <Texture Name="object_obj_milk_bin_Tex_001200" OutName="tex_001200" Format="rgba16" Width="32" Height="32" Offset="0x1200" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_tokeidai.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_tokeidai.xml
deleted file mode 100644
index 9822eb149..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_tokeidai.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<Root>
-    <!-- Contains objects related to the Clock Tower and various wall clocks. -->
-    <File Name="object_obj_tokeidai" Segment="6">
-        <Texture Name="gClockTowerClockFaceTopTLUT" OutName="clock_tower_clock_face_top_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gClockTowerClockFaceBottomTLUT" OutName="clock_tower_clock_face_bottom_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20" />
-        <Texture Name="gClockTowerSpotlightShineTex" OutName="clock_tower_spotlight_shine" Format="i8" Width="64" Height="64" Offset="0x40" />
-
-        <!-- Generic brick texture used for multiple pieces of the Clock Tower (counterweight, unused tower wall, staircase to rooftop) -->
-        <Texture Name="gClockTowerBrickTex" OutName="clock_tower_bricks" Format="rgba16" Width="32" Height="32" Offset="0x1040" />
-        <Texture Name="gClockTowerCounterweightBeamSide1Tex" OutName="clock_tower_counterweight_beam_side1" Format="rgba16" Width="32" Height="32" Offset="0x1840" />
-        <Texture Name="gClockTowerCounterweightBeamSide2Tex" OutName="clock_tower_counterweight_beam_side2" Format="rgba16" Width="32" Height="32" Offset="0x2040" />
-        <Texture Name="gClockTowerExteriorGearFaceTex" OutName="clock_tower_exterior_gear_face" Format="rgba16" Width="32" Height="32" Offset="0x2840" />
-        <Texture Name="gClockTowerExteriorGearSidesAndMinuteRingBackTex" OutName="clock_tower_exterior_gear_sides_and_minute_ring_back" Format="rgba16" Width="16" Height="32" Offset="0x3040" />
-        <Texture Name="gClockTowerClockCenterTex" OutName="clock_tower_clock_center" Format="rgba16" Width="8" Height="32" Offset="0x3440" />
-        <Texture Name="gClockTowerClockCenterSidesTex" OutName="clock_tower_clock_center_sides" Format="rgba16" Width="16" Height="16" Offset="0x3640" />
-        <Texture Name="gClockTowerHandTex" OutName="clock_tower_hand" Format="rgba16" Width="16" Height="16" Offset="0x3840" />
-        <Texture Name="gClockTowerSunAndMoonPanelSidesTex" OutName="clock_tower_sun_and_moon_panel_sides" Format="rgba16" Width="16" Height="16" Offset="0x3A40" />
-        <Texture Name="gClockTowerSunAndMoonPanelMoonTex" OutName="clock_tower_sun_and_moon_panel_moon" Format="rgba16" Width="16" Height="32" Offset="0x3C40" />
-        <Texture Name="gClockTowerSunAndMoonPanelSunTex" OutName="clock_tower_sun_and_moon_panel_sun" Format="rgba16" Width="16" Height="16" Offset="0x4040" />
-        <Texture Name="gClockTowerMinuteRingFace1Tex" OutName="clock_tower_minute_ring_face_1" Format="rgba16" Width="32" Height="16" Offset="0x4240" />
-        <Texture Name="gClockTowerMinuteRingFace2Tex" OutName="clock_tower_minute_ring_face_2" Format="rgba16" Width="32" Height="16" Offset="0x4640" />
-        <Texture Name="gClockTowerMinuteRingFace3Tex" OutName="clock_tower_minute_ring_face_3" Format="rgba16" Width="32" Height="16" Offset="0x4A40" />
-        <Texture Name="gClockTowerMinuteRingSidesTex" OutName="clock_tower_minute_ring_sides" Format="rgba16" Width="32" Height="16" Offset="0x4E40" />
-        <Texture Name="gClockTowerClockFaceTopTex" OutName="clock_tower_clock_face_top" Format="ci4" Width="64" Height="64" Offset="0x5240" />
-        <Texture Name="gClockTowerClockFaceBottomTex" OutName="clock_tower_clock_face_bottom" Format="ci4" Width="64" Height="64" Offset="0x5A40" />
-        <Texture Name="gClockTowerClockFacePanelBarTex" OutName="clock_tower_clock_face_panel_bar" Format="rgba16" Width="8" Height="8" Offset="0x6240" />
-        <Texture Name="gClockTowerUnusedBrickTex" OutName="clock_tower_unused_bricks" Format="rgba16" Width="32" Height="32" Offset="0x62C0" />
-        <Texture Name="gClockTowerUnusedMaskTex" OutName="clock_tower_unused_mask" Format="i4" Width="64" Height="64" Offset="0x6AC0" />
-        <Texture Name="gClockTowerSpotlightBeamTex" OutName="clock_tower_spotlight_beam" Format="ia8" Width="32" Height="64" Offset="0x72C0" />
-        <Texture Name="gClockTowerSpotlightMaskTex" OutName="clock_tower_spotlight_mask" Format="i8" Width="32" Height="32" Offset="0x7AC0" />
-        <Texture Name="gClockTowerCounterweightMaskTex" OutName="clock_tower_counterweight_mask" Format="i4" Width="64" Height="64" Offset="0x7EC0" />
-        <Texture Name="gClockTowerUnusedTowerWallMaskTex" OutName="clock_tower_unused_tower_wall_mask" Format="i4" Width="64" Height="64" Offset="0x86C0" />
-        <Texture Name="gClockTowerStaircaseToRooftopMaskTex" OutName="clock_tower_staircase_to_rooftop_mask" Format="i4" Width="64" Height="64" Offset="0x8EC0" />
-
-        <DList Name="gClockTowerUnusedEmpty1DL" Offset="0x9A00" /> <!-- Not present in MM3D, but it was probably named "z2_00_tokeitou_modelT" -->
-        <DList Name="gClockTowerTerminaFieldWallsDL" Offset="0x9A08" /> <!-- Original name is "z2_00_tokeitou_model" ("clock tower") -->
-        <Texture Name="gClockTowerTerminaFieldWallsBrickTex" OutName="clock_tower_termina_field_walls_brick" Format="rgba16" Width="32" Height="32" Offset="0x9B48" />
-        <Texture Name="gClockTowerTerminaFieldWallsMaskTex" OutName="clock_tower_termina_field_walls_mask" Format="i4" Width="64" Height="64" Offset="0xA348" />
-        <DList Name="gClockTowerSpotlightDL" Offset="0xB0C0" /> <!-- Original name is "z2_atama_modelT" -->
-        <DList Name="gClockTowerCounterweightDL" Offset="0xB208" /> <!-- Original name is "z2_atama_model" -->
-        <TextureAnimation Name="gClockTowerUnusedTexAnim" Offset="0xB4E4" />
-
-        <DList Name="gClockTowerUnusedEmpty2DL" Offset="0xBA70" /> <!-- Not present in MM3D, but it was probably named "z2_hagu_modelT" -->
-        <DList Name="gClockTowerExteriorGearDL" Offset="0xBA78" /> <!-- Original name is "z2_hagu_model" ("gear; cogwheel​") -->
-
-        <DList Name="gClockTowerUnusedEmpty3DL" Offset="0xBEE0" /> <!-- Not present in MM3D, but it was probably named "z2_hari_modelT" -->
-        <DList Name="gClockTowerClockCenterAndHandDL" Offset="0xBEE8" /> <!-- Original name is "z2_hari_model" ("hand (e.g. clock, etc.); pointer​") -->
-
-        <DList Name="gClockTowerUnusedEmpty4DL" Offset="0xC360" /> <!-- Not present in MM3D, but it was probably named "z2_paneru_modelT" -->
-        <DList Name="gClockTowerSunAndMoonPanelDL" Offset="0xC368" /> <!-- Original name is "z2_paneru_model" (probably just literally "panel") -->
-
-        <DList Name="gClockTowerUnusedEmpty5DL" Offset="0xCF20" /> <!-- Not present in MM3D, but it was probably named "z2_tannsin_modelT" -->
-        <DList Name="gClockTowerMinuteRingDL" Offset="0xCF28" /> <!-- Original name is "z2_tannsin_model" ("short hand; hour hand") -->
-
-        <DList Name="gClockTowerUnusedEmpty6DL" Offset="0xD380" /> <!-- Not present in MM3D, but it was probably named "z2_tou_modelT" -->
-        <DList Name="gClockTowerUnusedTowerWallDL" Offset="0xD388" /> <!-- Original name might be "z2_tou_model" ("tower; steeple; spire​") -->
-
-        <!-- Used as the xluDList for Staircase to Rooftop -->
-        <DList Name="gClockTowerEmptyDL" Offset="0xD8E0" /> <!-- Not present in MM3D, but it was probably named "z2_towerkaidan_modelT" -->
-        <DList Name="gClockTowerStaircaseToRooftopDL" Offset="0xD8E8" /> <!-- Original name is "z2_towerkaidan_model" ("kaiden" = "stairs; stairway; staircase​") -->
-        <Texture Name="gClockTowerClockFaceBackTex" OutName="clock_tower_clock_face_back" Format="rgba16" Width="16" Height="32" Offset="0xDAC0" />
-
-        <DList Name="gClockTowerUnusedEmpty7DL" Offset="0xE810" /> <!-- Not present in MM3D, but it was probably named "z2_tyousin_modelT" -->
-        <DList Name="gClockTowerClockFaceDL" Offset="0xE818" /> <!-- Original name is "z2_tyousin_model" ("long hand; minute hand​") -->
-
-        <DList Name="gClockTowerUnusedEmpty8DL" Offset="0xF510" /> <!-- Not present in MM3D, but it was probably named "z2_tyousin_room_modelT" -->
-        <DList Name="gWallClockClockFaceDL" Offset="0xF518" /> <!-- Original name is "z2_tyousin_room_model" -->
-        <Texture Name="gWallClockClockFaceBackTex" OutName="wall_clock_clock_face_back" Format="rgba16" Width="16" Height="32" Offset="0xF7F8" />
-        <Texture Name="gWallClockClockFaceBottomTex" OutName="wall_clock_clock_face_bottom" Format="rgba16" Width="64" Height="32" Offset="0xFBF8" />
-        <Texture Name="gWallClockClockFaceTopTex" OutName="wall_clock_clock_face_top" Format="rgba16" Width="64" Height="32" Offset="0x10BF8" />
-        <Texture Name="gWallClockClockFacePanelBarTex" OutName="wall_clock_clock_face_panel_bar" Format="rgba16" Width="8" Height="8" Offset="0x11BF8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_usiyane.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_usiyane.xml
deleted file mode 100644
index 99e6e0cb1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_usiyane.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_obj_usiyane" Segment="6">
-        <DList Name="object_obj_usiyane_DL_000090" Offset="0x90" /> <!-- Original name is "z2_usiwara_modelT" -->
-        <DList Name="object_obj_usiyane_DL_000098" Offset="0x98" /> <!-- Original name is "z2_usiwara_model" -->
-        <Texture Name="object_obj_usiyane_Tex_000130" OutName="tex_000130" Format="rgba16" Width="32" Height="16" Offset="0x130" />
-        <DList Name="object_obj_usiyane_DL_000830" Offset="0x830" /> <!-- Original name is "z2_usiyane_modelT" -->
-        <DList Name="object_obj_usiyane_DL_000838" Offset="0x838" /> <!-- Original name is "z2_usiyane_model" -->
-        <Texture Name="object_obj_usiyane_TLUT_0009C8" OutName="tlut_0009C8" Format="rgba16" Width="4" Height="4" Offset="0x9C8" />
-        <Texture Name="object_obj_usiyane_Tex_0009E8" OutName="tex_0009E8" Format="ci4" Width="64" Height="64" Offset="0x9E8" />
-        <Texture Name="object_obj_usiyane_Tex_0011E8" OutName="tex_0011E8" Format="rgba16" Width="64" Height="32" Offset="0x11E8" />
-        <Collision Name="object_obj_usiyane_Colheader_0022AC" Offset="0x22AC" /> <!-- Original name is "z2_usiyane_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_yasi.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_yasi.xml
deleted file mode 100644
index 5971fc744..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_obj_yasi.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Object for the Palm Tree(s) found at the Great Bay Coast -->
-    <File Name="object_obj_yasi" Segment="6">
-        <DList Name="gPalmTreeDL" Offset="0x360" /> <!-- Original name is "z2_yasi_model" -->
-        <Texture Name="gPalmTreeTLUT" OutName="palm_tree_tlut" Format="rgba16" Width="4" Height="4" Offset="0x630" />
-        <Texture Name="gPalmTreeFrondTex" OutName="palm_tree_frond" Format="ci4" Width="32" Height="128" Offset="0x650" />
-        <Texture Name="gPalmTreeDekuNutTex" OutName="palm_tree_deku_nut" Format="rgba16" Width="16" Height="16" Offset="0xE50" />
-        <Texture Name="gPalmTreeScarredWoodTex" OutName="palm_tree_scarred_wood" Format="rgba16" Width="16" Height="16" Offset="0x1050" />
-        <Texture Name="gPalmTreeWoodTex" OutName="palm_tree_wood" Format="rgba16" Width="8" Height="8" Offset="0x1250" />
-        <Collision Name="gPalmTreeCol" Offset="0x1428" /> <!-- Original name is "z2_yasi_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_okuta.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_okuta.xml
deleted file mode 100644
index cad1c57bd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_okuta.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<Root>
-    <!-- Assets for Octoroks -->
-    <File Name="object_okuta" Segment="6">
-        <Animation Name="gOctorokShootAnim" Offset="0x44C" /> <!-- Original name is "oc_atack" -->
-
-        <!-- Octorok Limb DisplayLists -->
-        <DList Name="gFrontRightArmBaseDL" Offset="0xDC0" />
-        <DList Name="gFrontRightArmMiddleDL" Offset="0xE70" />
-        <DList Name="gFrontRightArmEndDL" Offset="0xF28" />
-        <DList Name="gBackRightArmBaseDL" Offset="0xFD8" />
-        <DList Name="gBackRightArmMiddleDL" Offset="0x1088" />
-        <DList Name="gBackRightArmEndDL" Offset="0x1140" />
-        <DList Name="gBackLeftArmBaseDL" Offset="0x11F0" />
-        <DList Name="gBackLeftArmMiddleDL" Offset="0x12A0" />
-        <DList Name="gBackLeftArmEndDL" Offset="0x1358" />
-        <DList Name="gFrontLeftArmBaseDL" Offset="0x1408" />
-        <DList Name="gFrontLeftArmMiddleDL" Offset="0x14B8" />
-        <DList Name="gFrontLeftArmEndDL" Offset="0x1570" />
-        <DList Name="gOctorokSnoutDL" Offset="0x1620" />
-        <DList Name="gOctorokUnderEyeTrianglesDL" Offset="0x1730" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokHeadBottomDL" Offset="0x17F0" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokHeadFrontDL" Offset="0x18B0" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokHeadTopDL" Offset="0x1970" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokHeadBackDL" Offset="0x1A38" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokEyesDL" Offset="0x1B18" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokHeadDL" Offset="0x1BE8" />
-        <DList Name="gOctorokBodyDL" Offset="0x1C20" />
-
-        <!-- Octorok Textures -->
-        <Texture Name="gOctorokRoughSkinTex" OutName="octorok_rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x1D20" />
-        <Texture Name="gOctorokMouthTex" OutName="octorok_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1F20" />
-        <Texture Name="gOctorokArmTex" OutName="octorok_arm" Format="rgba16" Width="16" Height="32" Offset="0x2020" />
-        <Texture Name="gOctorokFinTex" OutName="octorok_fin" Format="rgba16" Width="16" Height="16" Offset="0x2420" />
-        <Texture Name="gOctorokEyeTex" OutName="octorok_eye" Format="rgba16" Width="16" Height="16" Offset="0x2620" />
-        <Texture Name="gOctorokStripesTex" OutName="octorok_stripes" Format="rgba16" Width="8" Height="16" Offset="0x2820" />
-        <Texture Name="gOctorokScalesTex" OutName="octorok_scales" Format="rgba32" Width="16" Height="16" Offset="0x2920" />
-        <Texture Name="gOctorokScalesOoTTex" OutName="octorok_scales_oot" Format="rgba16" Width="16" Height="16" Offset="0x2D20" /> <!-- Unused OoT leftover -->
-        <Texture Name="gOctorokHeadBottomTex" OutName="octorok_head_bottom" Format="rgba16" Width="8" Height="8" Offset="0x2F20" />
-        <Texture Name="gOctorokShadedSkinTex" OutName="octorok_shaded_skin" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" />
-
-        <!-- Octorok Projectile Texture and DisplayList -->
-        <Texture Name="gOctorokProjectileTex" OutName="octorok_projectile" Format="rgba16" Width="16" Height="16" Offset="0x3020" />
-        <DList Name="gOctorokProjectileDL" Offset="0x3250" />
-
-        <!-- Octorok Limbs -->
-        <Limb Name="gOctorokBodyLimb" Type="Standard" EnumName="OCTOROK_LIMB_BODY" Offset="0x32E0" />
-        <Limb Name="gFrontLeftArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_LEFT_ARM_BASE" Offset="0x32EC" />
-        <Limb Name="gFrontLeftArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_LEFT_ARM_MIDDLE" Offset="0x32F8" />
-        <Limb Name="gFrontLeftArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_LEFT_ARM_END" Offset="0x3304" />
-        <Limb Name="gFrontRightArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_RIGHT_ARM_BASE" Offset="0x3310" />
-        <Limb Name="gFrontRightArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_RIGHT_ARM_MIDDLE" Offset="0x331C" />
-        <Limb Name="gFrontRightArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_RIGHT_ARM_END" Offset="0x3328" />
-        <Limb Name="gBackLeftArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_LEFT_ARM_BASE" Offset="0x3334" />
-        <Limb Name="gBackLeftArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_LEFT_ARM_MIDDLE" Offset="0x3340" />
-        <Limb Name="gBackLeftArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_LEFT_ARM_END" Offset="0x334C" />
-        <Limb Name="gBackRightArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_RIGHT_ARM_BASE" Offset="0x3358" />
-        <Limb Name="gBackRightArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_RIGHT_ARM_MIDDLE" Offset="0x3364" />
-        <Limb Name="gBackRightArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_RIGHT_ARM_END" Offset="0x3370" />
-        <Limb Name="gOctorokHeadLimb" Type="Standard" EnumName="OCTOROK_LIMB_HEAD" Offset="0x337C" />
-        <Limb Name="gOctorokSnoutLimb" Type="Standard" EnumName="OCTOROK_LIMB_SNOUT" Offset="0x3388" />
-
-        <!-- Octorok Skeleton -->
-        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" LimbNone="OCTOROK_LIMB_NONE" LimbMax="OCTOROK_LIMB_MAX" EnumName="OctorokLimb" Offset="0x33D0" />
-
-        <!-- Octorok Animations -->
-        <Animation Name="gOctorokDieAnim" Offset="0x3958" /> <!-- Original name is "oc_dead" -->
-        <Animation Name="gOctorokHideAnim" Offset="0x3B24" /> <!-- Original name is "oc_down" -->
-        <Animation Name="gOctorokFloatAnim" Offset="0x3EE4" /> <!-- Original name is "oc_float" -->
-        <Animation Name="gOctorokHitAnim" Offset="0x4204" /> <!-- Original name is "oc_predead" -->
-        <Animation Name="gOctorokAppearAnim" Offset="0x466C" /> <!-- Original name is "oc_up" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_omoya_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_omoya_obj.xml
deleted file mode 100644
index e5483bd19..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_omoya_obj.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_omoya_obj" Segment="6">
-        <DList Name="object_omoya_obj_DL_0001A0" Offset="0x1A0" /> <!-- Original name is "yane_model" -->
-        <Texture Name="object_omoya_obj_TLUT_0002D8" OutName="tlut_0002D8" Format="rgba16" Width="4" Height="4" Offset="0x2D8" />
-        <Texture Name="object_omoya_obj_Tex_0002F8" OutName="tex_0002F8" Format="rgba16" Width="64" Height="32" Offset="0x2F8" />
-        <Texture Name="object_omoya_obj_Tex_0012F8" OutName="tex_0012F8" Format="ci4" Width="64" Height="64" Offset="0x12F8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_open_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_open_obj.xml
deleted file mode 100644
index 3ad1dd436..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_open_obj.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Root>
-    <File Name="object_open_obj" Segment="6">
-        <DList Name="object_open_obj_DL_0003E0" Offset="0x3E0" /> <!-- Original name is "m2_OPNshutter_modelT" -->
-        <DList Name="object_open_obj_DL_0003E8" Offset="0x3E8" /> <!-- Original name is "m2_OPNshutter_model" -->
-        <Texture Name="object_open_obj_Tex_000558" OutName="tex_000558" Format="rgba16" Width="32" Height="64" Offset="0x558" />
-        <Collision Name="object_open_obj_Colheader_001640" Offset="0x1640" /> <!-- Original name is "m2_OPNshutter_bgdatainfo" -->
-        <DList Name="gSpotlightLeftDL" Offset="0x1A60" /> <!-- Original name is "m2_SPOT_modelT" -->
-        <DList Name="gSpotlightRightDL" Offset="0x1B40" /> <!-- Original name is "m2_SPOT_model" -->
-        <Texture Name="gSpotlightShapesTex" OutName="spotlight_shapes" Format="rgba16" Width="32" Height="32" Offset="0x1CD0" />
-        <Texture Name="gSpotlightFloorTex" OutName="spotlight_floor" Format="ia8" Width="32" Height="64" Offset="0x24D0" />
-        <TextureAnimation Name="gSpotlightTexAnim" Offset="0x2CE0" />
-        <DList Name="object_open_obj_DL_002D30" Offset="0x2D30" /> <!-- Original name is "rakugaki_modelT" -->
-        <DList Name="object_open_obj_DL_002DC0" Offset="0x2DC0" />
-        <!-- <Blob Name="object_open_obj_Blob_002DC8" Size="0xE608" Offset="0x2DC8" /> -->
-        <Texture Name="object_open_obj_Tex_00DDC8" OutName="tex_00DDC8" Format="i4" Width="32" Height="32" Offset="0xDDC8" />
-        <Texture Name="object_open_obj_Tex_00DFC8" OutName="tex_00DFC8" Format="i4" Width="32" Height="32" Offset="0xDFC8" />
-        <Texture Name="object_open_obj_Tex_00E1C8" OutName="tex_00E1C8" Format="i4" Width="32" Height="32" Offset="0xE1C8" />
-        <Texture Name="object_open_obj_Tex_00E3C8" OutName="tex_00E3C8" Format="i4" Width="32" Height="32" Offset="0xE3C8" />
-        <Texture Name="object_open_obj_Tex_00E5C8" OutName="tex_00E5C8" Format="i4" Width="32" Height="32" Offset="0xE5C8" />
-        <Texture Name="object_open_obj_Tex_00E7C8" OutName="tex_00E7C8" Format="i4" Width="32" Height="32" Offset="0xE7C8" />
-        <Texture Name="object_open_obj_Tex_00E9C8" OutName="tex_00E9C8" Format="i4" Width="32" Height="32" Offset="0xE9C8" />
-        <Texture Name="object_open_obj_Tex_00EBC8" OutName="tex_00EBC8" Format="i4" Width="32" Height="32" Offset="0xEBC8" />
-        <Texture Name="object_open_obj_Tex_00EDC8" OutName="tex_00EDC8" Format="i4" Width="32" Height="32" Offset="0xEDC8" />
-        <Texture Name="object_open_obj_Tex_00EFC8" OutName="tex_00EFC8" Format="i4" Width="32" Height="32" Offset="0xEFC8" />
-        <TextureAnimation Name="object_open_obj_Matanimheader_011458" Offset="0x11458" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_os_anime.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_os_anime.xml
deleted file mode 100644
index 379beff0a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_os_anime.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Root>
-    <File Name="object_os_anime" Segment="6">
-        <Animation Name="object_os_anime_Anim_0000B4" Offset="0xB4" />
-        <Animation Name="object_os_anime_Anim_000170" Offset="0x170" />
-        <Animation Name="object_os_anime_Anim_000228" Offset="0x228" />
-        <Animation Name="object_os_anime_Anim_000718" Offset="0x718" />
-        <Animation Name="object_os_anime_Anim_0007D0" Offset="0x7D0" />
-        <Animation Name="object_os_anime_Anim_000894" Offset="0x894" />
-        <Animation Name="object_os_anime_Anim_000938" Offset="0x938" />
-        <Animation Name="object_os_anime_Anim_000B80" Offset="0xB80" />
-        <Animation Name="object_os_anime_Anim_000FF0" Offset="0xFF0" />
-        <Animation Name="object_os_anime_Anim_00107C" Offset="0x107C" />
-        <Animation Name="object_os_anime_Anim_001270" Offset="0x1270" />
-        <Animation Name="object_os_anime_Anim_0012FC" Offset="0x12FC" />
-        <Animation Name="object_os_anime_Anim_001458" Offset="0x1458" /> <!-- Original name is "Cne2_15" -->
-        <Animation Name="object_os_anime_Anim_0017D8" Offset="0x17D8" /> <!-- Original name is "Cne_aruku" ("walk") -->
-        <Animation Name="object_os_anime_Anim_001C9C" Offset="0x1C9C" /> <!-- Original name is "Cne_hiso_wait" ("hiso" = onomatopoeic for "whisper") -->
-        <Animation Name="object_os_anime_Anim_001D44" Offset="0x1D44" /> <!-- Original name is "Cne_matsu" -->
-        <Animation Name="object_os_anime_Anim_001EE0" Offset="0x1EE0" /> <!-- Original name is "Cne_n_wait" ("to wait​") -->
-        <Animation Name="object_os_anime_Anim_001F78" Offset="0x1F78" />
-        <Animation Name="object_os_anime_Anim_0020F8" Offset="0x20F8" />
-        <Animation Name="object_os_anime_Anim_0021B8" Offset="0x21B8" />
-        <Animation Name="object_os_anime_Anim_0025E4" Offset="0x25E4" />
-        <Animation Name="object_os_anime_Anim_002C80" Offset="0x2C80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_osn.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_osn.xml
deleted file mode 100644
index d6109c717..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_osn.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<Root>
-    <!-- Assets for the Happy Mask Salesman and the cutscene Deku Mask -->
-    <File Name="object_osn" Segment="6">
-        <!-- Happy Mask Salesman Animations -->
-        <Animation Name="gHappyMaskSalesmanLyingDownAnim" Offset="0xC4" /> <!-- Frame 0: Face up, Frame 1: Face down--> <!-- Original name is "om_downpose" -->
-        <Animation Name="gHappyMaskSalesmanOrganPlayAnim" Offset="0x1034" /> <!-- Original name is "om_ensou" -->
-        <Animation Name="gHappyMaskSalesmanOrganTalkAnim" Offset="0x1614" /> <!-- Original name is "om_ensou_taiki" -->
-        <Animation Name="gHappyMaskSalesmanTurnAroundStartAnim" Offset="0x1D6C" /> <!-- Original name is "om_furimuki" -->
-        <Animation Name="gHappyMaskSalesmanTurnAroundLoopAnim" Offset="0x2634" /> <!-- Original name is "om_furimuki_loop" -->
-        <Animation Name="gHappyMaskSalesmanArmsOutAnim" Offset="0x2F74" /> <!-- Original name is "om_gozonji" -->
-        <Animation Name="gHappyMaskSalesmanBowingAnim" Offset="0x37C4" /> <!-- Original name is "om_hajime" -->
-        <Animation Name="gHappyMaskSalesmanChokeAnim" Offset="0x3A1C" /> <!-- Original name is "om_kubisime_loop" -->
-        <Animation Name="gHappyMaskSalesmanReminisceAnim" Offset="0x4320" /> <!-- Rock calmly with hands together out front --> <!-- Original name is "om_nanto" -->
-        <Animation Name="gHappyMaskSalesmanHandsClaspedAnim" Offset="0x4C8C" /> <!-- Stand still with hands clasped together out front --> <!-- Original name is "om_niginigi" -->
-        <Animation Name="gHappyMaskSalesmanDespairAnim" Offset="0x55F8" /> <!-- Rock wildly with both hands on head --> <!-- Original name is "om_noo_loop" -->
-        <Animation Name="gHappyMaskSalesmanMaskLookFromStartAnim" Offset="0x5D78" /> <!-- Look away from held mask --> <!-- Original name is "om_omfurim" -->
-        <Animation Name="gHappyMaskSalesmanMaskLookFromLoopAnim" Offset="0x6564" /> <!-- Original name is "om_omfurim_loop" -->
-        <Animation Name="gHappyMaskSalesmanMaskLookAtAnim" Offset="0x6D48" /> <!-- Original name is "om_ommotu_loop" -->
-        <Animation Name="gHappyMaskSalesmanFastBowsAnim" Offset="0x7220" /> <!-- Original name is "om_onegai_loop" -->
-        <Animation Name="gHappyMaskSalesmanWalkAwayAnim" Offset="0x8D80" /> <!-- Original name is "om_saru" -->
-        <Animation Name="gHappyMaskSalesmanBelieveAnim" Offset="0x94E4" /> <!-- Both arms outstreched while looking up --> <!-- Original name is "om_sinjina" -->
-        <Animation Name="gHappyMaskSalesmanThinkAnim" Offset="0x9BB8" /> <!-- Stand still with hand on chin --> <!-- --> <!-- Original name is "om_souieba" -->
-        <Animation Name="gHappyMaskSalesmanHandOutAnim" Offset="0xA444" /> <!-- Original name is "om_tewodasu_loop" -->
-        <Animation Name="gHappyMaskSalesmanShakeHeadAnim" Offset="0xAC60" /> <!-- Shake head with hand on forehead --> <!-- Original name is "om_watasi" -->
-        <Animation Name="gHappyMaskSalesmanShakeAnim" Offset="0xAE9C" /> <!-- Original name is "om_yusaburu" -->
-
-        <!-- Happy Mask Salesman DLists -->
-        <DList Name="gHappyMaskSalesmanPelvisDL" Offset="0xF5E0" />
-        <DList Name="gHappyMaskSalesmanRightThighDL" Offset="0xF830" />
-        <DList Name="gHappyMaskSalesmanRightShinDL" Offset="0xFB30" />
-        <DList Name="gHappyMaskSalesmanRightFootDL" Offset="0xFD88" />
-        <DList Name="gHappyMaskSalesmanLeftThighDL" Offset="0xFFC0" />
-        <DList Name="gHappyMaskSalesmanLeftShinDL" Offset="0x102C0" />
-        <DList Name="gHappyMaskSalesmanLeftFootDL" Offset="0x10518" />
-        <DList Name="gHappyMaskSalesmanAbdomenDL" Offset="0x10750" />
-        <DList Name="gHappyMaskSalesmanChestDL" Offset="0x10AB0" />
-        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x10ED0" />
-        <DList Name="gHappyMaskSalesmanBackpackDL" Offset="0x114B8" />
-        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x12088" />
-        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x122F8" />
-        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x125F0" />
-        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x12780" />
-        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x129F0" />
-        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x12CE8" />
-
-        <!-- Happy Mask Salesman Textures -->
-        <Texture Name="gHappyMaskSalesmanBodyTLUT" OutName="happy_mask_salesman_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x12E78" />
-        <Texture Name="gHappyMaskSalesmanBackpackTLUT" OutName="happy_mask_salesman_mask_backpack_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13078" />
-        <Texture Name="gHappyMaskSalesmanMask1TLUT" OutName="happy_mask_salesman_mask_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13278" /> <!-- Shared between multiple masks -->
-        <Texture Name="gHappyMaskSalesmanMask2TLUT" OutName="happy_mask_salesman_mask_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13478" /> <!-- Shared between multiple masks -->
-        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="happy_mask_salesman_skin" Format="ci8" Width="8" Height="8" Offset="0x13678" />
-        <Texture Name="gHappyMaskSalesmanEarTex" OutName="happy_mask_salesman_ear" Format="ci8" Width="8" Height="8" Offset="0x136B8" />
-        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="happy_mask_salesman_nostril" Format="ci8" Width="8" Height="8" Offset="0x136F8" />
-        <Texture Name="gHappyMaskSalesmanHairTex" OutName="happy_mask_salesman_hair" Format="ci8" Width="8" Height="16" Offset="0x13738" />
-        <Texture Name="gHappyMaskSalesmanGoldFabric1Tex" OutName="happy_mask_salesman_gold_fabric_1" Format="ci8" Width="8" Height="16" Offset="0x137B8" /> <!-- Main neck piece and back of the cuffs -->
-        <Texture Name="gHappyMaskSalesmanGoldFabric2Tex" OutName="happy_mask_salesman_gold_fabric_2" Format="ci8" Width="8" Height="16" Offset="0x13838" /> <!-- Collar and front of the cuffs -->
-        <Texture Name="gHappyMaskSalesmanRobeFrontTex" OutName="happy_mask_salesman_robe_front" Format="ci8" Width="16" Height="16" Offset="0x138B8" />
-        <Texture Name="gHappyMaskSalesmanFootTex" OutName="happy_mask_salesman_foot" Format="ci8" Width="8" Height="8" Offset="0x139B8" />
-        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="happy_mask_salesman_fingers" Format="ci8" Width="16" Height="16" Offset="0x139F8" />
-        <Texture Name="gHappyMaskSalesmaeClothesTex" OutName="happy_mask_salesman_clothes" Format="ci8" Width="16" Height="16" Offset="0x13AF8" />
-        <Texture Name="gHappyMaskSalesmanHairlineTex" OutName="happy_mask_salesman_hairline" Format="rgba16" Width="8" Height="16" Offset="0x13BF8" />
-        <Texture Name="gHappyMaskSalesmanShoeTex" OutName="happy_mask_salesman_shoe" Format="ci8" Width="16" Height="8" Offset="0x13CF8" />
-        <Texture Name="gHappyMaskSalesmanRobeBackTex" OutName="happy_mask_salesman_robe_back" Format="ci8" Width="16" Height="16" Offset="0x13D78" />
-        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="happy_mask_salesman_shirt" Format="ci8" Width="16" Height="16" Offset="0x13E78" />
-        <Texture Name="gHappyMaskSalesmaeClothesEndTex" OutName="happy_mask_salesman_clothes_ends" Format="ci8" Width="8" Height="8" Offset="0x13F78" />
-
-        <!-- Happy Mask Salesman Backpack Textures, TLUTs are above -->
-        <Texture Name="gHappyMaskSalesmanBackpackTopTex" OutName="happy_mask_salesman_backpack_top" Format="ci8" Width="16" Height="32" Offset="0x13FB8" />
-        <Texture Name="gHappyMaskSalesmanBackpackPocketTex" OutName="happy_mask_salesman_backpack_pocket" Format="ci8" Width="16" Height="32" Offset="0x141B8" />
-        <Texture Name="gHappyMaskSalesmanBackpackPocketTopTex" OutName="happy_mask_salesman_backpack_pocket_top" Format="ci8" Width="16" Height="16" Offset="0x143B8" />
-        <Texture Name="gHappyMaskSalesmanBackpackBottomTex" OutName="happy_mask_salesman_backpack_bottom" Format="ci8" Width="32" Height="64" Offset="0x144B8" />
-        <Texture Name="gHappyMaskSalesmanBackpackRollTex" OutName="happy_mask_salesman_backpack_roll" Format="ci8" Width="32" Height="16" Offset="0x14CB8" />
-        <Texture Name="gHappyMaskSalesmanBackpackRollEndTex" OutName="happy_mask_salesman_backpack_roll_end" Format="ci8" Width="16" Height="16" Offset="0x14EB8" />
-        <Texture Name="gHappyMaskSalesmanBackpackStrapTex" OutName="happy_mask_salesman_backpack_strap" Format="ci8" Width="8" Height="8" Offset="0x14FB8" />
-        <Texture Name="gHappyMaskSalesmanMask01Tex" OutName="happy_mask_salesman_mask_01" Format="ci8" Width="16" Height="32" Offset="0x14FF8" />
-        <Texture Name="gHappyMaskSalesmanMask02Tex" OutName="happy_mask_salesman_mask_02" Format="ci8" Width="16" Height="32" Offset="0x151F8" />
-        <Texture Name="gHappyMaskSalesmanScrollTex" OutName="happy_mask_salesman_scroll" Format="i8" Width="16" Height="16" Offset="0x153F8" />
-        <Texture Name="gHappyMaskSalesmanMask03Tex" OutName="happy_mask_salesman_mask_03" Format="ci8" Width="16" Height="32" Offset="0x154F8" /> <!-- Mario Mask -->
-        <Texture Name="gHappyMaskSalesmanMask04Tex" OutName="happy_mask_salesman_mask_04" Format="ci8" Width="16" Height="32" Offset="0x156F8" />
-        <Texture Name="gHappyMaskSalesmanMask05Tex" OutName="happy_mask_salesman_mask_05" Format="i8" Width="16" Height="32" Offset="0x158F8" /> <!-- Mayor's Mask, frowning version of the one on the Mayor's chair -->
-        <Texture Name="gHappyMaskSalesmanMask06Tex" OutName="happy_mask_salesman_mask_06" Format="rgba16" Width="16" Height="32" Offset="0x15AF8" />
-        <Texture Name="gHappyMaskSalesmanMask07Tex" OutName="happy_mask_salesman_mask_07" Format="ci8" Width="16" Height="32" Offset="0x15EF8" />
-        <Texture Name="gHappyMaskSalesmanMask08Tex" OutName="happy_mask_salesman_mask_08" Format="ci8" Width="16" Height="32" Offset="0x160F8" />
-        <Texture Name="gHappyMaskSalesmanMask09Tex" OutName="happy_mask_salesman_mask_09" Format="ci8" Width="16" Height="32" Offset="0x162F8" />
-        <Texture Name="gHappyMaskSalesmanMask10Tex" OutName="happy_mask_salesman_mask_10" Format="ci8" Width="16" Height="32" Offset="0x164F8" /> <!-- Mirror Shield Mask, same face as on mirror shield -->
-
-        <!-- Happy Mask Salesman Face Textures -->
-        <Texture Name="gHappyMaskSalesmanEyeClosedHappyTex" OutName="happy_mask_salesman_eye_closed_happy" Format="rgba16" Width="32" Height="32" Offset="0x166F8" />
-        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="happy_mask_salesman_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x16EF8" />
-        <Texture Name="gHappyMaskSalesmanEyeClosedAngryTex" OutName="happy_mask_salesman_eye_closed_angry" Format="rgba16" Width="32" Height="32" Offset="0x176F8" />
-        <Texture Name="gHappyMaskSalesmanSmileTex" OutName="happy_mask_salesman_smile" Format="rgba16" Width="32" Height="16" Offset="0x17EF8" />
-        <Texture Name="gHappyMaskSalesmanFrownTex" OutName="happy_mask_salesman_frown" Format="rgba16" Width="32" Height="16" Offset="0x182F8" />
-
-        <TextureAnimation Name="gHappyMaskSalesmanMouthTexAnim" Offset="0x1873C" /> <!-- Unused -->
-
-        <!-- Majora's Mask -->
-        <DList Name="gHappyMaskSalesmanMajorasMaskDL" Offset="0x192A0" />
-        <DList Name="gHappyMaskSalesmanMajorasMaskEyesDL" Offset="0x19650" />
-
-        <Texture Name="gHappyMaskSalesmanMajorasMaskFaceTex" OutName="happy_mask_salesman_majoras_mask_face" Format="rgba16" Width="32" Height="64" Offset="0x19700" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskSpikes1Tex" OutName="happy_mask_salesman_majoras_mask_spikes_1" Format="rgba16" Width="16" Height="16" Offset="0x1A700" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskSpikes2Tex" OutName="happy_mask_salesman_majoras_mask_spikes_2" Format="rgba16" Width="16" Height="16" Offset="0x1A900" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskSpikes3Tex" OutName="happy_mask_salesman_majoras_mask_spikes_3" Format="rgba16" Width="16" Height="16" Offset="0x1AB00" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskSpikes4Tex" OutName="happy_mask_salesman_majoras_mask_spikes_4" Format="rgba16" Width="16" Height="16" Offset="0x1AD00" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskBackTex" OutName="happy_mask_salesman_majoras_mask_back" Format="rgba16" Width="32" Height="32" Offset="0x1AF00" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskEyeTex" OutName="happy_mask_salesman_majoras_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x1B700" />
-
-        <!-- <Blob Name="object_osn_Blob_01BF00" Size="0x3880" Offset="0x1BF00" /> -->
-
-        <!-- Happy Mask Salesman Idle Anim-->
-        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x201BC" /> <!-- Original name is "osn_wait" -->
-
-        <!-- Happy Mask Salesman Skeleton -->
-        <Limb Name="gHappyMaskSalesmanRootLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_ROOT" Offset="0x201D0" />
-        <Limb Name="gHappyMaskSalesmanAbdomenLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_ABDOMEN" Offset="0x201DC" />
-        <Limb Name="gHappyMaskSalesmanChestLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_CHEST" Offset="0x201E8" />
-        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_UPPER_ARM" Offset="0x201F4" />
-        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_FOREARM" Offset="0x20200" />
-        <Limb Name="gHappyMaskSalesmanLeftHandLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_HAND" Offset="0x2020C" />
-        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_RIGHT_UPPER_ARM" Offset="0x20218" />
-        <Limb Name="gHappyMaskSalesmanRightForearmLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_RIGHT_FOREARM" Offset="0x20224" />
-        <Limb Name="gHappyMaskSalesmanRightHandLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_RIGHT_HAND" Offset="0x20230" />
-        <Limb Name="gHappyMaskSalesmanBackpackLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_BACKPACK" Offset="0x2023C" />
-        <Limb Name="gHappyMaskSalesmanHeadLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_HEAD" Offset="0x20248" />
-        <Limb Name="gHappyMaskSalesmanPelvisLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_PELVIS" Offset="0x20254" />
-        <Limb Name="gHappyMaskSalesmanLeftThighLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_THIGH" Offset="0x20260" />
-        <Limb Name="gHappyMaskSalesmanLeftShinLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_SHIN" Offset="0x2026C" />
-        <Limb Name="gHappyMaskSalesmanLeftFootLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_FOOT" Offset="0x20278" />
-        <Limb Name="gHappyMaskSalesmanRightThighLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_RIGHT_THIGH" Offset="0x20284" />
-        <Limb Name="gHappyMaskSalesmanRightShinLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_RIGHT_SHIN" Offset="0x20290" />
-        <Limb Name="gHappyMaskSalesmanRightFootLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_RIGHT_FOOT" Offset="0x2029C" />
-        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" LimbNone="HAPPY_MASK_SALESMAN_LIMB_NONE" LimbMax="HAPPY_MASK_SALESMAN_LIMB_MAX" EnumName="HappyMaskSalesmanLimb" Offset="0x202F0" />
-
-        <!-- Deku Mask -->
-        <Animation Name="gDekuMaskFallOverAnim" Offset="0x20530" /> <!-- Original name is "rakka" -->
-        <Limb Name="gDekuMaskLimb" Type="Standard" EnumName="DEKU_MASK_LIMB" Offset="0x20540" />
-        <Skeleton Name="gDekuMaskSkel" Type="Flex" LimbType="Standard" LimbNone="DEKU_MASK_LIMB_NONE" LimbMax="DEKU_MASK_LIMB_MAX" EnumName="DekuMaskLimb" Offset="0x20550" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ot.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ot.xml
deleted file mode 100644
index 1b99fb071..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ot.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Root>
-    <File Name="object_ot" Segment="6">
-        <DList Name="object_ot_DL_000040" Offset="0x40" />
-        <DList Name="object_ot_DL_000078" Offset="0x78" /> <!-- Original name is "ot_item_model" -->
-        <Animation Name="object_ot_Anim_000420" Offset="0x420" /> <!-- Original name is "ot_kissing" -->
-        <DList Name="object_ot_DL_0004A0" Offset="0x4A0" /> <!-- Original name is "ot_light_model" -->
-        <Texture Name="object_ot_Tex_000550" OutName="tex_000550" Format="ia16" Width="8" Height="8" Offset="0x550" />
-        <TextureAnimation Name="object_ot_Matanimheader_0005F8" Offset="0x5F8" />
-        <Animation Name="object_ot_Anim_0008D8" Offset="0x8D8" /> <!-- Original name is "ot_swim" -->
-        <DList Name="object_ot_DL_001800" Offset="0x1800" />
-        <DList Name="object_ot_DL_0018D0" Offset="0x18D0" />
-        <DList Name="object_ot_DL_001988" Offset="0x1988" />
-        <DList Name="object_ot_DL_001AA0" Offset="0x1AA0" />
-        <DList Name="object_ot_DL_001B80" Offset="0x1B80" />
-        <DList Name="object_ot_DL_001C38" Offset="0x1C38" />
-        <DList Name="object_ot_DL_001CF0" Offset="0x1CF0" />
-        <DList Name="object_ot_DL_001FD8" Offset="0x1FD8" />
-        <DList Name="object_ot_DL_002090" Offset="0x2090" />
-        <DList Name="object_ot_DL_002220" Offset="0x2220" />
-        <DList Name="object_ot_DL_002318" Offset="0x2318" />
-        <DList Name="object_ot_DL_002410" Offset="0x2410" />
-        <DList Name="object_ot_DL_002508" Offset="0x2508" />
-        <DList Name="object_ot_DL_002600" Offset="0x2600" />
-        <DList Name="object_ot_DL_0026F8" Offset="0x26F8" />
-        <DList Name="object_ot_DL_0027F0" Offset="0x27F0" />
-        <Texture Name="object_ot_TLUT_0028E0" OutName="tlut_0028E0" Format="rgba16" Width="16" Height="16" Offset="0x28E0" />
-        <Texture Name="object_ot_Tex_002AE0" OutName="tex_002AE0" Format="ci8" Width="32" Height="32" Offset="0x2AE0" />
-        <Texture Name="object_ot_Tex_002EE0" OutName="tex_002EE0" Format="ci8" Width="32" Height="64" Offset="0x2EE0" />
-        <Texture Name="object_ot_Tex_0036E0" OutName="tex_0036E0" Format="ci8" Width="32" Height="32" Offset="0x36E0" />
-        <Texture Name="object_ot_Tex_003AE0" OutName="tex_003AE0" Format="ci8" Width="32" Height="32" Offset="0x3AE0" />
-        <Texture Name="object_ot_Tex_003EE0" OutName="tex_003EE0" Format="ci8" Width="32" Height="32" Offset="0x3EE0" />
-        <Texture Name="object_ot_Tex_0042E0" OutName="tex_0042E0" Format="ci8" Width="32" Height="32" Offset="0x42E0" />
-        <Limb Name="object_ot_Standardlimb_0046E0" Type="Standard" EnumName="OBJECT_OT_LIMB_01" Offset="0x46E0" />
-        <Limb Name="object_ot_Standardlimb_0046EC" Type="Standard" EnumName="OBJECT_OT_LIMB_02" Offset="0x46EC" />
-        <Limb Name="object_ot_Standardlimb_0046F8" Type="Standard" EnumName="OBJECT_OT_LIMB_03" Offset="0x46F8" />
-        <Limb Name="object_ot_Standardlimb_004704" Type="Standard" EnumName="OBJECT_OT_LIMB_04" Offset="0x4704" />
-        <Limb Name="object_ot_Standardlimb_004710" Type="Standard" EnumName="OBJECT_OT_LIMB_05" Offset="0x4710" />
-        <Limb Name="object_ot_Standardlimb_00471C" Type="Standard" EnumName="OBJECT_OT_LIMB_06" Offset="0x471C" />
-        <Limb Name="object_ot_Standardlimb_004728" Type="Standard" EnumName="OBJECT_OT_LIMB_07" Offset="0x4728" />
-        <Limb Name="object_ot_Standardlimb_004734" Type="Standard" EnumName="OBJECT_OT_LIMB_08" Offset="0x4734" />
-        <Limb Name="object_ot_Standardlimb_004740" Type="Standard" EnumName="OBJECT_OT_LIMB_09" Offset="0x4740" />
-        <Limb Name="object_ot_Standardlimb_00474C" Type="Standard" EnumName="OBJECT_OT_LIMB_0A" Offset="0x474C" />
-        <Limb Name="object_ot_Standardlimb_004758" Type="Standard" EnumName="OBJECT_OT_LIMB_0B" Offset="0x4758" />
-        <Limb Name="object_ot_Standardlimb_004764" Type="Standard" EnumName="OBJECT_OT_LIMB_0C" Offset="0x4764" />
-        <Limb Name="object_ot_Standardlimb_004770" Type="Standard" EnumName="OBJECT_OT_LIMB_0D" Offset="0x4770" />
-        <Limb Name="object_ot_Standardlimb_00477C" Type="Standard" EnumName="OBJECT_OT_LIMB_0E" Offset="0x477C" />
-        <Limb Name="object_ot_Standardlimb_004788" Type="Standard" EnumName="OBJECT_OT_LIMB_0F" Offset="0x4788" />
-        <Limb Name="object_ot_Standardlimb_004794" Type="Standard" EnumName="OBJECT_OT_LIMB_10" Offset="0x4794" />
-        <Limb Name="object_ot_Standardlimb_0047A0" Type="Standard" EnumName="OBJECT_OT_LIMB_11" Offset="0x47A0" />
-        <Limb Name="object_ot_Standardlimb_0047AC" Type="Standard" EnumName="OBJECT_OT_LIMB_12" Offset="0x47AC" />
-        <Skeleton Name="object_ot_Skel_004800" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OT_LIMB_NONE" LimbMax="OBJECT_OT_LIMB_MAX" EnumName="ObjectOtLimb" Offset="0x4800" />
-        <Animation Name="object_ot_Anim_004B30" Offset="0x4B30" /> <!-- Original name is "ot_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_owl.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_owl.xml
deleted file mode 100644
index b07442a99..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_owl.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<Root>
-    <!-- Object for Kaepora Gaebora (Owl) -->
-    <File Name="object_owl" Segment="6">
-        <!-- Animation -->
-        <Animation Name="gOwlTakeoffAnim" Offset="0x1168" /> <!-- Original name is "hovering" -->
-        
-        <!-- Single feather -->
-        <DList Name="gOwlFeatherDL" Offset="0x1200" /> <!-- Original name is "owl_feather_model" -->
-        <Texture Name="gOwlFeatherTex" OutName="owl_feather" Format="rgba16" Width="16" Height="32" Offset="0x1290" />
-        
-        <!-- Animation -->
-        <Animation Name="gOwlFlyAnim" Offset="0x1ADC" /> <!-- Original name is "owl_fly" -->
-        
-        <!-- Owl Flying DList -->
-        <DList Name="gOwlFlyingLowerBodyDL" Offset="0x5050" />
-        <DList Name="gOwlFlyingUpperBodyDL" Offset="0x51C8" />
-        <DList Name="gOwlFlyingHeadDL" Offset="0x52F0" />
-        <DList Name="gOwlFlyingRightEyebrowDL" Offset="0x5770" />
-        <DList Name="gOwlFlyingLeftEyebrowDL" Offset="0x5828" />
-        <DList Name="gOwlFlyingUpperRightLegDL" Offset="0x58E0" />
-        <DList Name="gOwlFlyingLowerRightLegDL" Offset="0x59A8" />
-        <DList Name="gOwlFlyingRightTalonDL" Offset="0x5A98" />
-        <DList Name="gOwlFlyingLowerLeftWingDL" Offset="0x5C30" />
-        <DList Name="gOwlFlyingMiddleLeftWing1DL" Offset="0x5E70" />
-        <DList Name="gOwlFlyingMiddleLeftWing2DL" Offset="0x60C8" />
-        <DList Name="gOwlFlyingUpperLeftWingDL" Offset="0x62F8" />
-        <DList Name="gOwlFlyingLowerRightWingDL" Offset="0x6578" />
-        <DList Name="gOwlFlyingMiddleRightWing1DL" Offset="0x67B8" />
-        <DList Name="gOwlFlyingMiddleRightWing2DL" Offset="0x6A10" />
-        <DList Name="gOwlFlyingUpperRightWingDL" Offset="0x6C40" />
-        <DList Name="gOwlFlyingTailDL" Offset="0x6EC0" />
-        <DList Name="gOwlFlyingUpperLeftLegDL" Offset="0x6F68" />
-        <DList Name="gOwlFlyingLowerLeftLegDL" Offset="0x7030" />
-        <DList Name="gOwlFlyingLeftTalonDL" Offset="0x7120" />
-        
-        <!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
-        <!-- TLUT used in gOwlPerchingHeadDL -->
-        <Texture Name="gOwlPerchingEyeTLUT" OutName="owl_perching_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x72B8" />
-        <!-- TLUT used in gOwlFlyingHeadDL -->
-        <Texture Name="gOwlFlyingEyeTLUT" OutName="owl_flying_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x74B8" />
-
-        <!-- Textures -->
-        <Texture Name="gOwlChinMarking1Tex" OutName="owl_chin_marking1" Format="rgba16" Width="32" Height="32" Offset="0x76B8" />
-        <Texture Name="gOwlForeheadMarkingTex" OutName="owl_forehead_marking" Format="rgba16" Width="32" Height="32" Offset="0x7EB8" />
-        <Texture Name="gOwlBeakTex" OutName="owl_beak" Format="rgba16" Width="32" Height="32" Offset="0x86B8" />
-        <Texture Name="gOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8EB8" />
-        <Texture Name="gOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x92B8" />
-        <Texture Name="gOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x96B8" />
-        <Texture Name="gOwlChinMarking2Tex" OutName="owl_chin_marking2" Format="rgba16" Width="32" Height="32" Offset="0x9AB8" />
-        <Texture Name="gOwlFeathersTex" OutName="owl_feathers" Format="rgba16" Width="16" Height="16" Offset="0xA2B8" />
-        <Texture Name="gOwlEyebrowTex" OutName="owl_eyebrow" Format="rgba16" Width="64" Height="32" Offset="0xA4B8" />
-        <Texture Name="gOwlFlightFeathers1Tex" OutName="owl_flight_feathers1" Format="rgba16" Width="32" Height="32" Offset="0xB4B8" />
-        <Texture Name="gOwlFlightFeathers2Tex" OutName="owl_flight_feathers2" Format="rgba16" Width="32" Height="32" Offset="0xBCB8" />
-        
-        <!-- Owl Flying Limbs -->
-        <Limb Name="gOwlFlyingLowerBodyLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LOWER_BODY" Offset="0xC4B8" />
-        <Limb Name="gOwlFlyingUpperBodyLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_UPPER_BODY" Offset="0xC4C4" />
-        <Limb Name="gOwlFlyingHeadLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_HEAD" Offset="0xC4D0" />
-        <Limb Name="gOwlFlyingRightEyebrowLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_RIGHT_EYEBROW" Offset="0xC4DC" />
-        <Limb Name="gOwlFlyingLeftEyebrowLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LEFT_EYEBROW" Offset="0xC4E8" />
-        <Limb Name="gOwlFlyingLowerLeftWingLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LOWER_LEFT_WING" Offset="0xC4F4" />
-        <Limb Name="gOwlFlyingMiddleLeftWing1Limb" Type="Standard" EnumName="OWL_FLYING_LIMB_MIDDLE_LEFT_WING_1" Offset="0xC500" />
-        <Limb Name="gOwlFlyingMiddleLeftWing2Limb" Type="Standard" EnumName="OWL_FLYING_LIMB_MIDDLE_LEFT_WING_2" Offset="0xC50C" />
-        <Limb Name="gOwlFlyingUpperLeftWingLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_UPPER_LEFT_WING" Offset="0xC518" />
-        <Limb Name="gOwlFlyingLowerRightWingLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LOWER_RIGHT_WING" Offset="0xC524" />
-        <Limb Name="gOwlFlyingMiddleRightWing1Limb" Type="Standard" EnumName="OWL_FLYING_LIMB_MIDDLE_RIGHT_WING_1" Offset="0xC530" />
-        <Limb Name="gOwlFlyingMiddleRightWing2Limb" Type="Standard" EnumName="OWL_FLYING_LIMB_MIDDLE_RIGHT_WING_2" Offset="0xC53C" />
-        <Limb Name="gOwlFlyingUpperRightWingLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_UPPER_RIGHT_WING" Offset="0xC548" />
-        <Limb Name="gOwlFlyingUpperRightLegLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_UPPER_RIGHT_LEG" Offset="0xC554" />
-        <Limb Name="gOwlFlyingLowerRightLegLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LOWER_RIGHT_LEG" Offset="0xC560" />
-        <Limb Name="gOwlFlyingRightTalonLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_RIGHT_TALON" Offset="0xC56C" />
-        <Limb Name="gOwlFlyingUpperLeftLegLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_UPPER_LEFT_LEG" Offset="0xC578" />
-        <Limb Name="gOwlFlyingLowerLeftLegLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LOWER_LEFT_LEG" Offset="0xC584" />
-        <Limb Name="gOwlFlyingLeftTalonLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LEFT_TALON" Offset="0xC590" />
-        <Limb Name="gOwlFlyingTailLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_TAIL" Offset="0xC59C" />
-        
-        <!-- Owl Flying Skeleton -->
-        <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" LimbNone="OWL_FLYING_LIMB_NONE" LimbMax="OWL_FLYING_LIMB_MAX" EnumName="OwlFlyingLimb" Offset="0xC5F8" />
-        
-        <!-- Animations -->
-        <Animation Name="gOwlGlideAnim" Offset="0xC6D4" /> <!-- Original name is "owl_kakku" -->
-        <Animation Name="gOwlUnfoldWingsAnim" Offset="0xCB94" /> <!-- Original name is "owl_openwing" -->
-        <Animation Name="gOwlPerchAnim" Offset="0xCDB0" /> <!-- Original name is "owl_wait" -->
-        
-        <!-- Owl Perching DList -->
-        <DList Name="gOwlPerchingLeftWingDL" Offset="0xF220" />
-        <DList Name="gOwlPerchingRightWingDL" Offset="0xF3B0" />
-        <DList Name="gOwlPerchingTailDL" Offset="0xF540" />
-        <DList Name="gOwlPerchingLowerBodyDL" Offset="0xF5E8" />
-        <DList Name="gOwlPerchingUpperBodyDL" Offset="0xF6D0" />
-        <DList Name="gOwlPerchingHeadDL" Offset="0xF840" />
-        <DList Name="gOwlPerchingRightEyebrowDL" Offset="0xFCC0" />
-        <DList Name="gOwlPerchingLeftEyebrowDL" Offset="0xFD78" />
-        <DList Name="gOwlPerchingUpperLeftLegDL" Offset="0xFE30" />
-        <DList Name="gOwlPerchingLowerLeftLegDL" Offset="0xFEF8" />
-        <DList Name="gOwlPerchingLeftTalonDL" Offset="0xFFE8" />
-        <DList Name="gOwlPerchingUpperRightLegDL" Offset="0x10180" />
-        <DList Name="gOwlPerchingLowerRightLegDL" Offset="0x10248" />
-        <DList Name="gOwlPerchingRightTalonDL" Offset="0x10338" />
-        
-        <!-- Owl Perching Limbs -->
-        <Limb Name="gOwlPerchingRootLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_ROOT" Offset="0x104D0" />
-        <Limb Name="gOwlPerchingUpperBodyLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_UPPER_BODY" Offset="0x104DC" />
-        <Limb Name="gOwlPerchingHeadLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_HEAD" Offset="0x104E8" />
-        <Limb Name="gOwlPerchingRightEyebrowLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_RIGHT_EYEBROW" Offset="0x104F4" />
-        <Limb Name="gOwlPerchingLeftEyebrowLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LEFT_EYEBROW" Offset="0x10500" />
-        <Limb Name="gOwlPerchingLowerBodyLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LOWER_BODY" Offset="0x1050C" />
-        <Limb Name="gOwlPerchingRightWingLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_RIGHT_WING" Offset="0x10518" />
-        <Limb Name="gOwlPerchingLeftWingLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LEFT_WING" Offset="0x10524" />
-        <Limb Name="gOwlPerchingUpperLeftLegLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_UPPER_LEFT_LEG" Offset="0x10530" />
-        <Limb Name="gOwlPerchingLowerLeftLegLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LOWER_LEFT_LEG" Offset="0x1053C" />
-        <Limb Name="gOwlPerchingLeftTalonLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LEFT_TALON" Offset="0x10548" />
-        <Limb Name="gOwlPerchingUpperRightLegLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_UPPER_RIGHT_LEG" Offset="0x10554" />
-        <Limb Name="gOwlPerchingLowerRightLegLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LOWER_RIGHT_LEG" Offset="0x10560" />
-        <Limb Name="gOwlPerchingRightTalonLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_RIGHT_TALON" Offset="0x1056C" />
-        <Limb Name="gOwlPerchingTailLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_TAIL" Offset="0x10578" />
-        
-        <!-- Owl Perching Skeleton -->
-        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" LimbNone="OWL_PERCHING_LIMB_NONE" LimbMax="OWL_PERCHING_LIMB_MAX" EnumName="OwlPerchingLimb" Offset="0x105C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_oyu.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_oyu.xml
deleted file mode 100644
index f674f0977..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_oyu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Hot Spring Water found in the Goron Graveyard -->
-    <File Name="object_oyu" Segment="6">
-        <DList Name="gGoronGraveyardHotSpringWaterDL" Offset="0x80" /> <!-- Original name is "z2_goron_haka_oyu_modelT" -->
-        <DList Name="gGoronGraveyardHotSpringWaterEmptyDL" Offset="0x158" />
-        <Texture Name="gGoronGraveyardHotSpringWaterTex" OutName="hot_spring_water" Format="rgba16" Width="32" Height="32" Offset="0x160" />
-        <TextureAnimation Name="gGoronGraveyardHotSpringWaterTexAnim" Offset="0x968" />
-        <Collision Name="gGoronGraveyardHotSpringWaterCol" Offset="0x988" /> <!-- Original name is "z2_goron_haka_oyu_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pamera.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pamera.xml
deleted file mode 100644
index 61dc17694..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pamera.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<Root>
-    <File Name="object_pamera" Segment="6">
-        <Animation Name="object_pamera_Anim_0005BC" Offset="0x5BC" />
-
-        <DList Name="gPamelaAbdomenDL" Offset="0x2E50" />
-        <DList Name="gPamelaPelvisDL" Offset="0x2FB8" />
-        <DList Name="gPamelaNeckDL" Offset="0x30D0" />
-        <DList Name="gPamelaChestDL" Offset="0x31B0" />
-        <DList Name="gPamelaLeftUpperArmDL" Offset="0x3520" />
-        <DList Name="gPamelaLeftForearmDL" Offset="0x37B8" />
-        <DList Name="gPamelaLeftHandDL" Offset="0x39C0" />
-        <DList Name="gPamelaRightUpperArmDL" Offset="0x3D60" />
-        <DList Name="gPamelaRightForearmDL" Offset="0x3F78" />
-        <DList Name="gPamelaRightHandDL" Offset="0x4180" />
-        <DList Name="gPamelaHeadDL" Offset="0x4520" />
-        <DList Name="gPamelaHairEndDL" Offset="0x4AC0" />
-        <DList Name="gPamelaBackDressDL" Offset="0x4C88" />
-        <DList Name="gPamelaFrontDressDL" Offset="0x4E00" />
-        <DList Name="gPamelaLeftThighDL" Offset="0x4F78" />
-        <DList Name="gPamelaLeftLegDL" Offset="0x5158" />
-        <DList Name="gPamelaLeftFootDL" Offset="0x54B8" />
-        <DList Name="gPamelaRightThighDL" Offset="0x5830" />
-        <DList Name="gPamelaRightLegDL" Offset="0x5A10" />
-        <DList Name="gPamelaRightFootDL" Offset="0x5D70" />
-
-        <Texture Name="object_pamera_TLUT_0060E8" OutName="tlut_0060E8" Format="rgba16" Width="16" Height="16" Offset="0x60E8" />
-        <Texture Name="object_pamera_Tex_0062E8" OutName="tex_0062E8" Format="ci8" Width="16" Height="16" Offset="0x62E8" />
-        <Texture Name="object_pamera_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="16" Height="16" Offset="0x63E8" />
-        <Texture Name="object_pamera_Tex_0064E8" OutName="tex_0064E8" Format="ci8" Width="16" Height="16" Offset="0x64E8" />
-        <Texture Name="object_pamera_Tex_0065E8" OutName="tex_0065E8" Format="ci8" Width="16" Height="16" Offset="0x65E8" />
-        <Texture Name="object_pamera_Tex_0066E8" OutName="tex_0066E8" Format="ci8" Width="32" Height="32" Offset="0x66E8" />
-        <Texture Name="object_pamera_Tex_006AE8" OutName="tex_006AE8" Format="ci8" Width="32" Height="32" Offset="0x6AE8" />
-        <Texture Name="object_pamera_Tex_006EE8" OutName="tex_006EE8" Format="ci8" Width="32" Height="32" Offset="0x6EE8" />
-        <Texture Name="object_pamera_Tex_0072E8" OutName="tex_0072E8" Format="ci8" Width="16" Height="16" Offset="0x72E8" />
-        <Texture Name="object_pamera_Tex_0073E8" OutName="tex_0073E8" Format="ci8" Width="16" Height="16" Offset="0x73E8" />
-        <Texture Name="object_pamera_Tex_0074E8" OutName="tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74E8" />
-        <Texture Name="object_pamera_Tex_0078E8" OutName="tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78E8" />
-        <Texture Name="object_pamera_Tex_007CE8" OutName="tex_007CE8" Format="ci8" Width="16" Height="16" Offset="0x7CE8" />
-        <Texture Name="object_pamera_Tex_007DE8" OutName="tex_007DE8" Format="ci8" Width="32" Height="16" Offset="0x7DE8" />
-        <Texture Name="object_pamera_Tex_007FE8" OutName="tex_007FE8" Format="ci8" Width="16" Height="16" Offset="0x7FE8" />
-        <Texture Name="object_pamera_Tex_0080E8" OutName="tex_0080E8" Format="ci8" Width="16" Height="16" Offset="0x80E8" />
-        <Texture Name="object_pamera_Tex_0081E8" OutName="tex_0081E8" Format="ci8" Width="16" Height="16" Offset="0x81E8" />
-
-        <Limb Name="gPamelaRootLimb" Type="Standard" EnumName="PAMELA_LIMB_ROOT" Offset="0x82E8" />
-        <Limb Name="gPamelaUpperBodyRootLimb" Type="Standard" EnumName="PAMELA_LIMB_UPPER_BODY_ROOT" Offset="0x82F4" />
-        <Limb Name="gPamelaLeftUpperArmLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_UPPER_ARM" Offset="0x8300" />
-        <Limb Name="gPamelaLeftForearmLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_FOREARM" Offset="0x830C" />
-        <Limb Name="gPamelaLeftHandLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_HAND" Offset="0x8318" />
-        <Limb Name="gPamelaRightUpperArmLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_UPPER_ARM" Offset="0x8324" />
-        <Limb Name="gPamelaRightForearmLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_FOREARM" Offset="0x8330" />
-        <Limb Name="gPamelaRightHandLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_HAND" Offset="0x833C" />
-        <Limb Name="gPamelaHeadLimb" Type="Standard" EnumName="PAMELA_LIMB_HEAD" Offset="0x8348" />
-        <Limb Name="gPamelaHairEndLimb" Type="Standard" EnumName="PAMELA_LIMB_HAIR_END" Offset="0x8354" />
-        <Limb Name="gPamelaChestLimb" Type="Standard" EnumName="PAMELA_LIMB_CHEST" Offset="0x8360" />
-        <Limb Name="gPamelaNeckLimb" Type="Standard" EnumName="PAMELA_LIMB_NECK" Offset="0x836C" />
-        <Limb Name="gPamelaLeftThighLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_THIGH" Offset="0x8378" />
-        <Limb Name="gPamelaLeftLegLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_LEG" Offset="0x8384" />
-        <Limb Name="gPamelaLeftFootLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_FOOT" Offset="0x8390" />
-        <Limb Name="gPamelaRightThighLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_THIGH" Offset="0x839C" />
-        <Limb Name="gPamelaRightLegLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_LEG" Offset="0x83A8" />
-        <Limb Name="gPamelaRightFootLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_FOOT" Offset="0x83B4" />
-        <Limb Name="gPamelaFrontDressLimb" Type="Standard" EnumName="PAMELA_LIMB_FRONT_DRESS" Offset="0x83C0" />
-        <Limb Name="gPamelaBackDressLimb" Type="Standard" EnumName="PAMELA_LIMB_BACK_DRESS" Offset="0x83CC" />
-        <Limb Name="gPamelaAbdomenLimb" Type="Standard" EnumName="PAMELA_LIMB_ABDOMEN" Offset="0x83D8" />
-        <Limb Name="gPamelaPelvisLimb" Type="Standard" EnumName="PAMELA_LIMB_PELVIS" Offset="0x83E4" />
-        <Skeleton Name="gPamelaSkel" Type="Flex" LimbType="Standard" LimbNone="PAMELA_LIMB_NONE" LimbMax="PAMELA_LIMB_MAX" EnumName="PamelaLimb" Offset="0x8448" />
-        
-        <Animation Name="object_pamera_Anim_008AE0" Offset="0x8AE0" /> <!-- Pamela Walking -->
-        <Animation Name="object_pamera_Anim_008E38" Offset="0x8E38" />
-        <Animation Name="object_pamera_Anim_009870" Offset="0x9870" />
-        <Animation Name="object_pamera_Anim_009F54" Offset="0x9F54" /> <!-- HoldBack En_Hgo -->
-        <Animation Name="object_pamera_Anim_00A844" Offset="0xA844" /> <!-- Pamela Looking down the well -->
-        <Animation Name="object_pamera_Anim_00B0C4" Offset="0xB0C4" />
-        <Animation Name="object_pamera_Anim_00B5B0" Offset="0xB5B0" /> <!-- PushBack En_Hgo -->
-        <Animation Name="object_pamera_Anim_00BCC4" Offset="0xBCC4" /> <!-- Defend En_Hgo -->
-        <Animation Name="object_pamera_Anim_00C9F4" Offset="0xC9F4" />
-        <Animation Name="object_pamera_Anim_00D0F0" Offset="0xD0F0" />
-        <Animation Name="object_pamera_Anim_00D9DC" Offset="0xD9DC" />
-        <Animation Name="object_pamera_Anim_00E16C" Offset="0xE16C" /> <!-- Hugging En_Hg -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ph.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ph.xml
deleted file mode 100644
index fcf03b765..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ph.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<Root>
-    <File Name="object_ph" Segment="6">
-        <Animation Name="object_ph_Anim_000350" Offset="0x350" />
-        <Animation Name="object_ph_Anim_0005C4" Offset="0x5C4" />
-        <Animation Name="object_ph_Anim_000844" Offset="0x844" />
-        <Animation Name="object_ph_Anim_0009C4" Offset="0x9C4" />
-        <DList Name="object_ph_DL_000ED0" Offset="0xED0" />
-        <DList Name="object_ph_DL_000F60" Offset="0xF60" />
-        <DList Name="object_ph_DL_000FF0" Offset="0xFF0" />
-        <DList Name="object_ph_DL_001080" Offset="0x1080" />
-        <DList Name="object_ph_DL_001110" Offset="0x1110" />
-        <DList Name="object_ph_DL_0011A0" Offset="0x11A0" />
-        <DList Name="object_ph_DL_001230" Offset="0x1230" />
-        <DList Name="object_ph_DL_0012F0" Offset="0x12F0" />
-        <Texture Name="object_ph_Tex_001410" OutName="tex_001410" Format="rgba16" Width="8" Height="8" Offset="0x1410" />
-        <Texture Name="object_ph_Tex_001490" OutName="tex_001490" Format="rgba16" Width="16" Height="32" Offset="0x1490" />
-        <Texture Name="object_ph_Tex_001890" OutName="tex_001890" Format="rgba16" Width="8" Height="32" Offset="0x1890" />
-        <Texture Name="object_ph_Tex_001A90" OutName="tex_001A90" Format="rgba16" Width="8" Height="8" Offset="0x1A90" />
-        <Limb Name="object_ph_Standardlimb_001B10" Type="Standard" EnumName="OBJECT_PH_LIMB_01" Offset="0x1B10" />
-        <Limb Name="object_ph_Standardlimb_001B1C" Type="Standard" EnumName="OBJECT_PH_LIMB_02" Offset="0x1B1C" />
-        <Limb Name="object_ph_Standardlimb_001B28" Type="Standard" EnumName="OBJECT_PH_LIMB_03" Offset="0x1B28" />
-        <Limb Name="object_ph_Standardlimb_001B34" Type="Standard" EnumName="OBJECT_PH_LIMB_04" Offset="0x1B34" />
-        <Limb Name="object_ph_Standardlimb_001B40" Type="Standard" EnumName="OBJECT_PH_LIMB_05" Offset="0x1B40" />
-        <Limb Name="object_ph_Standardlimb_001B4C" Type="Standard" EnumName="OBJECT_PH_LIMB_06" Offset="0x1B4C" />
-        <Limb Name="object_ph_Standardlimb_001B58" Type="Standard" EnumName="OBJECT_PH_LIMB_07" Offset="0x1B58" />
-        <Limb Name="object_ph_Standardlimb_001B64" Type="Standard" EnumName="OBJECT_PH_LIMB_08" Offset="0x1B64" />
-        <Limb Name="object_ph_Standardlimb_001B70" Type="Standard" EnumName="OBJECT_PH_LIMB_09" Offset="0x1B70" />
-        <Limb Name="object_ph_Standardlimb_001B7C" Type="Standard" EnumName="OBJECT_PH_LIMB_0A" Offset="0x1B7C" />
-        <Limb Name="object_ph_Standardlimb_001B88" Type="Standard" EnumName="OBJECT_PH_LIMB_0B" Offset="0x1B88" />
-        <Limb Name="object_ph_Standardlimb_001B94" Type="Standard" EnumName="OBJECT_PH_LIMB_0C" Offset="0x1B94" />
-        <Limb Name="object_ph_Standardlimb_001BA0" Type="Standard" EnumName="OBJECT_PH_LIMB_0D" Offset="0x1BA0" />
-        <Limb Name="object_ph_Standardlimb_001BAC" Type="Standard" EnumName="OBJECT_PH_LIMB_0E" Offset="0x1BAC" />
-        <Limb Name="object_ph_Standardlimb_001BB8" Type="Standard" EnumName="OBJECT_PH_LIMB_0F" Offset="0x1BB8" />
-        <Limb Name="object_ph_Standardlimb_001BC4" Type="Standard" EnumName="OBJECT_PH_LIMB_10" Offset="0x1BC4" />
-        <Limb Name="object_ph_Standardlimb_001BD0" Type="Standard" EnumName="OBJECT_PH_LIMB_11" Offset="0x1BD0" />
-        <Limb Name="object_ph_Standardlimb_001BDC" Type="Standard" EnumName="OBJECT_PH_LIMB_12" Offset="0x1BDC" />
-        <Limb Name="object_ph_Standardlimb_001BE8" Type="Standard" EnumName="OBJECT_PH_LIMB_13" Offset="0x1BE8" />
-        <Limb Name="object_ph_Standardlimb_001BF4" Type="Standard" EnumName="OBJECT_PH_LIMB_14" Offset="0x1BF4" />
-        <Limb Name="object_ph_Standardlimb_001C00" Type="Standard" EnumName="OBJECT_PH_LIMB_15" Offset="0x1C00" />
-        <Limb Name="object_ph_Standardlimb_001C0C" Type="Standard" EnumName="OBJECT_PH_LIMB_16" Offset="0x1C0C" />
-        <Limb Name="object_ph_Standardlimb_001C18" Type="Standard" EnumName="OBJECT_PH_LIMB_17" Offset="0x1C18" />
-        <Skeleton Name="object_ph_Skel_001C80" Type="Normal" LimbType="Standard" LimbNone="OBJECT_PH_LIMB_NONE" LimbMax="OBJECT_PH_LIMB_MAX" EnumName="ObjectPhLimb" Offset="0x1C80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po.xml
deleted file mode 100644
index a430d178b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Object for Poe -->
-    <File Name="object_po" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gPoeAttackAnim" Offset="0x1A8" />
-        <Animation Name="gPoeDamagedAnim" Offset="0x4EC" />
-        <Animation Name="gPoeFleeAnim" Offset="0x6E0" />
-        <Animation Name="gPoeFloatAnim" Offset="0xA60" />
-        <Animation Name="gPoeAppearAnim" Offset="0x11C4" />
-        <Animation Name="gPoeDisappearAnim" Offset="0x15B0" />
-
-        <!-- Poe Limb DisplayLists -->
-        <DList Name="gPoeRightUpperArmDL" Offset="0x1620" />
-        <DList Name="gPoeLeftForearmDL" Offset="0x1898" />
-        <DList Name="gPoeLeftUpperArmDL" Offset="0x1A78" />
-        <DList Name="gPoeRightForearmDL" Offset="0x1B70" />
-        <DList Name="gPoeRightHandDL" Offset="0x1C68" />
-        <DList Name="gPoeCloak1DL" Offset="0x1FB0" />
-        <DList Name="gPoeBurnDL" Offset="0x2608" />
-        <DList Name="gPoeFaceDL" Offset="0x2910" />
-        <DList Name="gPoeLanternDL" Offset="0x2D28" />
-        <DList Name="gPoeCloak2DL" Offset="0x2F58" />
-
-        <!-- Poe Soul -->
-        <Texture Name="gPoeSoulTex" OutName="poe_soul" Format="i8" Width="32" Height="64" Offset="0x3010" />
-        <DList Name="gPoeSoulDL" Offset="0x3850" />
-
-        <!-- Textures -->
-        <Texture Name="gPoeArmTex" OutName="poe_arm" Format="rgba16" Width="32" Height="16" Offset="0x3910" />
-        <Texture Name="gPoeCloak1Tex" OutName="poe_cloak1" Format="rgba16" Width="32" Height="32" Offset="0x3D10" />
-        <Texture Name="gPoeCloak2Tex" OutName="poe_cloak2" Format="rgba16" Width="16" Height="16" Offset="0x4510" />
-        <Texture Name="gPoeCloak3Tex" OutName="poe_cloak3" Format="rgba16" Width="8" Height="8" Offset="0x4710" />
-        <Texture Name="gPoeEyeTex" OutName="poe_eye" Format="rgba16" Width="16" Height="16" Offset="0x4790" />
-        <Texture Name="gPoeLanternTopTex" OutName="poe_lantern_top" Format="rgba16" Width="8" Height="8" Offset="0x4990" />
-        <Texture Name="gPoeLanternBottomTex" OutName="poe_lantern_bottom" Format="rgba16" Width="8" Height="16" Offset="0x4A10" />
-        <Texture Name="gPoeLanternMiddleTex" OutName="poe_lantern_middle" Format="rgba16" Width="16" Height="16" Offset="0x4B10" />
-        <Texture Name="gPoeBurnTex" OutName="poe_burn" Format="rgba16" Width="16" Height="16" Offset="0x4D10" />
-        <Texture Name="gPoeBurnEyeTex" OutName="poe_burn_eye" Format="rgba16" Width="8" Height="8" Offset="0x4F10" />
-
-        <!-- Limbs -->
-        <Limb Name="gPoeRootLimb" Type="Standard" EnumName="POE_LIMB_ROOT" Offset="0x4F90" />
-        <Limb Name="gPoeRootWrapperLimb" Type="Standard" EnumName="POE_LIMB_ROOT_WRAPPER" Offset="0x4F9C" />
-        <Limb Name="gPoeBottomCloakRootLimb" Type="Standard" EnumName="POE_LIMB_BOTTOM_CLOAK_ROOT" Offset="0x4FA8" />
-        <Limb Name="gPoeBottomCloakLimb" Type="Standard" EnumName="POE_LIMB_BOTTOM_CLOAK" Offset="0x4FB4" />
-        <Limb Name="gPoeTopCloakLimb" Type="Standard" EnumName="POE_LIMB_TOP_CLOAK" Offset="0x4FC0" />
-        <Limb Name="gPoeLeftArmRootLimb" Type="Standard" EnumName="POE_LIMB_LEFT_ARM_ROOT" Offset="0x4FCC" />
-        <Limb Name="gPoeLeftArmWrapperLimb" Type="Standard" EnumName="POE_LIMB_LEFT_ARM_WRAPPER" Offset="0x4FD8" />
-        <Limb Name="gPoeLeftForearmRootLimb" Type="Standard" EnumName="POE_LIMB_LEFT_FOREARM_ROOT" Offset="0x4FE4" />
-        <Limb Name="gPoeLeftForearmLimb" Type="Standard" EnumName="POE_LIMB_LEFT_FOREARM" Offset="0x4FF0" />
-        <Limb Name="gPoeLeftUpperArmLimb" Type="Standard" EnumName="POE_LIMB_LEFT_UPPER_ARM" Offset="0x4FFC" />
-        <Limb Name="gPoeFaceLimb" Type="Standard" EnumName="POE_LIMB_FACE" Offset="0x5008" />
-        <Limb Name="gPoeRightArmRootLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_ARM_ROOT" Offset="0x5014" />
-        <Limb Name="gPoeRightArmWrapperLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_ARM_WRAPPER" Offset="0x5020" />
-        <Limb Name="gPoeRightForearmRootLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_FOREARM_ROOT" Offset="0x502C" />
-        <Limb Name="gPoeRightArmHandRootLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_ARM_HAND_ROOT" Offset="0x5038" />
-        <Limb Name="gPoeRightArmHandLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_ARM_HAND" Offset="0x5044" />
-        <Limb Name="gPoeLanternRootLimb" Type="Standard" EnumName="POE_LIMB_LANTERN_ROOT" Offset="0x5050" />
-        <Limb Name="gPoeLanternLimb" Type="Standard" EnumName="POE_LIMB_LANTERN" Offset="0x505C" />
-        <Limb Name="gPoeRightForearmLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_FOREARM" Offset="0x5068" />
-        <Limb Name="gPoeRightUpperArmLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_UPPER_ARM" Offset="0x5074" />
-
-        <!-- Skeleton -->
-        <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" LimbNone="POE_LIMB_NONE" LimbMax="POE_LIMB_MAX" EnumName="PoeLimb" Offset="0x50D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po_composer.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po_composer.xml
deleted file mode 100644
index 1a083b1b4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po_composer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Assets for the composer brothers Flat and Sharp -->
-    <File Name="object_po_composer" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gPoeComposerAttackAnim" Offset="0x20C" />
-        <Animation Name="gPoeComposerRaiseArmsAnim" Offset="0x570" />
-        <Animation Name="gPoeComposerBeginPlayAnim" Offset="0xA58" />
-        <Animation Name="gPoeComposerPlayAnim" Offset="0x1420" />
-        <Animation Name="gPoeComposerFleeAnim" Offset="0x15B8" />
-        <Animation Name="gPoeComposerIdleAnim" Offset="0x188C" />
-        <Animation Name="gPoeComposerArmsRaisedAnim" Offset="0x1F44" />
-        <Animation Name="gPoeComposerLowerArmsAnim" Offset="0x23E8" />
-        <Animation Name="gPoeComposerLookDownAnim" Offset="0x2AE0" />
-        <Animation Name="gPoeComposerBeginRollAnim" Offset="0x3024" />
-        <Animation Name="gPoeComposerRollAnim" Offset="0x334C" />
-        <Animation Name="gPoeComposerAppearDisappearAnim" Offset="0x3954" />
-        <Animation Name="gPoeComposerStillAnim" Offset="0x3DB0" />
-
-        <!-- Texture -->
-        <Texture Name="gPoeComposerSoulTex" OutName="composer_soul" Format="i8" Width="32" Height="64" Offset="0x3DC0" />
-
-        <!-- Display Lists -->
-        <DList Name="object_po_composer_DL_004600" Offset="0x4600" />
-        <DList Name="gPoeComposerSharpHeadDL" Offset="0x6A70" />
-        <DList Name="object_po_composer_DL_006D80" Offset="0x6D80" />
-        <DList Name="gPoeComposerLanternBaseDL" Offset="0x6E08" />
-        <DList Name="gPoeComposerLanternTopDL" Offset="0x6EA8" />
-        <DList Name="gPoeComposerLanternGlassDL" Offset="0x6F38" />
-        <DList Name="gPoeComposerFlatHeadDL" Offset="0x6FD8" />
-        <DList Name="gPoeComposerBurnDL" Offset="0x7BC0" />
-
-        <!-- Textures -->
-        <Texture Name="object_po_composer_Tex_007E80" OutName="tex_007E80" Format="rgba16" Width="16" Height="16" Offset="0x7E80" />
-        <Texture Name="object_po_composer_Tex_008080" OutName="tex_008080" Format="rgba16" Width="16" Height="16" Offset="0x8080" />
-        <Texture Name="object_po_composer_Tex_008280" OutName="tex_008280" Format="rgba16" Width="16" Height="16" Offset="0x8280" />
-        <Texture Name="object_po_composer_Tex_008480" OutName="tex_008480" Format="rgba16" Width="16" Height="16" Offset="0x8480" />
-        <Texture Name="object_po_composer_Tex_008680" OutName="tex_008680" Format="rgba16" Width="16" Height="32" Offset="0x8680" />
-        <Texture Name="object_po_composer_Tex_008A80" OutName="tex_008A80" Format="rgba16" Width="16" Height="16" Offset="0x8A80" />
-        <Texture Name="object_po_composer_Tex_008C80" OutName="tex_008C80" Format="rgba16" Width="16" Height="16" Offset="0x8C80" />
-        <Texture Name="object_po_composer_Tex_008E80" OutName="tex_008E80" Format="rgba16" Width="16" Height="16" Offset="0x8E80" />
-        <Texture Name="object_po_composer_Tex_009080" OutName="tex_009080" Format="rgba16" Width="16" Height="16" Offset="0x9080" />
-        <Texture Name="object_po_composer_Tex_009280" OutName="tex_009280" Format="rgba16" Width="16" Height="16" Offset="0x9280" />
-        <Texture Name="object_po_composer_Tex_009480" OutName="tex_009480" Format="rgba16" Width="16" Height="16" Offset="0x9480" />
-        <Texture Name="object_po_composer_Tex_009680" OutName="tex_009680" Format="rgba16" Width="16" Height="16" Offset="0x9680" />
-
-        <!-- Limbs -->
-        <Limb Name="gPoeComposerUpperBodyLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_UPPER_BODY" Offset="0x9880" />
-        <Limb Name="gPoeComposerLeftShoulderLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LEFT_SHOULDER" Offset="0x988C" />
-        <Limb Name="gPoeComposerLeftArmLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LEFT_ARM" Offset="0x9898" />
-        <Limb Name="gPoeComposerLeftHandLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LEFT_HAND" Offset="0x98A4" />
-        <Limb Name="gPoeComposerConductorBatonLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_CONDUCTOR_BATON" Offset="0x98B0" />
-        <Limb Name="gPoeComposerRightShoulderLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_RIGHT_SHOULDER" Offset="0x98BC" />
-        <Limb Name="gPoeComposerRightArmLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_RIGHT_ARM" Offset="0x98C8" />
-        <Limb Name="gPoeComposerRightHandLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_RIGHT_HAND" Offset="0x98D4" />
-        <Limb Name="gPoeComposerLanternLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LANTERN" Offset="0x98E0" />
-        <Limb Name="gPoeComposerHeadLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_HEAD" Offset="0x98EC" />
-        <Limb Name="gPoeComposerLowerBodyLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LOWER_BODY" Offset="0x98F8" />
-
-        <!-- Skeleton -->
-        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" LimbNone="POE_COMPOSER_LIMB_NONE" LimbMax="POE_COMPOSER_LIMB_MAX" EnumName="PoeComposerLimb" Offset="0x9930" />
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po_fusen.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po_fusen.xml
deleted file mode 100644
index 23bfbe075..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po_fusen.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<Root>
-    <!-- Assets for Poe Balloon archery target in Romani Ranch. -->
-    <File Name="object_po_fusen" Segment="6">
-        <!-- Empty: PoFusen is animated directly from its code. -->
-        <Animation Name="gPoeBalloonEmptyAnim" Offset="0x40" />
-
-        <DList Name="gPoeBalloonChainAndLanternDL" Offset="0x8C0" />
-        <DList Name="gPoeBalloonLeftHandDL" Offset="0xAF8" />
-        <DList Name="gPoeBalloonLeftForearmDL" Offset="0xB90" />
-        <DList Name="gPoeBalloonLeftUpperArmDL" Offset="0xC48" />
-        <DList Name="gPoeBalloonRightHandDL" Offset="0xCD8" />
-        <DList Name="gPoeBalloonRightForearmDL" Offset="0xD70" />
-        <DList Name="gPoeBalloonRightUpperArmDL" Offset="0xE28" />
-        <DList Name="gPoeBalloonBodyDL" Offset="0xEB8" />
-
-        <Texture Name="gPoeBalloonTLUT" OutName="balloon_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10E0" />
-        <!-- The tattered cloth along the eyes are part of the face texture, but not below the chin. -->
-        <Texture Name="gPoeBalloonTatteredChinTex" OutName="tattered_chin" Format="rgba16" Width="16" Height="16" Offset="0x12E0" />
-        <Texture Name="gPoeBalloonLanternTopTex" OutName="lantern_top" Format="rgba16" Width="16" Height="16" Offset="0x14E0" />
-        <Texture Name="gPoeBalloonLanternStandTex" OutName="lantern_stand" Format="rgba16" Width="16" Height="16" Offset="0x16E0" />
-        <Texture Name="gPoeBalloonLanternGlassTex" OutName="lantern_glass" Format="ci8" Width="16" Height="16" Offset="0x18E0" />
-        <Texture Name="gPoeBalloonHandTex" OutName="the_hand" Format="i4" Width="16" Height="16" Offset="0x19E0" />
-        <Texture Name="gPoeBalloonOrangeSkinTex" OutName="orange_skin" Format="rgba16" Width="16" Height="16" Offset="0x1A60" />
-        <Texture Name="gPoeBalloonFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x1C60" />
-        <Texture Name="gPoeBalloonChainLinkTex" OutName="chain_link" Format="rgba16" Width="16" Height="32" Offset="0x2060" />
-
-        <Limb Name="gPoeBalloonRootLimb" Type="Standard" EnumName="POE_BALLOON_LIMB_ROOT" Offset="0x2460" />
-        <Limb Name="gPoeBalloonBodyLimb" Type="Standard" EnumName="POE_BALLOON_LIMB_BODY" Offset="0x246C" />
-        <Limb Name="gPoeBalloonRightUpperArmLimb" Type="Standard" EnumName="POE_BALLOON_RIGHT_UPPER_ARM" Offset="0x2478" />
-        <Limb Name="gPoeBalloonRightForearmLimb" Type="Standard" EnumName="POE_BALLOON_RIGHT_FOREARM" Offset="0x2484" />
-        <Limb Name="gPoeBalloonRightHandLimb" Type="Standard" EnumName="POE_BALLOON_RIGHT_HAND" Offset="0x2490" />
-        <Limb Name="gPoeBalloonLeftUpperArmLimb" Type="Standard" EnumName="POE_BALLOON_LEFT_UPPER_ARM" Offset="0x249C" />
-        <Limb Name="gPoeBalloonLeftForearmLimb" Type="Standard" EnumName="POE_BALLOON_LEFT_FOREARM" Offset="0x24A8" />
-        <Limb Name="gPoeBalloonLeftHandLimb" Type="Standard" EnumName="POE_BALLOON_LEFT_HAND" Offset="0x24B4" />
-        <Limb Name="gPoeBalloonChainAndLanternLimb" Type="Standard" EnumName="POE_BALLOON_LIMB_CHAIN_AND_LANTERN" Offset="0x24C0" />
-
-        <Skeleton Name="gPoeBalloonSkel" Type="Flex" LimbType="Standard" LimbNone="POE_BALLOON_LIMB_NONE" LimbMax="POE_BALLOON_LIMB_MAX" EnumName="PoeBalloonLimb" Offset="0x24F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po_sisters.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po_sisters.xml
deleted file mode 100644
index 6b0755905..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_po_sisters.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Po Sisters (Jo, Beth, Ami, and Meg) that you fight as a minigame in Ikana for a HP -->
-    <!-- Joelle is red, Beth is blue, Ami is green, and Meg is purple -->
-    <File Name="object_po_sisters" Segment="6">
-        <!-- PoSister Animations -->
-        <Animation Name="gPoeSistersAttackAnim" Offset="0x114" />
-        <Animation Name="gPoeSistersMegCryAnim" Offset="0x680" />
-        <Animation Name="gPoeSistersDamagedAnim" Offset="0x8C0" />
-        <Animation Name="gPoeSistersFleeAnim" Offset="0xA54" />
-        <Animation Name="gPoeSistersFloatAnim" Offset="0xD40" />
-        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C" />
-        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC" />
-
-        <!-- PoSister DisplayLists -->
-        <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0" />
-        <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0" />
-        <DList Name="gPoeSistersLowerBodyDL" Offset="0x24A8" />
-        <DList Name="gPoeSistersRightHandDL" Offset="0x2570" />
-        <DList Name="gPoeSistersArmShortDL" Offset="0x25E8" />
-        <DList Name="gPoeSistersArmMedDL" Offset="0x2680" />
-        <DList Name="gPoeSistersArmLongDL" Offset="0x2718" />
-        <DList Name="gPoeSistersTorchDL" Offset="0x27B0" />
-        <DList Name="gPoeSistersLeftHandDL" Offset="0x2870" />
-        <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8" />
-        <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88" />
-        <DList Name="gPoeSistersBethBodyDL" Offset="0x3628" />
-        <DList Name="gPoeSistersBethFaceDL" Offset="0x3880" />
-        <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8" />
-        <DList Name="gPoeSistersAmyFaceDL" Offset="0x4020" />
-        <DList Name="gPoeSistersBurnBodyDL" Offset="0x46E0" />
-
-        <!-- PoSister Textures -->
-        <Texture Name="gPoeSistersTorchTex" OutName="torch" Format="rgba16" Width="16" Height="16" Offset="0x48D8" />
-        <Texture Name="gPoeSistersTatteredRobeTex" OutName="tattered_robe" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" />
-        <Texture Name="gPoeSistersArmTex" OutName="arm" Format="rgba16" Width="32" Height="16" Offset="0x52D8" />
-        <Texture Name="gPoeSistersMegJoelleEyeTex" OutName="meg_joelle_eye" Format="rgba16" Width="16" Height="16" Offset="0x56D8" />
-        <Texture Name="gPoeSistersMainRobeGradientTex" OutName="robe_gradient" Format="rgba16" Width="4" Height="4" Offset="0x58D8" />
-        <Texture Name="gPoeSistersMegTiaraTex" OutName="meg_tiara" Format="rgba16" Width="16" Height="16" Offset="0x58F8" />
-        <Texture Name="gPoeSistersMegHairTex" OutName="meg_hair" Format="rgba16" Width="16" Height="16" Offset="0x5AF8" />
-        <Texture Name="gPoeSistersJoelleHairBandtex" OutName="joelle_hair_tie" Format="rgba16" Width="8" Height="8" Offset="0x5CF8" />
-        <Texture Name="gPoeSistersJoelleAmyHairTex" OutName="joelle_amy_hair" Format="rgba16" Width="16" Height="16" Offset="0x5D78" />
-        <Texture Name="gPoeSistersBethAmyEyesTex" OutName="beth_amy_eye" Format="rgba16" Width="16" Height="8" Offset="0x5F78" />
-        <Texture Name="gPoeSistersBethHatAndHairTex" OutName="beth_hat_and_hair" Format="rgba16" Width="16" Height="16" Offset="0x6078" />
-        <Texture Name="gPoeSistersBethHatEdgeTex" OutName="beth_hat_edge" Format="rgba16" Width="8" Height="8" Offset="0x6278" />
-        <Texture Name="gPoeSistersAmyHairTieTex" OutName="amy_hair_tie" Format="rgba16" Width="4" Height="4" Offset="0x62F8" />
-        <Texture Name="gPoeSistersCrispBodyTex" OutName="crisp_body" Format="rgba16" Width="16" Height="16" Offset="0x6318" />
-
-
-        <!-- PoSister Limbs -->
-        <Limb Name="gPoeSistersMainRootLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_ROOT" Offset="0x6518" />
-        <Limb Name="gPoeSistersLeftArmLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_LEFT_ARM" Offset="0x6524" />
-        <Limb Name="gPoeSistersLeftHandLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_LEFT_HAND" Offset="0x6530" />
-        <Limb Name="gPoeSistersRightUpperArmLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_RIGHT_UPPER_ARM" Offset="0x653C" />
-        <Limb Name="gPoeSistersRightForearmLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_RIGHT_FOREARM" Offset="0x6548" />
-        <Limb Name="gPoeSistersTorchRootLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_TORCH_ROOT" Offset="0x6554" />
-        <Limb Name="gPoeSistersRightHandLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_RIGHT_HAND" Offset="0x6560" />
-        <Limb Name="gPoeSistersTorchLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_TORCH" Offset="0x656C" />
-        <Limb Name="gPoeSistersMainBodyLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_MAIN_BODY" Offset="0x6578" />
-        <Limb Name="gPoeSistersFaceLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_FACE" Offset="0x6584" />
-        <Limb Name="gPoeSistersLowerBodyLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_LOWER_BODY" Offset="0x6590" />
-
-        <!-- PoSister Skeleton -->
-        <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" LimbNone="POE_SISTERS_LIMB_NONE" LimbMax="POE_SISTERS_LIMB_MAX" EnumName="PoeSistersLimb" Offset="0x65C8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_posthouse_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_posthouse_obj.xml
deleted file mode 100644
index 8a324672b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_posthouse_obj.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_posthouse_obj" Segment="6">
-        <DList Name="object_posthouse_obj_DL_000A50" Offset="0xA50" />
-        <Texture Name="object_posthouse_obj_Tex_000DA8" OutName="tex_000DA8" Format="rgba16" Width="8" Height="8" Offset="0xDA8" />
-        <Texture Name="object_posthouse_obj_Tex_000E28" OutName="tex_000E28" Format="rgba16" Width="16" Height="16" Offset="0xE28" />
-        <Texture Name="object_posthouse_obj_Tex_001028" OutName="tex_001028" Format="rgba16" Width="32" Height="32" Offset="0x1028" />
-        <DList Name="object_posthouse_obj_DL_001870" Offset="0x1870" />
-        <Texture Name="object_posthouse_obj_Tex_001900" OutName="tex_001900" Format="rgba16" Width="64" Height="32" Offset="0x1900" />
-        <Collision Name="object_posthouse_obj_Colheader_002948" Offset="0x2948" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pp.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pp.xml
deleted file mode 100644
index dc51c202c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pp.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<Root>
-    <!-- Assets for Hiploops. Includes an entire unused duplicate of the Hiploop's skeletal model and textures. -->
-    <File Name="object_pp" Segment="6">
-        <!-- Hiploop Animations -->
-        <Animation Name="gHiploopAttackAnim" Offset="0xE14" /> <!-- Original name is "pp_attack" -->
-        <Animation Name="gHiploopChargeAnim" Offset="0x1354" /> <!-- Original name is "pp_attack_run" -->
-        <Animation Name="gHiploopDamageAnim" Offset="0x178C" /> <!-- Original name is "pp_damage" -->
-
-        <!-- Unused Hiploop Limb DisplayLists -->
-        <DList Name="gUnusedHiploopBodyDL" Offset="0x2FD0" />
-        <DList Name="gUnusedHiploopLeftEyeDL" Offset="0x32D8" />
-        <DList Name="gUnusedHiploopRightEyeDL" Offset="0x3368" />
-        <DList Name="gUnusedHiploopBackLeftUpperLegDL" Offset="0x33F8" />
-        <DList Name="gUnusedHiploopBackLeftLowerLegDL" Offset="0x3580" />
-        <DList Name="gUnusedHiploopBackLeftFootDL" Offset="0x3700" />
-        <DList Name="gUnusedHiploopCenterWingBaseDL" Offset="0x3880" />
-        <DList Name="gUnusedHiploopCenterWingMiddleDL" Offset="0x39C0" />
-        <DList Name="gUnusedHiploopCenterWingTipDL" Offset="0x3AB8" />
-        <DList Name="gUnusedHiploopRightWingBaseDL" Offset="0x3BA8" />
-        <DList Name="gUnusedHiploopRightWingMiddleDL" Offset="0x3D30" />
-        <DList Name="gUnusedHiploopRightWingTipDL" Offset="0x3E20" />
-        <DList Name="gUnusedHiploopMaskDL" Offset="0x3F10" />
-        <DList Name="gUnusedHiploopBackRightUpperLegDL" Offset="0x4028" />
-        <DList Name="gUnusedHiploopBackRightLowerLegDL" Offset="0x41B0" />
-        <DList Name="gUnusedHiploopBackRightFootDL" Offset="0x4330" />
-        <DList Name="gUnusedHiploopLeftWingBaseDL" Offset="0x44B0" />
-        <DList Name="gUnusedHiploopLeftWingMiddleDL" Offset="0x4638" />
-        <DList Name="gUnusedHiploopLeftWingTipDL" Offset="0x4728" />
-        <DList Name="gUnusedHiploopFrontRightUpperLegDL" Offset="0x4818" />
-        <DList Name="gUnusedHiploopFrontRightLowerLegDL" Offset="0x4998" />
-        <DList Name="gUnusedHiploopFrontRightFootDL" Offset="0x4B18" />
-        <DList Name="gUnusedHiploopFrontLeftUpperLegDL" Offset="0x4C98" />
-        <DList Name="gUnusedHiploopFrontLeftLowerLegDL" Offset="0x4E18" />
-        <DList Name="gUnusedHiploopFrontLeftFootDL" Offset="0x4F98" />
-
-        <!-- Unused Hiploop Textures -->
-        <Texture Name="gUnusedHiploopEyeTex" OutName="unused_hiploop_eye" Format="rgba16" Width="32" Height="32" Offset="0x5118" />
-        <Texture Name="gUnusedHiploopUndersideTex" OutName="unused_hiploop_underside" Format="rgba16" Width="64" Height="32" Offset="0x5918" />
-        <Texture Name="gUnusedHiploopFaceTex" OutName="unused_hiploop_face" Format="rgba16" Width="32" Height="32" Offset="0x6918" />
-        <Texture Name="gUnusedHiploopBackTex" OutName="unused_hiploop_back" Format="rgba16" Width="32" Height="32" Offset="0x7118" />
-        <Texture Name="gUnusedHiploopCenterWingTex" OutName="unused_hiploop_center_wing" Format="rgba16" Width="32" Height="32" Offset="0x7918" />
-        <Texture Name="gUnusedHiploopSideWingsTex" OutName="unused_hiploop_side_wings" Format="rgba16" Width="32" Height="32" Offset="0x8118" />
-        <Texture Name="gUnusedHiploopBackCenterTex" OutName="unused_hiploop_back_center" Format="rgba16" Width="32" Height="32" Offset="0x8918" />
-        <Texture Name="gUnusedHiploopLegTex" OutName="unused_hiploop_leg" Format="rgba16" Width="16" Height="16" Offset="0x9118" />
-        <Texture Name="gUnusedHiploopMaskTex" OutName="unused_hiploop_mask" Format="i4" Width="32" Height="32" Offset="0x9318" />
-
-        <!-- Unused Hiploop Limbs -->
-        <Limb Name="gUnusedHiploopBodyLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BODY" Offset="0x9518" />
-        <Limb Name="gUnusedHiploopFrontLeftUpperLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x9524" />
-        <Limb Name="gUnusedHiploopFrontLeftLowerLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x9530" />
-        <Limb Name="gUnusedHiploopFrontLeftFootLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_LEFT_FOOT" Offset="0x953C" />
-        <Limb Name="gUnusedHiploopFrontRightUpperLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x9548" />
-        <Limb Name="gUnusedHiploopFrontRightLowerLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x9554" />
-        <Limb Name="gUnusedHiploopFrontRightFootLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_RIGHT_FOOT" Offset="0x9560" />
-        <Limb Name="gUnusedHiploopMaskLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_MASK" Offset="0x956C" />
-        <Limb Name="gUnusedHiploopLeftWingBaseLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_LEFT_WING_BASE" Offset="0x9578" />
-        <Limb Name="gUnusedHiploopLeftWingMiddleLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_LEFT_WING_MIDDLE" Offset="0x9584" />
-        <Limb Name="gUnusedHiploopLeftWingTipLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_LEFT_WING_TIP" Offset="0x9590" />
-        <Limb Name="gUnusedHiploopBackRightUpperLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_RIGHT_UPPER_LEG" Offset="0x959C" />
-        <Limb Name="gUnusedHiploopBackRightLowerLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_RIGHT_LOWER_LEG" Offset="0x95A8" />
-        <Limb Name="gUnusedHiploopBackRightFootLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_RIGHT_FOOT" Offset="0x95B4" />
-        <Limb Name="gUnusedHiploopRightWingBaseLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_RIGHT_WING_BASE" Offset="0x95C0" />
-        <Limb Name="gUnusedHiploopRightWingMiddleLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_RIGHT_WING_MIDDLE" Offset="0x95CC" />
-        <Limb Name="gUnusedHiploopRightWingTipLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_RIGHT_WING_TIP" Offset="0x95D8" />
-        <Limb Name="gUnusedHiploopCenterWingBaseLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_CENTER_WING_BASE" Offset="0x95E4" />
-        <Limb Name="gUnusedHiploopCenterWingMiddleLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_CENTER_WING_MIDDLE" Offset="0x95F0" />
-        <Limb Name="gUnusedHiploopCenterWingTipLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_CENTER_WING_TIP" Offset="0x95FC" />
-        <Limb Name="gUnusedHiploopBackLeftUpperLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_LEFT_UPPER_LEG" Offset="0x9608" />
-        <Limb Name="gUnusedHiploopBackLeftLowerLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_LEFT_LOWER_LEG" Offset="0x9614" />
-        <Limb Name="gUnusedHiploopBackLeftFootLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_LEFT_FOOT" Offset="0x9620" />
-        <Limb Name="gUnusedHiploopRightEyeLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_RIGHT_EYE" Offset="0x962C" />
-        <Limb Name="gUnusedHiploopLeftEyeLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_LEFT_EYE" Offset="0x9638" />
-
-        <!-- Unused Hiploop Skeleton -->
-        <Skeleton Name="gUnusedHiploopSkel" Type="Flex" LimbType="Standard" LimbNone="UNUSED_HIPLOOP_LIMB_NONE" LimbMax="UNUSED_HIPLOOP_LIMB_MAX" EnumName="UnusedHiploopLimb" Offset="0x96A8" />
-
-        <!-- Hiploop Animations -->
-        <Animation Name="gHiploopRoarAnim" Offset="0x9A74" /> <!-- Original name is "pp_mogaki" ("writhing") -->
-        <Animation Name="gHiploopWindUpAnim" Offset="0xA304" /> <!-- Original name is "pp_pre_attack" -->
-        <Animation Name="gHiploopIdleAnim" Offset="0xA844" /> <!-- Original name is "pp_wait" -->
-
-        <!-- Hiploop Limb DisplayLists -->
-        <DList Name="gHiploopBodyDL" Offset="0xC090" />
-        <DList Name="gHiploopLeftEyeDL" Offset="0xC398" />
-        <DList Name="gHiploopRightEyeDL" Offset="0xC428" />
-        <DList Name="gHiploopBackLeftUpperLegDL" Offset="0xC4B8" />
-        <DList Name="gHiploopBackLeftLowerLegDL" Offset="0xC640" />
-        <DList Name="gHiploopBackLeftFootDL" Offset="0xC7C0" />
-        <DList Name="gHiploopCenterWingBaseDL" Offset="0xC940" />
-        <DList Name="gHiploopCenterWingMiddleDL" Offset="0xCA80" />
-        <DList Name="gHiploopCenterWingTipDL" Offset="0xCB78" />
-        <DList Name="gHiploopRightWingBaseDL" Offset="0xCC68" />
-        <DList Name="gHiploopRightWingMiddleDL" Offset="0xCDF0" />
-        <DList Name="gHiploopRightWingTipDL" Offset="0xCEE0" />
-        <DList Name="gHiploopMaskDL" Offset="0xCFD0" />
-        <DList Name="gHiploopBackRightUpperLegDL" Offset="0xD0E8" />
-        <DList Name="gHiploopBackRightLowerLegDL" Offset="0xD270" />
-        <DList Name="gHiploopBackRightFootDL" Offset="0xD3F0" />
-        <DList Name="gHiploopLeftWingBaseDL" Offset="0xD570" />
-        <DList Name="gHiploopLeftWingMiddleDL" Offset="0xD6F8" />
-        <DList Name="gHiploopLeftWingTipDL" Offset="0xD7E8" />
-        <DList Name="gHiploopFrontRightUpperLegDL" Offset="0xD8D8" />
-        <DList Name="gHiploopFrontRightLowerLegDL" Offset="0xDA58" />
-        <DList Name="gHiploopFrontRightFootDL" Offset="0xDBD8" />
-        <DList Name="gHiploopFrontLeftUpperLegDL" Offset="0xDD58" />
-        <DList Name="gHiploopFrontLeftLowerLegDL" Offset="0xDED8" />
-        <DList Name="gHiploopFrontLeftFootDL" Offset="0xE058" />
-        
-        <!-- Hiploop Textures -->
-        <Texture Name="gHiploopEyeTex" OutName="hiploop_eye" Format="rgba16" Width="32" Height="32" Offset="0xE1D8" />
-        <Texture Name="gHiploopUndersideTex" OutName="hiploop_underside" Format="rgba16" Width="64" Height="32" Offset="0xE9D8" />
-        <Texture Name="gHiploopFaceTex" OutName="hiploop_face" Format="rgba16" Width="32" Height="32" Offset="0xF9D8" />
-        <Texture Name="gHiploopBackTex" OutName="hiploop_back" Format="rgba16" Width="32" Height="32" Offset="0x101D8" />
-        <Texture Name="gHiploopCenterWingTex" OutName="hiploop_center_wing" Format="rgba16" Width="32" Height="32" Offset="0x109D8" />
-        <Texture Name="gHiploopSideWingsTex" OutName="hiploop_side_wings" Format="rgba16" Width="32" Height="32" Offset="0x111D8" />
-        <Texture Name="gHiploopBackCenterTex" OutName="hiploop_back_center" Format="rgba16" Width="32" Height="32" Offset="0x119D8" />
-        <Texture Name="gHiploopLegTex" OutName="hiploop_leg" Format="rgba16" Width="16" Height="16" Offset="0x121D8" />
-        <Texture Name="gHiploopMaskTex" OutName="hiploop_mask" Format="i4" Width="32" Height="32" Offset="0x123D8" />
-
-        <!-- Hiploop Limbs -->
-        <Limb Name="gHiploopBodyLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BODY" Offset="0x125D8" />
-        <Limb Name="gHiploopFrontLeftUpperLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x125E4" />
-        <Limb Name="gHiploopFrontLeftLowerLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x125F0" />
-        <Limb Name="gHiploopFrontLeftFootLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_LEFT_FOOT" Offset="0x125FC" />
-        <Limb Name="gHiploopFrontRightUpperLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x12608" />
-        <Limb Name="gHiploopFrontRightLowerLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x12614" />
-        <Limb Name="gHiploopFrontRightFootLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_RIGHT_FOOT" Offset="0x12620" />
-        <Limb Name="gHiploopMaskLimb" Type="Standard" EnumName="HIPLOOP_LIMB_MASK" Offset="0x1262C" />
-        <Limb Name="gHiploopLeftWingBaseLimb" Type="Standard" EnumName="HIPLOOP_LIMB_LEFT_WING_BASE" Offset="0x12638" />
-        <Limb Name="gHiploopLeftWingMiddleLimb" Type="Standard" EnumName="HIPLOOP_LIMB_LEFT_WING_MIDDLE" Offset="0x12644" />
-        <Limb Name="gHiploopLeftWingTipLimb" Type="Standard" EnumName="HIPLOOP_LIMB_LEFT_WING_TIP" Offset="0x12650" />
-        <Limb Name="gHiploopBackRightUpperLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_RIGHT_UPPER_LEG" Offset="0x1265C" />
-        <Limb Name="gHiploopBackRightLowerLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_RIGHT_LOWER_LEG" Offset="0x12668" />
-        <Limb Name="gHiploopBackRightFootLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_RIGHT_FOOT" Offset="0x12674" />
-        <Limb Name="gHiploopRightWingBaseLimb" Type="Standard" EnumName="HIPLOOP_LIMB_RIGHT_WING_BASE" Offset="0x12680" />
-        <Limb Name="gHiploopRightWingMiddleLimb" Type="Standard" EnumName="HIPLOOP_LIMB_RIGHT_WING_MIDDLE" Offset="0x1268C" />
-        <Limb Name="gHiploopRightWingTipLimb" Type="Standard" EnumName="HIPLOOP_LIMB_RIGHT_WING_TIP" Offset="0x12698" />
-        <Limb Name="gHiploopCenterWingBaseLimb" Type="Standard" EnumName="HIPLOOP_LIMB_CENTER_WING_BASE" Offset="0x126A4" />
-        <Limb Name="gHiploopCenterWingMiddleLimb" Type="Standard" EnumName="HIPLOOP_LIMB_CENTER_WING_MIDDLE" Offset="0x126B0" />
-        <Limb Name="gHiploopCenterWingTipLimb" Type="Standard" EnumName="HIPLOOP_LIMB_CENTER_WING_TIP" Offset="0x126BC" />
-        <Limb Name="gHiploopBackLeftUpperLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_LEFT_UPPER_LEG" Offset="0x126C8" />
-        <Limb Name="gHiploopBackLeftLowerLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_LEFT_LOWER_LEG" Offset="0x126D4" />
-        <Limb Name="gHiploopBackLeftFootLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_LEFT_FOOT" Offset="0x126E0" />
-        <Limb Name="gHiploopRightEyeLimb" Type="Standard" EnumName="HIPLOOP_LIMB_RIGHT_EYE" Offset="0x126EC" />
-        <Limb Name="gHiploopLeftEyeLimb" Type="Standard" EnumName="HIPLOOP_LIMB_LEFT_EYE" Offset="0x126F8" />
-
-        <!-- Hiploop Skeleton -->
-        <Skeleton Name="gHiploopSkel" Type="Flex" LimbType="Standard" LimbNone="HIPLOOP_LIMB_NONE" LimbMax="HIPLOOP_LIMB_MAX" EnumName="HiploopLimb" Offset="0x12768" />
-
-        <!-- Hiploop Animation -->
-        <Animation Name="gHiploopWalkAnim" Offset="0x12AE4" /> <!-- Original name is "pp_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pr.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pr.xml
deleted file mode 100644
index 52429cb18..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pr.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<Root>
-    <File Name="object_pr" Segment="6">
-        <Animation Name="object_pr_Anim_000268" Offset="0x268" />
-        <Animation Name="object_pr_Anim_000740" Offset="0x740" />
-        <DList Name="object_pr_DL_000F30" Offset="0xF30" />
-        <DList Name="object_pr_DL_001130" Offset="0x1130" />
-        <DList Name="object_pr_DL_0011C8" Offset="0x11C8" />
-        <DList Name="object_pr_DL_001260" Offset="0x1260" />
-        <DList Name="object_pr_DL_0012F8" Offset="0x12F8" />
-        <DList Name="object_pr_DL_0013E8" Offset="0x13E8" />
-        <DList Name="object_pr_DL_001480" Offset="0x1480" />
-        <DList Name="object_pr_DL_001550" Offset="0x1550" />
-        <Texture Name="object_pr_Tex_001608" OutName="tex_001608" Format="rgba16" Width="8" Height="16" Offset="0x1608" />
-        <Texture Name="object_pr_Tex_001708" OutName="tex_001708" Format="rgba16" Width="16" Height="16" Offset="0x1708" />
-        <Texture Name="object_pr_Tex_001908" OutName="tex_001908" Format="rgba16" Width="16" Height="16" Offset="0x1908" />
-        <Texture Name="object_pr_Tex_001B08" OutName="tex_001B08" Format="rgba16" Width="16" Height="16" Offset="0x1B08" />
-        <Texture Name="object_pr_Tex_001D08" OutName="tex_001D08" Format="rgba16" Width="8" Height="8" Offset="0x1D08" />
-        <TextureAnimation Name="object_pr_Matanimheader_001DB0" Offset="0x1DB0" />
-        <Animation Name="object_pr_Anim_001E10" Offset="0x1E10" />
-        <Animation Name="object_pr_Anim_0021E8" Offset="0x21E8" />
-        <DList Name="object_pr_DL_0029E0" Offset="0x29E0" />
-        <DList Name="object_pr_DL_002BD0" Offset="0x2BD0" />
-        <DList Name="object_pr_DL_002C68" Offset="0x2C68" />
-        <DList Name="object_pr_DL_002D00" Offset="0x2D00" />
-        <DList Name="object_pr_DL_002D98" Offset="0x2D98" />
-        <DList Name="object_pr_DL_002E88" Offset="0x2E88" />
-        <DList Name="object_pr_DL_002F20" Offset="0x2F20" />
-        <DList Name="object_pr_DL_002FF0" Offset="0x2FF0" />
-        <Texture Name="object_pr_Tex_0030A8" OutName="tex_0030A8" Format="rgba16" Width="8" Height="16" Offset="0x30A8" />
-        <Texture Name="object_pr_Tex_0031A8" OutName="tex_0031A8" Format="rgba16" Width="16" Height="16" Offset="0x31A8" />
-        <Texture Name="object_pr_Tex_0033A8" OutName="tex_0033A8" Format="rgba16" Width="16" Height="16" Offset="0x33A8" />
-        <Texture Name="object_pr_Tex_0035A8" OutName="tex_0035A8" Format="rgba16" Width="16" Height="16" Offset="0x35A8" />
-        <Texture Name="object_pr_Tex_0037A8" OutName="tex_0037A8" Format="rgba16" Width="8" Height="8" Offset="0x37A8" />
-        <Limb Name="object_pr_Standardlimb_003828" Type="Standard" EnumName="OBJECT_PR_1_LIMB_01" Offset="0x3828" />
-        <Limb Name="object_pr_Standardlimb_003834" Type="Standard" EnumName="OBJECT_PR_1_LIMB_02" Offset="0x3834" />
-        <Limb Name="object_pr_Standardlimb_003840" Type="Standard" EnumName="OBJECT_PR_1_LIMB_03" Offset="0x3840" />
-        <Limb Name="object_pr_Standardlimb_00384C" Type="Standard" EnumName="OBJECT_PR_1_LIMB_04" Offset="0x384C" />
-        <Limb Name="object_pr_Standardlimb_003858" Type="Standard" EnumName="OBJECT_PR_1_LIMB_05" Offset="0x3858" />
-        <Limb Name="object_pr_Standardlimb_003864" Type="Standard" EnumName="OBJECT_PR_1_LIMB_06" Offset="0x3864" />
-        <Limb Name="object_pr_Standardlimb_003870" Type="Standard" EnumName="OBJECT_PR_1_LIMB_07" Offset="0x3870" />
-        <Limb Name="object_pr_Standardlimb_00387C" Type="Standard" EnumName="OBJECT_PR_1_LIMB_08" Offset="0x387C" />
-        <Limb Name="object_pr_Standardlimb_003888" Type="Standard" EnumName="OBJECT_PR_1_LIMB_09" Offset="0x3888" />
-        <Skeleton Name="object_pr_Skel_0038B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PR_1_LIMB_NONE" LimbMax="OBJECT_PR_1_LIMB_MAX" EnumName="ObjectPr1Limb" Offset="0x38B8" />
-        <Animation Name="object_pr_Anim_003904" Offset="0x3904" />
-        <DList Name="object_pr_DL_003AB0" Offset="0x3AB0" />
-        <DList Name="object_pr_DL_003B50" Offset="0x3B50" />
-        <DList Name="object_pr_DL_003C08" Offset="0x3C08" />
-        <DList Name="object_pr_DL_003D10" Offset="0x3D10" />
-        <Texture Name="object_pr_Tex_003DA8" OutName="tex_003DA8" Format="rgba16" Width="8" Height="16" Offset="0x3DA8" />
-        <Texture Name="object_pr_Tex_003EA8" OutName="tex_003EA8" Format="rgba16" Width="8" Height="16" Offset="0x3EA8" />
-        <Texture Name="object_pr_Tex_003FA8" OutName="tex_003FA8" Format="rgba16" Width="8" Height="8" Offset="0x3FA8" />
-        <Texture Name="object_pr_Tex_004028" OutName="tex_004028" Format="rgba16" Width="8" Height="16" Offset="0x4028" />
-        <Texture Name="object_pr_Tex_004128" OutName="tex_004128" Format="rgba16" Width="4" Height="4" Offset="0x4128" />
-        <Limb Name="object_pr_Standardlimb_004148" Type="Standard" EnumName="OBJECT_PR_2_LIMB_01" Offset="0x4148" />
-        <Limb Name="object_pr_Standardlimb_004154" Type="Standard" EnumName="OBJECT_PR_2_LIMB_02" Offset="0x4154" />
-        <Limb Name="object_pr_Standardlimb_004160" Type="Standard" EnumName="OBJECT_PR_2_LIMB_03" Offset="0x4160" />
-        <Limb Name="object_pr_Standardlimb_00416C" Type="Standard" EnumName="OBJECT_PR_2_LIMB_04" Offset="0x416C" />
-        <Skeleton Name="object_pr_Skel_004188" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PR_2_LIMB_NONE" LimbMax="OBJECT_PR_2_LIMB_MAX" EnumName="ObjectPr2Limb" Offset="0x4188" />
-        <Animation Name="object_pr_Anim_004274" Offset="0x4274" />
-        <Animation Name="object_pr_Anim_004340" Offset="0x4340" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ps.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ps.xml
deleted file mode 100644
index 689d78fb5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ps.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-    <File Name="object_ps" Segment="6">
-        <Animation Name="object_ps_Anim_00049C" Offset="0x49C" />
-        <DList Name="object_ps_DL_001B30" Offset="0x1B30" />
-        <DList Name="object_ps_DL_001B38" Offset="0x1B38" />
-        <DList Name="object_ps_DL_001F38" Offset="0x1F38" />
-        <DList Name="object_ps_DL_002438" Offset="0x2438" />
-        <DList Name="object_ps_DL_002560" Offset="0x2560" />
-        <DList Name="object_ps_DL_002638" Offset="0x2638" />
-        <DList Name="object_ps_DL_002840" Offset="0x2840" />
-        <DList Name="object_ps_DL_002948" Offset="0x2948" />
-        <DList Name="object_ps_DL_002A60" Offset="0x2A60" />
-        <DList Name="object_ps_DL_002B68" Offset="0x2B68" />
-        <Texture Name="object_ps_TLUT_002C80" OutName="tlut_002C80" Format="rgba16" Width="16" Height="16" Offset="0x2C80" />
-        <!-- <Blob Name="object_ps_Blob_002E80" Size="0x1080" Offset="0x2E80" /> -->
-        <Texture Name="object_ps_Tex_003F00" OutName="tex_003F00" Format="rgba16" Width="16" Height="16" Offset="0x3F00" />
-        <!-- <Blob Name="object_ps_Blob_004100" Size="0x21C0" Offset="0x4100" /> -->
-        <Texture Name="object_ps_Tex_0062C0" OutName="tex_0062C0" Format="ci8" Width="8" Height="8" Offset="0x62C0" />
-        <Texture Name="object_ps_Tex_006300" OutName="tex_006300" Format="ci8" Width="32" Height="32" Offset="0x6300" />
-        <Texture Name="object_ps_Tex_006700" OutName="tex_006700" Format="ci8" Width="8" Height="8" Offset="0x6700" />
-        <Texture Name="object_ps_Tex_006740" OutName="tex_006740" Format="ci8" Width="8" Height="8" Offset="0x6740" />
-        <Texture Name="object_ps_Tex_006780" OutName="tex_006780" Format="ci8" Width="32" Height="32" Offset="0x6780" />
-        <Texture Name="object_ps_Tex_006B80" OutName="tex_006B80" Format="rgba16" Width="16" Height="16" Offset="0x6B80" />
-        <Texture Name="object_ps_Tex_006D80" OutName="tex_006D80" Format="ci8" Width="32" Height="32" Offset="0x6D80" />
-        <Limb Name="object_ps_Standardlimb_007180" Type="Standard" EnumName="OBJECT_PS_LIMB_01" Offset="0x7180" />
-        <Limb Name="object_ps_Standardlimb_00718C" Type="Standard" EnumName="OBJECT_PS_LIMB_02" Offset="0x718C" />
-        <Limb Name="object_ps_Standardlimb_007198" Type="Standard" EnumName="OBJECT_PS_LIMB_03" Offset="0x7198" />
-        <Limb Name="object_ps_Standardlimb_0071A4" Type="Standard" EnumName="OBJECT_PS_LIMB_04" Offset="0x71A4" />
-        <Limb Name="object_ps_Standardlimb_0071B0" Type="Standard" EnumName="OBJECT_PS_LIMB_05" Offset="0x71B0" />
-        <Limb Name="object_ps_Standardlimb_0071BC" Type="Standard" EnumName="OBJECT_PS_LIMB_06" Offset="0x71BC" />
-        <Limb Name="object_ps_Standardlimb_0071C8" Type="Standard" EnumName="OBJECT_PS_LIMB_07" Offset="0x71C8" />
-        <Limb Name="object_ps_Standardlimb_0071D4" Type="Standard" EnumName="OBJECT_PS_LIMB_08" Offset="0x71D4" />
-        <Limb Name="object_ps_Standardlimb_0071E0" Type="Standard" EnumName="OBJECT_PS_LIMB_09" Offset="0x71E0" />
-        <Limb Name="object_ps_Standardlimb_0071EC" Type="Standard" EnumName="OBJECT_PS_LIMB_0A" Offset="0x71EC" />
-        <Limb Name="object_ps_Standardlimb_0071F8" Type="Standard" EnumName="OBJECT_PS_LIMB_0B" Offset="0x71F8" />
-        <Skeleton Name="object_ps_Skel_007230" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PS_LIMB_NONE" LimbMax="OBJECT_PS_LIMB_MAX" EnumName="ObjectPsLimb" Offset="0x7230" />
-        <Collision Name="object_ps_Colheader_0072E0" Offset="0x72E0" />
-        <Animation Name="object_ps_Anim_0078FC" Offset="0x78FC" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pst.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pst.xml
deleted file mode 100644
index d2b5323d6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_pst.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- This is the object for the Postbox Prop -->
-    <File Name="object_pst" Segment="6">
-        <Animation Name="gPostboxOpenSlotAnim" Offset="0x18" />
-        <DList Name="gPostboxFrameDL" Offset="0x4A0" />
-        <DList Name="gPostboxMailSlotDL" Offset="0x638" />
-        <Texture Name="gPostboxWoodRoofTex" OutName="postbox_wood_roof" Format="rgba16" Width="32" Height="32" Offset="0x760" />
-        <Texture Name="gPostboxWoodBodyTex" OutName="postbox_wood_body" Format="rgba16" Width="32" Height="32" Offset="0xF60" />
-        <Texture Name="gPostboxMetalTex" OutName="postbox_metal" Format="rgba16" Width="16" Height="16" Offset="0x1760" />
-        <Texture Name="gPostboxSlotHoleTex" OutName="postbox_slot_hole" Format="i4" Width="32" Height="16" Offset="0x1960" />
-        <Limb Name="gPostboxFrameLimb" Type="Standard" EnumName="POSTBOX_LIMB_FRAME" Offset="0x1A60" />
-        <Limb Name="gPostboxMailSlotLimb" Type="Standard" EnumName="POSTBOX_LIMB_MAIL_SLOT" Offset="0x1A6C" />
-        <Skeleton Name="gPostboxSkel" Type="Flex" LimbType="Standard" LimbNone="POSTBOX_LIMB_NONE" LimbMax="POSTBOX_LIMB_MAX" EnumName="PostboxLimb" Offset="0x1A80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_racetsubo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_racetsubo.xml
deleted file mode 100644
index 08a17d00a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_racetsubo.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Object for green magic pot -->
-    <File Name="object_racetsubo" Segment="6">
-        <DList Name="gMagicPotEmpty1DL" Offset="0x270" />
-        <DList Name="gMagicPotDL" Offset="0x278" />
-        <Texture Name="gMagicPotWallTex" OutName="magic_pot_wall" Format="rgba16" Width="32" Height="64" Offset="0x3E0" />
-        <Texture Name="gMagicPotRimTex" OutName="magic_pot_rim" Format="rgba16" Width="16" Height="16" Offset="0x13E0" />
-        <DList Name="gMagicPotShardDL" Offset="0x1610" />
-        <DList Name="gMagicPotEmpty2DL" Offset="0x1698" />
-        <Texture Name="gMagicPotShardTex" OutName="magic_pot_shard" Format="rgba16" Width="16" Height="16" Offset="0x16A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_raf.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_raf.xml
deleted file mode 100644
index 2322740d5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_raf.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<Root>
-    <!-- Assets for the Carnivorous Lily Pad-->
-    <File Name="object_raf" Segment="6">
-        <!-- Carnivorous Lily Pad Collision -->
-        <Collision Name="gCarnivorousLilyPadCol" Offset="0x108" />
-
-        <!-- Unused Textureless Platform DisplayList. Maybe used for testing collision? -->
-        <DList Name="gCarnivorousLilyPadTexturelessPlatformDL" Offset="0x1C0" />
-
-        <!-- Carnivorous Lily Pad Animations -->
-        <Animation Name="gCarnivorousLilyPadConvulseAnim" Offset="0x3FC" /> <!-- Original name is "raf_end01" -->
-        <Animation Name="gCarnivorousLilyPadDeathAnim" Offset="0x7A8" /> <!-- Original name is "raf_end02" -->
-        <Animation Name="gCarnivorousLilyPadSpitAnim" Offset="0xA64" /> <!-- Original name is "raf_haku" ("to spit up") -->
-        <Animation Name="gCarnivorousLilyPadChewAnim" Offset="0xB30" /> <!-- Original name is "raf_mogu" ("chew") -->
-        <Animation Name="gCarnivorousLilyPadCloseAnim" Offset="0xC7C" /> <!-- Original name is "raf_paku" ("devouring")-->
-
-        <!-- Carnivorous Lily Pad Limb DisplayLists -->
-        <DList Name="gCarnivorousLilyPadFlowerDL" Offset="0x1630" />
-        <DList Name="gCarnivorousLilyPadRootsDL" Offset="0x1790" />
-        <DList Name="gCarnivorousLilyPadTrap3LowerSegmentDL" Offset="0x1838" />
-        <DList Name="gCarnivorousLilyPadTrap3MiddleSegmentDL" Offset="0x18D0" />
-        <DList Name="gCarnivorousLilyPadTrap3UpperSegmentDL" Offset="0x1990" />
-        <DList Name="gCarnivorousLilyPadTrap2LowerSegmentDL" Offset="0x1B90" />
-        <DList Name="gCarnivorousLilyPadTrap2MiddleSegmentDL" Offset="0x1C28" />
-        <DList Name="gCarnivorousLilyPadTrap2UpperSegmentDL" Offset="0x1CE8" />
-        <DList Name="gCarnivorousLilyPadTrap1LowerSegmentDL" Offset="0x1EE8" />
-        <DList Name="gCarnivorousLilyPadTrap1MiddleSegmentDL" Offset="0x1F80" />
-        <DList Name="gCarnivorousLilyPadTrap1UpperSegmentDL" Offset="0x2040" />
-
-        <!-- Carnivorous Lily Pad Particle DisplayLists -->
-        <DList Name="gCarnivorousLilyPadParticlePetalDL" Offset="0x2340" />
-        <DList Name="gCarnivorousLilyPadParticleTeethDL" Offset="0x2418" />
-        <DList Name="gCarnivorousLilyPadParticleDL" Offset="0x24E0" />
-
-        <!-- Carnivorous Lily Pad Textures -->
-        <Texture Name="gCarnivorousLilyPadRootsTex" OutName="carnivorous_lily_pad_roots" Format="rgba16" Width="16" Height="32" Offset="0x24F8" />
-        <Texture Name="gCarnivorousLilyPadFlowerPetalTex" OutName="carnivorous_lily_pad_flower_petal" Format="rgba16" Width="16" Height="32" Offset="0x28F8" />
-        <Texture Name="gCarnivorousLilyPadFlowerCenterTex" OutName="carnivorous_lily_pad_flower_center" Format="rgba16" Width="16" Height="16" Offset="0x2CF8" />
-        <Texture Name="gCarnivorousLilyPadTrapPetalTex" OutName="carnivorous_lily_pad_trap_petal" Format="rgba16" Width="16" Height="32" Offset="0x2EF8" />
-        <Texture Name="gCarnivorousLilyPadTrapTeethTex" OutName="carnivorous_lily_pad_trap_teeth" Format="rgba16" Width="8" Height="8" Offset="0x32F8" />
-
-        <!-- Carnivorous Lily Pad Limbs -->
-        <Limb Name="gCarnivorousLilyPadFlowerLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_FLOWER" Offset="0x3378" />
-        <Limb Name="gCarnivorousLilyPadTrap1LowerSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_LOWER_SEGMENT" Offset="0x3384" />
-        <Limb Name="gCarnivorousLilyPadTrap1MiddleSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_MIDDLE_SEGMENT" Offset="0x3390" />
-        <Limb Name="gCarnivorousLilyPadTrap1UpperSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_UPPER_SEGMENT" Offset="0x339C" />
-        <Limb Name="gCarnivorousLilyPadTrap2LowerSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_LOWER_SEGMENT" Offset="0x33A8" />
-        <Limb Name="gCarnivorousLilyPadTrap2MiddleSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_MIDDLE_SEGMENT" Offset="0x33B4" />
-        <Limb Name="gCarnivorousLilyPadTrap2UpperSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_UPPER_SEGMENT" Offset="0x33C0" />
-        <Limb Name="gCarnivorousLilyPadTrap3LowerSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_LOWER_SEGMENT" Offset="0x33CC" />
-        <Limb Name="gCarnivorousLilyPadTrap3MiddleSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_MIDDLE_SEGMENT" Offset="0x33D8" />
-        <Limb Name="gCarnivorousLilyPadTrap3UpperSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT" Offset="0x33E4" />
-        <Limb Name="gCarnivorousLilyPadRootsLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_ROOTS" Offset="0x33F0" />
-
-        <!-- Carnivorous Lily Pad Skeleton -->
-        <Skeleton Name="gCarnivorousLilyPadSkel" Type="Flex" LimbType="Standard" LimbNone="CARNIVOROUS_LILY_PAD_LIMB_NONE" LimbMax="CARNIVOROUS_LILY_PAD_LIMB_MAX" EnumName="CarnivorousLilyPadLimb" Offset="0x3428" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_raillift.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_raillift.xml
deleted file mode 100644
index 241a7346b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_raillift.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Root>
-    <File Name="object_raillift" Segment="6">
-        <DList Name="object_raillift_DL_000200" Offset="0x200" />
-        <DList Name="object_raillift_DL_000208" Offset="0x208" />
-        <Texture Name="object_raillift_Tex_000370" OutName="tex_000370" Format="rgba16" Width="32" Height="32" Offset="0x370" />
-        <Texture Name="object_raillift_Tex_000B70" OutName="tex_000B70" Format="rgba16" Width="32" Height="32" Offset="0xB70" />
-        <Texture Name="object_raillift_Tex_001370" OutName="tex_001370" Format="rgba16" Width="32" Height="32" Offset="0x1370" />
-        <DList Name="object_raillift_DL_001DB0" Offset="0x1DB0" />
-        <DList Name="object_raillift_DL_001E40" Offset="0x1E40" />
-        <Texture Name="object_raillift_Tex_001FC8" OutName="tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" />
-        <Texture Name="object_raillift_Tex_0027C8" OutName="tex_0027C8" Format="rgba16" Width="32" Height="32" Offset="0x27C8" />
-        <Texture Name="object_raillift_Tex_002FC8" OutName="tex_002FC8" Format="rgba16" Width="32" Height="32" Offset="0x2FC8" />
-        <Texture Name="object_raillift_Tex_0037C8" OutName="tex_0037C8" Format="ia16" Width="32" Height="64" Offset="0x37C8" />
-        <Collision Name="object_raillift_Colheader_0048D0" Offset="0x48D0" />
-        <DList Name="object_raillift_DL_004BF0" Offset="0x4BF0" />
-        <Collision Name="object_raillift_Colheader_004FF8" Offset="0x4FF8" />
-        <Texture Name="object_raillift_Tex_005030" OutName="tex_005030" Format="rgba16" Width="32" Height="32" Offset="0x5030" />
-        <Texture Name="object_raillift_Tex_005830" OutName="tex_005830" Format="rgba16" Width="32" Height="32" Offset="0x5830" />
-        <Texture Name="object_raillift_Tex_006030" OutName="tex_006030" Format="rgba16" Width="32" Height="32" Offset="0x6030" />
-        <Texture Name="object_raillift_Tex_006830" OutName="tex_006830" Format="i4" Width="64" Height="64" Offset="0x6830" />
-        <DList Name="object_raillift_DL_0071B0" Offset="0x71B0" />
-        <DList Name="object_raillift_DL_0071B8" Offset="0x71B8" />
-        <Texture Name="object_raillift_Tex_0072B0" OutName="tex_0072B0" Format="rgba16" Width="32" Height="32" Offset="0x72B0" />
-        <Texture Name="object_raillift_Tex_007AB0" OutName="tex_007AB0" Format="rgba16" Width="32" Height="16" Offset="0x7AB0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_random_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_random_obj.xml
deleted file mode 100644
index 509ed86c7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_random_obj.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Object for Secret Shrine Sliding Door -->
-    <File Name="object_random_obj" Segment="6">
-        <DList Name="gSecretShrineSlidingDoorDL" Offset="0x190" />
-        <Texture Name="gSecretShrineSlidingDoorTex" OutName="secret_shrine_sliding_door" Format="rgba16" Width="32" Height="64" Offset="0x2F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rat.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rat.xml
deleted file mode 100644
index af47a3437..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rat.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<Root>
-    <!-- Assets for Real Bombchus -->
-    <File Name="object_rat" Segment="6">
-        <!-- Real Bombchu Animations -->
-        <Animation Name="gRealBombchuSpotAnim" Offset="0x174" /> <!-- Original name is "rat_hakken" ("detection") -->
-        <Animation Name="gRealBombchuRunAnim" Offset="0x26C" /> <!-- Original name is "rat_run" -->
-
-        <!-- Real Bombchu Limb DisplayLists -->
-        <DList Name="gRealBombchuBodyDL" Offset="0xA50" />
-        <DList Name="gRealBombchuBackRightLegDL" Offset="0xB18" />
-        <DList Name="gRealBombchuFrontRightLegDL" Offset="0xBC8" />
-        <DList Name="gRealBombchuBackLeftLegDL" Offset="0xC78" />
-        <DList Name="gRealBombchuFrontLeftLegDL" Offset="0xD28" />
-        <DList Name="gRealBombchuTailBaseDL" Offset="0xDD8" />
-        <DList Name="gRealBombchuTailMiddleDL" Offset="0xE20" />
-        <DList Name="gRealBombchuTailEndDL" Offset="0xE90" />
-        <DList Name="gRealBombchuHeadDL" Offset="0xED8" />
-
-        <!-- Real Bombchu Textures -->
-        <Texture Name="gRealBombchuSkinTex" OutName="real_bombchu_skin" Format="rgba16" Width="16" Height="16" Offset="0x11C8" />
-        <Texture Name="gRealBombchuMouthTex" OutName="real_bombchu_mouth" Format="rgba16" Width="16" Height="16" Offset="0x13C8" />
-        <Texture Name="gRealBombchuEyeTex" OutName="real_bombchu_eye" Format="rgba16" Width="16" Height="16" Offset="0x15C8" />
-
-        <!-- Real Bombchu Limbs -->
-        <Limb Name="gRealBombchuBodyLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_BODY" Offset="0x17C8" />
-        <Limb Name="gRealBombchuHeadLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_HEAD" Offset="0x17D4" />
-        <Limb Name="gRealBombchuTailBaseLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_TAIL_BASE" Offset="0x17E0" />
-        <Limb Name="gRealBombchuTailMiddleLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_TAIL_MIDDLE" Offset="0x17EC" />
-        <Limb Name="gRealBombchuTailEndLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_TAIL_END" Offset="0x17F8" />
-        <Limb Name="gRealBombchuFrontLeftLegLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_FRONT_LEFT_LEG" Offset="0x1804" />
-        <Limb Name="gRealBombchuBackLeftLegLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_BACK_LEFT_LEG" Offset="0x1810" />
-        <Limb Name="gRealBombchuFrontRightLegLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_FRONT_RIGHT_LEG" Offset="0x181C" />
-        <Limb Name="gRealBombchuBackRightLegLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_BACK_RIGHT_LEG" Offset="0x1828" />
-
-        <!-- Real Bombchu Skeleton -->
-        <Skeleton Name="gRealBombchuSkel" Type="Flex" LimbType="Standard" LimbNone="REAL_BOMBCHU_LIMB_NONE" LimbMax="REAL_BOMBCHU_LIMB_MAX" EnumName="RealBombchuLimb" Offset="0x1858" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rb.xml
deleted file mode 100644
index cd0e9c274..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rb.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <!-- Object for Leevers -->
-    <File Name="object_rb" Segment="6">
-        <Animation Name="gLeeverSpinAnim" Offset="0x1E4" />
-
-        <!-- DLs for visible limbs -->
-        <DList Name="gLeeverBottomHalfDL" Offset="0x200" />
-        <DList Name="gLeeverBottomHalfWrapper2DL" Offset="0x2D0" />
-        <DList Name="gLeeverBottomHalfWrapper1DL" Offset="0x2E0" />
-        <DList Name="gLeeverTopHalfDL" Offset="0x430" />
-        <DList Name="gLeeverTopHalfWrapper2DL" Offset="0x570" />
-        <DList Name="gLeeverTopHalfWrapper1DL" Offset="0x580" />
-        <DList Name="gLeeverSpike1DL" Offset="0x760" />
-        <DList Name="gLeeverSpike1Wrapper2DL" Offset="0x7F8" />
-        <DList Name="gLeeverSpike1Wrapper1DL" Offset="0x808" />
-        <DList Name="gLeeverSpike2DL" Offset="0x8B8" />
-        <DList Name="gLeeverSpike2Wrapper2DL" Offset="0x950" />
-        <DList Name="gLeeverSpike2Wrapper1DL" Offset="0x960" />
-        <DList Name="gLeeverSpike3DL" Offset="0xA10" />
-        <DList Name="gLeeverSpike3Wrapper2DL" Offset="0xAB0" />
-        <DList Name="gLeeverSpike3Wrapper1DL" Offset="0xAC0" />
-        <DList Name="gLeeverSpike4DL" Offset="0xB80" />
-        <DList Name="gLeeverSpike4Wrapper2DL" Offset="0xC18" />
-        <DList Name="gLeeverSpike4Wrapper1DL" Offset="0xC28" />
-
-        <Texture Name="gLeeverSpikeTex" OutName="spike" Format="rgba16" Width="8" Height="16" Offset="0xCD8" />
-        <Texture Name="gLeeverSideTex" OutName="side" Format="rgba16" Width="32" Height="32" Offset="0xDD8" />
-        <Texture Name="gLeeverFlowerTex" OutName="flower" Format="rgba16" Width="32" Height="32" Offset="0x15D8" />
-
-        <!-- Visible limbs -->
-        <Limb Name="gLeeverTopHalfLimb" Type="Standard" EnumName="LEEVER_LIMB_TOP_HALF" Offset="0x1DFC" />
-        <Limb Name="gLeeverSpike1Limb" Type="Standard" EnumName="LEEVER_LIMB_SPIKE_1" Offset="0x1E20" />
-        <Limb Name="gLeeverSpike2Limb" Type="Standard" EnumName="LEEVER_LIMB_SPIKE_2" Offset="0x1E44" />
-        <Limb Name="gLeeverSpike3Limb" Type="Standard" EnumName="LEEVER_LIMB_SPIKE_3" Offset="0x1E68" />
-        <Limb Name="gLeeverSpike4Limb" Type="Standard" EnumName="LEEVER_LIMB_SPIKE_4" Offset="0x1E8C" />
-        <Limb Name="gLeeverBottomHalfLimb" Type="Standard" EnumName="LEEVER_LIMB_BOTTOM_HALF" Offset="0x1E98" />
-
-        <!-- Invisible limbs -->
-        <Limb Name="object_rb_Standardlimb_001DD8" Type="Standard" EnumName="OBJECT_RB_LIMB_01" Offset="0x1DD8" />
-        <Limb Name="object_rb_Standardlimb_001DE4" Type="Standard" EnumName="OBJECT_RB_LIMB_02" Offset="0x1DE4" />
-        <Limb Name="object_rb_Standardlimb_001DF0" Type="Standard" EnumName="OBJECT_RB_LIMB_03" Offset="0x1DF0" />
-        <Limb Name="object_rb_Standardlimb_001E08" Type="Standard" EnumName="OBJECT_RB_LIMB_05" Offset="0x1E08" />
-        <Limb Name="object_rb_Standardlimb_001E14" Type="Standard" EnumName="OBJECT_RB_LIMB_06" Offset="0x1E14" />
-        <Limb Name="object_rb_Standardlimb_001E2C" Type="Standard" EnumName="OBJECT_RB_LIMB_08" Offset="0x1E2C" />
-        <Limb Name="object_rb_Standardlimb_001E38" Type="Standard" EnumName="OBJECT_RB_LIMB_09" Offset="0x1E38" />
-        <Limb Name="object_rb_Standardlimb_001E50" Type="Standard" EnumName="OBJECT_RB_LIMB_0B" Offset="0x1E50" />
-        <Limb Name="object_rb_Standardlimb_001E5C" Type="Standard" EnumName="OBJECT_RB_LIMB_0C" Offset="0x1E5C" />
-        <Limb Name="object_rb_Standardlimb_001E74" Type="Standard" EnumName="OBJECT_RB_LIMB_0E" Offset="0x1E74" />
-        <Limb Name="object_rb_Standardlimb_001E80" Type="Standard" EnumName="OBJECT_RB_LIMB_0F" Offset="0x1E80" />
-
-        <Skeleton Name="gLeeverSkel" Type="Normal" LimbType="Standard" LimbNone="LEEVER_LIMB_NONE" LimbMax="LEEVER_LIMB_MAX" EnumName="LeeverLimb" Offset="0x1EE8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rd.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rd.xml
deleted file mode 100644
index cb16e492f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rd.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<Root>
-    <File Name="object_rd" Segment="6">
-        <Animation Name="gGibdoRedeadArmsUpStartAnim" Offset="0x9C4" /> <!-- Original name is "gibud_banzai" ("cheering"?)-->
-        <Animation Name="gGibdoRedeadArmsUpLoopAnim" Offset="0xF1C" /> <!-- Original name is "gibud_banzai_loop" -->
-        <Animation Name="gGibdoRedeadConvulsionAnim" Offset="0x1600" /> <!-- Original name is "gibud_keiren" ("convulsion") -->
-        <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x1610" />
-        <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x2610" />
-        <DList Name="gGibdoPelvisDL" Offset="0x4270" />
-        <DList Name="gGibdoHeadDL" Offset="0x4350" />
-        <DList Name="gGibdoTorsoDL" Offset="0x44C0" />
-        <DList Name="gGibdoRightShoulderAndUpperArmDL" Offset="0x4628" />
-        <DList Name="gGibdoRightForearmDL" Offset="0x4730" />
-        <DList Name="gGibdoRightHandDL" Offset="0x4830" />
-        <DList Name="gGibdoLeftShoulderAndUpperArmDL" Offset="0x4930" />
-        <DList Name="gGibdoLeftForearmDL" Offset="0x4A38" />
-        <DList Name="gGibdoLeftHandDL" Offset="0x4B38" />
-        <DList Name="gGibdoRightThighDL" Offset="0x4C38" />
-        <DList Name="gGibdoRightShinDL" Offset="0x4D48" />
-        <DList Name="gGibdoRightFootDL" Offset="0x4E40" />
-        <DList Name="gGibdoLeftThighDL" Offset="0x4F58" />
-        <DList Name="gGibdoLeftShinDL" Offset="0x5068" />
-        <DList Name="gGibdoLeftFootDL" Offset="0x5160" />
-        <Limb Name="gGibdoRootLimb" Type="Standard" EnumName="GIBDO_LIMB_ROOT" Offset="0x5258" />
-        <Limb Name="gGibdoLeftLegRootLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_LEG_ROOT" Offset="0x5264" />
-        <Limb Name="gGibdoLeftThighLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_THIGH" Offset="0x5270" />
-        <Limb Name="gGibdoLeftShinLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_SHIN" Offset="0x527C" />
-        <Limb Name="gGibdoLeftAnkleLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_ANKLE" Offset="0x5288" />
-        <Limb Name="gGibdoLeftFootLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_FOOT" Offset="0x5294" />
-        <Limb Name="gGibdoRightLegRootLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_LEG_ROOT" Offset="0x52A0" />
-        <Limb Name="gGibdoRightThighLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_THIGH" Offset="0x52AC" />
-        <Limb Name="gGibdoRightShinLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_SHIN" Offset="0x52B8" />
-        <Limb Name="gGibdoRightAnkleLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_ANKLE" Offset="0x52C4" />
-        <Limb Name="gGibdoRightFootLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_FOOT" Offset="0x52D0" />
-        <Limb Name="gGibdoUpperBodyRootLimb" Type="Standard" EnumName="GIBDO_LIMB_UPPER_BODY_ROOT" Offset="0x52DC" />
-        <Limb Name="gGibdoUpperBodyLimb" Type="Standard" EnumName="GIBDO_LIMB_UPPER_BODY" Offset="0x52E8" />
-        <Limb Name="gGibdoTorsoLimb" Type="Standard" EnumName="GIBDO_LIMB_TORSO" Offset="0x52F4" />
-        <Limb Name="gGibdoLeftArmRootLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_ARM_ROOT" Offset="0x5300" />
-        <Limb Name="gGibdoLeftShoulderAndUpperArmLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_SHOULDER_AND_UPPER_ARM" Offset="0x530C" />
-        <Limb Name="gGibdoLeftForearmLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_FOREARM" Offset="0x5318" />
-        <Limb Name="gGibdoLeftHandLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_HAND" Offset="0x5324" />
-        <Limb Name="gGibdoRightArmRootLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_ARM_ROOT" Offset="0x5330" />
-        <Limb Name="gGibdoRightShoulderAndUpperArmLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_SHOULDER_AND_UPPER_ARM" Offset="0x533C" />
-        <Limb Name="gGibdoRightForearmLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_FOREARM" Offset="0x5348" />
-        <Limb Name="gGibdoRightHandLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_HAND" Offset="0x5354" />
-        <Limb Name="gGibdoHeadRootLimb" Type="Standard" EnumName="GIBDO_LIMB_HEAD_ROOT" Offset="0x5360" />
-        <Limb Name="gGibdoHeadLimb" Type="Standard" EnumName="GIBDO_LIMB_HEAD" Offset="0x536C" />
-        <Limb Name="gGibdoPelvisLimb" Type="Standard" EnumName="GIBDO_LIMB_PELVIS" Offset="0x5378" />
-        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" LimbNone="GIBDO_LIMB_NONE" LimbMax="GIBDO_LIMB_MAX" EnumName="GibdoLimb" Offset="0x53E8" />
-        <Animation Name="gGibdoRedeadSlumpStartAnim" Offset="0x5DF4" /> <!-- Original name is "gibud_stop" -->
-        <Animation Name="gGibdoRedeadSlumpLoopAnim" Offset="0x61E4" /> <!-- Original name is "gibud_stop_loop" -->
-        <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x6678" /> <!-- Original name is "re_dead_attack" -->
-        <Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x6B08" /> <!-- Original name is "re_dead_attack_end" -->
-        <Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x6EEC" /> <!-- Original name is "re_dead_attack_start" -->
-        <Animation Name="gGibdoRedeadLookBackAnim" Offset="0x73A4" /> <!-- Original name is "re_dead_back_turn" -->
-        <Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x7BBC" /> <!-- Original name is "re_dead_cry" -->
-        <Animation Name="gGibdoRedeadSobbingAnim" Offset="0x81A8" /> <!-- Original name is "re_dead_cryB" -->
-        <Animation Name="gGibdoRedeadDeathAnim" Offset="0x9298" /> <!-- Original name is "re_dead_down" -->
-        <Animation Name="gGibdoRedeadDamageAnim" Offset="0x9900" /> <!-- Original name is "re_dead_hit" -->
-        <Animation Name="gGibdoRedeadStandUpAnim" Offset="0xA450" /> <!-- Original name is "re_dead_standing" -->
-        <Animation Name="gGibdoRedeadIdleAnim" Offset="0xABE0" /> <!-- Original name is "re_dead_wait" -->
-        <Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0xABF0" />
-        <Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0xBBF0" />
-        <Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xCBF0" />
-        <Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xCFF0" />
-        <Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xD3F0" />
-        <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xD7F0" />
-        <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xE7F0" />
-        <DList Name="gRedeadPelvisDL" Offset="0xFAB0" />
-        <DList Name="gRedeadTorsoDL" Offset="0xFBD8" />
-        <DList Name="gRedeadLeftShoulderAndUpperArmDL" Offset="0xFED0" />
-        <DList Name="gRedeadLeftForearmDL" Offset="0xFFB0" />
-        <DList Name="gRedeadLeftHandDL" Offset="0x10070" />
-        <DList Name="gRedeadRightShoulderAndUpperArmDL" Offset="0x10140" />
-        <DList Name="gRedeadRightForearmDL" Offset="0x10218" />
-        <DList Name="gRedeadRightHandDL" Offset="0x102E8" />
-        <DList Name="gRedeadHeadDL" Offset="0x103B8" />
-        <DList Name="gRedeadLeftThighDL" Offset="0x104F8" />
-        <DList Name="gRedeadLeftShinDL" Offset="0x105D8" />
-        <DList Name="gRedeadLeftFootDL" Offset="0x106A0" />
-        <DList Name="gRedeadRightThighDL" Offset="0x10768" />
-        <DList Name="gRedeadRightShinDL" Offset="0x10848" />
-        <DList Name="gRedeadRightFootDL" Offset="0x10910" />
-        <Limb Name="gRedeadRootLimb" Type="Standard" EnumName="REDEAD_LIMB_ROOT" Offset="0x109F8" />
-        <Limb Name="gRedeadLeftLegRootLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_LEG_ROOT" Offset="0x10A04" />
-        <Limb Name="gRedeadLeftThighLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_THIGH" Offset="0x10A10" />
-        <Limb Name="gRedeadLeftShinLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_SHIN" Offset="0x10A1C" />
-        <Limb Name="gRedeadLeftAnkleLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_ANKLE" Offset="0x10A28" />
-        <Limb Name="gRedeadLeftFootLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_FOOT" Offset="0x10A34" />
-        <Limb Name="gRedeadRightLegRootLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_LEG_ROOT" Offset="0x10A40" />
-        <Limb Name="gRedeadRightThighLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_THIGH" Offset="0x10A4C" />
-        <Limb Name="gRedeadRightShinLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_SHIN" Offset="0x10A58" />
-        <Limb Name="gRedeadRightAnkleLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_ANKLE" Offset="0x10A64" />
-        <Limb Name="gRedeadRightFootLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_FOOT" Offset="0x10A70" />
-        <Limb Name="gRedeadUpperBodyRootLimb" Type="Standard" EnumName="REDEAD_LIMB_UPPER_BODY_ROOT" Offset="0x10A7C" />
-        <Limb Name="gRedeadUpperBodyLimb" Type="Standard" EnumName="REDEAD_LIMB_UPPER_BODY" Offset="0x10A88" />
-        <Limb Name="gRedeadTorsoLimb" Type="Standard" EnumName="REDEAD_LIMB_TORSO" Offset="0x10A94" />
-        <Limb Name="gRedeadLeftArmRootLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_ARM_ROOT" Offset="0x10AA0" />
-        <Limb Name="gRedeadLeftShoulderAndUpperArmLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_SHOULDER_AND_UPPER_ARM" Offset="0x10AAC" />
-        <Limb Name="gRedeadLeftForearmLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_FOREARM" Offset="0x10AB8" />
-        <Limb Name="gRedeadLeftHandLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_HAND" Offset="0x10AC4" />
-        <Limb Name="gRedeadRightArmRootLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_ARM_ROOT" Offset="0x10AD0" />
-        <Limb Name="gRedeadRightShoulderAndUpperArmLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_SHOULDER_AND_UPPER_ARM" Offset="0x10ADC" />
-        <Limb Name="gRedeadRightForearmLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_FOREARM" Offset="0x10AE8" />
-        <Limb Name="gRedeadRightHandLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_HAND" Offset="0x10AF4" />
-        <Limb Name="gRedeadHeadRootLimb" Type="Standard" EnumName="REDEAD_LIMB_HEAD_ROOT" Offset="0x10B00" />
-        <Limb Name="gRedeadHeadLimb" Type="Standard" EnumName="REDEAD_LIMB_HEAD" Offset="0x10B0C" />
-        <Limb Name="gRedeadPelvisLimb" Type="Standard" EnumName="REDEAD_LIMB_PELVIS" Offset="0x10B18" />
-        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" LimbNone="REDEAD_LIMB_NONE" LimbMax="REDEAD_LIMB_MAX" EnumName="RedeadLimb" Offset="0x10B88" />
-        <Animation Name="gGibdoRedeadWalkAnim" Offset="0x113EC" /> <!-- Original name is "re_dead_walk" -->
-        <Animation Name="gGibdoRedeadPirouetteAnim" Offset="0x118D8" /> <!-- Original name is "wait_baree" ("ballet") -->
-        <Animation Name="gGibdoRedeadClappingDanceAnim" Offset="0x11DB8" /> <!-- Original name is "wait_dance_b" -->
-        <Animation Name="gGibdoRedeadSquattingDanceAnim" Offset="0x1216C" /> <!-- Original name is "wait_kosakku" ("Cossack" as in "Cossack Dance") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_redead_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_redead_obj.xml
deleted file mode 100644
index 8460579b3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_redead_obj.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for the Beneath the Well's Sliding Door  -->
-    <File Name="object_redead_obj" Segment="6">
-        <DList Name="gBeneathTheWellSlidingDoorDL" Offset="0x1A0" />
-        <Texture Name="gBeneathTheWellSlidingDoorTLUT" OutName="beneath_the_well_sliding_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x390" />
-        <Texture Name="gBeneathTheWellSlidingDoorTex" OutName="beneath_the_well_sliding_door" Format="ci4" Width="64" Height="64" Offset="0x3B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rotlift.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rotlift.xml
deleted file mode 100644
index c2acf0540..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rotlift.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Assets for the rotating platforms/spikes in the Deku Moon Dungeon -->
-    <File Name="object_rotlift" Segment="6">
-        <!-- Rotating Platforms -->
-        <DList Name="gDekuMoonDungeonRotatingPlatformsDL" Offset="0x400" />
-        <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodBarkTLUT" OutName="deku_moon_dungeon_rotating_platforms_wood_bark_tlut" Format="rgba16" Width="16" Height="16" Offset="0x590" />
-        <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodBarkTex" OutName="deku_moon_dungeon_rotating_platforms_wood_bark" Format="ci8" Width="32" Height="64" Offset="0x790" />
-        <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodTex" OutName="deku_moon_dungeon_rotating_platforms_wood" Format="rgba16" Width="32" Height="64" Offset="0xF90" />
-        <TextureAnimation Name="gDekuMoonDungeonRotatingPlatformsUnusedTexAnim" Offset="0x1F98" />
-        <Collision Name="gDekuMoonDungeonRotatingPlatformsCol" Offset="0x2190" />
-
-        <!-- Rotating Spikes -->
-        <DList Name="gDekuMoonDungeonRotatingSpikesDL" Offset="0x2CE0" />
-        <Texture Name="gDekuMoonDungeonRotatingSpikesWoodBarkTLUT" OutName="deku_moon_dungeon_rotating_spikes_wood_bark_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2FF8" />
-        <Texture Name="gDekuMoonDungeonRotatingSpikesWoodBarkTex" OutName="deku_moon_dungeon_rotating_spikes_wood_bark" Format="ci8" Width="32" Height="64" Offset="0x31F8" />
-        <Texture Name="gDekuMoonDungeonRotatingSpikesWoodTex" OutName="deku_moon_dungeon_rotating_spikes_wood" Format="rgba16" Width="32" Height="64" Offset="0x39F8" />
-        <TextureAnimation Name="gDekuMoonDungeonRotatingSpikesUnusedTexAnim" Offset="0x4A08" />
-        <Collision Name="gDekuMoonDungeonRotatingSpikesCol" Offset="0x4DF0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rr.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rr.xml
deleted file mode 100644
index df974bb35..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rr.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_rr" Segment="6">
-        <DList Name="gLikeLikeDL" Offset="0x470"/>
-        <Texture Name="gLikeLikeBodyPattern1Tex" OutName="like_like_body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
-        <Texture Name="gLikeLikeBodyPattern2Tex" OutName="like_like_body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
-        <Texture Name="gLikeLikeHoleTex" OutName="like_like_hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rs.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rs.xml
deleted file mode 100644
index 5334f4fb8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rs.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<Root>
-    <!-- Object for Bomb Shopkeeper-->
-    <File Name="object_rs" Segment="6">
-        <!-- Bomb -->
-        <DList Name="gBombShopkeeperBombDL" Offset="0x970" />
-        <Texture Name="gBombShopkeeperBombFuseTex" OutName="bomb_shopkeeper_bomb_fuse" Format="i8" Width="32" Height="32" Offset="0xC08" />
-
-        <!-- DLists -->
-        <DList Name="gBombShopkeeperPelvisDL" Offset="0x36F0" />
-        <DList Name="gBombShopkeeperTorsoDL" Offset="0x3778" />
-        <DList Name="gBombShopkeeperHeadDL" Offset="0x3AF0" />
-        <DList Name="gBombShopkeeperRightUpperArmDL" Offset="0x3ED0" />
-        <DList Name="gBombShopkeeperRightForearmDL" Offset="0x3FF0" />
-        <DList Name="gBombShopkeeperRightHandDL" Offset="0x4108" />
-        <DList Name="gBombShopkeeperLeftUpperArmDL" Offset="0x4308" />
-        <DList Name="gBombShopkeeperLeftForearmDL" Offset="0x4428" />
-        <DList Name="gBombShopkeeperLeftHandDL" Offset="0x4540" />
-        <DList Name="gBombShopkeeperRightThighDL" Offset="0x4738" />
-        <DList Name="gBombShopkeeperRightShinDL" Offset="0x48D0" />
-        <DList Name="gBombShopkeeperRightFootDL" Offset="0x4A20" />
-        <DList Name="gBombShopkeeperLeftThighDL" Offset="0x4B88" />
-        <DList Name="gBombShopkeeperLeftShinDL" Offset="0x4D20" />
-        <DList Name="gBombShopkeeperLeftFootDL" Offset="0x4E70" />
-
-        <!-- Textures -->
-        <Texture Name="gBombShopkeeperTLUT" OutName="bomb_shopkeeper_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4FD8" />
-        <Texture Name="gBombShopkeeperEarTex" OutName="bomb_shopkeeper_ear" Format="ci8" Width="8" Height="8" Offset="0x51D8" />
-        <Texture Name="gBombShopkeeperSkinTex" OutName="bomb_shopkeeper_skin" Format="ci8" Width="8" Height="8" Offset="0x5218" />
-        <Texture Name="gBombShopkeeperTorsoTex" OutName="bomb_shopkeeper_torso" Format="ci8" Width="8" Height="32" Offset="0x5258" />
-        <Texture Name="gBombShopkeeperFingersTex" OutName="bomb_shopkeeper_fingers" Format="ci8" Width="16" Height="16" Offset="0x5358" />
-        <Texture Name="gBombShopkeeperEyeTex" OutName="bomb_shopkeeper_eye" Format="rgba16" Width="32" Height="32" Offset="0x5458" />
-        <Texture Name="gBombShopkeeperTatooTex" OutName="bomb_shopkeeper_tatoo" Format="ci8" Width="32" Height="64" Offset="0x5C58" />
-        <Texture Name="gBombShopkeeperShortsTex" OutName="bomb_shopkeeper_shorts" Format="rgba16" Width="16" Height="16" Offset="0x6458" />
-        <Texture Name="gBombShopkeeperSandalsTex" OutName="bomb_shopkeeper_sandals" Format="rgba16" Width="8" Height="8" Offset="0x6658" />
-        <Texture Name="gBombShopkeeperVestTex" OutName="bomb_shopkeeper_vest" Format="rgba16" Width="16" Height="16" Offset="0x66D8" />
-        <Texture Name="gBombShopkeeperToesTex" OutName="bomb_shopkeeper_toes" Format="ci8" Width="16" Height="16" Offset="0x68D8" />
-        <Texture Name="gBombShopkeeperWristBandTex" OutName="bomb_shopkeeper_wrist_band" Format="ci8" Width="32" Height="32" Offset="0x69D8" />
-
-        <!-- Animations -->
-        <Animation Name="gBombShopkeeperSwayAnim" Offset="0x788C" />
-        <Animation Name="gBombShopkeeperSitAtCounterStartAnim" Offset="0x8268" />
-        <Animation Name="gBombShopkeeperSitAtCounterLoopAnim" Offset="0x87BC" />
-        <Animation Name="gBombShopkeeperWalkAnim" Offset="0x9120" />
-
-        <!-- Skeleton -->
-        <Limb Name="gBombShopkeeperPelvisLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_PELVIS" Offset="0x9130" />
-        <Limb Name="gBombShopkeeperLeftThighLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_THIGH" Offset="0x913C" />
-        <Limb Name="gBombShopkeeperLeftShinLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_SHIN" Offset="0x9148" />
-        <Limb Name="gBombShopkeeperLeftFootLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_FOOT" Offset="0x9154" />
-        <Limb Name="gBombShopkeeperRightThighLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_THIGH" Offset="0x9160" />
-        <Limb Name="gBombShopkeeperRightShinLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_SHIN" Offset="0x916C" />
-        <Limb Name="gBombShopkeeperRightFootLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_FOOT" Offset="0x9178" />
-        <Limb Name="gBombShopkeeperTorsoLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_TORSO" Offset="0x9184" />
-        <Limb Name="gBombShopkeeperLeftUpperArmLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_UPPER_ARM" Offset="0x9190" />
-        <Limb Name="gBombShopkeeperLeftForearmLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_FOREARM" Offset="0x919C" />
-        <Limb Name="gBombShopkeeperLeftHandLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_HAND" Offset="0x91A8" />
-        <Limb Name="gBombShopkeeperRightUpperArmLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_UPPER_ARM" Offset="0x91B4" />
-        <Limb Name="gBombShopkeeperRightForearmLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_FOREARM" Offset="0x91C0" />
-        <Limb Name="gBombShopkeeperRightHandLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_HAND" Offset="0x91CC" />
-        <Limb Name="gBombShopkeeperHeadLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_HEAD" Offset="0x91D8" />
-        <Skeleton Name="gBombShopkeeperSkel" Type="Flex" LimbType="Standard" LimbNone="BOMB_SHOPKEEPER_LIMB_NONE" LimbMax="BOMB_SHOPKEEPER_LIMB_MAX" EnumName="BombShopkeeperLimb" Offset="0x9220" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ru2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ru2.xml
deleted file mode 100644
index 7d5823a50..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ru2.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<Root>
-    <!-- Adult Ruto from OoT (Unused). -->
-    <!-- Object is Copy from OoT, including documentation. -->
-    <File Name="object_ru2" Segment="6">
-        <!-- Adult Ruto Animations -->
-        <!-- gAdultRutoCrossingArmsAnim: Used in OoT when the sages seal ganon in the Evil Realm. -->
-        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
-        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
-
-        <!-- Adult Ruto Palettes -->
-        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
-        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
-
-        <!-- Adult Ruto Eye Textures -->
-        <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
-        <Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
-        <Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
-
-        <!-- Adult Ruto Textures -->
-        <Texture Name="gAdultRutoSkinGradientTex" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
-        <Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
-        <Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
-
-      
-        <!-- Adult Ruto Limb DisplayLists -->
-        <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
-        <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
-        <DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
-        <DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
-        <DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
-        <DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
-        <DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
-        <DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
-        <DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
-        <DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
-        <DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
-        <DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
-        <DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
-        <DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
-        <DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
-        <DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
-        <DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
-        <DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
-        <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
-        <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
-        <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
-
-
-        <!-- Adult Ruto Limbs -->
-        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" EnumName="RU2_LIMB_ROOT" Offset="0xC5A0"/>
-        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_THIGH" Offset="0xC5AC"/>
-        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_LEG" Offset="0xC5B8"/>
-        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_FOOT" Offset="0xC5C4"/>
-        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_TAIL" Offset="0xC5D0"/>
-        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_THIGH" Offset="0xC5DC"/>
-        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_LEG" Offset="0xC5E8"/>
-        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_FOOT" Offset="0xC5F4"/>
-        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_TAIL" Offset="0xC600"/>
-        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" EnumName="RU2_LIMB_TORSO" Offset="0xC60C"/>
-        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_UPPER_ARM" Offset="0xC618"/>
-        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_UPPER_WING" Offset="0xC624"/>
-        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_LOWER_WING" Offset="0xC630"/>
-        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_FOREARM" Offset="0xC63C"/>
-        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_HAND" Offset="0xC648"/>
-        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_UPPER_ARM" Offset="0xC654"/>
-        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_UPPER_WING" Offset="0xC660"/>
-        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_LOWER_WING" Offset="0xC66C"/>
-        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_FOREARM" Offset="0xC678"/>
-        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_HAND" Offset="0xC684"/>
-        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" EnumName="RU2_LIMB_HEAD" Offset="0xC690"/>
-        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" EnumName="RU2_LIMB_WAIST" Offset="0xC69C"/>
-        <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" LimbNone="RU2_LIMB_NONE" LimbMax="RU2_LIMB_MAX" EnumName="Ru2Limb" Offset="0xC700" />
-
-        <!-- (More) Adult Ruto Animations -->
-        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
-        <!-- HeadTurnDownLeft is intro to gAdultRutoLookingDownLeftAnim, used in OoT Credits scene -->
-        <!--   Looking down at Nabooru with the other sages on Death Mountain after the party -->
-        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
-        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
-        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
-        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rz.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rz.xml
deleted file mode 100644
index 9bf8961a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_rz.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<Root>
-    <File Name="object_rz" Segment="6">
-        <Animation Name="gRosaSistersApplaudingAnim" Offset="0x59C" />
-        <Animation Name="gRosaSistersOnKneesAnim" Offset="0xDE8" />
-        <Animation Name="gRosaSistersDancingAnim" Offset="0x28D4" />
-        <Animation Name="gRosaSistersSittingAnim" Offset="0x3098" />
-        <Animation Name="gRosaSistersStandingAnim" Offset="0x3A20" />
-        <Animation Name="gRosaSistersThinkingAnim" Offset="0x457C" />
-        <Animation Name="gRosaSistersWalkingAnim" Offset="0x5390" />
-        <Animation Name="gRosaSistersWalkingWhileThinkingAnim" Offset="0x5E50" />
-        <DList Name="object_rz_DL_0092B0" Offset="0x92B0" />
-        <DList Name="object_rz_DL_0094C8" Offset="0x94C8" />
-        <DList Name="object_rz_DL_009620" Offset="0x9620" />
-        <DList Name="object_rz_DL_009850" Offset="0x9850" />
-        <DList Name="object_rz_DL_009A68" Offset="0x9A68" />
-        <DList Name="object_rz_DL_009BC0" Offset="0x9BC0" />
-        <DList Name="object_rz_DL_009DF0" Offset="0x9DF0" />
-        <DList Name="object_rz_DL_009FD0" Offset="0x9FD0" />
-        <DList Name="object_rz_DL_00A088" Offset="0xA088" />
-        <DList Name="object_rz_DL_00A378" Offset="0xA378" />
-        <DList Name="object_rz_DL_00A9F8" Offset="0xA9F8" />
-        <DList Name="object_rz_DL_00AB98" Offset="0xAB98" />
-        <DList Name="object_rz_DL_00AC50" Offset="0xAC50" />
-        <DList Name="object_rz_DL_00AD70" Offset="0xAD70" />
-        <DList Name="object_rz_DL_00AE88" Offset="0xAE88" />
-        <DList Name="object_rz_DL_00B050" Offset="0xB050" />
-        <DList Name="object_rz_DL_00B170" Offset="0xB170" />
-        <DList Name="object_rz_DL_00B288" Offset="0xB288" />
-        <Texture Name="object_rz_TLUT_00B450" OutName="tlut_00B450" Format="rgba16" Width="16" Height="16" Offset="0xB450" />
-        <Texture Name="object_rz_Tex_00B650" OutName="tex_00B650" Format="rgba16" Width="16" Height="16" Offset="0xB650" />
-        <Texture Name="object_rz_Tex_00B850" OutName="tex_00B850" Format="ci8" Width="8" Height="8" Offset="0xB850" />
-        <Texture Name="object_rz_Tex_00B890" OutName="tex_00B890" Format="ci8" Width="8" Height="8" Offset="0xB890" />
-        <Texture Name="object_rz_Tex_00B8D0" OutName="tex_00B8D0" Format="ci8" Width="16" Height="16" Offset="0xB8D0" />
-        <Texture Name="object_rz_Tex_00B9D0" OutName="tex_00B9D0" Format="ci8" Width="16" Height="16" Offset="0xB9D0" />
-        <Texture Name="object_rz_Tex_00BAD0" OutName="tex_00BAD0" Format="ci8" Width="16" Height="16" Offset="0xBAD0" />
-        <Texture Name="object_rz_Tex_00BBD0" OutName="tex_00BBD0" Format="ci8" Width="8" Height="16" Offset="0xBBD0" />
-        <Texture Name="object_rz_Tex_00BC50" OutName="tex_00BC50" Format="ci8" Width="32" Height="32" Offset="0xBC50" />
-        <Texture Name="object_rz_Tex_00C050" OutName="tex_00C050" Format="ci8" Width="16" Height="16" Offset="0xC050" />
-        <Texture Name="object_rz_Tex_00C150" OutName="tex_00C150" Format="i8" Width="8" Height="8" Offset="0xC150" />
-        <Texture Name="object_rz_Tex_00C190" OutName="tex_00C190" Format="ci8" Width="32" Height="32" Offset="0xC190" />
-        <Texture Name="object_rz_Tex_00C590" OutName="tex_00C590" Format="ci8" Width="32" Height="32" Offset="0xC590" />
-        <Texture Name="object_rz_Tex_00C990" OutName="tex_00C990" Format="ci8" Width="32" Height="32" Offset="0xC990" />
-        <Texture Name="object_rz_Tex_00CD90" OutName="tex_00CD90" Format="ci8" Width="32" Height="32" Offset="0xCD90" />
-        <Texture Name="object_rz_Tex_00D190" OutName="tex_00D190" Format="i8" Width="8" Height="8" Offset="0xD190" />
-        <Texture Name="object_rz_Tex_00D1D0" OutName="tex_00D1D0" Format="i8" Width="16" Height="16" Offset="0xD1D0" />
-        <Texture Name="object_rz_Tex_00D2D0" OutName="tex_00D2D0" Format="i8" Width="32" Height="32" Offset="0xD2D0" />
-        <TextureAnimation Name="object_rz_Matanimheader_00D768" Offset="0xD768" />
-        <Limb Name="object_rz_Standardlimb_00D788" Type="Standard" EnumName="OBJECT_RZ_LIMB_01" Offset="0xD788" />
-        <Limb Name="object_rz_Standardlimb_00D794" Type="Standard" EnumName="OBJECT_RZ_LIMB_02" Offset="0xD794" />
-        <Limb Name="object_rz_Standardlimb_00D7A0" Type="Standard" EnumName="OBJECT_RZ_LIMB_03" Offset="0xD7A0" />
-        <Limb Name="object_rz_Standardlimb_00D7AC" Type="Standard" EnumName="OBJECT_RZ_LIMB_04" Offset="0xD7AC" />
-        <Limb Name="object_rz_Standardlimb_00D7B8" Type="Standard" EnumName="OBJECT_RZ_LIMB_05" Offset="0xD7B8" />
-        <Limb Name="object_rz_Standardlimb_00D7C4" Type="Standard" EnumName="OBJECT_RZ_LIMB_06" Offset="0xD7C4" />
-        <Limb Name="object_rz_Standardlimb_00D7D0" Type="Standard" EnumName="OBJECT_RZ_LIMB_07" Offset="0xD7D0" />
-        <Limb Name="object_rz_Standardlimb_00D7DC" Type="Standard" EnumName="OBJECT_RZ_LIMB_08" Offset="0xD7DC" />
-        <Limb Name="object_rz_Standardlimb_00D7E8" Type="Standard" EnumName="OBJECT_RZ_LIMB_09" Offset="0xD7E8" />
-        <Limb Name="object_rz_Standardlimb_00D7F4" Type="Standard" EnumName="OBJECT_RZ_LIMB_0A" Offset="0xD7F4" />
-        <Limb Name="object_rz_Standardlimb_00D800" Type="Standard" EnumName="OBJECT_RZ_LIMB_0B" Offset="0xD800" />
-        <Limb Name="object_rz_Standardlimb_00D80C" Type="Standard" EnumName="OBJECT_RZ_LIMB_0C" Offset="0xD80C" />
-        <Limb Name="object_rz_Standardlimb_00D818" Type="Standard" EnumName="OBJECT_RZ_LIMB_0D" Offset="0xD818" />
-        <Limb Name="object_rz_Standardlimb_00D824" Type="Standard" EnumName="OBJECT_RZ_LIMB_0E" Offset="0xD824" />
-        <Limb Name="object_rz_Standardlimb_00D830" Type="Standard" EnumName="OBJECT_RZ_LIMB_0F" Offset="0xD830" />
-        <Limb Name="object_rz_Standardlimb_00D83C" Type="Standard" EnumName="OBJECT_RZ_LIMB_10" Offset="0xD83C" />
-        <Limb Name="object_rz_Standardlimb_00D848" Type="Standard" EnumName="OBJECT_RZ_LIMB_11" Offset="0xD848" />
-        <Limb Name="object_rz_Standardlimb_00D854" Type="Standard" EnumName="OBJECT_RZ_LIMB_12" Offset="0xD854" />
-        <Limb Name="object_rz_Standardlimb_00D860" Type="Standard" EnumName="OBJECT_RZ_LIMB_13" Offset="0xD860" />
-        <Limb Name="object_rz_Standardlimb_00D86C" Type="Standard" EnumName="OBJECT_RZ_LIMB_14" Offset="0xD86C" />
-        <Limb Name="object_rz_Standardlimb_00D878" Type="Standard" EnumName="OBJECT_RZ_LIMB_15" Offset="0xD878" />
-        <Skeleton Name="object_rz_Skel_00D8D8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_RZ_LIMB_NONE" LimbMax="OBJECT_RZ_LIMB_MAX" EnumName="ObjectRzLimb" Offset="0xD8D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sb.xml
deleted file mode 100644
index 026b3389b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sb.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Root>
-    <File Name="object_sb" Segment="6">
-        <Animation Name="object_sb_Anim_00004C" Offset="0x4C" />
-        <Animation Name="object_sb_Anim_0000B4" Offset="0xB4" />
-        <Animation Name="object_sb_Anim_000124" Offset="0x124" />
-        <Animation Name="object_sb_Anim_000194" Offset="0x194" />
-        <!-- <Blob Name="object_sb_Blob_0001A4" Size="0x49C" Offset="0x1A4" /> -->
-        <!-- <Blob Name="object_sb_Blob_000840" Size="0x3C0" Offset="0x840" /> -->
-        <DList Name="object_sb_DL_000D80" Offset="0xD80" />
-        <DList Name="object_sb_DL_000E70" Offset="0xE70" />
-        <Texture Name="object_sb_Tex_001020" OutName="tex_001020" Format="rgba16" Width="32" Height="32" Offset="0x1020" />
-        <Texture Name="object_sb_Tex_001820" OutName="tex_001820" Format="rgba16" Width="8" Height="16" Offset="0x1820" />
-        <Texture Name="object_sb_Tex_001920" OutName="tex_001920" Format="rgba16" Width="8" Height="8" Offset="0x1920" />
-        <Texture Name="object_sb_Tex_0019A0" OutName="tex_0019A0" Format="rgba16" Width="8" Height="8" Offset="0x19A0" />
-        <Texture Name="object_sb_Tex_001A20" OutName="tex_001A20" Format="rgba16" Width="8" Height="8" Offset="0x1A20" />
-        <DList Name="object_sb_DL_0025B0" Offset="0x25B0" />
-        <DList Name="object_sb_DL_002858" Offset="0x2858" />
-        <Texture Name="object_sb_Tex_002AF0" OutName="tex_002AF0" Format="rgba16" Width="8" Height="8" Offset="0x2AF0" />
-        <Limb Name="object_sb_Standardlimb_002B70" Type="Standard" EnumName="OBJECT_SB_LIMB_01" Offset="0x2B70" />
-        <Limb Name="object_sb_Standardlimb_002B7C" Type="Standard" EnumName="OBJECT_SB_LIMB_02" Offset="0x2B7C" />
-        <Limb Name="object_sb_Standardlimb_002B88" Type="Standard" EnumName="OBJECT_SB_LIMB_03" Offset="0x2B88" />
-        <Limb Name="object_sb_Standardlimb_002B94" Type="Standard" EnumName="OBJECT_SB_LIMB_04" Offset="0x2B94" />
-        <Limb Name="object_sb_Standardlimb_002BA0" Type="Standard" EnumName="OBJECT_SB_LIMB_05" Offset="0x2BA0" />
-        <Limb Name="object_sb_Standardlimb_002BAC" Type="Standard" EnumName="OBJECT_SB_LIMB_06" Offset="0x2BAC" />
-        <Limb Name="object_sb_Standardlimb_002BB8" Type="Standard" EnumName="OBJECT_SB_LIMB_07" Offset="0x2BB8" />
-        <Limb Name="object_sb_Standardlimb_002BC4" Type="Standard" EnumName="OBJECT_SB_LIMB_08" Offset="0x2BC4" />
-        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_SB_LIMB_NONE" LimbMax="OBJECT_SB_LIMB_MAX" EnumName="ObjectSbLimb" Offset="0x2BF0" />
-        <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sdn.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sdn.xml
deleted file mode 100644
index bcc1f7637..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sdn.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<Root>
-    <File Name="object_sdn" Segment="6">
-        <DList Name="gSoldierBottleDL" Offset="0x630" />
-        <DList Name="gSoldierBottleContentsDL" Offset="0x768" />
-        <DList Name="gSoldierBottleEmptyContentsDL" Offset="0x800" />
-        <Texture Name="gSoldierBottleTex" OutName="soldier_bottle" Format="i4" Width="16" Height="16" Offset="0x808" />
-        <Animation Name="gSoldierStandWithHandOnChestAnim" Offset="0xA54" />
-        <Animation Name="gSoldierDrinkAnim" Offset="0x20D8" />
-        <Animation Name="gSoldierCheerWithSpearAnim" Offset="0x2A84" />
-        <Animation Name="gSoldierSitAndReachAnim" Offset="0x3380" />
-        <Animation Name="gSoldierWaveAnim" Offset="0x3BFC" />
-        <Animation Name="gSoldierStandUpAnim" Offset="0x4770" />
-        <Animation Name="gSoldierLookDownAnim" Offset="0x4AC0" />
-        <Animation Name="gSoldierComeUpHereAnim" Offset="0x5320" />
-        <Animation Name="object_sdn_Anim_0057BC" Offset="0x57BC" /><!-- gSoldierHaltStartAnim? -->
-        <Animation Name="object_sdn_Anim_005D28" Offset="0x5D28" /><!-- gSoldierHaltIdleAnim? -->
-        <Animation Name="object_sdn_Anim_0064C0" Offset="0x64C0" /><!-- gSoldierHaltLoopAnim? -->
-        <Animation Name="gSoldierStandHandOnHipAnim" Offset="0x6C18" />
-        <DList Name="gSoldierTorsoDL" Offset="0x9EB0" />
-        <DList Name="gSoldierHeadDL" Offset="0xA1A8" />
-        <DList Name="gSoldierRightShoulderDL" Offset="0xA678" />
-        <DList Name="gSoldierRightForearmDL" Offset="0xA768" />
-        <DList Name="gSoldierRightHandWithSpearDL" Offset="0xA9A8" />
-        <DList Name="gSoldierLeftShoulderDL" Offset="0xADE0" />
-        <DList Name="gSoldierLeftForearmDL" Offset="0xAED0" />
-        <DList Name="gSoldierLeftHandDL" Offset="0xB120" />
-        <DList Name="gSoldierPelvisDL" Offset="0xB438" />
-        <DList Name="gSoldierRightThighDL" Offset="0xB5B0" />
-        <DList Name="gSoldierRightShinDL" Offset="0xB698" />
-        <DList Name="gSoldierRightFootDL" Offset="0xB988" />
-        <DList Name="gSoldierLeftThighDL" Offset="0xBAD0" />
-        <DList Name="gSoldierLeftShinDL" Offset="0xBBB8" />
-        <DList Name="gSoldierLeftFootDL" Offset="0xBEB8" />
-        <Texture Name="gSoldierSkinTLUT" OutName="soldier_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC000" />
-        <Texture Name="gSoldierGeneralTLUT" OutName="soldier_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC200" />
-        <Texture Name="gSoldierArmorStrapTex" OutName="soldier_armor_strap" Format="ci8" Width="32" Height="32" Offset="0xC400" />
-        <Texture Name="gSoldierArmorPlate1Tex" OutName="soldier_armor_plate1" Format="i8" Width="16" Height="16" Offset="0xC800" />
-        <Texture Name="gSoldierArmorEmblemTex" OutName="soldier_armor_emblem" Format="i8" Width="32" Height="32" Offset="0xC900" />
-        <Texture Name="gSoldierSkinShadowGradient2Tex" OutName="soldier_skin_shadow_gradient2" Format="ci8" Width="8" Height="8" Offset="0xCD00" />
-        <Texture Name="gSoldierShortsToLegTex" OutName="soldier_shorts_to_leg" Format="ci8" Width="16" Height="16" Offset="0xCD40" />
-        <Texture Name="gSoldierArmorTex" OutName="soldier_armor" Format="ci8" Width="8" Height="8" Offset="0xCE40" />
-        <Texture Name="gSoldierSkinShadowGradient1Tex" OutName="soldier_skin_shadow_gradient1" Format="ci8" Width="8" Height="8" Offset="0xCE80" />
-        <Texture Name="gSoldierLipsTex" OutName="soldier_lips" Format="ci8" Width="16" Height="16" Offset="0xCEC0" />
-        <Texture Name="gSoldierArmorCoatOfArmsTex" OutName="soldier_armor_coat_of_arms" Format="ci8" Width="32" Height="32" Offset="0xCFC0" />
-        <Texture Name="gSoldierArmorPlate2Tex" OutName="soldier_armor_plate2" Format="i8" Width="16" Height="8" Offset="0xD3C0" />
-        <Texture Name="gSoldierFingersTex" OutName="soldier_fingers" Format="ci8" Width="16" Height="16" Offset="0xD440" />
-        <Limb Name="gSoldierRootLimb" Type="Standard" EnumName="SOLDIER_LIMB_ROOT" Offset="0xD540" />
-        <Limb Name="gSoldierPelvisLimb" Type="Standard" EnumName="SOLDIER_LIMB_PELVIS" Offset="0xD54C" />
-        <Limb Name="gSoldierLeftThighLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_THIGH" Offset="0xD558" />
-        <Limb Name="gSoldierLeftShinLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_SHIN" Offset="0xD564" />
-        <Limb Name="gSoldierLeftFootLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_FOOT" Offset="0xD570" />
-        <Limb Name="gSoldierRightThighLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_THIGH" Offset="0xD57C" />
-        <Limb Name="gSoldierRightShinLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_SHIN" Offset="0xD588" />
-        <Limb Name="gSoldierRightFootLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_FOOT" Offset="0xD594" />
-        <Limb Name="gSoldierTorsoLimb" Type="Standard" EnumName="SOLDIER_LIMB_TORSO" Offset="0xD5A0" />
-        <Limb Name="gSoldierLeftShoulderLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_SHOULDER" Offset="0xD5AC" />
-        <Limb Name="gSoldierLeftForearmLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_FOREARM" Offset="0xD5B8" />
-        <Limb Name="gSoldierLeftHandLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_HAND" Offset="0xD5C4" />
-        <Limb Name="gSoldierRightShoulderLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_SHOULDER" Offset="0xD5D0" />
-        <Limb Name="gSoldierRightForearmLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_FOREARM" Offset="0xD5DC" />
-        <Limb Name="gSoldierRightHandWithSpearLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_HAND_WITH_SPEAR" Offset="0xD5E8" />
-        <Limb Name="gSoldierHeadLimb" Type="Standard" EnumName="SOLDIER_LIMB_HEAD" Offset="0xD5F4" />
-        <Skeleton Name="gSoldierSkel" Type="Flex" LimbType="Standard" LimbNone="SOLDIER_LIMB_NONE" LimbMax="SOLDIER_LIMB_MAX" EnumName="SoldierLimb" Offset="0xD640" />
-        <Animation Name="gSoldierStandAndLookDownAnim" Offset="0xDC7C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_secom_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_secom_obj.xml
deleted file mode 100644
index 7b21783a3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_secom_obj.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <File Name="object_secom_obj" Segment="6">
-        <DList Name="object_secom_obj_DL_000080" Offset="0x80" />
-        <Collision Name="object_secom_obj_Colheader_0001C0" Offset="0x1C0" />
-        <Texture Name="object_secom_obj_Tex_0001F0" OutName="tex_0001F0" Format="rgba16" Width="32" Height="64" Offset="0x1F0" />
-        <DList Name="object_secom_obj_DL_001230" Offset="0x1230" />
-        <DList Name="object_secom_obj_DL_001300" Offset="0x1300" />
-        <Texture Name="object_secom_obj_Tex_001390" OutName="tex_001390" Format="rgba16" Width="15" Height="32" Offset="0x1390" />
-        <Texture Name="object_secom_obj_Tex_001750" OutName="tex_001750" Format="rgba16" Width="16" Height="16" Offset="0x1750" />
-        <DList Name="object_secom_obj_DL_001A50" Offset="0x1A50" />
-        <DList Name="object_secom_obj_DL_001A58" Offset="0x1A58" />
-        <Texture Name="object_secom_obj_Tex_001B08" OutName="tex_001B08" Format="rgba16" Width="32" Height="64" Offset="0x1B08" />
-        <Collision Name="object_secom_obj_Colheader_002CB8" Offset="0x2CB8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sek.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sek.xml
deleted file mode 100644
index 3529620aa..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sek.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="object_sek" Segment="6">
-        <DList Name="gOwlStatueClosedDL" Offset="0x1D0" />
-        <Texture Name="object_sek_Tex_0003F0" OutName="tex_0003F0" Format="ci8" Width="32" Height="32" Offset="0x3F0" />
-        <Texture Name="object_sek_Tex_0007F0" OutName="tex_0007F0" Format="ci8" Width="32" Height="32" Offset="0x7F0" />
-        <DList Name="object_sek_DL_001110" Offset="0x1110" />
-        <Texture Name="object_sek_TLUT_001610" OutName="tlut_001610" Format="rgba16" Width="16" Height="16" Offset="0x1610" />
-        <Texture Name="object_sek_Tex_001810" OutName="tex_001810" Format="ci8" Width="32" Height="32" Offset="0x1810" />
-        <Texture Name="object_sek_Tex_001C10" OutName="tex_001C10" Format="ci8" Width="32" Height="32" Offset="0x1C10" />
-        <Texture Name="object_sek_Tex_002010" OutName="tex_002010" Format="ci8" Width="32" Height="32" Offset="0x2010" />
-        <Texture Name="object_sek_Tex_002410" OutName="tex_002410" Format="ci8" Width="32" Height="32" Offset="0x2410" />
-        <Texture Name="object_sek_Tex_002810" OutName="tex_002810" Format="ci8" Width="32" Height="32" Offset="0x2810" />
-        <Texture Name="object_sek_Tex_002C10" OutName="tex_002C10" Format="ci8" Width="32" Height="32" Offset="0x2C10" />
-        <DList Name="gOwlStatueOpenedDL" Offset="0x3770" />
-        <Texture Name="object_sek_Tex_003A70" OutName="tex_003A70" Format="ci8" Width="32" Height="64" Offset="0x3A70" />
-        <Texture Name="object_sek_Tex_004270" OutName="tex_004270" Format="ci8" Width="32" Height="64" Offset="0x4270" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihig.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihig.xml
deleted file mode 100644
index de104df55..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihig.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Assets for a suns song grave with a goron symbol on it -->
-    <File Name="object_sekihig" Segment="6">
-        <DList Name="gSunsSongGraveGoronSymbolsBaseDL" Offset="0x340" />
-        <DList Name="gSunsSongGraveGoronSymbolsDL" Offset="0x4A8" />
-        <DList Name="gSunsSongGraveGoronStoneDL" Offset="0x4B8" />
-        <DList Name="gSunsSongGraveGoronDL" Offset="0x5C8" />
-        <Texture Name="gSunsSongGraveGoronTLUT" OutName="sun_song_grave_goron_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5E0" />
-        <Texture Name="gSunsSongGraveGoronKokiriTLUT" OutName="suns_song_grave_goron_kokiri_tlut" Format="rgba16" Width="4" Height="4" Offset="0x600" />
-        <Texture Name="gSunsSongGraveGoronUnknownTLUT" OutName="suns_song_grave_goron_unknown_tlut" Format="rgba16" Width="4" Height="4" Offset="0x620" />
-        <Texture Name="gSunsSongGraveGoronTriforceTLUT" OutName="suns_song_grave_goron_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x640" />
-        <Texture Name="gSunsSongGraveGoronGraniteTex" OutName="sun_song_grave_goron_granite" Format="rgba16" Width="32" Height="32" Offset="0x660" />
-        <Texture Name="gSunsSongGraveGoronMarbleTex" OutName="sun_song_grave_goron_marble" Format="rgba16" Width="32" Height="64" Offset="0xE60" />
-        <Texture Name="gSunsSongGraveGoronSymbolTex" OutName="sun_song_grave_goron_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" />
-        <Texture Name="gSunsSongGraveGoronStoneInscriptionTex" OutName="sun_song_grave_goron_stone_inscription" Format="ia4" Width="128" Height="16" Offset="0x2660" />
-        <Texture Name="gSunsSongGraveGoronStaffNotesTex" OutName="sun_song_grave_goron_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A60" />
-        <Collision Name="gSunsSongGraveGoronCol" Offset="0x33D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihil.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihil.xml
deleted file mode 100644
index 3dbb57774..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihil.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Assets for a suns song grave with a triforce symbol on it -->
-    <File Name="object_sekihil" Segment="6">
-        <DList Name="gSunsSongGraveTriforceSymbolsBaseDL" Offset="0x340" />
-        <DList Name="gSunsSongGraveTriforceSymbolsDL" Offset="0x4C0" />
-        <DList Name="gSunsSongGraveTriforceStoneDL" Offset="0x4D0" />
-        <DList Name="gSunsSongGraveTriforceDL" Offset="0x5E0" />
-        <Texture Name="gSunsSongGraveTriforceGoronTLUT" OutName="suns_song_grave_triforce_goron_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5F8" />
-        <Texture Name="gSunsSongGraveTriforceKokiriTLUT" OutName="suns_song_grave_triforce_kokiri_tlut" Format="rgba16" Width="4" Height="4" Offset="0x618" />
-        <Texture Name="gSunsSongGraveTriforceUnknownTLUT" OutName="suns_song_grave_triforce_unknown_tlut" Format="rgba16" Width="4" Height="4" Offset="0x638" />
-        <Texture Name="gSunsSongGraveTriforceTLUT" OutName="sun_song_grave_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x658" />
-        <Texture Name="gSunsSongGraveTriforceGraniteTex" OutName="sun_song_grave_triforce_granite" Format="rgba16" Width="32" Height="32" Offset="0x678" />
-        <Texture Name="gSunsSongGraveTriforceMarbleTex" OutName="sun_song_grave_triforce_marble" Format="rgba16" Width="32" Height="64" Offset="0xE78" />
-        <Texture Name="gSunsSongGraveTriforceSymbolTex" OutName="sun_song_grave_triforce_symbol" Format="ia4" Width="128" Height="16" Offset="0x1E78" />
-        <Texture Name="gSunsSongGraveTriforceStoneInscriptionTex" OutName="sun_song_grave_triforce_stone_inscription" Format="ci4" Width="64" Height="64" Offset="0x2278" />
-        <Texture Name="gSunsSongGraveTriforceStaffNotesTex" OutName="sun_song_grave_triforce_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A78" />
-        <Collision Name="gSunsSongGraveTriforceCol" Offset="0x33F8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihin.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihin.xml
deleted file mode 100644
index 300a9ad58..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihin.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Assets for a suns song grave with a kokiri symbol on it -->
-    <File Name="object_sekihin" Segment="6">
-        <DList Name="gSunsSongGraveKokiriSymbolsBaseDL" Offset="0x340" />
-        <DList Name="gSunsSongGraveKokiriSymbolsDL" Offset="0x4A8" />
-        <DList Name="gSunsSongGraveKokiriStoneDL" Offset="0x4B8" />
-        <DList Name="gSunsSongGraveKokiriDL" Offset="0x5C8" />
-        <Texture Name="gSunsSongGraveKokiriGoronTLUT" OutName="suns_song_grave_kokiri_goron_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5E0" />
-        <Texture Name="gSunsSongGraveKokiriTLUT" OutName="suns_song_grave_kokiri_tlut" Format="rgba16" Width="4" Height="4" Offset="0x600" />
-        <Texture Name="gSunsSongGraveKokiriUnknownTLUT" OutName="suns_song_grave_kokiri_unknown_tlut" Format="rgba16" Width="4" Height="4" Offset="0x620" />
-        <Texture Name="gSunsSongGraveKokiriTriforceTLUT" OutName="suns_song_grave_kokiri_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x640" />
-        <Texture Name="gSunsSongGraveKokiriGraniteTex" OutName="suns_song_grave_kokiri_granite" Format="rgba16" Width="32" Height="32" Offset="0x660" />
-        <Texture Name="gSunsSongGraveKokiriMarbleTex" OutName="suns_song_grave_kokiri_marble" Format="rgba16" Width="32" Height="64" Offset="0xE60" />
-        <Texture Name="gSunsSongGraveKokiriSymbolTex" OutName="suns_song_grave_kokiri_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" />
-        <Texture Name="gSunsSongGraveKokiriStoneInscriptionTex" OutName="suns_song_grave_kokiri_stone_inscription" Format="ia4" Width="128" Height="16" Offset="0x2660" />
-        <Texture Name="gSunsSongGraveKokiriStaffNotesTex" OutName="suns_song_grave_kokiri_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A60" />
-        <Collision Name="gSunsSongGraveKokiriCol" Offset="0x33D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihiz.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihiz.xml
deleted file mode 100644
index 806279c98..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sekihiz.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Assets for the song of soaring pedestal -->
-    <File Name="object_sekihiz" Segment="6">
-        <DList Name="gSongOfSoaringPedestalEmptyDL" Offset="0x510" />
-        <DList Name="gSongOfSoaringPedestalDL" Offset="0x518" />
-        <Texture Name="gSongOfSoaringPedestalStaffNotesTex" OutName="song_of_soaring_pedestal_staff_notes" Format="i8" Width="32" Height="32" Offset="0x728" />
-        <Texture Name="gSongOfSoaringPedestalGraniteTex" OutName="song_of_soaring_pedestal_granite" Format="i8" Width="32" Height="32" Offset="0xB28" />
-        <Collision Name="gSongOfSoaringPedestalCol" Offset="0x1010" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_shn.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_shn.xml
deleted file mode 100644
index 3e39b2eff..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_shn.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<Root>
-    <!-- Assets for the Shooting Gallery Men and the Swamp Guide. They all use the same body and just swap out the head. -->
-    <File Name="object_shn" Segment="6">
-        <!-- Burly Guy Limb DisplayLists. Includes the Swamp Shooting Gallery Man's head -->
-        <DList Name="gBurlyGuyWaistDL" Offset="0x3510" />
-        <DList Name="gBurlyGuyTorsoDL" Offset="0x3600" />
-        <DList Name="gSwampShootingGalleryManHeadDL" Offset="0x39A0" />
-        <DList Name="gBurlyGuyRightShoulderDL" Offset="0x3DA0" />
-        <DList Name="gBurlyGuyRightForearmDL" Offset="0x4038" />
-        <DList Name="gBurlyGuyRightHandDL" Offset="0x42E0" />
-        <DList Name="gBurlyGuyLeftShoulderDL" Offset="0x4620" />
-        <DList Name="gBurlyGuyLeftForearmDL" Offset="0x48B8" />
-        <DList Name="gBurlyGuyLeftHandDL" Offset="0x4B60" />
-        <DList Name="gBurlyGuyRightThighDL" Offset="0x4EA8" />
-        <DList Name="gBurlyGuyRightShinDL" Offset="0x4FC8" />
-        <DList Name="gBurlyGuyRightFootDL" Offset="0x50D0" />
-        <DList Name="gBurlyGuyLeftThighDL" Offset="0x5298" />
-        <DList Name="gBurlyGuyLeftShinDL" Offset="0x53B8" />
-        <DList Name="gBurlyGuyLeftFootDL" Offset="0x54C0" />
-
-        <!-- Textures for Burly Guy's body, as well as the Swamp Shooting Gallery Man's head -->
-        <Texture Name="gSwampShootingGalleryManNoseTLUT" OutName="swamp_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5688" />
-        <Texture Name="gBurlyGuyTLUT" OutName="shooting_gallery_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5888" />
-        <Texture Name="gBurlyGuySkinTex" OutName="shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0x5A88" />
-        <Texture Name="gSwampShootingGalleryManEyeOpenTex" OutName="swamp_shooting_gallery_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x5AC8" />
-        <Texture Name="gSwampShootingGalleryManEyeHalfTex" OutName="swamp_shooting_gallery_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x62C8" />
-        <Texture Name="gSwampShootingGalleryManEyeClosedTex" OutName="swamp_shooting_gallery_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x6AC8" />
-        <Texture Name="gSwampShootingGalleryManEarTex" OutName="swamp_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0x72C8" />
-        <Texture Name="gSwampShootingGalleryManNoseTex" OutName="swamp_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0x73C8" />
-        <Texture Name="gSwampShootingGalleryManBeardAndLipsTex" OutName="swamp_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x7408" />
-        <Texture Name="gSwampShootingGalleryManHairTex" OutName="swamp_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0x7808" />
-        <Texture Name="gBurlyGuyHandTex" OutName="shooting_gallery_man_hand" Format="ci8" Width="16" Height="16" Offset="0x7908" />
-        <Texture Name="gBurlyGuyBodyHairTex" OutName="shooting_gallery_man_body_hair" Format="ci8" Width="32" Height="32" Offset="0x7A08" />
-        <Texture Name="gBurlyGuyVestTex" OutName="shooting_gallery_man_vest" Format="ci8" Width="16" Height="16" Offset="0x7E08" />
-        <Texture Name="gBurlyGuyPantsTex" OutName="shooting_gallery_man_pants" Format="ci8" Width="8" Height="8" Offset="0x7F08" />
-        <Texture Name="gBurlyGuyShoesTex" OutName="shooting_gallery_man_shoes" Format="ci8" Width="16" Height="16" Offset="0x7F48" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gBurlyGuyUnused8050TexAnim" Offset="0x8050" />
-
-        <!-- DisplayLists for an unused duplicate of the Town Shooting Gallery Man's head -->
-        <DList Name="gUnusedTownShootingGalleryManEyesDL" Offset="0x8BA0" />
-        <DList Name="gUnusedTownShootingGalleryManLipsDL" Offset="0x8C70" />
-        <DList Name="gUnusedTownShootingGalleryManNoseDL" Offset="0x8D90" />
-        <DList Name="gUnusedTownShootingGalleryManEarsDL" Offset="0x8E48" />
-        <DList Name="gUnusedTownShootingGalleryManHairAndSideburnsDL" Offset="0x8F00" />
-        <DList Name="gUnusedTownShootingGalleryManFaceAndChinDL" Offset="0x9040" />
-
-        <!-- Textures for an unused duplicate of the Town Shooting Gallery Man's head -->
-        <Texture Name="gUnusedTownShootingGalleryManBeardAndLipsTLUT" OutName="unused_town_shooting_gallery_man_beard_and_lips_tlut" Format="rgba16" Width="16" Height="16" Offset="0x91D8" />
-        <Texture Name="gUnusedTownShootingGalleryManHairTLUT" OutName="unused_town_shooting_gallery_man_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x93D8" />
-        <Texture Name="gUnusedTownShootingGalleryManEarTLUT" OutName="unused_town_shooting_gallery_man_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x95D8" />
-        <Texture Name="gUnusedTownShootingGalleryManNoseTLUT" OutName="unused_town_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0x97D8" />
-        <Texture Name="gUnusedTownShootingGalleryManEyeTLUT" OutName="unused_town_shooting_gallery_man_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x99D8" />
-        <Texture Name="gUnusedTownShootingGalleryManSkinTLUT" OutName="unused_town_shooting_gallery_man_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9BD8" />
-        <Texture Name="gUnusedTownShootingGalleryManBeardAndLipsTex" OutName="unused_town_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x9DD8" /> <!-- Used only for the lips -->
-        <Texture Name="gUnusedTownShootingGalleryManHairTex" OutName="unused_town_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0xA1D8" />
-        <Texture Name="gUnusedTownShootingGalleryManEarTex" OutName="unused_town_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0xA2D8" />
-        <Texture Name="gUnusedTownShootingGalleryManNoseTex" OutName="unused_town_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0xA3D8" />
-        <Texture Name="gUnusedTownShootingGalleryManEyeTex" OutName="unused_town_shooting_gallery_man_eye" Format="ci8" Width="32" Height="32" Offset="0xA418" />
-        <Texture Name="gUnusedTownShootingGalleryManSkinTex" OutName="unused_town_shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0xA818" />
-
-        <!-- Unused Empty DisplayList -->
-        <DList Name="gBurlyGuyEmptyDL" Offset="0xB730" />
-
-        <!-- DisplayList for the Swamp Guide's head -->
-        <DList Name="gSwampGuideHeadDL" Offset="0xB738" />
-
-        <!-- Textures for the Swamp Guide's head -->
-        <Texture Name="gSwampGuideHairFabricAndSkinTLUT" OutName="swamp_guide_hair_fabric_and_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xBCD8" />
-        <Texture Name="gSwampGuideMouthGoggleAndEyeTLUT" OutName="swamp_guide_mouth_goggle_and_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xBED8" />
-        <Texture Name="gSwampGuideSkinTex" OutName="swamp_guide_skin" Format="ci8" Width="8" Height="8" Offset="0xC0D8" />
-        <Texture Name="gSwampGuideHatFabricTex" OutName="swamp_guide_hat_fabric" Format="ci8" Width="16" Height="16" Offset="0xC118" />
-        <Texture Name="gSwampGuideHairAndBeardTex" OutName="swamp_guide_hair_and_beard" Format="ci8" Width="16" Height="16" Offset="0xC218" />
-        <Texture Name="gSwampGuideHatAndGogglesMetalTex" OutName="swamp_guide_hat_and_goggles_metal" Format="ci8" Width="32" Height="16" Offset="0xC318" />
-        <Texture Name="gSwampGuideEyeTex" OutName="swamp_guide_eye" Format="ci8" Width="32" Height="32" Offset="0xC518" />
-        <Texture Name="gSwampGuideGoggleStrapTex" OutName="swamp_guide_goggle_strap" Format="ci8" Width="16" Height="16" Offset="0xC918" />
-        <Texture Name="gSwampGuideNoseTex" OutName="swamp_guide_nose" Format="rgba16" Width="8" Height="8" Offset="0xCA18" />
-        <Texture Name="gSwampGuideMouthTex" OutName="swamp_guide_mouth" Format="ci8" Width="16" Height="32" Offset="0xCA98" />
-
-        <!-- Burly Guy Animations -->
-        <Animation Name="gBurlyGuyHeadScratchEndAnim" Offset="0xD2F8" /> <!-- Original name is "shn_w02TOw01" ("wait02 to wait01"?) -->
-        <Animation Name="gBurlyGuyEmptyAnim" Offset="0xD3AC" /> <!-- Unused and one frame long. Original name is "shn_wait" -->
-        <Animation Name="gBurlyGuyHandsOnTableAnim" Offset="0xD9D0" /> <!-- Original name is "shn_wait01" -->
-        <Animation Name="gBurlyGuyHeadScratchLoopAnim" Offset="0xDFEC" /> <!-- Original name is "shn_wait02" -->
-        <Animation Name="gBurlyGuyChinScratchAnim" Offset="0xE6C4" /><!-- Original name is "shn_wait03" -->
-
-        <!-- Burly Guy Limbs -->
-        <Limb Name="gBurlyGuyWaistLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_WAIST" Offset="0xE6E0" />
-        <Limb Name="gBurlyGuyLeftThighLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_THIGH" Offset="0xE6EC" />
-        <Limb Name="gBurlyGuyLeftShinLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_SHIN" Offset="0xE6F8" />
-        <Limb Name="gBurlyGuyLeftFootLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_FOOT" Offset="0xE704" />
-        <Limb Name="gBurlyGuyRightThighLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_THIGH" Offset="0xE710" />
-        <Limb Name="gBurlyGuyRightShinLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_SHIN" Offset="0xE71C" />
-        <Limb Name="gBurlyGuyRightFootLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_FOOT" Offset="0xE728" />
-        <Limb Name="gBurlyGuyTorsoLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_TORSO" Offset="0xE734" />
-        <Limb Name="gBurlyGuyLeftShoulderLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_SHOULDER" Offset="0xE740" />
-        <Limb Name="gBurlyGuyLeftForearmLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_FOREARM" Offset="0xE74C" />
-        <Limb Name="gBurlyGuyLeftHandLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_HAND" Offset="0xE758" />
-        <Limb Name="gBurlyGuyRightShoulderLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_SHOULDER" Offset="0xE764" />
-        <Limb Name="gBurlyGuyRightForearmLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_FOREARM" Offset="0xE770" />
-        <Limb Name="gBurlyGuyRightHandLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_HAND" Offset="0xE77C" />
-        <Limb Name="gBurlyGuyHeadLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_HEAD" Offset="0xE788" />
-
-        <!-- Burly Guy Skeleton -->
-        <Skeleton Name="gBurlyGuySkel" Type="Flex" LimbType="Standard" LimbNone="BURLY_GUY_LIMB_NONE" LimbMax="BURLY_GUY_LIMB_MAX" EnumName="BurlyGuyLimb" Offset="0xE7D0" />
-
-        <!-- DisplayList for the Town Shooting Gallery Man's Head -->
-        <DList Name="gTownShootingGalleryManHeadDL" Offset="0xF2D0" />
-
-        <!-- Textures for the Town Shooting Gallery Man's Head -->
-        <Texture Name="gTownShootingGalleryManNoseTLUT" OutName="town_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF790" />
-        <Texture Name="gTownShootingGalleryManHeadTLUT" OutName="town_shooting_gallery_man_head_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF990" />
-        <Texture Name="gTownShootingGalleryManEyeOpenTex" OutName="town_shooting_gallery_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xFB90" />
-        <Texture Name="gTownShootingGalleryManEyeClosedTex" OutName="town_shooting_gallery_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x10390" />
-        <Texture Name="gTownShootingGalleryManBeardAndLipsTex" OutName="town_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x10B90" /> <!-- Used only for the lips -->
-        <Texture Name="gTownShootingGalleryManNoseTex" OutName="town_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0x10F90" />
-        <Texture Name="gTownShootingGalleryManEarTex" OutName="town_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0x10FD0" />
-        <Texture Name="gTownShootingGalleryManHairTex" OutName="town_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0x110D0" />
-        <Texture Name="gTownShootingGalleryManSkinTex" OutName="town_shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0x111D0" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gBurlyGuyUnused11210TexAnim" Offset="0x11210" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sichitai_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sichitai_obj.xml
deleted file mode 100644
index 03bc4f7f3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sichitai_obj.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_sichitai_obj" Segment="6">
-        <DList Name="gSichitaiBoatDL" Offset="0x6B0" />
-        <Texture Name="gSichitaiThwartTex" OutName="tex_000878" Format="rgba16" Width="16" Height="16" Offset="0x878" />
-        <Texture Name="gSichitaiHullTex" OutName="tex_000A78" Format="rgba16" Width="32" Height="32" Offset="0xA78" />
-        <Collision Name="gSichitaiBoatCol" Offset="0x16DC" />
-        <DList Name="object_sichitai_obj_DL_001820" Offset="0x1820" />
-        <Texture Name="object_sichitai_obj_Tex_001908" OutName="tex_001908" Format="rgba16" Width="32" Height="32" Offset="0x1908" />
-        <Texture Name="object_sichitai_obj_Tex_002108" OutName="tex_002108" Format="i4" Width="64" Height="64" Offset="0x2108" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sinkai_kabe.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sinkai_kabe.xml
deleted file mode 100644
index 3c23a73ce..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sinkai_kabe.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <!-- The collision for the front of the Deep Python's den (the invisible wall) -->
-    <File Name="object_sinkai_kabe" Segment="6">
-        <Collision Name="gPinnacleRockPythonDenCol" Offset="0x48" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_skb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_skb.xml
deleted file mode 100644
index b1afaf353..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_skb.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Assets for Stalchild -->
-    <File Name="object_skb" Segment="6">
-        <Animation Name="gStalchildIdleAnim" Offset="0x9E4" />
-        <Animation Name="gStalchildSaluteAnim" Offset="0x15EC" />
-        <Animation Name="gStalchildSwingOnBranchAnim" Offset="0x1D1C" />
-        <Animation Name="gStalchildAttackAnim" Offset="0x2190" />
-        <!-- <Blob Name="object_skb_zeroes_unk_000021A0" Size="0x20" Offset="0x21A0" /> -->
-        <Animation Name="gStalchildCollapseAnim" Offset="0x270C" />
-        <!-- <Blob Name="object_skb_zeroes_unk_00002720" Size="0x20" Offset="0x2720" /> -->
-        <Animation Name="gStalchildStaggerAnim" Offset="0x2AC8" />
-        <!-- <Blob Name="object_skb_zeroes_unk_00002AE0" Size="0x10" Offset="0x2AE0" /> -->
-        <Animation Name="gStalchildStandUpAnim" Offset="0x3584" />
-        <Texture Name="gStalchildPelvisTex" OutName="stalchild_pelvis" Format="rgba16" Width="16" Height="16" Offset="0x35A0" />
-        <Texture Name="gStalchildRibcageTex" OutName="stalchild_ribcage" Format="rgba16" Width="8" Height="16" Offset="0x37A0" />
-        <Texture Name="gStalchildSkullTex" OutName="stalchild_skull" Format="rgba16" Width="8" Height="8" Offset="0x38A0" />
-        <Texture Name="gStalchildNoseTex" OutName="stalchild_nose" Format="rgba16" Width="8" Height="8" Offset="0x3920" />
-        <Texture Name="gStalchildBoneTex" OutName="stalchild_bone" Format="rgba16" Width="8" Height="8" Offset="0x39A0" />
-        <Texture Name="gStalchildHandAndFeetTex" OutName="stalchild_hand_and_feet" Format="rgba16" Width="8" Height="16" Offset="0x3A20" />
-        <Texture Name="gStalchildTeethTex" OutName="stalchild_teeth" Format="rgba16" Width="16" Height="8" Offset="0x3B20" />
-        <Texture Name="gStalchildEyeSocketTex" OutName="stalchild_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x3C20" />
-        <Texture Name="gStalchildEyeTex" OutName="stalchild_eye" Format="rgba16" Width="8" Height="8" Offset="0x3E20" />
-        <DList Name="gStalchildHeadDL" Offset="0x4F30" />
-        <DList Name="gStalchildLowerJawDL" Offset="0x5298" />
-        <DList Name="gStalchildRibcageDL" Offset="0x5340" />
-        <DList Name="gStalchildSpineDL" Offset="0x5408" />
-        <DList Name="gStalchildPelvisDL" Offset="0x54A0" />
-        <DList Name="gStalchildLeftUpperArmDL" Offset="0x55A8" />
-        <DList Name="gStalchildLeftLowerArmDL" Offset="0x5668" />
-        <DList Name="gStalchildLeftHandDL" Offset="0x5710" />
-        <DList Name="gStalchildRightUpperArmDL" Offset="0x57D8" />
-        <DList Name="gStalchildRightLowerArmDL" Offset="0x5898" />
-        <DList Name="gStalchildRightHandDL" Offset="0x5940" />
-        <DList Name="gStalchildLeftThighDL" Offset="0x5A08" />
-        <DList Name="gStalchildLeftShinDL" Offset="0x5AA0" />
-        <DList Name="gStalchildLeftFootDL" Offset="0x5B48" />
-        <DList Name="gStalchildRightThighDL" Offset="0x5BE8" />
-        <DList Name="gStalchildRightShinDL" Offset="0x5C80" />
-        <DList Name="gStalchildRightFootDL" Offset="0x5D28" />
-        <Limb Name="gStalchildRootLimb" Type="Standard" EnumName="STALCHILD_LIMB_ROOT" Offset="0x5DC8" />
-        <Limb Name="gStalchildPelvisLimb" Type="Standard" EnumName="STALCHILD_LIMB_PELVIS" Offset="0x5DD4" />
-        <Limb Name="gStalchildRootLegsLimb" Type="Standard" EnumName="STALCHILD_LIMB_ROOT_LEGS" Offset="0x5DE0" />
-        <Limb Name="gStalchildRightThighLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_THIGH" Offset="0x5DEC" />
-        <Limb Name="gStalchildRightShinLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_SHIN" Offset="0x5DF8" />
-        <Limb Name="gStalchildRightFootLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_FOOT" Offset="0x5E04" />
-        <Limb Name="gStalchildLeftThighLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_THIGH" Offset="0x5E10" />
-        <Limb Name="gStalchildLeftShinLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_SHIN" Offset="0x5E1C" />
-        <Limb Name="gStalchildLeftFootLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_FOOT" Offset="0x5E28" />
-        <Limb Name="gStalchildRibcageLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIBCAGE" Offset="0x5E34" />
-        <Limb Name="gStalchildHeadLimb" Type="Standard" EnumName="STALCHILD_LIMB_HEAD" Offset="0x5E40" />
-        <Limb Name="gStalchildLowerJawLimb" Type="Standard" EnumName="STALCHILD_LIMB_LOWER_JAW" Offset="0x5E4C" />
-        <Limb Name="gStalchildRightUpperArmLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_UPPER_ARM" Offset="0x5E58" />
-        <Limb Name="gStalchildRightLowerArmLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_LOWER_ARM" Offset="0x5E64" />
-        <Limb Name="gStalchildRightHandLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_HAND" Offset="0x5E70" />
-        <Limb Name="gStalchildLeftUpperArmLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_UPPER_ARM" Offset="0x5E7C" />
-        <Limb Name="gStalchildLeftLowerArmLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_LOWER_ARM" Offset="0x5E88" />
-        <Limb Name="gStalchildLeftHandLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_HAND" Offset="0x5E94" />
-        <Limb Name="gStalchildSpineLimb" Type="Standard" EnumName="STALCHILD_LIMB_SPINE" Offset="0x5EA0" />
-        <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" LimbNone="STALCHILD_LIMB_NONE" LimbMax="STALCHILD_LIMB_MAX" EnumName="StalchildLimb" Offset="0x5EF8" />
-        <Animation Name="gStalchildWalkAnim" Offset="0x64E0" />
-        <!-- <Blob Name="object_skb_zeroes_unk_000064F0" Size="0x20" Offset="0x64F0" /> -->
-        <Animation Name="gStalchildSitLaughAnim" Offset="0x697C" />
-        <Animation Name="gStalchildSitTapToesAnim" Offset="0x6D90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_slime.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_slime.xml
deleted file mode 100644
index c8516e45f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_slime.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <!-- Object file for Chuchus -->
-    <File Name="object_slime" Segment="6">
-        <DList Name="gChuchuBodyDL" Offset="0x4C0" />
-        <DList Name="gChuchuEyesDL" Offset="0x650" />
-        <TextureAnimation Name="gChuchuSlimeFlowTexAnim" Offset="0x828" />
-        <DList Name="gChuchuPuddleDL" Offset="0xA10" />
-        <DList Name="gChuchuEmptyDL" Offset="0xB68" />
-        <Texture Name="gChuchuMouthTex" OutName="chuchu_mouth" Format="rgba16" Width="16" Height="16" Offset="0xB70" />
-        <Texture Name="gChuchuEyeSocketTex" OutName="chuchu_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0xD70" />
-        <Texture Name="gChuchuEyeOpenTex" OutName="chuchu_eye_open" Format="rgba16" Width="16" Height="8" Offset="0xF70" />
-        <Texture Name="gChuchuEyeHalfTex" OutName="chuchu_eye_half" Format="rgba16" Width="16" Height="8" Offset="0x1070" />
-        <Texture Name="gChuchuEyeClosedTex" OutName="chuchu_eye_closed" Format="rgba16" Width="16" Height="8" Offset="0x1170" />
-        <Texture Name="gChuchuSlimeFlowTex" OutName="chuchu_slime_flow" Format="i4" Width="32" Height="32" Offset="0x1270" />
-        <Texture Name="gChuchuSlimeBaseTex" OutName="chuchu_slime_base" Format="i4" Width="64" Height="64" Offset="0x1470" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_smtower.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_smtower.xml
deleted file mode 100644
index 90ee5a13d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_smtower.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_smtower" Segment="6">
-        <DList Name="object_smtower_DL_000520" Offset="0x520" />
-        <Texture Name="object_smtower_Tex_000778" OutName="tex_000778" Format="i8" Width="64" Height="32" Offset="0x778" />
-        <Texture Name="object_smtower_Tex_000F78" OutName="tex_000F78" Format="i4" Width="64" Height="64" Offset="0xF78" />
-        <TextureAnimation Name="object_smtower_Matanimheader_001788" Offset="0x1788" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_snowman.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_snowman.xml
deleted file mode 100644
index dd5f42c17..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_snowman.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<Root>
-    <!-- Assets for Eeno -->
-    <File Name="object_snowman" Segment="6">
-        <!-- Eeno Animations -->
-        <Animation Name="gEenoLargeSnowballCreateAnim" Offset="0x404" /> <!-- Original name is "sm_ageA" ("go up/raise A") -->
-        <Animation Name="gEenoSmallSnowballCreateAnim" Offset="0x7B4" /> <!-- Original name is "sm_ageB" ("go up/raise B") -->
-
-        <!-- Eeno Large Snowball DisplayList -->
-        <DList Name="gEenoLargeSnowballDL" Offset="0x10B0" />
-
-        <!-- Eeno Limb DisplayLists -->
-        <DList Name="gEenoBodyBottomDL" Offset="0x2428" />
-        <DList Name="gEenoBodyTopDL" Offset="0x2640" />
-        <DList Name="gEenoRightUpperArmDL" Offset="0x28F0" />
-        <DList Name="gEenoRightForearmDL" Offset="0x29B0" />
-        <DList Name="gEenoRightHandDL" Offset="0x2A50" />
-        <DList Name="gEenoLeftUpperArmDL" Offset="0x2B20" />
-        <DList Name="gEenoLeftForearmDL" Offset="0x2C70" />
-        <DList Name="gEenoLeftHandDL" Offset="0x2D10" />
-        <DList Name="gEenoRightEyeDL" Offset="0x2DE0" />
-        <DList Name="gEenoLeftEyeDL" Offset="0x2E70" />
-
-        <!-- Eeno Textures -->
-        <Texture Name="gEenoFaceTex" OutName="eeno_face" Format="rgba16" Width="32" Height="64" Offset="0x2F00" />
-        <Texture Name="gEenoUpperCheekTex" OutName="eeno_upper_cheek" Format="i4" Width="16" Height="16" Offset="0x3F00" />
-        <Texture Name="gEenoBodyTex" OutName="eeno_body" Format="i8" Width="16" Height="16" Offset="0x3F80" />
-        <Texture Name="gEenoEyeTex" OutName="eeno_eye" Format="rgba16" Width="16" Height="16" Offset="0x4080" />
-
-        <!-- Eeno Small Snowball DisplayList -->
-        <DList Name="gEenoSmallSnowballDL" Offset="0x4400" />
-
-        <!-- Eeno Limbs -->
-        <Limb Name="gEenoRootLimb" Type="Standard" EnumName="EENO_LIMB_ROOT" Offset="0x44F0" />
-        <Limb Name="gEenoBodyTopLimb" Type="Standard" EnumName="EENO_LIMB_BODY_TOP" Offset="0x44FC" />
-        <Limb Name="gEenoLeftEyeLimb" Type="Standard" EnumName="EENO_LIMB_LEFT_EYE" Offset="0x4508" />
-        <Limb Name="gEenoRightEyeLimb" Type="Standard" EnumName="EENO_LIMB_RIGHT_EYE" Offset="0x4514" />
-        <Limb Name="gEenoLeftUpperArmLimb" Type="Standard" EnumName="EENO_LIMB_LEFT_UPPER_ARM" Offset="0x4520" />
-        <Limb Name="gEenoLeftForearmLimb" Type="Standard" EnumName="EENO_LIMB_LEFT_FOREARM" Offset="0x452C" />
-        <Limb Name="gEenoLeftHandLimb" Type="Standard" EnumName="EENO_LIMB_LEFT_HAND" Offset="0x4538" />
-        <Limb Name="gEenoRightUpperArmLimb" Type="Standard" EnumName="EENO_LIMB_RIGHT_UPPER_ARM" Offset="0x4544" />
-        <Limb Name="gEenoRightForearmLimb" Type="Standard" EnumName="EENO_LIMB_RIGHT_FOREARM" Offset="0x4550" />
-        <Limb Name="gEenoRightHandLimb" Type="Standard" EnumName="EENO_LIMB_RIGHT_HAND" Offset="0x455C" />
-        <Limb Name="gEenoBodyBottomLimb" Type="Standard" EnumName="EENO_LIMB_BODY_BOTTOM" Offset="0x4568" />
-
-        <!-- Eeno Skeleton -->
-        <Skeleton Name="gEenoSkel" Type="Flex" LimbType="Standard" LimbNone="EENO_LIMB_NONE" LimbMax="EENO_LIMB_MAX" EnumName="EenoLimb" Offset="0x45A0" />
-
-        <!-- Eeno Animations -->
-        <Animation Name="gEenoDamageAnim" Offset="0x4628" /> <!-- Original name is "sm_damege" -->
-        <Animation Name="gEenoSnowPileMoveAnim" Offset="0x46D8" /> <!-- Original name is "sm_fukurami" ("to swell") -->
-
-        <!-- Eeno Snow Pile Limb DisplayLists -->
-        <DList Name="gEenoSnowPileBottomDL" Offset="0x4960" />
-        <DList Name="gEenoSnowPileTopDL" Offset="0x49E0" />
-
-        <!-- Eeno Snow Pile Limbs -->
-        <Limb Name="gEenoSnowPileBottomLimb" Type="Standard" EnumName="EENO_SNOW_PILE_LIMB_BOTTOM" Offset="0x4A70" />
-        <Limb Name="gEenoSnowPileTopLimb" Type="Standard" EnumName="EENO_SNOW_PILE_LIMB_TOP" Offset="0x4A7C" />
-
-        <!-- Eeno Snow Pile Skeleton -->
-        <Skeleton Name="gEenoSnowPileSkel" Type="Flex" LimbType="Standard" LimbNone="EENO_SNOW_PILE_LIMB_NONE" LimbMax="EENO_SNOW_PILE_LIMB_MAX" EnumName="EenoSnowPileLimb" Offset="0x4A90" />
-        
-        <!-- Eeno Animations -->
-        <Animation Name="gEenoLargeSnowballThrowAnim" Offset="0x4F14" /> <!-- Original name is "sm_nageA" ("throw A") -->
-        <Animation Name="gEenoSmallSnowballThrowAnim" Offset="0x544C" /> <!-- Original name is "sm_nageB" ("throw B") -->
-        <Animation Name="gEenoEmergeAnim" Offset="0x554C" /> <!-- Original name is "sm_tojo" ("appearance") -->
-        <Animation Name="gEenoIdleAnim" Offset="0x58CC" /> <!-- Original name is "sm_wait" -->
-
-        <!-- Eeno Snowball Fragment DisplayLists -->
-        <DList Name="gEenoSnowballFragment1DL" Offset="0x5CB0" />
-        <DList Name="gEenoSnowballFragment2DL" Offset="0x6190" />
-        <DList Name="gEenoSnowballFragment3DL" Offset="0x6620" />
-
-        <!-- Eeno Snowball Fragment Texture -->
-        <Texture Name="gEenoSnowballFragmentTex" OutName="eeno_snowball_fragment" Format="rgba16" Width="32" Height="64" Offset="0x6730" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_snowwd.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_snowwd.xml
deleted file mode 100644
index 9bb2209d9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_snowwd.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_snowwd" Segment="6">
-        <DList Name="gSnowTreeEmptyDL" Offset="0x190" />
-        <DList Name="gSnowTreeDL" Offset="0x198" />
-        <Texture Name="gSnowTreeLeavesTex" OutName="snow_tree_leaves" Format="rgba16" Width="32" Height="64" Offset="0x2A0" />
-        <Texture Name="gSnowTreeBodyTex" OutName="snow_tree_body" Format="rgba16" Width="32" Height="32" Offset="0x12A0" />
-        <Texture Name="gSnowTreeSnowLeavesTex" OutName="snow_tree_snow_leaves" Format="rgba16" Width="32" Height="64" Offset="0x1AA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spdweb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spdweb.xml
deleted file mode 100644
index 6f54a482d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spdweb.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_spdweb" Segment="6">
-        <DList Name="object_spdweb_DL_000060" Offset="0x60" />
-        <DList Name="object_spdweb_DL_000130" Offset="0x130" />
-        <Texture Name="object_spdweb_Tex_000138" OutName="tex_000138" Format="rgba16" Width="32" Height="32" Offset="0x138" />
-        <Texture Name="object_spdweb_Tex_000938" OutName="tex_000938" Format="ia8" Width="32" Height="64" Offset="0x938" />
-        <Collision Name="object_spdweb_Colheader_0011C0" Offset="0x11C0" />
-        <DList Name="object_spdweb_DL_0012F0" Offset="0x12F0" />
-        <DList Name="object_spdweb_DL_001400" Offset="0x1400" />
-        <Texture Name="object_spdweb_Tex_001408" OutName="tex_001408" Format="ia8" Width="64" Height="64" Offset="0x1408" />
-        <Collision Name="object_spdweb_Colheader_002678" Offset="0x2678" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spidertent.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spidertent.xml
deleted file mode 100644
index d90bede67..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spidertent.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_spidertent" Segment="6">
-        <DList Name="object_spidertent_DL_000070" Offset="0x70" />
-        <DList Name="object_spidertent_DL_000108" Offset="0x108" />
-        <Texture Name="object_spidertent_Tex_000110" OutName="tex_000110" Format="ia8" Width="64" Height="64" Offset="0x110" />
-        <Collision Name="object_spidertent_Colheader_0011AC" Offset="0x11AC" />
-        <DList Name="object_spidertent_DL_001250" Offset="0x1250" />
-        <DList Name="object_spidertent_DL_0012E8" Offset="0x12E8" />
-        <Texture Name="object_spidertent_Tex_0012F0" OutName="tex_0012F0" Format="ia8" Width="64" Height="64" Offset="0x12F0" />
-        <Collision Name="object_spidertent_Colheader_00238C" Offset="0x238C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spinyroll.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spinyroll.xml
deleted file mode 100644
index d27386945..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spinyroll.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_spinyroll" Segment="6">
-        <DList Name="object_spinyroll_DL_000460" Offset="0x460" />
-        <Texture Name="object_spinyroll_Tex_0005C0" OutName="tex_0005C0" Format="rgba16" Width="32" Height="32" Offset="0x5C0" />
-        <Collision Name="object_spinyroll_Colheader_000E68" Offset="0xE68" />
-        <Collision Name="object_spinyroll_Colheader_000F80" Offset="0xF80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spot11_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spot11_obj.xml
deleted file mode 100644
index 58d146203..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_spot11_obj.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_spot11_obj" Segment="6">
-        <DList Name="gSpot11EmptyDL" Offset="0x80" />
-        <DList Name="gGoronDoorDL" Offset="0x88" />
-        <Texture Name="gGoronDoorTex" OutName="goron_door" Format="rgba16" Width="32" Height="64" Offset="0x120" />
-        <Collision Name="gGoronDoorCol" Offset="0x11C0" />
-        <DList Name="gWoodStepDL" Offset="0x13F0" />
-        <Texture Name="gWoodTLUT" OutName="wood_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1560" />
-        <Texture Name="gWoodStepTopTex" OutName="wood_step_top" Format="ci8" Width="32" Height="32" Offset="0x1760" />
-        <Texture Name="gWoodStepSideTex" OutName="wood_step_side" Format="ci8" Width="32" Height="16" Offset="0x1B60" />
-        <Collision Name="gWoodStepCol" Offset="0x1EB8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ssh.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ssh.xml
deleted file mode 100644
index 5e6893077..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_ssh.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Root>
-    <File Name="object_ssh" Segment="6">
-        <DList Name="object_ssh_DL_0000D0" Offset="0xD0" />
-        <DList Name="object_ssh_DL_0000D8" Offset="0xD8" />
-        <Texture Name="object_ssh_Tex_000190" OutName="tex_000190" Format="rgba16" Width="32" Height="64" Offset="0x190" />
-        <Animation Name="object_ssh_Anim_001494" Offset="0x1494" />
-        <Texture Name="object_ssh_TLUT_0014B0" OutName="tlut_0014B0" Format="rgba16" Width="16" Height="16" Offset="0x14B0" />
-        <Texture Name="object_ssh_Tex_0016B0" OutName="tex_0016B0" Format="ci8" Width="8" Height="8" Offset="0x16B0" />
-        <Texture Name="object_ssh_Tex_0016F0" OutName="tex_0016F0" Format="ci8" Width="16" Height="8" Offset="0x16F0" />
-        <Texture Name="object_ssh_Tex_001770" OutName="tex_001770" Format="ci8" Width="8" Height="8" Offset="0x1770" />
-        <Texture Name="object_ssh_Tex_0017B0" OutName="tex_0017B0" Format="i8" Width="16" Height="16" Offset="0x17B0" />
-        <Texture Name="object_ssh_Tex_0018B0" OutName="tex_0018B0" Format="ci8" Width="8" Height="16" Offset="0x18B0" />
-        <Texture Name="object_ssh_Tex_001930" OutName="tex_001930" Format="ci8" Width="8" Height="8" Offset="0x1930" />
-        <Texture Name="object_ssh_Tex_001970" OutName="tex_001970" Format="ci8" Width="32" Height="32" Offset="0x1970" />
-        <Texture Name="object_ssh_Tex_001D70" OutName="tex_001D70" Format="ci8" Width="8" Height="16" Offset="0x1D70" />
-        <Texture Name="object_ssh_Tex_001DF0" OutName="tex_001DF0" Format="ci8" Width="32" Height="32" Offset="0x1DF0" />
-        <Texture Name="object_ssh_Tex_0021F0" OutName="tex_0021F0" Format="ci8" Width="32" Height="32" Offset="0x21F0" />
-        <DList Name="object_ssh_DL_004E60" Offset="0x4E60" />
-        <DList Name="object_ssh_DL_005210" Offset="0x5210" />
-        <DList Name="object_ssh_DL_0056A0" Offset="0x56A0" />
-        <DList Name="object_ssh_DL_005850" Offset="0x5850" />
-        <DList Name="object_ssh_DL_005A08" Offset="0x5A08" />
-        <DList Name="object_ssh_DL_005AD0" Offset="0x5AD0" />
-        <DList Name="object_ssh_DL_005B98" Offset="0x5B98" />
-        <DList Name="object_ssh_DL_005C60" Offset="0x5C60" />
-        <DList Name="object_ssh_DL_005D28" Offset="0x5D28" />
-        <DList Name="object_ssh_DL_005DF0" Offset="0x5DF0" />
-        <DList Name="object_ssh_DL_005EB8" Offset="0x5EB8" />
-        <DList Name="object_ssh_DL_005F78" Offset="0x5F78" />
-        <DList Name="object_ssh_DL_0061D8" Offset="0x61D8" />
-        <Limb Name="object_ssh_Standardlimb_0062A0" Type="Standard" EnumName="OBJECT_SSH_LIMB_01" Offset="0x62A0" />
-        <Limb Name="object_ssh_Standardlimb_0062AC" Type="Standard" EnumName="OBJECT_SSH_LIMB_02" Offset="0x62AC" />
-        <Limb Name="object_ssh_Standardlimb_0062B8" Type="Standard" EnumName="OBJECT_SSH_LIMB_03" Offset="0x62B8" />
-        <Limb Name="object_ssh_Standardlimb_0062C4" Type="Standard" EnumName="OBJECT_SSH_LIMB_04" Offset="0x62C4" />
-        <Limb Name="object_ssh_Standardlimb_0062D0" Type="Standard" EnumName="OBJECT_SSH_LIMB_05" Offset="0x62D0" />
-        <Limb Name="object_ssh_Standardlimb_0062DC" Type="Standard" EnumName="OBJECT_SSH_LIMB_06" Offset="0x62DC" />
-        <Limb Name="object_ssh_Standardlimb_0062E8" Type="Standard" EnumName="OBJECT_SSH_LIMB_07" Offset="0x62E8" />
-        <Limb Name="object_ssh_Standardlimb_0062F4" Type="Standard" EnumName="OBJECT_SSH_LIMB_08" Offset="0x62F4" />
-        <Limb Name="object_ssh_Standardlimb_006300" Type="Standard" EnumName="OBJECT_SSH_LIMB_09" Offset="0x6300" />
-        <Limb Name="object_ssh_Standardlimb_00630C" Type="Standard" EnumName="OBJECT_SSH_LIMB_0A" Offset="0x630C" />
-        <Limb Name="object_ssh_Standardlimb_006318" Type="Standard" EnumName="OBJECT_SSH_LIMB_0B" Offset="0x6318" />
-        <Limb Name="object_ssh_Standardlimb_006324" Type="Standard" EnumName="OBJECT_SSH_LIMB_0C" Offset="0x6324" />
-        <Limb Name="object_ssh_Standardlimb_006330" Type="Standard" EnumName="OBJECT_SSH_LIMB_0D" Offset="0x6330" />
-        <Limb Name="object_ssh_Standardlimb_00633C" Type="Standard" EnumName="OBJECT_SSH_LIMB_0E" Offset="0x633C" />
-        <Limb Name="object_ssh_Standardlimb_006348" Type="Standard" EnumName="OBJECT_SSH_LIMB_0F" Offset="0x6348" />
-        <Limb Name="object_ssh_Standardlimb_006354" Type="Standard" EnumName="OBJECT_SSH_LIMB_10" Offset="0x6354" />
-        <Limb Name="object_ssh_Standardlimb_006360" Type="Standard" EnumName="OBJECT_SSH_LIMB_11" Offset="0x6360" />
-        <Limb Name="object_ssh_Standardlimb_00636C" Type="Standard" EnumName="OBJECT_SSH_LIMB_12" Offset="0x636C" />
-        <Limb Name="object_ssh_Standardlimb_006378" Type="Standard" EnumName="OBJECT_SSH_LIMB_13" Offset="0x6378" />
-        <Limb Name="object_ssh_Standardlimb_006384" Type="Standard" EnumName="OBJECT_SSH_LIMB_14" Offset="0x6384" />
-        <Limb Name="object_ssh_Standardlimb_006390" Type="Standard" EnumName="OBJECT_SSH_LIMB_15" Offset="0x6390" />
-        <Limb Name="object_ssh_Standardlimb_00639C" Type="Standard" EnumName="OBJECT_SSH_LIMB_16" Offset="0x639C" />
-        <Limb Name="object_ssh_Standardlimb_0063A8" Type="Standard" EnumName="OBJECT_SSH_LIMB_17" Offset="0x63A8" />
-        <Limb Name="object_ssh_Standardlimb_0063B4" Type="Standard" EnumName="OBJECT_SSH_LIMB_18" Offset="0x63B4" />
-        <Limb Name="object_ssh_Standardlimb_0063C0" Type="Standard" EnumName="OBJECT_SSH_LIMB_19" Offset="0x63C0" />
-        <Limb Name="object_ssh_Standardlimb_0063CC" Type="Standard" EnumName="OBJECT_SSH_LIMB_1A" Offset="0x63CC" />
-        <Limb Name="object_ssh_Standardlimb_0063D8" Type="Standard" EnumName="OBJECT_SSH_LIMB_1B" Offset="0x63D8" />
-        <Limb Name="object_ssh_Standardlimb_0063E4" Type="Standard" EnumName="OBJECT_SSH_LIMB_1C" Offset="0x63E4" />
-        <Limb Name="object_ssh_Standardlimb_0063F0" Type="Standard" EnumName="OBJECT_SSH_LIMB_1D" Offset="0x63F0" />
-        <Skeleton Name="object_ssh_Skel_006470" Type="Normal" LimbType="Standard" LimbNone="OBJECT_SSH_LIMB_NONE" LimbMax="OBJECT_SSH_LIMB_MAX" EnumName="ObjectSshLimb" Offset="0x6470" />
-        <Animation Name="object_ssh_Anim_006788" Offset="0x6788" />
-        <Animation Name="object_ssh_Anim_006D78" Offset="0x6D78" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_st.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_st.xml
deleted file mode 100644
index cbb01d3c5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_st.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<Root>
-    <File Name="object_st" Segment="6">
-        <Animation Name="object_st_Anim_000304" Offset="0x304" />
-        <Texture Name="object_st_Tex_000320" OutName="tex_000320" Format="i4" Width="16" Height="8" Offset="0x320" />
-        <Texture Name="object_st_Tex_000360" OutName="tex_000360" Format="rgba16" Width="16" Height="8" Offset="0x360" />
-        <Texture Name="object_st_Tex_000460" OutName="tex_000460" Format="rgba16" Width="8" Height="8" Offset="0x460" />
-        <Texture Name="object_st_Tex_0004E0" OutName="tex_0004E0" Format="i4" Width="16" Height="16" Offset="0x4E0" />
-        <Texture Name="object_st_Tex_000560" OutName="tex_000560" Format="rgba16" Width="16" Height="16" Offset="0x560" />
-        <Texture Name="object_st_Tex_000760" OutName="tex_000760" Format="rgba16" Width="8" Height="8" Offset="0x760" />
-        <Texture Name="object_st_Tex_0007E0" OutName="tex_0007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0" />
-        <DList Name="object_st_DL_001A40" Offset="0x1A40" />
-        <DList Name="object_st_DL_001C30" Offset="0x1C30" />
-        <DList Name="object_st_DL_001FD0" Offset="0x1FD0" />
-        <DList Name="object_st_DL_002068" Offset="0x2068" />
-        <DList Name="object_st_DL_002100" Offset="0x2100" />
-        <DList Name="object_st_DL_002198" Offset="0x2198" />
-        <DList Name="object_st_DL_002230" Offset="0x2230" />
-        <DList Name="object_st_DL_0022C8" Offset="0x22C8" />
-        <DList Name="object_st_DL_002360" Offset="0x2360" />
-        <DList Name="object_st_DL_0023F8" Offset="0x23F8" />
-        <Texture Name="object_st_Tex_002490" OutName="tex_002490" Format="i8" Width="8" Height="8" Offset="0x2490" />
-        <Texture Name="object_st_Tex_0024D0" OutName="tex_0024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0" />
-        <Texture Name="object_st_Tex_0025D0" OutName="tex_0025D0" Format="i4" Width="16" Height="16" Offset="0x25D0" />
-        <Texture Name="object_st_Tex_002650" OutName="tex_002650" Format="rgba16" Width="8" Height="8" Offset="0x2650" />
-        <!-- <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50" /> -->
-        <DList Name="object_st_DL_003FB0" Offset="0x3FB0" />
-        <DList Name="object_st_DL_0043D8" Offset="0x43D8" />
-        <DList Name="object_st_DL_0045C0" Offset="0x45C0" />
-        <DList Name="object_st_DL_004658" Offset="0x4658" />
-        <DList Name="object_st_DL_0046F0" Offset="0x46F0" />
-        <DList Name="object_st_DL_004788" Offset="0x4788" />
-        <DList Name="object_st_DL_004820" Offset="0x4820" />
-        <DList Name="object_st_DL_0048B8" Offset="0x48B8" />
-        <DList Name="object_st_DL_004950" Offset="0x4950" />
-        <DList Name="object_st_DL_0049E8" Offset="0x49E8" />
-        <DList Name="gSkulltulaTokenDL" Offset="0x4DB0" />
-        <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8" />
-        <Limb Name="object_st_Standardlimb_0050C8" Type="Standard" EnumName="OBJECT_ST_LIMB_01" Offset="0x50C8" />
-        <Limb Name="object_st_Standardlimb_0050D4" Type="Standard" EnumName="OBJECT_ST_LIMB_02" Offset="0x50D4" />
-        <Limb Name="object_st_Standardlimb_0050E0" Type="Standard" EnumName="OBJECT_ST_LIMB_03" Offset="0x50E0" />
-        <Limb Name="object_st_Standardlimb_0050EC" Type="Standard" EnumName="OBJECT_ST_LIMB_04" Offset="0x50EC" />
-        <Limb Name="object_st_Standardlimb_0050F8" Type="Standard" EnumName="OBJECT_ST_LIMB_05" Offset="0x50F8" />
-        <Limb Name="object_st_Standardlimb_005104" Type="Standard" EnumName="OBJECT_ST_LIMB_06" Offset="0x5104" />
-        <Limb Name="object_st_Standardlimb_005110" Type="Standard" EnumName="OBJECT_ST_LIMB_07" Offset="0x5110" />
-        <Limb Name="object_st_Standardlimb_00511C" Type="Standard" EnumName="OBJECT_ST_LIMB_08" Offset="0x511C" />
-        <Limb Name="object_st_Standardlimb_005128" Type="Standard" EnumName="OBJECT_ST_LIMB_09" Offset="0x5128" />
-        <Limb Name="object_st_Standardlimb_005134" Type="Standard" EnumName="OBJECT_ST_LIMB_0A" Offset="0x5134" />
-        <Limb Name="object_st_Standardlimb_005140" Type="Standard" EnumName="OBJECT_ST_LIMB_0B" Offset="0x5140" />
-        <Limb Name="object_st_Standardlimb_00514C" Type="Standard" EnumName="OBJECT_ST_LIMB_0C" Offset="0x514C" />
-        <Limb Name="object_st_Standardlimb_005158" Type="Standard" EnumName="OBJECT_ST_LIMB_0D" Offset="0x5158" />
-        <Limb Name="object_st_Standardlimb_005164" Type="Standard" EnumName="OBJECT_ST_LIMB_0E" Offset="0x5164" />
-        <Limb Name="object_st_Standardlimb_005170" Type="Standard" EnumName="OBJECT_ST_LIMB_0F" Offset="0x5170" />
-        <Limb Name="object_st_Standardlimb_00517C" Type="Standard" EnumName="OBJECT_ST_LIMB_10" Offset="0x517C" />
-        <Limb Name="object_st_Standardlimb_005188" Type="Standard" EnumName="OBJECT_ST_LIMB_11" Offset="0x5188" />
-        <Limb Name="object_st_Standardlimb_005194" Type="Standard" EnumName="OBJECT_ST_LIMB_12" Offset="0x5194" />
-        <Limb Name="object_st_Standardlimb_0051A0" Type="Standard" EnumName="OBJECT_ST_LIMB_13" Offset="0x51A0" />
-        <Limb Name="object_st_Standardlimb_0051AC" Type="Standard" EnumName="OBJECT_ST_LIMB_14" Offset="0x51AC" />
-        <Limb Name="object_st_Standardlimb_0051B8" Type="Standard" EnumName="OBJECT_ST_LIMB_15" Offset="0x51B8" />
-        <Limb Name="object_st_Standardlimb_0051C4" Type="Standard" EnumName="OBJECT_ST_LIMB_16" Offset="0x51C4" />
-        <Limb Name="object_st_Standardlimb_0051D0" Type="Standard" EnumName="OBJECT_ST_LIMB_17" Offset="0x51D0" />
-        <Limb Name="object_st_Standardlimb_0051DC" Type="Standard" EnumName="OBJECT_ST_LIMB_18" Offset="0x51DC" />
-        <Limb Name="object_st_Standardlimb_0051E8" Type="Standard" EnumName="OBJECT_ST_LIMB_19" Offset="0x51E8" />
-        <Limb Name="object_st_Standardlimb_0051F4" Type="Standard" EnumName="OBJECT_ST_LIMB_1A" Offset="0x51F4" />
-        <Limb Name="object_st_Standardlimb_005200" Type="Standard" EnumName="OBJECT_ST_LIMB_1B" Offset="0x5200" />
-        <Limb Name="object_st_Standardlimb_00520C" Type="Standard" EnumName="OBJECT_ST_LIMB_1C" Offset="0x520C" />
-        <Limb Name="object_st_Standardlimb_005218" Type="Standard" EnumName="OBJECT_ST_LIMB_1D" Offset="0x5218" />
-        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" LimbNone="OBJECT_ST_LIMB_NONE" LimbMax="OBJECT_ST_LIMB_MAX" EnumName="ObjectStLimb" Offset="0x5298" />
-        <Animation Name="object_st_Anim_0055A8" Offset="0x55A8" />
-        <Animation Name="object_st_Anim_005B98" Offset="0x5B98" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sth.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sth.xml
deleted file mode 100644
index 53040ae05..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_sth.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <!-- Assets for the guy looking up at the moon, and the guy you find in Spider Houses. -->
-    <!-- This object is almost a copy of object_boj, with the animations removed -->
-    <File Name="object_sth" Segment="6">
-
-        <!-- Unused copy of head from object_boj (Juggler). -->
-        <Array Name="gSthUnusedHeadVtx" Count="83" Offset="0x0">
-            <Vtx/>
-        </Array>
-
-        <DList Name="gSthHeadDL" Offset="0x1C30" />
-        <DList Name="gSthRightHandDL" Offset="0x1C38" />
-        <DList Name="gSthRightForearmDL" Offset="0x1D80" />
-        <DList Name="gSthRightUpperArmDL" Offset="0x1E88" />
-        <DList Name="gSthLeftHandDL" Offset="0x1F90" />
-        <DList Name="gSthLeftForearmDL" Offset="0x20D8" />
-        <DList Name="gSthLeftUpperArmDL" Offset="0x21E0" />
-        <DList Name="gSthTorsoDL" Offset="0x22E8" />
-        <DList Name="gSthRightFootDL" Offset="0x24C0" />
-        <DList Name="gSthRightShinDL" Offset="0x25D8" />
-        <DList Name="gSthRightThighDL" Offset="0x26E8" />
-        <DList Name="gSthLeftFootDL" Offset="0x27F0" />
-        <DList Name="gSthLeftShinDL" Offset="0x2908" />
-        <DList Name="gSthLeftThighDL" Offset="0x2A18" />
-        <DList Name="gSthPelvisDL" Offset="0x2B20" />
-
-        <Texture Name="gSthTLUT" OutName="sth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2D08" />
-        <Texture Name="gSthSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x2F08" />
-        <Texture Name="gSthFingerTex" OutName="figer" Format="ci8" Width="8" Height="8" Offset="0x2F48" />
-        <!-- Shirt and pants get painted with color in the draw func. -->
-        <Texture Name="gSthShirtTex" OutName="shirt" Format="i8" Width="16" Height="16" Offset="0x2F88" />
-        <Texture Name="gSthBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0x3088" />
-        <Texture Name="gSthPantsTex" OutName="pants" Format="i8" Width="8" Height="8" Offset="0x30C8" />
-      
-        <Limb Name="gSthPelvisLimb" Type="Standard" EnumName="STH_LIMB_PELVIS" Offset="0x3108" />
-        <Limb Name="gSthLeftThighLimb" Type="Standard" EnumName="STH_LIMB_LEFT_THIGH" Offset="0x3114" />
-        <Limb Name="gSthLeftShinLimb" Type="Standard" EnumName="STH_LIMB_LEFT_SHIN" Offset="0x3120" />
-        <Limb Name="gSthLeftFootLimb" Type="Standard" EnumName="STH_LIMB_LEFT_FOOT" Offset="0x312C" />
-        <Limb Name="gSthRightThighLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_THIGH" Offset="0x3138" />
-        <Limb Name="gSthRightShinLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_SHIN" Offset="0x3144" />
-        <Limb Name="gSthRightFootLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_FOOT" Offset="0x3150" />
-        <Limb Name="gSthTorsoLimb" Type="Standard" EnumName="STH_LIMB_CHEST" Offset="0x315C" />
-        <Limb Name="gSthLeftUpperArmLimb" Type="Standard" EnumName="STH_LIMB_LEFT_UPPER_ARM" Offset="0x3168" />
-        <Limb Name="gSthLeftForearmLimb" Type="Standard" EnumName="STH_LIMB_LEFT_FOREARM" Offset="0x3174" />
-        <Limb Name="gSthLeftHandLimb" Type="Standard" EnumName="STH_LIMB_LEFT_HAND" Offset="0x3180" />
-        <Limb Name="gSthRightUpperArmLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_UPPER_ARM" Offset="0x318C" />
-        <Limb Name="gSthRightForearmLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_FOREARM" Offset="0x3198" />
-        <Limb Name="gSthRightHandLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_HAND" Offset="0x31A4" />
-        <!-- EnSth2 uses this head, EnSth1 has a replacement head embedded in its overlay. -->
-        <Limb Name="gSthHeadLimb" Type="Standard" EnumName="STH_LIMB_HEAD" Offset="0x31B0" />
-        <Skeleton Name="gSthSkel" Type="Flex" LimbType="Standard" LimbNone="STH_LIMB_NONE" LimbMax="STH_LIMB_MAX" EnumName="ObjectSthLimb" Offset="0x31F8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stk.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stk.xml
deleted file mode 100644
index eccbbb3a1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stk.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<Root>
-    <!-- Assets for Skull Kid, including a small number of animations. Most animations are in object_stk2 and object_stk3. -->
-    <File Name="object_stk" Segment="6">
-        <Animation Name="gSkullKidLookAroundAnim" Offset="0x1030" /> <!-- Original name is "kyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="gSkullKidCallDownMoonStartAnim" Offset="0x2774" /> <!-- Original name is "sk_moon_hikiyose" ("draw or pull the moon") -->
-        <Animation Name="gSkullKidCallDownMoonLoopAnim" Offset="0x3068" /> <!-- Original name is "sk_moon_hikiyose_loop" -->
-
-        <!-- DisplayLists for an unused Link Mask -->
-        <DList Name="gSkullKidLinkMask1DL" Offset="0x39A0" />
-        <DList Name="gSkullKidLinkMask2DL" Offset="0x46B0" />
-        <DList Name="gSkullKidLinkMask3DL" Offset="0x53C0" />
-
-        <!-- Majora's Mask Eyes DisplayList and Texture -->
-        <DList Name="gSkullKidMajorasMaskEyesDL" Offset="0x5870" />
-        <Texture Name="gSkullKidMajorasMaskEyeTex" OutName="skull_kid_majoras_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x5920" />
-
-        <!-- DisplayLists for Majora's Mask -->
-        <DList Name="gSkullKidMajorasMask1DL" Offset="0x6BB0" />
-        <DList Name="gSkullKidMajorasMask2DL" Offset="0x79F0" />
-
-        <!-- Unused Eyes DisplayList and Texture -->
-        <DList Name="gSkullKidUnusedEyesDL" Offset="0x7E10" />
-        <Texture Name="gSkullKidUnusedEyeTex" OutName="skull_kid_unused_eye" Format="rgba16" Width="8" Height="8" Offset="0x7EA0" /> <!-- Duplicate of gSkullKidEyeTex -->
-
-        <!-- Various Hand DisplayLists -->
-        <DList Name="gSkullKidUntexturedLeftHandDL" Offset="0x84C0" />
-        <DList Name="gSkullKidOpenLeftHandDL" Offset="0x87B0" />
-        <DList Name="gSkullKidFluteHoldingLeftHandDL" Offset="0x8A80" />
-        <DList Name="gSkullKidTwoFingersExtendedLeftHandDL" Offset="0x90C0" />
-        <DList Name="gSkullKidMaskHoldingRightHandDL" Offset="0x9710" />
-        <DList Name="gSkullKidUntexturedRightHandDL" Offset="0x9AC0" />
-        <DList Name="gSkullKidOcarinaHoldingRightHandDL" Offset="0x9DA0" />
-
-        <!-- Head DisplayLists with two different expressions -->
-        <DList Name="gSkullKidNormalEyesDL" Offset="0xA530" />
-        <DList Name="gSkullKidNormalHeadDL" Offset="0xA5C0" />
-        <DList Name="gSkullKidLaughingEyesDL" Offset="0xAE30" />
-        <DList Name="gSkullKidLaughingHeadDL" Offset="0xAEC0" />
-
-        <Animation Name="gSkullKidTelescopeLookUpStartAnim" Offset="0xBB2C" /> <!-- Original name is "stk_miageru" ("look up") -->
-        <Animation Name="gSkullKidTelescopeLookUpLoopAnim" Offset="0xC964" /> <!-- Original name is "stk_miageru_loop" -->
-        <DList Name="gSkullKidOcarinaOfTimeDL" Offset="0xCAD0" />
-        <Animation Name="gSkullKidTPoseAnim" Offset="0xCC94" /> <!-- Original name is "stk_pause" -->
-
-        <!-- Skull Kid Limb DisplayLists -->
-        <DList Name="gSkullKidTorsoDL" Offset="0xF6F0" />
-        <DList Name="gSkullKidNeckDL" Offset="0xF8B8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gSkullKidHeadWithLipsDL" Offset="0xF908" /> <!-- Unused in the final game. Has lips instead of beak, similar to how he looks in OoT. -->
-        <DList Name="gSkullKidHatBrimDL" Offset="0xFA78" />
-        <DList Name="gSkullKidHatRingsDL" Offset="0xFBD0" />
-        <DList Name="gSkullKidHatNarrowSectionDL" Offset="0xFCE8" />
-        <DList Name="gSkullKidHatTopDL" Offset="0xFDF8" />
-        <DList Name="gSkullKidRightUpperArmDL" Offset="0xFF30" />
-        <DList Name="gSkullKidRightForearmDL" Offset="0x10230" />
-        <DList Name="gSkullKidRightHandDL" Offset="0x10428" />
-        <DList Name="gSkullKidLeftUpperArmDL" Offset="0x10560" />
-        <DList Name="gSkullKidLeftForearmDL" Offset="0x10868" />
-        <DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x10A50" />
-        <DList Name="gSkullKidPelvisDL" Offset="0x10C60" />
-        <DList Name="gSkullKidLeftThighDL" Offset="0x10E30" />
-        <DList Name="gSkullKidLeftShinDL" Offset="0x11080" />
-        <DList Name="gSkullKidLeftFootDL" Offset="0x111A8" />
-        <DList Name="gSkullKidRightThighDL" Offset="0x112F0" />
-        <DList Name="gSkullKidRightShinDL" Offset="0x11560" />
-        <DList Name="gSkullKidRightFootDL" Offset="0x11688" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gSkullKidEmptyTexAnim" Offset="0x117D0" />
-
-        <!-- Skull Kid Textures -->
-        <Texture Name="gSkullKidClothingFringeTex" OutName="skull_kid_clothing_fringe" Format="rgba16" Width="32" Height="16" Offset="0x117D8" />
-        <Texture Name="gSkullKidRingTex" OutName="skull_kid_ring" Format="rgba16" Width="32" Height="16" Offset="0x11BD8" />
-        <Texture Name="gSkullKidOoTStyleMouthTex" OutName="skull_kid_oot_style_mouth" Format="rgba16" Width="16" Height="16" Offset="0x11FD8" />
-        <Texture Name="gSkullKidPantsAndWristsTex" OutName="skull_kid_pants_and_wrists" Format="rgba16" Width="16" Height="16" Offset="0x121D8" />
-        <Texture Name="gSkullKidSkinTex" OutName="skull_kid_skin" Format="rgba16" Width="16" Height="16" Offset="0x123D8" />
-        <Texture Name="gSkullKidShawlTex" OutName="skull_kid_shawl" Format="rgba16" Width="32" Height="32" Offset="0x125D8" />
-        <Texture Name="gSkullKidShoeTex" OutName="skull_kid_shoe" Format="rgba16" Width="32" Height="16" Offset="0x12DD8" />
-
-        <!-- Skull Kid Limbs -->
-        <Limb Name="gSkullKidRootLimb" Type="Standard" EnumName="SKULL_KID_LIMB_ROOT" Offset="0x131D8" />
-        <Limb Name="gSkullKidPelvisLimb" Type="Standard" EnumName="SKULL_KID_LIMB_PELVIS" Offset="0x131E4" />
-        <Limb Name="gSkullKidRightThighLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_THIGH" Offset="0x131F0" />
-        <Limb Name="gSkullKidRightShinLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_SHIN" Offset="0x131FC" />
-        <Limb Name="gSkullKidRightFootLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_FOOT" Offset="0x13208" />
-        <Limb Name="gSkullKidLeftThighLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_THIGH" Offset="0x13214" />
-        <Limb Name="gSkullKidLeftShinLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_SHIN" Offset="0x13220" />
-        <Limb Name="gSkullKidLeftFootLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_FOOT" Offset="0x1322C" />
-        <Limb Name="gSkullKidTorsoLimb" Type="Standard" EnumName="SKULL_KID_LIMB_TORSO" Offset="0x13238" />
-        <Limb Name="gSkullKidLeftUpperArmLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_UPPER_ARM" Offset="0x13244" />
-        <Limb Name="gSkullKidLeftForearmLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_FOREARM" Offset="0x13250" />
-        <Limb Name="gSkullKidLeftHandLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_HAND" Offset="0x1325C" />
-        <Limb Name="gSkullKidRightUpperArmLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_UPPER_ARM" Offset="0x13268" />
-        <Limb Name="gSkullKidRightForearmLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_FOREARM" Offset="0x13274" />
-        <Limb Name="gSkullKidRightHandLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_HAND" Offset="0x13280" />
-        <Limb Name="gSkullKidNeckLimb" Type="Standard" EnumName="SKULL_KID_LIMB_NECK" Offset="0x1328C" />
-        <Limb Name="gSkullKidHeadLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HEAD" Offset="0x13298" />
-        <Limb Name="gSkullKidHatBrimLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HAT_BRIM" Offset="0x132A4" />
-        <Limb Name="gSkullKidHatRingsLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HAT_RINGS" Offset="0x132B0" />
-        <Limb Name="gSkullKidHatNarrowSectionLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HAT_NARROW_SECTION" Offset="0x132BC" />
-        <Limb Name="gSkullKidHatTopLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HAT_TOP" Offset="0x132C8" />
-
-        <!-- Skull Kid Skeleton -->
-        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" LimbNone="SKULL_KID_LIMB_NONE" LimbMax="SKULL_KID_LIMB_MAX" EnumName="SkullKidLimb" Offset="0x13328" />
-
-        <Animation Name="gSkullKidHipShakeAndJumpAnim" Offset="0x14920" /> <!-- Original name is "stk_penpen_jump" ("spanking") -->
-        <Animation Name="gSkullKidSpankAnim" Offset="0x15028" /> <!-- Original name is "stk_penpen_loop" -->
-        <Animation Name="gSkullKidBentOverHeadTwitchAnim" Offset="0x15C14" /> <!-- Original name is "stk_rari_loop" -->
-        <Animation Name="gSkullKidBentOverLookUpAnim" Offset="0x16508" /> <!-- Original name is "stk_rarimiage" -->
-
-        <DList Name="gSkullKidFluteDL" Offset="0x16620" />
-
-        <Texture Name="gSkullKidLinkMaskEyeTex" OutName="skull_kid_link_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x16720" />
-        <Texture Name="gSkullKidLinkMaskNoseTex" OutName="skull_kid_link_mask_nose" Format="rgba16" Width="16" Height="8" Offset="0x16F20" />
-        <Texture Name="gSkullKidLinkMaskMouthTex" OutName="skull_kid_link_mask_mouth" Format="rgba16" Width="32" Height="16" Offset="0x17020" />
-        <Texture Name="gSkullKidLinkMaskHairTex" OutName="skull_kid_link_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x17420" />
-        <Texture Name="gSkullKidLinkMaskHatTex" OutName="skull_kid_link_mask_hat" Format="rgba16" Width="8" Height="16" Offset="0x17620" />
-        <Texture Name="gSkullKidLinkMaskEarTex" OutName="skull_kid_link_mask_ear" Format="rgba16" Width="16" Height="16" Offset="0x17720" />
-        <Texture Name="gSkullKidUnusedMajorasMaskEyeTex" OutName="skull_kid_unused_majoras_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x17920" /> <!-- Duplicate of gSkullKidMajorasMaskEyeTex -->
-        <Texture Name="gSkullKidMajorasMaskFaceTex" OutName="skull_kid_majoras_mask_face" Format="rgba16" Width="32" Height="64" Offset="0x18120" />
-        <Texture Name="gSkullKidMajorasMaskSpikes1Tex" OutName="skull_kid_majoras_mask_spikes_1" Format="rgba16" Width="16" Height="16" Offset="0x19120" />
-        <Texture Name="gSkullKidMajorasMaskSpikes2Tex" OutName="skull_kid_majoras_mask_spikes_2" Format="rgba16" Width="16" Height="16" Offset="0x19320" />
-        <Texture Name="gSkullKidMajorasMaskSpikes3Tex" OutName="skull_kid_majoras_mask_spikes_3" Format="rgba16" Width="16" Height="16" Offset="0x19520" />
-        <Texture Name="gSkullKidMajorasMaskSpikes4Tex" OutName="skull_kid_majoras_mask_spikes_4" Format="rgba16" Width="16" Height="16" Offset="0x19720" />
-        <Texture Name="gSkullKidMajorasMaskBackTex" OutName="skull_kid_majoras_mask_back" Format="rgba16" Width="32" Height="32" Offset="0x19920" />
-        <Texture Name="gSkullKidUnusedEye2Tex" OutName="skull_kid_unused_eye2" Format="rgba16" Width="8" Height="8" Offset="0x1A120" /> <!-- Duplicate of gSkullKidEyeTex -->
-        <Texture Name="gSkullKidHandTex" OutName="skull_kid_hand" Format="rgba16" Width="16" Height="32" Offset="0x1A1A0" />
-        <Texture Name="gSkullKidEyeTex" OutName="skull_kid_eye" Format="rgba16" Width="8" Height="8" Offset="0x1A5A0" />
-        <Texture Name="gSkullKidBeakTex" OutName="skull_kid_beak" Format="rgba16" Width="16" Height="16" Offset="0x1A620" />
-        <Texture Name="gSkullKidHeadSkinTex" OutName="skull_kid_head_skin" Format="rgba16" Width="16" Height="16" Offset="0x1A820" />
-        <Texture Name="gSkullKidOcarinaOfTimeTex" OutName="skull_kid_ocarina_of_time" Format="rgba16" Width="32" Height="16" Offset="0x1AA20" />
-        <Texture Name="gSkullKidFluteTex" OutName="skull_kid_flute" Format="rgba16" Width="8" Height="8" Offset="0x1AE20" />
-        <Texture Name="gSkullKidFluteHoleTex" OutName="skull_kid_flute_hole" Format="ia16" Width="16" Height="8" Offset="0x1AEA0" />
-
-        <Animation Name="gSkullKidShakeHeadAnim" Offset="0x1C21C" /> <!-- Original name is "wait_1" -->
-        <Animation Name="gSkullKidIdleAnim" Offset="0x1D008" /> <!-- Original name is "wait_2" -->
-        <Animation Name="gSkullKidWalkAnim" Offset="0x1D3D0" /> <!-- Original name is "walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stk2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stk2.xml
deleted file mode 100644
index d526bbc5c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stk2.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<Root>
-    <!-- Most of Skull Kid's animations, as well as assets for his curse effects and the Ocarina in the Clock Tower. -->
-    <File Name="object_stk2" Segment="6">
-        <!-- Skull Kid Animations -->
-        <Animation Name="gSkullKidCurseStartAnim" Offset="0x55C" /> <!-- Original name is "kubi_katakata" ("neck clack/rattle") -->
-        <!-- <Blob Name="object_stk2_Blob_00056C" Size="0x24" Offset="0x56C" /> -->
-        <Animation Name="gSkullKidCurseLoopAnim" Offset="0x130C" /> <!-- Original name is "kubi_katakata_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_00131C" Size="0x54" Offset="0x131C" /> -->
-        <Animation Name="gSkullKidHorseRideStartAnim" Offset="0x35C8" /> <!-- Original name is "lost_horse" -->
-        <Animation Name="gSkullKidHorseRideAndRotateAnim" Offset="0x4580" /> <!-- Original name is "lost_horse2" -->
-        <!-- <Blob Name="object_stk2_Blob_004590" Size="0x50" Offset="0x4590" /> -->
-        <Animation Name="gSkullKidHorseRideLoopAnim" Offset="0x49C8" /> <!-- Original name is "lost_horse_wait" -->
-        <Animation Name="gSkullKidGlitchyHorseRideStartAnim" Offset="0x70DC" /> <!-- Original name is "lost_house" -->
-
-        <!-- Assets for the curse effect overlayed on top of Majora's Mask when Skull Kid curses Link -->
-        <DList Name="gSkullKidMajorasMaskCurseOverlayDL" Offset="0x7840" />
-        <Texture Name="gSkullKidMajorasMaskCurseOverlayMaskTex" OutName="skull_kid_majoras_mask_curse_overlay_mask" Format="i8" Width="32" Height="32" Offset="0x7A48" />
-        <Texture Name="gSkullKidMajorasMaskCurseOverlayElectricityTex" OutName="skull_kid_majoras_mask_curse_overlay_electricity" Format="i8" Width="32" Height="64" Offset="0x7E48" />
-        <TextureAnimation Name="gSkullKidMajorasMaskCurseOverlayTexAnim" Offset="0x8658" />
-
-        <!-- Assets for the effects displayed on the sides of the screen when Skull Kid curses Link or calls down the moon -->
-        <DList Name="object_stk2_DL_008920" Offset="0x8920" />
-        <DList Name="object_stk2_DL_008A38" Offset="0x8A38" />
-        <Texture Name="object_stk2_Tex_008B50" OutName="tex_008B50" Format="i8" Width="32" Height="64" Offset="0x8B50" />
-        <Texture Name="object_stk2_Tex_009350" OutName="tex_009350" Format="i8" Width="32" Height="32" Offset="0x9350" />
-        <Texture Name="object_stk2_Tex_009750" OutName="tex_009750" Format="i8" Width="32" Height="64" Offset="0x9750" />
-        <TextureAnimation Name="object_stk2_Matanimheader_009F60" Offset="0x9F60" />
-
-        <!-- Clock Tower Ocarina Animations -->
-        <Animation Name="gClockTowerOcarinaOfTimeFallAnim" Offset="0xA104" /> <!-- Original name is "ok_otosu" ("to fall") -->
-        <Animation Name="gClockTowerOcarinaOfTimeHitGroundAnim" Offset="0xA2BC" /> <!-- Original name is "ok_rakka" ("falling down (from a high place)") -->
-        <Animation Name="gClockTowerOcarinaOfTimeTurnAroundAnim" Offset="0xA4C4" /> <!-- Original name is "ok_skypon" ("pon" = onomatopoeic for lightly hitting something, probably representing the sound that plays) -->
-        <Animation Name="gClockTowerOcarinaOfTimeJuggleAnim" Offset="0xA6D4" /> <!-- Original name is "ok_skypon_loop" -->
-
-        <!-- Clock Tower Ocarina Limb DisplayLists -->
-        <DList Name="gClockTowerOcarinaOfTimeDL" Offset="0xA840" />
-
-        <!-- Clock Tower Ocarina Textures -->
-        <Texture Name="gClockTowerOcarinaOfTimeTex" OutName="clock_tower_ocarina_of_time" Format="rgba16" Width="32" Height="16" Offset="0xA958" />
-
-        <!-- Clock Tower Ocarina Limbs -->
-        <Limb Name="gClockTowerOcarinaOfTimeRootLimb" Type="Standard" EnumName="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_ROOT" Offset="0xAD58" />
-
-        <!-- Clock Tower Ocarina Skeleton -->
-        <Skeleton Name="gClockTowerOcarinaOfTimeSkel" Type="Flex" LimbType="Standard" LimbNone="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_NONE" LimbMax="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_MAX" EnumName="ClockTowerOcarinaOfTimeLimb" Offset="0xAD68" />
-
-        <!-- Skull Kid Animations -->
-        <Animation Name="gSkullKidLaughStartAnim" Offset="0xC270" /> <!-- Original name is "oowarai" ("laughing loudly") -->
-        <!-- <Blob Name="object_stk2_Blob_00C280" Size="0x60" Offset="0xC280" /> -->
-        <Animation Name="gSkullKidLaughLoopAnim" Offset="0xCBB8" /> <!-- Original name is "oowarai_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_00CBC8" Size="0x28" Offset="0xCBC8" /> -->
-        <Animation Name="gSkullKidRecliningFloatAnim" Offset="0xD830" /> <!-- Original name is "situkoi_wait" ("being stubborn or persistant" or "being fixated on something, obsession") -->
-        <!-- <Blob Name="object_stk2_Blob_00D840" Size="0x50" Offset="0xD840" /> -->
-        <Animation Name="gSkullKidHoldHeadAndShakeStartAnim" Offset="0xE6EC" /> <!-- Original name is "sk_atama" ("head") -->
-        <Animation Name="gSkullKidHoldHeadAndShakeLoopAnim" Offset="0xEEC0" /> <!-- Original name is "sk_atama_loop" -->
-        <Animation Name="gSkullKidSmackFairyStartAnim" Offset="0x101A4" /> <!-- Original name is "sk_elf_hataku" ("elf hit/smack/strike") -->
-        <Animation Name="gSkullKidSmackFairyLoopAnim" Offset="0x10B60" /> <!-- Original name is "sk_elf_hataku_loop" -->
-        <Animation Name="gSkullKidSurpriseStartAnim" Offset="0x110B4" /> <!-- Original name is "sk_koe_kizuku" ("become aware of a voice") -->
-        <Animation Name="gSkullKidSurpriseLoopAnim" Offset="0x11FB0" /> <!-- Original name is "sk_koe_kizuku_loop" -->
-        <Animation Name="gSkullKidLookAroundForGiantsStartAnim" Offset="0x12A58" /> <!-- Original name is "sk_kyojin_sagasu" ("searching for giants") -->
-        <Animation Name="gSkullKidLookAroundForGiantsLoopAnim" Offset="0x141E4" /> <!-- Original name is "sk_kyojin_sagasu_loop" -->
-        <Animation Name="gSkullKidPickUpOcarinaAndStartPlayingAnim" Offset="0x16910" /> <!-- Original name is "sk_ok_fuku" ("playing ocarina") -->
-        <!-- <Blob Name="object_stk2_Blob_016920" Size="0xC0" Offset="0x16920" /> -->
-        <Animation Name="gSkullKidPlayOcarinaAndLaughAnim" Offset="0x18ED0" /> <!-- Original name is "sk_ok_fuku_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_018EE0" Size="0xC0" Offset="0x18EE0" /> -->
-        <Animation Name="gSkullKidHideOcarinaStartAnim" Offset="0x1AA80" /> <!-- Original name is "sk_ok_kakusu" ("hiding/concealing ocarina") -->
-        <Animation Name="gSkullKidJumpWhileHidingOcarinaAnim" Offset="0x1C114" /> <!-- Original name is "sk_ok_kakusu_jump" -->
-        <!-- <Blob Name="object_stk2_Blob_01C124" Size="0x6C" Offset="0x1C124" /> -->
-        <Animation Name="gSkullKidHideOcarinaLoopAnim" Offset="0x1D07C" /> <!-- Original name is "sk_ok_kakusu_wait" -->
-        <Animation Name="gSkullKidPickUpOcarinaAnim" Offset="0x1DDE0" /> <!-- Original name is "sk_ok_miru" ("looking at/seeing the ocarina") -->
-        <!-- <Blob Name="object_stk2_Blob_01DDF0" Size="0x40" Offset="0x1DDF0" /> -->
-        <Animation Name="gSkullKidLookAtOcarinaAnim" Offset="0x1EF50" /> <!-- Original name is "sk_ok_miru_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_01EF60" Size="0x50" Offset="0x1EF60" /> -->
-        <Animation Name="gSkullKidDropOcarinaAnim" Offset="0x1F9E4" /> <!-- Original name is "sk_ok_otosu" ("dropping the ocarina") -->
-        <Animation Name="gSkullKidPlayOcarinaWhileFloatingAnim" Offset="0x20CAC" /> <!-- Original name is "sk_ok_skyplay" -->
-        <Animation Name="gSkullKidFloatingTurnAroundAnim" Offset="0x2200C" /> <!-- Original name is "sk_ok_skypon" ("pon" = onomatopoeic for lightly hitting something, probably representing the sound that plays) -->
-        <Animation Name="gSkullKidOcarinaJuggleAnim" Offset="0x2336C" /> <!-- Original name is "sk_ok_skypon_loop" -->
-        <Animation Name="gSkullKidRaiseMaskStartAnim" Offset="0x259F4" /> <!-- Original name is "sk_omenage" ("mask raise") -->
-        <!-- <Blob Name="object_stk2_Blob_025A04" Size="0xCC" Offset="0x25A04" /> -->
-        <Animation Name="gSkullKidRaiseMaskLoopAnim" Offset="0x266C8" /> <!-- Original name is "sk_omenage_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_0266D8" Size="0x48" Offset="0x266D8" /> -->
-        <Animation Name="gSkullKidLowerMaskAnim" Offset="0x26CF4" /> <!-- Original name is "sk_omensage" ("mask lower") -->
-        <!-- <Blob Name="object_stk2_Blob_026D04" Size="0x1C" Offset="0x26D04" /> -->
-        <Animation Name="gSkullKidHoldHeadAndScreamStartAnim" Offset="0x27CF4" /> <!-- Original name is "sk_sakebu" ("letting out a loud voice") -->
-        <Animation Name="gSkullKidHoldHeadAndScreamLoopAnim" Offset="0x28F28" /> <!-- Original name is "sk_sakebu_loop" -->
-        <Animation Name="gSkullKidFloatingArmsCrossedAnim" Offset="0x29A04" /> <!-- Original name is "sk_sky_taiki" ("standing by") -->
-        <Animation Name="gSkullKidHitByBubbleAnim" Offset="0x2A2D8" /> <!-- Original name is "sk_syabon_otosu" ("bubble fall") -->
-        <Animation Name="gSkullKidDeflectAttackAnim" Offset="0x2AD54" /> <!-- Original name is "sk_sybonn_hajiku" ("bubble repel") -->
-        <Animation Name="gSkullKidKickOverLinkAnim" Offset="0x2DC64" /> <!-- Original name is "sk_uragaesu" ("turn over") -->
-        <!-- <Blob Name="object_stk2_Blob_02DC74" Size="0xDC" Offset="0x2DC74" /> -->
-        <Animation Name="gSkullKidSearchLinkAnim" Offset="0x2E9A0" /> <!-- Original name is "sk_uragaesu_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_02E9B0" Size="0x40" Offset="0x2E9B0" /> -->
-        <Animation Name="gSkullKidPlayFluteAnim" Offset="0x2FA70" /> <!-- Original name is "stk_fue_loop" ("flute") -->
-        <Animation Name="gSkullKidShiverAnim" Offset="0x3021C" /> <!-- Original name is "stk_furueru" ("to shiver/tremble") -->
-        <Animation Name="gSkullKidSearchMaskSalesmanAnim" Offset="0x31210" /> <!-- Original name is "stk_gosogoso" (onomatopoeic for "objects rubbing together, rustling") -->
-        <Animation Name="gSkullKidHoldUpMaskStartAnim" Offset="0x322FC" /> <!-- Original name is "stk_kakageru" ("holding up/hoisting something") -->
-        <Animation Name="gSkullKidHoldUpMaskLoopAnim" Offset="0x32AE0" /> <!-- Original name is "stk_kakageru_loop" -->
-        <Animation Name="gSkullKidHuddleWithFairiesAnim" Offset="0x3323C" /> <!-- Original name is "stk_miwoyoseau" ("huddling next to others to keep warm") -->
-        <Animation Name="gSkullKidDroppedFromMaskAnim" Offset="0x34FD8" /> <!-- Original name is "stk_rakka" ("falling down (from a high place)") -->
-        <Animation Name="gSkullKidDrawAnim" Offset="0x36964" /> <!-- Original name is "stk_rakugaki" ("graffiti") -->
-        <Animation Name="gSkullKidCartwheelAnim" Offset="0x37B94" /> <!-- Original name is "stk_sokuten" ("cartwheel") -->
-        <Animation Name="gSkullKidDangleFromMaskStartAnim" Offset="0x3967C" /> <!-- Original name is "stk_tyubura" ("to dangle in midair") -->
-        <Animation Name="gSkullKidDangleFromMaskLoopAnim" Offset="0x3A8F8" /> <!-- Original name is "stk_tyubura_loop" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stk3.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stk3.xml
deleted file mode 100644
index 7b45bf201..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stk3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Animations for Skull Kid for the game's ending. -->
-    <File Name="object_stk3" Segment="6">
-        <Animation Name="gSkullKidSniffAnim" Offset="0x1374" /> <!-- Original name is "stk_kaoyose" ("face close") -->
-        <Animation Name="gSkullKidLaughAfterSniffAnim" Offset="0x1EDC" /> <!-- Original name is "stk_kaoyose_loop" -->
-        <Animation Name="gSkullKidAshamedStartAnim" Offset="0x2CD8" /> <!-- Original name is "stk_kataf" (maybe a shortened combination of "rattle" and "tremble"?) -->
-        <Animation Name="gSkullKidAshamedLoopAnim" Offset="0x39F0" /> <!-- Original name is "stk_kataf_loop" -->
-        <Animation Name="gSkullKidLookLeftStartAnim" Offset="0x4554" /> <!-- Original name is "stk_migim" ("face right", which is correct if looking at Skull Kid) -->
-        <Animation Name="gSkullKidLookLeftLoopAnim" Offset="0x51C0" /> <!-- Original name is "stk_migim_loop" -->
-        <Animation Name="gSkullKidLookUpAtGiantsAnim" Offset="0x5F44" /> <!-- Original name is "stk_uemuki" ("facing up") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stream.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stream.xml
deleted file mode 100644
index 2e49af916..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_stream.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Used for the unused water vortex actor. -->
-    <File Name="object_stream" Segment="6">
-        <Texture Name="gWaterVortexTex" OutName="water_vortex" Format="i4" Width="64" Height="64" Offset="0x0" />
-        <DList Name="gWaterVortexDL" Offset="0x950" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_syokudai.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_syokudai.xml
deleted file mode 100644
index 84b9c8bca..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_syokudai.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="assets/objects/gameplay_dangeon_keep/"/>
-    <File Name="object_syokudai" Segment="6">
-        <DList Name="gObjectSyokudaiTypeSwitchCausesFlameDL" Offset="0x3A0" />
-        <DList Name="gObjectSyokudaiTypeNoSwitchDL" Offset="0x870" />
-        <DList Name="gObjectSyokudaiTypeFlameCausesSwitchDL" Offset="0xB90" />
-        <Texture Name="object_syokudai_Tex_000C90" OutName="tex_000C90" Format="rgba16" Width="32" Height="32" Offset="0xC90" />
-        <Texture Name="object_syokudai_Tex_001490" OutName="tex_001490" Format="rgba16" Width="32" Height="64" Offset="0x1490" />
-        <Texture Name="object_syokudai_Tex_002490" OutName="tex_002490" Format="rgba16" Width="32" Height="32" Offset="0x2490" />
-        <Texture Name="object_syokudai_Tex_002C90" OutName="tex_002C90" Format="rgba16" Width="32" Height="32" Offset="0x2C90" />
-        <Texture Name="object_syokudai_Tex_003490" OutName="tex_003490" Format="rgba16" Width="16" Height="64" Offset="0x3490" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_syoten.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_syoten.xml
deleted file mode 100644
index eefe0d7b6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_syoten.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<Root>
-    <File Name="object_syoten" Segment="6">
-        <KeyFrameAnimation Name="gSyotenKFAnim_023C" Skel="0x1328" Offset="0x023C"/>
-        <DList Name="object_syoten_DL_000450" Offset="0x450" />
-        <DList Name="object_syoten_DL_000518" Offset="0x518" />
-        <DList Name="object_syoten_DL_0005E0" Offset="0x5E0" />
-        <DList Name="object_syoten_DL_0006A8" Offset="0x6A8" />
-        <DList Name="object_syoten_DL_000770" Offset="0x770" />
-        <DList Name="object_syoten_DL_000838" Offset="0x838" />
-        <DList Name="object_syoten_DL_000900" Offset="0x900" />
-        <DList Name="object_syoten_DL_0009C8" Offset="0x9C8" />
-        <Texture Name="object_syoten_Tex_000A90" OutName="tex_000A90" Format="i8" Width="32" Height="32" Offset="0xA90" />
-        <Texture Name="object_syoten_Tex_000E90" OutName="tex_000E90" Format="i8" Width="32" Height="32" Offset="0xE90" />
-        <TextureAnimation Name="object_syoten_Matanimheader_001298" Offset="0x1298" />
-
-        <KeyFrameSkel Name="gSyotenKFSkel_1328" LimbType="Flex" Offset="0x1328"/>
-        <DList Name="object_syoten_DL_001370" Offset="0x1370" />
-        <TextureAnimation Name="object_syoten_Matanimheader_001448" Offset="0x1448" />
-        <DList Name="object_syoten_DL_001730" Offset="0x1730" />
-        <DList Name="object_syoten_DL_0018A0" Offset="0x18A0" />
-        <TextureAnimation Name="object_syoten_Matanimheader_0018B8" Offset="0x18B8" />
-        <Array Name="object_syotenVtx_0018C0" Count="81" Offset="0x18C0">
-            <Vtx/>
-        </Array>
-        <DList Name="object_syoten_DL_001DD0" Offset="0x1DD0" />
-        <DList Name="object_syoten_DL_002018" Offset="0x2018" />
-        <DList Name="object_syoten_DL_002880" Offset="0x2880" />
-        <DList Name="object_syoten_DL_002A20" Offset="0x2A20" />
-        <TextureAnimation Name="object_syoten_Matanimheader_002B88" Offset="0x2B88" />
-        <TextureAnimation Name="object_syoten_Matanimheader_002B98" Offset="0x2B98" />
-        <Texture Name="object_syoten_Tex_002BA0" OutName="tex_002BA0" Format="i8" Width="32" Height="32" Offset="0x2BA0" />
-        <Texture Name="object_syoten_Tex_002FA0" OutName="tex_002FA0" Format="i8" Width="32" Height="32" Offset="0x2FA0" />
-        <Texture Name="object_syoten_Tex_0033A0" OutName="tex_0033A0" Format="i8" Width="16" Height="128" Offset="0x33A0" />
-        <Texture Name="object_syoten_Tex_003BA0" OutName="tex_003BA0" Format="i4" Width="32" Height="32" Offset="0x3BA0" />
-        <Texture Name="object_syoten_Tex_003DA0" OutName="tex_003DA0" Format="i8" Width="32" Height="64" Offset="0x3DA0" />
-        <Texture Name="object_syoten_Tex_0045A0" OutName="tex_0045A0" Format="i8" Width="32" Height="64" Offset="0x45A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tab.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tab.xml
deleted file mode 100644
index 0a984b284..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tab.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<Root>
-    <File Name="object_tab" Segment="6">
-        <Animation Name="object_tab_Anim_000758" Offset="0x758" />
-        <DList Name="object_tab_DL_003E10" Offset="0x3E10" />
-        <DList Name="object_tab_DL_003EF0" Offset="0x3EF0" />
-        <DList Name="object_tab_DL_004270" Offset="0x4270" />
-        <DList Name="object_tab_DL_004438" Offset="0x4438" />
-        <DList Name="object_tab_DL_0046C8" Offset="0x46C8" />
-        <DList Name="object_tab_DL_0047F8" Offset="0x47F8" />
-        <DList Name="object_tab_DL_004B70" Offset="0x4B70" />
-        <DList Name="object_tab_DL_004E00" Offset="0x4E00" />
-        <DList Name="object_tab_DL_004F30" Offset="0x4F30" />
-        <DList Name="object_tab_DL_005178" Offset="0x5178" />
-        <DList Name="object_tab_DL_005668" Offset="0x5668" />
-        <DList Name="object_tab_DL_005758" Offset="0x5758" />
-        <DList Name="object_tab_DL_005840" Offset="0x5840" />
-        <DList Name="object_tab_DL_005988" Offset="0x5988" />
-        <DList Name="object_tab_DL_005A78" Offset="0x5A78" />
-        <DList Name="object_tab_DL_005B60" Offset="0x5B60" />
-        <Texture Name="object_tab_TLUT_005CA8" OutName="tlut_005CA8" Format="rgba16" Width="16" Height="16" Offset="0x5CA8" />
-        <Texture Name="object_tab_Tex_005EA8" OutName="tex_005EA8" Format="rgba16" Width="16" Height="16" Offset="0x5EA8" />
-        <Texture Name="object_tab_Tex_0060A8" OutName="tex_0060A8" Format="ci8" Width="8" Height="16" Offset="0x60A8" />
-        <Texture Name="object_tab_Tex_006128" OutName="tex_006128" Format="ci8" Width="16" Height="32" Offset="0x6128" />
-        <Texture Name="object_tab_Tex_006328" OutName="tex_006328" Format="ci8" Width="8" Height="8" Offset="0x6328" />
-        <Texture Name="object_tab_Tex_006368" OutName="tex_006368" Format="ci8" Width="8" Height="16" Offset="0x6368" />
-        <Texture Name="object_tab_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="8" Height="8" Offset="0x63E8" />
-        <Texture Name="object_tab_Tex_006428" OutName="tex_006428" Format="ci8" Width="32" Height="32" Offset="0x6428" />
-        <Texture Name="object_tab_Tex_006828" OutName="tex_006828" Format="ci8" Width="16" Height="16" Offset="0x6828" />
-        <Texture Name="object_tab_Tex_006928" OutName="tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6928" />
-        <Texture Name="object_tab_Tex_006D28" OutName="tex_006D28" Format="ci8" Width="32" Height="32" Offset="0x6D28" />
-        <Texture Name="object_tab_Tex_007128" OutName="tex_007128" Format="ci8" Width="16" Height="16" Offset="0x7128" />
-        <Texture Name="object_tab_Tex_007228" OutName="tex_007228" Format="ci8" Width="16" Height="16" Offset="0x7228" />
-        <Texture Name="object_tab_Tex_007328" OutName="tex_007328" Format="i8" Width="32" Height="32" Offset="0x7328" />
-        <Texture Name="object_tab_Tex_007728" OutName="tex_007728" Format="rgba16" Width="8" Height="16" Offset="0x7728" />
-        <Texture Name="object_tab_Tex_007828" OutName="tex_007828" Format="ci8" Width="8" Height="8" Offset="0x7828" />
-        <Texture Name="object_tab_Tex_007868" OutName="tex_007868" Format="ci8" Width="8" Height="16" Offset="0x7868" />
-        <Texture Name="object_tab_Tex_0078E8" OutName="tex_0078E8" Format="i8" Width="16" Height="16" Offset="0x78E8" />
-        <Texture Name="object_tab_Tex_0079E8" OutName="tex_0079E8" Format="i8" Width="8" Height="8" Offset="0x79E8" />
-        <Texture Name="object_tab_Tex_007A28" OutName="tex_007A28" Format="rgba16" Width="16" Height="16" Offset="0x7A28" />
-        <!-- <Blob Name="object_tab_Blob_007C28" Size="0x220" Offset="0x7C28" /> -->
-        <Limb Name="object_tab_Standardlimb_007E48" Type="Standard" EnumName="OBJECT_TAB_LIMB_01" Offset="0x7E48" />
-        <Limb Name="object_tab_Standardlimb_007E54" Type="Standard" EnumName="OBJECT_TAB_LIMB_02" Offset="0x7E54" />
-        <Limb Name="object_tab_Standardlimb_007E60" Type="Standard" EnumName="OBJECT_TAB_LIMB_03" Offset="0x7E60" />
-        <Limb Name="object_tab_Standardlimb_007E6C" Type="Standard" EnumName="OBJECT_TAB_LIMB_04" Offset="0x7E6C" />
-        <Limb Name="object_tab_Standardlimb_007E78" Type="Standard" EnumName="OBJECT_TAB_LIMB_05" Offset="0x7E78" />
-        <Limb Name="object_tab_Standardlimb_007E84" Type="Standard" EnumName="OBJECT_TAB_LIMB_06" Offset="0x7E84" />
-        <Limb Name="object_tab_Standardlimb_007E90" Type="Standard" EnumName="OBJECT_TAB_LIMB_07" Offset="0x7E90" />
-        <Limb Name="object_tab_Standardlimb_007E9C" Type="Standard" EnumName="OBJECT_TAB_LIMB_08" Offset="0x7E9C" />
-        <Limb Name="object_tab_Standardlimb_007EA8" Type="Standard" EnumName="OBJECT_TAB_LIMB_09" Offset="0x7EA8" />
-        <Limb Name="object_tab_Standardlimb_007EB4" Type="Standard" EnumName="OBJECT_TAB_LIMB_0A" Offset="0x7EB4" />
-        <Limb Name="object_tab_Standardlimb_007EC0" Type="Standard" EnumName="OBJECT_TAB_LIMB_0B" Offset="0x7EC0" />
-        <Limb Name="object_tab_Standardlimb_007ECC" Type="Standard" EnumName="OBJECT_TAB_LIMB_0C" Offset="0x7ECC" />
-        <Limb Name="object_tab_Standardlimb_007ED8" Type="Standard" EnumName="OBJECT_TAB_LIMB_0D" Offset="0x7ED8" />
-        <Limb Name="object_tab_Standardlimb_007EE4" Type="Standard" EnumName="OBJECT_TAB_LIMB_0E" Offset="0x7EE4" />
-        <Limb Name="object_tab_Standardlimb_007EF0" Type="Standard" EnumName="OBJECT_TAB_LIMB_0F" Offset="0x7EF0" />
-        <Limb Name="object_tab_Standardlimb_007EFC" Type="Standard" EnumName="OBJECT_TAB_LIMB_10" Offset="0x7EFC" />
-        <Limb Name="object_tab_Standardlimb_007F08" Type="Standard" EnumName="OBJECT_TAB_LIMB_11" Offset="0x7F08" />
-        <Limb Name="object_tab_Standardlimb_007F14" Type="Standard" EnumName="OBJECT_TAB_LIMB_12" Offset="0x7F14" />
-        <Limb Name="object_tab_Standardlimb_007F20" Type="Standard" EnumName="OBJECT_TAB_LIMB_13" Offset="0x7F20" />
-        <Skeleton Name="object_tab_Skel_007F78" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TAB_LIMB_NONE" LimbMax="OBJECT_TAB_LIMB_MAX" EnumName="ObjectTabLimb" Offset="0x7F78" />
-        <Animation Name="object_tab_Anim_0086AC" Offset="0x86AC" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_taisou.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_taisou.xml
deleted file mode 100644
index 0143f2444..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_taisou.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Animations for Gorons at the Racetrack -->
-    <File Name="object_taisou" Segment="6">
-        <Animation Name="gGoronAthleticsSquatSideToSideAnim" Offset="0x16C8" />
-        <Animation Name="gGoronAthleticsShakeLimbsAnim" Offset="0x283C" />
-        <Animation Name="gGoronAthleticsCheerAnim" Offset="0x2C48" />
-        <Animation Name="gGoronAthleticsShoutAnim" Offset="0x31D8" />
-        <Animation Name="gGoronAthleticsDoubleArmSideBendAnim" Offset="0x4DD4" />
-        <Animation Name="gGoronAthleticsHamstringStretchStandingAnim" Offset="0x5790" />
-        <Animation Name="gGoronAthleticsHamstringStretchSittingAnim" Offset="0x5EE0" />
-        <Animation Name="gGoronAthleticsSingleArmSideBendAnim" Offset="0x7764" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_takaraya_objects.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_takaraya_objects.xml
deleted file mode 100644
index ef1735575..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_takaraya_objects.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Assets for the Treasure Chest Shop Walls -->
-    <File Name="object_takaraya_objects" Segment="6">
-        <Texture Name="gTreasureChestShopWallWhiteTLUT" OutName="treasure_chest_shop_wall_white_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gTreasureChestShopWallBlackTex" OutName="treasure_chest_shop_wall_black" Format="rgba16" Width="32" Height="32" Offset="0x20" />
-        <Texture Name="gTreasureChestShopWallWhiteTex" OutName="treasure_chest_shop_wall_white" Format="ci4" Width="32" Height="32" Offset="0x820" />
-        <DList Name="gTreasureChestShopWallBlackDL" Offset="0xB70" />
-        <DList Name="gTreasureChestShopWallWhiteDL" Offset="0xD60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron1.xml
deleted file mode 100644
index d5ec3be03..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron1.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <!-- This file is empty -->
-    <File Name="object_tanron1" Segment="6">
-        <DList Name="gTanron1EmptyDL" Offset="0x0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron2.xml
deleted file mode 100644
index 950621c19..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron2.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <File Name="object_tanron2" Segment="6">
-        <DList Name="object_tanron2_DL_0004E0" Offset="0x4E0" />
-        <DList Name="object_tanron2_DL_000710" Offset="0x710" />
-        <DList Name="object_tanron2_DL_0007D8" Offset="0x7D8" />
-        <DList Name="object_tanron2_DL_0008A8" Offset="0x8A8" />
-        <DList Name="object_tanron2_DL_000960" Offset="0x960" />
-        <Texture Name="object_tanron2_TLUT_000A18" OutName="tlut_000A18" Format="rgba16" Width="4" Height="4" Offset="0xA18" />
-        <Texture Name="object_tanron2_TLUT_000A38" OutName="tlut_000A38" Format="rgba16" Width="4" Height="4" Offset="0xA38" />
-        <Texture Name="object_tanron2_TLUT_000A58" OutName="tlut_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" />
-        <Texture Name="object_tanron2_TLUT_000A78" OutName="tlut_000A78" Format="rgba16" Width="4" Height="4" Offset="0xA78" />
-        <Texture Name="object_tanron2_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" />
-        <Texture Name="object_tanron2_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" />
-        <Texture Name="object_tanron2_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" />
-        <Texture Name="object_tanron2_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron3.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron3.xml
deleted file mode 100644
index 05ef078d7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron3.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <File Name="object_tanron3" Segment="6">
-        <DList Name="object_tanron3_DL_0004E0" Offset="0x4E0" />
-        <DList Name="object_tanron3_DL_000710" Offset="0x710" />
-        <DList Name="object_tanron3_DL_0007D8" Offset="0x7D8" />
-        <DList Name="object_tanron3_DL_0008A8" Offset="0x8A8" />
-        <DList Name="object_tanron3_DL_000960" Offset="0x960" />
-        <Texture Name="object_tanron3_TLUT_000A18" OutName="tlut_000A18" Format="rgba16" Width="4" Height="4" Offset="0xA18" />
-        <Texture Name="object_tanron3_TLUT_000A38" OutName="tlut_000A38" Format="rgba16" Width="4" Height="4" Offset="0xA38" />
-        <Texture Name="object_tanron3_TLUT_000A58" OutName="tlut_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" />
-        <Texture Name="object_tanron3_TLUT_000A78" OutName="tlut_000A78" Format="rgba16" Width="4" Height="4" Offset="0xA78" />
-        <Texture Name="object_tanron3_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" />
-        <Texture Name="object_tanron3_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" />
-        <Texture Name="object_tanron3_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" />
-        <Texture Name="object_tanron3_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron4.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron4.xml
deleted file mode 100644
index ea342d448..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron4.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Root>
-    <!-- Assets for seagulls -->
-    <File Name="object_tanron4" Segment="6">
-        <!-- The glide animation goes unused, instead the flap animation is frozen while it glides -->
-        <Animation Name="gSeagullGlideAnim" Offset="0x58" />
-        <Animation Name="gSeagullFlapAnim" Offset="0x168" />
-
-        <DList Name="gSeagullBodyDL" Offset="0x300" />
-        <DList Name="gSeagullRightWingEndDL" Offset="0x3A0" />
-        <DList Name="gSeagullRightWingStartDL" Offset="0x440" />
-        <DList Name="gSeagullLeftWingEndDL" Offset="0x4B0" />
-        <DList Name="gSeagullLeftWingStartDL" Offset="0x550" />
-
-        <Texture Name="gSeagullBodyTex" OutName="seagull_body" Format="rgba16" Width="32" Height="16" Offset="0x5C8" />
-        <Texture Name="gSeagullWingTex" OutName="seagull_wing" Format="rgba16" Width="32" Height="16" Offset="0x9C8" />
-
-        <Limb Name="gSeagullRootLimb" Type="Standard" EnumName="SEAGULL_LIMB_ROOT" Offset="0xDC8" />
-        <Limb Name="gSeagullBodyLimb" Type="Standard" EnumName="SEAGULL_LIMB_BODY" Offset="0xDD4" />
-        <Limb Name="gSeagullLeftWingRootLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_ROOT" Offset="0xDE0" />
-        <Limb Name="gSeagullLeftWingWrapperLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_WRAPPER" Offset="0xDEC" />
-        <Limb Name="gSeagullLeftWingStartLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_START" Offset="0xDF8" />
-        <Limb Name="gSeagullLeftWingEndLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_END" Offset="0xE04" />
-        <Limb Name="gSeagullRightWingRootLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_ROOT" Offset="0xE10" />
-        <Limb Name="gSeagullRightWingWrapperLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_WRAPPER" Offset="0xE1C" />
-        <Limb Name="gSeagullRightWingStartLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_START" Offset="0xE28" />
-        <Limb Name="gSeagullRightWingEndLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_END" Offset="0xE34" />
-
-        <Skeleton Name="gSeagullSkel" Type="Flex" LimbType="Standard" LimbNone="SEAGULL_LIMB_RIGHT_WING_NONE" LimbMax="SEAGULL_LIMB_RIGHT_WING_MAX" EnumName="ObjectTanron4Limb" Offset="0xE68" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron5.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron5.xml
deleted file mode 100644
index e64a11d5d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tanron5.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <File Name="object_tanron5" Segment="6">
-        <DList Name="object_tanron5_DL_0004E0" Offset="0x4E0" />
-        <DList Name="object_tanron5_DL_000710" Offset="0x710" />
-        <DList Name="object_tanron5_DL_0007D8" Offset="0x7D8" />
-        <DList Name="object_tanron5_DL_0008A8" Offset="0x8A8" />
-        <DList Name="object_tanron5_DL_000960" Offset="0x960" />
-        <Texture Name="object_tanron5_TLUT_000A18" OutName="tlut_000A18" Format="rgba16" Width="4" Height="4" Offset="0xA18" />
-        <Texture Name="object_tanron5_TLUT_000A38" OutName="tlut_000A38" Format="rgba16" Width="4" Height="4" Offset="0xA38" />
-        <Texture Name="object_tanron5_TLUT_000A58" OutName="tlut_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" />
-        <Texture Name="object_tanron5_TLUT_000A78" OutName="tlut_000A78" Format="rgba16" Width="4" Height="4" Offset="0xA78" />
-        <Texture Name="object_tanron5_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" />
-        <Texture Name="object_tanron5_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" />
-        <Texture Name="object_tanron5_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" />
-        <Texture Name="object_tanron5_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_taru.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_taru.xml
deleted file mode 100644
index 4a23d2923..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_taru.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_taru" Segment="6">
-        <DList Name="gObjTaruBarrelDL" Offset="0x420" />
-        <Texture Name="gObjTaruBarrelSideTex" OutName="obj_taru_barrel_side" Format="rgba16" Width="16" Height="32" Offset="0x670" />
-        <Texture Name="gObjTaruBarrelTopTex" OutName="obj_taru_barrel_top" Format="rgba16" Width="32" Height="16" Offset="0xA70" />
-        <Collision Name="object_taru_Colheader_000FC8" Offset="0xFC8" />
-        <DList Name="gObjTaruBreakablePiratePanelDL" Offset="0x1140" />
-        <Texture Name="gObjTaruBreakablePiratePanelSkullTex" OutName="obj_taru_breakable_pirate_panel_skull" Format="rgba16" Width="32" Height="32" Offset="0x1230" />
-        <Texture Name="gObjTaruBreakablePiratePanelWoodTex" OutName="obj_taru_breakable_pirate_panel_wood" Format="i4" Width="32" Height="32" Offset="0x1A30" />
-        <Collision Name="object_taru_Colheader_001CB0" Offset="0x1CB0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_test3.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_test3.xml
deleted file mode 100644
index c32732b35..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_test3.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<Root>
-    <!-- Object for Kafei -->
-    <File Name="object_test3" Segment="6">
-        <!-- Textures -->
-        <Texture Name="gKafeiBody1TLUT" OutName="kafei_body_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="gKafeiBody2TLUT" OutName="kafei_body_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200" />
-        <Texture Name="gKafeiMouthTLUT" OutName="kafei_mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400" />
-        <Texture Name="gKafeiEyesTLUT" OutName="kafei_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600" />
-        <Texture Name="gKafeiSkinTex" OutName="kafei_skin" Format="ci8" Width="8" Height="8" Offset="0x800" />
-        <Texture Name="gKafeiHairTex" OutName="kafei_hair" Format="ci8" Width="8" Height="16" Offset="0x840" />
-        <Texture Name="gKafeiNoseTex" OutName="kafei_nose" Format="ci8" Width="16" Height="16" Offset="0x8C0" />
-        <Texture Name="gKafeiMouthClosedTex" OutName="kafei_mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x9C0" />
-        <Texture Name="gKafeiEyesOpenTex" OutName="kafei_eyes_open" Format="ci8" Width="64" Height="32" Offset="0xDC0" />
-        <Texture Name="gKafeiHairPartAndUndersideTex" OutName="kafei_hair_part_and_underside" Format="ci8" Width="8" Height="16" Offset="0x15C0" />
-        <Texture Name="gKafeiFingersTex" OutName="kafei_fingers" Format="ci8" Width="16" Height="16" Offset="0x1640" />
-        <Texture Name="gKafeiBootTex" OutName="kafei_boot" Format="ci8" Width="32" Height="32" Offset="0x1740" />
-        <Texture Name="gKafeiSleevePatternTex" OutName="kafei_sleeve_pattern" Format="ci8" Width="32" Height="32" Offset="0x1B40" />
-        <Texture Name="gKafeiInnerSleeveTex" OutName="kafei_inner_sleeve" Format="ci8" Width="8" Height="8" Offset="0x1F40" />
-        <Texture Name="gKafeiClothesNeckOpeningTex" OutName="kafei_clothes_neck_opening" Format="ci8" Width="32" Height="16" Offset="0x1F80" />
-        <Texture Name="gKafeiPendantOfMemoriesTex" OutName="kafei_pendant_of_memories" Format="rgba16" Width="32" Height="64" Offset="0x2180" />
-        <Texture Name="gKafeiClothesPatternTex" OutName="kafei_clothes_pattern" Format="ci8" Width="16" Height="64" Offset="0x3180" />
-        <Texture Name="gKafeiTrouserHemTex" OutName="kafei_trouser_hem" Format="ci8" Width="16" Height="16" Offset="0x3580" />
-        <Texture Name="gKafeiEyesHalfTex" OutName="kafei_eyes_half" Format="ci8" Width="64" Height="32" Offset="0x3680" />
-        <Texture Name="gKafeiEyesClosedTex" OutName="kafei_eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x3E80" />
-        <Texture Name="gKafeiEyesRollRightTex" OutName="kafei_eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x4680" />
-        <Texture Name="gKafeiEyesRollLeftTex" OutName="kafei_eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x4E80" />
-        <Texture Name="gKafeiEyesRollUpTex" OutName="kafei_eyes_roll_up" Format="ci8" Width="64" Height="32" Offset="0x5680" />
-        <Texture Name="gKafeiEyesRollDownTex" OutName="kafei_eyes_roll_down" Format="ci8" Width="64" Height="32" Offset="0x5E80" />
-        <Texture Name="object_test3_Tex_006680" OutName="tex_006680" Format="ci8" Width="64" Height="32" Offset="0x6680" /> <!-- TODO: name it after object_link_child_Tex_003800  -->
-        <Texture Name="gKafeiMouthTeethTex" OutName="kafei_mouth_teeth" Format="ci8" Width="32" Height="32" Offset="0x6E80" />
-        <Texture Name="gKafeiMouthAngryTex" OutName="kafei_mouth_angry" Format="ci8" Width="32" Height="32" Offset="0x7280" />
-        <Texture Name="gKafeiMouthHappyTex" OutName="kafei_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x7680" />
-
-        <!-- Kafei Dlists -->
-        <DList Name="gKafeiRightThighDL" Offset="0xBF10" />
-        <DList Name="gKafeiRightShinDL" Offset="0xC198" />
-        <DList Name="gKafeiRightFootDL" Offset="0xC300" />
-        <DList Name="gKafeiLeftThighDL" Offset="0xC478" />
-        <DList Name="gKafeiLeftShinDL" Offset="0xC708" />
-        <DList Name="gKafeiLeftFootDL" Offset="0xC870" />
-        <DList Name="gKafeiWaistDL" Offset="0xC9E8" />
-        <DList Name="gKafeiPendantOfMemoriesDL" Offset="0xCB60" />
-        <DList Name="gKafeiTorsoDL" Offset="0xCC20" />
-        <DList Name="gKafeiHeadDL" Offset="0xCF70" />
-        <DList Name="gKafeiNose1DL" Offset="0xD670" />
-        <DList Name="gKafeiNose2DL" Offset="0xD730" />
-        <DList Name="gKafeiRightShoulderDL" Offset="0xD7F0" />
-        <DList Name="gKafeiRightForearmDL" Offset="0xD930" />
-        <DList Name="gKafeiRightHandDL" Offset="0xDA70" />
-        <DList Name="gKafeiLeftShoulderDL" Offset="0xDCF0" />
-        <DList Name="gKafeiLeftForearmDL" Offset="0xDE30" />
-        <DList Name="gKafeiLeftHandDL" Offset="0xDF70" />
-
-        <!-- Sun Mask -->
-        <DList Name="gKafeiSunMaskDL" Offset="0xEDD0" />
-        <Texture Name="gKafeiSunMaskEyeTex" OutName="kafei_sun_mask_eye" Format="i4" Width="16" Height="16" Offset="0xF2C0" />
-        <Texture Name="gKafeiSunMaskPattern1Tex" OutName="kafei_sun_mask_pattern1" Format="i4" Width="16" Height="16" Offset="0xF340" />
-        <Texture Name="gKafeiSunMaskPattern2Tex" OutName="kafei_sun_mask_pattern2" Format="i4" Width="16" Height="16" Offset="0xF3C0" />
-        <Texture Name="gKafeiSunMaskPattern3Tex" OutName="kafei_sun_mask_pattern3" Format="i4" Width="32" Height="32" Offset="0xF440" />
-        <DList Name="gKafeiSunMaskEmptyDL" Offset="0xF640" />
-
-        <!-- Kafei Limbs -->
-        <Limb Name="gKafeiRootLimb" Type="LOD" EnumName="KAFEI_LIMB_ROOT" Offset="0xF648" />
-        <Limb Name="gKafeiWaistLimb" Type="LOD" EnumName="KAFEI_LIMB_WAIST" Offset="0xF658" />
-        <Limb Name="gKafeiLowerRootLimb" Type="LOD" EnumName="KAFEI_LIMB_LOWER_ROOT" Offset="0xF668" />
-        <Limb Name="gKafeiRightThighLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_THIGH" Offset="0xF678" />
-        <Limb Name="gKafeiRightShinLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_SHIN" Offset="0xF688" />
-        <Limb Name="gKafeiRightFootLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_FOOT" Offset="0xF698" />
-        <Limb Name="gKafeiLeftThighLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_THIGH" Offset="0xF6A8" />
-        <Limb Name="gKafeiLeftShinLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_SHIN" Offset="0xF6B8" />
-        <Limb Name="gKafeiLeftFootLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_FOOT" Offset="0xF6C8" />
-        <Limb Name="gKafeiUpperRootLimb" Type="LOD" EnumName="KAFEI_LIMB_UPPER_ROOT" Offset="0xF6D8" />
-        <Limb Name="gKafeiHeadLimb" Type="LOD" EnumName="KAFEI_LIMB_HEAD" Offset="0xF6E8" />
-        <Limb Name="gKafeiHatLimb" Type="LOD" EnumName="KAFEI_LIMB_HAT" Offset="0xF6F8" />
-        <Limb Name="gKafeiCollarLimb" Type="LOD" EnumName="KAFEI_LIMB_COLLAR" Offset="0xF708" />
-        <Limb Name="gKafeiLeftShoulderLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_SHOULDER" Offset="0xF718" />
-        <Limb Name="gKafeiLeftForearmLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_FOREARM" Offset="0xF728" />
-        <Limb Name="gKafeiLeftHandLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_HAND" Offset="0xF738" />
-        <Limb Name="gKafeiRightShoulderLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_SHOULDER" Offset="0xF748" />
-        <Limb Name="gKafeiRightForearmLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_FOREARM" Offset="0xF758" />
-        <Limb Name="gKafeiRightHandLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_HAND" Offset="0xF768" />
-        <Limb Name="gKafeiSheathLimb" Type="LOD" EnumName="KAFEI_LIMB_SHEATH" Offset="0xF778" />
-        <Limb Name="gKafeiTorsoLimb" Type="LOD" EnumName="KAFEI_LIMB_TORSO" Offset="0xF788" />
-
-        <!-- Kafei Skeleton -->
-        <Skeleton Name="gKafeiSkel" Type="Flex" LimbType="Standard" LimbNone="KAFEI_LIMB_NONE" LimbMax="KAFEI_LIMB_MAX" EnumName="KafeiLimb" Offset="0xF7EC" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_thiefbird.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_thiefbird.xml
deleted file mode 100644
index 52165cb89..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_thiefbird.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<Root>
-    <!-- Assets for Takkuri -->
-    <File Name="object_thiefbird" Segment="6">
-        <!-- Takkuri Animations -->
-        <Animation Name="gTakkuriDeathAnim" Offset="0x88" /> <!-- Original name is "hnt_damage" -->
-        <Animation Name="gTakkuriFlyWithItemAnim" Offset="0x278" /> <!-- Original name is "hnt_escape" -->
-        <Animation Name="gTakkuriFlyAnim" Offset="0x604" /> <!-- Original name is "hnt_fly" -->
-
-        <!-- Takkuri Limb DisplayLists -->
-        <DList Name="gTakkuriBodyDL" Offset="0x16D0" />
-        <DList Name="gTakkuriLegsDL" Offset="0x1800" />
-        <DList Name="gTakkuriFeetDL" Offset="0x18A8" />
-        <DList Name="gTakkuriStolenItemDL" Offset="0x19D0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gTakkuriHeadDL" Offset="0x1A18" />
-        <DList Name="gTakkuriEyesDL" Offset="0x1CF0" />
-        <DList Name="gTakkuriLowerBeakDL" Offset="0x1DA8" />
-        <DList Name="gTakkuriLeftEarDL" Offset="0x1FE0" />
-        <DList Name="gTakkuriRightEarDL" Offset="0x2070" />
-        <DList Name="gTakkuriNeckDL" Offset="0x2100" />
-        <DList Name="gTakkuriRightWingTipDL" Offset="0x21D0" />
-        <DList Name="gTakkuriRightWingMiddleDL" Offset="0x22C0" />
-        <DList Name="gTakkuriRightWingBaseDL" Offset="0x23B0" />
-        <DList Name="gTakkuriLeftWingTipDL" Offset="0x24A0" />
-        <DList Name="gTakkuriLeftWingMiddleDL" Offset="0x2590" />
-        <DList Name="gTakkuriLeftWingBaseDL" Offset="0x2680" />
-
-        <!-- Takkuri Textures -->
-        <Texture Name="gTakkuriFeathersTex" OutName="takkuri_feathers" Format="rgba16" Width="8" Height="16" Offset="0x2770" />
-        <Texture Name="gTakkuriWingTipTex" OutName="takkuri_wing_tip" Format="rgba16" Width="16" Height="16" Offset="0x2870" />
-        <Texture Name="gTakkuriEyeTex" OutName="takkuri_eye" Format="rgba16" Width="16" Height="16" Offset="0x2A70" />
-        <Texture Name="gTakkuriHeadAndNeckTex" OutName="takkuri_head_and_neck" Format="i8" Width="16" Height="16" Offset="0x2C70" />
-        <Texture Name="gTakkuriBeakAndLegsTex" OutName="takkuri_beak_and_legs" Format="rgba16" Width="8" Height="8" Offset="0x2D70" />
-        <Texture Name="gTakkuriInnerBeakTex" OutName="takkuri_inner_beak" Format="rgba16" Width="4" Height="8" Offset="0x2DF0" />
-        <Texture Name="gTakkuriEarTex" OutName="takkuri_ear" Format="rgba16" Width="16" Height="16" Offset="0x2E30" />
-
-        <!-- DisplayLists and Texture for Takkuri's feather effect -->
-        <DList Name="gTakkuriFeatherMaterialDL" Offset="0x3060" />
-        <DList Name="gTakkuriFeatherModelDL" Offset="0x30D8" />
-        <Texture Name="gTakkuriFeatherTex" OutName="takkuri_feather" Format="rgba16" Width="8" Height="16" Offset="0x30F0" />
-        
-        <!-- DisplayLists for stolen items -->
-        <DList Name="gTakkuriStolenBottleDL" Offset="0x33B0" />
-        <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="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" />
-        <Texture Name="gTakkuriStolenKokiriSwordGripTex" OutName="takkuri_stolen_kokiri_sword_grip" Format="i8" Width="8" Height="8" Offset="0x5D20" />
-        <Texture Name="gTakkuriStolenRazorSwordHiltAndScabbardTex" OutName="takkuri_stolen_razor_sword_hilt_and_scabbard" Format="rgba16" Width="8" Height="16" Offset="0x5D60" />
-        <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="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" />
-        <Limb Name="gTakkuriLeftWingBaseLimb" Type="Standard" EnumName="TAKKURI_LIMB_LEFT_WING_BASE" Offset="0x60AC" />
-        <Limb Name="gTakkuriLeftWingMiddleLimb" Type="Standard" EnumName="TAKKURI_LIMB_LEFT_WING_MIDDLE" Offset="0x60B8" />
-        <Limb Name="gTakkuriLeftWingTipLimb" Type="Standard" EnumName="TAKKURI_LIMB_LEFT_WING_TIP" Offset="0x60C4" />
-        <Limb Name="gTakkuriRightWingBaseLimb" Type="Standard" EnumName="TAKKURI_LIMB_RIGHT_WING_BASE" Offset="0x60D0" />
-        <Limb Name="gTakkuriRightWingMiddleLimb" Type="Standard" EnumName="TAKKURI_LIMB_RIGHT_WING_MIDDLE" Offset="0x60DC" />
-        <Limb Name="gTakkuriRightWingTipLimb" Type="Standard" EnumName="TAKKURI_LIMB_RIGHT_WING_TIP" Offset="0x60E8" />
-        <Limb Name="gTakkuriNeckLimb" Type="Standard" EnumName="TAKKURI_LIMB_NECK" Offset="0x60F4" />
-        <Limb Name="gTakkuriHeadLimb" Type="Standard" EnumName="TAKKURI_LIMB_HEAD" Offset="0x6100" />
-        <Limb Name="gTakkuriRightEarLimb" Type="Standard" EnumName="TAKKURI_LIMB_RIGHT_EAR" Offset="0x610C" />
-        <Limb Name="gTakkuriLeftEarLimb" Type="Standard" EnumName="TAKKURI_LIMB_LEFT_EAR" Offset="0x6118" />
-        <Limb Name="gTakkuriLowerBeakLimb" Type="Standard" EnumName="TAKKURI_LIMB_LOWER_BEAK" Offset="0x6124" />
-        <Limb Name="gTakkuriEyesLimb" Type="Standard" EnumName="TAKKURI_LIMB_EYES" Offset="0x6130" />
-        <Limb Name="gTakkuriLegsLimb" Type="Standard" EnumName="TAKKURI_LIMB_LEGS" Offset="0x613C" />
-        <Limb Name="gTakkuriFeetLimb" Type="Standard" EnumName="TAKKURI_LIMB_FEET" Offset="0x6148" />
-        <Limb Name="gTakkuriStolenItemLimb" Type="Standard" EnumName="TAKKURI_LIMB_STOLEN_ITEM" Offset="0x6154" />
-
-        <!-- Takkuri Skeleton -->
-        <Skeleton Name="gTakkuriSkel" Type="Flex" LimbType="Standard" LimbNone="TAKKURI_LIMB_NONE" LimbMax="TAKKURI_LIMB_MAX" EnumName="TakkuriLimb" Offset="0x61A0" />
-
-        <!-- Takkuri Animation -->
-        <Animation Name="gTakkuriAttackAnim" Offset="0x63C4" /> <!-- Original name is "hnt_ikaku" ("threat, intimidation") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tite.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tite.xml
deleted file mode 100644
index 351b4f56a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tite.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Root>
-    <File Name="object_tite" Segment="6">
-        <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4" />
-        <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8" />
-        <Animation Name="object_tite_Anim_00069C" Offset="0x69C" />
-        <Animation Name="object_tite_Anim_00083C" Offset="0x83C" />
-        <Animation Name="object_tite_Anim_000A14" Offset="0xA14" />
-        <Animation Name="object_tite_Anim_000C70" Offset="0xC70" />
-        <Animation Name="object_tite_Anim_000F50" Offset="0xF50" />
-        <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4" />
-        <Texture Name="object_tite_Tex_001300" OutName="tex_001300" Format="rgba16" Width="16" Height="32" Offset="0x1300" />
-        <Texture Name="object_tite_Tex_001700" OutName="tex_001700" Format="rgba16" Width="16" Height="16" Offset="0x1700" />
-        <Texture Name="object_tite_Tex_001900" OutName="tex_001900" Format="rgba16" Width="8" Height="16" Offset="0x1900" />
-        <Texture Name="object_tite_Tex_001A00" OutName="tex_001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00" />
-        <Texture Name="object_tite_Tex_001A80" OutName="tex_001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80" />
-        <Texture Name="object_tite_Tex_001B00" OutName="tex_001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00" />
-        <Texture Name="object_tite_Tex_001F00" OutName="tex_001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00" />
-        <Texture Name="object_tite_Tex_002100" OutName="tex_002100" Format="rgba16" Width="8" Height="16" Offset="0x2100" />
-        <DList Name="object_tite_DL_002FF0" Offset="0x2FF0" />
-        <DList Name="object_tite_DL_003160" Offset="0x3160" />
-        <DList Name="object_tite_DL_003290" Offset="0x3290" />
-        <DList Name="object_tite_DL_003330" Offset="0x3330" />
-        <DList Name="object_tite_DL_003460" Offset="0x3460" />
-        <DList Name="object_tite_DL_003500" Offset="0x3500" />
-        <DList Name="object_tite_DL_003630" Offset="0x3630" />
-        <DList Name="object_tite_DL_0036D0" Offset="0x36D0" />
-        <DList Name="object_tite_DL_003800" Offset="0x3800" />
-        <Limb Name="object_tite_Standardlimb_0038A0" Type="Standard" EnumName="OBJECT_TITE_LIMB_01" Offset="0x38A0" />
-        <Limb Name="object_tite_Standardlimb_0038AC" Type="Standard" EnumName="OBJECT_TITE_LIMB_02" Offset="0x38AC" />
-        <Limb Name="object_tite_Standardlimb_0038B8" Type="Standard" EnumName="OBJECT_TITE_LIMB_03" Offset="0x38B8" />
-        <Limb Name="object_tite_Standardlimb_0038C4" Type="Standard" EnumName="OBJECT_TITE_LIMB_04" Offset="0x38C4" />
-        <Limb Name="object_tite_Standardlimb_0038D0" Type="Standard" EnumName="OBJECT_TITE_LIMB_05" Offset="0x38D0" />
-        <Limb Name="object_tite_Standardlimb_0038DC" Type="Standard" EnumName="OBJECT_TITE_LIMB_06" Offset="0x38DC" />
-        <Limb Name="object_tite_Standardlimb_0038E8" Type="Standard" EnumName="OBJECT_TITE_LIMB_07" Offset="0x38E8" />
-        <Limb Name="object_tite_Standardlimb_0038F4" Type="Standard" EnumName="OBJECT_TITE_LIMB_08" Offset="0x38F4" />
-        <Limb Name="object_tite_Standardlimb_003900" Type="Standard" EnumName="OBJECT_TITE_LIMB_09" Offset="0x3900" />
-        <Limb Name="object_tite_Standardlimb_00390C" Type="Standard" EnumName="OBJECT_TITE_LIMB_0A" Offset="0x390C" />
-        <Limb Name="object_tite_Standardlimb_003918" Type="Standard" EnumName="OBJECT_TITE_LIMB_0B" Offset="0x3918" />
-        <Limb Name="object_tite_Standardlimb_003924" Type="Standard" EnumName="OBJECT_TITE_LIMB_0C" Offset="0x3924" />
-        <Limb Name="object_tite_Standardlimb_003930" Type="Standard" EnumName="OBJECT_TITE_LIMB_0D" Offset="0x3930" />
-        <Limb Name="object_tite_Standardlimb_00393C" Type="Standard" EnumName="OBJECT_TITE_LIMB_0E" Offset="0x393C" />
-        <Limb Name="object_tite_Standardlimb_003948" Type="Standard" EnumName="OBJECT_TITE_LIMB_0F" Offset="0x3948" />
-        <Limb Name="object_tite_Standardlimb_003954" Type="Standard" EnumName="OBJECT_TITE_LIMB_10" Offset="0x3954" />
-        <Limb Name="object_tite_Standardlimb_003960" Type="Standard" EnumName="OBJECT_TITE_LIMB_11" Offset="0x3960" />
-        <Limb Name="object_tite_Standardlimb_00396C" Type="Standard" EnumName="OBJECT_TITE_LIMB_12" Offset="0x396C" />
-        <Limb Name="object_tite_Standardlimb_003978" Type="Standard" EnumName="OBJECT_TITE_LIMB_13" Offset="0x3978" />
-        <Limb Name="object_tite_Standardlimb_003984" Type="Standard" EnumName="OBJECT_TITE_LIMB_14" Offset="0x3984" />
-        <Limb Name="object_tite_Standardlimb_003990" Type="Standard" EnumName="OBJECT_TITE_LIMB_15" Offset="0x3990" />
-        <Limb Name="object_tite_Standardlimb_00399C" Type="Standard" EnumName="OBJECT_TITE_LIMB_16" Offset="0x399C" />
-        <Limb Name="object_tite_Standardlimb_0039A8" Type="Standard" EnumName="OBJECT_TITE_LIMB_17" Offset="0x39A8" />
-        <Limb Name="object_tite_Standardlimb_0039B4" Type="Standard" EnumName="OBJECT_TITE_LIMB_18" Offset="0x39B4" />
-        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" LimbNone="OBJECT_TITE_LIMB_NONE" LimbMax="OBJECT_TITE_LIMB_MAX" EnumName="ObjectTiteLimb" Offset="0x3A20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tk.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tk.xml
deleted file mode 100644
index b11b47488..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tk.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <File Name="object_tk" Segment="6">
-        <Animation Name="object_tk_Anim_001144" Offset="0x1144" />
-        <Animation Name="object_tk_Anim_001FA8" Offset="0x1FA8" />
-        <Animation Name="object_tk_Anim_0020C8" Offset="0x20C8" />
-        <Animation Name="object_tk_Anim_0030A4" Offset="0x30A4" />
-        <Animation Name="object_tk_Anim_003724" Offset="0x3724" />
-        <Animation Name="object_tk_Anim_003B10" Offset="0x3B10" />
-        <Animation Name="object_tk_Anim_003FB8" Offset="0x3FB8" />
-        <Texture Name="object_tk_TLUT_003FD0" OutName="tlut_003FD0" Format="rgba16" Width="16" Height="16" Offset="0x3FD0" />
-        <Texture Name="object_tk_Tex_0041D0" OutName="tex_0041D0" Format="ci8" Width="8" Height="8" Offset="0x41D0" />
-        <Texture Name="object_tk_Tex_004210" OutName="tex_004210" Format="ci8" Width="8" Height="8" Offset="0x4210" />
-        <Texture Name="object_tk_Tex_004250" OutName="tex_004250" Format="ci8" Width="8" Height="8" Offset="0x4250" />
-        <Texture Name="object_tk_Tex_004290" OutName="tex_004290" Format="ci8" Width="16" Height="16" Offset="0x4290" />
-        <Texture Name="object_tk_Tex_004390" OutName="tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x4390" />
-        <Texture Name="object_tk_Tex_004B90" OutName="tex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" />
-        <Texture Name="object_tk_Tex_005390" OutName="tex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" />
-        <Texture Name="object_tk_Tex_005B90" OutName="tex_005B90" Format="ci8" Width="16" Height="16" Offset="0x5B90" />
-        <Texture Name="object_tk_Tex_005C90" OutName="tex_005C90" Format="ci8" Width="16" Height="16" Offset="0x5C90" />
-        <!-- <Blob Name="object_tk_Blob_005D90" Size="0x180" Offset="0x5D90" /> -->
-        <Texture Name="object_tk_Tex_005F10" OutName="tex_005F10" Format="ci8" Width="16" Height="16" Offset="0x5F10" />
-        <DList Name="object_tk_DL_008870" Offset="0x8870" />
-        <DList Name="object_tk_DL_0089B0" Offset="0x89B0" />
-        <DList Name="object_tk_DL_008B40" Offset="0x8B40" />
-        <DList Name="object_tk_DL_008C60" Offset="0x8C60" />
-        <DList Name="object_tk_DL_0091A8" Offset="0x91A8" />
-        <DList Name="object_tk_DL_0094F0" Offset="0x94F0" />
-        <DList Name="object_tk_DL_009620" Offset="0x9620" />
-        <DList Name="object_tk_DL_009750" Offset="0x9750" />
-        <DList Name="object_tk_DL_009960" Offset="0x9960" />
-        <DList Name="object_tk_DL_009A90" Offset="0x9A90" />
-        <DList Name="object_tk_DL_009BC0" Offset="0x9BC0" />
-        <DList Name="object_tk_DL_009DD0" Offset="0x9DD0" />
-        <DList Name="object_tk_DL_009F88" Offset="0x9F88" />
-        <DList Name="object_tk_DL_00A068" Offset="0xA068" />
-        <DList Name="object_tk_DL_00A220" Offset="0xA220" />
-        <!-- <Blob Name="object_tk_Blob_00A300" Size="0x50" Offset="0xA300" /> -->
-        <Texture Name="object_tk_Tex_00A350" OutName="tex_00A350" Format="ci8" Width="16" Height="16" Offset="0xA350" />
-        <Texture Name="object_tk_Tex_00A450" OutName="tex_00A450" Format="ci8" Width="8" Height="16" Offset="0xA450" />
-        <Texture Name="object_tk_Tex_00A4D0" OutName="tex_00A4D0" Format="i8" Width="8" Height="8" Offset="0xA4D0" />
-        <Texture Name="object_tk_Tex_00A510" OutName="tex_00A510" Format="rgba16" Width="8" Height="8" Offset="0xA510" />
-        <Texture Name="object_tk_Tex_00A590" OutName="tex_00A590" Format="i4" Width="16" Height="32" Offset="0xA590" />
-        <DList Name="object_tk_DL_00B260" Offset="0xB260" />
-        <DList Name="object_tk_DL_00B3C8" Offset="0xB3C8" />
-        <DList Name="object_tk_DL_00B530" Offset="0xB530" />
-        <Limb Name="object_tk_Standardlimb_00B8D8" Type="Standard" EnumName="OBJECT_TK_LIMB_01" Offset="0xB8D8" />
-        <Limb Name="object_tk_Standardlimb_00B8E4" Type="Standard" EnumName="OBJECT_TK_LIMB_02" Offset="0xB8E4" />
-        <Limb Name="object_tk_Standardlimb_00B8F0" Type="Standard" EnumName="OBJECT_TK_LIMB_03" Offset="0xB8F0" />
-        <Limb Name="object_tk_Standardlimb_00B8FC" Type="Standard" EnumName="OBJECT_TK_LIMB_04" Offset="0xB8FC" />
-        <Limb Name="object_tk_Standardlimb_00B908" Type="Standard" EnumName="OBJECT_TK_LIMB_05" Offset="0xB908" />
-        <Limb Name="object_tk_Standardlimb_00B914" Type="Standard" EnumName="OBJECT_TK_LIMB_06" Offset="0xB914" />
-        <Limb Name="object_tk_Standardlimb_00B920" Type="Standard" EnumName="OBJECT_TK_LIMB_07" Offset="0xB920" />
-        <Limb Name="object_tk_Standardlimb_00B92C" Type="Standard" EnumName="OBJECT_TK_LIMB_08" Offset="0xB92C" />
-        <Limb Name="object_tk_Standardlimb_00B938" Type="Standard" EnumName="OBJECT_TK_LIMB_09" Offset="0xB938" />
-        <Limb Name="object_tk_Standardlimb_00B944" Type="Standard" EnumName="OBJECT_TK_LIMB_0A" Offset="0xB944" />
-        <Limb Name="object_tk_Standardlimb_00B950" Type="Standard" EnumName="OBJECT_TK_LIMB_0B" Offset="0xB950" />
-        <Limb Name="object_tk_Standardlimb_00B95C" Type="Standard" EnumName="OBJECT_TK_LIMB_0C" Offset="0xB95C" />
-        <Limb Name="object_tk_Standardlimb_00B968" Type="Standard" EnumName="OBJECT_TK_LIMB_0D" Offset="0xB968" />
-        <Limb Name="object_tk_Standardlimb_00B974" Type="Standard" EnumName="OBJECT_TK_LIMB_0E" Offset="0xB974" />
-        <Limb Name="object_tk_Standardlimb_00B980" Type="Standard" EnumName="OBJECT_TK_LIMB_0F" Offset="0xB980" />
-        <Limb Name="object_tk_Standardlimb_00B98C" Type="Standard" EnumName="OBJECT_TK_LIMB_10" Offset="0xB98C" />
-        <Limb Name="object_tk_Standardlimb_00B998" Type="Standard" EnumName="OBJECT_TK_LIMB_11" Offset="0xB998" />
-        <Skeleton Name="object_tk_Skel_00B9E8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TK_LIMB_NONE" LimbMax="OBJECT_TK_LIMB_MAX" EnumName="ObjectTkLimb" Offset="0xB9E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tl.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tl.xml
deleted file mode 100644
index 3230f87f2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tl.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<Root>
-    <!-- Assets for Snappers. There are two variants: the regular Snapper with four legs, and a Spiked Snapper with spikes instead of legs that spins to attack. -->
-    <File Name="object_tl" Segment="6">
-        <!-- Snapper Animations -->
-        <Animation Name="gSnapperRearUpAnim" Offset="0x440" /> <!-- Original name is "tl_aisatsuDEMO" ("greeting") -->
-        <Animation Name="gSnapperDamageAnim" Offset="0x8B4" /> <!-- Original name is "tl_damage" -->
-        <Animation Name="gSnapperDeathAnim" Offset="0xAF4" /> <!-- Original name is "tl_dead" -->
-
-        <!-- Spiked Snapper Animation -->
-        <Animation Name="gSpikedSnapperIdleAnim" Offset="0xB30" /> <!-- Original name is "tl_default" -->
-
-        <!-- Spiked Snapper Limb DisplayLists -->
-        <DList Name="gSpikedSnapperBodyDL" Offset="0x1550" />
-        <DList Name="gSpikedSnapperShellDL" Offset="0x1800" />
-        <DList Name="gSpikedSnapperSpikesDL" Offset="0x18E0" />
-
-        <!-- Spiked Snapper Limbs -->
-        <Limb Name="gSpikedSnapperBodyLimb" Type="Standard" EnumName="SPIKED_SNAPPER_LIMB_BODY" Offset="0x1A20" />
-        <Limb Name="gSpikedSnapperShellLimb" Type="Standard" EnumName="SPIKED_SNAPPER_LIMB_SHELL" Offset="0x1A2C" />
-        <Limb Name="gSpikedSnapperSpikesLimb" Type="Standard" EnumName="SPIKED_SNAPPER_LIMB_SPIKES" Offset="0x1A38" />
-
-        <!-- Spiked Snapper Skeleton -->
-        <Skeleton Name="gSpikedSnapperSkel" Type="Flex" LimbType="Standard" LimbNone="SPIKED_SNAPPER_LIMB_NONE" LimbMax="SPIKED_SNAPPER_LIMB_MAX" EnumName="SpikedSnapperLimb" Offset="0x1A50" />
-
-        <!-- Snapper Animations -->
-        <Animation Name="gSnapperRetreatIntoShellAnim" Offset="0x1C68" /> <!-- Original name is "tl_hikkomi" ("retreat") -->
-        <Animation Name="gSnapperFlipUprightAnim" Offset="0x2510" /> <!-- Original name is "tl_modoru" ("to rebound; to spring back"). Used for when the Snapper flips itself upright. -->
-        <Animation Name="gSnapperWiggleLegsAnim" Offset="0x27D8" /> <!-- Original name is "tl_mogaki01" ("struggle; writhing; wriggling; floundering") -->
-        <Animation Name="gSnapperFailToFlipUprightAnim" Offset="0x2F88" /> <!-- Original name is "tl_mogaki02" -->
-        <Animation Name="gSnapperEmergeFromShellAnim" Offset="0x31DC" /> <!-- Original name is "tl_nyokkiri" ("sticking out prominently; rising up") -->
-        <Animation Name="gSnapperBouncedUprightAnim" Offset="0x35EC" /> <!-- Original name is "tl_omotegaeshi" ("omote" = "surface; face", "gaeshi" = "to turn over"). Used for when a Goron Pound flips the Snapper upright. -->
-
-        <!-- Unused Eye Texture Animation -->
-        <TextureAnimation Name="gSnapperEyeTexAnim" Offset="0x3624" />
-
-        <!-- Snapper Animations -->
-        <Animation Name="gSnapperFlipOverAnim" Offset="0x39C0" /> <!-- Original name is "tl_uragaeshi" ("ura" = "opposite side; bottom; other side")-->
-        <Animation Name="gSnapperIdleAnim" Offset="0x4210" /> <!-- Original name is "tl_wait" -->
-
-        <!-- Snapper and Spiked Snapper Textures -->
-        <Texture Name="gSnapperShellTex" OutName="snapper_shell" Format="rgba16" Width="16" Height="32" Offset="0x4220" />
-        <Texture Name="gSnapperBodyTex" OutName="snapper_body" Format="rgba16" Width="16" Height="16" Offset="0x4620" />
-        <Texture Name="gSnapperLegTex" OutName="snapper_leg" Format="rgba16" Width="16" Height="32" Offset="0x4820" />
-        <Texture Name="gSnapperHeadTex" OutName="snapper_head" Format="rgba16" Width="32" Height="16" Offset="0x4C20" />
-        <Texture Name="gSnapperMouthTex" OutName="snapper_mouth" Format="rgba16" Width="8" Height="8" Offset="0x5020" />
-        <Texture Name="gSnapperHoleTex" OutName="snapper_hole" Format="rgba16" Width="16" Height="16" Offset="0x50A0" />
-        <Texture Name="gSnapperSpikeSkinTex" OutName="snapper_spike_skin" Format="rgba16" Width="16" Height="8" Offset="0x52A0" />
-        <Texture Name="gSnapperSpikeTex" OutName="snapper_spike" Format="rgba16" Width="16" Height="16" Offset="0x53A0" />
-        <Texture Name="gSnapperEyeOpenTex" OutName="snapper_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x55A0" />
-        <Texture Name="gSnapperEyeHalfTex" OutName="snapper_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x57A0" />
-        <Texture Name="gSnapperEyeClosedTex" OutName="snapper_eye_closed" Format="rgba16" Width="16" Height="16" Offset="0x59A0" />
-
-        <!-- Snapper Limb DisplayLists -->
-        <DList Name="gSnapperBodyDL" Offset="0x6C50" />
-        <DList Name="gSnapperBackRightLegDL" Offset="0x6DE8" />
-        <DList Name="gSnapperBackRightFootDL" Offset="0x6F30" />
-        <DList Name="gSnapperBackLeftLegDL" Offset="0x7040" />
-        <DList Name="gSnapperBackLeftFootDL" Offset="0x7188" />
-        <DList Name="gSnapperFrontRightLegDL" Offset="0x7298" />
-        <DList Name="gSnapperFrontRightFootDL" Offset="0x73E0" />
-        <DList Name="gSnapperFrontLeftLegDL" Offset="0x74F0" />
-        <DList Name="gSnapperFrontLeftFootDL" Offset="0x7638" />
-        <DList Name="gSnapperHeadDL" Offset="0x7748" />
-        <DList Name="gSnapperEyesDL" Offset="0x7938" />
-        <DList Name="gSnapperJawDL" Offset="0x79C8" />
-
-        <!-- Snapper Limbs -->
-        <Limb Name="gSnapperBodyLimb" Type="Standard" EnumName="SNAPPER_LIMB_BODY" Offset="0x7BB0" />
-        <Limb Name="gSnapperHeadLimb" Type="Standard" EnumName="SNAPPER_LIMB_HEAD" Offset="0x7BBC" />
-        <Limb Name="gSnapperJawLimb" Type="Standard" EnumName="SNAPPER_LIMB_JAW" Offset="0x7BC8" />
-        <Limb Name="gSnapperEyesLimb" Type="Standard" EnumName="SNAPPER_LIMB_EYES" Offset="0x7BD4" />
-        <Limb Name="gSnapperFrontLeftLegLimb" Type="Standard" EnumName="SNAPPER_LIMB_FRONT_LEFT_LEG" Offset="0x7BE0" />
-        <Limb Name="gSnapperFrontLeftFootLimb" Type="Standard" EnumName="SNAPPER_LIMB_FRONT_LEFT_FOOT" Offset="0x7BEC" />
-        <Limb Name="gSnapperFrontRightLegLimb" Type="Standard" EnumName="SNAPPER_LIMB_FRONT_RIGHT_LEG" Offset="0x7BF8" />
-        <Limb Name="gSnapperFrontRightFootLimb" Type="Standard" EnumName="SNAPPER_LIMB_FRONT_RIGHT_FOOT" Offset="0x7C04" />
-        <Limb Name="gSnapperBackLeftLegLimb" Type="Standard" EnumName="SNAPPER_LIMB_BACK_LEFT_LEG" Offset="0x7C10" />
-        <Limb Name="gSnapperBackLeftFootLimb" Type="Standard" EnumName="SNAPPER_LIMB_BACK_LEFT_FOOT" Offset="0x7C1C" />
-        <Limb Name="gSnapperBackRightLegLimb" Type="Standard" EnumName="SNAPPER_LIMB_BACK_RIGHT_LEG" Offset="0x7C28" />
-        <Limb Name="gSnapperBackRightFootLimb" Type="Standard" EnumName="SNAPPER_LIMB_BACK_RIGHT_FOOT" Offset="0x7C34" />
-
-        <!-- Snapper Skeleton -->
-        <Skeleton Name="gSnapperSkel" Type="Flex" LimbType="Standard" LimbNone="SNAPPER_LIMB_NONE" LimbMax="SNAPPER_LIMB_MAX" EnumName="SnapperLimb" Offset="0x7C70" />
-
-        <!-- Snapper Animation-->
-        <Animation Name="gSnapperWalkAnim" Offset="0x823C" /> <!-- Original name is "tl_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tokei_step.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tokei_step.xml
deleted file mode 100644
index aac4b5ea9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tokei_step.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Assets for the Clock Tower steps -->
-    <File Name="object_tokei_step" Segment="6">
-        <DList Name="gClocktowerPanelEmptyDL" Offset="0x80" />
-        <DList Name="gClocktowerPanelDL" Offset="0x88" />
-        <Texture Name="gClocktowerPanelTex" OutName="clocktower_panel" Format="rgba16" Width="32" Height="32" Offset="0x120" />
-        <Collision Name="gClocktowerPanelCol" Offset="0x968" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tokei_tobira.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tokei_tobira.xml
deleted file mode 100644
index cfa617551..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tokei_tobira.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_tokei_tobira" Segment="6">
-        <Texture Name="object_tokei_tobira_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="object_tokei_tobira_Tex_000800" OutName="tex_000800" Format="i4" Width="64" Height="64" Offset="0x800" />
-        <DList Name="object_tokei_tobira_DL_001100" Offset="0x1100" />
-        <DList Name="object_tokei_tobira_DL_001108" Offset="0x1108" />
-        <Collision Name="object_tokei_tobira_Colheader_0012B0" Offset="0x12B0" />
-        <DList Name="object_tokei_tobira_DL_0013E0" Offset="0x13E0" />
-        <DList Name="object_tokei_tobira_DL_0013E8" Offset="0x13E8" />
-        <Collision Name="object_tokei_tobira_Colheader_001590" Offset="0x1590" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tokei_turret.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tokei_turret.xml
deleted file mode 100644
index 3ed158d83..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tokei_turret.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Object for the turret in South Clock Town that the carpenters build during the 3 day period. -->
-    <File Name="object_tokei_turret" Segment="6">
-        <Texture Name="gClockTownTurretTLUT" OutName="clock_town_turret_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gClockTownTurretTextTex" OutName="clock_town_turret_text" Format="ci4" Width="64" Height="64" Offset="0x20" />
-        <Texture Name="gClockTownTurretFabricTex" OutName="clock_town_turret_fabric" Format="rgba16" Width="32" Height="32" Offset="0x820" />
-        <Texture Name="gClockTownTurretWoodTex" OutName="clock_town_turret_wood" Format="rgba16" Width="16" Height="32" Offset="0x1020" />
-        <Texture Name="gClockTownFlagsTex" OutName="clock_town_flags" Format="rgba16" Width="128" Height="16" Offset="0x1420" />
-        <DList Name="gClockTownTurretEmpty0DL" Offset="0x2500" />
-        <DList Name="gClockTownTurretPlatformBaseDL" Offset="0x2508" />
-        <Collision Name="gClockTownTurretBaseCol" Offset="0x26A0" />
-        <DList Name="gClockTownTurretEmpty1DL" Offset="0x2A80" />
-        <DList Name="gClockTownTurretPlatformTopDL" Offset="0x2A88" />
-        <Collision Name="gClockTownTurretPlatformCol" Offset="0x2D80" />
-        <DList Name="gClockTownTurretEmpty2DL" Offset="0x3030" />
-        <DList Name="gClockTownFlagsDL" Offset="0x3038" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_toryo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_toryo.xml
deleted file mode 100644
index e19f2c540..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_toryo.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <File Name="object_toryo" Segment="6">
-        <Animation Name="object_toryo_Anim_000E50" Offset="0xE50" />
-        <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60" />
-        <Texture Name="object_toryo_Tex_001060" OutName="tex_001060" Format="ci8" Width="16" Height="16" Offset="0x1060" />
-        <Texture Name="object_toryo_Tex_001160" OutName="tex_001160" Format="ci8" Width="8" Height="4" Offset="0x1160" />
-        <Texture Name="object_toryo_Tex_001180" OutName="tex_001180" Format="ci8" Width="8" Height="8" Offset="0x1180" />
-        <Texture Name="object_toryo_Tex_0011C0" OutName="tex_0011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" />
-        <Texture Name="object_toryo_Tex_001200" OutName="tex_001200" Format="ci8" Width="8" Height="8" Offset="0x1200" />
-        <Texture Name="object_toryo_Tex_001240" OutName="tex_001240" Format="ci8" Width="8" Height="16" Offset="0x1240" />
-        <Texture Name="object_toryo_Tex_0012C0" OutName="tex_0012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0" />
-        <Texture Name="object_toryo_Tex_0016C0" OutName="tex_0016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" />
-        <Texture Name="object_toryo_Tex_0017C0" OutName="tex_0017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" />
-        <Texture Name="object_toryo_Tex_0018C0" OutName="tex_0018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" />
-        <Texture Name="object_toryo_Tex_0019C0" OutName="tex_0019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" />
-        <Texture Name="object_toryo_Tex_001A00" OutName="tex_001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" />
-        <Texture Name="object_toryo_Tex_001A80" OutName="tex_001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" />
-        <Texture Name="object_toryo_Tex_001B80" OutName="tex_001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" />
-        <DList Name="object_toryo_DL_004B20" Offset="0x4B20" />
-        <DList Name="object_toryo_DL_004F20" Offset="0x4F20" />
-        <DList Name="object_toryo_DL_005438" Offset="0x5438" />
-        <DList Name="object_toryo_DL_005720" Offset="0x5720" />
-        <DList Name="object_toryo_DL_005958" Offset="0x5958" />
-        <DList Name="object_toryo_DL_005BA0" Offset="0x5BA0" />
-        <DList Name="object_toryo_DL_005D10" Offset="0x5D10" />
-        <DList Name="object_toryo_DL_005EC8" Offset="0x5EC8" />
-        <DList Name="object_toryo_DL_006110" Offset="0x6110" />
-        <DList Name="object_toryo_DL_006280" Offset="0x6280" />
-        <DList Name="object_toryo_DL_0064B8" Offset="0x64B8" />
-        <DList Name="object_toryo_DL_0067E0" Offset="0x67E0" />
-        <DList Name="object_toryo_DL_0068E8" Offset="0x68E8" />
-        <DList Name="object_toryo_DL_006A88" Offset="0x6A88" />
-        <DList Name="object_toryo_DL_006DA8" Offset="0x6DA8" />
-        <DList Name="object_toryo_DL_006EB0" Offset="0x6EB0" />
-        <Limb Name="object_toryo_Standardlimb_007050" Type="Standard" EnumName="OBJECT_TORYO_LIMB_01" Offset="0x7050" />
-        <Limb Name="object_toryo_Standardlimb_00705C" Type="Standard" EnumName="OBJECT_TORYO_LIMB_02" Offset="0x705C" />
-        <Limb Name="object_toryo_Standardlimb_007068" Type="Standard" EnumName="OBJECT_TORYO_LIMB_03" Offset="0x7068" />
-        <Limb Name="object_toryo_Standardlimb_007074" Type="Standard" EnumName="OBJECT_TORYO_LIMB_04" Offset="0x7074" />
-        <Limb Name="object_toryo_Standardlimb_007080" Type="Standard" EnumName="OBJECT_TORYO_LIMB_05" Offset="0x7080" />
-        <Limb Name="object_toryo_Standardlimb_00708C" Type="Standard" EnumName="OBJECT_TORYO_LIMB_06" Offset="0x708C" />
-        <Limb Name="object_toryo_Standardlimb_007098" Type="Standard" EnumName="OBJECT_TORYO_LIMB_07" Offset="0x7098" />
-        <Limb Name="object_toryo_Standardlimb_0070A4" Type="Standard" EnumName="OBJECT_TORYO_LIMB_08" Offset="0x70A4" />
-        <Limb Name="object_toryo_Standardlimb_0070B0" Type="Standard" EnumName="OBJECT_TORYO_LIMB_09" Offset="0x70B0" />
-        <Limb Name="object_toryo_Standardlimb_0070BC" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0A" Offset="0x70BC" />
-        <Limb Name="object_toryo_Standardlimb_0070C8" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0B" Offset="0x70C8" />
-        <Limb Name="object_toryo_Standardlimb_0070D4" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0C" Offset="0x70D4" />
-        <Limb Name="object_toryo_Standardlimb_0070E0" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0D" Offset="0x70E0" />
-        <Limb Name="object_toryo_Standardlimb_0070EC" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0E" Offset="0x70EC" />
-        <Limb Name="object_toryo_Standardlimb_0070F8" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0F" Offset="0x70F8" />
-        <Limb Name="object_toryo_Standardlimb_007104" Type="Standard" EnumName="OBJECT_TORYO_LIMB_10" Offset="0x7104" />
-        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TORYO_LIMB_NONE" LimbMax="OBJECT_TORYO_LIMB_MAX" EnumName="ObjectToryoLimb" Offset="0x7150" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_trap.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_trap.xml
deleted file mode 100644
index 3afdf61d4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_trap.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_trap" Segment="6">
-        <Texture Name="object_trap_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="object_trap_Tex_000400" OutName="tex_000400" Format="i8" Width="32" Height="32" Offset="0x400" />
-        <Texture Name="object_trap_Tex_000800" OutName="tex_000800" Format="i8" Width="32" Height="32" Offset="0x800" />
-        <DList Name="object_trap_DL_001400" Offset="0x1400" />
-        <DList Name="object_trap_DL_001630" Offset="0x1630" />
-        <DList Name="object_trap_DL_001710" Offset="0x1710" />
-        <Texture Name="object_trap_Tex_001BD8" OutName="tex_001BD8" Format="rgba16" Width="32" Height="32" Offset="0x1BD8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tree.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tree.xml
deleted file mode 100644
index 89e3984c5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tree.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_tree" Segment="6">
-        <DList Name="gTreeBodyDL" Offset="0x680" />
-        <DList Name="gTreeLeavesDL" Offset="0x7C8" />
-        <Texture Name="gTreeBodyTex" OutName="tree_body" Format="rgba16" Width="32" Height="32" Offset="0x8B8" />
-        <Texture Name="gTreeLeavesTex" OutName="tree_leaves" Format="rgba16" Width="32" Height="32" Offset="0x10B8" />
-        <Collision Name="gTreeTopCol" Offset="0x1B2C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tro.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tro.xml
deleted file mode 100644
index 0a4a3ea8b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tro.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="object_tro" Segment="6">
-        <Animation Name="gKoumeKioskHeadMovingAnim" Offset="0xA0" />
-        <DList Name="gKoumeKioskDL" Offset="0x6B0" />
-        <Texture Name="gKoumeKioskNoseTLUT" OutName="koume_kiosk_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAE0" />
-        <Texture Name="gKoumeKioskNostrilsTLUT" OutName="koume_kiosk_nostrils_tlut" Format="rgba16" Width="16" Height="16" Offset="0xCE0" />
-        <Texture Name="gKoumeKioskShadowedSkinTex" OutName="koume_kiosk_shadowed_skin" Format="rgba16" Width="2" Height="8" Offset="0xEE0" />
-        <Texture Name="gKoumeKioskNoseTex" OutName="koume_kiosk_nose" Format="ci8" Width="16" Height="8" Offset="0xF00" />
-        <Texture Name="gKoumeKioskJewelHolderTex" OutName="koume_kiosk_jewel_holder" Format="rgba16" Width="16" Height="8" Offset="0xF80" />
-        <Texture Name="gKoumeKioskJewelTex" OutName="koume_kiosk_jewel" Format="rgba16" Width="8" Height="8" Offset="0x1080" />
-        <Texture Name="gKoumeKioskNostrilsTex" OutName="koume_kiosk_nostrils" Format="ci8" Width="8" Height="8" Offset="0x1100" />
-        <Texture Name="gKoumeKioskEyeOpenTex" OutName="koume_kiosk_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x1140"/>
-        <Texture Name="gKoumeKioskEyeHalfTex" OutName="koume_kiosk_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1940"/>
-        <Texture Name="gKoumeKioskEyeClosedTex" OutName="koume_kiosk_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2140"/>
-        <Limb Name="gKoumeKioskHeadLimb" Type="Standard" EnumName="KOUME_KIOSK_LIMB_HEAD" Offset="0x2940" />
-        <Skeleton Name="gKoumeKioskSkel" Type="Normal" LimbType="Standard" LimbNone="KOUME_KIOSK_LIMB_NONE" LimbMax="KOUME_KIOSK_LIMB_MAX" EnumName="KoumeKioskLimb" Offset="0x2950" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_trt.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_trt.xml
deleted file mode 100644
index 9f024f9cb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_trt.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<Root>
-    <!-- Assets for Kotake -->
-    <File Name="object_trt" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gKotakeHoverAnim" Offset="0xA44" />
-        <Animation Name="gKotakeFlyLookAroundAnim" Offset="0x1EF4" />
-        <Animation Name="gKotakeFlyDownAnim" Offset="0x2224" />
-        <Animation Name="gKotakeFlyAnim" Offset="0x2CB0" />
-        <Animation Name="gKotakeWakeUpAnim" Offset="0x30EC" />
-        <Animation Name="gKotakeSurprisedAnim" Offset="0x3D78" />
-
-        <!-- DLists -->
-        <DList Name="gKotakePelvisDL" Offset="0x6380" />
-        <DList Name="gKotakeTorsoDL" Offset="0x6590" />
-        <DList Name="gKotakeNeckDL" Offset="0x66D8" />
-        <DList Name="gKotakeHeadDL" Offset="0x6808" />
-        <DList Name="gKotakeLeftBraidStartDL" Offset="0x7298" />
-        <DList Name="gKotakeLeftBraidEndDL" Offset="0x7398" />
-        <DList Name="gKotakeTeethDL" Offset="0x7478" />
-        <DList Name="gKotakeRightBraidStartDL" Offset="0x74C8" />
-        <DList Name="gKotakeRightBraidEndDL" Offset="0x75C8" />
-        <DList Name="gKotakeRightSleeveStartDL" Offset="0x76A8" />
-        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x77B8" />
-        <DList Name="gKotakeRightHandDL" Offset="0x7928" />
-        <DList Name="gKotakeRightSleeveMidDL" Offset="0x7C10" />
-        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7D28" />
-        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7E38" />
-        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7F48" />
-        <DList Name="gKotakeLeftHandDL" Offset="0x80B8" />
-        <DList Name="gKotakeBroomDL" Offset="0x83A0" />
-        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x86A0" />
-        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x87B8" />
-        <DList Name="gKotakeRightThighDL" Offset="0x88C8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gKotakeRightShinDL" Offset="0x8958" />
-        <DList Name="gKotakeRightFootDL" Offset="0x8A08" />
-        <DList Name="gKotakeLeftThighDL" Offset="0x8AA0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gKotakeLeftShinDL" Offset="0x8B30" />
-        <DList Name="gKotakeLeftFootDL" Offset="0x8BE0" />
-
-        <!-- Textures -->
-        <Texture Name="gKotakeSkinTLUT" OutName="kotake_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8C78" />
-        <Texture Name="gKotakeMouthTLUT" OutName="kotake_mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8E78" />
-        <Texture Name="gKotakeEarTLUT" OutName="kotake_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9078" />
-        <Texture Name="gKotakeFingerTLUT" OutName="kotake_finger_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9278" />
-        <Texture Name="gKotakeNeckTLUT" OutName="kotake_neck_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9478" />
-        <Texture Name="gKotakeNostrilsTLUT" OutName="kotake_nostrils_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9678" />
-        <Texture Name="gKotakeGerudoFabricTex" OutName="kotake_gerudo_fabric" Format="rgba16" Width="32" Height="32" Offset="0x9878" />
-        <Texture Name="gKotakeRobeTex" OutName="kotake_robe" Format="rgba16" Width="16" Height="16" Offset="0xA078" />
-        <Texture Name="gKotakeRobePatternTex" OutName="kotake_robe_pattern" Format="rgba16" Width="16" Height="16" Offset="0xA278" />
-        <Texture Name="gKotakeRobeTrimTex" OutName="kotake_robe_trim" Format="rgba16" Width="16" Height="16" Offset="0xA478" />
-        <Texture Name="gKotakeSkinTex" OutName="kotake_skin" Format="ci8" Width="16" Height="8" Offset="0xA678" />
-        <Texture Name="gKotakeMouthTex" OutName="kotake_mouth" Format="ci8" Width="8" Height="8" Offset="0xA6F8" />
-        <Texture Name="gKotakeHairTex" OutName="kotake_hair" Format="rgba16" Width="8" Height="32" Offset="0xA738" />
-        <Texture Name="gKotakeBraidEndTex" OutName="kotake_braid_end" Format="rgba16" Width="8" Height="8" Offset="0xA938" />
-        <Texture Name="gKotakeEarTex" OutName="kotake_ear" Format="ci8" Width="8" Height="8" Offset="0xA9B8" />
-        <Texture Name="gKotakeCollarNeckTex" OutName="kotake_collar_neck" Format="rgba16" Width="4" Height="8" Offset="0xA9F8" />
-        <Texture Name="gKotakeFingerTex" OutName="kotake_finger" Format="ci8" Width="8" Height="16" Offset="0xAA38" />
-        <Texture Name="gKotakeBroomHandleTex" OutName="kotake_broom_handle" Format="rgba16" Width="8" Height="8" Offset="0xAAB8" />->
-        <Texture Name="gKotakeBroomHeadTex" OutName="kotake_broom_head" Format="rgba16" Width="16" Height="32" Offset="0xAB38" />
-        <Texture Name="gKotakeJewelHolderTex" OutName="kotake_jewel_holder" Format="rgba16" Width="16" Height="8" Offset="0xAF38" />
-        <Texture Name="gKotakeNeckTex" OutName="kotake_neck" Format="ci8" Width="8" Height="8" Offset="0xB038" />
-        <Texture Name="gKotakeNostrilsTex" OutName="kotake_nostrils" Format="ci8" Width="8" Height="8" Offset="0xB078" />
-        <Texture Name="gKotakeEyeOpenTex" OutName="kotake_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB0B8" />
-        <Texture Name="gKotakeEyeHalfTex" OutName="kotake_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xB8B8" />
-        <Texture Name="gKotakeEyeClosedTex" OutName="kotake_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0B8" />
-        <Texture Name="gKotakeJewelTex" OutName="kotake_jewel" Format="rgba16" Width="8" Height="8" Offset="0xC8B8" />
-
-        <!-- Unused Eye TexAnim-->
-        <TextureAnimation Name="gKotakeEyesTexAnim" Offset="0xC988" />
-
-        <!-- Animations -->
-        <Animation Name="gKotakeHandsOnCounterAnim" Offset="0xD52C" />
-        <Animation Name="gKotakeIdleAnim" Offset="0xDE68" />
-        <Animation Name="gKotakeHalfAwakeAnim" Offset="0xEE98" />
-        <Animation Name="gKotakeSleepingAnim" Offset="0xFD34" />
-
-        <!-- Skeleton -->
-        <Limb Name="gKotakePelvisLimb" Type="Standard" EnumName="KOTAKE_LIMB_PELVIS" Offset="0xFD50" />
-        <Limb Name="gKotakeLeftThighLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_THIGH" Offset="0xFD5C" />
-        <Limb Name="gKotakeLeftShinLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_SHIN" Offset="0xFD68" />
-        <Limb Name="gKotakeLeftFootLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_FOOT" Offset="0xFD74" />
-        <Limb Name="gKotakeRightThighLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGH_THIGH" Offset="0xFD80" />
-        <Limb Name="gKotakeRightShinLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_SHIN" Offset="0xFD8C" />
-        <Limb Name="gKotakeRightFootLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_FOOT" Offset="0xFD98" />
-        <Limb Name="gKotakeTorsoLimb" Type="Standard" EnumName="KOTAKE_LIMB_TORSO_LIMB" Offset="0xFDA4" />
-        <Limb Name="gKotakeLeftSleeveStartLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_SLEEVE_START" Offset="0xFDB0" />
-        <Limb Name="gKotakeLeftSleeveMidLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_SLEEVE_MID" Offset="0xFDBC" />
-        <Limb Name="gKotakeLeftSleeveEndLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_SLEEVE_END" Offset="0xFDC8" />
-        <Limb Name="gKotakeLeftSleeveFrontLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_SLEEVE_FRONT" Offset="0xFDD4" />
-        <Limb Name="gKotakeLeftHandLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_HAND" Offset="0xFDE0" />
-        <Limb Name="gKotakeBroomLimb" Type="Standard" EnumName="KOTAKE_LIMB_BROOM" Offset="0xFDEC" />
-        <Limb Name="gKotakeRightSleeveStartLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_SLEEVE_START" Offset="0xFDF8" />
-        <Limb Name="gKotakeRightSleeveMidLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_SLEEVE_MID" Offset="0xFE04" />
-        <Limb Name="gKotakeRightSleeveEndLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_SLEEVE_END" Offset="0xFE10" />
-        <Limb Name="gKotakeRightSleeveFrontLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_SLEEVE_FRONT" Offset="0xFE1C" />
-        <Limb Name="gKotakeRightHandLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_HAND" Offset="0xFE28" />
-        <Limb Name="gKotakeNeckLimb" Type="Standard" EnumName="KOTAKE_LIMB_NECK" Offset="0xFE34" />
-        <Limb Name="gKotakeHeadLimb" Type="Standard" EnumName="KOTAKE_LIMB_HEAD" Offset="0xFE40" />
-        <Limb Name="gKotakeRightBraidStartLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_BRAID_START" Offset="0xFE4C" />
-        <Limb Name="gKotakeRightBraidEndLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_BRAID_END" Offset="0xFE58" />
-        <Limb Name="gKotakeTeethLimb" Type="Standard" EnumName="KOTAKE_LIMB_TEETH" Offset="0xFE64" />
-        <Limb Name="gKotakeLeftBraidStartLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_BRAID_START" Offset="0xFE70" />
-        <Limb Name="gKotakeLeftBraidEndLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_BRAID_END" Offset="0xFE7C" />
-        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" LimbNone="KOTAKE_LIMB_NONE" LimbMax="KOTAKE_LIMB_MAX" EnumName="KotakeLimb" Offset="0xFEF0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tru.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tru.xml
deleted file mode 100644
index db35ec604..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tru.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<Root>
-    <!-- Assets for Koume -->
-    <File Name="object_tru" Segment="6">
-        <DList Name="gKoumeTargetDL" Offset="0x390" />
-        <DList Name="gKoumeChainDL" Offset="0x4C8" />
-        <Texture Name="gKoumeChainTex" OutName="koume_chain" Format="rgba16" Width="16" Height="32" Offset="0x560" />
-        <Texture Name="gKoumeTargetSideTex" OutName="koume_target_side" Format="rgba16" Width="32" Height="32" Offset="0x960" />
-        <Texture Name="gKoumeTargetFaceTex" OutName="koume_target_face" Format="rgba16" Width="32" Height="32" Offset="0x1160" />
-
-        <DList Name="gKoumeBottleDL" Offset="0x1F90" />
-        <DList Name="gKoumePotionDL" Offset="0x20C8" />
-        <DList Name="gKoumeEmptyDL" Offset="0x2160" />
-        <Texture Name="gKoumeBottleTex" OutName="koume_bottle" Format="i4" Width="16" Height="16" Offset="0x2168" />
-
-        <Animation Name="gKoumeFlyAnim" Offset="0x2BD8" />
-        <Animation Name="gKoumeTakeOffAnim" Offset="0x3698" />
-        <Animation Name="gKoumeHoverAnim" Offset="0x446C" />
-        <Animation Name="gKoumeDrinkAnim" Offset="0x7FA0" />
-        <Animation Name="gKoumeInjuredRaiseHeadAnim" Offset="0x9348" />
-
-        <DList Name="gKoumePelvisDL" Offset="0xB730" />
-        <DList Name="gKoumeTorsoDL" Offset="0xB940" />
-        <DList Name="gKoumeNeckDL" Offset="0xBA88" />
-        <DList Name="gKoumeHeadDL" Offset="0xBBB8" />
-        <DList Name="gKoumeLeftBraidStartDL" Offset="0xC630" />
-        <DList Name="gKoumeLeftBraidEndDL" Offset="0xC730" />
-        <DList Name="gKoumeTeethDL" Offset="0xC810" />
-        <DList Name="gKoumeRightBraidStartDL" Offset="0xC860" />
-        <DList Name="gKoumeRightBraidEndDL" Offset="0xC960" />
-        <DList Name="gKoumeRightSleeveStartDL" Offset="0xCA40" />
-        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xCB50" />
-        <DList Name="gKoumeRightHandDL" Offset="0xCCC0" />
-        <DList Name="gKoumeRightSleeveMidDL" Offset="0xCFA8" />
-        <DList Name="gKoumeRightSleeveEndDL" Offset="0xD0C0" />
-        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xD1D0" />
-        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xD2E0" />
-        <DList Name="gKoumeLeftHandDL" Offset="0xD450" />
-        <DList Name="gKoumeBroomDL" Offset="0xD738" />
-        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xDA38" />
-        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xDB50" />
-        <DList Name="gKoumeRightThighDL" Offset="0xDC40" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gKoumeRightShinDL" Offset="0xDC88" />
-        <DList Name="gKoumeRightFootDL" Offset="0xDD38" />
-        <DList Name="gKoumeLeftThighDL" Offset="0xDDD0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gKoumeLeftShinDL" Offset="0xDE18" />
-        <DList Name="gKoumeLeftFootDL" Offset="0xDEC8" />
-
-        <Animation Name="gKoumeInjuredTalkAnim" Offset="0xEEDC" />
-        <Animation Name="gKoumeInjuredLyingDownAnim" Offset="0xF9A0" />
-        <Animation Name="gKoumeTryGetUpAnim" Offset="0x108AC" />
-        <Animation Name="gKoumeHealedAnim" Offset="0x11F88" />
-        <Animation Name="gKoumeTakeAnim" Offset="0x14728" />
-        <Animation Name="gKoumeIdleAnim" Offset="0x15068" />
-        <Animation Name="gKoumeInjuredHeadUpAnim" Offset="0x15CA0" />
-        <Animation Name="gKoumeFinishedDrinkingAnim" Offset="0x16B4C" />
-
-        <Texture Name="gKoumeSkinTLUT" OutName="koume_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x16B60" />
-        <Texture Name="gKoumeMouthTLUT" OutName="koume_mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x16D60" />
-        <Texture Name="gKoumeEarTLUT" OutName="koume_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x16F60" />
-        <Texture Name="gKoumeFingerTLUT" OutName="koume_finger_tlut" Format="rgba16" Width="16" Height="16" Offset="0x17160" />
-        <Texture Name="gKoumeNeckTLUT" OutName="koume_neck_tlut" Format="rgba16" Width="16" Height="16" Offset="0x17360" />
-        <Texture Name="gKoumeNostrilsTLUT" OutName="koume_nostrils_tlut" Format="rgba16" Width="16" Height="16" Offset="0x17560" />
-        <Texture Name="gKoumeGerudoFabricTex" OutName="koume_gerudo_fabric" Format="rgba16" Width="32" Height="32" Offset="0x17760" />
-        <Texture Name="gKoumeRobeTex" OutName="koume_robe" Format="rgba16" Width="16" Height="16" Offset="0x17F60" />
-        <Texture Name="gKoumeRobePatternTex" OutName="koume_robe_pattern" Format="rgba16" Width="16" Height="16" Offset="0x18160" />
-        <Texture Name="gKoumeRobeTrimTex" OutName="koume_robe_trim" Format="rgba16" Width="16" Height="16" Offset="0x18360" />
-        <Texture Name="gKoumeSkinTex" OutName="koume_skin" Format="ci8" Width="16" Height="8" Offset="0x18560" />
-        <Texture Name="gKoumeMouthTex" OutName="koume_mouth" Format="ci8" Width="8" Height="8" Offset="0x185E0" />
-        <Texture Name="gKoumeHairTex" OutName="koume_hair" Format="rgba16" Width="8" Height="32" Offset="0x18620" />
-        <Texture Name="gKoumeBraidEndTex" OutName="koume_braid_end" Format="rgba16" Width="8" Height="8" Offset="0x18820" />
-        <Texture Name="gKoumeEarTex" OutName="koume_ear" Format="ci8" Width="8" Height="8" Offset="0x188A0" />
-        <Texture Name="gKoumeCollarNeckTex" OutName="koume_collar_neck" Format="rgba16" Width="4" Height="8" Offset="0x188E0" />
-        <Texture Name="gKoumeFingerTex" OutName="koume_finger" Format="ci8" Width="8" Height="16" Offset="0x18920" />
-        <Texture Name="gKoumeBroomHandleTex" OutName="koume_broom_handle" Format="rgba16" Width="8" Height="8" Offset="0x189A0" />
-        <Texture Name="gKoumeBroomHeadTex" OutName="koume_broom_head" Format="rgba16" Width="16" Height="32" Offset="0x18A20" />
-        <Texture Name="gKoumeJewelHolderTex" OutName="koume_jewel_holder" Format="rgba16" Width="16" Height="8" Offset="0x18E20" />
-        <Texture Name="gKoumeNeckTex" OutName="koume_neck" Format="ci8" Width="8" Height="8" Offset="0x18F20" />
-        <Texture Name="gKoumeNostrilsTex" OutName="koume_nostrils" Format="ci8" Width="8" Height="8" Offset="0x18F60" />
-        <Texture Name="gKoumeEyeOpenTex" OutName="koume_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x18FA0" />
-        <Texture Name="gKoumeEyeHalfTex" OutName="koume_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x197A0" />
-        <Texture Name="gKoumeEyeClosedTex" OutName="koume_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x19FA0" />
-        <Texture Name="gKoumeJewelTex" OutName="koume_jewel" Format="rgba16" Width="8" Height="8" Offset="0x1A7A0" />
-
-        <DList Name="gKoumeDustMaterialDL" Offset="0x1A820" />
-        <DList Name="gKoumeDustModelDL" Offset="0x1A830" />
-
-        <Limb Name="gKoumePelvisLimb" Type="Standard" EnumName="KOUME_LIMB_PELVIS" Offset="0x1A8C0" />
-        <Limb Name="gKoumeLeftThighLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_THIGH" Offset="0x1A8CC" />
-        <Limb Name="gKoumeLeftShinLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_SHIN" Offset="0x1A8D8" />
-        <Limb Name="gKoumeLeftFootLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_FOOT" Offset="0x1A8E4" />
-        <Limb Name="gKoumeRightThighLimb" Type="Standard" EnumName="KOUME_LIMB_RIGH_THIGH" Offset="0x1A8F0" />
-        <Limb Name="gKoumeRightShinLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_SHIN" Offset="0x1A8FC" />
-        <Limb Name="gKoumeRightFootLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_FOOT" Offset="0x1A908" />
-        <Limb Name="gKoumeTorsoLimb" Type="Standard" EnumName="KOUME_LIMB_TORSO_LIMB" Offset="0x1A914" />
-        <Limb Name="gKoumeLeftSleeveStartLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_SLEEVE_START" Offset="0x1A920" />
-        <Limb Name="gKoumeLeftSleeveMidLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_SLEEVE_MID" Offset="0x1A92C" />
-        <Limb Name="gKoumeLeftSleeveEndLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_SLEEVE_END" Offset="0x1A938" />
-        <Limb Name="gKoumeLeftSleeveFrontLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_SLEEVE_FRONT" Offset="0x1A944" />
-        <Limb Name="gKoumeLeftHandLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_HAND" Offset="0x1A950" />
-        <Limb Name="gKoumeBroomLimb" Type="Standard" EnumName="KOUME_LIMB_BROOM" Offset="0x1A95C" />
-        <Limb Name="gKoumeRightSleeveStartLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_SLEEVE_START" Offset="0x1A968" />
-        <Limb Name="gKoumeRightSleeveMidLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_SLEEVE_MID" Offset="0x1A974" />
-        <Limb Name="gKoumeRightSleeveEndLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_SLEEVE_END" Offset="0x1A980" />
-        <Limb Name="gKoumeRightSleeveFrontLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_SLEEVE_FRONT" Offset="0x1A98C" />
-        <Limb Name="gKoumeRightHandLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_HAND" Offset="0x1A998" />
-        <Limb Name="gKoumeNeckLimb" Type="Standard" EnumName="KOUME_LIMB_NECK" Offset="0x1A9A4" />
-        <Limb Name="gKoumeHeadLimb" Type="Standard" EnumName="KOUME_LIMB_HEAD" Offset="0x1A9B0" />
-        <Limb Name="gKoumeRightBraidStartLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_BRAID_START" Offset="0x1A9BC" />
-        <Limb Name="gKoumeRightBraidEndLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_BRAID_END" Offset="0x1A9C8" />
-        <Limb Name="gKoumeTeethLimb" Type="Standard" EnumName="KOUME_LIMB_TEETH" Offset="0x1A9D4" />
-        <Limb Name="gKoumeLeftBraidStartLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_BRAID_START" Offset="0x1A9E0" />
-        <Limb Name="gKoumeLeftBraidEndLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_BRAID_END" Offset="0x1A9EC" />
-        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" LimbNone="KOUME_LIMB_NONE" LimbMax="KOUME_LIMB_MAX" EnumName="KoumeLimb" Offset="0x1AA60" />
-
-        <Animation Name="gKoumeShakeAnim" Offset="0x1B5C4" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tsn.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tsn.xml
deleted file mode 100644
index d610b185e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tsn.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <File Name="object_tsn" Segment="6">
-        <Animation Name="object_tsn_Anim_000964" Offset="0x964" />
-        <Animation Name="object_tsn_Anim_001198" Offset="0x1198" />
-        <DList Name="object_tsn_DL_0043A0" Offset="0x43A0" />
-        <DList Name="object_tsn_DL_0044F0" Offset="0x44F0" />
-        <DList Name="object_tsn_DL_0047C0" Offset="0x47C0" />
-        <DList Name="object_tsn_DL_004B48" Offset="0x4B48" />
-        <DList Name="object_tsn_DL_004F00" Offset="0x4F00" />
-        <DList Name="object_tsn_DL_0050B8" Offset="0x50B8" />
-        <DList Name="object_tsn_DL_005270" Offset="0x5270" />
-        <DList Name="object_tsn_DL_0053B8" Offset="0x53B8" />
-        <DList Name="object_tsn_DL_0055E8" Offset="0x55E8" />
-        <DList Name="object_tsn_DL_005818" Offset="0x5818" />
-        <DList Name="object_tsn_DL_005960" Offset="0x5960" />
-        <DList Name="object_tsn_DL_005B00" Offset="0x5B00" />
-        <DList Name="object_tsn_DL_005CF8" Offset="0x5CF8" />
-        <DList Name="object_tsn_DL_005DE8" Offset="0x5DE8" />
-        <DList Name="object_tsn_DL_005F88" Offset="0x5F88" />
-        <DList Name="object_tsn_DL_006108" Offset="0x6108" />
-        <Texture Name="object_tsn_TLUT_0061F8" OutName="tlut_0061F8" Format="rgba16" Width="16" Height="16" Offset="0x61F8" />
-        <Texture Name="object_tsn_Tex_0063F8" OutName="tex_0063F8" Format="ci8" Width="32" Height="64" Offset="0x63F8" />
-        <Texture Name="object_tsn_Tex_006BF8" OutName="tex_006BF8" Format="ci8" Width="8" Height="8" Offset="0x6BF8" />
-        <Texture Name="object_tsn_Tex_006C38" OutName="tex_006C38" Format="ci8" Width="8" Height="8" Offset="0x6C38" />
-        <Texture Name="object_tsn_Tex_006C78" OutName="tex_006C78" Format="ci8" Width="8" Height="8" Offset="0x6C78" />
-        <Texture Name="object_tsn_Tex_006CB8" OutName="tex_006CB8" Format="ci8" Width="32" Height="32" Offset="0x6CB8" />
-        <Texture Name="object_tsn_Tex_0070B8" OutName="tex_0070B8" Format="rgba16" Width="16" Height="16" Offset="0x70B8" />
-        <Texture Name="object_tsn_Tex_0072B8" OutName="tex_0072B8" Format="ci8" Width="16" Height="16" Offset="0x72B8" />
-        <Texture Name="object_tsn_Tex_0073B8" OutName="tex_0073B8" Format="ci8" Width="32" Height="32" Offset="0x73B8" />
-        <Texture Name="object_tsn_Tex_0077B8" OutName="tex_0077B8" Format="rgba16" Width="16" Height="32" Offset="0x77B8" />
-        <Texture Name="object_tsn_Tex_007BB8" OutName="tex_007BB8" Format="rgba16" Width="16" Height="16" Offset="0x7BB8" />
-        <Texture Name="object_tsn_Tex_007DB8" OutName="tex_007DB8" Format="rgba16" Width="32" Height="32" Offset="0x7DB8" />
-        <Texture Name="object_tsn_Tex_0085B8" OutName="tex_0085B8" Format="ci8" Width="32" Height="32" Offset="0x85B8" />
-        <Limb Name="object_tsn_Standardlimb_0089B8" Type="Standard" EnumName="OBJECT_TSN_LIMB_01" Offset="0x89B8" />
-        <Limb Name="object_tsn_Standardlimb_0089C4" Type="Standard" EnumName="OBJECT_TSN_LIMB_02" Offset="0x89C4" />
-        <Limb Name="object_tsn_Standardlimb_0089D0" Type="Standard" EnumName="OBJECT_TSN_LIMB_03" Offset="0x89D0" />
-        <Limb Name="object_tsn_Standardlimb_0089DC" Type="Standard" EnumName="OBJECT_TSN_LIMB_04" Offset="0x89DC" />
-        <Limb Name="object_tsn_Standardlimb_0089E8" Type="Standard" EnumName="OBJECT_TSN_LIMB_05" Offset="0x89E8" />
-        <Limb Name="object_tsn_Standardlimb_0089F4" Type="Standard" EnumName="OBJECT_TSN_LIMB_06" Offset="0x89F4" />
-        <Limb Name="object_tsn_Standardlimb_008A00" Type="Standard" EnumName="OBJECT_TSN_LIMB_07" Offset="0x8A00" />
-        <Limb Name="object_tsn_Standardlimb_008A0C" Type="Standard" EnumName="OBJECT_TSN_LIMB_08" Offset="0x8A0C" />
-        <Limb Name="object_tsn_Standardlimb_008A18" Type="Standard" EnumName="OBJECT_TSN_LIMB_09" Offset="0x8A18" />
-        <Limb Name="object_tsn_Standardlimb_008A24" Type="Standard" EnumName="OBJECT_TSN_LIMB_0A" Offset="0x8A24" />
-        <Limb Name="object_tsn_Standardlimb_008A30" Type="Standard" EnumName="OBJECT_TSN_LIMB_0B" Offset="0x8A30" />
-        <Limb Name="object_tsn_Standardlimb_008A3C" Type="Standard" EnumName="OBJECT_TSN_LIMB_0C" Offset="0x8A3C" />
-        <Limb Name="object_tsn_Standardlimb_008A48" Type="Standard" EnumName="OBJECT_TSN_LIMB_0D" Offset="0x8A48" />
-        <Limb Name="object_tsn_Standardlimb_008A54" Type="Standard" EnumName="OBJECT_TSN_LIMB_0E" Offset="0x8A54" />
-        <Limb Name="object_tsn_Standardlimb_008A60" Type="Standard" EnumName="OBJECT_TSN_LIMB_0F" Offset="0x8A60" />
-        <Limb Name="object_tsn_Standardlimb_008A6C" Type="Standard" EnumName="OBJECT_TSN_LIMB_10" Offset="0x8A6C" />
-        <Skeleton Name="object_tsn_Skel_008AB8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TSN_LIMB_NONE" LimbMax="OBJECT_TSN_LIMB_MAX" EnumName="ObjectTsnLimb" Offset="0x8AB8" />
-        <Animation Name="object_tsn_Anim_0092FC" Offset="0x92FC" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tsubo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tsubo.xml
deleted file mode 100644
index 8bbebfc85..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_tsubo.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Object for normal brown pot/jar -->
-    <File Name="object_tsubo" Segment="6">
-        <Texture Name="gPotWallTex" OutName="pot_wall" Format="rgba16" Width="32" Height="64" Offset="0x0" />
-        <Texture Name="gPotRimTex" OutName="pot_rim" Format="rgba16" Width="16" Height="16" Offset="0x1000" />
-        <Texture Name="gPotShardTex" OutName="pot_shard" Format="rgba16" Width="16" Height="16" Offset="0x1200" />
-        <DList Name="gPotDL" Offset="0x17C0" />
-        <DList Name="gPotShardDL" Offset="0x1960" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_twig.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_twig.xml
deleted file mode 100644
index 7b9c6c191..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_twig.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_twig" Segment="6">
-        <Texture Name="object_twig_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="object_twig_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800" />
-        <Texture Name="object_twig_Tex_001000" OutName="tex_001000" Format="rgba16" Width="16" Height="32" Offset="0x1000" />
-        <DList Name="object_twig_DL_0014C0" Offset="0x14C0" />
-        <DList Name="object_twig_DL_0014C8" Offset="0x14C8" />
-        <Collision Name="object_twig_Colheader_0016C0" Offset="0x16C0" />
-        <DList Name="object_twig_DL_001C30" Offset="0x1C30" />
-        <DList Name="object_twig_DL_001C38" Offset="0x1C38" />
-        <Collision Name="object_twig_Colheader_0020A0" Offset="0x20A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_uch.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_uch.xml
deleted file mode 100644
index d82bf5b10..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_uch.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Root>
-    <!-- Assets for the Ghosts, more-commonly known as the aliens -->
-    <File Name="object_uch" Segment="6">
-        <!-- Assets for the beam of light coming from the alien's eyes. -->
-        <DList Name="gAlienEyeBeamDL" Offset="0x80" />
-        <Texture Name="gAlienEyeBeamMaskTex" OutName="alien_eye_beam_mask" Format="i8" Width="32" Height="32" Offset="0x130" />
-        <TextureAnimation Name="gAlienEyeBeamTexAnim" Offset="0x550" />
-
-        <!-- An empty texture animation, seemingly planned to animate something on the alien's body. -->
-        <TextureAnimation Name="gAlienEmptyTexAnim" Offset="0x560" />
-
-        <!-- Alien Animations -->
-        <Animation Name="gAlienDeathAnim" Offset="0x608" /> <!-- Original name is "uch_die_body" -->
-        <Animation Name="gAlienJerkingAnim" Offset="0x6C8" /> <!-- Original name is "uch_gaku_body" (probably short for the onomatopoeia for "jerking") -->
-
-        <!-- Assets for the flash of light that appears when an alien dies. -->
-        <DList Name="gAlienDeathFlashDL" Offset="0x720" />
-        <Texture Name="gAlienDeathFlashMaskTex" OutName="alien_death_flash_mask" Format="ia16" Width="32" Height="32" Offset="0x7B8" />
-
-        <!-- Alien Animations -->
-        <Animation Name="gAlienHoldingCowAnim" Offset="0x1674" /> <!-- Original name is "uch_take_body" -->
-        <Animation Name="gAlienFloatAnim" Offset="0x1D80" /> <!-- Original name is "uch_wait_body" -->
-
-        <!-- Alien Limb DisplayLists -->
-        <DList Name="gAlienHeadDL" Offset="0x2CD0" />
-        <DList Name="gAlienRightEyeDL" Offset="0x2F08" />
-        <DList Name="gAlienLeftEyeDL" Offset="0x2FA8" />
-        <DList Name="gAlienLeftShoulderDL" Offset="0x3048" />
-        <DList Name="gAlienLeftUpperArmDL" Offset="0x3128" />
-        <DList Name="gAlienLeftForearmDL" Offset="0x3290" />
-        <DList Name="gAlienLeftHandDL" Offset="0x3410" />
-        <DList Name="gAlienTorsoDL" Offset="0x35E8" />
-        <DList Name="gAlienRightShoulderDL" Offset="0x37E0" />
-        <DList Name="gAlienRightUpperArmDL" Offset="0x38C0" />
-        <DList Name="gAlienRightForearmDL" Offset="0x3A28" />
-        <DList Name="gAlienRightHandDL" Offset="0x3BA8" />
-
-        <!-- Alien Textures -->
-        <Texture Name="gAlienTLUT" OutName="alien_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3D80" />
-        <Texture Name="gAlienTorsoTex" OutName="alien_torso" Format="ci8" Width="16" Height="16" Offset="0x3F80" />
-        <Texture Name="gAlienHandsAndTorsoUndersideTex" OutName="alien_hands_and_torso_underside" Format="ci8" Width="16" Height="16" Offset="0x4080" />
-        <Texture Name="gAlienHeadFrontAndArmsTex" OutName="alien_head_front_and_arms" Format="ci8" Width="16" Height="32" Offset="0x4180" />
-        <Texture Name="gAlienHeadBackTex" OutName="alien_head_back" Format="ci8" Width="16" Height="32" Offset="0x4380" />
-        <Texture Name="gAlienEyeTex" OutName="alien_eye" Format="rgba16" Width="32" Height="32" Offset="0x4580" />
-
-        <!-- Alien Limbs -->
-        <Limb Name="gAlienRootLimb" Type="Standard" EnumName="ALIEN_LIMB_ROOT" Offset="0x4D80" />
-        <Limb Name="gAlienTorsoLimb" Type="Standard" EnumName="ALIEN_LIMB_TORSO" Offset="0x4D8C" />
-        <Limb Name="gAlienRightShoulderLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_SHOULDER" Offset="0x4D98" />
-        <Limb Name="gAlienRightUpperArmLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_UPPER_ARM" Offset="0x4DA4" />
-        <Limb Name="gAlienRightForearmLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_FOREARM" Offset="0x4DB0" />
-        <Limb Name="gAlienRightHandLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_HAND" Offset="0x4DBC" />
-        <Limb Name="gAlienLeftShoulderLimb" Type="Standard" EnumName="ALIEN_LIMB_LEFT_SHOULDER" Offset="0x4DC8" />
-        <Limb Name="gAlienLeftUpperArmLimb" Type="Standard" EnumName="ALIEN_LIMB_LEFT_UPPER_ARM" Offset="0x4DD4" />
-        <Limb Name="gAlienLeftForearmLimb" Type="Standard" EnumName="ALIEN_LIMB_LEFT_FOREARM" Offset="0x4DE0" />
-        <Limb Name="gAlienLeftHandLimb" Type="Standard" EnumName="ALIEN_LIMB_LEFT_HAND" Offset="0x4DEC" />
-        <Limb Name="gAlienHeadLimb" Type="Standard" EnumName="ALIEN_LIMB_HEAD" Offset="0x4DF8" />
-        <Limb Name="gAlienLeftEyeLimb" Type="Standard" EnumName="ALIEN_LIMB_LEFT_EYE" Offset="0x4E04" />
-        <Limb Name="gAlienRightEyeLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_EYE" Offset="0x4E10" />
-
-        <!-- Alien Skeleton -->
-        <Skeleton Name="gAlienSkel" Type="Flex" LimbType="Standard" LimbNone="ALIEN_LIMB_NONE" LimbMax="ALIEN_LIMB_MAX" EnumName="AlienLimb" Offset="0x4E50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_um.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_um.xml
deleted file mode 100644
index aac86a9a7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_um.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<Root>
-    <File Name="object_um" Segment="6">
-        <DList Name="object_um_DL_000040" Offset="0x40" />
-        <Texture Name="object_um_Tex_0000C8" OutName="tex_0000C8" Format="rgba16" Width="32" Height="32" Offset="0xC8" />
-        <DList Name="object_um_DL_000910" Offset="0x910" />
-        <Texture Name="object_um_Tex_000998" OutName="tex_000998" Format="rgba16" Width="32" Height="32" Offset="0x998" />
-        <DList Name="object_um_DL_0011E0" Offset="0x11E0" />
-        <Texture Name="object_um_Tex_001268" OutName="tex_001268" Format="rgba16" Width="32" Height="32" Offset="0x1268" />
-        <DList Name="object_um_DL_001EE0" Offset="0x1EE0" />
-        <Texture Name="object_um_Tex_002148" OutName="tex_002148" Format="rgba16" Width="32" Height="32" Offset="0x2148" />
-        <Texture Name="object_um_Tex_002948" OutName="tex_002948" Format="rgba16" Width="32" Height="32" Offset="0x2948" />
-        <Texture Name="object_um_Tex_003148" OutName="tex_003148" Format="rgba16" Width="32" Height="32" Offset="0x3148" />
-
-        <!-- The bottles which the bandits try to destroy in the milk-run minigame. Referred as "milk-bottles" by Cremia in-game. -->
-        <DList Name="gUmMinigamePotDL" Offset="0x3C60" />
-        <Texture Name="object_um_Tex_003F00" OutName="tex_003F00" Format="rgba16" Width="16" Height="16" Offset="0x3F00" />
-        <Texture Name="object_um_Tex_004100" OutName="tex_004100" Format="rgba16" Width="8" Height="8" Offset="0x4100" />
-        <DList Name="object_um_DL_0043E0" Offset="0x43E0" />
-        <Texture Name="object_um_Tex_004500" OutName="tex_004500" Format="i8" Width="32" Height="32" Offset="0x4500" />
-        <DList Name="object_um_DL_004B60" Offset="0x4B60" />
-        <Texture Name="object_um_Tex_004C80" OutName="tex_004C80" Format="i8" Width="32" Height="32" Offset="0x4C80" />
-        <DList Name="gUmBrokenMinigamePotDL" Offset="0x52B0" />
-        <Texture Name="object_um_TLUT_0054D0" OutName="tlut_0054D0" Format="rgba16" Width="16" Height="16" Offset="0x54D0" />
-        <Texture Name="object_um_Tex_0056D0" OutName="tex_0056D0" Format="ci8" Width="8" Height="8" Offset="0x56D0" />
-        <Texture Name="object_um_Tex_005710" OutName="tex_005710" Format="ci8" Width="32" Height="64" Offset="0x5710" />
-        <Texture Name="object_um_Tex_005F10" OutName="tex_005F10" Format="ci8" Width="32" Height="32" Offset="0x5F10" />
-        <DList Name="object_um_DL_0067C0" Offset="0x67C0" /> <!-- pre-minigame pot? -->
-        <Texture Name="object_um_TLUT_006AD0" OutName="tlut_006AD0" Format="rgba16" Width="16" Height="16" Offset="0x6AD0" />
-        <Texture Name="object_um_Tex_006CD0" OutName="tex_006CD0" Format="ci8" Width="8" Height="8" Offset="0x6CD0" />
-        <Texture Name="object_um_Tex_006D10" OutName="tex_006D10" Format="ci8" Width="32" Height="64" Offset="0x6D10" />
-        <Texture Name="object_um_Tex_007510" OutName="tex_007510" Format="rgba16" Width="32" Height="32" Offset="0x7510" />
-
-        <!-- <Blob Name="object_um_Blob_007D10" Size="0x10" Offset="0x7D10" /> -->
-
-        <Collision Name="object_um_Colheader_007E20" Offset="0x7E20" />
-        <Collision Name="object_um_Colheader_007F50" Offset="0x7F50" />
-
-        <DList Name="object_um_DL_00DF20" Offset="0xDF20" />
-        <DList Name="object_um_DL_00E2F0" Offset="0xE2F0" />
-        <DList Name="object_um_DL_00E6A8" Offset="0xE6A8" />
-        <DList Name="object_um_DL_00ED18" Offset="0xED18" />
-        <DList Name="object_um_DL_00EEB0" Offset="0xEEB0" />
-        <DList Name="object_um_DL_00F150" Offset="0xF150" />
-        <DList Name="object_um_DL_00F2D8" Offset="0xF2D8" />
-        <DList Name="object_um_DL_00F590" Offset="0xF590" />
-        <DList Name="object_um_DL_00F828" Offset="0xF828" />
-        <DList Name="object_um_DL_00F9B0" Offset="0xF9B0" />
-        <DList Name="object_um_DL_00FBF8" Offset="0xFBF8" />
-        <DList Name="object_um_DL_010178" Offset="0x10178" />
-        <DList Name="object_um_DL_0103E0" Offset="0x103E0" />
-        <DList Name="object_um_DL_010908" Offset="0x10908" />
-        <DList Name="object_um_DL_010AA8" Offset="0x10AA8" />
-        <DList Name="object_um_DL_010B40" Offset="0x10B40" />
-        <DList Name="object_um_DL_010BD8" Offset="0x10BD8" />
-        <DList Name="object_um_DL_010CC8" Offset="0x10CC8" />
-        <DList Name="object_um_DL_0114B8" Offset="0x114B8" />
-
-        <Limb Name="gUmWagonSeatAndShaftsLimb" Type="Standard" EnumName="UM_LIMB_SEAT_AND_SHAFTS" Offset="0x11CA8" /> <!-- Chair and donkey attachment -->
-        <Limb Name="gUmWagonRootLimb" Type="Standard" EnumName="UM_LIMB_WAGON_ROOT" Offset="0x11CB4" />
-        <Limb Name="gUmWagonRightWheelLimb" Type="Standard" EnumName="UM_LIMB_WAGON_RIGHT_WHEEL" Offset="0x11CC0" />
-        <Limb Name="gUmWagonLeftWheelLimb" Type="Standard" EnumName="UM_LIMB_WAGON_LEFT_WHEEL" Offset="0x11CCC" />
-        <Limb Name="gUmWagonCartBedLimb" Type="Standard" EnumName="UM_LIMB_WAGON_CART_BED" Offset="0x11CD8" />
-        <Limb Name="gUmWagonHandBrakeLimb" Type="Standard" EnumName="UM_LIMB_WAGON_HAND_BRAKE" Offset="0x11CE4" />
-        <Limb Name="gUmWagonCartCoverLimb" Type="Standard" EnumName="UM_LIMB_WAGON_CART_COVER" Offset="0x11CF0" />
-        <Limb Name="gUmWagonLeftLeafSpringLimb" Type="Standard" EnumName="UM_LIMB_WAGON_LEFT_LEAF_SPRING" Offset="0x11CFC" />
-        <Limb Name="gUmWagonRightLeafSpringLimb" Type="Standard" EnumName="UM_LIMB_WAGON_RIGHT_LEAF_SPRING" Offset="0x11D08" />
-        <Limb Name="gUmWagonSteeringWheelLimb" Type="Standard" EnumName="UM_LIMB_WAGON_STEERING_WHEEL" Offset="0x11D14" />
-        <Limb Name="gUmCremiaRootLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_ROOT" Offset="0x11D20" />
-        <Limb Name="gUmCremiaTorsoLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_TORSO" Offset="0x11D2C" />
-        <Limb Name="gUmCremiaHeadLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_HEAD" Offset="0x11D38" />
-        <Limb Name="gUmCremiaHairEndLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_HAIR_END" Offset="0x11D44" />
-        <Limb Name="gUmCremiaLeftUpperArmLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_LEFT_UPPER_ARM" Offset="0x11D50" />
-        <Limb Name="gUmCremiaLeftForearmLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_LEFT_FOREARM" Offset="0x11D5C" />
-        <Limb Name="gUmCremiaLeftHandLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_LEFT_HAND" Offset="0x11D68" />
-        <Limb Name="gUmCremiaRightUpperArmLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_RIGHT_UPPER_ARM" Offset="0x11D74" />
-        <Limb Name="gUmCremiaRightForearmLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_RIGHT_FOREARM" Offset="0x11D80" />
-        <Limb Name="gUmCremiaRightHandLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_RIGHT_HAND" Offset="0x11D8C" />
-        <Limb Name="gUmCremiaLowerBodyLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_LOWER_BODY" Offset="0x11D98" />
-
-        <Skeleton Name="gUmSkel" Type="Flex" LimbType="Standard" LimbNone="UM_LIMB_NONE" LimbMax="UM_LIMB_MAX" EnumName="ObjectUmLimb" Offset="0x11DF8" />
-
-        <Animation Name="gUmGallopAnim" Offset="0x1213C" />
-        <Animation Name="gUmLookBackAnim" Offset="0x126C4" />
-        <Animation Name="gUmTrotAnim" Offset="0x12CC0" />
-
-        <Texture Name="object_um_TLUT_012CD0" OutName="tlut_012CD0" Format="rgba16" Width="16" Height="16" Offset="0x12CD0" />
-        <Texture Name="object_um_TLUT_012ED0" OutName="tlut_012ED0" Format="rgba16" Width="16" Height="16" Offset="0x12ED0" />
-        <Texture Name="object_um_TLUT_0130D0" OutName="tlut_0130D0" Format="rgba16" Width="16" Height="16" Offset="0x130D0" />
-        <Texture Name="object_um_TLUT_0132D0" OutName="tlut_0132D0" Format="rgba16" Width="16" Height="16" Offset="0x132D0" />
-        <Texture Name="object_um_Tex_0134D0" OutName="tex_0134D0" Format="ci8" Width="32" Height="32" Offset="0x134D0" />
-        <Texture Name="object_um_Tex_0138D0" OutName="tex_0138D0" Format="ci8" Width="32" Height="32" Offset="0x138D0" />
-        <Texture Name="object_um_Tex_013CD0" OutName="tex_013CD0" Format="rgba16" Width="32" Height="32" Offset="0x13CD0" />
-        <Texture Name="object_um_Tex_0144D0" OutName="tex_0144D0" Format="ci8" Width="32" Height="64" Offset="0x144D0" />
-        <Texture Name="object_um_Tex_014CD0" OutName="tex_014CD0" Format="ci8" Width="32" Height="64" Offset="0x14CD0" />
-        <Texture Name="object_um_Tex_0154D0" OutName="tex_0154D0" Format="ci8" Width="32" Height="64" Offset="0x154D0" />
-        <Texture Name="object_um_Tex_015CD0" OutName="tex_015CD0" Format="rgba16" Width="32" Height="32" Offset="0x15CD0" />
-
-        <Texture Name="gUmCremiaEyeOpenTex" OutName="cremia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x164D0" TlutOffset="0x130D0" />
-        <Texture Name="gUmCremiaEyeHalfTex" OutName="cremia_eye_half" Format="ci8" Width="32" Height="32" Offset="0x168D0" TlutOffset="0x130D0" />
-        <Texture Name="gUmCremiaEyeClosedTex" OutName="cremia_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x16CD0" TlutOffset="0x130D0" />
-        <Texture Name="gUmCremiaEyeHappyTex" OutName="cremia_eye_happy" Format="ci8" Width="32" Height="32" Offset="0x170D0" TlutOffset="0x130D0" />
-        <Texture Name="gUmCremiaEyeAngryTex" OutName="cremia_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x174D0" TlutOffset="0x130D0" />
-        <Texture Name="gUmCremiaEyeSadTex" OutName="cremia_eye_sad" Format="ci8" Width="32" Height="32" Offset="0x178D0" TlutOffset="0x130D0" />
-
-        <Texture Name="gUmMouthNormalTex" OutName="mouth_normal" Format="ci8" Width="32" Height="16" Offset="0x17CD0" TlutOffset="0x130D0" />
-        <Texture Name="gUmMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x17ED0" TlutOffset="0x130D0" />
-        <Texture Name="gUmMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="16" Offset="0x180D0" TlutOffset="0x130D0" />
-        <Texture Name="gUmMouthHangingOpenTex" OutName="mouth_hanging_open" Format="ci8" Width="32" Height="16" Offset="0x182D0" TlutOffset="0x130D0" />
-
-        <Texture Name="object_um_Tex_0184D0" OutName="tex_0184D0" Format="ci8" Width="8" Height="8" Offset="0x184D0" />
-        <Texture Name="object_um_Tex_018510" OutName="tex_018510" Format="ci8" Width="16" Height="16" Offset="0x18510" />
-        <Texture Name="object_um_Tex_018610" OutName="tex_018610" Format="ci8" Width="16" Height="16" Offset="0x18610" />
-        <Texture Name="object_um_Tex_018710" OutName="tex_018710" Format="ci8" Width="8" Height="8" Offset="0x18710" />
-        <Texture Name="object_um_Tex_018750" OutName="tex_018750" Format="ci8" Width="16" Height="16" Offset="0x18750" />
-        <Texture Name="object_um_Tex_018850" OutName="tex_018850" Format="ci8" Width="16" Height="16" Offset="0x18850" />
-        <Texture Name="object_um_Tex_018950" OutName="tex_018950" Format="ci8" Width="8" Height="16" Offset="0x18950" />
-        <Texture Name="object_um_Tex_0189D0" OutName="tex_0189D0" Format="ci8" Width="8" Height="8" Offset="0x189D0" />
-        <Texture Name="object_um_Tex_018A10" OutName="tex_018A10" Format="rgba16" Width="16" Height="32" Offset="0x18A10" />
-        <Texture Name="object_um_Tex_018E10" OutName="tex_018E10" Format="ci8" Width="32" Height="16" Offset="0x18E10" />
-        <Texture Name="object_um_Tex_019010" OutName="tex_019010" Format="ci8" Width="16" Height="32" Offset="0x19010" />
-        <Texture Name="object_um_Tex_019210" OutName="tex_019210" Format="ci8" Width="16" Height="16" Offset="0x19210" />
-        <Texture Name="object_um_Tex_019310" OutName="tex_019310" Format="ci8" Width="16" Height="32" Offset="0x19310" />
-        <Texture Name="object_um_Tex_019510" OutName="tex_019510" Format="ci8" Width="64" Height="16" Offset="0x19510" />
-        <Animation Name="gUmIdleAnim" Offset="0x19E10" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_umajump.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_umajump.xml
deleted file mode 100644
index cec43c3a6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_umajump.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_umajump" Segment="6">
-        <Texture Name="object_umajump_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="64" Offset="0x0" />
-        <Texture Name="object_umajump_Tex_000800" OutName="tex_000800" Format="rgba16" Width="16" Height="64" Offset="0x800" />
-        <DList Name="gHorseJumpFenceDL" Offset="0x1220" />
-        <Collision Name="object_umajump_Colheader_001438" Offset="0x1438" />
-        <Collision Name="object_umajump_Colheader_001558" Offset="0x1558" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_utubo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_utubo.xml
deleted file mode 100644
index 4ce3d64f0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_utubo.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <!-- Assets for Deep Python -->
-    <File Name="object_utubo" Segment="6">
-        <Animation Name="gDeepPythonMultiDirectionalSwayAnim" Offset="0x82C" /> <!-- Unused -->
-
-        <!-- Deep Python Limb DisplayLists -->
-        <DList Name="gDeepPythonHeadDL" Offset="0x20B0" />
-        <DList Name="gDeepPythonJawDL" Offset="0x2358" />
-        <DList Name="gDeepPythonCollarDL" Offset="0x2440" />
-        <DList Name="gDeepPythonBodySegment1DL" Offset="0x2580" />
-        <DList Name="gDeepPythonBodySegment2DL" Offset="0x2738" />
-        <DList Name="gDeepPythonBodySegment3DL" Offset="0x28A0" />
-        <DList Name="gDeepPythonBodySegment4DL" Offset="0x2A08" />
-        <DList Name="gDeepPythonBodySegment7DL" Offset="0x2B18" />
-        <DList Name="gDeepPythonBodySegment6DL" Offset="0x2C28" />
-        <DList Name="gDeepPythonBodySegment5DL" Offset="0x2D38" />
-
-        <!-- Deep Python Textures -->
-        <Texture Name="gDeepPythonHeadAndCollarTLUT" OutName="deep_python_head_and_collar_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2E48" />
-        <Texture Name="gDeepPythonBodySegment1FrontTLUT" OutName="deep_python_body_segment_1_front_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2E68" />
-        <Texture Name="gDeepPythonBodyTLUT" OutName="deep_python_body_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2E88" />
-        <Texture Name="gDeepPythonHeadAndCollarTex" OutName="deep_python_head_and_collar" Format="ci4" Width="64" Height="64" Offset="0x2EA8" />
-        <Texture Name="gDeepPythonEyeTex" OutName="deep_python_eye" Format="rgba16" Width="32" Height="32" Offset="0x36A8" />
-        <Texture Name="gDeepPythonBodySegment1FrontTex" OutName="deep_python_body_segment_1_front" Format="ci4" Width="32" Height="32" Offset="0x3EA8" />
-        <Texture Name="gDeepPythonBodyTex" OutName="deep_python_body" Format="ci4" Width="32" Height="32" Offset="0x40A8" />
-
-        <!-- Deep Python Limbs -->
-        <Limb Name="gDeepPythonRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_ROOT" Offset="0x42A8" />
-        <Limb Name="gDeepPythonMiddleBodyRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_MIDDLE_BODY_ROOT" Offset="0x42B4" />
-        <Limb Name="gDeepPythonBodySegment4Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_4" Offset="0x42C0" />
-        <Limb Name="gDeepPythonBodySegment5Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_5" Offset="0x42CC" />
-        <Limb Name="gDeepPythonBodySegment6Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_6" Offset="0x42D8" />
-        <Limb Name="gDeepPythonBodySegment7Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_7" Offset="0x42E4" />
-        <Limb Name="gDeepPythonBodySegment3Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_3" Offset="0x42F0" />
-        <Limb Name="gDeepPythonUpperBodyRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_UPPER_BODY_ROOT" Offset="0x42FC" />
-        <Limb Name="gDeepPythonBodySegment2Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_2" Offset="0x4308" />
-        <Limb Name="gDeepPythonBodySegment1Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_1" Offset="0x4314" />
-        <Limb Name="gDeepPythonHeadAndCollarRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_HEAD_AND_COLLAR_ROOT" Offset="0x4320" />
-        <Limb Name="gDeepPythonCollarLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_COLLAR" Offset="0x432C" />
-        <Limb Name="gDeepPythonHeadLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_HEAD" Offset="0x4338" />
-        <Limb Name="gDeepPythonJawRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_JAW_ROOT" Offset="0x4344" />
-        <Limb Name="gDeepPythonJawLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_JAW" Offset="0x4350" />
-
-        <!-- Deep Python Skeleton -->
-        <Skeleton Name="gDeepPythonSkel" Type="Flex" LimbType="Standard" LimbNone="DEEP_PYTHON_LIMB_NONE" LimbMax="DEEP_PYTHON_LIMB_MAX" EnumName="DeepPythonLimb" Offset="0x4398" />
-
-        <!-- Deep Python Animations -->
-        <Animation Name="gDeepPythonUnusedSideSwayAnim" Offset="0x4518" /> <!-- Unused duplicate of gDeepPythonSmallSideSwayAnim -->
-        <Animation Name="gDeepPythonVerticalSwayAnim" Offset="0x4740" /> <!-- Referenced by En_Dragon, but never actually used in the final game. -->
-        <Animation Name="gDeepPythonSmallSideSwayAnim" Offset="0x48B8" /> <!-- Original name might be "utubo_wait" -->
-        <Animation Name="gDeepPythonLargeSideSwayAnim" Offset="0x4ABC" /> <!-- Original name might be "utubo_yoko" ("side-to-side") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_visiblock.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_visiblock.xml
deleted file mode 100644
index cae048322..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_visiblock.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Object for Lens of Truth Platform -->
-    <File Name="object_visiblock" Segment="6">
-        <DList Name="gLensOfTruthPlatformDL" Offset="0x140" />
-        <DList Name="gLensOfTruthPlatformEmptyDL" Offset="0x1E8" />
-        <Texture Name="gLensOfTruthPlatformTex" OutName="lens_of_truth_platform" Format="rgba16" Width="32" Height="32" Offset="0x1F0" />
-        <Collision Name="gLensOfTruthPlatformCol" Offset="0xAD0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_vm.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_vm.xml
deleted file mode 100644
index 8fb9fde20..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_vm.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-    <File Name="object_vm" Segment="6">
-        <!-- Beamos Animations -->
-        <Animation Name="gBeamosAnim" Offset="0x68" />
-        
-        <!-- Beamos Limb DisplayLists -->
-        <DList Name="gBeamosBodyDL" Offset="0x1E00" />
-        <DList Name="gBeamosTopEyelidDL" Offset="0x22B0" />
-        <DList Name="gBeamosBottomEyelidDL" Offset="0x2460" />
-        <DList Name="gBeamosEyeDL" Offset="0x2610" />
-
-        <!-- Beamos Laser DisplayList -->
-        <DList Name="gBeamosLaserDL" Offset="0x2728" />
-
-        <!-- Beamos DisplayList Textures -->
-        <Texture Name="gBeamosBodyGradientTex" OutName="beamos_body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0" />
-        <Texture Name="gBeamosGrayMetalTex" OutName="beamos_gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840" />
-        <Texture Name="gBeamosBoltAndMetalTex" OutName="beamos_bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940" />
-        <Texture Name="gBeamosInnerEyeLidTex" OutName="beamos_inner_eye_lid" Format="rgba16" Width="16" Height="8" Offset="0x2D40" />
-        <Texture Name="gBeamosEyeOutlineTex" OutName="beamos_eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40" />
-        <Texture Name="gBeamosEyeTex" OutName="beamos_eye" Format="rgba16" Width="32" Height="16" Offset="0x3040" />
-        <Texture Name="gBeamosBodyTex" OutName="beamos_body" Format="rgba16" Width="16" Height="16" Offset="0x3440" />
-        <Texture Name="gBeamosLaserTex" OutName="beamos_laser" Format="rgba16" Width="8" Height="8" Offset="0x3640" />
-        <Texture Name="gBeamosTeethTex" OutName="beamos_teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0" />
-
-        <!-- Beamos Skeleton Limbs -->
-        <Limb Name="gBeamosRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_ROOT" Offset="0x3EC0" />
-        <Limb Name="gBeamosHeadRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_HEAD_ROOT" Offset="0x3ECC" />
-        <Limb Name="gBeamosTopEyelidRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_TOP_EYELID_ROOT" Offset="0x3ED8" />
-        <Limb Name="gBeamosTopEyelidWrapperLimb" Type="Standard" EnumName="BEAMOS_LIMB_TOP_EYELID_WRAPPER" Offset="0x3EE4" />
-        <Limb Name="gBeamosTopEyelidLimb" Type="Standard" EnumName="BEAMOS_LIMB_TOP_EYELID" Offset="0x3EF0" />
-        <Limb Name="gBeamosBottomEyelidRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_BOTTOM_EYELID_ROOT" Offset="0x3EFC" />
-        <Limb Name="gBeamosBottomEyelidWrapperLimb" Type="Standard" EnumName="BEAMOS_LIMB_BOTTOM_EYELID_WRAPPER" Offset="0x3F08" />
-        <Limb Name="gBeamosBottomEyelidLimb" Type="Standard" EnumName="BEAMOS_LIMB_BOTTEM_EYELID" Offset="0x3F14" />
-        <Limb Name="gBeamosEyeLimb" Type="Standard" EnumName="BEAMOS_LIMB_EYE" Offset="0x3F20" />
-        <Limb Name="gBeamosBodyLimb" Type="Standard" EnumName="BEAMOS_LIMB_BODY" Offset="0x3F2C" />
-
-        <!-- Beamos Skeleton -->
-        <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" LimbNone="BEAMOS_LIMB_NONE" LimbMax="BEAMOS_LIMB_MAX" EnumName="BeamosLimb" Offset="0x3F60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wallmaster.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wallmaster.xml
deleted file mode 100644
index afe3843e3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wallmaster.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Root>
-    <!-- Assets for both Wallmasters and Floormasters. -->
-    <File Name="object_wallmaster" Segment="6">
-        <Animation Name="gWallmasterDamageAnim" Offset="0x590" /> <!-- Original name is "wm_damage" -->
-        <Animation Name="gWallmasterRecoverFromDamageAnim" Offset="0xEA4" /> <!-- Original name is "wm_damage_wait" -->
-        <Animation Name="gWallmasterJumpAnim" Offset="0x19CC" /> <!-- Original name is "wm_f_jump" -->
-        <Animation Name="gFloormasterTurnAnim" Offset="0x2158" /> <!-- Original name is "wm_l_turn" -->
-        <Animation Name="gWallmasterLungeAnim" Offset="0x299C" /> <!-- Original name is "wm_link_hangup" -->
-        <Animation Name="gWallmasterMissAnim" Offset="0x3120" /> <!-- Unused. Original name is "wm_miss" -->
-        <Animation Name="gFloormasterTapFingerAnim" Offset="0x39B0" /> <!-- Original name is "wm_motionA" -->
-        <Animation Name="gWallmasterWalkAnim" Offset="0x41F4" /> <!-- Original name is "wm_move" -->
-
-        <!-- Wallmaster/Floormaster Limb DisplayLists -->
-        <DList Name="gWallmasterThumbDistalDL" Offset="0x6660" />
-        <DList Name="gWallmasterThumbMiddleDL" Offset="0x6800" />
-        <DList Name="gWallmasterThumbProximalDL" Offset="0x6A20" />
-        <DList Name="gWallmasterWristDL" Offset="0x6C58" />
-        <DList Name="gWallmasterMiddleFingerDistalDL" Offset="0x6E98" />
-        <DList Name="gWallmasterMiddleFingerMiddleDL" Offset="0x7038" />
-        <DList Name="gWallmasterMiddleFingerProximalDL" Offset="0x7258" />
-        <DList Name="gWallmasterRingFingerDistalDL" Offset="0x7408" />
-        <DList Name="gWallmasterRingFingerMiddleDL" Offset="0x75A8" />
-        <DList Name="gWallmasterRingFingerProximalDL" Offset="0x77C8" />
-        <DList Name="gWallmasterIndexFingerDistalDL" Offset="0x7978" />
-        <DList Name="gWallmasterIndexFingerMiddleDL" Offset="0x7B18" />
-        <DList Name="gWallmasterIndexFingerProximalDL" Offset="0x7CE8" />
-        <DList Name="gWallmasterHandDL" Offset="0x7E98" />
-
-        <!-- Wallmaster/Floormaster Little Finger DisplayList. Not part of the skeleton, unlike the other fingers. -->
-        <DList Name="gWallmasterLittleFingerDL" Offset="0x8688" />
-
-        <!-- Wallmaster/Floormaster Textures -->
-        <Texture Name="gWallmasterWristTopTex" OutName="wallmaster_wrist_top" Format="rgba16" Width="8" Height="16" Offset="0x88F0" />
-        <Texture Name="gWallmasterWristSidesTex" OutName="wallmaster_wrist_sides" Format="rgba16" Width="8" Height="16" Offset="0x89F0" />
-        <Texture Name="gWallmasterHandBackTex" OutName="wallmaster_hand_back" Format="rgba16" Width="8" Height="8" Offset="0x8AF0" />
-        <Texture Name="gWallmasterFingerTipTex" OutName="wallmaster_finger_tip" Format="rgba16" Width="4" Height="16" Offset="0x8B70" />
-        <Texture Name="gWallmasterJointsAndSidesTex" OutName="wallmaster_joints_and_sides" Format="rgba16" Width="4" Height="8" Offset="0x8BF0" />
-        <Texture Name="gWallmasterPalmAndFingerPadTex" OutName="wallmaster_palm_and_finger_pad" Format="rgba16" Width="8" Height="16" Offset="0x8C30" />
-        <Texture Name="gWallmasterKnuckleAndFingerTopTex" OutName="wallmaster_knuckle_and_finger_top" Format="rgba16" Width="8" Height="16" Offset="0x8D30" />
-
-        <!-- Wallmaster/Floormaster Limbs -->
-        <Limb Name="gWallmasterRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_ROOT" Offset="0x8E30" />
-        <Limb Name="gWallmasterHandLimb" Type="Standard" EnumName="WALLMASTER_LIMB_HAND" Offset="0x8E3C" />
-        <Limb Name="gWallmasterIndexFingerRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_INDEX_FINGER_ROOT" Offset="0x8E48" />
-        <Limb Name="gWallmasterIndexFingerProximalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_INDEX_FINGER_PROXIMAL" Offset="0x8E54" />
-        <Limb Name="gWallmasterIndexFingerDistalRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_INDEX_FINGER_DISTAL_ROOT" Offset="0x8E60" />
-        <Limb Name="gWallmasterIndexFingerMiddleLimb" Type="Standard" EnumName="WALLMASTER_LIMB_INDEX_FINGER_MIDDLE" Offset="0x8E6C" />
-        <Limb Name="gWallmasterIndexFingerDistalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_INDEX_FINGER_DISTAL" Offset="0x8E78" />
-        <Limb Name="gWallmasterRingFingerRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_RING_FINGER_ROOT" Offset="0x8E84" />
-        <Limb Name="gWallmasterRingFingerProximalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_RING_FINGER_PROXIMAL" Offset="0x8E90" />
-        <Limb Name="gWallmasterRingFingerDistalRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_RING_FINGER_DISTAL_ROOT" Offset="0x8E9C" />
-        <Limb Name="gWallmasterRingFingerMiddleLimb" Type="Standard" EnumName="WALLMASTER_LIMB_RING_FINGER_MIDDLE" Offset="0x8EA8" />
-        <Limb Name="gWallmasterRingFingerDistalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_RING_FINGER_DISTAL" Offset="0x8EB4" />
-        <Limb Name="gWallmasterMiddleFingerRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_MIDDLE_FINGER_ROOT" Offset="0x8EC0" />
-        <Limb Name="gWallmasterMiddleFingerProximalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_MIDDLE_FINGER_PROXIMAL" Offset="0x8ECC" />
-        <Limb Name="gWallmasterMiddleFingerDistalRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_MIDDLE_FINGER_DISTAL_ROOT" Offset="0x8ED8" />
-        <Limb Name="gWallmasterMiddleFingerMiddleLimb" Type="Standard" EnumName="WALLMASTER_LIMB_MIDDLE_FINGER_MIDDLE" Offset="0x8EE4" />
-        <Limb Name="gWallmasterMiddleFingerDistalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_MIDDLE_FINGER_DISTAL" Offset="0x8EF0" />
-        <Limb Name="gWallmasterWristRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_WRIST_ROOT" Offset="0x8EFC" />
-        <Limb Name="gWallmasterWristLimb" Type="Standard" EnumName="WALLMASTER_LIMB_WRIST" Offset="0x8F08" />
-        <Limb Name="gWallmasterThumbRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_ROOT" Offset="0x8F14" />
-        <Limb Name="gWallmasterThumbProximalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_PROXIMAL" Offset="0x8F20" />
-        <Limb Name="gWallmasterThumbDistalRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_DISTAL_ROOT" Offset="0x8F2C" />
-        <Limb Name="gWallmasterThumbMiddleLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_MIDDLE" Offset="0x8F38" />
-        <Limb Name="gWallmasterThumbDistalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_DISTAL" Offset="0x8F44" />
-
-        <!-- Wallmaster/Floormaster Skeleton-->
-        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" LimbNone="WALLMASTER_LIMB_NONE" LimbMax="WALLMASTER_LIMB_MAX" EnumName="WallmasterLimb" Offset="0x8FB0" />
-        
-        <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244" /> <!-- Original name is "wm_move_wait" -->
-        <Animation Name="gWallmasterHoverAnim" Offset="0x9520" /> <!-- Original name is "wm_success" -->
-        <Animation Name="gWallmasterIdleAnim" Offset="0x9DB0" /> <!-- Original name is "wm_wait" -->
-        <Animation Name="gWallmasterStandUpAnim" Offset="0xA054" /> <!-- Original name is "wm_wait_move" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_warp1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_warp1.xml
deleted file mode 100644
index 0f6fe168b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_warp1.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<Root>
-    <!-- Assets for the warp portal, warp crystal, the boss warp platform, and related effects. -->
-    <File Name="object_warp1" Segment="6">
-        <!-- Assets for the portal that the player can walk into to warp out of boss rooms. Often called a "blue warp". -->
-        <DList Name="gWarpPortalDL" Offset="0x1A0" /> <!-- Original name is "warp_2_modelT" -->
-        <Texture Name="gWarpPortalTex" OutName="warp_portal" Format="i8" Width="64" Height="64" Offset="0x2C0" />
-
-        <!-- Warp Crystal Animation -->
-        <Animation Name="gWarpCrystalAnim" Offset="0x1374" /> <!-- Original name is "crystal_anim" -->
-
-        <!-- Warp Crystal Limb DisplayLists -->
-        <DList Name="gWarpCrystalBottomDL" Offset="0x1750" />
-        <DList Name="gWarpCrystalTopSegment1DL" Offset="0x1828" />
-        <DList Name="gWarpCrystalTopSegment2DL" Offset="0x18B0" />
-        <DList Name="gWarpCrystalTopSegment3DL" Offset="0x1938" />
-        <DList Name="gWarpCrystalTopSegment4DL" Offset="0x19C0" />
-        <DList Name="gWarpCrystalTopSegment5DL" Offset="0x1A48" />
-        <DList Name="gWarpCrystalTopSegment6DL" Offset="0x1AD0" />
-
-        <!-- Warp Crystal Limb Texture -->
-        <Texture Name="gWarpCrystalTex" OutName="warp_crystal" Format="i8" Width="64" Height="64" Offset="0x1B58" />
-
-        <!-- Warp Crystal Limbs -->
-        <Limb Name="gWarpCrystalRootLimb" Type="Standard" EnumName="WARP_CRYSTAL_LIMB_ROOT" Offset="0x2B58" />
-        <Limb Name="gWarpCrystalWrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_LIMB_WRAPPER" Offset="0x2B64" />
-        <Limb Name="gWarpCrystalBottomLimb" Type="Standard" EnumName="WARP_CRYSTAL_LIMB_BOTTOM" Offset="0x2B70" />
-        <Limb Name="gWarpCrystalTopSegment1RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_1_ROOT" Offset="0x2B7C" />
-        <Limb Name="gWarpCrystalTopSegment1WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_1_WRAPPER" Offset="0x2B88" />
-        <Limb Name="gWarpCrystalTopSegment1Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_1" Offset="0x2B94" />
-        <Limb Name="gWarpCrystalTopSegment2RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_2_ROOT" Offset="0x2BA0" />
-        <Limb Name="gWarpCrystalTopSegment2WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_2_WRAPPER" Offset="0x2BAC" />
-        <Limb Name="gWarpCrystalTopSegment2Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_2" Offset="0x2BB8" />
-        <Limb Name="gWarpCrystalTopSegment3RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_3_ROOT" Offset="0x2BC4" />
-        <Limb Name="gWarpCrystalTopSegment3WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_3_WRAPPER" Offset="0x2BD0" />
-        <Limb Name="gWarpCrystalTopSegment3Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_3" Offset="0x2BDC" />
-        <Limb Name="gWarpCrystalTopSegment4RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_4_ROOT" Offset="0x2BE8" />
-        <Limb Name="gWarpCrystalTopSegment4WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_4_WRAPPER" Offset="0x2BF4" />
-        <Limb Name="gWarpCrystalTopSegment4Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_4" Offset="0x2C00" />
-        <Limb Name="gWarpCrystalTopSegment5RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_5_ROOT" Offset="0x2C0C" />
-        <Limb Name="gWarpCrystalTopSegment5WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_5_WRAPPER" Offset="0x2C18" />
-        <Limb Name="gWarpCrystalTopSegment5Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_5" Offset="0x2C24" />
-        <Limb Name="gWarpCrystalTopSegment6RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_6_ROOT" Offset="0x2C30" />
-        <Limb Name="gWarpCrystalTopSegment6WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_6_WRAPPER" Offset="0x2C3C" />
-        <Limb Name="gWarpCrystalTopSegment6Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_6" Offset="0x2C48" />
-
-        <!-- Warp Crystal Skeleton -->
-        <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" LimbNone="WARP_CRYSTAL_LIMB_NONE" LimbMax="WARP_CRYSTAL_LIMB_MAX" EnumName="WarpCrystalLimb" Offset="0x2CA8" />
-
-        <!-- Assets for the beam that falls from the sky to activate a boss warp. -->
-        <DList Name="gWarpBossWarpActivationBeamDL" Offset="0x3230" /> <!-- Original name is "boss_warp1_modelT" -->
-        <DList Name="gWarpBossWarpActivationBeamEmptyDL" Offset="0x34C8" />
-        <Texture Name="gWarpBossWarpActivationBeamTex" OutName="warp_boss_warp_activation_beam" Format="i8" Width="32" Height="64" Offset="0x34D0" />
-        <Texture Name="gWarpBossWarpActivationBeamMaskTex" OutName="warp_boss_warp_activation_beam_mask" Format="i8" Width="32" Height="64" Offset="0x3CD0" />
-        <TextureAnimation Name="gWarpBossWarpActivationBeamTexAnim" Offset="0x44D8" />
-
-        <!-- Assets for the light shafts that rise upwards from an activated boss warp. -->
-        <DList Name="gWarpBossWarpLightShaftsDL" Offset="0x4690" /> <!-- Original name is "boss_warp2_modelT" -->
-        <DList Name="gWarpBossWarpLightShaftsEmptyDL" Offset="0x47C8" />
-        <Texture Name="gWarpBossWarpLightShaftsTex" OutName="warp_boss_warp_light_shafts" Format="i4" Width="64" Height="64" Offset="0x47D0" />
-        <Texture Name="gWarpBossWarpLightShaftsMaskTex" OutName="warp_boss_warp_light_shafts_mask" Format="i4" Width="64" Height="64" Offset="0x4FD0" />
-        <TextureAnimation Name="gWarpBossWarpLightShaftsTexAnim" Offset="0x57D8" />
-
-        <!-- Assets for the glow that covers the top of an activated boss warp platform. -->
-        <DList Name="gWarpBossWarpGlowEmptyDL" Offset="0x58C0" />
-        <DList Name="gWarpBossWarpGlowDL" Offset="0x58C8" /> <!-- Original name is "boss_warp3_model" -->
-        <Texture Name="gWarpBossWarpGlowBottomMaskTex" OutName="warp_boss_warp_glow_bottom_mask" Format="i4" Width="64" Height="64" Offset="0x5A30" />
-        <Texture Name="gWarpBossWarpGlowTopMaskTex" OutName="warp_boss_warp_glow_top_mask" Format="i4" Width="64" Height="64" Offset="0x6230" />
-        <Texture Name="gWarpBossWarpGlowTex" OutName="warp_boss_warp_glow" Format="i8" Width="32" Height="64" Offset="0x6A30" />
-        <TextureAnimation Name="gWarpBossWarpGlowTexAnim" Offset="0x7238" />
-
-        <!-- Assets for the Majora's Mask-shaped boss warp platform. -->
-        <DList Name="gWarpBossWarpPlatformDL" Offset="0x76C0" /> <!-- Original name is "m2_BossWarp_model" -->
-        <Texture Name="gWarpBossWarpPlatformBottomTLUT" OutName="warp_boss_warp_platform_bottom_tlut" Format="rgba16" Width="4" Height="4" Offset="0x78A0" />
-        <Texture Name="gWarpBossWarpPlatformTopTLUT" OutName="warp_boss_warp_platform_top_tlut" Format="rgba16" Width="4" Height="4" Offset="0x78C0" />
-        <Texture Name="gWarpBossWarpPlatformBottomTex" OutName="warp_boss_warp_platform_bottom" Format="ci4" Width="64" Height="64" Offset="0x78E0" />
-        <Texture Name="gWarpBossWarpPlatformTopTex" OutName="warp_boss_warp_platform_top" Format="ci4" Width="64" Height="64" Offset="0x80E0" />
-        <Collision Name="gWarpBossWarpPlatformCol" Offset="0x8BD4" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_warp_uzu.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_warp_uzu.xml
deleted file mode 100644
index 4924c86ca..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_warp_uzu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_warp_uzu" Segment="6">
-        <DList Name="object_warp_uzu_DL_000EC0" Offset="0xEC0" />
-        <Texture Name="object_warp_uzu_TLUT_0019D0" OutName="tlut_0019D0" Format="rgba16" Width="16" Height="16" Offset="0x19D0" />
-        <Texture Name="object_warp_uzu_Tex_001BD0" OutName="tex_001BD0" Format="rgba16" Width="16" Height="32" Offset="0x1BD0" />
-        <Texture Name="object_warp_uzu_Tex_001FD0" OutName="tex_001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" />
-        <Texture Name="object_warp_uzu_Tex_002010" OutName="tex_002010" Format="ci8" Width="32" Height="32" Offset="0x2010" />
-        <Texture Name="object_warp_uzu_Tex_002410" OutName="tex_002410" Format="ci8" Width="8" Height="8" Offset="0x2410" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_water_effect.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_water_effect.xml
deleted file mode 100644
index e3cd9ec27..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_water_effect.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Root>
-    <File Name="object_water_effect" Segment="6">
-        <DList Name="object_water_effect_DL_000180" Offset="0x180" />
-        <DList Name="object_water_effect_DL_000420" Offset="0x420" />
-        <DList Name="object_water_effect_DL_000730" Offset="0x730" />
-        <DList Name="object_water_effect_DL_000A48" Offset="0xA48" />
-        <DList Name="object_water_effect_DL_000CD8" Offset="0xCD8" />
-        <TextureAnimation Name="object_water_effect_Matanimheader_000DD0" Offset="0xDD0" />
-        <TextureAnimation Name="object_water_effect_Matanimheader_000DE0" Offset="0xDE0" />
-        <TextureAnimation Name="object_water_effect_Matanimheader_000E0C" Offset="0xE0C" />
-        <TextureAnimation Name="object_water_effect_Matanimheader_000E40" Offset="0xE40" />
-        <TextureAnimation Name="object_water_effect_Matanimheader_000E58" Offset="0xE58" />
-        <Texture Name="object_water_effect_Tex_000E60" OutName="tex_000E60" Format="i4" Width="32" Height="64" Offset="0xE60" />
-        <Texture Name="object_water_effect_Tex_001260" OutName="tex_001260" Format="i4" Width="64" Height="64" Offset="0x1260" />
-        <Texture Name="object_water_effect_Tex_001A60" OutName="tex_001A60" Format="i8" Width="32" Height="64" Offset="0x1A60" />
-        <Texture Name="object_water_effect_Tex_002260" OutName="tex_002260" Format="i4" Width="64" Height="64" Offset="0x2260" />
-        <Texture Name="object_water_effect_Tex_002A60" OutName="tex_002A60" Format="i4" Width="64" Height="64" Offset="0x2A60" />
-        <Texture Name="object_water_effect_Tex_003260" OutName="tex_003260" Format="i4" Width="64" Height="64" Offset="0x3260" />
-        <Texture Name="object_water_effect_Tex_003A60" OutName="tex_003A60" Format="i4" Width="64" Height="64" Offset="0x3A60" />
-        <DList Name="object_water_effect_DL_004260" Offset="0x4260" />
-        <DList Name="object_water_effect_DL_0042B0" Offset="0x42B0" />
-        <DList Name="object_water_effect_DL_0042F8" Offset="0x42F8" />
-        <DList Name="object_water_effect_DL_004340" Offset="0x4340" />
-        <DList Name="object_water_effect_DL_0043E8" Offset="0x43E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdhand.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdhand.xml
deleted file mode 100644
index 311d9299f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdhand.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="object_wdhand" Segment="6">
-        <Animation Name="object_wdhand_Anim_0000F4" Offset="0xF4" />
-        <Animation Name="object_wdhand_Anim_000364" Offset="0x364" />
-        <Animation Name="object_wdhand_Anim_000534" Offset="0x534" />
-        <Animation Name="object_wdhand_Anim_000854" Offset="0x854" />
-        <Texture Name="object_wdhand_Tex_000870" OutName="tex_000870" Format="rgba16" Width="16" Height="32" Offset="0x870" />
-        <Texture Name="object_wdhand_Tex_000C70" OutName="tex_000C70" Format="rgba16" Width="16" Height="32" Offset="0xC70" />
-        <Texture Name="object_wdhand_Tex_001070" OutName="tex_001070" Format="rgba16" Width="16" Height="32" Offset="0x1070" />
-        <DList Name="object_wdhand_DL_0014C0" Offset="0x14C0" />
-        <DList Name="object_wdhand_DL_0015B0" Offset="0x15B0" />
-        <DList Name="object_wdhand_DL_001908" Offset="0x1908" />
-        <DList Name="object_wdhand_DL_001998" Offset="0x1998" />
-        <DList Name="object_wdhand_DL_001A20" Offset="0x1A20" />
-        <DList Name="object_wdhand_DL_001AD0" Offset="0x1AD0" />
-        <DList Name="object_wdhand_DL_001B80" Offset="0x1B80" />
-        <DList Name="object_wdhand_DL_001C40" Offset="0x1C40" />
-        <DList Name="object_wdhand_DL_001CF0" Offset="0x1CF0" />
-        <Limb Name="object_wdhand_Standardlimb_001DB0" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_01" Offset="0x1DB0" />
-        <Limb Name="object_wdhand_Standardlimb_001DBC" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_02" Offset="0x1DBC" />
-        <Limb Name="object_wdhand_Standardlimb_001DC8" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_03" Offset="0x1DC8" />
-        <Limb Name="object_wdhand_Standardlimb_001DD4" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_04" Offset="0x1DD4" />
-        <Limb Name="object_wdhand_Standardlimb_001DE0" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_05" Offset="0x1DE0" />
-        <Limb Name="object_wdhand_Standardlimb_001DEC" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_06" Offset="0x1DEC" />
-        <Limb Name="object_wdhand_Standardlimb_001DF8" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_07" Offset="0x1DF8" />
-        <Skeleton Name="object_wdhand_Skel_001E20" Type="Flex" LimbType="Standard" LimbNone="OBJECT_WDHAND_LIMB_NONE" LimbMax="OBJECT_WDHAND_LIMB_MAX" EnumName="ObjectWdhandLimb" Offset="0x1E20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor01.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor01.xml
deleted file mode 100644
index b18158a14..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor01.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Lottery Shop / Curiosity Shop / Mayor's House Door -->
-    <File Name="object_wdor01" Segment="6">
-        <DList Name="gLotteryCuriosityShopMayorHouseDoorEmptyDL" Offset="0x540" />
-        <DList Name="gLotteryCuriosityShopMayorHouseDoorDL" Offset="0x548" />
-        <Texture Name="gLotteryCuriosityShopMayorHouseDoorTex" OutName="lottery_curiosity_shop_mayor_house_door" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor02.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor02.xml
deleted file mode 100644
index f192bf8f5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor02.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Post Office / Trading Post Door -->
-    <File Name="object_wdor02" Segment="6">
-        <DList Name="gPostOfficeTradingPostDoorEmptyDL" Offset="0x540" />
-        <DList Name="gPostOfficeTradingPostDoorDL" Offset="0x548" />
-        <Texture Name="gPostOfficeTradingPostDoorTex" OutName="post_office_trading_post_door" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor03.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor03.xml
deleted file mode 100644
index 545a68242..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor03.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Stock Pot Inn & Swordsman's School Door -->
-    <File Name="object_wdor03" Segment="6">
-        <DList Name="gInnSchoolDoorEmptyDL" Offset="0x540" />
-        <DList Name="gInnSchoolDoorDL" Offset="0x548" />
-        <Texture Name="gInnScoolDoorTex" OutName="inn_school_door" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor04.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor04.xml
deleted file mode 100644
index d47e78a8e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor04.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_wdor04" Segment="6">
-        <DList Name="gMilkBarDoorEndDL" Offset="0x500"/>
-        <DList Name="gMilkBarDoorDL" Offset="0x508"/>
-        <Texture Name="gMilkBarDoorTex" OutName="milk_bar_door" Format="rgba16" Width="32" Height="64" Offset="0x670"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor05.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor05.xml
deleted file mode 100644
index 6eb0f4ed0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wdor05.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_wdor05" Segment="6">
-        <DList Name="gMusicBoxHouseEndDL" Offset="0x500"/>
-        <DList Name="gMusicBoxHouseDoorDL" Offset="0x508"/>
-        <Texture Name="gMusicBoxHouseDoorTex" OutName="music_box_house_door" Format="rgba16" Width="32" Height="64" Offset="0x670"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wf.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wf.xml
deleted file mode 100644
index 0d8fdb68c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wf.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<Root>
-    <!-- Assets for Wolfos and White Wolfos -->
-    <File Name="object_wf" Segment="6">
-        <!-- White Wolfos Textures -->
-        <Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0" />
-        <Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100" />
-        <Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180" />
-        <Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200" />
-        <Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280" />
-
-        <!-- White Wolfos Eye Textures -->
-        <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300" />
-
-        <!-- White Wolfos Limb DisplayLists -->
-        <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20" />
-        <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8" />
-        <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8" />
-        <DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8" />
-        <DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98" />
-        <DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98" />
-        <DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88" />
-        <DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078" />
-        <DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148" />
-        <DList Name="gWolfosWhiteThoraxDL" Offset="0x2248" />
-        <DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368" />
-        <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490" />
-        <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0" />
-        <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8" />
-
-        <!-- White Wolfos Eye Textures -->
-        <Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8" />
-        <Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8" />
-
-        <!-- White Wolfos Limb DisplayLists -->
-        <DList Name="gWolfosWhiteTailDL" Offset="0x3488" />
-        <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528" />
-        <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0" />
-        <DList Name="gWolfosWhiteHeadDL" Offset="0x36B8" />
-        <DList Name="gWolfosWhiteEyesDL" Offset="0x39D8" />
-
-        <!-- White Wolfos Limbs -->
-        <Limb Name="gWolfosWhiteRootLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_ROOT" Offset="0x3A70" />
-        <Limb Name="gWolfosWhiteBackLeftThighLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_THIGH" Offset="0x3A7C" />
-        <Limb Name="gWolfosWhiteBackLeftShinLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_SHIN" Offset="0x3A88" />
-        <Limb Name="gWolfosWhiteBackLeftPasternLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_PASTERN" Offset="0x3A94" />
-        <Limb Name="gWolfosWhiteBackLeftPawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_PAW" Offset="0x3AA0" />
-        <Limb Name="gWolfosWhiteTailLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_TAIL" Offset="0x3AAC" />
-        <Limb Name="gWolfosWhiteAbdomenLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_ABDOMEN" Offset="0x3AB8" />
-        <Limb Name="gWolfosWhiteBackRightThighLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_THIGH" Offset="0x3AC4" />
-        <Limb Name="gWolfosWhiteBackRightShinLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_SHIN" Offset="0x3AD0" />
-        <Limb Name="gWolfosWhiteBackRightPasternLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_PASTERN" Offset="0x3ADC" />
-        <Limb Name="gWolfosWhiteBackRightPawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_PAW" Offset="0x3AE8" />
-        <Limb Name="gWolfosWhiteThoraxLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_THORAX" Offset="0x3AF4" />
-        <Limb Name="gWolfosWhiteFrontRightUpperLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x3B00" />
-        <Limb Name="gWolfosWhiteFrontRightLowerLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x3B0C" />
-        <Limb Name="gWolfosWhiteFrontRightClawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_RIGHT_CLAW" Offset="0x3B18" />
-        <Limb Name="gWolfosWhiteHeadRootLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_HEAD_ROOT" Offset="0x3B24" />
-        <Limb Name="gWolfosWhiteHeadLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_HEAD" Offset="0x3B30" />
-        <Limb Name="gWolfosWhiteEyesLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_EYES" Offset="0x3B3C" />
-        <Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x3B48" />
-        <Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x3B54" />
-        <Limb Name="gWolfosWhiteFrontLeftClawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_LEFT_CLAW" Offset="0x3B60" />
-
-        <!-- White Wolfos Skeleton -->
-        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" LimbNone="WOLFOS_WHITE_LIMB_NONE" LimbMax="WOLFOS_WHITE_LIMB_MAX" EnumName="WolfosWhiteLimb" Offset="0x3BC0" />
-
-        <!-- Wolfos/White Wolfos Animations -->
-        <Animation Name="gWolfosSlashAnim" Offset="0x4638" /> <!-- Original name is "wolfman_attack" -->
-        <Animation Name="gWolfosBackflipAnim" Offset="0x4A90" /> <!-- Original name is "wolfman_back_jump" -->
-        <Animation Name="gWolfosBlockAnim" Offset="0x4C44" /> <!-- Original name is "wolfman_defense" -->
-        <Animation Name="gWolfosRearUpFallOverAnim" Offset="0x53D0" /> <!-- Original name is "wolfman_down" -->
-        <Animation Name="gWolfosRunAnim" Offset="0x5700" /> <!-- Original name is "wolfman_run" -->
-
-        <!-- Wolfos Limb DisplayLists -->
-        <DList Name="gWolfosNormalAbdomenDL" Offset="0x6D10" />
-        <DList Name="gWolfosNormalBackRightThighDL" Offset="0x6DD8" />
-        <DList Name="gWolfosNormalBackRightShinDL" Offset="0x6EC8" />
-        <DList Name="gWolfosNormalBackRightPasternDL" Offset="0x6FB8" />
-        <DList Name="gWolfosNormalBackRightPawDL" Offset="0x7088" />
-        <DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7188" />
-        <DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7278" />
-        <DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7368" />
-        <DList Name="gWolfosNormalBackLeftPawDL" Offset="0x7438" />
-        <DList Name="gWolfosNormalThoraxDL" Offset="0x7538" />
-        <DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7658" />
-        <DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7770" />
-        <DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7880" />
-        <DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7998" />
-
-        <!-- Wolfos Eye Textures -->
-        <Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7AA8" />
-
-        <!-- Wolfos Textures -->
-        <Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7CA8" />
-        <Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x80A8" />
-        <Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x8128" />
-        <Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x81A8" />
-        <Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x8228" />
-
-        <!-- Wolfos Eye Textures -->
-        <Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x82A8" />
-        <Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x84A8" />
-
-        <!-- Wolfos Limb DisplayLists -->
-        <DList Name="gWolfosNormalTailDL" Offset="0x8E98" />
-        <DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8F38" />
-        <DList Name="gWolfosNormalFrontRightClawDL" Offset="0x9000" />
-        <DList Name="gWolfosNormalHeadDL" Offset="0x90C8" />
-        <DList Name="gWolfosNormalEyesDL" Offset="0x93E8" />
-
-        <!-- Wolfos Limbs -->
-        <Limb Name="gWolfosNormalRootLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_ROOT" Offset="0x9480" />
-        <Limb Name="gWolfosNormalBackLeftThighLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_THIGH" Offset="0x948C" />
-        <Limb Name="gWolfosNormalBackLeftShinLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_SHIN" Offset="0x9498" />
-        <Limb Name="gWolfosNormalBackLeftPasternLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_PASTERN" Offset="0x94A4" />
-        <Limb Name="gWolfosNormalBackLeftPawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_PAW" Offset="0x94B0" />
-        <Limb Name="gWolfosNormalTailLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_TAIL" Offset="0x94BC" />
-        <Limb Name="gWolfosNormalAbdomenLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_ABDOMEN" Offset="0x94C8" />
-        <Limb Name="gWolfosNormalBackRightThighLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_THIGH" Offset="0x94D4" />
-        <Limb Name="gWolfosNormalBackRightShinLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_SHIN" Offset="0x94E0" />
-        <Limb Name="gWolfosNormalBackRightPasternLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_PASTERN" Offset="0x94EC" />
-        <Limb Name="gWolfosNormalBackRightPawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_PAW" Offset="0x94F8" />
-        <Limb Name="gWolfosNormalThoraxLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_THORAX" Offset="0x9504" />
-        <Limb Name="gWolfosNormalFrontRightUpperLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x9510" />
-        <Limb Name="gWolfosNormalFrontRightLowerLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x951C" />
-        <Limb Name="gWolfosNormalFrontRightClawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_RIGHT_CLAW" Offset="0x9528" />
-        <Limb Name="gWolfosNormalHeadRootLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_HEAD_ROOT" Offset="0x9534" />
-        <Limb Name="gWolfosNormalHeadLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_HEAD" Offset="0x9540" />
-        <Limb Name="gWolfosNormalEyesLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_EYES" Offset="0x954C" />
-        <Limb Name="gWolfosNormalFrontLeftUpperLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x9558" />
-        <Limb Name="gWolfosNormalFrontLeftLowerLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x9564" />
-        <Limb Name="gWolfosNormalFrontLeftClawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_LEFT_CLAW" Offset="0x9570" />
-
-        <!-- Wolfos Skeleton -->
-        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" LimbNone="WOLFOS_NORMAL_LIMB_NONE" LimbMax="WOLFOS_NORMAL_LIMB_MAX" EnumName="WolfosNormalLimb" Offset="0x95D0" />
-
-        <!-- Wolfos/White Wolfos Animations -->
-        <Animation Name="gWolfosSidestepAnim" Offset="0x9808" /> <!-- Original name is "wolfman_side_walk" -->
-        <Animation Name="gWolfosDamagedAnim" Offset="0x9A50" /> <!-- Originla name is "wolfman_tail_hit" -->
-        <Animation Name="gWolfosWaitAnim" Offset="0xA3CC" /> <!-- Original name is "wolfman_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wiz.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wiz.xml
deleted file mode 100644
index 51fcae3a7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wiz.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<Root>
-    <!-- Assets for Wizrobe, its platforms, and its magical attacks. -->
-    <File Name="object_wiz" Segment="6">
-        <!-- Wizrobe Animation -->
-        <Animation Name="gWizrobeAttackAnim" Offset="0x7B0" /> <!-- Original name is "wiz_atack" -->
-
-        <!-- Assets for the smoke that rises from the ice pool -->
-        <Texture Name="gWizrobeIceSmokeTex" OutName="wizrobe_ice_smoke" Format="i4" Width="32" Height="64" Offset="0x7C0" />
-        <Texture Name="gWizrobeIceSmokeMaskTex" OutName="wizrobe_ice_smoke_mask" Format="i4" Width="32" Height="32" Offset="0xBC0" />
-        <Texture Name="gWizrobeUnusedTex" OutName="wizrobe_unused" Format="i4" Width="16" Height="16" Offset="0xDC0" />
-        <DList Name="gWizrobeIceSmokeMaterialDL" Offset="0xE70" />
-        <DList Name="gWizrobeUnusedIceSmokeMaterialDL" Offset="0xF28" />
-        <DList Name="gWizrobeIceSmokeModelDL" Offset="0xFD8" /> <!-- Original name might have been "wiz_coolball_modelT" or "wiz_icesmoke" -->
-
-        <!-- Assets for the Wizrobe platform -->
-        <DList Name="gWizrobePlatformEmptyDL" Offset="0x10E0" /> <!-- Empty, probably was the transparent version of the following DL -->
-        <DList Name="gWizrobePlatformDL" Offset="0x10E8" /> <!-- Original name is "wiz_daiza_model" ("pedestal") -->
-        <Texture Name="gWizrobePlatformTex" OutName="wizrobe_platform" Format="rgba16" Width="16" Height="32" Offset="0x1198" />
-        <TextureAnimation Name="gWizrobePlatformEmptyTexAnim" Offset="0x15A0" />
-        <Collision Name="gWizrobePlatformCol" Offset="0x1690" />
-
-        <!-- Assets for the light that appears from the platform when the Wizrobe appears -->
-        <DList Name="gWizrobePlatformLightDL" Offset="0x1860" /> <!-- Original name is "wiz_daizalight_model" -->
-        <Texture Name="gWizrobePlatformLightMaskTex" OutName="wizrobe_platform_light_mask" Format="i4" Width="32" Height="32" Offset="0x19F0" />
-        <Texture Name="gWizrobePlatformLightBaseTex" OutName="wizrobe_platform_light_base" Format="i4" Width="16" Height="32" Offset="0x1BF0" />
-        <Texture Name="gWizrobePlatformLightRaysTex" OutName="wizrobe_platform_light_rays" Format="i8" Width="32" Height="32" Offset="0x1CF0" />
-        <TextureAnimation Name="gWizrobePlatformLightTexAnim" Offset="0x211C" />
-
-        <!-- Wizrobe Animations -->
-        <Animation Name="gWizrobeDamageAnim" Offset="0x2218" /> <!-- Original name is "wiz_damage" -->
-        <Animation Name="gWizrobeDanceAnim" Offset="0x2458" /> <!-- Original name is "wiz_dance" -->
-        <Animation Name="gWizrobeRunAnim" Offset="0x25F0" /> <!-- Original name is "wiz_dash" -->
-
-        <!-- Assets for the small flames during the Fire Wizrobe fight -->
-        <DList Name="gWizrobeSmallFlameDL" Offset="0x2630" /> <!-- Original name is "wiz_fire_model" -->
-        <Texture Name="gWizrobeSmallFlameTex" OutName="wizrobe_small_flame" Format="i4" Width="32" Height="32" Offset="0x2700" />
-        <Texture Name="gWizrobeSmallFlameMaskTex" OutName="wizrobe_small_flame_mask" Format="i4" Width="32" Height="32" Offset="0x2900" />
-
-        <!-- An unused texture animation that scrolls textures. It works okay with the small flames, so that was likely its original purpose. -->
-        <TextureAnimation Name="gWizrobeUnusedScrollTexAnim" Offset="0x2B08" />
-
-        <!-- Assets for the Wizrobe's magic projectile -->
-        <DList Name="gWizrobeMagicProjectileDL" Offset="0x2B40" /> <!-- Original name is "wiz_fireball_model" -->
-        <Texture Name="gWizrobeMagicProjectileTex" OutName="wizrobe_magic_projectile" Format="i4" Width="32" Height="32" Offset="0x2BD0" />
-
-        <!-- An unused texture animation that changes. Based on its placement, it may have been originally used with the magic projectile. -->
-        <TextureAnimation Name="gWizrobeUnusedColorChangingTexAnim" Offset="0x2DF4" />
-
-        <!-- Assets for the pool of fire that forms when the Fire Wizrobe's projectile hits something -->
-        <Texture Name="gWizrobeFirePoolTex" OutName="wizrobe_fire_pool" Format="i4" Width="32" Height="32" Offset="0x2E00" />
-        <DList Name="gWizrobeFirePoolDL" Offset="0x3120" /> <!-- Original name is "wiz_firefloor_modelT" -->
-
-        <!-- Assets for the smoke that comes off the Fire Wizrobe's fire -->
-        <Texture Name="gWizrobeFireSmokeTex" OutName="wizrobe_fire_smoke" Format="i4" Width="32" Height="64" Offset="0x31E0" />
-        <DList Name="gWizrobeFireSmokeDL" Offset="0x3640" /> <!-- Original name is "wiz_firesmoke_modelT" -->
-
-        <!-- Assets for the big flame during the Fire Wizrobe fight-->
-        <Texture Name="gWizrobeBigFlameTex" OutName="wizrobe_big_flame" Format="i8" Width="32" Height="32" Offset="0x3700" />
-        <Texture Name="gWizrobeBigFlameMaskTex" OutName="wizrobe_big_flame_mask" Format="i4" Width="32" Height="64" Offset="0x3B00" />
-        <DList Name="gWizrobeBigFlameDL" Offset="0x3FC0" /> <!-- Original name is "wiz_firewall_modelT" -->
-
-        <!-- Texture for the ice pool -->
-        <Texture Name="gWizrobeIcePoolTex" OutName="wizrobe_ice_pool" Format="i8" Width="64" Height="64" Offset="0x40B0" />
-
-        <!-- Unused vertices. Based on its placement, this may have been originally used with the ice pool. -->
-        <Array Name="gWizrobeUnusedVtx" Count="4" Offset="0x50B0">
-            <Vtx/>
-        </Array>
-
-        <!-- DisplayList for the ice pool -->
-        <DList Name="gWizrobeIcePoolDL" Offset="0x5190" /> <!-- Original name is "wiz_icefloor03_modelT" -->
-
-        <!-- Assets for the gleam on top of the ice pool-->
-        <Texture Name="gWizrobeIcePoolShineTex" OutName="wizrobe_ice_pool_shine" Format="i4" Width="32" Height="64" Offset="0x5230" />
-        <Texture Name="gWizrobeIcePoolShineMaskTex" OutName="wizrobe_ice_pool_shine_mask" Format="i4" Width="16" Height="16" Offset="0x5630" />
-        <DList Name="gWizrobeIcePoolShineDL" Offset="0x5750" /> <!-- Original name is "wiz_icefloor03_pika_modelT" ("pika" = onomatopoeic for "sparkle, glisten") -->
-
-        <!-- Assets for the glowing light in the center of the Wizrobe platform -->
-        <DList Name="gWizrobePlatformCenterDL" Offset="0x5870" /> <!-- Original name is "wiz_lighthole_modelT" -->
-        <DList Name="gWizrobePlatformCenterEmptyDL" Offset="0x5938" /> <!-- Empty, was probably the opaque version of the previous DL -->
-        <Texture Name="gWizrobePlatformCenterMaskTex" OutName="wizrobe_platform_center_mask" Format="i4" Width="32" Height="32" Offset="0x5940" />
-        <Texture Name="gWizrobePlatformCenterTex" OutName="wizrobe_platform_center" Format="i4" Width="16" Height="32" Offset="0x5B40" />
-        <TextureAnimation Name="gWizrobePlatformCenterTexAnim" Offset="0x5C64" />
-
-        <!-- Wizrobe Animations -->
-        <Animation Name="gWizrobeWindUpAnim" Offset="0x60E8" /> <!-- Original name is "wiz_preatack" -->
-        <Animation Name="gWizrobeIdleAnim" Offset="0x66C0" /> <!-- Original name is "wiz_wait" -->
-
-        <!-- Wizrobe Limb DisplayLists -->
-        <DList Name="gWizrobePelvisDL" Offset="0x8640" />
-        <DList Name="gWizrobeRightThighDL" Offset="0x86F0" />
-        <DList Name="gWizrobeRightShinDL" Offset="0x8790" />
-        <DList Name="gWizrobeRightFootDL" Offset="0x8868" />
-        <DList Name="gWizrobeLeftThighDL" Offset="0x8938" />
-        <DList Name="gWizrobeLeftShinDL" Offset="0x89D8" />
-        <DList Name="gWizrobeLeftFootDL" Offset="0x8AB0" />
-        <DList Name="gWizrobeLoinclothDL" Offset="0x8B80" />
-        <DList Name="gWizrobeTorsoDL" Offset="0x8C10" />
-        <DList Name="gWizrobeNeckDL" Offset="0x8CE8" /> <!-- Also includes the nose and ears for some reason. -->
-        <DList Name="gWizrobeJawDL" Offset="0x8F18" />
-        <DList Name="gWizrobeHeadDL" Offset="0x91D8" />
-        <DList Name="gWizrobeRightUpperArmDL" Offset="0x9560" />
-        <DList Name="gWizrobeRightForearmDL" Offset="0x9608" />
-        <DList Name="gWizrobeRightHandDL" Offset="0x96E0" />
-        <DList Name="gWizrobeStaffDL" Offset="0x97B8" />
-        <DList Name="gWizrobeLeftUpperArmDL" Offset="0x9918" />
-        <DList Name="gWizrobeLeftForearmDL" Offset="0x99C0" />
-        <DList Name="gWizrobeLeftHandDL" Offset="0x9A98" />
-
-        <!-- Wizrobe Textures -->
-        <Texture Name="gWizrobeFaceSkinTex" OutName="wizrobe_face_skin" Format="rgba16" Width="8" Height="8" Offset="0x9B70" />
-        <Texture Name="gWizrobeRobeTex" OutName="wizrobe_robe" Format="rgba16" Width="32" Height="32" Offset="0x9BF0" />
-        <Texture Name="gWizrobeHairTex" OutName="wizrobe_hair" Format="rgba16" Width="8" Height="16" Offset="0xA3F0" />
-        <Texture Name="gWizrobeEyeOrbitTex" OutName="wizrobe_eye_orbit" Format="rgba16" Width="16" Height="16" Offset="0xA4F0" />
-        <Texture Name="gWizrobeEyeTex" OutName="wizrobe_eye" Format="rgba16" Width="16" Height="16" Offset="0xA6F0" />
-        <Texture Name="gWizrobeLowerLipTex" OutName="wizrobe_lower_lip" Format="rgba16" Width="8" Height="8" Offset="0xA8F0" />
-        <Texture Name="gWizrobeNoseTex" OutName="wizrobe_nose" Format="rgba16" Width="8" Height="16" Offset="0xA970" />
-        <Texture Name="gWizrobeEarTex" OutName="wizrobe_ear" Format="rgba16" Width="16" Height="4" Offset="0xAA70" />
-        <Texture Name="gWizrobeStaffTipTex" OutName="wizrobe_staff_tip" Format="rgba16" Width="16" Height="16" Offset="0xAAF0" />
-        <Texture Name="gWizrobeStaffTex" OutName="wizrobe_staff" Format="rgba16" Width="16" Height="16" Offset="0xACF0" />
-        <Texture Name="gWizrobeBandTex" OutName="wizrobe_band" Format="rgba16" Width="16" Height="16" Offset="0xAEF0" />
-        <Texture Name="gWizrobeFootTex" OutName="wizrobe_foot" Format="rgba16" Width="16" Height="8" Offset="0xB0F0" />
-
-        <!-- Wizrobe Limbs -->
-        <Limb Name="gWizrobePelvisLimb" Type="Standard" EnumName="WIZROBE_LIMB_PELVIS" Offset="0xB1F0" />
-        <Limb Name="gWizrobeTorsoLimb" Type="Standard" EnumName="WIZROBE_LIMB_TORSO" Offset="0xB1FC" />
-        <Limb Name="gWizrobeLeftUpperArmLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_UPPER_ARM" Offset="0xB208" />
-        <Limb Name="gWizrobeLeftForearmLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_FOREARM" Offset="0xB214" />
-        <Limb Name="gWizrobeLeftHandLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_HAND" Offset="0xB220" />
-        <Limb Name="gWizrobeRightUpperArmLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_UPPER_ARM" Offset="0xB22C" />
-        <Limb Name="gWizrobeRightForearmLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_FOREARM" Offset="0xB238" />
-        <Limb Name="gWizrobeRightHandLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_HAND" Offset="0xB244" />
-        <Limb Name="gWizrobeStaffLimb" Type="Standard" EnumName="WIZROBE_LIMB_STAFF" Offset="0xB250" />
-        <Limb Name="gWizrobeNeckLimb" Type="Standard" EnumName="WIZROBE_LIMB_NECK" Offset="0xB25C" />
-        <Limb Name="gWizrobeHeadLimb" Type="Standard" EnumName="WIZROBE_LIMB_HEAD" Offset="0xB268" />
-        <Limb Name="gWizrobeJawLimb" Type="Standard" EnumName="WIZROBE_LIMB_JAW" Offset="0xB274" />
-        <Limb Name="gWizrobeLoinclothLimb" Type="Standard" EnumName="WIZROBE_LIMB_LOINCLOTH" Offset="0xB280" />
-        <Limb Name="gWizrobeLeftThighLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_THIGH" Offset="0xB28C" />
-        <Limb Name="gWizrobeLeftShinLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_SHIN" Offset="0xB298" />
-        <Limb Name="gWizrobeLeftFootLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_FOOT" Offset="0xB2A4" />
-        <Limb Name="gWizrobeRightThighLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_THIGH" Offset="0xB2B0" />
-        <Limb Name="gWizrobeRightShinLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_SHIN" Offset="0xB2BC" />
-        <Limb Name="gWizrobeRightFootLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_FOOT" Offset="0xB2C8" />
-
-        <!-- Wizrobe Skeleton -->
-        <Skeleton Name="gWizrobeSkel" Type="Flex" LimbType="Standard" LimbNone="WIZROBE_LIMB_NONE" LimbMax="WIZROBE_LIMB_MAX" EnumName="WizrobeLimb" Offset="0xB320" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wood02.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wood02.xml
deleted file mode 100644
index 6265ebf04..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_wood02.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="assets/objects/gameplay_field_keep/"/>
-    <File Name="object_wood02" Segment="6">
-        <DList Name="object_wood02_DL_000090" Offset="0x90" />
-        <DList Name="object_wood02_DL_000160" Offset="0x160" />
-        <DList Name="object_wood02_DL_000340" Offset="0x340" />
-        <DList Name="object_wood02_DL_000440" Offset="0x440" />
-        <Texture Name="object_wood02_Tex_0004D0" OutName="tex_0004D0" Format="rgba16" Width="16" Height="16" Offset="0x4D0" />
-        <DList Name="object_wood02_DL_000700" Offset="0x700" />
-        <Texture Name="object_wood02_Tex_000790" OutName="tex_000790" Format="rgba16" Width="32" Height="32" Offset="0x790" />
-        <Texture Name="object_wood02_Tex_000F90" OutName="tex_000F90" Format="ia4" Width="32" Height="128" Offset="0xF90" />
-        <Texture Name="object_wood02_Tex_001790" OutName="tex_001790" Format="ia8" Width="32" Height="128" Offset="0x1790" />
-        <Texture Name="object_wood02_Tex_002790" OutName="tex_002790" Format="ia4" Width="32" Height="128" Offset="0x2790" />
-        <Texture Name="object_wood02_Tex_002F90" OutName="tex_002F90" Format="rgba16" Width="32" Height="32" Offset="0x2F90" />
-        <Texture Name="object_wood02_Tex_003790" OutName="tex_003790" Format="ia8" Width="32" Height="128" Offset="0x3790" />
-        <Texture Name="object_wood02_Tex_004790" OutName="tex_004790" Format="ia8" Width="32" Height="64" Offset="0x4790" />
-        <Texture Name="object_wood02_Tex_004F90" OutName="tex_004F90" Format="ia8" Width="32" Height="128" Offset="0x4F90" />
-        <Texture Name="object_wood02_Tex_005F90" OutName="tex_005F90" Format="ia8" Width="32" Height="64" Offset="0x5F90" />
-        <Texture Name="object_wood02_Tex_006790" OutName="tex_006790" Format="ia8" Width="32" Height="64" Offset="0x6790" />
-        <Texture Name="object_wood02_Tex_006F90" OutName="tex_006F90" Format="ia8" Width="32" Height="64" Offset="0x6F90" />
-        <DList Name="object_wood02_DL_0078D0" Offset="0x78D0" />
-        <DList Name="object_wood02_DL_007968" Offset="0x7968" />
-        <Collision Name="object_wood02_Colheader_007A70" Offset="0x7A70" />
-        <DList Name="object_wood02_DL_007AD0" Offset="0x7AD0" />
-        <DList Name="object_wood02_DL_007CA0" Offset="0x7CA0" />
-        <DList Name="object_wood02_DL_007D38" Offset="0x7D38" />
-        <DList Name="object_wood02_DL_007E20" Offset="0x7E20" />
-        <DList Name="object_wood02_DL_0080D0" Offset="0x80D0" />
-        <DList Name="object_wood02_DL_008160" Offset="0x8160" />
-        <Texture Name="object_wood02_Tex_008230" OutName="tex_008230" Format="ia8" Width="32" Height="64" Offset="0x8230" />
-        <Texture Name="object_wood02_Tex_008A30" OutName="tex_008A30" Format="rgba16" Width="32" Height="32" Offset="0x8A30" />
-        <DList Name="object_wood02_DL_0092A0" Offset="0x92A0" />
-        <DList Name="object_wood02_DL_009340" Offset="0x9340" />
-        <DList Name="object_wood02_DL_0093D0" Offset="0x93D0" />
-        <DList Name="object_wood02_DL_0095B0" Offset="0x95B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yabusame_point.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yabusame_point.xml
deleted file mode 100644
index a7a3cac85..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yabusame_point.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_yabusame_point" Segment="6">
-        <Texture Name="gYabusamePoint30Tex" OutName="points_30" Format="ia8" Width="48" Height="24" Offset="0x0"/>
-        <Texture Name="gYabusamePoint60Tex" OutName="points_60" Format="ia8" Width="48" Height="24" Offset="0x480"/>
-        <Texture Name="gYabusamePoint100Tex" OutName="points_100" Format="ia8" Width="48" Height="24" Offset="0x900"/>
-        <DList Name="gYabusamePointDL" Offset="0xDC0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yado_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yado_obj.xml
deleted file mode 100644
index d5d0467d4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yado_obj.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_yado_obj" Segment="6">
-        <DList Name="object_yado_obj_DL_000320" Offset="0x320" />
-        <DList Name="object_yado_obj_DL_000430" Offset="0x430" />
-        <Texture Name="object_yado_obj_Tex_0005D8" OutName="tex_0005D8" Format="ia16" Width="16" Height="32" Offset="0x5D8" />
-        <Texture Name="object_yado_obj_Tex_0009D8" OutName="tex_0009D8" Format="rgba16" Width="32" Height="16" Offset="0x9D8" />
-        <Texture Name="object_yado_obj_Tex_000DD8" OutName="tex_000DD8" Format="i8" Width="16" Height="16" Offset="0xDD8" />
-        <Texture Name="object_yado_obj_Tex_000ED8" OutName="tex_000ED8" Format="ia16" Width="16" Height="32" Offset="0xED8" />
-        <TextureAnimation Name="object_yado_obj_Matanimheader_0012E8" Offset="0x12E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yb.xml
deleted file mode 100644
index 6c0ae86df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yb.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<Root>
-    <File Name="object_yb" Segment="6">
-        <!-- animation wont play in z64utils, attempts to play in game are crash -->
-        <!-- actor uses link animation so this might be reading incorrectly -->
-        <Animation Name="object_yb_Anim_000200" Offset="0x200" />
-        <!-- since these blobs are right after the animation, and that animation doesnt work... assume this is part of why -->
-        <!-- <Blob Name="object_yb_Blob_002080" Size="0x30" Offset="0x2080" /> -->
-        <!-- <Blob Name="object_yb_Blob_002D50" Size="0x30" Offset="0x2D50" /> -->
-        <DList Name="gYbPantsAndBellyButtonDL" Offset="0x3400" />
-        <DList Name="gYbRightThighDL" Offset="0x3610" />
-        <DList Name="gYbRightShinDL" Offset="0x37B0" />
-        <DList Name="gYbRightFoodDL" Offset="0x3900" />
-        <DList Name="gYbLeftThighDL" Offset="0x3BC8" />
-        <DList Name="gYbLeftShinDL" Offset="0x3D68" />
-        <DList Name="gYbLeftFootDL" Offset="0x3EB8" />
-        <DList Name="gYbEndDisplayList4108DL" Offset="0x4108" />
-        <DList Name="gYbUpperTorsoDL" Offset="0x4110" />
-        <DList Name="gYbHeadDL" Offset="0x4310" />
-        <DList Name="gYbPonyTailDL" Offset="0x47F8" />
-        <DList Name="gYbEndDisplayList4970DL" Offset="0x4970" />
-        <DList Name="gYbRightUpperArmDL" Offset="0x4978" />
-        <DList Name="gYbRightForearmDL" Offset="0x4AA0" />
-        <DList Name="gYbRightHandDL" Offset="0x4BC0" />
-        <DList Name="gYbLeftUpperArmDL" Offset="0x4D98" />
-        <DList Name="gYbLeftForearmDL" Offset="0x4EC0" />
-        <DList Name="gYbLeftHandDL" Offset="0x4FE0" />
-        <Texture Name="gYbTLUT" OutName="yb_tlut" Format="rgba16" Width="16" Height="16" Offset="0x51B8" />
-        <Texture Name="gYbForeheadBlotchTex" OutName="yb_forhead_blotch" Format="ci8" Width="8" Height="8" Offset="0x53B8" />
-        <Texture Name="gYbPonytailTex" OutName="yb_ponytail" Format="ci8" Width="8" Height="16" Offset="0x53F8" />
-        <Texture Name="gYbFingersTex" OutName="yb_fingers" Format="ci8" Width="16" Height="16" Offset="0x5478" />
-        <Texture Name="gYbToesTex" OutName="yb_toes" Format="ci8" Width="16" Height="16" Offset="0x5578" />
-        <Texture Name="gYbHairlineTex" OutName="yb_hairline" Format="ci8" Width="16" Height="16" Offset="0x5678" />
-        <Texture Name="gYbBellybuttonTex" OutName="yb_bellybutton" Format="ci8" Width="8" Height="16" Offset="0x5778" />
-        <Texture Name="gYbNoseTex" OutName="yb_nose" Format="ci8" Width="16" Height="16" Offset="0x57F8" />
-        <Texture Name="gYbEyeTex" OutName="yb_eye" Format="ci8" Width="32" Height="32" Offset="0x58F8" />
-        <Texture Name="gYbPantsTex" OutName="yb_pants" Format="i8" Width="16" Height="16" Offset="0x5CF8" />
-        <!-- some limbs wont highlight in z64utils, some guesswork here -->
-        <Limb Name="gYbMainRootLimb" Type="Standard" EnumName="YB_LIMB_MAIN_ROOT" Offset="0x5DF8" />
-        <Limb Name="gYbPantsLimb" Type="Standard" EnumName="YB_LIMB_PANTS" Offset="0x5E04" />
-        <Limb Name="gYbLegsRootLimb" Type="Standard" EnumName="YB_LIMB_LEGS_ROOT" Offset="0x5E10" />
-        <Limb Name="gYbRightThighLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_THIGH" Offset="0x5E1C" />
-        <Limb Name="gYbRightShinLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_SHIN" Offset="0x5E28" />
-        <Limb Name="gYbRightFootLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_FOOT" Offset="0x5E34" />
-        <Limb Name="gYbLeftThighLimb" Type="Standard" EnumName="YB_LIMB_LEFT_THIGH" Offset="0x5E40" />
-        <Limb Name="gYbLeftShinLimb" Type="Standard" EnumName="YB_LIMB_LEFT_SHIN" Offset="0x5E4C" />
-        <Limb Name="gYbLeftFootLimb" Type="Standard" EnumName="YB_LIMB_LEFT_FOOT" Offset="0x5E58" />
-        <Limb Name="gYbChestRootLimb" Type="Standard" EnumName="YB_LIMB_CHEST_ROOT" Offset="0x5E64" />
-        <Limb Name="gYbHeadLimb" Type="Standard" EnumName="YB_LIMB_HEAD" Offset="0x5E70" />
-        <Limb Name="gYbPonyTailLimb" Type="Standard" EnumName="YB_LIMB_PONYTAIL" Offset="0x5E7C" />
-        <!-- TODO: Name empty limb based on Player's Skeleton -->
-        <Limb Name="gYbEmpty5E88Limb" Type="Standard" EnumName="YB_LIMB_EMPTY_5E88" Offset="0x5E88" />
-        <Limb Name="gYbLeftUpperArmLimb" Type="Standard" EnumName="YB_LIMB_LEFT_UPPER_ARM" Offset="0x5E94" />
-        <Limb Name="gYbLeftForearmLimb" Type="Standard" EnumName="YB_LIMB_LEFT_FOREARM" Offset="0x5EA0" />
-        <Limb Name="gYbLeftHandLimb" Type="Standard" EnumName="YB_LIMB_LEFT_HAND" Offset="0x5EAC" />
-        <Limb Name="gYbRightUpperArmLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_UPPER_ARM" Offset="0x5EB8" />
-        <Limb Name="gYbRightForearmLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_FOREARM" Offset="0x5EC4" />
-        <Limb Name="gYbRightHandLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_HAND" Offset="0x5ED0" />
-        <Limb Name="gYbEmpty5EDCLimb" Type="Standard" EnumName="YB_LIMB_EMPTY_5EDC" Offset="0x5EDC" />
-        <Limb Name="gYbUpperTorsoLimb" Type="Standard" EnumName="YB_LIMB_TORSO" Offset="0x5EE8" />
-        <Skeleton Name="gYbSkel" Type="Flex" LimbType="Standard" LimbNone="YB_LIMB_NONE" LimbMax="YB_LIMB_MAX" EnumName="ObjectYbLimb" Offset="0x5F48" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yukimura_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yukimura_obj.xml
deleted file mode 100644
index e7f6d14d2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yukimura_obj.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="code/actor.xml" OutPath="assets/code/actor/"/>
-
-    <File Name="object_yukimura_obj" Segment="6">
-        <DList Name="object_yukimura_obj_DL_000640" Offset="0x640" />
-        <DList Name="object_yukimura_obj_DL_000758" Offset="0x758" />
-        <DList Name="object_yukimura_obj_DL_000870" Offset="0x870" />
-        <DList Name="object_yukimura_obj_DL_000890" Offset="0x890" />
-        <DList Name="object_yukimura_obj_DL_0008C0" Offset="0x8C0" />
-        <Texture Name="object_yukimura_obj_Tex_0008D8" OutName="tex_0008D8" Format="rgba16" Width="16" Height="8" Offset="0x8D8" />
-        <Texture Name="object_yukimura_obj_Tex_0009D8" OutName="tex_0009D8" Format="rgba16" Width="32" Height="16" Offset="0x9D8" />
-        <DList Name="object_yukimura_obj_DL_000EB0" Offset="0xEB0" />
-        <DList Name="object_yukimura_obj_DL_000F98" Offset="0xF98" />
-        <Texture Name="object_yukimura_obj_Tex_001078" OutName="tex_001078" Format="rgba16" Width="32" Height="32" Offset="0x1078" />
-        <Texture Name="object_yukimura_obj_Tex_001878" OutName="tex_001878" Format="i4" Width="64" Height="64" Offset="0x1878" />
-        <TextureAnimation Name="object_yukimura_obj_Matanimheader_002090" Offset="0x2090" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yukiyama.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yukiyama.xml
deleted file mode 100644
index 5e7215f82..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_yukiyama.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_yukiyama" Segment="6">
-        <DList Name="object_yukiyama_DL_001250" Offset="0x1250" />
-        <DList Name="object_yukiyama_DL_0013A8" Offset="0x13A8" />
-        <Texture Name="object_yukiyama_Tex_001A60" OutName="tex_001A60" Format="ia16" Width="32" Height="8" Offset="0x1A60" />
-        <Texture Name="object_yukiyama_Tex_001C60" OutName="tex_001C60" Format="i8" Width="32" Height="128" Offset="0x1C60" />
-        <Texture Name="object_yukiyama_Tex_002C60" OutName="tex_002C60" Format="rgba16" Width="16" Height="128" Offset="0x2C60" />
-        <Texture Name="object_yukiyama_Tex_003C60" OutName="tex_003C60" Format="i4" Width="64" Height="64" Offset="0x3C60" />
-        <Texture Name="object_yukiyama_Tex_004460" OutName="tex_004460" Format="rgba16" Width="16" Height="64" Offset="0x4460" />
-        <Texture Name="object_yukiyama_Tex_004C60" OutName="tex_004C60" Format="i8" Width="32" Height="32" Offset="0x4C60" />
-        <Texture Name="object_yukiyama_Tex_005060" OutName="tex_005060" Format="rgba16" Width="32" Height="32" Offset="0x5060" />
-        <Texture Name="object_yukiyama_Tex_005860" OutName="tex_005860" Format="rgba16" Width="32" Height="32" Offset="0x5860" />
-        <Texture Name="object_yukiyama_Tex_006060" OutName="tex_006060" Format="rgba16" Width="32" Height="32" Offset="0x6060" />
-        <TextureAnimation Name="object_yukiyama_Matanimheader_006868" Offset="0x6868" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zg.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zg.xml
deleted file mode 100644
index 6ff35fe48..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_zg" Segment="6">
-        <Texture Name="gTowerCollapseBarMetalTex" OutName="tower_collapse_bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="gTowerCollapseBarFlameTex" OutName="tower_collapse_bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
-        <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
-        <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zl1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zl1.xml
deleted file mode 100644
index ed7fbf987..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zl1.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<Root>
-    <!-- Object for Child Zelda 1 -->
-    <File Name="object_zl1" Segment="6">
-        <!-- Animation -->
-        <Animation Name="gChildZelda1Anim_00438" Offset="0x438" />
-
-        <!-- Palette -->
-        <Texture Name="gChildZelda1TLUT_0450" OutName="child_zelda_1_tlut_0450" Format="rgba16" Width="16" Height="16" Offset="0x450" />
-
-        <!-- Textures -->
-        <Texture Name="gChildZelda1DressGradientTex" OutName="child_zelda_1_dress_gradient" Format="ci8" Width="8" Height="8" Offset="0x650" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1PurpleDressPatternTex" OutName="child_zelda_1_purple_dress_pattern" Format="ci8" Width="16" Height="16" Offset="0x690" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1TriforceSashTex" OutName="child_zelda_1_triforce_sash" Format="ci8" Width="32" Height="64" Offset="0x790" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1BeltTex" OutName="child_zelda_1_belt" Format="ci8" Width="32" Height="8" Offset="0xF90" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1BeltLoopsTex" OutName="child_zelda_1_belt_loops" Format="ci8" Width="8" Height="8" Offset="0x1090" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1DressWrinklesTex" OutName="child_zelda_1_dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x10D0" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1BackOfHandTex" OutName="child_zelda_1_back_of_hand" Format="rgba16" Width="16" Height="16" Offset="0x14D0" />
-        <Texture Name="gChildZelda1BraceletTex" OutName="child_zelda_1_bracelet" Format="ci8" Width="16" Height="16" Offset="0x16D0" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1BlueUndershirtGradient1Tex" OutName="child_zelda_1_blue_undershirt_gradient_1" Format="rgba16" Width="8" Height="8" Offset="0x17D0" />
-        <Texture Name="gChildZelda1BlueUndershirtGradient2Tex" OutName="child_zelda_1_blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x1850" />
-        <Texture Name="gChildZelda1Tex_1A50" OutName="child_zelda_1_tex_1A50" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1StripedShoulderPatternTex" OutName="child_zelda_1_striped_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1A90" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1UndershirtWrinklesTex" OutName="child_zelda_1_undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x1AD0" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1PendantTex" OutName="child_zelda_1_pendant" Format="rgba16" Width="32" Height="32" Offset="0x1BD0" />
-
-        <!-- Child Zelda 1 Limb DisplayLists -->
-        <DList Name="gChildZelda1TorsoDL" Offset="0x4B50" />
-        <DList Name="gChildZelda1RightUpperArmDL" Offset="0x54D0" />
-        <DList Name="gChildZelda1RightForearmDL" Offset="0x5738" />
-        <DList Name="gChildZelda1RightHandDL" Offset="0x5888" />
-        <DList Name="gChildZelda1LeftUpperArmDL" Offset="0x5A68" />
-        <DList Name="gChildZelda1LeftForearmDL" Offset="0x5CD8" />
-        <DList Name="gChildZelda1LeftHandDL" Offset="0x5E28" />
-        <DList Name="gChildZelda1WaistDL" Offset="0x6008" />
-        <DList Name="gChildZelda1Dress1DL" Offset="0x6828" />
-        <DList Name="gChildZelda1Dress2DL" Offset="0x69E0" />
-        <DList Name="gChildZelda1Dress3DL" Offset="0x6BA0" />
-
-
-        <!-- Textures -->
-        <Texture Name="gChildZelda1TLUT_6CD8" OutName="child_zelda_1_tlut_6CD8" Format="rgba16" Width="252" Height="1" Offset="0x6CD8" />
-        <Texture Name="gChildZelda1TLUT_6ED0" OutName="child_zelda_1_tlut_6ED0" Format="rgba16" Width="252" Height="1" Offset="0x6ED0" />
-        <Texture Name="gChildZelda1TLUT_70C8" OutName="child_zelda_1_tlut_70C8" Format="rgba16" Width="160" Height="1" Offset="0x70C8" />
-        <Texture Name="gChildZelda1EyeOpenLookingUpRightTex" OutName="child_zelda_1_eye_open_looking_up_right" Format="ci8" Width="32" Height="32" Offset="0x7208" TlutOffset="0x6CD8" />
-        <!-- <Blob Name="object_zl1_Blob_0072C8" Size="0x740" Offset="0x72C8" /> -->
-        <Texture Name="gChildZelda1MouthNeutralTex" OutName="child_zelda_1_mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x7608" TlutOffset="0x6ED0" />
-        <Texture Name="gChildZelda1HeaddressGradientTex" OutName="child_zelda_1_headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x7A08" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1SkinGradientTex" OutName="child_zelda_1_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x7A48" />
-        <Texture Name="gChildZelda1HeaddressTriforceEmblemTex" OutName="child_zelda_1_headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x7AC8" />
-        <Texture Name="gChildZelda1PointedHairOnSideTex" OutName="child_zelda_1_pointed_hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x7EC8" />
-        <Texture Name="gChildZelda1HairTex" OutName="child_zelda_1_hair" Format="rgba16" Width="16" Height="8" Offset="0x80C8" />
-        <Texture Name="gChildZelda1Tex_81C8" OutName="child_zelda_1_tex_81C8" Format="ci8" Width="8" Height="8" Offset="0x81C8" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1EarTex" OutName="child_zelda_1_ear" Format="rgba16" Width="16" Height="16" Offset="0x8208" />
-        <Texture Name="gChildZelda1AlternateDressPatternTex" OutName="child_zelda_1_alternate_dress_pattern" Format="ci8" Width="8" Height="8" Offset="0x8408" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1AlternateDressBeltTex" OutName="child_zelda_1_alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x8448" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1AlternateDressGradientTex" OutName="child_zelda_1_alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x8548" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1AlternateDressLiningTex" OutName="child_zelda_1_alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x8648" />
-        <Texture Name="gChildZelda1BootTex" OutName="child_zelda_1_boot" Format="rgba16" Width="8" Height="8" Offset="0x8748" />
-        <Texture Name="gChildZelda1BootShaftTex" OutName="child_zelda_1_boot_shaft" Format="rgba16" Width="8" Height="8" Offset="0x87C8" />
-        <Texture Name="gChildZelda1EyeOpenLookingLeftTex" OutName="child_zelda_1_eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x8848" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1EyeOpenLookingRightTex" OutName="child_zelda_1_eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x8C48" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1MouthFrowningTex" OutName="child_zelda_1_mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0" />
-        <Texture Name="gChildZelda1EyeHalf1Tex" OutName="child_zelda_1_eye_half_1" Format="ci8" Width="32" Height="32" Offset="0x9448" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1EyeHalf2Tex" OutName="child_zelda_1_eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x9848" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1EyeClosedTex" OutName="child_zelda_1_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9C48" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1EyeWideTex" OutName="child_zelda_1_eye_wide" Format="ci8" Width="32" Height="32" Offset="0xA048" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1MouthOpenTex" OutName="child_zelda_1_mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0" />
-        <Texture Name="gChildZelda1Tex_A848" OutName="child_zelda_1_tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848" />
-        <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="child_zelda_1_headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1HeaddressStripeTex" OutName="child_zelda_1_headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="child_zelda_1_mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0" />
-
-        <!-- Child Zelda 1 Limb DisplayLists -->
-        <DList Name="gChildZelda1HeadDL" Offset="0xCD98" />
-        <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8" />
-        <DList Name="gChildZelda1LeftFootDL" Offset="0xE748" />
-        <DList Name="gChildZelda1RightFootDL" Offset="0xEA78" />
-        <DList Name="gChildZelda1RightLegDL" Offset="0xEDA8" />
-        <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00" />
-        <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8" />
-
-        <!-- Child Zelda 1 Limbs -->
-        <Limb Name="gChildZelda1RootLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_ROOT" Offset="0xF4C8" />
-        <Limb Name="gChildZelda1WaistLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_WAIST" Offset="0xF4D4" />
-        <Limb Name="gChildZelda1LeftLegLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_LEFT_LEG" Offset="0xF4E0" />
-        <Limb Name="gChildZelda1LeftFootLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_LEFT_FOOT" Offset="0xF4EC" />
-        <Limb Name="gChildZelda1RightLegLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_RIGHT_LEG" Offset="0xF4F8" />
-        <Limb Name="gChildZelda1RightFootLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_RIGHT_FOOT" Offset="0xF504" />
-        <Limb Name="gChildZelda1Dress1Limb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_DRESS_1" Offset="0xF510" />
-        <Limb Name="gChildZelda1Dress2Limb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_DRESS_2" Offset="0xF51C" />
-        <Limb Name="gChildZelda1Dress3Limb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_DRESS_3" Offset="0xF528" />
-        <Limb Name="gChildZelda1TorsoLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_TORSO" Offset="0xF534" />
-        <Limb Name="gChildZelda1LeftUpperArmLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_LEFT_UPPER_ARM" Offset="0xF540" />
-        <Limb Name="gChildZelda1LeftForearmLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_LEFT_FOREARM" Offset="0xF54C" />
-        <Limb Name="gChildZelda1LeftHandLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_LEFT_HAND" Offset="0xF558" />
-        <Limb Name="gChildZelda1RightUpperArmLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_RIGHT_UPPER_ARM" Offset="0xF564" />
-        <Limb Name="gChildZelda1RightForearmLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_RIGHT_FOREARM" Offset="0xF570" />
-        <Limb Name="gChildZelda1RightHandLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_RIGHT_HAND" Offset="0xF57C" />
-        <Limb Name="gChildZelda1HeadLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_HEAD" Offset="0xF588" />
-
-        <!-- Child Zelda 1 Skeleton -->
-        <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" LimbNone="CHILD_ZELDA_1_LIMB_NONE" LimbMax="CHILD_ZELDA_1_LIMB_MAX" EnumName="ChildZelda1Limb" Offset="0xF5D8" />
-        
-        <!-- Animations -->
-        <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38" />
-        <Animation Name="gChildZelda1Anim_11348" Offset="0x11348" />
-        <Animation Name="gChildZelda1Anim_116E4" Offset="0x116E4" />
-        <Animation Name="gChildZelda1Anim_12B88" Offset="0x11B88" />
-        <Animation Name="gChildZelda1Anim_12118" Offset="0x12118" />
-        <Animation Name="gChildZelda1Anim_12B04" Offset="0x12B04" />
-        <Animation Name="gChildZelda1Anim_12F80" Offset="0x12F80" />
-        <Animation Name="gChildZelda1Anim_132D8" Offset="0x132D8" />
-        <Animation Name="gChildZelda1Anim_138E0" Offset="0x138E0" />
-        <Animation Name="gChildZelda1Anim_13F10" Offset="0x13F10" />
-        <Animation Name="gChildZelda1Anim_143A8" Offset="0x143A8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zl4.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zl4.xml
deleted file mode 100644
index 2c5eff1ef..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zl4.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<Root>
-    <!-- Child Zelda: from the cutscene where Deku Link recalls how to play Song of Time after getting his Ocarina back -->
-    <File Name="object_zl4" Segment="6">
-        <!-- Everything up to and including the skeleton is retained from the beginning of OoT's object_zl4 -->
-        <Animation Name="gDmZl4IdleAnim" Offset="0x654" />
-        <Texture Name="gDmZl4DressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x670" />
-        <Texture Name="gDmZl4EyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x870" />
-        <Texture Name="gDmZl4MouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA70" />
-        <Texture Name="gDmZl4DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0xC70" />
-        <Texture Name="gDmZl4DressPurpleTex" OutName="purple_dress_patern" Format="ci8" Width="16" Height="16" Offset="0xCB0" />
-        <Texture Name="gDmZl4TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0xDB0" />
-        <Texture Name="gDmZl4BootLacesTex" OutName="boot_laces" Format="rgba16" Width="8" Height="8" Offset="0x15B0" />
-        <Texture Name="gDmZl4BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x1630" />
-        <Texture Name="gDmZl4AltDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x16B0" />
-        <Texture Name="gDmZl4AltDressTex" OutName="alternate_dress_patern" Format="ci8" Width="8" Height="8" Offset="0x17B0" />
-        <Texture Name="gDmZl4DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x17F0" />
-        <Texture Name="gDmZl4AltDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" />
-        <Texture Name="gDmZl4AltDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x1CF0" />
-
-        <!-- not named in OOT, some blue blemish center -->
-        <Texture Name="gDmZl4_001DF0_Tex" OutName="tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" />
-        <Texture Name="gDmZl4HeadressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x1E30" />
-        <Texture Name="gDmZl4HeadressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x2230" />
-        <!-- not named in OOT, gradient with dark blotch bottom-->
-        <Texture Name="gDmZl4_002270_Tex" OutName="tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" />
-        <Texture Name="gDmZl4HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0x22F0" />
-        <Texture Name="gDmZl4EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x24F0" />
-        <Texture Name="gDmZl4HairOnSideTex" OutName="hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x26F0" />
-        <Texture Name="gDmZl4SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x28F0" />
-        <!-- not named in OOT, some skin blemish center -->
-        <Texture Name="gDmZl4_002970_Tex" OutName="tex_002970" Format="rgba16" Width="8" Height="8" Offset="0x2970" />
-        <Texture Name="gDmZl4HairTex" OutName="hair" Format="rgba16" Width="16" Height="8" Offset="0x29F0" />
-
-        <!-- Eye Textures -->
-        <Texture Name="gDmZl4EyeOpenNormalTex" OutName="eye_open_normal" Format="ci8" Width="32" Height="32" Offset="0x2AF0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeHalfTex" OutName="eye_blinking" Format="ci8" Width="32" Height="32" Offset="0x2EF0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x32F0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeWideTex" OutName="eye_wide" Format="ci8" Width="32" Height="32" Offset="0x36F0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeHappyTex" OutName="eye_happy" Format="ci8" Width="32" Height="32" Offset="0x3AF0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeOpenLookingLeftTex" OutName="eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x3EF0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeOpenLookingRightTex" OutName="eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x42F0" TlutOffset="0x870"/>
-
-        <!-- Mouth Textures -->
-        <Texture Name="gZl4MouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x46F0" TlutOffset="0xA70"/>
-        <Texture Name="gZl4MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0x4AF0" TlutOffset="0xA70"/>
-        <Texture Name="gZl4MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x4EF0" TlutOffset="0xA70"/>
-        <Texture Name="gZl4MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x52F0" TlutOffset="0xA70"/>
-
-        <Texture Name="gDmZl4FingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x56F0" />
-        <Texture Name="gDmZl4BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x58F0" />
-        <Texture Name="gDmZl4BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient" Format="rgba16" Width="8" Height="8" Offset="0x59F0" />
-        <Texture Name="gDmZl4BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x5A70" />
-        <Texture Name="gDmZl4StripedShoulderTex" OutName="striped_shoulder_patern" Format="ci8" Width="8" Height="8" Offset="0x5C70" />
-        <Texture Name="gDmZl4UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x5CB0" />
-        <Texture Name="gDmZl4PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" />
-
-        <DList Name="gDmZl4ChestDL" Offset="0xA630" />
-        <DList Name="gDmZl4HeadDL" Offset="0xAFC8" />
-        <DList Name="gDmZl4RightUpperArmDL" Offset="0xB8D8" />
-        <DList Name="gDmZl4RightForearmDL" Offset="0xBB40" />
-        <DList Name="gDmZl4RightHandDL" Offset="0xBC90" />
-        <DList Name="gDmZl4LeftUpperArmDL" Offset="0xBE70" />
-        <DList Name="gDmZl4LeftForearmDL" Offset="0xC0E0" />
-        <DList Name="gDmZl4LeftHandDL" Offset="0xC230" />
-        <DList Name="gDmZl4HorseRidingDressDL" Offset="0xC410" />
-        <DList Name="gDmZl4WaistDL" Offset="0xC8D0" />
-        <DList Name="gDmZl4Dress1DL" Offset="0xD0E8" />
-        <DList Name="gDmZl4Dress2DL" Offset="0xD2A0" />
-        <DList Name="gDmZl4Dress3DL" Offset="0xD460" />
-        <DList Name="gDmZl4RightLegDL" Offset="0xD598" />
-        <DList Name="gDmZl4RightBootDL" Offset="0xD5E8" />
-        <DList Name="gDmZl4LeftLegDL" Offset="0xD728" />
-        <DList Name="gDmZl4LeftBootDL" Offset="0xD778" />
-
-        <!-- Ocarina, drawn to right hand in OverrideLimbDraw -->
-        <Texture Name="gDmZl4OcarinaTex" OutName="ocarina" Format="rgba16" Width="32" Height="16" Offset="0xD8B8" />
-        <DList Name="gDmZl4OcarinaDL" Offset="0xDE08" />
-
-        <Limb Name="gDmZl4RootLimb" Type="Standard" EnumName="ZL4_LIMB_ROOT" Offset="0xDF28" />
-        <Limb Name="gDmZl4WaistLimb" Type="Standard" EnumName="ZL4_LIMB_WAIST" Offset="0xDF34" />
-        <Limb Name="gDmZl4LeftLegLimb" Type="Standard" EnumName="ZL4_LIMB_LEFT_LEG" Offset="0xDF40" />
-        <Limb Name="gDmZl4LeftFootLimb" Type="Standard" EnumName="ZL4_LIMB_LEFT_FOOT" Offset="0xDF4C" />
-        <Limb Name="gDmZl4RightLegLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_LEG" Offset="0xDF58" />
-        <Limb Name="gDmZl4RightFootLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_FOOT" Offset="0xDF64" />
-        <Limb Name="gDmZl4Dress1Limb" Type="Standard" EnumName="ZL4_LIMB_DRESS_1" Offset="0xDF70" />
-        <Limb Name="gDmZl4Dress2Limb" Type="Standard" EnumName="ZL4_LIMB_DRESS_2" Offset="0xDF7C" />
-        <Limb Name="gDmZl4Dress3Limb" Type="Standard" EnumName="ZL4_LIMB_DRESS_3" Offset="0xDF88" />
-        <Limb Name="gDmZl4TorsoLimb" Type="Standard" EnumName="ZL4_LIMB_TORSO" Offset="0xDF94" />
-        <Limb Name="gDmZl4LeftUpperArmLimb" Type="Standard" EnumName="ZL4_LIMB_LEFT_UPPER_ARM" Offset="0xDFA0" />
-        <Limb Name="gDmZl4LeftForearmLimb" Type="Standard" EnumName="ZL4_LIMB_LEFT_FOREARM" Offset="0xDFAC" />
-        <Limb Name="gDmZl4LeftHandLimb" Type="Standard" EnumName="ZL4_LIMB_LEFT_HAND" Offset="0xDFB8" />
-        <Limb Name="gDmZl4RightUpperArmLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_UPPER_ARM" Offset="0xDFC4" />
-        <Limb Name="gDmZl4RightForearmLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_FOREARM" Offset="0xDFD0" />
-        <Limb Name="gDmZl4RightHandLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_HAND" Offset="0xDFDC" />
-        <Limb Name="gDmZl4HeadLimb" Type="Standard" EnumName="ZL4_LIMB_HEAD" Offset="0xDFE8" />
-        <Skeleton Name="gZl4Skel" Type="Flex" LimbType="Standard" LimbNone="ZL4_LIMB_NONE" LimbMax="ZL4_LIMB_MAX" EnumName="Zl4Limb" Offset="0xE038" />
-
-        
-        <!-- Unused Flute Animations -->
-        <Animation Name="gDmZl4HoldingFluteInFrontAnim" Offset="0xFDC8" />
-        <Animation Name="gDmZl4RaiseFluteToPlayAnim" Offset="0x10334" />
-        <Animation Name="gDmZl4LowerFluteAfterPlayAnim" Offset="0x105C8" />
-        <Animation Name="gDmZl4PlayingFluteAnim" Offset="0x10D50" />
-
-        <!-- Used in MM -->
-        <Animation Name="gDmZl4TurningAroundAnim" Offset="0xF250" />
-        <Animation Name="gDmZl4FacingAwayIdleAnim" Offset="0x11294" />
-        <Animation Name="gDmZl4GivingItemStartAnim" Offset="0x11BB8" />
-        <Animation Name="gDmZl4GivingItemLoopAnim" Offset="0x122E0" />
-        <Animation Name="gDmZl4RaisingOcarinaToPlayAnim" Offset="0x12A84" />
-        <Animation Name="gDmZl4PlayingOcarinaAnim" Offset="0x1303C" />
-
-        <!-- Unused Backflipping Animation -->
-        <Animation Name="gDmZl4BackflipAnim" Offset="0x13934" />
-        <Animation Name="gDmZl4BackflipPrepareAnim" Offset="0x13F2C" />
-        <Animation Name="gDmZl4BackflipPrepareHoldingReadyAnim" Offset="0x14558" />
-
-        <!-- Used in MM --> 
-        <Animation Name="gDmZl4TurningAround2Anim" Offset="0x15494" />
-        <Animation Name="gDmZl4HandsOverEmblemLoopAnim" Offset="0x15A4C" />
-        <Animation Name="gDmZl4FacingAwayHandsOverEmblemLoopAnim" Offset="0x15DA0" />
-
-        <!-- Unused in MM, copy of OoT Animations in object_zl4:(0xE050 -> End) --> 
-        <Animation Name="gDmZl4Anim_016328" Offset="0x16328" />
-        <Animation Name="gDmZl4Anim_016924" Offset="0x16924" />
-        <Animation Name="gDmZl4Anim_016E04" Offset="0x16E04" />
-        <Animation Name="gDmZl4Anim_0175F4" Offset="0x175F4" />
-        <Animation Name="gDmZl4Anim_018B58" Offset="0x18B58" />
-        <Animation Name="gDmZl4Anim_018FA8" Offset="0x18FA8" />
-        <Animation Name="gDmZl4Anim_0193F8" Offset="0x193F8" />
-        <Animation Name="gDmZl4Anim_019894" Offset="0x19894" />
-        <Animation Name="gDmZl4Anim_01A344" Offset="0x1A344" />
-        <Animation Name="gDmZl4Anim_01ABB8" Offset="0x1ABB8" />
-        <Animation Name="gDmZl4Anim_01AFE0" Offset="0x1AFE0" />
-        <Animation Name="gDmZl4Anim_01B388" Offset="0x1B388" />
-        <Animation Name="gDmZl4Anim_01B7B0" Offset="0x1B7B0" />
-        <Animation Name="gDmZl4Anim_01BC00" Offset="0x1BC00" />
-        <Animation Name="gDmZl4Anim_01DC74" Offset="0x1DC74" />
-        <Animation Name="gDmZl4Anim_01E714" Offset="0x1E714" />
-        <Animation Name="gDmZl4Anim_01EA68" Offset="0x1EA68" />
-        <Animation Name="gDmZl4Anim_01EFCC" Offset="0x1EFCC" />
-        <Animation Name="gDmZl4Anim_01F578" Offset="0x1F578" />
-        <Animation Name="gDmZl4Anim_01FDBC" Offset="0x1FDBC" />
-        <Animation Name="gDmZl4Anim_0205F8" Offset="0x205F8" />
-        <Animation Name="gDmZl4Anim_020E6C" Offset="0x20E6C" />
-        <Animation Name="gDmZl4Anim_021360" Offset="0x21360" />
-        <Animation Name="gDmZl4Anim_02167C" Offset="0x2167C" />
-        <Animation Name="gDmZl4Anim_02205C" Offset="0x2205C" />
-        <Animation Name="gDmZl4Anim_022840" Offset="0x22840" />
-        <Animation Name="gDmZl4Anim_022BE8" Offset="0x22BE8" />
-        <Animation Name="gDmZl4Anim_0235D4" Offset="0x235D4" />
-        <Animation Name="gDmZl4Anim_023A50" Offset="0x23A50" />
-        <Animation Name="gDmZl4Anim_0241F4" Offset="0x241F4" />
-        <Animation Name="gDmZl4Anim_024510" Offset="0x24510" />
-        <Animation Name="gDmZl4Anim_024B68" Offset="0x24B68" />
-
-        <!-- Unused Flute -->
-        <DList Name="gDmZl4FluteDL" Offset="0x24D80" />
-        <DList Name="gDmZl4FluteWrapperDL" Offset="0x24E40" />
-        <Texture Name="gDmZl4FluteHoleTex" OutName="flute_hole" Format="rgba16" Width="16" Height="8" Offset="0x24E50" />
-        
-        <TextureAnimation Name="gDmZlEmptyTexAnim" Offset="0x24F50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zm.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zm.xml
deleted file mode 100644
index c35d5aecb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zm.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Root>
-    <File Name="object_zm" Segment="6">
-        <Animation Name="object_zm_Anim_000C80" Offset="0xC80" />
-        <Animation Name="object_zm_Anim_001324" Offset="0x1324" />
-        <Animation Name="object_zm_Anim_0016A4" Offset="0x16A4" />
-        <Animation Name="object_zm_Anim_001DF0" Offset="0x1DF0" />
-        <Animation Name="object_zm_Anim_0022C8" Offset="0x22C8" />
-        <Animation Name="object_zm_Anim_0028B8" Offset="0x28B8" />
-        <Animation Name="object_zm_Anim_002F20" Offset="0x2F20" />
-        <Animation Name="object_zm_Anim_003AA8" Offset="0x3AA8" />
-        <DList Name="object_zm_DL_0063A0" Offset="0x63A0" />
-        <DList Name="object_zm_DL_0066D0" Offset="0x66D0" />
-        <DList Name="object_zm_DL_006898" Offset="0x6898" />
-        <DList Name="object_zm_DL_0069D8" Offset="0x69D8" />
-        <DList Name="object_zm_DL_006C38" Offset="0x6C38" />
-        <DList Name="object_zm_DL_006E00" Offset="0x6E00" />
-        <DList Name="object_zm_DL_006F40" Offset="0x6F40" />
-        <DList Name="object_zm_DL_007178" Offset="0x7178" />
-        <DList Name="object_zm_DL_0076F8" Offset="0x76F8" />
-        <DList Name="object_zm_DL_0078A0" Offset="0x78A0" />
-        <DList Name="object_zm_DL_007A18" Offset="0x7A18" />
-        <DList Name="object_zm_DL_007B18" Offset="0x7B18" />
-        <DList Name="object_zm_DL_007C38" Offset="0x7C38" />
-        <DList Name="object_zm_DL_007D60" Offset="0x7D60" />
-        <DList Name="object_zm_DL_007E60" Offset="0x7E60" />
-        <DList Name="object_zm_DL_007F80" Offset="0x7F80" />
-        <Texture Name="object_zm_TLUT_0080A8" OutName="tlut_0080A8" Format="rgba16" Width="16" Height="16" Offset="0x80A8" />
-        <Texture Name="object_zm_Tex_0082A8" OutName="tex_0082A8" Format="ci8" Width="8" Height="8" Offset="0x82A8" />
-        <Texture Name="object_zm_Tex_0082E8" OutName="tex_0082E8" Format="ci8" Width="32" Height="32" Offset="0x82E8" />
-        <Texture Name="object_zm_Tex_0086E8" OutName="tex_0086E8" Format="ci8" Width="32" Height="32" Offset="0x86E8" />
-        <Texture Name="object_zm_Tex_008AE8" OutName="tex_008AE8" Format="ci8" Width="32" Height="32" Offset="0x8AE8" />
-        <Texture Name="object_zm_Tex_008EE8" OutName="tex_008EE8" Format="ci8" Width="16" Height="16" Offset="0x8EE8" />
-        <Texture Name="object_zm_Tex_008FE8" OutName="tex_008FE8" Format="rgba16" Width="32" Height="32" Offset="0x8FE8" />
-        <Texture Name="object_zm_Tex_0097E8" OutName="tex_0097E8" Format="rgba16" Width="8" Height="8" Offset="0x97E8" />
-        <Texture Name="object_zm_Tex_009868" OutName="tex_009868" Format="ci8" Width="16" Height="16" Offset="0x9868" />
-        <Texture Name="object_zm_Tex_009968" OutName="tex_009968" Format="ci8" Width="16" Height="16" Offset="0x9968" />
-        <Texture Name="object_zm_Tex_009A68" OutName="tex_009A68" Format="rgba16" Width="16" Height="16" Offset="0x9A68" />
-        <Texture Name="object_zm_Tex_009C68" OutName="tex_009C68" Format="ci8" Width="32" Height="32" Offset="0x9C68" />
-        <Texture Name="object_zm_Tex_00A068" OutName="tex_00A068" Format="ci8" Width="32" Height="32" Offset="0xA068" />
-        <Texture Name="object_zm_Tex_00A468" OutName="tex_00A468" Format="ci8" Width="32" Height="32" Offset="0xA468" />
-        <Limb Name="object_zm_Standardlimb_00A868" Type="Standard" EnumName="OBJECT_ZM_LIMB_01" Offset="0xA868" />
-        <Limb Name="object_zm_Standardlimb_00A874" Type="Standard" EnumName="OBJECT_ZM_LIMB_02" Offset="0xA874" />
-        <Limb Name="object_zm_Standardlimb_00A880" Type="Standard" EnumName="OBJECT_ZM_LIMB_03" Offset="0xA880" />
-        <Limb Name="object_zm_Standardlimb_00A88C" Type="Standard" EnumName="OBJECT_ZM_LIMB_04" Offset="0xA88C" />
-        <Limb Name="object_zm_Standardlimb_00A898" Type="Standard" EnumName="OBJECT_ZM_LIMB_05" Offset="0xA898" />
-        <Limb Name="object_zm_Standardlimb_00A8A4" Type="Standard" EnumName="OBJECT_ZM_LIMB_06" Offset="0xA8A4" />
-        <Limb Name="object_zm_Standardlimb_00A8B0" Type="Standard" EnumName="OBJECT_ZM_LIMB_07" Offset="0xA8B0" />
-        <Limb Name="object_zm_Standardlimb_00A8BC" Type="Standard" EnumName="OBJECT_ZM_LIMB_08" Offset="0xA8BC" />
-        <Limb Name="object_zm_Standardlimb_00A8C8" Type="Standard" EnumName="OBJECT_ZM_LIMB_09" Offset="0xA8C8" />
-        <Limb Name="object_zm_Standardlimb_00A8D4" Type="Standard" EnumName="OBJECT_ZM_LIMB_0A" Offset="0xA8D4" />
-        <Limb Name="object_zm_Standardlimb_00A8E0" Type="Standard" EnumName="OBJECT_ZM_LIMB_0B" Offset="0xA8E0" />
-        <Limb Name="object_zm_Standardlimb_00A8EC" Type="Standard" EnumName="OBJECT_ZM_LIMB_0C" Offset="0xA8EC" />
-        <Limb Name="object_zm_Standardlimb_00A8F8" Type="Standard" EnumName="OBJECT_ZM_LIMB_0D" Offset="0xA8F8" />
-        <Limb Name="object_zm_Standardlimb_00A904" Type="Standard" EnumName="OBJECT_ZM_LIMB_0E" Offset="0xA904" />
-        <Limb Name="object_zm_Standardlimb_00A910" Type="Standard" EnumName="OBJECT_ZM_LIMB_0F" Offset="0xA910" />
-        <Limb Name="object_zm_Standardlimb_00A91C" Type="Standard" EnumName="OBJECT_ZM_LIMB_10" Offset="0xA91C" />
-        <Limb Name="object_zm_Standardlimb_00A928" Type="Standard" EnumName="OBJECT_ZM_LIMB_11" Offset="0xA928" />
-        <Skeleton Name="object_zm_Skel_00A978" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZM_LIMB_NONE" LimbMax="OBJECT_ZM_LIMB_MAX" EnumName="ObjectZmLimb" Offset="0xA978" />
-        <Animation Name="object_zm_Anim_00B3E0" Offset="0xB3E0" />
-        <Animation Name="object_zm_Anim_00B894" Offset="0xB894" />
-        <Animation Name="object_zm_Anim_00BC08" Offset="0xBC08" />
-        <Animation Name="object_zm_Anim_00C880" Offset="0xC880" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zo.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zo.xml
deleted file mode 100644
index 0cd5c8546..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zo.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<Root>
-    <!-- Object for the Zoras -->
-    <File Name="object_zo" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gZoraHandsOnHipsTappingFootAnim" Offset="0x598" />
-        <Animation Name="gZoraArmsOpenAnim" Offset="0xD48" />
-        <Animation Name="gZoraThrowRupeeAnim" Offset="0x219C" />
-        <Animation Name="gZoraWalkAnim" Offset="0x2898" />
-
-        <!-- Effects -->
-        <Texture Name="gZoraBubbleTex" OutName="zora_bubble" Format="ia8" Width="16" Height="16" Offset="0x28B0" />
-        <DList Name="gZoraBubbleMaterialDL" Offset="0x29F0" />
-        <DList Name="gZoraBubbleModelDL" Offset="0x2A50" />
-
-        <Texture Name="gZoraSplashTex" OutName="zora_splash" Format="i8" Width="16" Height="16" Offset="0x2A70" />
-        <DList Name="gZoraSplashMaterialDL" Offset="0x2BA0" />
-        <DList Name="gZoraSplashModelDL" Offset="0x2C10" />
-
-        <!-- Animations -->
-        <Animation Name="gZoraSurfacingAnim" Offset="0x3610" />
-        <Animation Name="gZoraTreadingWaterAnim" Offset="0x4168" />
-        <Animation Name="gZoraIdleAnim" Offset="0x4248" />
-
-        <!-- Textures -->
-        <Texture Name="gZoraTLUT" OutName="zora_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4260" />
-        <Texture Name="gZoraFinTex" OutName="zora_fin" Format="ci8" Width="32" Height="32" Offset="0x4460" />
-        <Texture Name="gZoraBackAndHeadTailTex" OutName="zora_back_head_tail" Format="ci8" Width="32" Height="64" Offset="0x4860" />
-        <Texture Name="gZoraSkinTex" OutName="zora_skin" Format="ci8" Width="8" Height="8" Offset="0x5060" />
-        <Texture Name="gZoraEyeOpenTex" OutName="zora_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x50A0" />
-        <Texture Name="gZoraEyeHalfTex" OutName="zora_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x58A0" />
-        <Texture Name="gZoraEyeClosedTex" OutName="zora_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x60A0" />
-        <Texture Name="gZoraMouthTex" OutName="zora_mouth" Format="rgba16" Width="32" Height="32" Offset="0x68A0" />
-        <Texture Name="gZoraHandTex" OutName="zora_hand" Format="ci8" Width="16" Height="16" Offset="0x70A0" />
-        <Texture Name="gZoraKneeTex" OutName="zora_knee" Format="ci8" Width="8" Height="8" Offset="0x71A0" />
-
-        <!-- DLists -->
-        <DList Name="gZoraPelvisDL" Offset="0xA2A0" />
-        <DList Name="gZoraTorsoDL" Offset="0xA448" />
-        <DList Name="gZoraHeadDL" Offset="0xA7C0" />
-        <DList Name="gZoraHeadTail1DL" Offset="0xAA38" />
-        <DList Name="gZoraHeadTail2DL" Offset="0xABD8" />
-        <DList Name="gZoraHeadTail3DL" Offset="0xAD70" />
-        <DList Name="gZoraHeadTailFinDL" Offset="0xAF08" />
-        <DList Name="gZoraRightUpperArmDL" Offset="0xB148" />
-        <DList Name="gZoraRightForearmDL" Offset="0xB3A8" />
-        <DList Name="gZoraRightHandDL" Offset="0xB688" />
-        <DList Name="gZoraLeftUpperArmDL" Offset="0xB890" />
-        <DList Name="gZoraLeftForearmDL" Offset="0xBAF0" />
-        <DList Name="gZoraLeftHandDL" Offset="0xBDD0" />
-        <DList Name="gZoraRightThighDL" Offset="0xBFD8" />
-        <DList Name="gZoraRightShinDL" Offset="0xC2B8" />
-        <DList Name="gZoraRightFootDL" Offset="0xC590" />
-        <DList Name="gZoraLeftThighDL" Offset="0xC858" />
-        <DList Name="gZoraLeftShinDL" Offset="0xCB38" />
-        <DList Name="gZoraLeftFootDL" Offset="0xCE10" />
-
-        <!-- Skeleton -->
-        <Limb Name="gZoraPelvisLimb" Type="Standard" EnumName="ZORA_LIMB_PELVIS" Offset="0xD0D8" />
-        <Limb Name="gZoraLeftThighLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_THIGH" Offset="0xD0E4" />
-        <Limb Name="gZoraLeftShinLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_SHIN" Offset="0xD0F0" />
-        <Limb Name="gZoraLeftFootLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_FOOT" Offset="0xD0FC" />
-        <Limb Name="gZoraRightThighLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_THIGH" Offset="0xD108" />
-        <Limb Name="gZoraRightShinLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_SHIN" Offset="0xD114" />
-        <Limb Name="gZoraRightFootLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_FOOT" Offset="0xD120" />
-        <Limb Name="gZoraTorsoLimb" Type="Standard" EnumName="ZORA_LIMB_TORSO" Offset="0xD12C" />
-        <Limb Name="gZoraLeftUpperArmLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_UPPER_ARM" Offset="0xD138" />
-        <Limb Name="gZoraLeftForearmLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_FOREARM" Offset="0xD144" />
-        <Limb Name="gZoraLeftHandLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_HAND" Offset="0xD150" />
-        <Limb Name="gZoraRightUpperArmLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_UPPER_ARM" Offset="0xD15C" />
-        <Limb Name="gZoraRightForearmLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_FOREARM" Offset="0xD168" />
-        <Limb Name="gZoraRightHandLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_HAND" Offset="0xD174" />
-        <Limb Name="gZoraHeadLimb" Type="Standard" EnumName="ZORA_LIMB_HEAD" Offset="0xD180" />
-        <Limb Name="gZoraHeadTail1Limb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_1" Offset="0xD18C" />
-        <Limb Name="gZoraHeadTail2Limb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_2" Offset="0xD198" />
-        <Limb Name="gZoraHeadTail3Limb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_3" Offset="0xD1A4" />
-        <Limb Name="gZoraHeadTailFinLimb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_FIN" Offset="0xD1B0" />
-        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" LimbNone="ZORA_LIMB_NONE" LimbMax="ZORA_LIMB_MAX" EnumName="ZoraLimb" Offset="0xD208" />
-
-        <!-- Effects -->
-        <DList Name="gZoraRippleMaterialDL" Offset="0xD220" />
-        <DList Name="gZoraRippleModelDL" Offset="0xD288" />
-
-        <DList Name="object_zo_DL_00D2A0" Offset="0xD2A0" />
-        <DList Name="object_zo_DL_00D2B8" Offset="0xD2B8" />
-
-        <!-- Animations -->
-        <Animation Name="gZoraStandAnim" Offset="0xDE20" />
-        <Animation Name="gZoraListenAnim" Offset="0xDF54" />
-        <Animation Name="gZoraRunAnim" Offset="0xE400" />
-        <Animation Name="gZoraBobHandAnim" Offset="0xEDF0" />
-        <Animation Name="gZoraSitAnim" Offset="0xF4E8" />
-        <Animation Name="gZoraFixSpeakerStartAnim" Offset="0xFDF0" />
-        <Animation Name="gZoraFixSpeakerLoopAnim" Offset="0x10B18" />
-        <Animation Name="gZoraFixSpeakerEndAnim" Offset="0x11424" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zob.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zob.xml
deleted file mode 100644
index 8d27f260f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zob.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<Root>
-    <File Name="object_zob" Segment="6">
-        <Animation Name="object_zob_Anim_001FD4" Offset="0x1FD4" />
-        <Animation Name="object_zob_Anim_0027D0" Offset="0x27D0" />
-        <Animation Name="object_zob_Anim_002B38" Offset="0x2B38" />
-        <Animation Name="object_zob_Anim_0037A0" Offset="0x37A0" />
-        <Animation Name="object_zob_Anim_0043C4" Offset="0x43C4" />
-        <Animation Name="object_zob_Anim_005224" Offset="0x5224" />
-        <Animation Name="object_zob_Anim_005E90" Offset="0x5E90" />
-        <Animation Name="object_zob_Anim_006998" Offset="0x6998" />
-        <DList Name="object_zob_DL_00A700" Offset="0xA700" />
-        <DList Name="object_zob_DL_00A880" Offset="0xA880" />
-        <DList Name="object_zob_DL_00AA58" Offset="0xAA58" />
-        <DList Name="object_zob_DL_00AB80" Offset="0xAB80" />
-        <DList Name="object_zob_DL_00AE08" Offset="0xAE08" />
-        <DList Name="object_zob_DL_00AF90" Offset="0xAF90" />
-        <DList Name="object_zob_DL_00B150" Offset="0xB150" />
-        <DList Name="object_zob_DL_00B3B8" Offset="0xB3B8" />
-        <DList Name="object_zob_DL_00B4E0" Offset="0xB4E0" />
-        <DList Name="object_zob_DL_00B768" Offset="0xB768" />
-        <DList Name="object_zob_DL_00B8F0" Offset="0xB8F0" />
-        <DList Name="object_zob_DL_00BC48" Offset="0xBC48" />
-        <DList Name="object_zob_DL_00BD10" Offset="0xBD10" />
-        <DList Name="object_zob_DL_00BDC8" Offset="0xBDC8" />
-        <DList Name="object_zob_DL_00BE90" Offset="0xBE90" />
-        <DList Name="object_zob_DL_00BF48" Offset="0xBF48" />
-        <DList Name="object_zob_DL_00C140" Offset="0xC140" />
-        <DList Name="object_zob_DL_00C370" Offset="0xC370" />
-        <DList Name="object_zob_DL_00C528" Offset="0xC528" />
-        <DList Name="object_zob_DL_00C7B0" Offset="0xC7B0" />
-        <DList Name="object_zob_DL_00C9E0" Offset="0xC9E0" />
-        <DList Name="object_zob_DL_00CB98" Offset="0xCB98" />
-        <Texture Name="object_zob_TLUT_00CE20" OutName="tlut_00CE20" Format="rgba16" Width="16" Height="16" Offset="0xCE20" />
-        <Texture Name="object_zob_TLUT_00D020" OutName="tlut_00D020" Format="rgba16" Width="16" Height="16" Offset="0xD020" />
-        <Texture Name="object_zob_Tex_00D220" OutName="tex_00D220" Format="ci8" Width="8" Height="8" Offset="0xD220" />
-        <Texture Name="object_zob_Tex_00D260" OutName="tex_00D260" Format="ci8" Width="32" Height="32" Offset="0xD260" />
-        <Texture Name="object_zob_Tex_00D660" OutName="tex_00D660" Format="rgba16" Width="16" Height="16" Offset="0xD660" />
-        <Texture Name="object_zob_Tex_00D860" OutName="tex_00D860" Format="rgba16" Width="16" Height="16" Offset="0xD860" />
-        <Texture Name="object_zob_Tex_00DA60" OutName="tex_00DA60" Format="rgba16" Width="32" Height="32" Offset="0xDA60" />
-        <Texture Name="object_zob_Tex_00E260" OutName="tex_00E260" Format="ci8" Width="8" Height="8" Offset="0xE260" />
-        <Texture Name="object_zob_Tex_00E2A0" OutName="tex_00E2A0" Format="rgba16" Width="32" Height="32" Offset="0xE2A0" />
-        <Texture Name="object_zob_Tex_00EAA0" OutName="tex_00EAA0" Format="rgba16" Width="32" Height="32" Offset="0xEAA0" />
-        <Texture Name="object_zob_Tex_00F2A0" OutName="tex_00F2A0" Format="rgba16" Width="32" Height="32" Offset="0xF2A0" />
-        <Texture Name="object_zob_Tex_00FAA0" OutName="tex_00FAA0" Format="rgba16" Width="16" Height="16" Offset="0xFAA0" />
-        <Texture Name="object_zob_Tex_00FCA0" OutName="tex_00FCA0" Format="rgba16" Width="16" Height="16" Offset="0xFCA0" />
-        <Texture Name="object_zob_Tex_00FEA0" OutName="tex_00FEA0" Format="rgba16" Width="32" Height="32" Offset="0xFEA0" />
-        <Limb Name="object_zob_Standardlimb_0106A0" Type="Standard" EnumName="OBJECT_ZOB_LIMB_01" Offset="0x106A0" />
-        <Limb Name="object_zob_Standardlimb_0106AC" Type="Standard" EnumName="OBJECT_ZOB_LIMB_02" Offset="0x106AC" />
-        <Limb Name="object_zob_Standardlimb_0106B8" Type="Standard" EnumName="OBJECT_ZOB_LIMB_03" Offset="0x106B8" />
-        <Limb Name="object_zob_Standardlimb_0106C4" Type="Standard" EnumName="OBJECT_ZOB_LIMB_04" Offset="0x106C4" />
-        <Limb Name="object_zob_Standardlimb_0106D0" Type="Standard" EnumName="OBJECT_ZOB_LIMB_05" Offset="0x106D0" />
-        <Limb Name="object_zob_Standardlimb_0106DC" Type="Standard" EnumName="OBJECT_ZOB_LIMB_06" Offset="0x106DC" />
-        <Limb Name="object_zob_Standardlimb_0106E8" Type="Standard" EnumName="OBJECT_ZOB_LIMB_07" Offset="0x106E8" />
-        <Limb Name="object_zob_Standardlimb_0106F4" Type="Standard" EnumName="OBJECT_ZOB_LIMB_08" Offset="0x106F4" />
-        <Limb Name="object_zob_Standardlimb_010700" Type="Standard" EnumName="OBJECT_ZOB_LIMB_09" Offset="0x10700" />
-        <Limb Name="object_zob_Standardlimb_01070C" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0A" Offset="0x1070C" />
-        <Limb Name="object_zob_Standardlimb_010718" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0B" Offset="0x10718" />
-        <Limb Name="object_zob_Standardlimb_010724" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0C" Offset="0x10724" />
-        <Limb Name="object_zob_Standardlimb_010730" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0D" Offset="0x10730" />
-        <Limb Name="object_zob_Standardlimb_01073C" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0E" Offset="0x1073C" />
-        <Limb Name="object_zob_Standardlimb_010748" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0F" Offset="0x10748" />
-        <Limb Name="object_zob_Standardlimb_010754" Type="Standard" EnumName="OBJECT_ZOB_LIMB_10" Offset="0x10754" />
-        <Limb Name="object_zob_Standardlimb_010760" Type="Standard" EnumName="OBJECT_ZOB_LIMB_11" Offset="0x10760" />
-        <Limb Name="object_zob_Standardlimb_01076C" Type="Standard" EnumName="OBJECT_ZOB_LIMB_12" Offset="0x1076C" />
-        <Limb Name="object_zob_Standardlimb_010778" Type="Standard" EnumName="OBJECT_ZOB_LIMB_13" Offset="0x10778" />
-        <Limb Name="object_zob_Standardlimb_010784" Type="Standard" EnumName="OBJECT_ZOB_LIMB_14" Offset="0x10784" />
-        <Limb Name="object_zob_Standardlimb_010790" Type="Standard" EnumName="OBJECT_ZOB_LIMB_15" Offset="0x10790" />
-        <Limb Name="object_zob_Standardlimb_01079C" Type="Standard" EnumName="OBJECT_ZOB_LIMB_16" Offset="0x1079C" />
-        <Limb Name="object_zob_Standardlimb_0107A8" Type="Standard" EnumName="OBJECT_ZOB_LIMB_17" Offset="0x107A8" />
-        <Skeleton Name="object_zob_Skel_010810" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOB_LIMB_NONE" LimbMax="OBJECT_ZOB_LIMB_MAX" EnumName="ObjectZobLimb" Offset="0x10810" />
-        <Animation Name="object_zob_Anim_011144" Offset="0x11144" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zod.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zod.xml
deleted file mode 100644
index a926e6ef9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zod.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<Root>
-    <!-- Assets for Tijo, the drummer of The Indigo-Go's. -->
-    <File Name="object_zod" Segment="6">
-        <!-- Tijo Animations -->
-        <Animation Name="gTijoPlayingVivaceAnim" Offset="0x2E8" />
-        <Animation Name="gTijoReadyToPlayAnim" Offset="0x894" />
-        <Animation Name="gTijoArmsFoldedAnim" Offset="0xA9C" />
-        <Animation Name="gTijoPlayingLentoAnim" Offset="0xD94" />
-
-        <!-- Tijo DisplayLists -->
-        <DList Name="gTijoLowerBodyChairDL" Offset="0x39A0" />
-        <DList Name="gTijoUpperBodyDL" Offset="0x3DA0" />
-        <DList Name="gTijoRightArmDL" Offset="0x4018" />
-        <DList Name="gTijoRightForearmDL" Offset="0x4130" />
-        <DList Name="gTijoRightHandDL" Offset="0x4258" />
-        <DList Name="gTijoLeftArmDL" Offset="0x43E8" />
-        <DList Name="gTijoLeftForearmDL" Offset="0x4500" />
-        <DList Name="gTijoLeftHandDL" Offset="0x4628" />
-        <DList Name="gTijoHeadDL" Offset="0x47B8" />
-
-        <!-- Tijo Textures /> -->
-        <Texture Name="gTijoSkinTex" OutName="tijo_skin" Format="rgba16" Width="8" Height="8" Offset="0x4B50" />
-        <Texture Name="gTijoChairTex" OutName="tijo_chair" Format="rgba16" Width="32" Height="32" Offset="0x4BD0" />
-        <Texture Name="gTijoHandTex" OutName="tijo_hand" Format="rgba16" Width="16" Height="16" Offset="0x53D0" />
-        <Texture Name="gTijoNoseTex" OutName="tijo_nose" Format="rgba16" Width="8" Height="8" Offset="0x55D0" />
-        <Texture Name="gTijoSkinSpotsTex" OutName="tijo_skin_spots" Format="rgba16" Width="32" Height="32" Offset="0x5650" />
-        <Texture Name="gTijoEyesOpenTex" OutName="tijo_eyes_open" Format="rgba16" Width="32" Height="32" Offset="0x5E50" />
-        <Texture Name="gTijoEyesHalfOpenTex" OutName="tijo_eyes_half_open" Format="rgba16" Width="32" Height="32" Offset="0x6650" />
-        <Texture Name="gTijoEyesClosedTex" OutName="tijo_eyes_closed" Format="rgba16" Width="32" Height="32" Offset="0x6E50" />
-        <Texture Name="gTijoMouthClosedTex" OutName="tijo_mouth_closed" Format="rgba16" Width="32" Height="32" Offset="0x7650" />
-        <Texture Name="gTijoMouthOpenTex" OutName="tijo_mouth_open" Format="rgba16" Width="32" Height="32" Offset="0x7E50" />
-
-        <!-- <Blob Name="object_zod_Blob_008650" Size="0x1E10" Offset="0x8650" /> -->
-
-        <!-- Tijo Drums DisplayLists /> -->
-        <DList Name="gTijoDrumFrameDL" Offset="0xA460" />
-        <DList Name="gTijoRideCymbalDL" Offset="0xA550" />
-        <DList Name="gTijoCrashCymbalDL" Offset="0xA5E0" />
-        <DList Name="gTijoHiHatDL" Offset="0xA670" />
-        <DList Name="gTijoDrum1DL" Offset="0xA700" />
-        <DList Name="gTijoDrum2DL" Offset="0xA8F8" />
-        <DList Name="gTijoDrum3DL" Offset="0xAAF0" />
-        <DList Name="gTijoDrum4DL" Offset="0xACE8" />
-        <DList Name="gTijoDrum5DL" Offset="0xAEE0" />
-        <DList Name="gTijoBassDrumDL" Offset="0xB0D8" />
-
-        <!-- Tijo Drums Textures -->
-        <Texture Name="gTijoDrumFrameTex" OutName="tijo_drum_stands" Format="rgba16" Width="32" Height="32" Offset="0xB348" />
-        <Texture Name="gTijoCymbalHiHatTex" OutName="tijo_cymbal_hihat" Format="rgba16" Width="32" Height="32" Offset="0xBB48" />
-        <Texture Name="gTijoDrumsSkinTex" OutName="tijo_drums_skin" Format="rgba16" Width="8" Height="8" Offset="0xC348" />
-        <Texture Name="gTijoDrumsEyesTex" OutName="tijo_eyes" Format="rgba16" Width="32" Height="32" Offset="0xC3C8" />
-        <Texture Name="gTijoDrumsMouthTex" OutName="tijo_drums_mouth" Format="rgba16" Width="16" Height="16" Offset="0xCBC8" />
-        <Texture Name="gTijoDrumsHairTex" OutName="tijo_drums_hair" Format="rgba16" Width="32" Height="32" Offset="0xCDC8" />
-
-        <!-- Tijo Limbs -->
-        <Limb Name="gTijoLowerBodyChairLimb" Type="Standard" EnumName="TIJO_LIMB_BODY_CHAIR" Offset="0xD5C8" />
-        <Limb Name="gTijoUpperBodyLimb" Type="Standard" EnumName="TIJO_LIMB_UPPER_BODY" Offset="0xD5D4" />
-        <Limb Name="gTijoHeadLimb" Type="Standard" EnumName="TIJO_LIMB_HEAD" Offset="0xD5E0" />
-        <Limb Name="gTijoLeftArmLimb" Type="Standard" EnumName="TIJO_LIMB_LEFT_ARM" Offset="0xD5EC" />
-        <Limb Name="gTijoLeftForearmLimb" Type="Standard" EnumName="TIJO_LIMB_LEFT_FOREARM" Offset="0xD5F8" />
-        <Limb Name="gTijoLeftHandLimb" Type="Standard" EnumName="TIJO_LIMB_LEFT_HAND" Offset="0xD604" />
-        <Limb Name="gTijoRightArmLimb" Type="Standard" EnumName="TIJO_LIMB_RIGHT_ARM" Offset="0xD610" />
-        <Limb Name="gTijoRightForearmLimb" Type="Standard" EnumName="TIJO_LIMB_RIGHT_FOREARM" Offset="0xD61C" />
-        <Limb Name="gTijoRightHandLimb" Type="Standard" EnumName="TIJO_LIMB_RIGHT_HAND" Offset="0xD628" />
-
-        <!-- Tijo Skeleton -->
-        <Skeleton Name="gTijoSkel" Type="Flex" LimbType="Standard" LimbNone="TIJO_LIMB_NONE" LimbMax="TIJO_LIMB_MAX" EnumName="TijoLimb" Offset="0xD658" />
-
-        <!-- Tijo Andantino Animation -->
-        <Animation Name="gTijoPlayingAndantinoAnim" Offset="0xD9B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zog.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zog.xml
deleted file mode 100644
index c6bc9eed7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zog.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<Root>
-    <File Name="object_zog" Segment="6">
-        <Animation Name="object_zog_Anim_001000" Offset="0x1000" />
-        <Animation Name="object_zog_Anim_001970" Offset="0x1970" />
-        <Animation Name="object_zog_Anim_002344" Offset="0x2344" />
-        <Animation Name="object_zog_Anim_002894" Offset="0x2894" />
-        <Animation Name="object_zog_Anim_0030E0" Offset="0x30E0" />
-        <Animation Name="object_zog_Anim_0037F8" Offset="0x37F8" />
-        <Animation Name="object_zog_Anim_0041D0" Offset="0x41D0" />
-        <Animation Name="object_zog_Anim_004BDC" Offset="0x4BDC" />
-        <Animation Name="object_zog_Anim_0055B4" Offset="0x55B4" />
-        <DList Name="gMikauGraveDirtDL" Offset="0x69F0" />
-        <DList Name="gMikauGraveDL" Offset="0x6AA0" />
-        <Texture Name="gMikauGraveDirtTex" OutName="mikau_grave_dirt" Format="rgba16" Width="16" Height="32" Offset="0x6FD0" />
-        <Texture Name="gMikauGraveJawTex" OutName="mikau_grave_jaw" Format="rgba16" Width="16" Height="16" Offset="0x73D0" />
-        <Texture Name="gMikauGraveEyeTex" OutName="mikau_grave_eye" Format="rgba16" Width="16" Height="16" Offset="0x75D0" />
-        <Texture Name="gMikauGraveTeethTex" OutName="mikau_grave_teeth" Format="rgba16" Width="16" Height="16" Offset="0x77D0" />
-        <Texture Name="gMikauGraveSpinousTex" OutName="mikau_grave_spinous" Format="rgba16" Width="16" Height="32" Offset="0x79D0" />
-        <Texture Name="gMikauGraveBoneTex" OutName="mikau_grave_bone" Format="rgba16" Width="16" Height="32" Offset="0x7DD0" />
-        <Texture Name="gMikauGraveWoodenStickTex" OutName="mikau_grave_wooden_stick" Format="rgba16" Width="32" Height="8" Offset="0x81D0" />
-        <Texture Name="gMikauGraveCordTex" OutName="mikau_grave_cord" Format="rgba16" Width="16" Height="8" Offset="0x83D0" />
-        <Collision Name="gMikauGraveCol" Offset="0x8670" />
-        <Animation Name="object_zog_Anim_008EB8" Offset="0x8EB8" />
-        <Animation Name="object_zog_Anim_00931C" Offset="0x931C" />
-        <Animation Name="object_zog_Anim_0099A4" Offset="0x99A4" />
-        <Animation Name="object_zog_Anim_009EC4" Offset="0x9EC4" />
-        <Animation Name="object_zog_Anim_00B01C" Offset="0xB01C" />
-        <Animation Name="object_zog_Anim_00BF38" Offset="0xBF38" />
-        <Animation Name="object_zog_Anim_00CA94" Offset="0xCA94" />
-        <Animation Name="object_zog_Anim_00ECBC" Offset="0xECBC" />
-        <Animation Name="object_zog_Anim_00F110" Offset="0xF110" />
-        <Animation Name="object_zog_Anim_00FC0C" Offset="0xFC0C" />
-        <Animation Name="object_zog_Anim_0106B0" Offset="0x106B0" />
-        <Animation Name="object_zog_Anim_014B10" Offset="0x14B10" />
-        <Animation Name="object_zog_Anim_01579C" Offset="0x1579C" />
-        <Animation Name="object_zog_Anim_015B80" Offset="0x15B80" />
-        <Animation Name="object_zog_Anim_0166F4" Offset="0x166F4" />
-        <Animation Name="object_zog_Anim_017170" Offset="0x17170" />
-        <Animation Name="object_zog_Anim_018600" Offset="0x18600" />
-        <Animation Name="object_zog_Anim_01A06C" Offset="0x1A06C" />
-        <Animation Name="object_zog_Anim_01A990" Offset="0x1A990" />
-        <Animation Name="object_zog_Anim_01AD58" Offset="0x1AD58" />
-        <Animation Name="object_zog_Anim_01B72C" Offset="0x1B72C" />
-        <Animation Name="object_zog_Anim_01BC88" Offset="0x1BC88" />
-        <DList Name="object_zog_DL_01F830" Offset="0x1F830" />
-        <DList Name="object_zog_DL_01F9A8" Offset="0x1F9A8" />
-        <DList Name="object_zog_DL_01FB40" Offset="0x1FB40" />
-        <DList Name="object_zog_DL_01FFA0" Offset="0x1FFA0" />
-        <DList Name="object_zog_DL_0201C8" Offset="0x201C8" />
-        <DList Name="object_zog_DL_0204D0" Offset="0x204D0" />
-        <DList Name="object_zog_DL_020690" Offset="0x20690" />
-        <DList Name="object_zog_DL_0209B8" Offset="0x209B8" />
-        <DList Name="object_zog_DL_020CC0" Offset="0x20CC0" />
-        <DList Name="object_zog_DL_020E80" Offset="0x20E80" />
-        <DList Name="object_zog_DL_021360" Offset="0x21360" />
-        <DList Name="object_zog_DL_021438" Offset="0x21438" />
-        <DList Name="object_zog_DL_021510" Offset="0x21510" />
-        <DList Name="object_zog_DL_021850" Offset="0x21850" />
-        <DList Name="object_zog_DL_021A88" Offset="0x21A88" />
-        <DList Name="object_zog_DL_021D48" Offset="0x21D48" />
-        <DList Name="object_zog_DL_021FF0" Offset="0x21FF0" />
-        <DList Name="object_zog_DL_022228" Offset="0x22228" />
-        <DList Name="object_zog_DL_0224E8" Offset="0x224E8" />
-        <Texture Name="object_zog_TLUT_022790" OutName="tlut_022790" Format="rgba16" Width="16" Height="16" Offset="0x22790" />
-        <Texture Name="object_zog_TLUT_022990" OutName="tlut_022990" Format="rgba16" Width="16" Height="16" Offset="0x22990" />
-        <Texture Name="object_zog_Tex_022B90" OutName="tex_022B90" Format="ci8" Width="8" Height="8" Offset="0x22B90" />
-        <Texture Name="object_zog_Tex_022BD0" OutName="tex_022BD0" Format="ci8" Width="32" Height="32" Offset="0x22BD0" />
-        <Texture Name="object_zog_Tex_022FD0" OutName="tex_022FD0" Format="ci8" Width="32" Height="32" Offset="0x22FD0" />
-        <Texture Name="object_zog_Tex_0233D0" OutName="tex_0233D0" Format="rgba16" Width="16" Height="16" Offset="0x233D0" />
-        <Texture Name="object_zog_Tex_0235D0" OutName="tex_0235D0" Format="ci8" Width="32" Height="64" Offset="0x235D0" />
-        <Texture Name="object_zog_Tex_023DD0" OutName="tex_023DD0" Format="ci8" Width="8" Height="16" Offset="0x23DD0" />
-        <Texture Name="object_zog_Tex_023E50" OutName="tex_023E50" Format="rgba16" Width="16" Height="16" Offset="0x23E50" />
-        <Texture Name="object_zog_Tex_024050" OutName="tex_024050" Format="ci8" Width="16" Height="16" Offset="0x24050" />
-        <Texture Name="object_zog_Tex_024150" OutName="tex_024150" Format="rgba16" Width="16" Height="16" Offset="0x24150" />
-        <Texture Name="object_zog_Tex_024350" OutName="tex_024350" Format="ci8" Width="16" Height="32" Offset="0x24350" />
-        <Texture Name="object_zog_Tex_024550" OutName="tex_024550" Format="ci8" Width="16" Height="32" Offset="0x24550" />
-        <Texture Name="object_zog_Tex_024750" OutName="tex_024750" Format="rgba16" Width="32" Height="32" Offset="0x24750" />
-        <Texture Name="object_zog_Tex_024F50" OutName="tex_024F50" Format="rgba16" Width="32" Height="32" Offset="0x24F50" />
-        <Texture Name="object_zog_Tex_025750" OutName="tex_025750" Format="rgba16" Width="32" Height="32" Offset="0x25750" />
-        <Texture Name="object_zog_Tex_025F50" OutName="tex_025F50" Format="rgba16" Width="32" Height="32" Offset="0x25F50" />
-        <Texture Name="object_zog_Tex_026750" OutName="tex_026750" Format="rgba16" Width="32" Height="32" Offset="0x26750" />
-
-        <DList Name="object_zog_DL_0280A0" Offset="0x280A0" />
-        <DList Name="object_zog_DL_0280A8" Offset="0x280A8" />
-        <Texture Name="object_zog_Tex_028610" OutName="tex_028610" Format="rgba16" Width="16" Height="16" Offset="0x28610" />
-        <Texture Name="object_zog_Tex_028810" OutName="tex_028810" Format="rgba16" Width="16" Height="32" Offset="0x28810" />
-        <Texture Name="object_zog_Tex_028C10" OutName="tex_028C10" Format="rgba16" Width="16" Height="32" Offset="0x28C10" />
-        <Limb Name="object_zog_Standardlimb_029010" Type="Standard" EnumName="OBJECT_ZOG_LIMB_01" Offset="0x29010" />
-        <Limb Name="object_zog_Standardlimb_02901C" Type="Standard" EnumName="OBJECT_ZOG_LIMB_02" Offset="0x2901C" />
-        <Limb Name="object_zog_Standardlimb_029028" Type="Standard" EnumName="OBJECT_ZOG_LIMB_03" Offset="0x29028" />
-        <Limb Name="object_zog_Standardlimb_029034" Type="Standard" EnumName="OBJECT_ZOG_LIMB_04" Offset="0x29034" />
-        <Limb Name="object_zog_Standardlimb_029040" Type="Standard" EnumName="OBJECT_ZOG_LIMB_05" Offset="0x29040" />
-        <Limb Name="object_zog_Standardlimb_02904C" Type="Standard" EnumName="OBJECT_ZOG_LIMB_06" Offset="0x2904C" />
-        <Limb Name="object_zog_Standardlimb_029058" Type="Standard" EnumName="OBJECT_ZOG_LIMB_07" Offset="0x29058" />
-        <Limb Name="object_zog_Standardlimb_029064" Type="Standard" EnumName="OBJECT_ZOG_LIMB_08" Offset="0x29064" />
-        <Limb Name="object_zog_Standardlimb_029070" Type="Standard" EnumName="OBJECT_ZOG_LIMB_09" Offset="0x29070" />
-        <Limb Name="object_zog_Standardlimb_02907C" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0A" Offset="0x2907C" />
-        <Limb Name="object_zog_Standardlimb_029088" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0B" Offset="0x29088" />
-        <Limb Name="object_zog_Standardlimb_029094" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0C" Offset="0x29094" />
-        <Limb Name="object_zog_Standardlimb_0290A0" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0D" Offset="0x290A0" />
-        <Limb Name="object_zog_Standardlimb_0290AC" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0E" Offset="0x290AC" />
-        <Limb Name="object_zog_Standardlimb_0290B8" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0F" Offset="0x290B8" />
-        <Limb Name="object_zog_Standardlimb_0290C4" Type="Standard" EnumName="OBJECT_ZOG_LIMB_10" Offset="0x290C4" />
-        <Limb Name="object_zog_Standardlimb_0290D0" Type="Standard" EnumName="OBJECT_ZOG_LIMB_11" Offset="0x290D0" />
-        <Limb Name="object_zog_Standardlimb_0290DC" Type="Standard" EnumName="OBJECT_ZOG_LIMB_12" Offset="0x290DC" />
-        <Limb Name="object_zog_Standardlimb_0290E8" Type="Standard" EnumName="OBJECT_ZOG_LIMB_13" Offset="0x290E8" />
-        <Limb Name="object_zog_Standardlimb_0290F4" Type="Standard" EnumName="OBJECT_ZOG_LIMB_14" Offset="0x290F4" />
-        <Limb Name="object_zog_Standardlimb_029100" Type="Standard" EnumName="OBJECT_ZOG_LIMB_15" Offset="0x29100" />
-        <Limb Name="object_zog_Standardlimb_02910C" Type="Standard" EnumName="OBJECT_ZOG_LIMB_16" Offset="0x2910C" />
-        <Skeleton Name="object_zog_Skel_029170" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOG_LIMB_NONE" LimbMax="OBJECT_ZOG_LIMB_MAX" EnumName="ObjectZogLimb" Offset="0x29170" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zoraband.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zoraband.xml
deleted file mode 100644
index 53a3d5a7b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zoraband.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_zoraband" Segment="6">
-        <DList Name="object_zoraband_DL_000180" Offset="0x180" />
-        <DList Name="object_zoraband_DL_0002A8" Offset="0x2A8" />
-        <Texture Name="object_zoraband_Tex_000330" OutName="tex_000330" Format="i8" Width="32" Height="32" Offset="0x330" />
-        <Texture Name="object_zoraband_Tex_000730" OutName="tex_000730" Format="i8" Width="32" Height="32" Offset="0x730" />
-        <Texture Name="object_zoraband_Tex_000B30" OutName="tex_000B30" Format="i8" Width="32" Height="32" Offset="0xB30" />
-        <TextureAnimation Name="object_zoraband_Matanimheader_000F38" Offset="0xF38" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zoraegg.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zoraegg.xml
deleted file mode 100644
index 0fd05641d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zoraegg.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Root>
-    <!-- Object for Zora Baby and Zora Egg -->
-    <File Name="object_zoraegg" Segment="6">
-        <!-- The animations when all the eggs hatch and the Zora babies swim up -->
-        <Animation Name="gZoraBabySwimUpAnim" Offset="0x5D4" />
-        <Animation Name="gZoraBabyHatchAnim" Offset="0x1E08" />
-        
-        <!-- Zora Baby Dlists -->
-        <DList Name="gZoraBabyHeadDL" Offset="0x2550" />
-        <DList Name="gZoraBabyTail1DL" Offset="0x27C8" />
-        <DList Name="gZoraBabyTail2DL" Offset="0x2A60" />
-        <DList Name="gZoraBabyTailFinDL" Offset="0x2B60" />
-        <DList Name="gZoraBabyRightPectoralFinDL" Offset="0x2C70" />
-        <DList Name="gZoraBabyLeftPectoralFinDL" Offset="0x2D30" />
-        
-        <!-- Zora Baby Textures -->
-        <Texture Name="gZoraBabyTLUT" OutName="zora_baby_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2DF0" />
-        <Texture Name="gZoraBabyTailFinTex" OutName="zora_baby_tail_fin" Format="ci8" Width="32" Height="32" Offset="0x2FF0" />
-        <Texture Name="gZoraBabySkinTex" OutName="zora_baby_skin" Format="ci8" Width="8" Height="8" Offset="0x33F0" />
-        <Texture Name="gZoraBabyEyeOpenTex" OutName="zora_baby_eye_open" Format="ci8" Width="32" Height="32" Offset="0x3430" />
-        <Texture Name="gZoraBabySkinPatternTex" OutName="zora_baby_skin_pattern" Format="ci8" Width="32" Height="64" Offset="0x3830" />
-        <Texture Name="gZoraBabyPectoralFinTex" OutName="zora_baby_pectoral_fin" Format="ci8" Width="32" Height="32" Offset="0x4030" />
-        <Texture Name="gZoraBabyEyeHalfTex" OutName="zora_baby_eye_half" Format="ci8" Width="32" Height="32" Offset="0x4430" />
-        <Texture Name="gZoraBabyEyeClosedTex" OutName="zora_baby_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4830" />
-
-        <!-- Zora Baby Limbs -->
-        <Limb Name="gZoraBabyHeadLimb" Type="Standard" EnumName="ZORA_BABY_LIMB_HEAD" Offset="0x4C30" />
-        <Limb Name="gZoraBabyTail1Limb" Type="Standard" EnumName="ZORA_BABY_LIMB_TAIL1" Offset="0x4C3C" />
-        <Limb Name="gZoraBabyTail2Limb" Type="Standard" EnumName="ZORA_BABY_LIMB_TAIL2" Offset="0x4C48" />
-        <Limb Name="gZoraBabyTailFinLimb" Type="Standard" EnumName="ZORA_BABY_LIMB_TAIL_FIN" Offset="0x4C54" />
-        <Limb Name="gZoraBabyRightPectoralFinLimb" Type="Standard" EnumName="ZORA_BABY_LIMB_RIGHT_PECTORAL_FIN" Offset="0x4C60" />
-        <Limb Name="gZoraBabyLeftPectoralFinLimb" Type="Standard" EnumName="ZORA_BABY_LIMB_LEFT_PECTORAL_FIN" Offset="0x4C6C" />
-
-        <!-- Zora baby Skeleton -->
-        <Skeleton Name="gZoraBabySkel" Type="Flex" LimbType="Standard" LimbNone="ZORA_BABY_LIMB_NONE" LimbMax="ZORA_BABY_LIMB_MAX" EnumName="ZoraBabyLimb" Offset="0x4C90" />
-        
-        <!-- Animations -->
-        <Animation Name="gZoraBabyFormNoteAnim" Offset="0x4D20" />
-        <Animation Name="gZoraBabySongLearnedAnim" Offset="0x4E04" />
-        <Animation Name="gZoraBabyNoteAnim" Offset="0x4FE4" />
-        <Animation Name="gZoraBabySwimAnim" Offset="0x5098" />
-        
-        <!-- Zora Egg -->
-        <DList Name="gZoraEggDL" Offset="0x5250" />
-        <Texture Name="gZoraEggTLUT" OutName="zora_egg_tlut" Format="rgba16" Width="16" Height="16" Offset="0x53B0" />
-        <Texture Name="gZoraEggTex" OutName="zora_egg" Format="ci8" Width="32" Height="32" Offset="0x55B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zos.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zos.xml
deleted file mode 100644
index 5b3b12345..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zos.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<Root>
-    <!-- Assets for Evan, the pianist of The Indigo-Go's. -->
-    <File Name="object_zos" Segment="6">
-        <!-- Evan Animations -->
-        <Animation Name="gEvanSlowPlayAnim" Offset="0x1CFC" /> <!-- Original name is "ev_ensou_loop" ("musical performance​") -->
-        <Animation Name="gEvanInspiredAnim" Offset="0x48D4" /> <!-- Original name is "zK_furimuki" ("to turn around") -->
-        <Animation Name="gEvanPlayRightAnim" Offset="0x5E04" /> <!-- Original name is "zK_play01" -->
-        <Animation Name="gEvanPlayLeftAnim" Offset="0x7334" /> <!-- Original name is "zK_play02" -->
-        <Animation Name="gEvanTalkFootTapAnim" Offset="0x7C40" /> <!-- Original name is "zK_talk01" -->
-        <Animation Name="gEvanTalkLookDownAnim" Offset="0x8630" /> <!-- Original name is "zK_talk02" -->
-        <Animation Name="gEvanTalkArmsOutAnim" Offset="0x90CC" /> <!-- Original name is "zK_talk03" -->
-        <Animation Name="gEvanTalkHandsOnHipsAnim" Offset="0x9830" /> <!-- Original name is "zK_talk04" -->
-        <Animation Name="gEvanLeanOnKeyboardAnim" Offset="0xA164" /> <!-- Original name is "zK_wait01" -->
-
-        <!-- Evan Limb DisplayLists -->
-        <DList Name="gEvanPelvisDL" Offset="0xD2B0" />
-        <DList Name="gEvanTorsoDL" Offset="0xD3E0" />
-        <DList Name="gEvanRightUpperArmDL" Offset="0xD658" />
-        <DList Name="gEvanRightForearmDL" Offset="0xD7A8" />
-        <DList Name="gEvanRightHandDL" Offset="0xD900" />
-        <DList Name="gEvanLeftUpperArmDL" Offset="0xDA90" />
-        <DList Name="gEvanLeftForearmDL" Offset="0xDB90" />
-        <DList Name="gEvanLeftHandDL" Offset="0xDCE8" />
-        <DList Name="gEvanHeadDL" Offset="0xDE78" />
-        <DList Name="gEvanUpperHeadFinDL" Offset="0xE328" />
-        <DList Name="gEvanLowerHeadFinDL" Offset="0xE400" />
-        <DList Name="gEvanRightThighDL" Offset="0xE4C8" />
-        <DList Name="gEvanRightShinDL" Offset="0xE700" />
-        <DList Name="gEvanRightFootDL" Offset="0xE8A0" />
-        <DList Name="gEvanLeftThighDL" Offset="0xEA80" />
-        <DList Name="gEvanLeftShinDL" Offset="0xEC98" />
-        <DList Name="gEvanLeftFootDL" Offset="0xEE38" />
-
-        <!-- Evan Textures -->
-        <Texture Name="gEvanFingersTLUT" OutName="evan_fingers_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF018" />
-        <Texture Name="gEvanSpottedSkinTex" OutName="evan_spotted_skin" Format="rgba16" Width="32" Height="32" Offset="0xF218" />
-        <Texture Name="gEvanFingersTex" OutName="evan_fingers" Format="ci8" Width="16" Height="16" Offset="0xFA18" />
-        <Texture Name="gEvanMouthEdgeTex" OutName="evan_mouth_edge" Format="rgba16" Width="8" Height="8" Offset="0xFB18" />
-        <Texture Name="gEvanMouthAndFinsTex" OutName="evan_mouth_and_fins" Format="rgba16" Width="8" Height="8" Offset="0xFB98" />
-        <Texture Name="gEvanSkinTex" OutName="evan_skin" Format="rgba16" Width="8" Height="8" Offset="0xFC18" />
-        <Texture Name="gEvanHeadphoneClamTex" OutName="evan_headphone_clam" Format="rgba16" Width="32" Height="32" Offset="0xFC98" />
-        <Texture Name="gEvanHeadphoneBoneTex" OutName="evan_headphone_bone" Format="rgba16" Width="16" Height="32" Offset="0x10498" />
-        <Texture Name="gEvanArmbandTex" OutName="evan_armband" Format="rgba16" Width="8" Height="8" Offset="0x10898" />
-        <Texture Name="gEvanEyeOpenTex" OutName="evan_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x10918" />
-        <Texture Name="gEvanEyeHalfTex" OutName="evan_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x11118" />
-        <Texture Name="gEvanEyeClosedTex" OutName="evan_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x11918" />
-
-        <!-- Evan's Keyboard DisplayLists -->
-        <DList Name="gEvanKeyboardDL" Offset="0x13088" /> <!-- Original name is "zK_gakki_model" -->
-        <DList Name="gEvanUnknownWhiteTriangleDL" Offset="0x136E0" /> <!-- The purpose of this is unknown. It cannot be seen in-game. -->
-
-        <!-- Evan's Keyboard Textures -->
-        <Texture Name="gEvanKeyboardRibKeysTex" OutName="evan_keyboard_rib_keys" Format="rgba16" Width="32" Height="32" Offset="0x13728" />
-        <Texture Name="gEvanKeyboardSkullTex" OutName="evan_keyboard_skull" Format="rgba16" Width="32" Height="32" Offset="0x13F28" />
-        <Texture Name="gEvanKeyboardBoneTex" OutName="evan_keyboard_bone" Format="rgba16" Width="32" Height="32" Offset="0x14728" />
-        <Texture Name="gEvanKeyboardOtherKeysTex" OutName="evan_keyboard_other_keys" Format="rgba16" Width="16" Height="16" Offset="0x14F28" />
-
-        <!-- Evan Limbs -->
-        <Limb Name="gEvanPelvisLimb" Type="Standard" EnumName="EVAN_LIMB_PELVIS" Offset="0x15128" />
-        <Limb Name="gEvanLeftThighLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_THIGH" Offset="0x15134" />
-        <Limb Name="gEvanLeftShinLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_SHIN" Offset="0x15140" />
-        <Limb Name="gEvanLeftFootLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_FOOT" Offset="0x1514C" />
-        <Limb Name="gEvanRightThighLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_THIGH" Offset="0x15158" />
-        <Limb Name="gEvanRightShinLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_SHIN" Offset="0x15164" />
-        <Limb Name="gEvanRightFootLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_FOOT" Offset="0x15170" />
-        <Limb Name="gEvanTorsoLimb" Type="Standard" EnumName="EVAN_LIMB_TORSO" Offset="0x1517C" />
-        <Limb Name="gEvanHeadLimb" Type="Standard" EnumName="EVAN_LIMB_HEAD" Offset="0x15188" />
-        <Limb Name="gEvanUpperHeadFinLimb" Type="Standard" EnumName="EVAN_LIMB_UPPER_HEAD_FIN" Offset="0x15194" />
-        <Limb Name="gEvanLowerHeadFinLimb" Type="Standard" EnumName="EVAN_LIMB_LOWER_HEAD_FIN" Offset="0x151A0" />
-        <Limb Name="gEvanLeftUpperArmLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_UPPER_ARM" Offset="0x151AC" />
-        <Limb Name="gEvanLeftForearmLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_FOREARM" Offset="0x151B8" />
-        <Limb Name="gEvanLeftHandLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_HAND" Offset="0x151C4" />
-        <Limb Name="gEvanRightUpperArmLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_UPPER_ARM" Offset="0x151D0" />
-        <Limb Name="gEvanRightForearmLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_FOREARM" Offset="0x151DC" />
-        <Limb Name="gEvanRightHandLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_HAND" Offset="0x151E8" />
-
-        <!-- Evan Skeleton -->
-        <Skeleton Name="gEvanSkel" Type="Flex" LimbType="Standard" LimbNone="EVAN_LIMB_NONE" LimbMax="EVAN_LIMB_MAX" EnumName="EvanLimb" Offset="0x15238" />
-
-        <!-- Evan Animations -->
-        <Animation Name="gEvanLeanOnKeyboardAndSighAnim" Offset="0x1621C" /> <!-- Original name is "zK_wait02" -->
-        <Animation Name="gEvanHandsOnHipsAnim" Offset="0x16980" /> <!-- Original name is "zK_wait03" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zov.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zov.xml
deleted file mode 100644
index 31b9bcd7b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/objects/object_zov.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<Root>
-    <!-- Assets for Lulu - Zora Vocalist -->
-    <File Name="object_zov" Segment="6">
-
-        <!-- Lulu Animations -->
-        <Animation Name="gLuluTurnAndWalkAnim" Offset="0x17D4" />
-        <Animation Name="gLuluWalkLoopAnim" Offset="0x23F4" />
-        <Animation Name="gLuluSingStartAnim" Offset="0x2B5C" />
-        <Animation Name="gLuluSingLoopAnim" Offset="0x418C" />
-        <Animation Name="gLuluLookForwardAndLeftAnim" Offset="0x5A6C" />
-        <Animation Name="gLuluLookLeftLoopAnim" Offset="0x66A4" />
-        <Animation Name="gLuluPutHandsDownAnim" Offset="0x8120" />
-        <Animation Name="gLuluLookAroundAnim" Offset="0xA888" />
-        <Animation Name="gLuluLookForwardAndDownAnim" Offset="0xB4CC" />
-        <Animation Name="gLuluAngleHeadAnim" Offset="0xC510" />
-        <Animation Name="gLuluNodAnim" Offset="0xCAA8" />
-        <Animation Name="gLuluLookDownAnim" Offset="0xD3EC" />
-
-        <!-- Lulu Limb DLists -->
-        <DList Name="gLuluTorsoDL" Offset="0x107B0" />
-        <DList Name="gLuluRightUpperArmDL" Offset="0x10BC0" />
-        <DList Name="gLuluRightForearmDL" Offset="0x10E60" />
-        <DList Name="gLuluRightHandDL" Offset="0x10FF0" />
-        <DList Name="gLuluRightArmUpperFinDL" Offset="0x11230" />
-        <DList Name="gLuluRightArmLowerFinDL" Offset="0x11300" />
-        <DList Name="gLuluLeftUpperArmDL" Offset="0x113F0" />
-        <DList Name="gLuluLeftForearmDL" Offset="0x11690" />
-        <DList Name="gLuluLeftHandDL" Offset="0x11820" />
-        <DList Name="gLuluLeftArmUpperFinDL" Offset="0x11A60" />
-        <DList Name="gLuluLeftArmLowerFinDL" Offset="0x11B30" />
-        <DList Name="gLuluHeadDL" Offset="0x11C20" />
-        <DList Name="gLuluPelvisDL" Offset="0x122E0" />
-        <DList Name="gLuluRightThighDL" Offset="0x123C0" />
-        <DList Name="gLuluRightShinDL" Offset="0x12560" />
-        <DList Name="gLuluRightLegFinDL" Offset="0x127D0" />
-        <DList Name="gLuluRightFootDL" Offset="0x12890" />
-        <DList Name="gLuluLeftThighDL" Offset="0x12B20" />
-        <DList Name="gLuluLeftShinDL" Offset="0x12CB8" />
-        <DList Name="gLuluLeftLegFinDL" Offset="0x12F28" />
-        <DList Name="gLuluLeftFootDL" Offset="0x12FE8" />
-
-        <!-- Lulu Textures -->
-        <Texture Name="gLuluTLUT" OutName="lulu_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13278" />
-        <Texture Name="gLuluEarringTex" OutName="lulu_earring" Format="rgba16" Width="8" Height="16" Offset="0x13478" />
-        <Texture Name="gLuluSkinTex" OutName="lulu_skin" Format="ci8" Width="8" Height="8" Offset="0x13578" />
-        <Texture Name="gLuluNostrilTex" OutName="lulu_nostril" Format="ci8" Width="8" Height="8" Offset="0x135B8" />
-        <Texture Name="gLuluMouthClosedTex" OutName="lulu_mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x135F8" />
-        <Texture Name="gLuluHeadSkinTex" OutName="lulu_head_skin" Format="ci8" Width="16" Height="16" Offset="0x139F8" />
-        <Texture Name="gLuluEarCavityTex" OutName="lulu_ear_cavity" Format="ci8" Width="8" Height="8" Offset="0x13AF8" />
-        <Texture Name="gLuluHeadHoleTex" OutName="lulu_head_hole" Format="ci8" Width="16" Height="16" Offset="0x13B38" />
-        <Texture Name="gLuluEyeOpenTex" OutName="lulu_eye_open" Format="ci8" Width="32" Height="32" Offset="0x13C38" />
-        <Texture Name="gLuluEarTex" OutName="lulu_ear" Format="ci8" Width="16" Height="16" Offset="0x14038" />
-        <Texture Name="gLuluEyeClosedTex" OutName="lulu_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x14138" />
-        <Texture Name="gLuluMouthOpenTex" OutName="lulu_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x14538" />
-        <Texture Name="gLuluSpottedSkinTex" OutName="lulu_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x14938" />
-        <Texture Name="gLuluMouthOpenFullTex" OutName="lulu_mouth_open_full" Format="ci8" Width="32" Height="32" Offset="0x14D38" />
-        <Texture Name="gLuluEyeHalfTex" OutName="lulu_eye_half" Format="ci8" Width="32" Height="32" Offset="0x15138" />
-        <Texture Name="gLuluSkinShadowTex" OutName="lulu_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x15538" />
-        <Texture Name="gLuluKneeAndElbowTex" OutName="lulu_knee_and_elbow" Format="ci8" Width="16" Height="16" Offset="0x15578" />
-        <Texture Name="gLuluFingersTex" OutName="lulu_fingers" Format="ci8" Width="16" Height="16" Offset="0x15678" />
-        <Texture Name="gLuluDressPatternTex" OutName="lulu_dress_pattern" Format="rgba16" Width="32" Height="32" Offset="0x15778" />
-        <Texture Name="gLuluDressStringTex" OutName="lulu_dress_string" Format="ci8" Width="16" Height="16" Offset="0x15F78" />
-        <Texture Name="gLuluDressLoopTex" OutName="lulu_dress_loop" Format="ci8" Width="8" Height="16" Offset="0x16078" />
-        
-        <!-- Lulu Limbs and Skeleton -->
-        <Limb Name="gLuluRootLimb" Type="Standard" EnumName="LULU_LIMB_ROOT" Offset="0x160F8" />
-        <Limb Name="gLuluPelvisLimb" Type="Standard" EnumName="LULU_LIMB_PELVIS" Offset="0x16104" />
-        <Limb Name="gLuluLeftThighLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_THIGH" Offset="0x16110" />
-        <Limb Name="gLuluLeftShinLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_SHIN" Offset="0x1611C" />
-        <Limb Name="gLuluLeftFootLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_FOOT" Offset="0x16128" />
-        <Limb Name="gLuluLeftLegFinLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_LEG_FIN" Offset="0x16134" />
-        <Limb Name="gLuluRightThighLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_THIGH" Offset="0x16140" />
-        <Limb Name="gLuluRightShinLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_SHIN" Offset="0x1614C" />
-        <Limb Name="gLuluRightFootLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_FOOT" Offset="0x16158" />
-        <Limb Name="gLuluRightLegFinLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_LEG_FIN" Offset="0x16164" />
-        <Limb Name="gLuluTorsoLimb" Type="Standard" EnumName="LULU_LIMB_TORSO" Offset="0x16170" />
-        <Limb Name="gLuluHeadLimb" Type="Standard" EnumName="LULU_LIMB_HEAD" Offset="0x1617C" />
-        <Limb Name="gLuluLeftUpperArmLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_UPPER_ARM" Offset="0x16188" />
-        <Limb Name="gLuluLeftArmUpperFinLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_ARM_UPPER_FIN" Offset="0x16194" />
-        <Limb Name="gLuluLeftArmLowerFinLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_ARM_LOWER_FIN" Offset="0x161A0" />
-        <Limb Name="gLuluLeftForearmLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_FOREARM" Offset="0x161AC" />
-        <Limb Name="gLuluLeftHandLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_HAND" Offset="0x161B8" />
-        <Limb Name="gLuluRightUpperArmLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_UPPER_ARM" Offset="0x161C4" />
-        <Limb Name="gLuluRightArmUpperFinLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_ARM_UPPER_FIN" Offset="0x161D0" />
-        <Limb Name="gLuluRightArmLowerFinLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_ARM_LOWER_FIN" Offset="0x161DC" />
-        <Limb Name="gLuluRightForearmLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_FOREARM" Offset="0x161E8" />
-        <Limb Name="gLuluRightHandLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_HAND" Offset="0x161F4" />
-        <Skeleton Name="gLuluSkel" Type="Flex" LimbType="Standard" LimbNone="LULU_LIMB_NONE" LimbMax="LULU_LIMB_MAX" EnumName="LuluLimb" Offset="0x16258" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Arrow_Fire.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Arrow_Fire.xml
deleted file mode 100644
index 83f78d624..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Arrow_Fire.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="ovl_Arrow_Fire" BaseAddress="0x80902200" RangeStart="0xAB0" RangeEnd="0x1ED0">
-        <Texture Name="gFireArrowMaskTex" OutName="fire_arrow_mask" Format="i8" Width="32" Height="64" Offset="0x12B0"/>
-        <Texture Name="gFireArrowTex" OutName="fire_arrow" Format="i8" Width="32" Height="64" Offset="0xAB0"/>
-
-        <Array Name="gFireArrowVtx" Count="43" Offset="0x1AB0">
-            <Vtx/>
-        </Array>
-        <DList Name="gFireArrowMaterialDL" Offset="0x1D60"/>
-        <DList Name="gFireArrowModelDL" Offset="0x1E10"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Arrow_Ice.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Arrow_Ice.xml
deleted file mode 100644
index e1d076d82..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Arrow_Ice.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Ice Arrow assets -->
-    <File Name="ovl_Arrow_Ice" BaseAddress="0x809042F0" RangeStart="0x980" RangeEnd="0x1DA0">
-        <Texture Name="gIceArrowTex" OutName="ice_arrow" Format="i8" Width="32" Height="64" Offset="0x980"/>
-        <Texture Name="gIceArrowMaskTex" OutName="ice_arrow_mask" Format="i8" Width="32" Height="64" Offset="0x1180"/>
-        <Array Name="gIceArrowVtx" Count="43" Offset="0x1980">
-            <Vtx/>
-        </Array>
-        <DList Name="gIceArrowMaterialDL" Offset="0x1C30"/>
-        <DList Name="gIceArrowModelDL" Offset="0x1CE0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Arrow_Light.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Arrow_Light.xml
deleted file mode 100644
index 05728c16e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Arrow_Light.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-  <File Name="ovl_Arrow_Light" BaseAddress="0x809061C0" RangeStart="0x960" RangeEnd="0x1D80">
-    
-    <Texture Name="gLightArrowTex" OutName="light_arrow" Format="i8" Width="32" Height="64" Offset="0x960"/>
-    <Texture Name="gLightArrowMaskTex" OutName="light_arrow_mask" Format="i8" Width="32" Height="64" Offset="0x1160"/>
-    <Array Name="gLightArrowVtx" Count="43" Offset="0x1960">
-      <Vtx/>
-    </Array>
-    
-    <DList Name="gLightArrowMaterialDL" Offset="0x1C10"/>
-    <DList Name="gLightArrowModelDL" Offset="0x1CC0"/>
-  </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Boss_05.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Boss_05.xml
deleted file mode 100644
index 64d8b3ae5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Boss_05.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Root>
-    <File Name="ovl_Boss_05" BaseAddress="0x809D03B0" RangeStart="0x3540" RangeEnd="0x364C">
-        <Collision Name="sBioBabaLilypadCol" Offset="0x3620" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Dm_Char01.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Dm_Char01.xml
deleted file mode 100644
index 0e1210150..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Dm_Char01.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Vertices for the dynamic water that moves when Woodfall Temple is raised. -->
-    <File Name="ovl_Dm_Char01" BaseAddress="0x80A897A0" RangeStart="0x1BE0" RangeEnd="0x28B0">
-        <Array Name="gWoodfallSceneryDynamicPoisonWaterVtx" Count="205" Offset="0x1BE0">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Dm_Char08.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Dm_Char08.xml
deleted file mode 100644
index e7b93f356..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Dm_Char08.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <File Name="ovl_Dm_Char08" BaseAddress="0x80A90610" RangeStart="0x2320" RangeEnd="0x266C">
-        <Array Name="sTurtleGreatBayTempleColPolygons" Count="19" Offset="0x2350">
-            <CollisionPoly/>
-        </Array>
-        <Array Name="sTurtleGreatBayTempleColPolygons2" Count="19" Offset="0x2480">
-            <CollisionPoly/>
-        </Array>
-        <Array Name="sTurtleGreatBayTempleColVertices" Count="12" Offset="0x25B0">
-            <Vector Type="s16" Dimensions="3" />
-        </Array>
-        <Array Name="sTurtleGreatBayTempleColVertices2" Count="12" Offset="0x25F8">
-            <Vector Type="s16" Dimensions="3" />
-        </Array>
-        <Collision Name="sTurtleGreatBayTempleCol" Offset="0x2640"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Effect_Ss_Fhg_Flash.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Effect_Ss_Fhg_Flash.xml
deleted file mode 100644
index 77cb57933..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Effect_Ss_Fhg_Flash.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_Effect_Ss_Fhg_Flash" BaseAddress="0x8095E870" RangeStart="0x550" RangeEnd="0xA08">
-        <DList Name="gEffFhgFlashDL" Offset="0x590"/>
-        <Texture Name="gEffFhgFlashTex" OutName="eff_fhg_flash" Format="i8" Width="32" Height="32" Offset="0x608" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bigslime.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bigslime.xml
deleted file mode 100644
index cd6460563..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bigslime.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="ovl_En_Bigslime" BaseAddress="0x808E1A60" RangeStart="0x8680" RangeEnd="0xAF00">
-        <Array Name="sBigslimeStaticVtx" Count="162" Offset="0x8680">
-            <Vtx/>
-        </Array>
-        <Array Name="sBigslimeDynamicState0Vtx" Count="162" Offset="0x90A0">
-            <Vtx/>
-        </Array>
-        <Array Name="sBigslimeDynamicState1Vtx" Count="162" Offset="0x9AC0">
-            <Vtx/>
-        </Array>
-        <Array Name="sBigslimeTargetVtx" Count="162" Offset="0xA4E0">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bom.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bom.xml
deleted file mode 100644
index dc6d3b9e8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <!-- Assets for the Powder Keg -->
-    <File Name="ovl_En_Bom" BaseAddress="0x8086D8A0" RangeStart="0x2160" RangeEnd="0x3610">
-        <!-- Texture and DisplayLists for the Powder Keg's fuse -->
-        <Array Name="gPowderKegFuseVtx" Count="8" Offset="0x2160">
-            <Vtx/>
-        </Array>
-        <Texture Name="gPowderKegFuseTex" OutName="powder_keg_fuse" Format="i8" Width="2" Height="2" Offset="0x21E0"/>
-        <DList Name="gPowderKegFuseMaterialDL" Offset="0x21E8"/>
-        <DList Name="gPowderKegFuseModel1DL" Offset="0x2270"/>
-        <DList Name="gPowderKegFuseModel2DL" Offset="0x2290"/>
-
-        <!-- Textures and DisplayList for the Powder Keg -->
-        <Texture Name="gPowderKegBarrelTLUT" OutName="powder_keg_barrel_tlut" Format="rgba16" Width="16" Height="16" Offset="0x22B0"/>
-        <Texture Name="gPowderKegBarrelTex" OutName="powder_keg_barrel" Format="ci8" Width="32" Height="32" Offset="0x24B0"/>
-        <DList Name="gPowderKegBarrelDL" Offset="0x2EF0"/>
-
-        <!-- Textures and DisplayList for the Goron Skull on the side of the Powder Keg -->
-        <Texture Name="gPowderKegGoronSkullTLUT" OutName="powder_keg_goron_skull_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3048"/>
-        <Texture Name="gPowderKegGoronSkullTex" OutName="powder_keg_goron_skull" Format="ci8" Width="16" Height="32" Offset="0x3248"/>
-        <DList Name="gPowderKegGoronSkullDL" Offset="0x3548"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bom_Bowl_Man.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bom_Bowl_Man.xml
deleted file mode 100644
index b0268fe70..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bom_Bowl_Man.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_En_Bom_Bowl_Man" BaseAddress="0x809A6660" RangeStart="0x1A50" RangeEnd="0x1A70">
-        <DList Name="gEnBomBowlMan_D_809C61E0" Offset="0x1A50"/>
-        <DList Name="gEnBomBowlMan_D_809C61F0" Offset="0x1A60"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bombers.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bombers.xml
deleted file mode 100644
index a8bb13ae3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bombers.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_En_Bombers" BaseAddress="0x80BE4B60" RangeStart="0x12C8" RangeEnd="0x12E8">
-        <DList Name="ovl_En_Bombers_DL_12C8" Offset="0x12C8" />
-        <DList Name="ovl_En_Bombers_DL_12D8" Offset="0x12D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bomjima.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bomjima.xml
deleted file mode 100644
index a8727393a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bomjima.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_En_Bomjima" BaseAddress="0x80BDF7A0" RangeStart="0x2998" RangeEnd="0x29B8">
-        <DList Name="gEnBomjima_D_80C00B08" Offset="0x2998"/>
-        <DList Name="gEnBomjima_D_80C00B18" Offset="0x29A8"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bomjimb.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bomjimb.xml
deleted file mode 100644
index 5a24e7c3c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Bomjimb.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_En_Bomjimb" BaseAddress="0x80BE24D0" RangeStart="0x23A0" RangeEnd="0x23C0">
-        <DList Name="gEnBomjimb_D_80C03240" Offset="0x23A0"/>
-        <DList Name="gEnBomjimb_D_80C03250" Offset="0x23B0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Clear_Tag.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Clear_Tag.xml
deleted file mode 100644
index 758fb47a3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Clear_Tag.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<Root>
-    <File Name="ovl_En_Clear_Tag" BaseAddress="0x80929E20" RangeStart="0x2F00" RangeEnd="0x5D00">
-
-        <!-- Debris from explosion -->
-        <DList Name="gClearTagDebrisEffectMaterialDL" Offset="0x3130"/>
-        <Texture Name="gClearTagDebrisEffectTex" OutName="clear_tag_debris_effect" Format="rgba16" Width="16" Height="16" Offset="0x2F00"/>
-        <DList Name="gClearTagDebrisEffectDL" Offset="0x31B0"/>
-        <Array Name="gClearTagDebrisEffectVtx" Count="3" Offset="0x3100">
-            <Vtx/>
-        </Array>
-
-        <!-- Used for inner black smoke cloud from explosion: multi-texture -->
-        <DList Name="gClearTagFireEffectMaterialDL" Offset="0x37F8"/>
-        <Texture Name="gClearTagFireEffectFlickerTex" OutName="clear_tag_fire_effect_flicker" Format="i4" Width="32" Height="64" Offset="0x31C8"/>
-        <Texture Name="gClearTagFireEffectBackgroundTex" OutName="clear_tag_fire_effect_background" Format="i4" Width="32" Height="32" Offset="0x35C8"/>
-        <DList Name="gClearTagFireEffectDL" Offset="0x38A0"/>
-        <Array Name="gClearTagFireEffectVtx" Count="3" Offset="0x37C8">
-            <Vtx/>
-        </Array>
-
-        <!-- Used for spherical outer-most white-yellow cloud from explosions -->
-        <DList Name="gClearTagFlashEffectDL" Offset="0x4900"/>
-        <Texture Name="gClearTagFlashEffectTex" OutName="clear_tag_flash_effect" Format="i8" Width="64" Height="64" Offset="0x38C0"/>
-        <Array Name="gClearTagFlashEffectVtx" Count="4" Offset="0x48C0">
-            <Vtx/>
-        </Array>
-
-        <!-- Used for spherical outer-most cloud from explosions applied to floor poly -->
-        <DList Name="gClearTagFlashEffectGroundDL" Offset="0x4BB0"/>
-        <Texture Name="gClearTagFlashEffectGroundTex" OutName="clear_tag_flash_ground_effect" Format="i4" Width="32" Height="32" Offset="0x4980"/>
-        <Array Name="gClearTagFlashEffectGroundVtx" Count="3" Offset="0x4B80">
-            <Vtx/>
-        </Array>
-
-        <!-- Used for spherical glowing light orbs squished thin into light rays -->
-        <DList Name="gClearTagLightRayEffectMaterialDL" Offset="0x5C78"/>
-        <Texture Name="gClearTagLightRayEffectTex" OutName="clear_tag_light_ray_effect" Format="i8" Width="64" Height="64" Offset="0x4C38"/>
-        <DList Name="gClearTagLightRayEffectDL" Offset="0x5CE8"/>
-        <Array Name="gClearTagLightRayEffectVtx" Count="4" Offset="0x5C38">
-            <Vtx/>
-        </Array>
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Gakufu.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Gakufu.xml
deleted file mode 100644
index 0aea90869..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Gakufu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="ovl_En_Gakufu" BaseAddress="0x80ADDF20" RangeStart="0x8D0" RangeEnd="0x950">
-        <Array Name="gGakufuButtonIndexVtx" Count="4" Offset="0x8D0">
-            <Vtx/>
-        </Array>
-        <DList Name="gGakufuButtonIndexDL" Offset="0x910"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Holl.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Holl.xml
deleted file mode 100644
index 6e4df644f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Holl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_En_Holl" BaseAddress="0x80896450" RangeStart="0x0BF0" RangeEnd="0x0C58">
-        <Array Name="gEnHollCentralPlaneVtx" Count="4" Offset="0x0BF0">
-            <Vtx/>
-        </Array>
-
-        <DList Name="gEnHollCentralPlaneDL" Offset="0x0C30"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Horse_Game_Check.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Horse_Game_Check.xml
deleted file mode 100644
index 0dce61868..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Horse_Game_Check.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Root>
-    <File Name="ovl_En_Horse_Game_Check" BaseAddress="0x808F5530" RangeStart="0x1080" RangeEnd="0x10F4">
-        <Collision Name="ovl_En_Horse_Game_Check_Colheader_0010C8" Offset="0x10C8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Kanban.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Kanban.xml
deleted file mode 100644
index 0d0d3ce9d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Kanban.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_En_Kanban" BaseAddress="0x80936820" RangeStart="0x3440" RangeEnd="0x3500">
-        <Array Name="gEnKanban_D_80957DA0" Count="4" Offset="0x3440">
-            <Vtx/>
-        </Array>
-
-        <DList Name="gEnKanban_D_80957DE0" Offset="0x3480"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Mm2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Mm2.xml
deleted file mode 100644
index 3dca69274..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Mm2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="ovl_En_Mm2" BaseAddress="0x80983F10" RangeStart="0x240" RangeEnd="0xAD0">
-        <Texture Name="sEnMm2EnvelopeTex" OutName="mm2_envelope" Format="i8" Width="32" Height="32" Offset="0x240"/>
-        <Texture Name="sEnMm2LetterTex" OutName="mm2_letter" Format="rgba16" Width="16" Height="16" Offset="0x640"/>
-        <Array Name="sEnMm21Vtx" Count="10" Offset="0x840">
-            <Vtx/>
-        </Array>
-        <Array Name="sEnMm22Vtx" Count="12" Offset="0x8E0">
-            <Vtx/>
-        </Array>
-        <DList Name="sEnMm2DL" Offset="0x9A8"/> <!-- Original name is "mm_myletter_model" -->
-    </File>
-</Root>
-
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Mm3.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Mm3.xml
deleted file mode 100644
index d3e9ca76a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Mm3.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_En_Mm3" BaseAddress="0x80A50740" RangeStart="0x13F8" RangeEnd="0x1400">
-        <DList Name="sEnMm3DL" Offset="0x13F8"/>
-    </File>
-</Root>
-
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Sda.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Sda.xml
deleted file mode 100644
index c5f9db729..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Sda.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_En_Sda" BaseAddress="0x80928790" RangeStart="0x1458" RangeEnd="0x14E8">
-        <Array Name="ovl_En_Sda_Vtx_1458" Count="4" Offset="0x1458">
-            <Vtx/>
-        </Array>
-        <DList Name="ovl_En_Sda_DL_1498" Offset="0x1498"/>
-        <DList Name="ovl_En_Sda_DL_14B8" Offset="0x14B8"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Sth.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Sth.xml
deleted file mode 100644
index 1b140aa44..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Sth.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <File Name="ovl_En_Sth" BaseAddress="0x80B482F0" RangeStart="0x1890" RangeEnd="0x646C">
-        <DList Name="gEnSthHeadDL" Offset="0x34A0"/>
-        <DList Name="gEnSthExtraHairDL" Offset="0x37C0"/>
-
-        <Animation Name="gEnSthSignalAnim" Offset="0x3F50" /> <!-- Original name is "sth_ko_matsu" ("matsu" = "to wait​") -->
-        <Animation Name="gEnSthBendDownAnim" Offset="0x45B4" /> <!-- Original name is "sth_kibunwaru" ("bad mood") -->
-        <Animation Name="gEnSthTalkWithHandUpAnim" Offset="0x4CC0" /> <!-- Original name is "sth_talk2000" -->
-        <Animation Name="gEnSthWaitAnim" Offset="0x533C" /> <!-- Original name is "sth_wait2000" -->
-        <Animation Name="gEnSthLookUpAnim" Offset="0x59B8" /> <!-- Original name is "sth_miageru" ("look up") -->
-        <Animation Name="gEnSthLookAroundAnim" Offset="0x5E40" /> <!-- Original name is "sth_kyorokyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="gEnSthPleadAnim" Offset="0x6354" /> <!-- Original name is "sth_onegai" ("request; favor (to ask); wish") -->
-        <Animation Name="gEnSthPanicAnim" Offset="0x645C" /> <!-- Original name is "sth_tasukete" ("help!​") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Sth2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Sth2.xml
deleted file mode 100644
index f0ad48d43..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Sth2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="ovl_En_Sth2" BaseAddress="0x80BD8B10" RangeStart="0x460" RangeEnd="0x2B30">
-        <Texture Name="gEnSth2SkinBlotchTex" OutName="en_sth2_skin_blotch" Format="rgba16" Width="8" Height="8" Offset="0x460"/>
-        <Texture Name="gEnSth2HairWithSkinTex" OutName="en_sth2_hair_with_skin" Format="rgba16" Width="8" Height="16" Offset="0x4E0"/>
-        <Texture Name="gEnSth2EarTex" OutName="en_sth2_ear" Format="rgba16" Width="8" Height="8" Offset="0x5E0"/>
-        <Texture Name="gEnSth2NoseTex" OutName="en_sth2_nose" Format="rgba16" Width="8" Height="8" Offset="0x660"/>
-        <Texture Name="gEnSth2EyeTex" OutName="en_sth2_eye" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
-        <Texture Name="gEnSth2MouthTex" OutName="en_sth2_mouth" Format="rgba16" Width="32" Height="16" Offset="0xEE0"/>
-        <Texture Name="gEnSth2HairTex" OutName="en_sth2_hair" Format="rgba16" Width="8" Height="16" Offset="0x12E0"/>
-        <DList Name="gEnSth2HeadDL" Offset="0x2070"/>
-        <DList Name="gEnSth2HairDL" Offset="0x2390"/>
-        <Animation Name="gEnSth2WavingHandAnim" Offset="0x2B20"/> <!-- Original name is "sth_ko_matsu" ("matsu" = "to wait​") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Syateki_Okuta.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Syateki_Okuta.xml
deleted file mode 100644
index 2ca4a4d03..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Syateki_Okuta.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Shooting Gallery Octorok assets -->
-    <File Name="ovl_En_Syateki_Okuta" BaseAddress="0x80A17EE0" RangeStart="0x1640" RangeEnd="0x1B98">
-        <!-- DisplayList that turns certain Octoroks blue -->
-        <DList Name="gShootingGalleryOctorokBlueMaterialDL" Offset="0x1640"/>
-
-        <!-- Textures and DisplayLists for the cross and circle indicators that appear when you shoot an Octorok -->
-        <Texture Name="gShootingGalleryOctorokCrossTex" OutName="shooting_gallery_octorok_cross" Format="ia16" Width="16" Height="16" Offset="0x1658"/>
-        <Texture Name="gShootingGalleryOctorokCircleTex" OutName="shooting_gallery_octorok_circle" Format="ia16" Width="16" Height="16" Offset="0x1858"/>
-        <DList Name="gShootingGalleryOctorokCrossDL" Offset="0x1A98"/> <!-- Original name is "okuta_peke_model" ("peke" = "x (mark); cross") -->
-        <DList Name="gShootingGalleryOctorokCircleDL" Offset="0x1B18"/> <!-- Original name is "okuta_maru_model" ("maru" = "circle") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Tanron1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Tanron1.xml
deleted file mode 100644
index c6f4db8e3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Tanron1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="ovl_En_Tanron1" BaseAddress="0x80B96430" RangeStart="0x1028" RangeEnd="0x1918">
-        <Texture Name="ovl_En_Tanron1_DL_001428" OutName="tex_001428" Format="rgba16" Width="16" Height="32" Offset="0x1428"/>
-        <DList Name="ovl_En_Tanron1_DL_001888" Offset="0x1888"/>
-        <DList Name="ovl_En_Tanron1_DL_001900" Offset="0x1900"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Tru.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Tru.xml
deleted file mode 100644
index e3f3d6152..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_En_Tru.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Root>
-    <File Name="ovl_En_Tru" BaseAddress="0x80A66BE0" RangeStart="0x33B0" RangeEnd="0x5C30">
-        <Texture Name="D_80A889D0" OutName="en_tru_33B0" Format="i4" Width="32" Height="64" Offset="0x33B0"/>
-        <Texture Name="D_80A88DD0" OutName="en_tru_37B0" Format="i4" Width="32" Height="32" Offset="0x37B0"/>
-        <Array Name="D_80A88FD0" Count="3" Offset="0x39B0">
-            <Vtx/>
-        </Array>
-        <DList Name="D_80A89000" Offset="0x39E0"/>
-        <DList Name="D_80A890A8" Offset="0x3A88"/>
-
-        <Texture Name="D_80A890C8" OutName="en_tru_3AA8" Format="i8" Width="64" Height="64" Offset="0x3AA8"/>
-        <Array Name="D_80A8A0C8" Count="4" Offset="0x4AA8">
-            <Vtx/>
-        </Array>
-        <DList Name="D_80A8A108" Offset="0x4AE8"/>
-
-        <Texture Name="D_80A8A188" OutName="en_tru_4B68" Format="i8" Width="64" Height="64" Offset="0x4B68"/>
-        <Array Name="D_80A8B188" Count="4" Offset="0x5B68">
-            <Vtx/>
-        </Array>
-        <DList Name="D_80A8B1C8" Offset="0x5BA8"/>
-        <DList Name="D_80A8B238" Offset="0x5C18"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Entotu.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Entotu.xml
deleted file mode 100644
index f4b3f7692..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Entotu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="ovl_Obj_Entotu" BaseAddress="0x80A165D0" RangeStart="0x0D10" RangeEnd="0x0D80">
-        <Array Name="ovl_Obj_Entotu_Vtx_000D10" Count="7" Offset="0xD10">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Grass.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Grass.xml
deleted file mode 100644
index 4d03dad26..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Grass.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="assets/objects/gameplay_field_keep/"/>
-    <File Name="ovl_Obj_Grass" BaseAddress="0x8098AFF0" RangeStart="0x18E0" RangeEnd="0x19F0">
-        <DList Name="gObjGrass_D_809AA9F0" Offset="0x18E0"/>
-        <DList Name="gObjGrass_D_809AAA68" Offset="0x1958"/>
-        <DList Name="gObjGrass_D_809AAAE0" Offset="0x19D0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Jgame_Light.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Jgame_Light.xml
deleted file mode 100644
index 4b768c8d9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Jgame_Light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="ovl_Obj_Jgame_Light" BaseAddress="0x80BF6920" RangeStart="0x8FC" RangeEnd="0xE40">
-        <!-- @bug: Based on the DList, this should be an invalid i16 -->
-        <Texture Name="sObjJgameLightIncorrectTex" OutName="obj_jgamelight_incorrect" Format="ia16" Width="16" Height="16" Offset="0x8FC"/>
-        <!-- @bug: Based on the DList, this should be an invalid i16 -->
-        <Texture Name="sObjJgameLightCorrectTex" OutName="obj_jgamelight_correct" Format="ia16" Width="16" Height="16" Offset="0xAFC"/>
-
-        <DList Name="gObjJgameLightIncorrectDL" Offset="0xD40"/>
-        <DList Name="gObjJgameLightCorrectDL" Offset="0xDC0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Smork.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Smork.xml
deleted file mode 100644
index 2b065fac7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Smork.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="ovl_Obj_Smork" BaseAddress="0x80A1F570" RangeStart="0x400" RangeEnd="0x480">
-        <Array Name="ovl_Obj_Smork_Vtx_000C10" Count="7" Offset="0x400">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Toudai.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Toudai.xml
deleted file mode 100644
index fb6825cf3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Obj_Toudai.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="ovl_Obj_Toudai" BaseAddress="0x80A159D0" RangeStart="0xA90" RangeEnd="0xB70">
-        <Array Name="ovl_Obj_Toudai_Vtx_D_80A34590" Count="14" Offset="0xA90">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Spot.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Spot.xml
deleted file mode 100644
index fd908d743..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Spot.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Spot" BaseAddress="0x80954560" RangeStart="0x720" RangeEnd="0xDF8">
-        <Texture Name="sSunSongEffectTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x720"/>
-        <DList Name="sSunSongEffectCylinderMaterialDL" Offset="0xCD0"/>
-        <DList Name="sSunSongEffectCylinderModelDL" Offset="0xD68"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Storm.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Storm.xml
deleted file mode 100644
index 1f93a9716..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Storm.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-    <File Name="ovl_Oceff_Storm" BaseAddress="0x80963640" RangeStart="0x830" RangeEnd="0x1BC0">
-        <Texture Name="sSongOfStormsEffectTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x830"/>
-        <DList Name="sSongOfStormsMaterialDL" Offset="0x1830"/>
-        <Array Name="sSongOfStormsCylinderVtx" Count="27" Offset="0x18D8">
-            <Vtx/>
-        </Array>
-        <DList Name="sSongOfStormsCylinderMaterialDL" Offset="0x1A88"/>
-        <DList Name="sSongOfStormsCylinderModelDL" Offset="0x1B30"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe.xml
deleted file mode 100644
index 4b950f989..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe" BaseAddress="0x80958390" RangeStart="0x4F0" RangeEnd="0xCB0">
-        <Texture Name="sSongOfTimeEffectTex" OutName="song_of_time_effect" Format="i8" Width="32" Height="32" Offset="0x4F0"/>
-        <Array Name="sSongOfTimeFrustumVtx" Count="40" Offset="0x8F0">
-            <Vtx/>
-        </Array>
-        <DList Name="sSongOfTimeFrustumMaterialDL" Offset="0xB70"/>
-        <DList Name="sSongOfTimeFrustumModelDL" Offset="0xBF8"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe2.xml
deleted file mode 100644
index b6cd632da..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe2" BaseAddress="0x80968150" RangeStart="0x420" RangeEnd="0x1688">
-        <Texture Name="sEponaSongEffect1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x420"/>
-        <Texture Name="sEponaSongEffect2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC20"/>
-        <Array Name="sEponaSongFrustumVtx" Count="22" Offset="0x1420">
-            <Vtx/>
-        </Array>
-        <DList Name="sEponaSongFrustumMaterialDL" Offset="0x1580"/>
-        <DList Name="sEponaSongFrustumModelDL" Offset="0x1628"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe3.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe3.xml
deleted file mode 100644
index 49e6018bc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe3.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe3" BaseAddress="0x809698C0" RangeStart="0x430" RangeEnd="0x1678">
-        <Texture Name="sSariaSongEffectTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/>
-        <Array Name="sSariaSongFrustumVtx" Count="22" Offset="0x1430">
-            <Vtx/>
-        </Array>
-        <DList Name="sSariaSongFrustrumMaterialDL" Offset="0x1590"/>
-        <DList Name="sSariaSongFrustumModelDL" Offset="0x1618"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe4.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe4.xml
deleted file mode 100644
index 58536b8f7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe4.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-    <File Name="ovl_Oceff_Wipe4" BaseAddress="0x8097F660" RangeStart="0x430" RangeEnd="0xF18">
-        <Texture Name="sScarecrowSongEffectTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x430"/>
-        <Array Name="sScarecrowSongFrustumVtx" Count="22" Offset="0xC30">
-            <Vtx/>
-        </Array>
-        <DList Name="sScarecrowSongMaterialDL" Offset="0xD90"/>
-        <DList Name="sScarecrowSongUnusedMaterialDL" Offset="0xDF8"/>
-        <DList Name="sScarecrowSongModelDL" Offset="0xE60"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe5.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe5.xml
deleted file mode 100644
index e2db4b060..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe5" BaseAddress="0x80BA9100" RangeStart="0x440" RangeEnd="0x1630">
-        <TextureAnimation Name="gOceff5TexAnim" Offset="0x448" />
-        <Array Name="gOceff5Vtx" Count="22" Offset="0x1450"> 
-            <Vtx/>
-        </Array>
-        <DList Name="gOceff5DL" Offset="0x15B0"/> 
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe6.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe6.xml
deleted file mode 100644
index a37e085dd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe6.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe6" BaseAddress="0x80BABBD0" RangeStart="0x330" RangeEnd="0x5B8">
-        <TextureAnimation Name="ovl_Oceff_Wipe6_Matanimheader_000338" Offset="0x338" />
-        <Array Name="gOceff6Vtx" Count="22" Offset="0x340">
-            <Vtx/>
-        </Array>
-        <DList Name="gOceff6DL" Offset="0x4A0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe7.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe7.xml
deleted file mode 100644
index bf016974a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_Oceff_Wipe7.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe7" BaseAddress="0x80BAF2E0" RangeStart="0x330" RangeEnd="0xDB8">
-        <Texture Name="sSongofHealingEffectTex" OutName="song_of_healing_effect" Format="i8" Width="32" Height="64" Offset="0x330"/>
-        <TextureAnimation Name="sSongofHealingEffectTexAnim" Offset="0xB38" />
-        <Array Name="sSongofHealingEffectFrustrumVtx" Count="22" Offset="0xB40">
-            <Vtx/>
-        </Array>
-        <DList Name="sSongOfHealingEffectFrustumDL" Offset="0xCA0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_fbdemo_triforce.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_fbdemo_triforce.xml
deleted file mode 100644
index 16c1663f8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_fbdemo_triforce.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="ovl_fbdemo_triforce" BaseAddress="0x80AA6630" RangeStart="0x5C0" RangeEnd="0x690">
-        <DList Name="sTransTriforceDL" Offset="0x5C0"/>
-        <Array Name="sTransTriforceVtx" Count="10" Offset="0x5F0">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_fbdemo_wipe1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_fbdemo_wipe1.xml
deleted file mode 100644
index 6b5e107ef..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_fbdemo_wipe1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_fbdemo_wipe1" BaseAddress="0x80AA6D70" RangeStart="0x470" RangeEnd="0xEF8">
-        <Array Name="sTransWipe1Vtx" Count="25" Offset="0x470">
-            <Vtx/>
-        </Array>
-        <Texture Name="sTransWipe1Tex" OutName="trans_wipe" Format="i4" Width="64" Height="64" Offset="0x600"/>
-        <DList Name="sTransWipe1DL" Offset="0xE00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_fbdemo_wipe3.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_fbdemo_wipe3.xml
deleted file mode 100644
index 6371016b9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_fbdemo_wipe3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="ovl_fbdemo_wipe3" BaseAddress="0x80AA7D00" RangeStart="0x520" RangeEnd="0x1C10">
-        <Texture Name="fbdemo_tex_000520" OutName="tex_000520" Format="i8" Width="16" Height="64" Offset="0x520"/>
-        <Texture Name="fbdemo_tex_000920" OutName="tex_000920" Format="i8" Width="16" Height="64" Offset="0x920"/>
-        <Texture Name="fbdemo_tex_000D20" OutName="tex_000D20" Format="i8" Width="16" Height="64" Offset="0xD20"/>
-        <Texture Name="fbdemo_tex_001120" OutName="tex_001120" Format="i8" Width="16" Height="64" Offset="0x1120"/>
-        <Texture Name="fbdemo_tex_001520" OutName="tex_001520" Format="i8" Width="16" Height="64" Offset="0x1520"/>
-        <Array Name="sTransWipe3Vtx" Count="34" Offset="0x1920">
-            <Vtx/>
-        </Array>
-        <DList Name="sTransWipe3DL" Offset="0x1B40"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_file_choose.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_file_choose.xml
deleted file mode 100644
index c4a785e7e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/overlays/ovl_file_choose.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="ovl_file_choose" BaseAddress="0x80803F80" RangeStart="0xFC70" RangeEnd="0x10070">
-        <Array Name="D_80813DF0" Count="20" Offset="0xFC70" Static="Off">
-            <Vtx/>
-        </Array>
-        <Array Name="D_80813F30" Count="24" Offset="0xFDB0" Static="Off">
-            <Vtx/>
-        </Array>
-        <Array Name="D_80813EB0_ce0" Count="8" Offset="0xFF30" Static="Off">
-            <Vtx/>
-        </Array>
-        <Array Name="gOptionsDividerVtx" Count="12" Offset="0xFFB0" Static="Off">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/KAKUSIANA/KAKUSIANA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/KAKUSIANA/KAKUSIANA.xml
deleted file mode 100644
index cc5a3c999..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/KAKUSIANA/KAKUSIANA.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<Root>
-    <File Name="KAKUSIANA" Segment="2" Game="MM">
-        <Scene Name="KAKUSIANA" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_00" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_01" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_02" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_02" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_03" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_03" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_04" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_04" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_05" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_05" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_06" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_06" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_07" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_07" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_08" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_08" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_09" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_09" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_10" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_10" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_11" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_11" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_12" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_12" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_13" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_13" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_14" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_14" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/SPOT00/SPOT00.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/SPOT00/SPOT00.xml
deleted file mode 100644
index b060c7ba3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/SPOT00/SPOT00.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="SPOT00" Segment="2" Game="MM">
-        <Scene Name="SPOT00" Offset="0x0"/>
-    </File>
-    <File Name="SPOT00_room_00" Segment="3" Game="MM">
-        <Room Name="SPOT00_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
deleted file mode 100644
index 9c1a84c8c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
-    <File Name="Z2_00KEIKOKU" Segment="2" Game="MM">
-        <Scene Name="Z2_00KEIKOKU" Offset="0x0"/>
-        <Cutscene Name="gTerminaFieldClockTowerOpeningCs" Offset="0x9D8"/> <!-- Original name is "clock_t_change" -->
-        <Cutscene Name="gTerminaFieldTelescopeDay1And2Cs" Offset="0x11F8"/> <!-- Original name is "findoutstk" -->
-        <Cutscene Name="gTerminaFieldMoonCrashCs" Offset="0x1A48"/> <!-- Original name is "moon_atack" -->
-        <Cutscene Name="gTerminaFieldTelescopeDay3Cs" Offset="0x2A88"/> <!-- Original name is "findoutstk_3rd" -->
-        <Cutscene Name="gTerminaFieldTelescopeFinalHoursCs" Offset="0x32A8"/> <!-- Original name is "findoutstk_mad" -->
-        <Cutscene Name="gTerminaFieldSkullKidDrawingStartCs" Offset="0x3A68"/> <!-- Original name is "find_rakugaki" ("rakugaki" = "graffiti") -->
-        <Cutscene Name="gTerminaFieldSkullKidDrawingEndCs" Offset="0x4208"/> <!-- Original name is "rakugaki_end" -->
-        <Cutscene Name="gTerminaFieldIntroFromWestClockTownCs" Offset="0x4568"/> <!-- Original name is "sc1st01_001valley0" -->
-        <Cutscene Name="gTerminaFieldIntroFromNorthClockTownCs" Offset="0x4858"/> <!-- Original name is "sc1st01_001valley1" -->
-        <Cutscene Name="gTerminaFieldIntroFromEastClockTownCs" Offset="0x4A68"/> <!-- Original name is "sc1st01_001valley2" -->
-        <Cutscene Name="gTerminaFieldIntroFromSouthClockTownCs" Offset="0x4C78"/> <!-- Original name is "sc1st01_001valley3" -->
-        <Cutscene Name="gTerminaFieldGiantsGatherToStopMoonCs" Offset="0xDE2C"/> <!-- Original name is "k_s_start" ("k" is probably short for "kyojin", meaning "giant") -->
-        <Cutscene Name="gTerminaFieldGiantsStopMoonFailureCs" Offset="0xFA3C"/> <!-- Original name is "k_s_sippai" ("failure") -->
-        <Cutscene Name="gTerminaFieldGiantsStopMoonSuccessCs" Offset="0x1040C"/> <!-- Original name is "k_s_seikou" ("success") -->
-        <Cutscene Name="gTerminaFieldFirstCycleClockTowerOpeningCs" Offset="0x11414"/> <!-- Original name is "clock_t_change"; exact duplicate of gTerminaFieldClockTowerOpeningCs -->
-        <Cutscene Name="gTerminaFieldSkullKidFlashbackRainCs" Offset="0x11E80"/> <!-- Original name is "memory" -->
-        <Cutscene Name="gTerminaFieldSkullKidFlashbackDrawingWithFairiesCs" Offset="0x133B0"/> <!-- Original name is "rakugaki" -->
-        <Cutscene Name="gTerminaFieldSkullKidFlashbackPlayingWithFairiesCs" Offset="0x137E0"/> <!-- Original name is "asobu" ("to play; to enjoy oneself; to have a good time") -->
-        <Cutscene Name="gTerminaFieldCremiaHugCs" Offset="0x1421C"/> <!-- Original name is "climia_dakisime" ("dakisime" = "to hug someone close") -->
-        <Cutscene Name="gTerminaFieldGiantsDepartCs" Offset="0x1507C"/> <!-- Original name is "aftermoonclash" -->
-        <Cutscene Name="gTerminaFieldHappyMaskSalesmanAndLinkDepartCs" Offset="0x174EC"/> <!-- Original name is "bye_omenya" ("omenya" = "mask salesman") -->
-        <Cutscene Name="gTerminaFieldMoonsDestructionCs" Offset="0x1A1FC"/> <!-- Original name is "moonclash" -->
-        <Cutscene Name="gTerminaFieldCreditsWeddingCs" Offset="0x1B114"/> <!-- Original name is "sc_meoto" ("meoto" = "married couple; husband and wife; man and wife​") -->
-        <Cutscene Name="gTerminaFieldCreditsPostmanCs" Offset="0x1BC94"/> <!-- Original name is "sc_posthut" -->
-    </File>
-    <File Name="Z2_00KEIKOKU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_00KEIKOKU_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
deleted file mode 100644
index 9676cbc39..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_10YUKIYAMANOMURA" Segment="2" Game="MM">
-        <Scene Name="Z2_10YUKIYAMANOMURA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_10YUKIYAMANOMURA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_10YUKIYAMANOMURA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
deleted file mode 100644
index 943e58e58..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_10YUKIYAMANOMURA2" Segment="2" Game="MM">
-        <Scene Name="Z2_10YUKIYAMANOMURA2" Offset="0x0"/>
-    </File>
-    <File Name="Z2_10YUKIYAMANOMURA2_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_10YUKIYAMANOMURA2_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_10YUKIYAMANOMURA2_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_10YUKIYAMANOMURA2_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
deleted file mode 100644
index 986823c90..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_11GORONNOSATO" Segment="2" Game="MM">
-        <Scene Name="Z2_11GORONNOSATO" Offset="0x0"/>
-    </File>
-    <File Name="Z2_11GORONNOSATO_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_11GORONNOSATO_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_11GORONNOSATO_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_11GORONNOSATO_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
deleted file mode 100644
index 9e6925131..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_11GORONNOSATO2" Segment="2" Game="MM">
-        <Scene Name="Z2_11GORONNOSATO2" Offset="0x0"/>
-    </File>
-    <File Name="Z2_11GORONNOSATO2_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_11GORONNOSATO2_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_11GORONNOSATO2_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_11GORONNOSATO2_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
deleted file mode 100644
index 740f6a15a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_12HAKUGINMAE" Segment="2" Game="MM">
-        <Scene Name="Z2_12HAKUGINMAE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_12HAKUGINMAE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_12HAKUGINMAE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml
deleted file mode 100644
index 5a6ad2c19..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_13HUBUKINOMITI" Segment="2" Game="MM">
-        <Scene Name="Z2_13HUBUKINOMITI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_13HUBUKINOMITI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_13HUBUKINOMITI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
deleted file mode 100644
index 6c368004f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_14YUKIDAMANOMITI" Segment="2" Game="MM">
-        <Scene Name="Z2_14YUKIDAMANOMITI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_14YUKIDAMANOMITI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_14YUKIDAMANOMITI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml
deleted file mode 100644
index e3637907c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_16GORON_HOUSE" Segment="2" Game="MM">
-        <Scene Name="Z2_16GORON_HOUSE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_16GORON_HOUSE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_16GORON_HOUSE_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_16GORON_HOUSE_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_16GORON_HOUSE_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
deleted file mode 100644
index ed6beb36e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_17SETUGEN" Segment="2" Game="MM">
-        <Scene Name="Z2_17SETUGEN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_17SETUGEN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_17SETUGEN_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
deleted file mode 100644
index 1ac9488d7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_17SETUGEN2" Segment="2" Game="MM">
-        <Scene Name="Z2_17SETUGEN2" Offset="0x0"/>
-    </File>
-    <File Name="Z2_17SETUGEN2_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_17SETUGEN2_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
deleted file mode 100644
index d144c9e8e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
-    <File Name="Z2_20SICHITAI" Segment="2" Game="MM">
-        <Scene Name="Z2_20SICHITAI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI_room_02" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
deleted file mode 100644
index 144914621..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
-    <File Name="Z2_20SICHITAI2" Segment="2" Game="MM">
-        <Scene Name="Z2_20SICHITAI2" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI2_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI2_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI2_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI2_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI2_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI2_room_02" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml
deleted file mode 100644
index 03b04f989..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_21MITURINMAE" Segment="2" Game="MM">
-        <Scene Name="Z2_21MITURINMAE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_21MITURINMAE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_21MITURINMAE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
deleted file mode 100644
index 77f382ecc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
-    <File Name="Z2_22DEKUCITY" Segment="2" Game="MM">
-        <Scene Name="Z2_22DEKUCITY" Offset="0x0"/>
-    </File>
-    <File Name="Z2_22DEKUCITY_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_22DEKUCITY_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_22DEKUCITY_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_22DEKUCITY_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_22DEKUCITY_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_22DEKUCITY_room_02" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
deleted file mode 100644
index f6c852dc9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
-    <File Name="Z2_24KEMONOMITI" Segment="2" Game="MM">
-        <Scene Name="Z2_24KEMONOMITI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_24KEMONOMITI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_24KEMONOMITI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
deleted file mode 100644
index 83e362742..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
-    <File Name="Z2_26SARUNOMORI" Segment="2" Game="MM">
-        <Scene Name="Z2_26SARUNOMORI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_08" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_30GYOSON/Z2_30GYOSON.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
deleted file mode 100644
index f24a37254..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
-    <File Name="Z2_30GYOSON" Segment="2" Game="MM">
-        <Scene Name="Z2_30GYOSON" Offset="0x0"/>
-    </File>
-    <File Name="Z2_30GYOSON_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_30GYOSON_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_31MISAKI/Z2_31MISAKI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
deleted file mode 100644
index afd35a817..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
-    <File Name="Z2_31MISAKI" Segment="2" Game="MM">
-        <Scene Name="Z2_31MISAKI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_31MISAKI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_31MISAKI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_33ZORACITY/Z2_33ZORACITY.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_33ZORACITY/Z2_33ZORACITY.xml
deleted file mode 100644
index 693a30a58..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_33ZORACITY/Z2_33ZORACITY.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_33ZORACITY" Segment="2" Game="MM">
-        <Scene Name="Z2_33ZORACITY" Offset="0x0"/>
-    </File>
-    <File Name="Z2_33ZORACITY_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_33ZORACITY_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_35TAKI/Z2_35TAKI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_35TAKI/Z2_35TAKI.xml
deleted file mode 100644
index b123f1b9c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_35TAKI/Z2_35TAKI.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_35TAKI" Segment="2" Game="MM">
-        <Scene Name="Z2_35TAKI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_35TAKI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_35TAKI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_8ITEMSHOP/Z2_8ITEMSHOP.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_8ITEMSHOP/Z2_8ITEMSHOP.xml
deleted file mode 100644
index b3775346a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_8ITEMSHOP/Z2_8ITEMSHOP.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_8ITEMSHOP" Segment="2" Game="MM">
-        <Scene Name="Z2_8ITEMSHOP" Offset="0x0"/>
-    </File>
-    <File Name="Z2_8ITEMSHOP_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_8ITEMSHOP_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_ALLEY/Z2_ALLEY.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_ALLEY/Z2_ALLEY.xml
deleted file mode 100644
index d410d2098..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_ALLEY/Z2_ALLEY.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_ALLEY" Segment="2" Game="MM">
-        <Scene Name="Z2_ALLEY" Offset="0x0"/>
-    </File>
-    <File Name="Z2_ALLEY_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_ALLEY_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
deleted file mode 100644
index 3b03e8e5e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="misc/scene_texture_02/"/>
-    <File Name="Z2_AYASHIISHOP" Segment="2" Game="MM">
-        <Scene Name="Z2_AYASHIISHOP" Offset="0x0"/>
-    </File>
-    <File Name="Z2_AYASHIISHOP_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_AYASHIISHOP_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_AYASHIISHOP_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_AYASHIISHOP_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BACKTOWN/Z2_BACKTOWN.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BACKTOWN/Z2_BACKTOWN.xml
deleted file mode 100644
index 6289ccf82..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BACKTOWN/Z2_BACKTOWN.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_BACKTOWN" Segment="2" Game="MM">
-        <Scene Name="Z2_BACKTOWN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BACKTOWN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_BACKTOWN_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BANDROOM/Z2_BANDROOM.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BANDROOM/Z2_BANDROOM.xml
deleted file mode 100644
index 2277236aa..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BANDROOM/Z2_BANDROOM.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<Root>
-    <File Name="Z2_BANDROOM" Segment="2" Game="MM">
-        <Scene Name="Z2_BANDROOM" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BANDROOM_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_BANDROOM_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BANDROOM_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_BANDROOM_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BANDROOM_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_BANDROOM_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BANDROOM_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_BANDROOM_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BANDROOM_room_04" Segment="3" Game="MM">
-        <Texture Name="Z2_BANDROOM_room_04Tex_005A38" Format="rgba16" Width="64" Height="64" Offset="0x5A38"/>
-
-        <Room Name="Z2_BANDROOM_room_04" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BOMYA/Z2_BOMYA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BOMYA/Z2_BOMYA.xml
deleted file mode 100644
index 4fd948a88..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BOMYA/Z2_BOMYA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_BOMYA" Segment="2" Game="MM">
-        <Scene Name="Z2_BOMYA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BOMYA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_BOMYA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BOTI/Z2_BOTI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BOTI/Z2_BOTI.xml
deleted file mode 100644
index 830df7f79..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BOTI/Z2_BOTI.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_BOTI" Segment="2" Game="MM">
-        <Scene Name="Z2_BOTI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BOTI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_BOTI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BOTI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_BOTI_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BOWLING/Z2_BOWLING.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BOWLING/Z2_BOWLING.xml
deleted file mode 100644
index 794d73271..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_BOWLING/Z2_BOWLING.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_BOWLING" Segment="2" Game="MM">
-        <Scene Name="Z2_BOWLING" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BOWLING_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_BOWLING_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_CASTLE/Z2_CASTLE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_CASTLE/Z2_CASTLE.xml
deleted file mode 100644
index 3af97020c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_CASTLE/Z2_CASTLE.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-    <File Name="Z2_CASTLE" Segment="2" Game="MM">
-        <Scene Name="Z2_CASTLE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_00" Segment="3" Game="MM">
-        <Texture Name="Z2_CASTLE_room_00Tex_00FFB8" Format="rgba16" Width="64" Height="64" Offset="0xFFB8"/>
-        <Texture Name="Z2_CASTLE_room_00Tex_0127B8" Format="rgba16" Width="32" Height="128" Offset="0x127B8"/>
-
-        <Room Name="Z2_CASTLE_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_04" Segment="3" Game="MM">
-        <Texture Name="Z2_CASTLE_room_04Tex_004AC0" Format="rgba16" Width="64" Height="64" Offset="0x4AC0"/>
-
-        <Room Name="Z2_CASTLE_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_09" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_CLOCKTOWER/Z2_CLOCKTOWER.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_CLOCKTOWER/Z2_CLOCKTOWER.xml
deleted file mode 100644
index b6a593a0c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_CLOCKTOWER/Z2_CLOCKTOWER.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_CLOCKTOWER" Segment="2" Game="MM">
-        <Scene Name="Z2_CLOCKTOWER" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CLOCKTOWER_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_CLOCKTOWER_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DANPEI/Z2_DANPEI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DANPEI/Z2_DANPEI.xml
deleted file mode 100644
index 444e3782f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DANPEI/Z2_DANPEI.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Root>
-    <File Name="Z2_DANPEI" Segment="2" Game="MM">
-        <Scene Name="Z2_DANPEI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_08" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DANPEI2TEST/Z2_DANPEI2TEST.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DANPEI2TEST/Z2_DANPEI2TEST.xml
deleted file mode 100644
index 3906b57f3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DANPEI2TEST/Z2_DANPEI2TEST.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_DANPEI2TEST" Segment="2" Game="MM">
-        <Scene Name="Z2_DANPEI2TEST" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI2TEST_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI2TEST_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI2TEST_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI2TEST_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DEKUTES/Z2_DEKUTES.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DEKUTES/Z2_DEKUTES.xml
deleted file mode 100644
index 070d35cdb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DEKUTES/Z2_DEKUTES.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_DEKUTES" Segment="2" Game="MM">
-        <Scene Name="Z2_DEKUTES" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DEKUTES_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_DEKUTES_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DEKU_KING/Z2_DEKU_KING.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DEKU_KING/Z2_DEKU_KING.xml
deleted file mode 100644
index b283b92c0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DEKU_KING/Z2_DEKU_KING.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_DEKU_KING" Segment="2" Game="MM">
-        <Scene Name="Z2_DEKU_KING" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DEKU_KING_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_DEKU_KING_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DOUJOU/Z2_DOUJOU.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
deleted file mode 100644
index a6b7a1a6a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
-    <File Name="Z2_DOUJOU" Segment="2" Game="MM">
-        <Scene Name="Z2_DOUJOU" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DOUJOU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_DOUJOU_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F01/Z2_F01.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F01/Z2_F01.xml
deleted file mode 100644
index cde89cdda..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F01/Z2_F01.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_F01" Segment="2" Game="MM">
-        <Scene Name="Z2_F01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_F01_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_F01_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F01C/Z2_F01C.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F01C/Z2_F01C.xml
deleted file mode 100644
index ac179c6d2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F01C/Z2_F01C.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_F01C" Segment="2" Game="MM">
-        <Scene Name="Z2_F01C" Offset="0x0"/>
-    </File>
-    <File Name="Z2_F01C_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_F01C_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F01_B/Z2_F01_B.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F01_B/Z2_F01_B.xml
deleted file mode 100644
index 96c605641..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F01_B/Z2_F01_B.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_F01_B" Segment="2" Game="MM">
-        <Scene Name="Z2_F01_B" Offset="0x0"/>
-    </File>
-    <File Name="Z2_F01_B_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_F01_B_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F40/Z2_F40.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F40/Z2_F40.xml
deleted file mode 100644
index d233785f4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F40/Z2_F40.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_F40" Segment="2" Game="MM">
-        <Scene Name="Z2_F40" Offset="0x0"/>
-    </File>
-    <File Name="Z2_F40_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_F40_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F41/Z2_F41.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F41/Z2_F41.xml
deleted file mode 100644
index d34ed75c7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_F41/Z2_F41.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_F41" Segment="2" Game="MM">
-        <Scene Name="Z2_F41" Offset="0x0"/>
-    </File>
-    <File Name="Z2_F41_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_F41_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_FISHERMAN/Z2_FISHERMAN.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_FISHERMAN/Z2_FISHERMAN.xml
deleted file mode 100644
index 3fdd11f3f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_FISHERMAN/Z2_FISHERMAN.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_FISHERMAN" Segment="2" Game="MM">
-        <Scene Name="Z2_FISHERMAN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_FISHERMAN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_FISHERMAN_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_GORONRACE/Z2_GORONRACE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_GORONRACE/Z2_GORONRACE.xml
deleted file mode 100644
index f2e92ddb1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_GORONRACE/Z2_GORONRACE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_GORONRACE" Segment="2" Game="MM">
-        <Scene Name="Z2_GORONRACE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_GORONRACE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_GORONRACE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_GORONSHOP/Z2_GORONSHOP.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_GORONSHOP/Z2_GORONSHOP.xml
deleted file mode 100644
index a7671c9bd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_GORONSHOP/Z2_GORONSHOP.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_GORONSHOP" Segment="2" Game="MM">
-        <Texture Name="Z2_GORONSHOPTex_004630" Format="i8" Width="128" Height="64" Offset="0x4630"/>
-        <Texture Name="Z2_GORONSHOPTex_009230" Format="rgba16" Width="64" Height="64" Offset="0x9230"/>
-
-        <Scene Name="Z2_GORONSHOP" Offset="0x0"/>
-    </File>
-    <File Name="Z2_GORONSHOP_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_GORONSHOP_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_GORON_HAKA/Z2_GORON_HAKA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_GORON_HAKA/Z2_GORON_HAKA.xml
deleted file mode 100644
index 8b7dceaab..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_GORON_HAKA/Z2_GORON_HAKA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_GORON_HAKA" Segment="2" Game="MM">
-        <Scene Name="Z2_GORON_HAKA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_GORON_HAKA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_GORON_HAKA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_HAKASHITA/Z2_HAKASHITA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_HAKASHITA/Z2_HAKASHITA.xml
deleted file mode 100644
index 24763ee09..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_HAKASHITA/Z2_HAKASHITA.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <File Name="Z2_HAKASHITA" Segment="2" Game="MM">
-        <Scene Name="Z2_HAKASHITA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKASHITA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_HAKASHITA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKASHITA_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_HAKASHITA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKASHITA_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_HAKASHITA_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKASHITA_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_HAKASHITA_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKASHITA_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_HAKASHITA_room_04" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_HAKUGIN/Z2_HAKUGIN.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_HAKUGIN/Z2_HAKUGIN.xml
deleted file mode 100644
index 9f3f39a8a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_HAKUGIN/Z2_HAKUGIN.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<Root>
-    <File Name="Z2_HAKUGIN" Segment="2" Game="MM">
-        <Scene Name="Z2_HAKUGIN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_11" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_12" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_12" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_13" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_13" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_HAKUGIN_BS/Z2_HAKUGIN_BS.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_HAKUGIN_BS/Z2_HAKUGIN_BS.xml
deleted file mode 100644
index ca1c2dd11..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_HAKUGIN_BS/Z2_HAKUGIN_BS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_HAKUGIN_BS" Segment="2" Game="MM">
-        <Scene Name="Z2_HAKUGIN_BS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_BS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_BS_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_ICHIBA/Z2_ICHIBA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_ICHIBA/Z2_ICHIBA.xml
deleted file mode 100644
index 145b7b62d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_ICHIBA/Z2_ICHIBA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_ICHIBA" Segment="2" Game="MM">
-        <Scene Name="Z2_ICHIBA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_ICHIBA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_ICHIBA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_IKANA/Z2_IKANA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_IKANA/Z2_IKANA.xml
deleted file mode 100644
index c7e2885d3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_IKANA/Z2_IKANA.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<Root>
-    <File Name="Z2_IKANA" Segment="2" Game="MM">
-        <Scene Name="Z2_IKANA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANA_room_00" Segment="3" Game="MM">
-        <Texture Name="Z2_IKANA_room_00Tex_020A40" Format="rgba16" Width="64" Height="64" Offset="0x20958"/>
-
-        <Room Name="Z2_IKANA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANA_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_IKANA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANA_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_IKANA_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANA_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_IKANA_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANA_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_IKANA_room_04" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_IKANAMAE/Z2_IKANAMAE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_IKANAMAE/Z2_IKANAMAE.xml
deleted file mode 100644
index 3a738c04a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_IKANAMAE/Z2_IKANAMAE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_IKANAMAE" Segment="2" Game="MM">
-        <Scene Name="Z2_IKANAMAE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANAMAE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_IKANAMAE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_IKNINSIDE/Z2_IKNINSIDE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_IKNINSIDE/Z2_IKNINSIDE.xml
deleted file mode 100644
index 540e552a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_IKNINSIDE/Z2_IKNINSIDE.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_IKNINSIDE" Segment="2" Game="MM">
-        <Scene Name="Z2_IKNINSIDE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKNINSIDE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_IKNINSIDE_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKNINSIDE_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_IKNINSIDE_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INISIE_BS/Z2_INISIE_BS.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INISIE_BS/Z2_INISIE_BS.xml
deleted file mode 100644
index 933ce678e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INISIE_BS/Z2_INISIE_BS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_INISIE_BS" Segment="2" Game="MM">
-        <Scene Name="Z2_INISIE_BS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_BS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_BS_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INISIE_N/Z2_INISIE_N.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INISIE_N/Z2_INISIE_N.xml
deleted file mode 100644
index 2954a41fe..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INISIE_N/Z2_INISIE_N.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-    <File Name="Z2_INISIE_N" Segment="2" Game="MM">
-        <Scene Name="Z2_INISIE_N" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_11" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INISIE_R/Z2_INISIE_R.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INISIE_R/Z2_INISIE_R.xml
deleted file mode 100644
index 7ca232478..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INISIE_R/Z2_INISIE_R.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-    <File Name="Z2_INISIE_R" Segment="2" Game="MM">
-        <Scene Name="Z2_INISIE_R" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_11" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INSIDETOWER/Z2_INSIDETOWER.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INSIDETOWER/Z2_INSIDETOWER.xml
deleted file mode 100644
index b35391b77..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_INSIDETOWER/Z2_INSIDETOWER.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_INSIDETOWER" Segment="2" Game="MM">
-        <Scene Name="Z2_INSIDETOWER" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INSIDETOWER_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_INSIDETOWER_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INSIDETOWER_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_INSIDETOWER_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KAIZOKU/Z2_KAIZOKU.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KAIZOKU/Z2_KAIZOKU.xml
deleted file mode 100644
index ac8789051..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KAIZOKU/Z2_KAIZOKU.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_KAIZOKU" Segment="2" Game="MM">
-        <Scene Name="Z2_KAIZOKU" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KAIZOKU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KAIZOKU_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KAJIYA/Z2_KAJIYA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
deleted file mode 100644
index 158669f8f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="misc/scene_texture_02/"/>
-    <File Name="Z2_KAJIYA" Segment="2" Game="MM">
-        <Scene Name="Z2_KAJIYA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KAJIYA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KAJIYA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KINDAN2/Z2_KINDAN2.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KINDAN2/Z2_KINDAN2.xml
deleted file mode 100644
index 3283d92ad..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KINDAN2/Z2_KINDAN2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <File Name="Z2_KINDAN2" Segment="2" Game="MM">
-        <Scene Name="Z2_KINDAN2" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_05" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KINSTA1/Z2_KINSTA1.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KINSTA1/Z2_KINSTA1.xml
deleted file mode 100644
index 1ae2684c5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KINSTA1/Z2_KINSTA1.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <File Name="Z2_KINSTA1" Segment="2" Game="MM">
-        <Scene Name="Z2_KINSTA1" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_05" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KOEPONARACE/Z2_KOEPONARACE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KOEPONARACE/Z2_KOEPONARACE.xml
deleted file mode 100644
index b0edf047e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KOEPONARACE/Z2_KOEPONARACE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_KOEPONARACE" Segment="2" Game="MM">
-        <Scene Name="Z2_KOEPONARACE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KOEPONARACE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KOEPONARACE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KONPEKI_ENT/Z2_KONPEKI_ENT.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KONPEKI_ENT/Z2_KONPEKI_ENT.xml
deleted file mode 100644
index d306e587a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KONPEKI_ENT/Z2_KONPEKI_ENT.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="Z2_KONPEKI_ENT" Segment="2" Game="MM">
-        <Texture Name="Z2_KONPEKI_ENTTex_005020" Format="rgba16" Width="64" Height="64" Offset="0x5020"/>
-
-        <Scene Name="Z2_KONPEKI_ENT" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KONPEKI_ENT_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KONPEKI_ENT_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KYOJINNOMA/Z2_KYOJINNOMA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KYOJINNOMA/Z2_KYOJINNOMA.xml
deleted file mode 100644
index 23450a3eb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_KYOJINNOMA/Z2_KYOJINNOMA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_KYOJINNOMA" Segment="2" Game="MM">
-        <Scene Name="Z2_KYOJINNOMA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KYOJINNOMA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KYOJINNOMA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LABO/Z2_LABO.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LABO/Z2_LABO.xml
deleted file mode 100644
index 7aa23fc76..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LABO/Z2_LABO.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_LABO" Segment="2" Game="MM">
-        <Scene Name="Z2_LABO" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LABO_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LABO_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_BS/Z2_LAST_BS.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_BS/Z2_LAST_BS.xml
deleted file mode 100644
index fc488975d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_BS/Z2_LAST_BS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_LAST_BS" Segment="2" Game="MM">
-        <Scene Name="Z2_LAST_BS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_BS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_BS_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_DEKU/Z2_LAST_DEKU.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_DEKU/Z2_LAST_DEKU.xml
deleted file mode 100644
index 409e6829a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_DEKU/Z2_LAST_DEKU.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_LAST_DEKU" Segment="2" Game="MM">
-        <Scene Name="Z2_LAST_DEKU" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_DEKU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_DEKU_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_DEKU_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_DEKU_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_GORON/Z2_LAST_GORON.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_GORON/Z2_LAST_GORON.xml
deleted file mode 100644
index 94f212234..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_GORON/Z2_LAST_GORON.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_LAST_GORON" Segment="2" Game="MM">
-        <Scene Name="Z2_LAST_GORON" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_GORON_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_GORON_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_GORON_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_GORON_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_LINK/Z2_LAST_LINK.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_LINK/Z2_LAST_LINK.xml
deleted file mode 100644
index 3ad2ba8f0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_LINK/Z2_LAST_LINK.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Root>
-    <File Name="Z2_LAST_LINK" Segment="2" Game="MM">
-        <Scene Name="Z2_LAST_LINK" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_07" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_ZORA/Z2_LAST_ZORA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_ZORA/Z2_LAST_ZORA.xml
deleted file mode 100644
index 5090c76a8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LAST_ZORA/Z2_LAST_ZORA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_LAST_ZORA" Segment="2" Game="MM">
-        <Scene Name="Z2_LAST_ZORA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_ZORA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_ZORA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LOST_WOODS/Z2_LOST_WOODS.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LOST_WOODS/Z2_LOST_WOODS.xml
deleted file mode 100644
index 0c41a1b29..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_LOST_WOODS/Z2_LOST_WOODS.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="Z2_LOST_WOODS" Segment="2" Game="MM">
-        <Texture Name="Z2_LOST_WOODSTex_00B9D0" Format="ia16" Width="64" Height="64" Offset="0xB9D0"/>
-
-        <Scene Name="Z2_LOST_WOODS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LOST_WOODS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LOST_WOODS_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LOST_WOODS_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_LOST_WOODS_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LOST_WOODS_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_LOST_WOODS_room_02" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MAP_SHOP/Z2_MAP_SHOP.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MAP_SHOP/Z2_MAP_SHOP.xml
deleted file mode 100644
index 237791f40..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MAP_SHOP/Z2_MAP_SHOP.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_MAP_SHOP" Segment="2" Game="MM">
-        <Scene Name="Z2_MAP_SHOP" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MAP_SHOP_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_MAP_SHOP_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MILK_BAR/Z2_MILK_BAR.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MILK_BAR/Z2_MILK_BAR.xml
deleted file mode 100644
index 1c8a42e62..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MILK_BAR/Z2_MILK_BAR.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_MILK_BAR" Segment="2" Game="MM">
-        <Scene Name="Z2_MILK_BAR" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MILK_BAR_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_MILK_BAR_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MITURIN/Z2_MITURIN.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MITURIN/Z2_MITURIN.xml
deleted file mode 100644
index d1a6af9cd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MITURIN/Z2_MITURIN.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<Root>
-    <File Name="Z2_MITURIN" Segment="2" Game="MM">
-        <Scene Name="Z2_MITURIN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_11" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_12" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_12" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MITURIN_BS/Z2_MITURIN_BS.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MITURIN_BS/Z2_MITURIN_BS.xml
deleted file mode 100644
index 33402da41..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MITURIN_BS/Z2_MITURIN_BS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_MITURIN_BS" Segment="2" Game="MM">
-        <Scene Name="Z2_MITURIN_BS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_BS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_BS_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MUSICHOUSE/Z2_MUSICHOUSE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MUSICHOUSE/Z2_MUSICHOUSE.xml
deleted file mode 100644
index 2e5dc83d0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_MUSICHOUSE/Z2_MUSICHOUSE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_MUSICHOUSE" Segment="2" Game="MM">
-        <Scene Name="Z2_MUSICHOUSE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MUSICHOUSE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_MUSICHOUSE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_OKUJOU/Z2_OKUJOU.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_OKUJOU/Z2_OKUJOU.xml
deleted file mode 100644
index f3970315b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_OKUJOU/Z2_OKUJOU.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_OKUJOU" Segment="2" Game="MM">
-        <Scene Name="Z2_OKUJOU" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OKUJOU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_OKUJOU_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_OMOYA/Z2_OMOYA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_OMOYA/Z2_OMOYA.xml
deleted file mode 100644
index 5354762c8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_OMOYA/Z2_OMOYA.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="Z2_OMOYA" Segment="2" Game="MM">
-        <Scene Name="Z2_OMOYA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OMOYA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_OMOYA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OMOYA_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_OMOYA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OMOYA_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_OMOYA_room_02" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_OPENINGDAN/Z2_OPENINGDAN.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_OPENINGDAN/Z2_OPENINGDAN.xml
deleted file mode 100644
index 901c1698c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_OPENINGDAN/Z2_OPENINGDAN.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_OPENINGDAN" Segment="2" Game="MM">
-        <Scene Name="Z2_OPENINGDAN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OPENINGDAN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_OPENINGDAN_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OPENINGDAN_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_OPENINGDAN_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_PIRATE/Z2_PIRATE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_PIRATE/Z2_PIRATE.xml
deleted file mode 100644
index 1b459de39..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_PIRATE/Z2_PIRATE.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<Root>
-    <File Name="Z2_PIRATE" Segment="2" Game="MM">
-        <Scene Name="Z2_PIRATE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_11" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_12" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_12" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_13" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_13" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_14" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_14" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_POSTHOUSE/Z2_POSTHOUSE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_POSTHOUSE/Z2_POSTHOUSE.xml
deleted file mode 100644
index a0b71568b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_POSTHOUSE/Z2_POSTHOUSE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_POSTHOUSE" Segment="2" Game="MM">
-        <Scene Name="Z2_POSTHOUSE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_POSTHOUSE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_POSTHOUSE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_RANDOM/Z2_RANDOM.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_RANDOM/Z2_RANDOM.xml
deleted file mode 100644
index 0f4eafc22..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_RANDOM/Z2_RANDOM.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <File Name="Z2_RANDOM" Segment="2" Game="MM">
-        <Scene Name="Z2_RANDOM" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_05" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_REDEAD/Z2_REDEAD.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_REDEAD/Z2_REDEAD.xml
deleted file mode 100644
index a2d1b14ac..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_REDEAD/Z2_REDEAD.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<Root>
-    <File Name="Z2_REDEAD" Segment="2" Game="MM">
-        <Scene Name="Z2_REDEAD" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_11" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_12" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_12" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_13" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_13" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
deleted file mode 100644
index 3ef612381..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
-    <File Name="Z2_ROMANYMAE" Segment="2" Game="MM">
-        <Scene Name="Z2_ROMANYMAE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_ROMANYMAE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_ROMANYMAE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SEA/Z2_SEA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SEA/Z2_SEA.xml
deleted file mode 100644
index ad6ec3617..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SEA/Z2_SEA.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <File Name="Z2_SEA" Segment="2" Game="MM">
-        <Scene Name="Z2_SEA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_11" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_12" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_12" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_13" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_13" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_14" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_14" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_15" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_15" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SEA_BS/Z2_SEA_BS.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SEA_BS/Z2_SEA_BS.xml
deleted file mode 100644
index e602e7a7b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SEA_BS/Z2_SEA_BS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_SEA_BS" Segment="2" Game="MM">
-        <Scene Name="Z2_SEA_BS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_BS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_BS_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SECOM/Z2_SECOM.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SECOM/Z2_SECOM.xml
deleted file mode 100644
index 39cdd9fce..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SECOM/Z2_SECOM.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="Z2_SECOM" Segment="2" Game="MM">
-        <Scene Name="Z2_SECOM" Offset="0x0"/>
-        <!-- This texture is used in an "AnimatedMaterial", and must be declared to use the proper symbol -->
-        <Texture Name="gSakonsHidoutConveyorBeltTex" OutName="sakons_hideout_conveyor_belt" Height="32" Width="32" Format="rgba16" Offset="0x47F0"/>
-    </File>
-    <File Name="Z2_SECOM_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SECOM_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SECOM_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_SECOM_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SINKAI/Z2_SINKAI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SINKAI/Z2_SINKAI.xml
deleted file mode 100644
index 6a3df8b2e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SINKAI/Z2_SINKAI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
-    <File Name="Z2_SINKAI" Segment="2" Game="MM">
-        <Scene Name="Z2_SINKAI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SINKAI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SINKAI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
deleted file mode 100644
index 72f476631..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
-    <File Name="Z2_SONCHONOIE" Segment="2" Game="MM">
-        <Scene Name="Z2_SONCHONOIE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SONCHONOIE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SONCHONOIE_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SONCHONOIE_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_SONCHONOIE_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SONCHONOIE_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_SONCHONOIE_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SONCHONOIE_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_SONCHONOIE_room_03" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SOUGEN/Z2_SOUGEN.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SOUGEN/Z2_SOUGEN.xml
deleted file mode 100644
index 56ff81de0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SOUGEN/Z2_SOUGEN.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_SOUGEN" Segment="2" Game="MM">
-        <Scene Name="Z2_SOUGEN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SOUGEN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SOUGEN_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SYATEKI_MIZU/Z2_SYATEKI_MIZU.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SYATEKI_MIZU/Z2_SYATEKI_MIZU.xml
deleted file mode 100644
index f4592c69b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SYATEKI_MIZU/Z2_SYATEKI_MIZU.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_SYATEKI_MIZU" Segment="2" Game="MM">
-        <Scene Name="Z2_SYATEKI_MIZU" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SYATEKI_MIZU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SYATEKI_MIZU_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SYATEKI_MORI/Z2_SYATEKI_MORI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SYATEKI_MORI/Z2_SYATEKI_MORI.xml
deleted file mode 100644
index 32a4c7ce9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_SYATEKI_MORI/Z2_SYATEKI_MORI.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_SYATEKI_MORI" Segment="2" Game="MM">
-        <Scene Name="Z2_SYATEKI_MORI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SYATEKI_MORI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SYATEKI_MORI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TAKARAKUJI/Z2_TAKARAKUJI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TAKARAKUJI/Z2_TAKARAKUJI.xml
deleted file mode 100644
index d305a1e91..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TAKARAKUJI/Z2_TAKARAKUJI.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_TAKARAKUJI" Segment="2" Game="MM">
-        <Scene Name="Z2_TAKARAKUJI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TAKARAKUJI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TAKARAKUJI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TAKARAYA/Z2_TAKARAYA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TAKARAYA/Z2_TAKARAYA.xml
deleted file mode 100644
index d2845c468..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TAKARAYA/Z2_TAKARAYA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_TAKARAYA" Segment="2" Game="MM">
-        <Scene Name="Z2_TAKARAYA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TAKARAYA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TAKARAYA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TENMON_DAI/Z2_TENMON_DAI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TENMON_DAI/Z2_TENMON_DAI.xml
deleted file mode 100644
index f572992ed..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TENMON_DAI/Z2_TENMON_DAI.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_TENMON_DAI" Segment="2" Game="MM">
-        <Scene Name="Z2_TENMON_DAI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TENMON_DAI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TENMON_DAI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TENMON_DAI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_TENMON_DAI_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TORIDE/Z2_TORIDE.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TORIDE/Z2_TORIDE.xml
deleted file mode 100644
index 4003e785d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TORIDE/Z2_TORIDE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
-    <File Name="Z2_TORIDE" Segment="2" Game="MM">
-        <Scene Name="Z2_TORIDE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TORIDE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TORIDE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TOUGITES/Z2_TOUGITES.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TOUGITES/Z2_TOUGITES.xml
deleted file mode 100644
index 65752111f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TOUGITES/Z2_TOUGITES.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_TOUGITES" Segment="2" Game="MM">
-        <Scene Name="Z2_TOUGITES" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TOUGITES_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TOUGITES_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TOWN/Z2_TOWN.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TOWN/Z2_TOWN.xml
deleted file mode 100644
index be025d5ff..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_TOWN/Z2_TOWN.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_TOWN" Segment="2" Game="MM">
-        <Scene Name="Z2_TOWN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TOWN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TOWN_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_WITCH_SHOP/Z2_WITCH_SHOP.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_WITCH_SHOP/Z2_WITCH_SHOP.xml
deleted file mode 100644
index 1401d5832..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_WITCH_SHOP/Z2_WITCH_SHOP.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_WITCH_SHOP" Segment="2" Game="MM">
-        <Scene Name="Z2_WITCH_SHOP" Offset="0x0"/>
-    </File>
-    <File Name="Z2_WITCH_SHOP_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_WITCH_SHOP_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_YADOYA/Z2_YADOYA.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_YADOYA/Z2_YADOYA.xml
deleted file mode 100644
index 03801385c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_YADOYA/Z2_YADOYA.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
-    <File Name="Z2_YADOYA" Segment="2" Game="MM">
-        <Scene Name="Z2_YADOYA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YADOYA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_YADOYA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YADOYA_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_YADOYA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YADOYA_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_YADOYA_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YADOYA_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_YADOYA_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YADOYA_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_YADOYA_room_04" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_YOUSEI_IZUMI/Z2_YOUSEI_IZUMI.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_YOUSEI_IZUMI/Z2_YOUSEI_IZUMI.xml
deleted file mode 100644
index 10ebda0ba..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/scenes/Z2_YOUSEI_IZUMI/Z2_YOUSEI_IZUMI.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <File Name="Z2_YOUSEI_IZUMI" Segment="2" Game="MM">
-        <Scene Name="Z2_YOUSEI_IZUMI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YOUSEI_IZUMI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_YOUSEI_IZUMI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YOUSEI_IZUMI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_YOUSEI_IZUMI_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YOUSEI_IZUMI_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_YOUSEI_IZUMI_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YOUSEI_IZUMI_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_YOUSEI_IZUMI_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YOUSEI_IZUMI_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_YOUSEI_IZUMI_room_04" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/text/message_data_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/GC_US/text/message_data_static.xml
deleted file mode 100644
index 0f771ef2d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/GC_US/text/message_data_static.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-  <File Name="message_data_static">
-    <TextMM Name="message_data_static" CodeOffset="0x11F648"/>
-  </File>
-	<File Name="staff_message_data_static">
-		<TextMM Name="staff_message_data_static" CodeOffset="0x1285B8"/>
-	</File>
-</Root>
\ No newline at end of file
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/icon_item_24_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/icon_item_24_static.xml
deleted file mode 100644
index 6bc8c740b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/icon_item_24_static.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <File Name="icon_item_24_static_yar" Segment="9">
-        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x0" />
-        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x900" />
-        <Texture Name="gQuestIconPieceOfHeartTex" OutName="piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200" />
-        <!-- Identical to gQuestIconPieceOfHeartTex -->
-        <Texture Name="gQuestIconPieceOfHeart2Tex" OutName="piece_of_heart_2_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00" />
-        <!-- Both identical to gQuestIconHeartContainerTex -->
-        <Texture Name="gQuestIconHeartContainer2Tex" OutName="heart_container_2_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400" />
-        <Texture Name="gQuestIconHeartContainer3Tex" OutName="heart_container_3_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00" />
-        <Texture Name="gQuestIconBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600" />
-        <Texture Name="gQuestIconCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00" />
-        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800" />
-        <!-- Identical to gQuestIconGoldSkulltulaTex -->
-        <Texture Name="gQuestIconGoldSkulltula2Tex" OutName="gold_skulltula_2_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100" />
-        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00" />
-        <Texture Name="gQuestIconSmallMagicJarTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300" />
-        <Texture Name="gQuestIconBigMagicJarTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00" />
-        <Texture Name="gQuestIconLinkHumanFaceTex" OutName="link_human_face_icon" Format="rgba16" Width="16" Height="16" Offset="0x7500"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/icon_item_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/icon_item_static.xml
deleted file mode 100644
index 52cf6a3a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/icon_item_static.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<Root>
-    <File Name="icon_item_static_yar" Segment="8">
-        <!-- Item icons -->
-        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x0000"/>
-        <Texture Name="gItemIconBowTex" OutName="bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
-        <Texture Name="gItemIconFireArrowTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000" />
-        <Texture Name="gItemIconIceArrowTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000" />
-        <Texture Name="gItemIconLightArrowTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000" />
-        <Texture Name="gItemIconFairyOcarinaTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000" />
-        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000" />
-        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000" />
-        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000" />
-        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000" />
-        <Texture Name="gItemIconMagicBeansTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000" />
-        <Texture Name="gItemIconSlingshotTex" OutName="slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000" />
-        <Texture Name="gItemIconPowderKegTex" OutName="powder_keg_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000" />
-        <Texture Name="gItemIconPictographBoxTex" OutName="picto_box_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000" />
-        <Texture Name="gItemIconLensofTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000" />
-        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000" />
-        <Texture Name="gItemIconGreatFairysSwordTex" OutName="great_fairys_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000" />
-        <!-- Visually looks like OoT's Hookshot Icon -->
-        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000" />
-
-        <!-- Bottled item icons -->
-        <Texture Name="gItemIconEmptyBottleTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000" />
-        <Texture Name="gItemIconRedPotionTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000" />
-        <Texture Name="gItemIconGreenPotionTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000" />
-        <Texture Name="gItemIconBluePotionTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000" />
-        <Texture Name="gItemIconBottledFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000" />
-        <Texture Name="gItemIconBottledDekuPrincessTex" OutName="bottled_deku_princess_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000" />
-        <Texture Name="gItemIconBottledFullMilkTex" OutName="bottled_full_milk_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000" />
-        <Texture Name="gItemIconBottledHalfMilkTex" OutName="bottled_half_milk_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000" />
-        <Texture Name="gItemIconBottledFishTex" OutName="bottled_fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000" />
-        <Texture Name="gItemIconBottledBugTex" OutName="bottled_bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000" />
-        <Texture Name="gItemIconBottledBlueFireTex" OutName="bottled_blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000" />
-        <Texture Name="gItemIconBottledPoeTex" OutName="bottled_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000" />
-        <Texture Name="gItemIconBottledBigPoeTex" OutName="bottled_big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000" />
-        <Texture Name="gItemIconSpringWaterTex" OutName="spring_water_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000" />
-        <Texture Name="gItemIconHotSpringWaterTex" OutName="hot_spring_water_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000" />
-        <Texture Name="gItemIconBottledZoraEggTex" OutName="bottled_zora_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000" />
-        <Texture Name="gItemIconBottledGoldDustTex" OutName="bottled_gold_dust_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000" />
-        <Texture Name="gItemIconBottledMushroomTex" OutName="bottled_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000" />
-        <Texture Name="gItemIconBottledSeahorseTex" OutName="bottled_seahorse_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000" />
-        <Texture Name="gItemIconChateauRomaniTex" OutName="chateau_romani_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000" />
-        <Texture Name="gItemIconBottledHylianLoachTex" OutName="bottled_hylian_loach_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000" />
-        <!-- Identical to gItemIconEmptyBottleTex -->
-        <Texture Name="gItemIconEmptyBottle2Tex" OutName="empty_bottle_2_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000" />
-
-        <!-- Trade Quest icons -->
-        <Texture Name="gItemIconLandDeedTex" OutName="land_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000" />
-        <Texture Name="gItemIconMoonsTearTex" OutName="moons_tear_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000" />
-        <Texture Name="gItemIconSwampDeedTex" OutName="swamp_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000" />
-        <Texture Name="gItemIconMountainDeedTex" OutName="mountain_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000" />
-        <Texture Name="gItemIconOceanDeedTex" OutName="ocean_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000" />
-        <Texture Name="gItemIconRoomKeyTex" OutName="room_key_icon" Format="rgba32" Width="32" Height="32" Offset="0x2D000" />
-        <Texture Name="gItemIconLetterToMamaTex" OutName="letter_to_mama_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000" />
-        <Texture Name="gItemIconLetterToKafeiTex" OutName="letter_to_kafei_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000" />
-        <Texture Name="gItemIconPendantOfMemoriesTex" OutName="pendant_of_memories_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000" />
-
-        <Texture Name="gItemIconTingleMapTex" OutName="tingle_map_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000" />
-
-        <!-- Mask icons -->
-        <Texture Name="gItemIconDekuMaskTex" OutName="deku_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000" />
-        <Texture Name="gItemIconGoronMaskTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000" />
-        <Texture Name="gItemIconZoraMaskTex" OutName="zora_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000" />
-        <Texture Name="gItemIconFierceDeityMaskTex" OutName="fierce_deity_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000" />
-        <Texture Name="gItemIconMaskOfTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000" />
-        <Texture Name="gItemIconKafeisMaskTex" OutName="kafeis_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000" />
-        <Texture Name="gItemIconAllNightMaskTex" OutName="all_night_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000" />
-        <Texture Name="gItemIconBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000" />
-        <Texture Name="gItemIconKeatonMaskTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000" />
-        <Texture Name="gItemIconGaroMaskTex" OutName="garo_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000" />
-        <Texture Name="gItemIconRomaniMaskTex" OutName="romani_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000" />
-        <Texture Name="gItemIconCircusLeaderMaskTex" OutName="circus_leader_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000" />
-        <Texture Name="gItemIconPostmansHatTex" OutName="postmans_hat_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000" />
-        <Texture Name="gItemIconCouplesMaskTex" OutName="couples_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000" />
-        <Texture Name="gItemIconGreatFairyMaskTex" OutName="great_fairy_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000" />
-        <Texture Name="gItemIconGibdoMaskTex" OutName="gibdo_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000" />
-        <Texture Name="gItemIconDonGeroMaskTex" OutName="don_gero_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000" />
-        <Texture Name="gItemIconKamaroMaskTex" OutName="kamaro_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000" />
-        <Texture Name="gItemIconCaptainsHatTex" OutName="captains_hat_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000" />
-        <Texture Name="gItemIconStoneMaskTex" OutName="stone_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000" />
-        <Texture Name="gItemIconBremenMaskTex" OutName="bremen_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000" />
-        <Texture Name="gItemIconBlastMaskTex" OutName="blast_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000" />
-        <Texture Name="gItemIconMaskOfScentsTex" OutName="mask_of_scents_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000" />
-        <Texture Name="gItemIconGiantsMaskTex" OutName="giants_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000" />
-
-        <!-- Upgrads/Misc icons -->
-        <Texture Name="gItemIconBowFireTex" OutName="bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000" />
-        <Texture Name="gItemIconBowIceTex" OutName="bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000" />
-        <Texture Name="gItemIconBowLightTex" OutName="bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000" />
-        <Texture Name="gItemIconKokiriSwordTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000" />
-        <Texture Name="gItemIconRazorSwordTex" OutName="razor_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000" />
-        <Texture Name="gItemIconGildedSwordTex" OutName="gilded_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000" />
-        <Texture Name="gItemIconFierceDeitySwordTex" OutName="fierce_deity_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000" />
-        <Texture Name="gItemIconHerosShieldTex" OutName="heros_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000" />
-        <Texture Name="gItemIconMirrorShieldTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000" />
-        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000" />
-        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000" />
-        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000" />
-        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000" />
-        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000" />
-        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000" />
-        <Texture Name="gItemIconDefaultWalletTex" OutName="default_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000" />
-        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x5A000" />
-        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x5B000" />
-        <Texture Name="gItemIconFishingRodTex" OutName="fishing_rod_icon" Format="rgba32" Width="32" Height="32" Offset="0x5C000" />
-        <Texture Name="gItemIconOdolwasRemainsTex" OutName="odolwas_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x5D000" />
-        <Texture Name="gItemIconGohtsRemainsTex" OutName="gohts_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x5E000" />
-        <Texture Name="gItemIconGyorgsRemainsTex" OutName="gyorgs_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x5F000" />
-        <Texture Name="gItemIconTwinmoldsRemainsTex" OutName="twinmolds_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x60000" />
-        <Texture Name="gItemIconBombersNotebookTex" OutName="bombers_notebook_icon" Format="rgba32" Width="32" Height="32" Offset="0x61000" />
-
-        <!-- ia8 icons -->
-        <Texture Name="gItemIconSongNoteTex" OutName="song_note_icon" Format="ia8" Width="16" Height="24" Offset="0x62000" />
-        <Texture Name="gItemIconHeartPiece1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x62180" />
-        <Texture Name="gItemIconHeartPiece2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x62A80" />
-        <Texture Name="gItemIconHeartPiece3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x63380" />
-
-        <!-- Cursors -->
-        <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x63C80"/>
-        <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x64100"/>
-        <Texture Name="gPauseMenuCursorTex" OutName="pause_menu_cursor" Format="ia8" Width="16" Height="16" Offset="0x64340" />
-
-        <!-- Divided Background Menu: First Row -->
-        <Texture Name="gPauseMasks00Tex" OutName="pause_masks_0_0" Format="ia8" Width="80" Height="32" Offset="0x64440" />
-        <Texture Name="gPauseMasks10JPNTex" OutName="pause_masks_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x64E40" />
-        <Texture Name="gPauseMasks20Tex" OutName="pause_masks_2_0" Format="ia8" Width="80" Height="32" Offset="0x65840" />
-        <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x66240" />
-        <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x66C40" />
-        <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x67640" />
-        <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x68040" />
-        <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x68A40" />
-        <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x69440" />
-        <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x69E40" />
-        <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x6A840" />
-        <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x6B240" />
-        <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x6BC40" />
-        <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x6C640" />
-        <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x6D040" />
-        <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x6DA40" />
-
-       <!-- Divided Background Menu: Second Row -->
-        <Texture Name="gPauseMasks01Tex" OutName="pause_masks_0_1" Format="ia8" Width="80" Height="32" Offset="0x6E440" />
-        <Texture Name="gPauseMasks11Tex" OutName="pause_masks_1_1" Format="ia8" Width="80" Height="32" Offset="0x6EE40" />
-        <Texture Name="gPauseMasks21Tex" OutName="pause_masks_2_1" Format="ia8" Width="80" Height="32" Offset="0x6F840" />
-        <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x70240" />
-        <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x70C40" />
-        <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x71640" />
-        <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x72040" />
-        <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x72A40" />
-        <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x73440" />
-        <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x73E40" />
-        <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x74840" />
-        <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x75240" />
-        <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x75C40" />
-        <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x76640" />
-        <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x77040" />
-
-        <!-- Divided Background Menu: Third Row -->
-        <Texture Name="gPauseMasks02Tex" OutName="pause_masks_0_2" Format="ia8" Width="80" Height="32" Offset="0x77A40" />
-        <Texture Name="gPauseMasks12Tex" OutName="pause_masks_1_2" Format="ia8" Width="80" Height="32" Offset="0x78440" />
-        <Texture Name="gPauseMasks22Tex" OutName="pause_masks_2_2" Format="ia8" Width="80" Height="32" Offset="0x78E40" />
-        <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x79840" />
-        <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x7A240" />
-        <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x7AC40" />
-        <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x7B640" />
-        <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x7C040" />
-        <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x7CA40" />
-        <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x7D440" />
-        <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x7DE40" />
-        <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x7E840" />
-        <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x7F240" />
-        <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x7FC40" />
-        <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x80640" />
-
-        <!-- Divided Background Menu: Fourth Row -->
-        <Texture Name="gPauseMasks03Tex" OutName="pause_masks_0_3" Format="ia8" Width="80" Height="32" Offset="0x81040" />
-        <Texture Name="gPauseMasks13Tex" OutName="pause_masks_1_3" Format="ia8" Width="80" Height="32" Offset="0x81A40" />
-        <Texture Name="gPauseMasks23Tex" OutName="pause_masks_2_3" Format="ia8" Width="80" Height="32" Offset="0x82440" />
-        <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x82E40" />
-        <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x83840" />
-        <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x84240" />
-        <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x84C40" />
-        <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x85640" />
-        <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x86040" />
-        <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x86A40" />
-        <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x87440" />
-        <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x87E40" />
-        <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x88840" />
-        <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x89240" />
-        <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x89C40" />
-
-        <!-- Divided Background Menu: Fifth Row -->
-        <Texture Name="gPauseMasks04Tex" OutName="pause_masks_0_4" Format="ia8" Width="80" Height="32" Offset="0x8A640" />
-        <Texture Name="gPauseMasks14Tex" OutName="pause_masks_1_4" Format="ia8" Width="80" Height="32" Offset="0x8B040" />
-        <Texture Name="gPauseMasks24Tex" OutName="pause_masks_2_4" Format="ia8" Width="80" Height="32" Offset="0x8BA40" />
-        <Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x8C440" />
-        <Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x8CE40" />
-        <Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x8D840" />
-        <Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x8E240" />
-        <Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x8EC40" />
-        <Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x8F640" />
-        <Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x90040" />
-        <Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x90A40" />
-        <Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x91440" />
-        <Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x91E40" />
-        <Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x92840" />
-        <Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x93240" />
-
-        <!-- Textures used by display lists extracted from icon_item_vtx_static -->
-        <Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x93C40"/>
-        <Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x93DC0"/>
-        <Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x93F40"/>
-        <Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x94240"/>
-        <Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x94900"/>
-        <Texture Name="gZButtonTex" OutName="z_button" Format="ia8" Width="24" Height="32" Offset="0x94FC0"/>
-        <Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x952C0"/>
-        <!-- unused -->
-        <Texture Name="gShowAMusicalNoteTex" OutName="show_a_musical_note" Format="ia8" Width="80" Height="16" Offset="0x955C0"/>
-        <Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x95AC0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/item_name_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/item_name_static.xml
deleted file mode 100644
index b9ff2a5ee..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/item_name_static.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<Root>
-    <!-- Item Names. Must be ia4 128x16 and ordered following `ItemId` -->
-    <File Name="item_name_static">
-        <!-- Main items -->
-        <Texture Name="gItemNameOcarinaOfTimeENGTex" OutName="item_name_ocarina_of_time_eng" Format="ia4" Width="128" Height="16" Offset="0x0" /> <!-- ITEM_OCARINA_OF_TIME -->
-        <Texture Name="gItemNameHerosBowENGTex" OutName="item_name_heros_bow_eng" Format="ia4" Width="128" Height="16" Offset="0x400" /> <!-- ITEM_BOW -->
-        <Texture Name="gItemNameFireArrowENGTex" OutName="item_name_fire_arrow_eng" Format="ia4" Width="128" Height="16" Offset="0x800" /> <!-- ITEM_ARROW_FIRE -->
-        <Texture Name="gItemNameIceArrowENGTex" OutName="item_name_ice_arrow_eng" Format="ia4" Width="128" Height="16" Offset="0xC00" /> <!-- ITEM_ARROW_ICE -->
-        <Texture Name="gItemNameLightArrowENGTex" OutName="item_name_light_arrow_eng" Format="ia4" Width="128" Height="16" Offset="0x1000" /> <!-- ITEM_ARROW_LIGHT -->
-        <Texture Name="gItemNameFairyOcarinaJPNTex" OutName="item_name_fairy_ocarina_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400" /> <!-- ITEM_OCARINA_FAIRY -->
-        <Texture Name="gItemNameBombENGTex" OutName="item_name_bomb_eng" Format="ia4" Width="128" Height="16" Offset="0x1800" /> <!-- ITEM_BOMB -->
-        <Texture Name="gItemNameBombchuENGTex" OutName="item_name_bombchu_eng" Format="ia4" Width="128" Height="16" Offset="0x1C00" /> <!-- ITEM_BOMBCHU -->
-        <Texture Name="gItemNameDekuStickENGTex" OutName="item_name_deku_stick_eng" Format="ia4" Width="128" Height="16" Offset="0x2000" /> <!-- ITEM_DEKU_STICK -->
-        <Texture Name="gItemNameDekuNutENGTex" OutName="item_name_deku_nut_eng" Format="ia4" Width="128" Height="16" Offset="0x2400" /> <!-- ITEM_DEKU_NUT -->
-        <Texture Name="gItemNameMagicBeansENGTex" OutName="item_name_magic_beans_eng" Format="ia4" Width="128" Height="16" Offset="0x2800" /> <!-- ITEM_MAGIC_BEANS -->
-        <!-- Swapped with slingshot -->
-        <Texture Name="gItemNameLongshotJPNTex" OutName="item_name_longshot_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00" /> <!-- ITEM_SLINGSHOT -->
-        <Texture Name="gItemNamePowderKegENGTex" OutName="item_name_powder_keg_eng" Format="ia4" Width="128" Height="16" Offset="0x3000" /> <!-- ITEM_POWDER_KEG -->
-        <Texture Name="gItemNamePictographBoxENGTex" OutName="item_name_pictograph_box_eng" Format="ia4" Width="128" Height="16" Offset="0x3400" /> <!-- ITEM_PICTOGRAPH_BOX -->
-        <Texture Name="gItemNameLensOfTruthENGTex" OutName="item_name_lens_of_truth_eng" Format="ia4" Width="128" Height="16" Offset="0x3800" /> <!-- ITEM_LENS_OF_TRUTH -->
-        <Texture Name="gItemNameHookshotENGTex" OutName="item_name_hookshot_eng" Format="ia4" Width="128" Height="16" Offset="0x3C00" /> <!-- ITEM_HOOKSHOT -->
-        <Texture Name="gItemNameGreatFairysSwordENGTex" OutName="item_name_great_fairys_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x4000" /> <!-- ITEM_SWORD_GREAT_FAIRY -->
-        <!-- Swapped with longshot -->
-        <Texture Name="gItemNameFairySlingshotJPNTex" OutName="item_name_fairy_slingshot_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400" /> <!-- ITEM_LONGSHOT -->
-
-        <!-- Bottled items -->
-        <Texture Name="gItemNameEmptyBottleENGTex" OutName="item_name_empty_bottle_eng" Format="ia4" Width="128" Height="16" Offset="0x4800" /> <!-- ITEM_BOTTLE -->
-        <Texture Name="gItemNameRedPotionENGTex" OutName="item_name_red_potion_eng" Format="ia4" Width="128" Height="16" Offset="0x4C00" /> <!-- ITEM_POTION_RED -->
-        <Texture Name="gItemNameGreenPotionENGTex" OutName="item_name_green_potion_eng" Format="ia4" Width="128" Height="16" Offset="0x5000" /> <!-- ITEM_POTION_GREEN -->
-        <Texture Name="gItemNameBluePotionENGTex" OutName="item_name_blue_potion_eng" Format="ia4" Width="128" Height="16" Offset="0x5400" /> <!-- ITEM_POTION_BLUE -->
-        <Texture Name="gItemNameFairyENGTex" OutName="item_name_fairy_eng" Format="ia4" Width="128" Height="16" Offset="0x5800" /> <!-- ITEM_FAIRY -->
-        <Texture Name="gItemNameDekuPrincessENGTex" OutName="item_name_deku_princess_eng" Format="ia4" Width="128" Height="16" Offset="0x5C00" /> <!-- ITEM_DEKU_PRINCESS -->
-        <Texture Name="gItemNameFullMilkENGTex" OutName="item_name_full_milk_eng" Format="ia4" Width="128" Height="16" Offset="0x6000" /> <!-- ITEM_MILK_BOTTLE -->
-        <Texture Name="gItemNameHalfMilkENGTex" OutName="item_name_half_milk_eng" Format="ia4" Width="128" Height="16" Offset="0x6400" /> <!-- ITEM_MILK_HALF -->
-        <Texture Name="gItemNameFishENGTex" OutName="item_name_fish_eng" Format="ia4" Width="128" Height="16" Offset="0x6800" /> <!-- ITEM_FISH -->
-        <Texture Name="gItemNameBugENGTex" OutName="item_name_bug_eng" Format="ia4" Width="128" Height="16" Offset="0x6C00" /> <!-- ITEM_BUG -->
-        <Texture Name="gItemNameBlueFireENGTex" OutName="item_name_blue_fire_eng" Format="ia4" Width="128" Height="16" Offset="0x7000" /> <!-- ITEM_BLUE_FIRE -->
-        <Texture Name="gItemNamePoeENGTex" OutName="item_name_poe_eng" Format="ia4" Width="128" Height="16" Offset="0x7400" /> <!-- ITEM_POE -->
-        <Texture Name="gItemNameBigPoeENGTex" OutName="item_name_big_poe_eng" Format="ia4" Width="128" Height="16" Offset="0x7800" /> <!-- ITEM_BIG_POE -->
-        <Texture Name="gItemNameSpringWaterENGTex" OutName="item_name_spring_water_eng" Format="ia4" Width="128" Height="16" Offset="0x7C00" /> <!-- ITEM_SPRING_WATER -->
-        <Texture Name="gItemNameHotSpringWaterENGTex" OutName="item_name_hot_spring_water_eng" Format="ia4" Width="128" Height="16" Offset="0x8000" /> <!-- ITEM_HOT_SPRING_WATER -->
-        <Texture Name="gItemNameZoraEggENGTex" OutName="item_name_zora_egg_eng" Format="ia4" Width="128" Height="16" Offset="0x8400" /> <!-- ITEM_ZORA_EGG -->
-        <Texture Name="gItemNameGoldDustENGTex" OutName="item_name_gold_dust_eng" Format="ia4" Width="128" Height="16" Offset="0x8800" /> <!-- ITEM_GOLD_DUST -->
-        <Texture Name="gItemNameMagicalMushroomENGTex" OutName="item_name_magical_mushroom_eng" Format="ia4" Width="128" Height="16" Offset="0x8C00" /> <!-- ITEM_MUSHROOM -->
-        <Texture Name="gItemNameSeaHorseENGTex" OutName="item_name_sea_horse_eng" Format="ia4" Width="128" Height="16" Offset="0x9000" /> <!-- ITEM_SEAHORSE -->
-        <Texture Name="gItemNameChateauRomaniENGTex" OutName="item_name_chateau_romani_eng" Format="ia4" Width="128" Height="16" Offset="0x9400" /> <!-- ITEM_CHATEAU -->
-        <Texture Name="gItemNameHylianLoachJPNTex" OutName="item_name_hylian_loach_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800" /> <!-- ITEM_HYLIAN_LOACH -->
-        <Texture Name="gItemNameObabasDrinkJPNTex" OutName="item_name_obabas_drink_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00" /> <!-- ITEM_OBABA_DRINK -->
-
-        <!-- Trade Items -->
-        <Texture Name="gItemNameMoonsTearENGTex" OutName="item_name_moons_tear_eng" Format="ia4" Width="128" Height="16" Offset="0xA000" /> <!-- ITEM_MOONS_TEAR -->
-        <Texture Name="gItemNameLandTitleDeedENGTex" OutName="item_name_land_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xA400" /> <!-- ITEM_DEED_LAND -->
-        <Texture Name="gItemNameSwampTitleDeedENGTex" OutName="item_name_swamp_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xA800" /> <!-- ITEM_DEED_SWAMP -->
-        <Texture Name="gItemNameMountainTitleDeedENGTex" OutName="item_name_mountain_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xAC00" /> <!-- ITEM_DEED_MOUNTAIN -->
-        <Texture Name="gItemNameOceanTitleDeedENGTex" OutName="item_name_ocean_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xB000" /> <!-- ITEM_DEED_OCEAN -->
-        <Texture Name="gItemNameRoomKeyENGTex" OutName="item_name_room_key_eng" Format="ia4" Width="128" Height="16" Offset="0xB400" /> <!-- ITEM_ROOM_KEY -->
-        <Texture Name="gItemNameSpecialDeliveryToMamaENGTex" OutName="item_name_special_delivery_to_mama_eng" Format="ia4" Width="128" Height="16" Offset="0xB800" /> <!-- ITEM_LETTER_MAMA -->
-        <Texture Name="gItemNameLetterToKafeiENGTex" OutName="item_name_letter_to_kafei_eng" Format="ia4" Width="128" Height="16" Offset="0xBC00" /> <!-- ITEM_LETTER_TO_KAFEI -->
-        <Texture Name="gItemNamePendantOfMemoriesENGTex" OutName="item_name_pendant_of_memories_eng" Format="ia4" Width="128" Height="16" Offset="0xC000" /> <!-- ITEM_PENDANT_OF_MEMORIES -->
-
-        <!-- Translates to Moon's Stone? Slightly different than the japanese translation of Moon's Tear. Replaces Tear with Stone, the same character used in Stone's Mask -->
-        <Texture Name="gItemNameMoonsStoneJPNTex" OutName="item_name_moons_stone_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400" /> <!-- ITEM_TINGLE_MAP -->
-
-        <!-- Masks -->
-        <Texture Name="gItemNameDekuMaskENGTex" OutName="item_name_deku_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xC800" /> <!-- ITEM_MASK_DEKU -->
-        <Texture Name="gItemNameGoronMaskENGTex" OutName="item_name_goron_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xCC00" /> <!-- ITEM_MASK_GORON -->
-        <Texture Name="gItemNameZoraMaskENGTex" OutName="item_name_zora_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xD000" /> <!-- ITEM_MASK_ZORA -->
-        <Texture Name="gItemNameFierceDeitysMaskENGTex" OutName="item_name_fierce_deitys_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xD400" /> <!-- ITEM_MASK_FIERCE_DEITY -->
-        <Texture Name="gItemNameMaskOfTruthENGTex" OutName="item_name_mask_of_truth_eng" Format="ia4" Width="128" Height="16" Offset="0xD800" /> <!-- ITEM_MASK_TRUTH -->
-        <Texture Name="gItemNameKafeisMaskENGTex" OutName="item_name_kafeis_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xDC00" /> <!-- ITEM_MASK_KAFEIS_MASK -->
-        <Texture Name="gItemNameAllNightMaskENGTex" OutName="item_name_all_night_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xE000" /> <!-- ITEM_MASK_ALL_NIGHT -->
-        <Texture Name="gItemNameBunnyHoodENGTex" OutName="item_name_bunny_hood_eng" Format="ia4" Width="128" Height="16" Offset="0xE400" /> <!-- ITEM_MASK_BUNNY -->
-        <Texture Name="gItemNameKeatonMaskENGTex" OutName="item_name_keaton_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xE800" /> <!-- ITEM_MASK_KEATON -->
-        <Texture Name="gItemNameGarosMaskENGTex" OutName="item_name_garos_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xEC00" /> <!-- ITEM_MASK_GARO -->
-        <Texture Name="gItemNameRomanisMaskENGTex" OutName="item_name_romanis_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xF000" /> <!-- ITEM_MASK_ROMANI -->
-        <Texture Name="gItemNameCircusLeadersMaskENGTex" OutName="item_name_circus_leaders_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xF400" /> <!-- ITEM_MASK_CIRCUS_LEADER -->
-        <Texture Name="gItemNamePostmansHatENGTex" OutName="item_name_postmans_hat_eng" Format="ia4" Width="128" Height="16" Offset="0xF800" /> <!-- ITEM_MASK_POSTMAN -->
-        <Texture Name="gItemNameCouplesMaskENGTex" OutName="item_name_couples_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xFC00" /> <!-- ITEM_MASK_COUPLE -->
-        <Texture Name="gItemNameGreatFairysMaskENGTex" OutName="item_name_great_fairys_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10000" /> <!-- ITEM_MASK_GREAT_FAIRY -->
-        <Texture Name="gItemNameGibdoMaskENGTex" OutName="item_name_gibdo_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10400" /> <!-- ITEM_MASK_GIBDO -->
-        <Texture Name="gItemNameDonGerosMaskENGTex" OutName="item_name_don_geros_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10800" /> <!-- ITEM_MASK_DON_GERO -->
-        <Texture Name="gItemNameKamarosMaskENGTex" OutName="item_name_kamaros_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10C00" /> <!-- ITEM_MASK_KAMARO -->
-        <Texture Name="gItemNameCaptainsHatENGTex" OutName="item_name_captains_hat_eng" Format="ia4" Width="128" Height="16" Offset="0x11000" /> <!-- ITEM_MASK_CAPTAIN -->
-        <Texture Name="gItemNameStoneMaskENGTex" OutName="item_name_stone_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x11400" /> <!-- ITEM_MASK_STONE -->
-        <Texture Name="gItemNameBremenMaskENGTex" OutName="item_name_bremen_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x11800" /> <!-- ITEM_MASK_BREMEN -->
-        <Texture Name="gItemNameBlastMaskENGTex" OutName="item_name_blast_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x11C00" /> <!-- ITEM_MASK_BLAST -->
-        <Texture Name="gItemNameMaskOfScentsENGTex" OutName="item_name_mask_of_scents_eng" Format="ia4" Width="128" Height="16" Offset="0x12000" /> <!-- ITEM_MASK_SCENTS -->
-        <Texture Name="gItemNameGiantsMaskENGTex" OutName="item_name_giants_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x12400" /> <!-- ITEM_MASK_GIANT -->
-
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameWindMedallionJPNTex" OutName="item_name_wind_medallion_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800" /> <!-- ITEM_BOW_FIRE -->
-        <Texture Name="gItemNameFireMedallionJPNTex" OutName="item_name_fire_medallion_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00" /> <!-- ITEM_BOW_ICE -->
-        <Texture Name="gItemNameIceMedallionJPNTex" OutName="item_name_ice_medallion_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000" /> <!-- ITEM_BOW_LIGHT -->
-
-        <!-- Equipment -->
-        <Texture Name="gItemNameKokiriSwordENGTex" OutName="item_name_kokiri_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x13400" /> <!-- ITEM_SWORD_KOKIRI -->
-        <Texture Name="gItemNameRazorSwordENGTex" OutName="item_name_razor_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x13800" /> <!-- ITEM_SWORD_RAZOR -->
-        <Texture Name="gItemNameGildedSwordENGTex" OutName="item_name_gilded_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x13C00" /> <!-- ITEM_SWORD_GILDED -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameBrokenGiantsKnifeJPNTex" OutName="item_name_broken_giants_knife_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000" /> <!-- ITEM_SWORD_DEITY -->
-        <Texture Name="gItemNameHerosShieldENGTex" OutName="item_name_heros_shield_eng" Format="ia4" Width="128" Height="16" Offset="0x14400" /> <!-- ITEM_SHIELD_HERO -->
-        <Texture Name="gItemNameMirrorShieldENGTex" OutName="item_name_mirror_shield_eng" Format="ia4" Width="128" Height="16" Offset="0x14800" /> <!-- ITEM_SHIELD_MIRROR -->
-
-        <!-- Upgrades -->
-        <Texture Name="gItemNameQuiver30ENGTex" OutName="item_name_quiver_30_eng" Format="ia4" Width="128" Height="16" Offset="0x14C00" /> <!-- ITEM_QUIVER_30 -->
-        <Texture Name="gItemNameQuiver40ENGTex" OutName="item_name_quiver_40_eng" Format="ia4" Width="128" Height="16" Offset="0x15000" /> <!-- ITEM_QUIVER_40 -->
-        <Texture Name="gItemNameQuiver50ENGTex" OutName="item_name_quiver_50_eng" Format="ia4" Width="128" Height="16" Offset="0x15400" /> <!-- ITEM_QUIVER_50 -->
-        <Texture Name="gItemNameBombBag20ENGTex" OutName="item_name_bomb_bag_20_eng" Format="ia4" Width="128" Height="16" Offset="0x15800" /> <!-- ITEM_BOMB_BAG_20 -->
-        <Texture Name="gItemNameBombBag30ENGTex" OutName="item_name_bomb_bag_30_eng" Format="ia4" Width="128" Height="16" Offset="0x15C00" /> <!-- ITEM_BOMB_BAG_30 -->
-        <Texture Name="gItemNameBombBag40ENGTex" OutName="item_name_bomb_bag_40_eng" Format="ia4" Width="128" Height="16" Offset="0x16000" /> <!-- ITEM_BOMB_BAG_40 -->
-
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameBigKey1JPNTex" OutName="item_name_big_key_1_jpn" Format="ia4" Width="128" Height="16" Offset="0x16400" /> <!-- ITEM_WALLET_DEFAULT -->
-        <Texture Name="gItemNameBigKey2JPNTex" OutName="item_name_big_key_2_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800" /> <!-- ITEM_WALLET_ADULT -->
-        <Texture Name="gItemNameBigKey3JPNTex" OutName="item_name_big_key_3_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00" /> <!-- ITEM_WALLET_GIANT -->
-        <Texture Name="gItemNameBigKey4JPNTex" OutName="item_name_big_key_4_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000" /> <!-- ITEM_FISHING_ROD -->
-
-        <!-- Boss remains -->
-        <Texture Name="gItemNameOdolwasRemainsENGTex" OutName="item_name_odolwas_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x17400" /> <!-- ITEM_REMAINS_ODOLWA -->
-        <Texture Name="gItemNameGohtsRemainsENGTex" OutName="item_name_gohts_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x17800" /> <!-- ITEM_REMAINS_GOHT -->
-        <Texture Name="gItemNameGyorgsRemainsENGTex" OutName="item_name_gyorgs_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x17C00" /> <!-- ITEM_REMAINS_GYORG -->
-        <Texture Name="gItemNameTwinmoldsRemainsENGTex" OutName="item_name_twinmolds_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x18000" /> <!-- ITEM_REMAINS_TWINMOLD -->
-
-        <!-- Songs -->
-        <Texture Name="gItemNameSonataOfAwakeningENGTex" OutName="item_name_sonata_of_awakening_eng" Format="ia4" Width="128" Height="16" Offset="0x18400" /> <!-- ITEM_SONG_SONATA -->
-        <Texture Name="gItemNameGoronLullabyENGTex" OutName="item_name_goron_lullaby_eng" Format="ia4" Width="128" Height="16" Offset="0x18800" /> <!-- ITEM_SONG_LULLABY -->
-        <Texture Name="gItemNameNewWaveBossaNovaENGTex" OutName="item_name_new_wave_bossa_nova_eng" Format="ia4" Width="128" Height="16" Offset="0x18C00" /> <!-- ITEM_SONG_NOVA -->
-        <Texture Name="gItemNameElegyOfEmptynessENGTex" OutName="item_name_elegy_of_emptiness_eng" Format="ia4" Width="128" Height="16" Offset="0x19000" /> <!-- ITEM_SONG_ELEGY -->
-        <Texture Name="gItemNameOathToOrderENGTex" OutName="item_name_oath_to_order_eng" Format="ia4" Width="128" Height="16" Offset="0x19400" /> <!-- ITEM_SONG_OATH -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameNocturneOfShadowJPNTex" OutName="item_name_nocturne_of_shadow_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800" /> <!-- ITEM_SONG_SARIA -->
-        <Texture Name="gItemNameSongOfTimeENGTex" OutName="item_name_song_of_time_eng" Format="ia4" Width="128" Height="16" Offset="0x19C00" /> <!-- ITEM_SONG_TIME -->
-        <Texture Name="gItemNameSongOfHealingENGTex" OutName="item_name_song_of_healing_eng" Format="ia4" Width="128" Height="16" Offset="0x1A000" /> <!-- ITEM_SONG_HEALING -->
-        <Texture Name="gItemNameEponasSongENGTex" OutName="item_name_eponas_song_eng" Format="ia4" Width="128" Height="16" Offset="0x1A400" /> <!-- ITEM_SONG_EPONA -->
-        <Texture Name="gItemNameSongOfSoaringENGTex" OutName="item_name_song_of_soaring_eng" Format="ia4" Width="128" Height="16" Offset="0x1A800" /> <!-- ITEM_SONG_SOARING -->
-        <Texture Name="gItemNameSongOfStormsENGTex" OutName="item_name_song_of_storms_eng" Format="ia4" Width="128" Height="16" Offset="0x1AC00" /> <!-- ITEM_SONG_STORMS -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameSunsSongJPNTex" OutName="item_name_suns_song_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000" /> <!-- ITEM_SONG_SUN -->
-
-        <!-- Misc -->
-        <Texture Name="gItemNameBombersNotebookENGTex" OutName="item_name_bombers_notebook_eng" Format="ia4" Width="128" Height="16" Offset="0x1B400" /> <!-- ITEM_BOMBERS_NOTEBOOK -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameGoldSkulltulaJPNTex" OutName="item_name_gold_skulltula_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800" /> <!-- ITEM_SKULL_TOKEN -->
-        <Texture Name="gItemNamePieceOfHeartENGTex" OutName="item_name_piece_of_heart_eng" Format="ia4" Width="128" Height="16" Offset="0x1BC00" /> <!-- ITEM_HEART_CONTAINER, Piece of Heart? -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNamePieceOfHeartJPNTex" OutName="item_name_piece_of_heart_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000" /> <!-- ITEM_HEART_PIECE -->
-        <!-- Identical to gItemNameSunsSongJPNTex -->
-        <Texture Name="gItemNameSunsSong2JPNTex" OutName="item_name_suns_song_2_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400" /> <!-- ITEM_71 -->
-        <!-- Unused remnants from OoT -->
-        <Texture Name="gItemNameSongOfTimeJPNTex" OutName="item_name_song_of_time_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800" /> <!-- ITEM_72 -->
-        <Texture Name="gItemNameLullabyIntroENGTex" OutName="item_name_lullaby_intro_eng" Format="ia4" Width="128" Height="16" Offset="0x1CC00" /> <!-- ITEM_SONG_LULLABY_INTRO -->
-        <Texture Name="gItemNameBigKeyENGTex" OutName="item_name_big_key_eng" Format="ia4" Width="128" Height="16" Offset="0x1D000" /> <!-- ITEM_KEY_BOSS -->
-        <Texture Name="gItemNameCompassENGTex" OutName="item_name_compass_eng" Format="ia4" Width="128" Height="16" Offset="0x1D400" /> <!-- ITEM_COMPASS -->
-        <Texture Name="gItemNameDungeonMapENGTex" OutName="item_name_dungeon_map_eng" Format="ia4" Width="128" Height="16" Offset="0x1D800" /> <!-- ITEM_DUNGEON_MAP -->
-        <Texture Name="gItemNameStrayFairiesENGTex" OutName="item_name_stray_fairies_eng" Format="ia4" Width="128" Height="16" Offset="0x1DC00" /> <!-- ITEM_STRAY_FAIRIES -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/map_grand_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/map_grand_static.xml
deleted file mode 100644
index 94e51b350..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/map_grand_static.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<Root>
-    <File Name="map_grand_static">
-        <Blob Name="map_grand_static_Blob_000000" Size="0x0FF0" Offset="0x0" />
-        <Blob Name="map_grand_static_Blob_000FF0" Size="0x0FF0" Offset="0xFF0" />
-        <Blob Name="map_grand_static_Blob_001FE0" Size="0x0FF0" Offset="0x1FE0" />
-        <Blob Name="map_grand_static_Blob_002FD0" Size="0x0FF0" Offset="0x2FD0" />
-        <Blob Name="map_grand_static_Blob_003FC0" Size="0x0FF0" Offset="0x3FC0" />
-        <Blob Name="map_grand_static_Blob_004FB0" Size="0x0B40" Offset="0x4FB0" />
-        <Blob Name="map_grand_static_Blob_005AF0" Size="0x0FF0" Offset="0x5AF0" />
-        <Blob Name="map_grand_static_Blob_006AE0" Size="0x0FF0" Offset="0x6AE0" />
-        <Blob Name="map_grand_static_Blob_007AD0" Size="0x0FF0" Offset="0x7AD0" />
-        <Blob Name="map_grand_static_Blob_008AC0" Size="0x0FF0" Offset="0x8AC0" />
-        <Blob Name="map_grand_static_Blob_009AB0" Size="0x0420" Offset="0x9AB0" />
-        <Blob Name="map_grand_static_Blob_009ED0" Size="0x0FF0" Offset="0x9ED0" />
-        <Blob Name="map_grand_static_Blob_00AEC0" Size="0x0450" Offset="0xAEC0" />
-        <Blob Name="map_grand_static_Blob_00B310" Size="0x07A0" Offset="0xB310" />
-        <Blob Name="map_grand_static_Blob_00BAB0" Size="0x0FF0" Offset="0xBAB0" />
-        <Blob Name="map_grand_static_Blob_00CAA0" Size="0x0FF0" Offset="0xCAA0" />
-        <Blob Name="map_grand_static_Blob_00DA90" Size="0x0FF0" Offset="0xDA90" />
-        <Blob Name="map_grand_static_Blob_00EA80" Size="0x0780" Offset="0xEA80" />
-        <Blob Name="map_grand_static_Blob_00F200" Size="0x0800" Offset="0xF200" />
-        <Blob Name="map_grand_static_Blob_00FA00" Size="0x0850" Offset="0xFA00" />
-        <Blob Name="map_grand_static_Blob_010250" Size="0x0510" Offset="0x10250" />
-        <Blob Name="map_grand_static_Blob_010760" Size="0x0710" Offset="0x10760" />
-        <Blob Name="map_grand_static_Blob_010E70" Size="0x0AE0" Offset="0x10E70" />
-        <Blob Name="map_grand_static_Blob_011950" Size="0x0660" Offset="0x11950" />
-        <Blob Name="map_grand_static_Blob_011FB0" Size="0x0C60" Offset="0x11FB0" />
-        <Blob Name="map_grand_static_Blob_012C10" Size="0x0E10" Offset="0x12C10" />
-        <Blob Name="map_grand_static_Blob_013A20" Size="0x03E0" Offset="0x13A20" />
-        <Blob Name="map_grand_static_Blob_013E00" Size="0x05A0" Offset="0x13E00" />
-        <Blob Name="map_grand_static_Blob_0143A0" Size="0x0820" Offset="0x143A0" />
-        <Blob Name="map_grand_static_Blob_014BC0" Size="0x0440" Offset="0x14BC0" />
-        <Blob Name="map_grand_static_Blob_015000" Size="0x0590" Offset="0x15000" />
-        <Blob Name="map_grand_static_Blob_015590" Size="0x05A0" Offset="0x15590" />
-        <Blob Name="map_grand_static_Blob_015B30" Size="0x07A0" Offset="0x15B30" />
-        <Blob Name="map_grand_static_Blob_0162D0" Size="0x07A0" Offset="0x162D0" />
-        <Blob Name="map_grand_static_Blob_016A70" Size="0x0DF0" Offset="0x16A70" />
-        <Blob Name="map_grand_static_Blob_017860" Size="0x0850" Offset="0x17860" />
-        <Blob Name="map_grand_static_Blob_0180B0" Size="0x09C0" Offset="0x180B0" />
-        <Blob Name="map_grand_static_Blob_018A70" Size="0x0880" Offset="0x18A70" />
-        <Blob Name="map_grand_static_Blob_0192F0" Size="0x0660" Offset="0x192F0" />
-        <Blob Name="map_grand_static_Blob_019950" Size="0x0360" Offset="0x19950" />
-        <Blob Name="map_grand_static_Blob_019CB0" Size="0x0260" Offset="0x19CB0" />
-        <Blob Name="map_grand_static_Blob_019F10" Size="0x0960" Offset="0x19F10" />
-        <Blob Name="map_grand_static_Blob_01A870" Size="0x0350" Offset="0x1A870" />
-        <Blob Name="map_grand_static_Blob_01ABC0" Size="0x09B0" Offset="0x1ABC0" />
-        <Blob Name="map_grand_static_Blob_01B570" Size="0x0980" Offset="0x1B570" />
-        <Blob Name="map_grand_static_Blob_01BEF0" Size="0x0FF0" Offset="0x1BEF0" />
-        <Blob Name="map_grand_static_Blob_01CEE0" Size="0x0B20" Offset="0x1CEE0" />
-        <Blob Name="map_grand_static_Blob_01DA00" Size="0x0DA0" Offset="0x1DA00" />
-        <Blob Name="map_grand_static_Blob_01E7A0" Size="0x0820" Offset="0x1E7A0" />
-        <Blob Name="map_grand_static_Blob_01EFC0" Size="0x03E0" Offset="0x1EFC0" />
-        <Blob Name="map_grand_static_Blob_01F3A0" Size="0x0980" Offset="0x1F3A0" />
-        <Blob Name="map_grand_static_Blob_01FD20" Size="0x0960" Offset="0x1FD20" />
-        <Blob Name="map_grand_static_Blob_020680" Size="0x0760" Offset="0x20680" />
-        <Blob Name="map_grand_static_Blob_020DE0" Size="0x0960" Offset="0x20DE0" />
-        <Blob Name="map_grand_static_Blob_021740" Size="0x01D0" Offset="0x21740" />
-        <Blob Name="map_grand_static_Blob_021910" Size="0x0630" Offset="0x21910" />
-        <Blob Name="map_grand_static_Blob_021F40" Size="0x0680" Offset="0x21F40" />
-        <Blob Name="map_grand_static_Blob_0225C0" Size="0x07D0" Offset="0x225C0" />
-        <Blob Name="map_grand_static_Blob_022D90" Size="0x0870" Offset="0x22D90" />
-        <Blob Name="map_grand_static_Blob_023600" Size="0x0E60" Offset="0x23600" />
-        <Blob Name="map_grand_static_Blob_024460" Size="0x0710" Offset="0x24460" />
-        <Blob Name="map_grand_static_Blob_024B70" Size="0x0620" Offset="0x24B70" />
-        <Blob Name="map_grand_static_Blob_025190" Size="0x0620" Offset="0x25190" />
-        <Blob Name="map_grand_static_Blob_0257B0" Size="0x0680" Offset="0x257B0" />
-        <Blob Name="map_grand_static_Blob_025E30" Size="0x0620" Offset="0x25E30" />
-        <Blob Name="map_grand_static_Blob_026450" Size="0x0210" Offset="0x26450" />
-        <Blob Name="map_grand_static_Blob_026660" Size="0x04B0" Offset="0x26660" />
-        <Blob Name="map_grand_static_Blob_026B10" Size="0x0680" Offset="0x26B10" />
-        <Blob Name="map_grand_static_Blob_027190" Size="0x0350" Offset="0x27190" />
-        <Blob Name="map_grand_static_Blob_0274E0" Size="0x0660" Offset="0x274E0" />
-        <Blob Name="map_grand_static_Blob_027B40" Size="0x0350" Offset="0x27B40" />
-        <Blob Name="map_grand_static_Blob_027E90" Size="0x0500" Offset="0x27E90" />
-        <Blob Name="map_grand_static_Blob_028390" Size="0x06A0" Offset="0x28390" />
-        <Blob Name="map_grand_static_Blob_028A30" Size="0x05E0" Offset="0x28A30" />
-        <Blob Name="map_grand_static_Blob_029010" Size="0x0680" Offset="0x29010" />
-        <Blob Name="map_grand_static_Blob_029690" Size="0x0480" Offset="0x29690" />
-        <Blob Name="map_grand_static_Blob_029B10" Size="0x0AE0" Offset="0x29B10" />
-        <Blob Name="map_grand_static_Blob_02A5F0" Size="0x02D0" Offset="0x2A5F0" />
-        <Blob Name="map_grand_static_Blob_02A8C0" Size="0x0B90" Offset="0x2A8C0" />
-        <Blob Name="map_grand_static_Blob_02B450" Size="0x0DA0" Offset="0x2B450" />
-        <Blob Name="map_grand_static_Blob_02C1F0" Size="0x08C0" Offset="0x2C1F0" />
-        <Blob Name="map_grand_static_Blob_02CAB0" Size="0x0A30" Offset="0x2CAB0" />
-        <Blob Name="map_grand_static_Blob_02D4E0" Size="0x0130" Offset="0x2D4E0" />
-        <Blob Name="map_grand_static_Blob_02D610" Size="0x0C30" Offset="0x2D610" />
-        <Blob Name="map_grand_static_Blob_02E240" Size="0x08A0" Offset="0x2E240" />
-        <Blob Name="map_grand_static_Blob_02EAE0" Size="0x0F50" Offset="0x2EAE0" />
-        <Blob Name="map_grand_static_Blob_02FA30" Size="0x09B0" Offset="0x2FA30" />
-        <Blob Name="map_grand_static_Blob_0303E0" Size="0x07B0" Offset="0x303E0" />
-        <Blob Name="map_grand_static_Blob_030B90" Size="0x0960" Offset="0x30B90" />
-        <Blob Name="map_grand_static_Blob_0314F0" Size="0x0740" Offset="0x314F0" />
-        <Blob Name="map_grand_static_Blob_031C30" Size="0x0A00" Offset="0x31C30" />
-        <Blob Name="map_grand_static_Blob_032630" Size="0x0640" Offset="0x32630" />
-        <Blob Name="map_grand_static_Blob_032C70" Size="0x0A30" Offset="0x32C70" />
-        <Blob Name="map_grand_static_Blob_0336A0" Size="0x03D0" Offset="0x336A0" />
-        <Blob Name="map_grand_static_Blob_033A70" Size="0x0D00" Offset="0x33A70" />
-        <Blob Name="map_grand_static_Blob_034770" Size="0x0440" Offset="0x34770" />
-        <Blob Name="map_grand_static_Blob_034BB0" Size="0x03A0" Offset="0x34BB0" />
-        <Blob Name="map_grand_static_Blob_034F50" Size="0x0960" Offset="0x34F50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/map_i_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/map_i_static.xml
deleted file mode 100644
index 15e1a4348..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/map_i_static.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<Root>
-    <File Name="map_i_static">
-        <Blob Name="map_i_static_Blob_000000" Size="0x0FF0" Offset="0x0" />
-        <Blob Name="map_i_static_Blob_000FF0" Size="0x0FF0" Offset="0xFF0" />
-        <Blob Name="map_i_static_Blob_001FE0" Size="0x0FF0" Offset="0x1FE0" />
-        <Blob Name="map_i_static_Blob_002FD0" Size="0x0FF0" Offset="0x2FD0" />
-        <Blob Name="map_i_static_Blob_003FC0" Size="0x0FF0" Offset="0x3FC0" />
-        <Blob Name="map_i_static_Blob_004FB0" Size="0x01D0" Offset="0x4FB0" />
-        <Blob Name="map_i_static_Blob_005180" Size="0x01B0" Offset="0x5180" />
-        <Blob Name="map_i_static_Blob_005330" Size="0x01E0" Offset="0x5330" />
-        <Blob Name="map_i_static_Blob_005510" Size="0x0100" Offset="0x5510" />
-        <Blob Name="map_i_static_Blob_005610" Size="0x0060" Offset="0x5610" />
-        <Blob Name="map_i_static_Blob_005670" Size="0x01B0" Offset="0x5670" />
-        <Blob Name="map_i_static_Blob_005820" Size="0x0070" Offset="0x5820" />
-        <Blob Name="map_i_static_Blob_005890" Size="0x0130" Offset="0x5890" />
-        <Blob Name="map_i_static_Blob_0059C0" Size="0x01A0" Offset="0x59C0" />
-        <Blob Name="map_i_static_Blob_005B60" Size="0x0100" Offset="0x5B60" />
-        <Blob Name="map_i_static_Blob_005C60" Size="0x01B0" Offset="0x5C60" />
-        <Blob Name="map_i_static_Blob_005E10" Size="0x0120" Offset="0x5E10" />
-        <Blob Name="map_i_static_Blob_005F30" Size="0x0120" Offset="0x5F30" />
-        <Blob Name="map_i_static_Blob_006050" Size="0x0260" Offset="0x6050" />
-        <Blob Name="map_i_static_Blob_0062B0" Size="0x0150" Offset="0x62B0" />
-        <Blob Name="map_i_static_Blob_006400" Size="0x0220" Offset="0x6400" />
-        <Blob Name="map_i_static_Blob_006620" Size="0x0300" Offset="0x6620" />
-        <Blob Name="map_i_static_Blob_006920" Size="0x0110" Offset="0x6920" />
-        <Blob Name="map_i_static_Blob_006A30" Size="0x0110" Offset="0x6A30" />
-        <Blob Name="map_i_static_Blob_006B40" Size="0x0150" Offset="0x6B40" />
-        <Blob Name="map_i_static_Blob_006C90" Size="0x0120" Offset="0x6C90" />
-        <Blob Name="map_i_static_Blob_006DB0" Size="0x00C0" Offset="0x6DB0" />
-        <Blob Name="map_i_static_Blob_006E70" Size="0x00D0" Offset="0x6E70" />
-        <Blob Name="map_i_static_Blob_006F40" Size="0x0230" Offset="0x6F40" />
-        <Blob Name="map_i_static_Blob_007170" Size="0x00A0" Offset="0x7170" />
-        <Blob Name="map_i_static_Blob_007210" Size="0x01C0" Offset="0x7210" />
-        <Blob Name="map_i_static_Blob_0073D0" Size="0x0100" Offset="0x73D0" />
-        <Blob Name="map_i_static_Blob_0074D0" Size="0x0180" Offset="0x74D0" />
-        <Blob Name="map_i_static_Blob_007650" Size="0x0150" Offset="0x7650" />
-        <Blob Name="map_i_static_Blob_0077A0" Size="0x00B0" Offset="0x77A0" />
-        <Blob Name="map_i_static_Blob_007850" Size="0x0050" Offset="0x7850" />
-        <Blob Name="map_i_static_Blob_0078A0" Size="0x0040" Offset="0x78A0" />
-        <Blob Name="map_i_static_Blob_0078E0" Size="0x0170" Offset="0x78E0" />
-        <Blob Name="map_i_static_Blob_007A50" Size="0x0080" Offset="0x7A50" />
-        <Blob Name="map_i_static_Blob_007AD0" Size="0x0090" Offset="0x7AD0" />
-        <Blob Name="map_i_static_Blob_007B60" Size="0x00C0" Offset="0x7B60" />
-        <Blob Name="map_i_static_Blob_007C20" Size="0x0080" Offset="0x7C20" />
-        <Blob Name="map_i_static_Blob_007CA0" Size="0x00F0" Offset="0x7CA0" />
-        <Blob Name="map_i_static_Blob_007D90" Size="0x0110" Offset="0x7D90" />
-        <Blob Name="map_i_static_Blob_007EA0" Size="0x0100" Offset="0x7EA0" />
-        <Blob Name="map_i_static_Blob_007FA0" Size="0x0050" Offset="0x7FA0" />
-        <Blob Name="map_i_static_Blob_007FF0" Size="0x0090" Offset="0x7FF0" />
-        <Blob Name="map_i_static_Blob_008080" Size="0x0110" Offset="0x8080" />
-        <Blob Name="map_i_static_Blob_008190" Size="0x0060" Offset="0x8190" />
-        <Blob Name="map_i_static_Blob_0081F0" Size="0x0110" Offset="0x81F0" />
-        <Blob Name="map_i_static_Blob_008300" Size="0x0060" Offset="0x8300" />
-        <Blob Name="map_i_static_Blob_008360" Size="0x0090" Offset="0x8360" />
-        <Blob Name="map_i_static_Blob_0083F0" Size="0x0110" Offset="0x83F0" />
-        <Blob Name="map_i_static_Blob_008500" Size="0x00F0" Offset="0x8500" />
-        <Blob Name="map_i_static_Blob_0085F0" Size="0x0090" Offset="0x85F0" />
-        <Blob Name="map_i_static_Blob_008680" Size="0x0080" Offset="0x8680" />
-        <Blob Name="map_i_static_Blob_008700" Size="0x00F0" Offset="0x8700" />
-        <Blob Name="map_i_static_Blob_0087F0" Size="0x0050" Offset="0x87F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/map_name_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/map_name_static.xml
deleted file mode 100644
index d672cdc39..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/map_name_static.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Root>
-    <!-- Map Point Names. Must be ia4 128x16 and continguous with `ItemId` starting from `ITEM_MAP_POINT_GREAT_BAY` -->
-    <File Name="map_name_static">
-        <!-- First entries must be continguous with `RegionId` -->
-        <Texture Name="gMapPointGreatBayENGTex" OutName="map_point_great_bay_eng" Format="ia4" Width="128" Height="16" Offset="0x0" />                <!-- ITEM_MAP_POINT_GREAT_BAY -->
-        <Texture Name="gMapPointZoraHallENGTex" OutName="map_point_zora_hall_eng" Format="ia4" Width="128" Height="16" Offset="0x400" />              <!-- ITEM_MAP_POINT_ZORA_HALL -->
-        <Texture Name="gMapPointRomaniRanchENGTex" OutName="map_point_romani_ranch_eng" Format="ia4" Width="128" Height="16" Offset="0x800" />        <!-- ITEM_MAP_POINT_ROMANI_RANCH -->
-        <Texture Name="gMapPointDekuPalaceENGTex" OutName="map_point_deku_palace_eng" Format="ia4" Width="128" Height="16" Offset="0xC00" />          <!-- ITEM_MAP_POINT_DEKU_PALACE -->
-        <!-- Reused for both region and owl warp map point -->
-        <Texture Name="gMapPointWoodfallENGTex" OutName="map_point_woodfall_eng" Format="ia4" Width="128" Height="16" Offset="0x1000" />              <!-- ITEM_MAP_POINT_WOODFALL -->
-        <!-- Reused for both region and owl warp map point -->
-        <Texture Name="gMapPointClockTownENGTex" OutName="map_point_clock_town_eng" Format="ia4" Width="128" Height="16" Offset="0x1400" />           <!-- ITEM_MAP_POINT_CLOCK_TOWN -->
-        <!-- Reused for both region and owl warp map point -->
-        <Texture Name="gMapPointSnowheadENGTex" OutName="map_point_snowhead_eng" Format="ia4" Width="128" Height="16" Offset="0x1800" />              <!-- ITEM_MAP_POINT_SNOWHEAD -->
-        <Texture Name="gMapPointIkanaGraveyardENGTex" OutName="map_point_ikana_graveyard_eng" Format="ia4" Width="128" Height="16" Offset="0x1C00" /> <!-- ITEM_MAP_POINT_IKANA_GRAVEYARD -->
-        <!-- Reused for both region and owl warp map point -->
-        <Texture Name="gMapPointIkanaCanyonENGTex" OutName="map_point_ikana_canyon_eng" Format="ia4" Width="128" Height="16" Offset="0x2000" />       <!-- ITEM_MAP_POINT_IKANA_CANYON -->
-        <Texture Name="gMapPointGoronVillageENGTex" OutName="map_point_goron_village_eng" Format="ia4" Width="128" Height="16" Offset="0x2400" />     <!-- ITEM_MAP_POINT_GORON_VILLAGE -->
-        <!-- Reused for both region and owl warp map point -->
-        <Texture Name="gMapPointStoneTowerENGTex" OutName="map_point_stone_tower_eng" Format="ia4" Width="128" Height="16" Offset="0x2800" />         <!-- ITEM_MAP_POINT_STONE_TOWER -->
-        
-        <!-- Unique Owl Warp Map Points -->
-        <Texture Name="gMapPointGreatBayCoastENGTex" OutName="map_point_great_bay_coast_eng" Format="ia4" Width="128" Height="16" Offset="0x2C00" />    <!-- ITEM_MAP_POINT_GREAT_BAY_COAST -->
-        <Texture Name="gMapPointSouthernSwampENGTex" OutName="map_point_southern_swamp_eng" Format="ia4" Width="128" Height="16" Offset="0x3000" />     <!-- ITEM_MAP_POINT_SOUTHERN_SWAMP -->
-        <Texture Name="gMapPointMountainVillageENGTex" OutName="map_point_mountain_village_eng" Format="ia4" Width="128" Height="16" Offset="0x3400" /> <!-- ITEM_MAP_POINT_MOUNTAIN_VILLAGE -->
-        <Texture Name="gMapPointMilkRoadENGTex" OutName="map_point_milk_road_eng" Format="ia4" Width="128" Height="16" Offset="0x3800" />               <!-- ITEM_MAP_POINT_MILK_ROAD -->
-        <Texture Name="gMapPointZoraCapeENGTex" OutName="map_point_zora_cape_eng" Format="ia4" Width="128" Height="16" Offset="0x3C00" />               <!-- ITEM_MAP_POINT_ZORA_CAPE -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/schedule_dma_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/schedule_dma_static.xml
deleted file mode 100644
index 42f75f6d9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/archives/schedule_dma_static.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="schedule_dma_static_yar" Segment="7">
-        <Texture Name="gBombersNotebookPhotoAnjuTex" OutName="bombers_notebook_photo_anju" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="gBombersNotebookPhotoKafeiTex" OutName="bombers_notebook_photo_kafei" Format="rgba16" Width="32" Height="32" Offset="0x800" />
-        <Texture Name="gBombersNotebookPhotoCuriosityShopManTex" OutName="bombers_notebook_photo_curiosity_shop_man" Format="rgba16" Width="32" Height="32" Offset="0x1000" />
-        <Texture Name="gBombersNotebookPhotoBombShopLadyTex" OutName="bombers_notebook_photo_bomb_shop_lady" Format="rgba16" Width="32" Height="32" Offset="0x1800" />
-        <Texture Name="gBombersNotebookPhotoRomaniTex" OutName="bombers_notebook_photo_romani" Format="rgba16" Width="32" Height="32" Offset="0x2000" />
-        <Texture Name="gBombersNotebookPhotoCremiaTex" OutName="bombers_notebook_photo_cremia" Format="rgba16" Width="32" Height="32" Offset="0x2800" />
-        <Texture Name="gBombersNotebookPhotoMayorDotourTex" OutName="bombers_notebook_photo_mayor_dotour" Format="rgba16" Width="32" Height="32" Offset="0x3000" />
-        <Texture Name="gBombersNotebookPhotoMadameAromaTex" OutName="bombers_notebook_photo_madame_aroma" Format="rgba16" Width="32" Height="32" Offset="0x3800" />
-        <Texture Name="gBombersNotebookPhotoTotoTex" OutName="bombers_notebook_photo_toto" Format="rgba16" Width="32" Height="32" Offset="0x4000" />
-        <Texture Name="gBombersNotebookPhotoGormanTex" OutName="bombers_notebook_photo_gorman" Format="rgba16" Width="32" Height="32" Offset="0x4800" />
-        <Texture Name="gBombersNotebookPhotoPostmanTex" OutName="bombers_notebook_photo_postman" Format="rgba16" Width="32" Height="32" Offset="0x5000" />
-        <Texture Name="gBombersNotebookPhotoRosaSistersTex" OutName="bombers_notebook_photo_rosa_sisters" Format="rgba16" Width="32" Height="32" Offset="0x5800" />
-        <Texture Name="gBombersNotebookPhotoToiletHandTex" OutName="bombers_notebook_photo_toilet_hand" Format="rgba16" Width="32" Height="32" Offset="0x6000" />
-        <Texture Name="gBombersNotebookPhotoAnjusGrandmotherTex" OutName="bombers_notebook_photo_anjus_grandmother" Format="rgba16" Width="32" Height="32" Offset="0x6800" />
-        <Texture Name="gBombersNotebookPhotoKamaroTex" OutName="bombers_notebook_photo_kamaro" Format="rgba16" Width="32" Height="32" Offset="0x7000" />
-        <Texture Name="gBombersNotebookPhotoGrogTex" OutName="bombers_notebook_photo_grog" Format="rgba16" Width="32" Height="32" Offset="0x7800" />
-        <Texture Name="gBombersNotebookPhotoGormanBrothersTex" OutName="bombers_notebook_photo_gorman_brothers" Format="rgba16" Width="32" Height="32" Offset="0x8000" />
-        <Texture Name="gBombersNotebookPhotoShiroTex" OutName="bombers_notebook_photo_shiro" Format="rgba16" Width="32" Height="32" Offset="0x8800" />
-        <Texture Name="gBombersNotebookPhotoGuruGuruTex" OutName="bombers_notebook_photo_guru_guru" Format="rgba16" Width="32" Height="32" Offset="0x9000" />
-        <Texture Name="gBombersNotebookPhotoBombersTex" OutName="bombers_notebook_photo_bombers" Format="rgba16" Width="32" Height="32" Offset="0x9800" />
-        <Texture Name="gBombersNotebookPhotoMadameAromaBrightTex" OutName="bombers_notebook_photo_madame_aroma_bright" Format="rgba16" Width="32" Height="32" Offset="0xA000" /> <!-- Unused, slightly different pose to the used one -->
-        <Texture Name="gBombersNotebookEntryIconExclamationPointLargeTex" OutName="bombers_notebook_entry_icon_exclamation_point_large" Format="ia8" Width="32" Height="32" Offset="0xA800" /> <!-- Unused -->
-        <Texture Name="gBombersNotebookEntryIconMaskTex" OutName="bombers_notebook_entry_icon_mask" Format="ia8" Width="24" Height="28" Offset="0xAC00" />
-        <Texture Name="gBombersNotebookEntryIconRibbonTex" OutName="bombers_notebook_entry_icon_ribbon" Format="ia8" Width="32" Height="28" Offset="0xAEA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/audio/Audio.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/audio/Audio.xml
deleted file mode 100644
index dd1cfefc1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/audio/Audio.xml
+++ /dev/null
@@ -1,3363 +0,0 @@
-<Root>
-    <File Name="code" OutName="audio" RangeStart="0x0">
-        <Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x13B6C0" SequenceTableOffset="0x13BB70" SampleBankTableOffset="0x13C380" SequenceFontTableOffset="0x13B960">
-            <Sequences>
-                <Sequence Name="Sequence_0"/>
-                <Sequence Name="Sequence_1"/>
-                <Sequence Name="Sequence_2"/>
-                <Sequence Name="Sequence_3"/>
-                <Sequence Name="Sequence_4"/>
-                <Sequence Name="Sequence_5"/>
-                <Sequence Name="Sequence_6"/>
-                <Sequence Name="Sequence_7"/>
-                <Sequence Name="Sequence_8"/>
-                <Sequence Name="Sequence_9"/>
-                <Sequence Name="Sequence_10"/>
-                <Sequence Name="Sequence_11"/>
-                <Sequence Name="Sequence_12"/>
-                <Sequence Name="Sequence_13"/>
-                <Sequence Name="Sequence_14"/>
-                <Sequence Name="Sequence_15"/>
-                <Sequence Name="Sequence_16"/>
-                <Sequence Name="Sequence_17"/>
-                <Sequence Name="Sequence_18"/>
-                <Sequence Name="Sequence_19"/>
-                <Sequence Name="Sequence_20"/>
-                <Sequence Name="Sequence_21"/>
-                <Sequence Name="Sequence_22"/>
-                <Sequence Name="Sequence_23"/>
-                <Sequence Name="Sequence_24"/>
-                <Sequence Name="Sequence_25"/>
-                <Sequence Name="Sequence_26"/>
-                <Sequence Name="Sequence_27"/>
-                <Sequence Name="Sequence_28"/>
-                <Sequence Name="Sequence_29"/>
-                <Sequence Name="Sequence_30"/>
-                <Sequence Name="Sequence_31"/>
-                <Sequence Name="Sequence_32"/>
-                <Sequence Name="Sequence_33"/>
-                <Sequence Name="Sequence_34"/>
-                <Sequence Name="Sequence_35"/>
-                <Sequence Name="Sequence_36"/>
-                <Sequence Name="Sequence_37"/>
-                <Sequence Name="Sequence_38"/>
-                <Sequence Name="Sequence_39"/>
-                <Sequence Name="Sequence_40"/>
-                <Sequence Name="Sequence_41"/>
-                <Sequence Name="Sequence_42"/>
-                <Sequence Name="Sequence_43"/>
-                <Sequence Name="Sequence_44"/>
-                <Sequence Name="Sequence_45"/>
-                <Sequence Name="Sequence_46"/>
-                <Sequence Name="Sequence_47"/>
-                <Sequence Name="Sequence_48"/>
-                <Sequence Name="Sequence_49"/>
-                <Sequence Name="Sequence_50"/>
-                <Sequence Name="Sequence_51"/>
-                <Sequence Name="Sequence_52"/>
-                <Sequence Name="Sequence_53"/>
-                <Sequence Name="Sequence_54"/>
-                <Sequence Name="Sequence_55"/>
-                <Sequence Name="Sequence_56"/>
-                <Sequence Name="Sequence_57"/>
-                <Sequence Name="Sequence_58"/>
-                <Sequence Name="Sequence_59"/>
-                <Sequence Name="Sequence_60"/>
-                <Sequence Name="Sequence_61"/>
-                <Sequence Name="Sequence_62"/>
-                <Sequence Name="Sequence_63"/>
-                <Sequence Name="Sequence_64"/>
-                <Sequence Name="Sequence_65"/>
-                <Sequence Name="Sequence_66"/>
-                <Sequence Name="Sequence_67"/>
-                <Sequence Name="Sequence_68"/>
-                <Sequence Name="Sequence_69"/>
-                <Sequence Name="Sequence_70"/>
-                <Sequence Name="Sequence_71"/>
-                <Sequence Name="Sequence_72"/>
-                <Sequence Name="Sequence_73"/>
-                <Sequence Name="Sequence_74"/>
-                <Sequence Name="Sequence_75"/>
-                <Sequence Name="Sequence_76"/>
-                <Sequence Name="Sequence_77"/>
-                <Sequence Name="Sequence_78"/>
-                <Sequence Name="Sequence_79"/>
-                <Sequence Name="Sequence_80"/>
-                <Sequence Name="Sequence_81"/>
-                <Sequence Name="Sequence_82"/>
-                <Sequence Name="Sequence_83"/>
-                <Sequence Name="Sequence_84"/>
-                <Sequence Name="Sequence_85"/>
-                <Sequence Name="Sequence_86"/>
-                <Sequence Name="Sequence_87"/>
-                <Sequence Name="Sequence_88"/>
-                <Sequence Name="Sequence_89"/>
-                <Sequence Name="Sequence_90"/>
-                <Sequence Name="Sequence_91"/>
-                <Sequence Name="Sequence_92"/>
-                <Sequence Name="Sequence_93"/>
-                <Sequence Name="Sequence_94"/>
-                <Sequence Name="Sequence_95"/>
-                <Sequence Name="Sequence_96"/>
-                <Sequence Name="Sequence_97"/>
-                <Sequence Name="Sequence_98"/>
-                <Sequence Name="Sequence_99"/>
-                <Sequence Name="Sequence_100"/>
-                <Sequence Name="Sequence_101"/>
-                <Sequence Name="Sequence_102"/>
-                <Sequence Name="Sequence_103"/>
-                <Sequence Name="Sequence_104"/>
-                <Sequence Name="Sequence_105"/>
-                <Sequence Name="Sequence_106"/>
-                <Sequence Name="Sequence_107"/>
-                <Sequence Name="Sequence_108"/>
-                <Sequence Name="Sequence_109"/>
-                <Sequence Name="Sequence_110"/>
-                <Sequence Name="Sequence_111"/>
-                <Sequence Name="Sequence_112"/>
-                <Sequence Name="Sequence_113"/>
-                <Sequence Name="Sequence_114"/>
-                <Sequence Name="Sequence_115"/>
-                <Sequence Name="Sequence_116"/>
-                <Sequence Name="Sequence_117"/>
-                <Sequence Name="Sequence_118"/>
-                <Sequence Name="Sequence_119"/>
-                <Sequence Name="Sequence_120"/>
-                <Sequence Name="Sequence_121"/>
-                <Sequence Name="Sequence_122"/>
-                <Sequence Name="Sequence_123"/>
-                <Sequence Name="Sequence_124"/>
-                <Sequence Name="Sequence_125"/>
-                <Sequence Name="Sequence_126"/>
-                <Sequence Name="Sequence_127"/>
-            </Sequences>
-            <Samples Bank="0">
-                <Sample Name="Sample_0">
-                    <Offset Version="MQDebug" At="0x0" LoopOffset="0x80"/>
-                </Sample>
-                <Sample Name="Sample_1">
-                    <Offset Version="MQDebug" At="0x0" LoopOffset="0xC0"/>
-                </Sample>
-                <Sample Name="Sample_2">
-                    <Offset Version="MQDebug" At="0x0" LoopOffset="0x1EA0"/>
-                </Sample>
-                <Sample Name="Sample_3">
-                    <Offset Version="MQDebug" At="0x6E0" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_4">
-                    <Offset Version="MQDebug" At="0x6E0" LoopOffset="0x1DA0"/>
-                </Sample>
-                <Sample Name="Sample_5">
-                    <Offset Version="MQDebug" At="0x8B0" LoopOffset="0x1A0"/>
-                </Sample>
-                <Sample Name="Sample_6">
-                    <Offset Version="MQDebug" At="0x8B0" LoopOffset="0x1E10"/>
-                </Sample>
-                <Sample Name="Sample_7">
-                    <Offset Version="MQDebug" At="0xDA0"/>
-                </Sample>
-                <Sample Name="Sample_8">
-                    <Offset Version="MQDebug" At="0x1870"/>
-                </Sample>
-                <Sample Name="Sample_9">
-                    <Offset Version="MQDebug" At="0x21B0"/>
-                </Sample>
-                <Sample Name="Sample_10">
-                    <Offset Version="MQDebug" At="0x2540"/>
-                </Sample>
-                <Sample Name="Sample_11">
-                    <Offset Version="MQDebug" At="0x2FF0"/>
-                </Sample>
-                <Sample Name="Sample_12">
-                    <Offset Version="MQDebug" At="0x4530"/>
-                </Sample>
-                <Sample Name="Sample_13">
-                    <Offset Version="MQDebug" At="0x4800"/>
-                </Sample>
-                <Sample Name="Sample_14">
-                    <Offset Version="MQDebug" At="0x5760"/>
-                </Sample>
-                <Sample Name="Sample_15">
-                    <Offset Version="MQDebug" At="0x72D0"/>
-                </Sample>
-                <Sample Name="Sample_16">
-                    <Offset Version="MQDebug" At="0x7AB0"/>
-                </Sample>
-                <Sample Name="Sample_17">
-                    <Offset Version="MQDebug" At="0x7B70"/>
-                </Sample>
-                <Sample Name="Sample_18">
-                    <Offset Version="MQDebug" At="0x8630"/>
-                </Sample>
-                <Sample Name="Sample_19">
-                    <Offset Version="MQDebug" At="0x9010"/>
-                </Sample>
-                <Sample Name="Sample_20">
-                    <Offset Version="MQDebug" At="0xA570"/>
-                </Sample>
-                <Sample Name="Sample_21">
-                    <Offset Version="MQDebug" At="0xAB90"/>
-                </Sample>
-                <Sample Name="Sample_22">
-                    <Offset Version="MQDebug" At="0x11260"/>
-                </Sample>
-                <Sample Name="Sample_23">
-                    <Offset Version="MQDebug" At="0x13A90" LoopOffset="0x7A0"/>
-                </Sample>
-                <Sample Name="Sample_24">
-                    <Offset Version="MQDebug" At="0x13A90" LoopOffset="0x14E0"/>
-                </Sample>
-                <Sample Name="Sample_25">
-                    <Offset Version="MQDebug" At="0x17360" LoopOffset="0x830"/>
-                </Sample>
-                <Sample Name="Sample_26">
-                    <Offset Version="MQDebug" At="0x17360" LoopOffset="0x1570"/>
-                </Sample>
-                <Sample Name="Sample_27">
-                    <Offset Version="MQDebug" At="0x1D040" LoopOffset="0x8C0"/>
-                </Sample>
-                <Sample Name="Sample_28">
-                    <Offset Version="MQDebug" At="0x1D040" LoopOffset="0x1450"/>
-                </Sample>
-                <Sample Name="Sample_29">
-                    <Offset Version="MQDebug" At="0x237D0" LoopOffset="0x990"/>
-                </Sample>
-                <Sample Name="Sample_30">
-                    <Offset Version="MQDebug" At="0x237D0" LoopOffset="0x2030"/>
-                </Sample>
-                <Sample Name="Sample_31">
-                    <Offset Version="MQDebug" At="0x237D0" LoopOffset="0x15B0"/>
-                </Sample>
-                <Sample Name="Sample_32">
-                    <Offset Version="MQDebug" At="0x293C0" LoopOffset="0x9D0"/>
-                </Sample>
-                <Sample Name="Sample_33">
-                    <Offset Version="MQDebug" At="0x293C0" LoopOffset="0x1180"/>
-                </Sample>
-                <Sample Name="Sample_34">
-                    <Offset Version="MQDebug" At="0x2D060" LoopOffset="0xA40"/>
-                </Sample>
-                <Sample Name="Sample_35">
-                    <Offset Version="MQDebug" At="0x2D060" LoopOffset="0x2140"/>
-                </Sample>
-                <Sample Name="Sample_36">
-                    <Offset Version="MQDebug" At="0x2E330"/>
-                </Sample>
-                <Sample Name="Sample_37">
-                    <Offset Version="MQDebug" At="0x2ECB0"/>
-                </Sample>
-                <Sample Name="Sample_38">
-                    <Offset Version="MQDebug" At="0x2F740"/>
-                </Sample>
-                <Sample Name="Sample_39">
-                    <Offset Version="MQDebug" At="0x2FFD0"/>
-                </Sample>
-                <Sample Name="Sample_40">
-                    <Offset Version="MQDebug" At="0x30A70" LoopOffset="0x1FB0"/>
-                </Sample>
-                <Sample Name="Sample_41">
-                    <Offset Version="MQDebug" At="0x30A70" LoopOffset="0x310"/>
-                </Sample>
-                <Sample Name="Sample_42">
-                    <Offset Version="MQDebug" At="0x314C0" LoopOffset="0x1EC0"/>
-                </Sample>
-                <Sample Name="Sample_43">
-                    <Offset Version="MQDebug" At="0x314C0" LoopOffset="0x330"/>
-                </Sample>
-                <Sample Name="Sample_44">
-                    <Offset Version="MQDebug" At="0x319F0"/>
-                </Sample>
-                <Sample Name="Sample_45">
-                    <Offset Version="MQDebug" At="0x31CA0"/>
-                </Sample>
-                <Sample Name="Sample_46">
-                    <Offset Version="MQDebug" At="0x33970"/>
-                </Sample>
-                <Sample Name="Sample_47">
-                    <Offset Version="MQDebug" At="0x367E0"/>
-                </Sample>
-                <Sample Name="Sample_48">
-                    <Offset Version="MQDebug" At="0x38810"/>
-                </Sample>
-                <Sample Name="Sample_49">
-                    <Offset Version="MQDebug" At="0x3A4E0"/>
-                </Sample>
-                <Sample Name="Sample_50">
-                    <Offset Version="MQDebug" At="0x3A670"/>
-                </Sample>
-                <Sample Name="Sample_51">
-                    <Offset Version="MQDebug" At="0x3F760" LoopOffset="0x2090"/>
-                </Sample>
-                <Sample Name="Sample_52">
-                    <Offset Version="MQDebug" At="0x3F760" LoopOffset="0x450"/>
-                </Sample>
-                <Sample Name="Sample_53">
-                    <Offset Version="MQDebug" At="0x431E0"/>
-                </Sample>
-                <Sample Name="Sample_54">
-                    <Offset Version="MQDebug" At="0x45B70"/>
-                </Sample>
-                <Sample Name="Sample_55">
-                    <Offset Version="MQDebug" At="0x47CE0"/>
-                </Sample>
-                <Sample Name="Sample_56">
-                    <Offset Version="MQDebug" At="0x4B560"/>
-                </Sample>
-                <Sample Name="Sample_57">
-                    <Offset Version="MQDebug" At="0x4CB70" LoopOffset="0x1F70"/>
-                </Sample>
-                <Sample Name="Sample_58">
-                    <Offset Version="MQDebug" At="0x4CB70" LoopOffset="0x590"/>
-                </Sample>
-                <Sample Name="Sample_59">
-                    <Offset Version="MQDebug" At="0x50210"/>
-                </Sample>
-                <Sample Name="Sample_60">
-                    <Offset Version="MQDebug" At="0x51B60"/>
-                </Sample>
-                <Sample Name="Sample_61">
-                    <Offset Version="MQDebug" At="0x53320"/>
-                </Sample>
-                <Sample Name="Sample_62">
-                    <Offset Version="MQDebug" At="0x53B40"/>
-                </Sample>
-                <Sample Name="Sample_63">
-                    <Offset Version="MQDebug" At="0x545D0"/>
-                </Sample>
-                <Sample Name="Sample_64">
-                    <Offset Version="MQDebug" At="0x54BE0"/>
-                </Sample>
-                <Sample Name="Sample_65">
-                    <Offset Version="MQDebug" At="0x55600" LoopOffset="0x1F30"/>
-                </Sample>
-                <Sample Name="Sample_66">
-                    <Offset Version="MQDebug" At="0x55600" LoopOffset="0x730"/>
-                </Sample>
-                <Sample Name="Sample_67">
-                    <Offset Version="MQDebug" At="0x56D70"/>
-                </Sample>
-                <Sample Name="Sample_68">
-                    <Offset Version="MQDebug" At="0x57CE0"/>
-                </Sample>
-                <Sample Name="Sample_69">
-                    <Offset Version="MQDebug" At="0x58AB0"/>
-                </Sample>
-                <Sample Name="Sample_70">
-                    <Offset Version="MQDebug" At="0x593F0" LoopOffset="0x2070"/>
-                </Sample>
-                <Sample Name="Sample_71">
-                    <Offset Version="MQDebug" At="0x593F0" LoopOffset="0x900"/>
-                </Sample>
-                <Sample Name="Sample_72">
-                    <Offset Version="MQDebug" At="0x5A110" LoopOffset="0x2210"/>
-                </Sample>
-                <Sample Name="Sample_73">
-                    <Offset Version="MQDebug" At="0x5A110" LoopOffset="0x920"/>
-                </Sample>
-                <Sample Name="Sample_74">
-                    <Offset Version="MQDebug" At="0x5A580"/>
-                </Sample>
-                <Sample Name="Sample_75">
-                    <Offset Version="MQDebug" At="0x5B490" LoopOffset="0x21F0"/>
-                </Sample>
-                <Sample Name="Sample_76">
-                    <Offset Version="MQDebug" At="0x5B490" LoopOffset="0x960"/>
-                </Sample>
-                <Sample Name="Sample_77">
-                    <Offset Version="MQDebug" At="0x5CE50"/>
-                </Sample>
-                <Sample Name="Sample_78">
-                    <Offset Version="MQDebug" At="0x5D810"/>
-                </Sample>
-                <Sample Name="Sample_79">
-                    <Offset Version="MQDebug" At="0x5EA00"/>
-                </Sample>
-                <Sample Name="Sample_80">
-                    <Offset Version="MQDebug" At="0x61150"/>
-                </Sample>
-                <Sample Name="Sample_81">
-                    <Offset Version="MQDebug" At="0x62780"/>
-                </Sample>
-                <Sample Name="Sample_82">
-                    <Offset Version="MQDebug" At="0x63C70" LoopOffset="0x21B0"/>
-                </Sample>
-                <Sample Name="Sample_83">
-                    <Offset Version="MQDebug" At="0x63C70" LoopOffset="0xAE0"/>
-                </Sample>
-                <Sample Name="Sample_84">
-                    <Offset Version="MQDebug" At="0x652F0"/>
-                </Sample>
-                <Sample Name="Sample_85">
-                    <Offset Version="MQDebug" At="0x65E80"/>
-                </Sample>
-                <Sample Name="Sample_86">
-                    <Offset Version="MQDebug" At="0x692B0"/>
-                </Sample>
-                <Sample Name="Sample_87">
-                    <Offset Version="MQDebug" At="0x6B570" LoopOffset="0x2230"/>
-                </Sample>
-                <Sample Name="Sample_88">
-                    <Offset Version="MQDebug" At="0x6B570" LoopOffset="0xB80"/>
-                </Sample>
-                <Sample Name="Sample_89">
-                    <Offset Version="MQDebug" At="0x6D6D0"/>
-                </Sample>
-                <Sample Name="Sample_90">
-                    <Offset Version="MQDebug" At="0x6DF70" LoopOffset="0x2250"/>
-                </Sample>
-                <Sample Name="Sample_91">
-                    <Offset Version="MQDebug" At="0x6DF70" LoopOffset="0xBC0"/>
-                </Sample>
-                <Sample Name="Sample_92">
-                    <Offset Version="MQDebug" At="0x6F0E0"/>
-                </Sample>
-                <Sample Name="Sample_93">
-                    <Offset Version="MQDebug" At="0x702E0"/>
-                </Sample>
-                <Sample Name="Sample_94">
-                    <Offset Version="MQDebug" At="0x711B0"/>
-                </Sample>
-                <Sample Name="Sample_95">
-                    <Offset Version="MQDebug" At="0x72660"/>
-                </Sample>
-                <Sample Name="Sample_96">
-                    <Offset Version="MQDebug" At="0x75310"/>
-                </Sample>
-                <Sample Name="Sample_97">
-                    <Offset Version="MQDebug" At="0x75720"/>
-                </Sample>
-                <Sample Name="Sample_98">
-                    <Offset Version="MQDebug" At="0x76900"/>
-                </Sample>
-                <Sample Name="Sample_99">
-                    <Offset Version="MQDebug" At="0x76D30"/>
-                </Sample>
-                <Sample Name="Sample_100">
-                    <Offset Version="MQDebug" At="0x77A20"/>
-                </Sample>
-                <Sample Name="Sample_101">
-                    <Offset Version="MQDebug" At="0x77D60"/>
-                </Sample>
-                <Sample Name="Sample_102">
-                    <Offset Version="MQDebug" At="0x797C0"/>
-                </Sample>
-                <Sample Name="Sample_103">
-                    <Offset Version="MQDebug" At="0x7AB10"/>
-                </Sample>
-                <Sample Name="Sample_104">
-                    <Offset Version="MQDebug" At="0x7C0A0" LoopOffset="0x1FD0"/>
-                </Sample>
-                <Sample Name="Sample_105">
-                    <Offset Version="MQDebug" At="0x7C0A0" LoopOffset="0xEF0"/>
-                </Sample>
-                <Sample Name="Sample_106">
-                    <Offset Version="MQDebug" At="0x80760"/>
-                </Sample>
-                <Sample Name="Sample_107">
-                    <Offset Version="MQDebug" At="0x814C0"/>
-                </Sample>
-                <Sample Name="Sample_108">
-                    <Offset Version="MQDebug" At="0x854B0"/>
-                </Sample>
-                <Sample Name="Sample_109">
-                    <Offset Version="MQDebug" At="0x89FA0"/>
-                </Sample>
-                <Sample Name="Sample_110">
-                    <Offset Version="MQDebug" At="0x8CC10"/>
-                </Sample>
-                <Sample Name="Sample_111">
-                    <Offset Version="MQDebug" At="0x8DE50"/>
-                </Sample>
-                <Sample Name="Sample_112">
-                    <Offset Version="MQDebug" At="0x8EF40"/>
-                </Sample>
-                <Sample Name="Sample_113">
-                    <Offset Version="MQDebug" At="0x932B0"/>
-                </Sample>
-                <Sample Name="Sample_114">
-                    <Offset Version="MQDebug" At="0x94DA0"/>
-                </Sample>
-                <Sample Name="Sample_115">
-                    <Offset Version="MQDebug" At="0x96F60"/>
-                </Sample>
-                <Sample Name="Sample_116">
-                    <Offset Version="MQDebug" At="0x98460"/>
-                </Sample>
-                <Sample Name="Sample_117">
-                    <Offset Version="MQDebug" At="0x99D20"/>
-                </Sample>
-                <Sample Name="Sample_118">
-                    <Offset Version="MQDebug" At="0x9C9C0"/>
-                </Sample>
-                <Sample Name="Sample_119">
-                    <Offset Version="MQDebug" At="0x9CED0" LoopOffset="0x2380"/>
-                </Sample>
-                <Sample Name="Sample_120">
-                    <Offset Version="MQDebug" At="0x9CED0" LoopOffset="0x1200"/>
-                </Sample>
-                <Sample Name="Sample_121">
-                    <Offset Version="MQDebug" At="0x9DF50"/>
-                </Sample>
-                <Sample Name="Sample_122">
-                    <Offset Version="MQDebug" At="0x9EE40"/>
-                </Sample>
-                <Sample Name="Sample_123">
-                    <Offset Version="MQDebug" At="0xA06C0"/>
-                </Sample>
-                <Sample Name="Sample_124">
-                    <Offset Version="MQDebug" At="0xA2100"/>
-                </Sample>
-                <Sample Name="Sample_125">
-                    <Offset Version="MQDebug" At="0xA3B30"/>
-                </Sample>
-                <Sample Name="Sample_126">
-                    <Offset Version="MQDebug" At="0xAC2E0"/>
-                </Sample>
-                <Sample Name="Sample_127">
-                    <Offset Version="MQDebug" At="0xAD170"/>
-                </Sample>
-                <Sample Name="Sample_128">
-                    <Offset Version="MQDebug" At="0xB08F0" LoopOffset="0x1FF0"/>
-                </Sample>
-                <Sample Name="Sample_129">
-                    <Offset Version="MQDebug" At="0xB08F0" LoopOffset="0x1630"/>
-                </Sample>
-                <Sample Name="Sample_130">
-                    <Offset Version="MQDebug" At="0xB2F90"/>
-                </Sample>
-                <Sample Name="Sample_131">
-                    <Offset Version="MQDebug" At="0xB6920"/>
-                </Sample>
-                <Sample Name="Sample_132">
-                    <Offset Version="MQDebug" At="0xB7340"/>
-                </Sample>
-                <Sample Name="Sample_133">
-                    <Offset Version="MQDebug" At="0xB8FF0"/>
-                </Sample>
-                <Sample Name="Sample_134">
-                    <Offset Version="MQDebug" At="0xBA9D0"/>
-                </Sample>
-                <Sample Name="Sample_135">
-                    <Offset Version="MQDebug" At="0xBEEB0"/>
-                </Sample>
-                <Sample Name="Sample_136">
-                    <Offset Version="MQDebug" At="0xC1000"/>
-                </Sample>
-                <Sample Name="Sample_137">
-                    <Offset Version="MQDebug" At="0xC3320" LoopOffset="0x2290"/>
-                </Sample>
-                <Sample Name="Sample_138">
-                    <Offset Version="MQDebug" At="0xC3320" LoopOffset="0x1890"/>
-                </Sample>
-                <Sample Name="Sample_139">
-                    <Offset Version="MQDebug" At="0xC52B0"/>
-                </Sample>
-                <Sample Name="Sample_140">
-                    <Offset Version="MQDebug" At="0xC5910"/>
-                </Sample>
-                <Sample Name="Sample_141">
-                    <Offset Version="MQDebug" At="0xC6980" LoopOffset="0x20D0"/>
-                </Sample>
-                <Sample Name="Sample_142">
-                    <Offset Version="MQDebug" At="0xC6980" LoopOffset="0x1930"/>
-                </Sample>
-                <Sample Name="Sample_143">
-                    <Offset Version="MQDebug" At="0xCB570"/>
-                </Sample>
-                <Sample Name="Sample_144">
-                    <Offset Version="MQDebug" At="0xCBDE0"/>
-                </Sample>
-                <Sample Name="Sample_145">
-                    <Offset Version="MQDebug" At="0xCC3D0"/>
-                </Sample>
-                <Sample Name="Sample_146">
-                    <Offset Version="MQDebug" At="0xCDD60"/>
-                </Sample>
-                <Sample Name="Sample_147">
-                    <Offset Version="MQDebug" At="0xCF9A0"/>
-                </Sample>
-                <Sample Name="Sample_148">
-                    <Offset Version="MQDebug" At="0xD67A0"/>
-                </Sample>
-                <Sample Name="Sample_149">
-                    <Offset Version="MQDebug" At="0xDA370"/>
-                </Sample>
-                <Sample Name="Sample_150">
-                    <Offset Version="MQDebug" At="0xDBA30" LoopOffset="0x2320"/>
-                </Sample>
-                <Sample Name="Sample_151">
-                    <Offset Version="MQDebug" At="0xDBA30" LoopOffset="0x1BE0"/>
-                </Sample>
-                <Sample Name="Sample_152">
-                    <Offset Version="MQDebug" At="0xE02C0"/>
-                </Sample>
-                <Sample Name="Sample_153">
-                    <Offset Version="MQDebug" At="0xE0900"/>
-                </Sample>
-                <Sample Name="Sample_154">
-                    <Offset Version="MQDebug" At="0xE1960"/>
-                </Sample>
-                <Sample Name="Sample_155">
-                    <Offset Version="MQDebug" At="0xE2A20"/>
-                </Sample>
-                <Sample Name="Sample_156">
-                    <Offset Version="MQDebug" At="0xE3BA0"/>
-                </Sample>
-                <Sample Name="Sample_157">
-                    <Offset Version="MQDebug" At="0xE5BB0"/>
-                </Sample>
-                <Sample Name="Sample_158">
-                    <Offset Version="MQDebug" At="0xE64A0"/>
-                </Sample>
-                <Sample Name="Sample_159">
-                    <Offset Version="MQDebug" At="0xE8AB0"/>
-                </Sample>
-                <Sample Name="Sample_160">
-                    <Offset Version="MQDebug" At="0xE9940"/>
-                </Sample>
-                <Sample Name="Sample_161">
-                    <Offset Version="MQDebug" At="0xEA700"/>
-                </Sample>
-                <Sample Name="Sample_162">
-                    <Offset Version="MQDebug" At="0xEB5D0"/>
-                </Sample>
-                <Sample Name="Sample_163">
-                    <Offset Version="MQDebug" At="0xEC280"/>
-                </Sample>
-                <Sample Name="Sample_164">
-                    <Offset Version="MQDebug" At="0xEDED0"/>
-                </Sample>
-                <Sample Name="Sample_165">
-                    <Offset Version="MQDebug" At="0xEE7A0"/>
-                </Sample>
-                <Sample Name="Sample_166">
-                    <Offset Version="MQDebug" At="0xF09A0"/>
-                </Sample>
-                <Sample Name="Sample_167">
-                    <Offset Version="MQDebug" At="0xF14B0"/>
-                </Sample>
-                <Sample Name="Sample_168">
-                    <Offset Version="MQDebug" At="0xF2B20"/>
-                </Sample>
-                <Sample Name="Sample_169">
-                    <Offset Version="MQDebug" At="0xF4810"/>
-                </Sample>
-                <Sample Name="Sample_170">
-                    <Offset Version="MQDebug" At="0xF4A30"/>
-                </Sample>
-                <Sample Name="Sample_171">
-                    <Offset Version="MQDebug" At="0xF4C10"/>
-                </Sample>
-                <Sample Name="Sample_172">
-                    <Offset Version="MQDebug" At="0xF9070"/>
-                </Sample>
-                <Sample Name="Sample_173">
-                    <Offset Version="MQDebug" At="0xFB3E0"/>
-                </Sample>
-                <Sample Name="Sample_174">
-                    <Offset Version="MQDebug" At="0xFBB20"/>
-                </Sample>
-                <Sample Name="Sample_175">
-                    <Offset Version="MQDebug" At="0xFD330"/>
-                </Sample>
-                <Sample Name="Sample_176">
-                    <Offset Version="MQDebug" At="0x100DD0"/>
-                </Sample>
-                <Sample Name="Sample_177">
-                    <Offset Version="MQDebug" At="0x102290"/>
-                </Sample>
-                <Sample Name="Sample_178">
-                    <Offset Version="MQDebug" At="0x104620"/>
-                </Sample>
-                <Sample Name="Sample_179">
-                    <Offset Version="MQDebug" At="0x107050"/>
-                </Sample>
-                <Sample Name="Sample_180">
-                    <Offset Version="MQDebug" At="0x108620"/>
-                </Sample>
-                <Sample Name="Sample_181">
-                    <Offset Version="MQDebug" At="0x10A780"/>
-                </Sample>
-                <Sample Name="Sample_182">
-                    <Offset Version="MQDebug" At="0x10B800"/>
-                </Sample>
-                <Sample Name="Sample_183">
-                    <Offset Version="MQDebug" At="0x10CA60"/>
-                </Sample>
-                <Sample Name="Sample_184">
-                    <Offset Version="MQDebug" At="0x10DB90"/>
-                </Sample>
-                <Sample Name="Sample_185">
-                    <Offset Version="MQDebug" At="0x10EAF0"/>
-                </Sample>
-                <Sample Name="Sample_186">
-                    <Offset Version="MQDebug" At="0x10FF20"/>
-                </Sample>
-                <Sample Name="Sample_187">
-                    <Offset Version="MQDebug" At="0x110920"/>
-                </Sample>
-                <Sample Name="Sample_188">
-                    <Offset Version="MQDebug" At="0x111BE0"/>
-                </Sample>
-                <Sample Name="Sample_189">
-                    <Offset Version="MQDebug" At="0x112A50"/>
-                </Sample>
-                <Sample Name="Sample_190">
-                    <Offset Version="MQDebug" At="0x1140E0"/>
-                </Sample>
-                <Sample Name="Sample_191">
-                    <Offset Version="MQDebug" At="0x114790"/>
-                </Sample>
-                <Sample Name="Sample_192">
-                    <Offset Version="MQDebug" At="0x114E20"/>
-                </Sample>
-                <Sample Name="Sample_193">
-                    <Offset Version="MQDebug" At="0x1166D0"/>
-                </Sample>
-                <Sample Name="Sample_194">
-                    <Offset Version="MQDebug" At="0x1195A0"/>
-                </Sample>
-                <Sample Name="Sample_195">
-                    <Offset Version="MQDebug" At="0x11AD20"/>
-                </Sample>
-                <Sample Name="Sample_196">
-                    <Offset Version="MQDebug" At="0x11DA10" LoopOffset="0x1D30"/>
-                </Sample>
-                <Sample Name="Sample_197">
-                    <Offset Version="MQDebug" At="0x11DA10" LoopOffset="0x2A70"/>
-                </Sample>
-                <Sample Name="Sample_198">
-                    <Offset Version="MQDebug" At="0x11EA00"/>
-                </Sample>
-                <Sample Name="Sample_199">
-                    <Offset Version="MQDebug" At="0x11FA20"/>
-                </Sample>
-                <Sample Name="Sample_200">
-                    <Offset Version="MQDebug" At="0x120FA0"/>
-                </Sample>
-                <Sample Name="Sample_201">
-                    <Offset Version="MQDebug" At="0x122370"/>
-                </Sample>
-                <Sample Name="Sample_202">
-                    <Offset Version="MQDebug" At="0x122E70"/>
-                </Sample>
-                <Sample Name="Sample_203">
-                    <Offset Version="MQDebug" At="0x124070"/>
-                </Sample>
-                <Sample Name="Sample_204">
-                    <Offset Version="MQDebug" At="0x1268E0"/>
-                </Sample>
-                <Sample Name="Sample_205">
-                    <Offset Version="MQDebug" At="0x127730"/>
-                </Sample>
-                <Sample Name="Sample_206">
-                    <Offset Version="MQDebug" At="0x128990"/>
-                </Sample>
-                <Sample Name="Sample_207">
-                    <Offset Version="MQDebug" At="0x1298F0"/>
-                </Sample>
-                <Sample Name="Sample_208">
-                    <Offset Version="MQDebug" At="0x12B5D0"/>
-                </Sample>
-                <Sample Name="Sample_209">
-                    <Offset Version="MQDebug" At="0x12E040"/>
-                </Sample>
-                <Sample Name="Sample_210">
-                    <Offset Version="MQDebug" At="0x130340"/>
-                </Sample>
-                <Sample Name="Sample_211">
-                    <Offset Version="MQDebug" At="0x1324D0"/>
-                </Sample>
-                <Sample Name="Sample_212">
-                    <Offset Version="MQDebug" At="0x1347A0"/>
-                </Sample>
-                <Sample Name="Sample_213">
-                    <Offset Version="MQDebug" At="0x136B70"/>
-                </Sample>
-                <Sample Name="Sample_214">
-                    <Offset Version="MQDebug" At="0x13D8F0"/>
-                </Sample>
-                <Sample Name="Sample_215">
-                    <Offset Version="MQDebug" At="0x148670" LoopOffset="0x2360"/>
-                </Sample>
-                <Sample Name="Sample_216">
-                    <Offset Version="MQDebug" At="0x148670" LoopOffset="0x31B0"/>
-                </Sample>
-                <Sample Name="Sample_217">
-                    <Offset Version="MQDebug" At="0x14E930"/>
-                </Sample>
-                <Sample Name="Sample_218">
-                    <Offset Version="MQDebug" At="0x14F570"/>
-                </Sample>
-                <Sample Name="Sample_219">
-                    <Offset Version="MQDebug" At="0x1501C0"/>
-                </Sample>
-                <Sample Name="Sample_220">
-                    <Offset Version="MQDebug" At="0x151570"/>
-                </Sample>
-                <Sample Name="Sample_221">
-                    <Offset Version="MQDebug" At="0x1535B0"/>
-                </Sample>
-                <Sample Name="Sample_222">
-                    <Offset Version="MQDebug" At="0x154750"/>
-                </Sample>
-                <Sample Name="Sample_223">
-                    <Offset Version="MQDebug" At="0x156730"/>
-                </Sample>
-                <Sample Name="Sample_224">
-                    <Offset Version="MQDebug" At="0x15D360" LoopOffset="0x1CC0"/>
-                </Sample>
-                <Sample Name="Sample_225">
-                    <Offset Version="MQDebug" At="0x15D360" LoopOffset="0x3530"/>
-                </Sample>
-                <Sample Name="Sample_226">
-                    <Offset Version="MQDebug" At="0x160600"/>
-                </Sample>
-                <Sample Name="Sample_227">
-                    <Offset Version="MQDebug" At="0x160C70"/>
-                </Sample>
-                <Sample Name="Sample_228">
-                    <Offset Version="MQDebug" At="0x160EE0"/>
-                </Sample>
-                <Sample Name="Sample_229">
-                    <Offset Version="MQDebug" At="0x162630"/>
-                </Sample>
-                <Sample Name="Sample_230">
-                    <Offset Version="MQDebug" At="0x163780"/>
-                </Sample>
-                <Sample Name="Sample_231">
-                    <Offset Version="MQDebug" At="0x164A40"/>
-                </Sample>
-                <Sample Name="Sample_232">
-                    <Offset Version="MQDebug" At="0x1655C0"/>
-                </Sample>
-                <Sample Name="Sample_233">
-                    <Offset Version="MQDebug" At="0x165E10"/>
-                </Sample>
-                <Sample Name="Sample_234">
-                    <Offset Version="MQDebug" At="0x166440"/>
-                </Sample>
-                <Sample Name="Sample_235">
-                    <Offset Version="MQDebug" At="0x167D90"/>
-                </Sample>
-                <Sample Name="Sample_236">
-                    <Offset Version="MQDebug" At="0x1697D0"/>
-                </Sample>
-                <Sample Name="Sample_237">
-                    <Offset Version="MQDebug" At="0x16B850"/>
-                </Sample>
-                <Sample Name="Sample_238">
-                    <Offset Version="MQDebug" At="0x16CF30"/>
-                </Sample>
-                <Sample Name="Sample_239">
-                    <Offset Version="MQDebug" At="0x16E5D0"/>
-                </Sample>
-                <Sample Name="Sample_240">
-                    <Offset Version="MQDebug" At="0x16FDF0"/>
-                </Sample>
-                <Sample Name="Sample_241">
-                    <Offset Version="MQDebug" At="0x170C00"/>
-                </Sample>
-                <Sample Name="Sample_242">
-                    <Offset Version="MQDebug" At="0x172180"/>
-                </Sample>
-                <Sample Name="Sample_243">
-                    <Offset Version="MQDebug" At="0x173AF0"/>
-                </Sample>
-                <Sample Name="Sample_244">
-                    <Offset Version="MQDebug" At="0x174F90"/>
-                </Sample>
-                <Sample Name="Sample_245">
-                    <Offset Version="MQDebug" At="0x176090"/>
-                </Sample>
-                <Sample Name="Sample_246">
-                    <Offset Version="MQDebug" At="0x1768B0"/>
-                </Sample>
-                <Sample Name="Sample_247">
-                    <Offset Version="MQDebug" At="0x1787C0"/>
-                </Sample>
-                <Sample Name="Sample_248">
-                    <Offset Version="MQDebug" At="0x17AF50"/>
-                </Sample>
-                <Sample Name="Sample_249">
-                    <Offset Version="MQDebug" At="0x17C5F0"/>
-                </Sample>
-                <Sample Name="Sample_250">
-                    <Offset Version="MQDebug" At="0x1805C0"/>
-                </Sample>
-                <Sample Name="Sample_251">
-                    <Offset Version="MQDebug" At="0x185470"/>
-                </Sample>
-                <Sample Name="Sample_252">
-                    <Offset Version="MQDebug" At="0x186A90"/>
-                </Sample>
-                <Sample Name="Sample_253">
-                    <Offset Version="MQDebug" At="0x188150"/>
-                </Sample>
-                <Sample Name="Sample_254">
-                    <Offset Version="MQDebug" At="0x18A6A0"/>
-                </Sample>
-                <Sample Name="Sample_255">
-                    <Offset Version="MQDebug" At="0x18CB50"/>
-                </Sample>
-                <Sample Name="Sample_256">
-                    <Offset Version="MQDebug" At="0x18DC40"/>
-                </Sample>
-                <Sample Name="Sample_257">
-                    <Offset Version="MQDebug" At="0x18F630"/>
-                </Sample>
-                <Sample Name="Sample_258">
-                    <Offset Version="MQDebug" At="0x190A20"/>
-                </Sample>
-                <Sample Name="Sample_259">
-                    <Offset Version="MQDebug" At="0x1927A0"/>
-                </Sample>
-                <Sample Name="Sample_260">
-                    <Offset Version="MQDebug" At="0x195E60"/>
-                </Sample>
-                <Sample Name="Sample_261">
-                    <Offset Version="MQDebug" At="0x198A10"/>
-                </Sample>
-                <Sample Name="Sample_262">
-                    <Offset Version="MQDebug" At="0x199200"/>
-                </Sample>
-                <Sample Name="Sample_263">
-                    <Offset Version="MQDebug" At="0x199980"/>
-                </Sample>
-                <Sample Name="Sample_264">
-                    <Offset Version="MQDebug" At="0x19A5F0"/>
-                </Sample>
-                <Sample Name="Sample_265">
-                    <Offset Version="MQDebug" At="0x1A0D90"/>
-                </Sample>
-                <Sample Name="Sample_266">
-                    <Offset Version="MQDebug" At="0x1A2D30"/>
-                </Sample>
-                <Sample Name="Sample_267">
-                    <Offset Version="MQDebug" At="0x1A3C40"/>
-                </Sample>
-                <Sample Name="Sample_268">
-                    <Offset Version="MQDebug" At="0x1A88A0"/>
-                </Sample>
-                <Sample Name="Sample_269">
-                    <Offset Version="MQDebug" At="0x1A9080"/>
-                </Sample>
-                <Sample Name="Sample_270">
-                    <Offset Version="MQDebug" At="0x1B09A0"/>
-                </Sample>
-                <Sample Name="Sample_271">
-                    <Offset Version="MQDebug" At="0x1B15A0"/>
-                </Sample>
-                <Sample Name="Sample_272">
-                    <Offset Version="MQDebug" At="0x1B5610"/>
-                </Sample>
-                <Sample Name="Sample_273">
-                    <Offset Version="MQDebug" At="0x1B7BF0"/>
-                </Sample>
-                <Sample Name="Sample_274">
-                    <Offset Version="MQDebug" At="0x1BD8E0"/>
-                </Sample>
-                <Sample Name="Sample_275">
-                    <Offset Version="MQDebug" At="0x1C0D40"/>
-                </Sample>
-                <Sample Name="Sample_276">
-                    <Offset Version="MQDebug" At="0x1C3040"/>
-                </Sample>
-                <Sample Name="Sample_277">
-                    <Offset Version="MQDebug" At="0x1C49D0"/>
-                </Sample>
-                <Sample Name="Sample_278">
-                    <Offset Version="MQDebug" At="0x1C75D0"/>
-                </Sample>
-                <Sample Name="Sample_279">
-                    <Offset Version="MQDebug" At="0x1CA900"/>
-                </Sample>
-                <Sample Name="Sample_280">
-                    <Offset Version="MQDebug" At="0x1CC4C0"/>
-                </Sample>
-                <Sample Name="Sample_281">
-                    <Offset Version="MQDebug" At="0x1CD430"/>
-                </Sample>
-                <Sample Name="Sample_282">
-                    <Offset Version="MQDebug" At="0x1D06C0"/>
-                </Sample>
-                <Sample Name="Sample_283">
-                    <Offset Version="MQDebug" At="0x1D0B80" LoopOffset="0x23C0"/>
-                </Sample>
-                <Sample Name="Sample_284">
-                    <Offset Version="MQDebug" At="0x1D0B80" LoopOffset="0x4730"/>
-                </Sample>
-                <Sample Name="Sample_285">
-                    <Offset Version="MQDebug" At="0x1D17F0" LoopOffset="0x23E0"/>
-                </Sample>
-                <Sample Name="Sample_286">
-                    <Offset Version="MQDebug" At="0x1D17F0" LoopOffset="0x4750"/>
-                </Sample>
-                <Sample Name="Sample_287">
-                    <Offset Version="MQDebug" At="0x1D1F50"/>
-                </Sample>
-                <Sample Name="Sample_288">
-                    <Offset Version="MQDebug" At="0x1D30F0"/>
-                </Sample>
-                <Sample Name="Sample_289">
-                    <Offset Version="MQDebug" At="0x1D5770"/>
-                </Sample>
-                <Sample Name="Sample_290">
-                    <Offset Version="MQDebug" At="0x1D60E0"/>
-                </Sample>
-                <Sample Name="Sample_291">
-                    <Offset Version="MQDebug" At="0x1D6B50"/>
-                </Sample>
-                <Sample Name="Sample_292">
-                    <Offset Version="MQDebug" At="0x1D86D0"/>
-                </Sample>
-                <Sample Name="Sample_293">
-                    <Offset Version="MQDebug" At="0x1D9450"/>
-                </Sample>
-                <Sample Name="Sample_294">
-                    <Offset Version="MQDebug" At="0x1DAE00" LoopOffset="0x2420"/>
-                </Sample>
-                <Sample Name="Sample_295">
-                    <Offset Version="MQDebug" At="0x1DAE00" LoopOffset="0x4850"/>
-                </Sample>
-                <Sample Name="Sample_296">
-                    <Offset Version="MQDebug" At="0x1DC810"/>
-                </Sample>
-                <Sample Name="Sample_297">
-                    <Offset Version="MQDebug" At="0x1DD590"/>
-                </Sample>
-                <Sample Name="Sample_298">
-                    <Offset Version="MQDebug" At="0x1DEE90"/>
-                </Sample>
-                <Sample Name="Sample_299">
-                    <Offset Version="MQDebug" At="0x1E0470"/>
-                </Sample>
-                <Sample Name="Sample_300">
-                    <Offset Version="MQDebug" At="0x1E1970"/>
-                </Sample>
-                <Sample Name="Sample_301">
-                    <Offset Version="MQDebug" At="0x1E25A0"/>
-                </Sample>
-                <Sample Name="Sample_302">
-                    <Offset Version="MQDebug" At="0x1E2DE0"/>
-                </Sample>
-                <Sample Name="Sample_303">
-                    <Offset Version="MQDebug" At="0x1E36F0"/>
-                </Sample>
-                <Sample Name="Sample_304">
-                    <Offset Version="MQDebug" At="0x1E4670"/>
-                </Sample>
-                <Sample Name="Sample_305">
-                    <Offset Version="MQDebug" At="0x1E5DB0"/>
-                </Sample>
-                <Sample Name="Sample_306">
-                    <Offset Version="MQDebug" At="0x1E6D70"/>
-                </Sample>
-                <Sample Name="Sample_307">
-                    <Offset Version="MQDebug" At="0x1E73C0"/>
-                </Sample>
-                <Sample Name="Sample_308">
-                    <Offset Version="MQDebug" At="0x1E91E0"/>
-                </Sample>
-                <Sample Name="Sample_309">
-                    <Offset Version="MQDebug" At="0x1EAB30"/>
-                </Sample>
-                <Sample Name="Sample_310">
-                    <Offset Version="MQDebug" At="0x1EC5F0"/>
-                </Sample>
-                <Sample Name="Sample_311">
-                    <Offset Version="MQDebug" At="0x1EDCF0"/>
-                </Sample>
-                <Sample Name="Sample_312">
-                    <Offset Version="MQDebug" At="0x1EF070"/>
-                </Sample>
-                <Sample Name="Sample_313">
-                    <Offset Version="MQDebug" At="0x1F2690"/>
-                </Sample>
-                <Sample Name="Sample_314">
-                    <Offset Version="MQDebug" At="0x1F3E20"/>
-                </Sample>
-                <Sample Name="Sample_315">
-                    <Offset Version="MQDebug" At="0x1F4B70"/>
-                </Sample>
-                <Sample Name="Sample_316">
-                    <Offset Version="MQDebug" At="0x1F6770"/>
-                </Sample>
-                <Sample Name="Sample_317">
-                    <Offset Version="MQDebug" At="0x1F77E0"/>
-                </Sample>
-                <Sample Name="Sample_318">
-                    <Offset Version="MQDebug" At="0x1F87A0"/>
-                </Sample>
-                <Sample Name="Sample_319">
-                    <Offset Version="MQDebug" At="0x1FA1F0"/>
-                </Sample>
-                <Sample Name="Sample_320">
-                    <Offset Version="MQDebug" At="0x1FAD30"/>
-                </Sample>
-                <Sample Name="Sample_321">
-                    <Offset Version="MQDebug" At="0x1FB0D0"/>
-                </Sample>
-                <Sample Name="Sample_322">
-                    <Offset Version="MQDebug" At="0x1FBD20"/>
-                </Sample>
-                <Sample Name="Sample_323">
-                    <Offset Version="MQDebug" At="0x1FC4C0"/>
-                </Sample>
-                <Sample Name="Sample_324">
-                    <Offset Version="MQDebug" At="0x1FD3F0"/>
-                </Sample>
-                <Sample Name="Sample_325">
-                    <Offset Version="MQDebug" At="0x1FDBC0"/>
-                </Sample>
-                <Sample Name="Sample_326">
-                    <Offset Version="MQDebug" At="0x1FE390"/>
-                </Sample>
-                <Sample Name="Sample_327">
-                    <Offset Version="MQDebug" At="0x1FF3F0"/>
-                </Sample>
-                <Sample Name="Sample_328">
-                    <Offset Version="MQDebug" At="0x200050"/>
-                </Sample>
-                <Sample Name="Sample_329">
-                    <Offset Version="MQDebug" At="0x2009F0"/>
-                </Sample>
-                <Sample Name="Sample_330">
-                    <Offset Version="MQDebug" At="0x2027D0"/>
-                </Sample>
-                <Sample Name="Sample_331">
-                    <Offset Version="MQDebug" At="0x2043E0"/>
-                </Sample>
-                <Sample Name="Sample_332">
-                    <Offset Version="MQDebug" At="0x206660"/>
-                </Sample>
-                <Sample Name="Sample_333">
-                    <Offset Version="MQDebug" At="0x208120"/>
-                </Sample>
-                <Sample Name="Sample_334">
-                    <Offset Version="MQDebug" At="0x208C00"/>
-                </Sample>
-                <Sample Name="Sample_335">
-                    <Offset Version="MQDebug" At="0x209A00"/>
-                </Sample>
-                <Sample Name="Sample_336">
-                    <Offset Version="MQDebug" At="0x20A380"/>
-                </Sample>
-                <Sample Name="Sample_337">
-                    <Offset Version="MQDebug" At="0x20B4A0"/>
-                </Sample>
-                <Sample Name="Sample_338">
-                    <Offset Version="MQDebug" At="0x20D5B0"/>
-                </Sample>
-                <Sample Name="Sample_339">
-                    <Offset Version="MQDebug" At="0x20F1A0"/>
-                </Sample>
-                <Sample Name="Sample_340">
-                    <Offset Version="MQDebug" At="0x20FBB0"/>
-                </Sample>
-                <Sample Name="Sample_341">
-                    <Offset Version="MQDebug" At="0x2112E0"/>
-                </Sample>
-                <Sample Name="Sample_342">
-                    <Offset Version="MQDebug" At="0x2117A0"/>
-                </Sample>
-                <Sample Name="Sample_343">
-                    <Offset Version="MQDebug" At="0x213510"/>
-                </Sample>
-                <Sample Name="Sample_344">
-                    <Offset Version="MQDebug" At="0x215040"/>
-                </Sample>
-                <Sample Name="Sample_345">
-                    <Offset Version="MQDebug" At="0x217170"/>
-                </Sample>
-                <Sample Name="Sample_346">
-                    <Offset Version="MQDebug" At="0x218B80"/>
-                </Sample>
-                <Sample Name="Sample_347">
-                    <Offset Version="MQDebug" At="0x219900"/>
-                </Sample>
-                <Sample Name="Sample_348">
-                    <Offset Version="MQDebug" At="0x21B470"/>
-                </Sample>
-                <Sample Name="Sample_349">
-                    <Offset Version="MQDebug" At="0x21C660"/>
-                </Sample>
-                <Sample Name="Sample_350">
-                    <Offset Version="MQDebug" At="0x21D430"/>
-                </Sample>
-                <Sample Name="Sample_351">
-                    <Offset Version="MQDebug" At="0x21E100"/>
-                </Sample>
-                <Sample Name="Sample_352">
-                    <Offset Version="MQDebug" At="0x21FF50"/>
-                </Sample>
-                <Sample Name="Sample_353">
-                    <Offset Version="MQDebug" At="0x222620"/>
-                </Sample>
-                <Sample Name="Sample_354">
-                    <Offset Version="MQDebug" At="0x2243A0"/>
-                </Sample>
-                <Sample Name="Sample_355">
-                    <Offset Version="MQDebug" At="0x226580"/>
-                </Sample>
-                <Sample Name="Sample_356">
-                    <Offset Version="MQDebug" At="0x227AC0"/>
-                </Sample>
-                <Sample Name="Sample_357">
-                    <Offset Version="MQDebug" At="0x229080"/>
-                </Sample>
-                <Sample Name="Sample_358">
-                    <Offset Version="MQDebug" At="0x22B010"/>
-                </Sample>
-                <Sample Name="Sample_359">
-                    <Offset Version="MQDebug" At="0x22CD50"/>
-                </Sample>
-                <Sample Name="Sample_360">
-                    <Offset Version="MQDebug" At="0x22EF10"/>
-                </Sample>
-                <Sample Name="Sample_361">
-                    <Offset Version="MQDebug" At="0x230F90"/>
-                </Sample>
-                <Sample Name="Sample_362">
-                    <Offset Version="MQDebug" At="0x233110"/>
-                </Sample>
-                <Sample Name="Sample_363">
-                    <Offset Version="MQDebug" At="0x234560"/>
-                </Sample>
-                <Sample Name="Sample_364">
-                    <Offset Version="MQDebug" At="0x235720"/>
-                </Sample>
-                <Sample Name="Sample_365">
-                    <Offset Version="MQDebug" At="0x237190"/>
-                </Sample>
-                <Sample Name="Sample_366">
-                    <Offset Version="MQDebug" At="0x238E50"/>
-                </Sample>
-                <Sample Name="Sample_367">
-                    <Offset Version="MQDebug" At="0x23A200"/>
-                </Sample>
-                <Sample Name="Sample_368">
-                    <Offset Version="MQDebug" At="0x23B270"/>
-                </Sample>
-                <Sample Name="Sample_369">
-                    <Offset Version="MQDebug" At="0x23CDA0"/>
-                </Sample>
-                <Sample Name="Sample_370">
-                    <Offset Version="MQDebug" At="0x23EF70"/>
-                </Sample>
-                <Sample Name="Sample_371">
-                    <Offset Version="MQDebug" At="0x240E20"/>
-                </Sample>
-                <Sample Name="Sample_372">
-                    <Offset Version="MQDebug" At="0x241260"/>
-                </Sample>
-                <Sample Name="Sample_373">
-                    <Offset Version="MQDebug" At="0x2423E0"/>
-                </Sample>
-                <Sample Name="Sample_374">
-                    <Offset Version="MQDebug" At="0x243E70"/>
-                </Sample>
-                <Sample Name="Sample_375">
-                    <Offset Version="MQDebug" At="0x245750"/>
-                </Sample>
-                <Sample Name="Sample_376">
-                    <Offset Version="MQDebug" At="0x245E40"/>
-                </Sample>
-                <Sample Name="Sample_377">
-                    <Offset Version="MQDebug" At="0x246780"/>
-                </Sample>
-                <Sample Name="Sample_378">
-                    <Offset Version="MQDebug" At="0x2479F0"/>
-                </Sample>
-                <Sample Name="Sample_379">
-                    <Offset Version="MQDebug" At="0x2492E0"/>
-                </Sample>
-                <Sample Name="Sample_380">
-                    <Offset Version="MQDebug" At="0x24AA40"/>
-                </Sample>
-                <Sample Name="Sample_381">
-                    <Offset Version="MQDebug" At="0x24CA20"/>
-                </Sample>
-                <Sample Name="Sample_382">
-                    <Offset Version="MQDebug" At="0x24E3C0"/>
-                </Sample>
-                <Sample Name="Sample_383">
-                    <Offset Version="MQDebug" At="0x24FCB0"/>
-                </Sample>
-                <Sample Name="Sample_384">
-                    <Offset Version="MQDebug" At="0x2513B0"/>
-                </Sample>
-                <Sample Name="Sample_385">
-                    <Offset Version="MQDebug" At="0x251EB0"/>
-                </Sample>
-                <Sample Name="Sample_386">
-                    <Offset Version="MQDebug" At="0x2539F0"/>
-                </Sample>
-                <Sample Name="Sample_387">
-                    <Offset Version="MQDebug" At="0x254180"/>
-                </Sample>
-                <Sample Name="Sample_388">
-                    <Offset Version="MQDebug" At="0x255CB0"/>
-                </Sample>
-                <Sample Name="Sample_389">
-                    <Offset Version="MQDebug" At="0x256720"/>
-                </Sample>
-                <Sample Name="Sample_390">
-                    <Offset Version="MQDebug" At="0x256CA0"/>
-                </Sample>
-                <Sample Name="Sample_391">
-                    <Offset Version="MQDebug" At="0x257B30"/>
-                </Sample>
-                <Sample Name="Sample_392">
-                    <Offset Version="MQDebug" At="0x258600"/>
-                </Sample>
-                <Sample Name="Sample_393">
-                    <Offset Version="MQDebug" At="0x258FF0"/>
-                </Sample>
-                <Sample Name="Sample_394">
-                    <Offset Version="MQDebug" At="0x25A450"/>
-                </Sample>
-                <Sample Name="Sample_395">
-                    <Offset Version="MQDebug" At="0x25B2A0"/>
-                </Sample>
-                <Sample Name="Sample_396">
-                    <Offset Version="MQDebug" At="0x25BB90"/>
-                </Sample>
-                <Sample Name="Sample_397">
-                    <Offset Version="MQDebug" At="0x25DB00"/>
-                </Sample>
-                <Sample Name="Sample_398">
-                    <Offset Version="MQDebug" At="0x25FD80"/>
-                </Sample>
-                <Sample Name="Sample_399">
-                    <Offset Version="MQDebug" At="0x262630"/>
-                </Sample>
-                <Sample Name="Sample_400">
-                    <Offset Version="MQDebug" At="0x264B20"/>
-                </Sample>
-                <Sample Name="Sample_401">
-                    <Offset Version="MQDebug" At="0x2651F0"/>
-                </Sample>
-                <Sample Name="Sample_402">
-                    <Offset Version="MQDebug" At="0x2665E0"/>
-                </Sample>
-                <Sample Name="Sample_403">
-                    <Offset Version="MQDebug" At="0x267E70"/>
-                </Sample>
-                <Sample Name="Sample_404">
-                    <Offset Version="MQDebug" At="0x26A7D0"/>
-                </Sample>
-                <Sample Name="Sample_405">
-                    <Offset Version="MQDebug" At="0x26F5F0"/>
-                </Sample>
-                <Sample Name="Sample_406">
-                    <Offset Version="MQDebug" At="0x270430"/>
-                </Sample>
-                <Sample Name="Sample_407">
-                    <Offset Version="MQDebug" At="0x271500"/>
-                </Sample>
-                <Sample Name="Sample_408">
-                    <Offset Version="MQDebug" At="0x2732E0"/>
-                </Sample>
-                <Sample Name="Sample_409">
-                    <Offset Version="MQDebug" At="0x273AF0"/>
-                </Sample>
-                <Sample Name="Sample_410">
-                    <Offset Version="MQDebug" At="0x275B90"/>
-                </Sample>
-                <Sample Name="Sample_411">
-                    <Offset Version="MQDebug" At="0x277160"/>
-                </Sample>
-                <Sample Name="Sample_412">
-                    <Offset Version="MQDebug" At="0x2786B0"/>
-                </Sample>
-                <Sample Name="Sample_413">
-                    <Offset Version="MQDebug" At="0x27B930"/>
-                </Sample>
-                <Sample Name="Sample_414">
-                    <Offset Version="MQDebug" At="0x280060"/>
-                </Sample>
-                <Sample Name="Sample_415">
-                    <Offset Version="MQDebug" At="0x284590"/>
-                </Sample>
-                <Sample Name="Sample_416">
-                    <Offset Version="MQDebug" At="0x286000"/>
-                </Sample>
-                <Sample Name="Sample_417">
-                    <Offset Version="MQDebug" At="0x28A690"/>
-                </Sample>
-                <Sample Name="Sample_418">
-                    <Offset Version="MQDebug" At="0x28CFA0"/>
-                </Sample>
-                <Sample Name="Sample_419">
-                    <Offset Version="MQDebug" At="0x28F270"/>
-                </Sample>
-                <Sample Name="Sample_420">
-                    <Offset Version="MQDebug" At="0x2917A0"/>
-                </Sample>
-                <Sample Name="Sample_421">
-                    <Offset Version="MQDebug" At="0x295040"/>
-                </Sample>
-                <Sample Name="Sample_422">
-                    <Offset Version="MQDebug" At="0x29A8F0"/>
-                </Sample>
-                <Sample Name="Sample_423">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x1C10"/>
-                </Sample>
-                <Sample Name="Sample_424">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x5CF0"/>
-                </Sample>
-                <Sample Name="Sample_425">
-                    <Offset Version="MQDebug" At="0x2A4740"/>
-                </Sample>
-                <Sample Name="Sample_426">
-                    <Offset Version="MQDebug" At="0x2AFCD0"/>
-                </Sample>
-                <Sample Name="Sample_427">
-                    <Offset Version="MQDebug" At="0x2B6570"/>
-                </Sample>
-                <Sample Name="Sample_428">
-                    <Offset Version="MQDebug" At="0x2B82E0"/>
-                </Sample>
-                <Sample Name="Sample_429">
-                    <Offset Version="MQDebug" At="0x2BB710"/>
-                </Sample>
-                <Sample Name="Sample_430">
-                    <Offset Version="MQDebug" At="0x2C08A0"/>
-                </Sample>
-                <Sample Name="Sample_431">
-                    <Offset Version="MQDebug" At="0x2C51D0" LoopOffset="0x320"/>
-                </Sample>
-                <Sample Name="Sample_432">
-                    <Offset Version="MQDebug" At="0x2C51D0" LoopOffset="0x6020"/>
-                </Sample>
-                <Sample Name="Sample_433">
-                    <Offset Version="MQDebug" At="0x2C6910"/>
-                </Sample>
-                <Sample Name="Sample_434">
-                    <Offset Version="MQDebug" At="0x2C7130" LoopOffset="0x860"/>
-                </Sample>
-                <Sample Name="Sample_435">
-                    <Offset Version="MQDebug" At="0x2C7130" LoopOffset="0x6080"/>
-                </Sample>
-                <Sample Name="Sample_436">
-                    <Offset Version="MQDebug" At="0x2C7D70" LoopOffset="0x880"/>
-                </Sample>
-                <Sample Name="Sample_437">
-                    <Offset Version="MQDebug" At="0x2C7D70" LoopOffset="0x60A0"/>
-                </Sample>
-                <Sample Name="Sample_438">
-                    <Offset Version="MQDebug" At="0x2C9200" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_439">
-                    <Offset Version="MQDebug" At="0x2C9200" LoopOffset="0x60C0"/>
-                </Sample>
-                <Sample Name="Sample_440">
-                    <Offset Version="MQDebug" At="0x2C9D30" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_441">
-                    <Offset Version="MQDebug" At="0x2C9D30" LoopOffset="0x60E0"/>
-                </Sample>
-                <Sample Name="Sample_442">
-                    <Offset Version="MQDebug" At="0x2CA730" LoopOffset="0x300"/>
-                </Sample>
-                <Sample Name="Sample_443">
-                    <Offset Version="MQDebug" At="0x2CA730" LoopOffset="0x6100"/>
-                </Sample>
-                <Sample Name="Sample_444">
-                    <Offset Version="MQDebug" At="0x2CADA0" LoopOffset="0xB80"/>
-                </Sample>
-                <Sample Name="Sample_445">
-                    <Offset Version="MQDebug" At="0x2CADA0" LoopOffset="0x6120"/>
-                </Sample>
-                <Sample Name="Sample_446">
-                    <Offset Version="MQDebug" At="0x2CC180" LoopOffset="0x1840"/>
-                </Sample>
-                <Sample Name="Sample_447">
-                    <Offset Version="MQDebug" At="0x2CC180" LoopOffset="0x6140"/>
-                </Sample>
-                <Sample Name="Sample_448">
-                    <Offset Version="MQDebug" At="0x2CD450" LoopOffset="0x1860"/>
-                </Sample>
-                <Sample Name="Sample_449">
-                    <Offset Version="MQDebug" At="0x2CD450" LoopOffset="0x6160"/>
-                </Sample>
-                <Sample Name="Sample_450">
-                    <Offset Version="MQDebug" At="0x2CF810" LoopOffset="0x1940"/>
-                </Sample>
-                <Sample Name="Sample_451">
-                    <Offset Version="MQDebug" At="0x2CF810" LoopOffset="0x6180"/>
-                </Sample>
-                <Sample Name="Sample_452">
-                    <Offset Version="MQDebug" At="0x2D0C60" LoopOffset="0x1960"/>
-                </Sample>
-                <Sample Name="Sample_453">
-                    <Offset Version="MQDebug" At="0x2D0C60" LoopOffset="0x61A0"/>
-                </Sample>
-                <Sample Name="Sample_454">
-                    <Offset Version="MQDebug" At="0x2D2490" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_455">
-                    <Offset Version="MQDebug" At="0x2D2490" LoopOffset="0x61C0"/>
-                </Sample>
-                <Sample Name="Sample_456">
-                    <Offset Version="MQDebug" At="0x2D2E90" LoopOffset="0x680"/>
-                </Sample>
-                <Sample Name="Sample_457">
-                    <Offset Version="MQDebug" At="0x2D2E90" LoopOffset="0x61E0"/>
-                </Sample>
-                <Sample Name="Sample_458">
-                    <Offset Version="MQDebug" At="0x2D3880" LoopOffset="0x6A0"/>
-                </Sample>
-                <Sample Name="Sample_459">
-                    <Offset Version="MQDebug" At="0x2D3880" LoopOffset="0x6200"/>
-                </Sample>
-                <Sample Name="Sample_460">
-                    <Offset Version="MQDebug" At="0x2D4550" LoopOffset="0x6C0"/>
-                </Sample>
-                <Sample Name="Sample_461">
-                    <Offset Version="MQDebug" At="0x2D4550" LoopOffset="0x6220"/>
-                </Sample>
-                <Sample Name="Sample_462">
-                    <Offset Version="MQDebug" At="0x2D5E20" LoopOffset="0x700"/>
-                </Sample>
-                <Sample Name="Sample_463">
-                    <Offset Version="MQDebug" At="0x2D5E20" LoopOffset="0x6240"/>
-                </Sample>
-                <Sample Name="Sample_464">
-                    <Offset Version="MQDebug" At="0x2D76A0"/>
-                </Sample>
-                <Sample Name="Sample_465">
-                    <Offset Version="MQDebug" At="0x2D8140"/>
-                </Sample>
-                <Sample Name="Sample_466">
-                    <Offset Version="MQDebug" At="0x2DA8A0"/>
-                </Sample>
-                <Sample Name="Sample_467">
-                    <Offset Version="MQDebug" At="0x2DB390"/>
-                </Sample>
-                <Sample Name="Sample_468">
-                    <Offset Version="MQDebug" At="0x2DCE60"/>
-                </Sample>
-                <Sample Name="Sample_469">
-                    <Offset Version="MQDebug" At="0x2DDA70"/>
-                </Sample>
-                <Sample Name="Sample_470">
-                    <Offset Version="MQDebug" At="0x2DE370"/>
-                </Sample>
-                <Sample Name="Sample_471">
-                    <Offset Version="MQDebug" At="0x2DE5E0"/>
-                </Sample>
-                <Sample Name="Sample_472">
-                    <Offset Version="MQDebug" At="0x2DE850"/>
-                </Sample>
-                <Sample Name="Sample_473">
-                    <Offset Version="MQDebug" At="0x2DECB0"/>
-                </Sample>
-                <Sample Name="Sample_474">
-                    <Offset Version="MQDebug" At="0x2DEED0"/>
-                </Sample>
-                <Sample Name="Sample_475">
-                    <Offset Version="MQDebug" At="0x2DF720"/>
-                </Sample>
-                <Sample Name="Sample_476">
-                    <Offset Version="MQDebug" At="0x2DFE90"/>
-                </Sample>
-                <Sample Name="Sample_477">
-                    <Offset Version="MQDebug" At="0x2E0A60"/>
-                </Sample>
-                <Sample Name="Sample_478">
-                    <Offset Version="MQDebug" At="0x2E1910"/>
-                </Sample>
-                <Sample Name="Sample_479">
-                    <Offset Version="MQDebug" At="0x2E42D0"/>
-                </Sample>
-                <Sample Name="Sample_480">
-                    <Offset Version="MQDebug" At="0x2E5E50"/>
-                </Sample>
-                <Sample Name="Sample_481">
-                    <Offset Version="MQDebug" At="0x2E6700"/>
-                </Sample>
-                <Sample Name="Sample_482">
-                    <Offset Version="MQDebug" At="0x2E6B00"/>
-                </Sample>
-                <Sample Name="Sample_483">
-                    <Offset Version="MQDebug" At="0x2E74B0"/>
-                </Sample>
-                <Sample Name="Sample_484">
-                    <Offset Version="MQDebug" At="0x2E89D0"/>
-                </Sample>
-                <Sample Name="Sample_485">
-                    <Offset Version="MQDebug" At="0x2E9610"/>
-                </Sample>
-                <Sample Name="Sample_486">
-                    <Offset Version="MQDebug" At="0x2EC210"/>
-                </Sample>
-                <Sample Name="Sample_487">
-                    <Offset Version="MQDebug" At="0x2ED150"/>
-                </Sample>
-                <Sample Name="Sample_488">
-                    <Offset Version="MQDebug" At="0x2EEAA0"/>
-                </Sample>
-                <Sample Name="Sample_489">
-                    <Offset Version="MQDebug" At="0x2F0600"/>
-                </Sample>
-                <Sample Name="Sample_490">
-                    <Offset Version="MQDebug" At="0x2F0BF0"/>
-                </Sample>
-                <Sample Name="Sample_491">
-                    <Offset Version="MQDebug" At="0x2F1780"/>
-                </Sample>
-                <Sample Name="Sample_492">
-                    <Offset Version="MQDebug" At="0x2F3850"/>
-                </Sample>
-                <Sample Name="Sample_493">
-                    <Offset Version="MQDebug" At="0x2F5360"/>
-                </Sample>
-                <Sample Name="Sample_494">
-                    <Offset Version="MQDebug" At="0x2F63A0"/>
-                </Sample>
-                <Sample Name="Sample_495">
-                    <Offset Version="MQDebug" At="0x2F68B0"/>
-                </Sample>
-                <Sample Name="Sample_496">
-                    <Offset Version="MQDebug" At="0x2F7490"/>
-                </Sample>
-                <Sample Name="Sample_497">
-                    <Offset Version="MQDebug" At="0x2F87D0"/>
-                </Sample>
-                <Sample Name="Sample_498">
-                    <Offset Version="MQDebug" At="0x2FC270"/>
-                </Sample>
-                <Sample Name="Sample_499">
-                    <Offset Version="MQDebug" At="0x2FFF70"/>
-                </Sample>
-                <Sample Name="Sample_500">
-                    <Offset Version="MQDebug" At="0x3030E0"/>
-                </Sample>
-                <Sample Name="Sample_501">
-                    <Offset Version="MQDebug" At="0x303670"/>
-                </Sample>
-                <Sample Name="Sample_502">
-                    <Offset Version="MQDebug" At="0x304E90"/>
-                </Sample>
-                <Sample Name="Sample_503">
-                    <Offset Version="MQDebug" At="0x306820"/>
-                </Sample>
-                <Sample Name="Sample_504">
-                    <Offset Version="MQDebug" At="0x308540"/>
-                </Sample>
-                <Sample Name="Sample_505">
-                    <Offset Version="MQDebug" At="0x309300"/>
-                </Sample>
-                <Sample Name="Sample_506">
-                    <Offset Version="MQDebug" At="0x309DD0"/>
-                </Sample>
-                <Sample Name="Sample_507">
-                    <Offset Version="MQDebug" At="0x30ACA0"/>
-                </Sample>
-                <Sample Name="Sample_508">
-                    <Offset Version="MQDebug" At="0x30C320"/>
-                </Sample>
-                <Sample Name="Sample_509">
-                    <Offset Version="MQDebug" At="0x30CF40"/>
-                </Sample>
-                <Sample Name="Sample_510">
-                    <Offset Version="MQDebug" At="0x30D5D0"/>
-                </Sample>
-                <Sample Name="Sample_511">
-                    <Offset Version="MQDebug" At="0x30E370"/>
-                </Sample>
-                <Sample Name="Sample_512">
-                    <Offset Version="MQDebug" At="0x30EEA0"/>
-                </Sample>
-                <Sample Name="Sample_513">
-                    <Offset Version="MQDebug" At="0x310730"/>
-                </Sample>
-                <Sample Name="Sample_514">
-                    <Offset Version="MQDebug" At="0x311590"/>
-                </Sample>
-                <Sample Name="Sample_515">
-                    <Offset Version="MQDebug" At="0x311B20"/>
-                </Sample>
-                <Sample Name="Sample_516">
-                    <Offset Version="MQDebug" At="0x312590"/>
-                </Sample>
-                <Sample Name="Sample_517">
-                    <Offset Version="MQDebug" At="0x3129E0"/>
-                </Sample>
-                <Sample Name="Sample_518">
-                    <Offset Version="MQDebug" At="0x3142D0"/>
-                </Sample>
-                <Sample Name="Sample_519">
-                    <Offset Version="MQDebug" At="0x317850"/>
-                </Sample>
-                <Sample Name="Sample_520">
-                    <Offset Version="MQDebug" At="0x31A100"/>
-                </Sample>
-                <Sample Name="Sample_521">
-                    <Offset Version="MQDebug" At="0x31C380"/>
-                </Sample>
-                <Sample Name="Sample_522">
-                    <Offset Version="MQDebug" At="0x31EE60"/>
-                </Sample>
-                <Sample Name="Sample_523">
-                    <Offset Version="MQDebug" At="0x31F980"/>
-                </Sample>
-                <Sample Name="Sample_524">
-                    <Offset Version="MQDebug" At="0x3205A0"/>
-                </Sample>
-                <Sample Name="Sample_525">
-                    <Offset Version="MQDebug" At="0x324A40"/>
-                </Sample>
-                <Sample Name="Sample_526">
-                    <Offset Version="MQDebug" At="0x324F90"/>
-                </Sample>
-                <Sample Name="Sample_527">
-                    <Offset Version="MQDebug" At="0x325BE0"/>
-                </Sample>
-                <Sample Name="Sample_528">
-                    <Offset Version="MQDebug" At="0x327550"/>
-                </Sample>
-                <Sample Name="Sample_529">
-                    <Offset Version="MQDebug" At="0x3294B0"/>
-                </Sample>
-                <Sample Name="Sample_530">
-                    <Offset Version="MQDebug" At="0x32A520"/>
-                </Sample>
-                <Sample Name="Sample_531">
-                    <Offset Version="MQDebug" At="0x32B240"/>
-                </Sample>
-                <Sample Name="Sample_532">
-                    <Offset Version="MQDebug" At="0x32F340"/>
-                </Sample>
-                <Sample Name="Sample_533">
-                    <Offset Version="MQDebug" At="0x330580"/>
-                </Sample>
-                <Sample Name="Sample_534">
-                    <Offset Version="MQDebug" At="0x3318C0"/>
-                </Sample>
-                <Sample Name="Sample_535">
-                    <Offset Version="MQDebug" At="0x332C80"/>
-                </Sample>
-                <Sample Name="Sample_536">
-                    <Offset Version="MQDebug" At="0x3381F0"/>
-                </Sample>
-                <Sample Name="Sample_537">
-                    <Offset Version="MQDebug" At="0x33B090"/>
-                </Sample>
-                <Sample Name="Sample_538">
-                    <Offset Version="MQDebug" At="0x33CB40"/>
-                </Sample>
-                <Sample Name="Sample_539">
-                    <Offset Version="MQDebug" At="0x341990"/>
-                </Sample>
-                <Sample Name="Sample_540">
-                    <Offset Version="MQDebug" At="0x342B90"/>
-                </Sample>
-                <Sample Name="Sample_541">
-                    <Offset Version="MQDebug" At="0x344EA0"/>
-                </Sample>
-                <Sample Name="Sample_542">
-                    <Offset Version="MQDebug" At="0x34A3D0"/>
-                </Sample>
-                <Sample Name="Sample_543">
-                    <Offset Version="MQDebug" At="0x34C430"/>
-                </Sample>
-                <Sample Name="Sample_544">
-                    <Offset Version="MQDebug" At="0x34E7C0"/>
-                </Sample>
-                <Sample Name="Sample_545">
-                    <Offset Version="MQDebug" At="0x352D10"/>
-                </Sample>
-                <Sample Name="Sample_546">
-                    <Offset Version="MQDebug" At="0x353AD0"/>
-                </Sample>
-                <Sample Name="Sample_547">
-                    <Offset Version="MQDebug" At="0x354560"/>
-                </Sample>
-                <Sample Name="Sample_548">
-                    <Offset Version="MQDebug" At="0x356A80"/>
-                </Sample>
-                <Sample Name="Sample_549">
-                    <Offset Version="MQDebug" At="0x358620"/>
-                </Sample>
-                <Sample Name="Sample_550">
-                    <Offset Version="MQDebug" At="0x35B680"/>
-                </Sample>
-                <Sample Name="Sample_551">
-                    <Offset Version="MQDebug" At="0x35F640"/>
-                </Sample>
-                <Sample Name="Sample_552">
-                    <Offset Version="MQDebug" At="0x362420"/>
-                </Sample>
-                <Sample Name="Sample_553">
-                    <Offset Version="MQDebug" At="0x3630C0"/>
-                </Sample>
-                <Sample Name="Sample_554">
-                    <Offset Version="MQDebug" At="0x366D60"/>
-                </Sample>
-                <Sample Name="Sample_555">
-                    <Offset Version="MQDebug" At="0x367B00"/>
-                </Sample>
-                <Sample Name="Sample_556">
-                    <Offset Version="MQDebug" At="0x36A580"/>
-                </Sample>
-                <Sample Name="Sample_557">
-                    <Offset Version="MQDebug" At="0x36B000"/>
-                </Sample>
-                <Sample Name="Sample_558">
-                    <Offset Version="MQDebug" At="0x36BA80"/>
-                </Sample>
-                <Sample Name="Sample_559">
-                    <Offset Version="MQDebug" At="0x36C410"/>
-                </Sample>
-                <Sample Name="Sample_560">
-                    <Offset Version="MQDebug" At="0x36CA80"/>
-                </Sample>
-                <Sample Name="Sample_561">
-                    <Offset Version="MQDebug" At="0x36DDD0"/>
-                </Sample>
-                <Sample Name="Sample_562">
-                    <Offset Version="MQDebug" At="0x36F130"/>
-                </Sample>
-                <Sample Name="Sample_563">
-                    <Offset Version="MQDebug" At="0x370080"/>
-                </Sample>
-                <Sample Name="Sample_564">
-                    <Offset Version="MQDebug" At="0x370A30"/>
-                </Sample>
-                <Sample Name="Sample_565">
-                    <Offset Version="MQDebug" At="0x371C50"/>
-                </Sample>
-                <Sample Name="Sample_566">
-                    <Offset Version="MQDebug" At="0x372FF0"/>
-                </Sample>
-                <Sample Name="Sample_567">
-                    <Offset Version="MQDebug" At="0x375050"/>
-                </Sample>
-                <Sample Name="Sample_568">
-                    <Offset Version="MQDebug" At="0x376D20"/>
-                </Sample>
-                <Sample Name="Sample_569">
-                    <Offset Version="MQDebug" At="0x378920"/>
-                </Sample>
-                <Sample Name="Sample_570">
-                    <Offset Version="MQDebug" At="0x37AD80"/>
-                </Sample>
-                <Sample Name="Sample_571">
-                    <Offset Version="MQDebug" At="0x37BCE0"/>
-                </Sample>
-                <Sample Name="Sample_572">
-                    <Offset Version="MQDebug" At="0x37E300"/>
-                </Sample>
-                <Sample Name="Sample_573">
-                    <Offset Version="MQDebug" At="0x37F0A0"/>
-                </Sample>
-                <Sample Name="Sample_574">
-                    <Offset Version="MQDebug" At="0x3804A0"/>
-                </Sample>
-                <Sample Name="Sample_575">
-                    <Offset Version="MQDebug" At="0x380A80"/>
-                </Sample>
-                <Sample Name="Sample_576">
-                    <Offset Version="MQDebug" At="0x381120"/>
-                </Sample>
-                <Sample Name="Sample_577">
-                    <Offset Version="MQDebug" At="0x381890"/>
-                </Sample>
-                <Sample Name="Sample_578">
-                    <Offset Version="MQDebug" At="0x382370"/>
-                </Sample>
-                <Sample Name="Sample_579">
-                    <Offset Version="MQDebug" At="0x382CD0"/>
-                </Sample>
-                <Sample Name="Sample_580">
-                    <Offset Version="MQDebug" At="0x383220"/>
-                </Sample>
-                <Sample Name="Sample_581">
-                    <Offset Version="MQDebug" At="0x386120"/>
-                </Sample>
-                <Sample Name="Sample_582">
-                    <Offset Version="MQDebug" At="0x386320"/>
-                </Sample>
-                <Sample Name="Sample_583">
-                    <Offset Version="MQDebug" At="0x386550"/>
-                </Sample>
-                <Sample Name="Sample_584">
-                    <Offset Version="MQDebug" At="0x386AE0"/>
-                </Sample>
-                <Sample Name="Sample_585">
-                    <Offset Version="MQDebug" At="0x387050"/>
-                </Sample>
-                <Sample Name="Sample_586">
-                    <Offset Version="MQDebug" At="0x3874B0"/>
-                </Sample>
-                <Sample Name="Sample_587">
-                    <Offset Version="MQDebug" At="0x387CA0"/>
-                </Sample>
-                <Sample Name="Sample_588">
-                    <Offset Version="MQDebug" At="0x388DA0"/>
-                </Sample>
-                <Sample Name="Sample_589">
-                    <Offset Version="MQDebug" At="0x38B6A0"/>
-                </Sample>
-                <Sample Name="Sample_590">
-                    <Offset Version="MQDebug" At="0x38C420"/>
-                </Sample>
-                <Sample Name="Sample_591">
-                    <Offset Version="MQDebug" At="0x38D300"/>
-                </Sample>
-                <Sample Name="Sample_592">
-                    <Offset Version="MQDebug" At="0x396B40"/>
-                </Sample>
-                <Sample Name="Sample_593">
-                    <Offset Version="MQDebug" At="0x397530"/>
-                </Sample>
-                <Sample Name="Sample_594">
-                    <Offset Version="MQDebug" At="0x397DB0"/>
-                </Sample>
-                <Sample Name="Sample_595">
-                    <Offset Version="MQDebug" At="0x3987C0"/>
-                </Sample>
-                <Sample Name="Sample_596">
-                    <Offset Version="MQDebug" At="0x399C00"/>
-                </Sample>
-                <Sample Name="Sample_597">
-                    <Offset Version="MQDebug" At="0x39AC40"/>
-                </Sample>
-                <Sample Name="Sample_598">
-                    <Offset Version="MQDebug" At="0x39B3B0"/>
-                </Sample>
-                <Sample Name="Sample_599">
-                    <Offset Version="MQDebug" At="0x39B700"/>
-                </Sample>
-                <Sample Name="Sample_600">
-                    <Offset Version="MQDebug" At="0x39CE50"/>
-                </Sample>
-                <Sample Name="Sample_601">
-                    <Offset Version="MQDebug" At="0x39D590"/>
-                </Sample>
-                <Sample Name="Sample_602">
-                    <Offset Version="MQDebug" At="0x39D9F0"/>
-                </Sample>
-                <Sample Name="Sample_603">
-                    <Offset Version="MQDebug" At="0x39F4B0"/>
-                </Sample>
-                <Sample Name="Sample_604">
-                    <Offset Version="MQDebug" At="0x3A0710"/>
-                </Sample>
-                <Sample Name="Sample_605">
-                    <Offset Version="MQDebug" At="0x3A0F30"/>
-                </Sample>
-                <Sample Name="Sample_606">
-                    <Offset Version="MQDebug" At="0x3A2400"/>
-                </Sample>
-                <Sample Name="Sample_607">
-                    <Offset Version="MQDebug" At="0x3A3090"/>
-                </Sample>
-                <Sample Name="Sample_608">
-                    <Offset Version="MQDebug" At="0x3A3500"/>
-                </Sample>
-                <Sample Name="Sample_609">
-                    <Offset Version="MQDebug" At="0x3A4340"/>
-                </Sample>
-                <Sample Name="Sample_610">
-                    <Offset Version="MQDebug" At="0x3A4CF0"/>
-                </Sample>
-                <Sample Name="Sample_611">
-                    <Offset Version="MQDebug" At="0x3AB8C0"/>
-                </Sample>
-                <Sample Name="Sample_612">
-                    <Offset Version="MQDebug" At="0x3AC4B0"/>
-                </Sample>
-                <Sample Name="Sample_613">
-                    <Offset Version="MQDebug" At="0x3AC6D0"/>
-                </Sample>
-                <Sample Name="Sample_614">
-                    <Offset Version="MQDebug" At="0x3AD6F0"/>
-                </Sample>
-                <Sample Name="Sample_615">
-                    <Offset Version="MQDebug" At="0x3ADEA0"/>
-                </Sample>
-                <Sample Name="Sample_616">
-                    <Offset Version="MQDebug" At="0x3AF120"/>
-                </Sample>
-                <Sample Name="Sample_617">
-                    <Offset Version="MQDebug" At="0x3AFC30"/>
-                </Sample>
-                <Sample Name="Sample_618">
-                    <Offset Version="MQDebug" At="0x3B1970"/>
-                </Sample>
-                <Sample Name="Sample_619">
-                    <Offset Version="MQDebug" At="0x3B1DA0"/>
-                </Sample>
-                <Sample Name="Sample_620">
-                    <Offset Version="MQDebug" At="0x3B2D90"/>
-                </Sample>
-                <Sample Name="Sample_621">
-                    <Offset Version="MQDebug" At="0x3B3240"/>
-                </Sample>
-                <Sample Name="Sample_622">
-                    <Offset Version="MQDebug" At="0x3B4690"/>
-                </Sample>
-                <Sample Name="Sample_623">
-                    <Offset Version="MQDebug" At="0x3B4D10"/>
-                </Sample>
-                <Sample Name="Sample_624">
-                    <Offset Version="MQDebug" At="0x3B9640"/>
-                </Sample>
-                <Sample Name="Sample_625">
-                    <Offset Version="MQDebug" At="0x3BA830"/>
-                </Sample>
-                <Sample Name="Sample_626">
-                    <Offset Version="MQDebug" At="0x3BB3C0"/>
-                </Sample>
-                <Sample Name="Sample_627">
-                    <Offset Version="MQDebug" At="0x3BCB80"/>
-                </Sample>
-                <Sample Name="Sample_628">
-                    <Offset Version="MQDebug" At="0x3BE0A0"/>
-                </Sample>
-                <Sample Name="Sample_629">
-                    <Offset Version="MQDebug" At="0x3BE6C0"/>
-                </Sample>
-                <Sample Name="Sample_630">
-                    <Offset Version="MQDebug" At="0x3BF500"/>
-                </Sample>
-            </Samples>
-            <Samples Bank="1">
-                <Sample Name="Sample_631">
-                    <Offset Version="MQDebug" At="0x2786B0" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_632">
-                    <Offset Version="MQDebug" At="0x2786B0" LoopOffset="0x370"/>
-                </Sample>
-                <Sample Name="Sample_633">
-                    <Offset Version="MQDebug" At="0x2786B0" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_634">
-                    <Offset Version="MQDebug" At="0x2786B0" LoopOffset="0x240"/>
-                </Sample>
-                <Sample Name="Sample_635">
-                    <Offset Version="MQDebug" At="0x2786B0" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_636">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x700"/>
-                </Sample>
-                <Sample Name="Sample_637">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x790"/>
-                </Sample>
-                <Sample Name="Sample_638">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x320"/>
-                </Sample>
-                <Sample Name="Sample_639">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x350"/>
-                </Sample>
-                <Sample Name="Sample_640">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x1B0"/>
-                </Sample>
-                <Sample Name="Sample_641">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_642">
-                    <Offset Version="MQDebug" At="0x27B930" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_643">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0xDD0"/>
-                </Sample>
-                <Sample Name="Sample_644">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0xB70"/>
-                </Sample>
-                <Sample Name="Sample_645">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_646">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0x6B0"/>
-                </Sample>
-                <Sample Name="Sample_647">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0x9F0"/>
-                </Sample>
-                <Sample Name="Sample_648">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0x780"/>
-                </Sample>
-                <Sample Name="Sample_649">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_650">
-                    <Offset Version="MQDebug" At="0x280060" LoopOffset="0xD20"/>
-                </Sample>
-                <Sample Name="Sample_651">
-                    <Offset Version="MQDebug" At="0x284590" LoopOffset="0xC90"/>
-                </Sample>
-                <Sample Name="Sample_652">
-                    <Offset Version="MQDebug" At="0x284590" LoopOffset="0x630"/>
-                </Sample>
-                <Sample Name="Sample_653">
-                    <Offset Version="MQDebug" At="0x284590" LoopOffset="0x9D0"/>
-                </Sample>
-                <Sample Name="Sample_654">
-                    <Offset Version="MQDebug" At="0x284590" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_655">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x70"/>
-                </Sample>
-                <Sample Name="Sample_656">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x5A0"/>
-                </Sample>
-                <Sample Name="Sample_657">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x370"/>
-                </Sample>
-                <Sample Name="Sample_658">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_659">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x310"/>
-                </Sample>
-                <Sample Name="Sample_660">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_661">
-                    <Offset Version="MQDebug" At="0x286000" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_662">
-                    <Offset Version="MQDebug" At="0x28A690" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_663">
-                    <Offset Version="MQDebug" At="0x28A690" LoopOffset="0x240"/>
-                </Sample>
-                <Sample Name="Sample_664">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x3C0"/>
-                </Sample>
-                <Sample Name="Sample_665">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x450"/>
-                </Sample>
-                <Sample Name="Sample_666">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x8C0"/>
-                </Sample>
-                <Sample Name="Sample_667">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x720"/>
-                </Sample>
-                <Sample Name="Sample_668">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x4C0"/>
-                </Sample>
-                <Sample Name="Sample_669">
-                    <Offset Version="MQDebug" At="0x28CFA0" LoopOffset="0x3B0"/>
-                </Sample>
-                <Sample Name="Sample_670">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x450"/>
-                </Sample>
-                <Sample Name="Sample_671">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x4E0"/>
-                </Sample>
-                <Sample Name="Sample_672">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x950"/>
-                </Sample>
-                <Sample Name="Sample_673">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x7B0"/>
-                </Sample>
-                <Sample Name="Sample_674">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x550"/>
-                </Sample>
-                <Sample Name="Sample_675">
-                    <Offset Version="MQDebug" At="0x28F270" LoopOffset="0x440"/>
-                </Sample>
-                <Sample Name="Sample_676">
-                    <Offset Version="MQDebug" At="0x2917A0"/>
-                </Sample>
-                <Sample Name="Sample_677">
-                    <Offset Version="MQDebug" At="0x295040" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_678">
-                    <Offset Version="MQDebug" At="0x295040" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_679">
-                    <Offset Version="MQDebug" At="0x295040" LoopOffset="0x5C0"/>
-                </Sample>
-                <Sample Name="Sample_680">
-                    <Offset Version="MQDebug" At="0x295040" LoopOffset="0x2D0"/>
-                </Sample>
-                <Sample Name="Sample_681">
-                    <Offset Version="MQDebug" At="0x295040" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_682">
-                    <Offset Version="MQDebug" At="0x29A8F0"/>
-                </Sample>
-                <Sample Name="Sample_683">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_684">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x8A0"/>
-                </Sample>
-                <Sample Name="Sample_685">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x3C0"/>
-                </Sample>
-                <Sample Name="Sample_686">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x490"/>
-                </Sample>
-                <Sample Name="Sample_687">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x720"/>
-                </Sample>
-                <Sample Name="Sample_688">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x4B0"/>
-                </Sample>
-                <Sample Name="Sample_689">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x650"/>
-                </Sample>
-                <Sample Name="Sample_690">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x9E0"/>
-                </Sample>
-                <Sample Name="Sample_691">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x770"/>
-                </Sample>
-                <Sample Name="Sample_692">
-                    <Offset Version="MQDebug" At="0x29C360" LoopOffset="0x780"/>
-                </Sample>
-                <Sample Name="Sample_693">
-                    <Offset Version="MQDebug" At="0x2A4740" LoopOffset="0xD00"/>
-                </Sample>
-                <Sample Name="Sample_694">
-                    <Offset Version="MQDebug" At="0x2A4740" LoopOffset="0x120"/>
-                </Sample>
-                <Sample Name="Sample_695">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0x700"/>
-                </Sample>
-                <Sample Name="Sample_696">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0x670"/>
-                </Sample>
-                <Sample Name="Sample_697">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0x740"/>
-                </Sample>
-                <Sample Name="Sample_698">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0x6A0"/>
-                </Sample>
-                <Sample Name="Sample_699">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0xD50"/>
-                </Sample>
-                <Sample Name="Sample_700">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0x240"/>
-                </Sample>
-                <Sample Name="Sample_701">
-                    <Offset Version="MQDebug" At="0x2AFCD0" LoopOffset="0xC00"/>
-                </Sample>
-                <Sample Name="Sample_702">
-                    <Offset Version="MQDebug" At="0x2B6570" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_703">
-                    <Offset Version="MQDebug" At="0x2B6570" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_704">
-                    <Offset Version="MQDebug" At="0x2B6570" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_705">
-                    <Offset Version="MQDebug" At="0x2B82E0"/>
-                </Sample>
-                <Sample Name="Sample_706">
-                    <Offset Version="MQDebug" At="0x2BB710" LoopOffset="0xC00"/>
-                </Sample>
-                <Sample Name="Sample_707">
-                    <Offset Version="MQDebug" At="0x2BB710" LoopOffset="0xA10"/>
-                </Sample>
-                <Sample Name="Sample_708">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0xC20"/>
-                </Sample>
-                <Sample Name="Sample_709">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_710">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0x9D0"/>
-                </Sample>
-                <Sample Name="Sample_711">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0x500"/>
-                </Sample>
-                <Sample Name="Sample_712">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0x4E0"/>
-                </Sample>
-                <Sample Name="Sample_713">
-                    <Offset Version="MQDebug" At="0x3C0F20" LoopOffset="0x8F0"/>
-                </Sample>
-                <Sample Name="Sample_714">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0xCB0"/>
-                </Sample>
-                <Sample Name="Sample_715">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_716">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0xA60"/>
-                </Sample>
-                <Sample Name="Sample_717">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0x590"/>
-                </Sample>
-                <Sample Name="Sample_718">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0x570"/>
-                </Sample>
-                <Sample Name="Sample_719">
-                    <Offset Version="MQDebug" At="0x3C83F0" LoopOffset="0x980"/>
-                </Sample>
-                <Sample Name="Sample_720">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0xD40"/>
-                </Sample>
-                <Sample Name="Sample_721">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0xAE0"/>
-                </Sample>
-                <Sample Name="Sample_722">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_723">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0x620"/>
-                </Sample>
-                <Sample Name="Sample_724">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0x960"/>
-                </Sample>
-                <Sample Name="Sample_725">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0x6F0"/>
-                </Sample>
-                <Sample Name="Sample_726">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_727">
-                    <Offset Version="MQDebug" At="0x3D0630" LoopOffset="0xC90"/>
-                </Sample>
-                <Sample Name="Sample_728">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x650"/>
-                </Sample>
-                <Sample Name="Sample_729">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x7F0"/>
-                </Sample>
-                <Sample Name="Sample_730">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x240"/>
-                </Sample>
-                <Sample Name="Sample_731">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_732">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_733">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x520"/>
-                </Sample>
-                <Sample Name="Sample_734">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x2D0"/>
-                </Sample>
-                <Sample Name="Sample_735">
-                    <Offset Version="MQDebug" At="0x3D42E0" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_736">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_737">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x730"/>
-                </Sample>
-                <Sample Name="Sample_738">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x6E0"/>
-                </Sample>
-                <Sample Name="Sample_739">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x200"/>
-                </Sample>
-                <Sample Name="Sample_740">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x2D0"/>
-                </Sample>
-                <Sample Name="Sample_741">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x560"/>
-                </Sample>
-                <Sample Name="Sample_742">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_743">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x490"/>
-                </Sample>
-                <Sample Name="Sample_744">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x820"/>
-                </Sample>
-                <Sample Name="Sample_745">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x5B0"/>
-                </Sample>
-                <Sample Name="Sample_746">
-                    <Offset Version="MQDebug" At="0x3D9670" LoopOffset="0x5C0"/>
-                </Sample>
-                <Sample Name="Sample_747">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x110"/>
-                </Sample>
-                <Sample Name="Sample_748">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x750"/>
-                </Sample>
-                <Sample Name="Sample_749">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x270"/>
-                </Sample>
-                <Sample Name="Sample_750">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x340"/>
-                </Sample>
-                <Sample Name="Sample_751">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x5D0"/>
-                </Sample>
-                <Sample Name="Sample_752">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_753">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x500"/>
-                </Sample>
-                <Sample Name="Sample_754">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x890"/>
-                </Sample>
-                <Sample Name="Sample_755">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x620"/>
-                </Sample>
-                <Sample Name="Sample_756">
-                    <Offset Version="MQDebug" At="0x3DE410" LoopOffset="0x630"/>
-                </Sample>
-                <Sample Name="Sample_757">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x180"/>
-                </Sample>
-                <Sample Name="Sample_758">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x7C0"/>
-                </Sample>
-                <Sample Name="Sample_759">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_760">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x3B0"/>
-                </Sample>
-                <Sample Name="Sample_761">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x640"/>
-                </Sample>
-                <Sample Name="Sample_762">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x3D0"/>
-                </Sample>
-                <Sample Name="Sample_763">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x570"/>
-                </Sample>
-                <Sample Name="Sample_764">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x900"/>
-                </Sample>
-                <Sample Name="Sample_765">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x690"/>
-                </Sample>
-                <Sample Name="Sample_766">
-                    <Offset Version="MQDebug" At="0x3E0BA0" LoopOffset="0x6A0"/>
-                </Sample>
-                <Sample Name="Sample_767">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x1F0"/>
-                </Sample>
-                <Sample Name="Sample_768">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x830"/>
-                </Sample>
-                <Sample Name="Sample_769">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x350"/>
-                </Sample>
-                <Sample Name="Sample_770">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x420"/>
-                </Sample>
-                <Sample Name="Sample_771">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x6B0"/>
-                </Sample>
-                <Sample Name="Sample_772">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x440"/>
-                </Sample>
-                <Sample Name="Sample_773">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x5E0"/>
-                </Sample>
-                <Sample Name="Sample_774">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x970"/>
-                </Sample>
-                <Sample Name="Sample_775">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x700"/>
-                </Sample>
-                <Sample Name="Sample_776">
-                    <Offset Version="MQDebug" At="0x3E3330" LoopOffset="0x710"/>
-                </Sample>
-                <Sample Name="Sample_777">
-                    <Offset Version="MQDebug" At="0x3EBAA0" LoopOffset="0x270"/>
-                </Sample>
-                <Sample Name="Sample_778">
-                    <Offset Version="MQDebug" At="0x3EBAA0" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_779">
-                    <Offset Version="MQDebug" At="0x3EBAA0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_780">
-                    <Offset Version="MQDebug" At="0x3EF2C0" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_781">
-                    <Offset Version="MQDebug" At="0x3EF2C0" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_782">
-                    <Offset Version="MQDebug" At="0x3F0780" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_783">
-                    <Offset Version="MQDebug" At="0x3F0780" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_784">
-                    <Offset Version="MQDebug" At="0x3F21D0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_785">
-                    <Offset Version="MQDebug" At="0x3F21D0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_786">
-                    <Offset Version="MQDebug" At="0x3F21D0" LoopOffset="0x650"/>
-                </Sample>
-                <Sample Name="Sample_787">
-                    <Offset Version="MQDebug" At="0x3F21D0" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_788">
-                    <Offset Version="MQDebug" At="0x3F21D0" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_789">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x430"/>
-                </Sample>
-                <Sample Name="Sample_790">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x4C0"/>
-                </Sample>
-                <Sample Name="Sample_791">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x930"/>
-                </Sample>
-                <Sample Name="Sample_792">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x790"/>
-                </Sample>
-                <Sample Name="Sample_793">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_794">
-                    <Offset Version="MQDebug" At="0x3F3980" LoopOffset="0x420"/>
-                </Sample>
-                <Sample Name="Sample_795">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x4C0"/>
-                </Sample>
-                <Sample Name="Sample_796">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_797">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_798">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x440"/>
-                </Sample>
-                <Sample Name="Sample_799">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x550"/>
-                </Sample>
-                <Sample Name="Sample_800">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_801">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_802">
-                    <Offset Version="MQDebug" At="0x3F43C0" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_803">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0x5E0"/>
-                </Sample>
-                <Sample Name="Sample_804">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0x550"/>
-                </Sample>
-                <Sample Name="Sample_805">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0x620"/>
-                </Sample>
-                <Sample Name="Sample_806">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0x580"/>
-                </Sample>
-                <Sample Name="Sample_807">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0xC30"/>
-                </Sample>
-                <Sample Name="Sample_808">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0x120"/>
-                </Sample>
-                <Sample Name="Sample_809">
-                    <Offset Version="MQDebug" At="0x3F9010" LoopOffset="0xAE0"/>
-                </Sample>
-                <Sample Name="Sample_810">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0x670"/>
-                </Sample>
-                <Sample Name="Sample_811">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0x5E0"/>
-                </Sample>
-                <Sample Name="Sample_812">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0x6B0"/>
-                </Sample>
-                <Sample Name="Sample_813">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0x610"/>
-                </Sample>
-                <Sample Name="Sample_814">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0xCC0"/>
-                </Sample>
-                <Sample Name="Sample_815">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0x1B0"/>
-                </Sample>
-                <Sample Name="Sample_816">
-                    <Offset Version="MQDebug" At="0x4009E0" LoopOffset="0xB70"/>
-                </Sample>
-                <Sample Name="Sample_817">
-                    <Offset Version="MQDebug" At="0x40A1A0" LoopOffset="0x790"/>
-                </Sample>
-                <Sample Name="Sample_818">
-                    <Offset Version="MQDebug" At="0x40A1A0" LoopOffset="0x820"/>
-                </Sample>
-                <Sample Name="Sample_819">
-                    <Offset Version="MQDebug" At="0x40A1A0" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_820">
-                    <Offset Version="MQDebug" At="0x40A1A0" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_821">
-                    <Offset Version="MQDebug" At="0x40E220" LoopOffset="0x8B0"/>
-                </Sample>
-                <Sample Name="Sample_822">
-                    <Offset Version="MQDebug" At="0x40E220" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_823">
-                    <Offset Version="MQDebug" At="0x40EBE0" LoopOffset="0x920"/>
-                </Sample>
-                <Sample Name="Sample_824">
-                    <Offset Version="MQDebug" At="0x40EBE0" LoopOffset="0x5A0"/>
-                </Sample>
-                <Sample Name="Sample_825">
-                    <Offset Version="MQDebug" At="0x40EBE0" LoopOffset="0x7A0"/>
-                </Sample>
-                <Sample Name="Sample_826">
-                    <Offset Version="MQDebug" At="0x411340" LoopOffset="0x990"/>
-                </Sample>
-                <Sample Name="Sample_827">
-                    <Offset Version="MQDebug" At="0x411340" LoopOffset="0x610"/>
-                </Sample>
-                <Sample Name="Sample_828">
-                    <Offset Version="MQDebug" At="0x411340" LoopOffset="0x810"/>
-                </Sample>
-                <Sample Name="Sample_829">
-                    <Offset Version="MQDebug" At="0x412620" LoopOffset="0xA00"/>
-                </Sample>
-                <Sample Name="Sample_830">
-                    <Offset Version="MQDebug" At="0x412620" LoopOffset="0x680"/>
-                </Sample>
-                <Sample Name="Sample_831">
-                    <Offset Version="MQDebug" At="0x412620" LoopOffset="0x880"/>
-                </Sample>
-                <Sample Name="Sample_832">
-                    <Offset Version="MQDebug" At="0x414C60" LoopOffset="0xA70"/>
-                </Sample>
-                <Sample Name="Sample_833">
-                    <Offset Version="MQDebug" At="0x414C60" LoopOffset="0x6F0"/>
-                </Sample>
-                <Sample Name="Sample_834">
-                    <Offset Version="MQDebug" At="0x414C60" LoopOffset="0x8F0"/>
-                </Sample>
-                <Sample Name="Sample_835">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0xA70"/>
-                </Sample>
-                <Sample Name="Sample_836">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x810"/>
-                </Sample>
-                <Sample Name="Sample_837">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_838">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_839">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_840">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x7B0"/>
-                </Sample>
-                <Sample Name="Sample_841">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0xAE0"/>
-                </Sample>
-                <Sample Name="Sample_842">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_843">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x540"/>
-                </Sample>
-                <Sample Name="Sample_844">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x370"/>
-                </Sample>
-                <Sample Name="Sample_845">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x350"/>
-                </Sample>
-                <Sample Name="Sample_846">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x490"/>
-                </Sample>
-                <Sample Name="Sample_847">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x2C0"/>
-                </Sample>
-                <Sample Name="Sample_848">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x820"/>
-                </Sample>
-                <Sample Name="Sample_849">
-                    <Offset Version="MQDebug" At="0x419100" LoopOffset="0x930"/>
-                </Sample>
-                <Sample Name="Sample_850">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0xB00"/>
-                </Sample>
-                <Sample Name="Sample_851">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x8A0"/>
-                </Sample>
-                <Sample Name="Sample_852">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_853">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_854">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_855">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x840"/>
-                </Sample>
-                <Sample Name="Sample_856">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0xB70"/>
-                </Sample>
-                <Sample Name="Sample_857">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_858">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x5D0"/>
-                </Sample>
-                <Sample Name="Sample_859">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_860">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x3E0"/>
-                </Sample>
-                <Sample Name="Sample_861">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x520"/>
-                </Sample>
-                <Sample Name="Sample_862">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x350"/>
-                </Sample>
-                <Sample Name="Sample_863">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x8B0"/>
-                </Sample>
-                <Sample Name="Sample_864">
-                    <Offset Version="MQDebug" At="0x41E120" LoopOffset="0x9C0"/>
-                </Sample>
-                <Sample Name="Sample_865">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0xB90"/>
-                </Sample>
-                <Sample Name="Sample_866">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x930"/>
-                </Sample>
-                <Sample Name="Sample_867">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_868">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_869">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x5C0"/>
-                </Sample>
-                <Sample Name="Sample_870">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x8D0"/>
-                </Sample>
-                <Sample Name="Sample_871">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0xC00"/>
-                </Sample>
-                <Sample Name="Sample_872">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_873">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x660"/>
-                </Sample>
-                <Sample Name="Sample_874">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x490"/>
-                </Sample>
-                <Sample Name="Sample_875">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x470"/>
-                </Sample>
-                <Sample Name="Sample_876">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x5B0"/>
-                </Sample>
-                <Sample Name="Sample_877">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x3E0"/>
-                </Sample>
-                <Sample Name="Sample_878">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0x940"/>
-                </Sample>
-                <Sample Name="Sample_879">
-                    <Offset Version="MQDebug" At="0x4227D0" LoopOffset="0xA50"/>
-                </Sample>
-                <Sample Name="Sample_880">
-                    <Offset Version="MQDebug" At="0x4264C0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_881">
-                    <Offset Version="MQDebug" At="0x4264C0" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_882">
-                    <Offset Version="MQDebug" At="0x4264C0" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_883">
-                    <Offset Version="MQDebug" At="0x4264C0" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_884">
-                    <Offset Version="MQDebug" At="0x427770" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_885">
-                    <Offset Version="MQDebug" At="0x427770" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_886">
-                    <Offset Version="MQDebug" At="0x427770" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_887">
-                    <Offset Version="MQDebug" At="0x427770" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_888">
-                    <Offset Version="MQDebug" At="0x427770" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_889">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_890">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_891">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0x3B0"/>
-                </Sample>
-                <Sample Name="Sample_892">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_893">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0x370"/>
-                </Sample>
-                <Sample Name="Sample_894">
-                    <Offset Version="MQDebug" At="0x42F0D0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_895">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x530"/>
-                </Sample>
-                <Sample Name="Sample_896">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x5C0"/>
-                </Sample>
-                <Sample Name="Sample_897">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x4D0"/>
-                </Sample>
-                <Sample Name="Sample_898">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_899">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x3F0"/>
-                </Sample>
-                <Sample Name="Sample_900">
-                    <Offset Version="MQDebug" At="0x4328B0" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_901">
-                    <Offset Version="MQDebug" At="0x435820" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_902">
-                    <Offset Version="MQDebug" At="0x435820" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_903">
-                    <Offset Version="MQDebug" At="0x435820" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_904">
-                    <Offset Version="MQDebug" At="0x437AD0" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_905">
-                    <Offset Version="MQDebug" At="0x437AD0" LoopOffset="0x240"/>
-                </Sample>
-                <Sample Name="Sample_906">
-                    <Offset Version="MQDebug" At="0x437AD0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_907">
-                    <Offset Version="MQDebug" At="0x437AD0" LoopOffset="0x120"/>
-                </Sample>
-                <Sample Name="Sample_908">
-                    <Offset Version="MQDebug" At="0x43BB30" LoopOffset="0x290"/>
-                </Sample>
-                <Sample Name="Sample_909">
-                    <Offset Version="MQDebug" At="0x43BB30" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_910">
-                    <Offset Version="MQDebug" At="0x43BB30" LoopOffset="0x2D0"/>
-                </Sample>
-                <Sample Name="Sample_911">
-                    <Offset Version="MQDebug" At="0x43BB30" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_912">
-                    <Offset Version="MQDebug" At="0x43BB30" LoopOffset="0x1B0"/>
-                </Sample>
-                <Sample Name="Sample_913">
-                    <Offset Version="MQDebug" At="0x43E560" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_914">
-                    <Offset Version="MQDebug" At="0x43E560" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_915">
-                    <Offset Version="MQDebug" At="0x43E560" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_916">
-                    <Offset Version="MQDebug" At="0x43E560" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_917">
-                    <Offset Version="MQDebug" At="0x43E560" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_918">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0xAE0"/>
-                </Sample>
-                <Sample Name="Sample_919">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x500"/>
-                </Sample>
-                <Sample Name="Sample_920">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_921">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x6E0"/>
-                </Sample>
-                <Sample Name="Sample_922">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x800"/>
-                </Sample>
-                <Sample Name="Sample_923">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x4B0"/>
-                </Sample>
-                <Sample Name="Sample_924">
-                    <Offset Version="MQDebug" At="0x43FA60" LoopOffset="0x9C0"/>
-                </Sample>
-                <Sample Name="Sample_925">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0xB70"/>
-                </Sample>
-                <Sample Name="Sample_926">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0x590"/>
-                </Sample>
-                <Sample Name="Sample_927">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_928">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0x770"/>
-                </Sample>
-                <Sample Name="Sample_929">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0x890"/>
-                </Sample>
-                <Sample Name="Sample_930">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0x540"/>
-                </Sample>
-                <Sample Name="Sample_931">
-                    <Offset Version="MQDebug" At="0x442D20" LoopOffset="0xA50"/>
-                </Sample>
-                <Sample Name="Sample_932">
-                    <Offset Version="MQDebug" At="0x4461A0" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_933">
-                    <Offset Version="MQDebug" At="0x4461A0" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_934">
-                    <Offset Version="MQDebug" At="0x44A130" LoopOffset="0x470"/>
-                </Sample>
-                <Sample Name="Sample_935">
-                    <Offset Version="MQDebug" At="0x44A130" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_936">
-                    <Offset Version="MQDebug" At="0x4520D0" LoopOffset="0xCA0"/>
-                </Sample>
-                <Sample Name="Sample_937">
-                    <Offset Version="MQDebug" At="0x4520D0" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_938">
-                    <Offset Version="MQDebug" At="0x45D9D0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_939">
-                    <Offset Version="MQDebug" At="0x45D9D0" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_940">
-                    <Offset Version="MQDebug" At="0x45D9D0" LoopOffset="0x3F0"/>
-                </Sample>
-                <Sample Name="Sample_941">
-                    <Offset Version="MQDebug" At="0x4608E0" LoopOffset="0x410"/>
-                </Sample>
-                <Sample Name="Sample_942">
-                    <Offset Version="MQDebug" At="0x4608E0" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_943">
-                    <Offset Version="MQDebug" At="0x4608E0" LoopOffset="0x480"/>
-                </Sample>
-                <Sample Name="Sample_944">
-                    <Offset Version="MQDebug" At="0x464970" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_945">
-                    <Offset Version="MQDebug" At="0x464970" LoopOffset="0x80"/>
-                </Sample>
-                <Sample Name="Sample_946">
-                    <Offset Version="MQDebug" At="0x464970" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_947">
-                    <Offset Version="MQDebug" At="0x46AB90" LoopOffset="0x1A0"/>
-                </Sample>
-                <Sample Name="Sample_948">
-                    <Offset Version="MQDebug" At="0x46AB90" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_949">
-                    <Offset Version="MQDebug" At="0x46AB90" LoopOffset="0x370"/>
-                </Sample>
-                <Sample Name="Sample_950">
-                    <Offset Version="MQDebug" At="0x46E340" LoopOffset="0x110"/>
-                </Sample>
-                <Sample Name="Sample_951">
-                    <Offset Version="MQDebug" At="0x46E340" LoopOffset="0x3E0"/>
-                </Sample>
-                <Sample Name="Sample_952">
-                    <Offset Version="MQDebug" At="0x4728F0" LoopOffset="0x470"/>
-                </Sample>
-                <Sample Name="Sample_953">
-                    <Offset Version="MQDebug" At="0x4728F0" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_954">
-                    <Offset Version="MQDebug" At="0x473E10" LoopOffset="0x2D0"/>
-                </Sample>
-                <Sample Name="Sample_955">
-                    <Offset Version="MQDebug" At="0x473E10" LoopOffset="0x210"/>
-                </Sample>
-                <Sample Name="Sample_956">
-                    <Offset Version="MQDebug" At="0x478C20" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_957">
-                    <Offset Version="MQDebug" At="0x478C20" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_958">
-                    <Offset Version="MQDebug" At="0x478C20" LoopOffset="0xBA0"/>
-                </Sample>
-                <Sample Name="Sample_959">
-                    <Offset Version="MQDebug" At="0x480600" LoopOffset="0x4A0"/>
-                </Sample>
-                <Sample Name="Sample_960">
-                    <Offset Version="MQDebug" At="0x480600" LoopOffset="0x3F0"/>
-                </Sample>
-                <Sample Name="Sample_961">
-                    <Offset Version="MQDebug" At="0x480600" LoopOffset="0x270"/>
-                </Sample>
-                <Sample Name="Sample_962">
-                    <Offset Version="MQDebug" At="0x483620" LoopOffset="0xDB0"/>
-                </Sample>
-                <Sample Name="Sample_963">
-                    <Offset Version="MQDebug" At="0x483620" LoopOffset="0x480"/>
-                </Sample>
-                <Sample Name="Sample_964">
-                    <Offset Version="MQDebug" At="0x483620" LoopOffset="0xAF0"/>
-                </Sample>
-                <Sample Name="Sample_965">
-                    <Offset Version="MQDebug" At="0x483620" LoopOffset="0x7D0"/>
-                </Sample>
-                <Sample Name="Sample_966">
-                    <Offset Version="MQDebug" At="0x483620" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_967">
-                    <Offset Version="MQDebug" At="0x4889B0" LoopOffset="0xE40"/>
-                </Sample>
-                <Sample Name="Sample_968">
-                    <Offset Version="MQDebug" At="0x4889B0" LoopOffset="0x510"/>
-                </Sample>
-                <Sample Name="Sample_969">
-                    <Offset Version="MQDebug" At="0x4889B0" LoopOffset="0xB80"/>
-                </Sample>
-                <Sample Name="Sample_970">
-                    <Offset Version="MQDebug" At="0x4889B0" LoopOffset="0x860"/>
-                </Sample>
-                <Sample Name="Sample_971">
-                    <Offset Version="MQDebug" At="0x4889B0" LoopOffset="0x490"/>
-                </Sample>
-                <Sample Name="Sample_972">
-                    <Offset Version="MQDebug" At="0x48E460"/>
-                </Sample>
-                <Sample Name="Sample_973">
-                    <Offset Version="MQDebug" At="0x491090"/>
-                </Sample>
-                <Sample Name="Sample_974">
-                    <Offset Version="MQDebug" At="0x493E70"/>
-                </Sample>
-                <Sample Name="Sample_975">
-                    <Offset Version="MQDebug" At="0x495240"/>
-                </Sample>
-                <Sample Name="Sample_976">
-                    <Offset Version="MQDebug" At="0x496610"/>
-                </Sample>
-                <Sample Name="Sample_977">
-                    <Offset Version="MQDebug" At="0x498B50"/>
-                </Sample>
-                <Sample Name="Sample_978">
-                    <Offset Version="MQDebug" At="0x49A670"/>
-                </Sample>
-                <Sample Name="Sample_979">
-                    <Offset Version="MQDebug" At="0x49BF60"/>
-                </Sample>
-                <Sample Name="Sample_980">
-                    <Offset Version="MQDebug" At="0x4A5780"/>
-                </Sample>
-                <Sample Name="Sample_981">
-                    <Offset Version="MQDebug" At="0x4AB940"/>
-                </Sample>
-                <Sample Name="Sample_982">
-                    <Offset Version="MQDebug" At="0x4AEF20"/>
-                </Sample>
-                <Sample Name="Sample_983">
-                    <Offset Version="MQDebug" At="0x4B0BA0"/>
-                </Sample>
-                <Sample Name="Sample_984">
-                    <Offset Version="MQDebug" At="0x4B0CD0"/>
-                </Sample>
-                <Sample Name="Sample_985">
-                    <Offset Version="MQDebug" At="0x4B4940"/>
-                </Sample>
-                <Sample Name="Sample_986">
-                    <Offset Version="MQDebug" At="0x4B6610" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_987">
-                    <Offset Version="MQDebug" At="0x4B6610" LoopOffset="0x80"/>
-                </Sample>
-                <Sample Name="Sample_988">
-                    <Offset Version="MQDebug" At="0x4B6610" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_989">
-                    <Offset Version="MQDebug" At="0x4B9CE0" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_990">
-                    <Offset Version="MQDebug" At="0x4B9CE0" LoopOffset="0x110"/>
-                </Sample>
-                <Sample Name="Sample_991">
-                    <Offset Version="MQDebug" At="0x4B9CE0" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_992">
-                    <Offset Version="MQDebug" At="0x4BE590" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_993">
-                    <Offset Version="MQDebug" At="0x4BE590" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_994">
-                    <Offset Version="MQDebug" At="0x4BE590" LoopOffset="0x1A0"/>
-                </Sample>
-                <Sample Name="Sample_995">
-                    <Offset Version="MQDebug" At="0x4BF5B0" LoopOffset="0x100"/>
-                </Sample>
-                <Sample Name="Sample_996">
-                    <Offset Version="MQDebug" At="0x4BF5B0" LoopOffset="0x230"/>
-                </Sample>
-                <Sample Name="Sample_997">
-                    <Offset Version="MQDebug" At="0x4BF5B0" LoopOffset="0x210"/>
-                </Sample>
-                <Sample Name="Sample_998">
-                    <Offset Version="MQDebug" At="0x4C0DA0" LoopOffset="0x170"/>
-                </Sample>
-                <Sample Name="Sample_999">
-                    <Offset Version="MQDebug" At="0x4C0DA0" LoopOffset="0x2A0"/>
-                </Sample>
-                <Sample Name="Sample_1000">
-                    <Offset Version="MQDebug" At="0x4C0DA0" LoopOffset="0x280"/>
-                </Sample>
-                <Sample Name="Sample_1001">
-                    <Offset Version="MQDebug" At="0x4C1CC0" LoopOffset="0x3A0"/>
-                </Sample>
-                <Sample Name="Sample_1002">
-                    <Offset Version="MQDebug" At="0x4C1CC0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_1003">
-                    <Offset Version="MQDebug" At="0x4CC1F0" LoopOffset="0x430"/>
-                </Sample>
-                <Sample Name="Sample_1004">
-                    <Offset Version="MQDebug" At="0x4CC1F0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_1005">
-                    <Offset Version="MQDebug" At="0x4D1CF0" LoopOffset="0x510"/>
-                </Sample>
-                <Sample Name="Sample_1006">
-                    <Offset Version="MQDebug" At="0x4D1CF0" LoopOffset="0x3F0"/>
-                </Sample>
-                <Sample Name="Sample_1007">
-                    <Offset Version="MQDebug" At="0x4D4230"/>
-                </Sample>
-                <Sample Name="Sample_1008">
-                    <Offset Version="MQDebug" At="0x4DEB10" LoopOffset="0x760"/>
-                </Sample>
-                <Sample Name="Sample_1009">
-                    <Offset Version="MQDebug" At="0x4DEB10" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_1010">
-                    <Offset Version="MQDebug" At="0x4E60A0" LoopOffset="0x380"/>
-                </Sample>
-                <Sample Name="Sample_1011">
-                    <Offset Version="MQDebug" At="0x4E60A0" LoopOffset="0x250"/>
-                </Sample>
-                <Sample Name="Sample_1012">
-                    <Offset Version="MQDebug" At="0x4E60A0" LoopOffset="0x2F0"/>
-                </Sample>
-                <Sample Name="Sample_1013">
-                    <Offset Version="MQDebug" At="0x4E65F0"/>
-                </Sample>
-                <Sample Name="Sample_1014">
-                    <Offset Version="MQDebug" At="0x4EC650" LoopOffset="0x120"/>
-                </Sample>
-                <Sample Name="Sample_1015">
-                    <Offset Version="MQDebug" At="0x4EC650" LoopOffset="0x1D0"/>
-                </Sample>
-                <Sample Name="Sample_1016">
-                    <Offset Version="MQDebug" At="0x4ED240" LoopOffset="0xC00"/>
-                </Sample>
-                <Sample Name="Sample_1017">
-                    <Offset Version="MQDebug" At="0x4ED240" LoopOffset="0x1E0"/>
-                </Sample>
-                <Sample Name="Sample_1018">
-                    <Offset Version="MQDebug" At="0x4ED240" LoopOffset="0x100"/>
-                </Sample>
-                <Sample Name="Sample_1019">
-                    <Offset Version="MQDebug" At="0x4ED240" LoopOffset="0x200"/>
-                </Sample>
-                <Sample Name="Sample_1020">
-                    <Offset Version="MQDebug" At="0x4EF640" LoopOffset="0x3E0"/>
-                </Sample>
-                <Sample Name="Sample_1021">
-                    <Offset Version="MQDebug" At="0x4EF640" LoopOffset="0x2E0"/>
-                </Sample>
-                <Sample Name="Sample_1022">
-                    <Offset Version="MQDebug" At="0x4F3440" LoopOffset="0x450"/>
-                </Sample>
-                <Sample Name="Sample_1023">
-                    <Offset Version="MQDebug" At="0x4F3440" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_1024">
-                    <Offset Version="MQDebug" At="0x4F6280" LoopOffset="0x4E0"/>
-                </Sample>
-                <Sample Name="Sample_1025">
-                    <Offset Version="MQDebug" At="0x4F6280" LoopOffset="0x140"/>
-                </Sample>
-                <Sample Name="Sample_1026">
-                    <Offset Version="MQDebug" At="0x4F8B20" LoopOffset="0x400"/>
-                </Sample>
-                <Sample Name="Sample_1027">
-                    <Offset Version="MQDebug" At="0x4F8B20" LoopOffset="0x360"/>
-                </Sample>
-                <Sample Name="Sample_1028">
-                    <Offset Version="MQDebug" At="0x4FADE0" LoopOffset="0x470"/>
-                </Sample>
-                <Sample Name="Sample_1029">
-                    <Offset Version="MQDebug" At="0x4FADE0" LoopOffset="0x3D0"/>
-                </Sample>
-                <Sample Name="Sample_1030">
-                    <Offset Version="MQDebug" At="0x4FD5B0" LoopOffset="0x4E0"/>
-                </Sample>
-                <Sample Name="Sample_1031">
-                    <Offset Version="MQDebug" At="0x4FD5B0" LoopOffset="0x440"/>
-                </Sample>
-                <Sample Name="Sample_1032">
-                    <Offset Version="MQDebug" At="0x500080" LoopOffset="0x550"/>
-                </Sample>
-                <Sample Name="Sample_1033">
-                    <Offset Version="MQDebug" At="0x500080" LoopOffset="0x4B0"/>
-                </Sample>
-                <Sample Name="Sample_1034">
-                    <Offset Version="MQDebug" At="0x500FD0" LoopOffset="0x960"/>
-                </Sample>
-                <Sample Name="Sample_1035">
-                    <Offset Version="MQDebug" At="0x500FD0" LoopOffset="0x5C0"/>
-                </Sample>
-                <Sample Name="Sample_1036">
-                    <Offset Version="MQDebug" At="0x501C90" LoopOffset="0xC90"/>
-                </Sample>
-                <Sample Name="Sample_1037">
-                    <Offset Version="MQDebug" At="0x501C90" LoopOffset="0xB0"/>
-                </Sample>
-                <Sample Name="Sample_1038">
-                    <Offset Version="MQDebug" At="0x50AA40" LoopOffset="0xD70"/>
-                </Sample>
-                <Sample Name="Sample_1039">
-                    <Offset Version="MQDebug" At="0x50AA40" LoopOffset="0x190"/>
-                </Sample>
-                <Sample Name="Sample_1040">
-                    <Offset Version="MQDebug" At="0x513220" LoopOffset="0xA80"/>
-                </Sample>
-                <Sample Name="Sample_1041">
-                    <Offset Version="MQDebug" At="0x513220" LoopOffset="0xDB0"/>
-                </Sample>
-                <Sample Name="Sample_1042">
-                    <Offset Version="MQDebug" At="0x5158C0" LoopOffset="0xB10"/>
-                </Sample>
-                <Sample Name="Sample_1043">
-                    <Offset Version="MQDebug" At="0x5158C0" LoopOffset="0xE40"/>
-                </Sample>
-                <Sample Name="Sample_1044">
-                    <Offset Version="MQDebug" At="0x517A50"/>
-                </Sample>
-                <Sample Name="Sample_1045">
-                    <Offset Version="MQDebug" At="0x51A230"/>
-                </Sample>
-                <Sample Name="Sample_1046">
-                    <Offset Version="MQDebug" At="0x51C3F0" LoopOffset="0xA0"/>
-                </Sample>
-                <Sample Name="Sample_1047">
-                    <Offset Version="MQDebug" At="0x51C3F0" LoopOffset="0x260"/>
-                </Sample>
-                <Sample Name="Sample_1048">
-                    <Offset Version="MQDebug" At="0x51E2C0"/>
-                </Sample>
-                <Sample Name="Sample_1049">
-                    <Offset Version="MQDebug" At="0x522F10" LoopOffset="0x130"/>
-                </Sample>
-                <Sample Name="Sample_1050">
-                    <Offset Version="MQDebug" At="0x522F10" LoopOffset="0x90"/>
-                </Sample>
-                <Sample Name="Sample_1051">
-                    <Offset Version="MQDebug" At="0x527B70" LoopOffset="0x1C0"/>
-                </Sample>
-                <Sample Name="Sample_1052">
-                    <Offset Version="MQDebug" At="0x527B70" LoopOffset="0x120"/>
-                </Sample>
-                <Sample Name="Sample_1053">
-                    <Offset Version="MQDebug" At="0x52A260"/>
-                </Sample>
-            </Samples>
-            <Samples Bank="2">
-                <Sample Name="Sample_1054">
-                    <Offset Version="MQDebug" At="0x0"/>
-                </Sample>
-                <Sample Name="Sample_1055">
-                    <Offset Version="MQDebug" At="0x2540"/>
-                </Sample>
-                <Sample Name="Sample_1056">
-                    <Offset Version="MQDebug" At="0x4800"/>
-                </Sample>
-                <Sample Name="Sample_1057">
-                    <Offset Version="MQDebug" At="0x72D0"/>
-                </Sample>
-                <Sample Name="Sample_1058">
-                    <Offset Version="MQDebug" At="0x7B70"/>
-                </Sample>
-                <Sample Name="Sample_1059">
-                    <Offset Version="MQDebug" At="0x8630"/>
-                </Sample>
-            </Samples>
-            <Soundfont Name="Soundfont_0" Index="0"/>
-            <Soundfont Name="Soundfont_1" Index="1"/>
-            <Soundfont Name="Soundfont_2" Index="2"/>
-            <Soundfont Name="Soundfont_3" Index="3"/>
-            <Soundfont Name="Soundfont_4" Index="4"/>
-            <Soundfont Name="Soundfont_5" Index="5"/>
-            <Soundfont Name="Soundfont_6" Index="6"/>
-            <Soundfont Name="Soundfont_7" Index="7"/>
-            <Soundfont Name="Soundfont_8" Index="8"/>
-            <Soundfont Name="Soundfont_9" Index="9"/>
-            <Soundfont Name="Soundfont_10" Index="10"/>
-            <Soundfont Name="Soundfont_11" Index="11"/>
-            <Soundfont Name="Soundfont_12" Index="12"/>
-            <Soundfont Name="Soundfont_13" Index="13"/>
-            <Soundfont Name="Soundfont_14" Index="14"/>
-            <Soundfont Name="Soundfont_15" Index="15"/>
-            <Soundfont Name="Soundfont_16" Index="16"/>
-            <Soundfont Name="Soundfont_17" Index="17"/>
-            <Soundfont Name="Soundfont_18" Index="18"/>
-            <Soundfont Name="Soundfont_19" Index="19"/>
-            <Soundfont Name="Soundfont_20" Index="20"/>
-            <Soundfont Name="Soundfont_21" Index="21"/>
-            <Soundfont Name="Soundfont_22" Index="22"/>
-            <Soundfont Name="Soundfont_23" Index="23"/>
-            <Soundfont Name="Soundfont_24" Index="24"/>
-            <Soundfont Name="Soundfont_25" Index="25"/>
-            <Soundfont Name="Soundfont_26" Index="26"/>
-            <Soundfont Name="Soundfont_27" Index="27"/>
-            <Soundfont Name="Soundfont_28" Index="28"/>
-            <Soundfont Name="Soundfont_29" Index="29"/>
-            <Soundfont Name="Soundfont_30" Index="30"/>
-            <Soundfont Name="Soundfont_31" Index="31"/>
-            <Soundfont Name="Soundfont_32" Index="32"/>
-            <Soundfont Name="Soundfont_33" Index="33"/>
-            <Soundfont Name="Soundfont_34" Index="34"/>
-            <Soundfont Name="Soundfont_35" Index="35"/>
-            <Soundfont Name="Soundfont_36" Index="36"/>
-            <Soundfont Name="Soundfont_37" Index="37"/>
-            <Soundfont Name="Soundfont_38" Index="38"/>
-            <Soundfont Name="Soundfont_39" Index="39"/>
-            <Soundfont Name="Soundfont_40" Index="40"/>
-        </Audio>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/actor.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/actor.xml
deleted file mode 100644
index bb4aa8c35..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/actor.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="code" BaseAddress="0x800A5AC0" RangeStart="0x1094C8" RangeEnd="0x1094E8" OutName="actor">
-        <DList Name="D_801AEF88" Offset="0x1094C8"/>
-        <DList Name="D_801AEFA0" Offset="0x1094E0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/debug_display.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/debug_display.xml
deleted file mode 100644
index 7a25bbd0c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/debug_display.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Root>
-    <File Name="code" BaseAddress="0x800A5AC0" RangeStart="0x114A90" RangeEnd="0x115550" OutName="debug_display">
-        <Array Name="sDebugDisplay1Vtx" Count="36" Offset="0x114A90">
-            <Vtx/>
-        </Array>
-        <DList Name="sDebugDisplay1DL" Offset="0x114CD0"/>
-
-        <Array Name="sDebugDisplay2Vtx" Count="8" Offset="0x114D30">
-            <Vtx/>
-        </Array>
-        <DList Name="sDebugDisplay2DL" Offset="0x114DB0"/>
-
-        <Array Name="sDebugDisplay3Vtx" Count="40" Offset="0x114E00">
-            <Vtx/>
-        </Array>
-        <DList Name="sDebugDisplay3DL" Offset="0x115080"/>
-
-        <Texture Name="sDebugDisplayCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x1150F8"/>
-        <Texture Name="sDebugDisplayBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x1151F8"/>
-        <Texture Name="sDebugDisplayCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x1152F8"/>
-        <Texture Name="sDebugDisplayCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x1153F8"/>
-
-        <Array Name="sDebugDisplaySpriteVtx" Count="4" Offset="0x1154F8">
-            <Vtx/>
-        </Array>
-        <DList Name="sDebugDisplaySpriteDL" Offset="0x115538"/>
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/eff_footmark.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/eff_footmark.xml
deleted file mode 100644
index 2fae1fe16..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/eff_footmark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="code" BaseAddress="0x800A5AC0" RangeStart="0x116750" RangeEnd="0x1167E0" OutName="eff_footmark">
-        <Array Name="gEffFootprintVtx" Count="3" Offset="0x116750">
-            <Vtx/>
-        </Array>
-        <DList Name="gEffFootprintMaterialDL" Offset="0x116780"/>
-        <DList Name="gEffFootprintModelDL" Offset="0x1167C8"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/eff_shield_particle.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/eff_shield_particle.xml
deleted file mode 100644
index 3ff553506..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/eff_shield_particle.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="code" BaseAddress="0x800A5AC0" RangeStart="0x108830" RangeEnd="0x108870" OutName="eff_shield_particle">
-        <Array Name="sEffShieldParticleVtx" Count="4" Offset="0x108830">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/fbdemo_circle.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/fbdemo_circle.xml
deleted file mode 100644
index 515b594a4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/fbdemo_circle.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Root>
-    <File Name="code" OutName="fbdemo_circle" BaseAddress="0x800A5AC0" RangeStart="0x138DD0" RangeEnd="0x1395D0">
-        <Texture Name="gCircleTex" Format="i4" Width="64" Height="64" Offset="0x138DD0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/sub_s.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/sub_s.xml
deleted file mode 100644
index 76db7e32c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/code/sub_s.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="code" OutName="sub_s" BaseAddress="0x800A5AC0" RangeStart="0x120260" RangeEnd="0x1202F0" >
-        <DList Name="gShadowMaterialDL" Offset="0x1202A0"/>
-        <DList Name="gShadowModelDL" Offset="0x1202C0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/do_action_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/do_action_static.xml
deleted file mode 100644
index 3fdd1e404..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/do_action_static.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Root>
-     <File Name="do_action_static" Segment="9">
-        <Texture Name="gDoActionAttackENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x0"/>
-        <Texture Name="gDoActionCheckENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x180"/>
-        <Texture Name="gDoActionEnterENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x300"/>
-        <Texture Name="gDoActionReturnENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x480"/>
-        <Texture Name="gDoActionOpenENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x600"/>
-        <Texture Name="gDoActionJumpENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x780"/>
-        <Texture Name="gDoActionDecideENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x900"/>
-        <Texture Name="gDoActionDiveENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
-        <Texture Name="gDoActionFasterENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
-        <Texture Name="gDoActionThrowENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
-
-        <!-- Unused and left untranslated from Japanese -->
-        <Texture Name="gDoActionNaviENGTex" OutName="navi_eng" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
-
-        <Texture Name="gDoActionClimbENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
-        <Texture Name="gDoActionDropENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
-        <Texture Name="gDoActionDownENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
-        <Texture Name="gDoActionQuitENGTex" OutName="quit_eng" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
-        <Texture Name="gDoActionSpeakENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
-        <Texture Name="gDoActionNextENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
-        <Texture Name="gDoActionGrabENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
-        <Texture Name="gDoActionStopENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
-        <Texture Name="gDoActionPutAwayENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
-
-        <!-- Unused and left untranslated from Japanese -->
-        <Texture Name="gDoActionReelENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
-
-        <Texture Name="gDoActionInfoENGTex" OutName="info_eng" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
-        <Texture Name="gDoActionWarpENGTex" OutName="warp_eng" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
-        <Texture Name="gDoActionSnapENGTex" OutName="snap_eng" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
-        <Texture Name="gDoActionExplodeENGTex" OutName="explode_eng" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
-        <Texture Name="gDoActionDanceENGTex" OutName="dance_eng" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
-        <Texture Name="gDoActionMarchENGTex" OutName="march_eng" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
-
-        <Texture Name="gDoActionNum1ENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
-        <Texture Name="gDoActionNum2ENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
-        <Texture Name="gDoActionNum3ENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
-        <Texture Name="gDoActionNum4ENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
-        <Texture Name="gDoActionNum5ENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
-        <Texture Name="gDoActionNum6ENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
-        <Texture Name="gDoActionNum7ENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
-        <Texture Name="gDoActionNum8ENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
-
-        <Texture Name="gDoActionCurlENGTex" OutName="curl_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
-        <Texture Name="gDoActionSurfaceENGTex" OutName="surface_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
-        <Texture Name="gDoActionSwimENGTex" OutName="swim_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
-        <Texture Name="gDoActionPunchENGTex" OutName="punch_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
-        <Texture Name="gDoActionPoundENGTex" OutName="pound_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
-
-        <!-- Unused and left untranslated from Japanese -->
-        <Texture Name="gDoActionHookENGTex" OutName="hook_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
-
-        <Texture Name="gDoActionShootENGTex" OutName="shoot_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
-     </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_dungeon_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_dungeon_static.xml
deleted file mode 100644
index 04ba39338..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_dungeon_static.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<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/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_field_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_field_static.xml
deleted file mode 100644
index 8fe3a9299..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_field_static.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<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/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_gameover_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_gameover_static.xml
deleted file mode 100644
index 405167b86..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_gameover_static.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="icon_item_gameover_static" Segment="12">
-        <Texture Name="gGameOverP1Tex" OutName="game_over_p1" Format="ia8" Width="64" Height="32" Offset="0x0"/>
-        <Texture Name="gGameOverP2Tex" OutName="game_over_p2" Format="ia8" Width="64" Height="32" Offset="0x800"/>
-        <Texture Name="gGameOverP3Tex" OutName="game_over_p3" Format="ia8" Width="64" Height="32" Offset="0x1000"/>
-        <Texture Name="gGameOverMaskTex" OutName="game_over_mask" Format="ia8" Width="64" Height="32" Offset="0x1800"/>
-        <Texture Name="gContinuePlayingJAPTex" OutName="continue_playing_jap" Format="ia8" Width="152" Height="16" Offset="0x2000"/>
-        <Texture Name="gContinuePlayingNESTex" OutName="continue_playing_nes" Format="ia8" Width="152" Height="16" Offset="0x2980"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_jpn_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_jpn_static.xml
deleted file mode 100644
index aff93d07e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_jpn_static.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<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/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_vtx_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_vtx_static.xml
deleted file mode 100644
index 2c7bfe219..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/icon_item_vtx_static.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="archives/icon_item_static.xml" OutPath="assets/archives/icon_item_static"/>
-    <File Name="icon_item_vtx_static" Segment="11">
-        <DList Name="gItemNamePanelDL" Offset="0x0"/>
-        <DList Name="gZButtonIconDL" Offset="0x90"/>
-        <DList Name="gRButtonIconDL" Offset="0xE0"/>
-        <DList Name="gCButtonIconsDL" Offset="0x130"/>
-        <DList Name="gAButtonIconDL" Offset="0x188"/>
-        <DList Name="gBButtonIconDL" Offset="0x1E0"/>
-        <DList Name="gPromptCursorLeftDL" Offset="0x238"/>
-        <DList Name="gPromptCursorRightDL" Offset="0x288"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/message_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/message_static.xml
deleted file mode 100644
index 81024355b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/message_static.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-     <File Name="message_static" Segment="7">
-        <Texture Name="gMessageDefaultBackgroundTex" OutName="message_default_background" Format="ia4" Width="128" Height="64" Offset="0x0"/>
-        <Texture Name="gMessageSignBackgroundTex" OutName="message_sign_background" Format="ia4" Width="128" Height="64" Offset="0x1000"/>
-        <Texture Name="gMessageNoteStaffBackgroundTex" OutName="message_note_staff_background" Format="ia4" Width="128" Height="64" Offset="0x2000"/>
-        <Texture Name="gMessageFadingBackgroundTex" OutName="message_fading_background" Format="i4" Width="128" Height="64" Offset="0x3000"/>
-        <Texture Name="gMessageNotebookBackgroundTex" OutName="message_notebook_background" Format="i4" Width="128" Height="64" Offset="0x4000"/>
-        <Texture Name="gMessageContinueTriangleTex" OutName="message_continue_triangle" Format="i4" Width="16" Height="16" Offset="0x5000"/>
-        <Texture Name="gMessageEndSquareTex" OutName="message_end_square" Format="i4" Width="16" Height="16" Offset="0x5080"/>
-        <Texture Name="gMessageArrowTex" OutName="message_arrow" Format="i4" Width="16" Height="16" Offset="0x5100"/>
-     </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/message_texture_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/message_texture_static.xml
deleted file mode 100644
index d7ecf1745..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/message_texture_static.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-     <File Name="message_texture_static" Segment="9">
-        <Texture Name="gMessageXLeftTex" OutName="message_x_left" Format="i4" Width="96" Height="48" Offset="0x0"/>
-        <Texture Name="gMessageXRightTex" OutName="message_x_right" Format="i4" Width="96" Height="48" Offset="0x900"/>
-     </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/nes_font_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/nes_font_static.xml
deleted file mode 100644
index b021dbfdb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/nes_font_static.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<Root>
-     <File Name="nes_font_static">
-        <!-- The two-digit number after the prefix is the character's codepoint: the hexadecimal byte it corresponds to in the text data -->
-        <!-- "ASCII" block -->
-        <!-- Not actually either ASCII or JIS X 0201: 0x5C is the yen symbol, 0x7E the tilde, 0x7F the masculine ordinal indicator -->
-        <Texture Name="gMsgChar20SpaceTex" OutName="msg_char_20_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
-        <Texture Name="gMsgChar21ExclamationMarkTex" OutName="msg_char_21_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x80"/>
-        <Texture Name="gMsgChar22QuotationMarkTex" OutName="msg_char_22_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x100"/>
-        <Texture Name="gMsgChar23NumberSignTex" OutName="msg_char_23_number_sign" Format="i4" Width="16" Height="16" Offset="0x180"/>
-        <Texture Name="gMsgChar24DollarSignTex" OutName="msg_char_24_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x200"/>
-        <Texture Name="gMsgChar25PercentSignTex" OutName="msg_char_25_percent_sign" Format="i4" Width="16" Height="16" Offset="0x280"/>
-        <Texture Name="gMsgChar26AmpersandTex" OutName="msg_char_26_ampersand" Format="i4" Width="16" Height="16" Offset="0x300"/>
-        <Texture Name="gMsgChar27ApostropheTex" OutName="msg_char_27_apostrophe" Format="i4" Width="16" Height="16" Offset="0x380"/>
-        <Texture Name="gMsgChar28LeftParenthesesTex" OutName="msg_char_28_left_parentheses" Format="i4" Width="16" Height="16" Offset="0x400"/>
-        <Texture Name="gMsgChar29RightParenthesesTex" OutName="msg_char_29_right_parentheses" Format="i4" Width="16" Height="16" Offset="0x480"/>
-        <Texture Name="gMsgChar2AAsteriskTex" OutName="msg_char_2a_asterisk" Format="i4" Width="16" Height="16" Offset="0x500"/>
-        <Texture Name="gMsgChar2BPlusSignTex" OutName="msg_char_2b_plus_sign" Format="i4" Width="16" Height="16" Offset="0x580"/>
-        <Texture Name="gMsgChar2CCommaTex" OutName="msg_char_2c_comma" Format="i4" Width="16" Height="16" Offset="0x600"/>
-        <Texture Name="gMsgChar2DHyphenMinusTex" OutName="msg_char_2d_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x680"/>
-        <Texture Name="gMsgChar2EFullStopTex" OutName="msg_char_2e_full_stop" Format="i4" Width="16" Height="16" Offset="0x700"/>
-        <Texture Name="gMsgChar2FSolidusTex" OutName="msg_char_2f_solidus" Format="i4" Width="16" Height="16" Offset="0x780"/>
-        <Texture Name="gMsgChar30Digit0Tex" OutName="msg_char_30_digit_0" Format="i4" Width="16" Height="16" Offset="0x800"/>
-        <Texture Name="gMsgChar31Digit1Tex" OutName="msg_char_31_digit_1" Format="i4" Width="16" Height="16" Offset="0x880"/>
-        <Texture Name="gMsgChar32Digit2Tex" OutName="msg_char_32_digit_2" Format="i4" Width="16" Height="16" Offset="0x900"/>
-        <Texture Name="gMsgChar33Digit3Tex" OutName="msg_char_33_digit_3" Format="i4" Width="16" Height="16" Offset="0x980"/>
-        <Texture Name="gMsgChar34Digit4Tex" OutName="msg_char_34_digit_4" Format="i4" Width="16" Height="16" Offset="0xA00"/>
-        <Texture Name="gMsgChar35Digit5Tex" OutName="msg_char_35_digit_5" Format="i4" Width="16" Height="16" Offset="0xA80"/>
-        <Texture Name="gMsgChar36Digit6Tex" OutName="msg_char_36_digit_6" Format="i4" Width="16" Height="16" Offset="0xB00"/>
-        <Texture Name="gMsgChar37Digit7Tex" OutName="msg_char_37_digit_7" Format="i4" Width="16" Height="16" Offset="0xB80"/>
-        <Texture Name="gMsgChar38Digit8Tex" OutName="msg_char_38_digit_8" Format="i4" Width="16" Height="16" Offset="0xC00"/>
-        <Texture Name="gMsgChar39Digit9Tex" OutName="msg_char_39_digit_9" Format="i4" Width="16" Height="16" Offset="0xC80"/>
-        <Texture Name="gMsgChar3AColonTex" OutName="msg_char_3a_colon" Format="i4" Width="16" Height="16" Offset="0xD00"/>
-        <Texture Name="gMsgChar3BSemicolonTex" OutName="msg_char_3b_semicolon" Format="i4" Width="16" Height="16" Offset="0xD80"/>
-        <Texture Name="gMsgChar3CLessThanSignTex" OutName="msg_char_3c_less_than_sign" Format="i4" Width="16" Height="16" Offset="0xE00"/>
-        <Texture Name="gMsgChar3DEqualsSignTex" OutName="msg_char_3d_equals_sign" Format="i4" Width="16" Height="16" Offset="0xE80"/>
-        <Texture Name="gMsgChar3EGreaterThanSignTex" OutName="msg_char_3e_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0xF00"/>
-        <Texture Name="gMsgChar3FQuestionMarkTex" OutName="msg_char_3f_question_mark" Format="i4" Width="16" Height="16" Offset="0xF80"/>
-        <Texture Name="gMsgChar40CommercialAtTex" OutName="msg_char_40_commercial_at" Format="i4" Width="16" Height="16" Offset="0x1000"/>
-        <Texture Name="gMsgChar41LatinCapitalLetterATex" OutName="msg_char_41_latin_capital_letter_a" Format="i4" Width="16" Height="16" Offset="0x1080"/>
-        <Texture Name="gMsgChar42LatinCapitalLetterBTex" OutName="msg_char_42_latin_capital_letter_b" Format="i4" Width="16" Height="16" Offset="0x1100"/>
-        <Texture Name="gMsgChar43LatinCapitalLetterCTex" OutName="msg_char_43_latin_capital_letter_c" Format="i4" Width="16" Height="16" Offset="0x1180"/>
-        <Texture Name="gMsgChar44LatinCapitalLetterDTex" OutName="msg_char_44_latin_capital_letter_d" Format="i4" Width="16" Height="16" Offset="0x1200"/>
-        <Texture Name="gMsgChar45LatinCapitalLetterETex" OutName="msg_char_45_latin_capital_letter_e" Format="i4" Width="16" Height="16" Offset="0x1280"/>
-        <Texture Name="gMsgChar46LatinCapitalLetterFTex" OutName="msg_char_46_latin_capital_letter_f" Format="i4" Width="16" Height="16" Offset="0x1300"/>
-        <Texture Name="gMsgChar47LatinCapitalLetterGTex" OutName="msg_char_47_latin_capital_letter_g" Format="i4" Width="16" Height="16" Offset="0x1380"/>
-        <Texture Name="gMsgChar48LatinCapitalLetterHTex" OutName="msg_char_48_latin_capital_letter_h" Format="i4" Width="16" Height="16" Offset="0x1400"/>
-        <Texture Name="gMsgChar49LatinCapitalLetterITex" OutName="msg_char_49_latin_capital_letter_i" Format="i4" Width="16" Height="16" Offset="0x1480"/>
-        <Texture Name="gMsgChar4ALatinCapitalLetterJTex" OutName="msg_char_4a_latin_capital_letter_j" Format="i4" Width="16" Height="16" Offset="0x1500"/>
-        <Texture Name="gMsgChar4BLatinCapitalLetterKTex" OutName="msg_char_4b_latin_capital_letter_k" Format="i4" Width="16" Height="16" Offset="0x1580"/>
-        <Texture Name="gMsgChar4CLatinCapitalLetterLTex" OutName="msg_char_4c_latin_capital_letter_l" Format="i4" Width="16" Height="16" Offset="0x1600"/>
-        <Texture Name="gMsgChar4DLatinCapitalLetterMTex" OutName="msg_char_4d_latin_capital_letter_m" Format="i4" Width="16" Height="16" Offset="0x1680"/>
-        <Texture Name="gMsgChar4ELatinCapitalLetterNTex" OutName="msg_char_4e_latin_capital_letter_n" Format="i4" Width="16" Height="16" Offset="0x1700"/>
-        <Texture Name="gMsgChar4FLatinCapitalLetterOTex" OutName="msg_char_4f_latin_capital_letter_o" Format="i4" Width="16" Height="16" Offset="0x1780"/>
-        <Texture Name="gMsgChar50LatinCapitalLetterPTex" OutName="msg_char_50_latin_capital_letter_p" Format="i4" Width="16" Height="16" Offset="0x1800"/>
-        <Texture Name="gMsgChar51LatinCapitalLetterQTex" OutName="msg_char_51_latin_capital_letter_q" Format="i4" Width="16" Height="16" Offset="0x1880"/>
-        <Texture Name="gMsgChar52LatinCapitalLetterRTex" OutName="msg_char_52_latin_capital_letter_r" Format="i4" Width="16" Height="16" Offset="0x1900"/>
-        <Texture Name="gMsgChar53LatinCapitalLetterSTex" OutName="msg_char_53_latin_capital_letter_s" Format="i4" Width="16" Height="16" Offset="0x1980"/>
-        <Texture Name="gMsgChar54LatinCapitalLetterTTex" OutName="msg_char_54_latin_capital_letter_t" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
-        <Texture Name="gMsgChar55LatinCapitalLetterUTex" OutName="msg_char_55_latin_capital_letter_u" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
-        <Texture Name="gMsgChar56LatinCapitalLetterVTex" OutName="msg_char_56_latin_capital_letter_v" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
-        <Texture Name="gMsgChar57LatinCapitalLetterWTex" OutName="msg_char_57_latin_capital_letter_w" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
-        <Texture Name="gMsgChar58LatinCapitalLetterXTex" OutName="msg_char_58_latin_capital_letter_x" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
-        <Texture Name="gMsgChar59LatinCapitalLetterYTex" OutName="msg_char_59_latin_capital_letter_y" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
-        <Texture Name="gMsgChar5ALatinCapitalLetterZTex" OutName="msg_char_5a_latin_capital_letter_z" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
-        <Texture Name="gMsgChar5BLeftSquareBracketTex" OutName="msg_char_5b_left_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
-        <Texture Name="gMsgChar5CYenSignTex" OutName="msg_char_5c_yen_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
-        <Texture Name="gMsgChar5DRightSquareBracketTex" OutName="msg_char_5d_right_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
-        <Texture Name="gMsgChar5ECircumflexAccentTex" OutName="msg_char_5e_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
-        <Texture Name="gMsgChar5FLowLineTex" OutName="msg_char_5f_low_line" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
-        <Texture Name="gMsgChar60GraveAccentTex" OutName="msg_char_60_grave_accent" Format="i4" Width="16" Height="16" Offset="0x2000"/>
-        <Texture Name="gMsgChar61LatinSmallLetterATex" OutName="msg_char_61_latin_small_letter_a" Format="i4" Width="16" Height="16" Offset="0x2080"/>
-        <Texture Name="gMsgChar62LatinSmallLetterBTex" OutName="msg_char_62_latin_small_letter_b" Format="i4" Width="16" Height="16" Offset="0x2100"/>
-        <Texture Name="gMsgChar63LatinSmallLetterCTex" OutName="msg_char_63_latin_small_letter_c" Format="i4" Width="16" Height="16" Offset="0x2180"/>
-        <Texture Name="gMsgChar64LatinSmallLetterDTex" OutName="msg_char_64_latin_small_letter_d" Format="i4" Width="16" Height="16" Offset="0x2200"/>
-        <Texture Name="gMsgChar65LatinSmallLetterETex" OutName="msg_char_65_latin_small_letter_e" Format="i4" Width="16" Height="16" Offset="0x2280"/>
-        <Texture Name="gMsgChar66LatinSmallLetterFTex" OutName="msg_char_66_latin_small_letter_f" Format="i4" Width="16" Height="16" Offset="0x2300"/>
-        <Texture Name="gMsgChar67LatinSmallLetterGTex" OutName="msg_char_67_latin_small_letter_g" Format="i4" Width="16" Height="16" Offset="0x2380"/>
-        <Texture Name="gMsgChar68LatinSmallLetterHTex" OutName="msg_char_68_latin_small_letter_h" Format="i4" Width="16" Height="16" Offset="0x2400"/>
-        <Texture Name="gMsgChar69LatinSmallLetterITex" OutName="msg_char_69_latin_small_letter_i" Format="i4" Width="16" Height="16" Offset="0x2480"/>
-        <Texture Name="gMsgChar6ALatinSmallLetterJTex" OutName="msg_char_6a_latin_small_letter_j" Format="i4" Width="16" Height="16" Offset="0x2500"/>
-        <Texture Name="gMsgChar6BLatinSmallLetterKTex" OutName="msg_char_6b_latin_small_letter_k" Format="i4" Width="16" Height="16" Offset="0x2580"/>
-        <Texture Name="gMsgChar6CLatinSmallLetterLTex" OutName="msg_char_6c_latin_small_letter_l" Format="i4" Width="16" Height="16" Offset="0x2600"/>
-        <Texture Name="gMsgChar6DLatinSmallLetterMTex" OutName="msg_char_6d_latin_small_letter_m" Format="i4" Width="16" Height="16" Offset="0x2680"/>
-        <Texture Name="gMsgChar6ELatinSmallLetterNTex" OutName="msg_char_6e_latin_small_letter_n" Format="i4" Width="16" Height="16" Offset="0x2700"/>
-        <Texture Name="gMsgChar6FLatinSmallLetterOTex" OutName="msg_char_6f_latin_small_letter_o" Format="i4" Width="16" Height="16" Offset="0x2780"/>
-        <Texture Name="gMsgChar70LatinSmallLetterPTex" OutName="msg_char_70_latin_small_letter_p" Format="i4" Width="16" Height="16" Offset="0x2800"/>
-        <Texture Name="gMsgChar71LatinSmallLetterQTex" OutName="msg_char_71_latin_small_letter_q" Format="i4" Width="16" Height="16" Offset="0x2880"/>
-        <Texture Name="gMsgChar72LatinSmallLetterRTex" OutName="msg_char_72_latin_small_letter_r" Format="i4" Width="16" Height="16" Offset="0x2900"/>
-        <Texture Name="gMsgChar73LatinSmallLetterSTex" OutName="msg_char_73_latin_small_letter_s" Format="i4" Width="16" Height="16" Offset="0x2980"/>
-        <Texture Name="gMsgChar74LatinSmallLetterTTex" OutName="msg_char_74_latin_small_letter_t" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
-        <Texture Name="gMsgChar75LatinSmallLetterUTex" OutName="msg_char_75_latin_small_letter_u" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
-        <Texture Name="gMsgChar76LatinSmallLetterVTex" OutName="msg_char_76_latin_small_letter_v" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
-        <Texture Name="gMsgChar77LatinSmallLetterWTex" OutName="msg_char_77_latin_small_letter_w" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
-        <Texture Name="gMsgChar78LatinSmallLetterXTex" OutName="msg_char_78_latin_small_letter_x" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
-        <Texture Name="gMsgChar79LatinSmallLetterYTex" OutName="msg_char_79_latin_small_letter_y" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
-        <Texture Name="gMsgChar7ALatinSmallLetterZTex" OutName="msg_char_7a_latin_small_letter_z" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
-        <Texture Name="gMsgChar7BLeftCurlyBracketTex" OutName="msg_char_7b_left_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
-        <Texture Name="gMsgChar7CVerticalLineTex" OutName="msg_char_7c_vertical_line" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
-        <Texture Name="gMsgChar7DRightCurlyBracketTex" OutName="msg_char_7d_right_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
-        <Texture Name="gMsgChar7ETildeTex" OutName="msg_char_7e_tilde" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
-        <Texture Name="gMsgChar7FMasculineOrdinalIndicatorTex" OutName="msg_char_7f_masculine_ordinal_indicator" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
-
-        <!-- Accented character section -->
-        <!-- These do not conform to any standard encoding, but this section is much more regular and expansive than the corresponding one in Ocarina of Time -->
-        <Texture Name="gMsgChar80LatinCapitalLetterAWithGraveTex" OutName="msg_char_80_latin_capital_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3000"/>
-        <Texture Name="gMsgChar81LatinCapitalLetterAWithAcuteTex" OutName="msg_char_81_latin_capital_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3080"/>
-        <Texture Name="gMsgChar82LatinCapitalLetterAWithCircumflexTex" OutName="msg_char_82_latin_capital_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3100"/>
-        <Texture Name="gMsgChar83LatinCapitalLetterAWithDiaeresisTex" OutName="msg_char_83_latin_capital_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3180"/>
-        <Texture Name="gMsgChar84LatinCapitalLetterCWithCedillaTex" OutName="msg_char_84_latin_capital_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3200"/>
-        <Texture Name="gMsgChar85LatinCapitalLetterEWithGraveTex" OutName="msg_char_85_latin_capital_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3280"/>
-        <Texture Name="gMsgChar86LatinCapitalLetterEWithAcuteTex" OutName="msg_char_86_latin_capital_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3300"/>
-        <Texture Name="gMsgChar87LatinCapitalLetterEWithCircumflexTex" OutName="msg_char_87_latin_capital_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3380"/>
-        <Texture Name="gMsgChar88LatinCapitalLetterEWithDiaeresisTex" OutName="msg_char_88_latin_capital_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3400"/>
-        <Texture Name="gMsgChar89LatinCapitalLetterIWithGraveTex" OutName="msg_char_89_latin_capital_letter_i_with_grave" Format="i4" Width="16" Height="16" Offset="0x3480"/>
-        <Texture Name="gMsgChar8ALatinCapitalLetterIWithAcuteTex" OutName="msg_char_8a_latin_capital_letter_i_with_acute" Format="i4" Width="16" Height="16" Offset="0x3500"/>
-        <Texture Name="gMsgChar8BLatinCapitalLetterIWithCircumflexTex" OutName="msg_char_8b_latin_capital_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3580"/>
-        <Texture Name="gMsgChar8CLatinCapitalLetterIWithDiaeresisTex" OutName="msg_char_8c_latin_capital_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3600"/>
-        <Texture Name="gMsgChar8DLatinCapitalLetterNWithTildeTex" OutName="msg_char_8d_latin_capital_letter_n_with_tilde" Format="i4" Width="16" Height="16" Offset="0x3680"/>
-        <Texture Name="gMsgChar8ELatinCapitalLetterOWithGraveTex" OutName="msg_char_8e_latin_capital_letter_o_with_grave" Format="i4" Width="16" Height="16" Offset="0x3700"/>
-        <Texture Name="gMsgChar8FLatinCapitalLetterOWithAcuteTex" OutName="msg_char_8f_latin_capital_letter_o_with_acute" Format="i4" Width="16" Height="16" Offset="0x3780"/>
-        <Texture Name="gMsgChar90LatinCapitalLetterOWithCircumflexTex" OutName="msg_char_90_latin_capital_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3800"/>
-        <Texture Name="gMsgChar91LatinCapitalLetterOWithDiaeresisTex" OutName="msg_char_91_latin_capital_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3880"/>
-        <Texture Name="gMsgChar92LatinCapitalLetterUWithGraveTex" OutName="msg_char_92_latin_capital_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3900"/>
-        <Texture Name="gMsgChar93LatinCapitalLetterUWithAcuteTex" OutName="msg_char_93_latin_capital_letter_u_with_acute" Format="i4" Width="16" Height="16" Offset="0x3980"/>
-        <Texture Name="gMsgChar94LatinCapitalLetterUWithCircumflexTex" OutName="msg_char_94_latin_capital_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
-        <Texture Name="gMsgChar95LatinCapitalLetterUWithDiaeresisTex" OutName="msg_char_95_latin_capital_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
-        <Texture Name="gMsgChar96GreekSmallLetterBetaTex" OutName="msg_char_96_greek_small_letter_beta" Format="i4" Width="16" Height="16" Offset="0x3B00"/><!-- Likely meant to be eszett -->
-        <Texture Name="gMsgChar97LatinSmallLetterAWithGraveTex" OutName="msg_char_97_latin_small_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
-        <Texture Name="gMsgChar98LatinSmallLetterAWithAcuteTex" OutName="msg_char_98_latin_small_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
-        <Texture Name="gMsgChar99LatinSmallLetterAWithCircumflexTex" OutName="msg_char_99_latin_small_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
-        <Texture Name="gMsgChar9ALatinSmallLetterAWithDiaeresisTex" OutName="msg_char_9a_latin_small_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
-        <Texture Name="gMsgChar9BLatinSmallLetterCWithCedillaTex" OutName="msg_char_9b_latin_small_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
-        <Texture Name="gMsgChar9CLatinSmallLetterEWithGraveTex" OutName="msg_char_9c_latin_small_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
-        <Texture Name="gMsgChar9DLatinSmallLetterEWithAcuteTex" OutName="msg_char_9d_latin_small_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
-        <Texture Name="gMsgChar9ELatinSmallLetterEWithCircumflexTex" OutName="msg_char_9e_latin_small_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
-        <Texture Name="gMsgChar9FLatinSmallLetterEWithDiaeresisTex" OutName="msg_char_9f_latin_small_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
-        <Texture Name="gMsgCharA0LatinSmallLetterIWithGraveTex" OutName="msg_char_a0_latin_small_letter_i_with_grave" Format="i4" Width="16" Height="16" Offset="0x4000"/>
-        <Texture Name="gMsgCharA1LatinSmallLetterIWithAcuteTex" OutName="msg_char_a1_latin_small_letter_i_with_acute" Format="i4" Width="16" Height="16" Offset="0x4080"/>
-        <Texture Name="gMsgCharA2LatinSmallLetterIWithCircumflexTex" OutName="msg_char_a2_latin_small_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x4100"/>
-        <Texture Name="gMsgCharA3LatinSmallLetterIWithDiaeresisTex" OutName="msg_char_a3_latin_small_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x4180"/>
-        <Texture Name="gMsgCharA4LatinSmallLetterNWithTildeTex" OutName="msg_char_a4_latin_small_letter_n_with_tilde" Format="i4" Width="16" Height="16" Offset="0x4200"/>
-        <Texture Name="gMsgCharA5LatinSmallLetterOWithGraveTex" OutName="msg_char_a5_latin_small_letter_o_with_grave" Format="i4" Width="16" Height="16" Offset="0x4280"/>
-        <Texture Name="gMsgCharA6LatinSmallLetterOWithAcuteTex" OutName="msg_char_a6_latin_small_letter_o_with_acute" Format="i4" Width="16" Height="16" Offset="0x4300"/>
-        <Texture Name="gMsgCharA7LatinSmallLetterOWithCircumflexTex" OutName="msg_char_a7_latin_small_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x4380"/>
-        <Texture Name="gMsgCharA8LatinSmallLetterOWithDiaeresisTex" OutName="msg_char_a8_latin_small_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x4400"/>
-        <Texture Name="gMsgCharA9LatinSmallLetterUWithGraveTex" OutName="msg_char_a9_latin_small_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x4480"/>
-        <Texture Name="gMsgCharAALatinSmallLetterUWithAcuteTex" OutName="msg_char_aa_latin_small_letter_u_with_acute" Format="i4" Width="16" Height="16" Offset="0x4500"/>
-        <Texture Name="gMsgCharABLatinSmallLetterUWithCircumflexTex" OutName="msg_char_ab_latin_small_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x4580"/>
-        <Texture Name="gMsgCharACLatinSmallLetterUWithDiaeresisTex" OutName="msg_char_ac_latin_small_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x4600"/>
-        <Texture Name="gMsgCharADInvertedExclamationMarkTex" OutName="msg_char_ad_inverted_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x4680"/>
-        <Texture Name="gMsgCharAEInvertedQuestionMarkTex" OutName="msg_char_ae_inverted_question_mark" Format="i4" Width="16" Height="16" Offset="0x4700"/>
-        <Texture Name="gMsgCharAFFeminineOrdinalIndicatorTex" OutName="msg_char_af_feminine_ordinal_indicator" Format="i4" Width="16" Height="16" Offset="0x4780"/>
-
-        <!-- Controller buttons and target inverted triangle -->
-        <Texture Name="gMsgCharB0ButtonATex" OutName="msg_char_b0_button_a" Format="i4" Width="16" Height="16" Offset="0x4800"/>
-        <Texture Name="gMsgCharB1ButtonBTex" OutName="msg_char_b1_button_b" Format="i4" Width="16" Height="16" Offset="0x4880"/>
-        <Texture Name="gMsgCharB2ButtonCTex" OutName="msg_char_b2_button_c" Format="i4" Width="16" Height="16" Offset="0x4900"/>
-        <Texture Name="gMsgCharB3ButtonLTex" OutName="msg_char_b3_button_l" Format="i4" Width="16" Height="16" Offset="0x4980"/>
-        <Texture Name="gMsgCharB4ButtonRTex" OutName="msg_char_b4_button_r" Format="i4" Width="16" Height="16" Offset="0x4A00"/>
-        <Texture Name="gMsgCharB5ButtonZTex" OutName="msg_char_b5_button_z" Format="i4" Width="16" Height="16" Offset="0x4A80"/>
-        <Texture Name="gMsgCharB6ButtonCUpTex" OutName="msg_char_b6_button_c_up" Format="i4" Width="16" Height="16" Offset="0x4B00"/>
-        <Texture Name="gMsgCharB7ButtonCDownTex" OutName="msg_char_b7_button_c_down" Format="i4" Width="16" Height="16" Offset="0x4B80"/>
-        <Texture Name="gMsgCharB8ButtonCLeftTex" OutName="msg_char_b8_button_c_left" Format="i4" Width="16" Height="16" Offset="0x4C00"/>
-        <Texture Name="gMsgCharB9ButtonCRightTex" OutName="msg_char_b9_button_c_right" Format="i4" Width="16" Height="16" Offset="0x4C80"/>
-        <Texture Name="gMsgCharBAZTargetSignTex" OutName="msg_char_ba_z_target_sign" Format="i4" Width="16" Height="16" Offset="0x4D00"/>
-        <Texture Name="gMsgCharBBControlStickTex" OutName="msg_char_bb_control_stick" Format="i4" Width="16" Height="16" Offset="0x4D80"/>
-     </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/parameter_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/parameter_static.xml
deleted file mode 100644
index 2cbcb8124..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/parameter_static.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<Root>
-    <File Name="parameter_static" Segment="2">
-        <Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16" Offset="0x0"/>
-        <Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x100"/>
-        <Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16" Offset="0x200"/>
-        <Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x300"/>
-        <Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16" Offset="0x400"/>
-        <Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16" Offset="0x500"/>
-        <Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x600"/>
-        <Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16" Offset="0x700"/>
-        <Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x800"/>
-        <Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16" Offset="0x900"/>
-
-        <Texture Name="gFishermanMinigameTorchIconTex" OutName="fisherman_minigame_torch_icon" Format="ia8" Width="16" Height="30" Offset="0xA00"/>
-        <Texture Name="gSwordTrainingLogIconTex" OutName="sword_training_log_icon" Format="ia8" Width="24" Height="16" Offset="0xBE0"/>
-        <Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16" Offset="0xD60"/>
-        <Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16" Offset="0xE60"/>
-        <Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32" Offset="0xF60"/>
-        <Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32" Offset="0x1360"/>
-        <Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1760"/>
-        <Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1B60"/>
-        <Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1F60"/>
-        <Texture Name="gTimerClockIconTex" OutName="timer_clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2360"/>
-        <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2460"/>
-
-        <Texture Name="gOcarinaATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x24A0"/>
-        <Texture Name="gOcarinaCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x25A0"/>
-        <Texture Name="gOcarinaCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x26A0"/>
-        <Texture Name="gOcarinaCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x27A0"/>
-        <Texture Name="gOcarinaCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x28A0"/>
-        <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x29A0"/>
-
-        <Texture Name="gSceneTitleCardGradientTex" OutName="scene_title_card_gradient" Format="i8" Width="64" Height="1" Offset="0x2AA0"/>
-
-        <!-- All four versions of Tatl textures are identical -->
-        <Texture Name="gTatlCUpENGTex" OutName="tatl_c_up_eng" Format="ia4" Width="32" Height="12" Offset="0x2AE0"/>
-        <Texture Name="gTatlCUpGERTex" OutName="tatl_c_up_ger" Format="ia4" Width="32" Height="12" Offset="0x2BA0"/>
-        <Texture Name="gTatlCUpFRATex" OutName="tatl_c_up_fra" Format="ia4" Width="32" Height="12" Offset="0x2C60"/>
-        <Texture Name="gTatlCUpESPTex" OutName="tatl_c_up_esp" Format="ia4" Width="32" Height="12" Offset="0x2D20"/>
-
-        <Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16" Offset="0x2DE0"/>
-        <Texture Name="gGoldSkulltulaCounterIconTex" OutName="gold_skulltula_counter_icon" Format="rgba32" Width="24" Height="18" Offset="0x31E0"/>
-        <Texture Name="gBeaverRingIconTex" OutName="beaver_ring_icon" Format="rgba32" Width="24" Height="16" Offset="0x38A0"/>
-        <Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x3EA0"/>
-        <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x3F20"/>
-        <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x3FA0"/>
-
-        <!-- Looking through the lens of the pictograph box -->
-        <Texture Name="gPictoBoxFocusIconTex" OutName="picto_box_focus_icon" Format="i4" Width="32" Height="16" Offset="0x42A0"/>
-        <Texture Name="gPictoBoxFocusBorderTex" OutName="picto_box_focus_border" Format="ia4" Width="16" Height="16" Offset="0x43A0"/>
-        <Texture Name="gPictoBoxFocusTextTex" OutName="picto_box_focus_text" Format="i4" Width="32" Height="8" Offset="0x4420"/>
-
-        <Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16" Offset="0x44A0"/>
-        <Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16" Offset="0x4520"/>
-        <Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16" Offset="0x45A0"/>
-        <Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16" Offset="0x4620"/>
-        <Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16" Offset="0x46A0"/>
-        <Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16" Offset="0x4720"/>
-        <Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16" Offset="0x47A0"/>
-        <Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16" Offset="0x4820"/>
-        <Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16" Offset="0x48A0"/>
-        <Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16" Offset="0x4920"/>
-        <Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16" Offset="0x49A0"/>
-        <Texture Name="gStrayFairyMapCounterSlashTex" OutName="stray_fairy_map_counter_slash" Format="i8" Width="8" Height="16" Offset="0x4A20"/>
-
-        <Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8" Offset="0x4AA0"/>
-        <Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8" Offset="0x4AE0"/>
-        <Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8" Offset="0x4B20"/>
-        <Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8" Offset="0x4B60"/>
-        <Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8" Offset="0x4BA0"/>
-        <Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8" Offset="0x4BE0"/>
-        <Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8" Offset="0x4C20"/>
-        <Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8" Offset="0x4C60"/>
-        <Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8" Offset="0x4CA0"/>
-        <Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8" Offset="0x4CE0"/>
-        <Texture Name="gAmmoDigitHalfTex" OutName="ammo_digit_half" Format="ia8" Width="16" Height="8" Offset="0x4D20"/>
-
-        <Texture Name="gMagicMeterEndTex" OutName="magic_meter_end" Format="ia8" Width="8" Height="16" Offset="0x4DA0"/>
-        <Texture Name="gMagicMeterMidTex" OutName="magic_meter_mid" Format="ia8" Width="24" Height="16" Offset="0x4E20"/>
-        <Texture Name="gMagicMeterFillTex" OutName="magic_meter_fill" Format="i4" Width="16" Height="16" Offset="0x4FA0"/>
-
-        <!-- The analog clock from day one until midnight of the final day -->
-        <Texture Name="gThreeDayClockDiamondTex" OutName="three_day_clock_diamond" Format="ia8" Width="40" Height="32" Offset="0x4FE0"/>
-        <Texture Name="gThreeDayClockMoonHourTex" OutName="three_day_clock_moon_hour" Format="ia8" Width="24" Height="24" Offset="0x54E0"/>
-        <Texture Name="gThreeDayClockSunHourTex" OutName="three_day_clock_sun_hour" Format="ia8" Width="24" Height="24" Offset="0x5720"/>
-        <Texture Name="gThreeDayClockBorderTex" OutName="three_day_clock_border" Format="i4" Width="64" Height="48" Offset="0x5960"/>
-        <Texture Name="gThreeDayClockHourLinesTex" OutName="three_day_clock_hour_lines" Format="i4" Width="64" Height="35" Offset="0x5F60"/>
-        <Texture Name="gThreeDayClockStarMinuteTex" OutName="three_day_clock_star_minute" Format="i4" Width="16" Height="16" Offset="0x63C0"/>
-        <Texture Name="gThreeDayClockHour12Tex" OutName="three_day_clock_hour_12" Format="i4" Width="16" Height="11" Offset="0x6440"/>
-        <Texture Name="gThreeDayClockHour1Tex" OutName="three_day_clock_hour_1" Format="i4" Width="16" Height="11" Offset="0x6498"/>
-        <Texture Name="gThreeDayClockHour2Tex" OutName="three_day_clock_hour_2" Format="i4" Width="16" Height="11" Offset="0x64F0"/>
-        <Texture Name="gThreeDayClockHour3Tex" OutName="three_day_clock_hour_3" Format="i4" Width="16" Height="11" Offset="0x6548"/>
-        <Texture Name="gThreeDayClockHour4Tex" OutName="three_day_clock_hour_4" Format="i4" Width="16" Height="11" Offset="0x65A0"/>
-        <Texture Name="gThreeDayClockHour5Tex" OutName="three_day_clock_hour_5" Format="i4" Width="16" Height="11" Offset="0x65F8"/>
-        <Texture Name="gThreeDayClockHour6Tex" OutName="three_day_clock_hour_6" Format="i4" Width="16" Height="11" Offset="0x6650"/>
-        <Texture Name="gThreeDayClockHour7Tex" OutName="three_day_clock_hour_7" Format="i4" Width="16" Height="11" Offset="0x66A8"/>
-        <Texture Name="gThreeDayClockHour8Tex" OutName="three_day_clock_hour_8" Format="i4" Width="16" Height="11" Offset="0x6700"/>
-        <Texture Name="gThreeDayClockHour9Tex" OutName="three_day_clock_hour_9" Format="i4" Width="16" Height="11" Offset="0x6758"/>
-        <Texture Name="gThreeDayClockHour10Tex" OutName="three_day_clock_hour_10" Format="i4" Width="16" Height="11" Offset="0x67B0"/>
-        <Texture Name="gThreeDayClockHour11Tex" OutName="three_day_clock_hour_11" Format="i4" Width="16" Height="11" Offset="0x6808"/>
-
-        <!-- The digital clock until moon crash after midnight of the final day -->
-        <Texture Name="gFinalHoursClockDigit0Tex" OutName="final_hours_clock_digit_0" Format="i8" Width="8" Height="8" Offset="0x6860"/>
-        <Texture Name="gFinalHoursClockDigit1Tex" OutName="final_hours_clock_digit_1" Format="i8" Width="8" Height="8" Offset="0x68A0"/>
-        <Texture Name="gFinalHoursClockDigit2Tex" OutName="final_hours_clock_digit_2" Format="i8" Width="8" Height="8" Offset="0x68E0"/>
-        <Texture Name="gFinalHoursClockDigit3Tex" OutName="final_hours_clock_digit_3" Format="i8" Width="8" Height="8" Offset="0x6920"/>
-        <Texture Name="gFinalHoursClockDigit4Tex" OutName="final_hours_clock_digit_4" Format="i8" Width="8" Height="8" Offset="0x6960"/>
-        <Texture Name="gFinalHoursClockDigit5Tex" OutName="final_hours_clock_digit_5" Format="i8" Width="8" Height="8" Offset="0x69A0"/>
-        <Texture Name="gFinalHoursClockDigit6Tex" OutName="final_hours_clock_digit_6" Format="i8" Width="8" Height="8" Offset="0x69E0"/>
-        <Texture Name="gFinalHoursClockDigit7Tex" OutName="final_hours_clock_digit_7" Format="i8" Width="8" Height="8" Offset="0x6A20"/>
-        <Texture Name="gFinalHoursClockDigit8Tex" OutName="final_hours_clock_digit_8" Format="i8" Width="8" Height="8" Offset="0x6A60"/>
-        <Texture Name="gFinalHoursClockDigit9Tex" OutName="final_hours_clock_digit_9" Format="i8" Width="8" Height="8" Offset="0x6AA0"/>
-        <Texture Name="gFinalHoursClockColonTex" OutName="final_hours_clock_colon" Format="i8" Width="8" Height="8" Offset="0x6AE0"/>
-        <Texture Name="gFinalHoursClockFrameTex" OutName="final_hours_clock_frame" Format="ia4" Width="80" Height="13" Offset="0x6B20"/>
-
-        <Texture Name="gMinigameCountdownGoTex" OutName="minigame_countdown_go" Format="ia8" Width="40" Height="32" Offset="0x6D28"/>
-        <Texture Name="gMinigameCountdown1Tex" OutName="minigame_countdown_1" Format="ia8" Width="24" Height="32" Offset="0x7228"/>
-        <Texture Name="gMinigameCountdown2Tex" OutName="minigame_countdown_2" Format="ia8" Width="24" Height="32" Offset="0x7528"/>
-        <Texture Name="gMinigameCountdown3Tex" OutName="minigame_countdown_3" Format="ia8" Width="24" Height="32" Offset="0x7828"/>
-
-        <!-- The letters of "PERFECT!" -->
-        <Texture Name="gPerfectLetterPTex" OutName="letter_perfect_p" Format="i4" Width="32" Height="33" Offset="0x7B28"/>
-        <Texture Name="gPerfectLetterETex" OutName="letter_perfect_e" Format="i4" Width="32" Height="33" Offset="0x7D38"/>
-        <Texture Name="gPerfectLetterRTex" OutName="letter_perfect_r" Format="i4" Width="32" Height="33" Offset="0x7F48"/>
-        <Texture Name="gPerfectLetterFTex" OutName="letter_perfect_f" Format="i4" Width="32" Height="33" Offset="0x8158"/>
-        <Texture Name="gPerfectLetterCTex" OutName="letter_perfect_c" Format="i4" Width="32" Height="33" Offset="0x8368"/>
-        <Texture Name="gPerfectLetterTTex" OutName="letter_perfect_t" Format="i4" Width="32" Height="33" Offset="0x8578"/>
-        <Texture Name="gPerfectLetterExclamationTex" OutName="letter_perfect_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"/>
-        <Texture Name="gStrayFairyStoneTowerIconTex" OutName="stray_fairy_stone_tower_icon" Format="rgba32" Width="32" Height="24" Offset="0xAD98"/>
-        <Texture Name="gStrayFairyGlowingCircleIconTex" OutName="stray_fairy_glowing_circle_icon" Format="i4" Width="32" Height="24" Offset="0xB998"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/schedule_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/schedule_static.xml
deleted file mode 100644
index cf87038ce..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/schedule_static.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<Root>
-    <File Name="schedule_static" Segment="8">
-        <Texture Name="gBombersNotebookEntryIconExclamationPointTex" OutName="bombers_notebook_entry_icon_exlamation_point" Format="ia8" Width="16" Height="16" Offset="0x0000"/>
-        <Texture Name="gBombersNotebookStampTex" OutName="bombers_notebook_stamp" Format="ia8" Width="32" Height="48" Offset="0x0100"/>
-        <Texture Name="gBombersNotebookArrowTex" OutName="bombers_notebook_arrow" Format="ia8" Width="24" Height="16" Offset="0x0700"/>
-        <Texture Name="gBombersNotebookConnectorTex" OutName="bombers_notebook_connector" Format="ia8" Width="32" Height="14" Offset="0x0880"/>
-        <Texture Name="gBombersNotebookEmptyPhotoTex" OutName="bombers_notebook_empty_photo" Format="rgba16" Width="32" Height="32" Offset="0x0A40"/>
-        <Texture Name="gBombersNotebookEntryBoxEndTex" OutName="bombers_notebook_entry_end" Format="rgba16" Width="4" Height="16" Offset="0x1240"/>
-        <Texture Name="gBombersNotebookEntryBoxMiddleTex" OutName="bombers_notebook_entry_middle" Format="rgba16" Width="4" Height="16" Offset="0x12C0"/>
-        <Texture Name="gBombersNotebookSubColumnBoxTex" OutName="bombers_notebook_sub_column_box" Format="i4" Width="48" Height="1" Offset="0x1340"/>
-        <Texture Name="gBombersNotebookCircleTex" OutName="bombers_notebook_circle" Format="i4" Width="16" Height="16" Offset="0x1358"/>        
-        <Texture Name="gBombersNotebookBackgroundTex" OutName="bombers_notebook_background" Format="i8" Width="32" Height="32" Offset="0x13D8"/>
-        <Texture Name="gBombersNotebookHeaderBoxTex" OutName="bombers_notebook_header_box" Format="i8" Width="8" Height="24" Offset="0x17D8"/>
-        <Texture Name="gBombersNotebookLineTex" OutName="bombers_notebook_line" Format="i8" Width="8" Height="1" Offset="0x1898"/>
-        <Texture Name="gBombersNotebookBarSmallTex" OutName="bombers_notebook_bar_small" Format="i8" Width="8" Height="2" Offset="0x18A0"/> <!-- Unused -->
-        <Texture Name="gBombersNotebookBarTex" OutName="bombers_notebook_bar" Format="i8" Width="8" Height="4" Offset="0x18B0"/>
-        <Texture Name="gBombersNotebookCursorTex" OutName="bombers_notebook_cursor" Format="ia4" Width="16" Height="16" Offset="0x18D0"/>
-        <Texture Name="gBombersNoteoobkTimeOfDayBoxTex" OutName="bombers_notebook_time_of_day_box" Format="ia4" Width="64" Height="28" Offset="0x1950"/>
-        <Texture Name="gBombersNotebookTimeBoxLeftTex" OutName="bombers_notebook_time_box_left" Format="ia4" Width="16" Height="28" Offset="0x1CD0"/>
-        <Texture Name="gBombersNotebookTimeBoxRightTex" OutName="bombers_notebook_time_box_right" Format="ia4" Width="16" Height="28" Offset="0x1DB0"/>
-        <Texture Name="gBombersNotebookTimeBoxMiddleTex" OutName="bombers_notebook_time_box_middle" Format="ia4" Width="16" Height="28" Offset="0x1E90"/>
-        <Texture Name="gBombersNotebook1800Tex" OutName="bombers_notebook_1800" Format="ia4" Width="48" Height="11" Offset="0x1F70"/>
-        <Texture Name="gBombersNotebookDigit0Tex" OutName="bombers_notebook_digit_0" Format="i4" Width="16" Height="17" Offset="0x2078"/>
-        <Texture Name="gBombersNotebookDigit1Tex" OutName="bombers_notebook_digit_1" Format="i4" Width="16" Height="17" Offset="0x2100"/>
-        <Texture Name="gBombersNotebookDigit2Tex" OutName="bombers_notebook_digit_2" Format="i4" Width="16" Height="17" Offset="0x2188"/>
-        <Texture Name="gBombersNotebookDigit3Tex" OutName="bombers_notebook_digit_3" Format="i4" Width="16" Height="17" Offset="0x2210"/>
-        <Texture Name="gBombersNotebookDigit4Tex" OutName="bombers_notebook_digit_4" Format="i4" Width="16" Height="17" Offset="0x2298"/>
-        <Texture Name="gBombersNotebookDigit5Tex" OutName="bombers_notebook_digit_5" Format="i4" Width="16" Height="17" Offset="0x2320"/>
-        <Texture Name="gBombersNotebookDigit6Tex" OutName="bombers_notebook_digit_6" Format="i4" Width="16" Height="17" Offset="0x23A8"/>
-        <Texture Name="gBombersNotebookDigit7Tex" OutName="bombers_notebook_digit_7" Format="i4" Width="16" Height="17" Offset="0x2430"/>
-        <Texture Name="gBombersNotebookDigit8Tex" OutName="bombers_notebook_digit_8" Format="i4" Width="16" Height="17" Offset="0x24B8"/>
-        <Texture Name="gBombersNotebookDigit9Tex" OutName="bombers_notebook_digit_9" Format="i4" Width="16" Height="17" Offset="0x2540"/>
-        <Texture Name="gBombersNotebookColonTex" OutName="bombers_notebook_colon" Format="i4" Width="16" Height="17" Offset="0x25C8"/>
-
-        <!-- English -->
-        <Texture Name="gBombersNotebookDay1stENGTex" OutName="bombers_notebook_day_1st_eng" Format="ia8" Width="48" Height="22" Offset="0x2650"/>
-        <Texture Name="gBombersNotebookDay2ndENGTex" OutName="bombers_notebook_day_2nd_eng" Format="ia8" Width="48" Height="22" Offset="0x2A70"/>
-        <Texture Name="gBombersNotebookDayFinalENGTex" OutName="bombers_notebook_day_final_eng" Format="ia8" Width="48" Height="22" Offset="0x2E90"/>
-        <Texture Name="gBombersNotebookTimeOfDayENGTex" OutName="bombers_notebook_time_of_day_eng" Format="i4" Width="96" Height="20" Offset="0x32B0"/>
-
-        <!-- German -->
-        <Texture Name="gBombersNotebookDay1stGERTex" OutName="bombers_notebook_day_1st_ger" Format="ia8" Width="48" Height="22" Offset="0x3670"/>
-        <Texture Name="gBombersNotebookDay2ndGERTex" OutName="bombers_notebook_day_2nd_ger" Format="ia8" Width="48" Height="22" Offset="0x3A90"/>
-        <Texture Name="gBombersNotebookDayFinalGERTex" OutName="bombers_notebook_day_final_ger" Format="ia8" Width="48" Height="22" Offset="0x3EB0"/>
-        <Texture Name="gBombersNotebookTimeOfDayGERTex" OutName="bombers_notebook_time_of_day_ger" Format="i4" Width="96" Height="20" Offset="0x42D0"/>
-
-        <!-- French -->
-        <Texture Name="gBombersNotebookDay1stFRATex" OutName="bombers_notebook_day_1st_fra" Format="ia8" Width="48" Height="22" Offset="0x4690"/>
-        <Texture Name="gBombersNotebookDay2ndFRATex" OutName="bombers_notebook_day_2nd_fra" Format="ia8" Width="48" Height="22" Offset="0x4AB0"/>
-        <Texture Name="gBombersNotebookDayFinalFRATex" OutName="bombers_notebook_day_final_fra" Format="ia8" Width="48" Height="22" Offset="0x4ED0"/>
-        <Texture Name="gBombersNotebookTimeOfDayFRATex" OutName="bombers_notebook_time_of_day_fra" Format="i4" Width="96" Height="20" Offset="0x52F0"/>
-
-        <!-- Spanish -->
-        <Texture Name="gBombersNotebookDay1stSPATex" OutName="bombers_notebook_day_1st_spa" Format="ia8" Width="48" Height="22" Offset="0x56B0"/>
-        <Texture Name="gBombersNotebookDay2ndSPATex" OutName="bombers_notebook_day_2nd_spa" Format="ia8" Width="48" Height="22" Offset="0x5AD0"/>
-        <Texture Name="gBombersNotebookDayFinalSPATex" OutName="bombers_notebook_day_final_spa" Format="ia8" Width="48" Height="22" Offset="0x5EF0"/>
-        <Texture Name="gBombersNotebookTimeOfDaySPATex" OutName="bombers_notebook_time_of_day_spa" Format="i4" Width="96" Height="20" Offset="0x6310"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/week_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/week_static.xml
deleted file mode 100644
index e2b098410..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/interface/week_static.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="week_static" Segment="9">
-        <Texture Name="gClockDay1stTex" OutName="clock_day_1st" Format="i8" Width="48" Height="27" Offset="0x0"/>
-        <Texture Name="gClockDay2ndTex" OutName="clock_day_2nd" Format="i8" Width="48" Height="27" Offset="0x510"/>
-        <Texture Name="gClockDayFinalTex" OutName="clock_day_final" Format="i8" Width="48" Height="27" Offset="0xA20"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/daytelop_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/daytelop_static.xml
deleted file mode 100644
index 2c558404f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/daytelop_static.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <File Name="daytelop_static" Segment="9">
-        <Texture Name="gDaytelopFirstDayLeftNESTex" OutName="first_day_left_nes" Format="i4" Width="128" Height="64" Offset="0x0"/>
-        <Texture Name="gDaytelopFirstDayRightNESTex" OutName="first_day_right_nes" Format="i4" Width="128" Height="64" Offset="0x1000"/>
-
-        <Texture Name="gDaytelopSecondDayLeftNESTex" OutName="second_day_left_nes" Format="i4" Width="128" Height="64" Offset="0x2000"/>
-        <Texture Name="gDaytelopSecondDayRightNESTex" OutName="second_day_right_nes" Format="i4" Width="128" Height="64" Offset="0x3000"/>
-
-        <Texture Name="gDaytelopFinalDayLeftNESTex" OutName="final_day_left_nes" Format="i4" Width="128" Height="64" Offset="0x4000"/>
-        <Texture Name="gDaytelopFinalDayRightNESTex" OutName="final_day_right_nes" Format="i4" Width="128" Height="64" Offset="0x5000"/>
-
-        <Texture Name="gDaytelopNewDayLeftNESTex" OutName="new_day_left_nes" Format="i4" Width="128" Height="64" Offset="0x6000"/>
-        <Texture Name="gDaytelopNewDayRightNESTex" OutName="new_day_right_nes" Format="i4" Width="128" Height="64" Offset="0x7000"/>
-
-        <Texture Name="gDaytelop72HoursNESTex" OutName="72_hours_nes" Format="i4" Width="144" Height="32" Offset="0x8000"/>
-        <Texture Name="gDaytelop48HoursNESTex" OutName="48_hours_nes" Format="i4" Width="144" Height="32" Offset="0x8900"/>
-        <Texture Name="gDaytelop24HoursNESTex" OutName="24_hours_nes" Format="i4" Width="144" Height="32" Offset="0x9200"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/esp_daytelop_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/esp_daytelop_static.xml
deleted file mode 100644
index 2c55295dc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/esp_daytelop_static.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <File Name="esp_daytelop_static" Segment="9">
-        <Texture Name="gDaytelopFirstDayLeftESPTex" OutName="first_day_left_esp" Format="i4" Width="128" Height="64" Offset="0x0"/>
-        <Texture Name="gDaytelopFirstDayRightESPTex" OutName="first_day_right_esp" Format="i4" Width="128" Height="64" Offset="0x1000"/>
-
-        <Texture Name="gDaytelopSecondDayLeftESPTex" OutName="second_day_left_esp" Format="i4" Width="128" Height="64" Offset="0x2000"/>
-        <Texture Name="gDaytelopSecondDayRightESPTex" OutName="second_day_right_esp" Format="i4" Width="128" Height="64" Offset="0x3000"/>
-
-        <Texture Name="gDaytelopFinalDayLeftESPTex" OutName="final_day_left_esp" Format="i4" Width="128" Height="64" Offset="0x4000"/>
-        <Texture Name="gDaytelopFinalDayRightESPTex" OutName="final_day_right_esp" Format="i4" Width="128" Height="64" Offset="0x5000"/>
-
-        <Texture Name="gDaytelopNewDayLeftESPTex" OutName="new_day_left_esp" Format="i4" Width="128" Height="64" Offset="0x6000"/>
-        <Texture Name="gDaytelopNewDayRightESPTex" OutName="new_day_right_esp" Format="i4" Width="128" Height="64" Offset="0x7000"/>
-
-        <Texture Name="gDaytelop72HoursESPTex" OutName="72_hours_esp" Format="i4" Width="144" Height="32" Offset="0x8000"/>
-        <Texture Name="gDaytelop48HoursESPTex" OutName="48_hours_esp" Format="i4" Width="144" Height="32" Offset="0x8900"/>
-        <Texture Name="gDaytelop24HoursESPTex" OutName="24_hours_esp" Format="i4" Width="144" Height="32" Offset="0x9200"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/fra_daytelop_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/fra_daytelop_static.xml
deleted file mode 100644
index f855ddbe1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/fra_daytelop_static.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <File Name="fra_daytelop_static" Segment="9">
-        <Texture Name="gDaytelopFirstDayLeftFRATex" OutName="first_day_left_fra" Format="i4" Width="128" Height="64" Offset="0x0"/>
-        <Texture Name="gDaytelopFirstDayRightFRATex" OutName="first_day_right_fra" Format="i4" Width="128" Height="64" Offset="0x1000"/>
-
-        <Texture Name="gDaytelopSecondDayLeftFRATex" OutName="second_day_left_fra" Format="i4" Width="128" Height="64" Offset="0x2000"/>
-        <Texture Name="gDaytelopSecondDayRightFRATex" OutName="second_day_right_fra" Format="i4" Width="128" Height="64" Offset="0x3000"/>
-
-        <Texture Name="gDaytelopFinalDayLeftFRATex" OutName="final_day_left_fra" Format="i4" Width="128" Height="64" Offset="0x4000"/>
-        <Texture Name="gDaytelopFinalDayRightFRATex" OutName="final_day_right_fra" Format="i4" Width="128" Height="64" Offset="0x5000"/>
-
-        <Texture Name="gDaytelopNewDayLeftFRATex" OutName="new_day_left_fra" Format="i4" Width="128" Height="64" Offset="0x6000"/>
-        <Texture Name="gDaytelopNewDayRightFRATex" OutName="new_day_right_fra" Format="i4" Width="128" Height="64" Offset="0x7000"/>
-
-        <Texture Name="gDaytelop72HoursFRATex" OutName="72_hours_fra" Format="i4" Width="144" Height="32" Offset="0x8000"/>
-        <Texture Name="gDaytelop48HoursFRATex" OutName="48_hours_fra" Format="i4" Width="144" Height="32" Offset="0x8900"/>
-        <Texture Name="gDaytelop24HoursFRATex" OutName="24_hours_fra" Format="i4" Width="144" Height="32" Offset="0x9200"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/ger_daytelop_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/ger_daytelop_static.xml
deleted file mode 100644
index 398683f4b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/ger_daytelop_static.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <File Name="ger_daytelop_static" Segment="9">
-        <Texture Name="gDaytelopFirstDayLeftGERTex" OutName="first_day_left_ger" Format="i4" Width="128" Height="64" Offset="0x0"/>
-        <Texture Name="gDaytelopFirstDayRightGERTex" OutName="first_day_right_ger" Format="i4" Width="128" Height="64" Offset="0x1000"/>
-
-        <Texture Name="gDaytelopSecondDayLeftGERTex" OutName="second_day_left_ger" Format="i4" Width="128" Height="64" Offset="0x2000"/>
-        <Texture Name="gDaytelopSecondDayRightGERTex" OutName="second_day_right_ger" Format="i4" Width="128" Height="64" Offset="0x3000"/>
-
-        <Texture Name="gDaytelopFinalDayLeftGERTex" OutName="final_day_left_ger" Format="i4" Width="128" Height="64" Offset="0x4000"/>
-        <Texture Name="gDaytelopFinalDayRightGERTex" OutName="final_day_right_ger" Format="i4" Width="128" Height="64" Offset="0x5000"/>
-
-        <Texture Name="gDaytelopNewDayLeftGERTex" OutName="new_day_left_ger" Format="i4" Width="128" Height="64" Offset="0x6000"/>
-        <Texture Name="gDaytelopNewDayRightGERTex" OutName="new_day_right_ger" Format="i4" Width="128" Height="64" Offset="0x7000"/>
-
-        <Texture Name="gDaytelop72HoursGERTex" OutName="72_hours_ger" Format="i4" Width="144" Height="32" Offset="0x8000"/>
-        <Texture Name="gDaytelop48HoursGERTex" OutName="48_hours_ger" Format="i4" Width="144" Height="32" Offset="0x8900"/>
-        <Texture Name="gDaytelop24HoursGERTex" OutName="24_hours_ger" Format="i4" Width="144" Height="32" Offset="0x9200"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/link_animetion.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/link_animetion.xml
deleted file mode 100644
index 2bb5826dd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/link_animetion.xml
+++ /dev/null
@@ -1,699 +0,0 @@
-<Root>
-    <File Name="link_animetion" Segment="7">
-        <PlayerAnimationData Name="gPlayerAnim_al_fuwafuwa_modori_Data" FrameCount="54" Offset="0x0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_shitR_Data" FrameCount="8" Offset="0x1C50"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_tetunagu_loop_Data" FrameCount="40" Offset="0x2080"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_left_down_Data" FrameCount="65" Offset="0x3570"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_nigeru_Data" FrameCount="8" Offset="0x5780"/>
-        <PlayerAnimationData Name="gPlayerAnim_dl_kokeru_Data" FrameCount="14" Offset="0x5BB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_nozokikomi_Data" FrameCount="70" Offset="0x6310"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_free2free_Data" FrameCount="20" Offset="0x87C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_miseau_Data" FrameCount="40" Offset="0x9240"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_rebound_Data" FrameCount="11" Offset="0xA730"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cutterwaitB_Data" FrameCount="9" Offset="0xAD00"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cutterwaitC_Data" FrameCount="9" Offset="0xB1C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cutterwaitA_Data" FrameCount="9" Offset="0xB680"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_nozokikomi_wait_Data" FrameCount="35" Offset="0xBB40"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_somukeru_loop_Data" FrameCount="40" Offset="0xCDA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pull_start_Data" FrameCount="16" Offset="0xE290"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_push_wait_end_Data" FrameCount="11" Offset="0xEAF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_kaitenmiss_Data" FrameCount="28" Offset="0xF0C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_free2fighter_free_Data" FrameCount="20" Offset="0xFF70"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_futtobi_Data" FrameCount="40" Offset="0x109F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR_Data" FrameCount="13" Offset="0x11EE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_tamahakidf_Data" FrameCount="2" Offset="0x125B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_fish_in_Data" FrameCount="44" Offset="0x126C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_get_Data" FrameCount="12" Offset="0x13DD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_defense_long_hitR_Data" FrameCount="7" Offset="0x14420"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_defense_long_hitL_Data" FrameCount="8" Offset="0x147D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_defense_wait_Data" FrameCount="31" Offset="0x14C00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_rolling_kiru_endR_Data" FrameCount="14" Offset="0x15C40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kaoage_Data" FrameCount="15" Offset="0x163A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_link_twait_Data" FrameCount="45" Offset="0x16B80"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_link_nwait_Data" FrameCount="45" Offset="0x18310"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR_Data" FrameCount="19" Offset="0x19AA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_waitF_itemA_20f_Data" FrameCount="90" Offset="0x1A4A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_waitF_itemB_20f_Data" FrameCount="100" Offset="0x1D3C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_umanoru_Data" FrameCount="74" Offset="0x20820"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_right_up_Data" FrameCount="74" Offset="0x22EE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_bug_out_Data" FrameCount="131" Offset="0x255A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_end_Data" FrameCount="5" Offset="0x29A40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LRside_kiru_end_Data" FrameCount="11" Offset="0x29CE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LLside_kiru_end_Data" FrameCount="13" Offset="0x2A2B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_ee_Data" FrameCount="30" Offset="0x2A980"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pull_start_free_Data" FrameCount="16" Offset="0x2B940"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_maskoff_Data" FrameCount="10" Offset="0x2C1A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_mukinaoru_Data" FrameCount="10" Offset="0x2C6E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpierce_kiru_end_Data" FrameCount="10" Offset="0x2CC20"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_tobikakaru_Data" FrameCount="52" Offset="0x2D160"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_ononoki_Data" FrameCount="60" Offset="0x2ECA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_spotlight_Data" FrameCount="50" Offset="0x30C10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait_Data" FrameCount="20" Offset="0x32640"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_fishswim_Data" FrameCount="10" Offset="0x330C0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_033600" FrameCount="52" Offset="0x33600"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_miokuri_wait_Data" FrameCount="30" Offset="0x35140"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_hip_down_Data" FrameCount="28" Offset="0x36100"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_endAL_Data" FrameCount="27" Offset="0x36FB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_endAR_Data" FrameCount="28" Offset="0x37DE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_shit_Data" FrameCount="8" Offset="0x38C90"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_endAL_Data" FrameCount="35" Offset="0x390C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_endAR_Data" FrameCount="36" Offset="0x3A320"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_endBL_Data" FrameCount="35" Offset="0x3B600"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_endBR_Data" FrameCount="36" Offset="0x3C860"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_endBL_Data" FrameCount="56" Offset="0x3DB40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_endBR_Data" FrameCount="56" Offset="0x3F890"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lside_kiru_endR_Data" FrameCount="8" Offset="0x415E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Rside_kiru_endR_Data" FrameCount="18" Offset="0x41A10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_walk_endR_long_Data" FrameCount="11" Offset="0x42380"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_walk_endL_long_Data" FrameCount="11" Offset="0x42950"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_shagamu_demo_Data" FrameCount="13" Offset="0x42F20"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0435F0" FrameCount="40" Offset="0x435F0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_044AE0" FrameCount="33" Offset="0x44AE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_Data" FrameCount="9" Offset="0x45C30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_turn_kiruR_Data" FrameCount="6" Offset="0x460F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_turn_kiruL_Data" FrameCount="5" Offset="0x46420"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_take_out_Data" FrameCount="38" Offset="0x466C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_tatiagari_Data" FrameCount="110" Offset="0x47AB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_Data" FrameCount="20" Offset="0x4B450"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait2waitR_Data" FrameCount="6" Offset="0x4BED0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_kiru_end_Data" FrameCount="12" Offset="0x4C200"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_kiru_end_Data" FrameCount="9" Offset="0x4C850"/>
-        <PlayerAnimationData Name="gPlayerAnimData_04CD10" FrameCount="30" Offset="0x4CD10"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_gakkistart_Data" FrameCount="15" Offset="0x4DCD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_nw_modoru_Data" FrameCount="20" Offset="0x4E4B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_short_landing_Data" FrameCount="16" Offset="0x4EF30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_shit_Data" FrameCount="8" Offset="0x4F790"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_swimtowait_Data" FrameCount="10" Offset="0x4FBC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_fastrun_muti_Data" FrameCount="24" Offset="0x50100"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_landingR_Data" FrameCount="21" Offset="0x50D90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_kiru_Data" FrameCount="5" Offset="0x51890"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_kiru_Data" FrameCount="5" Offset="0x51B30"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_drinkend_Data" FrameCount="20" Offset="0x51DD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_stop_muti_Data" FrameCount="75" Offset="0x52850"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_wait_long_Data" FrameCount="89" Offset="0x54FA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_look_hand_Data" FrameCount="35" Offset="0x57E40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_Data" FrameCount="2" Offset="0x590A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_walk_Data" FrameCount="21" Offset="0x591B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_okarina_warp_goal_Data" FrameCount="45" Offset="0x59CB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_nozoki_Data" FrameCount="30" Offset="0x5B440"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_wait_Data" FrameCount="34" Offset="0x5C400"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_bug_in_Data" FrameCount="44" Offset="0x5D5D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_doorB_open_Data" FrameCount="100" Offset="0x5ECE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_doorA_open_Data" FrameCount="100" Offset="0x62140"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kousan_Data" FrameCount="28" Offset="0x655A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_typeD_20f_Data" FrameCount="138" Offset="0x66450"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kakeyori_wait_Data" FrameCount="20" Offset="0x6AC90"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_fuwafuwa_Data" FrameCount="45" Offset="0x6B710"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_furafura_Data" FrameCount="136" Offset="0x6CEA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_walk_long_Data" FrameCount="29" Offset="0x715D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_link_orosuu_Data" FrameCount="90" Offset="0x72500"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_getA_Data" FrameCount="22" Offset="0x75420"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_getB_Data" FrameCount="22" Offset="0x75FB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_gurd_Data" FrameCount="4" Offset="0x76B40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hammer_normal2long_Data" FrameCount="20" Offset="0x76D60"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_dakisime_loop_Data" FrameCount="40" Offset="0x777E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_wait_end_Data" FrameCount="15" Offset="0x78CD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal_kiru_end_Data" FrameCount="8" Offset="0x794B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lrolling_kiru_end_Data" FrameCount="12" Offset="0x798E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_nocarry_free_Data" FrameCount="9" Offset="0x79F30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal_kiru_endR_Data" FrameCount="9" Offset="0x7A3F0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_07A8B0" FrameCount="15" Offset="0x7A8B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_sita_wait_Data" FrameCount="30" Offset="0x7B090"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_down_slope_slip_end_free_Data" FrameCount="19" Offset="0x7C050"/>
-        <PlayerAnimationData Name="gPlayerAnimData_07CA50" FrameCount="20" Offset="0x7CA50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait_Data" FrameCount="89" Offset="0x7D4D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_fall_Data" FrameCount="37" Offset="0x80370"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_Data" FrameCount="29" Offset="0x816D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_normal2bom_Data" FrameCount="20" Offset="0x82600"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_kiru_start_Data" FrameCount="16" Offset="0x83080"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_okarina_start_Data" FrameCount="12" Offset="0x838E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchBend_Data" FrameCount="10" Offset="0x83F30"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchCend_Data" FrameCount="10" Offset="0x84470"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchAend_Data" FrameCount="13" Offset="0x849B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_front_hitR_Data" FrameCount="16" Offset="0x85080"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_down_wake_Data" FrameCount="39" Offset="0x858E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_throw_free_Data" FrameCount="21" Offset="0x86D50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_short_landing_free_Data" FrameCount="16" Offset="0x87850"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_walk_muti_Data" FrameCount="35" Offset="0x880B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_jumpATend_Data" FrameCount="13" Offset="0x89310"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_powerup_loop_Data" FrameCount="29" Offset="0x899E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_fall_up_Data" FrameCount="86" Offset="0x8A910"/>
-        <PlayerAnimationData Name="gPlayerAnim_o_get_mae_Data" FrameCount="50" Offset="0x8D620"/>
-        <PlayerAnimationData Name="gPlayerAnim_om_get_mae_Data" FrameCount="50" Offset="0x8F050"/>
-        <PlayerAnimationData Name="gPlayerAnim_urusai_Data" FrameCount="51" Offset="0x90A80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_stop_Data" FrameCount="65" Offset="0x92540"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_heat2_20f_Data" FrameCount="25" Offset="0x94750"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_heat1_20f_Data" FrameCount="35" Offset="0x95470"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_tewofuru_Data" FrameCount="22" Offset="0x966D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_newside_jump_end_20f_Data" FrameCount="16" Offset="0x97260"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_hold_Data" FrameCount="18" Offset="0x97AC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_goto_future_Data" FrameCount="110" Offset="0x98430"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_put_Data" FrameCount="21" Offset="0x9BDD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_wait2waitR_long_Data" FrameCount="6" Offset="0x9C8D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_hanare_Data" FrameCount="35" Offset="0x9CC00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR_Data" FrameCount="12" Offset="0x9DE60"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_wakare_Data" FrameCount="51" Offset="0x9E4B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_sagaru_Data" FrameCount="30" Offset="0x9FF70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_back_hitR_Data" FrameCount="16" Offset="0xA0F30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_upR_Data" FrameCount="21" Offset="0xA1790"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_upL_Data" FrameCount="21" Offset="0xA2290"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitL2defense_long_Data" FrameCount="3" Offset="0xA2D90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitR2defense_long_Data" FrameCount="3" Offset="0xA2F30"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_uma_rightup_Data" FrameCount="38" Offset="0xA30D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_attack_Data" FrameCount="2" Offset="0xA44C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_otituku_w_Data" FrameCount="20" Offset="0xA45D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kenmiru2_modori_Data" FrameCount="15" Offset="0xA5050"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_up_slope_slip_end_long_Data" FrameCount="19" Offset="0xA5830"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kaoage_wait_Data" FrameCount="20" Offset="0xA6230"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end_Data" FrameCount="18" Offset="0xA6CB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end_Data" FrameCount="15" Offset="0xA7620"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_side_walk_Data" FrameCount="21" Offset="0xA7E00"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_umamiage_loop_Data" FrameCount="44" Offset="0xA8900"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kakeyori_Data" FrameCount="20" Offset="0xAA010"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_omen_loop_Data" FrameCount="30" Offset="0xAAA90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end_Data" FrameCount="19" Offset="0xABA50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lnormal_kiru_Data" FrameCount="5" Offset="0xAC450"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_landing_roll_free_Data" FrameCount="32" Offset="0xAC6F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_re_dead_attack_wait_Data" FrameCount="11" Offset="0xAD7B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_stand_Data" FrameCount="33" Offset="0xADD80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_talk_free_wait_Data" FrameCount="34" Offset="0xAEED0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_fish_miss_Data" FrameCount="21" Offset="0xB00A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_endR_Data" FrameCount="11" Offset="0xB0BA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_endL_Data" FrameCount="11" Offset="0xB1170"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_defense_ALL_Data" FrameCount="5" Offset="0xB1740"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0B19E0" FrameCount="30" Offset="0xB19E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_bow_shoot_next_Data" FrameCount="8" Offset="0xB29A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pushing_Data" FrameCount="31" Offset="0xB2DD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pulling_Data" FrameCount="31" Offset="0xB3E10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_wait_Data" FrameCount="20" Offset="0xB4E50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_zeldamiru_wait_Data" FrameCount="25" Offset="0xB58D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_Rside_swim_Data" FrameCount="34" Offset="0xB65F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_Lside_swim_Data" FrameCount="34" Offset="0xB77C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_bow_wait_Data" FrameCount="66" Offset="0xB8990"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR_Data" FrameCount="11" Offset="0xBAC20"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0BB1F0" FrameCount="30" Offset="0xBB1F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_250jump_start_Data" FrameCount="10" Offset="0xBC1B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_Data" FrameCount="29" Offset="0xBC6F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_hip_down_long_Data" FrameCount="28" Offset="0xBD620"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_side_walkR_long_Data" FrameCount="16" Offset="0xBE4D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_side_walkL_long_Data" FrameCount="16" Offset="0xBED30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_landing_Data" FrameCount="21" Offset="0xBF590"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_hajikareru_Data" FrameCount="24" Offset="0xC0090"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_rakka_Data" FrameCount="3" Offset="0xC0D20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end_Data" FrameCount="15" Offset="0xC0EC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR_Data" FrameCount="32" Offset="0xC16A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_waitL_long_Data" FrameCount="29" Offset="0xC2760"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_waitR_long_Data" FrameCount="29" Offset="0xC3690"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_child_tunnel_end_Data" FrameCount="71" Offset="0xC45C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_look_hand_wait_Data" FrameCount="20" Offset="0xC6AF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_endAL_Data" FrameCount="27" Offset="0xC7570"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_endAL_Data" FrameCount="27" Offset="0xC83A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_endAR_Data" FrameCount="27" Offset="0xC91D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_endAR_Data" FrameCount="27" Offset="0xCA000"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_endBL_Data" FrameCount="56" Offset="0xCAE30"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_endBL_Data" FrameCount="56" Offset="0xCCB80"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_endBR_Data" FrameCount="56" Offset="0xCE8D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_endBR_Data" FrameCount="56" Offset="0xD0620"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_hang_up_down_Data" FrameCount="11" Offset="0xD2370"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_drink_demo_end_Data" FrameCount="50" Offset="0xD2940"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_setmaskend_Data" FrameCount="3" Offset="0xD4370"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitR_Data" FrameCount="29" Offset="0xD4510"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitL_Data" FrameCount="29" Offset="0xD5440"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_shitR_Data" FrameCount="8" Offset="0xD6370"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_end_free_Data" FrameCount="5" Offset="0xD67A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_drink_demo_start_Data" FrameCount="47" Offset="0xD6A40"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_jumpAT_Data" FrameCount="13" Offset="0xD82E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_pierce_kiru_Data" FrameCount="4" Offset="0xD89B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hook_shot_ready_Data" FrameCount="9" Offset="0xD8BD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal2fighter_Data" FrameCount="20" Offset="0xD9090"/>
-        <PlayerAnimationData Name="gPlayerAnim_dl_jibunmiru_Data" FrameCount="48" Offset="0xD9B10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_waitL2wait_long_Data" FrameCount="13" Offset="0xDB430"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_waitR2wait_long_Data" FrameCount="13" Offset="0xDBB00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_jump_water_fall_wait_Data" FrameCount="13" Offset="0xDC1D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_rakuba_Data" FrameCount="33" Offset="0xDC8A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pulling_free_Data" FrameCount="31" Offset="0xDD9F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_bow_shoot_end_Data" FrameCount="16" Offset="0xDEA30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_nocarry_free_end_Data" FrameCount="7" Offset="0xDF290"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_elf_tobidasi_Data" FrameCount="52" Offset="0xDF640"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_rakkatyu_Data" FrameCount="20" Offset="0xE1180"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_free_Data" FrameCount="5" Offset="0xE1C00"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0E1EA0" FrameCount="18" Offset="0xE1EA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_standup_wait_Data" FrameCount="30" Offset="0xE2810"/>
-        <PlayerAnimationData Name="gPlayerAnim_bajyo_furikaeru_Data" FrameCount="60" Offset="0xE37D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_kyoro_loop_Data" FrameCount="62" Offset="0xE5740"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_hensin_Data" FrameCount="51" Offset="0xE77C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_sirimochi_wait_Data" FrameCount="25" Offset="0xE9280"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_Data" FrameCount="9" Offset="0xE9FA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_bajyo_walk_Data" FrameCount="35" Offset="0xEA460"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_45_turn_free_Data" FrameCount="10" Offset="0xEB6C0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0EBC00" FrameCount="20" Offset="0xEBC00"/>
-        <PlayerAnimationData Name="gPlayerAnim_lost_horse2_Data" FrameCount="40" Offset="0xEC680"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_down_Data" FrameCount="29" Offset="0xEDB70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_electric_shock_Data" FrameCount="26" Offset="0xEEAA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_fighter2free_Data" FrameCount="20" Offset="0xEF840"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_back_to_past_Data" FrameCount="90" Offset="0xF02C0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0F31E0" FrameCount="12" Offset="0xF31E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_ozigi_modori_Data" FrameCount="11" Offset="0xF3830"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0F3E00" FrameCount="15" Offset="0xF3E00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit_Data" FrameCount="9" Offset="0xF45E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_damage_run_long_Data" FrameCount="20" Offset="0xF4AA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_up_free_Data" FrameCount="38" Offset="0xF5520"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_Data" FrameCount="6" Offset="0xF6910"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_jump_rollkiru_Data" FrameCount="11" Offset="0xF6C40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_walk_Data" FrameCount="35" Offset="0xF7210"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_landing_roll_Data" FrameCount="32" Offset="0xF8470"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_drink_demo_wait_Data" FrameCount="9" Offset="0xF9530"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_mimawasi_wait_Data" FrameCount="55" Offset="0xF99F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_wait_Data" FrameCount="59" Offset="0xFB6C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_wait_Data" FrameCount="79" Offset="0xFD5B0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_0FFF10" FrameCount="24" Offset="0xFFF10"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_kubisime_Data" FrameCount="6" Offset="0x100BA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_hit_Data" FrameCount="16" Offset="0x100ED0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_run_long_Data" FrameCount="20" Offset="0x101730"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_Data" FrameCount="10" Offset="0x1021B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_15step_up_Data" FrameCount="66" Offset="0x1026F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_reboundR_Data" FrameCount="11" Offset="0x104980"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_startB_Data" FrameCount="50" Offset="0x104F50"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_startA_Data" FrameCount="30" Offset="0x106980"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_startA_Data" FrameCount="30" Offset="0x107940"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_startA_Data" FrameCount="30" Offset="0x108900"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_startB_Data" FrameCount="56" Offset="0x1098C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_startB_Data" FrameCount="56" Offset="0x10B610"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_wait_free_Data" FrameCount="54" Offset="0x10D360"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiwait_Data" FrameCount="18" Offset="0x10EFB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end_Data" FrameCount="11" Offset="0x10F920"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_box_kick_Data" FrameCount="50" Offset="0x10FEF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_furimuki_Data" FrameCount="80" Offset="0x111920"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_normal2free_Data" FrameCount="20" Offset="0x114300"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_Data" FrameCount="10" Offset="0x114D80"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_kennasi_w_Data" FrameCount="20" Offset="0x1152C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_doorB_link_Data" FrameCount="100" Offset="0x115D40"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_doorA_link_Data" FrameCount="100" Offset="0x1191A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_get_itemA_Data" FrameCount="22" Offset="0x11C600"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_get_itemB_Data" FrameCount="22" Offset="0x11D190"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_read_end_Data" FrameCount="20" Offset="0x11DD20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end_Data" FrameCount="12" Offset="0x11E7A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_down_Data" FrameCount="178" Offset="0x11EDF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_end_Data" FrameCount="10" Offset="0x124B20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_normal2fighter_free_Data" FrameCount="20" Offset="0x125060"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_Data" FrameCount="9" Offset="0x125AE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hatto_demo_Data" FrameCount="72" Offset="0x125FA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_silver_throw_Data" FrameCount="31" Offset="0x128550"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_brake_end_Data" FrameCount="12" Offset="0x129590"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_silver_carry_Data" FrameCount="80" Offset="0x129BE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_up_slope_slip_end_Data" FrameCount="19" Offset="0x12C5C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_ozigi_loop_Data" FrameCount="10" Offset="0x12CFC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_startB_Data" FrameCount="56" Offset="0x12D500"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_startA_Data" FrameCount="30" Offset="0x12F250"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pull_end_free_Data" FrameCount="16" Offset="0x130210"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_backturn_jump_endR_Data" FrameCount="12" Offset="0x130A70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hook_fly_wait_Data" FrameCount="21" Offset="0x1310C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_batabata_Data" FrameCount="14" Offset="0x131BC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_sude_nwait_Data" FrameCount="45" Offset="0x132320"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_carryB_Data" FrameCount="36" Offset="0x133AB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_honoo2_Data" FrameCount="25" Offset="0x134D90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_honoo3_Data" FrameCount="60" Offset="0x135AB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_honoo1_Data" FrameCount="60" Offset="0x137A20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_endL_free_Data" FrameCount="11" Offset="0x139990"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_endR_free_Data" FrameCount="11" Offset="0x139F60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hammer_long2long_Data" FrameCount="20" Offset="0x13A530"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_startA_Data" FrameCount="30" Offset="0x13AFB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_startB_Data" FrameCount="15" Offset="0x13BF70"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_ken_miru_Data" FrameCount="26" Offset="0x13C750"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_tamahaki_Data" FrameCount="8" Offset="0x13D4F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_om_get_Data" FrameCount="30" Offset="0x13D920"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_gaku_Data" FrameCount="29" Offset="0x13E8E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_ue_Data" FrameCount="10" Offset="0x13F810"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_newroll_jump_end_20f_Data" FrameCount="13" Offset="0x13FD50"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_upL_Data" FrameCount="21" Offset="0x140420"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_upL_Data" FrameCount="21" Offset="0x140F20"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_climb_upR_Data" FrameCount="21" Offset="0x141A20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_upR_Data" FrameCount="21" Offset="0x142520"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_ee_loop_Data" FrameCount="28" Offset="0x143020"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_walk2ready_Data" FrameCount="9" Offset="0x143ED0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_sideL_Data" FrameCount="21" Offset="0x144390"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_sideR_Data" FrameCount="21" Offset="0x144E90"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_gakkistart_Data" FrameCount="12" Offset="0x145990"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_rakkafinish_Data" FrameCount="11" Offset="0x145FE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_light_bom_Data" FrameCount="12" Offset="0x1465B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_hip_down_free_Data" FrameCount="28" Offset="0x146C00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kakeyori_miokuri_Data" FrameCount="25" Offset="0x147AB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_itemD1_20f_Data" FrameCount="70" Offset="0x1487D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_itemD2_20f_Data" FrameCount="108" Offset="0x14AC80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_throw_Data" FrameCount="21" Offset="0x14E510"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_push_start_Data" FrameCount="16" Offset="0x14F010"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_jump_end_Data" FrameCount="8" Offset="0x14F870"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_jump_end_Data" FrameCount="8" Offset="0x14FCA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_brake_Data" FrameCount="12" Offset="0x1500D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_down_slope_slip_end_Data" FrameCount="19" Offset="0x150720"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_derth_rebirth_Data" FrameCount="230" Offset="0x151120"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hook_wait_Data" FrameCount="69" Offset="0x158990"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_warp_Data" FrameCount="70" Offset="0x15ADB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_drinkstart_Data" FrameCount="29" Offset="0x15D260"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_Data" FrameCount="9" Offset="0x15E190"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_okarina_walkB_Data" FrameCount="21" Offset="0x15E650"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_kaze1_Data" FrameCount="56" Offset="0x15F150"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_kaze3_Data" FrameCount="32" Offset="0x160EA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_kaze2_Data" FrameCount="9" Offset="0x161F60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_okarina_end_Data" FrameCount="12" Offset="0x162420"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_walk_free_Data" FrameCount="29" Offset="0x162A70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_talk_free_Data" FrameCount="7" Offset="0x1639A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_spotlight_wait_Data" FrameCount="25" Offset="0x163D50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_Data" FrameCount="7" Offset="0x164A70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kenmiru1_wait_Data" FrameCount="20" Offset="0x164E20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kenmiru2_wait_Data" FrameCount="20" Offset="0x1658A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end_Data" FrameCount="17" Offset="0x166320"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_wait_Data" FrameCount="54" Offset="0x166C10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_jump200_Data" FrameCount="30" Offset="0x168860"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_doorB_open_Data" FrameCount="100" Offset="0x169820"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_doorA_open_Data" FrameCount="100" Offset="0x16CC80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_LLside_kiru_endL_Data" FrameCount="11" Offset="0x1700E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_LRside_kiru_endR_Data" FrameCount="11" Offset="0x1706B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk_Data" FrameCount="21" Offset="0x170C80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end_Data" FrameCount="16" Offset="0x171780"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end_Data" FrameCount="13" Offset="0x171FE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_normal_okarina_walk_Data" FrameCount="21" Offset="0x1726B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_hoo_Data" FrameCount="20" Offset="0x1731B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_landing_wait_Data" FrameCount="20" Offset="0x173C30"/>
-        <PlayerAnimationData Name="gPlayerAnimData_1746B0" FrameCount="15" Offset="0x1746B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_ue_wait_Data" FrameCount="40" Offset="0x174E90"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_jibun_miru_Data" FrameCount="43" Offset="0x176380"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_waterroll_Data" FrameCount="18" Offset="0x177A10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_waitF_heat1_20f_Data" FrameCount="36" Offset="0x178380"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_waitF_heat2_20f_Data" FrameCount="24" Offset="0x179660"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_fastrun_Data" FrameCount="24" Offset="0x17A2F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_unun_Data" FrameCount="29" Offset="0x17AF80"/>
-        <PlayerAnimationData Name="gPlayerAnimData_17BEB0" FrameCount="20" Offset="0x17BEB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_tereru_Data" FrameCount="24" Offset="0x17C930"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait_free_Data" FrameCount="89" Offset="0x17D5C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_slowrun_muti_Data" FrameCount="29" Offset="0x180460"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_deep_end_Data" FrameCount="32" Offset="0x181390"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_climb_up_Data" FrameCount="29" Offset="0x182450"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_wait_Data" FrameCount="46" Offset="0x183380"/>
-        <PlayerAnimationData Name="gPlayerAnim_okarinatori_Data" FrameCount="22" Offset="0x184BA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_damage_run_Data" FrameCount="20" Offset="0x185730"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_run_Data" FrameCount="20" Offset="0x1861B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_backturn_jump_Data" FrameCount="15" Offset="0x186C30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kenmiru2_Data" FrameCount="35" Offset="0x187410"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kenmiru1_Data" FrameCount="10" Offset="0x188670"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_kyoro_Data" FrameCount="15" Offset="0x188BB0"/>
-        <PlayerAnimationData Name="gPlayerAnimData_189390" FrameCount="42" Offset="0x189390"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_up_slope_slip_end_free_Data" FrameCount="19" Offset="0x18A990"/>
-        <PlayerAnimationData Name="gPlayerAnim_d_link_orowait_Data" FrameCount="45" Offset="0x18B390"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_furimuki2_Data" FrameCount="45" Offset="0x18CB20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_return_to_past_Data" FrameCount="80" Offset="0x18E2B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_kakkufinish_Data" FrameCount="15" Offset="0x190C90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_rebound_longR_Data" FrameCount="13" Offset="0x191470"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_fuwafuwa_loop_Data" FrameCount="40" Offset="0x191B40"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cutterwaitanim_Data" FrameCount="29" Offset="0x193030"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_maskoffstart_Data" FrameCount="15" Offset="0x193F60"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_maskoffstart_Data" FrameCount="15" Offset="0x194740"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_maskoffstart_Data" FrameCount="15" Offset="0x194F20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_defense_hit_Data" FrameCount="8" Offset="0x195700"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_wait2swim_wait_Data" FrameCount="10" Offset="0x195B30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_nocarry_free_wait_Data" FrameCount="5" Offset="0x196070"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_slowrun_Data" FrameCount="29" Offset="0x196310"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_koutai_Data" FrameCount="35" Offset="0x197240"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_goma_furimuki_Data" FrameCount="46" Offset="0x1984A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_front_jump_endR_Data" FrameCount="21" Offset="0x199CC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_give_other_Data" FrameCount="47" Offset="0x19A7C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_yes_Data" FrameCount="23" Offset="0x19C060"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitL2wait_Data" FrameCount="13" Offset="0x19CC70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitR2wait_Data" FrameCount="13" Offset="0x19D340"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_gurad_Data" FrameCount="20" Offset="0x19DA10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_waitF_typeD_20f_Data" FrameCount="138" Offset="0x19E490"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_ice_down_Data" FrameCount="16" Offset="0x1A2CD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_gakkiplay_Data" FrameCount="7" Offset="0x1A3530"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_gakkiplay_Data" FrameCount="8" Offset="0x1A38E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_1kyoro_Data" FrameCount="20" Offset="0x1A3D10"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_miokuri_Data" FrameCount="30" Offset="0x1A4790"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_2kyoro_Data" FrameCount="20" Offset="0x1A5750"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplay_Data" FrameCount="18" Offset="0x1A61D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_umanoru_loop_Data" FrameCount="30" Offset="0x1A6B40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_bug_miss_Data" FrameCount="13" Offset="0x1A7B00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_down_wake_Data" FrameCount="36" Offset="0x1A81D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_push_wait_Data" FrameCount="10" Offset="0x1A94B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_landing_roll_long_Data" FrameCount="32" Offset="0x1A99F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_jump_end_Data" FrameCount="19" Offset="0x1AAAB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_jibunmiru_Data" FrameCount="100" Offset="0x1AB4B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_hit_Data" FrameCount="16" Offset="0x1AE910"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_up_Data" FrameCount="38" Offset="0x1AF170"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_wait_free_Data" FrameCount="20" Offset="0x1B0560"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_atozusari_Data" FrameCount="33" Offset="0x1B0FE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_zeldamiru_Data" FrameCount="15" Offset="0x1B2130"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_tame_Data" FrameCount="43" Offset="0x1B2910"/>
-        <PlayerAnimationData Name="gPlayerAnimData_1B3FA0" FrameCount="45" Offset="0x1B3FA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hammer_long2free_Data" FrameCount="20" Offset="0x1B5730"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_pull_end_Data" FrameCount="16" Offset="0x1B61B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_push_end_Data" FrameCount="16" Offset="0x1B6A10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_jump_Data" FrameCount="13" Offset="0x1B7270"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_last_hit_motion2_Data" FrameCount="28" Offset="0x1B7940"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_last_hit_motion1_Data" FrameCount="82" Offset="0x1B87F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hook_fly_start_Data" FrameCount="9" Offset="0x1BB2E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_up_slope_slip_Data" FrameCount="10" Offset="0x1BB7A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitL_free_Data" FrameCount="29" Offset="0x1BBCE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitR_free_Data" FrameCount="29" Offset="0x1BCC10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_pierce_kiru_endR_Data" FrameCount="9" Offset="0x1BDB40"/>
-        <PlayerAnimationData Name="gPlayerAnim_dl_yusaburu_Data" FrameCount="6" Offset="0x1BE000"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_mimawasi_Data" FrameCount="15" Offset="0x1BE330"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_right_down_Data" FrameCount="48" Offset="0x1BEB10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_land2swim_wait_Data" FrameCount="27" Offset="0x1C0430"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_bikkuri_Data" FrameCount="20" Offset="0x1C1260"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_standup_Data" FrameCount="78" Offset="0x1C1CE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_upL_Data" FrameCount="21" Offset="0x1C45C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_climb_upR_Data" FrameCount="21" Offset="0x1C50C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_okiagaru_wait_Data" FrameCount="40" Offset="0x1C5BC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_side_walk_free_Data" FrameCount="29" Offset="0x1C70B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_silver_wait_Data" FrameCount="71" Offset="0x1C7FE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_upL_Data" FrameCount="21" Offset="0x1CA510"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_climb_upR_Data" FrameCount="21" Offset="0x1CB010"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_ha_Data" FrameCount="35" Offset="0x1CBB10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_defense_long_hit_Data" FrameCount="9" Offset="0x1CCD70"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchBendR_Data" FrameCount="10" Offset="0x1CD230"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchCendR_Data" FrameCount="10" Offset="0x1CD770"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchAendR_Data" FrameCount="13" Offset="0x1CDCB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_okiagaru_tatu_Data" FrameCount="41" Offset="0x1CE380"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_back_brake_Data" FrameCount="18" Offset="0x1CF900"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_front_jump_end_Data" FrameCount="21" Offset="0x1D0270"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_muku_Data" FrameCount="25" Offset="0x1D0D70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_side_walk_Data" FrameCount="29" Offset="0x1D1A90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_walk_Data" FrameCount="29" Offset="0x1D29C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_downB_Data" FrameCount="12" Offset="0x1D38F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_front_downA_Data" FrameCount="5" Offset="0x1D3F40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_backspace_Data" FrameCount="13" Offset="0x1D41E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_kamaeru_Data" FrameCount="15" Offset="0x1D48B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_kei_wait_Data" FrameCount="30" Offset="0x1D5090"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_okarina_swing_Data" FrameCount="68" Offset="0x1D6050"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_omen_Data" FrameCount="20" Offset="0x1D83F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_negaeri_Data" FrameCount="55" Offset="0x1D8E70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_rolling_kiru_Data" FrameCount="13" Offset="0x1DAB40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_Tbox_open_Data" FrameCount="133" Offset="0x1DB210"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_powerup_Data" FrameCount="80" Offset="0x1DF7B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_itemC_20f_Data" FrameCount="93" Offset="0x1E2190"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_itemB_20f_Data" FrameCount="100" Offset="0x1E5240"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_wait_itemA_20f_Data" FrameCount="90" Offset="0x1E86A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_free_Data" FrameCount="20" Offset="0x1EB5C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end_Data" FrameCount="19" Offset="0x1EC040"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal_kiru_finsh_Data" FrameCount="6" Offset="0x1ECA40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_fall_wait_Data" FrameCount="61" Offset="0x1ECD70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_end_free_Data" FrameCount="10" Offset="0x1EED60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end_Data" FrameCount="19" Offset="0x1EF2A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_d_link_imanodare_Data" FrameCount="20" Offset="0x1EFCA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_Tbox_open_Data" FrameCount="133" Offset="0x1F0720"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR_Data" FrameCount="19" Offset="0x1F4CC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_anim_jump100_Data" FrameCount="23" Offset="0x1F56C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_furimuki2_wait_Data" FrameCount="30" Offset="0x1F62D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_landing_free_Data" FrameCount="21" Offset="0x1F7290"/>
-        <PlayerAnimationData Name="gPlayerAnim_rakka_Data" FrameCount="57" Offset="0x1F7D90"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_okiagari_Data" FrameCount="365" Offset="0x1F9B70"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_bashi_Data" FrameCount="55" Offset="0x205A80"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_bladeon_Data" FrameCount="9" Offset="0x207750"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL_Data" FrameCount="18" Offset="0x207C10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_long2bom_Data" FrameCount="20" Offset="0x208580"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_side_walkL_free_Data" FrameCount="16" Offset="0x209000"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_side_walkR_free_Data" FrameCount="16" Offset="0x209860"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_back_walk_Data" FrameCount="16" Offset="0x20A0C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_defense_Data" FrameCount="5" Offset="0x20A920"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_koutai_wait_Data" FrameCount="20" Offset="0x20ABC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR_Data" FrameCount="15" Offset="0x20B640"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_doorB_open_Data" FrameCount="100" Offset="0x20BE20"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_doorA_open_Data" FrameCount="100" Offset="0x20F280"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_dakiau_Data" FrameCount="35" Offset="0x2126E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_backturn_jump_end_Data" FrameCount="7" Offset="0x213940"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpierce_kiru_Data" FrameCount="3" Offset="0x213CF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_get1_Data" FrameCount="40" Offset="0x213E90"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_get3_Data" FrameCount="20" Offset="0x215380"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_get2_Data" FrameCount="20" Offset="0x215E00"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_m_wait_Data" FrameCount="40" Offset="0x216880"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_baru_op2_Data" FrameCount="40" Offset="0x217D70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_baru_op3_Data" FrameCount="25" Offset="0x219260"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_baru_op1_Data" FrameCount="35" Offset="0x219F80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_hook_walk2ready_Data" FrameCount="9" Offset="0x21B1E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_jump_kiru_end_Data" FrameCount="20" Offset="0x21B6A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR_Data" FrameCount="16" Offset="0x21C120"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_fukitobu_Data" FrameCount="20" Offset="0x21C980"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_deep_start_Data" FrameCount="50" Offset="0x21D400"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_pierce_kiru_end_Data" FrameCount="9" Offset="0x21EE30"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkistart_Data" FrameCount="14" Offset="0x21F2F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplayU_Data" FrameCount="9" Offset="0x21FA50"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplayR_Data" FrameCount="9" Offset="0x21FF10"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplayL_Data" FrameCount="9" Offset="0x2203D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplayD_Data" FrameCount="9" Offset="0x220890"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_gakkiplayA_Data" FrameCount="9" Offset="0x220D50"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_45_turn_Data" FrameCount="10" Offset="0x221210"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_wait_3_Data" FrameCount="30" Offset="0x221750"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_wait_2_Data" FrameCount="195" Offset="0x222710"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_wait_1_Data" FrameCount="208" Offset="0x228D30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_startL_Data" FrameCount="11" Offset="0x22FA10"/>
-        <PlayerAnimationData Name="gPlayerAnim_lost_horse_wait_Data" FrameCount="11" Offset="0x22FFE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_link_tewatashi_Data" FrameCount="90" Offset="0x2305B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_newroll_jump_20f_Data" FrameCount="13" Offset="0x2334D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_free2freeB_Data" FrameCount="20" Offset="0x233BA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_jump_endL_Data" FrameCount="8" Offset="0x234620"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_jump_endR_Data" FrameCount="8" Offset="0x234A50"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_maru_change_Data" FrameCount="11" Offset="0x234E80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_run_Data" FrameCount="16" Offset="0x235450"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait_typeA_20f_Data" FrameCount="184" Offset="0x235CB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait_typeB_20f_Data" FrameCount="187" Offset="0x23BD00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_wait_typeC_20f_Data" FrameCount="200" Offset="0x241EF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_dl_jibunmiru_wait_Data" FrameCount="20" Offset="0x2487A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_sirimochi_Data" FrameCount="54" Offset="0x249220"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_anchor2fighter_Data" FrameCount="34" Offset="0x24AE70"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_tamashii1_Data" FrameCount="52" Offset="0x24C040"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_tamashii3_Data" FrameCount="49" Offset="0x24DB80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_magic_tamashii2_Data" FrameCount="29" Offset="0x24F530"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_side_walk_long_Data" FrameCount="29" Offset="0x250460"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_power_kiru_start_Data" FrameCount="11" Offset="0x251390"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_kakku_Data" FrameCount="12" Offset="0x251960"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_kiru_Data" FrameCount="5" Offset="0x251FB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_boom_throw_waitL_Data" FrameCount="29" Offset="0x252250"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_boom_throw_waitR_Data" FrameCount="29" Offset="0x253180"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_kakeyori_mimawasi_Data" FrameCount="85" Offset="0x2540B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_Fclimb_hold2upL_Data" FrameCount="30" Offset="0x256D30"/>
-        <PlayerAnimationData Name="gPlayerAnim_Link_miageru_Data" FrameCount="20" Offset="0x257CF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lrolling_kiru_Data" FrameCount="16" Offset="0x258770"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Wrolling_kiru_Data" FrameCount="17" Offset="0x258FD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_rolling_kiru_end_Data" FrameCount="16" Offset="0x2598C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_Data" FrameCount="8" Offset="0x25A120"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cuttercatch_Data" FrameCount="6" Offset="0x25A550"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitL2defense_Data" FrameCount="3" Offset="0x25A880"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_waitR2defense_Data" FrameCount="3" Offset="0x25AA20"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_koutai_kennuki_Data" FrameCount="25" Offset="0x25ABC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_carryB_wait_Data" FrameCount="55" Offset="0x25B8E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitF_typeC_20f_Data" FrameCount="200" Offset="0x25D5B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitF_typeB_20f_Data" FrameCount="187" Offset="0x263E60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_waitF_typeA_20f_Data" FrameCount="184" Offset="0x26A050"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_child_tunnel_start_Data" FrameCount="80" Offset="0x2700A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_pikupiku_Data" FrameCount="10" Offset="0x272A80"/>
-        <PlayerAnimationData Name="gPlayerAnim_lost_horse_Data" FrameCount="81" Offset="0x272FC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_wait_free_Data" FrameCount="72" Offset="0x275A30"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_rebound_long_Data" FrameCount="13" Offset="0x277FE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_uma_left_up_Data" FrameCount="70" Offset="0x2786B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_put_free_Data" FrameCount="15" Offset="0x27AB60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_normal_kiru_Data" FrameCount="5" Offset="0x27B340"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_wait3_Data" FrameCount="30" Offset="0x27B5E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_wait2_Data" FrameCount="30" Offset="0x27C5A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_op3_wait1_Data" FrameCount="80" Offset="0x27D560"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_free_Data" FrameCount="20" Offset="0x27FF40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_turn_kiruR_end_Data" FrameCount="16" Offset="0x2809C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_turn_kiruL_end_Data" FrameCount="16" Offset="0x281220"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackC_Data" FrameCount="20" Offset="0x281A80"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackB_Data" FrameCount="10" Offset="0x282500"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackA_Data" FrameCount="7" Offset="0x282A40"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LRside_kiru_Data" FrameCount="6" Offset="0x282DF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_LLside_kiru_Data" FrameCount="6" Offset="0x283120"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_fish_out_Data" FrameCount="120" Offset="0x283450"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_doorA_link_free_Data" FrameCount="100" Offset="0x287320"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_free2bom_Data" FrameCount="20" Offset="0x28A780"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_doorB_link_free_Data" FrameCount="100" Offset="0x28B200"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_wait_Data" FrameCount="73" Offset="0x28E660"/>
-        <PlayerAnimationData Name="gPlayerAnim_d_link_orooro_Data" FrameCount="60" Offset="0x290CA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_defense_hit_Data" FrameCount="9" Offset="0x292C10"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_jump_climb_hold_free_Data" FrameCount="18" Offset="0x2930D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_dakiau_loop_Data" FrameCount="40" Offset="0x293A40"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchC_Data" FrameCount="20" Offset="0x294F30"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchB_Data" FrameCount="19" Offset="0x2959B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_punchA_Data" FrameCount="12" Offset="0x2963B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_down_slope_slip_end_long_Data" FrameCount="19" Offset="0x296A00"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_downB_Data" FrameCount="14" Offset="0x297400"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_back_downA_Data" FrameCount="6" Offset="0x297B60"/>
-        <PlayerAnimationData Name="gPlayerAnimData_297E90" FrameCount="30" Offset="0x297E90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_bow_ready_Data" FrameCount="9" Offset="0x298E50"/>
-        <PlayerAnimationData Name="gPlayerAnim_vs_yousei_Data" FrameCount="102" Offset="0x299310"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_down_slope_slip_Data" FrameCount="10" Offset="0x29C880"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Rside_jump_Data" FrameCount="7" Offset="0x29CDC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lside_jump_Data" FrameCount="7" Offset="0x29D170"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_Tbox_open_Data" FrameCount="133" Offset="0x29D520"/>
-        <PlayerAnimationData Name="gPlayerAnim_pg_Tbox_open_Data" FrameCount="133" Offset="0x2A1AC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_yurayura_Data" FrameCount="40" Offset="0x2A6060"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_Tbox_open_Data" FrameCount="133" Offset="0x2A7550"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_light_bom_end_Data" FrameCount="19" Offset="0x2ABAF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_clink_demo_return_to_future_Data" FrameCount="51" Offset="0x2AC4F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_msbowait_Data" FrameCount="79" Offset="0x2ADFB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_run_jump_water_fall_Data" FrameCount="31" Offset="0x2B0910"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_carryB_free_Data" FrameCount="17" Offset="0x2B1950"/>
-        <PlayerAnimationData Name="gPlayerAnim_lkt_nwait_Data" FrameCount="45" Offset="0x2B2240"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lnormal_kiru_end_Data" FrameCount="9" Offset="0x2B39D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackBend_Data" FrameCount="12" Offset="0x2B3E90"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackCend_Data" FrameCount="10" Offset="0x2B44E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackAend_Data" FrameCount="9" Offset="0x2B4A20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_re_dead_attack_Data" FrameCount="9" Offset="0x2B4EE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_hensin_loop_Data" FrameCount="48" Offset="0x2B53A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_okarina_get_Data" FrameCount="30" Offset="0x2B6CC0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_electric_shock_end_Data" FrameCount="113" Offset="0x2B7C80"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_normal2fighter_Data" FrameCount="20" Offset="0x2BB7B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_side_walkR_Data" FrameCount="16" Offset="0x2BC230"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_side_walkL_Data" FrameCount="16" Offset="0x2BCA90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL_Data" FrameCount="9" Offset="0x2BD2F0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_gurad_wait_Data" FrameCount="10" Offset="0x2BD7B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_setmask_Data" FrameCount="66" Offset="0x2BDCF0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_front_jump_Data" FrameCount="10" Offset="0x2BFF80"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_wakare_loop_Data" FrameCount="30" Offset="0x2C04C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Wrolling_kiru_end_Data" FrameCount="12" Offset="0x2C1480"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_fighter2long_Data" FrameCount="20" Offset="0x2C1AD0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bow_side_walk_Data" FrameCount="24" Offset="0x2C2550"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_ozigi_Data" FrameCount="30" Offset="0x2C31E0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackBendR_Data" FrameCount="6" Offset="0x2C41A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackCendR_Data" FrameCount="3" Offset="0x2C44D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_attackAendR_Data" FrameCount="6" Offset="0x2C4670"/>
-        <PlayerAnimationData Name="gPlayerAnim_pz_cutterattack_Data" FrameCount="9" Offset="0x2C49A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_hanare_loop_Data" FrameCount="40" Offset="0x2C4E60"/>
-        <PlayerAnimationData Name="gPlayerAnimData_2C6350" FrameCount="45" Offset="0x2C6350"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_okiru_demo_Data" FrameCount="80" Offset="0x2C7AE0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_check_Data" FrameCount="20" Offset="0x2CA4C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR_Data" FrameCount="10" Offset="0x2CAF40"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_dance_loop_Data" FrameCount="145" Offset="0x2CB480"/>
-        <PlayerAnimationData Name="gPlayerAnim_pn_drink_Data" FrameCount="15" Offset="0x2D0070"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_Data" FrameCount="35" Offset="0x2D0850"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_bouzen_Data" FrameCount="15" Offset="0x2D1AB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_Lpower_kiru_walk_Data" FrameCount="21" Offset="0x2D2290"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_fighter_jump_kiru_finsh_Data" FrameCount="10" Offset="0x2D2D90"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_uma_leftup_Data" FrameCount="38" Offset="0x2D32D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_okiagaru_Data" FrameCount="79" Offset="0x2D46C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_keirei_Data" FrameCount="40" Offset="0x2D7020"/>
-        <PlayerAnimationData Name="gPlayerAnimData_2D8510" FrameCount="66" Offset="0x2D8510"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_umamiage_Data" FrameCount="30" Offset="0x2DA7A0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_fall_up_free_Data" FrameCount="61" Offset="0x2DB760"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_swim_hit_Data" FrameCount="10" Offset="0x2DD750"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_100step_up_Data" FrameCount="28" Offset="0x2DDC90"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_150step_up_Data" FrameCount="45" Offset="0x2DEB40"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_suwari1_Data" FrameCount="40" Offset="0x2E02D0"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_suwari3_Data" FrameCount="30" Offset="0x2E17C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_demo_suwari2_Data" FrameCount="80" Offset="0x2E2780"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_bottle_read_Data" FrameCount="100" Offset="0x2E5160"/>
-        <PlayerAnimationData Name="gPlayerAnim_kf_awase_Data" FrameCount="10" Offset="0x2E85C0"/>
-        <PlayerAnimationData Name="gPlayerAnim_o_get_ato_Data" FrameCount="20" Offset="0x2E8B00"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_yareyare_Data" FrameCount="48" Offset="0x2E9580"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_ue_wait_Data" FrameCount="30" Offset="0x2EAEA0"/>
-        <PlayerAnimationData Name="gPlayerAnim_cl_dakisime_Data" FrameCount="40" Offset="0x2EBE60"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_newside_jump_20f_Data" FrameCount="14" Offset="0x2ED350"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_swimer_back_swim_Data" FrameCount="39" Offset="0x2EDAB0"/>
-        <PlayerAnimationData Name="gPlayerAnim_kolink_odoroki_demo_Data" FrameCount="60" Offset="0x2EEF20"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_normal_damage_run_free_Data" FrameCount="20" Offset="0x2F0E90"/>
-        <PlayerAnimationData Name="gPlayerAnim_L_kw_Data" FrameCount="20" Offset="0x2F1910"/>
-        <PlayerAnimationData Name="gPlayerAnim_al_no_Data" FrameCount="25" Offset="0x2F2390"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_doorB_link_Data" FrameCount="100" Offset="0x2F30B0"/>
-        <PlayerAnimationData Name="gPlayerAnim_link_demo_doorA_link_Data" FrameCount="100" Offset="0x2F6510"/>
-        <PlayerAnimationData Name="gPlayerAnim_alink_somukeru_Data" FrameCount="8" Offset="0x2F9970"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/locerrmsg.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/locerrmsg.xml
deleted file mode 100644
index d6f8bfdaa..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/locerrmsg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Root>
-	<File Name="locerrmsg" Segment="1">
-		<Texture Name="gNotDesignedForSystemErrorTex" OutName="not_designed_for_system_error" Format="i4" Width="208" Height="16" Offset="0x0"/>
-	</File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/memerrmsg.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/memerrmsg.xml
deleted file mode 100644
index 92c15f474..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/memerrmsg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-	<File Name="memerrmsg" Segment="1">
-		<Texture Name="gExpansionPakNotInstalledErrorTex" OutName="expansion_pak_not_installed_error" Format="i4" Width="128" Height="37" Offset="0x0"/>
-		<Texture Name="gSeeInstructionBookletErrorTex" OutName="see_instruction_booklet_error" Format="i4" Width="128" Height="37" Offset="0x940"/>
-	</File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/nintendo_rogo_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/nintendo_rogo_static.xml
deleted file mode 100644
index ff6fc56fc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/nintendo_rogo_static.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="nintendo_rogo_static" Segment="1" Game="MM">
-        <Texture Name="gNintendo64LogoTextTex" OutName="nintendo_64_logo_text" Format="i8" Width="192" Height="32" Offset="0x0"/>
-        <Texture Name="gNintendo64LogoTextShineTex" OutName="nintendo_64_logo_text_shine" Format="i8" Width="32" Height="32" Offset="0x1800"/>
-        <DList Name="gNintendo64LogoNDL" Offset="0x2720"/>
-        <Texture Name="gNintendo64LogoNShineTex" OutName="nintendo_64_logo_n_shine" Format="i8" Width="32" Height="32" Offset="0x29C0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_01.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_01.xml
deleted file mode 100644
index edbb2d1c4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_01.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<Root>
-    <File Name="scene_texture_01" Segment="6">
-        <Texture Name="scene_texture_01_Tex_000000" OutName="tex_000000" Format="ci8" Width="16" Height="16" Offset="0x0"/>
-        <Texture Name="scene_texture_01_Tex_000100" OutName="tex_000100" Format="rgba16" Width="32" Height="32" Offset="0x100"/>
-        <Texture Name="scene_texture_01_Tex_000900" OutName="tex_000900" Format="ci8" Width="64" Height="16" Offset="0x900"/>
-        <Texture Name="scene_texture_01_Tex_000D00" OutName="tex_000D00" Format="ci8" Width="64" Height="16" Offset="0xD00"/>
-        <Texture Name="scene_texture_01_Tex_001100" OutName="tex_001100" Format="ci8" Width="16" Height="16" Offset="0x1100"/>
-        <Texture Name="scene_texture_01_Tex_001200" OutName="tex_001200" Format="ci8" Width="32" Height="16" Offset="0x1200"/>
-        <Texture Name="scene_texture_01_Tex_001400" OutName="tex_001400" Format="ci8" Width="32" Height="32" Offset="0x1400"/>
-        <Texture Name="scene_texture_01_Tex_001800" OutName="tex_001800" Format="rgba16" Width="16" Height="8" Offset="0x1800"/>
-        <Texture Name="scene_texture_01_Tex_001900" OutName="tex_001900" Format="ci8" Width="16" Height="16" Offset="0x1900"/>
-        <Texture Name="scene_texture_01_Tex_001A00" OutName="tex_001A00" Format="ci8" Width="32" Height="32" Offset="0x1A00"/>
-        <Texture Name="scene_texture_01_Tex_001E00" OutName="tex_001E00" Format="ci8" Width="32" Height="32" Offset="0x1E00"/>
-        <Texture Name="scene_texture_01_Tex_002200" OutName="tex_002200" Format="ci8" Width="16" Height="16" Offset="0x2200"/>
-        <Texture Name="scene_texture_01_Tex_002300" OutName="tex_002300" Format="ci8" Width="16" Height="32" Offset="0x2300"/>
-        <Texture Name="scene_texture_01_Tex_002500" OutName="tex_002500" Format="ci8" Width="16" Height="64" Offset="0x2500"/>
-        <Texture Name="scene_texture_01_Tex_002900" OutName="tex_002900" Format="ci8" Width="16" Height="64" Offset="0x2900"/>
-        <Texture Name="scene_texture_01_Tex_002D00" OutName="tex_002D00" Format="i8" Width="8" Height="8" Offset="0x2D00"/>
-        <!-- <Blob Name="scene_texture_01_Blob_002D40" Size="0x100" Offset="0x2D40"/> -->
-        <Texture Name="scene_texture_01_Tex_002E40" OutName="tex_002E40" Format="ci8" Width="16" Height="32" Offset="0x2E40"/>
-        <Texture Name="scene_texture_01_Tex_003040" OutName="tex_003040" Format="ci8" Width="32" Height="16" Offset="0x3040"/>
-        <Texture Name="scene_texture_01_Tex_003240" OutName="tex_003240" Format="ci8" Width="8" Height="8" Offset="0x3240"/>
-        <Texture Name="scene_texture_01_Tex_003280" OutName="tex_003280" Format="ci8" Width="32" Height="32" Offset="0x3280"/>
-        <Texture Name="scene_texture_01_Tex_003680" OutName="tex_003680" Format="ci8" Width="32" Height="32" Offset="0x3680"/>
-        <Texture Name="scene_texture_01_Tex_003A80" OutName="tex_003A80" Format="ci8" Width="16" Height="32" Offset="0x3A80"/>
-        <Texture Name="scene_texture_01_Tex_003C80" OutName="tex_003C80" Format="ci8" Width="32" Height="32" Offset="0x3C80"/>
-        <Texture Name="scene_texture_01_Tex_004080" OutName="tex_004080" Format="ci8" Width="32" Height="32" Offset="0x4080"/>
-        <Texture Name="scene_texture_01_Tex_004480" OutName="tex_004480" Format="ci8" Width="32" Height="8" Offset="0x4480"/>
-        <Texture Name="scene_texture_01_Tex_004580" OutName="tex_004580" Format="ci8" Width="16" Height="8" Offset="0x4580"/>
-        <Texture Name="scene_texture_01_Tex_004600" OutName="tex_004600" Format="ci8" Width="16" Height="16" Offset="0x4600"/>
-        <Texture Name="scene_texture_01_Tex_004700" OutName="tex_004700" Format="ci8" Width="16" Height="16" Offset="0x4700"/>
-        <Texture Name="scene_texture_01_Tex_004800" OutName="tex_004800" Format="ci8" Width="16" Height="64" Offset="0x4800"/>
-        <Texture Name="scene_texture_01_Tex_004C00" OutName="tex_004C00" Format="ci8" Width="16" Height="16" Offset="0x4C00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_02.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_02.xml
deleted file mode 100644
index a7219c31e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_02.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="scene_texture_02" Segment="6">
-        <Texture Name="scene_texture_02_Tex_000000" OutName="tex_000000" Format="ci8" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="scene_texture_02_Tex_000400" OutName="tex_000400" Format="ci8" Width="16" Height="32" Offset="0x400"/>
-        <Texture Name="scene_texture_02_Tex_000600" OutName="tex_000600" Format="ci8" Width="32" Height="8" Offset="0x600"/>
-        <Texture Name="scene_texture_02_Tex_000700" OutName="tex_000700" Format="ci8" Width="32" Height="32" Offset="0x700"/>
-        <Texture Name="scene_texture_02_Tex_000B00" OutName="tex_000B00" Format="ci8" Width="32" Height="32" Offset="0xB00"/>
-        <Texture Name="scene_texture_02_Tex_000F00" OutName="tex_000F00" Format="ci8" Width="32" Height="32" Offset="0xF00"/>
-        <Texture Name="scene_texture_02_Tex_001300" OutName="tex_001300" Format="ci8" Width="16" Height="64" Offset="0x1300"/>
-        <Texture Name="scene_texture_02_Tex_001700" OutName="tex_001700" Format="ci8" Width="16" Height="16" Offset="0x1700"/>
-        <Texture Name="scene_texture_02_Tex_001800" OutName="tex_001800" Format="ci8" Width="32" Height="32" Offset="0x1800"/>
-        <Texture Name="scene_texture_02_Tex_001C00" OutName="tex_001C00" Format="ci8" Width="16" Height="16" Offset="0x1C00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_03.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_03.xml
deleted file mode 100644
index fcd10b9a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_03.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="scene_texture_03" Segment="6">
-        <!-- Seems like various trees in different formats -->
-        <Blob Name="scene_texture_03_Blob_002D40" Size="0x4800" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_04.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_04.xml
deleted file mode 100644
index 6faf681ac..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_04.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="scene_texture_04" Segment="6">
-        <Texture Name="scene_texture_04_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
-        <Texture Name="scene_texture_04_Tex_001000" OutName="tex_001000" Format="rgba16" Width="32" Height="32" Offset="0x1000"/>
-        <Texture Name="scene_texture_04_Tex_001800" OutName="tex_001800" Format="rgba16" Width="32" Height="32" Offset="0x1800"/>
-        <Texture Name="scene_texture_04_Tex_002000" OutName="tex_002000" Format="rgba16" Width="16" Height="64" Offset="0x2000"/>
-        <Texture Name="scene_texture_04_Tex_002800" OutName="tex_002800" Format="rgba16" Width="16" Height="64" Offset="0x2800"/>
-        <Texture Name="scene_texture_04_Tex_003000" OutName="tex_003000" Format="i4" Width="64" Height="64" Offset="0x3000"/>
-        <Texture Name="scene_texture_04_Tex_003800" OutName="tex_003800" Format="i4" Width="64" Height="64" Offset="0x3800"/>
-        <Texture Name="scene_texture_04_Tex_004000" OutName="tex_004000" Format="i4" Width="32" Height="32" Offset="0x4000"/>
-        <Texture Name="scene_texture_04_Tex_004200" OutName="tex_004200" Format="rgba16" Width="32" Height="32" Offset="0x4200"/>
-        <Texture Name="scene_texture_04_Tex_004A00" OutName="tex_004A00" Format="rgba16" Width="32" Height="32" Offset="0x4A00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_05.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_05.xml
deleted file mode 100644
index d9ae4f2c3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_05.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <File Name="scene_texture_05" Segment="6">
-        <Texture Name="scene_texture_05_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="scene_texture_05_Tex_000800" OutName="tex_000800" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
-        <Texture Name="scene_texture_05_Tex_001000" OutName="tex_001000" Format="rgba16" Width="16" Height="64" Offset="0x1000"/>
-        <Texture Name="scene_texture_05_Tex_001800" OutName="tex_001800" Format="i4" Width="64" Height="64" Offset="0x1800"/>
-        <Texture Name="scene_texture_05_Tex_002000" OutName="tex_002000" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
-        <Texture Name="scene_texture_05_Tex_002800" OutName="tex_002800" Format="rgba16" Width="32" Height="32" Offset="0x2800"/>
-        <Texture Name="scene_texture_05_Tex_003000" OutName="tex_003000" Format="rgba16" Width="32" Height="32" Offset="0x3000"/>
-        <Texture Name="scene_texture_05_Tex_003800" OutName="tex_003800" Format="rgba16" Width="32" Height="32" Offset="0x3800"/>
-        <Texture Name="scene_texture_05_Tex_004000" OutName="tex_004000" Format="rgba16" Width="32" Height="32" Offset="0x4000"/>
-        <Texture Name="scene_texture_05_Tex_004800" OutName="tex_004800" Format="rgba16" Width="32" Height="32" Offset="0x4800"/>
-        <Texture Name="scene_texture_05_Tex_005000" OutName="tex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000"/>
-        <Texture Name="scene_texture_05_Tex_005800" OutName="tex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800"/>
-        <Texture Name="scene_texture_05_Tex_006000" OutName="tex_006000" Format="i4" Width="64" Height="64" Offset="0x6000"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_06.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_06.xml
deleted file mode 100644
index 1a2dfc2a0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_06.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="scene_texture_06" Segment="6">
-        <Texture Name="scene_texture_06_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
-        <Texture Name="scene_texture_06_Tex_000400" OutName="tex_000400" Format="ci4" Width="128" Height="32" Offset="0x400"/>
-        <Texture Name="scene_texture_06_TLUT_000C00" OutName="tlut_000C00" Format="rgba16" Width="4" Height="4" Offset="0xC00"/>
-        <Texture Name="scene_texture_06_Tex_000C20" OutName="tex_000C20" Format="ci4" Width="64" Height="64" Offset="0xC20"/>
-        <Texture Name="scene_texture_06_TLUT_001420" OutName="tlut_001420" Format="rgba16" Width="4" Height="4" Offset="0x1420"/>
-        <Texture Name="scene_texture_06_Tex_001440" OutName="tex_001440" Format="ci4" Width="64" Height="64" Offset="0x1440"/>
-        <Texture Name="scene_texture_06_TLUT_001C40" OutName="tlut_001C40" Format="rgba16" Width="4" Height="4" Offset="0x1C40"/>
-        <Texture Name="scene_texture_06_Tex_001C60" OutName="tex_001C60" Format="rgba16" Width="32" Height="32" Offset="0x1C60"/>
-        <Texture Name="scene_texture_06_Tex_002460" OutName="tex_002460" Format="rgba16" Width="32" Height="32" Offset="0x2460"/>
-        <Texture Name="scene_texture_06_Tex_002C60" OutName="tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2C60"/>
-        <Texture Name="scene_texture_06_Tex_003460" OutName="tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3460"/>
-        <Texture Name="scene_texture_06_Tex_003C60" OutName="tex_003C60" Format="i4" Width="64" Height="64" Offset="0x3C60"/>
-        <Texture Name="scene_texture_06_Tex_004460" OutName="tex_004460" Format="rgba16" Width="32" Height="32" Offset="0x4460"/>
-        <Texture Name="scene_texture_06_Tex_004C60" OutName="tex_004C60" Format="rgba16" Width="32" Height="32" Offset="0x4C60"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_07.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_07.xml
deleted file mode 100644
index 22f445990..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_07.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="scene_texture_07" Segment="6">
-        <!-- Empty file -->
-        <Blob Name="scene_texture_07_Blob_000" Size="0x10" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_08.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_08.xml
deleted file mode 100644
index 31e557347..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/scene_texture_08.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <File Name="scene_texture_08" Segment="6">
-        <Texture Name="scene_texture_08_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="scene_texture_08_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
-        <Texture Name="scene_texture_08_Tex_001000" OutName="tex_001000" Format="rgba16" Width="32" Height="32" Offset="0x1000"/>
-        <Texture Name="scene_texture_08_Tex_001800" OutName="tex_001800" Format="rgba16" Width="32" Height="32" Offset="0x1800"/>
-        <Texture Name="scene_texture_08_Tex_002000" OutName="tex_002000" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
-        <Texture Name="scene_texture_08_Tex_002800" OutName="tex_002800" Format="i4" Width="64" Height="64" Offset="0x2800"/>
-        <Texture Name="scene_texture_08_Tex_003000" OutName="tex_003000" Format="ia4" Width="64" Height="32" Offset="0x3000"/>
-        <Texture Name="scene_texture_08_Tex_003400" OutName="tex_003400" Format="ia8" Width="64" Height="32" Offset="0x3400"/>
-        <Texture Name="scene_texture_08_Tex_003C00" OutName="tex_003C00" Format="ia4" Width="64" Height="32" Offset="0x3C00"/>
-        <Texture Name="scene_texture_08_Tex_004000" OutName="tex_004000" Format="ia8" Width="64" Height="32" Offset="0x4000"/>
-        <Texture Name="scene_texture_08_Tex_004800" OutName="tex_004800" Format="rgba16" Width="32" Height="32" Offset="0x4800"/>
-        <Texture Name="scene_texture_08_Tex_005000" OutName="tex_005000" Format="ia4" Width="64" Height="64" Offset="0x5000"/>
-        <Texture Name="scene_texture_08_Tex_005800" OutName="tex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800"/>
-        <Texture Name="scene_texture_08_Tex_006000" OutName="tex_006000" Format="rgba16" Width="32" Height="32" Offset="0x6000"/>
-        <Texture Name="scene_texture_08_Tex_006800" OutName="tex_006800" Format="ia4" Width="64" Height="64" Offset="0x6800"/>
-        <Texture Name="scene_texture_08_Tex_007000" OutName="tex_007000" Format="rgba16" Width="32" Height="32" Offset="0x7000"/>
-        <Texture Name="scene_texture_08_Tex_007800" OutName="tex_007800" Format="rgba16" Width="32" Height="32" Offset="0x7800"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/skyboxes.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/skyboxes.xml
deleted file mode 100644
index 3e82f084f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/skyboxes.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <File Name="d2_fine_static">
-        <Texture Name="gClearSkybox1Tex" OutName="clear_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gClearSkybox2Tex" OutName="clear_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gClearSkybox3Tex" OutName="clear_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gClearSkybox4Tex" OutName="clear_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gClearSkybox5Tex" OutName="clear_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-    </File>
-
-    <File Name="d2_cloud_static">
-        <Texture Name="gCloudySkybox1Tex" OutName="cloudy_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gCloudySkybox2Tex" OutName="cloudy_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gCloudySkybox3Tex" OutName="cloudy_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gCloudySkybox4Tex" OutName="cloudy_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-        <Texture Name="gCloudySkybox5Tex" OutName="cloudy_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="d2_fine_pal_static" SplitTlut="false" ExternalTlutOffset="0x0"/>
-    </File>
-    <File Name="d2_fine_pal_static">
-        <Texture Name="gClearSkyboxTlue" OutName="clear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/story_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/story_static.xml
deleted file mode 100644
index 9a15d8c4f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/story_static.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="story_static" Segment="7">
-        <Texture Name="gStoryMaskFestivalTex" OutName="story_mask_festival" Format="ci8" Width="320" Height="240" TlutOffset="0x25800" Offset="0x0"/>
-        <Texture Name="gStoryGiantsLeavingTex" OutName="story_giants_leaving" Format="ci8" Width="320" Height="240" TlutOffset="0x25A00" Offset="0x12C00"/>
-        <Texture Name="gStoryMaskFestivalTLUT" OutName="story_mask_festival_tlut" Format="rgba16" Width="16" Height="16" Offset="0x25800"/>
-        <Texture Name="gStoryGiantsLeavingTLUT" OutName="story_giants_leaving_tlut" Format="rgba16" Width="16" Height="16" Offset="0x25A00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/title_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/title_static.xml
deleted file mode 100644
index 5e6cea55f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/misc/title_static.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<Root>
-    <File Name="title_static" Segment="1">
-        <Texture Name="gFileSelNoFileToCopyENGTex" OutName="no_file_to_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x0"/>
-        <Texture Name="gFileSelNoFileToEraseENGTex" OutName="no_file_to_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x800"/>
-        <Texture Name="gFileSelNoEmptyFileENGTex" OutName="no_empty_file_eng" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
-        <Texture Name="gFileSelFileEmptyENGTex" OutName="file_empty_eng" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
-        <Texture Name="gFileSelFileInUseENGTex" OutName="file_in_use_eng" Format="ia8" Width="128" Height="16" Offset="0x2000"/>
-
-        <Texture Name="gFileSelConnectorTex" OutName="connector" Format="ia8" Width="24" Height="16" Offset="0x2800"/>
-
-        <Texture Name="gFileSelCopyWhichFileENGTex" OutName="copy_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2980"/>
-        <Texture Name="gFileSelCopyToWhichFileENGTex" OutName="copy_to_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x3180"/>
-        <Texture Name="gFileSelAreYouSureCopyENGTex" OutName="are_you_sure_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x3980"/>
-        <Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x4180"/>
-
-        <Texture Name="gFileSelPleaseSelectAFileENGTex" OutName="please_select_a_file_eng" Format="ia8" Width="128" Height="16" Offset="0x4980"/>
-        <Texture Name="gFileSelOpenThisFileENGTex" OutName="open_this_file_eng" Format="ia8" Width="128" Height="16" Offset="0x5180"/>
-
-        <Texture Name="gFileSelEraseWhichFileENGTex" OutName="erase_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x5980"/>
-        <Texture Name="gFileSelAreYouSureEraseENGTex" OutName="are_you_sure_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x6180"/>
-        <Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x6980"/>
-
-        <Texture Name="gFileSelOptionsENGTex" OutName="options_eng" Format="ia8" Width="128" Height="16" Offset="0x7180"/>
-        <Texture Name="gFileSelNameENGTex" OutName="name_eng" Format="ia8" Width="56" Height="16" Offset="0x7980"/>
-        <Texture Name="gFileSelSurroundENGTex" OutName="surround_eng" Format="ia8" Width="48" Height="16" Offset="0x7D00"/>
-        <Texture Name="gFileSelHeadsetENGTex" OutName="headset_eng" Format="ia8" Width="48" Height="16" Offset="0x8000"/>
-        <Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia8" Width="48" Height="16" Offset="0x8300"/>
-        <Texture Name="gFileSelSoundENGTex" OutName="sound_eng" Format="ia8" Width="64" Height="16" Offset="0x8600"/>
-        <Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x8A00"/>
-        <Texture Name="gFileSelTargetingENGTex" OutName="targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x8D00"/>
-        <Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x9100"/>
-        <Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia8" Width="48" Height="16" Offset="0x9400"/>
-        <Texture Name="gFileSelCheckBrightnessENGTex" OutName="check_brightness_eng" Format="ia8" Width="96" Height="16" Offset="0x9700"/>
-        <Texture Name="gFileSelDolbySurroundLogoENGTex" OutName="dolby_surround_logo_eng" Format="i8" Width="48" Height="17" Offset="0x9D00"/>
-
-        <Texture Name="gFileSelDecideCancelENGTex" OutName="decide_cancel_eng" Format="ia8" Width="144" Height="16" Offset="0xA030"/>
-        <Texture Name="gFileSelDecideSaveENGTex" OutName="decide_save_eng" Format="ia8" Width="152" Height="16" Offset="0xA930"/>
-        <Texture Name="gFileSelPleaseWaitENGTex" OutName="please_wait_eng" Format="ia8" Width="144" Height="16" Offset="0xB2B0"/>
-
-        <Texture Name="gFileSelWindow00Tex" OutName="window_00" Format="ia16" Width="64" Height="32" Offset="0xBBB0"/>
-        <Texture Name="gFileSelWindow01Tex" OutName="window_01" Format="ia16" Width="64" Height="32" Offset="0xCBB0"/>
-        <Texture Name="gFileSelWindow02Tex" OutName="window_02" Format="ia16" Width="64" Height="32" Offset="0xDBB0"/>
-        <Texture Name="gFileSelWindow03Tex" OutName="window_03" Format="ia16" Width="48" Height="32" Offset="0xEBB0"/>
-        <Texture Name="gFileSelWindow10Tex" OutName="window_10" Format="ia16" Width="64" Height="32" Offset="0xF7B0"/>
-        <Texture Name="gFileSelWindow11Tex" OutName="window_11" Format="ia16" Width="64" Height="32" Offset="0x107B0"/>
-        <Texture Name="gFileSelWindow12Tex" OutName="window_12" Format="ia16" Width="64" Height="32" Offset="0x117B0"/>
-        <Texture Name="gFileSelWindow13Tex" OutName="window_13" Format="ia16" Width="48" Height="32" Offset="0x127B0"/>
-        <Texture Name="gFileSelWindow20Tex" OutName="window_20" Format="ia16" Width="64" Height="32" Offset="0x133B0"/>
-        <Texture Name="gFileSelWindow21Tex" OutName="window_21" Format="ia16" Width="64" Height="32" Offset="0x143B0"/>
-        <Texture Name="gFileSelWindow22Tex" OutName="window_22" Format="ia16" Width="64" Height="32" Offset="0x153B0"/>
-        <Texture Name="gFileSelWindow23Tex" OutName="window_23" Format="ia16" Width="48" Height="32" Offset="0x163B0"/>
-        <Texture Name="gFileSelWindow30Tex" OutName="window_30" Format="ia16" Width="64" Height="32" Offset="0x16FB0"/>
-        <Texture Name="gFileSelWindow31Tex" OutName="window_31" Format="ia16" Width="64" Height="32" Offset="0x17FB0"/>
-        <Texture Name="gFileSelWindow32Tex" OutName="window_32" Format="ia16" Width="64" Height="32" Offset="0x18FB0"/>
-        <Texture Name="gFileSelWindow33Tex" OutName="window_33" Format="ia16" Width="48" Height="32" Offset="0x19FB0"/>
-        <Texture Name="gFileSelWindow40Tex" OutName="window_40" Format="ia16" Width="64" Height="32" Offset="0x1ABB0"/>
-        <Texture Name="gFileSelWindow41Tex" OutName="window_41" Format="ia16" Width="64" Height="32" Offset="0x1BBB0"/>
-        <Texture Name="gFileSelWindow42Tex" OutName="window_42" Format="ia16" Width="64" Height="32" Offset="0x1CBB0"/>
-        <Texture Name="gFileSelWindow43Tex" OutName="window_43" Format="ia16" Width="48" Height="32" Offset="0x1DBB0"/>
-
-        <Texture Name="gFileSelCopyButtonENGTex" OutName="copy_button_eng" Format="ia16" Width="64" Height="16" Offset="0x1E7B0"/>
-
-        <Texture Name="gFileSelFile1ButtonENGTex" OutName="file_1_button_eng" Format="ia16" Width="64" Height="16" Offset="0x1EFB0"/>
-        <Texture Name="gFileSelFile2ButtonENGTex" OutName="file_2_button_eng" Format="ia16" Width="64" Height="16" Offset="0x1F7B0"/>
-        <Texture Name="gFileSelFile3ButtonENGTex" OutName="file_3_button_eng" Format="ia16" Width="64" Height="16" Offset="0x1FFB0"/>
-
-        <Texture Name="gFileSelYesButtonENGTex" OutName="yes_button_eng" Format="ia16" Width="64" Height="16" Offset="0x207B0"/>
-        <Texture Name="gFileSelEraseButtonENGTex" OutName="erase_button_eng" Format="ia16" Width="64" Height="16" Offset="0x20FB0"/>
-        <Texture Name="gFileSelENDButtonENGTex" OutName="end_button_eng" Format="ia16" Width="44" Height="16" Offset="0x217B0"/>
-        <Texture Name="gFileSelBackspaceButtonTex" OutName="backspace_button" Format="ia16" Width="28" Height="16" Offset="0x21D30"/>
-
-        <Texture Name="gFileSelFileNameBoxTex" OutName="file_name_box" Format="ia16" Width="108" Height="16" Offset="0x220B0"/>
-
-        <Texture Name="gFileSelFileInfoBox0Tex" OutName="file_info_box_0" Format="ia16" Width="36" Height="56" Offset="0x22E30"/>
-        <Texture Name="gFileSelFileInfoBox1Tex" OutName="file_info_box_1" Format="ia16" Width="36" Height="56" Offset="0x23DF0"/>
-        <Texture Name="gFileSelFileInfoBox2Tex" OutName="file_info_box_2" Format="ia16" Width="36" Height="56" Offset="0x24DB0"/>
-        <Texture Name="gFileSelFileInfoBox3Tex" OutName="file_info_box_3" Format="ia16" Width="36" Height="56" Offset="0x25D70"/>
-        <Texture Name="gFileSelFileInfoBox4Tex" OutName="file_info_box_4" Format="ia16" Width="24" Height="56" Offset="0x26D30"/>
-
-        <Texture Name="gFileSelOptionsButtonENGTex" OutName="options_button_eng" Format="ia16" Width="64" Height="16" Offset="0x277B0"/>
-
-        <Texture Name="gFileSelQuitButtonENGTex" OutName="quit_button_eng" Format="ia16" Width="64" Height="16" Offset="0x27FB0"/>
-
-        <!-- Extension for owl save information -->
-        <Texture Name="gFileSelFileExtraInfoBox0Tex" OutName="file_extra_info_box_0" Format="ia16" Width="28" Height="56" Offset="0x287B0"/>
-        <Texture Name="gFileSelFileExtraInfoBox1Tex" OutName="file_extra_info_box_1" Format="ia16" Width="28" Height="56" Offset="0x293F0"/>
-
-        <!-- Used for closed owl save file -->
-        <Texture Name="gFileSelBlankButtonTex" OutName="file_blank_button" Format="ia16" Width="52" Height="16" Offset="0x2A030"/>
-
-        <Texture Name="gFileSelOptionsDividerTex" OutName="options_divider" Format="ia4" Width="256" Height="2" Offset="0x2A6B0"/>
-        <Texture Name="gFileSelBrightnessCheckTex" OutName="brightness_check" Format="ia4" Width="96" Height="16" Offset="0x2A7B0"/>
-
-        <Texture Name="gFileSelBigButtonHighlightTex" OutName="big_button_highlight" Format="i8" Width="72" Height="24" Offset="0x2AAB0"/>
-        <Texture Name="gFileSelCharHighlightTex" OutName="char_highlight" Format="i8" Width="24" Height="24" Offset="0x2B170"/>
-        <Texture Name="gFileSelMediumButtonHighlightTex" OutName="medium_button_highlight" Format="i8" Width="56" Height="24" Offset="0x2B3B0"/>
-        <Texture Name="gFileSelSmallButtonHighlightTex" OutName="small_button_highlight" Format="i8" Width="40" Height="24" Offset="0x2B8F0"/>
-
-        <!-- Boss remains textures -->
-        <Texture Name="gFileSelOdolwasRemainsTex" OutName="odolwas_remains" Format="rgba32" Width="32" Height="32" Offset="0x2BCB0"/>
-        <Texture Name="gFileSelGohtsRemainsTex" OutName="gohts_remains" Format="rgba32" Width="32" Height="32" Offset="0x2CCB0"/>
-        <Texture Name="gFileSelGyorgsRemainsTex" OutName="gyorgs_remains" Format="rgba32" Width="32" Height="32" Offset="0x2DCB0"/>
-        <Texture Name="gFileSelTwinmoldsRemainsTex" OutName="twinmolds_remains" Format="rgba32" Width="32" Height="32" Offset="0x2ECB0"/>
-
-        <Texture Name="gFileSelOwlSaveIconTex" OutName="owl_save_icon" Format="rgba32" Width="24" Height="12" Offset="0x2FCB0"/>
-
-        <Texture Name="gFileSelFirstDayENGTex" OutName="first_day_eng" Format="i4" Width="48" Height="24" Offset="0x30130"/>
-        <Texture Name="gFileSelSecondDayENGTex" OutName="second_day_eng" Format="i4" Width="48" Height="24" Offset="0x30370"/>
-        <Texture Name="gFileSelFinalDayENGTex" OutName="final_day_eng" Format="i4" Width="48" Height="24" Offset="0x305B0"/>
-
-        <Texture Name="gFileSelSaveXJPNTex" OutName="save_x_jpn" Format="i4" Width="32" Height="16" Offset="0x307F0"/>
-
-        <Texture Name="gFileSelMASKSENGTex" OutName="masks_eng" Format="i4" Width="64" Height="16" Offset="0x308F0"/>
-
-        <Texture Name="gFileSel0QuarterHeartENGTex" OutName="0_quarter_heart" Format="ia8" Width="24" Height="16" Offset="0x30AF0"/>
-        <Texture Name="gFileSel1QuarterHeartENGTex" OutName="1_quarter_heart" Format="ia8" Width="24" Height="16" Offset="0x30C70"/>
-        <Texture Name="gFileSel2QuarterHeartENGTex" OutName="2_quarter_heart" Format="ia8" Width="24" Height="16" Offset="0x30DF0"/>
-        <Texture Name="gFileSel3QuarterHeartENGTex" OutName="3_quarter_heart" Format="ia8" Width="24" Height="16" Offset="0x30F70"/>
-
-        <Texture Name="gFileSelRupeeTex" OutName="rupee" Format="ia8" Width="16" Height="16" Offset="0x310F0"/>
-
-        <DList Name="gFileSelWindow1DL" Offset="0x311F0"/>
-        <DList Name="gFileSelWindow2DL" Offset="0x31408"/>
-        <DList Name="gFileSelWindow3DL" Offset="0x31618"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/gameplay_dangeon_keep.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/gameplay_dangeon_keep.xml
deleted file mode 100644
index b4c92432d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/gameplay_dangeon_keep.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<Root>
-    <File Name="gameplay_dangeon_keep" Segment="5">
-        <DList Name="gDoorLockDL" Offset="0x140" /> <!-- Original name is "doorkagi_model" ("lock") -->
-        <DList Name="gDoorChainDL" Offset="0x230" /> <!-- Original name is "doorkusari_model" ("chain") -->
-        <Texture Name="gDoorLockTex" OutName="door_lock" Format="rgba16" Width="32" Height="32" Offset="0x2C0" />
-        <Texture Name="gBossDoorLockTex" OutName="boss_door_lock" Format="rgba16" Width="32" Height="32" Offset="0xAC0" />
-        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x12C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0022C8" OutName="tex_0022C8" Format="i4" Width="96" Height="85" Offset="0x22C8" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0032C8" OutName="tex_0032C8" Format="i4" Width="96" Height="85" Offset="0x32C8" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0042C8" OutName="tex_0042C8" Format="i4" Width="96" Height="85" Offset="0x42C8" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0052C8" OutName="tex_0052C8" Format="i4" Width="96" Height="85" Offset="0x52C8" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0062C8" OutName="tex_0062C8" Format="i4" Width="96" Height="85" Offset="0x62C8" />
-        <DList Name="gameplay_dangeon_keep_DL_007300" Offset="0x7300" />
-        <Collision Name="gameplay_dangeon_keep_Colheader_007498" Offset="0x7498" />
-        <DList Name="gameplay_dangeon_keep_DL_007650" Offset="0x7650" />
-        <DList Name="gameplay_dangeon_keep_DL_007890" Offset="0x7890" />
-        <DList Name="gameplay_dangeon_keep_DL_007980" Offset="0x7980" />
-        <DList Name="gameplay_dangeon_keep_DL_007A50" Offset="0x7A50" />
-        <DList Name="gameplay_dangeon_keep_DL_007B20" Offset="0x7B20" />
-        <DList Name="gameplay_dangeon_keep_DL_007BF0" Offset="0x7BF0" />
-        <DList Name="gRustyFloorSwitchDL" Offset="0x7E00" />
-        <Collision Name="gFloorSwitchCol" Offset="0x8018" />
-        <DList Name="gameplay_dangeon_keep_DL_0081D0" Offset="0x81D0" />
-        <DList Name="gEyeSwitchGoldDL" Offset="0x83F0" />
-        <DList Name="gEyeSwitchSilverDL" Offset="0x85F0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0086C0" OutName="tex_0086C0" Format="rgba16" Width="32" Height="32" Offset="0x86C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_008EC0" OutName="tex_008EC0" Format="rgba16" Width="32" Height="32" Offset="0x8EC0" />
-        <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x96C0" />
-        <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x9EC0" />
-        <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA6C0" />
-        <Texture Name="gEyeSwitchGoldOpenTex" OutName="eye_gold_open" Format="rgba16" Width="32" Height="32" Offset="0xAEC0" />
-        <Texture Name="gEyeSwitchSilverOpenTex" OutName="eye_silver_open" Format="rgba16" Width="32" Height="32" Offset="0xB6C0" />
-        <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xBEC0" />
-        <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC6C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00CEC0" OutName="tex_00CEC0" Format="rgba16" Width="32" Height="32" Offset="0xCEC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00D6C0" OutName="tex_00D6C0" Format="rgba16" Width="32" Height="32" Offset="0xD6C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00DEC0" OutName="tex_00DEC0" Format="rgba16" Width="32" Height="32" Offset="0xDEC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00E6C0" OutName="tex_00E6C0" Format="rgba16" Width="32" Height="32" Offset="0xE6C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00EEC0" OutName="tex_00EEC0" Format="i8" Width="32" Height="32" Offset="0xEEC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00F2C0" OutName="tex_00F2C0" Format="i8" Width="32" Height="32" Offset="0xF2C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00F6C0" OutName="tex_00F6C0" Format="rgba16" Width="32" Height="32" Offset="0xF6C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_00FEC0" OutName="tex_00FEC0" Format="rgba16" Width="64" Height="32" Offset="0xFEC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_010EC0" OutName="tex_010EC0" Format="rgba16" Width="32" Height="64" Offset="0x10EC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_011EC0" OutName="tex_011EC0" Format="rgba16" Width="16" Height="16" Offset="0x11EC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0120C0" OutName="tex_0120C0" Format="rgba16" Width="16" Height="16" Offset="0x120C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0122C0" OutName="tex_0122C0" Format="rgba16" Width="32" Height="64" Offset="0x122C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0132C0" OutName="tex_0132C0" Format="rgba16" Width="64" Height="16" Offset="0x132C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_013AC0" OutName="tex_013AC0" Format="rgba16" Width="32" Height="32" Offset="0x13AC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0142C0" OutName="tex_0142C0" Format="rgba16" Width="32" Height="32" Offset="0x142C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_014AC0" OutName="tex_014AC0" Format="rgba16" Width="32" Height="32" Offset="0x14AC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0152C0" OutName="tex_0152C0" Format="rgba16" Width="32" Height="32" Offset="0x152C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_015AC0" OutName="tex_015AC0" Format="i8" Width="32" Height="32" Offset="0x15AC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_015EC0" OutName="tex_015EC0" Format="i8" Width="32" Height="32" Offset="0x15EC0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0162C0" OutName="tex_0162C0" Format="i8" Width="64" Height="64" Offset="0x162C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_0172C0" OutName="tex_0172C0" Format="rgba16" Width="32" Height="32" Offset="0x172C0" />
-        <Texture Name="gameplay_dangeon_keep_Tex_017AC0" OutName="tex_017AC0" Format="ia16" Width="4" Height="4" Offset="0x17AC0" />
-        <DList Name="gameplay_dangeon_keep_DL_017EA0" Offset="0x17EA0" /> <!-- pot displaylist -->
-        <DList Name="gameplay_dangeon_keep_DL_018090" Offset="0x18090" /> <!-- pot break shard displaylist -->
-        <DList Name="gameplay_dangeon_keep_DL_0182A0" Offset="0x182A0" />
-        <DList Name="gameplay_dangeon_keep_DL_0182A8" Offset="0x182A8" />
-        <Texture Name="gameplay_dangeon_keep_Tex_018350" OutName="tex_018350" Format="i8" Width="64" Height="64" Offset="0x18350" />
-        <Texture Name="gameplay_dangeon_keep_Tex_019350" OutName="tex_019350" Format="i8" Width="64" Height="64" Offset="0x19350" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01A350" OutName="tex_01A350" Format="i8" Width="64" Height="64" Offset="0x1A350" />
-        <TextureAnimation Name="gameplay_dangeon_keep_Matanimheader_01B370" Offset="0x1B370" />
-        <DList Name="gameplay_dangeon_keep_DL_01B500" Offset="0x1B500" />
-        <DList Name="gFloorSwitch1DL" Offset="0x1B508" />
-        <DList Name="gameplay_dangeon_keep_DL_01B780" Offset="0x1B780" />
-        <DList Name="gFloorSwitch2DL" Offset="0x1B788" />
-        <DList Name="gameplay_dangeon_keep_DL_01B9F0" Offset="0x1B9F0" />
-        <DList Name="gFloorSwitch3DL" Offset="0x1B9F8" />
-        <DList Name="gCrystalSwitchCoreDL" Offset="0x1BEE0" />
-        <DList Name="gCrystalSwitchDiamondDL" Offset="0x1BFB8" />
-        <DList Name="gCrystalSwitchBaseDL" Offset="0x1C058" />
-        <TextureAnimation Name="gCrystalSwitchTexAnim" Offset="0x1C118" />
-        <DList Name="gameplay_dangeon_keep_DL_01C220" Offset="0x1C220" />
-        <DList Name="gameplay_dangeon_keep_DL_01C228" Offset="0x1C228" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01C2D8" OutName="tex_01C2D8" Format="rgba16" Width="32" Height="64" Offset="0x1C2D8" />
-        <Collision Name="gameplay_dangeon_keep_Colheader_01D488" Offset="0x1D488" />
-        <DList Name="gameplay_dangeon_keep_DL_01D980" Offset="0x1D980" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01DC70" OutName="tex_01DC70" Format="rgba16" Width="32" Height="32" Offset="0x1DC70" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01E470" OutName="tex_01E470" Format="rgba16" Width="32" Height="32" Offset="0x1E470" />
-        <!-- snowhead(?) floor changing stone staircase stone textures -->
-        <Texture Name="gameplay_dangeon_keep_Tex_01EC70" OutName="tex_01EC70" Format="rgba16" Width="32" Height="32" Offset="0x1EC70" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01F470" OutName="tex_01F470" Format="i4" Width="64" Height="64" Offset="0x1F470" />
-        <Texture Name="gameplay_dangeon_keep_Tex_01FC70" OutName="tex_01FC70" Format="i4" Width="64" Height="64" Offset="0x1FC70" />
-        <Texture Name="gameplay_dangeon_keep_Tex_020470" OutName="tex_020470" Format="i4" Width="64" Height="64" Offset="0x20470" />
-        <Texture Name="gameplay_dangeon_keep_Tex_020C70" OutName="tex_020C70" Format="i4" Width="64" Height="64" Offset="0x20C70" />
-        <!-- snowhead(?) floor changing stone staircase -->
-        <DList Name="gameplay_dangeon_keep_DL_0219E0" Offset="0x219E0" />
-
-        <!-- En_Warp_tag assets -->
-        <DList Name="gWarpTagGoronTrialBaseDL" Offset="0x21EF0" />
-        <Texture Name="gWarpTagRainbowTex" OutName="warptag_rainbow" Format="rgba32" Width="32" Height="32" Offset="0x21FF8" />
-        <TextureAnimation Name="gWarpTagRainbowTexAnim" Offset="0x23008" />
-        <Collision Name="gWarpTagGoronTrialBaseCol" Offset="0x2324C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/gameplay_field_keep.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/gameplay_field_keep.xml
deleted file mode 100644
index cc9d04e70..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/gameplay_field_keep.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Root>
-    <File Name="gameplay_field_keep" Segment="5">
-        <Texture Name="gameplay_field_keep_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="32" Offset="0x0" />
-        <Texture Name="gameplay_field_keep_Tex_000400" OutName="tex_000400" Format="rgba16" Width="32" Height="32" Offset="0x400" />
-        <DList Name="gameplay_field_keep_DL_000C40" Offset="0xC40" />
-        <Texture Name="gameplay_field_keep_Tex_000CD0" OutName="tex_000CD0" Format="ia16" Width="32" Height="64" Offset="0xCD0" />
-        <Animation Name="gameplay_field_keep_Anim_001D20" Offset="0x1D20" />
-        <DList Name="gameplay_field_keep_DL_001D30" Offset="0x1D30" />
-        <DList Name="gameplay_field_keep_DL_001DD0" Offset="0x1DD0" />
-        <DList Name="gameplay_field_keep_DL_001DE0" Offset="0x1DE0" />
-        <DList Name="gameplay_field_keep_DL_001E30" Offset="0x1E30" />
-        <DList Name="gameplay_field_keep_DL_001ED0" Offset="0x1ED0" />
-        <DList Name="gameplay_field_keep_DL_001EE0" Offset="0x1EE0" />
-        <Texture Name="gameplay_field_keep_Tex_001F30" OutName="tex_001F30" Format="rgba16" Width="32" Height="64" Offset="0x1F30" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F30" Type="Standard" EnumName="BUTTERFLY_LIMB_01" Offset="0x2F30" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F3C" Type="Standard" EnumName="BUTTERFLY_LIMB_02" Offset="0x2F3C" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F48" Type="Standard" EnumName="BUTTERFLY_LIMB_03" Offset="0x2F48" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F54" Type="Standard" EnumName="BUTTERFLY_LIMB_04" Offset="0x2F54" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F60" Type="Standard" EnumName="BUTTERFLY_LIMB_05" Offset="0x2F60" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F6C" Type="Standard" EnumName="BUTTERFLY_LIMB_06" Offset="0x2F6C" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F78" Type="Standard" EnumName="BUTTERFLY_LIMB_07" Offset="0x2F78" />
-        <Skeleton Name="gameplay_field_keep_Skel_002FA0" Type="Normal" LimbType="Standard" LimbNone="BUTTERFLY_LIMB_NONE" LimbMax="BUTTERFLY_LIMB_MAX" EnumName="ButterflyLimb" Offset="0x2FA0" />
-        <Texture Name="gameplay_field_keep_TLUT_002FB0" OutName="tlut_002FB0" Format="rgba16" Width="4" Height="4" Offset="0x2FB0" />
-        <Texture Name="gameplay_field_keep_Tex_002FD0" OutName="tex_002FD0" Format="ci4" Width="32" Height="64" Offset="0x2FD0" />
-        <Texture Name="gameplay_field_keep_Tex_0033D0" OutName="tex_0033D0" Format="ci4" Width="32" Height="64" Offset="0x33D0" />
-        <DList Name="gameplay_field_keep_DL_003870" Offset="0x3870" />
-        <DList Name="gameplay_field_keep_DL_003938" Offset="0x3938" />
-        <Collision Name="gameplay_field_keep_Colheader_003A60" Offset="0x3A60" />
-        <DList Name="gFieldWoodDoorFrameDL" Offset="0x3FD0" />
-        <DList Name="gFieldWoodDoorLeftDL" Offset="0x4050" />
-        <DList Name="gFieldWoodDoorRightDL" Offset="0x4228" />
-        <Texture Name="gameplay_field_keep_Tex_004400" OutName="tex_004400" Format="rgba16" Width="16" Height="16" Offset="0x4400" />
-        <Texture Name="gameplay_field_keep_Tex_004600" OutName="tex_004600" Format="rgba16" Width="16" Height="16" Offset="0x4600" />
-        <Texture Name="gFieldWoodDoorTex" OutName="wood_door" Format="i4" Width="64" Height="128" Offset="0x4800" />
-        <Texture Name="gameplay_field_keep_TLUT_005800" OutName="tlut_005800" Format="rgba16" Width="4" Height="4" Offset="0x5800" />
-        <Texture Name="gameplay_field_keep_Tex_005828" OutName="tex_005828" Format="ci4" Width="64" Height="64" Offset="0x5828" />
-        <DList Name="gameplay_field_keep_DL_0061E8" Offset="0x61E8" />
-        <DList Name="gameplay_field_keep_DL_006420" Offset="0x6420" />
-        <DList Name="gameplay_field_keep_DL_0066B0" Offset="0x66B0" />
-        <DList Name="gameplay_field_keep_DL_006760" Offset="0x6760" />
-        <Texture Name="gameplay_field_keep_Tex_006810" OutName="tex_006810" Format="rgba16" Width="32" Height="32" Offset="0x6810" />
-        <Texture Name="gameplay_field_keep_Tex_007010" OutName="tex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" />
-
-        <Array Name="gameplay_field_keepVtx_007810" Count="9" Offset="0x7810">
-            <Vtx/>
-        </Array>
-
-        <DList Name="gKusaBushType1DL" Offset="0x78A0" />
-        <DList Name="gKusaBushType2DL" Offset="0x7938" />
-
-        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0x79D0" />
-        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0x81D0" />
-        <DList Name="gFieldSandstormDL" Offset="0x89D0" />
-
-        <Texture Name="gameplay_field_keep_Tex_008A90" OutName="tex_008A90" Format="rgba16" Width="32" Height="32" Offset="0x8A90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/gameplay_keep.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/gameplay_keep.xml
deleted file mode 100644
index eee79cdd1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/gameplay_keep.xml
+++ /dev/null
@@ -1,1535 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="assets/misc/link_animetion/"/>
-    <File Name="gameplay_keep" Segment="4">
-        <!-- Bottles -->
-        <Texture Name="gBottleTex" OutName="bottle" Format="i4" Width="16" Height="16" Offset="0x0" />
-        <DList Name="gBottleContentsDL" Offset="0x320" />
-        <DList Name="gBottleGlassDL" Offset="0x3E0" />
-        <Texture Name="gBottleContentsTex" OutName="bottle_contents" Format="i8" Width="16" Height="32" Offset="0x508" />
-        <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="i8" Width="8" Height="8" Offset="0x708" />
-
-        <!-- Hookshot -->
-        <DList Name="gHookshotChainDL" Offset="0x8D0" />
-        <Texture Name="gHookshotChainLinkTex" OutName="hookshot_chain_link" Format="rgba16" Width="16" Height="32" Offset="0x988" />
-
-        <!-- Swords -->
-        <DList Name="gRazorSwordHandlePart4DL" Offset="0x19B0" />
-        <DList Name="gRazorSwordHandlePart3DL" Offset="0x1B20" />
-        <DList Name="gRazorSwordHandlePart2DL" Offset="0x1BC8" />
-        <DList Name="gRazorSwordHandlePart1DL" Offset="0x1C60" />
-        <DList Name="gRazorSwordHandleDL" Offset="0x1D00" />
-        <DList Name="gRazorSwordBladePart7DL" Offset="0x1D28" />
-        <DList Name="gRazorSwordBladePart6DL" Offset="0x1DC8" />
-        <DList Name="gRazorSwordBladePart5DL" Offset="0x1E58" />
-        <DList Name="gRazorSwordBladePart4DL" Offset="0x1F08" />
-        <DList Name="gRazorSwordBladePart3DL" Offset="0x1FA8" />
-        <DList Name="gRazorSwordBladePart2DL" Offset="0x2038" />
-        <DList Name="gRazorSwordBladePart1DL" Offset="0x20C8" />
-        <DList Name="gRazorSwordBladeDL" Offset="0x2168" />
-        <DList Name="gKokiriSwordHandleDL" Offset="0x21A8" />
-        <DList Name="gKokiriSwordBladePart8DL" Offset="0x2480" />
-        <DList Name="gKokiriSwordBladePart7DL" Offset="0x2508" />
-        <DList Name="gKokiriSwordBladePart6DL" Offset="0x2590" />
-        <DList Name="gKokiriSwordBladePart5DL" Offset="0x2618" />
-        <DList Name="gKokiriSwordBladePart4DL" Offset="0x26A0" />
-        <DList Name="gKokiriSwordBladePart3DL" Offset="0x2728" />
-        <DList Name="gKokiriSwordBladePart2DL" Offset="0x27B0" />
-        <DList Name="gKokiriSwordBladePart1DL" Offset="0x2838" />
-        <DList Name="gKokiriSwordBladeDL" Offset="0x28C0" />
-        <Texture Name="gKokiriSwordHandleTLUT" OutName="kokiri_sword_handle_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2908" />
-        <Texture Name="gKokiriSwordHandlePommelTex" OutName="kokiri_sword_handle_pommel" Format="rgba16" Width="8" Height="8" Offset="0x2B08" />
-        <Texture Name="gRazorSwordHandleGripTex" OutName="razor_sword_handle_grip" Format="rgba16" Width="16" Height="16" Offset="0x2B88" />
-        <Texture Name="gKokiriSwordHandleCrossGuardTex" OutName="kokiri_sword_handle_cross_gaurd" Format="ci8" Width="8" Height="8" Offset="0x2D88" />
-        <Texture Name="gKokiriSwordHandleGripTex" OutName="kokiri_sword_handle_grip" Format="i8" Width="8" Height="8" Offset="0x2DC8" />
-        <Texture Name="gRazorSwordHandleDesignTex" OutName="razor_sword_handle_design" Format="rgba16" Width="16" Height="16" Offset="0x2E08" />
-        <Texture Name="gSwordMetalTex" OutName="sword_metal" Format="i8" Width="8" Height="8" Offset="0x3008" />
-        <DList Name="gKokiriSwordDL" Offset="0x3050" />
-        <DList Name="gRazorSwordDL" Offset="0x3060" />
-
-        <!-- 2S2H [Port] - Increase referenced texture's extraction size -->
-        <DList Name="gDekuStickDL" Offset="0x32B0" /> <!-- @bug Supplies the wrong size to gsDPLoadTextureBlock, meaning it uses part of gLinkPauseChildJointTable as if it were a texture. -->
-
-        <Array Name="gLinkMaskVtx" Count="157" Offset="0x3400"> <!-- Rendering the vertices shows the same shape as the Link Mask in object_stk -->
-            <Vtx/>
-        </Array>
-
-        <!-- Transformation Masks -->
-        <DList Name="gZoraMaskDL" Offset="0x5360" />
-        <DList Name="gDekuMaskDL" Offset="0x56C0" />
-        <DList Name="gGoronMaskDL" Offset="0x5A10" />
-        <Texture Name="gLinkMaskTLUT" OutName="link_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5DB8" /> <!-- Unused, leftover remnant same as the vertices -->
-        <Texture Name="gGoronMaskTLUT" OutName="goron_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5FB8" />
-        <Texture Name="gZoraMaskTLUT" OutName="zora_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x61B8" />
-        <Texture Name="gGoronMaskMouthTex" OutName="goron_mask_mouth" Format="ci8" Width="64" Height="32" Offset="0x63B8" />
-        <Texture Name="gGoronMaskInsideEyeTex" OutName="goron_mask_inside_eye" Format="ci8" Width="32" Height="32" Offset="0x6BB8" />
-        <Texture Name="gGoronMaskNoseEyebrowTex" OutName="goron_mask_nose_eyebrow" Format="ci8" Width="8" Height="8" Offset="0x6FB8" />
-        <Texture Name="gGoronMaskHairTex" OutName="goron_mask_hair" Format="ci8" Width="16" Height="16" Offset="0x6FF8" />
-        <Texture Name="gGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba32" Width="32" Height="32" Offset="0x70F8" />
-        <Texture Name="gDekuMaskEyeTex" OutName="deku_mask_eye" Format="rgba16" Width="64" Height="32" Offset="0x80F8" />
-        <Texture Name="gDekuMaskFaceTex" OutName="deku_mask_face" Format="rgba16" Width="16" Height="16" Offset="0x90F8" />
-        <Texture Name="gDekuMaskHairTex" OutName="deku_mask_hair" Format="rgba16" Width="32" Height="32" Offset="0x92F8" />
-        <Texture Name="gZoraMaskInsideEyeTex" OutName="zora_mask_inside_eye" Format="ci8" Width="32" Height="32" Offset="0x9AF8" />
-        <Texture Name="gZoraMaskMouthTex" OutName="zora_mask_mouth" Format="ci8" Width="32" Height="32" Offset="0x9EF8" />
-        <Texture Name="gZoraMaskNoseTex" OutName="zora_mask_nose" Format="ci8" Width="8" Height="8" Offset="0xA2F8" />
-        <Texture Name="gZoraMaskSpotsTex" OutName="zora_mask_spots" Format="ci8" Width="16" Height="32" Offset="0xA338" />
-        <Texture Name="gZoraMaskEyeTex" OutName="zora_mask_eye" Format="i8" Width="32" Height="32" Offset="0xA538" />
-
-        <!-- Fierce Deity Mask-->
-        <DList Name="gFierceDeityMaskDL" Offset="0xB260" />
-        <Texture Name="gFierceDeityMaskTLUT" OutName="fierce_deity_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0xB6B0" />
-        <Texture Name="gFierceDeityMaskHairTex" OutName="fierce_deity_mask_hair" Format="ci8" Width="32" Height="32" Offset="0xB8B0" />
-        <Texture Name="gFierceDeityMaskEyesTex" OutName="fierce_deity_mask_eyes" Format="ci8" Width="64" Height="32" Offset="0xBCB0" />
-        <Texture Name="gFierceDeityMaskMouthTex" OutName="fierce_deity_mask_mouth" Format="ci8" Width="32" Height="16" Offset="0xC4B0" />
-        <Texture Name="gFierceDeityMaskEarTex" OutName="fierce_deity_mask_ear" Format="ci8" Width="16" Height="16" Offset="0xC6B0" />
-        <Texture Name="gFierceDeityMaskHatTex" OutName="fierce_deity_mask_hat" Format="rgba16" Width="8" Height="8" Offset="0xC7B0" />
-
-        <Texture Name="gameplay_keep_Tex_00C830" OutName="tex_00C830" Format="rgba16" Width="16" Height="16" Offset="0xC830" />
-        <Texture Name="gameplay_keep_Tex_00CA30" OutName="tex_00CA30" Format="rgba16" Width="16" Height="16" Offset="0xCA30" />
-
-        <!-- 2S2H [Port] - gDekuStickDL loads this as a 16x16 texture, despite it being 8x8. We need to extract this extra 'garbage' data too -->
-        <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="16" Height="16" Offset="0xCC30" />
-
-        <!-- Leftover joint tables from Ocarina of Time's Pause Menu. -->
-        <Array Name="gLinkPauseChildJointTable" Count="24" Offset="0xCC70">
-            <Vector Type="s16" Dimensions="3"/>
-        </Array>
-        <Array Name="gLinkPauseChildDekuShieldJointTable" Count="24" Offset="0xCD00">
-            <Vector Type="s16" Dimensions="3"/>
-        </Array>
-        <Array Name="gLinkPauseAdultBgsJointTable" Count="24" Offset="0xCD90">
-            <Vector Type="s16" Dimensions="3"/>
-        </Array>
-        <Array Name="gLinkPauseAdultJointTable" Count="24" Offset="0xCE20">
-            <Vector Type="s16" Dimensions="3"/>
-        </Array>
-        <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0xCEB0">
-            <Vector Type="s16" Dimensions="3"/>
-        </Array>
-
-        <!-- Player Animations -->
-        <PlayerAnimation Name="gPlayerAnim_al_elf_tobidasi" Offset="0xCF40" />
-        <PlayerAnimation Name="gPlayerAnim_al_fuwafuwa" Offset="0xCF48" />
-        <PlayerAnimation Name="gPlayerAnim_al_fuwafuwa_loop" Offset="0xCF50" />
-        <PlayerAnimation Name="gPlayerAnim_al_fuwafuwa_modori" Offset="0xCF58" />
-        <PlayerAnimation Name="gPlayerAnim_al_gaku" Offset="0xCF60" />
-        <PlayerAnimation Name="gPlayerAnim_al_hensin" Offset="0xCF68" />
-        <PlayerAnimation Name="gPlayerAnim_al_hensin_loop" Offset="0xCF70" />
-        <PlayerAnimation Name="gPlayerAnim_al_no" Offset="0xCF78" />
-        <PlayerAnimation Name="gPlayerAnim_al_unun" Offset="0xCF80" />
-        <PlayerAnimation Name="gPlayerAnim_al_yareyare" Offset="0xCF88" />
-        <PlayerAnimation Name="gPlayerAnim_al_yes" Offset="0xCF90" />
-        <PlayerAnimation Name="gPlayerAnim_alink_dance_loop" Offset="0xCF98" />
-        <PlayerAnimation Name="gPlayerAnim_alink_ee" Offset="0xCFA0" />
-        <PlayerAnimation Name="gPlayerAnim_alink_ee_loop" Offset="0xCFA8" />
-        <PlayerAnimation Name="gPlayerAnim_alink_fukitobu" Offset="0xCFB0" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFB8" Offset="0xCFB8" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFC0" Offset="0xCFC0" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFC8" Offset="0xCFC8" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFD0" Offset="0xCFD0" />
-        <PlayerAnimation Name="gPlayerAnim_alink_kaitenmiss" Offset="0xCFD8" />
-        <PlayerAnimation Name="gPlayerAnim_alink_kyoro" Offset="0xCFE0" />
-        <PlayerAnimation Name="gPlayerAnim_alink_kyoro_loop" Offset="0xCFE8" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFF0" Offset="0xCFF0" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00CFF8" Offset="0xCFF8" />
-        <PlayerAnimation Name="gPlayerAnim_alink_ozigi" Offset="0xD000" />
-        <PlayerAnimation Name="gPlayerAnim_alink_ozigi_loop" Offset="0xD008" />
-        <PlayerAnimation Name="gPlayerAnim_alink_ozigi_modori" Offset="0xD010" />
-        <PlayerAnimation Name="gPlayerAnim_alink_powerup" Offset="0xD018" />
-        <PlayerAnimation Name="gPlayerAnim_alink_powerup_loop" Offset="0xD020" />
-        <PlayerAnimation Name="gPlayerAnim_alink_rakkatyu" Offset="0xD028" />
-        <PlayerAnimation Name="gPlayerAnim_alink_somukeru" Offset="0xD030" />
-        <PlayerAnimation Name="gPlayerAnim_alink_somukeru_loop" Offset="0xD038" />
-        <PlayerAnimation Name="gPlayerAnim_alink_tereru" Offset="0xD040" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D048" Offset="0xD048" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D050" Offset="0xD050" />
-        <PlayerAnimation Name="gPlayerAnim_alink_yurayura" Offset="0xD058" />
-        <PlayerAnimation Name="gPlayerAnim_bajyo_furikaeru" Offset="0xD060" />
-        <PlayerAnimation Name="gPlayerAnim_bajyo_walk" Offset="0xD068" />
-        <PlayerAnimation Name="gPlayerAnim_cl_dakisime" Offset="0xD070" />
-        <PlayerAnimation Name="gPlayerAnim_cl_dakisime_loop" Offset="0xD078" />
-        <PlayerAnimation Name="gPlayerAnim_cl_furafura" Offset="0xD080" />
-        <PlayerAnimation Name="gPlayerAnim_cl_hoo" Offset="0xD088" />
-        <PlayerAnimation Name="gPlayerAnim_cl_jibun_miru" Offset="0xD090" />
-        <PlayerAnimation Name="gPlayerAnim_cl_kubisime" Offset="0xD098" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D0A0" Offset="0xD0A0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_maskoff" Offset="0xD0A8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_msbowait" Offset="0xD0B0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_nigeru" Offset="0xD0B8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_ononoki" Offset="0xD0C0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_setmask" Offset="0xD0C8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_setmaskend" Offset="0xD0D0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_tewofuru" Offset="0xD0D8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_tobikakaru" Offset="0xD0E0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_uma_leftup" Offset="0xD0E8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_uma_rightup" Offset="0xD0F0" />
-        <PlayerAnimation Name="gPlayerAnim_cl_umamiage" Offset="0xD0F8" />
-        <PlayerAnimation Name="gPlayerAnim_cl_umamiage_loop" Offset="0xD100" />
-        <PlayerAnimation Name="gPlayerAnim_cl_umanoru" Offset="0xD108" />
-        <PlayerAnimation Name="gPlayerAnim_cl_umanoru_loop" Offset="0xD110" />
-        <PlayerAnimation Name="gPlayerAnim_cl_wakare" Offset="0xD118" />
-        <PlayerAnimation Name="gPlayerAnim_cl_wakare_loop" Offset="0xD120" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0xD128" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0xD130" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_bashi" Offset="0xD138" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorA_link" Offset="0xD140" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorB_link" Offset="0xD148" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_futtobi" Offset="0xD150" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_get1" Offset="0xD158" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_get2" Offset="0xD160" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_get3" Offset="0xD168" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_goto_future" Offset="0xD170" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai" Offset="0xD178" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_kennuki" Offset="0xD180" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_wait" Offset="0xD188" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi" Offset="0xD190" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi_wait" Offset="0xD198" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri" Offset="0xD1A0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri_wait" Offset="0xD1A8" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_nozoki" Offset="0xD1B0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_return_to_future" Offset="0xD1B8" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup" Offset="0xD1C0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup_wait" Offset="0xD1C8" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D1D0" Offset="0xD1D0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAL" Offset="0xD1D8" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAR" Offset="0xD1E0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBL" Offset="0xD1E8" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBR" Offset="0xD1F0" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startA" Offset="0xD1F8" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startB" Offset="0xD200" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upL" Offset="0xD208" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upR" Offset="0xD210" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_defense_ALL" Offset="0xD218" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_okarina_walkB" Offset="0xD220" />
-        <PlayerAnimation Name="gPlayerAnim_clink_normal_okarina_walk" Offset="0xD228" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_negaeri" Offset="0xD230" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_okiagari" Offset="0xD238" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_tatiagari" Offset="0xD240" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait1" Offset="0xD248" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait2" Offset="0xD250" />
-        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait3" Offset="0xD258" />
-        <PlayerAnimation Name="gPlayerAnim_d_link_imanodare" Offset="0xD260" />
-        <PlayerAnimation Name="gPlayerAnim_d_link_orooro" Offset="0xD268" />
-        <PlayerAnimation Name="gPlayerAnim_d_link_orowait" Offset="0xD270" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D278" Offset="0xD278" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D280" Offset="0xD280" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D288" Offset="0xD288" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D290" Offset="0xD290" />
-        <PlayerAnimation Name="gPlayerAnim_demo_link_nwait" Offset="0xD298" />
-        <PlayerAnimation Name="gPlayerAnim_demo_link_orosuu" Offset="0xD2A0" />
-        <PlayerAnimation Name="gPlayerAnim_demo_link_tewatashi" Offset="0xD2A8" />
-        <PlayerAnimation Name="gPlayerAnim_demo_link_twait" Offset="0xD2B0" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D2B8" Offset="0xD2B8" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D2C0" Offset="0xD2C0" />
-        <PlayerAnimation Name="gPlayerAnim_demo_pikupiku" Offset="0xD2C8" />
-        <PlayerAnimation Name="gPlayerAnim_demo_rakka" Offset="0xD2D0" />
-        <PlayerAnimation Name="gPlayerAnim_demo_suwari1" Offset="0xD2D8" />
-        <PlayerAnimation Name="gPlayerAnim_demo_suwari2" Offset="0xD2E0" />
-        <PlayerAnimation Name="gPlayerAnim_demo_suwari3" Offset="0xD2E8" />
-        <PlayerAnimation Name="gPlayerAnim_dl_jibunmiru" Offset="0xD2F0" />
-        <PlayerAnimation Name="gPlayerAnim_dl_jibunmiru_wait" Offset="0xD2F8" />
-        <PlayerAnimation Name="gPlayerAnim_dl_kokeru" Offset="0xD300" />
-        <PlayerAnimation Name="gPlayerAnim_dl_yusaburu" Offset="0xD308" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D310" Offset="0xD310" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D318" Offset="0xD318" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00D320" Offset="0xD320" />
-        <PlayerAnimation Name="gPlayerAnim_kf_awase" Offset="0xD328" />
-        <PlayerAnimation Name="gPlayerAnim_kf_dakiau" Offset="0xD330" />
-        <PlayerAnimation Name="gPlayerAnim_kf_dakiau_loop" Offset="0xD338" />
-        <PlayerAnimation Name="gPlayerAnim_kf_hanare" Offset="0xD340" />
-        <PlayerAnimation Name="gPlayerAnim_kf_hanare_loop" Offset="0xD348" />
-        <PlayerAnimation Name="gPlayerAnim_kf_miseau" Offset="0xD350" />
-        <PlayerAnimation Name="gPlayerAnim_kf_omen" Offset="0xD358" />
-        <PlayerAnimation Name="gPlayerAnim_kf_omen_loop" Offset="0xD360" />
-        <PlayerAnimation Name="gPlayerAnim_kf_tetunagu_loop" Offset="0xD368" />
-        <PlayerAnimation Name="gPlayerAnim_kolink_odoroki_demo" Offset="0xD370" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_endL" Offset="0xD378" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR" Offset="0xD380" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_endR" Offset="0xD388" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL" Offset="0xD390" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR" Offset="0xD398" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR" Offset="0xD3A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL" Offset="0xD3A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR" Offset="0xD3B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR" Offset="0xD3B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_endR" Offset="0xD3C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR" Offset="0xD3C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_endR" Offset="0xD3D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR" Offset="0xD3D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_anchor2fighter" Offset="0xD3E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_brake" Offset="0xD3E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_hitR" Offset="0xD3F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_walk" Offset="0xD3F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_hit" Offset="0xD400" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitL" Offset="0xD408" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitR" Offset="0xD410" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_front_hitR" Offset="0xD418" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_landingR" Offset="0xD420" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR" Offset="0xD428" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_endR" Offset="0xD430" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR" Offset="0xD438" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_rolling_kiru_endR" Offset="0xD440" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkL" Offset="0xD448" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkR" Offset="0xD450" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense" Offset="0xD458" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense_long" Offset="0xD460" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL" Offset="0xD468" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense" Offset="0xD470" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense_long" Offset="0xD478" />
-        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR" Offset="0xD480" />
-        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitL" Offset="0xD488" />
-        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitR" Offset="0xD490" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_in" Offset="0xD498" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_miss" Offset="0xD4A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_out" Offset="0xD4A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_end" Offset="0xD4B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_start" Offset="0xD4B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_wait" Offset="0xD4C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_in" Offset="0xD4C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_miss" Offset="0xD4D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_out" Offset="0xD4D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_read" Offset="0xD4E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bottle_read_end" Offset="0xD4E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_ready" Offset="0xD4F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_end" Offset="0xD4F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_next" Offset="0xD500" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_wait" Offset="0xD508" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_defense" Offset="0xD510" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_defense_wait" Offset="0xD518" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_side_walk" Offset="0xD520" />
-        <PlayerAnimation Name="gPlayerAnim_link_bow_walk2ready" Offset="0xD528" />
-        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_end" Offset="0xD530" />
-        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_start" Offset="0xD538" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_Tbox_open" Offset="0xD540" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_back_to_past" Offset="0xD548" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op1" Offset="0xD550" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op2" Offset="0xD558" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op3" Offset="0xD560" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_bikkuri" Offset="0xD568" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link" Offset="0xD570" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link_free" Offset="0xD578" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link" Offset="0xD580" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link_free" Offset="0xD588" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2" Offset="0xD590" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2_wait" Offset="0xD598" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki" Offset="0xD5A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemA" Offset="0xD5A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemB" Offset="0xD5B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_goma_furimuki" Offset="0xD5B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad" Offset="0xD5C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad_wait" Offset="0xD5C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_jibunmiru" Offset="0xD5D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori" Offset="0xD5D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_mimawasi" Offset="0xD5E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri" Offset="0xD5E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait" Offset="0xD5F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_wait" Offset="0xD5F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage" Offset="0xD600" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage_wait" Offset="0xD608" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1" Offset="0xD610" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1_wait" Offset="0xD618" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2" Offset="0xD620" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_modori" Offset="0xD628" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_wait" Offset="0xD630" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_kousan" Offset="0xD638" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand" Offset="0xD640" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand_wait" Offset="0xD648" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi" Offset="0xD650" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi_wait" Offset="0xD658" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_return_to_past" Offset="0xD660" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_sita_wait" Offset="0xD668" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_ue" Offset="0xD670" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_ue_wait" Offset="0xD678" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_warp" Offset="0xD680" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru" Offset="0xD688" />
-        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru_wait" Offset="0xD690" />
-        <PlayerAnimation Name="gPlayerAnim_link_derth_rebirth" Offset="0xD698" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru" Offset="0xD6A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_end" Offset="0xD6A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh" Offset="0xD6B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end" Offset="0xD6B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru" Offset="0xD6C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_end" Offset="0xD6C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh" Offset="0xD6D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end" Offset="0xD6D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru" Offset="0xD6E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_end" Offset="0xD6E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh" Offset="0xD6F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end" Offset="0xD6F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru" Offset="0xD700" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_end" Offset="0xD708" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh" Offset="0xD710" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end" Offset="0xD718" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru" Offset="0xD720" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end" Offset="0xD728" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit" Offset="0xD730" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk" Offset="0xD738" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_start" Offset="0xD740" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait" Offset="0xD748" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end" Offset="0xD750" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_walk" Offset="0xD758" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru" Offset="0xD760" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru_end" Offset="0xD768" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump" Offset="0xD770" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_endL" Offset="0xD778" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_end" Offset="0xD780" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru" Offset="0xD788" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_end" Offset="0xD790" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh" Offset="0xD798" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end" Offset="0xD7A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump" Offset="0xD7A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_endR" Offset="0xD7B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_end" Offset="0xD7B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru" Offset="0xD7C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_end" Offset="0xD7C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh" Offset="0xD7D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end" Offset="0xD7D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru" Offset="0xD7E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru_end" Offset="0xD7E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump" Offset="0xD7F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_endR" Offset="0xD7F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_end" Offset="0xD800" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run" Offset="0xD808" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run_long" Offset="0xD810" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_hit" Offset="0xD818" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_fighter2long" Offset="0xD820" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump" Offset="0xD828" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_endR" Offset="0xD830" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_end" Offset="0xD838" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh" Offset="0xD840" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end" Offset="0xD848" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_rollkiru" Offset="0xD850" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_landing_roll_long" Offset="0xD858" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal2fighter" Offset="0xD860" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru" Offset="0xD868" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_endR" Offset="0xD870" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_end" Offset="0xD878" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh" Offset="0xD880" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end" Offset="0xD888" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru" Offset="0xD890" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_end" Offset="0xD898" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh" Offset="0xD8A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end" Offset="0xD8A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_jump_kiru_end" Offset="0xD8B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_side_walk" Offset="0xD8B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_startL" Offset="0xD8C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_start" Offset="0xD8C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait" Offset="0xD8D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait_end" Offset="0xD8D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_walk" Offset="0xD8E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_reboundR" Offset="0xD8E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound" Offset="0xD8F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_longR" Offset="0xD8F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_long" Offset="0xD900" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru" Offset="0xD908" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru_end" Offset="0xD910" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_run" Offset="0xD918" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_run_long" Offset="0xD920" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkL_long" Offset="0xD928" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkR_long" Offset="0xD930" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walk_long" Offset="0xD938" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL" Offset="0xD940" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL_end" Offset="0xD948" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR" Offset="0xD950" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR_end" Offset="0xD958" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitR_long" Offset="0xD960" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL2wait_long" Offset="0xD968" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL_long" Offset="0xD970" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR2wait_long" Offset="0xD978" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR_long" Offset="0xD980" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait_long" Offset="0xD988" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endL_long" Offset="0xD990" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endR_long" Offset="0xD998" />
-        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_long" Offset="0xD9A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2free" Offset="0xD9A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2long" Offset="0xD9B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_hammer_normal2long" Offset="0xD9B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_hatto_demo" Offset="0xD9C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_start" Offset="0xD9C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_wait" Offset="0xD9D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_hook_shot_ready" Offset="0xD9D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_hook_wait" Offset="0xD9E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_hook_walk2ready" Offset="0xD9E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_kei_wait" Offset="0xD9F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_keirei" Offset="0xD9F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion1" Offset="0xDA00" />
-        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion2" Offset="0xDA08" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo1" Offset="0xDA10" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo2" Offset="0xDA18" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo3" Offset="0xDA20" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze1" Offset="0xDA28" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze2" Offset="0xDA30" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze3" Offset="0xDA38" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii1" Offset="0xDA40" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii2" Offset="0xDA48" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii3" Offset="0xDA50" />
-        <PlayerAnimation Name="gPlayerAnim_link_magic_tame" Offset="0xDA58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_100step_up" Offset="0xDA60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_150step_up" Offset="0xDA68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_250jump_start" Offset="0xDA70" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn" Offset="0xDA78" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn_free" Offset="0xDA80" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_hold2upL" Offset="0xDA88" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideL" Offset="0xDA90" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideR" Offset="0xDA98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startA" Offset="0xDAA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startB" Offset="0xDAA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upL" Offset="0xDAB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upR" Offset="0xDAB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake" Offset="0xDAC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake_end" Offset="0xDAC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downA" Offset="0xDAD0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downB" Offset="0xDAD8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_down_wake" Offset="0xDAE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_hit" Offset="0xDAE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_run" Offset="0xDAF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shitR" Offset="0xDAF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shit" Offset="0xDB00" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_back_walk" Offset="0xDB08" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_backspace" Offset="0xDB10" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_box_kick" Offset="0xDB18" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB" Offset="0xDB20" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_free" Offset="0xDB28" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_wait" Offset="0xDB30" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check" Offset="0xDB38" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end" Offset="0xDB40" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end_free" Offset="0xDB48" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check_free" Offset="0xDB50" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait" Offset="0xDB58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait_free" Offset="0xDB60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_down" Offset="0xDB68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAL" Offset="0xDB70" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAR" Offset="0xDB78" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBL" Offset="0xDB80" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBR" Offset="0xDB88" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startA" Offset="0xDB90" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startB" Offset="0xDB98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upL" Offset="0xDBA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upR" Offset="0xDBA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_up" Offset="0xDBB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_damage_run_free" Offset="0xDBB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense" Offset="0xDBC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end" Offset="0xDBC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end_free" Offset="0xDBD0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_free" Offset="0xDBD8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_hit" Offset="0xDBE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_kiru" Offset="0xDBE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait" Offset="0xDBF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait_free" Offset="0xDBF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip" Offset="0xDC00" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end" Offset="0xDC08" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_free" Offset="0xDC10" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_long" Offset="0xDC18" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock" Offset="0xDC20" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock_end" Offset="0xDC28" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_fall" Offset="0xDC30" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up" Offset="0xDC38" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up_free" Offset="0xDC40" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_wait" Offset="0xDC48" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_fighter2free" Offset="0xDC50" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_free2bom" Offset="0xDC58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_free2fighter_free" Offset="0xDC60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_free2freeB" Offset="0xDC68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_free2free" Offset="0xDC70" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downA" Offset="0xDC78" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downB" Offset="0xDC80" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_down_wake" Offset="0xDC88" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_hit" Offset="0xDC90" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shitR" Offset="0xDC98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shit" Offset="0xDCA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_give_other" Offset="0xDCA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_hang_up_down" Offset="0xDCB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down" Offset="0xDCB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_free" Offset="0xDCC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_long" Offset="0xDCC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_ice_down" Offset="0xDCD0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump" Offset="0xDCD8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold" Offset="0xDCE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold_free" Offset="0xDCE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up" Offset="0xDCF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up_free" Offset="0xDCF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait" Offset="0xDD00" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait_free" Offset="0xDD08" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_landing" Offset="0xDD10" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_free" Offset="0xDD18" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll" Offset="0xDD20" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll_free" Offset="0xDD28" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_wait" Offset="0xDD30" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom" Offset="0xDD38" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom_end" Offset="0xDD40" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_long2bom" Offset="0xDD48" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_newroll_jump_20f" Offset="0xDD50" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_newroll_jump_end_20f" Offset="0xDD58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_newside_jump_20f" Offset="0xDD60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_newside_jump_end_20f" Offset="0xDD68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free" Offset="0xDD70" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_end" Offset="0xDD78" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_wait" Offset="0xDD80" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2bom" Offset="0xDD88" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter" Offset="0xDD90" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter_free" Offset="0xDD98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2free" Offset="0xDDA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_end" Offset="0xDDA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_start" Offset="0xDDB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_swing" Offset="0xDDB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end" Offset="0xDDC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end_free" Offset="0xDDC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start" Offset="0xDDD0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start_free" Offset="0xDDD8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling" Offset="0xDDE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling_free" Offset="0xDDE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_push_end" Offset="0xDDF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_push_start" Offset="0xDDF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait" Offset="0xDE00" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait_end" Offset="0xDE08" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_pushing" Offset="0xDE10" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_put" Offset="0xDE18" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_put_free" Offset="0xDE20" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack" Offset="0xDE28" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack_wait" Offset="0xDE30" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run" Offset="0xDE38" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run_free" Offset="0xDE40" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump" Offset="0xDE48" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_end" Offset="0xDE50" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall" Offset="0xDE58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall_wait" Offset="0xDE60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing" Offset="0xDE68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing_free" Offset="0xDE70" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkL_free" Offset="0xDE78" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkR_free" Offset="0xDE80" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk" Offset="0xDE88" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk_free" Offset="0xDE90" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_take_out" Offset="0xDE98" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free" Offset="0xDEA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free_wait" Offset="0xDEA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_throw" Offset="0xDEB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_throw_free" Offset="0xDEB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip" Offset="0xDEC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end" Offset="0xDEC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_free" Offset="0xDED0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_long" Offset="0xDED8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitR" Offset="0xDEE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeA_20f" Offset="0xDEE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeB_20f" Offset="0xDEF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeC_20f" Offset="0xDEF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL2wait" Offset="0xDF00" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL_free" Offset="0xDF08" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR2wait" Offset="0xDF10" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR_free" Offset="0xDF18" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait" Offset="0xDF20" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_free" Offset="0xDF28" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeA_20f" Offset="0xDF30" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeB_20f" Offset="0xDF38" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeC_20f" Offset="0xDF40" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk" Offset="0xDF48" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL" Offset="0xDF50" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL_free" Offset="0xDF58" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR" Offset="0xDF60" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR_free" Offset="0xDF68" />
-        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_free" Offset="0xDF70" />
-        <PlayerAnimation Name="gPlayerAnim_link_okarina_warp_goal" Offset="0xDF78" />
-        <PlayerAnimation Name="gPlayerAnim_link_okiru_demo" Offset="0xDF80" />
-        <PlayerAnimation Name="gPlayerAnim_link_shagamu_demo" Offset="0xDF88" />
-        <PlayerAnimation Name="gPlayerAnim_link_silver_carry" Offset="0xDF90" />
-        <PlayerAnimation Name="gPlayerAnim_link_silver_throw" Offset="0xDF98" />
-        <PlayerAnimation Name="gPlayerAnim_link_silver_wait" Offset="0xDFA0" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_Lside_swim" Offset="0xDFA8" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_Rside_swim" Offset="0xDFB0" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_back_swim" Offset="0xDFB8" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_land2swim_wait" Offset="0xDFC0" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_15step_up" Offset="0xDFC8" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim" Offset="0xDFD0" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_end" Offset="0xDFD8" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_start" Offset="0xDFE0" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_down" Offset="0xDFE8" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_get" Offset="0xDFF0" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_hit" Offset="0xDFF8" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_wait" Offset="0xE000" />
-        <PlayerAnimation Name="gPlayerAnim_link_swimer_wait2swim_wait" Offset="0xE008" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun" Offset="0xE010" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun_muti" Offset="0xE018" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump100" Offset="0xE020" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump200" Offset="0xE028" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun" Offset="0xE030" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun_muti" Offset="0xE038" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stand" Offset="0xE040" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stop" Offset="0xE048" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk" Offset="0xE050" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk_muti" Offset="0xE058" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_left_down" Offset="0xE060" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_left_up" Offset="0xE068" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_right_down" Offset="0xE070" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_right_up" Offset="0xE078" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_stop_muti" Offset="0xE080" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_1" Offset="0xE088" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_2" Offset="0xE090" />
-        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_3" Offset="0xE098" />
-        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat1_20f" Offset="0xE0A0" />
-        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat2_20f" Offset="0xE0A8" />
-        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemA_20f" Offset="0xE0B0" />
-        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemB_20f" Offset="0xE0B8" />
-        <PlayerAnimation Name="gPlayerAnim_link_waitF_typeD_20f" Offset="0xE0C0" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_heat1_20f" Offset="0xE0C8" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_heat2_20f" Offset="0xE0D0" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_itemA_20f" Offset="0xE0D8" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_itemB_20f" Offset="0xE0E0" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_itemC_20f" Offset="0xE0E8" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD1_20f" Offset="0xE0F0" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD2_20f" Offset="0xE0F8" />
-        <PlayerAnimation Name="gPlayerAnim_link_wait_typeD_20f" Offset="0xE100" />
-        <PlayerAnimation Name="gPlayerAnim_lkt_nwait" Offset="0xE108" />
-        <PlayerAnimation Name="gPlayerAnim_lost_horse2" Offset="0xE110" />
-        <PlayerAnimation Name="gPlayerAnim_lost_horse" Offset="0xE118" />
-        <PlayerAnimation Name="gPlayerAnim_lost_horse_wait" Offset="0xE120" />
-        <PlayerAnimation Name="gPlayerAnim_nw_modoru" Offset="0xE128" />
-        <PlayerAnimation Name="gPlayerAnim_o_get_ato" Offset="0xE130" />
-        <PlayerAnimation Name="gPlayerAnim_o_get_mae" Offset="0xE138" />
-        <PlayerAnimation Name="gPlayerAnim_okarinatori" Offset="0xE140" />
-        <PlayerAnimation Name="gPlayerAnim_okiagaru" Offset="0xE148" />
-        <PlayerAnimation Name="gPlayerAnim_okiagaru_tatu" Offset="0xE150" />
-        <PlayerAnimation Name="gPlayerAnim_okiagaru_wait" Offset="0xE158" />
-        <PlayerAnimation Name="gPlayerAnim_om_get" Offset="0xE160" />
-        <PlayerAnimation Name="gPlayerAnim_om_get_mae" Offset="0xE168" />
-        <PlayerAnimation Name="gPlayerAnim_pg_Tbox_open" Offset="0xE170" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_endAL" Offset="0xE178" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_endAR" Offset="0xE180" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_endBL" Offset="0xE188" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_endBR" Offset="0xE190" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_startA" Offset="0xE198" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_startB" Offset="0xE1A0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_upL" Offset="0xE1A8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_climb_upR" Offset="0xE1B0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_doorA_open" Offset="0xE1B8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_doorB_open" Offset="0xE1C0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplayA" Offset="0xE1C8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplayD" Offset="0xE1D0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplayL" Offset="0xE1D8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplayR" Offset="0xE1E0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplayU" Offset="0xE1E8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiplay" Offset="0xE1F0" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkistart" Offset="0xE1F8" />
-        <PlayerAnimation Name="gPlayerAnim_pg_gakkiwait" Offset="0xE200" />
-        <PlayerAnimation Name="gPlayerAnim_pg_maru_change" Offset="0xE208" />
-        <PlayerAnimation Name="gPlayerAnim_pg_maskoffstart" Offset="0xE210" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchA" Offset="0xE218" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchAendR" Offset="0xE220" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchAend" Offset="0xE228" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchB" Offset="0xE230" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchBendR" Offset="0xE238" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchBend" Offset="0xE240" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchC" Offset="0xE248" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchCendR" Offset="0xE250" />
-        <PlayerAnimation Name="gPlayerAnim_pg_punchCend" Offset="0xE258" />
-        <PlayerAnimation Name="gPlayerAnim_pg_wait" Offset="0xE260" />
-        <PlayerAnimation Name="gPlayerAnim_pn_Tbox_open" Offset="0xE268" />
-        <PlayerAnimation Name="gPlayerAnim_pn_attack" Offset="0xE270" />
-        <PlayerAnimation Name="gPlayerAnim_pn_batabata" Offset="0xE278" />
-        <PlayerAnimation Name="gPlayerAnim_pn_doorA_open" Offset="0xE280" />
-        <PlayerAnimation Name="gPlayerAnim_pn_doorB_open" Offset="0xE288" />
-        <PlayerAnimation Name="gPlayerAnim_pn_drink" Offset="0xE290" />
-        <PlayerAnimation Name="gPlayerAnim_pn_drinkend" Offset="0xE298" />
-        <PlayerAnimation Name="gPlayerAnim_pn_drinkstart" Offset="0xE2A0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_gakkiplay" Offset="0xE2A8" />
-        <PlayerAnimation Name="gPlayerAnim_pn_gakkistart" Offset="0xE2B0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_getA" Offset="0xE2B8" />
-        <PlayerAnimation Name="gPlayerAnim_pn_getB" Offset="0xE2C0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_gurd" Offset="0xE2C8" />
-        <PlayerAnimation Name="gPlayerAnim_pn_kakku" Offset="0xE2D0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_kakkufinish" Offset="0xE2D8" />
-        <PlayerAnimation Name="gPlayerAnim_pn_maskoffstart" Offset="0xE2E0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_rakkafinish" Offset="0xE2E8" />
-        <PlayerAnimation Name="gPlayerAnim_pn_tamahaki" Offset="0xE2F0" />
-        <PlayerAnimation Name="gPlayerAnim_pn_tamahakidf" Offset="0xE2F8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_Tbox_open" Offset="0xE300" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackA" Offset="0xE308" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackAendR" Offset="0xE310" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackAend" Offset="0xE318" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackB" Offset="0xE320" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackBendR" Offset="0xE328" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackBend" Offset="0xE330" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackC" Offset="0xE338" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackCendR" Offset="0xE340" />
-        <PlayerAnimation Name="gPlayerAnim_pz_attackCend" Offset="0xE348" />
-        <PlayerAnimation Name="gPlayerAnim_pz_bladeon" Offset="0xE350" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_endAL" Offset="0xE358" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_endAR" Offset="0xE360" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_endBL" Offset="0xE368" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_endBR" Offset="0xE370" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_startA" Offset="0xE378" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_startB" Offset="0xE380" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_upL" Offset="0xE388" />
-        <PlayerAnimation Name="gPlayerAnim_pz_climb_upR" Offset="0xE390" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cutterattack" Offset="0xE398" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cuttercatch" Offset="0xE3A0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cutterwaitA" Offset="0xE3A8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cutterwaitB" Offset="0xE3B0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cutterwaitC" Offset="0xE3B8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_cutterwaitanim" Offset="0xE3C0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_doorA_open" Offset="0xE3C8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_doorB_open" Offset="0xE3D0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_fishswim" Offset="0xE3D8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_gakkiplay" Offset="0xE3E0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_gakkistart" Offset="0xE3E8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_jumpAT" Offset="0xE3F0" />
-        <PlayerAnimation Name="gPlayerAnim_pz_jumpATend" Offset="0xE3F8" />
-        <PlayerAnimation Name="gPlayerAnim_pz_maskoffstart" Offset="0xE400" />
-        <PlayerAnimation Name="gPlayerAnim_pz_swimtowait" Offset="0xE408" />
-        <PlayerAnimation Name="gPlayerAnim_pz_wait" Offset="0xE410" />
-        <PlayerAnimation Name="gPlayerAnim_pz_waterroll" Offset="0xE418" />
-        <PlayerAnimation Name="gPlayerAnim_rakka" Offset="0xE420" />
-        <PlayerAnimation Name="gPlayerAnim_rakuba" Offset="0xE428" />
-        <PlayerAnimation Name="gPlayerAnim_sirimochi" Offset="0xE430" />
-        <PlayerAnimation Name="gPlayerAnim_sirimochi_wait" Offset="0xE438" />
-        <PlayerAnimation Name="gPlayerAnim_spotlight" Offset="0xE440" />
-        <PlayerAnimation Name="gPlayerAnim_spotlight_wait" Offset="0xE448" />
-        <PlayerAnimation Name="gPlayerAnim_sude_nwait" Offset="0xE450" />
-        <PlayerAnimation Name="gameplay_keep_Linkanim_00E458" Offset="0xE458" />
-        <PlayerAnimation Name="gPlayerAnim_urusai" Offset="0xE460" />
-        <PlayerAnimation Name="gPlayerAnim_vs_yousei" Offset="0xE468" />
-        <PlayerAnimation Name="gPlayerAnim_L_1kyoro" Offset="0xE470" />
-        <PlayerAnimation Name="gPlayerAnim_L_2kyoro" Offset="0xE478" />
-        <PlayerAnimation Name="gPlayerAnim_L_bouzen" Offset="0xE480" />
-        <PlayerAnimation Name="gPlayerAnim_L_hajikareru" Offset="0xE488" />
-        <PlayerAnimation Name="gPlayerAnim_L_kamaeru" Offset="0xE490" />
-        <PlayerAnimation Name="gPlayerAnim_L_ken_miru" Offset="0xE498" />
-        <PlayerAnimation Name="gPlayerAnim_L_kennasi_w" Offset="0xE4A0" />
-        <PlayerAnimation Name="gPlayerAnim_L_kw" Offset="0xE4A8" />
-        <PlayerAnimation Name="gPlayerAnim_L_mukinaoru" Offset="0xE4B0" />
-        <PlayerAnimation Name="gPlayerAnim_L_okarina_get" Offset="0xE4B8" />
-        <PlayerAnimation Name="gPlayerAnim_L_sagaru" Offset="0xE4C0" />
-        <PlayerAnimation Name="gPlayerAnim_Link_ha" Offset="0xE4C8" />
-        <PlayerAnimation Name="gPlayerAnim_Link_m_wait" Offset="0xE4D0" />
-        <PlayerAnimation Name="gPlayerAnim_Link_miageru" Offset="0xE4D8" />
-        <PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0xE4E0" />
-        <PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0xE4E8" />
-        <PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0xE4F0" />
-
-        <DList Name="gameplay_keep_DL_00E5C0" Offset="0xE5C0" />
-
-        <!-- Deku Flower -->
-        <Collision Name="gPinkDekuFlowerCol" Offset="0xE710" />
-        <Animation Name="gDekuFlowerBounceAnim" Offset="0xEB7C" /> <!-- Original name is "dnp_boyoyon" ("bounce") -->
-        <DList Name="gPinkDekuFlowerIdleDL" Offset="0xED80" />
-        <DList Name="gPinkDekuFlowerBaseDL" Offset="0xF2B8" />
-        <DList Name="gPinkDekuFlowerCenterDL" Offset="0xF350" />
-        <DList Name="gPinkDekuFlowerBackLeftPetalDL" Offset="0xF438" />
-        <DList Name="gPinkDekuFlowerLeftLeafDL" Offset="0xF4C0" />
-        <DList Name="gPinkDekuFlowerFrontLeftPetalDL" Offset="0xF548" />
-        <DList Name="gPinkDekuFlowerRightLeafDL" Offset="0xF5D0" />
-        <DList Name="gPinkDekuFlowerBackRightPetalDL" Offset="0xF658" />
-        <DList Name="gPinkDekuFlowerFrontRightPetalDL" Offset="0xF6E0" />
-        <DList Name="gPinkDekuFlowerFrontLeafDL" Offset="0xF768" />
-        <DList Name="gPinkDekuFlowerBackLeafDL" Offset="0xF7F0" />
-        <Texture Name="gPinkDekuFlowerPetalAndCenterTex" OutName="pink_deku_flower_petal_and_center" Format="rgba16" Width="16" Height="32" Offset="0xF878" />
-        <Texture Name="gPinkDekuFlowerLeafAndCenterTex" OutName="pink_deku_flower_leaf_and_center" Format="rgba16" Width="16" Height="32" Offset="0xFC78" />
-        <Texture Name="gPinkDekuFlowerBaseLeafTex" OutName="pink_deku_flower_base_leaf" Format="rgba16" Width="32" Height="32" Offset="0x10078" />
-        <Texture Name="gGoldDekuFlowerPetalAndCenterTex" OutName="gold_deku_flower_petal_and_center" Format="rgba16" Width="16" Height="32" Offset="0x10878" />
-        <Texture Name="gGoldDekuFlowerBaseLeafTex" OutName="gold_deku_flower_base_leaf" Format="rgba16" Width="32" Height="32" Offset="0x10C78" />
-        <Limb Name="gPinkDekuFlowerBaseLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_BASE" Offset="0x11478" />
-        <Limb Name="gPinkDekuFlowerCenterLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_CENTER" Offset="0x11484" />
-        <Limb Name="gPinkDekuFlowerBackLeafLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_BACK_LEAF" Offset="0x11490" />
-        <Limb Name="gPinkDekuFlowerFrontLeafLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_FRONT_LEAF" Offset="0x1149C" />
-        <Limb Name="gPinkDekuFlowerFrontRightPetalLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_FRONT_RIGHT_PETAL" Offset="0x114A8" />
-        <Limb Name="gPinkDekuFlowerBackRightPetalLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_BACK_RIGHT_PETAL" Offset="0x114B4" />
-        <Limb Name="gPinkDekuFlowerRightLeafLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_RIGHT_LEAF" Offset="0x114C0" />
-        <Limb Name="gPinkDekuFlowerFrontLeftPetalLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_FRONT_LEFT_PETAL" Offset="0x114CC" />
-        <Limb Name="gPinkDekuFlowerLeftLeafLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_LEFT_LEAF" Offset="0x114D8" />
-        <Limb Name="gPinkDekuFlowerBackLeftPetalLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_BACK_LEFT_PETAL" Offset="0x114E4" />
-        <Skeleton Name="gPinkDekuFlowerSkel" Type="Normal" LimbType="Standard" LimbNone="PINK_DEKU_FLOWER_LIMB_NONE" LimbMax="PINK_DEKU_FLOWER_LIMB_MAX" EnumName="PinkDekuFlowerLimb" Offset="0x11518" />
-        <Animation Name="gDekuFlowerRustleAnim" Offset="0x117A8" /> <!-- Original name is "dnp_zawa" ("rustling") -->
-        <Collision Name="gGoldDekuFlowerCol" Offset="0x118D8" />
-        <DList Name="gGoldDekuFlowerIdleDL" Offset="0x11BD0" />
-        <DList Name="gGoldDekuFlowerBaseDL" Offset="0x121B0" />
-        <DList Name="gGoldDekuFlowerCenterDL" Offset="0x12260" />
-        <DList Name="gGoldDekuFlowerBackLeftPetalDL" Offset="0x12308" />
-        <DList Name="gGoldDekuFlowerLeftPetalDL" Offset="0x12390" />
-        <DList Name="gGoldDekuFlowerFrontLeftPetalDL" Offset="0x12418" />
-        <DList Name="gGoldDekuFlowerRightPetalDL" Offset="0x124A0" />
-        <DList Name="gGoldDekuFlowerBackRightPetalDL" Offset="0x12528" />
-        <DList Name="gGoldDekuFlowerFrontRightPetalDL" Offset="0x125B0" />
-        <DList Name="gGoldDekuFlowerFrontPetalDL" Offset="0x12638" />
-        <DList Name="gGoldDekuFlowerBackPetalDL" Offset="0x126C0" />
-        <Limb Name="gGoldDekuFlowerBaseLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_BASE" Offset="0x12748" />
-        <Limb Name="gGoldDekuFlowerCenterLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_CENTER" Offset="0x12754" />
-        <Limb Name="gGoldDekuFlowerBackPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_BACK_PETAL" Offset="0x12760" />
-        <Limb Name="gGoldDekuFlowerFrontPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_FRONT_PETAL" Offset="0x1276C" />
-        <Limb Name="gGoldDekuFlowerFrontRightPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_FRONT_RIGHT_PETAL" Offset="0x12778" />
-        <Limb Name="gGoldDekuFlowerBackRightPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_BACK_RIGHT_PETAL" Offset="0x12784" />
-        <Limb Name="gGoldDekuFlowerRightPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_RIGHT_PETAL" Offset="0x12790" />
-        <Limb Name="gGoldDekuFlowerFrontLeftPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_FRONT_LEFT_PETAL" Offset="0x1279C" />
-        <Limb Name="gGoldDekuFlowerLeftPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_LEFT_PETAL" Offset="0x127A8" />
-        <Limb Name="gGoldDekuFlowerBackLeftPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_BACK_LEFT_PETAL" Offset="0x127B4" />
-        <Skeleton Name="gGoldDekuFlowerSkel" Type="Flex" LimbType="Standard" LimbNone="GOLD_DEKU_FLOWER_LIMB_NONE" LimbMax="GOLD_DEKU_FLOWER_LIMB_MAX" EnumName="GoldDekuFlowerLimb" Offset="0x127E8" />
-
-        <Animation Name="gameplay_keep_Anim_012860" Offset="0x12860" />
-        <Animation Name="gameplay_keep_Anim_0128BC" Offset="0x128BC" />
-        <Texture Name="gameplay_keep_Tex_0128D0" OutName="tex_0128D0" Format="rgba16" Width="16" Height="128" Offset="0x128D0" />
-        <Texture Name="gameplay_keep_Tex_0138D0" OutName="tex_0138D0" Format="rgba16" Width="32" Height="16" Offset="0x138D0" />
-        <DList Name="gameplay_keep_DL_013FF0" Offset="0x13FF0" />
-        <DList Name="gameplay_keep_DL_014370" Offset="0x14370" />
-        <Limb Name="gameplay_keep_Lodlimb_014510" Type="LOD" EnumName="ARROW_LIMB_1" Offset="0x14510" />
-        <Limb Name="gameplay_keep_Lodlimb_014520" Type="LOD" EnumName="ARROW_LIMB_2" Offset="0x14520" />
-        <Limb Name="gameplay_keep_Lodlimb_014530" Type="LOD" EnumName="ARROW_LIMB_3" Offset="0x14530" />
-        <Limb Name="gameplay_keep_Lodlimb_014540" Type="LOD" EnumName="ARROW_LIMB_4" Offset="0x14540" />
-        <Skeleton Name="gameplay_keep_Skel_014560" Type="Normal" LimbType="Standard" LimbNone="ARROW_LIMB_NONE" LimbMax="ARROW_LIMB_MAX" EnumName="ArrowLimb" Offset="0x14560" />
-        <Texture Name="gameplay_keep_Tex_014570" OutName="tex_014570" Format="rgba32" Width="16" Height="32" Offset="0x14570" />
-
-        <!-- Bomb -->
-        <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x14D70" />
-        <DList Name="gBombBodyDL" Offset="0x15DB0" />
-        <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x15E40" />
-        <DList Name="gBombCapDL" Offset="0x15FA0" />
-
-        <!-- Bombchu -->
-        <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x16060" />
-        <DList Name="gBombchuDL" Offset="0x16360" />
-        
-        <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x164D0" />
-        <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x16CD0" />
-        <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x174D0" />
-        <Texture Name="gEffBombExplosion4Tex" OutName="eff_bomb_explosion_4" Format="ia16" Width="32" Height="32" Offset="0x17CD0" />
-        <Texture Name="gEffBombExplosion5Tex" OutName="eff_bomb_explosion_5" Format="ia16" Width="32" Height="32" Offset="0x184D0" />
-        <Texture Name="gEffBombExplosion6Tex" OutName="eff_bomb_explosion_6" Format="ia16" Width="32" Height="32" Offset="0x18CD0" />
-        <Texture Name="gEffBombExplosion7Tex" OutName="eff_bomb_explosion_7" Format="ia16" Width="32" Height="32" Offset="0x194D0" />
-        <Texture Name="gEffBombExplosion8Tex" OutName="eff_bomb_explosion_8" Format="ia16" Width="32" Height="32" Offset="0x19CD0" />
-        <DList Name="gEffBombExplosion1DL" Offset="0x1A4D0" />
-        <DList Name="gEffBombExplosion2DL" Offset="0x1A538" />
-        <DList Name="gEffBombExplosion3DL" Offset="0x1A590" />
-        <DList Name="gEffFragments1DL" Offset="0x1A620" />
-        <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0x1A6B0" />
-        <Texture Name="gameplay_keep_Tex_01A8B0" OutName="tex_01A8B0" Format="i8" Width="16" Height="32" Offset="0x1A8B0" />
-        <Texture Name="gameplay_keep_Tex_01AAB0" OutName="tex_01AAB0" Format="i8" Width="16" Height="32" Offset="0x1AAB0" />
-        <DList Name="gameplay_keep_DL_01ACF0" Offset="0x1ACF0" />
-
-        <!-- Human Elegy of Emptiness Shell -->
-        <DList Name="gElegyShellHumanDL" Offset="0x1C430" /> <!-- Original name is "pls_zo_model" -->
-        <Texture Name="gElegyShellHumanMouthTex" OutName="elegy_shell_human_mouth" Format="rgba16" Width="32" Height="32" Offset="0x1CAF8" />
-        <Texture Name="gElegyShellHumanEyeAndNoseTex" OutName="elegy_shell_human_eye_and_nose" Format="rgba16" Width="32" Height="64" Offset="0x1D2F8" />
-        <Texture Name="gElegyShellHumanNostrilsAndSkinTex" OutName="elegy_shell_human_nostrils_and_skin" Format="rgba16" Width="16" Height="8" Offset="0x1E2F8" />
-        <Texture Name="gElegyShellHumanBootsTex" OutName="elegy_shell_human_boots" Format="rgba16" Width="16" Height="16" Offset="0x1E3F8" />
-        <Texture Name="gElegyShellHumanPlatformTex" OutName="elegy_shell_human_platform" Format="rgba16" Width="8" Height="16" Offset="0x1E5F8" />
-        <Texture Name="gElegyShellBeltAndTunicTex" OutName="elegy_shell_human_belt_and_tunic" Format="rgba16" Width="32" Height="16" Offset="0x1E6F8" />
-        <Texture Name="gElegyShellHumanHairTex" OutName="elegy_shell_human_hair" Format="rgba16" Width="16" Height="16" Offset="0x1EAF8" />
-
-        <DList Name="gCompassArrowDL" Offset="0x1ED00" />
-        <DList Name="gameplay_keep_DL_01ED90" Offset="0x1ED90" />
-        <DList Name="gZTargetArrowDL" Offset="0x1F0F0" />
-        <Texture Name="gameplay_keep_Tex_01F200" OutName="tex_01F200" Format="i8" Width="8" Height="8" Offset="0x1F200" />
-        <DList Name="gEffFragments2DL" Offset="0x1F300" />
-        <Texture Name="gameplay_keep_Tex_01F340" OutName="tex_01F340" Format="ia8" Width="32" Height="32" Offset="0x1F340" />
-        <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0x1F740" />
-        <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0x1F7C0" />
-        <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0x1F8C0" />
-
-        <!-- Boulder Fragments -->
-        <DList Name="gBoulderFragmentsDL" Offset="0x1FA40" />
-        <Texture Name="gBoulderFragmentsTex" OutName="boulder_fragments" Format="rgba16" Width="32" Height="32" Offset="0x1FBE0" />
-
-        <Animation Name="gameplay_keep_Anim_0204B4" Offset="0x204B4" />
-        <Animation Name="gameplay_keep_Anim_0205A0" Offset="0x205A0" />
-        <Animation Name="gameplay_keep_Anim_020658" Offset="0x20658" />
-        <DList Name="gameplay_keep_DL_020B30" Offset="0x20B30" />
-        <DList Name="gDoorLeftDL" Offset="0x20BB8" />
-        <DList Name="gDoorRightDL" Offset="0x20D00" />
-        <Texture Name="gameplay_keep_Tex_020E38" OutName="tex_020E38" Format="rgba16" Width="32" Height="64" Offset="0x20E38" />
-        <DList Name="gameplay_keep_DL_0221B8" Offset="0x221B8" />
-        <Texture Name="gameplay_keep_Tex_0222E8" OutName="tex_0222E8" Format="i4" Width="32" Height="64" Offset="0x222E8" />
-        <Texture Name="gameplay_keep_Tex_0226E8" OutName="tex_0226E8" Format="i8" Width="8" Height="128" Offset="0x226E8" />
-        <Limb Name="gameplay_keep_Standardlimb_022AE8" Type="Standard" EnumName="DOOR_LIMB_1" Offset="0x22AE8" />
-        <Limb Name="gameplay_keep_Standardlimb_022AF4" Type="Standard" EnumName="DOOR_LIMB_2" Offset="0x22AF4" />
-        <Limb Name="gameplay_keep_Standardlimb_022B00" Type="Standard" EnumName="DOOR_LIMB_3" Offset="0x22B00" />
-        <Limb Name="gameplay_keep_Standardlimb_022B0C" Type="Standard" EnumName="DOOR_LIMB_4" Offset="0x22B0C" />
-        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" LimbNone="DOOR_LIMB_NONE" LimbMax="DOOR_LIMB_MAX" EnumName="DoorLimb" Offset="0x22B28" />
-        <Animation Name="gameplay_keep_Anim_022BE8" Offset="0x22BE8" />
-        <Animation Name="gameplay_keep_Anim_022CA8" Offset="0x22CA8" />
-        <Animation Name="gameplay_keep_Anim_022D90" Offset="0x22D90" />
-        <Animation Name="gameplay_keep_Anim_022E68" Offset="0x22E68" />
-        <Blob Name="gameplay_keep_zeroes_unk_00022E78" Size="0xA8" Offset="0x22E78" />
-        <Animation Name="gameplay_keep_Anim_022FF0" Offset="0x22FF0" />
-        <Collision Name="gDoorCol" Offset="0x23100" />
-        <DList Name="gEffDustDL" Offset="0x23130" />
-        <DList Name="gEffFlash1DL" Offset="0x23210" />
-        <DList Name="gEffFlash2DL" Offset="0x23288" />
-        <DList Name="gLightOrbMaterial1DL" Offset="0x23348" />
-        <DList Name="gLightOrbMaterial2DL" Offset="0x233B8" />
-        <DList Name="gLightOrbModelDL" Offset="0x23428" />
-        <DList Name="gElectricSparkMaterialDL" Offset="0x23480" />
-        <DList Name="gElectricSparkModelDL" Offset="0x234F0" />
-        <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x23508" />
-
-        <!-- EnMThunder (Spin Attack and Sword Beams) -->
-        <!-- Spin Attack -->
-        <Texture Name="gSpinAttack1Tex" OutName="spin_attack_1" Format="i8" Width="64" Height="32" Offset="0x24510" />
-        <Texture Name="gSpinAttack2Tex" OutName="spin_attack_2" Format="i8" Width="64" Height="32" Offset="0x24D10" />
-        <DList Name="gSpinAttackDiskDL" Offset="0x25850" />
-        <DList Name="gSpinAttackCylinderDL" Offset="0x25970" />
-        <DList Name="gGreatSpinAttackDiskDL" Offset="0x25DD0" />
-        <DList Name="gGreatSpinAttackCylinderDL" Offset="0x25EF0" />
-        <Texture Name="gSpinAttackCharging1Tex" OutName="spin_attack_charging_1" Format="i8" Width="32" Height="32" Offset="0x26010" />
-        <Texture Name="gSpinAttackCharging2Tex" OutName="spin_attack_charging_2" Format="i8" Width="32" Height="32" Offset="0x26410" />
-        <DList Name="gSpinAttackChargingDL" Offset="0x268F0" />
-        <!-- Sword Beam -->
-        <Texture Name="gSwordBeam1Tex" OutName="sword_beam_1" Format="i8" Width="32" Height="64" Offset="0x269E0" />
-        <Texture Name="gSwordBeam2Tex" OutName="sword_beam_2" Format="i8" Width="32" Height="64" Offset="0x271E0" />
-        <DList Name="gSwordBeamDL" Offset="0x27CA0" />
-
-        <KeyFrameAnimation Name="gGameplayKeepKFAnim_281DC" Skel="0x2900C" Offset="0x281DC"/>
-
-        <DList Name="gameplay_keep_DL_0282D0" Offset="0x282D0" />
-        <Texture Name="gameplay_keep_Tex_0283B8" OutName="tex_0283B8" Format="i4" Width="64" Height="64" Offset="0x283B8" />
-        <Texture Name="gameplay_keep_Tex_028BB8" OutName="tex_028BB8" Format="i8" Width="32" Height="32" Offset="0x28BB8" />
-        <TextureAnimation Name="gameplay_keep_Matanimheader_028FEC" Offset="0x28FEC" />
-        <KeyFrameSkel Name="gGameplayKeepKFSkel_2900C" LimbType="Flex" Offset="0x2900C"/>
-        <Animation Name="gameplay_keep_Anim_029140" Offset="0x29140" />
-        <Texture Name="gameplay_keep_Tex_029150" OutName="tex_029150" Format="i8" Width="32" Height="64" Offset="0x29150" />
-        <DList Name="gameplay_keep_DL_029990" Offset="0x29990" />
-        <DList Name="gameplay_keep_DL_029A58" Offset="0x29A58" />
-        <DList Name="gameplay_keep_DL_029B20" Offset="0x29B20" />
-        <DList Name="gameplay_keep_DL_029BE8" Offset="0x29BE8" />
-        <DList Name="gameplay_keep_DL_029CB0" Offset="0x29CB0" />
-        <DList Name="gameplay_keep_DL_029CF0" Offset="0x29CF0" />
-        <DList Name="gameplay_keep_DL_029D10" Offset="0x29D10" /> <!-- Used in ObJ_Kinoko to radiate a purple glow -->
-        <Texture Name="gameplay_keep_Tex_029EF8" OutName="tex_029EF8" Format="rgba16" Width="32" Height="64" Offset="0x29EF8" />
-        <Limb Name="gameplay_keep_Standardlimb_02AEF8" Type="Standard" EnumName="FAIRY_LIMB_1" Offset="0x2AEF8" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF04" Type="Standard" EnumName="FAIRY_LIMB_2" Offset="0x2AF04" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF10" Type="Standard" EnumName="FAIRY_LIMB_3" Offset="0x2AF10" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF1C" Type="Standard" EnumName="FAIRY_LIMB_4" Offset="0x2AF1C" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF28" Type="Standard" EnumName="FAIRY_LIMB_5" Offset="0x2AF28" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF34" Type="Standard" EnumName="FAIRY_LIMB_6" Offset="0x2AF34" />
-        <Skeleton Name="gameplay_keep_Skel_02AF58" Type="Flex" LimbType="Standard" LimbNone="FAIRY_LIMB_NONE" LimbMax="FAIRY_LIMB_MAX" EnumName="FairyLimb" Offset="0x2AF58" />
-        <Animation Name="gameplay_keep_Anim_02B2E8" Offset="0x2B2E8" />
-
-        <!-- Stray Fairy -->
-        <Animation Name="gStrayFairyFlyingAnim" Offset="0x2B494" /> <!-- Original name is "ys_fly01" -->
-        <DList Name="gStrayFairyRightFacingHeadDL" Offset="0x2B6B0" />
-        <DList Name="gStrayFairyLeftFacingHeadDL" Offset="0x2B748" />
-        <DList Name="gStrayFairyGlowDL" Offset="0x2B7E0" />
-        <DList Name="gStrayFairyTorsoDL" Offset="0x2B888" />
-        <DList Name="gStrayFairyLeftArmDL" Offset="0x2B920" />
-        <DList Name="gStrayFairyPelvisAndLegsDL" Offset="0x2B9B8" />
-        <DList Name="gStrayFairyRightArmDL" Offset="0x2BA68" />
-        <DList Name="gStrayFairyRightWingDL" Offset="0x2BB00" />
-        <DList Name="gStrayFairyLeftWingDL" Offset="0x2BB98" />
-        <Texture Name="gStrayFairyRightFacingHeadTex" OutName="stray_fairy_right_facing_head" Format="ia8" Width="32" Height="32" Offset="0x2BC30" />
-        <Texture Name="gStrayFairyBodyTex" OutName="stray_fairy_body" Format="ia8" Width="16" Height="32" Offset="0x2C030" />
-        <Texture Name="gStrayFairyLeftFacingHeadTex" OutName="stray_fairy_left_facing_head" Format="ia8" Width="32" Height="32" Offset="0x2C230" />
-        <Texture Name="gStrayFairyWingTex" OutName="stray_fairy_wing" Format="ia8" Width="16" Height="16" Offset="0x2C630" />
-        <Texture Name="gStrayFairyGlowTex" OutName="stray_fairy_glow" Format="i4" Width="16" Height="16" Offset="0x2C730" />
-        <TextureAnimation Name="gStrayFairyClockTownTexAnim" Offset="0x2C818" />
-        <TextureAnimation Name="gStrayFairySnowheadTexAnim" Offset="0x2C890" />
-        <TextureAnimation Name="gStrayFairyWoodfallTexAnim" Offset="0x2C908" />
-        <TextureAnimation Name="gStrayFairyGreatBayTexAnim" Offset="0x2C980" />
-        <TextureAnimation Name="gStrayFairyStoneTowerTexAnim" Offset="0x2C9F8" />
-        <Limb Name="gStrayFairyRightFacingHeadLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_RIGHT_FACING_HEAD" Offset="0x2CA08" />
-        <Limb Name="gStrayFairyLeftWingLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_LEFT_WING" Offset="0x2CA14" />
-        <Limb Name="gStrayFairyRightWingLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_RIGHT_WING" Offset="0x2CA20" />
-        <Limb Name="gStrayFairyGlowLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_GLOW" Offset="0x2CA2C" />
-        <Limb Name="gStrayFairyTorsoLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_TORSO" Offset="0x2CA38" />
-        <Limb Name="gStrayFairyRightArmLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_RIGHT_ARM" Offset="0x2CA44" />
-        <Limb Name="gStrayFairyPelvisAndLegsLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_PELVIS_AND_LEGS" Offset="0x2CA50" />
-        <Limb Name="gStrayFairyLeftArmLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_LEFT_ARM" Offset="0x2CA5C" />
-        <Limb Name="gStrayFairyLeftFacingHeadLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_LEFT_FACING_HEAD" Offset="0x2CA68" />
-        <Skeleton Name="gStrayFairySkel" Type="Flex" LimbType="Standard" LimbNone="STRAY_FAIRY_LIMB_NONE" LimbMax="STRAY_FAIRY_LIMB_MAX" EnumName="StrayFairyLimb" Offset="0x2CA98" />
-
-        <Texture Name="gameplay_keep_Tex_02CAB0" OutName="tex_02CAB0" Format="i4" Width="16" Height="16" Offset="0x2CAB0" />
-        <Texture Name="gameplay_keep_Tex_02CB30" OutName="tex_02CB30" Format="i8" Width="16" Height="16" Offset="0x2CB30" />
-        <Texture Name="gameplay_keep_Tex_02CC30" OutName="tex_02CC30" Format="rgba16" Width="32" Height="32" Offset="0x2CC30" />
-        <Texture Name="gameplay_keep_Tex_02D430" OutName="tex_02D430" Format="i8" Width="32" Height="64" Offset="0x2D430" />
-        <Texture Name="gameplay_keep_Tex_02DC30" OutName="tex_02DC30" Format="i8" Width="32" Height="64" Offset="0x2DC30" />
-        <DList Name="gameplay_keep_DL_02E510" Offset="0x2E510" />
-        <Animation Name="gameplay_keep_Anim_02E65C" Offset="0x2E65C" />
-        <DList Name="gameplay_keep_DL_02E910" Offset="0x2E910" />
-        <DList Name="gameplay_keep_DL_02E9A8" Offset="0x2E9A8" />
-        <DList Name="gameplay_keep_DL_02EAB8" Offset="0x2EAB8" />
-        <Texture Name="gameplay_keep_Tex_02EBC8" OutName="tex_02EBC8" Format="rgba16" Width="16" Height="16" Offset="0x2EBC8" />
-        <Texture Name="gameplay_keep_Tex_02EDC8" OutName="tex_02EDC8" Format="rgba16" Width="32" Height="8" Offset="0x2EDC8" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFC8" Type="Standard" EnumName="FISH_LIMB_1" Offset="0x2EFC8" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFD4" Type="Standard" EnumName="FISH_LIMB_2" Offset="0x2EFD4" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFE0" Type="Standard" EnumName="FISH_LIMB_3" Offset="0x2EFE0" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFEC" Type="Standard" EnumName="FISH_LIMB_4" Offset="0x2EFEC" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFF8" Type="Standard" EnumName="FISH_LIMB_5" Offset="0x2EFF8" />
-        <Limb Name="gameplay_keep_Standardlimb_02F004" Type="Standard" EnumName="FISH_LIMB_6" Offset="0x2F004" />
-        <Skeleton Name="gameplay_keep_Skel_02F028" Type="Flex" LimbType="Standard" LimbNone="FISH_LIMB_NONE" LimbMax="FISH_LIMB_MAX" EnumName="FishLimb" Offset="0x2F028" />
-        <Animation Name="gameplay_keep_Anim_02F0EC" Offset="0x2F0EC" />
-        <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x2F100" />
-
-        <DList Name="gEffShockwaveDL" Offset="0x30100" />
-        <Array Name="gEffShockwaveVtx" Count="4" Offset="0x30170">
-            <Vtx/>
-        </Array>
-        <DList Name="gEffBubbleDL" Offset="0x301B0" />
-
-        <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x30270" />
-        <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x30670" />
-        <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x30A70" />
-        <Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x30E70" />
-        <Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x31270" />
-        <Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x31670" />
-        <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x31A70" />
-        <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x31E70" />
-        <DList Name="gEffFireFootprintDL" Offset="0x32270" />
-        <Texture Name="gameplay_keep_Tex_032310" OutName="tex_032310" Format="rgba32" Width="16" Height="64" Offset="0x32310" />
-        <Texture Name="gEffHitmarkWhiteMetal1Tex" OutName="eff_hitmark_white_metal_1" Format="i4" Width="32" Height="24" Offset="0x33310" />
-        <Texture Name="gEffHitmarkWhiteMetal2Tex" OutName="eff_hitmark_white_metal_2" Format="i4" Width="32" Height="24" Offset="0x33490" />
-        <Texture Name="gEffHitmarkWhiteMetal3Tex" OutName="eff_hitmark_white_metal_3" Format="i4" Width="32" Height="24" Offset="0x33610" />
-        <Texture Name="gEffHitmarkWhiteMetal4Tex" OutName="eff_hitmark_white_metal_4" Format="i4" Width="32" Height="24" Offset="0x33790" />
-        <Texture Name="gEffHitmarkWhiteMetal5Tex" OutName="eff_hitmark_white_metal_5" Format="i4" Width="32" Height="24" Offset="0x33910" />
-        <Texture Name="gEffHitmarkWhiteMetal6Tex" OutName="eff_hitmark_white_metal_6" Format="i4" Width="32" Height="24" Offset="0x33A90" />
-        <Texture Name="gEffHitmarkWhiteMetal7Tex" OutName="eff_hitmark_white_metal_7" Format="i4" Width="32" Height="24" Offset="0x33C10" />
-        <Texture Name="gEffHitmarkWhiteMetal8Tex" OutName="eff_hitmark_white_metal_8" Format="i4" Width="32" Height="24" Offset="0x33D90" />
-        <Texture Name="gEffHitmarkDust1Tex" OutName="eff_hitmark_dust_1" Format="i4" Width="32" Height="24" Offset="0x33F10" />
-        <Texture Name="gEffHitmarkDust2Tex" OutName="eff_hitmark_dust_2" Format="i4" Width="32" Height="24" Offset="0x34090" />
-        <Texture Name="gEffHitmarkDust3Tex" OutName="eff_hitmark_dust_3" Format="i4" Width="32" Height="24" Offset="0x34210" />
-        <Texture Name="gEffHitmarkDust4Tex" OutName="eff_hitmark_dust_4" Format="i4" Width="32" Height="24" Offset="0x34390" />
-        <Texture Name="gEffHitmarkDust5Tex" OutName="eff_hitmark_dust_5" Format="i4" Width="32" Height="24" Offset="0x34510" />
-        <Texture Name="gEffHitmarkDust6Tex" OutName="eff_hitmark_dust_6" Format="i4" Width="32" Height="24" Offset="0x34690" />
-        <Texture Name="gEffHitmarkDust7Tex" OutName="eff_hitmark_dust_7" Format="i4" Width="32" Height="24" Offset="0x34810" />
-        <Texture Name="gEffHitmarkDust8Tex" OutName="eff_hitmark_dust_8" Format="i4" Width="32" Height="24" Offset="0x34990" />
-        <Texture Name="gEffHitmarkRed1Tex" OutName="eff_hitmark_red_1" Format="i4" Width="32" Height="24" Offset="0x34B10" />
-        <Texture Name="gEffHitmarkRed2Tex" OutName="eff_hitmark_red_2" Format="i4" Width="32" Height="24" Offset="0x34C90" />
-        <Texture Name="gEffHitmarkRed3Tex" OutName="eff_hitmark_red_3" Format="i4" Width="32" Height="24" Offset="0x34E10" />
-        <Texture Name="gEffHitmarkRed4Tex" OutName="eff_hitmark_red_4" Format="i4" Width="32" Height="24" Offset="0x34F90" />
-        <Texture Name="gEffHitmarkRed5Tex" OutName="eff_hitmark_red_5" Format="i4" Width="32" Height="24" Offset="0x35110" />
-        <Texture Name="gEffHitmarkRed6Tex" OutName="eff_hitmark_red_6" Format="i4" Width="32" Height="24" Offset="0x35290" />
-        <Texture Name="gEffHitmarkRed7Tex" OutName="eff_hitmark_red_7" Format="i4" Width="32" Height="24" Offset="0x35410" />
-        <Texture Name="gEffHitmarkRed8Tex" OutName="eff_hitmark_red_8" Format="i4" Width="32" Height="24" Offset="0x35590" />
-        <DList Name="gEffHitmarkDL" Offset="0x35710" />
-        <Texture Name="gameplay_keep_Tex_0357B0" OutName="tex_0357B0" Format="ia8" Width="32" Height="64" Offset="0x357B0" />
-        <Texture Name="gameplay_keep_Tex_035FB0" OutName="tex_035FB0" Format="ia8" Width="32" Height="64" Offset="0x35FB0" />
-        <Texture Name="gEffWaterRippleTex" OutName="eff_water_ripple" Format="i8" Width="64" Height="64" Offset="0x367B0" />
-        <DList Name="gEffWaterRippleDL" Offset="0x377B0" />
-        <DList Name="gEffSparkDL" Offset="0x37850" />
-        <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x378F0" />
-        <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x37DF0" />
-        <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x382F0" />
-        <Texture Name="gEffWaterSplash4Tex" OutName="eff_water_splash_4" Format="i8" Width="32" Height="40" Offset="0x387F0" />
-        <Texture Name="gEffWaterSplash5Tex" OutName="eff_water_splash_5" Format="i8" Width="32" Height="40" Offset="0x38CF0" />
-        <Texture Name="gEffWaterSplash6Tex" OutName="eff_water_splash_6" Format="i8" Width="32" Height="40" Offset="0x391F0" />
-        <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x396F0" />
-        <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x39BF0" />
-        <DList Name="gEffWaterSplashDL" Offset="0x3A0F0" />
-        <Texture Name="gEffStone1Tex" OutName="eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x3A190" />
-        <Texture Name="gEffStone2Tex" OutName="eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x3A590" />
-        <Texture Name="gEffStone3Tex" OutName="eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x3A990" />
-        <Texture Name="gEffStone4Tex" OutName="eff_stone_4" Format="ia8" Width="32" Height="32" Offset="0x3AD90" />
-        <Texture Name="gEffStone5Tex" OutName="eff_stone_5" Format="ia8" Width="32" Height="32" Offset="0x3B190" />
-        <Texture Name="gEffStone6Tex" OutName="eff_stone_6" Format="ia8" Width="32" Height="32" Offset="0x3B590" />
-        <Texture Name="gEffStone7Tex" OutName="eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x3B990" />
-        <Texture Name="gEffStone8Tex" OutName="eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x3BD90" />
-        <DList Name="gEffStoneDL" Offset="0x3C190" />
-        <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i4" Width="32" Height="96" Offset="0x3C230" />
-        <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i4" Width="32" Height="96" Offset="0x3C830" />
-        <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i4" Width="32" Height="96" Offset="0x3CE30" />
-        <Texture Name="gEffLightning4Tex" OutName="eff_lightning_4" Format="i4" Width="32" Height="96" Offset="0x3D430" />
-        <Texture Name="gEffLightning5Tex" OutName="eff_lightning_5" Format="i4" Width="32" Height="96" Offset="0x3DA30" />
-        <Texture Name="gEffLightning6Tex" OutName="eff_lightning_6" Format="i4" Width="32" Height="96" Offset="0x3E030" />
-        <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i4" Width="32" Height="96" Offset="0x3E630" />
-        <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i4" Width="32" Height="96" Offset="0x3EC30" />
-        <DList Name="gEffLightningDL" Offset="0x3F230" />
-        <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x3F300" />
-        <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x3FB00" />
-        <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x40300" />
-        <Texture Name="gEffEnemyDeathFlame4Tex" OutName="eff_enemy_death_flame_4" Format="i8" Width="32" Height="64" Offset="0x40B00" />
-        <Texture Name="gEffEnemyDeathFlame5Tex" OutName="eff_enemy_death_flame_5" Format="i8" Width="32" Height="64" Offset="0x41300" />
-        <Texture Name="gEffEnemyDeathFlame6Tex" OutName="eff_enemy_death_flame_6" Format="i8" Width="32" Height="64" Offset="0x41B00" />
-        <Texture Name="gEffEnemyDeathFlame7Tex" OutName="eff_enemy_death_flame_7" Format="i8" Width="32" Height="64" Offset="0x42300" />
-        <Texture Name="gEffEnemyDeathFlame8Tex" OutName="eff_enemy_death_flame_8" Format="i8" Width="32" Height="64" Offset="0x42B00" />
-        <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x43300" />
-        <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x43B00" />
-        <DList Name="gEffEnemyDeathFlameDL" Offset="0x44300" />
-        <Texture Name="gameplay_keep_Tex_0443B0" OutName="tex_0443B0" Format="i8" Width="32" Height="32" Offset="0x443B0" />
-        <Texture Name="gameplay_keep_Tex_0447B0" OutName="tex_0447B0" Format="i8" Width="32" Height="32" Offset="0x447B0" />
-        <Texture Name="gameplay_keep_Tex_044BB0" OutName="tex_044BB0" Format="i8" Width="32" Height="32" Offset="0x44BB0" />
-        <Texture Name="gEffIceFragmentTex" OutName="eff_ice_fragment" Format="i8" Width="32" Height="32" Offset="0x44FB0" />
-        <Texture Name="gameplay_keep_Tex_0453B0" OutName="tex_0453B0" Format="i8" Width="32" Height="32" Offset="0x453B0" />
-
-        <!-- Goron Elegy of Emptiness Shell -->
-        <DList Name="gElegyShellGoronDL" Offset="0x48DF0" /> <!-- Original name is "pgs_zo_model" -->
-        <Texture Name="gElegyShellGoronTLUT" OutName="elegy_shell_goron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4A460" />
-        <Texture Name="gElegyShellGoronSkinTex" OutName="elegy_shell_goron_skin" Format="ci8" Width="16" Height="16" Offset="0x4A660" />
-        <Texture Name="gElegyShellGoronHairTex" OutName="elegy_shell_goron_hair" Format="ci8" Width="16" Height="32" Offset="0x4A760" />
-        <Texture Name="gElegyShellGoronSideburnsAndBeardTex" OutName="elegy_shell_goron_sideburns_and_beard" Format="ci8" Width="16" Height="16" Offset="0x4A960" />
-        <Texture Name="gElegyShellGoronNostrilTex" OutName="elegy_shell_goron_nostril" Format="ci8" Width="8" Height="8" Offset="0x4AA60" />
-        <Texture Name="gElegyShellGoronLipsTex" OutName="elegy_shell_goron_lips" Format="ci8" Width="8" Height="8" Offset="0x4AAA0" />
-        <Texture Name="gElegyShellGoronGlovePalmTex" OutName="elegy_shell_goron_glove_palm" Format="ci8" Width="16" Height="16" Offset="0x4AAE0" />
-        <Texture Name="gElegyShellGoronGloveBackTex" OutName="elegy_shell_goron_glove_back" Format="ci8" Width="8" Height="16" Offset="0x4ABE0" />
-        <Texture Name="gElegyShellGoronFingerAndToeTex" OutName="elegy_shell_goron_finger_and_toe" Format="ci8" Width="8" Height="16" Offset="0x4AC60" />
-        <Texture Name="gElegyShellGoronSandalTopAndSideTex" OutName="elegy_shell_goron_sandal_top_and_side" Format="ci8" Width="8" Height="8" Offset="0x4ACE0" />
-        <Texture Name="gElegyShellGoronChestTex" OutName="elegy_shell_goron_chest" Format="ci8" Width="32" Height="32" Offset="0x4AD20" />
-        <Texture Name="gElegyShellGoronBackTex" OutName="elegy_shell_goron_back" Format="ci8" Width="32" Height="64" Offset="0x4B120" />
-        <Texture Name="gElegyShellGoronGoronsRubyTattooTex" OutName="elegy_shell_goron_gorons_ruby_tattoo" Format="ci8" Width="32" Height="64" Offset="0x4B920" />
-        <Texture Name="gElegyShellGoronTribalTattooTex" OutName="elegy_shell_goron_tribal_tattoo" Format="ci8" Width="32" Height="64" Offset="0x4C120" />
-        <Texture Name="gElegyShellGoronLoinclothTex" OutName="elegy_shell_goron_loincloth" Format="ci8" Width="8" Height="16" Offset="0x4C920" />
-        <Texture Name="gElegyShellGoronEyeTex" OutName="elegy_shell_goron_eye" Format="ci8" Width="32" Height="32" Offset="0x4C9A0" />
-        <Texture Name="gElegyShellGoronScarTex" OutName="elegy_shell_goron_scar" Format="rgba16" Width="32" Height="64" Offset="0x4CDA0" />
-        <Texture Name="gElegyShellGoronNecklaceTex" OutName="elegy_shell_goron_necklace" Format="i8" Width="32" Height="32" Offset="0x4DDA0" />
-        <Texture Name="gElegyShellGoronPlatformTex" OutName="elegy_shell_goron_platform" Format="ci8" Width="8" Height="16" Offset="0x4E1A0" />
-
-        <Texture Name="gHookshotReticleTex" OutName="tex_04E220" Format="i8" Width="64" Height="64" Offset="0x4E220" />
-        <DList Name="gHookshotReticleDL" Offset="0x4F250" /> <!-- Original name might be "pointer_modelT" -->
-        <Texture Name="gameplay_keep_Tex_04F2C0" OutName="tex_04F2C0" Format="ia16" Width="32" Height="64" Offset="0x4F2C0" />
-        <DList Name="gEffIceFragment1DL" Offset="0x50550" />
-        <DList Name="gEffIceFragment2MaterialDL" Offset="0x50648" />
-        <DList Name="gEffIceFragment2ModelDL" Offset="0x506E0" />
-        <DList Name="gEffIceFragment3DL" Offset="0x50D10" />
-        <Texture Name="gEffIceSmokeTex" OutName="eff_ice_smoke" Format="i4" Width="32" Height="32" Offset="0x50E80" />
-        <DList Name="gEffIceSmokeDL" Offset="0x510B0" />
-        <DList Name="gFrozenSteamMaterialDL" Offset="0x51180" />
-        <DList Name="gFrozenSteamModelDL" Offset="0x51238" />
-        <Animation Name="gameplay_keep_Anim_05140C" Offset="0x5140C" />
-        <DList Name="gameplay_keep_DL_051420" Offset="0x51420" />
-        <DList Name="gameplay_keep_DL_0514C0" Offset="0x514C0" />
-        <DList Name="gameplay_keep_DL_0514D0" Offset="0x514D0" />
-        <DList Name="gameplay_keep_DL_051510" Offset="0x51510" />
-        <DList Name="gameplay_keep_DL_0515B0" Offset="0x515B0" />
-        <DList Name="gameplay_keep_DL_0515C0" Offset="0x515C0" />
-        <DList Name="gameplay_keep_DL_051600" Offset="0x51600" />
-        <DList Name="gameplay_keep_DL_0516A0" Offset="0x516A0" />
-        <DList Name="gameplay_keep_DL_0516B0" Offset="0x516B0" />
-        <DList Name="gameplay_keep_DL_0516F0" Offset="0x516F0" />
-        <DList Name="gameplay_keep_DL_051790" Offset="0x51790" />
-        <DList Name="gameplay_keep_DL_0517A0" Offset="0x517A0" />
-        <DList Name="gameplay_keep_DL_0517E0" Offset="0x517E0" />
-        <DList Name="gameplay_keep_DL_051880" Offset="0x51880" />
-        <DList Name="gameplay_keep_DL_051890" Offset="0x51890" />
-        <DList Name="gameplay_keep_DL_0518D0" Offset="0x518D0" />
-        <DList Name="gameplay_keep_DL_051970" Offset="0x51970" />
-        <DList Name="gameplay_keep_DL_051980" Offset="0x51980" />
-        <DList Name="gameplay_keep_DL_0519C0" Offset="0x519C0" />
-        <DList Name="gameplay_keep_DL_051A60" Offset="0x51A60" />
-        <DList Name="gameplay_keep_DL_051A70" Offset="0x51A70" />
-        <DList Name="gameplay_keep_DL_051AB0" Offset="0x51AB0" />
-        <DList Name="gameplay_keep_DL_051B50" Offset="0x51B50" />
-        <DList Name="gameplay_keep_DL_051B60" Offset="0x51B60" />
-        <DList Name="gameplay_keep_DL_051BA0" Offset="0x51BA0" />
-        <DList Name="gameplay_keep_DL_051C50" Offset="0x51C50" />
-        <DList Name="gameplay_keep_DL_051C60" Offset="0x51C60" />
-        <Texture Name="gameplay_keep_Tex_051D30" OutName="tex_051D30" Format="rgba16" Width="16" Height="64" Offset="0x51D30" />
-        <Texture Name="gameplay_keep_Tex_052530" OutName="tex_052530" Format="rgba16" Width="8" Height="16" Offset="0x52530" />
-        <Limb Name="gameplay_keep_Standardlimb_052630" Type="Standard" EnumName="BUG_LIMB_01" Offset="0x52630" />
-        <Limb Name="gameplay_keep_Standardlimb_05263C" Type="Standard" EnumName="BUG_LIMB_02" Offset="0x5263C" />
-        <Limb Name="gameplay_keep_Standardlimb_052648" Type="Standard" EnumName="BUG_LIMB_03" Offset="0x52648" />
-        <Limb Name="gameplay_keep_Standardlimb_052654" Type="Standard" EnumName="BUG_LIMB_04" Offset="0x52654" />
-        <Limb Name="gameplay_keep_Standardlimb_052660" Type="Standard" EnumName="BUG_LIMB_05" Offset="0x52660" />
-        <Limb Name="gameplay_keep_Standardlimb_05266C" Type="Standard" EnumName="BUG_LIMB_06" Offset="0x5266C" />
-        <Limb Name="gameplay_keep_Standardlimb_052678" Type="Standard" EnumName="BUG_LIMB_07" Offset="0x52678" />
-        <Limb Name="gameplay_keep_Standardlimb_052684" Type="Standard" EnumName="BUG_LIMB_08" Offset="0x52684" />
-        <Limb Name="gameplay_keep_Standardlimb_052690" Type="Standard" EnumName="BUG_LIMB_09" Offset="0x52690" />
-        <Limb Name="gameplay_keep_Standardlimb_05269C" Type="Standard" EnumName="BUG_LIMB_0A" Offset="0x5269C" />
-        <Limb Name="gameplay_keep_Standardlimb_0526A8" Type="Standard" EnumName="BUG_LIMB_0B" Offset="0x526A8" />
-        <Limb Name="gameplay_keep_Standardlimb_0526B4" Type="Standard" EnumName="BUG_LIMB_0C" Offset="0x526B4" />
-        <Limb Name="gameplay_keep_Standardlimb_0526C0" Type="Standard" EnumName="BUG_LIMB_0D" Offset="0x526C0" />
-        <Limb Name="gameplay_keep_Standardlimb_0526CC" Type="Standard" EnumName="BUG_LIMB_0E" Offset="0x526CC" />
-        <Limb Name="gameplay_keep_Standardlimb_0526D8" Type="Standard" EnumName="BUG_LIMB_0F" Offset="0x526D8" />
-        <Limb Name="gameplay_keep_Standardlimb_0526E4" Type="Standard" EnumName="BUG_LIMB_10" Offset="0x526E4" />
-        <Limb Name="gameplay_keep_Standardlimb_0526F0" Type="Standard" EnumName="BUG_LIMB_11" Offset="0x526F0" />
-        <Limb Name="gameplay_keep_Standardlimb_0526FC" Type="Standard" EnumName="BUG_LIMB_12" Offset="0x526FC" />
-        <Limb Name="gameplay_keep_Standardlimb_052708" Type="Standard" EnumName="BUG_LIMB_13" Offset="0x52708" />
-        <Limb Name="gameplay_keep_Standardlimb_052714" Type="Standard" EnumName="BUG_LIMB_14" Offset="0x52714" />
-        <Limb Name="gameplay_keep_Standardlimb_052720" Type="Standard" EnumName="BUG_LIMB_15" Offset="0x52720" />
-        <Limb Name="gameplay_keep_Standardlimb_05272C" Type="Standard" EnumName="BUG_LIMB_16" Offset="0x5272C" />
-        <Limb Name="gameplay_keep_Standardlimb_052738" Type="Standard" EnumName="BUG_LIMB_17" Offset="0x52738" />
-        <Skeleton Name="gameplay_keep_Skel_0527A0" Type="Normal" LimbType="Standard" LimbNone="BUG_LIMB_NONE" LimbMax="BUG_LIMB_MAX" EnumName="BugLimb" Offset="0x527A0" />
-        <DList Name="gKakeraLeafMiddleDL" Offset="0x527F0" />
-        <DList Name="gKakeraLeafTipDL" Offset="0x528B0" />
-        <Texture Name="gameplay_keep_Tex_052940" OutName="tex_052940" Format="rgba16" Width="32" Height="32" Offset="0x52940" />
-        <Texture Name="gameplay_keep_Tex_053140" OutName="tex_053140" Format="rgba16" Width="32" Height="32" Offset="0x53140" />
-        <Texture Name="gameplay_keep_Tex_053940" OutName="tex_053940" Format="i4" Width="64" Height="64" Offset="0x53940" />
-        <Texture Name="gameplay_keep_Tex_054140" OutName="tex_054140" Format="i4" Width="64" Height="64" Offset="0x54140" />
-        <DList Name="gLensFlareCircleDL" Offset="0x54940" />
-        <DList Name="gLensFlareRingDL" Offset="0x549A8" />
-        <DList Name="gEffSparklesDL" Offset="0x54A90" />
-        <Texture Name="gameplay_keep_Tex_054AF0" OutName="tex_054AF0" Format="i4" Width="16" Height="16" Offset="0x54AF0" />
-        <DList Name="gameplay_keep_DL_054C90" Offset="0x54C90" />
-        <Texture Name="gameplay_keep_Tex_054D90" OutName="tex_054D90" Format="i4" Width="16" Height="16" Offset="0x54D90" />
-        <Texture Name="gameplay_keep_Tex_054E10" OutName="tex_054E10" Format="i8" Width="16" Height="16" Offset="0x54E10" />
-
-        <TextureAnimation Name="gameplay_keep_Matanimheader_054F18" Offset="0x54F18" />
-
-        <Texture Name="gameplay_keep_Tex_054F20" OutName="tex_054F20" Format="i8" Width="32" Height="32" Offset="0x54F20" />
-        <DList Name="gameplay_keep_DL_055360" Offset="0x55360" />
-        <DList Name="gameplay_keep_DL_055620" Offset="0x55620" />
-        <DList Name="gameplay_keep_DL_055628" Offset="0x55628" />
-        <Texture Name="gameplay_keep_Tex_0557F0" OutName="tex_0557F0" Format="rgba16" Width="32" Height="32" Offset="0x557F0" />
-        <Texture Name="gameplay_keep_Tex_055FF0" OutName="tex_055FF0" Format="i4" Width="64" Height="64" Offset="0x55FF0" />
-
-        <!-- Deku Elegy of Emptiness Shell -->
-        <DList Name="gElegyShellDekuDL" Offset="0x57B10" /> <!-- Original name is "pns_zo_model" -->
-        <Texture Name="gElegyShellDekuPlatformTex" OutName="elegy_shell_deku_platform" Format="rgba16" Width="8" Height="16" Offset="0x57FE8" />
-        <Texture Name="gElegyShellDekuSkinTex" OutName="elegy_shell_deku_skin" Format="rgba16" Width="16" Height="16" Offset="0x580E8" />
-        <Texture Name="gElegyShellDekuLeafTex" OutName="elegy_shell_deku_leaf" Format="rgba16" Width="32" Height="32" Offset="0x582E8" />
-        <Texture Name="gElegyShellDekuEyeTex" OutName="elegy_shell_deku_eye" Format="rgba16" Width="8" Height="8" Offset="0x58AE8" />
-
-        <DList Name="gameplay_keep_DL_058BA0" Offset="0x58BA0" />
-        <Texture Name="gameplay_keep_Tex_058C30" OutName="tex_058C30" Format="rgba16" Width="16" Height="16" Offset="0x58C30" />
-        <Collision Name="gameplay_keep_Colheader_058F30" Offset="0x58F30" />
-        <DList Name="gameplay_keep_DL_0590E0" Offset="0x590E0" />
-        <DList Name="gameplay_keep_DL_059310" Offset="0x59310" />
-        <Collision Name="gameplay_keep_Colheader_0594C8" Offset="0x594C8" />
-        <DList Name="gameplay_keep_DL_059680" Offset="0x59680" />
-        <Collision Name="gameplay_keep_Colheader_059840" Offset="0x59840" />
-        <DList Name="gameplay_keep_DL_0599F0" Offset="0x599F0" />
-        <Collision Name="gameplay_keep_Colheader_059BA0" Offset="0x59BA0" />
-        <DList Name="gameplay_keep_DL_059D50" Offset="0x59D50" />
-        <Collision Name="gameplay_keep_Colheader_059F00" Offset="0x59F00" />
-        <DList Name="gameplay_keep_DL_05A0B0" Offset="0x5A0B0" />
-        <Collision Name="gameplay_keep_Colheader_05A270" Offset="0x5A270" />
-        <DList Name="gameplay_keep_DL_05A430" Offset="0x5A430" />
-        <DList Name="gameplay_keep_DL_05A600" Offset="0x5A600" />
-
-        <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x5A6B0" />
-        <DList Name="gHeartPieceInteriorDL" Offset="0x5AAB0" />
-        <DList Name="gSignRectangularDL" Offset="0x5AED0" />
-        <DList Name="gSignDirectionalDL" Offset="0x5B430" />
-
-        <!-- Item Drops -->
-        <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x5B6F0" />
-        <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x5BEF0" />
-        <Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x5C6F0" />
-        <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x5CEF0" />
-        <Texture Name="gDropBombchuTex" OutName="drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x5D6F0" />
-        <Texture Name="gDropUnknownPouchTex" OutName="drop_unknown_pouch" Format="rgba16" Width="32" Height="32" Offset="0x5DEF0" />
-        <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x5E6F0" />
-        <Texture Name="gDropHeartPieceTex" OutName="drop_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x5EEF0" />
-        <DList Name="gItemDropDL" Offset="0x5F6F0" />
-        <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x5F7C0" />
-        <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x5FFC0" />
-        <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x607C0" />
-        <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x60FC0" />
-        <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x617C0" />
-        
-        <!-- Rupees -->
-        <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x61FC0" />
-        <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x61FE0" />
-        <Texture Name="gRupeeRedTex" OutName="rupee_red" Format="rgba16" Width="4" Height="4" Offset="0x62000" />
-        <Texture Name="gRupeePurpleTex" OutName="rupee_purple" Format="rgba16" Width="4" Height="4" Offset="0x62020" />
-        <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x62040" />
-        <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x62060" />
-        <DList Name="gRupeeDL" Offset="0x622C0" />
-
-        <Texture Name="gRecoveryHeartTex" OutName="recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x62390" />
-        <Texture Name="gBombTex" OutName="bomb" Format="rgba16" Width="32" Height="32" Offset="0x62B90" />
-        <Texture Name="gArrowTex" OutName="arrow" Format="rgba16" Width="32" Height="32" Offset="0x63390" />
-        <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x63B90" />
-        <Texture Name="gRupeeLightBlueTex" OutName="rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x63BB0" />
-        <Texture Name="gHeartContainerTex" OutName="heart_container" Format="rgba16" Width="32" Height="32" Offset="0x63BD0" />
-        
-        <Texture Name="gameplay_keep_Tex_0643D0" OutName="tex_0643D0" Format="rgba16" Width="32" Height="32" Offset="0x643D0" />
-        <Texture Name="gameplay_keep_Tex_064BD0" OutName="tex_064BD0" Format="rgba16" Width="32" Height="32" Offset="0x64BD0" />
-        <Texture Name="gameplay_keep_Tex_0653D0" OutName="tex_0653D0" Format="rgba16" Width="32" Height="32" Offset="0x653D0" />
-        <Texture Name="gameplay_keep_Tex_065BD0" OutName="tex_065BD0" Format="rgba16" Width="32" Height="32" Offset="0x65BD0" />
-        <Texture Name="gameplay_keep_Tex_0663D0" OutName="tex_0663D0" Format="rgba16" Width="32" Height="32" Offset="0x663D0" />
-        <Texture Name="gameplay_keep_Tex_066BD0" OutName="tex_066BD0" Format="rgba16" Width="64" Height="32" Offset="0x66BD0" />
-        <Texture Name="gameplay_keep_Tex_067BD0" OutName="tex_067BD0" Format="rgba16" Width="32" Height="32" Offset="0x67BD0" />
-        <Texture Name="gameplay_keep_Tex_0683D0" OutName="tex_0683D0" Format="rgba16" Width="32" Height="32" Offset="0x683D0" />
-
-        <Texture Name="gSignRectangularSideTex" OutName="sign_rectangular_side" Format="rgba16" Width="32" Height="16" Offset="0x68BD0" />
-        <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x68FD0" />
-        <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x693D0" />
-        <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x697D0" />
-
-        <DList Name="gameplay_keep_DL_06A800" Offset="0x6A800" />
-        <Texture Name="gameplay_keep_Tex_06A880" OutName="tex_06A880" Format="i8" Width="16" Height="16" Offset="0x6A880" />
-        <DList Name="gameplay_keep_DL_06AB30" Offset="0x6AB30" />
-        <Texture Name="gameplay_keep_Tex_06ABF8" OutName="tex_06ABF8" Format="rgba16" Width="36" Height="36" Offset="0x6ABF8" />
-        <TextureAnimation Name="gameplay_keep_Matanimheader_06B6A0" Offset="0x6B6A0" />
-        <TextureAnimation Name="gameplay_keep_Matanimheader_06B730" Offset="0x6B730" />
-
-        <KeyFrameAnimation Name="gGameplayKeepKFAnim_6BB0C" Skel="0x6EB70" Offset="0x6BB0C"/>
-
-        <DList Name="gameplay_keep_DL_06BFE0" Offset="0x6BFE0" />
-        <DList Name="gameplay_keep_DL_06C098" Offset="0x6C098" />
-        <DList Name="gameplay_keep_DL_06C1E8" Offset="0x6C1E8" />
-        <Texture Name="gameplay_keep_Tex_06C350" OutName="tex_06C350" Format="i4" Width="64" Height="64" Offset="0x6C350" />
-        <Texture Name="gameplay_keep_Tex_06CB50" OutName="tex_06CB50" Format="i4" Width="64" Height="64" Offset="0x6CB50" />
-        <Texture Name="gameplay_keep_Tex_06D350" OutName="tex_06D350" Format="i4" Width="64" Height="64" Offset="0x6D350" />
-        <Texture Name="gameplay_keep_Tex_06DB50" OutName="tex_06DB50" Format="i4" Width="64" Height="64" Offset="0x6DB50" />
-        <Texture Name="gameplay_keep_Tex_06E350" OutName="tex_06E350" Format="i4" Width="64" Height="64" Offset="0x6E350" />
-        
-        <KeyFrameSkel Name="gGameplayKeepKFSkel_6EB70" LimbType="Flex" Offset="0x6EB70"/>
-
-        <Texture Name="gameplay_keep_Tex_06EB80" OutName="tex_06EB80" Format="i4" Width="64" Height="64" Offset="0x6EB80" />
-        <DList Name="gameplay_keep_DL_06F380" Offset="0x6F380" />
-        <DList Name="gameplay_keep_DL_06F9F0" Offset="0x6F9F0" />
-        <DList Name="gameplay_keep_DL_06FAE0" Offset="0x6FAE0" />
-        <DList Name="gameplay_keep_DL_06FE20" Offset="0x6FE20" />
-        <DList Name="gameplay_keep_DL_06FF68" Offset="0x6FF68" />
-        <Texture Name="gameplay_keep_Tex_0700B0" OutName="tex_0700B0" Format="rgba16" Width="16" Height="32" Offset="0x700B0" />
-        <Texture Name="gameplay_keep_Tex_0704B0" OutName="tex_0704B0" Format="rgba16" Width="16" Height="16" Offset="0x704B0" />
-        <DList Name="gFallingRainDropDL" Offset="0x706E0" />
-
-        <!-- Popped Deku Bubbles (EffSsSbn) -->
-
-        <!-- Static Popped Bubbles, can't swap out textures (unused) -->
-        <DList Name="gEffPoppedDekuBubbleStaticDL" Offset="0x70730" />
-        <Texture Name="gEffPoppedDekuBubbleStaticMaskTex" OutName="eff_popped_deku_bubble_static_mask" Format="i4" Width="32" Height="32" Offset="0x707F0" />
-        <Texture Name="gEffPoppedDekuBubbleStaticTex" OutName="eff_popped_deku_bubble_static" Format="i4" Width="64" Height="64" Offset="0x709F0" />
-        <TextureAnimation Name="gEffPoppedDekuBubbleStaticTexAnim" Offset="0x711F8" />
-
-        <!-- Sliding Popped Deku Bubbles -->
-        <DList Name="gEffPoppedDekuBubbleSlidingDL" Offset="0x71230" />
-        <TextureAnimation Name="gEffPoppedDekuBubbleSlidingTexAnim" Offset="0x712F8" /> <!-- Unused -->
-        <Texture Name="gEffPoppedDekuBubbleSliding1Tex" OutName="eff_popped_deku_bubble_sliding_1" Format="i4" Width="32" Height="64" Offset="0x71300" />
-        <Texture Name="gEffPoppedDekuBubbleSliding2Tex" OutName="eff_popped_deku_bubble_sliding_2" Format="i4" Width="32" Height="64" Offset="0x71700" />
-        <Texture Name="gEffPoppedDekuBubbleSliding3Tex" OutName="eff_popped_deku_bubble_sliding_3" Format="i4" Width="32" Height="64" Offset="0x71B00" />
-        <Texture Name="gEffPoppedDekuBubbleSliding4Tex" OutName="eff_popped_deku_bubble_sliding_4" Format="i4" Width="32" Height="64" Offset="0x71F00" />
-        <Texture Name="gEffPoppedDekuBubbleSliding5Tex" OutName="eff_popped_deku_bubble_sliding_5" Format="i4" Width="32" Height="64" Offset="0x72300" />
-        <Texture Name="gEffPoppedDekuBubbleSliding6Tex" OutName="eff_popped_deku_bubble_sliding_6" Format="i4" Width="32" Height="64" Offset="0x72700" />
-        <Texture Name="gEffPoppedDekuBubbleSliding7Tex" OutName="eff_popped_deku_bubble_sliding_7" Format="i4" Width="32" Height="64" Offset="0x72B00" />
-        <Texture Name="gEffPoppedDekuBubbleSliding8Tex" OutName="eff_popped_deku_bubble_sliding_8" Format="i4" Width="32" Height="64" Offset="0x72F00" />
-        <Texture Name="gEffPoppedDekuBubbleSliding9Tex" OutName="eff_popped_deku_bubble_sliding_9" Format="i4" Width="32" Height="64" Offset="0x73300" />
-        <Texture Name="gEffPoppedDekuBubbleSliding10Tex" OutName="eff_popped_deku_bubble_sliding_10" Format="i4" Width="32" Height="64" Offset="0x73700" />
-        <Texture Name="gEffPoppedDekuBubbleSliding11Tex" OutName="eff_popped_deku_bubble_sliding_11" Format="i4" Width="32" Height="64" Offset="0x73B00" />
-        <Texture Name="gEffPoppedDekuBubbleSliding12Tex" OutName="eff_popped_deku_bubble_sliding_12" Format="i4" Width="32" Height="64" Offset="0x73F00" />
-
-        <!-- Regular Popped Deku Bubbles -->
-        <DList Name="gEffPoppedDekuBubbleDL" Offset="0x74330" />
-        <TextureAnimation Name="gEffPoppedDekuBubbleTexAnim" Offset="0x743F0" /> <!-- Empty and unused -->
-        <Texture Name="gEffPoppedDekuBubble1Tex" OutName="eff_popped_deku_bubble_1" Format="i4" Width="32" Height="64" Offset="0x74400" />
-        <Texture Name="gEffPoppedDekuBubble2Tex" OutName="eff_popped_deku_bubble_2" Format="i4" Width="32" Height="64" Offset="0x74800" />
-        <Texture Name="gEffPoppedDekuBubble3Tex" OutName="eff_popped_deku_bubble_3" Format="i4" Width="32" Height="64" Offset="0x74C00" />
-        <Texture Name="gEffPoppedDekuBubble4Tex" OutName="eff_popped_deku_bubble_4" Format="i4" Width="32" Height="64" Offset="0x75000" />
-        <Texture Name="gEffPoppedDekuBubble5Tex" OutName="eff_popped_deku_bubble_5" Format="i4" Width="32" Height="64" Offset="0x75400" />
-        <Texture Name="gEffPoppedDekuBubbleMaskTex" OutName="eff_popped_deku_bubble_mask" Format="i4" Width="32" Height="32" Offset="0x75800" /> <!-- Mask used for both normal and sliding bubbles -->
-
-        <DList Name="gSquareShadowDL" Offset="0x75A40" />
-        <Texture Name="gameplay_keep_Tex_075AA8" OutName="tex_075AA8" Format="i4" Width="16" Height="16" Offset="0x75AA8" />
-        <DList Name="gFootShadowDL" Offset="0x75B30" />
-        <Texture Name="gameplay_keep_Tex_075BC0" OutName="tex_075BC0" Format="ia16" Width="32" Height="64" Offset="0x75BC0" />
-        <DList Name="gCircleShadowDL" Offset="0x76BC0" />
-        <Texture Name="gameplay_keep_Tex_076C40" OutName="tex_076C40" Format="ia16" Width="32" Height="32" Offset="0x76C40" />
-        <DList Name="gHorseShadowDL" Offset="0x77480" />
-        <Texture Name="gameplay_keep_Tex_0774D0" OutName="tex_0774D0" Format="i8" Width="16" Height="64" Offset="0x774D0" />
-        <DList Name="gameplay_keep_DL_077990" Offset="0x77990" />
-        <Texture Name="gameplay_keep_Tex_077A40" OutName="tex_077A40" Format="ia8" Width="32" Height="128" Offset="0x77A40" />
-        <DList Name="gameplay_keep_DL_078A80" Offset="0x78A80" />
-        <Texture Name="gameplay_keep_Tex_078B10" OutName="tex_078B10" Format="rgba16" Width="32" Height="64" Offset="0x78B10" />
-
-        <!-- Sun Textures. These should be 64x64, but they get broken into pieces in gSunDL, and ZAPD cannot currently handle that. -->
-        <!-- #region 2S2H [Port] Treat these properly as 64x64 on extraction-->
-        <Texture Name="gSun1Tex" OutName="sun_1" Format="i4" Width="64" Height="64" Offset="0x79B10" />
-        <!-- <Texture Name="gSun1Tex" OutName="sun_1" Format="i4" Width="64" Height="31" Offset="0x79B10" /> -->
-        <Texture Name="gSun2Tex" OutName="sun_2" Format="i4" Width="64" Height="16" Offset="0x79EF0" />
-        <Texture Name="gSun3Tex" OutName="sun_3" Format="i4" Width="64" Height="17" Offset="0x7A0F0" />
-        <Texture Name="gSunEvening1Tex" OutName="sun_evening_1" Format="i4" Width="64" Height="64" Offset="0x7A310" />
-        <!-- <Texture Name="gSunEvening1Tex" OutName="sun_evening_1" Format="i4" Width="64" Height="31" Offset="0x7A310" /> -->
-        <Texture Name="gSunEvening2Tex" OutName="sun_evening_2" Format="i4" Width="64" Height="16" Offset="0x7A6F0" />
-        <Texture Name="gSunEvening3Tex" OutName="sun_evening_3" Format="i4" Width="64" Height="17" Offset="0x7A8F0" />
-
-        <DList Name="gSunSparkleMaterialDL" Offset="0x7AB10" /> <!-- sun (sparkles when small) displaylist -->
-        <DList Name="gSunSparkleModelDL" Offset="0x7AB58" />
-        <DList Name="gSunDL" Offset="0x7AB70" />
-        <DList Name="gZTargetLockOnTriangleDL" Offset="0x7AE00" />
-
-        <!-- The clock that appears when the player is moving through, slowing down, or speeding up time with the Song of Time -->
-        <DList Name="gSongOfTimeClockDL" Offset="0x7AFB0" /> <!-- Original name is "disk_modelT" -->
-        <DList Name="gSongOfTimeClockEmptyDL" Offset="0x7B0B8" /> <!-- Probably was the opaque component for the above DL -->
-        <Texture Name="gSongOfTimeClockTopTex" OutName="song_of_time_clock_top" Format="i8" Width="64" Height="64" Offset="0x7B0C0" />
-        <Texture Name="gSongOfTimeClockBottomTex" OutName="song_of_time_clock_bottom" Format="i8" Width="64" Height="64" Offset="0x7C0C0" />
-
-        <DList Name="gameplay_keep_DL_07D260" Offset="0x7D260" />
-        <DList Name="gameplay_keep_DL_07D348" Offset="0x7D348" />
-        <Texture Name="gameplay_keep_Tex_07D350" OutName="tex_07D350" Format="i8" Width="16" Height="32" Offset="0x7D350" />
-
-        <Array Name="gameplay_keepVtx_07D550" Count="4" Offset="0x7D550">
-            <Vtx/>
-        </Array>
-
-        <DList Name="gEffFire1DL" Offset="0x7D590" />
-        <DList Name="gEffFire2DL" Offset="0x7D650" />
-        <Texture Name="gEffFireMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x7D710" />
-        <Texture Name="gEffFireTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x7DF10" />
-        <DList Name="gameplay_keep_DL_07E8C0" Offset="0x7E8C0" />
-        <Texture Name="gameplay_keep_Tex_07EA08" OutName="tex_07EA08" Format="i8" Width="32" Height="64" Offset="0x7EA08" />
-        <TextureAnimation Name="gameplay_keep_Matanimheader_07F218" Offset="0x7F218" />
-        <DList Name="gameplay_keep_DL_07F260" Offset="0x7F260" />
-        <Texture Name="gameplay_keep_Tex_07F2E8" OutName="tex_07F2E8" Format="ia16" Width="32" Height="64" Offset="0x7F2E8" />
-        <DList Name="gameplay_keep_DL_080FC0" Offset="0x80FC0" />
-        <DList Name="gameplay_keep_DL_080FC8" Offset="0x80FC8" />
-        <Texture Name="gameplay_keep_Tex_0813A0" OutName="tex_0813A0" Format="i8" Width="16" Height="32" Offset="0x813A0" />
-        <TextureAnimation Name="gameplay_keep_Matanimheader_0815D0" Offset="0x815D0" />
-        <DList Name="gameplay_keep_DL_081620" Offset="0x81620" />
-        <DList Name="gameplay_keep_DL_081628" Offset="0x81628" />
-        <Texture Name="gameplay_keep_Tex_0816C0" OutName="tex_0816C0" Format="rgba16" Width="16" Height="32" Offset="0x816C0" />
-
-        <KeyFrameAnimation Name="gGameplayKeepKFAnim_83534" Skel="0x85640" Offset="0x83534"/>
-
-        <DList Name="gameplay_keep_DL_084790" Offset="0x84790" />
-        <DList Name="gameplay_keep_DL_0847E0" Offset="0x847E0" />
-        <DList Name="gameplay_keep_DL_084850" Offset="0x84850" />
-        <DList Name="gameplay_keep_DL_0848C0" Offset="0x848C0" />
-        <DList Name="gameplay_keep_DL_084930" Offset="0x84930" />
-        <DList Name="gameplay_keep_DL_0849A0" Offset="0x849A0" />
-        <DList Name="gameplay_keep_DL_084A10" Offset="0x84A10" />
-        <DList Name="gameplay_keep_DL_084A80" Offset="0x84A80" />
-        <DList Name="gameplay_keep_DL_084AF0" Offset="0x84AF0" />
-        <DList Name="gameplay_keep_DL_084B60" Offset="0x84B60" />
-        <DList Name="gameplay_keep_DL_084BD0" Offset="0x84BD0" />
-        <DList Name="gameplay_keep_DL_084C48" Offset="0x84C48" />
-        <DList Name="gameplay_keep_DL_084CF0" Offset="0x84CF0" />
-        <DList Name="gameplay_keep_DL_084D70" Offset="0x84D70" />
-        <DList Name="gameplay_keep_DL_084DD8" Offset="0x84DD8" />
-        <DList Name="gameplay_keep_DL_084E50" Offset="0x84E50" />
-        <DList Name="gameplay_keep_DL_084EA0" Offset="0x84EA0" />
-        <DList Name="gameplay_keep_DL_084F10" Offset="0x84F10" />
-        <DList Name="gameplay_keep_DL_084F80" Offset="0x84F80" />
-        <DList Name="gameplay_keep_DL_084FF0" Offset="0x84FF0" />
-        <DList Name="gameplay_keep_DL_085060" Offset="0x85060" />
-        <DList Name="gameplay_keep_DL_0850D0" Offset="0x850D0" />
-        <DList Name="gameplay_keep_DL_085140" Offset="0x85140" />
-        <DList Name="gameplay_keep_DL_0851B0" Offset="0x851B0" />
-        <DList Name="gameplay_keep_DL_085220" Offset="0x85220" />
-        <DList Name="gameplay_keep_DL_085290" Offset="0x85290" />
-        <DList Name="gameplay_keep_DL_085308" Offset="0x85308" />
-        <DList Name="gameplay_keep_DL_0853B0" Offset="0x853B0" />
-        <DList Name="gameplay_keep_DL_085418" Offset="0x85418" />
-        <DList Name="gameplay_keep_DL_085490" Offset="0x85490" />
-
-        <KeyFrameSkel Name="gGameplayKeepKFSkel_85640" LimbType="Flex" Offset="0x85640"/>
-
-        <!-- Zora Elegy of Emptiness Shell -->
-        <DList Name="gElegyShellZoraDL" Offset="0x89070" /> <!-- Original name is "pzs_zo_model" -->
-        <Texture Name="gElegyShellZoraTLUT" OutName="elegy_shell_zora_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8A420" />
-        <Texture Name="gElegyShellZoraGuitarJawTex" OutName="elegy_shell_zora_guitar_jaw" Format="rgba16" Width="16" Height="16" Offset="0x8A620" />
-        <Texture Name="gElegyShellZoraGuitarEyeTex" OutName="elegy_shell_zora_guitar_eye" Format="rgba16" Width="16" Height="16" Offset="0x8A820" />
-        <Texture Name="gElegyShellZoraGuitarTeethTex" OutName="elegy_shell_zora_guitar_teeth" Format="rgba16" Width="16" Height="16" Offset="0x8AA20" />
-        <Texture Name="gElegyShellZoraGuitarSpinousTex" OutName="elegy_shell_zora_guitar_spinous" Format="rgba16" Width="16" Height="32" Offset="0x8AC20" />
-        <Texture Name="gElegyShellZoraGuitarBoneTex" OutName="elegy_shell_zora_guitar_bone" Format="rgba16" Width="16" Height="32" Offset="0x8B020" />
-        <Texture Name="gElegyShellZoraSkinTex" OutName="elegy_shell_zora_skin" Format="ci8" Width="8" Height="8" Offset="0x8B420" />
-        <Texture Name="gElegyShellZoraSpottedSkinTex" OutName="elegy_shell_zora_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x8B460" />
-        <Texture Name="gElegyShellZoraFingersTex" OutName="elegy_shell_zora_fingers" Format="ci8" Width="16" Height="16" Offset="0x8B860" />
-        <Texture Name="gElegyShellZoraBackAndHipSpottedSkinTex" OutName="elegy_shell_zora_back_and_hip_spotted_skin" Format="ci8" Width="32" Height="64" Offset="0x8B960" />
-        <Texture Name="gElegyShellZoraWristbandTex" OutName="elegy_shell_zora_wristband" Format="ci8" Width="8" Height="16" Offset="0x8C160" />
-        <Texture Name="gElegyShellZoraFinTex" OutName="elegy_shell_zora_fin" Format="ci8" Width="16" Height="16" Offset="0x8C1E0" />
-        <Texture Name="gElegyShellZoraEyeTex" OutName="elegy_shell_zora_eye" Format="ci8" Width="32" Height="32" Offset="0x8C2E0" />
-        <Texture Name="gElegyShellZoraMouthTex" OutName="elegy_shell_zora_mouth" Format="ci8" Width="32" Height="32" Offset="0x8C6E0" />
-        <Texture Name="gElegyShellZoraRibsTattooTex" OutName="elegy_shell_zora_ribs_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CAE0" />
-        <Texture Name="gElegyShellZoraArrowTattooTex" OutName="elegy_shell_zora_arrow_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CCE0" />
-        <Texture Name="gElegyShellZoraRightShoulderTattooTex" OutName="elegy_shell_zora_right_shoulder_tattoo" Format="ci8" Width="32" Height="32" Offset="0x8CEE0" />
-        <Texture Name="gElegyShellZoraPlatformTex" OutName="elegy_shell_zora_platform" Format="rgba16" Width="8" Height="16" Offset="0x8D2E0" />
-
-        <Texture Name="gameplay_keep_Tex_08D3E0" OutName="tex_08D3E0" Format="i8" Width="64" Height="32" Offset="0x8D3E0" />
-
-        <!-- Dust Textures -->
-        <Texture Name="gEffDust1Tex" OutName="eff_dust_1" Format="i8" Width="32" Height="32" Offset="0x8DBE0" />
-        <Texture Name="gEffDust2Tex" OutName="eff_dust_2" Format="i8" Width="32" Height="32" Offset="0x8DFE0" />
-        <Texture Name="gEffDust3Tex" OutName="eff_dust_3" Format="i8" Width="32" Height="32" Offset="0x8E3E0" />
-        <Texture Name="gEffDust4Tex" OutName="eff_dust_4" Format="i8" Width="32" Height="32" Offset="0x8E7E0" />
-        <Texture Name="gEffDust5Tex" OutName="eff_dust_5" Format="i8" Width="32" Height="32" Offset="0x8EBE0" />
-        <Texture Name="gEffDust6Tex" OutName="eff_dust_6" Format="i8" Width="32" Height="32" Offset="0x8EFE0" />
-        <Texture Name="gEffDust7Tex" OutName="eff_dust_7" Format="i8" Width="32" Height="32" Offset="0x8F3E0" />
-        <Texture Name="gEffDust8Tex" OutName="eff_dust_8" Format="i8" Width="32" Height="32" Offset="0x8F7E0" />
-
-        <Texture Name="gameplay_keep_Tex_08FBE0" OutName="tex_08FBE0" Format="i8" Width="32" Height="64" Offset="0x8FBE0" />
-        <Texture Name="gameplay_keep_Tex_0903E0" OutName="tex_0903E0" Format="i8" Width="32" Height="64" Offset="0x903E0" />
-        <Texture Name="gameplay_keep_Tex_090BE0" OutName="tex_090BE0" Format="i8" Width="32" Height="64" Offset="0x90BE0" />
-        <Texture Name="gameplay_keep_Tex_0913E0" OutName="tex_0913E0" Format="i8" Width="32" Height="64" Offset="0x913E0" />
-        <Texture Name="gEffBubble1Tex" OutName="eff_bubble_1" Format="ia8" Width="16" Height="16" Offset="0x91BE0" />
-        <Texture Name="gEffBubble2Tex" OutName="eff_bubble_2" Format="ia8" Width="16" Height="16" Offset="0x91CE0" />
-
-        <!-- Electric spark textures from Zora-Form attack -->
-        <Texture Name="gElectricSpark1Tex" OutName="electric_spark_1" Format="i4" Width="32" Height="32" Offset="0x91DE0" />
-        <Texture Name="gElectricSpark2Tex" OutName="electric_spark_2" Format="i4" Width="32" Height="32" Offset="0x91FE0" />
-        <Texture Name="gElectricSpark3Tex" OutName="electric_spark_3" Format="i4" Width="32" Height="32" Offset="0x921E0" />
-        <Texture Name="gElectricSpark4Tex" OutName="electric_spark_4" Format="i4" Width="32" Height="32" Offset="0x923E0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ah.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ah.xml
deleted file mode 100644
index 71b031a01..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ah.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<Root>
-    <File Name="object_ah" Segment="6">
-        <Animation Name="object_ah_Anim_000968" Offset="0x968" /> <!-- Original name is "ah_deteike" (probably based on her Japanese dialogue, where she tells Kafei to "get out") -->
-        <Animation Name="object_ah_Anim_000DDC" Offset="0xDDC" /> <!-- Original name is "ah_suwari" ("sitting") -->
-        <Animation Name="object_ah_Anim_001860" Offset="0x1860" /> <!-- Original name is "ah_wait" -->
-        <Animation Name="object_ah_Anim_002280" Offset="0x2280" /> <!-- Original name is "ah_wait2deteike" -->
-        <DList Name="object_ah_DL_004A60" Offset="0x4A60" />
-        <DList Name="object_ah_DL_004B70" Offset="0x4B70" />
-        <DList Name="object_ah_DL_004C80" Offset="0x4C80" />
-        <DList Name="object_ah_DL_004E78" Offset="0x4E78" />
-        <DList Name="object_ah_DL_005010" Offset="0x5010" />
-        <DList Name="object_ah_DL_0050E8" Offset="0x50E8" />
-        <DList Name="object_ah_DL_005268" Offset="0x5268" />
-        <DList Name="object_ah_DL_005400" Offset="0x5400" />
-        <DList Name="object_ah_DL_0054D8" Offset="0x54D8" />
-        <DList Name="object_ah_DL_0055F0" Offset="0x55F0" />
-        <DList Name="object_ah_DL_005BA8" Offset="0x5BA8" />
-        <DList Name="object_ah_DL_005D88" Offset="0x5D88" />
-        <DList Name="object_ah_DL_005EB0" Offset="0x5EB0" />
-        <DList Name="object_ah_DL_006090" Offset="0x6090" />
-        <DList Name="object_ah_DL_0061B8" Offset="0x61B8" />
-        <Texture Name="object_ah_TLUT_0064B0" OutName="tlut_0064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0" />
-        <Texture Name="object_ah_Tex_0066B0" OutName="tex_0066B0" Format="ci8" Width="16" Height="16" Offset="0x66B0" />
-        <Texture Name="object_ah_Tex_0067B0" OutName="tex_0067B0" Format="ci8" Width="16" Height="16" Offset="0x67B0" />
-        <Texture Name="object_ah_Tex_0068B0" OutName="tex_0068B0" Format="ci8" Width="8" Height="8" Offset="0x68B0" />
-        <Texture Name="object_ah_Tex_0068F0" OutName="tex_0068F0" Format="ci8" Width="8" Height="8" Offset="0x68F0" />
-        <Texture Name="object_ah_Tex_006930" OutName="tex_006930" Format="ci8" Width="8" Height="8" Offset="0x6930" />
-        <Texture Name="object_ah_Tex_006970" OutName="tex_006970" Format="ci8" Width="16" Height="16" Offset="0x6970" />
-        <Texture Name="object_ah_Tex_006A70" OutName="tex_006A70" Format="ci8" Width="8" Height="8" Offset="0x6A70" />
-        <Texture Name="object_ah_Tex_006AB0" OutName="tex_006AB0" Format="ci8" Width="16" Height="16" Offset="0x6AB0" />
-        <Texture Name="object_ah_Tex_006BB0" OutName="tex_006BB0" Format="ci8" Width="8" Height="16" Offset="0x6BB0" />
-        <Texture Name="object_ah_Tex_006C30" OutName="tex_006C30" Format="i8" Width="8" Height="8" Offset="0x6C30" />
-        <Texture Name="object_ah_Tex_006C70" OutName="tex_006C70" Format="ci8" Width="16" Height="16" Offset="0x6C70" />
-        <Texture Name="object_ah_Tex_006D70" OutName="tex_006D70" Format="rgba16" Width="32" Height="32" Offset="0x6D70" />
-        <Texture Name="object_ah_Tex_007570" OutName="tex_007570" Format="rgba16" Width="32" Height="32" Offset="0x7570" />
-        <Texture Name="object_ah_Tex_007D70" OutName="tex_007D70" Format="rgba16" Width="32" Height="32" Offset="0x7D70" />
-        <Texture Name="object_ah_Tex_008570" OutName="tex_008570" Format="rgba16" Width="32" Height="32" Offset="0x8570" />
-        <Texture Name="object_ah_Tex_008D70" OutName="tex_008D70" Format="rgba16" Width="32" Height="32" Offset="0x8D70" />
-        <Texture Name="object_ah_Tex_009570" OutName="tex_009570" Format="rgba16" Width="32" Height="32" Offset="0x9570" />
-        <Limb Name="object_ah_Standardlimb_009D70" Type="Standard" EnumName="OBJECT_AH_LIMB_01" Offset="0x9D70" />
-        <Limb Name="object_ah_Standardlimb_009D7C" Type="Standard" EnumName="OBJECT_AH_LIMB_02" Offset="0x9D7C" />
-        <Limb Name="object_ah_Standardlimb_009D88" Type="Standard" EnumName="OBJECT_AH_LIMB_03" Offset="0x9D88" />
-        <Limb Name="object_ah_Standardlimb_009D94" Type="Standard" EnumName="OBJECT_AH_LIMB_04" Offset="0x9D94" />
-        <Limb Name="object_ah_Standardlimb_009DA0" Type="Standard" EnumName="OBJECT_AH_LIMB_05" Offset="0x9DA0" />
-        <Limb Name="object_ah_Standardlimb_009DAC" Type="Standard" EnumName="OBJECT_AH_LIMB_06" Offset="0x9DAC" />
-        <Limb Name="object_ah_Standardlimb_009DB8" Type="Standard" EnumName="OBJECT_AH_LIMB_07" Offset="0x9DB8" />
-        <Limb Name="object_ah_Standardlimb_009DC4" Type="Standard" EnumName="OBJECT_AH_LIMB_08" Offset="0x9DC4" />
-        <Limb Name="object_ah_Standardlimb_009DD0" Type="Standard" EnumName="OBJECT_AH_LIMB_09" Offset="0x9DD0" />
-        <Limb Name="object_ah_Standardlimb_009DDC" Type="Standard" EnumName="OBJECT_AH_LIMB_0A" Offset="0x9DDC" />
-        <Limb Name="object_ah_Standardlimb_009DE8" Type="Standard" EnumName="OBJECT_AH_LIMB_0B" Offset="0x9DE8" />
-        <Limb Name="object_ah_Standardlimb_009DF4" Type="Standard" EnumName="OBJECT_AH_LIMB_0C" Offset="0x9DF4" />
-        <Limb Name="object_ah_Standardlimb_009E00" Type="Standard" EnumName="OBJECT_AH_LIMB_0D" Offset="0x9E00" />
-        <Limb Name="object_ah_Standardlimb_009E0C" Type="Standard" EnumName="OBJECT_AH_LIMB_0E" Offset="0x9E0C" />
-        <Limb Name="object_ah_Standardlimb_009E18" Type="Standard" EnumName="OBJECT_AH_LIMB_0F" Offset="0x9E18" />
-        <Limb Name="object_ah_Standardlimb_009E24" Type="Standard" EnumName="OBJECT_AH_LIMB_10" Offset="0x9E24" />
-        <Skeleton Name="object_ah_Skel_009E70" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AH_LIMB_NONE" LimbMax="OBJECT_AH_LIMB_MAX" EnumName="ObjectAhLimb" Offset="0x9E70" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ahg.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ahg.xml
deleted file mode 100644
index 8233a5b27..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ahg.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<Root>
-    <!-- Assets for the bearded man from OOT, body is reused in MM for Cured Swamp Spider House Man (head substituted from overlay data). -->
-    <File Name="object_ahg" Segment="6">
-        <Texture Name="gAhgTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="gAhgHairLineTex" OutName="hair_line" Format="ci8" Width="16" Height="16" Offset="0x200" />
-        <Texture Name="gAhgHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x300" />
-        <Texture Name="gAhgEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x400" />
-        <Texture Name="gAhgSkinGradientTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x440"/>
-        <Texture Name="gAhgEyeOpenTex" OutName="eye_open" Format="ci8" Width="16" Height="16" Offset="0x480" TlutOffset="0x0"/>
-        <Texture Name="gAhgEyeHalfTex" OutName="eye_half" Format="ci8" Width="16" Height="16" Offset="0x580" TlutOffset="0x0"/>
-        <Texture Name="gAhgEyeClosedTex" OutName="eye_closed" Format="ci8" Width="16" Height="16" Offset="0x680" TlutOffset="0x0"/>
-        <Texture Name="gAhgFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x780" />
-        <Texture Name="gAhgShirtTex" OutName="shirt" Format="i8" Width="8" Height="8" Offset="0x880" />
-        <Texture Name="gAhgShoesTex" OutName="shoes" Format="i8" Width="8" Height="8" Offset="0x8C0" />
-        <Texture Name="gAhgBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="32" Height="16" Offset="0x900" />
-        <Texture Name="gAhgBeltLoopTex" OutName="belt_loop" Format="ci8" Width="16" Height="16" Offset="0xB00" />
-
-        <!-- This head is overwritten in EnSth draw. -->
-        <DList Name="gAhgBeardedHeadDL" Offset="0x2FF0" />
-        <DList Name="gAhgRightHandDL" Offset="0x3400" />
-        <DList Name="gAhgRightForearmDL" Offset="0x3570" />
-        <DList Name="gAhgRightUpperArmDL" Offset="0x36A0" />
-        <DList Name="gAhgLeftHandDL" Offset="0x37D8" />
-        <DList Name="gAhgLeftForearmDL" Offset="0x3948" />
-        <DList Name="gAhgLeftUpperArmDL" Offset="0x3A78" />
-        <DList Name="gAhgTorsoDL" Offset="0x3BB0" />
-        <DList Name="gAhgRightFootDL" Offset="0x3DD8" />
-        <DList Name="gAhgRightShinDL" Offset="0x3F18" />
-        <DList Name="gAhgRightThighDL" Offset="0x4048" />
-        <DList Name="gAhgLeftFootDL" Offset="0x4180" />
-        <DList Name="gAhgLeftShinDL" Offset="0x42C0" />
-        <DList Name="gAhgLeftThighDL" Offset="0x43F0" />
-        <DList Name="gAhgPelvisDL" Offset="0x4528" />
-
-        <!-- Assets for alternate heads for Ahg, left over from OOT (Unused). -->
-        <Texture Name="gAhg2TLUT" OutName="tlut2" Format="rgba16" Width="16" Height="12" Offset="0x46C8" />
-        <Texture Name="gAhgEar2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x4848" TlutOffset="0x46C8" />
-        <Texture Name="gAhgMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x4888" TlutOffset="0x46C8"  />
-        <Texture Name="gAhgEyeAndEyebrowTex" OutName="eye_with_eyebrow" Format="ci8" Width="16" Height="16" Offset="0x4A88" TlutOffset="0x46C8"  />
-        <Texture Name="gAhgRedHairTex" OutName="red_hair" Format="ci8" Width="8" Height="16" Offset="0x4B88" TlutOffset="0x46C8"  />
-        <DList Name="gAhgRedHeadDL" Offset="0x5408" />
-        <DList Name="gAhgShortHairHeadDL" Offset="0x5628" />
-
-        <Limb Name="gAhgPelvisLimb" Type="Standard" EnumName="AHG_LIMB_PELVIS" Offset="0x58A8" />
-        <Limb Name="gAhgLeftThighLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_THIGH" Offset="0x58B4" />
-        <Limb Name="gAhgLeftShinLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_SHIN" Offset="0x58C0" />
-        <Limb Name="gAhgLeftFootLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_FOOT" Offset="0x58CC" />
-        <Limb Name="gAhgRightThighLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_THIGH" Offset="0x58D8" />
-        <Limb Name="gAhgRightShinLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_SHIN" Offset="0x58E4" />
-        <Limb Name="gAhgRightFootLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_FOOT" Offset="0x58F0" />
-        <Limb Name="gAhgTorsoLimb" Type="Standard" EnumName="AHG_LIMB_CHEST" Offset="0x58FC" />
-        <Limb Name="gAhgLeftUpperArmLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_UPPER_ARM" Offset="0x5908" />
-        <Limb Name="gAhgLeftForearmLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_FOREARM" Offset="0x5914" />
-        <Limb Name="gAhgLeftHandLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_HAND" Offset="0x5920" />
-        <Limb Name="gAhgRightUpperArmLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_UPPER_ARM" Offset="0x592C" />
-        <Limb Name="gAhgRightForearmLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_FOREARM" Offset="0x5938" />
-        <Limb Name="gAhgRightHandLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_HAND" Offset="0x5944" />
-        <Limb Name="gAhgHeadLimb" Type="Standard" EnumName="AHG_LIMB_HEAD" Offset="0x5950" />
-        <Skeleton Name="gAhgSkel" Type="Flex" LimbType="Standard" LimbNone="AHG_LIMB_NONE" LimbMax="AHG_LIMB_MAX" EnumName="ObjectAhgLimb" Offset="0x5998" />
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_al.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_al.xml
deleted file mode 100644
index 790ca3d8a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_al.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Root>
-    <File Name="object_al" Segment="6">
-        <Animation Name="object_al_Anim_000C54" Offset="0xC54" /> <!-- Original name is "al_suwaruA" ("suwaru" = "to sit") -->
-        <DList Name="gMadameAromaRightFootDL" Offset="0x45F0" />
-        <DList Name="gMadameAromaLeftFootDL" Offset="0x4738" />
-        <DList Name="gMadameAromaLegsDL" Offset="0x4880" />
-        <DList Name="gMadameAromaLowerBodyDL" Offset="0x4A50" />
-        <DList Name="gMadameAromaMiddleBodyDL" Offset="0x4B30" />
-        <DList Name="gMadameAromaRightHairEdgeDL" Offset="0x4BF8" />
-        <DList Name="gMadameAromaRightHairDL" Offset="0x4D10" />
-        <DList Name="gMadameAromaLeftHairEdgeDL" Offset="0x4DD0" />
-        <DList Name="gMadameAromaLeftHairDL" Offset="0x4EE8" />
-        <DList Name="gMadameAromaHairLoopDL" Offset="0x4FA8" />
-        <DList Name="gMadameAromaHeadDL" Offset="0x50B0" />
-        <DList Name="gMadameAromaShawlRightLowerDL" Offset="0x5680" />
-        <DList Name="gMadameAromaShawlRightLowerMiddleDL" Offset="0x5728" />
-        <DList Name="gMadameAromaShawlLeftLowerDL" Offset="0x57D0" />
-        <DList Name="gMadameAromaShawlLeftLowerMiddleDL" Offset="0x5878" />
-        <DList Name="gMadameAromaShawlUpperDL" Offset="0x5920" />
-        <DList Name="gMadameAromaLeftHandDL" Offset="0x59E8" />
-        <DList Name="gMadameAromaLeftArmDL" Offset="0x5C10" />
-        <DList Name="gMadameAromaLeftShoulderDL" Offset="0x5D28" />
-        <DList Name="gMadameAromaRightHandDL" Offset="0x5E48" />
-        <DList Name="gMadameAromaRightArmDL" Offset="0x5FF8" />
-        <DList Name="gMadameAromaRightShoulderDL" Offset="0x6190" />
-        <DList Name="gMadameAromaUpperBodyDL" Offset="0x62B0" />
-        <DList Name="gMadameAromaNecklaceDL" Offset="0x64E0" />
-        <DList Name="gMadameAromaShawlMiddleDL" Offset="0x6598" />
-        <Texture Name="gMadameAromaTLUT" OutName="madame_aroma_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6638" />
-        <Texture Name="gMadameAromaSkinBlotchTex" OutName="madame_aroma_skin_blotch" Format="ci8" Width="8" Height="8" Offset="0x6838" />
-        <Texture Name="gMadameAromaEarsTex" OutName="madame_aroma_ears" Format="ci8" Width="8" Height="8" Offset="0x6878" />
-        <Texture Name="gMadameAromaHairToSkinTex" OutName="madame_aroma_hair_to_skin" Format="ci8" Width="16" Height="16" Offset="0x68B8" />
-        <Texture Name="gMadameAromaMouthTex" OutName="madame_aroma_mouth" Format="rgba16" Width="64" Height="32" Offset="0x69B8" />
-        <Texture Name="gMadameAromaEyesTex" OutName="madame_aroma_eyes" Format="rgba16" Width="32" Height="32" Offset="0x79B8" />
-        <Texture Name="gMadameAromaShoeTex" OutName="madame_aroma_shoe" Format="ci8" Width="32" Height="16" Offset="0x81B8" />
-        <Texture Name="gMadameAromaDressLowerTex" OutName="madame_aroma_dress_lower" Format="rgba16" Width="32" Height="32" Offset="0x83B8" />
-        <Texture Name="gMadameAromaHairHolderTex" OutName="madame_aroma_hair_holder" Format="rgba16" Width="8" Height="8" Offset="0x8BB8" />
-        <Texture Name="gMadameAromaFingersTex" OutName="madame_aroma_fingers" Format="ci8" Width="16" Height="16" Offset="0x8C38" />
-        <Texture Name="gMadameAromaChestTex" OutName="madame_aroma_chest" Format="ci8" Width="16" Height="16" Offset="0x8D38" />
-        <Texture Name="gMadameAromaEarringsTex" OutName="madame_aroma_earrings" Format="rgba16" Width="32" Height="64" Offset="0x8E38" />
-        <Texture Name="gMadameAromaRingTex" OutName="madame_aroma_ring" Format="rgba16" Width="8" Height="16" Offset="0x9E38" />
-        <Limb Name="gMadameAromaRootLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_ROOT" Offset="0x9F38" />
-        <Limb Name="gMadameAromaUpperBodyLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_UPPER_BODY" Offset="0x9F44" />
-        <Limb Name="gMadameAromaShawlMiddleLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_MIDDLE" Offset="0x9F50" />
-        <Limb Name="gMadameAromaNecklaceLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_NECKLACE" Offset="0x9F5C" />
-        <Limb Name="gMadameAromaRightShoulderLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_SHOULDER" Offset="0x9F68" />
-        <Limb Name="gMadameAromaRightArmLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_ARM" Offset="0x9F74" />
-        <Limb Name="gMadameAromaRightHandLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_HAND" Offset="0x9F80" />
-        <Limb Name="gMadameAromaLeftShoulderLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_SHOULDER" Offset="0x9F8C" />
-        <Limb Name="gMadameAromaLeftArmLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_ARM" Offset="0x9F98" />
-        <Limb Name="gMadameAromaLeftHandLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_HAND" Offset="0x9FA4" />
-        <Limb Name="gMadameAromaShawlUpperLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_UPPER" Offset="0x9FB0" />
-        <Limb Name="gMadameAromaShawlLeftLowerMiddleLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_LEFT_LOWER_MIDDLE" Offset="0x9FBC" />
-        <Limb Name="gMadameAromaShawlLeftLowerLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_LEFT_LOWER" Offset="0x9FC8" />
-        <Limb Name="gMadameAromaShawlRightLowerMiddleLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_RIGHT_LOWER_MIDDLE" Offset="0x9FD4" />
-        <Limb Name="gMadameAromaShawlRightLowerLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_SHAWL_RIGHT_LOWER" Offset="0x9FE0" />
-        <Limb Name="gMadameAromaHeadLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_HEAD" Offset="0x9FEC" />
-        <Limb Name="gMadameAromaHairLoopLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_HAIR_LOOP" Offset="0x9FF8" />
-        <Limb Name="gMadameAromaLeftHairLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_HAIR" Offset="0xA004" />
-        <Limb Name="gMadameAromaLeftHairEdgeLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_HAIR_EDGE" Offset="0xA010" />
-        <Limb Name="gMadameAromaRightHairLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_HAIR" Offset="0xA01C" />
-        <Limb Name="gMadameAromaRightHairEdgeLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_HAIR_EDGE" Offset="0xA028" />
-        <Limb Name="gMadameAromaMiddleBodyLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_MIDDLE_BODY" Offset="0xA034" />
-        <Limb Name="gMadameAromaLowerBodyLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LOWER_BODY" Offset="0xA040" />
-        <Limb Name="gMadameAromaLegsLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEGS" Offset="0xA04C" />
-        <Limb Name="gMadameAromaLeftFootLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_FOOT" Offset="0xA058" />
-        <Limb Name="gMadameAromaRightFootLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_FOOT" Offset="0xA064" />
-        <Skeleton Name="gMadameAromaSkel" Type="Flex" LimbType="Standard" LimbNone="MADAME_AROMA_LIMB_NONE" LimbMax="MADAME_AROMA_LIMB_MAX" EnumName="MadameAromaLimb" Offset="0xA0D8" />
-        <Animation Name="object_al_Anim_00A764" Offset="0xA764" /> <!-- Original name is "al_suwaruAtalk" -->
-        <Animation Name="object_al_Anim_00ACA0" Offset="0xACA0" /> <!-- Original name is "al_suwaruB2talk" -->
-        <Animation Name="object_al_Anim_00BCA4" Offset="0xBCA4" /> <!-- Original name is "al_suwaruBarayada" ("arayada" = "Oh no; Oh dear​") -->
-        <Animation Name="object_al_Anim_00CA28" Offset="0xCA28" /> <!-- Original name is "al_suwaruBtalk" -->
-        <Animation Name="object_al_Anim_00DBE0" Offset="0xDBE0" /> <!-- Original name is "al_suwaruBwait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_am.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_am.xml
deleted file mode 100644
index bec26eb3a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_am.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-    <File Name="object_am" Segment="6">
-        <Collision Name="object_am_Colheader_000118" Offset="0x118" /> <!-- Original name is "am_bgdatainfo" -->
-        <Animation Name="gArmosHopAnim" Offset="0x238" /> <!-- Original name is "am_jump" -->
-        <Animation Name="gArmosPushedBackAnim" Offset="0x33C" /> <!-- Original name is "am_mamori" ("protection; defense") -->
-        <DList Name="object_am_DL_0005D0" Offset="0x5D0" />
-        <DList Name="object_am_DL_0007A8" Offset="0x7A8" />
-        <DList Name="object_am_DL_0016C8" Offset="0x16C8" />
-        <DList Name="object_am_DL_002278" Offset="0x2278" />
-        <DList Name="object_am_DL_002550" Offset="0x2550" />
-        <Texture Name="object_am_Tex_002638" OutName="tex_002638" Format="i4" Width="32" Height="32" Offset="0x2638" />
-        <Texture Name="object_am_Tex_002838" OutName="tex_002838" Format="i4" Width="16" Height="32" Offset="0x2838" />
-        <Texture Name="object_am_Tex_002938" OutName="tex_002938" Format="rgba16" Width="16" Height="32" Offset="0x2938" />
-        <Texture Name="object_am_Tex_002D38" OutName="tex_002D38" Format="i4" Width="16" Height="32" Offset="0x2D38" />
-        <Texture Name="object_am_Tex_002E38" OutName="tex_002E38" Format="i4" Width="32" Height="32" Offset="0x2E38" />
-        <Texture Name="object_am_Tex_003038" OutName="tex_003038" Format="i4" Width="32" Height="32" Offset="0x3038" />
-        <Texture Name="object_am_Tex_003238" OutName="tex_003238" Format="rgba16" Width="32" Height="32" Offset="0x3238" />
-        <Texture Name="object_am_Tex_003A38" OutName="tex_003A38" Format="rgba16" Width="16" Height="16" Offset="0x3A38" />
-        <Texture Name="object_am_Tex_003C38" OutName="tex_003C38" Format="rgba16" Width="32" Height="32" Offset="0x3C38" />
-        <Texture Name="object_am_Tex_004438" OutName="tex_004438" Format="rgba16" Width="32" Height="32" Offset="0x4438" />
-        <Texture Name="object_am_Tex_004C38" OutName="tex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" />
-        <Texture Name="object_am_Tex_005438" OutName="tex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" />
-        <Texture Name="object_am_Tex_005478" OutName="tex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" />
-        <Limb Name="object_am_Standardlimb_005878" Type="Standard" EnumName="OBJECT_AM_LIMB_01" Offset="0x5878" />
-        <Limb Name="object_am_Standardlimb_005884" Type="Standard" EnumName="OBJECT_AM_LIMB_02" Offset="0x5884" />
-        <Limb Name="object_am_Standardlimb_005890" Type="Standard" EnumName="OBJECT_AM_LIMB_BODY" Offset="0x5890" />
-        <Limb Name="object_am_Standardlimb_00589C" Type="Standard" EnumName="OBJECT_AM_LIMB_04" Offset="0x589C" />
-        <Limb Name="object_am_Standardlimb_0058A8" Type="Standard" EnumName="OBJECT_AM_LIMB_05" Offset="0x58A8" />
-        <Limb Name="object_am_Standardlimb_0058B4" Type="Standard" EnumName="OBJECT_AM_LIMB_SHIELD" Offset="0x58B4" />
-        <Limb Name="object_am_Standardlimb_0058C0" Type="Standard" EnumName="OBJECT_AM_LIMB_07" Offset="0x58C0" />
-        <Limb Name="object_am_Standardlimb_0058CC" Type="Standard" EnumName="OBJECT_AM_LIMB_08" Offset="0x58CC" />
-        <Limb Name="object_am_Standardlimb_0058D8" Type="Standard" EnumName="OBJECT_AM_LIMB_SWORD" Offset="0x58D8" />
-        <Limb Name="object_am_Standardlimb_0058E4" Type="Standard" EnumName="OBJECT_AM_LIMB_0A" Offset="0x58E4" />
-        <Limb Name="object_am_Standardlimb_0058F0" Type="Standard" EnumName="OBJECT_AM_LIMB_0B" Offset="0x58F0" />
-        <Limb Name="object_am_Standardlimb_0058FC" Type="Standard" EnumName="OBJECT_AM_LIMB_BASE" Offset="0x58FC" />
-        <Limb Name="object_am_Standardlimb_005908" Type="Standard" EnumName="OBJECT_AM_LIMB_0D" Offset="0x5908" />
-        <Skeleton Name="object_am_Skel_005948" Type="Normal" LimbType="Standard" LimbNone="OBJECT_AM_LIMB_NONE" LimbMax="OBJECT_AM_LIMB_MAX" EnumName="ObjectAmLimb" Offset="0x5948" />
-        <Animation Name="gArmosTakeDamageAnim" Offset="0x5B3C" /> <!-- Original name is "am_yarare" ("to suffer damage") -->
-        <Collision Name="object_am_Colheader_005CF8" Offset="0x5CF8" /> <!-- Original name is "armos_test_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an1.xml
deleted file mode 100644
index 927fa848a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an1.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<Root>
-    <!-- Assets for Anju -->
-    <File Name="object_an1" Segment="6">
-        <Animation Name="gAnju1TasteAnim" Offset="0x1090" /> <!-- Original name is "an_ajimi" ("tasting; sampling​") -->
-        <Animation Name="gAnju1TasteEndAnim" Offset="0x144C" /> <!-- Original name is "an_ajimiend" -->
-
-        <Animation Name="gAnju1LookUpRelievedAnim" Offset="0x1E74" /> <!-- Original name is "an_aogu" ("to look up") -->
-        <Animation Name="gAnju1SurprisedAnim" Offset="0x26B4" /> <!-- Original name is "an_bikkuri" ("to be surprised") -->
-        <Animation Name="gAnju1WaitWithTrayAnim" Offset="0x341C" /> <!-- Original name is "an_obonwait" ("obon" = "tray") -->
-        <Animation Name="gAnju1WalkWithTrayAnim" Offset="0x3EA8" /> <!-- Original name is "an_obonwalk" -->
-        <Animation Name="gAnju1BowAnim" Offset="0x544C" /> <!-- Original name is "an_ojigit" ("bow; bowing") -->
-        <Animation Name="gAnju1CookAnim" Offset="0x65C8" /> <!-- Original name is "an_ryouri" ("cooking") -->
-        <Animation Name="gAnju1SitAnim" Offset="0x71E8" /> <!-- Original name is "an_suwaru" ("to sit") -->
-        <Animation Name="gAnju1SittingInDisbeliefAnim" Offset="0x7E08" /> <!-- Original name is "an_suzetsubou" ("su" = short for "suwaru", "zetsubou" = "despair; hopelessness​") -->
-        <Animation Name="gAnju1IdleAnim" Offset="0x8B6C" /> <!-- Original name is "an_wait" -->
-
-        <!-- Skeleton's Display lists -->
-        <DList Name="gAnju1Skirt4DL" Offset="0xBC20" />
-        <DList Name="gAnju1Skirt3DL" Offset="0xBD20" />
-        <DList Name="gAnju1Skirt2DL" Offset="0xBE60" />
-        <DList Name="gAnju1Skirt1DL" Offset="0xBF88" />
-        <DList Name="gAnju1LeftFootDL" Offset="0xC080" />
-        <DList Name="gAnju1LeftShinDL" Offset="0xC2E8" />
-        <DList Name="gAnju1LeftThighDL" Offset="0xC3C0" />
-        <DList Name="gAnju1RightFootDL" Offset="0xC480" />
-        <DList Name="gAnju1RightShinDL" Offset="0xC6E8" />
-        <DList Name="gAnju1RightThighDL" Offset="0xC7C0" />
-        <DList Name="gAnju1PelvisDL" Offset="0xC880" />
-        <DList Name="gAnju1HeadDL" Offset="0xC940" />
-        <DList Name="gAnju1RightHandDL" Offset="0xD030" />
-        <DList Name="gAnju1RightForearmDL" Offset="0xD208" />
-        <DList Name="gAnju1RightUpperArmDL" Offset="0xD320" />
-        <DList Name="gAnju1LeftHandDL" Offset="0xD440" />
-        <DList Name="gAnju1LeftForearmDL" Offset="0xD618" />
-        <DList Name="gAnju1LeftUpperArmDL" Offset="0xD730" />
-        <DList Name="gAnju1TorsoDL" Offset="0xD850" />
-
-        <!-- Skeleton's TLUTs -->
-        <Texture Name="gAnju1TLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0xDB20" />
-        <Texture Name="gAnju1EyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xDD20" />
-        <Texture Name="gAnju1MouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0xDF20" />
-
-        <!-- Skeleton's textures -->
-        <Texture Name="gAnju1SkinTex" OutName="anju_skin" Format="ci8" Width="8" Height="8" Offset="0xE120" />
-        <Texture Name="gAnju1HairTex" OutName="anju_hair" Format="ci8" Width="8" Height="16" Offset="0xE160" />
-        <Texture Name="gAnju1EyeOpenTex" OutName="anju_eye_open" Format="ci8" Width="32" Height="32" Offset="0xE1E0" TlutOffset="0xDD20" />
-        <Texture Name="gAnju1EarTex" OutName="anju_ear" Format="ci8" Width="16" Height="16" Offset="0xE5E0" />
-        <Texture Name="gAnju1MouthClosedTex" OutName="anju_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xE6E0" TlutOffset="0xDF20" />
-        <Texture Name="gAnju1ShirtButtonTex" OutName="anju_shirt_button" Format="ci8" Width="8" Height="8" Offset="0xE8E0" />
-        <Texture Name="gAnju1HandTex" OutName="anju_hand" Format="ci8" Width="16" Height="16" Offset="0xE920" />
-        <Texture Name="gAnju1SkirtTex" OutName="anju_skirt" Format="ci8" Width="32" Height="32" Offset="0xEA20" />
-        <Texture Name="gAnju1ShirtTex" OutName="anju_shirt" Format="ci8" Width="16" Height="16" Offset="0xEE20" />
-        <Texture Name="gAnju1SleeveTex" OutName="anju_sleeve" Format="ci8" Width="8" Height="16" Offset="0xEF20" />
-        <Texture Name="gAnju1EyeHalfTex" OutName="anju_eye_half" Format="ci8" Width="32" Height="32" Offset="0xEFA0" TlutOffset="0xDD20" />
-        <Texture Name="gAnju1EyeClosedTex" OutName="anju_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF3A0" TlutOffset="0xDD20" />
-        <Texture Name="gAnju1MouthHappyTex" OutName="anju_mouth_happy" Format="ci8" Width="32" Height="16" Offset="0xF7A0" TlutOffset="0xDF20" />
-        <Texture Name="gAnju1EyeSadTex" OutName="anju_eye_sad" Format="ci8" Width="32" Height="32" Offset="0xF9A0" TlutOffset="0xDD20" />
-        <Texture Name="gAnju1EyeComfortTex" OutName="anju_eye_comfort" Format="ci8" Width="32" Height="32" Offset="0xFDA0" TlutOffset="0xDD20" />
-        <Texture Name="gAnju1MouthOpenTex" OutName="anju_mouth_open" Format="ci8" Width="32" Height="16" Offset="0x101A0" TlutOffset="0xDF20" />
-        <Texture Name="gAnju1EyeRelievedClosedTex" OutName="anju_eye_relieved_closed" Format="ci8" Width="32" Height="32" Offset="0x103A0" TlutOffset="0xDD20" />
-
-        <!-- Empty -->
-        <DList Name="gAnju1EmptyDL" Offset="0x111E0" />
-
-        <!-- Food tray for Granny -->
-        <DList Name="gAnju1FoodTrayDL" Offset="0x111E8" /> <!-- Original name is "an_obon_model" -->
-        <Texture Name="gAnju1PlateTex" OutName="tray_plate" Format="i8" Width="32" Height="32" Offset="0x11928" />
-        <Texture Name="gAnju1Food1Tex" OutName="tray_food_1" Format="rgba16" Width="16" Height="16" Offset="0x11D28" />
-        <Texture Name="gAnju1Food2Tex" OutName="tray_food_2" Format="rgba16" Width="16" Height="16" Offset="0x11F28" />
-        <Texture Name="gAnju1CircleTex" OutName="tray_circle" Format="i8" Width="16" Height="16" Offset="0x12128" />
-        <Texture Name="gAnju1Steam1Tex" OutName="tray_steam_1" Format="i4" Width="16" Height="16" Offset="0x12228" />
-        <Texture Name="gAnju1Steam2Tex" OutName="tray_steam_2" Format="i8" Width="16" Height="16" Offset="0x122A8" />
-
-        <!-- <Blob Name="object_an1_Blob_0123A8" Size="0x10" Offset="0x123A8" /> -->
-
-        <!-- Chopsticks used for cooking -->
-        <DList Name="gAnju1ChopsticksDL" Offset="0x12478" /> <!-- Original name is "an_hashi_model" ("chopsticks​") -->
-
-        <!-- Skeleton's limbs -->
-        <Limb Name="gAnju1RootLimb" Type="Standard" EnumName="ANJU1_LIMB_ROOT" Offset="0x124D8" />
-        <Limb Name="gAnju1TorsoLimb" Type="Standard" EnumName="ANJU1_LIMB_TORSO" Offset="0x124E4" />
-        <Limb Name="gAnju1LeftUpperArmLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_UPPER_ARM" Offset="0x124F0" />
-        <Limb Name="gAnju1LeftForearmLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_FOREARM" Offset="0x124FC" />
-        <Limb Name="gAnju1LeftHandLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_HAND" Offset="0x12508" />
-        <Limb Name="gAnju1RightUpperArmLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_UPPER_ARM" Offset="0x12514" />
-        <Limb Name="gAnju1RightForearmLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_FOREARM" Offset="0x12520" />
-        <Limb Name="gAnju1RightHandLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_HAND" Offset="0x1252C" />
-        <Limb Name="gAnju1HeadLimb" Type="Standard" EnumName="ANJU1_LIMB_HEAD" Offset="0x12538" />
-        <Limb Name="gAnju1PelvisLimb" Type="Standard" EnumName="ANJU1_LIMB_PELVIS" Offset="0x12544" />
-        <Limb Name="gAnju1RightThighLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_THIGH" Offset="0x12550" />
-        <Limb Name="gAnju1RightShinLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_SHIN" Offset="0x1255C" />
-        <Limb Name="gAnju1RightFootLimb" Type="Standard" EnumName="ANJU1_LIMB_RIGHT_FOOT" Offset="0x12568" />
-        <Limb Name="gAnju1LeftThighLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_THIGH" Offset="0x12574" />
-        <Limb Name="gAnju1LeftShinLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_SHIN" Offset="0x12580" />
-        <Limb Name="gAnju1LeftFootLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_FOOT" Offset="0x1258C" />
-        <Limb Name="gAnju1Skirt1Limb" Type="Standard" EnumName="ANJU1_LIMB_SKIRT1" Offset="0x12598" />
-        <Limb Name="gAnju1Skirt2Limb" Type="Standard" EnumName="ANJU1_LIMB_SKIRT2" Offset="0x125A4" />
-        <Limb Name="gAnju1Skirt3Limb" Type="Standard" EnumName="ANJU1_LIMB_SKIRT3" Offset="0x125B0" />
-        <Limb Name="gAnju1Skirt4Limb" Type="Standard" EnumName="ANJU1_LIMB_SKIRT4" Offset="0x125BC" />
-
-        <!-- Skeleton -->
-        <Skeleton Name="gAnju1Skel" Type="Flex" LimbType="Standard" LimbNone="ANJU1_LIMB_NONE" LimbMax="ANJU1_LIMB_MAX" EnumName="Anju1Limb" Offset="0x12618" />
-
-        <Animation Name="gAnju1WalkAnim" Offset="0x13048" /> <!-- Original name is "an_walk" -->
-        <Animation Name="gAnju1HoldHandsAnim" Offset="0x13E1C" /> <!-- Holding hands with Kafei while kneeled --> <!-- Original name is "anj_tetunagu_loop" ("joined hands") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an2.xml
deleted file mode 100644
index f56be1431..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an2.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Assets for Anju on the rainy second day -->
-    <File Name="object_an2" Segment="6">
-        <!-- Empty -->
-        <DList Name="gAnju2EmptyDL" Offset="0x370" />
-
-        <!-- Umbrella -->
-        <DList Name="gAnju2UmbrellaDL" Offset="0x378" /> <!-- Original name is "an_kasa_model" ("umbrella; parasol") -->
-        <Texture Name="gAnju2UmbrellaCircleTex" OutName="umbrella_circle" Format="i8" Width="16" Height="16" Offset="0x578" />
-        <Texture Name="gAnju2UmbrellaDesignTex" OutName="umbrella_design" Format="i8" Width="32" Height="32" Offset="0x678" />
-
-        <!-- Animations holding the umbrella -->
-        <Animation Name="gAnju2UmbrellaCryAnim" Offset="0x1B80" /> <!-- Original name is "an_kasasuwarinaku" ("suwari" = "sitting", "naku" = "to cry; to weep; to sob") -->
-        <Animation Name="gAnju2UmbrellaIdleAnim" Offset="0x28DC" /> <!-- Original name is "an_kasawait" -->
-        <Animation Name="gAnju2UmbrellaSitAnim" Offset="0x38A0" /> <!-- Original name is "an_kasawait2suwaru" ("suwaru" = "to sit") -->
-        <Animation Name="gAnju2UmbrellaWalkAnim" Offset="0x42CC" /> <!-- Original name is "an_kasawalk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an3.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an3.xml
deleted file mode 100644
index a5268448c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an3.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Assets for Anju sweeping on the third day -->
-    <File Name="object_an3" Segment="6">
-        <!-- Empty -->
-        <DList Name="gAnju3EmptyDL" Offset="0x300" />
-
-        <!-- Broom -->
-        <DList Name="gAnju3BroomDL" Offset="0x308" /> <!-- Original name is "an_hoki_model" ("broom") -->
-        <Texture Name="gAnju3BroomCircleTex" OutName="broom_circle" Format="i8" Width="16" Height="16" Offset="0x4C8" />
-        <Texture Name="gAnju3BroomSideTex" OutName="broom_side" Format="rgba16" Width="8" Height="32" Offset="0x5C8" />
-        <Texture Name="gAnju3BroomBaseTex" OutName="broom_base" Format="rgba16" Width="8" Height="8" Offset="0x7C8" />
-
-        <!-- Broom-related animations -->
-        <Animation Name="gAnju3BroomSweepAnim" Offset="0x12C0" /> <!-- Original name is "an_hokihaku" ("haku" = "to sweep; to brush; to clean​") -->
-        <Animation Name="gAnju3BroomIdleAnim" Offset="0x201C" /> <!-- Original name is "an_hokiwait" -->
-        <Animation Name="gAnju3BroomWalkAnim" Offset="0x2A4C" /> <!-- Original name is "an_hokiwalk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an4.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an4.xml
deleted file mode 100644
index d159c3dd5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_an4.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<Root>
-    <!-- Assets for Anju in the Couple's Mask cutscene -->
-    <File Name="object_an4" Segment="6">
-        <Animation Name="gAnju4CombineMasks2Anim" Offset="0x41C" /> <!-- Original name is "anj_awase" ("to face; to be opposite (someone)") -->
-
-        <Animation Name="gAnju4HugAnim" Offset="0x13C8" /> <!-- Start hugging while kneeled --> <!-- Original name is "anj_dakiau" ("to embrace each other​") -->
-        <Animation Name="gAnju4HugLoopAnim" Offset="0x2550" /> <!-- hugging while kneeled --> <!-- Original name is "anj_dakiau_loop" -->
-
-        <Animation Name="gAnju4HugReleaseAnim" Offset="0x353C" /> <!-- Stop hugging while kneeled -->  <!-- Original name is "anj_hanare" ("to be separated; to be apart") -->
-        <Animation Name="gAnju4HugReleaseLoopAnim" Offset="0x4498" /> <!-- Original name is "anj_hanare_loop" -->
-
-        <Animation Name="gAnju4LookUpAnim" Offset="0x4A78" /> <!-- Original name is "anj_kaoage" ("raising face") -->
-        <Animation Name="gAnju4LookUpLoopAnim" Offset="0x506C" /> <!-- Original name is "anj_kaoage_loop" -->
-
-        <Animation Name="gAnju4CombineMasks1Anim" Offset="0x60B4" /> <!-- Shows Moon Mask to Kafei --> <!-- Original name is "anj_miseau" ("to show each other​") -->
-
-        <Animation Name="gAnju4MaskStandLoopAnim" Offset="0x6CC0" /> <!-- Holds the Moon Mask while standing --> <!-- Original name is "anj_mitume_loop" ("to stare (at); to gaze (at)") -->
-
-        <Animation Name="gAnju4MaskKneelAnim" Offset="0x7E3C" /> <!-- Holds the Moon Mask while kneeling --> <!-- Original name is "anj_omen" ("mask") -->
-        <Animation Name="gAnju4MaskKneelLoopAnim" Offset="0x88C0" /> <!-- Holds the Moon Mask while kneeled --> <!-- Original name is "anj_omen_loop" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_and.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_and.xml
deleted file mode 100644
index 69ffebc7b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_and.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<Root>
-    <!-- Assets for Anju in a wedding dress -->
-    <File Name="object_and" Segment="6">
-        <Animation Name="gAndStaticAnim" Offset="0xC8" /> <!-- Original name is "and_test" -->
-        <DList Name="gAndTrainDL" Offset="0x4670" />
-        <DList Name="gAndCalvesDL" Offset="0x4708" />
-        <DList Name="gAndShinsDL" Offset="0x47F0" />
-        <DList Name="gAndThighsDL" Offset="0x4998" />
-        <DList Name="gAndPelvisDL" Offset="0x4BE0" />
-        <DList Name="gAndLowerVeilDL" Offset="0x4D90" />
-        <DList Name="gAndUpperVeilDL" Offset="0x4E50" />
-        <DList Name="gAndVeilBaseDL" Offset="0x4F20" />
-        <DList Name="gAndHeadDL" Offset="0x5038" />
-        <DList Name="gAndBouquetDL" Offset="0x56C0" />
-        <DList Name="gAndCenterLeavesTipDL" Offset="0x5888" />
-        <DList Name="gAndCenterLeavesDL" Offset="0x5938" />
-        <DList Name="gAndRightLeavesTipDL" Offset="0x59C8" />
-        <DList Name="gAndRightLeavesDL" Offset="0x5A80" />
-        <DList Name="gAndLeftLeavesTipDL" Offset="0x5BA8" />
-        <DList Name="gAndLeftLeavesDL" Offset="0x5C60" />
-        <DList Name="gAndRightHandDL" Offset="0x5D80" />
-        <DList Name="gAndRightForearmDL" Offset="0x5F10" />
-        <DList Name="gAndRightUpperArmDL" Offset="0x5FF8" />
-        <DList Name="gAndLeftHandDL" Offset="0x6240" />
-        <DList Name="gAndLeftForearmDL" Offset="0x63D8" />
-        <DList Name="gAndLeftUpperArmDL" Offset="0x64C0" />
-        <DList Name="gAndSymbolDL" Offset="0x6708" />
-        <DList Name="gAndTorsoDL" Offset="0x67E0" />
-        <Texture Name="gAndSkinShadowTex" OutName="and_skin_shadow" Format="rgba16" Width="8" Height="8" Offset="0x6C30" />
-        <Texture Name="gAndHairTex" OutName="and_hair" Format="rgba16" Width="8" Height="16" Offset="0x6CB0" />
-        <Texture Name="gAndEarTex" OutName="and_ear" Format="rgba16" Width="16" Height="16" Offset="0x6DB0" />
-        <Texture Name="gAndFingersTex" OutName="and_fingers" Format="rgba16" Width="16" Height="16" Offset="0x6FB0" />
-        <Texture Name="gAndDressGradientTex" OutName="and_dress_gradient" Format="i8" Width="8" Height="8" Offset="0x71B0" />
-        <Texture Name="gAndDressSymbolTex" OutName="and_dress_symbol" Format="i8" Width="32" Height="32" Offset="0x71F0" />
-        <Texture Name="gAndPearlTex" OutName="and_pearl" Format="rgba16" Width="16" Height="16" Offset="0x75F0" />
-        <Texture Name="gAndLeavesTex" OutName="and_leaves" Format="rgba16" Width="32" Height="16" Offset="0x77F0" />
-        <Texture Name="gAndFlowerTex" OutName="and_flower" Format="rgba16" Width="16" Height="16" Offset="0x7BF0" />
-        <Texture Name="gAndEyeOpenTex" OutName="and_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x7DF0" />
-        <Texture Name="gAndEyeClosingTex" OutName="and_eye_closing" Format="rgba16" Width="32" Height="32" Offset="0x85F0" />
-        <Texture Name="gAndEyeClosedTex" OutName="and_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x8DF0" />
-        <Texture Name="gAndEyeOpeningTex" OutName="and_eye_opening" Format="rgba16" Width="32" Height="32" Offset="0x95F0" />
-        <Texture Name="gAndMouthNeutralTex" OutName="and_mouth_neutral" Format="rgba16" Width="32" Height="16" Offset="0x9DF0" />
-        <Texture Name="gAndMouthSmileTex" OutName="and_mouth_smile" Format="rgba16" Width="32" Height="16" Offset="0xA1F0" />
-        <Texture Name="gAndDressSpotsTex" OutName="and_dress_spots" Format="i8" Width="32" Height="64" Offset="0xA5F0" />
-        <Texture Name="gAndDressCircleTex" OutName="and_dress_circle" Format="i8" Width="32" Height="32" Offset="0xADF0" />
-        <Limb Name="gAndRootLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_ROOT" Offset="0xB1F0" />
-        <Limb Name="gAndTorsoLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_TORSO" Offset="0xB1FC" />
-        <Limb Name="gAndSymbolLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_SYMBOL" Offset="0xB208" />
-        <Limb Name="gAndLeftUpperArmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_UPPER_ARM" Offset="0xB214" />
-        <Limb Name="gAndLeftForearmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_FOREARM" Offset="0xB220" />
-        <Limb Name="gAndLeftHandLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_HAND" Offset="0xB22C" />
-        <Limb Name="gAndRightUpperArmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_UPPER_ARM" Offset="0xB238" />
-        <Limb Name="gAndRightForearmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_FOREARM" Offset="0xB244" />
-        <Limb Name="gAndRightHandLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_HAND" Offset="0xB250" />
-        <Limb Name="gAndBouquetLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_BOUQUET" Offset="0xB25C" />
-        <Limb Name="gAndLeftLeavesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_LEAVES" Offset="0xB268" />
-        <Limb Name="gAndLeftLeavesTipLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_LEAVES_TIP" Offset="0xB274" />
-        <Limb Name="gAndRightLeavesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_LEAVES" Offset="0xB280" />
-        <Limb Name="gAndRightLeavesTipLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_LEAVES_TIP" Offset="0xB28C" />
-        <Limb Name="gAndCenterLeavesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_CENTER_LEAVES" Offset="0xB298" />
-        <Limb Name="gAndCenterLeavesTipLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_CENTER_LEAVES_TIP" Offset="0xB2A4" />
-        <Limb Name="gAndVeilBaseLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_VEIL_BASE" Offset="0xB2B0" />
-        <Limb Name="gAndHeadLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_HEAD" Offset="0xB2BC" />
-        <Limb Name="gAndUpperVeilLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_UPPER_VEIL" Offset="0xB2C8" />
-        <Limb Name="gAndLowerVeilLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LOWER_VEIL" Offset="0xB2D4" />
-        <Limb Name="gAndPelvisLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_PELVIS" Offset="0xB2E0" />
-        <Limb Name="gAndThighsLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_THIGHS" Offset="0xB2EC" />
-        <Limb Name="gAndShinsLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_SHINS" Offset="0xB2F8" />
-        <Limb Name="gAndCalvesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_CALVES" Offset="0xB304" />
-        <Limb Name="gAndTrainLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_TRAIN" Offset="0xB310" />
-        <Skeleton Name="gAndSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AND_LIMB_NONE" LimbMax="OBJECT_AND_LIMB_MAX" EnumName="ObjectAndLimb" Offset="0xB380" />
-        <Animation Name="gAndWalkAnim" Offset="0xDA58" /> <!-- Original name is "wa_aruku" ("walk") -->
-        <Animation Name="gAndRaiseHandAnim" Offset="0xEE00" /> <!-- Original name is "wa_hidari" ("left; left hand side") -->
-        <Animation Name="gAndRaisedHandLoopAnim" Offset="0xF6C4" /> <!-- Original name is "wa_hidari_loop" -->
-        <Animation Name="gAndRaiseHeadAnim" Offset="0xFE64" /> <!-- Original name is "wa_kaoage" ("raising face") -->
-        <Animation Name="gAndRaisedHeadLoopAnim" Offset="0x1067C" /> <!-- Original name is "wa_kaoage_loop" -->
-        <Animation Name="gAndRaisedHandWalkAnim" Offset="0x11AFC" /> <!-- Original name is "wa_kaoaruki" (probably a combination of "kaoage" and "aruki") -->
-        <Animation Name="gAndIdleAnim" Offset="0x122D0" /> <!-- Original name is "wa_utumuki_loop" ("looking down") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ani.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ani.xml
deleted file mode 100644
index 8bc8aa5e3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ani.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<Root>
-    <File Name="object_ani" Segment="6">
-        <Animation Name="gAniTreeHangLosingBalanceAnim" Offset="0x7FC" /> <!-- Original name is "Ani_guratsuku" ("to be unsteady; to reel; to shake​") -->
-        <Animation Name="gAniFallOverHoldingFootAnim" Offset="0xC14" /> <!-- Original name is "Ani_itameru" ("to hurt; to injure; to cause pain") -->
-        <Animation Name="gAniHoldingFootWrithingInPainAnim" Offset="0x11CC" /> <!-- Original name is "Ani_itameru2" -->
-        <Animation Name="gAniUnusedSidesteppingAnim" Offset="0x1584" /> <!-- Original name is "Ani_kaniark" ("kami" = "crab", "ark" = probably short for "aruki", which is "to walk") -->
-        <Animation Name="gAniTreeHangingAnim" Offset="0x1D48" /> <!-- Original name is "Ani_ki01" ("tree") -->
-        <Animation Name="gAniTreeHangingReachAnim" Offset="0x27A0" /> <!-- Original name is "Ani_ki02" -->
-        <Limb Name="gAniPelvisLimb" Type="Standard" EnumName="ANI_LIMB_PELVIS" Offset="0x27B0" />
-        <Limb Name="gAniLeftThighLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_THIGH" Offset="0x27BC" />
-        <Limb Name="gAniLeftShinLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_SHIN" Offset="0x27C8" />
-        <Limb Name="gAniLeftFootLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_FOOT" Offset="0x27D4" />
-        <Limb Name="gAniRightThighLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_THIGH" Offset="0x27E0" />
-        <Limb Name="gAniRightShinLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_SHIN" Offset="0x27EC" />
-        <Limb Name="gAniRightFootLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_FOOT" Offset="0x27F8" />
-        <Limb Name="gAniTorsoLimb" Type="Standard" EnumName="ANI_LIMB_TORSO" Offset="0x2804" />
-        <Limb Name="gAniLeftUpperArmLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_UPPER_ARM" Offset="0x2810" />
-        <Limb Name="gAniLeftForearmLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_FOREARM" Offset="0x281C" />
-        <Limb Name="gAniLeftHandLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_HAND" Offset="0x2828" />
-        <Limb Name="gAniRightUpperArmLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_UPPER_ARM" Offset="0x2834" />
-        <Limb Name="gAniRightForearmLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_FOREARM" Offset="0x2840" />
-        <Limb Name="gAniRightHandLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_HAND" Offset="0x284C" />
-        <Limb Name="gAniHeadLimb" Type="Standard" EnumName="ANI_LIMB_HEAD" Offset="0x2858" />
-        <Skeleton Name="gAniSkel" Type="Flex" LimbType="Standard" LimbNone="ANI_LIMB_NONE" LimbMax="ANI_LIMB_MAX" EnumName="AniLimb" Offset="0x28A0" />
-        <DList Name="gAniRightHandDL" Offset="0x4860" />
-        <DList Name="gAniRightForearmDL" Offset="0x4A50" />
-        <DList Name="gAniRightUpperArmDL" Offset="0x4B38" />
-        <DList Name="gAniLeftHandDL" Offset="0x4C30" />
-        <DList Name="gAniLeftForearmDL" Offset="0x4E20" />
-        <DList Name="gAniLeftUpperArmDL" Offset="0x4F08" />
-        <DList Name="gAniTorsoDL" Offset="0x5000" />
-        <DList Name="gAniRightFootDL" Offset="0x5270" />
-        <DList Name="gAniRightShinDL" Offset="0x5420" />
-        <DList Name="gAniRightThighDL" Offset="0x5668" />
-        <DList Name="gAniLeftFootDL" Offset="0x5778" />
-        <DList Name="gAniLeftShinDL" Offset="0x5928" />
-        <DList Name="gAniLeftThighDL" Offset="0x5C50" />
-        <DList Name="gAniPelvisDL" Offset="0x5D60" />
-        <Texture Name="gAniGeneralTLUT" OutName="ani_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5E58" />
-        <Texture Name="gAniUnkGradientTex" OutName="ani_unk_gradient1" Format="ci8" Width="8" Height="8" Offset="0x6058" />
-        <Texture Name="gAniFingersTex" OutName="ani_fingers" Format="ci8" Width="8" Height="8" Offset="0x6098" />
-        <Texture Name="gAniShirtEdgeTex" OutName="ani_shirt_edge" Format="i8" Width="8" Height="8" Offset="0x60D8" />
-        <Texture Name="gAniSandleBuckleTex" OutName="ani_sandle_buckle" Format="ci8" Width="16" Height="16" Offset="0x6118" />
-        <Texture Name="gAniPantsTex" OutName="ani_pants" Format="ci8" Width="16" Height="16" Offset="0x6218" />
-        <Texture Name="gAniEyeTLUT" OutName="ani_eye_tlut" Format="rgba16" Width="16" Height="12" Offset="0x6318" />
-        <Texture Name="gAniOpenEyeTex" OutName="ani_open_eye" Format="ci8" Width="32" Height="32" Offset="0x6498" TlutOffset="0x6318" />
-        <Texture Name="gAniMouthTex" OutName="ani_mouth" Format="ci8" Width="16" Height="16" Offset="0x6898" />
-        <Texture Name="gAniUnkGradient2Tex" OutName="ani_unk_gradient2" Format="ci8" Width="8" Height="8" Offset="0x6998" />
-        <Texture Name="gAniEarTex" OutName="ani_ear" Format="ci8" Width="8" Height="8" Offset="0x69D8" />
-        <Texture Name="gAniHairTex" OutName="ani_hair" Format="ci8" Width="16" Height="16" Offset="0x6A18" />
-        <Texture Name="gAniClosingEyeTex" OutName="ani_closing_eye" Format="ci8" Width="32" Height="32" Offset="0x6B18" TlutOffset="0x6318"/>
-        <Texture Name="gAniClosedEyeTex" OutName="ani_closed_eye" Format="ci8" Width="32" Height="32" Offset="0x6F18" TlutOffset="0x6318"/>
-        <DList Name="gAniHeadDL" Offset="0x7B58" />
-
-        <!-- Only the first half of the animation is used by EnAni when knocked out of tree -->
-        <Animation Name="gAniLandingThenStandingUpAnim" Offset="0x9220" /> <!-- Original name is "Ani_oriru" ("to go down; to come down​") -->
-        <!-- used by EnOssan -->
-        <Animation Name="gAniHoldUpHandAnim" Offset="0x9734" /> <!-- Original name is "Ani_talk" -->
-        <Animation Name="gAniStandingNormalAnim" Offset="0x9D34" /> <!-- Original name is "Ani_wait" -->
-        <Animation Name="gAniHandBehindHeadApologyAnim" Offset="0xA460" /> <!-- Original name is "Ani_zorawait" -->
-        <!-- left over from OOT firetemple deathmountain cutscene, unused in MM -->
-        <Animation Name="gAniKnockBackAnim" Offset="0xA978" /> <!-- Original name is "ani_bikkuri" ("to be amazed; to be frightened") -->
-        <Animation Name="gAniKnockBackGettingUpAnim" Offset="0xB2B0" /> <!-- Original name is "ani_nanyarona" -->
-        <!-- left over from OOT sitting on roof, unused in MM -->
-        <Animation Name="gAniSittingBackAnim" Offset="0xB8AC" /> <!-- Original name is "ani_suwari_wait" ("sitting") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_aob.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_aob.xml
deleted file mode 100644
index 50de06ea0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_aob.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Assets for Mamamu Yan, the proprietor of the Doggy Racetrack. -->
-    <File Name="object_aob" Segment="6">
-        <!-- Unused dummied-out idle animation. Probably an OoT leftover, since her idle animation in that game has the same name. -->
-        <Animation Name="gMamamuYanUnusedIdleAnim" Offset="0x7C" /> <!-- Original name is "Aob_mastu" (probably a misspelling of "matsu" or "wait") -->
-
-        <!-- Mamamu Yan Limbs -->
-        <Limb Name="gMamamuYanDressLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_DRESS" Offset="0x90" />
-        <Limb Name="gMamamuYanLeftThighLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_THIGH" Offset="0x9C" />
-        <Limb Name="gMamamuYanLeftShinLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_SHIN" Offset="0xA8" />
-        <Limb Name="gMamamuYanLeftFootLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_FOOT" Offset="0xB4" />
-        <Limb Name="gMamamuYanRightThighLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_THIGH" Offset="0xC0" />
-        <Limb Name="gMamamuYanRightShinLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_SHIN" Offset="0xCC" />
-        <Limb Name="gMamamuYanRightFootLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_FOOT" Offset="0xD8" />
-        <Limb Name="gMamamuYanTorsoLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_TORSO" Offset="0xE4" />
-        <Limb Name="gMamamuYanLeftUpperArmLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_UPPER_ARM" Offset="0xF0" />
-        <Limb Name="gMamamuYanLeftForearmLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_FOREARM" Offset="0xFC" />
-        <Limb Name="gMamamuYanLeftHandLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_LEFT_HAND" Offset="0x108" />
-        <Limb Name="gMamamuYanRightUpperArmLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_UPPER_ARM" Offset="0x114" />
-        <Limb Name="gMamamuYanRightForearmLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_FOREARM" Offset="0x120" />
-        <Limb Name="gMamamuYanRightHandLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_RIGHT_HAND" Offset="0x12C" />
-        <Limb Name="gMamamuYanHeadLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_HEAD" Offset="0x138" />
-
-        <!-- Mamamu Yan Skeleton -->
-        <Skeleton Name="gMamamuYanSkel" Type="Flex" LimbType="Standard" LimbNone="MAMAMU_YAN_LIMB_NONE" LimbMax="MAMAMU_YAN_LIMB_MAX" EnumName="MamamuYanLimb" Offset="0x180" />
-
-        <!-- Mamamu Yan Textures -->
-        <Texture Name="gMamamuYanTLUT" OutName="mamamu_yan_tlut" Format="rgba16" Width="16" Height="16" Offset="0x198" />
-        <Texture Name="gMamamuYanHairTex" OutName="mamamu_yan_hair" Format="ci8" Width="16" Height="16" Offset="0x398" />
-        <Texture Name="gMamamuYanSkinTex" OutName="mamamu_yan_skin" Format="ci8" Width="8" Height="8" Offset="0x498" />
-        <Texture Name="gMamamuYanEarTex" OutName="mamamu_yan_ear" Format="ci8" Width="16" Height="16" Offset="0x4D8" />
-        <Texture Name="gMamamuYanLipsTex" OutName="mamamu_yan_lips" Format="ci8" Width="8" Height="8" Offset="0x5D8" />
-        <Texture Name="gMamamuYanNostrilTex" OutName="mamamu_yan_nostril" Format="ci8" Width="8" Height="8" Offset="0x618" />
-        <Texture Name="gMamamuYanEyeOpenTex" OutName="mamamu_yan_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x658" /> 
-        <Texture Name="gMamamuYanEyeHalfTex" OutName="mamamu_yan_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xE58" /> 
-        <Texture Name="gMamamuYanEyeClosedTex" OutName="mamamu_yan_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1658" /> 
-        <Texture Name="gMamamuYanFingersTex" OutName="mamamu_yan_fingers" Format="ci8" Width="16" Height="16" Offset="0x1E58" />
-        <Texture Name="gMamamuYanSleevesTex" OutName="mamamu_yan_sleeves" Format="ci8" Width="8" Height="8" Offset="0x1F58" />
-        <Texture Name="gMamamuYanDressTex" OutName="mamamu_yan_dress" Format="ci8" Width="8" Height="8" Offset="0x1F98" />
-
-        <!-- Mamamu Yan Limb DisplayLists -->
-        <DList Name="gMamamuYanHeadDL" Offset="0x3D18" />
-        <DList Name="gMamamuYanRightHandDL" Offset="0x44D8" />
-        <DList Name="gMamamuYanRightForearmDL" Offset="0x46E0" />
-        <DList Name="gMamamuYanRightUpperArmDL" Offset="0x4810" />
-        <DList Name="gMamamuYanLeftHandDL" Offset="0x49B8" />
-        <DList Name="gMamamuYanLeftForearmDL" Offset="0x4BC0" />
-        <DList Name="gMamamuYanLeftUpperArmDL" Offset="0x4CF0" />
-        <DList Name="gMamamuYanTorsoDL" Offset="0x4E98" />
-        <DList Name="gMamamuYanRightFootDL" Offset="0x5138" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanRightShinDL" Offset="0x5208" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanRightThighDL" Offset="0x52D8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanLeftFootDL" Offset="0x53A8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanLeftShinDL" Offset="0x5478" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanLeftThighDL" Offset="0x5548" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gMamamuYanDressDL" Offset="0x5618" />
-
-        <!-- Mamamu Yan Animations -->
-        <Animation Name="gMamamuYanSurpriseStartAnim" Offset="0x58EC" /> <!-- Original name is "Aob_odoroku" ("surprise") -->
-        <Animation Name="gMamamuYanSurpriseLoopAnim" Offset="0x6040" /> <!-- Original name is "Aob_odorokuroop" -->
-        <Animation Name="gMamamuYanLaughStartAnim" Offset="0x68B4" /> <!-- Original name is "Aob_sikkari" (reference to her catchphrase in the Japanese text) -->
-        <Animation Name="gMamamuYanLaughLoopAnim" Offset="0x700C" /> <!-- Original name is "Aob_sikkariroop" -->
-        <Animation Name="gMamamuYanIdleAnim" Offset="0x7758" /> <!-- Original name is "Aob_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_astr_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_astr_obj.xml
deleted file mode 100644
index 233de785b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_astr_obj.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_astr_obj" Segment="6">
-        <Texture Name="object_astr_obj_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="object_astr_obj_Tex_000020" OutName="tex_000020" Format="rgba16" Width="32" Height="32" Offset="0x20" />
-        <Texture Name="object_astr_obj_Tex_000820" OutName="tex_000820" Format="ci4" Width="64" Height="64" Offset="0x820" />
-        <Texture Name="object_astr_obj_Tex_001020" OutName="tex_001020" Format="ia8" Width="64" Height="64" Offset="0x1020" />
-        <DList Name="object_astr_obj_DL_002170" Offset="0x2170" />
-        <DList Name="object_astr_obj_DL_002178" Offset="0x2178" /> <!-- Original name is "z2_tennmondai_hahen_model" ("tennmondai" = "astronomical observatory​", "hahen" = "fragment") -->
-        <DList Name="object_astr_obj_DL_0022E0" Offset="0x22E0" />
-        <DList Name="object_astr_obj_DL_002380" Offset="0x2380" /> <!-- Original name is "z2_tennmondai_kabe_model" ("tennmondai" = "astronomical observatory​", "kabe" = "wall") -->
-        <Collision Name="object_astr_obj_Colheader_002498" Offset="0x2498" /> <!-- Original name is "z2_tennmondai_kabe_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_az.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_az.xml
deleted file mode 100644
index 42e5bdc61..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_az.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<Root>
-    <!-- Assets for the Beaver Bros. -->
-    <File Name="object_az" Segment="6">
-        <!-- Older Beaver Limb DisplayLists -->
-        <DList Name="gBeaverOlderBrotherHeadDL" Offset="0x1B80" />
-        <DList Name="gBeaverOlderBrotherHairLeftDL" Offset="0x2098" />
-        <DList Name="gBeaverOlderBrotherHairBackDL" Offset="0x2120" />
-        <DList Name="gBeaverOlderBrotherHairRightDL" Offset="0x21A8" />
-        <DList Name="gBeaverOlderBrotherTeethDL" Offset="0x2230" />
-        <DList Name="gBeaverOlderBrotherLeftArmDL" Offset="0x22C8" />
-        <DList Name="gBeaverOlderBrotherRightArmDL" Offset="0x2418" />
-        <DList Name="gBeaverOlderBrotherInnerTubeDL" Offset="0x2568" />
-        <DList Name="gBeaverOlderBrotherTorsoDL" Offset="0x26D8" />
-        <DList Name="gBeaverOlderBrotherTailEndDL" Offset="0x27D0" />
-        <DList Name="gBeaverOlderBrotherTailBaseDL" Offset="0x28D8" />
-        <DList Name="gBeaverOlderBrotherLeftLegDL" Offset="0x2A08" />
-        <DList Name="gBeaverOlderBrotherRightLegDL" Offset="0x2B48" />
-        <DList Name="gBeaverOlderBrotherPelvisDL" Offset="0x2C88" />
-
-        <!-- Older Beaver Textures -->
-        <Texture Name="gBeaverOlderBrotherGoggleTex" OutName="beaver_older_brother_goggle" Format="rgba16" Width="32" Height="32" Offset="0x2DC8" />
-        <Texture Name="gBeaverOlderBrotherMouthTex" OutName="beaver_older_brother_mouth" Format="rgba16" Width="32" Height="32" Offset="0x35C8" />
-        <Texture Name="gBeaverOlderBrotherNoseTex" OutName="beaver_older_brother_nose" Format="rgba16" Width="16" Height="32" Offset="0x3DC8" />
-        <Texture Name="gBeaverOlderBrotherSkinTex" OutName="beaver_older_brother_skin" Format="rgba16" Width="16" Height="16" Offset="0x41C8" />
-        <Texture Name="gBeaverOlderBrotherGoggleStrapTex" OutName="beaver_older_brother_goggle_strap" Format="rgba16" Width="16" Height="16" Offset="0x43C8" />
-        <Texture Name="gBeaverOlderBrotherCapTex" OutName="beaver_older_brother_cap" Format="rgba16" Width="16" Height="16" Offset="0x45C8" />
-        <Texture Name="gBeaverOlderBrotherToothTex" OutName="beaver_older_brother_tooth" Format="rgba16" Width="8" Height="16" Offset="0x47C8" />
-        <Texture Name="gBeaverOlderBrotherHairTex" OutName="beaver_older_brother_hair" Format="rgba16" Width="32" Height="32" Offset="0x48C8" /> <!-- A completely transparent texture -->
-        <Texture Name="gBeaverOlderBrotherHandAndFootTex" OutName="beaver_older_brother_hand_and_foot" Format="rgba16" Width="32" Height="32" Offset="0x50C8" />
-        <Texture Name="gBeaverOlderBrotherTorsoTex" OutName="beaver_older_brother_torso" Format="rgba16" Width="32" Height="32" Offset="0x58C8" />
-        <Texture Name="gBeaverOlderBrotherInnerTubeTex" OutName="beaver_older_brother_inner_tube" Format="rgba16" Width="32" Height="32" Offset="0x60C8" />
-        <Texture Name="gBeaverOlderBrotherTailTex" OutName="beaver_older_brother_tail" Format="rgba16" Width="32" Height="32" Offset="0x68C8" />
-        <Texture Name="gBeaverOlderBrotherPantsTex" OutName="beaver_older_brother_pants" Format="rgba16" Width="16" Height="16" Offset="0x70C8" />
-
-        <!-- Older Beaver Limbs -->
-        <Limb Name="gBeaverOlderBrotherRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_ROOT" Offset="0x72C8" />
-        <Limb Name="gBeaverOlderBrotherPelvisRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_PELVIS_ROOT" Offset="0x72D4" />
-        <Limb Name="gBeaverOlderBrotherPelvisLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_PELVIS" Offset="0x72E0" />
-        <Limb Name="gBeaverOlderBrotherTorsoRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TORSO_ROOT" Offset="0x72EC" />
-        <Limb Name="gBeaverOlderBrotherHeadRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_HEAD_ROOT" Offset="0x72F8" />
-        <Limb Name="gBeaverOlderBrotherHeadLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_HEAD" Offset="0x7304" />
-        <Limb Name="gBeaverOlderBrotherTeethLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TEETH" Offset="0x7310" />
-        <Limb Name="gBeaverOlderBrotherHairRightLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_HAIR_RIGHT" Offset="0x731C" />
-        <Limb Name="gBeaverOlderBrotherHairLeftLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_HAIR_LEFT" Offset="0x7328" />
-        <Limb Name="gBeaverOlderBrotherHairBackLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_HAIR_BACK" Offset="0x7334" />
-        <Limb Name="gBeaverOlderBrotherLeftArmRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_LEFT_ARM_ROOT" Offset="0x7340" />
-        <Limb Name="gBeaverOlderBrotherLeftArmLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_LEFT_ARM" Offset="0x734C" />
-        <Limb Name="gBeaverOlderBrotherRightArmRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_RIGHT_ARM_ROOT" Offset="0x7358" />
-        <Limb Name="gBeaverOlderBrotherRightArmLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_RIGHT_ARM" Offset="0x7364" />
-        <Limb Name="gBeaverOlderBrotherTorsoLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TORSO" Offset="0x7370" />
-        <Limb Name="gBeaverOlderBrotherInnerTubeLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_INNER_TUBE" Offset="0x737C" />
-        <Limb Name="gBeaverOlderBrotherTailRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TAIL_ROOT" Offset="0x7388" />
-        <Limb Name="gBeaverOlderBrotherTailBaseLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TAIL_BASE" Offset="0x7394" />
-        <Limb Name="gBeaverOlderBrotherTailEndLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_TAIL_END" Offset="0x73A0" />
-        <Limb Name="gBeaverOlderBrotherRightLegRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_RIGHT_LEG_ROOT" Offset="0x73AC" />
-        <Limb Name="gBeaverOlderBrotherRightLegLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_RIGHT_LEG" Offset="0x73B8" />
-        <Limb Name="gBeaverOlderBrotherLeftLegRootLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_LEFT_LEG_ROOT" Offset="0x73C4" />
-        <Limb Name="gBeaverOlderBrotherLeftLegLimb" Type="Standard" EnumName="BEAVER_OLDER_BROTHER_LIMB_LEFT_LEG" Offset="0x73D0" />
-
-        <!-- Older Beaver Skeleton -->
-        <Skeleton Name="gBeaverOlderBrotherSkel" Type="Flex" LimbType="Standard" LimbNone="BEAVER_OLDER_BROTHER_LIMB_NONE" LimbMax="BEAVER_OLDER_BROTHER_LIMB_MAX" EnumName="BeaverOlderBrotherLimb" Offset="0x7438" />
-
-        <!-- Beaver Animations -->
-        <Animation Name="gBeaverGlitchyLimbSpinAnim" Offset="0x750C" /> <!-- Original name might be "bea_wait". Unused -->
-        <Animation Name="gBeaverLaughLeftAnim" Offset="0x7D3C" /> <!-- Original name is "bev_chukletoL" -->
-        <Animation Name="gBeaverLaughRightAnim" Offset="0x86AC" /> <!-- Original name is "bev_chukletoR" -->
-        <Animation Name="gBeaverSwimWithSpinningTailAnim" Offset="0x8960" /> <!-- Original name is "bev_propellerswim" -->
-        <Animation Name="gBeaverSwimWithRaisedTailAnim" Offset="0x8BB4" /> <!-- Unused variation of gBeaverSwimWithSpinningTailAnim where the tail just stays upright. Original name is "bev_propellerswim2" -->
-        <Animation Name="gBeaverSwimAnim" Offset="0x8EAC" /> <!-- Original name is "bev_swim" -->
-        <Animation Name="gBeaverTalkAnim" Offset="0x925C" /> <!-- Original name is "bev_talk1" -->
-        <Animation Name="gBeaverTalkWaveArmsAnim" Offset="0x9B4C" /> <!-- Original name is "bev_talk2" -->
-        <Animation Name="gBeaverTalkToLeftAnim" Offset="0xA25C" /> <!-- Original name is "bev_talktoL" -->
-        <Animation Name="gBeaverTalkToRightAnim" Offset="0xAAEC" /> <!-- Original name is "bev_talktoR" -->
-        <Animation Name="gBeaverBowAnim" Offset="0xB94C" /> <!-- Original name is "bev_thankyou" -->
-        <Animation Name="gBeaverIdleAnim" Offset="0xBCFC" /> <!-- Original name is "bev_wait" -->
-        <Animation Name="gBeaverIdleFaceLeftAnim" Offset="0xC0A0" /> <!-- Original name is "bev_waittoL" -->
-        <Animation Name="gBeaverIdleFaceRightAnim" Offset="0xC47C" /> <!-- Original name is "bev_waittoR" -->
-        <Animation Name="gBeaverWalkAnim" Offset="0xC94C" /> <!-- Original name is "bev_walk" -->
-
-        <!-- Younger Beaver Limb DisplayLists -->
-        <DList Name="gBeaverYoungerBrotherHeadDL" Offset="0xE670" />
-        <DList Name="gBeaverYoungerBrotherHairLeftDL" Offset="0xEB58" />
-        <DList Name="gBeaverYoungerBrotherHairRightDL" Offset="0xEBE0" />
-        <DList Name="gBeaverYoungerBrotherHairBackDL" Offset="0xEC68" />
-        <DList Name="gBeaverYoungerBrotherTeethDL" Offset="0xECF0" />
-        <DList Name="gBeaverYoungerBrotherLeftArmDL" Offset="0xED88" />
-        <DList Name="gBeaverYoungerBrotherRightArmDL" Offset="0xEEE0" />
-        <DList Name="gBeaverYoungerBrotherLogsDL" Offset="0xF030" />
-        <DList Name="gBeaverYoungerBrotherTorsoDL" Offset="0xF190" />
-        <DList Name="gBeaverYoungerBrotherTailEndDL" Offset="0xF2B0" />
-        <DList Name="gBeaverYoungerBrotherTailBaseDL" Offset="0xF3B8" />
-        <DList Name="gBeaverYoungerBrotherLeftLegDL" Offset="0xF4E8" />
-        <DList Name="gBeaverYoungerBrotherRightLegDL" Offset="0xF638" />
-        <DList Name="gBeaverYoungerBrotherPelvisDL" Offset="0xF788" />
-
-        <!-- Younger Beaver Textures -->
-        <Texture Name="gBeaverYoungerBrotherEye1Tex" OutName="beaver_younger_brother_eye_1" Format="rgba16" Width="32" Height="32" Offset="0xF918" />
-        <Texture Name="gBeaverYoungerBrotherEye2Tex" OutName="beaver_younger_brother_eye_2" Format="rgba16" Width="32" Height="32" Offset="0x10118" />
-        <Texture Name="gBeaverYoungerBrotherEye3Tex" OutName="beaver_younger_brother_eye_3" Format="rgba16" Width="32" Height="32" Offset="0x10918" />
-        <Texture Name="gBeaverYoungerBrotherEye4Tex" OutName="beaver_younger_brother_eye_4" Format="rgba16" Width="32" Height="32" Offset="0x11118" />
-        <Texture Name="gBeaverYoungerBrotherMouthTex" OutName="beaver_younger_brother_mouth" Format="rgba16" Width="32" Height="32" Offset="0x11918" />
-        <Texture Name="gBeaverYoungerBrotherNoseTex" OutName="beaver_younger_brother_nose" Format="rgba16" Width="16" Height="32" Offset="0x12118" />
-        <Texture Name="gBeaverYoungerBrotherSkinTex" OutName="beaver_younger_brother_skin" Format="rgba16" Width="16" Height="16" Offset="0x12518" />
-        <Texture Name="gBeaverYoungerBrotherClothesTex" OutName="beaver_younger_brother_clothes" Format="rgba16" Width="32" Height="32" Offset="0x12718" />
-        <Texture Name="gBeaverYoungerBrotherHairTex" OutName="beaver_younger_brother_hair" Format="rgba16" Width="32" Height="32" Offset="0x12F18" />
-        <Texture Name="gBeaverYoungerBrotherToothTex" OutName="beaver_younger_brother_tooth" Format="rgba16" Width="8" Height="16" Offset="0x13718" />
-        <Texture Name="gBeaverYoungerBrotherHandAndFootTex" OutName="beaver_younger_brother_hand_and_foot" Format="rgba16" Width="32" Height="32" Offset="0x13818" />
-        <Texture Name="gBeaverYoungerBrotherLogsEndTex" OutName="beaver_younger_brother_logs_end" Format="rgba16" Width="32" Height="32" Offset="0x14018" />
-        <Texture Name="gBeaverYoungerBrotherLogsTex" OutName="beaver_younger_brother_logs" Format="rgba16" Width="32" Height="32" Offset="0x14818" />
-        <Texture Name="gBeaverYoungerBrotherTailTex" OutName="beaver_younger_brother_tail" Format="rgba16" Width="32" Height="32" Offset="0x15018" />
-        <Texture Name="gBeaverYoungerBrotherTailSkinTex" OutName="beaver_younger_brother_tail_skin" Format="rgba16" Width="32" Height="32" Offset="0x15818" />
-        <Texture Name="gBeaverYoungerBrotherBeltRedTex" OutName="beaver_younger_brother_belt_red" Format="rgba16" Width="32" Height="32" Offset="0x16018" />
-        <Texture Name="gBeaverYoungerBrotherBeltGreenTex" OutName="beaver_younger_brother_belt_green" Format="rgba16" Width="32" Height="32" Offset="0x16818" />
-        <Texture Name="gBeaverYoungerBrotherBeltBlueTex" OutName="beaver_younger_brother_belt_blue" Format="rgba16" Width="32" Height="32" Offset="0x17018" />
-
-        <!-- Younger Beaver Limbs -->
-        <Limb Name="gBeaverYoungerBrotherRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_ROOT" Offset="0x17820" />
-        <Limb Name="gBeaverYoungerBrotherPelvisRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_PELVIS_ROOT" Offset="0x1782C" />
-        <Limb Name="gBeaverYoungerBrotherPelvisLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_PELVIS" Offset="0x17838" />
-        <Limb Name="gBeaverYoungerBrotherTorsoRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TORSO_ROOT" Offset="0x17844" />
-        <Limb Name="gBeaverYoungerBrotherHeadRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_HEAD_ROOT" Offset="0x17850" />
-        <Limb Name="gBeaverYoungerBrotherHeadLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_HEAD" Offset="0x1785C" />
-        <Limb Name="gBeaverYoungerBrotherTeethLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TEETH" Offset="0x17868" />
-        <Limb Name="gBeaverYoungerBrotherHairRightLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_HAIR_RIGHT" Offset="0x17874" />
-        <Limb Name="gBeaverYoungerBrotherHairLeftLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_HAIR_LEFT" Offset="0x17880" />
-        <Limb Name="gBeaverYoungerBrotherHairBackLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_HAIR_BACK" Offset="0x1788C" />
-        <Limb Name="gBeaverYoungerBrotherLeftArmRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_LEFT_ARM_ROOT" Offset="0x17898" />
-        <Limb Name="gBeaverYoungerBrotherLeftArmLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_LEFT_ARM" Offset="0x178A4" />
-        <Limb Name="gBeaverYoungerBrotherRightArmRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_RIGHT_ARM_ROOT" Offset="0x178B0" />
-        <Limb Name="gBeaverYoungerBrotherRightArmLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_RIGHT_ARM" Offset="0x178BC" />
-        <Limb Name="gBeaverYoungerBrotherTorsoLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TORSO" Offset="0x178C8" />
-        <Limb Name="gBeaverYoungerBrotherLogsLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_LOGS" Offset="0x178D4" />
-        <Limb Name="gBeaverYoungerBrotherTailRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TAIL_ROOT" Offset="0x178E0" />
-        <Limb Name="gBeaverYoungerBrotherTailBaseLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TAIL_BASE" Offset="0x178EC" />
-        <Limb Name="gBeaverYoungerBrotherTailEndLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_TAIL_END" Offset="0x178F8" />
-        <Limb Name="gBeaverYoungerBrotherRightLegRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_RIGHT_LEG_ROOT" Offset="0x17904" />
-        <Limb Name="gBeaverYoungerBrotherRightLegLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_RIGHT_LEG" Offset="0x17910" />
-        <Limb Name="gBeaverYoungerBrotherLeftLegRootLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_LEFT_LEG_ROOT" Offset="0x1791C" />
-        <Limb Name="gBeaverYoungerBrotherLeftLegLimb" Type="Standard" EnumName="BEAVER_YOUNGER_BROTHER_LIMB_LEFT_LEG" Offset="0x17928" />
-
-        <!-- Younger Beaver Skeleton -->
-        <Skeleton Name="gBeaverYoungerBrotherSkel" Type="Flex" LimbType="Standard" LimbNone="BEAVER_YOUNGER_BROTHER_LIMB_NONE" LimbMax="BEAVER_YOUNGER_BROTHER_LIMB_MAX" EnumName="BeaverYoungerBrotherLimb" Offset="0x17990" />
-        
-        <!-- Textures for the vortex and splashing effects that appear behind the beavers when they swim. -->
-        <Texture Name="gBeaverUnusedTLUT" OutName="beaver_unused_tlut" Format="rgba16" Width="4" Height="4" Offset="0x179A0" />
-        <Texture Name="gBeaverOlderBrotherTailVortexMaskTex" OutName="beaver_older_brother_tail_vortex_mask" Format="i4" Width="32" Height="64" Offset="0x179C0" />
-        <Texture Name="gBeaverOlderBrotherTailVortexTex" OutName="beaver_older_brother_tail_vortex" Format="i4" Width="64" Height="64" Offset="0x17DC0" />
-        <Texture Name="gBeaverYoungerBrotherTailVortexTex" OutName="beaver_younger_brother_tail_vortex" Format="i4" Width="64" Height="64" Offset="0x185C0" />
-        <Texture Name="gBeaverYoungerBrotherTailVortexMaskTex" OutName="beaver_younger_brother_tail_vortex_mask" Format="i4" Width="64" Height="64" Offset="0x18DC0" />
-        <Texture Name="gBeaverYoungerBrotherTailSplashTex" OutName="beaver_younger_brother_tail_splash" Format="i4" Width="64" Height="64" Offset="0x195C0" />
-        <Texture Name="gBeaverYoungerBrotherTailSplashMaskTex" OutName="beaver_younger_brother_tail_splash_mask" Format="i4" Width="64" Height="64" Offset="0x19DC0" />
-
-        <!-- DisplayLists and TextureAnimations for the vortex effect that appears behind the older beaver brother. All DisplayLists are the same besides a change in alpha. -->
-        <DList Name="gBeaverOlderBrotherTailVortex1DL" Offset="0x1A600" /> <!-- Original name is "vux_001_model" -->
-        <TextureAnimation Name="gBeaverOlderBrotherTailVortex1TexAnim" Offset="0x1A6E8" />
-        <DList Name="gBeaverOlderBrotherTailVortex2DL" Offset="0x1A730" /> <!-- Original name is "vux_002_model" -->
-        <TextureAnimation Name="gBeaverOlderBrotherTailVortex2TexAnim" Offset="0x1A818" />
-        <DList Name="gBeaverOlderBrotherTailVortex3DL" Offset="0x1A860" /> <!-- Original name is "vux_003_model" -->
-        <TextureAnimation Name="gBeaverOlderBrotherTailVortex3TexAnim" Offset="0x1A948" />
-        <DList Name="gBeaverOlderBrotherTailVortex4DL" Offset="0x1A990" /> <!-- Original name is "vux_004_model" -->
-        <TextureAnimation Name="gBeaverOlderBrotherTailVortex4TexAnim" Offset="0x1AA78" />
-        <DList Name="gBeaverOlderBrotherTailVortex5DL" Offset="0x1AAC0" /> <!-- Original name is "vux_005_model" -->
-        <TextureAnimation Name="gBeaverOlderBrotherTailVortex5TexAnim" Offset="0x1ABA8" />
-
-        <!-- DisplayLists for the vortex and splashing effects that appear behind the younger beaver brother. -->
-        <DList Name="gBeaverYoungerBrotherTailVortexDL" Offset="0x1ABF0" /> <!-- Original name is "vuz_01_model" -->
-        <DList Name="gBeaverYoungerBrotherTailSplashDL" Offset="0x1AD00" /> <!-- Original name is "vuz_02_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_b_heart.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_b_heart.xml
deleted file mode 100644
index 789f05b37..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_b_heart.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_b_heart" Segment="6">
-        <DList Name="object_b_heart_DL_000240" Offset="0x240" />
-        <DList Name="object_b_heart_DL_000348" Offset="0x348" />
-        <Texture Name="object_b_heart_Tex_0003C0" OutName="tex_0003C0" Format="i4" Width="32" Height="32" Offset="0x3C0" />
-        <Texture Name="object_b_heart_Tex_0005C0" OutName="tex_0005C0" Format="i4" Width="16" Height="16" Offset="0x5C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bai.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bai.xml
deleted file mode 100644
index 419f37b29..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bai.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <File Name="object_bai" Segment="6">
-        <Animation Name="object_bai_Anim_0008B4" Offset="0x8B4" /> <!-- Original name is "bai_talk01" -->
-        <Animation Name="object_bai_Anim_0011C0" Offset="0x11C0" /> <!-- Original name is "bai_wait01" -->
-        <DList Name="object_bai_DL_0049C0" Offset="0x49C0" />
-        <DList Name="object_bai_DL_004BA8" Offset="0x4BA8" />
-        <DList Name="object_bai_DL_004EC0" Offset="0x4EC0" />
-        <DList Name="object_bai_DL_004FF0" Offset="0x4FF0" />
-        <DList Name="object_bai_DL_0050F8" Offset="0x50F8" />
-        <DList Name="object_bai_DL_005410" Offset="0x5410" />
-        <DList Name="object_bai_DL_005540" Offset="0x5540" />
-        <DList Name="object_bai_DL_005648" Offset="0x5648" />
-        <DList Name="object_bai_DL_005A30" Offset="0x5A30" />
-        <DList Name="object_bai_DL_005EA8" Offset="0x5EA8" />
-        <DList Name="object_bai_DL_005FC8" Offset="0x5FC8" />
-        <DList Name="object_bai_DL_0060D0" Offset="0x60D0" />
-        <DList Name="object_bai_DL_0062F8" Offset="0x62F8" />
-        <DList Name="object_bai_DL_006410" Offset="0x6410" />
-        <DList Name="object_bai_DL_006518" Offset="0x6518" />
-        <DList Name="object_bai_DL_006740" Offset="0x6740" />
-        <Texture Name="object_bai_TLUT_006858" OutName="tlut_006858" Format="rgba16" Width="16" Height="16" Offset="0x6858" />
-        <Texture Name="object_bai_Tex_006A58" OutName="tex_006A58" Format="ci8" Width="32" Height="64" Offset="0x6A58" />
-        <Texture Name="object_bai_Tex_007258" OutName="tex_007258" Format="ci8" Width="8" Height="8" Offset="0x7258" />
-        <Texture Name="object_bai_Tex_007298" OutName="tex_007298" Format="ci8" Width="8" Height="8" Offset="0x7298" />
-        <Texture Name="object_bai_Tex_0072D8" OutName="tex_0072D8" Format="ci8" Width="8" Height="8" Offset="0x72D8" />
-        <Texture Name="object_bai_Tex_007318" OutName="tex_007318" Format="ci8" Width="8" Height="16" Offset="0x7318" />
-        <Texture Name="object_bai_Tex_007398" OutName="tex_007398" Format="ci8" Width="8" Height="8" Offset="0x7398" />
-        <Texture Name="object_bai_Tex_0073D8" OutName="tex_0073D8" Format="ci8" Width="16" Height="16" Offset="0x73D8" />
-        <Texture Name="object_bai_Tex_0074D8" OutName="tex_0074D8" Format="ci8" Width="16" Height="16" Offset="0x74D8" />
-        <Texture Name="object_bai_Tex_0075D8" OutName="tex_0075D8" Format="rgba16" Width="16" Height="16" Offset="0x75D8" />
-        <Limb Name="object_bai_Standardlimb_0077D8" Type="Standard" EnumName="OBJECT_BAI_LIMB_01" Offset="0x77D8" />
-        <Limb Name="object_bai_Standardlimb_0077E4" Type="Standard" EnumName="OBJECT_BAI_LIMB_02" Offset="0x77E4" />
-        <Limb Name="object_bai_Standardlimb_0077F0" Type="Standard" EnumName="OBJECT_BAI_LIMB_03" Offset="0x77F0" />
-        <Limb Name="object_bai_Standardlimb_0077FC" Type="Standard" EnumName="OBJECT_BAI_LIMB_04" Offset="0x77FC" />
-        <Limb Name="object_bai_Standardlimb_007808" Type="Standard" EnumName="OBJECT_BAI_LIMB_05" Offset="0x7808" />
-        <Limb Name="object_bai_Standardlimb_007814" Type="Standard" EnumName="OBJECT_BAI_LIMB_06" Offset="0x7814" />
-        <Limb Name="object_bai_Standardlimb_007820" Type="Standard" EnumName="OBJECT_BAI_LIMB_07" Offset="0x7820" />
-        <Limb Name="object_bai_Standardlimb_00782C" Type="Standard" EnumName="OBJECT_BAI_LIMB_08" Offset="0x782C" />
-        <Limb Name="object_bai_Standardlimb_007838" Type="Standard" EnumName="OBJECT_BAI_LIMB_09" Offset="0x7838" />
-        <Limb Name="object_bai_Standardlimb_007844" Type="Standard" EnumName="OBJECT_BAI_LIMB_0A" Offset="0x7844" />
-        <Limb Name="object_bai_Standardlimb_007850" Type="Standard" EnumName="OBJECT_BAI_LIMB_0B" Offset="0x7850" />
-        <Limb Name="object_bai_Standardlimb_00785C" Type="Standard" EnumName="OBJECT_BAI_LIMB_0C" Offset="0x785C" />
-        <Limb Name="object_bai_Standardlimb_007868" Type="Standard" EnumName="OBJECT_BAI_LIMB_0D" Offset="0x7868" />
-        <Limb Name="object_bai_Standardlimb_007874" Type="Standard" EnumName="OBJECT_BAI_LIMB_0E" Offset="0x7874" />
-        <Limb Name="object_bai_Standardlimb_007880" Type="Standard" EnumName="OBJECT_BAI_LIMB_0F" Offset="0x7880" />
-        <Limb Name="object_bai_Standardlimb_00788C" Type="Standard" EnumName="OBJECT_BAI_LIMB_10" Offset="0x788C" />
-        <Limb Name="object_bai_Standardlimb_007898" Type="Standard" EnumName="OBJECT_BAI_LIMB_11" Offset="0x7898" />
-        <Limb Name="object_bai_Standardlimb_0078A4" Type="Standard" EnumName="OBJECT_BAI_LIMB_12" Offset="0x78A4" />
-        <Limb Name="object_bai_Standardlimb_0078B0" Type="Standard" EnumName="OBJECT_BAI_LIMB_13" Offset="0x78B0" />
-        <Skeleton Name="object_bai_Skel_007908" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BAI_LIMB_NONE" LimbMax="OBJECT_BAI_LIMB_MAX" EnumName="ObjectBaiLimb" Offset="0x7908" />
-        <Animation Name="object_bai_Anim_008198" Offset="0x8198" /> <!-- Original name is "bai_wait02" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bal.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bal.xml
deleted file mode 100644
index c98ffb43d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bal.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<Root>
-    <!-- Object file for Tingle -->
-    <File Name="object_bal" Segment="6">
-
-        <!-- Animations 1 -->
-        <Animation Name="gTingleFloatIdleAnim" Offset="0x5FC" /> <!-- Original name is "bal_fly"-->
-        <Animation Name="gTingleFallAnim" Offset="0x840" /> <!-- Original name is "bal_fly2"-->
-        <Animation Name="gTingleSpinAnim" Offset="0xC78" /> <!-- Original name is "bal_kaiten" ("rotation; revolution; turn; spin​") -->
-        <Animation Name="gTingleFloatThrowConfettiAnim" Offset="0x1804" /> <!-- Original name is "bal_kami" ("paper​")-->
-
-        <!-- Model Pieces -->
-        <DList Name="gTinglePelvisDL" Offset="0x4000" />
-        <DList Name="gTingleLeftFootDL" Offset="0x4108" />
-        <DList Name="gTingleLeftShinDL" Offset="0x41E8" />
-        <DList Name="gTingleLeftThighDL" Offset="0x42A8" />
-        <DList Name="gTingleRightFootDL" Offset="0x4368" />
-        <DList Name="gTingleRightShinDL" Offset="0x4448" />
-        <DList Name="gTingleRightThighDL" Offset="0x4508" />
-        <DList Name="gTingleHeadDL" Offset="0x45C8" />
-        <DList Name="gTingleTorsoDL" Offset="0x4980" />
-        <DList Name="gTingleLeftHandDL" Offset="0x4BA0" />
-        <DList Name="gTingleMapDL" Offset="0x4CA0" />
-        <DList Name="gTingleLeftForearmDL" Offset="0x4D58" />
-        <DList Name="gTingleLeftUpperArmDL" Offset="0x4E40" />
-        <DList Name="gTingleRightHandDL" Offset="0x4F00" />
-        <DList Name="gTinglePenDL" Offset="0x5000" />
-        <DList Name="gTingleRightForearmDL" Offset="0x50F8" />
-        <DList Name="gTingleRightUpperArmDL" Offset="0x51E0" />
-        <DList Name="gTingleBalloonDL" Offset="0x52A0" />
-
-        <!-- Textures -->
-        <Texture Name="gTingleMapTLUT" OutName="tingle_map_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53B0" />
-        <Texture Name="gTingleBriefsTex" OutName="tingle_briefs" Format="rgba16" Width="16" Height="16" Offset="0x53D0" />
-        <Texture Name="gTingleTopFrontTex" OutName="tingle_top" Format="rgba16" Width="32" Height="32" Offset="0x55D0" />
-        <Texture Name="gTingleBalloonTex" OutName="tingle_balloon" Format="rgba16" Width="16" Height="16" Offset="0x5DD0" />
-        <Texture Name="gTingleBackpackTex" OutName="tingle_backpack" Format="rgba16" Width="8" Height="8" Offset="0x5FD0" />
-        <Texture Name="gTingleEyeOpenTex" OutName="tingle_eye_open" Format="rgba16" Width="32" Height="64" Offset="0x6050" />
-        <Texture Name="gTingleBodysuitTex" OutName="tingle_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x7050" />
-        <Texture Name="gTingleNostrilTex" OutName="tingle_nostril" Format="rgba16" Width="16" Height="16" Offset="0x70D0" />
-        <Texture Name="gTingleMouthTex" OutName="tingle_mouth" Format="rgba16" Width="64" Height="32" Offset="0x72D0" />
-        <Texture Name="gTingleNoseSideTex" OutName="tingle_nose" Format="rgba16" Width="16" Height="32" Offset="0x82D0" />
-        <Texture Name="gTingleHandTex" OutName="tingle_hand" Format="rgba16" Width="32" Height="16" Offset="0x86D0" />
-        <Texture Name="gTinglePenTopTex" OutName="tingle_pen_top" Format="rgba16" Width="16" Height="16" Offset="0x8AD0" />
-        <Texture Name="gTingleMapTex" OutName="tingle_map" Format="ci4" Width="64" Height="64" Offset="0x8CD0" />
-        <Texture Name="gTingleEyeClosedTex" OutName="tingle_eye_closed" Format="rgba16" Width="32" Height="64" Offset="0x94D0" />
-
-        <!-- Skeleton -->
-        <Limb Name="gTingleRootLimb" Type="Standard" EnumName="TINGLE_LIMB_ROOT" Offset="0xA4D0" />
-        <Limb Name="gTinglePelvisLimb" Type="Standard" EnumName="TINGLE_LIMB_PELVIS" Offset="0xA4DC" />
-        <Limb Name="gTingleUpperBodyRootLimb" Type="Standard" EnumName="TINGLE_LIMB_UPPER_BODY_ROOT" Offset="0xA4E8" />
-        <Limb Name="gTingleUpperBodyWrapperLimb" Type="Standard" EnumName="TINGLE_LIMB_UPPER_BODY_WRAPPER" Offset="0xA4F4" />
-        <Limb Name="gTingleBalloonRootLimb" Type="Standard" EnumName="TINGLE_LIMB_BALLOON_ROOT" Offset="0xA500" />
-        <Limb Name="gTingleBalloonLimb" Type="Standard" EnumName="TINGLE_LIMB_BALLOON" Offset="0xA50C" />
-        <Limb Name="gTingleRightArmRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_ARM_ROOT" Offset="0xA518" />
-        <Limb Name="gTingleRightArmWrapperLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_ARM_WRAPPER" Offset="0xA524" />
-        <Limb Name="gTingleRightUpperArmLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_UPPER_ARM" Offset="0xA530" />
-        <Limb Name="gTingleRightForearmLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_FOREARM" Offset="0xA53C" />
-        <Limb Name="gTingleRightHandRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_HAND_ROOT" Offset="0xA548" />
-        <Limb Name="gTingleRightHandLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_HAND" Offset="0xA554" />
-        <Limb Name="gTingleHeldPenLimb" Type="Standard" EnumName="TINGLE_LIMB_HELD_PEN" Offset="0xA560" />
-        <Limb Name="gTingleLeftArmRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_ARM_ROOT" Offset="0xA56C" />
-        <Limb Name="gTingleLeftArmWrapperLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_ARM_WRAPPER" Offset="0xA578" />
-        <Limb Name="gTingleLeftUpperArmLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_UPPER_ARM" Offset="0xA584" />
-        <Limb Name="gTingleLeftForearmLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_FOREARM" Offset="0xA590" />
-        <Limb Name="gTingleLeftHandRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_HAND_ROOT" Offset="0xA59C" />
-        <Limb Name="gTingleLeftHandLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_HAND" Offset="0xA5A8" />
-        <Limb Name="gTingleHeldMapLimb" Type="Standard" EnumName="TINGLE_LIMB_HELD_MAP" Offset="0xA5B4" />
-        <Limb Name="gTingleTorsoLimb" Type="Standard" EnumName="TINGLE_LIMB_TORSO" Offset="0xA5C0" />
-        <Limb Name="gTingleHeadLimb" Type="Standard" EnumName="TINGLE_LIMB_HEAD" Offset="0xA5CC" />
-        <Limb Name="gTingleRightLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_LEG_ROOT" Offset="0xA5D8" /> 
-        <Limb Name="gTingleRightThighLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_THIGH" Offset="0xA5E4" />
-        <Limb Name="gTingleRightLowerLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_LOWER_LEG_ROOT" Offset="0xA5F0" />
-        <Limb Name="gTingleRightShinLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_SHIN" Offset="0xA5FC" />
-        <Limb Name="gTingleRightFootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_FOOT" Offset="0xA608" />
-        <Limb Name="gTingleLeftLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_LEG_ROOT" Offset="0xA614" />
-        <Limb Name="gTingleLeftThighLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_THIGH" Offset="0xA620" />
-        <Limb Name="gTingleLeftLowerLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_LOWER_LEG_ROOT" Offset="0xA62C" />
-        <Limb Name="gTingleLeftShinLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_SHIN" Offset="0xA638" />
-        <Limb Name="gTingleLeftFootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_FOOT" Offset="0xA644" />
-        <Skeleton Name="gTingleSkel" Type="Flex" LimbType="Standard" LimbNone="TINGLE_LIMB_NONE" LimbMax="TINGLE_LIMB_MAX" EnumName="TingleLimb" Offset="0xA6D0" />
-
-        <!-- Animations 2 -->
-        <Animation Name="gTingleLandAnim" Offset="0xA7DC" /> <!-- Original name is "bal_put"-->
-        <Animation Name="gTingleTwistAnim" Offset="0xB1E8" /> <!-- Original name is "bal_talk" -->
-        <Animation Name="gTingleTalkAnim" Offset="0xB604" /> <!-- Original name is "bal_talk2" -->
-        <Animation Name="gTingleThrowConfettiAnim" Offset="0xC498" /> <!-- Original name is "bal_talk3" -->
-        <Animation Name="gTingleHappyDanceAnim" Offset="0xC8D8" /> <!-- Original name is "bal_talk4" -->
-        <Animation Name="gTingleFloatHideFaceAnim" Offset="0xCB78" /> <!-- Original name is "bal_tereru" ("to be shy; to be bashful") -->
-        <Animation Name="gTingleIdleAnim" Offset="0xD530" /> <!-- Original name is "bal_wait" -->
-		
-        <!-- Misc. -->
-        <DList Name="gTingleConfettiDL" Offset="0xD5A0" /> <!-- Original name is "bal_cube32_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bat.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bat.xml
deleted file mode 100644
index 5a685024e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bat.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Assets for ovl_En_Bat (Bad Bats) -->
-    <File Name="object_bat" Segment="6">
-        <DList Name="gBadBatSetupDL" Offset="0xA0" />
-        <DList Name="gBadBatBodyDL" Offset="0xC8" />
-
-        <!-- Wings used in manual animation -->
-        <DList Name="gBadBatWingsFrame0DL" Offset="0x1B0" />
-        <DList Name="gBadBatWingsFrame1DL" Offset="0x2A0" />
-        <DList Name="gBadBatWingsFrame2DL" Offset="0x390" />
-        <DList Name="gBadBatWingsFrame3DL" Offset="0x480" />
-        <DList Name="gBadBatWingsFrame4DL" Offset="0x570" />
-        <DList Name="gBadBatWingsFrame5DL" Offset="0x660" />
-        <DList Name="gBadBatWingsFrame6DL" Offset="0x750" />
-        <DList Name="gBadBatWingsFrame7DL" Offset="0x840" />
-        <DList Name="gBadBatWingsFrame8DL" Offset="0x930" />
-
-        <Texture Name="gBadBatWingTex" OutName="bad_bat_wing" Format="rgba16" Width="8" Height="16" Offset="0x9A0" />
-        <Texture Name="gBatBatBodyTex" OutName="bad_bat_body" Format="rgba16" Width="16" Height="16" Offset="0xAA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bb.xml
deleted file mode 100644
index e03cdb0e2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bb.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<Root>
-    <!-- Assets for red and blue Bubbles -->
-    <File Name="object_bb" Segment="6">
-        <!-- Bubble Animations -->
-        <Animation Name="gBubbleAttackAnim" Offset="0x184" /> <!-- Original name is "bb_atack" -->
-        <Animation Name="gBubblePainAnim" Offset="0x2AC" /> <!-- Original name might be "bb_damage". Unused. -->
-        <Animation Name="gBubbleFlyingAnim" Offset="0x444" /> <!-- Original name is "bb_fly" -->
-
-        <!-- Bubble Limb DisplayLimbs -->
-        <DList Name="gBubbleLeftWingWebbingDL" Offset="0xC20" />
-        <DList Name="gBubbleLeftWingBoneDL" Offset="0xCB0" />
-        <DList Name="gBubbleJawDL" Offset="0xD40" />
-        <DList Name="gBubbleCraniumDL" Offset="0xE08" />
-        <DList Name="gBubbleRightWingBoneDL" Offset="0x1100" />
-        <DList Name="gBubbleRightWingWebbingDL" Offset="0x1190" />
-
-        <!-- Bubble Textures -->
-        <Texture Name="gBubbleEyeSocketBottomTex" OutName="eye_socket_bottom" Format="rgba16" Width="16" Height="16" Offset="0x1220" />
-        <Texture Name="gBubbleNostrilTex" OutName="nostril" Format="rgba16" Width="8" Height="8" Offset="0x1420" />
-        <Texture Name="gBubbleEyeSocketTopAndJawTex" OutName="eye_socket_top_and_jaw" Format="rgba16" Width="4" Height="4" Offset="0x14A0" />
-        <Texture Name="gBubbleCraniumTopTex" OutName="cranium_top" Format="rgba16" Width="8" Height="8" Offset="0x14C0" />
-        <Texture Name="gBubbleCraniumSidesAndBackTex" OutName="cranium_sides_and_back" Format="rgba16" Width="8" Height="8" Offset="0x1540" />
-        <Texture Name="gBubbleEyeGlowTex" OutName="eye_glow" Format="rgba16" Width="8" Height="8" Offset="0x15C0" />
-        <Texture Name="gBubbleWingBoneTex" OutName="wing_bone" Format="rgba16" Width="16" Height="8" Offset="0x1640" />
-        <Texture Name="gBubbleWingWebbingTex" OutName="wing_webbing" Format="rgba16" Width="16" Height="16" Offset="0x1740" />
-
-        <!-- Bubble Limbs -->
-        <Limb Name="gBubbleRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_ROOT" Offset="0x1940" />
-        <Limb Name="gBubbleCraniumRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_CRANIUM_ROOT" Offset="0x194C" />
-        <Limb Name="gBubbleJawRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_JAW_ROOT" Offset="0x1958" />
-        <Limb Name="gBubbleJawLimb" Type="Standard" EnumName="BUBBLE_LIMB_JAW" Offset="0x1964" />
-        <Limb Name="gBubbleLeftWingRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_LEFT_WING_ROOT" Offset="0x1970" />
-        <Limb Name="gBubbleLeftWingWrapperLimb" Type="Standard" EnumName="BUBBLE_LIMB_LEFT_WING_WRAPPER" Offset="0x197C" />
-        <Limb Name="gBubbleLeftWingWebbingRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_LEFT_WING_WEBBING_ROOT" Offset="0x1988" />
-        <Limb Name="gBubbleLeftWingWebbingLimb" Type="Standard" EnumName="BUBBLE_LIMB_LEFT_WING_WEBBING" Offset="0x1994" />
-        <Limb Name="gBubbleLeftWingBoneLimb" Type="Standard" EnumName="BUBBLE_LIMB_LEFT_WING_BONE" Offset="0x19A0" />
-        <Limb Name="gBubbleRightWingRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_RIGHT_WING_ROOT" Offset="0x19AC" />
-        <Limb Name="gBubbleRightWingWrapperLimb" Type="Standard" EnumName="BUBBLE_LIMB_RIGHT_WING_WRAPPER" Offset="0x19B8" />
-        <Limb Name="gBubbleRightWingWebbingRootLimb" Type="Standard" EnumName="BUBBLE_LIMB_RIGHT_WING_WEBBING_ROOT" Offset="0x19C4" />
-        <Limb Name="gBubbleRightWingWebbingLimb" Type="Standard" EnumName="BUBBLE_LIMB_RIGHT_WING_WEBBING" Offset="0x19D0" />
-        <Limb Name="gBubbleRightWingBoneLimb" Type="Standard" EnumName="BUBBLE_LIMB_RIGHT_WING_BONE" Offset="0x19DC" />
-        <Limb Name="gBubbleCraniumLimb" Type="Standard" EnumName="BUBBLE_LIMB_CRANIUM" Offset="0x19E8" />
-
-        <!-- Bubble Skeleton -->
-        <Skeleton Name="gBubbleSkel" Type="Normal" LimbType="Standard" LimbNone="BUBBLE_LIMB_NONE" LimbMax="BUBBLE_LIMB_MAX" EnumName="BubbleLimb" Offset="0x1A30" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bba.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bba.xml
deleted file mode 100644
index 54706c2e3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bba.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<Root>
-    <!-- Object for Bomb Shop Lady -->
-    <File Name="object_bba" Segment="6">
-        <!-- DLists -->
-        <DList Name="gBbaUpperLegsDL" Offset="0x2A80" />
-        <DList Name="gBbaRightHandDL" Offset="0x2B70" />
-        <DList Name="gBbaRightForearmDL" Offset="0x2D88" />
-        <DList Name="gBbaRightUpperArmDL" Offset="0x2E90" />
-        <DList Name="gBbaLeftHandDL" Offset="0x2FA0" />
-        <DList Name="gBbaLeftForearmDL" Offset="0x31B8" />
-        <DList Name="gBbaLeftUpperArmDL" Offset="0x32C0" />
-        <DList Name="gBbaTorsoDL" Offset="0x33D0" />
-        <DList Name="gBbaBagDL" Offset="0x3618" />
-        <DList Name="gBbaNeckDL" Offset="0x3760" />
-        <DList Name="gBbaHeadDL" Offset="0x3968" />
-        <DList Name="gBbaMiddleLegsDL" Offset="0x3F68" />
-        <DList Name="gBbaLowerLegsDL" Offset="0x4078" />
-        <DList Name="gBbaFeetDL" Offset="0x4180" />
-
-        <!-- Animations -->
-        <Animation Name="gBbaSwayAnim" Offset="0x4910" /> <!-- Original name is "sb_ending" -->
-        <Animation Name="gBbaKnockedOverAnim" Offset="0x5154" /> <!-- Original name is "sb_taore" ("to fall (over, down); to collapse; to take a fall") -->
-        <Animation Name="gBbaLyingDownAnim" Offset="0x58B8" /> <!-- Original name is "sb_taorewait" -->
-        <Animation Name="gBbaIdleHoldingBagAnim" Offset="0x5DC4" /> <!-- Original name is "sb_wait01" -->
-
-        <!-- Skeleton -->
-        <Limb Name="gBbaUpperLegsLimb" Type="Standard" EnumName="BBA_LIMB_UPPER_LEGS" Offset="0x5DE0" />
-        <Limb Name="gBbaMiddleLegsLimb" Type="Standard" EnumName="BBA_LIMB_MIDDLE_LEGS" Offset="0x5DEC" />
-        <Limb Name="gBbaLowerLegsLimb" Type="Standard" EnumName="BBA_LIMB_LOWER_LEGS" Offset="0x5DF8" />
-        <Limb Name="gBbaFeetLimb" Type="Standard" EnumName="BBA_LIMB_FEET" Offset="0x5E04" />
-        <Limb Name="gBbaUpperRootLimb" Type="Standard" EnumName="BBA_LIMB_UPPER_ROOT" Offset="0x5E10" />
-        <Limb Name="gBbaNeckLimb" Type="Standard" EnumName="BBA_LIMB_NECK" Offset="0x5E1C" />
-        <Limb Name="gBbaHeadLimb" Type="Standard" EnumName="BBA_LIMB_HEAD" Offset="0x5E28" />
-        <Limb Name="gBbaBagLimb" Type="Standard" EnumName="BBA_LIMB_BAG" Offset="0x5E34" />
-        <Limb Name="gBbaTorsoLimb" Type="Standard" EnumName="BBA_LIMB_TORSO" Offset="0x5E40" />
-        <Limb Name="gBbaLeftUpperArmLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_UPPER_ARM" Offset="0x5E4C" />
-        <Limb Name="gBbaLeftLowerArmRootLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_LOWER_ARM_ROOT" Offset="0x5E58" />
-        <Limb Name="gBbaLeftForearmLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_FOREARM" Offset="0x5E64" />
-        <Limb Name="gBbaLeftHandLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_HAND" Offset="0x5E70" />
-        <Limb Name="gBbaRightUpperArmLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_UPPER_ARM" Offset="0x5E7C" />
-        <Limb Name="gBbaRightLowerArmRootLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_LOWER_ARM_ROOT" Offset="0x5E88" />
-        <Limb Name="gBbaRightForearmLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_FOREARM" Offset="0x5E94" />
-        <Limb Name="gBbaRightHandLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_HAND" Offset="0x5EA0" />
-        <Skeleton Name="gBbaSkel" Type="Flex" LimbType="Standard" LimbNone="BBA_LIMB_NONE" LimbMax="BBA_LIMB_MAX" EnumName="BbaLimb" Offset="0x5EF0" />
-
-         <!-- Animations -->
-        <Animation Name="gBbaIdleAnim" Offset="0x6550" /> <!-- Original name is "sb_wait02" -->
-        <Animation Name="gBbaWalkingHoldingBagAnim" Offset="0x6B10" /> <!-- Original name is "sb_walk01" -->
-
-        <!-- TLUT -->
-        <Texture Name="gBbaTLUT" OutName="bba_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6B20" />
-
-        <!-- Unused Textures -->
-        <!-- These are just exact copies of the used textures -->
-        <Texture Name="gBbaHairSkin2Tex" OutName="bba_hair_skin_2" Format="ci8" Width="32" Height="32" Offset="0x6D20" TlutOffset="0x6B20" />
-        <Texture Name="gBbaEar2Tex" OutName="bba_ear_2" Format="ci8" Width="8" Height="8" Offset="0x7120" TlutOffset="0x6B20" />
-        <Texture Name="gBbaNostril2Tex" OutName="bba_nostril_2" Format="ci8" Width="8" Height="8" Offset="0x7160" TlutOffset="0x6B20" />
-        <Texture Name="gBbaEye2Tex" OutName="bba_eye_2" Format="rgba16" Width="32" Height="32" Offset="0x71A0"/>
-        <Texture Name="gBbaWrinkles2Tex" OutName="bba_wrinkles_2" Format="ci8" Width="32" Height="32" Offset="0x79A0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaCheek2Tex" OutName="bba_cheek_2" Format="ci8" Width="16" Height="16" Offset="0x7DA0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaSkin2Tex" OutName="bba_skin_2" Format="ci8" Width="8" Height="8" Offset="0x7EA0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaForehead2Tex" OutName="bba_forehead_2" Format="ci8" Width="32" Height="32" Offset="0x7EE0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaFingers2Tex" OutName="bba_fingers_2" Format="ci8" Width="16" Height="16" Offset="0x82E0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaShirt2Tex" OutName="bba_shirt_2" Format="ci8" Width="16" Height="16" Offset="0x83E0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaBag2Tex" OutName="bba_bag_2" Format="ci8" Width="16" Height="16" Offset="0x84E0" TlutOffset="0x6B20" />
-        <Texture Name="gBbaSkirt2Tex" OutName="bba_skirt_2" Format="ci8" Width="16" Height="16" Offset="0x85E0" TlutOffset="0x6B20" />
-
-        <!-- Textures -->
-        <Texture Name="gBbaSkinTex" OutName="bba_skin" Format="ci8" Width="8" Height="8" Offset="0x86E0" />
-        <Texture Name="gBbaWrinklesTex" OutName="bba_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x8720" />
-        <Texture Name="gBbaHairSkinTex" OutName="bba_hair_skin" Format="ci8" Width="32" Height="32" Offset="0x8B20" />
-        <Texture Name="gBbaNostrilTex" OutName="bba_nostril" Format="ci8" Width="8" Height="8" Offset="0x8F20" />
-        <Texture Name="gBbaEarTex" OutName="bba_ear" Format="ci8" Width="8" Height="8" Offset="0x8F60" />
-        <Texture Name="gBbaFingersTex" OutName="bba_fingers" Format="ci8" Width="16" Height="16" Offset="0x8FA0" />
-        <Texture Name="gBbaBagTex" OutName="bba_bag" Format="ci8" Width="16" Height="16" Offset="0x90A0" />
-        <Texture Name="gBbaSkirtTex" OutName="bba_skirt" Format="ci8" Width="16" Height="16" Offset="0x91A0" />
-        <Texture Name="gBbaEyeTex" OutName="bba_eye" Format="rgba16" Width="32" Height="32" Offset="0x92A0" />
-        <Texture Name="gBbaCheekTex" OutName="bba_cheek" Format="ci8" Width="16" Height="16" Offset="0x9AA0" />
-        <Texture Name="gBbaForeheadTex" OutName="bba_forehead" Format="ci8" Width="32" Height="32" Offset="0x9BA0" />
-        <Texture Name="gBbaShirtTex" OutName="bba_shirt" Format="ci8" Width="16" Height="16" Offset="0x9FA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bdoor.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bdoor.xml
deleted file mode 100644
index 2e64110f5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bdoor.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="assets/objects/gameplay_dangeon_keep/"/>
-
-    <!-- Assets for Boss Doors -->
-    <File Name="object_bdoor" Segment="6">
-        <!-- Boss Door, Lock, and Chain DisplayLists -->
-        <DList Name="gBossDoorDL" Offset="0xC0" /> <!-- Original name is "bossdoor_model" -->
-        <DList Name="gBossDoorLockDL" Offset="0x400" /> <!-- Original name is "doorkagiboss_model" ("lock") -->
-        <DList Name="gBossDoorChainDL" Offset="0x530" /> <!-- Original name is "doorkusariboss_model" ("chain") -->
-
-        <!-- One of the Boss Door Textures -->
-        <Texture Name="gBossDoorSnowheadTex" OutName="boss_door_snowhead" Format="rgba16" Width="32" Height="64" Offset="0x5C0" />
-
-        <!-- Assets for an unused set of doors -->
-        <DList Name="gBossDoorUnusedDoor1LeftDL" Offset="0x1790" /> <!-- Original name is "i2_L_d1_model" -->
-        <DList Name="gBossDoorUnusedDoor1RightDL" Offset="0x1850" /> <!-- Original name is "i2_L_d1_2_model" -->
-        <Texture Name="gBossDoorUnusedDoor1Tex" OutName="boss_door_unused_door_1" Format="rgba16" Width="32" Height="64" Offset="0x1910" />
-        <DList Name="gBossDoorUnusedDoor2LeftDL" Offset="0x2A50" /> <!-- Original name is "i2_L_d2_model" -->
-        <DList Name="gBossDoorUnusedDoor2RightDL" Offset="0x2AF8" /> <!-- Original name is "i2_L_d2_2_model" -->
-        <Texture Name="gBossDoorUnusedDoor2Tex" OutName="boss_door_unused_door_2" Format="rgba16" Width="32" Height="64" Offset="0x2BA0" />
-
-        <!-- The rest of the Boss Door Textures -->
-        <Texture Name="gBossDoorStoneTowerTex" OutName="boss_door_stone_tower" Format="rgba16" Width="32" Height="64" Offset="0x3BA0" />
-        <Texture Name="gBossDoorGreatBayTex" OutName="boss_door_great_bay" Format="rgba16" Width="32" Height="64" Offset="0x4BA0" />
-        <Texture Name="gBossDoorWoodfallTex" OutName="boss_door_woodfall" Format="rgba16" Width="32" Height="64" Offset="0x5BA0" />
-
-        <!-- A default texture only used if a Boss Door is present outside of the four main dungeons, which is never the case in the final game. -->
-        <Texture Name="gBossDoorDefaultTex" OutName="boss_door_unused" Format="rgba16" Width="32" Height="64" Offset="0x6BA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bee.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bee.xml
deleted file mode 100644
index ab9699e84..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bee.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<Root>
-    <!-- Object for Bee -->
-    <File Name="object_bee" Segment="6">
-        <!-- Bee Animations -->
-        <Animation Name="gBeeFlyingAnim" Offset="0x5C" /> <!-- Original name is "bee_fyl" [sic] -->
-
-        <!-- Bee Limb DisplayLists -->
-        <DList Name="gBeeBodyDL" Offset="0x550" />
-        <DList Name="gBeeHeadDL" Offset="0x780" />
-        <DList Name="gBeeAntennaeDL" Offset="0x848" />
-        <DList Name="gBeeRightWingDL" Offset="0x918" />
-        <DList Name="gBeeLeftWingDL" Offset="0x9D0" />
-
-        <!-- Bee Textures -->
-        <Texture Name="gBeeWingTLUT" OutName="bee_wing_tlut" Format="rgba16" Width="4" Height="4" Offset="0xA88" />
-        <Texture Name="gBeeHeadTLUT" OutName="bee_head_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAA8" />
-        <Texture Name="gBeeBodyTLUT" OutName="bee_body_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAC8" />
-        <Texture Name="gBeeAntennaeTLUT" OutName="bee_antennae_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAE8" />
-        <Texture Name="gBeeWingTex" OutName="bee_wing" Format="ci4" Width="32" Height="32" Offset="0xB08" />
-        <Texture Name="gBeeHeadTex" OutName="bee_head" Format="ci4" Width="32" Height="32" Offset="0xD08" />
-        <Texture Name="gBeeBodyTex" OutName="bee_body" Format="ci4" Width="32" Height="32" Offset="0xF08" />
-        <Texture Name="gBeeAntennaeTex" OutName="bee_antennae" Format="ci4" Width="32" Height="32" Offset="0x1108" />
-
-        <!-- Bee Limbs -->
-        <Limb Name="gBeeRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_ROOT" Offset="0x1308" />
-        <Limb Name="gBeeWingsRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_WINGS_ROOT" Offset="0x1314" />
-        <Limb Name="gBeeLeftWingRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_LEFT_WING_ROOT" Offset="0x1320" />
-        <Limb Name="gBeeLeftWingLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_LEFT_WING" Offset="0x132C" />
-        <Limb Name="gBeeRightWingRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_RIGHT_WING_ROOT" Offset="0x1338" />
-        <Limb Name="gBeeRightWingLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_RIGHT_WING" Offset="0x1344" />
-        <Limb Name="gBeeBodyLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_BODY" Offset="0x1350" />
-        <Limb Name="gBeeAntennaeLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_ANTENNAE" Offset="0x135C" />
-        <Limb Name="gBeeHeadLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_HEAD" Offset="0x1368" />
-
-        <!-- Bee Skeleton -->
-        <Skeleton Name="gBeeSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BEE_LIMB_NONE" LimbMax="OBJECT_BEE_LIMB_MAX" EnumName="ObjectBeeLimb" Offset="0x1398" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bg.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bg.xml
deleted file mode 100644
index 9008fb381..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bg.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<Root>
-    <File Name="object_bg" Segment="6">
-        <!-- Animations -->
-        <Animation Name="object_bg_Anim_000968" Offset="0x968" /> <!-- Original name is "bg_asking" -->
-        <Animation Name="object_bg_Anim_000A00" Offset="0xA00" /> <!-- Original name is "bg_getup" -->
-        <Animation Name="object_bg_Anim_001384" Offset="0x1384" /> <!-- Original name is "bg_kunekune" ("wiggling; waving; swaying; twisting and turning​") -->
-        
-        <!-- Treasure Chest Shop Gal Limb DisplayLists -->
-        <DList Name="gTreasureChestShopGalHeadDL" Offset="0x3F50" />
-        <DList Name="gTreasureChestShopGalNeckDL" Offset="0x4558" />
-        <DList Name="gTreasureChestShopGalLeftHandDL" Offset="0x4768" />
-        <DList Name="gTreasureChestShopGalLeftForearmDL" Offset="0x4A38" />
-        <DList Name="gTreasureChestShopGalLeftUpperArmDL" Offset="0x4BC0" />
-        <DList Name="gTreasureChestShopGalRightHandDL" Offset="0x4EE0" />
-        <DList Name="gTreasureChestShopGalRightForearmDL" Offset="0x51B0" />
-        <DList Name="gTreasureChestShopGalRightUpperArmDL" Offset="0x5338" />
-        <DList Name="gTreasureChestShopGalTorsoDL" Offset="0x5658" />
-        <DList Name="gTreasureChestShopGalLeftFootDL" Offset="0x5978" />
-        <DList Name="gTreasureChestShopGalLeftShinDL" Offset="0x5B80" />
-        <DList Name="gTreasureChestShopGalLeftThighDL" Offset="0x5F20" />
-        <DList Name="gTreasureChestShopGalRightFootDL" Offset="0x6090" />
-        <DList Name="gTreasureChestShopGalRightShinDL" Offset="0x6298" />
-        <DList Name="gTreasureChestShopGalRightThighDL" Offset="0x6638" />
-        <DList Name="gTreasureChestShopGalHipsDL" Offset="0x67A8" />
-
-        <!-- Treasure Chest Shop Gal Textures -->
-        <Texture Name="gTreasureChestShopGalTLUT" OutName="treasure_cheat_shop_gal_tlut" Format="rgba16" Width="16" Height="16" Offset="0x68D8" />
-        <Texture Name="gTreasureChestShopGalHairTex" OutName="treasure_cheat_shop_gal_hair" Format="ci8" Width="32" Height="32" Offset="0x6AD8" />
-        <Texture Name="gTreasureChestShopGalHair2Tex" OutName="treasure_cheat_shop_gal_hair2" Format="ci8" Width="8" Height="16" Offset="0x6ED8" />
-        <Texture Name="gTreasureChestShopGalEyeOpenUpTex" OutName="treasure_cheat_shop_gal_eye_open_up" Format="ci8" Width="32" Height="32" Offset="0x6F58" />
-        <Texture Name="gTreasureChestShopGalEyeHalfUpTex" OutName="treasure_cheat_shop_gal_eye_half_up" Format="ci8" Width="32" Height="32" Offset="0x7358" />
-        <Texture Name="gTreasureChestShopGalEyeClosedTex" OutName="treasure_cheat_shop_gal_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7758" />
-        <Texture Name="gTreasureChestShopGalEyeOpenDownTex" OutName="treasure_cheat_shop_gal_eye_open_down" Format="ci8" Width="32" Height="32" Offset="0x7B58" />
-        <Texture Name="gTreasureChestShopGalEyeHalfDownTex" OutName="treasure_cheat_shop_gal_eye_half_down" Format="ci8" Width="32" Height="32" Offset="0x7F58" />
-        <Texture Name="gTreasureChestShopGalMouthTex" OutName="treasure_cheat_shop_gal_mouth" Format="ci8" Width="32" Height="32" Offset="0x8358" />
-        <Texture Name="gTreasureChestShopGalEarAndBellyButtonTex" OutName="treasure_cheat_shop_gal_ear_and_belly_button" Format="ci8" Width="16" Height="16" Offset="0x8758" />
-        <Texture Name="gTreasureChestShopGalSkinTex" OutName="treasure_cheat_shop_gal_skin" Format="ci8" Width="16" Height="16" Offset="0x8858" />
-        <Texture Name="gTreasureChestShopGalClothesTex" OutName="treasure_cheat_shop_gal_clothes" Format="ci8" Width="32" Height="32" Offset="0x8958" />
-        <Texture Name="gTreasureChestShopGalFingersTex" OutName="treasure_cheat_shop_gal_fingers" Format="ci8" Width="16" Height="16" Offset="0x8D58" /> 
-        
-        <!-- Treasure Chest Shop Gal Limbs -->
-        <Limb Name="gTreasureChestShopGalRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_ROOT" Offset="0x8E58" />
-        <Limb Name="gTreasureChestShopGalHipsLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_HIPS" Offset="0x8E64" />
-        <Limb Name="gTreasureChestShopGalTorsoLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_TORSO" Offset="0x8E70" />
-        <Limb Name="gTreasureChestShopGalNeckLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_NECK" Offset="0x8E7C" />
-        <Limb Name="gTreasureChestShopGalHeadLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_HEAD" Offset="0x8E88" />
-        <Limb Name="gTreasureChestShopGalLeftArmRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_ARM_ROOT" Offset="0x8E94" />
-        <Limb Name="gTreasureChestShopGalLeftUpperArmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_UPPER_ARM" Offset="0x8EA0" />
-        <Limb Name="gTreasureChestShopGalLeftForearmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_FOREARM" Offset="0x8EAC" />
-        <Limb Name="gTreasureChestShopGalLeftHandLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_HAND" Offset="0x8EB8" />
-        <Limb Name="gTreasureChestShopGalRightArmRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_ARM_ROOT" Offset="0x8EC4" />
-        <Limb Name="gTreasureChestShopGalRightUpperArmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_UPPER_ARM" Offset="0x8ED0" />
-        <Limb Name="gTreasureChestShopGalRightForearmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_FOREARM" Offset="0x8EDC" />
-        <Limb Name="gTreasureChestShopGalRightHandLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_HAND" Offset="0x8EE8" />
-        <Limb Name="gTreasureChestShopGalRightLegRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_LEG_ROOT" Offset="0x8EF4" />
-        <Limb Name="gTreasureChestShopGalRightThighLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_THIGH" Offset="0x8F00" />
-        <Limb Name="gTreasureChestShopGalRightShinLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_SHIN" Offset="0x8F0C" />
-        <Limb Name="gTreasureChestShopGalRightFootRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_FOOT_ROOT" Offset="0x8F18" />
-        <Limb Name="gTreasureChestShopGalRightFootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_FOOT" Offset="0x8F24" />
-        <Limb Name="gTreasureChestShopGalLeftLegRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_LEG_ROOT" Offset="0x8F30" />
-        <Limb Name="gTreasureChestShopGalLeftThighLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_THIGH" Offset="0x8F3C" />
-        <Limb Name="gTreasureChestShopGalLeftShinLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_SHIN" Offset="0x8F48" />
-        <Limb Name="gTreasureChestShopGalLeftFootRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_FOOT_ROOT" Offset="0x8F54" />
-        <Limb Name="gTreasureChestShopGalLeftFootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_FOOT" Offset="0x8F60" />
-        
-        <!-- Treasure Chest Shop Gal Skeleton -->
-        <Skeleton Name="gTreasureChestShopGalSkel" Type="Flex" LimbType="Standard" LimbNone="TREASURE_CHEST_SHOP_GAL_LIMB_NONE" LimbMax="TREASURE_CHEST_SHOP_GAL_LIMB_MAX" EnumName="TreasureChestShopGalLimb" Offset="0x8FC8" />
-        
-        <!-- Animations -->
-        <Animation Name="object_bg_Anim_009890" Offset="0x9890" /> <!-- Original name is "bg_newwait" -->
-        <Animation Name="object_bg_Anim_009F20" Offset="0x9F20" /> <!-- Original name is "bg_sleeping" -->
-        <Animation Name="object_bg_Anim_00A280" Offset="0xA280" /> <!-- Original name is "bg_tokune" (probably the English word "to" and "kunekune") -->
-        <Animation Name="object_bg_Anim_00AD98" Offset="0xAD98" /> <!-- Original name is "bg_up" -->
-        <Animation Name="object_bg_Anim_00B19C" Offset="0xB19C" /> <!-- Original name is "bg_wait" -->
-        
-        <!-- Mayor's receptionist DisplayLists -->
-        <DList Name="object_bg_DL_00D5E0" Offset="0xD5E0" />
-        <DList Name="object_bg_DL_00D780" Offset="0xD780" />
-        <DList Name="object_bg_DL_00DB38" Offset="0xDB38" />
-        <DList Name="object_bg_DL_00DCD8" Offset="0xDCD8" />
-        <DList Name="object_bg_DL_00E1C0" Offset="0xE1C0" />
-        <DList Name="object_bg_DL_00E3F8" Offset="0xE3F8" />
-        <DList Name="object_bg_DL_00E580" Offset="0xE580" />
-        <DList Name="object_bg_DL_00E758" Offset="0xE758" />
-        <DList Name="object_bg_DL_00E990" Offset="0xE990" />
-        <DList Name="object_bg_DL_00EB18" Offset="0xEB18" />
-        <DList Name="object_bg_DL_00ECF0" Offset="0xECF0" />
-        <DList Name="object_bg_DL_00EE50" Offset="0xEE50" />
-        <DList Name="object_bg_DL_00EFE8" Offset="0xEFE8" />
-        <DList Name="object_bg_DL_00F1F0" Offset="0xF1F0" />
-        <DList Name="object_bg_DL_00F350" Offset="0xF350" />
-        <DList Name="object_bg_DL_00F4E8" Offset="0xF4E8" />
-        
-        <!-- Mayor's receptionist Textures -->
-        <Texture Name="object_bg_TLUT_00F6F0" OutName="tlut_00F6F0" Format="rgba16" Width="16" Height="16" Offset="0xF6F0" />
-        <Texture Name="object_bg_Tex_00F8F0" OutName="tex_00F8F0" Format="ci8" Width="32" Height="32" Offset="0xF8F0" />
-        <Texture Name="object_bg_Tex_00FCF0" OutName="tex_00FCF0" Format="ci8" Width="32" Height="32" Offset="0xFCF0" />
-        <Texture Name="object_bg_Tex_0100F0" OutName="tex_0100F0" Format="ci8" Width="32" Height="32" Offset="0x100F0" />
-        <Texture Name="object_bg_Tex_0104F0" OutName="tex_0104F0" Format="ci8" Width="16" Height="32" Offset="0x104F0" />
-        <Texture Name="object_bg_Tex_0106F0" OutName="tex_0106F0" Format="ci8" Width="16" Height="16" Offset="0x106F0" />
-        <Texture Name="object_bg_Tex_0107F0" OutName="tex_0107F0" Format="ci8" Width="64" Height="32" Offset="0x107F0" />
-        <Texture Name="object_bg_Tex_010FF0" OutName="tex_010FF0" Format="ci8" Width="16" Height="16" Offset="0x10FF0" />
-        <Texture Name="object_bg_Tex_0110F0" OutName="tex_0110F0" Format="ci8" Width="32" Height="32" Offset="0x110F0" />
-        <Texture Name="object_bg_Tex_0114F0" OutName="tex_0114F0" Format="ci8" Width="16" Height="16" Offset="0x114F0" />
-        <Texture Name="object_bg_Tex_0115F0" OutName="tex_0115F0" Format="ci8" Width="32" Height="32" Offset="0x115F0" />
-
-        <!-- Mayor's receptionist Limbs -->
-        <Limb Name="object_bg_Standardlimb_0119F0" Type="Standard" EnumName="OBJECT_BG_2_LIMB_01" Offset="0x119F0" />
-        <Limb Name="object_bg_Standardlimb_0119FC" Type="Standard" EnumName="OBJECT_BG_2_LIMB_02" Offset="0x119FC" />
-        <Limb Name="object_bg_Standardlimb_011A08" Type="Standard" EnumName="OBJECT_BG_2_LIMB_03" Offset="0x11A08" />
-        <Limb Name="object_bg_Standardlimb_011A14" Type="Standard" EnumName="OBJECT_BG_2_LIMB_04" Offset="0x11A14" />
-        <Limb Name="object_bg_Standardlimb_011A20" Type="Standard" EnumName="OBJECT_BG_2_LIMB_05" Offset="0x11A20" />
-        <Limb Name="object_bg_Standardlimb_011A2C" Type="Standard" EnumName="OBJECT_BG_2_LIMB_06" Offset="0x11A2C" />
-        <Limb Name="object_bg_Standardlimb_011A38" Type="Standard" EnumName="OBJECT_BG_2_LIMB_07" Offset="0x11A38" />
-        <Limb Name="object_bg_Standardlimb_011A44" Type="Standard" EnumName="OBJECT_BG_2_LIMB_08" Offset="0x11A44" />
-        <Limb Name="object_bg_Standardlimb_011A50" Type="Standard" EnumName="OBJECT_BG_2_LIMB_09" Offset="0x11A50" />
-        <Limb Name="object_bg_Standardlimb_011A5C" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0A" Offset="0x11A5C" />
-        <Limb Name="object_bg_Standardlimb_011A68" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0B" Offset="0x11A68" />
-        <Limb Name="object_bg_Standardlimb_011A74" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0C" Offset="0x11A74" />
-        <Limb Name="object_bg_Standardlimb_011A80" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0D" Offset="0x11A80" />
-        <Limb Name="object_bg_Standardlimb_011A8C" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0E" Offset="0x11A8C" />
-        <Limb Name="object_bg_Standardlimb_011A98" Type="Standard" EnumName="OBJECT_BG_2_LIMB_0F" Offset="0x11A98" />
-        <Limb Name="object_bg_Standardlimb_011AA4" Type="Standard" EnumName="OBJECT_BG_2_LIMB_10" Offset="0x11AA4" />
-        <Limb Name="object_bg_Standardlimb_011AB0" Type="Standard" EnumName="OBJECT_BG_2_LIMB_11" Offset="0x11AB0" />
-        <Limb Name="object_bg_Standardlimb_011ABC" Type="Standard" EnumName="OBJECT_BG_2_LIMB_12" Offset="0x11ABC" />
-        <Limb Name="object_bg_Standardlimb_011AC8" Type="Standard" EnumName="OBJECT_BG_2_LIMB_13" Offset="0x11AC8" />
-        <Limb Name="object_bg_Standardlimb_011AD4" Type="Standard" EnumName="OBJECT_BG_2_LIMB_14" Offset="0x11AD4" />
-        <Limb Name="object_bg_Standardlimb_011AE0" Type="Standard" EnumName="OBJECT_BG_2_LIMB_15" Offset="0x11AE0" />
-        <Limb Name="object_bg_Standardlimb_011AEC" Type="Standard" EnumName="OBJECT_BG_2_LIMB_16" Offset="0x11AEC" />
-        <Limb Name="object_bg_Standardlimb_011AF8" Type="Standard" EnumName="OBJECT_BG_2_LIMB_17" Offset="0x11AF8" />
-
-        <!--Mayor's receptionist Skeleton -->
-        <Skeleton Name="object_bg_Skel_011B60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BG_2_LIMB_NONE" LimbMax="OBJECT_BG_2_LIMB_MAX" EnumName="ObjectBg2Limb" Offset="0x11B60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bh.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bh.xml
deleted file mode 100644
index b4cc95393..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bh.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="object_bh" Segment="6">
-        <Animation Name="gBhFlyingAnim" Offset="0x74" /> <!-- Original name is "bh_fly" -->
-        <DList Name="gBhBodyDL" Offset="0x2B0" />
-        <DList Name="gBhRightWingToEdgeDL" Offset="0x3A0" />
-        <DList Name="gBhRightWingToBodyDL" Offset="0x450" />
-        <DList Name="gBhLeftWingToEdgeDL" Offset="0x4D8" />
-        <DList Name="gBhLeftWingToBodyDL" Offset="0x588" />
-        <Texture Name="gBhBodyTex" OutName="en_bh_body" Format="rgba16" Width="32" Height="32" Offset="0x610" />
-        <Texture Name="gBhWingTex" OutName="en_bh_wing" Format="rgba16" Width="64" Height="32" Offset="0xE10" />
-        <Limb Name="gBhBodyLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_BODY" Offset="0x1E10" />
-        <Limb Name="gBhRightWingToBodyLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_RIGHT_WING_TO_BODY" Offset="0x1E1C" />
-        <Limb Name="gBhRightWingToEdgeLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_RIGHT_WING_TO_EDGE" Offset="0x1E28" />
-        <Limb Name="gBhLeftWingToBodyLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_LEFT_WING_TO_BODY" Offset="0x1E34" />
-        <Limb Name="gBhLeftWingToEdgeLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_LEFT_WING_TO_EDGE" Offset="0x1E40" />
-        <Skeleton Name="gBhSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BH_LIMB_NONE" LimbMax="OBJECT_BH_LIMB_MAX" EnumName="ObjectBhLimb" Offset="0x1E60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_big_fwall.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_big_fwall.xml
deleted file mode 100644
index f1becbe8e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_big_fwall.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Ring Of Fire used during Garo's encounters -->
-    <File Name="object_big_fwall" Segment="6">
-        <Texture Name="gRingOfFireTex" OutName="ring_of_fire" Format="i8" Width="32" Height="64" Offset="0x0" />
-        <DList Name="gRingOfFireDL" Offset="0x9A0" /> <!-- Original name is "big_firewall_modelT" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigicicle.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigicicle.xml
deleted file mode 100644
index f02767256..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigicicle.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <File Name="object_bigicicle" Segment="6">
-        <Texture Name="object_bigicicle_Tex_000000" OutName="tex_000000" Format="i4" Width="64" Height="64" Offset="0x0" />
-        <Texture Name="object_bigicicle_Tex_000800" OutName="tex_000800" Format="i4" Width="16" Height="16" Offset="0x800" />
-        <DList Name="object_bigicicle_DL_0009B0" Offset="0x9B0" /> <!-- Original name is "trr_hahen_modelT" -->
-        <DList Name="object_bigicicle_DL_000B20" Offset="0xB20" /> <!-- Original name is "trr_hibi01_modelT" ("crack; fissure") -->
-        <DList Name="object_bigicicle_DL_000D60" Offset="0xD60" /> <!-- Original name is "trr_hibi02_modelT" -->
-        <DList Name="object_bigicicle_DL_000F40" Offset="0xF40" /> <!-- Original name is "trr_hibi03_modelT" -->
-        <DList Name="object_bigicicle_DL_0014F0" Offset="0x14F0" /> <!-- Original name is "trr_inside_modelT" -->
-        <TextureAnimation Name="object_bigicicle_Matanimheader_001678" Offset="0x1678" />
-        <DList Name="object_bigicicle_DL_001D10" Offset="0x1D10" />
-        <DList Name="object_bigicicle_DL_002530" Offset="0x2530" />
-        <DList Name="object_bigicicle_DL_002C20" Offset="0x2C20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigokuta.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigokuta.xml
deleted file mode 100644
index 7c2928b23..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigokuta.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<Root>
-    <File Name="object_bigokuta" Segment="6">
-        <Animation Name="gBigOctoRiseOutOfWaterAnim" Offset="0x444" /> <!-- Original name is "ocd_damagejump" -->
-        <Animation Name="gBigOctoDeathAnim" Offset="0xA74" /> <!-- Original name is "ocd_dead" -->
-        <Animation Name="gBigOctoHitAnim" Offset="0xD1C" /> <!-- Original name is "ocd_stop" -->
-        <Animation Name="gBigOctoIdleAnim" Offset="0x14B8" /> <!-- Original name is "ocd_wait" -->
-        <Animation Name="gBigOctoWalkAnim" Offset="0x1CA4" /> <!-- Original name is "ocd_walk" -->
-        <DList Name="gBigOctoBodyDL" Offset="0x4090" />
-        <DList Name="gBigOctoCenterSnoutDL" Offset="0x4158" />
-        <DList Name="gBigOctoLeftSnoutDL" Offset="0x42A8" />
-        <DList Name="gBigOctoRightSnoutDL" Offset="0x43D0" />
-        <DList Name="gBigOctoHeadShellDL" Offset="0x44F8" />
-        <DList Name="gBigOctoRightWeakPointDL" Offset="0x4AB8" />
-        <DList Name="gBigOctoLeftWeakPointDL" Offset="0x4CA0" />
-        <DList Name="gBigOctoRightTentacleBaseDL" Offset="0x4E10" />
-        <DList Name="gBigOctoRightTentacleTipDL" Offset="0x4EB8" />
-        <DList Name="gBigOctoLeftTentacleBaseDL" Offset="0x4F90" />
-        <DList Name="gBigOctoLeftTentacleTipDL" Offset="0x5038" />
-        <DList Name="gBigOctoBackRightArmBaseDL" Offset="0x5110" />
-        <DList Name="gBigOctoBackRightArmEndDL" Offset="0x51D0" />
-        <DList Name="gBigOctoBackLeftArmBaseDL" Offset="0x53B0" />
-        <DList Name="gBigOctoBackLeftArmEndDL" Offset="0x5470" />
-        <DList Name="gBigOctoFrontLeftArmBaseDL" Offset="0x5650" />
-        <DList Name="gBigOctoFrontLeftArmEndDL" Offset="0x5710" />
-        <DList Name="gBigOctoFrontRightArmBaseDL" Offset="0x58F0" />
-        <DList Name="gBigOctoFrontRightArmEndDL" Offset="0x59B0" />
-        <Texture Name="gBigOctoArmTopTex" OutName="big_octo_arm_top" Format="rgba16" Width="16" Height="16" Offset="0x5B90" />
-        <Texture Name="gBigOctoWeakPointCoverTex" OutName="big_octo_weak_point_cover" Format="rgba16" Width="8" Height="16" Offset="0x5D90" />
-        <Texture Name="gBigOctoEyeTex" OutName="big_octo_eye" Format="rgba16" Width="16" Height="16" Offset="0x5E90" />
-        <Texture Name="gBigOctoShellTex" OutName="big_octo_shell" Format="rgba16" Width="16" Height="16" Offset="0x6090" />
-        <Texture Name="gBigOctoHeadBaseTex" OutName="big_octo_head_base" Format="rgba16" Width="8" Height="8" Offset="0x6290" />
-        <Texture Name="gBigOctoBetweenEyesTex" OutName="big_octo_between_eyes" Format="rgba16" Width="8" Height="8" Offset="0x6310" />
-        <Texture Name="gBigOctoHeadUndersideTex" OutName="big_octo_head_underside" Format="rgba16" Width="16" Height="16" Offset="0x6390" />
-        <Texture Name="gBigOctoEyeShellTex" OutName="big_octo_eye_shell" Format="rgba16" Width="16" Height="16" Offset="0x6590" />
-        <Texture Name="gBigOctoSnoutEdgeTex" OutName="big_octo_snout_edge" Format="rgba16" Width="8" Height="16" Offset="0x6790" />
-        <Texture Name="gBigOctoArmBottomTex" OutName="big_octo_arm_bottom" Format="rgba16" Width="16" Height="16" Offset="0x6890" />
-        <Limb Name="gBigOctoBodyLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_BODY" Offset="0x6A90" />
-        <Limb Name="gBigOctoFrontRightArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_FRONT_ARM_BASE" Offset="0x6A9C" />
-        <Limb Name="gBigOctoFrontRightArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_FRONT_ARM_END" Offset="0x6AA8" />
-        <Limb Name="gBigOctoFrontLeftArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_FRONT_ARM_BASE" Offset="0x6AB4" />
-        <Limb Name="gBigOctoFrontLeftArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_FRONT_ARM_END" Offset="0x6AC0" />
-        <Limb Name="gBigOctoBackLeftArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_BACK_ARM_BASE" Offset="0x6ACC" />
-        <Limb Name="gBigOctoBackLeftArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_BACK_ARM_END" Offset="0x6AD8" />
-        <Limb Name="gBigOctoBackRightArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_BACK_ARM_BASE" Offset="0x6AE4" />
-        <Limb Name="gBigOctoBackRightArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_BACK_ARM_END" Offset="0x6AF0" />
-        <Limb Name="gBigOctoHeadShellLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_HEAD" Offset="0x6AFC" />
-        <Limb Name="gBigOctoLeftTentacleBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_TENTACLE_BASE" Offset="0x6B08" />
-        <Limb Name="gBigOctoLeftTentacleTipLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_TENTACLE_TIP" Offset="0x6B14" />
-        <Limb Name="gBigOctoRightTentacleBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_TENTACLE_BASE" Offset="0x6B20" />
-        <Limb Name="gBigOctoRightTentacleTipLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_TENTACLE_TIP" Offset="0x6B2C" />
-        <Limb Name="gBigOctoLeftWeakPointLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_WEAK_POINT" Offset="0x6B38" />
-        <Limb Name="gBigOctoRightWeakPointLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_WEAK_POINT" Offset="0x6B44" />
-        <Limb Name="gBigOctoCenterSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_CENTER_SNOUT" Offset="0x6B50" />
-        <Limb Name="gBigOctoRightSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_SNOUT" Offset="0x6B5C" />
-        <Limb Name="gBigOctoLeftSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_SNOUT" Offset="0x6B68" />
-        <Skeleton Name="gBigOctoSkel" Type="Flex" LimbType="Standard" LimbNone="BIGOKUTA_LIMB_NONE" LimbMax="BIGOKUTA_LIMB_MAX" EnumName="BigokutaLimb" Offset="0x6BC0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigpo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigpo.xml
deleted file mode 100644
index fbde9e8e5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigpo.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<Root>
-    <!-- Assets for Big Poes -->
-    <File Name="object_bigpo" Segment="6">
-        <Animation Name="gBigPoeSwingLampAttackAnim" Offset="0x158" /> <!-- Original name is "pog_atack" -->
-        <Animation Name="gBigPoeShockAnim" Offset="0x454" /> <!-- Original name is "pog_damage" -->
-        <Animation Name="gBigPoeBackpedalAnim" Offset="0x608" /> <!-- Original name is "pog_escape" -->
-        <Animation Name="gBigPoeFloatAnim" Offset="0x924" /> <!-- Original name is "pog_fly" -->
-        <Animation Name="gBigPoeAwakenSpawnAnim" Offset="0xF9C" /> <!-- Original name is "pog_start" -->
-        <Animation Name="gBigPoeAwakenStretchAnim" Offset="0x1360" /> <!-- Original name is "pog_wait" -->
-        <Texture Name="gBigPoeSoulFaceTex" OutName="bigpo_soul_face" Format="i8" Width="32" Height="64" Offset="0x1370" />
-        <DList Name="gBigPoeSoulDL" Offset="0x1BB0" /> <!-- Original name is "bigpo_soul_modelT" -->
-        <Texture Name="gBigPoeNecklaceSkullHalfTex" OutName="bigpo_skull_necklace" Format="rgba16" Width="16" Height="16" Offset="0x1C70" />
-        <Texture Name="gBigPoeLanternGlassTex" OutName="bigpo_lantern_glass" Format="rgba16" Width="16" Height="16" Offset="0x1E70" />
-        <Texture Name="gBigPoeTornRobeTex" OutName="bigpo_torn_robe" Format="rgba16" Width="32" Height="32" Offset="0x2070" />
-        <Texture Name="gBigPoeArmSectionTex" OutName="bigpo_arm_section" Format="rgba16" Width="16" Height="16" Offset="0x2870" />
-        <Texture Name="gBigPoeHoodEdgeTex" OutName="bigpo_hood_edge" Format="rgba16" Width="8" Height="8" Offset="0x2A70" />
-        <Texture Name="gBigPoeNecklaceBeadsTex" OutName="bigpo_necklace_beads" Format="rgba16" Width="16" Height="8" Offset="0x2AF0" />
-        <Texture Name="gBigPoeShawlTex" OutName="bigpo_shawl" Format="rgba16" Width="16" Height="16" Offset="0x2BF0" />
-        <Texture Name="gBigPoeGlowingEyeTex" OutName="bigpo_glowing_eye" Format="rgba16" Width="16" Height="16" Offset="0x2DF0" />
-        <!-- Carried over from object_po_field from OoT. Field Poes and Big Poes shared assets, -->
-        <!-- but certain DLists/Vtx were dropped, so some remain unused  -->
-        <!-- These 5 vtx were likely grouped as one, but they are separated out here for the used and unused sections -->
-        <Array Name="gFieldPoeLanternVtx" Count="33" Offset="0x2FF0">
-            <Vtx/>
-        </Array>
-        <Array Name="gFieldPoeBodyAndFaceVtx" Count="53" Offset="0x3200"> <!-- Unused -->
-            <Vtx/>
-        </Array>
-        <Array Name="gFieldPoeArmVtx" Count="36" Offset="0x3550">
-            <Vtx/>
-        </Array>
-        <Array Name="gFieldPoeCloakVtx" Count="55" Offset="0x3790"> <!-- Unused -->
-            <Vtx/>
-        </Array>
-        <Array Name="gFieldPoeFaceHoodRobeVtx" Count="106" Offset="0x3B00">
-            <Vtx/>
-        </Array>
-        <DList Name="gBigPoeLanternFallingDL" Offset="0x41A0" /> <!-- Original name is "pog_kantera_hahen_model" ("kantera" = "lantern", "hahen" = "fragment") -->
-        <DList Name="gBigPoeLanternMainDL" Offset="0x42C8" /> <!-- Original name is "poh_big_cantera" -->
-        <DList Name="gBigPoeLanternPurpleTopDL" Offset="0x43F8" />
-        <DList Name="gBigPoeHandDL" Offset="0x4488" />
-        <DList Name="gBigPoeSmallArmDL" Offset="0x4538" />
-        <DList Name="gBigPoeBigArmDL" Offset="0x45D8" />
-        <DList Name="gBigPoeArmAndGrowthDL" Offset="0x4680" />
-        <DList Name="gBigPoeMediumArmDL" Offset="0x4768" />
-        <DList Name="gBigPoeNecklaceHoodShawlDL" Offset="0x4808" />
-        <DList Name="gBigPoeFaceDL" Offset="0x4AE8" />
-        <DList Name="gBigPoeLowerRobeDL" Offset="0x4BD8" />
-        <Texture Name="gBigPoeCrispyPiecesTex" OutName="bigpo_crispy_pieces" Format="rgba16" Width="16" Height="16" Offset="0x4C98" />
-        <Texture Name="gBigPoeCrispyEyesTex" OutName="bigpo_crispy_eyes" Format="rgba16" Width="8" Height="8" Offset="0x4E98" />
-        <DList Name="gBigPoeCrispyBodyDL" Offset="0x58B8" />
-        <Limb Name="gBigPoeFaceLimb" Type="Standard" EnumName="BIG_POE_LIMB_FACE" Offset="0x5B88" />
-        <Limb Name="gBigPoeLeftUpperArmLimb" Type="Standard" EnumName="BIG_POE_LIMB_LEFT_UPPER_ARM" Offset="0x5B94" />
-        <Limb Name="gBigPoeLeftForearmLimb" Type="Standard" EnumName="BIG_POE_LIMB_LEFT_FOREARM" Offset="0x5BA0" />
-        <Limb Name="gBigPoeRightUpperArmLimb" Type="Standard" EnumName="BIG_POE_LIMB_RIGHT_UPPER_ARM" Offset="0x5BAC" />
-        <Limb Name="gBigPoeRightForearmLimb" Type="Standard" EnumName="BIG_POE_LIMB_RIGHT_FOREARM" Offset="0x5BB8" />
-        <Limb Name="gBigPoeRightHandLimb" Type="Standard" EnumName="BIG_POE_LIMB_RIGHT_HAND" Offset="0x5BC4" />
-        <Limb Name="gBigPoeLanternLimb" Type="Standard" EnumName="BIG_POE_LIMB_LANTERN" Offset="0x5BD0" />
-        <Limb Name="gBigPoeHatAndCloakLimb" Type="Standard" EnumName="BIG_POE_LIMB_HAT_AND_CLOAK" Offset="0x5BDC" />
-        <Limb Name="gBigPoeLowerRobeLimb" Type="Standard" EnumName="BIG_POE_LIMB_LOWER_ROBE" Offset="0x5BE8" />
-        <Skeleton Name="gBigPoeSkel" Type="Normal" LimbType="Standard" LimbNone="BIG_POE_LIMB_NONE" LimbMax="BIG_POE_LIMB_MAX" EnumName="BigPoeLimb" Offset="0x5C18" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigslime.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigslime.xml
deleted file mode 100644
index 93c2ef807..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bigslime.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<Root>
-    <!-- Assets for the Gekko, Minislime, and Bigslime -->
-    <File Name="object_bigslime" Segment="6">
-        <Animation Name="gGekkoFullFistPumpAnim" Offset="0x994" /> <!-- Original name is "bsl_aisatsuDEMO" ("greeting") -->
-        <Animation Name="gGekkoSurpriseJumpAnim" Offset="0x10F4" /> <!-- Original name is "bsl_bikkuri" ("to be surprised; to be frightened") -->
-        <Animation Name="gGekkoCallAnim" Offset="0x1B08" /> <!-- Original name is "bsl_callDEMO" -->
-        <Animation Name="gGekkoCrawlAnim" Offset="0x1E14" /> <!-- Original name is "bsl_clim" -->
-        <Animation Name="gGekkoFallInAirAnim" Offset="0x1F20" /> <!-- Original name is "bsl_climdamage" -->
-        <Animation Name="gGekkoFloorIdleAnim" Offset="0x225C" /> <!-- Original name is "bsl_climwait" -->
-        <Animation Name="gGekkoDamagedAnim" Offset="0x276C" /> <!-- Original name is "bsl_damage" -->
-        <Animation Name="gGekkoJumpUpAnim" Offset="0x2E0C" /> <!-- Original name is "bsl_flyjump" -->
-        <Animation Name="gGekkoRecoverAnim" Offset="0x30E4" /> <!-- Original name is "bsl_hukki" ("return; comeback") -->
-        <Animation Name="gGekkoJabPunchAnim" Offset="0x347C" /> <!-- Original name is "bsl_jabA" -->
-        <Animation Name="gGekkoJumpForwardAnim" Offset="0x39C4" /> <!-- Original name is "bsl_jump" -->
-        <Animation Name="gGekkoKickAnim" Offset="0x3F28" /> <!-- Original name is "bsl_kickA" -->
-        <Animation Name="gGekkoFallOnGroundAnim" Offset="0x4298" /> <!-- Original name is "bsl_rakka" ("fall; drop; descent") -->
-        <Animation Name="gGekkoStandingIdleAnim" Offset="0x4680" /> <!-- Original name is "bsl_ride" -->
-        <Animation Name="gGekkoJumpOnSnapperAnim" Offset="0x4894" /> <!-- Orignal name is "bsl_ridefuse" -->
-        <Animation Name="gGekkoQuickFistPumpAnim" Offset="0x4D50" /> <!-- Original name is "bsl_ridegogo" -->
-        <Animation Name="gGekkoSqueezeAnim" Offset="0x50B8" /> <!-- Original name is "bsl_ridejump" -->
-        <Animation Name="gGekkoLandOnSnapperAnim" Offset="0x52EC" /> <!-- Original name is "bsl_rideokiru" ("okiru" = "to get up; to rise") -->
-        <Animation Name="gGekkoWiggleAnim" Offset="0x5694" /> <!-- Original name is "bsl_riderakka" -->
-        <Animation Name="gGekkoKnockbackAnim" Offset="0x5D54" /> <!-- Original name is "bsl_standdamage" -->
-        <Animation Name="gGekkoLookAroundAnim" Offset="0x66B4" /> <!-- Original name is "bsl_standview" -->
-        <Animation Name="gGekkoNervousIdleAnim" Offset="0x69FC" /> <!-- Original name is "bsl_standwalk" -->
-        <Animation Name="gGekkoHookPunchAnim" Offset="0x70C4" /> <!-- Original name is "bsl_strertA" (maybe a severe mispelling of "straight", as in "straight punch"?) -->
-        <Animation Name="gGekkoSwimForwardAnim" Offset="0x7790" /> <!-- Original name is "bsl_swim" -->
-
-        <DList Name="gGekkoRightEyeDL" Offset="0x9D90" />
-        <DList Name="gGekkoLeftEyeDL" Offset="0x9FF0" />
-        <DList Name="gGekkoJawDL" Offset="0xA250" />
-        <DList Name="gGekkoHeadDL" Offset="0xA510" />
-        <DList Name="gGekkoRightHandDL" Offset="0xAAF8" />
-        <DList Name="gGekkoRightWristDL" Offset="0xABB0" />
-        <DList Name="gGekkoRightForearmDL" Offset="0xAC78" />
-        <DList Name="gGekkoRightUpperArmDL" Offset="0xAD88" />
-        <DList Name="gGekkoLeftHandDL" Offset="0xAE98" />
-        <DList Name="gGekkoLeftWristDL" Offset="0xAF50" />
-        <DList Name="gGekkoLeftForearmDL" Offset="0xB030" />
-        <DList Name="gGekkoLeftUpperArmDL" Offset="0xB140" />
-        <DList Name="gGekkoTorsoDL" Offset="0xB250" />
-        <DList Name="gGekkoRightFootDL" Offset="0xB4D8" />
-        <DList Name="gGekkoRightAnkleDL" Offset="0xB660" />
-        <DList Name="gGekkoRightShinDL" Offset="0xB770" />
-        <DList Name="gGekkoRightThighDL" Offset="0xB880" />
-        <DList Name="gGekkoLeftFootDL" Offset="0xB9A8" />
-        <DList Name="gGekkoLeftAnkleDL" Offset="0xBB30" />
-        <DList Name="gGekkoLeftShinDL" Offset="0xBC40" />
-        <DList Name="gGekkoLeftThighDL" Offset="0xBD50" />
-        <DList Name="gGekkoWaistDL" Offset="0xBE78" />
-
-        <Texture Name="gGekkoArmLegTLUT" OutName="gekko_arm_leg_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC028" />
-        <Texture Name="gGekkoBodyTLUT" OutName="gekko_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC228" />
-        <Texture Name="gGekkoHeadTLUT" OutName="gekko_head_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC428" />
-        
-        <Texture Name="gGekkoNostrilTex" OutName="gekko_nostril" Format="rgba16" Width="8" Height="8" Offset="0xC628" />
-        <Texture Name="gGekkoEyeTex" OutName="gekko_eye" Format="rgba16" Width="16" Height="16" Offset="0xC6A8" />
-        <Texture Name="gGekkoSpots1Tex" OutName="gekko_spots_1" Format="rgba16" Width="16" Height="16" Offset="0xC8A8" />
-        <Texture Name="gGekkoBellyTex" OutName="gekko_belly" Format="rgba16" Width="16" Height="32" Offset="0xCAA8" />
-        <Texture Name="gGekkoSpots2Tex" OutName="gekko_spots_2" Format="ci8" Width="16" Height="32" Offset="0xCEA8" />
-        <Texture Name="gGekkoToothTex" OutName="gekko_tooth" Format="rgba16" Width="16" Height="16" Offset="0xD0A8" />
-        <Texture Name="gGekkoMouthTex" OutName="gekko_mouth" Format="rgba16" Width="16" Height="8" Offset="0xD2A8" />
-        <Texture Name="gGekkoEyebrowTex" OutName="gekko_eyebrow" Format="rgba16" Width="8" Height="8" Offset="0xD3A8" />
-        <Texture Name="gGekkoFinTex" OutName="gekko_fin" Format="rgba16" Width="32" Height="16" Offset="0xD428" />
-        <Texture Name="gGekkoSpots3Tex" OutName="gekko_spots_3" Format="ci8" Width="32" Height="32" Offset="0xD828" />
-        <Texture Name="gGekkoSwirlTex" OutName="gekko_swirl" Format="ci8" Width="16" Height="32" Offset="0xDC28" />
-        
-        <Limb Name="gGekkoRootLimb" Type="Standard" EnumName="GEKKO_LIMB_ROOT" Offset="0xDE28" />
-        <Limb Name="gGekkoWaistLimb" Type="Standard" EnumName="GEKKO_LIMB_WAIST" Offset="0xDE34" />
-        <Limb Name="gGekkoLeftThighLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_THIGH" Offset="0xDE40" />
-        <Limb Name="gGekkoLeftShinLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_SHIN" Offset="0xDE4C" />
-        <Limb Name="gGekkoLeftAnkleLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_ANKLE" Offset="0xDE58" />
-        <Limb Name="gGekkoLeftFootLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_FOOT" Offset="0xDE64" />
-        <Limb Name="gGekkoRightThighLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_THIGH" Offset="0xDE70" />
-        <Limb Name="gGekkoRightShinLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_SHIN" Offset="0xDE7C" />
-        <Limb Name="gGekkoRightAnkleLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_ANKLE" Offset="0xDE88" />
-        <Limb Name="gGekkoRightFootLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_FOOT" Offset="0xDE94" />
-        <Limb Name="gGekkoTorsoLimb" Type="Standard" EnumName="GEKKO_LIMB_TORSO" Offset="0xDEA0" />
-        <Limb Name="gGekkoLeftUpperArmLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_UPPER_ARM" Offset="0xDEAC" />
-        <Limb Name="gGekkoLeftForearmLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_FOREARM" Offset="0xDEB8" />
-        <Limb Name="gGekkoLeftWristLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_WRIST" Offset="0xDEC4" />
-        <Limb Name="gGekkoLeftHandLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_HAND" Offset="0xDED0" />
-        <Limb Name="gGekkoRightUpperArmLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_UPPER_ARM" Offset="0xDEDC" />
-        <Limb Name="gGekkoRightForearmLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_FOREARM" Offset="0xDEE8" />
-        <Limb Name="gGekkoRightWristLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_WRIST" Offset="0xDEF4" />
-        <Limb Name="gGekkoRightHandLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_HAND" Offset="0xDF00" />
-        <Limb Name="gGekkoHeadLimb" Type="Standard" EnumName="GEKKO_LIMB_HEAD" Offset="0xDF0C" />
-        <Limb Name="gGekkoJawLimb" Type="Standard" EnumName="GEKKO_LIMB_JAW" Offset="0xDF18" />
-        <Limb Name="gGekkoLeftEyeLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_EYE" Offset="0xDF24" />
-        <Limb Name="gGekkoRightEyeLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_EYE" Offset="0xDF30" />
-        <Skeleton Name="gGekkoSkel" Type="Flex" LimbType="Standard" LimbNone="GEKKO_LIMB_NONE" LimbMax="GEKKO_LIMB_MAX" EnumName="GekkoLimb" Offset="0xDF98" />
-
-        <Animation Name="gGekkoWindupPunchAnim" Offset="0xF048" /> <!-- Original name is "bsl_upperA" -->
-        <Animation Name="gGekkoSwimUpAnim" Offset="0xF3F0" /> <!-- Original name is "bsl_upswim" -->
-        <Animation Name="gGekkoBoxingStanceAnim" Offset="0xF990" /> <!-- Original name is "bsl_waitA" -->
-        
-        <DList Name="gBigslimeBubbleDL" Offset="0xF9D0" /> <!-- Original name is "bsl_bable_model" -->
-        <DList Name="gBigslimeShockwaveDL" Offset="0xFB40" /> <!-- Original name is "bsl_coolwave_modelT" -->
-        <Texture Name="gBigslimeShockwave1Tex" OutName="bigslime_shockwave_1" Format="i4" Width="32" Height="64" Offset="0xFC28" />
-        <Blob Name="object_bigslime_zeroes_Blob_010028" Size="0x400" Offset="0x10028" />
-        <Texture Name="gBigslimeShockwave2Tex" OutName="bigslime_shockwave_2" Format="i4" Width="16" Height="16" Offset="0x10428" />
-        <Blob Name="object_bigslime_zeroes_Blob_0104A8" Size="0x88" Offset="0x104A8" />
-        
-        <DList Name="gBigslimeNormalMaterialDL" Offset="0x10530" />
-
-        <!-- Reads vtx from segment 9 set by sBigslimeDynamicVtx -->
-        <DList Name="gBigslimeModelDL" Offset="0x105E8" />
-        <!-- Reads vtx from segment 9 set by sBigslimeTargetVtx -->
-        <DList Name="gBigslimeFrozenMaterialDL" Offset="0x10B80" />
-
-        <TextureAnimation Name="gBigslimeFrozenTexAnim" Offset="0x10C48" />
-        <DList Name="gMinislimeFrozenDL" Offset="0x10DB0" /> <!-- Original name is "bsl_icepart_model" (the original asset exists in MM3D, along with an updated asset named "muddjelly_icepart") -->
-        <TextureAnimation Name="gMinislimeFrozenTexAnim" Offset="0x10EC8" />
-
-        <DList Name="gBigslimeIceShardDL" Offset="0x10F20" />
-        <DList Name="gBigslimeIceShardVtxDL" Offset="0x10FE0" /> <!-- Original name is probably "bsl_icepeace_model" (called "muddjelly_icepeace" in MM3D) -->
-        <TextureAnimation Name="gBigslimeIceShardTexAnim" Offset="0x11008" />
-        
-        <DList Name="gBigslimeShadowDL" Offset="0x11050" /> <!-- Original name is "bsl_kage_model" ("shadow; silhouette") -->
-        <DList Name="gMinislimeNormalDL" Offset="0x113B0" /> <!-- Original name is probably "bsl_smallgel_model" (called "muddjelly_smallgel" in MM3D) -->
-
-        <Texture Name="gBigslimeBubbleTex" OutName="bigslime_bubble" Format="i4" Width="16" Height="16" Offset="0x11580" />
-        <Texture Name="gBigslimeShadowTex" OutName="bigslime_shadow" Format="i8" Width="32" Height="32" Offset="0x11600" />
-        
-        <!-- Used also for minislime -->
-        <Texture Name="gBigslimeNormal1Tex" OutName="bigslime_normal_1" Format="rgba16" Width="32" Height="32" Offset="0x11A00" />
-        <Texture Name="gBigslimeNormal2Tex" OutName="bigslime_normal_2" Format="i4" Width="64" Height="64" Offset="0x12200" />
-        <Texture Name="gBigslimeFrozen1Tex" OutName="bigslime_frozen_1" Format="i4" Width="64" Height="64" Offset="0x12A00" />
-        <Texture Name="gBigslimeFrozen2Tex" OutName="bigslime_frozen_2" Format="i4" Width="32" Height="32" Offset="0x13200" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bji.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bji.xml
deleted file mode 100644
index 697ee565c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bji.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Root>
-    <File Name="object_bji" Segment="6">
-        <Animation Name="object_bji_Anim_00066C" Offset="0x66C" /> <!-- Original name is "Bji_fushigigaru" ("to be curious; to wonder; to marvel​") -->
-        <Animation Name="object_bji_Anim_000AB0" Offset="0xAB0" /> <!-- Original name is "Bji_talk" -->
-        <Animation Name="object_bji_Anim_000FDC" Offset="0xFDC" /> <!-- Original name is "Bji_wait01" -->
-        
-        <DList Name="gShikashiHeadDL" Offset="0x23A0" />
-        <DList Name="gShikashiRightHandDL" Offset="0x28D8" />
-        <DList Name="gShikashiRightForearmDL" Offset="0x2998" />
-        <DList Name="gShikashiRightArmDL" Offset="0x2A98" />
-        <DList Name="gShikashiLeftHandDL" Offset="0x2BA8" />
-        <DList Name="gShikashiLeftForearmDL" Offset="0x2C68" />
-        <DList Name="gShikashiLeftArmDL" Offset="0x2D68" />
-        <DList Name="gShikashiTorsoDL" Offset="0x2E78" />
-        <DList Name="gShikashiRightFootDL" Offset="0x30F0" />
-        <DList Name="gShikashiRightLegDL" Offset="0x31B0" />
-        <DList Name="gShikashiRightThighDL" Offset="0x3270" />
-        <DList Name="gShikashiLeftFootDL" Offset="0x3330" />
-        <DList Name="gShikashiLeftLegDL" Offset="0x33F0" />
-        <DList Name="gShikashiLeftThighDL" Offset="0x34B0" />
-        <DList Name="gShikashiPelvisDL" Offset="0x3570" />
-
-        <Texture Name="object_bji_TLUT_003730" OutName="tlut_003730" Format="rgba16" Width="16" Height="16" Offset="0x3730" />
-        <Texture Name="object_bji_TLUT_003930" OutName="tlut_003930" Format="rgba16" Width="16" Height="16" Offset="0x3930" />
-        <Texture Name="object_bji_TLUT_003B30" OutName="tlut_003B30" Format="rgba16" Width="16" Height="16" Offset="0x3B30" />
-        <Texture Name="object_bji_TLUT_003D30" OutName="tlut_003D30" Format="rgba16" Width="16" Height="16" Offset="0x3D30" />
-        <Texture Name="object_bji_TLUT_003F30" OutName="tlut_003F30" Format="rgba16" Width="16" Height="16" Offset="0x3F30" />
-        <Texture Name="object_bji_Tex_004130" OutName="tex_004130" Format="rgba16" Width="16" Height="16" Offset="0x4130" />
-        <Texture Name="object_bji_TLUT_004330" OutName="tlut_004330" Format="rgba16" Width="16" Height="16" Offset="0x4330" />
-        <Texture Name="object_bji_TLUT_004530" OutName="tlut_004530" Format="rgba16" Width="16" Height="16" Offset="0x4530" />
-        <Texture Name="object_bji_Tex_004730" OutName="tex_004730" Format="ci8" Width="8" Height="8" Offset="0x4730" />
-        <Texture Name="object_bji_Tex_004770" OutName="tex_004770" Format="ci8" Width="16" Height="16" Offset="0x4770" />
-        <Texture Name="object_bji_Tex_004870" OutName="tex_004870" Format="ci8" Width="8" Height="8" Offset="0x4870" />
-        <Texture Name="object_bji_Tex_0048B0" OutName="tex_0048B0" Format="ci8" Width="16" Height="16" Offset="0x48B0" />
-        <Texture Name="object_bji_Tex_0049B0" OutName="tex_0049B0" Format="ci8" Width="8" Height="8" Offset="0x49B0" />
-        <Texture Name="object_bji_Tex_0049F0" OutName="tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" />
-        <Texture Name="object_bji_Tex_004DF0" OutName="tex_004DF0" Format="ci8" Width="8" Height="8" Offset="0x4DF0" />
-        <Texture Name="object_bji_Tex_004E30" OutName="tex_004E30" Format="ci8" Width="8" Height="8" Offset="0x4E30" />
-        <Texture Name="object_bji_Tex_004E70" OutName="tex_004E70" Format="ci8" Width="32" Height="32" Offset="0x4E70" />
-        <Texture Name="object_bji_Tex_005270" OutName="tex_005270" Format="ci8" Width="32" Height="32" Offset="0x5270" />
-        
-        <!-- Unused Eye Texture Animation -->
-        <TextureAnimation Name="gShikashiEyeTexAnim" Offset="0x5694" />
-
-        <Limb Name="gShikashiPelvisLimb" Type="Standard" EnumName="SHIKASHI_LIMB_PELVIS" Offset="0x569C" />
-        <Limb Name="gShikashiLeftThighLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_THIGH" Offset="0x56A8" />
-        <Limb Name="gShikashiLeftLegLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_LEG" Offset="0x56B4" />
-        <Limb Name="gShikashiLeftFootLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_FOOT" Offset="0x56C0" />
-        <Limb Name="gShikashiRightThighLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_THIGH" Offset="0x56CC" />
-        <Limb Name="gShikashiRightLegLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_LEG" Offset="0x56D8" />
-        <Limb Name="gShikashiRightFootLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_FOOT" Offset="0x56E4" />
-        <Limb Name="gShikashiTorsoLimb" Type="Standard" EnumName="SHIKASHI_LIMB_TORSO" Offset="0x56F0" />
-        <Limb Name="gShikashiLeftArmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_ARM" Offset="0x56FC" />
-        <Limb Name="gShikashiLeftForearmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_FOREARM" Offset="0x5708" />
-        <Limb Name="gShikashiLeftHandLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_HAND" Offset="0x5714" />
-        <Limb Name="gShikashiRightArmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_ARM" Offset="0x5720" />
-        <Limb Name="gShikashiRightForearmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_FOREARM" Offset="0x572C" />
-        <Limb Name="gShikashiRightHandLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_HAND" Offset="0x5738" />
-        <Limb Name="gShikashiHeadLimb" Type="Standard" EnumName="SHIKASHI_LIMB_HEAD" Offset="0x5744" />
-        <Skeleton Name="gShikashiSkel" Type="Flex" LimbType="Standard" LimbNone="SHIKASHI_LIMB_NONE" LimbMax="SHIKASHI_LIMB_MAX" EnumName="ShikashiLimb" Offset="0x578C" />
-
-        <Animation Name="object_bji_Anim_005B58" Offset="0x5B58" /> <!-- Original name is "Bji_wait02" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bjt.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bjt.xml
deleted file mode 100644
index a4943f6ee..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bjt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Root>
-    <!-- ??? (Hand in Toilet) assets -->
-    <File Name="object_bjt" Segment="6">
-        <!-- ??? animations -->
-        <Animation Name="gToiletHandWaggingFingerAnim" Offset="0xFC" /><!-- Original name is "bjt_chigau" ("different/wrong") -->
-        <Animation Name="gToiletHandFistAnim" Offset="0x218" /><!-- Original name is "bjt_guu" ("fist") -->
-        <Animation Name="gToiletHandThumbsUpAnim" Offset="0x3A8" /><!-- Original name is "bjt_ok" (thumbs up, correct) -->
-        <Animation Name="gToiletHandOpenHandAnim" Offset="0x564" /><!-- Original name is "bjt_par" ("paper"? Open hand, palm up) -->
-        <Animation Name="gToiletHandWaitingAnim" Offset="0x7B8" /><!-- Original name is "bjt_wait" (flopping around grasping at air) -->
-
-        <!-- ??? model -->
-        <DList Name="gToiletHandIndexFingerDL" Offset="0x1570" />
-        <DList Name="gToiletHandThumbDL" Offset="0x1690" />
-        <DList Name="gToiletHandOtherFingersDL" Offset="0x17A0" />
-        <DList Name="gToiletHandPalmDL" Offset="0x18C8" />
-        <DList Name="gToiletHandArmDL" Offset="0x19E8" />
-        <Texture Name="gToiletHandFingersTex" OutName="toilet_hand_fingers" Format="rgba16" Width="32" Height="32" Offset="0x1AB0" />
-        <Texture Name="gToiletHandArmSkinTex" OutName="toilet_hand_arm_skin" Format="rgba16" Width="8" Height="8" Offset="0x22B0" />
-        <Limb Name="gToiletHandRootLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_ROOT" Offset="0x2330" />
-        <Limb Name="gToiletHandArmLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_ARM" Offset="0x233C" />
-        <Limb Name="gToiletHandPalmLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_PALM" Offset="0x2348" />
-        <Limb Name="gToiletHandOtherFingersLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_OTHER_FINGERS" Offset="0x2354" />
-        <Limb Name="gToiletHandThumbLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_THUMB" Offset="0x2360" />
-        <Limb Name="gToiletHandIndexFingerLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_INDEX_FINGER" Offset="0x236C" />
-        <Skeleton Name="gToiletHandSkel" Type="Flex" LimbType="Standard" LimbNone="TOILET_HAND_LIMB_NONE" LimbMax="TOILET_HAND_LIMB_MAX" EnumName="ToiletHandLimb" Offset="0x2390" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bob.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bob.xml
deleted file mode 100644
index 13edbe6fe..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bob.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<Root>
-    <File Name="object_bob" Segment="6">
-        <Limb Name="object_bob_Standardlimb_000000" Type="Standard" EnumName="OBJECT_BOB_LIMB_01" Offset="0x0" />
-        <Limb Name="object_bob_Standardlimb_00000C" Type="Standard" EnumName="OBJECT_BOB_LIMB_02" Offset="0xC" />
-        <Limb Name="object_bob_Standardlimb_000018" Type="Standard" EnumName="OBJECT_BOB_LIMB_03" Offset="0x18" />
-        <Limb Name="object_bob_Standardlimb_000024" Type="Standard" EnumName="OBJECT_BOB_LIMB_04" Offset="0x24" />
-        <Limb Name="object_bob_Standardlimb_000030" Type="Standard" EnumName="OBJECT_BOB_LIMB_05" Offset="0x30" />
-        <Limb Name="object_bob_Standardlimb_00003C" Type="Standard" EnumName="OBJECT_BOB_LIMB_06" Offset="0x3C" />
-        <Limb Name="object_bob_Standardlimb_000048" Type="Standard" EnumName="OBJECT_BOB_LIMB_07" Offset="0x48" />
-        <Limb Name="object_bob_Standardlimb_000054" Type="Standard" EnumName="OBJECT_BOB_LIMB_08" Offset="0x54" />
-        <Limb Name="object_bob_Standardlimb_000060" Type="Standard" EnumName="OBJECT_BOB_LIMB_09" Offset="0x60" />
-        <Limb Name="object_bob_Standardlimb_00006C" Type="Standard" EnumName="OBJECT_BOB_LIMB_0A" Offset="0x6C" />
-        <Limb Name="object_bob_Standardlimb_000078" Type="Standard" EnumName="OBJECT_BOB_LIMB_0B" Offset="0x78" />
-        <Limb Name="object_bob_Standardlimb_000084" Type="Standard" EnumName="OBJECT_BOB_LIMB_0C" Offset="0x84" />
-        <Limb Name="object_bob_Standardlimb_000090" Type="Standard" EnumName="OBJECT_BOB_LIMB_0D" Offset="0x90" />
-        <Limb Name="object_bob_Standardlimb_00009C" Type="Standard" EnumName="OBJECT_BOB_LIMB_0E" Offset="0x9C" />
-        <Limb Name="object_bob_Standardlimb_0000A8" Type="Standard" EnumName="OBJECT_BOB_LIMB_0F" Offset="0xA8" />
-        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOB_LIMB_NONE" LimbMax="OBJECT_BOB_LIMB_MAX" EnumName="ObjectBobLimb" Offset="0xF0" />
-        <Texture Name="object_bob_TLUT_000108" OutName="tlut_000108" Format="rgba16" Width="16" Height="16" Offset="0x108" />
-        <Texture Name="object_bob_Tex_000308" OutName="tex_000308" Format="ci8" Width="8" Height="8" Offset="0x308" />
-        <Texture Name="object_bob_Tex_000348" OutName="tex_000348" Format="ci8" Width="8" Height="8" Offset="0x348" />
-        <Texture Name="object_bob_Tex_000388" OutName="tex_000388" Format="ci8" Width="32" Height="32" Offset="0x388" />
-        <Texture Name="object_bob_Tex_000788" OutName="tex_000788" Format="ci8" Width="8" Height="8" Offset="0x788" />
-        <Texture Name="object_bob_Tex_0007C8" OutName="tex_0007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8" />
-        <Texture Name="object_bob_Tex_000FC8" OutName="tex_000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8" />
-        <Texture Name="object_bob_Tex_0017C8" OutName="tex_0017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8" />
-        <Texture Name="object_bob_Tex_001FC8" OutName="tex_001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" />
-        <Texture Name="object_bob_Tex_0020C8" OutName="tex_0020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" />
-        <Texture Name="object_bob_Tex_0021C8" OutName="tex_0021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" />
-        <Texture Name="object_bob_Tex_002208" OutName="tex_002208" Format="ci8" Width="16" Height="16" Offset="0x2208" />
-        <DList Name="object_bob_DL_003B78" Offset="0x3B78" />
-        <DList Name="object_bob_DL_003F68" Offset="0x3F68" />
-        <DList Name="object_bob_DL_0040B0" Offset="0x40B0" />
-        <DList Name="object_bob_DL_0041E0" Offset="0x41E0" />
-        <DList Name="object_bob_DL_004310" Offset="0x4310" />
-        <DList Name="object_bob_DL_004458" Offset="0x4458" />
-        <DList Name="object_bob_DL_004588" Offset="0x4588" />
-        <DList Name="object_bob_DL_0046B8" Offset="0x46B8" />
-        <DList Name="object_bob_DL_004A48" Offset="0x4A48" />
-        <DList Name="object_bob_DL_004B18" Offset="0x4B18" />
-        <DList Name="object_bob_DL_004BE8" Offset="0x4BE8" />
-        <DList Name="object_bob_DL_004C38" Offset="0x4C38" />
-        <DList Name="object_bob_DL_004D08" Offset="0x4D08" />
-        <DList Name="object_bob_DL_004DD8" Offset="0x4DD8" />
-        <DList Name="object_bob_DL_004E28" Offset="0x4E28" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boj.xml
deleted file mode 100644
index 2eb08a1ef..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boj.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<Root>
-    <File Name="object_boj" Segment="6">
-        <Animation Name="object_boj_Anim_00041C" Offset="0x41C" /> <!-- Original name is "Boj2_17" -->
-        <Animation Name="object_boj_Anim_0004D0" Offset="0x4D0" /> <!-- Original name is "Boj2_19" -->
-        <Animation Name="object_boj_Anim_00071C" Offset="0x71C" /> <!-- Original name is "Boj2_5" -->
-        <Animation Name="object_boj_Anim_0008C0" Offset="0x8C0" /> <!-- Original name is "Boj2_9" -->
-        <Animation Name="object_boj_Anim_000AC4" Offset="0xAC4" /> <!-- Original name is "Boj2_9_2" -->
-        <Animation Name="object_boj_Anim_001494" Offset="0x1494" /> <!-- Original name is "Boj_13" -->
-        <Animation Name="object_boj_Anim_001908" Offset="0x1908" /> <!-- Original name is "Boj_14" -->
-        <Animation Name="object_boj_Anim_002734" Offset="0x2734" /> <!-- Original name is "Boj_card_aka_talk" ("aka" = "red") -->
-        <Animation Name="object_boj_Anim_0033B0" Offset="0x33B0" /> <!-- Original name is "Boj_card_aka_wait" -->
-        <Animation Name="object_boj_Anim_004078" Offset="0x4078" /> <!-- Original name is "Boj_card_ao_wait" ("ao" = "blue") -->
-        <Animation Name="object_boj_Anim_0043F0" Offset="0x43F0" /> <!-- Original name is "Boj_ginkowait" ("ginko" = "bank") -->
-        <Animation Name="object_boj_Anim_004A7C" Offset="0x4A7C" /> <!-- Original name is "Boj_ginkoyobi" ("yobi" = "call; invitation") -->
-        <Animation Name="object_boj_Anim_004F40" Offset="0x4F40" /> <!-- Original name is "Boj_hanko" ("seal; stamp") -->
-        <Animation Name="object_boj_Anim_005CE4" Offset="0x5CE4" /> <!-- Original name is "Boj_juggling" -->
-        <Animation Name="object_boj_Anim_005D9C" Offset="0x5D9C" /> <!-- Original name is "Boj_matsu" ("to wait​") -->
-        <Texture Name="object_boj_TLUT_005DB0" OutName="tlut_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5DB0" />
-        <Texture Name="object_boj_Tex_005FB0" OutName="tex_005FB0" Format="ci8" Width="8" Height="16" Offset="0x5FB0" />
-        <Texture Name="object_boj_Tex_006030" OutName="tex_006030" Format="ci8" Width="8" Height="8" Offset="0x6030" />
-        <Texture Name="object_boj_Tex_006070" OutName="tex_006070" Format="ci8" Width="32" Height="16" Offset="0x6070" />
-        <Texture Name="object_boj_Tex_006270" OutName="tex_006270" Format="ci8" Width="8" Height="8" Offset="0x6270" />
-        <Texture Name="object_boj_Tex_0062B0" OutName="tex_0062B0" Format="ci8" Width="16" Height="16" Offset="0x62B0" />
-        <Texture Name="object_boj_Tex_0063B0" OutName="tex_0063B0" Format="ci8" Width="16" Height="16" Offset="0x63B0" />
-        <Texture Name="object_boj_Tex_0064B0" OutName="tex_0064B0" Format="ci8" Width="16" Height="16" Offset="0x64B0" />
-        <Texture Name="object_boj_Tex_0065B0" OutName="tex_0065B0" Format="ci8" Width="8" Height="8" Offset="0x65B0" />
-        <Texture Name="object_boj_Tex_0065F0" OutName="tex_0065F0" Format="i8" Width="16" Height="16" Offset="0x65F0" />
-        <Texture Name="object_boj_Tex_0066F0" OutName="tex_0066F0" Format="ci8" Width="8" Height="8" Offset="0x66F0" />
-        <Texture Name="object_boj_Tex_006730" OutName="tex_006730" Format="i8" Width="8" Height="8" Offset="0x6730" />
-        <DList Name="object_boj_DL_0083A0" Offset="0x83A0" />
-        <DList Name="object_boj_DL_008778" Offset="0x8778" />
-        <DList Name="object_boj_DL_0088C0" Offset="0x88C0" />
-        <DList Name="object_boj_DL_0089C8" Offset="0x89C8" />
-        <DList Name="object_boj_DL_008AD0" Offset="0x8AD0" />
-        <DList Name="object_boj_DL_008C18" Offset="0x8C18" />
-        <DList Name="object_boj_DL_008D20" Offset="0x8D20" />
-        <DList Name="object_boj_DL_008E28" Offset="0x8E28" />
-        <DList Name="object_boj_DL_009000" Offset="0x9000" />
-        <DList Name="object_boj_DL_009118" Offset="0x9118" />
-        <DList Name="object_boj_DL_009228" Offset="0x9228" />
-        <DList Name="object_boj_DL_009330" Offset="0x9330" />
-        <DList Name="object_boj_DL_009448" Offset="0x9448" />
-        <DList Name="object_boj_DL_009558" Offset="0x9558" />
-        <DList Name="object_boj_DL_009660" Offset="0x9660" />
-        <!-- <Blob Name="object_boj_Blob_009848" Size="0x1F8" Offset="0x9848" /> -->
-        <Texture Name="object_boj_Tex_009A40" OutName="tex_009A40" Format="ci8" Width="8" Height="8" Offset="0x9A40" />
-        <Texture Name="object_boj_Tex_009A80" OutName="tex_009A80" Format="ci8" Width="16" Height="16" Offset="0x9A80" />
-        <Texture Name="object_boj_Tex_009B80" OutName="tex_009B80" Format="ci8" Width="16" Height="16" Offset="0x9B80" />
-        <Texture Name="object_boj_Tex_009C80" OutName="tex_009C80" Format="ci8" Width="8" Height="16" Offset="0x9C80" />
-        <Texture Name="object_boj_Tex_009D00" OutName="tex_009D00" Format="ci8" Width="16" Height="16" Offset="0x9D00" />
-        <Texture Name="object_boj_Tex_009E00" OutName="tex_009E00" Format="ci8" Width="16" Height="16" Offset="0x9E00" />
-        <Texture Name="object_boj_Tex_009F00" OutName="tex_009F00" Format="ci8" Width="16" Height="16" Offset="0x9F00" />
-        <DList Name="object_boj_DL_00AF90" Offset="0xAF90" />
-        <DList Name="object_boj_DL_00B1D8" Offset="0xB1D8" /> <!-- object_ginko_limb15_dlist -->
-        <DList Name="object_boj_DL_00B3E8" Offset="0xB3E8" />
-        <DList Name="object_boj_DL_00B660" Offset="0xB660" />
-        <DList Name="object_boj_DL_00B878" Offset="0xB878" />
-        <DList Name="object_boj_DL_00BA28" Offset="0xBA28" />
-        <DList Name="object_boj_DL_00BA30" Offset="0xBA30" />
-        <Texture Name="object_boj_Tex_00BB88" OutName="tex_00BB88" Format="i8" Width="16" Height="16" Offset="0xBB88" />
-        <DList Name="object_boj_DL_00BCC8" Offset="0xBCC8" /> <!-- Original name is "jug_ball_model" -->
-        <Texture Name="object_boj_Tex_00BD50" OutName="tex_00BD50" Format="i8" Width="32" Height="32" Offset="0xBD50" />
-        <Limb Name="object_boj_Standardlimb_00C150" Type="Standard" EnumName="OBJECT_BOJ_LIMB_01" Offset="0xC150" />
-        <Limb Name="object_boj_Standardlimb_00C15C" Type="Standard" EnumName="OBJECT_BOJ_LIMB_02" Offset="0xC15C" />
-        <Limb Name="object_boj_Standardlimb_00C168" Type="Standard" EnumName="OBJECT_BOJ_LIMB_03" Offset="0xC168" />
-        <Limb Name="object_boj_Standardlimb_00C174" Type="Standard" EnumName="OBJECT_BOJ_LIMB_04" Offset="0xC174" />
-        <Limb Name="object_boj_Standardlimb_00C180" Type="Standard" EnumName="OBJECT_BOJ_LIMB_05" Offset="0xC180" />
-        <Limb Name="object_boj_Standardlimb_00C18C" Type="Standard" EnumName="OBJECT_BOJ_LIMB_06" Offset="0xC18C" />
-        <Limb Name="object_boj_Standardlimb_00C198" Type="Standard" EnumName="OBJECT_BOJ_LIMB_07" Offset="0xC198" />
-        <Limb Name="object_boj_Standardlimb_00C1A4" Type="Standard" EnumName="OBJECT_BOJ_LIMB_08" Offset="0xC1A4" />
-        <Limb Name="object_boj_Standardlimb_00C1B0" Type="Standard" EnumName="OBJECT_BOJ_LIMB_09" Offset="0xC1B0" />
-        <Limb Name="object_boj_Standardlimb_00C1BC" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0A" Offset="0xC1BC" />
-        <Limb Name="object_boj_Standardlimb_00C1C8" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0B" Offset="0xC1C8" />
-        <Limb Name="object_boj_Standardlimb_00C1D4" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0C" Offset="0xC1D4" />
-        <Limb Name="object_boj_Standardlimb_00C1E0" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0D" Offset="0xC1E0" />
-        <Limb Name="object_boj_Standardlimb_00C1EC" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0E" Offset="0xC1EC" />
-        <Limb Name="object_boj_Standardlimb_00C1F8" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0F" Offset="0xC1F8" />
-        <Skeleton Name="object_boj_Skel_00C240" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOJ_LIMB_NONE" LimbMax="OBJECT_BOJ_LIMB_MAX" EnumName="ObjectBojLimb" Offset="0xC240" /> <!-- object_ginko_skeleton -->
-        <Animation Name="object_boj_Anim_00DED8" Offset="0xDED8" /> <!-- Original name is "boj_door1" -->
-        <Animation Name="object_boj_Anim_00F920" Offset="0xF920" /> <!-- Original name is "boj_door2" -->
-        <Animation Name="object_boj_Anim_00FC1C" Offset="0xFC1C" /> <!-- Original name is "boj_walk1" -->
-        <Animation Name="object_boj_Anim_00FEE4" Offset="0xFEE4" /> <!-- Original name is "boj_walk2" -->
-        <Animation Name="object_boj_Anim_010330" Offset="0x10330" /> <!-- Original name is "boj_walk3" -->
-        <Animation Name="object_boj_Anim_010BDC" Offset="0x10BDC" /> <!-- Original name is "scm_harau" ("to drive away") -->
-        <Animation Name="object_boj_Anim_01139C" Offset="0x1139C" /> <!-- Original name is "scm_niwait" -->
-        <Animation Name="object_boj_Anim_011C38" Offset="0x11C38" /> <!-- Original name is "scm_odoroku" ("surprise") -->
-        <Animation Name="object_boj_Anim_011F84" Offset="0x11F84" /> <!-- Original name is "scm_teburarun" ("tebura" = "empty-handed​") -->
-        <Animation Name="object_boj_Anim_0128F4" Offset="0x128F4" /> <!-- Original name is "scm_teburawait" -->
-        <Animation Name="object_boj_Anim_012E84" Offset="0x12E84" /> <!-- Original name is "scm_yarare" ("to suffer damage") -->
-        <DList Name="gBombShopBagDL" Offset="0x13380" /> <!-- Original name is "seb_model" -->
-        <Texture Name="gBombShopBagTLUT" OutName="bomb_shop_bag_tlut" Format="rgba16" Width="16" Height="16" Offset="0x134C0" />
-        <Texture Name="gBombShopBagTex" OutName="bomb_shop_bag" Format="ci8" Width="16" Height="16" Offset="0x136C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bombf.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bombf.xml
deleted file mode 100644
index ca635875b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bombf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="object_bombf" Segment="6">
-        <!-- Bomb Flower DisplayLists -->
-        <DList Name="gBombFlowerLeavesDL" Offset="0x340"/> <!-- Original name is "bm_leaf_model" -->
-        <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/> <!-- Original name is "bm_flower_model" -->
-        <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/> <!-- Original name is "bm_leaf2_model" -->
-        
-        <!-- Bomb Flower DisplayList Textures -->
-        <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x5D8"/>
-        <Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0xDD8"/>
-        <Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x11D8"/>
-        <Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x19D8"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bombiwa.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bombiwa.xml
deleted file mode 100644
index 903d5bd40..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bombiwa.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="object_bombiwa" Segment="6">
-        <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="object_bombiwa_Tex_000020" OutName="tex_000020" Format="ci4" Width="64" Height="64" Offset="0x20" />
-        <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0" /> <!-- Original name is "obj_18b_stone_model" -->
-        <DList Name="object_bombiwa_DL_000AF0" Offset="0xAF0" />
-        <Texture Name="object_bombiwa_Tex_000C00" OutName="tex_000C00" Format="i4" Width="64" Height="64" Offset="0xC00" />
-        <DList Name="object_bombiwa_DL_001700" Offset="0x1700" /> <!-- Original name is "obj_bombstone_model" -->
-        <DList Name="object_bombiwa_DL_001800" Offset="0x1800" />
-        <DList Name="object_bombiwa_DL_001820" Offset="0x1820" />
-        <DList Name="object_bombiwa_DL_001990" Offset="0x1990" /> <!-- Original name is "g5_model" -->
-        <Texture Name="object_bombiwa_Tex_001A70" OutName="tex_001A70" Format="rgba16" Width="32" Height="32" Offset="0x1A70" />
-        <Texture Name="object_bombiwa_Tex_002270" OutName="tex_002270" Format="i4" Width="64" Height="64" Offset="0x2270" />
-        <DList Name="object_bombiwa_DL_002F60" Offset="0x2F60" /> <!-- Original name is "g2_model" -->
-        <DList Name="object_bombiwa_DL_003110" Offset="0x3110" />
-        <Texture Name="object_bombiwa_Tex_0031C0" OutName="tex_0031C0" Format="ia8" Width="16" Height="16" Offset="0x31C0" />
-        <Texture Name="object_bombiwa_Tex_0032C0" OutName="tex_0032C0" Format="rgba16" Width="32" Height="32" Offset="0x32C0" />
-        <Texture Name="object_bombiwa_Tex_003AC0" OutName="tex_003AC0" Format="i4" Width="64" Height="64" Offset="0x3AC0" />
-        <DList Name="object_bombiwa_DL_004560" Offset="0x4560" /> <!-- Original name is "g4_model" -->
-        <DList Name="object_bombiwa_DL_004688" Offset="0x4688" />
-        <Texture Name="object_bombiwa_Tex_004730" OutName="tex_004730" Format="ia8" Width="16" Height="16" Offset="0x4730" />
-        <Texture Name="object_bombiwa_Tex_004830" OutName="tex_004830" Format="rgba16" Width="32" Height="32" Offset="0x4830" />
-        <Texture Name="object_bombiwa_Tex_005030" OutName="tex_005030" Format="i4" Width="64" Height="64" Offset="0x5030" />
-        <DList Name="object_bombiwa_DL_005990" Offset="0x5990" /> <!-- Original name is "hahen_model" -->
-        <Texture Name="object_bombiwa_Tex_005A70" OutName="tex_005A70" Format="rgba16" Width="32" Height="32" Offset="0x5A70" />
-        <Texture Name="object_bombiwa_Tex_006270" OutName="tex_006270" Format="i4" Width="64" Height="64" Offset="0x6270" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss01.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss01.xml
deleted file mode 100644
index ff37d2bc9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss01.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<Root>
-    <!-- Assets for the Odolwa boss fight (Odolwa itself, its bugs and moths, its title card, etc.) -->
-    <File Name="object_boss01" Segment="6">
-        <!-- Odolwa Animations -->
-        <Animation Name="gOdolwaVerticalSlashAnim" Offset="0xC44" /> <!-- Original name is "jmp_at01" -->
-        <Animation Name="gOdolwaHorizontalSlashAnim" Offset="0x1884" /> <!-- Original name is "jmp_at02" -->
-        <Animation Name="gOdolwaAtAttentionAnim" Offset="0x1A14" /> <!-- Unused. Original name is "jmp_base" -->
-
-        <!-- Odolwa Limb DisplayLists -->
-        <DList Name="gOdolwaPelvisDL" Offset="0x5E80" />
-        <DList Name="gOdolwaHeadDL" Offset="0x5F98" />
-        <DList Name="gOdolwaCenterPlumeTipDL" Offset="0x61E8" />
-        <DList Name="gOdolwaCenterPlumeMiddleDL" Offset="0x62A8" />
-        <DList Name="gOdolwaCenterPlumeBaseDL" Offset="0x6368" />
-        <DList Name="gOdolwaLeftPlumeTipDL" Offset="0x6408" />
-        <DList Name="gOdolwaLeftPlumeMiddleDL" Offset="0x64C8" />
-        <DList Name="gOdolwaLeftPlumeBaseDL" Offset="0x6588" />
-        <DList Name="gOdolwaRightPlumeTipDL" Offset="0x6628" />
-        <DList Name="gOdolwaRightPlumeMiddleDL" Offset="0x66E8" />
-        <DList Name="gOdolwaRightPlumeBaseDL" Offset="0x67A8" />
-        <DList Name="gOdolwaLeftEarringDL" Offset="0x6848" />
-        <DList Name="gOdolwaRightEarringDL" Offset="0x68F8" />
-        <DList Name="gOdolwaSwordDL" Offset="0x69A8" />
-        <DList Name="gOdolwaRightHandDL" Offset="0x6B20" />
-        <DList Name="gOdolwaRightForearmDL" Offset="0x6CF8" />
-        <DList Name="gOdolwaRightBangleDL" Offset="0x6E50" />
-        <DList Name="gOdolwaRightUpperArmDL" Offset="0x6F40" />
-        <DList Name="gOdolwaShieldDL" Offset="0x70D0" />
-        <DList Name="gOdolwaLeftHandDL" Offset="0x71C0" />
-        <DList Name="gOdolwaLeftForearmDL" Offset="0x7398" />
-        <DList Name="gOdolwaLeftBangleDL" Offset="0x74F0" />
-        <DList Name="gOdolwaLeftUpperArmDL" Offset="0x75E0" />
-        <DList Name="gOdolwaTorsoDL" Offset="0x7770" />
-        <DList Name="gOdolwaLeftFootDL" Offset="0x7BD8" />
-        <DList Name="gOdolwaLeftShinDL" Offset="0x7E40" />
-        <DList Name="gOdolwaLeftThighDL" Offset="0x7FB0" />
-        <DList Name="gOdolwaRightFootDL" Offset="0x8128" />
-        <DList Name="gOdolwaRightShinDL" Offset="0x8390" />
-        <DList Name="gOdolwaRightThighDL" Offset="0x8500" />
-
-        <!-- Odolwa Textures -->
-        <Texture Name="gOdolwaPantsAndSwordHiltTLUT" OutName="odolwa_pants_and_sword_hilt_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8678" />
-        <Texture Name="gOdolwaFaceAndShoeTLUT" OutName="odolwa_face_and_shoe_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8698" />
-        <Texture Name="gOdolwaSkinTLUT" OutName="odolwa_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x86B8" />
-        <Texture Name="gOdolwaEarBangleAndShieldTLUT" OutName="odolwa_ear_bangle_and_shield_tlut" Format="rgba16" Width="4" Height="4" Offset="0x86D8" />
-        <Texture Name="gOdolwaClothTLUT" OutName="odolwa_cloth_tlut" Format="rgba16" Width="4" Height="4" Offset="0x86F8" />
-        <Texture Name="gOdolwaTorsoTLUT" OutName="odolwa_torso_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8718" />
-        <Texture Name="gOdolwaPantsAndSwordHiltTex" OutName="odolwa_pants_and_sword_hilt" Format="ci4" Width="64" Height="64" Offset="0x8738" />
-        <Texture Name="gOdolwaFaceAndShoeTex" OutName="odolwa_face_and_shoe" Format="ci4" Width="64" Height="64" Offset="0x8F38" />
-        <Texture Name="gOdolwaSkinTex" OutName="odolwa_skin" Format="ci4" Width="64" Height="64" Offset="0x9738" />
-        <Texture Name="gOdolwaEarBangleAndShieldTex" OutName="odolwa_ear_bangle_and_shield" Format="ci4" Width="64" Height="64" Offset="0x9F38" />
-        <Texture Name="gOdolwaEarringTex" OutName="odolwa_earring" Format="rgba16" Width="16" Height="16" Offset="0xA738" />
-        <Texture Name="gOdolwaPlumeTex" OutName="odolwa_plume" Format="rgba16" Width="16" Height="16" Offset="0xA938" />
-        <Texture Name="gOdolwaClothTex" OutName="odolwa_cloth" Format="ci4" Width="64" Height="64" Offset="0xAB38" />
-        <Texture Name="gOdolwaTorsoTex" OutName="odolwa_torso" Format="ci4" Width="64" Height="64" Offset="0xB338" />
-        <Texture Name="gOdolwaSwordBladeTex" OutName="odolwa_sword_blade" Format="rgba16" Width="16" Height="16" Offset="0xBB38" />
-
-        <!-- Assets for the trail that follows Odolwa's sword when he slashes -->
-        <Texture Name="gOdolwaSwordTrailTex" OutName="odolwa_sword_trail" Format="i8" Width="32" Height="32" Offset="0xBD38" />
-        <Texture Name="gOdolwaSwordTrailMaskTex" OutName="odolwa_sword_trail_mask" Format="i4" Width="32" Height="32" Offset="0xC138" />
-        <Array Name="gOdolwaSwordTrailVtx" Count="22" Offset="0xC338">
-            <Vtx/>
-        </Array>
-        <DList Name="gOdolwaSwordTrailDL" Offset="0xC498" />
-
-        <!-- Assets for Odolwa's glowing eyes -->
-        <DList Name="gOdolwaEyeDL" Offset="0xC5E0" />
-        <Texture Name="gOdolwaEyeTex" OutName="odolwa_eye" Format="i8" Width="16" Height="16" Offset="0xC668" />
-
-        <!-- DisplayLists for Odolwa's dynamic shadow -->
-        <DList Name="gOdolwaShadowMaterialDL" Offset="0xC7A8" />
-        <DList Name="gOdolwaShadowModelDL" Offset="0xC7C8" />
-
-        <!-- Odolwa Title Card -->
-        <Texture Name="gOdolwaTitleCardTex" OutName="odolwa_title_card" Format="ia8" Width="128" Height="40" Offset="0xC7F8" />
-
-        <!-- Assets for the moths Odolwa can summon -->
-        <DList Name="gOdolwaMothMaterialDL" Offset="0xDC58" />
-        <DList Name="gOdolwaMothModelDL" Offset="0xDCD0" />
-        <Texture Name="gOdolwaMothTex" OutName="odolwa_moth" Format="rgba16" Width="16" Height="32" Offset="0xDCE8" />
-
-        <!-- Assets for the blocks that fall from the ceiling during the Odolwa fight -->
-        <DList Name="gOdolwaFallingBlockDL" Offset="0xE3E8" /> <!-- Original name is "iwa01_model" ("rock; boulder") -->
-        <Texture Name="gOdolwaFallingBlockTLUT" OutName="odolwa_falling_block_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE558" />
-        <Texture Name="gOdolwaFallingBlockTex" OutName="odolwa_falling_block" Format="ci4" Width="64" Height="64" Offset="0xE578" />
-        
-        <!-- Odolwa Limbs -->
-        <Limb Name="gOdolwaRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_ROOT" Offset="0xED78" />
-        <Limb Name="gOdolwaPelvisLimb" Type="Standard" EnumName="ODOLWA_LIMB_PELVIS" Offset="0xED84" />
-        <Limb Name="gOdolwaRightLegRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_LEG_ROOT" Offset="0xED90" />
-        <Limb Name="gOdolwaRightThighLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_THIGH" Offset="0xED9C" />
-        <Limb Name="gOdolwaRightLowerLegRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_LOWER_LEG_ROOT" Offset="0xEDA8" />
-        <Limb Name="gOdolwaRightShinLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_SHIN" Offset="0xEDB4" />
-        <Limb Name="gOdolwaRightFootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_FOOT" Offset="0xEDC0" />
-        <Limb Name="gOdolwaLeftLegRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_LEG_ROOT" Offset="0xEDCC" />
-        <Limb Name="gOdolwaLeftThighLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_THIGH" Offset="0xEDD8" />
-        <Limb Name="gOdolwaLeftLowerLegRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_LOWER_LEG_ROOT" Offset="0xEDE4" />
-        <Limb Name="gOdolwaLeftShinLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_SHIN" Offset="0xEDF0" />
-        <Limb Name="gOdolwaLeftFootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_FOOT" Offset="0xEDFC" />
-        <Limb Name="gOdolwaUpperBodyRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_UPPER_BODY_ROOT" Offset="0xEE08" />
-        <Limb Name="gOdolwaUpperBodyWrapperLimb" Type="Standard" EnumName="ODOLWA_LIMB_UPPER_BODY_WRAPPER" Offset="0xEE14" />
-        <Limb Name="gOdolwaTorsoLimb" Type="Standard" EnumName="ODOLWA_LIMB_TORSO" Offset="0xEE20" />
-        <Limb Name="gOdolwaLeftArmRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_ARM_ROOT" Offset="0xEE2C" />
-        <Limb Name="gOdolwaLeftUpperArmLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_UPPER_ARM" Offset="0xEE38" />
-        <Limb Name="gOdolwaLeftLowerArmRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_LOWER_ARM_ROOT" Offset="0xEE44" />
-        <Limb Name="gOdolwaLeftForearmLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_FOREARM" Offset="0xEE50" />
-        <Limb Name="gOdolwaLeftBangleLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_BANGLE" Offset="0xEE5C" />
-        <Limb Name="gOdolwaLeftHandRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_HAND_ROOT" Offset="0xEE68" />
-        <Limb Name="gOdolwaLeftHandLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_HAND" Offset="0xEE74" />
-        <Limb Name="gOdolwaShieldLimb" Type="Standard" EnumName="ODOLWA_LIMB_SHIELD" Offset="0xEE80" />
-        <Limb Name="gOdolwaRightArmRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_ARM_ROOT" Offset="0xEE8C" />
-        <Limb Name="gOdolwaRightUpperArmLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_UPPER_ARM" Offset="0xEE98" />
-        <Limb Name="gOdolwaRightLowerArmRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_LOWER_ARM_ROOT" Offset="0xEEA4" />
-        <Limb Name="gOdolwaRightForearmLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_FOREARM" Offset="0xEEB0" />
-        <Limb Name="gOdolwaRightBangleLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_BANGLE" Offset="0xEEBC" />
-        <Limb Name="gOdolwaRightHandRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_HAND_ROOT" Offset="0xEEC8" />
-        <Limb Name="gOdolwaRightHandLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_HAND" Offset="0xEED4" />
-        <Limb Name="gOdolwaSwordLimb" Type="Standard" EnumName="ODOLWA_LIMB_SWORD" Offset="0xEEE0" />
-        <Limb Name="gOdolwaHeadLimb" Type="Standard" EnumName="ODOLWA_LIMB_HEAD" Offset="0xEEEC" />
-        <Limb Name="gOdolwaRightEarringRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_EARRING_ROOT" Offset="0xEEF8" />
-        <Limb Name="gOdolwaRightEarringLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_EARRING" Offset="0xEF04" />
-        <Limb Name="gOdolwaLeftEarringRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_EARRING_ROOT" Offset="0xEF10" />
-        <Limb Name="gOdolwaLeftEarringLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_EARRING" Offset="0xEF1C" />
-        <Limb Name="gOdolwaRightPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_PLUME_ROOT" Offset="0xEF28" />
-        <Limb Name="gOdolwaRightPlumeBaseLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_PLUME_BASE" Offset="0xEF34" />
-        <Limb Name="gOdolwaRightLowerPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_LOWER_PLUME_ROOT" Offset="0xEF40" />
-        <Limb Name="gOdolwaRightPlumeMiddleLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_PLUME_MIDDLE" Offset="0xEF4C" />
-        <Limb Name="gOdolwaRightPlumeTipLimb" Type="Standard" EnumName="ODOLWA_LIMB_RIGHT_PLUME_TIP" Offset="0xEF58" />
-        <Limb Name="gOdolwaLeftPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_PLUME_ROOT" Offset="0xEF64" />
-        <Limb Name="gOdolwaLeftPlumeBaseLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_PLUME_BASE" Offset="0xEF70" />
-        <Limb Name="gOdolwaLeftLowerPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_LOWER_PLUME_ROOT" Offset="0xEF7C" />
-        <Limb Name="gOdolwaLeftPlumeMiddleLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_PLUME_MIDDLE" Offset="0xEF88" />
-        <Limb Name="gOdolwaLeftPlumeTipLimb" Type="Standard" EnumName="ODOLWA_LIMB_LEFT_PLUME_TIP" Offset="0xEF94" />
-        <Limb Name="gOdolwaCenterPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_CENTER_PLUME_ROOT" Offset="0xEFA0" />
-        <Limb Name="gOdolwaCenterPlumeBaseLimb" Type="Standard" EnumName="ODOLWA_LIMB_CENTER_PLUME_BASE" Offset="0xEFAC" />
-        <Limb Name="gOdolwaCenterLowerPlumeRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_CENTER_LOWER_PLUME_ROOT" Offset="0xEFB8" />
-        <Limb Name="gOdolwaCenterPlumeMiddleLimb" Type="Standard" EnumName="ODOLWA_LIMB_CENTER_PLUME_MIDDLE" Offset="0xEFC4" />
-        <Limb Name="gOdolwaCenterPlumeTipLimb" Type="Standard" EnumName="ODOLWA_LIMB_CENTER_PLUME_TIP" Offset="0xEFD0" />
-
-        <!-- Odolwa Skeleton -->
-        <Skeleton Name="gOdolwaSkel" Type="Flex" LimbType="Standard" LimbNone="ODOLWA_LIMB_NONE" LimbMax="ODOLWA_LIMB_MAX" EnumName="OdolwaLimb" Offset="0xF0A8" />
-
-        <!-- Odolwa Animations -->
-        <Animation Name="gOdolwaClimbAnim" Offset="0xF918" /> <!-- Unused and glitchy. Original name might be "jmp_crym" -->
-        <Animation Name="gOdolwaDamagedStartAnim" Offset="0xFDEC" /> <!-- Original name is "jmp_dam02" -->
-        <Animation Name="gOdolwaShieldGuardAnim" Offset="0xFF94" /> <!-- Original name is "jmp_def" -->
-        <Animation Name="gOdolwaSwordGuardAnim" Offset="0x10150" /> <!-- Original name is "jmp_def02" -->
-        <Animation Name="gOdolwaDamagedLoopAnim" Offset="0x10980" /> <!-- Original name is "jmp_dm01" -->
-        <Animation Name="gOdolwaDeathAnim" Offset="0x124CC" /> <!-- Original name is "jmp_down" -->
-        <Animation Name="gOdolwaMothSummonDanceAnim" Offset="0x12B70" /> <!-- Named "dance_bug" in MM3D, but it was probably renamed by Grezzo, since it doesn't fit with other names. -->
-        <Animation Name="gOdolwaCrouchAnim" Offset="0x12D10" /> <!-- Original name is "jmp_jmp01" -->
-        <Animation Name="gOdolwaJumpAnim" Offset="0x12EBC" /> <!-- Original name is "jmp_jmp02" -->
-        <Animation Name="gOdolwaFallingSlashAnim" Offset="0x13480" /> <!-- Original name is "jmp_jmp03" -->
-        <Animation Name="gOdolwaKickAnim" Offset="0x1407C" /> <!-- Original name is "jmp_kick" -->
-        <Animation Name="gOdolwaStunAnim" Offset="0x14F14" /> <!-- Original name is "jmp_piyo" ("weakly moving") -->
-        <Animation Name="gOdolwaShieldBashAnim" Offset="0x15A30" /> <!-- Original name is "jmp_punch" -->
-        <Animation Name="gOdolwaRunAnim" Offset="0x16168" /> <!-- Original name is "jmp_run" -->
-        <Animation Name="gOdolwaSpinAttackAnim" Offset="0x164CC" /> <!-- Original name is "jmp_spin" -->
-        <Animation Name="gOdolwaReadyAnim" Offset="0x18438" /> <!-- Original name is "jmp_stop" -->
-        <Animation Name="gOdolwaIntroSlashAnim" Offset="0x19C10" /> <!-- Original name is "jmp_stop02" -->
-        <Animation Name="gOdolwaSpinSwordAnim" Offset="0x1AAF4" /> <!-- MM3D name is "dance_roll", but it was probably renamed. Might have originally been "jmp_stop03" from surrounding context. -->
-        <Animation Name="gOdolwaVerticalHopAnim" Offset="0x1AF18" /> <!-- MM3D name is "dance_jump", but it was probably renamed. Might have originally been "jmp_stop04" from surrounding context. -->
-        <Animation Name="gOdolwaHipShakeDanceAnim" Offset="0x1BA94" /> <!-- MM3D name is "dance_moth", but it was probably renamed. Might have originally been "jmp_stop05" from surrounding context. -->
-        <Animation Name="gOdolwaUpAndDownDanceAnim" Offset="0x1C700" /> <!-- MM3D name is "dance_fire", but it was probably renamed. Might have originally been "jmp_stop06" from surrounding context. -->
-        <Animation Name="gOdolwaArmSwingDanceAnim" Offset="0x1CE88" /> <!-- Original name is "jmp_stop07" -->
-        <Animation Name="gOdolwaThurstAttackAnim" Offset="0x1D8C8" /> <!-- Original name is "jmp_stop08" -->
-        <Animation Name="gOdolwaDoubleSlashAnim" Offset="0x1E68C" /> <!-- Original name is "jmp_stop09" -->
-        <Animation Name="gOdolwaSideToSideHopAnim" Offset="0x1EEA8" /> <!-- Original name is "jmp_stop10" -->
-        <Animation Name="gOdolwaSideToSideDanceAnim" Offset="0x1F6A4" /> <!-- Not present in MM3D, but might have been originally named "jmp_stop11" from surrounding context. -->
-        <Animation Name="gOdolwaSpinDanceAnim" Offset="0x1FC10" /> <!-- Original name is "jmp_stop12" -->
-        <Animation Name="gOdolwaJumpDanceAnim" Offset="0x204AC" /> <!-- Not present in MM3D, but might have been originally named "jmp_stop13" from surrounding context. -->
-
-        <!-- Unused vertices of unknown purpose. They seem similar to the vertices used for the bug's body. -->
-        <Array Name="gOdolwaUnusedVtx" Count="16" Offset="0x206F0">
-            <Vtx/>
-        </Array>
-
-        <!-- Odolwa Bug Limb DisplayLists -->
-        <DList Name="gOdolwaBugLightBodyDL" Offset="0x21230" />
-        <DList Name="gOdolwaBugDarkBodyDL" Offset="0x213A8" />
-        <DList Name="gOdolwaBugFrontLeftUpperLegDL" Offset="0x21518" />
-        <DList Name="gOdolwaBugFrontLeftLowerLegDL" Offset="0x21538" />
-        <DList Name="gOdolwaBugBackRightUpperLegDL" Offset="0x21570" />
-        <DList Name="gOdolwaBugBackRightLowerLegDL" Offset="0x21590" />
-        <DList Name="gOdolwaBugBackLeftUpperLegDL" Offset="0x215C0" />
-        <DList Name="gOdolwaBugBackLeftLowerLegDL" Offset="0x215E0" />
-        <DList Name="gOdolwaBugMiddleRightUpperLegDL" Offset="0x21608" />
-        <DList Name="gOdolwaBugMiddleRightLowerLegDL" Offset="0x21628" />
-        <DList Name="gOdolwaBugMiddleLeftUpperLegDL" Offset="0x21658" />
-        <DList Name="gOdolwaBugMiddleLeftLowerLegDL" Offset="0x21678" />
-        <DList Name="gOdolwaBugFrontRightUpperLegDL" Offset="0x216A8" />
-        <DList Name="gOdolwaBugFrontRightLowerLegDL" Offset="0x216C8" />
-
-        <!-- Odolwa Bug Textures -->
-        <Texture Name="gOdolwaBugUndersideTLUT" OutName="odolwa_bug_underside_tlut" Format="rgba16" Width="4" Height="4" Offset="0x21700" />
-        <Texture Name="gOdolwaBugUndersideTex" OutName="odolwa_bug_underside" Format="ci4" Width="16" Height="32" Offset="0x21720" />
-        <Texture Name="gOdolwaBugBodyTex" OutName="odolwa_bug_body" Format="rgba16" Width="32" Height="32" Offset="0x21820" />
-        <Texture Name="gOdolwaBugLegTex" OutName="odolwa_bug_leg" Format="rgba16" Width="8" Height="8" Offset="0x22020" />
-
-        <!-- Material DisplayLists for the bug's legs. The bright one is only used for the cutscene where the bugs first fall down. -->
-        <DList Name="gOdolwaBugDullLegMaterialDL" Offset="0x220A0" />
-        <DList Name="gOdolwaBugBrightLegMaterialDL" Offset="0x22118" />
-
-        <!-- Odolwa Bug Limbs -->
-        <Limb Name="gOdolwaBugRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_ROOT" Offset="0x22190" />
-        <Limb Name="gOdolwaBugBodyLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BODY" Offset="0x2219C" />
-        <Limb Name="gOdolwaBugFrontRightLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_RIGHT_LEG_ROOT" Offset="0x221A8" />
-        <Limb Name="gOdolwaBugFrontRightUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x221B4" />
-        <Limb Name="gOdolwaBugFrontRightLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x221C0" />
-        <Limb Name="gOdolwaBugMiddleLeftLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_LEFT_LEG_ROOT" Offset="0x221CC" />
-        <Limb Name="gOdolwaBugMiddleLeftUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_LEFT_UPPER_LEG" Offset="0x221D8" />
-        <Limb Name="gOdolwaBugMiddleLeftLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_LEFT_LOWER_LEG" Offset="0x221E4" />
-        <Limb Name="gOdolwaBugMiddleRightLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_RIGHT_LEG_ROOT" Offset="0x221F0" />
-        <Limb Name="gOdolwaBugMiddleRightUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_RIGHT_UPPER_LEG" Offset="0x221FC" />
-        <Limb Name="gOdolwaBugMiddleRightLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_MIDDLE_RIGHT_LOWER_LEG" Offset="0x22208" />
-        <Limb Name="gOdolwaBugBackLeftLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_LEFT_LEG_ROOT" Offset="0x22214" />
-        <Limb Name="gOdolwaBugBackLeftUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_LEFT_UPPER_LEG" Offset="0x22220" />
-        <Limb Name="gOdolwaBugBackLeftLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_LEFT_LOWER_LEG" Offset="0x2222C" />
-        <Limb Name="gOdolwaBugBackRightLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_RIGHT_LEG_ROOT" Offset="0x22238" />
-        <Limb Name="gOdolwaBugBackRightUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_RIGHT_UPPER_LEG" Offset="0x22244" />
-        <Limb Name="gOdolwaBugBackRightLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_BACK_RIGHT_LOWER_LEG" Offset="0x22250" />
-        <Limb Name="gOdolwaBugFrontLeftLegRootLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_LEFT_LEG_ROOT" Offset="0x2225C" />
-        <Limb Name="gOdolwaBugFrontLeftUpperLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x22268" />
-        <Limb Name="gOdolwaBugFrontLeftLowerLegLimb" Type="Standard" EnumName="ODOLWA_BUG_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x22274" />
-
-        <!-- Odolwa Bug Skeleton -->
-        <Skeleton Name="gOdolwaBugSkel" Type="Flex" LimbType="Standard" LimbNone="ODOLWA_BUG_LIMB_NONE" LimbMax="ODOLWA_BUG_LIMB_MAX" EnumName="OdolwaBugLimb" Offset="0x222D0" />
-
-        <!-- Odolwa Bug Animation -->
-        <Animation Name="gOdolwaBugCrawlAnim" Offset="0x22550" /> <!-- Original name is "mbug_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss02.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss02.xml
deleted file mode 100644
index 0f2fdd052..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss02.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<Root>
-    <!-- Assets for the Twinmold boss fight (Twinmold itself, the props in its arena, its title card, etc.)-->
-    <File Name="object_boss02" Segment="6">
-        <!-- DisplayLists and Textures for the dust that appears wherever Twinmold contacts the ground -->
-        <Texture Name="gTwinmoldDustMaskTex" OutName="dust_mask" Format="i4" Width="32" Height="32" Offset="0x0" />
-        <DList Name="gTwinmoldDustMaterialDL" Offset="0x230" />
-        <DList Name="gTwinmoldDustModelDL" Offset="0x2E0" />
-
-        <!-- Twinmold Textures -->
-        <Texture Name="gTwinmoldSkinTLUT" OutName="twinmold_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x300" />
-        <Texture Name="gTwinmoldSnoutTLUT" OutName="twinmold_snout_tlut" Format="rgba16" Width="4" Height="4" Offset="0x320" />
-        <Texture Name="gTwinmoldVeinsTLUT" OutName="twinmold_veins_tlut" Format="rgba16" Width="4" Height="4" Offset="0x340" />
-        <Texture Name="gTwinmoldUndersideTLUT" OutName="twinmold_underside_tlut" Format="rgba16" Width="4" Height="4" Offset="0x360" />
-        <Texture Name="gTwinmoldSpikeAndMandibleTLUT" OutName="twinmold_spike_and_mandible_tlut" Format="rgba16" Width="4" Height="4" Offset="0x380" />
-        <Texture Name="gTwinmoldRedSkinTex" OutName="twinmold_red_skin" Format="ci4" Width="64" Height="64" Offset="0x3A0" TlutOffset="0x300" />
-        <Texture Name="gTwinmoldEyeTex" OutName="twinmold_eye" Format="rgba16" Width="32" Height="32" Offset="0xBA0" />
-        <Texture Name="gTwinmoldSnoutTex" OutName="twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0x13A0" />
-        <Texture Name="gTwinmoldVeinsTex" OutName="twinmold_veins" Format="ci4" Width="64" Height="64" Offset="0x1BA0" />
-        <Texture Name="gTwinmoldTeethTex" OutName="twinmold_teeth" Format="rgba16" Width="16" Height="32" Offset="0x23A0" />
-        <Texture Name="gTwinmoldUndersideTex" OutName="twinmold_underside" Format="ci4" Width="64" Height="64" Offset="0x27A0" />
-        <Texture Name="gTwinmoldSpikeAndMandibleTex" OutName="twinmold_spike_and_mandible" Format="ci4" Width="64" Height="64" Offset="0x2FA0" />
-        <Texture Name="gTwinmoldAntennaTex" OutName="twinmold_antenna" Format="rgba16" Width="16" Height="16" Offset="0x37A0" />
-        <Texture Name="gTwinmoldTailGemTex" OutName="twinmold_tail_gem" Format="rgba16" Width="32" Height="32" Offset="0x39A0" />
-        <Texture Name="gTwinmoldBlueSkinTex" OutName="twinmold_blue_skin" Format="ci4" Width="64" Height="64" Offset="0x41A0" TlutOffset="0x300"/>
-
-        <!-- Unused, completely motionless Twinmold Head animation -->
-        <Animation Name="gTwinmoldHeadStationaryAnim" Offset="0x4A1C" />
-        
-        <!-- Twinmold Head Limb DisplayLists -->
-        <DList Name="gTwinmoldHeadDL" Offset="0x6160" />
-        <DList Name="gTwinmoldHeadLeftAntennaBackDL" Offset="0x6820" />
-        <DList Name="gTwinmoldHeadLeftAntennaFrontDL" Offset="0x68C8" />
-        <DList Name="gTwinmoldHeadRightAntennaBackDL" Offset="0x6970" />
-        <DList Name="gTwinmoldHeadRightAntennaFrontDL" Offset="0x6A18" />
-        <DList Name="gTwinmoldHeadLeftMandibleDL" Offset="0x6AC0" />
-        <DList Name="gTwinmoldHeadRightMandibleDL" Offset="0x6C68" />
-
-        <!-- DisplayLists and Textures for the destructible props in Twinmold's arena -->
-        <DList Name="gTwinmoldRuinPyramidDL" Offset="0x6FD0" />
-        <Texture Name="gTwinmoldRuinPyramidTLUT" OutName="ruin_pyramid_tlut" Format="rgba16" Width="4" Height="4" Offset="0x7158" />
-        <Texture Name="gTwinmoldRuinPyramidTex" OutName="ruin_pyramid" Format="ci4" Width="64" Height="64" Offset="0x7178" />
-        <DList Name="gRuinFragmentDL" Offset="0x7A88" />
-        <DList Name="gTwinmoldRuinPillarDL" Offset="0x7D18" />
-        <Texture Name="gTwinmoldRuinPillarTLUT" OutName="ruin_pillar_tlut" Format="rgba16" Width="4" Height="4" Offset="0x7E30" />
-        <Texture Name="gTwinmoldRuinPillarTex" OutName="ruin_pillar" Format="ci4" Width="64" Height="64" Offset="0x7E50" />
-        
-        <!-- Twinmold Title Card -->
-        <Texture Name="gTwinmoldTitleCardTex" OutName="twinmold_title_card" Format="ia8" Width="128" Height="40" Offset="0x8650" />
-
-        <!-- Twinmold Head Limbs -->
-        <Limb Name="gTwinmoldHeadRootLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_ROOT" Offset="0x9A50" />
-        <Limb Name="gTwinmoldHeadLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_HEAD" Offset="0x9A5C" />
-        <Limb Name="gTwinmoldHeadRightMandibleRootLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_RIGHT_MANDIBLE_ROOT" Offset="0x9A68" />
-        <Limb Name="gTwinmoldHeadRightMandibleLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_RIGHT_MANDIBLE" Offset="0x9A74" />
-        <Limb Name="gTwinmoldHeadLeftMandibleRootLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_MANDIBLE_ROOT" Offset="0x9A80" />
-        <Limb Name="gTwinmoldHeadLeftMandibleLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_MANDIBLE" Offset="0x9A8C" />
-        <Limb Name="gTwinmoldHeadRightAntennaRootLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_RIGHT_ANTENNA_ROOT" Offset="0x9A98" />
-        <Limb Name="gTwinmoldHeadRightAntennaBackLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_RIGHT_ANTENNA_BACK" Offset="0x9AA4" />
-        <Limb Name="gTwinmoldHeadRightAntennaFrontLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_RIGHT_ANTENNA_FRONT" Offset="0x9AB0" />
-        <Limb Name="gTwinmoldHeadLeftAntennaRootLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_ANTENNA_ROOT" Offset="0x9ABC" />
-        <Limb Name="gTwinmoldHeadLeftAntennaBackLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_ANTENNA_BACK" Offset="0x9AC8" />
-        <Limb Name="gTwinmoldHeadLeftAntennaFrontLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_ANTENNA_FRONT" Offset="0x9AD4" />
-
-        <!-- Twinmold Head Skeleton -->
-        <Skeleton Name="gTwinmoldHeadSkel" Type="Normal" LimbType="Standard" LimbNone="TWINMOLD_HEAD_LIMB_NONE" LimbMax="TWINMOLD_HEAD_LIMB_MAX" EnumName="TwinmoldHeadLimb" Offset="0x9B10" />
-
-        <!-- The only used animation for Twinmold's Head -->
-        <Animation Name="gTwinmoldHeadFlyAnim" Offset="0x9C78" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gTwinmoldUnusedTexAnim" Offset="0x9C90" />
-
-        <!-- Twinmold Body Limb DisplayLists -->
-        <DList Name="gTwinmoldBodySegment1DL" Offset="0xECF0" />
-        <DList Name="gTwinmoldBodySegment2DL" Offset="0xEF90" />
-        <DList Name="gTwinmoldBodySegment3DL" Offset="0xF310" />
-        <DList Name="gTwinmoldBodySegment4DL" Offset="0xF690" />
-        <DList Name="gTwinmoldBodySegment5DL" Offset="0xFA10" />
-        <DList Name="gTwinmoldBodySegment6DL" Offset="0xFD90" />
-        <DList Name="gTwinmoldBodySegment7DL" Offset="0x10110" />
-        <DList Name="gTwinmoldBodySegment8DL" Offset="0x10490" />
-        <DList Name="gTwinmoldBodySegment9DL" Offset="0x10810" />
-        <DList Name="gTwinmoldBodySegment10DL" Offset="0x10B90" />
-        <DList Name="gTwinmoldBodySegment11DL" Offset="0x10F10" />
-        <DList Name="gTwinmoldBodySegment12DL" Offset="0x11290" />
-        <DList Name="gTwinmoldBodySegment13DL" Offset="0x11610" />
-        <DList Name="gTwinmoldBodySegment14DL" Offset="0x11990" />
-        <DList Name="gTwinmoldBodySegment15DL" Offset="0x11D10" />
-        <DList Name="gTwinmoldBodySegment16DL" Offset="0x12090" />
-        <DList Name="gTwinmoldBodySegment17DL" Offset="0x12410" />
-        <DList Name="gTwinmoldBodySegment18DL" Offset="0x12790" />
-        <DList Name="gTwinmoldBodySegment19DL" Offset="0x12B10" />
-        <DList Name="gTwinmoldBodySegment20DL" Offset="0x12E90" />
-        <DList Name="gTwinmoldBodySegment21DL" Offset="0x13210" />
-        <DList Name="gTwinmoldBodyTailDL" Offset="0x13590" />
-
-        <!-- Twinmold Body Limbs -->
-        <Limb Name="gTwinmoldBodyRootLimb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_ROOT" Offset="0x13818" />
-        <Limb Name="gTwinmoldBodySegment1Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_1" Offset="0x13824" />
-        <Limb Name="gTwinmoldBodySegment2Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_2" Offset="0x13830" />
-        <Limb Name="gTwinmoldBodySegment3Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_3" Offset="0x1383C" />
-        <Limb Name="gTwinmoldBodySegment4Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_4" Offset="0x13848" />
-        <Limb Name="gTwinmoldBodySegment5Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_5" Offset="0x13854" />
-        <Limb Name="gTwinmoldBodySegment6Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_6" Offset="0x13860" />
-        <Limb Name="gTwinmoldBodySegment7Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_7" Offset="0x1386C" />
-        <Limb Name="gTwinmoldBodySegment8Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_8" Offset="0x13878" />
-        <Limb Name="gTwinmoldBodySegment9Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_9" Offset="0x13884" />
-        <Limb Name="gTwinmoldBodySegment10Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_10" Offset="0x13890" />
-        <Limb Name="gTwinmoldBodySegment11Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_11" Offset="0x1389C" />
-        <Limb Name="gTwinmoldBodySegment12Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_12" Offset="0x138A8" />
-        <Limb Name="gTwinmoldBodySegment13Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_13" Offset="0x138B4" />
-        <Limb Name="gTwinmoldBodySegment14Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_14" Offset="0x138C0" />
-        <Limb Name="gTwinmoldBodySegment15Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_15" Offset="0x138CC" />
-        <Limb Name="gTwinmoldBodySegment16Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_16" Offset="0x138D8" />
-        <Limb Name="gTwinmoldBodySegment17Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_17" Offset="0x138E4" />
-        <Limb Name="gTwinmoldBodySegment18Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_18" Offset="0x138F0" />
-        <Limb Name="gTwinmoldBodySegment19Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_19" Offset="0x138FC" />
-        <Limb Name="gTwinmoldBodySegment20Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_20" Offset="0x13908" />
-        <Limb Name="gTwinmoldBodySegment21Limb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_SEGMENT_21" Offset="0x13914" />
-        <Limb Name="gTwinmoldBodyTailLimb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_TAIL" Offset="0x13920" />
-
-        <!-- Unused Twinmold Body Skeleton -->
-        <Skeleton Name="gTwinmoldBodySkel" Type="Flex" LimbType="Standard" LimbNone="TWINMOLD_BODY_LIMB_NONE" LimbMax="TWINMOLD_BODY_LIMB_MAX" EnumName="TwinmoldBodyLimb" Offset="0x13988" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss03.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss03.xml
deleted file mode 100644
index 0b4ab9aa2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss03.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<Root>
-    <!-- 
-        Gyorg, his title card, the small fishes he summons, the seaweed in his boss arena,
-        and the bubbles in his intro cutscene. Also contains an unused copy of Majora's Wrath's
-        whip assets, along with an unused duplicate of the small fishes.
-    -->
-    <File Name="object_boss03" Segment="6">
-        <Animation Name="gGyorgIdleAnim" Offset="0x88" /> <!-- Unused. Original name is "bus_base" -->
-
-        <!-- Unused Majora's Wrath Whip Texture -->
-        <Texture Name="gGyorgUnusedMajorasWrathWhipTex" OutName="unused_majoras_wrath_whip" Format="rgba16" Width="8" Height="16" Offset="0xA0" />
-
-        <!-- Unused Majora's Wrath Whip DisplayLists -->
-        <DList Name="gGyorgUnusedMajorasWrathWhipDL1" Offset="0x200" />
-        <DList Name="gGyorgUnusedMajorasWrathWhipDL2" Offset="0x278" />
-        <DList Name="gGyorgUnusedMajorasWrathWhipDL3" Offset="0x2A8" />
-
-        <!--Gyorg Limb DisplayLists -->
-        <DList Name="gGyorgHeadDL" Offset="0x3398" />
-        <DList Name="gGyorgJawDL" Offset="0x3A78" />
-        <DList Name="gGyorgUpperLeftFinDL" Offset="0x3E38" />
-        <DList Name="gGyorgLowerLeftFinDL" Offset="0x3FB8" />
-        <DList Name="gGyorgUpperRightFinDL" Offset="0x42D0" />
-        <DList Name="gGyorgLowerRightFinDL" Offset="0x4450" />
-        <DList Name="gGyorgUpperTrunkDL" Offset="0x4768" />
-        <DList Name="gGyorgLowerTrunkDL" Offset="0x4AC0" />
-        <DList Name="gGyorgTailDL" Offset="0x5010" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gGyorgUnused5388TexAnim" Offset="0x5388" />
-
-        <!-- Gyorg Textures -->
-        <Texture Name="gGyorgFinsSpikesAndJawTLUT" OutName="gyorg_fins_spikes_and_jaw_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5390" />
-        <Texture Name="gGyorgSidesTLUT" OutName="gyorg_sides_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53B0" />
-        <Texture Name="gGyorgMouthAndSpikeBacksideTLUT" OutName="gyorg_mouth_and_spike_backside_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53D0" />
-        <Texture Name="gGyorgBellyAndFinFleshTLUT" OutName="gyorg_belly_and_fin_flesh_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53F0" />
-        <Texture Name="gGyorgEyeTex" OutName="gyorg_eye" Format="rgba16" Width="32" Height="32" Offset="0x5410" />
-        <Texture Name="gGyorgFinsSpikesAndJawTex" OutName="gyorg_fins_spikes_and_jaw" Format="ci4" Width="64" Height="64" Offset="0x5C10" />
-        <Texture Name="gGyorgSidesTex" OutName="gyorg_sides" Format="ci4" Width="64" Height="64" Offset="0x6410" />
-        <Texture Name="gGyorgMouthAndSpikeBacksideTex" OutName="gyorg_mouth_and_spike_backside" Format="ci4" Width="64" Height="64" Offset="0x6C10" />
-        <Texture Name="gGyorgBellyAndFinFleshTex" OutName="gyorg_belly_and_fin_flesh" Format="ci4" Width="64" Height="64" Offset="0x7410" />
-        <Texture Name="gGyorgHornsTeethAndClawsTex" OutName="gyorg_horns_teeth_claws" Format="rgba16" Width="16" Height="16" Offset="0x7C10" />
-
-        <!-- Bubble DisplayLists (texture comes from gameplay_keep) -->
-        <DList Name="gGyorgBubbleMaterialDL" Offset="0x7E50" />
-        <DList Name="gGyorgBubbleModelDL" Offset="0x7EB0" />
-
-        <!-- Gyorg Title Card -->
-        <Texture Name="gGyorgTitleCardTex" OutName="gyorg_title_card" Format="ia8" Width="128" Height="40" Offset="0x7EC8" />
-
-        <!-- Gyorg Limbs -->
-        <Limb Name="gGyorgRootLimb" Type="Standard" EnumName="GYORG_LIMB_ROOT" Offset="0x92C8" />
-        <Limb Name="gGyorgHeadLimb" Type="Standard" EnumName="GYORG_LIMB_HEAD" Offset="0x92D4" />
-        <Limb Name="gGyorgBodyRootLimb" Type="Standard" EnumName="GYORG_LIMB_BODY_ROOT" Offset="0x92E0" />
-        <Limb Name="gGyorgUpperTrunkLimb" Type="Standard" EnumName="GYORG_LIMB_UPPER_TRUNK" Offset="0x92EC" />
-        <Limb Name="gGyorgLowerTrunkLimb" Type="Standard" EnumName="GYORG_LIMB_LOWER_TRUNK" Offset="0x92F8" />
-        <Limb Name="gGyorgTailLimb" Type="Standard" EnumName="GYORG_LIMB_TAIL" Offset="0x9304" />
-        <Limb Name="gGyorgRightFinRootLimb" Type="Standard" EnumName="GYORG_LIMB_RIGHT_FIN_ROOT" Offset="0x9310" />
-        <Limb Name="gGyorgUpperRightFinLimb" Type="Standard" EnumName="GYORG_LIMB_UPPER_RIGHT_FIN" Offset="0x931C" />
-        <Limb Name="gGyorgLowerRightFinLimb" Type="Standard" EnumName="GYORG_LIMB_LOWER_RIGHT_FIN" Offset="0x9328" />
-        <Limb Name="gGyorgLeftFinRootLimb" Type="Standard" EnumName="GYORG_LIMB_LEFT_FIN_ROOT" Offset="0x9334" />
-        <Limb Name="gGyorgUpperLeftFinLimb" Type="Standard" EnumName="GYORG_LIMB_UPPER_LEFT_FIN" Offset="0x9340" />
-        <Limb Name="gGyorgLowerLeftFinLimb" Type="Standard" EnumName="GYORG_LIMB_LOWER_LEFT_FIN" Offset="0x934C" />
-        <Limb Name="gGyorgJawRootLimb" Type="Standard" EnumName="GYORG_LIMB_JAW_ROOT" Offset="0x9358" />
-        <Limb Name="gGyorgJawLimb" Type="Standard" EnumName="GYORG_LIMB_JAW" Offset="0x9364" />
-
-        <!-- Gyorg Skeleton-->
-        <Skeleton Name="gGyorgSkel" Type="Flex" LimbType="Standard" LimbNone="GYORG_LIMB_NONE" LimbMax="GYORG_LIMB_MAX" EnumName="GyorgLimb" Offset="0x93A8" />
-
-        <!-- Gyorg Animations -->
-        <Animation Name="gGyorgFloppingAnim" Offset="0x9554" /> <!-- Original name is "bus_dead" -->
-        <Animation Name="gGyorgJumpingAnim" Offset="0x98F0" /> <!-- Unused. Original name is "bus_jump" -->
-        <Animation Name="gGyorgStunnedAnim" Offset="0x99D0" /> <!-- Original name is "bus_sibire" ("paralyzed") -->
-        <Animation Name="gGyorgBackingUpAnim" Offset="0x9C14" /> <!-- Original name is "bus_stop" -->
-        <Animation Name="gGyorgFastSwimmingAnim" Offset="0x9CF8" /> <!-- Original name is "bus_swim" -->
-        <Animation Name="gGyorgGentleSwimmingAnim" Offset="0xA020" /> <!-- Unused -->
-        <Animation Name="gGyorgTailSweepAnim" Offset="0xA134" /> <!-- Unused -->
-        <Animation Name="gGyorgCrawlingAnim" Offset="0xA6C8" />
-
-        <!-- Seaweed DisplayLists -->
-        <DList Name="gGyorgSeaweedPiece1DL" Offset="0xA8B0" />
-        <DList Name="gGyorgSeaweedPiece2DL" Offset="0xA948" />
-        <DList Name="gGyorgSeaweedPiece3DL" Offset="0xA978" />
-        <DList Name="gGyorgSeaweedPiece4DL" Offset="0xA9A8" />
-        <DList Name="gGyorgSeaweedPiece5DL" Offset="0xA9D8" />
-        <DList Name="gGyorgSeaweedTopDL" Offset="0xAA08" />
-
-        <!-- Seaweed Textures -->
-        <Texture Name="gGyorgSeaweedTopTLUT" OutName="gyorg_seaweed_top_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAAC0" />
-        <Texture Name="gGyorgSeaweedTLUT" OutName="gyord_seaweed_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAAE0" />
-        <Texture Name="gGyorgSeaweedTopTex" OutName="gyorg_seaweed_top" Format="ci4" Width="64" Height="64" Offset="0xAB00" />
-        <Texture Name="gGyorgSeaweedTex" OutName="gyorg_seaweed" Format="ci4" Width="64" Height="64" Offset="0xB300" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gGyorgUnusedBB00TexAnim" Offset="0xBB00" />
-
-        <!-- Unused Duplicate of Small Fish Limb DisplayLists -->
-        <DList Name="gUnusedGyorgSmallFishHeadDL" Offset="0xBD80" />
-        <DList Name="gUnusedGyorgSmallFishTrunkDL" Offset="0xBE40" />
-        <DList Name="gUnusedGyorgSmallFishRightFinDL" Offset="0xBF20" />
-        <DList Name="gUnusedGyorgSmallFishDorsalFinDL" Offset="0xBFD8" />
-        <DList Name="gUnusedGyorgSmallFishLeftFinDL" Offset="0xC0A8" />
-        <DList Name="gUnusedGyorgSmallFishTailFinDL" Offset="0xC160" />
-
-        <!-- Unused Duplicate of Small Fish Textures -->
-        <Texture Name="gUnusedGyorgSmallFishTLUT" OutName="unused_small_fish_tlut" Format="rgba16" Width="4" Height="4" Offset="0xC230" />
-        <Texture Name="gUnusedGyorgSmallFishTex" OutName="unused_small_fish" Format="ci4" Width="64" Height="64" Offset="0xC250" />
-
-        <!-- Small Fishes Limb DisplayLists -->
-        <DList Name="gGyorgSmallFishHeadDL" Offset="0xCCC0" />
-        <DList Name="gGyorgSmallFishTrunkDL" Offset="0xCD80" />
-        <DList Name="gGyorgSmallFishRightFinDL" Offset="0xCE60" />
-        <DList Name="gGyorgSmallFishDorsalFinDL" Offset="0xCF18" />
-        <DList Name="gGyorgSmallFishLeftFinDL" Offset="0xCFE8" />
-        <DList Name="gGyorgSmallFishTailFinDL" Offset="0xD0A0" />
-
-        <!-- Small Fishes Textures -->
-        <Texture Name="gGyorgSmallFishTLUT" OutName="small_fish_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD170" />
-        <Texture Name="gGyorgSmallFishTex" OutName="small_fish" Format="ci4" Width="64" Height="64" Offset="0xD190" />
-
-        <!-- Small Fishes Limbs -->
-        <Limb Name="gGyorgSmallFishRootLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_ROOT" Offset="0xD990" />
-        <Limb Name="gGyorgSmallFishBodyRootLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_BODY_ROOT" Offset="0xD99C" />
-        <Limb Name="gGyorgSmallFishTrunkRootLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_TRUNK_ROOT" Offset="0xD9A8" />
-        <Limb Name="gGyorgSmallFishTailFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_TAIL_FIN" Offset="0xD9B4" />
-        <Limb Name="gGyorgSmallFishTrunkLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_TRUNK" Offset="0xD9C0" />
-        <Limb Name="gGyorgSmallFishLeftFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_LEFT_FIN" Offset="0xD9CC" />
-        <Limb Name="gGyorgSmallFishDorsalFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_DORSAL_FIN" Offset="0xD9D8" />
-        <Limb Name="gGyorgSmallFishRightFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_RIGHT_FIN" Offset="0xD9E4" />
-        <Limb Name="gGyorgSmallFishHeadLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_HEAD" Offset="0xD9F0" />
-
-        <!-- Small Fishes Skeleton -->
-        <Skeleton Name="gGyorgSmallFishSkel" Type="Flex" LimbType="Standard" LimbNone="GYORG_SMALL_FISH_LIMB_NONE" LimbMax="GYORG_SMALL_FISH_LIMB_MAX" EnumName="GyorgSmallFishLimb" Offset="0xDA20" />
-
-        <!-- Small Fishes Animation -->
-        <Animation Name="gGyorgSmallFishSwimAnim" Offset="0xDAAC" /> <!-- Original name is "minibus_b_swim" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss04.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss04.xml
deleted file mode 100644
index d98083a64..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss04.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<Root>
-    <!-- Assets for Wart and its Bubbles -->
-    <File Name="object_boss04" Segment="6">
-        <!-- Wart Animation -->
-        <Animation Name="gWartIdleAnim" Offset="0x4C" /> <!-- Original name might be "wart". A 20-frame animation where he doesn't move at all. -->
-
-        <!-- Wart Limb DisplayLists -->
-        <DList Name="gWartShellDL" Offset="0x19B0" />
-        <DList Name="gWartBottomEyelidDL" Offset="0x1E58" />
-        <DList Name="gWartTopEyelidDL" Offset="0x1FC8" />
-        <DList Name="gWartEyeDL" Offset="0x2138" />
-
-        <!-- Wart Textures -->
-        <Texture Name="gWartShellTLUT" OutName="wart_shell_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2328" />
-        <Texture Name="gWartRidgesTLUT" OutName="wart_ridges_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2348" />
-        <Texture Name="gWartShellTex" OutName="wart_shell" Format="ci4" Width="64" Height="64" Offset="0x2368" />
-        <Texture Name="gWartRidgesTex" OutName="wart_ridges" Format="ci4" Width="8" Height="16" Offset="0x2B68" />
-        <Texture Name="gWartEyeTex" OutName="wart_eye" Format="rgba16" Width="32" Height="32" Offset="0x2BA8" />
-
-        <!-- Unused DisplayList that can be used to make Bubbles opaque -->
-        <DList Name="gWartBubbleOpaqueMaterialDL" Offset="0x33D8" />
-
-        <!-- Wart Bubble Texture and DisplayLists-->
-        <DList Name="gWartBubbleMaterialDL" Offset="0x3450" />
-        <DList Name="gWartBubbleModelDL" Offset="0x34C8" />
-        <Texture Name="gWartBubbleTex" OutName="wart_bubble" Format="rgba16" Width="32" Height="32" Offset="0x34E0" />
-
-        <!-- Wart and Bubble Shadow Texture and DisplayLists -->
-        <Texture Name="gWartShadowTex" OutName="wart_shadow" Format="ia16" Width="32" Height="32" Offset="0x3D10" />
-        <DList Name="gWartShadowMaterialDL" Offset="0x4510" />
-        <DList Name="gWartShadowModelDL" Offset="0x4550" />
-
-        <!-- Wart Limbs -->
-        <Limb Name="gWartRootLimb" Type="Standard" EnumName="WART_LIMB_ROOT" Offset="0x4568" />
-        <Limb Name="gWartBodyLimb" Type="Standard" EnumName="WART_LIMB_BODY" Offset="0x4574" />
-        <Limb Name="gWartEyeRootLimb" Type="Standard" EnumName="WART_LIMB_EYE_ROOT" Offset="0x4580" />
-        <Limb Name="gWartEyeLimb" Type="Standard" EnumName="WART_LIMB_EYE" Offset="0x458C" />
-        <Limb Name="gWartTopEyelidRootLimb" Type="Standard" EnumName="WART_LIMB_TOP_EYELID_ROOT" Offset="0x4598" />
-        <Limb Name="gWartTopEyelidLimb" Type="Standard" EnumName="WART_LIMB_TOP_EYELID" Offset="0x45A4" />
-        <Limb Name="gWartBottomEyelidRootLimb" Type="Standard" EnumName="WART_LIMB_BOTTOM_EYELID_ROOT" Offset="0x45B0" />
-        <Limb Name="gWartBottomEyelidLimb" Type="Standard" EnumName="WART_LIMB_BOTTOM_EYELID" Offset="0x45BC" />
-
-        <!-- Wart Skeleton -->
-        <Skeleton Name="gWartSkel" Type="Flex" LimbType="Standard" LimbNone="WART_LIMB_NONE" LimbMax="WART_LIMB_MAX" EnumName="WartLimb" Offset="0x45E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss05.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss05.xml
deleted file mode 100644
index 54dcd0e95..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss05.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<Root>
-    <!-- Assets for Bio Deku Baba. The "Head" in this file refers to both the chomping head attached to the lily pad as well as -->
-    <!-- the entity with legs and eyes that spawns from the head after it is detached. The same skeleton and limbs are used for -->
-    <!-- both of these; when the head is attached to the lily pad, the Boss_05 actor is responsible for hiding most of the limbs. -->
-    <File Name="object_boss05" Segment="6">
-        <!-- Bio Deku Baba Head Animations -->
-        <Animation Name="gBioDekuBabaHeadAttackAnim" Offset="0x6A4" /> <!-- Original name is "wdb_atackH" ("H" is almost certainly short for "head") -->
-        <Animation Name="gBioDekuBabaHeadChargeAnim" Offset="0xA5C" /> <!-- Original name is "wdb_atackwalkH" -->
-
-        <!-- Bio Deku Baba Lily Pad Animation. This animation is completely stationary, and all it does is position the limbs in -->
-        <!-- a certain way. The Boss_05 actor manually rotates the limbs to move the lily pad around. -->
-        <Animation Name="gBioDekuBabaLilyPadIdleAnim" Offset="0xABC" /> <!-- Original name might be "wdb_body" -->
-
-        <!-- Bio Deku Baba Lily Pad Limb DisplayLists -->
-        <DList Name="gBioDekuBabaLilyPadRootsDL" Offset="0x11C0" />
-        <DList Name="gBioDekuBabaLilyPadLeafDL" Offset="0x1288" />
-        <DList Name="gBioDekuBabaLilyPadUpperStemDL" Offset="0x1320" />
-        <DList Name="gBioDekuBabaLilyPadMiddleStemDL" Offset="0x13D0" />
-        <DList Name="gBioDekuBabaLilyPadRightUpperArmDL" Offset="0x14A0" />
-        <DList Name="gBioDekuBabaLilyPadRightLowerArmDL" Offset="0x1538" />
-        <DList Name="gBioDekuBabaLilyPadLeftUpperArmDL" Offset="0x15F0" />
-        <DList Name="gBioDekuBabaLilyPadLeftLowerArmDL" Offset="0x1688" />
-        <DList Name="gBioDekuBabaLilyPadLowerStemDL" Offset="0x1740" />
-
-        <!-- Bio Deku Baba Lily Pad Textures -->
-        <Texture Name="gBioDekuBabaLilyPadStemTex" OutName="bio_deku_baba_lily_pad_stem" Format="rgba16" Width="8" Height="8" Offset="0x17D0" />
-        <Texture Name="gBioDekuBabaLilyPadLeafTex" OutName="bio_deku_baba_lily_pad_leaf" Format="rgba16" Width="32" Height="32" Offset="0x1850" />
-        <Texture Name="gBioDekuBabaLilyPadRootsTex" OutName="bio_deku_baba_lily_pad_roots" Format="rgba16" Width="16" Height="32" Offset="0x2050" />
-
-        <!-- Bio Deku Baba Lily Pad Limbs -->
-        <Limb Name="gBioDekuBabaLilyPadRootsLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_ROOTS" Offset="0x2450" />
-        <Limb Name="gBioDekuBabaLilyPadUpperStemLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_UPPER_STEM" Offset="0x245C" />
-        <Limb Name="gBioDekuBabaLilyPadMiddleStemLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_MIDDLE_STEM" Offset="0x2468" />
-        <Limb Name="gBioDekuBabaLilyPadLowerStemLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_LOWER_STEM" Offset="0x2474" />
-        <Limb Name="gBioDekuBabaLilyPadLeftUpperArmLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_LEFT_UPPER_ARM" Offset="0x2480" />
-        <Limb Name="gBioDekuBabaLilyPadLeftLowerArmLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_LEFT_LOWER_ARM" Offset="0x248C" />
-        <Limb Name="gBioDekuBabaLilyPadRightUpperArmLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_RIGHT_UPPER_ARM" Offset="0x2498" />
-        <Limb Name="gBioDekuBabaLilyPadRightLowerArmLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_RIGHT_LOWER_ARM" Offset="0x24A4" />
-        <Limb Name="gBioDekuBabaLilyPadLeafLimb" Type="Standard" EnumName="BIO_DEKU_BABA_LILY_PAD_LIMB_LEAF" Offset="0x24B0" />
-
-        <!-- Bio Deku Baba Lily Pad Skeleton -->
-        <Skeleton Name="gBioDekuBabaLilyPadSkel" Type="Flex" LimbType="Standard" LimbNone="BIO_DEKU_BABA_LILY_PAD_LIMB_NONE" LimbMax="BIO_DEKU_BABA_LILY_PAD_LIMB_MAX" EnumName="BioDekuBabaLilyPadLimb" Offset="0x24E0" />
-
-        <!-- Bio Deku Baba Head Animations -->
-        <Animation Name="gBioDekuBabaHeadDamagedAnim" Offset="0x2F0C" /> <!-- Original name is "wdb_damageH" -->
-        <Animation Name="gBioDekuBabaHeadSpotAnim" Offset="0x3448" /> <!-- Original name is "wdb_hakkenH" ("detection") -->
-        <Animation Name="gBioDekuBabaHeadRapidChompAnim" Offset="0x3500" /> <!-- Unused and one frame long. Original name is "wdb_head" -->
-
-        <!-- Bio Deku Baba Head Limb DisplayLists -->
-        <DList Name="gBioDekuBabaHeadBodyDL" Offset="0x4620" />
-        <DList Name="gBioDekuBabaHeadLeavesDL" Offset="0x46C8" />
-        <DList Name="gBioDekuBabaHeadRightUpperLegDL" Offset="0x4788" />
-        <DList Name="gBioDekuBabaHeadRightLowerLegDL" Offset="0x4830" />
-        <DList Name="gBioDekuBabaHeadRightFootDL" Offset="0x48F0" />
-        <DList Name="gBioDekuBabaHeadRightLowerEyestalkDL" Offset="0x49C0" />
-        <DList Name="gBioDekuBabaHeadRightUpperEyestalkDL" Offset="0x4A58" />
-        <DList Name="gBioDekuBabaHeadRightEyeDL" Offset="0x4B10" />
-        <DList Name="gBioDekuBabaHeadLeftLowerEyestalkDL" Offset="0x4C58" />
-        <DList Name="gBioDekuBabaHeadLeftUpperEyestalkDL" Offset="0x4CF0" />
-        <DList Name="gBioDekuBabaHeadLeftEyeDL" Offset="0x4DA8" />
-        <DList Name="gBioDekuBabaHeadLeftUpperLegDL" Offset="0x4EF8" />
-        <DList Name="gBioDekuBabaHeadLeftLowerLegDL" Offset="0x4FA0" />
-        <DList Name="gBioDekuBabaHeadLeftFootDL" Offset="0x5060" />
-        <DList Name="gBioDekuBabaHeadBackUpperLegDL" Offset="0x5130" />
-        <DList Name="gBioDekuBabaHeadBackLowerLegDL" Offset="0x51D8" />
-        <DList Name="gBioDekuBabaHeadBackFootDL" Offset="0x5298" />
-        <DList Name="gBioDekuBabaHeadUpperJawDL" Offset="0x5348" />
-        <DList Name="gBioDekuBabaHeadLowerJawDL" Offset="0x5460" />
-
-        <!-- Bio Deku Baba Head Textures -->
-        <Texture Name="gBioDekuBabaHeadLeavesTex" OutName="bio_deku_baba_head_leaves" Format="rgba16" Width="16" Height="16" Offset="0x5598" />
-        <Texture Name="gBioDekuBabaHeadJawOuterTex" OutName="bio_deku_baba_head_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x5798" />
-        <Texture Name="gBioDekuBabaHeadLegAndEyestalkTex" OutName="bio_deku_baba_head_leg_and_eyestalk" Format="rgba16" Width="8" Height="8" Offset="0x5B98" />
-        <Texture Name="gBioDekuBabaHeadJawInnerTex" OutName="bio_deku_baba_head_jaw_inner" Format="rgba16" Width="16" Height="16" Offset="0x5C18" />
-        <Texture Name="gBioDekuBabaHeadEyeTex" OutName="bio_deku_baba_head_eye" Format="rgba32" Width="16" Height="16" Offset="0x5E18" />
-
-        <!-- Texture Animation that cycles between white and gray to give the Bio Deku Baba's eyes a flashing effect -->
-        <TextureAnimation Name="gBioDekuBabaHeadEyeFlashTexAnim" Offset="0x6240" />
-
-        <!-- Bio Deku Baba Head Limbs -->
-        <Limb Name="gBioDekuBabaHeadBodyLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_BODY" Offset="0x6248" />
-        <Limb Name="gBioDekuBabaHeadLowerJawLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LOWER_JAW" Offset="0x6254" />
-        <Limb Name="gBioDekuBabaHeadUpperJawLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_UPPER_JAW" Offset="0x6260" />
-        <Limb Name="gBioDekuBabaHeadBackUpperLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_BACK_UPPER_LEG" Offset="0x626C" />
-        <Limb Name="gBioDekuBabaHeadBackLowerLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_BACK_LOWER_LEG" Offset="0x6278" />
-        <Limb Name="gBioDekuBabaHeadBackFootLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_BACK_FOOT" Offset="0x6284" />
-        <Limb Name="gBioDekuBabaHeadLeftUpperLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_UPPER_LEG" Offset="0x6290" />
-        <Limb Name="gBioDekuBabaHeadLeftLowerLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_LOWER_LEG" Offset="0x629C" />
-        <Limb Name="gBioDekuBabaHeadLeftFootLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_FOOT" Offset="0x62A8" />
-        <Limb Name="gBioDekuBabaHeadLeftLowerEyestalkLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_LOWER_EYESTALK" Offset="0x62B4" />
-        <Limb Name="gBioDekuBabaHeadLeftUpperEyestalkLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_UPPER_EYESTALK" Offset="0x62C0" />
-        <Limb Name="gBioDekuBabaHeadLeftEyeLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEFT_EYE" Offset="0x62CC" />
-        <Limb Name="gBioDekuBabaHeadRightLowerEyestalkLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_LOWER_EYESTALK" Offset="0x62D8" />
-        <Limb Name="gBioDekuBabaHeadRightUpperEyestalkLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_UPPER_EYESTALK" Offset="0x62E4" />
-        <Limb Name="gBioDekuBabaHeadRightEyeLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_EYE" Offset="0x62F0" />
-        <Limb Name="gBioDekuBabaHeadRightUpperLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_UPPER_LEG" Offset="0x62FC" />
-        <Limb Name="gBioDekuBabaHeadRightLowerLegLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_LOWER_LEG" Offset="0x6308" />
-        <Limb Name="gBioDekuBabaHeadRightFootLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_RIGHT_FOOT" Offset="0x6314" />
-        <Limb Name="gBioDekuBabaHeadLeavesLimb" Type="Standard" EnumName="BIO_DEKU_BABA_HEAD_LIMB_LEAVES" Offset="0x6320" />
-
-        <!-- Bio Deku Baba Head Skeleton -->
-        <Skeleton Name="gBioDekuBabaHeadSkel" Type="Flex" LimbType="Standard" LimbNone="BIO_DEKU_BABA_HEAD_LIMB_NONE" LimbMax="BIO_DEKU_BABA_HEAD_LIMB_MAX" EnumName="BioDekuBabaHeadLimb" Offset="0x6378" />
-
-        <!-- Bio Deku Baba Head Animations -->
-        <Animation Name="gBioDekuBabaHeadChompAnim" Offset="0x6484" /> <!-- Original name is "wdb_pakupaku" ("repeatedly opening and closing (one's mouth)") -->
-        <Animation Name="gBioDekuBabaHeadTransformAnim" Offset="0x6E50" /> <!-- Original name is "wdb_startH" -->
-        <Animation Name="gBioDekuBabaHeadIdleAnim" Offset="0x7488" /> <!-- Original name is "wdb_waitH" -->
-        <Animation Name="gBioDekuBabaHeadWalkAnim" Offset="0x7908" /> <!-- Original name is "wdb_walkH" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss07.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss07.xml
deleted file mode 100644
index 2d3aa4fa1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss07.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<Root>
-    <!-- Assets for the Majora fight -->
-    <File Name="object_boss07" Segment="6">
-        <!-- Majora's Incarnation Animations -->
-        <Animation Name="gMajorasIncarnationPirouetteAnim" Offset="0x194" /> <!-- Original name is "last2_bd" (probably short for "ballet dance") -->
-        <Animation Name="gMajorasIncarnationEnergyBallAttackAnim" Offset="0x428" /> <!-- Original name is "last2_beam02" -->
-        <Animation Name="gMajorasIncarnationDamageAnim" Offset="0xD0C" /> <!-- Original name is "last2_dam" -->
-        <Animation Name="gMajorasIncarnationIntroDanceAnim" Offset="0x2C40" /> <!-- Original name is "last2_hensin" ("metamorphosis/transformation") -->
-        <Animation Name="gMajorasIncarnationJerkingAnim" Offset="0x2D84" /> <!-- Original name is "last2_hensin2" -->
-        <Animation Name="gMajorasIncarnationPumpingUpAnim" Offset="0x31E4" /> <!-- Original name is "last2_hensin3" -->
-        <Animation Name="gMajorasIncarnationFinalHitAnim" Offset="0x3854" /> <!-- Original name is "last2_hensin4" -->
-        <Animation Name="gMajorasIncarnationSquattingDanceAnim" Offset="0x3A64" /> <!-- Original name is "last2_kd" (probably short for "kosakku (Cossack) dance") -->
-        <Animation Name="gMajorasIncarnationStationaryAnim" Offset="0x3B3C" /> <!-- Unused. Original name is "last2_kihon" ("basic") -->
-
-        <!-- Majora's Incarnation Limb DisplayLists -->
-        <DList Name="gMajorasIncarnationEyestalkDL" Offset="0x7930" />
-        <DList Name="gMajorasIncarnationLeftFootDL" Offset="0x7B58" />
-        <DList Name="gMajorasIncarnationLeftShinDL" Offset="0x7CC0" />
-        <DList Name="gMajorasIncarnationLeftThighDL" Offset="0x7F48" />
-        <DList Name="gMajorasIncarnationLeftHandDL" Offset="0x80E0" />
-        <DList Name="gMajorasIncarnationLeftForearmDL" Offset="0x82D8" />
-        <DList Name="gMajorasIncarnationLeftUpperArmDL" Offset="0x8580" />
-        <DList Name="gMajorasIncarnationRightHandDL" Offset="0x87B8" />
-        <DList Name="gMajorasIncarnationRightForearmDL" Offset="0x89B0" />
-        <DList Name="gMajorasIncarnationRightUpperArmDL" Offset="0x8C58" />
-        <DList Name="gMajorasIncarnationRightFootDL" Offset="0x8E90" />
-        <DList Name="gMajorasIncarnationRightShinDL" Offset="0x8FF8" />
-        <DList Name="gMajorasIncarnationRightThighDL" Offset="0x9280" />
-        <DList Name="gMajorasIncarnationMaskDL" Offset="0x9418" />
-
-        <!-- Majora's Incarnation Limbs -->
-        <Limb Name="gMajorasIncarnationRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_ROOT" Offset="0x9820" />
-        <Limb Name="gMajorasIncarnationWrapperLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_WRAPPER" Offset="0x982C" />
-        <Limb Name="gMajorasIncarnationMaskLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_MASK" Offset="0x9838" />
-        <Limb Name="gMajorasIncarnationRightLegRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_LEG_ROOT" Offset="0x9844" />
-        <Limb Name="gMajorasIncarnationRightThighLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_THIGH" Offset="0x9850" />
-        <Limb Name="gMajorasIncarnationRightLowerLegRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_LOWER_LEG_ROOT" Offset="0x985C" />
-        <Limb Name="gMajorasIncarnationRightShinLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_SHIN" Offset="0x9868" />
-        <Limb Name="gMajorasIncarnationRightFootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_FOOT" Offset="0x9874" />
-        <Limb Name="gMajorasIncarnationRightArmRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_ARM_ROOT" Offset="0x9880" />
-        <Limb Name="gMajorasIncarnationRightUpperArmLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_UPPER_ARM" Offset="0x988C" />
-        <Limb Name="gMajorasIncarnationRightLowerArmRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_LOWER_ARM_ROOT" Offset="0x9898" />
-        <Limb Name="gMajorasIncarnationRightForearmLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_FOREARM" Offset="0x98A4" />
-        <Limb Name="gMajorasIncarnationRightHandLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_RIGHT_HAND" Offset="0x98B0" />
-        <Limb Name="gMajorasIncarnationLeftArmRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_ARM_ROOT" Offset="0x98BC" />
-        <Limb Name="gMajorasIncarnationLeftUpperArmLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_UPPER_ARM" Offset="0x98C8" />
-        <Limb Name="gMajorasIncarnationLeftLowerArmRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_LOWER_ARM_ROOT" Offset="0x98D4" />
-        <Limb Name="gMajorasIncarnationLeftForearmLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_FOREARM" Offset="0x98E0" />
-        <Limb Name="gMajorasIncarnationLeftHandLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_HAND" Offset="0x98EC" />
-        <Limb Name="gMajorasIncarnationLeftLegRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_LEG_ROOT" Offset="0x98F8" />
-        <Limb Name="gMajorasIncarnationLeftThighLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_THIGH" Offset="0x9904" />
-        <Limb Name="gMajorasIncarnationLeftLowerLegRootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_LOWER_LEG_ROOT" Offset="0x9910" />
-        <Limb Name="gMajorasIncarnationLeftShinLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_SHIN" Offset="0x991C" />
-        <Limb Name="gMajorasIncarnationLeftFootLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_LEFT_FOOT" Offset="0x9928" />
-        <Limb Name="gMajorasIncarnationEyestalkLimb" Type="Standard" EnumName="MAJORAS_INCARNATION_LIMB_EYESTALK" Offset="0x9934" />
-
-        <!-- Majora's Incarnation Skeleton -->
-        <Skeleton Name="gMajorasIncarnationSkel" Type="Flex" LimbType="Standard" LimbNone="MAJORAS_INCARNATION_LIMB_NONE" LimbMax="MAJORAS_INCARNATION_LIMB_MAX" EnumName="MajorasIncarnationLimb" Offset="0x99A0" />
-
-        <!-- Majora's Incarnation Animations -->
-        <Animation Name="gMajorasIncarnationFallOverStartAnim" Offset="0x9C7C" /> <!-- Original name is "last2_koke" ("stupidity; a fool") -->
-        <Animation Name="gMajorasIncarnationFallOverLoopAnim" Offset="0x9EA8" /> <!-- Original name is "last2_koke2" -->
-        <Animation Name="gMajorasIncarnationMoonwalkAnim" Offset="0xA194" /> <!-- Original name is "last2_mw" (almost certainly short for "moonwalk") -->
-        <Animation Name="gMajorasIncarnationRunAnim" Offset="0xA400" /> <!-- Original name is "last2_run" -->
-        <Animation Name="gMajorasIncarnationTauntDance1Anim" Offset="0xA6AC" /> <!-- Original name is "last2_stop01" -->
-        <Animation Name="gMajorasIncarnationTauntDance2Anim" Offset="0xAB04" /> <!-- Original name is "last2_stop02" -->
-        <Animation Name="gMajorasIncarnationTauntJumpAnim" Offset="0xAD84" /> <!-- Original name is "last2_stop03" -->
-
-        <!-- Majora's Mask Animations -->
-        <Animation Name="gMajorasMaskJerkingAnim" Offset="0xAE40" /> <!-- Original name is "last3_dam" -->
-        <Animation Name="gMajorasMaskStationaryAnim" Offset="0xAEDC" /> <!-- Unused. Original name is "last3_kihon" ("basic") -->
-
-        <!-- Majora's Mask Tentacle Texture and DisplayLists -->
-        <Texture Name="gMajorasMaskTentacleTex" OutName="majoras_mask_tentacle" Format="rgba16" Width="8" Height="8" Offset="0xAEF0" />
-        <DList Name="gMajorasMaskTentacleMaterialDL" Offset="0xAFB0" />
-        <DList Name="gMajorasMaskTentacleModelDL" Offset="0xB020" />
-
-        <!-- Majora's Mask Limb DisplayLists -->
-        <DList Name="gMajorasMaskLeftSpike3DL" Offset="0xBB30" />
-        <DList Name="gMajorasMaskLeftSpike4DL" Offset="0xBBC0" />
-        <DList Name="gMajorasMaskRightSpike4DL" Offset="0xBC50" />
-        <DList Name="gMajorasMaskRightSpike3DL" Offset="0xBCE0" />
-        <DList Name="gMajorasMaskRightSpike2DL" Offset="0xBD70" />
-        <DList Name="gMajorasMaskRightSpike1DL" Offset="0xBE00" />
-        <DList Name="gMajorasMaskLeftSpike1DL" Offset="0xBE90" />
-        <DList Name="gMajorasMaskLeftSpike2DL" Offset="0xBF20" />
-        <DList Name="gMajorasMaskFaceDL" Offset="0xBFB0" />
-
-        <!-- Majora's Mask Beam Texture and DisplayList -->
-        <Texture Name="gMajorasMaskBeamTex" OutName="majoras_mask_beam" Format="i4" Width="32" Height="64" Offset="0xC298" />
-        <DList Name="gMajorasMaskBeamDL" Offset="0xC7D8" />
-
-        <!-- Majora's Mask Fire Textures and DisplayList -->
-        <Texture Name="gMajorasMaskFireTex" OutName="majoras_mask_fire" Format="i4" Width="32" Height="64" Offset="0xC8B8" />
-        <Texture Name="gMajorasMaskFireMaskTex" OutName="majoras_mask_fire_mask" Format="i4" Width="32" Height="32" Offset="0xCCB8" />
-        <DList Name="gMajorasMaskFireDL" Offset="0xCEE8" />
-
-        <!-- Boss Mask Textures -->
-        <Texture Name="gBossMaskOdolwaFaceTLUT" OutName="boss_mask_odolwa_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0xCFB0" />
-        <Texture Name="gBossMaskOdolwaEarTLUT" OutName="boss_mask_odolwa_ear_tlut" Format="rgba16" Width="4" Height="4" Offset="0xCFD0" />
-        <Texture Name="gBossMaskOdolwaPlumeTex" OutName="boss_mask_odolwa_plume" Format="rgba16" Width="16" Height="16" Offset="0xCFF0" />
-        <Texture Name="gBossMaskOdolwaFaceTex" OutName="boss_mask_odolwa_face" Format="ci4" Width="64" Height="64" Offset="0xD1F0" />
-        <Texture Name="gBossMaskOdolwaEarTex" OutName="boss_mask_odolwa_ear" Format="ci4" Width="64" Height="64" Offset="0xD9F0" />
-        <Texture Name="gBossMaskGyorgSkinTLUT" OutName="boss_mask_gyorg_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE1F0" />
-        <Texture Name="gBossMaskGyorgMouthTLUT" OutName="boss_mask_gyorg_mouth_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE210" />
-        <Texture Name="gBossMaskGyorgToothHornTLUT" OutName="boss_mask_gyorg_tooth_horn_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE230" />
-        <Texture Name="gBossMaskGyorgTwinmoldEyeTex" OutName="boss_mask_gyorg_twinmold_eye" Format="rgba16" Width="32" Height="32" Offset="0xE250" />
-        <Texture Name="gBossMaskGyorgSkinTex" OutName="boss_mask_gyorg_skin" Format="ci4" Width="64" Height="64" Offset="0xEA50" />
-        <Texture Name="gBossMaskGyorgMouthTex" OutName="boss_mask_gyorg_mouth" Format="ci4" Width="64" Height="64" Offset="0xF250" />
-        <Texture Name="gBossMaskGyorgToothHornTex" OutName="boss_mask_gyorg_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0xFA50" />
-        <Texture Name="gBossMaskGohtEyeTex" OutName="boss_mask_goht_eye" Format="rgba16" Width="32" Height="64" Offset="0xFAD0" />
-        <Texture Name="gBossMaskGohtTopPatternTex" OutName="boss_mask_goht_top_pattern" Format="rgba16" Width="32" Height="64" Offset="0x10AD0" />
-        <Texture Name="gBossMaskGohtTwinmoldPatternTex" OutName="boss_mask_goht_twinmold_pattern" Format="rgba16" Width="32" Height="64" Offset="0x11AD0" /> <!-- Used for the lower part of Goht's mask and for the mouth of Twinmold's mask -->
-        <Texture Name="gBossMaskGohtSpikeTwinmoldMandibleTex" OutName="boss_mask_goht_spike_twinmold_mandible" Format="rgba16" Width="32" Height="32" Offset="0x12AD0" />
-        <Texture Name="gBossMaskTwinmoldSkinTLUT" OutName="boss_mask_twinmold_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x132D0" />
-        <Texture Name="gBossMaskTwinmoldSnoutTLUT" OutName="boss_mask_twinmold_snout_tlut" Format="rgba16" Width="4" Height="4" Offset="0x132F0" />
-        <Texture Name="gBossMaskTwinmoldSkinTex" OutName="boss_mask_twinmold_skin" Format="ci4" Width="64" Height="64" Offset="0x13310" />
-        <Texture Name="gBossMaskTwinmoldSnoutTex" OutName="boss_mask_twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0x13B10" />
-
-        <!-- Boss Mask DisplayLists -->
-        <DList Name="gBossMaskOdolwaDL" Offset="0x149A0" />
-        <DList Name="gBossMaskGyorgDL" Offset="0x16090" />
-        <DList Name="gBossMaskGohtDL" Offset="0x17DE0" />
-        <DList Name="gBossMaskTwinmoldDL" Offset="0x19328" />
-
-        <!-- Majora's Mask Limbs. Spikes are numbered from top to bottom. -->
-        <Limb Name="gMajorasMaskRootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_ROOT" Offset="0x19B38" />
-        <Limb Name="gMajorasMaskFaceLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_FACE" Offset="0x19B44" />
-        <Limb Name="gMajorasMaskLeftSpike2RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE2_ROOT" Offset="0x19B50" />
-        <Limb Name="gMajorasMaskLeftSpike2Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE2" Offset="0x19B5C" />
-        <Limb Name="gMajorasMaskLeftSpike1RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE1_ROOT" Offset="0x19B68" />
-        <Limb Name="gMajorasMaskLeftSpike1Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE1" Offset="0x19B74" />
-        <Limb Name="gMajorasMaskRightSpike1RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE1_ROOT" Offset="0x19B80" />
-        <Limb Name="gMajorasMaskRightSpike1Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE1" Offset="0x19B8C" />
-        <Limb Name="gMajorasMaskRightSpike2RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE2_ROOT" Offset="0x19B98" />
-        <Limb Name="gMajorasMaskRightSpike2Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE2" Offset="0x19BA4" />
-        <Limb Name="gMajorasMaskRightSpike3RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE3_ROOT" Offset="0x19BB0" />
-        <Limb Name="gMajorasMaskRightSpike3Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE3" Offset="0x19BBC" />
-        <Limb Name="gMajorasMaskRightSpike4RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE4_ROOT" Offset="0x19BC8" />
-        <Limb Name="gMajorasMaskRightSpike4Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_RIGHT_SPIKE4" Offset="0x19BD4" />
-        <Limb Name="gMajorasMaskLeftSpike4RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE4_ROOT" Offset="0x19BE0" />
-        <Limb Name="gMajorasMaskLeftSpike4Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE4" Offset="0x19BEC" />
-        <Limb Name="gMajorasMaskLeftSpike3RootLimb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE3_ROOT" Offset="0x19BF8" />
-        <Limb Name="gMajorasMaskLeftSpike3Limb" Type="Standard" EnumName="MAJORAS_MASK_LIMB_LEFT_SPIKE3" Offset="0x19C04" />
-
-        <!-- Majora's Mask Skeleton -->
-        <Skeleton Name="gMajorasMaskSkel" Type="Normal" LimbType="Standard" LimbNone="MAJORAS_MASK_LIMB_NONE" LimbMax="MAJORAS_MASK_LIMB_MAX" EnumName="MajorasMaskLimb" Offset="0x19C58" />
-
-        <!-- Majora's Mask Animation -->
-        <Animation Name="gMajorasMaskFloatingAnim" Offset="0x19E48" /> <!-- Original name is "last3_stop" -->
-
-        <!-- Majora's Wrath Animations. For unused animations, we don't know what the whips are supposed to do, since their physics are controlled by the Boss07 actor.  -->
-        <Animation Name="gMajorasWrathFlipLeftAndSpinAnim" Offset="0x1AE1C" /> <!-- Unused. Original name is "last_ac01" -->
-        <Animation Name="gMajorasWrathDoubleKickAndJumpBackAnim" Offset="0x1C430" /> <!-- Unused. Original name is "last_ac02" -->
-        <Animation Name="gMajorasWrathBackflipUppercutAttackAnim" Offset="0x1CFF0" /> <!-- Unused. Original name is "last_ac03" -->
-        <Animation Name="gMajorasWrathHighKickAnim" Offset="0x1D974" /> <!-- Unused and almost identical to gMajorasWrathKickAnim. Original name is "last_ac04" -->
-        <Animation Name="gMajorasWrathDamageAnim" Offset="0x1DEB4" /> <!-- Original name is "last_dam" -->
-        <Animation Name="gMajorasWrathDeathAnim" Offset="0x22BB4" /> <!-- Original name is "last_dead" -->
-        <Animation Name="gMajorasWrathTiptoeWhipAttackAnim" Offset="0x23A44" /> <!-- Unused. Original name is "last_def" -->
-        <Animation Name="gMajorasWrathHeavyBreathingAnim" Offset="0x23DAC" /> <!-- Original name is "last_hen" (short for "metamorphosis/transformation") -->
-        <Animation Name="gMajorasWrathIntroAnim" Offset="0x25018" /> <!-- Original name is "last_hen2" -->
-        <Animation Name="gMajorasWrathBackflipAnim" Offset="0x25878" /> <!-- Original name is "last_jump" -->
-        <Animation Name="gMajorasWrathKickAnim" Offset="0x26204" /> <!-- Original name is "last_kick" -->
-        <Animation Name="gMajorasWrathReleaseTopAnim" Offset="0x269EC" /> <!-- Original name is "last_koma" ("spinning top") -->
-        <Animation Name="gMajorasWrathGrabAnim" Offset="0x26EA0" /> <!-- Original name is "last_link" -->
-        <Animation Name="gMajorasWrathThrowAnim" Offset="0x27270" /> <!-- Original name is "last_link2" -->
-
-        <!-- Majora's Wrath Limb DisplayLists -->
-        <DList Name="gMajorasWrathPelvisDL" Offset="0x2C350" />
-        <DList Name="gMajorasWrathHeadDL" Offset="0x2C4D0" />
-        <DList Name="gMajorasWrathThirdEyeDL" Offset="0x2CB48" />
-        <DList Name="gMajorasWrathTorsoDL" Offset="0x2CD40" />
-        <DList Name="gMajorasWrathLeftHandDL" Offset="0x2D1D0" />
-        <DList Name="gMajorasWrathLeftForearmDL" Offset="0x2D3C8" />
-        <DList Name="gMajorasWrathLeftUpperArmDL" Offset="0x2D670" />
-        <DList Name="gMajorasWrathRightHandDL" Offset="0x2D940" />
-        <DList Name="gMajorasWrathRightForearmDL" Offset="0x2DB38" />
-        <DList Name="gMajorasWrathRightUpperArmDL" Offset="0x2DDE0" />
-        <DList Name="gMajorasWrathRightFootDL" Offset="0x2E0B8" />
-        <DList Name="gMajorasWrathRightShinDL" Offset="0x2E220" />
-        <DList Name="gMajorasWrathRightThighDL" Offset="0x2E4A8" />
-        <DList Name="gMajorasWrathLeftFootDL" Offset="0x2E6D0" />
-        <DList Name="gMajorasWrathLeftShinDL" Offset="0x2E838" />
-        <DList Name="gMajorasWrathLeftThighDL" Offset="0x2EAC0" />
-
-        <!-- Majora's Wrath Whip Texture and DisplayLists -->
-        <Texture Name="gMajorasWrathWhipTex" OutName="majoras_wrath_whip" Format="rgba16" Width="8" Height="16" Offset="0x2ECF0" />
-        <DList Name="gMajorasWrathWhipMaterialDL" Offset="0x2EE50" />
-        <DList Name="gMajorasMaskWhipShadowMaterialDL" Offset="0x2EEC8" />
-        <DList Name="gMajorasWrathWhipModelDL" Offset="0x2EEF8" />
-
-        <!-- Majora's Wrath Shadow DisplayLists -->
-        <DList Name="gMajorasWrathShadowMaterialDL" Offset="0x2EF68" />
-        <DList Name="gMajorasWrathShadowModelDL" Offset="0x2EF88" />
-
-        <!-- DisplayList for the rays of light that emanate from Wrath's body when defeated -->
-        <DList Name="gMajorasWrathDeathLightModelDL" Offset="0x2EFE8" />
-
-        <!-- Majora's Wrath Top DisplayList-->
-        <DList Name="gMajorasWrathSpinningTopDL" Offset="0x2F640" />
-
-        <!-- Majora Title Cards -->
-        <Texture Name="gMajorasMaskTitleCardTex" OutName="majoras_mask_title_card" Format="ia8" Width="128" Height="40" Offset="0x2F840" />
-        <Texture Name="gMajorasIncarnationTitleCardTex" OutName="majoras_incarnation_title_card" Format="ia8" Width="128" Height="40" Offset="0x30C40" />
-        <Texture Name="gMajorasWrathTitleCardTex" OutName="majoras_wrath_title_card" Format="ia8" Width="128" Height="40" Offset="0x32040" />
-
-        <!-- Majora's Wrath Limbs -->
-        <Limb Name="gMajorasWrathRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_ROOT" Offset="0x33440" />
-        <Limb Name="gMajorasWrathPelvisLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_PELVIS" Offset="0x3344C" />
-        <Limb Name="gMajorasWrathLeftLegRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_LEG_ROOT" Offset="0x33458" />
-        <Limb Name="gMajorasWrathLeftThighLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_THIGH" Offset="0x33464" />
-        <Limb Name="gMajorasWrathLeftLowerLegRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_LOWER_LEG_ROOT" Offset="0x33470" />
-        <Limb Name="gMajorasWrathLeftShinLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_SHIN" Offset="0x3347C" />
-        <Limb Name="gMajorasWrathLeftFootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_FOOT" Offset="0x33488" />
-        <Limb Name="gMajorasWrathRightLegRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_LEG_ROOT" Offset="0x33494" />
-        <Limb Name="gMajorasWrathRightThighLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_THIGH" Offset="0x334A0" />
-        <Limb Name="gMajorasWrathRightLowerLegRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_LOWER_LEG_ROOT" Offset="0x334AC" />
-        <Limb Name="gMajorasWrathRightShinLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_SHIN" Offset="0x334B8" />
-        <Limb Name="gMajorasWrathRightFootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_FOOT" Offset="0x334C4" />
-        <Limb Name="gMajorasWrathTorsoRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_TORSO_ROOT" Offset="0x334D0" />
-        <Limb Name="gMajorasWrathTorsoLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_TORSO" Offset="0x334DC" />
-        <Limb Name="gMajorasWrathRightArmRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_ARM_ROOT" Offset="0x334E8" />
-        <Limb Name="gMajorasWrathRightUpperArmLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_UPPER_ARM" Offset="0x334F4" />
-        <Limb Name="gMajorasWrathRightLowerArmRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_LOWER_ARM_ROOT" Offset="0x33500" />
-        <Limb Name="gMajorasWrathRightForearmLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_FOREARM" Offset="0x3350C" />
-        <Limb Name="gMajorasWrathRightHandLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_RIGHT_HAND" Offset="0x33518" />
-        <Limb Name="gMajorasWrathLeftArmRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_ARM_ROOT" Offset="0x33524" />
-        <Limb Name="gMajorasWrathLeftUpperArmLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_UPPER_ARM" Offset="0x33530" />
-        <Limb Name="gMajorasWrathLeftLowerArmRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_LOWER_ARM_ROOT" Offset="0x3353C" />
-        <Limb Name="gMajorasWrathLeftForearmLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_FOREARM" Offset="0x33548" />
-        <Limb Name="gMajorasWrathLeftHandLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_LEFT_HAND" Offset="0x33554" />
-        <Limb Name="gMajorasWrathHeadRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_HEAD_ROOT" Offset="0x33560" />
-        <Limb Name="gMajorasWrathHeadLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_HEAD" Offset="0x3356C" />
-        <Limb Name="gMajorasWrathThirdEyeLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_THIRD_EYE" Offset="0x33578" />
-
-        <!-- Majora's Wrath Skeleton -->
-        <Skeleton Name="gMajorasWrathSkel" Type="Flex" LimbType="Standard" LimbNone="MAJORAS_WRATH_LIMB_NONE" LimbMax="MAJORAS_WRATH_LIMB_MAX" EnumName="MajorasWrathLimb" Offset="0x335F0" />
-
-        <!-- Majora's Wrath Animations -->
-        <Animation Name="gMajorasWrathShortSingleWhipAttackAnim" Offset="0x33F80" /> <!-- Original name is "last_muti" ("whip") -->
-        <Animation Name="gMajorasWrathWhipFlurryAttackAnim" Offset="0x34E64" /> <!-- Original name is "last_muti2" -->
-        <Animation Name="gMajorasWrathDoubleWhipAttackAnim" Offset="0x358C4" /> <!-- Original name is "last_muti3" -->
-        <Animation Name="gMajorasWrathLongSingleWhipAttackAnim" Offset="0x36A7C" /> <!-- Original name is "last_muti4" -->
-        <Animation Name="gMajorasWrathTauntAnim" Offset="0x37ADC" /> <!-- Original name is "last_muti5" -->
-        <Animation Name="gMajorasWrathThreeAttackComboAnim" Offset="0x3918C" /> <!-- Original name is "last_muticombo" -->
-        <Animation Name="gMajorasWrathStunAnim" Offset="0x3B330" /> <!-- Original name is "last_piyo" ("weakly moving") -->
-        <Animation Name="gMajorasWrathSpinAttackAnim" Offset="0x3C4E0" /> <!-- Original name is "last_rolling" -->
-        <Animation Name="gMajorasWrathIdleAnim" Offset="0x3CBD0" /> <!-- Original name is "last_stop" -->
-        <Animation Name="gMajorasWrathFlipLeftAnim" Offset="0x3D224" /> <!-- Original name is "last_tombo1" ("somersault​") -->
-        <Animation Name="gMajorasWrathFlipRightAnim" Offset="0x3D7F0" /> <!-- Original name is "last_tombo2" -->
-        <Animation Name="gMajorasWrathSidestepAnim" Offset="0x3DD1C" /> <!-- Original name is "last_walk" -->
-
-        <!-- Majora Textures -->
-        <Texture Name="gMajoraBodyTex" OutName="majora_body" Format="rgba16" Width="32" Height="64" Offset="0x3DD30" />
-        <Texture Name="gMajoraStripesTex" OutName="majora_stripes" Format="rgba16" Width="32" Height="16" Offset="0x3ED30" />
-        <Texture Name="gMajorasWrathEyeTex" OutName="majoras_wrath_eye" Format="rgba16" Width="64" Height="32" Offset="0x3F130" />
-        <Texture Name="gMajorasWrathMouthTex" OutName="majoras_wrath_mouth" Format="rgba16" Width="32" Height="32" Offset="0x40130" />
-        <Texture Name="gMajorasWrathEarTex" OutName="majoras_wrath_ear" Format="rgba16" Width="16" Height="16" Offset="0x40930" />
-        <Texture Name="gMajoraVeinsTex" OutName="majora_veins" Format="rgba16" Width="32" Height="64" Offset="0x40B30" />
-        <Texture Name="gMajoraBloodshotEyeTex" OutName="majora_bloodshot_eye" Format="rgba16" Width="32" Height="32" Offset="0x41B30" />
-        <Texture Name="gMajorasMaskWithNormalEyesTex" OutName="majoras_mask_with_normal_eyes" Format="rgba16" Width="32" Height="64" Offset="0x42330" />
-        <Texture Name="gMajoraHandTex" OutName="majora_hand" Format="rgba16" Width="32" Height="64" Offset="0x43330" />
-        <Texture Name="gMajorasIncarnationMaskTex" OutName="majoras_incarnation_mask" Format="rgba16" Width="32" Height="64" Offset="0x44330" />
-        <Texture Name="gMajorasMaskSpikes1Tex" OutName="majoras_mask_spikes_1" Format="rgba16" Width="16" Height="16" Offset="0x45330" />
-        <Texture Name="gMajorasMaskSpikes2Tex" OutName="majoras_mask_spikes_2" Format="rgba16" Width="16" Height="16" Offset="0x45530" />
-        <Texture Name="gMajorasMaskSpikes3Tex" OutName="majoras_mask_spikes_3" Format="rgba16" Width="16" Height="16" Offset="0x45730" />
-        <Texture Name="gMajorasMaskSpikes4Tex" OutName="majoras_mask_spikes_4" Format="rgba16" Width="16" Height="16" Offset="0x45930" />
-        <Texture Name="gMajorasMaskWithDullEyesTex" OutName="majoras_mask_with_dull_eyes" Format="rgba16" Width="32" Height="64" Offset="0x45B30" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss_hakugin.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss_hakugin.xml
deleted file mode 100644
index 7c7232ecf..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boss_hakugin.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<Root>
-    <!-- Assets for the Goht boss fight (Goht itself, its title card, its lightning, its rocks, etc.) -->
-    <File Name="object_boss_hakugin" Segment="6">
-        <!-- Goht Animations -->
-        <Animation Name="gGohtThawAndBreakWallAnim" Offset="0x2054" /> <!-- Original name is "iceb_demo" -->
-        <Animation Name="gGohtWritheOnSideAnim" Offset="0x25B0" /> <!-- Unused. Original name is "iceb_dm01" -->
-        <Animation Name="gGohtTwitchOnSideAnim" Offset="0x28D0" /> <!-- Unused. Original name is "iceb_dm02" -->
-        <Animation Name="gGohtFallOnSideAnim" Offset="0x3088" /> <!-- Unused. Original name is "iceb_down" -->
-        <Animation Name="gGohtStationaryAnim" Offset="0x319C" /> <!-- Original name is "iceb_kihon" ("basic") -->
-
-        <!-- Goht Limb DisplayLists -->
-        <DList Name="gGohtPelvisDL" Offset="0x8030" />
-        <DList Name="gGohtBackLeftHoofDL" Offset="0x8380" />
-        <DList Name="gGohtBackLeftPasternDL" Offset="0x84C0" />
-        <DList Name="gGohtBackLeftShinDL" Offset="0x8590" />
-        <DList Name="gGohtBackLeftThighDL" Offset="0x8718" />
-        <DList Name="gGohtBackRightHoofDL" Offset="0x89B8" />
-        <DList Name="gGohtBackRightPasternDL" Offset="0x8AF8" />
-        <DList Name="gGohtBackRightShinDL" Offset="0x8BC8" />
-        <DList Name="gGohtBackRightThighDL" Offset="0x8D50" />
-        <DList Name="gGohtHeadDL" Offset="0x8FF0" />
-        <DList Name="gGohtJawDL" Offset="0x9748" />
-        <DList Name="gGohtThoraxDL" Offset="0x9948" />
-        <DList Name="gGohtFrontLeftHoofDL" Offset="0x9E18" />
-        <DList Name="gGohtFrontLeftLowerLegDL" Offset="0x9F58" />
-        <DList Name="gGohtFrontLeftUpperLegDL" Offset="0xA170" />
-        <DList Name="gGohtFrontRightHoofDL" Offset="0xA478" />
-        <DList Name="gGohtFrontRightLowerLegDL" Offset="0xA5B8" />
-        <DList Name="gGohtFrontRightUpperLegDL" Offset="0xA7D0" />
-
-        <!-- Goht Textures -->
-        <Texture Name="gGohtMachineryTex" OutName="goht_machinery" Format="rgba16" Width="32" Height="64" Offset="0xAAD8" />
-        <Texture Name="gGohtMetalPlateWithCirclePatternTex" OutName="goht_metal_plate_with_circle_pattern" Format="rgba16" Width="32" Height="64" Offset="0xBAD8" />
-        <Texture Name="gGohtMetalPlateWithMulticoloredPatternTex" OutName="goht_metal_plate_with_multicolored_pattern" Format="rgba16" Width="32" Height="64" Offset="0xCAD8" />
-        <Texture Name="gGohtEyeTex" OutName="goht_eye" Format="rgba16" Width="32" Height="64" Offset="0xDAD8" />
-        <Texture Name="gGohtFaceAndKneePatternTex" OutName="goht_face_and_knee_pattern" Format="rgba16" Width="32" Height="64" Offset="0xEAD8" />
-        <Texture Name="gGohtHornTex" OutName="goht_horn" Format="rgba16" Width="32" Height="32" Offset="0xFAD8" />
-
-        <!-- Assets for the small rocks that Goht kicks up, as well as the large rocks that surround him when he is defeated. -->
-        <DList Name="gGohtRockMaterialDL" Offset="0x10488" />
-        <DList Name="gGohtRockModelDL" Offset="0x10500" /> <!-- Original name is "boss_haku_rock_model" -->
-        <Texture Name="gGohtRockTex" OutName="goht_rock" Format="rgba16" Width="36" Height="36" Offset="0x10560" />
-
-        <!-- DisplayLists for the stalactites that fall from the ceiling. -->
-        <DList Name="gGohtStalactiteMaterialDL" Offset="0x11100" />
-        <DList Name="gGohtStalactiteModelDL" Offset="0x11178" /> <!-- Original name is "boss_haku_icicle_model" -->
-
-        <!-- Assets for the lightning that Goht can shoot. -->
-        <DList Name="gGohtLightningMaterialDL" Offset="0x11208" />
-        <DList Name="gGohtLightningModelDL" Offset="0x11278" /> <!-- Original name is "boss_hakugin_lightining_modelT" -->
-        <Texture Name="gGohtLightningTex" OutName="goht_lightning" Format="i4" Width="32" Height="96" Offset="0x11290" />
-
-        <!-- A large amount of zeroes that are unused and have seemingly no purpose. -->
-        <Blob Name="gGohtUnusedZeroesBlob" Size="0x600" Offset="0x11890" />
-        
-        <!-- Assets for the light orb that Goht can shoot at the player, or out of which he can shoot lightning. -->
-        <Texture Name="gGohtLightOrbTex" OutName="goht_light_orb" Format="i8" Width="64" Height="64" Offset="0x11E90" />
-        <DList Name="gGohtLightOrbMaterialDL" Offset="0x12ED0" />
-        <DList Name="gGohtLightOrbModelDL" Offset="0x12F40" /> <!-- Original name is "boss_hakugin_lightball_modelT" -->
-
-        <!-- Goht Limbs -->
-        <Limb Name="gGohtRootLimb" Type="Standard" EnumName="GOHT_LIMB_ROOT" Offset="0x12F58" />
-        <Limb Name="gGohtPelvisLimb" Type="Standard" EnumName="GOHT_LIMB_PELVIS" Offset="0x12F64" />
-        <Limb Name="gGohtThoraxRootLimb" Type="Standard" EnumName="GOHT_LIMB_THORAX_ROOT" Offset="0x12F70" />
-        <Limb Name="gGohtThoraxWrapperLimb" Type="Standard" EnumName="GOHT_LIMB_THORAX_WRAPPER" Offset="0x12F7C" />
-        <Limb Name="gGohtFrontRightLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_RIGHT_LEG_ROOT" Offset="0x12F88" />
-        <Limb Name="gGohtFrontRightUpperLegLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x12F94" />
-        <Limb Name="gGohtFrontRightLowerLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_RIGHT_LOWER_LEG_ROOT" Offset="0x12FA0" />
-        <Limb Name="gGohtFrontRightLowerLegLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x12FAC" />
-        <Limb Name="gGohtFrontRightHoofLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_RIGHT_HOOF" Offset="0x12FB8" />
-        <Limb Name="gGohtFrontLeftLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_LEFT_LEG_ROOT" Offset="0x12FC4" />
-        <Limb Name="gGohtFrontLeftUpperLegLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x12FD0" />
-        <Limb Name="gGohtFrontLeftLowerLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_LEFT_LOWER_LEG_ROOT" Offset="0x12FDC" />
-        <Limb Name="gGohtFrontLeftLowerLegLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x12FE8" />
-        <Limb Name="gGohtFrontLeftHoofLimb" Type="Standard" EnumName="GOHT_LIMB_FRONT_LEFT_HOOF" Offset="0x12FF4" />
-        <Limb Name="gGohtThoraxLimb" Type="Standard" EnumName="GOHT_LIMB_THORAX" Offset="0x13000" />
-        <Limb Name="gGohtHeadLimb" Type="Standard" EnumName="GOHT_LIMB_HEAD" Offset="0x1300C" />
-        <Limb Name="gGohtJawRootLimb" Type="Standard" EnumName="GOHT_LIMB_JAW_ROOT" Offset="0x13018" />
-        <Limb Name="gGohtJawLimb" Type="Standard" EnumName="GOHT_LIMB_JAW" Offset="0x13024" />
-        <Limb Name="gGohtBackRightLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_LEG_ROOT" Offset="0x13030" />
-        <Limb Name="gGohtBackRightLegWrapperLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_LEG_WRAPPER" Offset="0x1303C" />
-        <Limb Name="gGohtBackRightThighLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_THIGH" Offset="0x13048" />
-        <Limb Name="gGohtBackRightShinLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_SHIN" Offset="0x13054" />
-        <Limb Name="gGohtBackRightPasternRootLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_PASTERN_ROOT" Offset="0x13060" />
-        <Limb Name="gGohtBackRightPasternLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_PASTERN" Offset="0x1306C" />
-        <Limb Name="gGohtBackRightHoofLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_RIGHT_HOOF" Offset="0x13078" />
-        <Limb Name="gGohtBackLeftLegRootLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_LEG_ROOT" Offset="0x13084" />
-        <Limb Name="gGohtBackLeftLegWrapperLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_LEG_WRAPPER" Offset="0x13090" />
-        <Limb Name="gGohtBackLeftThighLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_THIGH" Offset="0x1309C" />
-        <Limb Name="gGohtBackLeftShinLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_SHIN" Offset="0x130A8" />
-        <Limb Name="gGohtBackLeftPasternRootLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_PASTERN_ROOT" Offset="0x130B4" />
-        <Limb Name="gGohtBackLeftPasternLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_PASTERN" Offset="0x130C0" />
-        <Limb Name="gGohtBackLeftHoofLimb" Type="Standard" EnumName="GOHT_LIMB_BACK_LEFT_HOOF" Offset="0x130CC" />
-
-        <!-- Goht Skeleton -->
-        <Skeleton Name="gGohtSkel" Type="Flex" LimbType="Standard" LimbNone="GOHT_LIMB_NONE" LimbMax="GOHT_LIMB_MAX" EnumName="GohtLimb" Offset="0x13158" />
-
-        <!-- Goht Animations -->
-        <Animation Name="gGohtFallDownAnim" Offset="0x134D0" /> <!-- Original name is "iceb_koke" ("folly; fool") -->
-        <Animation Name="gGohtRunAnim" Offset="0x13828" /> <!-- Original name is "iceb_run" -->
-        <Animation Name="gGohtGetUpFromSideAnim" Offset="0x14024" /> <!-- Unused. Original name is "iceb_up" -->
-
-        <!-- Goht Title Card -->
-        <Texture Name="gGohtTitleCardTex" OutName="goht_title_card" Format="ia8" Width="128" Height="40" Offset="0x14040" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_botihasira.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_botihasira.xml
deleted file mode 100644
index 0a2212760..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_botihasira.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_botihasira" Segment="6">
-        <DList Name="object_botihasira_DL_0004A0" Offset="0x4A0" /> <!-- Original name is "z2_botihasira_model" ("boti" = "graveyard", "hasira" = "post") -->
-        <DList Name="object_botihasira_DL_000628" Offset="0x628" />
-        <DList Name="object_botihasira_DL_000638" Offset="0x638" />
-        <Texture Name="object_botihasira_Tex_000648" OutName="tex_000648" Format="rgba16" Width="32" Height="64" Offset="0x648" />
-        <Texture Name="object_botihasira_Tex_001648" OutName="tex_001648" Format="rgba16" Width="32" Height="16" Offset="0x1648" />
-        <!-- <Blob Name="object_botihasira_Blob_001A48" Size="0x18" Offset="0x1A48" /> -->
-        <Collision Name="object_botihasira_Colheader_001BD8" Offset="0x1BD8" /> <!-- Original name is "z2_botihasira_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_box.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_box.xml
deleted file mode 100644
index 8bb2b7efe..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_box.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <File Name="object_box" Segment="6">
-        <Animation Name="gBoxBigChestOpenChildAnim" Offset="0x128" /> <!-- Original name is "cdemo_box_boxA" -->
-        <Animation Name="gBoxBigChestOpenAdultAnim" Offset="0x24C" /> <!-- Original name is "demo_box_boxA" -->
-        <Blob Name="object_box_zeroes_unk_0000025C" Size="0xF4" Offset="0x25C" />
-        <Animation Name="gBoxChestOpenAnim" Offset="0x43C" /> <!-- Original name is "demo_box_boxB" -->
-        <Blob Name="object_box_zeroes_unk_0000044C" Size="0x64" Offset="0x44C" />
-        <DList Name="gBoxChestBaseDL" Offset="0x6F0" />
-        <DList Name="gBoxChestBaseGildedDL" Offset="0xA50" />
-        <DList Name="gBoxChestBaseOrnateDL" Offset="0xDB0" />
-        <DList Name="gBoxChestLidDL" Offset="0x12E8" />
-        <DList Name="gBoxChestLidGildedDL" Offset="0x1850" />
-        <DList Name="gBoxChestLidOrnateDL" Offset="0x1D58" />
-        <Texture Name="gBoxChestLockTex" OutName="chest_lock" Format="rgba16" Width="32" Height="64" Offset="0x1E60" />
-        <Texture Name="gBoxChestCornerTex" OutName="chest_corner" Format="rgba16" Width="32" Height="32" Offset="0x2E60" />
-        <Texture Name="gBoxChestLockGildedTex" OutName="chest_lock_gilded" Format="rgba16" Width="32" Height="64" Offset="0x3660" />
-        <Texture Name="gBoxChestCornerGildedTex" OutName="chest_corner_gilded" Format="rgba16" Width="32" Height="32" Offset="0x4660" />
-        <Texture Name="gBoxChestLockOrnateTex" OutName="chest_lock_ornate" Format="rgba16" Width="32" Height="64" Offset="0x4E60" />
-        <Texture Name="gBoxChestCornerOrnateTex" OutName="chest_corner_ornate" Format="rgba16" Width="32" Height="32" Offset="0x5E60" />
-        <Limb Name="object_box_Standardlimb_006660" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_01" Offset="0x6660" />
-        <Limb Name="object_box_Standardlimb_00666C" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_02" Offset="0x666C" />
-        <Limb Name="object_box_Standardlimb_006678" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_03" Offset="0x6678" />
-        <Limb Name="object_box_Standardlimb_006684" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_04" Offset="0x6684" />
-        <Skeleton Name="gBoxChestSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BOX_CHEST_LIMB_NONE" LimbMax="OBJECT_BOX_CHEST_LIMB_MAX" EnumName="ObjectBoxChestLimb" Offset="0x66A0" />
-        <CurveAnimation Name="gBoxLightAdultCurveAnim" SkelOffset="0x7D78" Offset="0x6A20"/> <!-- Original name is "demo_tre_lgt_c_fcurve_data" -->
-        <CurveAnimation Name="gBoxLightChildCurveAnim" SkelOffset="0x7D78" Offset="0x6E30"/> <!-- Original name is "demo_tre_lgt_fcurve_data" -->
-        <Texture Name="gBoxLightTex" OutName="box_light" Format="i8" Width="64" Height="32" Offset="0x6E40" />
-        <DList Name="object_box_DL_007890" Offset="0x7890" />
-        <DList Name="object_box_DL_007978" Offset="0x7978" />
-        <DList Name="object_box_DL_007A40" Offset="0x7A40" />
-        <DList Name="object_box_DL_007B08" Offset="0x7B08" />
-        <DList Name="object_box_DL_007BD0" Offset="0x7BD0" />
-        <Limb Name="object_box_Curvelimb_007C98" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_01" Offset="0x7C98" />
-        <Limb Name="object_box_Curvelimb_007CA4" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_02" Offset="0x7CA4" />
-        <Limb Name="object_box_Curvelimb_007CB0" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_03" Offset="0x7CB0" />
-        <Limb Name="object_box_Curvelimb_007CBC" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_04" Offset="0x7CBC" />
-        <Limb Name="object_box_Curvelimb_007CC8" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_05" Offset="0x7CC8" />
-        <Limb Name="object_box_Curvelimb_007CD4" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_06" Offset="0x7CD4" />
-        <Limb Name="object_box_Curvelimb_007CE0" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_07" Offset="0x7CE0" />
-        <Limb Name="object_box_Curvelimb_007CEC" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_08" Offset="0x7CEC" />
-        <Limb Name="object_box_Curvelimb_007CF8" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_09" Offset="0x7CF8" />
-        <Limb Name="object_box_Curvelimb_007D04" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_10" Offset="0x7D04" />
-        <Limb Name="object_box_Curvelimb_007D10" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_11" Offset="0x7D10" />
-        <Limb Name="object_box_Curvelimb_007D1C" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_12" Offset="0x7D1C" />
-        <Limb Name="object_box_Curvelimb_007D28" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_13" Offset="0x7D28" />
-        <Limb Name="object_box_Curvelimb_007D34" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_14" Offset="0x7D34" />
-        <Skeleton Name="gBoxLightCurveSkel" Type="Curve" LimbType="Curve" LimbNone="OBJECT_BOX_LIGHT_LIMB_NONE" LimbMax="OBJECT_BOX_LIGHT_LIMB_MAX" EnumName="ObjectBoxLightLimb" Offset="0x7D78" />
-        <Animation Name="gBoxBigChestOpenGoronAnim" Offset="0x7E54" /> <!-- Original name is "pg_Tbox" -->
-        <Animation Name="gBoxBigChestOpenDekuAnim" Offset="0x7F30" /> <!-- Original name is "pn_Tbox" -->
-        <Blob Name="object_box_zeroes_unk_00007F40" Size="0xA0" Offset="0x7F40" />
-        <Collision Name="gBoxChestCol" Offset="0x80E8" /> <!-- Original name is "takara_hako_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boyo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boyo.xml
deleted file mode 100644
index 0084c4825..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_boyo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_boyo" Segment="6">
-        <DList Name="object_boyo_DL_000300" Offset="0x300" />
-        <Texture Name="object_boyo_Tex_000480" OutName="tex_000480" Format="rgba16" Width="32" Height="32" Offset="0x480" />
-        <Texture Name="object_boyo_Tex_000C80" OutName="tex_000C80" Format="rgba16" Width="16" Height="16" Offset="0xC80" />
-        <TextureAnimation Name="object_boyo_Matanimheader_000E88" Offset="0xE88" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bsb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bsb.xml
deleted file mode 100644
index 40bce73f2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bsb.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<Root>
-    <File Name="object_bsb" Segment="6">
-        <Animation Name="object_bsb_Anim_000400" Offset="0x400" /> <!-- Original name is "bsb_aita" ("Ouch!") -->
-        <Animation Name="object_bsb_Anim_000C50" Offset="0xC50" /> <!-- Original name is "bsb_atack" -->
-        <Animation Name="object_bsb_Anim_000FF0" Offset="0xFF0" /> <!-- Original name is "bsb_battlewalk" -->
-        <Animation Name="object_bsb_Anim_001390" Offset="0x1390" /> <!-- Original name is "bsb_damage" -->
-        <Animation Name="object_bsb_Anim_001CD8" Offset="0x1CD8" /> <!-- Original name is "bsb_demo_wait" -->
-        <Animation Name="object_bsb_Anim_001F90" Offset="0x1F90" /> <!-- Original name is "bsb_don" (onomatopoeic for "bang; bam; boom; thud") -->
-        <Animation Name="object_bsb_Anim_002590" Offset="0x2590" /> <!-- Original name is "bsb_dosuni" -->
-        <Animation Name="object_bsb_Anim_002AF4" Offset="0x2AF4" /> <!-- Original name is "bsb_down" -->
-        <Animation Name="object_bsb_Anim_003238" Offset="0x3238" /> <!-- Original name is "bsb_furi_wait" -->
-        <Animation Name="object_bsb_Anim_003E1C" Offset="0x3E1C" /> <!-- Original name is "bsb_furimuki" ("to turn around") -->
-        <Animation Name="object_bsb_Anim_004208" Offset="0x4208" /> <!-- Original name is "bsb_jidanda" ("to stamp one's feet (in frustration, impatience, etc.)") -->
-        <Animation Name="object_bsb_Anim_0043A4" Offset="0x43A4" /> <!-- Original name is "bsb_jump" -->
-        <Animation Name="object_bsb_Anim_004510" Offset="0x4510" /> <!-- Original name is "bsb_jumpTOdon" -->
-        <Animation Name="object_bsb_Anim_004894" Offset="0x4894" /> <!-- Original name is "bsb_kei_wait" -->
-        <Animation Name="object_bsb_Anim_004E2C" Offset="0x4E2C" /> <!-- Original name is "bsb_keirei" ("salute") -->
-        <Animation Name="object_bsb_Anim_005440" Offset="0x5440" /> <!-- Original name is "bsb_kiwo_wait" -->
-        <Animation Name="object_bsb_Anim_00606C" Offset="0x606C" /> <!-- Original name is "bsb_kiwotuke" ("standing at attention​") -->
-        <Animation Name="object_bsb_Anim_0065D8" Offset="0x65D8" /> <!-- Original name is "bsb_kyorokyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="object_bsb_Anim_006C48" Offset="0x6C48" /> <!-- Original name is "bsb_laugh" -->
-        <Animation Name="object_bsb_Anim_007120" Offset="0x7120" /> <!-- Original name is "bsb_matarei" -->
-        <Animation Name="object_bsb_Anim_007B18" Offset="0x7B18" /> <!-- Original name is "bsb_rajio" -->
-        <Animation Name="object_bsb_Anim_0086BC" Offset="0x86BC" /> <!-- Original name is "bsb_start" -->
-        <DList Name="object_bsb_DL_00A010" Offset="0xA010" />
-        <DList Name="object_bsb_DL_00A0D8" Offset="0xA0D8" />
-        <DList Name="object_bsb_DL_00A188" Offset="0xA188" />
-        <DList Name="object_bsb_DL_00A230" Offset="0xA230" />
-        <DList Name="object_bsb_DL_00A2F8" Offset="0xA2F8" />
-        <DList Name="object_bsb_DL_00A3A8" Offset="0xA3A8" />
-        <DList Name="object_bsb_DL_00A450" Offset="0xA450" />
-        <DList Name="object_bsb_DL_00A5D0" Offset="0xA5D0" />
-        <DList Name="object_bsb_DL_00A708" Offset="0xA708" />
-        <DList Name="object_bsb_DL_00AE20" Offset="0xAE20" />
-        <DList Name="object_bsb_DL_00AEA8" Offset="0xAEA8" />
-        <DList Name="object_bsb_DL_00B038" Offset="0xB038" />
-        <DList Name="object_bsb_DL_00B100" Offset="0xB100" />
-        <DList Name="object_bsb_DL_00B228" Offset="0xB228" />
-        <DList Name="object_bsb_DL_00B2F8" Offset="0xB2F8" />
-        <DList Name="object_bsb_DL_00B3C0" Offset="0xB3C0" />
-        <DList Name="object_bsb_DL_00B4E8" Offset="0xB4E8" />
-        <DList Name="object_bsb_DL_00B5B8" Offset="0xB5B8" />
-        <Texture Name="object_bsb_Tex_00B660" OutName="tex_00B660" Format="rgba16" Width="8" Height="16" Offset="0xB660" />
-        <Texture Name="object_bsb_Tex_00B760" OutName="tex_00B760" Format="rgba16" Width="8" Height="16" Offset="0xB760" />
-        <Texture Name="object_bsb_Tex_00B860" OutName="tex_00B860" Format="rgba16" Width="8" Height="8" Offset="0xB860" />
-        <Texture Name="object_bsb_Tex_00B8E0" OutName="tex_00B8E0" Format="rgba16" Width="16" Height="16" Offset="0xB8E0" />
-        <Texture Name="object_bsb_Tex_00BAE0" OutName="tex_00BAE0" Format="rgba16" Width="16" Height="8" Offset="0xBAE0" />
-        <Texture Name="object_bsb_Tex_00BBE0" OutName="tex_00BBE0" Format="rgba16" Width="8" Height="8" Offset="0xBBE0" />
-        <Texture Name="object_bsb_Tex_00BC60" OutName="tex_00BC60" Format="rgba16" Width="16" Height="16" Offset="0xBC60" />
-        <Texture Name="object_bsb_Tex_00BE60" OutName="tex_00BE60" Format="rgba16" Width="16" Height="16" Offset="0xBE60" />
-        <Texture Name="object_bsb_Tex_00C060" OutName="tex_00C060" Format="rgba16" Width="8" Height="16" Offset="0xC060" />
-        <Texture Name="object_bsb_Tex_00C160" OutName="tex_00C160" Format="rgba16" Width="8" Height="8" Offset="0xC160" />
-        <Texture Name="object_bsb_Tex_00C1E0" OutName="tex_00C1E0" Format="rgba16" Width="8" Height="8" Offset="0xC1E0" />
-        <TextureAnimation Name="object_bsb_Matanimheader_00C298" Offset="0xC298" />
-        <Limb Name="object_bsb_Standardlimb_00C2A0" Type="Standard" EnumName="OBJECT_BSB_LIMB_01" Offset="0xC2A0" />
-        <Limb Name="object_bsb_Standardlimb_00C2AC" Type="Standard" EnumName="OBJECT_BSB_LIMB_02" Offset="0xC2AC" />
-        <Limb Name="object_bsb_Standardlimb_00C2B8" Type="Standard" EnumName="OBJECT_BSB_LIMB_03" Offset="0xC2B8" />
-        <Limb Name="object_bsb_Standardlimb_00C2C4" Type="Standard" EnumName="OBJECT_BSB_LIMB_04" Offset="0xC2C4" />
-        <Limb Name="object_bsb_Standardlimb_00C2D0" Type="Standard" EnumName="OBJECT_BSB_LIMB_05" Offset="0xC2D0" />
-        <Limb Name="object_bsb_Standardlimb_00C2DC" Type="Standard" EnumName="OBJECT_BSB_LIMB_06" Offset="0xC2DC" />
-        <Limb Name="object_bsb_Standardlimb_00C2E8" Type="Standard" EnumName="OBJECT_BSB_LIMB_07" Offset="0xC2E8" />
-        <Limb Name="object_bsb_Standardlimb_00C2F4" Type="Standard" EnumName="OBJECT_BSB_LIMB_08" Offset="0xC2F4" />
-        <Limb Name="object_bsb_Standardlimb_00C300" Type="Standard" EnumName="OBJECT_BSB_LIMB_09" Offset="0xC300" />
-        <Limb Name="object_bsb_Standardlimb_00C30C" Type="Standard" EnumName="OBJECT_BSB_LIMB_0A" Offset="0xC30C" />
-        <Limb Name="object_bsb_Standardlimb_00C318" Type="Standard" EnumName="OBJECT_BSB_LIMB_0B" Offset="0xC318" />
-        <Limb Name="object_bsb_Standardlimb_00C324" Type="Standard" EnumName="OBJECT_BSB_LIMB_0C" Offset="0xC324" />
-        <Limb Name="object_bsb_Standardlimb_00C330" Type="Standard" EnumName="OBJECT_BSB_LIMB_0D" Offset="0xC330" />
-        <Limb Name="object_bsb_Standardlimb_00C33C" Type="Standard" EnumName="OBJECT_BSB_LIMB_0E" Offset="0xC33C" />
-        <Limb Name="object_bsb_Standardlimb_00C348" Type="Standard" EnumName="OBJECT_BSB_LIMB_0F" Offset="0xC348" />
-        <Limb Name="object_bsb_Standardlimb_00C354" Type="Standard" EnumName="OBJECT_BSB_LIMB_10" Offset="0xC354" />
-        <Limb Name="object_bsb_Standardlimb_00C360" Type="Standard" EnumName="OBJECT_BSB_LIMB_11" Offset="0xC360" />
-        <Limb Name="object_bsb_Standardlimb_00C36C" Type="Standard" EnumName="OBJECT_BSB_LIMB_12" Offset="0xC36C" />
-        <Limb Name="object_bsb_Standardlimb_00C378" Type="Standard" EnumName="OBJECT_BSB_LIMB_13" Offset="0xC378" />
-        <Limb Name="object_bsb_Standardlimb_00C384" Type="Standard" EnumName="OBJECT_BSB_LIMB_14" Offset="0xC384" />
-        <Skeleton Name="object_bsb_Skel_00C3E0" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BSB_LIMB_NONE" LimbMax="OBJECT_BSB_LIMB_MAX" EnumName="ObjectBsbLimb" Offset="0xC3E0" />
-        <Animation Name="object_bsb_Anim_00C790" Offset="0xC790" /> <!-- Original name is "bsb_tatsu" ("to stand; to rise; to stand up​") -->
-        <Animation Name="object_bsb_Anim_00CD88" Offset="0xCD88" /> <!-- Original name is "bsb_walk" -->
-        <Animation Name="object_bsb_Anim_00D3CC" Offset="0xD3CC" /> <!-- Original name is "bsb_yareyare" ("oh!; ah!; oh dear!; good grief!; dear me!") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bsmask.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bsmask.xml
deleted file mode 100644
index 92e8148e9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bsmask.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<Root>
-    <!-- Boss Remains -->
-    <File Name="object_bsmask" Segment="6">
-
-        <!-- Boss Remains Display Lists -->
-        <DList Name="gRemainsOdolwaDL" Offset="0x690" /> <!-- Original name is "face01_get_model" -->
-        <DList Name="gRemainsGyorgDL" Offset="0x1D80" /> <!-- Original name is "face02_get_model" -->
-        <DList Name="gRemainsGohtDL" Offset="0x3AD0" /> <!-- Original name is "face03_get_model" -->
-        <DList Name="gRemainsTwinmoldDL" Offset="0x5020" /> <!-- Original name is "face04_get_model" -->
-
-        <!-- Boss Remains TLUTs -->
-        <Texture Name="gRemainsOdolwaFaceTLUT" OutName="remains_odolwa_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5830" />
-        <Texture Name="gRemainsOdolwaEarTLUT" OutName="remains_odolwa_ear_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5850" />
-        <Texture Name="gRemainsGyorgSkinTLUT" OutName="remains_gyorg_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5870" />
-        <Texture Name="gRemainsGyorgMouthTLUT" OutName="remains_gyorg_mouth_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5890" />
-        <Texture Name="gRemainsGyorgToothHornTLUT" OutName="remains_gyorg_tooth_horn_tlut" Format="rgba16" Width="4" Height="4" Offset="0x58B0" />
-        <Texture Name="gRemainsTwinmoldSkinTLUT" OutName="remains_twinmold_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x58D0" />
-        <Texture Name="gRemainsTwinmoldSnoutTLUT" OutName="remains_twinmold_snout_tlut" Format="rgba16" Width="4" Height="4" Offset="0x58F0" />
-
-        <!-- Boss Remains Textures -->
-        <Texture Name="gRemainsOdolwaPlumeTex" OutName="remains_odolwa_plume" Format="rgba16" Width="16" Height="16" Offset="0x5910" />
-        <Texture Name="gRemainsOdolwaFaceTex" OutName="remains_odolwa_face" Format="ci4" Width="64" Height="64" Offset="0x5B10" />
-        <Texture Name="gRemainsOdolwaEarTex" OutName="remains_odolwa_ear" Format="ci4" Width="64" Height="64" Offset="0x6310" />
-        <Texture Name="gRemainsGyorgTwinmoldEyeTex" OutName="remains_gyorg_twinmold_eye" Format="rgba16" Width="32" Height="32" Offset="0x6B10" />
-        <Texture Name="gRemainsGyorgSkinTex" OutName="remains_gyorg_skin" Format="ci4" Width="64" Height="64" Offset="0x7310" />
-        <Texture Name="gRemainsGyorgMouthTex" OutName="remains_gyorg_mouth" Format="ci4" Width="64" Height="64" Offset="0x7B10" />
-        <Texture Name="gRemainsGyorgToothHornTex" OutName="remains_gyorg_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0x8310" />
-        <Texture Name="gRemainsGohtEyeTex" OutName="remains_goht_eye" Format="rgba16" Width="32" Height="64" Offset="0x8390" />
-        <Texture Name="gRemainsGohtTopPatternTex" OutName="remains_goht_top_pattern" Format="rgba16" Width="32" Height="64" Offset="0x9390" />
-        <!-- Used for the lower part of Goht's Remains for the mouth of Twinmold's Remains -->
-        <Texture Name="gRemainsGohtTwinmoldPatternTex" OutName="remains_goht_twinmold_pattern" Format="rgba16" Width="32" Height="64" Offset="0xA390" />
-        <Texture Name="gRemainsGohtSpikeTwinmoldMandibleTex" OutName="remains_goht_spike_twinmold_mandible" Format="rgba16" Width="32" Height="32" Offset="0xB390" />
-        <Texture Name="gRemainsTwinmoldSkinTex" OutName="remains_twinmold_skin" Format="ci4" Width="64" Height="64" Offset="0xBB90" />
-        <Texture Name="gRemainsTwinmoldSnoutTex" OutName="remains_twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0xC390" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bubble.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bubble.xml
deleted file mode 100644
index da2f01d47..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_bubble.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="object_bubble" Segment="6">
-        <Texture Name="gBubbleTex" OutName="bubble" Format="ia8" Width="64" Height="64" Offset="0x0" />
-        <DList Name="gBubbleDL" Offset="0x1000" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cha.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cha.xml
deleted file mode 100644
index 79b008353..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cha.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_cha" Segment="6">
-        <DList Name="object_cha_DL_000710" Offset="0x710" /> <!-- Original name is "cha_ki_model" -->
-        <DList Name="object_cha_DL_000958" Offset="0x958" /> <!-- Original name is "cha_kane_model" -->
-        <Texture Name="object_cha_TLUT_000B08" OutName="tlut_000B08" Format="rgba16" Width="16" Height="16" Offset="0xB08" />
-        <Texture Name="object_cha_Tex_000D08" OutName="tex_000D08" Format="ci8" Width="32" Height="32" Offset="0xD08" />
-        <Texture Name="object_cha_Tex_001108" OutName="tex_001108" Format="ci8" Width="32" Height="32" Offset="0x1108" />
-        <Texture Name="object_cha_Tex_001508" OutName="tex_001508" Format="ci8" Width="16" Height="16" Offset="0x1508" />
-        <Texture Name="object_cha_Tex_001608" OutName="tex_001608" Format="ci8" Width="32" Height="32" Offset="0x1608" />
-        <Texture Name="object_cha_Tex_001A08" OutName="tex_001A08" Format="rgba16" Width="16" Height="32" Offset="0x1A08" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cne.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cne.xml
deleted file mode 100644
index 135aae7a2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cne.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Root>
-    <!-- Object for Unusued Hyrule Market NPC -->
-    <File Name="object_cne" Segment="6">
-        <!-- The textures used by these limbs aren't 64-bit aligned -->
-        <Limb Name="gCnePelvisLimb" LimbType="Standard" EnumName="CNE_LIMB_PELVIS" Offset="0x0"/>
-        <Limb Name="gCneLeftThighLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_THIGH" Offset="0xC"/>
-        <Limb Name="gCneLeftShinLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_SHIN" Offset="0x18"/>
-        <Limb Name="gCneLeftFootLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_FOOT" Offset="0x24"/>
-        <Limb Name="gCneRightThighLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_THIGH" Offset="0x30"/>
-        <Limb Name="gCneRightShinLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_SHIN" Offset="0x3C"/>
-        <Limb Name="gCneRightFootLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_FOOT" Offset="0x48"/>
-        <Limb Name="gCneTorsoLimb" LimbType="Standard" EnumName="CNE_LIMB_TORSO" Offset="0x54"/>
-        <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_UPPER_ARM" Offset="0x60"/>
-        <Limb Name="gCneLeftForearmLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_FOREARM" Offset="0x6C"/>
-        <Limb Name="gCneLeftHandLimb" LimbType="Standard" EnumName="CNE_LIMB_LEFT_HAND" Offset="0x78"/>
-        <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_UPPER_ARM" Offset="0x84"/>
-        <Limb Name="gCneRightForearmLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_FOREARM" Offset="0x90"/>
-        <Limb Name="gCneRightHandLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_HAND" Offset="0x9C"/>
-        <Limb Name="gCneHeadLimb" LimbType="Standard" EnumName="CNE_LIMB_HEAD" Offset="0xA8"/>
-
-        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" LimbNone="CNE_LIMB_NONE" LimbMax="CNE_LIMB_MAX" EnumName="CneLimb" Offset="0xF0"/>
-
-        <!-- 32-bit aligned textures. -->
-        <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
-        <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC"/>
-        <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C"/>
-        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C"/>
-        <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC"/>
-        <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC"/>
-        <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
-        <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC"/>
-
-        <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
-        <DList Name="gCneRightHandDL" Offset="0x1608"/>
-        <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
-        <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
-        <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
-        <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
-        <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
-        <DList Name="gCneTorsoDL" Offset="0x1B88"/>
-        <DList Name="gCneRightFootDL" Offset="0x1E50"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCneRightShinDL" Offset="0x1F18"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCneRightThighDL" Offset="0x1FE0"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCneLeftFootDL" Offset="0x20A8"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCneLeftShinDL" Offset="0x2170"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCneLeftThighDL" Offset="0x2238"/> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCnePelvisDL" Offset="0x2300"/>
-
-        <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
-        <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
-
-        <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_comb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_comb.xml
deleted file mode 100644
index 2bea4db20..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_comb.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Object for Beehive -->
-    <File Name="object_comb" Segment="6">
-        <!-- Beehive -->
-        <Texture Name="gBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <DList Name="gBeehiveDL" Offset="0xCB0" /> <!-- Original name is "hatisu_model" ("hive; beehive") -->
-
-        <!-- Beehive Fragment -->
-        <Texture Name="gBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0xE10" />
-        <DList Name="gBeehiveFragmentDL" Offset="0x1040" /> <!-- Original name is "hatisu_hahen_model" ("hahen" = "fragment; broken piece") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cow.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cow.xml
deleted file mode 100644
index 6895d6217..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cow.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Root>
-    <!-- Assets for cows -->
-    <File Name="object_cow" Segment="6">
-        <Animation Name="gCowChewAnim" Offset="0x1CC" /> <!-- Original name is "usi_mogmog" (onomatopoeia for chewing) -->
-
-        <!-- Cow Limb DisplayLists -->
-        <DList Name="gCowBodyDL" Offset="0x1A80" />
-        <DList Name="gCowHeadDL" Offset="0x1FE8" />
-        <DList Name="gCowNoseDL" Offset="0x2368" />
-        <DList Name="gCowNoseRingDL" Offset="0x2628" />
-        <DList Name="gCowJawDL" Offset="0x2760" />
-
-        <!-- Cow Palettes -->
-        <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880" />
-
-        <!-- Cow Textures -->
-        <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" />
-        <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" />
-        <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" />
-        <Texture Name="gCowSpotsTex" OutName="cow_spots" Format="i8" Width="64" Height="64" Offset="0x2CC0" />
-        <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" />
-        <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40" />
-        <Texture Name="gCowLegAndTailTex" OutName="cow_leg_and_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" />
-
-        <!-- Cow Limb DisplayLists -->
-        <Limb Name="gCowBodyLimb" Type="Standard" EnumName="COW_LIMB_BODY" Offset="0x3FC0" />
-        <Limb Name="gCowHeadLimb" Type="Standard" EnumName="COW_LIMB_HEAD" Offset="0x3FCC" />
-        <Limb Name="gCowJawLimb" Type="Standard" EnumName="COW_LIMB_JAW" Offset="0x3FD8" />
-        <Limb Name="gCowNoseLimb" Type="Standard" EnumName="COW_LIMB_NOSE" Offset="0x3FE4" />
-        <Limb Name="gCowNoseRingLimb" Type="Standard" EnumName="COW_LIMB_NOSE_RING" Offset="0x3FF0" />
-
-        <!-- Cow Skeleton -->
-        <Skeleton Name="gCowSkel" Type="Flex" LimbType="Standard" LimbNone="COW_LIMB_NONE" LimbMax="COW_LIMB_MAX" EnumName="CowLimb" Offset="0x4010" />
-
-        <Animation Name="gCowMooAnim" Offset="0x4264" /> <!-- Original name is "usi_mooo" -->
-        <Animation Name="gCowTailIdleAnim" Offset="0x4348" /> <!-- Original name is "ust_daran" ("loosely") -->
-
-        <!-- Cow Tail Limb DisplayLists -->
-        <DList Name="gCowTailBaseDL" Offset="0x46F0" />
-        <DList Name="gCowTailUpperDL" Offset="0x47D0" />
-        <DList Name="gCowTailMiddleDL" Offset="0x48D0" />
-        <DList Name="gCowTailLowerDL" Offset="0x49D0" />
-        <DList Name="gCowTailEndDL" Offset="0x4AD0" />
-
-        <!-- Cow Tail Limbs -->
-        <Limb Name="gCowTailBaseLimb" Type="Standard" EnumName="COW_TAIL_LIMB_BASE" Offset="0x4BE0" />
-        <Limb Name="gCowTailUpperLimb" Type="Standard" EnumName="COW_TAIL_LIMB_UPPER" Offset="0x4BEC" />
-        <Limb Name="gCowTailMiddleLimb" Type="Standard" EnumName="COW_TAIL_LIMB_MIDDLE" Offset="0x4BF8" />
-        <Limb Name="gCowTailLowerLimb" Type="Standard" EnumName="COW_TAIL_LIMB_LOWER" Offset="0x4C04" />
-        <Limb Name="gCowTailEndLimb" Type="Standard" EnumName="COW_TAIL_LIMB_END" Offset="0x4C10" />
-
-        <!-- Cow Tail Skeleton -->
-        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" LimbNone="COW_TAIL_LIMB_NONE" LimbMax="COW_TAIL_LIMB_MAX" EnumName="CowTailLimb" Offset="0x4C30" />
-
-        <Animation Name="gCowTailSwishAnim" Offset="0x4E98" /> <!-- Original name is "ust_furifuri" ("fluttery") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_crace_object.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_crace_object.xml
deleted file mode 100644
index 63dd9913d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_crace_object.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Assets for the sliding doors in the Deku Shrine -->
-    <File Name="object_crace_object" Segment="6">
-        <DList Name="gDekuShrineSlidingDoorDL" Offset="0x3A0" /> <!-- Original name is "Y2_DANPEI_shutter_model" -->
-        <Texture Name="gDekuShrineSlidingDoorTLUT" OutName="deku_shrine_sliding_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x540" />
-        <Texture Name="gDekuShrineSlidingDoorTex" OutName="deku_shrine_sliding_door" Format="ci4" Width="32" Height="128" Offset="0x560" />
-        <Collision Name="gDekuShrineSlidingDoorCol" Offset="0xE00" /> <!-- Original name is "Y2_DANPEI_shutter_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_crow.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_crow.xml
deleted file mode 100644
index 068ca790a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_crow.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Root>
-    <File Name="object_crow" Segment="6">
-        <Animation Name="gGuayFlyAnim" Offset="0xF0" /> <!-- Original name is "df_flygue" -->
-        <DList Name="gGuayBodyDL" Offset="0x490" />
-        <DList Name="gGuayRightWingTipDL" Offset="0x5E0" />
-        <DList Name="gGuayRightWingBodyDL" Offset="0x6B0" />
-        <DList Name="gGuayLeftWingTipDL" Offset="0x770" />
-        <DList Name="gGuayLeftWingBodyDL" Offset="0x840" />
-        <DList Name="gGuayTailDL" Offset="0x900" />
-        <DList Name="gGuayUpperTailDL" Offset="0x9A0" />
-        <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40" />
-        <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40" />
-        <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40" />
-        <Limb Name="gGuayRootLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_ROOT" Offset="0x1040" />
-        <Limb Name="gGuayBodyLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_BODY" Offset="0x104C" />
-        <Limb Name="gGuayRightWingBodyLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_RIGHT_WING_BODY" Offset="0x1058" />
-        <Limb Name="gGuayRightWingTipLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_RIGHT_WING_TIP" Offset="0x1064" />
-        <Limb Name="gGuayLeftWingBodyLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_LEFT_WING_BODY" Offset="0x1070" />
-        <Limb Name="gGuayLeftWingTipLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_LEFT_WING_TIP" Offset="0x107C" />
-        <Limb Name="gGuayUpperTailLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_UPPER_TAIL" Offset="0x1088" />
-        <Limb Name="gGuayTailLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_TAIL" Offset="0x1094" />
-        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_CROW_LIMB_NONE" LimbMax="OBJECT_CROW_LIMB_MAX" EnumName="ObjectCrowLimb" Offset="0x10C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cs.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cs.xml
deleted file mode 100644
index cc9dfbe74..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_cs.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<Root>
-    <File Name="object_cs" Segment="6">
-        <DList Name="object_cs_DL_000040" Offset="0x40" />
-        <Texture Name="object_cs_Tex_0000C0" OutName="tex_0000C0" Format="ia8" Width="64" Height="64" Offset="0xC0" />
-        <Animation Name="object_cs_Anim_001708" Offset="0x1708" /> <!-- Original name is "csn_atsume" ("to collect; to assemble; to gather​") -->
-        <Animation Name="object_cs_Anim_001A1C" Offset="0x1A1C" /> <!-- Original name is "csn_fly" -->
-        <Animation Name="object_cs_Anim_002044" Offset="0x2044" /> <!-- Original name is "csn_fukiya" ("blowgun; blowpipe; dart​") -->
-        <Animation Name="object_cs_Anim_0026B0" Offset="0x26B0" /> <!-- Original name is "csn_keirei" ("salute") -->
-        <Animation Name="object_cs_Anim_002930" Offset="0x2930" /> <!-- Original name is "csn_kinobori" ("tree climbing​") -->
-        <Animation Name="object_cs_Anim_0031C4" Offset="0x31C4" /> <!-- Original name is "csn_kyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="object_cs_Anim_00349C" Offset="0x349C" /> <!-- Original name is "csn_odoroku" ("surprise") -->
-        <Animation Name="object_cs_Anim_0036B0" Offset="0x36B0" /> <!-- Original name is "csn_run03" -->
-        <Animation Name="object_cs_Anim_003EE4" Offset="0x3EE4" /> <!-- Original name is "csn_senakamise" ("senaka" = "back (of the body)​", "mise" = "to show; to display​") -->
-        <Animation Name="object_cs_Anim_00433C" Offset="0x433C" /> <!-- Original name is "csn_senakatalk" -->
-        <Animation Name="object_cs_Anim_00478C" Offset="0x478C" /> <!-- Original name is "csn_senakawait" -->
-        <Animation Name="object_cs_Anim_004960" Offset="0x4960" /> <!-- Original name is "csn_shagamu" ("to squat; to crouch​") -->
-        <Animation Name="object_cs_Anim_004C1C" Offset="0x4C1C" /> <!-- Original name is "csn_suwari" ("sitting") -->
-        <Animation Name="object_cs_Anim_005128" Offset="0x5128" /> <!-- Original name is "csn_suwaripiyo" ("piyo" = "weakly moving") -->
-        <Animation Name="object_cs_Anim_0053F4" Offset="0x53F4" /> <!-- Original name is "csn_talk01" -->
-        <Animation Name="object_cs_Anim_0057C8" Offset="0x57C8" /> <!-- Original name is "csn_talk02" -->
-        <Animation Name="object_cs_Anim_005DC4" Offset="0x5DC4" /> <!-- Original name is "csn_talk03" -->
-        <Animation Name="object_cs_Anim_0060E8" Offset="0x60E8" /> <!-- Original name is "csn_tome" -->
-        <Animation Name="gBomberIdleAnim" Offset="0x64B8" /> <!-- Original name is "csn_wait01" -->
-        <DList Name="object_cs_DL_009130" Offset="0x9130" />
-        <DList Name="object_cs_DL_009478" Offset="0x9478" />
-        <DList Name="object_cs_DL_009578" Offset="0x9578" />
-        <DList Name="object_cs_DL_009678" Offset="0x9678" />
-        <DList Name="object_cs_DL_009C50" Offset="0x9C50" />
-        <DList Name="object_cs_DL_009D48" Offset="0x9D48" />
-        <DList Name="object_cs_DL_009E38" Offset="0x9E38" />
-        <DList Name="object_cs_DL_009F80" Offset="0x9F80" />
-        <DList Name="object_cs_DL_00A0C0" Offset="0xA0C0" />
-        <DList Name="object_cs_DL_00A1B8" Offset="0xA1B8" />
-        <DList Name="object_cs_DL_00A2A8" Offset="0xA2A8" />
-        <DList Name="object_cs_DL_00A3F0" Offset="0xA3F0" />
-        <DList Name="object_cs_DL_00A508" Offset="0xA508" />
-        <DList Name="object_cs_DL_00A650" Offset="0xA650" />
-        <DList Name="object_cs_DL_00A7E0" Offset="0xA7E0" />
-        <DList Name="object_cs_DL_00AA58" Offset="0xAA58" />
-        <DList Name="object_cs_DL_00ABA0" Offset="0xABA0" />
-        <DList Name="object_cs_DL_00AD30" Offset="0xAD30" />
-        <Texture Name="object_cs_TLUT_00B020" OutName="tlut_00B020" Format="rgba16" Width="16" Height="16" Offset="0xB020" />
-        <Texture Name="object_cs_TLUT_00B220" OutName="tlut_00B220" Format="rgba16" Width="16" Height="16" Offset="0xB220" />
-        <Texture Name="object_cs_TLUT_00B420" OutName="tlut_00B420" Format="rgba16" Width="16" Height="16" Offset="0xB420" />
-        <Texture Name="object_cs_Tex_00B620" OutName="tex_00B620" Format="ci8" Width="32" Height="16" Offset="0xB620" />
-        <Texture Name="object_cs_Tex_00B820" OutName="tex_00B820" Format="ci8" Width="8" Height="8" Offset="0xB820" />
-        <Texture Name="object_cs_Tex_00B860" OutName="tex_00B860" Format="ci8" Width="8" Height="8" Offset="0xB860" />
-        <Texture Name="object_cs_Tex_00B8A0" OutName="tex_00B8A0" Format="ci8" Width="16" Height="16" Offset="0xB8A0" />
-        <Texture Name="object_cs_Tex_00B9A0" OutName="tex_00B9A0" Format="ci8" Width="8" Height="8" Offset="0xB9A0" />
-        <Texture Name="object_cs_Tex_00B9E0" OutName="tex_00B9E0" Format="ci8" Width="16" Height="16" Offset="0xB9E0" />
-        <Texture Name="object_cs_Tex_00BAE0" OutName="tex_00BAE0" Format="ci8" Width="16" Height="16" Offset="0xBAE0" />
-        <Blob Name="object_cs_Blob_00BBE0" Size="0x400" Offset="0xBBE0" />
-        <Texture Name="object_cs_Tex_00BFE0" OutName="tex_00BFE0" Format="ci8" Width="8" Height="8" Offset="0xBFE0" />
-        <Texture Name="object_cs_Tex_00C020" OutName="tex_00C020" Format="ci8" Width="8" Height="8" Offset="0xC020" />
-        <Texture Name="object_cs_Tex_00C060" OutName="tex_00C060" Format="ci8" Width="8" Height="8" Offset="0xC060" />
-        <Texture Name="object_cs_Tex_00C0A0" OutName="tex_00C0A0" Format="ci8" Width="8" Height="16" Offset="0xC0A0" />
-        <Texture Name="object_cs_Tex_00C120" OutName="tex_00C120" Format="i8" Width="16" Height="16" Offset="0xC120" />
-        <Texture Name="object_cs_Tex_00C220" OutName="tex_00C220" Format="ci8" Width="16" Height="16" Offset="0xC220" />
-        <Blob Name="object_cs_Blob_00C320" Size="0x200" Offset="0xC320" />
-        <Texture Name="object_cs_Tex_00C520" OutName="tex_00C520" Format="rgba16" Width="32" Height="32" Offset="0xC520" />
-        <Texture Name="object_cs_Tex_00CD20" OutName="tex_00CD20" Format="rgba16" Width="32" Height="32" Offset="0xCD20" />
-        <Texture Name="object_cs_Tex_00D520" OutName="tex_00D520" Format="rgba16" Width="32" Height="32" Offset="0xD520" />
-        <Texture Name="object_cs_Tex_00DD20" OutName="tex_00DD20" Format="i8" Width="32" Height="32" Offset="0xDD20" />
-        <Texture Name="object_cs_Tex_00E120" OutName="tex_00E120" Format="i8" Width="16" Height="16" Offset="0xE120" />
-        <Texture Name="object_cs_Tex_00E220" OutName="tex_00E220" Format="i8" Width="32" Height="32" Offset="0xE220"/>
-        <Texture Name="object_cs_Tex_00E620" OutName="tex_00E620" Format="i8" Width="32" Height="32" Offset="0xE620" />
-        <Texture Name="object_cs_Tex_00EA20" OutName="tex_00EA20" Format="i8" Width="32" Height="32" Offset="0xEA20" />
-        <Texture Name="object_cs_Tex_00EE20" OutName="tex_00EE20" Format="i8" Width="32" Height="32" Offset="0xEE20" />
-        <Texture Name="object_cs_Tex_00F220" OutName="tex_00F220" Format="i8" Width="32" Height="32" Offset="0xF220" />
-        <Texture Name="object_cs_Tex_00F620" OutName="tex_00F620" Format="i8" Width="8" Height="8" Offset="0xF620" />
-        <TextureAnimation Name="object_cs_Matanimheader_00F6E4" Offset="0xF6E4" />
-        <Limb Name="object_cs_Standardlimb_00F6EC" Type="Standard" EnumName="OBJECT_CS_LIMB_01" Offset="0xF6EC" />
-        <Limb Name="object_cs_Standardlimb_00F6F8" Type="Standard" EnumName="OBJECT_CS_LIMB_02" Offset="0xF6F8" />
-        <Limb Name="object_cs_Standardlimb_00F704" Type="Standard" EnumName="OBJECT_CS_LIMB_03" Offset="0xF704" />
-        <Limb Name="object_cs_Standardlimb_00F710" Type="Standard" EnumName="OBJECT_CS_LIMB_04" Offset="0xF710" />
-        <Limb Name="object_cs_Standardlimb_00F71C" Type="Standard" EnumName="OBJECT_CS_LIMB_05" Offset="0xF71C" />
-        <Limb Name="object_cs_Standardlimb_00F728" Type="Standard" EnumName="OBJECT_CS_LIMB_06" Offset="0xF728" />
-        <Limb Name="object_cs_Standardlimb_00F734" Type="Standard" EnumName="OBJECT_CS_LIMB_07" Offset="0xF734" />
-        <Limb Name="object_cs_Standardlimb_00F740" Type="Standard" EnumName="OBJECT_CS_LIMB_08" Offset="0xF740" />
-        <Limb Name="object_cs_Standardlimb_00F74C" Type="Standard" EnumName="OBJECT_CS_LIMB_09" Offset="0xF74C" />
-        <Limb Name="object_cs_Standardlimb_00F758" Type="Standard" EnumName="OBJECT_CS_LIMB_0A" Offset="0xF758" />
-        <Limb Name="object_cs_Standardlimb_00F764" Type="Standard" EnumName="OBJECT_CS_LIMB_0B" Offset="0xF764" />
-        <Limb Name="object_cs_Standardlimb_00F770" Type="Standard" EnumName="OBJECT_CS_LIMB_0C" Offset="0xF770" />
-        <Limb Name="object_cs_Standardlimb_00F77C" Type="Standard" EnumName="OBJECT_CS_LIMB_0D" Offset="0xF77C" />
-        <Limb Name="object_cs_Standardlimb_00F788" Type="Standard" EnumName="OBJECT_CS_LIMB_0E" Offset="0xF788" />
-        <Limb Name="object_cs_Standardlimb_00F794" Type="Standard" EnumName="OBJECT_CS_LIMB_0F" Offset="0xF794" />
-        <Limb Name="object_cs_Standardlimb_00F7A0" Type="Standard" EnumName="OBJECT_CS_LIMB_10" Offset="0xF7A0" />
-        <Limb Name="object_cs_Standardlimb_00F7AC" Type="Standard" EnumName="OBJECT_CS_LIMB_11" Offset="0xF7AC" />
-        <Limb Name="object_cs_Standardlimb_00F7B8" Type="Standard" EnumName="OBJECT_CS_LIMB_12" Offset="0xF7B8" />
-        <Limb Name="object_cs_Standardlimb_00F7C4" Type="Standard" EnumName="OBJECT_CS_LIMB_13" Offset="0xF7C4" />
-        <Limb Name="object_cs_Standardlimb_00F7D0" Type="Standard" EnumName="OBJECT_CS_LIMB_14" Offset="0xF7D0" />
-        <Skeleton Name="object_cs_Skel_00F82C" Type="Flex" LimbType="Standard" LimbNone="OBJECT_CS_LIMB_NONE" LimbMax="OBJECT_CS_LIMB_MAX" EnumName="ObjectCsLimb" Offset="0xF82C" />
-        <Animation Name="object_cs_Anim_00FAF4" Offset="0xFAF4" /> <!-- Original name is "csn_wait02" -->
-        <Animation Name="object_cs_Anim_01007C" Offset="0x1007C" /> <!-- Original name is "csn_walk" -->
-        <Animation Name="object_cs_Anim_010B68" Offset="0x10B68" /> <!-- Original name is "csn_yarare" ("to suffer damage") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ctower_rot.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ctower_rot.xml
deleted file mode 100644
index 044443c98..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ctower_rot.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<Root>
-    <!-- Interior clocktower objects including the ceiling cog, rotating corridor, organ, center cog, stone doors, and water wheel  -->
-    <File Name="object_ctower_rot" Segment="6">
-        <!-- TLUTs -->
-        <Texture Name="gClockTowerCeilingCogWoodTLUT" OutName="clocktower_ceiling_cog_wood_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gClockTowerCeilingCogWoodMetalTLUT" OutName="clocktower_ceiling_cog_wood_metal_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20" />
-        <Texture Name="gClockTowerCooridorTLUT" OutName="clocktower_cooridor_tlut" Format="rgba16" Width="16" Height="16" Offset="0x40" />
-        <Texture Name="gClockTowerOrganTLUT" OutName="clocktower_organ_tlut" Format="rgba16" Width="16" Height="16" Offset="0x240" />
-        <Texture Name="gClockTowerStoneDoorTLUT" OutName="clocktower_stone_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x440" />
-
-        <!-- Textures -->
-
-        <!-- CeilingCog -->
-        <Texture Name="gClockTowerCeilingCogWoodTex" OutName="clocktower_ceiling_cog_wood" Format="ci4" Width="64" Height="64" Offset="0x460" />
-        <Texture Name="gClockTowerCeilingCogWoodMetalTex" OutName="clocktower_ceiling_cog_wood_metal" Format="ci4" Width="64" Height="64" Offset="0xC60" />
-        
-        <!-- Corridor -->
-        <Texture Name="gClockTowerCorridorStonePath1Tex" OutName="clocktower_corridor_stone_path_1" Format="ci8" Width="32" Height="32" Offset="0x1460" />
-        <Texture Name="gClockTowerCorridorStonePath2Tex" OutName="clocktower_corridor_stone_path_2" Format="ci8" Width="32" Height="32" Offset="0x1860" />
-        <Texture Name="gClockTowerCorridorStoneWallTex" OutName="clocktower_corridor_stone_wall" Format="ci8" Width="32" Height="64" Offset="0x1C60" />
-        <Texture Name="gClockTowerCorridorGrassyStoneWallTex" OutName="clocktower_corridor_grassy_stone_wall" Format="ci8" Width="32" Height="64" Offset="0x2460" />
-        <Texture Name="gClockTowerCorridorStonePillarTex" OutName="clocktower_corridor_stone_pillar" Format="ci8" Width="32" Height="64" Offset="0x2C60" />
-        <Texture Name="gClockTowerCorridorStoneCeilingTex" OutName="clocktower_corridor_stone_ceiling" Format="ci8" Width="32" Height="64" Offset="0x3460" />
-        <Texture Name="gClockTowerCorridorDirtPathTex" OutName="clocktower_corridor_dirt_path" Format="ci8" Width="32" Height="32" Offset="0x3C60" />
-        <Texture Name="gClockTowerCooridorFoliageTex" OutName="clocktower_corridor_foliage" Format="rgba16" Width="32" Height="64" Offset="0x4060" />
-        <Texture Name="gClockTowerCorridorWoodPillarTex" OutName="clocktower_corridor_wood_pillar" Format="ci8" Width="16" Height="64" Offset="0x5060" />
-        <Texture Name="gClockTowerCorridorWoodWallTex" OutName="clocktower_corridor_wood_wall" Format="ci8" Width="64" Height="32" Offset="0x5460" />
-        <Texture Name="gClockTowerCorridorGrassyCeilingTex" OutName="clocktower_corridor_grassy_ceiling" Format="ci8" Width="8" Height="64" Offset="0x5C60" />
-        <Texture Name="gClockTowerCorridorDirtTex" OutName="clocktower_corridor_dirt" Format="ci8" Width="32" Height="32" Offset="0x5E60" />
-        
-        <!-- Organ -->
-        <Texture Name="gClockTowerOrganBackTex" OutName="clocktower_organ_back" Format="ci8" Width="16" Height="128" Offset="0x6260" />
-        <Texture Name="gClockTowerOrganSeatLegsTex" OutName="clocktower_organ_seat_legs" Format="ia16" Width="32" Height="32" Offset="0x6A60" />
-        <Texture Name="gClockTowerOrganSeatCushionTex" OutName="clocktower_organ_seat_cushion" Format="ci8" Width="16" Height="16" Offset="0x7260" />
-        <Texture Name="gClockTowerOrganSeatBackTex" OutName="clocktower_organ_seat_back" Format="ia16" Width="32" Height="64" Offset="0x7360" />
-        <Texture Name="gClockTowerOrganPedalTex" OutName="clocktower_organ_pedal" Format="ia16" Width="16" Height="16" Offset="0x8360" />
-        <Texture Name="gClockTowerOrganWoodTex" OutName="clocktower_organ_wood" Format="i8" Width="32" Height="32" Offset="0x8560" />
-        <Texture Name="gClockTowerOrganMetalPiece1Tex" OutName="clocktower_organ_metal_piece_1" Format="ia8" Width="64" Height="64" Offset="0x8960" />
-        <Texture Name="gClockTowerOrganMetalPiece2Tex" OutName="clocktower_organ_metal_piece_2" Format="ia8" Width="64" Height="64" Offset="0x9960" />
-        <Texture Name="gClockTowerOrganMetalPiece3Tex" OutName="clocktower_organ_metal_piece_3" Format="ia16" Width="32" Height="32" Offset="0xA960" />
-        <Texture Name="gClockTowerOrganMetalPiece4Tex" OutName="clocktower_organ_metal_piece_4" Format="ia16" Width="32" Height="32" Offset="0xB160" />
-        <Texture Name="gClockTowerOrganMetalPiece5Tex" OutName="clocktower_organ_metal_piece_5" Format="ia16" Width="8" Height="64" Offset="0xB960" />
-        <Texture Name="gClockTowerOrganMetalPiece6Tex" OutName="clocktower_organ_metal_piece_6" Format="ia16" Width="32" Height="32" Offset="0xBD60" />
-        
-        <!-- CenterCog -->
-        <Texture Name="gClockTowerCenterCogBeamTex" OutName="clocktower_center_cog_beam" Format="rgba16" Width="32" Height="32" Offset="0xC560" />
-        <Texture Name="gClockTowerCenterCogTex" OutName="clocktower_center_cog" Format="ia8" Width="64" Height="64" Offset="0xCD60" />
-        
-        <!-- StoneDoors -->
-        <Texture Name="gClockTowerStoneDoorTex" OutName="clocktower_stone_door" Format="ci4" Width="64" Height="64" Offset="0xDD60" />
-        
-        <!-- Waterwheel -->
-        <Texture Name="gClockTowerWaterWheelWoodTex" OutName="clocktower_water_wheel_wood" Format="rgba16" Width="32" Height="32" Offset="0xE560" />
-        <Texture Name="gClockTowerWaterWheelGrassyWoodTex" OutName="clocktower_water_wheel_grassy_wood" Format="rgba16" Width="32" Height="32" Offset="0xED60" />
-        
-        <!-- Organ Pipes -->
-        <Texture Name="gClockTowerOrganPipesThinTex" OutName="clocktower_organ_pipes_thin" Format="ia4" Width="32" Height="32" Offset="0xF560" />
-        <Texture Name="gClockTowerOrganPipesThickTex" OutName="clocktower_organ_pipes_thick" Format="ia4" Width="32" Height="32" Offset="0xF760" />
-
-        <!-- Organ Keys -->
-        <!-- Keys get progressively blurrier-->
-        <Texture Name="gClockTowerOrganKeys1Tex" OutName="clocktower_organ_keys_1" Format="i4" Width="32" Height="16" Offset="0xF960" />
-        <Texture Name="gClockTowerOrganKeys2Tex" OutName="clocktower_organ_keys_2" Format="i4" Width="32" Height="16" Offset="0xFA60" />
-        <Texture Name="gClockTowerOrganKeys3Tex" OutName="clocktower_organ_keys_3" Format="i4" Width="32" Height="16" Offset="0xFB60" />
-        <Texture Name="gClockTowerOrganKeys4Tex" OutName="clocktower_organ_keys_4" Format="i4" Width="32" Height="16" Offset="0xFC60" />
-        
-        <!-- DLists and Collision -->
-
-        <!-- CeilingCog -->
-        <DList Name="gClockTowerEmpty1DL" Offset="0x10820" /> <!-- Original name is "w2_gia_modelT" (probably a mispelling of "gear") -->
-        <DList Name="gClockTowerCeilingCogDL" Offset="0x10828" /> <!-- Original name is "w2_gia_model" -->
-        
-        <!-- Corridor -->
-        <DList Name="gClockTowerCorridorFoliageDL" Offset="0x129D0" />
-        <DList Name="gClockTowerCorridorDL" Offset="0x12DA0" /> <!-- Original name is "w2_hineri_model" ("twist; spin") -->
-        <Collision Name="gClockTowerCorridorCol" Offset="0x142E8" /> <!-- Original name is "w2_hineri_bgdatainfo" -->
-        
-        <!-- Organ -->
-        <DList Name="gClockTowerOrganPipesDL" Offset="0x15F30" /> <!-- Original name is "w2_piano_modelT" -->
-        <DList Name="gClockTowerOrganDL" Offset="0x160A0" /> <!-- Original name is "w2_piano_model" -->
-        <Collision Name="gClockTowerOrganCol" Offset="0x16E70" /> <!-- Original name is "w2_piano_bgdatainfo" -->
-        
-        <!-- CenterCog -->
-        <DList Name="gClockTowerEmpty2DL" Offset="0x17010" /> <!-- Original name is "w2_shaft_modelT" -->
-        <DList Name="gClockTowerCenterCogDL" Offset="0x17018" /> <!-- Original name is "w2_shaft_model" -->
-        
-        <!-- StoneDoorMain -->
-        <DList Name="gClockTowerStoneDoorMainDL" Offset="0x17220" /> <!-- Original name is "w2_shatter_higashi_model" ("higashi" = "east") -->
-        <Collision Name="gClockTowerStoneDoorMainCol" Offset="0x17410" /> <!-- Original name is "w2_shatter_higashi_bgdatainfo" -->
-        
-        <!-- StoneDoor -->
-        <DList Name="gClockTowerStoneDoorDL" Offset="0x174E0" /> <!-- Original name is "w2_shatter_nishi_model" ("nishi" = "west") -->
-        <Collision Name="gClockTowerStoneDoorCol" Offset="0x17650" /> <!-- Original name is "w2_shatter_nishi_bgdatainfo" -->
-        
-        <!-- WaterWheel -->
-        <DList Name="gClockTowerEmpty3DL" Offset="0x18110" /> <!-- Original name is "w2_suisha_modelT" ("water wheel") -->
-        <DList Name="gClockTowerWaterWheelDL" Offset="0x18118" /> <!-- Original name is "w2_suisha_model" -->
-        <Collision Name="gClockTowerWaterWheelCol" Offset="0x18588" /> <!-- Original name is "w2_suisha_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_d_hsblock.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_d_hsblock.xml
deleted file mode 100644
index ee61d0a54..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_d_hsblock.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Assets for the hookshot post -->
-    <File Name="object_d_hsblock" Segment="6">
-        <DList Name="gHookshotPostDL" Offset="0x210" /> <!-- Original name is "field_fshot_model" -->
-        <DList Name="gHookshotTargetDL" Offset="0x470" /> <!-- Original name is "field_fshot2_model" -->
-        <Collision Name="gHookshotTargetCol" Offset="0x578" /> <!-- Original name is "field_fshot2_bgdatainfo" -->
-        <Collision Name="gHookshotPostCol" Offset="0x730" /> <!-- Original name is "field_fshot_bgdatainfo" -->
-        <Texture Name="gHookshotTargetTex" OutName="tex_000760" Format="i4" Width="64" Height="64" Offset="0x760" />
-        <Texture Name="gHookshotPostTex" OutName="tex_000F60" Format="i8" Width="32" Height="64" Offset="0xF60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_d_lift.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_d_lift.xml
deleted file mode 100644
index 868eccd85..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_d_lift.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_d_lift" Segment="6">
-        <DList Name="object_d_lift_DL_000180" Offset="0x180" />
-        <Texture Name="object_d_lift_Tex_000298" OutName="tex_000298" Format="rgba16" Width="32" Height="32" Offset="0x298" />
-        <Collision Name="object_d_lift_Colheader_000BA0" Offset="0xBA0" />
-        <DList Name="gDampeGraveBrownElevatorDL" Offset="0xD10" /> <!-- Original name is "lift_l_model" -->
-        <Collision Name="gDampeGraveBrownElevatorCol" Offset="0xF00" /> <!-- Original name is "lift_l_bgdatainfo" -->
-        <Texture Name="gDampeGraveBrownElevatorSideTex" OutName="brown_elevator_side" Format="i8" Width="64" Height="16" Offset="0xF30" />
-        <Texture Name="gDampeGraveBrownElevatorTopBottomTex" OutName="brown_elevator_top_bottom" Format="i8" Width="64" Height="64" Offset="0x1330" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dai.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dai.xml
deleted file mode 100644
index 927e3f1e1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dai.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<Root>
-    <File Name="object_dai" Segment="6">
-        <Texture Name="object_dai_Tex_000000" OutName="tex_000000" Format="i4" Width="32" Height="32" Offset="0x0" />
-        <DList Name="object_dai_DL_000230" Offset="0x230" />
-        <DList Name="object_dai_DL_0002E8" Offset="0x2E8" /> <!-- Original name is "dai_ball_modelT" -->
-        <Animation Name="object_dai_Anim_000CEC" Offset="0xCEC" /> <!-- Original name is "dg_haku" ("to breathe out​") -->
-        <Animation Name="object_dai_Anim_0010F8" Offset="0x10F8" /> <!-- Original name is "dg_iare" ("are" = "huh?; eh?"") -->
-        <Animation Name="object_dai_Anim_0014BC" Offset="0x14BC" /> <!-- Original name is "dg_iareend" -->
-        <Animation Name="object_dai_Anim_001E44" Offset="0x1E44" /> <!-- Original name is "dg_iareloop" -->
-        <Animation Name="object_dai_Anim_002E58" Offset="0x2E58" /> <!-- Original name is "dg_inemuri" ("nemuri" = "to fall asleep") -->
-        <Animation Name="object_dai_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "dg_isuwaru" ("suwari" = "to sit" )-->
-        <Animation Name="object_dai_Anim_0040E0" Offset="0x40E0" /> <!-- Original name is "dg_isuwaruloop" -->
-        <Animation Name="object_dai_Anim_0048B4" Offset="0x48B4" /> <!-- Original name is "dg_iwait" -->
-        <Animation Name="object_dai_Anim_005100" Offset="0x5100" /> <!-- Original name is "dg_iwalk" -->
-        <Animation Name="object_dai_Anim_00563C" Offset="0x563C" /> <!-- Original name is "dg_korogeoti" ("to fall off; to tumble down​") -->
-        <Animation Name="object_dai_Anim_006590" Offset="0x6590" /> <!-- Original name is "dg_marumari" ("to roll into a ball") -->
-        <Animation Name="object_dai_Anim_0069DC" Offset="0x69DC" /> <!-- Original name is "dg_modoru" ("to return; to go back​") -->
-        <Animation Name="object_dai_Anim_007354" Offset="0x7354" /> <!-- Original name is "dg_tame" ("to amass; to accumulate; to store​") -->
-        <Animation Name="object_dai_Anim_0079E4" Offset="0x79E4" /> <!-- Original name is "dg_wait" -->
-        <DList Name="object_dai_DL_008710" Offset="0x8710" />
-        <DList Name="object_dai_DL_0087B8" Offset="0x87B8" />
-        <DList Name="object_dai_DL_0089D8" Offset="0x89D8" />
-        <DList Name="object_dai_DL_008B00" Offset="0x8B00" />
-        <Texture Name="object_dai_TLUT_008C58" OutName="tlut_008C58" Format="rgba16" Width="16" Height="16" Offset="0x8C58" />
-        <Texture Name="object_dai_Tex_008E58" OutName="tex_008E58" Format="ci8" Width="32" Height="32" Offset="0x8E58" />
-        <Texture Name="object_dai_Tex_009258" OutName="tex_009258" Format="ci8" Width="8" Height="8" Offset="0x9258" />
-        <Texture Name="object_dai_Tex_009298" OutName="tex_009298" Format="ci8" Width="32" Height="16" Offset="0x9298" />
-        <Texture Name="object_dai_Tex_009498" OutName="tex_009498" Format="rgba16" Width="16" Height="16" Offset="0x9498" />
-        <Texture Name="object_dai_Tex_009698" OutName="tex_009698" Format="ci8" Width="8" Height="8" Offset="0x9698" />
-        <DList Name="object_dai_DL_00C538" Offset="0xC538" />
-        <DList Name="object_dai_DL_00C5D8" Offset="0xC5D8" />
-        <DList Name="object_dai_DL_00C9B8" Offset="0xC9B8" />
-        <DList Name="object_dai_DL_00D068" Offset="0xD068" />
-        <DList Name="object_dai_DL_00D400" Offset="0xD400" />
-        <DList Name="object_dai_DL_00D588" Offset="0xD588" />
-        <DList Name="object_dai_DL_00D6C0" Offset="0xD6C0" />
-        <DList Name="object_dai_DL_00D948" Offset="0xD948" />
-        <DList Name="object_dai_DL_00DAD0" Offset="0xDAD0" />
-        <DList Name="object_dai_DL_00DC08" Offset="0xDC08" />
-        <DList Name="object_dai_DL_00DE18" Offset="0xDE18" />
-        <DList Name="object_dai_DL_00DF78" Offset="0xDF78" />
-        <DList Name="object_dai_DL_00E068" Offset="0xE068" />
-        <DList Name="object_dai_DL_00E1A0" Offset="0xE1A0" />
-        <DList Name="object_dai_DL_00E470" Offset="0xE470" />
-        <DList Name="object_dai_DL_00E560" Offset="0xE560" />
-        <DList Name="object_dai_DL_00E698" Offset="0xE698" />
-        <Texture Name="object_dai_TLUT_00E8F0" OutName="tlut_00E8F0" Format="rgba16" Width="16" Height="16" Offset="0xE8F0" />
-        <Texture Name="object_dai_Tex_00EAF0" OutName="tex_00EAF0" Format="ci8" Width="16" Height="16" Offset="0xEAF0" />
-        <Texture Name="object_dai_Tex_00EBF0" OutName="tex_00EBF0" Format="ci8" Width="16" Height="16" Offset="0xEBF0" />
-        <Texture Name="object_dai_Tex_00ECF0" OutName="tex_00ECF0" Format="ci8" Width="32" Height="32" Offset="0xECF0" />
-        <Texture Name="object_dai_Tex_00F0F0" OutName="tex_00F0F0" Format="ci8" Width="32" Height="16" Offset="0xF0F0" />
-        <Texture Name="object_dai_Tex_00F2F0" OutName="tex_00F2F0" Format="ci8" Width="32" Height="32" Offset="0xF2F0" />
-        <Texture Name="object_dai_Tex_00F6F0" OutName="tex_00F6F0" Format="ci8" Width="8" Height="8" Offset="0xF6F0" />
-        <Texture Name="object_dai_Tex_00F730" OutName="tex_00F730" Format="ci8" Width="8" Height="16" Offset="0xF730" />
-        <Texture Name="object_dai_Tex_00F7B0" OutName="tex_00F7B0" Format="ci8" Width="32" Height="64" Offset="0xF7B0" />
-        <Texture Name="object_dai_Tex_00FFB0" OutName="tex_00FFB0" Format="ci8" Width="16" Height="16" Offset="0xFFB0" />
-        <Texture Name="object_dai_Tex_0100B0" OutName="tex_0100B0" Format="rgba16" Width="8" Height="8" Offset="0x100B0" />
-        <Texture Name="object_dai_Tex_010130" OutName="tex_010130" Format="rgba16" Width="16" Height="16" Offset="0x10130" />
-        <Texture Name="object_dai_Tex_010330" OutName="tex_010330" Format="rgba16" Width="8" Height="8" Offset="0x10330" />
-        <Texture Name="object_dai_Tex_0103B0" OutName="tex_0103B0" Format="rgba16" Width="32" Height="16" Offset="0x103B0" />
-        <Texture Name="object_dai_Tex_0107B0" OutName="tex_0107B0" Format="rgba16" Width="32" Height="32" Offset="0x107B0" />
-        <Texture Name="object_dai_Tex_010FB0" OutName="tex_010FB0" Format="rgba16" Width="32" Height="32" Offset="0x10FB0" />
-        <Texture Name="object_dai_Tex_0117B0" OutName="tex_0117B0" Format="rgba16" Width="32" Height="32" Offset="0x117B0" />
-        <Texture Name="object_dai_Tex_011FB0" OutName="tex_011FB0" Format="rgba16" Width="32" Height="32" Offset="0x11FB0" />
-        <Texture Name="object_dai_Tex_0127B0" OutName="tex_0127B0" Format="rgba16" Width="32" Height="32" Offset="0x127B0" />
-        <Limb Name="object_dai_Standardlimb_012FB0" Type="Standard" EnumName="OBJECT_DAI_LIMB_01" Offset="0x12FB0" />
-        <Limb Name="object_dai_Standardlimb_012FBC" Type="Standard" EnumName="OBJECT_DAI_LIMB_02" Offset="0x12FBC" />
-        <Limb Name="object_dai_Standardlimb_012FC8" Type="Standard" EnumName="OBJECT_DAI_LIMB_03" Offset="0x12FC8" />
-        <Limb Name="object_dai_Standardlimb_012FD4" Type="Standard" EnumName="OBJECT_DAI_LIMB_04" Offset="0x12FD4" />
-        <Limb Name="object_dai_Standardlimb_012FE0" Type="Standard" EnumName="OBJECT_DAI_LIMB_05" Offset="0x12FE0" />
-        <Limb Name="object_dai_Standardlimb_012FEC" Type="Standard" EnumName="OBJECT_DAI_LIMB_06" Offset="0x12FEC" />
-        <Limb Name="object_dai_Standardlimb_012FF8" Type="Standard" EnumName="OBJECT_DAI_LIMB_07" Offset="0x12FF8" />
-        <Limb Name="object_dai_Standardlimb_013004" Type="Standard" EnumName="OBJECT_DAI_LIMB_08" Offset="0x13004" />
-        <Limb Name="object_dai_Standardlimb_013010" Type="Standard" EnumName="OBJECT_DAI_LIMB_09" Offset="0x13010" />
-        <Limb Name="object_dai_Standardlimb_01301C" Type="Standard" EnumName="OBJECT_DAI_LIMB_0A" Offset="0x1301C" />
-        <Limb Name="object_dai_Standardlimb_013028" Type="Standard" EnumName="OBJECT_DAI_LIMB_0B" Offset="0x13028" />
-        <Limb Name="object_dai_Standardlimb_013034" Type="Standard" EnumName="OBJECT_DAI_LIMB_0C" Offset="0x13034" />
-        <Limb Name="object_dai_Standardlimb_013040" Type="Standard" EnumName="OBJECT_DAI_LIMB_0D" Offset="0x13040" />
-        <Limb Name="object_dai_Standardlimb_01304C" Type="Standard" EnumName="OBJECT_DAI_LIMB_0E" Offset="0x1304C" />
-        <Limb Name="object_dai_Standardlimb_013058" Type="Standard" EnumName="OBJECT_DAI_LIMB_0F" Offset="0x13058" />
-        <Limb Name="object_dai_Standardlimb_013064" Type="Standard" EnumName="OBJECT_DAI_LIMB_10" Offset="0x13064" />
-        <Limb Name="object_dai_Standardlimb_013070" Type="Standard" EnumName="OBJECT_DAI_LIMB_11" Offset="0x13070" />
-        <Limb Name="object_dai_Standardlimb_01307C" Type="Standard" EnumName="OBJECT_DAI_LIMB_12" Offset="0x1307C" />
-        <Skeleton Name="object_dai_Skel_0130D0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DAI_LIMB_NONE" LimbMax="OBJECT_DAI_LIMB_MAX" EnumName="ObjectDaiLimb" Offset="0x130D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_daiku.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_daiku.xml
deleted file mode 100644
index 0152a6e7d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_daiku.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<Root>
-    <File Name="object_daiku" Segment="6">
-        <Animation Name="object_daiku_Anim_000600" Offset="0x600" /> <!-- Original name is "dk2_hanasi" ("talk") -->
-        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44" /> <!-- Original name is "dk2_hashiru" ("to run​") -->
-        <Animation Name="object_daiku_Anim_001114" Offset="0x1114" /> <!-- Original name is "dk2_katugi" ("to carry") -->
-        <Animation Name="object_daiku_Anim_001A24" Offset="0x1A24" /> <!-- Original name is "dk2_kowasu" ("to break; to destroy; to demolish​") -->
-        <Animation Name="object_daiku_Anim_002134" Offset="0x2134" /> <!-- Original name is "dk2_kowasu2wait" -->
-        <Animation Name="object_daiku_Anim_002FA0" Offset="0x2FA0" /> <!-- Original name is "dk2_matsu" ("to wait​") -->
-        <Texture Name="object_daiku_TLUT_002FB0" OutName="tlut_002FB0" Format="rgba16" Width="16" Height="16" Offset="0x2FB0" />
-        <Texture Name="object_daiku_Tex_0031B0" OutName="tex_0031B0" Format="ci8" Width="8" Height="8" Offset="0x31B0" />
-        <Texture Name="object_daiku_Tex_0031F0" OutName="tex_0031F0" Format="ci8" Width="16" Height="16" Offset="0x31F0" />
-        <Texture Name="object_daiku_Tex_0032F0" OutName="tex_0032F0" Format="rgba16" Width="4" Height="4" Offset="0x32F0" />
-        <Texture Name="object_daiku_Tex_003310" OutName="tex_003310" Format="ci8" Width="8" Height="16" Offset="0x3310" />
-        <Texture Name="object_daiku_Tex_003390" OutName="tex_003390" Format="ci8" Width="8" Height="8" Offset="0x3390" />
-        <Texture Name="object_daiku_Tex_0033D0" OutName="tex_0033D0" Format="ci8" Width="16" Height="16" Offset="0x33D0" />
-        <Texture Name="object_daiku_Tex_0034D0" OutName="tex_0034D0" Format="ci8" Width="8" Height="8" Offset="0x34D0" />
-        <Texture Name="object_daiku_Tex_003510" OutName="tex_003510" Format="rgba16" Width="32" Height="32" Offset="0x3510" />
-        <Texture Name="object_daiku_Tex_003D10" OutName="tex_003D10" Format="ci8" Width="16" Height="16" Offset="0x3D10" />
-        <Texture Name="object_daiku_Tex_003E10" OutName="tex_003E10" Format="ci8" Width="8" Height="8" Offset="0x3E10" />
-        <Texture Name="object_daiku_Tex_003E50" OutName="tex_003E50" Format="ci8" Width="8" Height="8" Offset="0x3E50" />
-        <Texture Name="object_daiku_Tex_003E90" OutName="tex_003E90" Format="ci8" Width="8" Height="8" Offset="0x3E90" />
-        <DList Name="object_daiku_DL_006980" Offset="0x6980" />
-        <DList Name="object_daiku_DL_006D70" Offset="0x6D70" />
-        <DList Name="object_daiku_DL_006E80" Offset="0x6E80" />
-        <DList Name="object_daiku_DL_006FB0" Offset="0x6FB0" />
-        <DList Name="object_daiku_DL_0070C0" Offset="0x70C0" />
-        <DList Name="object_daiku_DL_0071E0" Offset="0x71E0" />
-        <DList Name="object_daiku_DL_007700" Offset="0x7700" />
-        <DList Name="object_daiku_DL_007A10" Offset="0x7A10" />
-        <DList Name="object_daiku_DL_007B40" Offset="0x7B40" />
-        <DList Name="object_daiku_DL_007C70" Offset="0x7C70" />
-        <DList Name="object_daiku_DL_007DE0" Offset="0x7DE0" />
-        <DList Name="object_daiku_DL_007F10" Offset="0x7F10" />
-        <DList Name="object_daiku_DL_008040" Offset="0x8040" />
-        <DList Name="object_daiku_DL_0081B0" Offset="0x81B0" />
-        <DList Name="object_daiku_DL_0083A0" Offset="0x83A0" />
-        <DList Name="object_daiku_DL_008648" Offset="0x8648" />
-        <DList Name="object_daiku_DL_008758" Offset="0x8758" />
-        <DList Name="object_daiku_DL_008870" Offset="0x8870" />
-        <DList Name="object_daiku_DL_008B20" Offset="0x8B20" />
-        <DList Name="object_daiku_DL_008C30" Offset="0x8C30" />
-        <DList Name="object_daiku_DL_008EC8" Offset="0x8EC8" /> <!-- Original name is "dk2_hashira_model" -->
-        <Texture Name="object_daiku_TLUT_008FA8" OutName="tlut_008FA8" Format="rgba16" Width="16" Height="16" Offset="0x8FA8" />
-        <Texture Name="object_daiku_Tex_0091A8" OutName="tex_0091A8" Format="ci8" Width="16" Height="16" Offset="0x91A8" />
-        <DList Name="object_daiku_DL_009638" Offset="0x9638" /> <!-- Original name is "dk2_2_turuhashi_model" -->
-        <Texture Name="object_daiku_TLUT_0097B0" OutName="tlut_0097B0" Format="rgba16" Width="16" Height="16" Offset="0x97B0" />
-        <Texture Name="object_daiku_Tex_0099B0" OutName="tex_0099B0" Format="i8" Width="32" Height="32" Offset="0x99B0" />
-        <Texture Name="object_daiku_Tex_009DB0" OutName="tex_009DB0" Format="ci8" Width="16" Height="16" Offset="0x9DB0" />
-        <DList Name="object_daiku_DL_00A390" Offset="0xA390" />
-        <Texture Name="object_daiku_TLUT_00A4D0" OutName="tlut_00A4D0" Format="rgba16" Width="16" Height="16" Offset="0xA4D0" />
-        <Texture Name="object_daiku_Tex_00A6D0" OutName="tex_00A6D0" Format="ci8" Width="8" Height="16" Offset="0xA6D0" />
-        <Limb Name="object_daiku_Standardlimb_00A750" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_01" Offset="0xA750" />
-        <Limb Name="object_daiku_Standardlimb_00A75C" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_02" Offset="0xA75C" />
-        <Limb Name="object_daiku_Standardlimb_00A768" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_03" Offset="0xA768" />
-        <Limb Name="object_daiku_Standardlimb_00A774" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_04" Offset="0xA774" />
-        <Limb Name="object_daiku_Standardlimb_00A780" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_05" Offset="0xA780" />
-        <Limb Name="object_daiku_Standardlimb_00A78C" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_06" Offset="0xA78C" />
-        <Limb Name="object_daiku_Standardlimb_00A798" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_07" Offset="0xA798" />
-        <Limb Name="object_daiku_Standardlimb_00A7A4" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_08" Offset="0xA7A4" />
-        <Limb Name="object_daiku_Standardlimb_00A7B0" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_09" Offset="0xA7B0" />
-        <Limb Name="object_daiku_Standardlimb_00A7BC" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0A" Offset="0xA7BC" />
-        <Limb Name="object_daiku_Standardlimb_00A7C8" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0B" Offset="0xA7C8" />
-        <Limb Name="object_daiku_Standardlimb_00A7D4" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0C" Offset="0xA7D4" />
-        <Limb Name="object_daiku_Standardlimb_00A7E0" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0D" Offset="0xA7E0" />
-        <Limb Name="object_daiku_Standardlimb_00A7EC" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0E" Offset="0xA7EC" />
-        <Limb Name="object_daiku_Standardlimb_00A7F8" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0F" Offset="0xA7F8" />
-        <Limb Name="object_daiku_Standardlimb_00A804" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_10" Offset="0xA804" />
-        <Skeleton Name="object_daiku_Skel_00A850" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DAIKU_LIMB_NONE" LimbMax="OBJECT_DAIKU_LIMB_MAX" EnumName="ObjectDaikuLimb" Offset="0xA850" />
-        <Animation Name="object_daiku_Anim_00ACD0" Offset="0xACD0" /> <!-- Original name is "dk2_roya" -->
-        <Animation Name="object_daiku_Anim_00B690" Offset="0xB690" /> <!-- Original name is "dk2_shiji" (perhaps "instructions; directions​"?) -->
-        <Animation Name="object_daiku_Anim_00BEAC" Offset="0xBEAC" /> <!-- Original name is "dk2_shiji02" -->
-        <Animation Name="object_daiku_Anim_00C234" Offset="0xC234" /> <!-- Original name is "dk2_suwari" ("sitting") -->
-        <Animation Name="object_daiku_Anim_00C92C" Offset="0xC92C" /> <!-- Original name is "dk2_tasuke" ("to save; to rescue​") -->
-        <Animation Name="object_daiku_Anim_00D328" Offset="0xD328" /> <!-- Original name is "dk2_turuwait" ("turu" = "to hang; to suspend; to sling") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_danpei_object.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_danpei_object.xml
deleted file mode 100644
index 8e86f2f79..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_danpei_object.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <File Name="object_danpei_object" Segment="6">
-        <DList Name="object_danpei_object_DL_000300" Offset="0x300" />
-        <Texture Name="object_danpei_object_TLUT_000438" OutName="tlut_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" />
-        <Texture Name="object_danpei_object_Tex_000458" OutName="tex_000458" Format="ci4" Width="64" Height="64" Offset="0x458" />
-        <Collision Name="object_danpei_object_Colheader_000D60" Offset="0xD60" /> <!-- Original name is "y2_kanokefuta_bgdatainfo" -->
-        <DList Name="object_danpei_object_DL_0012C0" Offset="0x12C0" /> <!-- Original name is "Y2_DP2_RASENsita_model" ("rasen" = "spiral", "sita" = "below") -->
-        <DList Name="object_danpei_object_DL_002110" Offset="0x2110" /> <!-- Original name is "Y2_DP2_RASENue_model" ("ue" = "above") -->
-        <Texture Name="object_danpei_object_TLUT_002B10" OutName="tlut_002B10" Format="rgba16" Width="16" Height="16" Offset="0x2B10" />
-        <Texture Name="object_danpei_object_Tex_002D10" OutName="tex_002D10" Format="ci8" Width="32" Height="64" Offset="0x2D10" />
-        <Texture Name="object_danpei_object_Tex_003510" OutName="tex_003510" Format="ci8" Width="32" Height="32" Offset="0x3510" />
-        <Texture Name="object_danpei_object_Tex_003910" OutName="tex_003910" Format="ci8" Width="32" Height="32" Offset="0x3910" />
-        <Texture Name="object_danpei_object_Tex_003D10" OutName="tex_003D10" Format="ci8" Width="16" Height="16" Offset="0x3D10" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dblue_object.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dblue_object.xml
deleted file mode 100644
index 63d28bd33..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dblue_object.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<Root>
-    <!-- Assets for interactive elements in Great Bay Temple, i.e., waterwheels, seesaws, whirlpools, waterfalls, doors, etc. -->
-    <File Name="object_dblue_object" Segment="6">
-        <!-- DisplayLists and Collision for the elevator platforms. -->
-        <DList Name="gGreatBayTempleObjectElevatorEmptyDL" Offset="0x2C0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectElevatorDL" Offset="0x2C8" /> <!-- Original name is "m2_KON_ELE_model" -->
-        <Collision Name="gGreatBayTempleObjectElevatorCol" Offset="0x5C4" /> <!-- Original name is "m2_KON_ELE_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the rotating waterwheel with two platforms. -->
-        <DList Name="gGreatBayTempleObjectWaterwheelWithPlatformsEmptyDL" Offset="0x1E60" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectWaterwheelWithPlatformsDL" Offset="0x1E68" /> <!-- Original name is "m2_KON_GEAR09_model" -->
-        <Collision Name="gGreatBayTempleObjectWaterwheelWithPlatformsCol" Offset="0x2E78" /> <!-- Original name is "m2_KON_GEAR09_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the ice stalactites that can be thawed with Fire Arrows.  -->
-        <DList Name="gGreatBayTempleObjectIceStalactiteRimDL" Offset="0x3250" />
-        <DList Name="gGreatBayTempleObjectIceStalactiteDL" Offset="0x3358" /> <!-- Original name is "m2_KON_ICE_model" -->
-        <Collision Name="gGreatBayTempleObjectIceStalactiteCol" Offset="0x3540" /> <!-- Unused. Original name is "m2_KON_ICE_bgdatainfo" -->
-
-        <!-- DisplayLists for the frozen version of the waterfall that briefly appears when you hit it with an Ice Arrow. -->
-        <DList Name="gGreatBayTempleObjectFrozenWaterfallDL" Offset="0x3770" />
-        <DList Name="gGreatBayTempleObjectFrozenWaterfallEmptyDL" Offset="0x38D0" /> <!-- Probably was the opaque component for the above DL -->
-
-        <!-- DisplayLists and Collision for the rotating gear shaft, both with and without two platforms. -->
-        <DList Name="gGreatBayTempleObjectGearShaftWithPlatformsEmptyDL" Offset="0x4840" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectGearShaftWithPlatformsDL" Offset="0x4848" /> <!-- Original name is "m2_KON_Screw_model" -->
-        <DList Name="gGreatBayTempleObjectGearShaftEmptyDL" Offset="0x52B0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectGearShaftDL" Offset="0x52B8" /> <!-- Original name is "m2_KON_ScrewFor8_model" -->
-        <Collision Name="gGreatBayTempleObjectGearShaftWithPlatformsCol" Offset="0x5D28" /> <!-- Original name is "m2_KON_Screw_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the switches that can be pushed or pulled. -->
-        <DList Name="gGreatBayTempleObjectOneWaySwitchEmptyDL" Offset="0x61B0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectOneWaySwitchDL" Offset="0x61B8" /> <!-- Original name is "m2_KON_Sen_model" (perhaps "tap; faucet") -->
-        <DList Name="gGreatBayTempleObjectTwoWaySwitchEmptyDL" Offset="0x69D0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectTwoWaySwitchDL" Offset="0x69D8" /> <!-- Original name is "m2_KON_SenP2_model" -->
-        <Collision Name="gGreatBayTempleObjectTwoWaySwitchCol" Offset="0x6EA8" /> <!-- Original name is "m2_KON_SenP2_bgdatainfo" -->
-        <Collision Name="gGreatBayTempleObjectOneWaySwitchCol" Offset="0x714C" /> <!-- Original name is "m2_KON_Sen_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the giant waterwheel near the start of the dungeon. -->
-        <DList Name="gGreatBayTempleObjectWaterwheelEmptyDL" Offset="0x8770" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectWaterwheelDL" Offset="0x8778" /> <!-- Original name is "m2_KON_SuisyaFor0_model" ("waterwheel") -->
-        <DList Name="gGreatBayTempleObjectWaterwheelWithFakeGearEmptyDL" Offset="0xA520" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectWaterwheelWithFakeGearDL" Offset="0xA528" /> <!-- Original name is "m2_KON_SuisyaFor8_model" -->
-        <Collision Name="gGreatBayTempleObjectWaterwheelCol" Offset="0xAED0" /> <!-- Original name is "m2_KON_SuisyaFor8_bgdatainfo" -->
-
-        <!-- DisplayLists and TextureAnimation for the waterfalls that can be frozen with Ice Arrows. -->
-        <DList Name="gGreatBayTempleObjectWaterfallDL" Offset="0xB280" /> <!-- Original name is "m2_KON_TAKI_modelT" ("waterfall​") -->
-        <DList Name="gGreatBayTempleObjectWaterfallEmptyDL" Offset="0xB430" /> <!-- Probably was the opaque component for the above DL -->
-        <TextureAnimation Name="gGreatBayTempleObjectWaterfallTexAnim" Offset="0xB448" />
-
-        <!-- DisplayLists and Collision for the "shaft" of the seesaw, i.e., the bar that connects the two platforms. -->
-        <DList Name="gGreatBayTempleObjectSeesawShaftEmptyDL" Offset="0xB8F0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectSeesawShaftDL" Offset="0xB8F8" /> <!-- Original name is "m2_KON_TENBIN_model" ("(balance) scales​") -->
-        <Collision Name="gGreatBayTempleObjectSeesawShaftCol" Offset="0xBC08" /> <!-- Original name is "m2_KON_TENBIN_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the large seesaw platform. -->
-        <DList Name="gGreatBayTempleObjectLargeSeesawPlatformEmptyDL" Offset="0xBF40" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectLargeSeesawPlatformDL" Offset="0xBF48" /> <!-- Original name is "m2_KON_TENBINstepBIG_model" -->
-        <Collision Name="gGreatBayTempleObjectLargeSeesawPlatformCol" Offset="0xC180" /> <!-- Original name is "m2_KON_TENBINstepBIG_bgdatainfo" -->
-
-        <!-- DisplayLists and Collision for the small seesaw platform. -->
-        <DList Name="gGreatBayTempleObjectSmallSeesawPlatformEmptyDL" Offset="0xC4B0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gGreatBayTempleObjectSmallSeesawPlatformDL" Offset="0xC4B8" /> <!-- Original name is "m2_KON_TENBINstepSML_model" -->
-        <Collision Name="gGreatBayTempleObjectSmallSeesawPlatformCol" Offset="0xC700" /> <!-- Original name is "m2_KON_TENBINstepSML_bgdatainfo" -->
-
-        <!-- DisplayLists and TextureAnimation for the large whirlpool at the bottom of the main room. -->
-        <DList Name="gGreatBayTempleObjectWhirlpoolDL" Offset="0xCAA0" /> <!-- Original name is "m2_KON_UZUdis_modelT" ("whirlpool; swirl") -->
-        <DList Name="gGreatBayTempleObjectWhirlpoolEmptyDL" Offset="0xCC08" /> <!-- Probably was the opaque component for the above DL -->
-        <TextureAnimation Name="gGreatBayTempleObjectWhirlpoolTexAnim" Offset="0xCC18" />
-
-        <!-- DisplayLists and TextureAnimation for the splashing effect created when water hits a waterwheel. -->
-        <DList Name="gGreatBayTempleObjectWaterwheelSplashDL" Offset="0xCD10" /> <!-- Original name is "m2_KON_sibukiG_modelT" (probably "splash" + GEAR) -->
-        <DList Name="gGreatBayTempleObjectWaterwheelSplashEmptyDL" Offset="0xCDD8" /> <!-- Probably was the opaque component for the above DL -->
-        <TextureAnimation Name="gGreatBayTempleObjectWaterwheelSplashTexAnim" Offset="0xCE00" />
-        
-        <!-- DisplayLists and TextureAnimation for the splashing effect created when water hits a seesaw platform. -->
-        <DList Name="gGreatBayTempleObjectSeesawSplashDL" Offset="0xD110" /> <!-- Original name is "m2_KON_sibukiT_modelT" (probably "splash" + TENBIN) -->
-        <DList Name="gGreatBayTempleObjectSeesawSplashEmptyDL" Offset="0xD220" /> <!-- Probably was the opaque component for the above DL -->
-        <TextureAnimation Name="gGreatBayTempleObjectSeesawSplashTexAnim" Offset="0xD250" />
-
-        <Collision Name="gGreatBayTempleObjectUnusedCol" Offset="0xD3DC" /> <!-- Original name is probably "m2_SEAuzuuzu2_bgdatainfo" ("itching to do something; impatient") -->
-
-        <!-- Textures for all the Great Bay Temple objects. -->
-        <Texture Name="gGreatBayTempleObjectOneWaySwitchTLUT" OutName="great_bay_temple_object_one_way_switch_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD410" />
-        <Texture Name="gGreatBayTempleObjectUnused1TLUT" OutName="great_bay_temple_object_unused_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0xD430" />
-        <Texture Name="gGreatBayTempleObjectUnused2TLUT" OutName="great_bay_temple_object_unused_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xD450" />
-        <Texture Name="gGreatBayTempleObjectUnused3TLUT" OutName="great_bay_temple_object_unused_tlut_3" Format="rgba16" Width="4" Height="4" Offset="0xD470" />
-        <Texture Name="gGreatBayTempleObjectUnused4TLUT" OutName="great_bay_temple_object_unused_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0xD490" />
-        <Texture Name="gGreatBayTempleObjectUnused5TLUT" OutName="great_bay_temple_object_unused_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xD4B0" />
-        <Texture Name="gGreatBayTempleObjectUnused6TLUT" OutName="great_bay_temple_object_unused_tlut_6" Format="rgba16" Width="4" Height="4" Offset="0xD4D0" />
-        <Texture Name="gGreatBayTempleObjectUnused7TLUT" OutName="great_bay_temple_object_unused_tlut_7" Format="rgba16" Width="4" Height="4" Offset="0xD4F0" />
-        <Texture Name="gGreatBayTempleObjectUnused8TLUT" OutName="great_bay_temple_object_unused_tlut_8" Format="rgba16" Width="4" Height="4" Offset="0xD510" />
-        <Texture Name="gGreatBayTempleObjectUnusedGearTLUT" OutName="great_bay_temple_object_unused_gear_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD530" />
-        <Texture Name="gGreatBayTempleObjectUnused9TLUT" OutName="great_bay_temple_object_unused_tlut_9" Format="rgba16" Width="4" Height="4" Offset="0xD550" />
-        <Texture Name="gGreatBayTempleObjectUnused10TLUT" OutName="great_bay_temple_object_unused_tlut_10" Format="rgba16" Width="4" Height="4" Offset="0xD570" />
-        <Texture Name="gGreatBayTempleObjectUnused11TLUT" OutName="great_bay_temple_object_unused_tlut_11" Format="rgba16" Width="4" Height="4" Offset="0xD590" />
-        <Texture Name="gGreatBayTempleObjectUnused12TLUT" OutName="great_bay_temple_object_unused_tlut_12" Format="rgba16" Width="4" Height="4" Offset="0xD5B0" />
-        <Texture Name="gGreatBayTempleObjectUnused13TLUT" OutName="great_bay_temple_object_unused_tlut_13" Format="rgba16" Width="4" Height="4" Offset="0xD5D0" />
-        <Texture Name="gGreatBayTempleObjectUnused14TLUT" OutName="great_bay_temple_object_unused_tlut_14" Format="rgba16" Width="4" Height="4" Offset="0xD5F0" />
-        <Texture Name="gGreatBayTempleObjectUnused15TLUT" OutName="great_bay_temple_object_unused_tlut_15" Format="rgba16" Width="4" Height="4" Offset="0xD610" />
-        <Texture Name="gGreatBayTempleObjectUnusedDarkMetalTLUT" OutName="great_bay_temple_object_unused_dark_metal_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD630" />
-        <Texture Name="gGreatBayTempleObjectUnused16TLUT" OutName="great_bay_temple_object_unused_tlut_16" Format="rgba16" Width="4" Height="4" Offset="0xD650" />
-        <Texture Name="gGreatBayTempleObjectUnusedPaddleTLUT" OutName="great_bay_temple_object_unused_paddle_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD670" /> 
-        <Texture Name="gGreatBayTempleObjectUnused17TLUT" OutName="great_bay_temple_object_unused_tlut_17" Format="rgba16" Width="4" Height="4" Offset="0xD690" /> 
-        <Texture Name="gGreatBayTempleObjectUnused18TLUT" OutName="great_bay_temple_object_unused_tlut_18" Format="rgba16" Width="4" Height="4" Offset="0xD6B0" />
-        <Texture Name="gGreatBayTempleObjectUnused19TLUT" OutName="great_bay_temple_object_unused_tlut_19" Format="rgba16" Width="4" Height="4" Offset="0xD6D0" />
-        <Texture Name="gGreatBayTempleObjectUnused20TLUT" OutName="great_bay_temple_object_unused_tlut_20" Format="rgba16" Width="4" Height="4" Offset="0xD6F0" /> 
-        <Texture Name="gGreatBayTempleObjectUnused21TLUT" OutName="great_bay_temple_object_unused_tlut_21" Format="rgba16" Width="4" Height="4" Offset="0xD710" /> 
-        <Texture Name="gGreatBayTempleObjectUnused22TLUT" OutName="great_bay_temple_object_unused_tlut_22" Format="rgba16" Width="4" Height="4" Offset="0xD730" /> 
-        <Texture Name="gGreatBayTempleObjectUnused23TLUT" OutName="great_bay_temple_object_unused_tlut_23" Format="rgba16" Width="4" Height="4" Offset="0xD750" /> 
-        <Texture Name="gGreatBayTempleObjectUnused24TLUT" OutName="great_bay_temple_object_unused_tlut_24" Format="rgba16" Width="4" Height="4" Offset="0xD770" /> 
-        <Texture Name="gGreatBayTempleObjectUnused25TLUT" OutName="great_bay_temple_object_unused_tlut_25" Format="rgba16" Width="4" Height="4" Offset="0xD790" /> 
-        <Texture Name="gGreatBayTempleObjectUnused26TLUT" OutName="great_bay_temple_object_unused_tlut_26" Format="rgba16" Width="4" Height="4" Offset="0xD7B0" /> 
-        <Texture Name="gGreatBayTempleObjectUnused27TLUT" OutName="great_bay_temple_object_unused_tlut_27" Format="rgba16" Width="4" Height="4" Offset="0xD7D0" /> 
-        <Texture Name="gGreatBayTempleObjectUnused28TLUT" OutName="great_bay_temple_object_unused_tlut_28" Format="rgba16" Width="4" Height="4" Offset="0xD7F0" /> 
-        <Texture Name="gGreatBayTempleObjectUnused29TLUT" OutName="great_bay_temple_object_unused_tlut_29" Format="rgba16" Width="4" Height="4" Offset="0xD810" /> 
-        <Texture Name="gGreatBayTempleObjectUnused30TLUT" OutName="great_bay_temple_object_unused_tlut_30" Format="rgba16" Width="4" Height="4" Offset="0xD830" /> 
-        <Texture Name="gGreatBayTempleObjectLargeSeesawPlatformTLUT" OutName="great_bay_temple_object_large_seesaw_platform_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD850" />
-        <Texture Name="gGreatBayTempleObjectUnused31TLUT" OutName="great_bay_temple_object_unused_tlut_31" Format="rgba16" Width="4" Height="4" Offset="0xD870" />
-        <Texture Name="gGreatBayTempleObjectUnused32TLUT" OutName="great_bay_temple_object_unused_tlut_32" Format="rgba16" Width="4" Height="4" Offset="0xD890" />
-        <Texture Name="gGreatBayTempleObjectUnused33TLUT" OutName="great_bay_temple_object_unused_tlut_33" Format="rgba16" Width="4" Height="4" Offset="0xD8B0" />
-        <Texture Name="gGreatBayTempleObjectPlatformSideAndSeesawShaftTex" OutName="great_bay_temple_object_platform_side_and_seesaw_shaft" Format="rgba16" Width="16" Height="64" Offset="0xD8D0" />
-        <Texture Name="gGreatBayTempleObjectElevatorRiserTex" OutName="great_bay_temple_object_elevator_riser" Format="rgba16" Width="8" Height="16" Offset="0xE0D0" />
-        <Texture Name="gGreatBayTempleObjectPlatformAndWaterwheelBladeTex" OutName="great_bay_temple_object_platform_and_waterwheel_blade" Format="rgba16" Width="32" Height="64" Offset="0xE1D0" />
-        <Texture Name="gGreatBayTempleObjectDarkMetalTex" OutName="great_bay_temple_object_dark_metal" Format="rgba16" Width="16" Height="32" Offset="0xF1D0" />
-        <Texture Name="gGreatBayTempleObjectShaftTex" OutName="great_bay_temple_object_shaft" Format="rgba16" Width="16" Height="64" Offset="0xF5D0" />
-        <Texture Name="gGreatBayTempleObjectGearTex" OutName="great_bay_temple_object_gear" Format="rgba16" Width="16" Height="32" Offset="0xFDD0" />
-        <Texture Name="gGreatBayTempleObjectPaddleTex" OutName="great_bay_temple_object_paddle" Format="rgba16" Width="32" Height="64" Offset="0x101D0" />
-        <Texture Name="gGreatBayTempleObjectSwitchKnobTex" OutName="great_bay_temple_object_switch_knob" Format="rgba16" Width="32" Height="32" Offset="0x111D0" />
-        <Texture Name="gGreatBayTempleObjectOneWaySwitchTex" OutName="great_bay_temple_object_one_way_switch" Format="ci4" Width="8" Height="16" Offset="0x119D0" />
-        <Texture Name="gGreatBayTempleObjectSwitchSideTex" OutName="great_bay_temple_object_switch_side" Format="rgba16" Width="32" Height="32" Offset="0x11A10" />
-        <Texture Name="gGreatBayTempleObjectUnusedGearTex" OutName="great_bay_temple_object_unused_gear" Format="ci4" Width="48" Height="36" Offset="0x12210" TlutOffset="0xD530" />
-        <Texture Name="gGreatBayTempleObjectUnusedDarkMetalTex" OutName="great_bay_temple_object_unused_dark_metal" Format="ci4" Width="32" Height="32" Offset="0x12570" TlutOffset="0xD630" />
-        <Texture Name="gGreatBayTempleObjectUnusedShaftTex" OutName="great_bay_temple_object_unused_shaft" Format="rgba16" Width="32" Height="64" Offset="0x12770" />
-        <Texture Name="gGreatBayTempleObjectUnusedPaddleTex" OutName="great_bay_temple_object_unused_paddle" Format="ci4" Width="32" Height="128" Offset="0x13770" TlutOffset="0xD670" />
-        <Texture Name="gGreatBayTempleObjectLargeSeesawPlatformTex" OutName="great_bay_temple_object_large_seesaw_platform" Format="ci4" Width="64" Height="64" Offset="0x13F70" />
-        <Texture Name="gGreatBayTempleObjectHorizontalWaterFoamTex" OutName="great_bay_temple_object_horizontal_water_foam" Format="rgba16" Width="32" Height="32" Offset="0x14770" />
-        <Texture Name="gGreatBayTempleObjectIceTex" OutName="great_bay_temple_object_ice" Format="rgba16" Width="32" Height="32" Offset="0x14F70" />
-        <Texture Name="gGreatBayTempleObjectIceStalactiteRimMaskTex" OutName="great_bay_temple_object_ice_stalactite_rim_mask" Format="ia8" Width="32" Height="64" Offset="0x15770" />
-        <Texture Name="gGreatBayTempleObjectWaterfallWaterTex" OutName="great_bay_temple_object_waterfall_water" Format="rgba16" Width="32" Height="32" Offset="0x15F70" />
-        <Texture Name="gGreatBayTempleObjectVerticalWaterFoamTex" OutName="great_bay_temple_object_vertical_water_foam" Format="rgba16" Width="32" Height="32" Offset="0x16770" />
-        <Texture Name="gGreatBayTempleObjectWhirpoolWaterTex" OutName="great_bay_temple_object_whirlpool_water" Format="rgba16" Width="32" Height="32" Offset="0x16F70" />
-        <Texture Name="gGreatBayTempleObjectSplashScrollTex" OutName="great_bay_temple_object_splash_scroll" Format="ia8" Width="32" Height="32" Offset="0x17770" />
-
-        <!-- Assets for the doors in Great Bay Temple. -->
-        <DList Name="gGreatBayTempleObjectDoorDL" Offset="0x17D00" /> <!-- Original name is "m2_KON_shuter1_model" -->
-        <Texture Name="gGreatBayTempleObjectDoorTex" OutName="great_bay_temple_object_door" Format="rgba16" Width="32" Height="64" Offset="0x17E58" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_death.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_death.xml
deleted file mode 100644
index 6c75cc824..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_death.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<Root>
-    <File Name="object_death" Segment="6">
-        <Animation Name="gGomessScytheSwingAnim" Offset="0xE64" />
-        <Animation Name="object_death_Anim_0015B4" Offset="0x15B4" />   <!-- Start bats attack    -->
-        <Animation Name="object_death_Anim_001834" Offset="0x1834" />   <!-- Continue bats attack -->
-        <Animation Name="gGomessDamagedAnim" Offset="0x1F80" />
-        <Animation Name="gGomessBeginDeathAnim" Offset="0x2DE8" />
-        <Animation Name="gGomessDeathAnim" Offset="0x352C" />
-        <Animation Name="gGomessFloatAnim" Offset="0x3CAC" />
-        <DList Name="object_death_DL_006B80" Offset="0x6B80" />
-        <DList Name="object_death_DL_006D18" Offset="0x6D18" />
-        <DList Name="object_death_DL_006E08" Offset="0x6E08" />
-        <DList Name="object_death_DL_006F88" Offset="0x6F88" /> <!-- Original name is "d13_kama_model" ("sickle​") -->
-        <DList Name="object_death_DL_0073D0" Offset="0x73D0" /> <!-- Original name is "d13_kamahaA_model" -->
-        <DList Name="object_death_DL_0074B8" Offset="0x74B8" />
-        <DList Name="object_death_DL_007560" Offset="0x7560" />
-        <DList Name="object_death_DL_007638" Offset="0x7638" />
-        <DList Name="object_death_DL_007710" Offset="0x7710" />
-        <DList Name="object_death_DL_007818" Offset="0x7818" />
-        <DList Name="object_death_DL_007998" Offset="0x7998" />
-        <DList Name="object_death_DL_007A40" Offset="0x7A40" />
-        <DList Name="object_death_DL_007CD0" Offset="0x7CD0" />
-        <DList Name="object_death_DL_007ED0" Offset="0x7ED0" />
-        <DList Name="object_death_DL_0082C0" Offset="0x82C0" />
-        <DList Name="object_death_DL_008370" Offset="0x8370" />
-        <DList Name="object_death_DL_008428" Offset="0x8428" />
-        <DList Name="object_death_DL_0084E0" Offset="0x84E0" />
-        <DList Name="object_death_DL_008598" Offset="0x8598" />
-        <DList Name="object_death_DL_008638" Offset="0x8638" />
-        <Texture Name="object_death_Tex_008788" OutName="tex_008788" Format="rgba16" Width="32" Height="32" Offset="0x8788" />
-        <Texture Name="object_death_Tex_008F88" OutName="tex_008F88" Format="rgba16" Width="8" Height="8" Offset="0x8F88" />
-        <Texture Name="object_death_Tex_009008" OutName="tex_009008" Format="rgba16" Width="8" Height="16" Offset="0x9008" />
-        <Texture Name="object_death_Tex_009108" OutName="tex_009108" Format="rgba16" Width="8" Height="8" Offset="0x9108" />
-        <Texture Name="object_death_Tex_009188" OutName="tex_009188" Format="rgba16" Width="16" Height="8" Offset="0x9188" />
-        <Texture Name="object_death_Tex_009288" OutName="tex_009288" Format="rgba16" Width="8" Height="8" Offset="0x9288" />
-        <Texture Name="object_death_Tex_009308" OutName="tex_009308" Format="rgba16" Width="8" Height="8" Offset="0x9308" />
-        <Texture Name="object_death_Tex_009388" OutName="tex_009388" Format="rgba16" Width="16" Height="16" Offset="0x9388" />
-        <Texture Name="object_death_Tex_009588" OutName="tex_009588" Format="rgba16" Width="4" Height="8" Offset="0x9588" />
-        <Texture Name="object_death_Tex_0095C8" OutName="tex_0095C8" Format="rgba16" Width="16" Height="16" Offset="0x95C8" />
-        <Texture Name="object_death_Tex_0097C8" OutName="tex_0097C8" Format="rgba16" Width="4" Height="8" Offset="0x97C8" />
-        <Texture Name="object_death_Tex_009808" OutName="tex_009808" Format="i4" Width="16" Height="16" Offset="0x9808" />
-        <DList Name="gGomessCoreDL" Offset="0x9988" />
-        <Texture Name="gGomessCoreTex" OutName="gomess_core" Format="i4" Width="16" Height="16" Offset="0x9AA0" />
-        <DList Name="gGomessBatsGuardingCoreDL" Offset="0x9BA0" />
-        <Texture Name="gGomessBatsGuardingCoreTex" OutName="gomess_bats_guarding_core" Format="rgba16" Width="16" Height="16" Offset="0x9C40" />
-        <DList Name="gGomessBatMaterialDL" Offset="0x9F10" />
-        <DList Name="gGomessBatFrame1DL" Offset="0x9F88" />
-        <DList Name="gGomessBatFrame2DL" Offset="0xA088" />
-        <DList Name="gGomessBatFrame3DL" Offset="0xA188" />
-        <DList Name="gGomessBatFrame4DL" Offset="0xA288" />
-        <DList Name="gGomessBatFrame5DL" Offset="0xA388" />
-        <DList Name="gGomessBatFrame6DL" Offset="0xA488" />
-        <DList Name="gGomessBatFrame7DL" Offset="0xA588" />
-        <DList Name="gGomessBatFrame8DL" Offset="0xA688" />
-        <DList Name="gGomessBatFrame9DL" Offset="0xA788" />
-        <Texture Name="gGomessBatTex" OutName="gomess_bat" Format="rgba16" Width="32" Height="16" Offset="0xA7B8" />
-        <Limb Name="object_death_Standardlimb_00ABB8" Type="Standard" EnumName="GOMESS_LIMB_1" Offset="0xABB8" />
-        <Limb Name="object_death_Standardlimb_00ABC4" Type="Standard" EnumName="GOMESS_LIMB_CORE_POS" Offset="0xABC4" />
-        <Limb Name="object_death_Standardlimb_00ABD0" Type="Standard" EnumName="GOMESS_LIMB_LOWER_BODY" Offset="0xABD0" />
-        <Limb Name="object_death_Standardlimb_00ABDC" Type="Standard" EnumName="GOMESS_LIMB_TORSO" Offset="0xABDC" />
-        <Limb Name="object_death_Standardlimb_00ABE8" Type="Standard" EnumName="GOMESS_LIMB_COLLAR" Offset="0xABE8" />
-        <Limb Name="object_death_Standardlimb_00ABF4" Type="Standard" EnumName="GOMESS_LIMB_HEAD_LOWER" Offset="0xABF4" />
-        <Limb Name="object_death_Standardlimb_00AC00" Type="Standard" EnumName="GOMESS_LIMB_HEAD_UPPER" Offset="0xAC00" />
-        <Limb Name="object_death_Standardlimb_00AC0C" Type="Standard" EnumName="GOMESS_LIMB_8" Offset="0xAC0C" />  <!-- Antenna thing, 4 parts -->
-        <Limb Name="object_death_Standardlimb_00AC18" Type="Standard" EnumName="GOMESS_LIMB_9" Offset="0xAC18" />
-        <Limb Name="object_death_Standardlimb_00AC24" Type="Standard" EnumName="GOMESS_LIMB_10" Offset="0xAC24" />
-        <Limb Name="object_death_Standardlimb_00AC30" Type="Standard" EnumName="GOMESS_LIMB_11" Offset="0xAC30" />
-        <Limb Name="object_death_Standardlimb_00AC3C" Type="Standard" EnumName="GOMESS_LIMB_CLOAK_UPPER" Offset="0xAC3C" />
-        <Limb Name="object_death_Standardlimb_00AC48" Type="Standard" EnumName="GOMESS_LIMB_CLOAK_LOWER" Offset="0xAC48" />
-        <Limb Name="object_death_Standardlimb_00AC54" Type="Standard" EnumName="GOMESS_LIMB_UPPER_ARM_LEFT" Offset="0xAC54" />
-        <Limb Name="object_death_Standardlimb_00AC60" Type="Standard" EnumName="GOMESS_LIMB_FOREARM_LEFT" Offset="0xAC60" />
-        <Limb Name="object_death_Standardlimb_00AC6C" Type="Standard" EnumName="GOMESS_LIMB_HAND_LEFT" Offset="0xAC6C" />
-        <Limb Name="object_death_Standardlimb_00AC78" Type="Standard" EnumName="GOMESS_LIMB_UPPER_ARM_RIGHT" Offset="0xAC78" />
-        <Limb Name="object_death_Standardlimb_00AC84" Type="Standard" EnumName="GOMESS_LIMB_FOREARM_RIGHT" Offset="0xAC84" />
-        <Limb Name="object_death_Standardlimb_00AC90" Type="Standard" EnumName="GOMESS_LIMB_HAND_RIGHT" Offset="0xAC90" />
-        <Limb Name="object_death_Standardlimb_00AC9C" Type="Standard" EnumName="GOMESS_LIMB_SCYTHE_HANDLE" Offset="0xAC9C" />
-        <Limb Name="object_death_Standardlimb_00ACA8" Type="Standard" EnumName="GOMESS_LIMB_SCYTHE_BLADE" Offset="0xACA8" />
-        <Skeleton Name="gGomessSkel" Type="Flex" LimbType="Standard" LimbNone="GOMESS_LIMB_NONE" LimbMax="GOMESS_LIMB_MAX" EnumName="GomessSkelLimbs" Offset="0xAD08" />
-        <Animation Name="object_death_Anim_00B284" Offset="0xB284" />   <!-- Intro anim 1 -->
-        <Animation Name="gGomessScytheSpinAnim" Offset="0xB508" />
-        <Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" />   <!-- Intro anim 2 -->
-        <TextureAnimation Name="gGomessCoreMatAnim" Offset="0xCB84" />
-        <TextureAnimation Name="gGomessBodyMatAnim" Offset="0xCBC0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekubaba.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekubaba.xml
deleted file mode 100644
index 053b82f61..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekubaba.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-    <!-- Deku Baba and withered Deku Baba assets. Identical to OoT -->
-    <File Name="object_dekubaba" Segment="6">
-
-        <!-- Deku Baba animations -->
-        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/> <!-- Original name is "db_P_kougeki" ("attack; assault") -->
-        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/> <!-- Original name is "db_P_tobidasu" ("to appear (suddenly)​") -->
-
-        <!-- Deku Baba body DLists (not all are limb DLists) -->
-        <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
-        <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
-        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/> <!-- Original name is "db_ha_model" ("leaf; blade of grass") -->
-        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/> <!-- Original name is "db_miki1_model" ("miki" = "trunk") -->
-        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/> <!-- Original name is "db_miki2_model" -->
-        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/> <!-- Original name is "db_miki3_model" -->
-
-        <!-- Deku Baba body textures -->
-        <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
-        <Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
-        <Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
-        <Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
-        <Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
-
-        <!-- Deku Baba limbs (upper/lower is only based on the "tongue" being in the lower) -->
-        <Limb Name="gDekuBabaRootLimb" Type="Standard" EnumName="DEKUBABA_LIMB_ROOT" Offset="0x29D0" />
-        <Limb Name="gDekuBabaUpperJawRootLimb" Type="Standard" EnumName="DEKUBABA_LIMB_UPPER_JAW_ROOT" Offset="0x29DC" />
-        <Limb Name="gDekuBabaUpperJawRooWrappertLimb" Type="Standard" EnumName="DEKUBABA_LIMB_UPPER_JAW_WRAPPER" Offset="0x29E8" />
-        <Limb Name="gDekuBabaUpperJawLimb" Type="Standard" EnumName="DEKUBABA_LIMB_UPPER_JAW" Offset="0x29F4" />
-        <Limb Name="gDekuBabaLowerJawRootLimb" Type="Standard" EnumName="DEKUBABA_LIMB_LOWER_JAW_ROOT" Offset="0x2A00" />
-        <Limb Name="gDekuBabaLowerJawWrapperLimb" Type="Standard" EnumName="DEKUBABA_LIMB_LOWER_JAW_WRAPPER" Offset="0x2A0C" />
-        <Limb Name="gDekuBabaLowerJawLimb" Type="Standard" EnumName="DEKUBABA_LIMB_LOWER_JAW" Offset="0x2A18" />
-
-        <!-- Deku Baba skeleton (only used for jaws) -->
-        <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" LimbNone="DEKUBABA_LIMB_NONE" LimbMax="DEKUBABA_LIMB_MAX" EnumName="DekuBabaLimb" Offset="0x2A40" />
-
-        <!-- Deku Baba stick drop -->
-        <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
-        <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekucity_ana_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekucity_ana_obj.xml
deleted file mode 100644
index 620c34a04..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekucity_ana_obj.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_dekucity_ana_obj" Segment="6">
-        <DList Name="object_dekucity_ana_obj_DL_000040" Offset="0x40" />
-        <Texture Name="object_dekucity_ana_obj_Tex_000100" OutName="tex_000100" Format="rgba16" Width="32" Height="32" Offset="0x100" />
-        <Texture Name="object_dekucity_ana_obj_Tex_000900" OutName="tex_000900" Format="i4" Width="64" Height="64" Offset="0x900" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekucity_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekucity_obj.xml
deleted file mode 100644
index 2d1da14a0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekucity_obj.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <File Name="object_dekucity_obj" Segment="6">
-        <Collision Name="object_dekucity_obj_Colheader_0002AC" Offset="0x2AC" /> <!-- Original name is "z2_22_DOKUcode_bgdatainfo" ("doku" = "poison") -->
-        <DList Name="object_dekucity_obj_DL_0004E0" Offset="0x4E0" /> <!-- Original name is "z2_22_DOKUwter_modelT" -->
-        <DList Name="object_dekucity_obj_DL_000610" Offset="0x610" />
-        <Texture Name="object_dekucity_obj_Tex_000618" OutName="tex_000618" Format="rgba16" Width="32" Height="32" Offset="0x618" />
-        <TextureAnimation Name="object_dekucity_obj_Matanimheader_000E28" Offset="0xE28" />
-        <DList Name="object_dekucity_obj_DL_001030" Offset="0x1030" /> <!-- Original name is "z2_22_wter_modelT" -->
-        <DList Name="object_dekucity_obj_DL_001160" Offset="0x1160" />
-        <Texture Name="object_dekucity_obj_Tex_001168" OutName="tex_001168" Format="rgba16" Width="32" Height="32" Offset="0x1168" />
-        <TextureAnimation Name="object_dekucity_obj_Matanimheader_001978" Offset="0x1978" />
-        <DList Name="object_dekucity_obj_DL_001D80" Offset="0x1D80" />
-        <DList Name="object_dekucity_obj_DL_001ED8" Offset="0x1ED8" /> <!-- Original name is "z2_22_yama01_model" ("yama" = "mountain; hill​") -->
-        <Texture Name="object_dekucity_obj_Tex_002008" OutName="tex_002008" Format="rgba16" Width="16" Height="64" Offset="0x2008" />
-        <Texture Name="object_dekucity_obj_Tex_002808" OutName="tex_002808" Format="rgba16" Width="32" Height="32" Offset="0x2808" />
-        <Texture Name="object_dekucity_obj_Tex_003008" OutName="tex_003008" Format="i4" Width="64" Height="64" Offset="0x3008" />
-        <TextureAnimation Name="object_dekucity_obj_Matanimheader_003820" Offset="0x3820" />
-        <DList Name="object_dekucity_obj_DL_003990" Offset="0x3990" />
-        <DList Name="object_dekucity_obj_DL_003998" Offset="0x3998" /> <!-- Original name is "z2_22_yama02_model" -->
-        <Texture Name="object_dekucity_obj_Tex_003AC0" OutName="tex_003AC0" Format="rgba16" Width="16" Height="32" Offset="0x3AC0" />
-        <Texture Name="object_dekucity_obj_Tex_003EC0" OutName="tex_003EC0" Format="rgba16" Width="32" Height="32" Offset="0x3EC0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekunuts.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekunuts.xml
deleted file mode 100644
index 909231a77..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dekunuts.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<Root>
-    <!-- Assets for Deku Scrubs and their flowers -->
-    <File Name="object_dekunuts" Segment="6">
-        <Animation Name="gDekuScrubSpitAnim" Offset="0x168" /> <!-- Original name is "dn_atack" -->
-
-        <!-- Deku Scrub Limb DisplayLists -->
-        <DList Name="gDekuScrubRightFootDL" Offset="0xA00" />
-        <DList Name="gDekuScrubRightLegDL" Offset="0xAA8" />
-        <DList Name="gDekuScrubLeftFootDL" Offset="0xB40" />
-        <DList Name="gDekuScrubLeftLegDL" Offset="0xBE8" />
-        <DList Name="gDekuScrubSnoutDL" Offset="0xC80" />
-        <DList Name="gDekuScrubCrestDL" Offset="0xD90" />
-        <DList Name="gDekuScrubHeaddressDL" Offset="0xE30" />
-        <DList Name="gDekuScrubHeadDL" Offset="0xF20" />
-        <DList Name="gDekuScrubBodyDL" Offset="0x1050" />
-
-        <!-- Deku Scrub Textures -->
-        <Texture Name="gDekuScrubSnoutTex" OutName="deku_scrub_snout" Format="rgba16" Width="8" Height="8" Offset="0x10F0" />
-        <Texture Name="gDekuScrubMouthTex" OutName="deku_scrub_mouth" Format="rgba16" Width="8" Height="8" Offset="0x1170" />
-        <Texture Name="gDekuScrubLeafTex" OutName="deku_scrub_leaf" Format="rgba16" Width="32" Height="32" Offset="0x11F0" />
-        <Texture Name="gDekuScrubEyeTex" OutName="deku_scrub_eye" Format="rgba16" Width="8" Height="8" Offset="0x19F0" />
-        <Texture Name="gDekuScrubSkinTex" OutName="deku_scrub_skin" Format="rgba16" Width="16" Height="16" Offset="0x1A70" />
-
-        <!-- Deku Scrub Flower and Flower Fragment DisplayLists and Textures -->
-        <DList Name="gDekuScrubFlowerDL" Offset="0x1E50" />
-        <DList Name="gDekuScrubFlowerFragmentDL" Offset="0x1F50" />
-        <Texture Name="gDekuScrubFlowerFragmentTex" OutName="deku_scrub_flower_fragment" Format="rgba16" Width="16" Height="32" Offset="0x1FD8" />
-
-        <!-- Deku Scrub Limbs -->
-        <Limb Name="gDekuScrubBodyLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_BODY" Offset="0x23D8" />
-        <Limb Name="gDekuScrubHeadLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_HEAD" Offset="0x23E4" />
-        <Limb Name="gDekuScrubHeaddressLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_HEADDRESS" Offset="0x23F0" />
-        <Limb Name="gDekuScrubCrestLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_CREST" Offset="0x23FC" />
-        <Limb Name="gDekuScrubSnoutLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_SNOUT" Offset="0x2408" />
-        <Limb Name="gDekuScrubLeftLegLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_LEFT_LEG" Offset="0x2414" />
-        <Limb Name="gDekuScrubLeftFootLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_LEFT_FOOT" Offset="0x2420" />
-        <Limb Name="gDekuScrubRightLegLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_RIGHT_LEG" Offset="0x242C" />
-        <Limb Name="gDekuScrubRightFootLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_RIGHT_FOOT" Offset="0x2438" />
-
-        <!-- Deku Scrub Skeleton -->
-        <Skeleton Name="gDekuScrubSkel" Type="Normal" LimbType="Standard" LimbNone="DEKU_SCRUB_LIMB_NONE" LimbMax="DEKU_SCRUB_LIMB_MAX" EnumName="DekuScrubLimb" Offset="0x2468" />
-
-        <!-- Deku Scrub Animations -->
-        <Animation Name="gDekuScrubDamageAnim" Offset="0x259C" /> <!-- Original name is "dn_damage" -->
-        <Animation Name="gDekuScrubStandingIdleAnim" Offset="0x2950" /> <!-- Original name is "dn_demowait" -->
-        <Animation Name="gDekuScrubBurrowAnim" Offset="0x2A5C" /> <!-- Original name is "dn_dig" -->
-        <Animation Name="gDekuScrubDieAnim" Offset="0x2BD4" /> <!-- Original name is "dn_down" -->
-        <Animation Name="gDekuScrubUnburrowAnim" Offset="0x2DD4" /> <!-- Original name is "dn_jump" -->
-        <Animation Name="gDekuScrubLookAroundAnim" Offset="0x2FA4" /> <!-- Original name is "dn_lookaround" -->
-        <Animation Name="gDekuScrubUpAnim" Offset="0x3180" /> <!-- Original name is "dn_start" -->
-        <Animation Name="gDekuScrubIdleAnim" Offset="0x326C" /> <!-- Original name is "dn_wait" -->
-        <Animation Name="gDekuScrubPantingAnim" Offset="0x33E4" /> <!-- Original name is "dn_wait02" -->
-        <Animation Name="gDekuScrubRunAnim" Offset="0x3780" /> <!-- Original name is "dn_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_delf.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_delf.xml
deleted file mode 100644
index 85f3138e1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_delf.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<Root>
-    <File Name="object_delf" Segment="6">
-        <Animation Name="object_delf_Anim_00046C" Offset="0x46C" /> <!-- Original name is "chat_bikkuri" -->
-        <Animation Name="object_delf_Anim_00065C" Offset="0x65C" /> <!-- Original name is "chat_bikkuri_wait" -->
-        <Animation Name="object_delf_Anim_0008E0" Offset="0x8E0" /> <!-- Original name is "chat_deru" -->
-        <Animation Name="object_delf_Anim_000A94" Offset="0xA94" /> <!-- Original name is "chat_deru_wait" -->
-        <Animation Name="object_delf_Anim_000E44" Offset="0xE44" /> <!-- Original name is "chat_fly_loop" -->
-        <Animation Name="object_delf_Anim_0010F8" Offset="0x10F8" /> <!-- Original name is "chat_hena_wait" -->
-        <Animation Name="object_delf_Anim_001410" Offset="0x1410" /> <!-- Original name is "chat_henahena" -->
-        <Animation Name="object_delf_Anim_001754" Offset="0x1754" /> <!-- Original name is "chat_mae_wait" -->
-        <Animation Name="object_delf_Anim_00199C" Offset="0x199C" /> <!-- Original name is "chat_modoru" -->
-        <Animation Name="object_delf_Anim_001B28" Offset="0x1B28" /> <!-- Original name is "chat_nani_to_fly" -->
-        <Animation Name="object_delf_Anim_001ED4" Offset="0x1ED4" /> <!-- Original name is "chat_nani_wait" -->
-        <Animation Name="object_delf_Anim_003148" Offset="0x3148" /> <!-- Original name is "chat_okarina_play" -->
-        <Animation Name="object_delf_Anim_00377C" Offset="0x377C" /> <!-- Original name is "chat_okarina_wait" -->
-        <Animation Name="object_delf_Anim_003BB4" Offset="0x3BB4" /> <!-- Original name is "chat_sowasowa" -->
-        <Animation Name="object_delf_Anim_003FAC" Offset="0x3FAC" /> <!-- Original name is "elf_amayadori" -->
-        <Animation Name="object_delf_Anim_0042E8" Offset="0x42E8" /> <!-- Original name is "elf_amayadori2" -->
-        <Animation Name="object_delf_Anim_004798" Offset="0x4798" /> <!-- Original name is "elf_amayadori_loop" -->
-        <Animation Name="object_delf_Anim_004C44" Offset="0x4C44" /> <!-- Original name is "elf_amayadori_loop2" -->
-        <Animation Name="object_delf_Anim_004FF4" Offset="0x4FF4" /> <!-- Original name is "elf_attack_1a" -->
-        <Animation Name="object_delf_Anim_0053A4" Offset="0x53A4" /> <!-- Original name is "elf_attack_1b" -->
-        <Animation Name="object_delf_Anim_005B68" Offset="0x5B68" /> <!-- Original name is "elf_attack_2a" -->
-        <Animation Name="object_delf_Anim_006328" Offset="0x6328" /> <!-- Original name is "elf_attack_1b" -->
-        <Animation Name="object_delf_Anim_006614" Offset="0x6614" /> <!-- Original name is "elf_bata_wait" -->
-        <Animation Name="object_delf_Anim_006B28" Offset="0x6B28" /> <!-- Original name is "elf_boo" -->
-        <Animation Name="object_delf_Anim_006D74" Offset="0x6D74" /> <!-- Original name is "elf_guru1" -->
-        <Animation Name="object_delf_Anim_00706C" Offset="0x706C" /> <!-- Original name is "elf_guru1_loop" -->
-        <Animation Name="object_delf_Anim_0072B0" Offset="0x72B0" /> <!-- Original name is "elf_guru2" -->
-        <Animation Name="object_delf_Anim_007570" Offset="0x7570" /> <!-- Original name is "elf_guru2_loop" -->
-        <Animation Name="object_delf_Anim_007B04" Offset="0x7B04" /> <!-- Original name is "elf_haigo_1" -->
-        <Animation Name="object_delf_Anim_0080A4" Offset="0x80A4" /> <!-- Original name is "elf_haigo_2" -->
-        <Animation Name="object_delf_Anim_00859C" Offset="0x859C" /> <!-- Original name is "elf_haigo_wait_1" -->
-        <Animation Name="object_delf_Anim_008A44" Offset="0x8A44" /> <!-- Original name is "elf_haigo_wait_2" -->
-        <Animation Name="object_delf_Anim_009010" Offset="0x9010" /> <!-- Original name is "elf_hataku" -->
-        <Animation Name="object_delf_Anim_0091BC" Offset="0x91BC" /> <!-- Original name is "elf_hataku_kaodasi" -->
-        <Animation Name="object_delf_Anim_0094B0" Offset="0x94B0" /> <!-- Original name is "elf_hataku_kaodasi_loop" -->
-        <Animation Name="object_delf_Anim_0097C4" Offset="0x97C4" /> <!-- Original name is "elf_hataku_loop" -->
-        <Animation Name="object_delf_Anim_009C4C" Offset="0x9C4C" /> <!-- Original name is "elf_hataku_mawarikomi" -->
-        <Animation Name="object_delf_Anim_009F40" Offset="0x9F40" /> <!-- Original name is "elf_hataku_mawarikomi_loop" -->
-        <Animation Name="object_delf_Anim_00A2A4" Offset="0xA2A4" /> <!-- Original name is "elf_hayai_turn" -->
-        <Animation Name="object_delf_Anim_00A4B4" Offset="0xA4B4" /> <!-- Original name is "elf_ht_wait" -->
-        <Animation Name="object_delf_Anim_00A7B4" Offset="0xA7B4" /> <!-- Original name is "elf_ikari" -->
-        <Animation Name="object_delf_Anim_00AF78" Offset="0xAF78" /> <!-- Original name is "elf_kakureru" -->
-        <Animation Name="object_delf_Anim_00B2B8" Offset="0xB2B8" /> <!-- Original name is "elf_kakureru_loop" -->
-        <Animation Name="object_delf_Anim_00BCD8" Offset="0xBCD8" /> <!-- Original name is "elf_kizetu" -->
-        <Animation Name="object_delf_Anim_00BDFC" Offset="0xBDFC" /> <!-- Original name is "elf_maederu" -->
-        <Animation Name="object_delf_Anim_00C0BC" Offset="0xC0BC" /> <!-- Original name is "elf_maederu_loop" -->
-        <Animation Name="object_delf_Anim_00C248" Offset="0xC248" /> <!-- Original name is "elf_mawarikomi" -->
-        <Animation Name="object_delf_Anim_00C588" Offset="0xC588" /> <!-- Original name is "elf_mawarikomi_loop" -->
-        <Animation Name="object_delf_Anim_00C690" Offset="0xC690" /> <!-- Original name is "elf_miwoyoseau" -->
-        <Animation Name="object_delf_Anim_00C790" Offset="0xC790" /> <!-- Original name is "elf_miwoyoseau2" -->
-        <Animation Name="object_delf_Anim_00CCD4" Offset="0xCCD4" /> <!-- Original name is "elf_modoru" -->
-        <Animation Name="object_delf_Anim_00CEE0" Offset="0xCEE0" /> <!-- Original name is "elf_nanikairu2" -->
-        <Animation Name="object_delf_Anim_00D260" Offset="0xD260" /> <!-- Original name is "elf_nanikairu_loop2" -->
-        <Animation Name="object_delf_Anim_00E024" Offset="0xE024" /> <!-- Original name is "elf_okizari" -->
-        <Animation Name="object_delf_Anim_00EB18" Offset="0xEB18" /> <!-- Original name is "elf_okizari_no" -->
-        <Animation Name="object_delf_Anim_00EBB0" Offset="0xEBB0" /> <!-- Original name is "elf_okizari_sakebu" -->
-        <Animation Name="object_delf_Anim_00EE30" Offset="0xEE30" /> <!-- Original name is "elf_okizari_sakebu_wait" -->
-        <Animation Name="object_delf_Anim_00F0D0" Offset="0xF0D0" /> <!-- Original name is "elf_okizari_wait" -->
-        <Animation Name="object_delf_Anim_00FB30" Offset="0xFB30" /> <!-- Original name is "elf_sakimawari_1" -->
-        <Animation Name="object_delf_Anim_010590" Offset="0x10590" /> <!-- Original name is "elf_sakimawari_2" -->
-        <Animation Name="object_delf_Anim_01088C" Offset="0x1088C" /> <!-- Original name is "elf_samui" -->
-        <Animation Name="object_delf_Anim_011088" Offset="0x11088" /> <!-- Original name is "elf_seisi_1" -->
-        <Animation Name="object_delf_Anim_0118FC" Offset="0x118FC" /> <!-- Original name is "elf_seisi_2" -->
-        <Animation Name="object_delf_Anim_011C70" Offset="0x11C70" /> <!-- Original name is "elf_seisi_taiki_1" -->
-        <Animation Name="object_delf_Anim_011FE0" Offset="0x11FE0" /> <!-- Original name is "elf_seisi_taiki_2" -->
-        <Animation Name="object_delf_Anim_012388" Offset="0x12388" /> <!-- Original name is "elf_seisi_wait_1" -->
-        <Animation Name="object_delf_Anim_012738" Offset="0x12738" /> <!-- Original name is "elf_seisi_wait_2" -->
-        <Animation Name="object_delf_Anim_012BBC" Offset="0x12BBC" /> <!-- Original name is "elf_urusai" -->
-        <Animation Name="object_delf_Anim_012EF8" Offset="0x12EF8" /> <!-- Original name is "elf_urusai_wait" -->
-        <Animation Name="object_delf_Anim_013040" Offset="0x13040" /> <!-- Original name is "elf_usirohiku" -->
-        <Animation Name="object_delf_Anim_013378" Offset="0x13378" /> <!-- Original name is "elf_usirohiku_loop" -->
-        <Animation Name="object_delf_Anim_013BE0" Offset="0x13BE0" /> <!-- Original name is "elf_vs_yousei" -->
-        <Animation Name="object_delf_Anim_013E80" Offset="0x13E80" /> <!-- Original name is "elf_vs_yousei_wait" -->
-        <Animation Name="object_delf_Anim_014190" Offset="0x14190" /> <!-- Original name is "elf_yokeru" -->
-        <Animation Name="object_delf_Anim_01447C" Offset="0x1447C" /> <!-- Original name is "elf_yokeru_loop" -->
-        <Animation Name="object_delf_Anim_01498C" Offset="0x1498C" /> <!-- Original name is "elf_yorisou" -->
-        <Animation Name="object_delf_Anim_014E9C" Offset="0x14E9C" /> <!-- Original name is "elf_yorisou_loop" -->
-        <Animation Name="object_delf_Anim_015114" Offset="0x15114" /> <!-- Original name is "elf_yururi_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dhouse.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dhouse.xml
deleted file mode 100644
index a5894a4df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dhouse.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Root>
-    <File Name="object_dhouse" Segment="6">
-        <Texture Name="object_dhouse_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="object_dhouse_TLUT_000020" OutName="tlut_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" />
-        <Texture Name="object_dhouse_Tex_000040" OutName="tex_000040" Format="ci4" Width="64" Height="64" Offset="0x40" />
-        <Texture Name="object_dhouse_Tex_000840" OutName="tex_000840" Format="rgba16" Width="32" Height="32" Offset="0x840" />
-        <Texture Name="object_dhouse_Tex_001040" OutName="tex_001040" Format="rgba16" Width="64" Height="32" Offset="0x1040" />
-        <Texture Name="object_dhouse_Tex_002040" OutName="tex_002040" Format="ci4" Width="64" Height="64" Offset="0x2040" />
-        <Texture Name="object_dhouse_Tex_002840" OutName="tex_002840" Format="rgba16" Width="32" Height="32" Offset="0x2840" />
-        <Texture Name="object_dhouse_Tex_003040" OutName="tex_003040" Format="i4" Width="64" Height="64" Offset="0x3040" />
-        <DList Name="object_dhouse_DL_004920" Offset="0x4920" />
-        <DList Name="object_dhouse_DL_004928" Offset="0x4928" /> <!-- Original name is "z2_broken_dhouse_model" -->
-        <DList Name="object_dhouse_DL_005A70" Offset="0x5A70" />
-        <DList Name="object_dhouse_DL_005A78" Offset="0x5A78" /> <!-- Original name is "z2_dhouse_model" -->
-        <DList Name="object_dhouse_DL_006CE0" Offset="0x6CE0" />
-        <DList Name="object_dhouse_DL_006E28" Offset="0x6E28" /> <!-- Original name is "d_hahen_01_model" -->
-        <DList Name="object_dhouse_DL_006EF8" Offset="0x6EF8" />
-        <DList Name="object_dhouse_DL_0070A8" Offset="0x70A8" /> <!-- Original name is "d_hahen_02_model" -->
-        <DList Name="object_dhouse_DL_007190" Offset="0x7190" />
-        <DList Name="object_dhouse_DL_007348" Offset="0x7348" /> <!-- Original name is "d_hahen_03_model" -->
-        <DList Name="object_dhouse_DL_007438" Offset="0x7438" />
-        <DList Name="object_dhouse_DL_007568" Offset="0x7568" /> <!-- Original name is "d_hahen_04_model" -->
-        <DList Name="object_dhouse_DL_007638" Offset="0x7638" />
-        <DList Name="object_dhouse_DL_007780" Offset="0x7780" /> <!-- Original name is "d_hahen_05_model" -->
-        <DList Name="object_dhouse_DL_007850" Offset="0x7850" />
-        <DList Name="object_dhouse_DL_007A00" Offset="0x7A00" /> <!-- Original name is "d_hahen_06_model" -->
-        <DList Name="object_dhouse_DL_007AE8" Offset="0x7AE8" />
-        <DList Name="object_dhouse_DL_007C98" Offset="0x7C98" /> <!-- Original name is "d_hahen_07_model" -->
-        <Collision Name="object_dhouse_Colheader_008040" Offset="0x8040" /> <!-- Original name is "z2_dhouse_hahen_bgdatainfo" -->
-        <DList Name="object_dhouse_DL_0081D0" Offset="0x81D0" />
-        <DList Name="object_dhouse_DL_0081D8" Offset="0x81D8" /> <!-- Original name is "z2_small_hahen_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dinofos.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dinofos.xml
deleted file mode 100644
index c3c575b0f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dinofos.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<Root>
-    <!-- Object for Dinolfos -->
-    <File Name="object_dinofos" Segment="6">
-        <Animation Name="gDinolfosWalkAnim" Offset="0x580" /> <!-- Original name is "zf2_aruku" -->
-        <Animation Name="gDinolfosLandAnim" Offset="0xAF0" /> <!-- Original name is "zf2_chakuti" -->
-        <Animation Name="gDinolfosFireStartAnim" Offset="0x1040" /> <!-- Original name is "zf2_fire1" -->
-        <Animation Name="gDinolfosFireLoopAnim" Offset="0x13C0" /> <!-- Original name is "zf2_fire2" -->
-        <Animation Name="gDinolfosFireEndAnim" Offset="0x17B8" /> <!-- Original name is "zf2_fire3" -->
-        <Animation Name="gDinolfosJumpAnim" Offset="0x1CCC" /> <!-- Original name is "zf2_jump" -->
-        <Animation Name="gDinolfosAttackAnim" Offset="0x25B4" /> <!-- Original name is "zf2_kiru" -->
-        <Animation Name="gDinolfosIdleAnim" Offset="0x2E40" /> <!-- Original name is "zf2_matsu" -->
-
-        <DList Name="gDinolfosKnifeDL" Offset="0x5B10" />
-        <DList Name="gDinolfosLowerTailDL" Offset="0x5D00" />
-        <DList Name="gDinolfosUpperTailDL" Offset="0x5E60" />
-        <DList Name="gDinolfosUpperBodyDL" Offset="0x5FC8" />
-        <DList Name="gDinolfosNeckDL" Offset="0x61F8" />
-        <DList Name="gDinolfosHeadDL" Offset="0x6440" />
-        <DList Name="gDinolfosJawDL" Offset="0x6930" />
-        <DList Name="gDinolfosRightUpperArmDL" Offset="0x6C28" />
-        <DList Name="gDinolfosRightForearmDL" Offset="0x6D68" />
-        <DList Name="gDinolfosRightHandDL" Offset="0x6E58" />
-        <DList Name="gDinolfosLeftUpperArmDL" Offset="0x70A0" />
-        <DList Name="gDinolfosLeftForearmDL" Offset="0x71E0" />
-        <DList Name="gDinolfosLeftHandDL" Offset="0x72D0" />
-        <DList Name="gDinolfosLowerBodyDL" Offset="0x7450" />
-        <DList Name="gDinolfosRightUpperLegDL" Offset="0x7690" />
-        <DList Name="gDinolfosRightLowerLegDL" Offset="0x78E0" />
-        <DList Name="gDinolfosRightClawsDL" Offset="0x7AC8" />
-        <DList Name="gDinolfosLeftUpperLegDL" Offset="0x7C20" />
-        <DList Name="gDinolfosLeftLowerLegDL" Offset="0x7E70" />
-        <DList Name="gDinolfosLeftClawsDL" Offset="0x8058" />
-
-        <Texture Name="gDinolfosTLUT" OutName="dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x81B0" />
-        <Texture Name="gDinolfosSkinTex" OutName="dinolfos_skin" Format="ci8" Width="16" Height="16" Offset="0x83B0" />
-        <Texture Name="gDinolfosScaleTex" OutName="dinolfos_scale" Format="rgba16" Width="16" Height="16" Offset="0x84B0" />
-        <Texture Name="gDinolfosArmorTex" OutName="dinolfos_armor" Format="rgba16" Width="16" Height="16" Offset="0x86B0" />
-        <Texture Name="gDinolfosSpikeTex" OutName="dinolfos_spike" Format="rgba16" Width="8" Height="8" Offset="0x88B0" />
-        <Texture Name="gDinolfosInnerMouthTex" OutName="dinolfos_inner_mouth" Format="rgba16" Width="16" Height="16" Offset="0x8930" />
-        <Texture Name="gDinolfosKnifeHoleTex" OutName="dinolfos_knife_hole" Format="rgba16" Width="8" Height="8" Offset="0x8B30" />
-        <Texture Name="gDinolfosJawTex" OutName="dinolfos_jaw" Format="rgba16" Width="8" Height="16" Offset="0x8BB0" />
-        <Texture Name="gDinolfosEyeHoleTex" OutName="dinolfos_eye_hole" Format="rgba16" Width="16" Height="8" Offset="0x8CB0" />
-        <Texture Name="gDinolfosClawTex" OutName="dinolfos_claw" Format="rgba16" Width="8" Height="8" Offset="0x8DB0" />
-        <Texture Name="gDinolfosEyeOpenTex" OutName="dinolfos_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x8E30" />
-        <Texture Name="gDinolfosEyeHalfTex" OutName="dinolfos_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x9030" />
-        <Texture Name="gDinolfosEyeClosedTex" OutName="dinolfos_eye_closed" Format="rgba16" Width="16" Height="16" Offset="0x9230" />
-
-        <Limb Name="gDinolfosLowerBodyLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LOWER_BODY" Offset="0x9430" />
-        <Limb Name="gDinolfosLeftUpperLegLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_UPPER_LEG" Offset="0x943C" />
-        <Limb Name="gDinolfosLeftLowerLegLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_LOWER_LEG" Offset="0x9448" />
-        <Limb Name="gDinolfosLeftClawsLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_CLAWS" Offset="0x9454" />
-        <Limb Name="gDinolfosRightUpperLegLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_UPPER_LEG" Offset="0x9460" />
-        <Limb Name="gDinolfosRightLowerLegLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_LOWER_LEG" Offset="0x946C" />
-        <Limb Name="gDinolfosRightClawsLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_CLAWS" Offset="0x9478" />
-        <Limb Name="gDinolfosUpperBodyLimb" Type="Standard" EnumName="DINOLFOS_LIMB_UPPER_BODY" Offset="0x9484" />
-        <Limb Name="gDinolfosLeftUpperArmLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_UPPER_ARM" Offset="0x9490" />
-        <Limb Name="gDinolfosLeftForearmLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_FOREARM" Offset="0x949C" />
-        <Limb Name="gDinolfosLeftHandLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LEFT_HAND" Offset="0x94A8" />
-        <Limb Name="gDinolfosRightUpperArmLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_UPPER_ARM" Offset="0x94B4" />
-        <Limb Name="gDinolfosRightForearmLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_FOREARM" Offset="0x94C0" />
-        <Limb Name="gDinolfosRightHandLimb" Type="Standard" EnumName="DINOLFOS_LIMB_RIGHT_HAND" Offset="0x94CC" />
-        <Limb Name="gDinolfosNeckLimb" Type="Standard" EnumName="DINOLFOS_LIMB_NECK" Offset="0x94D8" />
-        <Limb Name="gDinolfosHeadLimb" Type="Standard" EnumName="DINOLFOS_LIMB_HEAD" Offset="0x94E4" />
-        <Limb Name="gDinolfosJawLimb" Type="Standard" EnumName="DINOLFOS_LIMB_JAW" Offset="0x94F0" />
-        <Limb Name="gDinolfosUpperTailLimb" Type="Standard" EnumName="DINOLFOS_LIMB_UPPER_TAIL" Offset="0x94FC" />
-        <Limb Name="gDinolfosLowerTailLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LOWER_TAIL" Offset="0x9508" />
-        <Limb Name="gDinolfosKnifeLimb" Type="Standard" EnumName="DINOLFOS_LIMB_KNIFE" Offset="0x9514" />
-        <Skeleton Name="gDinolfosSkel" Type="Flex" LimbType="Standard" LimbNone="DINOLFOS_LIMB_NONE" LimbMax="DINOLFOS_LIMB_MAX" EnumName="DinolfosLimb" Offset="0x9570" />
-
-        <Animation Name="gDinolfosCryAnim" Offset="0x9B70" /> <!-- Original name is "zf2_sakebi" -->
-        <Animation Name="gDinolfosDieAnim" Offset="0xABD0" /> <!-- Original name is "zf2_lowerlegi" -->
-        <Animation Name="gDinolfosIntroAnim" Offset="0xC974" /> <!-- Original name is "zf2_startDEMO" -->
-        <Animation Name="gDinolfosHitAnim" Offset="0xD21C" /> <!-- Original name is "zf2_yarare" -->
-        <Animation Name="gDinolfosSidestepAnim" Offset="0xD62C" /> <!-- Original name is "zf2_yokoaruki" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dkjail_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dkjail_obj.xml
deleted file mode 100644
index 0827c3814..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dkjail_obj.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Assets for the ivy jail -->
-    <File Name="object_dkjail_obj" Segment="6">
-        <DList Name="gDkjailIvyDL" Offset="0x80" /> <!-- Original name is "m2_Mn_TUTA_modelT" -->
-        <DList Name="gDkjailEmptyDL" Offset="0x150" />
-        <Texture Name="gDkjailIvyTex" OutName="dkjail_ivy" Format="rgba16" Width="32" Height="32" Offset="0x158" />
-        <Texture Name="gDkjailMaskTex" OutName="dkjail_mask" Format="ia8" Width="32" Height="64" Offset="0x958" />
-        <Collision Name="gDkjailCol" Offset="0x11A8" /> <!-- Original name is "m2_Mn_TUTA_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dmask.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dmask.xml
deleted file mode 100644
index 29f245b1b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dmask.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="object_dmask" Segment="6">
-        <Animation Name="object_dmask_Anim_00017C" Offset="0x17C" /> <!-- Original name is "gbm_fall" -->
-        <Animation Name="object_dmask_Anim_0001A8" Offset="0x1A8" /> <!-- Original name is "gbm_normal" -->
-        <Limb Name="object_dmask_Standardlimb_01C0" Type="Standard" Offset="0x1C0" />
-        <Skeleton Name="object_dmask_Skel_001D0" Type="Flex" LimbType="Standard" Offset="0x1D0" />
-        <DList Name="object_dmask_DL_000430" Offset="0x430" />
-        <Texture Name="object_dmask_Tex_000578" OutName="tex_000578" Format="i8" Width="64" Height="32" Offset="0x578" />
-        <Texture Name="object_dmask_Tex_000D78" OutName="tex_000D78" Format="i8" Width="32" Height="16" Offset="0xD78" />
-        <Animation Name="object_dmask_Anim_001090" Offset="0x1090" /> <!-- Original name is "gmask_rakka" -->
-        <Limb Name="object_dmask_Standardlimb_010A0" Type="Standard" Offset="0x10A0" />
-        <Skeleton Name="object_dmask_Skel_010B0" Type="Normal" LimbType="Standard" Offset="0x10B0" />
-        <Animation Name="object_dmask_Anim_0011A0" Offset="0x11A0" /> <!-- Original name is "mjm_suteru" -->
-        <Animation Name="object_dmask_Anim_0013A4" Offset="0x13A4" /> <!-- Original name is "mjm_suteru_loop" -->
-        <Limb Name="object_dmask_Standardlimb_013C0" Type="Standard" Offset="0x13C0" />
-        <Skeleton Name="object_dmask_Skel_013D0" Type="Normal" LimbType="Standard" Offset="0x13D0" />
-        <DList Name="object_dmask_DL_001E70" Offset="0x1E70" />
-        <Texture Name="object_dmask_Tex_002220" OutName="tex_002220" Format="rgba16" Width="32" Height="64" Offset="0x2220" />
-        <Texture Name="object_dmask_Tex_003220" OutName="tex_003220" Format="rgba16" Width="16" Height="16" Offset="0x3220" />
-        <Texture Name="object_dmask_Tex_003420" OutName="tex_003420" Format="rgba16" Width="16" Height="16" Offset="0x3420" />
-        <Texture Name="object_dmask_Tex_003620" OutName="tex_003620" Format="rgba16" Width="16" Height="16" Offset="0x3620" />
-        <Texture Name="object_dmask_Tex_003820" OutName="tex_003820" Format="rgba16" Width="16" Height="16" Offset="0x3820" />
-        <Texture Name="object_dmask_Tex_003A20" OutName="tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x3A20" />
-        <Animation Name="object_dmask_Anim_004288" Offset="0x4288" /> <!-- Original name is "pzmask_taoreru" -->
-        <Limb Name="object_dmask_Standardlimb_042A0" Type="Standard" Offset="0x42A0" />
-        <Skeleton Name="object_dmask_Skel_042B0" Type="Normal" LimbType="Standard" Offset="0x42B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnj.xml
deleted file mode 100644
index f7f9d830c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnj.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<Root>
-    <!-- Assets for the Deku Butler -->
-    <File Name="object_dnj" Segment="6">
-        <!-- Deku Butler Animations -->
-        <Animation Name="gDekuButlerStartRaceStartAnim" Offset="0x470" /> <!-- Original name is "dnj_douzoR" (named after the line he says when the race starts in the Japanese text)-->
-        <Animation Name="gDekuButlerStartRaceEndAnim" Offset="0x8F0" /> <!-- Original name is "dnj_douzoTOwaitR" -->
-        <Animation Name="gDekuButlerFlyAnim" Offset="0xF6C" /> <!-- Original name is "dnj_flyR" -->
-        <Animation Name="gDekuButlerFarewellAnim" Offset="0x1A50" /> <!-- Original name is "dnj_goodbye" -->
-        <Animation Name="gDekuButlerGreetingAnim" Offset="0x2530" /> <!-- Original name is "dnj_hello" -->
-        <Animation Name="gDekuButlerGreetingWithCandleAnim" Offset="0x3320" /> <!-- Original name is "dnj_helloR" -->
-        <Animation Name="gDekuButlerPrayerLoopAnim" Offset="0x36D0" /> <!-- Original name is "dnj_inori" ("prayer; supplication") -->
-        <Animation Name="gDekuButlerCloseParasolAnim" Offset="0x41CC" /> <!-- Original name is "dnj_kasacloseR" ("kasa" = "umbrella; parasol") -->
-        <Animation Name="gDekuButlerOpenParasolAnim" Offset="0x4DD8" /> <!-- Original name is "dnj_kasaopenR" -->
-        <Animation Name="gDekuButlerShockStartAnim" Offset="0x51E4" /> <!-- Original name is "dnj_kosinukasu" ("to be unable to stand due to fear/surprise") -->
-        <Animation Name="gDekuButlerShockLoopAnim" Offset="0x5E20" /> <!-- Original name is "dnj_kosinukasu_loop" -->
-        <Animation Name="gDekuButlerImploreLoopAnim" Offset="0x5F98" /> <!-- Original name is "dnj_oisame" ("o" = "king", "isame" = "to admonish; to advise") -->
-        <Animation Name="gDekuButlerImploreEndAnim" Offset="0x6488" /> <!-- Original name is "dnj_oisameTOwait" -->
-        <Animation Name="gDekuButlerGrieveAnim" Offset="0x6F84" /> <!-- Original name is "dnj_rakutan_loop" ("despondency; disappointment​")-->
-        <Animation Name="gDekuButlerTalkAnim" Offset="0x73E4" /> <!-- Original name is "dnj_talk" -->
-        <Animation Name="gDekuButlerTalkWithParasolAndCandleAnim" Offset="0x77A8" /> <!-- Original name is "dnj_talkR" -->
-        <Animation Name="gDekuButlerIdleAnim" Offset="0x7CA4" /> <!-- Original name is "dnj_wait" -->
-        <Animation Name="gDekuButlerIdleWithCandleAnim" Offset="0x8324" /> <!-- Original name is "dnj_waitR" -->
-        <Animation Name="gDekuButlerPrayerStartAnim" Offset="0x8AE4" /> <!-- Original name is "dnj_waitTOinori" -->
-        <Animation Name="gDekuButlerImploreStartAnim" Offset="0x9100" /> <!-- Original name is "dnj_waitTOoisame" -->
-
-        <!-- Deku Butler Limb DisplayLists -->
-        <DList Name="gDekuButlerEyesDL" Offset="0xB7C0" />
-        <DList Name="gDekuButlerUpperBodyDL" Offset="0xB850" />
-        <DList Name="gDekuButlerLeftForearmDL" Offset="0xBC68" />
-        <DList Name="gDekuButlerLeftHandDL" Offset="0xBDD8" />
-        <DList Name="gDekuButlerCandleDL" Offset="0xBEF0" />
-        <DList Name="gDekuButlerCandleWickDL" Offset="0xC118" />
-        <DList Name="gDekuButlerLeftUpperArmDL" Offset="0xC1A0" />
-        <DList Name="gDekuButlerSnoutDL" Offset="0xC248" />
-        <DList Name="gDekuButlerRightMustacheCurlDL" Offset="0xC370" />
-        <DList Name="gDekuButlerRightMustacheBaseDL" Offset="0xC450" />
-        <DList Name="gDekuButlerLeftMustacheCurlDL" Offset="0xC4E0" />
-        <DList Name="gDekuButlerLeftMustacheBaseDL" Offset="0xC5C0" />
-        <DList Name="gDekuButlerRightForearmDL" Offset="0xC650" />
-        <DList Name="gDekuButlerRightHandDL" Offset="0xC7C0" />
-        <DList Name="gDekuButlerParasolUpperPetalsDL" Offset="0xC8D8" />
-        <DList Name="gDekuButlerParasolMiddlePetalsDL" Offset="0xC988" />
-        <DList Name="gDekuButlerParasolLowerPetalsDL" Offset="0xCA38" />
-        <DList Name="gDekuButlerParasolHandleDL" Offset="0xCAE8" />
-        <DList Name="gDekuButlerRightUpperArmDL" Offset="0xCBE8" />
-        <DList Name="gDekuButlerPelvisDL" Offset="0xCC90" />
-        <DList Name="gDekuButlerLeftShinDL" Offset="0xCD48" />
-        <DList Name="gDekuButlerLeftFootDL" Offset="0xCE00" />
-        <DList Name="gDekuButlerLeftThighDL" Offset="0xCEC8" />
-        <DList Name="gDekuButlerRightShinDL" Offset="0xCF88" />
-        <DList Name="gDekuButlerRightFootDL" Offset="0xD040" />
-        <DList Name="gDekuButlerRightThighDL" Offset="0xD108" />
-
-        <!-- Deku Butler Textures -->
-        <Texture Name="gDekuButlerEyeTex" OutName="deku_butler_eye" Format="rgba16" Width="16" Height="16" Offset="0xD1C8" />
-        <Texture Name="gDekuButlerBodyAndCandleHolderTex" OutName="deku_butler_body_and_candle_holder" Format="rgba16" Width="16" Height="16" Offset="0xD3C8" />
-        <Texture Name="gDekuButlerMouthTex" OutName="deku_butler_mouth" Format="rgba16" Width="8" Height="8" Offset="0xD5C8" />
-        <Texture Name="gDekuButlerLeafTex" OutName="deku_butler_leaf" Format="rgba16" Width="16" Height="16" Offset="0xD648" />
-        <Texture Name="gDekuButlerParasolPetalTex" OutName="deku_butler_parasol_petal" Format="rgba16" Width="16" Height="32" Offset="0xD848" />
-        <Texture Name="gDekuButlerCandleTex" OutName="deku_butler_candle" Format="rgba16" Width="16" Height="8" Offset="0xDC48" />
-        <Texture Name="gDekuButlerHairTex" OutName="deku_butler_hair" Format="rgba16" Width="16" Height="16" Offset="0xDD48" />
-        <Texture Name="gDekuButlerBowtieCenterTex" OutName="deku_butler_bowtie_center" Format="rgba16" Width="8" Height="16" Offset="0xDF48" />
-
-        <!-- Deku Butler Limbs -->
-        <Limb Name="gDekuButlerRootLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_ROOT" Offset="0xE048" />
-        <Limb Name="gDekuButlerPelvisLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PELVIS" Offset="0xE054" />
-        <Limb Name="gDekuButlerRightThighLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_THIGH" Offset="0xE060" />
-        <Limb Name="gDekuButlerRightShinLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_SHIN" Offset="0xE06C" />
-        <Limb Name="gDekuButlerRightFootLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_FOOT" Offset="0xE078" />
-        <Limb Name="gDekuButlerLeftThighLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_THIGH" Offset="0xE084" />
-        <Limb Name="gDekuButlerLeftShinLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_SHIN" Offset="0xE090" />
-        <Limb Name="gDekuButlerLeftFootLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_FOOT" Offset="0xE09C" />
-        <Limb Name="gDekuButlerEyesLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_EYES" Offset="0xE0A8" />
-        <Limb Name="gDekuButlerRightUpperArmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_UPPER_ARM" Offset="0xE0B4" />
-        <Limb Name="gDekuButlerRightForearmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_FOREARM" Offset="0xE0C0" />
-        <Limb Name="gDekuButlerRightHandLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_HAND" Offset="0xE0CC" />
-        <Limb Name="gDekuButlerParasolHandleLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_HANDLE" Offset="0xE0D8" />
-        <Limb Name="gDekuButlerParasolUpperPetalsLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_UPPER_PETALS" Offset="0xE0E4" />
-        <Limb Name="gDekuButlerParasolLowerPetalsLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_LOWER_PETALS" Offset="0xE0F0" />
-        <Limb Name="gDekuButlerParasolMiddlePetalsLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_MIDDLE_PETALS" Offset="0xE0FC" />
-        <Limb Name="gDekuButlerSnoutLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_SNOUT" Offset="0xE108" />
-        <Limb Name="gDekuButlerLeftMustacheBaseLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_MUSTACHE_BASE" Offset="0xE114" />
-        <Limb Name="gDekuButlerLeftMustacheCurlLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_MUSTACHE_CURL" Offset="0xE120" />
-        <Limb Name="gDekuButlerRightMustacheBaseLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_MUSTACHE_BASE" Offset="0xE12C" />
-        <Limb Name="gDekuButlerRightMustacheCurlLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_MUSTACHE_CURL" Offset="0xE138" />
-        <Limb Name="gDekuButlerLeftUpperArmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_UPPER_ARM" Offset="0xE144" />
-        <Limb Name="gDekuButlerLeftForearmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_FOREARM" Offset="0xE150" />
-        <Limb Name="gDekuButlerLeftHandLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_HAND" Offset="0xE15C" />
-        <Limb Name="gDekuButlerCandleLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_CANDLE" Offset="0xE168" />
-        <Limb Name="gDekuButlerCandleWickLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_CANDLE_WICK" Offset="0xE174" />
-        <Limb Name="gDekuButlerUpperBodyLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_UPPER_BODY" Offset="0xE180" />
-
-        <!-- Deku Butler Skeleton -->
-        <Skeleton Name="gDekuButlerSkel" Type="Flex" LimbType="Standard" LimbNone="DEKU_BUTLER_LIMB_NONE" LimbMax="DEKU_BUTLER_LIMB_MAX" EnumName="DekuButlerLimb" Offset="0xE1F8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnk.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnk.xml
deleted file mode 100644
index 0e35b1f97..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnk.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<Root>
-    <!-- Assets for Deku Palace Guards -->
-    <File Name="object_dnk" Segment="6">
-        <Animation Name="gDekuPalaceGuardAttackAnim" Offset="0x31C" /> <!-- Original name is "dnk_attack" -->
-        <Animation Name="gDekuPalaceGuardDigAnim" Offset="0x430" /> <!-- Original name is "dnk_dig" -->
-        <Animation Name="gDekuPalaceGuardHappyAnim" Offset="0x6CC" /> <!-- Original name is "dnk_happy" -->
-        <Animation Name="gDekuPalaceGuardJumpAnim" Offset="0x894" /> <!-- Original name is "dnk_jump" -->
-        <Animation Name="gDekuPalaceGuardStartAnim" Offset="0xB70" /> <!-- Original name is "dnk_start" -->
-        <Texture Name="gDekuPalaceGuardLeafTorsoTex" OutName="deku_palace_guard_leaf_torso" Format="rgba16" Width="32" Height="32" Offset="0xB80" />
-        <Texture Name="gDekuPalaceGuardFootTex" OutName="deku_palace_guard_foot" Format="rgba16" Width="16" Height="16" Offset="0x1380" />
-        <Texture Name="gDekuPalaceGuardHeadTex" OutName="deku_palace_guard_head" Format="rgba16" Width="8" Height="8" Offset="0x1580" />
-        <Texture Name="gDekuPalaceGuardMouthTex" OutName="deku_palace_guard_mouth" Format="rgba16" Width="8" Height="8" Offset="0x1600" />
-        <Texture Name="gDekuPalaceGuardEyeOpenTex" OutName="deku_palace_guard_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x1680" />
-        <Texture Name="gDekuPalaceGuardEyeHalfTex" OutName="deku_palace_guard_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x1700" />
-        <Texture Name="gDekuPalaceGuardEyeClosedTex" OutName="deku_palace_guard_eye_closed" Format="rgba16" Width="8" Height="8" Offset="0x1780" />
-        <DList Name="gDekuPalaceGuardRightLeafDL" Offset="0x1DD0" />
-        <DList Name="gDekuPalaceGuardRightLeaf2DL" Offset="0x1E58" />
-        <DList Name="gDekuPalaceGuardLeftLeafDL" Offset="0x1E68" />
-        <DList Name="gDekuPalaceGuardLeftLeaf2DL" Offset="0x1EF0" />
-        <DList Name="gDekuPalaceGuardRearLeafDL" Offset="0x1F00" />
-        <DList Name="gDekuPalaceGuardRearLeaf2DL" Offset="0x1F90" />
-        <DList Name="gDekuPalaceGuardCenterLeafDL" Offset="0x1FA0" />
-        <DList Name="gDekuPalaceGuardCenterLeaf2DL" Offset="0x2030" />
-        <DList Name="gDekuPalaceGuardTorsoDL" Offset="0x2040" />
-        <DList Name="gDekuPalaceGuardTorso2DL" Offset="0x20F0" />
-        <DList Name="gDekuPalaceGuardEyesDL" Offset="0x2100" />
-        <DList Name="gDekuPalaceGuardEyes2DL" Offset="0x2188" />
-        <DList Name="gDekuPalaceGuardRightFootDL" Offset="0x2198" />
-        <DList Name="gDekuPalaceGuardRightFoot2DL" Offset="0x2240" />
-        <DList Name="gDekuPalaceGuardLeftFootDL" Offset="0x2250" />
-        <DList Name="gDekuPalaceGuardLeftFoot2DL" Offset="0x22F8" />
-        <DList Name="gDekuPalaceGuardHeadDL" Offset="0x2308" />
-        <DList Name="gDekuPalaceGuardHead2DL" Offset="0x2400" />
-        <DList Name="gDekuPalaceGuardSnoutDL" Offset="0x2410" />
-        <DList Name="gDekuPalaceGuardSnout2DL" Offset="0x2510" />
-        <DList Name="gDekuPalaceGuardFlowerDL" Offset="0x2700" />
-        <Limb Name="gDekuPalaceGuardTorsoLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_TORSO" Offset="0x27A8" />
-        <Limb Name="gDekuPalaceGuardHeadLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_HEAD" Offset="0x27B4" />
-        <Limb Name="gDekuPalaceGuardLeftLeafLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_LEFT_LEAF" Offset="0x27C0" />
-        <Limb Name="gDekuPalaceGuardRightLeafLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_RIGHT_LEAF" Offset="0x27CC" />
-        <Limb Name="gDekuPalaceGuardCenterLeafLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_CENTER_LEAF" Offset="0x27D8" />
-        <Limb Name="gDekuPalaceGuardRearLeafLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_REAR_LEAF" Offset="0x27E4" />
-        <Limb Name="gDekuPalaceGuardSnoutLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_SNOUT" Offset="0x27F0" />
-        <Limb Name="gDekuPalaceGuardEyesLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_EYES" Offset="0x27FC" />
-        <Limb Name="gDekuPalaceGuardLeftFootLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_LEFT_FOOT" Offset="0x2808" />
-        <Limb Name="gDekuPalaceGuardRightFootLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_RIGHT_FOOT" Offset="0x2814" />
-        <Skeleton Name="gDekuPalaceGuardSkel" Type="Normal" LimbType="Standard" LimbNone="DEKU_PALACE_GUARD_LIMB_NONE" LimbMax="DEKU_PALACE_GUARD_LIMB_MAX" EnumName="DekuPalaceGuardLimb" Offset="0x2848" />
-        <Animation Name="gDekuPalaceGuardWaitAnim" Offset="0x2A08" /> <!-- Original name is "dnk_wait" -->
-        <Animation Name="gDekuPalaceGuardWalkAnim" Offset="0x2B6C" /> <!-- Original name is "dnk_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dno.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dno.xml
deleted file mode 100644
index e5b3323dc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dno.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<Root>
-    <!-- Assets for the Deku King -->
-    <File Name="object_dno" Segment="6">
-        <!-- Deku King Animations -->
-        <Animation Name="gDekuKingJumpedOnStartAnim" Offset="0x6F0" /> <!-- Original name is "dno_attack2" -->
-        <Animation Name="gDekuKingJumpedOnLoopAnim" Offset="0xBF8" /> <!-- Original name is "dno_attack2_loop" -->
-        <Animation Name="gDekuKingSpinScepterAnim" Offset="0x1100" /> <!-- Original name is "dno_batton" -->
-        <Animation Name="gDekuKingMarchAnim" Offset="0x1AEC" /> <!-- Original name is "dno_battonwalk" -->
-        <Animation Name="gDekuKingJumpedOnEndAnim" Offset="0x2690" /> <!-- Original name is "dno_gaku" -->
-        <Animation Name="gDekuKingLyingDownTwitchAnim" Offset="0x3408" /> <!-- Original name is "dno_gaku_loop" -->
-        <Animation Name="gDekuKingLaughAnim" Offset="0x3DBC" /> <!-- Original name is "dno_gebohaha" (onomatopoetic for a boisterous laugh) -->
-        <Animation Name="gDekuKingJumpAnim" Offset="0x47B8" /> <!-- Original name is "dno_gogojump" -->
-        <Animation Name="gDekuKingIntimidateAnim" Offset="0x4EA0" /> <!-- Original name is "dno_horehore" -->
-        <Animation Name="gDekuKingWailStartAnim" Offset="0x5284" /> <!-- Original name is "dno_jidaTOnage" -->
-        <Animation Name="gDekuKingFootStampLoopAnim" Offset="0x5A14" /> <!-- Original name is "dno_jidanda" ("to stamp one's feet (in frustration, impatience, etc.)​") -->
-        <Animation Name="gDekuKingFootStampStartAnim" Offset="0x5E18" /> <!-- Original name is "dno_nageTOjida" -->
-        <Animation Name="gDekuKingWailLoopAnim" Offset="0x6984" /> <!-- Original name is "dno_nageki" ("grief; lamentation​") -->
-        <Animation Name="gDekuKingSurpriseAnim" Offset="0x7528" /> <!-- Original name is "dno_oh" -->
-        <Animation Name="gDekuKingIdleAnim" Offset="0x8328" /> <!-- Original name is "dno_wait" -->
-
-        <!-- Deku King Textures -->
-        <Texture Name="gDekuKingBodyTex" OutName="deku_king_body" Format="rgba16" Width="16" Height="16" Offset="0x8340" />
-        <Texture Name="gDekuKingMustacheAndLoinclothLeafTex" OutName="deku_king_mustache_and_loincloth_leaf" Format="rgba16" Width="16" Height="16" Offset="0x8540" />
-        <Texture Name="gDekuKingCrownTex" OutName="deku_king_crown" Format="rgba16" Width="32" Height="32" Offset="0x8740" />
-        <Texture Name="gDekuKingLeavesTex" OutName="deku_king_leaves" Format="rgba16" Width="32" Height="64" Offset="0x8F40" />
-        <Texture Name="gDekuKingBeardLeavesTex" OutName="deku_king_beard_leaves" Format="rgba16" Width="32" Height="32" Offset="0x9F40" />
-        <Texture Name="gDekuKingEyeTex" OutName="deku_king_eye" Format="rgba16" Width="16" Height="16" Offset="0xA740" />
-        <Texture Name="gDekuKingScepterTipTex" OutName="deku_king_scepter_tip" Format="rgba16" Width="8" Height="8" Offset="0xA940" />
-        <Texture Name="gDekuKingScepterPetalTex" OutName="deku_king_scepter_petal" Format="rgba16" Width="16" Height="16" Offset="0xA9C0" />
-        <Texture Name="gDekuKingSnoutTex" OutName="deku_king_snout" Format="rgba16" Width="8" Height="8" Offset="0xABC0" />
-        <Texture Name="gDekuKingMouthTex" OutName="deku_king_mouth" Format="rgba16" Width="8" Height="8" Offset="0xAC40" />
-
-        <!-- Deku King Limb DisplayLists -->
-        <DList Name="gDekuKingCrownDL" Offset="0xC9B0" />
-        <DList Name="gDekuKingCrownLeavesDL" Offset="0xCB70" />
-        <DList Name="gDekuKingUpperBodyDL" Offset="0xCC10" />
-        <DList Name="gDekuKingEyesDL" Offset="0xCE38" />
-        <DList Name="gDekuKingLeftHandDL" Offset="0xCED0" />
-        <DList Name="gDekuKingLeftForearmDL" Offset="0xCFA8" />
-        <DList Name="gDekuKingLeftForearmLowerLeavesDL" Offset="0xD050" />
-        <DList Name="gDekuKingLeftForearmUpperLeavesDL" Offset="0xD140" />
-        <DList Name="gDekuKingLeftUpperArmDL" Offset="0xD230" />
-        <DList Name="gDekuKingLeftUpperArmLowerLeavesDL" Offset="0xD2E8" />
-        <DList Name="gDekuKingLeftUpperArmUpperLeavesDL" Offset="0xD3D8" />
-        <DList Name="gDekuKingSnoutDL" Offset="0xD4C8" />
-        <DList Name="gDekuKingRightLowerMustacheDL" Offset="0xD668" />
-        <DList Name="gDekuKingRightUpperMustacheDL" Offset="0xD758" />
-        <DList Name="gDekuKingLeftLowerMustacheDL" Offset="0xD848" />
-        <DList Name="gDekuKingLeftUpperMustacheDL" Offset="0xD938" />
-        <DList Name="gDekuKingRightHandDL" Offset="0xDA28" />
-        <DList Name="gDekuKingScepterDL" Offset="0xDB00" />
-        <DList Name="gDekuKingRightForearmDL" Offset="0xDCA8" />
-        <DList Name="gDekuKingRightForearmLowerLeavesDL" Offset="0xDD50" />
-        <DList Name="gDekuKingRightForearmUpperLeavesDL" Offset="0xDE40" />
-        <DList Name="gDekuKingRightUpperArmDL" Offset="0xDF30" />
-        <DList Name="gDekuKingRightUpperArmLowerLeavesDL" Offset="0xDFE8" />
-        <DList Name="gDekuKingRightUpperArmUpperLeavesDL" Offset="0xE0D8" />
-        <DList Name="gDekuKingPelvisDL" Offset="0xE1C8" />
-        <DList Name="gDekuKingRightFootDL" Offset="0xE318" />
-        <DList Name="gDekuKingRightShinDL" Offset="0xE420" />
-        <DList Name="gDekuKingRightThighDL" Offset="0xE538" />
-        <DList Name="gDekuKingLeftFootDL" Offset="0xE630" />
-        <DList Name="gDekuKingLeftShinDL" Offset="0xE738" />
-        <DList Name="gDekuKingLeftThighDL" Offset="0xE850" />
-
-        <!-- Deku King Limbs -->
-        <Limb Name="gDekuKingRootLimb" Type="Standard" EnumName="DEKU_KING_LIMB_ROOT" Offset="0xE948" />
-        <Limb Name="gDekuKingPelvisLimb" Type="Standard" EnumName="DEKU_KING_LIMB_PELVIS" Offset="0xE954" />
-        <Limb Name="gDekuKingLeftThighLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_THIGH" Offset="0xE960" />
-        <Limb Name="gDekuKingLeftShinLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_SHIN" Offset="0xE96C" />
-        <Limb Name="gDekuKingLeftFootLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_FOOT" Offset="0xE978" />
-        <Limb Name="gDekuKingRightThighLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_THIGH" Offset="0xE984" />
-        <Limb Name="gDekuKingRightShinLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_SHIN" Offset="0xE990" />
-        <Limb Name="gDekuKingRightFootLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_FOOT" Offset="0xE99C" />
-        <Limb Name="gDekuKingUpperBodyLimb" Type="Standard" EnumName="DEKU_KING_LIMB_UPPER_BODY" Offset="0xE9A8" />
-        <Limb Name="gDekuKingRightUpperArmLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_UPPER_ARM" Offset="0xE9B4" />
-        <Limb Name="gDekuKingRightUpperArmUpperLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_UPPER_ARM_UPPER_LEAVES" Offset="0xE9C0" />
-        <Limb Name="gDekuKingRightUpperArmLowerLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_UPPER_ARM_LOWER_LEAVES" Offset="0xE9CC" />
-        <Limb Name="gDekuKingRightForearmLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_FOREARM" Offset="0xE9D8" />
-        <Limb Name="gDekuKingRightForearmUpperLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_FOREARM_UPPER_LEAVES" Offset="0xE9E4" />
-        <Limb Name="gDekuKingRightForearmLowerLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_FOREARM_LOWER_LEAVES" Offset="0xE9F0" />
-        <Limb Name="gDekuKingRightHandLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_HAND" Offset="0xE9FC" />
-        <Limb Name="gDekuKingScepterLimb" Type="Standard" EnumName="DEKU_KING_LIMB_SCEPTER" Offset="0xEA08" />
-        <Limb Name="gDekuKingSnoutLimb" Type="Standard" EnumName="DEKU_KING_LIMB_SNOUT" Offset="0xEA14" />
-        <Limb Name="gDekuKingLeftUpperMustacheLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_UPPER_MUSTACHE" Offset="0xEA20" />
-        <Limb Name="gDekuKingLeftLowerMustacheLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_LOWER_MUSTACHE" Offset="0xEA2C" />
-        <Limb Name="gDekuKingRightUpperMustacheLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_UPPER_MUSTACHE" Offset="0xEA38" />
-        <Limb Name="gDekuKingRightLowerMustacheLimb" Type="Standard" EnumName="DEKU_KING_LIMB_RIGHT_LOWER_MUSTACHE" Offset="0xEA44" />
-        <Limb Name="gDekuKingLeftUpperArmLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_UPPER_ARM" Offset="0xEA50" />
-        <Limb Name="gDekuKingLeftUpperArmUpperLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_UPPER_ARM_UPPER_LEAVES" Offset="0xEA5C" />
-        <Limb Name="gDekuKingLeftUpperArmLowerLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_UPPER_ARM_LOWER_LEAVES" Offset="0xEA68" />
-        <Limb Name="gDekuKingLeftForearmLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_FOREARM" Offset="0xEA74" />
-        <Limb Name="gDekuKingLeftForearmUpperLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_FOREARM_UPPER_LEAVES" Offset="0xEA80" />
-        <Limb Name="gDekuKingLeftForearmLowerLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_FOREARM_LOWER_LEAVES" Offset="0xEA8C" />
-        <Limb Name="gDekuKingLeftHandLimb" Type="Standard" EnumName="DEKU_KING_LIMB_LEFT_HAND" Offset="0xEA98" />
-        <Limb Name="gDekuKingEyesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_EYES" Offset="0xEAA4" />
-        <Limb Name="gDekuKingCrownLimb" Type="Standard" EnumName="DEKU_KING_LIMB_CROWN" Offset="0xEAB0" />
-        <Limb Name="gDekuKingCrownLeavesLimb" Type="Standard" EnumName="DEKU_KING_LIMB_CROWN_LEAVES" Offset="0xEABC" />
-
-        <!-- Deku King Skeleton -->
-        <Skeleton Name="gDekuKingSkel" Type="Flex" LimbType="Standard" LimbNone="DEKU_KING_LIMB_NONE" LimbMax="DEKU_KING_LIMB_MAX" EnumName="DekuKingLimb" Offset="0xEB48" />
-
-        <!-- Deku King Animation -->
-        <Animation Name="gDekuKingPointScepterAnim" Offset="0xF504" /> <!-- Original name is "dno_yubisashi" ("pointing at") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnq.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnq.xml
deleted file mode 100644
index 4a21dbfef..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnq.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<Root>
-    <!-- Assets for the Deku Princess. -->
-    <File Name="object_dnq" Segment="6">
-        <!-- Deku Princess Animations -->
-        <Animation Name="gDekuPrincessJumpKickAnim" Offset="0x7D8" /> <!-- Original name is "dnq_atack" -->
-        <Animation Name="gDekuPrincessJumpAnim" Offset="0x125C" /> <!-- Original name is "dnq_attack1" -->
-        <Animation Name="gDekuPrincessBounceStartAnim" Offset="0x17F8" /> <!-- Original name is "dnq_attack2" -->
-        <Animation Name="gDekuPrincessBounceLoopAnim" Offset="0x1C1C" /> <!-- Original name is "dnq_attack2_loop" -->
-        <Animation Name="gDekuPrincessHurryAnim" Offset="0x21DC" /> <!-- Original name is "dnq_awate" ("to hurry; to rush; to hasten") -->
-        <Animation Name="gDekuPrincessHurryEndAnim" Offset="0x26B8" /> <!-- Original name is "dnq_awateTOwait" -->
-        <Animation Name="gDekuPrincessScoldAnim" Offset="0x4D08" /> <!-- Original name is "dnq_baka" ("idiot; moron; fool") -->
-        <Animation Name="gDekuPrincessGlareStartAnim" Offset="0x57AC" /> <!-- Original name is "dnq_gekido" ("rage; fury​") -->
-        <Animation Name="gDekuPrincessGlareLoopAnim" Offset="0x625C" /> <!-- Origianl name is "dnq_gekido_loop" -->
-        <Animation Name="gDekuPrincessThinkLoopAnim" Offset="0x674C" /> <!-- Original name is "dnq_hatena" ("question") -->
-        <Animation Name="gDekuPrincessArmsTogetherLoopAnim" Offset="0x6B74" /> <!-- Original name is "dnq_ho" -->
-        <Animation Name="gDekuPrincessLaughStartAnim" Offset="0x71F4" /> <!-- Original name is "dnq_hoTOhohoho" -->
-        <Animation Name="gDekuPrincessLaughLoopAnim" Offset="0x7960" /> <!-- Original name is "dnq_hohoho" -->
-        <Animation Name="gDekuPrincessTurnAroundAnim" Offset="0x8588" /> <!-- Original name is "dnq_maji" (from her Japanese dialogue, like "really?!" or "seriously?!")-->
-        <Animation Name="gDekuPrincessAngryStartAnim" Offset="0x923C" /> <!-- Original name is "dnq_okoru" ("to get angry; to get mad​") -->
-        <Animation Name="gDekuPrincessAngryLoopAnim" Offset="0x9AA0" /> <!-- Original name is "dnq_okoru_loop" -->
-        <Animation Name="gDekuPrincessBowAnim" Offset="0xA900" /> <!-- Original name is "dnq_orei" ("bow") -->
-        <Animation Name="gDekuPrincessRunAnim" Offset="0xAEB8" /> <!-- Original name is "dnq_run" -->
-        <Animation Name="gDekuPrincessIdleAnim" Offset="0xB324" /> <!-- Original name is "dnq_wait" -->
-        <Animation Name="gDekuPrincessThinkStartAnim" Offset="0xB754" /> <!-- Original name is "dnq_waitTOhatena" -->
-        <Animation Name="gDekuPrincessArmsTogetherStartAnim" Offset="0xBAD8" /> <!-- Original name is "dnq_waitTOho" -->
-
-        <!-- Deku Princess Limb DisplayLists -->
-        <DList Name="gDekuPrincessHeadDL" Offset="0xD670" />
-        <DList Name="gDekuPrincessEyesDL" Offset="0xD978" />
-        <DList Name="gDekuPrincessHair9DL" Offset="0xDA08" />
-        <DList Name="gDekuPrincessHair8DL" Offset="0xDAA0" />
-        <DList Name="gDekuPrincessHair7DL" Offset="0xDB38" />
-        <DList Name="gDekuPrincessHair6DL" Offset="0xDBD0" />
-        <DList Name="gDekuPrincessHair5DL" Offset="0xDC68" />
-        <DList Name="gDekuPrincessHair4DL" Offset="0xDD00" />
-        <DList Name="gDekuPrincessHair3DL" Offset="0xDD98" />
-        <DList Name="gDekuPrincessHair2DL" Offset="0xDE30" />
-        <DList Name="gDekuPrincessHair1DL" Offset="0xDEC8" />
-        <DList Name="gDekuPrincessSnoutDL" Offset="0xE018" />
-        <DList Name="gDekuPrincessRightEarringDL" Offset="0xE1C8" />
-        <DList Name="gDekuPrincessLeftEarringDL" Offset="0xE260" />
-        <DList Name="gDekuPrincessNeckDL" Offset="0xE2F8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gDekuPrincessTorsoDL" Offset="0xE340" />
-        <DList Name="gDekuPrincessRightSleeveEndDL" Offset="0xE410" />
-        <DList Name="gDekuPrincessRightForearmDL" Offset="0xE530" />
-        <DList Name="gDekuPrincessRightUpperArmDL" Offset="0xE650" />
-        <DList Name="gDekuPrincessLeftSleeveEndDL" Offset="0xE768" />
-        <DList Name="gDekuPrincessLeftForearmDL" Offset="0xE888" />
-        <DList Name="gDekuPrincessLeftUpperArmDL" Offset="0xE9A8" />
-        <DList Name="gDekuPrincessDressDL" Offset="0xEAC0" />
-        <DList Name="gDekuPrincessDressTrainDL" Offset="0xEBD8" />
-
-        <!-- Deku Princess Textures -->
-        <Texture Name="gDekuPrincessPetalTex" OutName="deku_princess_petal" Format="rgba16" Width="16" Height="32" Offset="0xECD0" />
-        <Texture Name="gDekuPrincessHairLeafTex" OutName="deku_princess_hair_leaf" Format="rgba16" Width="16" Height="32" Offset="0xF0D0" />
-        <Texture Name="gDekuPrincessHeadTex" OutName="deku_princess_head" Format="rgba16" Width="4" Height="16" Offset="0xF4D0" />
-        <Texture Name="gDekuPrincessMouthTex" OutName="deku_princess_mouth" Format="rgba16" Width="8" Height="8" Offset="0xF550" />
-        <Texture Name="gDekuPrincessFaceTex" OutName="deku_princess_face" Format="rgba16" Width="16" Height="16" Offset="0xF5D0" />
-        <Texture Name="gDekuPrincessDressTex" OutName="deku_princess_dress" Format="rgba16" Width="32" Height="32" Offset="0xF7D0" />
-        <Texture Name="gDekuPrincessSleeveTex" OutName="deku_princess_sleeve" Format="rgba16" Width="16" Height="32" Offset="0xFFD0" />
-        <Texture Name="gDekuPrincessEyeOpenTex" OutName="deku_princess_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x103D0" />
-        <Texture Name="gDekuPrincessEyeHalfTex" OutName="deku_princess_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x105D0" />
-        <Texture Name="gDekuPrincessEyeClosedTex" OutName="deku_princess_eye_closed" Format="rgba16" Width="16" Height="16" Offset="0x107D0" />
-        <Texture Name="gDekuPrincessEyeAngryTex" OutName="deku_princess_eye_angry" Format="rgba16" Width="16" Height="16" Offset="0x109D0" />
-
-        <!-- Deku Princess Limbs -->
-        <Limb Name="gDekuPrincessRootLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_ROOT" Offset="0x10BD0" />
-        <Limb Name="gDekuPrincessDressLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_DRESS" Offset="0x10BDC" />
-        <Limb Name="gDekuPrincessDressTrainLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_DRESS_TRAIN" Offset="0x10BE8" />
-        <Limb Name="gDekuPrincessTorsoLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_TORSO" Offset="0x10BF4" />
-        <Limb Name="gDekuPrincessLeftUpperArmLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_LEFT_UPPER_ARM" Offset="0x10C00" />
-        <Limb Name="gDekuPrincessLeftForearmLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_LEFT_FOREARM" Offset="0x10C0C" />
-        <Limb Name="gDekuPrincessLeftSleeveEndLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_LEFT_SLEEVE_END" Offset="0x10C18" />
-        <Limb Name="gDekuPrincessRightUpperArmLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_RIGHT_UPPER_ARM" Offset="0x10C24" />
-        <Limb Name="gDekuPrincessRightForearmLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_RIGHT_FOREARM" Offset="0x10C30" />
-        <Limb Name="gDekuPrincessRightSleeveEndLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_RIGHT_SLEEVE_END" Offset="0x10C3C" />
-        <Limb Name="gDekuPrincessNeckLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_NECK" Offset="0x10C48" />
-        <Limb Name="gDekuPrincessHeadLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HEAD" Offset="0x10C54" />
-        <Limb Name="gDekuPrincessLeftEarringLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_LEFT_EARRING" Offset="0x10C60" />
-        <Limb Name="gDekuPrincessRightEarringLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_RIGHT_EARRING" Offset="0x10C6C" />
-        <Limb Name="gDekuPrincessSnoutLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_SNOUT" Offset="0x10C78" />
-        <Limb Name="gDekuPrincessHair1Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_1" Offset="0x10C84" />
-        <Limb Name="gDekuPrincessHair2Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_2" Offset="0x10C90" />
-        <Limb Name="gDekuPrincessHair3Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_3" Offset="0x10C9C" />
-        <Limb Name="gDekuPrincessHair4Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_4" Offset="0x10CA8" />
-        <Limb Name="gDekuPrincessHair5Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_5" Offset="0x10CB4" />
-        <Limb Name="gDekuPrincessHair6Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_6" Offset="0x10CC0" />
-        <Limb Name="gDekuPrincessHair7Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_7" Offset="0x10CCC" />
-        <Limb Name="gDekuPrincessHair8Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_8" Offset="0x10CD8" />
-        <Limb Name="gDekuPrincessHair9Limb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_HAIR_9" Offset="0x10CE4" />
-        <Limb Name="gDekuPrincessEyesLimb" Type="Standard" EnumName="DEKU_PRINCESS_LIMB_EYES" Offset="0x10CF0" />
-
-        <!-- Deku Princess Skeleton -->
-        <Skeleton Name="gDekuPrincessSkel" Type="Flex" LimbType="Standard" LimbNone="DEKU_PRINCESS_LIMB_NONE" LimbMax="DEKU_PRINCESS_LIMB_MAX" EnumName="DekuPrincessLimb" Offset="0x10D60" />
-
-        <!-- Deku Princess Animations -->
-        <Animation Name="gDekuPrincessWalkAnim" Offset="0x115B8" /> <!-- Original name is "dnq_walk" -->
-        <Animation Name="gDekuPrincessGreetingAnim" Offset="0x12428" /> <!-- Original name is "dnq_yorosiku" (probably short for "pleased to meet you") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dns.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dns.xml
deleted file mode 100644
index 903dfba6c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dns.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<Root>
-    <!-- Assets for the King's Chamber Deku Guards -->
-    <File Name="object_dns" Segment="6">
-        <Animation Name="gKingsChamberDekuGuardDanceAnim" Offset="0x2A8" /> <!-- Original name is "dns_dance" -->
-        <Animation Name="gKingsChamberDekuGuardFlipAnim" Offset="0x734" /> <!-- Original name is "dns_dancejump" -->
-        <Animation Name="gKingsChamberDekuGuardSurpriseStartAnim" Offset="0x8F4" /> <!-- Original name is "dns_furueru" ("to shiver") -->
-        <Animation Name="gKingsChamberDekuGuardSurpriseLoopAnim" Offset="0xBD8" />
-        <Animation Name="gKingsChamberDekuGuardRunStartAnim" Offset="0xD58" /> <!-- Original name is "dns_hasiru" ("to run") -->
-        <Animation Name="gKingsChamberDekuGuardRunLoopAnim" Offset="0xFEC" />
-        <DList Name="gKingsChamberDekuGuardRightFootDL" Offset="0x1640" />
-        <DList Name="gKingsChamberDekuGuardLeftFootDL" Offset="0x16F0" />
-        <DList Name="gKingsChamberDekuGuardSnoutDL" Offset="0x17A0" />
-        <DList Name="gKingsChamberDekuGuardHeadDL" Offset="0x18B8" />
-        <DList Name="gKingsChamberDekuGuardStalkDL" Offset="0x19B8" />
-        <DList Name="gKingsChamberDekuGuardEyesDL" Offset="0x1A50" />
-        <DList Name="gKingsChamberDekuGuardTorsoDL" Offset="0x1AD8" />
-        <DList Name="gKingsChamberDekuGuardLeftMustacheDL" Offset="0x1B90" />
-        <DList Name="gKingsChamberDekuGuardRightMustacheDL" Offset="0x1C20" />
-        <DList Name="gKingsChamberDekuGuardLeftLeafDL" Offset="0x1CB0" />
-        <DList Name="gKingsChamberDekuGuardCenterLeafDL" Offset="0x1D40" />
-        <DList Name="gKingsChamberDekuGuardRightLeafDL" Offset="0x1DD8" />
-        <Texture Name="gKingsChamberDekuGuardLeafTex" OutName="kings_chamber_deku_guard_leaf" Format="rgba16" Width="32" Height="32" Offset="0x1E68" />
-        <Texture Name="gKingsChamberDekuGuardBodyTex" OutName="kings_chamber_deku_guard_body" Format="rgba16" Width="16" Height="16" Offset="0x2668" />
-        <Texture Name="gKingsChamberDekuGuardMouthTex" OutName="kings_chamber_deku_guard_mouth" Format="rgba16" Width="8" Height="8" Offset="0x2868" />
-        <Texture Name="gKingsChamberDekuGuardEyeOpenTex" OutName="kings_chamber_deku_guard_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x28E8" />" Format="rgba16" Width="8" Height="8" Offset="0x28E8" />
-        <Texture Name="gKingsChamberDekuGuardEyeHalfTex" OutName="kings_chamber_deku_guard_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x2968" />
-        <Texture Name="gKingsChamberDekuGuardEyeClosedTex" OutName="kings_chamber_deku_guard_eye_closed" Format="rgba16" Width="8" Height="8" Offset="0x29E8" />
-        <DList Name="gKingsChamberDekuGuardDekuFlowerDL" Offset="0x2C48" />
-        <Limb Name="gKingsChamberDekuGuardTorsoLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_TORSO" Offset="0x2D18" />
-        <Limb Name="gKingsChamberDekuGuardHeadLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_HEAD" Offset="0x2D24" />
-        <Limb Name="gKingsChamberDekuGuardStalkLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_STALK" Offset="0x2D30" />
-        <Limb Name="gKingsChamberDekuGuardLeftLeafLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_LEFT_LEAF" Offset="0x2D3C" />
-        <Limb Name="gKingsChamberDekuGuardRightLeafLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_RIGHT_LEAF" Offset="0x2D48" />
-        <Limb Name="gKingsChamberDekuGuardCenterLeafLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_CENTER_LEAF" Offset="0x2D54" />
-        <Limb Name="gKingsChamberDekuGuardSnoutLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_SNOUT" Offset="0x2D60" />
-        <Limb Name="gKingsChamberDekuGuardRightMustacheLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_RIGHT_MUSTACHE" Offset="0x2D6C" />
-        <Limb Name="gKingsChamberDekuGuardLeftMustacheLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_LEFT_MUSTACHE" Offset="0x2D78" />
-        <Limb Name="gKingsChamberDekuGuardEyesLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_EYES" Offset="0x2D84" />
-        <Limb Name="gKingsChamberDekuGuardLeftFootLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_LEFT_FOOT" Offset="0x2D90" />
-        <Limb Name="gKingsChamberDekuGuardRightFootLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_RIGHT_FOOT" Offset="0x2D9C" />
-        <Skeleton Name="gKingsChamberDekuGuardSkel" Type="Normal" LimbType="Standard" LimbNone="KINGS_CHAMBER_DEKU_GUARD_LIMB_NONE" LimbMax="KINGS_CHAMBER_DEKU_GUARD_LIMB_MAX" EnumName="KingsChamberDekuGuardLimb" Offset="0x2DD8" />
-        <Animation Name="gKingsChamberDekuGuardIdleAnim" Offset="0x3310" /> <!-- Original name is "dns_wait" -->
-        <Animation Name="gKingsChamberDekuGuardWalkAnim" Offset="0x34EC" /> <!-- Original name is "dns_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnt.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnt.xml
deleted file mode 100644
index 658720258..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dnt.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<Root>
-    <!-- Assets for business scrubs -->
-    <File Name="object_dnt" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gBusinessScrubShockedPoundAnim" Offset="0x994" /> <!-- Original name is "dnt_banban" -->
-        <Animation Name="gBusinessScrubTakeOffHatAnim" Offset="0x12F4" /> <!-- Original name is "dnt_boyon" -->
-
-        <!-- Additional Eyes DLs -->
-        <DList Name="gBusinessScrubEyesWideDL" Offset="0x1350" />
-        <DList Name="gBusinessScrubEyesSquintDL" Offset="0x1420" />
-
-        <!-- Animations -->
-        <Animation Name="gBusinessScrubFlyLoopAnim" Offset="0x1BC8" /> <!-- Original name is "dnt_fly" -->
-        <Animation Name="gBusinessScrubShockedShakeHeadAnim" Offset="0x1E2C" /> <!-- Original name is "dnt_iyaiya" -->
-        <Animation Name="gBusinessScrubShockedEndAnim" Offset="0x2268" /> <!-- Original name is "dnt_iyaiyaTOmuun" -->
-        <Animation Name="gBusinessScrubFlyEndAnim" Offset="0x2670" /> <!-- Original name is "dnt_kouka" -->
-        <Animation Name="gBusinessScrubBurrowAnim" Offset="0x29E8" /> <!-- Original name is "dnt_moguru" -->
-        <Animation Name="gBusinessScrubThinkAnim" Offset="0x2F08" /> <!-- Original name is "dnt_muun" -->
-        <Animation Name="gBusinessScrubShockedStartAnim" Offset="0x3438" /> <!-- Original name is "dnt_nooo" -->
-        <Animation Name="gBusinessScrubExcitedLoopAnim" Offset="0x38CC" /> <!-- Original name is "dnt_onedari" -->
-        <Animation Name="gBusinessScrubExcitedEndAnim" Offset="0x3CC0" /> <!-- Original name is "dnt_onedariTOwait" -->
-        <TextureAnimation Name="gBusinessScrubEmptyTexAnim" Offset="0x3CD0" />
-        <Animation Name="gBusinessScrubFlyStartAnim" Offset="0x4700" /> <!-- Original name is "dnt_spoon" -->
-        <Animation Name="gBusinessScrubRiseUpAnim" Offset="0x4AA0" /> <!-- Original name is "dnt_tobidasu01" -->
-        <Animation Name="gBusinessScrubJumpAnim" Offset="0x4E38" /> <!-- Original name is "dnt_tobidasu02" -->
-        <Animation Name="gBusinessScrubStandingAnim" Offset="0x5488" /> <!-- Original name is "dnt_wait" -->
-        <Animation Name="gBusinessScrubBobAnim" Offset="0x577C" /> <!-- Original name is "dnt_wait02" --> <!-- used as the idle anim when half burrowed into a deku flower-->
-        <Animation Name="gBusinessScrubExcitedStartAnim" Offset="0x5CA8" /> <!-- Original name is "dnt_waitTOonedari" -->
-
-        <!-- DLs -->
-        <DList Name="gBusinessScrubHeadDL" Offset="0x7EA0" />
-        <DList Name="gBusinessScrubLeftArmBagDL" Offset="0x8048" />
-        <DList Name="gBusinessScrubEyesDL" Offset="0x8290" />
-        <DList Name="gBusinessScrubScalpDL" Offset="0x8320" />
-        <DList Name="gBusinessScrubHatDL" Offset="0x8438" />
-        <DList Name="gBusinessScrubHairDL" Offset="0x85D8" />
-        <DList Name="gBusinessScrubLeftEarDL" Offset="0x8688" />
-        <DList Name="gBusinessScrubLeftHandDL" Offset="0x8718" />
-        <DList Name="gBusinessScrubLeftHandBagDL" Offset="0x8838" />
-        <DList Name="gBusinessScrubLeftForearmDL" Offset="0x8A48" />
-        <DList Name="gBusinessScrubLeftUpperArmDL" Offset="0x8B60" />
-        <DList Name="gBusinessScrubRightHandHatDL" Offset="0x8C10" />
-        <DList Name="gBusinessScrubRightHandDL" Offset="0x8DB0" />
-        <DList Name="gBusinessScrubRightHandBagDL" Offset="0x8ED0" />
-        <DList Name="gBusinessScrubRightForearmDL" Offset="0x90E8" />
-        <DList Name="gBusinessScrubRightUpperArmDL" Offset="0x9200" />
-        <DList Name="gBusinessScrubRightMustacheDL" Offset="0x92B0" />
-        <DList Name="gBusinessScrubRightEarDL" Offset="0x9340" />
-        <DList Name="gBusinessScrubSnoutDL" Offset="0x93D0" />
-        <DList Name="gBusinessScrubBodyDL" Offset="0x94E8" />
-        <DList Name="gBusinessScrubLeftFootDL" Offset="0x9630" />
-        <DList Name="gBusinessScrubLeftShinDL" Offset="0x9740" />
-        <DList Name="gBusinessScrubLeftThighDL" Offset="0x9838" />
-        <DList Name="gBusinessScrubRightFootDL" Offset="0x98D8" />
-        <DList Name="gBusinessScrubRightShinDL" Offset="0x99E8" />
-        <DList Name="gBusinessScrubRightThighDL" Offset="0x9AE0" />
-
-        <!-- Textures -->
-        <Texture Name="gBusinessScrubSkinTex" OutName="business_scrub_skin" Format="rgba16" Width="16" Height="16" Offset="0x9B80" />
-        <Texture Name="gBusinessScrubLeafTex" OutName="business_scrub_leaf" Format="rgba16" Width="16" Height="16" Offset="0x9D80" />
-        <Texture Name="gBusinessScrubBagOpeningTex" OutName="business_scrub_bag_opening" Format="rgba16" Width="8" Height="16" Offset="0x9F80" />
-        <Texture Name="gBusinessScrubBagCordTex" OutName="business_scrub_bag_cord" Format="rgba16" Width="8" Height="16" Offset="0xA080" />
-        <Texture Name="gBusinessScrubBagTex" OutName="business_scrub_bag" Format="rgba16" Width="2" Height="16" Offset="0xA180" />
-        <Texture Name="gBusinessScrubHatTex" OutName="business_scrub_hat" Format="rgba16" Width="8" Height="8" Offset="0xA1C0" />
-        <Texture Name="gBusinessScrubHatLeafTex" OutName="business_scrub_hat_leaf" Format="rgba16" Width="8" Height="16" Offset="0xA240" />
-        <Texture Name="gBusinessScrubHairTex" OutName="business_scrub_hair" Format="rgba16" Width="16" Height="32" Offset="0xA340" />
-        <Texture Name="gBusinessScrubScalpTex" OutName="business_scrub_scalp" Format="rgba16" Width="8" Height="8" Offset="0xA740" />
-        <Texture Name="gBusinessScrubSnoutTex" OutName="business_scrub_snout" Format="rgba16" Width="16" Height="8" Offset="0xA7C0" />
-        <Texture Name="gBusinessScrubEyeTex" OutName="business_scrub_eye" Format="rgba16" Width="16" Height="16" Offset="0xA8C0" />
-
-        <!-- Skeleton -->
-        <Limb Name="gBusinessScrubRootLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_ROOT" Offset="0xAAC0" />
-        <Limb Name="gBusinessScrubBodyLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_BODY" Offset="0xAACC" />
-        <Limb Name="gBusinessScrubRightThighLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_THIGH" Offset="0xAAD8" />
-        <Limb Name="gBusinessScrubRightShinLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_SHIN" Offset="0xAAE4" />
-        <Limb Name="gBusinessScrubRightFootLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_FOOT" Offset="0xAAF0" />
-        <Limb Name="gBusinessScrubLeftThighLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_THIGH" Offset="0xAAFC" />
-        <Limb Name="gBusinessScrubLeftShinLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_SHIN" Offset="0xAB08" />
-        <Limb Name="gBusinessScrubLeftFootLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_FOOT" Offset="0xAB14" />
-        <Limb Name="gBusinessScrubHeadLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_HEAD" Offset="0xAB20" />
-        <Limb Name="gBusinessScrubSnoutLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_SNOUT" Offset="0xAB2C" />
-        <Limb Name="gBusinessScrubRightLeafLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_LEAF" Offset="0xAB38" />
-        <Limb Name="gBusinessScrubRightMustacheLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_MUSTACHE" Offset="0xAB44" />
-        <Limb Name="gBusinessScrubRightUpperArmLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_UPPER_ARM" Offset="0xAB50" />
-        <Limb Name="gBusinessScrubRightForearmLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_FOREARM" Offset="0xAB5C" />
-        <Limb Name="gBusinessScrubRightHandHatLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_HAND_HAT" Offset="0xAB68" />
-        <Limb Name="gBusinessScrubRightHandBagLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_HAND_BAG" Offset="0xAB74" />
-        <Limb Name="gBusinessScrubRightHandLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_HAND" Offset="0xAB80" />
-        <Limb Name="gBusinessScrubLeftUpperArmLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_UPPER_ARM" Offset="0xAB8C" />
-        <Limb Name="gBusinessScrubLeftForearmLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_FOREARM" Offset="0xAB98" />
-        <Limb Name="gBusinessScrubLeftHandLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_HAND" Offset="0xABA4" />
-        <Limb Name="gBusinessScrubLeftHandBagLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_HAND_BAG" Offset="0xABB0" />
-        <Limb Name="gBusinessScrubLeftLeafLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_LEAF" Offset="0xABBC" />
-        <Limb Name="gBusinessScrubScalpLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_SCALP" Offset="0xABC8" />
-        <Limb Name="gBusinessScrubHairLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_HAIR" Offset="0xABD4" />
-        <Limb Name="gBusinessScrubHatLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_HAT" Offset="0xABE0" />
-        <Limb Name="gBusinessScrubEyesLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_EYES" Offset="0xABEC" />
-        <Limb Name="gBusinessScrubLeftArmBagLimb" Type="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_ARM_BAG" Offset="0xABF8" />
-        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" LimbNone="BUSINESS_SCRUB_LIMB_NONE" LimbMax="BUSINESS_SCRUB_LIMB_MAX" EnumName="BusinessScrubLimb" Offset="0xAC70" />
-
-        <Animation Name="gBusinessScrubWalkAnim" Offset="0xB0B4" /> <!-- Original name is "dnt_walk" -->
-
-        <!-- An exact copy of gBusinessScrubEyeTex -->
-        <Texture Name="gBusinessScrubEye2Tex" OutName="business_scrub_eye_2" Format="rgba16" Width="16" Height="16" Offset="0xB0D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dodongo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dodongo.xml
deleted file mode 100644
index cc9b41e25..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dodongo.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<Root>
-    <File Name="object_dodongo" Segment="6">
-        <Animation Name="object_dodongo_Anim_0013C4" Offset="0x13C4" /> <!-- Original name is "da_die" -->
-        <Animation Name="object_dodongo_Anim_0015F4" Offset="0x15F4" />
-        <Animation Name="object_dodongo_Anim_001A44" Offset="0x1A44" /> <!-- Original name is "da_dmg" -->
-        <Animation Name="object_dodongo_Anim_001F44" Offset="0x1F44" /> <!-- Original name is "da_dmg_wait" -->
-        <Animation Name="object_dodongo_Anim_0028F0" Offset="0x28F0" /> <!-- Original name is "da_fire" -->
-        <Animation Name="object_dodongo_Anim_003088" Offset="0x3088" /> <!-- Original name is "da_fire_wait" -->
-        <Animation Name="object_dodongo_Anim_003368" Offset="0x3368" />
-        <Animation Name="object_dodongo_Anim_003B14" Offset="0x3B14" /> <!-- Original name is "da_right" -->
-        <Animation Name="object_dodongo_Anim_0042C4" Offset="0x42C4" /> <!-- Original name is "da_left" -->
-        <Animation Name="object_dodongo_Anim_004C20" Offset="0x4C20" /> <!-- Original name is "da_wait" -->
-        <DList Name="object_dodongo_DL_006640" Offset="0x6640" />
-        <DList Name="object_dodongo_DL_006750" Offset="0x6750" />
-        <DList Name="object_dodongo_DL_006860" Offset="0x6860" />
-        <DList Name="object_dodongo_DL_006960" Offset="0x6960" />
-        <DList Name="object_dodongo_DL_006AA0" Offset="0x6AA0" />
-        <DList Name="object_dodongo_DL_006BA8" Offset="0x6BA8" />
-        <DList Name="object_dodongo_DL_006CA8" Offset="0x6CA8" />
-        <DList Name="object_dodongo_DL_006D88" Offset="0x6D88" />
-        <DList Name="object_dodongo_DL_006FD8" Offset="0x6FD8" />
-        <DList Name="object_dodongo_DL_007198" Offset="0x7198" />
-        <DList Name="object_dodongo_DL_007298" Offset="0x7298" />
-        <DList Name="object_dodongo_DL_0073A8" Offset="0x73A8" />
-        <Texture Name="object_dodongo_Tex_0074B8" OutName="tex_0074B8" Format="rgba16" Width="16" Height="16" Offset="0x74B8" />
-        <Texture Name="object_dodongo_Tex_0076B8" OutName="tex_0076B8" Format="rgba16" Width="8" Height="16" Offset="0x76B8" />
-        <Texture Name="object_dodongo_Tex_0077B8" OutName="tex_0077B8" Format="rgba16" Width="8" Height="16" Offset="0x77B8" />
-        <Texture Name="object_dodongo_Tex_0078B8" OutName="tex_0078B8" Format="rgba16" Width="32" Height="16" Offset="0x78B8" />
-        <Texture Name="object_dodongo_Tex_007CB8" OutName="tex_007CB8" Format="rgba16" Width="16" Height="32" Offset="0x7CB8" />
-        <Texture Name="object_dodongo_Tex_0080B8" OutName="tex_0080B8" Format="rgba16" Width="8" Height="8" Offset="0x80B8" />
-        <Limb Name="object_dodongo_Standardlimb_008138" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_01" Offset="0x8138" />
-        <Limb Name="object_dodongo_Standardlimb_008144" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_02" Offset="0x8144" />
-        <Limb Name="object_dodongo_Standardlimb_008150" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_03" Offset="0x8150" />
-        <Limb Name="object_dodongo_Standardlimb_00815C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_04" Offset="0x815C" />
-        <Limb Name="object_dodongo_Standardlimb_008168" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_05" Offset="0x8168" />
-        <Limb Name="object_dodongo_Standardlimb_008174" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_06" Offset="0x8174" />
-        <Limb Name="object_dodongo_Standardlimb_008180" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_07" Offset="0x8180" />
-        <Limb Name="object_dodongo_Standardlimb_00818C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_08" Offset="0x818C" />
-        <Limb Name="object_dodongo_Standardlimb_008198" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_09" Offset="0x8198" />
-        <Limb Name="object_dodongo_Standardlimb_0081A4" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0A" Offset="0x81A4" />
-        <Limb Name="object_dodongo_Standardlimb_0081B0" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0B" Offset="0x81B0" />
-        <Limb Name="object_dodongo_Standardlimb_0081BC" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0C" Offset="0x81BC" />
-        <Limb Name="object_dodongo_Standardlimb_0081C8" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0D" Offset="0x81C8" />
-        <Limb Name="object_dodongo_Standardlimb_0081D4" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0E" Offset="0x81D4" />
-        <Limb Name="object_dodongo_Standardlimb_0081E0" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_0F" Offset="0x81E0" />
-        <Limb Name="object_dodongo_Standardlimb_0081EC" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_10" Offset="0x81EC" />
-        <Limb Name="object_dodongo_Standardlimb_0081F8" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_11" Offset="0x81F8" />
-        <Limb Name="object_dodongo_Standardlimb_008204" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_12" Offset="0x8204" />
-        <Limb Name="object_dodongo_Standardlimb_008210" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_13" Offset="0x8210" />
-        <Limb Name="object_dodongo_Standardlimb_00821C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_14" Offset="0x821C" />
-        <Limb Name="object_dodongo_Standardlimb_008228" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_15" Offset="0x8228" />
-        <Limb Name="object_dodongo_Standardlimb_008234" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_16" Offset="0x8234" />
-        <Limb Name="object_dodongo_Standardlimb_008240" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_17" Offset="0x8240" />
-        <Limb Name="object_dodongo_Standardlimb_00824C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_18" Offset="0x824C" />
-        <Limb Name="object_dodongo_Standardlimb_008258" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_19" Offset="0x8258" />
-        <Limb Name="object_dodongo_Standardlimb_008264" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1A" Offset="0x8264" />
-        <Limb Name="object_dodongo_Standardlimb_008270" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1B" Offset="0x8270" />
-        <Limb Name="object_dodongo_Standardlimb_00827C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1C" Offset="0x827C" />
-        <Limb Name="object_dodongo_Standardlimb_008288" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1D" Offset="0x8288" />
-        <Limb Name="object_dodongo_Standardlimb_008294" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1E" Offset="0x8294" />
-        <Skeleton Name="object_dodongo_Skel_008318" Type="Normal" LimbType="Standard" LimbNone="OBJECT_DODONGO_LIMB_NONE" LimbMax="OBJECT_DODONGO_LIMB_MAX" EnumName="ObjectDodongoLimb" Offset="0x8318" />
-        <Animation Name="object_dodongo_Anim_008B1C" Offset="0x8B1C" /> <!-- Original name is "da_walk" -->
-        <Animation Name="object_dodongo_Anim_008DE0" Offset="0x8DE0" /> <!-- Original name is "da_walk_start" -->
-        <Animation Name="object_dodongo_Anim_009088" Offset="0x9088" /> <!-- Original name is "da_walk_end" -->
-        
-        <!-- Fire Effect Textures -->
-        <Texture Name="gDodongoFire0Tex" OutName="dodongo_fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
-        <Texture Name="gDodongoFire1Tex" OutName="dodongo_fire_1" Format="i4" Width="32" Height="32" Offset="0x92A0"/>
-        <Texture Name="gDodongoFire2Tex" OutName="dodongo_fire_2" Format="i4" Width="32" Height="32" Offset="0x94A0"/>
-        <Texture Name="gDodongoFire3Tex" OutName="dodongo_fire_3" Format="i4" Width="32" Height="32" Offset="0x96A0"/>
-
-        <DList Name="gDodongoFireDL" Offset="0x98A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dog.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dog.xml
deleted file mode 100644
index d0f306b24..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dog.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Assets for dogs and the arrow that appears over your selected dog in the Doggy Racetrack -->
-    <File Name="object_dog" Segment="6">
-        <!-- Unused Selection Arrow with a Texture Animation -->
-        <DList Name="gDogSelectionArrowAnimatedDL" Offset="0x170" /> <!-- Original name is "cursor_00_anim_model" -->
-        <DList Name="gDogSelectionArrowAnimatedEmptyDL" Offset="0x250" /> <!-- Original name is "cursor_00_anim_modelT" -->
-        <Texture Name="gDogSelectionArrowAnimatedTex" OutName="dog_selection_arrow_animated" Format="i8" Width="8" Height="32" Offset="0x258" />
-        <TextureAnimation Name="gDogSelectionArrowTexAnim" Offset="0x3C4" />
-
-        <!-- Selection Arrow DisplayLists and Texture -->
-        <DList Name="gDogSelectionArrowDL" Offset="0x550" /> <!-- Original name is "cursor_00_none_model" -->
-        <DList Name="gDogSelectionArrowEmptyDL" Offset="0x618" /> <!-- Original name is "cursor_00_none_modelT" -->
-        <Texture Name="gDogSelectionArrowTex" OutName="dog_selection_arrow" Format="i4" Width="16" Height="32" Offset="0x620" />
-
-        <!-- Dog Animations -->
-        <Animation Name="gDogBarkAnim" Offset="0x998" /> <!-- Original name is "dog_bark" -->
-        <Animation Name="gDogLyingDownAnim" Offset="0x1048" /> <!-- Original name is "dog_fuse" ("lying on the ground") -->
-        <Animation Name="gDogLyingDownLoopAnim" Offset="0x1348" /> <!-- Original name is "dog_fusetamama" ("lying on the ground continues") -->
-        <Animation Name="gDogJumpAnim" Offset="0x1560" /> <!-- Original name is "dog_jump" -->
-        <Animation Name="gDogJumpAttackAnim" Offset="0x17C0" /> <!-- Original name is "dog_jump2" -->
-        <Animation Name="gDogLongJumpAnim" Offset="0x1A84" /> <!-- Original name is "dog_longjump" -->
-        <Animation Name="gDogRunAnim" Offset="0x1BD8" /> <!-- Original name is "dog_run" -->
-        <Animation Name="gDogSitAnim" Offset="0x1FB0" /> <!-- Original name is "dog_sit" -->
-        <Animation Name="gDogWalkAnim" Offset="0x21C8" /> <!-- Original name is "dog_walk" -->
-
-        <!-- Dog Textures -->
-        <Texture Name="gDogFur1Tex" OutName="dog_fur_1" Format="rgba16" Width="32" Height="32" Offset="0x21E0" /> <!-- Lower body, legs, and tail -->
-        <Texture Name="gDogFur2Tex" OutName="dog_fur_2" Format="rgba16" Width="32" Height="32" Offset="0x29E0" /> <!-- Front of ears, back of the tail, and around the feet-->
-        <Texture Name="gDogFur3Tex" OutName="dog_fur_3" Format="rgba16" Width="32" Height="32" Offset="0x31E0" /> <!-- Upper body, top of head-->
-        <Texture Name="gDogFaceAndEyeTex" OutName="dog_face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x39E0" />
-        <Texture Name="gDogFaceAndNoseTex" OutName="dog_face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x41E0" />
-        <Texture Name="gDogFur4Tex" OutName="dog_fur_4" Format="rgba16" Width="32" Height="32" Offset="0x49E0" /> <!-- Back of ears, side of head, and part of front body-->
-        <Texture Name="gDogPawTex" OutName="dog_paw" Format="rgba16" Width="16" Height="16" Offset="0x51E0" />
-        <Texture Name="gDogFaceHairTex" OutName="dog_face_hair" Format="rgba16" Width="32" Height="32" Offset="0x53E0" />
-
-        <!-- Dog Limb DisplayLists -->
-        <DList Name="gDogHeadDL" Offset="0x6F40" />
-        <DList Name="gDogRightFaceHairDL" Offset="0x72A8" />
-        <DList Name="gDogLeftFaceHairDL" Offset="0x7348" />
-        <DList Name="gDogBodyFrontDL" Offset="0x73E8" />
-        <DList Name="gDogFrontRightLegDL" Offset="0x7600" />
-        <DList Name="gDogFrontLeftLegDL" Offset="0x77B0" />
-        <DList Name="gDogBodyBackDL" Offset="0x7960" />
-        <DList Name="gDogBackRightLegDL" Offset="0x7B00" />
-        <DList Name="gDogBackLeftLegDL" Offset="0x7CB0" />
-        <DList Name="gDogTailDL" Offset="0x7E60" />
-
-        <!-- Dog Limbs -->
-        <Limb Name="gDogRootLimb" Type="Standard" EnumName="DOG_LIMB_ROOT" Offset="0x8030" />
-        <Limb Name="gDogBodyBackLimb" Type="Standard" EnumName="DOG_LIMB_BODY_BACK" Offset="0x803C" />
-        <Limb Name="gDogBodyFrontLimb" Type="Standard" EnumName="DOG_LIMB_BODY_FRONT" Offset="0x8048" />
-        <Limb Name="gDogHeadRootLimb" Type="Standard" EnumName="DOG_LIMB_HEAD_ROOT" Offset="0x8054" />
-        <Limb Name="gDogHeadLimb" Type="Standard" EnumName="DOG_LIMB_HEAD" Offset="0x8060" />
-        <Limb Name="gDogRightFaceHairLimb" Type="Standard" EnumName="DOG_LIMB_RIGHT_FACE_HAIR" Offset="0x806C" />
-        <Limb Name="gDogLeftFaceHairLimb" Type="Standard" EnumName="DOG_LIMB_LEFT_FACE_HAIR" Offset="0x8078" />
-        <Limb Name="gDogFrontRightLegLimb" Type="Standard" EnumName="DOG_LIMB_FRONT_RIGHT_LEG" Offset="0x8084" />
-        <Limb Name="gDogFrontLeftLegLimb" Type="Standard" EnumName="DOG_LIMB_FRONT_LEFT_LEG" Offset="0x8090" />
-        <Limb Name="gDogBackRightLegLimb" Type="Standard" EnumName="DOG_LIMB_BACK_RIGHT_LEG" Offset="0x809C" />
-        <Limb Name="gDogBackLeftLegLimb" Type="Standard" EnumName="DOG_LIMB_BACK_LEFT_LEG" Offset="0x80A8" />
-        <Limb Name="gDogTailLimb" Type="Standard" EnumName="DOG_LIMB_TAIL" Offset="0x80B4" />
-
-        <!-- Dog Skeleton -->
-        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" LimbNone="DOG_LIMB_NONE" LimbMax="DOG_LIMB_MAX" EnumName="DogLimb" Offset="0x80F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor01.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor01.xml
deleted file mode 100644
index 727949d60..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor01.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Astral Observatory / Marine Research Lab Door (Bland metal door) -->
-    <File Name="object_dor01" Segment="6">
-        <DList Name="gObservatoryLabDoorEmptyDL" Offset="0x440" /> <!-- Original name is "z2_dor01_modelT" -->
-        <DList Name="gObservatoryLabDoorDL" Offset="0x448" /> <!-- Original name is "z2_dor01_model" -->
-        <Texture Name="gObservatoryLabDoorTex" OutName="observatory_lab_door" Format="rgba16" Width="16" Height="128" Offset="0x650" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor02.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor02.xml
deleted file mode 100644
index 402fdd499..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor02.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Assets for a zora hall door -->
-    <File Name="object_dor02" Segment="6">
-        <DList Name="gZoraHallDoorEmptyDL" Offset="0x420"/> <!-- Original name is "z2_dor02_modelT" -->
-        <DList Name="gZoraHallDoorDL" Offset="0x428"/> <!-- Original name is "z2_dor02_model" -->
-        <Texture Name="gZoraHallDoorTex" OutName="zora_hall_door" Format="rgba16" Width="32" Height="64" Offset="0x610"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor03.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor03.xml
deleted file mode 100644
index c7971db0c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor03.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="object_dor03" Segment="6">
-        <DList Name="gSwampDoorDL" Offset="0x3C0" /> <!-- Original name is "z2_dor03_model" -->
-        <Texture Name="gSwampDoorTex" OutName="swamp_door" Format="rgba16" Width="32" Height="64" Offset="0x4D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor04.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor04.xml
deleted file mode 100644
index afb348c7d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dor04.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Assets for the magic hag potion shop door -->
-    <File Name="object_dor04" Segment="6">
-        <DList Name="gMagicHagPotionShopDoorEmptyDL" Offset="0x460"/> <!-- Original name is "z2_dor04_modelT" -->
-        <DList Name="gMagicHagPotionShopDoorDL" Offset="0x468"/> <!-- Original name is "z2_dor04_model" -->
-        <Texture Name="gMagicHagPotionShopDoorTex" OutName="magic_hag_potion_shop_door" Format="rgba16" Width="64" Height="32" Offset="0x658"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dora.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dora.xml
deleted file mode 100644
index 09732ba0a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dora.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Object for the Gong and KendoKanban board in the Swordsman's School -->
-    <File Name="object_dora" Segment="6">
-        <DList Name="gKendoKanbanDL" Offset="0x180" /> <!-- Original name is "djo_kanban_model" -->
-        <Texture Name="gKendoKanbanFrontTex" OutName="kendo_kanban_front" Format="rgba16" Width="32" Height="64" Offset="0x280" />
-        <Texture Name="gKendoKanbanSideTex" OutName="kendo_kanban_side" Format="rgba16" Width="32" Height="32" Offset="0x1280" />
-        <DList Name="gKendoKanbanTopRightDL" Offset="0x2080" /> <!-- Original name is "ita_tR_model" -->
-        <DList Name="gKendoKanbanTopLeftDL" Offset="0x2180" /> <!-- Original name is "ita_tL_model" -->
-        <DList Name="gKendoKanbanBottomLeftDL" Offset="0x2280" /> <!-- Original name is "ita_bL_model" -->
-        <DList Name="gKendoKanbanBottomRightDL" Offset="0x2380" /> <!-- Original name is "ita_bR_model" -->
-        <Texture Name="gKendoKanbanSplitFrontTex" OutName="kendo_kanban_front_split_alt" Format="rgba16" Width="32" Height="64" Offset="0x2480" />
-        <Texture Name="gKendoKanbanSplitSideTex" OutName="kendo_kanban_side_split_alt" Format="rgba16" Width="32" Height="32" Offset="0x3480" />
-        <DList Name="gDoraGongDL" Offset="0x3FD0" /> <!-- Original name is "dora_hontai_model" -->
-        <DList Name="gDoraChainDL" Offset="0x4160" /> <!-- Original name is "kusariT_model" -->
-        <Texture Name="gDoraGongTex" OutName="dora_gong" Format="rgba16" Width="32" Height="32" Offset="0x4208" />
-        <Texture Name="gDoraChainTex" OutName="dora_chain" Format="rgba16" Width="16" Height="64" Offset="0x4A08" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_driftice.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_driftice.xml
deleted file mode 100644
index c380c09c1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_driftice.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_driftice" Segment="6">
-        <Texture Name="object_driftice_Tex_000000" OutName="tex_000000" Format="rgba16" Width="64" Height="8" Offset="0x0" />
-        <Texture Name="object_driftice_TLUT_000400" OutName="tlut_000400" Format="rgba16" Width="4" Height="4" Offset="0x400" />
-        <Texture Name="object_driftice_TLUT_000420" OutName="tlut_000420" Format="rgba16" Width="4" Height="4" Offset="0x420" />
-        <Texture Name="object_driftice_Tex_000440" OutName="tex_000440" Format="ci4" Width="64" Height="64" Offset="0x440" />
-        <Texture Name="object_driftice_Tex_000C40" OutName="tex_000C40" Format="ci4" Width="64" Height="64" Offset="0xC40" />
-        <DList Name="object_driftice_DL_0016A0" Offset="0x16A0" /> <!-- Original name is "obj_iceblock_model" -->
-        <Collision Name="object_driftice_Colheader_001AA8" Offset="0x1AA8" /> <!-- Original name is "obj_iceblock_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_drs.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_drs.xml
deleted file mode 100644
index ef9788fd5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_drs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Object for the mannequin inside Anju's room which holds her wedding dress --> 
-    <File Name="object_drs" Segment="6">
-        <Animation Name="gWeddingDressMannequinIdleAnim" Offset="0x1C" /> <!-- Original name is "drs_kihon" -->
-        <DList Name="gWeddingDressMannequinDL" Offset="0x3120" />
-        <DList Name="gWeddingDressMannequinPatternDL" Offset="0x3EA8" />
-        <DList Name="gWeddingDressMannequinMaskDL" Offset="0x3F80" />
-        <Texture Name="gWeddingDressMannequinWoodTex" OutName="wood" Format="rgba16" Width="16" Height="16" Offset="0x4008" />
-        <Texture Name="gWeddingDressMannequinWoodCornerTex" OutName="wood_corner" Format="rgba16" Width="16" Height="16" Offset="0x4208" />
-        <Texture Name="gWeddingDressMannequinShoulderGradientTex" OutName="drs_shoulder_gradient" Format="i8" Width="8" Height="8" Offset="0x4408" />
-        <Texture Name="gWeddingDressMannequinPatternTex" OutName="pattern" Format="i8" Width="32" Height="32" Offset="0x4448" />
-        <Texture Name="gWeddingDressMannequinVineTex" OutName="vine" Format="rgba16" Width="32" Height="16" Offset="0x4848" />
-        <Texture Name="gWeddingDressMannequinFlowerTex" OutName="flower" Format="rgba16" Width="16" Height="16" Offset="0x4C48" />
-        <Texture Name="gWeddingDressMannequinFabricHighlightsTex" OutName="fabric_highlight" Format="i8" Width="32" Height="64" Offset="0x4E48" />
-        <Texture Name="gWeddingDressMannequinFabricSheerTex" OutName="fabric_sheer" Format="i8" Width="32" Height="32" Offset="0x5648" />
-        <Limb Name="gWeddingDressMannequinLimb" Type="Standard" EnumName="WEDDING_DRESS_MANNEQUIN_LIMB" Offset="0x5A48" />
-        <Limb Name="gWeddingDressMannequinMaskLimb" Type="Standard" EnumName="WEDDING_DRESS_MANNEQUIN_LIMB_MASK" Offset="0x5A54" />
-        <Limb Name="gWeddingDressMannequinPatternLimb" Type="Standard" EnumName="WEDDING_DRESS_MANNEQUIN_LIMB_PATTERN" Offset="0x5A60" />
-        <Skeleton Name="gWeddingDressMannequinSkel" Type="Flex" LimbType="Standard" LimbNone="WEDDING_DRESS_MANNEQUIN_LIMB_NONE" LimbMax="WEDDING_DRESS_MANNEQUIN_LIMB_MAX" EnumName="WeddingDressMannequinLimb" Offset="0x5A78" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ds2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ds2.xml
deleted file mode 100644
index 0eb35db79..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ds2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Root>
-    <File Name="object_ds2" Segment="6">
-        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4" /> <!-- Original name is "ds2_matsu" -->
-        <DList Name="object_ds2_DL_001990" Offset="0x1990" />
-        <DList Name="object_ds2_DL_001C98" Offset="0x1C98" />
-        <DList Name="object_ds2_DL_002188" Offset="0x2188" />
-        <DList Name="object_ds2_DL_0022B0" Offset="0x22B0" />
-        <DList Name="object_ds2_DL_002480" Offset="0x2480" />
-        <DList Name="object_ds2_DL_002610" Offset="0x2610" />
-        <DList Name="object_ds2_DL_002738" Offset="0x2738" />
-        <DList Name="object_ds2_DL_002908" Offset="0x2908" />
-        <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98" />
-        <Texture Name="object_ds2_Tex_002C98" OutName="tex_002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" />
-        <Texture Name="object_ds2_Tex_002D98" OutName="tex_002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" />
-        <Texture Name="object_ds2_Tex_002DD8" OutName="tex_002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" />
-        <Texture Name="object_ds2_Tex_002ED8" OutName="tex_002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" />
-        <!-- <Blob Name="object_ds2_Blob_0030D8" Size="0xC00" Offset="0x30D8" /> -->
-        <Texture Name="object_ds2_Tex_003CD8" OutName="tex_003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" />
-        <Texture Name="object_ds2_Tex_003DD8" OutName="tex_003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" />
-        <Texture Name="object_ds2_Tex_003ED8" OutName="tex_003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" />
-        <Texture Name="object_ds2_Tex_003FD8" OutName="tex_003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" />
-        <Limb Name="object_ds2_Standardlimb_0041D8" Type="Standard" EnumName="OBJECT_DS2_LIMB_01" Offset="0x41D8" />
-        <Limb Name="object_ds2_Standardlimb_0041E4" Type="Standard" EnumName="OBJECT_DS2_LIMB_02" Offset="0x41E4" />
-        <Limb Name="object_ds2_Standardlimb_0041F0" Type="Standard" EnumName="OBJECT_DS2_LIMB_03" Offset="0x41F0" />
-        <Limb Name="object_ds2_Standardlimb_0041FC" Type="Standard" EnumName="OBJECT_DS2_LIMB_04" Offset="0x41FC" />
-        <Limb Name="object_ds2_Standardlimb_004208" Type="Standard" EnumName="OBJECT_DS2_LIMB_05" Offset="0x4208" />
-        <Limb Name="object_ds2_Standardlimb_004214" Type="Standard" EnumName="OBJECT_DS2_LIMB_06" Offset="0x4214" />
-        <Limb Name="object_ds2_Standardlimb_004220" Type="Standard" EnumName="OBJECT_DS2_LIMB_07" Offset="0x4220" />
-        <Limb Name="object_ds2_Standardlimb_00422C" Type="Standard" EnumName="OBJECT_DS2_LIMB_08" Offset="0x422C" />
-        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DS2_LIMB_NONE" LimbMax="OBJECT_DS2_LIMB_MAX" EnumName="ObjectDs2Limb" Offset="0x4258" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ds2n.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ds2n.xml
deleted file mode 100644
index e4757de31..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ds2n.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<Root>
-    <!-- Unused Potion Shop Seller from OoT, in that game (Ossan -> object_ds2) -->
-    <File Name="object_ds2n" Segment="6">
-        <!-- [object_ds2] still exists as a copy from OoT in MM, but unused, this has a different skeleton with legs -->
-        <!-- Difficult to document, might have made mistakes -->
-
-        <DList Name="gDs2nTorsoDL" Offset="0x2420" />
-        <DList Name="gDs2nHeadDL" Offset="0x2740" />
-        <DList Name="gDs2nRightUpperArmDL" Offset="0x2C20" />
-        <DList Name="gDs2nRightForearmDL" Offset="0x2D38" />
-        <DList Name="gDs2nRightHandDL" Offset="0x2F68" />
-        <DList Name="gDs2nLeftUpperArmDL" Offset="0x30E0" />
-        <DList Name="gDs2nLeftForearmDL" Offset="0x31F8" />
-        <DList Name="gDs2nLeftHandDL" Offset="0x33B0" />
-        <DList Name="gDs2nHipsDL" Offset="0x3528" />
-        <DList Name="gDs2nRightThighDL" Offset="0x35F0" /> 
-        <DList Name="gDs2nRightShinDL" Offset="0x36D0" />
-        <DList Name="gDs2nRightFootDL" Offset="0x37A8" />
-        <DList Name="gDs2nLeftThighDL" Offset="0x3988" />
-        <DList Name="gDs2nLeftShinDL" Offset="0x3A68" />
-        <DList Name="gDs2nLeftFootDL" Offset="0x3B40" />
-        
-        <Texture Name="gDs2nMainTLUT" OutName="main_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3CD8" />
-        <Texture Name="gDs2nFingersTLUT" OutName="fingers_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3ED8" />
-        <Texture Name="gDs2nEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x40D8" />
-        <Texture Name="gDs2nPantsAndShirtBottomTex" OutName="pants_and_shirt_bottom" Format="rgba16" Width="16" Height="16" Offset="0x42D8" />
-        <Texture Name="gDs2nShoesTex" OutName="shoes" Format="rgba16" Width="16" Height="32" Offset="0x44D8" />
-
-        <!-- Unused Belt/Tie Texture, kinda looks like a Karate belt. -->
-        <Texture Name="gDs2nBeltTieTex" OutName="belt_tie" Format="ci8" Width="32" Height="32" Offset="0x48D8" TlutOffset="0x3CD8"/>
-
-        <!-- These two eye textures are corrupted, they extract and draw broken in-game.
-            The half tex: the blue iris is olive greenish and whites of the eyes are blended blue, with scatter of random pixels.
-            The closed has an extra dot of black in the center of the eye lid. -->
-        <Texture Name="gDs2nEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x4CD8" TlutOffset="0x40D8"/>
-        <Texture Name="gDs2nEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x50D8" TlutOffset="0x40D8"/>
-
-        <Texture Name="gDs2nFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x54D8" TlutOffset="0x3ED8" />
-        <Texture Name="gDs2nSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x55D8" />
-        <Texture Name="gDs2nHairTex" OutName="hair" Format="rgba16" Width="16" Height="16" Offset="0x5618" />
-        <Texture Name="gDs2nHairlineTex" OutName="hairline" Format="ci8" Width="16" Height="16" Offset="0x5818" />
-        <Texture Name="gDs2nShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="16" Height="32" Offset="0x5918" />
-        <Texture Name="gDs2nVestTex" OutName="vest" Format="rgba16" Width="16" Height="16" Offset="0x5B18" />
-        <Texture Name="gDs2nShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0x5D18" />
-        <Texture Name="gDs2nEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x5E18" TlutOffset="0x40D8" />
-
-        <Texture Name="gDs2nMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6218" TlutOffset="0x3CD8" />
-
-        <!-- 6418 -> 6450: unknown small data -->
-
-        <!-- Unused and unreferenced. Exact copies of the above used textures. -->
-        <Texture Name="gDs2nMain2TLUT" OutName="main2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6450" />
-        <Texture Name="gDs2nFingers2TLUT" OutName="fingers2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6650" />
-        <Texture Name="gDs2nEyes2TLUT" OutName="eyes2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6850" />
-        <Texture Name="gDs2nPantsAndShirtBottom2Tex" OutName="pants_and_shirt_bottom2" Format="rgba16" Width="16" Height="16" Offset="0x6A50" />
-        <Texture Name="gDs2nShoes2Tex" OutName="shoes2" Format="rgba16" Width="16" Height="32" Offset="0x6C50" />
-        <Texture Name="gDs2nFingers2Tex" OutName="fingers2" Format="ci8" Width="16" Height="16" Offset="0x7050" TlutOffset="0x6650" />
-        <Texture Name="gDs2nSkinGradient2Tex" OutName="skin_gradient2" Format="ci8" Width="8" Height="8" Offset="0x7150" TlutOffset="0x6450"/>
-        <Texture Name="gDs2nHair2Tex" OutName="hair2" Format="rgba16" Width="16" Height="16" Offset="0x7190" />
-        <Texture Name="gDs2nHairline2Tex" OutName="hairline2" Format="ci8" Width="16" Height="16" Offset="0x7390" TlutOffset="0x6450"/>
-        <Texture Name="gDs2nShirtButtons2Tex" OutName="shirt_buttons2" Format="ci8" Width="16" Height="32" Offset="0x7490" TlutOffset="0x6450"/>
-        <Texture Name="gDs2nVest2Tex" OutName="vest2" Format="rgba16" Width="16" Height="16" Offset="0x7690" />
-        <Texture Name="gDs2nShirt2Tex" OutName="shirt2" Format="ci8" Width="16" Height="16" Offset="0x7890" TlutOffset="0x6450" />
-
-        <Texture Name="gDs2nEyeOpen2Tex" OutName="eye_open2" Format="ci8" Width="32" Height="32" Offset="0x7990" TlutOffset="0x6850" />
-        <Texture Name="gDs2nMouthOpen2Tex" OutName="mouth_open2" Format="ci8" Width="32" Height="16" Offset="0x7D90" TlutOffset="0x6450" />
-        
-        <Animation Name="gDs2nIdleAnim" Offset="0x8038" /> <!-- Original name is "ds2n_wait" -->
-
-        <!-- z64Utils cannot render this skeleton, no idea what the three limbs with no DL are for, our actor doesnt use them -->
-        <Limb Name="gDs2nHipsLimb" Type="Standard" EnumName="DS2N_LIMB_HIPS" Offset="0x8050" />
-        <Limb Name="gDs2nLeftThighLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_THIGH" Offset="0x805C" />
-        <Limb Name="gDs2nLeftShinLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_SHIN" Offset="0x8068" />
-        <Limb Name="gDs2nLeftFootLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_FOOT" Offset="0x8074" />
-        <Limb Name="gDs2nRightThighLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_THIGH" Offset="0x8080" />
-        <Limb Name="gDs2nRightShinLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_SHIN" Offset="0x808C" />
-        <Limb Name="gDs2nRightFootLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_FOOT" Offset="0x8098" />
-        <Limb Name="gDs2nLimb_008098" Type="Standard" EnumName="DS2N_LIMB_08" Offset="0x80A4" /> <!-- these three have no DL -->
-        <Limb Name="gDs2nLimb_0080B0" Type="Standard" EnumName="DS2N_LIMB_09" Offset="0x80B0" />
-        <Limb Name="gDs2nLimb_0080BC" Type="Standard" EnumName="DS2N_LIMB_0A" Offset="0x80BC" />
-        <Limb Name="gDs2nTorsoLimb" Type="Standard" EnumName="DS2N_LIMB_TORSO" Offset="0x80C8" />
-        <Limb Name="gDs2nLeftUpperArmLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_UPPER_ARM" Offset="0x80D4" />
-        <Limb Name="gDs2nLeftForearmLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_FOREARM" Offset="0x80E0" />
-        <Limb Name="gDs2nLeftHandLimb" Type="Standard" EnumName="DS2N_LIMB_LEFT_HAND" Offset="0x80EC" />
-        <Limb Name="gDs2nRightUpperArmLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_UPPER_ARM" Offset="0x80F8" />
-        <Limb Name="gDs2nRightForearmLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_FOREARM" Offset="0x8104" />
-        <Limb Name="gDs2nRightHandLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_HAND" Offset="0x8110" />
-        <Limb Name="gDs2nHeadLimb" Type="Standard" EnumName="DS2N_LIMB_HEAD" Offset="0x811C" />
-        <Skeleton Name="gDs2nSkel" Type="Flex" LimbType="Standard" LimbNone="DS2N_LIMB_NONE" LimbMax="DS2N_LIMB_MAX" EnumName="Ds2nLimb" Offset="0x8170" />
-
-        <!-- 8 bytes: 0x11 followed by zeros  <Blob Name="gDs2n_Blob_008178" Size="0x8" Offset="0x8178" /> -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dt.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dt.xml
deleted file mode 100644
index 3acf0c442..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dt.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<Root>
-    <File Name="object_dt" Segment="6">
-        <Animation Name="object_dt_Anim_0005A4" Offset="0x5A4" /> <!-- Original name is "dt_aiya" -->
-        <Animation Name="object_dt_Anim_000854" Offset="0x854" /> <!-- Original name is "dt_aiya2yomesan" -->
-        <Animation Name="object_dt_Anim_000BE0" Offset="0xBE0" /> <!-- Original name is "dt_arigato" -->
-        <Animation Name="object_dt_Anim_000DA8" Offset="0xDA8" /> <!-- Original name is "dt_mojimoji" -->
-        <Animation Name="object_dt_Anim_00112C" Offset="0x112C" /> <!-- Original name is "dt_wait" -->
-        <DList Name="object_dt_DL_004DB0" Offset="0x4DB0" />
-        <DList Name="object_dt_DL_005130" Offset="0x5130" />
-        <DList Name="object_dt_DL_0054C8" Offset="0x54C8" />
-        <DList Name="object_dt_DL_005AF8" Offset="0x5AF8" />
-        <DList Name="object_dt_DL_005DB0" Offset="0x5DB0" />
-        <DList Name="object_dt_DL_005E70" Offset="0x5E70" />
-        <DList Name="object_dt_DL_006018" Offset="0x6018" />
-        <DList Name="object_dt_DL_006140" Offset="0x6140" />
-        <DList Name="object_dt_DL_006258" Offset="0x6258" />
-        <DList Name="object_dt_DL_0063B8" Offset="0x63B8" />
-        <DList Name="object_dt_DL_0064E0" Offset="0x64E0" />
-        <DList Name="object_dt_DL_0065F8" Offset="0x65F8" />
-        <DList Name="object_dt_DL_006800" Offset="0x6800" />
-        <DList Name="object_dt_DL_006928" Offset="0x6928" />
-        <Texture Name="object_dt_TLUT_006A50" OutName="tlut_006A50" Format="rgba16" Width="16" Height="16" Offset="0x6A50" />
-        <Texture Name="object_dt_TLUT_006C50" OutName="tlut_006C50" Format="rgba16" Width="16" Height="16" Offset="0x6C50" />
-        <Texture Name="object_dt_TLUT_006E50" OutName="tlut_006E50" Format="rgba16" Width="16" Height="16" Offset="0x6E50" />
-        <Texture Name="object_dt_Tex_007050" OutName="tex_007050" Format="ci8" Width="8" Height="8" Offset="0x7050" />
-        <Texture Name="object_dt_Tex_007090" OutName="tex_007090" Format="ci8" Width="16" Height="16" Offset="0x7090" />
-        <Texture Name="object_dt_Tex_007190" OutName="tex_007190" Format="ci8" Width="8" Height="8" Offset="0x7190" />
-        <Texture Name="object_dt_Tex_0071D0" OutName="tex_0071D0" Format="ci8" Width="8" Height="8" Offset="0x71D0" />
-        <Texture Name="object_dt_Tex_007210" OutName="tex_007210" Format="rgba16" Width="8" Height="16" Offset="0x7210" />
-        <Texture Name="object_dt_Tex_007310" OutName="tex_007310" Format="ci8" Width="8" Height="8" Offset="0x7310" />
-        <Texture Name="gDotourEyeShockTex" OutName="dotour_eye_shock" Format="ci8" Width="32" Height="32" Offset="0x7350" TlutOffset="0x6C50" /> 
-        <Texture Name="gDotourEyebrowHighTex" OutName="dotour_eyebrow_high" Format="ci8" Width="16" Height="16" Offset="0x7750" TlutOffset="0x6E50" />
-        <Texture Name="object_dt_Tex_007850" OutName="tex_007850" Format="ci8" Width="32" Height="32" Offset="0x7850" />
-        <Texture Name="object_dt_Tex_007C50" OutName="tex_007C50" Format="ci8" Width="16" Height="16" Offset="0x7C50" />
-        <Texture Name="object_dt_Tex_007D50" OutName="tex_007D50" Format="ci8" Width="32" Height="32" Offset="0x7D50" />
-        <Texture Name="object_dt_Tex_008150" OutName="tex_008150" Format="ci8" Width="8" Height="8" Offset="0x8150" />
-        <Texture Name="object_dt_Tex_008190" OutName="tex_008190" Format="ci8" Width="32" Height="16" Offset="0x8190" />
-        <Texture Name="object_dt_Tex_008390" OutName="tex_008390" Format="rgba16" Width="32" Height="64" Offset="0x8390" />
-        <Texture Name="object_dt_Tex_009390" OutName="tex_009390" Format="rgba16" Width="16" Height="16" Offset="0x9390" />
-        <Texture Name="gDotourEyeOpenTex" OutName="dotour_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9590" TlutOffset="0x6C50" />
-        <Texture Name="object_dt_Tex_009990" OutName="tex_009990" Format="rgba16" Width="16" Height="32" Offset="0x9990" />
-        <Texture Name="object_dt_Tex_009D90" OutName="tex_009D90" Format="rgba16" Width="16" Height="16" Offset="0x9D90" />
-        <Texture Name="gDotourEyeClosedTex" OutName="dotour_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9F90" TlutOffset="0x6C50" />
-        <Texture Name="gDotourEyebrowMidTex" OutName="dotour_eyebrow_mid" Format="ci8" Width="16" Height="16" Offset="0xA390" TlutOffset="0x6E50" />
-        <Texture Name="gDotourEyebrowLowTex" OutName="dotour_eyebrow_low" Format="ci8" Width="16" Height="16" Offset="0xA490" TlutOffset="0x6E50" />
-        <Texture Name="object_dt_Tex_00A590" OutName="tex_00A590" Format="rgba16" Width="16" Height="16" Offset="0xA590" />
-        <Texture Name="gDotourEyeLookDownTex" OutName="dotour_eye_look_down" Format="ci8" Width="32" Height="32" Offset="0xA790" TlutOffset="0x6C50" />
-        <Texture Name="gDotourEyeSquintTex" OutName="dotour_eye_squint" Format="ci8" Width="32" Height="32" Offset="0xAB90" TlutOffset="0x6C50" />
-        <TextureAnimation Name="object_dt_Matanimheader_00AFDC" Offset="0xAFDC" />
-        <Limb Name="object_dt_Standardlimb_00AFEC" Type="Standard" EnumName="OBJECT_DT_LIMB_01" Offset="0xAFEC" />
-        <Limb Name="object_dt_Standardlimb_00AFF8" Type="Standard" EnumName="OBJECT_DT_LIMB_02" Offset="0xAFF8" />
-        <Limb Name="object_dt_Standardlimb_00B004" Type="Standard" EnumName="OBJECT_DT_LIMB_03" Offset="0xB004" />
-        <Limb Name="object_dt_Standardlimb_00B010" Type="Standard" EnumName="OBJECT_DT_LIMB_04" Offset="0xB010" />
-        <Limb Name="object_dt_Standardlimb_00B01C" Type="Standard" EnumName="OBJECT_DT_LIMB_05" Offset="0xB01C" />
-        <Limb Name="object_dt_Standardlimb_00B028" Type="Standard" EnumName="OBJECT_DT_LIMB_06" Offset="0xB028" />
-        <Limb Name="object_dt_Standardlimb_00B034" Type="Standard" EnumName="OBJECT_DT_LIMB_07" Offset="0xB034" />
-        <Limb Name="object_dt_Standardlimb_00B040" Type="Standard" EnumName="OBJECT_DT_LIMB_08" Offset="0xB040" />
-        <Limb Name="object_dt_Standardlimb_00B04C" Type="Standard" EnumName="OBJECT_DT_LIMB_09" Offset="0xB04C" />
-        <Limb Name="object_dt_Standardlimb_00B058" Type="Standard" EnumName="OBJECT_DT_LIMB_0A" Offset="0xB058" />
-        <Limb Name="object_dt_Standardlimb_00B064" Type="Standard" EnumName="OBJECT_DT_LIMB_0B" Offset="0xB064" />
-        <Limb Name="object_dt_Standardlimb_00B070" Type="Standard" EnumName="OBJECT_DT_LIMB_0C" Offset="0xB070" />
-        <Limb Name="object_dt_Standardlimb_00B07C" Type="Standard" EnumName="OBJECT_DT_LIMB_0D" Offset="0xB07C" />
-        <Limb Name="object_dt_Standardlimb_00B088" Type="Standard" EnumName="OBJECT_DT_LIMB_0E" Offset="0xB088" />
-        <Skeleton Name="object_dt_Skel_00B0CC" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DT_LIMB_NONE" LimbMax="OBJECT_DT_LIMB_MAX" EnumName="ObjectDtLimb" Offset="0xB0CC" />
-        <Animation Name="object_dt_Anim_00B500" Offset="0xB500" /> <!-- Original name is "dt_yome2arigato" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dy_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dy_obj.xml
deleted file mode 100644
index b321240cc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_dy_obj.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<Root>
-    <!-- Great Fairy assets -->
-    <File Name="object_dy_obj" Segment="6">
-        <!-- Great Fairy animations -->
-        <Animation Name="gGreatFairyStartGivingUpgradeAnim" Offset="0x129C" /> <!-- Original name is "be_mahoukousi" -->
-        <Animation Name="gGreatFairyGivingUpgradeAnim" Offset="0x2338" /> <!-- Original name is "be_mahoukousi_loop" -->
-        <Animation Name="gGreatFairyAnim_0027B0" Offset="0x27B0" /> <!-- Original name is "be_syutugen" --> <!-- unused -->
-        <Animation Name="gGreatFairyLayDownTransitionAnim" Offset="0x45FC" /> <!-- Original name is "be_utubuse" -->
-        <Animation Name="gGreatFairyLayingDownAnim" Offset="0x5238" /> <!-- Original name is "be_utubuse_loop" -->
-        <Animation Name="gGreatFairyTeachSpinAttackAnim" Offset="0x5E20" /> <!-- Original name is "bigelf_denjyu" ("instruction") -->
-        <Animation Name="gGreatFairyClappingAnim" Offset="0x6DE4" /> <!-- Original name is "bigelf_hakusyu" ("applause") -->
-        <Animation Name="gGreatFairyShowingItemAnim" Offset="0x8090" /> <!-- Original name is "bigelf_itemdasu" -->
-        <Animation Name="gGreatFairySpinLayDownAnim" Offset="0xC500" /> <!-- Original name is "bigelf_syutugen" -->
-        <Animation Name="gGreatFairyArmsFoldedAnim" Offset="0xD15C" /> <!-- Original name is "bigelf_udegumi" ("arms crossed") -->
-
-        <!-- Great Fairy particles -->
-        <DList Name="gGreatFairyParticleSetupDL" Offset="0xD1B0" />
-        <DList Name="gGreatFairyParticleDL" Offset="0xD228" />
-        <Texture Name="gGreatFairyParticleTex" OutName="great_fairy_particle" Format="i4" Width="32" Height="32" Offset="0xD240" />
-
-        <!-- Great Fairy spiral beam -->
-        <Texture Name="gGreatFairySpiralBeamPatternTex" OutName="spiral_beam_pattern" Format="i8" Width="16" Height="16" Offset="0xD440" />
-        <Texture Name="gGreatFairySpiralBeamGradientTex" OutName="spiral_beam_gradient" Format="i8" Width="32" Height="64" Offset="0xD540" />
-        <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0xDD40">
-            <Vtx/>
-        </Array>
-        <DList Name="gGreatFairySpiralBeamDL" Offset="0xDEF0" /> <!-- Original name is "efc_g_fairly_modelT" -->
-
-        <!-- Great Fairy model -->
-        <!-- Displaylists -->
-        <DList Name="gGreatFairyWaistDL" Offset="0x13810" />
-        <DList Name="gGreatFairyTorsoDL" Offset="0x13928" />
-        <DList Name="gGreatFairyHeadDL" Offset="0x13CF8" />
-        <DList Name="gGreatFairyRightHairLowerPartDL" Offset="0x142E0" />
-        <DList Name="gGreatFairyRightHairMiddlePartDL" Offset="0x143F0" />
-        <DList Name="gGreatFairyRightHairUpperPartDL" Offset="0x14578" />
-        <DList Name="gGreatFairyRightHairTipDL" Offset="0x14670" />
-        <DList Name="gGreatFairyLeftHairLowerPartDL" Offset="0x14760" />
-        <DList Name="gGreatFairyLeftHairMiddlePartDL" Offset="0x14908" />
-        <DList Name="gGreatFairyLeftHairUpperPartDL" Offset="0x14A00" />
-        <DList Name="gGreatFairyLeftHairTipDL" Offset="0x14B88" />
-        <DList Name="gGreatFairyMiddleHairLowerPartDL" Offset="0x14C78" />
-        <DList Name="gGreatFairyMiddleHairMiddlePartDL" Offset="0x14E08" />
-        <DList Name="gGreatFairyMiddleHairUpperPartDL" Offset="0x14F08" />
-        <DList Name="gGreatFairyMiddleHairTipDL" Offset="0x15008" />
-        <DList Name="gGreatFairyRightUpperArmDL" Offset="0x150F8" />
-        <DList Name="gGreatFairyRightForearmDL" Offset="0x15220" />
-        <DList Name="gGreatFairyRightHandDL" Offset="0x153B8" />
-        <DList Name="gGreatFairyLeftUpperArmDL" Offset="0x15598" />
-        <DList Name="gGreatFairyLeftForearmDL" Offset="0x156C0" />
-        <DList Name="gGreatFairyLeftHandDL" Offset="0x158E8" />
-        <DList Name="gGreatFairyRightThighDL" Offset="0x15AC8" />
-        <DList Name="gGreatFairyRightLowerLegDL" Offset="0x15E88" />
-        <DList Name="gGreatFairyRightFootDL" Offset="0x15FE8" />
-        <DList Name="gGreatFairyLeftThighDL" Offset="0x160F8" />
-        <DList Name="gGreatFairyLeftLowerLegDL" Offset="0x16360" />
-        <DList Name="gGreatFairyLeftFootDL" Offset="0x164B8" />
-
-        <!-- Textures -->
-        <Texture Name="object_dy_obj_TLUT_0165C8" OutName="tlut_0165C8" Format="rgba16" Width="16" Height="16" Offset="0x165C8" />
-        <Texture Name="object_dy_obj_Tex_0167C8" OutName="tex_0167C8" Format="ci8" Width="8" Height="8" Offset="0x167C8" />
-        <Texture Name="object_dy_obj_Tex_016808" OutName="tex_016808" Format="ci8" Width="8" Height="8" Offset="0x16808" />
-        <Texture Name="object_dy_obj_Tex_016848" OutName="tex_016848" Format="ci8" Width="32" Height="64" Offset="0x16848" />
-        <Texture Name="object_dy_obj_Tex_017048" OutName="tex_017048" Format="ci8" Width="8" Height="8" Offset="0x17048" />
-        <Texture Name="object_dy_obj_Tex_017088" OutName="tex_017088" Format="ci8" Width="32" Height="32" Offset="0x17088" />
-        <Texture Name="object_dy_obj_Tex_017488" OutName="tex_017488" Format="ci8" Width="32" Height="32" Offset="0x17488" />
-        <Texture Name="object_dy_obj_Tex_017888" OutName="tex_017888" Format="ci8" Width="16" Height="16" Offset="0x17888" />
-        <Texture Name="object_dy_obj_Tex_017988" OutName="tex_017988" Format="rgba16" Width="32" Height="16" Offset="0x17988" />
-
-        <Texture Name="object_dy_obj_Tex_017D88" OutName="tex_017D88" Format="rgba16" Width="32" Height="32" Offset="0x17D88" />
-        <Texture Name="object_dy_obj_Tex_018588" OutName="tex_018588" Format="rgba16" Width="32" Height="32" Offset="0x18588" />
-        <Texture Name="object_dy_obj_Tex_018D88" OutName="tex_018D88" Format="rgba16" Width="32" Height="32" Offset="0x18D88" />
-        <Texture Name="object_dy_obj_Tex_019588" OutName="tex_019588" Format="rgba16" Width="32" Height="32" Offset="0x19588" />
-        <Texture Name="object_dy_obj_Tex_019D88" OutName="tex_019D88" Format="rgba16" Width="32" Height="32" Offset="0x19D88" />
-        <Texture Name="gGreatFairyMouthClosedTex" OutName="great_fairy_mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x1A588" />
-        <Texture Name="gGreatFairyMouthOpenTex" OutName="great_fairy_mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1B588" />
-        <Texture Name="object_dy_obj_Tex_01C588" OutName="tex_01C588" Format="i8" Width="16" Height="16" Offset="0x1C588" />
-
-        <TextureAnimation Name="gGreatFairyAppearenceTexAnim" Offset="0x1C6F4" />
-
-        <!-- Great Fairy Skeleton -->
-        <Limb Name="gGreatFairyWaistLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_WAIST" Offset="0x1C704" />
-        <Limb Name="gGreatFairyLeftThighLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_THIGH" Offset="0x1C710" />
-        <Limb Name="gGreatFairyLeftLowerLegLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_LOWER_LEG" Offset="0x1C71C" />
-        <Limb Name="gGreatFairyLeftFootLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_FOOT" Offset="0x1C728" />
-        <Limb Name="gGreatFairyRightThighLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_THIGH" Offset="0x1C734" />
-        <Limb Name="gGreatFairyRightLowerLegLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_LOWER_LEG" Offset="0x1C740" />
-        <Limb Name="gGreatFairyRightFootLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_FOOT" Offset="0x1C74C" />
-        <Limb Name="gGreatFairyTorsoLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_TORSO" Offset="0x1C758" />
-        <Limb Name="gGreatFairyLeftUpperArmLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_UPPER_ARM" Offset="0x1C764" />
-        <Limb Name="gGreatFairyLeftForearmLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_FOREARM" Offset="0x1C770" />
-        <Limb Name="gGreatFairyLeftHandLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_HAND" Offset="0x1C77C" />
-        <Limb Name="gGreatFairyRightUpperArmLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_UPPER_ARM" Offset="0x1C788" />
-        <Limb Name="gGreatFairyRightForearmLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_FOREARM" Offset="0x1C794" />
-        <Limb Name="gGreatFairyRightHandLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_HAND" Offset="0x1C7A0" />
-        <Limb Name="gGreatFairyHeadLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_HEAD" Offset="0x1C7AC" />
-        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_MIDDLE_HAIR_LOWER_PART" Offset="0x1C7B8" />
-        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_MIDDLE_HAIR_MIDDLE_PART" Offset="0x1C7C4" />
-        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_MIDDLE_HAIR_UPPER_PART" Offset="0x1C7D0" />
-        <Limb Name="gGreatFairyMiddleHairTipLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_MIDDLE_HAIR_TIP" Offset="0x1C7DC" />
-        <Limb Name="gGreatFairyLeftHairLowerPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_HAIR_LOWER_PART" Offset="0x1C7E8" />
-        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_HAIR_MIDDLE_PART" Offset="0x1C7F4" />
-        <Limb Name="gGreatFairyLeftHairUpperPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_HAIR_UPPER_PART" Offset="0x1C800" />
-        <Limb Name="gGreatFairyLeftHairTipLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_LEFT_HAIR_TIP" Offset="0x1C80C" />
-        <Limb Name="gGreatFairyRightHairLowerPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_HAIR_LOWER_PART" Offset="0x1C818" />
-        <Limb Name="gGreatFairyRightHairMiddlePartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_HAIR_MIDDLE_PART" Offset="0x1C824" />
-        <Limb Name="gGreatFairyRightHairUpperPartLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_HAIR_UPPER_PART" Offset="0x1C830" />
-        <Limb Name="gGreatFairyRightHairTipLimb" Type="Standard" EnumName="GREAT_FAIRY_LIMB_RIGHT_HAIR_TIP" Offset="0x1C83C" />
-        <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" LimbNone="GREAT_FAIRY_LIMB_NONE" LimbMax="GREAT_FAIRY_LIMB_MAX" EnumName="GreatFairyLimb" Offset="0x1C8B4" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_efc_star_field.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_efc_star_field.xml
deleted file mode 100644
index 90ea17929..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_efc_star_field.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_efc_star_field" Segment="6">
-        <DList Name="object_efc_star_field_DL_000080" Offset="0x80" /> <!-- Original name is "efc_star_field_modelT" -->
-        <Texture Name="object_efc_star_field_Tex_000108" OutName="tex_000108" Format="i8" Width="16" Height="64" Offset="0x108" />
-        <DList Name="object_efc_star_field_DL_000DE0" Offset="0xDE0" /> <!-- Original name is "demo_rock_model" -->
-        <Texture Name="object_efc_star_field_Tex_000FD0" OutName="tex_000FD0" Format="i4" Width="64" Height="64" Offset="0xFD0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_efc_tw.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_efc_tw.xml
deleted file mode 100644
index c28ae3c81..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_efc_tw.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_efc_tw" Segment="6">
-        <CurveAnimation Name="gTimewarpAnim" SkelOffset="0x12E8" Offset="0x50" />
-
-        <Array Name="gTimewarpVtx" Count="21" Offset="0x60" >
-            <Vtx/>
-        </Array>
-
-        <DList Name="gTimewarpDL" Offset="0x1B0" /> <!-- Original name is "top_fc_mdl" -->
-        <Texture Name="gTimewarpTex" OutName="timewarp" Format="i8" Width="64" Height="64" Offset="0x2C8" />
-
-        <Limb Name="gTimewarp1Limb" Type="Curve" EnumName="TIMEWARP_LIMB_1" Offset="0x12C8" />
-        <Limb Name="gTimewarp2Limb" Type="Curve" EnumName="TIMEWARP_LIMB_2" Offset="0x12D4" />
-        <Skeleton Name="gTimewarpSkel" Type="Curve" LimbType="Curve" LimbNone="TIMEWARP_LIMB_NONE" LimbMax="TIMEWARP_LIMB_MAX" EnumName="TimewarpLimb" Offset="0x12E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_eg.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_eg.xml
deleted file mode 100644
index a79ff6332..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_eg.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<Root>
-    <!-- Assets for the Eyegore enemy and associated props -->
-    <File Name="object_eg" Segment="6">
-        <!-- Display lists and textures for Eyegore's effects -->
-        <DList Name="gEyegoreEffectImpactDL" Offset="0x40" /> <!-- Original name is "grid1_model" -->
-        <Texture Name="gEyegoreEffectImpactTex" OutName="eyegore_effect_impact" Format="ia8" Width="64" Height="64" Offset="0xC0" />
-        <TextureAnimation Name="gEyegoreEmpty1TexAnim" Offset="0x10C0" />
-        <DList Name="gEyegoreEffectLargeBodyPieceDL" Offset="0x1170" /> <!-- Original name is "baku_shape1_model" -->
-        <Texture Name="gEyegoreEffectLargeBodyPieceTex" OutName="eyegore_effect_large_piece" Format="rgba16" Width="8" Height="16" Offset="0x1210" />
-        <DList Name="gEyegoreEffectSmallBodyPieceDL" Offset="0x13B0" /> <!-- Original name is "baku_shape2_model" -->
-        <Texture Name="gEyegoreEffectSmallBodyPieceTex" OutName="eyegore_effect_small_piece" Format="rgba16" Width="8" Height="16" Offset="0x1450" />
-        <DList Name="gEyegoreEmpty1DL" Offset="0x1690" />
-
-        <!-- Assets for Eyegore's destructible pillars (unused) -->
-        <DList Name="gEyegoreBlockDL" Offset="0x1698" />
-        <Collision Name="gEyegoreBlockCol" Offset="0x1820" /> <!-- Original name is "eg_block1_bgdatainfo" -->
-        <DList Name="gEyegoreEmpty2DL" Offset="0x1910" />
-        <DList Name="gEyegoreEffectSolidDebrisDL" Offset="0x1918" /> <!-- Original name is "eg_block2_model" -->
-        <Texture Name="gEyegoreEffectSolidDebrisTex" OutName="eyegore_effect_solid_debris" Format="rgba16" Width="16" Height="16" Offset="0x19B0" />
-        <TextureAnimation Name="gEyegoreEmpty2TexAnim" Offset="0x1BB0" />
-        <DList Name="gEyegoreEmpty3DL" Offset="0x1BF0" />
-        <DList Name="gEyegoreEffectFlatDebrisDL" Offset="0x1BF8" />
-        <Texture Name="gEyegoreEffectFlatDebrisTex" OutName="eyegore_effect_flat_debris" Format="rgba16" Width="16" Height="16" Offset="0x1C78" />
-        <TextureAnimation Name="gEyegoreEmpty3TexAnim" Offset="0x1E80" />
-
-        <!-- Slam attack animation -->
-        <Animation Name="gEyegoreSlamAnim" Offset="0x2460" /> <!-- Original name is "eg_atack01" -->
-
-        <!-- Unused vertex mesh. Purpose unknown. -->
-        <Array Name="gEyegoreUnusedVtx" Count="464" Offset="0x2470"> <!-- type is uncertain -->
-            <Vtx/>
-        </Array>
-
-        <!-- Display list for Eyegore's laser attack -->
-        <DList Name="gEyegoreLaserDL" Offset="0x41F0" /> <!-- Original name is "eg_sen_SCR1_F_model" -->
-        
-        <!-- Several unused textures that look to come from object_vm. Purpose unknown. -->
-        <Texture Name="gEyegoreBeamosBodyGradientTex" OutName="eyegore_beamos_body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x4280" />
-        <Texture Name="gEyegoreBeamosGrayMetalTex" OutName="eyegore_beamos_gray_metal" Format="i4" Width="16" Height="32" Offset="0x4300" />
-        <Texture Name="gEyegoreBeamosBoltAndMetalTex" OutName="eyegore_beamos_bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x4400" />
-        <Texture Name="gEyegoreBeamosInnerEyeLidTex" OutName="eyegore_beamos_inner_eye_lid" Format="rgba16" Width="16" Height="8" Offset="0x4800" />
-        <Texture Name="gEyegoreBeamosEyeOutlineTex" OutName="eyegore_beamos_eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x4900" />
-        <Texture Name="gEyegoreBeamosEyeTex" OutName="eyegore_beamos_eye" Format="rgba16" Width="32" Height="16" Offset="0x4B00" />
-        <Texture Name="gEyegoreBeamosBodyTex" OutName="eyegore_beamos_body" Format="rgba16" Width="16" Height="16" Offset="0x4F00" />
-
-        <!-- Animated texture for Eyegore's laser attack. Uses gEyegoreEyeLaserTexAnim. -->
-        <Texture Name="gEyegoreLaserTex" OutName="eyegore_laser" Format="rgba16" Width="8" Height="8" Offset="0x5100" />
-
-        <!-- Unused teeth texture that looks to come from object_vm. Purpose unknown. -->
-        <Texture Name="gEyegoreBeamosTeethTex" OutName="eyegore_beamos_teeth" Format="rgba16" Width="32" Height="32" Offset="0x5180" />
-
-        <!-- Eyegore limb display lists -->
-        <DList Name="gEyegoreHipsDL" Offset="0x7C80" />
-        <DList Name="gEyegoreFauldsDL" Offset="0x7DF8" />
-        <DList Name="gEyegoreRightShinDL" Offset="0x7EB0" />
-        <DList Name="gEyegoreRightFootDL" Offset="0x7FF0" />
-        <DList Name="gEyegoreRightThighDL" Offset="0x8180" />
-        <DList Name="gEyegoreLeftShinDL" Offset="0x82F0" />
-        <DList Name="gEyegoreLeftFootDL" Offset="0x8430" />
-        <DList Name="gEyegoreLeftThighDL" Offset="0x85C0" />
-        <DList Name="gEyegoreHeadDL" Offset="0x8730" />
-        <DList Name="gEyegoreEyeballDL" Offset="0x88E0" />
-        <DList Name="gEyegoreEyeColliderLimbDL" Offset="0x89F8" />
-        <DList Name="gEyegoreLaserAttachLimbDL" Offset="0x8A40" />
-        <DList Name="gEyegorePupilDL" Offset="0x8A88" />
-        <DList Name="gEyegoreLowerEyelidDL" Offset="0x8B28" />
-        <DList Name="gEyegoreUpperEyelidDL" Offset="0x8C28" />
-        <DList Name="gEyegoreRightHandDL" Offset="0x8D28" />
-        <DList Name="gEyegoreRightShoulderDL" Offset="0x8E40" />
-        <DList Name="gEyegoreRightArmDL" Offset="0x8ED8" />
-        <DList Name="gEyegoreLeftHandDL" Offset="0x90A0" />
-        <DList Name="gEyegoreLeftShoulderDL" Offset="0x91B8" />
-        <DList Name="gEyegoreLeftArmDL" Offset="0x9250" />
-        <DList Name="gEyegoreTorsoDL" Offset="0x9418" />
-
-        <!-- Texture animation for Eyegore's eye and laser -->
-        <TextureAnimation Name="gEyegoreEyeLaserTexAnim" Offset="0x94E4" />
-
-        <!-- Eyegore limbs -->
-        <Limb Name="gEyegoreRootLimb" Type="Standard" EnumName="EYEGORE_LIMB_ROOT" Offset="0x94F4" />
-        <Limb Name="gEyegoreTorsoLimb" Type="Standard" EnumName="EYEGORE_LIMB_TORSO" Offset="0x9500" />
-        <Limb Name="gEyegoreHeadLimb" Type="Standard" EnumName="EYEGORE_LIMB_HEAD" Offset="0x950C" />
-        <Limb Name="gEyegoreLeftShoulderLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_SHOULDER" Offset="0x9518" /> 
-        <Limb Name="gEyegoreLeftArmLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_ARM" Offset="0x9524" /> 
-        <Limb Name="gEyegoreLeftHandLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_HAND" Offset="0x9530" /> 
-        <Limb Name="gEyegoreRightShoulderLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_SHOULDER" Offset="0x953C" /> 
-        <Limb Name="gEyegoreRightArmLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_ARM" Offset="0x9548" /> 
-        <Limb Name="gEyegoreRightHandLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_HAND" Offset="0x9554" /> 
-        <Limb Name="gEyegoreUpperEyelidLimb" Type="Standard" EnumName="EYEGORE_LIMB_UPPER_EYELID" Offset="0x9560" /> 
-        <Limb Name="gEyegoreLowerEyelidLimb" Type="Standard" EnumName="EYEGORE_LIMB_LOWER_EYELID" Offset="0x956C" /> 
-        <Limb Name="gEyegorePupilLimb" Type="Standard" EnumName="EYEGORE_LIMB_PUPIL" Offset="0x9578" /> 
-        <Limb Name="gEyegoreLaserAttachLimb" Type="Standard" EnumName="EYEGORE_LIMB_LASER_ATTACH" Offset="0x9584" /> 
-        <Limb Name="gEyegoreEyeColliderLimb" Type="Standard" EnumName="EYEGORE_LIMB_EYE_COLLIDER" Offset="0x9590" /> 
-        <Limb Name="gEyegoreEyeballLimb" Type="Standard" EnumName="EYEGORE_LIMB_EYEBALL" Offset="0x959C" /> 
-        <Limb Name="gEyegoreHipsLimb" Type="Standard" EnumName="EYEGORE_LIMB_HIPS" Offset="0x95A8" /> 
-        <Limb Name="gEyegoreLeftThighLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_THIGH" Offset="0x95B4" /> 
-        <Limb Name="gEyegoreLeftShinLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_SHIN" Offset="0x95C0" /> 
-        <Limb Name="gEyegoreLeftFootLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_FOOT" Offset="0x95CC" /> 
-        <Limb Name="gEyegoreRightThighLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_THIGH" Offset="0x95D8" /> 
-        <Limb Name="gEyegoreRightShinLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_SHIN" Offset="0x95E4" /> 
-        <Limb Name="gEyegoreRightFootLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_FOOT" Offset="0x95F0" /> 
-        <Limb Name="gEyegoreFauldsLimb" Type="Standard" EnumName="EYEGORE_LIMB_FAULDS" Offset="0x95FC" /> 
-
-        <!-- Eyegore skeleton -->
-        <Skeleton Name="gEyegoreSkel" Type="Flex" LimbType="Standard" LimbNone="EYEGORE_LIMB_NONE" LimbMax="EYEGORE_LIMB_MAX" EnumName="EyegoreLimb" Offset="0x9664" />
-
-        <!-- Various fight animations -->
-        <Animation Name="gEyegoreSlamWaitAnim" Offset="0x9D2C" /> <!-- Original name is "eg_atack02" -->
-        <Animation Name="gEyegoreSlamEndAnim" Offset="0xA204" /> <!-- Original name is "eg_atack03" -->
-        <Animation Name="gEyegoreLaserAnim" Offset="0xA484" /> <!-- Original name is "eg_beam" -->
-        <Animation Name="gEyegoreUnusedLaserEndAnim" Offset="0xA73C" /> <!-- Original name is "eg_beamTOwalk" -->
-        <Animation Name="gEyegoreDamagedAnim" Offset="0xADF8" /> <!-- Original name is "eg_damage" -->
-        <Animation Name="gEyegoreDeathAnim" Offset="0xBC60" /> <!-- Original name is "eg_dead" -->
-        <Animation Name="gEyegoreRetreatAnim" Offset="0xBEB8" /> <!-- Original name is "eg_escape" -->
-        <Animation Name="gEyegoreLeftPunchAnim" Offset="0xC434" /> <!-- Original name is "eg_hatakiL" -->
-        <Animation Name="gEyegoreRightPunchAnim" Offset="0xC9B4" /> <!-- Original name is "eg_hatakiR" -->
-        <Animation Name="gEyegoreStunnedAnim" Offset="0xCC4C" /> <!-- Original name is "eg_mahi" -->
-        <Animation Name="gEyegoreStunEndAnim" Offset="0xCE54" /> <!-- Original name is "eg_mahiTOwalk" -->
-        <Animation Name="gEyegoreSitAnim" Offset="0xD3D8" /> <!-- Original name is "eg_nemuru" -->
-
-        <!-- Unused stone display list and texture. It's a copy of the stone in object_efc_star_field. -->
-        <DList Name="gEyegoreUnusedStoneDL" Offset="0xDCC0" />
-        <Texture Name="gEyegoreUnusedStoneTex" OutName="eyegore_unused_stone" Format="i4" Width="64" Height="64" Offset="0xDEA8" />
-
-        <!-- Various walking and idle animations. Contains several unused ones. -->
-        <Animation Name="gEyegoreUnusedChaseAnim" Offset="0xEA10" /> <!-- Original name is "eg_run" -->
-        <Animation Name="gEyegoreStandAnim" Offset="0xEE4C" /> <!-- Original name is "eg_start" -->
-        <Animation Name="gEyegoreUnusedWalkAnim" Offset="0xF524" /> <!-- Original name is "eg_turn" -->
-        <Animation Name="gEyegoreUnusedIdleAnim" Offset="0xFB0C" /> <!-- Original name is "eg_wait" -->
-        <Animation Name="gEyegoreWalkAnim" Offset="0x100C0" /> <!-- Original name is "eg_walk" -->
-
-        <!-- Display list and texture for the stones created by Eyegore's attacks -->
-        <DList Name="gEyegoreStoneDL" Offset="0x10240" /> <!-- Original name is "iwaA_cube1_model" -->
-        <Texture Name="gEyegoreStoneTex" OutName="eyegore_stone" Format="rgba16" Width="36" Height="36" Offset="0x10310" />
-
-        <!-- Duplicate of gEyegoreEffectImpactTex -->
-        <Texture Name="gEyegoreDuplicateEffectImpactTex" OutName="eyegore_duplicate_effect_impact" Format="ia8" Width="64" Height="64" Offset="0x10D30" />
-
-        <!-- Textures for Eyegore's body -->
-        <Texture Name="gEyegoreDarkBodyTex" OutName="eyegore_dark_body" Format="rgba16" Width="8" Height="16" Offset="0x11D30" />
-        <Texture Name="gEyegoreBlockTex" OutName="eyegore_block" Format="rgba16" Width="16" Height="16" Offset="0x11E30" />
-        <Texture Name="gEyegoreClawTex" OutName="eyegore_claw" Format="rgba16" Width="4" Height="4" Offset="0x12030" />
-        <Texture Name="gEyegoreLightBodyTex" OutName="eyegore_light_body" Format="rgba16" Width="8" Height="16" Offset="0x12050" />
-        <Texture Name="gEyegoreArmorTex" OutName="eyegore_armor" Format="rgba16" Width="8" Height="8" Offset="0x12150" />
-        <Texture Name="gEyegoreHeadTex" OutName="eyegore_head" Format="i4" Width="16" Height="32" Offset="0x121D0" />
-        <Texture Name="gEyegorePupilTex" OutName="eyegore_pupil" Format="rgba16" Width="16" Height="32" Offset="0x122D0" />
-
-        <!-- Duplicate of gEyegoreStoneTex -->
-        <Texture Name="gEyegoreDuplicateStoneTex" OutName="eyegore_duplicate_stone" Format="rgba16" Width="36" Height="36" Offset="0x126D0" />
-        
-        <!-- Animated texture for Eyegore's eye. Uses gEyegoreEyeLaserTexAnim. -->
-        <Texture Name="gEyegoreEyeballTex" OutName="eyegore_eyeball" Format="i4" Width="16" Height="32" Offset="0x130F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ending_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ending_obj.xml
deleted file mode 100644
index f8902e353..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ending_obj.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <File Name="object_ending_obj" Segment="6">
-        <DList Name="object_ending_obj_DL_0003D0" Offset="0x3D0" /> <!-- Original name is "lost_woods_light_u_modelT" -->
-        <DList Name="object_ending_obj_DL_0005E0" Offset="0x5E0" />
-        <Texture Name="object_ending_obj_Tex_0005E8" OutName="tex_0005E8" Format="i8" Width="32" Height="64" Offset="0x5E8" />
-        <Texture Name="object_ending_obj_Tex_000DE8" OutName="tex_000DE8" Format="i8" Width="8" Height="64" Offset="0xDE8" />
-        <Texture Name="object_ending_obj_Tex_000FE8" OutName="tex_000FE8" Format="ia8" Width="64" Height="64" Offset="0xFE8" />
-        <TextureAnimation Name="object_ending_obj_Matanimheader_001FF8" Offset="0x1FF8" />
-        <DList Name="object_ending_obj_DL_0031A0" Offset="0x31A0" /> <!-- Original name is "z2_lost_woods_end_modelT" -->
-        <DList Name="object_ending_obj_DL_003440" Offset="0x3440" /> <!-- Original name is "z2_lost_woods_end_model" -->
-        <Texture Name="object_ending_obj_Tex_003958" OutName="tex_003958" Format="ia4" Width="128" Height="64" Offset="0x3958" />
-        <Texture Name="object_ending_obj_Tex_004958" OutName="tex_004958" Format="rgba16" Width="32" Height="32" Offset="0x4958" />
-        <Texture Name="object_ending_obj_Tex_005158" OutName="tex_005158" Format="ia16" Width="16" Height="64" Offset="0x5158" />
-        <Texture Name="object_ending_obj_Tex_005958" OutName="tex_005958" Format="ia16" Width="8" Height="32" Offset="0x5958" />
-        <Texture Name="object_ending_obj_Tex_005B58" OutName="tex_005B58" Format="rgba16" Width="16" Height="16" Offset="0x5B58" />
-        <Texture Name="object_ending_obj_Tex_005D58" OutName="tex_005D58" Format="ia16" Width="32" Height="32" Offset="0x5D58" />
-        <Texture Name="object_ending_obj_Tex_006558" OutName="tex_006558" Format="ia8" Width="64" Height="64" Offset="0x6558" />
-        <Texture Name="object_ending_obj_Tex_007558" OutName="tex_007558" Format="ia8" Width="8" Height="16" Offset="0x7558" />
-        <Texture Name="object_ending_obj_Tex_0075D8" OutName="tex_0075D8" Format="i8" Width="32" Height="64" Offset="0x75D8" />
-        <Texture Name="object_ending_obj_Tex_007DD8" OutName="tex_007DD8" Format="i4" Width="64" Height="64" Offset="0x7DD8" />
-        <Texture Name="object_ending_obj_Tex_0085D8" OutName="tex_0085D8" Format="i4" Width="32" Height="32" Offset="0x85D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f40_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f40_obj.xml
deleted file mode 100644
index 636a80682..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f40_obj.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Root>
-    <!-- 
-        Assets for Stone Tower platforms. These platforms include the cubes moved by pressing the switches in 
-        Stone Tower and two unused platforms.
-    -->
-    <File Name="object_f40_obj" Segment="6">
-        <Texture Name="gStoneTowerPlatformsTopTex" OutName="stone_tower_platforms_top" Format="i8" Width="64" Height="64" Offset="0x0" /> <!-- Unused -->
-        <Texture Name="gStoneTowerPlatformsSidesTex" OutName="stone_tower_platforms_sides" Format="rgba16" Width="32" Height="64" Offset="0x1000" /> <!-- Unused -->
-        
-        <Texture Name="gStoneTowerBlockBackgroundTex" OutName="stone_tower_block_background" Format="rgba16" Width="32" Height="32" Offset="0x2000" />
-        <Texture Name="gStoneTowerBlockPatternTex" OutName="stone_tower_block_pattern" Format="i4" Width="32" Height="128" Offset="0x2800" />
-        <Texture Name="gStoneTowerBlockSidesTex" OutName="stone_tower_block_sides" Format="i4" Width="64" Height="64" Offset="0x3000" />
-        
-        <DList Name="gStoneTowerVerticallyOscillatingPlatformEmptyDL" Offset="0x3B00" />
-        <DList Name="gStoneTowerVerticallyOscillatingPlatformDL" Offset="0x3B08" /> <!-- Unused -->
-        <Collision Name="gStoneTowerVerticallyOscillatingPlatformCol" Offset="0x3E80" /> <!-- Unused -->
-        
-        <DList Name="gStoneTowerTempleSquareElevatorEmptyDL" Offset="0x4030" />
-        <DList Name="gStoneTowerTempleSquareElevatorDL" Offset="0x4038" /> <!-- Unused -->
-        <Collision Name="gStoneTowerTempleSquareElevatorCol" Offset="0x4240" /> <!-- Unused -->
-        
-        <DList Name="gStoneTowerBlockDL" Offset="0x43D0" />
-        <Collision Name="gStoneTowerBlockCol" Offset="0x4640" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f40_switch.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f40_switch.xml
deleted file mode 100644
index 6be5a5bd5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f40_switch.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Object for Stone Tower Switch -->
-    <File Name="object_f40_switch" Segment="6">
-        <Collision Name="gStoneTowerFloorSwitchCol" Offset="0x118" /> <!-- Original name is "f40_switch_1_bgdatainfo" -->
-        <DList Name="gStoneTowerFloorSwitchOutlineDL" Offset="0x390" /> <!-- Original name is "z2_switch_lb_modelT" -->
-        <DList Name="gStoneTowerFloorSwitchDL" Offset="0x438" /> <!-- Original name is "z2_switch_lb_model" -->
-        <Texture Name="gStoneTowerFloorSwitchOutlineTex" OutName="stone_tower_switch_outline" Format="rgba16" Width="16" Height="64" Offset="0x4E8" />
-        <Texture Name="gStoneTowerFloorSwitchTex" OutName="stone_tower_switch" Format="ia8" Width="16" Height="16" Offset="0xCE8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f52_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f52_obj.xml
deleted file mode 100644
index 0da643be0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f52_obj.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_f52_obj" Segment="6">
-        <DList Name="object_f52_obj_DL_000570" Offset="0x570" /> <!-- Bell post. Original name is "bw_01_model" -->
-        <DList Name="object_f52_obj_DL_000698" Offset="0x698" /> <!-- Bell. Original name is "bk_model" -->
-        <DList Name="object_f52_obj_DL_0007A8" Offset="0x7A8" /> <!-- Bell Base -->
-        <DList Name="object_f52_obj_DL_000840" Offset="0x840" /> <!-- Bell Shadow. Original name is "bqT_model" -->
-        <DList Name="object_f52_obj_DL_0008D0" Offset="0x8D0" /> <!-- Bell Hook. Original name is "bhT_model" -->
-        <DList Name="object_f52_obj_DL_000960" Offset="0x960" /> <!-- Bell Designs -->
-        <Texture Name="object_f52_obj_Tex_000A10" OutName="tex_000A10" Format="rgba16" Width="32" Height="16" Offset="0xA10" />
-        <Texture Name="object_f52_obj_Tex_000E10" OutName="tex_000E10" Format="ia16" Width="16" Height="16" Offset="0xE10" />
-        <Texture Name="object_f52_obj_Tex_001010" OutName="tex_001010" Format="rgba16" Width="32" Height="16" Offset="0x1010" />
-        <Texture Name="object_f52_obj_Tex_001410" OutName="tex_001410" Format="rgba16" Width="16" Height="32" Offset="0x1410" />
-        <Texture Name="object_f52_obj_Tex_001810" OutName="tex_001810" Format="rgba16" Width="8" Height="16" Offset="0x1810" />
-        <Collision Name="object_f52_obj_Colheader_001BA8" Offset="0x1BA8" /> <!-- Original name is "z2_bell_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f53_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f53_obj.xml
deleted file mode 100644
index d93048a9d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_f53_obj.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Root>
-    <File Name="object_f53_obj" Segment="6">
-        <DList Name="object_f53_obj_DL_000090" Offset="0x90" /> <!-- Original name is "z2_entotu_modelT" -->
-        <DList Name="object_f53_obj_DL_000148" Offset="0x148" />
-        <DList Name="object_f53_obj_DL_000158" Offset="0x158" />
-        <Texture Name="object_f53_obj_Tex_000168" OutName="tex_000168" Format="rgba16" Width="32" Height="64" Offset="0x168" />
-        <DList Name="gBankShutterDL" Offset="0x11E0" />
-        <Texture Name="object_f53_obj_Tex_001278" OutName="tex_001278" Format="rgba16" Width="32" Height="32" Offset="0x1278" />
-        <!-- <Blob Name="object_f53_obj_Blob_001A78" Size="0x78" Offset="0x1A78" /> -->
-        <DList Name="object_f53_obj_DL_001AF0" Offset="0x1AF0" /> <!-- Original name is "z2_smork_modelT" -->
-        <DList Name="object_f53_obj_DL_001BF0" Offset="0x1BF0" />
-        <DList Name="object_f53_obj_DL_001C00" Offset="0x1C00" />
-        <Texture Name="object_f53_obj_Tex_001C10" OutName="tex_001C10" Format="ia8" Width="32" Height="32" Offset="0x1C10" />
-        <!-- <Blob Name="object_f53_obj_Blob_0022D0" Size="0xE0" Offset="0x22D0" /> -->
-        <DList Name="object_f53_obj_DL_0023B0" Offset="0x23B0" />
-        <DList Name="object_f53_obj_DL_0024C8" Offset="0x24C8" />
-        <DList Name="object_f53_obj_DL_0024D8" Offset="0x24D8" />
-        <DList Name="object_f53_obj_DL_0024E8" Offset="0x24E8" />
-        <DList Name="object_f53_obj_DL_002648" Offset="0x2648" />
-        <DList Name="object_f53_obj_DL_002658" Offset="0x2658" />
-        <Texture Name="object_f53_obj_Tex_002668" OutName="tex_002668" Format="rgba16" Width="32" Height="32" Offset="0x2668" />
-        <Texture Name="object_f53_obj_Tex_002E68" OutName="tex_002E68" Format="ia8" Width="32" Height="32" Offset="0x2E68" />
-        <Texture Name="object_f53_obj_Tex_003268" OutName="tex_003268" Format="i4" Width="32" Height="128" Offset="0x3268" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fall.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fall.xml
deleted file mode 100644
index 04c1ff058..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fall.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<Root>
-    <!--
-        Contains the high-detail moon used in cutscenes and in Termina Field,
-        the debris that rises from the ground as the moon is crashing, the
-        ball of fire that surrounds the moon when it is crashing, and the ring
-        of fire that expands outward when the moon is almost done crashing.
-    -->
-    <File Name="object_fall" Segment="6">
-        <!-- Debris -->
-        <DList Name="gMoonEmpty1DL" Offset="0x190" /> <!-- Was likely going to be used with gMoonDebrisModel1DL before they made all debris use the same material -->
-        <DList Name="gMoonDebrisMaterialDL" Offset="0x198" />
-        <DList Name="gMoonDebrisModel1DL" Offset="0x220" /> <!-- Original name is "at_dust_01_model" -->
-        <Texture Name="gMoonDebrisTex" OutName="moon_debris" Format="i8" Width="16" Height="16" Offset="0x260" />
-        <DList Name="gMoonEmpty2DL" Offset="0x420" /> <!-- Was likely going to be used with gMoonDebrisModel2DL before they made all debris use the same material -->
-        <DList Name="gMoonDebrisModel2DL" Offset="0x428" /> <!-- Original name is "at_dust_02_model" -->
-        <DList Name="gMoonEmpty3DL" Offset="0x490" /> <!-- Was likely going to be used with gMoonDebrisModel3DL before they made all debris use the same material -->
-        <DList Name="gMoonDebrisModel3DL" Offset="0x498" /> <!-- Original name is "at_dust_03_model" -->
-
-        <!-- Fireball Vertices -->
-        <Array Name="gMoonFireballVtx" Count="209" Offset="0x4C0">
-            <Vtx/>
-        </Array>
-        
-        <!-- Fireball DisplayList -->
-        <DList Name="gMoonFireballDL" Offset="0x11D0" /> <!-- Original name is "moon_fall_model" -->
-
-        <!-- Fireball Textures -->
-        <Texture Name="gMoonFireballFlecksTex" OutName="moon_fireball_flecks" Format="i8" Width="64" Height="64" Offset="0x1688" />
-        <Texture Name="gMoonFireballFlamesTex" OutName="moon_fireball_flames" Format="i4" Width="64" Height="64" Offset="0x2688" />
-        <Texture Name="gMoonFireballMaskTex" OutName="moon_fireball_mask" Format="i4" Width="64" Height="64" Offset="0x2E88" />
-
-        <!-- Fire Ring DisplayList -->
-        <DList Name="gMoonFireRingDL" Offset="0x3C30" /> <!-- Original name is "moon_fall2_model" -->
-
-        <!-- Fire Ring Textures -->
-        <Texture Name="gMoonFireRingFlamesTex" OutName="moon_fire_ring_flames" Format="i8" Width="32" Height="64" Offset="0x3E28" />
-        <Texture Name="gMoonFireRingMaskTex" OutName="moon_fire_ring_mask" Format="i8" Width="32" Height="64" Offset="0x4628" />
-
-        <!-- Fire Ring Texture Animation -->
-        <TextureAnimation Name="gMoonFireRingTexAnim" Offset="0x4E38" />
-
-        <!-- Unused Fireball Texture Animation -->
-        <TextureAnimation Name="gMoonUnusedFireballTexAnim" Offset="0x4E58" /> <!-- Almost certainly scrapped for just doing the TwoTexScrolls manually in EnFall_Fireball_Draw -->
-
-        <!-- Moon DisplayList -->
-        <DList Name="gMoonDL" Offset="0x77F0" /> <!-- Original name is "moon" -->
-
-        <!-- Moon Textures -->
-        <Texture Name="gMoonFarSideTLUT" OutName="moon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x82F8" />
-        <Texture Name="gMoonFaceTLUT" OutName="moon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8318" />
-        <Texture Name="gMoonEyeTex" OutName="moon_eye" Format="rgba16" Width="32" Height="32" Offset="0x8338" />
-        <Texture Name="gMoonTeethTex" OutName="moon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x8B38" />
-        <Texture Name="gMoonFarSideTex" OutName="moon_far_side" Format="ci4" Width="64" Height="64" Offset="0x9B38" />
-        <Texture Name="gMoonFaceTex" OutName="moon_face" Format="ci4" Width="64" Height="64" Offset="0xA338" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fall2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fall2.xml
deleted file mode 100644
index c6e4483a8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fall2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<Root>
-    <!--
-        Open-mouth version of the moon and the "warp beam" that emerges from the
-        moon's mouth, both used in the cutscene before warping to the moon.
-    -->
-    <File Name="object_fall2" Segment="6">
-        <DList Name="gOpenMouthMoonDL" Offset="0x2970" /> <!-- Original name is "moon_open" -->
-        <Texture Name="gOpenMouthMoonFarSideTLUT" OutName="open_mouth_moon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x34A8" />
-        <Texture Name="gOpenMouthMoonFaceTLUT" OutName="open_mouth_moon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x34C8" />
-        <Texture Name="gOpenMouthMoonEyesTex" OutName="open_mouth_moon_eyes" Format="rgba16" Width="32" Height="32" Offset="0x34E8" />
-        <Texture Name="gOpenMouthMoonFarSideTex" OutName="open_mouth_moon_far_side" Format="ci4" Width="64" Height="64" Offset="0x3CE8" />
-        <Texture Name="gOpenMouthMoonFaceTex" OutName="open_mouth_moon_face" Format="ci4" Width="64" Height="64" Offset="0x44E8" />
-        <Texture Name="gOpenMouthMoonTeethTex" OutName="open_mouth_moon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x4CE8" />
-        
-        <KeyFrameAnimation Name="gFall2FKAnim_5EF4" Skel="0x8898" Offset="0x5EF4"/>
-        <KeyFrameSkel Name="gFall2KFSkel_8898" LimbType="Flex" Offset="0x8898"/>
-
-        <Array Name="object_fall2_Vtx_005F10" Count="239" Offset="0x5F10">
-            <Vtx />
-        </Array>
-        <DList Name="object_fall2_DL_006E00" Offset="0x6E00" />
-        <DList Name="object_fall2_DL_006EF0" Offset="0x6EF0" />
-        <DList Name="object_fall2_DL_006FF8" Offset="0x6FF8" />
-        <DList Name="object_fall2_DL_007100" Offset="0x7100" />
-        <DList Name="object_fall2_DL_007208" Offset="0x7208" />
-        <DList Name="object_fall2_DL_007310" Offset="0x7310" />
-        <DList Name="object_fall2_DL_007418" Offset="0x7418" />
-        <DList Name="object_fall2_DL_007520" Offset="0x7520" />
-        <DList Name="object_fall2_DL_007628" Offset="0x7628" />
-        <DList Name="object_fall2_DL_007730" Offset="0x7730" />
-        <Texture Name="object_fall2_Tex_007838" OutName="tex_007838" Format="i4" Width="64" Height="64" Offset="0x7838" />
-        <Texture Name="object_fall2_Tex_008038" OutName="tex_008038" Format="i4" Width="64" Height="64" Offset="0x8038" />
-        <TextureAnimation Name="object_fall2_Matanimheader_008840" Offset="0x8840" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_famos.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_famos.xml
deleted file mode 100644
index f62604424..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_famos.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Root>
-    <!-- Death Armos: flying statues in Inverted Stone Tower Temple -->
-    <File Name="object_famos" Segment="6">
-        <Animation Name="gFamosShakeAnim" Offset="0xF8" /> <!-- Original name is "fam_aizu" -->
-        <DList Name="gFamosHelmetDL" Offset="0x12B0" />
-        <DList Name="gFamosMainBodyDL" Offset="0x1528" />
-        <DList Name="gFamosShieldDL" Offset="0x1C88" />
-        <DList Name="gFamosSwordDL" Offset="0x1DE8" />
-        <DList Name="gFamosLightSwitchDL" Offset="0x1FA8" />
-        <Texture Name="gFamosBodyTLUT" OutName="body_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2068" />
-        <Texture Name="gFamosBottomTLUT" OutName="bottom_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2088" />
-        <Texture Name="gFamosShieldTLUT" OutName="shield_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20A8" />
-        <Texture Name="gFamosSwordHiltTLUT" OutName="sword_hilt_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20C8" />
-        <Texture Name="gFamosMainBodyTex" OutName="famos_main_body" Format="ci4" Width="64" Height="64" Offset="0x20E8" />
-        <Texture Name="gFamosBottomTex" OutName="famos_bottom" Format="ci4" Width="32" Height="32" Offset="0x28E8" />
-        <Texture Name="gFamosShieldTex" OutName="famos_shield" Format="ci4" Width="64" Height="64" Offset="0x2AE8" />
-        <Texture Name="gFamosSwordHiltTex" OutName="famos_sword_hilt" Format="ci4" Width="32" Height="32" Offset="0x32E8" />
-        <Texture Name="gFamosLightSwitchTex" OutName="famos_light_switch" Format="rgba16" Width="32" Height="32" Offset="0x34E8" />
-
-        <Limb Name="gFamosBodyLimb" Type="Standard" EnumName="FAMOS_LIMB_BODY" Offset="0x3CE8" />
-        <Limb Name="gFamosEmblemLimb" Type="Standard" EnumName="FAMOS_LIMB_EMBLEM" Offset="0x3CF4" />
-        <Limb Name="gFamosSwordLimb" Type="Standard" EnumName="FAMOS_LIMB_SWORD" Offset="0x3D00" />
-        <Limb Name="gFamosShieldLimb" Type="Standard" EnumName="FAMOS_LIMB_SHIELD" Offset="0x3D0C" />
-        <Limb Name="gFamosHeadLimb" Type="Standard" EnumName="FAMOS_LIMB_HEAD" Offset="0x3D18" />
-        <Skeleton Name="gFamosSkel" Type="Normal" LimbType="Standard" LimbNone="FAMOS_LIMB_NONE" LimbMax="FAMOS_LIMB_MAX" EnumName="FamosLimb" Offset="0x3D38" />
-
-        <Animation Name="gFamosIdleAnim" Offset="0x3DC8" /> <!-- Original name is "fam_dosun" -->
-        <TextureAnimation Name="gFamosNormalGlowingEmblemTexAnim" Offset="0x3E30" />
-        <TextureAnimation Name="gFamosFlippedGlowingEmblemTexAnim" Offset="0x3E38" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fb.xml
deleted file mode 100644
index 59ecaf9e5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fb.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<Root>
-    <File Name="object_fb" Segment="6">
-        <Animation Name="object_fb_Anim_0006D8" Offset="0x6D8" /> <!-- Original name is "fb_eat" -->
-        <Animation Name="object_fb_Anim_0007D4" Offset="0x7D4" /> <!-- Original name is "fb_fastswim" -->
-        <Animation Name="object_fb_Anim_000ACC" Offset="0xACC" /> <!-- Original name is "fb_neweat" -->
-        <Animation Name="object_fb_Anim_001174" Offset="0x1174" /> <!-- Original name is "fb_spitout" -->
-        <Animation Name="object_fb_Anim_0013AC" Offset="0x13AC" /> <!-- Original name is "fb_swim" -->
-        <DList Name="object_fb_DL_002000" Offset="0x2000" />
-        <DList Name="object_fb_DL_002088" Offset="0x2088" />
-        <DList Name="object_fb_DL_002110" Offset="0x2110" />
-        <DList Name="object_fb_DL_0021A8" Offset="0x21A8" />
-        <DList Name="object_fb_DL_002230" Offset="0x2230" />
-        <DList Name="object_fb_DL_002388" Offset="0x2388" />
-        <DList Name="object_fb_DL_002418" Offset="0x2418" />
-        <DList Name="object_fb_DL_0024A8" Offset="0x24A8" />
-        <DList Name="object_fb_DL_0025F8" Offset="0x25F8" />
-        <DList Name="object_fb_DL_002690" Offset="0x2690" />
-        <DList Name="object_fb_DL_002730" Offset="0x2730" />
-        <DList Name="object_fb_DL_0027B8" Offset="0x27B8" />
-        <DList Name="object_fb_DL_002870" Offset="0x2870" />
-        <DList Name="object_fb_DL_002930" Offset="0x2930" />
-        <DList Name="object_fb_DL_0029F0" Offset="0x29F0" />
-        <DList Name="object_fb_DL_002AD8" Offset="0x2AD8" />
-        <DList Name="object_fb_DL_002B98" Offset="0x2B98" />
-        <DList Name="object_fb_DL_002C20" Offset="0x2C20" />
-        <Texture Name="object_fb_Tex_002D20" OutName="tex_002D20" Format="rgba16" Width="32" Height="16" Offset="0x2D20" />
-        <Texture Name="object_fb_Tex_003120" OutName="tex_003120" Format="rgba16" Width="16" Height="32" Offset="0x3120" />
-        <Texture Name="object_fb_Tex_003520" OutName="tex_003520" Format="rgba16" Width="32" Height="16" Offset="0x3520" />
-        <Texture Name="object_fb_Tex_003920" OutName="tex_003920" Format="rgba16" Width="64" Height="32" Offset="0x3920" />
-        <Texture Name="object_fb_Tex_004920" OutName="tex_004920" Format="rgba16" Width="16" Height="16" Offset="0x4920" />
-        <Texture Name="object_fb_Tex_004B20" OutName="tex_004B20" Format="rgba16" Width="32" Height="16" Offset="0x4B20" />
-        <Texture Name="object_fb_Tex_004F20" OutName="tex_004F20" Format="rgba16" Width="8" Height="16" Offset="0x4F20" />
-        <Texture Name="object_fb_Tex_005020" OutName="tex_005020" Format="rgba16" Width="32" Height="32" Offset="0x5020" />
-        <Texture Name="object_fb_Tex_005820" OutName="tex_005820" Format="rgba16" Width="32" Height="32" Offset="0x5820" />
-        <Limb Name="object_fb_Standardlimb_006020" Type="Standard" EnumName="OBJECT_FB_LIMB_01" Offset="0x6020" />
-        <Limb Name="object_fb_Standardlimb_00602C" Type="Standard" EnumName="OBJECT_FB_LIMB_02" Offset="0x602C" />
-        <Limb Name="object_fb_Standardlimb_006038" Type="Standard" EnumName="OBJECT_FB_LIMB_03" Offset="0x6038" />
-        <Limb Name="object_fb_Standardlimb_006044" Type="Standard" EnumName="OBJECT_FB_LIMB_04" Offset="0x6044" />
-        <Limb Name="object_fb_Standardlimb_006050" Type="Standard" EnumName="OBJECT_FB_LIMB_05" Offset="0x6050" />
-        <Limb Name="object_fb_Standardlimb_00605C" Type="Standard" EnumName="OBJECT_FB_LIMB_06" Offset="0x605C" />
-        <Limb Name="object_fb_Standardlimb_006068" Type="Standard" EnumName="OBJECT_FB_LIMB_07" Offset="0x6068" />
-        <Limb Name="object_fb_Standardlimb_006074" Type="Standard" EnumName="OBJECT_FB_LIMB_08" Offset="0x6074" />
-        <Limb Name="object_fb_Standardlimb_006080" Type="Standard" EnumName="OBJECT_FB_LIMB_09" Offset="0x6080" />
-        <Limb Name="object_fb_Standardlimb_00608C" Type="Standard" EnumName="OBJECT_FB_LIMB_0A" Offset="0x608C" />
-        <Limb Name="object_fb_Standardlimb_006098" Type="Standard" EnumName="OBJECT_FB_LIMB_0B" Offset="0x6098" />
-        <Limb Name="object_fb_Standardlimb_0060A4" Type="Standard" EnumName="OBJECT_FB_LIMB_0C" Offset="0x60A4" />
-        <Limb Name="object_fb_Standardlimb_0060B0" Type="Standard" EnumName="OBJECT_FB_LIMB_0D" Offset="0x60B0" />
-        <Limb Name="object_fb_Standardlimb_0060BC" Type="Standard" EnumName="OBJECT_FB_LIMB_0E" Offset="0x60BC" />
-        <Limb Name="object_fb_Standardlimb_0060C8" Type="Standard" EnumName="OBJECT_FB_LIMB_0F" Offset="0x60C8" />
-        <Limb Name="object_fb_Standardlimb_0060D4" Type="Standard" EnumName="OBJECT_FB_LIMB_10" Offset="0x60D4" />
-        <Limb Name="object_fb_Standardlimb_0060E0" Type="Standard" EnumName="OBJECT_FB_LIMB_11" Offset="0x60E0" />
-        <Limb Name="object_fb_Standardlimb_0060EC" Type="Standard" EnumName="OBJECT_FB_LIMB_12" Offset="0x60EC" />
-        <Limb Name="object_fb_Standardlimb_0060F8" Type="Standard" EnumName="OBJECT_FB_LIMB_13" Offset="0x60F8" />
-        <Limb Name="object_fb_Standardlimb_006104" Type="Standard" EnumName="OBJECT_FB_LIMB_14" Offset="0x6104" />
-        <Limb Name="object_fb_Standardlimb_006110" Type="Standard" EnumName="OBJECT_FB_LIMB_15" Offset="0x6110" />
-        <Limb Name="object_fb_Standardlimb_00611C" Type="Standard" EnumName="OBJECT_FB_LIMB_16" Offset="0x611C" />
-        <Limb Name="object_fb_Standardlimb_006128" Type="Standard" EnumName="OBJECT_FB_LIMB_17" Offset="0x6128" />
-        <Skeleton Name="object_fb_Skel_006190" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FB_LIMB_NONE" LimbMax="OBJECT_FB_LIMB_MAX" EnumName="ObjectFbLimb" Offset="0x6190" />
-        <DList Name="object_fb_DL_0061E0" Offset="0x61E0" />
-        <Texture Name="object_fb_Tex_0062A8" OutName="tex_0062A8" Format="i4" Width="32" Height="64" Offset="0x62A8" />
-        <Texture Name="object_fb_Tex_0066A8" OutName="tex_0066A8" Format="i4" Width="64" Height="64" Offset="0x66A8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_firefly.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_firefly.xml
deleted file mode 100644
index 93e5640b6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_firefly.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<Root>
-    <File Name="object_firefly" Segment="6">
-    
-        <!-- Assets for the Fire Keese-->
-
-        <!-- Fire Keese Flying Animation-->
-        <Animation Name="gFireKeeseFlyAnim" Offset="0x17C" /> <!-- Original name is "firefly_foot_fly" -->
-
-        <!--Fire Keese Textures-->
-        <Texture Name="gFireKeeseBodyTex" OutName="fire_keese_body" Format="rgba16" Width="8" Height="8" Offset="0x210" />
-        <Texture Name="gFireKeeseEyeTex" OutName="fire_keese_eye" Format="rgba16" Width="8" Height="8" Offset="0x290" />
-        <Texture Name="gFireKeeseEarTex" OutName="fire_keese_ear" Format="rgba16" Width="16" Height="8" Offset="0x310" />
-        <Texture Name="gFireKeeseTalonTex" OutName="fire_keese_talon" Format="rgba16" Width="8" Height="16" Offset="0x410" />
-        <Texture Name="gFireKeeseWingTex" OutName="fire_keese_wing" Format="rgba16" Width="4" Height="16" Offset="0x510" />
-
-        <!--Regular Keese Textures-->
-        <Texture Name="gKeeseRedEyeTex" OutName="keese_red_eye" Format="rgba16" Width="8" Height="8" Offset="0x190" />
-        <Texture Name="gKeeseBodyTex" OutName="keese_body" Format="rgba16" Width="8" Height="8" Offset="0x590" />
-        <Texture Name="gKeeseTalonTex" OutName="keese_talon" Format="rgba16" Width="8" Height="16" Offset="0x610" />
-        <Texture Name="gKeeseWingTex" OutName="keese_wing" Format="rgba16" Width="4" Height="16" Offset="0x710" />
-        <Texture Name="gKeeseEarTex" OutName="keese_ear" Format="rgba16" Width="16" Height="8" Offset="0x790" />
-
-        <!--DLists-->
-        <DList Name="gFireKeeseHeadDL" Offset="0xD30" />
-        <DList Name="gFireKeeseBodyDL" Offset="0xF40" />
-        <DList Name="gFireKeeseLeftFootDL" Offset="0x1038" />
-        <DList Name="gFireKeeseRightFootDL" Offset="0x1100" />
-        <DList Name="gFireKeeseRightWingStartDL" Offset="0x11C8" />
-        <DList Name="gFireKeeseRightWingMidDL" Offset="0x1290" />
-        <DList Name="gFireKeeseRightWingEndDL" Offset="0x1358" />
-        <DList Name="gFireKeeseLeftWingEndDL" Offset="0x1420" />
-        <DList Name="gFireKeeseLeftWingMidDL" Offset="0x14E8" />
-        <DList Name="gFireKeeseLeftWingStartDL" Offset="0x15B0" />
-        <DList Name="gKeeseRedEyesDL" Offset="0x1678" />
-
-        <!--Limbs for the whole thing-->
-        <Limb Name="gFireKeeseRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_ROOT" Offset="0x1708" />
-        <Limb Name="gFireKeeseRootWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_ROOT_WRAPPER" Offset="0x1714" />
-
-        <!--Root Limb for all feet-->
-        <Limb Name="gFireKeeseFeetRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_FEET_ROOT" Offset="0x1720" />
-
-        <!--Right Foot Limbs-->
-        <Limb Name="gFireKeeseRightFootRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_FOOT_ROOT" Offset="0x172C" />
-        <Limb Name="gFirekeeseRightFootWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_FOOT_WRAPPER" Offset="0x1738" />
-        <Limb Name="gFireKeeseRightFootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_FOOT" Offset="0x1744" />
-
-        <!--Left Foot Limbs-->
-        <Limb Name="gFireKeeseLeftFootRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_FOOT_ROOT" Offset="0x1750" />
-        <Limb Name="gFireKeeseLeftFootWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_FOOT_WRAPPER" Offset="0x175C" />
-        <Limb Name="gFireKeeseLeftFootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_FOOT" Offset="0x1768" />
-
-        <!--Body Limb-->
-        <Limb Name="gFireKeeseBodyLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_BODY" Offset="0x1774" />
-
-        <!--Left Wing Limbs-->
-        <Limb Name="gFireKeeseLeftWingRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_ROOT" Offset="0x1780" />
-        <Limb Name="gFireKeeseLeftWingWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_WRAPPER" Offset="0x178C" />
-        <Limb Name="gFireKeeseLeftWingEndMidRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_END_MID_ROOT" Offset="0x1798" />
-        <Limb Name="gFireKeeseLeftWingEndRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_END_ROOT" Offset="0x17A4" />
-        <Limb Name="gFireKeeseLeftWingEndLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_END" Offset="0x17B0" />
-        <Limb Name="gFireKeeseLeftWingMidLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_MID" Offset="0x17BC" />
-        <Limb Name="gFireKeeseLeftWingStartLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_LEFT_WING_START" Offset="0x17C8" />
-
-        <!--Right Wing Limbs-->
-        <Limb Name="gFireKeeseRightWingRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_ROOT" Offset="0x17D4" />
-        <Limb Name="gFireKeeseRightWingWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_WRAPPER" Offset="0x17E0" />
-        <Limb Name="gFireKeeseRightWingEndMidRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_END_MID_ROOT" Offset="0x17EC" />
-        <Limb Name="gFireKeeseRightWingEndRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_END_ROOT" Offset="0x17F8" />
-        <Limb Name="gFireKeeseRightWingEndLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_END" Offset="0x1804" />
-        <Limb Name="gFireKeeseRightWingMidLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_MID" Offset="0x1810" />
-        <Limb Name="gFireKeeseRightWingStartLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_RIGHT_WING_START" Offset="0x181C" />
-
-        <!--Head Limbs-->
-        <Limb Name="gFireKeeseHeadRootLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_HEAD_ROOT" Offset="0x1828" />
-        <Limb Name="gFireKeeseHeadWrapperLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_HEAD_WRAPPER" Offset="0x1834" />
-        <Limb Name="gFireKeeseHeadLimb" Type="Standard" EnumName="FIRE_KEESE_LIMB_HEAD" Offset="0x1840" />
-
-        <!--Skeleton-->
-        <Skeleton Name="gFireKeeseSkel" Type="Normal" LimbType="Standard" LimbNone="FIRE_KEESE_LIMB_NONE" LimbMax="FIRE_KEESE_LIMB_MAX" EnumName="FireKeeseLimb" Offset="0x18B8" />
-        
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fish.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fish.xml
deleted file mode 100644
index 318cb53d5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fish.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<Root>
-    <!-- Assets for fishing -->
-    <File Name="object_fish" Segment="6">
-
-        <!-- Bass -->
-
-        <!-- Bass Animations -->
-        <Animation Name="gFishingBassAnim" Offset="0x7C" /> <!-- Original name is "basu" -->
-
-        <!-- Bass DLs -->
-        <DList Name="gFishingBassTailFinDL" Offset="0x940" />
-        <DList Name="gFishingBassBackSegmentEndDL" Offset="0x9E8" />
-        <DList Name="gFishingBassTopRearFinDL" Offset="0xB00" />
-        <DList Name="gFishingBassBottomRearFinDL" Offset="0xBA0" />
-        <DList Name="gFishingBassBackSegmentDL" Offset="0xC40" />
-        <DList Name="gFishingBassTopFrontFinDL" Offset="0xE30" />
-        <DList Name="gFishingBassBottomFrontFinDL" Offset="0xED0" />
-        <DList Name="gFishingBassMiddleSegmentDL" Offset="0xF70" />
-        <DList Name="gFishingBassHeadDL" Offset="0x10A0" />
-        <DList Name="gFishingBassLeftPectoralFinDL" Offset="0x1260" />
-        <DList Name="gFishingBassRightPectoralFinDL" Offset="0x1300" />
-        <DList Name="gFishingBassJawDL" Offset="0x13A0" />
-
-        <!-- Bass Textures -->
-        <Texture Name="gFishingBassTailFinTex" OutName="fishing_bass_tail_fin" Format="rgba16" Width="16" Height="16" Offset="0x14D0" />
-        <Texture Name="gFishingBassTopScalesTex" OutName="fishing_bass_top_scales" Format="rgba16" Width="16" Height="16" Offset="0x16D0" />
-        <Texture Name="gFishingBassBottomScalesTex" OutName="fishing_bass_bottom_scales" Format="rgba16" Width="16" Height="16" Offset="0x18D0" />
-        <Texture Name="gFishingBassHeadTex" OutName="fishing_bass_head" Format="rgba16" Width="32" Height="32" Offset="0x1AD0" />
-        <Texture Name="gFishingBassFinTex" OutName="fishing_bass_fin" Format="rgba16" Width="16" Height="16" Offset="0x22D0" />
-        <Texture Name="gFishingBassUnusedFinTex" OutName="fishing_bass_unused_fin" Format="rgba16" Width="16" Height="16" Offset="0x24D0" />
-        <Texture Name="gFishingBassSpinyFinTex" OutName="fishing_bass_spiny_fin" Format="rgba16" Width="16" Height="16" Offset="0x26D0" />
-
-        <!-- Bass Limbs and Skel -->
-        <Limb Name="gFishingBassHeadLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_HEAD" Offset="0x28D0" />
-        <Limb Name="gFishingBassMiddleSegmentRootLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_MIDDLE_SEGMENT_ROOT" Offset="0x28DC" />
-        <Limb Name="gFishingBassBackSegmentRootLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_BACK_SEGMENT_ROOT" Offset="0x28E8" />
-        <Limb Name="gFishingBassEndRootLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_END_ROOT" Offset="0x28F4" />
-        <Limb Name="gFishingBassTailFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_TAIL_FIN" Offset="0x2900" />
-        <Limb Name="gFishingBassBackSegmentEndLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_BACK_SEGMENT_END" Offset="0x290C" />
-        <Limb Name="gFishingBassBackSegmentLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_BACK_SEGMENT" Offset="0x2918" />
-        <Limb Name="gFishingBassTopRearFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_TOP_REAR_FIN" Offset="0x2924" />
-        <Limb Name="gFishingBassBottomRearFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_BOTTOM_REAR_FIN" Offset="0x2930" />
-        <Limb Name="gFishingBassMiddleSegmentLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_MIDDLE_SEGMENT" Offset="0x293C" />
-        <Limb Name="gFishingBassTopFrontFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_TOP_FRONT_FIN" Offset="0x2948" />
-        <Limb Name="gFishingBassBottomFrontFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_BOTTOM_FRONT_FIN" Offset="0x2954" />
-        <Limb Name="gFishingBassJawLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_JAW" Offset="0x2960" />
-        <Limb Name="gFishingBassRightPectoralFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_RIGHT_PECTORAL_FIN" Offset="0x296C" />
-        <Limb Name="gFishingBassLeftPectoralFinLimb" Type="Standard" EnumName="FISHING_BASS_LIMB_LEFT_PECTORAL_FIN" Offset="0x2978" />
-        <Skeleton Name="gFishingBassSkel" Type="Flex" LimbType="Standard" LimbNone="FISHING_BASS_LIMB_NONE" LimbMax="FISHING_BASS_LIMB_MAX" EnumName="FishingBassLimb" Offset="0x29C0" />
-
-
-        <!-- Old Lure -->
-
-        <!-- Old Lure Textures -->
-        <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0" />
-        <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0" />
-        
-        <!-- Old Lure DLs -->
-        <DList Name="gFishingOldLureDL" Offset="0x2BD0" />
-
-
-        <!-- Stream Splash -->
-
-        <!-- Stream Splash Textures -->
-        <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0" />
-        <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0" />
-
-        <!-- Stream Splash DLs-->
-        <DList Name="gFishingStreamSplashDL" Offset="0x3230" />
-
-
-        <!-- Bubble -->
-
-        <!-- Bubble Textures-->
-        <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320" />
-
-        <!-- Bubble DLs-->
-        <DList Name="gFishingBubbleMaterialDL" Offset="0x3460" />
-        <DList Name="gFishingBubbleModelDL" Offset="0x34C0" />
-
-
-        <!-- Dust Splash -->
-
-        <!-- Dust Splash Texture-->
-        <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0" />
-
-        <!-- Dust Splash DLs-->
-        <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610" />
-        <DList Name="gFishingDustSplashModelDL" Offset="0x3680" />
-
-
-        <!-- Line -->
-
-        <!-- Line DLs -->
-        <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0" />
-        <DList Name="gFishingLineModelDL" Offset="0x3710" />
-
-
-        <!-- Raindrop -->
-
-        <!-- Raindrop DLs -->
-        <DList Name="gFishingRainDropModelDL" Offset="0x3760" />
-
-
-        <!-- Rain Splash -->
-
-        <!-- Rain Splash Textures -->
-        <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778" />
-        
-        <!-- Rain Splash DLs -->
-        <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8" />
-        <DList Name="gFishingRainSplashModelDL" Offset="0x3A18" />
-
-
-        <!-- Owner -->
-
-        <!-- Owner Animations -->
-        <Animation Name="gFishingOwnerAnim" Offset="0x453C" /> <!-- Original name is "fs_matsu" -->
-
-        <!-- Owner DLs -->
-        <DList Name="gFishingOwnerTorsoDL" Offset="0x6F60" />
-        <DList Name="gFishingOwnerHairDL" Offset="0x7350" />
-        <DList Name="gFishingOwnerHatDL" Offset="0x74C8" /> <!-- Original name is "fs_cap_model" -->
-        <DList Name="gFishingOwnerHeadDL" Offset="0x76B8" />
-        <DList Name="gFishingOwnerRightUpperArmDL" Offset="0x7CF8" />
-        <DList Name="gFishingOwnerRightForearmDL" Offset="0x7E48" />
-        <DList Name="gFishingOwnerRightHandDL" Offset="0x7F78" />
-        <DList Name="gFishingOwnerLeftUpperArmDL" Offset="0x8138" />
-        <DList Name="gFishingOwnerLeftForearmDL" Offset="0x8288" />
-        <DList Name="gFishingOwnerLeftHandDL" Offset="0x83B8" />
-
-        <!-- Owner Limbs and Skel -->
-        <Limb Name="gFishingOwnerTorsoLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_TORSO" Offset="0x8578" />
-        <Limb Name="gFishingOwnerLeftUpperArmLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_LEFT_UPPER_ARM" Offset="0x8584" />
-        <Limb Name="gFishingOwnerLeftForearmLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_LEFT_FOREARM" Offset="0x8590" />
-        <Limb Name="gFishingOwnerLeftHandLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_LEFT_HAND" Offset="0x859C" />
-        <Limb Name="gFishingOwnerRightUpperArmLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_RIGHT_UPPER_ARM" Offset="0x85A8" />
-        <Limb Name="gFishingOwnerRightForearmLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_RIGHT_FOREARM" Offset="0x85B4" />
-        <Limb Name="gFishingOwnerRightHandLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_RIGHT_HAND" Offset="0x85C0" />
-        <Limb Name="gFishingOwnerHeadLimb" Type="Standard" EnumName="FISHING_OWNER_LIMB_HEAD" Offset="0x85CC" />
-        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" LimbNone="FISHING_OWNER_LIMB_NONE" LimbMax="FISHING_OWNER_LIMB_MAX" EnumName="FishingOwnerLimb" Offset="0x85F8" />
-
-
-        <!-- Ripple -->
-
-        <!-- Ripple DLs -->
-        <DList Name="gFishingRippleMaterialDL" Offset="0x8610" />
-        <DList Name="gFishingRippleModelDL" Offset="0x8678" />
-
-
-        <!-- Water Dust -->
-
-        <!-- Water Dust Textures-->
-        <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690" />
-
-        <!-- Water Dust DLs -->
-        <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0" />
-        <DList Name="gFishingWaterDustModelDL" Offset="0x8970" /> <!-- Original name is "fs_smoke_modelT" -->
-
-        <!-- Owner -->
-
-        <!-- Owner Textures -->
-        <Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990" />
-        <Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerEarTex" OutName="fishing_owner_ear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990" />
-        <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990" />
-
-
-        <!-- Sinking Lure -->
-
-        <!-- Sinking Lure Textures -->
-        <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910" />
-
-        <!-- Sinking Lure DLs -->
-        <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950" />
-        <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0" />
-
-
-        <!-- Group Fish -->
-
-        <!-- Group Fish Texture -->
-        <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0" />
-
-        <!-- Group Fish DLs -->
-        <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220" />
-        <DList Name="gFishingGroupFishModelDL" Offset="0xC298" /> <!-- Original name is "minnow_model" -->
-
-
-        <!-- Unused Rock -->
-
-        <!-- Unused Rock DLs -->
-        <DList Name="gFishingUnusedRockDL" Offset="0xC650" />
-
-        <!-- Unused Rock Textures -->
-        <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780" />
-
-
-        <!-- Loach -->
-
-        <!-- Loach Animations -->
-        <Animation Name="gFishingLoachAnim" Offset="0xCFE0" /> <!-- Original name is "nz_namazu" -->
-
-        <!-- Loach DLs -->
-        <DList Name="gFishingLoachHeadDL" Offset="0xDED0" />
-        <DList Name="gFishingLoachLowerFrontFinDL" Offset="0xDFA8" />
-        <DList Name="gFishingLoachFrontSegmentDL" Offset="0xE048" />
-        <DList Name="gFishingLoachMiddleSegmentDL" Offset="0xE168" />
-        <DList Name="gFishingLoachLowerBackFinDL" Offset="0xE460" />
-        <DList Name="gFishingLoachBackSegmentDL" Offset="0xE500" />
-        <DList Name="gFishingLoachTailFinDL" Offset="0xE808" />
-        <DList Name="gFishingLoachTailSegmentDL" Offset="0xE8B0" />
-        <DList Name="gFishingLoachRightPectoralFinDL" Offset="0xEB28" />
-        <DList Name="gFishingLoachLeftPectoralFinDL" Offset="0xEBC8" />
-        <DList Name="gFishingLoachJawDL" Offset="0xEC68" />
-
-        <!-- Loach Textures -->
-        <Texture Name="gFishingLoachTopScalesTex" OutName="fishing_loach_top_scales" Format="rgba16" Width="32" Height="32" Offset="0xED28" />
-        <Texture Name="gFishingLoachBottomScalesTex" OutName="fishing_loach_bottom_scales" Format="rgba16" Width="32" Height="32" Offset="0xF528" />
-        <Texture Name="gFishingLoachGillTex" OutName="fishing_loach_gill" Format="rgba16" Width="32" Height="32" Offset="0xFD28" />
-        <Texture Name="gFishingLoachHeadTex" OutName="fishing_loach_head" Format="rgba16" Width="32" Height="32" Offset="0x10528" />
-        <Texture Name="gFishingLoachTopFinTex" OutName="fishing_loach_top_fin" Format="rgba16" Width="8" Height="8" Offset="0x10D28" />
-        <Texture Name="gFishingLoachFinTex" OutName="fishing_loach_fin" Format="rgba16" Width="16" Height="16" Offset="0x10DA8" />
-
-        <!-- Loach Limbs and Skel -->
-        <Limb Name="gFishingLoachHeadLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_HEAD" Offset="0x10FA8" />
-        <Limb Name="gFishingLoachLowerFrontFinLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_LOWER_FRONT_FIN" Offset="0x10FB4" />
-        <Limb Name="gFishingLoachMiddleSegmentLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_MIDDLE_SEGMENT" Offset="0x10FC0" />
-        <Limb Name="gFishingLoachLowerBackFinLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_LOWER_BACK_FIN" Offset="0x10FCC" />
-        <Limb Name="gFishingLoachTailFinLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_TAIL_FIN" Offset="0x10FD8" />
-        <Limb Name="gFishingLoachTailSegmentLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_TAIL_SEGMENT" Offset="0x10FE4" />
-        <Limb Name="gFishingLoachBackSegmentLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_BACK_SEGMENT" Offset="0x10FF0" />
-        <Limb Name="gFishingLoachFrontSegmentLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_FRONT_SEGMENT" Offset="0x10FFC" />
-        <Limb Name="gFishingLoachLeftPectoralFinLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_LEFT_PECTORAL_FIN" Offset="0x11008" />
-        <Limb Name="gFishingLoachRightPectoralFinLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_RIGHT_PECTORAL_FIN" Offset="0x11014" />
-        <Limb Name="gFishingLoachJawLimb" Type="Standard" EnumName="FISHING_LOACH_LIMB_JAW" Offset="0x11020" />
-        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" LimbNone="FISHING_LOACH_LIMB_NONE" LimbMax="FISHING_LOACH_LIMB_MAX" EnumName="FishingLoachLimb" Offset="0x11058" />
-
-
-        <!-- Fishing Rod -->
-
-        <!-- Fishing Rod Textures -->
-        <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070" />
-        <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170" />
-        <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270" />
-
-        <!-- Fishing Rod DLs -->
-        <DList Name="gFishingRodSetupDL" Offset="0x113D0" />
-        <DList Name="gFishingRodSegmentDL" Offset="0x11410" /> <!-- Original name is "rod_model" -->
-
-
-        <!-- Lure -->
-
-        <!-- Lure Textures -->
-        <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440" />
-        <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40" />
-        
-        <!-- Lure DLs -->
-        <DList Name="gFishingLureHookDL" Offset="0x12160" /> <!-- Original name is "rua_hari_model" -->
-        <DList Name="gFishingLureFloatDL" Offset="0x121F0" /> <!-- Original name is "rua_body_model" -->
-
-
-        <!-- Lily Pad and Rock -->
-
-        <!-- Lily Pad and Rock Textures -->
-        <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0" />
-        <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0" />
-
-        <!-- Lily Pad and Rock DLs -->
-        <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330" />
-        <DList Name="gFishingLilyPadModelDL" Offset="0x133B0" /> <!-- Original name is "turi_hasu_model" -->
-        <DList Name="gFishingRockMaterialDL" Offset="0x13590" />
-        <DList Name="gFishingRockModelDL" Offset="0x13610" />
-
-
-        <!-- Wood Post -->
-
-        <!-- Wood Post Textures -->
-        <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660" />
-
-        <!-- Wood Post DLs -->
-        <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50" />
-        <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0" />
-
-
-        <!-- Reed -->
-
-        <!-- Reed DLs -->
-        <DList Name="gFishingReedMaterialDL" Offset="0x14030" />
-        <DList Name="gFishingReedModelDL" Offset="0x140B0" /> <!-- Original name is "turi_kusa_model" -->
-
-
-        <!-- Aquarium -->
-
-        <!-- Aquarium Textures -->
-        <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0" />
-        <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0" />
-        <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0" />
-
-        <!-- Aquarium DLs -->
-        <DList Name="gFishingAquariumBottomDL" Offset="0x153D0" />
-        <DList Name="gFishingAquariumContainerDL" Offset="0x15470" /> <!-- Original name is "turi_suisou_modelT" -->
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_flowerpot.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_flowerpot.xml
deleted file mode 100644
index 01d16b663..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_flowerpot.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_flowerpot" Segment="6">
-        <Texture Name="object_flowerpot_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="32" Offset="0x0" />
-        <Texture Name="object_flowerpot_Tex_000400" OutName="tex_000400" Format="rgba16" Width="16" Height="32" Offset="0x400" />
-        <Texture Name="object_flowerpot_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800" />
-        <DList Name="object_flowerpot_DL_0012E0" Offset="0x12E0" /> <!-- Original name is "hati01_model" -->
-        <DList Name="object_flowerpot_DL_001408" Offset="0x1408" /> <!-- Original name is "kusa_nearT_model" -->
-        <DList Name="object_flowerpot_DL_0014F0" Offset="0x14F0" /> <!-- Original name is "haT_model" -->
-        <DList Name="object_flowerpot_DL_0015B0" Offset="0x15B0" /> <!-- Original name is "hati02_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fr.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fr.xml
deleted file mode 100644
index 3262c6782..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fr.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<Root>
-    <!-- Object for the choir frogs and unused hostile(?) frog -->
-    <File Name="object_fr" Segment="6">
-        <Animation Name="gFrogJumpAnim" Offset="0x7BC" /> <!-- Original name is "Jump" -->
-        <Animation Name="gFrogDanceAnim" Offset="0x11C0" /> <!-- Original name is "swing" -->
-        <Animation Name="gFrogIdleAnim" Offset="0x1534" /> <!-- Original name is "wait" -->
-        <Texture Name="gFrogLimbPatternTex" OutName="frog_limb_pattern" Format="rgba16" Width="32" Height="32" Offset="0x1550" />
-        <Texture Name="gFrogQuestionMarkTex" OutName="frog_question_mark" Format="rgba16" Width="50" Height="74" Offset="0x1D50" />
-        <Texture Name="gFrogNostrilTex" OutName="frog_nostril" Format="i8" Width="16" Height="16" Offset="0x3AA0" />
-        <Texture Name="gFrogLowerInnerMouthTex" OutName="frog_lower_inner_mouth" Format="rgba16" Width="32" Height="32" Offset="0x3BA0" />
-        <Texture Name="gFrogUpperInnerMouthTex" OutName="frog_upper_inner_mouth" Format="rgba16" Width="32" Height="32" Offset="0x43A0" />
-        <Texture Name="gFrogSkinTex" OutName="frog_skin" Format="rgba16" Width="16" Height="16" Offset="0x4BA0" />
-        <Texture Name="gFrogUpperBodyPatternTex" OutName="frog_upper_body_pattern" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" />
-        <Texture Name="gFrogLowerBodyPatternTex" OutName="frog_lower_body_pattern" Format="i8" Width="32" Height="32" Offset="0x55A0" />
-        <Texture Name="gFrogIrisOpenTex" OutName="frog_iris_open" Format="rgba16" Width="16" Height="16" Offset="0x59A0" />
-        <Texture Name="gFrogIrisClosedTex" OutName="frog_iris_closed" Format="rgba16" Width="16" Height="16" Offset="0x5BA0" />
-        <Texture Name="gFrogEyeTex" OutName="frog_eye" Format="ia16" Width="32" Height="32" Offset="0x5DA0" />
-        <Texture Name="gFrogHandAndToeTex" OutName="frog_hand_and_toe" Format="ia16" Width="32" Height="32" Offset="0x65A0" />
-        <DList Name="gFrogRightEyeDL" Offset="0x8EC0" />
-        <DList Name="gFrogLeftEyeDL" Offset="0x8F60" />
-        <DList Name="gFrogHeadDL" Offset="0x9000" />
-        <DList Name="gFrogRightIrisDL" Offset="0x9328" />
-        <DList Name="gFrogLeftIrisDL" Offset="0x93C8" />
-        <DList Name="gFrogJawDL" Offset="0x9468" />
-        <DList Name="gFrogUpperBodyDL" Offset="0x95A0" />
-        <DList Name="gFrogLeftForearmDL" Offset="0x98B8" />
-        <DList Name="gFrogLeftHandDL" Offset="0x9AE0" />
-        <DList Name="gFrogLeftUpperArmDL" Offset="0x9B80" />
-        <DList Name="gFrogRightForearmDL" Offset="0x9D88" />
-        <DList Name="gFrogRightHandDL" Offset="0x9FB0" />
-        <DList Name="gFrogRightUpperArmDL" Offset="0xA050" />
-        <DList Name="gFrogLowerBodyDL" Offset="0xA258" />
-        <DList Name="gFrogRightHeelDL" Offset="0xA428" />
-        <DList Name="gFrogRightToeDL" Offset="0xA6B8" />
-        <DList Name="gFrogRightShinDL" Offset="0xA758" />
-        <DList Name="gFrogRightThighDL" Offset="0xA978" />
-        <DList Name="gFrogLeftHeelDL" Offset="0xABA8" />
-        <DList Name="gFrogLeftToeDL" Offset="0xAE38" />
-        <DList Name="gFrogLeftShinDL" Offset="0xAED8" />
-        <DList Name="gFrogLeftThighDL" Offset="0xB0F8" />
-        <DList Name="gFrogDustMaterialDL" Offset="0xB328" />
-        <DList Name="gFrogDustModelDL" Offset="0xB338" />
-        <Limb Name="gFrogLowerBodyLimb" Type="Standard" EnumName="FROG_LIMB_LOWER_BODY" Offset="0xB3C8" />
-        <Limb Name="gFrogUpperBodyLimb" Type="Standard" EnumName="FROG_LIMB_UPPER_BODY" Offset="0xB3D4" />
-        <Limb Name="gFrogHeadRootLimb" Type="Standard" EnumName="FROG_LIMB_HEAD_ROOT" Offset="0xB3E0" />
-        <Limb Name="gFrogHeadLimb" Type="Standard" EnumName="FROG_LIMB_HEAD" Offset="0xB3EC" />
-        <Limb Name="gFrogRightIrisLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_IRIS" Offset="0xB3F8" />
-        <Limb Name="gFrogJawLimb" Type="Standard" EnumName="FROG_LIMB_JAW" Offset="0xB404" />
-        <Limb Name="gFrogRightEyeLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_EYE" Offset="0xB410" />
-        <Limb Name="gFrogLeftEyeLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_EYE" Offset="0xB41C" />
-        <Limb Name="gFrogLeftIrisLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_IRIS" Offset="0xB428" />
-        <Limb Name="gFrogLeftUpperArmLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_UPPER_ARM" Offset="0xB434" />
-        <Limb Name="gFrogLeftForearmLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_FOREARM" Offset="0xB440" />
-        <Limb Name="gFrogLeftHandLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_HAND" Offset="0xB44C" />
-        <Limb Name="gFrogRightUpperArmLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_UPPER_ARM" Offset="0xB458" />
-        <Limb Name="gFrogRightForearmLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_FOREARM" Offset="0xB464" />
-        <Limb Name="gFrogRightHandLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_HAND" Offset="0xB470" />
-        <Limb Name="gFrogRightThighLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_THIGH" Offset="0xB47C" />
-        <Limb Name="gFrogRightShinLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_SHIN" Offset="0xB488" />
-        <Limb Name="gFrogRightHeelLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_HEEL" Offset="0xB494" />
-        <Limb Name="gFrogRightToesLimb" Type="Standard" EnumName="FROG_LIMB_RIGHT_TOES" Offset="0xB4A0" />
-        <Limb Name="gFrogLeftThighLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_THIGH" Offset="0xB4AC" />
-        <Limb Name="gFrogLeftShinLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_SHIN" Offset="0xB4B8" />
-        <Limb Name="gFrogLeftHeelLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_HEEL" Offset="0xB4C4" />
-        <Limb Name="gFrogLeftToesLimb" Type="Standard" EnumName="FROG_LIMB_LEFT_TOES" Offset="0xB4D0" />
-        <Skeleton Name="gFrogSkel" Type="Flex" LimbType="Standard" LimbNone="FROG_LIMB_NONE" LimbMax="FROG_LIMB_MAX" EnumName="FrogLimb" Offset="0xB538" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fsn.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fsn.xml
deleted file mode 100644
index 5ca67c207..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fsn.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<Root>
-    <!-- Object for the Curisoity Shop Man -->
-    <File Name="object_fsn" Segment="6">
-        <!-- DLists -->
-        <DList Name="gFsnTorsoDL" Offset="0x2A20" />
-        <DList Name="gFsnToupeeDL" Offset="0x2D88" />
-        <DList Name="gFsnHeadDL" Offset="0x2EF0" />
-        <DList Name="gFsnRightUpperArmDL" Offset="0x34C8" />
-        <DList Name="gFsnRightForearmDL" Offset="0x3600" />
-        <DList Name="gFsnRightHandDL" Offset="0x3718" />
-        <DList Name="gFsnLeftUpperArmDL" Offset="0x3860" />
-        <DList Name="gFsnLeftForearmDL" Offset="0x3998" />
-        <DList Name="gFsnLeftHandDL" Offset="0x3AB0" />
-        <DList Name="gFsnPelvisDL" Offset="0x3BF8" />
-        <DList Name="gFsnRightThighDL" Offset="0x3CF0" />
-        <DList Name="gFsnRightShinDL" Offset="0x3DD8" />
-        <DList Name="gFsnRightFootDL" Offset="0x3F20" />
-        <DList Name="gFsnLeftThighDL" Offset="0x3FF8" />
-        <DList Name="gFsnLeftShinDL" Offset="0x40E0" />
-        <DList Name="gFsnLeftFootDL" Offset="0x4228" />
-
-        <!-- TLUTs -->
-        <Texture Name="gFsnHandTLUT" OutName="fsn_hand_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4300" />
-        <Texture Name="gFsnSkinTLUT" OutName="fsn_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4500" />
-        <Texture Name="gFsnShirtTLUT" OutName="fsn_shirt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4700" />
-        <Texture Name="gFsnHairTLUT" OutName="fsn_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4900" />
-        <Texture Name="gFsnEyeTLUT" OutName="fsn_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4B00" />
-        <Texture Name="gFsnEarTLUT" OutName="fsn_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4D00" />
-        <Texture Name="gFsnHairSkinTLUT" OutName="fsn_hair_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4F00" />
-        <Texture Name="gFsnMouthTLUT" OutName="fsn_mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5100" />
-        <Texture Name="gFsnNostrilTLUT" OutName="fsn_nostril_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300" />
-
-        <!-- Textures -->
-        <Texture Name="gFsnHandTex" OutName="fsn_hand" Format="ci8" Width="16" Height="16" Offset="0x5500" />
-        <Texture Name="gFsnSkinTex" OutName="fsn_skin" Format="ci8" Width="8" Height="8" Offset="0x5600" />
-        <Texture Name="gFsnShirtTex" OutName="fsn_shirt" Format="ci8" Width="8" Height="16" Offset="0x5640" />
-        <Texture Name="gFsnPantsTex" OutName="fsn_pants" Format="rgba16" Width="16" Height="16" Offset="0x56C0" />
-        <Texture Name="gFsnBootsTex" OutName="fsn_boots" Format="rgba16" Width="16" Height="16" Offset="0x58C0" />
-        <Texture Name="gFsnHairTex" OutName="fsn_hair" Format="ci8" Width="16" Height="16" Offset="0x5AC0" />
-        <Texture Name="gFsnEyeOpenTex" OutName="fsn_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5BC0" /> 
-        <Texture Name="gFsnEarTex" OutName="fsn_ear" Format="ci8" Width="8" Height="8" Offset="0x5FC0" />
-        <Texture Name="gFsnHairSkinTex" OutName="fsn_hair_and_skin" Format="ci8" Width="16" Height="16" Offset="0x6000" />
-        <Texture Name="gFsnMouthTex" OutName="fsn_mouth" Format="ci8" Width="32" Height="32" Offset="0x6100" />
-        <Texture Name="gFsnNostrilTex" OutName="fsn_nostril" Format="ci8" Width="8" Height="8" Offset="0x6500" />
-        <Texture Name="gFsnVestTex" OutName="fsn_vest" Format="rgba16" Width="32" Height="32" Offset="0x6540" />
-        <Texture Name="gFsnEyeHalfTex" OutName="fsn_eye_half" Format="ci8" Width="32" Height="32" Offset="0x6D40" />
-        <Texture Name="gFsnEyeClosedTex" OutName="fsn_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7140" />
-        
-        <!-- Unused -->
-        <!-- <Blob Name="object_fsn_Blob_007540" Size="0x1100" Offset="0x7540" /> -->
-
-        <Texture Name="gFsnUnusedEyeOpenTex" OutName="fsn_unused_eye_open" Format="rgba32" Width="32" Height="32" Offset="0x8640" />
-        <Texture Name="gFsnUnusedEyeHalfTex" OutName="fsn_unused_eye_half" Format="rgba32" Width="32" Height="32" Offset="0x9640" />
-        <Texture Name="gFsnUnusedEyeClosedTex" OutName="fsn_unused_eye_closed" Format="rgba32" Width="32" Height="32" Offset="0xA640" />
-
-        <!-- Unused Eye Texture Animation -->
-        <TextureAnimation Name="gFsnEyeTexAnim" Offset="0xB664" />
-        
-        <!-- Animations -->
-        <Animation Name="gFsnSlamCounterStartAnim" Offset="0xB9D8" /> <!-- Original name is "fsn_dekuwait01" -->
-        <Animation Name="gFsnSlamCounterLoopAnim" Offset="0xC26C" /> <!-- Original name is "fsn_dekuwait02" -->
-        <Animation Name="gFsnTurnAroundAnim" Offset="0xC58C" /> <!-- Original name is "fsn_furimuki" -->
-        <Animation Name="gFsnHandOnFaceStartAnim" Offset="0xCB3C" /> <!-- Original name is "fsn_goronwait01" -->
-        <Animation Name="gFsnHandOnFaceLoopAnim" Offset="0xD354" /> <!-- Original name is "fsn_goronwait02" -->
-        <Animation Name="gFsnMakeOfferAnim" Offset="0xDE34" /> <!-- Original name is "fsn_kane" -->
-        <Animation Name="gFsnHandsOnCounterStartAnim" Offset="0xE3EC" /> <!-- Original name is "fsn_nwait01" -->
-        <Animation Name="gFsnHandsOnCounterLoopAnim" Offset="0xF00C" /> <!-- Original name is "fsn_nwait02" -->
-
-        <!-- Glasses DLists -->
-        <DList Name="gFsnGlassesFrameDL" Offset="0xF180" />
-        <DList Name="gFsnGlassesLensesDL" Offset="0xF218" />
-
-        <!-- Glasses Textures -->
-        <Texture Name="gFsnGlassesLensesTex" OutName="fsn_glasses_lenses" Format="rgba16" Width="32" Height="32" Offset="0xF2B0" />
-        <Texture Name="gFsnGlassesFrameTex" OutName="fsn_glasses_frame" Format="rgba16" Width="8" Height="8" Offset="0xFAB0" />
-        
-        <!-- <Blob Name="object_fsn_Blob_00FB30" Size="0x3040" Offset="0xFB30" /> -->
-        
-        <!-- Animations -->
-        <Animation Name="gFsnIdleAnim" Offset="0x12C34" /> <!-- Original name is "fsn_wait" -->
-        <Animation Name="gFsnScratchBackAnim" Offset="0x131FC" /> <!-- Original name is "fsn_wait01" -->
-
-        <!-- Limbs -->
-        <Limb Name="gFsnPelvisLimb" Type="Standard" EnumName="FSN_LIMB_PELVIS" Offset="0x13210" />
-        <Limb Name="gFsnLeftThighLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_THIGH" Offset="0x1321C" />
-        <Limb Name="gFsnLeftShinLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_SHIN" Offset="0x13228" />
-        <Limb Name="gFsnLeftFootLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_FOOT" Offset="0x13234" />
-        <Limb Name="gFsnRightThighLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_THIGH" Offset="0x13240" />
-        <Limb Name="gFsnRightShinLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_SHIN" Offset="0x1324C" />
-        <Limb Name="gFsnRightFootLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_FOOT" Offset="0x13258" />
-        <Limb Name="gFsnTorsoLimb" Type="Standard" EnumName="FSN_LIMB_TORSO" Offset="0x13264" />
-        <Limb Name="gFsnLeftUpperArmLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_UPPER_ARM" Offset="0x13270" />
-        <Limb Name="gFsnLeftForearmLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_FOREARM" Offset="0x1327C" />
-        <Limb Name="gFsnLeftHandLimb" Type="Standard" EnumName="FSN_LIMB_LEFT_HAND" Offset="0x13288" />
-        <Limb Name="gFsnRightUpperArmLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_UPPER_ARM" Offset="0x13294" />
-        <Limb Name="gFsnRightForearmLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_FOREARM" Offset="0x132A0" />
-        <Limb Name="gFsnRightHandLimb" Type="Standard" EnumName="FSN_LIMB_RIGHT_HAND" Offset="0x132AC" />
-        <Limb Name="gFsnHeadRootLimb" Type="Standard" EnumName="FSN_LIMB_HEAD_ROOT" Offset="0x132B8" />
-        <Limb Name="gFsnHeadLimb" Type="Standard" EnumName="FSN_LIMB_HEAD" Offset="0x132C4" />
-        <Limb Name="gFsnToupeeLimb" Type="Standard" EnumName="FSN_LIMB_TOUPEE" Offset="0x132D0" />
-
-        <!-- Skeleton -->
-        <!-- @bug: gFsnSkel specifies 18 limbs but only 17 exist, ZAPD breaks if gFsnLimbs is not extracted manually -->
-        <LimbTable Name="gFsnLimbs" LimbType="Standard" Count="17" Offset="0x132DC"/>
-        <Skeleton Name="gFsnSkel" Type="Flex" LimbType="Standard" LimbNone="FSN_LIMB_NONE" LimbMax="FSN_LIMB_MAX" EnumName="FsnLimb" Offset="0x13320" />
-
-        <!-- Animations -->
-        <Animation Name="gFsnLeanForwardStartAnim" Offset="0x138B0" /> <!-- Original name is "fsn_zorawait01" -->
-        <Animation Name="gFsnLeanForwardLoopAnim" Offset="0x1430C" /> <!-- Original name is "fsn_zorawait02" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fu.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fu.xml
deleted file mode 100644
index c70db90e8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fu.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<Root>
-    <File Name="object_fu" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gGuruGuruPlayAndMoveHeadAnim" Offset="0x57C"/> <!-- Original name is "are_are" -->
-        <Animation Name="gGuruGuruPlayStillAnim" Offset="0xB04"/> <!-- Original name is "fu_mawasu" -->
-
-        <!-- Guru Guru Limb DisplayLists -->
-        <DList Name="gGuruGuruHornDL" Offset="0x3130"/>
-        <DList Name="gGuruGuruChestAndMusicBoxPipeDL" Offset="0x3320"/>
-        <DList Name="gGuruGuruHeadDL" Offset="0x36A0"/>
-        <DList Name="gGuruGuruRightShoulderDL" Offset="0x3BD8"/>
-        <DList Name="gGuruGuruRightArmDL" Offset="0x3D08"/>
-        <DList Name="gGuruGuruRightHandAndCrankDL" Offset="0x3E38"/>
-        <DList Name="gGuruGuruLeftArmAndMusicBoxDL" Offset="0x40E0"/>
-        <DList Name="gGuruGuruBlueTriangleDL" Offset="0x4390"/>
-        <DList Name="gGuruGuruTorsoDL" Offset="0x4460"/>
-        <DList Name="gGuruGuruRightThighDL" Offset="0x4570"/>
-        <DList Name="gGuruGuruRightLegDL" Offset="0x4690"/>
-        <DList Name="gGuruGuruRightFootDL" Offset="0x47E0"/>
-        <DList Name="gGuruGuruLeftThighDL" Offset="0x48E8"/>
-        <DList Name="gGuruGuruLeftLegDL" Offset="0x4A08"/>
-        <DList Name="gGuruGuruLeftFootDL" Offset="0x4B58"/>
-
-        <!-- Textures -->
-        <Texture Name="gGuruGuruClothesTLUT" OutName="guru_guru_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
-        <Texture Name="gGuruGuruSkinTLUT" OutName="guru_guru_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
-        <Texture Name="gGuruGuruPantsTex" OutName="guru_guru_pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
-        <Texture Name="gGuruGuruHeadSkinTex" OutName="guru_guru_head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruMusicBoxTex" OutName="guru_guru_music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
-        <Texture Name="gGuruGuruFingersAndToesTex" OutName="guru_guru_fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruEarTex" OutName="guru_guru_ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruUpperHornAndCrankTex" OutName="guru_guru_upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
-        <Texture Name="gGuruGuruShirtTex" OutName="guru_guru_shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
-        <Texture Name="gGuruGuruHornAndPipeTex" OutName="guru_guru_horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
-        <Texture Name="gGuruGuruEyeClosedTex" OutName="guru_guru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruEyeAngryTex" OutName="guru_guru_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruMouthOpenTex" OutName="guru_guru_mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruMouthAngryTex" OutName="guru_guru_mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
-        <Texture Name="gGuruGuruHairTex" OutName="guru_guru_hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
-
-        <!-- Guru Guru Limbs -->
-        <Limb Name="gGuruGuruTorsoLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_TORSO" Offset="0x6BA0"/>
-        <Limb Name="gGuruGuruLeftThighLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_THIGH" Offset="0x6BAC"/>
-        <Limb Name="gGuruGuruLeftLegLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_LEG" Offset="0x6BB8"/>
-        <Limb Name="gGuruGuruLeftFootLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_FOOT" Offset="0x6BC4"/>
-        <Limb Name="gGuruGuruRightThighLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_THIGH" Offset="0x6BD0"/>
-        <Limb Name="gGuruGuruRightLegLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_LEG" Offset="0x6BDC"/>
-        <Limb Name="gGuruGuruRightFootLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_FOOT" Offset="0x6BE8"/>
-        <Limb Name="gGuruGuruChestAndMusicBoxPipeLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_CHEST_AND_MUSIC_BOX_PIPE" Offset="0x6BF4"/>
-        <Limb Name="gGuruGuruLeftArmAndMusicBoxLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_ARM_AND_MUSIC_BOX" Offset="0x6C00"/>
-        <Limb Name="gGuruGuruTriangleLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_TRIANGLE" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
-        <Limb Name="gGuruGuruRightShoulderLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_SHOULDER" Offset="0x6C18"/>
-        <Limb Name="gGuruGuruRightArmLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT" Offset="0x6C24"/>
-        <Limb Name="gGuruGuruRightHandAndCrankLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_HAND_AND_CRANK" Offset="0x6C30"/>
-        <Limb Name="gGuruGuruHeadLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_HEAD" Offset="0x6C3C"/>
-        <Limb Name="gGuruGuruHornLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_HORN" Offset="0x6C48"/>
-
-        <!-- Guru Guru Skeleton -->
-        <Skeleton Name="gGuruGuruSkel" Type="Flex" LimbType="Standard" LimbNone="GURU_GURU_LIMB_NONE" LimbMax="GURU_GURU_LIMB_MAX" EnumName="GuruGuruLimb" Offset="0x6C90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fu_kaiten.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fu_kaiten.xml
deleted file mode 100644
index ad277bb26..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fu_kaiten.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="object_fu_kaiten" Segment="6">
-        <DList Name="object_fu_kaiten_DL_0005D0" Offset="0x5D0" /> <!-- Original name is "dai_model" -->
-        <Texture Name="object_fu_kaiten_TLUT_000858" OutName="tlut_000858" Format="rgba16" Width="4" Height="4" Offset="0x858" />
-        <Texture Name="object_fu_kaiten_Tex_000878" OutName="tex_000878" Format="ci4" Width="64" Height="64" Offset="0x878" />
-        <Texture Name="object_fu_kaiten_Tex_001078" OutName="tex_001078" Format="rgba16" Width="16" Height="64" Offset="0x1078" />
-        <Texture Name="object_fu_kaiten_Tex_001878" OutName="tex_001878" Format="rgba16" Width="32" Height="32" Offset="0x1878" />
-        <Texture Name="object_fu_kaiten_Tex_002078" OutName="tex_002078" Format="rgba16" Width="32" Height="32" Offset="0x2078" />
-        <Collision Name="object_fu_kaiten_Colheader_002D30" Offset="0x2D30" /> <!-- Original name is "z2_bowling_dai_bgdatainfo" -->
-        <DList Name="object_fu_kaiten_DL_002EB0" Offset="0x2EB0" /> <!-- Original name is "z2_bowling_mizu_modelT" -->
-        <DList Name="object_fu_kaiten_DL_002FB0" Offset="0x2FB0" />
-        <DList Name="object_fu_kaiten_DL_002FC0" Offset="0x2FC0" />
-        <Texture Name="object_fu_kaiten_Tex_002FD0" OutName="tex_002FD0" Format="rgba16" Width="32" Height="32" Offset="0x2FD0" />
-        <TextureAnimation Name="object_fu_kaiten_Matanimheader_0037D8" Offset="0x37D8" />
-        <!-- <Blob Name="object_fu_kaiten_Blob_0037E0" Size="0x18" Offset="0x37E0" /> -->
-        <Collision Name="object_fu_kaiten_Colheader_0037F8" Offset="0x37F8" /> <!-- Original name is "z2_bowling_mizu_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fu_mato.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fu_mato.xml
deleted file mode 100644
index bedf6906f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fu_mato.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<Root>
-    <File Name="object_fu_mato" Segment="6">
-        <DList Name="object_fu_mato_DL_0006A0" Offset="0x6A0" /> <!-- Original name is "kago1_model" -->
-        <DList Name="object_fu_mato_DL_000740" Offset="0x740" /> <!-- Original name is "kago2_model" -->
-        <DList Name="object_fu_mato_DL_0007E0" Offset="0x7E0" /> <!-- Original name is "kago3_model" -->
-        <DList Name="object_fu_mato_DL_000880" Offset="0x880" /> <!-- Original name is "kago4_model" -->
-        <DList Name="object_fu_mato_DL_000920" Offset="0x920" /> <!-- Original name is "kago5_model" -->
-        <DList Name="object_fu_mato_DL_0009C0" Offset="0x9C0" /> <!-- Original name is "kago6_model" -->
-        <Texture Name="object_fu_mato_Tex_000A60" OutName="tex_000A60" Format="rgba16" Width="32" Height="32" Offset="0xA60" />
-        <Collision Name="object_fu_mato_Colheader_0015C0" Offset="0x15C0" /> <!-- Original name is "z2_bowling_kago_bgdatainfo" -->
-        <DList Name="object_fu_mato_DL_001C80" Offset="0x1C80" /> <!-- Original name is "mato1_model" -->
-        <DList Name="object_fu_mato_DL_001D68" Offset="0x1D68" /> <!-- Original name is "mato2_model" -->
-        <DList Name="object_fu_mato_DL_001E50" Offset="0x1E50" /> <!-- Original name is "mato3_model" -->
-        <DList Name="object_fu_mato_DL_001F38" Offset="0x1F38" /> <!-- Original name is "mato4_model" -->
-        <DList Name="object_fu_mato_DL_002020" Offset="0x2020" /> <!-- Original name is "mato5_model" -->
-        <DList Name="object_fu_mato_DL_002108" Offset="0x2108" /> <!-- Original name is "mato6_model" -->
-        <Collision Name="object_fu_mato_Colheader_0023D4" Offset="0x23D4" /> <!-- Original name is "z2_bowling_mato_bgdatainfo" -->
-        <DList Name="object_fu_mato_DL_002720" Offset="0x2720" /> <!-- Original name is "mato_model" -->
-        <Texture Name="object_fu_mato_Tex_002850" OutName="tex_002850" Format="rgba16" Width="16" Height="16" Offset="0x2850" />
-        <Texture Name="object_fu_mato_Tex_002A50" OutName="tex_002A50" Format="rgba16" Width="16" Height="64" Offset="0x2A50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_funen.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_funen.xml
deleted file mode 100644
index 0f9d0a484..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_funen.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Object for Stone Tower Smoke -->
-    <File Name="object_funen" Segment="6">
-        <DList Name="gStoneTowerSmokeDL" Offset="0xD0" /> <!-- Original name is "obj_smork_modelT" -->
-        <Texture Name="gStoneTowerSmokeTex" OutName="stone_tower_smoke" Format="ia8" Width="32" Height="32" Offset="0x1C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fusen.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fusen.xml
deleted file mode 100644
index 2ee47097a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fusen.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_fusen" Segment="6">
-        <DList Name="gMajoraBalloonDL" Offset="0xA00" /> <!-- Original name is "sphere1_model" -->
-        <DList Name="gMajoraBalloonKnotDL" Offset="0xD78" /> <!-- Original name is "musubu_model" -->
-        <Texture Name="object_fusen_Tex_000E08" OutName="tex_000E08" Format="rgba16" Width="32" Height="32" Offset="0xE08" />
-        <Collision Name="object_fusen_Colheader_002420" Offset="0x2420" /> <!-- Original name is "zako_fusen_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fwall.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fwall.xml
deleted file mode 100644
index a4311c173..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fwall.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Root>
-    <File Name="object_fwall" Segment="6">
-        <DList Name="object_fwall_DL_000040" Offset="0x40" /> <!-- Original name is "m_Ffirewall_model" -->
-        
-        <!-- 0xA0 to 0x3520 are leftover textures from the OOT fire jet elevator in Fire Temple -->
-        <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="fwall_fire_temple_big_vertical_flame_0" Format="ia8" Width="24" Height="80" Offset="0xA0" /> 
-        <Texture Name="gFireTempleBigVerticalFlame1Tex" OutName="fwall_fire_temple_big_vertical_flame_1" Format="ia8" Width="24" Height="80" Offset="0x820" />
-        <Texture Name="gFireTempleBigVerticalFlame2Tex" OutName="fwall_fire_temple_big_vertical_flame_2" Format="ia8" Width="24" Height="80" Offset="0xFA0" />
-        <Texture Name="gFireTempleBigVerticalFlame3Tex" OutName="fwall_fire_temple_big_vertical_flame_3" Format="ia8" Width="24" Height="80" Offset="0x1720" />
-        <Texture Name="gFireTempleBigVerticalFlame4Tex" OutName="fwall_fire_temple_big_vertical_flame_4" Format="ia8" Width="24" Height="80" Offset="0x1EA0" />
-        <Texture Name="gFireTempleBigVerticalFlame5Tex" OutName="fwall_fire_temple_big_vertical_flame_5" Format="ia8" Width="24" Height="80" Offset="0x2620" />
-        <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="fwall_fire_temple_big_vertical_flame_6" Format="ia8" Width="24" Height="80" Offset="0x2DA0" />
-        <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="fwall_fire_temple_big_vertical_flame_7" Format="ia8" Width="24" Height="80" Offset="0x3520" />
-        
-        <Texture Name="gFwallFireball0Tex" OutName="fwall_fireball_0" Format="ia8" Width="32" Height="32" Offset="0x3CA0" />
-        <Texture Name="gFwallFireball1Tex" OutName="fwall_fireball_1" Format="ia8" Width="32" Height="32" Offset="0x40A0" />
-        <Texture Name="gFwallFireball2Tex" OutName="fwall_fireball_2" Format="ia8" Width="32" Height="32" Offset="0x44A0" />
-        <Texture Name="gFwallFireball3Tex" OutName="fwall_fireball_3" Format="ia8" Width="32" Height="32" Offset="0x48A0" />
-        <Texture Name="gFwallFireball4Tex" OutName="fwall_fireball_4" Format="ia8" Width="32" Height="32" Offset="0x4CA0" />
-        <Texture Name="gFwallFireball5Tex" OutName="fwall_fireball_5" Format="ia8" Width="32" Height="32" Offset="0x50A0" />
-        <Texture Name="gFwallFireball6Tex" OutName="fwall_fireball_6" Format="ia8" Width="32" Height="32" Offset="0x54A0" />
-        <Texture Name="gFwallFireball7Tex" OutName="fwall_fireball_7" Format="ia8" Width="32" Height="32" Offset="0x58A0" />        
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fz.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fz.xml
deleted file mode 100644
index 0c0b2ce2b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_fz.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_fz" Segment="6">
-        <DList Name="object_fz_DL_001130" Offset="0x1130" />
-        <DList Name="object_fz_DL_0021A0" Offset="0x21A0" />
-        <DList Name="object_fz_DL_002CA0" Offset="0x2CA0" />
-        <Texture Name="object_fz_Tex_002E70" OutName="tex_002E70" Format="i4" Width="32" Height="32" Offset="0x2E70" />
-        <DList Name="object_fz_DL_0030A0" Offset="0x30A0" />
-        <DList Name="object_fz_DL_003158" Offset="0x3158" />
-        <DList Name="object_fz_DL_003260" Offset="0x3260" />
-        <DList Name="object_fz_DL_0033F0" Offset="0x33F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ge1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ge1.xml
deleted file mode 100644
index db123e78c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ge1.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<Root>
-    <!-- Assets for white-clothed Gerudo -->
-    <File Name="object_ge1" Segment="6">
-        <!-- White-clothed Gerudo Animations -->
-        <Animation Name="gGerudoWhiteStandingHeadBowedAnim" Offset="0x594" /><!-- Original name may be "gb_ie" ("home")? -->
-        <Animation Name="gGerudoWhiteSaluteAnim" Offset="0xABC" /><!-- Original name is "gb_keirei" ("salute/bow") -->
-        <Animation Name="gGerudoWhiteStiffeningAnim" Offset="0xCF8" /><!-- Original name is "gb_kochoku" ("stiffening/rigidity") -->
-        <Animation Name="gGerudoWhiteStiffShiveringAnim" Offset="0x13CC" /><!-- Original name is "gb_kochoku_loop" ("stiffening loop") -->
-        <Animation Name="gGerudoWhiteTrudgingOffAnim" Offset="0x202C" /><!-- Original name is "gb_tobotobo" ("totteringly/trudgingly") -->
-        <Animation Name="gGerudoWhiteGreatBayCutsceneAnim" Offset="0x2148" /><!-- one frame used for each part of Great Bay Temple first entry cutscene. Original name is "gb_twister" -->
-        <Animation Name="gGerudoWhiteExcitedClappingAnim" Offset="0x2954" /><!-- Original name is "gb_wakuwaku", ("excited") -->
-        <Animation Name="gGerudoWhiteUnfoldingArmsAnim" Offset="0x2AD8" /><!-- Original name is "ge1_hanasi" ("talk") -->
-
-        <!-- From here to the end this file is identical to OoT's object_ge1, offset 0x0-0x9860 -->
-        <Animation Name="gGerudoWhiteArmsFoldedAnim" Offset="0x2B98" /><!-- Original name is "ge1_matsu" ("waiting") -->
-
-        <!-- White-clothed Gerudo Limbs -->
-        <Limb Name="gGerudoWhiteWaistLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_WAIST" Offset="0x2BB0" />
-        <Limb Name="gGerudoWhiteLeftThighLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_THIGH" Offset="0x2BBC" />
-        <Limb Name="gGerudoWhiteLeftShinLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_LOWER_LEG" Offset="0x2BC8" />
-        <Limb Name="gGerudoWhiteLeftFootLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_FOOT" Offset="0x2BD4" />
-        <Limb Name="gGerudoWhiteRightThighLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_THIGH" Offset="0x2BE0" />
-        <Limb Name="gGerudoWhiteRightShinLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_LOWER_LEG" Offset="0x2BEC" />
-        <Limb Name="gGerudoWhiteRightFootLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_FOOT" Offset="0x2BF8" />
-        <Limb Name="gGerudoWhiteTorsoLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_TORSO" Offset="0x2C04" />
-        <Limb Name="gGerudoWhiteLeftUpperArmLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_UPPER_ARM" Offset="0x2C10" />
-        <Limb Name="gGerudoWhiteLeftForearmLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_FOREARM" Offset="0x2C1C" />
-        <Limb Name="gGerudoWhiteLeftHandLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_LEFT_HAND" Offset="0x2C28" />
-        <Limb Name="gGerudoWhiteRightUpperArmLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_UPPER_ARM" Offset="0x2C34" />
-        <Limb Name="gGerudoWhiteRightForearmLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_FOREARM" Offset="0x2C40" />
-        <Limb Name="gGerudoWhiteRightHandLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_RIGHT_HAND" Offset="0x2C4C" />
-        <Limb Name="gGerudoWhiteHeadLimb" Type="Standard" EnumName="GERUDO_WHITE_LIMB_HEAD" Offset="0x2C58" />
-
-        <!-- White-clothed Gerudo Skeleton -->
-        <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" LimbNone="GERUDO_WHITE_LIMB_NONE" LimbMax="GERUDO_WHITE_LIMB_MAX" EnumName="GerudoWhiteLimb" Offset="0x2CA0" />
-
-        <Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2CB8" />
-        <Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2EB8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x2EF8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x2FF8" TlutOffset="0x2CB8" />
-
-        <!-- White-clothed Gerudo Eye Textures -->
-        <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3078"/>
-        <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x3878"/>
-        <Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4078"/>
-
-        <Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x4C78" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x4CF8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x4DF8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x4EF8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x4FF8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x5038" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x50B8" TlutOffset="0x2CB8" />
-        <Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x50F8" />
-
-        <!-- White-clothed Gerudo Hair Textures -->
-        <Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5178" />
-        <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x5378" TlutOffset="0x5178" />
-
-        <!-- White-clothed Gerudo Limb DisplayLists -->
-        <DList Name="gGerudoWhiteWaistDL" Offset="0x7F78" />
-        <DList Name="gGerudoWhiteLeftThighDL" Offset="0x85A8" />
-        <DList Name="gGerudoWhiteLeftShinDL" Offset="0x89B0" />
-        <DList Name="gGerudoWhiteLeftFootDL" Offset="0x8B58" />
-        <DList Name="gGerudoWhiteRightThighDL" Offset="0x8C88" />
-        <DList Name="gGerudoWhiteRightShinDL" Offset="0x8E80" />
-        <DList Name="gGerudoWhiteRightFootDL" Offset="0x9028" />
-        <DList Name="gGerudoWhiteTorsoDL" Offset="0x9158" />
-        <DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x9350" />
-        <DList Name="gGerudoWhiteLeftForearmDL" Offset="0x9440" />
-        <DList Name="gGerudoWhiteLeftHandDL" Offset="0x9570" />
-        <DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x97C0" />
-        <DList Name="gGerudoWhiteRightForearmDL" Offset="0x9A20" />
-        <DList Name="gGerudoWhiteRightHandDL" Offset="0x9B50" />
-        <DList Name="gGerudoWhiteHeadDL" Offset="0x9D18" />
-
-        <!-- White-clothed Gerudo Hairstyle DisplayLists -->
-        <DList Name="gGerudoWhiteHairstyleBobDL" Offset="0xBB08" />
-        <DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0xBDA0" />
-        <DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0xC000" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_geldb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_geldb.xml
deleted file mode 100644
index 3b5dfa4ea..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_geldb.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<Root>
-    <!-- Assets for Gerudo wearing red, i.e. Aveil -->
-    <File Name="object_geldb" Segment="6">
-        <Animation Name="gGerudoRedBegAnim" Offset="0x734" /> <!-- Original name is "ga_asonde" begging? "idle"? -->
-        <Animation Name="gGerudoRedDismissAnim" Offset="0xCB0" /> <!-- Original name is "ga_hayaku" "hurry" -->
-        <Animation Name="gGerudoRedTurnHeadAnim" Offset="0xEE0" /> <!-- Original name is "ga_matu" "wait" -->
-        <Animation Name="gGerudoRedWaitAnim" Offset="0x14CC" /> <!-- Original name is "ga_matu_loop" "wait_loop" -->
-        <Animation Name="gGerudoRedDemandAnim" Offset="0x1AC8" /> <!-- hands on hips leaning forward (demanding?). Original name is "ga_naniyatte" -->
-        <Animation Name="gGerudoRedRunAwayAnim" Offset="0x1DFC" /> <!-- Running away from the bees. Original name is "ga_nigedasu" -->
-        <Animation Name="gGerudoRedHandOnHipWaitAnim" Offset="0x1EFC" /> <!-- Single frame pose with hand on hip. Original name is "gelb_wait" -->
-        <Animation Name="gGerudoRedWalkAnim" Offset="0x28A0" /> <!-- Walking. Original name is "gelb_walk" -->
-
-        <!-- Model, same as OoT object_geldb 0x2500-0xA470 -->
-        <Texture Name="gGerudoRed1TLUT" OutName="gerudo_red_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x28B0" />
-        <Texture Name="gGerudoRedSkinShadowTex" OutName="gerudo_red_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x2AB0" TlutOffset="0x28B0" />
-        <Texture Name="gGerudoRedDarkRedFabricTex" OutName="gerudo_red_dark_red_fabric" Format="ci8" Width="8" Height="8" Offset="0x2AF0" TlutOffset="0x28B0" />
-        <Texture Name="gGerudoRedYellowJewel1Tex" OutName="gerudo_red_yellow_jewel_1" Format="ci8" Width="16" Height="16" Offset="0x2B30" /> <!-- also used for gauntlets and greaves -->
-        <Texture Name="gGerudoRedGerudoPatternFabricTex" OutName="gerudo_red_gerudo_pattern_fabric" Format="i8" Width="16" Height="16" Offset="0x2C30" />
-        <Texture Name="gGerudoRedMidriffTex" OutName="gerudo_red_midriff" Format="ci8" Width="16" Height="16" Offset="0x2D30" TlutOffset="0x28B0" />
-        <Texture Name="gGerudoTrousersTex" OutName="gerudo_red_trousers" Format="i8" Width="16" Height="16" Offset="0x2E30" />
-        <Texture Name="gGerudoMail1Tex" OutName="gerudo_red_mail_1" Format="i8" Width="8" Height="16" Offset="0x2F30" />
-        <DList Name="gGerudoRedTorsoDL" Offset="0x4C90" />
-        <DList Name="gGerudoRedRightUpperArmDL" Offset="0x5110" />
-        <DList Name="gGerudoRedRightForearmDL" Offset="0x5248" />
-        <DList Name="gGerudoRedLeftUpperArmDL" Offset="0x5470" />
-        <DList Name="gGerudoRedLeftForearmDL" Offset="0x55A8" />
-        <DList Name="gGerudoRedPelvisDL" Offset="0x57D0" />
-        <DList Name="gGerudoRedRightThighDL" Offset="0x59F0" />
-        <DList Name="gGerudoRedRightLowerLegDL" Offset="0x5AF0" />
-        <DList Name="gGerudoRedLeftThighDL" Offset="0x5D60" />
-        <DList Name="gGerudoRedLeftLowerLegDL" Offset="0x5E60" />
-        <Texture Name="gGerudoRed2TLUT" OutName="gerudo_red_2_tlut" Format="rgba16" Width="18" Height="14" Offset="0x60E0" />
-        <Texture Name="gGerudoRedSkinGradientTex" OutName="gerudo_red_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x62D8" /> <!-- also used on head -->
-        <Texture Name="gGerudoRedEarTex" OutName="gerudo_red_ear" Format="ci8" Width="8" Height="16" Offset="0x6318" />
-        <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x6398" TlutOffset="0x60E0" />
-        <Texture Name="gGerudoRedVeilFabricTex" OutName="gerudo_red_veil_fabric" Format="i8" Width="16" Height="16" Offset="0x6798" />
-        <Texture Name="gGerudoRedShoeUpperTex" OutName="gerudo_red_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x6898" />
-        <Texture Name="gGerudoRedShoeSoleTex" OutName="gerudo_red_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x6918" />
-        <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x6958" TlutOffset="0x60E0" />
-        <Texture Name="gGerudoRedMail2Tex" OutName="gerudo_red_mail_2" Format="i8" Width="8" Height="16" Offset="0x6D58" />
-        <Texture Name="gGerudoRedHairTex" OutName="gerudo_red_hair" Format="ci8" Width="16" Height="16" Offset="0x6DD8" />
-        <Texture Name="gGerudoRedFingersTex" OutName="gerudo_red_fingers" Format="ci8" Width="16" Height="16" Offset="0x6ED8" />
-        <Texture Name="gGerudoRedYellowJewel2Tex" OutName="gerudo_red_yellow_jewel_2" Format="ci8" Width="16" Height="16" Offset="0x6FD8" /> <!-- used for head and sword guards -->
-        <Texture Name="gGerudoRedEyeClosedTex" OutName="gerudo_red_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x70D8" TlutOffset="0x60E0" />
-        <DList Name="gGerudoRedLeftFootDL" Offset="0x92F8" />
-        <DList Name="gGerudoRedRightFootDL" Offset="0x94B8" />
-        <DList Name="gGerudoRedLeftHandDL" Offset="0x9678" />
-        <DList Name="gGerudoRedLeftSwordDL" Offset="0x9810" />
-        <DList Name="gGerudoRedRightHandDL" Offset="0x99E8" />
-        <DList Name="gGerudoRedRightSwordDL" Offset="0x9B80" />
-        <DList Name="gGerudoRedVeilDL" Offset="0x9D58" />
-        <DList Name="gGerudoRedPonytailDL" Offset="0x9E10" />
-        <DList Name="gGerudoRedHeadDL" Offset="0x9F00" />
-
-        <Limb Name="gGerudoRedRootLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_ROOT" Offset="0xA698" />
-        <Limb Name="gGerudoRedTorsoLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_TORSO" Offset="0xA6A4" />
-        <Limb Name="gGerudoRedNeckLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_NECK" Offset="0xA6B0" />
-        <Limb Name="gGerudoRedPonytailLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_PONYTAIL" Offset="0xA6BC" />
-        <Limb Name="gGerudoRedVeilLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_VEIL" Offset="0xA6C8" />
-        <Limb Name="gGerudoRedHeadLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_HEAD" Offset="0xA6D4" />
-        <Limb Name="gGerudoRedRightUpperArmLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_UPPER_ARM" Offset="0xA6E0" />
-        <Limb Name="gGerudoRedRightForearmLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_FOREARM" Offset="0xA6EC" />
-        <Limb Name="gGerudoRedRightWristLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_WRIST" Offset="0xA6F8" />
-        <Limb Name="gGerudoRedRightHandLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_HAND" Offset="0xA704" />
-        <Limb Name="gGerudoRedRightSwordLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_SWORD" Offset="0xA710" />
-        <Limb Name="gGerudoRedLeftUpperArmLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_UPPER_ARM" Offset="0xA71C" />
-        <Limb Name="gGerudoRedLeftForearmLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_FOREARM" Offset="0xA728" />
-        <Limb Name="gGerudoRedLeftWristLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_WRIST" Offset="0xA734" />
-        <Limb Name="gGerudoRedLeftHandLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_HAND" Offset="0xA740" />
-        <Limb Name="gGerudoRedLeftSwordLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_SWORD" Offset="0xA74C" />
-        <Limb Name="gGerudoRedLeftThighLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_THIGH" Offset="0xA758" />
-        <Limb Name="gGerudoRedLeftLowerLegLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_LOWER_LEG" Offset="0xA764" />
-        <Limb Name="gGerudoRedLeftFootLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_LEFT_FOOT" Offset="0xA770" />
-        <Limb Name="gGerudoRedRightThighLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_THIGH" Offset="0xA77C" />
-        <Limb Name="gGerudoRedRightLowerLegLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_LOWER_LEG" Offset="0xA788" />
-        <Limb Name="gGerudoRedRightFootLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_RIGHT_FOOT" Offset="0xA794" />
-        <Limb Name="gGerudoRedPelvisLimb" Type="Standard" EnumName="GERUDO_RED_LIMB_PELVIS" Offset="0xA7A0" />
-        <Skeleton Name="gGerudoRedSkel" Type="Flex" LimbType="Standard" LimbNone="GERUDO_RED_LIMB_NONE" LimbMax="GERUDO_RED_LIMB_MAX" EnumName="GerudoRedLimb" Offset="0xA808" />
-
-        <!-- Same as OoT object_geldb 0xAE10-end -->
-        <Animation Name="gGerudoRedStandAnim" Offset="0xAA8C" /> <!-- Original name is "geldB_talk" -->
-        <Animation Name="gGerudoRedNeutralAnim" Offset="0xB0E4" /> <!-- Original name is "geldB_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gg.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gg.xml
deleted file mode 100644
index 45fe1b172..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gg.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<Root>
-    <File Name="object_gg" Segment="6">
-        <DList Name="object_gg_DL_003BA0" Offset="0x3BA0" />
-        <DList Name="object_gg_DL_003EC0" Offset="0x3EC0" />
-        <DList Name="object_gg_DL_004578" Offset="0x4578" />
-        <DList Name="object_gg_DL_004890" Offset="0x4890" />
-        <DList Name="object_gg_DL_004B08" Offset="0x4B08" />
-        <DList Name="object_gg_DL_004B50" Offset="0x4B50" />
-        <DList Name="object_gg_DL_004C48" Offset="0x4C48" />
-        <DList Name="object_gg_DL_004F08" Offset="0x4F08" />
-        <DList Name="object_gg_DL_005050" Offset="0x5050" />
-        <DList Name="object_gg_DL_0050E0" Offset="0x50E0" />
-        <DList Name="object_gg_DL_0051D8" Offset="0x51D8" />
-        <DList Name="object_gg_DL_005498" Offset="0x5498" />
-        <DList Name="object_gg_DL_0055D8" Offset="0x55D8" />
-        <DList Name="object_gg_DL_005670" Offset="0x5670" />
-        <DList Name="object_gg_DL_005730" Offset="0x5730" />
-        <DList Name="object_gg_DL_005828" Offset="0x5828" />
-        <DList Name="object_gg_DL_0058E8" Offset="0x58E8" />
-        <Texture Name="object_gg_Tex_0059E0" OutName="tex_0059E0" Format="i8" Width="16" Height="16" Offset="0x59E0" />
-        <Texture Name="object_gg_Tex_005AE0" OutName="tex_005AE0" Format="i8" Width="8" Height="8" Offset="0x5AE0" />
-        <Texture Name="object_gg_Tex_005B20" OutName="tex_005B20" Format="i8" Width="8" Height="8" Offset="0x5B20" />
-        <Texture Name="object_gg_Tex_005B60" OutName="tex_005B60" Format="i8" Width="32" Height="64" Offset="0x5B60" />
-        <Texture Name="object_gg_Tex_006360" OutName="tex_006360" Format="i8" Width="32" Height="32" Offset="0x6360" />
-        <Texture Name="object_gg_Tex_006760" OutName="tex_006760" Format="i8" Width="8" Height="32" Offset="0x6760" />
-        <Texture Name="object_gg_Tex_006860" OutName="tex_006860" Format="i8" Width="16" Height="32" Offset="0x6860" />
-        <Texture Name="object_gg_Tex_006A60" OutName="tex_006A60" Format="i8" Width="8" Height="16" Offset="0x6A60" />
-        <Texture Name="object_gg_Tex_006AE0" OutName="tex_006AE0" Format="i8" Width="16" Height="16" Offset="0x6AE0" />
-        <Texture Name="object_gg_Tex_006BE0" OutName="tex_006BE0" Format="i8" Width="8" Height="16" Offset="0x6BE0" />
-        <Texture Name="object_gg_Tex_006C60" OutName="tex_006C60" Format="i8" Width="8" Height="8" Offset="0x6C60" />
-        <Texture Name="object_gg_Tex_006CA0" OutName="tex_006CA0" Format="i8" Width="8" Height="16" Offset="0x6CA0" />
-        <Texture Name="object_gg_Tex_006D20" OutName="tex_006D20" Format="i8" Width="16" Height="16" Offset="0x6D20" />
-        <Texture Name="object_gg_Tex_006E20" OutName="tex_006E20" Format="i8" Width="32" Height="64" Offset="0x6E20" />
-        <Texture Name="object_gg_Tex_007620" OutName="tex_007620" Format="i8" Width="32" Height="64" Offset="0x7620" />
-        <Texture Name="object_gg_Tex_007E20" OutName="tex_007E20" Format="rgba16" Width="32" Height="64" Offset="0x7E20" />
-        <Texture Name="object_gg_Tex_008E20" OutName="tex_008E20" Format="i8" Width="8" Height="8" Offset="0x8E20" />
-        <Texture Name="object_gg_Tex_008E60" OutName="tex_008E60" Format="i8" Width="32" Height="32" Offset="0x8E60" />
-        <Texture Name="object_gg_Tex_009260" OutName="tex_009260" Format="i8" Width="32" Height="32" Offset="0x9260" />
-        <Texture Name="object_gg_Tex_009660" OutName="tex_009660" Format="i8" Width="32" Height="32" Offset="0x9660" />
-        <Texture Name="object_gg_Tex_009A60" OutName="tex_009A60" Format="i8" Width="32" Height="32" Offset="0x9A60" />
-        <Texture Name="object_gg_Tex_009E60" OutName="tex_009E60" Format="i8" Width="32" Height="32" Offset="0x9E60" />
-        <Animation Name="object_gg_Anim_00A4B4" Offset="0xA4B4" /> <!-- Original name is "gg_2um" -->
-        <TextureAnimation Name="object_gg_Matanimheader_00A4F4" Offset="0xA4F4" />
-        <Animation Name="object_gg_Anim_00AF40" Offset="0xAF40" /> <!-- Original name is "gg_fly" -->
-        <Animation Name="object_gg_Anim_00B560" Offset="0xB560" /> <!-- Original name is "gg_gokyu" -->
-        <Animation Name="object_gg_Anim_00BAF0" Offset="0xBAF0" /> <!-- Original name is "gg_kongan" -->
-        <Animation Name="object_gg_Anim_00CDA0" Offset="0xCDA0" /> <!-- Original name is "gg_kyorokyoro" -->
-        <Animation Name="object_gg_Anim_00D174" Offset="0xD174" /> <!-- Original name is "gg_munen" -->
-        <Animation Name="object_gg_Anim_00D528" Offset="0xD528" /> <!-- Original name is "gg_odoroki" -->
-        <Animation Name="object_gg_Anim_00D99C" Offset="0xD99C" /> <!-- Original name is "gg_otakebi" -->
-        <Animation Name="object_gg_Anim_00E2A4" Offset="0xE2A4" /> <!-- Original name is "gg_otakebi_loop" -->
-        <Animation Name="object_gg_Anim_00E86C" Offset="0xE86C" /> <!-- Original name is "gg_um" -->
-        <Animation Name="object_gg_Anim_00ECC0" Offset="0xECC0" /> <!-- Original name is "gg_unadareru" -->
-        <Animation Name="object_gg_Anim_00F578" Offset="0xF578" /> <!-- Original name is "gg_wait" -->
-        <Limb Name="object_gg_Standardlimb_00F590" Type="Standard" EnumName="OBJECT_GG_LIMB_01" Offset="0xF590" />
-        <Limb Name="object_gg_Standardlimb_00F59C" Type="Standard" EnumName="OBJECT_GG_LIMB_02" Offset="0xF59C" />
-        <Limb Name="object_gg_Standardlimb_00F5A8" Type="Standard" EnumName="OBJECT_GG_LIMB_03" Offset="0xF5A8" />
-        <Limb Name="object_gg_Standardlimb_00F5B4" Type="Standard" EnumName="OBJECT_GG_LIMB_04" Offset="0xF5B4" />
-        <Limb Name="object_gg_Standardlimb_00F5C0" Type="Standard" EnumName="OBJECT_GG_LIMB_05" Offset="0xF5C0" />
-        <Limb Name="object_gg_Standardlimb_00F5CC" Type="Standard" EnumName="OBJECT_GG_LIMB_06" Offset="0xF5CC" />
-        <Limb Name="object_gg_Standardlimb_00F5D8" Type="Standard" EnumName="OBJECT_GG_LIMB_07" Offset="0xF5D8" />
-        <Limb Name="object_gg_Standardlimb_00F5E4" Type="Standard" EnumName="OBJECT_GG_LIMB_08" Offset="0xF5E4" />
-        <Limb Name="object_gg_Standardlimb_00F5F0" Type="Standard" EnumName="OBJECT_GG_LIMB_09" Offset="0xF5F0" />
-        <Limb Name="object_gg_Standardlimb_00F5FC" Type="Standard" EnumName="OBJECT_GG_LIMB_0A" Offset="0xF5FC" />
-        <Limb Name="object_gg_Standardlimb_00F608" Type="Standard" EnumName="OBJECT_GG_LIMB_0B" Offset="0xF608" />
-        <Limb Name="object_gg_Standardlimb_00F614" Type="Standard" EnumName="OBJECT_GG_LIMB_0C" Offset="0xF614" />
-        <Limb Name="object_gg_Standardlimb_00F620" Type="Standard" EnumName="OBJECT_GG_LIMB_0D" Offset="0xF620" />
-        <Limb Name="object_gg_Standardlimb_00F62C" Type="Standard" EnumName="OBJECT_GG_LIMB_0E" Offset="0xF62C" />
-        <Limb Name="object_gg_Standardlimb_00F638" Type="Standard" EnumName="OBJECT_GG_LIMB_0F" Offset="0xF638" />
-        <Limb Name="object_gg_Standardlimb_00F644" Type="Standard" EnumName="OBJECT_GG_LIMB_10" Offset="0xF644" />
-        <Limb Name="object_gg_Standardlimb_00F650" Type="Standard" EnumName="OBJECT_GG_LIMB_11" Offset="0xF650" />
-        <Limb Name="object_gg_Standardlimb_00F65C" Type="Standard" EnumName="OBJECT_GG_LIMB_12" Offset="0xF65C" />
-        <Limb Name="object_gg_Standardlimb_00F668" Type="Standard" EnumName="OBJECT_GG_LIMB_13" Offset="0xF668" />
-        <Skeleton Name="object_gg_Skel_00F6C0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GG_LIMB_NONE" LimbMax="OBJECT_GG_LIMB_MAX" EnumName="ObjectGgLimb" Offset="0xF6C0" />
-        <Animation Name="object_gg_Anim_0100C8" Offset="0x100C8" /> <!-- Original name is "gg_yurayura" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ghaka.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ghaka.xml
deleted file mode 100644
index 91ae8fa4f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ghaka.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_ghaka" Segment="6">
-        <Collision Name="object_ghaka_Colheader_0000E8" Offset="0xE8" /> <!-- Original name is "goron_hakaisi_bgdatainfo" -->
-        <DList Name="object_ghaka_DL_001980" Offset="0x1980" />
-        <DList Name="object_ghaka_DL_001A20" Offset="0x1A20" /> <!-- Original name is "z2_goron_hakaisi_model" -->
-        <Texture Name="object_ghaka_Tex_002020" OutName="tex_002020" Format="i8" Width="32" Height="64" Offset="0x2020" />
-        <Texture Name="object_ghaka_Tex_002820" OutName="tex_002820" Format="ia16" Width="16" Height="16" Offset="0x2820" />
-        <Texture Name="object_ghaka_Tex_002A20" OutName="tex_002A20" Format="rgba16" Width="32" Height="32" Offset="0x2A20" />
-        <Texture Name="object_ghaka_Tex_003220" OutName="tex_003220" Format="rgba16" Width="32" Height="32" Offset="0x3220" />
-        <Collision Name="object_ghaka_Colheader_003CD0" Offset="0x3CD0" /> <!-- Original name is "z2_goron_hakaisi_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_arrow.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_arrow.xml
deleted file mode 100644
index 5fcfeb6eb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_arrow.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Arrow -->
-    <File Name="object_gi_arrow" Segment="6">
-
-        <!-- Arrow Drop Display Lists -->
-        <DList Name="gGiArrowSmallDL" Offset="0x340" />
-        <DList Name="gGiArrowMediumDL" Offset="0xB90" />
-        <DList Name="gGiArrowLargeDL" Offset="0x1830" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_arrowcase.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_arrowcase.xml
deleted file mode 100644
index 87d8c29fb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_arrowcase.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Quiver Upgrades -->
-    <File Name="object_gi_arrowcase" Segment="6">
-
-        <!-- Quiver Upgrades Color Display Lists -->
-        <DList Name="gGiQuiver30InnerColorDL" Offset="0x8D0" />
-        <DList Name="gGiQuiver40InnerColorDL" Offset="0x8F0" />
-        <DList Name="gGiQuiver50InnerColorDL" Offset="0x910" />
-        <DList Name="gGiQuiver30OuterColorDL" Offset="0x930" />
-        <DList Name="gGiQuiver40OuterColorDL" Offset="0x950" />
-        <DList Name="gGiQuiver50OuterColorDL" Offset="0x970" />
-
-        <!-- Quiver Upgrades Common Display Lists -->
-        <DList Name="gGiQuiverInnerDL" Offset="0x990" />
-        <DList Name="gGiQuiverOuterDL" Offset="0xA80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bean.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bean.xml
deleted file mode 100644
index ed9d2b7a6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bean.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bean -->
-    <File Name="object_gi_bean" Segment="6">
-
-        <!-- Bean Display Lists -->
-        <DList Name="gGiBeanDL" Offset="0x580" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bigbomb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bigbomb.xml
deleted file mode 100644
index 042736edc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bigbomb.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Powder Keg -->
-    <File Name="object_gi_bigbomb" Segment="6">
-
-        <!-- Powder Keg Display Lists -->
-        <DList Name="gGiPowderKegGoronSkullAndFuseDL" Offset="0xBC0" />
-        <DList Name="gGiPowderKegBarrelDL" Offset="0xDA0" />
-
-        <!-- Powder Key TLUT -->
-        <Texture Name="gGiPowderKegBarrelTLUT" OutName="gi_powder_keg_barrel_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF30" />
-
-        <!-- Powder Keg Textures -->
-        <Texture Name="gGiPowderKegGoronSkullTex" OutName="gi_powder_keg_goron_skull" Format="ia8" Width="16" Height="32" Offset="0x1130" />
-        <Texture Name="gGiPowderKegBarrelTex" OutName="gi_powder_keg_barrel" Format="ci8" Width="32" Height="32" Offset="0x1330" />
-        <Texture Name="gGiPowderKegFuseTex" OutName="gi_powder_keg_fuse" Format="i8" Width="32" Height="16" Offset="0x1730" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bomb_1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bomb_1.xml
deleted file mode 100644
index 174927ca6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bomb_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bomb -->
-    <File Name="object_gi_bomb_1" Segment="6">
-
-        <!-- Bomb Display Lists -->
-        <DList Name="gGiBombDL" Offset="0x9A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bomb_2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bomb_2.xml
deleted file mode 100644
index f5b3af67f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bomb_2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bombchu -->
-    <File Name="object_gi_bomb_2" Segment="6">
-
-        <!-- Bombchu Display Lists -->
-        <DList Name="gGiBombchuDL" Offset="0x4B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bombpouch.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bombpouch.xml
deleted file mode 100644
index 2e9969cbd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bombpouch.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bomb Bag Upgrades -->
-    <File Name="object_gi_bombpouch" Segment="6">
-
-        <!-- Bomb Bag Upgrade Color Display Lists -->
-        <DList Name="gGiBombBag20BagColorDL" Offset="0xAD0" />
-        <DList Name="gGiBombBag30BagColorDL" Offset="0xAF0" />
-        <DList Name="gGiBombBag40BagColorDL" Offset="0xB10" />
-        <DList Name="gGiBombBag20RingColorDL" Offset="0xB30" />
-        <DList Name="gGiBombBag30RingColorDL" Offset="0xB50" />
-        <DList Name="gGiBombBag40RingColorDL" Offset="0xB70" />
-
-        <!-- Bomb Bag Upgrade Common Display Lists -->
-        <DList Name="gGiBombBagDL" Offset="0xB90" />
-        <DList Name="gGiBombBagRingDL" Offset="0xD98" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bosskey.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bosskey.xml
deleted file mode 100644
index 5d4bda5c0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bosskey.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Dungeon Boss Key -->
-    <File Name="object_gi_bosskey" Segment="6">
-
-        <!-- Dungeon Boss Key Display Lists -->
-        <DList Name="gGiBossKeyDL" Offset="0xCA0" />
-        <DList Name="gGiBossKeyGemDL" Offset="0xF08" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle.xml
deleted file mode 100644
index e978697ab..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Empty Bottle -->
-    <File Name="object_gi_bottle" Segment="6">
-
-        <!-- Empty Bottle Display Lists -->
-        <DList Name="gGiEmptyBottleCorkDL" Offset="0x670" />
-        <DList Name="gGiEmptyBottleGlassDL" Offset="0x750" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_04.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_04.xml
deleted file mode 100644
index ab90eb89d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_04.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Fairy -->
-    <File Name="object_gi_bottle_04" Segment="6">
-
-        <!-- Bottled Fairy Billboard Mtx Rotation -->
-        <Mtx Name="gGiFairyBottleBillboardRotMtx" Offset="0x7B0" />
-
-        <!-- Bottled Fairy Display Lists -->
-        <DList Name="gGiFairyBottleContentsDL" Offset="0x7F0" />
-        <DList Name="gGiFairyBottleGlassCorkDL" Offset="0x8B8" />
-        <DList Name="gGiFairyBottleEmptyDL" Offset="0xB10" />
-
-        <!-- Bottled Fairy Textures -->
-        <Texture Name="gGiFairyBottleCorkTex" OutName="gi_fairy_bottle_cork" Format="i8" Width="16" Height="16" Offset="0xB18" />
-        <Texture Name="gGiFairyBottleFairyTex" OutName="gi_fairy_bottle_fairy" Format="ia8" Width="32" Height="32" Offset="0xC18" />
-        <Texture Name="gGiFairyBottleGlassTex" OutName="gi_fairy_bottle_glass" Format="i4" Width="32" Height="32" Offset="0x1018" />
-
-        <!-- Bottled Fairy Texture Animation -->
-        <TextureAnimation Name="gGiFairyBottleTexAnim" Offset="0x1254" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_15.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_15.xml
deleted file mode 100644
index 486e042a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_15.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Zora Egg -->
-    <File Name="object_gi_bottle_15" Segment="6">
-
-        <!-- Bottled Zora Egg Display Lists -->
-        <DList Name="gGiZoraEggBottleGlassAndCorkDL" Offset="0xCF0" />
-        <DList Name="gGiZoraEggBottleContentsDL" Offset="0x1010" />
-
-        <!-- Bottled Zora Egg Textures -->
-        <Texture Name="gGiZoraEggBottleCorkTex" OutName="gi_zora_egg_bottle_cork" Format="i8" Width="16" Height="16" Offset="0x10F8" />
-        <Texture Name="gGiZoraEggBottleContentsTex" OutName="gi_zora_egg_bottle_contents" Format="rgba16" Width="32" Height="32" Offset="0x11F8" />
-        <Texture Name="gGiZoraEggBottleGlass1Tex" OutName="gi_zora_egg_bottle_glass_1" Format="i8" Width="32" Height="32" Offset="0x19F8" />
-        <Texture Name="gGiZoraEggBottleGlass2Tex" OutName="gi_zora_egg_bottle_glass_2" Format="i4" Width="32" Height="32" Offset="0x1DF8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_16.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_16.xml
deleted file mode 100644
index ab736f087..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Seahorse -->
-    <File Name="object_gi_bottle_16" Segment="6">
-
-        <!-- Bottled Seahorse Display Lists -->
-        <DList Name="gGiSeahorseBottleGlassAndCorkDL" Offset="0x9A0" />
-        <DList Name="gGiSeahorseBottleEmptyDL" Offset="0xD18" />
-
-        <!-- Bottled Seahorse Textures -->
-        <Texture Name="gGiSeahorseBottleCorkTex" OutName="gi_seahorse_bottle_cork" Format="i8" Width="32" Height="32" Offset="0xD20" />
-        <Texture Name="gGiSeahorseBottleGlassTex" OutName="gi_seahorse_bottle_glass" Format="i4" Width="32" Height="32" Offset="0x1120" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_21.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_21.xml
deleted file mode 100644
index 32cbd8e75..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_21.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Chateau Romani -->
-    <File Name="object_gi_bottle_21" Segment="6">
-
-        <!-- Bottled Chateau Romani: Display Lists -->
-        <DList Name="gGiChateauRomaniBottleDL" Offset="0xA50" />
-        <DList Name="gGiChateauRomaniBottleEmptyDL" Offset="0xE90" />
-
-        <!-- Bottled Chateau Romani: Display Lists -->
-        <Texture Name="gGiChateauRomaniBottleCorkTex" OutName="gi_chateau_romani_bottle_cork" Format="i8" Width="16" Height="16" Offset="0xE98" />
-        <Texture Name="gGiChateauRomaniBottleLabelTex" OutName="gi_chateau_romani_bottle_label" Format="i4" Width="96" Height="64" Offset="0xF98" />
-        <Texture Name="gGiChateauRomaniBottleGlassTex" OutName="gi_chateau_romani_bottle_glass" Format="i4" Width="16" Height="32" Offset="0x1B98" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_22.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_22.xml
deleted file mode 100644
index bbc2ea452..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_22.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Hylian Loach -->
-    <File Name="object_gi_bottle_22" Segment="6">
-
-        <!-- Bottled Hylian Loach Display Lists -->
-        <DList Name="gGiHylianLoachBottleGlassCorkWaterDL" Offset="0xC90" />
-        <DList Name="gGiHylianLoachBottleContentsDL" Offset="0xFB8" />
-
-        <!-- Bottled Hylian Loach Textures -->
-        <Texture Name="gGiHylianLoachBottleCorkTex" OutName="gi_hylian_loach_bottle_cork" Format="i8" Width="32" Height="32" Offset="0x11C0" />
-        <Texture Name="gGiHylianLoachBottleLoachTex" OutName="gi_hylian_loach_bottle_loach" Format="i8" Width="16" Height="16" Offset="0x15C0" />
-        <Texture Name="gGiHylianLoachBottleGlassTex" OutName="gi_hylian_loach_bottle_glass" Format="i4" Width="32" Height="32" Offset="0x16C0" />
-        <Texture Name="gGiHylianLoachBottleWaterTex" OutName="gi_hylian_loach_bottle_water" Format="i4" Width="32" Height="32" Offset="0x18C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_red.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_red.xml
deleted file mode 100644
index b52781d8d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bottle_red.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bottled Red Potion -->
-    <File Name="object_gi_bottle_red" Segment="6">
-
-        <!-- Bottled Red Potion Display Lists -->
-        <DList Name="gGiRedPotionBottleDL" Offset="0x9B0" />
-        <DList Name="gGiRedPotionBottleEmptyDL" Offset="0xCC0" />
-
-        <!-- Bottled Red Potion Textures -->
-        <Texture Name="gGiRedPotionBottleCorkTex" OutName="gi_red_potion_bottle_cork" Format="i8" Width="16" Height="16" Offset="0xCC8" />
-        <Texture Name="gGiRedPotionBottleGlassPotionTex" OutName="gi_red_potion_bottle_glass_potion" Format="i4" Width="32" Height="32" Offset="0xDC8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bow.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bow.xml
deleted file mode 100644
index f5ba88dfa..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_bow.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bow -->
-    <File Name="object_gi_bow" Segment="6">
-
-        <!-- Bow Display Lists -->
-        <DList Name="gGiBowHandleDL" Offset="0xC80" />
-        <DList Name="gGiBowStringDL" Offset="0xF40" />
-
-        <!-- Bow Textures -->
-        <Texture Name="gGiBowHandleTex" OutName="gi_bow_handle" Format="i8" Width="16" Height="32" Offset="0xFF0" />
-        <Texture Name="gGiBowStringTex" OutName="gi_bow_string" Format="i8" Width="16" Height="16" Offset="0x11F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_camera.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_camera.xml
deleted file mode 100644
index 5e94bf88b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_camera.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Picto Box -->
-    <File Name="object_gi_camera" Segment="6">
-
-        <!-- Picto Box Display Lists -->
-        <DList Name="gGiPictoBoxBodyAndLensDL" Offset="0xBC0" />
-        <DList Name="gGiPictoBoxFrameDL" Offset="0xEC8" />
-
-        <!-- Picto Box Textures -->
-        <Texture Name="gGiPictoBoxLensZoomRingTex" OutName="gi_picto_box_lens_zoom_ring" Format="i8" Width="32" Height="32" Offset="0x1058" />
-        <Texture Name="gGiPictoBoxFrameTex" OutName="gi_picto_box_frame" Format="i8" Width="32" Height="16" Offset="0x1458" />
-        <Texture Name="gGiPictoBoxBodyAndLensGlassTex" OutName="gi_picto_box_body_and_lens_glass" Format="i4" Width="32" Height="32" Offset="0x1658" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_compass.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_compass.xml
deleted file mode 100644
index 9c724fc59..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_compass.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Dungeon Compass -->
-    <File Name="object_gi_compass" Segment="6">
-
-        <!-- Dungeon Compass Display Lists -->
-        <DList Name="gGiCompassDL" Offset="0x960" />
-        <DList Name="gGiCompassGlassDL" Offset="0xC50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_fieldmap.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_fieldmap.xml
deleted file mode 100644
index f4d6369a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_fieldmap.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Tingle Map -->
-    <File Name="object_gi_fieldmap" Segment="6">
-
-        <!-- Tingle Map Display Lists -->
-        <DList Name="gGiTingleMapEmptyDL" Offset="0x6E0" />
-        <DList Name="gGiTingleMapDL" Offset="0x6E8" />
-
-        <!-- Tingle Map Textures -->
-        <Texture Name="gGiTingleMapLeftInscriptionsTex" OutName="gi_tingle_map_left_inscriptions" Format="i8" Width="32" Height="40" Offset="0xA20" />
-        <Texture Name="gGiTingleMapRightInscriptionsTex" OutName="gi_tingle_map_right_inscriptions" Format="i8" Width="32" Height="40" Offset="0xF20" />
-        <Texture Name="gGiTingleMapScrollHandleTex" OutName="gi_tingle_map_scroll_handle" Format="i8" Width="32" Height="32" Offset="0x1420" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_fish.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_fish.xml
deleted file mode 100644
index 7c9f4be1f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_fish.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Fish Container (in a bottle) -->
-    <File Name="object_gi_fish" Segment="6">
-
-        <!-- Fish Container Display Lists -->
-        <DList Name="gGiFishContainerDL" Offset="0x600" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_ghost.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_ghost.xml
deleted file mode 100644
index 3ea6ca582..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_ghost.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Poe Container (small and big poes inside a bottle) -->
-    <File Name="object_gi_ghost" Segment="6">
-
-        <!-- Poe Container Textures -->
-        <Texture Name="gGiPoeContainerFlameTex" OutName="gi_poe_container_flame" Format="i8" Width="16" Height="32" Offset="0x0" />
-        <Texture Name="gGiPoeContainerPatternTex" OutName="gi_poe_container_pattern" Format="i8" Width="16" Height="32" Offset="0x200" />
-
-        <!-- Poe Container Color Display Lists -->
-        <DList Name="gGiPoeContainerPoeColorDL" Offset="0x950" />
-        <DList Name="gGiPoeContainerBigPoeColorDL" Offset="0x970" />
-
-        <!-- Poe Container Common Display Lists -->
-        <DList Name="gGiPoeContainerLidDL" Offset="0x990" />
-        <DList Name="gGiPoeContainerGlassDL" Offset="0xBE0" />
-        <DList Name="gGiPoeContainerContentsDL" Offset="0xCF0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_glasses.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_glasses.xml
deleted file mode 100644
index e089e2c8d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_glasses.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Lens of Truth -->
-    <File Name="object_gi_glasses" Segment="6">
-
-        <!-- Lens of Truth Display Lists -->
-        <DList Name="gGiLensDL" Offset="0xD80" />
-        <DList Name="gGiLensGlassDL" Offset="0x1010" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_gold_dust.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_gold_dust.xml
deleted file mode 100644
index 523134bae..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_gold_dust.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Powdered Gold Dust (not inside a bottle) -->
-    <File Name="object_gi_gold_dust" Segment="6">
-
-        <!-- Powdered Gold Dust Display Lists -->
-        <DList Name="gGiGoldDustPowderEmptyDL" Offset="0x880" />
-        <DList Name="gGiGoldDustPowderDL" Offset="0x888" />
-
-        <!-- Powdered Gold Dust Textures -->
-        <Texture Name="gGiGoldDustPowderClothTex" OutName="gi_gold_dust_powder_cloth" Format="i8" Width="32" Height="32" Offset="0xB40" />
-        <Texture Name="gGiGoldDustPowderContentTex" OutName="gi_gold_dust_powder_content" Format="i4" Width="32" Height="32" Offset="0xF40" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_golonmask.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_golonmask.xml
deleted file mode 100644
index 87e65396e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_golonmask.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Goron Mask -->
-    <File Name="object_gi_golonmask" Segment="6">
-
-        <!-- Goron Mask Display Lists -->
-        <DList Name="gGiGoronMaskDL" Offset="0xBA0" />
-        <DList Name="gGiGoronMaskEmptyDL" Offset="0x10D0" />
-
-        <!-- Goron Mask Textures -->
-        <Texture Name="gGiGoronMaskEyeTex" OutName="gi_goron_mask_eye" Format="ia8" Width="32" Height="32" Offset="0x10D8" />
-        <Texture Name="gGiGoronMaskMouthTex" OutName="gi_goron_mask_mouth" Format="ia8" Width="64" Height="32" Offset="0x14D8" />
-        <Texture Name="gGiGoronMaskNoseEyebrowTex" OutName="gi_goron_mask_nose_eyebrow" Format="ia8" Width="8" Height="8" Offset="0x1CD8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_heart.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_heart.xml
deleted file mode 100644
index 1d9e72459..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_heart.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Recovery Heart -->
-    <File Name="object_gi_heart" Segment="6">
-
-        <!-- Recovery Heart Display Lists -->
-        <DList Name="gGiRecoveryHeartDL" Offset="0xE0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_hearts.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_hearts.xml
deleted file mode 100644
index 0f5387cae..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_hearts.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Heart Upgrades -->
-    <File Name="object_gi_hearts" Segment="6">
-
-        <!-- Heart Upgrade Display Lists -->
-        <DList Name="gGiHeartBorderDL" Offset="0x1290" />
-        <DList Name="gGiHeartContainerDL" Offset="0x1470" />
-        <DList Name="gGiHeartPieceDL" Offset="0x1590" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_hookshot.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_hookshot.xml
deleted file mode 100644
index 54dbcdd74..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_hookshot.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Hookshot -->
-    <File Name="object_gi_hookshot" Segment="6">
-
-        <!-- Hookshot Display Lists -->
-        <DList Name="gGiHookshotDL" Offset="0xA10" />
-        <DList Name="gGiHookshotEmptyDL" Offset="0xE48" />
-
-        <!-- Hookshot Textures -->
-        <Texture Name="gGiHookshot1Tex" OutName="gi_hookshot_1" Format="i8" Width="32" Height="32" Offset="0xE50" />
-        <Texture Name="gGiHookshot2Tex" OutName="gi_hookshot_2" Format="i4" Width="32" Height="32" Offset="0x1250" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_insect.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_insect.xml
deleted file mode 100644
index bba46991d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_insect.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bug Container (inside a bottle) -->
-    <File Name="object_gi_insect" Segment="6">
-
-        <!-- Bug Container Display Lists -->
-        <DList Name="gGiBugContainerContentsDL" Offset="0x830" /> <!-- bug, green cover, handle -->
-        <DList Name="gGiBugContainerGlassDL" Offset="0xB20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_key.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_key.xml
deleted file mode 100644
index 2f4511f1d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_key.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Dungeon Small Key -->
-    <File Name="object_gi_key" Segment="6">
-
-        <!-- Dungeon Small Key Display Lists -->
-        <DList Name="gGiSmallKeyDL" Offset="0x800" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_ki_tan_mask.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_ki_tan_mask.xml
deleted file mode 100644
index 3898630da..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_ki_tan_mask.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Keaton Mask -->
-    <File Name="object_gi_ki_tan_mask" Segment="6">
-
-        <!-- Keaton Mask Textures -->
-        <Texture Name="gGiKeatonMaskEyeTex" OutName="gi_keaton_mask_eye" Format="ia8" Width="8" Height="32" Offset="0x0" />
-
-        <!-- Keaton Mask Display Lists -->
-        <DList Name="gGiKeatonMaskDL" Offset="0xAC0" />
-        <DList Name="gGiKeatonMaskEyesDL" Offset="0xD50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_liquid.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_liquid.xml
deleted file mode 100644
index ed26c4267..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_liquid.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Potion Containers (refills) -->
-    <File Name="object_gi_liquid" Segment="6">
-
-        <!-- Potion Containers Textures -->
-        <Texture Name="gGiPotionContainerGreenPatternTex" OutName="gi_potion_container_green_pattern" Format="ia8" Width="16" Height="32" Offset="0x0" />
-        <Texture Name="gGiPotionContainerRedPatternTex" OutName="gi_potion_container_red_pattern" Format="ia8" Width="16" Height="32" Offset="0x200" />
-        <Texture Name="gGiPotionContainerBluePatternTex" OutName="gi_potion_container_blue_pattern" Format="ia8" Width="16" Height="32" Offset="0x400" />
-
-        <!-- Potion Containers Color Display Lists -->
-        <DList Name="gGiPotionContainerGreenPotColorDL" Offset="0x1270" />
-        <DList Name="gGiPotionContainerRedPotColorDL" Offset="0x1290" />
-        <DList Name="gGiPotionContainerBluePotColorDL" Offset="0x12B0" />
-        <DList Name="gGiPotionContainerGreenLiquidColorDL" Offset="0x12D0" />
-        <DList Name="gGiPotionContainerRedLiquidColorDL" Offset="0x12F0" />
-        <DList Name="gGiPotionContainerBlueLiquidColorDL" Offset="0x1310" />
-        <DList Name="gGiPotionContainerGreenPatternColorDL" Offset="0x1330" />
-        <DList Name="gGiPotionContainerRedPatternColorDL" Offset="0x1388" />
-        <DList Name="gGiPotionContainerBluePatternColorDL" Offset="0x13E0" />
-
-        <!-- Potion Containers Common Display Lists -->
-        <DList Name="gGiPotionContainerPotDL" Offset="0x1438" />
-        <DList Name="gGiPotionContainerLiquidDL" Offset="0x1790" />
-        <DList Name="gGiPotionContainerPatternDL" Offset="0x1848" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_loach.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_loach.xml
deleted file mode 100644
index 4ffcbfe73..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_loach.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Hylian Loach (not inside a bottle) -->
-    <File Name="object_gi_loach" Segment="6">
-
-        <!-- Hylian Loach Display Lists -->
-        <DList Name="gGiHylianLoachDL" Offset="0x7F0" />
-        <DList Name="gGiHylianLoachEmptyDL" Offset="0xD30" />
-
-        <!-- Hylian Loach Textures -->
-        <Texture Name="gGiHylianLoachBodyTex" OutName="gi_hylian_loach_body" Format="i8" Width="32" Height="32" Offset="0xD38" />
-        <Texture Name="gGiHylianLoachSideFinTex" OutName="gi_hylian_loach_side_fin" Format="ia8" Width="16" Height="16" Offset="0x1138" />
-        <Texture Name="gGiHylianLoachBackFinTex" OutName="gi_hylian_loach_back_fin" Format="ia8" Width="16" Height="16" Offset="0x1238" />
-        <Texture Name="gGiHylianLoachEyeTex" OutName="gi_hylian_loach_eye" Format="ia8" Width="16" Height="16" Offset="0x1338" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_longsword.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_longsword.xml
deleted file mode 100644
index 5385b9639..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_longsword.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Biggoron Sword (remnant of OoT) -->
-    <File Name="object_gi_longsword" Segment="6">
-
-        <!-- Biggoron Sword Display Lists -->
-        <DList Name="gGiBiggoronSwordDL" Offset="0x600" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_m_arrow.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_m_arrow.xml
deleted file mode 100644
index 595ad25d6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_m_arrow.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Magic Arrow -->
-    <File Name="object_gi_m_arrow" Segment="6">
-
-    <!-- Magic Arrow Color Display Lists -->
-        <DList Name="gGiMagicArrowFireColorDL" Offset="0xCA0" />
-        <DList Name="gGiMagicArrowIceColorDL" Offset="0xCC0" />
-        <DList Name="gGiMagicArrowLightColorDL" Offset="0xCE0" />
-
-        <!-- Magic Arrow Common Display Lists -->
-        <DList Name="gGiMagicArrowAmmoDL" Offset="0xAE0" /> <!-- the arrow itself -->
-        <DList Name="gGiMagicArrowGlowDL" Offset="0xD00" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_magicmushroom.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_magicmushroom.xml
deleted file mode 100644
index 1d26dfa63..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_magicmushroom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Magic Mushroom -->
-    <File Name="object_gi_magicmushroom" Segment="6">
-
-        <!-- Magic Mushroom Display Lists -->
-        <DList Name="gGiMagicMushroomDL" Offset="0x640" />
-        <DList Name="gGiMagicMushroomEmptyDL" Offset="0x958" />
-
-        <!-- Magic Mushroom Textures -->
-        <Texture Name="gGiMagicMushroomPinkBackgroundTex" OutName="gi_mushroom_pink_background" Format="i4" Width="16" Height="16" Offset="0x960" />
-        <Texture Name="gGiMagicMushroomBluePatternTex" OutName="gi_mushroom_blue_pattern" Format="i4" Width="32" Height="32" Offset="0x9E0" />
-        <Texture Name="gGiMagicMushroomStemTex" OutName="gi_mushroom_stem" Format="i4" Width="32" Height="32" Offset="0xBE0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_magicpot.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_magicpot.xml
deleted file mode 100644
index 459f010f4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_magicpot.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Magic Jar -->
-    <File Name="object_gi_magicpot" Segment="6">
-
-        <!-- Magic Jar Display Lists -->
-        <DList Name="gGiMagicJarSmallDL" Offset="0x580" />
-        <DList Name="gGiMagicJarLargeDL" Offset="0xEE0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_map.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_map.xml
deleted file mode 100644
index c0cb2e070..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_map.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Dungeon Map and Stone of Agony -->
-    <File Name="object_gi_map" Segment="6">
-
-        <!-- Dungeon Map Display Lists -->
-        <DList Name="gGiDungeonMapDL" Offset="0x3C0" />
-
-        <!-- Stone of Agony Display Lists -->
-        <DList Name="gGiStoneOfAgonyDL" Offset="0xB70" /> <!-- remnant of OoT -->
-
-        <!-- Dungeon Map Textures -->
-        <Texture Name="gGiDungeonMapInscriptionsTex" OutName="gi_dungeon_map_inscriptions" Format="i8" Width="32" Height="32" Offset="0xD60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask03.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask03.xml
deleted file mode 100644
index 3bc62ba8e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask03.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Fierce Deity Mask -->
-    <File Name="object_gi_mask03" Segment="6">
-
-        <!-- Fierce Deity Mask Display Lists -->
-        <DList Name="gGiFierceDeityMaskHairAndHatDL" Offset="0x9B0" />
-        <DList Name="gGiFierceDeityMaskFaceDL" Offset="0xB90" />
-
-        <!-- Fierce Deity Mask TLUTs -->
-        <Texture Name="gGiFierceDeityMaskMouthAndEarTLUT" OutName="gi_fierce_deity_mask_mouth_and_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF70" />
-        <Texture Name="gGiFierceDeityMaskEyeTLUT" OutName="gi_fierce_deity_mask_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1170" />
-
-        <!-- Fierce Deity Mask Textures -->
-        <Texture Name="gGiFierceDeityMaskMouthTex" OutName="gi_fierce_deity_mask_mouth" Format="ci8" Width="32" Height="16" Offset="0x1370" />
-        <Texture Name="gGiFierceDeityMaskEarTex" OutName="gi_fierce_deity_mask_ear" Format="ci8" Width="16" Height="16" Offset="0x1570" />
-        <Texture Name="gGiFierceDeityMaskEyeTex" OutName="gi_fierce_deity_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1670" />
-        <Texture Name="gGiFierceDeityMaskHatTex" OutName="gi_fierce_deity_mask_hat" Format="i8" Width="8" Height="8" Offset="0x1A70" />
-        <Texture Name="gGiFierceDeityMaskHairTex" OutName="gi_fierce_deity_mask_hair" Format="i8" Width="32" Height="32" Offset="0x1AB0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask05.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask05.xml
deleted file mode 100644
index c6bf0baad..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask05.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Kafei's Mask -->
-    <File Name="object_gi_mask05" Segment="6">
-
-        <!-- Kafei's Mask Display Lists -->
-        <DList Name="gGiKafeiMaskEmptyDL" Offset="0x1040" />
-        <DList Name="gGiKafeiMaskDL" Offset="0x1048" />
-
-        <!-- Kafei's Mask TLUTs -->
-        <Texture Name="gGiKafeiMaskTLUT" OutName="gi_kafei_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1638" />
-
-        <!-- Kafei's Mask Textures -->
-        <Texture Name="gGiKafeiMaskLowerHairTex" OutName="gi_kafei_mask_lower_hair" Format="ci8" Width="8" Height="16" Offset="0x1838" />
-        <Texture Name="gGiKafeiMaskUpperHairTex" OutName="gi_kafei_mask_upper_hair" Format="ci8" Width="8" Height="16" Offset="0x18B8" />
-        <Texture Name="gGiKafeiMaskEyeMouthTex" OutName="gi_kafei_mask_eye_mouth" Format="ci8" Width="16" Height="16" Offset="0x1938" />
-        <Texture Name="gGiKafeiMaskEyebrowTex" OutName="gi_kafei_mask_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x1A38" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask06.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask06.xml
deleted file mode 100644
index 7d24b1d92..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask06.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <!-- Get Item Draw: All Night's Mask -->
-    <File Name="object_gi_mask06" Segment="6">
-
-        <!-- All Night's Mask Display Lists -->
-        <DList Name="gGiAllNightMaskFaceDL" Offset="0x6F0" />
-        <DList Name="gGiAllNightMaskEyesDL" Offset="0x968" />
-
-        <!-- All Night's Mask TLUT -->
-        <Texture Name="gGiAllNightMaskEyeTLUT" OutName="gi_all_night_mask_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAD8" />
-
-        <!-- All Night's Mask Textures -->
-        <Texture Name="gGiAllNightMaskEyeTex" OutName="gi_all_night_mask_eye" Format="ci8" Width="32" Height="32" Offset="0xCD8" />
-        <Texture Name="gGiAllNightMaskFacePattern1Tex" OutName="gi_all_night_mask_face_pattern_1" Format="i8" Width="32" Height="32" Offset="0x10D8" />
-        <Texture Name="gGiAllNightMaskFacePattern2Tex" OutName="gi_all_night_mask_face_pattern_2" Format="i4" Width="64" Height="32" Offset="0x14D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask09.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask09.xml
deleted file mode 100644
index 76efc6922..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask09.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Garo's Mask -->
-    <File Name="object_gi_mask09" Segment="6">
-
-        <!-- Garo's Mask Display Lists -->
-        <DList Name="gGiGarosMaskFaceDL" Offset="0x7A0" />
-        <DList Name="gGiGarosMaskCloakDL" Offset="0x8F0" />
-
-        <!-- Garo's Mask TLUT -->
-        <Texture Name="gGiGarosMaskCloakTLUT" OutName="gi_garos_mask_cloak_tlut" Format="rgba16" Width="16" Height="16" Offset="0xDA0" />
-
-        <!-- Garo's Mask Texture -->
-        <Texture Name="gGiGarosMaskEyeTex" OutName="gi_garo_mask_eye" Format="i8" Width="16" Height="16" Offset="0xFA0" />
-        <Texture Name="gGiGarosMaskUpperSidePatternTex" OutName="gi_garo_mask_upper_side_pattern" Format="ci8" Width="16" Height="8" Offset="0x10A0" />
-        <Texture Name="gGiGarosMaskFrontPatternTex" OutName="gi_garo_mask_front_pattern" Format="ci8" Width="16" Height="32" Offset="0x1120" />
-        <Texture Name="gGiGarosMaskLowerSidePatternTex" OutName="gi_garo_mask_lower_side_pattern" Format="ci8" Width="32" Height="32" Offset="0x1320" />
-        <Texture Name="gGiGarosMaskTopPatternTex" OutName="gi_garo_mask_top_pattern" Format="ci8" Width="8" Height="8" Offset="0x1720" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask10.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask10.xml
deleted file mode 100644
index e7083f94b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask10.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Romani's Mask -->
-    <File Name="object_gi_mask10" Segment="6">
-
-        <!-- Romani's Mask Display Lists -->
-        <DList Name="gGiRomaniMaskNoseEyeDL" Offset="0xA30" />
-        <DList Name="gGiRomaniMaskCapDL" Offset="0xB60" />
-
-        <!-- Romani's Mask Textures -->
-        <Texture Name="gGiRomaniMaskSpotsTex" OutName="gi_romani_mask_spots" Format="i8" Width="32" Height="64" Offset="0xF38" />
-        <Texture Name="gGiRomaniMaskPlainTex" OutName="gi_romani_mask_plain" Format="i8" Width="16" Height="8" Offset="0x1738" />
-        <Texture Name="gGiRomaniMaskNoseTex" OutName="gi_romani_mask_nose" Format="ia8" Width="16" Height="16" Offset="0x17B8" />
-        <Texture Name="gGiRomaniMaskEyeTex" OutName="gi_romani_mask_eye" Format="ia8" Width="32" Height="32" Offset="0x18B8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask11.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask11.xml
deleted file mode 100644
index e7b175b4d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask11.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Circus Leader Mask -->
-    <File Name="object_gi_mask11" Segment="6">
-
-        <!-- Circus Leader Mask Display Lists -->
-        <DList Name="gGiCircusLeaderMaskEyebrowsDL" Offset="0xB50" />
-        <DList Name="gGiCircusLeaderMaskFaceDL" Offset="0xC00" />
-
-        <!-- Circus Leader Mask TLUTs -->
-        <Texture Name="gGiCircusLeaderMaskFaceTLUT" OutName="gi_circus_leader_mask_face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x11D0" />
-
-        <!-- Circus Leader Mask Textures -->
-        <Texture Name="gGiCircusLeaderMaskEyebrowTex" OutName="gi_circus_leader_mask_eyebrow" Format="rgba32" Width="16" Height="16" Offset="0x13D0" />
-        <Texture Name="gGiCircusLeaderMaskHairTex" OutName="gi_circus_leader_mask_hair" Format="ci8" Width="8" Height="8" Offset="0x17D0" />
-        <Texture Name="gGiCircusLeaderMaskEarTex" OutName="gi_circus_leader_mask_ear" Format="ci8" Width="8" Height="8" Offset="0x1810" />
-        <Texture Name="gGiCircusLeaderMaskEyeTex" OutName="gi_circus_leader_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1850" />
-        <Texture Name="gGiCircusLeaderMaskHairlineTex" OutName="gi_circus_leader_mask_hairline" Format="ci8" Width="16" Height="16" Offset="0x1C50" />
-        <Texture Name="gGiCircusLeaderMaskSideBurnTex" OutName="gi_circus_leader_mask_sideburn" Format="ci8" Width="16" Height="16" Offset="0x1D50" />
-        <Texture Name="gGiCircusLeaderMaskSkinTex" OutName="gi_circus_leader_mask_skin" Format="ci8" Width="8" Height="8" Offset="0x1E50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask12.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask12.xml
deleted file mode 100644
index 2f1508b9d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Postman's Hat -->
-    <File Name="object_gi_mask12" Segment="6">
-
-        <!-- Postman's Hat Display Lists -->
-        <DList Name="gGiPostmanHatBunnyLogoDL" Offset="0x570" />
-        <DList Name="gGiPostmanHatCapDL" Offset="0x608" />
-
-        <!-- Postman's Hat Textures -->
-        <Texture Name="gGiPostmanHatBunnyLogoTex" OutName="gi_postman_hat_bunny_logo" Format="ia8" Width="32" Height="32" Offset="0x900" />
-        <Texture Name="gGiPostmanHatCapTex" OutName="gi_postman_hat_cap" Format="i4" Width="32" Height="32" Offset="0xD00" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask13.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask13.xml
deleted file mode 100644
index 8f5e7bf8f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask13.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Couple's Mask -->
-    <File Name="object_gi_mask13" Segment="6">
-
-        <!-- Couple's Mask Display Lists -->
-        <DList Name="gGiCouplesMaskHalfDL" Offset="0x5A0" />
-        <DList Name="gGiCouplesMaskFullDL" Offset="0x6A0" />
-
-        <!-- Couple's Mask Display Lists -->
-        <Texture Name="gGiCouplesMaskLeftInscriptionTex" OutName="gi_couples_mask_left_inscription" Format="i8" Width="32" Height="64" Offset="0x900" />
-        <Texture Name="gGiCouplesMaskRightInscriptionTex" OutName="gi_couples_mask_right_inscription" Format="i4" Width="32" Height="64" Offset="0x1100" />
-        <Texture Name="gGiCouplesMaskBackgroundTex" OutName="gi_couples_mask_background" Format="i4" Width="16" Height="32" Offset="0x1500" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask14.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask14.xml
deleted file mode 100644
index 0b9b5be28..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask14.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Great Fairy Mask -->
-    <File Name="object_gi_mask14" Segment="6">
-
-        <!-- Great Fairy Mask Display Lists -->
-        <DList Name="gGiGreatFairyMaskLeavesDL" Offset="0xED0" />
-        <DList Name="gGiGreatFairyMaskFaceDL" Offset="0x1000" />
-
-        <!-- Great Fairy Mask Textures -->
-        <Texture Name="gGiGreatFairyMaskHairTex" OutName="gi_great_fairy_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x1300" />
-        <Texture Name="gGiGreatFairyMaskLeafTex" OutName="gi_great_fairy_mask_leaf" Format="ia8" Width="32" Height="16" Offset="0x1500" />
-        <Texture Name="gGiGreatFairyMaskEyeTex" OutName="gi_great_fairy_mask_eye" Format="rgba16" Width="24" Height="24" Offset="0x1700" />
-        <Texture Name="gGiGreatFairyMaskMouthTex" OutName="gi_great_fairy_mask_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1B80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask15.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask15.xml
deleted file mode 100644
index 1f29f1bef..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask15.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Gibdo Mask -->
-    <File Name="object_gi_mask15" Segment="6">
-
-        <!-- Gibdo Mask Display Lists -->
-        <DList Name="gGiGibdoMaskDL" Offset="0xB30" />
-        <DList Name="gGiGibdoMaskEmptyDL" Offset="0xF58" />
-
-        <!-- Gibdo Mask Textures -->
-        <Texture Name="gGiGibdoMaskWrapPattern1Tex" OutName="gi_gibdo_mask_wrap_pattern_1" Format="i8" Width="64" Height="32" Offset="0xF60" />
-        <Texture Name="gGiGibdoMaskWrapPattern2Tex" OutName="gi_gibdo_mask_wrap_pattern_2" Format="ia8" Width="32" Height="16" Offset="0x1760" />
-        <Texture Name="gGiGibdoMaskEyeTex" OutName="gi_gibdo_mask_eye" Format="ia8" Width="32" Height="16" Offset="0x1960" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask16.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask16.xml
deleted file mode 100644
index 4a0650cdd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask16.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Don Gero Mask -->
-    <File Name="object_gi_mask16" Segment="6">
-
-        <!-- Don Gero Mask Display Lists -->
-        <DList Name="gGiDonGeroMaskBodyDL" Offset="0x1040" />
-        <DList Name="gGiDonGeroMaskFaceDL" Offset="0x1438" />
-
-        <!-- Don Gero Mask Textures -->
-        <Texture Name="gGiDonGeroMaskToesTex" OutName="gi_don_gero_mask_toes" Format="ia8" Width="16" Height="32" Offset="0x1590" />
-        <Texture Name="gGiDonGeroMaskFrillsTex" OutName="gi_don_gero_mask_frills" Format="ia8" Width="32" Height="16" Offset="0x1790" />
-        <Texture Name="gGiDonGeroMaskEyeTex" OutName="gi_don_gero_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x1990" />
-        <Texture Name="gGiDonGeroMaskNostrilTex" OutName="gi_don_gero_mask_face" Format="rgba16" Width="16" Height="32" Offset="0x1B90" />
-        <Texture Name="gGiDonGeroMaskMouthTex" OutName="gi_don_gero_mask_mouth" Format="i4" Width="16" Height="8" Offset="0x1F90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask17.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask17.xml
deleted file mode 100644
index a4df99986..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask17.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Kamaro Mask -->
-    <File Name="object_gi_mask17" Segment="6">
-
-        <!-- Kamaro Mask Display Lists -->
-        <DList Name="gGiKamaroMaskEmptyDL" Offset="0xFD0" />
-        <DList Name="gGiKamaroMaskDL" Offset="0xFD8" />
-
-        <!-- Kamaro Mask TLUT -->
-        <Texture Name="gGiKamaroMaskTLUT" OutName="kamaro_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1650" />
-
-        <!-- Kamaro Mask Textures -->
-        <Texture Name="gGiKamaroMaskStitchesTex" OutName="gi_kamaro_mask_stitches" Format="ci8" Width="16" Height="16" Offset="0x1850" />
-        <Texture Name="gGiKamaroMaskEyeTex" OutName="gi_kamaro_mask_eye" Format="ci8" Width="16" Height="16" Offset="0x1950" />
-        <Texture Name="gGiKamaroMaskSpotTex" OutName="gi_kamaro_mask_spot" Format="ci8" Width="8" Height="8" Offset="0x1A50" />
-        <Texture Name="gGiKamaroMaskHairChinTex" OutName="gi_kamaro_mask_hair_chin" Format="ci8" Width="16" Height="16" Offset="0x1A90" />
-        <Texture Name="gGiKamaroMaskNoseEarTex" OutName="gi_kamaro_mask_nose_ear" Format="ci8" Width="8" Height="8" Offset="0x1B90" />
-        <Texture Name="gGiKamaroMaskPonytailTex" OutName="gi_kamaro_mask_ponytail" Format="ci8" Width="8" Height="16" Offset="0x1BD0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask18.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask18.xml
deleted file mode 100644
index ad0364290..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask18.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Captains Hat -->
-    <File Name="object_gi_mask18" Segment="6">
-
-        <!-- Captains Hat Display Lists -->
-        <DList Name="gGiCaptainsHatFaceDL" Offset="0xCF0" />
-        <DList Name="gGiCaptainsHatBodyDL" Offset="0xFA0" />
-
-        <!-- Captains Hat TLUT -->
-        <Texture Name="gGiCaptainsHatBodyTLUT" OutName="gi_captains_hat_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x12F8" />
-
-        <!-- Captains Hat Textures -->
-        <Texture Name="gGiCaptainsHatHoodTex" OutName="gi_captains_hat_hood" Format="ci8" Width="16" Height="16" Offset="0x14F8" />
-        <Texture Name="gGiCaptainsHatHandTex" OutName="gi_captains_hat_hand" Format="ci8" Width="8" Height="16" Offset="0x15F8" />
-        <Texture Name="gGiCaptainsHatArmTex" OutName="gi_captains_hat_arm" Format="ci8" Width="8" Height="8" Offset="0x1678" />
-        <Texture Name="gGiCaptainsHatRibTex" OutName="gi_captains_hat_rib" Format="rgba16" Width="8" Height="16" Offset="0x16B8" />
-        <Texture Name="gGiCaptainsHatFaceTex" OutName="gi_captains_hat_face" Format="i4" Width="16" Height="32" Offset="0x17B8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask20.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask20.xml
deleted file mode 100644
index f04bb157e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask20.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bremen Mask -->
-    <File Name="object_gi_mask20" Segment="6">
-
-        <!-- Bremen Mask Display Lists -->
-        <DList Name="gGiBremenMaskEmptyDL" Offset="0x800" />
-        <DList Name="gGiBremenMaskDL" Offset="0x808" />
-
-        <!-- Bremen Mask TLUTs -->
-        <Texture Name="gGiBremenMaskTLUT" OutName="gi_bremen_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC80" />
-
-        <!-- Bremen Mask Textures -->
-        <Texture Name="gGiBremenMaskFeathersTex" OutName="gi_bremen_mask_feathers" Format="ia8" Width="48" Height="24" Offset="0xE80" />
-        <Texture Name="gGiBremenMaskBeakBaseTex" OutName="gi_bremen_mask_beak_base" Format="ci8" Width="16" Height="16" Offset="0x1300" />
-        <Texture Name="gGiBremenMaskBeakNostrilTex" OutName="gi_bremen_mask_beak_nostril" Format="ci8" Width="8" Height="8" Offset="0x1400" />
-        <Texture Name="gGiBremenMaskEyeTex" OutName="gi_bremen_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1440" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask21.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask21.xml
deleted file mode 100644
index 4696963ad..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Blast Mask -->
-    <File Name="object_gi_mask21" Segment="6">
-
-        <!-- Blast Mask Display Lists -->
-        <DList Name="gGiBlastMaskDL" Offset="0x830" />
-        <DList Name="gGiBlastMaskEmptyDL" Offset="0xAA8" />
-
-        <!-- Blast Mask Textures -->
-        <Texture Name="gGiBlastMaskSkullTex" OutName="gi_blast_mask_skull" Format="i4" Width="64" Height="64" Offset="0xAB0" />
-        <Texture Name="gGiBlastMaskBombTex" OutName="gi_blast_mask_bomb" Format="i4" Width="16" Height="32" Offset="0x12B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask22.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask22.xml
deleted file mode 100644
index 54b0c5595..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask22.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Mask of Scents -->
-    <File Name="object_gi_mask22" Segment="6">
-
-        <!-- Mask of Scents Display Lists -->
-        <DList Name="gGiMaskOfScentsTeethDL" Offset="0x880" />
-        <DList Name="gGiMaskOfScentsFaceDL" Offset="0x918" />
-
-        <!-- Mask of Scents TLUTs -->
-        <Texture Name="gGiMaskOfScentsTLUT" OutName="gi_mask_of_scents_tlut" Format="rgba16" Width="16" Height="16" Offset="0xD58" />
-
-        <!-- Mask of Scents Textures -->
-        <Texture Name="gGiMaskOfScentsSpotTex" OutName="gi_mask_of_scents_spot" Format="ci8" Width="8" Height="8" Offset="0xF58" />
-        <Texture Name="gGiMaskOfScentsEyeShadowTex" OutName="gi_mask_of_scents_eye_shadow" Format="ci8" Width="16" Height="16" Offset="0xF98" />
-        <Texture Name="gGiMaskOfScentsNostrilTex" OutName="gi_mask_of_scents_nostril" Format="ci8" Width="16" Height="32" Offset="0x1098" />
-        <Texture Name="gGiMaskOfScentsMouthTex" OutName="gi_mask_of_scents_mouth" Format="ci8" Width="8" Height="8" Offset="0x1298" />
-        <Texture Name="gGiMaskOfScentsEyeTex" OutName="gi_mask_of_scents_eye" Format="rgba16" Width="16" Height="16" Offset="0x12D8" />
-        <Texture Name="gGiMaskOfScentsToothTex" OutName="gi_mask_of_scents_tooth" Format="i8" Width="16" Height="32" Offset="0x14D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask23.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask23.xml
deleted file mode 100644
index 6efa0147b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mask23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Giant's Mask -->
-    <File Name="object_gi_mask23" Segment="6">
-
-        <!-- Giant's Mask Display List -->
-        <DList Name="gGiGiantMaskDL" Offset="0x8C0" />
-        <DList Name="gGiGiantMaskEmptyDL" Offset="0xC00" />
-
-        <!-- Giant's Mask Textures -->
-        <Texture Name="gGiGiantMaskEyeTex" OutName="gi_giant_mask_eye" Format="i8" Width="32" Height="64" Offset="0xC08" />
-        <Texture Name="gGiGiantMaskMouthTex" OutName="gi_giant_mask_mouth" Format="i8" Width="24" Height="11" Offset="0x1408" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_melody.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_melody.xml
deleted file mode 100644
index 4d4696528..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_melody.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: OoT Songs -->
-    <File Name="object_gi_melody" Segment="6">
-
-        <!-- OoT Songs Display Lists -->
-        <DList Name="gGiMinuetColorDL" Offset="0xA80" />
-        <DList Name="gGiBoleroColorDL" Offset="0xA90" />
-        <DList Name="gGiSerenadeColorDL" Offset="0xAA0" />
-        <DList Name="gGiRequiemColorDL" Offset="0xAB0" />
-        <DList Name="gGiNocturneColorDL" Offset="0xAC0" />
-        <DList Name="gGiPreludeColorDL" Offset="0xAD0" />
-        <DList Name="gGiSongNoteDL" Offset="0xAE0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_milk.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_milk.xml
deleted file mode 100644
index 0e2c37efa..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_milk.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bottled Milk -->
-    <File Name="object_gi_milk" Segment="6">
-
-        <!-- Bottled Milk Textures -->
-        <Texture Name="gGiMilkBottleLabelTex" OutName="gi_milk_bottle_label" Format="i8" Width="72" Height="24" Offset="0x0" />
-
-        <!-- Bottled Milk Display Lists -->
-        <DList Name="gGiMilkBottleContentsDL" Offset="0x1060" /> <!-- Milk, Label, Cork -->
-        <DList Name="gGiMilkBottleGlassDL" Offset="0x1288" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mssa.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mssa.xml
deleted file mode 100644
index ce1ae8c42..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_mssa.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Sun Mask -->
-    <File Name="object_gi_mssa" Segment="6">
-
-        <!-- Sun Mask Display List -->
-        <DList Name="gGiSunMaskEyesSidePatternsDL" Offset="0xC00" /> <!-- Both the eyes and side patterns -->
-        <DList Name="gGiSunMaskFaceDL" Offset="0xDF0" />
-
-        <!-- Sun Mask Textures -->
-        <Texture Name="gGiSunMaskEyeTex" OutName="gi_sun_mask_eye" Format="i4" Width="16" Height="16" Offset="0x10F0" />
-        <Texture Name="gGiSunMaskSidePatternsTex" OutName="gi_sun_mask_side_patterns" Format="i4" Width="16" Height="16" Offset="0x1170" />
-        <Texture Name="gGiSunMaskFacePatternsTex" OutName="gi_sun_mask_face_patterns" Format="i4" Width="16" Height="16" Offset="0x11F0" />
-        <Texture Name="gGiSunMaskManeSwirlTex" OutName="gi_sun_mask_mane_swirl" Format="i4" Width="32" Height="32" Offset="0x1270" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_nuts.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_nuts.xml
deleted file mode 100644
index d142cc8bd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_nuts.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Deku Nut -->
-    <File Name="object_gi_nuts" Segment="6">
-
-        <!-- Deku Nut Textures -->
-        <Texture Name="gGiNutShellTex" OutName="gi_nut_shell" Format="i8" Width="32" Height="32" Offset="0x0" />
-
-        <!-- Deku Nut Display Lists -->
-        <DList Name="gGiNutDL" Offset="0xE90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_nutsmask.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_nutsmask.xml
deleted file mode 100644
index c6df5804a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_nutsmask.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Deku Mask -->
-    <File Name="object_gi_nutsmask" Segment="6">
-
-        <!-- Deku Mask Display Lists -->
-        <DList Name="gGiDekuMaskDL" Offset="0xB50" />
-        <DList Name="gGiDekuMaskEmptyDL" Offset="0xF20" />
-
-        <!-- Deku Mask Textures -->
-        <Texture Name="gGiDekuMaskHairTex" OutName="gi_deku_mask_hair" Format="i8" Width="32" Height="32" Offset="0xF28" />
-        <Texture Name="gGiDekuMaskFaceTex" OutName="gi_deku_mask_face" Format="i8" Width="16" Height="16" Offset="0x1328" />
-        <Texture Name="gGiDekuMaskEyeTex" OutName="gi_deku_mask_eye" Format="ia8" Width="64" Height="32" Offset="0x1428" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_ocarina.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_ocarina.xml
deleted file mode 100644
index 5856529e6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_ocarina.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Ocarina of Time -->
-    <File Name="object_gi_ocarina" Segment="6">
-
-        <!-- Ocarina of Time Textures -->
-        <Texture Name="gGiOcarinaOfTimeHoleTex" OutName="gi_ocarina_of_time_hole" Format="i8" Width="16" Height="16" Offset="0x0" />
-
-        <!-- Ocarina of Time Display Lists -->
-        <DList Name="gGiOcarinaOfTimeDL" Offset="0x8C0" />
-        <DList Name="gGiOcarinaOfTimeHolesDL" Offset="0xAF8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_purse.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_purse.xml
deleted file mode 100644
index d24da1add..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_purse.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Wallet -->
-    <File Name="object_gi_purse" Segment="6">
-
-        <!-- Wallet Textures -->
-        <Texture Name="gGiWalletTex" OutName="gi_wallet" Format="i8" Width="64" Height="64" Offset="0x0" />
-
-        <!-- Wallet Color Display Lists -->
-        <DList Name="gGiAdultWalletColorDL" Offset="0x1750" />
-        <DList Name="gGiGiantsWalletColorDL" Offset="0x1770" />
-        <DList Name="gGiAdultWalletRupeeOuterColorDL" Offset="0x1790" />
-        <DList Name="gGiAdultWalletStringColorDL" Offset="0x17B0" />
-        <DList Name="gGiAdultWalletRupeeInnerColorDL" Offset="0x17D0" />
-        <DList Name="gGiGiantsWalletRupeeOuterColorDL" Offset="0x17F0" />
-        <DList Name="gGiGiantsWalletStringColorDL" Offset="0x1810" />
-        <DList Name="gGiGiantsWalletRupeeInnerColorDL" Offset="0x1830" />
-
-        <!-- Wallet Common Display Lists -->
-        <DList Name="gGiWalletDL" Offset="0x1850" />
-        <DList Name="gGiWalletRupeeOuterDL" Offset="0x19A0" />
-        <DList Name="gGiWalletStringDL" Offset="0x1A28" />
-        <DList Name="gGiWalletRupeeInnerDL" Offset="0x1AD8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_rabit_mask.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_rabit_mask.xml
deleted file mode 100644
index 16f536976..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_rabit_mask.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Bunny Hood -->
-    <File Name="object_gi_rabit_mask" Segment="6">
-
-        <!-- Bunny Hood Textures -->
-        <Texture Name="gGiBunnyHoodEyeTex" OutName="gi_bunny_hood_eye" Format="ia8" Width="16" Height="16" Offset="0x0" />
-
-        <!-- Bunny Hood Display Lists -->
-        <DList Name="gGiBunnyHoodDL" Offset="0xBC0" />
-        <DList Name="gGiBunnyHoodEyesDL" Offset="0xE58" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve00.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve00.xml
deleted file mode 100644
index 3476ab719..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve00.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Moon's Tear -->
-    <File Name="object_gi_reserve00" Segment="6">
-
-        <!-- Moon's Tear Identity Mtx (unused) -->
-        <Mtx Name="gGiMoonsTearIdentityMtx" Offset="0xC40" />
-
-        <!-- Moon's Tear Display Lists -->
-        <DList Name="gGiMoonsTearGlowDL" Offset="0xC80" />
-        <DList Name="gGiMoonsTearItemDL" Offset="0xD78" />
-
-        <!-- Moon's Tear Textures -->
-        <Texture Name="gGiMoonsTearItem1Tex" OutName="gi_moons_tear_item_1" Format="i8" Width="32" Height="32" Offset="0x1048" />
-        <Texture Name="gGiMoonsTearItem2Tex" OutName="gi_moons_tear_item_2" Format="i8" Width="32" Height="32" Offset="0x1448" />
-        <Texture Name="gGiMoonsTearGlowTex" OutName="gi_moons_tear_glow" Format="i8" Width="32" Height="32" Offset="0x1848" />
-
-        <!-- Moon's Tear Texture Animation -->
-        <TextureAnimation Name="gGiMoonsTearTexAnim" Offset="0x1C60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve01.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve01.xml
deleted file mode 100644
index 5c6bb4d18..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve01.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Title Deeds -->
-    <File Name="object_gi_reserve01" Segment="6">
-
-        <!-- Title Deed Common Display Lists -->
-        <DList Name="gGiTitleDeedSealAndRibbonDL" Offset="0x600" />
-        <DList Name="gGiTitleDeedPaperDL" Offset="0x788" />
-        <DList Name="gGiTitleDeedEmptyDL" Offset="0xA08" />
-
-        <!-- Title Deed Color Display Lists -->
-        <DList Name="gGiTitleDeedLandColorDL" Offset="0x968" />
-        <DList Name="gGiTitleDeedSwampColorDL" Offset="0x990" />
-        <DList Name="gGiTitleDeedMountainColorDL" Offset="0x9B8" />
-        <DList Name="gGiTitleDeedOceanColorDL" Offset="0x9E0" />
-
-        <!-- Title Deed Textures -->
-        <Texture Name="gGiTitleDeedRightInscriptionsTex" OutName="gi_title_deed_right_inscriptions" Format="i8" Width="32" Height="32" Offset="0xA10" />
-        <Texture Name="gGiTitleDeedLeftInscriptionsTex" OutName="gi_title_deed_left_inscriptions" Format="i8" Width="32" Height="32" Offset="0xE10" />
-        <Texture Name="gGiTitleDeedSealAndRibbonTex" OutName="gi_title_deed_seal_and_ribbon" Format="i8" Width="32" Height="32" Offset="0x1210" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_b_00.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_b_00.xml
deleted file mode 100644
index 1e2c37821..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_b_00.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Room Key -->
-    <File Name="object_gi_reserve_b_00" Segment="6">
-
-        <!-- Room Key Display Lists -->
-        <DList Name="gGiRoomKeyDL" Offset="0x7D0" />
-        <DList Name="gGiRoomKeyEmptyDL" Offset="0xC20" />
-
-        <!-- Room Key Textures -->
-        <Texture Name="gGiRoomKeyInscriptionsTex" OutName="gi_room_key_inscriptions" Format="i4" Width="64" Height="16" Offset="0xC28" />
-        <Texture Name="gGiRoomKeyBackgroundTex" OutName="gi_room_key_background" Format="i4" Width="32" Height="32" Offset="0xE28" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_b_01.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_b_01.xml
deleted file mode 100644
index 2bd1b2af2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_b_01.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Letter to Mama -->
-    <File Name="object_gi_reserve_b_01" Segment="6">
-
-        <!-- Letter to Mama Display Lists -->
-        <DList Name="gGiLetterToMamaInscriptionsDL" Offset="0x820" />
-        <DList Name="gGiLetterToMamaEnvelopeLetterDL" Offset="0x948" />
-
-        <!-- Letter to Mama Textures -->
-        <Texture Name="gGiLetterToMamaPostalAddressTex" OutName="gi_letter_to_mama_postal_address" Format="i4" Width="32" Height="16" Offset="0xCD8" />
-        <Texture Name="gGiLetterToMamaStampTex" OutName="gi_letter_to_mama_stamp" Format="ia16" Width="24" Height="32" Offset="0xDD8" />
-        <Texture Name="gGiLetterToMamaPattern1Tex" OutName="gi_letter_to_mama_pattern_1" Format="i8" Width="16" Height="32" Offset="0x13D8" />
-        <Texture Name="gGiLetterToMamaPattern2Tex" OutName="gi_letter_to_mama_pattern_2" Format="i4" Width="16" Height="32" Offset="0x15D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_c_00.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_c_00.xml
deleted file mode 100644
index f9cca9676..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_c_00.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Letter To Kafei -->
-    <File Name="object_gi_reserve_c_00" Segment="6">
-
-        <!-- Letter To Kafei Display Lists -->
-        <DList Name="gGiLetterToKafeiInscriptionsDL" Offset="0x4A0" />
-        <DList Name="gGiLetterToKafeiEnvelopeLetterDL" Offset="0x5F0" />
-
-        <!-- Letter To Kafei Textures -->
-        <Texture Name="gGiLetterToKafeiLetterBackgroundTex" OutName="gi_letter_to_kafei_background" Format="i8" Width="16" Height="16" Offset="0x760" />
-        <Texture Name="gGiLetterToKafeiLetterInscriptionsTex" OutName="gi_letter_to_kafei_letter_inscriptions" Format="i4" Width="32" Height="8" Offset="0x860" />
-        <Texture Name="gGiLetterToKafeiEnvelopeInscriptionsTex" OutName="gi_letter_to_kafei_inscriptions" Format="i4" Width="128" Height="32" Offset="0x8E0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_c_01.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_c_01.xml
deleted file mode 100644
index b88f74df5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_reserve_c_01.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Pendant of Memories -->
-    <File Name="object_gi_reserve_c_01" Segment="6">
-
-        <!-- Pendant of Memories Display Lists -->
-        <DList Name="gGiPendantOfMemoriesDL" Offset="0x750" />
-        <DList Name="gGiPendantOfMemoriesEmptyDL" Offset="0xC78" />
-
-        <!-- Pendant of Memories Textures -->
-        <Texture Name="gGiPendantOfMemoriesBlankTex" OutName="gi_pendant_of_memories_blank" Format="i8" Width="16" Height="8" Offset="0xC80" />
-        <Texture Name="gGiPendantOfMemoriesBackgroundTex" OutName="gi_pendant_of_memories_background" Format="i4" Width="32" Height="32" Offset="0xD00" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_rupy.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_rupy.xml
deleted file mode 100644
index 98d5714d6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_rupy.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Rupee -->
-    <File Name="object_gi_rupy" Segment="6">
-
-        <!-- Rupee Color Display Lists -->
-        <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x4A0" />
-        <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x4C0" />
-        <DList Name="gGiRedRupeeInnerColorDL" Offset="0x4E0" />
-        <DList Name="gGiPurpleRupeeInnerColorDL" Offset="0x500" />
-        <DList Name="gGiSilverRupeeInnerColorDL" Offset="0x520" />
-        <DList Name="gGiGoldRupeeInnerColorDL" Offset="0x540" />
-        <DList Name="gGiGreenRupeeOuterColorDL" Offset="0x560" />
-        <DList Name="gGiBlueRupeeOuterColorDL" Offset="0x580" />
-        <DList Name="gGiRedRupeeOuterColorDL" Offset="0x5A0" />
-        <DList Name="gGiPurpleRupeeOuterColorDL" Offset="0x5C0" />
-        <DList Name="gGiSilverRupeeOuterColorDL" Offset="0x5E0" />
-        <DList Name="gGiGoldRupeeOuterColorDL" Offset="0x600" />
-
-        <!-- Rupee Common Display Lists -->
-        <DList Name="gGiRupeeInnerDL" Offset="0x620" />
-        <DList Name="gGiRupeeOuterDL" Offset="0x730" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_schedule.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_schedule.xml
deleted file mode 100644
index 9350bdcc3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_schedule.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Bomber's Notebook -->
-    <File Name="object_gi_schedule" Segment="6">
-
-        <!-- Bomber's Notebook Display Lists -->
-        <DList Name="gGiBombersNotebookDL" Offset="0x6C0" />
-        <DList Name="gGiBombersNotebookEmptyDL" Offset="0xB78" />
-
-        <!-- Bomber's Notebook Textures -->
-        <Texture Name="gGiBombersNotebookPagesTex" OutName="gi_bombers_notebook_pages" Format="i4" Width="16" Height="8" Offset="0xB80" />
-        <Texture Name="gGiBombersNotebookCoverBorderTex" OutName="gi_bombers_notebook_cover_border" Format="i4" Width="64" Height="32" Offset="0xBC0" />
-        <Texture Name="gGiBombersNotebookCoverTex" OutName="gi_bombers_notebook_cover" Format="i8" Width="32" Height="32" Offset="0xFC0" />
-        <Texture Name="gGiBombersNotebookLabelTex" OutName="gi_bombers_notebook_label" Format="i4" Width="32" Height="64" Offset="0x13C0" />
-        <Texture Name="gGiBombersNotebookBindingsTex" OutName="gi_bombers_notebook_bindings" Format="i4" Width="16" Height="32" Offset="0x17C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_seahorse.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_seahorse.xml
deleted file mode 100644
index acc1e184d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_seahorse.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Seahorse (not inside a bottle) -->
-    <File Name="object_gi_seahorse" Segment="6">
-
-        <!-- Seahorse Billboard Mtx Rotation -->
-        <Mtx Name="gGiSeahorseBillboardRotMtx" Offset="0xA50" />
-
-        <!-- Seahorse Display Lists -->
-        <DList Name="gGiSeahorseGlowDL" Offset="0xA90" />
-        <DList Name="gGiSeahorseBodyDL" Offset="0xB20" />
-        <DList Name="gGiSeahorseEmptyDL" Offset="0xF08" />
-
-        <!-- Seahorse Textures -->
-        <Texture Name="gGiSeahorseEyeTex" OutName="gi_seahorse_eye" Format="ia8" Width="16" Height="8" Offset="0xF10" />
-        <Texture Name="gGiSeahorseGlowTex" OutName="gi_seahorse_glow" Format="i4" Width="16" Height="8" Offset="0xF90" />
-        <Texture Name="gGiSeahorseTorsoTailTex" OutName="gi_seahorse_torso_tail" Format="i8" Width="32" Height="32" Offset="0xFD0" />
-        <Texture Name="gGiSeahorseFinTex" OutName="gi_seahorse_fin" Format="ia8" Width="32" Height="32" Offset="0x13D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_shield_2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_shield_2.xml
deleted file mode 100644
index e3b990bcf..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_shield_2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Hero's Shield -->
-    <File Name="object_gi_shield_2" Segment="6">
-
-        <!-- Hero's Shield Display Lists -->
-        <DList Name="gGiHerosShieldDL" Offset="0x9F0" />
-        <DList Name="gGiHerosShieldEmblemDL" Offset="0xD28" />
-
-        <!-- Hero's Shield Textures -->
-        <Texture Name="gGiHerosShieldEmblem1Tex" OutName="gi_heros_shield_emblem_1" Format="i8" Width="32" Height="64" Offset="0xEB8" />
-        <Texture Name="gGiHerosShieldBase1Tex" OutName="gi_heros_shield_base_1" Format="i4" Width="16" Height="32" Offset="0x16B8" />
-        <Texture Name="gGiHerosShieldEmblem2Tex" OutName="gi_heros_shield_emblem_2" Format="i8" Width="32" Height="48" Offset="0x17B8" />
-        <Texture Name="gGiHerosShieldBase2Tex" OutName="gi_heros_shield_base_2" Format="i4" Width="16" Height="32" Offset="0x1DB8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_shield_3.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_shield_3.xml
deleted file mode 100644
index 19f23203b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_shield_3.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Mirror Shield -->
-    <File Name="object_gi_shield_3" Segment="6">
-
-        <!-- Mirror Shield Display Lists -->
-        <DList Name="gGiMirrorShieldDL" Offset="0x770" />
-        <DList Name="gGiMirrorShieldEmptyDL" Offset="0xBF8" />
-
-        <!-- Mirror Shield Textures -->
-        <Texture Name="gGiMirrorShieldHandleTex" OutName="gi_mirror_shield_handle" Format="i4" Width="32" Height="32" Offset="0xC00" />
-        <Texture Name="gGiMirrorShieldFaceSymbolTex" OutName="gi_mirror_shield_face_symbol" Format="i8" Width="32" Height="64" Offset="0xE00" />
-        <Texture Name="gGiMirrorShieldFaceBackgroundTex" OutName="gi_mirror_shield_face_background" Format="i8" Width="32" Height="32" Offset="0x1600" />
-        <Texture Name="gGiMirrorShieldPatternTex" OutName="gi_mirror_shield_pattern" Format="i4" Width="32" Height="32" Offset="0x1A00" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_soldout.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_soldout.xml
deleted file mode 100644
index 109a65072..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_soldout.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Soldout (unused) -->
-    <File Name="object_gi_soldout" Segment="6">
-
-        <!-- Soldout Textures -->
-        <Texture Name="gGiSoldOutTex" OutName="gi_sold_out" Format="ia8" Width="32" Height="32" Offset="0x0" />
-
-        <!-- Soldout Display Lists -->
-        <DList Name="gGiSoldOutDL" Offset="0x440" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_soul.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_soul.xml
deleted file mode 100644
index 942062535..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_soul.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Fairy Container (not using the cork bottle model) -->
-    <File Name="object_gi_soul" Segment="6">
-
-        <!-- Fairy Container Textures -->
-        <Texture Name="gGiFairyContainerFairyTex" OutName="gi_fairy_container_fairy" Format="i8" Width="32" Height="32" Offset="0x0" />
-
-        <!-- Fairy Container Display Lists -->
-        <DList Name="gGiFairyContainerBaseCapDL" Offset="0xBD0" />
-        <DList Name="gGiFairyContainerGlassDL" Offset="0xDB8" />
-        <DList Name="gGiFairyContainerContentsDL" Offset="0xEF0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_stick.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_stick.xml
deleted file mode 100644
index 859e4f641..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_stick.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Deku Stick -->
-    <File Name="object_gi_stick" Segment="6">
-
-        <!-- Deku Stick Display Lists -->
-        <DList Name="gGiStickDL" Offset="0x4D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_stonemask.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_stonemask.xml
deleted file mode 100644
index 497ace2df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_stonemask.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Stone Mask -->
-    <File Name="object_gi_stonemask" Segment="6">
-
-        <!-- Stone Mask Display Lists -->
-        <DList Name="gGiStoneMaskDL" Offset="0xA10" />
-        <DList Name="gGiStoneMaskEmptyDL" Offset="0xE48" />
-
-        <!-- Stone Mask Textures -->
-        <Texture Name="gGiStoneMaskFaceTex" OutName="gi_stone_mask_face" Format="i8" Width="16" Height="16" Offset="0xE50" />
-        <Texture Name="gGiStoneMaskEyeTex" OutName="gi_stone_mask_eye" Format="i8" Width="32" Height="32" Offset="0xF50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sutaru.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sutaru.xml
deleted file mode 100644
index 1a425dd2a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sutaru.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Skull Token -->
-    <File Name="object_gi_sutaru" Segment="6">
-
-        <!-- Skull Token Display Lists -->
-        <DList Name="gGiSkulltulaTokenDL" Offset="0x330" />
-        <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x438" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_1.xml
deleted file mode 100644
index 3f1bd41c0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_1.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Kokiri Sword -->
-    <File Name="object_gi_sword_1" Segment="6">
-
-        <!-- Kokiri Sword Display Lists -->
-        <DList Name="gGiKokiriSwordGuardDL" Offset="0x850" />
-        <DList Name="gGiKokiriSwordBladeHiltDL" Offset="0x998" />
-
-        <!-- Kokiri Sword Textures -->
-        <Texture Name="gGiKokiriSwordGuardTex" OutName="gi_kokiri_sword_guard" Format="i8" Width="8" Height="8" Offset="0xD58" />
-        <Texture Name="gGiKokiriSwordHiltTex" OutName="gi_kokiri_sword_hilt" Format="i8" Width="24" Height="24" Offset="0xD98" />
-        <Texture Name="gGiKokiriSwordBladeTex" OutName="gi_kokiri_sword_blade" Format="i8" Width="24" Height="24" Offset="0xFD8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_2.xml
deleted file mode 100644
index 6a2bb445b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Razor Sword -->
-    <File Name="object_gi_sword_2" Segment="6">
-
-        <!-- Razor Sword Display Lists -->
-        <DList Name="gGiRazorSwordEmptyDL" Offset="0xC00" />
-        <DList Name="gGiRazorSwordDL" Offset="0xC08" />
-
-        <!-- Razor Sword Textures -->
-        <Texture Name="gGiRazorSwordHiltTex" OutName="gi_razor_sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x1120" />
-        <Texture Name="gGiRazorSwordBladeTex" OutName="gi_razor_sword_blade" Format="rgba16" Width="16" Height="16" Offset="0x1320" />
-        <Texture Name="gGiRazorSwordSpotTex" OutName="gi_razor_sword_spot" Format="i8" Width="8" Height="8" Offset="0x1520" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_3.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_3.xml
deleted file mode 100644
index b347c33cf..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_3.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Gilded Sword -->
-    <File Name="object_gi_sword_3" Segment="6">
-
-        <!-- Gilded Sword Display Lists -->
-        <DList Name="gGiGildedSwordEmptyDL" Offset="0x9E0" />
-        <DList Name="gGiGildedSwordDL" Offset="0x9E8" />
-
-        <!-- Gilded Sword Textures -->
-        <Texture Name="gGiGildedSwordHiltTex" OutName="gi_gilded_sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0xF58" />
-        <Texture Name="gGiGildedSwordSpotTex" OutName="gi_gilded_sword_spot" Format="i8" Width="8" Height="8" Offset="0x1158" />
-        <Texture Name="gGiGildedSwordBladePommelTex" OutName="gi_gilded_sword_blade_pommel" Format="i8" Width="16" Height="16" Offset="0x1198" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_4.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_4.xml
deleted file mode 100644
index 082c27e2a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_sword_4.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Great Fairys Sword -->
-    <File Name="object_gi_sword_4" Segment="6">
-        
-        <!-- 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 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/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_truth_mask.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_truth_mask.xml
deleted file mode 100644
index cbc818cea..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_truth_mask.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Get Item Draw: Mask Of Truth -->
-    <File Name="object_gi_truth_mask" Segment="6">
-
-        <!-- Mask of Truth Textures -->
-        <Texture Name="gGiMaskOfTruthEyebrowTriangleTex" OutName="gi_mask_of_truth_eyebrow_triangle" Format="i8" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="gGiMaskOfTruthSideEtchingTex" OutName="gi_mask_of_truth_side_etching" Format="i8" Width="32" Height="32" Offset="0x400" />
-
-        <!-- Mask of Truth Display Lists -->
-        <DList Name="gGiMaskOfTruthDL" Offset="0x13D0" />
-        <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_zoramask.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_zoramask.xml
deleted file mode 100644
index 7deefdf71..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gi_zoramask.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Get Item Draw: Zora Mask -->
-    <File Name="object_gi_zoramask" Segment="6">
-
-        <!-- Zora Mask Display Lists -->
-        <DList Name="gGiZoraMaskDL" Offset="0x7D0" />
-        <DList Name="gGiZoraMaskEmptyDL" Offset="0xC10" />
-
-        <!-- Zora Mask Textures -->
-        <Texture Name="gGiZoraMaskNoseTex" OutName="gi_zora_mask_nose" Format="i8" Width="8" Height="8" Offset="0xC18" />
-        <Texture Name="gGiZoraMaskSpots1Tex" OutName="gi_zora_mask_spots_1" Format="i8" Width="16" Height="32" Offset="0xC58" />
-        <Texture Name="gGiZoraMaskEyeTex" OutName="gi_zora_mask_eye" Format="i8" Width="32" Height="32" Offset="0xE58" />
-        <Texture Name="gGiZoraMaskMouthTex" OutName="gi_zora_mask_mouth" Format="i8" Width="32" Height="32" Offset="0x1258" />
-        <Texture Name="gGiZoraMaskSpots2Tex" OutName="gi_zora_mask_spots_2" Format="i4" Width="16" Height="32" Offset="0x1658" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_giant.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_giant.xml
deleted file mode 100644
index 491cd0cb0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_giant.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<Root>
-    <!-- Object for the Four Giants -->
-    <File Name="object_giant" Segment="6">
-        <Animation Name="gGiantLargeStrideAnim" Offset="0x2168" /> <!-- Original name is "kya_testwalk" -->
-
-        <!-- Giant Body Vertices. Contains everything but the beard. -->
-        <Array Name="gGiantBodyVtx" Count="444" Offset="0x2180">
-            <Vtx/>
-        </Array>
-        
-        <!-- Giant Unused Beard Vertices. An exact duplicate of the beard vertices that are actually used. -->
-        <Array Name="gGiantUnusedBeardVtx" Count="9" Offset="0x3D40">
-            <Vtx/>
-        </Array>
-
-        <!-- Giant Limb DisplayLists -->
-        <DList Name="gGiantHeadDL" Offset="0x3DD0" />
-        <DList Name="gGiantRightThighDL" Offset="0x40C0" />
-        <DList Name="gGiantRightShinDL" Offset="0x4200" />
-        <DList Name="gGiantRightFootDL" Offset="0x4438" />
-        <DList Name="gGiantLeftThighDL" Offset="0x4560" />
-        <DList Name="gGiantLeftShinDL" Offset="0x46A0" />
-        <DList Name="gGiantLeftFootDL" Offset="0x48D8" />
-        <DList Name="gGiantRightShoulderDL" Offset="0x4A00" />
-        <DList Name="gGiantRightUpperArmDL" Offset="0x4B10" />
-        <DList Name="gGiantRightForearmDL" Offset="0x4C38" />
-        <DList Name="gGiantRightHandDL" Offset="0x4D58" />
-        <DList Name="gGiantLeftShoulderDL" Offset="0x4EC0" />
-        <DList Name="gGiantLeftUpperArmDL" Offset="0x4FD0" />
-        <DList Name="gGiantLeftForearmDL" Offset="0x50F8" />
-        <DList Name="gGiantLeftHandDL" Offset="0x5218" />
-
-        <!-- Giant Textures -->
-        <Texture Name="gGiantTLUT" OutName="giant_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5380" />
-        <Texture Name="gGiantFootTex" OutName="giant_foot" Format="ci8" Width="16" Height="16" Offset="0x5580" />
-        <Texture Name="gGiantShinTex" OutName="giant_shin" Format="ci8" Width="16" Height="16" Offset="0x5680" />
-        <Texture Name="gGiantForearmAndKneeTex" OutName="giant_forearm_and_knee" Format="ci8" Width="16" Height="16" Offset="0x5780" />
-        <Texture Name="gGiantUpperArmAndThighTex" OutName="giant_upper_arm_and_thigh" Format="ci8" Width="16" Height="16" Offset="0x5880" />
-        <Texture Name="gGiantHandTex" OutName="giant_hand" Format="ci8" Width="16" Height="16" Offset="0x5980" />
-        <Texture Name="gGiantFaceEyeOpenTex" OutName="giant_face_eye_open" Format="ci8" Width="32" Height="64" Offset="0x5A80" TlutOffset="0x5380" />
-        <Texture Name="gGiantFaceEyeHalfTex" OutName="giant_face_eye_half" Format="ci8" Width="32" Height="64" Offset="0x6280" TlutOffset="0x5380" />
-        <Texture Name="gGiantFaceEyeClosedTex" OutName="giant_face_eye_closed" Format="ci8" Width="32" Height="64" Offset="0x6A80" TlutOffset="0x5380" />
-        <Texture Name="gGiantGroinTex" OutName="giant_groin" Format="ci8" Width="16" Height="16" Offset="0x7280" />
-        <Texture Name="gGiantHairTex" OutName="giant_hair" Format="ci8" Width="16" Height="32" Offset="0x7380" />
-
-        <!-- Giant Beard Vertices, DisplayList, and Texture -->
-        <Array Name="gGiantBeardVtx" Count="9" Offset="0x7580">
-            <Vtx/>
-        </Array>
-        <DList Name="gGiantBeardDL" Offset="0x7610" />
-        <Texture Name="gGiantBeardTex" OutName="giant_beard" Format="rgba16" Width="16" Height="16" Offset="0x76C0" />
-
-        <!-- Giant Limbs -->
-        <Limb Name="gGiantHeadLimb" Type="Standard" EnumName="GIANT_LIMB_HEAD" Offset="0x78C0" />
-        <Limb Name="gGiantLeftThighLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_THIGH" Offset="0x78CC" />
-        <Limb Name="gGiantLeftShinLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_SHIN" Offset="0x78D8" />
-        <Limb Name="gGiantLeftFootLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_FOOT" Offset="0x78E4" />
-        <Limb Name="gGiantRightThighLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_THIGH" Offset="0x78F0" />
-        <Limb Name="gGiantRightShinLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_SHIN" Offset="0x78FC" />
-        <Limb Name="gGiantRightFootLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_FOOT" Offset="0x7908" />
-        <Limb Name="gGiantLeftShoulderLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_SHOULDER" Offset="0x7914" />
-        <Limb Name="gGiantLeftUpperArmLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_UPPER_ARM" Offset="0x7920" />
-        <Limb Name="gGiantLeftForearmLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_FOREARM" Offset="0x792C" />
-        <Limb Name="gGiantLeftHandLimb" Type="Standard" EnumName="GIANT_LIMB_LEFT_HAND" Offset="0x7938" />
-        <Limb Name="gGiantRightShoulderLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_SHOULDER" Offset="0x7944" />
-        <Limb Name="gGiantRightUpperArmLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_UPPER_ARM" Offset="0x7950" />
-        <Limb Name="gGiantRightForearmLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_FOREARM" Offset="0x795C" />
-        <Limb Name="gGiantRightHandLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_HAND" Offset="0x7968" />
-
-        <!-- Giant Skeleton -->
-        <Skeleton Name="gGiantSkel" Type="Flex" LimbType="Standard" LimbNone="GIANT_LIMB_NONE" LimbMax="GIANT_LIMB_MAX" EnumName="EnGiantLimb" Offset="0x79B0" />
-
-        <!-- Giant Animations -->
-        <Animation Name="gGiantLookUpStartAnim" Offset="0x8394" /> <!-- Original name is "kyo_kaoage" ("raising face") -->
-        <Animation Name="gGiantLookUpLoopAnim" Offset="0x96E4" /> <!-- Original name is "kyo_kaoage_loop" -->
-        <Animation Name="gGiantBigCallStartAnim" Offset="0xA1C4" /> <!-- Original name is "kyo_sakebi" ("cry"). Stretches his arms outward -->
-        <Animation Name="gGiantSmallCallStartAnim" Offset="0xACA4" /> <!-- Original name is "kyo_sakebi2" ("cry2"). Places his hands over his mouth -->
-        <Animation Name="gGiantSmallCallLoopAnim" Offset="0xB784" /> <!-- Original name is "kyo_sakebi2_loop" -->
-        <Animation Name="gGiantSmallCallEndAnim" Offset="0xC5D4" /> <!-- Original name is "kyo_sakebi2_modori" ("cry2 return") -->
-        <Animation Name="gGiantBigCallLoopAnim" Offset="0xD040" /> <!-- Original name is "kyo_sakebi_loop" -->
-        <Animation Name="gGiantBigCallEndAnim" Offset="0xDE84" /> <!-- Original name is "kyo_sakebi_modori" ("cry return") -->
-        <Animation Name="gGiantFallingOverAnim" Offset="0x102A4" /> <!-- Original name is "kyo_taoreru" ("falling over") -->
-        <Animation Name="gGiantRaisedArmsStartAnim" Offset="0x116E4" /> <!-- Original name is "kyo_teage" ("raising arm") -->
-        <Animation Name="gGiantRaisedArmsLoopAnim" Offset="0x12A38" /> <!-- Original name is "kyo_teage_loop" -->
-        <Animation Name="gGiantStruggleStartAnim" Offset="0x13004" /> <!-- Original name is "kyo_tukisasae" ("holding up the moon") -->
-        <Animation Name="gGiantStruggleLoopAnim" Offset="0x13FE8" /> <!-- Original name is "kyo_tukisasae_loop" -->
-        <Animation Name="gGiantIdleAnim" Offset="0x15334" /> <!-- Original name is "kyo_wait" -->
-        <Animation Name="gGiantWalkingAnim" Offset="0x17944" /> <!-- Original name is "kyo_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gk.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gk.xml
deleted file mode 100644
index 40abd45a2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gk.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Root>
-    <File Name="object_gk" Segment="6">
-        <DList Name="object_gk_DL_002E30" Offset="0x2E30" />
-        <DList Name="object_gk_DL_0031B0" Offset="0x31B0" />
-        <DList Name="object_gk_DL_0038B0" Offset="0x38B0" />
-        <DList Name="object_gk_DL_0039D0" Offset="0x39D0" />
-        <DList Name="object_gk_DL_003AC0" Offset="0x3AC0" />
-        <DList Name="object_gk_DL_003D60" Offset="0x3D60" />
-        <DList Name="object_gk_DL_003F68" Offset="0x3F68" />
-        <DList Name="object_gk_DL_004088" Offset="0x4088" />
-        <DList Name="object_gk_DL_004218" Offset="0x4218" />
-        <DList Name="object_gk_DL_004498" Offset="0x4498" />
-        <DList Name="object_gk_DL_0045B8" Offset="0x45B8" />
-        <DList Name="object_gk_DL_004748" Offset="0x4748" />
-        <DList Name="object_gk_DL_0047D8" Offset="0x47D8" />
-        <DList Name="object_gk_DL_0048C0" Offset="0x48C0" />
-        <DList Name="object_gk_DL_0049F0" Offset="0x49F0" />
-        <DList Name="object_gk_DL_004CB8" Offset="0x4CB8" />
-        <DList Name="object_gk_DL_004DA0" Offset="0x4DA0" />
-        <DList Name="object_gk_DL_004ED0" Offset="0x4ED0" />
-        <TextureAnimation Name="object_gk_Matanimheader_005144" Offset="0x5144" />
-        <Animation Name="object_gk_Anim_005EDC" Offset="0x5EDC" /> <!-- Original name is "gk_furafura" -->
-        <DList Name="object_gk_DL_006680" Offset="0x6680" />
-        <DList Name="object_gk_DL_006688" Offset="0x6688" /> <!-- Original name is "gk_iwa_obj_model" -->
-        <Animation Name="object_gk_Anim_00787C" Offset="0x787C" /> <!-- Oriignal name is "gk_naki" -->
-        <Limb Name="object_gk_Standardlimb_007890" Type="Standard" EnumName="OBJECT_GK_LIMB_01" Offset="0x7890" />
-        <Limb Name="object_gk_Standardlimb_00789C" Type="Standard" EnumName="OBJECT_GK_LIMB_02" Offset="0x789C" />
-        <Limb Name="object_gk_Standardlimb_0078A8" Type="Standard" EnumName="OBJECT_GK_LIMB_03" Offset="0x78A8" />
-        <Limb Name="object_gk_Standardlimb_0078B4" Type="Standard" EnumName="OBJECT_GK_LIMB_04" Offset="0x78B4" />
-        <Limb Name="object_gk_Standardlimb_0078C0" Type="Standard" EnumName="OBJECT_GK_LIMB_05" Offset="0x78C0" />
-        <Limb Name="object_gk_Standardlimb_0078CC" Type="Standard" EnumName="OBJECT_GK_LIMB_06" Offset="0x78CC" />
-        <Limb Name="object_gk_Standardlimb_0078D8" Type="Standard" EnumName="OBJECT_GK_LIMB_07" Offset="0x78D8" />
-        <Limb Name="object_gk_Standardlimb_0078E4" Type="Standard" EnumName="OBJECT_GK_LIMB_08" Offset="0x78E4" />
-        <Limb Name="object_gk_Standardlimb_0078F0" Type="Standard" EnumName="OBJECT_GK_LIMB_09" Offset="0x78F0" />
-        <Limb Name="object_gk_Standardlimb_0078FC" Type="Standard" EnumName="OBJECT_GK_LIMB_0A" Offset="0x78FC" />
-        <Limb Name="object_gk_Standardlimb_007908" Type="Standard" EnumName="OBJECT_GK_LIMB_0B" Offset="0x7908" />
-        <Limb Name="object_gk_Standardlimb_007914" Type="Standard" EnumName="OBJECT_GK_LIMB_0C" Offset="0x7914" />
-        <Limb Name="object_gk_Standardlimb_007920" Type="Standard" EnumName="OBJECT_GK_LIMB_0D" Offset="0x7920" />
-        <Limb Name="object_gk_Standardlimb_00792C" Type="Standard" EnumName="OBJECT_GK_LIMB_0E" Offset="0x792C" />
-        <Limb Name="object_gk_Standardlimb_007938" Type="Standard" EnumName="OBJECT_GK_LIMB_0F" Offset="0x7938" />
-        <Limb Name="object_gk_Standardlimb_007944" Type="Standard" EnumName="OBJECT_GK_LIMB_10" Offset="0x7944" />
-        <Limb Name="object_gk_Standardlimb_007950" Type="Standard" EnumName="OBJECT_GK_LIMB_11" Offset="0x7950" />
-        <Limb Name="object_gk_Standardlimb_00795C" Type="Standard" EnumName="OBJECT_GK_LIMB_12" Offset="0x795C" />
-        <Limb Name="object_gk_Standardlimb_007968" Type="Standard" EnumName="OBJECT_GK_LIMB_13" Offset="0x7968" />
-        <Skeleton Name="object_gk_Skel_0079C0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GK_LIMB_NONE" LimbMax="OBJECT_GK_LIMB_MAX" EnumName="ObjectGkLimb" Offset="0x79C0" />
-        <Animation Name="object_gk_Anim_007DC4" Offset="0x7DC4" /> <!-- Original name is "gk_sleep" -->
-        <Animation Name="object_gk_Anim_008774" Offset="0x8774" /> <!-- Original name is "gk_stand_wait" -->
-        <Animation Name="object_gk_Anim_0092C0" Offset="0x92C0" /> <!-- Original name is "gk_talk" -->
-        <Animation Name="object_gk_Anim_009638" Offset="0x9638" /> <!-- Original name is "gk_wait" -->
-        <Animation Name="object_gk_Anim_009858" Offset="0x9858" /> <!-- Original name is "gkid_dada" -->
-        <Animation Name="object_gk_Anim_009D88" Offset="0x9D88" /> <!-- Original name is "gkid_dada_loop" -->
-        <Animation Name="object_gk_Anim_00A21C" Offset="0xA21C" /> <!-- Original name is "gkid_dada_modori" -->
-        <Animation Name="object_gk_Anim_00AAEC" Offset="0xAAEC" /> <!-- Original name is "gkid_dakko" -->
-        <Animation Name="object_gk_Anim_00AE34" Offset="0xAE34" /> <!-- Original name is "gkid_run_loop" -->
-        <Animation Name="object_gk_Anim_00BD90" Offset="0xBD90" /> <!-- Original name is "gkid_utau" -->
-        <Animation Name="object_gk_Anim_00C308" Offset="0xC308" /> <!-- Original name is "gkid_utau_loop" -->
-        <Texture Name="object_gk_TLUT_00C320" OutName="tlut_00C320" Format="rgba16" Width="16" Height="16" Offset="0xC320" />
-        <!-- <Blob Name="object_gk_Blob_00C520" Size="0x1900" Offset="0xC520" /> -->
-        <Texture Name="object_gk_Tex_00DE20" OutName="tex_00DE20" Format="ci8" Width="8" Height="8" Offset="0xDE20" />
-        <Texture Name="object_gk_Tex_00DE60" OutName="tex_00DE60" Format="ci8" Width="16" Height="16" Offset="0xDE60" />
-        <Texture Name="object_gk_Tex_00DF60" OutName="tex_00DF60" Format="ci8" Width="16" Height="32" Offset="0xDF60" />
-        <Texture Name="object_gk_Tex_00E160" OutName="tex_00E160" Format="ci8" Width="32" Height="16" Offset="0xE160" />
-        <Texture Name="object_gk_Tex_00E360" OutName="tex_00E360" Format="ci8" Width="32" Height="32" Offset="0xE360" />
-        <Texture Name="object_gk_Tex_00E760" OutName="tex_00E760" Format="ci8" Width="8" Height="8" Offset="0xE760" />
-        <Texture Name="object_gk_Tex_00E7A0" OutName="tex_00E7A0" Format="ci8" Width="32" Height="64" Offset="0xE7A0" />
-        <Texture Name="object_gk_Tex_00EFA0" OutName="tex_00EFA0" Format="ci8" Width="16" Height="16" Offset="0xEFA0" />
-        <Texture Name="object_gk_Tex_00F0A0" OutName="tex_00F0A0" Format="ci8" Width="32" Height="32" Offset="0xF0A0" />
-        <Texture Name="object_gk_Tex_00F4A0" OutName="tex_00F4A0" Format="rgba16" Width="8" Height="8" Offset="0xF4A0" />
-        <Texture Name="object_gk_Tex_00F520" OutName="tex_00F520" Format="rgba16" Width="16" Height="16" Offset="0xF520" />
-        <Texture Name="object_gk_Tex_00F720" OutName="tex_00F720" Format="rgba16" Width="32" Height="32" Offset="0xF720" />
-        <Texture Name="object_gk_Tex_00FF20" OutName="tex_00FF20" Format="rgba16" Width="32" Height="32" Offset="0xFF20" />
-        <Texture Name="object_gk_Tex_010720" OutName="tex_010720" Format="rgba16" Width="32" Height="32" Offset="0x10720" />
-        <Texture Name="object_gk_Tex_010F20" OutName="tex_010F20" Format="rgba16" Width="32" Height="32" Offset="0x10F20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gla.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gla.xml
deleted file mode 100644
index 45da7754a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gla.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<Root>
-    <!-- object for the assets for ovl_En_Ge2 (Purple-clad Gerudo) -->
-    <File Name="object_gla" Segment="6">
-        <Animation Name="gGerudoPurpleRunningAwayCutsceneAnim" Offset="0x30C" /><!-- Original name is "g_yari_nigedasu" -->
-        <Animation Name="gGerudoPurpleGreatBayCutsceneAnim" Offset="0x460" /><!-- Original name is "g_yari_twister" -->
-
-        <!-- Identical to OoT's object_gla from here to the end -->
-        <Animation Name="gGerudoPurpleHorizontalSlashAnim" Offset="0x794" /><!-- Unused. Original name is "geldA_attack" -->
-        <Animation Name="gGerudoPurpleSlashToStandingAnim" Offset="0xBF0" /><!-- Usused. Original name is "geldA_attack_end" -->
-        <Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x1664" /><!-- Original name is "geldA_down" -->
-        <Animation Name="gGerudoPurpleStandingToCrouchAnim" Offset="0x1A40" /><!-- Unused. Original name is "geldA_find" -->
-        <Animation Name="gGerudoPurpleCrouchingLookAroundAnim" Offset="0x1FAC" /><!-- Unused. Original name is "geldA_find_wait" -->
-
-        <DList Name="gGerudoPurpleTorsoDL" Offset="0x39B0" />
-        <DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3E50" />
-        <DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3F88" />
-        <DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x4188" />
-        <DList Name="gGerudoPurpleRightForearmDL" Offset="0x42C0" />
-        <DList Name="gGerudoPurpleWaistDL" Offset="0x44C0" />
-        <DList Name="gGerudoPurpleRightThighDL" Offset="0x4658" />
-        <DList Name="gGerudoPurpleRightShinDL" Offset="0x4768" />
-        <DList Name="gGerudoPurpleLeftThighDL" Offset="0x4928" />
-        <DList Name="gGerudoPurpleLeftShinDL" Offset="0x4A38" />
-        <Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4BF8" />
-        <Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4DF8" TlutOffset="0x4BF8" />
-        <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x4E38" TlutOffset="0x4BF8" />
-        <Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4E78" TlutOffset="0x4BF8" />
-        <Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4F78" TlutOffset="0x4BF8" />
-        <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x5078" />
-        <Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x5178" />
-        <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x5328" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x5368" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x53E8" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleGlaiveGuardTex" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x57E8" />
-        <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x5828" />
-        <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x5928" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x59A8" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x59E8" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5DE8" />
-        <Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x5E68" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5F68" />
-        <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x6068" TlutOffset="0x5178" />
-        <DList Name="gGerudoPurpleRightHandDL" Offset="0x7DE8" />
-        <DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FA8" />
-        <DList Name="gGerudoPurpleLeftHandDL" Offset="0x8168" />
-        <DList Name="gGerudoPurpleLeftFootDL" Offset="0x82D0" />
-        <DList Name="gGerudoPurpleRightFootDL" Offset="0x8438" />
-        <DList Name="gGerudoPurpleVeilDL" Offset="0x8628" />
-        <DList Name="gGerudoPurplePonytailDL" Offset="0x86E0" />
-        <DList Name="gGerudoPurpleHeadDL" Offset="0x87D0" />
-        <Limb Name="gGerudoPurpleRootLimb" Type="Standard" EnumName="GERUDO_PURPLE_ROOT_LIMB" Offset="0x8C88" />
-        <Limb Name="gGerudoPurpleTorsoLimb" Type="Standard" EnumName="GERUDO_PURPLE_TORSO_LIMB" Offset="0x8C94" />
-        <Limb Name="gGerudoPurpleNeckLimb" Type="Standard" EnumName="GERUDO_PURPLE_NECK_LIMB" Offset="0x8CA0" />
-        <Limb Name="gGerudoPurplePonytailLimb" Type="Standard" EnumName="GERUDO_PURPLE_PONYTAIL_LIMB" Offset="0x8CAC" />
-        <Limb Name="gGerudoPurpleVeilLimb" Type="Standard" EnumName="GERUDO_PURPLE_VEIL_LIMB" Offset="0x8CB8" />
-        <Limb Name="gGerudoPurpleHeadLimb" Type="Standard" EnumName="GERUDO_PURPLE_HEAD_LIMB" Offset="0x8CC4" />
-        <Limb Name="gGerudoPurpleRightUpperArmLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_UPPER_ARM_LIMB" Offset="0x8CD0" />
-        <Limb Name="gGerudoPurpleRightForearmLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_FOREARM_LIMB" Offset="0x8CDC" />
-        <Limb Name="gGerudoPurpleRightWristLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_WRIST_LIMB" Offset="0x8CE8" />
-        <Limb Name="gGerudoPurpleRightHandLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_HAND_LIMB" Offset="0x8CF4" />
-        <Limb Name="gGerudoPurpleGlaiveLimb" Type="Standard" EnumName="GERUDO_PURPLE_GLAIVE_LIMB" Offset="0x8D00" />
-        <Limb Name="gGerudoPurpleLeftUpperArmLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_UPPER_ARM_LIMB" Offset="0x8D0C" />
-        <Limb Name="gGerudoPurpleLeftForearmLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_FOREARM_LIMB" Offset="0x8D18" />
-        <Limb Name="gGerudoPurpleLeftHandLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_HAND_LIMB" Offset="0x8D24" />
-        <Limb Name="gGerudoPurpleLeftThighLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_THIGH_LIMB" Offset="0x8D30" />
-        <Limb Name="gGerudoPurpleLeftShinLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_SHIN_LIMB" Offset="0x8D3C" />
-        <Limb Name="gGerudoPurpleLeftFootLimb" Type="Standard" EnumName="GERUDO_PURPLE_LEFT_FOOT_LIMB" Offset="0x8D48" />
-        <Limb Name="gGerudoPurpleRightThighLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_THIGH_LIMB" Offset="0x8D54" />
-        <Limb Name="gGerudoPurpleRightShinLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_SHIN_LIMB" Offset="0x8D60" />
-        <Limb Name="gGerudoPurpleRightFootLimb" Type="Standard" EnumName="GERUDO_PURPLE_RIGHT_FOOT_LIMB" Offset="0x8D6C" />
-        <Limb Name="gGerudoPurpleWaistLimb" Type="Standard" EnumName="GERUDO_PURPLE_WAIST_LIMB" Offset="0x8D78" />
-        <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" LimbNone="GERUDO_PURPLE_LIMB_NONE" LimbMax="GERUDO_PURPLE_LIMB_MAX" EnumName="GerudoPurpleLimb" Offset="0x8DD8" />
-
-        <Animation Name="gGerudoPurpleChargingAnim" Offset="0x91D0" /><!-- Original name is "geldA_run" -->
-        <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x9D1C" /><!-- Original name is "geldA_wait" -->
-        <Animation Name="gGerudoPurpleWalkingAnim" Offset="0xA344" /><!-- Original name is "geldA_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gm.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gm.xml
deleted file mode 100644
index 80edb8aeb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gm.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <!-- This file is empty -->
-    <File Name="object_gm" Segment="6">
-        <Blob Name="gGmEmptyBlob" Size="0x10" Offset="0x0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gmo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gmo.xml
deleted file mode 100644
index eaee120b3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gmo.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Assets for Nejiron -->
-    <File Name="object_gmo" Segment="6">
-        <Animation Name="gNejironIdleAnim" Offset="0x18" /> <!-- Original name might be "gm_default" -->
-        <DList Name="gNejironBodyDL" Offset="0xB70" />
-        <DList Name="gNejironEyesDL" Offset="0xE38" />
-        <Texture Name="gNejironBodyTLUT" OutName="nejiron_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0xEC8" />
-        <Texture Name="gNejironBodyTex" OutName="nejiron_body" Format="ci8" Width="32" Height="32" Offset="0x10C8" />
-        <Texture Name="gNejironEyeOpenTex" OutName="nejiron_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x14C8" />
-        <Texture Name="gNejironEyeHalfTex" OutName="nejiron_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x18C8" />
-        <Texture Name="gNejironEyeClosedTex" OutName="nejiron_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x1CC8" />
-        <Limb Name="gNejironBodyLimb" Type="Standard" EnumName="NEJIRON_LIMB_BODY" Offset="0x20C8" />
-        <Limb Name="gNejironEyeLimb" Type="Standard" EnumName="NEJIRON_LIMB_EYES" Offset="0x20D4" />
-        <Skeleton Name="gNejironSkel" Type="Normal" LimbType="Standard" LimbNone="NEJIRON_LIMB_NONE" LimbMax="NEJIRON_LIMB_MAX" EnumName="NejironLimb" Offset="0x20E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_goroiwa.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_goroiwa.xml
deleted file mode 100644
index df6aa04bb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_goroiwa.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="object_goroiwa" Segment="6">
-        <DList Name="object_goroiwa_DL_0003B0" Offset="0x3B0" /> <!-- Original name is "Z2_goron_hahenAT_model" -->
-        <Texture Name="object_goroiwa_Tex_000520" OutName="tex_000520" Format="rgba16" Width="32" Height="32" Offset="0x520" />
-        <Texture Name="object_goroiwa_Tex_000D20" OutName="tex_000D20" Format="rgba16" Width="32" Height="32" Offset="0xD20" />
-        <Texture Name="object_goroiwa_Tex_001520" OutName="tex_001520" Format="rgba16" Width="32" Height="64" Offset="0x1520" />
-        <DList Name="object_goroiwa_DL_0028E0" Offset="0x28E0" /> <!-- Original name is "Z2_goron_hahenBT_model" -->
-        <DList Name="object_goroiwa_DL_002D70" Offset="0x2D70" /> <!-- Original name is "Z2_goron_hahenCT_model" -->
-        <DList Name="object_goroiwa_DL_0032E0" Offset="0x32E0" /> <!-- Original name is "Z2_goron_halfAT_model" -->
-        <DList Name="object_goroiwa_DL_003B40" Offset="0x3B40" /> <!-- Original name is "Z2_gorongoroiwa_model" -->
-        <DList Name="object_goroiwa_DL_0042B0" Offset="0x42B0" /> <!-- Original name is "Z2_new_hahenA_model" -->
-        <DList Name="object_goroiwa_DL_004960" Offset="0x4960" /> <!-- Original name is "Z2_new_hahenB_model" -->
-        <DList Name="object_goroiwa_DL_004EF0" Offset="0x4EF0" /> <!-- Original name is "Z2_new_hahenC_model" -->
-        <DList Name="object_goroiwa_DL_005C20" Offset="0x5C20" /> <!-- Original name is "Z2_newgoroiwa_model" -->
-        <Texture Name="object_goroiwa_TLUT_005EE0" OutName="tlut_005EE0" Format="rgba16" Width="4" Height="4" Offset="0x5EE0" />
-        <Texture Name="object_goroiwa_TLUT_005F00" OutName="tlut_005F00" Format="rgba16" Width="4" Height="4" Offset="0x5F00" />
-        <Texture Name="object_goroiwa_Tex_005F20" OutName="tex_005F20" Format="ci4" Width="64" Height="64" Offset="0x5F20" />
-        <Texture Name="object_goroiwa_Tex_006720" OutName="tex_006720" Format="ci4" Width="64" Height="64" Offset="0x6720" />
-        <DList Name="object_goroiwa_DL_0072F0" Offset="0x72F0" /> <!-- Original name is "Z2_snow_hahenA_model" -->
-        <DList Name="object_goroiwa_DL_0077D0" Offset="0x77D0" /> <!-- Original name is "Z2_snow_hahenB_model" -->
-        <DList Name="object_goroiwa_DL_007C60" Offset="0x7C60" /> <!-- Original name is "Z2_snow_hahenC_model" -->
-        <DList Name="object_goroiwa_DL_0082D0" Offset="0x82D0" /> <!-- Original name is "Z2_snow_halfA_model" -->
-        <DList Name="object_goroiwa_DL_008B90" Offset="0x8B90" /> <!-- Original name is "Z2_snowgoroniwa_model" -->
-        <!-- <Blob Name="object_goroiwa_Blob_008D80" Size="0x20" Offset="0x8D80" /> -->
-        <Texture Name="object_goroiwa_Tex_008DA0" OutName="tex_008DA0" Format="rgba16" Width="32" Height="64" Offset="0x8DA0" />
-        <!-- <Blob Name="object_goroiwa_Blob_009DA0" Size="0x800" Offset="0x9DA0" /> -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_goronswitch.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_goronswitch.xml
deleted file mode 100644
index 2f7592664..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_goronswitch.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="object_goronswitch" Segment="6">
-        <DList Name="object_goronswitch_DL_000260" Offset="0x260" /> <!-- Original name is "i2_H_swit1_modelT" -->
-        <DList Name="object_goronswitch_DL_000268" Offset="0x268" /> <!-- Original name is "i2_H_swit1_model" -->
-        <Collision Name="object_goronswitch_Colheader_0005C8" Offset="0x5C8" /> <!-- Original name is "i2_h_swit1_bgdatainfo" -->
-        <DList Name="object_goronswitch_DL_0007D0" Offset="0x7D0" /> <!-- Original name is "i2_H_swit2_modelT" -->
-        <DList Name="object_goronswitch_DL_0007D8" Offset="0x7D8" /> <!-- Original name is "i2_H_swit2_model" -->
-        <Texture Name="object_goronswitch_TLUT_000970" OutName="tlut_000970" Format="rgba16" Width="4" Height="4" Offset="0x970" />
-        <Texture Name="object_goronswitch_TLUT_000990" OutName="tlut_000990" Format="rgba16" Width="4" Height="4" Offset="0x990" />
-        <Texture Name="object_goronswitch_Tex_0009B0" OutName="tex_0009B0" Format="i8" Width="64" Height="64" Offset="0x9B0" />
-        <Texture Name="object_goronswitch_Tex_0019B0" OutName="tex_0019B0" Format="ci4" Width="64" Height="64" Offset="0x19B0" />
-        <Texture Name="object_goronswitch_Tex_0021B0" OutName="tex_0021B0" Format="ci4" Width="64" Height="64" Offset="0x21B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_grasshopper.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_grasshopper.xml
deleted file mode 100644
index f08536c90..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_grasshopper.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<Root>
-    <!-- Assets for Dragonflies. -->
-    <File Name="object_grasshopper" Segment="6">
-        <!-- Dragonfly Animations -->
-        <Animation Name="gDragonflyAttackAnim" Offset="0x66C" /> <!-- Original name is "kdz_attack" -->
-        <Animation Name="gDragonflyDeadAnim" Offset="0x8D4" /> <!-- Original name is "kdz_dead_hit" -->
-        <Animation Name="gDragonflyFallAnim" Offset="0x9E0" /> <!-- Original name is "kdz_down" -->
-        <Animation Name="gDragonflyFlyAnim" Offset="0xF9C" /> <!-- Original name is "kdz_fly" -->
-
-        <!-- Dragonfly Textures -->
-        <Texture Name="gDragonflyMouthAndTailSegmentUndersideTex" OutName="dragonfly_mouth_and_tail_segment_underside" Format="rgba16" Width="8" Height="8" Offset="0xFB0" />
-        <Texture Name="gDragonflyTailBackTex" OutName="dragonfly_tail_back" Format="rgba16" Width="16" Height="32" Offset="0x1030" />
-        <Texture Name="gDragonflyThoraxBackAndLegsTex" OutName="dragonfly_thorax_back_and_legs" Format="rgba16" Width="16" Height="16" Offset="0x1430" />
-        <Texture Name="gDragonflyStripeTex" OutName="dragonfly_stripe" Format="rgba16" Width="8" Height="8" Offset="0x1630" />
-        <Texture Name="gDragonflyHeadAndTailTipTex" OutName="dragonfly_head_and_tail_tip" Format="rgba16" Width="32" Height="8" Offset="0x16B0" />
-        <Texture Name="gDragonflyThoraxSidesTex" OutName="dragonfly_thorax_sides" Format="rgba16" Width="16" Height="8" Offset="0x18B0" />
-        <Texture Name="gDragonflyWingTex" OutName="dragonfly_wing" Format="rgba16" Width="8" Height="8" Offset="0x19B0" />
-        <Texture Name="gDragonflyEyeTex" OutName="dragonfly_eye" Format="rgba16" Width="8" Height="8" Offset="0x1A30" />
-        <Texture Name="gDragonflyFaceTex" OutName="dragonfly_face" Format="rgba16" Width="16" Height="16" Offset="0x1AB0" />
-        
-        <!-- Dragonfly Limb DisplayLists -->
-        <DList Name="gDragonflyBackRightFootDL" Offset="0x2BE0" />
-        <DList Name="gDragonflyBackLeftLowerLegDL" Offset="0x2C70" />
-        <DList Name="gDragonflyBackRightLowerLegDL" Offset="0x2D00" />
-        <DList Name="gDragonflyFrontLeftUpperLegDL" Offset="0x2D90" />
-        <DList Name="gDragonflyFrontRightUpperLegDL" Offset="0x2E28" />
-        <DList Name="gDragonflyFrontLeftLowerLegDL" Offset="0x2EC0" />
-        <DList Name="gDragonflyFrontRightLowerLegDL" Offset="0x2F50" />
-        <DList Name="gDragonflyLeftWingDL" Offset="0x2FE0" />
-        <DList Name="gDragonflyRightWingDL" Offset="0x3078" />
-        <DList Name="gDragonflyBackRightUpperLegDL" Offset="0x3110" />
-        <DList Name="gDragonflyBackLeftUpperLegDL" Offset="0x31A8" />
-        <DList Name="gDragonflyTailTipDL" Offset="0x3240" />
-        <DList Name="gDragonflyTailSegment4DL" Offset="0x32E8" />
-        <DList Name="gDragonflyTailSegment3DL" Offset="0x33E0" />
-        <DList Name="gDragonflyTailSegment2DL" Offset="0x3520" />
-        <DList Name="gDragonflyTailSegment1DL" Offset="0x3660" />
-        <DList Name="gDragonflyThoraxDL" Offset="0x3798" />
-        <DList Name="gDragonflyJawDL" Offset="0x3900" />
-        <DList Name="gDragonflyHeadDL" Offset="0x39E0" />
-        <DList Name="gDragonflyBackLeftFootDL" Offset="0x3BE0" />
-        <DList Name="gDragonflyFrontLeftFootDL" Offset="0x3C70" />
-        <DList Name="gDragonflyFrontRightFootDL" Offset="0x3D00" />
-
-        <!-- Dragonfly Limbs -->
-        <Limb Name="gDragonflyRootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_ROOT" Offset="0x3D90" />
-        <Limb Name="gDragonflyTailSegment1Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_1" Offset="0x3D9C" />
-        <Limb Name="gDragonflyTailSegment2Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_2" Offset="0x3DA8" />
-        <Limb Name="gDragonflyTailSegment3Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_3" Offset="0x3DB4" />
-        <Limb Name="gDragonflyTailSegment4Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_4" Offset="0x3DC0" />
-        <Limb Name="gDragonflyTailTipLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_TIP" Offset="0x3DCC" />
-        <Limb Name="gDragonflyThoraxLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_THORAX" Offset="0x3DD8" />
-        <Limb Name="gDragonflyLeftWingLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_LEFT_WING" Offset="0x3DE4" />
-        <Limb Name="gDragonflyRightWingLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_RIGHT_WING" Offset="0x3DF0" />
-        <Limb Name="gDragonflyBackLeftUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_UPPER_LEG" Offset="0x3DFC" />
-        <Limb Name="gDragonflyBackLeftLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_LOWER_LEG" Offset="0x3E08" />
-        <Limb Name="gDragonflyBackLeftFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_FOOT" Offset="0x3E14" />
-        <Limb Name="gDragonflyBackRightUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_UPPER_LEG" Offset="0x3E20" />
-        <Limb Name="gDragonflyBackRightLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_LOWER_LEG" Offset="0x3E2C" />
-        <Limb Name="gDragonflyBackRightFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_FOOT" Offset="0x3E38" />
-        <Limb Name="gDragonflyFrontLeftUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x3E44" />
-        <Limb Name="gDragonflyFrontLeftLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x3E50" />
-        <Limb Name="gDragonflyFrontLeftFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_FOOT" Offset="0x3E5C" />
-        <Limb Name="gDragonflyFrontRightUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x3E68" />
-        <Limb Name="gDragonflyFrontRightLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x3E74" />
-        <Limb Name="gDragonflyFrontRightFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_FOOT" Offset="0x3E80" />
-        <Limb Name="gDragonflyHeadLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_HEAD" Offset="0x3E8C" />
-        <Limb Name="gDragonflyJawLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_JAW" Offset="0x3E98" />
-
-        <!-- Dragonfly Skeleton -->
-        <Skeleton Name="gDragonflySkel" Type="Normal" LimbType="Standard" LimbNone="DRAGONFLY_LIMB_NONE" LimbMax="DRAGONFLY_LIMB_MAX" EnumName="DragonflyLimb" Offset="0x3F00" />
-
-        <!-- Dragonfly Animations -->
-        <Animation Name="gDragonflyRaiseTailAnim" Offset="0x42F0" /> <!-- Original name is "kdz_hight" -->
-        <Animation Name="gDragonflyDamageAnim" Offset="0x47AC" /> <!-- Original name is "kdz_hit" -->
-        <Animation Name="gDragonflyLowerTailAnim" Offset="0x4BC8" /> <!-- Original name is "kdz_low" -->
-        <Animation Name="gDragonflyHoverAnim" Offset="0x524C" /> <!-- Original name is "kdz_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gs.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gs.xml
deleted file mode 100644
index eebe60035..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_gs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Assets for the Gossip Stones. -->
-    <File Name="object_gs" Segment="6">
-        <Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0" />
-        <DList Name="gGossipStoneMaterialDL" Offset="0x950" />
-        <DList Name="gGossipStoneDL" Offset="0x9D0" />
-        <DList Name="gGossipStoneBottomModelDL" Offset="0xA60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ha.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ha.xml
deleted file mode 100644
index 860b592df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ha.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<Root>
-    <!-- Assets for Cremia's Donkeys and Gorman Brothers' Horses -->
-    <File Name="object_ha" Segment="6">
-
-        <Animation Name="gHorseUnusedAnim" Offset="0xC4" /> <!-- Original name is "ha_default" -->
-
-        <!-- Gorman Brothers' Horses -->
-
-        <!-- Gorman Brothers' Horses' DLs -->
-
-        <DList Name="gHorseBanditRightHindFootDL" Offset="0x30C0" />
-        <DList Name="gHorseBanditRightHindCannonDL" Offset="0x3418" />
-        <DList Name="gHorseBanditRightHindStifleDL" Offset="0x35D8" />
-        <DList Name="gHorseBanditRightHindThighDL" Offset="0x37A8" />
-        <DList Name="gHorseBanditLeftHindFootDL" Offset="0x3A68" />
-        <DList Name="gHorseBanditLeftHindCannonDL" Offset="0x3DB8" />
-        <DList Name="gHorseBanditLeftHindStifleDL" Offset="0x3F78" />
-        <DList Name="gHorseBanditLeftHindThighDL" Offset="0x4150" />
-        <DList Name="gHorseBanditTailEndDL" Offset="0x44C0" />
-        <DList Name="gHorseBanditTailMiddleDL" Offset="0x4628" />
-        <DList Name="gHorseBanditTailDockDL" Offset="0x47A8" />
-        <DList Name="gHorseBanditPelvisDL" Offset="0x4880" />
-        <DList Name="gHorseBanditRightFrontFootDL" Offset="0x4CA8" />
-        <DList Name="gHorseBanditRightFrontCannonDL" Offset="0x5000" />
-        <DList Name="gHorseBanditRightFrontForearmDL" Offset="0x51C0" />
-        <DList Name="gHorseBanditRightFrontLegRootDL" Offset="0x5390" />
-        <DList Name="gHorseBanditHeadDL" Offset="0x5450" />
-        <DList Name="gHorseBanditUpperNeckDL" Offset="0x5E08" />
-        <DList Name="gHorseBanditLowerNeckDL" Offset="0x5F98" />
-        <DList Name="gHorseBanditLeftFrontFootDL" Offset="0x6220" />
-        <DList Name="gHorseBanditLeftFrontCannonDL" Offset="0x6538" />
-        <DList Name="gHorseBanditLeftFrontForearmDL" Offset="0x6708" />
-        <DList Name="gHorseBanditLeftFrontLegRootDL" Offset="0x68E8" />
-        <DList Name="gHorseBanditTorsoDL" Offset="0x69A8" />
-
-        <!-- Gorman Brothers' Horses' Textures -->
-
-        <Texture Name="gHorseBanditTLUT" OutName="horse_bandit_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6E58" />
-        <Texture Name="gHorseBanditMaskTex" OutName="horse_bandit_mask" Format="ci8" Width="16" Height="16" Offset="0x7058" />
-        <Texture Name="gHorseBanditSpottedDetailTex" OutName="horse_bandit_spotted_detail" Format="ci8" Width="16" Height="32" Offset="0x7158" />
-        <Texture Name="gHorseBanditEyebrowTex" OutName="horse_bandit_eyebrow" Format="rgba16" Width="16" Height="16" Offset="0x7358" />
-        <Texture Name="gHorseBanditTeethTex" OutName="horse_bandit_teeth" Format="ci8" Width="16" Height="16" Offset="0x7558" />
-        <Texture Name="gHorseBanditTailAndFeetTex" OutName="horse_bandit_tail_and_feet" Format="ci8" Width="16" Height="16" Offset="0x7658" />
-        <Texture Name="gHorseBanditEyeTex" OutName="horse_bandit_eye" Format="rgba16" Width="32" Height="32" Offset="0x7758" />
-        <Texture Name="gHorseBanditMouthTex" OutName="horse_bandit_mouth" Format="ci8" Width="32" Height="32" Offset="0x7F58" />
-        <Texture Name="gHorseBanditSpottedSkinTex" OutName="horse_bandit_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x8358" />
-        <Texture Name="gHorseBanditTasselTex" OutName="horse_bandit_tassel" Format="rgba16" Width="8" Height="16" Offset="0x8758" />
-        <Texture Name="gHorseBanditSaddleSideTex" OutName="horse_bandit_saddle_side" Format="ci8" Width="16" Height="16" Offset="0x8858" />
-        <Texture Name="gHorseBanditSaddleTopTex" OutName="horse_bandit_saddle_top" Format="ci8" Width="16" Height="16" Offset="0x8958" />
-        <Texture Name="gHorseBanditSaddleBackTex" OutName="horse_bandit_saddle_back" Format="ci8" Width="8" Height="16" Offset="0x8A58" />
-
-        <!-- Gorman Brothers' Horses' Limbs and Skel -->
-
-        <Limb Name="gHorseBanditRootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_ROOT" Offset="0x8AD8" />
-        <Limb Name="gHorseBanditPelvisLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_PELVIS" Offset="0x8AE4" />
-        <Limb Name="gHorseBanditTorsoLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_TORSO" Offset="0x8AF0" />
-        <Limb Name="gHorseBanditLeftFrontLegRootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_FRONT_LEG_ROOT" Offset="0x8AFC" />
-        <Limb Name="gHorseBanditLeftFrontForearmLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_FRONT_FOREARM" Offset="0x8B08" />
-        <Limb Name="gHorseBanditLeftFrontCannonLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_FRONT_CANNON" Offset="0x8B14" />
-        <Limb Name="gHorseBanditLeftFrontFootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_FRONT_FOOT" Offset="0x8B20" />
-        <Limb Name="gHorseBanditLowerNeckLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LOWER_NECK" Offset="0x8B2C" />
-        <Limb Name="gHorseBanditUpperNeckLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_UPPER_NECK" Offset="0x8B38" />
-        <Limb Name="gHorseBanditHeadLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_HEAD" Offset="0x8B44" />
-        <Limb Name="gHorseBanditRightFrontLegRootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_FRONT_LEG_ROOT" Offset="0x8B50" />
-        <Limb Name="gHorseBanditRightFrontForearmLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_FRONT_FOREARM" Offset="0x8B5C" />
-        <Limb Name="gHorseBanditRightFrontCannonLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_FRONT_CANNON" Offset="0x8B68" />
-        <Limb Name="gHorseBanditRightFrontFootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_FRONT_FOOT" Offset="0x8B74" />
-        <Limb Name="gHorseBanditTailDockLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_TAIL_DOCK" Offset="0x8B80" />
-        <Limb Name="gHorseBanditTailMiddleLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_TAIL_MIDDLE" Offset="0x8B8C" />
-        <Limb Name="gHorseBanditTailEndLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_TAIL_END" Offset="0x8B98" />
-        <Limb Name="gHorseBanditLeftHindThighLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_HIND_THIGH" Offset="0x8BA4" />
-        <Limb Name="gHorseBanditLeftHindStifleLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_HIND_STIFLE" Offset="0x8BB0" />
-        <Limb Name="gHorseBanditLeftHindCannonLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_HIND_CANNON" Offset="0x8BBC" />
-        <Limb Name="gHorseBanditLeftHindFootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_LEFT_HIND_FOOT" Offset="0x8BC8" />
-        <Limb Name="gHorseBanditRightHindThighLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_HIND_THIGH" Offset="0x8BD4" />
-        <Limb Name="gHorseBanditRightHindStifleLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_HIND_STIFLE" Offset="0x8BE0" />
-        <Limb Name="gHorseBanditRightHindCannonLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_HIND_CANNON" Offset="0x8BEC" />
-        <Limb Name="gHorseBanditRightHindFootLimb" Type="Standard" EnumName="HORSE_BANDIT_LIMB_RIGHT_HIND_FOOT" Offset="0x8BF8" />
-        <Skeleton Name="gHorseBanditSkel" Type="Flex" LimbType="Standard" LimbNone="HORSE_BANDIT_LIMB_NONE" LimbMax="HORSE_BANDIT_LIMB_MAX" EnumName="DonkeyBanditLimb" Offset="0x8C68" />
-
-        <!-- Horse/Donkey Animations -->
-
-        <Animation Name="gHorseGallopAnim" Offset="0x9208" /> <!-- Original name is "ha_fastrun" -->
-        <Animation Name="gHorseJumpLowAnim" Offset="0x9858" /> <!-- Original name is "ha_jump100" -->
-        <Animation Name="gHorseJumpHighAnim" Offset="0xA05C" /> <!-- Original name is "ha_jump200" -->
-        <Animation Name="gHorseTrotAnim" Offset="0xA650" /> <!-- Original name is "ha_slowrun" -->
-        <Animation Name="gHorseWhinnyAnim" Offset="0xB00C" /> <!-- Original name is "ha_stand" -->
-        <Animation Name="gHorseStopAnim" Offset="0xB9C8" /> <!-- Original name is "ha_stop" -->
-        <Animation Name="gHorseIdleAnim" Offset="0xC850" /> <!-- Original name is "ha_wait" -->
-        <Animation Name="gHorseShakeHeadAnim" Offset="0xCE70" /> <!-- Original name is "ha_wait02" -->
-        <Animation Name="gHorseWalkAnim" Offset="0xD648" /> <!-- Original name is "ha_walk" -->
-
-        <!-- Cremia's Donkey -->
-        
-        <!-- Cremia's Donkey DLs -->
-
-        <DList Name="gDonkeyRightHindFootDL" Offset="0x100B0" />
-        <DList Name="gDonkeyRightHindCannonDL" Offset="0x10258" />
-        <DList Name="gDonkeyRightHindStifleDL" Offset="0x103F0" />
-        <DList Name="gDonkeyRightHindThighDL" Offset="0x105C8" />
-        <DList Name="gDonkeyLeftHindFootDL" Offset="0x107A8" />
-        <DList Name="gDonkeyLeftHindCannonDL" Offset="0x10940" />
-        <DList Name="gDonkeyLeftHindStifleDL" Offset="0x10AE0" />
-        <DList Name="gDonkeyLeftHindThighDL" Offset="0x10CB8" />
-        <DList Name="gDonkeyTailEndDL" Offset="0x10E88" />
-        <DList Name="gDonkeyTailMiddleDL" Offset="0x10FE0" />
-        <DList Name="gDonkeyTailDockDL" Offset="0x11160" />
-        <DList Name="gDonkeyPelvisDL" Offset="0x11228" />
-        <DList Name="gDonkeyRightFrontFootDL" Offset="0x11378" />
-        <DList Name="gDonkeyRightFrontCannonDL" Offset="0x11518" />
-        <DList Name="gDonkeyRightFrontForearmDL" Offset="0x116A8" />
-        <DList Name="gDonkeyRightFrontLegRootDL" Offset="0x11888" />
-        <DList Name="gDonkeyHeadDL" Offset="0x11948" />
-        <DList Name="gDonkeyUpperNeckDL" Offset="0x11E08" />
-        <DList Name="gDonkeyLowerNeckDL" Offset="0x11F90" />
-        <DList Name="gDonkeyLeftFrontFootDL" Offset="0x122C0" />
-        <DList Name="gDonkeyLeftFrontCannonDL" Offset="0x12460" />
-        <DList Name="gDonkeyLeftFrontForearmDL" Offset="0x125E8" />
-        <DList Name="gDonkeyLeftFrontLegRootDL" Offset="0x127D0" />
-        <DList Name="gDonkeyTorsoDL" Offset="0x12890" />
-
-        <!-- Cremia's Donkey Textures -->
-
-        <Texture Name="gDonkeyTLUT" OutName="donkey_tlut" Format="rgba16" Width="16" Height="16" Offset="0x12D48" />
-        <Texture Name="gDonkeyMouthTex" OutName="donkey_mouth" Format="ci8" Width="32" Height="32" Offset="0x12F48" />
-        <Texture Name="gDonkeyHeadTex" OutName="donkey_head" Format="ci8" Width="32" Height="32" Offset="0x13348" />
-        <Texture Name="gDonkeyEyeTex" OutName="donkey_eye" Format="rgba32" Width="32" Height="32" Offset="0x13748" />
-        <Texture Name="gDonkeyManeTex" OutName="donkey_mane" Format="ci8" Width="16" Height="32" Offset="0x14748" />
-        <Texture Name="gDonkeySkinTex" OutName="donkey_skin" Format="ci8" Width="32" Height="32" Offset="0x14948" />
-        <Texture Name="gDonkeyHarnessTex" OutName="donkey_harness" Format="ci8" Width="16" Height="16" Offset="0x14D48" />
-        <Texture Name="gDonkeyTailAndFeetTex" OutName="donkey_tail_and_feet" Format="ci8" Width="16" Height="16" Offset="0x14E48" />
-    
-        <!-- Cremia's Donkey Limbs and Skel-->
-
-        <Limb Name="gDonkeyRootLimb" Type="Standard" EnumName="DONKEY_LIMB_ROOT" Offset="0x14F48" />
-        <Limb Name="gDonkeyPelvisLimb" Type="Standard" EnumName="DONKEY_LIMB_PELVIS" Offset="0x14F54" />
-        <Limb Name="gDonkeyTorsoLimb" Type="Standard" EnumName="DONKEY_LIMB_TORSO" Offset="0x14F60" />
-        <Limb Name="gDonkeyLeftFrontLegRootLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_FRONT_LEG_ROOT" Offset="0x14F6C" />
-        <Limb Name="gDonkeyLeftFrontForearmLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_FRONT_FOREARM" Offset="0x14F78" />
-        <Limb Name="gDonkeyLeftFrontCannonLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_FRONT_CANNON" Offset="0x14F84" />
-        <Limb Name="gDonkeyLeftFrontFootLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_FRONT_FOOT" Offset="0x14F90" />
-        <Limb Name="gDonkeyLowerNeckLimb" Type="Standard" EnumName="DONKEY_LIMB_LOWER_NECK" Offset="0x14F9C" />
-        <Limb Name="gDonkeyUpperNeckLimb" Type="Standard" EnumName="DONKEY_LIMB_UPPER_NECK" Offset="0x14FA8" />
-        <Limb Name="gDonkeyHeadLimb" Type="Standard" EnumName="DONKEY_LIMB_HEAD" Offset="0x14FB4" />
-        <Limb Name="gDonkeyRightFrontLegRootLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_FRONT_LEG_ROOT" Offset="0x14FC0" />
-        <Limb Name="gDonkeyRightFrontForearmLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_FRONT_FOREARM" Offset="0x14FCC" />
-        <Limb Name="gDonkeyRightFrontCannonLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_FRONT_CANNON" Offset="0x14FD8" />
-        <Limb Name="gDonkeyRightFrontFootLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_FRONT_FOOT" Offset="0x14FE4" />
-        <Limb Name="gDonkeyTailDockLimb" Type="Standard" EnumName="DONKEY_LIMB_TAIL_DOCK" Offset="0x14FF0" />
-        <Limb Name="gDonkeyTailMiddleLimb" Type="Standard" EnumName="DONKEY_LIMB_TAIL_MIDDLE" Offset="0x14FFC" />
-        <Limb Name="gDonkeyTailEndLimb" Type="Standard" EnumName="DONKEY_LIMB_TAIL_END" Offset="0x15008" />
-        <Limb Name="gDonkeyLeftHindThighLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_HIND_THIGH" Offset="0x15014" />
-        <Limb Name="gDonkeyLeftHindStifleLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_HIND_STIFLE" Offset="0x15020" />
-        <Limb Name="gDonkeyLeftHindCannonLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_HIND_CANNON" Offset="0x1502C" />
-        <Limb Name="gDonkeyLeftHindFootLimb" Type="Standard" EnumName="DONKEY_LIMB_LEFT_HIND_FOOT" Offset="0x15038" />
-        <Limb Name="gDonkeyRightHindThighLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_HIND_THIGH" Offset="0x15044" />
-        <Limb Name="gDonkeyRightHindStifleLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_HIND_STIFLE" Offset="0x15050" />
-        <Limb Name="gDonkeyRightHindCannonLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_HIND_CANNON" Offset="0x1505C" />
-        <Limb Name="gDonkeyRightHindFootLimb" Type="Standard" EnumName="DONKEY_LIMB_RIGHT_HIND_FOOT" Offset="0x15068" />
-        <Skeleton Name="gDonkeySkel" Type="Flex" LimbType="Standard" LimbNone="DONKEY_LIMB_NONE" LimbMax="DONKEY_LIMB_MAX" EnumName="DonkeyLimb" Offset="0x150D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_haka_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_haka_obj.xml
deleted file mode 100644
index 2746eb690..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_haka_obj.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Root>
-    <File Name="object_haka_obj" Segment="6">
-        <DList Name="object_haka_obj_DL_000040" Offset="0x40" /> <!-- Original name is "Y2_bakuKABE_model" -->
-        <Collision Name="object_haka_obj_Colheader_000148" Offset="0x148" /> <!-- Original name is "Y2_bakuKABE_bgdatainfo" -->
-        <DList Name="object_haka_obj_DL_0007B0" Offset="0x7B0" /> <!-- Original name is "Y2_hakaishi_model" -->
-        <Collision Name="object_haka_obj_Colheader_000EE8" Offset="0xEE8" /> <!-- Original name is "Y2_hakaishi_bgdatainfo" -->
-        <DList Name="object_haka_obj_DL_000F70" Offset="0xF70" /> <!-- Original name is "Y2_hakashita00_meganeOBJ_model" -->
-        <DList Name="object_haka_obj_DL_001200" Offset="0x1200" /> <!-- Original name is "Y2_hakashita03_meganeOBJ_model" -->
-        <DList Name="object_haka_obj_DL_001410" Offset="0x1410" /> <!-- Original name is "Y2_hakashitaMAKU_model" -->
-        <Collision Name="object_haka_obj_Colheader_001588" Offset="0x1588" /> <!-- Original name is "Y2_hakashitaMAKU_bgdatainfo" -->
-        <DList Name="object_haka_obj_DL_001680" Offset="0x1680" /> <!-- Original name is "Y2_kakera_model" -->
-        <Texture Name="object_haka_obj_TLUT_001800" OutName="tlut_001800" Format="rgba16" Width="16" Height="16" Offset="0x1800" />
-        <Texture Name="object_haka_obj_TLUT_001A00" OutName="tlut_001A00" Format="rgba16" Width="4" Height="4" Offset="0x1A00" />
-        <Texture Name="object_haka_obj_TLUT_001A20" OutName="tlut_001A20" Format="rgba16" Width="4" Height="4" Offset="0x1A20" />
-        <Texture Name="object_haka_obj_TLUT_001A40" OutName="tlut_001A40" Format="rgba16" Width="16" Height="16" Offset="0x1A40" />
-        <Texture Name="object_haka_obj_Tex_001C40" OutName="tex_001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" />
-        <Texture Name="object_haka_obj_Tex_002040" OutName="tex_002040" Format="ci8" Width="32" Height="32" Offset="0x2040" />
-        <Texture Name="object_haka_obj_Tex_002440" OutName="tex_002440" Format="rgba16" Width="32" Height="32" Offset="0x2440" />
-        <Texture Name="object_haka_obj_Tex_002C40" OutName="tex_002C40" Format="ci4" Width="64" Height="64" Offset="0x2C40" />
-        <Texture Name="object_haka_obj_Tex_003440" OutName="tex_003440" Format="ci4" Width="64" Height="64" Offset="0x3440" />
-        <Texture Name="object_haka_obj_Tex_003C40" OutName="tex_003C40" Format="ci8" Width="32" Height="64" Offset="0x3C40" />
-        <Texture Name="object_haka_obj_Tex_004440" OutName="tex_004440" Format="ci8" Width="32" Height="32" Offset="0x4440" />
-        <Texture Name="object_haka_obj_Tex_004840" OutName="tex_004840" Format="rgba16" Width="64" Height="8" Offset="0x4840" />
-        <Texture Name="object_haka_obj_Tex_004C40" OutName="tex_004C40" Format="rgba16" Width="16" Height="16" Offset="0x4C40" />
-        <Texture Name="object_haka_obj_Tex_004E40" OutName="tex_004E40" Format="rgba16" Width="32" Height="32" Offset="0x4E40" />
-        <Texture Name="object_haka_obj_Tex_005640" OutName="tex_005640" Format="i4" Width="64" Height="64" Offset="0x5640" />
-        <Texture Name="object_haka_obj_Tex_005E40" OutName="tex_005E40" Format="rgba16" Width="32" Height="32" Offset="0x5E40" />
-        <Texture Name="object_haka_obj_Tex_006640" OutName="tex_006640" Format="i4" Width="64" Height="64" Offset="0x6640" />
-        <Texture Name="object_haka_obj_Tex_006E40" OutName="tex_006E40" Format="rgba16" Width="32" Height="32" Offset="0x6E40" />
-        <Texture Name="object_haka_obj_Tex_007640" OutName="tex_007640" Format="i4" Width="32" Height="32" Offset="0x7640" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hakaisi.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hakaisi.xml
deleted file mode 100644
index c0e200ea7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hakaisi.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <File Name="object_hakaisi" Segment="6">
-        <Texture Name="object_hakaisi_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="object_hakaisi_Tex_000200" OutName="tex_000200" Format="i8" Width="8" Height="32" Offset="0x200" />
-        <Texture Name="object_hakaisi_Tex_000300" OutName="tex_000300" Format="rgba16" Width="16" Height="16" Offset="0x300" />
-        <Texture Name="object_hakaisi_Tex_000500" OutName="tex_000500" Format="rgba16" Width="32" Height="64" Offset="0x500" />
-        <Texture Name="object_hakaisi_Tex_001500" OutName="tex_001500" Format="rgba16" Width="16" Height="64" Offset="0x1500" />
-        <DList Name="object_hakaisi_DL_001F10" Offset="0x1F10" /> <!-- Original name is "hahen01_model" -->
-        <DList Name="object_hakaisi_DL_0021B0" Offset="0x21B0" /> <!-- Original name is "hahen02_model" -->
-        <DList Name="object_hakaisi_DL_002650" Offset="0x2650" /> <!-- Original name is "haka_model" -->
-        <DList Name="object_hakaisi_DL_0029C0" Offset="0x29C0" /> <!-- Original name is "haka02_model" -->
-        <DList Name="object_hakaisi_DL_002CC0" Offset="0x2CC0" /> <!-- Original name is "haka03_model" -->
-        <Collision Name="object_hakaisi_Colheader_002FC4" Offset="0x2FC4" /> <!-- Original name is "z2_haka_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hakugin_demo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hakugin_demo.xml
deleted file mode 100644
index 1de3cd695..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hakugin_demo.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Animations for Gorons during the arrival of spring cutscene -->
-    <File Name="object_hakugin_demo" Segment="6">
-        <Animation Name="gGoronSpringShowAnim" Offset="0x1420" /> <!-- Original name is "goron_hora" -->
-        <Animation Name="gGoronSpringShowLoopAnim" Offset="0x1A4C" /> <!-- Original name is "goron_hora_loop" -->
-        <Animation Name="gGoronSpringLookAroundAnim" Offset="0x2704" /> <!-- Original name is "goron_mimawasu" -->
-        <Animation Name="gGoronSpringLookAroundLoopAnim" Offset="0x3378" /> <!-- Original name is "goron_mimawasu_loop" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hakugin_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hakugin_obj.xml
deleted file mode 100644
index 883a954a6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hakugin_obj.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<Root>
-    <File Name="object_hakugin_obj" Segment="6">
-        <DList Name="object_hakugin_obj_DL_000120" Offset="0x120" />
-        <DList Name="object_hakugin_obj_DL_000128" Offset="0x128" /> <!-- Original name is "i2_H_shutter1_model" -->
-        <Texture Name="object_hakugin_obj_TLUT_000310" OutName="tlut_000310" Format="rgba16" Width="4" Height="4" Offset="0x310" />
-        <Texture Name="object_hakugin_obj_Tex_000330" OutName="tex_000330" Format="ci4" Width="64" Height="64" Offset="0x330" />
-        <DList Name="object_hakugin_obj_DL_000D30" Offset="0xD30" />
-        <DList Name="object_hakugin_obj_DL_000D38" Offset="0xD38" />
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_000E48" Offset="0xE48" />
-        <Texture Name="object_hakugin_obj_TLUT_000E50" OutName="tlut_000E50" Format="rgba16" Width="4" Height="4" Offset="0xE50" />
-        <Texture Name="object_hakugin_obj_Tex_000E70" OutName="tex_000E70" Format="ci4" Width="64" Height="64" Offset="0xE70" />
-        <DList Name="object_hakugin_obj_DL_0016D0" Offset="0x16D0" />
-        <DList Name="object_hakugin_obj_DL_0016D8" Offset="0x16D8" /> <!-- Original name is "i2_haku041_model" -->
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_0017A8" Offset="0x17A8" />
-        <Texture Name="object_hakugin_obj_TLUT_0017B0" OutName="tlut_0017B0" Format="rgba16" Width="4" Height="4" Offset="0x17B0" />
-        <Texture Name="object_hakugin_obj_Tex_0017D0" OutName="tex_0017D0" Format="ci4" Width="64" Height="64" Offset="0x17D0" />
-        <DList Name="object_hakugin_obj_DL_002010" Offset="0x2010" />
-        <DList Name="object_hakugin_obj_DL_002018" Offset="0x2018" /> <!-- Original name is "i2_haku071_model" -->
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_0020E8" Offset="0x20E8" />
-        <Texture Name="object_hakugin_obj_TLUT_0020F0" OutName="tlut_0020F0" Format="rgba16" Width="4" Height="4" Offset="0x20F0" />
-        <Texture Name="object_hakugin_obj_Tex_002110" OutName="tex_002110" Format="ci4" Width="64" Height="64" Offset="0x2110" />
-        <DList Name="object_hakugin_obj_DL_002970" Offset="0x2970" />
-        <DList Name="object_hakugin_obj_DL_002978" Offset="0x2978" /> <!-- Original name is "i2_haku081_model" -->
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_002A58" Offset="0x2A58" />
-        <DList Name="object_hakugin_obj_DL_0035A0" Offset="0x35A0" />
-        <DList Name="object_hakugin_obj_DL_0035A8" Offset="0x35A8" /> <!-- Original name is "i2_haku091_model" -->
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_003888" Offset="0x3888" />
-        <Texture Name="object_hakugin_obj_TLUT_003890" OutName="tlut_003890" Format="rgba16" Width="4" Height="4" Offset="0x3890" />
-        <Texture Name="object_hakugin_obj_TLUT_0038B0" OutName="tlut_0038B0" Format="rgba16" Width="4" Height="4" Offset="0x38B0" />
-        <Texture Name="object_hakugin_obj_Tex_0038D0" OutName="tex_0038D0" Format="ci4" Width="64" Height="64" Offset="0x38D0" />
-        <Texture Name="object_hakugin_obj_Tex_0040D0" OutName="tex_0040D0" Format="ci4" Width="64" Height="64" Offset="0x40D0" />
-        <DList Name="object_hakugin_obj_DL_004920" Offset="0x4920" />
-        <DList Name="object_hakugin_obj_DL_004928" Offset="0x4928" /> <!-- Original name is "i2_haku0a1_model" -->
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_0049F8" Offset="0x49F8" />
-        <Texture Name="object_hakugin_obj_TLUT_004A00" OutName="tlut_004A00" Format="rgba16" Width="4" Height="4" Offset="0x4A00" />
-        <Texture Name="object_hakugin_obj_Tex_004A20" OutName="tex_004A20" Format="ci4" Width="64" Height="64" Offset="0x4A20" />
-        <DList Name="object_hakugin_obj_DL_005260" Offset="0x5260" />
-        <DList Name="object_hakugin_obj_DL_005268" Offset="0x5268" />
-        <TextureAnimation Name="object_hakugin_obj_Matanimheader_005338" Offset="0x5338" />
-        <Texture Name="object_hakugin_obj_TLUT_005340" OutName="tlut_005340" Format="rgba16" Width="4" Height="4" Offset="0x5340" />
-        <Texture Name="object_hakugin_obj_Tex_005360" OutName="tex_005360" Format="ci4" Width="64" Height="64" Offset="0x5360" />
-        <DList Name="object_hakugin_obj_DL_006120" Offset="0x6120" />
-        <DList Name="object_hakugin_obj_DL_006128" Offset="0x6128" /> <!-- Original name is "i2_H_RASENsita_model" -->
-        <Texture Name="object_hakugin_obj_TLUT_0064C0" OutName="tlut_0064C0" Format="rgba16" Width="4" Height="4" Offset="0x64C0" />
-        <Texture Name="object_hakugin_obj_TLUT_0064E0" OutName="tlut_0064E0" Format="rgba16" Width="4" Height="4" Offset="0x64E0" />
-        <Texture Name="object_hakugin_obj_TLUT_006500" OutName="tlut_006500" Format="rgba16" Width="4" Height="4" Offset="0x6500" />
-        <Texture Name="object_hakugin_obj_Tex_006520" OutName="tex_006520" Format="ci4" Width="64" Height="64" Offset="0x6520" />
-        <Texture Name="object_hakugin_obj_Tex_006D20" OutName="tex_006D20" Format="ci4" Width="64" Height="64" Offset="0x6D20" />
-        <Texture Name="object_hakugin_obj_Tex_007520" OutName="tex_007520" Format="rgba16" Width="32" Height="32" Offset="0x7520" />
-        <Texture Name="object_hakugin_obj_Tex_007D20" OutName="tex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" />
-        <Texture Name="object_hakugin_obj_Tex_008520" OutName="tex_008520" Format="ci4" Width="64" Height="64" Offset="0x8520" />
-        <DList Name="object_hakugin_obj_DL_009270" Offset="0x9270" />
-        <DList Name="object_hakugin_obj_DL_009278" Offset="0x9278" /> <!-- Original name is "i2_H_RASENue_model" -->
-        <DList Name="object_hakugin_obj_DL_009650" Offset="0x9650" />
-        <DList Name="object_hakugin_obj_DL_009658" Offset="0x9658" /> <!-- Original name is "i2_bomH1_model" -->
-        <Collision Name="object_hakugin_obj_Colheader_009768" Offset="0x9768" /> <!-- Original name is "i2_bomH1_bgdatainfo" -->
-        <DList Name="object_hakugin_obj_DL_009830" Offset="0x9830" /> <!-- Original name is "i2_bomH1_sep_model" -->
-        <DList Name="object_hakugin_obj_DL_0099A0" Offset="0x99A0" />
-        <DList Name="object_hakugin_obj_DL_0099A8" Offset="0x99A8" />
-        <Collision Name="object_hakugin_obj_Colheader_009AF0" Offset="0x9AF0" />
-        <Texture Name="object_hakugin_obj_TLUT_009B20" OutName="tlut_009B20" Format="rgba16" Width="4" Height="4" Offset="0x9B20" />
-        <Texture Name="object_hakugin_obj_TLUT_009B40" OutName="tlut_009B40" Format="rgba16" Width="4" Height="4" Offset="0x9B40" />
-        <Texture Name="object_hakugin_obj_Tex_009B60" OutName="tex_009B60" Format="ci4" Width="64" Height="64" Offset="0x9B60" />
-        <Texture Name="object_hakugin_obj_Tex_00A360" OutName="tex_00A360" Format="ci4" Width="64" Height="64" Offset="0xA360" />
-        <DList Name="object_hakugin_obj_DL_00ACB0" Offset="0xACB0" />
-        <DList Name="object_hakugin_obj_DL_00ACB8" Offset="0xACB8" /> <!-- Original name is "i2_elvH1_model" -->
-        <Texture Name="object_hakugin_obj_TLUT_00AE18" OutName="tlut_00AE18" Format="rgba16" Width="4" Height="4" Offset="0xAE18" />
-        <Texture Name="object_hakugin_obj_TLUT_00AE38" OutName="tlut_00AE38" Format="rgba16" Width="4" Height="4" Offset="0xAE38" />
-        <Texture Name="object_hakugin_obj_Tex_00AE58" OutName="tex_00AE58" Format="ci4" Width="64" Height="64" Offset="0xAE58" />
-        <Texture Name="object_hakugin_obj_Tex_00B658" OutName="tex_00B658" Format="ci4" Width="64" Height="64" Offset="0xB658" />
-        <Collision Name="object_hakugin_obj_Colheader_00BF40" Offset="0xBF40" /> <!-- Original name is "i2_elvH1_bgdatainfo" -->
-        <DList Name="object_hakugin_obj_DL_00C1A0" Offset="0xC1A0" />
-        <DList Name="object_hakugin_obj_DL_00C1A8" Offset="0xC1A8" /> <!-- Original name is "i2_icecol1_model" -->
-        <DList Name="object_hakugin_obj_DL_00C560" Offset="0xC560" />
-        <DList Name="object_hakugin_obj_DL_00C568" Offset="0xC568" /> <!-- Original name is "i2_icecol2_model" -->
-        <DList Name="object_hakugin_obj_DL_00CA30" Offset="0xCA30" />
-        <DList Name="object_hakugin_obj_DL_00CA38" Offset="0xCA38" /> <!-- Original name is "i2_icecolA_model" -->
-        <DList Name="object_hakugin_obj_DL_00CEC0" Offset="0xCEC0" />
-        <DList Name="object_hakugin_obj_DL_00CEC8" Offset="0xCEC8" /> <!-- Original name is "i2_icecolB_model" -->
-        <DList Name="object_hakugin_obj_DL_00D090" Offset="0xD090" />
-        <DList Name="object_hakugin_obj_DL_00D098" Offset="0xD098" /> <!-- Original name is "i2_icecolB_sep_model" -->
-        <Collision Name="object_hakugin_obj_Colheader_00D3B0" Offset="0xD3B0" />
-        <Texture Name="object_hakugin_obj_TLUT_00D3E0" OutName="tlut_00D3E0" Format="rgba16" Width="4" Height="4" Offset="0xD3E0" />
-        <!-- <Blob Name="object_hakugin_obj_Blob_00D400" Size="0x40" Offset="0xD400" /> -->
-        <Texture Name="object_hakugin_obj_Tex_00D440" OutName="tex_00D440" Format="rgba16" Width="64" Height="32" Offset="0xD440" />
-        <Texture Name="object_hakugin_obj_Tex_00E440" OutName="tex_00E440" Format="ci4" Width="64" Height="64" Offset="0xE440" />
-        <Texture Name="object_hakugin_obj_Tex_00EC40" OutName="tex_00EC40" Format="i4" Width="64" Height="64" Offset="0xEC40" />
-        <Texture Name="object_hakugin_obj_Tex_00F440" OutName="tex_00F440" Format="i4" Width="64" Height="64" Offset="0xF440" />
-        <Texture Name="object_hakugin_obj_Tex_00FC40" OutName="tex_00FC40" Format="rgba16" Width="32" Height="32" Offset="0xFC40" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hana.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hana.xml
deleted file mode 100644
index 79593345a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hana.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="assets/objects/gameplay_field_keep/"/>
-    <!-- Assets for the orange graveyard flowers -->
-    <File Name="object_hana" Segment="6">
-        <!-- Each of these is a single flower out of the 3 -->
-        <DList Name="gGraveyardFlower1DL" Offset="0x0" />
-        <DList Name="gGraveyardFlower2DL" Offset="0xA0" />
-        <DList Name="gGraveyardFlower3DL" Offset="0x140" />
-
-        <!-- Each of these is a single leaf out of the 5 -->
-        <DList Name="gGraveyardFlowerLeaf1DL" Offset="0x1E0" />
-        <DList Name="gGraveyardFlowerLeaf2DL" Offset="0x280" />
-        <DList Name="gGraveyardFlowerLeaf3DL" Offset="0x320" />
-        <DList Name="gGraveyardFlowerLeaf4DL" Offset="0x3C0" />
-        <DList Name="gGraveyardFlowerLeaf5DL" Offset="0x460" />
-
-        <!-- This DL combines all the other DLs to make the whole object -->
-        <DList Name="gGraveyardFlowersDL" Offset="0x500" /> <!-- Original name is "flower1_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hanareyama_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hanareyama_obj.xml
deleted file mode 100644
index 62cf67540..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hanareyama_obj.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<Root>
-    <File Name="object_hanareyama_obj" Segment="6">
-        <DList Name="object_hanareyama_obj_DL_000000" Offset="0x0" />
-        <DList Name="object_hanareyama_obj_DL_000020" Offset="0x20" />
-        <DList Name="object_hanareyama_obj_DL_000D70" Offset="0xD70" />
-        <DList Name="object_hanareyama_obj_DL_000E30" Offset="0xE30" />
-        <DList Name="object_hanareyama_obj_DL_000EF0" Offset="0xEF0" />
-        <DList Name="object_hanareyama_obj_DL_000FB8" Offset="0xFB8" />
-        <DList Name="object_hanareyama_obj_DL_001078" Offset="0x1078" />
-        <DList Name="object_hanareyama_obj_DL_001138" Offset="0x1138" />
-        <DList Name="object_hanareyama_obj_DL_001200" Offset="0x1200" />
-        <DList Name="object_hanareyama_obj_DL_0012C0" Offset="0x12C0" />
-        <DList Name="object_hanareyama_obj_DL_001380" Offset="0x1380" />
-        <DList Name="object_hanareyama_obj_DL_001448" Offset="0x1448" />
-        <DList Name="object_hanareyama_obj_DL_001508" Offset="0x1508" />
-        <DList Name="object_hanareyama_obj_DL_0015C8" Offset="0x15C8" />
-        <DList Name="object_hanareyama_obj_DL_001690" Offset="0x1690" />
-        <DList Name="object_hanareyama_obj_DL_001750" Offset="0x1750" />
-        <DList Name="object_hanareyama_obj_DL_001810" Offset="0x1810" />
-        <DList Name="object_hanareyama_obj_DL_0018D8" Offset="0x18D8" />
-        <DList Name="object_hanareyama_obj_DL_001998" Offset="0x1998" />
-        <DList Name="object_hanareyama_obj_DL_001A58" Offset="0x1A58" />
-        <DList Name="object_hanareyama_obj_DL_001B20" Offset="0x1B20" />
-        <DList Name="object_hanareyama_obj_DL_001BE0" Offset="0x1BE0" />
-        <DList Name="object_hanareyama_obj_DL_001CA0" Offset="0x1CA0" />
-        <DList Name="object_hanareyama_obj_DL_001D68" Offset="0x1D68" />
-        <DList Name="object_hanareyama_obj_DL_001E28" Offset="0x1E28" />
-        <DList Name="object_hanareyama_obj_DL_001EE8" Offset="0x1EE8" />
-        <DList Name="object_hanareyama_obj_DL_001FB0" Offset="0x1FB0" />
-        <DList Name="object_hanareyama_obj_DL_002070" Offset="0x2070" />
-        <DList Name="object_hanareyama_obj_DL_002130" Offset="0x2130" />
-        <DList Name="object_hanareyama_obj_DL_0021F0" Offset="0x21F0" />
-        <DList Name="object_hanareyama_obj_DL_0022B0" Offset="0x22B0" />
-        <DList Name="object_hanareyama_obj_DL_002370" Offset="0x2370" />
-        <DList Name="object_hanareyama_obj_DL_002430" Offset="0x2430" />
-        <DList Name="object_hanareyama_obj_DL_0024F0" Offset="0x24F0" />
-        <DList Name="object_hanareyama_obj_DL_0025B0" Offset="0x25B0" />
-        <DList Name="object_hanareyama_obj_DL_002670" Offset="0x2670" />
-        <DList Name="object_hanareyama_obj_DL_002730" Offset="0x2730" />
-        <DList Name="object_hanareyama_obj_DL_0027F0" Offset="0x27F0" />
-        <DList Name="object_hanareyama_obj_DL_0028B0" Offset="0x28B0" />
-        <DList Name="object_hanareyama_obj_DL_002970" Offset="0x2970" />
-        <DList Name="object_hanareyama_obj_DL_002A30" Offset="0x2A30" />
-        <DList Name="object_hanareyama_obj_DL_002AF0" Offset="0x2AF0" />
-        <DList Name="object_hanareyama_obj_DL_002BB0" Offset="0x2BB0" />
-        <DList Name="object_hanareyama_obj_DL_002C70" Offset="0x2C70" />
-        <DList Name="object_hanareyama_obj_DL_002D30" Offset="0x2D30" />
-        <DList Name="object_hanareyama_obj_DL_002DF0" Offset="0x2DF0" />
-        <DList Name="object_hanareyama_obj_DL_002EB0" Offset="0x2EB0" />
-        <DList Name="object_hanareyama_obj_DL_002F78" Offset="0x2F78" />
-        <DList Name="object_hanareyama_obj_DL_003038" Offset="0x3038" />
-        <DList Name="object_hanareyama_obj_DL_0030F8" Offset="0x30F8" />
-        <DList Name="object_hanareyama_obj_DL_0031B8" Offset="0x31B8" />
-        <DList Name="object_hanareyama_obj_DL_003278" Offset="0x3278" />
-        <DList Name="object_hanareyama_obj_DL_003338" Offset="0x3338" />
-        <DList Name="object_hanareyama_obj_DL_0033F8" Offset="0x33F8" />
-        <DList Name="object_hanareyama_obj_DL_0034B8" Offset="0x34B8" />
-        <DList Name="object_hanareyama_obj_DL_003578" Offset="0x3578" />
-        <Texture Name="object_hanareyama_obj_Tex_003638" OutName="tex_003638" Format="i4" Width="64" Height="64" Offset="0x3638" />
-        <Texture Name="object_hanareyama_obj_Tex_003E38" OutName="tex_003E38" Format="rgba16" Width="32" Height="32" Offset="0x3E38" />
-        <Array Name="object_hanareyama_obj_DLArray_004638" Count="54" Offset="0x4638">
-            <Pointer Type="Gfx"/>
-        </Array>
-        <Array Name="object_hanareyama_obj_Vec_004710" Count="54" Offset="0x4710">
-            <Vector Type="s16" Dimensions="3" />
-        </Array>
-        <Collision Name="object_hanareyama_obj_Colheader_004D8C" Offset="0x4D8C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_harfgibud.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_harfgibud.xml
deleted file mode 100644
index 437e3b70d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_harfgibud.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<Root>
-    <!-- Object for the Pamela's father, both human and gibdo form-->
-    <File Name="object_harfgibud" Segment="6">
-
-        <!-- Gibdo Form -->
-        <Animation Name="gPamelasFatherLeanForwardAnim" Offset="0x370" /> <!-- Original name is "hg_garuru" -->
-        <Animation Name="gPamelasFatherReachForwardAnim" Offset="0x1138" /> <!-- Original name is "hg_garuru_loop" -->
-        <Animation Name="gPamelasFatherCurlUpAnim" Offset="0x15D4" /> <!-- Original name is "hg_kurusimu" -->
-        <Animation Name="gPamelasFatherCrouchedPanicAnim" Offset="0x1960" /> <!-- Original name is "hg_kurusimu_loop" -->
-        <Animation Name="gPamelasFatherIdleAnim" Offset="0x260C" /> <!-- Original name is "hg_wait" -->
-
-        <DList Name="gPamelasFatherGibdoPelvisDL" Offset="0x5790" />
-        <DList Name="gPamelasFatherGibdoRightFootDL" Offset="0x5878" />
-        <DList Name="gPamelasFatherGibdoRightLegDL" Offset="0x5978" />
-        <DList Name="gPamelasFatherGibdoRightThighDL" Offset="0x5A60" />
-        <DList Name="gPamelasFatherGibdoLeftFootDL" Offset="0x5B50" />
-        <DList Name="gPamelasFatherGibdoLeftLegDL" Offset="0x5C50" />
-        <DList Name="gPamelasFatherGibdoLeftThighDL" Offset="0x5D38" />
-        <DList Name="gPamelasFatherGibdoEyebrowsDL" Offset="0x5E28" />
-        <DList Name="gPamelasFatherGibdoHeadDL" Offset="0x5ED0" />
-        <DList Name="gPamelasFatherGibdoChestDL" Offset="0x65B0" />
-        <DList Name="gPamelasFatherGibdoRightHandDL" Offset="0x67C8" />
-        <DList Name="gPamelasFatherGibdoRightForearmDL" Offset="0x6988" />
-        <DList Name="gPamelasFatherGibdoRightUpperArmDL" Offset="0x6B80" />
-        <DList Name="gPamelasFatherGibdoLeftHandDL" Offset="0x6C80" />
-        <DList Name="gPamelasFatherGibdoLeftForearmDL" Offset="0x6DB8" />
-        <DList Name="gPamelasFatherGibdoLeftUpperArmDL" Offset="0x6EA0" />
-        <DList Name="gPamelasFatherGibdoAbdomenDL" Offset="0x6F98" />
-
-        <Texture Name="gPamelasFatherGibdoTLUT" OutName="pamelas_father_gibdo__tlut" Format="rgba16" Width="16" Height="16" Offset="0x70A0" />
-        <Texture Name="gPamelasFatherGibdoBandageWrappingsTex" OutName="gibdo_bandage_wrappings" Format="i8" Width="64" Height="32" Offset="0x72A0" />
-        <Texture Name="gPamelasFatherGibdoSkinGradientTex" OutName="gibdo_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x7AA0" />
-        <Texture Name="gPamelasFatherGibdoSideHairTex" OutName="gibdo_side_hair" Format="ci8" Width="8" Height="16" Offset="0x7AE0" />
-        <Texture Name="gPamelasFatherGibdoEarTex" OutName="gibdo_ear" Format="ci8" Width="8" Height="8" Offset="0x7B60" />
-        <Texture Name="gPamelasFatherGibdoLipTex" OutName="gibdo_lip" Format="ci8" Width="8" Height="8" Offset="0x7BA0" />
-        <Texture Name="gPamelasFatherGibdoBloodshotEyeTex" OutName="gibdo_bloodshot_eye" Format="ci8" Width="32" Height="32" Offset="0x7BE0" />
-        <Texture Name="gPamelasFatherGibdoHairTex" OutName="gibdo_hair" Format="ci8" Width="16" Height="16" Offset="0x7FE0" />
-        <Texture Name="gPamelasFatherGibdoEyebrowTex" OutName="gibdo_eyebrow" Format="rgba16" Width="16" Height="16" Offset="0x80E0" />
-        <Texture Name="gPamelasFatherGibdoLabCoatSleeveTex" OutName="gibdo_lab_coat_sleeve" Format="i8" Width="8" Height="8" Offset="0x82E0" />
-        <Texture Name="gPamelasFatherGibdoShirtPieceTex" OutName="gibdo_shirt_piece" Format="rgba16" Width="8" Height="8" Offset="0x8320" />
-        <Texture Name="gPamelasFatherGibdoFingernailTex" OutName="gibdo_fingernail" Format="ci8" Width="16" Height="8" Offset="0x83A0" />
-        <Texture Name="gPamelasFatherGibdoLabCoatCuffTex" OutName="gibdo_lab_coat_cuff" Format="i8" Width="8" Height="8" Offset="0x8420" />
-
-        <Limb Name="gPamelasFatherGibdoRootLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_ROOT" Offset="0x8460" />
-        <Limb Name="gPamelasFatherGibdoAbdomenLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_ABDOMEN" Offset="0x846C" />
-        <Limb Name="gPamelasFatherGibdoChestLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_CHEST" Offset="0x8478" />
-        <Limb Name="gPamelasFatherGibdoLeftUpperArmLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_UPPER_ARM" Offset="0x8484" />
-        <Limb Name="gPamelasFatherGibdoLeftForearmLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_FOREARM" Offset="0x8490" />
-        <Limb Name="gPamelasFatherGibdoLeftHandLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_HAND" Offset="0x849C" />
-        <Limb Name="gPamelasFatherGibdoRightUpperArmLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_UPPER_ARM" Offset="0x84A8" />
-        <Limb Name="gPamelasFatherGibdoRightForearmLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_FOREARM" Offset="0x84B4" />
-        <Limb Name="gPamelasFatherGibdoRightHandLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_HAND" Offset="0x84C0" />
-        <Limb Name="gPamelasFatherGibdoEyebrowsLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_EYEBROWS" Offset="0x84CC" />
-        <Limb Name="gPamelasFatherGibdoHeadLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_HEAD" Offset="0x84D8" />
-        <Limb Name="gPamelasFatherGibdoPelvisLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_PELVIS" Offset="0x84E4" />
-        <Limb Name="gPamelasFatherGibdoLeftThighLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_THIGH" Offset="0x84F0" />
-        <Limb Name="gPamelasFatherGibdoLeftShinLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_SHIN" Offset="0x84FC" />
-        <Limb Name="gPamelasFatherGibdoLeftFootLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_LEFT_FOOT" Offset="0x8508" />
-        <Limb Name="gPamelasFatherGibdoRightThighLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_THIGH" Offset="0x8514" />
-        <Limb Name="gPamelasFatherGibdoRightShinLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_SHIN" Offset="0x8520" />
-        <Limb Name="gPamelasFatherGibdoRightFootLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_RIGHT_FOOT" Offset="0x852C" />
-        <Skeleton Name="gPamelasFatherGibdoSkel" Type="Flex" LimbType="Standard" LimbNone="PAMELAS_FATHER_GIBDO_LIMB_NONE" LimbMax="PAMELAS_FATHER_GIBDO_LIMB_MAX" EnumName="PamelasFatherGibdoLimb" Offset="0x8580" />
-
-        <Animation Name="gPamelasFatherLurchForwardAnim" Offset="0x9D44" /> <!-- Original name is "hg_walk" -->
-        <Animation Name="gPamelasFatherRecoilFromHitAnim" Offset="0xA164" /> <!-- Original name is "hg_yarare" -->
-        <Animation Name="gPamelasFatherPanicAnim" Offset="0xAE1C" /> <!-- Original name is "hg_yurayura" -->
-        <TextureAnimation Name="gPamelasFatherEyeTexAnim" Offset="0xAE50" />
-        <Animation Name="gPamelasFatherArmsFoldedAnim" Offset="0xB644" /> <!-- Original name is "hgo_wait" -->
-
-        <DList Name="gPamelasFatherHumanPelvisDL" Offset="0xE860" />
-        <DList Name="gPamelasFatherHumanRightFootDL" Offset="0xE9E0" />
-        <DList Name="gPamelasFatherHumanRightShinDL" Offset="0xEB28" />
-        <DList Name="gPamelasFatherHumanRightThighDL" Offset="0xEC48" />
-        <DList Name="gPamelasFatherHumanLeftFootDL" Offset="0xEE50" />
-        <DList Name="gPamelasFatherHumanLeftShinDL" Offset="0xEF98" />
-        <DList Name="gPamelasFatherHumanLeftThighDL" Offset="0xF0B8" />
-        <DList Name="gPamelasFatherHumanEyebrowsDL" Offset="0xF248" />
-        <DList Name="gPamelasFatherHumanHeadDL" Offset="0xF2F0" />
-        <DList Name="gPamelasFatherHumanChestDL" Offset="0xF838" />
-        <DList Name="gPamelasFatherHumanRightHandDL" Offset="0xFAA8" />
-        <DList Name="gPamelasFatherHumanRightForearmDL" Offset="0xFC10" />
-        <DList Name="gPamelasFatherHumanRightUpperArmDL" Offset="0xFE08" />
-        <DList Name="gPamelasFatherHumanLeftHandDL" Offset="0xFF10" />
-        <DList Name="gPamelasFatherHumanLeftForearmDL" Offset="0x10078" />
-        <DList Name="gPamelasFatherHumanLeftUpperArmDL" Offset="0x102B8" />
-        <DList Name="gPamelasFatherHumanAbdomenDL" Offset="0x103C0" />
-
-        <Texture Name="gPamelasFatherHumanTLUT" OutName="human_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10578" />
-        <Texture Name="gPamelasFatherHumanSkinGradientTex" OutName="human_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x10778" />
-        <Texture Name="gPamelasFatherHumanHandTex" OutName="human_hand" Format="ci8" Width="16" Height="16" Offset="0x107B8" />
-        <Texture Name="gPamelasFatherHumanSideHairTex" OutName="human_side_hair" Format="ci8" Width="8" Height="16" Offset="0x108B8" />
-        <Texture Name="gPamelasFatherHumanEarTex" OutName="human_ear" Format="ci8" Width="8" Height="8" Offset="0x10938" />
-        <Texture Name="gPamelasFatherHumanBeltTex" OutName="human_belt" Format="ci8" Width="32" Height="16" Offset="0x10978" />
-        <Texture Name="gPamelasFatherHumanLipTex" OutName="human_lip" Format="ci8" Width="8" Height="8" Offset="0x10B78" />
-        <Texture Name="gPamelasFatherHumanShirtTex" OutName="human_shirt" Format="rgba16" Width="8" Height="16" Offset="0x10BB8" />
-        <Texture Name="gPamelasFatherHumanEyebrowTex" OutName="human_eyebrow" Format="rgba16" Width="16" Height="16" Offset="0x10CB8" />
-        <Texture Name="gPamelasFatherHumanLabCoatTex" OutName="human_lab_coat" Format="i8" Width="8" Height="8" Offset="0x10EB8" />
-        <Texture Name="gPamelasFatherHumanSockTex" OutName="human_sock" Format="rgba16" Width="16" Height="16" Offset="0x10EF8" />
-        <Texture Name="gPamelasFatherHumanLabCoatCuffTex" OutName="human_lab_coat_cuff" Format="i8" Width="8" Height="8" Offset="0x110F8" />
-        <Texture Name="gPamelasFatherHumanEyeOpenTex" OutName="human_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x11138" />
-        <Texture Name="gPamelasFatherHumanEyeHalfTex" OutName="human_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x11938" />
-        <Texture Name="gPamelasFatherHumanEyeClosedTex" OutName="human_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x12138" />
-
-        <Limb Name="gPamelasFatherHumanRootLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_ROOT" Offset="0x12938" />
-        <Limb Name="gPamelasFatherHumanAbdomenLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_ABDOMEN" Offset="0x12944" />
-        <Limb Name="gPamelasFatherHumanChestLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_CHEST" Offset="0x12950" />
-        <Limb Name="gPamelasFatherHumanLeftUpperArmLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_UPPER_ARM" Offset="0x1295C" />
-        <Limb Name="gPamelasFatherHumanLeftForearmLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_FOREARM" Offset="0x12968" />
-        <Limb Name="gPamelasFatherHumanLeftHandLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_HAND" Offset="0x12974" />
-        <Limb Name="gPamelasFatherHumanRightUpperArmLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_UPPER_ARM" Offset="0x12980" />
-        <Limb Name="gPamelasFatherHumanRightForearmLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_FOREARM" Offset="0x1298C" />
-        <Limb Name="gPamelasFatherHumanRightHandLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_HAND" Offset="0x12998" />
-        <Limb Name="gPamelasFatherHumanEyebrowsLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_EYEBROWS" Offset="0x129A4" />
-        <Limb Name="gPamelasFatherHumanHeadLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_HEAD" Offset="0x129B0" />
-        <Limb Name="gPamelasFatherHumanPelvisLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_PELVIS" Offset="0x129BC" />
-        <Limb Name="gPamelasFatherHumanLeftThighLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_THIGH" Offset="0x129C8" />
-        <Limb Name="gPamelasFatherHumanLeftLegLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_SHIN" Offset="0x129D4" />
-        <Limb Name="gPamelasFatherHumanLeftFootLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_LEFT_FOOT" Offset="0x129E0" />
-        <Limb Name="gPamelasFatherHumanRightThighLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_THIGH" Offset="0x129EC" />
-        <Limb Name="gPamelasFatherHumanRightLegLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_SHIN" Offset="0x129F8" />
-        <Limb Name="gPamelasFatherHumanRightFootLimb" Type="Standard" EnumName="PAMELAS_FATHER_HUMAN_LIMB_RIGHT_FOOT" Offset="0x12A04" />
-        <Skeleton Name="gPamelasFatherHumanSkel" Type="Flex" LimbType="Standard" LimbNone="PAMELAS_FATHER_HUMAN_LIMB_NONE" LimbMax="PAMELAS_FATHER_HUMAN_LIMB_MAX" EnumName="PamelasFatherHumanLimb" Offset="0x12A58" />
-
-        <Animation Name="gPamelasFatherAstonishedAnim" Offset="0x13684" /> <!-- Original name is "ho_bozen_loop" -->
-        <Animation Name="gPamelasFatherReachDownToLiftAnim" Offset="0x14220" /> <!-- Original name is "ho_siawase" -->
-        <Animation Name="gPamelasFatherTossAnim" Offset="0x14A9C" /> <!-- Original name is "ho_siawase_loop" -->
-        <Animation Name="gPamelasFatherKneelDownAndHugAnim" Offset="0x152EC" /> <!-- Original name is "ho_uketome" -->
-        <Animation Name="gPamelasFatherConsoleAnim" Offset="0x15C70" /> <!-- Original name is "ho_uketome_loop" -->
-        <Animation Name="gPamelasFatherConsoleHeadUpAnim" Offset="0x165F0" /> <!-- Original name is "ho_watasiwa" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hariko.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hariko.xml
deleted file mode 100644
index 9af628304..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hariko.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Object for the Clock Town cow statues -->
-    <File Name="object_hariko" Segment="6">
-        <DList Name="gHarikoBodyDL" Offset="0x80" /> <!-- Original name is "hariko_body_model" -->
-        <DList Name="gHarikoFaceDL" Offset="0x110" /> <!-- Original name is "hariko_atamaT_model" -->
-        <Texture Name="gHarikoBodyTex" OutName="hariko_body" Format="rgba16" Width="8" Height="8" Offset="0x1A0" />
-        <Texture Name="gHarikoFaceTex" OutName="hariko_face" Format="rgba16" Width="16" Height="16" Offset="0x220" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hata.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hata.xml
deleted file mode 100644
index cbee285e3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hata.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<Root>
-    <File Name="object_hata" Segment="6">
-        <!-- Flagpole Collision -->
-        <Collision Name="gFlagpoleCol" Offset="0xC0" /> <!-- Original name is "hata_bgdatainfo" -->
-
-        <!-- Flagpole Animation -->
-        <Animation Name="gFlagpoleFlapAnim" Offset="0x444" /> <!-- Original name is "ht_hata" -->
-
-        <!-- Flagpole Textures -->
-        <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole" Format="rgba16" Width="32" Height="32" Offset="0x460" />
-        <Texture Name="gFlagpoleTopTex" OutName="flagpole_top" Format="rgba16" Width="32" Height="32" Offset="0xC60" />
-        <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag" Format="ia8" Width="128" Height="32" Offset="0x1460" />
-
-        <!-- Flagpole DLists -->
-        <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
-        <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
-        <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
-        <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
-        <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
-        <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
-        <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
-        <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
-        <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
-
-        <!-- Flagpole Limbs -->
-        <Limb Name="gFlagpolePoleBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_BASE" Offset="0x2E90" />
-        <Limb Name="gFlagpolePoleLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_POLE" Offset="0x2E9C" />
-        <Limb Name="gFlagpoleFlag1BaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_BASE" Offset="0x2EA8" />
-        <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_END_BASE" Offset="0x2EB4" />
-        <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_MID_BASE" Offset="0x2EC0" />
-        <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_MID_BASE" Offset="0x2ECC" />
-        <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_END_BASE" Offset="0x2ED8" />
-        <Limb Name="gFlagpoleFlag1FlyEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_END" Offset="0x2EE4" />
-        <Limb Name="gFlagpoleFlag1FlyMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_MID" Offset="0x2EF0" />
-        <Limb Name="gFlagpoleFlag1HoistMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_MID" Offset="0x2EFC" />
-        <Limb Name="gFlagpoleFlag1HoistEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_END" Offset="0x2F08" />
-        <Limb Name="gFlagpoleFlag2BaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_BASE" Offset="0x2F14" />
-        <Limb Name="gFlagpoleFlag2HoistEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_END_BASE" Offset="0x2F20" />
-        <Limb Name="gFlagpoleFlag2HoistMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_MID_BASE" Offset="0x2F2C" />
-        <Limb Name="gFlagpoleFlag2FlyMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_MID_BASE" Offset="0x2F38" />
-        <Limb Name="gFlagpoleFlag2FlyEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_END_BASE" Offset="0x2F44" />
-        <Limb Name="gFlagpoleFlag2FlyEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_END" Offset="0x2F50" />
-        <Limb Name="gFlagpoleFlag2FlyMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_MID" Offset="0x2F5C" />
-        <Limb Name="gFlagpoleFlag2HoistMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_MID" Offset="0x2F68" />
-        <Limb Name="gFlagpoleFlag2HoistEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_END" Offset="0x2F74" />
-
-        <!-- Flagpole Skeleton -->
-        <Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" LimbNone="FLAGPOLE_LIMB_NONE" LimbMax="FLAGPOLE_LIMB_MAX" EnumName="FlagpoleLimb" Offset="0x2FD0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hgdoor.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hgdoor.xml
deleted file mode 100644
index 8a0bb4c70..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hgdoor.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_hgdoor" Segment="6">
-        <Texture Name="object_hgdoor_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="32" Offset="0x0" />
-        <Texture Name="object_hgdoor_Tex_000400" OutName="tex_000400" Format="rgba16" Width="32" Height="64" Offset="0x400" />
-        <Texture Name="object_hgdoor_Tex_001400" OutName="tex_001400" Format="i8" Width="8" Height="32" Offset="0x1400" />
-        <DList Name="object_hgdoor_DL_001670" Offset="0x1670" /> <!-- Original name is "tobira_left_model" -->
-        <DList Name="object_hgdoor_DL_001768" Offset="0x1768" /> <!-- Original name is "huda_l_model" -->
-        <Collision Name="object_hgdoor_Colheader_0018C0" Offset="0x18C0" /> <!-- Original name is "z2_music_box_house_t_l_bgdatainfo" -->
-        <DList Name="object_hgdoor_DL_001AB0" Offset="0x1AB0" /> <!-- Original name is "tobira_right_model" -->
-        <DList Name="object_hgdoor_DL_001BA8" Offset="0x1BA8" /> <!-- Original name is "huda_r_model" -->
-        <Collision Name="object_hgdoor_Colheader_001D10" Offset="0x1D10" /> <!-- Original name is "z2_music_box_house_t_r_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hintnuts.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hintnuts.xml
deleted file mode 100644
index 99ea55d87..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hintnuts.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-    <File Name="object_hintnuts" Segment="6">
-        <Animation Name="object_hintnuts_Anim_000168" Offset="0x168" /> <!-- Original name is "dnh_atack" -->
-        <DList Name="object_hintnuts_DL_000B30" Offset="0xB30" />
-        <DList Name="object_hintnuts_DL_000C68" Offset="0xC68" />
-        <DList Name="object_hintnuts_DL_000D10" Offset="0xD10" />
-        <DList Name="object_hintnuts_DL_000E28" Offset="0xE28" />
-        <DList Name="object_hintnuts_DL_000EC8" Offset="0xEC8" />
-        <DList Name="object_hintnuts_DL_000F78" Offset="0xF78" />
-        <DList Name="object_hintnuts_DL_001028" Offset="0x1028" />
-        <DList Name="object_hintnuts_DL_0010C8" Offset="0x10C8" />
-        <DList Name="object_hintnuts_DL_001208" Offset="0x1208" />
-        <DList Name="object_hintnuts_DL_0012F0" Offset="0x12F0" /> <!-- Original name is "dnh_ball_model" -->
-        <DList Name="object_hintnuts_DL_0014E0" Offset="0x14E0" />
-        <Texture Name="object_hintnuts_Tex_0015A8" OutName="tex_0015A8" Format="rgba16" Width="32" Height="32" Offset="0x15A8" />
-        <Texture Name="object_hintnuts_Tex_001DA8" OutName="tex_001DA8" Format="rgba16" Width="16" Height="16" Offset="0x1DA8" />
-        <Texture Name="object_hintnuts_Tex_001FA8" OutName="tex_001FA8" Format="rgba16" Width="8" Height="8" Offset="0x1FA8" />
-        <Texture Name="object_hintnuts_Tex_002028" OutName="tex_002028" Format="rgba16" Width="8" Height="8" Offset="0x2028" />
-        <Texture Name="object_hintnuts_Tex_0020A8" OutName="tex_0020A8" Format="rgba16" Width="8" Height="8" Offset="0x20A8" />
-        <Texture Name="object_hintnuts_Tex_002128" OutName="tex_002128" Format="rgba16" Width="16" Height="16" Offset="0x2128" />
-        <Limb Name="object_hintnuts_Standardlimb_002328" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_01" Offset="0x2328" />
-        <Limb Name="object_hintnuts_Standardlimb_002334" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_02" Offset="0x2334" />
-        <Limb Name="object_hintnuts_Standardlimb_002340" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_03" Offset="0x2340" />
-        <Limb Name="object_hintnuts_Standardlimb_00234C" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_04" Offset="0x234C" />
-        <Limb Name="object_hintnuts_Standardlimb_002358" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_05" Offset="0x2358" />
-        <Limb Name="object_hintnuts_Standardlimb_002364" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_06" Offset="0x2364" />
-        <Limb Name="object_hintnuts_Standardlimb_002370" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_07" Offset="0x2370" />
-        <Limb Name="object_hintnuts_Standardlimb_00237C" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_08" Offset="0x237C" />
-        <Limb Name="object_hintnuts_Standardlimb_002388" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_09" Offset="0x2388" />
-        <Skeleton Name="object_hintnuts_Skel_0023B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HINTNUTS_LIMB_NONE" LimbMax="OBJECT_HINTNUTS_LIMB_MAX" EnumName="ObjectHintnutsLimb" Offset="0x23B8" />
-        <Animation Name="object_hintnuts_Anim_0024CC" Offset="0x24CC" /> <!-- Original name is "dnh_dig" -->
-        <Animation Name="object_hintnuts_Anim_0026C4" Offset="0x26C4" /> <!-- Original name is "dnh_jump" -->
-        <Animation Name="object_hintnuts_Anim_002894" Offset="0x2894" /> <!-- Original name is "dnh_lookaround" -->
-        <Animation Name="object_hintnuts_Anim_0029BC" Offset="0x29BC" /> <!-- Original name is "dnh_mahi" -->
-        <Animation Name="object_hintnuts_Anim_002B90" Offset="0x2B90" /> <!-- Original name is "dnh_start" -->
-        <Animation Name="object_hintnuts_Anim_002E84" Offset="0x2E84" /> <!-- Original name is "dnh_talk" -->
-        <Animation Name="object_hintnuts_Anim_002F7C" Offset="0x2F7C" /> <!-- Original name is "dnh_wait" -->
-        <Animation Name="object_hintnuts_Anim_003128" Offset="0x3128" /> <!-- Original name is "dnh_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_horse_game_check.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_horse_game_check.xml
deleted file mode 100644
index fd5e2f398..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_horse_game_check.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_horse_game_check" Segment="6">
-        <Texture Name="object_horse_game_check_Tex_000048" OutName="tex_000048" Format="i8" Width="64" Height="64" Offset="0x48" />
-        <DList Name="object_horse_game_check_DL_001048" Offset="0x1048" />
-        <DList Name="object_horse_game_check_DL_0013A0" Offset="0x13A0" />
-        <DList Name="object_horse_game_check_DL_0014B0" Offset="0x14B0" />
-        <Texture Name="object_horse_game_check_Tex_001590" OutName="tex_001590" Format="ia4" Width="64" Height="64" Offset="0x1590" />
-        <Texture Name="object_horse_game_check_Tex_001D90" OutName="tex_001D90" Format="rgba16" Width="32" Height="32" Offset="0x1D90" />
-        <Texture Name="object_horse_game_check_Tex_002590" OutName="tex_002590" Format="i8" Width="64" Height="32" Offset="0x2590" />
-        <Collision Name="object_horse_game_check_Colheader_002FB8" Offset="0x2FB8" />
-        <DList Name="object_horse_game_check_DL_003030" Offset="0x3030" /> <!-- Original name is "z2_umajamp_modelT" -->
-        <DList Name="object_horse_game_check_DL_0030C0" Offset="0x30C0" />
-        <Texture Name="object_horse_game_check_Tex_0030C8" OutName="tex_0030C8" Format="rgba16" Width="32" Height="32" Offset="0x30C8" />
-        <Collision Name="object_horse_game_check_Colheader_003918" Offset="0x3918" /> <!-- Original name is "z2_umajamp_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_horse_link_child.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_horse_link_child.xml
deleted file mode 100644
index 535ea1d86..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_horse_link_child.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<Root>
-    <!-- Epona -->
-    <File Name="object_horse_link_child" Segment="6">
-        <DList Name="object_horse_link_child_DL_000C70" Offset="0xC70" />
-        <DList Name="object_horse_link_child_DL_001028" Offset="0x1028" />
-        <DList Name="object_horse_link_child_DL_0010D8" Offset="0x10D8" />
-        <DList Name="object_horse_link_child_DL_0011E8" Offset="0x11E8" />
-        <DList Name="object_horse_link_child_DL_001298" Offset="0x1298" />
-        <DList Name="object_horse_link_child_DL_0013A8" Offset="0x13A8" />
-        <DList Name="object_horse_link_child_DL_0014B8" Offset="0x14B8" />
-        <DList Name="object_horse_link_child_DL_001568" Offset="0x1568" />
-        <DList Name="object_horse_link_child_DL_001678" Offset="0x1678" />
-
-        <Texture Name="gEponaTLUT" OutName="epona_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728" />
-
-        <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728" />
-        <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728" />
-        <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728" />
-
-        <Texture Name="object_horse_link_child_Tex_001F28" OutName="tex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" />
-        <Texture Name="object_horse_link_child_Tex_001F68" OutName="tex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" />
-        <Texture Name="object_horse_link_child_Tex_002168" OutName="tex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" />
-        <Texture Name="object_horse_link_child_Tex_002368" OutName="tex_002368" Format="rgba16" Width="16" Height="16" Offset="0x2368" />
-        <Texture Name="object_horse_link_child_Tex_002568" OutName="tex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" />
-        <Texture Name="object_horse_link_child_Tex_002588" OutName="tex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" />
-        <Texture Name="object_horse_link_child_Tex_002788" OutName="tex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" />
-
-        <Animation Name="gEponaGallopAnim" Offset="0x2F98" /> <!-- Original name is "hlc_anim_fastrun_30" -->
-        <Animation Name="object_horse_link_child_Anim_0035B0" Offset="0x35B0" /> <!-- Original name is "hlc_anim_jump100" -->
-        <Animation Name="object_horse_link_child_Anim_003D38" Offset="0x3D38" /> <!-- Original name is "hlc_anim_jump200" -->
-        <Animation Name="gEponaTrotAnim" Offset="0x43AC" /> <!-- Original name is "hlc_anim_slowrun_30" -->
-        <Animation Name="object_horse_link_child_Anim_004DE8" Offset="0x4DE8" /> <!-- Original name is "hlc_anim_stand" -->
-        <Animation Name="object_horse_link_child_Anim_005F64" Offset="0x5F64" /> <!-- Original name is "hlc_anim_stop" -->
-        <Animation Name="gEponaIdleAnim" Offset="0x6D44" /> <!-- Original name is "hlc_anim_wait" -->
-        <Animation Name="gEponaWhinnyAnim" Offset="0x7468" /> <!-- Original name is "hlc_anim_wait02" -->
-        <Animation Name="gEponaWalkAnim" Offset="0x7D50" /> <!-- Original name is "hlc_anim_walk_30" -->
-
-        <!-- <Blob Name="object_horse_link_child_Blob_007D60" Size="0x2388" Offset="0x7D60" /> -->
-
-        <!-- z64Utils will not render because of skin type skeleton -->
-        <Limb Name="object_horse_link_child_Skinlimb_00A0E8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_01" Offset="0xA0E8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A0F8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_02" Offset="0xA0F8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A108" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_03" Offset="0xA108" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A118" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_04" Offset="0xA118" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A128" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_05" Offset="0xA128" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A138" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_06" Offset="0xA138" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A148" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_07" Offset="0xA148" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A158" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_08" Offset="0xA158" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A168" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_09" Offset="0xA168" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A178" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0A" Offset="0xA178" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A188" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0B" Offset="0xA188" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A198" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0C" Offset="0xA198" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1A8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0D" Offset="0xA1A8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1B8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0E" Offset="0xA1B8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1C8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_0F" Offset="0xA1C8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1D8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_10" Offset="0xA1D8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1E8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_11" Offset="0xA1E8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A1F8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_12" Offset="0xA1F8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A208" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_13" Offset="0xA208" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A218" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_14" Offset="0xA218" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A228" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_15" Offset="0xA228" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A238" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_16" Offset="0xA238" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A248" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_17" Offset="0xA248" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A258" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_18" Offset="0xA258" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A268" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_19" Offset="0xA268" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A278" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1A" Offset="0xA278" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A288" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1B" Offset="0xA288" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A298" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1C" Offset="0xA298" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2A8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1D" Offset="0xA2A8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2B8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1E" Offset="0xA2B8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2C8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_1F" Offset="0xA2C8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2D8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_20" Offset="0xA2D8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2E8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_21" Offset="0xA2E8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A2F8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_22" Offset="0xA2F8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A308" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_23" Offset="0xA308" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A318" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_24" Offset="0xA318" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A328" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_25" Offset="0xA328" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A338" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_26" Offset="0xA338" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A348" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_27" Offset="0xA348" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A358" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_28" Offset="0xA358" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A368" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_29" Offset="0xA368" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A378" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2A" Offset="0xA378" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A388" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2B" Offset="0xA388" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A398" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2C" Offset="0xA398" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A3A8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2D" Offset="0xA3A8" />
-        <Limb Name="object_horse_link_child_Skinlimb_00A3B8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2E" Offset="0xA3B8" />
-        <Skeleton Name="gEponaSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_HORSE_LINK_CHILD_LIMB_NONE" LimbMax="OBJECT_HORSE_LINK_CHILD_LIMB_MAX" EnumName="ObjectHorseLinkChildLimb" Offset="0xA480" />
-
-        <Animation Name="object_horse_link_child_Anim_00A8DC" Offset="0xA8DC" /> <!-- Original name is "hlc_inanaki" -->
-        <Animation Name="object_horse_link_child_Anim_00AD08" Offset="0xAD08" /> <!-- Original name is "hlc_inanaki_modori" -->
-        <Animation Name="object_horse_link_child_Anim_00B3E0" Offset="0xB3E0" /> <!-- Original name is "hlc_inanaki_wait" -->
-        <Animation Name="object_horse_link_child_Anim_00BDE0" Offset="0xBDE0" /> <!-- Original name is "hlc_lost_house2" -->
-        <Animation Name="object_horse_link_child_Anim_00D178" Offset="0xD178" /> <!-- Original name is "hlc_lost_house_inanaki" -->
-        <Animation Name="object_horse_link_child_Anim_00D4E8" Offset="0xD4E8" /> <!-- Original name is "hlc_lost_house_inanaki_run" -->
-
-        <DList Name="object_horse_link_child_DL_00D500" Offset="0xD500" />
-        <!-- skin textures -->
-        <Texture Name="object_horse_link_child_Tex_00DAF0" OutName="tex_00DAF0" Format="rgba16" Width="16" Height="16" Offset="0xDAF0" />
-        <Texture Name="object_horse_link_child_Tex_00DCF0" OutName="tex_00DCF0" Format="rgba16" Width="32" Height="32" Offset="0xDCF0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hs.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hs.xml
deleted file mode 100644
index be333f1dc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hs.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<Root>
-    <!-- Grog: the Cucco keeper, you raise his Cucco chicks into adults to earn the Bunny Hood mask -->
-    <File Name="object_hs" Segment="6">
-        <Animation Name="gHsShiveringAnim" Offset="0x304" /> <!-- Original name is "h_purupuru" (onomatopoeic for "shivering"), unused -->
-        <Animation Name="gHsPleadingAnim" Offset="0x528" /> <!-- Original name is "h_tanomuu" ("to beg"), unused -->
-        <Animation Name="gHsIdleAnim" Offset="0x5C0" /> <!-- Original name is "h_matsu" ("to wait") -->
-        <DList Name="object_hs_DL_003760" Offset="0x3760" />
-        <DList Name="object_hs_DL_003AB0" Offset="0x3AB0" />
-        <DList Name="object_hs_DL_004140" Offset="0x4140" />
-        <DList Name="object_hs_DL_0042A0" Offset="0x42A0" />
-        <DList Name="object_hs_DL_004380" Offset="0x4380" />
-        <DList Name="object_hs_DL_004728" Offset="0x4728" />
-        <DList Name="object_hs_DL_004860" Offset="0x4860" />
-        <DList Name="object_hs_DL_004960" Offset="0x4960" />
-        <DList Name="object_hs_DL_004AB8" Offset="0x4AB8" />
-        <DList Name="object_hs_DL_004BF0" Offset="0x4BF0" />
-        <DList Name="gHsEndDL" Offset="0x4CF0" />
-        <DList Name="object_hs_DL_004CF8" Offset="0x4CF8" />
-        <Texture Name="object_hs_TLUT_004E50" OutName="tlut_004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50" />
-        <Texture Name="gHsRibsTex" OutName="ribs" Format="ci8" Width="16" Height="32" Offset="0x5050" />
-        <Texture Name="gHsEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x5250" />
-        <Texture Name="gHsMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x5290" />
-        <Texture Name="gHsEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x5490" />
-        <Texture Name="gHsPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5890" />
-        <Texture Name="gHsFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x5990" />
-        <Texture Name="gHsBraceletTex" OutName="bracelet" Format="rgba16" Width="4" Height="4" Offset="0x5A90" />
-        <Texture Name="gHsCuccoFeedBagTex" OutName="cucco_feed_bag" Format="ci8" Width="8" Height="8" Offset="0x5AB0" />
-        <Texture Name="gHsChairBoxTex" OutName="chair_box" Format="ci8" Width="32" Height="32" Offset="0x5AF0" />
-        <Texture Name="gHsAbsTex" OutName="abs" Format="ci8" Width="8" Height="16" Offset="0x5EF0" />
-        <Texture Name="gHsBackTex" OutName="back" Format="ci8" Width="16" Height="32" Offset="0x5F70" />
-        <Limb Name="gHsRootLimb" Type="Standard" EnumName="HS_LIMB_ROOT" Offset="0x6170" />
-        <Limb Name="gHsLeftUpperArmLimb" Type="Standard" EnumName="HS_LIMB_LEFT_UPPER_ARM" Offset="0x617C" />
-        <Limb Name="gHsLeftForearmLimb" Type="Standard" EnumName="HS_LIMB_LEFT_FOREARM" Offset="0x6188" />
-        <Limb Name="gHsLeftHandLimb" Type="Standard" EnumName="HS_LIMB_LEFT_HAND" Offset="0x6194" />
-        <Limb Name="gHsRightUpperArmLimb" Type="Standard" EnumName="HS_LIMB_RIGHT_UPPER_ARM" Offset="0x61A0" />
-        <Limb Name="gHsRightForearmLimb" Type="Standard" EnumName="HS_LIMB_RIGHT_FOREARM" Offset="0x61AC" />
-        <Limb Name="gHsRightHandLimb" Type="Standard" EnumName="HS_LIMB_RIGHT_HAND" Offset="0x61B8" />
-        <Limb Name="gHsHeadRootLimb" Type="Standard" EnumName="HS_LIMB_HEAD_ROOT" Offset="0x61C4" />
-        <Limb Name="gHsHeadLimb" Type="Standard" EnumName="HS_LIMB_HEAD" Offset="0x61D0" />
-        <Limb Name="gHsHairSpikesLimb" Type="Standard" EnumName="HS_LIMB_HAIR_SPIKES" Offset="0x61DC" />
-        <!-- this limb is nulled in the override limb function -->
-        <Limb Name="gHsHiddenHairLimb" Type="Standard" EnumName="HS_LIMB_HIDDEN_HAIR" Offset="0x61E8" />
-        <!-- both of these use the same display list, which is just an end display list, unfinished content? -->
-        <Limb Name="object_hs_Standardlimb_0061F4" Type="Standard" EnumName="OBJECT_HS_LIMB_0C" Offset="0x61F4" />
-        <Limb Name="object_hs_Standardlimb_006200" Type="Standard" EnumName="OBJECT_HS_LIMB_0D" Offset="0x6200" />
-        <!-- shoulders down to toes plus box hes sitting on -->
-        <Limb Name="gHsChestAndLowerBodyPlusBoxLimb" Type="Standard" EnumName="HS_LIMB_LOWER_BODY_PLUS_BOX" Offset="0x620C" />
-        <Limb Name="gHsCuccoFeedBagsLimb" Type="Standard" EnumName="HS_LIMB_CUCCO_FEED_BAGS" Offset="0x6218" />
-        <Skeleton Name="gHsSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HS_LIMB_NONE" LimbMax="OBJECT_HS_LIMB_MAX" EnumName="ObjectHsLimb" Offset="0x6260" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hsstump.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hsstump.xml
deleted file mode 100644
index f8e466603..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hsstump.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_hsstump" Segment="6">
-        <DList Name="object_hsstump_DL_0003B0" Offset="0x3B0" />
-        <DList Name="object_hsstump_DL_0003B8" Offset="0x3B8" /> <!-- Original name is "z2_miki_model" -->
-        <Texture Name="object_hsstump_Tex_0005A0" OutName="tex_0005A0" Format="rgba16" Width="16" Height="16" Offset="0x5A0" />
-        <Texture Name="object_hsstump_TLUT_0007A0" OutName="tlut_0007A0" Format="rgba16" Width="4" Height="4" Offset="0x7A0" />
-        <Texture Name="object_hsstump_Tex_0007C0" OutName="tex_0007C0" Format="ci4" Width="64" Height="64" Offset="0x7C0" />
-        <Collision Name="object_hsstump_Colheader_0011B0" Offset="0x11B0" /> <!-- Original name is "z2_miki_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hunsui.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hunsui.xml
deleted file mode 100644
index a97f8f094..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_hunsui.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_hunsui" Segment="6">
-        <DList Name="object_hunsui_DL_000220" Offset="0x220" /> <!-- Original name might be "m2_SEAhunsui_4_modelT" -->
-        <Texture Name="object_hunsui_Tex_0003E0" OutName="tex_0003E0" Format="rgba16" Width="32" Height="32" Offset="0x3E0" />
-        <TextureAnimation Name="object_hunsui_Matanimheader_000BF0" Offset="0xBF0" />
-        <Collision Name="object_hunsui_Colheader_000C74" Offset="0xC74" /> <!-- Original name might be "m2_SEAhunsui_4_bgdatainfo" -->
-        <DList Name="object_hunsui_DL_000EC0" Offset="0xEC0" /> <!-- Original name might be "m2_SEAhunsui20_5_modelT" -->
-        <Texture Name="object_hunsui_Tex_001078" OutName="tex_001078" Format="rgba16" Width="32" Height="32" Offset="0x1078" />
-        <TextureAnimation Name="object_hunsui_Matanimheader_001888" Offset="0x1888" />
-        <Collision Name="object_hunsui_Colheader_00190C" Offset="0x190C" /> <!-- Original name might be "m2_SEAhunsui20_5_bgdatainfo". Unused duplicate of object_hunsui_Colheader_000C74 -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ice_block.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ice_block.xml
deleted file mode 100644
index 4b5cd47d4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ice_block.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="object_ice_block" Segment="6">
-        <!-- IceArrow Freezes ChuChu into a Pushable/Climbable Cube block -->
-        <DList Name="gIceBlockCubeDL" Offset="0x1A0" /> <!-- Original name is "ic_block_modelT" -->
-        <DList Name="gIceBlockCubeEndDL" Offset="0x310" /> <!-- Original name is "ic_block_model" -->
-        <!-- this TexAnim is for the cube surface -->
-        <TextureAnimation Name="gIceBlockCubeSublimatingAirTexAnim" Offset="0x328" />
-        <Collision Name="gIceBlockCol" Offset="0x438" /> <!-- Original name is "ic_block_bgdatainfo" -->
-
-        <!-- IceArrow Freezes Octarock into a floating Iceberg platform -->
-        <DList Name="gIceBlockIceBergDL" Offset="0x7F0" /> <!-- Original name is "ic_blockdai_modelT" -->
-        <DList Name="gIceBlockIceBergEndDL" Offset="0x9B8" /> <!-- Original name is "ic_blockdai_model" -->
-        <!-- this TexAnim is for the iceberg surface -->
-        <TextureAnimation Name="gIceBlockIceBergSublimatingAirTexAnim" Offset="0x9D0" />
-
-        <!-- Shard of Ice thrown off of IceBlock (EffectEnIceBlock) -->
-        <!--   IceArrow creates frozen block or platform, throws shards during growing animation -->
-        <!-- too big to be a snow flake, more like thin block of ice, better described as "Chip", or "Shard" or "Plate" -->
-        <DList Name="gIceBlockShardEffectEndDL" Offset="0xA30" /> <!-- Original name is "ic_kakera_modelT" -->
-        <DList Name="gIceBlockShardEffectDL" Offset="0xA38" /> <!-- Original name is "ic_kakera_model" -->
-
-        <!-- These two appear to be identical (but different hash) -->
-        <!-- first is used in CubeDL and ShardDL -->
-        <Texture Name="gIceBlockIce1Tex" OutName="iceblock_ice_1" Format="i4" Width="64" Height="64" Offset="0xAE0" />
-        <!-- second is used in CubeDL and IceBergDL -->
-        <Texture Name="gIceBlockIce2Tex" OutName="iceblock_ice_2" Format="i4" Width="64" Height="64" Offset="0x12E0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_icefloe.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_icefloe.xml
deleted file mode 100644
index 0440fa4bb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_icefloe.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_icefloe" Segment="6">
-        <DList Name="gIcefloeIcePlatformDL" Offset="0x1E0" /> <!-- Original name is "w_ice_model" -->
-        <Texture Name="gIcefloePlatformTex" OutName="icefloe_iceplatform" Format="rgba16" Width="32" Height="32" Offset="0x2C8" />
-        <Collision Name="gIcefloePlatformCol" Offset="0xC90" /> <!-- Original name is "w_ice_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_icicle.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_icicle.xml
deleted file mode 100644
index d3275aa46..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_icicle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Icicles -->
-    <File Name="object_icicle" Segment="6">
-        <DList Name="gIcicleDL" Offset="0xD0" /> <!-- Original name is "ice_turara_model" -->
-        <Collision Name="gIcicleCol" Offset="0x294" /> <!-- Original name is "ice_turara_bgdatainfo" -->
-        <Texture Name="gIcicleTex" OutName="icicle" Format="i8" Width="64" Height="64" Offset="0x2C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ik.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ik.xml
deleted file mode 100644
index af271f081..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ik.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<Root>
-    <!-- This is the object for the Iron Knuckle Enemy -->
-    <File Name="object_ik" Segment="6">
-        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0xCE8" /> <!-- Original name is "ironknack_attackA" -->
-        <Animation Name="gIronKnuckleRecoverVerticalAttackAnim" Offset="0x15F8" /> <!-- Original name is "ironknack_attackA_end" -->
-        <Animation Name="gIronKnuckleEndVerticalAttackAnim" Offset="0x1ABC" /> <!-- Original name is "ironknack_attackA_hit" -->
-        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x2484" /> <!-- Original name is "ironknack_attackB" -->
-        <Animation Name="gIronKnuckleEndHorizontalAttackAnim" Offset="0x2E7C" /> <!-- Original name is "ironknack_attackB_end" -->
-        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x367C" /> <!-- Original name is "ironknack_back_hit" -->
-        <Animation Name="gIronKnuckleBlockAnim" Offset="0x391C" /> <!-- Original name is "ironknack_defense" -->
-        <Animation Name="gIronKnuckleDeathAnim" Offset="0x4A04" /> <!-- Original name is "ironknack_down" -->
-        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x5254" /> <!-- Original name is "ironknack_front_hit" -->
-        <Animation Name="gIronKnuckleRunAnim" Offset="0x57F4" /> <!-- Original name is "ironknack_run" -->
-        <Animation Name="gIronKnuckleWalkAnim" Offset="0x6294" /> <!-- Original name is "ironknack_walk" -->
-        <Array Name="gObjectIkVtx_0062B0" Count="889" Offset="0x62B0">
-            <Vtx/>
-        </Array>
-        <DList Name="gIronKnuckleArmorFrontDL" Offset="0x9A40" /> <!-- Original name is "ironknack_front_armer" -->
-        <DList Name="gIronKnuckleArmorBackDL" Offset="0x9BC8" /> <!-- Original name is "ironknack_back_armer" -->
-        <DList Name="gIronKnuckleAxeDL" Offset="0x9D20" />
-        <DList Name="gIronKnuckleRightHandDL" Offset="0x9FD8" />
-        <DList Name="gIronKnuckleLowerRightPauldronDL" Offset="0xA130" /> <!-- Original name is "ironknack_Rshoulder_b" -->
-        <DList Name="gIronKnuckleLeftHandDL" Offset="0xA1F0" />
-        <DList Name="gIronKnuckleLowerLeftPauldronDL" Offset="0xA348" /> <!-- Original name is "ironknack_Lshoulder_b" -->
-        <DList Name="gIronKnuckleUpperRightPauldronDL" Offset="0xA408" /> <!-- Original name is "ironknack_Rshoulder" -->
-        <DList Name="gIronKnuckleUpperLeftPauldronDL" Offset="0xA4F0" /> <!-- Original name is "ironknack_Lshoulder" -->
-        <DList Name="gIronKnuckleFrontTorsoArmorMarkingDL" Offset="0xA5D8" />
-        <DList Name="gIronKnuckleRearTorsoArmorMarkingDL" Offset="0xA6D0" />
-        <DList Name="gIronKnuckleRivetsMarking1DL" Offset="0xA780" />
-        <DList Name="gIronKnuckleRivetsMarking2DL" Offset="0xA820" />
-        <DList Name="gIronKnuckleBasMarkingDL" Offset="0xBF80" /> <!-- Original name is "ironknack_head" -->
-        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0xC200" />
-        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0xCF08" />
-        <DList Name="gIronKnuckleTanArmorMaterialDL" Offset="0xD038" />
-        <DList Name="gIronKnuckleBronzeArmorMaterialDL" Offset="0xD050" />
-        <DList Name="gIronKnuckleSilverArmorMaterialDL" Offset="0xD068" />
-        <DList Name="gIronKnuckleBlackArmorMaterialDL" Offset="0xD080" />
-        <DList Name="gIronKnuckleBrownArmorMaterialDL" Offset="0xD098" />
-        <DList Name="gIronKnuckleWhiteArmorMaterialDL" Offset="0xD0B0" />
-        <DList Name="gIronKnuckleGoldArmorMaterialDL" Offset="0xD0C8" />
-        <DList Name="gIronKnuckleTorsoDL" Offset="0xEC20" />
-        <DList Name="gIronKnuckleVambraceLeftDL" Offset="0xEFD8" />
-        <DList Name="gIronKnuckleArmLeftDL" Offset="0xF270" />
-        <DList Name="gIronKnuckleVambraceRightDL" Offset="0xF3F8" />
-        <DList Name="gIronKnuckleArmRightDL" Offset="0xF690" />
-        <DList Name="gIronKnuckleHandDL" Offset="0xF818" />
-        <DList Name="gIronKnuckleWaistDL" Offset="0xF8E0" />
-        <DList Name="gIronKnucklePauldronLeftDL" Offset="0xFC20" />
-        <DList Name="gIronKnuckleBootTipLeftDL" Offset="0xFD68" />
-        <DList Name="gIronKnuckleWaistArmorLeftDL" Offset="0xFFA8" />
-        <DList Name="gIronKnucklePauldronRightDL" Offset="0x10358" />
-        <DList Name="gIronKnuckleBootTipRightDL" Offset="0x104A0" />
-        <DList Name="gIronKnuckleWaistArmorRightDL" Offset="0x106E0" />
-        <Texture Name="gIronKnuckleChainMailTLUT" OutName="iron_knuckle_chain_mail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10A30" />
-        <Texture Name="gIronKnuckleRivet1Tex" OutName="iron_knuckle_rivet_1" Format="ia16" Width="16" Height="16" Offset="0x10C30" />
-        <Texture Name="gIronKnuckleHair1Tex" OutName="iron_knuckle_hair_1" Format="ci8" Width="16" Height="16" Offset="0x10E30" />
-        <Texture Name="gIronKnuckleAxePomelJewel1Tex" OutName="iron_knuckle_axe_pomel_1_jewel" Format="ci8" Width="16" Height="16" Offset="0x10F30" />
-        <!-- Odd size-->
-        <Texture Name="gIronKnuckleAxeTLUT" OutName="iron_knuckle_axe_tlut" Format="rgba16" Width="183" Height="1" Offset="0x11030" />
-        <Texture Name="gIronKnuckleFireTex" OutName="iron_knuckle_fire" Format="i4" Width="32" Height="64" Offset="0x111A0" />
-        <Texture Name="gIronKnuckleRivet2Tex" OutName="iron_knuckle_rivet_2" Format="ia8" Width="32" Height="32" Offset="0x115A0" />
-        <Texture Name="gIronKnuckleBlockPatternTex" OutName="iron_knuckle_block_pattern" Format="rgba16" Width="16" Height="16" Offset="0x119A0" />
-        <Texture Name="gIronKnuckleChainMailTex" OutName="iron_knuckle_chain_mail" Format="rgba16" Width="16" Height="16" Offset="0x11BA0" />
-        <Texture Name="gIronKnuckleArmorEmblemTex" OutName="iron_knuckle_emblem" Format="ia16" Width="32" Height="32" Offset="0x11DA0" />
-        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="iron_knuckle_gerudo_eye" Format="rgba16" Width="32" Height="32" Offset="0x125A0" />
-        <Texture Name="gIronKnuckleChestJewelTex" OutName="iron_knuckle_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x12DA0" />
-        <Texture Name="gIronKnuckleArmorRivet2Tex" OutName="iron_knuckle_armor_rivet_2" Format="ia8" Width="16" Height="16" Offset="0x12EA0" />
-        <!-- Odd size-->
-        <Texture Name="gIronKnuckleArmorTLUT" OutName="iron_knuckle_armor_tlut" Format="rgba16" Width="120" Height="1" Offset="0x12FA0" />
-        <Texture Name="gIronKnuckleForeheadJewelTex" OutName="iron_knuckle_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x13090" />
-        <Texture Name="gIronKnuckleGerudoSkinTex" OutName="iron_knuckle_gerudo_skin" Format="ci8" Width="8" Height="8" Offset="0x13190" />
-        <Texture Name="gIronKnuckleHair2Tex" OutName="iron_knuckle_hair_2" Format="ci8" Width="16" Height="16" Offset="0x131D0" />
-        <Texture Name="gIronKnuckleEarTex" OutName="iron_knuckle_ear" Format="ci8" Width="8" Height="16" Offset="0x132D0" />
-        <Texture Name="gIronKnuckleForeheadDecal1Tex" OutName="iron_knuckle_forehead_decal_1" Format="ci8" Width="8" Height="16" Offset="0x13350" />
-        <Texture Name="gIronKnuckleForeheadDecal2Tex" OutName="iron_knuckle_forehead_decal_2" Format="ci8" Width="16" Height="16" Offset="0x133D0" />
-        <Limb Name="gIronKnuckleRootLimb" Type="Standard" EnumName="IRON_KNUCKLE_LIMB_ROOT" Offset="0x134D0" />
-        <Limb Name="gIronKnuckleTassetCenterLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_CENTER" Type="Standard" Offset="0x134DC" />
-        <Limb Name="gIronKnuckleTassetRightLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_RIGHT" Type="Standard" Offset="0x134E8" />
-        <Limb Name="gIronKnuckleRightLegLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_LEG" Type="Standard" Offset="0x134F4" />
-        <Limb Name="gIronKnuckleRightFootLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_FOOT" Type="Standard" Offset="0x13500" />
-        <Limb Name="gIronKnuckleTassetLeftLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_LEFT" Type="Standard" Offset="0x1350C" />
-        <Limb Name="gIronKnuckleLeftLegLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_LEG" Type="Standard" Offset="0x13518" />
-        <Limb Name="gIronKnuckleLeftFootLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_FOOT" Type="Standard" Offset="0x13524" />
-        <Limb Name="gIronKnuckleUpperBodyRoot" EnumName="IRON_KNUCKLE_LIMB_UPPER_BODY_ROOT" Type="Standard" Offset="0x13530" />
-        <Limb Name="gIronKnuckleUnkRootLimb" EnumName="IRON_KNUCKLE_LIMB_UNK_ROOT" Type="Standard" Offset="0x1353C" />
-        <Limb Name="gIronKnuckleHeadRootLimb" EnumName="IRON_KNUCKLE_LIMB_HEAD_ROOT" Type="Standard" Offset="0x13548" />
-        <Limb Name="gIronKnuckleHelmetArmorLimb" EnumName="IRON_KNUCKLE_LIMB_HELMET_ARMOR" Type="Standard" Offset="0x13554" />
-        <Limb Name="gIronKnuckleHeadLimb" EnumName="IRON_KNUCKLE_LIMB_HEAD" Type="Standard" Offset="0x13560" />
-        <Limb Name="gIronKnuckleRightUpperArmLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_UPPER_ARM" Type="Standard" Offset="0x1356C" />
-        <Limb Name="gIronKnuckleRightForearmLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_FOREARM" Type="Standard" Offset="0x13578" />
-        <Limb Name="gIronKnuckleAxeRootLimb" EnumName="IRON_KNUCKLE_LIMB_AXE_ROOT" Type="Standard" Offset="0x13584" />
-        <Limb Name="gIronKnuckleAxeLimb" EnumName="IRON_KNUCKLE_LIMB_AXE" Type="Standard" Offset="0x13590" />
-        <Limb Name="gIronKnuckleRightHandLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_HAND" Type="Standard" Offset="0x1359C" />
-        <Limb Name="gIronKnuckleLeftUpperArmLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_UPPER_ARM" Type="Standard" Offset="0x135A8" />
-        <Limb Name="gIronKnuckleLeftForearmLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_FOREARM" Type="Standard" Offset="0x135B4" />
-        <Limb Name="gIronKnuckleLeftHandLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_HAND" Type="Standard" Offset="0x135C0" />
-        <Limb Name="gIronKnuckleUpperLeftPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_UPPER_LEFT_PAULDRON" Type="Standard" Offset="0x135CC" />
-        <Limb Name="gIronKnuckleLowerLeftPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_LOWER_LEFT_PAULDRON" Type="Standard" Offset="0x135D8" />
-        <Limb Name="gIronKnuckleUpperRightPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_UPPER_RIGHT_PAULDRON" Type="Standard" Offset="0x135E4" />
-        <Limb Name="gIronKnuckleLowerRightPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_LOWER_RIGHT_PAULDRON" Type="Standard" Offset="0x135F0" />
-        <Limb Name="gIronKnuckleChestArmorFrontLimb" EnumName="IRON_KNUCKLE_LIMB_CHEST_ARMOR_FRONT" Type="Standard" Offset="0x135FC" />
-        <Limb Name="gIronKnuckleChestArmorBackLimb" EnumName="IRON_KNUCKLE_LIMB_CHEST_ARMOR_BACK" Type="Standard" Offset="0x13608" />
-        <Limb Name="gIronKnuckleTorsoLimb" EnumName="IRON_KNUCKLE_LIMB_TORSO" Type="Standard" Offset="0x13614" />
-        <Limb Name="gIronKnuckleWaistLimb" EnumName="IRON_KNUCKLE_LIMB_WAIST" Type="Standard" Offset="0x13620" />
-        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" LimbNone="IRON_KNUCKLE_LIMB_NONE" LimbMax="IRON_KNUCKLE_LIMB_MAX" EnumName="IronKnuckleLimb" Offset="0x136A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ikana_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ikana_obj.xml
deleted file mode 100644
index 0b67e7757..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ikana_obj.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<Root>
-    <File Name="object_ikana_obj" Segment="6">
-        <DList Name="object_ikana_obj_DL_000040" Offset="0x40" /> <!-- Original name is "m2_IKA_BOMBfl_modelT" -->
-        <DList Name="object_ikana_obj_DL_000048" Offset="0x48" /> <!-- Original name is "m2_IKA_BOMBfl_model" -->
-        <Collision Name="object_ikana_obj_Colheader_000128" Offset="0x128" /> <!-- Original name is "m2_IKA_BOMBfl_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_000280" Offset="0x280" /> <!-- Original name is "m2_IKA_BOMBhahen_modelT" -->
-        <DList Name="object_ikana_obj_DL_000288" Offset="0x288" /> <!-- Original name is "m2_IKA_BOMBhahen_model" -->
-        <DList Name="object_ikana_obj_DL_000370" Offset="0x370" /> <!-- Original name is "m2_IKA_BOMBwall_modelT" -->
-        <DList Name="object_ikana_obj_DL_000378" Offset="0x378" /> <!-- Original name is "m2_IKA_BOMBwall_model" -->
-        <Collision Name="object_ikana_obj_Colheader_000488" Offset="0x488" /> <!-- Original name is "m2_IKA_BOMBwall_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_0008C0" Offset="0x8C0" /> <!-- Original name is "m2_IKA_Dalma_modelT" -->
-        <DList Name="gStoneTowerTemplePunchablePillarDL" Offset="0x8C8" /> <!-- Original name is "m2_IKA_Dalma_model" -->
-        <Collision Name="gStoneTowerTemplePunchablePillarCol" Offset="0xC50" /> <!-- Original name is "m2_IKA_Dalma_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_000CE0" Offset="0xCE0" /> <!-- Not present in MM3D, but it was probably named "m2_IKA_KOUSI_modelT" based on the rest of this object. -->
-        <DList Name="object_ikana_obj_DL_000CE8" Offset="0xCE8" /> <!-- Original name is "m2_IKA_KOUSI_model" -->
-        <Collision Name="object_ikana_obj_Colheader_000F28" Offset="0xF28" /> <!-- Original name is "m2_IKA_KOUSI_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_001100" Offset="0x1100" /> <!-- Original name is "m2_IKA_LIGHT_modelT" -->
-        <DList Name="object_ikana_obj_DL_001210" Offset="0x1210" /> <!-- Original name is "m2_IKA_LIGHT_model" -->
-        <TextureAnimation Name="object_ikana_obj_Matanimheader_001228" Offset="0x1228" />
-        <DList Name="gStoneTowerTempleMirrorLightAbsorptionDL" Offset="0x14B0" /> <!-- Original name is "m2_IKA_MRin_modelT" -->
-        <DList Name="object_ikana_obj_DL_001660" Offset="0x1660" /> <!-- Original name is "m2_IKA_MRin_model" -->
-        <TextureAnimation Name="gStoneTowerTempleMirrorLightAbsorptionTexAnim" Offset="0x1678" />
-        <DList Name="gStoneTowerTempleMirrorLightEmissionDL" Offset="0x1880" /> <!-- Original name is "m2_IKA_MRout_modelT" -->
-        <DList Name="object_ikana_obj_DL_001AC0" Offset="0x1AC0" /> <!-- Original name is "m2_IKA_MRout_model" -->
-        <TextureAnimation Name="gStoneTowerTempleMirrorLightEmissionTexAnim" Offset="0x1AD8" />
-        <DList Name="object_ikana_obj_DL_001E10" Offset="0x1E10" /> <!-- Original name is "m2_IKA_Mirror_modelT" -->
-        <DList Name="gStoneTowerTempleMirrorDL" Offset="0x1E18" /> <!-- Original name is "m2_IKA_Mirror_model" -->
-        <Collision Name="gStoneTowerTempleMirrorCol" Offset="0x2358" /> <!-- Original name is "m2_IKA_Mirror_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_004710" Offset="0x4710" /> <!-- Not present in MM3D, but it was probably named "m2_IKA_room05_modelT" based on the rest of this object. -->
-        <DList Name="object_ikana_obj_DL_0048A0" Offset="0x48A0" /> <!-- Original name is "m2_IKA_room05_model" -->
-        <Collision Name="object_ikana_obj_Colheader_006368" Offset="0x6368" /> <!-- Original name is "m2_IKA_room05_bgdatainfo" -->
-        <DList Name="object_ikana_obj_DL_007360" Offset="0x7360" /> <!-- Not present in MM3D, but it was probably named "m2_IKA_room06_modelT" based on the rest of this object. -->
-        <DList Name="object_ikana_obj_DL_007448" Offset="0x7448" /> <!-- Original name is "m2_IKA_room06_model" -->
-        <TextureAnimation Name="object_ikana_obj_Matanimheader_007B68" Offset="0x7B68" />
-        <Collision Name="object_ikana_obj_Colheader_0084F8" Offset="0x84F8" /> <!-- Original name is "m2_IKA_room06_bgdatainfo" -->
-        <Texture Name="object_ikana_obj_TLUT_008530" OutName="tlut_008530" Format="rgba16" Width="4" Height="4" Offset="0x8530" />
-        <!-- <Blob Name="object_ikana_obj_Blob_008550" Size="0x40" Offset="0x8550" /> -->
-        <Texture Name="object_ikana_obj_TLUT_008590" OutName="tlut_008590" Format="rgba16" Width="4" Height="4" Offset="0x8590" />
-        <Texture Name="object_ikana_obj_Tex_0085B0" OutName="tex_0085B0" Format="rgba16" Width="16" Height="16" Offset="0x85B0" />
-        <Texture Name="object_ikana_obj_Tex_0087B0" OutName="tex_0087B0" Format="ci4" Width="64" Height="64" Offset="0x87B0" />
-        <Texture Name="gStoneTowerTemplePunchablePillarTex" OutName="stone_tower_temple_punchable_pillar" Format="rgba16" Width="32" Height="64" Offset="0x8FB0" />
-        <Texture Name="gStoneTowerTempleMirrorFrameTex" OutName="stone_tower_temple_mirror_frame" Format="rgba16" Width="16" Height="16" Offset="0x9FB0" />
-        <Texture Name="object_ikana_obj_Tex_00A1B0" OutName="tex_00A1B0" Format="rgba16" Width="16" Height="16" Offset="0xA1B0" />
-        <Texture Name="object_ikana_obj_Tex_00A3B0" OutName="tex_00A3B0" Format="rgba16" Width="32" Height="32" Offset="0xA3B0" />
-        <Texture Name="object_ikana_obj_Tex_00ABB0" OutName="tex_00ABB0" Format="rgba16" Width="32" Height="32" Offset="0xABB0" />
-        <Texture Name="object_ikana_obj_Tex_00B3B0" OutName="tex_00B3B0" Format="rgba16" Width="16" Height="16" Offset="0xB3B0" />
-        <Texture Name="object_ikana_obj_Tex_00B5B0" OutName="tex_00B5B0" Format="rgba16" Width="32" Height="32" Offset="0xB5B0" />
-        <Texture Name="object_ikana_obj_Tex_00BDB0" OutName="tex_00BDB0" Format="ci4" Width="16" Height="128" Offset="0xBDB0" />
-        <Texture Name="object_ikana_obj_Tex_00C1B0" OutName="tex_00C1B0" Format="rgba16" Width="16" Height="64" Offset="0xC1B0" />
-        <Texture Name="object_ikana_obj_Tex_00C9B0" OutName="tex_00C9B0" Format="ia8" Width="32" Height="64" Offset="0xC9B0" />
-        <Texture Name="object_ikana_obj_Tex_00D1B0" OutName="tex_00D1B0" Format="rgba16" Width="16" Height="64" Offset="0xD1B0" />
-        <Texture Name="object_ikana_obj_Tex_00D9B0" OutName="tex_00D9B0" Format="rgba16" Width="32" Height="32" Offset="0xD9B0" />
-        <Texture Name="object_ikana_obj_Tex_00E1B0" OutName="tex_00E1B0" Format="ia8" Width="32" Height="64" Offset="0xE1B0" />
-        <Texture Name="gStoneTowerTempleLightRaysTex" OutName="stone_tower_temple_light_rays" Format="ia16" Width="16" Height="64" Offset="0xE9B0" />
-        <Texture Name="gStoneTowerTempleLightPatternTex" OutName="stone_tower_temple_light_pattern" Format="rgba16" Width="32" Height="32" Offset="0xF1B0" />
-        <Texture Name="gStoneTowerTempleMirrorEmissionLightRaysTex" OutName="stone_tower_temple_mirror_emission_light_rays" Format="ia16" Width="16" Height="64" Offset="0xF9B0" />
-        <Texture Name="gStoneTowerTempleMirrorSurfaceTex" OutName="stone_tower_temple_mirror_surface" Format="rgba16" Width="32" Height="32" Offset="0x101B0" />
-        <Texture Name="gStoneTowerEmblemFrameTex" OutName="stone_tower_temple_emblem_frame" Format="ia8" Width="32" Height="64" Offset="0x109B0" />
-        <Texture Name="object_ikana_obj_Tex_0111B0" OutName="tex_0111B0" Format="rgba16" Width="32" Height="32" Offset="0x111B0" />
-        <Texture Name="object_ikana_obj_Tex_0119B0" OutName="tex_0119B0" Format="rgba16" Width="32" Height="32" Offset="0x119B0" />
-        <DList Name="object_ikana_obj_DL_012B70" Offset="0x12B70" /> <!-- Original name is probably "m2_IKA_RASENsita_model" (the model is just a green cube in MM3D) -->
-        <DList Name="object_ikana_obj_DL_013EA0" Offset="0x13EA0" /> <!-- Original name is probably "m2_IKA_RASENue_modelT" (the model is just a green cube in MM3D) -->
-        <DList Name="object_ikana_obj_DL_013EA8" Offset="0x13EA8" /> <!-- Original name is probably "m2_IKA_RASENue_model" (the model is just a green cube in MM3D) -->
-        <DList Name="object_ikana_obj_DL_014A40" Offset="0x14A40" /> <!-- Original name is "m2_IKA_shutter_model" -->
-        <Texture Name="object_ikana_obj_Tex_014BA0" OutName="tex_014BA0" Format="rgba16" Width="32" Height="64" Offset="0x14BA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ikn_demo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ikn_demo.xml
deleted file mode 100644
index bbb803499..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ikn_demo.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<Root>
-    <File Name="object_ikn_demo" Segment="6">
-        <!-- <Blob Name="object_ikn_demo_Blob_000000" Size="0x10" Offset="0x0" /> -->
-        <Animation Name="object_ikn_demo_Anim_0000B8" Offset="0xB8" /> <!-- Original name is "osk_default" -->
-        <DList Name="object_ikn_demo_DL_001D20" Offset="0x1D20" />
-        <DList Name="object_ikn_demo_DL_002128" Offset="0x2128" />
-        <DList Name="object_ikn_demo_DL_002208" Offset="0x2208" />
-        <DList Name="object_ikn_demo_DL_0022D0" Offset="0x22D0" />
-        <DList Name="object_ikn_demo_DL_002420" Offset="0x2420" />
-        <DList Name="object_ikn_demo_DL_0024E0" Offset="0x24E0" />
-        <DList Name="object_ikn_demo_DL_0025B0" Offset="0x25B0" />
-        <DList Name="object_ikn_demo_DL_002670" Offset="0x2670" />
-        <DList Name="object_ikn_demo_DL_002740" Offset="0x2740" />
-        <DList Name="object_ikn_demo_DL_002858" Offset="0x2858" />
-        <DList Name="object_ikn_demo_DL_002970" Offset="0x2970" />
-        <DList Name="object_ikn_demo_DL_0029F8" Offset="0x29F8" />
-        <DList Name="object_ikn_demo_DL_002A80" Offset="0x2A80" />
-        <DList Name="object_ikn_demo_DL_002B08" Offset="0x2B08" />
-        <DList Name="object_ikn_demo_DL_002B90" Offset="0x2B90" />
-        <DList Name="object_ikn_demo_DL_002C68" Offset="0x2C68" />
-        <Texture Name="object_ikn_demo_Tex_002D50" OutName="tex_002D50" Format="rgba16" Width="4" Height="4" Offset="0x2D50" />
-        <Texture Name="object_ikn_demo_Tex_002D70" OutName="tex_002D70" Format="rgba16" Width="8" Height="16" Offset="0x2D70" />
-        <Texture Name="object_ikn_demo_Tex_002E70" OutName="tex_002E70" Format="rgba16" Width="8" Height="16" Offset="0x2E70" />
-        <Texture Name="object_ikn_demo_Tex_002F70" OutName="tex_002F70" Format="rgba16" Width="8" Height="16" Offset="0x2F70" />
-        <Texture Name="object_ikn_demo_Tex_003070" OutName="tex_003070" Format="rgba16" Width="8" Height="8" Offset="0x3070" />
-        <Texture Name="object_ikn_demo_Tex_0030F0" OutName="tex_0030F0" Format="rgba16" Width="16" Height="16" Offset="0x30F0" />
-        <Texture Name="object_ikn_demo_Tex_0032F0" OutName="tex_0032F0" Format="rgba16" Width="16" Height="16" Offset="0x32F0" />
-        <Texture Name="object_ikn_demo_Tex_0034F0" OutName="tex_0034F0" Format="rgba16" Width="16" Height="8" Offset="0x34F0" />
-        <Texture Name="object_ikn_demo_Tex_0035F0" OutName="tex_0035F0" Format="rgba16" Width="16" Height="16" Offset="0x35F0" />
-        <Limb Name="object_ikn_demo_Standardlimb_0037F0" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_01" Offset="0x37F0" />
-        <Limb Name="object_ikn_demo_Standardlimb_0037FC" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_02" Offset="0x37FC" />
-        <Limb Name="object_ikn_demo_Standardlimb_003808" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_03" Offset="0x3808" />
-        <Limb Name="object_ikn_demo_Standardlimb_003814" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_04" Offset="0x3814" />
-        <Limb Name="object_ikn_demo_Standardlimb_003820" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_05" Offset="0x3820" />
-        <Limb Name="object_ikn_demo_Standardlimb_00382C" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_06" Offset="0x382C" />
-        <Limb Name="object_ikn_demo_Standardlimb_003838" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_07" Offset="0x3838" />
-        <Limb Name="object_ikn_demo_Standardlimb_003844" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_08" Offset="0x3844" />
-        <Limb Name="object_ikn_demo_Standardlimb_003850" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_09" Offset="0x3850" />
-        <Limb Name="object_ikn_demo_Standardlimb_00385C" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0A" Offset="0x385C" />
-        <Limb Name="object_ikn_demo_Standardlimb_003868" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0B" Offset="0x3868" />
-        <Limb Name="object_ikn_demo_Standardlimb_003874" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0C" Offset="0x3874" />
-        <Limb Name="object_ikn_demo_Standardlimb_003880" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0D" Offset="0x3880" />
-        <Limb Name="object_ikn_demo_Standardlimb_00388C" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0E" Offset="0x388C" />
-        <Limb Name="object_ikn_demo_Standardlimb_003898" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0F" Offset="0x3898" />
-        <Limb Name="object_ikn_demo_Standardlimb_0038A4" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_10" Offset="0x38A4" />
-        <Skeleton Name="object_ikn_demo_Skel_0038F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_1_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_1_LIMB_MAX" EnumName="ObjectIknDemo1Limb" Offset="0x38F0" />
-        <Animation Name="object_ikn_demo_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "osk_hanasu_loop" -->
-        <Animation Name="object_ikn_demo_Anim_004208" Offset="0x4208" /> <!-- Original name is "osk_hanasu_wait" -->
-        <Animation Name="object_ikn_demo_Anim_004514" Offset="0x4514" /> <!-- Original name is "osk_okoru_loop" -->
-        <Animation Name="object_ikn_demo_Anim_004A58" Offset="0x4A58" /> <!-- Original name is "osk_okoru_wait" -->
-        <Animation Name="object_ikn_demo_Anim_0065D8" Offset="0x65D8" /> <!-- Original name is "osk_utau_loop" -->
-        <Animation Name="object_ikn_demo_Anim_0067B8" Offset="0x67B8" /> <!-- Original name is "sk1_bibiru_loop" -->
-        <Animation Name="object_ikn_demo_Anim_006808" Offset="0x6808" /> <!-- Original name is "sk1_default" -->
-        <DList Name="object_ikn_demo_DL_0072F0" Offset="0x72F0" />
-        <DList Name="object_ikn_demo_DL_007680" Offset="0x7680" />
-        <DList Name="object_ikn_demo_DL_0077B0" Offset="0x77B0" />
-        <DList Name="object_ikn_demo_DL_0078E0" Offset="0x78E0" />
-        <DList Name="object_ikn_demo_DL_007988" Offset="0x7988" />
-        <DList Name="object_ikn_demo_DL_007A38" Offset="0x7A38" />
-        <Limb Name="object_ikn_demo_Standardlimb_007AE8" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_01" Offset="0x7AE8" />
-        <Limb Name="object_ikn_demo_Standardlimb_007AF4" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_02" Offset="0x7AF4" />
-        <Limb Name="object_ikn_demo_Standardlimb_007B00" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_03" Offset="0x7B00" />
-        <Limb Name="object_ikn_demo_Standardlimb_007B0C" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_04" Offset="0x7B0C" />
-        <Limb Name="object_ikn_demo_Standardlimb_007B18" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_05" Offset="0x7B18" />
-        <Limb Name="object_ikn_demo_Standardlimb_007B24" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_06" Offset="0x7B24" />
-        <Skeleton Name="object_ikn_demo_Skel_007B48" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_2_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_2_LIMB_MAX" EnumName="ObjectIknDemo2Limb" Offset="0x7B48" />
-        <Animation Name="object_ikn_demo_Anim_0081A8" Offset="0x81A8" /> <!-- Original name is "sk1_hajikareru" -->
-        <Animation Name="object_ikn_demo_Anim_0083F4" Offset="0x83F4" /> <!-- Original name is "sk1_hajikareru_loop" -->
-        <Animation Name="object_ikn_demo_Anim_008724" Offset="0x8724" /> <!-- Original name is "sk1_hebo" -->
-        <Animation Name="object_ikn_demo_Anim_008AF4" Offset="0x8AF4" /> <!-- Original name is "sk1_hebo_loop" -->
-        <Animation Name="object_ikn_demo_Anim_008CEC" Offset="0x8CEC" /> <!-- Original name is "sk1_odoroku" -->
-        <Animation Name="object_ikn_demo_Anim_008F1C" Offset="0x8F1C" /> <!-- Original name is "sk1_odoroku_loop" -->
-        <Animation Name="object_ikn_demo_Anim_009044" Offset="0x9044" /> <!-- Original name is "sk1_sagaru" -->
-        <Animation Name="object_ikn_demo_Anim_009254" Offset="0x9254" /> <!-- Original name is "sk1_sagaru_loop" -->
-        <Animation Name="object_ikn_demo_Anim_0098E4" Offset="0x98E4" /> <!-- Original name is "sk1_syutugen_loop" -->
-        <Animation Name="object_ikn_demo_Anim_009A44" Offset="0x9A44" /> <!-- Original name is "sk1_warau" -->
-        <Animation Name="object_ikn_demo_Anim_009CC8" Offset="0x9CC8" /> <!-- Original name is "sk1_warau_loop" -->
-        <Animation Name="object_ikn_demo_Anim_009EA8" Offset="0x9EA8" /> <!-- Original name is "sk2_bibiru_loop" -->
-        <Animation Name="object_ikn_demo_Anim_009F00" Offset="0x9F00" /> <!-- Original name is "sk2_default" -->
-        <DList Name="object_ikn_demo_DL_00AB80" Offset="0xAB80" />
-        <DList Name="object_ikn_demo_DL_00AEA0" Offset="0xAEA0" />
-        <DList Name="object_ikn_demo_DL_00B028" Offset="0xB028" />
-        <DList Name="object_ikn_demo_DL_00B1B0" Offset="0xB1B0" />
-        <DList Name="object_ikn_demo_DL_00B258" Offset="0xB258" />
-        <DList Name="object_ikn_demo_DL_00B308" Offset="0xB308" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B430" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_01" Offset="0xB430" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B43C" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_02" Offset="0xB43C" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B448" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_03" Offset="0xB448" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B454" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_04" Offset="0xB454" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B460" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_05" Offset="0xB460" />
-        <Limb Name="object_ikn_demo_Standardlimb_00B46C" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_06" Offset="0xB46C" />
-        <Skeleton Name="object_ikn_demo_Skel_00B490" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_3_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_3_LIMB_MAX" EnumName="ObjectIknDemo3Limb" Offset="0xB490" />
-        <Animation Name="object_ikn_demo_Anim_00B704" Offset="0xB704" /> <!-- Original name is "sk2_hajiku" -->
-        <Animation Name="object_ikn_demo_Anim_00B8C0" Offset="0xB8C0" /> <!-- Original name is "sk2_hajiku_loop" -->
-        <Animation Name="object_ikn_demo_Anim_00B9E4" Offset="0xB9E4" /> <!-- Original name is "sk2_hiku" -->
-        <Animation Name="object_ikn_demo_Anim_00BDB4" Offset="0xBDB4" /> <!-- Original name is "sk2_hiku_loop" -->
-        <Animation Name="object_ikn_demo_Anim_00BF04" Offset="0xBF04" /> <!-- Original name is "sk2_maee" -->
-        <Animation Name="object_ikn_demo_Anim_00C154" Offset="0xC154" /> <!-- Original name is "sk2_maee_loop" -->
-        <Animation Name="object_ikn_demo_Anim_00C2C4" Offset="0xC2C4" /> <!-- Original name is "sk2_muu" -->
-        <Animation Name="object_ikn_demo_Anim_00C59C" Offset="0xC59C" /> <!-- Original name is "sk2_muu_loop" -->
-        <Animation Name="object_ikn_demo_Anim_00C804" Offset="0xC804" /> <!-- Original name is "sk2_nani" -->
-        <Animation Name="object_ikn_demo_Anim_00CA74" Offset="0xCA74" /> <!-- Original name is "sk2_nani_loop" -->
-        <Animation Name="object_ikn_demo_Anim_00CD28" Offset="0xCD28" /> <!-- Original name is "sk2_odoroku" -->
-        <Animation Name="object_ikn_demo_Anim_00D044" Offset="0xD044" /> <!-- Original name is "sk2_odoroku_loop' "-->
-        <Texture Name="object_ikn_demo_Tex_00D060" OutName="tex_00D060" Format="rgba16" Width="8" Height="8" Offset="0xD060" />
-        <!-- <Blob Name="object_ikn_demo_Blob_00D0E0" Size="0x100" Offset="0xD0E0" /> -->
-        <Texture Name="object_ikn_demo_Tex_00D1E0" OutName="tex_00D1E0" Format="rgba16" Width="16" Height="16" Offset="0xD1E0" />
-        <!-- <Blob Name="object_ikn_demo_Blob_00D3E0" Size="0x100" Offset="0xD3E0" /> -->
-        <Texture Name="object_ikn_demo_Tex_00D4E0" OutName="tex_00D4E0" Format="rgba16" Width="4" Height="4" Offset="0xD4E0" />
-        <!-- <Blob Name="object_ikn_demo_Blob_00D500" Size="0x100" Offset="0xD500" /> -->
-        <Texture Name="object_ikn_demo_Tex_00D600" OutName="tex_00D600" Format="rgba16" Width="16" Height="16" Offset="0xD600" />
-        <!-- <Blob Name="object_ikn_demo_Blob_00D800" Size="0x100" Offset="0xD800" /> -->
-        <Texture Name="object_ikn_demo_Tex_00D900" OutName="tex_00D900" Format="rgba16" Width="4" Height="8" Offset="0xD900" />
-        <Texture Name="object_ikn_demo_Tex_00D940" OutName="tex_00D940" Format="rgba16" Width="8" Height="16" Offset="0xD940" />
-        <!-- <Blob Name="object_ikn_demo_Blob_00DA40" Size="0x240" Offset="0xDA40" /> -->
-        <Texture Name="object_ikn_demo_Tex_00DC80" OutName="tex_00DC80" Format="ia8" Width="8" Height="8" Offset="0xDC80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ikninside_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ikninside_obj.xml
deleted file mode 100644
index 26d1e1206..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ikninside_obj.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Root>
-    <File Name="object_ikninside_obj" Segment="6">
-        <DList Name="object_ikninside_obj_DL_000590" Offset="0x590" /> <!-- Original name is "w2_RASENsite_model" -->
-        <DList Name="object_ikninside_obj_DL_000EA0" Offset="0xEA0" /> <!-- Original name is "w2_RASENue_model" -->
-        <Texture Name="object_ikninside_obj_Tex_001120" OutName="tex_001120" Format="rgba16" Width="32" Height="64" Offset="0x1120" />
-        <Texture Name="object_ikninside_obj_Tex_002120" OutName="tex_002120" Format="rgba16" Width="32" Height="64" Offset="0x2120" />
-        <Texture Name="object_ikninside_obj_Tex_003120" OutName="tex_003120" Format="rgba16" Width="32" Height="64" Offset="0x3120" />
-        <DList Name="object_ikninside_obj_DL_004440" Offset="0x4440" /> <!-- Original name is "w2_ikn_marutobira_model" -->
-        <Texture Name="object_ikninside_obj_TLUT_004620" OutName="tlut_004620" Format="rgba16" Width="16" Height="16" Offset="0x4620" />
-        <Texture Name="object_ikninside_obj_Tex_004820" OutName="tex_004820" Format="ci8" Width="32" Height="64" Offset="0x4820" />
-        <Texture Name="object_ikninside_obj_Tex_005020" OutName="tex_005020" Format="ci8" Width="16" Height="32" Offset="0x5020" />
-        <DList Name="object_ikninside_obj_DL_005260" Offset="0x5260" /> <!-- Original name is "w2_ikn_zenetu_model" -->
-        <Texture Name="object_ikninside_obj_Tex_0052F0" OutName="tex_0052F0" Format="ia16" Width="16" Height="64" Offset="0x52F0" />
-        <!-- <Blob Name="object_ikninside_obj_Blob_005AF0" Size="0x220" Offset="0x5AF0" /> -->
-        <Texture Name="object_ikninside_obj_Tex_005D10" OutName="tex_005D10" Format="ia16" Width="32" Height="32" Offset="0x5D10" />
-        <!-- <Blob Name="object_ikninside_obj_Blob_006510" Size="0x20" Offset="0x6510" /> -->
-        <Texture Name="object_ikninside_obj_Tex_006530" OutName="tex_006530" Format="rgba16" Width="32" Height="64" Offset="0x6530" />
-        <Texture Name="object_ikninside_obj_Tex_007530" OutName="tex_007530" Format="rgba16" Width="32" Height="16" Offset="0x7530" />
-        <Texture Name="object_ikninside_obj_Tex_007930" OutName="tex_007930" Format="i4" Width="64" Height="64" Offset="0x7930" />
-        <Texture Name="object_ikninside_obj_Tex_008130" OutName="tex_008130" Format="ia16" Width="16" Height="32" Offset="0x8130" />
-        <Texture Name="object_ikninside_obj_Tex_008530" OutName="tex_008530" Format="rgba16" Width="32" Height="32" Offset="0x8530" />
-        <Texture Name="object_ikninside_obj_Tex_008D30" OutName="tex_008D30" Format="rgba16" Width="32" Height="32" Offset="0x8D30" />
-        <Texture Name="object_ikninside_obj_Tex_009530" OutName="tex_009530" Format="rgba16" Width="16" Height="64" Offset="0x9530" />
-        <Texture Name="object_ikninside_obj_Tex_009D30" OutName="tex_009D30" Format="rgba16" Width="32" Height="32" Offset="0x9D30" />
-        <DList Name="object_ikninside_obj_DL_00A5A0" Offset="0xA5A0" /> <!-- Original name is "w2_ikn_hahen_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00A5A8" Offset="0xA5A8" /> <!-- Original name is "w2_ikn_hahen_model" -->
-        <DList Name="object_ikninside_obj_DL_00A740" Offset="0xA740" /> <!-- Original name is "w2_ikn_hahen2_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00A748" Offset="0xA748" /> <!-- Original name is "w2_ikn_hahen2_model" -->
-        <DList Name="object_ikninside_obj_DL_00AB10" Offset="0xAB10" /> <!-- Original name is "w2_ikn_hikari_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00AD50" Offset="0xAD50" /> <!-- Original name is "w2_ikn_hikari_model" -->
-        <DList Name="object_ikninside_obj_DL_00AEC0" Offset="0xAEC0" /> <!-- Original name is "w2_ikn_hikari2_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00B0A8" Offset="0xB0A8" /> <!-- Original name is "w2_ikn_hikari2_model" -->
-        <Texture Name="object_ikninside_obj_Tex_00B0B0" OutName="tex_00B0B0" Format="ia16" Width="32" Height="32" Offset="0xB0B0" />
-        <Texture Name="object_ikninside_obj_Tex_00B8B0" OutName="tex_00B8B0" Format="ia16" Width="16" Height="32" Offset="0xB8B0" />
-        <TextureAnimation Name="object_ikninside_obj_Matanimheader_00BCB8" Offset="0xBCB8" />
-        <TextureAnimation Name="object_ikninside_obj_Matanimheader_00BCC8" Offset="0xBCC8" />
-        <DList Name="object_ikninside_obj_DL_00C300" Offset="0xC300" /> <!-- Original name is "w2_ikn_turitenjo_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00C308" Offset="0xC308" /> <!-- Original name is "w2_ikn_turitenjo_model" -->
-        <TextureAnimation Name="object_ikninside_obj_Matanimheader_00C670" Offset="0xC670" />
-        <Collision Name="object_ikninside_obj_Colheader_00CBAC" Offset="0xCBAC" /> <!-- Original name is "w2_ikn_turitenjo_bgdatainfo" -->
-        <DList Name="object_ikninside_obj_DL_00CC70" Offset="0xCC70" /> <!-- Original name is "w2_ikn_yuka_modelT" -->
-        <DList Name="object_ikninside_obj_DL_00CC78" Offset="0xCC78" /> <!-- Original name is "w2_ikn_yuka_model" -->
-        <Texture Name="object_ikninside_obj_Tex_00CD60" OutName="tex_00CD60" Format="rgba16" Width="16" Height="64" Offset="0xCD60" />
-        <Texture Name="object_ikninside_obj_Tex_00D560" OutName="tex_00D560" Format="i4" Width="64" Height="64" Offset="0xD560" />
-        <TextureAnimation Name="object_ikninside_obj_Matanimheader_00DD70" Offset="0xDD70" />
-        <Collision Name="object_ikninside_obj_Colheader_00DE48" Offset="0xDE48" /> <!-- Original name is "w2_ikn_yuka_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_iknv_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_iknv_obj.xml
deleted file mode 100644
index 5c54c71da..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_iknv_obj.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Root>
-    <File Name="object_iknv_obj" Segment="6">
-        <Texture Name="object_iknv_obj_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="object_iknv_obj_Tex_000020" OutName="tex_000020" Format="rgba16" Width="32" Height="32" Offset="0x20" />
-        <Texture Name="object_iknv_obj_Tex_000820" OutName="tex_000820" Format="ci4" Width="32" Height="128" Offset="0x820" />
-        <Texture Name="object_iknv_obj_Tex_001020" OutName="tex_001020" Format="rgba16" Width="64" Height="32" Offset="0x1020" />
-        <Texture Name="object_iknv_obj_Tex_002020" OutName="tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" />
-        <Texture Name="object_iknv_obj_Tex_002820" OutName="tex_002820" Format="rgba16" Width="16" Height="16" Offset="0x2820" />
-        <Texture Name="object_iknv_obj_Tex_002A20" OutName="tex_002A20" Format="rgba16" Width="8" Height="8" Offset="0x2A20" />
-        <Texture Name="object_iknv_obj_Tex_002AA0" OutName="tex_002AA0" Format="rgba16" Width="16" Height="16" Offset="0x2AA0" />
-        <Texture Name="object_iknv_obj_Tex_002CA0" OutName="tex_002CA0" Format="rgba16" Width="8" Height="8" Offset="0x2CA0" />
-        <Texture Name="object_iknv_obj_Tex_002D20" OutName="tex_002D20" Format="rgba16" Width="4" Height="4" Offset="0x2D20" />
-        <Texture Name="object_iknv_obj_Tex_002D40" OutName="tex_002D40" Format="ia8" Width="16" Height="16" Offset="0x2D40" />
-        <Texture Name="object_iknv_obj_Tex_002E40" OutName="tex_002E40" Format="rgba16" Width="32" Height="64" Offset="0x2E40" />
-        <Texture Name="object_iknv_obj_Tex_003E40" OutName="tex_003E40" Format="rgba16" Width="32" Height="16" Offset="0x3E40" />
-        <Texture Name="object_iknv_obj_TLUT_004240" OutName="tlut_004240" Format="rgba16" Width="4" Height="4" Offset="0x4240" />
-        <Texture Name="object_iknv_obj_Tex_004260" OutName="tex_004260" Format="rgba16" Width="32" Height="32" Offset="0x4260" />
-        <Texture Name="object_iknv_obj_Tex_004A60" OutName="tex_004A60" Format="rgba16" Width="32" Height="32" Offset="0x4A60" />
-        <Texture Name="object_iknv_obj_Tex_005260" OutName="tex_005260" Format="i4" Width="64" Height="64" Offset="0x5260" />
-        <Texture Name="object_iknv_obj_Tex_005A60" OutName="tex_005A60" Format="i4" Width="64" Height="64" Offset="0x5A60" />
-        <Texture Name="object_iknv_obj_Tex_006260" OutName="tex_006260" Format="ci4" Width="32" Height="128" Offset="0x6260" />
-        <Texture Name="object_iknv_obj_Tex_006A60" OutName="tex_006A60" Format="i8" Width="16" Height="16" Offset="0x6A60" />
-        <Texture Name="object_iknv_obj_Tex_006B60" OutName="tex_006B60" Format="rgba16" Width="32" Height="32" Offset="0x6B60" />
-        <Texture Name="object_iknv_obj_Tex_007360" OutName="tex_007360" Format="i8" Width="32" Height="64" Offset="0x7360" />
-        <Texture Name="object_iknv_obj_Tex_007B60" OutName="tex_007B60" Format="rgba16" Width="32" Height="32" Offset="0x7B60" />
-        <Texture Name="object_iknv_obj_Tex_008360" OutName="tex_008360" Format="i8" Width="32" Height="128" Offset="0x8360" />
-        <DList Name="object_iknv_obj_DL_00DB60" Offset="0xDB60" /> <!-- Original name is "z2_dokuana_modelT" -->
-        <DList Name="object_iknv_obj_DL_00DDD8" Offset="0xDDD8" /> <!-- Original name is "z2_dokuana_model" -->
-        <TextureAnimation Name="object_iknv_obj_Matanimheader_00F1C0" Offset="0xF1C0" />
-        <DList Name="object_iknv_obj_DL_010D90" Offset="0x10D90" /> <!-- Original name is "z2_doukutu_modelT" -->
-        <DList Name="object_iknv_obj_DL_010D98" Offset="0x10D98" /> <!-- Original name is "z2_doukutu_model" -->
-        <!-- <Blob Name="object_iknv_obj_Blob_0113E0" Size="0x10" Offset="0x113E0" /> -->
-        <DList Name="object_iknv_obj_DL_0115E0" Offset="0x115E0" /> <!-- Original name is "z2_doumizu_modelT" -->
-        <DList Name="object_iknv_obj_DL_011788" Offset="0x11788" /> <!-- Original name is "z2_doumizu_model" -->
-        <TextureAnimation Name="object_iknv_obj_Matanimheader_0117A0" Offset="0x117A0" />
-        <Collision Name="object_iknv_obj_Colheader_0117C8" Offset="0x117C8" /> <!-- Original name is "z2_doumizu_bgdatainfo" -->
-        <DList Name="object_iknv_obj_DL_011880" Offset="0x11880" /> <!-- Original name is "z2_ikiriguti_modelT" -->
-        <DList Name="object_iknv_obj_DL_011950" Offset="0x11950" /> <!-- Original name is "z2_ikiriguti_model" -->
-        <Collision Name="object_iknv_obj_Colheader_0119D4" Offset="0x119D4" /> <!-- Original name is "z2_ikiriguti_bgdatainfo" -->
-        <DList Name="object_iknv_obj_DL_011E70" Offset="0x11E70" />
-        <DList Name="object_iknv_obj_DL_011F40" Offset="0x11F40" />
-        <DList Name="object_iknv_obj_DL_012020" Offset="0x12020" />
-        <DList Name="object_iknv_obj_DL_0120F0" Offset="0x120F0" />
-        <DList Name="object_iknv_obj_DL_0121C8" Offset="0x121C8" />
-        <DList Name="object_iknv_obj_DL_012298" Offset="0x12298" />
-        <DList Name="object_iknv_obj_DL_012368" Offset="0x12368" />
-        <DList Name="object_iknv_obj_DL_012440" Offset="0x12440" />
-        <DList Name="object_iknv_obj_DL_012460" Offset="0x12460" />
-        <DList Name="object_iknv_obj_DL_012480" Offset="0x12480" />
-        <DList Name="object_iknv_obj_DL_0124A0" Offset="0x124A0" />
-        <DList Name="object_iknv_obj_DL_0124C0" Offset="0x124C0" />
-        <DList Name="object_iknv_obj_DL_0124E0" Offset="0x124E0" />
-        <DList Name="object_iknv_obj_DL_012500" Offset="0x12500" />
-        <DList Name="object_iknv_obj_DL_012518" Offset="0x12518" />
-        <DList Name="object_iknv_obj_DL_012528" Offset="0x12528" />
-        <DList Name="object_iknv_obj_DL_012538" Offset="0x12538" />
-        <DList Name="object_iknv_obj_DL_012550" Offset="0x12550" />
-        <DList Name="object_iknv_obj_DL_0125E0" Offset="0x125E0" />
-        <DList Name="object_iknv_obj_DL_0126D0" Offset="0x126D0" />
-        <DList Name="object_iknv_obj_DL_012700" Offset="0x12700" /> <!-- Original name is "z2_ikkawa_modelT" -->
-        <TextureAnimation Name="object_iknv_obj_Matanimheader_012728" Offset="0x12728" />
-        <Collision Name="object_iknv_obj_Colheader_012788" Offset="0x12788" /> <!-- Original name is "z2_ikkawa_bgdatainfo" -->
-        <DList Name="object_iknv_obj_DL_012880" Offset="0x12880" /> <!-- Original name is "z2_ikkawa_c_model" -->
-        <DList Name="object_iknv_obj_DL_0129C0" Offset="0x129C0" /> <!-- Not present in MM3D, but it was probably named "z2_iwado_model" based on the rest of this object. -->
-        <DList Name="object_iknv_obj_DL_0129C8" Offset="0x129C8" /> <!-- Original name is "z2_iwado_model" -->
-        <Collision Name="object_iknv_obj_Colheader_012CA4" Offset="0x12CA4" /> <!-- Original name is "z2_iwado_bgdatainfo" -->
-        <DList Name="object_iknv_obj_DL_013050" Offset="0x13050" /> <!-- Original name is "z2_suisya_modelT" -->
-        <DList Name="object_iknv_obj_DL_013058" Offset="0x13058" /> <!-- Original name is "z2_suisya_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_in.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_in.xml
deleted file mode 100644
index ee7ceb3a0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_in.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<Root>
-    <File Name="object_in" Segment="6">
-        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4" /> <!-- Original name is "in2_fusagu" -->
-        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0" /> <!-- Original name is "in2_kachi" -->
-        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0" /> <!-- Original name is "in2_kuyasii" -->
-        <TextureAnimation Name="object_in_Matanimheader_001C30" Offset="0x1C30" />
-        <Animation Name="object_in_Anim_001D10" Offset="0x1D10" /> <!-- Original name is "in_matsu1" -->
-        <!-- <Blob Name="object_in_Blob_001D20" Size="0x1738" Offset="0x1D20" /> -->
-        <Texture Name="object_in_Tex_003520" OutName="tex_003520" Format="ci8" Width="8" Height="8" Offset="0x3520" />
-        <Texture Name="object_in_Tex_0035E0" OutName="tex_0035E0" Format="ci8" Width="32" Height="32" Offset="0x35E0" />
-        <Texture Name="object_in_Tex_0039E0" OutName="tex_0039E0" Format="rgba16" Width="16" Height="16" Offset="0x39E0" />
-        <Texture Name="object_in_Tex_003BE0" OutName="tex_003BE0" Format="ci8" Width="16" Height="16" Offset="0x3BE0" />
-        <Texture Name="object_in_Tex_003CE0" OutName="tex_003CE0" Format="ci8" Width="16" Height="16" Offset="0x3CE0" />
-        <Texture Name="object_in_Tex_003DE0" OutName="tex_003DE0" Format="i8" Width="8" Height="8" Offset="0x3DE0" />
-        <Texture Name="object_in_Tex_003E20" OutName="tex_003E20" Format="rgba16" Width="8" Height="16" Offset="0x3E20" />
-        <Texture Name="object_in_Tex_003F20" OutName="tex_003F20" Format="ci8" Width="16" Height="32" Offset="0x3F20" />
-        <Texture Name="object_in_Tex_004120" OutName="tex_004120" Format="rgba16" Width="8" Height="16" Offset="0x4120" />
-        <Texture Name="object_in_Tex_004220" OutName="tex_004220" Format="ci8" Width="8" Height="16" Offset="0x4220" />
-        <Texture Name="object_in_Tex_0042A0" OutName="tex_0042A0" Format="ci8" Width="16" Height="16" Offset="0x42A0" />
-        <Texture Name="object_in_Tex_0043E0" OutName="tex_0043E0" Format="ci8" Width="32" Height="32" Offset="0x43E0" />
-        <Texture Name="object_in_Tex_0047E0" OutName="tex_0047E0" Format="ci8" Width="8" Height="8" Offset="0x47E0" />
-        <Texture Name="object_in_Tex_004820" OutName="tex_004820" Format="ci8" Width="32" Height="32" Offset="0x4820" />
-        <Texture Name="object_in_Tex_004C20" OutName="tex_004C20" Format="ci8" Width="32" Height="32" Offset="0x4C20" />
-        <DList Name="object_in_DL_006780" Offset="0x6780" />
-        <DList Name="object_in_DL_0073E8" Offset="0x73E8" />
-        <DList Name="object_in_DL_007510" Offset="0x7510" />
-        <DList Name="object_in_DL_007638" Offset="0x7638" />
-        <DList Name="object_in_DL_007730" Offset="0x7730" />
-        <DList Name="object_in_DL_0078D0" Offset="0x78D0" />
-        <DList Name="object_in_DL_007A70" Offset="0x7A70" />
-        <DList Name="object_in_DL_007C48" Offset="0x7C48" />
-        <DList Name="object_in_DL_00A0B8" Offset="0xA0B8" />
-        <DList Name="object_in_DL_00A2B8" Offset="0xA2B8" />
-        <DList Name="object_in_DL_00A4B0" Offset="0xA4B0" />
-        <DList Name="object_in_DL_00A748" Offset="0xA748" />
-        <DList Name="object_in_DL_00AAC8" Offset="0xAAC8" />
-        <DList Name="object_in_DL_00ACC0" Offset="0xACC0" />
-        <DList Name="object_in_DL_00AF58" Offset="0xAF58" />
-        <DList Name="object_in_DL_00B2D8" Offset="0xB2D8" />
-        <DList Name="object_in_DL_00B410" Offset="0xB410" />
-        <DList Name="object_in_DL_00B570" Offset="0xB570" />
-        <DList Name="object_in_DL_00B718" Offset="0xB718" />
-        <DList Name="object_in_DL_00B8D0" Offset="0xB8D0" />
-        <Texture Name="object_in_TLUT_00BA78" OutName="tlut_00BA78" Format="rgba16" Width="16" Height="16" Offset="0xBA78" />
-        <!-- <Blob Name="object_in_Blob_00BC78" Size="0x400" Offset="0xBC78" /> -->
-        <Texture Name="object_in_TLUT_00C078" OutName="tlut_00C078" Format="rgba16" Width="16" Height="16" Offset="0xC078" />
-        <Texture Name="object_in_TLUT_00C278" OutName="tlut_00C278" Format="rgba16" Width="16" Height="16" Offset="0xC278" />
-        <!-- <Blob Name="object_in_Blob_00C478" Size="0x200" Offset="0xC478" /> -->
-        <Texture Name="object_in_Tex_00C678" OutName="tex_00C678" Format="ci8" Width="8" Height="8" Offset="0xC678" />
-        <!-- <Blob Name="object_in_Blob_00C6B8" Size="0x640" Offset="0xC6B8" /> -->
-        <Texture Name="object_in_Tex_00CCF8" OutName="tex_00CCF8" Format="ci8" Width="16" Height="32" Offset="0xCCF8" />
-        <Texture Name="object_in_Tex_00CEF8" OutName="tex_00CEF8" Format="ci8" Width="16" Height="16" Offset="0xCEF8" />
-        <!-- <Blob Name="object_in_Blob_00CFF8" Size="0x100" Offset="0xCFF8" /> -->
-        <Texture Name="object_in_Tex_00D0F8" OutName="tex_00D0F8" Format="i8" Width="8" Height="8" Offset="0xD0F8" />
-        <Texture Name="object_in_Tex_00D138" OutName="tex_00D138" Format="i8" Width="32" Height="32" Offset="0xD138" />
-        <Texture Name="object_in_Tex_00D538" OutName="tex_00D538" Format="i8" Width="8" Height="8" Offset="0xD538" />
-        <Texture Name="object_in_Tex_00D578" OutName="tex_00D578" Format="i8" Width="8" Height="8" Offset="0xD578" />
-        <Texture Name="object_in_TLUT_00D5B8" OutName="tlut_00D5B8" Format="rgba16" Width="16" Height="16" Offset="0xD5B8" />
-        <Texture Name="object_in_Tex_00D7B8" OutName="tex_00D7B8" Format="rgba16" Width="16" Height="16" Offset="0xD7B8" />
-        <Texture Name="object_in_Tex_00D9B8" OutName="tex_00D9B8" Format="ci8" Width="8" Height="8" Offset="0xD9B8" />
-        <Texture Name="object_in_Tex_00D9F8" OutName="tex_00D9F8" Format="ci8" Width="8" Height="8" Offset="0xD9F8" />
-        <Texture Name="object_in_Tex_00DA38" OutName="tex_00DA38" Format="ci8" Width="8" Height="8" Offset="0xDA38" />
-        <Texture Name="object_in_Tex_00DA78" OutName="tex_00DA78" Format="ci8" Width="16" Height="32" Offset="0xDA78" />
-        <Texture Name="object_in_Tex_00DC78" OutName="tex_00DC78" Format="ci8" Width="16" Height="16" Offset="0xDC78" />
-        <Texture Name="object_in_Tex_00DD78" OutName="tex_00DD78" Format="ci8" Width="16" Height="16" Offset="0xDD78" />
-        <Texture Name="object_in_Tex_00DE78" OutName="tex_00DE78" Format="ci8" Width="8" Height="8" Offset="0xDE78" />
-        <!-- <Blob Name="object_in_Blob_00DEB8" Size="0x800" Offset="0xDEB8" /> -->
-        <Texture Name="object_in_Tex_00E6B8" OutName="tex_00E6B8" Format="rgba16" Width="32" Height="32" Offset="0xE6B8" />
-        <!-- <Blob Name="object_in_Blob_00EEB8" Size="0x800" Offset="0xEEB8" /> -->
-        <Texture Name="object_in_Tex_00F6B8" OutName="tex_00F6B8" Format="ci8" Width="16" Height="16" Offset="0xF6B8" />
-        <Texture Name="object_in_Tex_00F7B8" OutName="tex_00F7B8" Format="ci8" Width="16" Height="32" Offset="0xF7B8" />
-        <Texture Name="object_in_Tex_00F9B8" OutName="tex_00F9B8" Format="ci8" Width="16" Height="16" Offset="0xF9B8" />
-        <Texture Name="object_in_Tex_00FAB8" OutName="tex_00FAB8" Format="ci8" Width="16" Height="16" Offset="0xFAB8" />
-        <Texture Name="object_in_Tex_00FBB8" OutName="tex_00FBB8" Format="ci8" Width="16" Height="16" Offset="0xFBB8" />
-        <Texture Name="object_in_Tex_00FCB8" OutName="tex_00FCB8" Format="ci8" Width="16" Height="16" Offset="0xFCB8" />
-        <Texture Name="object_in_Tex_00FDB8" OutName="tex_00FDB8" Format="ci8" Width="8" Height="8" Offset="0xFDB8" />
-        <Texture Name="object_in_Tex_00FDF8" OutName="tex_00FDF8" Format="ci8" Width="8" Height="8" Offset="0xFDF8" />
-        <DList Name="object_in_DL_012A78" Offset="0x12A78" />
-        <DList Name="object_in_DL_012DF8" Offset="0x12DF8" />
-        <DList Name="object_in_DL_013440" Offset="0x13440" />
-        <DList Name="object_in_DL_013540" Offset="0x13540" />
-        <DList Name="object_in_DL_013670" Offset="0x13670" />
-        <DList Name="object_in_DL_0137A0" Offset="0x137A0" />
-        <DList Name="object_in_DL_0138D0" Offset="0x138D0" />
-        <DList Name="object_in_DL_013A00" Offset="0x13A00" />
-        <DList Name="object_in_DL_013DE0" Offset="0x13DE0" />
-        <DList Name="object_in_DL_013F10" Offset="0x13F10" />
-        <DList Name="object_in_DL_014040" Offset="0x14040" />
-        <DList Name="object_in_DL_014420" Offset="0x14420" />
-        <DList Name="object_in_DL_0145D8" Offset="0x145D8" />
-        <DList Name="object_in_DL_014710" Offset="0x14710" />
-        <DList Name="object_in_DL_014860" Offset="0x14860" />
-        <DList Name="object_in_DL_0149A8" Offset="0x149A8" />
-        <DList Name="object_in_DL_014AE0" Offset="0x14AE0" />
-        <DList Name="object_in_DL_014C30" Offset="0x14C30" />
-        <Limb Name="object_in_Standardlimb_014D78" Type="Standard" EnumName="OBJECT_IN_LIMB_01" Offset="0x14D78" />
-        <Limb Name="object_in_Standardlimb_014D84" Type="Standard" EnumName="OBJECT_IN_LIMB_02" Offset="0x14D84" />
-        <Limb Name="object_in_Standardlimb_014D90" Type="Standard" EnumName="OBJECT_IN_LIMB_03" Offset="0x14D90" />
-        <Limb Name="object_in_Standardlimb_014D9C" Type="Standard" EnumName="OBJECT_IN_LIMB_04" Offset="0x14D9C" />
-        <Limb Name="object_in_Standardlimb_014DA8" Type="Standard" EnumName="OBJECT_IN_LIMB_05" Offset="0x14DA8" />
-        <Limb Name="object_in_Standardlimb_014DB4" Type="Standard" EnumName="OBJECT_IN_LIMB_06" Offset="0x14DB4" />
-        <Limb Name="object_in_Standardlimb_014DC0" Type="Standard" EnumName="OBJECT_IN_LIMB_07" Offset="0x14DC0" />
-        <Limb Name="object_in_Standardlimb_014DCC" Type="Standard" EnumName="OBJECT_IN_LIMB_08" Offset="0x14DCC" />
-        <Limb Name="object_in_Standardlimb_014DD8" Type="Standard" EnumName="OBJECT_IN_LIMB_09" Offset="0x14DD8" />
-        <Limb Name="object_in_Standardlimb_014DE4" Type="Standard" EnumName="OBJECT_IN_LIMB_0A" Offset="0x14DE4" />
-        <Limb Name="object_in_Standardlimb_014DF0" Type="Standard" EnumName="OBJECT_IN_LIMB_0B" Offset="0x14DF0" />
-        <Limb Name="object_in_Standardlimb_014DFC" Type="Standard" EnumName="OBJECT_IN_LIMB_0C" Offset="0x14DFC" />
-        <Limb Name="object_in_Standardlimb_014E08" Type="Standard" EnumName="OBJECT_IN_LIMB_0D" Offset="0x14E08" />
-        <Limb Name="object_in_Standardlimb_014E14" Type="Standard" EnumName="OBJECT_IN_LIMB_0E" Offset="0x14E14" />
-        <Limb Name="object_in_Standardlimb_014E20" Type="Standard" EnumName="OBJECT_IN_LIMB_0F" Offset="0x14E20" />
-        <Limb Name="object_in_Standardlimb_014E2C" Type="Standard" EnumName="OBJECT_IN_LIMB_10" Offset="0x14E2C" />
-        <Limb Name="object_in_Standardlimb_014E38" Type="Standard" EnumName="OBJECT_IN_LIMB_11" Offset="0x14E38" />
-        <Limb Name="object_in_Standardlimb_014E44" Type="Standard" EnumName="OBJECT_IN_LIMB_12" Offset="0x14E44" />
-        <Limb Name="object_in_Standardlimb_014E50" Type="Standard" EnumName="OBJECT_IN_LIMB_13" Offset="0x14E50" />
-        <Skeleton Name="object_in_Skel_014EA8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IN_LIMB_NONE" LimbMax="OBJECT_IN_LIMB_MAX" EnumName="ObjectInLimb" Offset="0x14EA8" />
-        <Animation Name="object_in_Anim_014F8C" Offset="0x14F8C" /> <!-- Original name is "in_matsu2" -->
-        <Animation Name="object_in_Anim_015918" Offset="0x15918" /> <!-- Original name is "in_shigoto" -->
-        <Animation Name="object_in_Anim_015E38" Offset="0x15E38" /> <!-- Original name is "ingo_anim_fastrun" -->
-        <Animation Name="object_in_Anim_016484" Offset="0x16484" /> <!-- Original name is "ingo_anim_fastrun_muti" -->
-        <Animation Name="object_in_Anim_016A60" Offset="0x16A60" /> <!-- Original name is "ingo_anim_slowrun" -->
-        <Animation Name="object_in_Anim_0170DC" Offset="0x170DC" /> <!-- Original name is "ingo_anim_slowrun_muti" -->
-        <Animation Name="object_in_Anim_0177AC" Offset="0x177AC" /> <!-- Original name is "ingo_anim_stop" -->
-        <Animation Name="object_in_Anim_018240" Offset="0x18240" /> <!-- Original name is "ingo_anim_stop_muti" -->
-        <Animation Name="object_in_Anim_0187C8" Offset="0x187C8" /> <!-- Original name is "ingo_anim_wait1" -->
-        <Animation Name="object_in_Anim_0198A8" Offset="0x198A8" /> <!-- Original name is "ingo_anim_wait2" -->
-        <Animation Name="object_in_Anim_019EB4" Offset="0x19EB4" /> <!-- Original name is "ingo_jump" -->
-        <Animation Name="object_in_Anim_01A140" Offset="0x1A140" /> <!-- Original name is "ingo_run1" -->
-        <Animation Name="object_in_Anim_01B3C4" Offset="0x1B3C4" /> <!-- Original name is "ingo_tyakuti" -->
-        <Animation Name="object_in_Anim_01B904" Offset="0x1B904" /> <!-- Original name is "ingo_wait1" -->
-        <Animation Name="object_in_Anim_01C0B0" Offset="0x1C0B0" /> <!-- Original name is "ingo_walk_loop" -->
-        <DList Name="object_in_DL_01C520" Offset="0x1C520" />
-        <DList Name="object_in_DL_01C528" Offset="0x1C528" />
-        <Texture Name="object_in_TLUT_01C8F0" OutName="tlut_01C8F0" Format="rgba16" Width="16" Height="16" Offset="0x1C8F0" />
-        <Texture Name="object_in_Tex_01CAF0" OutName="tex_01CAF0" Format="ci8" Width="8" Height="8" Offset="0x1CAF0" />
-        <Texture Name="object_in_Tex_01CB30" OutName="tex_01CB30" Format="ci8" Width="16" Height="8" Offset="0x1CB30" />
-        <Texture Name="object_in_Tex_01CBB0" OutName="tex_01CBB0" Format="ci8" Width="16" Height="16" Offset="0x1CBB0" />
-        <Texture Name="object_in_Tex_01CCB0" OutName="tex_01CCB0" Format="rgba16" Width="16" Height="16" Offset="0x1CCB0" />
-        <Texture Name="object_in_Tex_01CEB0" OutName="tex_01CEB0" Format="ci8" Width="8" Height="32" Offset="0x1CEB0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_in2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_in2.xml
deleted file mode 100644
index e903185b4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_in2.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<Root>
-    <File Name="object_in2" Segment="6">
-        <Animation Name="object_in2_Anim_000084" Offset="0x84" /> <!-- Original name is "in2_kihon" -->
-        <DList Name="object_in2_DL_002D60" Offset="0x2D60" />
-        <DList Name="object_in2_DL_003060" Offset="0x3060" />
-        <DList Name="object_in2_DL_0035B0" Offset="0x35B0" />
-        <DList Name="object_in2_DL_0036A8" Offset="0x36A8" />
-        <DList Name="object_in2_DL_0037D0" Offset="0x37D0" />
-        <DList Name="object_in2_DL_0038F8" Offset="0x38F8" />
-        <DList Name="object_in2_DL_003A10" Offset="0x3A10" />
-        <DList Name="object_in2_DL_003B28" Offset="0x3B28" />
-        <DList Name="object_in2_DL_003EA0" Offset="0x3EA0" />
-        <DList Name="object_in2_DL_003FB8" Offset="0x3FB8" />
-        <DList Name="object_in2_DL_0040D0" Offset="0x40D0" />
-        <DList Name="object_in2_DL_004448" Offset="0x4448" />
-        <DList Name="object_in2_DL_0045C8" Offset="0x45C8" />
-        <DList Name="object_in2_DL_0046C0" Offset="0x46C0" />
-        <DList Name="object_in2_DL_0047C8" Offset="0x47C8" />
-        <DList Name="object_in2_DL_0048F8" Offset="0x48F8" />
-        <DList Name="object_in2_DL_0049F0" Offset="0x49F0" />
-        <DList Name="object_in2_DL_004AF8" Offset="0x4AF8" />
-        <Texture Name="object_in2_Tex_004C28" OutName="tex_004C28" Format="rgba16" Width="16" Height="16" Offset="0x4C28" />
-        <Texture Name="object_in2_TLUT_004E28" OutName="tlut_004E28" Format="rgba16" Width="16" Height="16" Offset="0x4E28" />
-        <Texture Name="object_in2_Tex_005028" OutName="tex_005028" Format="ci8" Width="32" Height="32" Offset="0x5028" />
-        <Texture Name="object_in2_Tex_005428" OutName="tex_005428" Format="ci8" Width="8" Height="8" Offset="0x5428" />
-        <Texture Name="object_in2_Tex_005468" OutName="tex_005468" Format="ci8" Width="8" Height="8" Offset="0x5468" />
-        <Texture Name="object_in2_Tex_0054A8" OutName="tex_0054A8" Format="ci8" Width="32" Height="32" Offset="0x54A8" />
-        <Texture Name="object_in2_Tex_0058A8" OutName="tex_0058A8" Format="rgba16" Width="16" Height="16" Offset="0x58A8" />
-        <Texture Name="object_in2_Tex_005AA8" OutName="tex_005AA8" Format="ci8" Width="16" Height="16" Offset="0x5AA8" />
-        <Texture Name="object_in2_Tex_005BA8" OutName="tex_005BA8" Format="ci8" Width="16" Height="16" Offset="0x5BA8" />
-        <Texture Name="object_in2_Tex_005CA8" OutName="tex_005CA8" Format="i8" Width="8" Height="8" Offset="0x5CA8" />
-        <Texture Name="object_in2_Tex_005CE8" OutName="tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CE8" />
-        <Texture Name="object_in2_Tex_0060E8" OutName="tex_0060E8" Format="ci8" Width="16" Height="32" Offset="0x60E8" />
-        <Texture Name="object_in2_Tex_0062E8" OutName="tex_0062E8" Format="ci8" Width="16" Height="16" Offset="0x62E8" />
-        <Texture Name="object_in2_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="8" Height="8" Offset="0x63E8" />
-        <Texture Name="object_in2_Tex_006428" OutName="tex_006428" Format="ci8" Width="16" Height="16" Offset="0x6428" />
-        <Texture Name="object_in2_Tex_006528" OutName="tex_006528" Format="ci8" Width="16" Height="16" Offset="0x6528" />
-        <Texture Name="object_in2_Tex_006628" OutName="tex_006628" Format="i8" Width="16" Height="16" Offset="0x6628" />
-        <Texture Name="object_in2_Tex_006728" OutName="tex_006728" Format="i8" Width="16" Height="16" Offset="0x6728" />
-        <Texture Name="object_in2_Tex_006828" OutName="tex_006828" Format="ci8" Width="32" Height="32" Offset="0x6828" />
-        <Texture Name="object_in2_Tex_006C28" OutName="tex_006C28" Format="ci8" Width="8" Height="8" Offset="0x6C28" />
-        <Texture Name="object_in2_Tex_006C68" OutName="tex_006C68" Format="ci8" Width="32" Height="32" Offset="0x6C68" />
-        <Texture Name="object_in2_Tex_007068" OutName="tex_007068" Format="ci8" Width="8" Height="8" Offset="0x7068" />
-        <DList Name="object_in2_DL_007198" Offset="0x7198" />
-        <DList Name="object_in2_DL_0071A0" Offset="0x71A0" />
-        <Texture Name="object_in2_Tex_007260" OutName="tex_007260" Format="rgba16" Width="16" Height="16" Offset="0x7260" />
-        <DList Name="object_in2_DL_007520" Offset="0x7520" />
-        <DList Name="object_in2_DL_007528" Offset="0x7528" />
-        <Texture Name="object_in2_Tex_007680" OutName="tex_007680" Format="i8" Width="16" Height="16" Offset="0x7680" />
-        <Limb Name="object_in2_Standardlimb_007780" Type="Standard" EnumName="OBJECT_IN2_LIMB_01" Offset="0x7780" />
-        <Limb Name="object_in2_Standardlimb_00778C" Type="Standard" EnumName="OBJECT_IN2_LIMB_02" Offset="0x778C" />
-        <Limb Name="object_in2_Standardlimb_007798" Type="Standard" EnumName="OBJECT_IN2_LIMB_03" Offset="0x7798" />
-        <Limb Name="object_in2_Standardlimb_0077A4" Type="Standard" EnumName="OBJECT_IN2_LIMB_04" Offset="0x77A4" />
-        <Limb Name="object_in2_Standardlimb_0077B0" Type="Standard" EnumName="OBJECT_IN2_LIMB_05" Offset="0x77B0" />
-        <Limb Name="object_in2_Standardlimb_0077BC" Type="Standard" EnumName="OBJECT_IN2_LIMB_06" Offset="0x77BC" />
-        <Limb Name="object_in2_Standardlimb_0077C8" Type="Standard" EnumName="OBJECT_IN2_LIMB_07" Offset="0x77C8" />
-        <Limb Name="object_in2_Standardlimb_0077D4" Type="Standard" EnumName="OBJECT_IN2_LIMB_08" Offset="0x77D4" />
-        <Limb Name="object_in2_Standardlimb_0077E0" Type="Standard" EnumName="OBJECT_IN2_LIMB_09" Offset="0x77E0" />
-        <Limb Name="object_in2_Standardlimb_0077EC" Type="Standard" EnumName="OBJECT_IN2_LIMB_0A" Offset="0x77EC" />
-        <Limb Name="object_in2_Standardlimb_0077F8" Type="Standard" EnumName="OBJECT_IN2_LIMB_0B" Offset="0x77F8" />
-        <Limb Name="object_in2_Standardlimb_007804" Type="Standard" EnumName="OBJECT_IN2_LIMB_0C" Offset="0x7804" />
-        <Limb Name="object_in2_Standardlimb_007810" Type="Standard" EnumName="OBJECT_IN2_LIMB_0D" Offset="0x7810" />
-        <Limb Name="object_in2_Standardlimb_00781C" Type="Standard" EnumName="OBJECT_IN2_LIMB_0E" Offset="0x781C" />
-        <Limb Name="object_in2_Standardlimb_007828" Type="Standard" EnumName="OBJECT_IN2_LIMB_0F" Offset="0x7828" />
-        <Limb Name="object_in2_Standardlimb_007834" Type="Standard" EnumName="OBJECT_IN2_LIMB_10" Offset="0x7834" />
-        <Limb Name="object_in2_Standardlimb_007840" Type="Standard" EnumName="OBJECT_IN2_LIMB_11" Offset="0x7840" />
-        <Limb Name="object_in2_Standardlimb_00784C" Type="Standard" EnumName="OBJECT_IN2_LIMB_12" Offset="0x784C" />
-        <Limb Name="object_in2_Standardlimb_007858" Type="Standard" EnumName="OBJECT_IN2_LIMB_13" Offset="0x7858" />
-        <Skeleton Name="object_in2_Skel_0078B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IN2_LIMB_NONE" LimbMax="OBJECT_IN2_LIMB_MAX" EnumName="ObjectIn2Limb" Offset="0x78B0" />
-        <Animation Name="object_in2_Anim_008090" Offset="0x8090" /> <!-- Original name is "in2_suwarukard" -->
-        <Animation Name="object_in2_Anim_00898C" Offset="0x898C" /> <!-- Original name is "in2_suwarunomu" -->
-        <Animation Name="object_in2_Anim_009450" Offset="0x9450" /> <!-- Original name is "in2_suwaruokoru" -->
-        <Animation Name="object_in2_Anim_009CDC" Offset="0x9CDC" /> <!-- Original name is "in2_suwaruwait" -->
-        <Animation Name="object_in2_Anim_00A5E0" Offset="0xA5E0" /> <!-- Original name is "in2_suwaruwait2" -->
-        <Animation Name="object_in2_Anim_00A70C" Offset="0xA70C" /> <!-- Original name is "in2_suwaruwait3" -->
-        <Animation Name="object_in2_Anim_00AD18" Offset="0xAD18" /> <!-- Original name is "in2_walk" -->
-        <Animation Name="object_in2_Anim_00B8B0" Offset="0xB8B0" /> <!-- Original name is "in2_walk2suwaru" -->
-        <Animation Name="object_in2_Anim_00B990" Offset="0xB990" /> <!-- Original name is "in2_matsu1" -->
-        <Animation Name="object_in2_Anim_00BA80" Offset="0xBA80" /> <!-- Original name is "in_neru1" -->
-        <Animation Name="object_in2_Anim_00C03C" Offset="0xC03C" /> <!-- Original name is "in_pekopeko" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_inibs_object.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_inibs_object.xml
deleted file mode 100644
index db78735fb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_inibs_object.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<Root>
-    <!-- Assets for Twinmold's Arena -->
-    <File Name="object_inibs_object" Segment="6">
-        <!-- Assets for the version of the arena when the player is using the Giant's Mask -->
-        <DList Name="gTwinmoldArenaGiantModeCenterPlatformDL" Offset="0x1C10" />
-        <DList Name="gTwinmoldArenaGiantModeSandDL" Offset="0x1DC0" />
-        <TextureAnimation Name="gTwinmoldArenaGiantModeSandTexAnim" Offset="0x2598" />
-        <Collision Name="gTwinmoldArenaGiantModeArenaCol" Offset="0x4BA0" /> <!-- Unused. Attempting to use it severely slows down the game. -->
-
-        <!-- Assets for the normal version of the arena -->
-        <DList Name="gTwinmoldArenaNormalModeCenterPlatformDL" Offset="0x6140" />
-        <DList Name="gTwinmoldArenaNormalModeSandDL" Offset="0x62D8" />
-        <TextureAnimation Name="gTwinmoldArenaNormalModeSandTexAnim" Offset="0x6858" />
-        <Collision Name="gTwinmoldArenaNormalModeArenaCol" Offset="0x8EF4" /> <!-- Unused. Attempting to use it severely slows down the game. -->
-
-        <!-- Assets for unused pillars and walls -->
-        <DList Name="gTwinmoldArenaEmpty1DL" Offset="0x90A0" /> <!-- Probably intended to be used as the xluDList for the pillar below. -->
-        <DList Name="gTwinmoldArenaUnusedTwistedPillarDL" Offset="0x90A8" />
-        <Collision Name="gTwinmoldArenaUnusedTwistedPillarCol" Offset="0x930C" />
-        <DList Name="gTwinmoldArenaEmpty2DL" Offset="0x9460" /> <!-- Probably intended to be used as the xluDList for the pillar below. -->
-        <DList Name="gTwinmoldArenaUnusedTrapezoidalPillarDL" Offset="0x9468" />
-        <Collision Name="gTwinmoldArenaUnusedTrapezoidalPillarCol" Offset="0x9600" />
-        <DList Name="gTwinmoldArenaEmpty3DL" Offset="0x9A90" /> <!-- Probably intended to be used as the xluDList for the pillar below. -->
-        <DList Name="gTwinmoldArenaUnusedClawShapedPillarDL" Offset="0x9A98" />
-        <Collision Name="gTwinmoldArenaUnusedClawShapedPillarCol" Offset="0x9EA8" />
-        <DList Name="gTwinmoldArenaEmpty4DL" Offset="0xA020" /> <!-- Probably intended to be used as the xluDList for the wall below. -->
-        <DList Name="gTwinmoldArenaUnusedWallDL" Offset="0xA028" />
-        <Collision Name="gTwinmoldArenaUnusedWallCol" Offset="0xA200" />
-        <DList Name="gTwinmoldArenaEmpty5DL" Offset="0xA430" /> <!-- Probably intended to be used as the xluDList for the wall below. -->
-        <DList Name="gTwinmoldArenaUnusedWallCornerDL" Offset="0xA438" />
-        <Collision Name="gTwinmoldArenaUnusedWallCornerCol" Offset="0xA6A8" />
-
-        <!-- Textures for Twinmold's Arena -->
-        <Texture Name="gTwinmoldArenaCenterPlatformBrickTex" OutName="twinmold_arena_center_platform_brick" Format="rgba16" Width="32" Height="32" Offset="0xA6E0" />
-        <Texture Name="gTwinmoldArenaCenterPlatformEmblemTex" OutName="twinmold_arena_center_platform_emblem" Format="rgba16" Width="32" Height="32" Offset="0xAEE0" />
-        <Texture Name="gTwinmoldArenaCenterPlatformSlopesAndWallSidesTex" OutName="twinmold_arena_center_platform_slopes_and_wall_sides" Format="rgba16" Width="32" Height="64" Offset="0xB6E0" />
-        <Texture Name="gTwinmoldArenaPillarSidesTex" OutName="twinmold_arena_pillar_sides" Format="rgba16" Width="32" Height="32" Offset="0xC6E0" />
-        <Texture Name="gTwinmoldArenaTwistedPillarTopTex" OutName="twinmold_arena_twisted_pillar_top" Format="rgba16" Width="32" Height="32" Offset="0xCEE0" />
-        <Texture Name="gTwinmoldArenaWallTopAndClawPillarInteriorTex" OutName="twinmold_arena_wall_top_and_claw_pillar_interior" Format="rgba16" Width="32" Height="32" Offset="0xD6E0" />
-        <Texture Name="gTwinmoldArenaSandTex" OutName="twinmold_arena_sand" Format="rgba16" Width="32" Height="32" Offset="0xDEE0" />
-        <Texture Name="gTwinmoldArenaSandDetailTex" OutName="twinmold_arena_sand_detail" Format="rgba16" Width="32" Height="32" Offset="0xE6E0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ishi.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ishi.xml
deleted file mode 100644
index 5f53b90ac..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ishi.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Object for small rocks -->
-    <File Name="object_ishi" Segment="6">
-        <Texture Name="gSmallRockTex" OutName="small_rock" Format="rgba16" Width="32" Height="32" Offset="0x1B0" />
-        <DList Name="gSmallRockDL" Offset="0x9B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_jg.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_jg.xml
deleted file mode 100644
index c3e1ac18a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_jg.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<Root>
-    <File Name="object_jg" Segment="6">
-        <!-- Goron Elder Limb DisplayLists -->
-        <DList Name="gGoronElderPelvisDL" Offset="0x3C50" />
-        <DList Name="gGoronElderRightShinDL" Offset="0x3DC8" />
-        <DList Name="gGoronElderRightFootDL" Offset="0x4068" />
-        <DList Name="gGoronElderRightThighDL" Offset="0x4410" />
-        <DList Name="gGoronElderLeftShinDL" Offset="0x4688" />
-        <DList Name="gGoronElderLeftFootDL" Offset="0x4928" />
-        <DList Name="gGoronElderLeftThighDL" Offset="0x4CD0" />
-        <DList Name="gGoronElderHeadDL" Offset="0x4F50" />
-        <DList Name="gGoronElderLowerBeardDL" Offset="0x5440" />
-        <DList Name="gGoronElderUpperBeardDL" Offset="0x54F0" />
-        <DList Name="gGoronElderLowerLipDL" Offset="0x55A8" />
-        <DList Name="gGoronElderHairBackDL" Offset="0x5770" />
-        <DList Name="gGoronElderRightHairEndDL" Offset="0x5968" />
-        <DList Name="gGoronElderLeftHairEndDL" Offset="0x5A48" />
-        <DList Name="gGoronElderUpperTorsoDL" Offset="0x5B28" />
-        <DList Name="gGoronElderRightForearmDL" Offset="0x5EE8" />
-        <DList Name="gGoronElderRightFingersDL" Offset="0x6018" />
-        <DList Name="gGoronElderRightHandAndThumbDL" Offset="0x6130" />
-        <DList Name="gGoronElderRightShoulderAndUpperArmDL" Offset="0x6378" />
-        <DList Name="gGoronElderLeftForearmDL" Offset="0x6678" />
-        <DList Name="gGoronElderLeftFingersDL" Offset="0x67A8" />
-        <DList Name="gGoronElderLeftHandAndThumbDL" Offset="0x68C0" />
-        <DList Name="gGoronElderLeftShoulderAndUpperArmDL" Offset="0x6B08" />
-        <DList Name="gGoronElderLowerTorsoDL" Offset="0x6E08" />
-
-        <!-- Goron Elder Animations -->
-        <Animation Name="gGoronElderThinkingAnim" Offset="0x77CC" /> <!-- Original name is "jg_are_loop" ("huh?") -->
-        <Animation Name="gGoronElderWalkAnim" Offset="0x9440" /> <!-- Original name is "jg_aruku" ("walk") -->
-        <Animation Name="gGoronElderCradleAnim" Offset="0xA07C" /> <!-- Original name is "jg_dakko" ("hug") -->
-
-        <!-- Drum DisplayList and Textures -->
-        <DList Name="gGoronElderDrumDL" Offset="0xA3B0" />
-        <Texture Name="gGoronElderDrumSidesTex" OutName="goron_elder_drum_sides" Format="rgba16" Width="32" Height="32" Offset="0xA530" />
-        <Texture Name="gGoronElderDrumTopTex" OutName="goron_elder_drum_top" Format="rgba16" Width="16" Height="16" Offset="0xAD30" />
-        
-        <!-- Goron Elder Animations -->
-        <Animation Name="gGoronElderWavingAnim" Offset="0xBDD8" /> <!-- Original name is "jg_iran" ("refuse") -->
-        <Animation Name="gGoronElderHeadShakeAnim" Offset="0xC7A8" /> <!-- Original name is "jg_kubifuri" ("head shake") -->
-        <Animation Name="gGoronElderRememberingAnim" Offset="0xD630" /> <!-- Original name is "jg_mouichido" ("once more time") -->
-        <Animation Name="gGoronElderSurpriseStartAnim" Offset="0xDB54" /> <!-- Original name is "jg_odoroki" ("surprise") -->
-        <Animation Name="gGoronElderSurpriseLoopAnim" Offset="0xE8FC" /> <!-- Original name is "jg_odorokiLoop" -->
-        <Animation Name="gGoronElderStrongRememberingAnim" Offset="0xFE48" /> <!-- Original name is "jg_soujyatta" (something like "it was this way") -->
-        <Animation Name="gGoronElderTakeOutDrumAnim" Offset="0x11F50" /> <!-- Original name is "jg_taiko_dasu" ("get out drum") -->
-        <Animation Name="gGoronElderDrumIdleAnim" Offset="0x129F4" /> <!-- Original name is "jg_taiko_loop" ("drum loop") -->
-        <Animation Name="gGoronElderPlayingDrumAnim" Offset="0x13DD8" /> <!-- Original name is "jg_taiko_tataku" ("playing the drum") -->
-        <Animation Name="gGoronElderAngryAnim" Offset="0x1436C" /> <!-- Original name is "jg_takaburu" ("to become worked up") -->
-
-        <!-- Goron Elder Textures -->
-        <Texture Name="gGoronElderTLUT" OutName="goron_elder_palette" Format="rgba16" Width="16" Height="16" Offset="0x14380" />
-        <Texture Name="gGoronElderSkinTex" OutName="goron_elder_skin" Format="ci8" Width="8" Height="8" Offset="0x14580" />
-        <Texture Name="gGoronElderToesTex" OutName="goron_elder_toes" Format="ci8" Width="32" Height="16" Offset="0x145C0" />
-        <Texture Name="gGoronElderFootBottomTex" OutName="goron_elder_foot_bottom" Format="ci8" Width="32" Height="32" Offset="0x147C0" />
-        <Texture Name="gGoronElderVeinsTex" OutName="goron_elder_veins" Format="ci8" Width="32" Height="32" Offset="0x14BC0" />
-        <Texture Name="gGoronElderSpotsTex" OutName="goron_elder_spots" Format="ci8" Width="16" Height="16" Offset="0x14FC0" />
-        <Texture Name="gGoronElderLowerLipTex" OutName="goron_elder_lower_lip" Format="rgba16" Width="8" Height="16" Offset="0x150C0" />
-        <Texture Name="gGoronElderLipTex" OutName="goron_elder_lip" Format="rgba16" Width="8" Height="8" Offset="0x151C0" />
-        <Texture Name="gGoronElderHairTex" OutName="goron_elder_hair" Format="rgba16" Width="16" Height="32" Offset="0x15240" />
-        <Texture Name="gGoronElderNostrilAndBellyButtonTex" OutName="goron_elder_nostril_and_belly_button" Format="ci8" Width="8" Height="8" Offset="0x15640" />
-        <Texture Name="gGoronElderCheekTex" OutName="goron_elder_cheek" Format="ci8" Width="8" Height="8" Offset="0x15680" />
-        <Texture Name="gGoronElderBrowTex" OutName="goron_elder_brow" Format="ci8" Width="8" Height="8" Offset="0x156C0" />
-        <Texture Name="gGoronElderHairEndTex" OutName="goron_elder_hair_end" Format="rgba16" Width="32" Height="64" Offset="0x15700" />
-        <Texture Name="gGoronElderFingersTex" OutName="goron_elder_fingers" Format="ci8" Width="16" Height="16" Offset="0x16700" />
-        <Texture Name="gGoronElderGoronRubyTattooTex" OutName="goron_elder_goron_ruby_tattoo" Format="ci8" Width="16" Height="32" Offset="0x16800" />
-        <Texture Name="gGoronElderChestTex" OutName="goron_elder_chest" Format="ci8" Width="32" Height="32" Offset="0x16A00" />
-        <Texture Name="gGoronElderBackTex" OutName="goron_elder_back" Format="ci8" Width="32" Height="64" Offset="0x16E00" />
-
-        <!-- Goron Elder Animations -->
-        <Animation Name="gGoronElderDepressedAnim" Offset="0x18CE4" /> <!-- Original name is "jg_u_m_loop" -->
-        <Animation Name="gGoronElderIdleAnim" Offset="0x1ADC0" /> <!-- Original name is "jg_wait" -->
-
-        <!-- Goron Elder Limbs -->
-        <Limb Name="gGoronElderRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_ROOT" Offset="0x1ADD0" />
-        <Limb Name="gGoronElderUpperBodyRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_UPPER_BODY_ROOT" Offset="0x1ADDC" />
-        <Limb Name="gGoronElderLowerTorsoLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LOWER_TORSO" Offset="0x1ADE8" />
-        <Limb Name="gGoronElderUpperTorsoLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_UPPER_TORSO" Offset="0x1ADF4" />
-        <Limb Name="gGoronElderLeftArmRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_ARM_ROOT" Offset="0x1AE00" />
-        <Limb Name="gGoronElderLeftShoulderAndUpperArmLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_SHOULDER_AND_UPPER_ARM" Offset="0x1AE0C" />
-        <Limb Name="gGoronElderLeftForearmLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_FOREARM" Offset="0x1AE18" />
-        <Limb Name="gGoronElderLeftWristLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_WRIST" Offset="0x1AE24" />
-        <Limb Name="gGoronElderLeftHandAndThumbLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_HAND_AND_THUMB" Offset="0x1AE30" />
-        <Limb Name="gGoronElderLeftFingersLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_FINGERS" Offset="0x1AE3C" />
-        <Limb Name="gGoronElderRightArmRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_ARM_ROOT" Offset="0x1AE48" />
-        <Limb Name="gGoronElderRightShoulderAndUpperArmLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_SHOULDER_AND_UPPER_ARM" Offset="0x1AE54" />
-        <Limb Name="gGoronElderRightForearmLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_FOREARM" Offset="0x1AE60" />
-        <Limb Name="gGoronElderRightWristLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_WRIST" Offset="0x1AE6C" />
-        <Limb Name="gGoronElderRightHandAndThumbLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_HAND_AND_THUMB" Offset="0x1AE78" />
-        <Limb Name="gGoronElderRightFingersLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_FINGERS" Offset="0x1AE84" />
-        <Limb Name="gGoronElderNeckLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_NECK" Offset="0x1AE90" />
-        <Limb Name="gGoronElderLeftHairEndLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_HAIR_END" Offset="0x1AE9C" />
-        <Limb Name="gGoronElderRightHairEndLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_HAIR_END" Offset="0x1AEA8" />
-        <Limb Name="gGoronElderHairBackLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_HAIR_BACK" Offset="0x1AEB4" />
-        <Limb Name="gGoronElderHeadLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_HEAD" Offset="0x1AEC0" />
-        <Limb Name="gGoronElderLowerLipLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LOWER_LIP" Offset="0x1AECC" />
-        <Limb Name="gGoronElderBeardRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_BEARD_ROOT" Offset="0x1AED8" />
-        <Limb Name="gGoronElderUpperBeardLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_UPPER_BEARD" Offset="0x1AEE4" />
-        <Limb Name="gGoronElderLowerBeardLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LOWER_BEARD" Offset="0x1AEF0" />
-        <Limb Name="gGoronElderPelvisLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_PELVIS" Offset="0x1AEFC" />
-        <Limb Name="gGoronElderLeftLegRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_LEG_ROOT" Offset="0x1AF08" />
-        <Limb Name="gGoronElderLeftThighLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_THIGH" Offset="0x1AF14" />
-        <Limb Name="gGoronElderLeftShinLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_SHIN" Offset="0x1AF20" />
-        <Limb Name="gGoronElderLeftFootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_LEFT_FOOT" Offset="0x1AF2C" />
-        <Limb Name="gGoronElderRightLegRootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_LEG_ROOT" Offset="0x1AF38" />
-        <Limb Name="gGoronElderRightThighLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_THIGH" Offset="0x1AF44" />
-        <Limb Name="gGoronElderRightShinLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_SHIN" Offset="0x1AF50" />
-        <Limb Name="gGoronElderRightFootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_FOOT" Offset="0x1AF5C" />
-
-        <!-- Goron Elder Skeleton -->
-        <Skeleton Name="gGoronElderSkel" Type="Flex" LimbType="Standard" LimbNone="GORON_ELDER_LIMB_NONE" LimbMax="GORON_ELDER_LIMB_MAX" EnumName="GoronElderLimb" Offset="0x1AFF0" />
-
-        <!-- Drum Animation, Limb, and Skeleton -->
-        <Animation Name="gGoronElderDrumTakeOutAnim" Offset="0x1B1E8" /> <!-- Original name is "jggakki_dasu" ("get out") -->
-        <Limb Name="gGoronElderDrumLimb" Type="Standard" EnumName="GORON_ELDER_DRUM_LIMB_ROOT" Offset="0x1B200" />
-        <Skeleton Name="gGoronElderDrumSkel" Type="Normal" LimbType="Standard" LimbNone="GORON_ELDER_DRUM_LIMB_NONE" LimbMax="GORON_ELDER_DRUM_LIMB_MAX" EnumName="GoronElderDrumLimb" Offset="0x1B210" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_js.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_js.xml
deleted file mode 100644
index 6d93f7ac2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_js.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<Root>
-    <File Name="object_js" Segment="6">
-        <Animation Name="object_js_Anim_00016C" Offset="0x16C" /> <!-- Original name is "js_chigau" -->
-        <Animation Name="object_js_Anim_0003DC" Offset="0x3DC" /> <!-- Original name is "js_chigau2wait" -->
-        <Animation Name="object_js_Anim_000AD4" Offset="0xAD4" /> <!-- Original name is "js_furueru" -->
-        <Animation Name="object_js_Anim_000C7C" Offset="0xC7C" /> <!-- Original name is "js_maido" -->
-        <Animation Name="object_js_Anim_000F4C" Offset="0xF4C" /> <!-- Original name is "js_matsu" -->
-        <DList Name="object_js_DL_003F30" Offset="0x3F30" />
-        <DList Name="object_js_DL_004510" Offset="0x4510" />
-        <DList Name="object_js_DL_004688" Offset="0x4688" />
-        <DList Name="object_js_DL_004868" Offset="0x4868" />
-        <DList Name="object_js_DL_004B60" Offset="0x4B60" />
-        <DList Name="object_js_DL_004EA0" Offset="0x4EA0" />
-        <DList Name="object_js_DL_004FD0" Offset="0x4FD0" />
-        <DList Name="object_js_DL_005178" Offset="0x5178" />
-        <DList Name="object_js_DL_0052D8" Offset="0x52D8" />
-        <DList Name="object_js_DL_005408" Offset="0x5408" />
-        <DList Name="object_js_DL_0055B0" Offset="0x55B0" />
-        <Texture Name="object_js_TLUT_005710" OutName="tlut_005710" Format="rgba16" Width="16" Height="16" Offset="0x5710" />
-        <Texture Name="object_js_Tex_005910" OutName="tex_005910" Format="ci8" Width="8" Height="16" Offset="0x5910" />
-        <Texture Name="object_js_Tex_005990" OutName="tex_005990" Format="ci8" Width="16" Height="16" Offset="0x5990" />
-        <Texture Name="object_js_Tex_005A90" OutName="tex_005A90" Format="ci8" Width="32" Height="16" Offset="0x5A90" />
-        <Texture Name="object_js_Tex_005C90" OutName="tex_005C90" Format="ci8" Width="8" Height="8" Offset="0x5C90" />
-        <Texture Name="object_js_Tex_005CD0" OutName="tex_005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" />
-        <Texture Name="object_js_Tex_0060D0" OutName="tex_0060D0" Format="ci8" Width="16" Height="16" Offset="0x60D0" />
-        <Texture Name="object_js_Tex_0061D0" OutName="tex_0061D0" Format="ci8" Width="16" Height="32" Offset="0x61D0" />
-        <Texture Name="object_js_Tex_0063D0" OutName="tex_0063D0" Format="ci8" Width="16" Height="32" Offset="0x63D0" />
-        <Texture Name="object_js_Tex_0065D0" OutName="tex_0065D0" Format="ci8" Width="16" Height="32" Offset="0x65D0" />
-        <Texture Name="object_js_Tex_0067D0" OutName="tex_0067D0" Format="ci8" Width="16" Height="16" Offset="0x67D0" />
-        <Limb Name="object_js_Standardlimb_0068D0" Type="Standard" EnumName="OBJECT_JS_LIMB_01" Offset="0x68D0" />
-        <Limb Name="object_js_Standardlimb_0068DC" Type="Standard" EnumName="OBJECT_JS_LIMB_02" Offset="0x68DC" />
-        <Limb Name="object_js_Standardlimb_0068E8" Type="Standard" EnumName="OBJECT_JS_LIMB_03" Offset="0x68E8" />
-        <Limb Name="object_js_Standardlimb_0068F4" Type="Standard" EnumName="OBJECT_JS_LIMB_04" Offset="0x68F4" />
-        <Limb Name="object_js_Standardlimb_006900" Type="Standard" EnumName="OBJECT_JS_LIMB_05" Offset="0x6900" />
-        <Limb Name="object_js_Standardlimb_00690C" Type="Standard" EnumName="OBJECT_JS_LIMB_06" Offset="0x690C" />
-        <Limb Name="object_js_Standardlimb_006918" Type="Standard" EnumName="OBJECT_JS_LIMB_07" Offset="0x6918" />
-        <Limb Name="object_js_Standardlimb_006924" Type="Standard" EnumName="OBJECT_JS_LIMB_08" Offset="0x6924" />
-        <Limb Name="object_js_Standardlimb_006930" Type="Standard" EnumName="OBJECT_JS_LIMB_09" Offset="0x6930" />
-        <Limb Name="object_js_Standardlimb_00693C" Type="Standard" EnumName="OBJECT_JS_LIMB_0A" Offset="0x693C" />
-        <Limb Name="object_js_Standardlimb_006948" Type="Standard" EnumName="OBJECT_JS_LIMB_0B" Offset="0x6948" />
-        <Limb Name="object_js_Standardlimb_006954" Type="Standard" EnumName="OBJECT_JS_LIMB_0C" Offset="0x6954" />
-        <Skeleton Name="object_js_Skel_006990" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JS_LIMB_NONE" LimbMax="OBJECT_JS_LIMB_MAX" EnumName="ObjectJsLimb" Offset="0x6990" />
-        <Collision Name="object_js_Colheader_0069E8" Offset="0x69E8" /> <!-- Original name is "test_floor_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_jso.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_jso.xml
deleted file mode 100644
index d94ffdafe..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_jso.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<Root>
-    <!-- Assets for Garos and the Garo Master -->
-    <File Name="object_jso" Segment="6">
-        <!-- Unused Empty Texture Animations -->
-        <TextureAnimation Name="gGaroEmpty1TexAnim" Offset="0x0" />
-        <TextureAnimation Name="gGaroEmpty2TexAnim" Offset="0x10" />
-
-        <!-- Garo Master Limb DisplayLists -->
-        <DList Name="gGaroMasterLeftThighDL" Offset="0x1210" />
-        <DList Name="gGaroMasterLeftShinDL" Offset="0x1348" />
-        <DList Name="gGaroMasterLeftFootDL" Offset="0x13F8" />
-        <DList Name="gGaroMasterRightThighDL" Offset="0x1508" />
-        <DList Name="gGaroMasterRightShinDL" Offset="0x1640" />
-        <DList Name="gGaroMasterRightFootDL" Offset="0x16F0" />
-        <DList Name="gGaroMasterTorsoDL" Offset="0x1800" />
-        <DList Name="gGaroMasterHeadDL" Offset="0x1908" />
-        <DList Name="gGaroMasterRobeTopDL" Offset="0x1A18" />
-        <DList Name="gGaroMasterRobeFrontDL" Offset="0x1B00" />
-        <DList Name="gGaroMasterRobeRightDL" Offset="0x1C48" />
-        <DList Name="gGaroMasterRobeLeftDL" Offset="0x1D78" />
-        <DList Name="gGaroMasterRobeBackDL" Offset="0x1EA8" />
-        <DList Name="gGaroMasterRightArmDL" Offset="0x1FA8" />
-        <DList Name="gGaroMasterRightSwordDL" Offset="0x1FF8" />
-        <DList Name="gGaroMasterLeftArmDL" Offset="0x20B0" />
-        <DList Name="gGaroMasterLeftSwordDL" Offset="0x2100" />
-
-        <!-- Garo Master Textures -->
-        <Texture Name="gGaroMasterUnusedLegWrappingTex" OutName="garo_master_unused_leg_wrapping" Format="rgba16" Width="8" Height="16" Offset="0x21B8" /> <!-- unused duplicate of gGaroLegWrappingTex -->
-        <Texture Name="gGaroMasterRobeFrontTex" OutName="garo_master_robe_front" Format="rgba16" Width="16" Height="16" Offset="0x22B8" />
-        <Texture Name="gGaroMasterShinTex" OutName="garo_master_shin" Format="rgba16" Width="8" Height="16" Offset="0x24B8" />
-        <Texture Name="gGaroMasterDuplicateEyeTex" OutName="garo_master_duplicate_eye" Format="rgba16" Width="8" Height="8" Offset="0x25B8" /> <!-- unused duplicate of gGaroMasterEyeTex -->
-        <Texture Name="gGaroMasterSwordTex" OutName="garo_master_sword" Format="rgba16" Width="4" Height="4" Offset="0x2638" />
-        <Texture Name="gGaroMasterRobeTex" OutName="garo_master_robe" Format="rgba16" Width="8" Height="32" Offset="0x2658" />
-        <Texture Name="gGaroMasterClothingTLUT" OutName="garo_master_clothing_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2858" />
-        <Texture Name="gGaroMasterMaskTLUT" OutName="garo_master_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2A58" />
-        <Texture Name="gGaroMasterClothingTex" OutName="garo_master_clothing" Format="ci8" Width="16" Height="16" Offset="0x2C58" />
-        <Texture Name="gGaroMasterMaskTex" OutName="garo_master_mask" Format="ci8" Width="16" Height="16" Offset="0x2D58" />
-
-        <!-- Garo Master Eyes Texture and DisplayList -->
-        <DList Name="gGaroMasterEyesDL" Offset="0x2ED8" />
-        <Texture Name="gGaroMasterEyeTex" OutName="garo_master_eye" Format="rgba16" Width="8" Height="8" Offset="0x2FB8" />
-
-        <!-- Garo Master Limbs -->
-        <Limb Name="gGaroMasterRootLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROOT" Offset="0x3038" />
-        <Limb Name="gGaroMasterTorsoLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_TORSO" Offset="0x3044" />
-        <Limb Name="gGaroMasterLeftArmLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LEFT_ARM" Offset="0x3050" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <Limb Name="gGaroMasterLeftSwordLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LEFT_SWORD" Offset="0x305C" />
-        <Limb Name="gGaroMasterRightArmLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_RIGHT_ARM" Offset="0x3068" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <Limb Name="gGaroMasterRightSwordLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_RIGHT_SWORD" Offset="0x3074" />
-        <Limb Name="gGaroMasterRobeTopLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROBE_TOP" Offset="0x3080" />
-        <Limb Name="gGaroMasterRobeBackLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROBE_BACK" Offset="0x308C" />
-        <Limb Name="gGaroMasterRobeLeftLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROBE_LEFT" Offset="0x3098" />
-        <Limb Name="gGaroMasterRobeRightLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROBE_RIGHT" Offset="0x30A4" />
-        <Limb Name="gGaroMasterRobeFrontLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_ROBE_FRONT" Offset="0x30B0" />
-        <Limb Name="gGaroMasterHeadLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_HEAD" Offset="0x30BC" />
-        <Limb Name="gGaroMasterLowerBodyRootLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LOWER_BODY_ROOT" Offset="0x30C8" />
-        <Limb Name="gGaroMasterRightThighLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_RIGHT_THIGH" Offset="0x30D4" />
-        <Limb Name="gGaroMasterRightShinLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_RIGHT_SHIN" Offset="0x30E0" />
-        <Limb Name="gGaroMasterRightFootLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_RIGHT_FOOT" Offset="0x30EC" />
-        <Limb Name="gGaroMasterLeftThighLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LEFT_THIGH" Offset="0x30F8" />
-        <Limb Name="gGaroMasterLeftShinLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LEFT_SHIN" Offset="0x3104" />
-        <Limb Name="gGaroMasterLeftFootLimb" Type="Standard" EnumName="GARO_MASTER_LIMB_LEFT_FOOT" Offset="0x3110" />
-
-        <!-- Garo Master Skeleton -->
-        <Skeleton Name="gGaroMasterSkel" Type="Flex" LimbType="Standard" LimbNone="GARO_MASTER_LIMB_NONE" LimbMax="GARO_MASTER_LIMB_MAX" EnumName="GaroMasterLimb" Offset="0x3168" />
-
-        <!-- Garo and Garo Master Animations -->
-        <Animation Name="gGaroStaticJumpPoseAnim" Offset="0x3238" /> <!-- Unused, one-frame long animation of the Garo jumping or falling. Original name is "jsk_pose" -->
-        <Animation Name="gGaroDashAttackAnim" Offset="0x3530" /> <!-- Original name is "jso_attack1" -->
-        <Animation Name="gGaroSlashStartAnim" Offset="0x378C" /> <!-- Original name is "jso_attack2" -->
-        <Animation Name="gGaroSlashLoopAnim" Offset="0x38AC" /> <!-- Original name is "jso_attack_wait" -->
-        <Animation Name="gGaroJumpBackAnim" Offset="0x3D5C" /> <!-- Original name is "jso_back" -->
-        <Animation Name="gGaroTakeOutBombAnim" Offset="0x4018" /> <!-- Original name is "jso_bomb" -->
-        <Animation Name="gGaroLandAnim" Offset="0x4384" /> <!-- Original name is "jso_chakuchiD" ("chakuchi" = "landing", "D" is probably short for "demo") -->
-        <Animation Name="gGaroDamagedAnim" Offset="0x44F8" /> <!-- Original name is "jso_damage" -->
-        <Animation Name="gGaroGuardAnim" Offset="0x4858" /> <!-- Original name is "jso_defense" -->
-        <Animation Name="gGaroAppearAndDrawSwordsAnim" Offset="0x5778" /> <!-- Original name is "jso_demo_start" -->
-        <Animation Name="gGaroFallDownAnim" Offset="0x5D5C" /> <!-- Original name is "jso_down" -->
-        <Animation Name="gGaroKnockedBackAnim" Offset="0x603C" /> <!-- Original name is "jso_hajiku" ("repelled" or "bounced back") -->
-        <Animation Name="gGaroTrembleAnim" Offset="0x63A4" /> <!-- Original name is "jso_henahena" (onomatopoeic for "weakly; helplessly​") -->
-        <Animation Name="gGaroCollapseAnim" Offset="0x67F0" /> <!-- Original name is "jso_hetari" ("to sink down to the floor") -->
-        <Animation Name="gGaroDrawSwordsAnim" Offset="0x70BC" /> <!-- Original name is "jso_jakin" (possibly onomatopoeic for drawing a sword from a sheath) -->
-        <Animation Name="gGaroJumpDownAnim" Offset="0x71E0" /> <!-- Original name is "jso_jumpD" -->
-        <Animation Name="gGaroSpinAttackAnim" Offset="0x72AC" /> <!-- Original name is "jso_kaiten" ("rotation; turn; spin") -->
-        <Animation Name="gGaroLookAroundAnim" Offset="0x788C" /> <!-- Original name is "jso_kyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="gGaroCowerAnim" Offset="0x7B04" /> <!-- Original name is "jso_ororo" (possibly onomatopoeic for "in a panic; helplessly" or "sobbing; tearfully") -->
-        <Animation Name="gGaroAppearAnim" Offset="0x81F4" /> <!-- Original name is "jso_start" -->
-
-        <!-- Garo Limb DisplayLists -->
-        <DList Name="gGaroLeftThighDL" Offset="0x8F50" />
-        <DList Name="gGaroLeftShinDL" Offset="0x9008" />
-        <DList Name="gGaroLeftFootDL" Offset="0x90C0" />
-        <DList Name="gGaroRightThighDL" Offset="0x9190" />
-        <DList Name="gGaroRightShinDL" Offset="0x9248" />
-        <DList Name="gGaroRightFootDL" Offset="0x9300" />
-        <DList Name="gGaroTorsoDL" Offset="0x93D0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gGaroHeadDL" Offset="0x9428" />
-        <DList Name="gGaroRobeTopDL" Offset="0x94E0" />
-        <DList Name="gGaroRobeFrontDL" Offset="0x9758" />
-        <DList Name="gGaroRobeRightDL" Offset="0x98C8" />
-        <DList Name="gGaroRobeLeftDL" Offset="0x99B8" />
-        <DList Name="gGaroRobeBackDL" Offset="0x9AA8" />
-        <DList Name="gGaroRightArmDL" Offset="0x9B80" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gGaroRightSwordDL" Offset="0x9BD8" />
-        <DList Name="gGaroLeftArmDL" Offset="0x9C98" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gGaroLeftSwordDL" Offset="0x9CF0" />
-
-        <!-- Garo Textures -->
-        <Texture Name="gGaroLegWrappingTex" OutName="garo_leg_wrapping" Format="rgba16" Width="8" Height="16" Offset="0x9DB0" />
-        <Texture Name="gGaroThighTex" OutName="garo_thigh" Format="rgba16" Width="8" Height="8" Offset="0x9EB0" />
-        <Texture Name="gGaroRobeFrontTex" OutName="garo_robe_front" Format="rgba16" Width="16" Height="32" Offset="0x9F30" />
-        <Texture Name="gGaroRobeTex" OutName="garo_robe" Format="rgba16" Width="16" Height="16" Offset="0xA330" />
-        <Texture Name="gGaroRobeStitchingTex" OutName="garo_robe_stitching" Format="rgba16" Width="16" Height="8" Offset="0xA530" />
-        <Texture Name="gGaroRobeTopTex" OutName="garo_robe_top" Format="rgba16" Width="8" Height="8" Offset="0xA630" />
-        <Texture Name="gGaroEyesTex" OutName="garo_eyes" Format="rgba16" Width="16" Height="16" Offset="0xA6B0" />
-        <Texture Name="gGaroSwordTex" OutName="garo_sword" Format="rgba16" Width="4" Height="4" Offset="0xA8B0" />
-
-        <!-- Garo Limbs -->
-        <Limb Name="gGaroRootLimb" Type="Standard" EnumName="GARO_LIMB_ROOT" Offset="0xA8D0" />
-        <Limb Name="gGaroTorsoLimb" Type="Standard" EnumName="GARO_LIMB_TORSO" Offset="0xA8DC" />
-        <Limb Name="gGaroLeftArmLimb" Type="Standard" EnumName="GARO_LIMB_LEFT_ARM" Offset="0xA8E8" />
-        <Limb Name="gGaroLeftSwordLimb" Type="Standard" EnumName="GARO_LIMB_LEFT_SWORD" Offset="0xA8F4" />
-        <Limb Name="gGaroRightArmLimb" Type="Standard" EnumName="GARO_LIMB_RIGHT_ARM" Offset="0xA900" />
-        <Limb Name="gGaroRightSwordLimb" Type="Standard" EnumName="GARO_LIMB_RIGHT_SWORD" Offset="0xA90C" />
-        <Limb Name="gGaroRobeTopLimb" Type="Standard" EnumName="GARO_LIMB_ROBE_TOP" Offset="0xA918" />
-        <Limb Name="gGaroRobeBackLimb" Type="Standard" EnumName="GARO_LIMB_ROBE_BACK" Offset="0xA924" />
-        <Limb Name="gGaroRobeLeftLimb" Type="Standard" EnumName="GARO_LIMB_ROBE_LEFT" Offset="0xA930" />
-        <Limb Name="gGaroRobeRightLimb" Type="Standard" EnumName="GARO_LIMB_ROBE_RIGHT" Offset="0xA93C" />
-        <Limb Name="gGaroRobeFrontLimb" Type="Standard" EnumName="GARO_LIMB_ROBE_FRONT" Offset="0xA948" />
-        <Limb Name="gGaroHeadLimb" Type="Standard" EnumName="GARO_LIMB_HEAD" Offset="0xA954" />
-        <Limb Name="gGaroLowerBodyRootLimb" Type="Standard" EnumName="GARO_LIMB_LOWER_BODY_ROOT" Offset="0xA960" />
-        <Limb Name="gGaroRightThighLimb" Type="Standard" EnumName="GARO_LIMB_RIGHT_THIGH" Offset="0xA96C" />
-        <Limb Name="gGaroRightShinLimb" Type="Standard" EnumName="GARO_LIMB_RIGHT_SHIN" Offset="0xA978" />
-        <Limb Name="gGaroRightFootLimb" Type="Standard" EnumName="GARO_LIMB_RIGHT_FOOT" Offset="0xA984" />
-        <Limb Name="gGaroLeftThighLimb" Type="Standard" EnumName="GARO_LIMB_LEFT_THIGH" Offset="0xA990" />
-        <Limb Name="gGaroLeftShinLimb" Type="Standard" EnumName="GARO_LIMB_LEFT_SHIN" Offset="0xA99C" />
-        <Limb Name="gGaroLeftFootLimb" Type="Standard" EnumName="GARO_LIMB_LEFT_FOOT" Offset="0xA9A8" />
-
-        <!-- Garo Skeleton -->
-        <Skeleton Name="gGaroSkel" Type="Flex" LimbType="Standard" LimbNone="GARO_LIMB_NONE" LimbMax="GARO_LIMB_MAX" EnumName="GaroLimb" Offset="0xAA00" />
-
-        <!-- Garo and Garo Master Animations -->
-        <Animation Name="gGaroIdleAnim" Offset="0xAE80" /> <!-- Original name is "jso_wait" -->
-        <Animation Name="gGaroLaughAnim" Offset="0xB1DC" /> <!-- Original name is "jso_waitD" -->
-        <Animation Name="gGaroBounceAnim" Offset="0xB5F0" /> <!-- Original name is "jso_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ka.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ka.xml
deleted file mode 100644
index 914617b41..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ka.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Root>
-    <!-- Assets for Pierre, the scarecrow -->
-    <File Name="object_ka" Segment="6">
-        <Animation Name="object_ka_Anim_000214" Offset="0x214" /> <!-- Original name is "dance" -->
-        <DList Name="object_ka_DL_001550" Offset="0x1550" />
-        <DList Name="object_ka_DL_001600" Offset="0x1600" />
-        <DList Name="object_ka_DL_0017D8" Offset="0x17D8" />
-        <DList Name="object_ka_DL_001878" Offset="0x1878" />
-        <DList Name="object_ka_DL_001918" Offset="0x1918" />
-        <DList Name="object_ka_DL_0019B8" Offset="0x19B8" />
-        <DList Name="object_ka_DL_001CD8" Offset="0x1CD8" />
-        <DList Name="object_ka_DL_001F68" Offset="0x1F68" />
-        <DList Name="object_ka_DL_002020" Offset="0x2020" />
-        <DList Name="object_ka_DL_0020C0" Offset="0x20C0" />
-        <DList Name="object_ka_DL_002160" Offset="0x2160" />
-        <DList Name="object_ka_DL_002200" Offset="0x2200" />
-        <DList Name="object_ka_DL_0022A0" Offset="0x22A0" />
-        <DList Name="object_ka_DL_002340" Offset="0x2340" />
-        <DList Name="object_ka_DL_002430" Offset="0x2430" />
-        <DList Name="object_ka_DL_0024D0" Offset="0x24D0" />
-        <DList Name="object_ka_DL_002570" Offset="0x2570" />
-        <DList Name="object_ka_DL_002610" Offset="0x2610" />
-        <DList Name="object_ka_DL_0027A0" Offset="0x27A0" />
-        <DList Name="object_ka_DL_002890" Offset="0x2890" />
-        <DList Name="object_ka_DL_002930" Offset="0x2930" />
-        <DList Name="object_ka_DL_0029D0" Offset="0x29D0" />
-        <DList Name="object_ka_DL_002A70" Offset="0x2A70" />
-        <Texture Name="object_ka_Tex_002C00" OutName="tex_002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00" />
-        <Texture Name="object_ka_Tex_003400" OutName="tex_003400" Format="rgba16" Width="32" Height="32" Offset="0x3400" />
-        <Texture Name="object_ka_Tex_003C00" OutName="tex_003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00" />
-        <Texture Name="object_ka_Tex_004400" OutName="tex_004400" Format="rgba16" Width="32" Height="32" Offset="0x4400" />
-        <Texture Name="object_ka_Tex_004C00" OutName="tex_004C00" Format="rgba16" Width="32" Height="32" Offset="0x4C00" />
-        <Texture Name="object_ka_Tex_005400" OutName="tex_005400" Format="rgba16" Width="32" Height="32" Offset="0x5400" />
-        <Texture Name="object_ka_Tex_005C00" OutName="tex_005C00" Format="rgba16" Width="32" Height="32" Offset="0x5C00" />
-        <Limb Name="object_ka_Standardlimb_006400" Type="Standard" EnumName="OBJECT_KA_LIMB_01" Offset="0x6400" />
-        <Limb Name="object_ka_Standardlimb_00640C" Type="Standard" EnumName="OBJECT_KA_LIMB_02" Offset="0x640C" />
-        <Limb Name="object_ka_Standardlimb_006418" Type="Standard" EnumName="OBJECT_KA_LIMB_03" Offset="0x6418" />
-        <Limb Name="object_ka_Standardlimb_006424" Type="Standard" EnumName="OBJECT_KA_LIMB_04" Offset="0x6424" />
-        <Limb Name="object_ka_Standardlimb_006430" Type="Standard" EnumName="OBJECT_KA_LIMB_05" Offset="0x6430" />
-        <Limb Name="object_ka_Standardlimb_00643C" Type="Standard" EnumName="OBJECT_KA_LIMB_06" Offset="0x643C" />
-        <Limb Name="object_ka_Standardlimb_006448" Type="Standard" EnumName="OBJECT_KA_LIMB_07" Offset="0x6448" />
-        <Limb Name="object_ka_Standardlimb_006454" Type="Standard" EnumName="OBJECT_KA_LIMB_08" Offset="0x6454" />
-        <Limb Name="object_ka_Standardlimb_006460" Type="Standard" EnumName="OBJECT_KA_LIMB_09" Offset="0x6460" />
-        <Limb Name="object_ka_Standardlimb_00646C" Type="Standard" EnumName="OBJECT_KA_LIMB_0A" Offset="0x646C" />
-        <Limb Name="object_ka_Standardlimb_006478" Type="Standard" EnumName="OBJECT_KA_LIMB_0B" Offset="0x6478" />
-        <Limb Name="object_ka_Standardlimb_006484" Type="Standard" EnumName="OBJECT_KA_LIMB_0C" Offset="0x6484" />
-        <Limb Name="object_ka_Standardlimb_006490" Type="Standard" EnumName="OBJECT_KA_LIMB_0D" Offset="0x6490" />
-        <Limb Name="object_ka_Standardlimb_00649C" Type="Standard" EnumName="OBJECT_KA_LIMB_0E" Offset="0x649C" />
-        <Limb Name="object_ka_Standardlimb_0064A8" Type="Standard" EnumName="OBJECT_KA_LIMB_0F" Offset="0x64A8" />
-        <Limb Name="object_ka_Standardlimb_0064B4" Type="Standard" EnumName="OBJECT_KA_LIMB_10" Offset="0x64B4" />
-        <Limb Name="object_ka_Standardlimb_0064C0" Type="Standard" EnumName="OBJECT_KA_LIMB_11" Offset="0x64C0" />
-        <Limb Name="object_ka_Standardlimb_0064CC" Type="Standard" EnumName="OBJECT_KA_LIMB_12" Offset="0x64CC" />
-        <Limb Name="object_ka_Standardlimb_0064D8" Type="Standard" EnumName="OBJECT_KA_LIMB_13" Offset="0x64D8" />
-        <Limb Name="object_ka_Standardlimb_0064E4" Type="Standard" EnumName="OBJECT_KA_LIMB_14" Offset="0x64E4" />
-        <Limb Name="object_ka_Standardlimb_0064F0" Type="Standard" EnumName="OBJECT_KA_LIMB_15" Offset="0x64F0" />
-        <Limb Name="object_ka_Standardlimb_0064FC" Type="Standard" EnumName="OBJECT_KA_LIMB_16" Offset="0x64FC" />
-        <Limb Name="object_ka_Standardlimb_006508" Type="Standard" EnumName="OBJECT_KA_LIMB_17" Offset="0x6508" />
-        <Limb Name="object_ka_Standardlimb_006514" Type="Standard" EnumName="OBJECT_KA_LIMB_18" Offset="0x6514" />
-        <Limb Name="object_ka_Standardlimb_006520" Type="Standard" EnumName="OBJECT_KA_LIMB_19" Offset="0x6520" />
-        <Limb Name="object_ka_Standardlimb_00652C" Type="Standard" EnumName="OBJECT_KA_LIMB_1A" Offset="0x652C" />
-        <Limb Name="object_ka_Standardlimb_006538" Type="Standard" EnumName="OBJECT_KA_LIMB_1B" Offset="0x6538" />
-        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KA_LIMB_NONE" LimbMax="OBJECT_KA_LIMB_MAX" EnumName="ObjectKaLimb" Offset="0x65B0" />
-        <Animation Name="object_ka_Anim_00686C" Offset="0x686C" /> <!-- Original name is "ka_basicdance" -->
-        <Animation Name="object_ka_Anim_006A6C" Offset="0x6A6C" /> <!-- Original name is "ka_dance" (this animation was removed in MM3D, but it's present in OoT3D) -->
-        <Animation Name="object_ka_Anim_0071EC" Offset="0x71EC" /> <!-- Original name is "ka_hello" -->
-        <Animation Name="object_ka_Anim_007444" Offset="0x7444" /> <!-- Original name is "ka_newwait" -->
-        <Animation Name="object_ka_Anim_007B90" Offset="0x7B90" /> <!-- Original name is "ka_onegai" -->
-        <Animation Name="object_ka_Anim_0081A4" Offset="0x81A4" /> <!-- Original name is "ka_turndance" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kaizoku_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kaizoku_obj.xml
deleted file mode 100644
index c13f32125..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kaizoku_obj.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-    <File Name="object_kaizoku_obj" Segment="6">
-        <DList Name="object_kaizoku_obj_DL_0001A0" Offset="0x1A0" /> <!-- Original name is "Y2_KaizokuShutter_model" -->
-        <Texture Name="object_kaizoku_obj_Tex_000300" OutName="tex_000300" Format="rgba16" Width="32" Height="64" Offset="0x300" />
-        <DList Name="gPirateLiftPlatformDL" Offset="0x1680" />
-        <Collision Name="gPirateLiftPlatformCol" Offset="0x19B0" />
-        <Texture Name="object_kaizoku_obj_Tex_0019E0" OutName="tex_0019E0" Format="rgba16" Width="64" Height="32" Offset="0x19E0" />
-        <Texture Name="object_kaizoku_obj_Tex_0029E0" OutName="tex_0029E0" Format="rgba16" Width="16" Height="32" Offset="0x29E0" />
-        <Texture Name="object_kaizoku_obj_Tex_002DE0" OutName="tex_002DE0" Format="rgba16" Width="16" Height="16" Offset="0x2DE0" />
-        <DList Name="gPirateBarredShutterDL" Offset="0x32A0" /> <!-- Original name is "Y2_AMIdoor_model" -->
-        <Collision Name="gPirateBarredShutterCol" Offset="0x35B0" /> <!-- Original name is "Y2_AMIdoor_bgdatainfo" -->
-        <Texture Name="object_kaizoku_obj_Tex_0035E0" OutName="tex_0035E0" Format="rgba16" Width="32" Height="64" Offset="0x35E0" />
-        <Texture Name="object_kaizoku_obj_Tex_0045E0" OutName="tex_0045E0" Format="rgba16" Width="32" Height="32" Offset="0x45E0" />
-        <Texture Name="object_kaizoku_obj_Tex_004DE0" OutName="tex_004DE0" Format="rgba16" Width="32" Height="16" Offset="0x4DE0" />
-        <DList Name="gPirateGratedShutterDL" Offset="0x5720" /> <!-- Original name is "Y2_AMIshutter_model" -->
-        <Collision Name="gPirateGratedShutterCol" Offset="0x5EC8" /> <!-- Original name is "Y2_AMIshutter_bgdatainfo" -->
-        <Texture Name="object_kaizoku_obj_TLUT_005F00" OutName="tlut_005F00" Format="rgba16" Width="4" Height="4" Offset="0x5F00" />
-        <Texture Name="object_kaizoku_obj_Tex_005F20" OutName="tex_005F20" Format="ci4" Width="64" Height="64" Offset="0x5F20" />
-        <DList Name="object_kaizoku_obj_DL_007630" Offset="0x7630" /> <!-- Original name is "Y2_boat_model" -->
-        <Texture Name="object_kaizoku_obj_TLUT_0083C8" OutName="tlut_0083C8" Format="rgba16" Width="16" Height="16" Offset="0x83C8" />
-        <Texture Name="object_kaizoku_obj_TLUT_0085C8" OutName="tlut_0085C8" Format="rgba16" Width="4" Height="4" Offset="0x85C8" />
-        <Texture Name="object_kaizoku_obj_TLUT_0085E8" OutName="tlut_0085E8" Format="rgba16" Width="4" Height="4" Offset="0x85E8" />
-        <Texture Name="object_kaizoku_obj_Tex_008608" OutName="tex_008608" Format="ci8" Width="16" Height="32" Offset="0x8608" />
-        <Texture Name="object_kaizoku_obj_Tex_008808" OutName="tex_008808" Format="ci8" Width="32" Height="16" Offset="0x8808" />
-        <Texture Name="object_kaizoku_obj_Tex_008A08" OutName="tex_008A08" Format="ci8" Width="16" Height="16" Offset="0x8A08" />
-        <Texture Name="object_kaizoku_obj_Tex_008B08" OutName="tex_008B08" Format="ci4" Width="32" Height="32" Offset="0x8B08" />
-        <Texture Name="object_kaizoku_obj_Tex_008D08" OutName="tex_008D08" Format="ci8" Width="32" Height="32" Offset="0x8D08" />
-        <Texture Name="object_kaizoku_obj_Tex_009108" OutName="tex_009108" Format="ci8" Width="32" Height="32" Offset="0x9108" />
-        <Texture Name="object_kaizoku_obj_Tex_009508" OutName="tex_009508" Format="ci4" Width="4" Height="4" Offset="0x9508" />
-        <Collision Name="object_kaizoku_obj_Colheader_009A88" Offset="0x9A88" /> <!-- Original name is "Y2_boat_bgdatainfo" -->
-        <DList Name="gPiratesFortressDoorDL" Offset="0x9F20" /> <!-- Original name is "Y2_KaizokuDoor_model" -->
-        <Texture Name="gPiratesFortressDoorTex" OutName="door" Format="rgba16" Width="16" Height="64" Offset="0xA210" />
-        <Texture Name="object_kaizoku_obj_Tex_00AA10" OutName="tex_00AA10" Format="i4" Width="32" Height="32" Offset="0xAA10" />
-        <DList Name="object_kaizoku_obj_DL_00AD50" Offset="0xAD50" /> <!-- Original name is "Y2_kibako_model" -->
-        <Texture Name="object_kaizoku_obj_TLUT_00AF38" OutName="tlut_00AF38" Format="rgba16" Width="4" Height="4" Offset="0xAF38" />
-        <Texture Name="object_kaizoku_obj_TLUT_00AF58" OutName="tlut_00AF58" Format="rgba16" Width="4" Height="4" Offset="0xAF58" />
-        <Texture Name="object_kaizoku_obj_Tex_00AF78" OutName="tex_00AF78" Format="ci4" Width="32" Height="64" Offset="0xAF78" />
-        <Texture Name="object_kaizoku_obj_Tex_00B378" OutName="tex_00B378" Format="ci4" Width="32" Height="64" Offset="0xB378" />
-        <Collision Name="object_kaizoku_obj_Colheader_00B868" Offset="0xB868" /> <!-- Original name is "Y2_kibako_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kamejima.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kamejima.xml
deleted file mode 100644
index 272a541be..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kamejima.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<Root>
-    <!-- Assest for the giant turtle and wave he creates -->
-    <File Name="object_kamejima" Segment="6">
-        <!-- Turtle Wave -->
-        <Array Name="gTurtleWaveVtx" Count="20" Offset="0x0">
-            <Vtx/>
-        </Array>
-        <DList Name="gTurtleWaveDL" Offset="0x140" /> <!-- Original name is "efc_wave_model" -->
-        <Texture Name="gTurtleWaveUnusedTex" OutName="turtle_wave_unused" Format="i8" Width="32" Height="64" Offset="0x2D8" />
-        <Texture Name="gTurtleWaveTex" OutName="turtle_wave" Format="i8" Width="64" Height="64" Offset="0xAD8" />
-        <TextureAnimation Name="gTurtleWaveTexAnim" Offset="0x1AF0" />
-
-
-        <!-- Turtle -->
-        <Collision Name="gTurtleZoraCapeAsleepCol" Offset="0x2328" /> <!-- Original name is "kam_all_bgdatainfo" -->
-        <TextureAnimation Name="gTurtleEmptyTexAnim" Offset="0x2360"/>
-        <Collision Name="gTurtleZoraCapeAwakeCol" Offset="0x2470" /> <!-- Original name is "kam_kamebgbox_bgdatainfo" -->
-        <Collision Name="gTurtleUnusedCol" Offset="0x2E04" /> <!-- Original name might be "kam_kamebg_bgdatainfo"? MM3D has this, but the collision vertices do not match at all. -->
-        
-        <Animation Name="gTurtleGlitchy1Anim" Offset="0x3980" /> <!-- Original name is "kam_laugh" -->
-        <Animation Name="gTurtleCoughAnim" Offset="0x47B8" /> <!-- Original name is "kam_laughlong" -->
-        <Animation Name="gTurtleIdleAnim" Offset="0x48B0" /> <!-- Original name is "kam_mezame" -->
-
-        <DList Name="gTurtleAsleepDL" Offset="0x4E70" /> <!-- When asleep, the turtle looks like a giant rock. Original name is "kam_sima_3_model" -->
-
-        <Texture Name="gTurtleAsleepTLUT" OutName="turtle_asleep_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5248" />
-        <Texture Name="gTurtleAsleepGrassTex" OutName="turtle_asleep_grass" Format="ci8" Width="32" Height="32" Offset="0x5448" />
-        <Texture Name="gTurtleAsleepGrassDirtTex" OutName="turtle_asleep_grass_dirt" Format="ci8" Width="64" Height="32" Offset="0x5848" />
-
-        <Animation Name="gTurtleSwimAnim" Offset="0x6980" /> <!-- Original name is "kam_swim" -->
-
-        <DList Name="gTurtleShellDL" Offset="0x8760" />
-        <DList Name="gTurtleFrontLeftUpperFlipperDL" Offset="0x8E18" />
-        <DList Name="gTurtleFrontLeftLowerFlipperDL" Offset="0x90E8" />
-        <DList Name="gTurtleFrontLeftEndFlipperDL" Offset="0x9278" />
-        <DList Name="gTurtleFrontRightUpperFlipperDL" Offset="0x93E8" />
-        <DList Name="gTurtleFrontRightLowerFlipperDL" Offset="0x96B8" />
-        <DList Name="gTurtleFrontRightEndFlipperDL" Offset="0x9848" />
-        <DList Name="gTurtleBackRightFlipperDL" Offset="0x99B8" />
-        <DList Name="gTurtleBackLeftFlipperDL" Offset="0x9C38" />
-        <DList Name="gTurtleTailDL" Offset="0x9E38" />
-        <DList Name="gTurtleNeckDL" Offset="0x9F18" />
-        <DList Name="gTurtleHeadDL" Offset="0xA118" />
-        <DList Name="gTurtleUpperMouthDL" Offset="0xA4B8" />
-        <DList Name="gTurtleLowerMouthDL" Offset="0xA7C8" />
-
-        <Texture Name="gTurtleSkinTLUT" OutName="turtle_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAAD8" />
-        <Texture Name="gTurtleTLUT" OutName="turtle_tlut" Format="rgba16" Width="16" Height="16" Offset="0xACD8" />
-        <Texture Name="gTurtleNostrilTex" OutName="turtle_nostril" Format="ci8" Width="32" Height="32" Offset="0xAED8" />
-        <Texture Name="gTurtleInsideUpperMouthTex" OutName="turtle_inside_upper_mouth" Format="ci8" Width="16" Height="16" Offset="0xB2D8" />
-        <Texture Name="gTurtleInsideLowerMouthTex" OutName="turtle_inside_lower_mouth" Format="ci8" Width="16" Height="32" Offset="0xB3D8"/>
-        <Texture Name="gTurtleSpottedSkinTex" OutName="turtle_spotted_skin" Format="ci8" Width="64" Height="32" Offset="0xB5D8"/>
-        <Texture Name="gTurtleSkinTex" OutName="turtle_skin" Format="ci8" Width="16" Height="16" Offset="0xBDD8" />
-        <Texture Name="gTurtleEyeOpenStraightTex" OutName="turtle_eye_open_straight" Format="ci8" Width="32" Height="32" Offset="0xBED8" TlutOffset="0xAAD8"/>
-        <Texture Name="gTurtleEyeHalfStraightTex" OutName="turtle_eye_half_straight" Format="ci8" Width="32" Height="32" Offset="0xC2D8" TlutOffset="0xAAD8"/>
-        <Texture Name="gTurtleEyeClosedTex" OutName="turtle_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xC6D8" TlutOffset="0xAAD8"/>
-        <Texture Name="gTurtleEyeHalfLeftTex" OutName="turtle_eye_half_left" Format="ci8" Width="32" Height="32" Offset="0xCAD8" TlutOffset="0xAAD8"/>
-        <Texture Name="gTurtleEyeOpenRightTex" OutName="turtle_eye_half_right" Format="ci8" Width="32" Height="32" Offset="0xCED8" TlutOffset="0xAAD8"/>
-        <Texture Name="gTurtleEyeOpenLeftTex" OutName="turtle_eye_half_left_2" Format="ci8" Width="32" Height="32" Offset="0xD2D8" TlutOffset="0xAAD8"/>
-
-        <Texture Name="gTurtleHeadTex" OutName="turtle_head" Format="ci8" Width="16" Height="16" Offset="0xD6D8"/>
-        <Texture Name="gTurtleShellGrassTex" OutName="turtle_shell_grass" Format="ci8" Width="32" Height="64" Offset="0xD7D8" />
-        <Texture Name="gTurtleShellScutesTex" OutName="turtle_shell_scutes" Format="ci8" Width="32" Height="32" Offset="0xDFD8"/>
-        <Texture Name="gTurtleShellBottomTex" OutName="turtle_shell_bottom" Format="ci8" Width="16" Height="32" Offset="0xE3D8"/>
-
-        <Limb Name="gTurtleRootLimb" Type="Standard" EnumName="TURTLE_LIMB_ROOT" Offset="0xE5D8" />
-        <Limb Name="gTurtleShellLimb" Type="Standard" EnumName="TURTLE_LIMB_SHELL" Offset="0xE5E4" />
-        <Limb Name="gTurtleNeckHeadRootLimb" Type="Standard" EnumName="TURTLE_LIMB_NECK_HEAD_ROOT" Offset="0xE5F0" />
-        <Limb Name="gTurtleNeckLimb" Type="Standard" EnumName="TURTLE_LIMB_NECK" Offset="0xE5FC" />
-        <Limb Name="gTurtleHeadLimb" Type="Standard" EnumName="TURTLE_LIMB_HEAD" Offset="0xE608" />
-        <Limb Name="gTurtleUpperMouthLimb" Type="Standard" EnumName="TURTLE_LIMB_UPPER_MOUTH" Offset="0xE614" />
-        <Limb Name="gTurtleLowerMouthRootLimb" Type="Standard" EnumName="TURTLE_LIMB_LOWER_MOUTH_ROOT" Offset="0xE620" />
-        <Limb Name="gTurtleLowerMouthLimb" Type="Standard" EnumName="TURTLE_LIMB_LOWER_MOUTH" Offset="0xE62C" />
-        <Limb Name="gTurtleBackLeftFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_LEFT_FLIPPER_ROOT" Offset="0xE638" />
-        <Limb Name="gTurtleBackLeftFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_LEFT_FLIPPER" Offset="0xE644" />
-        <Limb Name="gTurtleBackRightFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_RIGHT_FLIPPER_ROOT" Offset="0xE650" />
-        <Limb Name="gTurtleBackRightFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_RIGHT_FLIPPER" Offset="0xE65C" />
-        <Limb Name="gTurtleTailRootLimb" Type="Standard" EnumName="TURTLE_TAIL_ROOT_LIMB" Offset="0xE668" />
-        <Limb Name="gTurtleTailLimb" Type="Standard" EnumName="TURTLE_TAIL_LIMB" Offset="0xE674" />
-        <Limb Name="gTurtleTailEndRootLimb" Type="Standard" EnumName="TURTLE_TAIL_END_ROOT_LIMB" Offset="0xE680" />
-        <Limb Name="gTurtleFrontLeftFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_FLIPPER_ROOT" Offset="0xE68C" />
-        <Limb Name="gTurtleFrontLeftUpperFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_UPPER_FLIPPER" Offset="0xE698" />
-        <Limb Name="gTurtleFrontLeftLowerFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_LOWER_FLIPPER" Offset="0xE6A4" />
-        <Limb Name="gTurtleFrontLeftEndFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_END_FLIPPER" Offset="0xE6B0" />
-        <Limb Name="gTurtleFrontRightFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_FLIPPER_ROOT" Offset="0xE6BC" />
-        <Limb Name="gTurtleFrontRightUpperFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_UPPER_FLIPPER" Offset="0xE6C8" />
-        <Limb Name="gTurtleFrontRightLowerFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_LOWER_FLIPPER" Offset="0xE6D4" />
-        <Limb Name="gTurtleFrontRightEndFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_END_FLIPPER" Offset="0xE6E0" />
-        <Skeleton Name="gTurtleSkel" Type="Flex" LimbType="Standard" LimbNone="TURTLE_LIMB_NONE" LimbMax="TURTLE_LIMB_MAX" EnumName="TurtleLimb" Offset="0xE748" />
-
-        <Animation Name="gTurtleGlitchy2Anim" Offset="0xEF98" /> <!-- Original name is "kam_talk" -->
-        <Animation Name="gTurtleSpeak1Anim" Offset="0x100CC" /> <!-- Original name is "kam_talklong" -->
-        <Animation Name="gTurtleGlitchyRaiseHeadAnim" Offset="0x10918" /> <!-- Original name is "kam_unazuku" -->
-        <Animation Name="gTurtleSpeak2Anim" Offset="0x119D4" /> <!-- Original name is "kam_unazukulong" -->
-        <Animation Name="gTurtleFloatAnim" Offset="0x12260" /> <!-- Original name is "kam_wait" -->
-        <Animation Name="gTurtleGlitchyLookAroundAnim" Offset="0x13264" /> <!-- Original name is "kam_yawn" -->
-        <Animation Name="gTurtleYawnAnim" Offset="0x14E8C" /> <!-- Original name is "kam_yawnlong" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kanban.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kanban.xml
deleted file mode 100644
index e5baa90ee..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kanban.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Assets for cuttable signs -->
-    <File Name="object_kanban" Segment="6">
-        <DList Name="gSignMaterialDL" Offset="0xC30" />
-        <DList Name="gSignUpperSideLeftModelDL" Offset="0xCB0" /> <!-- Original name is "kanban_L_top_R_model" -->
-        <DList Name="gSignLeftSideUpperModelDL" Offset="0xDB8" /> <!-- Original name is "kanban_L_top_L_model" -->
-        <DList Name="gSignLeftSideLowerModelDL" Offset="0xE78" /> <!-- Original name is "kanban_L_bottom_L_model" -->
-        <DList Name="gSignRightSideUpperModelDL" Offset="0xF38" /> <!-- Original name is "kanban_R_top_R_model" -->
-        <DList Name="gSignRightSideLowerModelDL" Offset="0xFF8" /> <!-- Original name is "kanban_R_bottom_R_model" -->
-        <DList Name="gSignLowerSideLeftModelDL" Offset="0x10B8" /> <!-- Original name is "kanban_L_bottom_R_model" -->
-        <DList Name="gSignUpperSideRightModelDL" Offset="0x11C0" /> <!-- Original name is "kanban_R_top_L_model" -->
-        <DList Name="gSignLowerSideRightModelDL" Offset="0x12C8" /> <!-- Original name is "kanban_R_bottom_L_model" -->
-        <DList Name="gSignPostUpperModelDL" Offset="0x13D0" /> <!-- Original name is "kanban_bo_top_model" -->
-        <DList Name="gSignPostLowerModelDL" Offset="0x1488" /> <!-- Original name is "kanban_bo_center_model" -->
-        <DList Name="gSignPostStandModelDL" Offset="0x1540" /> <!-- Original name is "kanban_bo_bottom_model" -->
-        <DList Name="gSignParticleDL" Offset="0x1630" /> <!-- Original name is "kanban_eff_modelT" -->
-        <Texture Name="gSignParticleTex" OutName="sign_particle" Format="i8" Width="16" Height="16" Offset="0x16B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kbt.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kbt.xml
deleted file mode 100644
index bf6078da8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kbt.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Root>
-    <File Name="object_kbt" Segment="6">
-        <Animation Name="object_kbt_Anim_000670" Offset="0x670" /> <!-- Original name is "kbt_neru" -->
-        <Animation Name="object_kbt_Anim_000FE8" Offset="0xFE8" /> <!-- Original name is "kbt_nerutalk" -->
-        <Animation Name="object_kbt_Anim_001674" Offset="0x1674" /> <!-- Original name is "kbt_niramitalk" -->
-        <Animation Name="object_kbt_Anim_001940" Offset="0x1940" /> <!-- Original name is "kbt_niramu" -->
-        <Animation Name="object_kbt_Anim_001BF4" Offset="0x1BF4" /> <!-- Original name is "kbt_niramu02" -->
-        <Animation Name="object_kbt_Anim_002084" Offset="0x2084" /> <!-- Original name is "kbt_okiru" -->
-        <Animation Name="object_kbt_Anim_002710" Offset="0x2710" /> <!-- Original name is "kbt_talk01" -->
-        <Animation Name="object_kbt_Anim_002DE0" Offset="0x2DE0" /> <!-- Original name is "kbt_talk02" -->
-        <Animation Name="object_kbt_Anim_003414" Offset="0x3414" /> <!-- Original name is "kbt_talk03" -->
-        <Animation Name="object_kbt_Anim_003D24" Offset="0x3D24" /> <!-- Original name is "kbt_talk04" -->
-        <Animation Name="object_kbt_Anim_004274" Offset="0x4274" /> <!-- Original name is "kbt_testwait" -->
-        <DList Name="object_kbt_DL_007550" Offset="0x7550" />
-        <DList Name="object_kbt_DL_0076F8" Offset="0x76F8" />
-        <DList Name="object_kbt_DL_0077E0" Offset="0x77E0" />
-        <DList Name="object_kbt_DL_007940" Offset="0x7940" />
-        <DList Name="object_kbt_DL_007AE8" Offset="0x7AE8" />
-        <DList Name="object_kbt_DL_007C68" Offset="0x7C68" />
-        <DList Name="object_kbt_DL_007D50" Offset="0x7D50" />
-        <DList Name="object_kbt_DL_007E38" Offset="0x7E38" />
-        <DList Name="object_kbt_DL_008150" Offset="0x8150" />
-        <DList Name="object_kbt_DL_008738" Offset="0x8738" />
-        <DList Name="object_kbt_DL_008810" Offset="0x8810" />
-        <DList Name="object_kbt_DL_0088E8" Offset="0x88E8" />
-        <DList Name="object_kbt_DL_008A60" Offset="0x8A60" />
-        <DList Name="object_kbt_DL_008C48" Offset="0x8C48" />
-        <DList Name="object_kbt_DL_008D20" Offset="0x8D20" />
-        <DList Name="object_kbt_DL_008E98" Offset="0x8E98" />
-        <Texture Name="object_kbt_TLUT_009078" OutName="tlut_009078" Format="rgba16" Width="16" Height="16" Offset="0x9078" />
-        <Texture Name="object_kbt_Tex_009278" OutName="tex_009278" Format="i8" Width="16" Height="16" Offset="0x9278" />
-        <Texture Name="object_kbt_Tex_009378" OutName="tex_009378" Format="ci8" Width="16" Height="16" Offset="0x9378" />
-        <Texture Name="object_kbt_Tex_009478" OutName="tex_009478" Format="rgba16" Width="16" Height="16" Offset="0x9478" />
-        <Texture Name="object_kbt_Tex_009678" OutName="tex_009678" Format="rgba16" Width="32" Height="32" Offset="0x9678" />
-        <Texture Name="object_kbt_Tex_009E78" OutName="tex_009E78" Format="ci8" Width="8" Height="8" Offset="0x9E78" />
-        <Texture Name="object_kbt_Tex_009EB8" OutName="tex_009EB8" Format="ci8" Width="8" Height="8" Offset="0x9EB8" />
-        <Texture Name="object_kbt_Tex_009EF8" OutName="tex_009EF8" Format="rgba16" Width="8" Height="8" Offset="0x9EF8" />
-        <Texture Name="object_kbt_Tex_009F78" OutName="tex_009F78" Format="ci8" Width="16" Height="16" Offset="0x9F78" />
-        <Texture Name="object_kbt_Tex_00A078" OutName="tex_00A078" Format="rgba16" Width="8" Height="8" Offset="0xA078" />
-        <Texture Name="object_kbt_Tex_00A0F8" OutName="tex_00A0F8" Format="ci8" Width="16" Height="16" Offset="0xA0F8" />
-        <Texture Name="object_kbt_Tex_00A1F8" OutName="tex_00A1F8" Format="ci8" Width="16" Height="16" Offset="0xA1F8" />
-        <Texture Name="object_kbt_Tex_00A2F8" OutName="tex_00A2F8" Format="ci8" Width="8" Height="8" Offset="0xA2F8" />
-        <Texture Name="object_kbt_Tex_00A338" OutName="tex_00A338" Format="rgba16" Width="8" Height="8" Offset="0xA338" />
-        <Texture Name="object_kbt_Tex_00A3B8" OutName="tex_00A3B8" Format="ci8" Width="16" Height="32" Offset="0xA3B8" />
-        <Texture Name="object_kbt_Tex_00A5B8" OutName="tex_00A5B8" Format="rgba16" Width="32" Height="32" Offset="0xA5B8" />
-        <Texture Name="object_kbt_Tex_00ADB8" OutName="tex_00ADB8" Format="rgba16" Width="32" Height="32" Offset="0xADB8" />
-        <Texture Name="object_kbt_Tex_00B5B8" OutName="tex_00B5B8" Format="rgba16" Width="32" Height="32" Offset="0xB5B8" />
-        <Texture Name="object_kbt_Tex_00BDB8" OutName="tex_00BDB8" Format="rgba16" Width="32" Height="32" Offset="0xBDB8" />
-        <Texture Name="object_kbt_Tex_00C5B8" OutName="tex_00C5B8" Format="rgba16" Width="32" Height="32" Offset="0xC5B8" />
-        <Texture Name="object_kbt_Tex_00CDB8" OutName="tex_00CDB8" Format="rgba16" Width="32" Height="32" Offset="0xCDB8" />
-        <Texture Name="object_kbt_Tex_00D5B8" OutName="tex_00D5B8" Format="rgba16" Width="32" Height="32" Offset="0xD5B8" />
-        <Limb Name="object_kbt_Standardlimb_00DDB8" Type="Standard" EnumName="OBJECT_KBT_LIMB_01" Offset="0xDDB8" />
-        <Limb Name="object_kbt_Standardlimb_00DDC4" Type="Standard" EnumName="OBJECT_KBT_LIMB_02" Offset="0xDDC4" />
-        <Limb Name="object_kbt_Standardlimb_00DDD0" Type="Standard" EnumName="OBJECT_KBT_LIMB_03" Offset="0xDDD0" />
-        <Limb Name="object_kbt_Standardlimb_00DDDC" Type="Standard" EnumName="OBJECT_KBT_LIMB_04" Offset="0xDDDC" />
-        <Limb Name="object_kbt_Standardlimb_00DDE8" Type="Standard" EnumName="OBJECT_KBT_LIMB_05" Offset="0xDDE8" />
-        <Limb Name="object_kbt_Standardlimb_00DDF4" Type="Standard" EnumName="OBJECT_KBT_LIMB_06" Offset="0xDDF4" />
-        <Limb Name="object_kbt_Standardlimb_00DE00" Type="Standard" EnumName="OBJECT_KBT_LIMB_07" Offset="0xDE00" />
-        <Limb Name="object_kbt_Standardlimb_00DE0C" Type="Standard" EnumName="OBJECT_KBT_LIMB_08" Offset="0xDE0C" />
-        <Limb Name="object_kbt_Standardlimb_00DE18" Type="Standard" EnumName="OBJECT_KBT_LIMB_09" Offset="0xDE18" />
-        <Limb Name="object_kbt_Standardlimb_00DE24" Type="Standard" EnumName="OBJECT_KBT_LIMB_0A" Offset="0xDE24" />
-        <Limb Name="object_kbt_Standardlimb_00DE30" Type="Standard" EnumName="OBJECT_KBT_LIMB_0B" Offset="0xDE30" />
-        <Limb Name="object_kbt_Standardlimb_00DE3C" Type="Standard" EnumName="OBJECT_KBT_LIMB_0C" Offset="0xDE3C" />
-        <Limb Name="object_kbt_Standardlimb_00DE48" Type="Standard" EnumName="OBJECT_KBT_LIMB_0D" Offset="0xDE48" />
-        <Limb Name="object_kbt_Standardlimb_00DE54" Type="Standard" EnumName="OBJECT_KBT_LIMB_0E" Offset="0xDE54" />
-        <Limb Name="object_kbt_Standardlimb_00DE60" Type="Standard" EnumName="OBJECT_KBT_LIMB_0F" Offset="0xDE60" />
-        <Limb Name="object_kbt_Standardlimb_00DE6C" Type="Standard" EnumName="OBJECT_KBT_LIMB_10" Offset="0xDE6C" />
-        <Limb Name="object_kbt_Standardlimb_00DE78" Type="Standard" EnumName="OBJECT_KBT_LIMB_11" Offset="0xDE78" />
-        <Limb Name="object_kbt_Standardlimb_00DE84" Type="Standard" EnumName="OBJECT_KBT_LIMB_12" Offset="0xDE84" />
-        <Limb Name="object_kbt_Standardlimb_00DE90" Type="Standard" EnumName="OBJECT_KBT_LIMB_13" Offset="0xDE90" />
-        <Skeleton Name="object_kbt_Skel_00DEE8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KBT_LIMB_NONE" LimbMax="OBJECT_KBT_LIMB_MAX" EnumName="ObjectKbtLimb" Offset="0xDEE8" />
-        <Animation Name="object_kbt_Anim_00E7BC" Offset="0xE7BC" /> <!-- Original name is "kbt_wait01" -->
-        <Animation Name="object_kbt_Anim_00F0C8" Offset="0xF0C8" /> <!-- Original name is "kbt_wait02" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_keikoku_demo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_keikoku_demo.xml
deleted file mode 100644
index b9433a48f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_keikoku_demo.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Trees and the ground of the Lost woods (DmOpstage actor) -->
-    <!-- (DmRavine) uses it as an object, but does not draw or use any of its assets as far as I can tell -->
-    <File Name="object_keikoku_demo" Segment="6">
-        <!-- the following textures have duplicates in Z2_LOSTWOODS scene:  -->
-        <!--   gKeikokuDemoYellowFlowersOnGrassTex, gKeikokuDemoFallLeavesOnGrassTex, unused: gKeikokuDemoWrinkledBarkTex -->
-
-        <!-- DmOpstage draws both an empty XLU and non-empty OPA at the same time, each version has its own empty DL instead of reusing. -->
-        <DList Name="gKeikokuDemoFloorEmptyDL" Offset="0x970" />
-        <DList Name="gKeikokuDemoFloorDL" Offset="0x978" /> <!-- Original name is "daichi_model" -->
-
-        <!-- DmOpstage type DMOPSTAGE_TYPE_GROUND textures -->
-        <Texture Name="gKeikokuDemoYellowFlowersOnGrassTex" OutName="yellow_flowers_on_grass" Format="rgba16" Width="32" Height="32" Offset="0xC50" />
-        <Texture Name="gKeikokuDemoFallLeavesOnGrassTex" OutName="fall_leaves_on_grass" Format="rgba16" Width="32" Height="32" Offset="0x1450" />
-
-        <!-- DmOpstage type DMOPSTAGE_TYPE_GROUND Dyna Collider -->
-        <Collision Name="gKeikokuDemoFloorCol" Offset="0x1C98" /> <!-- Original name is "daichi_bgdatainfo" -->
-
-        <DList Name="gKeikokuDemoTallTreeWithRootBaseEmptyDL" Offset="0x2870" />
-        <DList Name="gKeikokuDemoTallTreeWithRootBaseDL" Offset="0x2878" /> <!-- Original name is "lost_woods_wood1_model" -->
-        <DList Name="gKeikokuDemoTallTreeCutEmptyDL" Offset="0x3060" />
-        <DList Name="gKeikokuDemoTallTreeCutDL" Offset="0x3068" /> <!-- Original name is "lost_woods_wood2_model" -->
-        <DList Name="gKeikokuDemoTallTreeStraightEmptyDL" Offset="0x3720" />
-        <DList Name="gKeikokuDemoTallTreeStraightDL" Offset="0x3728" /> <!-- Original name is "lost_woods_wood3_model" -->
-        <Texture Name="gKeikokuDemoTreeLeavesTex" OutName="tree_leaves" Format="ia16" Width="32" Height="32" Offset="0x3930" />
-        <Texture Name="gKeikokuDemoTreeCutEndGrainTex" OutName="cut_end_grain" Format="rgba16" Width="32" Height="32" Offset="0x4130" />
-
-        <!-- From this point on, all assets are unused. -->
-        
-        <!-- Side texture of raised bed of clover, clover on top of stems seen from side. -->
-        <Texture Name="gKeikokuDemoCloverEdgeTex" OutName="clover_edge" Format="rgba16" Width="64" Height="16" Offset="0x4930" />
-        <!-- Top texture of bed of clover (like the kind of raised grass that hide gold skultula). -->
-        <Texture Name="gKeikokuDemoCloverTopTex" OutName="clover_top" Format="rgba16" Width="32" Height="32" Offset="0x5130" />
-        <!-- Darker brown wrinkly bark with moss on I think, low resolution so not sure.  -->
-        <Texture Name="gKeikokuDemoDarkMossyBarkTex" OutName="dark_mossy_bark" Format="rgba16" Width="32" Height="32" Offset="0x5930" />
-        <Texture Name="gKeikokuDemoDarkGreenMossTex" OutName="dark_moss" Format="rgba16" Width="16" Height="16" Offset="0x6130" />
-        <!-- Bright tan wrinkly bark with moss on I think, low resolution so not sure. -->
-        <Texture Name="gKeikokuDemoBrightMossyBarkTex" OutName="bright_mossy_bark" Format="rgba16" Width="32" Height="32" Offset="0x6330" />
-        <!-- This dirt wall looks similar to OoT:Kokiri forest wall, but brighter sand color.  -->
-        <Texture Name="gKeikokuDemoDirtWallTex" OutName="dirt_wall" Format="rgba16" Width="32" Height="64" Offset="0x6B30" />
-        <!-- Does NOT look like the wall of trees from Lostwoods. -->
-        <Texture Name="gKeikokuDemoTreeWallBackdropTex" OutName="tree_wall_backdrop" Format="i4" Width="64" Height="64" Offset="0x7B30" />
-
-        <Texture Name="gKeikokuDemoHangingMossTex" OutName="hanging_moss" Format="rgba16" Width="32" Height="32" Offset="0x8330" />
-        <Texture Name="gKeikokuDemoStumpRingsDarkTex" OutName="stump_rings_dark" Format="rgba16" Width="32" Height="32" Offset="0x8B30" />
-
-        <!-- Might be mistyped, looks like pink rings to match the following stump rings texture, but pink. -->
-        <Texture Name="gKeikokuDemoStumpRingsPinkTex" OutName="stump_rings_pink" Format="rgba16" Width="16" Height="32" Offset="0x9330" />
-        <!-- Looks like a duplicate of gKeikokuDemoTreeCutEndGrainTex, but rotated clockwise 90deg. -->
-        <Texture Name="gKeikokuDemoTreeCutEndGrain2Tex" OutName="stump_rings" Format="rgba16" Width="32" Height="32" Offset="0x9730" />
-
-        <!-- Duplicates of used textures: -->
-        <Texture Name="gKeikokuDemoYellowFlowersOnGrass2Tex" OutName="yellow_flowers_on_grass2" Format="rgba16" Width="32" Height="32" Offset="0x9F30" />
-        <Texture Name="gKeikokuDemoFallLeavesOnGrass2Tex" OutName="fall_leaves_on_grass2" Format="rgba16" Width="32" Height="32" Offset="0xA730" />
-
-        <Texture Name="gKeikokuDemoYoungerBarkTex" OutName="younger_bark" Format="rgba16" Width="16" Height="64" Offset="0xAF30" />
-        <Texture Name="gKeikokuDemoWrinkledBarkTex" OutName="wrinkled_bark" Format="i4" Width="64" Height="64" Offset="0xB730" />
-        <!-- Could be moss, could be leaves, could be dying grass, hard to tell. -->
-        <Texture Name="gKeikokuDemoGreenSludgeTex" OutName="green_sludge" Format="rgba16" Width="32" Height="32" Offset="0xBF30" />
-        <!-- This might be something else, nothing else looked any more accurate. -->
-        <Texture Name="gKeikokuDemoWhiteYellowArtifactTex" OutName="white_yellow_artifact" Format="rgba16" Width="16" Height="32" Offset="0xC730" />
-        <!-- Seems to be a dimmer version of the bright yellow on grass texture. -->
-        <Texture Name="gKeikokuDemoDullYellowFlowersOnGrassTex" OutName="dull_yellow_flowers_on_grass" Format="rgba16" Width="32" Height="32" Offset="0xCB30" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_keikoku_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_keikoku_obj.xml
deleted file mode 100644
index b6d61e91f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_keikoku_obj.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Root>
-    <File Name="object_keikoku_obj" Segment="6">
-        <DList Name="object_keikoku_obj_DL_000100" Offset="0x100" />
-        <TextureAnimation Name="object_keikoku_obj_Matanimheader_0001F8" Offset="0x1F8" />
-        <DList Name="object_keikoku_obj_DL_000300" Offset="0x300" />
-        <TextureAnimation Name="object_keikoku_obj_Matanimheader_0003F8" Offset="0x3F8" />
-        <DList Name="object_keikoku_obj_DL_000500" Offset="0x500" />
-        <TextureAnimation Name="object_keikoku_obj_Matanimheader_0005F8" Offset="0x5F8" />
-        <Texture Name="object_keikoku_obj_Tex_000600" OutName="tex_000600" Format="i4" Width="64" Height="64" Offset="0x600" />
-        <Texture Name="object_keikoku_obj_Tex_000E00" OutName="tex_000E00" Format="i4" Width="64" Height="64" Offset="0xE00" />
-        <DList Name="object_keikoku_obj_DL_001640" Offset="0x1640" /> <!-- Original name is "g2T_model" -->
-        <Texture Name="object_keikoku_obj_Tex_001780" OutName="tex_001780" Format="ia4" Width="32" Height="128" Offset="0x1780" />
-        <Texture Name="object_keikoku_obj_Tex_001F80" OutName="tex_001F80" Format="ia4" Width="16" Height="64" Offset="0x1F80" />
-        <Texture Name="object_keikoku_obj_Tex_002180" OutName="tex_002180" Format="ia8" Width="8" Height="32" Offset="0x2180" />
-        <Collision Name="object_keikoku_obj_Colheader_002300" Offset="0x2300" /> <!-- Original name is "z2_00_saku01_bgdatainfo" -->
-        <DList Name="object_keikoku_obj_DL_0027D0" Offset="0x27D0" />
-        <DList Name="object_keikoku_obj_DL_0027D8" Offset="0x27D8" /> <!-- Original name is "z2_00_yama01_model" -->
-        <Texture Name="object_keikoku_obj_Tex_002A78" OutName="tex_002A78" Format="rgba16" Width="16" Height="64" Offset="0x2A78" />
-        <Texture Name="object_keikoku_obj_Tex_003278" OutName="tex_003278" Format="rgba16" Width="32" Height="32" Offset="0x3278" />
-        <Texture Name="object_keikoku_obj_Tex_003A78" OutName="tex_003A78" Format="i4" Width="64" Height="64" Offset="0x3A78" />
-        <TextureAnimation Name="object_keikoku_obj_Matanimheader_004290" Offset="0x4290" />
-        <DList Name="object_keikoku_obj_DL_0044A0" Offset="0x44A0" />
-        <DList Name="object_keikoku_obj_DL_0044A8" Offset="0x44A8" /> <!-- Original name is "z2_00_yama02_model" -->
-        <Texture Name="object_keikoku_obj_Tex_004618" OutName="tex_004618" Format="rgba16" Width="16" Height="32" Offset="0x4618" />
-        <Texture Name="object_keikoku_obj_Tex_004A18" OutName="tex_004A18" Format="rgba16" Width="32" Height="32" Offset="0x4A18" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kepn_koya.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kepn_koya.xml
deleted file mode 100644
index cc14f0556..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kepn_koya.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="object_kepn_koya" Segment="6">
-        <DList Name="object_kepn_koya_DL_003470" Offset="0x3470" /> <!-- Original name is "w2_kepn_koya_modelT" -->
-        <DList Name="object_kepn_koya_DL_003478" Offset="0x3478" /> <!-- Original name is "w2_kepn_koya_model" -->
-        <Texture Name="object_kepn_koya_TLUT_005118" OutName="tlut_005118" Format="rgba16" Width="16" Height="16" Offset="0x5118" />
-        <Texture Name="object_kepn_koya_Tex_005318" OutName="tex_005318" Format="ci8" Width="16" Height="16" Offset="0x5318" />
-        <Texture Name="object_kepn_koya_Tex_005418" OutName="tex_005418" Format="ci8" Width="64" Height="32" Offset="0x5418" />
-        <Texture Name="object_kepn_koya_Tex_005C18" OutName="tex_005C18" Format="ci8" Width="32" Height="64" Offset="0x5C18" />
-        <Texture Name="object_kepn_koya_Tex_006418" OutName="tex_006418" Format="ci8" Width="16" Height="32" Offset="0x6418" />
-        <Texture Name="object_kepn_koya_Tex_006618" OutName="tex_006618" Format="ci8" Width="16" Height="32" Offset="0x6618" />
-        <Texture Name="object_kepn_koya_Tex_006818" OutName="tex_006818" Format="ci8" Width="32" Height="16" Offset="0x6818" />
-        <Texture Name="object_kepn_koya_Tex_006A18" OutName="tex_006A18" Format="ci8" Width="64" Height="16" Offset="0x6A18" />
-        <Texture Name="object_kepn_koya_Tex_006E18" OutName="tex_006E18" Format="ci8" Width="32" Height="32" Offset="0x6E18" />
-        <Texture Name="object_kepn_koya_Tex_007218" OutName="tex_007218" Format="rgba16" Width="8" Height="8" Offset="0x7218" />
-        <Texture Name="object_kepn_koya_Tex_007298" OutName="tex_007298" Format="ci8" Width="8" Height="8" Offset="0x7298" />
-        <Collision Name="object_kepn_koya_Colheader_00805C" Offset="0x805C" /> <!-- Original name is "w2_kepn_koya_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kgy.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kgy.xml
deleted file mode 100644
index b83234b8c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kgy.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<Root>
-    <File Name="object_kgy" Segment="6">
-        <Animation Name="object_kgy_Anim_0008FC" Offset="0x8FC" /> <!-- Original name is "kgy_abareru" -->
-        <Animation Name="object_kgy_Anim_001764" Offset="0x1764" /> <!-- Original name is "kgy_katsugu" -->
-        <Animation Name="object_kgy_Anim_001EA4" Offset="0x1EA4" /> <!-- Original name is "kgy_muki" -->
-        <Animation Name="object_kgy_Anim_00292C" Offset="0x292C" /> <!-- Original name is "kgy_mukiwait" -->
-        <Animation Name="object_kgy_Anim_003334" Offset="0x3334" /> <!-- Original name is "kgy_tataku" -->
-        <Animation Name="object_kgy_Anim_003D88" Offset="0x3D88" /> <!-- Original name is "kgy_tataku02" -->
-        <Animation Name="object_kgy_Anim_0042E4" Offset="0x42E4" /> <!-- Original name is "kgy_utsumuki" -->
-        <Animation Name="object_kgy_Anim_004B98" Offset="0x4B98" /> <!-- Original name is "kgy_wait01" -->
-        <DList Name="object_kgy_DL_009C80" Offset="0x9C80" />
-        <DList Name="object_kgy_DL_009DA0" Offset="0x9DA0" />
-        <DList Name="object_kgy_DL_009F28" Offset="0x9F28" />
-        <DList Name="object_kgy_DL_00A0A0" Offset="0xA0A0" />
-        <DList Name="object_kgy_DL_00A1C0" Offset="0xA1C0" />
-        <DList Name="object_kgy_DL_00A300" Offset="0xA300" />
-        <DList Name="object_kgy_DL_00A490" Offset="0xA490" />
-        <DList Name="object_kgy_DL_00A618" Offset="0xA618" />
-        <DList Name="object_kgy_DL_00A790" Offset="0xA790" />
-        <DList Name="object_kgy_DL_00A998" Offset="0xA998" />
-        <DList Name="object_kgy_DL_00AD60" Offset="0xAD60" />
-        <DList Name="object_kgy_DL_00B028" Offset="0xB028" />
-        <DList Name="object_kgy_DL_00B130" Offset="0xB130" />
-        <DList Name="object_kgy_DL_00B280" Offset="0xB280" />
-        <DList Name="object_kgy_DL_00B3C8" Offset="0xB3C8" />
-        <DList Name="object_kgy_DL_00B678" Offset="0xB678" />
-        <DList Name="object_kgy_DL_00B7B8" Offset="0xB7B8" />
-        <DList Name="object_kgy_DL_00B978" Offset="0xB978" />
-        <Texture Name="object_kgy_TLUT_00BC28" OutName="tlut_00BC28" Format="rgba16" Width="16" Height="16" Offset="0xBC28" />
-        <Texture Name="object_kgy_Tex_00BE28" OutName="tex_00BE28" Format="rgba16" Width="32" Height="32" Offset="0xBE28" />
-        <Texture Name="object_kgy_Tex_00C628" OutName="tex_00C628" Format="ci8" Width="16" Height="16" Offset="0xC628" />
-        <Texture Name="object_kgy_Tex_00C728" OutName="tex_00C728" Format="ci8" Width="16" Height="16" Offset="0xC728" />
-        <Texture Name="object_kgy_Tex_00C828" OutName="tex_00C828" Format="ci8" Width="32" Height="32" Offset="0xC828" />
-        <Texture Name="object_kgy_Tex_00CC28" OutName="tex_00CC28" Format="ci8" Width="32" Height="32" Offset="0xCC28" />
-        <Texture Name="object_kgy_Tex_00D028" OutName="tex_00D028" Format="rgba16" Width="32" Height="32" Offset="0xD028" />
-        <Texture Name="object_kgy_Tex_00D828" OutName="tex_00D828" Format="ci8" Width="16" Height="16" Offset="0xD828" />
-        <Texture Name="object_kgy_Tex_00D928" OutName="tex_00D928" Format="rgba16" Width="32" Height="32" Offset="0xD928" />
-        <Texture Name="object_kgy_Tex_00E128" OutName="tex_00E128" Format="ci8" Width="16" Height="16" Offset="0xE128" />
-        <Texture Name="object_kgy_Tex_00E228" OutName="tex_00E228" Format="i8" Width="32" Height="32" Offset="0xE228" />
-        <Texture Name="object_kgy_Tex_00E628" OutName="tex_00E628" Format="ci8" Width="16" Height="16" Offset="0xE628" />
-        <DList Name="object_kgy_DL_00E8E8" Offset="0xE8E8" />
-        <DList Name="object_kgy_DL_00E8F0" Offset="0xE8F0" /> <!-- Original name is "swordA_model" -->
-        <TextureAnimation Name="object_kgy_Matanimheader_00EE58" Offset="0xEE58" />
-        <DList Name="object_kgy_DL_00F178" Offset="0xF178" />
-        <DList Name="object_kgy_DL_00F180" Offset="0xF180" /> <!-- Original name is "swordB_model" -->
-        <TextureAnimation Name="object_kgy_Matanimheader_00F6A0" Offset="0xF6A0" />
-        <Texture Name="object_kgy_Tex_00F6B0" OutName="tex_00F6B0" Format="i8" Width="16" Height="16" Offset="0xF6B0" />
-        <Limb Name="object_kgy_Standardlimb_00F7B0" Type="Standard" EnumName="OBJECT_KGY_LIMB_01" Offset="0xF7B0" />
-        <Limb Name="object_kgy_Standardlimb_00F7BC" Type="Standard" EnumName="OBJECT_KGY_LIMB_02" Offset="0xF7BC" />
-        <Limb Name="object_kgy_Standardlimb_00F7C8" Type="Standard" EnumName="OBJECT_KGY_LIMB_03" Offset="0xF7C8" />
-        <Limb Name="object_kgy_Standardlimb_00F7D4" Type="Standard" EnumName="OBJECT_KGY_LIMB_04" Offset="0xF7D4" />
-        <Limb Name="object_kgy_Standardlimb_00F7E0" Type="Standard" EnumName="OBJECT_KGY_LIMB_05" Offset="0xF7E0" />
-        <Limb Name="object_kgy_Standardlimb_00F7EC" Type="Standard" EnumName="OBJECT_KGY_LIMB_06" Offset="0xF7EC" />
-        <Limb Name="object_kgy_Standardlimb_00F7F8" Type="Standard" EnumName="OBJECT_KGY_LIMB_07" Offset="0xF7F8" />
-        <Limb Name="object_kgy_Standardlimb_00F804" Type="Standard" EnumName="OBJECT_KGY_LIMB_08" Offset="0xF804" />
-        <Limb Name="object_kgy_Standardlimb_00F810" Type="Standard" EnumName="OBJECT_KGY_LIMB_09" Offset="0xF810" />
-        <Limb Name="object_kgy_Standardlimb_00F81C" Type="Standard" EnumName="OBJECT_KGY_LIMB_0A" Offset="0xF81C" />
-        <Limb Name="object_kgy_Standardlimb_00F828" Type="Standard" EnumName="OBJECT_KGY_LIMB_0B" Offset="0xF828" />
-        <Limb Name="object_kgy_Standardlimb_00F834" Type="Standard" EnumName="OBJECT_KGY_LIMB_0C" Offset="0xF834" />
-        <Limb Name="object_kgy_Standardlimb_00F840" Type="Standard" EnumName="OBJECT_KGY_LIMB_0D" Offset="0xF840" />
-        <Limb Name="object_kgy_Standardlimb_00F84C" Type="Standard" EnumName="OBJECT_KGY_LIMB_0E" Offset="0xF84C" />
-        <Limb Name="object_kgy_Standardlimb_00F858" Type="Standard" EnumName="OBJECT_KGY_LIMB_0F" Offset="0xF858" />
-        <Limb Name="object_kgy_Standardlimb_00F864" Type="Standard" EnumName="OBJECT_KGY_LIMB_10" Offset="0xF864" />
-        <Limb Name="object_kgy_Standardlimb_00F870" Type="Standard" EnumName="OBJECT_KGY_LIMB_11" Offset="0xF870" />
-        <Limb Name="object_kgy_Standardlimb_00F87C" Type="Standard" EnumName="OBJECT_KGY_LIMB_12" Offset="0xF87C" />
-        <Limb Name="object_kgy_Standardlimb_00F888" Type="Standard" EnumName="OBJECT_KGY_LIMB_13" Offset="0xF888" />
-        <Limb Name="object_kgy_Standardlimb_00F894" Type="Standard" EnumName="OBJECT_KGY_LIMB_14" Offset="0xF894" />
-        <Limb Name="object_kgy_Standardlimb_00F8A0" Type="Standard" EnumName="OBJECT_KGY_LIMB_15" Offset="0xF8A0" />
-        <Limb Name="object_kgy_Standardlimb_00F8AC" Type="Standard" EnumName="OBJECT_KGY_LIMB_16" Offset="0xF8AC" />
-        <Skeleton Name="object_kgy_Skel_00F910" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KGY_LIMB_NONE" LimbMax="OBJECT_KGY_LIMB_MAX" EnumName="ObjectKgyLimb" Offset="0xF910" />
-        <Animation Name="object_kgy_Anim_0101F0" Offset="0x101F0" /> <!-- Original name is "kgy_wait02" -->
-        <Animation Name="object_kgy_Anim_010B84" Offset="0x10B84" /> <!-- Original name is "kgy_yorokobu" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kibako.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kibako.xml
deleted file mode 100644
index 2cdd6ce36..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kibako.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Object for small wooden crate -->
-    <File Name="object_kibako" Segment="6">
-        <Texture Name="gSmallCrateTex" OutName="small_crate" Format="rgba16" Width="32" Height="64" Offset="0x0" />
-        <DList Name="gSmallCrateDL" Offset="0x1180" /> <!-- Original name is "field_kibako_model" -->
-        <Texture Name="gSmallCrateFragmentTex" OutName="small_crate_fragment" Format="rgba16" Width="64" Height="16" Offset="0x1240" />
-        <DList Name="gSmallCrateFragmentDL" Offset="0x1A70" /> <!-- Original name is "field_kibako_hahen_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kibako2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kibako2.xml
deleted file mode 100644
index 180038e82..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kibako2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Object for large wooden crate -->
-    <File Name="object_kibako2" Segment="6">
-        <Texture Name="gLargeCrateTLUT" OutName="large_crate_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gLargeCrateTopTex" OutName="large_crate_top" Format="ci4" Width="32" Height="64" Offset="0x20" />
-        <Texture Name="gLargeCrateSidesTex" OutName="large_crate_sides" Format="ci4" Width="32" Height="64" Offset="0x420" />
-        <DList Name="gLargeCrateDL" Offset="0x960" /> <!-- Original name is "CIkibako_model" -->
-        <Collision Name="gLargeCrateCol" Offset="0xB70" /> <!-- Original name is "CIkibako_bgdatainfo" -->
-        <Texture Name="gLargeCrateFragmentTLUT" OutName="large_crate_fragment_tlut" Format="rgba16" Width="4" Height="4" Offset="0xBA0" />
-        <Texture Name="gLargeCrateFragmentTex" OutName="large_crate_fragment" Format="ci4" Width="32" Height="64" Offset="0xBC0" />
-        <DList Name="gLargeCrateFragment1DL" Offset="0x1040" /> <!-- Original name is "CIkibako_hahen_model" -->
-        <DList Name="gLargeCrateFragment2DL" Offset="0x1100" /> <!-- Original name is "CIkibako_hahen2_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kin2_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kin2_obj.xml
deleted file mode 100644
index 6e63f19cd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kin2_obj.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Root>
-    <!-- 
-        Assets for Ocean Spider House's bombable wall, Skullkid's painting, fireplace grate on the path to the Heart
-        Piece, bookshelves and chests of drawers.
-    -->
-    <File Name="object_kin2_obj" Segment="6">
-        <DList Name="gOceanSpiderHouseEmpty1DL" Offset="0x120" /> <!-- Not present in MM3D, but it was probably named "m2_KIN_BOMBhahen_modelT" based on the rest of this object. -->
-        <DList Name="gOceanSpiderHouseBombableWallDebrisDL" Offset="0x128" /> <!-- Original name is "m2_KIN_BOMBhahen_model" -->
-
-        <DList Name="gOceanSpiderHouseBombableWallCrackDL" Offset="0x2C0" /> <!-- Not present in MM3D, but it was probably named "m2_KIN_BOMBwall_modelT" based on the rest of this object. -->
-        <DList Name="gOceanSpiderHouseBombableWallDL" Offset="0x360" /> <!-- Original name is "m2_KIN_BOMBwall_model" -->
-        <Collision Name="gOceanSpiderHouseBombableWallCol" Offset="0x490" /> <!-- Original name is "m2_KIN_BOMBwall_bgdatainfo" -->
-
-        <DList Name="gOceanSpiderHouseEmpty2DL" Offset="0x650" /> <!-- Original name is "m2_KIN_GAKU_modelT" -->
-        <DList Name="gOceanSpiderHouseSkullkidPaintingDL" Offset="0x658" /> <!-- Original name is "m2_KIN_GAKU_model" -->
-        <Collision Name="gOceanSpiderHouseSkullkidPaintingCol" Offset="0x798" /> <!-- Original name is "m2_KIN_GAKU_bgdatainfo" -->
-
-        <DList Name="gOceanSpiderHouseEmpty3DL" Offset="0x820" /> <!-- Original name is "m2_KIN_SAKU_modelT" -->
-        <DList Name="gOceanSpiderHouseFireplaceGrateDL" Offset="0x828" /> <!-- Original name is "m2_KIN_SAKU_model" -->
-        <Collision Name="gOceanSpiderHouseFireplaceGrateCol" Offset="0x908" /> <!-- Original name is "m2_KIN_SAKU_bgdatainfo" -->
-        
-        <DList Name="gOceanSpiderHouseEmpty4DL" Offset="0xCA0" /> <!-- Original name is "m2_KIN_TANAbig_modelT" -->
-        <DList Name="gOceanSpiderHouseBookshelfDL" Offset="0xCA8" /> <!-- Original name is "m2_KIN_TANAbig_model"-->
-        <Collision Name="gOceanSpiderHouseBookshelfCol" Offset="0xF80" /> <!-- Original name is "m2_KIN_TANAbig_bgdatainfo" -->
-        
-        <DList Name="gOceanSpiderHouseEmpty5DL" Offset="0x10F0" /> <!-- Original name is "m2_KIN_TANAsmall_modelT" -->
-        <DList Name="gOceanSpiderHouseChestOfDrawersDL" Offset="0x10F8" /> <!-- Original name is "m2_KIN_TANAsmall_model" -->
-        <Collision Name="gOceanSpiderHouseChestOfDrawersCol" Offset="0x1328" /> <!-- Original name is "m2_KIN_TANAsmall_bgdatainfo" -->
-        
-        <Texture Name="gOceanSpiderHouseUnused1TLUT" OutName="ocean_spider_house_unused_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x1360" />
-        <Texture Name="gOceanSpiderHouseTLUT" OutName="ocean_spider_house_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1380" />
-        <Texture Name="gOceanSpiderHouseUnused2TLUT" OutName="ocean_spider_house_unused_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x13A0" />
-        
-        <Texture Name="gOceanSpiderHouseBombableWallCrackTex" OutName="ocean_spider_house_bombable_wall_crack" Format="ia8" Width="64" Height="64" Offset="0x13C0" />
-        <Texture Name="gOceanSpiderHouseBookshelfWoodTex" OutName="ocean_spider_house_bookshelf_wood" Format="rgba16" Width="32" Height="32" Offset="0x23C0" />
-        <Texture Name="gOceanSpiderHouseFireplaceGrateTex" OutName="ocean_spider_house_fireplace_grate" Format="rgba16" Width="32" Height="32" Offset="0x2BC0" />
-        <Texture Name="gOceanSpiderHouseSkullkidPaintingTex" OutName="ocean_spider_house_skullkid_painting" Format="ci4" Width="64" Height="64" Offset="0x33C0" />
-        
-        <Texture Name="gOceanSpiderHouseChestOfDrawersFrontTex" OutName="ocean_spider_house_chest_of_drawers_front" Format="rgba16" Width="32" Height="64" Offset="0x3BC0" />
-        <Texture Name="gOceanSpiderHouseChestOfDrawersBackTex" OutName="ocean_spider_house_chest_of_drawers_back" Format="rgba16" Width="32" Height="64" Offset="0x4BC0" />
-        <Texture Name="gOceanSpiderHouseChestOfDrawersTopTex" OutName="ocean_spider_house_chest_of_drawers_top" Format="rgba16" Width="32" Height="32" Offset="0x5BC0" />
-        
-        <Texture Name="gOceanSpiderHouseBookshelfBooksTex" OutName="ocean_spider_house_bookshelf_books" Format="rgba16" Width="32" Height="64" Offset="0x63C0" />
-        
-        <Texture Name="gOceanSpiderHouseBombableWallDebrisTex1" OutName="ocean_spider_house_debris_1" Format="rgba16" Width="32" Height="32" Offset="0x73C0" />
-        <Texture Name="gOceanSpiderHouseBombableWallDebrisTex2" OutName="ocean_spider_house_debris_2" Format="i4" Width="64" Height="64" Offset="0x7BC0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kinsta1_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kinsta1_obj.xml
deleted file mode 100644
index d2a55b04d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kinsta1_obj.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Swamp Spider House Sliding Door -->
-    <File Name="object_kinsta1_obj" Segment="6">
-        <DList Name="gSwampSpiderHouseSlidingDoorEmptyDL" Offset="0x190" /> <!-- Original name is "m2_KIN1_shutter_modelT" -->
-        <DList Name="gSwampSpiderHouseSlidingDoorDL" Offset="0x198" /> <!-- Original name is "m2_KIN1_shutter_model" -->
-        <Texture Name="gSwampSpiderHouseSlidingDoorTex" OutName="swamp_spider_house_sliding_door" Format="rgba16" Width="32" Height="64" Offset="0x2F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kinsta2_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kinsta2_obj.xml
deleted file mode 100644
index 66bec962d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kinsta2_obj.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Object for Oceanside Spider House Door -->
-    <File Name="object_kinsta2_obj" Segment="6">
-        <DList Name="gOceansideSpiderHouseDoorDL" Offset="0x310" /> <!-- Original name is "m2_Kin2DOOR_model" -->
-        <Texture Name="gOceansideSpiderHouseDoorTex" OutName="oceanside_spider_house_door" Format="rgba16" Width="32" Height="64" Offset="0x4E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kitan.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kitan.xml
deleted file mode 100644
index cd7db0005..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kitan.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Root>
-    <File Name="object_kitan" Segment="6">
-        <Animation Name="object_kitan_Anim_000CE8" Offset="0xCE8" /> <!-- Original name is "kt_hohoho" -->
-        <Animation Name="object_kitan_Anim_00190C" Offset="0x190C" /> <!-- Original name is "kt_laugh" -->
-        <Animation Name="object_kitan_Anim_002770" Offset="0x2770" /> <!-- Original name is "kt_wait" -->
-        <DList Name="object_kitan_DL_004C40" Offset="0x4C40" />
-        <DList Name="object_kitan_DL_004DF0" Offset="0x4DF0" />
-        <DList Name="object_kitan_DL_005160" Offset="0x5160" />
-        <DList Name="object_kitan_DL_005628" Offset="0x5628" />
-        <DList Name="object_kitan_DL_005928" Offset="0x5928" />
-        <DList Name="object_kitan_DL_005B48" Offset="0x5B48" />
-        <DList Name="object_kitan_DL_005E48" Offset="0x5E48" />
-        <DList Name="object_kitan_DL_006068" Offset="0x6068" />
-        <DList Name="object_kitan_DL_0063E8" Offset="0x63E8" />
-        <DList Name="object_kitan_DL_0065E0" Offset="0x65E0" />
-        <DList Name="object_kitan_DL_0066A8" Offset="0x66A8" />
-        <DList Name="object_kitan_DL_006810" Offset="0x6810" />
-        <DList Name="object_kitan_DL_006990" Offset="0x6990" />
-        <DList Name="object_kitan_DL_006A58" Offset="0x6A58" />
-        <DList Name="object_kitan_DL_006BC0" Offset="0x6BC0" />
-        <DList Name="object_kitan_DL_006D40" Offset="0x6D40" />
-        <DList Name="object_kitan_DL_006E08" Offset="0x6E08" />
-        <DList Name="object_kitan_DL_006F70" Offset="0x6F70" />
-        <DList Name="object_kitan_DL_0070F0" Offset="0x70F0" />
-        <DList Name="object_kitan_DL_007470" Offset="0x7470" />
-        <Texture Name="object_kitan_TLUT_007668" OutName="tlut_007668" Format="rgba16" Width="16" Height="16" Offset="0x7668" />
-        <Texture Name="object_kitan_Tex_007868" OutName="tex_007868" Format="ci8" Width="32" Height="16" Offset="0x7868" />
-        <Texture Name="object_kitan_Tex_007A68" OutName="tex_007A68" Format="ci8" Width="16" Height="16" Offset="0x7A68" />
-        <Texture Name="object_kitan_Tex_007B68" OutName="tex_007B68" Format="ci8" Width="16" Height="16" Offset="0x7B68" />
-        <Texture Name="object_kitan_Tex_007C68" OutName="tex_007C68" Format="ci8" Width="16" Height="16" Offset="0x7C68" />
-        <Texture Name="object_kitan_Tex_007D68" OutName="tex_007D68" Format="ci8" Width="16" Height="16" Offset="0x7D68" />
-        <Limb Name="object_kitan_Standardlimb_007E68" Type="Standard" EnumName="OBJECT_KITAN_LIMB_01" Offset="0x7E68" />
-        <Limb Name="object_kitan_Standardlimb_007E74" Type="Standard" EnumName="OBJECT_KITAN_LIMB_02" Offset="0x7E74" />
-        <Limb Name="object_kitan_Standardlimb_007E80" Type="Standard" EnumName="OBJECT_KITAN_LIMB_03" Offset="0x7E80" />
-        <Limb Name="object_kitan_Standardlimb_007E8C" Type="Standard" EnumName="OBJECT_KITAN_LIMB_04" Offset="0x7E8C" />
-        <Limb Name="object_kitan_Standardlimb_007E98" Type="Standard" EnumName="OBJECT_KITAN_LIMB_05" Offset="0x7E98" />
-        <Limb Name="object_kitan_Standardlimb_007EA4" Type="Standard" EnumName="OBJECT_KITAN_LIMB_06" Offset="0x7EA4" />
-        <Limb Name="object_kitan_Standardlimb_007EB0" Type="Standard" EnumName="OBJECT_KITAN_LIMB_07" Offset="0x7EB0" />
-        <Limb Name="object_kitan_Standardlimb_007EBC" Type="Standard" EnumName="OBJECT_KITAN_LIMB_08" Offset="0x7EBC" />
-        <Limb Name="object_kitan_Standardlimb_007EC8" Type="Standard" EnumName="OBJECT_KITAN_LIMB_09" Offset="0x7EC8" />
-        <Limb Name="object_kitan_Standardlimb_007ED4" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0A" Offset="0x7ED4" />
-        <Limb Name="object_kitan_Standardlimb_007EE0" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0B" Offset="0x7EE0" />
-        <Limb Name="object_kitan_Standardlimb_007EEC" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0C" Offset="0x7EEC" />
-        <Limb Name="object_kitan_Standardlimb_007EF8" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0D" Offset="0x7EF8" />
-        <Limb Name="object_kitan_Standardlimb_007F04" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0E" Offset="0x7F04" />
-        <Limb Name="object_kitan_Standardlimb_007F10" Type="Standard" EnumName="OBJECT_KITAN_LIMB_0F" Offset="0x7F10" />
-        <Limb Name="object_kitan_Standardlimb_007F1C" Type="Standard" EnumName="OBJECT_KITAN_LIMB_10" Offset="0x7F1C" />
-        <Limb Name="object_kitan_Standardlimb_007F28" Type="Standard" EnumName="OBJECT_KITAN_LIMB_11" Offset="0x7F28" />
-        <Limb Name="object_kitan_Standardlimb_007F34" Type="Standard" EnumName="OBJECT_KITAN_LIMB_12" Offset="0x7F34" />
-        <Limb Name="object_kitan_Standardlimb_007F40" Type="Standard" EnumName="OBJECT_KITAN_LIMB_13" Offset="0x7F40" />
-        <Limb Name="object_kitan_Standardlimb_007F4C" Type="Standard" EnumName="OBJECT_KITAN_LIMB_14" Offset="0x7F4C" />
-        <Skeleton Name="object_kitan_Skel_007FA8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KITAN_LIMB_NONE" LimbMax="OBJECT_KITAN_LIMB_MAX" EnumName="ObjectKitanLimb" Offset="0x7FA8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_knight.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_knight.xml
deleted file mode 100644
index 2a8595627..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_knight.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<Root>
-    <!--
-        Assets for Igos du Ikana and his aides.
-        A note about the original animation names; in MM3D, they split them up into two into two nearly-identical but
-        incompatible sets of animations. For example, there is an animation named "nsk_king_front_damage" for the king,
-        and an animation named "nsk_zako_front_damage" for the aides. In the original game, the animations are used
-        for *both* the king and his aides, so for the animation names, I just removed "king" or "zako" from the name
-        under the assumption that Grezzo were probably the ones who added the qualifier to the names.
-    -->
-    <File Name="object_knight" Segment="6">
-        <Animation Name="object_knight_Anim_0005A8" Offset="0x5A8" /> <!-- Original name is probably "nsk_aramaD" -->
-        <Animation Name="object_knight_Anim_0009E0" Offset="0x9E0" /> <!-- Original name is probably "nsk_araraD" -->
-        <Animation Name="object_knight_Anim_000D9C" Offset="0xD9C" /> <!-- Original name is probably "nsk_back_damage" -->
-        <Animation Name="object_knight_Anim_001CDC" Offset="0x1CDC" /> <!-- Original name is probably "nsk_back_down" -->
-        <Animation Name="object_knight_Anim_002174" Offset="0x2174" /> <!-- Original name is probably "nsk_back_jump" -->
-        <Animation Name="object_knight_Anim_003008" Offset="0x3008" /> <!-- Original name is probably "nsk_bunri" -->
-        <Animation Name="object_knight_Anim_0031F0" Offset="0x31F0" /> <!-- Original name is probably "nsk_defend" -->
-        <Animation Name="object_knight_Anim_003650" Offset="0x3650" /> <!-- Original name is probably "nsk_fighting_run" -->
-        <Animation Name="object_knight_Anim_0040E0" Offset="0x40E0" /> <!-- Original name is probably "nsk_fighting_wait" -->
-        <Animation Name="object_knight_Anim_004620" Offset="0x4620" /> <!-- Original name is probably "nsk_fighting_walk" -->
-        <Animation Name="object_knight_Anim_004974" Offset="0x4974" /> <!-- Original name is probably "nsk_front_damage" -->
-        <Animation Name="object_knight_Anim_005D30" Offset="0x5D30" /> <!-- Original name is probably "nsk_front_down" -->
-        <Animation Name="object_knight_Anim_005E78" Offset="0x5E78" /> <!-- Original name is probably "nsk_furufuruD" -->
-        <Animation Name="object_knight_Anim_006754" Offset="0x6754" /> <!-- Original name is probably "nsk_gabaBD" -->
-        <Animation Name="object_knight_Anim_006EF8" Offset="0x6EF8" /> <!-- Original name is probably "nsk_gabaD" -->
-        <Animation Name="object_knight_Anim_0079D4" Offset="0x79D4" /> <!-- Original name is probably "nsk_gattai" -->
-        <Animation Name="object_knight_Anim_008390" Offset="0x8390" /> <!-- Original name is probably "nsk_goD" -->
-        <Animation Name="object_knight_Anim_008524" Offset="0x8524" /> <!-- Original name is probably "nsk_guardA" -->
-        <Animation Name="object_knight_Anim_0089E4" Offset="0x89E4" /> <!-- Original name is probably "nsk_guardB" -->
-        <Animation Name="object_knight_Anim_008D80" Offset="0x8D80" /> <!-- Original name is probably "nsk_haiteru" -->
-        <Animation Name="object_knight_Anim_009538" Offset="0x9538" /> <!-- Original name is probably "nsk_haku" -->
-        <Animation Name="object_knight_Anim_009D8C" Offset="0x9D8C" /> <!-- Original name is probably "nsk_jakinD" -->
-        <Animation Name="object_knight_Anim_00A530" Offset="0xA530" /> <!-- Original name is probably "nsk_jakinTOsekiD" -->
-        <Animation Name="object_knight_Anim_00A88C" Offset="0xA88C" /> <!-- Original name is probably "nsk_jidandaD" -->
-        <Animation Name="object_knight_Anim_00AB68" Offset="0xAB68" /> <!-- Original name is probably "nsk_jump" -->
-        <Animation Name="object_knight_Anim_00AFAC" Offset="0xAFAC" /> <!-- Original name is probably "nsk_jump_kiru" -->
-        <Animation Name="object_knight_Anim_00B5D4" Offset="0xB5D4" /> <!-- Original name is probably "nsk_jump_kiru_end" -->
-        <Animation Name="object_knight_Anim_00BCF4" Offset="0xBCF4" /> <!-- Original name is probably "nsk_koteL" -->
-        <Animation Name="object_knight_Anim_00C384" Offset="0xC384" /> <!-- Original name is probably "nsk_koteR" -->
-        <Animation Name="object_knight_Anim_00C7F0" Offset="0xC7F0" /> <!-- Original name is probably "nsk_kunekuneaD" -->
-        <Animation Name="object_knight_Anim_00CDE0" Offset="0xCDE0" /> <!-- Original name is probably "nsk_laugh" -->
-        <Animation Name="object_knight_Anim_00D870" Offset="0xD870" /> <!-- Original name is probably "nsk_laughD" -->
-        <Animation Name="object_knight_Anim_00DDCC" Offset="0xDDCC" /> <!-- Original name is probably "nsk_march" -->
-        <Animation Name="object_knight_Anim_00E15C" Offset="0xE15C" /> <!-- Original name is probably "nsk_modoru" -->
-        <Animation Name="object_knight_Anim_00E45C" Offset="0xE45C" /> <!-- Original name is probably "nsk_muzumuzuwalk" -->
-        <Animation Name="object_knight_Anim_00E7F4" Offset="0xE7F4" /> <!-- Original name is probably "nsk_nunuBD" -->
-        <Animation Name="object_knight_Anim_00EA90" Offset="0xEA90" /> <!-- Original name is probably "nsk_nunuD" -->
-        <Animation Name="object_knight_Anim_00EF44" Offset="0xEF44" /> <!-- Original name is probably "nsk_side_walk" -->
-        <Animation Name="object_knight_Anim_00F90C" Offset="0xF90C" /> <!-- Original name is probably "nsk_sonicgiri" -->
-        <Animation Name="object_knight_Anim_00FC78" Offset="0xFC78" /> <!-- Original name is probably "nsk_suwariwaitD" -->
-        <Animation Name="object_knight_Anim_01024C" Offset="0x1024C" /> <!-- Original name is probably "nsk_suwaru02D" -->
-        <Animation Name="object_knight_Anim_010E98" Offset="0x10E98" /> <!-- Original name is probably "nsk_suwaruD" -->
-        <Animation Name="object_knight_Anim_011298" Offset="0x11298" /> <!-- Original name is probably "nsk_tategiri" -->
-        <Animation Name="object_knight_Anim_011AAC" Offset="0x11AAC" /> <!-- Original name is probably "nsk_tategiri_kaburu" -->
-        <DList Name="object_knight_DL_012400" Offset="0x12400" />
-        <Texture Name="object_knight_Tex_012760" OutName="tex_012760" Format="rgba16" Width="16" Height="16" Offset="0x12760" />
-        <Texture Name="object_knight_Tex_012960" OutName="tex_012960" Format="rgba16" Width="16" Height="16" Offset="0x12960" />
-        <Texture Name="object_knight_Tex_012B60" OutName="tex_012B60" Format="rgba16" Width="8" Height="8" Offset="0x12B60" />
-        <Texture Name="object_knight_Tex_012BE0" OutName="tex_012BE0" Format="ia16" Width="8" Height="8" Offset="0x12BE0" />
-        <DList Name="object_knight_DL_012DB0" Offset="0x12DB0" />
-        <Texture Name="object_knight_Tex_012EC0" OutName="tex_012EC0" Format="rgba16" Width="8" Height="16" Offset="0x12EC0" />
-        <Texture Name="object_knight_Tex_012FC0" OutName="tex_012FC0" Format="rgba16" Width="4" Height="4" Offset="0x12FC0" />
-        <DList Name="object_knight_DL_013020" Offset="0x13020" />
-        <DList Name="object_knight_DL_0153E0" Offset="0x153E0" />
-        <DList Name="object_knight_DL_0154B0" Offset="0x154B0" />
-        <DList Name="object_knight_DL_0155A0" Offset="0x155A0" />
-        <DList Name="object_knight_DL_015660" Offset="0x15660" />
-        <DList Name="object_knight_DL_015730" Offset="0x15730" />
-        <DList Name="object_knight_DL_015820" Offset="0x15820" />
-        <DList Name="object_knight_DL_0158E0" Offset="0x158E0" />
-        <DList Name="object_knight_DL_015A40" Offset="0x15A40" />
-        <DList Name="object_knight_DL_015AE0" Offset="0x15AE0" />
-        <DList Name="object_knight_DL_015B88" Offset="0x15B88" />
-        <DList Name="object_knight_DL_015D78" Offset="0x15D78" />
-        <DList Name="object_knight_DL_015E38" Offset="0x15E38" />
-        <DList Name="object_knight_DL_015ED8" Offset="0x15ED8" />
-        <DList Name="object_knight_DL_016310" Offset="0x16310" />
-        <DList Name="object_knight_DL_0163C8" Offset="0x163C8" />
-        <DList Name="object_knight_DL_016478" Offset="0x16478" />
-        <DList Name="object_knight_DL_016530" Offset="0x16530" />
-        <DList Name="object_knight_DL_0165F0" Offset="0x165F0" />
-        <DList Name="object_knight_DL_0166D8" Offset="0x166D8" />
-        <DList Name="object_knight_DL_016810" Offset="0x16810" />
-        <DList Name="object_knight_DL_0169C8" Offset="0x169C8" />
-        <DList Name="object_knight_DL_016AD0" Offset="0x16AD0" />
-        <DList Name="object_knight_DL_016B90" Offset="0x16B90" />
-        <DList Name="object_knight_DL_016C78" Offset="0x16C78" />
-        <DList Name="object_knight_DL_016DB0" Offset="0x16DB0" />
-        <DList Name="object_knight_DL_016F70" Offset="0x16F70" />
-        <Texture Name="object_knight_Tex_017078" OutName="tex_017078" Format="rgba16" Width="16" Height="16" Offset="0x17078" />
-        <Texture Name="object_knight_Tex_017278" OutName="tex_017278" Format="rgba16" Width="4" Height="4" Offset="0x17278" />
-        <Texture Name="object_knight_Tex_017298" OutName="tex_017298" Format="rgba16" Width="4" Height="8" Offset="0x17298" />
-        <Texture Name="object_knight_Tex_0172D8" OutName="tex_0172D8" Format="rgba16" Width="8" Height="8" Offset="0x172D8" />
-        <Texture Name="object_knight_Tex_017358" OutName="tex_017358" Format="rgba16" Width="16" Height="16" Offset="0x17358" />
-        <Texture Name="object_knight_Tex_017558" OutName="tex_017558" Format="rgba16" Width="8" Height="8" Offset="0x17558" />
-        <Texture Name="object_knight_Tex_0175D8" OutName="tex_0175D8" Format="rgba16" Width="8" Height="16" Offset="0x175D8" />
-        <Texture Name="object_knight_Tex_0176D8" OutName="tex_0176D8" Format="rgba16" Width="16" Height="16" Offset="0x176D8" />
-        <Texture Name="object_knight_Tex_0178D8" OutName="tex_0178D8" Format="rgba16" Width="16" Height="16" Offset="0x178D8" />
-        <Texture Name="object_knight_Tex_017AD8" OutName="tex_017AD8" Format="rgba16" Width="8" Height="16" Offset="0x17AD8" />
-        <Texture Name="object_knight_Tex_017BD8" OutName="tex_017BD8" Format="rgba16" Width="16" Height="16" Offset="0x17BD8" />
-        <Texture Name="object_knight_Tex_017DD8" OutName="tex_017DD8" Format="rgba16" Width="8" Height="32" Offset="0x17DD8" />
-        <Texture Name="object_knight_Tex_017FD8" OutName="tex_017FD8" Format="ia8" Width="8" Height="8" Offset="0x17FD8" />
-        <Texture Name="object_knight_Tex_018018" OutName="tex_018018" Format="i4" Width="16" Height="16" Offset="0x18018" />
-        <Texture Name="object_knight_Tex_018098" OutName="tex_018098" Format="i8" Width="64" Height="32" Offset="0x18098" />
-        <DList Name="object_knight_DL_0188F8" Offset="0x188F8" />
-        <DList Name="object_knight_DL_0189F0" Offset="0x189F0" />
-        <DList Name="object_knight_DL_018AF0" Offset="0x18AF0" />
-        <TextureAnimation Name="object_knight_Matanimheader_018BC4" Offset="0x18BC4" />
-        <Array Name="object_knight_Vtx_018BD0" Count="18" Offset="0x18BD0">
-            <Vtx/>
-        </Array>
-        <DList Name="object_knight_DL_018CF0" Offset="0x18CF0" /> <!-- Original name is "w2_hikari_naname_modelT" -->
-        <DList Name="object_knight_DL_018DE0" Offset="0x18DE0" /> <!-- Original name is "w2_hikari_naname2_modelT" -->
-        <DList Name="object_knight_DL_018E50" Offset="0x18E50" />
-        <Texture Name="object_knight_Tex_018E58" OutName="tex_018E58" Format="ia8" Width="16" Height="16" Offset="0x18E58" />
-        <Texture Name="object_knight_Tex_018F58" OutName="tex_018F58" Format="ia16" Width="16" Height="32" Offset="0x18F58" />
-        <TextureAnimation Name="object_knight_Matanimheader_019360" Offset="0x19360" />
-        <DList Name="object_knight_DL_0193A8" Offset="0x193A8" />
-        <DList Name="object_knight_DL_0193B0" Offset="0x193B0" /> <!-- Original name is "w2_ikn_katen_model" -->
-        <Texture Name="object_knight_Tex_019470" OutName="tex_019470" Format="rgba16" Width="4" Height="4" Offset="0x19470" />
-        <Texture Name="object_knight_Tex_019490" OutName="tex_019490" Format="i8" Width="32" Height="64" Offset="0x19490" />
-        <DList Name="object_knight_DL_01D380" Offset="0x1D380" />
-        <DList Name="object_knight_DL_01D4C0" Offset="0x1D4C0" />
-        <DList Name="object_knight_DL_01D650" Offset="0x1D650" />
-        <DList Name="object_knight_DL_01D710" Offset="0x1D710" />
-        <DList Name="object_knight_DL_01D870" Offset="0x1D870" />
-        <DList Name="object_knight_DL_01DA00" Offset="0x1DA00" />
-        <DList Name="object_knight_DL_01DAC0" Offset="0x1DAC0" />
-        <DList Name="object_knight_DL_01DC00" Offset="0x1DC00" />
-        <DList Name="object_knight_DL_01DCA0" Offset="0x1DCA0" />
-        <DList Name="object_knight_DL_01DD48" Offset="0x1DD48" />
-        <DList Name="object_knight_DL_01DF88" Offset="0x1DF88" />
-        <DList Name="object_knight_DL_01E050" Offset="0x1E050" />
-        <DList Name="object_knight_DL_01E0A0" Offset="0x1E0A0" />
-        <DList Name="object_knight_DL_01E878" Offset="0x1E878" />
-        <DList Name="object_knight_DL_01EAA8" Offset="0x1EAA8" />
-        <DList Name="object_knight_DL_01EB40" Offset="0x1EB40" />
-        <DList Name="object_knight_DL_01EBD8" Offset="0x1EBD8" />
-        <DList Name="object_knight_DL_01EC98" Offset="0x1EC98" />
-        <DList Name="object_knight_DL_01EDE0" Offset="0x1EDE0" />
-        <DList Name="object_knight_DL_01EF68" Offset="0x1EF68" />
-        <DList Name="object_knight_DL_01F188" Offset="0x1F188" />
-        <DList Name="object_knight_DL_01F248" Offset="0x1F248" />
-        <DList Name="object_knight_DL_01F308" Offset="0x1F308" />
-        <DList Name="object_knight_DL_01F3C0" Offset="0x1F3C0" />
-        <DList Name="object_knight_DL_01F5C0" Offset="0x1F5C0" />
-        <DList Name="object_knight_DL_01F828" Offset="0x1F828" />
-        <Texture Name="object_knight_Tex_01F8E8" OutName="tex_01F8E8" Format="rgba16" Width="8" Height="16" Offset="0x1F8E8" />
-        <Texture Name="object_knight_Tex_01F9E8" OutName="tex_01F9E8" Format="rgba16" Width="8" Height="16" Offset="0x1F9E8" />
-        <Texture Name="object_knight_Tex_01FAE8" OutName="tex_01FAE8" Format="rgba16" Width="16" Height="8" Offset="0x1FAE8" />
-        <Texture Name="object_knight_Tex_01FBE8" OutName="tex_01FBE8" Format="ia8" Width="16" Height="16" Offset="0x1FBE8" />
-        <Texture Name="object_knight_Tex_01FCE8" OutName="tex_01FCE8" Format="rgba16" Width="8" Height="16" Offset="0x1FCE8" />
-        <Texture Name="object_knight_Tex_01FDE8" OutName="tex_01FDE8" Format="rgba16" Width="16" Height="16" Offset="0x1FDE8" />
-        <Limb Name="object_knight_Standardlimb_01FFE8" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_01" Offset="0x1FFE8" />
-        <Limb Name="object_knight_Standardlimb_01FFF4" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_02" Offset="0x1FFF4" />
-        <Limb Name="object_knight_Standardlimb_020000" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_03" Offset="0x20000" />
-        <Limb Name="object_knight_Standardlimb_02000C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_04" Offset="0x2000C" />
-        <Limb Name="object_knight_Standardlimb_020018" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_05" Offset="0x20018" />
-        <Limb Name="object_knight_Standardlimb_020024" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_06" Offset="0x20024" />
-        <Limb Name="object_knight_Standardlimb_020030" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_07" Offset="0x20030" />
-        <Limb Name="object_knight_Standardlimb_02003C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_08" Offset="0x2003C" />
-        <Limb Name="object_knight_Standardlimb_020048" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_09" Offset="0x20048" />
-        <Limb Name="object_knight_Standardlimb_020054" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0A" Offset="0x20054" />
-        <Limb Name="object_knight_Standardlimb_020060" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0B" Offset="0x20060" />
-        <Limb Name="object_knight_Standardlimb_02006C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0C" Offset="0x2006C" />
-        <Limb Name="object_knight_Standardlimb_020078" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0D" Offset="0x20078" />
-        <Limb Name="object_knight_Standardlimb_020084" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0E" Offset="0x20084" />
-        <Limb Name="object_knight_Standardlimb_020090" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_0F" Offset="0x20090" />
-        <Limb Name="object_knight_Standardlimb_02009C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_10" Offset="0x2009C" />
-        <Limb Name="object_knight_Standardlimb_0200A8" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_11" Offset="0x200A8" />
-        <Limb Name="object_knight_Standardlimb_0200B4" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_12" Offset="0x200B4" />
-        <Limb Name="object_knight_Standardlimb_0200C0" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_13" Offset="0x200C0" />
-        <Limb Name="object_knight_Standardlimb_0200CC" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_14" Offset="0x200CC" />
-        <Limb Name="object_knight_Standardlimb_0200D8" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_15" Offset="0x200D8" />
-        <Limb Name="object_knight_Standardlimb_0200E4" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_16" Offset="0x200E4" />
-        <Limb Name="object_knight_Standardlimb_0200F0" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_17" Offset="0x200F0" />
-        <Limb Name="object_knight_Standardlimb_0200FC" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_18" Offset="0x200FC" />
-        <Limb Name="object_knight_Standardlimb_020108" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_19" Offset="0x20108" />
-        <Limb Name="object_knight_Standardlimb_020114" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_1A" Offset="0x20114" />
-        <Limb Name="object_knight_Standardlimb_020120" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_1B" Offset="0x20120" />
-        <Limb Name="object_knight_Standardlimb_02012C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_1C" Offset="0x2012C" />
-        <Skeleton Name="object_knight_Skel_0201A8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KNIGHT_1_LIMB_NONE" LimbMax="OBJECT_KNIGHT_1_LIMB_MAX" EnumName="ObjectKnight1Limb" Offset="0x201A8" />
-        <Limb Name="object_knight_Standardlimb_0201B4" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_01" Offset="0x201B4" />
-        <Limb Name="object_knight_Standardlimb_0201C0" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_02" Offset="0x201C0" />
-        <Limb Name="object_knight_Standardlimb_0201CC" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_03" Offset="0x201CC" />
-        <Limb Name="object_knight_Standardlimb_0201D8" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_04" Offset="0x201D8" />
-        <Limb Name="object_knight_Standardlimb_0201E4" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_05" Offset="0x201E4" />
-        <Limb Name="object_knight_Standardlimb_0201F0" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_06" Offset="0x201F0" />
-        <Limb Name="object_knight_Standardlimb_0201FC" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_07" Offset="0x201FC" />
-        <Limb Name="object_knight_Standardlimb_020208" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_08" Offset="0x20208" />
-        <Limb Name="object_knight_Standardlimb_020214" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_09" Offset="0x20214" />
-        <Limb Name="object_knight_Standardlimb_020220" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0A" Offset="0x20220" />
-        <Limb Name="object_knight_Standardlimb_02022C" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0B" Offset="0x2022C" />
-        <Limb Name="object_knight_Standardlimb_020238" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0C" Offset="0x20238" />
-        <Limb Name="object_knight_Standardlimb_020244" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0D" Offset="0x20244" />
-        <Limb Name="object_knight_Standardlimb_020250" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0E" Offset="0x20250" />
-        <Limb Name="object_knight_Standardlimb_02025C" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_0F" Offset="0x2025C" />
-        <Limb Name="object_knight_Standardlimb_020268" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_10" Offset="0x20268" />
-        <Limb Name="object_knight_Standardlimb_020274" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_11" Offset="0x20274" />
-        <Limb Name="object_knight_Standardlimb_020280" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_12" Offset="0x20280" />
-        <Limb Name="object_knight_Standardlimb_02028C" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_13" Offset="0x2028C" />
-        <Limb Name="object_knight_Standardlimb_020298" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_14" Offset="0x20298" />
-        <Limb Name="object_knight_Standardlimb_0202A4" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_15" Offset="0x202A4" />
-        <Limb Name="object_knight_Standardlimb_0202B0" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_16" Offset="0x202B0" />
-        <Limb Name="object_knight_Standardlimb_0202BC" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_17" Offset="0x202BC" />
-        <Limb Name="object_knight_Standardlimb_0202C8" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_18" Offset="0x202C8" />
-        <Limb Name="object_knight_Standardlimb_0202D4" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_19" Offset="0x202D4" />
-        <Limb Name="object_knight_Standardlimb_0202E0" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_1A" Offset="0x202E0" />
-        <Limb Name="object_knight_Standardlimb_0202EC" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_1B" Offset="0x202EC" />
-        <Limb Name="object_knight_Standardlimb_0202F8" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_1C" Offset="0x202F8" />
-        <Skeleton Name="object_knight_Skel_020374" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KNIGHT_2_LIMB_NONE" LimbMax="OBJECT_KNIGHT_2_LIMB_MAX" EnumName="ObjectKnight2Limb" Offset="0x20374" />
-        <Animation Name="object_knight_Anim_020950" Offset="0x20950" /> <!-- Original name is probably "nsk_tategiri_tame" -->
-        <Animation Name="object_knight_Anim_02105C" Offset="0x2105C" /> <!-- Original name is probably "nsk_towaitBD" -->
-        <Animation Name="object_knight_Anim_021B10" Offset="0x21B10" /> <!-- Original name is probably "nsk_walkD" -->
-        <Animation Name="object_knight_Anim_021E34" Offset="0x21E34" /> <!-- Original name is probably "nsk_whyD" -->
-        <Animation Name="object_knight_Anim_022728" Offset="0x22728" /> <!-- Original name is probably "nsk_yokogiri" -->
-        <Animation Name="object_knight_Anim_022CAC" Offset="0x22CAC" /> <!-- Original name is probably "nsk_yokogiri_kime" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kujiya.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kujiya.xml
deleted file mode 100644
index f657e8bd8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kujiya.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Root>
-    <!-- Object for Lottery Shop -->
-    <File Name="object_kujiya" Segment="6">
-        <Mtx Name="gLotteryShopMaskPosMtx" Offset="0x2A40" />
-        <DList Name="gLotteryShopCylinderDL" Offset="0x2A80" />
-        <DList Name="gLotteryShopBackSignDL" Offset="0x3030" />
-        <DList Name="gLotteryShopOpenBoxDL" Offset="0x3248" />
-        <DList Name="gLotteryShopScrollingEffectsDL" Offset="0x3358" />
-        <DList Name="gLotteryShopRedRupeesDL" Offset="0x34A8" />
-        <DList Name="gLotteryShopGreenRupeesDL" Offset="0x35B8" />
-        <DList Name="gLotteryShopBlueRupeesDL" Offset="0x36B0" />
-        <DList Name="gLotteryShopTargetArrowAndSignDL" Offset="0x37C0" />
-        <DList Name="gLotteryShopScrollingArrowDL" Offset="0x3C80" />
-
-        <!-- Uses the billboard mtx and gLotteryShopMaskPosMtx -->
-        <DList Name="gLotteryShopMaskDL" Offset="0x3D58" />
-
-        <Texture Name="gLotteryShopSignTextTex" OutName="lottery_shop_sign_text" Format="i8" Width="64" Height="16" Offset="0x3E68" />
-        <Texture Name="gLotteryShopMaskTex" OutName="lottery_shop_mask" Format="rgba16" Width="16" Height="32" Offset="0x4268" />
-        <Texture Name="gLotteryShopGradientTex" OutName="lottery_shop_gradient" Format="i8" Width="4" Height="4" Offset="0x4668" /><!-- Used for box and target -->
-        <Texture Name="gLotteryShopCylinderTopBottomTex" OutName="lottery_shop_cylinder_top_bottom" Format="rgba16" Width="16" Height="32" Offset="0x4678" />
-        <Texture Name="gLotteryShopCylinderMiddleStripesTex" OutName="lottery_shop_cylinder_middle_stripes" Format="rgba16" Width="16" Height="32" Offset="0x4A78" />
-        <Texture Name="gLotteryShopSignBorderTex" OutName="lottery_shop_sign_border" Format="rgba16" Width="16" Height="64" Offset="0x4E78" />
-        <Texture Name="gLotteryShopBoxBaseTex" OutName="lottery_shop_box_base" Format="rgba16" Width="16" Height="16" Offset="0x5678" />
-        <Texture Name="gLotteryShopRainbowTex" OutName="lottery_shop_rainbow" Format="rgba16" Width="4" Height="32" Offset="0x5878" />
-        <Texture Name="gLotteryShopRupeesTex" OutName="lottery_shop_rupees" Format="rgba16" Width="32" Height="32" Offset="0x5978" />
-
-        <!-- All used to scroll the rainbow texture -->
-        <TextureAnimation Name="gLotteryShopTexAnim" Offset="0x6198" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kumo30.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kumo30.xml
deleted file mode 100644
index 3a74c0988..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kumo30.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="object_kumo30" Segment="6">
-        <DList Name="object_kumo30_DL_000A50" Offset="0xA50" /> <!-- Original name is "konpeki_mist1_FT_model" -->
-        <DList Name="object_kumo30_DL_000C98" Offset="0xC98" /> <!-- Original name is "konpeki_mist3_FT_model" -->
-        <Texture Name="object_kumo30_Tex_000E80" OutName="tex_000E80" Format="i8" Width="64" Height="64" Offset="0xE80" />
-        <Texture Name="object_kumo30_Tex_001E80" OutName="tex_001E80" Format="i4" Width="32" Height="32" Offset="0x1E80" />
-        <Texture Name="object_kumo30_Tex_002080" OutName="tex_002080" Format="i4" Width="64" Height="64" Offset="0x2080" />
-        <TextureAnimation Name="object_kumo30_Matanimheader_002890" Offset="0x2890" />
-        <DList Name="object_kumo30_DL_002A40" Offset="0x2A40" /> <!-- Original name is "z2_30_kumo_model" -->
-        <Texture Name="object_kumo30_Tex_002B58" OutName="tex_002B58" Format="i8" Width="32" Height="32" Offset="0x2B58" />
-        <Texture Name="object_kumo30_Tex_002F58" OutName="tex_002F58" Format="i8" Width="32" Height="32" Offset="0x2F58" />
-        <TextureAnimation Name="object_kumo30_Matanimheader_003368" Offset="0x3368" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kusa.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kusa.xml
deleted file mode 100644
index 362e47114..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kusa.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="object_kusa" Segment="6">
-        <DList Name="gKusaSproutDL" Offset="0x140" /> <!-- Original name is "obj_kusa01_model" -->
-        <DList Name="gKusaStumpDL" Offset="0x2E0" /> <!-- Original name is "obj_kusa03_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kz.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kz.xml
deleted file mode 100644
index 6295d7b1d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kz.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<Root>
-    <File Name="object_kz" Segment="6">
-        <Animation Name="object_kz_Anim_0003CC" Offset="0x3CC" /> <!-- Original name is "kz_attackA" -->
-        <Animation Name="object_kz_Anim_000F5C" Offset="0xF5C" /> <!-- Original name is "kz_attackB" -->
-        <Animation Name="object_kz_Anim_001390" Offset="0x1390" /> <!-- Original name is "kz_back_ten" -->
-        <Animation Name="object_kz_Anim_001578" Offset="0x1578" /> <!-- Original name is "kz_defense" -->
-        <Animation Name="object_kz_Anim_001E9C" Offset="0x1E9C" /> <!-- Original name is "kz_doron" -->
-        <Animation Name="object_kz_Anim_002730" Offset="0x2730" /> <!-- Original name is "kz_down" -->
-        <Animation Name="object_kz_Anim_002BA0" Offset="0x2BA0" /> <!-- Original name is "kz_downwait" -->
-        <Animation Name="object_kz_Anim_003A3C" Offset="0x3A3C" /> <!-- Original name is "kz_downwake" -->
-        <Animation Name="object_kz_Anim_0043E4" Offset="0x43E4" /> <!-- Original name is "kz_getout" -->
-        <Animation Name="object_kz_Anim_004860" Offset="0x4860" /> <!-- Original name is "kz_hit" -->
-        <Animation Name="object_kz_Anim_005644" Offset="0x5644" /> <!-- Original name is "kz_kime" -->
-        <Animation Name="object_kz_Anim_0058B8" Offset="0x58B8" /> <!-- Original name is "kz_run" -->
-
-        <Texture Name="object_kz_TLUT_0058D0" OutName="tlut_0058D0" Format="rgba16" Width="16" Height="16" Offset="0x58D0" />
-        <Texture Name="object_kz_Tex_005AD0" OutName="tex_005AD0" Format="ci8" Width="8" Height="8" Offset="0x5AD0" />
-        <Texture Name="object_kz_Tex_005B10" OutName="tex_005B10" Format="ci8" Width="8" Height="8" Offset="0x5B10" />
-        <Texture Name="object_kz_Tex_005B50" OutName="tex_005B50" Format="ci8" Width="16" Height="16" Offset="0x5B50" />
-        <Texture Name="object_kz_Tex_005C50" OutName="tex_005C50" Format="i8" Width="16" Height="16" Offset="0x5C50" />
-        <Texture Name="object_kz_Tex_005D50" OutName="tex_005D50" Format="ci8" Width="16" Height="16" Offset="0x5D50" />
-        <Texture Name="object_kz_Tex_005E50" OutName="tex_005E50" Format="i8" Width="16" Height="16" Offset="0x5E50" />
-        <Texture Name="object_kz_Tex_005F50" OutName="tex_005F50" Format="i8" Width="8" Height="16" Offset="0x5F50" />
-
-        <DList Name="object_kz_DL_007CB0" Offset="0x7CB0" />
-        <DList Name="object_kz_DL_008130" Offset="0x8130" />
-        <DList Name="object_kz_DL_008268" Offset="0x8268" />
-        <DList Name="object_kz_DL_008490" Offset="0x8490" />
-        <DList Name="object_kz_DL_0085C8" Offset="0x85C8" />
-        <DList Name="object_kz_DL_0087F0" Offset="0x87F0" />
-        <DList Name="object_kz_DL_008A10" Offset="0x8A10" />
-        <DList Name="object_kz_DL_008B10" Offset="0x8B10" />
-        <DList Name="object_kz_DL_008D80" Offset="0x8D80" />
-        <DList Name="object_kz_DL_008E80" Offset="0x8E80" />
-
-        <!-- <Texture Name="object_kz_TLUT_009100" OutName="tlut_009100" Format="rgba16" Width="16" Height="16" Offset="0x9100" /> -->
-        <!-- <Blob Name="object_kz_Blob_009300" Size="0x38" Offset="0x9300" /> -->
-        <Texture Name="object_kz_Tex_009338" OutName="tex_009338" Format="ci8" Width="8" Height="16" Offset="0x9338" />
-        <Texture Name="gKaizokuEyeOpenTex" OutName="kaizoku_eye_open" Format="ci8" Width="32" Height="32" Offset="0x93B8" TlutOffset="0x9100" />
-        <Texture Name="object_kz_Tex_0097B8" OutName="tex_0097B8" Format="i8" Width="16" Height="16" Offset="0x97B8" />
-        <Texture Name="object_kz_Tex_0098B8" OutName="tex_0098B8" Format="ci8" Width="8" Height="16" Offset="0x98B8" />
-        <Texture Name="object_kz_Tex_009938" OutName="tex_009938" Format="ci8" Width="8" Height="8" Offset="0x9938" />
-        <Texture Name="gKaizokuEyeHalfTex" OutName="kaizoku_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9978" TlutOffset="0x9100" />
-        <Texture Name="object_kz_Tex_009D78" OutName="tex_009D78" Format="i8" Width="8" Height="16" Offset="0x9D78" />
-        <Texture Name="object_kz_Tex_009DF8" OutName="tex_009DF8" Format="ci8" Width="16" Height="16" Offset="0x9DF8" />
-        <Texture Name="object_kz_Tex_009EF8" OutName="tex_009EF8" Format="ci8" Width="16" Height="16" Offset="0x9EF8" />
-        <Texture Name="object_kz_Tex_009FF8" OutName="tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" />
-        <Texture Name="gKaizokuEyeClosedTex" OutName="kaizoku_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9100" />
-
-        <DList Name="object_kz_DL_00C318" Offset="0xC318" />
-        <DList Name="object_kz_DL_00C4D8" Offset="0xC4D8" />
-        <DList Name="object_kz_DL_00C698" Offset="0xC698" />
-        <DList Name="object_kz_DL_00C830" Offset="0xC830" />
-        <DList Name="object_kz_DL_00CA08" Offset="0xCA08" />
-        <DList Name="object_kz_DL_00CBA0" Offset="0xCBA0" />
-        <DList Name="object_kz_DL_00CD78" Offset="0xCD78" />
-        <DList Name="object_kz_DL_00CE30" Offset="0xCE30" />
-        <DList Name="object_kz_DL_00CF20" Offset="0xCF20" />
-
-        <Limb Name="object_kz_Standardlimb_00D6B8" Type="Standard" EnumName="KAIZOKU_LIMB_01" Offset="0xD6B8" />
-        <Limb Name="object_kz_Standardlimb_00D6C4" Type="Standard" EnumName="KAIZOKU_LIMB_02" Offset="0xD6C4" />
-        <Limb Name="object_kz_Standardlimb_00D6D0" Type="Standard" EnumName="KAIZOKU_LIMB_03" Offset="0xD6D0" />
-        <Limb Name="object_kz_Standardlimb_00D6DC" Type="Standard" EnumName="KAIZOKU_LIMB_04" Offset="0xD6DC" />
-        <Limb Name="object_kz_Standardlimb_00D6E8" Type="Standard" EnumName="KAIZOKU_LIMB_05" Offset="0xD6E8" />
-        <Limb Name="object_kz_Standardlimb_00D6F4" Type="Standard" EnumName="KAIZOKU_LIMB_06" Offset="0xD6F4" />
-        <Limb Name="object_kz_Standardlimb_00D700" Type="Standard" EnumName="KAIZOKU_LIMB_07" Offset="0xD700" />
-        <Limb Name="object_kz_Standardlimb_00D70C" Type="Standard" EnumName="KAIZOKU_LIMB_08" Offset="0xD70C" />
-        <Limb Name="object_kz_Standardlimb_00D718" Type="Standard" EnumName="KAIZOKU_LIMB_09" Offset="0xD718" />
-        <Limb Name="object_kz_Standardlimb_00D724" Type="Standard" EnumName="KAIZOKU_LIMB_0A" Offset="0xD724" />
-        <Limb Name="object_kz_Standardlimb_00D730" Type="Standard" EnumName="KAIZOKU_LIMB_R_SWORD" Offset="0xD730" />
-        <Limb Name="object_kz_Standardlimb_00D73C" Type="Standard" EnumName="KAIZOKU_LIMB_0C" Offset="0xD73C" />
-        <Limb Name="object_kz_Standardlimb_00D748" Type="Standard" EnumName="KAIZOKU_LIMB_0D" Offset="0xD748" />
-        <Limb Name="object_kz_Standardlimb_00D754" Type="Standard" EnumName="KAIZOKU_LIMB_0E" Offset="0xD754" />
-        <Limb Name="object_kz_Standardlimb_00D760" Type="Standard" EnumName="KAIZOKU_LIMB_0F" Offset="0xD760" />
-        <Limb Name="object_kz_Standardlimb_00D76C" Type="Standard" EnumName="KAIZOKU_LIMB_10" Offset="0xD76C" />
-        <Limb Name="object_kz_Standardlimb_00D778" Type="Standard" EnumName="KAIZOKU_LIMB_11" Offset="0xD778" />
-        <Limb Name="object_kz_Standardlimb_00D784" Type="Standard" EnumName="KAIZOKU_LIMB_12" Offset="0xD784" />
-        <Limb Name="object_kz_Standardlimb_00D790" Type="Standard" EnumName="KAIZOKU_LIMB_L_FOOT" Offset="0xD790" />
-        <Limb Name="object_kz_Standardlimb_00D79C" Type="Standard" EnumName="KAIZOKU_LIMB_14" Offset="0xD79C" />
-        <Limb Name="object_kz_Standardlimb_00D7A8" Type="Standard" EnumName="KAIZOKU_LIMB_15" Offset="0xD7A8" />
-        <Limb Name="object_kz_Standardlimb_00D7B4" Type="Standard" EnumName="KAIZOKU_LIMB_R_FOOT" Offset="0xD7B4" />
-        <Limb Name="object_kz_Standardlimb_00D7C0" Type="Standard" EnumName="KAIZOKU_LIMB_17" Offset="0xD7C0" />
-        <Skeleton Name="gKaizokuSkel" Type="Flex" LimbType="Standard" LimbNone="KAIZOKU_LIMB_NONE" LimbMax="KAIZOKU_LIMB_MAX" EnumName="KaizokuLimb" Offset="0xD828" />
-
-        <Animation Name="object_kz_Anim_00DBE4" Offset="0xDBE4" /> <!-- Original name is "kz_side_walk" -->
-        <Animation Name="object_kz_Anim_00E1C8" Offset="0xE1C8" /> <!-- Original name is "kz_start" -->
-        <Animation Name="object_kz_Anim_00E8BC" Offset="0xE8BC" /> <!-- Original name is "kz_syuta" -->
-        <Animation Name="object_kz_Anim_00ED1C" Offset="0xED1C" /> <!-- Original name is "kz_syutawait" -->
-        <Animation Name="object_kz_Anim_00EF9C" Offset="0xEF9C" /> <!-- Original name is "kz_talk" -->
-        <Animation Name="object_kz_Anim_00F288" Offset="0xF288" /> <!-- Original name is "kz_togetout" -->
-        <Animation Name="object_kz_Anim_00F8E4" Offset="0xF8E4" /> <!-- Original name is "kz_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kzsaku.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kzsaku.xml
deleted file mode 100644
index fa157409e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_kzsaku.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Underwater grate -->
-    <File Name="object_kzsaku" Segment="6">
-        <DList Name="gUnderwaterGrateDL" Offset="0x40" /> <!-- Original name is "kz_saku_model" -->
-        <Texture Name="gUnderwaterGrateTex" OutName="underwater_grate" Format="ia8" Width="32" Height="128" Offset="0xD0" />
-        <Collision Name="gUnderwaterGrateCol" Offset="0x1118" /> <!-- Original name is "z2_30_saku_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ladder.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ladder.xml
deleted file mode 100644
index 2fc01e5bf..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ladder.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <!-- Object for Wooden Ladder -->
-    <File Name="object_ladder" Segment="6">
-        <!-- Wooden Ladder with 12 Rungs -->
-        <DList Name="gWoodenLadder12RungDL" Offset="0xA0" /> <!-- Original name is "m2_HASIGO_45_model" -->
-        <Collision Name="gWoodenLadder12RungCol" Offset="0x1D8" /> <!-- Original name is "m2_HASIGO_45_bgdatainfo" -->
-
-        <!-- Wooden Ladder with 16 Rungs -->
-        <DList Name="gWoodenLadder16RungDL" Offset="0x2D0" /> <!-- Original name is "m2_HASIGO_60_model" -->
-        <Collision Name="gWoodenLadder16RungCol" Offset="0x408" /> <!-- Original name is "m2_HASIGO_60_bgdatainfo" -->
-
-        <!-- Wooden Ladder with 20 Rungs -->
-        <DList Name="gWoodenLadder20RungDL" Offset="0x500" /> <!-- Original name is "m2_HASIGO_75_model" -->
-        <Collision Name="gWoodenLadder20RungCol" Offset="0x638" /> <!-- Original name is "m2_HASIGO_75_bgdatainfo" -->
-
-        <!-- Wooden Ladder with 24 Rungs -->
-        <DList Name="gWoodenLadder24RungDL" Offset="0x730" /> <!-- Original name is "m2_HASIGO_90_model" -->
-        <Collision Name="gWoodenLadder24RungCol" Offset="0x868" /> <!-- Original name is "m2_HASIGO_90_bgdatainfo" -->
-
-        <!-- Wooden Ladder Texture -->
-        <Texture Name="gWoodenLadderTex" OutName="wooden_ladder" Format="rgba16" Width="32" Height="32" Offset="0x8A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_last_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_last_obj.xml
deleted file mode 100644
index bd452a408..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_last_obj.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <File Name="object_last_obj" Segment="6">
-        <DList Name="object_last_obj_DL_000090" Offset="0x90" />
-        <DList Name="object_last_obj_DL_000098" Offset="0x98" /> <!-- Original name is "i2_bomH1_sep__L_model" -->
-        <DList Name="object_last_obj_DL_0001A0" Offset="0x1A0" />
-        <DList Name="object_last_obj_DL_0001A8" Offset="0x1A8" /> <!-- Original name is "i2_last_L031_model" -->
-        <Collision Name="object_last_obj_Colheader_000288" Offset="0x288" /> <!-- Original name is "i2_last_L031_bgdatainfo" -->
-        <Texture Name="object_last_obj_Tex_0002C0" OutName="tex_0002C0" Format="rgba16" Width="32" Height="64" Offset="0x2C0" />
-        <DList Name="object_last_obj_DL_001310" Offset="0x1310" />
-        <DList Name="object_last_obj_DL_001318" Offset="0x1318" /> <!-- Original name is "i2_last_L041_model" -->
-        <Collision Name="object_last_obj_Colheader_001450" Offset="0x1450" /> <!-- Original name is "i2_last_L041_bgdatainfo" -->
-        <!-- <Blob Name="object_last_obj_Blob_00147C" Size="0x284" Offset="0x147C" /> -->
-        <Texture Name="object_last_obj_TLUT_001700" OutName="tlut_001700" Format="rgba16" Width="4" Height="4" Offset="0x1700" />
-        <!-- <Blob Name="object_last_obj_Blob_001720" Size="0x180" Offset="0x1720" /> -->
-        <Texture Name="object_last_obj_Tex_0018A0" OutName="tex_0018A0" Format="rgba16" Width="32" Height="32" Offset="0x18A0" />
-        <!-- <Blob Name="object_last_obj_Blob_0020A0" Size="0x1000" Offset="0x20A0" /> -->
-        <Texture Name="object_last_obj_Tex_0030A0" OutName="tex_0030A0" Format="ci4" Width="64" Height="64" Offset="0x30A0" />
-        <DList Name="object_last_obj_DL_0039C0" Offset="0x39C0" /> <!-- Original name is "i2_L_shutter1_model" -->
-        <Texture Name="object_last_obj_Tex_003B20" OutName="tex_003B20" Format="rgba16" Width="32" Height="64" Offset="0x3B20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lastday.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lastday.xml
deleted file mode 100644
index 4c6b5fdb4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lastday.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <File Name="object_lastday" Segment="6">
-        <Array Name="object_lastday_Vtx_000000" Count="6" Offset="0x0">
-            <Vtx/>
-        </Array>
-        <DList Name="object_lastday_DL_000060" Offset="0x60" /> <!-- Original name is "houkai_core_model" -->
-        <TextureAnimation Name="object_lastday_Matanimheader_000148" Offset="0x148" />
-        <DList Name="object_lastday_DL_000210" Offset="0x210" /> <!-- Original name is "houkai_fire_model" -->
-        <TextureAnimation Name="object_lastday_Matanimheader_000308" Offset="0x308" />
-        <DList Name="object_lastday_DL_000370" Offset="0x370" /> <!-- Original name is "houkai_horizon_model" -->
-        <TextureAnimation Name="object_lastday_Matanimheader_000448" Offset="0x448" />
-        <DList Name="object_lastday_DL_000510" Offset="0x510" /> <!-- Original name is "houkai_smoke_model" -->
-        <TextureAnimation Name="object_lastday_Matanimheader_000608" Offset="0x608" />
-        <Texture Name="object_lastday_Tex_000610" OutName="tex_000610" Format="ia16" Width="32" Height="32" Offset="0x610" />
-        <Texture Name="object_lastday_Tex_000E10" OutName="tex_000E10" Format="i8" Width="64" Height="32" Offset="0xE10" />
-        <Texture Name="object_lastday_Tex_001610" OutName="tex_001610" Format="i8" Width="32" Height="64" Offset="0x1610" />
-        <Texture Name="object_lastday_Tex_001E10" OutName="tex_001E10" Format="i8" Width="32" Height="32" Offset="0x1E10" />
-        <Texture Name="object_lastday_Tex_002210" OutName="tex_002210" Format="i8" Width="64" Height="32" Offset="0x2210" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lbfshot.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lbfshot.xml
deleted file mode 100644
index 881f877b6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lbfshot.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_lbfshot" Segment="6">
-        <DList Name="object_lbfshot_DL_000220" Offset="0x220" /> <!-- Original name is "z2_lbfshot_modelT" -->
-        <DList Name="object_lbfshot_DL_000228" Offset="0x228" /> <!-- Original name is "z2_lbfshot_model" -->
-        <Texture Name="object_lbfshot_Tex_000340" OutName="tex_000340" Format="rgba16" Width="16" Height="64" Offset="0x340" />
-        <Texture Name="object_lbfshot_Tex_000B40" OutName="tex_000B40" Format="rgba16" Width="32" Height="32" Offset="0xB40" />
-        <Collision Name="object_lbfshot_Colheader_0014D8" Offset="0x14D8" /> <!-- Original name is "z2_lbfshot_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lightblock.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lightblock.xml
deleted file mode 100644
index 07c5da688..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lightblock.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Object for the Sun Block -->
-    <File Name="object_lightblock" Segment="6">
-        <DList Name="gSunBlockEmptyDL" Offset="0x170" /> <!-- Original name is "z2_brick_light_modelT" -->
-        <DList Name="gSunBlockDL" Offset="0x178" /> <!-- Original name is "z2_brick_light_model" -->
-        <Texture Name="gSunBlockTLUT" OutName="sun_block_tlut" Format="rgba16" Width="4" Height="4" Offset="0x258" />
-        <Texture Name="gSunBlockTex" OutName="sun_block" Format="ci4" Width="64" Height="64" Offset="0x278" />
-        <Collision Name="gSunBlockCol" Offset="0xB80" /> <!-- Original name is "z2_brick_light_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lightswitch.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lightswitch.xml
deleted file mode 100644
index a8b26bc51..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lightswitch.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_lightswitch" Segment="6">
-        <DList Name="object_lightswitch_DL_000260" Offset="0x260" /> <!-- Original name is "switch_8_model" -->
-        <DList Name="object_lightswitch_DL_000398" Offset="0x398" /> <!-- Original name is "switch_8_fire1_model" -->
-        <!-- a square, geometry only -->
-        <DList Name="object_lightswitch_DL_000408" Offset="0x408" /> <!-- Original name is "switch_8_fire2_model" -->
-        <Texture Name="object_lightswitch_Tex_000420" OutName="tex_000420" Format="rgba16" Width="32" Height="32" Offset="0x420" /> <!-- eyes open -->
-        <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20" /> <!-- eyes closed -->
-        <Texture Name="object_lightswitch_Tex_001420" OutName="tex_001420" Format="rgba16" Width="32" Height="32" Offset="0x1420" /> <!-- eyes open, smiling -->
-        <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_boy.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_boy.xml
deleted file mode 100644
index 2fe50d9bc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_boy.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<Root>
-    <File Name="object_link_boy" Segment="6">
-        <Texture Name="object_link_boy_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="object_link_boy_TLUT_000200" OutName="tlut_000200" Format="rgba16" Width="16" Height="16" Offset="0x200" />
-        <Texture Name="gLinkFierceDeityHandHoldingTLUT" OutName="hand_holding_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400" />
-        <Texture Name="object_link_boy_Tex_000600" OutName="tex_000600" Format="ci8" Width="16" Height="32" Offset="0x600" TlutOffset="0x0" />
-        <Texture Name="object_link_boy_Tex_000800" OutName="tex_000800" Format="ci8" Width="16" Height="32" Offset="0x800" />
-        <Texture Name="gLinkFierceDeityHandHoldingTex" OutName="hand_holding" Format="ci8" Width="16" Height="16" Offset="0xA00" TlutOffset="0x400" />
-        <Texture Name="object_link_boy_Tex_000B00" OutName="tex_000B00" Format="i8" Width="16" Height="16" Offset="0xB00" />
-
-        <DList Name="gLinkFierceDeityWaistDL" Offset="0x49E0" />
-        <DList Name="gLinkFierceDeityRightThighDL" Offset="0x4C50" />
-        <DList Name="gLinkFierceDeityRightShinDL" Offset="0x4F48" />
-        <DList Name="gLinkFierceDeityRightFootDL" Offset="0x5190" />
-        <DList Name="gLinkFierceDeityLeftThighDL" Offset="0x52A0" />
-        <DList Name="gLinkFierceDeityLeftShinDL" Offset="0x55D0" />
-        <DList Name="gLinkFierceDeityLeftFootDL" Offset="0x5818" />
-        <DList Name="gLinkFierceDeityHatDL" Offset="0x5928" />
-        <DList Name="gLinkFierceDeityHeadDL" Offset="0x5A78" />
-        <DList Name="object_link_boy_DL_0060E8" Offset="0x60E8" />
-        <DList Name="gLinkFierceDeityTorsoDL" Offset="0x6148" />
-        <DList Name="object_link_boy_DL_006370" Offset="0x6370" />
-        <DList Name="gLinkFierceDeityRightShoulderDL" Offset="0x6410" />
-        <DList Name="gLinkFierceDeityRightForearmDL" Offset="0x65E0" />
-        <DList Name="gLinkFierceDeityRightHandDL" Offset="0x67D8" />
-        <DList Name="gLinkFierceDeityLeftShoulderDL" Offset="0x6A58" />
-        <DList Name="gLinkFierceDeityLeftForearmDL" Offset="0x6C38" />
-        <DList Name="gLinkFierceDeityLeftHandDL" Offset="0x6EB8" />
-        <!-- Unused leftover from OoT -->
-        <DList Name="gLinkFierceDeityLeftHandHoldBottleDL" Offset="0x7820" />
-        <DList Name="object_link_boy_DL_007A50" Offset="0x7A50" />
-        <DList Name="gLinkFierceDeityBottleDL" Offset="0x7AD0" />
-        <DList Name="gLinkFierceDeitySwordDL" Offset="0x7F28" />
-        <DList Name="gLinkFierceDeityLeftHandHoldingSwordDL" Offset="0x80F0" />
-        <DList Name="gLinkFierceDeityEmptyDL" Offset="0x8100" />
-
-        <Texture Name="object_link_boy_TLUT_008108" OutName="tlut_008108" Format="rgba16" Width="4" Height="4" Offset="0x8108" />
-        <Texture Name="object_link_boy_TLUT_008128" OutName="tlut_008128" Format="rgba16" Width="4" Height="4" Offset="0x8128" />
-        <Texture Name="object_link_boy_TLUT_008148" OutName="tlut_008148" Format="rgba16" Width="4" Height="4" Offset="0x8148" />
-        <Texture Name="object_link_boy_TLUT_008168" OutName="tlut_008168" Format="rgba16" Width="4" Height="4" Offset="0x8168" />
-        <Texture Name="object_link_boy_TLUT_008188" OutName="tlut_008188" Format="rgba16" Width="4" Height="4" Offset="0x8188" />
-        <Texture Name="object_link_boy_TLUT_0081A8" OutName="tlut_0081A8" Format="rgba16" Width="4" Height="4" Offset="0x81A8" />
-        <Texture Name="gLinkFierceDeityHandTLUT" OutName="hand_tlut" Format="rgba16" Width="4" Height="4" Offset="0x81C8" />
-        <Texture Name="object_link_boy_TLUT_0081E8" OutName="tlut_0081E8" Format="rgba16" Width="4" Height="4" Offset="0x81E8" />
-        <Texture Name="object_link_boy_Tex_008208" OutName="tex_008208" Format="rgba16" Width="16" Height="16" Offset="0x8208" />
-        <Texture Name="object_link_boy_Tex_008408" OutName="tex_008408" Format="ci4" Width="16" Height="16" Offset="0x8408" />
-        <Texture Name="object_link_boy_Tex_008488" OutName="tex_008488" Format="rgba16" Width="16" Height="32" Offset="0x8488" />
-        <Texture Name="object_link_boy_Tex_008888" OutName="tex_008888" Format="rgba16" Width="32" Height="16" Offset="0x8888" />
-        <Texture Name="object_link_boy_Tex_008C88" OutName="tex_008C88" Format="ci4" Width="16" Height="16" Offset="0x8C88" />
-        <Texture Name="object_link_boy_Tex_008D08" OutName="tex_008D08" Format="ci4" Width="32" Height="32" Offset="0x8D08" />
-        <Texture Name="object_link_boy_Tex_008F08" OutName="tex_008F08" Format="ci4" Width="64" Height="64" Offset="0x8F08" />
-        <Texture Name="gLinkFierceDeityEyesTex" OutName="eyes" Format="rgba16" Width="64" Height="32" Offset="0x9708" />
-        <Texture Name="object_link_boy_Tex_00A708" OutName="tex_00A708" Format="ci4" Width="32" Height="32" Offset="0xA708" />
-        <Texture Name="gLinkFierceDeityMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0xA908" />
-        <Texture Name="gLinkFierceDeityEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xAD08" />
-        <Texture Name="object_link_boy_Tex_00AF08" OutName="tex_00AF08" Format="ci4" Width="32" Height="32" Offset="0xAF08" />
-        <Texture Name="gLinkFierceDeityHandTex" OutName="hand" Format="ci4" Width="16" Height="16" Offset="0xB108" TlutOffset="0x81C8" />
-        <Texture Name="object_link_boy_Tex_00B188" OutName="tex_00B188" Format="ci4" Width="64" Height="64" Offset="0xB188" />
-
-        <!-- TODO this texture should be 50x75 but the u64 type of textures makes this not match currently -->
-        <Texture Name="object_link_boy_Tex_00B988" OutName="tex_00B988" Format="rgba16" Width="50" Height="74" Offset="0xB988" />
-
-        <Limb Name="gLinkFierceDeityRootLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_ROOT" Offset="0xD6D4" />
-        <Limb Name="gLinkFierceDeityWaistLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_WAIST" Offset="0xD6E4" />
-        <Limb Name="gLinkFierceDeityLowerRootLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LOWER_ROOT" Offset="0xD6F4" />
-        <Limb Name="gLinkFierceDeityRightThighLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_THIGH" Offset="0xD704" />
-        <Limb Name="gLinkFierceDeityRightShinLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_SHIN" Offset="0xD714" />
-        <Limb Name="gLinkFierceDeityRightFootLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_FOOT" Offset="0xD724" />
-        <Limb Name="gLinkFierceDeityLeftThighLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_THIGH" Offset="0xD734" />
-        <Limb Name="gLinkFierceDeityLeftShinLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_SHIN" Offset="0xD744" />
-        <Limb Name="gLinkFierceDeityLeftFootLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_FOOT" Offset="0xD754" />
-        <Limb Name="gLinkFierceDeityUpperRootLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_UPPER_ROOT" Offset="0xD764" />
-        <Limb Name="gLinkFierceDeityHeadLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_HEAD" Offset="0xD774" />
-        <Limb Name="gLinkFierceDeityHatLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_HAT" Offset="0xD784" />
-        <Limb Name="gLinkFierceDeityCollarLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_COLLAR" Offset="0xD794" />
-        <Limb Name="gLinkFierceDeityLeftShoulderLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_SHOULDER" Offset="0xD7A4" />
-        <Limb Name="gLinkFierceDeityLeftForearmLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_FOREARM" Offset="0xD7B4" />
-        <Limb Name="gLinkFierceDeityLeftHandLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_LEFT_HAND" Offset="0xD7C4" />
-        <Limb Name="gLinkFierceDeityRightShoulderLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_SHOULDER" Offset="0xD7D4" />
-        <Limb Name="gLinkFierceDeityRightForearmLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_FOREARM" Offset="0xD7E4" />
-        <Limb Name="gLinkFierceDeityRightHandLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_RIGHT_HAND" Offset="0xD7F4" />
-        <Limb Name="gLinkFierceDeitySheathLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_SHEATH" Offset="0xD804" />
-        <Limb Name="gLinkFierceDeityTorsoLimb" Type="LOD" EnumName="LINK_FIERCE_DEITY_LIMB_TORSO" Offset="0xD814" />
-        <Skeleton Name="gLinkFierceDeitySkel" Type="Flex" LimbType="LOD" LimbNone="LINK_FIERCE_DEITY_LIMB_NONE" LimbMax="LINK_FIERCE_DEITY_LIMB_MAX" EnumName="LinkFierceDeityLimb" Offset="0xD878" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_child.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_child.xml
deleted file mode 100644
index dd045c1d8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_child.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<Root>
-    <File Name="object_link_child" Segment="6">
-        <Texture Name="gLinkHumanEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x800" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesClosedTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesRollUpTex" OutName="eyes_roll_up" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5000" />
-        <Texture Name="gLinkHumanEyesRollDownTex" OutName="eyes_roll_down" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5000" />
-        <Texture Name="object_link_child_Tex_003800" OutName="tex_003800" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5000" />
-
-        <Texture Name="gLinkHumanMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5200" />
-        <Texture Name="gLinkHumanMouthTeethTex" OutName="mouth_teeth" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5200" />
-        <Texture Name="gLinkHumanMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5200" />
-        <Texture Name="gLinkHumanMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5200" />
-
-        <Texture Name="gLinkHumanSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5000" />
-        <Texture Name="gLinkHumanMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5200" />
-
-        <Texture Name="object_link_child_Tex_005400" OutName="tex_005400" Format="rgba16" Width="8" Height="16" Offset="0x5400" />
-        <Texture Name="object_link_child_Tex_005500" OutName="tex_005500" Format="ci8" Width="8" Height="8" Offset="0x5500" />
-        <Texture Name="object_link_child_Tex_005540" OutName="tex_005540" Format="ci8" Width="16" Height="16" Offset="0x5540" />
-        <Texture Name="gLinkHumanEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5640" />
-        <Texture Name="gLinkHumanBeltClaspTex" OutName="belt_clasp" Format="rgba16" Width="32" Height="16" Offset="0x5740" />
-        <Texture Name="gLinkHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="16" Offset="0x5B40" />
-        <Texture Name="object_link_child_Tex_005C40" OutName="tex_005C40" Format="i8" Width="16" Height="16" Offset="0x5C40" />
-        <Texture Name="object_link_child_Tex_005D40" OutName="tex_005D40" Format="i8" Width="8" Height="8" Offset="0x5D40" />
-        <Texture Name="object_link_child_Tex_005D80" OutName="tex_005D80" Format="i8" Width="8" Height="16" Offset="0x5D80" />
-        <Texture Name="object_link_child_Tex_005E00" OutName="tex_005E00" Format="rgba16" Width="16" Height="32" Offset="0x5E00" />
-        <Texture Name="object_link_child_Tex_006200" OutName="tex_006200" Format="rgba16" Width="32" Height="32" Offset="0x6200" />
-        <Texture Name="object_link_child_Tex_006A00" OutName="tex_006A00" Format="ci8" Width="16" Height="16" Offset="0x6A00" />
-        <Texture Name="object_link_child_Tex_006B00" OutName="tex_006B00" Format="rgba16" Width="16" Height="16" Offset="0x6B00" />
-        <!-- <Blob Name="object_link_child_Blob_006D00" Size="0xA00" Offset="0x6D00" /> -->
-        <Texture Name="object_link_child_Tex_007700" OutName="tex_007700" Format="rgba16" Width="16" Height="16" Offset="0x7700" />
-
-        <DList Name="gLinkHumanRightThighDL" Offset="0xB360" />
-        <DList Name="gLinkHumanRightShinDL" Offset="0xB538" />
-        <DList Name="gLinkHumanRightFootDL" Offset="0xB778" />
-        <DList Name="gLinkHumanLeftThighDL" Offset="0xB888" />
-        <DList Name="gLinkHumanLeftShinDL" Offset="0xBA60" />
-        <DList Name="gLinkHumanLeftFootDL" Offset="0xBCA0" />
-        <DList Name="gLinkHumanWaistDL" Offset="0xBDB0" />
-        <DList Name="gLinkHumanCollarDL" Offset="0xBF88" />
-        <DList Name="gLinkHumanTorsoDL" Offset="0xC048" />
-        <DList Name="gLinkHumanHeadDL" Offset="0xC3E8" />
-        <DList Name="gLinkHumanHatDL" Offset="0xCAA8" />
-        <!-- Unused sword in scabbard -->
-        <DList Name="gLinkHumanSwordScabbardDL" Offset="0xCBC8" />
-        <DList Name="gLinkHumanRightShoulderDL" Offset="0xCCE0" />
-        <DList Name="gLinkHumanRightForearmDL" Offset="0xCF08" />
-        <DList Name="gLinkHumanRightHandOpenDL" Offset="0xD058" />
-        <DList Name="gLinkHumanLeftShoulderDL" Offset="0xD1B0" />
-        <DList Name="gLinkHumanLeftForearmDL" Offset="0xD3D8" />
-        <DList Name="gLinkHumanLeftHandOpenDL" Offset="0xD528" />
-
-        <Texture Name="gLinkHumanOcarinaTex" OutName="ocarina" Format="rgba16" Width="32" Height="16" Offset="0xD680" />
-        <!-- <Blob Name="object_link_child_Blob_00DA80" Size="0x88" Offset="0xDA80" /> -->
-        <Texture Name="object_link_child_Tex_00DB08" OutName="tex_00DB08" Format="ci8" Width="16" Height="16" Offset="0xDB08" />
-
-        <!-- <Blob Name="object_link_child_Blob_00DC08" Size="0x360" Offset="0xDC08" /> -->
-        <DList Name="gLinkHumanLeftHandClosedDL" Offset="0xE1C8" />
-        <!-- <Blob Name="object_link_child_Blob_00E2E8" Size="0x1F0" Offset="0xE2E8" /> -->
-        <DList Name="gLinkHumanRightHandClosedDL" Offset="0xE738" />
-
-        <DList Name="gLinkHumanRightHandHoldingOcarinaDL" Offset="0xED18" />
-        <DList Name="object_link_child_DL_00F1D8" Offset="0xF1D8" />
-        <DList Name="object_link_child_DL_00F548" Offset="0xF548" />
-        <DList Name="object_link_child_DL_00F998" Offset="0xF998" />
-        <DList Name="object_link_child_DL_00FD08" Offset="0xFD08" />
-        <!-- Duplicated of gLinkHumanRightHandHoldingOcarinaDL -->
-        <DList Name="object_link_child_DL_0102E8" Offset="0x102E8" />
-
-        <DList Name="object_link_child_DL_015F98" Offset="0x15F98" />
-        <DList Name="object_link_child_DL_016048" Offset="0x16048" />
-        <DList Name="object_link_child_DL_016058" Offset="0x16058" />
-        <DList Name="object_link_child_DL_0161C8" Offset="0x161C8" />
-        <DList Name="object_link_child_DL_016270" Offset="0x16270" />
-        <DList Name="object_link_child_DL_016320" Offset="0x16320" />
-        <DList Name="object_link_child_DL_0163D0" Offset="0x163D0" />
-        <DList Name="gLinkHumanMirrorShieldDL" Offset="0x16480" />
-
-        <DList Name="object_link_child_DL_0164B8" Offset="0x164B8" />
-        <DList Name="object_link_child_DL_016608" Offset="0x16608" />
-        <DList Name="object_link_child_DL_0166F8" Offset="0x166F8" />
-        <DList Name="object_link_child_DL_0167D0" Offset="0x167D0" />
-        <DList Name="gLinkHumanGreatFairysSwordDL" Offset="0x16898" />
-        <DList Name="object_link_child_DL_0168C0" Offset="0x168C0" />
-        <DList Name="object_link_child_DL_016950" Offset="0x16950" />
-        <DList Name="object_link_child_DL_0169E0" Offset="0x169E0" />
-        <DList Name="gLinkHumanGildedSwordSheathDL" Offset="0x16B80" />
-        <DList Name="object_link_child_DL_016BA0" Offset="0x16BA0" />
-        <DList Name="object_link_child_DL_016C88" Offset="0x16C88" />
-        <DList Name="object_link_child_DL_016D58" Offset="0x16D58" />
-        <DList Name="object_link_child_DL_016E10" Offset="0x16E10" />
-        <DList Name="object_link_child_DL_016F38" Offset="0x16F38" />
-        <DList Name="object_link_child_DL_016FC8" Offset="0x16FC8" />
-        <DList Name="gLinkHumanGildedSwordHandleDL" Offset="0x17058" />
-        <DList Name="object_link_child_DL_017090" Offset="0x17090" />
-        <DList Name="object_link_child_DL_017130" Offset="0x17130" />
-        <DList Name="object_link_child_DL_0171D0" Offset="0x171D0" />
-        <DList Name="object_link_child_DL_017270" Offset="0x17270" />
-        <DList Name="gLinkHumanGildedSwordBladeDL" Offset="0x17310" />
-        <DList Name="gLinkHumanRazorSwordSheathDL" Offset="0x17338" />
-        <DList Name="gLinkHumanHerosShieldDL" Offset="0x17458" />
-        <DList Name="gLinkHumanKokiriSwordSheathDL" Offset="0x17700" />
-        <DList Name="object_link_child_DL_017818" Offset="0x17818" />
-        <DList Name="gLinkHumanHookshotDL" Offset="0x17858" />
-        <DList Name="object_link_child_DL_017B40" Offset="0x17B40" />
-        <DList Name="gLinkHumanBowDL" Offset="0x181C8" />
-        <DList Name="object_link_child_DL_018490" Offset="0x18490" />
-
-        <Texture Name="object_link_child_TLUT_018A40" OutName="tlut_018A40" Format="rgba16" Width="16" Height="16" Offset="0x18A40" />
-        <Texture Name="gLinkHumanHerosShieldFrontTLUT" OutName="hylian_shield_front_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18C40" />
-        <Texture Name="gLinkHumanHerosShieldBackTLUT" OutName="hylian_shield_back_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18E40" />
-        <Texture Name="gLinkHumanShieldHandleTLUT" OutName="shield_handle_tlut" Format="rgba16" Width="16" Height="16" Offset="0x19040" />
-        <Texture Name="object_link_child_Tex_019240" OutName="tex_019240" Format="ci8" Width="8" Height="8" Offset="0x19240" />
-        <Texture Name="gLinkHumanHerosShieldFrontUpperTex" OutName="hylian_shield_front_upper" Format="ci8" Width="64" Height="32" Offset="0x19280" TlutOffset="0x18C40" />
-        <Texture Name="object_link_child_Tex_019A80" OutName="tex_019A80" Format="ci8" Width="32" Height="64" Offset="0x19A80" />
-        <Texture Name="object_link_child_Tex_01A280" OutName="tex_01A280" Format="ci8" Width="16" Height="16" Offset="0x1A280" />
-        <Texture Name="object_link_child_Tex_01A380" OutName="tex_01A380" Format="rgba16" Width="64" Height="32" Offset="0x1A380" />
-        <Texture Name="object_link_child_Tex_01B380" OutName="tex_01B380" Format="ci8" Width="16" Height="16" Offset="0x1B380" />
-        <Texture Name="gLinkHumanHerosShieldFrontLowerTex" OutName="hylian_shield_front_lower" Format="ci8" Width="64" Height="32" Offset="0x1B480" TlutOffset="0x18C40" />
-        <Texture Name="gLinkHumanHerosShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0x1BC80" TlutOffset="0x18E40" />
-        <Texture Name="gLinkHumanShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0x1BE80" TlutOffset="0x19040" />
-        <Texture Name="object_link_child_Tex_01BF00" OutName="tex_01BF00" Format="rgba16" Width="8" Height="8" Offset="0x1BF00" />
-        <Texture Name="object_link_child_Tex_01BF80" OutName="tex_01BF80" Format="rgba16" Width="16" Height="16" Offset="0x1BF80" />
-        <Texture Name="object_link_child_Tex_01C180" OutName="tex_01C180" Format="rgba16" Width="16" Height="16" Offset="0x1C180" />
-        <Texture Name="object_link_child_Tex_01C380" OutName="tex_01C380" Format="rgba16" Width="8" Height="8" Offset="0x1C380" />
-        <Texture Name="object_link_child_Tex_01C400" OutName="tex_01C400" Format="rgba16" Width="16" Height="32" Offset="0x1C400" />
-        <Texture Name="object_link_child_Tex_01C800" OutName="tex_01C800" Format="rgba16" Width="16" Height="8" Offset="0x1C800" />
-        <Texture Name="object_link_child_Tex_01C900" OutName="tex_01C900" Format="rgba16" Width="16" Height="16" Offset="0x1C900" />
-        <Texture Name="object_link_child_Tex_01CB00" OutName="tex_01CB00" Format="i8" Width="32" Height="64" Offset="0x1CB00" />
-        <Texture Name="object_link_child_Tex_01D300" OutName="tex_01D300" Format="i8" Width="8" Height="8" Offset="0x1D300" />
-        <Texture Name="object_link_child_Tex_01D340" OutName="tex_01D340" Format="i8" Width="16" Height="16" Offset="0x1D340" />
-        <Texture Name="object_link_child_Tex_01D440" OutName="tex_01D440" Format="i8" Width="32" Height="32" Offset="0x1D440" />
-        <DList Name="object_link_child_DL_01D960" Offset="0x1D960" />
-
-        <DList Name="gLinkHumanSheathEmptyDL" Offset="0x1DA90" />
-
-        <Mtx Name="gLinkHumanSheathedKokiriSwordMtx" Offset="0x1DA98" />
-        <DList Name="gLinkHumanSheathedKokiriSwordDL" Offset="0x1DAD8" />
-
-        <Mtx Name="gLinkHumanSheathedRazorSwordMtx" Offset="0x1DB00" />
-        <DList Name="gLinkHumanSheathedRazorSwordDL" Offset="0x1DB40" />
-        <DList Name="gLinkHumanSheathedGildedSwordDL" Offset="0x1DB60" />
-        <Mtx Name="gLinkHumanHerosShieldMtx" Offset="0x1DB88" />
-        <DList Name="gLinkHumanHerosShieldWithMtxDL" Offset="0x1DBC8" />
-        <Mtx Name="gLinkHumanMirrorShieldMtx" Offset="0x1DBD8" />
-        <DList Name="gLinkHumanMirrorShieldWithMtxDL" Offset="0x1DC18" />
-
-        <DList Name="gLinkHumanRightHandHoldingHerosShieldDL" Offset="0x1DC28" />
-        <DList Name="object_link_child_DL_01DC38" Offset="0x1DC38" />
-        <DList Name="gLinkHumanRightHandHoldingMirrorShieldDL" Offset="0x1DC48" />
-        <DList Name="object_link_child_DL_01DC58" Offset="0x1DC58" />
-        <DList Name="gLinkHumanLeftHandHoldingKokiriSwordDL" Offset="0x1DC68" />
-        <DList Name="object_link_child_DL_01DC78" Offset="0x1DC78" />
-        <DList Name="gLinkHumanLeftHandHoldingRazorSwordDL" Offset="0x1DC88" />
-        <DList Name="object_link_child_DL_01DC98" Offset="0x1DC98" />
-        <DList Name="gLinkHumanLeftHandHoldingGildedSwordDL" Offset="0x1DCA8" />
-        <DList Name="object_link_child_DL_01DCC0" Offset="0x1DCC0" />
-        <DList Name="gLinkHumanLeftHandHoldingGreatFairysSwordDL" Offset="0x1DCD8" />
-        <DList Name="object_link_child_DL_01DCE8" Offset="0x1DCE8" />
-        <DList Name="gLinkHumanRightHandHoldingHookshotDL" Offset="0x1DCF8" />
-        <DList Name="object_link_child_DL_01DD08" Offset="0x1DD08" />
-        <DList Name="gLinkHumanRightHandHoldingBowDL" Offset="0x1DD18" />
-        <DList Name="object_link_child_DL_01DD28" Offset="0x1DD28" />
-
-        <DList Name="gLinkHumanLeftHandHoldBottleDL" Offset="0x1DFA8" />
-
-        <Limb Name="gLinkHumanRootLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_ROOT" Offset="0x1E0A0" />
-        <Limb Name="gLinkHumanWaistLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_WAIST" Offset="0x1E0B0" />
-        <Limb Name="gLinkHumanLowerRootLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LOWER_ROOT" Offset="0x1E0C0" />
-        <Limb Name="gLinkHumanRightThighLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_THIGH" Offset="0x1E0D0" />
-        <Limb Name="gLinkHumanRightShinLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_SHIN" Offset="0x1E0E0" />
-        <Limb Name="gLinkHumanRightFootLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_FOOT" Offset="0x1E0F0" />
-        <Limb Name="gLinkHumanLeftThighLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_THIGH" Offset="0x1E100" />
-        <Limb Name="gLinkHumanLeftShinLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_SHIN" Offset="0x1E110" />
-        <Limb Name="gLinkHumanLeftFootLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_FOOT" Offset="0x1E120" />
-        <Limb Name="gLinkHumanUpperRootLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_UPPER_ROOT" Offset="0x1E130" />
-        <Limb Name="gLinkHumanHeadLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_HEAD" Offset="0x1E140" />
-        <Limb Name="gLinkHumanHatLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_HAT" Offset="0x1E150" />
-        <Limb Name="gLinkHumanCollarLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_COLLAR" Offset="0x1E160" />
-        <Limb Name="gLinkHumanLeftShoulderLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_SHOULDER" Offset="0x1E170" />
-        <Limb Name="gLinkHumanLeftForearmLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_FOREARM" Offset="0x1E180" />
-        <Limb Name="gLinkHumanLeftHandLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_LEFT_HAND" Offset="0x1E190" />
-        <Limb Name="gLinkHumanRightShoulderLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_SHOULDER" Offset="0x1E1A0" />
-        <Limb Name="gLinkHumanRightForearmLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_FOREARM" Offset="0x1E1B0" />
-        <Limb Name="gLinkHumanRightHandLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_RIGHT_HAND" Offset="0x1E1C0" />
-        <Limb Name="gLinkHumanSheathLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_SHEATH" Offset="0x1E1D0" />
-        <Limb Name="gLinkHumanTorsoLimb" Type="LOD" EnumName="LINK_HUMAN_LIMB_TORSO" Offset="0x1E1E0" />
-        <Skeleton Name="gLinkHumanSkel" Type="Flex" LimbType="LOD" LimbNone="LINK_HUMAN_LIMB_NONE" LimbMax="LINK_HUMAN_LIMB_MAX" EnumName="LinkHumanLimb" Offset="0x1E244" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_goron.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_goron.xml
deleted file mode 100644
index b6dd7fe6f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_goron.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<Root>
-    <File Name="object_link_goron" Segment="6">
-        <Texture Name="gLinkGoronEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0" TlutOffset="0x2200" />
-        <Texture Name="gLinkGoronEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x800" TlutOffset="0x2200" />
-        <Texture Name="gLinkGoronEyesClosedTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x2200" />
-        <Texture Name="gLinkGoronEyesSurprisedTex" OutName="eyes_surprised" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x2200" />
-
-        <Texture Name="object_link_goron_TLUT_002000" OutName="tlut_002000" Format="rgba16" Width="16" Height="16" Offset="0x2000" />
-        <Texture Name="gLinkGoronSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2200" />
-
-        <Texture Name="object_link_goron_Tex_002400" OutName="tex_002400" Format="rgba16" Width="8" Height="32" Offset="0x2400" />
-        <Texture Name="object_link_goron_Tex_002600" OutName="tex_002600" Format="ci8" Width="16" Height="16" Offset="0x2600" />
-        <Texture Name="object_link_goron_Tex_002700" OutName="tex_002700" Format="rgba16" Width="8" Height="8" Offset="0x2700" />
-        <Texture Name="object_link_goron_Tex_002780" OutName="tex_002780" Format="rgba16" Width="8" Height="16" Offset="0x2780" />
-        <Texture Name="object_link_goron_Tex_002880" OutName="tex_002880" Format="rgba16" Width="8" Height="8" Offset="0x2880" />
-        <Texture Name="object_link_goron_Tex_002900" OutName="tex_002900" Format="ci8" Width="8" Height="8" Offset="0x2900" />
-        <Texture Name="object_link_goron_Tex_002940" OutName="tex_002940" Format="rgba16" Width="32" Height="16" Offset="0x2940" />
-        <Texture Name="object_link_goron_Tex_002D40" OutName="tex_002D40" Format="rgba16" Width="16" Height="32" Offset="0x2D40" />
-        <Texture Name="object_link_goron_Tex_003140" OutName="tex_003140" Format="ci8" Width="32" Height="64" Offset="0x3140" />
-        <Texture Name="object_link_goron_Tex_003940" OutName="tex_003940" Format="ci8" Width="16" Height="16" Offset="0x3940" />
-        <Texture Name="object_link_goron_Tex_003A40" OutName="tex_003A40" Format="ci8" Width="32" Height="32" Offset="0x3A40" />
-        <Texture Name="object_link_goron_Tex_003E40" OutName="tex_003E40" Format="ci8" Width="32" Height="32" Offset="0x3E40" />
-        <Texture Name="object_link_goron_Tex_004240" OutName="tex_004240" Format="ci8" Width="8" Height="32" Offset="0x4240" />
-        <Texture Name="object_link_goron_Tex_004340" OutName="tex_004340" Format="i8" Width="8" Height="8" Offset="0x4340" />
-
-        <DList Name="gLinkGoronRightThighDL" Offset="0x8140" />
-        <DList Name="gLinkGoronRightShinDL" Offset="0x8230" />
-        <DList Name="gLinkGoronRightFootDL" Offset="0x8500" />
-        <DList Name="gLinkGoronLeftThighDL" Offset="0x86A0" />
-        <DList Name="gLinkGoronLeftShinDL" Offset="0x8790" />
-        <DList Name="gLinkGoronLeftFootDL" Offset="0x8A60" />
-        <DList Name="gLinkGoronWaistDL" Offset="0x8C00" />
-        <DList Name="gLinkGoronCollarDL" Offset="0x8C98" />
-        <DList Name="gLinkGoronTorsoDL" Offset="0x8F18" />
-        <DList Name="gLinkGoronHeadDL" Offset="0x91F0" />
-        <DList Name="gLinkGoronHatDL" Offset="0x9898" />
-        <DList Name="gLinkGoronSheathDL" Offset="0x99D8" />
-        <DList Name="gLinkGoronRightShoulderDL" Offset="0x9A98" />
-        <DList Name="gLinkGoronRightForearmDL" Offset="0x9C18" />
-        <DList Name="gLinkGoronRightHandOpenDL" Offset="0x9EF8" />
-        <DList Name="gLinkGoronLeftShoulderDL" Offset="0xA0A0" />
-        <DList Name="gLinkGoronLeftForearmDL" Offset="0xA220" />
-        <DList Name="gLinkGoronLeftHandOpenDL" Offset="0xA500" />
-        <DList Name="gLinkGoronCurledDL" Offset="0xBDD8" />
-        <DList Name="object_link_goron_DL_00C540" Offset="0xC540" /> <!-- Original name is "lg_spike_model" -->
-
-        <Texture Name="object_link_goron_Tex_00C6B8" OutName="tex_00C6B8" Format="ci8" Width="32" Height="64" Offset="0xC6B8" />
-        <Texture Name="object_link_goron_Tex_00CEB8" OutName="tex_00CEB8" Format="rgba16" Width="8" Height="16" Offset="0xCEB8" />
-        <Texture Name="object_link_goron_Tex_00CFB8" OutName="tex_00CFB8" Format="ci8" Width="16" Height="16" Offset="0xCFB8" />
-        <Texture Name="object_link_goron_Tex_00D0B8" OutName="tex_00D0B8" Format="rgba16" Width="16" Height="16" Offset="0xD0B8" />
-        <Texture Name="object_link_goron_Tex_00D2B8" OutName="tex_00D2B8" Format="rgba16" Width="8" Height="16" Offset="0xD2B8" />
-        <Texture Name="object_link_goron_Tex_00D3B8" OutName="tex_00D3B8" Format="rgba16" Width="8" Height="16" Offset="0xD3B8" />
-        <Texture Name="object_link_goron_Tex_00D4B8" OutName="tex_00D4B8" Format="rgba16" Width="16" Height="32" Offset="0xD4B8" />
-        <Texture Name="object_link_goron_Tex_00D8B8" OutName="tex_00D8B8" Format="i8" Width="8" Height="8" Offset="0xD8B8" />
-        <DList Name="gLinkGoronLeftHandClosedDL" Offset="0xDE68" />
-        <Texture Name="object_link_goron_Tex_00E078" OutName="tex_00E078" Format="rgba16" Width="16" Height="16" Offset="0xE078" />
-        <DList Name="gLinkGoronRightHandClosedDL" Offset="0xE7E8" />
-        <DList Name="object_link_goron_DL_00FC18" Offset="0xFC18" />
-        <DList Name="object_link_goron_DL_00FCF0" Offset="0xFCF0" />
-        <DList Name="object_link_goron_DL_00FF18" Offset="0xFF18" />
-        <DList Name="object_link_goron_DL_010140" Offset="0x10140" />
-        <DList Name="object_link_goron_DL_010368" Offset="0x10368" />
-        <DList Name="object_link_goron_DL_010590" Offset="0x10590" />
-        <Texture Name="object_link_goron_TLUT_0107B8" OutName="tlut_0107B8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" />
-        <Texture Name="object_link_goron_Tex_0109B8" OutName="tex_0109B8" Format="ci8" Width="16" Height="16" Offset="0x109B8" />
-        <Texture Name="object_link_goron_Tex_010AB8" OutName="tex_010AB8" Format="ci8" Width="16" Height="8" Offset="0x10AB8" />
-        <Texture Name="object_link_goron_Tex_010B38" OutName="tex_010B38" Format="ci8" Width="16" Height="16" Offset="0x10B38" />
-        <Texture Name="object_link_goron_Tex_010C38" OutName="tex_010C38" Format="ci8" Width="32" Height="32" Offset="0x10C38" />
-        <DList Name="gLinkGoronLeftHandHoldBottleDL" Offset="0x11468" />
-        <Texture Name="object_link_goron_Tex_011628" OutName="tex_011628" Format="ci8" Width="16" Height="16" Offset="0x11628" />
-        <Texture Name="object_link_goron_Tex_011728" OutName="tex_011728" Format="rgba16" Width="8" Height="32" Offset="0x11728" />
-        <DList Name="gLinkGoronGoronPunchEffectDL" Offset="0x11AB8" />
-        <Texture Name="object_link_goron_Tex_011C10" OutName="tex_011C10" Format="i4" Width="32" Height="32" Offset="0x11C10" />
-        <Texture Name="object_link_goron_Tex_011E10" OutName="tex_011E10" Format="i4" Width="64" Height="64" Offset="0x11E10" />
-        <DList Name="object_link_goron_DL_0127B0" Offset="0x127B0" /> <!-- Original name is "grt_01_model" -->
-        <Texture Name="object_link_goron_Tex_012930" OutName="tex_012930" Format="i4" Width="64" Height="64" Offset="0x12930" />
-        <TextureAnimation Name="object_link_goron_Matanimheader_013138" Offset="0x13138" />
-        <DList Name="object_link_goron_DL_0134D0" Offset="0x134D0" /> <!-- Original name is "grt_02_model" -->
-        <Texture Name="object_link_goron_Tex_013660" OutName="tex_013660" Format="i4" Width="64" Height="64" Offset="0x13660" />
-        <Texture Name="object_link_goron_Tex_013E60" OutName="tex_013E60" Format="i4" Width="64" Height="64" Offset="0x13E60" />
-        <TextureAnimation Name="object_link_goron_Matanimheader_014684" Offset="0x14684" />
-        <DList Name="gLinkGoronRollingSpikesAndEffectDL" Offset="0x14690" />
-        <DList Name="object_link_goron_DL_016A88" Offset="0x16A88" />
-        <DList Name="object_link_goron_DL_017180" Offset="0x17180" />
-        <DList Name="object_link_goron_DL_017620" Offset="0x17620" />
-
-        <Limb Name="gLinkGoronShieldingRootLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_ROOT" Offset="0x17778" />
-        <Limb Name="gLinkGoronShieldingBodyLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_BODY" Offset="0x17784" />
-        <Limb Name="gLinkGoronShieldingHeadLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_HEAD" Offset="0x17790" />
-        <Limb Name="gLinkGoronShieldingArmsAndLegsLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_ARMS_AND_LEGS" Offset="0x1779C" />
-        <Skeleton Name="gLinkGoronShieldingSkel" Type="Flex" LimbType="Standard" LimbNone="LINK_GORON_SHIELDING_LIMB_NONE" LimbMax="LINK_GORON_SHIELDING_LIMB_MAX" EnumName="LinkGoronShieldingLimb" Offset="0x177B8" />
-
-        <Animation Name="gLinkGoronShieldingAnim" Offset="0x178D0" /> <!-- Original name is "pg_gurdmotion" -->
-
-        <Limb Name="gLinkGoronRootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_ROOT" Offset="0x178E0" />
-        <Limb Name="gLinkGoronWaistLimb" Type="LOD" EnumName="LINK_GORON_LIMB_WAIST" Offset="0x178F0" />
-        <Limb Name="gLinkGoronLowerRootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LOWER_ROOT" Offset="0x17900" />
-        <Limb Name="gLinkGoronRightThighLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_THIGH" Offset="0x17910" />
-        <Limb Name="gLinkGoronRightShinLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_SHIN" Offset="0x17920" />
-        <Limb Name="gLinkGoronRightFootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_FOOT" Offset="0x17930" />
-        <Limb Name="gLinkGoronLeftThighLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_THIGH" Offset="0x17940" />
-        <Limb Name="gLinkGoronLeftShinLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_SHIN" Offset="0x17950" />
-        <Limb Name="gLinkGoronLeftFootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_FOOT" Offset="0x17960" />
-        <Limb Name="gLinkGoronUpperRootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_UPPER_ROOT" Offset="0x17970" />
-        <Limb Name="gLinkGoronHeadLimb" Type="LOD" EnumName="LINK_GORON_LIMB_HEAD" Offset="0x17980" />
-        <Limb Name="gLinkGoronHatLimb" Type="LOD" EnumName="LINK_GORON_LIMB_HAT" Offset="0x17990" />
-        <Limb Name="gLinkGoronCollarLimb" Type="LOD" EnumName="LINK_GORON_LIMB_COLLAR" Offset="0x179A0" />
-        <Limb Name="gLinkGoronLeftShoulderLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_SHOULDER" Offset="0x179B0" />
-        <Limb Name="gLinkGoronLeftForearmLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_FOREARM" Offset="0x179C0" />
-        <Limb Name="gLinkGoronLeftHandLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_HAND" Offset="0x179D0" />
-        <Limb Name="gLinkGoronRightShoulderLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_SHOULDER" Offset="0x179E0" />
-        <Limb Name="gLinkGoronRightForearmLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_FOREARM" Offset="0x179F0" />
-        <Limb Name="gLinkGoronRightHandLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_HAND" Offset="0x17A00" />
-        <Limb Name="gLinkGoronSheathLimb" Type="LOD" EnumName="LINK_GORON_LIMB_SHEATH" Offset="0x17A10" />
-        <Limb Name="gLinkGoronTorsoLimb" Type="LOD" EnumName="LINK_GORON_LIMB_TORSO" Offset="0x17A20" />
-        <Skeleton Name="gLinkGoronSkel" Type="Flex" LimbType="Standard" LimbNone="LINK_GORON_LIMB_NONE" LimbMax="LINK_GORON_LIMB_MAX" EnumName="LinkGoronLimb" Offset="0x17A84" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_nuts.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_nuts.xml
deleted file mode 100644
index 9247d3db4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_nuts.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<Root>
-    <File Name="object_link_nuts" Segment="6">
-        <DList Name="gLinkDekuRightThighDL" Offset="0x25D0" />
-        <DList Name="gLinkDekuRightShinDL" Offset="0x26D8" />
-        <DList Name="gLinkDekuRightFootDL" Offset="0x27E0" />
-        <DList Name="gLinkDekuLeftThighDL" Offset="0x28F8" />
-        <DList Name="gLinkDekuLeftShinDL" Offset="0x2A00" />
-        <DList Name="gLinkDekuLeftFootDL" Offset="0x2B08" />
-        <DList Name="gLinkDekuWaistDL" Offset="0x2C20" />
-        <DList Name="gLinkDekuCollarDL" Offset="0x2DD8" />
-        <DList Name="gLinkDekuTorsoDL" Offset="0x2E98" />
-        <DList Name="gLinkDekuHeadDL" Offset="0x2FD0" />
-        <DList Name="gLinkDekuHatDL" Offset="0x3488" />
-        <DList Name="gLinkDekuSheathDL" Offset="0x35F0" />
-        <DList Name="gLinkDekuRightShoulderDL" Offset="0x36B0" />
-        <DList Name="gLinkDekuRightForearmDL" Offset="0x37B8" />
-        <DList Name="gLinkDekuRightHandDL" Offset="0x38C0" />
-        <DList Name="gLinkDekuLeftShoulderDL" Offset="0x39B0" />
-        <DList Name="gLinkDekuLeftForearmDL" Offset="0x3AB8" />
-        <DList Name="gLinkDekuLeftHandDL" Offset="0x3BC0" />
-
-        <Texture Name="object_link_nuts_TLUT_003CB0" OutName="tlut_003CB0" Format="rgba16" Width="16" Height="16" Offset="0x3CB0" />
-        <Texture Name="object_link_nuts_TLUT_003EB0" OutName="tlut_003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0" />
-        <Texture Name="object_link_nuts_Tex_0040B0" OutName="tex_0040B0" Format="ci8" Width="16" Height="16" Offset="0x40B0" />
-        <Texture Name="object_link_nuts_Tex_0041B0" OutName="tex_0041B0" Format="ci8" Width="16" Height="16" Offset="0x41B0" />
-        <Texture Name="object_link_nuts_Tex_0042B0" OutName="tex_0042B0" Format="ci8" Width="16" Height="16" Offset="0x42B0" />
-        <Texture Name="object_link_nuts_Tex_0043B0" OutName="tex_0043B0" Format="ci8" Width="16" Height="16" Offset="0x43B0" />
-        <Texture Name="object_link_nuts_Tex_0044B0" OutName="tex_0044B0" Format="ci8" Width="32" Height="32" Offset="0x44B0" />
-        <Texture Name="object_link_nuts_Tex_0048B0" OutName="tex_0048B0" Format="rgba16" Width="64" Height="32" Offset="0x48B0" />
-        <Texture Name="object_link_nuts_Tex_0058B0" OutName="tex_0058B0" Format="ci8" Width="16" Height="16" Offset="0x58B0" />
-        <DList Name="object_link_nuts_DL_007390" Offset="0x7390" />
-        <DList Name="object_link_nuts_DL_007548" Offset="0x7548" />
-        <DList Name="object_link_nuts_DL_0076A0" Offset="0x76A0" />
-        <DList Name="object_link_nuts_DL_0077D0" Offset="0x77D0" />
-        <DList Name="object_link_nuts_DL_007900" Offset="0x7900" />
-        <DList Name="object_link_nuts_DL_007A28" Offset="0x7A28" />
-        <Texture Name="object_link_nuts_Tex_007B80" OutName="tex_007B80" Format="rgba16" Width="16" Height="16" Offset="0x7B80" />
-        <DList Name="object_link_nuts_DL_008660" Offset="0x8660" />
-        <DList Name="object_link_nuts_DL_008760" Offset="0x8760" />
-        <DList Name="object_link_nuts_DL_008860" Offset="0x8860" />
-        <DList Name="object_link_nuts_DL_008908" Offset="0x8908" />
-        <DList Name="object_link_nuts_DL_0089F0" Offset="0x89F0" />
-        <DList Name="gLinkDekuClosedFlowerDL" Offset="0x8AA0" />
-        <DList Name="object_link_nuts_DL_008AB8" Offset="0x8AB8" />
-        <DList Name="object_link_nuts_DL_008BA0" Offset="0x8BA0" />
-        <DList Name="gLinkDekuOpenFlowerDL" Offset="0x8C50" />
-        <Texture Name="object_link_nuts_Tex_008C68" OutName="tex_008C68" Format="rgba16" Width="16" Height="16" Offset="0x8C68" />
-        <Texture Name="object_link_nuts_Tex_008E68" OutName="tex_008E68" Format="rgba16" Width="16" Height="16" Offset="0x8E68" />
-        <Texture Name="object_link_nuts_Tex_009068" OutName="tex_009068" Format="rgba16" Width="8" Height="8" Offset="0x9068" />
-        <DList Name="object_link_nuts_DL_009AB8" Offset="0x9AB8" />
-        <DList Name="object_link_nuts_DL_009C48" Offset="0x9C48" />
-        <DList Name="object_link_nuts_DL_009DB8" Offset="0x9DB8" />
-        <DList Name="object_link_nuts_DL_00A348" Offset="0xA348" />
-        <Texture Name="object_link_nuts_Tex_00A4E0" OutName="tex_00A4E0" Format="rgba16" Width="32" Height="64" Offset="0xA4E0" />
-        <DList Name="object_link_nuts_DL_00B690" Offset="0xB690" />
-        <Texture Name="object_link_nuts_Tex_00B780" OutName="tex_00B780" Format="ci8" Width="16" Height="16" Offset="0xB780" />
-
-        <Limb Name="gLinkDekuRootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_ROOT" Offset="0xB880" />
-        <Limb Name="gLinkDekuWaistLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_WAIST" Offset="0xB890" />
-        <Limb Name="gLinkDekuLowerRootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LOWER_ROOT" Offset="0xB8A0" />
-        <Limb Name="gLinkDekuRightThighLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_THIGH" Offset="0xB8B0" />
-        <Limb Name="gLinkDekuRightShinLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_SHIN" Offset="0xB8C0" />
-        <Limb Name="gLinkDekuRightFootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_FOOT" Offset="0xB8D0" />
-        <Limb Name="gLinkDekuLeftThighLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_THIGH" Offset="0xB8E0" />
-        <Limb Name="gLinkDekuLeftShinLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_SHIN" Offset="0xB8F0" />
-        <Limb Name="gLinkDekuLeftFootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_FOOT" Offset="0xB900" />
-        <Limb Name="gLinkDekuUpperRootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_UPPER_ROOT" Offset="0xB910" />
-        <Limb Name="gLinkDekuHeadLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_HEAD" Offset="0xB920" />
-        <Limb Name="gLinkDekuHatLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_HAT" Offset="0xB930" />
-        <Limb Name="gLinkDekuCollarLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_COLLAR" Offset="0xB940" />
-        <Limb Name="gLinkDekuLeftShoulderLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_SHOULDER" Offset="0xB950" />
-        <Limb Name="gLinkDekuLeftForearmLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_FOREARM" Offset="0xB960" />
-        <Limb Name="gLinkDekuLeftHandLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_HAND" Offset="0xB970" />
-        <Limb Name="gLinkDekuRightShoulderLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_SHOULDER" Offset="0xB980" />
-        <Limb Name="gLinkDekuRightForearmLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_FOREARM" Offset="0xB990" />
-        <Limb Name="gLinkDekuRightHandLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_HAND" Offset="0xB9A0" />
-        <Limb Name="gLinkDekuSheathLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_SHEATH" Offset="0xB9B0" />
-        <Limb Name="gLinkDekuTorsoLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_TORSO" Offset="0xB9C0" />
-        <Skeleton Name="gLinkDekuSkel" Type="Flex" LimbType="LOD" LimbNone="LINK_DEKU_LIMB_NONE" LimbMax="LINK_DEKU_LIMB_MAX" EnumName="LinkDekuLimb" Offset="0xBA24" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_zora.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_zora.xml
deleted file mode 100644
index be4c54274..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_link_zora.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<Root>
-    <File Name="object_link_zora" Segment="6">
-        <Texture Name="gLinkZoraEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x800" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesClosedTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesRollUpTex" OutName="eyes_roll_up" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraEyesRollDownTex" OutName="eyes_roll_down" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5200" />
-        <Texture Name="object_link_zora_Tex_003800" OutName="tex_003800" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5200" />
-
-        <Texture Name="gLinkZoraMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5200" />
-        <Texture Name="object_link_zora_Tex_004400" OutName="tex_004400" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5200" />
-        <Texture Name="gLinkZoraMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5200" />
-
-        <Texture Name="object_link_zora_TLUT_005000" OutName="tlut_005000" Format="rgba16" Width="16" Height="16" Offset="0x5000" />
-        <Texture Name="gLinkZoraSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5200" />
-
-        <Texture Name="object_link_zora_Tex_005400" OutName="tex_005400" Format="ci8" Width="32" Height="32" Offset="0x5400" />
-        <Texture Name="object_link_zora_Tex_005800" OutName="tex_005800" Format="ci8" Width="16" Height="16" Offset="0x5800" />
-        <Texture Name="object_link_zora_Tex_005900" OutName="tex_005900" Format="ci8" Width="16" Height="16" Offset="0x5900" />
-        <Texture Name="object_link_zora_Tex_005A00" OutName="tex_005A00" Format="ci8" Width="8" Height="16" Offset="0x5A00" />
-        <Texture Name="object_link_zora_Tex_005A80" OutName="tex_005A80" Format="ci8" Width="8" Height="16" Offset="0x5A80" />
-        <Texture Name="object_link_zora_Tex_005B00" OutName="tex_005B00" Format="ci8" Width="32" Height="16" Offset="0x5B00" />
-        <Texture Name="object_link_zora_Tex_005D00" OutName="tex_005D00" Format="ci8" Width="16" Height="32" Offset="0x5D00" />
-        <Texture Name="object_link_zora_Tex_005F00" OutName="tex_005F00" Format="ci8" Width="16" Height="16" Offset="0x5F00" />
-        <Texture Name="object_link_zora_Tex_006000" OutName="tex_006000" Format="ci8" Width="16" Height="16" Offset="0x6000" />
-        <Texture Name="object_link_zora_Tex_006100" OutName="tex_006100" Format="ci8" Width="8" Height="16" Offset="0x6100" />
-        <Texture Name="object_link_zora_Tex_006180" OutName="tex_006180" Format="ci8" Width="8" Height="8" Offset="0x6180" />
-        <Texture Name="object_link_zora_Tex_0061C0" OutName="tex_0061C0" Format="ci8" Width="16" Height="16" Offset="0x61C0" />
-
-        <DList Name="gLinkZoraRightThighDL" Offset="0x9E00" />
-        <DList Name="gLinkZoraRightShinDL" Offset="0xA108" />
-        <DList Name="gLinkZoraRightFootDL" Offset="0xA370" />
-        <DList Name="gLinkZoraLeftThighDL" Offset="0xA4A0" />
-        <DList Name="gLinkZoraLeftShinDL" Offset="0xA7A8" />
-        <DList Name="gLinkZoraLeftFootDL" Offset="0xAA10" />
-        <DList Name="gLinkZoraWaistDL" Offset="0xAB40" />
-        <DList Name="gLinkZoraCollarDL" Offset="0xAD38" />
-        <DList Name="gLinkZoraTorsoDL" Offset="0xADF0" />
-        <DList Name="gLinkZoraHeadDL" Offset="0xB170" />
-        <DList Name="gLinkZoraHatDL" Offset="0xB630" />
-        <DList Name="gLinkZoraSheathDL" Offset="0xB768" />
-        <DList Name="gLinkZoraRightShoulderDL" Offset="0xB820" />
-        <DList Name="gLinkZoraRightForearmDL" Offset="0xB990" />
-        <DList Name="gLinkZoraRightHandClosedDL" Offset="0xBBE0" />
-        <DList Name="gLinkZoraLeftShoulderDL" Offset="0xBEE8" />
-        <DList Name="gLinkZoraLeftForearmDL" Offset="0xC020" />
-        <DList Name="gLinkZoraLeftHandClosedDL" Offset="0xC270" />
-
-        <Texture Name="object_link_zora_TLUT_00C578" OutName="tlut_00C578" Format="rgba16" Width="16" Height="16" Offset="0xC578" />
-        <Texture Name="object_link_zora_Tex_00C778" OutName="tex_00C778" Format="ci8" Width="16" Height="32" Offset="0xC778" />
-        <Texture Name="object_link_zora_Tex_00C978" OutName="tex_00C978" Format="ci8" Width="16" Height="16" Offset="0xC978" />
-        <DList Name="object_link_zora_DL_00CC38" Offset="0xCC38" />
-        <DList Name="object_link_zora_DL_00CDA0" Offset="0xCDA0" />
-        <DList Name="object_link_zora_DL_00E088" Offset="0xE088" />
-        <DList Name="object_link_zora_DL_00E2A0" Offset="0xE2A0" />
-        <Texture Name="object_link_zora_Tex_00E678" OutName="tex_00E678" Format="ci8" Width="16" Height="16" Offset="0xE678" />
-        <Texture Name="object_link_zora_Tex_00E778" OutName="tex_00E778" Format="ci8" Width="16" Height="16" Offset="0xE778" />
-        <Texture Name="object_link_zora_Tex_00E878" OutName="tex_00E878" Format="ci8" Width="8" Height="16" Offset="0xE878" />
-        <Texture Name="object_link_zora_Tex_00E8F8" OutName="tex_00E8F8" Format="rgba16" Width="16" Height="16" Offset="0xE8F8" />
-        <Texture Name="object_link_zora_Tex_00EAF8" OutName="tex_00EAF8" Format="rgba16" Width="16" Height="16" Offset="0xEAF8" />
-        <Texture Name="object_link_zora_Tex_00ECF8" OutName="tex_00ECF8" Format="rgba16" Width="16" Height="16" Offset="0xECF8" />
-        <Texture Name="object_link_zora_Tex_00EEF8" OutName="tex_00EEF8" Format="rgba16" Width="16" Height="32" Offset="0xEEF8" />
-        <Texture Name="object_link_zora_Tex_00F2F8" OutName="tex_00F2F8" Format="rgba16" Width="16" Height="32" Offset="0xF2F8" />
-        <DList Name="gLinkZoraRightHandOpenDL" Offset="0xFBB8" />
-        <DList Name="gLinkZoraLeftHandOpenDL" Offset="0xFDF0" />
-        <Texture Name="object_link_zora_Tex_010028" OutName="tex_010028" Format="rgba16" Width="16" Height="16" Offset="0x10028" />
-        <Texture Name="object_link_zora_Tex_010228" OutName="tex_010228" Format="rgba16" Width="16" Height="32" Offset="0x10228" />
-        <DList Name="object_link_zora_DL_010868" Offset="0x10868" />
-        <DList Name="object_link_zora_DL_010978" Offset="0x10978" />
-        <DList Name="gLinkZoraLeftHandHoldBottleDL" Offset="0x10D08" />
-        <DList Name="object_link_zora_DL_0110A8" Offset="0x110A8" />
-
-        <Array Name="object_link_zora_Vtx_011210" Count="80" Offset="0x011210">
-            <Vtx/>
-        </Array>
-        <Array Name="object_link_zora_U8_011710" Count="80" Offset="0x011710">
-            <Scalar Type="x8"/>
-        </Array>
-
-        <DList Name="object_link_zora_DL_011760" Offset="0x11760" /> <!-- Original name is "zora_thunder_modelT" -->
-        <DList Name="object_link_zora_DL_011A58" Offset="0x11A58" />
-        <Texture Name="object_link_zora_Tex_011A60" OutName="tex_011A60" Format="i8" Width="64" Height="32" Offset="0x11A60" />
-        <Texture Name="object_link_zora_Tex_012260" OutName="tex_012260" Format="i8" Width="32" Height="64" Offset="0x12260" />
-
-        <TextureAnimation Name="object_link_zora_Matanimheader_012A68" Offset="0x12A68" />
-        <TextureAnimation Name="object_link_zora_Matanimheader_012A80" Offset="0x12A80" />
-
-        <Limb Name="gLinkZoraRootLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_ROOT" Offset="0x12A90" />
-        <Limb Name="gLinkZoraWaistLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_WAIST" Offset="0x12AA0" />
-        <Limb Name="gLinkZoraLowerRootLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LOWER_ROOT" Offset="0x12AB0" />
-        <Limb Name="gLinkZoraRightThighLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_THIGH" Offset="0x12AC0" />
-        <Limb Name="gLinkZoraRightShinLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_SHIN" Offset="0x12AD0" />
-        <Limb Name="gLinkZoraRightFootLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_FOOT" Offset="0x12AE0" />
-        <Limb Name="gLinkZoraLeftThighLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_THIGH" Offset="0x12AF0" />
-        <Limb Name="gLinkZoraLeftShinLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_SHIN" Offset="0x12B00" />
-        <Limb Name="gLinkZoraLeftFootLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_FOOT" Offset="0x12B10" />
-        <Limb Name="gLinkZoraUpperRootLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_UPPER_ROOT" Offset="0x12B20" />
-        <Limb Name="gLinkZoraHeadLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_HEAD" Offset="0x12B30" />
-        <Limb Name="gLinkZoraHatLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_HAT" Offset="0x12B40" />
-        <Limb Name="gLinkZoraCollarLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_COLLAR" Offset="0x12B50" />
-        <Limb Name="gLinkZoraLeftShoulderLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_SHOULDER" Offset="0x12B60" />
-        <Limb Name="gLinkZoraLeftForearmLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_FOREARM" Offset="0x12B70" />
-        <Limb Name="gLinkZoraLeftHandLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_LEFT_HAND" Offset="0x12B80" />
-        <Limb Name="gLinkZoraRightShoulderLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_SHOULDER" Offset="0x12B90" />
-        <Limb Name="gLinkZoraRightForearmLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_FOREARM" Offset="0x12BA0" />
-        <Limb Name="gLinkZoraRightHandLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_RIGHT_HAND" Offset="0x12BB0" />
-        <Limb Name="gLinkZoraSheathLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_SHEATH" Offset="0x12BC0" />
-        <Limb Name="gLinkZoraTorsoLimb" Type="LOD" EnumName="LINK_ZORA_LIMB_TORSO" Offset="0x12BD0" />
-        <Skeleton Name="gLinkZoraSkel" Type="Flex" LimbType="LOD" LimbNone="LINK_ZORA_LIMB_NONE" LimbMax="LINK_ZORA_LIMB_MAX" EnumName="LinkZoraLimb" Offset="0x12C34" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lodmoon.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lodmoon.xml
deleted file mode 100644
index 0756c3300..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lodmoon.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Low detail version of the moon used during gameplay (except in Termina Field) -->
-    <File Name="object_lodmoon" Segment="6">
-        <DList Name="gLodmoonEyesDL" Offset="0x10E0" />
-        <DList Name="gLodmoonMoonDL" Offset="0x1158" />
-        <Texture Name="gLodmoonFaceTLUT" OutName="lodmoon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x15D8" />
-        <Texture Name="gLodmoonFarSideTLUT" OutName="lodmoon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x15F8" />
-        <Texture Name="gLodmoonEyesTex" OutName="lodmoon_eyes" Format="rgba16" Width="32" Height="32" Offset="0x1618" />
-        <Texture Name="gLodmoonTeethTex" OutName="lodmoon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x1E18" />
-        <Texture Name="gLodmoonFaceTex" OutName="lodmoon_face" Format="ci4" Width="64" Height="64" Offset="0x2E18" />
-        <Texture Name="gLodmoonFarSideTex" OutName="lodmoon_far_side" Format="ci4" Width="64" Height="64" Offset="0x3618" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lotus.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lotus.xml
deleted file mode 100644
index 923218811..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_lotus.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Assets for Lily Pads -->
-    <File Name="object_lotus" Segment="6">
-        <DList Name="gLilyPadDL" Offset="0x40" /> <!-- Original name is "z2_hasu_model" ("lotus​") -->
-        <Texture Name="gLilyPadTLUT" OutName="lily_pad_tlut" Format="rgba16" Width="4" Height="4" Offset="0x100" />
-        <Texture Name="gLilyPadTex" OutName="lily_pad" Format="ci4" Width="64" Height="64" Offset="0x120" />
-        <Collision Name="gLilyPadCol" Offset="0xA20" /> <!-- Original name is "z2_hasu_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ma1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ma1.xml
deleted file mode 100644
index b0b1435bc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ma1.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<Root>
-    <!-- Assets for Romani -->
-    <File Name="object_ma1" Segment="6">
-        <!-- Romani's Bow DisplayList and Textures -->
-        <DList Name="gRomaniBowDL" Offset="0x3B0" />
-        <Texture Name="gRomaniBowTLUT" OutName="romani_bow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5E0" />
-        <Texture Name="gRomaniBowHandleTex" OutName="romani_bow_handle" Format="ci8" Width="16" Height="16" Offset="0x7E0" />
-        <Texture Name="gRomaniBowLimbTex" OutName="romani_bow_limb" Format="ci8" Width="8" Height="8" Offset="0x8E0" />
-        
-        <!-- Romani's Wooden Box DisplayList and Textures. She sits on it after being abducted by the aliens. -->
-        <DList Name="gRomaniWoodenBoxDL" Offset="0xA20" />
-        <Texture Name="gRomaniWoodenBoxTex" OutName="romani_wooden_box" Format="rgba16" Width="32" Height="64" Offset="0xAD0" />
-
-        <!-- Romani Animation -->
-        <Animation Name="gRomaniLookAroundAnim" Offset="0x2A8C" /> <!-- Original name is "rm_kyoro" (onomatopoeic for "looking around restlessly") -->
-
-        <!-- Romani Sleeping DisplayList and Textures -->
-        <DList Name="gRomaniSleepingDL" Offset="0x43A0" />
-        <Texture Name="gRomaniSleepingTLUT" OutName="romani_sleeping_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4CF8" />
-        <Texture Name="gRomaniSleepingDressTex" OutName="romani_sleeping_dress" Format="ci8" Width="16" Height="16" Offset="0x4EF8" />
-        <Texture Name="gRomaniSleepingSkinTex" OutName="romani_sleeping_skin" Format="ci8" Width="8" Height="8" Offset="0x4FF8" />
-        <Texture Name="gRomaniSleepingEarTex" OutName="romani_sleeping_ear" Format="ci8" Width="8" Height="8" Offset="0x5038" />
-        <Texture Name="gRomaniSleepingHairTex" OutName="romani_sleeping_hair" Format="ci8" Width="16" Height="16" Offset="0x5078" />
-        <Texture Name="gRomaniSleepingHandTex" OutName="romani_sleeping_hand" Format="ci8" Width="16" Height="16" Offset="0x5178" />
-        <Texture Name="gRomaniSleepingDressPatternAndPillowTex" OutName="romani_sleeping_dress_pattern_and_pillow" Format="ci8" Width="8" Height="16" Offset="0x5278" />
-        <Texture Name="gRomaniSleepingEyeTex" OutName="romani_sleeping_eye" Format="rgba16" Width="32" Height="32" Offset="0x52F8" />
-        <Texture Name="gRomaniSleepingBlanketTex" OutName="romani_sleeping_blanket" Format="rgba16" Width="16" Height="128" Offset="0x5AF8" />
-        <Texture Name="gRomaniSleepingMouthTex" OutName="romani_sleeping_mouth" Format="rgba16" Width="32" Height="16" Offset="0x6AF8" />
-
-        <!-- Romani Animations -->
-        <Animation Name="gRomaniRunAnim" Offset="0x7328" /> <!-- Original anme is "rm_run" -->
-        <Animation Name="gRomaniSittingAnim" Offset="0x7D98" /> <!-- Original name is "rm_swari" ("sitting") -->
-        <Animation Name="gRomaniSittingHeadShakeAnim" Offset="0x852C" /> <!-- Original name is "rm_swariatamafuri" ("sitting head shake") -->
-        <Animation Name="gRomaniSittingLookDownAnim" Offset="0x8F6C" /> <!-- Original name is "rm_swariutumuku" ("sitting" and "to hang one's head") -->
-        <Animation Name="gRomaniIdleAnim" Offset="0x9E58" /> <!-- Original name is "rm_wait" -->
-
-        <!-- Romani Limb DisplayLists -->
-        <DList Name="gRomaniTorsoDL" Offset="0xD060" />
-        <DList Name="gRomaniRightUpperArmDL" Offset="0xD440" />
-        <DList Name="gRomaniRightForearmDL" Offset="0xD688" />
-        <DList Name="gRomaniRightHandDL" Offset="0xD7A0" />
-        <DList Name="gRomaniLeftUpperArmDL" Offset="0xD980" />
-        <DList Name="gRomaniLeftForearmDL" Offset="0xDBC8" />
-        <DList Name="gRomaniLeftHandDL" Offset="0xDCE0" />
-        <DList Name="gRomaniHeadDL" Offset="0xDEC0" />
-        <DList Name="gRomaniUpperHairDL" Offset="0xE410" />
-        <DList Name="gRomaniLowerHairDL" Offset="0xE510" />
-        <DList Name="gRomaniDress1DL" Offset="0xE618" />
-        <DList Name="gRomaniDress2DL" Offset="0xE710" />
-        <DList Name="gRomaniDress3DL" Offset="0xE838" />
-        <DList Name="gRomaniDress4DL" Offset="0xE980" />
-        <DList Name="gRomaniPelvisDL" Offset="0xEA80" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gRomaniRightThighDL" Offset="0xEAC8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gRomaniRightShinDL" Offset="0xEB88" />
-        <DList Name="gRomaniRightFootDL" Offset="0xED08" />
-        <DList Name="gRomaniLeftThighDL" Offset="0xEE28" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gRomaniLeftShinDL" Offset="0xEEE8" />
-        <DList Name="gRomaniLeftFootDL" Offset="0xF068" />
-        
-        <!-- Romani Textures -->
-        <Texture Name="gRomaniTLUT" OutName="romani_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF188" />
-        <Texture Name="gRomaniDressTex" OutName="romani_dress" Format="ci8" Width="16" Height="16" Offset="0xF388" />
-        <Texture Name="gRomaniSkinTex" OutName="romani_skin" Format="ci8" Width="8" Height="8" Offset="0xF488" />
-        <Texture Name="gRomaniEarTex" OutName="romani_ear" Format="ci8" Width="8" Height="8" Offset="0xF4C8" />
-        <Texture Name="gRomaniHairTex" OutName="romani_hair" Format="ci8" Width="16" Height="16" Offset="0xF508" />
-        <Texture Name="gRomaniShawlTex" OutName="romani_shawl" Format="ci8" Width="8" Height="8" Offset="0xF608" />
-        <Texture Name="gRomaniBroochTex" OutName="romani_brooch" Format="rgba16" Width="16" Height="32" Offset="0xF648" />
-        <Texture Name="gRomaniHandTex" OutName="romani_hand" Format="ci8" Width="16" Height="16" Offset="0xFA48" />
-        <Texture Name="gRomaniBootTex" OutName="romani_boot" Format="ci8" Width="64" Height="16" Offset="0xFB48" />
-        <Texture Name="gRomaniDressPatternTex" OutName="romani_dress_pattern" Format="ci8" Width="8" Height="16" Offset="0xFF48" />
-        <Texture Name="gRomaniEyeOpenTex" OutName="romani_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" />
-        <Texture Name="gRomaniEyeHalfTex" OutName="romani_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x107C8" />
-        <Texture Name="gRomaniEyeClosedTex" OutName="romani_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x10FC8" />
-        <Texture Name="gRomaniEyeHappyTex" OutName="romani_eye_happy" Format="rgba16" Width="32" Height="32" Offset="0x117C8" />
-        <Texture Name="gRomaniEyeSadTex" OutName="romani_eye_sad" Format="rgba16" Width="32" Height="32" Offset="0x11FC8" />
-        <Texture Name="gRomaniMouthHappyTex" OutName="romani_mouth_happy" Format="rgba16" Width="32" Height="16" Offset="0x127C8" />
-        <Texture Name="gRomaniMouthFrownTex" OutName="romani_mouth_frown" Format="rgba16" Width="32" Height="16" Offset="0x12BC8" />
-        <Texture Name="gRomaniMouthHangingOpenTex" OutName="romani_mouth_hanging_open" Format="rgba16" Width="32" Height="16" Offset="0x12FC8" />
-        <Texture Name="gRomaniMouthSmileTex" OutName="romani_mouth_smile" Format="rgba16" Width="32" Height="16" Offset="0x133C8" />
-
-        <!-- Romani Limbs -->
-        <Limb Name="gRomaniRootLimb" Type="Standard" EnumName="ROMANI_LIMB_ROOT" Offset="0x137C8" />
-        <Limb Name="gRomaniPelvisLimb" Type="Standard" EnumName="ROMANI_LIMB_PELVIS" Offset="0x137D4" />
-        <Limb Name="gRomaniLeftThighLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_THIGH" Offset="0x137E0" />
-        <Limb Name="gRomaniLeftShinLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_SHIN" Offset="0x137EC" />
-        <Limb Name="gRomaniLeftFootLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_FOOT" Offset="0x137F8" />
-        <Limb Name="gRomaniRightThighLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_THIGH" Offset="0x13804" />
-        <Limb Name="gRomaniRightShinLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_SHIN" Offset="0x13810" />
-        <Limb Name="gRomaniRightFootLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_FOOT" Offset="0x1381C" />
-        <Limb Name="gRomaniDress1Limb" Type="Standard" EnumName="ROMANI_LIMB_DRESS_1" Offset="0x13828" />
-        <Limb Name="gRomaniDress2Limb" Type="Standard" EnumName="ROMANI_LIMB_DRESS_2" Offset="0x13834" />
-        <Limb Name="gRomaniDress3Limb" Type="Standard" EnumName="ROMANI_LIMB_DRESS_3" Offset="0x13840" />
-        <Limb Name="gRomaniDress4Limb" Type="Standard" EnumName="ROMANI_LIMB_DRESS_4" Offset="0x1384C" />
-        <Limb Name="gRomaniTorsoLimb" Type="Standard" EnumName="ROMANI_LIMB_TORSO" Offset="0x13858" />
-        <Limb Name="gRomaniHeadLimb" Type="Standard" EnumName="ROMANI_LIMB_HEAD" Offset="0x13864" />
-        <Limb Name="gRomaniUpperHairLimb" Type="Standard" EnumName="ROMANI_LIMB_UPPER_HAIR" Offset="0x13870" />
-        <Limb Name="gRomaniLowerHairLimb" Type="Standard" EnumName="ROMANI_LIMB_LOWER_HAIR" Offset="0x1387C" />
-        <Limb Name="gRomaniLeftUpperArmLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_UPPER_ARM" Offset="0x13888" />
-        <Limb Name="gRomaniLeftForearmLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_FOREARM" Offset="0x13894" />
-        <Limb Name="gRomaniLeftHandLimb" Type="Standard" EnumName="ROMANI_LIMB_LEFT_HAND" Offset="0x138A0" />
-        <Limb Name="gRomaniRightUpperArmLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_UPPER_ARM" Offset="0x138AC" />
-        <Limb Name="gRomaniRightForearmLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_FOREARM" Offset="0x138B8" />
-        <Limb Name="gRomaniRightHandLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_HAND" Offset="0x138C4" />
-
-        <!-- Romani Skeleton -->
-        <Skeleton Name="gRomaniSkel" Type="Flex" LimbType="Standard" LimbNone="ROMANI_LIMB_NONE" LimbMax="ROMANI_LIMB_MAX" EnumName="RomaniLimb" Offset="0x13928" />
-
-        <!-- Romani Animations -->
-        <Animation Name="gRomaniWalkAnim" Offset="0x14088" /> <!-- Original name is "rm_walk" -->
-        <Animation Name="gRomaniShootBowAnim" Offset="0x15B7C" /> <!-- Original name is "rm_yumiuti" ("shooting a bow") -->
-        <Animation Name="gRomaniAbductedAnim" Offset="0x16588" /> <!-- Original name is "romani_capture_loop" -->
-        <Animation Name="gRomaniTurnAroundAndFlickHairAnim" Offset="0x180DC" /> <!-- Original name is "romani_furimuki" ("to turn around") -->
-        <Animation Name="gRomaniSingStartAnim" Offset="0x18948" /> <!-- Original name is "romani_utau" ("sing") -->
-        <Animation Name="gRomaniSingLoopAnim" Offset="0x1B76C" /> <!-- Original name is "romani_utau_loop" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ma2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ma2.xml
deleted file mode 100644
index 0d528b37b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ma2.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<Root>
-    <!-- Assets for Cremia -->
-    <File Name="object_ma2" Segment="6">
-        <!-- Cremia Animations -->
-        <Animation Name="gCremiaSpreadArmsLoopAnim" Offset="0xCC0" /> <!-- Original name is "kl_aogu" ("to look up") -->
-        <Animation Name="gCremiaHugStartAnim" Offset="0x1FD0" /> <!-- Original name is "kl_dakisime" ("to hug someone close") -->
-        <Animation Name="gCremiaHugLoopAnim" Offset="0x30B4" /> <!-- Original name is "kl_dakisime_loop" -->
-        <Animation Name="gCremiaSittingLookDownAnim" Offset="0x3D54" /> <!-- Original name is "kl_gakkurisuwari" ("heartbroken" + "sitting") -->
-        <Animation Name="gCremiaClapAnim" Offset="0x4370" /> <!-- Original name is "kl_hakusyu_loop" ("applause") -->
-        <Animation Name="gCremiaThinkAnim" Offset="0x5314" /> <!-- Original name is "kl_kangaeru" ("thinking/contemplating") -->
-
-        <!-- Cremia's Wooden Box DisplayList and Textures. She sits on it when petting the cows in the barn. -->
-        <DList Name="gCremiaWoodenBoxDL" Offset="0x5430" />
-        <Texture Name="gCremiaWoodenBoxTex" OutName="cremia_wooden_box" Format="rgba16" Width="32" Height="64" Offset="0x54E0" />
-
-        <!-- Cremia Animations -->
-        <Animation Name="gCremiaSittingAnim" Offset="0x70EC" /> <!-- Original name is "kl_suwari" ("sitting") -->
-        <Animation Name="gCremiaSittingPetCowAnim" Offset="0x7E28" /> <!-- Original name is "kl_usinades" ("cow" + "stroke" + first letter of "sitting"?) -->
-        <Animation Name="gCremiaPetCowAnim" Offset="0x93E8" /> <!-- Original name is "kl_usinadet" -->
-        <Animation Name="gCremiaIdleAnim" Offset="0xA174" /> <!-- Original name is "kl_wait" -->
-        <Animation Name="gCremiaSpreadArmsStartAnim" Offset="0xAF7C" /> <!-- Original name is "kl_wait2aogu" -->
-
-        <!-- Cremia Limb DisplayLists -->
-        <DList Name="gCremiaDress1DL" Offset="0xE170" />
-        <DList Name="gCremiaDress2DL" Offset="0xE370" />
-        <DList Name="gCremiaDress3DL" Offset="0xE4E0" />
-        <DList Name="gCremiaDress4DL" Offset="0xE6E8" />
-        <DList Name="gCremiaPelvisDL" Offset="0xE7F0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCremiaRightThighDL" Offset="0xE8B0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCremiaRightShinDL" Offset="0xE940" />
-        <DList Name="gCremiaRightFootDL" Offset="0xEA20" />
-        <DList Name="gCremiaLeftThighDL" Offset="0xEB30" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gCremiaLeftShinDL" Offset="0xEBC0" />
-        <DList Name="gCremiaLeftFootDL" Offset="0xECA0" />
-        <DList Name="gCremiaTorsoDL" Offset="0xEDB0" />
-        <DList Name="gCremiaHeadDL" Offset="0xF108" />
-        <DList Name="gCremiaHairEndDL" Offset="0xF5A0" />
-        <DList Name="gCremiaRightUpperArmDL" Offset="0xF6E8" />
-        <DList Name="gCremiaRightForearmDL" Offset="0xF8F8" />
-        <DList Name="gCremiaRightHandDL" Offset="0xF9E0" />
-        <DList Name="gCremiaLeftUpperArmDL" Offset="0xFBA8" />
-        <DList Name="gCremiaLeftForearmDL" Offset="0xFDB0" />
-        <DList Name="gCremiaLeftHandDL" Offset="0xFE98" />
-
-        <!-- Cremia Textures -->
-        <Texture Name="gCremiaTLUT" OutName="cremia_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10018" />
-        <Texture Name="gCremiaSkinArmsTex" OutName="cremia_skin_arms" Format="rgba16" Width="8" Height="8" Offset="0x10218" />
-        <Texture Name="gCremiaSkinHeadTex" OutName="cremia_skin_head" Format="rgba16" Width="8" Height="8" Offset="0x10298" />
-        <Texture Name="gCremiaBootTex" OutName="cremia_boot" Format="ci8" Width="64" Height="16" Offset="0x10318" />
-        <Texture Name="gCremiaEarTex" OutName="cremia_ear" Format="rgba16" Width="16" Height="16" Offset="0x10718" />
-        <Texture Name="gCremiaHairTex" OutName="cremia_hair" Format="ci8" Width="16" Height="16" Offset="0x10918" />
-        <Texture Name="gCremiaShawlTex" OutName="cremia_shawl" Format="ci8" Width="8" Height="8" Offset="0x10A18" />
-        <Texture Name="gCremiaBroochTex" OutName="cremia_brooch" Format="rgba16" Width="16" Height="32" Offset="0x10A58" />
-        <Texture Name="gCremiaShirtTex" OutName="cremia_shirt" Format="ci8" Width="16" Height="16" Offset="0x10E58" />
-        <Texture Name="gCremiaSleevesTex" OutName="cremia_sleeves" Format="ci8" Width="8" Height="16" Offset="0x10F58" />
-        <Texture Name="gCremiaBeltTex" OutName="cremia_belt" Format="ci8" Width="32" Height="16" Offset="0x10FD8" />
-        <Texture Name="gCremiaDressPatternTex" OutName="cremia_dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x111D8" />
-        <Texture Name="gCremiaDressTex" OutName="cremia_dress" Format="ci8" Width="16" Height="16" Offset="0x113D8" />
-        <Texture Name="gCremiaApronTex" OutName="cremia_apron" Format="rgba16" Width="16" Height="32" Offset="0x114D8" />
-        <Texture Name="gCremiaHandTex" OutName="cremia_hand" Format="rgba16" Width="16" Height="16" Offset="0x118D8" />
-        <Texture Name="gCremiaEyeOpenTex" OutName="cremia_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x11AD8" />
-        <Texture Name="gCremiaEyeHalfTex" OutName="cremia_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x122D8" />
-        <Texture Name="gCremiaEyeClosedTex" OutName="cremia_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x12AD8" />
-        <Texture Name="gCremiaEyeHappyTex" OutName="cremia_eye_happy" Format="rgba16" Width="32" Height="32" Offset="0x132D8" />
-        <Texture Name="gCremiaEyeAngryTex" OutName="cremia_eye_angry" Format="rgba16" Width="32" Height="32" Offset="0x13AD8" />
-        <Texture Name="gCremiaEyeSadTex" OutName="cremia_eye_sad" Format="rgba16" Width="32" Height="32" Offset="0x142D8" />
-        <Texture Name="gCremiaMouthNormalTex" OutName="cremia_mouth_normal" Format="rgba16" Width="32" Height="16" Offset="0x14AD8" />
-        <Texture Name="gCremiaMouthSlightSmileTex" OutName="cremia_mouth_slight_smile" Format="rgba16" Width="32" Height="16" Offset="0x14ED8" />
-        <Texture Name="gCremiaMouthFrownTex" OutName="cremia_mouth_frown" Format="rgba16" Width="32" Height="16" Offset="0x152D8" />
-        <Texture Name="gCremiaMouthHangingOpenTex" OutName="cremia_mouth_hanging_open" Format="rgba16" Width="32" Height="16" Offset="0x156D8" />
-        
-        <!-- Cremia Limbs -->
-        <Limb Name="gCremiaRootLimb" Type="Standard" EnumName="CREMIA_LIMB_ROOT" Offset="0x15AD8" />
-        <Limb Name="gCremiaTorsoLimb" Type="Standard" EnumName="CREMIA_LIMB_TORSO" Offset="0x15AE4" />
-        <Limb Name="gCremiaLeftUpperArmLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_UPPER_ARM" Offset="0x15AF0" />
-        <Limb Name="gCremiaLeftForearmLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_FOREARM" Offset="0x15AFC" />
-        <Limb Name="gCremiaLeftHandLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_HAND" Offset="0x15B08" />
-        <Limb Name="gCremiaRightUpperArmLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_UPPER_ARM" Offset="0x15B14" />
-        <Limb Name="gCremiaRightForearmLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_FOREARM" Offset="0x15B20" />
-        <Limb Name="gCremiaRightHandLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_HAND" Offset="0x15B2C" />
-        <Limb Name="gCremiaHeadLimb" Type="Standard" EnumName="CREMIA_LIMB_HEAD" Offset="0x15B38" />
-        <Limb Name="gCremiaHairEndLimb" Type="Standard" EnumName="CREMIA_LIMB_HAIR_END" Offset="0x15B44" />
-        <Limb Name="gCremiaPelvisLimb" Type="Standard" EnumName="CREMIA_LIMB_PELVIS" Offset="0x15B50" />
-        <Limb Name="gCremiaLeftThighLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_THIGH" Offset="0x15B5C" />
-        <Limb Name="gCremiaLeftShinLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_SHIN" Offset="0x15B68" />
-        <Limb Name="gCremiaLeftFootLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_FOOT" Offset="0x15B74" />
-        <Limb Name="gCremiaRightThighLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_THIGH" Offset="0x15B80" />
-        <Limb Name="gCremiaRightShinLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_SHIN" Offset="0x15B8C" />
-        <Limb Name="gCremiaRightFootLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_FOOT" Offset="0x15B98" />
-        <Limb Name="gCremiaDress1Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_1" Offset="0x15BA4" />
-        <Limb Name="gCremiaDress2Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_2" Offset="0x15BB0" />
-        <Limb Name="gCremiaDress3Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_3" Offset="0x15BBC" />
-        <Limb Name="gCremiaDress4Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_4" Offset="0x15BC8" />
-        
-        <!-- Cremia Skeleton -->
-        <Skeleton Name="gCremiaSkel" Type="Flex" LimbType="Standard" LimbNone="CREMIA_LIMB_NONE" LimbMax="CREMIA_LIMB_MAX" EnumName="CremiaLimb" Offset="0x15C28" />
-
-        <!-- Cremia Animation -->
-        <Animation Name="gCremiaWalkAnim" Offset="0x16720" /> <!-- Original name is "kl_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mag.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mag.xml
deleted file mode 100644
index 29d30daad..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mag.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Root>
-    <!-- Textures for the title screen -->
-    <File Name="object_mag" Segment="6">
-        <Texture Name="gTitleScreenZeldaLogoTex" OutName="title_screen_zelda_logo" Format="rgba32" Width="144" Height="64" Offset="0x0"/>
-        <Texture Name="gTitleScreenMajorasMaskSubtitleTex" OutName="title_screen_majoras_mask_subtitle" Format="i8" Width="104" Height="16" Offset="0x9000"/>
-        <Texture Name="gTitleScreenMajorasMaskSubtitleMaskTex" OutName="title_screen_majoras_mask_subtitle_mask" Format="i8" Width="104" Height="16" Offset="0x9680"/><!-- Masking the flame effect -->
-        <Texture Name="gTitleScreenTheLegendOfTextTex" OutName="title_screen_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x9D00"/>
-    
-        <Texture Name="gTitleScreenDisplayEffectMask00Tex" OutName="title_screen_display_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x9F40"/>
-        <Texture Name="gTitleScreenDisplayEffectMask01Tex" OutName="title_screen_display_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0xA740"/>
-        <Texture Name="gTitleScreenDisplayEffectMask10Tex" OutName="title_screen_display_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0xAF40"/>
-        <Texture Name="gTitleScreenDisplayEffectMask11Tex" OutName="title_screen_display_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0xB740"/>
-        <Texture Name="gTitleScreenDisplayEffectMask02Tex" OutName="title_screen_display_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0xBF40"/>
-        <Texture Name="gTitleScreenDisplayEffectMask12Tex" OutName="title_screen_display_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0xC740"/>
-
-        <Texture Name="gTitleScreenAppearEffectMask00Tex" OutName="title_screen_appear_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0xCF40"/>
-        <Texture Name="gTitleScreenAppearEffectMask01Tex" OutName="title_screen_appear_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0xD740"/>
-        <Texture Name="gTitleScreenAppearEffectMask10Tex" OutName="title_screen_appear_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0xDF40"/>
-        <Texture Name="gTitleScreenAppearEffectMask11Tex" OutName="title_screen_appear_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0xE740"/>
-        <Texture Name="gTitleScreenAppearEffectMask02Tex" OutName="title_screen_appear_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0xEF40"/>
-        <Texture Name="gTitleScreenAppearEffectMask12Tex" OutName="title_screen_appear_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0xF740"/>
-
-        <Texture Name="gTitleScreenFlame0Tex" OutName="title_screen_flame_0" Format="i8" Width="32" Height="32" Offset="0xFF40"/>
-        <Texture Name="gTitleScreenFlame1Tex" OutName="title_screen_flame_1" Format="i8" Width="32" Height="32" Offset="0x10340"/>
-        <Texture Name="gTitleScreenFlame2Tex" OutName="title_screen_flame_2" Format="i8" Width="32" Height="32" Offset="0x10740"/>
-        <Texture Name="gTitleScreenFlame3Tex" OutName="title_screen_flame_3" Format="i8" Width="32" Height="32" Offset="0x10B40"/>
-
-        <Texture Name="gTitleScreenCopyright2000NintendoTex" OutName="title_screen_copyright_2000_nintendo_text" Format="i8" Width="128" Height="16" Offset="0x10F40"/>
-        <Texture Name="gTitleScreenControllerNotConnectedTextTex" OutName="title_screen_controller_not_connected_text" Format="i4" Width="256" Height="9" Offset="0x11740"/>
-        <Texture Name="gTitleScreenInsertControllerTextTex" OutName="title_screen_insert_controller_text" Format="i4" Width="144" Height="9" Offset="0x11BC0"/>
-        <Texture Name="gTitleScreenMajorasMaskTex" OutName="title_screen_majoras_mask" Format="rgba32" Width="128" Height="112" Offset="0x11E48"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mamenoki.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mamenoki.xml
deleted file mode 100644
index 9fa5b6832..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mamenoki.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_mamenoki" Segment="6">
-        <DList Name="object_mamenoki_DL_000090" Offset="0x90" /> <!-- Original name is "c_mame_jr_model" -->
-        <DList Name="object_mamenoki_DL_0002D0" Offset="0x2D0" /> <!-- Original name is "c_mame_lift_model" -->
-        <Collision Name="object_mamenoki_Colheader_0004BC" Offset="0x4BC" /> <!-- Original name is "c_mame_lift_bgdatainfo" -->
-        <DList Name="object_mamenoki_DL_000530" Offset="0x530" /> <!-- Original name is "c_mame_place_model" -->
-        <Texture Name="object_mamenoki_Tex_0005C0" OutName="tex_0005C0" Format="rgba16" Width="32" Height="32" Offset="0x5C0" />
-        <Texture Name="object_mamenoki_Tex_000DC0" OutName="tex_000DC0" Format="rgba16" Width="16" Height="32" Offset="0xDC0" />
-        <Texture Name="object_mamenoki_Tex_0011C0" OutName="tex_0011C0" Format="rgba16" Width="32" Height="32" Offset="0x11C0" />
-        <Texture Name="object_mamenoki_Tex_0019C0" OutName="tex_0019C0" Format="rgba16" Width="16" Height="32" Offset="0x19C0" />
-        <Texture Name="object_mamenoki_Tex_001DC0" OutName="tex_001DC0" Format="rgba16" Width="32" Height="16" Offset="0x1DC0" />
-        <DList Name="object_mamenoki_DL_002200" Offset="0x2200" />
-        <DList Name="object_mamenoki_DL_002208" Offset="0x2208" />
-        <Texture Name="object_mamenoki_Tex_002298" OutName="tex_002298" Format="i8" Width="32" Height="32" Offset="0x2298" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_market_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_market_obj.xml
deleted file mode 100644
index 8ad9436cc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_market_obj.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<Root>
-    <!-- Assets for most of the West Clock Town Market (the section with the shops and the bank) -->
-    <File Name="object_market_obj" Segment="6">
-        <!-- West Clock Town Market Textures -->
-        <Texture Name="gWestClockTownMarketWhitePlasterTLUT" OutName="west_clock_town_market_white_plaster_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gWestClockTownMarketYellowPlasterTLUT" OutName="west_clock_town_market_yellow_plaster_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20" />
-        <Texture Name="gWestClockTownMarketBrownPlasterTLUT" OutName="west_clock_town_market_brown_plaster_tlut" Format="rgba16" Width="4" Height="4" Offset="0x40" />
-        <Texture Name="gWestClockTownMarketStrawTLUT" OutName="west_clock_town_market_straw_tlut" Format="rgba16" Width="4" Height="4" Offset="0x60" />
-        <Texture Name="gWestClockTownMarketStrawFringeTLUT" OutName="west_clock_town_market_straw_fringe_tlut" Format="rgba16" Width="4" Height="4" Offset="0x80" />
-        <Texture Name="gWestClockTownMarketBrownPatternedPlasterTLUT" OutName="west_clock_town_market_brown_patterned_plaster_tlut" Format="rgba16" Width="4" Height="4" Offset="0xA0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster1TLUT" OutName="west_clock_town_market_yellow_patterned_plaster_1_tlut" Format="rgba16" Width="4" Height="4" Offset="0xC0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster2TLUT" OutName="west_clock_town_market_yellow_patterned_plaster_2_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster1TLUT" OutName="west_clock_town_market_white_patterned_plaster_1_tlut" Format="rgba16" Width="4" Height="4" Offset="0x100" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster2TLUT" OutName="west_clock_town_market_white_patterned_plaster_2_tlut" Format="rgba16" Width="4" Height="4" Offset="0x120" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster3TLUT" OutName="west_clock_town_market_yellow_patterned_plaster_3_tlut" Format="rgba16" Width="4" Height="4" Offset="0x140" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster4TLUT" OutName="west_clock_town_market_yellow_patterned_plaster_4_tlut" Format="rgba16" Width="4" Height="4" Offset="0x160" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster5TLUT" OutName="west_clock_town_market_yellow_patterned_plaster_5_tlut" Format="rgba16" Width="4" Height="4" Offset="0x180" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster3TLUT" OutName="west_clock_town_market_white_patterned_plaster_3_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1A0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster4TLUT" OutName="west_clock_town_market_white_patterned_plaster_4_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1C0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster5TLUT" OutName="west_clock_town_market_white_patterned_plaster_5_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1E0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster6TLUT" OutName="west_clock_town_market_white_patterned_plaster_6_tlut" Format="rgba16" Width="4" Height="4" Offset="0x200" />
-        <Texture Name="gWestClockTownMarketCowFrontTLUT" OutName="west_clock_town_market_cow_front_tlut" Format="rgba16" Width="16" Height="16" Offset="0x220" />
-        <Texture Name="gWestClockTownMarketCuriosityShopSignTex" OutName="west_clock_town_market_curiosity_shop_sign" Format="rgba16" Width="32" Height="64" Offset="0x420" />
-        <Texture Name="gWestClockTownMarketBombShopSignTex" OutName="west_clock_town_market_bomb_shop_sign" Format="rgba16" Width="32" Height="64" Offset="0x1420" />
-        <Texture Name="gWestClockTownMarketWhitePlasterTex" OutName="west_clock_town_market_white_plaster" Format="ci4" Width="64" Height="64" Offset="0x2420" />
-        <Texture Name="gWestClockTownMarketClockTownBankSignTex" OutName="west_clock_town_market_clock_town_bank_sign" Format="rgba16" Width="32" Height="63" Offset="0x2C20" />
-        <Texture Name="gWestClockTownMarketTradingPostSignTex" OutName="west_clock_town_market_trading_post_sign" Format="rgba16" Width="32" Height="64" Offset="0x3BE0" />
-        <Texture Name="gWestClockTownMarketYellowPlasterTex" OutName="west_clock_town_market_yellow_plaster" Format="ci4" Width="64" Height="64" Offset="0x4BE0" />
-        <Texture Name="gWestClockTownMarketBrownPlasterTex" OutName="west_clock_town_market_brown_plaster" Format="ci4" Width="64" Height="64" Offset="0x53E0" />
-        <Texture Name="gWestClockTownMarketBankAndDoorFrameTex" OutName="west_clock_town_market_bank_and_door_frame" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" />
-        <Texture Name="gWestClockTownMarketGroundTex" OutName="west_clock_town_market_ground" Format="rgba16" Width="32" Height="32" Offset="0x63E0" />
-        <Texture Name="gWestClockTownBrickBelowWhitePlasterTex" OutName="west_clock_town_market_brick_below_white_plaster" Format="rgba16" Width="64" Height="32" Offset="0x6BE0" />
-        <Texture Name="gWestClockTownMarketStrawTex" OutName="west_clock_town_market_straw" Format="ci4" Width="64" Height="64" Offset="0x7BE0" />
-        <Texture Name="gWestClockTownBrickBelowYellowPlasterTex" OutName="west_clock_town_market_brick_below_yellow_plaster" Format="rgba16" Width="64" Height="32" Offset="0x83E0" />
-        <Texture Name="gWestClockTownBrickBelowBrownPlasterTex" OutName="west_clock_town_market_brick_below_brown_plaster" Format="rgba16" Width="64" Height="32" Offset="0x93E0" />
-        <Texture Name="gWestClockTownMarketStrawFringeTex" OutName="west_clock_town_market_straw_fringe" Format="ci4" Width="64" Height="32" Offset="0xA3E0" />
-        <Texture Name="gWestClockTownMarketBankDoorTex" OutName="west_clock_town_market_bank_door" Format="i4" Width="32" Height="32" Offset="0xA7E0" />
-        <Texture Name="gWestClockTownMarketBrownPatternedPlasterTex" OutName="west_clock_town_market_brown_patterned_plaster" Format="ci4" Width="32" Height="64" Offset="0xA9E0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster1Tex" OutName="west_clock_town_market_yellow_patterned_plaster_1" Format="ci4" Width="64" Height="64" Offset="0xADE0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster2Tex" OutName="west_clock_town_market_yellow_patterned_plaster_2" Format="ci4" Width="64" Height="64" Offset="0xB5E0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster1Tex" OutName="west_clock_town_market_white_patterned_plaster_1" Format="ci4" Width="64" Height="64" Offset="0xBDE0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster2Tex" OutName="west_clock_town_market_white_patterned_plaster_2" Format="ci4" Width="64" Height="64" Offset="0xC5E0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster3Tex" OutName="west_clock_town_market_yellow_patterned_plaster_3" Format="ci4" Width="64" Height="64" Offset="0xCDE0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster4Tex" OutName="west_clock_town_market_yellow_patterned_plaster_4" Format="ci4" Width="64" Height="64" Offset="0xD5E0" />
-        <Texture Name="gWestClockTownMarketYellowPatternedPlaster5Tex" OutName="west_clock_town_market_yellow_patterned_plaster_5" Format="ci4" Width="64" Height="64" Offset="0xDDE0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster3Tex" OutName="west_clock_town_market_white_patterned_plaster_3" Format="ci4" Width="64" Height="64" Offset="0xE5E0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster4Tex" OutName="west_clock_town_market_white_patterned_plaster_4" Format="ci4" Width="64" Height="64" Offset="0xEDE0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster5Tex" OutName="west_clock_town_market_white_patterned_plaster_5" Format="ci4" Width="64" Height="64" Offset="0xF5E0" />
-        <Texture Name="gWestClockTownMarketWhitePatternedPlaster6Tex" OutName="west_clock_town_market_white_patterned_plaster_6" Format="ci4" Width="64" Height="64" Offset="0xFDE0" />
-        <Texture Name="gWestClockTownMarketPoleTex" OutName="west_clock_town_market_pole" Format="rgba16" Width="32" Height="16" Offset="0x105E0" />
-        <Texture Name="gWestClockTownMarketBrickEdgedGroundTex" OutName="west_clock_town_market_brick_edged_ground" Format="rgba16" Width="32" Height="64" Offset="0x109E0" />
-        <Texture Name="gWestClockTownMarketStairRiserTex" OutName="west_clock_town_market_stair_riser" Format="rgba16" Width="32" Height="16" Offset="0x119E0" />
-        <Texture Name="gWestClockTownMarketFlowerBedTopTex" OutName="west_clock_town_market_flower_bed_top" Format="rgba16" Width="32" Height="32" Offset="0x11DE0" />
-        <Texture Name="gWestClockTownMarketFlowerBedSidesTex" OutName="west_clock_town_market_flower_bed_sides" Format="rgba16" Width="32" Height="32" Offset="0x125E0" />
-        <Texture Name="gWestClockTownMarketSafeTex" OutName="west_clock_town_market_safe" Format="rgba16" Width="32" Height="32" Offset="0x12DE0" />
-        <Texture Name="gWestClockTownMarketRugTex" OutName="west_clock_town_market_rug" Format="rgba16" Width="64" Height="16" Offset="0x135E0" />
-        <Texture Name="gWestClockTownMarketBankCurtainTex" OutName="west_clock_town_market_bank_curtain" Format="ia8" Width="32" Height="32" Offset="0x13DE0" />
-        <Texture Name="gWestClockTownMarketCowFrontTex" OutName="west_clock_town_market_cow_front" Format="ci8" Width="8" Height="8" Offset="0x141E0" />
-        <Texture Name="gWestClockTownMarketCowBodyTex" OutName="west_clock_town_market_cow_body" Format="i8" Width="8" Height="8" Offset="0x14220" />
-        <Texture Name="gWestClockTownMarketBankAdvertisementsTex" OutName="west_clock_town_market_bank_advertisements" Format="i4" Width="64" Height="32" Offset="0x14260" />
-        <Texture Name="gWestClockTownMarketSafeWheelAndHandleTex" OutName="west_clock_town_market_safe_wheel_and_handle" Format="rgba16" Width="16" Height="16" Offset="0x14660" />
-
-        <!-- West Clock Town Market DisplayLists -->
-        <DList Name="gWestClockTownMarketBankAdvertisementsAndDoorNightDL" Offset="0x18C60" /> <!-- The door is not interactive, and it's not visible in-game. -->
-        <DList Name="gWestClockTownMarketNightDL" Offset="0x18DA0" />
-        <DList Name="gWestClockTownMarketBankAdvertisementsAndDoorDayDL" Offset="0x1EF10" /> <!-- The door is not interactive, and it's not visible in-game. -->
-        <DList Name="gWestClockTownMarketDayDL" Offset="0x1F050" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_maruta.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_maruta.xml
deleted file mode 100644
index c44907b1d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_maruta.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_maruta" Segment="6">
-        <Texture Name="object_maruta_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="object_maruta_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800" />
-        <Texture Name="object_maruta_Tex_001000" OutName="tex_001000" Format="rgba16" Width="32" Height="32" Offset="0x1000" />
-        <DList Name="object_maruta_DL_002220" Offset="0x2220" /> <!-- Original name is "parts_1_model" -->
-        <DList Name="object_maruta_DL_0023D0" Offset="0x23D0" /> <!-- Original name is "parts_2_model" -->
-        <DList Name="object_maruta_DL_002568" Offset="0x2568" /> <!-- Original name is "parts_3_model" -->
-        <DList Name="object_maruta_DL_002660" Offset="0x2660" /> <!-- Original name is "parts_4_model" -->
-        <DList Name="object_maruta_DL_002758" Offset="0x2758" /> <!-- Original name is "parts_5_model" -->
-        <DList Name="object_maruta_DL_002850" Offset="0x2850" /> <!-- Original name is "parts_6_model" -->
-        <DList Name="object_maruta_DL_002948" Offset="0x2948" /> <!-- Original name is "parts_7_model" -->
-        <DList Name="object_maruta_DL_002AE0" Offset="0x2AE0" /> <!-- Original name is "parts_8_model" -->
-        <DList Name="object_maruta_DL_002EC0" Offset="0x2EC0" /> <!-- Original name is "kiretenaimaruta_model" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bakuretu.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bakuretu.xml
deleted file mode 100644
index 2eed78171..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bakuretu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_mask_bakuretu" Segment="10">
-        <DList Name="object_mask_bakuretu_DL_000440" Offset="0x440" />
-        <DList Name="object_mask_bakuretu_DL_0005C0" Offset="0x5C0" />
-        <Texture Name="object_mask_bakuretu_Tex_0007B0" OutName="tex_0007B0" Format="i8" Width="32" Height="32" Offset="0x7B0" />
-        <Texture Name="object_mask_bakuretu_Tex_000BB0" OutName="tex_000BB0" Format="i8" Width="8" Height="8" Offset="0xBB0" />
-        <Texture Name="object_mask_bakuretu_Tex_000BF0" OutName="tex_000BF0" Format="i4" Width="32" Height="32" Offset="0xBF0" />
-        <Texture Name="object_mask_bakuretu_Tex_000DF0" OutName="tex_000DF0" Format="i8" Width="32" Height="32" Offset="0xDF0" />
-        <TextureAnimation Name="object_mask_bakuretu_Matanimheader_0011F8" Offset="0x11F8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bigelf.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bigelf.xml
deleted file mode 100644
index 762d11808..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bigelf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_mask_bigelf" Segment="10">
-        <DList Name="object_mask_bigelf_DL_0016F0" Offset="0x16F0" />
-        <Texture Name="object_mask_bigelf_TLUT_002130" OutName="tlut_002130" Format="rgba16" Width="16" Height="16" Offset="0x2130" />
-        <Texture Name="object_mask_bigelf_Tex_002330" OutName="tex_002330" Format="ci8" Width="8" Height="8" Offset="0x2330" />
-        <Texture Name="object_mask_bigelf_Tex_002370" OutName="tex_002370" Format="ci8" Width="32" Height="32" Offset="0x2370" />
-        <Texture Name="object_mask_bigelf_Tex_002770" OutName="tex_002770" Format="ci8" Width="64" Height="32" Offset="0x2770" />
-        <Texture Name="object_mask_bigelf_Tex_002F70" OutName="tex_002F70" Format="ci8" Width="16" Height="16" Offset="0x2F70" />
-        <Texture Name="object_mask_bigelf_Tex_003070" OutName="tex_003070" Format="ci8" Width="8" Height="8" Offset="0x3070" />
-        <Texture Name="object_mask_bigelf_Tex_0030B0" OutName="tex_0030B0" Format="rgba16" Width="32" Height="16" Offset="0x30B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_boy.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_boy.xml
deleted file mode 100644
index e0f93797e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_boy.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_mask_boy" Segment="10">
-        <DList Name="object_mask_boy_DL_000900" Offset="0x900" />
-        <Texture Name="object_mask_boy_TLUT_000D50" OutName="tlut_000D50" Format="rgba16" Width="16" Height="16" Offset="0xD50" />
-        <Texture Name="object_mask_boy_Tex_000F50" OutName="tex_000F50" Format="ci8" Width="32" Height="32" Offset="0xF50" />
-        <Texture Name="object_mask_boy_Tex_001350" OutName="tex_001350" Format="ci8" Width="64" Height="32" Offset="0x1350" />
-        <Texture Name="object_mask_boy_Tex_001B50" OutName="tex_001B50" Format="ci8" Width="32" Height="32" Offset="0x1B50" />
-        <Texture Name="object_mask_boy_Tex_001F50" OutName="tex_001F50" Format="ci8" Width="16" Height="16" Offset="0x1F50" />
-        <Texture Name="object_mask_boy_Tex_002050" OutName="tex_002050" Format="rgba16" Width="8" Height="8" Offset="0x2050" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bree.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bree.xml
deleted file mode 100644
index 9fda443c8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bree.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_mask_bree" Segment="10">
-        <DList Name="object_mask_bree_DL_0003C0" Offset="0x3C0" />
-        <Texture Name="object_mask_bree_TLUT_000658" OutName="tlut_000658" Format="rgba16" Width="16" Height="16" Offset="0x658" />
-        <Texture Name="object_mask_bree_Tex_000858" OutName="tex_000858" Format="ci8" Width="32" Height="32" Offset="0x858" />
-        <Texture Name="object_mask_bree_Tex_000C58" OutName="tex_000C58" Format="ci8" Width="16" Height="16" Offset="0xC58" />
-        <Texture Name="object_mask_bree_Tex_000D58" OutName="tex_000D58" Format="ci8" Width="8" Height="8" Offset="0xD58" />
-        <Texture Name="object_mask_bree_Tex_000D98" OutName="tex_000D98" Format="rgba16" Width="64" Height="32" Offset="0xD98" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bu_san.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bu_san.xml
deleted file mode 100644
index 621e748ed..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_bu_san.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_mask_bu_san" Segment="10">
-        <DList Name="object_mask_bu_san_DL_000710" Offset="0x710" />
-        <Texture Name="object_mask_bu_san_TLUT_000B68" OutName="tlut_000B68" Format="rgba16" Width="16" Height="16" Offset="0xB68" />
-        <Texture Name="object_mask_bu_san_Tex_000D68" OutName="tex_000D68" Format="ci8" Width="8" Height="8" Offset="0xD68" />
-        <Texture Name="object_mask_bu_san_Tex_000DA8" OutName="tex_000DA8" Format="rgba16" Width="8" Height="16" Offset="0xDA8" />
-        <Texture Name="object_mask_bu_san_Tex_000EA8" OutName="tex_000EA8" Format="ci8" Width="16" Height="16" Offset="0xEA8" />
-        <Texture Name="object_mask_bu_san_Tex_000FA8" OutName="tex_000FA8" Format="ci8" Width="16" Height="32" Offset="0xFA8" />
-        <Texture Name="object_mask_bu_san_Tex_0011A8" OutName="tex_0011A8" Format="ci8" Width="8" Height="8" Offset="0x11A8" />
-        <Texture Name="object_mask_bu_san_Tex_0011E8" OutName="tex_0011E8" Format="rgba16" Width="16" Height="16" Offset="0x11E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_dancer.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_dancer.xml
deleted file mode 100644
index a2a37c958..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_dancer.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_mask_dancer" Segment="10">
-        <DList Name="object_mask_dancer_DL_000EF0" Offset="0xEF0" />
-        <Texture Name="object_mask_dancer_TLUT_001548" OutName="tlut_001548" Format="rgba16" Width="16" Height="16" Offset="0x1548" />
-        <Texture Name="object_mask_dancer_Tex_001748" OutName="tex_001748" Format="ci8" Width="16" Height="16" Offset="0x1748" />
-        <Texture Name="object_mask_dancer_Tex_001848" OutName="tex_001848" Format="ci8" Width="8" Height="8" Offset="0x1848" />
-        <Texture Name="object_mask_dancer_Tex_001888" OutName="tex_001888" Format="ci8" Width="16" Height="16" Offset="0x1888" />
-        <Texture Name="object_mask_dancer_Tex_001988" OutName="tex_001988" Format="ci8" Width="8" Height="8" Offset="0x1988" />
-        <Texture Name="object_mask_dancer_Tex_0019C8" OutName="tex_0019C8" Format="ci8" Width="16" Height="16" Offset="0x19C8" />
-        <Texture Name="object_mask_dancer_Tex_001AC8" OutName="tex_001AC8" Format="ci8" Width="8" Height="16" Offset="0x1AC8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_gero.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_gero.xml
deleted file mode 100644
index b6f4a6117..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_gero.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Object for Don Gero's Mask-->
-    <File Name="object_mask_gero" Segment="10">
-        <DList Name="gDonGeroMaskDL" Offset="0xDC0" />
-        <Texture Name="gDonGeroMaskTLUT" OutName="don_gero_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1388" />
-        <Texture Name="gDonGeroMaskBottomTex" OutName="don_gero_mask_bottom" Format="ci8" Width="16" Height="16" Offset="0x1588" />
-        <Texture Name="gDonGeroMaskToesTex" OutName="don_gero_mask_toes" Format="rgba16" Width="32" Height="32" Offset="0x1688" />
-        <Texture Name="gDonGeroMaskTopTex" OutName="don_gero_mask_top" Format="ci8" Width="16" Height="16" Offset="0x1E88" />
-        <Texture Name="gDonGeroMaskNostrilTex" OutName="don_gero_mask_nostril" Format="ci8" Width="32" Height="32" Offset="0x1F88" />
-        <Texture Name="gDonGeroMaskMouthTex" OutName="don_gero_mask_mouth" Format="ci8" Width="16" Height="16" Offset="0x2388" />
-        <Texture Name="gDonGeroMaskFrillsTex" OutName="don_gero_mask_frills" Format="rgba16" Width="32" Height="32" Offset="0x2488" />
-        <Texture Name="gDonGeroMaskEyeTex" OutName="don_gero_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x2C88" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_gibudo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_gibudo.xml
deleted file mode 100644
index 76bf2b3de..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_gibudo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_mask_gibudo" Segment="10">
-        <DList Name="object_mask_gibudo_DL_000250" Offset="0x250" />
-        <Texture Name="object_mask_gibudo_Tex_000398" OutName="tex_000398" Format="i8" Width="64" Height="32" Offset="0x398" />
-        <Texture Name="object_mask_gibudo_Tex_000B98" OutName="tex_000B98" Format="i8" Width="32" Height="16" Offset="0xB98" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_goron.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_goron.xml
deleted file mode 100644
index 56a67218e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_goron.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_mask_goron" Segment="10">
-        <Texture Name="object_mask_goron_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="object_mask_goron_Tex_000200" OutName="tex_000200" Format="ci8" Width="32" Height="64" Offset="0x200" />
-        <Texture Name="object_mask_goron_Tex_000A00" OutName="tex_000A00" Format="ci8" Width="8" Height="8" Offset="0xA00" />
-        <Texture Name="object_mask_goron_Tex_000A40" OutName="tex_000A40" Format="ci8" Width="16" Height="16" Offset="0xA40" />
-        <Texture Name="object_mask_goron_Tex_000B40" OutName="tex_000B40" Format="ci8" Width="32" Height="32" Offset="0xB40" />
-        <DList Name="object_mask_goron_DL_0014A0" Offset="0x14A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_json.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_json.xml
deleted file mode 100644
index 1a5c10eb1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_json.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_mask_json" Segment="10">
-        <DList Name="object_mask_json_DL_0004C0" Offset="0x4C0" />
-        <Texture Name="object_mask_json_TLUT_0008A0" OutName="tlut_0008A0" Format="rgba16" Width="16" Height="16" Offset="0x8A0" />
-        <Texture Name="object_mask_json_Tex_000AA0" OutName="tex_000AA0" Format="rgba16" Width="16" Height="16" Offset="0xAA0" />
-        <Texture Name="object_mask_json_Tex_000CA0" OutName="tex_000CA0" Format="ci8" Width="16" Height="8" Offset="0xCA0" />
-        <Texture Name="object_mask_json_Tex_000D20" OutName="tex_000D20" Format="ci8" Width="16" Height="32" Offset="0xD20" />
-        <Texture Name="object_mask_json_Tex_000F20" OutName="tex_000F20" Format="ci8" Width="32" Height="32" Offset="0xF20" />
-        <Texture Name="object_mask_json_Tex_001320" OutName="tex_001320" Format="ci8" Width="8" Height="8" Offset="0x1320" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_kerfay.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_kerfay.xml
deleted file mode 100644
index d80b8eaf0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_kerfay.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Assets for Kafei's Mask -->
-    <File Name="object_mask_kerfay" Segment="10">
-        <DList Name="gKafeisMaskDL" Offset="0xD40" />
-
-        <Texture Name="gKafeisMaskTLUT" OutName="kafeis_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1140" />
-        <Texture Name="gKafeisMaskHoleTex" OutName="hole" Format="ci8" Width="16" Height="16" Offset="0x1340" TlutOffset="0x1140" />
-        <Texture Name="gKafeisMaskHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x1440" TlutOffset="0x1140" />
-        <Texture Name="gKafeisMaskHairPartAndUndersideTex" OutName="hair_part_and_underside" Format="ci8" Width="8" Height="16" Offset="0x14C0" TlutOffset="0x1140" />
-        <Texture Name="gKafeisMaskEyebrowTex" OutName="eyebrow" Format="ci8" Width="16" Height="8" Offset="0x1540" TlutOffset="0x1140" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_ki_tan.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_ki_tan.xml
deleted file mode 100644
index f0322cc83..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_ki_tan.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_mask_ki_tan" Segment="10">
-        <DList Name="object_mask_ki_tan_DL_0004A0" Offset="0x4A0" />
-        <Texture Name="object_mask_ki_tan_TLUT_000688" OutName="tlut_000688" Format="rgba16" Width="16" Height="16" Offset="0x688" />
-        <Texture Name="object_mask_ki_tan_Tex_000888" OutName="tex_000888" Format="ci8" Width="32" Height="16" Offset="0x888" />
-        <Texture Name="object_mask_ki_tan_Tex_000A88" OutName="tex_000A88" Format="ci8" Width="8" Height="8" Offset="0xA88" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_kyojin.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_kyojin.xml
deleted file mode 100644
index cd07a57fd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_kyojin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="object_mask_kyojin" Segment="10">
-        <DList Name="object_mask_kyojin_DL_000380" Offset="0x380" />
-        <Texture Name="object_mask_kyojin_Tex_000498" OutName="tex_000498" Format="i4" Width="64" Height="64" Offset="0x498" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_meoto.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_meoto.xml
deleted file mode 100644
index 069e521e0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_meoto.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_mask_meoto" Segment="10">
-        <DList Name="object_mask_meoto_DL_0005A0" Offset="0x5A0" />
-        <Texture Name="object_mask_meoto_Tex_0008C8" OutName="tex_0008C8" Format="i8" Width="32" Height="64" Offset="0x8C8" />
-        <Texture Name="object_mask_meoto_Tex_0010C8" OutName="tex_0010C8" Format="i8" Width="32" Height="64" Offset="0x10C8" />
-        <Texture Name="object_mask_meoto_Tex_0018C8" OutName="tex_0018C8" Format="i8" Width="32" Height="32" Offset="0x18C8" />
-        <TextureAnimation Name="object_mask_meoto_Matanimheader_001CD8" Offset="0x1CD8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_nuts.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_nuts.xml
deleted file mode 100644
index 6a0eaf26d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_nuts.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_mask_nuts" Segment="10">
-        <Texture Name="object_mask_nuts_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="object_mask_nuts_Tex_000800" OutName="tex_000800" Format="rgba16" Width="16" Height="16" Offset="0x800" />
-        <Texture Name="object_mask_nuts_Tex_000A00" OutName="tex_000A00" Format="rgba16" Width="32" Height="32" Offset="0xA00" />
-        <DList Name="object_mask_nuts_DL_001D90" Offset="0x1D90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_posthat.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_posthat.xml
deleted file mode 100644
index bccbfb301..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_posthat.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_mask_posthat" Segment="10">
-        <DList Name="object_mask_posthat_DL_000290" Offset="0x290" />
-        <Texture Name="object_mask_posthat_TLUT_000488" OutName="tlut_000488" Format="rgba16" Width="16" Height="16" Offset="0x488" />
-        <Texture Name="object_mask_posthat_Tex_000688" OutName="tex_000688" Format="i4" Width="16" Height="16" Offset="0x688" />
-        <Texture Name="object_mask_posthat_Tex_000708" OutName="tex_000708" Format="ci8" Width="32" Height="32" Offset="0x708" />
-        <Texture Name="object_mask_posthat_Tex_000B08" OutName="tex_000B08" Format="ci8" Width="8" Height="8" Offset="0xB08" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_rabit.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_rabit.xml
deleted file mode 100644
index a4a1f5c0c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_rabit.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_mask_rabit" Segment="10">
-        <DList Name="object_mask_rabit_DL_000610" Offset="0x610" />
-        <Texture Name="object_mask_rabit_Tex_0009A0" OutName="tex_0009A0" Format="rgba16" Width="16" Height="16" Offset="0x9A0" />
-        <Texture Name="object_mask_rabit_Tex_000BA0" OutName="tex_000BA0" Format="rgba16" Width="16" Height="32" Offset="0xBA0" />
-        <Texture Name="object_mask_rabit_Tex_000FA0" OutName="tex_000FA0" Format="rgba16" Width="16" Height="32" Offset="0xFA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_romerny.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_romerny.xml
deleted file mode 100644
index 603feef0d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_romerny.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_mask_romerny" Segment="10">
-        <DList Name="object_mask_romerny_DL_0007A0" Offset="0x7A0" />
-        <Texture Name="object_mask_romerny_TLUT_000B88" OutName="tlut_000B88" Format="rgba16" Width="16" Height="16" Offset="0xB88" />
-        <Texture Name="object_mask_romerny_Tex_000D88" OutName="tex_000D88" Format="i4" Width="64" Height="64" Offset="0xD88" />
-        <Texture Name="object_mask_romerny_Tex_001588" OutName="tex_001588" Format="ci8" Width="16" Height="16" Offset="0x1588" />
-        <Texture Name="object_mask_romerny_Tex_001688" OutName="tex_001688" Format="ci8" Width="16" Height="16" Offset="0x1688" />
-        <Texture Name="object_mask_romerny_Tex_001788" OutName="tex_001788" Format="rgba16" Width="16" Height="16" Offset="0x1788" />
-        <Texture Name="object_mask_romerny_Tex_001988" OutName="tex_001988" Format="ci8" Width="8" Height="16" Offset="0x1988" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_skj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_skj.xml
deleted file mode 100644
index 457cd94f2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_skj.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_mask_skj" Segment="10">
-        <DList Name="object_mask_skj_DL_0009F0" Offset="0x9F0" />
-        <Texture Name="object_mask_skj_TLUT_000FA0" OutName="tlut_000FA0" Format="rgba16" Width="16" Height="16" Offset="0xFA0" />
-        <Texture Name="object_mask_skj_Tex_0011A0" OutName="tex_0011A0" Format="ci8" Width="16" Height="16" Offset="0x11A0" />
-        <Texture Name="object_mask_skj_Tex_0012A0" OutName="tex_0012A0" Format="ci8" Width="8" Height="16" Offset="0x12A0" />
-        <Texture Name="object_mask_skj_Tex_001320" OutName="tex_001320" Format="ci8" Width="8" Height="8" Offset="0x1320" />
-        <Texture Name="object_mask_skj_Tex_001360" OutName="tex_001360" Format="ci8" Width="16" Height="16" Offset="0x1360" />
-        <Texture Name="object_mask_skj_Tex_001460" OutName="tex_001460" Format="rgba16" Width="8" Height="16" Offset="0x1460" />
-        <Texture Name="object_mask_skj_Tex_001560" OutName="tex_001560" Format="rgba16" Width="16" Height="8" Offset="0x1560" />
-        <Texture Name="object_mask_skj_Tex_001660" OutName="tex_001660" Format="rgba16" Width="8" Height="8" Offset="0x1660" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_stone.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_stone.xml
deleted file mode 100644
index 24f67d1df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_stone.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_mask_stone" Segment="10">
-        <DList Name="object_mask_stone_DL_000820" Offset="0x820" />
-        <Texture Name="object_mask_stone_Tex_000B40" OutName="tex_000B40" Format="i8" Width="16" Height="16" Offset="0xB40" />
-        <Texture Name="object_mask_stone_Tex_000C40" OutName="tex_000C40" Format="i8" Width="32" Height="32" Offset="0xC40" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_truth.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_truth.xml
deleted file mode 100644
index 3fed737a2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_truth.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="object_mask_truth" Segment="10">
-        <DList Name="object_mask_truth_DL_0001A0" Offset="0x1A0" />
-        <Texture Name="object_mask_truth_Tex_000298" OutName="tex_000298" Format="rgba16" Width="32" Height="64" Offset="0x298" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_yofukasi.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_yofukasi.xml
deleted file mode 100644
index 990543e1b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_yofukasi.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_mask_yofukasi" Segment="10">
-        <DList Name="object_mask_yofukasi_DL_000490" Offset="0x490" />
-        <Texture Name="object_mask_yofukasi_Tex_0006A0" OutName="tex_0006A0" Format="rgba16" Width="32" Height="32" Offset="0x6A0" />
-        <Texture Name="object_mask_yofukasi_Tex_000EA0" OutName="tex_000EA0" Format="i8" Width="32" Height="32" Offset="0xEA0" />
-        <Texture Name="object_mask_yofukasi_Tex_0012A0" OutName="tex_0012A0" Format="i8" Width="64" Height="32" Offset="0x12A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_zacho.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_zacho.xml
deleted file mode 100644
index ae63753de..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_zacho.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_mask_zacho" Segment="10">
-        <DList Name="object_mask_zacho_DL_000700" Offset="0x700" />
-        <Texture Name="object_mask_zacho_TLUT_000BC8" OutName="tlut_000BC8" Format="rgba16" Width="16" Height="16" Offset="0xBC8" />
-        <Texture Name="object_mask_zacho_Tex_000DC8" OutName="tex_000DC8" Format="rgba16" Width="16" Height="16" Offset="0xDC8" />
-        <Texture Name="object_mask_zacho_Tex_000FC8" OutName="tex_000FC8" Format="ci8" Width="8" Height="8" Offset="0xFC8" />
-        <Texture Name="object_mask_zacho_Tex_001008" OutName="tex_001008" Format="ci8" Width="8" Height="8" Offset="0x1008" />
-        <Texture Name="object_mask_zacho_Tex_001048" OutName="tex_001048" Format="ci8" Width="32" Height="32" Offset="0x1048" />
-        <Texture Name="object_mask_zacho_Tex_001448" OutName="tex_001448" Format="ci8" Width="16" Height="16" Offset="0x1448" />
-        <Texture Name="object_mask_zacho_Tex_001548" OutName="tex_001548" Format="ci8" Width="16" Height="16" Offset="0x1548" />
-        <Texture Name="object_mask_zacho_Tex_001648" OutName="tex_001648" Format="ci8" Width="8" Height="8" Offset="0x1648" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_zora.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_zora.xml
deleted file mode 100644
index c2e07cde2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mask_zora.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_mask_zora" Segment="10">
-        <Texture Name="object_mask_zora_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="object_mask_zora_Tex_000200" OutName="tex_000200" Format="ci8" Width="32" Height="32" Offset="0x200" />
-        <Texture Name="object_mask_zora_Tex_000600" OutName="tex_000600" Format="ci8" Width="16" Height="32" Offset="0x600" />
-        <Texture Name="object_mask_zora_Tex_000800" OutName="tex_000800" Format="ci8" Width="8" Height="8" Offset="0x800" />
-        <Texture Name="object_mask_zora_Tex_000840" OutName="tex_000840" Format="ci8" Width="16" Height="32" Offset="0x840" />
-        <DList Name="object_mask_zora_DL_000DB0" Offset="0xDB0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mastergolon.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mastergolon.xml
deleted file mode 100644
index 481fb7cde..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mastergolon.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <!-- Object for the Goron Shopkeeper's animation -->
-    <File Name="object_mastergolon" Segment="6">
-        <Animation Name="gGoronShopkeeperAnim" Offset="0xFC" /> <!-- Original name is "oF1d_omise" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_masterzoora.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_masterzoora.xml
deleted file mode 100644
index 5a72744da..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_masterzoora.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <!-- Object for the Zora Shopkeeper's animation -->
-    <File Name="object_masterzoora" Segment="6">
-        <Animation Name="gZoraShopkeeperAnim" Offset="0x78C" /> <!-- Original name is "zo_omise" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mbar_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mbar_obj.xml
deleted file mode 100644
index b1a816f47..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mbar_obj.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_mbar_obj" Segment="6">
-        <DList Name="object_mbar_obj_DL_000280" Offset="0x280" />
-        <DList Name="object_mbar_obj_DL_000288" Offset="0x288" />
-        <Texture Name="object_mbar_obj_Tex_000408" OutName="tex_000408" Format="i8" Width="32" Height="64" Offset="0x408" />
-        <Texture Name="object_mbar_obj_Tex_000C08" OutName="tex_000C08" Format="i8" Width="32" Height="32" Offset="0xC08" />
-        <Texture Name="object_mbar_obj_Tex_001008" OutName="tex_001008" Format="ia16" Width="16" Height="64" Offset="0x1008" />
-        <Collision Name="object_mbar_obj_Colheader_0019B4" Offset="0x19B4" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_meganeana_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_meganeana_obj.xml
deleted file mode 100644
index 457c937bd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_meganeana_obj.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_meganeana_obj" Segment="6">
-        <DList Name="object_meganeana_obj_DL_000080" Offset="0x80" />
-        <DList Name="object_meganeana_obj_DL_000110" Offset="0x110" />
-        <Texture Name="object_meganeana_obj_Tex_0001D0" OutName="tex_0001D0" Format="rgba16" Width="32" Height="16" Offset="0x1D0" />
-        <Texture Name="object_meganeana_obj_Tex_0005D0" OutName="tex_0005D0" Format="i4" Width="64" Height="64" Offset="0x5D0" />
-        <Texture Name="object_meganeana_obj_Tex_000DD0" OutName="tex_000DD0" Format="rgba16" Width="32" Height="32" Offset="0xDD0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_milkbar.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_milkbar.xml
deleted file mode 100644
index f3e732514..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_milkbar.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Root>
-    <File Name="object_milkbar" Segment="6">
-        <DList Name="object_milkbar_DL_000100" Offset="0x100" /> <!-- Original name is "z2_milk_bar_light_1_modelT" -->
-        <DList Name="object_milkbar_DL_000240" Offset="0x240" />
-        <Texture Name="object_milkbar_Tex_000248" OutName="tex_000248" Format="ia16" Width="16" Height="16" Offset="0x248" />
-        <Texture Name="object_milkbar_Tex_000448" OutName="tex_000448" Format="ia8" Width="16" Height="16" Offset="0x448" />
-        <DList Name="object_milkbar_DL_000650" Offset="0x650" /> <!-- Original name is "z2_milk_bar_light_2_modelT" -->
-        <DList Name="object_milkbar_DL_000790" Offset="0x790" />
-        <Texture Name="object_milkbar_Tex_000798" OutName="tex_000798" Format="ia16" Width="16" Height="16" Offset="0x798" />
-        <Texture Name="object_milkbar_Tex_000998" OutName="tex_000998" Format="ia8" Width="16" Height="16" Offset="0x998" />
-        <DList Name="object_milkbar_DL_000B80" Offset="0xB80" /> <!-- Original name is "z2_milk_bar_light_3_modelT" -->
-        <DList Name="object_milkbar_DL_000CC0" Offset="0xCC0" />
-        <Texture Name="object_milkbar_Tex_000CC8" OutName="tex_000CC8" Format="ia16" Width="16" Height="16" Offset="0xCC8" />
-        <Texture Name="object_milkbar_Tex_000EC8" OutName="tex_000EC8" Format="ia8" Width="16" Height="16" Offset="0xEC8" />
-        <DList Name="object_milkbar_DL_0010D0" Offset="0x10D0" /> <!-- Original name is "z2_milk_bar_light_4_modelT" -->
-        <DList Name="object_milkbar_DL_001210" Offset="0x1210" />
-        <Texture Name="object_milkbar_Tex_001218" OutName="tex_001218" Format="ia16" Width="16" Height="16" Offset="0x1218" />
-        <Texture Name="object_milkbar_Tex_001418" OutName="tex_001418" Format="ia8" Width="16" Height="16" Offset="0x1418" />
-        <DList Name="object_milkbar_DL_0015E0" Offset="0x15E0" /> <!-- Original name is "z2_milk_bar_light_5_modelT" -->
-        <DList Name="object_milkbar_DL_0016B8" Offset="0x16B8" />
-        <Texture Name="object_milkbar_Tex_0016C0" OutName="tex_0016C0" Format="ia16" Width="16" Height="16" Offset="0x16C0" />
-        <Texture Name="object_milkbar_Tex_0018C0" OutName="tex_0018C0" Format="ia8" Width="16" Height="16" Offset="0x18C0" />
-        <DList Name="object_milkbar_DL_002BA0" Offset="0x2BA0" /> <!-- Not present in MM3D, but it was probably named "z2_milk_bar_stage_1_modelT" based on the rest of this object. -->
-        <DList Name="object_milkbar_DL_002CD0" Offset="0x2CD0" /> <!-- Original name is "z2_milk_bar_stage_1_model" -->
-        <Texture Name="object_milkbar_Tex_003320" OutName="tex_003320" Format="i8" Width="64" Height="64" Offset="0x3320" />
-        <Texture Name="object_milkbar_Tex_004320" OutName="tex_004320" Format="i8" Width="32" Height="32" Offset="0x4320" />
-        <Texture Name="object_milkbar_Tex_004720" OutName="tex_004720" Format="ia16" Width="16" Height="32" Offset="0x4720" />
-        <Texture Name="object_milkbar_Tex_004B20" OutName="tex_004B20" Format="i8" Width="32" Height="32" Offset="0x4B20" />
-        <Texture Name="object_milkbar_Tex_004F20" OutName="tex_004F20" Format="ia16" Width="32" Height="32" Offset="0x4F20" />
-        <Texture Name="object_milkbar_Tex_005720" OutName="tex_005720" Format="i8" Width="32" Height="32" Offset="0x5720" />
-        <Texture Name="object_milkbar_Tex_005B20" OutName="tex_005B20" Format="i8" Width="8" Height="8" Offset="0x5B20" />
-        <Texture Name="object_milkbar_Tex_005B60" OutName="tex_005B60" Format="i8" Width="16" Height="32" Offset="0x5B60" />
-        <Texture Name="object_milkbar_Tex_005D60" OutName="tex_005D60" Format="i4" Width="16" Height="32" Offset="0x5D60" />
-        <Texture Name="object_milkbar_Tex_005E60" OutName="tex_005E60" Format="i8" Width="32" Height="32" Offset="0x5E60" />
-        <Texture Name="object_milkbar_Tex_006260" OutName="tex_006260" Format="i4" Width="32" Height="32" Offset="0x6260" />
-        <Collision Name="object_milkbar_Colheader_006688" Offset="0x6688" /> <!-- Original name is "z2_milk_bar_stage_1_bgdatainfo" -->
-        <Mtx Name="object_milkbar_Mtx_0075E0" Offset="0x75E0" />
-        <Mtx Name="object_milkbar_Mtx_007620" Offset="0x7620" />
-        <Mtx Name="object_milkbar_Mtx_007660" Offset="0x7660" />
-        <DList Name="object_milkbar_DL_0076A0" Offset="0x76A0" /> <!-- Original name is "z2_milk_bar_stage_2_modelT" -->
-        <DList Name="object_milkbar_DL_007918" Offset="0x7918" /> <!-- Original name is "z2_milk_bar_stage_2_model" -->
-        <Texture Name="object_milkbar_Tex_007FA0" OutName="tex_007FA0" Format="ia16" Width="64" Height="32" Offset="0x7FA0" />
-        <Texture Name="object_milkbar_Tex_008FA0" OutName="tex_008FA0" Format="rgba16" Width="32" Height="32" Offset="0x8FA0" />
-        <Texture Name="object_milkbar_Tex_0097A0" OutName="tex_0097A0" Format="rgba16" Width="32" Height="32" Offset="0x97A0" />
-        <Texture Name="object_milkbar_Tex_009FA0" OutName="tex_009FA0" Format="ia16" Width="32" Height="32" Offset="0x9FA0" />
-        <Texture Name="object_milkbar_Tex_00A7A0" OutName="tex_00A7A0" Format="i8" Width="32" Height="32" Offset="0xA7A0" />
-        <Texture Name="object_milkbar_Tex_00ABA0" OutName="tex_00ABA0" Format="ia16" Width="32" Height="32" Offset="0xABA0" />
-        <Texture Name="object_milkbar_Tex_00B3A0" OutName="tex_00B3A0" Format="ia8" Width="32" Height="128" Offset="0xB3A0" />
-        <Texture Name="object_milkbar_Tex_00C3A0" OutName="tex_00C3A0" Format="ia8" Width="64" Height="64" Offset="0xC3A0" />
-        <Texture Name="object_milkbar_Tex_00D3A0" OutName="tex_00D3A0" Format="ia16" Width="64" Height="32" Offset="0xD3A0" />
-        <Texture Name="object_milkbar_Tex_00E3A0" OutName="tex_00E3A0" Format="i8" Width="8" Height="8" Offset="0xE3A0" />
-        <Texture Name="object_milkbar_TLUT_00E3E0" OutName="tlut_00E3E0" Format="rgba16" Width="16" Height="16" Offset="0xE3E0" />
-        <Texture Name="object_milkbar_Tex_00E5E0" OutName="tex_00E5E0" Format="rgba16" Width="32" Height="32" Offset="0xE5E0" />
-        <Texture Name="object_milkbar_Tex_00EDE0" OutName="tex_00EDE0" Format="ci8" Width="32" Height="32" Offset="0xEDE0" />
-        <Texture Name="object_milkbar_Tex_00F1E0" OutName="tex_00F1E0" Format="ia16" Width="32" Height="32" Offset="0xF1E0" />
-        <Texture Name="object_milkbar_Tex_00F9E0" OutName="tex_00F9E0" Format="i4" Width="64" Height="64" Offset="0xF9E0" />
-        <Texture Name="object_milkbar_Tex_0101E0" OutName="tex_0101E0" Format="i8" Width="32" Height="32" Offset="0x101E0" />
-        <TextureAnimation Name="object_milkbar_Matanimheader_0105F8" Offset="0x105F8" />
-        <DList Name="object_milkbar_DL_010D60" Offset="0x10D60" />
-        <DList Name="object_milkbar_DL_010D68" Offset="0x10D68" />
-        <Texture Name="object_milkbar_Tex_0110A8" OutName="tex_0110A8" Format="i8" Width="32" Height="32" Offset="0x110A8" />
-        <Texture Name="object_milkbar_Tex_0114A8" OutName="tex_0114A8" Format="ia16" Width="16" Height="32" Offset="0x114A8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mir_ray.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mir_ray.xml
deleted file mode 100644
index c0b1cf6f2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mir_ray.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_mir_ray" Segment="6">
-        <DList Name="object_mir_ray_DL_000160" Offset="0x160" />
-        <DList Name="object_mir_ray_DL_000168" Offset="0x168" /> <!-- Original name is "cl_sMLightSyl_model" -->
-        <Texture Name="object_mir_ray_Tex_000270" OutName="tex_000270" Format="i4" Width="16" Height="16" Offset="0x270" />
-        <Texture Name="object_mir_ray_Tex_0002F0" OutName="tex_0002F0" Format="i4" Width="16" Height="32" Offset="0x2F0" />
-        <TextureAnimation Name="object_mir_ray_Matanimheader_0003F8" Offset="0x3F8" />
-        <DList Name="object_mir_ray_DL_0004B0" Offset="0x4B0" />
-        <DList Name="object_mir_ray_DL_000550" Offset="0x550" />
-        <Texture Name="object_mir_ray_Tex_000558" OutName="tex_000558" Format="i8" Width="32" Height="64" Offset="0x558" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mk.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mk.xml
deleted file mode 100644
index 0db6c703d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mk.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<Root>
-    <!-- Assets for the Marine Researcher -->
-    <File Name="object_mk" Segment="6">
-        <Animation Name="gMarineResearcherHeadWaggleAnim" Offset="0x438" /> <!-- Original name is "lake_dameja" -->
-        <Animation Name="gMarineResearcherYellAnim" Offset="0x7D8" /> <!-- Original name is "lake_isogunoja" -->
-        <Animation Name="gMarineResearcherShakeInFearAnim" Offset="0x10F4" /> <!-- Original name is "lake_sorewa" -->
-        <Animation Name="gMarineResearcherStrokeChinAnim" Offset="0x1964" /> <!-- Original name is "lake_u_m" -->
-        <Animation Name="gMarineResearcherIdleAnim" Offset="0x1C38" /> <!-- Original name is "mk_matsu" -->
-        <DList Name="gMarineResearcherMidTorsoDL" Offset="0x4320" />
-        <DList Name="gMarineResearcherUpperTorsoDL" Offset="0x4610" />
-        <DList Name="gMarineResearcherNeckDL" Offset="0x4960" />
-        <DList Name="gMarineResearcherHeadDL" Offset="0x4A78" />
-        <DList Name="gMarineResearcherMouthDL" Offset="0x5180" />
-        <DList Name="gMarineResearcherRightShoulderDL" Offset="0x5500" />
-        <DList Name="gMarineResearcherRightArmDL" Offset="0x5630" />
-        <DList Name="gMarineResearcherRightHandDL" Offset="0x5760" />
-        <DList Name="gMarineResearcherLeftShoulderDL" Offset="0x58B0" />
-        <DList Name="gMarineResearcherLeftArmDL" Offset="0x59E0" />
-        <DList Name="gMarineResearcherLeftHandDL" Offset="0x5B10" />
-        <DList Name="gMarineResearcherLowerTorsoDL" Offset="0x5C60" />
-        <Texture Name="gMarineResearcherTLUT" OutName="marine_researcher_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5DE0" />
-        <Texture Name="gMarineResearcherChestSkinTex" OutName="marine_researcher_chest_skin" Format="ci8" Width="8" Height="8" Offset="0x5FE0" />
-        <Texture Name="gMarineResearcherMouthTex" OutName="marine_researcher_mouth" Format="ci8" Width="16" Height="16" Offset="0x6020" />
-        <Texture Name="gMarineResearcherLipsTex" OutName="marine_researcher_lips" Format="ci8" Width="8" Height="8" Offset="0x6120" />
-        <Texture Name="gMarineResearcherJacketTex" OutName="marine_researcher_jacket" Format="ci8" Width="8" Height="8" Offset="0x6160" />
-        <Texture Name="gMarineResearcherHairTex" OutName="marine_researcher_hair" Format="ci8" Width="8" Height="16" Offset="0x61A0" />
-        <Texture Name="gMarineResearcherEyeTex" OutName="marine_researcher_eye" Format="rgba16" Width="32" Height="32" Offset="0x6220" />
-        <Texture Name="gMarineResearcherNostrilTex" OutName="marine_researcher_nostril" Format="ci8" Width="8" Height="8" Offset="0x6A20" />
-        <Texture Name="gMarineResearcherEarTex" OutName="marine_researcher_ear" Format="ci8" Width="8" Height="8" Offset="0x6A60" />
-        <Texture Name="gMarineResearcherShirtTex" OutName="marine_researcher_shirt" Format="ci8" Width="8" Height="8" Offset="0x6AA0" />
-        <Texture Name="gMarineResearcherFingersTex" OutName="marine_researcher_fingers" Format="ci8" Width="16" Height="16" Offset="0x6AE0" />
-        <Limb Name="gMarineResearcherLowerTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LOWER_TORSO" Offset="0x6BE0" />
-        <Limb Name="gMarineResearcherMidTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_MID_TORSO" Offset="0x6BEC" />
-        <Limb Name="gMarineResearcherLeftShoulderLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LEFT_SHOULDER" Offset="0x6BF8" />
-        <Limb Name="gMarineResearcherLeftArmLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LEFT_ARM" Offset="0x6C04" />
-        <Limb Name="gMarineResearcherLeftHandLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LEFT_HAND" Offset="0x6C10" />
-        <Limb Name="gMarineResearcherRightShoulderLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_RIGHT_SHOULDER" Offset="0x6C1C" />
-        <Limb Name="gMarineResearcherRightArmLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_RIGHT_ARM" Offset="0x6C28" />
-        <Limb Name="gMarineResearcherRightHandLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_RIGHT_HAND" Offset="0x6C34" />
-        <Limb Name="gMarineResearcherUpperTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_UPPER_TORSO" Offset="0x6C40" />
-        <Limb Name="gMarineResearcherNeckLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_NECK" Offset="0x6C4C" />
-        <Limb Name="gMarineResearcherHeadLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_HEAD" Offset="0x6C58" />
-        <Limb Name="gMarineResearcherMouthLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_MOUTH" Offset="0x6C64" />
-        <Skeleton Name="gMarineResearcherSkel" Type="Flex" LimbType="Standard" LimbNone="MARINE_RESEARCHER_LIMB_NONE" LimbMax="MARINE_RESEARCHER_LIMB_MAX" EnumName="MarineResearcherLimb" Offset="0x6CA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mkk.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mkk.xml
deleted file mode 100644
index 445d26f0d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mkk.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <!-- Object for Black and White Boes -->
-    <File Name="object_mkk" Segment="6">
-        <DList Name="gBlackBoeBodyMaterialDL" Offset="0x30" />
-        <DList Name="gBlackBoeBodyModelDL" Offset="0xB0" />
-        <DList Name="gBlackBoeEndDL" Offset="0xC8" />
-        <DList Name="gBlackBoeEyesDL" Offset="0x140" />
-        <DList Name="gWhiteBoeBodyMaterialDL" Offset="0x1F0" />
-        <DList Name="gWhiteBoeBodyModelDL" Offset="0x278" />
-        <DList Name="gWhiteBoeEndDL" Offset="0x290" />
-        <DList Name="gWhiteBoeEyesDL" Offset="0x310" />
-        <Texture Name="gBlackBoeTex" OutName="black_boe" Format="i4" Width="16" Height="16" Offset="0x390" />
-        <Texture Name="gWhiteBoeTex" OutName="white_boe" Format="i4" Width="16" Height="16" Offset="0x410" />
-        <Texture Name="gBoeEyeTex" OutName="boe_eye" Format="rgba16" Width="8" Height="8" Offset="0x490" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mm.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mm.xml
deleted file mode 100644
index b7b727d4e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<Root>
-    <File Name="object_mm" Segment="6">
-        <Animation Name="object_mm_Anim_000468" Offset="0x468" /> <!-- Original name is "hasiruu" -->
-        <Animation Name="object_mm_Anim_00099C" Offset="0x99C" /> <!-- Original name is "mm_kunou" -->
-        <Animation Name="object_mm_Anim_000FC4" Offset="0xFC4" /> <!-- Original name is "mm_neru" -->
-        <Animation Name="object_mm_Anim_001F84" Offset="0x1F84" /> <!-- Original name is "mm_postcheck" -->
-        <Animation Name="object_mm_Anim_002238" Offset="0x2238" /> <!-- Original name is "mm_run01" -->
-        <Texture Name="object_mm_TLUT_002250" OutName="tlut_002250" Format="rgba16" Width="16" Height="16" Offset="0x2250" />
-        <Texture Name="object_mm_Tex_002450" OutName="tex_002450" Format="ci8" Width="8" Height="8" Offset="0x2450" />
-        <Texture Name="object_mm_Tex_002490" OutName="tex_002490" Format="ci8" Width="8" Height="8" Offset="0x2490" />
-        <Texture Name="object_mm_Tex_0024D0" OutName="tex_0024D0" Format="ci8" Width="8" Height="8" Offset="0x24D0" />
-        <Texture Name="object_mm_Tex_002510" OutName="tex_002510" Format="ci8" Width="8" Height="8" Offset="0x2510" />
-        <Texture Name="object_mm_Tex_002550" OutName="tex_002550" Format="ci8" Width="16" Height="16" Offset="0x2550" />
-        <Texture Name="object_mm_Tex_002650" OutName="tex_002650" Format="ci8" Width="16" Height="16" Offset="0x2650" />
-        <Texture Name="object_mm_Tex_002750" OutName="tex_002750" Format="ci8" Width="32" Height="16" Offset="0x2750" />
-        <Texture Name="object_mm_Tex_002950" OutName="tex_002950" Format="ci8" Width="32" Height="16" Offset="0x2950" />
-        <Texture Name="object_mm_Tex_002B50" OutName="tex_002B50" Format="ci8" Width="16" Height="16" Offset="0x2B50" />
-        <Texture Name="object_mm_Tex_002C50" OutName="tex_002C50" Format="ci8" Width="32" Height="16" Offset="0x2C50" />
-        <Texture Name="object_mm_Tex_002E50" OutName="tex_002E50" Format="ci8" Width="16" Height="16" Offset="0x2E50" />
-        <DList Name="object_mm_DL_005B30" Offset="0x5B30" />
-        <DList Name="object_mm_DL_005E70" Offset="0x5E70" />
-        <DList Name="object_mm_DL_006598" Offset="0x6598" />
-        <DList Name="object_mm_DL_0066D0" Offset="0x66D0" />
-        <DList Name="object_mm_DL_006808" Offset="0x6808" />
-        <DList Name="object_mm_DL_006A10" Offset="0x6A10" />
-        <DList Name="object_mm_DL_006B48" Offset="0x6B48" />
-        <DList Name="object_mm_DL_006C80" Offset="0x6C80" />
-        <DList Name="object_mm_DL_006E88" Offset="0x6E88" />
-        <DList Name="object_mm_DL_006F20" Offset="0x6F20" />
-        <DList Name="object_mm_DL_007188" Offset="0x7188" />
-        <DList Name="object_mm_DL_0072F8" Offset="0x72F8" />
-        <DList Name="object_mm_DL_007430" Offset="0x7430" />
-        <DList Name="object_mm_DL_007610" Offset="0x7610" />
-        <DList Name="object_mm_DL_007780" Offset="0x7780" />
-        <DList Name="object_mm_DL_008348" Offset="0x8348" /> <!-- Original name is "mm_letter_model" -->
-        <DList Name="object_mm_DL_0083E0" Offset="0x83E0" /> <!-- Original name is "mm_bag_model" -->
-        <DList Name="object_mm_DL_0085C8" Offset="0x85C8" /> <!-- Original name is "mm_cap_model" -->
-        <Texture Name="object_mm_Tex_008778" OutName="tex_008778" Format="rgba16" Width="8" Height="8" Offset="0x8778" />
-        <Texture Name="object_mm_Tex_0087F8" OutName="tex_0087F8" Format="rgba16" Width="16" Height="16" Offset="0x87F8" />
-        <Texture Name="object_mm_Tex_0089F8" OutName="tex_0089F8" Format="rgba16" Width="32" Height="32" Offset="0x89F8" />
-        <Texture Name="object_mm_Tex_0091F8" OutName="tex_0091F8" Format="i8" Width="32" Height="32" Offset="0x91F8" />
-        <Limb Name="object_mm_Standardlimb_0095F8" Type="Standard" EnumName="OBJECT_MM_LIMB_01" Offset="0x95F8" />
-        <Limb Name="object_mm_Standardlimb_009604" Type="Standard" EnumName="OBJECT_MM_LIMB_02" Offset="0x9604" />
-        <Limb Name="object_mm_Standardlimb_009610" Type="Standard" EnumName="OBJECT_MM_LIMB_03" Offset="0x9610" />
-        <Limb Name="object_mm_Standardlimb_00961C" Type="Standard" EnumName="OBJECT_MM_LIMB_04" Offset="0x961C" />
-        <Limb Name="object_mm_Standardlimb_009628" Type="Standard" EnumName="OBJECT_MM_LIMB_05" Offset="0x9628" />
-        <Limb Name="object_mm_Standardlimb_009634" Type="Standard" EnumName="OBJECT_MM_LIMB_06" Offset="0x9634" />
-        <Limb Name="object_mm_Standardlimb_009640" Type="Standard" EnumName="OBJECT_MM_LIMB_07" Offset="0x9640" />
-        <Limb Name="object_mm_Standardlimb_00964C" Type="Standard" EnumName="OBJECT_MM_LIMB_08" Offset="0x964C" />
-        <Limb Name="object_mm_Standardlimb_009658" Type="Standard" EnumName="OBJECT_MM_LIMB_09" Offset="0x9658" />
-        <Limb Name="object_mm_Standardlimb_009664" Type="Standard" EnumName="OBJECT_MM_LIMB_0A" Offset="0x9664" />
-        <Limb Name="object_mm_Standardlimb_009670" Type="Standard" EnumName="OBJECT_MM_LIMB_0B" Offset="0x9670" />
-        <Limb Name="object_mm_Standardlimb_00967C" Type="Standard" EnumName="OBJECT_MM_LIMB_0C" Offset="0x967C" />
-        <Limb Name="object_mm_Standardlimb_009688" Type="Standard" EnumName="OBJECT_MM_LIMB_0D" Offset="0x9688" />
-        <Limb Name="object_mm_Standardlimb_009694" Type="Standard" EnumName="OBJECT_MM_LIMB_0E" Offset="0x9694" />
-        <Limb Name="object_mm_Standardlimb_0096A0" Type="Standard" EnumName="OBJECT_MM_LIMB_0F" Offset="0x96A0" />
-        <Skeleton Name="object_mm_Skel_0096E8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MM_LIMB_NONE" LimbMax="OBJECT_MM_LIMB_MAX" EnumName="ObjectMmLimb" Offset="0x96E8" />
-        <Animation Name="object_mm_Anim_0099B4" Offset="0x99B4" /> <!-- Original name is "mm_runwait" -->
-        <Animation Name="object_mm_Anim_00A4E0" Offset="0xA4E0" /> <!-- Original name is "mm_tatsu" -->
-        <Animation Name="object_mm_Anim_00A8D8" Offset="0xA8D8" /> <!-- Original name is "mm_uzukumaru" -->
-        <Animation Name="object_mm_Anim_00B09C" Offset="0xB09C" /> <!-- Original name is "mm_wait01" -->
-        <Animation Name="object_mm_Anim_00BA78" Offset="0xBA78" /> <!-- Original name is "mm_watasu" -->
-        <Animation Name="object_mm_Anim_00C32C" Offset="0xC32C" /> <!-- Original name is "mm_watasuwait" -->
-        <Animation Name="object_mm_Anim_00C640" Offset="0xC640" /> <!-- Original name is "mm_yoru" -->
-        <Animation Name="object_mm_Anim_00CD90" Offset="0xCD90" /> <!-- Original name is "uttekure" -->
-        <Animation Name="object_mm_Anim_00DA50" Offset="0xDA50" /> <!-- Original name is "yorokobi_long" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mnk.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mnk.xml
deleted file mode 100644
index 794069ee7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mnk.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<Root>
-    <File Name="object_mnk" Segment="6">
-        <DList Name="object_mnk_DL_000F50" Offset="0xF50" />
-        <DList Name="object_mnk_DL_000F58" Offset="0xF58" /> <!-- Original name is "z2_25_tubo_model" -->
-        <Texture Name="object_mnk_TLUT_001620" OutName="tlut_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" />
-        <Texture Name="object_mnk_Tex_001820" OutName="tex_001820" Format="ci8" Width="16" Height="64" Offset="0x1820" />
-        <Texture Name="object_mnk_Tex_001C20" OutName="tex_001C20" Format="ci8" Width="16" Height="16" Offset="0x1C20" />
-        <Texture Name="object_mnk_Tex_001D20" OutName="tex_001D20" Format="ci8" Width="16" Height="16" Offset="0x1D20" />
-        <Texture Name="object_mnk_Tex_001E20" OutName="tex_001E20" Format="ci8" Width="16" Height="128" Offset="0x1E20" />
-        <Texture Name="object_mnk_Tex_002620" OutName="tex_002620" Format="rgba16" Width="32" Height="32" Offset="0x2620" />
-        <TextureAnimation Name="object_mnk_Matanimheader_002E28" Offset="0x2E28" />
-        <Collision Name="object_mnk_Colheader_0033E8" Offset="0x33E8" /> <!-- Original name is "z2_25_tubo_bgdatainfo" -->
-        <Animation Name="object_mnk_Anim_003504" Offset="0x3504" /> <!-- Original name is "mnk_hashira_hatena" -->
-        <Animation Name="object_mnk_Anim_003584" Offset="0x3584" /> <!-- Original name is "mnk_hashira_mogaku" -->
-        <Animation Name="object_mnk_Anim_0037E8" Offset="0x37E8" /> <!-- Original name is "mnk_hashira_sadtalk" -->
-        <Animation Name="object_mnk_Anim_003854" Offset="0x3854" /> <!-- Original name is "mnk_hashira_sing" -->
-        <DList Name="object_mnk_DL_003C70" Offset="0x3C70" />
-        <DList Name="object_mnk_DL_003D40" Offset="0x3D40" />
-        <DList Name="object_mnk_DL_003DF8" Offset="0x3DF8" />
-        <Texture Name="object_mnk_Tex_003F10" OutName="tex_003F10" Format="rgba16" Width="16" Height="128" Offset="0x3F10" />
-        <Texture Name="object_mnk_Tex_004F10" OutName="tex_004F10" Format="rgba16" Width="16" Height="16" Offset="0x4F10" />
-        <Limb Name="object_mnk_Standardlimb_005110" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_01" Offset="0x5110" />
-        <Limb Name="object_mnk_Standardlimb_00511C" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_02" Offset="0x511C" />
-        <Limb Name="object_mnk_Standardlimb_005128" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_03" Offset="0x5128" />
-        <Limb Name="object_mnk_Standardlimb_005134" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_04" Offset="0x5134" />
-        <Skeleton Name="gMonkeyTiedUpPoleSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_1_LIMB_NONE" LimbMax="OBJECT_MNK_1_LIMB_MAX" EnumName="ObjectMnk1Limb" Offset="0x5150" />
-        <Animation Name="object_mnk_Anim_005194" Offset="0x5194" /> <!-- Original name is "mnk_hashira_swing" -->
-        <Animation Name="object_mnk_Anim_0052C4" Offset="0x52C4" /> <!-- Original name is "mnk_hashira_tiedNO" -->
-        <Animation Name="object_mnk_Anim_005390" Offset="0x5390" /> <!-- Original name is "mnk_hashira_tiedtalk" -->
-        <Animation Name="object_mnk_Anim_005414" Offset="0x5414" /> <!-- Original name is "mnk_hashira_tiedtalkroud" -->
-        <Animation Name="object_mnk_Anim_0054B4" Offset="0x54B4" /> <!-- Original name is "mnk_hashira_tiedwait" -->
-        <Animation Name="object_mnk_Anim_005A08" Offset="0x5A08" /> <!-- Original name is "mnk_chuugaeri" -->
-        <Animation Name="object_mnk_Anim_0062D8" Offset="0x62D8" /> <!-- Original name is "mnk_hang_guttari" -->
-        <Animation Name="object_mnk_Anim_007380" Offset="0x7380" /> <!-- Original name is "mnk_hang_hikiage" -->
-        <Animation Name="gMonkeyHangingStruggleAnim" Offset="0x82C8" /> <!-- Original name is "mnk_hang_mogaku" -->
-        <Animation Name="object_mnk_Anim_008814" Offset="0x8814" /> <!-- Original name is "mnk_highjump" -->
-        <Animation Name="object_mnk_Anim_0095B4" Offset="0x95B4" /> <!-- Original name is "mnk_hitting" -->
-        <Animation Name="object_mnk_Anim_0099B0" Offset="0x99B0" /> <!-- Original name is "mnk_hop" -->
-        <Animation Name="object_mnk_Anim_009CC0" Offset="0x9CC0" /> <!-- Original name is "mnk_minijump" -->
-        <Animation Name="object_mnk_Anim_009FE0" Offset="0x9FE0" /> <!-- Original name is "mnk_run" -->
-        <Animation Name="object_mnk_Anim_00B864" Offset="0xB864" /> <!-- Original name is "mnk_scratch" -->
-        <Animation Name="object_mnk_Anim_00C23C" Offset="0xC23C" /> <!-- Original name is "mnk_tied_NO" -->
-        <Animation Name="object_mnk_Anim_00CAE8" Offset="0xCAE8" /> <!-- Original name is "mnk_tied_hatena" -->
-        <Animation Name="object_mnk_Anim_00CD4C" Offset="0xCD4C" /> <!-- Original name is "mnk_tied_legswing" -->
-        <Animation Name="object_mnk_Anim_00D1C8" Offset="0xD1C8" /> <!-- Original name is "mnk_tied_mogaku" -->
-        <Animation Name="object_mnk_Anim_00EC44" Offset="0xEC44" /> <!-- Original name is "mnk_tied_sadtalk" -->
-        <Animation Name="object_mnk_Anim_00F248" Offset="0xF248" /> <!-- Original name is "mnk_tied_sing" -->
-        <Animation Name="object_mnk_Anim_00F9A4" Offset="0xF9A4" /> <!-- Original name is "mnk_tied_talk" -->
-        <Animation Name="object_mnk_Anim_00FE34" Offset="0xFE34" /> <!-- Original name is "mnk_tied_talkroud" -->
-        <Animation Name="object_mnk_Anim_010298" Offset="0x10298" /> <!-- Original name is "mnk_tied_wait" -->
-        <Animation Name="object_mnk_Anim_0105DC" Offset="0x105DC" /> <!-- Original name is "mnk_wait"-->
-        <DList Name="object_mnk_DL_012770" Offset="0x12770" />
-        <DList Name="object_mnk_DL_012918" Offset="0x12918" />
-        <DList Name="object_mnk_DL_0129D0" Offset="0x129D0" />
-        <DList Name="object_mnk_DL_012A60" Offset="0x12A60" />
-        <DList Name="object_mnk_DL_012C10" Offset="0x12C10" />
-        <DList Name="object_mnk_DL_012E60" Offset="0x12E60" />
-        <DList Name="object_mnk_DL_012F48" Offset="0x12F48" />
-        <DList Name="object_mnk_DL_0132A8" Offset="0x132A8" />
-        <DList Name="object_mnk_DL_013430" Offset="0x13430" />
-        <DList Name="object_mnk_DL_013550" Offset="0x13550" />
-        <DList Name="object_mnk_DL_013660" Offset="0x13660" />
-        <DList Name="object_mnk_DL_013818" Offset="0x13818" />
-        <DList Name="object_mnk_DL_013938" Offset="0x13938" />
-        <DList Name="object_mnk_DL_013A48" Offset="0x13A48" />
-        <DList Name="object_mnk_DL_013C00" Offset="0x13C00" />
-        <DList Name="object_mnk_DL_013E80" Offset="0x13E80" />
-        <DList Name="object_mnk_DL_014080" Offset="0x14080" />
-        <DList Name="object_mnk_DL_014310" Offset="0x14310" />
-        <DList Name="object_mnk_DL_014590" Offset="0x14590" />
-        <DList Name="object_mnk_DL_014790" Offset="0x14790" />
-        <Texture Name="object_mnk_TLUT_014A20" OutName="tlut_014A20" Format="rgba16" Width="16" Height="16" Offset="0x14A20" />
-        <Texture Name="object_mnk_Tex_014C20" OutName="tex_014C20" Format="ci8" Width="32" Height="32" Offset="0x14C20" />
-        <Texture Name="object_mnk_Tex_015020" OutName="tex_015020" Format="ci8" Width="32" Height="64" Offset="0x15020" />
-        <Texture Name="object_mnk_Tex_015820" OutName="tex_015820" Format="ci8" Width="16" Height="16" Offset="0x15820" />
-        <Texture Name="object_mnk_Tex_015920" OutName="tex_015920" Format="ci8" Width="32" Height="64" Offset="0x15920" />
-        <Texture Name="object_mnk_Tex_016120" OutName="tex_016120" Format="ci8" Width="32" Height="64" Offset="0x16120" />
-        <Texture Name="object_mnk_Tex_016920" OutName="tex_016920" Format="ci8" Width="32" Height="64" Offset="0x16920" />
-        <Texture Name="object_mnk_Tex_017120" OutName="tex_017120" Format="ci8" Width="32" Height="64" Offset="0x17120" />
-        <Texture Name="object_mnk_Tex_017920" OutName="tex_017920" Format="ci8" Width="32" Height="64" Offset="0x17920" />
-        <Texture Name="object_mnk_Tex_018120" OutName="tex_018120" Format="ci8" Width="32" Height="64" Offset="0x18120" />
-        <Texture Name="object_mnk_Tex_018920" OutName="tex_018920" Format="ci8" Width="16" Height="16" Offset="0x18920" />
-        <Texture Name="object_mnk_Tex_018A20" OutName="tex_018A20" Format="ci8" Width="32" Height="32" Offset="0x18A20" />
-        <Texture Name="object_mnk_Tex_018E20" OutName="tex_018E20" Format="ci8" Width="16" Height="16" Offset="0x18E20" />
-        <Texture Name="object_mnk_Tex_018F20" OutName="tex_018F20" Format="rgba16" Width="32" Height="32" Offset="0x18F20" />
-        <Texture Name="object_mnk_Tex_019720" OutName="tex_019720" Format="ci8" Width="16" Height="16" Offset="0x19720" />
-        <Texture Name="object_mnk_Tex_019820" OutName="tex_019820" Format="ci8" Width="16" Height="16" Offset="0x19820" />
-        <Texture Name="object_mnk_Tex_019920" OutName="tex_019920" Format="ci8" Width="16" Height="16" Offset="0x19920" />
-        <!-- <Blob Name="object_mnk_Blob_019A20" Size="0x8" Offset="0x19A20" /> -->
-        <Limb Name="object_mnk_Standardlimb_019A28" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_01" Offset="0x19A28" />
-        <Limb Name="object_mnk_Standardlimb_019A34" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_02" Offset="0x19A34" />
-        <Limb Name="object_mnk_Standardlimb_019A40" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_03" Offset="0x19A40" />
-        <Limb Name="object_mnk_Standardlimb_019A4C" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_04" Offset="0x19A4C" />
-        <Limb Name="object_mnk_Standardlimb_019A58" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_05" Offset="0x19A58" />
-        <Limb Name="object_mnk_Standardlimb_019A64" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_06" Offset="0x19A64" />
-        <Limb Name="object_mnk_Standardlimb_019A70" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_07" Offset="0x19A70" />
-        <Limb Name="object_mnk_Standardlimb_019A7C" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_08" Offset="0x19A7C" />
-        <Limb Name="object_mnk_Standardlimb_019A88" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_09" Offset="0x19A88" />
-        <Limb Name="object_mnk_Standardlimb_019A94" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0A" Offset="0x19A94" />
-        <Limb Name="object_mnk_Standardlimb_019AA0" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0B" Offset="0x19AA0" />
-        <Limb Name="object_mnk_Standardlimb_019AAC" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0C" Offset="0x19AAC" />
-        <Limb Name="object_mnk_Standardlimb_019AB8" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0D" Offset="0x19AB8" />
-        <Limb Name="object_mnk_Standardlimb_019AC4" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0E" Offset="0x19AC4" />
-        <Limb Name="object_mnk_Standardlimb_019AD0" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_0F" Offset="0x19AD0" />
-        <Limb Name="object_mnk_Standardlimb_019ADC" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_10" Offset="0x19ADC" />
-        <Limb Name="object_mnk_Standardlimb_019AE8" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_11" Offset="0x19AE8" />
-        <Limb Name="object_mnk_Standardlimb_019AF4" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_12" Offset="0x19AF4" />
-        <Limb Name="object_mnk_Standardlimb_019B00" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_13" Offset="0x19B00" />
-        <Limb Name="object_mnk_Standardlimb_019B0C" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_14" Offset="0x19B0C" />
-        <Limb Name="object_mnk_Standardlimb_019B18" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_15" Offset="0x19B18" />
-        <Limb Name="object_mnk_Standardlimb_019B24" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_16" Offset="0x19B24" />
-        <Skeleton Name="gMonkeySkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_2_LIMB_NONE" LimbMax="OBJECT_MNK_2_LIMB_MAX" EnumName="ObjectMnk2Limb" Offset="0x19B88" />
-        <Animation Name="object_mnk_Anim_01A4F8" Offset="0x1A4F8" /> <!-- Original name is "mnk_onnikiruze" -->
-        <Animation Name="object_mnk_Anim_01B468" Offset="0x1B468" /> <!-- Original name is "mnk_wakatte" -->
-        <Animation Name="object_mnk_Anim_01BB0C" Offset="0x1BB0C" /> <!-- Original name is "mnk_wakatte_loop" -->
-        <Animation Name="object_mnk_Anim_01C17C" Offset="0x1C17C" /> <!-- Original name is "mnk_wakatte_modori" -->
-        <Animation Name="object_mnk_Anim_01C1B8" Offset="0x1C1B8" /> <!-- Original name is "mnk_rope_guttari" -->
-        <Animation Name="object_mnk_Anim_01C1F8" Offset="0x1C1F8" /> <!-- Original name is "mnk_rope_hikiage" -->
-        <Animation Name="gMonkeyHangingRopeStruggleAnim" Offset="0x1C3B4" /> <!-- Original name is "mnk_rope_mogaku_mdl" -->
-        <DList Name="object_mnk_DL_01C660" Offset="0x1C660" />
-        <DList Name="object_mnk_DL_01C770" Offset="0x1C770" />
-        <DList Name="object_mnk_DL_01C818" Offset="0x1C818" />
-        <Texture Name="object_mnk_Tex_01C8E8" OutName="tex_01C8E8" Format="rgba16" Width="16" Height="16" Offset="0x1C8E8" />
-        <Texture Name="object_mnk_Tex_01CAE8" OutName="tex_01CAE8" Format="rgba16" Width="32" Height="32" Offset="0x1CAE8" />
-        <Texture Name="object_mnk_Tex_01D2E8" OutName="tex_01D2E8" Format="rgba16" Width="16" Height="16" Offset="0x1D2E8" />
-        <Limb Name="object_mnk_Standardlimb_01D4E8" Type="Standard" EnumName="OBJECT_MNK_3_LIMB_01" Offset="0x1D4E8" />
-        <Limb Name="object_mnk_Standardlimb_01D4F4" Type="Standard" EnumName="OBJECT_MNK_3_LIMB_02" Offset="0x1D4F4" />
-        <Limb Name="object_mnk_Standardlimb_01D500" Type="Standard" EnumName="OBJECT_MNK_3_LIMB_03" Offset="0x1D500" />
-        <Skeleton Name="gMonkeyHangingRopeSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_3_LIMB_NONE" LimbMax="OBJECT_MNK_3_LIMB_MAX" EnumName="ObjectMnk3Limb" Offset="0x1D518" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_moonend.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_moonend.xml
deleted file mode 100644
index de643308b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_moonend.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<Root>
-    <File Name="object_moonend" Segment="6">
-        <!--<Blob Name="object_moonend_Blob_000000" Size="0x1214" Offset="0x0" />
-        <Blob Name="object_moonend_Blob_001214" Size="0x1C" Offset="0x1214" />-->
-        <KeyFrameAnimation Name="gMoonendKFAnim_1214" Skel="0xB5A0" Offset="0x1214"/>
-        <DList Name="object_moonend_DL_0055F0" Offset="0x55F0" />
-        <DList Name="object_moonend_DL_0061F8" Offset="0x61F8" />
-        <DList Name="object_moonend_DL_006460" Offset="0x6460" />
-        <DList Name="object_moonend_DL_006588" Offset="0x6588" />
-        <DList Name="object_moonend_DL_0066B0" Offset="0x66B0" />
-        <DList Name="object_moonend_DL_0067D8" Offset="0x67D8" />
-        <DList Name="object_moonend_DL_006900" Offset="0x6900" />
-        <DList Name="object_moonend_DL_006A28" Offset="0x6A28" />
-        <DList Name="object_moonend_DL_006B50" Offset="0x6B50" />
-        <Texture Name="object_moonend_TLUT_006CF0" OutName="tlut_006CF0" Format="rgba16" Width="4" Height="4" Offset="0x6CF0" />
-        <Texture Name="object_moonend_TLUT_006D10" OutName="tlut_006D10" Format="rgba16" Width="4" Height="4" Offset="0x6D10" />
-        <Texture Name="object_moonend_Tex_006D30" OutName="tex_006D30" Format="rgba16" Width="32" Height="32" Offset="0x6D30" />
-        <Texture Name="object_moonend_Tex_007530" OutName="tex_007530" Format="rgba16" Width="64" Height="32" Offset="0x7530" />
-        <Texture Name="object_moonend_Tex_008530" OutName="tex_008530" Format="ci4" Width="64" Height="64" Offset="0x8530" />
-        <Texture Name="object_moonend_Tex_008D30" OutName="tex_008D30" Format="ci4" Width="64" Height="64" Offset="0x8D30" />
-        <Texture Name="object_moonend_Tex_009530" OutName="tex_009530" Format="i8" Width="64" Height="64" Offset="0x9530" />
-        <Texture Name="object_moonend_Tex_00A530" OutName="tex_00A530" Format="i8" Width="64" Height="64" Offset="0xA530" />
-        <TextureAnimation Name="object_moonend_Matanimheader_00B540" Offset="0xB540" />
-
-        <KeyFrameSkel Name="gMoonendKFSkel_B5A0" LimbType="Flex" Offset="0xB5A0"/>
-
-        <!--<Blob Name="object_moonend_Blob_00B550" Size="0x50" Offset="0xB550" />
-        <Blob Name="object_moonend_Blob_00B5A0" Size="0x170" Offset="0xB5A0" />-->
-
-        <DList Name="object_moonend_DL_00CCF0" Offset="0xCCF0" />
-        <DList Name="object_moonend_DL_00CF58" Offset="0xCF58" />
-        <DList Name="object_moonend_DL_00D080" Offset="0xD080" />
-        <DList Name="object_moonend_DL_00D1A8" Offset="0xD1A8" />
-        <DList Name="object_moonend_DL_00D2D0" Offset="0xD2D0" />
-        <DList Name="object_moonend_DL_00D3F8" Offset="0xD3F8" />
-        <DList Name="object_moonend_DL_00D520" Offset="0xD520" />
-        <Texture Name="object_moonend_Tex_00D648" OutName="tex_00D648" Format="i8" Width="64" Height="64" Offset="0xD648" />
-        <TextureAnimation Name="object_moonend_Matanimheader_00E650" Offset="0xE650" />
-        <!-- <Blob Name="object_moonend_Blob_00E658" Size="0x48" Offset="0xE658" /> -->
-        <DList Name="object_moonend_DL_00EB00" Offset="0xEB00" />
-        <Texture Name="object_moonend_Tex_00EC58" OutName="tex_00EC58" Format="i8" Width="64" Height="64" Offset="0xEC58" />
-        <DList Name="object_moonend_DL_010C40" Offset="0x10C40" /> <!-- Original name is "rainbow_model" -->
-        <Texture Name="object_moonend_Tex_0111E0" OutName="tex_0111E0" Format="i8" Width="64" Height="64" Offset="0x111E0" />
-        <Texture Name="object_moonend_Tex_0121E0" OutName="tex_0121E0" Format="i8" Width="32" Height="64" Offset="0x121E0" />
-        <TextureAnimation Name="object_moonend_Matanimheader_0129F0" Offset="0x129F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_moonston.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_moonston.xml
deleted file mode 100644
index 2945469f2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_moonston.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!--
-        The Moon's Tear that can be seen falling from the telescope,
-        along with its associated fire trail.
-    -->
-    <File Name="object_moonston" Segment="6">
-        <DList Name="gFallingMoonsTearDL" Offset="0x400" /> <!-- Original name is "moon_stone_g1_FT_model" -->
-        <DList Name="gFallingMoonsTearFireDL" Offset="0x4C8" /> <!-- Original name is "moon_stone_g2_FT_model" -->
-        <Texture Name="gFallingMoonsTearTex" OutName="falling_moons_tear" Format="i8" Width="32" Height="32" Offset="0x608" />
-        <Texture Name="gFallingMoonsTearFireTex" OutName="falling_moons_tear_fire" Format="i8" Width="32" Height="64" Offset="0xA08" />
-        <TextureAnimation Name="gFallingMoonsTearTexAnim" Offset="0x1220" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ms.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ms.xml
deleted file mode 100644
index 1b3f86145..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ms.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<Root>
-    <File Name="object_ms" Segment="6">
-        <!-- Bean Salesman Animations -->
-        <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/> <!-- Original name is "ms_matsu" -->
-
-        <!-- Bean Salesman Limb DisplayLists -->
-        <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
-        <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
-        <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
-        <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
-        <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
-        <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
-        <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
-
-        <!-- Bean Salesman Palettes -->
-        <Texture Name="gBeanSalesmanTLUT" OutName="bean_salesman_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
-
-        <!-- Bean Salesman DisplayList Textures -->
-        <Texture Name="gBeanSalesmanBackOfHandTex" OutName="bean_salesman_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanTattooTex" OutName="bean_salesman_tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanMouthTex" OutName="bean_salesman_mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanEarTex" OutName="bean_salesman_ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanNoseTex" OutName="bean_salesman_nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanEyeTex" OutName="bean_salesman_eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanPantsTex" OutName="bean_salesman_pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanShoeTex" OutName="bean_salesman_shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanSkinGradientTex" OutName="bean_salesman_skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
-        <Texture Name="gBeanSalesmanBeanbagTex" OutName="bean_salesman_beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
-
-        <!-- Bean Salesman Limbs -->
-        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_ROOT" Offset="0x3D40"/>
-        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_LEFT_UPPER_ARM" Offset="0x3D4C"/>
-        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_LEFT_FOREARM" Offset="0x3D58"/>
-        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_LEFT_HAND" Offset="0x3D64"/>
-        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_HEAD" Offset="0x3D70"/>
-        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_MOUTH" Offset="0x3D7C"/>
-        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_BODY" Offset="0x3D88"/>
-        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_BEANBAG" Offset="0x3D94"/>
-
-        <!-- Bean Salesman Skeleton -->
-        <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" LimbNone="BEAN_SALESMAN_LIMB_NONE" LimbMax="BEAN_SALESMAN_LIMB_MAX" EnumName="BeanSalesmanLimb" Offset="0x3DC0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_msmo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_msmo.xml
deleted file mode 100644
index 6bfd0e46d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_msmo.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Object for the Moon Mask -->
-    <File Name="object_msmo" Segment="6">
-        <DList Name="gMoonMaskDL" Offset="0xE70" />
-        <Texture Name="gMoonMaskEyeTex" OutName="eye" Format="i8" Width="16" Height="16" Offset="0x1320" />
-        <Texture Name="gMoonMaskPatternTex" OutName="pattern" Format="i8" Width="16" Height="16" Offset="0x1420" />
-        <Texture Name="gMoonMaskSilverTex" OutName="silver" Format="i8" Width="16" Height="16" Offset="0x1520" />
-        <Texture Name="gMoonMaskGoldTex" OutName="gold" Format="i4" Width="16" Height="16" Offset="0x1620" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mtoride.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mtoride.xml
deleted file mode 100644
index 145fcd33f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mtoride.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<Root>
-    <!-- Assets for Woodfall scene objects (temple, water, walls, etc.) -->
-    <File Name="object_mtoride" Segment="6">
-        <!-- Textures for the Woodfall scenery. -->
-        <Texture Name="gWoodfallSceneryUnusedTLUT" OutName="woodfall_scenery_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="gWoodfallSceneryBranchAndLeavesTLUT" OutName="woodfall_scenery_branch_and_leaves_tlut" Format="rgba16" Width="4" Height="4" Offset="0x200" />
-        <Texture Name="gWoodfallSceneryTreeRingTex" OutName="woodfall_scenery_tree_ring" Format="rgba16" Width="16" Height="16" Offset="0x220" />
-        <Texture Name="gWoodfallSceneryBranchAndLeavesTex" OutName="woodfall_scenery_branch_and_leaves" Format="ci4" Width="32" Height="128" Offset="0x420" />
-        <Texture Name="gWoodfallSceneryEntranceGradientTex" OutName="woodfall_scenery_entrance_gradient" Format="ia8" Width="32" Height="8" Offset="0xC20" />
-        <Texture Name="gWoodfallSceneryTempleEdgeAndRampAndPlatformTopTex" OutName="woodfall_scenery_temple_edges_and_ramp_and_platform_top" Format="rgba16" Width="32" Height="32" Offset="0xD20" />
-        <Texture Name="gWoodfallSceneryTempleEntranceAndRampSidesTex" OutName="woodfall_scenery_temple_entrance_and_ramp_sides" Format="rgba16" Width="32" Height="64" Offset="0x1520" />
-        <Texture Name="gWoodfallSceneryTempleSidesTex" OutName="woodfall_scenery_temple_sides" Format="rgba16" Width="32" Height="64" Offset="0x2520" />
-        <Texture Name="gWoodfallSceneryTempleFloorAndTopTex" OutName="woodfall_scenery_temple_floor_and_top" Format="rgba16" Width="32" Height="32" Offset="0x3520" />
-        <Texture Name="gWoodfallSceneryTreeBarkTex" OutName="woodfall_scenery_tree_bark" Format="rgba16" Width="32" Height="64" Offset="0x3D20" />
-        <Texture Name="gWoodfallSceneryFaceDesignTex" OutName="woodfall_scenery_face_design" Format="rgba16" Width="32" Height="64" Offset="0x4D20" />
-        <Texture Name="gWoodfallSceneryPoisonWaterTex" OutName="woodfall_scenery_poison_water" Format="rgba16" Width="32" Height="32" Offset="0x5D20" />
-        <Texture Name="gWoodfallSceneryPoisonWallsScrollTex" OutName="woodfall_scenery_poison_walls_scroll" Format="rgba16" Width="32" Height="32" Offset="0x6520" />
-        <Texture Name="gWoodfallSceneryPoisonWallsTex" OutName="woodfall_scenery_poison_walls" Format="rgba16" Width="32" Height="32" Offset="0x6D20" />
-        <Texture Name="gWoodfallSceneryPurifiedWalls1Tex" OutName="woodfall_scenery_purified_walls_1" Format="rgba16" Width="16" Height="32" Offset="0x7520" />
-        <Texture Name="gWoodfallSceneryPurifiedWalls2Tex" OutName="woodfall_scenery_purified_walls_2" Format="rgba16" Width="32" Height="32" Offset="0x7920" />
-        <Texture Name="gWoodfallSceneryFloorBackgroundTex" OutName="woodfall_scenery_floor_background" Format="rgba16" Width="32" Height="32" Offset="0x8120" />
-        <Texture Name="gWoodfallSceneryFloorForegroundTex" OutName="woodfall_scenery_floor_foreground" Format="rgba16" Width="32" Height="32" Offset="0x8920" />
-        <Texture Name="gWoodfallSceneryPurifiedWaterTex" OutName="woodfall_scenery_purified_water" Format="rgba16" Width="32" Height="32" Offset="0x9120" />
-
-        <!-- Assets for the poison water whose vertices are dynamically adjusted when Woodfall Temple is raised. -->
-        <DList Name="gWoodfallSceneryDynamicPoisonWaterEmptyDL" Offset="0x9920" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gWoodfallSceneryDynamicPoisonWaterDL" Offset="0x9928" />
-        <TextureAnimation Name="gWoodfallSceneryDynamicPoisonWaterTexAnim" Offset="0x9D70" />
-
-        <!-- When walking or swimming in poisoned Woodfall, this collision is responsible for damaging the player. -->
-        <Collision Name="gWoodfallSceneryPoisonWaterDamageCol" Offset="0x9E4C" />
-        
-        <!-- Assets for the walls of Woodfall when the swamp is still poisoned. -->
-        <DList Name="gWoodfallSceneryPoisonWallsEmptyDL" Offset="0xA390" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gWoodfallSceneryPoisonWallsDL" Offset="0xA398" /> <!-- Original name is "z2_21_DOKUkabe_model" ("doku" = "poison", "kabe" = "wall") -->
-        <TextureAnimation Name="gWoodfallSceneryPoisonWallsTexAnim" Offset="0xA5C0" />
-
-        <!-- Assets for the static poison water in Woodfall. -->
-        <DList Name="gWoodfallSceneryPoisonWaterEmptyDL" Offset="0xA8F0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gWoodfallSceneryPoisonWaterDL" Offset="0xA8F8" /> <!-- Original name is "z2_21_DOKUwater_model" -->
-        <TextureAnimation Name="gWoodfallSceneryPoisonWaterTexAnim" Offset="0xAA50" />
-
-        <!-- Assets for the walls of Woodfall when the swamp is purified. -->
-        <DList Name="gWoodfallSceneryPurifiedWallsEmptyDL" Offset="0xAF90" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gWoodfallSceneryPurifiedWallsDL" Offset="0xAF98" /> <!-- Original name is "z2_21_kabe_model" -->
-        <TextureAnimation Name="gWoodfallSceneryPurifiedWallsTexAnim" Offset="0xB1A0" />
-
-        <!-- DisplayLists for Woodfall Temple. -->
-        <DList Name="gWoodfallSceneryTempleEntrancesDL" Offset="0xDE50" />
-        <DList Name="gWoodfallSceneryTempleDL" Offset="0xDF18" /> <!-- Original name is "z2_21_toride_model" ("fort, fortress") -->
-
-        <!-- Assets for the water the flows over Woodfall Temple during the cutscene where it rises from the water. -->
-        <DList Name="gWoodfallSceneryWaterFlowingOverTempleDL" Offset="0xF3C0" /> <!-- Original name is "z2_21_toride2_modelT" -->
-        <DList Name="gWoodfallSceneryWaterFlowingOverTempleEmptyDL" Offset="0xF758" /> <!-- Probably was the opaque component for the above DL -->
-        <TextureAnimation Name="gWoodfallSceneryWaterFlowingOverTempleTexAnim" Offset="0xF768" />
-
-        <!-- Assets for the ramp and platform that appear next to Woodfall Temple when the swamp is purified. -->
-        <DList Name="gWoodfallSceneryTempleRampAndPlatformEmptyDL" Offset="0xFAE0" /> <!-- Probably was the transparent component for the below DL -->
-        <DList Name="gWoodfallSceneryTempleRampAndPlatformDL" Offset="0xFAE8" /> <!-- Original name is "z2_21_toride3_model" -->
-        <Collision Name="gWoodfallSceneryTempleRampAndPlatformCol" Offset="0xFE5C" />
-
-        <!-- The collision for Woodfall Temple and an empty texture animation that was seemingly intended to be used with the temple. -->
-        <TextureAnimation Name="gWoodfallSceneryTempleTexAnim" Offset="0xFE90" />
-        <Collision Name="gWoodfallSceneryTempleCol" Offset="0x10C3C" />
-
-        <!-- Assets for the purified water in Woodfall, as well as the floor visible beneath the water. -->
-        <DList Name="gWoodfallSceneryPurifiedWaterDL" Offset="0x10EF0" /> <!-- Original name is "z2_21_water_modelT" -->
-        <DList Name="gWoodfallSceneryFloorDL" Offset="0x10FD8" /> <!-- Original name is "z2_21_water_model" -->
-        <TextureAnimation Name="gWoodfallSceneryPurifiedWaterTexAnim" Offset="0x110B8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mu.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mu.xml
deleted file mode 100644
index a72b184c1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_mu.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<Root>
-    <!-- Assets for Honey & Darling -->
-    <File Name="object_mu" Segment="6">
-        <Animation Name="gHoneyAndDarlingCupCheeksLoopAnim" Offset="0x1F74" /> <!-- Original name is "tg_betabeta" -->
-        <Animation Name="gHoneyAndDarlingHugLoopAnim" Offset="0x2F64" /> <!-- Original name is "tg_dakisime" -->
-        <Animation Name="gHoneyAndDarlingGameDanceLoopAnim" Offset="0x4904" /> <!-- Original name is "tg_dance" -->
-        <Animation Name="gHoneyAndDarlingHoldHandsLoopAnim" Offset="0x5304" /> <!-- Original name is "tg_ityaita" -->
-        <Animation Name="gHoneyAndDarlingIdleAnim" Offset="0x53E0" /> <!-- Original name is "tg_matsu" -->
-        <Texture Name="gHoneyAndDarlingTLUT" OutName="honey_and_darling_tlut" Format="rgba16" Width="16" Height="16" Offset="0x53F0" />
-        <Texture Name="gHoneyAndDarlingShirtsAndShoesTex" OutName="honey_and_darling_shirts_and_shoes" Format="i8" Width="16" Height="16" Offset="0x55F0" />
-        <Texture Name="gHoneyAndDarlingWomanDressTex" OutName="honey_and_darling_woman_dress" Format="ci8" Width="16" Height="16" Offset="0x56F0" />
-        <Texture Name="gHoneyAndDarlingJointShadeTex" OutName="honey_and_darling_joint_shade" Format="i8" Width="8" Height="8" Offset="0x57F0" /> <!-- For the man's shoulders, elbows, and knees, and the woman's elbows -->
-        <Texture Name="gHoneyAndDarlingHeadSkinTex" OutName="honey_and_darling_head_skin" Format="ci8" Width="8" Height="8" Offset="0x5830" /> <!-- For their necks, under chin, noses, cheeks, and foreheads -->
-        <Texture Name="gHoneyAndDarlingManHairTex" OutName="honey_and_darling_man_hair" Format="ci8" Width="16" Height="16" Offset="0x5870" /> 
-        <Texture Name="gHoneyAndDarlingEarTex" OutName="honey_and_darling_ear" Format="ci8" Width="8" Height="8" Offset="0x5970" />
-        <Texture Name="gHoneyAndDarlingMouthTex" OutName="honey_and_darling_mouth" Format="ci8" Width="32" Height="16" Offset="0x59B0" />
-        <Texture Name="gHoneyAndDarlingManEyeTex" OutName="honey_and_darling_man_eye" Format="ci8" Width="32" Height="32" Offset="0x5BB0" />
-        <Texture Name="gHoneyAndDarlingHandTex" OutName="honey_and_darling_hand" Format="ci8" Width="8" Height="8" Offset="0x5FB0" />
-        <Texture Name="gHoneyAndDarlingWomanHairTex" OutName="honey_and_darling_woman_hair" Format="ci8" Width="8" Height="16" Offset="0x5FF0" />
-        <Texture Name="gHoneyAndDarlingWomanEyeTex" OutName="honey_and_darling_woman_eye" Format="ci8" Width="32" Height="32" Offset="0x6070" />
-        <DList Name="gHoneyAndDarlingLegsDL" Offset="0x9370" />
-        <DList Name="gHoneyAndDarlingWomanHeadDL" Offset="0x96C8" />
-        <DList Name="gHoneyAndDarlingWomanRightHandDL" Offset="0x9BC8" />
-        <DList Name="gHoneyAndDarlingWomanRightForearmDL" Offset="0x9D10" />
-        <DList Name="gHoneyAndDarlingWomanRightUpperArmDL" Offset="0x9E10" />
-        <DList Name="gHoneyAndDarlingWomanLeftHandDL" Offset="0x9F10" />
-        <DList Name="gHoneyAndDarlingWomanLeftForearmDL" Offset="0xA058" />
-        <DList Name="gHoneyAndDarlingWomanLeftUpperArmDL" Offset="0xA158" />
-        <DList Name="gHoneyAndDarlingWomanTorsoDL" Offset="0xA258" />
-        <DList Name="gHoneyAndDarlingManTorsoDL" Offset="0xA3C8" />
-        <DList Name="gHoneyAndDarlingManHeadDL" Offset="0xA510" />
-        <DList Name="gHoneyAndDarlingManRightUpperArmDL" Offset="0xAA10" />
-        <DList Name="gHoneyAndDarlingManRightForearmDL" Offset="0xAB10" />
-        <DList Name="gHoneyAndDarlingManRightHandDL" Offset="0xAC10" />
-        <DList Name="gHoneyAndDarlingManLeftUpperArmDL" Offset="0xAD58" />
-        <DList Name="gHoneyAndDarlingManLeftForearmDL" Offset="0xAE58" />
-        <DList Name="gHoneyAndDarlingManLeftHandDL" Offset="0xAF58" />
-        <DList Name="gHoneyAndDarlingHeartMaterialDL" Offset="0xB0A0" />
-        <DList Name="gHoneyAndDarlingHeartModelDL" Offset="0xB0E0" />
-        <Limb Name="gHoneyAndDarlingLegsLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_LEGS" Offset="0xB170" />
-        <Limb Name="gHoneyAndDarlingManTorsoLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_TORSO" Offset="0xB17C" />
-        <Limb Name="gHoneyAndDarlingManLeftUpperArmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_LEFT_UPPER_ARM" Offset="0xB188" />
-        <Limb Name="gHoneyAndDarlingManLeftForearmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_LEFT_FOREARM" Offset="0xB194" />
-        <Limb Name="gHoneyAndDarlingManLeftHandLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_LEFT_HAND" Offset="0xB1A0" />
-        <Limb Name="gHoneyAndDarlingManRightUpperArmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_RIGHT_UPPER_ARM" Offset="0xB1AC" />
-        <Limb Name="gHoneyAndDarlingManRightForearmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_RIGHT_FOREARM" Offset="0xB1B8" />
-        <Limb Name="gHoneyAndDarlingManRightHandLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_RIGHT_HAND" Offset="0xB1C4" />
-        <Limb Name="gHoneyAndDarlingManHeadLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_MAN_HEAD" Offset="0xB1D0" />
-        <Limb Name="gHoneyAndDarlingWomanRootLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_ROOT" Offset="0xB1DC" />
-        <Limb Name="gHoneyAndDarlingWomanTorsoLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_TORSO" Offset="0xB1E8" />
-        <Limb Name="gHoneyAndDarlingWomanLeftUpperArmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_LEFT_UPPER_ARM" Offset="0xB1F4" />
-        <Limb Name="gHoneyAndDarlingWomanLeftForearmRootLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_LEFT_FOREARM_ROOT" Offset="0xB200" />
-        <Limb Name="gHoneyAndDarlingWomanLeftForearmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_LEFT_FOREARM" Offset="0xB20C" />
-        <Limb Name="gHoneyAndDarlingWomanLeftHandLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_LEFT_HAND" Offset="0xB218" />
-        <Limb Name="gHoneyAndDarlingWomanRightUpperArmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_RIGHT_UPPER_ARM" Offset="0xB224" />
-        <Limb Name="gHoneyAndDarlingWomanRightForearmRootLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_RIGHT_FOREARM_ROOT" Offset="0xB230" />
-        <Limb Name="gHoneyAndDarlingWomanRightForearmLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_RIGHT_FOREARM" Offset="0xB23C" />
-        <Limb Name="gHoneyAndDarlingWomanRightHandLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_RIGHT_HAND" Offset="0xB248" />
-        <Limb Name="gHoneyAndDarlingWomanHeadLimb" Type="Standard" EnumName="HONEY_AND_DARLING_LIMB_WOMAN_HEAD" Offset="0xB254" />
-        <Skeleton Name="gHoneyAndDarlingSkel" Type="Flex" LimbType="Standard" LimbNone="HONEY_AND_DARLING_LIMB_NONE" LimbMax="HONEY_AND_DARLING_LIMB_MAX" EnumName="HoneyAndDarlingLimb" Offset="0xB2B0" />
-        <Animation Name="gHoneyAndDarlingSurpiseAnim" Offset="0xBAC4" /> <!-- Original name is "tg_odoroku" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_nb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_nb.xml
deleted file mode 100644
index f169abed9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_nb.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<Root>
-    <!-- Assets for Anju's Grandma -->
-    <File Name="object_nb" Segment="6">
-        <!-- Anju's Grandma Animations-->
-        <Animation Name="gNbTalkAnim" Offset="0x290" /> <!-- Original name is "nb_talk01" -->
-        <Animation Name="gNbAngryAnim" Offset="0x52C" /> <!-- Original name is "nb_talk02" -->
-        <Animation Name="gNbRelievedAnim" Offset="0x6D4" /> <!-- Original name is "nb_talk03" -->
-        <Animation Name="gNbIdleAnim" Offset="0x990" /> <!-- Original name is "nb_wait01" -->
-
-        <!-- Anju's Grandma DisplayLists -->
-        <DList Name="gNbWheelchairDL" Offset="0x4A70" /> <!-- Includes legs -->
-        <DList Name="gNbRightWheelDL" Offset="0x5170" />
-        <DList Name="gNbLeftWheelDL" Offset="0x5430" />
-        <DList Name="gNbTorsoDL" Offset="0x56F0" />
-        <DList Name="gNbNeckDL" Offset="0x5988" />
-        <DList Name="gNbHeadDL" Offset="0x5AA8" />
-        <DList Name="gNbArmsBookDL" Offset="0x6390" />
-
-        <!-- Anju's Grandma TLUTs -->
-        <Texture Name="object_nb_TLUT_006910" OutName="tlut_006910" Format="rgba16" Width="16" Height="16" Offset="0x6910" />
-        <Texture Name="object_nb_TLUT_006B10" OutName="tlut_006B10" Format="rgba16" Width="16" Height="16" Offset="0x6B10" />
-        <Texture Name="gNbTigerTLUT" OutName="nb_tiger_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6D10" />
-
-        <!-- Anju's Grandma Textures -->
-        <Texture Name="gNbSkinTex" OutName="nb_skin" Format="ci8" Width="8" Height="8" Offset="0x6F10" TlutOffset="0x6910" />
-        <Texture Name="gNbEarTex" OutName="nb_ear" Format="ci8" Width="16" Height="16" Offset="0x6F50" TlutOffset="0x6910" />
-        <Texture Name="object_nb_Tex_007050" OutName="tex_007050" Format="ci8" Width="16" Height="16" Offset="0x7050" TlutOffset="0x6910" />
-        <Texture Name="gNbUpperEyelidTex" OutName="nb_upper_eyelid" Format="ci8" Width="16" Height="8" Offset="0x7150" TlutOffset="0x6910" />
-        <Texture Name="gNbHairTex" OutName="nb_hair" Format="ci8" Width="16" Height="32" Offset="0x71D0" TlutOffset="0x6B10" />
-        <Texture Name="gNbEyeTex" OutName="nb_eye" Format="ci8" Width="16" Height="8" Offset="0x73D0" TlutOffset="0x6910" />
-        <Texture Name="gNbLowerEyelidTex" OutName="nb_lower_eyelid" Format="ci8" Width="16" Height="8" Offset="0x7450" TlutOffset="0x6910" />
-        <Texture Name="object_nb_Tex_0074D0" OutName="tex_0074D0" Format="ci8" Width="16" Height="8" Offset="0x74D0" TlutOffset="0x6D10" />
-        <Texture Name="object_nb_Tex_007550" OutName="tex_007550" Format="ci8" Width="16" Height="16" Offset="0x7550" TlutOffset="0x6B10" />
-        <Texture Name="object_nb_Tex_007650" OutName="tex_007650" Format="i8" Width="16" Height="16" Offset="0x7650" />
-        <Texture Name="object_nb_Tex_007750" OutName="tex_007750" Format="rgba16" Width="8" Height="8" Offset="0x7750" />
-        <Texture Name="object_nb_Tex_0077D0" OutName="tex_0077D0" Format="ci8" Width="16" Height="16" Offset="0x77D0" TlutOffset="0x6B10" />
-        <Texture Name="object_nb_Tex_0078D0" OutName="tex_0078D0" Format="ci8" Width="16" Height="16" Offset="0x78D0" TlutOffset="0x6B10" />
-        <Texture Name="object_nb_Tex_0079D0" OutName="tex_0079D0" Format="ci8" Width="32" Height="16" Offset="0x79D0" TlutOffset="0x6B10" />
-        <Texture Name="gNbBookCoverTex" OutName="nb_book_cover" Format="ci8" Width="16" Height="16" Offset="0x7BD0" TlutOffset="0x6B10" />
-        <Texture Name="gNbSkirtTex" OutName="nb_skirt" Format="ci8" Width="16" Height="16" Offset="0x7CD0" TlutOffset="0x6910" />
-        <Texture Name="gNbBookPageTex" OutName="nb_book_page" Format="ci8" Width="16" Height="16" Offset="0x7DD0" TlutOffset="0x6D10" />
-        <Texture Name="gNbFingersTex" OutName="nb_fingers" Format="ci8" Width="16" Height="16" Offset="0x7ED0" TlutOffset="0x6910" />
-        <Texture Name="gNbTigerTex" OutName="nb_tiger" Format="ci8" Width="32" Height="64" Offset="0x7FD0" TlutOffset="0x6D10" />
-        <Texture Name="object_nb_Tex_0087D0" OutName="tex_0087D0" Format="ci8" Width="32" Height="32" Offset="0x87D0" TlutOffset="0x6B10" />
-
-        <!-- Anju's Grandma Limbs -->
-        <Limb Name="gNbWheelchairLimb" Type="Standard" EnumName="NB_LIMB_WHEELCHAIR" Offset="0x8BD0" />
-        <Limb Name="gNbTorsoLimb" Type="Standard" EnumName="NB_LIMB_TORSO" Offset="0x8BDC" />
-        <Limb Name="gNbArmsBookLimb" Type="Standard" EnumName="NB_LIMB_ARMS_BOOK" Offset="0x8BE8" />
-        <Limb Name="gNbNeckLimb" Type="Standard" EnumName="NB_LIMB_NECK" Offset="0x8BF4" />
-        <Limb Name="gNbHeadLimb" Type="Standard" EnumName="NB_LIMB_HEAD" Offset="0x8C00" />
-        <Limb Name="gNbLeftWheelLimb" Type="Standard" EnumName="NB_LIMB_LEFT_WHEEL" Offset="0x8C0C" />
-        <Limb Name="gNbRightWheelLimb" Type="Standard" EnumName="NB_LIMB_RIGHT_WHEEL" Offset="0x8C18" />
-
-        <!-- Anju's Grandma Skeleton -->
-        <Skeleton Name="gNbSkel" Type="Flex" LimbType="Standard" LimbNone="NB_LIMB_NONE" LimbMax="NB_LIMB_MAX" EnumName="NbLimb" Offset="0x8C40" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_niw.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_niw.xml
deleted file mode 100644
index fcc178dde..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_niw.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-    <!-- Cucco: zelda name for chicken, "Niw" likely short for "Niwatori" -->
-    <File Name="object_niw" Segment="6">
-        <Animation Name="gNiwIdleAnim" Offset="0xE8" /> <!-- Original name is "nw_wait" -->
-        <DList Name="gNiwNeckDL" Offset="0x9C0" />
-        <DList Name="gNiwHeadDL" Offset="0xA98" />
-        <DList Name="gNiwTailDL" Offset="0xDF0" />
-        <DList Name="gNiwWingLeftDL" Offset="0xFD0" />
-        <DList Name="gNiwFootLeftDL" Offset="0x1088" />
-        <DList Name="gNiwWingRightDL" Offset="0x1128" />
-        <DList Name="gNiwFootRightDL" Offset="0x11E0" />
-        <Texture Name="gNiwEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x1280" />
-        <Texture Name="gNiwHeadFeathersTex" OutName="head_feathers" Format="rgba16" Width="8" Height="16" Offset="0x1480" />
-        <Texture Name="gNiwBaseFeathersTex" OutName="base_feathers" Format="rgba16" Width="8" Height="8" Offset="0x1580" />
-        <Texture Name="gNiwBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x1600" />
-        <Texture Name="gNiwCombTex" OutName="comb" Format="rgba16" Width="16" Height="16" Offset="0x1680" />
-        <Texture Name="gNiwTailFeathersTex" OutName="tail_feathers" Format="rgba16" Width="32" Height="32" Offset="0x1880" />
-        <Texture Name="gNiwFootTex" OutName="foot" Format="rgba16" Width="8" Height="16" Offset="0x2080" />
-        <Texture Name="gNiwFeatherTex" OutName="feather" Format="rgba16" Width="16" Height="16" Offset="0x2180" />
-        <DList Name="gNiwFeatherMaterialDL" Offset="0x23B0" />
-        <DList Name="gNiwFeatherDL" Offset="0x2428" /> <!-- Original name is "nw_hane_model" -->
-
-        <Limb Name="gNiwRootLimb" LimbType="Standard" EnumName="NIW_LIMB_ROOT" Offset="0x2440"/>
-        <Limb Name="gNiwLimb_244C" LimbType="Standard" EnumName="NIW_LIMB_2" Offset="0x244C"/>
-        <Limb Name="gNiwLimb_2458" LimbType="Standard" EnumName="NIW_LIMB_3" Offset="0x2458"/>
-        <Limb Name="gNiwTailAndUndersideLimb" LimbType="Standard" EnumName="NIW_LIMB_UNDER_SIDE" Offset="0x2464"/>
-        <Limb Name="gNiwLeftFootRootLimb" LimbType="Standard" EnumName="NIW_LIMB_LEFT_FOOT_ROOT" Offset="0x2470"/>
-        <Limb Name="gNiwLeftFootLimb" LimbType="Standard" EnumName="NIW_LIMB_LEFT_FOOT" Offset="0x247C"/>
-        <Limb Name="gNiwLeftWingRootLimb" LimbType="Standard" EnumName="NIW_LIMB_LEFT_WING_ROOT" Offset="0x2488"/>
-        <Limb Name="gNiwLeftWingLimb" LimbType="Standard" EnumName="NIW_LIMB_LEFT_WING" Offset="0x2494"/>
-        <Limb Name="gNiwRightFootRootLimb" LimbType="Standard" EnumName="NIW_LIMB_RIGHT_FOOT_ROOT" Offset="0x24A0"/>
-        <Limb Name="gNiwRightFootLimb" LimbType="Standard" EnumName="NIW_LIMB_RIGHT_FOOT" Offset="0x24AC"/>
-        <Limb Name="gNiwRightWingRootLimb" LimbType="Standard" EnumName="NIW_LIMB_RIGHT_WING_ROOT" Offset="0x24B8"/>
-        <Limb Name="gNiwRightWingLimb" LimbType="Standard" EnumName="NIW_LIMB_RIGHT_WING" Offset="0x24C4"/>
-        <Limb Name="gNiwUpperBodyRootLimb" LimbType="Standard" EnumName="NIW_LIMB_UPPER_BODY" Offset="0x24D0"/>
-        <Limb Name="gNiwNeckLimb" LimbType="Standard" EnumName="NIW_LIMB_NECK" Offset="0x24DC"/>
-        <Limb Name="gNiwHeadLimb" LimbType="Standard" EnumName="NIW_LIMB_HEAD" Offset="0x24E8"/>
-        <Skeleton Name="gNiwSkel" Type="Flex" LimbType="Standard" LimbNone="NIW_LIMB_NONE" LimbMax="NIW_LIMB_MAX" EnumName="ObjectNiwLimb" Offset="0x2530" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_nnh.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_nnh.xml
deleted file mode 100644
index 3a806c792..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_nnh.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- Son of the butler cursed into the corpse/body of a dead tree by Skullkid-->
-    <!--    the player walks past before meeting the Happy Mask Salesman -->
-    <File Name="object_nnh" Segment="6">
-        <DList Name="gButlerSonMainBodyDL" Offset="0x1510" /> <!-- Original name is "nnh_body_model" -->
-        <Texture Name="gButlerSonTLUT" OutName="tlut_001AA0" Format="rgba16" Width="16" Height="16" Offset="0x1AA0" />
-
-        <!-- Similar to MainBodyTex but with dark green mold under the roots -->
-        <Texture Name="gButlerSonRootTex" OutName="roots" Format="ci8" Width="16" Height="16" Offset="0x1CA0" />
-        <Texture Name="gButlerSonMainBodyTex" OutName="body" Format="ci8" Width="16" Height="16" Offset="0x1DA0" />
-        <Texture Name="gButlerSonWholeLeafTex" OutName="whole_leaf" Format="rgba16" Width="32" Height="32" Offset="0x1EA0" />
-        <!-- Only his top left leaf has this circular cutout -->
-        <Texture Name="gButlerSonCutoutLeafTex" OutName="cutout_leaf" Format="rgba16" Width="32" Height="32" Offset="0x26A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_numa_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_numa_obj.xml
deleted file mode 100644
index ea2aa74a6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_numa_obj.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<Root>
-    <!-- Assets for actors in Woodfall Temple (doors, staircases, the wooden flower, poisoned/purified water) -->
-    <File Name="object_numa_obj" Segment="6">
-        <DList Name="object_numa_obj_DL_0007A0" Offset="0x7A0" /> <!-- Original name is "m2_NumaRasenSita_modelT" -->
-        <DList Name="object_numa_obj_DL_0007A8" Offset="0x7A8" /> <!-- Original name is "m2_NumaRasenSita_model" -->
-        <DList Name="object_numa_obj_DL_0014C0" Offset="0x14C0" /> <!-- Original name is "m2_NumaRasenSita_PT_modelT" -->
-        <DList Name="object_numa_obj_DL_0014C8" Offset="0x14C8" /> <!-- Original name is "m2_NumaRasenSita_PT_model" -->
-        <Texture Name="object_numa_obj_Tex_001D60" OutName="tex_001D60" Format="rgba16" Width="32" Height="64" Offset="0x1D60" />
-        <Texture Name="object_numa_obj_Tex_002D60" OutName="tex_002D60" Format="rgba16" Width="32" Height="32" Offset="0x2D60" />
-        <Texture Name="object_numa_obj_Tex_003560" OutName="tex_003560" Format="rgba16" Width="32" Height="32" Offset="0x3560" />
-        <DList Name="object_numa_obj_DL_004440" Offset="0x4440" /> <!-- Original name is "m2_NumaRasenUe_modelT" -->
-        <DList Name="object_numa_obj_DL_004448" Offset="0x4448" /> <!-- Original name is "m2_NumaRasenUe_model" -->
-        <DList Name="object_numa_obj_DL_0051B0" Offset="0x51B0" /> <!-- Original name is "m2_NumaRasenUe_PT_modelT" -->
-        <DList Name="object_numa_obj_DL_0051B8" Offset="0x51B8" /> <!-- Original name is "m2_NumaRasenUe_PT_model" -->
-        <DList Name="gWoodfallDoorDL" Offset="0x5DF0" />
-        <Texture Name="object_numa_obj_Tex_005FC0" OutName="tex_005FC0" Format="rgba16" Width="32" Height="64" Offset="0x5FC0" />
-        <DList Name="object_numa_obj_DL_007150" Offset="0x7150" /> <!-- Original name is "m2_N_shutter1_model" -->
-        <Texture Name="object_numa_obj_Tex_0072B0" OutName="tex_0072B0" Format="rgba16" Width="32" Height="64" Offset="0x72B0" />
-        <DList Name="object_numa_obj_DL_008440" Offset="0x8440" /> <!-- Original name is "m2_N_shutter2_model" -->
-        <Texture Name="object_numa_obj_Tex_0085A0" OutName="tex_0085A0" Format="rgba16" Width="32" Height="64" Offset="0x85A0" />
-
-        <!-- Wooden Flower -->
-        <Collision Name="gWoodenFlowerOpenedFlowerCol" Offset="0x9FE0" /> <!-- Original name is "m2_N_HANAafter_bgdatainfo" -->
-        <Collision Name="gWoodenFlowerClosedFlowerCol" Offset="0xA740" /> <!-- Original name is "m2_N_HANAdefault_bgdatainfo" -->
-        <DList Name="gWoodenFlowerEmpty1DL" Offset="0xAB80" /> <!-- Original name might be "m2_N_HANAin_modelT", may have originally been for transparency? -->
-        <DList Name="gWoodenFlowerInnerPetalDL" Offset="0xAB88" /> <!-- Original name is "m2_N_HANAin_model" -->
-        <DList Name="gWoodenFlowerEmpty2DL" Offset="0xB920" /> <!-- Original name might be "m2_N_HANAkuki_modelT", may have originally been for transparency? -->
-        <DList Name="gWoodenFlowerStalkDL" Offset="0xB928" /> <!-- Original name is "m2_N_HANAkuki_model" -->
-        <DList Name="gWoodenFlowerEmpty3DL" Offset="0xBE50" /> <!-- Original name might be "m2_N_HANAout_modelT", may have originally been for transparency? -->
-        <DList Name="gWoodenFlowerOuterPetalDL" Offset="0xBE58" /> <!-- Original name is "m2_N_HANAout_model" -->
-        <Texture Name="gWoodenFlowerPetalSidesTex" OutName="wooden_flower_petal_sides" Format="rgba16" Width="32" Height="32" Offset="0xBFD0" />
-        <Texture Name="gWoodenFlowerInnerPetalTopTex" OutName="wooden_flower_inner_petal_top" Format="rgba16" Width="32" Height="64" Offset="0xC7D0" />
-        <Texture Name="gWoodenFlowerInnerPetalBottomTex" OutName="wooden_flower_inner_petal_bottom" Format="rgba16" Width="32" Height="64" Offset="0xD7D0" />
-        <Texture Name="gWoodenFlowerStalkTopTex" OutName="wooden_flower_stalk_top" Format="rgba16" Width="32" Height="64" Offset="0xE7D0" />
-        <Texture Name="gWoodenFlowerStalkSidesTex" OutName="wooden_flower_stalk_sides" Format="rgba16" Width="32" Height="64" Offset="0xF7D0" />
-        <Texture Name="gWoodenFlowerOuterPetalTopTex" OutName="wooden_flower_outer_petal_top" Format="rgba16" Width="32" Height="64" Offset="0x107D0" />
-        <Texture Name="gWoodenFlowerOuterPetalBottomTex" OutName="wooden_flower_outer_petal_bottom" Format="rgba16" Width="32" Height="64" Offset="0x117D0" />
-
-        <Collision Name="object_numa_obj_Colheader_012818" Offset="0x12818" /> <!-- Original name is "m2_N_DOKUcode_bgdatainfo" -->
-        <DList Name="object_numa_obj_DL_0128E0" Offset="0x128E0" /> <!-- Original name is "m2_N_DOKUwater_modelT" -->
-        <DList Name="object_numa_obj_DL_0129C0" Offset="0x129C0" />
-        <DList Name="object_numa_obj_DL_012A60" Offset="0x12A60" /> <!-- Original name is "m2_N_DOKUwater03_modelT" -->
-        <DList Name="object_numa_obj_DL_012B40" Offset="0x12B40" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_012B58" Offset="0x12B58" />
-        <DList Name="object_numa_obj_DL_012BF0" Offset="0x12BF0" /> <!-- Original name is "m2_N_DOKUwater05_modelT" -->
-        <DList Name="object_numa_obj_DL_012CD0" Offset="0x12CD0" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_012CE8" Offset="0x12CE8" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_012CF8" Offset="0x12CF8" />
-        <DList Name="object_numa_obj_DL_012D90" Offset="0x12D90" /> <!-- Original name is "m2_N_water_modelT" -->
-        <DList Name="object_numa_obj_DL_012E70" Offset="0x12E70" />
-        <DList Name="object_numa_obj_DL_012F10" Offset="0x12F10" /> <!-- Original name is "m2_N_water03_modelT" -->
-        <DList Name="object_numa_obj_DL_012FF0" Offset="0x12FF0" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_013008" Offset="0x13008" />
-        <DList Name="object_numa_obj_DL_0130A0" Offset="0x130A0" /> <!-- Original name is "m2_N_water05_modelT" -->
-        <DList Name="object_numa_obj_DL_013180" Offset="0x13180" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_013198" Offset="0x13198" />
-        <TextureAnimation Name="object_numa_obj_Matanimheader_0131A8" Offset="0x131A8" />
-        <Texture Name="object_numa_obj_Tex_0131B0" OutName="tex_0131B0" Format="rgba16" Width="32" Height="32" Offset="0x131B0" />
-        <Texture Name="object_numa_obj_Tex_0139B0" OutName="tex_0139B0" Format="rgba16" Width="32" Height="32" Offset="0x139B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_nwc.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_nwc.xml
deleted file mode 100644
index 8c67159ce..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_nwc.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Root>
-    <!-- Cucco Chick: the little baby Cucco you find and raise in the Cucco Shack -->
-    <File Name="object_nwc" Segment="6">
-        <DList Name="gNwcEndDL" Offset="0x2E0" />
-        <DList Name="gNwcBodyDL" Offset="0x2E8" />
-        <Texture Name="gNwcBodyTex" OutName="body" Format="rgba16" Width="8" Height="8" Offset="0x4D0" />
-        <Texture Name="gNwcBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x550" />
-        <!-- Wing texture is reused for tail feathers -->
-        <Texture Name="gNwcWingTex" OutName="wing" Format="rgba16" Width="16" Height="16" Offset="0x5D0" />
-        <Texture Name="gNwcEyeOpenTex" OutName="eye_opened" Format="rgba16" Width="16" Height="16" Offset="0x7D0" />
-        <Texture Name="gNwcEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="16" Height="16" Offset="0x9D0" />
-        
-        <!-- **************************************************************************************** -->
-        <!-- *** Beyond this point is unused content, including broken display lists and textures *** -->
-        <!-- **************************************************************************************** -->
-
-        <!-- this blinking animated texture seems unused, as the actor cycles through blinking with code -->
-        <TextureAnimation Name="gNwcBlinkTexAnim" Offset="0xBEC" />
-        <!-- unused multi-colored texture? -->
-        <Texture Name="object_nwc_Tex_000C00" OutName="tex_000C00" Format="rgba16" Width="32" Height="32" Offset="0xC00" />
-        <DList Name="object_nwc_DL_001440" Offset="0x1440" />
-        <DList Name="object_nwc_DL_0014B8" Offset="0x14B8" />
-        <DList Name="object_nwc_DL_001520" Offset="0x1520" />
-        <!-- dark gold ball texture -->
-        <Texture Name="object_nwc_Tex_001550" OutName="tex_001550" Format="rgba16" Width="16" Height="16" Offset="0x1550" />
-        <!-- gold color pallet? -->
-        <Texture Name="object_nwc_Tex_001750" OutName="tex_001750" Format="rgba16" Width="4" Height="4" Offset="0x1750" />
-      
-        <!-- both of these display lists use the dark gold ball texture -->
-        <DList Name="object_nwc_DL_001860" Offset="0x1860" />
-        <DList Name="object_nwc_DL_0018D0" Offset="0x18D0" />
-
-        <!-- draws two untextured triangles like jack-o-lantern eyes -->
-        <DList Name="object_nwc_DL_001940" Offset="0x1940" />
-
-        <!-- both of these display lists use the yellow pallet texture -->
-        <DList Name="object_nwc_DL_001960" Offset="0x1960" />
-        <DList Name="object_nwc_DL_0019B8" Offset="0x19B8" />
-
-        <!-- in z64utils draws a un-textured tetrahedron -->
-        <DList Name="object_nwc_DL_001A10" Offset="0x1A10" />
-
-        <!-- contains an unsupported texture (i16) used in an unused display list ( @ 0x1B80 ) -->
-        <!-- is type G_IM_FMT_I, G_IM_SIZ_16b, dimensions are best guesses from Texture64 renders -->
-        <Texture Name="object_nwc_Tex_001A40" OutName="broken_tex_gimfmti_001A40" Format="ia16" Width="8" Height="16" Offset="0x1A40" />
-
-        <!-- Z64Utils throws an error for this DL because of the above texture -->
-        <DList Name="object_nwc_DL_001B80" Offset="0x1B80" />
-
-        <!-- requires unassigned segment 0x01 matrix to render, no idea what its doing -->
-        <DList Name="object_nwc_DL_001BE8" Offset="0x1BE8" />
-        <!-- loads a dark spot from gameplay keep -->
-        <DList Name="object_nwc_DL_001C10" Offset="0x1C10" />
-        <!-- unused DL produces a yellow textured triangle -->
-        <DList Name="object_nwc_DL_001C58" Offset="0x1C58" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ny.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ny.xml
deleted file mode 100644
index 3f2d3a908..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ny.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_ny" Segment="6">
-        <DList Name="object_ny_DL_000030" Offset="0x30" /> <!-- Original name is "ksl_kusari_modelT" -->
-        <DList Name="object_ny_DL_0000B8" Offset="0xB8" />
-        <Texture Name="object_ny_Tex_0000C0" OutName="tex_0000C0" Format="rgba16" Width="8" Height="16" Offset="0xC0" />
-        <Texture Name="object_ny_Tex_0001C0" OutName="tex_0001C0" Format="rgba16" Width="16" Height="16" Offset="0x1C0" />
-        <Texture Name="object_ny_Tex_0003C0" OutName="tex_0003C0" Format="rgba16" Width="32" Height="32" Offset="0x3C0" />
-        <Texture Name="object_ny_Tex_000BC0" OutName="tex_000BC0" Format="rgba16" Width="32" Height="32" Offset="0xBC0" />
-        <DList Name="object_ny_DL_001F90" Offset="0x1F90" />
-        <DList Name="object_ny_DL_002068" Offset="0x2068" />
-        <DList Name="object_ny_DL_002188" Offset="0x2188" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_oF1d_map.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_oF1d_map.xml
deleted file mode 100644
index 27270fb7f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_oF1d_map.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<Root>
-    <!-- Object file for Gorons -->
-    <File Name="object_oF1d_map" Segment="6">
-        <!-- Snowball -->
-        <!-- Large Snowball Fragment -->
-        <DList Name="gGoronLargeSnowballFragmentMaterialDL" Offset="0x3D0" />
-        <DList Name="gGoronLargeSnowballFragmentModelDL" Offset="0x458" />
-
-        <!-- Medium Snowball Fragment -->
-        <DList Name="gGoronMediumSnowballFragmentMaterialDL" Offset="0x8C0" />
-        <DList Name="gGoronMediumSnowballFragmentModelDL" Offset="0x948" />
-
-        <!-- Small Snowball Fragment -->
-        <DList Name="gGoronSmallSnowballFragmentMaterialDL" Offset="0xD50" />
-        <DList Name="gGoronSmallSnowballFragmentModelDL" Offset="0xDD8" />
-
-        <DList Name="gGoronSnowballDL" Offset="0x1560" /> <!-- Original name is "of1_snowgoroniwa_model" -->
-        <Blob Name="object_oF1d_map_Blob_001750" Size="0x20" Offset="0x1750" />
-        <Texture Name="gGoronSnowBallTex" OutName="goron_snow" Format="rgba16" Width="32" Height="64" Offset="0x1770" />
-        <Blob Name="object_oF1d_map_Blob_002770" Size="0x800" Offset="0x2770" />
-
-        <!-- Steam -->
-        <Texture Name="gGoronSteamTex" OutName="goron_steam" Format="i4" Width="32" Height="32" Offset="0x2F70" />
-        <DList Name="gGoronSteamMaterialDL" Offset="0x31A0" />
-        <DList Name="gGoronSteamModelDL" Offset="0x3258" />
-
-        <!-- Unused -->
-        <DList Name="object_oF1d_map_DL_003280" Offset="0x3280" />
-        <DList Name="object_oF1d_map_DL_003298" Offset="0x3298" />
-
-        <DList Name="object_oF1d_map_DL_003330" Offset="0x3330" />
-        <DList Name="object_oF1d_map_DL_003340" Offset="0x3340" />
-
-        <!-- Animations -->
-        <Animation Name="gGoronCoverEarsAnim" Offset="0x3650" /> <!-- Original name is "goron_urusaina" -->
-        <Animation Name="gGoronDropKegAnim" Offset="0x39D8" /> <!-- Original name is "gr_gift_bom" -->
-        <Animation Name="gGoronShiverAnim" Offset="0x3E28" /> <!-- Original name is "gr_samui" -->
-
-        <!-- Don Gero's Mask -->
-        <DList Name="gGoronDonGeroMaskDL" Offset="0x4DB0" />
-        <Texture Name="gGoronDonGeroMaskTLUT" OutName="goron_don_gero_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5340" />
-        <Texture Name="gGoronDonGeroMaskBottomTex" OutName="goron_don_gero_mask_bottom" Format="ci8" Width="16" Height="16" Offset="0x5540" />
-        <Texture Name="gGoronDonGeroMaskToesTex" OutName="goron_don_gero_mask_toes" Format="rgba16" Width="32" Height="32" Offset="0x5640" />
-        <Texture Name="gGoronDonGeroMaskTopTex" OutName="goron_don_gero_mask_top" Format="ci8" Width="16" Height="16" Offset="0x5E40" />
-        <Texture Name="gGoronDonGeroMaskNostrilTex" OutName="goron_don_gero_mask_nostril" Format="ci8" Width="32" Height="32" Offset="0x5F40" />
-        <Texture Name="gGoronDonGeroMaskMouthTex" OutName="goron_don_gero_mask_mouth" Format="ci8" Width="16" Height="16" Offset="0x6340" />
-        <Texture Name="gGoronDonGeroMaskFrillsTex" OutName="goron_don_gero_mask_frills" Format="rgba16" Width="32" Height="32" Offset="0x6440" />
-        <Texture Name="gGoronDonGeroMaskEyeTex" OutName="goron_don_gero_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x6C40" />
-
-        <!-- Scared -->
-        <!-- Unused leftover from OoT -->
-        <DList Name="gGoronEmptyDL" Offset="0x7A60" />
-        <DList Name="gGoronScaredDL" Offset="0x7A68" />
-        <Texture Name="gGoronScaredTLUT" OutName="goron_scared_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7EF0" />
-        <Texture Name="gGoronScaredSkinTex" OutName="goron_scared_skin" Format="ci8" Width="16" Height="16" Offset="0x80F0" />
-        <Texture Name="gGoronScaredBellyButtonTex" OutName="goron_scared_belly_button" Format="ci8" Width="8" Height="8" Offset="0x81F0" />
-        <Texture Name="gGoronScaredBottomTex" OutName="goron_scared_bottom" Format="ci8" Width="8" Height="16" Offset="0x8230" />
-        <Texture Name="gGoronScaredRocksTex" OutName="goron_scared_rocks" Format="ci8" Width="32" Height="64" Offset="0x82B0" />
-        <Texture Name="gGoronScaredHairTex" OutName="goron_scared_hair" Format="ci8" Width="16" Height="16" Offset="0x8AB0" />
-
-        <!-- Rolled Up -->
-        <DList Name="gGoronEmpty2DL" Offset="0x91A0" />
-        <DList Name="gGoronRolledUpDL" Offset="0x91A8" /> <!-- Original name is "oF1d_iwa2_model" -->
-        <Texture Name="gGoronRolledUpTLUT" OutName="goron_rolled_up_tlut" Format="rgba16" Width="16" Height="16" Offset="0x94E0" />
-        <Texture Name="gGoronRolledUpSkinTex" OutName="goron_rolled_up_skin" Format="ci8" Width="16" Height="16" Offset="0x96E0" />
-        <Texture Name="gGoronRolledUpBellyButtonTex" OutName="goron_rolled_up_belly_button" Format="ci8" Width="8" Height="8" Offset="0x97E0" />
-        <Texture Name="gGoronRolledUpBottomTex" OutName="goron_rolled_up_bottom" Format="ci8" Width="8" Height="16" Offset="0x9820" />
-        <Texture Name="gGoronRolledUpRocksTex" OutName="goron_rolled_up_rocks" Format="ci8" Width="32" Height="64" Offset="0x98A0" />
-
-        <!-- Animation -->
-        <Animation Name="gGoronTPoseAnim" Offset="0xA118" /> <!-- Original name is "ng_kihon" -->
-
-        <!-- DLists -->
-        <DList Name="gGoronBodyDL" Offset="0xCC50" />
-        <DList Name="gGoronHeadDL" Offset="0xCF70" />
-        <DList Name="gGoronRightUpperArmDL" Offset="0xD688" />
-        <DList Name="gGoronRightForearmDL" Offset="0xD808" />
-        <DList Name="gGoronRightHandDL" Offset="0xD938" />
-        <DList Name="gGoronLeftUpperArmDL" Offset="0xDBB8" />
-        <DList Name="gGoronLeftForearmDL" Offset="0xDD38" />
-        <DList Name="gGoronLeftHandDL" Offset="0xDE68" />
-        <DList Name="gGoronPelvisDL" Offset="0xE070" />
-        <DList Name="gGoronRightThighDL" Offset="0xE130" />
-        <DList Name="gGoronRightShinDL" Offset="0xE218" />
-        <DList Name="gGoronRightFootDL" Offset="0xE348" />
-        <DList Name="gGoronLeftThighDL" Offset="0xE610" />
-        <DList Name="gGoronLeftShinDL" Offset="0xE6F8" />
-        <DList Name="gGoronLeftFootDL" Offset="0xE828" />
-
-        <!-- Textures -->
-        <Texture Name="gGoronTLUT" OutName="goron_tlut" Format="rgba16" Width="16" Height="16" Offset="0xEA78" />
-        <Texture Name="gGoronEyeTLUT" OutName="goron_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xEC78" />
-        <Texture Name="gGoronSkinTex" OutName="goron_skin" Format="ci8" Width="16" Height="16" Offset="0xEE78" />
-        <Texture Name="gGoronFingersTex" OutName="goron_fingers" Format="ci8" Width="16" Height="16" Offset="0xEF78" />
-        <Texture Name="gGoronTatooTex" OutName="goron_tatoo" Format="ci8" Width="32" Height="32" Offset="0xF078" />
-        <Texture Name="gGoronToesTex" OutName="goron_toes" Format="ci8" Width="32" Height="16" Offset="0xF478" />
-        <Texture Name="gGoronFootTex" OutName="goron_foot" Format="ci8" Width="32" Height="32" Offset="0xF678" />
-        <Texture Name="gGoronNostrilTex" OutName="goron_nostril" Format="ci8" Width="8" Height="8" Offset="0xFA78" />
-        <Texture Name="gGoronBottomTex" OutName="goron_bottom" Format="ci8" Width="8" Height="16" Offset="0xFAB8" />
-        <Texture Name="gGoronsRocksTex" OutName="goron_rocks" Format="ci8" Width="32" Height="64" Offset="0xFB38" />
-        <Texture Name="gGoronHairTex" OutName="goron_hair" Format="ci8" Width="16" Height="16" Offset="0x10338" />
-        <Texture Name="gGoronEyeOpenTex" OutName="goron_eye_open" Format="ci8" Width="32" Height="32" Offset="0x10438" />
-        <Texture Name="gGoronEyeClosed2Tex" OutName="goron_eye_closed2" Format="ci8" Width="32" Height="32" Offset="0x10838" />
-        <Texture Name="gGoronEyeHalfTex" OutName="goron_eye_half" Format="ci8" Width="32" Height="32" Offset="0x10C38" />
-        <Texture Name="gGoronEyeClosedTex" OutName="goron_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x11038" />
-        <Texture Name="gGoronLipsTex" OutName="goron_lips" Format="rgba16" Width="8" Height="8" Offset="0x11438" />
-        <Texture Name="gGoronDimpleTex" OutName="goron_dimple" Format="ci8" Width="16" Height="16" Offset="0x114B8" />
-        <Texture Name="gGoronBeardTex" OutName="goron_beard" Format="rgba16" Width="32" Height="16" Offset="0x115B8" />
-
-        <!-- Skeleton -->
-        <Limb Name="gGoronRootLimb" Type="Standard" EnumName="GORON_LIMB_ROOT" Offset="0x119B8" />
-        <Limb Name="gGoronPelvisLimb" Type="Standard" EnumName="GORON_LIMB_PELVIS" Offset="0x119C4" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <Limb Name="gGoronLegsRootLimb" Type="Standard" EnumName="GORON_LIMB_LEGS_ROOT" Offset="0x119D0" />
-        <Limb Name="gGoronLeftThighLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_THIGH" Offset="0x119DC" />
-        <Limb Name="gGoronLeftShinLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_SHIN" Offset="0x119E8" />
-        <Limb Name="gGoronLeftFootLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_FOOT" Offset="0x119F4" />
-        <Limb Name="gGoronRightThighLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_THIGH" Offset="0x11A00" />
-        <Limb Name="gGoronRightShinLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_SHIN" Offset="0x11A0C" />
-        <Limb Name="gGoronRightFootLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_FOOT" Offset="0x11A18" />
-        <Limb Name="gGoronBodyLimb" Type="Standard" EnumName="GORON_LIMB_BODY" Offset="0x11A24" />
-        <Limb Name="gGoronLeftUpperArmLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_UPPER_ARM" Offset="0x11A30" />
-        <Limb Name="gGoronLeftForearmLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_FOREARM" Offset="0x11A3C" />
-        <Limb Name="gGoronLeftHandLimb" Type="Standard" EnumName="GORON_LIMB_LEFT_HAND" Offset="0x11A48" />
-        <Limb Name="gGoronRightUpperArmLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_UPPER_ARM" Offset="0x11A54" />
-        <Limb Name="gGoronRightForearmLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_FOREARM" Offset="0x11A60" />
-        <Limb Name="gGoronRightHandLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_HAND" Offset="0x11A6C" />
-        <Limb Name="gGoronHeadLimb" Type="Standard" EnumName="GORON_LIMB_HEAD" Offset="0x11A78" />
-        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" LimbNone="GORON_LIMB_NONE" LimbMax="GORON_LIMB_MAX" EnumName="GoronLimb" Offset="0x11AC8" />
-
-        <!-- Animations -->
-        <Animation Name="gGoronLyingDownIdleAnim" Offset="0x11D98" /> <!-- Original name is "oF1d_chyu_goron" -->
-        <Animation Name="gGoronUnrollAnim" Offset="0x12DE0" /> <!-- Original name is "oF1d_konnnichiwa" -->
-        <Animation Name="gGoronShiveringSurprisedAnim" Offset="0x135E8" /> <!-- Original name is "ofx_odoroku" -->
-        <Animation Name="gGoronStandingHandTappingAnim" Offset="0x13DB0" /> <!-- Original name is "ofx_uri" -->
-        <Animation Name="gGoronSleepyAnim" Offset="0x143AC" /> <!-- Original name is "ofx_wabi" -->
-        <Animation Name="gGoronStandingIdleAnim" Offset="0x14CE0" /> <!-- Original name is "ofx_wait01" -->
-
-        <!-- Dust -->
-        <DList Name="gGoronDustMaterialDL" Offset="0x14CF0" />
-        <DList Name="gGoronDustModelDL" Offset="0x14D00" /> <!-- Original name might be "snowgoron_effct_set" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ob.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ob.xml
deleted file mode 100644
index 1d4447de5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ob.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<Root>
-    <!-- Object for MoonChild and his four Masks -->
-    <File Name="object_ob" Segment="6">
-    
-        <!-- Moonchild Mask DisplayLists -->
-        <DList Name="gMoonChildOdolwasMaskDL" Offset="0x690" />
-        <DList Name="gMoonChildGyorgsMaskDL" Offset="0x1D80" />
-        <DList Name="gMoonChildGohtsMaskDL" Offset="0x3AD0" />
-        <DList Name="gMoonChildTwinmoldsMaskDL" Offset="0x5020" />
-        <DList Name="gMoonChildMajorasMaskDL" Offset="0x6380" /> <!-- Original name is "mjk_evilmask_model" -->
-        <DList Name="gMoonChildMajorasMaskEyesDL" Offset="0x6730" /> <!-- Original name is "mjk_evLIGHTeye_model" -->
-
-        <!-- Moonchild Mask Textures -->
-        <Texture Name="gMoonChildMajorasMaskTex" OutName="moonchild_majoras_mask" Format="rgba16" Width="32" Height="64" Offset="0x67E0" />
-        <Texture Name="gMoonChildMajorasMaskSpike1Tex" OutName="moonchild_majoras_mask_spike_1" Format="rgba16" Width="16" Height="16" Offset="0x77E0" />
-        <Texture Name="gMoonChildMajorasMaskSpike2Tex" OutName="moonchild_majoras_mask_spike_2" Format="rgba16" Width="16" Height="16" Offset="0x79E0" />
-        <Texture Name="gMoonChildMajorasMaskSpike3Tex" OutName="moonchild_majoras_mask_spike_3" Format="rgba16" Width="16" Height="16" Offset="0x7BE0" />
-        <Texture Name="gMoonChildMajorasMaskSpike4Tex" OutName="moonchild_majoras_mask_spike_4" Format="rgba16" Width="16" Height="16" Offset="0x7DE0" />
-        <Texture Name="gMoonChildMajorasMaskBackTex" OutName="moonchild_majoras_mask_back" Format="rgba16" Width="32" Height="32" Offset="0x7FE0" />
-        <Texture Name="gMoonChildMajorasMaskEyesTex" OutName="moonchild_majoras_mask_eyes" Format="rgba16" Width="32" Height="32" Offset="0x87E0" />
-        <Texture Name="gMoonChildOdolwasMaskFaceTLUT" OutName="moonchild_odolwas_mask_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8FE0" />
-        <Texture Name="gMoonChildOdolwasMaskEarTLUT" OutName="moonchild_odolwas_mask_ear_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9000" />
-        <Texture Name="gMoonChildGyorgsMaskSkinTLUT" OutName="moonchild_gyorgs_mask_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9020" />
-        <Texture Name="gMoonChildGyorgsMaskMouthTLUT" OutName="moonchild_gyorgs_mask_mouth_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9040" />
-        <Texture Name="gMoonChildGyorgsMaskToothHornTLUT" OutName="moonchild_gyorgs_mask_tooth_horn_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9060" />
-        <Texture Name="gMoonChildTwinmoldsMaskSkinTLUT" OutName="moonchild_twinmolds_mask_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9080" />
-        <Texture Name="gMoonChildTwinmoldsMaskSnoutTLUT" OutName="moonchild_twinmolds_snout_tlut" Format="rgba16" Width="4" Height="4" Offset="0x90A0" />
-        <Texture Name="gMoonChildOdolwasMaskPlumeTex" OutName="moonchild_odolwas_mask_plume" Format="rgba16" Width="16" Height="16" Offset="0x90C0" />
-        <Texture Name="gMoonChildOdolwasMaskFaceTex" OutName="moonchild_odolwas_mask_face" Format="ci4" Width="64" Height="64" Offset="0x92C0" />
-        <Texture Name="gMoonChildOdolwasMaskEarTex" OutName="moonchild_odolwas_mask_ear" Format="ci4" Width="64" Height="64" Offset="0x9AC0" />
-        <Texture Name="gMoonChildGyorgsTwinmoldsMaskEyeTex" OutName="moonchild_gyorgs_twinmolds_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0xA2C0" />
-        <Texture Name="gMoonChildGyorgsMaskSkinTex" OutName="moonchild_gyorgs_mask_skin" Format="ci4" Width="64" Height="64" Offset="0xAAC0" />
-        <Texture Name="gMoonChildGyorgsMaskMouthTex" OutName="moonchild_gyorgs_mask_mouth" Format="ci4" Width="64" Height="64" Offset="0xB2C0" />
-        <Texture Name="gMoonChildGyorgsMaskToothHornTex" OutName="moonchild_gyorgs_mask_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0xBAC0" />
-        <Texture Name="gMoonChildGohtsMaskEyeTex" OutName="moonchild_gohts_mask_eye" Format="rgba16" Width="32" Height="64" Offset="0xBB40" />
-        <Texture Name="gMoonChildGohtsMaskTopPatternTex" OutName="moonchild_gohts_mask_top_pattern" Format="rgba16" Width="32" Height="64" Offset="0xCB40" />
-        <Texture Name="gMoonChildGohtsTwinmoldsMaskPatternTex" OutName="moonchild_goht_twinmold_mask_pattern" Format="rgba16" Width="32" Height="64" Offset="0xDB40" />
-        <Texture Name="gMoonChildGohtsMaskSpikeTwinmoldsMaskMandibleTex" OutName="moonchild_gohts_mask_spike_twinmolds_mask_mandible" Format="rgba16" Width="32" Height="32" Offset="0xEB40" />
-        <Texture Name="gMoonChildTwinmoldsMaskSkinTex" OutName="moonchild_twinmolds_mask_skin" Format="ci4" Width="64" Height="64" Offset="0xF340" />
-        <Texture Name="gMoonChildTwinmoldsMaskSnoutTex" OutName="moonchild_twinmolds_mask_snout" Format="ci4" Width="64" Height="64" Offset="0xFB40" />
-
-        <!-- Moonchild Moving Animations -->
-        <Animation Name="gMoonChildWalkingAnim" Offset="0x10880" /> <!-- Original name is "mjk_run" -->
-        <Animation Name="gMoonChildRunningAnim" Offset="0x10CD8" /> <!-- Original name is "mjk_run2" -->
-
-        <!-- Moonchild DisplayLists -->
-        <DList Name="gMoonChildPelvisDL" Offset="0x14190" />
-        <DList Name="gMoonChildLeftThighDL" Offset="0x142C0" />
-        <DList Name="gMoonChildLeftLegDL" Offset="0x144D0" />
-        <DList Name="gMoonChildLeftFootDL" Offset="0x14638" />
-        <DList Name="gMoonChildRightThighDL" Offset="0x147A0" />
-        <DList Name="gMoonChildRightLegDL" Offset="0x149B0" />
-        <DList Name="gMoonChildRightFootDL" Offset="0x14B18" />
-        <DList Name="gMoonChildChestBottomDL" Offset="0x14C80" />
-        <DList Name="gMoonChildChestDL" Offset="0x14DA0" />
-        <DList Name="gMoonChildHeadDL" Offset="0x14F18" />
-        <DList Name="gMoonChildLeftArmDL" Offset="0x15380" />
-        <DList Name="gMoonChildLeftForearmDL" Offset="0x154B0" />
-        <DList Name="gMoonChildLeftHandDL" Offset="0x155D0" />
-        <DList Name="gMoonChildRightArmDL" Offset="0x15758" />
-        <DList Name="gMoonChildRightForearmDL" Offset="0x15888" />
-        <DList Name="gMoonChildRightHandDL" Offset="0x159A8" />
-
-        <!-- Moonchild Textures -->
-        <Texture Name="gMoonChildTLUT" OutName="moonchild_tlut" Format="rgba16" Width="16" Height="16" Offset="0x15B28" />
-        <Texture Name="gMoonChildFingersTex" OutName="moonchild_fingers" Format="ci8" Width="16" Height="16" Offset="0x15D28" />
-        <Texture Name="gMoonChildThighSkinTex" OutName="moonchild_thigh_skin" Format="ci8" Width="8" Height="8" Offset="0x15E28" />
-        <Texture Name="gMoonChildTshirtDetailTex" OutName="moonchild_tshirt_detail" Format="ci8" Width="16" Height="32" Offset="0x15E68" />
-        <Texture Name="gMoonChildHairTex" OutName="moonchild_hair" Format="ci8" Width="8" Height="16" Offset="0x16068" />
-        <Texture Name="gMoonChildEarTex" OutName="moonchild_ear" Format="ci8" Width="8" Height="8" Offset="0x160E8" />
-        <Texture Name="gMoonChildBackHairTex" OutName="moonchild_back_hair" Format="ci8" Width="8" Height="16" Offset="0x16128" />
-        <Texture Name="gMoonChildTshirtNecklineTex" OutName="moonchild_tshirt_neckline" Format="ci8" Width="16" Height="32" Offset="0x161A8" />
-
-        <!-- Moonchild Limbs -->
-        <Limb Name="gMoonChildRootLimb" Type="Standard" EnumName="MOONCHILD_LIMB_ROOT" Offset="0x163A8" />
-        <Limb Name="gMoonChildWaistLimb" Type="Standard" EnumName="MOONCHILD_LIMB_WAIST" Offset="0x163B4" />
-        <Limb Name="gMoonChildTorsoLimb" Type="Standard" EnumName="MOONCHILD_LIMB_TORSO" Offset="0x163C0" />
-        <Limb Name="gMoonChildLeftUpperArmLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_UPPER_ARM" Offset="0x163CC" />
-        <Limb Name="gMoonChildLeftForearmLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_FOREARM" Offset="0x163D8" />
-        <Limb Name="gMoonChildLeftHandLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_HAND" Offset="0x163E4" />
-        <Limb Name="gMoonChildRightUpperArmLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_UPPER_ARM" Offset="0x163F0" />
-        <Limb Name="gMoonChildRightForearmLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_FOREARM" Offset="0x163FC" />
-        <Limb Name="gMoonChildRightHandLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_HAND" Offset="0x16408" />
-        <Limb Name="gMoonChildHeadLimb" Type="Standard" EnumName="MOONCHILD_LIMB_HEAD" Offset="0x16414" />
-        <Limb Name="gMoonChildPelvisLimb" Type="Standard" EnumName="MOONCHILD_LIMB_PELVIS" Offset="0x16420" />
-        <Limb Name="gMoonChildLeftThighLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_THIGH" Offset="0x1642C" />
-        <Limb Name="gMoonChildLeftShinLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_SHIN" Offset="0x16438" />
-        <Limb Name="gMoonChildLeftFootLimb" Type="Standard" EnumName="MOONCHILD_LIMB_LEFT_FOOT" Offset="0x16444" />
-        <Limb Name="gMoonChildRightThighLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_THIGH" Offset="0x16450" />
-        <Limb Name="gMoonChildRightShinLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_SHIN" Offset="0x1645C" />
-        <Limb Name="gMoonChildRightFootLimb" Type="Standard" EnumName="MOONCHILD_LIMB_RIGHT_FOOT" Offset="0x16468" />
-
-        <!-- Moonchild Skeleton -->
-        <Skeleton Name="gMoonChildSkel" Type="Flex" LimbType="Standard" LimbNone="MOONCHILD_LIMB_NONE" LimbMax="MOONCHILD_LIMB_MAX" EnumName="MoonchildLimb" Offset="0x164B8" />
-
-        <!-- Moonchild Mask Still Animations -->
-        <Animation Name="gMoonChildGettingUpAnim" Offset="0x16F58" /> <!-- Original name is "mjk_suwari2wait" -->
-        <Animation Name="gMoonChildSittingAnim" Offset="0x1764C" /> <!-- Original name is "mjk_suwariloop" -->
-        <Animation Name="gMoonChildStandingAnim" Offset="0x17E98" /> <!-- Original name is "mjk_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_chan.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_chan.xml
deleted file mode 100644
index 108669b0e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_chan.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <!-- Object for the Goron Shrine Chandelier -->
-    <File Name="object_obj_chan" Segment="6">
-        <DList Name="gChandelierPotHolderDL" Offset="0xA10" /> <!-- Original name is "z2_16_tubo01_modelT" -->
-        <DList Name="gChandelierCenterDL" Offset="0xAF0" /> <!-- Original name is "z2_16_tubo01_model" -->
-        <Texture Name="gChandelierCenterBottomTex" OutName="chandelier_center_bottom" Format="rgba16" Width="32" Height="32" Offset="0xD80" />
-        <Texture Name="gChandelierCenterTopTex" OutName="chandelier_center_top" Format="rgba16" Width="32" Height="32" Offset="0x1580" />
-        <Texture Name="gChandelierChainTex" OutName="chandelier_chain" Format="ia4" Width="16" Height="32" Offset="0x1D80" />
-        <Texture Name="gChandelierPotHolderTex" OutName="chandelier_pot_holder" Format="i8" Width="32" Height="8" Offset="0x1E80" />
-        <DList Name="gChandelierEmptyDL" Offset="0x2350" /> <!-- Original name is "z2_16_tubo02_modelT" -->
-        <DList Name="gChandelierPotDL" Offset="0x2358" /> <!-- Original name is "z2_16_tubo02_model" -->
-        <Texture Name="gChandelierPotTex" OutName="chandelier_pot" Format="rgba16" Width="32" Height="64" Offset="0x24F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_danpeilift.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_danpeilift.xml
deleted file mode 100644
index 882ce1bce..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_danpeilift.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_obj_danpeilift" Segment="6">
-        <DList Name="object_obj_danpeilift_DL_000180" Offset="0x180" /> <!-- Original name is "Y2_DANPEI_lift_model2" -->
-        <Texture Name="object_obj_danpeilift_Tex_000298" OutName="tex_000298" Format="rgba16" Width="32" Height="32" Offset="0x298" />
-        <Collision Name="object_obj_danpeilift_Colheader_000BA0" Offset="0xBA0" /> <!-- Original name is "Y2_DANPEI_lift_bgdatainfo2" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_dinner.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_dinner.xml
deleted file mode 100644
index f73716464..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_dinner.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_obj_dinner" Segment="6">
-        <DList Name="object_obj_dinner_DL_0011E0" Offset="0x11E0" /> <!-- Original name is "obj_dinner_model" -->
-        <DList Name="object_obj_dinner_DL_001AA0" Offset="0x1AA0" /> <!-- Original name might be "objT_model" -->
-        <Texture Name="object_obj_dinner_Tex_001B38" OutName="tex_001B38" Format="rgba16" Width="4" Height="32" Offset="0x1B38" />
-        <Texture Name="object_obj_dinner_Tex_001C38" OutName="tex_001C38" Format="rgba16" Width="16" Height="16" Offset="0x1C38" />
-        <Texture Name="object_obj_dinner_Tex_001E38" OutName="tex_001E38" Format="rgba16" Width="16" Height="16" Offset="0x1E38" />
-        <Texture Name="object_obj_dinner_Tex_002038" OutName="tex_002038" Format="rgba16" Width="16" Height="16" Offset="0x2038" />
-        <Texture Name="object_obj_dinner_Tex_002238" OutName="tex_002238" Format="rgba16" Width="16" Height="32" Offset="0x2238" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_milk_bin.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_milk_bin.xml
deleted file mode 100644
index e67e0b15f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_milk_bin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_obj_milk_bin" Segment="6">
-        <DList Name="gMilkBinMilkJarDL" Offset="0x4B0" /> <!-- Original name is "obj_mlk_simplebin_model" -->
-        <Texture Name="object_obj_milk_bin_TLUT_0007C0" OutName="tlut_0007C0" Format="rgba16" Width="16" Height="16" Offset="0x7C0" />
-        <Texture Name="object_obj_milk_bin_Tex_0009C0" OutName="tex_0009C0" Format="ci8" Width="8" Height="8" Offset="0x9C0" />
-        <Texture Name="object_obj_milk_bin_Tex_000A00" OutName="tex_000A00" Format="ci8" Width="32" Height="64" Offset="0xA00" />
-        <Texture Name="object_obj_milk_bin_Tex_001200" OutName="tex_001200" Format="rgba16" Width="32" Height="32" Offset="0x1200" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_tokeidai.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_tokeidai.xml
deleted file mode 100644
index 9822eb149..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_tokeidai.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<Root>
-    <!-- Contains objects related to the Clock Tower and various wall clocks. -->
-    <File Name="object_obj_tokeidai" Segment="6">
-        <Texture Name="gClockTowerClockFaceTopTLUT" OutName="clock_tower_clock_face_top_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gClockTowerClockFaceBottomTLUT" OutName="clock_tower_clock_face_bottom_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20" />
-        <Texture Name="gClockTowerSpotlightShineTex" OutName="clock_tower_spotlight_shine" Format="i8" Width="64" Height="64" Offset="0x40" />
-
-        <!-- Generic brick texture used for multiple pieces of the Clock Tower (counterweight, unused tower wall, staircase to rooftop) -->
-        <Texture Name="gClockTowerBrickTex" OutName="clock_tower_bricks" Format="rgba16" Width="32" Height="32" Offset="0x1040" />
-        <Texture Name="gClockTowerCounterweightBeamSide1Tex" OutName="clock_tower_counterweight_beam_side1" Format="rgba16" Width="32" Height="32" Offset="0x1840" />
-        <Texture Name="gClockTowerCounterweightBeamSide2Tex" OutName="clock_tower_counterweight_beam_side2" Format="rgba16" Width="32" Height="32" Offset="0x2040" />
-        <Texture Name="gClockTowerExteriorGearFaceTex" OutName="clock_tower_exterior_gear_face" Format="rgba16" Width="32" Height="32" Offset="0x2840" />
-        <Texture Name="gClockTowerExteriorGearSidesAndMinuteRingBackTex" OutName="clock_tower_exterior_gear_sides_and_minute_ring_back" Format="rgba16" Width="16" Height="32" Offset="0x3040" />
-        <Texture Name="gClockTowerClockCenterTex" OutName="clock_tower_clock_center" Format="rgba16" Width="8" Height="32" Offset="0x3440" />
-        <Texture Name="gClockTowerClockCenterSidesTex" OutName="clock_tower_clock_center_sides" Format="rgba16" Width="16" Height="16" Offset="0x3640" />
-        <Texture Name="gClockTowerHandTex" OutName="clock_tower_hand" Format="rgba16" Width="16" Height="16" Offset="0x3840" />
-        <Texture Name="gClockTowerSunAndMoonPanelSidesTex" OutName="clock_tower_sun_and_moon_panel_sides" Format="rgba16" Width="16" Height="16" Offset="0x3A40" />
-        <Texture Name="gClockTowerSunAndMoonPanelMoonTex" OutName="clock_tower_sun_and_moon_panel_moon" Format="rgba16" Width="16" Height="32" Offset="0x3C40" />
-        <Texture Name="gClockTowerSunAndMoonPanelSunTex" OutName="clock_tower_sun_and_moon_panel_sun" Format="rgba16" Width="16" Height="16" Offset="0x4040" />
-        <Texture Name="gClockTowerMinuteRingFace1Tex" OutName="clock_tower_minute_ring_face_1" Format="rgba16" Width="32" Height="16" Offset="0x4240" />
-        <Texture Name="gClockTowerMinuteRingFace2Tex" OutName="clock_tower_minute_ring_face_2" Format="rgba16" Width="32" Height="16" Offset="0x4640" />
-        <Texture Name="gClockTowerMinuteRingFace3Tex" OutName="clock_tower_minute_ring_face_3" Format="rgba16" Width="32" Height="16" Offset="0x4A40" />
-        <Texture Name="gClockTowerMinuteRingSidesTex" OutName="clock_tower_minute_ring_sides" Format="rgba16" Width="32" Height="16" Offset="0x4E40" />
-        <Texture Name="gClockTowerClockFaceTopTex" OutName="clock_tower_clock_face_top" Format="ci4" Width="64" Height="64" Offset="0x5240" />
-        <Texture Name="gClockTowerClockFaceBottomTex" OutName="clock_tower_clock_face_bottom" Format="ci4" Width="64" Height="64" Offset="0x5A40" />
-        <Texture Name="gClockTowerClockFacePanelBarTex" OutName="clock_tower_clock_face_panel_bar" Format="rgba16" Width="8" Height="8" Offset="0x6240" />
-        <Texture Name="gClockTowerUnusedBrickTex" OutName="clock_tower_unused_bricks" Format="rgba16" Width="32" Height="32" Offset="0x62C0" />
-        <Texture Name="gClockTowerUnusedMaskTex" OutName="clock_tower_unused_mask" Format="i4" Width="64" Height="64" Offset="0x6AC0" />
-        <Texture Name="gClockTowerSpotlightBeamTex" OutName="clock_tower_spotlight_beam" Format="ia8" Width="32" Height="64" Offset="0x72C0" />
-        <Texture Name="gClockTowerSpotlightMaskTex" OutName="clock_tower_spotlight_mask" Format="i8" Width="32" Height="32" Offset="0x7AC0" />
-        <Texture Name="gClockTowerCounterweightMaskTex" OutName="clock_tower_counterweight_mask" Format="i4" Width="64" Height="64" Offset="0x7EC0" />
-        <Texture Name="gClockTowerUnusedTowerWallMaskTex" OutName="clock_tower_unused_tower_wall_mask" Format="i4" Width="64" Height="64" Offset="0x86C0" />
-        <Texture Name="gClockTowerStaircaseToRooftopMaskTex" OutName="clock_tower_staircase_to_rooftop_mask" Format="i4" Width="64" Height="64" Offset="0x8EC0" />
-
-        <DList Name="gClockTowerUnusedEmpty1DL" Offset="0x9A00" /> <!-- Not present in MM3D, but it was probably named "z2_00_tokeitou_modelT" -->
-        <DList Name="gClockTowerTerminaFieldWallsDL" Offset="0x9A08" /> <!-- Original name is "z2_00_tokeitou_model" ("clock tower") -->
-        <Texture Name="gClockTowerTerminaFieldWallsBrickTex" OutName="clock_tower_termina_field_walls_brick" Format="rgba16" Width="32" Height="32" Offset="0x9B48" />
-        <Texture Name="gClockTowerTerminaFieldWallsMaskTex" OutName="clock_tower_termina_field_walls_mask" Format="i4" Width="64" Height="64" Offset="0xA348" />
-        <DList Name="gClockTowerSpotlightDL" Offset="0xB0C0" /> <!-- Original name is "z2_atama_modelT" -->
-        <DList Name="gClockTowerCounterweightDL" Offset="0xB208" /> <!-- Original name is "z2_atama_model" -->
-        <TextureAnimation Name="gClockTowerUnusedTexAnim" Offset="0xB4E4" />
-
-        <DList Name="gClockTowerUnusedEmpty2DL" Offset="0xBA70" /> <!-- Not present in MM3D, but it was probably named "z2_hagu_modelT" -->
-        <DList Name="gClockTowerExteriorGearDL" Offset="0xBA78" /> <!-- Original name is "z2_hagu_model" ("gear; cogwheel​") -->
-
-        <DList Name="gClockTowerUnusedEmpty3DL" Offset="0xBEE0" /> <!-- Not present in MM3D, but it was probably named "z2_hari_modelT" -->
-        <DList Name="gClockTowerClockCenterAndHandDL" Offset="0xBEE8" /> <!-- Original name is "z2_hari_model" ("hand (e.g. clock, etc.); pointer​") -->
-
-        <DList Name="gClockTowerUnusedEmpty4DL" Offset="0xC360" /> <!-- Not present in MM3D, but it was probably named "z2_paneru_modelT" -->
-        <DList Name="gClockTowerSunAndMoonPanelDL" Offset="0xC368" /> <!-- Original name is "z2_paneru_model" (probably just literally "panel") -->
-
-        <DList Name="gClockTowerUnusedEmpty5DL" Offset="0xCF20" /> <!-- Not present in MM3D, but it was probably named "z2_tannsin_modelT" -->
-        <DList Name="gClockTowerMinuteRingDL" Offset="0xCF28" /> <!-- Original name is "z2_tannsin_model" ("short hand; hour hand") -->
-
-        <DList Name="gClockTowerUnusedEmpty6DL" Offset="0xD380" /> <!-- Not present in MM3D, but it was probably named "z2_tou_modelT" -->
-        <DList Name="gClockTowerUnusedTowerWallDL" Offset="0xD388" /> <!-- Original name might be "z2_tou_model" ("tower; steeple; spire​") -->
-
-        <!-- Used as the xluDList for Staircase to Rooftop -->
-        <DList Name="gClockTowerEmptyDL" Offset="0xD8E0" /> <!-- Not present in MM3D, but it was probably named "z2_towerkaidan_modelT" -->
-        <DList Name="gClockTowerStaircaseToRooftopDL" Offset="0xD8E8" /> <!-- Original name is "z2_towerkaidan_model" ("kaiden" = "stairs; stairway; staircase​") -->
-        <Texture Name="gClockTowerClockFaceBackTex" OutName="clock_tower_clock_face_back" Format="rgba16" Width="16" Height="32" Offset="0xDAC0" />
-
-        <DList Name="gClockTowerUnusedEmpty7DL" Offset="0xE810" /> <!-- Not present in MM3D, but it was probably named "z2_tyousin_modelT" -->
-        <DList Name="gClockTowerClockFaceDL" Offset="0xE818" /> <!-- Original name is "z2_tyousin_model" ("long hand; minute hand​") -->
-
-        <DList Name="gClockTowerUnusedEmpty8DL" Offset="0xF510" /> <!-- Not present in MM3D, but it was probably named "z2_tyousin_room_modelT" -->
-        <DList Name="gWallClockClockFaceDL" Offset="0xF518" /> <!-- Original name is "z2_tyousin_room_model" -->
-        <Texture Name="gWallClockClockFaceBackTex" OutName="wall_clock_clock_face_back" Format="rgba16" Width="16" Height="32" Offset="0xF7F8" />
-        <Texture Name="gWallClockClockFaceBottomTex" OutName="wall_clock_clock_face_bottom" Format="rgba16" Width="64" Height="32" Offset="0xFBF8" />
-        <Texture Name="gWallClockClockFaceTopTex" OutName="wall_clock_clock_face_top" Format="rgba16" Width="64" Height="32" Offset="0x10BF8" />
-        <Texture Name="gWallClockClockFacePanelBarTex" OutName="wall_clock_clock_face_panel_bar" Format="rgba16" Width="8" Height="8" Offset="0x11BF8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_usiyane.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_usiyane.xml
deleted file mode 100644
index 99e6e0cb1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_usiyane.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_obj_usiyane" Segment="6">
-        <DList Name="object_obj_usiyane_DL_000090" Offset="0x90" /> <!-- Original name is "z2_usiwara_modelT" -->
-        <DList Name="object_obj_usiyane_DL_000098" Offset="0x98" /> <!-- Original name is "z2_usiwara_model" -->
-        <Texture Name="object_obj_usiyane_Tex_000130" OutName="tex_000130" Format="rgba16" Width="32" Height="16" Offset="0x130" />
-        <DList Name="object_obj_usiyane_DL_000830" Offset="0x830" /> <!-- Original name is "z2_usiyane_modelT" -->
-        <DList Name="object_obj_usiyane_DL_000838" Offset="0x838" /> <!-- Original name is "z2_usiyane_model" -->
-        <Texture Name="object_obj_usiyane_TLUT_0009C8" OutName="tlut_0009C8" Format="rgba16" Width="4" Height="4" Offset="0x9C8" />
-        <Texture Name="object_obj_usiyane_Tex_0009E8" OutName="tex_0009E8" Format="ci4" Width="64" Height="64" Offset="0x9E8" />
-        <Texture Name="object_obj_usiyane_Tex_0011E8" OutName="tex_0011E8" Format="rgba16" Width="64" Height="32" Offset="0x11E8" />
-        <Collision Name="object_obj_usiyane_Colheader_0022AC" Offset="0x22AC" /> <!-- Original name is "z2_usiyane_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_yasi.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_yasi.xml
deleted file mode 100644
index 5971fc744..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_obj_yasi.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Object for the Palm Tree(s) found at the Great Bay Coast -->
-    <File Name="object_obj_yasi" Segment="6">
-        <DList Name="gPalmTreeDL" Offset="0x360" /> <!-- Original name is "z2_yasi_model" -->
-        <Texture Name="gPalmTreeTLUT" OutName="palm_tree_tlut" Format="rgba16" Width="4" Height="4" Offset="0x630" />
-        <Texture Name="gPalmTreeFrondTex" OutName="palm_tree_frond" Format="ci4" Width="32" Height="128" Offset="0x650" />
-        <Texture Name="gPalmTreeDekuNutTex" OutName="palm_tree_deku_nut" Format="rgba16" Width="16" Height="16" Offset="0xE50" />
-        <Texture Name="gPalmTreeScarredWoodTex" OutName="palm_tree_scarred_wood" Format="rgba16" Width="16" Height="16" Offset="0x1050" />
-        <Texture Name="gPalmTreeWoodTex" OutName="palm_tree_wood" Format="rgba16" Width="8" Height="8" Offset="0x1250" />
-        <Collision Name="gPalmTreeCol" Offset="0x1428" /> <!-- Original name is "z2_yasi_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_okuta.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_okuta.xml
deleted file mode 100644
index cad1c57bd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_okuta.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<Root>
-    <!-- Assets for Octoroks -->
-    <File Name="object_okuta" Segment="6">
-        <Animation Name="gOctorokShootAnim" Offset="0x44C" /> <!-- Original name is "oc_atack" -->
-
-        <!-- Octorok Limb DisplayLists -->
-        <DList Name="gFrontRightArmBaseDL" Offset="0xDC0" />
-        <DList Name="gFrontRightArmMiddleDL" Offset="0xE70" />
-        <DList Name="gFrontRightArmEndDL" Offset="0xF28" />
-        <DList Name="gBackRightArmBaseDL" Offset="0xFD8" />
-        <DList Name="gBackRightArmMiddleDL" Offset="0x1088" />
-        <DList Name="gBackRightArmEndDL" Offset="0x1140" />
-        <DList Name="gBackLeftArmBaseDL" Offset="0x11F0" />
-        <DList Name="gBackLeftArmMiddleDL" Offset="0x12A0" />
-        <DList Name="gBackLeftArmEndDL" Offset="0x1358" />
-        <DList Name="gFrontLeftArmBaseDL" Offset="0x1408" />
-        <DList Name="gFrontLeftArmMiddleDL" Offset="0x14B8" />
-        <DList Name="gFrontLeftArmEndDL" Offset="0x1570" />
-        <DList Name="gOctorokSnoutDL" Offset="0x1620" />
-        <DList Name="gOctorokUnderEyeTrianglesDL" Offset="0x1730" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokHeadBottomDL" Offset="0x17F0" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokHeadFrontDL" Offset="0x18B0" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokHeadTopDL" Offset="0x1970" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokHeadBackDL" Offset="0x1A38" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokEyesDL" Offset="0x1B18" /> <!-- Used as part of the head displaylist -->
-        <DList Name="gOctorokHeadDL" Offset="0x1BE8" />
-        <DList Name="gOctorokBodyDL" Offset="0x1C20" />
-
-        <!-- Octorok Textures -->
-        <Texture Name="gOctorokRoughSkinTex" OutName="octorok_rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x1D20" />
-        <Texture Name="gOctorokMouthTex" OutName="octorok_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1F20" />
-        <Texture Name="gOctorokArmTex" OutName="octorok_arm" Format="rgba16" Width="16" Height="32" Offset="0x2020" />
-        <Texture Name="gOctorokFinTex" OutName="octorok_fin" Format="rgba16" Width="16" Height="16" Offset="0x2420" />
-        <Texture Name="gOctorokEyeTex" OutName="octorok_eye" Format="rgba16" Width="16" Height="16" Offset="0x2620" />
-        <Texture Name="gOctorokStripesTex" OutName="octorok_stripes" Format="rgba16" Width="8" Height="16" Offset="0x2820" />
-        <Texture Name="gOctorokScalesTex" OutName="octorok_scales" Format="rgba32" Width="16" Height="16" Offset="0x2920" />
-        <Texture Name="gOctorokScalesOoTTex" OutName="octorok_scales_oot" Format="rgba16" Width="16" Height="16" Offset="0x2D20" /> <!-- Unused OoT leftover -->
-        <Texture Name="gOctorokHeadBottomTex" OutName="octorok_head_bottom" Format="rgba16" Width="8" Height="8" Offset="0x2F20" />
-        <Texture Name="gOctorokShadedSkinTex" OutName="octorok_shaded_skin" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" />
-
-        <!-- Octorok Projectile Texture and DisplayList -->
-        <Texture Name="gOctorokProjectileTex" OutName="octorok_projectile" Format="rgba16" Width="16" Height="16" Offset="0x3020" />
-        <DList Name="gOctorokProjectileDL" Offset="0x3250" />
-
-        <!-- Octorok Limbs -->
-        <Limb Name="gOctorokBodyLimb" Type="Standard" EnumName="OCTOROK_LIMB_BODY" Offset="0x32E0" />
-        <Limb Name="gFrontLeftArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_LEFT_ARM_BASE" Offset="0x32EC" />
-        <Limb Name="gFrontLeftArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_LEFT_ARM_MIDDLE" Offset="0x32F8" />
-        <Limb Name="gFrontLeftArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_LEFT_ARM_END" Offset="0x3304" />
-        <Limb Name="gFrontRightArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_RIGHT_ARM_BASE" Offset="0x3310" />
-        <Limb Name="gFrontRightArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_RIGHT_ARM_MIDDLE" Offset="0x331C" />
-        <Limb Name="gFrontRightArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_RIGHT_ARM_END" Offset="0x3328" />
-        <Limb Name="gBackLeftArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_LEFT_ARM_BASE" Offset="0x3334" />
-        <Limb Name="gBackLeftArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_LEFT_ARM_MIDDLE" Offset="0x3340" />
-        <Limb Name="gBackLeftArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_LEFT_ARM_END" Offset="0x334C" />
-        <Limb Name="gBackRightArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_RIGHT_ARM_BASE" Offset="0x3358" />
-        <Limb Name="gBackRightArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_RIGHT_ARM_MIDDLE" Offset="0x3364" />
-        <Limb Name="gBackRightArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_RIGHT_ARM_END" Offset="0x3370" />
-        <Limb Name="gOctorokHeadLimb" Type="Standard" EnumName="OCTOROK_LIMB_HEAD" Offset="0x337C" />
-        <Limb Name="gOctorokSnoutLimb" Type="Standard" EnumName="OCTOROK_LIMB_SNOUT" Offset="0x3388" />
-
-        <!-- Octorok Skeleton -->
-        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" LimbNone="OCTOROK_LIMB_NONE" LimbMax="OCTOROK_LIMB_MAX" EnumName="OctorokLimb" Offset="0x33D0" />
-
-        <!-- Octorok Animations -->
-        <Animation Name="gOctorokDieAnim" Offset="0x3958" /> <!-- Original name is "oc_dead" -->
-        <Animation Name="gOctorokHideAnim" Offset="0x3B24" /> <!-- Original name is "oc_down" -->
-        <Animation Name="gOctorokFloatAnim" Offset="0x3EE4" /> <!-- Original name is "oc_float" -->
-        <Animation Name="gOctorokHitAnim" Offset="0x4204" /> <!-- Original name is "oc_predead" -->
-        <Animation Name="gOctorokAppearAnim" Offset="0x466C" /> <!-- Original name is "oc_up" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_omoya_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_omoya_obj.xml
deleted file mode 100644
index e5483bd19..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_omoya_obj.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_omoya_obj" Segment="6">
-        <DList Name="object_omoya_obj_DL_0001A0" Offset="0x1A0" /> <!-- Original name is "yane_model" -->
-        <Texture Name="object_omoya_obj_TLUT_0002D8" OutName="tlut_0002D8" Format="rgba16" Width="4" Height="4" Offset="0x2D8" />
-        <Texture Name="object_omoya_obj_Tex_0002F8" OutName="tex_0002F8" Format="rgba16" Width="64" Height="32" Offset="0x2F8" />
-        <Texture Name="object_omoya_obj_Tex_0012F8" OutName="tex_0012F8" Format="ci4" Width="64" Height="64" Offset="0x12F8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_open_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_open_obj.xml
deleted file mode 100644
index 3ad1dd436..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_open_obj.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Root>
-    <File Name="object_open_obj" Segment="6">
-        <DList Name="object_open_obj_DL_0003E0" Offset="0x3E0" /> <!-- Original name is "m2_OPNshutter_modelT" -->
-        <DList Name="object_open_obj_DL_0003E8" Offset="0x3E8" /> <!-- Original name is "m2_OPNshutter_model" -->
-        <Texture Name="object_open_obj_Tex_000558" OutName="tex_000558" Format="rgba16" Width="32" Height="64" Offset="0x558" />
-        <Collision Name="object_open_obj_Colheader_001640" Offset="0x1640" /> <!-- Original name is "m2_OPNshutter_bgdatainfo" -->
-        <DList Name="gSpotlightLeftDL" Offset="0x1A60" /> <!-- Original name is "m2_SPOT_modelT" -->
-        <DList Name="gSpotlightRightDL" Offset="0x1B40" /> <!-- Original name is "m2_SPOT_model" -->
-        <Texture Name="gSpotlightShapesTex" OutName="spotlight_shapes" Format="rgba16" Width="32" Height="32" Offset="0x1CD0" />
-        <Texture Name="gSpotlightFloorTex" OutName="spotlight_floor" Format="ia8" Width="32" Height="64" Offset="0x24D0" />
-        <TextureAnimation Name="gSpotlightTexAnim" Offset="0x2CE0" />
-        <DList Name="object_open_obj_DL_002D30" Offset="0x2D30" /> <!-- Original name is "rakugaki_modelT" -->
-        <DList Name="object_open_obj_DL_002DC0" Offset="0x2DC0" />
-        <!-- <Blob Name="object_open_obj_Blob_002DC8" Size="0xE608" Offset="0x2DC8" /> -->
-        <Texture Name="object_open_obj_Tex_00DDC8" OutName="tex_00DDC8" Format="i4" Width="32" Height="32" Offset="0xDDC8" />
-        <Texture Name="object_open_obj_Tex_00DFC8" OutName="tex_00DFC8" Format="i4" Width="32" Height="32" Offset="0xDFC8" />
-        <Texture Name="object_open_obj_Tex_00E1C8" OutName="tex_00E1C8" Format="i4" Width="32" Height="32" Offset="0xE1C8" />
-        <Texture Name="object_open_obj_Tex_00E3C8" OutName="tex_00E3C8" Format="i4" Width="32" Height="32" Offset="0xE3C8" />
-        <Texture Name="object_open_obj_Tex_00E5C8" OutName="tex_00E5C8" Format="i4" Width="32" Height="32" Offset="0xE5C8" />
-        <Texture Name="object_open_obj_Tex_00E7C8" OutName="tex_00E7C8" Format="i4" Width="32" Height="32" Offset="0xE7C8" />
-        <Texture Name="object_open_obj_Tex_00E9C8" OutName="tex_00E9C8" Format="i4" Width="32" Height="32" Offset="0xE9C8" />
-        <Texture Name="object_open_obj_Tex_00EBC8" OutName="tex_00EBC8" Format="i4" Width="32" Height="32" Offset="0xEBC8" />
-        <Texture Name="object_open_obj_Tex_00EDC8" OutName="tex_00EDC8" Format="i4" Width="32" Height="32" Offset="0xEDC8" />
-        <Texture Name="object_open_obj_Tex_00EFC8" OutName="tex_00EFC8" Format="i4" Width="32" Height="32" Offset="0xEFC8" />
-        <TextureAnimation Name="object_open_obj_Matanimheader_011458" Offset="0x11458" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_os_anime.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_os_anime.xml
deleted file mode 100644
index 379beff0a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_os_anime.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Root>
-    <File Name="object_os_anime" Segment="6">
-        <Animation Name="object_os_anime_Anim_0000B4" Offset="0xB4" />
-        <Animation Name="object_os_anime_Anim_000170" Offset="0x170" />
-        <Animation Name="object_os_anime_Anim_000228" Offset="0x228" />
-        <Animation Name="object_os_anime_Anim_000718" Offset="0x718" />
-        <Animation Name="object_os_anime_Anim_0007D0" Offset="0x7D0" />
-        <Animation Name="object_os_anime_Anim_000894" Offset="0x894" />
-        <Animation Name="object_os_anime_Anim_000938" Offset="0x938" />
-        <Animation Name="object_os_anime_Anim_000B80" Offset="0xB80" />
-        <Animation Name="object_os_anime_Anim_000FF0" Offset="0xFF0" />
-        <Animation Name="object_os_anime_Anim_00107C" Offset="0x107C" />
-        <Animation Name="object_os_anime_Anim_001270" Offset="0x1270" />
-        <Animation Name="object_os_anime_Anim_0012FC" Offset="0x12FC" />
-        <Animation Name="object_os_anime_Anim_001458" Offset="0x1458" /> <!-- Original name is "Cne2_15" -->
-        <Animation Name="object_os_anime_Anim_0017D8" Offset="0x17D8" /> <!-- Original name is "Cne_aruku" ("walk") -->
-        <Animation Name="object_os_anime_Anim_001C9C" Offset="0x1C9C" /> <!-- Original name is "Cne_hiso_wait" ("hiso" = onomatopoeic for "whisper") -->
-        <Animation Name="object_os_anime_Anim_001D44" Offset="0x1D44" /> <!-- Original name is "Cne_matsu" -->
-        <Animation Name="object_os_anime_Anim_001EE0" Offset="0x1EE0" /> <!-- Original name is "Cne_n_wait" ("to wait​") -->
-        <Animation Name="object_os_anime_Anim_001F78" Offset="0x1F78" />
-        <Animation Name="object_os_anime_Anim_0020F8" Offset="0x20F8" />
-        <Animation Name="object_os_anime_Anim_0021B8" Offset="0x21B8" />
-        <Animation Name="object_os_anime_Anim_0025E4" Offset="0x25E4" />
-        <Animation Name="object_os_anime_Anim_002C80" Offset="0x2C80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_osn.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_osn.xml
deleted file mode 100644
index d6109c717..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_osn.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<Root>
-    <!-- Assets for the Happy Mask Salesman and the cutscene Deku Mask -->
-    <File Name="object_osn" Segment="6">
-        <!-- Happy Mask Salesman Animations -->
-        <Animation Name="gHappyMaskSalesmanLyingDownAnim" Offset="0xC4" /> <!-- Frame 0: Face up, Frame 1: Face down--> <!-- Original name is "om_downpose" -->
-        <Animation Name="gHappyMaskSalesmanOrganPlayAnim" Offset="0x1034" /> <!-- Original name is "om_ensou" -->
-        <Animation Name="gHappyMaskSalesmanOrganTalkAnim" Offset="0x1614" /> <!-- Original name is "om_ensou_taiki" -->
-        <Animation Name="gHappyMaskSalesmanTurnAroundStartAnim" Offset="0x1D6C" /> <!-- Original name is "om_furimuki" -->
-        <Animation Name="gHappyMaskSalesmanTurnAroundLoopAnim" Offset="0x2634" /> <!-- Original name is "om_furimuki_loop" -->
-        <Animation Name="gHappyMaskSalesmanArmsOutAnim" Offset="0x2F74" /> <!-- Original name is "om_gozonji" -->
-        <Animation Name="gHappyMaskSalesmanBowingAnim" Offset="0x37C4" /> <!-- Original name is "om_hajime" -->
-        <Animation Name="gHappyMaskSalesmanChokeAnim" Offset="0x3A1C" /> <!-- Original name is "om_kubisime_loop" -->
-        <Animation Name="gHappyMaskSalesmanReminisceAnim" Offset="0x4320" /> <!-- Rock calmly with hands together out front --> <!-- Original name is "om_nanto" -->
-        <Animation Name="gHappyMaskSalesmanHandsClaspedAnim" Offset="0x4C8C" /> <!-- Stand still with hands clasped together out front --> <!-- Original name is "om_niginigi" -->
-        <Animation Name="gHappyMaskSalesmanDespairAnim" Offset="0x55F8" /> <!-- Rock wildly with both hands on head --> <!-- Original name is "om_noo_loop" -->
-        <Animation Name="gHappyMaskSalesmanMaskLookFromStartAnim" Offset="0x5D78" /> <!-- Look away from held mask --> <!-- Original name is "om_omfurim" -->
-        <Animation Name="gHappyMaskSalesmanMaskLookFromLoopAnim" Offset="0x6564" /> <!-- Original name is "om_omfurim_loop" -->
-        <Animation Name="gHappyMaskSalesmanMaskLookAtAnim" Offset="0x6D48" /> <!-- Original name is "om_ommotu_loop" -->
-        <Animation Name="gHappyMaskSalesmanFastBowsAnim" Offset="0x7220" /> <!-- Original name is "om_onegai_loop" -->
-        <Animation Name="gHappyMaskSalesmanWalkAwayAnim" Offset="0x8D80" /> <!-- Original name is "om_saru" -->
-        <Animation Name="gHappyMaskSalesmanBelieveAnim" Offset="0x94E4" /> <!-- Both arms outstreched while looking up --> <!-- Original name is "om_sinjina" -->
-        <Animation Name="gHappyMaskSalesmanThinkAnim" Offset="0x9BB8" /> <!-- Stand still with hand on chin --> <!-- --> <!-- Original name is "om_souieba" -->
-        <Animation Name="gHappyMaskSalesmanHandOutAnim" Offset="0xA444" /> <!-- Original name is "om_tewodasu_loop" -->
-        <Animation Name="gHappyMaskSalesmanShakeHeadAnim" Offset="0xAC60" /> <!-- Shake head with hand on forehead --> <!-- Original name is "om_watasi" -->
-        <Animation Name="gHappyMaskSalesmanShakeAnim" Offset="0xAE9C" /> <!-- Original name is "om_yusaburu" -->
-
-        <!-- Happy Mask Salesman DLists -->
-        <DList Name="gHappyMaskSalesmanPelvisDL" Offset="0xF5E0" />
-        <DList Name="gHappyMaskSalesmanRightThighDL" Offset="0xF830" />
-        <DList Name="gHappyMaskSalesmanRightShinDL" Offset="0xFB30" />
-        <DList Name="gHappyMaskSalesmanRightFootDL" Offset="0xFD88" />
-        <DList Name="gHappyMaskSalesmanLeftThighDL" Offset="0xFFC0" />
-        <DList Name="gHappyMaskSalesmanLeftShinDL" Offset="0x102C0" />
-        <DList Name="gHappyMaskSalesmanLeftFootDL" Offset="0x10518" />
-        <DList Name="gHappyMaskSalesmanAbdomenDL" Offset="0x10750" />
-        <DList Name="gHappyMaskSalesmanChestDL" Offset="0x10AB0" />
-        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x10ED0" />
-        <DList Name="gHappyMaskSalesmanBackpackDL" Offset="0x114B8" />
-        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x12088" />
-        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x122F8" />
-        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x125F0" />
-        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x12780" />
-        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x129F0" />
-        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x12CE8" />
-
-        <!-- Happy Mask Salesman Textures -->
-        <Texture Name="gHappyMaskSalesmanBodyTLUT" OutName="happy_mask_salesman_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x12E78" />
-        <Texture Name="gHappyMaskSalesmanBackpackTLUT" OutName="happy_mask_salesman_mask_backpack_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13078" />
-        <Texture Name="gHappyMaskSalesmanMask1TLUT" OutName="happy_mask_salesman_mask_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13278" /> <!-- Shared between multiple masks -->
-        <Texture Name="gHappyMaskSalesmanMask2TLUT" OutName="happy_mask_salesman_mask_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13478" /> <!-- Shared between multiple masks -->
-        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="happy_mask_salesman_skin" Format="ci8" Width="8" Height="8" Offset="0x13678" />
-        <Texture Name="gHappyMaskSalesmanEarTex" OutName="happy_mask_salesman_ear" Format="ci8" Width="8" Height="8" Offset="0x136B8" />
-        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="happy_mask_salesman_nostril" Format="ci8" Width="8" Height="8" Offset="0x136F8" />
-        <Texture Name="gHappyMaskSalesmanHairTex" OutName="happy_mask_salesman_hair" Format="ci8" Width="8" Height="16" Offset="0x13738" />
-        <Texture Name="gHappyMaskSalesmanGoldFabric1Tex" OutName="happy_mask_salesman_gold_fabric_1" Format="ci8" Width="8" Height="16" Offset="0x137B8" /> <!-- Main neck piece and back of the cuffs -->
-        <Texture Name="gHappyMaskSalesmanGoldFabric2Tex" OutName="happy_mask_salesman_gold_fabric_2" Format="ci8" Width="8" Height="16" Offset="0x13838" /> <!-- Collar and front of the cuffs -->
-        <Texture Name="gHappyMaskSalesmanRobeFrontTex" OutName="happy_mask_salesman_robe_front" Format="ci8" Width="16" Height="16" Offset="0x138B8" />
-        <Texture Name="gHappyMaskSalesmanFootTex" OutName="happy_mask_salesman_foot" Format="ci8" Width="8" Height="8" Offset="0x139B8" />
-        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="happy_mask_salesman_fingers" Format="ci8" Width="16" Height="16" Offset="0x139F8" />
-        <Texture Name="gHappyMaskSalesmaeClothesTex" OutName="happy_mask_salesman_clothes" Format="ci8" Width="16" Height="16" Offset="0x13AF8" />
-        <Texture Name="gHappyMaskSalesmanHairlineTex" OutName="happy_mask_salesman_hairline" Format="rgba16" Width="8" Height="16" Offset="0x13BF8" />
-        <Texture Name="gHappyMaskSalesmanShoeTex" OutName="happy_mask_salesman_shoe" Format="ci8" Width="16" Height="8" Offset="0x13CF8" />
-        <Texture Name="gHappyMaskSalesmanRobeBackTex" OutName="happy_mask_salesman_robe_back" Format="ci8" Width="16" Height="16" Offset="0x13D78" />
-        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="happy_mask_salesman_shirt" Format="ci8" Width="16" Height="16" Offset="0x13E78" />
-        <Texture Name="gHappyMaskSalesmaeClothesEndTex" OutName="happy_mask_salesman_clothes_ends" Format="ci8" Width="8" Height="8" Offset="0x13F78" />
-
-        <!-- Happy Mask Salesman Backpack Textures, TLUTs are above -->
-        <Texture Name="gHappyMaskSalesmanBackpackTopTex" OutName="happy_mask_salesman_backpack_top" Format="ci8" Width="16" Height="32" Offset="0x13FB8" />
-        <Texture Name="gHappyMaskSalesmanBackpackPocketTex" OutName="happy_mask_salesman_backpack_pocket" Format="ci8" Width="16" Height="32" Offset="0x141B8" />
-        <Texture Name="gHappyMaskSalesmanBackpackPocketTopTex" OutName="happy_mask_salesman_backpack_pocket_top" Format="ci8" Width="16" Height="16" Offset="0x143B8" />
-        <Texture Name="gHappyMaskSalesmanBackpackBottomTex" OutName="happy_mask_salesman_backpack_bottom" Format="ci8" Width="32" Height="64" Offset="0x144B8" />
-        <Texture Name="gHappyMaskSalesmanBackpackRollTex" OutName="happy_mask_salesman_backpack_roll" Format="ci8" Width="32" Height="16" Offset="0x14CB8" />
-        <Texture Name="gHappyMaskSalesmanBackpackRollEndTex" OutName="happy_mask_salesman_backpack_roll_end" Format="ci8" Width="16" Height="16" Offset="0x14EB8" />
-        <Texture Name="gHappyMaskSalesmanBackpackStrapTex" OutName="happy_mask_salesman_backpack_strap" Format="ci8" Width="8" Height="8" Offset="0x14FB8" />
-        <Texture Name="gHappyMaskSalesmanMask01Tex" OutName="happy_mask_salesman_mask_01" Format="ci8" Width="16" Height="32" Offset="0x14FF8" />
-        <Texture Name="gHappyMaskSalesmanMask02Tex" OutName="happy_mask_salesman_mask_02" Format="ci8" Width="16" Height="32" Offset="0x151F8" />
-        <Texture Name="gHappyMaskSalesmanScrollTex" OutName="happy_mask_salesman_scroll" Format="i8" Width="16" Height="16" Offset="0x153F8" />
-        <Texture Name="gHappyMaskSalesmanMask03Tex" OutName="happy_mask_salesman_mask_03" Format="ci8" Width="16" Height="32" Offset="0x154F8" /> <!-- Mario Mask -->
-        <Texture Name="gHappyMaskSalesmanMask04Tex" OutName="happy_mask_salesman_mask_04" Format="ci8" Width="16" Height="32" Offset="0x156F8" />
-        <Texture Name="gHappyMaskSalesmanMask05Tex" OutName="happy_mask_salesman_mask_05" Format="i8" Width="16" Height="32" Offset="0x158F8" /> <!-- Mayor's Mask, frowning version of the one on the Mayor's chair -->
-        <Texture Name="gHappyMaskSalesmanMask06Tex" OutName="happy_mask_salesman_mask_06" Format="rgba16" Width="16" Height="32" Offset="0x15AF8" />
-        <Texture Name="gHappyMaskSalesmanMask07Tex" OutName="happy_mask_salesman_mask_07" Format="ci8" Width="16" Height="32" Offset="0x15EF8" />
-        <Texture Name="gHappyMaskSalesmanMask08Tex" OutName="happy_mask_salesman_mask_08" Format="ci8" Width="16" Height="32" Offset="0x160F8" />
-        <Texture Name="gHappyMaskSalesmanMask09Tex" OutName="happy_mask_salesman_mask_09" Format="ci8" Width="16" Height="32" Offset="0x162F8" />
-        <Texture Name="gHappyMaskSalesmanMask10Tex" OutName="happy_mask_salesman_mask_10" Format="ci8" Width="16" Height="32" Offset="0x164F8" /> <!-- Mirror Shield Mask, same face as on mirror shield -->
-
-        <!-- Happy Mask Salesman Face Textures -->
-        <Texture Name="gHappyMaskSalesmanEyeClosedHappyTex" OutName="happy_mask_salesman_eye_closed_happy" Format="rgba16" Width="32" Height="32" Offset="0x166F8" />
-        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="happy_mask_salesman_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x16EF8" />
-        <Texture Name="gHappyMaskSalesmanEyeClosedAngryTex" OutName="happy_mask_salesman_eye_closed_angry" Format="rgba16" Width="32" Height="32" Offset="0x176F8" />
-        <Texture Name="gHappyMaskSalesmanSmileTex" OutName="happy_mask_salesman_smile" Format="rgba16" Width="32" Height="16" Offset="0x17EF8" />
-        <Texture Name="gHappyMaskSalesmanFrownTex" OutName="happy_mask_salesman_frown" Format="rgba16" Width="32" Height="16" Offset="0x182F8" />
-
-        <TextureAnimation Name="gHappyMaskSalesmanMouthTexAnim" Offset="0x1873C" /> <!-- Unused -->
-
-        <!-- Majora's Mask -->
-        <DList Name="gHappyMaskSalesmanMajorasMaskDL" Offset="0x192A0" />
-        <DList Name="gHappyMaskSalesmanMajorasMaskEyesDL" Offset="0x19650" />
-
-        <Texture Name="gHappyMaskSalesmanMajorasMaskFaceTex" OutName="happy_mask_salesman_majoras_mask_face" Format="rgba16" Width="32" Height="64" Offset="0x19700" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskSpikes1Tex" OutName="happy_mask_salesman_majoras_mask_spikes_1" Format="rgba16" Width="16" Height="16" Offset="0x1A700" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskSpikes2Tex" OutName="happy_mask_salesman_majoras_mask_spikes_2" Format="rgba16" Width="16" Height="16" Offset="0x1A900" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskSpikes3Tex" OutName="happy_mask_salesman_majoras_mask_spikes_3" Format="rgba16" Width="16" Height="16" Offset="0x1AB00" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskSpikes4Tex" OutName="happy_mask_salesman_majoras_mask_spikes_4" Format="rgba16" Width="16" Height="16" Offset="0x1AD00" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskBackTex" OutName="happy_mask_salesman_majoras_mask_back" Format="rgba16" Width="32" Height="32" Offset="0x1AF00" />
-        <Texture Name="gHappyMaskSalesmanMajorasMaskEyeTex" OutName="happy_mask_salesman_majoras_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x1B700" />
-
-        <!-- <Blob Name="object_osn_Blob_01BF00" Size="0x3880" Offset="0x1BF00" /> -->
-
-        <!-- Happy Mask Salesman Idle Anim-->
-        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x201BC" /> <!-- Original name is "osn_wait" -->
-
-        <!-- Happy Mask Salesman Skeleton -->
-        <Limb Name="gHappyMaskSalesmanRootLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_ROOT" Offset="0x201D0" />
-        <Limb Name="gHappyMaskSalesmanAbdomenLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_ABDOMEN" Offset="0x201DC" />
-        <Limb Name="gHappyMaskSalesmanChestLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_CHEST" Offset="0x201E8" />
-        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_UPPER_ARM" Offset="0x201F4" />
-        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_FOREARM" Offset="0x20200" />
-        <Limb Name="gHappyMaskSalesmanLeftHandLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_HAND" Offset="0x2020C" />
-        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_RIGHT_UPPER_ARM" Offset="0x20218" />
-        <Limb Name="gHappyMaskSalesmanRightForearmLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_RIGHT_FOREARM" Offset="0x20224" />
-        <Limb Name="gHappyMaskSalesmanRightHandLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_RIGHT_HAND" Offset="0x20230" />
-        <Limb Name="gHappyMaskSalesmanBackpackLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_BACKPACK" Offset="0x2023C" />
-        <Limb Name="gHappyMaskSalesmanHeadLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_HEAD" Offset="0x20248" />
-        <Limb Name="gHappyMaskSalesmanPelvisLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_PELVIS" Offset="0x20254" />
-        <Limb Name="gHappyMaskSalesmanLeftThighLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_THIGH" Offset="0x20260" />
-        <Limb Name="gHappyMaskSalesmanLeftShinLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_SHIN" Offset="0x2026C" />
-        <Limb Name="gHappyMaskSalesmanLeftFootLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_LEFT_FOOT" Offset="0x20278" />
-        <Limb Name="gHappyMaskSalesmanRightThighLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_RIGHT_THIGH" Offset="0x20284" />
-        <Limb Name="gHappyMaskSalesmanRightShinLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_RIGHT_SHIN" Offset="0x20290" />
-        <Limb Name="gHappyMaskSalesmanRightFootLimb" Type="Standard" EnumName="HAPPY_MASK_SALESMAN_LIMB_RIGHT_FOOT" Offset="0x2029C" />
-        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" LimbNone="HAPPY_MASK_SALESMAN_LIMB_NONE" LimbMax="HAPPY_MASK_SALESMAN_LIMB_MAX" EnumName="HappyMaskSalesmanLimb" Offset="0x202F0" />
-
-        <!-- Deku Mask -->
-        <Animation Name="gDekuMaskFallOverAnim" Offset="0x20530" /> <!-- Original name is "rakka" -->
-        <Limb Name="gDekuMaskLimb" Type="Standard" EnumName="DEKU_MASK_LIMB" Offset="0x20540" />
-        <Skeleton Name="gDekuMaskSkel" Type="Flex" LimbType="Standard" LimbNone="DEKU_MASK_LIMB_NONE" LimbMax="DEKU_MASK_LIMB_MAX" EnumName="DekuMaskLimb" Offset="0x20550" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ot.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ot.xml
deleted file mode 100644
index 1b99fb071..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ot.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Root>
-    <File Name="object_ot" Segment="6">
-        <DList Name="object_ot_DL_000040" Offset="0x40" />
-        <DList Name="object_ot_DL_000078" Offset="0x78" /> <!-- Original name is "ot_item_model" -->
-        <Animation Name="object_ot_Anim_000420" Offset="0x420" /> <!-- Original name is "ot_kissing" -->
-        <DList Name="object_ot_DL_0004A0" Offset="0x4A0" /> <!-- Original name is "ot_light_model" -->
-        <Texture Name="object_ot_Tex_000550" OutName="tex_000550" Format="ia16" Width="8" Height="8" Offset="0x550" />
-        <TextureAnimation Name="object_ot_Matanimheader_0005F8" Offset="0x5F8" />
-        <Animation Name="object_ot_Anim_0008D8" Offset="0x8D8" /> <!-- Original name is "ot_swim" -->
-        <DList Name="object_ot_DL_001800" Offset="0x1800" />
-        <DList Name="object_ot_DL_0018D0" Offset="0x18D0" />
-        <DList Name="object_ot_DL_001988" Offset="0x1988" />
-        <DList Name="object_ot_DL_001AA0" Offset="0x1AA0" />
-        <DList Name="object_ot_DL_001B80" Offset="0x1B80" />
-        <DList Name="object_ot_DL_001C38" Offset="0x1C38" />
-        <DList Name="object_ot_DL_001CF0" Offset="0x1CF0" />
-        <DList Name="object_ot_DL_001FD8" Offset="0x1FD8" />
-        <DList Name="object_ot_DL_002090" Offset="0x2090" />
-        <DList Name="object_ot_DL_002220" Offset="0x2220" />
-        <DList Name="object_ot_DL_002318" Offset="0x2318" />
-        <DList Name="object_ot_DL_002410" Offset="0x2410" />
-        <DList Name="object_ot_DL_002508" Offset="0x2508" />
-        <DList Name="object_ot_DL_002600" Offset="0x2600" />
-        <DList Name="object_ot_DL_0026F8" Offset="0x26F8" />
-        <DList Name="object_ot_DL_0027F0" Offset="0x27F0" />
-        <Texture Name="object_ot_TLUT_0028E0" OutName="tlut_0028E0" Format="rgba16" Width="16" Height="16" Offset="0x28E0" />
-        <Texture Name="object_ot_Tex_002AE0" OutName="tex_002AE0" Format="ci8" Width="32" Height="32" Offset="0x2AE0" />
-        <Texture Name="object_ot_Tex_002EE0" OutName="tex_002EE0" Format="ci8" Width="32" Height="64" Offset="0x2EE0" />
-        <Texture Name="object_ot_Tex_0036E0" OutName="tex_0036E0" Format="ci8" Width="32" Height="32" Offset="0x36E0" />
-        <Texture Name="object_ot_Tex_003AE0" OutName="tex_003AE0" Format="ci8" Width="32" Height="32" Offset="0x3AE0" />
-        <Texture Name="object_ot_Tex_003EE0" OutName="tex_003EE0" Format="ci8" Width="32" Height="32" Offset="0x3EE0" />
-        <Texture Name="object_ot_Tex_0042E0" OutName="tex_0042E0" Format="ci8" Width="32" Height="32" Offset="0x42E0" />
-        <Limb Name="object_ot_Standardlimb_0046E0" Type="Standard" EnumName="OBJECT_OT_LIMB_01" Offset="0x46E0" />
-        <Limb Name="object_ot_Standardlimb_0046EC" Type="Standard" EnumName="OBJECT_OT_LIMB_02" Offset="0x46EC" />
-        <Limb Name="object_ot_Standardlimb_0046F8" Type="Standard" EnumName="OBJECT_OT_LIMB_03" Offset="0x46F8" />
-        <Limb Name="object_ot_Standardlimb_004704" Type="Standard" EnumName="OBJECT_OT_LIMB_04" Offset="0x4704" />
-        <Limb Name="object_ot_Standardlimb_004710" Type="Standard" EnumName="OBJECT_OT_LIMB_05" Offset="0x4710" />
-        <Limb Name="object_ot_Standardlimb_00471C" Type="Standard" EnumName="OBJECT_OT_LIMB_06" Offset="0x471C" />
-        <Limb Name="object_ot_Standardlimb_004728" Type="Standard" EnumName="OBJECT_OT_LIMB_07" Offset="0x4728" />
-        <Limb Name="object_ot_Standardlimb_004734" Type="Standard" EnumName="OBJECT_OT_LIMB_08" Offset="0x4734" />
-        <Limb Name="object_ot_Standardlimb_004740" Type="Standard" EnumName="OBJECT_OT_LIMB_09" Offset="0x4740" />
-        <Limb Name="object_ot_Standardlimb_00474C" Type="Standard" EnumName="OBJECT_OT_LIMB_0A" Offset="0x474C" />
-        <Limb Name="object_ot_Standardlimb_004758" Type="Standard" EnumName="OBJECT_OT_LIMB_0B" Offset="0x4758" />
-        <Limb Name="object_ot_Standardlimb_004764" Type="Standard" EnumName="OBJECT_OT_LIMB_0C" Offset="0x4764" />
-        <Limb Name="object_ot_Standardlimb_004770" Type="Standard" EnumName="OBJECT_OT_LIMB_0D" Offset="0x4770" />
-        <Limb Name="object_ot_Standardlimb_00477C" Type="Standard" EnumName="OBJECT_OT_LIMB_0E" Offset="0x477C" />
-        <Limb Name="object_ot_Standardlimb_004788" Type="Standard" EnumName="OBJECT_OT_LIMB_0F" Offset="0x4788" />
-        <Limb Name="object_ot_Standardlimb_004794" Type="Standard" EnumName="OBJECT_OT_LIMB_10" Offset="0x4794" />
-        <Limb Name="object_ot_Standardlimb_0047A0" Type="Standard" EnumName="OBJECT_OT_LIMB_11" Offset="0x47A0" />
-        <Limb Name="object_ot_Standardlimb_0047AC" Type="Standard" EnumName="OBJECT_OT_LIMB_12" Offset="0x47AC" />
-        <Skeleton Name="object_ot_Skel_004800" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OT_LIMB_NONE" LimbMax="OBJECT_OT_LIMB_MAX" EnumName="ObjectOtLimb" Offset="0x4800" />
-        <Animation Name="object_ot_Anim_004B30" Offset="0x4B30" /> <!-- Original name is "ot_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_owl.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_owl.xml
deleted file mode 100644
index b07442a99..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_owl.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<Root>
-    <!-- Object for Kaepora Gaebora (Owl) -->
-    <File Name="object_owl" Segment="6">
-        <!-- Animation -->
-        <Animation Name="gOwlTakeoffAnim" Offset="0x1168" /> <!-- Original name is "hovering" -->
-        
-        <!-- Single feather -->
-        <DList Name="gOwlFeatherDL" Offset="0x1200" /> <!-- Original name is "owl_feather_model" -->
-        <Texture Name="gOwlFeatherTex" OutName="owl_feather" Format="rgba16" Width="16" Height="32" Offset="0x1290" />
-        
-        <!-- Animation -->
-        <Animation Name="gOwlFlyAnim" Offset="0x1ADC" /> <!-- Original name is "owl_fly" -->
-        
-        <!-- Owl Flying DList -->
-        <DList Name="gOwlFlyingLowerBodyDL" Offset="0x5050" />
-        <DList Name="gOwlFlyingUpperBodyDL" Offset="0x51C8" />
-        <DList Name="gOwlFlyingHeadDL" Offset="0x52F0" />
-        <DList Name="gOwlFlyingRightEyebrowDL" Offset="0x5770" />
-        <DList Name="gOwlFlyingLeftEyebrowDL" Offset="0x5828" />
-        <DList Name="gOwlFlyingUpperRightLegDL" Offset="0x58E0" />
-        <DList Name="gOwlFlyingLowerRightLegDL" Offset="0x59A8" />
-        <DList Name="gOwlFlyingRightTalonDL" Offset="0x5A98" />
-        <DList Name="gOwlFlyingLowerLeftWingDL" Offset="0x5C30" />
-        <DList Name="gOwlFlyingMiddleLeftWing1DL" Offset="0x5E70" />
-        <DList Name="gOwlFlyingMiddleLeftWing2DL" Offset="0x60C8" />
-        <DList Name="gOwlFlyingUpperLeftWingDL" Offset="0x62F8" />
-        <DList Name="gOwlFlyingLowerRightWingDL" Offset="0x6578" />
-        <DList Name="gOwlFlyingMiddleRightWing1DL" Offset="0x67B8" />
-        <DList Name="gOwlFlyingMiddleRightWing2DL" Offset="0x6A10" />
-        <DList Name="gOwlFlyingUpperRightWingDL" Offset="0x6C40" />
-        <DList Name="gOwlFlyingTailDL" Offset="0x6EC0" />
-        <DList Name="gOwlFlyingUpperLeftLegDL" Offset="0x6F68" />
-        <DList Name="gOwlFlyingLowerLeftLegDL" Offset="0x7030" />
-        <DList Name="gOwlFlyingLeftTalonDL" Offset="0x7120" />
-        
-        <!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
-        <!-- TLUT used in gOwlPerchingHeadDL -->
-        <Texture Name="gOwlPerchingEyeTLUT" OutName="owl_perching_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x72B8" />
-        <!-- TLUT used in gOwlFlyingHeadDL -->
-        <Texture Name="gOwlFlyingEyeTLUT" OutName="owl_flying_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x74B8" />
-
-        <!-- Textures -->
-        <Texture Name="gOwlChinMarking1Tex" OutName="owl_chin_marking1" Format="rgba16" Width="32" Height="32" Offset="0x76B8" />
-        <Texture Name="gOwlForeheadMarkingTex" OutName="owl_forehead_marking" Format="rgba16" Width="32" Height="32" Offset="0x7EB8" />
-        <Texture Name="gOwlBeakTex" OutName="owl_beak" Format="rgba16" Width="32" Height="32" Offset="0x86B8" />
-        <Texture Name="gOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8EB8" />
-        <Texture Name="gOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x92B8" />
-        <Texture Name="gOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x96B8" />
-        <Texture Name="gOwlChinMarking2Tex" OutName="owl_chin_marking2" Format="rgba16" Width="32" Height="32" Offset="0x9AB8" />
-        <Texture Name="gOwlFeathersTex" OutName="owl_feathers" Format="rgba16" Width="16" Height="16" Offset="0xA2B8" />
-        <Texture Name="gOwlEyebrowTex" OutName="owl_eyebrow" Format="rgba16" Width="64" Height="32" Offset="0xA4B8" />
-        <Texture Name="gOwlFlightFeathers1Tex" OutName="owl_flight_feathers1" Format="rgba16" Width="32" Height="32" Offset="0xB4B8" />
-        <Texture Name="gOwlFlightFeathers2Tex" OutName="owl_flight_feathers2" Format="rgba16" Width="32" Height="32" Offset="0xBCB8" />
-        
-        <!-- Owl Flying Limbs -->
-        <Limb Name="gOwlFlyingLowerBodyLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LOWER_BODY" Offset="0xC4B8" />
-        <Limb Name="gOwlFlyingUpperBodyLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_UPPER_BODY" Offset="0xC4C4" />
-        <Limb Name="gOwlFlyingHeadLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_HEAD" Offset="0xC4D0" />
-        <Limb Name="gOwlFlyingRightEyebrowLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_RIGHT_EYEBROW" Offset="0xC4DC" />
-        <Limb Name="gOwlFlyingLeftEyebrowLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LEFT_EYEBROW" Offset="0xC4E8" />
-        <Limb Name="gOwlFlyingLowerLeftWingLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LOWER_LEFT_WING" Offset="0xC4F4" />
-        <Limb Name="gOwlFlyingMiddleLeftWing1Limb" Type="Standard" EnumName="OWL_FLYING_LIMB_MIDDLE_LEFT_WING_1" Offset="0xC500" />
-        <Limb Name="gOwlFlyingMiddleLeftWing2Limb" Type="Standard" EnumName="OWL_FLYING_LIMB_MIDDLE_LEFT_WING_2" Offset="0xC50C" />
-        <Limb Name="gOwlFlyingUpperLeftWingLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_UPPER_LEFT_WING" Offset="0xC518" />
-        <Limb Name="gOwlFlyingLowerRightWingLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LOWER_RIGHT_WING" Offset="0xC524" />
-        <Limb Name="gOwlFlyingMiddleRightWing1Limb" Type="Standard" EnumName="OWL_FLYING_LIMB_MIDDLE_RIGHT_WING_1" Offset="0xC530" />
-        <Limb Name="gOwlFlyingMiddleRightWing2Limb" Type="Standard" EnumName="OWL_FLYING_LIMB_MIDDLE_RIGHT_WING_2" Offset="0xC53C" />
-        <Limb Name="gOwlFlyingUpperRightWingLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_UPPER_RIGHT_WING" Offset="0xC548" />
-        <Limb Name="gOwlFlyingUpperRightLegLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_UPPER_RIGHT_LEG" Offset="0xC554" />
-        <Limb Name="gOwlFlyingLowerRightLegLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LOWER_RIGHT_LEG" Offset="0xC560" />
-        <Limb Name="gOwlFlyingRightTalonLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_RIGHT_TALON" Offset="0xC56C" />
-        <Limb Name="gOwlFlyingUpperLeftLegLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_UPPER_LEFT_LEG" Offset="0xC578" />
-        <Limb Name="gOwlFlyingLowerLeftLegLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LOWER_LEFT_LEG" Offset="0xC584" />
-        <Limb Name="gOwlFlyingLeftTalonLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_LEFT_TALON" Offset="0xC590" />
-        <Limb Name="gOwlFlyingTailLimb" Type="Standard" EnumName="OWL_FLYING_LIMB_TAIL" Offset="0xC59C" />
-        
-        <!-- Owl Flying Skeleton -->
-        <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" LimbNone="OWL_FLYING_LIMB_NONE" LimbMax="OWL_FLYING_LIMB_MAX" EnumName="OwlFlyingLimb" Offset="0xC5F8" />
-        
-        <!-- Animations -->
-        <Animation Name="gOwlGlideAnim" Offset="0xC6D4" /> <!-- Original name is "owl_kakku" -->
-        <Animation Name="gOwlUnfoldWingsAnim" Offset="0xCB94" /> <!-- Original name is "owl_openwing" -->
-        <Animation Name="gOwlPerchAnim" Offset="0xCDB0" /> <!-- Original name is "owl_wait" -->
-        
-        <!-- Owl Perching DList -->
-        <DList Name="gOwlPerchingLeftWingDL" Offset="0xF220" />
-        <DList Name="gOwlPerchingRightWingDL" Offset="0xF3B0" />
-        <DList Name="gOwlPerchingTailDL" Offset="0xF540" />
-        <DList Name="gOwlPerchingLowerBodyDL" Offset="0xF5E8" />
-        <DList Name="gOwlPerchingUpperBodyDL" Offset="0xF6D0" />
-        <DList Name="gOwlPerchingHeadDL" Offset="0xF840" />
-        <DList Name="gOwlPerchingRightEyebrowDL" Offset="0xFCC0" />
-        <DList Name="gOwlPerchingLeftEyebrowDL" Offset="0xFD78" />
-        <DList Name="gOwlPerchingUpperLeftLegDL" Offset="0xFE30" />
-        <DList Name="gOwlPerchingLowerLeftLegDL" Offset="0xFEF8" />
-        <DList Name="gOwlPerchingLeftTalonDL" Offset="0xFFE8" />
-        <DList Name="gOwlPerchingUpperRightLegDL" Offset="0x10180" />
-        <DList Name="gOwlPerchingLowerRightLegDL" Offset="0x10248" />
-        <DList Name="gOwlPerchingRightTalonDL" Offset="0x10338" />
-        
-        <!-- Owl Perching Limbs -->
-        <Limb Name="gOwlPerchingRootLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_ROOT" Offset="0x104D0" />
-        <Limb Name="gOwlPerchingUpperBodyLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_UPPER_BODY" Offset="0x104DC" />
-        <Limb Name="gOwlPerchingHeadLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_HEAD" Offset="0x104E8" />
-        <Limb Name="gOwlPerchingRightEyebrowLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_RIGHT_EYEBROW" Offset="0x104F4" />
-        <Limb Name="gOwlPerchingLeftEyebrowLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LEFT_EYEBROW" Offset="0x10500" />
-        <Limb Name="gOwlPerchingLowerBodyLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LOWER_BODY" Offset="0x1050C" />
-        <Limb Name="gOwlPerchingRightWingLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_RIGHT_WING" Offset="0x10518" />
-        <Limb Name="gOwlPerchingLeftWingLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LEFT_WING" Offset="0x10524" />
-        <Limb Name="gOwlPerchingUpperLeftLegLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_UPPER_LEFT_LEG" Offset="0x10530" />
-        <Limb Name="gOwlPerchingLowerLeftLegLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LOWER_LEFT_LEG" Offset="0x1053C" />
-        <Limb Name="gOwlPerchingLeftTalonLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LEFT_TALON" Offset="0x10548" />
-        <Limb Name="gOwlPerchingUpperRightLegLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_UPPER_RIGHT_LEG" Offset="0x10554" />
-        <Limb Name="gOwlPerchingLowerRightLegLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_LOWER_RIGHT_LEG" Offset="0x10560" />
-        <Limb Name="gOwlPerchingRightTalonLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_RIGHT_TALON" Offset="0x1056C" />
-        <Limb Name="gOwlPerchingTailLimb" Type="Standard" EnumName="OWL_PERCHING_LIMB_TAIL" Offset="0x10578" />
-        
-        <!-- Owl Perching Skeleton -->
-        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" LimbNone="OWL_PERCHING_LIMB_NONE" LimbMax="OWL_PERCHING_LIMB_MAX" EnumName="OwlPerchingLimb" Offset="0x105C0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_oyu.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_oyu.xml
deleted file mode 100644
index f674f0977..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_oyu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Hot Spring Water found in the Goron Graveyard -->
-    <File Name="object_oyu" Segment="6">
-        <DList Name="gGoronGraveyardHotSpringWaterDL" Offset="0x80" /> <!-- Original name is "z2_goron_haka_oyu_modelT" -->
-        <DList Name="gGoronGraveyardHotSpringWaterEmptyDL" Offset="0x158" />
-        <Texture Name="gGoronGraveyardHotSpringWaterTex" OutName="hot_spring_water" Format="rgba16" Width="32" Height="32" Offset="0x160" />
-        <TextureAnimation Name="gGoronGraveyardHotSpringWaterTexAnim" Offset="0x968" />
-        <Collision Name="gGoronGraveyardHotSpringWaterCol" Offset="0x988" /> <!-- Original name is "z2_goron_haka_oyu_bgdatainfo" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pamera.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pamera.xml
deleted file mode 100644
index 61dc17694..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pamera.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<Root>
-    <File Name="object_pamera" Segment="6">
-        <Animation Name="object_pamera_Anim_0005BC" Offset="0x5BC" />
-
-        <DList Name="gPamelaAbdomenDL" Offset="0x2E50" />
-        <DList Name="gPamelaPelvisDL" Offset="0x2FB8" />
-        <DList Name="gPamelaNeckDL" Offset="0x30D0" />
-        <DList Name="gPamelaChestDL" Offset="0x31B0" />
-        <DList Name="gPamelaLeftUpperArmDL" Offset="0x3520" />
-        <DList Name="gPamelaLeftForearmDL" Offset="0x37B8" />
-        <DList Name="gPamelaLeftHandDL" Offset="0x39C0" />
-        <DList Name="gPamelaRightUpperArmDL" Offset="0x3D60" />
-        <DList Name="gPamelaRightForearmDL" Offset="0x3F78" />
-        <DList Name="gPamelaRightHandDL" Offset="0x4180" />
-        <DList Name="gPamelaHeadDL" Offset="0x4520" />
-        <DList Name="gPamelaHairEndDL" Offset="0x4AC0" />
-        <DList Name="gPamelaBackDressDL" Offset="0x4C88" />
-        <DList Name="gPamelaFrontDressDL" Offset="0x4E00" />
-        <DList Name="gPamelaLeftThighDL" Offset="0x4F78" />
-        <DList Name="gPamelaLeftLegDL" Offset="0x5158" />
-        <DList Name="gPamelaLeftFootDL" Offset="0x54B8" />
-        <DList Name="gPamelaRightThighDL" Offset="0x5830" />
-        <DList Name="gPamelaRightLegDL" Offset="0x5A10" />
-        <DList Name="gPamelaRightFootDL" Offset="0x5D70" />
-
-        <Texture Name="object_pamera_TLUT_0060E8" OutName="tlut_0060E8" Format="rgba16" Width="16" Height="16" Offset="0x60E8" />
-        <Texture Name="object_pamera_Tex_0062E8" OutName="tex_0062E8" Format="ci8" Width="16" Height="16" Offset="0x62E8" />
-        <Texture Name="object_pamera_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="16" Height="16" Offset="0x63E8" />
-        <Texture Name="object_pamera_Tex_0064E8" OutName="tex_0064E8" Format="ci8" Width="16" Height="16" Offset="0x64E8" />
-        <Texture Name="object_pamera_Tex_0065E8" OutName="tex_0065E8" Format="ci8" Width="16" Height="16" Offset="0x65E8" />
-        <Texture Name="object_pamera_Tex_0066E8" OutName="tex_0066E8" Format="ci8" Width="32" Height="32" Offset="0x66E8" />
-        <Texture Name="object_pamera_Tex_006AE8" OutName="tex_006AE8" Format="ci8" Width="32" Height="32" Offset="0x6AE8" />
-        <Texture Name="object_pamera_Tex_006EE8" OutName="tex_006EE8" Format="ci8" Width="32" Height="32" Offset="0x6EE8" />
-        <Texture Name="object_pamera_Tex_0072E8" OutName="tex_0072E8" Format="ci8" Width="16" Height="16" Offset="0x72E8" />
-        <Texture Name="object_pamera_Tex_0073E8" OutName="tex_0073E8" Format="ci8" Width="16" Height="16" Offset="0x73E8" />
-        <Texture Name="object_pamera_Tex_0074E8" OutName="tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74E8" />
-        <Texture Name="object_pamera_Tex_0078E8" OutName="tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78E8" />
-        <Texture Name="object_pamera_Tex_007CE8" OutName="tex_007CE8" Format="ci8" Width="16" Height="16" Offset="0x7CE8" />
-        <Texture Name="object_pamera_Tex_007DE8" OutName="tex_007DE8" Format="ci8" Width="32" Height="16" Offset="0x7DE8" />
-        <Texture Name="object_pamera_Tex_007FE8" OutName="tex_007FE8" Format="ci8" Width="16" Height="16" Offset="0x7FE8" />
-        <Texture Name="object_pamera_Tex_0080E8" OutName="tex_0080E8" Format="ci8" Width="16" Height="16" Offset="0x80E8" />
-        <Texture Name="object_pamera_Tex_0081E8" OutName="tex_0081E8" Format="ci8" Width="16" Height="16" Offset="0x81E8" />
-
-        <Limb Name="gPamelaRootLimb" Type="Standard" EnumName="PAMELA_LIMB_ROOT" Offset="0x82E8" />
-        <Limb Name="gPamelaUpperBodyRootLimb" Type="Standard" EnumName="PAMELA_LIMB_UPPER_BODY_ROOT" Offset="0x82F4" />
-        <Limb Name="gPamelaLeftUpperArmLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_UPPER_ARM" Offset="0x8300" />
-        <Limb Name="gPamelaLeftForearmLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_FOREARM" Offset="0x830C" />
-        <Limb Name="gPamelaLeftHandLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_HAND" Offset="0x8318" />
-        <Limb Name="gPamelaRightUpperArmLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_UPPER_ARM" Offset="0x8324" />
-        <Limb Name="gPamelaRightForearmLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_FOREARM" Offset="0x8330" />
-        <Limb Name="gPamelaRightHandLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_HAND" Offset="0x833C" />
-        <Limb Name="gPamelaHeadLimb" Type="Standard" EnumName="PAMELA_LIMB_HEAD" Offset="0x8348" />
-        <Limb Name="gPamelaHairEndLimb" Type="Standard" EnumName="PAMELA_LIMB_HAIR_END" Offset="0x8354" />
-        <Limb Name="gPamelaChestLimb" Type="Standard" EnumName="PAMELA_LIMB_CHEST" Offset="0x8360" />
-        <Limb Name="gPamelaNeckLimb" Type="Standard" EnumName="PAMELA_LIMB_NECK" Offset="0x836C" />
-        <Limb Name="gPamelaLeftThighLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_THIGH" Offset="0x8378" />
-        <Limb Name="gPamelaLeftLegLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_LEG" Offset="0x8384" />
-        <Limb Name="gPamelaLeftFootLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_FOOT" Offset="0x8390" />
-        <Limb Name="gPamelaRightThighLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_THIGH" Offset="0x839C" />
-        <Limb Name="gPamelaRightLegLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_LEG" Offset="0x83A8" />
-        <Limb Name="gPamelaRightFootLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_FOOT" Offset="0x83B4" />
-        <Limb Name="gPamelaFrontDressLimb" Type="Standard" EnumName="PAMELA_LIMB_FRONT_DRESS" Offset="0x83C0" />
-        <Limb Name="gPamelaBackDressLimb" Type="Standard" EnumName="PAMELA_LIMB_BACK_DRESS" Offset="0x83CC" />
-        <Limb Name="gPamelaAbdomenLimb" Type="Standard" EnumName="PAMELA_LIMB_ABDOMEN" Offset="0x83D8" />
-        <Limb Name="gPamelaPelvisLimb" Type="Standard" EnumName="PAMELA_LIMB_PELVIS" Offset="0x83E4" />
-        <Skeleton Name="gPamelaSkel" Type="Flex" LimbType="Standard" LimbNone="PAMELA_LIMB_NONE" LimbMax="PAMELA_LIMB_MAX" EnumName="PamelaLimb" Offset="0x8448" />
-        
-        <Animation Name="object_pamera_Anim_008AE0" Offset="0x8AE0" /> <!-- Pamela Walking -->
-        <Animation Name="object_pamera_Anim_008E38" Offset="0x8E38" />
-        <Animation Name="object_pamera_Anim_009870" Offset="0x9870" />
-        <Animation Name="object_pamera_Anim_009F54" Offset="0x9F54" /> <!-- HoldBack En_Hgo -->
-        <Animation Name="object_pamera_Anim_00A844" Offset="0xA844" /> <!-- Pamela Looking down the well -->
-        <Animation Name="object_pamera_Anim_00B0C4" Offset="0xB0C4" />
-        <Animation Name="object_pamera_Anim_00B5B0" Offset="0xB5B0" /> <!-- PushBack En_Hgo -->
-        <Animation Name="object_pamera_Anim_00BCC4" Offset="0xBCC4" /> <!-- Defend En_Hgo -->
-        <Animation Name="object_pamera_Anim_00C9F4" Offset="0xC9F4" />
-        <Animation Name="object_pamera_Anim_00D0F0" Offset="0xD0F0" />
-        <Animation Name="object_pamera_Anim_00D9DC" Offset="0xD9DC" />
-        <Animation Name="object_pamera_Anim_00E16C" Offset="0xE16C" /> <!-- Hugging En_Hg -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ph.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ph.xml
deleted file mode 100644
index fcf03b765..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ph.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<Root>
-    <File Name="object_ph" Segment="6">
-        <Animation Name="object_ph_Anim_000350" Offset="0x350" />
-        <Animation Name="object_ph_Anim_0005C4" Offset="0x5C4" />
-        <Animation Name="object_ph_Anim_000844" Offset="0x844" />
-        <Animation Name="object_ph_Anim_0009C4" Offset="0x9C4" />
-        <DList Name="object_ph_DL_000ED0" Offset="0xED0" />
-        <DList Name="object_ph_DL_000F60" Offset="0xF60" />
-        <DList Name="object_ph_DL_000FF0" Offset="0xFF0" />
-        <DList Name="object_ph_DL_001080" Offset="0x1080" />
-        <DList Name="object_ph_DL_001110" Offset="0x1110" />
-        <DList Name="object_ph_DL_0011A0" Offset="0x11A0" />
-        <DList Name="object_ph_DL_001230" Offset="0x1230" />
-        <DList Name="object_ph_DL_0012F0" Offset="0x12F0" />
-        <Texture Name="object_ph_Tex_001410" OutName="tex_001410" Format="rgba16" Width="8" Height="8" Offset="0x1410" />
-        <Texture Name="object_ph_Tex_001490" OutName="tex_001490" Format="rgba16" Width="16" Height="32" Offset="0x1490" />
-        <Texture Name="object_ph_Tex_001890" OutName="tex_001890" Format="rgba16" Width="8" Height="32" Offset="0x1890" />
-        <Texture Name="object_ph_Tex_001A90" OutName="tex_001A90" Format="rgba16" Width="8" Height="8" Offset="0x1A90" />
-        <Limb Name="object_ph_Standardlimb_001B10" Type="Standard" EnumName="OBJECT_PH_LIMB_01" Offset="0x1B10" />
-        <Limb Name="object_ph_Standardlimb_001B1C" Type="Standard" EnumName="OBJECT_PH_LIMB_02" Offset="0x1B1C" />
-        <Limb Name="object_ph_Standardlimb_001B28" Type="Standard" EnumName="OBJECT_PH_LIMB_03" Offset="0x1B28" />
-        <Limb Name="object_ph_Standardlimb_001B34" Type="Standard" EnumName="OBJECT_PH_LIMB_04" Offset="0x1B34" />
-        <Limb Name="object_ph_Standardlimb_001B40" Type="Standard" EnumName="OBJECT_PH_LIMB_05" Offset="0x1B40" />
-        <Limb Name="object_ph_Standardlimb_001B4C" Type="Standard" EnumName="OBJECT_PH_LIMB_06" Offset="0x1B4C" />
-        <Limb Name="object_ph_Standardlimb_001B58" Type="Standard" EnumName="OBJECT_PH_LIMB_07" Offset="0x1B58" />
-        <Limb Name="object_ph_Standardlimb_001B64" Type="Standard" EnumName="OBJECT_PH_LIMB_08" Offset="0x1B64" />
-        <Limb Name="object_ph_Standardlimb_001B70" Type="Standard" EnumName="OBJECT_PH_LIMB_09" Offset="0x1B70" />
-        <Limb Name="object_ph_Standardlimb_001B7C" Type="Standard" EnumName="OBJECT_PH_LIMB_0A" Offset="0x1B7C" />
-        <Limb Name="object_ph_Standardlimb_001B88" Type="Standard" EnumName="OBJECT_PH_LIMB_0B" Offset="0x1B88" />
-        <Limb Name="object_ph_Standardlimb_001B94" Type="Standard" EnumName="OBJECT_PH_LIMB_0C" Offset="0x1B94" />
-        <Limb Name="object_ph_Standardlimb_001BA0" Type="Standard" EnumName="OBJECT_PH_LIMB_0D" Offset="0x1BA0" />
-        <Limb Name="object_ph_Standardlimb_001BAC" Type="Standard" EnumName="OBJECT_PH_LIMB_0E" Offset="0x1BAC" />
-        <Limb Name="object_ph_Standardlimb_001BB8" Type="Standard" EnumName="OBJECT_PH_LIMB_0F" Offset="0x1BB8" />
-        <Limb Name="object_ph_Standardlimb_001BC4" Type="Standard" EnumName="OBJECT_PH_LIMB_10" Offset="0x1BC4" />
-        <Limb Name="object_ph_Standardlimb_001BD0" Type="Standard" EnumName="OBJECT_PH_LIMB_11" Offset="0x1BD0" />
-        <Limb Name="object_ph_Standardlimb_001BDC" Type="Standard" EnumName="OBJECT_PH_LIMB_12" Offset="0x1BDC" />
-        <Limb Name="object_ph_Standardlimb_001BE8" Type="Standard" EnumName="OBJECT_PH_LIMB_13" Offset="0x1BE8" />
-        <Limb Name="object_ph_Standardlimb_001BF4" Type="Standard" EnumName="OBJECT_PH_LIMB_14" Offset="0x1BF4" />
-        <Limb Name="object_ph_Standardlimb_001C00" Type="Standard" EnumName="OBJECT_PH_LIMB_15" Offset="0x1C00" />
-        <Limb Name="object_ph_Standardlimb_001C0C" Type="Standard" EnumName="OBJECT_PH_LIMB_16" Offset="0x1C0C" />
-        <Limb Name="object_ph_Standardlimb_001C18" Type="Standard" EnumName="OBJECT_PH_LIMB_17" Offset="0x1C18" />
-        <Skeleton Name="object_ph_Skel_001C80" Type="Normal" LimbType="Standard" LimbNone="OBJECT_PH_LIMB_NONE" LimbMax="OBJECT_PH_LIMB_MAX" EnumName="ObjectPhLimb" Offset="0x1C80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po.xml
deleted file mode 100644
index a430d178b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Object for Poe -->
-    <File Name="object_po" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gPoeAttackAnim" Offset="0x1A8" />
-        <Animation Name="gPoeDamagedAnim" Offset="0x4EC" />
-        <Animation Name="gPoeFleeAnim" Offset="0x6E0" />
-        <Animation Name="gPoeFloatAnim" Offset="0xA60" />
-        <Animation Name="gPoeAppearAnim" Offset="0x11C4" />
-        <Animation Name="gPoeDisappearAnim" Offset="0x15B0" />
-
-        <!-- Poe Limb DisplayLists -->
-        <DList Name="gPoeRightUpperArmDL" Offset="0x1620" />
-        <DList Name="gPoeLeftForearmDL" Offset="0x1898" />
-        <DList Name="gPoeLeftUpperArmDL" Offset="0x1A78" />
-        <DList Name="gPoeRightForearmDL" Offset="0x1B70" />
-        <DList Name="gPoeRightHandDL" Offset="0x1C68" />
-        <DList Name="gPoeCloak1DL" Offset="0x1FB0" />
-        <DList Name="gPoeBurnDL" Offset="0x2608" />
-        <DList Name="gPoeFaceDL" Offset="0x2910" />
-        <DList Name="gPoeLanternDL" Offset="0x2D28" />
-        <DList Name="gPoeCloak2DL" Offset="0x2F58" />
-
-        <!-- Poe Soul -->
-        <Texture Name="gPoeSoulTex" OutName="poe_soul" Format="i8" Width="32" Height="64" Offset="0x3010" />
-        <DList Name="gPoeSoulDL" Offset="0x3850" />
-
-        <!-- Textures -->
-        <Texture Name="gPoeArmTex" OutName="poe_arm" Format="rgba16" Width="32" Height="16" Offset="0x3910" />
-        <Texture Name="gPoeCloak1Tex" OutName="poe_cloak1" Format="rgba16" Width="32" Height="32" Offset="0x3D10" />
-        <Texture Name="gPoeCloak2Tex" OutName="poe_cloak2" Format="rgba16" Width="16" Height="16" Offset="0x4510" />
-        <Texture Name="gPoeCloak3Tex" OutName="poe_cloak3" Format="rgba16" Width="8" Height="8" Offset="0x4710" />
-        <Texture Name="gPoeEyeTex" OutName="poe_eye" Format="rgba16" Width="16" Height="16" Offset="0x4790" />
-        <Texture Name="gPoeLanternTopTex" OutName="poe_lantern_top" Format="rgba16" Width="8" Height="8" Offset="0x4990" />
-        <Texture Name="gPoeLanternBottomTex" OutName="poe_lantern_bottom" Format="rgba16" Width="8" Height="16" Offset="0x4A10" />
-        <Texture Name="gPoeLanternMiddleTex" OutName="poe_lantern_middle" Format="rgba16" Width="16" Height="16" Offset="0x4B10" />
-        <Texture Name="gPoeBurnTex" OutName="poe_burn" Format="rgba16" Width="16" Height="16" Offset="0x4D10" />
-        <Texture Name="gPoeBurnEyeTex" OutName="poe_burn_eye" Format="rgba16" Width="8" Height="8" Offset="0x4F10" />
-
-        <!-- Limbs -->
-        <Limb Name="gPoeRootLimb" Type="Standard" EnumName="POE_LIMB_ROOT" Offset="0x4F90" />
-        <Limb Name="gPoeRootWrapperLimb" Type="Standard" EnumName="POE_LIMB_ROOT_WRAPPER" Offset="0x4F9C" />
-        <Limb Name="gPoeBottomCloakRootLimb" Type="Standard" EnumName="POE_LIMB_BOTTOM_CLOAK_ROOT" Offset="0x4FA8" />
-        <Limb Name="gPoeBottomCloakLimb" Type="Standard" EnumName="POE_LIMB_BOTTOM_CLOAK" Offset="0x4FB4" />
-        <Limb Name="gPoeTopCloakLimb" Type="Standard" EnumName="POE_LIMB_TOP_CLOAK" Offset="0x4FC0" />
-        <Limb Name="gPoeLeftArmRootLimb" Type="Standard" EnumName="POE_LIMB_LEFT_ARM_ROOT" Offset="0x4FCC" />
-        <Limb Name="gPoeLeftArmWrapperLimb" Type="Standard" EnumName="POE_LIMB_LEFT_ARM_WRAPPER" Offset="0x4FD8" />
-        <Limb Name="gPoeLeftForearmRootLimb" Type="Standard" EnumName="POE_LIMB_LEFT_FOREARM_ROOT" Offset="0x4FE4" />
-        <Limb Name="gPoeLeftForearmLimb" Type="Standard" EnumName="POE_LIMB_LEFT_FOREARM" Offset="0x4FF0" />
-        <Limb Name="gPoeLeftUpperArmLimb" Type="Standard" EnumName="POE_LIMB_LEFT_UPPER_ARM" Offset="0x4FFC" />
-        <Limb Name="gPoeFaceLimb" Type="Standard" EnumName="POE_LIMB_FACE" Offset="0x5008" />
-        <Limb Name="gPoeRightArmRootLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_ARM_ROOT" Offset="0x5014" />
-        <Limb Name="gPoeRightArmWrapperLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_ARM_WRAPPER" Offset="0x5020" />
-        <Limb Name="gPoeRightForearmRootLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_FOREARM_ROOT" Offset="0x502C" />
-        <Limb Name="gPoeRightArmHandRootLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_ARM_HAND_ROOT" Offset="0x5038" />
-        <Limb Name="gPoeRightArmHandLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_ARM_HAND" Offset="0x5044" />
-        <Limb Name="gPoeLanternRootLimb" Type="Standard" EnumName="POE_LIMB_LANTERN_ROOT" Offset="0x5050" />
-        <Limb Name="gPoeLanternLimb" Type="Standard" EnumName="POE_LIMB_LANTERN" Offset="0x505C" />
-        <Limb Name="gPoeRightForearmLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_FOREARM" Offset="0x5068" />
-        <Limb Name="gPoeRightUpperArmLimb" Type="Standard" EnumName="POE_LIMB_RIGHT_UPPER_ARM" Offset="0x5074" />
-
-        <!-- Skeleton -->
-        <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" LimbNone="POE_LIMB_NONE" LimbMax="POE_LIMB_MAX" EnumName="PoeLimb" Offset="0x50D0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po_composer.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po_composer.xml
deleted file mode 100644
index 1a083b1b4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po_composer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-
-    <!-- Assets for the composer brothers Flat and Sharp -->
-    <File Name="object_po_composer" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gPoeComposerAttackAnim" Offset="0x20C" />
-        <Animation Name="gPoeComposerRaiseArmsAnim" Offset="0x570" />
-        <Animation Name="gPoeComposerBeginPlayAnim" Offset="0xA58" />
-        <Animation Name="gPoeComposerPlayAnim" Offset="0x1420" />
-        <Animation Name="gPoeComposerFleeAnim" Offset="0x15B8" />
-        <Animation Name="gPoeComposerIdleAnim" Offset="0x188C" />
-        <Animation Name="gPoeComposerArmsRaisedAnim" Offset="0x1F44" />
-        <Animation Name="gPoeComposerLowerArmsAnim" Offset="0x23E8" />
-        <Animation Name="gPoeComposerLookDownAnim" Offset="0x2AE0" />
-        <Animation Name="gPoeComposerBeginRollAnim" Offset="0x3024" />
-        <Animation Name="gPoeComposerRollAnim" Offset="0x334C" />
-        <Animation Name="gPoeComposerAppearDisappearAnim" Offset="0x3954" />
-        <Animation Name="gPoeComposerStillAnim" Offset="0x3DB0" />
-
-        <!-- Texture -->
-        <Texture Name="gPoeComposerSoulTex" OutName="composer_soul" Format="i8" Width="32" Height="64" Offset="0x3DC0" />
-
-        <!-- Display Lists -->
-        <DList Name="object_po_composer_DL_004600" Offset="0x4600" />
-        <DList Name="gPoeComposerSharpHeadDL" Offset="0x6A70" />
-        <DList Name="object_po_composer_DL_006D80" Offset="0x6D80" />
-        <DList Name="gPoeComposerLanternBaseDL" Offset="0x6E08" />
-        <DList Name="gPoeComposerLanternTopDL" Offset="0x6EA8" />
-        <DList Name="gPoeComposerLanternGlassDL" Offset="0x6F38" />
-        <DList Name="gPoeComposerFlatHeadDL" Offset="0x6FD8" />
-        <DList Name="gPoeComposerBurnDL" Offset="0x7BC0" />
-
-        <!-- Textures -->
-        <Texture Name="object_po_composer_Tex_007E80" OutName="tex_007E80" Format="rgba16" Width="16" Height="16" Offset="0x7E80" />
-        <Texture Name="object_po_composer_Tex_008080" OutName="tex_008080" Format="rgba16" Width="16" Height="16" Offset="0x8080" />
-        <Texture Name="object_po_composer_Tex_008280" OutName="tex_008280" Format="rgba16" Width="16" Height="16" Offset="0x8280" />
-        <Texture Name="object_po_composer_Tex_008480" OutName="tex_008480" Format="rgba16" Width="16" Height="16" Offset="0x8480" />
-        <Texture Name="object_po_composer_Tex_008680" OutName="tex_008680" Format="rgba16" Width="16" Height="32" Offset="0x8680" />
-        <Texture Name="object_po_composer_Tex_008A80" OutName="tex_008A80" Format="rgba16" Width="16" Height="16" Offset="0x8A80" />
-        <Texture Name="object_po_composer_Tex_008C80" OutName="tex_008C80" Format="rgba16" Width="16" Height="16" Offset="0x8C80" />
-        <Texture Name="object_po_composer_Tex_008E80" OutName="tex_008E80" Format="rgba16" Width="16" Height="16" Offset="0x8E80" />
-        <Texture Name="object_po_composer_Tex_009080" OutName="tex_009080" Format="rgba16" Width="16" Height="16" Offset="0x9080" />
-        <Texture Name="object_po_composer_Tex_009280" OutName="tex_009280" Format="rgba16" Width="16" Height="16" Offset="0x9280" />
-        <Texture Name="object_po_composer_Tex_009480" OutName="tex_009480" Format="rgba16" Width="16" Height="16" Offset="0x9480" />
-        <Texture Name="object_po_composer_Tex_009680" OutName="tex_009680" Format="rgba16" Width="16" Height="16" Offset="0x9680" />
-
-        <!-- Limbs -->
-        <Limb Name="gPoeComposerUpperBodyLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_UPPER_BODY" Offset="0x9880" />
-        <Limb Name="gPoeComposerLeftShoulderLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LEFT_SHOULDER" Offset="0x988C" />
-        <Limb Name="gPoeComposerLeftArmLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LEFT_ARM" Offset="0x9898" />
-        <Limb Name="gPoeComposerLeftHandLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LEFT_HAND" Offset="0x98A4" />
-        <Limb Name="gPoeComposerConductorBatonLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_CONDUCTOR_BATON" Offset="0x98B0" />
-        <Limb Name="gPoeComposerRightShoulderLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_RIGHT_SHOULDER" Offset="0x98BC" />
-        <Limb Name="gPoeComposerRightArmLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_RIGHT_ARM" Offset="0x98C8" />
-        <Limb Name="gPoeComposerRightHandLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_RIGHT_HAND" Offset="0x98D4" />
-        <Limb Name="gPoeComposerLanternLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LANTERN" Offset="0x98E0" />
-        <Limb Name="gPoeComposerHeadLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_HEAD" Offset="0x98EC" />
-        <Limb Name="gPoeComposerLowerBodyLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LOWER_BODY" Offset="0x98F8" />
-
-        <!-- Skeleton -->
-        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" LimbNone="POE_COMPOSER_LIMB_NONE" LimbMax="POE_COMPOSER_LIMB_MAX" EnumName="PoeComposerLimb" Offset="0x9930" />
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po_fusen.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po_fusen.xml
deleted file mode 100644
index 23bfbe075..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po_fusen.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<Root>
-    <!-- Assets for Poe Balloon archery target in Romani Ranch. -->
-    <File Name="object_po_fusen" Segment="6">
-        <!-- Empty: PoFusen is animated directly from its code. -->
-        <Animation Name="gPoeBalloonEmptyAnim" Offset="0x40" />
-
-        <DList Name="gPoeBalloonChainAndLanternDL" Offset="0x8C0" />
-        <DList Name="gPoeBalloonLeftHandDL" Offset="0xAF8" />
-        <DList Name="gPoeBalloonLeftForearmDL" Offset="0xB90" />
-        <DList Name="gPoeBalloonLeftUpperArmDL" Offset="0xC48" />
-        <DList Name="gPoeBalloonRightHandDL" Offset="0xCD8" />
-        <DList Name="gPoeBalloonRightForearmDL" Offset="0xD70" />
-        <DList Name="gPoeBalloonRightUpperArmDL" Offset="0xE28" />
-        <DList Name="gPoeBalloonBodyDL" Offset="0xEB8" />
-
-        <Texture Name="gPoeBalloonTLUT" OutName="balloon_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10E0" />
-        <!-- The tattered cloth along the eyes are part of the face texture, but not below the chin. -->
-        <Texture Name="gPoeBalloonTatteredChinTex" OutName="tattered_chin" Format="rgba16" Width="16" Height="16" Offset="0x12E0" />
-        <Texture Name="gPoeBalloonLanternTopTex" OutName="lantern_top" Format="rgba16" Width="16" Height="16" Offset="0x14E0" />
-        <Texture Name="gPoeBalloonLanternStandTex" OutName="lantern_stand" Format="rgba16" Width="16" Height="16" Offset="0x16E0" />
-        <Texture Name="gPoeBalloonLanternGlassTex" OutName="lantern_glass" Format="ci8" Width="16" Height="16" Offset="0x18E0" />
-        <Texture Name="gPoeBalloonHandTex" OutName="the_hand" Format="i4" Width="16" Height="16" Offset="0x19E0" />
-        <Texture Name="gPoeBalloonOrangeSkinTex" OutName="orange_skin" Format="rgba16" Width="16" Height="16" Offset="0x1A60" />
-        <Texture Name="gPoeBalloonFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x1C60" />
-        <Texture Name="gPoeBalloonChainLinkTex" OutName="chain_link" Format="rgba16" Width="16" Height="32" Offset="0x2060" />
-
-        <Limb Name="gPoeBalloonRootLimb" Type="Standard" EnumName="POE_BALLOON_LIMB_ROOT" Offset="0x2460" />
-        <Limb Name="gPoeBalloonBodyLimb" Type="Standard" EnumName="POE_BALLOON_LIMB_BODY" Offset="0x246C" />
-        <Limb Name="gPoeBalloonRightUpperArmLimb" Type="Standard" EnumName="POE_BALLOON_RIGHT_UPPER_ARM" Offset="0x2478" />
-        <Limb Name="gPoeBalloonRightForearmLimb" Type="Standard" EnumName="POE_BALLOON_RIGHT_FOREARM" Offset="0x2484" />
-        <Limb Name="gPoeBalloonRightHandLimb" Type="Standard" EnumName="POE_BALLOON_RIGHT_HAND" Offset="0x2490" />
-        <Limb Name="gPoeBalloonLeftUpperArmLimb" Type="Standard" EnumName="POE_BALLOON_LEFT_UPPER_ARM" Offset="0x249C" />
-        <Limb Name="gPoeBalloonLeftForearmLimb" Type="Standard" EnumName="POE_BALLOON_LEFT_FOREARM" Offset="0x24A8" />
-        <Limb Name="gPoeBalloonLeftHandLimb" Type="Standard" EnumName="POE_BALLOON_LEFT_HAND" Offset="0x24B4" />
-        <Limb Name="gPoeBalloonChainAndLanternLimb" Type="Standard" EnumName="POE_BALLOON_LIMB_CHAIN_AND_LANTERN" Offset="0x24C0" />
-
-        <Skeleton Name="gPoeBalloonSkel" Type="Flex" LimbType="Standard" LimbNone="POE_BALLOON_LIMB_NONE" LimbMax="POE_BALLOON_LIMB_MAX" EnumName="PoeBalloonLimb" Offset="0x24F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po_sisters.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po_sisters.xml
deleted file mode 100644
index 6b0755905..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_po_sisters.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Po Sisters (Jo, Beth, Ami, and Meg) that you fight as a minigame in Ikana for a HP -->
-    <!-- Joelle is red, Beth is blue, Ami is green, and Meg is purple -->
-    <File Name="object_po_sisters" Segment="6">
-        <!-- PoSister Animations -->
-        <Animation Name="gPoeSistersAttackAnim" Offset="0x114" />
-        <Animation Name="gPoeSistersMegCryAnim" Offset="0x680" />
-        <Animation Name="gPoeSistersDamagedAnim" Offset="0x8C0" />
-        <Animation Name="gPoeSistersFleeAnim" Offset="0xA54" />
-        <Animation Name="gPoeSistersFloatAnim" Offset="0xD40" />
-        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C" />
-        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC" />
-
-        <!-- PoSister DisplayLists -->
-        <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0" />
-        <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0" />
-        <DList Name="gPoeSistersLowerBodyDL" Offset="0x24A8" />
-        <DList Name="gPoeSistersRightHandDL" Offset="0x2570" />
-        <DList Name="gPoeSistersArmShortDL" Offset="0x25E8" />
-        <DList Name="gPoeSistersArmMedDL" Offset="0x2680" />
-        <DList Name="gPoeSistersArmLongDL" Offset="0x2718" />
-        <DList Name="gPoeSistersTorchDL" Offset="0x27B0" />
-        <DList Name="gPoeSistersLeftHandDL" Offset="0x2870" />
-        <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8" />
-        <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88" />
-        <DList Name="gPoeSistersBethBodyDL" Offset="0x3628" />
-        <DList Name="gPoeSistersBethFaceDL" Offset="0x3880" />
-        <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8" />
-        <DList Name="gPoeSistersAmyFaceDL" Offset="0x4020" />
-        <DList Name="gPoeSistersBurnBodyDL" Offset="0x46E0" />
-
-        <!-- PoSister Textures -->
-        <Texture Name="gPoeSistersTorchTex" OutName="torch" Format="rgba16" Width="16" Height="16" Offset="0x48D8" />
-        <Texture Name="gPoeSistersTatteredRobeTex" OutName="tattered_robe" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" />
-        <Texture Name="gPoeSistersArmTex" OutName="arm" Format="rgba16" Width="32" Height="16" Offset="0x52D8" />
-        <Texture Name="gPoeSistersMegJoelleEyeTex" OutName="meg_joelle_eye" Format="rgba16" Width="16" Height="16" Offset="0x56D8" />
-        <Texture Name="gPoeSistersMainRobeGradientTex" OutName="robe_gradient" Format="rgba16" Width="4" Height="4" Offset="0x58D8" />
-        <Texture Name="gPoeSistersMegTiaraTex" OutName="meg_tiara" Format="rgba16" Width="16" Height="16" Offset="0x58F8" />
-        <Texture Name="gPoeSistersMegHairTex" OutName="meg_hair" Format="rgba16" Width="16" Height="16" Offset="0x5AF8" />
-        <Texture Name="gPoeSistersJoelleHairBandtex" OutName="joelle_hair_tie" Format="rgba16" Width="8" Height="8" Offset="0x5CF8" />
-        <Texture Name="gPoeSistersJoelleAmyHairTex" OutName="joelle_amy_hair" Format="rgba16" Width="16" Height="16" Offset="0x5D78" />
-        <Texture Name="gPoeSistersBethAmyEyesTex" OutName="beth_amy_eye" Format="rgba16" Width="16" Height="8" Offset="0x5F78" />
-        <Texture Name="gPoeSistersBethHatAndHairTex" OutName="beth_hat_and_hair" Format="rgba16" Width="16" Height="16" Offset="0x6078" />
-        <Texture Name="gPoeSistersBethHatEdgeTex" OutName="beth_hat_edge" Format="rgba16" Width="8" Height="8" Offset="0x6278" />
-        <Texture Name="gPoeSistersAmyHairTieTex" OutName="amy_hair_tie" Format="rgba16" Width="4" Height="4" Offset="0x62F8" />
-        <Texture Name="gPoeSistersCrispBodyTex" OutName="crisp_body" Format="rgba16" Width="16" Height="16" Offset="0x6318" />
-
-
-        <!-- PoSister Limbs -->
-        <Limb Name="gPoeSistersMainRootLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_ROOT" Offset="0x6518" />
-        <Limb Name="gPoeSistersLeftArmLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_LEFT_ARM" Offset="0x6524" />
-        <Limb Name="gPoeSistersLeftHandLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_LEFT_HAND" Offset="0x6530" />
-        <Limb Name="gPoeSistersRightUpperArmLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_RIGHT_UPPER_ARM" Offset="0x653C" />
-        <Limb Name="gPoeSistersRightForearmLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_RIGHT_FOREARM" Offset="0x6548" />
-        <Limb Name="gPoeSistersTorchRootLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_TORCH_ROOT" Offset="0x6554" />
-        <Limb Name="gPoeSistersRightHandLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_RIGHT_HAND" Offset="0x6560" />
-        <Limb Name="gPoeSistersTorchLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_TORCH" Offset="0x656C" />
-        <Limb Name="gPoeSistersMainBodyLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_MAIN_BODY" Offset="0x6578" />
-        <Limb Name="gPoeSistersFaceLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_FACE" Offset="0x6584" />
-        <Limb Name="gPoeSistersLowerBodyLimb" Type="Standard" EnumName="POE_SISTERS_LIMB_LOWER_BODY" Offset="0x6590" />
-
-        <!-- PoSister Skeleton -->
-        <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" LimbNone="POE_SISTERS_LIMB_NONE" LimbMax="POE_SISTERS_LIMB_MAX" EnumName="PoeSistersLimb" Offset="0x65C8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_posthouse_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_posthouse_obj.xml
deleted file mode 100644
index 8a324672b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_posthouse_obj.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_posthouse_obj" Segment="6">
-        <DList Name="object_posthouse_obj_DL_000A50" Offset="0xA50" />
-        <Texture Name="object_posthouse_obj_Tex_000DA8" OutName="tex_000DA8" Format="rgba16" Width="8" Height="8" Offset="0xDA8" />
-        <Texture Name="object_posthouse_obj_Tex_000E28" OutName="tex_000E28" Format="rgba16" Width="16" Height="16" Offset="0xE28" />
-        <Texture Name="object_posthouse_obj_Tex_001028" OutName="tex_001028" Format="rgba16" Width="32" Height="32" Offset="0x1028" />
-        <DList Name="object_posthouse_obj_DL_001870" Offset="0x1870" />
-        <Texture Name="object_posthouse_obj_Tex_001900" OutName="tex_001900" Format="rgba16" Width="64" Height="32" Offset="0x1900" />
-        <Collision Name="object_posthouse_obj_Colheader_002948" Offset="0x2948" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pp.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pp.xml
deleted file mode 100644
index dc51c202c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pp.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<Root>
-    <!-- Assets for Hiploops. Includes an entire unused duplicate of the Hiploop's skeletal model and textures. -->
-    <File Name="object_pp" Segment="6">
-        <!-- Hiploop Animations -->
-        <Animation Name="gHiploopAttackAnim" Offset="0xE14" /> <!-- Original name is "pp_attack" -->
-        <Animation Name="gHiploopChargeAnim" Offset="0x1354" /> <!-- Original name is "pp_attack_run" -->
-        <Animation Name="gHiploopDamageAnim" Offset="0x178C" /> <!-- Original name is "pp_damage" -->
-
-        <!-- Unused Hiploop Limb DisplayLists -->
-        <DList Name="gUnusedHiploopBodyDL" Offset="0x2FD0" />
-        <DList Name="gUnusedHiploopLeftEyeDL" Offset="0x32D8" />
-        <DList Name="gUnusedHiploopRightEyeDL" Offset="0x3368" />
-        <DList Name="gUnusedHiploopBackLeftUpperLegDL" Offset="0x33F8" />
-        <DList Name="gUnusedHiploopBackLeftLowerLegDL" Offset="0x3580" />
-        <DList Name="gUnusedHiploopBackLeftFootDL" Offset="0x3700" />
-        <DList Name="gUnusedHiploopCenterWingBaseDL" Offset="0x3880" />
-        <DList Name="gUnusedHiploopCenterWingMiddleDL" Offset="0x39C0" />
-        <DList Name="gUnusedHiploopCenterWingTipDL" Offset="0x3AB8" />
-        <DList Name="gUnusedHiploopRightWingBaseDL" Offset="0x3BA8" />
-        <DList Name="gUnusedHiploopRightWingMiddleDL" Offset="0x3D30" />
-        <DList Name="gUnusedHiploopRightWingTipDL" Offset="0x3E20" />
-        <DList Name="gUnusedHiploopMaskDL" Offset="0x3F10" />
-        <DList Name="gUnusedHiploopBackRightUpperLegDL" Offset="0x4028" />
-        <DList Name="gUnusedHiploopBackRightLowerLegDL" Offset="0x41B0" />
-        <DList Name="gUnusedHiploopBackRightFootDL" Offset="0x4330" />
-        <DList Name="gUnusedHiploopLeftWingBaseDL" Offset="0x44B0" />
-        <DList Name="gUnusedHiploopLeftWingMiddleDL" Offset="0x4638" />
-        <DList Name="gUnusedHiploopLeftWingTipDL" Offset="0x4728" />
-        <DList Name="gUnusedHiploopFrontRightUpperLegDL" Offset="0x4818" />
-        <DList Name="gUnusedHiploopFrontRightLowerLegDL" Offset="0x4998" />
-        <DList Name="gUnusedHiploopFrontRightFootDL" Offset="0x4B18" />
-        <DList Name="gUnusedHiploopFrontLeftUpperLegDL" Offset="0x4C98" />
-        <DList Name="gUnusedHiploopFrontLeftLowerLegDL" Offset="0x4E18" />
-        <DList Name="gUnusedHiploopFrontLeftFootDL" Offset="0x4F98" />
-
-        <!-- Unused Hiploop Textures -->
-        <Texture Name="gUnusedHiploopEyeTex" OutName="unused_hiploop_eye" Format="rgba16" Width="32" Height="32" Offset="0x5118" />
-        <Texture Name="gUnusedHiploopUndersideTex" OutName="unused_hiploop_underside" Format="rgba16" Width="64" Height="32" Offset="0x5918" />
-        <Texture Name="gUnusedHiploopFaceTex" OutName="unused_hiploop_face" Format="rgba16" Width="32" Height="32" Offset="0x6918" />
-        <Texture Name="gUnusedHiploopBackTex" OutName="unused_hiploop_back" Format="rgba16" Width="32" Height="32" Offset="0x7118" />
-        <Texture Name="gUnusedHiploopCenterWingTex" OutName="unused_hiploop_center_wing" Format="rgba16" Width="32" Height="32" Offset="0x7918" />
-        <Texture Name="gUnusedHiploopSideWingsTex" OutName="unused_hiploop_side_wings" Format="rgba16" Width="32" Height="32" Offset="0x8118" />
-        <Texture Name="gUnusedHiploopBackCenterTex" OutName="unused_hiploop_back_center" Format="rgba16" Width="32" Height="32" Offset="0x8918" />
-        <Texture Name="gUnusedHiploopLegTex" OutName="unused_hiploop_leg" Format="rgba16" Width="16" Height="16" Offset="0x9118" />
-        <Texture Name="gUnusedHiploopMaskTex" OutName="unused_hiploop_mask" Format="i4" Width="32" Height="32" Offset="0x9318" />
-
-        <!-- Unused Hiploop Limbs -->
-        <Limb Name="gUnusedHiploopBodyLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BODY" Offset="0x9518" />
-        <Limb Name="gUnusedHiploopFrontLeftUpperLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x9524" />
-        <Limb Name="gUnusedHiploopFrontLeftLowerLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x9530" />
-        <Limb Name="gUnusedHiploopFrontLeftFootLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_LEFT_FOOT" Offset="0x953C" />
-        <Limb Name="gUnusedHiploopFrontRightUpperLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x9548" />
-        <Limb Name="gUnusedHiploopFrontRightLowerLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x9554" />
-        <Limb Name="gUnusedHiploopFrontRightFootLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_FRONT_RIGHT_FOOT" Offset="0x9560" />
-        <Limb Name="gUnusedHiploopMaskLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_MASK" Offset="0x956C" />
-        <Limb Name="gUnusedHiploopLeftWingBaseLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_LEFT_WING_BASE" Offset="0x9578" />
-        <Limb Name="gUnusedHiploopLeftWingMiddleLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_LEFT_WING_MIDDLE" Offset="0x9584" />
-        <Limb Name="gUnusedHiploopLeftWingTipLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_LEFT_WING_TIP" Offset="0x9590" />
-        <Limb Name="gUnusedHiploopBackRightUpperLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_RIGHT_UPPER_LEG" Offset="0x959C" />
-        <Limb Name="gUnusedHiploopBackRightLowerLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_RIGHT_LOWER_LEG" Offset="0x95A8" />
-        <Limb Name="gUnusedHiploopBackRightFootLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_RIGHT_FOOT" Offset="0x95B4" />
-        <Limb Name="gUnusedHiploopRightWingBaseLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_RIGHT_WING_BASE" Offset="0x95C0" />
-        <Limb Name="gUnusedHiploopRightWingMiddleLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_RIGHT_WING_MIDDLE" Offset="0x95CC" />
-        <Limb Name="gUnusedHiploopRightWingTipLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_RIGHT_WING_TIP" Offset="0x95D8" />
-        <Limb Name="gUnusedHiploopCenterWingBaseLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_CENTER_WING_BASE" Offset="0x95E4" />
-        <Limb Name="gUnusedHiploopCenterWingMiddleLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_CENTER_WING_MIDDLE" Offset="0x95F0" />
-        <Limb Name="gUnusedHiploopCenterWingTipLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_CENTER_WING_TIP" Offset="0x95FC" />
-        <Limb Name="gUnusedHiploopBackLeftUpperLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_LEFT_UPPER_LEG" Offset="0x9608" />
-        <Limb Name="gUnusedHiploopBackLeftLowerLegLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_LEFT_LOWER_LEG" Offset="0x9614" />
-        <Limb Name="gUnusedHiploopBackLeftFootLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_BACK_LEFT_FOOT" Offset="0x9620" />
-        <Limb Name="gUnusedHiploopRightEyeLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_RIGHT_EYE" Offset="0x962C" />
-        <Limb Name="gUnusedHiploopLeftEyeLimb" Type="Standard" EnumName="UNUSED_HIPLOOP_LIMB_LEFT_EYE" Offset="0x9638" />
-
-        <!-- Unused Hiploop Skeleton -->
-        <Skeleton Name="gUnusedHiploopSkel" Type="Flex" LimbType="Standard" LimbNone="UNUSED_HIPLOOP_LIMB_NONE" LimbMax="UNUSED_HIPLOOP_LIMB_MAX" EnumName="UnusedHiploopLimb" Offset="0x96A8" />
-
-        <!-- Hiploop Animations -->
-        <Animation Name="gHiploopRoarAnim" Offset="0x9A74" /> <!-- Original name is "pp_mogaki" ("writhing") -->
-        <Animation Name="gHiploopWindUpAnim" Offset="0xA304" /> <!-- Original name is "pp_pre_attack" -->
-        <Animation Name="gHiploopIdleAnim" Offset="0xA844" /> <!-- Original name is "pp_wait" -->
-
-        <!-- Hiploop Limb DisplayLists -->
-        <DList Name="gHiploopBodyDL" Offset="0xC090" />
-        <DList Name="gHiploopLeftEyeDL" Offset="0xC398" />
-        <DList Name="gHiploopRightEyeDL" Offset="0xC428" />
-        <DList Name="gHiploopBackLeftUpperLegDL" Offset="0xC4B8" />
-        <DList Name="gHiploopBackLeftLowerLegDL" Offset="0xC640" />
-        <DList Name="gHiploopBackLeftFootDL" Offset="0xC7C0" />
-        <DList Name="gHiploopCenterWingBaseDL" Offset="0xC940" />
-        <DList Name="gHiploopCenterWingMiddleDL" Offset="0xCA80" />
-        <DList Name="gHiploopCenterWingTipDL" Offset="0xCB78" />
-        <DList Name="gHiploopRightWingBaseDL" Offset="0xCC68" />
-        <DList Name="gHiploopRightWingMiddleDL" Offset="0xCDF0" />
-        <DList Name="gHiploopRightWingTipDL" Offset="0xCEE0" />
-        <DList Name="gHiploopMaskDL" Offset="0xCFD0" />
-        <DList Name="gHiploopBackRightUpperLegDL" Offset="0xD0E8" />
-        <DList Name="gHiploopBackRightLowerLegDL" Offset="0xD270" />
-        <DList Name="gHiploopBackRightFootDL" Offset="0xD3F0" />
-        <DList Name="gHiploopLeftWingBaseDL" Offset="0xD570" />
-        <DList Name="gHiploopLeftWingMiddleDL" Offset="0xD6F8" />
-        <DList Name="gHiploopLeftWingTipDL" Offset="0xD7E8" />
-        <DList Name="gHiploopFrontRightUpperLegDL" Offset="0xD8D8" />
-        <DList Name="gHiploopFrontRightLowerLegDL" Offset="0xDA58" />
-        <DList Name="gHiploopFrontRightFootDL" Offset="0xDBD8" />
-        <DList Name="gHiploopFrontLeftUpperLegDL" Offset="0xDD58" />
-        <DList Name="gHiploopFrontLeftLowerLegDL" Offset="0xDED8" />
-        <DList Name="gHiploopFrontLeftFootDL" Offset="0xE058" />
-        
-        <!-- Hiploop Textures -->
-        <Texture Name="gHiploopEyeTex" OutName="hiploop_eye" Format="rgba16" Width="32" Height="32" Offset="0xE1D8" />
-        <Texture Name="gHiploopUndersideTex" OutName="hiploop_underside" Format="rgba16" Width="64" Height="32" Offset="0xE9D8" />
-        <Texture Name="gHiploopFaceTex" OutName="hiploop_face" Format="rgba16" Width="32" Height="32" Offset="0xF9D8" />
-        <Texture Name="gHiploopBackTex" OutName="hiploop_back" Format="rgba16" Width="32" Height="32" Offset="0x101D8" />
-        <Texture Name="gHiploopCenterWingTex" OutName="hiploop_center_wing" Format="rgba16" Width="32" Height="32" Offset="0x109D8" />
-        <Texture Name="gHiploopSideWingsTex" OutName="hiploop_side_wings" Format="rgba16" Width="32" Height="32" Offset="0x111D8" />
-        <Texture Name="gHiploopBackCenterTex" OutName="hiploop_back_center" Format="rgba16" Width="32" Height="32" Offset="0x119D8" />
-        <Texture Name="gHiploopLegTex" OutName="hiploop_leg" Format="rgba16" Width="16" Height="16" Offset="0x121D8" />
-        <Texture Name="gHiploopMaskTex" OutName="hiploop_mask" Format="i4" Width="32" Height="32" Offset="0x123D8" />
-
-        <!-- Hiploop Limbs -->
-        <Limb Name="gHiploopBodyLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BODY" Offset="0x125D8" />
-        <Limb Name="gHiploopFrontLeftUpperLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x125E4" />
-        <Limb Name="gHiploopFrontLeftLowerLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x125F0" />
-        <Limb Name="gHiploopFrontLeftFootLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_LEFT_FOOT" Offset="0x125FC" />
-        <Limb Name="gHiploopFrontRightUpperLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x12608" />
-        <Limb Name="gHiploopFrontRightLowerLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x12614" />
-        <Limb Name="gHiploopFrontRightFootLimb" Type="Standard" EnumName="HIPLOOP_LIMB_FRONT_RIGHT_FOOT" Offset="0x12620" />
-        <Limb Name="gHiploopMaskLimb" Type="Standard" EnumName="HIPLOOP_LIMB_MASK" Offset="0x1262C" />
-        <Limb Name="gHiploopLeftWingBaseLimb" Type="Standard" EnumName="HIPLOOP_LIMB_LEFT_WING_BASE" Offset="0x12638" />
-        <Limb Name="gHiploopLeftWingMiddleLimb" Type="Standard" EnumName="HIPLOOP_LIMB_LEFT_WING_MIDDLE" Offset="0x12644" />
-        <Limb Name="gHiploopLeftWingTipLimb" Type="Standard" EnumName="HIPLOOP_LIMB_LEFT_WING_TIP" Offset="0x12650" />
-        <Limb Name="gHiploopBackRightUpperLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_RIGHT_UPPER_LEG" Offset="0x1265C" />
-        <Limb Name="gHiploopBackRightLowerLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_RIGHT_LOWER_LEG" Offset="0x12668" />
-        <Limb Name="gHiploopBackRightFootLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_RIGHT_FOOT" Offset="0x12674" />
-        <Limb Name="gHiploopRightWingBaseLimb" Type="Standard" EnumName="HIPLOOP_LIMB_RIGHT_WING_BASE" Offset="0x12680" />
-        <Limb Name="gHiploopRightWingMiddleLimb" Type="Standard" EnumName="HIPLOOP_LIMB_RIGHT_WING_MIDDLE" Offset="0x1268C" />
-        <Limb Name="gHiploopRightWingTipLimb" Type="Standard" EnumName="HIPLOOP_LIMB_RIGHT_WING_TIP" Offset="0x12698" />
-        <Limb Name="gHiploopCenterWingBaseLimb" Type="Standard" EnumName="HIPLOOP_LIMB_CENTER_WING_BASE" Offset="0x126A4" />
-        <Limb Name="gHiploopCenterWingMiddleLimb" Type="Standard" EnumName="HIPLOOP_LIMB_CENTER_WING_MIDDLE" Offset="0x126B0" />
-        <Limb Name="gHiploopCenterWingTipLimb" Type="Standard" EnumName="HIPLOOP_LIMB_CENTER_WING_TIP" Offset="0x126BC" />
-        <Limb Name="gHiploopBackLeftUpperLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_LEFT_UPPER_LEG" Offset="0x126C8" />
-        <Limb Name="gHiploopBackLeftLowerLegLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_LEFT_LOWER_LEG" Offset="0x126D4" />
-        <Limb Name="gHiploopBackLeftFootLimb" Type="Standard" EnumName="HIPLOOP_LIMB_BACK_LEFT_FOOT" Offset="0x126E0" />
-        <Limb Name="gHiploopRightEyeLimb" Type="Standard" EnumName="HIPLOOP_LIMB_RIGHT_EYE" Offset="0x126EC" />
-        <Limb Name="gHiploopLeftEyeLimb" Type="Standard" EnumName="HIPLOOP_LIMB_LEFT_EYE" Offset="0x126F8" />
-
-        <!-- Hiploop Skeleton -->
-        <Skeleton Name="gHiploopSkel" Type="Flex" LimbType="Standard" LimbNone="HIPLOOP_LIMB_NONE" LimbMax="HIPLOOP_LIMB_MAX" EnumName="HiploopLimb" Offset="0x12768" />
-
-        <!-- Hiploop Animation -->
-        <Animation Name="gHiploopWalkAnim" Offset="0x12AE4" /> <!-- Original name is "pp_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pr.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pr.xml
deleted file mode 100644
index 52429cb18..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pr.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<Root>
-    <File Name="object_pr" Segment="6">
-        <Animation Name="object_pr_Anim_000268" Offset="0x268" />
-        <Animation Name="object_pr_Anim_000740" Offset="0x740" />
-        <DList Name="object_pr_DL_000F30" Offset="0xF30" />
-        <DList Name="object_pr_DL_001130" Offset="0x1130" />
-        <DList Name="object_pr_DL_0011C8" Offset="0x11C8" />
-        <DList Name="object_pr_DL_001260" Offset="0x1260" />
-        <DList Name="object_pr_DL_0012F8" Offset="0x12F8" />
-        <DList Name="object_pr_DL_0013E8" Offset="0x13E8" />
-        <DList Name="object_pr_DL_001480" Offset="0x1480" />
-        <DList Name="object_pr_DL_001550" Offset="0x1550" />
-        <Texture Name="object_pr_Tex_001608" OutName="tex_001608" Format="rgba16" Width="8" Height="16" Offset="0x1608" />
-        <Texture Name="object_pr_Tex_001708" OutName="tex_001708" Format="rgba16" Width="16" Height="16" Offset="0x1708" />
-        <Texture Name="object_pr_Tex_001908" OutName="tex_001908" Format="rgba16" Width="16" Height="16" Offset="0x1908" />
-        <Texture Name="object_pr_Tex_001B08" OutName="tex_001B08" Format="rgba16" Width="16" Height="16" Offset="0x1B08" />
-        <Texture Name="object_pr_Tex_001D08" OutName="tex_001D08" Format="rgba16" Width="8" Height="8" Offset="0x1D08" />
-        <TextureAnimation Name="object_pr_Matanimheader_001DB0" Offset="0x1DB0" />
-        <Animation Name="object_pr_Anim_001E10" Offset="0x1E10" />
-        <Animation Name="object_pr_Anim_0021E8" Offset="0x21E8" />
-        <DList Name="object_pr_DL_0029E0" Offset="0x29E0" />
-        <DList Name="object_pr_DL_002BD0" Offset="0x2BD0" />
-        <DList Name="object_pr_DL_002C68" Offset="0x2C68" />
-        <DList Name="object_pr_DL_002D00" Offset="0x2D00" />
-        <DList Name="object_pr_DL_002D98" Offset="0x2D98" />
-        <DList Name="object_pr_DL_002E88" Offset="0x2E88" />
-        <DList Name="object_pr_DL_002F20" Offset="0x2F20" />
-        <DList Name="object_pr_DL_002FF0" Offset="0x2FF0" />
-        <Texture Name="object_pr_Tex_0030A8" OutName="tex_0030A8" Format="rgba16" Width="8" Height="16" Offset="0x30A8" />
-        <Texture Name="object_pr_Tex_0031A8" OutName="tex_0031A8" Format="rgba16" Width="16" Height="16" Offset="0x31A8" />
-        <Texture Name="object_pr_Tex_0033A8" OutName="tex_0033A8" Format="rgba16" Width="16" Height="16" Offset="0x33A8" />
-        <Texture Name="object_pr_Tex_0035A8" OutName="tex_0035A8" Format="rgba16" Width="16" Height="16" Offset="0x35A8" />
-        <Texture Name="object_pr_Tex_0037A8" OutName="tex_0037A8" Format="rgba16" Width="8" Height="8" Offset="0x37A8" />
-        <Limb Name="object_pr_Standardlimb_003828" Type="Standard" EnumName="OBJECT_PR_1_LIMB_01" Offset="0x3828" />
-        <Limb Name="object_pr_Standardlimb_003834" Type="Standard" EnumName="OBJECT_PR_1_LIMB_02" Offset="0x3834" />
-        <Limb Name="object_pr_Standardlimb_003840" Type="Standard" EnumName="OBJECT_PR_1_LIMB_03" Offset="0x3840" />
-        <Limb Name="object_pr_Standardlimb_00384C" Type="Standard" EnumName="OBJECT_PR_1_LIMB_04" Offset="0x384C" />
-        <Limb Name="object_pr_Standardlimb_003858" Type="Standard" EnumName="OBJECT_PR_1_LIMB_05" Offset="0x3858" />
-        <Limb Name="object_pr_Standardlimb_003864" Type="Standard" EnumName="OBJECT_PR_1_LIMB_06" Offset="0x3864" />
-        <Limb Name="object_pr_Standardlimb_003870" Type="Standard" EnumName="OBJECT_PR_1_LIMB_07" Offset="0x3870" />
-        <Limb Name="object_pr_Standardlimb_00387C" Type="Standard" EnumName="OBJECT_PR_1_LIMB_08" Offset="0x387C" />
-        <Limb Name="object_pr_Standardlimb_003888" Type="Standard" EnumName="OBJECT_PR_1_LIMB_09" Offset="0x3888" />
-        <Skeleton Name="object_pr_Skel_0038B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PR_1_LIMB_NONE" LimbMax="OBJECT_PR_1_LIMB_MAX" EnumName="ObjectPr1Limb" Offset="0x38B8" />
-        <Animation Name="object_pr_Anim_003904" Offset="0x3904" />
-        <DList Name="object_pr_DL_003AB0" Offset="0x3AB0" />
-        <DList Name="object_pr_DL_003B50" Offset="0x3B50" />
-        <DList Name="object_pr_DL_003C08" Offset="0x3C08" />
-        <DList Name="object_pr_DL_003D10" Offset="0x3D10" />
-        <Texture Name="object_pr_Tex_003DA8" OutName="tex_003DA8" Format="rgba16" Width="8" Height="16" Offset="0x3DA8" />
-        <Texture Name="object_pr_Tex_003EA8" OutName="tex_003EA8" Format="rgba16" Width="8" Height="16" Offset="0x3EA8" />
-        <Texture Name="object_pr_Tex_003FA8" OutName="tex_003FA8" Format="rgba16" Width="8" Height="8" Offset="0x3FA8" />
-        <Texture Name="object_pr_Tex_004028" OutName="tex_004028" Format="rgba16" Width="8" Height="16" Offset="0x4028" />
-        <Texture Name="object_pr_Tex_004128" OutName="tex_004128" Format="rgba16" Width="4" Height="4" Offset="0x4128" />
-        <Limb Name="object_pr_Standardlimb_004148" Type="Standard" EnumName="OBJECT_PR_2_LIMB_01" Offset="0x4148" />
-        <Limb Name="object_pr_Standardlimb_004154" Type="Standard" EnumName="OBJECT_PR_2_LIMB_02" Offset="0x4154" />
-        <Limb Name="object_pr_Standardlimb_004160" Type="Standard" EnumName="OBJECT_PR_2_LIMB_03" Offset="0x4160" />
-        <Limb Name="object_pr_Standardlimb_00416C" Type="Standard" EnumName="OBJECT_PR_2_LIMB_04" Offset="0x416C" />
-        <Skeleton Name="object_pr_Skel_004188" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PR_2_LIMB_NONE" LimbMax="OBJECT_PR_2_LIMB_MAX" EnumName="ObjectPr2Limb" Offset="0x4188" />
-        <Animation Name="object_pr_Anim_004274" Offset="0x4274" />
-        <Animation Name="object_pr_Anim_004340" Offset="0x4340" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ps.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ps.xml
deleted file mode 100644
index 689d78fb5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ps.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-    <File Name="object_ps" Segment="6">
-        <Animation Name="object_ps_Anim_00049C" Offset="0x49C" />
-        <DList Name="object_ps_DL_001B30" Offset="0x1B30" />
-        <DList Name="object_ps_DL_001B38" Offset="0x1B38" />
-        <DList Name="object_ps_DL_001F38" Offset="0x1F38" />
-        <DList Name="object_ps_DL_002438" Offset="0x2438" />
-        <DList Name="object_ps_DL_002560" Offset="0x2560" />
-        <DList Name="object_ps_DL_002638" Offset="0x2638" />
-        <DList Name="object_ps_DL_002840" Offset="0x2840" />
-        <DList Name="object_ps_DL_002948" Offset="0x2948" />
-        <DList Name="object_ps_DL_002A60" Offset="0x2A60" />
-        <DList Name="object_ps_DL_002B68" Offset="0x2B68" />
-        <Texture Name="object_ps_TLUT_002C80" OutName="tlut_002C80" Format="rgba16" Width="16" Height="16" Offset="0x2C80" />
-        <!-- <Blob Name="object_ps_Blob_002E80" Size="0x1080" Offset="0x2E80" /> -->
-        <Texture Name="object_ps_Tex_003F00" OutName="tex_003F00" Format="rgba16" Width="16" Height="16" Offset="0x3F00" />
-        <!-- <Blob Name="object_ps_Blob_004100" Size="0x21C0" Offset="0x4100" /> -->
-        <Texture Name="object_ps_Tex_0062C0" OutName="tex_0062C0" Format="ci8" Width="8" Height="8" Offset="0x62C0" />
-        <Texture Name="object_ps_Tex_006300" OutName="tex_006300" Format="ci8" Width="32" Height="32" Offset="0x6300" />
-        <Texture Name="object_ps_Tex_006700" OutName="tex_006700" Format="ci8" Width="8" Height="8" Offset="0x6700" />
-        <Texture Name="object_ps_Tex_006740" OutName="tex_006740" Format="ci8" Width="8" Height="8" Offset="0x6740" />
-        <Texture Name="object_ps_Tex_006780" OutName="tex_006780" Format="ci8" Width="32" Height="32" Offset="0x6780" />
-        <Texture Name="object_ps_Tex_006B80" OutName="tex_006B80" Format="rgba16" Width="16" Height="16" Offset="0x6B80" />
-        <Texture Name="object_ps_Tex_006D80" OutName="tex_006D80" Format="ci8" Width="32" Height="32" Offset="0x6D80" />
-        <Limb Name="object_ps_Standardlimb_007180" Type="Standard" EnumName="OBJECT_PS_LIMB_01" Offset="0x7180" />
-        <Limb Name="object_ps_Standardlimb_00718C" Type="Standard" EnumName="OBJECT_PS_LIMB_02" Offset="0x718C" />
-        <Limb Name="object_ps_Standardlimb_007198" Type="Standard" EnumName="OBJECT_PS_LIMB_03" Offset="0x7198" />
-        <Limb Name="object_ps_Standardlimb_0071A4" Type="Standard" EnumName="OBJECT_PS_LIMB_04" Offset="0x71A4" />
-        <Limb Name="object_ps_Standardlimb_0071B0" Type="Standard" EnumName="OBJECT_PS_LIMB_05" Offset="0x71B0" />
-        <Limb Name="object_ps_Standardlimb_0071BC" Type="Standard" EnumName="OBJECT_PS_LIMB_06" Offset="0x71BC" />
-        <Limb Name="object_ps_Standardlimb_0071C8" Type="Standard" EnumName="OBJECT_PS_LIMB_07" Offset="0x71C8" />
-        <Limb Name="object_ps_Standardlimb_0071D4" Type="Standard" EnumName="OBJECT_PS_LIMB_08" Offset="0x71D4" />
-        <Limb Name="object_ps_Standardlimb_0071E0" Type="Standard" EnumName="OBJECT_PS_LIMB_09" Offset="0x71E0" />
-        <Limb Name="object_ps_Standardlimb_0071EC" Type="Standard" EnumName="OBJECT_PS_LIMB_0A" Offset="0x71EC" />
-        <Limb Name="object_ps_Standardlimb_0071F8" Type="Standard" EnumName="OBJECT_PS_LIMB_0B" Offset="0x71F8" />
-        <Skeleton Name="object_ps_Skel_007230" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PS_LIMB_NONE" LimbMax="OBJECT_PS_LIMB_MAX" EnumName="ObjectPsLimb" Offset="0x7230" />
-        <Collision Name="object_ps_Colheader_0072E0" Offset="0x72E0" />
-        <Animation Name="object_ps_Anim_0078FC" Offset="0x78FC" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pst.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pst.xml
deleted file mode 100644
index d2b5323d6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_pst.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <!-- This is the object for the Postbox Prop -->
-    <File Name="object_pst" Segment="6">
-        <Animation Name="gPostboxOpenSlotAnim" Offset="0x18" />
-        <DList Name="gPostboxFrameDL" Offset="0x4A0" />
-        <DList Name="gPostboxMailSlotDL" Offset="0x638" />
-        <Texture Name="gPostboxWoodRoofTex" OutName="postbox_wood_roof" Format="rgba16" Width="32" Height="32" Offset="0x760" />
-        <Texture Name="gPostboxWoodBodyTex" OutName="postbox_wood_body" Format="rgba16" Width="32" Height="32" Offset="0xF60" />
-        <Texture Name="gPostboxMetalTex" OutName="postbox_metal" Format="rgba16" Width="16" Height="16" Offset="0x1760" />
-        <Texture Name="gPostboxSlotHoleTex" OutName="postbox_slot_hole" Format="i4" Width="32" Height="16" Offset="0x1960" />
-        <Limb Name="gPostboxFrameLimb" Type="Standard" EnumName="POSTBOX_LIMB_FRAME" Offset="0x1A60" />
-        <Limb Name="gPostboxMailSlotLimb" Type="Standard" EnumName="POSTBOX_LIMB_MAIL_SLOT" Offset="0x1A6C" />
-        <Skeleton Name="gPostboxSkel" Type="Flex" LimbType="Standard" LimbNone="POSTBOX_LIMB_NONE" LimbMax="POSTBOX_LIMB_MAX" EnumName="PostboxLimb" Offset="0x1A80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_racetsubo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_racetsubo.xml
deleted file mode 100644
index 08a17d00a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_racetsubo.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Object for green magic pot -->
-    <File Name="object_racetsubo" Segment="6">
-        <DList Name="gMagicPotEmpty1DL" Offset="0x270" />
-        <DList Name="gMagicPotDL" Offset="0x278" />
-        <Texture Name="gMagicPotWallTex" OutName="magic_pot_wall" Format="rgba16" Width="32" Height="64" Offset="0x3E0" />
-        <Texture Name="gMagicPotRimTex" OutName="magic_pot_rim" Format="rgba16" Width="16" Height="16" Offset="0x13E0" />
-        <DList Name="gMagicPotShardDL" Offset="0x1610" />
-        <DList Name="gMagicPotEmpty2DL" Offset="0x1698" />
-        <Texture Name="gMagicPotShardTex" OutName="magic_pot_shard" Format="rgba16" Width="16" Height="16" Offset="0x16A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_raf.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_raf.xml
deleted file mode 100644
index 2322740d5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_raf.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<Root>
-    <!-- Assets for the Carnivorous Lily Pad-->
-    <File Name="object_raf" Segment="6">
-        <!-- Carnivorous Lily Pad Collision -->
-        <Collision Name="gCarnivorousLilyPadCol" Offset="0x108" />
-
-        <!-- Unused Textureless Platform DisplayList. Maybe used for testing collision? -->
-        <DList Name="gCarnivorousLilyPadTexturelessPlatformDL" Offset="0x1C0" />
-
-        <!-- Carnivorous Lily Pad Animations -->
-        <Animation Name="gCarnivorousLilyPadConvulseAnim" Offset="0x3FC" /> <!-- Original name is "raf_end01" -->
-        <Animation Name="gCarnivorousLilyPadDeathAnim" Offset="0x7A8" /> <!-- Original name is "raf_end02" -->
-        <Animation Name="gCarnivorousLilyPadSpitAnim" Offset="0xA64" /> <!-- Original name is "raf_haku" ("to spit up") -->
-        <Animation Name="gCarnivorousLilyPadChewAnim" Offset="0xB30" /> <!-- Original name is "raf_mogu" ("chew") -->
-        <Animation Name="gCarnivorousLilyPadCloseAnim" Offset="0xC7C" /> <!-- Original name is "raf_paku" ("devouring")-->
-
-        <!-- Carnivorous Lily Pad Limb DisplayLists -->
-        <DList Name="gCarnivorousLilyPadFlowerDL" Offset="0x1630" />
-        <DList Name="gCarnivorousLilyPadRootsDL" Offset="0x1790" />
-        <DList Name="gCarnivorousLilyPadTrap3LowerSegmentDL" Offset="0x1838" />
-        <DList Name="gCarnivorousLilyPadTrap3MiddleSegmentDL" Offset="0x18D0" />
-        <DList Name="gCarnivorousLilyPadTrap3UpperSegmentDL" Offset="0x1990" />
-        <DList Name="gCarnivorousLilyPadTrap2LowerSegmentDL" Offset="0x1B90" />
-        <DList Name="gCarnivorousLilyPadTrap2MiddleSegmentDL" Offset="0x1C28" />
-        <DList Name="gCarnivorousLilyPadTrap2UpperSegmentDL" Offset="0x1CE8" />
-        <DList Name="gCarnivorousLilyPadTrap1LowerSegmentDL" Offset="0x1EE8" />
-        <DList Name="gCarnivorousLilyPadTrap1MiddleSegmentDL" Offset="0x1F80" />
-        <DList Name="gCarnivorousLilyPadTrap1UpperSegmentDL" Offset="0x2040" />
-
-        <!-- Carnivorous Lily Pad Particle DisplayLists -->
-        <DList Name="gCarnivorousLilyPadParticlePetalDL" Offset="0x2340" />
-        <DList Name="gCarnivorousLilyPadParticleTeethDL" Offset="0x2418" />
-        <DList Name="gCarnivorousLilyPadParticleDL" Offset="0x24E0" />
-
-        <!-- Carnivorous Lily Pad Textures -->
-        <Texture Name="gCarnivorousLilyPadRootsTex" OutName="carnivorous_lily_pad_roots" Format="rgba16" Width="16" Height="32" Offset="0x24F8" />
-        <Texture Name="gCarnivorousLilyPadFlowerPetalTex" OutName="carnivorous_lily_pad_flower_petal" Format="rgba16" Width="16" Height="32" Offset="0x28F8" />
-        <Texture Name="gCarnivorousLilyPadFlowerCenterTex" OutName="carnivorous_lily_pad_flower_center" Format="rgba16" Width="16" Height="16" Offset="0x2CF8" />
-        <Texture Name="gCarnivorousLilyPadTrapPetalTex" OutName="carnivorous_lily_pad_trap_petal" Format="rgba16" Width="16" Height="32" Offset="0x2EF8" />
-        <Texture Name="gCarnivorousLilyPadTrapTeethTex" OutName="carnivorous_lily_pad_trap_teeth" Format="rgba16" Width="8" Height="8" Offset="0x32F8" />
-
-        <!-- Carnivorous Lily Pad Limbs -->
-        <Limb Name="gCarnivorousLilyPadFlowerLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_FLOWER" Offset="0x3378" />
-        <Limb Name="gCarnivorousLilyPadTrap1LowerSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_LOWER_SEGMENT" Offset="0x3384" />
-        <Limb Name="gCarnivorousLilyPadTrap1MiddleSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_MIDDLE_SEGMENT" Offset="0x3390" />
-        <Limb Name="gCarnivorousLilyPadTrap1UpperSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_UPPER_SEGMENT" Offset="0x339C" />
-        <Limb Name="gCarnivorousLilyPadTrap2LowerSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_LOWER_SEGMENT" Offset="0x33A8" />
-        <Limb Name="gCarnivorousLilyPadTrap2MiddleSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_MIDDLE_SEGMENT" Offset="0x33B4" />
-        <Limb Name="gCarnivorousLilyPadTrap2UpperSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_UPPER_SEGMENT" Offset="0x33C0" />
-        <Limb Name="gCarnivorousLilyPadTrap3LowerSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_LOWER_SEGMENT" Offset="0x33CC" />
-        <Limb Name="gCarnivorousLilyPadTrap3MiddleSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_MIDDLE_SEGMENT" Offset="0x33D8" />
-        <Limb Name="gCarnivorousLilyPadTrap3UpperSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT" Offset="0x33E4" />
-        <Limb Name="gCarnivorousLilyPadRootsLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_ROOTS" Offset="0x33F0" />
-
-        <!-- Carnivorous Lily Pad Skeleton -->
-        <Skeleton Name="gCarnivorousLilyPadSkel" Type="Flex" LimbType="Standard" LimbNone="CARNIVOROUS_LILY_PAD_LIMB_NONE" LimbMax="CARNIVOROUS_LILY_PAD_LIMB_MAX" EnumName="CarnivorousLilyPadLimb" Offset="0x3428" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_raillift.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_raillift.xml
deleted file mode 100644
index 241a7346b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_raillift.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Root>
-    <File Name="object_raillift" Segment="6">
-        <DList Name="object_raillift_DL_000200" Offset="0x200" />
-        <DList Name="object_raillift_DL_000208" Offset="0x208" />
-        <Texture Name="object_raillift_Tex_000370" OutName="tex_000370" Format="rgba16" Width="32" Height="32" Offset="0x370" />
-        <Texture Name="object_raillift_Tex_000B70" OutName="tex_000B70" Format="rgba16" Width="32" Height="32" Offset="0xB70" />
-        <Texture Name="object_raillift_Tex_001370" OutName="tex_001370" Format="rgba16" Width="32" Height="32" Offset="0x1370" />
-        <DList Name="object_raillift_DL_001DB0" Offset="0x1DB0" />
-        <DList Name="object_raillift_DL_001E40" Offset="0x1E40" />
-        <Texture Name="object_raillift_Tex_001FC8" OutName="tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" />
-        <Texture Name="object_raillift_Tex_0027C8" OutName="tex_0027C8" Format="rgba16" Width="32" Height="32" Offset="0x27C8" />
-        <Texture Name="object_raillift_Tex_002FC8" OutName="tex_002FC8" Format="rgba16" Width="32" Height="32" Offset="0x2FC8" />
-        <Texture Name="object_raillift_Tex_0037C8" OutName="tex_0037C8" Format="ia16" Width="32" Height="64" Offset="0x37C8" />
-        <Collision Name="object_raillift_Colheader_0048D0" Offset="0x48D0" />
-        <DList Name="object_raillift_DL_004BF0" Offset="0x4BF0" />
-        <Collision Name="object_raillift_Colheader_004FF8" Offset="0x4FF8" />
-        <Texture Name="object_raillift_Tex_005030" OutName="tex_005030" Format="rgba16" Width="32" Height="32" Offset="0x5030" />
-        <Texture Name="object_raillift_Tex_005830" OutName="tex_005830" Format="rgba16" Width="32" Height="32" Offset="0x5830" />
-        <Texture Name="object_raillift_Tex_006030" OutName="tex_006030" Format="rgba16" Width="32" Height="32" Offset="0x6030" />
-        <Texture Name="object_raillift_Tex_006830" OutName="tex_006830" Format="i4" Width="64" Height="64" Offset="0x6830" />
-        <DList Name="object_raillift_DL_0071B0" Offset="0x71B0" />
-        <DList Name="object_raillift_DL_0071B8" Offset="0x71B8" />
-        <Texture Name="object_raillift_Tex_0072B0" OutName="tex_0072B0" Format="rgba16" Width="32" Height="32" Offset="0x72B0" />
-        <Texture Name="object_raillift_Tex_007AB0" OutName="tex_007AB0" Format="rgba16" Width="32" Height="16" Offset="0x7AB0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_random_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_random_obj.xml
deleted file mode 100644
index 509ed86c7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_random_obj.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Object for Secret Shrine Sliding Door -->
-    <File Name="object_random_obj" Segment="6">
-        <DList Name="gSecretShrineSlidingDoorDL" Offset="0x190" />
-        <Texture Name="gSecretShrineSlidingDoorTex" OutName="secret_shrine_sliding_door" Format="rgba16" Width="32" Height="64" Offset="0x2F0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rat.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rat.xml
deleted file mode 100644
index af47a3437..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rat.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<Root>
-    <!-- Assets for Real Bombchus -->
-    <File Name="object_rat" Segment="6">
-        <!-- Real Bombchu Animations -->
-        <Animation Name="gRealBombchuSpotAnim" Offset="0x174" /> <!-- Original name is "rat_hakken" ("detection") -->
-        <Animation Name="gRealBombchuRunAnim" Offset="0x26C" /> <!-- Original name is "rat_run" -->
-
-        <!-- Real Bombchu Limb DisplayLists -->
-        <DList Name="gRealBombchuBodyDL" Offset="0xA50" />
-        <DList Name="gRealBombchuBackRightLegDL" Offset="0xB18" />
-        <DList Name="gRealBombchuFrontRightLegDL" Offset="0xBC8" />
-        <DList Name="gRealBombchuBackLeftLegDL" Offset="0xC78" />
-        <DList Name="gRealBombchuFrontLeftLegDL" Offset="0xD28" />
-        <DList Name="gRealBombchuTailBaseDL" Offset="0xDD8" />
-        <DList Name="gRealBombchuTailMiddleDL" Offset="0xE20" />
-        <DList Name="gRealBombchuTailEndDL" Offset="0xE90" />
-        <DList Name="gRealBombchuHeadDL" Offset="0xED8" />
-
-        <!-- Real Bombchu Textures -->
-        <Texture Name="gRealBombchuSkinTex" OutName="real_bombchu_skin" Format="rgba16" Width="16" Height="16" Offset="0x11C8" />
-        <Texture Name="gRealBombchuMouthTex" OutName="real_bombchu_mouth" Format="rgba16" Width="16" Height="16" Offset="0x13C8" />
-        <Texture Name="gRealBombchuEyeTex" OutName="real_bombchu_eye" Format="rgba16" Width="16" Height="16" Offset="0x15C8" />
-
-        <!-- Real Bombchu Limbs -->
-        <Limb Name="gRealBombchuBodyLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_BODY" Offset="0x17C8" />
-        <Limb Name="gRealBombchuHeadLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_HEAD" Offset="0x17D4" />
-        <Limb Name="gRealBombchuTailBaseLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_TAIL_BASE" Offset="0x17E0" />
-        <Limb Name="gRealBombchuTailMiddleLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_TAIL_MIDDLE" Offset="0x17EC" />
-        <Limb Name="gRealBombchuTailEndLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_TAIL_END" Offset="0x17F8" />
-        <Limb Name="gRealBombchuFrontLeftLegLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_FRONT_LEFT_LEG" Offset="0x1804" />
-        <Limb Name="gRealBombchuBackLeftLegLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_BACK_LEFT_LEG" Offset="0x1810" />
-        <Limb Name="gRealBombchuFrontRightLegLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_FRONT_RIGHT_LEG" Offset="0x181C" />
-        <Limb Name="gRealBombchuBackRightLegLimb" Type="Standard" EnumName="REAL_BOMBCHU_LIMB_BACK_RIGHT_LEG" Offset="0x1828" />
-
-        <!-- Real Bombchu Skeleton -->
-        <Skeleton Name="gRealBombchuSkel" Type="Flex" LimbType="Standard" LimbNone="REAL_BOMBCHU_LIMB_NONE" LimbMax="REAL_BOMBCHU_LIMB_MAX" EnumName="RealBombchuLimb" Offset="0x1858" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rb.xml
deleted file mode 100644
index cd0e9c274..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rb.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <!-- Object for Leevers -->
-    <File Name="object_rb" Segment="6">
-        <Animation Name="gLeeverSpinAnim" Offset="0x1E4" />
-
-        <!-- DLs for visible limbs -->
-        <DList Name="gLeeverBottomHalfDL" Offset="0x200" />
-        <DList Name="gLeeverBottomHalfWrapper2DL" Offset="0x2D0" />
-        <DList Name="gLeeverBottomHalfWrapper1DL" Offset="0x2E0" />
-        <DList Name="gLeeverTopHalfDL" Offset="0x430" />
-        <DList Name="gLeeverTopHalfWrapper2DL" Offset="0x570" />
-        <DList Name="gLeeverTopHalfWrapper1DL" Offset="0x580" />
-        <DList Name="gLeeverSpike1DL" Offset="0x760" />
-        <DList Name="gLeeverSpike1Wrapper2DL" Offset="0x7F8" />
-        <DList Name="gLeeverSpike1Wrapper1DL" Offset="0x808" />
-        <DList Name="gLeeverSpike2DL" Offset="0x8B8" />
-        <DList Name="gLeeverSpike2Wrapper2DL" Offset="0x950" />
-        <DList Name="gLeeverSpike2Wrapper1DL" Offset="0x960" />
-        <DList Name="gLeeverSpike3DL" Offset="0xA10" />
-        <DList Name="gLeeverSpike3Wrapper2DL" Offset="0xAB0" />
-        <DList Name="gLeeverSpike3Wrapper1DL" Offset="0xAC0" />
-        <DList Name="gLeeverSpike4DL" Offset="0xB80" />
-        <DList Name="gLeeverSpike4Wrapper2DL" Offset="0xC18" />
-        <DList Name="gLeeverSpike4Wrapper1DL" Offset="0xC28" />
-
-        <Texture Name="gLeeverSpikeTex" OutName="spike" Format="rgba16" Width="8" Height="16" Offset="0xCD8" />
-        <Texture Name="gLeeverSideTex" OutName="side" Format="rgba16" Width="32" Height="32" Offset="0xDD8" />
-        <Texture Name="gLeeverFlowerTex" OutName="flower" Format="rgba16" Width="32" Height="32" Offset="0x15D8" />
-
-        <!-- Visible limbs -->
-        <Limb Name="gLeeverTopHalfLimb" Type="Standard" EnumName="LEEVER_LIMB_TOP_HALF" Offset="0x1DFC" />
-        <Limb Name="gLeeverSpike1Limb" Type="Standard" EnumName="LEEVER_LIMB_SPIKE_1" Offset="0x1E20" />
-        <Limb Name="gLeeverSpike2Limb" Type="Standard" EnumName="LEEVER_LIMB_SPIKE_2" Offset="0x1E44" />
-        <Limb Name="gLeeverSpike3Limb" Type="Standard" EnumName="LEEVER_LIMB_SPIKE_3" Offset="0x1E68" />
-        <Limb Name="gLeeverSpike4Limb" Type="Standard" EnumName="LEEVER_LIMB_SPIKE_4" Offset="0x1E8C" />
-        <Limb Name="gLeeverBottomHalfLimb" Type="Standard" EnumName="LEEVER_LIMB_BOTTOM_HALF" Offset="0x1E98" />
-
-        <!-- Invisible limbs -->
-        <Limb Name="object_rb_Standardlimb_001DD8" Type="Standard" EnumName="OBJECT_RB_LIMB_01" Offset="0x1DD8" />
-        <Limb Name="object_rb_Standardlimb_001DE4" Type="Standard" EnumName="OBJECT_RB_LIMB_02" Offset="0x1DE4" />
-        <Limb Name="object_rb_Standardlimb_001DF0" Type="Standard" EnumName="OBJECT_RB_LIMB_03" Offset="0x1DF0" />
-        <Limb Name="object_rb_Standardlimb_001E08" Type="Standard" EnumName="OBJECT_RB_LIMB_05" Offset="0x1E08" />
-        <Limb Name="object_rb_Standardlimb_001E14" Type="Standard" EnumName="OBJECT_RB_LIMB_06" Offset="0x1E14" />
-        <Limb Name="object_rb_Standardlimb_001E2C" Type="Standard" EnumName="OBJECT_RB_LIMB_08" Offset="0x1E2C" />
-        <Limb Name="object_rb_Standardlimb_001E38" Type="Standard" EnumName="OBJECT_RB_LIMB_09" Offset="0x1E38" />
-        <Limb Name="object_rb_Standardlimb_001E50" Type="Standard" EnumName="OBJECT_RB_LIMB_0B" Offset="0x1E50" />
-        <Limb Name="object_rb_Standardlimb_001E5C" Type="Standard" EnumName="OBJECT_RB_LIMB_0C" Offset="0x1E5C" />
-        <Limb Name="object_rb_Standardlimb_001E74" Type="Standard" EnumName="OBJECT_RB_LIMB_0E" Offset="0x1E74" />
-        <Limb Name="object_rb_Standardlimb_001E80" Type="Standard" EnumName="OBJECT_RB_LIMB_0F" Offset="0x1E80" />
-
-        <Skeleton Name="gLeeverSkel" Type="Normal" LimbType="Standard" LimbNone="LEEVER_LIMB_NONE" LimbMax="LEEVER_LIMB_MAX" EnumName="LeeverLimb" Offset="0x1EE8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rd.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rd.xml
deleted file mode 100644
index cb16e492f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rd.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<Root>
-    <File Name="object_rd" Segment="6">
-        <Animation Name="gGibdoRedeadArmsUpStartAnim" Offset="0x9C4" /> <!-- Original name is "gibud_banzai" ("cheering"?)-->
-        <Animation Name="gGibdoRedeadArmsUpLoopAnim" Offset="0xF1C" /> <!-- Original name is "gibud_banzai_loop" -->
-        <Animation Name="gGibdoRedeadConvulsionAnim" Offset="0x1600" /> <!-- Original name is "gibud_keiren" ("convulsion") -->
-        <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x1610" />
-        <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x2610" />
-        <DList Name="gGibdoPelvisDL" Offset="0x4270" />
-        <DList Name="gGibdoHeadDL" Offset="0x4350" />
-        <DList Name="gGibdoTorsoDL" Offset="0x44C0" />
-        <DList Name="gGibdoRightShoulderAndUpperArmDL" Offset="0x4628" />
-        <DList Name="gGibdoRightForearmDL" Offset="0x4730" />
-        <DList Name="gGibdoRightHandDL" Offset="0x4830" />
-        <DList Name="gGibdoLeftShoulderAndUpperArmDL" Offset="0x4930" />
-        <DList Name="gGibdoLeftForearmDL" Offset="0x4A38" />
-        <DList Name="gGibdoLeftHandDL" Offset="0x4B38" />
-        <DList Name="gGibdoRightThighDL" Offset="0x4C38" />
-        <DList Name="gGibdoRightShinDL" Offset="0x4D48" />
-        <DList Name="gGibdoRightFootDL" Offset="0x4E40" />
-        <DList Name="gGibdoLeftThighDL" Offset="0x4F58" />
-        <DList Name="gGibdoLeftShinDL" Offset="0x5068" />
-        <DList Name="gGibdoLeftFootDL" Offset="0x5160" />
-        <Limb Name="gGibdoRootLimb" Type="Standard" EnumName="GIBDO_LIMB_ROOT" Offset="0x5258" />
-        <Limb Name="gGibdoLeftLegRootLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_LEG_ROOT" Offset="0x5264" />
-        <Limb Name="gGibdoLeftThighLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_THIGH" Offset="0x5270" />
-        <Limb Name="gGibdoLeftShinLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_SHIN" Offset="0x527C" />
-        <Limb Name="gGibdoLeftAnkleLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_ANKLE" Offset="0x5288" />
-        <Limb Name="gGibdoLeftFootLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_FOOT" Offset="0x5294" />
-        <Limb Name="gGibdoRightLegRootLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_LEG_ROOT" Offset="0x52A0" />
-        <Limb Name="gGibdoRightThighLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_THIGH" Offset="0x52AC" />
-        <Limb Name="gGibdoRightShinLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_SHIN" Offset="0x52B8" />
-        <Limb Name="gGibdoRightAnkleLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_ANKLE" Offset="0x52C4" />
-        <Limb Name="gGibdoRightFootLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_FOOT" Offset="0x52D0" />
-        <Limb Name="gGibdoUpperBodyRootLimb" Type="Standard" EnumName="GIBDO_LIMB_UPPER_BODY_ROOT" Offset="0x52DC" />
-        <Limb Name="gGibdoUpperBodyLimb" Type="Standard" EnumName="GIBDO_LIMB_UPPER_BODY" Offset="0x52E8" />
-        <Limb Name="gGibdoTorsoLimb" Type="Standard" EnumName="GIBDO_LIMB_TORSO" Offset="0x52F4" />
-        <Limb Name="gGibdoLeftArmRootLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_ARM_ROOT" Offset="0x5300" />
-        <Limb Name="gGibdoLeftShoulderAndUpperArmLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_SHOULDER_AND_UPPER_ARM" Offset="0x530C" />
-        <Limb Name="gGibdoLeftForearmLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_FOREARM" Offset="0x5318" />
-        <Limb Name="gGibdoLeftHandLimb" Type="Standard" EnumName="GIBDO_LIMB_LEFT_HAND" Offset="0x5324" />
-        <Limb Name="gGibdoRightArmRootLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_ARM_ROOT" Offset="0x5330" />
-        <Limb Name="gGibdoRightShoulderAndUpperArmLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_SHOULDER_AND_UPPER_ARM" Offset="0x533C" />
-        <Limb Name="gGibdoRightForearmLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_FOREARM" Offset="0x5348" />
-        <Limb Name="gGibdoRightHandLimb" Type="Standard" EnumName="GIBDO_LIMB_RIGHT_HAND" Offset="0x5354" />
-        <Limb Name="gGibdoHeadRootLimb" Type="Standard" EnumName="GIBDO_LIMB_HEAD_ROOT" Offset="0x5360" />
-        <Limb Name="gGibdoHeadLimb" Type="Standard" EnumName="GIBDO_LIMB_HEAD" Offset="0x536C" />
-        <Limb Name="gGibdoPelvisLimb" Type="Standard" EnumName="GIBDO_LIMB_PELVIS" Offset="0x5378" />
-        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" LimbNone="GIBDO_LIMB_NONE" LimbMax="GIBDO_LIMB_MAX" EnumName="GibdoLimb" Offset="0x53E8" />
-        <Animation Name="gGibdoRedeadSlumpStartAnim" Offset="0x5DF4" /> <!-- Original name is "gibud_stop" -->
-        <Animation Name="gGibdoRedeadSlumpLoopAnim" Offset="0x61E4" /> <!-- Original name is "gibud_stop_loop" -->
-        <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x6678" /> <!-- Original name is "re_dead_attack" -->
-        <Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x6B08" /> <!-- Original name is "re_dead_attack_end" -->
-        <Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x6EEC" /> <!-- Original name is "re_dead_attack_start" -->
-        <Animation Name="gGibdoRedeadLookBackAnim" Offset="0x73A4" /> <!-- Original name is "re_dead_back_turn" -->
-        <Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x7BBC" /> <!-- Original name is "re_dead_cry" -->
-        <Animation Name="gGibdoRedeadSobbingAnim" Offset="0x81A8" /> <!-- Original name is "re_dead_cryB" -->
-        <Animation Name="gGibdoRedeadDeathAnim" Offset="0x9298" /> <!-- Original name is "re_dead_down" -->
-        <Animation Name="gGibdoRedeadDamageAnim" Offset="0x9900" /> <!-- Original name is "re_dead_hit" -->
-        <Animation Name="gGibdoRedeadStandUpAnim" Offset="0xA450" /> <!-- Original name is "re_dead_standing" -->
-        <Animation Name="gGibdoRedeadIdleAnim" Offset="0xABE0" /> <!-- Original name is "re_dead_wait" -->
-        <Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0xABF0" />
-        <Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0xBBF0" />
-        <Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xCBF0" />
-        <Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xCFF0" />
-        <Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xD3F0" />
-        <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xD7F0" />
-        <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xE7F0" />
-        <DList Name="gRedeadPelvisDL" Offset="0xFAB0" />
-        <DList Name="gRedeadTorsoDL" Offset="0xFBD8" />
-        <DList Name="gRedeadLeftShoulderAndUpperArmDL" Offset="0xFED0" />
-        <DList Name="gRedeadLeftForearmDL" Offset="0xFFB0" />
-        <DList Name="gRedeadLeftHandDL" Offset="0x10070" />
-        <DList Name="gRedeadRightShoulderAndUpperArmDL" Offset="0x10140" />
-        <DList Name="gRedeadRightForearmDL" Offset="0x10218" />
-        <DList Name="gRedeadRightHandDL" Offset="0x102E8" />
-        <DList Name="gRedeadHeadDL" Offset="0x103B8" />
-        <DList Name="gRedeadLeftThighDL" Offset="0x104F8" />
-        <DList Name="gRedeadLeftShinDL" Offset="0x105D8" />
-        <DList Name="gRedeadLeftFootDL" Offset="0x106A0" />
-        <DList Name="gRedeadRightThighDL" Offset="0x10768" />
-        <DList Name="gRedeadRightShinDL" Offset="0x10848" />
-        <DList Name="gRedeadRightFootDL" Offset="0x10910" />
-        <Limb Name="gRedeadRootLimb" Type="Standard" EnumName="REDEAD_LIMB_ROOT" Offset="0x109F8" />
-        <Limb Name="gRedeadLeftLegRootLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_LEG_ROOT" Offset="0x10A04" />
-        <Limb Name="gRedeadLeftThighLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_THIGH" Offset="0x10A10" />
-        <Limb Name="gRedeadLeftShinLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_SHIN" Offset="0x10A1C" />
-        <Limb Name="gRedeadLeftAnkleLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_ANKLE" Offset="0x10A28" />
-        <Limb Name="gRedeadLeftFootLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_FOOT" Offset="0x10A34" />
-        <Limb Name="gRedeadRightLegRootLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_LEG_ROOT" Offset="0x10A40" />
-        <Limb Name="gRedeadRightThighLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_THIGH" Offset="0x10A4C" />
-        <Limb Name="gRedeadRightShinLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_SHIN" Offset="0x10A58" />
-        <Limb Name="gRedeadRightAnkleLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_ANKLE" Offset="0x10A64" />
-        <Limb Name="gRedeadRightFootLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_FOOT" Offset="0x10A70" />
-        <Limb Name="gRedeadUpperBodyRootLimb" Type="Standard" EnumName="REDEAD_LIMB_UPPER_BODY_ROOT" Offset="0x10A7C" />
-        <Limb Name="gRedeadUpperBodyLimb" Type="Standard" EnumName="REDEAD_LIMB_UPPER_BODY" Offset="0x10A88" />
-        <Limb Name="gRedeadTorsoLimb" Type="Standard" EnumName="REDEAD_LIMB_TORSO" Offset="0x10A94" />
-        <Limb Name="gRedeadLeftArmRootLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_ARM_ROOT" Offset="0x10AA0" />
-        <Limb Name="gRedeadLeftShoulderAndUpperArmLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_SHOULDER_AND_UPPER_ARM" Offset="0x10AAC" />
-        <Limb Name="gRedeadLeftForearmLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_FOREARM" Offset="0x10AB8" />
-        <Limb Name="gRedeadLeftHandLimb" Type="Standard" EnumName="REDEAD_LIMB_LEFT_HAND" Offset="0x10AC4" />
-        <Limb Name="gRedeadRightArmRootLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_ARM_ROOT" Offset="0x10AD0" />
-        <Limb Name="gRedeadRightShoulderAndUpperArmLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_SHOULDER_AND_UPPER_ARM" Offset="0x10ADC" />
-        <Limb Name="gRedeadRightForearmLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_FOREARM" Offset="0x10AE8" />
-        <Limb Name="gRedeadRightHandLimb" Type="Standard" EnumName="REDEAD_LIMB_RIGHT_HAND" Offset="0x10AF4" />
-        <Limb Name="gRedeadHeadRootLimb" Type="Standard" EnumName="REDEAD_LIMB_HEAD_ROOT" Offset="0x10B00" />
-        <Limb Name="gRedeadHeadLimb" Type="Standard" EnumName="REDEAD_LIMB_HEAD" Offset="0x10B0C" />
-        <Limb Name="gRedeadPelvisLimb" Type="Standard" EnumName="REDEAD_LIMB_PELVIS" Offset="0x10B18" />
-        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" LimbNone="REDEAD_LIMB_NONE" LimbMax="REDEAD_LIMB_MAX" EnumName="RedeadLimb" Offset="0x10B88" />
-        <Animation Name="gGibdoRedeadWalkAnim" Offset="0x113EC" /> <!-- Original name is "re_dead_walk" -->
-        <Animation Name="gGibdoRedeadPirouetteAnim" Offset="0x118D8" /> <!-- Original name is "wait_baree" ("ballet") -->
-        <Animation Name="gGibdoRedeadClappingDanceAnim" Offset="0x11DB8" /> <!-- Original name is "wait_dance_b" -->
-        <Animation Name="gGibdoRedeadSquattingDanceAnim" Offset="0x1216C" /> <!-- Original name is "wait_kosakku" ("Cossack" as in "Cossack Dance") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_redead_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_redead_obj.xml
deleted file mode 100644
index 8460579b3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_redead_obj.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for the Beneath the Well's Sliding Door  -->
-    <File Name="object_redead_obj" Segment="6">
-        <DList Name="gBeneathTheWellSlidingDoorDL" Offset="0x1A0" />
-        <Texture Name="gBeneathTheWellSlidingDoorTLUT" OutName="beneath_the_well_sliding_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x390" />
-        <Texture Name="gBeneathTheWellSlidingDoorTex" OutName="beneath_the_well_sliding_door" Format="ci4" Width="64" Height="64" Offset="0x3B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rotlift.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rotlift.xml
deleted file mode 100644
index c2acf0540..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rotlift.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <!-- Assets for the rotating platforms/spikes in the Deku Moon Dungeon -->
-    <File Name="object_rotlift" Segment="6">
-        <!-- Rotating Platforms -->
-        <DList Name="gDekuMoonDungeonRotatingPlatformsDL" Offset="0x400" />
-        <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodBarkTLUT" OutName="deku_moon_dungeon_rotating_platforms_wood_bark_tlut" Format="rgba16" Width="16" Height="16" Offset="0x590" />
-        <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodBarkTex" OutName="deku_moon_dungeon_rotating_platforms_wood_bark" Format="ci8" Width="32" Height="64" Offset="0x790" />
-        <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodTex" OutName="deku_moon_dungeon_rotating_platforms_wood" Format="rgba16" Width="32" Height="64" Offset="0xF90" />
-        <TextureAnimation Name="gDekuMoonDungeonRotatingPlatformsUnusedTexAnim" Offset="0x1F98" />
-        <Collision Name="gDekuMoonDungeonRotatingPlatformsCol" Offset="0x2190" />
-
-        <!-- Rotating Spikes -->
-        <DList Name="gDekuMoonDungeonRotatingSpikesDL" Offset="0x2CE0" />
-        <Texture Name="gDekuMoonDungeonRotatingSpikesWoodBarkTLUT" OutName="deku_moon_dungeon_rotating_spikes_wood_bark_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2FF8" />
-        <Texture Name="gDekuMoonDungeonRotatingSpikesWoodBarkTex" OutName="deku_moon_dungeon_rotating_spikes_wood_bark" Format="ci8" Width="32" Height="64" Offset="0x31F8" />
-        <Texture Name="gDekuMoonDungeonRotatingSpikesWoodTex" OutName="deku_moon_dungeon_rotating_spikes_wood" Format="rgba16" Width="32" Height="64" Offset="0x39F8" />
-        <TextureAnimation Name="gDekuMoonDungeonRotatingSpikesUnusedTexAnim" Offset="0x4A08" />
-        <Collision Name="gDekuMoonDungeonRotatingSpikesCol" Offset="0x4DF0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rr.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rr.xml
deleted file mode 100644
index df974bb35..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rr.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_rr" Segment="6">
-        <DList Name="gLikeLikeDL" Offset="0x470"/>
-        <Texture Name="gLikeLikeBodyPattern1Tex" OutName="like_like_body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
-        <Texture Name="gLikeLikeBodyPattern2Tex" OutName="like_like_body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
-        <Texture Name="gLikeLikeHoleTex" OutName="like_like_hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rs.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rs.xml
deleted file mode 100644
index 5334f4fb8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rs.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<Root>
-    <!-- Object for Bomb Shopkeeper-->
-    <File Name="object_rs" Segment="6">
-        <!-- Bomb -->
-        <DList Name="gBombShopkeeperBombDL" Offset="0x970" />
-        <Texture Name="gBombShopkeeperBombFuseTex" OutName="bomb_shopkeeper_bomb_fuse" Format="i8" Width="32" Height="32" Offset="0xC08" />
-
-        <!-- DLists -->
-        <DList Name="gBombShopkeeperPelvisDL" Offset="0x36F0" />
-        <DList Name="gBombShopkeeperTorsoDL" Offset="0x3778" />
-        <DList Name="gBombShopkeeperHeadDL" Offset="0x3AF0" />
-        <DList Name="gBombShopkeeperRightUpperArmDL" Offset="0x3ED0" />
-        <DList Name="gBombShopkeeperRightForearmDL" Offset="0x3FF0" />
-        <DList Name="gBombShopkeeperRightHandDL" Offset="0x4108" />
-        <DList Name="gBombShopkeeperLeftUpperArmDL" Offset="0x4308" />
-        <DList Name="gBombShopkeeperLeftForearmDL" Offset="0x4428" />
-        <DList Name="gBombShopkeeperLeftHandDL" Offset="0x4540" />
-        <DList Name="gBombShopkeeperRightThighDL" Offset="0x4738" />
-        <DList Name="gBombShopkeeperRightShinDL" Offset="0x48D0" />
-        <DList Name="gBombShopkeeperRightFootDL" Offset="0x4A20" />
-        <DList Name="gBombShopkeeperLeftThighDL" Offset="0x4B88" />
-        <DList Name="gBombShopkeeperLeftShinDL" Offset="0x4D20" />
-        <DList Name="gBombShopkeeperLeftFootDL" Offset="0x4E70" />
-
-        <!-- Textures -->
-        <Texture Name="gBombShopkeeperTLUT" OutName="bomb_shopkeeper_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4FD8" />
-        <Texture Name="gBombShopkeeperEarTex" OutName="bomb_shopkeeper_ear" Format="ci8" Width="8" Height="8" Offset="0x51D8" />
-        <Texture Name="gBombShopkeeperSkinTex" OutName="bomb_shopkeeper_skin" Format="ci8" Width="8" Height="8" Offset="0x5218" />
-        <Texture Name="gBombShopkeeperTorsoTex" OutName="bomb_shopkeeper_torso" Format="ci8" Width="8" Height="32" Offset="0x5258" />
-        <Texture Name="gBombShopkeeperFingersTex" OutName="bomb_shopkeeper_fingers" Format="ci8" Width="16" Height="16" Offset="0x5358" />
-        <Texture Name="gBombShopkeeperEyeTex" OutName="bomb_shopkeeper_eye" Format="rgba16" Width="32" Height="32" Offset="0x5458" />
-        <Texture Name="gBombShopkeeperTatooTex" OutName="bomb_shopkeeper_tatoo" Format="ci8" Width="32" Height="64" Offset="0x5C58" />
-        <Texture Name="gBombShopkeeperShortsTex" OutName="bomb_shopkeeper_shorts" Format="rgba16" Width="16" Height="16" Offset="0x6458" />
-        <Texture Name="gBombShopkeeperSandalsTex" OutName="bomb_shopkeeper_sandals" Format="rgba16" Width="8" Height="8" Offset="0x6658" />
-        <Texture Name="gBombShopkeeperVestTex" OutName="bomb_shopkeeper_vest" Format="rgba16" Width="16" Height="16" Offset="0x66D8" />
-        <Texture Name="gBombShopkeeperToesTex" OutName="bomb_shopkeeper_toes" Format="ci8" Width="16" Height="16" Offset="0x68D8" />
-        <Texture Name="gBombShopkeeperWristBandTex" OutName="bomb_shopkeeper_wrist_band" Format="ci8" Width="32" Height="32" Offset="0x69D8" />
-
-        <!-- Animations -->
-        <Animation Name="gBombShopkeeperSwayAnim" Offset="0x788C" />
-        <Animation Name="gBombShopkeeperSitAtCounterStartAnim" Offset="0x8268" />
-        <Animation Name="gBombShopkeeperSitAtCounterLoopAnim" Offset="0x87BC" />
-        <Animation Name="gBombShopkeeperWalkAnim" Offset="0x9120" />
-
-        <!-- Skeleton -->
-        <Limb Name="gBombShopkeeperPelvisLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_PELVIS" Offset="0x9130" />
-        <Limb Name="gBombShopkeeperLeftThighLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_THIGH" Offset="0x913C" />
-        <Limb Name="gBombShopkeeperLeftShinLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_SHIN" Offset="0x9148" />
-        <Limb Name="gBombShopkeeperLeftFootLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_FOOT" Offset="0x9154" />
-        <Limb Name="gBombShopkeeperRightThighLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_THIGH" Offset="0x9160" />
-        <Limb Name="gBombShopkeeperRightShinLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_SHIN" Offset="0x916C" />
-        <Limb Name="gBombShopkeeperRightFootLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_FOOT" Offset="0x9178" />
-        <Limb Name="gBombShopkeeperTorsoLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_TORSO" Offset="0x9184" />
-        <Limb Name="gBombShopkeeperLeftUpperArmLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_UPPER_ARM" Offset="0x9190" />
-        <Limb Name="gBombShopkeeperLeftForearmLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_FOREARM" Offset="0x919C" />
-        <Limb Name="gBombShopkeeperLeftHandLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_LEFT_HAND" Offset="0x91A8" />
-        <Limb Name="gBombShopkeeperRightUpperArmLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_UPPER_ARM" Offset="0x91B4" />
-        <Limb Name="gBombShopkeeperRightForearmLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_FOREARM" Offset="0x91C0" />
-        <Limb Name="gBombShopkeeperRightHandLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_HAND" Offset="0x91CC" />
-        <Limb Name="gBombShopkeeperHeadLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_HEAD" Offset="0x91D8" />
-        <Skeleton Name="gBombShopkeeperSkel" Type="Flex" LimbType="Standard" LimbNone="BOMB_SHOPKEEPER_LIMB_NONE" LimbMax="BOMB_SHOPKEEPER_LIMB_MAX" EnumName="BombShopkeeperLimb" Offset="0x9220" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ru2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ru2.xml
deleted file mode 100644
index 7d5823a50..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ru2.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<Root>
-    <!-- Adult Ruto from OoT (Unused). -->
-    <!-- Object is Copy from OoT, including documentation. -->
-    <File Name="object_ru2" Segment="6">
-        <!-- Adult Ruto Animations -->
-        <!-- gAdultRutoCrossingArmsAnim: Used in OoT when the sages seal ganon in the Evil Realm. -->
-        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
-        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
-
-        <!-- Adult Ruto Palettes -->
-        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
-        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
-
-        <!-- Adult Ruto Eye Textures -->
-        <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
-        <Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
-        <Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
-
-        <!-- Adult Ruto Textures -->
-        <Texture Name="gAdultRutoSkinGradientTex" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
-        <Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
-        <Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
-        <Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
-        <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
-
-      
-        <!-- Adult Ruto Limb DisplayLists -->
-        <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
-        <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
-        <DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
-        <DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
-        <DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
-        <DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
-        <DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
-        <DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
-        <DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
-        <DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
-        <DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
-        <DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
-        <DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
-        <DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
-        <DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
-        <DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
-        <DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
-        <DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
-        <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
-        <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
-        <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
-
-
-        <!-- Adult Ruto Limbs -->
-        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" EnumName="RU2_LIMB_ROOT" Offset="0xC5A0"/>
-        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_THIGH" Offset="0xC5AC"/>
-        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_LEG" Offset="0xC5B8"/>
-        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_FOOT" Offset="0xC5C4"/>
-        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_TAIL" Offset="0xC5D0"/>
-        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_THIGH" Offset="0xC5DC"/>
-        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_LEG" Offset="0xC5E8"/>
-        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_FOOT" Offset="0xC5F4"/>
-        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_TAIL" Offset="0xC600"/>
-        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" EnumName="RU2_LIMB_TORSO" Offset="0xC60C"/>
-        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_UPPER_ARM" Offset="0xC618"/>
-        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_UPPER_WING" Offset="0xC624"/>
-        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_LOWER_WING" Offset="0xC630"/>
-        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_FOREARM" Offset="0xC63C"/>
-        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_HAND" Offset="0xC648"/>
-        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_UPPER_ARM" Offset="0xC654"/>
-        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_UPPER_WING" Offset="0xC660"/>
-        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_LOWER_WING" Offset="0xC66C"/>
-        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_FOREARM" Offset="0xC678"/>
-        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_HAND" Offset="0xC684"/>
-        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" EnumName="RU2_LIMB_HEAD" Offset="0xC690"/>
-        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" EnumName="RU2_LIMB_WAIST" Offset="0xC69C"/>
-        <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" LimbNone="RU2_LIMB_NONE" LimbMax="RU2_LIMB_MAX" EnumName="Ru2Limb" Offset="0xC700" />
-
-        <!-- (More) Adult Ruto Animations -->
-        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
-        <!-- HeadTurnDownLeft is intro to gAdultRutoLookingDownLeftAnim, used in OoT Credits scene -->
-        <!--   Looking down at Nabooru with the other sages on Death Mountain after the party -->
-        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
-        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
-        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
-        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rz.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rz.xml
deleted file mode 100644
index 9bf8961a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_rz.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<Root>
-    <File Name="object_rz" Segment="6">
-        <Animation Name="gRosaSistersApplaudingAnim" Offset="0x59C" />
-        <Animation Name="gRosaSistersOnKneesAnim" Offset="0xDE8" />
-        <Animation Name="gRosaSistersDancingAnim" Offset="0x28D4" />
-        <Animation Name="gRosaSistersSittingAnim" Offset="0x3098" />
-        <Animation Name="gRosaSistersStandingAnim" Offset="0x3A20" />
-        <Animation Name="gRosaSistersThinkingAnim" Offset="0x457C" />
-        <Animation Name="gRosaSistersWalkingAnim" Offset="0x5390" />
-        <Animation Name="gRosaSistersWalkingWhileThinkingAnim" Offset="0x5E50" />
-        <DList Name="object_rz_DL_0092B0" Offset="0x92B0" />
-        <DList Name="object_rz_DL_0094C8" Offset="0x94C8" />
-        <DList Name="object_rz_DL_009620" Offset="0x9620" />
-        <DList Name="object_rz_DL_009850" Offset="0x9850" />
-        <DList Name="object_rz_DL_009A68" Offset="0x9A68" />
-        <DList Name="object_rz_DL_009BC0" Offset="0x9BC0" />
-        <DList Name="object_rz_DL_009DF0" Offset="0x9DF0" />
-        <DList Name="object_rz_DL_009FD0" Offset="0x9FD0" />
-        <DList Name="object_rz_DL_00A088" Offset="0xA088" />
-        <DList Name="object_rz_DL_00A378" Offset="0xA378" />
-        <DList Name="object_rz_DL_00A9F8" Offset="0xA9F8" />
-        <DList Name="object_rz_DL_00AB98" Offset="0xAB98" />
-        <DList Name="object_rz_DL_00AC50" Offset="0xAC50" />
-        <DList Name="object_rz_DL_00AD70" Offset="0xAD70" />
-        <DList Name="object_rz_DL_00AE88" Offset="0xAE88" />
-        <DList Name="object_rz_DL_00B050" Offset="0xB050" />
-        <DList Name="object_rz_DL_00B170" Offset="0xB170" />
-        <DList Name="object_rz_DL_00B288" Offset="0xB288" />
-        <Texture Name="object_rz_TLUT_00B450" OutName="tlut_00B450" Format="rgba16" Width="16" Height="16" Offset="0xB450" />
-        <Texture Name="object_rz_Tex_00B650" OutName="tex_00B650" Format="rgba16" Width="16" Height="16" Offset="0xB650" />
-        <Texture Name="object_rz_Tex_00B850" OutName="tex_00B850" Format="ci8" Width="8" Height="8" Offset="0xB850" />
-        <Texture Name="object_rz_Tex_00B890" OutName="tex_00B890" Format="ci8" Width="8" Height="8" Offset="0xB890" />
-        <Texture Name="object_rz_Tex_00B8D0" OutName="tex_00B8D0" Format="ci8" Width="16" Height="16" Offset="0xB8D0" />
-        <Texture Name="object_rz_Tex_00B9D0" OutName="tex_00B9D0" Format="ci8" Width="16" Height="16" Offset="0xB9D0" />
-        <Texture Name="object_rz_Tex_00BAD0" OutName="tex_00BAD0" Format="ci8" Width="16" Height="16" Offset="0xBAD0" />
-        <Texture Name="object_rz_Tex_00BBD0" OutName="tex_00BBD0" Format="ci8" Width="8" Height="16" Offset="0xBBD0" />
-        <Texture Name="object_rz_Tex_00BC50" OutName="tex_00BC50" Format="ci8" Width="32" Height="32" Offset="0xBC50" />
-        <Texture Name="object_rz_Tex_00C050" OutName="tex_00C050" Format="ci8" Width="16" Height="16" Offset="0xC050" />
-        <Texture Name="object_rz_Tex_00C150" OutName="tex_00C150" Format="i8" Width="8" Height="8" Offset="0xC150" />
-        <Texture Name="object_rz_Tex_00C190" OutName="tex_00C190" Format="ci8" Width="32" Height="32" Offset="0xC190" />
-        <Texture Name="object_rz_Tex_00C590" OutName="tex_00C590" Format="ci8" Width="32" Height="32" Offset="0xC590" />
-        <Texture Name="object_rz_Tex_00C990" OutName="tex_00C990" Format="ci8" Width="32" Height="32" Offset="0xC990" />
-        <Texture Name="object_rz_Tex_00CD90" OutName="tex_00CD90" Format="ci8" Width="32" Height="32" Offset="0xCD90" />
-        <Texture Name="object_rz_Tex_00D190" OutName="tex_00D190" Format="i8" Width="8" Height="8" Offset="0xD190" />
-        <Texture Name="object_rz_Tex_00D1D0" OutName="tex_00D1D0" Format="i8" Width="16" Height="16" Offset="0xD1D0" />
-        <Texture Name="object_rz_Tex_00D2D0" OutName="tex_00D2D0" Format="i8" Width="32" Height="32" Offset="0xD2D0" />
-        <TextureAnimation Name="object_rz_Matanimheader_00D768" Offset="0xD768" />
-        <Limb Name="object_rz_Standardlimb_00D788" Type="Standard" EnumName="OBJECT_RZ_LIMB_01" Offset="0xD788" />
-        <Limb Name="object_rz_Standardlimb_00D794" Type="Standard" EnumName="OBJECT_RZ_LIMB_02" Offset="0xD794" />
-        <Limb Name="object_rz_Standardlimb_00D7A0" Type="Standard" EnumName="OBJECT_RZ_LIMB_03" Offset="0xD7A0" />
-        <Limb Name="object_rz_Standardlimb_00D7AC" Type="Standard" EnumName="OBJECT_RZ_LIMB_04" Offset="0xD7AC" />
-        <Limb Name="object_rz_Standardlimb_00D7B8" Type="Standard" EnumName="OBJECT_RZ_LIMB_05" Offset="0xD7B8" />
-        <Limb Name="object_rz_Standardlimb_00D7C4" Type="Standard" EnumName="OBJECT_RZ_LIMB_06" Offset="0xD7C4" />
-        <Limb Name="object_rz_Standardlimb_00D7D0" Type="Standard" EnumName="OBJECT_RZ_LIMB_07" Offset="0xD7D0" />
-        <Limb Name="object_rz_Standardlimb_00D7DC" Type="Standard" EnumName="OBJECT_RZ_LIMB_08" Offset="0xD7DC" />
-        <Limb Name="object_rz_Standardlimb_00D7E8" Type="Standard" EnumName="OBJECT_RZ_LIMB_09" Offset="0xD7E8" />
-        <Limb Name="object_rz_Standardlimb_00D7F4" Type="Standard" EnumName="OBJECT_RZ_LIMB_0A" Offset="0xD7F4" />
-        <Limb Name="object_rz_Standardlimb_00D800" Type="Standard" EnumName="OBJECT_RZ_LIMB_0B" Offset="0xD800" />
-        <Limb Name="object_rz_Standardlimb_00D80C" Type="Standard" EnumName="OBJECT_RZ_LIMB_0C" Offset="0xD80C" />
-        <Limb Name="object_rz_Standardlimb_00D818" Type="Standard" EnumName="OBJECT_RZ_LIMB_0D" Offset="0xD818" />
-        <Limb Name="object_rz_Standardlimb_00D824" Type="Standard" EnumName="OBJECT_RZ_LIMB_0E" Offset="0xD824" />
-        <Limb Name="object_rz_Standardlimb_00D830" Type="Standard" EnumName="OBJECT_RZ_LIMB_0F" Offset="0xD830" />
-        <Limb Name="object_rz_Standardlimb_00D83C" Type="Standard" EnumName="OBJECT_RZ_LIMB_10" Offset="0xD83C" />
-        <Limb Name="object_rz_Standardlimb_00D848" Type="Standard" EnumName="OBJECT_RZ_LIMB_11" Offset="0xD848" />
-        <Limb Name="object_rz_Standardlimb_00D854" Type="Standard" EnumName="OBJECT_RZ_LIMB_12" Offset="0xD854" />
-        <Limb Name="object_rz_Standardlimb_00D860" Type="Standard" EnumName="OBJECT_RZ_LIMB_13" Offset="0xD860" />
-        <Limb Name="object_rz_Standardlimb_00D86C" Type="Standard" EnumName="OBJECT_RZ_LIMB_14" Offset="0xD86C" />
-        <Limb Name="object_rz_Standardlimb_00D878" Type="Standard" EnumName="OBJECT_RZ_LIMB_15" Offset="0xD878" />
-        <Skeleton Name="object_rz_Skel_00D8D8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_RZ_LIMB_NONE" LimbMax="OBJECT_RZ_LIMB_MAX" EnumName="ObjectRzLimb" Offset="0xD8D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sb.xml
deleted file mode 100644
index 026b3389b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sb.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Root>
-    <File Name="object_sb" Segment="6">
-        <Animation Name="object_sb_Anim_00004C" Offset="0x4C" />
-        <Animation Name="object_sb_Anim_0000B4" Offset="0xB4" />
-        <Animation Name="object_sb_Anim_000124" Offset="0x124" />
-        <Animation Name="object_sb_Anim_000194" Offset="0x194" />
-        <!-- <Blob Name="object_sb_Blob_0001A4" Size="0x49C" Offset="0x1A4" /> -->
-        <!-- <Blob Name="object_sb_Blob_000840" Size="0x3C0" Offset="0x840" /> -->
-        <DList Name="object_sb_DL_000D80" Offset="0xD80" />
-        <DList Name="object_sb_DL_000E70" Offset="0xE70" />
-        <Texture Name="object_sb_Tex_001020" OutName="tex_001020" Format="rgba16" Width="32" Height="32" Offset="0x1020" />
-        <Texture Name="object_sb_Tex_001820" OutName="tex_001820" Format="rgba16" Width="8" Height="16" Offset="0x1820" />
-        <Texture Name="object_sb_Tex_001920" OutName="tex_001920" Format="rgba16" Width="8" Height="8" Offset="0x1920" />
-        <Texture Name="object_sb_Tex_0019A0" OutName="tex_0019A0" Format="rgba16" Width="8" Height="8" Offset="0x19A0" />
-        <Texture Name="object_sb_Tex_001A20" OutName="tex_001A20" Format="rgba16" Width="8" Height="8" Offset="0x1A20" />
-        <DList Name="object_sb_DL_0025B0" Offset="0x25B0" />
-        <DList Name="object_sb_DL_002858" Offset="0x2858" />
-        <Texture Name="object_sb_Tex_002AF0" OutName="tex_002AF0" Format="rgba16" Width="8" Height="8" Offset="0x2AF0" />
-        <Limb Name="object_sb_Standardlimb_002B70" Type="Standard" EnumName="OBJECT_SB_LIMB_01" Offset="0x2B70" />
-        <Limb Name="object_sb_Standardlimb_002B7C" Type="Standard" EnumName="OBJECT_SB_LIMB_02" Offset="0x2B7C" />
-        <Limb Name="object_sb_Standardlimb_002B88" Type="Standard" EnumName="OBJECT_SB_LIMB_03" Offset="0x2B88" />
-        <Limb Name="object_sb_Standardlimb_002B94" Type="Standard" EnumName="OBJECT_SB_LIMB_04" Offset="0x2B94" />
-        <Limb Name="object_sb_Standardlimb_002BA0" Type="Standard" EnumName="OBJECT_SB_LIMB_05" Offset="0x2BA0" />
-        <Limb Name="object_sb_Standardlimb_002BAC" Type="Standard" EnumName="OBJECT_SB_LIMB_06" Offset="0x2BAC" />
-        <Limb Name="object_sb_Standardlimb_002BB8" Type="Standard" EnumName="OBJECT_SB_LIMB_07" Offset="0x2BB8" />
-        <Limb Name="object_sb_Standardlimb_002BC4" Type="Standard" EnumName="OBJECT_SB_LIMB_08" Offset="0x2BC4" />
-        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_SB_LIMB_NONE" LimbMax="OBJECT_SB_LIMB_MAX" EnumName="ObjectSbLimb" Offset="0x2BF0" />
-        <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sdn.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sdn.xml
deleted file mode 100644
index bcc1f7637..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sdn.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<Root>
-    <File Name="object_sdn" Segment="6">
-        <DList Name="gSoldierBottleDL" Offset="0x630" />
-        <DList Name="gSoldierBottleContentsDL" Offset="0x768" />
-        <DList Name="gSoldierBottleEmptyContentsDL" Offset="0x800" />
-        <Texture Name="gSoldierBottleTex" OutName="soldier_bottle" Format="i4" Width="16" Height="16" Offset="0x808" />
-        <Animation Name="gSoldierStandWithHandOnChestAnim" Offset="0xA54" />
-        <Animation Name="gSoldierDrinkAnim" Offset="0x20D8" />
-        <Animation Name="gSoldierCheerWithSpearAnim" Offset="0x2A84" />
-        <Animation Name="gSoldierSitAndReachAnim" Offset="0x3380" />
-        <Animation Name="gSoldierWaveAnim" Offset="0x3BFC" />
-        <Animation Name="gSoldierStandUpAnim" Offset="0x4770" />
-        <Animation Name="gSoldierLookDownAnim" Offset="0x4AC0" />
-        <Animation Name="gSoldierComeUpHereAnim" Offset="0x5320" />
-        <Animation Name="object_sdn_Anim_0057BC" Offset="0x57BC" /><!-- gSoldierHaltStartAnim? -->
-        <Animation Name="object_sdn_Anim_005D28" Offset="0x5D28" /><!-- gSoldierHaltIdleAnim? -->
-        <Animation Name="object_sdn_Anim_0064C0" Offset="0x64C0" /><!-- gSoldierHaltLoopAnim? -->
-        <Animation Name="gSoldierStandHandOnHipAnim" Offset="0x6C18" />
-        <DList Name="gSoldierTorsoDL" Offset="0x9EB0" />
-        <DList Name="gSoldierHeadDL" Offset="0xA1A8" />
-        <DList Name="gSoldierRightShoulderDL" Offset="0xA678" />
-        <DList Name="gSoldierRightForearmDL" Offset="0xA768" />
-        <DList Name="gSoldierRightHandWithSpearDL" Offset="0xA9A8" />
-        <DList Name="gSoldierLeftShoulderDL" Offset="0xADE0" />
-        <DList Name="gSoldierLeftForearmDL" Offset="0xAED0" />
-        <DList Name="gSoldierLeftHandDL" Offset="0xB120" />
-        <DList Name="gSoldierPelvisDL" Offset="0xB438" />
-        <DList Name="gSoldierRightThighDL" Offset="0xB5B0" />
-        <DList Name="gSoldierRightShinDL" Offset="0xB698" />
-        <DList Name="gSoldierRightFootDL" Offset="0xB988" />
-        <DList Name="gSoldierLeftThighDL" Offset="0xBAD0" />
-        <DList Name="gSoldierLeftShinDL" Offset="0xBBB8" />
-        <DList Name="gSoldierLeftFootDL" Offset="0xBEB8" />
-        <Texture Name="gSoldierSkinTLUT" OutName="soldier_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC000" />
-        <Texture Name="gSoldierGeneralTLUT" OutName="soldier_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC200" />
-        <Texture Name="gSoldierArmorStrapTex" OutName="soldier_armor_strap" Format="ci8" Width="32" Height="32" Offset="0xC400" />
-        <Texture Name="gSoldierArmorPlate1Tex" OutName="soldier_armor_plate1" Format="i8" Width="16" Height="16" Offset="0xC800" />
-        <Texture Name="gSoldierArmorEmblemTex" OutName="soldier_armor_emblem" Format="i8" Width="32" Height="32" Offset="0xC900" />
-        <Texture Name="gSoldierSkinShadowGradient2Tex" OutName="soldier_skin_shadow_gradient2" Format="ci8" Width="8" Height="8" Offset="0xCD00" />
-        <Texture Name="gSoldierShortsToLegTex" OutName="soldier_shorts_to_leg" Format="ci8" Width="16" Height="16" Offset="0xCD40" />
-        <Texture Name="gSoldierArmorTex" OutName="soldier_armor" Format="ci8" Width="8" Height="8" Offset="0xCE40" />
-        <Texture Name="gSoldierSkinShadowGradient1Tex" OutName="soldier_skin_shadow_gradient1" Format="ci8" Width="8" Height="8" Offset="0xCE80" />
-        <Texture Name="gSoldierLipsTex" OutName="soldier_lips" Format="ci8" Width="16" Height="16" Offset="0xCEC0" />
-        <Texture Name="gSoldierArmorCoatOfArmsTex" OutName="soldier_armor_coat_of_arms" Format="ci8" Width="32" Height="32" Offset="0xCFC0" />
-        <Texture Name="gSoldierArmorPlate2Tex" OutName="soldier_armor_plate2" Format="i8" Width="16" Height="8" Offset="0xD3C0" />
-        <Texture Name="gSoldierFingersTex" OutName="soldier_fingers" Format="ci8" Width="16" Height="16" Offset="0xD440" />
-        <Limb Name="gSoldierRootLimb" Type="Standard" EnumName="SOLDIER_LIMB_ROOT" Offset="0xD540" />
-        <Limb Name="gSoldierPelvisLimb" Type="Standard" EnumName="SOLDIER_LIMB_PELVIS" Offset="0xD54C" />
-        <Limb Name="gSoldierLeftThighLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_THIGH" Offset="0xD558" />
-        <Limb Name="gSoldierLeftShinLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_SHIN" Offset="0xD564" />
-        <Limb Name="gSoldierLeftFootLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_FOOT" Offset="0xD570" />
-        <Limb Name="gSoldierRightThighLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_THIGH" Offset="0xD57C" />
-        <Limb Name="gSoldierRightShinLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_SHIN" Offset="0xD588" />
-        <Limb Name="gSoldierRightFootLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_FOOT" Offset="0xD594" />
-        <Limb Name="gSoldierTorsoLimb" Type="Standard" EnumName="SOLDIER_LIMB_TORSO" Offset="0xD5A0" />
-        <Limb Name="gSoldierLeftShoulderLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_SHOULDER" Offset="0xD5AC" />
-        <Limb Name="gSoldierLeftForearmLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_FOREARM" Offset="0xD5B8" />
-        <Limb Name="gSoldierLeftHandLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_HAND" Offset="0xD5C4" />
-        <Limb Name="gSoldierRightShoulderLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_SHOULDER" Offset="0xD5D0" />
-        <Limb Name="gSoldierRightForearmLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_FOREARM" Offset="0xD5DC" />
-        <Limb Name="gSoldierRightHandWithSpearLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_HAND_WITH_SPEAR" Offset="0xD5E8" />
-        <Limb Name="gSoldierHeadLimb" Type="Standard" EnumName="SOLDIER_LIMB_HEAD" Offset="0xD5F4" />
-        <Skeleton Name="gSoldierSkel" Type="Flex" LimbType="Standard" LimbNone="SOLDIER_LIMB_NONE" LimbMax="SOLDIER_LIMB_MAX" EnumName="SoldierLimb" Offset="0xD640" />
-        <Animation Name="gSoldierStandAndLookDownAnim" Offset="0xDC7C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_secom_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_secom_obj.xml
deleted file mode 100644
index 7b21783a3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_secom_obj.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <File Name="object_secom_obj" Segment="6">
-        <DList Name="object_secom_obj_DL_000080" Offset="0x80" />
-        <Collision Name="object_secom_obj_Colheader_0001C0" Offset="0x1C0" />
-        <Texture Name="object_secom_obj_Tex_0001F0" OutName="tex_0001F0" Format="rgba16" Width="32" Height="64" Offset="0x1F0" />
-        <DList Name="object_secom_obj_DL_001230" Offset="0x1230" />
-        <DList Name="object_secom_obj_DL_001300" Offset="0x1300" />
-        <Texture Name="object_secom_obj_Tex_001390" OutName="tex_001390" Format="rgba16" Width="15" Height="32" Offset="0x1390" />
-        <Texture Name="object_secom_obj_Tex_001750" OutName="tex_001750" Format="rgba16" Width="16" Height="16" Offset="0x1750" />
-        <DList Name="object_secom_obj_DL_001A50" Offset="0x1A50" />
-        <DList Name="object_secom_obj_DL_001A58" Offset="0x1A58" />
-        <Texture Name="object_secom_obj_Tex_001B08" OutName="tex_001B08" Format="rgba16" Width="32" Height="64" Offset="0x1B08" />
-        <Collision Name="object_secom_obj_Colheader_002CB8" Offset="0x2CB8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sek.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sek.xml
deleted file mode 100644
index 3529620aa..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sek.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="object_sek" Segment="6">
-        <DList Name="gOwlStatueClosedDL" Offset="0x1D0" />
-        <Texture Name="object_sek_Tex_0003F0" OutName="tex_0003F0" Format="ci8" Width="32" Height="32" Offset="0x3F0" />
-        <Texture Name="object_sek_Tex_0007F0" OutName="tex_0007F0" Format="ci8" Width="32" Height="32" Offset="0x7F0" />
-        <DList Name="object_sek_DL_001110" Offset="0x1110" />
-        <Texture Name="object_sek_TLUT_001610" OutName="tlut_001610" Format="rgba16" Width="16" Height="16" Offset="0x1610" />
-        <Texture Name="object_sek_Tex_001810" OutName="tex_001810" Format="ci8" Width="32" Height="32" Offset="0x1810" />
-        <Texture Name="object_sek_Tex_001C10" OutName="tex_001C10" Format="ci8" Width="32" Height="32" Offset="0x1C10" />
-        <Texture Name="object_sek_Tex_002010" OutName="tex_002010" Format="ci8" Width="32" Height="32" Offset="0x2010" />
-        <Texture Name="object_sek_Tex_002410" OutName="tex_002410" Format="ci8" Width="32" Height="32" Offset="0x2410" />
-        <Texture Name="object_sek_Tex_002810" OutName="tex_002810" Format="ci8" Width="32" Height="32" Offset="0x2810" />
-        <Texture Name="object_sek_Tex_002C10" OutName="tex_002C10" Format="ci8" Width="32" Height="32" Offset="0x2C10" />
-        <DList Name="gOwlStatueOpenedDL" Offset="0x3770" />
-        <Texture Name="object_sek_Tex_003A70" OutName="tex_003A70" Format="ci8" Width="32" Height="64" Offset="0x3A70" />
-        <Texture Name="object_sek_Tex_004270" OutName="tex_004270" Format="ci8" Width="32" Height="64" Offset="0x4270" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihig.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihig.xml
deleted file mode 100644
index de104df55..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihig.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Assets for a suns song grave with a goron symbol on it -->
-    <File Name="object_sekihig" Segment="6">
-        <DList Name="gSunsSongGraveGoronSymbolsBaseDL" Offset="0x340" />
-        <DList Name="gSunsSongGraveGoronSymbolsDL" Offset="0x4A8" />
-        <DList Name="gSunsSongGraveGoronStoneDL" Offset="0x4B8" />
-        <DList Name="gSunsSongGraveGoronDL" Offset="0x5C8" />
-        <Texture Name="gSunsSongGraveGoronTLUT" OutName="sun_song_grave_goron_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5E0" />
-        <Texture Name="gSunsSongGraveGoronKokiriTLUT" OutName="suns_song_grave_goron_kokiri_tlut" Format="rgba16" Width="4" Height="4" Offset="0x600" />
-        <Texture Name="gSunsSongGraveGoronUnknownTLUT" OutName="suns_song_grave_goron_unknown_tlut" Format="rgba16" Width="4" Height="4" Offset="0x620" />
-        <Texture Name="gSunsSongGraveGoronTriforceTLUT" OutName="suns_song_grave_goron_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x640" />
-        <Texture Name="gSunsSongGraveGoronGraniteTex" OutName="sun_song_grave_goron_granite" Format="rgba16" Width="32" Height="32" Offset="0x660" />
-        <Texture Name="gSunsSongGraveGoronMarbleTex" OutName="sun_song_grave_goron_marble" Format="rgba16" Width="32" Height="64" Offset="0xE60" />
-        <Texture Name="gSunsSongGraveGoronSymbolTex" OutName="sun_song_grave_goron_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" />
-        <Texture Name="gSunsSongGraveGoronStoneInscriptionTex" OutName="sun_song_grave_goron_stone_inscription" Format="ia4" Width="128" Height="16" Offset="0x2660" />
-        <Texture Name="gSunsSongGraveGoronStaffNotesTex" OutName="sun_song_grave_goron_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A60" />
-        <Collision Name="gSunsSongGraveGoronCol" Offset="0x33D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihil.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihil.xml
deleted file mode 100644
index 3dbb57774..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihil.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Assets for a suns song grave with a triforce symbol on it -->
-    <File Name="object_sekihil" Segment="6">
-        <DList Name="gSunsSongGraveTriforceSymbolsBaseDL" Offset="0x340" />
-        <DList Name="gSunsSongGraveTriforceSymbolsDL" Offset="0x4C0" />
-        <DList Name="gSunsSongGraveTriforceStoneDL" Offset="0x4D0" />
-        <DList Name="gSunsSongGraveTriforceDL" Offset="0x5E0" />
-        <Texture Name="gSunsSongGraveTriforceGoronTLUT" OutName="suns_song_grave_triforce_goron_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5F8" />
-        <Texture Name="gSunsSongGraveTriforceKokiriTLUT" OutName="suns_song_grave_triforce_kokiri_tlut" Format="rgba16" Width="4" Height="4" Offset="0x618" />
-        <Texture Name="gSunsSongGraveTriforceUnknownTLUT" OutName="suns_song_grave_triforce_unknown_tlut" Format="rgba16" Width="4" Height="4" Offset="0x638" />
-        <Texture Name="gSunsSongGraveTriforceTLUT" OutName="sun_song_grave_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x658" />
-        <Texture Name="gSunsSongGraveTriforceGraniteTex" OutName="sun_song_grave_triforce_granite" Format="rgba16" Width="32" Height="32" Offset="0x678" />
-        <Texture Name="gSunsSongGraveTriforceMarbleTex" OutName="sun_song_grave_triforce_marble" Format="rgba16" Width="32" Height="64" Offset="0xE78" />
-        <Texture Name="gSunsSongGraveTriforceSymbolTex" OutName="sun_song_grave_triforce_symbol" Format="ia4" Width="128" Height="16" Offset="0x1E78" />
-        <Texture Name="gSunsSongGraveTriforceStoneInscriptionTex" OutName="sun_song_grave_triforce_stone_inscription" Format="ci4" Width="64" Height="64" Offset="0x2278" />
-        <Texture Name="gSunsSongGraveTriforceStaffNotesTex" OutName="sun_song_grave_triforce_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A78" />
-        <Collision Name="gSunsSongGraveTriforceCol" Offset="0x33F8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihin.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihin.xml
deleted file mode 100644
index 300a9ad58..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihin.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Assets for a suns song grave with a kokiri symbol on it -->
-    <File Name="object_sekihin" Segment="6">
-        <DList Name="gSunsSongGraveKokiriSymbolsBaseDL" Offset="0x340" />
-        <DList Name="gSunsSongGraveKokiriSymbolsDL" Offset="0x4A8" />
-        <DList Name="gSunsSongGraveKokiriStoneDL" Offset="0x4B8" />
-        <DList Name="gSunsSongGraveKokiriDL" Offset="0x5C8" />
-        <Texture Name="gSunsSongGraveKokiriGoronTLUT" OutName="suns_song_grave_kokiri_goron_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5E0" />
-        <Texture Name="gSunsSongGraveKokiriTLUT" OutName="suns_song_grave_kokiri_tlut" Format="rgba16" Width="4" Height="4" Offset="0x600" />
-        <Texture Name="gSunsSongGraveKokiriUnknownTLUT" OutName="suns_song_grave_kokiri_unknown_tlut" Format="rgba16" Width="4" Height="4" Offset="0x620" />
-        <Texture Name="gSunsSongGraveKokiriTriforceTLUT" OutName="suns_song_grave_kokiri_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x640" />
-        <Texture Name="gSunsSongGraveKokiriGraniteTex" OutName="suns_song_grave_kokiri_granite" Format="rgba16" Width="32" Height="32" Offset="0x660" />
-        <Texture Name="gSunsSongGraveKokiriMarbleTex" OutName="suns_song_grave_kokiri_marble" Format="rgba16" Width="32" Height="64" Offset="0xE60" />
-        <Texture Name="gSunsSongGraveKokiriSymbolTex" OutName="suns_song_grave_kokiri_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" />
-        <Texture Name="gSunsSongGraveKokiriStoneInscriptionTex" OutName="suns_song_grave_kokiri_stone_inscription" Format="ia4" Width="128" Height="16" Offset="0x2660" />
-        <Texture Name="gSunsSongGraveKokiriStaffNotesTex" OutName="suns_song_grave_kokiri_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A60" />
-        <Collision Name="gSunsSongGraveKokiriCol" Offset="0x33D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihiz.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihiz.xml
deleted file mode 100644
index 806279c98..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sekihiz.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Assets for the song of soaring pedestal -->
-    <File Name="object_sekihiz" Segment="6">
-        <DList Name="gSongOfSoaringPedestalEmptyDL" Offset="0x510" />
-        <DList Name="gSongOfSoaringPedestalDL" Offset="0x518" />
-        <Texture Name="gSongOfSoaringPedestalStaffNotesTex" OutName="song_of_soaring_pedestal_staff_notes" Format="i8" Width="32" Height="32" Offset="0x728" />
-        <Texture Name="gSongOfSoaringPedestalGraniteTex" OutName="song_of_soaring_pedestal_granite" Format="i8" Width="32" Height="32" Offset="0xB28" />
-        <Collision Name="gSongOfSoaringPedestalCol" Offset="0x1010" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_shn.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_shn.xml
deleted file mode 100644
index 3e39b2eff..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_shn.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<Root>
-    <!-- Assets for the Shooting Gallery Men and the Swamp Guide. They all use the same body and just swap out the head. -->
-    <File Name="object_shn" Segment="6">
-        <!-- Burly Guy Limb DisplayLists. Includes the Swamp Shooting Gallery Man's head -->
-        <DList Name="gBurlyGuyWaistDL" Offset="0x3510" />
-        <DList Name="gBurlyGuyTorsoDL" Offset="0x3600" />
-        <DList Name="gSwampShootingGalleryManHeadDL" Offset="0x39A0" />
-        <DList Name="gBurlyGuyRightShoulderDL" Offset="0x3DA0" />
-        <DList Name="gBurlyGuyRightForearmDL" Offset="0x4038" />
-        <DList Name="gBurlyGuyRightHandDL" Offset="0x42E0" />
-        <DList Name="gBurlyGuyLeftShoulderDL" Offset="0x4620" />
-        <DList Name="gBurlyGuyLeftForearmDL" Offset="0x48B8" />
-        <DList Name="gBurlyGuyLeftHandDL" Offset="0x4B60" />
-        <DList Name="gBurlyGuyRightThighDL" Offset="0x4EA8" />
-        <DList Name="gBurlyGuyRightShinDL" Offset="0x4FC8" />
-        <DList Name="gBurlyGuyRightFootDL" Offset="0x50D0" />
-        <DList Name="gBurlyGuyLeftThighDL" Offset="0x5298" />
-        <DList Name="gBurlyGuyLeftShinDL" Offset="0x53B8" />
-        <DList Name="gBurlyGuyLeftFootDL" Offset="0x54C0" />
-
-        <!-- Textures for Burly Guy's body, as well as the Swamp Shooting Gallery Man's head -->
-        <Texture Name="gSwampShootingGalleryManNoseTLUT" OutName="swamp_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5688" />
-        <Texture Name="gBurlyGuyTLUT" OutName="shooting_gallery_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5888" />
-        <Texture Name="gBurlyGuySkinTex" OutName="shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0x5A88" />
-        <Texture Name="gSwampShootingGalleryManEyeOpenTex" OutName="swamp_shooting_gallery_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x5AC8" />
-        <Texture Name="gSwampShootingGalleryManEyeHalfTex" OutName="swamp_shooting_gallery_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x62C8" />
-        <Texture Name="gSwampShootingGalleryManEyeClosedTex" OutName="swamp_shooting_gallery_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x6AC8" />
-        <Texture Name="gSwampShootingGalleryManEarTex" OutName="swamp_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0x72C8" />
-        <Texture Name="gSwampShootingGalleryManNoseTex" OutName="swamp_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0x73C8" />
-        <Texture Name="gSwampShootingGalleryManBeardAndLipsTex" OutName="swamp_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x7408" />
-        <Texture Name="gSwampShootingGalleryManHairTex" OutName="swamp_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0x7808" />
-        <Texture Name="gBurlyGuyHandTex" OutName="shooting_gallery_man_hand" Format="ci8" Width="16" Height="16" Offset="0x7908" />
-        <Texture Name="gBurlyGuyBodyHairTex" OutName="shooting_gallery_man_body_hair" Format="ci8" Width="32" Height="32" Offset="0x7A08" />
-        <Texture Name="gBurlyGuyVestTex" OutName="shooting_gallery_man_vest" Format="ci8" Width="16" Height="16" Offset="0x7E08" />
-        <Texture Name="gBurlyGuyPantsTex" OutName="shooting_gallery_man_pants" Format="ci8" Width="8" Height="8" Offset="0x7F08" />
-        <Texture Name="gBurlyGuyShoesTex" OutName="shooting_gallery_man_shoes" Format="ci8" Width="16" Height="16" Offset="0x7F48" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gBurlyGuyUnused8050TexAnim" Offset="0x8050" />
-
-        <!-- DisplayLists for an unused duplicate of the Town Shooting Gallery Man's head -->
-        <DList Name="gUnusedTownShootingGalleryManEyesDL" Offset="0x8BA0" />
-        <DList Name="gUnusedTownShootingGalleryManLipsDL" Offset="0x8C70" />
-        <DList Name="gUnusedTownShootingGalleryManNoseDL" Offset="0x8D90" />
-        <DList Name="gUnusedTownShootingGalleryManEarsDL" Offset="0x8E48" />
-        <DList Name="gUnusedTownShootingGalleryManHairAndSideburnsDL" Offset="0x8F00" />
-        <DList Name="gUnusedTownShootingGalleryManFaceAndChinDL" Offset="0x9040" />
-
-        <!-- Textures for an unused duplicate of the Town Shooting Gallery Man's head -->
-        <Texture Name="gUnusedTownShootingGalleryManBeardAndLipsTLUT" OutName="unused_town_shooting_gallery_man_beard_and_lips_tlut" Format="rgba16" Width="16" Height="16" Offset="0x91D8" />
-        <Texture Name="gUnusedTownShootingGalleryManHairTLUT" OutName="unused_town_shooting_gallery_man_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x93D8" />
-        <Texture Name="gUnusedTownShootingGalleryManEarTLUT" OutName="unused_town_shooting_gallery_man_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x95D8" />
-        <Texture Name="gUnusedTownShootingGalleryManNoseTLUT" OutName="unused_town_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0x97D8" />
-        <Texture Name="gUnusedTownShootingGalleryManEyeTLUT" OutName="unused_town_shooting_gallery_man_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x99D8" />
-        <Texture Name="gUnusedTownShootingGalleryManSkinTLUT" OutName="unused_town_shooting_gallery_man_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9BD8" />
-        <Texture Name="gUnusedTownShootingGalleryManBeardAndLipsTex" OutName="unused_town_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x9DD8" /> <!-- Used only for the lips -->
-        <Texture Name="gUnusedTownShootingGalleryManHairTex" OutName="unused_town_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0xA1D8" />
-        <Texture Name="gUnusedTownShootingGalleryManEarTex" OutName="unused_town_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0xA2D8" />
-        <Texture Name="gUnusedTownShootingGalleryManNoseTex" OutName="unused_town_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0xA3D8" />
-        <Texture Name="gUnusedTownShootingGalleryManEyeTex" OutName="unused_town_shooting_gallery_man_eye" Format="ci8" Width="32" Height="32" Offset="0xA418" />
-        <Texture Name="gUnusedTownShootingGalleryManSkinTex" OutName="unused_town_shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0xA818" />
-
-        <!-- Unused Empty DisplayList -->
-        <DList Name="gBurlyGuyEmptyDL" Offset="0xB730" />
-
-        <!-- DisplayList for the Swamp Guide's head -->
-        <DList Name="gSwampGuideHeadDL" Offset="0xB738" />
-
-        <!-- Textures for the Swamp Guide's head -->
-        <Texture Name="gSwampGuideHairFabricAndSkinTLUT" OutName="swamp_guide_hair_fabric_and_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xBCD8" />
-        <Texture Name="gSwampGuideMouthGoggleAndEyeTLUT" OutName="swamp_guide_mouth_goggle_and_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xBED8" />
-        <Texture Name="gSwampGuideSkinTex" OutName="swamp_guide_skin" Format="ci8" Width="8" Height="8" Offset="0xC0D8" />
-        <Texture Name="gSwampGuideHatFabricTex" OutName="swamp_guide_hat_fabric" Format="ci8" Width="16" Height="16" Offset="0xC118" />
-        <Texture Name="gSwampGuideHairAndBeardTex" OutName="swamp_guide_hair_and_beard" Format="ci8" Width="16" Height="16" Offset="0xC218" />
-        <Texture Name="gSwampGuideHatAndGogglesMetalTex" OutName="swamp_guide_hat_and_goggles_metal" Format="ci8" Width="32" Height="16" Offset="0xC318" />
-        <Texture Name="gSwampGuideEyeTex" OutName="swamp_guide_eye" Format="ci8" Width="32" Height="32" Offset="0xC518" />
-        <Texture Name="gSwampGuideGoggleStrapTex" OutName="swamp_guide_goggle_strap" Format="ci8" Width="16" Height="16" Offset="0xC918" />
-        <Texture Name="gSwampGuideNoseTex" OutName="swamp_guide_nose" Format="rgba16" Width="8" Height="8" Offset="0xCA18" />
-        <Texture Name="gSwampGuideMouthTex" OutName="swamp_guide_mouth" Format="ci8" Width="16" Height="32" Offset="0xCA98" />
-
-        <!-- Burly Guy Animations -->
-        <Animation Name="gBurlyGuyHeadScratchEndAnim" Offset="0xD2F8" /> <!-- Original name is "shn_w02TOw01" ("wait02 to wait01"?) -->
-        <Animation Name="gBurlyGuyEmptyAnim" Offset="0xD3AC" /> <!-- Unused and one frame long. Original name is "shn_wait" -->
-        <Animation Name="gBurlyGuyHandsOnTableAnim" Offset="0xD9D0" /> <!-- Original name is "shn_wait01" -->
-        <Animation Name="gBurlyGuyHeadScratchLoopAnim" Offset="0xDFEC" /> <!-- Original name is "shn_wait02" -->
-        <Animation Name="gBurlyGuyChinScratchAnim" Offset="0xE6C4" /><!-- Original name is "shn_wait03" -->
-
-        <!-- Burly Guy Limbs -->
-        <Limb Name="gBurlyGuyWaistLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_WAIST" Offset="0xE6E0" />
-        <Limb Name="gBurlyGuyLeftThighLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_THIGH" Offset="0xE6EC" />
-        <Limb Name="gBurlyGuyLeftShinLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_SHIN" Offset="0xE6F8" />
-        <Limb Name="gBurlyGuyLeftFootLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_FOOT" Offset="0xE704" />
-        <Limb Name="gBurlyGuyRightThighLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_THIGH" Offset="0xE710" />
-        <Limb Name="gBurlyGuyRightShinLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_SHIN" Offset="0xE71C" />
-        <Limb Name="gBurlyGuyRightFootLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_FOOT" Offset="0xE728" />
-        <Limb Name="gBurlyGuyTorsoLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_TORSO" Offset="0xE734" />
-        <Limb Name="gBurlyGuyLeftShoulderLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_SHOULDER" Offset="0xE740" />
-        <Limb Name="gBurlyGuyLeftForearmLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_FOREARM" Offset="0xE74C" />
-        <Limb Name="gBurlyGuyLeftHandLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_HAND" Offset="0xE758" />
-        <Limb Name="gBurlyGuyRightShoulderLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_SHOULDER" Offset="0xE764" />
-        <Limb Name="gBurlyGuyRightForearmLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_FOREARM" Offset="0xE770" />
-        <Limb Name="gBurlyGuyRightHandLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_HAND" Offset="0xE77C" />
-        <Limb Name="gBurlyGuyHeadLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_HEAD" Offset="0xE788" />
-
-        <!-- Burly Guy Skeleton -->
-        <Skeleton Name="gBurlyGuySkel" Type="Flex" LimbType="Standard" LimbNone="BURLY_GUY_LIMB_NONE" LimbMax="BURLY_GUY_LIMB_MAX" EnumName="BurlyGuyLimb" Offset="0xE7D0" />
-
-        <!-- DisplayList for the Town Shooting Gallery Man's Head -->
-        <DList Name="gTownShootingGalleryManHeadDL" Offset="0xF2D0" />
-
-        <!-- Textures for the Town Shooting Gallery Man's Head -->
-        <Texture Name="gTownShootingGalleryManNoseTLUT" OutName="town_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF790" />
-        <Texture Name="gTownShootingGalleryManHeadTLUT" OutName="town_shooting_gallery_man_head_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF990" />
-        <Texture Name="gTownShootingGalleryManEyeOpenTex" OutName="town_shooting_gallery_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xFB90" />
-        <Texture Name="gTownShootingGalleryManEyeClosedTex" OutName="town_shooting_gallery_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x10390" />
-        <Texture Name="gTownShootingGalleryManBeardAndLipsTex" OutName="town_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x10B90" /> <!-- Used only for the lips -->
-        <Texture Name="gTownShootingGalleryManNoseTex" OutName="town_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0x10F90" />
-        <Texture Name="gTownShootingGalleryManEarTex" OutName="town_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0x10FD0" />
-        <Texture Name="gTownShootingGalleryManHairTex" OutName="town_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0x110D0" />
-        <Texture Name="gTownShootingGalleryManSkinTex" OutName="town_shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0x111D0" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gBurlyGuyUnused11210TexAnim" Offset="0x11210" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sichitai_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sichitai_obj.xml
deleted file mode 100644
index 03bc4f7f3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sichitai_obj.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_sichitai_obj" Segment="6">
-        <DList Name="gSichitaiBoatDL" Offset="0x6B0" />
-        <Texture Name="gSichitaiThwartTex" OutName="tex_000878" Format="rgba16" Width="16" Height="16" Offset="0x878" />
-        <Texture Name="gSichitaiHullTex" OutName="tex_000A78" Format="rgba16" Width="32" Height="32" Offset="0xA78" />
-        <Collision Name="gSichitaiBoatCol" Offset="0x16DC" />
-        <DList Name="object_sichitai_obj_DL_001820" Offset="0x1820" />
-        <Texture Name="object_sichitai_obj_Tex_001908" OutName="tex_001908" Format="rgba16" Width="32" Height="32" Offset="0x1908" />
-        <Texture Name="object_sichitai_obj_Tex_002108" OutName="tex_002108" Format="i4" Width="64" Height="64" Offset="0x2108" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sinkai_kabe.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sinkai_kabe.xml
deleted file mode 100644
index 3c23a73ce..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sinkai_kabe.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <!-- The collision for the front of the Deep Python's den (the invisible wall) -->
-    <File Name="object_sinkai_kabe" Segment="6">
-        <Collision Name="gPinnacleRockPythonDenCol" Offset="0x48" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_skb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_skb.xml
deleted file mode 100644
index b1afaf353..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_skb.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <!-- Assets for Stalchild -->
-    <File Name="object_skb" Segment="6">
-        <Animation Name="gStalchildIdleAnim" Offset="0x9E4" />
-        <Animation Name="gStalchildSaluteAnim" Offset="0x15EC" />
-        <Animation Name="gStalchildSwingOnBranchAnim" Offset="0x1D1C" />
-        <Animation Name="gStalchildAttackAnim" Offset="0x2190" />
-        <!-- <Blob Name="object_skb_zeroes_unk_000021A0" Size="0x20" Offset="0x21A0" /> -->
-        <Animation Name="gStalchildCollapseAnim" Offset="0x270C" />
-        <!-- <Blob Name="object_skb_zeroes_unk_00002720" Size="0x20" Offset="0x2720" /> -->
-        <Animation Name="gStalchildStaggerAnim" Offset="0x2AC8" />
-        <!-- <Blob Name="object_skb_zeroes_unk_00002AE0" Size="0x10" Offset="0x2AE0" /> -->
-        <Animation Name="gStalchildStandUpAnim" Offset="0x3584" />
-        <Texture Name="gStalchildPelvisTex" OutName="stalchild_pelvis" Format="rgba16" Width="16" Height="16" Offset="0x35A0" />
-        <Texture Name="gStalchildRibcageTex" OutName="stalchild_ribcage" Format="rgba16" Width="8" Height="16" Offset="0x37A0" />
-        <Texture Name="gStalchildSkullTex" OutName="stalchild_skull" Format="rgba16" Width="8" Height="8" Offset="0x38A0" />
-        <Texture Name="gStalchildNoseTex" OutName="stalchild_nose" Format="rgba16" Width="8" Height="8" Offset="0x3920" />
-        <Texture Name="gStalchildBoneTex" OutName="stalchild_bone" Format="rgba16" Width="8" Height="8" Offset="0x39A0" />
-        <Texture Name="gStalchildHandAndFeetTex" OutName="stalchild_hand_and_feet" Format="rgba16" Width="8" Height="16" Offset="0x3A20" />
-        <Texture Name="gStalchildTeethTex" OutName="stalchild_teeth" Format="rgba16" Width="16" Height="8" Offset="0x3B20" />
-        <Texture Name="gStalchildEyeSocketTex" OutName="stalchild_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x3C20" />
-        <Texture Name="gStalchildEyeTex" OutName="stalchild_eye" Format="rgba16" Width="8" Height="8" Offset="0x3E20" />
-        <DList Name="gStalchildHeadDL" Offset="0x4F30" />
-        <DList Name="gStalchildLowerJawDL" Offset="0x5298" />
-        <DList Name="gStalchildRibcageDL" Offset="0x5340" />
-        <DList Name="gStalchildSpineDL" Offset="0x5408" />
-        <DList Name="gStalchildPelvisDL" Offset="0x54A0" />
-        <DList Name="gStalchildLeftUpperArmDL" Offset="0x55A8" />
-        <DList Name="gStalchildLeftLowerArmDL" Offset="0x5668" />
-        <DList Name="gStalchildLeftHandDL" Offset="0x5710" />
-        <DList Name="gStalchildRightUpperArmDL" Offset="0x57D8" />
-        <DList Name="gStalchildRightLowerArmDL" Offset="0x5898" />
-        <DList Name="gStalchildRightHandDL" Offset="0x5940" />
-        <DList Name="gStalchildLeftThighDL" Offset="0x5A08" />
-        <DList Name="gStalchildLeftShinDL" Offset="0x5AA0" />
-        <DList Name="gStalchildLeftFootDL" Offset="0x5B48" />
-        <DList Name="gStalchildRightThighDL" Offset="0x5BE8" />
-        <DList Name="gStalchildRightShinDL" Offset="0x5C80" />
-        <DList Name="gStalchildRightFootDL" Offset="0x5D28" />
-        <Limb Name="gStalchildRootLimb" Type="Standard" EnumName="STALCHILD_LIMB_ROOT" Offset="0x5DC8" />
-        <Limb Name="gStalchildPelvisLimb" Type="Standard" EnumName="STALCHILD_LIMB_PELVIS" Offset="0x5DD4" />
-        <Limb Name="gStalchildRootLegsLimb" Type="Standard" EnumName="STALCHILD_LIMB_ROOT_LEGS" Offset="0x5DE0" />
-        <Limb Name="gStalchildRightThighLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_THIGH" Offset="0x5DEC" />
-        <Limb Name="gStalchildRightShinLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_SHIN" Offset="0x5DF8" />
-        <Limb Name="gStalchildRightFootLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_FOOT" Offset="0x5E04" />
-        <Limb Name="gStalchildLeftThighLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_THIGH" Offset="0x5E10" />
-        <Limb Name="gStalchildLeftShinLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_SHIN" Offset="0x5E1C" />
-        <Limb Name="gStalchildLeftFootLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_FOOT" Offset="0x5E28" />
-        <Limb Name="gStalchildRibcageLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIBCAGE" Offset="0x5E34" />
-        <Limb Name="gStalchildHeadLimb" Type="Standard" EnumName="STALCHILD_LIMB_HEAD" Offset="0x5E40" />
-        <Limb Name="gStalchildLowerJawLimb" Type="Standard" EnumName="STALCHILD_LIMB_LOWER_JAW" Offset="0x5E4C" />
-        <Limb Name="gStalchildRightUpperArmLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_UPPER_ARM" Offset="0x5E58" />
-        <Limb Name="gStalchildRightLowerArmLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_LOWER_ARM" Offset="0x5E64" />
-        <Limb Name="gStalchildRightHandLimb" Type="Standard" EnumName="STALCHILD_LIMB_RIGHT_HAND" Offset="0x5E70" />
-        <Limb Name="gStalchildLeftUpperArmLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_UPPER_ARM" Offset="0x5E7C" />
-        <Limb Name="gStalchildLeftLowerArmLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_LOWER_ARM" Offset="0x5E88" />
-        <Limb Name="gStalchildLeftHandLimb" Type="Standard" EnumName="STALCHILD_LIMB_LEFT_HAND" Offset="0x5E94" />
-        <Limb Name="gStalchildSpineLimb" Type="Standard" EnumName="STALCHILD_LIMB_SPINE" Offset="0x5EA0" />
-        <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" LimbNone="STALCHILD_LIMB_NONE" LimbMax="STALCHILD_LIMB_MAX" EnumName="StalchildLimb" Offset="0x5EF8" />
-        <Animation Name="gStalchildWalkAnim" Offset="0x64E0" />
-        <!-- <Blob Name="object_skb_zeroes_unk_000064F0" Size="0x20" Offset="0x64F0" /> -->
-        <Animation Name="gStalchildSitLaughAnim" Offset="0x697C" />
-        <Animation Name="gStalchildSitTapToesAnim" Offset="0x6D90" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_slime.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_slime.xml
deleted file mode 100644
index c8516e45f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_slime.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <!-- Object file for Chuchus -->
-    <File Name="object_slime" Segment="6">
-        <DList Name="gChuchuBodyDL" Offset="0x4C0" />
-        <DList Name="gChuchuEyesDL" Offset="0x650" />
-        <TextureAnimation Name="gChuchuSlimeFlowTexAnim" Offset="0x828" />
-        <DList Name="gChuchuPuddleDL" Offset="0xA10" />
-        <DList Name="gChuchuEmptyDL" Offset="0xB68" />
-        <Texture Name="gChuchuMouthTex" OutName="chuchu_mouth" Format="rgba16" Width="16" Height="16" Offset="0xB70" />
-        <Texture Name="gChuchuEyeSocketTex" OutName="chuchu_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0xD70" />
-        <Texture Name="gChuchuEyeOpenTex" OutName="chuchu_eye_open" Format="rgba16" Width="16" Height="8" Offset="0xF70" />
-        <Texture Name="gChuchuEyeHalfTex" OutName="chuchu_eye_half" Format="rgba16" Width="16" Height="8" Offset="0x1070" />
-        <Texture Name="gChuchuEyeClosedTex" OutName="chuchu_eye_closed" Format="rgba16" Width="16" Height="8" Offset="0x1170" />
-        <Texture Name="gChuchuSlimeFlowTex" OutName="chuchu_slime_flow" Format="i4" Width="32" Height="32" Offset="0x1270" />
-        <Texture Name="gChuchuSlimeBaseTex" OutName="chuchu_slime_base" Format="i4" Width="64" Height="64" Offset="0x1470" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_smtower.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_smtower.xml
deleted file mode 100644
index 90ee5a13d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_smtower.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_smtower" Segment="6">
-        <DList Name="object_smtower_DL_000520" Offset="0x520" />
-        <Texture Name="object_smtower_Tex_000778" OutName="tex_000778" Format="i8" Width="64" Height="32" Offset="0x778" />
-        <Texture Name="object_smtower_Tex_000F78" OutName="tex_000F78" Format="i4" Width="64" Height="64" Offset="0xF78" />
-        <TextureAnimation Name="object_smtower_Matanimheader_001788" Offset="0x1788" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_snowman.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_snowman.xml
deleted file mode 100644
index dd5f42c17..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_snowman.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<Root>
-    <!-- Assets for Eeno -->
-    <File Name="object_snowman" Segment="6">
-        <!-- Eeno Animations -->
-        <Animation Name="gEenoLargeSnowballCreateAnim" Offset="0x404" /> <!-- Original name is "sm_ageA" ("go up/raise A") -->
-        <Animation Name="gEenoSmallSnowballCreateAnim" Offset="0x7B4" /> <!-- Original name is "sm_ageB" ("go up/raise B") -->
-
-        <!-- Eeno Large Snowball DisplayList -->
-        <DList Name="gEenoLargeSnowballDL" Offset="0x10B0" />
-
-        <!-- Eeno Limb DisplayLists -->
-        <DList Name="gEenoBodyBottomDL" Offset="0x2428" />
-        <DList Name="gEenoBodyTopDL" Offset="0x2640" />
-        <DList Name="gEenoRightUpperArmDL" Offset="0x28F0" />
-        <DList Name="gEenoRightForearmDL" Offset="0x29B0" />
-        <DList Name="gEenoRightHandDL" Offset="0x2A50" />
-        <DList Name="gEenoLeftUpperArmDL" Offset="0x2B20" />
-        <DList Name="gEenoLeftForearmDL" Offset="0x2C70" />
-        <DList Name="gEenoLeftHandDL" Offset="0x2D10" />
-        <DList Name="gEenoRightEyeDL" Offset="0x2DE0" />
-        <DList Name="gEenoLeftEyeDL" Offset="0x2E70" />
-
-        <!-- Eeno Textures -->
-        <Texture Name="gEenoFaceTex" OutName="eeno_face" Format="rgba16" Width="32" Height="64" Offset="0x2F00" />
-        <Texture Name="gEenoUpperCheekTex" OutName="eeno_upper_cheek" Format="i4" Width="16" Height="16" Offset="0x3F00" />
-        <Texture Name="gEenoBodyTex" OutName="eeno_body" Format="i8" Width="16" Height="16" Offset="0x3F80" />
-        <Texture Name="gEenoEyeTex" OutName="eeno_eye" Format="rgba16" Width="16" Height="16" Offset="0x4080" />
-
-        <!-- Eeno Small Snowball DisplayList -->
-        <DList Name="gEenoSmallSnowballDL" Offset="0x4400" />
-
-        <!-- Eeno Limbs -->
-        <Limb Name="gEenoRootLimb" Type="Standard" EnumName="EENO_LIMB_ROOT" Offset="0x44F0" />
-        <Limb Name="gEenoBodyTopLimb" Type="Standard" EnumName="EENO_LIMB_BODY_TOP" Offset="0x44FC" />
-        <Limb Name="gEenoLeftEyeLimb" Type="Standard" EnumName="EENO_LIMB_LEFT_EYE" Offset="0x4508" />
-        <Limb Name="gEenoRightEyeLimb" Type="Standard" EnumName="EENO_LIMB_RIGHT_EYE" Offset="0x4514" />
-        <Limb Name="gEenoLeftUpperArmLimb" Type="Standard" EnumName="EENO_LIMB_LEFT_UPPER_ARM" Offset="0x4520" />
-        <Limb Name="gEenoLeftForearmLimb" Type="Standard" EnumName="EENO_LIMB_LEFT_FOREARM" Offset="0x452C" />
-        <Limb Name="gEenoLeftHandLimb" Type="Standard" EnumName="EENO_LIMB_LEFT_HAND" Offset="0x4538" />
-        <Limb Name="gEenoRightUpperArmLimb" Type="Standard" EnumName="EENO_LIMB_RIGHT_UPPER_ARM" Offset="0x4544" />
-        <Limb Name="gEenoRightForearmLimb" Type="Standard" EnumName="EENO_LIMB_RIGHT_FOREARM" Offset="0x4550" />
-        <Limb Name="gEenoRightHandLimb" Type="Standard" EnumName="EENO_LIMB_RIGHT_HAND" Offset="0x455C" />
-        <Limb Name="gEenoBodyBottomLimb" Type="Standard" EnumName="EENO_LIMB_BODY_BOTTOM" Offset="0x4568" />
-
-        <!-- Eeno Skeleton -->
-        <Skeleton Name="gEenoSkel" Type="Flex" LimbType="Standard" LimbNone="EENO_LIMB_NONE" LimbMax="EENO_LIMB_MAX" EnumName="EenoLimb" Offset="0x45A0" />
-
-        <!-- Eeno Animations -->
-        <Animation Name="gEenoDamageAnim" Offset="0x4628" /> <!-- Original name is "sm_damege" -->
-        <Animation Name="gEenoSnowPileMoveAnim" Offset="0x46D8" /> <!-- Original name is "sm_fukurami" ("to swell") -->
-
-        <!-- Eeno Snow Pile Limb DisplayLists -->
-        <DList Name="gEenoSnowPileBottomDL" Offset="0x4960" />
-        <DList Name="gEenoSnowPileTopDL" Offset="0x49E0" />
-
-        <!-- Eeno Snow Pile Limbs -->
-        <Limb Name="gEenoSnowPileBottomLimb" Type="Standard" EnumName="EENO_SNOW_PILE_LIMB_BOTTOM" Offset="0x4A70" />
-        <Limb Name="gEenoSnowPileTopLimb" Type="Standard" EnumName="EENO_SNOW_PILE_LIMB_TOP" Offset="0x4A7C" />
-
-        <!-- Eeno Snow Pile Skeleton -->
-        <Skeleton Name="gEenoSnowPileSkel" Type="Flex" LimbType="Standard" LimbNone="EENO_SNOW_PILE_LIMB_NONE" LimbMax="EENO_SNOW_PILE_LIMB_MAX" EnumName="EenoSnowPileLimb" Offset="0x4A90" />
-        
-        <!-- Eeno Animations -->
-        <Animation Name="gEenoLargeSnowballThrowAnim" Offset="0x4F14" /> <!-- Original name is "sm_nageA" ("throw A") -->
-        <Animation Name="gEenoSmallSnowballThrowAnim" Offset="0x544C" /> <!-- Original name is "sm_nageB" ("throw B") -->
-        <Animation Name="gEenoEmergeAnim" Offset="0x554C" /> <!-- Original name is "sm_tojo" ("appearance") -->
-        <Animation Name="gEenoIdleAnim" Offset="0x58CC" /> <!-- Original name is "sm_wait" -->
-
-        <!-- Eeno Snowball Fragment DisplayLists -->
-        <DList Name="gEenoSnowballFragment1DL" Offset="0x5CB0" />
-        <DList Name="gEenoSnowballFragment2DL" Offset="0x6190" />
-        <DList Name="gEenoSnowballFragment3DL" Offset="0x6620" />
-
-        <!-- Eeno Snowball Fragment Texture -->
-        <Texture Name="gEenoSnowballFragmentTex" OutName="eeno_snowball_fragment" Format="rgba16" Width="32" Height="64" Offset="0x6730" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_snowwd.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_snowwd.xml
deleted file mode 100644
index 9bb2209d9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_snowwd.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_snowwd" Segment="6">
-        <DList Name="gSnowTreeEmptyDL" Offset="0x190" />
-        <DList Name="gSnowTreeDL" Offset="0x198" />
-        <Texture Name="gSnowTreeLeavesTex" OutName="snow_tree_leaves" Format="rgba16" Width="32" Height="64" Offset="0x2A0" />
-        <Texture Name="gSnowTreeBodyTex" OutName="snow_tree_body" Format="rgba16" Width="32" Height="32" Offset="0x12A0" />
-        <Texture Name="gSnowTreeSnowLeavesTex" OutName="snow_tree_snow_leaves" Format="rgba16" Width="32" Height="64" Offset="0x1AA0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spdweb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spdweb.xml
deleted file mode 100644
index 6f54a482d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spdweb.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_spdweb" Segment="6">
-        <DList Name="object_spdweb_DL_000060" Offset="0x60" />
-        <DList Name="object_spdweb_DL_000130" Offset="0x130" />
-        <Texture Name="object_spdweb_Tex_000138" OutName="tex_000138" Format="rgba16" Width="32" Height="32" Offset="0x138" />
-        <Texture Name="object_spdweb_Tex_000938" OutName="tex_000938" Format="ia8" Width="32" Height="64" Offset="0x938" />
-        <Collision Name="object_spdweb_Colheader_0011C0" Offset="0x11C0" />
-        <DList Name="object_spdweb_DL_0012F0" Offset="0x12F0" />
-        <DList Name="object_spdweb_DL_001400" Offset="0x1400" />
-        <Texture Name="object_spdweb_Tex_001408" OutName="tex_001408" Format="ia8" Width="64" Height="64" Offset="0x1408" />
-        <Collision Name="object_spdweb_Colheader_002678" Offset="0x2678" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spidertent.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spidertent.xml
deleted file mode 100644
index d90bede67..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spidertent.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_spidertent" Segment="6">
-        <DList Name="object_spidertent_DL_000070" Offset="0x70" />
-        <DList Name="object_spidertent_DL_000108" Offset="0x108" />
-        <Texture Name="object_spidertent_Tex_000110" OutName="tex_000110" Format="ia8" Width="64" Height="64" Offset="0x110" />
-        <Collision Name="object_spidertent_Colheader_0011AC" Offset="0x11AC" />
-        <DList Name="object_spidertent_DL_001250" Offset="0x1250" />
-        <DList Name="object_spidertent_DL_0012E8" Offset="0x12E8" />
-        <Texture Name="object_spidertent_Tex_0012F0" OutName="tex_0012F0" Format="ia8" Width="64" Height="64" Offset="0x12F0" />
-        <Collision Name="object_spidertent_Colheader_00238C" Offset="0x238C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spinyroll.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spinyroll.xml
deleted file mode 100644
index d27386945..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spinyroll.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_spinyroll" Segment="6">
-        <DList Name="object_spinyroll_DL_000460" Offset="0x460" />
-        <Texture Name="object_spinyroll_Tex_0005C0" OutName="tex_0005C0" Format="rgba16" Width="32" Height="32" Offset="0x5C0" />
-        <Collision Name="object_spinyroll_Colheader_000E68" Offset="0xE68" />
-        <Collision Name="object_spinyroll_Colheader_000F80" Offset="0xF80" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spot11_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spot11_obj.xml
deleted file mode 100644
index 58d146203..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_spot11_obj.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_spot11_obj" Segment="6">
-        <DList Name="gSpot11EmptyDL" Offset="0x80" />
-        <DList Name="gGoronDoorDL" Offset="0x88" />
-        <Texture Name="gGoronDoorTex" OutName="goron_door" Format="rgba16" Width="32" Height="64" Offset="0x120" />
-        <Collision Name="gGoronDoorCol" Offset="0x11C0" />
-        <DList Name="gWoodStepDL" Offset="0x13F0" />
-        <Texture Name="gWoodTLUT" OutName="wood_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1560" />
-        <Texture Name="gWoodStepTopTex" OutName="wood_step_top" Format="ci8" Width="32" Height="32" Offset="0x1760" />
-        <Texture Name="gWoodStepSideTex" OutName="wood_step_side" Format="ci8" Width="32" Height="16" Offset="0x1B60" />
-        <Collision Name="gWoodStepCol" Offset="0x1EB8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ssh.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ssh.xml
deleted file mode 100644
index 5e6893077..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_ssh.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Root>
-    <File Name="object_ssh" Segment="6">
-        <DList Name="object_ssh_DL_0000D0" Offset="0xD0" />
-        <DList Name="object_ssh_DL_0000D8" Offset="0xD8" />
-        <Texture Name="object_ssh_Tex_000190" OutName="tex_000190" Format="rgba16" Width="32" Height="64" Offset="0x190" />
-        <Animation Name="object_ssh_Anim_001494" Offset="0x1494" />
-        <Texture Name="object_ssh_TLUT_0014B0" OutName="tlut_0014B0" Format="rgba16" Width="16" Height="16" Offset="0x14B0" />
-        <Texture Name="object_ssh_Tex_0016B0" OutName="tex_0016B0" Format="ci8" Width="8" Height="8" Offset="0x16B0" />
-        <Texture Name="object_ssh_Tex_0016F0" OutName="tex_0016F0" Format="ci8" Width="16" Height="8" Offset="0x16F0" />
-        <Texture Name="object_ssh_Tex_001770" OutName="tex_001770" Format="ci8" Width="8" Height="8" Offset="0x1770" />
-        <Texture Name="object_ssh_Tex_0017B0" OutName="tex_0017B0" Format="i8" Width="16" Height="16" Offset="0x17B0" />
-        <Texture Name="object_ssh_Tex_0018B0" OutName="tex_0018B0" Format="ci8" Width="8" Height="16" Offset="0x18B0" />
-        <Texture Name="object_ssh_Tex_001930" OutName="tex_001930" Format="ci8" Width="8" Height="8" Offset="0x1930" />
-        <Texture Name="object_ssh_Tex_001970" OutName="tex_001970" Format="ci8" Width="32" Height="32" Offset="0x1970" />
-        <Texture Name="object_ssh_Tex_001D70" OutName="tex_001D70" Format="ci8" Width="8" Height="16" Offset="0x1D70" />
-        <Texture Name="object_ssh_Tex_001DF0" OutName="tex_001DF0" Format="ci8" Width="32" Height="32" Offset="0x1DF0" />
-        <Texture Name="object_ssh_Tex_0021F0" OutName="tex_0021F0" Format="ci8" Width="32" Height="32" Offset="0x21F0" />
-        <DList Name="object_ssh_DL_004E60" Offset="0x4E60" />
-        <DList Name="object_ssh_DL_005210" Offset="0x5210" />
-        <DList Name="object_ssh_DL_0056A0" Offset="0x56A0" />
-        <DList Name="object_ssh_DL_005850" Offset="0x5850" />
-        <DList Name="object_ssh_DL_005A08" Offset="0x5A08" />
-        <DList Name="object_ssh_DL_005AD0" Offset="0x5AD0" />
-        <DList Name="object_ssh_DL_005B98" Offset="0x5B98" />
-        <DList Name="object_ssh_DL_005C60" Offset="0x5C60" />
-        <DList Name="object_ssh_DL_005D28" Offset="0x5D28" />
-        <DList Name="object_ssh_DL_005DF0" Offset="0x5DF0" />
-        <DList Name="object_ssh_DL_005EB8" Offset="0x5EB8" />
-        <DList Name="object_ssh_DL_005F78" Offset="0x5F78" />
-        <DList Name="object_ssh_DL_0061D8" Offset="0x61D8" />
-        <Limb Name="object_ssh_Standardlimb_0062A0" Type="Standard" EnumName="OBJECT_SSH_LIMB_01" Offset="0x62A0" />
-        <Limb Name="object_ssh_Standardlimb_0062AC" Type="Standard" EnumName="OBJECT_SSH_LIMB_02" Offset="0x62AC" />
-        <Limb Name="object_ssh_Standardlimb_0062B8" Type="Standard" EnumName="OBJECT_SSH_LIMB_03" Offset="0x62B8" />
-        <Limb Name="object_ssh_Standardlimb_0062C4" Type="Standard" EnumName="OBJECT_SSH_LIMB_04" Offset="0x62C4" />
-        <Limb Name="object_ssh_Standardlimb_0062D0" Type="Standard" EnumName="OBJECT_SSH_LIMB_05" Offset="0x62D0" />
-        <Limb Name="object_ssh_Standardlimb_0062DC" Type="Standard" EnumName="OBJECT_SSH_LIMB_06" Offset="0x62DC" />
-        <Limb Name="object_ssh_Standardlimb_0062E8" Type="Standard" EnumName="OBJECT_SSH_LIMB_07" Offset="0x62E8" />
-        <Limb Name="object_ssh_Standardlimb_0062F4" Type="Standard" EnumName="OBJECT_SSH_LIMB_08" Offset="0x62F4" />
-        <Limb Name="object_ssh_Standardlimb_006300" Type="Standard" EnumName="OBJECT_SSH_LIMB_09" Offset="0x6300" />
-        <Limb Name="object_ssh_Standardlimb_00630C" Type="Standard" EnumName="OBJECT_SSH_LIMB_0A" Offset="0x630C" />
-        <Limb Name="object_ssh_Standardlimb_006318" Type="Standard" EnumName="OBJECT_SSH_LIMB_0B" Offset="0x6318" />
-        <Limb Name="object_ssh_Standardlimb_006324" Type="Standard" EnumName="OBJECT_SSH_LIMB_0C" Offset="0x6324" />
-        <Limb Name="object_ssh_Standardlimb_006330" Type="Standard" EnumName="OBJECT_SSH_LIMB_0D" Offset="0x6330" />
-        <Limb Name="object_ssh_Standardlimb_00633C" Type="Standard" EnumName="OBJECT_SSH_LIMB_0E" Offset="0x633C" />
-        <Limb Name="object_ssh_Standardlimb_006348" Type="Standard" EnumName="OBJECT_SSH_LIMB_0F" Offset="0x6348" />
-        <Limb Name="object_ssh_Standardlimb_006354" Type="Standard" EnumName="OBJECT_SSH_LIMB_10" Offset="0x6354" />
-        <Limb Name="object_ssh_Standardlimb_006360" Type="Standard" EnumName="OBJECT_SSH_LIMB_11" Offset="0x6360" />
-        <Limb Name="object_ssh_Standardlimb_00636C" Type="Standard" EnumName="OBJECT_SSH_LIMB_12" Offset="0x636C" />
-        <Limb Name="object_ssh_Standardlimb_006378" Type="Standard" EnumName="OBJECT_SSH_LIMB_13" Offset="0x6378" />
-        <Limb Name="object_ssh_Standardlimb_006384" Type="Standard" EnumName="OBJECT_SSH_LIMB_14" Offset="0x6384" />
-        <Limb Name="object_ssh_Standardlimb_006390" Type="Standard" EnumName="OBJECT_SSH_LIMB_15" Offset="0x6390" />
-        <Limb Name="object_ssh_Standardlimb_00639C" Type="Standard" EnumName="OBJECT_SSH_LIMB_16" Offset="0x639C" />
-        <Limb Name="object_ssh_Standardlimb_0063A8" Type="Standard" EnumName="OBJECT_SSH_LIMB_17" Offset="0x63A8" />
-        <Limb Name="object_ssh_Standardlimb_0063B4" Type="Standard" EnumName="OBJECT_SSH_LIMB_18" Offset="0x63B4" />
-        <Limb Name="object_ssh_Standardlimb_0063C0" Type="Standard" EnumName="OBJECT_SSH_LIMB_19" Offset="0x63C0" />
-        <Limb Name="object_ssh_Standardlimb_0063CC" Type="Standard" EnumName="OBJECT_SSH_LIMB_1A" Offset="0x63CC" />
-        <Limb Name="object_ssh_Standardlimb_0063D8" Type="Standard" EnumName="OBJECT_SSH_LIMB_1B" Offset="0x63D8" />
-        <Limb Name="object_ssh_Standardlimb_0063E4" Type="Standard" EnumName="OBJECT_SSH_LIMB_1C" Offset="0x63E4" />
-        <Limb Name="object_ssh_Standardlimb_0063F0" Type="Standard" EnumName="OBJECT_SSH_LIMB_1D" Offset="0x63F0" />
-        <Skeleton Name="object_ssh_Skel_006470" Type="Normal" LimbType="Standard" LimbNone="OBJECT_SSH_LIMB_NONE" LimbMax="OBJECT_SSH_LIMB_MAX" EnumName="ObjectSshLimb" Offset="0x6470" />
-        <Animation Name="object_ssh_Anim_006788" Offset="0x6788" />
-        <Animation Name="object_ssh_Anim_006D78" Offset="0x6D78" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_st.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_st.xml
deleted file mode 100644
index cbb01d3c5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_st.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<Root>
-    <File Name="object_st" Segment="6">
-        <Animation Name="object_st_Anim_000304" Offset="0x304" />
-        <Texture Name="object_st_Tex_000320" OutName="tex_000320" Format="i4" Width="16" Height="8" Offset="0x320" />
-        <Texture Name="object_st_Tex_000360" OutName="tex_000360" Format="rgba16" Width="16" Height="8" Offset="0x360" />
-        <Texture Name="object_st_Tex_000460" OutName="tex_000460" Format="rgba16" Width="8" Height="8" Offset="0x460" />
-        <Texture Name="object_st_Tex_0004E0" OutName="tex_0004E0" Format="i4" Width="16" Height="16" Offset="0x4E0" />
-        <Texture Name="object_st_Tex_000560" OutName="tex_000560" Format="rgba16" Width="16" Height="16" Offset="0x560" />
-        <Texture Name="object_st_Tex_000760" OutName="tex_000760" Format="rgba16" Width="8" Height="8" Offset="0x760" />
-        <Texture Name="object_st_Tex_0007E0" OutName="tex_0007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0" />
-        <DList Name="object_st_DL_001A40" Offset="0x1A40" />
-        <DList Name="object_st_DL_001C30" Offset="0x1C30" />
-        <DList Name="object_st_DL_001FD0" Offset="0x1FD0" />
-        <DList Name="object_st_DL_002068" Offset="0x2068" />
-        <DList Name="object_st_DL_002100" Offset="0x2100" />
-        <DList Name="object_st_DL_002198" Offset="0x2198" />
-        <DList Name="object_st_DL_002230" Offset="0x2230" />
-        <DList Name="object_st_DL_0022C8" Offset="0x22C8" />
-        <DList Name="object_st_DL_002360" Offset="0x2360" />
-        <DList Name="object_st_DL_0023F8" Offset="0x23F8" />
-        <Texture Name="object_st_Tex_002490" OutName="tex_002490" Format="i8" Width="8" Height="8" Offset="0x2490" />
-        <Texture Name="object_st_Tex_0024D0" OutName="tex_0024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0" />
-        <Texture Name="object_st_Tex_0025D0" OutName="tex_0025D0" Format="i4" Width="16" Height="16" Offset="0x25D0" />
-        <Texture Name="object_st_Tex_002650" OutName="tex_002650" Format="rgba16" Width="8" Height="8" Offset="0x2650" />
-        <!-- <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50" /> -->
-        <DList Name="object_st_DL_003FB0" Offset="0x3FB0" />
-        <DList Name="object_st_DL_0043D8" Offset="0x43D8" />
-        <DList Name="object_st_DL_0045C0" Offset="0x45C0" />
-        <DList Name="object_st_DL_004658" Offset="0x4658" />
-        <DList Name="object_st_DL_0046F0" Offset="0x46F0" />
-        <DList Name="object_st_DL_004788" Offset="0x4788" />
-        <DList Name="object_st_DL_004820" Offset="0x4820" />
-        <DList Name="object_st_DL_0048B8" Offset="0x48B8" />
-        <DList Name="object_st_DL_004950" Offset="0x4950" />
-        <DList Name="object_st_DL_0049E8" Offset="0x49E8" />
-        <DList Name="gSkulltulaTokenDL" Offset="0x4DB0" />
-        <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8" />
-        <Limb Name="object_st_Standardlimb_0050C8" Type="Standard" EnumName="OBJECT_ST_LIMB_01" Offset="0x50C8" />
-        <Limb Name="object_st_Standardlimb_0050D4" Type="Standard" EnumName="OBJECT_ST_LIMB_02" Offset="0x50D4" />
-        <Limb Name="object_st_Standardlimb_0050E0" Type="Standard" EnumName="OBJECT_ST_LIMB_03" Offset="0x50E0" />
-        <Limb Name="object_st_Standardlimb_0050EC" Type="Standard" EnumName="OBJECT_ST_LIMB_04" Offset="0x50EC" />
-        <Limb Name="object_st_Standardlimb_0050F8" Type="Standard" EnumName="OBJECT_ST_LIMB_05" Offset="0x50F8" />
-        <Limb Name="object_st_Standardlimb_005104" Type="Standard" EnumName="OBJECT_ST_LIMB_06" Offset="0x5104" />
-        <Limb Name="object_st_Standardlimb_005110" Type="Standard" EnumName="OBJECT_ST_LIMB_07" Offset="0x5110" />
-        <Limb Name="object_st_Standardlimb_00511C" Type="Standard" EnumName="OBJECT_ST_LIMB_08" Offset="0x511C" />
-        <Limb Name="object_st_Standardlimb_005128" Type="Standard" EnumName="OBJECT_ST_LIMB_09" Offset="0x5128" />
-        <Limb Name="object_st_Standardlimb_005134" Type="Standard" EnumName="OBJECT_ST_LIMB_0A" Offset="0x5134" />
-        <Limb Name="object_st_Standardlimb_005140" Type="Standard" EnumName="OBJECT_ST_LIMB_0B" Offset="0x5140" />
-        <Limb Name="object_st_Standardlimb_00514C" Type="Standard" EnumName="OBJECT_ST_LIMB_0C" Offset="0x514C" />
-        <Limb Name="object_st_Standardlimb_005158" Type="Standard" EnumName="OBJECT_ST_LIMB_0D" Offset="0x5158" />
-        <Limb Name="object_st_Standardlimb_005164" Type="Standard" EnumName="OBJECT_ST_LIMB_0E" Offset="0x5164" />
-        <Limb Name="object_st_Standardlimb_005170" Type="Standard" EnumName="OBJECT_ST_LIMB_0F" Offset="0x5170" />
-        <Limb Name="object_st_Standardlimb_00517C" Type="Standard" EnumName="OBJECT_ST_LIMB_10" Offset="0x517C" />
-        <Limb Name="object_st_Standardlimb_005188" Type="Standard" EnumName="OBJECT_ST_LIMB_11" Offset="0x5188" />
-        <Limb Name="object_st_Standardlimb_005194" Type="Standard" EnumName="OBJECT_ST_LIMB_12" Offset="0x5194" />
-        <Limb Name="object_st_Standardlimb_0051A0" Type="Standard" EnumName="OBJECT_ST_LIMB_13" Offset="0x51A0" />
-        <Limb Name="object_st_Standardlimb_0051AC" Type="Standard" EnumName="OBJECT_ST_LIMB_14" Offset="0x51AC" />
-        <Limb Name="object_st_Standardlimb_0051B8" Type="Standard" EnumName="OBJECT_ST_LIMB_15" Offset="0x51B8" />
-        <Limb Name="object_st_Standardlimb_0051C4" Type="Standard" EnumName="OBJECT_ST_LIMB_16" Offset="0x51C4" />
-        <Limb Name="object_st_Standardlimb_0051D0" Type="Standard" EnumName="OBJECT_ST_LIMB_17" Offset="0x51D0" />
-        <Limb Name="object_st_Standardlimb_0051DC" Type="Standard" EnumName="OBJECT_ST_LIMB_18" Offset="0x51DC" />
-        <Limb Name="object_st_Standardlimb_0051E8" Type="Standard" EnumName="OBJECT_ST_LIMB_19" Offset="0x51E8" />
-        <Limb Name="object_st_Standardlimb_0051F4" Type="Standard" EnumName="OBJECT_ST_LIMB_1A" Offset="0x51F4" />
-        <Limb Name="object_st_Standardlimb_005200" Type="Standard" EnumName="OBJECT_ST_LIMB_1B" Offset="0x5200" />
-        <Limb Name="object_st_Standardlimb_00520C" Type="Standard" EnumName="OBJECT_ST_LIMB_1C" Offset="0x520C" />
-        <Limb Name="object_st_Standardlimb_005218" Type="Standard" EnumName="OBJECT_ST_LIMB_1D" Offset="0x5218" />
-        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" LimbNone="OBJECT_ST_LIMB_NONE" LimbMax="OBJECT_ST_LIMB_MAX" EnumName="ObjectStLimb" Offset="0x5298" />
-        <Animation Name="object_st_Anim_0055A8" Offset="0x55A8" />
-        <Animation Name="object_st_Anim_005B98" Offset="0x5B98" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sth.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sth.xml
deleted file mode 100644
index 53040ae05..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_sth.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <!-- Assets for the guy looking up at the moon, and the guy you find in Spider Houses. -->
-    <!-- This object is almost a copy of object_boj, with the animations removed -->
-    <File Name="object_sth" Segment="6">
-
-        <!-- Unused copy of head from object_boj (Juggler). -->
-        <Array Name="gSthUnusedHeadVtx" Count="83" Offset="0x0">
-            <Vtx/>
-        </Array>
-
-        <DList Name="gSthHeadDL" Offset="0x1C30" />
-        <DList Name="gSthRightHandDL" Offset="0x1C38" />
-        <DList Name="gSthRightForearmDL" Offset="0x1D80" />
-        <DList Name="gSthRightUpperArmDL" Offset="0x1E88" />
-        <DList Name="gSthLeftHandDL" Offset="0x1F90" />
-        <DList Name="gSthLeftForearmDL" Offset="0x20D8" />
-        <DList Name="gSthLeftUpperArmDL" Offset="0x21E0" />
-        <DList Name="gSthTorsoDL" Offset="0x22E8" />
-        <DList Name="gSthRightFootDL" Offset="0x24C0" />
-        <DList Name="gSthRightShinDL" Offset="0x25D8" />
-        <DList Name="gSthRightThighDL" Offset="0x26E8" />
-        <DList Name="gSthLeftFootDL" Offset="0x27F0" />
-        <DList Name="gSthLeftShinDL" Offset="0x2908" />
-        <DList Name="gSthLeftThighDL" Offset="0x2A18" />
-        <DList Name="gSthPelvisDL" Offset="0x2B20" />
-
-        <Texture Name="gSthTLUT" OutName="sth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2D08" />
-        <Texture Name="gSthSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x2F08" />
-        <Texture Name="gSthFingerTex" OutName="figer" Format="ci8" Width="8" Height="8" Offset="0x2F48" />
-        <!-- Shirt and pants get painted with color in the draw func. -->
-        <Texture Name="gSthShirtTex" OutName="shirt" Format="i8" Width="16" Height="16" Offset="0x2F88" />
-        <Texture Name="gSthBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0x3088" />
-        <Texture Name="gSthPantsTex" OutName="pants" Format="i8" Width="8" Height="8" Offset="0x30C8" />
-      
-        <Limb Name="gSthPelvisLimb" Type="Standard" EnumName="STH_LIMB_PELVIS" Offset="0x3108" />
-        <Limb Name="gSthLeftThighLimb" Type="Standard" EnumName="STH_LIMB_LEFT_THIGH" Offset="0x3114" />
-        <Limb Name="gSthLeftShinLimb" Type="Standard" EnumName="STH_LIMB_LEFT_SHIN" Offset="0x3120" />
-        <Limb Name="gSthLeftFootLimb" Type="Standard" EnumName="STH_LIMB_LEFT_FOOT" Offset="0x312C" />
-        <Limb Name="gSthRightThighLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_THIGH" Offset="0x3138" />
-        <Limb Name="gSthRightShinLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_SHIN" Offset="0x3144" />
-        <Limb Name="gSthRightFootLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_FOOT" Offset="0x3150" />
-        <Limb Name="gSthTorsoLimb" Type="Standard" EnumName="STH_LIMB_CHEST" Offset="0x315C" />
-        <Limb Name="gSthLeftUpperArmLimb" Type="Standard" EnumName="STH_LIMB_LEFT_UPPER_ARM" Offset="0x3168" />
-        <Limb Name="gSthLeftForearmLimb" Type="Standard" EnumName="STH_LIMB_LEFT_FOREARM" Offset="0x3174" />
-        <Limb Name="gSthLeftHandLimb" Type="Standard" EnumName="STH_LIMB_LEFT_HAND" Offset="0x3180" />
-        <Limb Name="gSthRightUpperArmLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_UPPER_ARM" Offset="0x318C" />
-        <Limb Name="gSthRightForearmLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_FOREARM" Offset="0x3198" />
-        <Limb Name="gSthRightHandLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_HAND" Offset="0x31A4" />
-        <!-- EnSth2 uses this head, EnSth1 has a replacement head embedded in its overlay. -->
-        <Limb Name="gSthHeadLimb" Type="Standard" EnumName="STH_LIMB_HEAD" Offset="0x31B0" />
-        <Skeleton Name="gSthSkel" Type="Flex" LimbType="Standard" LimbNone="STH_LIMB_NONE" LimbMax="STH_LIMB_MAX" EnumName="ObjectSthLimb" Offset="0x31F8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stk.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stk.xml
deleted file mode 100644
index eccbbb3a1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stk.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<Root>
-    <!-- Assets for Skull Kid, including a small number of animations. Most animations are in object_stk2 and object_stk3. -->
-    <File Name="object_stk" Segment="6">
-        <Animation Name="gSkullKidLookAroundAnim" Offset="0x1030" /> <!-- Original name is "kyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="gSkullKidCallDownMoonStartAnim" Offset="0x2774" /> <!-- Original name is "sk_moon_hikiyose" ("draw or pull the moon") -->
-        <Animation Name="gSkullKidCallDownMoonLoopAnim" Offset="0x3068" /> <!-- Original name is "sk_moon_hikiyose_loop" -->
-
-        <!-- DisplayLists for an unused Link Mask -->
-        <DList Name="gSkullKidLinkMask1DL" Offset="0x39A0" />
-        <DList Name="gSkullKidLinkMask2DL" Offset="0x46B0" />
-        <DList Name="gSkullKidLinkMask3DL" Offset="0x53C0" />
-
-        <!-- Majora's Mask Eyes DisplayList and Texture -->
-        <DList Name="gSkullKidMajorasMaskEyesDL" Offset="0x5870" />
-        <Texture Name="gSkullKidMajorasMaskEyeTex" OutName="skull_kid_majoras_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x5920" />
-
-        <!-- DisplayLists for Majora's Mask -->
-        <DList Name="gSkullKidMajorasMask1DL" Offset="0x6BB0" />
-        <DList Name="gSkullKidMajorasMask2DL" Offset="0x79F0" />
-
-        <!-- Unused Eyes DisplayList and Texture -->
-        <DList Name="gSkullKidUnusedEyesDL" Offset="0x7E10" />
-        <Texture Name="gSkullKidUnusedEyeTex" OutName="skull_kid_unused_eye" Format="rgba16" Width="8" Height="8" Offset="0x7EA0" /> <!-- Duplicate of gSkullKidEyeTex -->
-
-        <!-- Various Hand DisplayLists -->
-        <DList Name="gSkullKidUntexturedLeftHandDL" Offset="0x84C0" />
-        <DList Name="gSkullKidOpenLeftHandDL" Offset="0x87B0" />
-        <DList Name="gSkullKidFluteHoldingLeftHandDL" Offset="0x8A80" />
-        <DList Name="gSkullKidTwoFingersExtendedLeftHandDL" Offset="0x90C0" />
-        <DList Name="gSkullKidMaskHoldingRightHandDL" Offset="0x9710" />
-        <DList Name="gSkullKidUntexturedRightHandDL" Offset="0x9AC0" />
-        <DList Name="gSkullKidOcarinaHoldingRightHandDL" Offset="0x9DA0" />
-
-        <!-- Head DisplayLists with two different expressions -->
-        <DList Name="gSkullKidNormalEyesDL" Offset="0xA530" />
-        <DList Name="gSkullKidNormalHeadDL" Offset="0xA5C0" />
-        <DList Name="gSkullKidLaughingEyesDL" Offset="0xAE30" />
-        <DList Name="gSkullKidLaughingHeadDL" Offset="0xAEC0" />
-
-        <Animation Name="gSkullKidTelescopeLookUpStartAnim" Offset="0xBB2C" /> <!-- Original name is "stk_miageru" ("look up") -->
-        <Animation Name="gSkullKidTelescopeLookUpLoopAnim" Offset="0xC964" /> <!-- Original name is "stk_miageru_loop" -->
-        <DList Name="gSkullKidOcarinaOfTimeDL" Offset="0xCAD0" />
-        <Animation Name="gSkullKidTPoseAnim" Offset="0xCC94" /> <!-- Original name is "stk_pause" -->
-
-        <!-- Skull Kid Limb DisplayLists -->
-        <DList Name="gSkullKidTorsoDL" Offset="0xF6F0" />
-        <DList Name="gSkullKidNeckDL" Offset="0xF8B8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gSkullKidHeadWithLipsDL" Offset="0xF908" /> <!-- Unused in the final game. Has lips instead of beak, similar to how he looks in OoT. -->
-        <DList Name="gSkullKidHatBrimDL" Offset="0xFA78" />
-        <DList Name="gSkullKidHatRingsDL" Offset="0xFBD0" />
-        <DList Name="gSkullKidHatNarrowSectionDL" Offset="0xFCE8" />
-        <DList Name="gSkullKidHatTopDL" Offset="0xFDF8" />
-        <DList Name="gSkullKidRightUpperArmDL" Offset="0xFF30" />
-        <DList Name="gSkullKidRightForearmDL" Offset="0x10230" />
-        <DList Name="gSkullKidRightHandDL" Offset="0x10428" />
-        <DList Name="gSkullKidLeftUpperArmDL" Offset="0x10560" />
-        <DList Name="gSkullKidLeftForearmDL" Offset="0x10868" />
-        <DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x10A50" />
-        <DList Name="gSkullKidPelvisDL" Offset="0x10C60" />
-        <DList Name="gSkullKidLeftThighDL" Offset="0x10E30" />
-        <DList Name="gSkullKidLeftShinDL" Offset="0x11080" />
-        <DList Name="gSkullKidLeftFootDL" Offset="0x111A8" />
-        <DList Name="gSkullKidRightThighDL" Offset="0x112F0" />
-        <DList Name="gSkullKidRightShinDL" Offset="0x11560" />
-        <DList Name="gSkullKidRightFootDL" Offset="0x11688" />
-
-        <!-- Unused Empty Texture Animation -->
-        <TextureAnimation Name="gSkullKidEmptyTexAnim" Offset="0x117D0" />
-
-        <!-- Skull Kid Textures -->
-        <Texture Name="gSkullKidClothingFringeTex" OutName="skull_kid_clothing_fringe" Format="rgba16" Width="32" Height="16" Offset="0x117D8" />
-        <Texture Name="gSkullKidRingTex" OutName="skull_kid_ring" Format="rgba16" Width="32" Height="16" Offset="0x11BD8" />
-        <Texture Name="gSkullKidOoTStyleMouthTex" OutName="skull_kid_oot_style_mouth" Format="rgba16" Width="16" Height="16" Offset="0x11FD8" />
-        <Texture Name="gSkullKidPantsAndWristsTex" OutName="skull_kid_pants_and_wrists" Format="rgba16" Width="16" Height="16" Offset="0x121D8" />
-        <Texture Name="gSkullKidSkinTex" OutName="skull_kid_skin" Format="rgba16" Width="16" Height="16" Offset="0x123D8" />
-        <Texture Name="gSkullKidShawlTex" OutName="skull_kid_shawl" Format="rgba16" Width="32" Height="32" Offset="0x125D8" />
-        <Texture Name="gSkullKidShoeTex" OutName="skull_kid_shoe" Format="rgba16" Width="32" Height="16" Offset="0x12DD8" />
-
-        <!-- Skull Kid Limbs -->
-        <Limb Name="gSkullKidRootLimb" Type="Standard" EnumName="SKULL_KID_LIMB_ROOT" Offset="0x131D8" />
-        <Limb Name="gSkullKidPelvisLimb" Type="Standard" EnumName="SKULL_KID_LIMB_PELVIS" Offset="0x131E4" />
-        <Limb Name="gSkullKidRightThighLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_THIGH" Offset="0x131F0" />
-        <Limb Name="gSkullKidRightShinLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_SHIN" Offset="0x131FC" />
-        <Limb Name="gSkullKidRightFootLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_FOOT" Offset="0x13208" />
-        <Limb Name="gSkullKidLeftThighLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_THIGH" Offset="0x13214" />
-        <Limb Name="gSkullKidLeftShinLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_SHIN" Offset="0x13220" />
-        <Limb Name="gSkullKidLeftFootLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_FOOT" Offset="0x1322C" />
-        <Limb Name="gSkullKidTorsoLimb" Type="Standard" EnumName="SKULL_KID_LIMB_TORSO" Offset="0x13238" />
-        <Limb Name="gSkullKidLeftUpperArmLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_UPPER_ARM" Offset="0x13244" />
-        <Limb Name="gSkullKidLeftForearmLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_FOREARM" Offset="0x13250" />
-        <Limb Name="gSkullKidLeftHandLimb" Type="Standard" EnumName="SKULL_KID_LIMB_LEFT_HAND" Offset="0x1325C" />
-        <Limb Name="gSkullKidRightUpperArmLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_UPPER_ARM" Offset="0x13268" />
-        <Limb Name="gSkullKidRightForearmLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_FOREARM" Offset="0x13274" />
-        <Limb Name="gSkullKidRightHandLimb" Type="Standard" EnumName="SKULL_KID_LIMB_RIGHT_HAND" Offset="0x13280" />
-        <Limb Name="gSkullKidNeckLimb" Type="Standard" EnumName="SKULL_KID_LIMB_NECK" Offset="0x1328C" />
-        <Limb Name="gSkullKidHeadLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HEAD" Offset="0x13298" />
-        <Limb Name="gSkullKidHatBrimLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HAT_BRIM" Offset="0x132A4" />
-        <Limb Name="gSkullKidHatRingsLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HAT_RINGS" Offset="0x132B0" />
-        <Limb Name="gSkullKidHatNarrowSectionLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HAT_NARROW_SECTION" Offset="0x132BC" />
-        <Limb Name="gSkullKidHatTopLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HAT_TOP" Offset="0x132C8" />
-
-        <!-- Skull Kid Skeleton -->
-        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" LimbNone="SKULL_KID_LIMB_NONE" LimbMax="SKULL_KID_LIMB_MAX" EnumName="SkullKidLimb" Offset="0x13328" />
-
-        <Animation Name="gSkullKidHipShakeAndJumpAnim" Offset="0x14920" /> <!-- Original name is "stk_penpen_jump" ("spanking") -->
-        <Animation Name="gSkullKidSpankAnim" Offset="0x15028" /> <!-- Original name is "stk_penpen_loop" -->
-        <Animation Name="gSkullKidBentOverHeadTwitchAnim" Offset="0x15C14" /> <!-- Original name is "stk_rari_loop" -->
-        <Animation Name="gSkullKidBentOverLookUpAnim" Offset="0x16508" /> <!-- Original name is "stk_rarimiage" -->
-
-        <DList Name="gSkullKidFluteDL" Offset="0x16620" />
-
-        <Texture Name="gSkullKidLinkMaskEyeTex" OutName="skull_kid_link_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x16720" />
-        <Texture Name="gSkullKidLinkMaskNoseTex" OutName="skull_kid_link_mask_nose" Format="rgba16" Width="16" Height="8" Offset="0x16F20" />
-        <Texture Name="gSkullKidLinkMaskMouthTex" OutName="skull_kid_link_mask_mouth" Format="rgba16" Width="32" Height="16" Offset="0x17020" />
-        <Texture Name="gSkullKidLinkMaskHairTex" OutName="skull_kid_link_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x17420" />
-        <Texture Name="gSkullKidLinkMaskHatTex" OutName="skull_kid_link_mask_hat" Format="rgba16" Width="8" Height="16" Offset="0x17620" />
-        <Texture Name="gSkullKidLinkMaskEarTex" OutName="skull_kid_link_mask_ear" Format="rgba16" Width="16" Height="16" Offset="0x17720" />
-        <Texture Name="gSkullKidUnusedMajorasMaskEyeTex" OutName="skull_kid_unused_majoras_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x17920" /> <!-- Duplicate of gSkullKidMajorasMaskEyeTex -->
-        <Texture Name="gSkullKidMajorasMaskFaceTex" OutName="skull_kid_majoras_mask_face" Format="rgba16" Width="32" Height="64" Offset="0x18120" />
-        <Texture Name="gSkullKidMajorasMaskSpikes1Tex" OutName="skull_kid_majoras_mask_spikes_1" Format="rgba16" Width="16" Height="16" Offset="0x19120" />
-        <Texture Name="gSkullKidMajorasMaskSpikes2Tex" OutName="skull_kid_majoras_mask_spikes_2" Format="rgba16" Width="16" Height="16" Offset="0x19320" />
-        <Texture Name="gSkullKidMajorasMaskSpikes3Tex" OutName="skull_kid_majoras_mask_spikes_3" Format="rgba16" Width="16" Height="16" Offset="0x19520" />
-        <Texture Name="gSkullKidMajorasMaskSpikes4Tex" OutName="skull_kid_majoras_mask_spikes_4" Format="rgba16" Width="16" Height="16" Offset="0x19720" />
-        <Texture Name="gSkullKidMajorasMaskBackTex" OutName="skull_kid_majoras_mask_back" Format="rgba16" Width="32" Height="32" Offset="0x19920" />
-        <Texture Name="gSkullKidUnusedEye2Tex" OutName="skull_kid_unused_eye2" Format="rgba16" Width="8" Height="8" Offset="0x1A120" /> <!-- Duplicate of gSkullKidEyeTex -->
-        <Texture Name="gSkullKidHandTex" OutName="skull_kid_hand" Format="rgba16" Width="16" Height="32" Offset="0x1A1A0" />
-        <Texture Name="gSkullKidEyeTex" OutName="skull_kid_eye" Format="rgba16" Width="8" Height="8" Offset="0x1A5A0" />
-        <Texture Name="gSkullKidBeakTex" OutName="skull_kid_beak" Format="rgba16" Width="16" Height="16" Offset="0x1A620" />
-        <Texture Name="gSkullKidHeadSkinTex" OutName="skull_kid_head_skin" Format="rgba16" Width="16" Height="16" Offset="0x1A820" />
-        <Texture Name="gSkullKidOcarinaOfTimeTex" OutName="skull_kid_ocarina_of_time" Format="rgba16" Width="32" Height="16" Offset="0x1AA20" />
-        <Texture Name="gSkullKidFluteTex" OutName="skull_kid_flute" Format="rgba16" Width="8" Height="8" Offset="0x1AE20" />
-        <Texture Name="gSkullKidFluteHoleTex" OutName="skull_kid_flute_hole" Format="ia16" Width="16" Height="8" Offset="0x1AEA0" />
-
-        <Animation Name="gSkullKidShakeHeadAnim" Offset="0x1C21C" /> <!-- Original name is "wait_1" -->
-        <Animation Name="gSkullKidIdleAnim" Offset="0x1D008" /> <!-- Original name is "wait_2" -->
-        <Animation Name="gSkullKidWalkAnim" Offset="0x1D3D0" /> <!-- Original name is "walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stk2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stk2.xml
deleted file mode 100644
index d526bbc5c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stk2.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<Root>
-    <!-- Most of Skull Kid's animations, as well as assets for his curse effects and the Ocarina in the Clock Tower. -->
-    <File Name="object_stk2" Segment="6">
-        <!-- Skull Kid Animations -->
-        <Animation Name="gSkullKidCurseStartAnim" Offset="0x55C" /> <!-- Original name is "kubi_katakata" ("neck clack/rattle") -->
-        <!-- <Blob Name="object_stk2_Blob_00056C" Size="0x24" Offset="0x56C" /> -->
-        <Animation Name="gSkullKidCurseLoopAnim" Offset="0x130C" /> <!-- Original name is "kubi_katakata_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_00131C" Size="0x54" Offset="0x131C" /> -->
-        <Animation Name="gSkullKidHorseRideStartAnim" Offset="0x35C8" /> <!-- Original name is "lost_horse" -->
-        <Animation Name="gSkullKidHorseRideAndRotateAnim" Offset="0x4580" /> <!-- Original name is "lost_horse2" -->
-        <!-- <Blob Name="object_stk2_Blob_004590" Size="0x50" Offset="0x4590" /> -->
-        <Animation Name="gSkullKidHorseRideLoopAnim" Offset="0x49C8" /> <!-- Original name is "lost_horse_wait" -->
-        <Animation Name="gSkullKidGlitchyHorseRideStartAnim" Offset="0x70DC" /> <!-- Original name is "lost_house" -->
-
-        <!-- Assets for the curse effect overlayed on top of Majora's Mask when Skull Kid curses Link -->
-        <DList Name="gSkullKidMajorasMaskCurseOverlayDL" Offset="0x7840" />
-        <Texture Name="gSkullKidMajorasMaskCurseOverlayMaskTex" OutName="skull_kid_majoras_mask_curse_overlay_mask" Format="i8" Width="32" Height="32" Offset="0x7A48" />
-        <Texture Name="gSkullKidMajorasMaskCurseOverlayElectricityTex" OutName="skull_kid_majoras_mask_curse_overlay_electricity" Format="i8" Width="32" Height="64" Offset="0x7E48" />
-        <TextureAnimation Name="gSkullKidMajorasMaskCurseOverlayTexAnim" Offset="0x8658" />
-
-        <!-- Assets for the effects displayed on the sides of the screen when Skull Kid curses Link or calls down the moon -->
-        <DList Name="object_stk2_DL_008920" Offset="0x8920" />
-        <DList Name="object_stk2_DL_008A38" Offset="0x8A38" />
-        <Texture Name="object_stk2_Tex_008B50" OutName="tex_008B50" Format="i8" Width="32" Height="64" Offset="0x8B50" />
-        <Texture Name="object_stk2_Tex_009350" OutName="tex_009350" Format="i8" Width="32" Height="32" Offset="0x9350" />
-        <Texture Name="object_stk2_Tex_009750" OutName="tex_009750" Format="i8" Width="32" Height="64" Offset="0x9750" />
-        <TextureAnimation Name="object_stk2_Matanimheader_009F60" Offset="0x9F60" />
-
-        <!-- Clock Tower Ocarina Animations -->
-        <Animation Name="gClockTowerOcarinaOfTimeFallAnim" Offset="0xA104" /> <!-- Original name is "ok_otosu" ("to fall") -->
-        <Animation Name="gClockTowerOcarinaOfTimeHitGroundAnim" Offset="0xA2BC" /> <!-- Original name is "ok_rakka" ("falling down (from a high place)") -->
-        <Animation Name="gClockTowerOcarinaOfTimeTurnAroundAnim" Offset="0xA4C4" /> <!-- Original name is "ok_skypon" ("pon" = onomatopoeic for lightly hitting something, probably representing the sound that plays) -->
-        <Animation Name="gClockTowerOcarinaOfTimeJuggleAnim" Offset="0xA6D4" /> <!-- Original name is "ok_skypon_loop" -->
-
-        <!-- Clock Tower Ocarina Limb DisplayLists -->
-        <DList Name="gClockTowerOcarinaOfTimeDL" Offset="0xA840" />
-
-        <!-- Clock Tower Ocarina Textures -->
-        <Texture Name="gClockTowerOcarinaOfTimeTex" OutName="clock_tower_ocarina_of_time" Format="rgba16" Width="32" Height="16" Offset="0xA958" />
-
-        <!-- Clock Tower Ocarina Limbs -->
-        <Limb Name="gClockTowerOcarinaOfTimeRootLimb" Type="Standard" EnumName="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_ROOT" Offset="0xAD58" />
-
-        <!-- Clock Tower Ocarina Skeleton -->
-        <Skeleton Name="gClockTowerOcarinaOfTimeSkel" Type="Flex" LimbType="Standard" LimbNone="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_NONE" LimbMax="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_MAX" EnumName="ClockTowerOcarinaOfTimeLimb" Offset="0xAD68" />
-
-        <!-- Skull Kid Animations -->
-        <Animation Name="gSkullKidLaughStartAnim" Offset="0xC270" /> <!-- Original name is "oowarai" ("laughing loudly") -->
-        <!-- <Blob Name="object_stk2_Blob_00C280" Size="0x60" Offset="0xC280" /> -->
-        <Animation Name="gSkullKidLaughLoopAnim" Offset="0xCBB8" /> <!-- Original name is "oowarai_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_00CBC8" Size="0x28" Offset="0xCBC8" /> -->
-        <Animation Name="gSkullKidRecliningFloatAnim" Offset="0xD830" /> <!-- Original name is "situkoi_wait" ("being stubborn or persistant" or "being fixated on something, obsession") -->
-        <!-- <Blob Name="object_stk2_Blob_00D840" Size="0x50" Offset="0xD840" /> -->
-        <Animation Name="gSkullKidHoldHeadAndShakeStartAnim" Offset="0xE6EC" /> <!-- Original name is "sk_atama" ("head") -->
-        <Animation Name="gSkullKidHoldHeadAndShakeLoopAnim" Offset="0xEEC0" /> <!-- Original name is "sk_atama_loop" -->
-        <Animation Name="gSkullKidSmackFairyStartAnim" Offset="0x101A4" /> <!-- Original name is "sk_elf_hataku" ("elf hit/smack/strike") -->
-        <Animation Name="gSkullKidSmackFairyLoopAnim" Offset="0x10B60" /> <!-- Original name is "sk_elf_hataku_loop" -->
-        <Animation Name="gSkullKidSurpriseStartAnim" Offset="0x110B4" /> <!-- Original name is "sk_koe_kizuku" ("become aware of a voice") -->
-        <Animation Name="gSkullKidSurpriseLoopAnim" Offset="0x11FB0" /> <!-- Original name is "sk_koe_kizuku_loop" -->
-        <Animation Name="gSkullKidLookAroundForGiantsStartAnim" Offset="0x12A58" /> <!-- Original name is "sk_kyojin_sagasu" ("searching for giants") -->
-        <Animation Name="gSkullKidLookAroundForGiantsLoopAnim" Offset="0x141E4" /> <!-- Original name is "sk_kyojin_sagasu_loop" -->
-        <Animation Name="gSkullKidPickUpOcarinaAndStartPlayingAnim" Offset="0x16910" /> <!-- Original name is "sk_ok_fuku" ("playing ocarina") -->
-        <!-- <Blob Name="object_stk2_Blob_016920" Size="0xC0" Offset="0x16920" /> -->
-        <Animation Name="gSkullKidPlayOcarinaAndLaughAnim" Offset="0x18ED0" /> <!-- Original name is "sk_ok_fuku_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_018EE0" Size="0xC0" Offset="0x18EE0" /> -->
-        <Animation Name="gSkullKidHideOcarinaStartAnim" Offset="0x1AA80" /> <!-- Original name is "sk_ok_kakusu" ("hiding/concealing ocarina") -->
-        <Animation Name="gSkullKidJumpWhileHidingOcarinaAnim" Offset="0x1C114" /> <!-- Original name is "sk_ok_kakusu_jump" -->
-        <!-- <Blob Name="object_stk2_Blob_01C124" Size="0x6C" Offset="0x1C124" /> -->
-        <Animation Name="gSkullKidHideOcarinaLoopAnim" Offset="0x1D07C" /> <!-- Original name is "sk_ok_kakusu_wait" -->
-        <Animation Name="gSkullKidPickUpOcarinaAnim" Offset="0x1DDE0" /> <!-- Original name is "sk_ok_miru" ("looking at/seeing the ocarina") -->
-        <!-- <Blob Name="object_stk2_Blob_01DDF0" Size="0x40" Offset="0x1DDF0" /> -->
-        <Animation Name="gSkullKidLookAtOcarinaAnim" Offset="0x1EF50" /> <!-- Original name is "sk_ok_miru_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_01EF60" Size="0x50" Offset="0x1EF60" /> -->
-        <Animation Name="gSkullKidDropOcarinaAnim" Offset="0x1F9E4" /> <!-- Original name is "sk_ok_otosu" ("dropping the ocarina") -->
-        <Animation Name="gSkullKidPlayOcarinaWhileFloatingAnim" Offset="0x20CAC" /> <!-- Original name is "sk_ok_skyplay" -->
-        <Animation Name="gSkullKidFloatingTurnAroundAnim" Offset="0x2200C" /> <!-- Original name is "sk_ok_skypon" ("pon" = onomatopoeic for lightly hitting something, probably representing the sound that plays) -->
-        <Animation Name="gSkullKidOcarinaJuggleAnim" Offset="0x2336C" /> <!-- Original name is "sk_ok_skypon_loop" -->
-        <Animation Name="gSkullKidRaiseMaskStartAnim" Offset="0x259F4" /> <!-- Original name is "sk_omenage" ("mask raise") -->
-        <!-- <Blob Name="object_stk2_Blob_025A04" Size="0xCC" Offset="0x25A04" /> -->
-        <Animation Name="gSkullKidRaiseMaskLoopAnim" Offset="0x266C8" /> <!-- Original name is "sk_omenage_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_0266D8" Size="0x48" Offset="0x266D8" /> -->
-        <Animation Name="gSkullKidLowerMaskAnim" Offset="0x26CF4" /> <!-- Original name is "sk_omensage" ("mask lower") -->
-        <!-- <Blob Name="object_stk2_Blob_026D04" Size="0x1C" Offset="0x26D04" /> -->
-        <Animation Name="gSkullKidHoldHeadAndScreamStartAnim" Offset="0x27CF4" /> <!-- Original name is "sk_sakebu" ("letting out a loud voice") -->
-        <Animation Name="gSkullKidHoldHeadAndScreamLoopAnim" Offset="0x28F28" /> <!-- Original name is "sk_sakebu_loop" -->
-        <Animation Name="gSkullKidFloatingArmsCrossedAnim" Offset="0x29A04" /> <!-- Original name is "sk_sky_taiki" ("standing by") -->
-        <Animation Name="gSkullKidHitByBubbleAnim" Offset="0x2A2D8" /> <!-- Original name is "sk_syabon_otosu" ("bubble fall") -->
-        <Animation Name="gSkullKidDeflectAttackAnim" Offset="0x2AD54" /> <!-- Original name is "sk_sybonn_hajiku" ("bubble repel") -->
-        <Animation Name="gSkullKidKickOverLinkAnim" Offset="0x2DC64" /> <!-- Original name is "sk_uragaesu" ("turn over") -->
-        <!-- <Blob Name="object_stk2_Blob_02DC74" Size="0xDC" Offset="0x2DC74" /> -->
-        <Animation Name="gSkullKidSearchLinkAnim" Offset="0x2E9A0" /> <!-- Original name is "sk_uragaesu_wait" -->
-        <!-- <Blob Name="object_stk2_Blob_02E9B0" Size="0x40" Offset="0x2E9B0" /> -->
-        <Animation Name="gSkullKidPlayFluteAnim" Offset="0x2FA70" /> <!-- Original name is "stk_fue_loop" ("flute") -->
-        <Animation Name="gSkullKidShiverAnim" Offset="0x3021C" /> <!-- Original name is "stk_furueru" ("to shiver/tremble") -->
-        <Animation Name="gSkullKidSearchMaskSalesmanAnim" Offset="0x31210" /> <!-- Original name is "stk_gosogoso" (onomatopoeic for "objects rubbing together, rustling") -->
-        <Animation Name="gSkullKidHoldUpMaskStartAnim" Offset="0x322FC" /> <!-- Original name is "stk_kakageru" ("holding up/hoisting something") -->
-        <Animation Name="gSkullKidHoldUpMaskLoopAnim" Offset="0x32AE0" /> <!-- Original name is "stk_kakageru_loop" -->
-        <Animation Name="gSkullKidHuddleWithFairiesAnim" Offset="0x3323C" /> <!-- Original name is "stk_miwoyoseau" ("huddling next to others to keep warm") -->
-        <Animation Name="gSkullKidDroppedFromMaskAnim" Offset="0x34FD8" /> <!-- Original name is "stk_rakka" ("falling down (from a high place)") -->
-        <Animation Name="gSkullKidDrawAnim" Offset="0x36964" /> <!-- Original name is "stk_rakugaki" ("graffiti") -->
-        <Animation Name="gSkullKidCartwheelAnim" Offset="0x37B94" /> <!-- Original name is "stk_sokuten" ("cartwheel") -->
-        <Animation Name="gSkullKidDangleFromMaskStartAnim" Offset="0x3967C" /> <!-- Original name is "stk_tyubura" ("to dangle in midair") -->
-        <Animation Name="gSkullKidDangleFromMaskLoopAnim" Offset="0x3A8F8" /> <!-- Original name is "stk_tyubura_loop" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stk3.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stk3.xml
deleted file mode 100644
index 7b45bf201..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stk3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Animations for Skull Kid for the game's ending. -->
-    <File Name="object_stk3" Segment="6">
-        <Animation Name="gSkullKidSniffAnim" Offset="0x1374" /> <!-- Original name is "stk_kaoyose" ("face close") -->
-        <Animation Name="gSkullKidLaughAfterSniffAnim" Offset="0x1EDC" /> <!-- Original name is "stk_kaoyose_loop" -->
-        <Animation Name="gSkullKidAshamedStartAnim" Offset="0x2CD8" /> <!-- Original name is "stk_kataf" (maybe a shortened combination of "rattle" and "tremble"?) -->
-        <Animation Name="gSkullKidAshamedLoopAnim" Offset="0x39F0" /> <!-- Original name is "stk_kataf_loop" -->
-        <Animation Name="gSkullKidLookLeftStartAnim" Offset="0x4554" /> <!-- Original name is "stk_migim" ("face right", which is correct if looking at Skull Kid) -->
-        <Animation Name="gSkullKidLookLeftLoopAnim" Offset="0x51C0" /> <!-- Original name is "stk_migim_loop" -->
-        <Animation Name="gSkullKidLookUpAtGiantsAnim" Offset="0x5F44" /> <!-- Original name is "stk_uemuki" ("facing up") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stream.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stream.xml
deleted file mode 100644
index 2e49af916..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_stream.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <!-- Used for the unused water vortex actor. -->
-    <File Name="object_stream" Segment="6">
-        <Texture Name="gWaterVortexTex" OutName="water_vortex" Format="i4" Width="64" Height="64" Offset="0x0" />
-        <DList Name="gWaterVortexDL" Offset="0x950" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_syokudai.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_syokudai.xml
deleted file mode 100644
index 84b9c8bca..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_syokudai.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="assets/objects/gameplay_dangeon_keep/"/>
-    <File Name="object_syokudai" Segment="6">
-        <DList Name="gObjectSyokudaiTypeSwitchCausesFlameDL" Offset="0x3A0" />
-        <DList Name="gObjectSyokudaiTypeNoSwitchDL" Offset="0x870" />
-        <DList Name="gObjectSyokudaiTypeFlameCausesSwitchDL" Offset="0xB90" />
-        <Texture Name="object_syokudai_Tex_000C90" OutName="tex_000C90" Format="rgba16" Width="32" Height="32" Offset="0xC90" />
-        <Texture Name="object_syokudai_Tex_001490" OutName="tex_001490" Format="rgba16" Width="32" Height="64" Offset="0x1490" />
-        <Texture Name="object_syokudai_Tex_002490" OutName="tex_002490" Format="rgba16" Width="32" Height="32" Offset="0x2490" />
-        <Texture Name="object_syokudai_Tex_002C90" OutName="tex_002C90" Format="rgba16" Width="32" Height="32" Offset="0x2C90" />
-        <Texture Name="object_syokudai_Tex_003490" OutName="tex_003490" Format="rgba16" Width="16" Height="64" Offset="0x3490" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_syoten.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_syoten.xml
deleted file mode 100644
index eefe0d7b6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_syoten.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<Root>
-    <File Name="object_syoten" Segment="6">
-        <KeyFrameAnimation Name="gSyotenKFAnim_023C" Skel="0x1328" Offset="0x023C"/>
-        <DList Name="object_syoten_DL_000450" Offset="0x450" />
-        <DList Name="object_syoten_DL_000518" Offset="0x518" />
-        <DList Name="object_syoten_DL_0005E0" Offset="0x5E0" />
-        <DList Name="object_syoten_DL_0006A8" Offset="0x6A8" />
-        <DList Name="object_syoten_DL_000770" Offset="0x770" />
-        <DList Name="object_syoten_DL_000838" Offset="0x838" />
-        <DList Name="object_syoten_DL_000900" Offset="0x900" />
-        <DList Name="object_syoten_DL_0009C8" Offset="0x9C8" />
-        <Texture Name="object_syoten_Tex_000A90" OutName="tex_000A90" Format="i8" Width="32" Height="32" Offset="0xA90" />
-        <Texture Name="object_syoten_Tex_000E90" OutName="tex_000E90" Format="i8" Width="32" Height="32" Offset="0xE90" />
-        <TextureAnimation Name="object_syoten_Matanimheader_001298" Offset="0x1298" />
-
-        <KeyFrameSkel Name="gSyotenKFSkel_1328" LimbType="Flex" Offset="0x1328"/>
-        <DList Name="object_syoten_DL_001370" Offset="0x1370" />
-        <TextureAnimation Name="object_syoten_Matanimheader_001448" Offset="0x1448" />
-        <DList Name="object_syoten_DL_001730" Offset="0x1730" />
-        <DList Name="object_syoten_DL_0018A0" Offset="0x18A0" />
-        <TextureAnimation Name="object_syoten_Matanimheader_0018B8" Offset="0x18B8" />
-        <Array Name="object_syotenVtx_0018C0" Count="81" Offset="0x18C0">
-            <Vtx/>
-        </Array>
-        <DList Name="object_syoten_DL_001DD0" Offset="0x1DD0" />
-        <DList Name="object_syoten_DL_002018" Offset="0x2018" />
-        <DList Name="object_syoten_DL_002880" Offset="0x2880" />
-        <DList Name="object_syoten_DL_002A20" Offset="0x2A20" />
-        <TextureAnimation Name="object_syoten_Matanimheader_002B88" Offset="0x2B88" />
-        <TextureAnimation Name="object_syoten_Matanimheader_002B98" Offset="0x2B98" />
-        <Texture Name="object_syoten_Tex_002BA0" OutName="tex_002BA0" Format="i8" Width="32" Height="32" Offset="0x2BA0" />
-        <Texture Name="object_syoten_Tex_002FA0" OutName="tex_002FA0" Format="i8" Width="32" Height="32" Offset="0x2FA0" />
-        <Texture Name="object_syoten_Tex_0033A0" OutName="tex_0033A0" Format="i8" Width="16" Height="128" Offset="0x33A0" />
-        <Texture Name="object_syoten_Tex_003BA0" OutName="tex_003BA0" Format="i4" Width="32" Height="32" Offset="0x3BA0" />
-        <Texture Name="object_syoten_Tex_003DA0" OutName="tex_003DA0" Format="i8" Width="32" Height="64" Offset="0x3DA0" />
-        <Texture Name="object_syoten_Tex_0045A0" OutName="tex_0045A0" Format="i8" Width="32" Height="64" Offset="0x45A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tab.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tab.xml
deleted file mode 100644
index 0a984b284..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tab.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<Root>
-    <File Name="object_tab" Segment="6">
-        <Animation Name="object_tab_Anim_000758" Offset="0x758" />
-        <DList Name="object_tab_DL_003E10" Offset="0x3E10" />
-        <DList Name="object_tab_DL_003EF0" Offset="0x3EF0" />
-        <DList Name="object_tab_DL_004270" Offset="0x4270" />
-        <DList Name="object_tab_DL_004438" Offset="0x4438" />
-        <DList Name="object_tab_DL_0046C8" Offset="0x46C8" />
-        <DList Name="object_tab_DL_0047F8" Offset="0x47F8" />
-        <DList Name="object_tab_DL_004B70" Offset="0x4B70" />
-        <DList Name="object_tab_DL_004E00" Offset="0x4E00" />
-        <DList Name="object_tab_DL_004F30" Offset="0x4F30" />
-        <DList Name="object_tab_DL_005178" Offset="0x5178" />
-        <DList Name="object_tab_DL_005668" Offset="0x5668" />
-        <DList Name="object_tab_DL_005758" Offset="0x5758" />
-        <DList Name="object_tab_DL_005840" Offset="0x5840" />
-        <DList Name="object_tab_DL_005988" Offset="0x5988" />
-        <DList Name="object_tab_DL_005A78" Offset="0x5A78" />
-        <DList Name="object_tab_DL_005B60" Offset="0x5B60" />
-        <Texture Name="object_tab_TLUT_005CA8" OutName="tlut_005CA8" Format="rgba16" Width="16" Height="16" Offset="0x5CA8" />
-        <Texture Name="object_tab_Tex_005EA8" OutName="tex_005EA8" Format="rgba16" Width="16" Height="16" Offset="0x5EA8" />
-        <Texture Name="object_tab_Tex_0060A8" OutName="tex_0060A8" Format="ci8" Width="8" Height="16" Offset="0x60A8" />
-        <Texture Name="object_tab_Tex_006128" OutName="tex_006128" Format="ci8" Width="16" Height="32" Offset="0x6128" />
-        <Texture Name="object_tab_Tex_006328" OutName="tex_006328" Format="ci8" Width="8" Height="8" Offset="0x6328" />
-        <Texture Name="object_tab_Tex_006368" OutName="tex_006368" Format="ci8" Width="8" Height="16" Offset="0x6368" />
-        <Texture Name="object_tab_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="8" Height="8" Offset="0x63E8" />
-        <Texture Name="object_tab_Tex_006428" OutName="tex_006428" Format="ci8" Width="32" Height="32" Offset="0x6428" />
-        <Texture Name="object_tab_Tex_006828" OutName="tex_006828" Format="ci8" Width="16" Height="16" Offset="0x6828" />
-        <Texture Name="object_tab_Tex_006928" OutName="tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6928" />
-        <Texture Name="object_tab_Tex_006D28" OutName="tex_006D28" Format="ci8" Width="32" Height="32" Offset="0x6D28" />
-        <Texture Name="object_tab_Tex_007128" OutName="tex_007128" Format="ci8" Width="16" Height="16" Offset="0x7128" />
-        <Texture Name="object_tab_Tex_007228" OutName="tex_007228" Format="ci8" Width="16" Height="16" Offset="0x7228" />
-        <Texture Name="object_tab_Tex_007328" OutName="tex_007328" Format="i8" Width="32" Height="32" Offset="0x7328" />
-        <Texture Name="object_tab_Tex_007728" OutName="tex_007728" Format="rgba16" Width="8" Height="16" Offset="0x7728" />
-        <Texture Name="object_tab_Tex_007828" OutName="tex_007828" Format="ci8" Width="8" Height="8" Offset="0x7828" />
-        <Texture Name="object_tab_Tex_007868" OutName="tex_007868" Format="ci8" Width="8" Height="16" Offset="0x7868" />
-        <Texture Name="object_tab_Tex_0078E8" OutName="tex_0078E8" Format="i8" Width="16" Height="16" Offset="0x78E8" />
-        <Texture Name="object_tab_Tex_0079E8" OutName="tex_0079E8" Format="i8" Width="8" Height="8" Offset="0x79E8" />
-        <Texture Name="object_tab_Tex_007A28" OutName="tex_007A28" Format="rgba16" Width="16" Height="16" Offset="0x7A28" />
-        <!-- <Blob Name="object_tab_Blob_007C28" Size="0x220" Offset="0x7C28" /> -->
-        <Limb Name="object_tab_Standardlimb_007E48" Type="Standard" EnumName="OBJECT_TAB_LIMB_01" Offset="0x7E48" />
-        <Limb Name="object_tab_Standardlimb_007E54" Type="Standard" EnumName="OBJECT_TAB_LIMB_02" Offset="0x7E54" />
-        <Limb Name="object_tab_Standardlimb_007E60" Type="Standard" EnumName="OBJECT_TAB_LIMB_03" Offset="0x7E60" />
-        <Limb Name="object_tab_Standardlimb_007E6C" Type="Standard" EnumName="OBJECT_TAB_LIMB_04" Offset="0x7E6C" />
-        <Limb Name="object_tab_Standardlimb_007E78" Type="Standard" EnumName="OBJECT_TAB_LIMB_05" Offset="0x7E78" />
-        <Limb Name="object_tab_Standardlimb_007E84" Type="Standard" EnumName="OBJECT_TAB_LIMB_06" Offset="0x7E84" />
-        <Limb Name="object_tab_Standardlimb_007E90" Type="Standard" EnumName="OBJECT_TAB_LIMB_07" Offset="0x7E90" />
-        <Limb Name="object_tab_Standardlimb_007E9C" Type="Standard" EnumName="OBJECT_TAB_LIMB_08" Offset="0x7E9C" />
-        <Limb Name="object_tab_Standardlimb_007EA8" Type="Standard" EnumName="OBJECT_TAB_LIMB_09" Offset="0x7EA8" />
-        <Limb Name="object_tab_Standardlimb_007EB4" Type="Standard" EnumName="OBJECT_TAB_LIMB_0A" Offset="0x7EB4" />
-        <Limb Name="object_tab_Standardlimb_007EC0" Type="Standard" EnumName="OBJECT_TAB_LIMB_0B" Offset="0x7EC0" />
-        <Limb Name="object_tab_Standardlimb_007ECC" Type="Standard" EnumName="OBJECT_TAB_LIMB_0C" Offset="0x7ECC" />
-        <Limb Name="object_tab_Standardlimb_007ED8" Type="Standard" EnumName="OBJECT_TAB_LIMB_0D" Offset="0x7ED8" />
-        <Limb Name="object_tab_Standardlimb_007EE4" Type="Standard" EnumName="OBJECT_TAB_LIMB_0E" Offset="0x7EE4" />
-        <Limb Name="object_tab_Standardlimb_007EF0" Type="Standard" EnumName="OBJECT_TAB_LIMB_0F" Offset="0x7EF0" />
-        <Limb Name="object_tab_Standardlimb_007EFC" Type="Standard" EnumName="OBJECT_TAB_LIMB_10" Offset="0x7EFC" />
-        <Limb Name="object_tab_Standardlimb_007F08" Type="Standard" EnumName="OBJECT_TAB_LIMB_11" Offset="0x7F08" />
-        <Limb Name="object_tab_Standardlimb_007F14" Type="Standard" EnumName="OBJECT_TAB_LIMB_12" Offset="0x7F14" />
-        <Limb Name="object_tab_Standardlimb_007F20" Type="Standard" EnumName="OBJECT_TAB_LIMB_13" Offset="0x7F20" />
-        <Skeleton Name="object_tab_Skel_007F78" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TAB_LIMB_NONE" LimbMax="OBJECT_TAB_LIMB_MAX" EnumName="ObjectTabLimb" Offset="0x7F78" />
-        <Animation Name="object_tab_Anim_0086AC" Offset="0x86AC" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_taisou.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_taisou.xml
deleted file mode 100644
index 0143f2444..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_taisou.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Animations for Gorons at the Racetrack -->
-    <File Name="object_taisou" Segment="6">
-        <Animation Name="gGoronAthleticsSquatSideToSideAnim" Offset="0x16C8" />
-        <Animation Name="gGoronAthleticsShakeLimbsAnim" Offset="0x283C" />
-        <Animation Name="gGoronAthleticsCheerAnim" Offset="0x2C48" />
-        <Animation Name="gGoronAthleticsShoutAnim" Offset="0x31D8" />
-        <Animation Name="gGoronAthleticsDoubleArmSideBendAnim" Offset="0x4DD4" />
-        <Animation Name="gGoronAthleticsHamstringStretchStandingAnim" Offset="0x5790" />
-        <Animation Name="gGoronAthleticsHamstringStretchSittingAnim" Offset="0x5EE0" />
-        <Animation Name="gGoronAthleticsSingleArmSideBendAnim" Offset="0x7764" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_takaraya_objects.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_takaraya_objects.xml
deleted file mode 100644
index ef1735575..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_takaraya_objects.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Assets for the Treasure Chest Shop Walls -->
-    <File Name="object_takaraya_objects" Segment="6">
-        <Texture Name="gTreasureChestShopWallWhiteTLUT" OutName="treasure_chest_shop_wall_white_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gTreasureChestShopWallBlackTex" OutName="treasure_chest_shop_wall_black" Format="rgba16" Width="32" Height="32" Offset="0x20" />
-        <Texture Name="gTreasureChestShopWallWhiteTex" OutName="treasure_chest_shop_wall_white" Format="ci4" Width="32" Height="32" Offset="0x820" />
-        <DList Name="gTreasureChestShopWallBlackDL" Offset="0xB70" />
-        <DList Name="gTreasureChestShopWallWhiteDL" Offset="0xD60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron1.xml
deleted file mode 100644
index d5ec3be03..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron1.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <!-- This file is empty -->
-    <File Name="object_tanron1" Segment="6">
-        <DList Name="gTanron1EmptyDL" Offset="0x0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron2.xml
deleted file mode 100644
index 950621c19..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron2.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <File Name="object_tanron2" Segment="6">
-        <DList Name="object_tanron2_DL_0004E0" Offset="0x4E0" />
-        <DList Name="object_tanron2_DL_000710" Offset="0x710" />
-        <DList Name="object_tanron2_DL_0007D8" Offset="0x7D8" />
-        <DList Name="object_tanron2_DL_0008A8" Offset="0x8A8" />
-        <DList Name="object_tanron2_DL_000960" Offset="0x960" />
-        <Texture Name="object_tanron2_TLUT_000A18" OutName="tlut_000A18" Format="rgba16" Width="4" Height="4" Offset="0xA18" />
-        <Texture Name="object_tanron2_TLUT_000A38" OutName="tlut_000A38" Format="rgba16" Width="4" Height="4" Offset="0xA38" />
-        <Texture Name="object_tanron2_TLUT_000A58" OutName="tlut_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" />
-        <Texture Name="object_tanron2_TLUT_000A78" OutName="tlut_000A78" Format="rgba16" Width="4" Height="4" Offset="0xA78" />
-        <Texture Name="object_tanron2_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" />
-        <Texture Name="object_tanron2_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" />
-        <Texture Name="object_tanron2_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" />
-        <Texture Name="object_tanron2_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron3.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron3.xml
deleted file mode 100644
index 05ef078d7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron3.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <File Name="object_tanron3" Segment="6">
-        <DList Name="object_tanron3_DL_0004E0" Offset="0x4E0" />
-        <DList Name="object_tanron3_DL_000710" Offset="0x710" />
-        <DList Name="object_tanron3_DL_0007D8" Offset="0x7D8" />
-        <DList Name="object_tanron3_DL_0008A8" Offset="0x8A8" />
-        <DList Name="object_tanron3_DL_000960" Offset="0x960" />
-        <Texture Name="object_tanron3_TLUT_000A18" OutName="tlut_000A18" Format="rgba16" Width="4" Height="4" Offset="0xA18" />
-        <Texture Name="object_tanron3_TLUT_000A38" OutName="tlut_000A38" Format="rgba16" Width="4" Height="4" Offset="0xA38" />
-        <Texture Name="object_tanron3_TLUT_000A58" OutName="tlut_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" />
-        <Texture Name="object_tanron3_TLUT_000A78" OutName="tlut_000A78" Format="rgba16" Width="4" Height="4" Offset="0xA78" />
-        <Texture Name="object_tanron3_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" />
-        <Texture Name="object_tanron3_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" />
-        <Texture Name="object_tanron3_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" />
-        <Texture Name="object_tanron3_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron4.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron4.xml
deleted file mode 100644
index ea342d448..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron4.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Root>
-    <!-- Assets for seagulls -->
-    <File Name="object_tanron4" Segment="6">
-        <!-- The glide animation goes unused, instead the flap animation is frozen while it glides -->
-        <Animation Name="gSeagullGlideAnim" Offset="0x58" />
-        <Animation Name="gSeagullFlapAnim" Offset="0x168" />
-
-        <DList Name="gSeagullBodyDL" Offset="0x300" />
-        <DList Name="gSeagullRightWingEndDL" Offset="0x3A0" />
-        <DList Name="gSeagullRightWingStartDL" Offset="0x440" />
-        <DList Name="gSeagullLeftWingEndDL" Offset="0x4B0" />
-        <DList Name="gSeagullLeftWingStartDL" Offset="0x550" />
-
-        <Texture Name="gSeagullBodyTex" OutName="seagull_body" Format="rgba16" Width="32" Height="16" Offset="0x5C8" />
-        <Texture Name="gSeagullWingTex" OutName="seagull_wing" Format="rgba16" Width="32" Height="16" Offset="0x9C8" />
-
-        <Limb Name="gSeagullRootLimb" Type="Standard" EnumName="SEAGULL_LIMB_ROOT" Offset="0xDC8" />
-        <Limb Name="gSeagullBodyLimb" Type="Standard" EnumName="SEAGULL_LIMB_BODY" Offset="0xDD4" />
-        <Limb Name="gSeagullLeftWingRootLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_ROOT" Offset="0xDE0" />
-        <Limb Name="gSeagullLeftWingWrapperLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_WRAPPER" Offset="0xDEC" />
-        <Limb Name="gSeagullLeftWingStartLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_START" Offset="0xDF8" />
-        <Limb Name="gSeagullLeftWingEndLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_END" Offset="0xE04" />
-        <Limb Name="gSeagullRightWingRootLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_ROOT" Offset="0xE10" />
-        <Limb Name="gSeagullRightWingWrapperLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_WRAPPER" Offset="0xE1C" />
-        <Limb Name="gSeagullRightWingStartLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_START" Offset="0xE28" />
-        <Limb Name="gSeagullRightWingEndLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_END" Offset="0xE34" />
-
-        <Skeleton Name="gSeagullSkel" Type="Flex" LimbType="Standard" LimbNone="SEAGULL_LIMB_RIGHT_WING_NONE" LimbMax="SEAGULL_LIMB_RIGHT_WING_MAX" EnumName="ObjectTanron4Limb" Offset="0xE68" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron5.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron5.xml
deleted file mode 100644
index e64a11d5d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tanron5.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <File Name="object_tanron5" Segment="6">
-        <DList Name="object_tanron5_DL_0004E0" Offset="0x4E0" />
-        <DList Name="object_tanron5_DL_000710" Offset="0x710" />
-        <DList Name="object_tanron5_DL_0007D8" Offset="0x7D8" />
-        <DList Name="object_tanron5_DL_0008A8" Offset="0x8A8" />
-        <DList Name="object_tanron5_DL_000960" Offset="0x960" />
-        <Texture Name="object_tanron5_TLUT_000A18" OutName="tlut_000A18" Format="rgba16" Width="4" Height="4" Offset="0xA18" />
-        <Texture Name="object_tanron5_TLUT_000A38" OutName="tlut_000A38" Format="rgba16" Width="4" Height="4" Offset="0xA38" />
-        <Texture Name="object_tanron5_TLUT_000A58" OutName="tlut_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" />
-        <Texture Name="object_tanron5_TLUT_000A78" OutName="tlut_000A78" Format="rgba16" Width="4" Height="4" Offset="0xA78" />
-        <Texture Name="object_tanron5_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" />
-        <Texture Name="object_tanron5_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" />
-        <Texture Name="object_tanron5_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" />
-        <Texture Name="object_tanron5_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_taru.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_taru.xml
deleted file mode 100644
index 4a23d2923..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_taru.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_taru" Segment="6">
-        <DList Name="gObjTaruBarrelDL" Offset="0x420" />
-        <Texture Name="gObjTaruBarrelSideTex" OutName="obj_taru_barrel_side" Format="rgba16" Width="16" Height="32" Offset="0x670" />
-        <Texture Name="gObjTaruBarrelTopTex" OutName="obj_taru_barrel_top" Format="rgba16" Width="32" Height="16" Offset="0xA70" />
-        <Collision Name="object_taru_Colheader_000FC8" Offset="0xFC8" />
-        <DList Name="gObjTaruBreakablePiratePanelDL" Offset="0x1140" />
-        <Texture Name="gObjTaruBreakablePiratePanelSkullTex" OutName="obj_taru_breakable_pirate_panel_skull" Format="rgba16" Width="32" Height="32" Offset="0x1230" />
-        <Texture Name="gObjTaruBreakablePiratePanelWoodTex" OutName="obj_taru_breakable_pirate_panel_wood" Format="i4" Width="32" Height="32" Offset="0x1A30" />
-        <Collision Name="object_taru_Colheader_001CB0" Offset="0x1CB0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_test3.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_test3.xml
deleted file mode 100644
index c32732b35..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_test3.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<Root>
-    <!-- Object for Kafei -->
-    <File Name="object_test3" Segment="6">
-        <!-- Textures -->
-        <Texture Name="gKafeiBody1TLUT" OutName="kafei_body_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0" />
-        <Texture Name="gKafeiBody2TLUT" OutName="kafei_body_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200" />
-        <Texture Name="gKafeiMouthTLUT" OutName="kafei_mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400" />
-        <Texture Name="gKafeiEyesTLUT" OutName="kafei_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600" />
-        <Texture Name="gKafeiSkinTex" OutName="kafei_skin" Format="ci8" Width="8" Height="8" Offset="0x800" />
-        <Texture Name="gKafeiHairTex" OutName="kafei_hair" Format="ci8" Width="8" Height="16" Offset="0x840" />
-        <Texture Name="gKafeiNoseTex" OutName="kafei_nose" Format="ci8" Width="16" Height="16" Offset="0x8C0" />
-        <Texture Name="gKafeiMouthClosedTex" OutName="kafei_mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x9C0" />
-        <Texture Name="gKafeiEyesOpenTex" OutName="kafei_eyes_open" Format="ci8" Width="64" Height="32" Offset="0xDC0" />
-        <Texture Name="gKafeiHairPartAndUndersideTex" OutName="kafei_hair_part_and_underside" Format="ci8" Width="8" Height="16" Offset="0x15C0" />
-        <Texture Name="gKafeiFingersTex" OutName="kafei_fingers" Format="ci8" Width="16" Height="16" Offset="0x1640" />
-        <Texture Name="gKafeiBootTex" OutName="kafei_boot" Format="ci8" Width="32" Height="32" Offset="0x1740" />
-        <Texture Name="gKafeiSleevePatternTex" OutName="kafei_sleeve_pattern" Format="ci8" Width="32" Height="32" Offset="0x1B40" />
-        <Texture Name="gKafeiInnerSleeveTex" OutName="kafei_inner_sleeve" Format="ci8" Width="8" Height="8" Offset="0x1F40" />
-        <Texture Name="gKafeiClothesNeckOpeningTex" OutName="kafei_clothes_neck_opening" Format="ci8" Width="32" Height="16" Offset="0x1F80" />
-        <Texture Name="gKafeiPendantOfMemoriesTex" OutName="kafei_pendant_of_memories" Format="rgba16" Width="32" Height="64" Offset="0x2180" />
-        <Texture Name="gKafeiClothesPatternTex" OutName="kafei_clothes_pattern" Format="ci8" Width="16" Height="64" Offset="0x3180" />
-        <Texture Name="gKafeiTrouserHemTex" OutName="kafei_trouser_hem" Format="ci8" Width="16" Height="16" Offset="0x3580" />
-        <Texture Name="gKafeiEyesHalfTex" OutName="kafei_eyes_half" Format="ci8" Width="64" Height="32" Offset="0x3680" />
-        <Texture Name="gKafeiEyesClosedTex" OutName="kafei_eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x3E80" />
-        <Texture Name="gKafeiEyesRollRightTex" OutName="kafei_eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x4680" />
-        <Texture Name="gKafeiEyesRollLeftTex" OutName="kafei_eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x4E80" />
-        <Texture Name="gKafeiEyesRollUpTex" OutName="kafei_eyes_roll_up" Format="ci8" Width="64" Height="32" Offset="0x5680" />
-        <Texture Name="gKafeiEyesRollDownTex" OutName="kafei_eyes_roll_down" Format="ci8" Width="64" Height="32" Offset="0x5E80" />
-        <Texture Name="object_test3_Tex_006680" OutName="tex_006680" Format="ci8" Width="64" Height="32" Offset="0x6680" /> <!-- TODO: name it after object_link_child_Tex_003800  -->
-        <Texture Name="gKafeiMouthTeethTex" OutName="kafei_mouth_teeth" Format="ci8" Width="32" Height="32" Offset="0x6E80" />
-        <Texture Name="gKafeiMouthAngryTex" OutName="kafei_mouth_angry" Format="ci8" Width="32" Height="32" Offset="0x7280" />
-        <Texture Name="gKafeiMouthHappyTex" OutName="kafei_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x7680" />
-
-        <!-- Kafei Dlists -->
-        <DList Name="gKafeiRightThighDL" Offset="0xBF10" />
-        <DList Name="gKafeiRightShinDL" Offset="0xC198" />
-        <DList Name="gKafeiRightFootDL" Offset="0xC300" />
-        <DList Name="gKafeiLeftThighDL" Offset="0xC478" />
-        <DList Name="gKafeiLeftShinDL" Offset="0xC708" />
-        <DList Name="gKafeiLeftFootDL" Offset="0xC870" />
-        <DList Name="gKafeiWaistDL" Offset="0xC9E8" />
-        <DList Name="gKafeiPendantOfMemoriesDL" Offset="0xCB60" />
-        <DList Name="gKafeiTorsoDL" Offset="0xCC20" />
-        <DList Name="gKafeiHeadDL" Offset="0xCF70" />
-        <DList Name="gKafeiNose1DL" Offset="0xD670" />
-        <DList Name="gKafeiNose2DL" Offset="0xD730" />
-        <DList Name="gKafeiRightShoulderDL" Offset="0xD7F0" />
-        <DList Name="gKafeiRightForearmDL" Offset="0xD930" />
-        <DList Name="gKafeiRightHandDL" Offset="0xDA70" />
-        <DList Name="gKafeiLeftShoulderDL" Offset="0xDCF0" />
-        <DList Name="gKafeiLeftForearmDL" Offset="0xDE30" />
-        <DList Name="gKafeiLeftHandDL" Offset="0xDF70" />
-
-        <!-- Sun Mask -->
-        <DList Name="gKafeiSunMaskDL" Offset="0xEDD0" />
-        <Texture Name="gKafeiSunMaskEyeTex" OutName="kafei_sun_mask_eye" Format="i4" Width="16" Height="16" Offset="0xF2C0" />
-        <Texture Name="gKafeiSunMaskPattern1Tex" OutName="kafei_sun_mask_pattern1" Format="i4" Width="16" Height="16" Offset="0xF340" />
-        <Texture Name="gKafeiSunMaskPattern2Tex" OutName="kafei_sun_mask_pattern2" Format="i4" Width="16" Height="16" Offset="0xF3C0" />
-        <Texture Name="gKafeiSunMaskPattern3Tex" OutName="kafei_sun_mask_pattern3" Format="i4" Width="32" Height="32" Offset="0xF440" />
-        <DList Name="gKafeiSunMaskEmptyDL" Offset="0xF640" />
-
-        <!-- Kafei Limbs -->
-        <Limb Name="gKafeiRootLimb" Type="LOD" EnumName="KAFEI_LIMB_ROOT" Offset="0xF648" />
-        <Limb Name="gKafeiWaistLimb" Type="LOD" EnumName="KAFEI_LIMB_WAIST" Offset="0xF658" />
-        <Limb Name="gKafeiLowerRootLimb" Type="LOD" EnumName="KAFEI_LIMB_LOWER_ROOT" Offset="0xF668" />
-        <Limb Name="gKafeiRightThighLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_THIGH" Offset="0xF678" />
-        <Limb Name="gKafeiRightShinLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_SHIN" Offset="0xF688" />
-        <Limb Name="gKafeiRightFootLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_FOOT" Offset="0xF698" />
-        <Limb Name="gKafeiLeftThighLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_THIGH" Offset="0xF6A8" />
-        <Limb Name="gKafeiLeftShinLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_SHIN" Offset="0xF6B8" />
-        <Limb Name="gKafeiLeftFootLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_FOOT" Offset="0xF6C8" />
-        <Limb Name="gKafeiUpperRootLimb" Type="LOD" EnumName="KAFEI_LIMB_UPPER_ROOT" Offset="0xF6D8" />
-        <Limb Name="gKafeiHeadLimb" Type="LOD" EnumName="KAFEI_LIMB_HEAD" Offset="0xF6E8" />
-        <Limb Name="gKafeiHatLimb" Type="LOD" EnumName="KAFEI_LIMB_HAT" Offset="0xF6F8" />
-        <Limb Name="gKafeiCollarLimb" Type="LOD" EnumName="KAFEI_LIMB_COLLAR" Offset="0xF708" />
-        <Limb Name="gKafeiLeftShoulderLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_SHOULDER" Offset="0xF718" />
-        <Limb Name="gKafeiLeftForearmLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_FOREARM" Offset="0xF728" />
-        <Limb Name="gKafeiLeftHandLimb" Type="LOD" EnumName="KAFEI_LIMB_LEFT_HAND" Offset="0xF738" />
-        <Limb Name="gKafeiRightShoulderLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_SHOULDER" Offset="0xF748" />
-        <Limb Name="gKafeiRightForearmLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_FOREARM" Offset="0xF758" />
-        <Limb Name="gKafeiRightHandLimb" Type="LOD" EnumName="KAFEI_LIMB_RIGHT_HAND" Offset="0xF768" />
-        <Limb Name="gKafeiSheathLimb" Type="LOD" EnumName="KAFEI_LIMB_SHEATH" Offset="0xF778" />
-        <Limb Name="gKafeiTorsoLimb" Type="LOD" EnumName="KAFEI_LIMB_TORSO" Offset="0xF788" />
-
-        <!-- Kafei Skeleton -->
-        <Skeleton Name="gKafeiSkel" Type="Flex" LimbType="Standard" LimbNone="KAFEI_LIMB_NONE" LimbMax="KAFEI_LIMB_MAX" EnumName="KafeiLimb" Offset="0xF7EC" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_thiefbird.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_thiefbird.xml
deleted file mode 100644
index 52165cb89..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_thiefbird.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<Root>
-    <!-- Assets for Takkuri -->
-    <File Name="object_thiefbird" Segment="6">
-        <!-- Takkuri Animations -->
-        <Animation Name="gTakkuriDeathAnim" Offset="0x88" /> <!-- Original name is "hnt_damage" -->
-        <Animation Name="gTakkuriFlyWithItemAnim" Offset="0x278" /> <!-- Original name is "hnt_escape" -->
-        <Animation Name="gTakkuriFlyAnim" Offset="0x604" /> <!-- Original name is "hnt_fly" -->
-
-        <!-- Takkuri Limb DisplayLists -->
-        <DList Name="gTakkuriBodyDL" Offset="0x16D0" />
-        <DList Name="gTakkuriLegsDL" Offset="0x1800" />
-        <DList Name="gTakkuriFeetDL" Offset="0x18A8" />
-        <DList Name="gTakkuriStolenItemDL" Offset="0x19D0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gTakkuriHeadDL" Offset="0x1A18" />
-        <DList Name="gTakkuriEyesDL" Offset="0x1CF0" />
-        <DList Name="gTakkuriLowerBeakDL" Offset="0x1DA8" />
-        <DList Name="gTakkuriLeftEarDL" Offset="0x1FE0" />
-        <DList Name="gTakkuriRightEarDL" Offset="0x2070" />
-        <DList Name="gTakkuriNeckDL" Offset="0x2100" />
-        <DList Name="gTakkuriRightWingTipDL" Offset="0x21D0" />
-        <DList Name="gTakkuriRightWingMiddleDL" Offset="0x22C0" />
-        <DList Name="gTakkuriRightWingBaseDL" Offset="0x23B0" />
-        <DList Name="gTakkuriLeftWingTipDL" Offset="0x24A0" />
-        <DList Name="gTakkuriLeftWingMiddleDL" Offset="0x2590" />
-        <DList Name="gTakkuriLeftWingBaseDL" Offset="0x2680" />
-
-        <!-- Takkuri Textures -->
-        <Texture Name="gTakkuriFeathersTex" OutName="takkuri_feathers" Format="rgba16" Width="8" Height="16" Offset="0x2770" />
-        <Texture Name="gTakkuriWingTipTex" OutName="takkuri_wing_tip" Format="rgba16" Width="16" Height="16" Offset="0x2870" />
-        <Texture Name="gTakkuriEyeTex" OutName="takkuri_eye" Format="rgba16" Width="16" Height="16" Offset="0x2A70" />
-        <Texture Name="gTakkuriHeadAndNeckTex" OutName="takkuri_head_and_neck" Format="i8" Width="16" Height="16" Offset="0x2C70" />
-        <Texture Name="gTakkuriBeakAndLegsTex" OutName="takkuri_beak_and_legs" Format="rgba16" Width="8" Height="8" Offset="0x2D70" />
-        <Texture Name="gTakkuriInnerBeakTex" OutName="takkuri_inner_beak" Format="rgba16" Width="4" Height="8" Offset="0x2DF0" />
-        <Texture Name="gTakkuriEarTex" OutName="takkuri_ear" Format="rgba16" Width="16" Height="16" Offset="0x2E30" />
-
-        <!-- DisplayLists and Texture for Takkuri's feather effect -->
-        <DList Name="gTakkuriFeatherMaterialDL" Offset="0x3060" />
-        <DList Name="gTakkuriFeatherModelDL" Offset="0x30D8" />
-        <Texture Name="gTakkuriFeatherTex" OutName="takkuri_feather" Format="rgba16" Width="8" Height="16" Offset="0x30F0" />
-        
-        <!-- DisplayLists for stolen items -->
-        <DList Name="gTakkuriStolenBottleDL" Offset="0x33B0" />
-        <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="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" />
-        <Texture Name="gTakkuriStolenKokiriSwordGripTex" OutName="takkuri_stolen_kokiri_sword_grip" Format="i8" Width="8" Height="8" Offset="0x5D20" />
-        <Texture Name="gTakkuriStolenRazorSwordHiltAndScabbardTex" OutName="takkuri_stolen_razor_sword_hilt_and_scabbard" Format="rgba16" Width="8" Height="16" Offset="0x5D60" />
-        <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="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" />
-        <Limb Name="gTakkuriLeftWingBaseLimb" Type="Standard" EnumName="TAKKURI_LIMB_LEFT_WING_BASE" Offset="0x60AC" />
-        <Limb Name="gTakkuriLeftWingMiddleLimb" Type="Standard" EnumName="TAKKURI_LIMB_LEFT_WING_MIDDLE" Offset="0x60B8" />
-        <Limb Name="gTakkuriLeftWingTipLimb" Type="Standard" EnumName="TAKKURI_LIMB_LEFT_WING_TIP" Offset="0x60C4" />
-        <Limb Name="gTakkuriRightWingBaseLimb" Type="Standard" EnumName="TAKKURI_LIMB_RIGHT_WING_BASE" Offset="0x60D0" />
-        <Limb Name="gTakkuriRightWingMiddleLimb" Type="Standard" EnumName="TAKKURI_LIMB_RIGHT_WING_MIDDLE" Offset="0x60DC" />
-        <Limb Name="gTakkuriRightWingTipLimb" Type="Standard" EnumName="TAKKURI_LIMB_RIGHT_WING_TIP" Offset="0x60E8" />
-        <Limb Name="gTakkuriNeckLimb" Type="Standard" EnumName="TAKKURI_LIMB_NECK" Offset="0x60F4" />
-        <Limb Name="gTakkuriHeadLimb" Type="Standard" EnumName="TAKKURI_LIMB_HEAD" Offset="0x6100" />
-        <Limb Name="gTakkuriRightEarLimb" Type="Standard" EnumName="TAKKURI_LIMB_RIGHT_EAR" Offset="0x610C" />
-        <Limb Name="gTakkuriLeftEarLimb" Type="Standard" EnumName="TAKKURI_LIMB_LEFT_EAR" Offset="0x6118" />
-        <Limb Name="gTakkuriLowerBeakLimb" Type="Standard" EnumName="TAKKURI_LIMB_LOWER_BEAK" Offset="0x6124" />
-        <Limb Name="gTakkuriEyesLimb" Type="Standard" EnumName="TAKKURI_LIMB_EYES" Offset="0x6130" />
-        <Limb Name="gTakkuriLegsLimb" Type="Standard" EnumName="TAKKURI_LIMB_LEGS" Offset="0x613C" />
-        <Limb Name="gTakkuriFeetLimb" Type="Standard" EnumName="TAKKURI_LIMB_FEET" Offset="0x6148" />
-        <Limb Name="gTakkuriStolenItemLimb" Type="Standard" EnumName="TAKKURI_LIMB_STOLEN_ITEM" Offset="0x6154" />
-
-        <!-- Takkuri Skeleton -->
-        <Skeleton Name="gTakkuriSkel" Type="Flex" LimbType="Standard" LimbNone="TAKKURI_LIMB_NONE" LimbMax="TAKKURI_LIMB_MAX" EnumName="TakkuriLimb" Offset="0x61A0" />
-
-        <!-- Takkuri Animation -->
-        <Animation Name="gTakkuriAttackAnim" Offset="0x63C4" /> <!-- Original name is "hnt_ikaku" ("threat, intimidation") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tite.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tite.xml
deleted file mode 100644
index 351b4f56a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tite.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Root>
-    <File Name="object_tite" Segment="6">
-        <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4" />
-        <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8" />
-        <Animation Name="object_tite_Anim_00069C" Offset="0x69C" />
-        <Animation Name="object_tite_Anim_00083C" Offset="0x83C" />
-        <Animation Name="object_tite_Anim_000A14" Offset="0xA14" />
-        <Animation Name="object_tite_Anim_000C70" Offset="0xC70" />
-        <Animation Name="object_tite_Anim_000F50" Offset="0xF50" />
-        <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4" />
-        <Texture Name="object_tite_Tex_001300" OutName="tex_001300" Format="rgba16" Width="16" Height="32" Offset="0x1300" />
-        <Texture Name="object_tite_Tex_001700" OutName="tex_001700" Format="rgba16" Width="16" Height="16" Offset="0x1700" />
-        <Texture Name="object_tite_Tex_001900" OutName="tex_001900" Format="rgba16" Width="8" Height="16" Offset="0x1900" />
-        <Texture Name="object_tite_Tex_001A00" OutName="tex_001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00" />
-        <Texture Name="object_tite_Tex_001A80" OutName="tex_001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80" />
-        <Texture Name="object_tite_Tex_001B00" OutName="tex_001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00" />
-        <Texture Name="object_tite_Tex_001F00" OutName="tex_001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00" />
-        <Texture Name="object_tite_Tex_002100" OutName="tex_002100" Format="rgba16" Width="8" Height="16" Offset="0x2100" />
-        <DList Name="object_tite_DL_002FF0" Offset="0x2FF0" />
-        <DList Name="object_tite_DL_003160" Offset="0x3160" />
-        <DList Name="object_tite_DL_003290" Offset="0x3290" />
-        <DList Name="object_tite_DL_003330" Offset="0x3330" />
-        <DList Name="object_tite_DL_003460" Offset="0x3460" />
-        <DList Name="object_tite_DL_003500" Offset="0x3500" />
-        <DList Name="object_tite_DL_003630" Offset="0x3630" />
-        <DList Name="object_tite_DL_0036D0" Offset="0x36D0" />
-        <DList Name="object_tite_DL_003800" Offset="0x3800" />
-        <Limb Name="object_tite_Standardlimb_0038A0" Type="Standard" EnumName="OBJECT_TITE_LIMB_01" Offset="0x38A0" />
-        <Limb Name="object_tite_Standardlimb_0038AC" Type="Standard" EnumName="OBJECT_TITE_LIMB_02" Offset="0x38AC" />
-        <Limb Name="object_tite_Standardlimb_0038B8" Type="Standard" EnumName="OBJECT_TITE_LIMB_03" Offset="0x38B8" />
-        <Limb Name="object_tite_Standardlimb_0038C4" Type="Standard" EnumName="OBJECT_TITE_LIMB_04" Offset="0x38C4" />
-        <Limb Name="object_tite_Standardlimb_0038D0" Type="Standard" EnumName="OBJECT_TITE_LIMB_05" Offset="0x38D0" />
-        <Limb Name="object_tite_Standardlimb_0038DC" Type="Standard" EnumName="OBJECT_TITE_LIMB_06" Offset="0x38DC" />
-        <Limb Name="object_tite_Standardlimb_0038E8" Type="Standard" EnumName="OBJECT_TITE_LIMB_07" Offset="0x38E8" />
-        <Limb Name="object_tite_Standardlimb_0038F4" Type="Standard" EnumName="OBJECT_TITE_LIMB_08" Offset="0x38F4" />
-        <Limb Name="object_tite_Standardlimb_003900" Type="Standard" EnumName="OBJECT_TITE_LIMB_09" Offset="0x3900" />
-        <Limb Name="object_tite_Standardlimb_00390C" Type="Standard" EnumName="OBJECT_TITE_LIMB_0A" Offset="0x390C" />
-        <Limb Name="object_tite_Standardlimb_003918" Type="Standard" EnumName="OBJECT_TITE_LIMB_0B" Offset="0x3918" />
-        <Limb Name="object_tite_Standardlimb_003924" Type="Standard" EnumName="OBJECT_TITE_LIMB_0C" Offset="0x3924" />
-        <Limb Name="object_tite_Standardlimb_003930" Type="Standard" EnumName="OBJECT_TITE_LIMB_0D" Offset="0x3930" />
-        <Limb Name="object_tite_Standardlimb_00393C" Type="Standard" EnumName="OBJECT_TITE_LIMB_0E" Offset="0x393C" />
-        <Limb Name="object_tite_Standardlimb_003948" Type="Standard" EnumName="OBJECT_TITE_LIMB_0F" Offset="0x3948" />
-        <Limb Name="object_tite_Standardlimb_003954" Type="Standard" EnumName="OBJECT_TITE_LIMB_10" Offset="0x3954" />
-        <Limb Name="object_tite_Standardlimb_003960" Type="Standard" EnumName="OBJECT_TITE_LIMB_11" Offset="0x3960" />
-        <Limb Name="object_tite_Standardlimb_00396C" Type="Standard" EnumName="OBJECT_TITE_LIMB_12" Offset="0x396C" />
-        <Limb Name="object_tite_Standardlimb_003978" Type="Standard" EnumName="OBJECT_TITE_LIMB_13" Offset="0x3978" />
-        <Limb Name="object_tite_Standardlimb_003984" Type="Standard" EnumName="OBJECT_TITE_LIMB_14" Offset="0x3984" />
-        <Limb Name="object_tite_Standardlimb_003990" Type="Standard" EnumName="OBJECT_TITE_LIMB_15" Offset="0x3990" />
-        <Limb Name="object_tite_Standardlimb_00399C" Type="Standard" EnumName="OBJECT_TITE_LIMB_16" Offset="0x399C" />
-        <Limb Name="object_tite_Standardlimb_0039A8" Type="Standard" EnumName="OBJECT_TITE_LIMB_17" Offset="0x39A8" />
-        <Limb Name="object_tite_Standardlimb_0039B4" Type="Standard" EnumName="OBJECT_TITE_LIMB_18" Offset="0x39B4" />
-        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" LimbNone="OBJECT_TITE_LIMB_NONE" LimbMax="OBJECT_TITE_LIMB_MAX" EnumName="ObjectTiteLimb" Offset="0x3A20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tk.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tk.xml
deleted file mode 100644
index b11b47488..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tk.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Root>
-    <File Name="object_tk" Segment="6">
-        <Animation Name="object_tk_Anim_001144" Offset="0x1144" />
-        <Animation Name="object_tk_Anim_001FA8" Offset="0x1FA8" />
-        <Animation Name="object_tk_Anim_0020C8" Offset="0x20C8" />
-        <Animation Name="object_tk_Anim_0030A4" Offset="0x30A4" />
-        <Animation Name="object_tk_Anim_003724" Offset="0x3724" />
-        <Animation Name="object_tk_Anim_003B10" Offset="0x3B10" />
-        <Animation Name="object_tk_Anim_003FB8" Offset="0x3FB8" />
-        <Texture Name="object_tk_TLUT_003FD0" OutName="tlut_003FD0" Format="rgba16" Width="16" Height="16" Offset="0x3FD0" />
-        <Texture Name="object_tk_Tex_0041D0" OutName="tex_0041D0" Format="ci8" Width="8" Height="8" Offset="0x41D0" />
-        <Texture Name="object_tk_Tex_004210" OutName="tex_004210" Format="ci8" Width="8" Height="8" Offset="0x4210" />
-        <Texture Name="object_tk_Tex_004250" OutName="tex_004250" Format="ci8" Width="8" Height="8" Offset="0x4250" />
-        <Texture Name="object_tk_Tex_004290" OutName="tex_004290" Format="ci8" Width="16" Height="16" Offset="0x4290" />
-        <Texture Name="object_tk_Tex_004390" OutName="tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x4390" />
-        <Texture Name="object_tk_Tex_004B90" OutName="tex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" />
-        <Texture Name="object_tk_Tex_005390" OutName="tex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" />
-        <Texture Name="object_tk_Tex_005B90" OutName="tex_005B90" Format="ci8" Width="16" Height="16" Offset="0x5B90" />
-        <Texture Name="object_tk_Tex_005C90" OutName="tex_005C90" Format="ci8" Width="16" Height="16" Offset="0x5C90" />
-        <!-- <Blob Name="object_tk_Blob_005D90" Size="0x180" Offset="0x5D90" /> -->
-        <Texture Name="object_tk_Tex_005F10" OutName="tex_005F10" Format="ci8" Width="16" Height="16" Offset="0x5F10" />
-        <DList Name="object_tk_DL_008870" Offset="0x8870" />
-        <DList Name="object_tk_DL_0089B0" Offset="0x89B0" />
-        <DList Name="object_tk_DL_008B40" Offset="0x8B40" />
-        <DList Name="object_tk_DL_008C60" Offset="0x8C60" />
-        <DList Name="object_tk_DL_0091A8" Offset="0x91A8" />
-        <DList Name="object_tk_DL_0094F0" Offset="0x94F0" />
-        <DList Name="object_tk_DL_009620" Offset="0x9620" />
-        <DList Name="object_tk_DL_009750" Offset="0x9750" />
-        <DList Name="object_tk_DL_009960" Offset="0x9960" />
-        <DList Name="object_tk_DL_009A90" Offset="0x9A90" />
-        <DList Name="object_tk_DL_009BC0" Offset="0x9BC0" />
-        <DList Name="object_tk_DL_009DD0" Offset="0x9DD0" />
-        <DList Name="object_tk_DL_009F88" Offset="0x9F88" />
-        <DList Name="object_tk_DL_00A068" Offset="0xA068" />
-        <DList Name="object_tk_DL_00A220" Offset="0xA220" />
-        <!-- <Blob Name="object_tk_Blob_00A300" Size="0x50" Offset="0xA300" /> -->
-        <Texture Name="object_tk_Tex_00A350" OutName="tex_00A350" Format="ci8" Width="16" Height="16" Offset="0xA350" />
-        <Texture Name="object_tk_Tex_00A450" OutName="tex_00A450" Format="ci8" Width="8" Height="16" Offset="0xA450" />
-        <Texture Name="object_tk_Tex_00A4D0" OutName="tex_00A4D0" Format="i8" Width="8" Height="8" Offset="0xA4D0" />
-        <Texture Name="object_tk_Tex_00A510" OutName="tex_00A510" Format="rgba16" Width="8" Height="8" Offset="0xA510" />
-        <Texture Name="object_tk_Tex_00A590" OutName="tex_00A590" Format="i4" Width="16" Height="32" Offset="0xA590" />
-        <DList Name="object_tk_DL_00B260" Offset="0xB260" />
-        <DList Name="object_tk_DL_00B3C8" Offset="0xB3C8" />
-        <DList Name="object_tk_DL_00B530" Offset="0xB530" />
-        <Limb Name="object_tk_Standardlimb_00B8D8" Type="Standard" EnumName="OBJECT_TK_LIMB_01" Offset="0xB8D8" />
-        <Limb Name="object_tk_Standardlimb_00B8E4" Type="Standard" EnumName="OBJECT_TK_LIMB_02" Offset="0xB8E4" />
-        <Limb Name="object_tk_Standardlimb_00B8F0" Type="Standard" EnumName="OBJECT_TK_LIMB_03" Offset="0xB8F0" />
-        <Limb Name="object_tk_Standardlimb_00B8FC" Type="Standard" EnumName="OBJECT_TK_LIMB_04" Offset="0xB8FC" />
-        <Limb Name="object_tk_Standardlimb_00B908" Type="Standard" EnumName="OBJECT_TK_LIMB_05" Offset="0xB908" />
-        <Limb Name="object_tk_Standardlimb_00B914" Type="Standard" EnumName="OBJECT_TK_LIMB_06" Offset="0xB914" />
-        <Limb Name="object_tk_Standardlimb_00B920" Type="Standard" EnumName="OBJECT_TK_LIMB_07" Offset="0xB920" />
-        <Limb Name="object_tk_Standardlimb_00B92C" Type="Standard" EnumName="OBJECT_TK_LIMB_08" Offset="0xB92C" />
-        <Limb Name="object_tk_Standardlimb_00B938" Type="Standard" EnumName="OBJECT_TK_LIMB_09" Offset="0xB938" />
-        <Limb Name="object_tk_Standardlimb_00B944" Type="Standard" EnumName="OBJECT_TK_LIMB_0A" Offset="0xB944" />
-        <Limb Name="object_tk_Standardlimb_00B950" Type="Standard" EnumName="OBJECT_TK_LIMB_0B" Offset="0xB950" />
-        <Limb Name="object_tk_Standardlimb_00B95C" Type="Standard" EnumName="OBJECT_TK_LIMB_0C" Offset="0xB95C" />
-        <Limb Name="object_tk_Standardlimb_00B968" Type="Standard" EnumName="OBJECT_TK_LIMB_0D" Offset="0xB968" />
-        <Limb Name="object_tk_Standardlimb_00B974" Type="Standard" EnumName="OBJECT_TK_LIMB_0E" Offset="0xB974" />
-        <Limb Name="object_tk_Standardlimb_00B980" Type="Standard" EnumName="OBJECT_TK_LIMB_0F" Offset="0xB980" />
-        <Limb Name="object_tk_Standardlimb_00B98C" Type="Standard" EnumName="OBJECT_TK_LIMB_10" Offset="0xB98C" />
-        <Limb Name="object_tk_Standardlimb_00B998" Type="Standard" EnumName="OBJECT_TK_LIMB_11" Offset="0xB998" />
-        <Skeleton Name="object_tk_Skel_00B9E8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TK_LIMB_NONE" LimbMax="OBJECT_TK_LIMB_MAX" EnumName="ObjectTkLimb" Offset="0xB9E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tl.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tl.xml
deleted file mode 100644
index 3230f87f2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tl.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<Root>
-    <!-- Assets for Snappers. There are two variants: the regular Snapper with four legs, and a Spiked Snapper with spikes instead of legs that spins to attack. -->
-    <File Name="object_tl" Segment="6">
-        <!-- Snapper Animations -->
-        <Animation Name="gSnapperRearUpAnim" Offset="0x440" /> <!-- Original name is "tl_aisatsuDEMO" ("greeting") -->
-        <Animation Name="gSnapperDamageAnim" Offset="0x8B4" /> <!-- Original name is "tl_damage" -->
-        <Animation Name="gSnapperDeathAnim" Offset="0xAF4" /> <!-- Original name is "tl_dead" -->
-
-        <!-- Spiked Snapper Animation -->
-        <Animation Name="gSpikedSnapperIdleAnim" Offset="0xB30" /> <!-- Original name is "tl_default" -->
-
-        <!-- Spiked Snapper Limb DisplayLists -->
-        <DList Name="gSpikedSnapperBodyDL" Offset="0x1550" />
-        <DList Name="gSpikedSnapperShellDL" Offset="0x1800" />
-        <DList Name="gSpikedSnapperSpikesDL" Offset="0x18E0" />
-
-        <!-- Spiked Snapper Limbs -->
-        <Limb Name="gSpikedSnapperBodyLimb" Type="Standard" EnumName="SPIKED_SNAPPER_LIMB_BODY" Offset="0x1A20" />
-        <Limb Name="gSpikedSnapperShellLimb" Type="Standard" EnumName="SPIKED_SNAPPER_LIMB_SHELL" Offset="0x1A2C" />
-        <Limb Name="gSpikedSnapperSpikesLimb" Type="Standard" EnumName="SPIKED_SNAPPER_LIMB_SPIKES" Offset="0x1A38" />
-
-        <!-- Spiked Snapper Skeleton -->
-        <Skeleton Name="gSpikedSnapperSkel" Type="Flex" LimbType="Standard" LimbNone="SPIKED_SNAPPER_LIMB_NONE" LimbMax="SPIKED_SNAPPER_LIMB_MAX" EnumName="SpikedSnapperLimb" Offset="0x1A50" />
-
-        <!-- Snapper Animations -->
-        <Animation Name="gSnapperRetreatIntoShellAnim" Offset="0x1C68" /> <!-- Original name is "tl_hikkomi" ("retreat") -->
-        <Animation Name="gSnapperFlipUprightAnim" Offset="0x2510" /> <!-- Original name is "tl_modoru" ("to rebound; to spring back"). Used for when the Snapper flips itself upright. -->
-        <Animation Name="gSnapperWiggleLegsAnim" Offset="0x27D8" /> <!-- Original name is "tl_mogaki01" ("struggle; writhing; wriggling; floundering") -->
-        <Animation Name="gSnapperFailToFlipUprightAnim" Offset="0x2F88" /> <!-- Original name is "tl_mogaki02" -->
-        <Animation Name="gSnapperEmergeFromShellAnim" Offset="0x31DC" /> <!-- Original name is "tl_nyokkiri" ("sticking out prominently; rising up") -->
-        <Animation Name="gSnapperBouncedUprightAnim" Offset="0x35EC" /> <!-- Original name is "tl_omotegaeshi" ("omote" = "surface; face", "gaeshi" = "to turn over"). Used for when a Goron Pound flips the Snapper upright. -->
-
-        <!-- Unused Eye Texture Animation -->
-        <TextureAnimation Name="gSnapperEyeTexAnim" Offset="0x3624" />
-
-        <!-- Snapper Animations -->
-        <Animation Name="gSnapperFlipOverAnim" Offset="0x39C0" /> <!-- Original name is "tl_uragaeshi" ("ura" = "opposite side; bottom; other side")-->
-        <Animation Name="gSnapperIdleAnim" Offset="0x4210" /> <!-- Original name is "tl_wait" -->
-
-        <!-- Snapper and Spiked Snapper Textures -->
-        <Texture Name="gSnapperShellTex" OutName="snapper_shell" Format="rgba16" Width="16" Height="32" Offset="0x4220" />
-        <Texture Name="gSnapperBodyTex" OutName="snapper_body" Format="rgba16" Width="16" Height="16" Offset="0x4620" />
-        <Texture Name="gSnapperLegTex" OutName="snapper_leg" Format="rgba16" Width="16" Height="32" Offset="0x4820" />
-        <Texture Name="gSnapperHeadTex" OutName="snapper_head" Format="rgba16" Width="32" Height="16" Offset="0x4C20" />
-        <Texture Name="gSnapperMouthTex" OutName="snapper_mouth" Format="rgba16" Width="8" Height="8" Offset="0x5020" />
-        <Texture Name="gSnapperHoleTex" OutName="snapper_hole" Format="rgba16" Width="16" Height="16" Offset="0x50A0" />
-        <Texture Name="gSnapperSpikeSkinTex" OutName="snapper_spike_skin" Format="rgba16" Width="16" Height="8" Offset="0x52A0" />
-        <Texture Name="gSnapperSpikeTex" OutName="snapper_spike" Format="rgba16" Width="16" Height="16" Offset="0x53A0" />
-        <Texture Name="gSnapperEyeOpenTex" OutName="snapper_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x55A0" />
-        <Texture Name="gSnapperEyeHalfTex" OutName="snapper_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x57A0" />
-        <Texture Name="gSnapperEyeClosedTex" OutName="snapper_eye_closed" Format="rgba16" Width="16" Height="16" Offset="0x59A0" />
-
-        <!-- Snapper Limb DisplayLists -->
-        <DList Name="gSnapperBodyDL" Offset="0x6C50" />
-        <DList Name="gSnapperBackRightLegDL" Offset="0x6DE8" />
-        <DList Name="gSnapperBackRightFootDL" Offset="0x6F30" />
-        <DList Name="gSnapperBackLeftLegDL" Offset="0x7040" />
-        <DList Name="gSnapperBackLeftFootDL" Offset="0x7188" />
-        <DList Name="gSnapperFrontRightLegDL" Offset="0x7298" />
-        <DList Name="gSnapperFrontRightFootDL" Offset="0x73E0" />
-        <DList Name="gSnapperFrontLeftLegDL" Offset="0x74F0" />
-        <DList Name="gSnapperFrontLeftFootDL" Offset="0x7638" />
-        <DList Name="gSnapperHeadDL" Offset="0x7748" />
-        <DList Name="gSnapperEyesDL" Offset="0x7938" />
-        <DList Name="gSnapperJawDL" Offset="0x79C8" />
-
-        <!-- Snapper Limbs -->
-        <Limb Name="gSnapperBodyLimb" Type="Standard" EnumName="SNAPPER_LIMB_BODY" Offset="0x7BB0" />
-        <Limb Name="gSnapperHeadLimb" Type="Standard" EnumName="SNAPPER_LIMB_HEAD" Offset="0x7BBC" />
-        <Limb Name="gSnapperJawLimb" Type="Standard" EnumName="SNAPPER_LIMB_JAW" Offset="0x7BC8" />
-        <Limb Name="gSnapperEyesLimb" Type="Standard" EnumName="SNAPPER_LIMB_EYES" Offset="0x7BD4" />
-        <Limb Name="gSnapperFrontLeftLegLimb" Type="Standard" EnumName="SNAPPER_LIMB_FRONT_LEFT_LEG" Offset="0x7BE0" />
-        <Limb Name="gSnapperFrontLeftFootLimb" Type="Standard" EnumName="SNAPPER_LIMB_FRONT_LEFT_FOOT" Offset="0x7BEC" />
-        <Limb Name="gSnapperFrontRightLegLimb" Type="Standard" EnumName="SNAPPER_LIMB_FRONT_RIGHT_LEG" Offset="0x7BF8" />
-        <Limb Name="gSnapperFrontRightFootLimb" Type="Standard" EnumName="SNAPPER_LIMB_FRONT_RIGHT_FOOT" Offset="0x7C04" />
-        <Limb Name="gSnapperBackLeftLegLimb" Type="Standard" EnumName="SNAPPER_LIMB_BACK_LEFT_LEG" Offset="0x7C10" />
-        <Limb Name="gSnapperBackLeftFootLimb" Type="Standard" EnumName="SNAPPER_LIMB_BACK_LEFT_FOOT" Offset="0x7C1C" />
-        <Limb Name="gSnapperBackRightLegLimb" Type="Standard" EnumName="SNAPPER_LIMB_BACK_RIGHT_LEG" Offset="0x7C28" />
-        <Limb Name="gSnapperBackRightFootLimb" Type="Standard" EnumName="SNAPPER_LIMB_BACK_RIGHT_FOOT" Offset="0x7C34" />
-
-        <!-- Snapper Skeleton -->
-        <Skeleton Name="gSnapperSkel" Type="Flex" LimbType="Standard" LimbNone="SNAPPER_LIMB_NONE" LimbMax="SNAPPER_LIMB_MAX" EnumName="SnapperLimb" Offset="0x7C70" />
-
-        <!-- Snapper Animation-->
-        <Animation Name="gSnapperWalkAnim" Offset="0x823C" /> <!-- Original name is "tl_walk" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tokei_step.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tokei_step.xml
deleted file mode 100644
index aac4b5ea9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tokei_step.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Assets for the Clock Tower steps -->
-    <File Name="object_tokei_step" Segment="6">
-        <DList Name="gClocktowerPanelEmptyDL" Offset="0x80" />
-        <DList Name="gClocktowerPanelDL" Offset="0x88" />
-        <Texture Name="gClocktowerPanelTex" OutName="clocktower_panel" Format="rgba16" Width="32" Height="32" Offset="0x120" />
-        <Collision Name="gClocktowerPanelCol" Offset="0x968" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tokei_tobira.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tokei_tobira.xml
deleted file mode 100644
index cfa617551..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tokei_tobira.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="object_tokei_tobira" Segment="6">
-        <Texture Name="object_tokei_tobira_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="object_tokei_tobira_Tex_000800" OutName="tex_000800" Format="i4" Width="64" Height="64" Offset="0x800" />
-        <DList Name="object_tokei_tobira_DL_001100" Offset="0x1100" />
-        <DList Name="object_tokei_tobira_DL_001108" Offset="0x1108" />
-        <Collision Name="object_tokei_tobira_Colheader_0012B0" Offset="0x12B0" />
-        <DList Name="object_tokei_tobira_DL_0013E0" Offset="0x13E0" />
-        <DList Name="object_tokei_tobira_DL_0013E8" Offset="0x13E8" />
-        <Collision Name="object_tokei_tobira_Colheader_001590" Offset="0x1590" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tokei_turret.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tokei_turret.xml
deleted file mode 100644
index 3ed158d83..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tokei_turret.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <!-- Object for the turret in South Clock Town that the carpenters build during the 3 day period. -->
-    <File Name="object_tokei_turret" Segment="6">
-        <Texture Name="gClockTownTurretTLUT" OutName="clock_town_turret_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
-        <Texture Name="gClockTownTurretTextTex" OutName="clock_town_turret_text" Format="ci4" Width="64" Height="64" Offset="0x20" />
-        <Texture Name="gClockTownTurretFabricTex" OutName="clock_town_turret_fabric" Format="rgba16" Width="32" Height="32" Offset="0x820" />
-        <Texture Name="gClockTownTurretWoodTex" OutName="clock_town_turret_wood" Format="rgba16" Width="16" Height="32" Offset="0x1020" />
-        <Texture Name="gClockTownFlagsTex" OutName="clock_town_flags" Format="rgba16" Width="128" Height="16" Offset="0x1420" />
-        <DList Name="gClockTownTurretEmpty0DL" Offset="0x2500" />
-        <DList Name="gClockTownTurretPlatformBaseDL" Offset="0x2508" />
-        <Collision Name="gClockTownTurretBaseCol" Offset="0x26A0" />
-        <DList Name="gClockTownTurretEmpty1DL" Offset="0x2A80" />
-        <DList Name="gClockTownTurretPlatformTopDL" Offset="0x2A88" />
-        <Collision Name="gClockTownTurretPlatformCol" Offset="0x2D80" />
-        <DList Name="gClockTownTurretEmpty2DL" Offset="0x3030" />
-        <DList Name="gClockTownFlagsDL" Offset="0x3038" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_toryo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_toryo.xml
deleted file mode 100644
index e19f2c540..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_toryo.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <File Name="object_toryo" Segment="6">
-        <Animation Name="object_toryo_Anim_000E50" Offset="0xE50" />
-        <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60" />
-        <Texture Name="object_toryo_Tex_001060" OutName="tex_001060" Format="ci8" Width="16" Height="16" Offset="0x1060" />
-        <Texture Name="object_toryo_Tex_001160" OutName="tex_001160" Format="ci8" Width="8" Height="4" Offset="0x1160" />
-        <Texture Name="object_toryo_Tex_001180" OutName="tex_001180" Format="ci8" Width="8" Height="8" Offset="0x1180" />
-        <Texture Name="object_toryo_Tex_0011C0" OutName="tex_0011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" />
-        <Texture Name="object_toryo_Tex_001200" OutName="tex_001200" Format="ci8" Width="8" Height="8" Offset="0x1200" />
-        <Texture Name="object_toryo_Tex_001240" OutName="tex_001240" Format="ci8" Width="8" Height="16" Offset="0x1240" />
-        <Texture Name="object_toryo_Tex_0012C0" OutName="tex_0012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0" />
-        <Texture Name="object_toryo_Tex_0016C0" OutName="tex_0016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" />
-        <Texture Name="object_toryo_Tex_0017C0" OutName="tex_0017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" />
-        <Texture Name="object_toryo_Tex_0018C0" OutName="tex_0018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" />
-        <Texture Name="object_toryo_Tex_0019C0" OutName="tex_0019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" />
-        <Texture Name="object_toryo_Tex_001A00" OutName="tex_001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" />
-        <Texture Name="object_toryo_Tex_001A80" OutName="tex_001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" />
-        <Texture Name="object_toryo_Tex_001B80" OutName="tex_001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" />
-        <DList Name="object_toryo_DL_004B20" Offset="0x4B20" />
-        <DList Name="object_toryo_DL_004F20" Offset="0x4F20" />
-        <DList Name="object_toryo_DL_005438" Offset="0x5438" />
-        <DList Name="object_toryo_DL_005720" Offset="0x5720" />
-        <DList Name="object_toryo_DL_005958" Offset="0x5958" />
-        <DList Name="object_toryo_DL_005BA0" Offset="0x5BA0" />
-        <DList Name="object_toryo_DL_005D10" Offset="0x5D10" />
-        <DList Name="object_toryo_DL_005EC8" Offset="0x5EC8" />
-        <DList Name="object_toryo_DL_006110" Offset="0x6110" />
-        <DList Name="object_toryo_DL_006280" Offset="0x6280" />
-        <DList Name="object_toryo_DL_0064B8" Offset="0x64B8" />
-        <DList Name="object_toryo_DL_0067E0" Offset="0x67E0" />
-        <DList Name="object_toryo_DL_0068E8" Offset="0x68E8" />
-        <DList Name="object_toryo_DL_006A88" Offset="0x6A88" />
-        <DList Name="object_toryo_DL_006DA8" Offset="0x6DA8" />
-        <DList Name="object_toryo_DL_006EB0" Offset="0x6EB0" />
-        <Limb Name="object_toryo_Standardlimb_007050" Type="Standard" EnumName="OBJECT_TORYO_LIMB_01" Offset="0x7050" />
-        <Limb Name="object_toryo_Standardlimb_00705C" Type="Standard" EnumName="OBJECT_TORYO_LIMB_02" Offset="0x705C" />
-        <Limb Name="object_toryo_Standardlimb_007068" Type="Standard" EnumName="OBJECT_TORYO_LIMB_03" Offset="0x7068" />
-        <Limb Name="object_toryo_Standardlimb_007074" Type="Standard" EnumName="OBJECT_TORYO_LIMB_04" Offset="0x7074" />
-        <Limb Name="object_toryo_Standardlimb_007080" Type="Standard" EnumName="OBJECT_TORYO_LIMB_05" Offset="0x7080" />
-        <Limb Name="object_toryo_Standardlimb_00708C" Type="Standard" EnumName="OBJECT_TORYO_LIMB_06" Offset="0x708C" />
-        <Limb Name="object_toryo_Standardlimb_007098" Type="Standard" EnumName="OBJECT_TORYO_LIMB_07" Offset="0x7098" />
-        <Limb Name="object_toryo_Standardlimb_0070A4" Type="Standard" EnumName="OBJECT_TORYO_LIMB_08" Offset="0x70A4" />
-        <Limb Name="object_toryo_Standardlimb_0070B0" Type="Standard" EnumName="OBJECT_TORYO_LIMB_09" Offset="0x70B0" />
-        <Limb Name="object_toryo_Standardlimb_0070BC" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0A" Offset="0x70BC" />
-        <Limb Name="object_toryo_Standardlimb_0070C8" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0B" Offset="0x70C8" />
-        <Limb Name="object_toryo_Standardlimb_0070D4" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0C" Offset="0x70D4" />
-        <Limb Name="object_toryo_Standardlimb_0070E0" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0D" Offset="0x70E0" />
-        <Limb Name="object_toryo_Standardlimb_0070EC" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0E" Offset="0x70EC" />
-        <Limb Name="object_toryo_Standardlimb_0070F8" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0F" Offset="0x70F8" />
-        <Limb Name="object_toryo_Standardlimb_007104" Type="Standard" EnumName="OBJECT_TORYO_LIMB_10" Offset="0x7104" />
-        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TORYO_LIMB_NONE" LimbMax="OBJECT_TORYO_LIMB_MAX" EnumName="ObjectToryoLimb" Offset="0x7150" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_trap.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_trap.xml
deleted file mode 100644
index 3afdf61d4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_trap.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_trap" Segment="6">
-        <Texture Name="object_trap_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="object_trap_Tex_000400" OutName="tex_000400" Format="i8" Width="32" Height="32" Offset="0x400" />
-        <Texture Name="object_trap_Tex_000800" OutName="tex_000800" Format="i8" Width="32" Height="32" Offset="0x800" />
-        <DList Name="object_trap_DL_001400" Offset="0x1400" />
-        <DList Name="object_trap_DL_001630" Offset="0x1630" />
-        <DList Name="object_trap_DL_001710" Offset="0x1710" />
-        <Texture Name="object_trap_Tex_001BD8" OutName="tex_001BD8" Format="rgba16" Width="32" Height="32" Offset="0x1BD8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tree.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tree.xml
deleted file mode 100644
index 89e3984c5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tree.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_tree" Segment="6">
-        <DList Name="gTreeBodyDL" Offset="0x680" />
-        <DList Name="gTreeLeavesDL" Offset="0x7C8" />
-        <Texture Name="gTreeBodyTex" OutName="tree_body" Format="rgba16" Width="32" Height="32" Offset="0x8B8" />
-        <Texture Name="gTreeLeavesTex" OutName="tree_leaves" Format="rgba16" Width="32" Height="32" Offset="0x10B8" />
-        <Collision Name="gTreeTopCol" Offset="0x1B2C" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tro.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tro.xml
deleted file mode 100644
index 0a4a3ea8b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tro.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <File Name="object_tro" Segment="6">
-        <Animation Name="gKoumeKioskHeadMovingAnim" Offset="0xA0" />
-        <DList Name="gKoumeKioskDL" Offset="0x6B0" />
-        <Texture Name="gKoumeKioskNoseTLUT" OutName="koume_kiosk_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAE0" />
-        <Texture Name="gKoumeKioskNostrilsTLUT" OutName="koume_kiosk_nostrils_tlut" Format="rgba16" Width="16" Height="16" Offset="0xCE0" />
-        <Texture Name="gKoumeKioskShadowedSkinTex" OutName="koume_kiosk_shadowed_skin" Format="rgba16" Width="2" Height="8" Offset="0xEE0" />
-        <Texture Name="gKoumeKioskNoseTex" OutName="koume_kiosk_nose" Format="ci8" Width="16" Height="8" Offset="0xF00" />
-        <Texture Name="gKoumeKioskJewelHolderTex" OutName="koume_kiosk_jewel_holder" Format="rgba16" Width="16" Height="8" Offset="0xF80" />
-        <Texture Name="gKoumeKioskJewelTex" OutName="koume_kiosk_jewel" Format="rgba16" Width="8" Height="8" Offset="0x1080" />
-        <Texture Name="gKoumeKioskNostrilsTex" OutName="koume_kiosk_nostrils" Format="ci8" Width="8" Height="8" Offset="0x1100" />
-        <Texture Name="gKoumeKioskEyeOpenTex" OutName="koume_kiosk_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x1140"/>
-        <Texture Name="gKoumeKioskEyeHalfTex" OutName="koume_kiosk_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1940"/>
-        <Texture Name="gKoumeKioskEyeClosedTex" OutName="koume_kiosk_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2140"/>
-        <Limb Name="gKoumeKioskHeadLimb" Type="Standard" EnumName="KOUME_KIOSK_LIMB_HEAD" Offset="0x2940" />
-        <Skeleton Name="gKoumeKioskSkel" Type="Normal" LimbType="Standard" LimbNone="KOUME_KIOSK_LIMB_NONE" LimbMax="KOUME_KIOSK_LIMB_MAX" EnumName="KoumeKioskLimb" Offset="0x2950" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_trt.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_trt.xml
deleted file mode 100644
index 9f024f9cb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_trt.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<Root>
-    <!-- Assets for Kotake -->
-    <File Name="object_trt" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gKotakeHoverAnim" Offset="0xA44" />
-        <Animation Name="gKotakeFlyLookAroundAnim" Offset="0x1EF4" />
-        <Animation Name="gKotakeFlyDownAnim" Offset="0x2224" />
-        <Animation Name="gKotakeFlyAnim" Offset="0x2CB0" />
-        <Animation Name="gKotakeWakeUpAnim" Offset="0x30EC" />
-        <Animation Name="gKotakeSurprisedAnim" Offset="0x3D78" />
-
-        <!-- DLists -->
-        <DList Name="gKotakePelvisDL" Offset="0x6380" />
-        <DList Name="gKotakeTorsoDL" Offset="0x6590" />
-        <DList Name="gKotakeNeckDL" Offset="0x66D8" />
-        <DList Name="gKotakeHeadDL" Offset="0x6808" />
-        <DList Name="gKotakeLeftBraidStartDL" Offset="0x7298" />
-        <DList Name="gKotakeLeftBraidEndDL" Offset="0x7398" />
-        <DList Name="gKotakeTeethDL" Offset="0x7478" />
-        <DList Name="gKotakeRightBraidStartDL" Offset="0x74C8" />
-        <DList Name="gKotakeRightBraidEndDL" Offset="0x75C8" />
-        <DList Name="gKotakeRightSleeveStartDL" Offset="0x76A8" />
-        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x77B8" />
-        <DList Name="gKotakeRightHandDL" Offset="0x7928" />
-        <DList Name="gKotakeRightSleeveMidDL" Offset="0x7C10" />
-        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7D28" />
-        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7E38" />
-        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7F48" />
-        <DList Name="gKotakeLeftHandDL" Offset="0x80B8" />
-        <DList Name="gKotakeBroomDL" Offset="0x83A0" />
-        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x86A0" />
-        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x87B8" />
-        <DList Name="gKotakeRightThighDL" Offset="0x88C8" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gKotakeRightShinDL" Offset="0x8958" />
-        <DList Name="gKotakeRightFootDL" Offset="0x8A08" />
-        <DList Name="gKotakeLeftThighDL" Offset="0x8AA0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gKotakeLeftShinDL" Offset="0x8B30" />
-        <DList Name="gKotakeLeftFootDL" Offset="0x8BE0" />
-
-        <!-- Textures -->
-        <Texture Name="gKotakeSkinTLUT" OutName="kotake_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8C78" />
-        <Texture Name="gKotakeMouthTLUT" OutName="kotake_mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8E78" />
-        <Texture Name="gKotakeEarTLUT" OutName="kotake_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9078" />
-        <Texture Name="gKotakeFingerTLUT" OutName="kotake_finger_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9278" />
-        <Texture Name="gKotakeNeckTLUT" OutName="kotake_neck_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9478" />
-        <Texture Name="gKotakeNostrilsTLUT" OutName="kotake_nostrils_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9678" />
-        <Texture Name="gKotakeGerudoFabricTex" OutName="kotake_gerudo_fabric" Format="rgba16" Width="32" Height="32" Offset="0x9878" />
-        <Texture Name="gKotakeRobeTex" OutName="kotake_robe" Format="rgba16" Width="16" Height="16" Offset="0xA078" />
-        <Texture Name="gKotakeRobePatternTex" OutName="kotake_robe_pattern" Format="rgba16" Width="16" Height="16" Offset="0xA278" />
-        <Texture Name="gKotakeRobeTrimTex" OutName="kotake_robe_trim" Format="rgba16" Width="16" Height="16" Offset="0xA478" />
-        <Texture Name="gKotakeSkinTex" OutName="kotake_skin" Format="ci8" Width="16" Height="8" Offset="0xA678" />
-        <Texture Name="gKotakeMouthTex" OutName="kotake_mouth" Format="ci8" Width="8" Height="8" Offset="0xA6F8" />
-        <Texture Name="gKotakeHairTex" OutName="kotake_hair" Format="rgba16" Width="8" Height="32" Offset="0xA738" />
-        <Texture Name="gKotakeBraidEndTex" OutName="kotake_braid_end" Format="rgba16" Width="8" Height="8" Offset="0xA938" />
-        <Texture Name="gKotakeEarTex" OutName="kotake_ear" Format="ci8" Width="8" Height="8" Offset="0xA9B8" />
-        <Texture Name="gKotakeCollarNeckTex" OutName="kotake_collar_neck" Format="rgba16" Width="4" Height="8" Offset="0xA9F8" />
-        <Texture Name="gKotakeFingerTex" OutName="kotake_finger" Format="ci8" Width="8" Height="16" Offset="0xAA38" />
-        <Texture Name="gKotakeBroomHandleTex" OutName="kotake_broom_handle" Format="rgba16" Width="8" Height="8" Offset="0xAAB8" />->
-        <Texture Name="gKotakeBroomHeadTex" OutName="kotake_broom_head" Format="rgba16" Width="16" Height="32" Offset="0xAB38" />
-        <Texture Name="gKotakeJewelHolderTex" OutName="kotake_jewel_holder" Format="rgba16" Width="16" Height="8" Offset="0xAF38" />
-        <Texture Name="gKotakeNeckTex" OutName="kotake_neck" Format="ci8" Width="8" Height="8" Offset="0xB038" />
-        <Texture Name="gKotakeNostrilsTex" OutName="kotake_nostrils" Format="ci8" Width="8" Height="8" Offset="0xB078" />
-        <Texture Name="gKotakeEyeOpenTex" OutName="kotake_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB0B8" />
-        <Texture Name="gKotakeEyeHalfTex" OutName="kotake_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xB8B8" />
-        <Texture Name="gKotakeEyeClosedTex" OutName="kotake_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0B8" />
-        <Texture Name="gKotakeJewelTex" OutName="kotake_jewel" Format="rgba16" Width="8" Height="8" Offset="0xC8B8" />
-
-        <!-- Unused Eye TexAnim-->
-        <TextureAnimation Name="gKotakeEyesTexAnim" Offset="0xC988" />
-
-        <!-- Animations -->
-        <Animation Name="gKotakeHandsOnCounterAnim" Offset="0xD52C" />
-        <Animation Name="gKotakeIdleAnim" Offset="0xDE68" />
-        <Animation Name="gKotakeHalfAwakeAnim" Offset="0xEE98" />
-        <Animation Name="gKotakeSleepingAnim" Offset="0xFD34" />
-
-        <!-- Skeleton -->
-        <Limb Name="gKotakePelvisLimb" Type="Standard" EnumName="KOTAKE_LIMB_PELVIS" Offset="0xFD50" />
-        <Limb Name="gKotakeLeftThighLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_THIGH" Offset="0xFD5C" />
-        <Limb Name="gKotakeLeftShinLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_SHIN" Offset="0xFD68" />
-        <Limb Name="gKotakeLeftFootLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_FOOT" Offset="0xFD74" />
-        <Limb Name="gKotakeRightThighLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGH_THIGH" Offset="0xFD80" />
-        <Limb Name="gKotakeRightShinLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_SHIN" Offset="0xFD8C" />
-        <Limb Name="gKotakeRightFootLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_FOOT" Offset="0xFD98" />
-        <Limb Name="gKotakeTorsoLimb" Type="Standard" EnumName="KOTAKE_LIMB_TORSO_LIMB" Offset="0xFDA4" />
-        <Limb Name="gKotakeLeftSleeveStartLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_SLEEVE_START" Offset="0xFDB0" />
-        <Limb Name="gKotakeLeftSleeveMidLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_SLEEVE_MID" Offset="0xFDBC" />
-        <Limb Name="gKotakeLeftSleeveEndLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_SLEEVE_END" Offset="0xFDC8" />
-        <Limb Name="gKotakeLeftSleeveFrontLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_SLEEVE_FRONT" Offset="0xFDD4" />
-        <Limb Name="gKotakeLeftHandLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_HAND" Offset="0xFDE0" />
-        <Limb Name="gKotakeBroomLimb" Type="Standard" EnumName="KOTAKE_LIMB_BROOM" Offset="0xFDEC" />
-        <Limb Name="gKotakeRightSleeveStartLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_SLEEVE_START" Offset="0xFDF8" />
-        <Limb Name="gKotakeRightSleeveMidLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_SLEEVE_MID" Offset="0xFE04" />
-        <Limb Name="gKotakeRightSleeveEndLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_SLEEVE_END" Offset="0xFE10" />
-        <Limb Name="gKotakeRightSleeveFrontLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_SLEEVE_FRONT" Offset="0xFE1C" />
-        <Limb Name="gKotakeRightHandLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_HAND" Offset="0xFE28" />
-        <Limb Name="gKotakeNeckLimb" Type="Standard" EnumName="KOTAKE_LIMB_NECK" Offset="0xFE34" />
-        <Limb Name="gKotakeHeadLimb" Type="Standard" EnumName="KOTAKE_LIMB_HEAD" Offset="0xFE40" />
-        <Limb Name="gKotakeRightBraidStartLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_BRAID_START" Offset="0xFE4C" />
-        <Limb Name="gKotakeRightBraidEndLimb" Type="Standard" EnumName="KOTAKE_LIMB_RIGHT_BRAID_END" Offset="0xFE58" />
-        <Limb Name="gKotakeTeethLimb" Type="Standard" EnumName="KOTAKE_LIMB_TEETH" Offset="0xFE64" />
-        <Limb Name="gKotakeLeftBraidStartLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_BRAID_START" Offset="0xFE70" />
-        <Limb Name="gKotakeLeftBraidEndLimb" Type="Standard" EnumName="KOTAKE_LIMB_LEFT_BRAID_END" Offset="0xFE7C" />
-        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" LimbNone="KOTAKE_LIMB_NONE" LimbMax="KOTAKE_LIMB_MAX" EnumName="KotakeLimb" Offset="0xFEF0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tru.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tru.xml
deleted file mode 100644
index db35ec604..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tru.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<Root>
-    <!-- Assets for Koume -->
-    <File Name="object_tru" Segment="6">
-        <DList Name="gKoumeTargetDL" Offset="0x390" />
-        <DList Name="gKoumeChainDL" Offset="0x4C8" />
-        <Texture Name="gKoumeChainTex" OutName="koume_chain" Format="rgba16" Width="16" Height="32" Offset="0x560" />
-        <Texture Name="gKoumeTargetSideTex" OutName="koume_target_side" Format="rgba16" Width="32" Height="32" Offset="0x960" />
-        <Texture Name="gKoumeTargetFaceTex" OutName="koume_target_face" Format="rgba16" Width="32" Height="32" Offset="0x1160" />
-
-        <DList Name="gKoumeBottleDL" Offset="0x1F90" />
-        <DList Name="gKoumePotionDL" Offset="0x20C8" />
-        <DList Name="gKoumeEmptyDL" Offset="0x2160" />
-        <Texture Name="gKoumeBottleTex" OutName="koume_bottle" Format="i4" Width="16" Height="16" Offset="0x2168" />
-
-        <Animation Name="gKoumeFlyAnim" Offset="0x2BD8" />
-        <Animation Name="gKoumeTakeOffAnim" Offset="0x3698" />
-        <Animation Name="gKoumeHoverAnim" Offset="0x446C" />
-        <Animation Name="gKoumeDrinkAnim" Offset="0x7FA0" />
-        <Animation Name="gKoumeInjuredRaiseHeadAnim" Offset="0x9348" />
-
-        <DList Name="gKoumePelvisDL" Offset="0xB730" />
-        <DList Name="gKoumeTorsoDL" Offset="0xB940" />
-        <DList Name="gKoumeNeckDL" Offset="0xBA88" />
-        <DList Name="gKoumeHeadDL" Offset="0xBBB8" />
-        <DList Name="gKoumeLeftBraidStartDL" Offset="0xC630" />
-        <DList Name="gKoumeLeftBraidEndDL" Offset="0xC730" />
-        <DList Name="gKoumeTeethDL" Offset="0xC810" />
-        <DList Name="gKoumeRightBraidStartDL" Offset="0xC860" />
-        <DList Name="gKoumeRightBraidEndDL" Offset="0xC960" />
-        <DList Name="gKoumeRightSleeveStartDL" Offset="0xCA40" />
-        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xCB50" />
-        <DList Name="gKoumeRightHandDL" Offset="0xCCC0" />
-        <DList Name="gKoumeRightSleeveMidDL" Offset="0xCFA8" />
-        <DList Name="gKoumeRightSleeveEndDL" Offset="0xD0C0" />
-        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xD1D0" />
-        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xD2E0" />
-        <DList Name="gKoumeLeftHandDL" Offset="0xD450" />
-        <DList Name="gKoumeBroomDL" Offset="0xD738" />
-        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xDA38" />
-        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xDB50" />
-        <DList Name="gKoumeRightThighDL" Offset="0xDC40" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gKoumeRightShinDL" Offset="0xDC88" />
-        <DList Name="gKoumeRightFootDL" Offset="0xDD38" />
-        <DList Name="gKoumeLeftThighDL" Offset="0xDDD0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
-        <DList Name="gKoumeLeftShinDL" Offset="0xDE18" />
-        <DList Name="gKoumeLeftFootDL" Offset="0xDEC8" />
-
-        <Animation Name="gKoumeInjuredTalkAnim" Offset="0xEEDC" />
-        <Animation Name="gKoumeInjuredLyingDownAnim" Offset="0xF9A0" />
-        <Animation Name="gKoumeTryGetUpAnim" Offset="0x108AC" />
-        <Animation Name="gKoumeHealedAnim" Offset="0x11F88" />
-        <Animation Name="gKoumeTakeAnim" Offset="0x14728" />
-        <Animation Name="gKoumeIdleAnim" Offset="0x15068" />
-        <Animation Name="gKoumeInjuredHeadUpAnim" Offset="0x15CA0" />
-        <Animation Name="gKoumeFinishedDrinkingAnim" Offset="0x16B4C" />
-
-        <Texture Name="gKoumeSkinTLUT" OutName="koume_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x16B60" />
-        <Texture Name="gKoumeMouthTLUT" OutName="koume_mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x16D60" />
-        <Texture Name="gKoumeEarTLUT" OutName="koume_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x16F60" />
-        <Texture Name="gKoumeFingerTLUT" OutName="koume_finger_tlut" Format="rgba16" Width="16" Height="16" Offset="0x17160" />
-        <Texture Name="gKoumeNeckTLUT" OutName="koume_neck_tlut" Format="rgba16" Width="16" Height="16" Offset="0x17360" />
-        <Texture Name="gKoumeNostrilsTLUT" OutName="koume_nostrils_tlut" Format="rgba16" Width="16" Height="16" Offset="0x17560" />
-        <Texture Name="gKoumeGerudoFabricTex" OutName="koume_gerudo_fabric" Format="rgba16" Width="32" Height="32" Offset="0x17760" />
-        <Texture Name="gKoumeRobeTex" OutName="koume_robe" Format="rgba16" Width="16" Height="16" Offset="0x17F60" />
-        <Texture Name="gKoumeRobePatternTex" OutName="koume_robe_pattern" Format="rgba16" Width="16" Height="16" Offset="0x18160" />
-        <Texture Name="gKoumeRobeTrimTex" OutName="koume_robe_trim" Format="rgba16" Width="16" Height="16" Offset="0x18360" />
-        <Texture Name="gKoumeSkinTex" OutName="koume_skin" Format="ci8" Width="16" Height="8" Offset="0x18560" />
-        <Texture Name="gKoumeMouthTex" OutName="koume_mouth" Format="ci8" Width="8" Height="8" Offset="0x185E0" />
-        <Texture Name="gKoumeHairTex" OutName="koume_hair" Format="rgba16" Width="8" Height="32" Offset="0x18620" />
-        <Texture Name="gKoumeBraidEndTex" OutName="koume_braid_end" Format="rgba16" Width="8" Height="8" Offset="0x18820" />
-        <Texture Name="gKoumeEarTex" OutName="koume_ear" Format="ci8" Width="8" Height="8" Offset="0x188A0" />
-        <Texture Name="gKoumeCollarNeckTex" OutName="koume_collar_neck" Format="rgba16" Width="4" Height="8" Offset="0x188E0" />
-        <Texture Name="gKoumeFingerTex" OutName="koume_finger" Format="ci8" Width="8" Height="16" Offset="0x18920" />
-        <Texture Name="gKoumeBroomHandleTex" OutName="koume_broom_handle" Format="rgba16" Width="8" Height="8" Offset="0x189A0" />
-        <Texture Name="gKoumeBroomHeadTex" OutName="koume_broom_head" Format="rgba16" Width="16" Height="32" Offset="0x18A20" />
-        <Texture Name="gKoumeJewelHolderTex" OutName="koume_jewel_holder" Format="rgba16" Width="16" Height="8" Offset="0x18E20" />
-        <Texture Name="gKoumeNeckTex" OutName="koume_neck" Format="ci8" Width="8" Height="8" Offset="0x18F20" />
-        <Texture Name="gKoumeNostrilsTex" OutName="koume_nostrils" Format="ci8" Width="8" Height="8" Offset="0x18F60" />
-        <Texture Name="gKoumeEyeOpenTex" OutName="koume_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x18FA0" />
-        <Texture Name="gKoumeEyeHalfTex" OutName="koume_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x197A0" />
-        <Texture Name="gKoumeEyeClosedTex" OutName="koume_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x19FA0" />
-        <Texture Name="gKoumeJewelTex" OutName="koume_jewel" Format="rgba16" Width="8" Height="8" Offset="0x1A7A0" />
-
-        <DList Name="gKoumeDustMaterialDL" Offset="0x1A820" />
-        <DList Name="gKoumeDustModelDL" Offset="0x1A830" />
-
-        <Limb Name="gKoumePelvisLimb" Type="Standard" EnumName="KOUME_LIMB_PELVIS" Offset="0x1A8C0" />
-        <Limb Name="gKoumeLeftThighLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_THIGH" Offset="0x1A8CC" />
-        <Limb Name="gKoumeLeftShinLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_SHIN" Offset="0x1A8D8" />
-        <Limb Name="gKoumeLeftFootLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_FOOT" Offset="0x1A8E4" />
-        <Limb Name="gKoumeRightThighLimb" Type="Standard" EnumName="KOUME_LIMB_RIGH_THIGH" Offset="0x1A8F0" />
-        <Limb Name="gKoumeRightShinLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_SHIN" Offset="0x1A8FC" />
-        <Limb Name="gKoumeRightFootLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_FOOT" Offset="0x1A908" />
-        <Limb Name="gKoumeTorsoLimb" Type="Standard" EnumName="KOUME_LIMB_TORSO_LIMB" Offset="0x1A914" />
-        <Limb Name="gKoumeLeftSleeveStartLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_SLEEVE_START" Offset="0x1A920" />
-        <Limb Name="gKoumeLeftSleeveMidLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_SLEEVE_MID" Offset="0x1A92C" />
-        <Limb Name="gKoumeLeftSleeveEndLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_SLEEVE_END" Offset="0x1A938" />
-        <Limb Name="gKoumeLeftSleeveFrontLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_SLEEVE_FRONT" Offset="0x1A944" />
-        <Limb Name="gKoumeLeftHandLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_HAND" Offset="0x1A950" />
-        <Limb Name="gKoumeBroomLimb" Type="Standard" EnumName="KOUME_LIMB_BROOM" Offset="0x1A95C" />
-        <Limb Name="gKoumeRightSleeveStartLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_SLEEVE_START" Offset="0x1A968" />
-        <Limb Name="gKoumeRightSleeveMidLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_SLEEVE_MID" Offset="0x1A974" />
-        <Limb Name="gKoumeRightSleeveEndLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_SLEEVE_END" Offset="0x1A980" />
-        <Limb Name="gKoumeRightSleeveFrontLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_SLEEVE_FRONT" Offset="0x1A98C" />
-        <Limb Name="gKoumeRightHandLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_HAND" Offset="0x1A998" />
-        <Limb Name="gKoumeNeckLimb" Type="Standard" EnumName="KOUME_LIMB_NECK" Offset="0x1A9A4" />
-        <Limb Name="gKoumeHeadLimb" Type="Standard" EnumName="KOUME_LIMB_HEAD" Offset="0x1A9B0" />
-        <Limb Name="gKoumeRightBraidStartLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_BRAID_START" Offset="0x1A9BC" />
-        <Limb Name="gKoumeRightBraidEndLimb" Type="Standard" EnumName="KOUME_LIMB_RIGHT_BRAID_END" Offset="0x1A9C8" />
-        <Limb Name="gKoumeTeethLimb" Type="Standard" EnumName="KOUME_LIMB_TEETH" Offset="0x1A9D4" />
-        <Limb Name="gKoumeLeftBraidStartLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_BRAID_START" Offset="0x1A9E0" />
-        <Limb Name="gKoumeLeftBraidEndLimb" Type="Standard" EnumName="KOUME_LIMB_LEFT_BRAID_END" Offset="0x1A9EC" />
-        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" LimbNone="KOUME_LIMB_NONE" LimbMax="KOUME_LIMB_MAX" EnumName="KoumeLimb" Offset="0x1AA60" />
-
-        <Animation Name="gKoumeShakeAnim" Offset="0x1B5C4" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tsn.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tsn.xml
deleted file mode 100644
index d610b185e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tsn.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <File Name="object_tsn" Segment="6">
-        <Animation Name="object_tsn_Anim_000964" Offset="0x964" />
-        <Animation Name="object_tsn_Anim_001198" Offset="0x1198" />
-        <DList Name="object_tsn_DL_0043A0" Offset="0x43A0" />
-        <DList Name="object_tsn_DL_0044F0" Offset="0x44F0" />
-        <DList Name="object_tsn_DL_0047C0" Offset="0x47C0" />
-        <DList Name="object_tsn_DL_004B48" Offset="0x4B48" />
-        <DList Name="object_tsn_DL_004F00" Offset="0x4F00" />
-        <DList Name="object_tsn_DL_0050B8" Offset="0x50B8" />
-        <DList Name="object_tsn_DL_005270" Offset="0x5270" />
-        <DList Name="object_tsn_DL_0053B8" Offset="0x53B8" />
-        <DList Name="object_tsn_DL_0055E8" Offset="0x55E8" />
-        <DList Name="object_tsn_DL_005818" Offset="0x5818" />
-        <DList Name="object_tsn_DL_005960" Offset="0x5960" />
-        <DList Name="object_tsn_DL_005B00" Offset="0x5B00" />
-        <DList Name="object_tsn_DL_005CF8" Offset="0x5CF8" />
-        <DList Name="object_tsn_DL_005DE8" Offset="0x5DE8" />
-        <DList Name="object_tsn_DL_005F88" Offset="0x5F88" />
-        <DList Name="object_tsn_DL_006108" Offset="0x6108" />
-        <Texture Name="object_tsn_TLUT_0061F8" OutName="tlut_0061F8" Format="rgba16" Width="16" Height="16" Offset="0x61F8" />
-        <Texture Name="object_tsn_Tex_0063F8" OutName="tex_0063F8" Format="ci8" Width="32" Height="64" Offset="0x63F8" />
-        <Texture Name="object_tsn_Tex_006BF8" OutName="tex_006BF8" Format="ci8" Width="8" Height="8" Offset="0x6BF8" />
-        <Texture Name="object_tsn_Tex_006C38" OutName="tex_006C38" Format="ci8" Width="8" Height="8" Offset="0x6C38" />
-        <Texture Name="object_tsn_Tex_006C78" OutName="tex_006C78" Format="ci8" Width="8" Height="8" Offset="0x6C78" />
-        <Texture Name="object_tsn_Tex_006CB8" OutName="tex_006CB8" Format="ci8" Width="32" Height="32" Offset="0x6CB8" />
-        <Texture Name="object_tsn_Tex_0070B8" OutName="tex_0070B8" Format="rgba16" Width="16" Height="16" Offset="0x70B8" />
-        <Texture Name="object_tsn_Tex_0072B8" OutName="tex_0072B8" Format="ci8" Width="16" Height="16" Offset="0x72B8" />
-        <Texture Name="object_tsn_Tex_0073B8" OutName="tex_0073B8" Format="ci8" Width="32" Height="32" Offset="0x73B8" />
-        <Texture Name="object_tsn_Tex_0077B8" OutName="tex_0077B8" Format="rgba16" Width="16" Height="32" Offset="0x77B8" />
-        <Texture Name="object_tsn_Tex_007BB8" OutName="tex_007BB8" Format="rgba16" Width="16" Height="16" Offset="0x7BB8" />
-        <Texture Name="object_tsn_Tex_007DB8" OutName="tex_007DB8" Format="rgba16" Width="32" Height="32" Offset="0x7DB8" />
-        <Texture Name="object_tsn_Tex_0085B8" OutName="tex_0085B8" Format="ci8" Width="32" Height="32" Offset="0x85B8" />
-        <Limb Name="object_tsn_Standardlimb_0089B8" Type="Standard" EnumName="OBJECT_TSN_LIMB_01" Offset="0x89B8" />
-        <Limb Name="object_tsn_Standardlimb_0089C4" Type="Standard" EnumName="OBJECT_TSN_LIMB_02" Offset="0x89C4" />
-        <Limb Name="object_tsn_Standardlimb_0089D0" Type="Standard" EnumName="OBJECT_TSN_LIMB_03" Offset="0x89D0" />
-        <Limb Name="object_tsn_Standardlimb_0089DC" Type="Standard" EnumName="OBJECT_TSN_LIMB_04" Offset="0x89DC" />
-        <Limb Name="object_tsn_Standardlimb_0089E8" Type="Standard" EnumName="OBJECT_TSN_LIMB_05" Offset="0x89E8" />
-        <Limb Name="object_tsn_Standardlimb_0089F4" Type="Standard" EnumName="OBJECT_TSN_LIMB_06" Offset="0x89F4" />
-        <Limb Name="object_tsn_Standardlimb_008A00" Type="Standard" EnumName="OBJECT_TSN_LIMB_07" Offset="0x8A00" />
-        <Limb Name="object_tsn_Standardlimb_008A0C" Type="Standard" EnumName="OBJECT_TSN_LIMB_08" Offset="0x8A0C" />
-        <Limb Name="object_tsn_Standardlimb_008A18" Type="Standard" EnumName="OBJECT_TSN_LIMB_09" Offset="0x8A18" />
-        <Limb Name="object_tsn_Standardlimb_008A24" Type="Standard" EnumName="OBJECT_TSN_LIMB_0A" Offset="0x8A24" />
-        <Limb Name="object_tsn_Standardlimb_008A30" Type="Standard" EnumName="OBJECT_TSN_LIMB_0B" Offset="0x8A30" />
-        <Limb Name="object_tsn_Standardlimb_008A3C" Type="Standard" EnumName="OBJECT_TSN_LIMB_0C" Offset="0x8A3C" />
-        <Limb Name="object_tsn_Standardlimb_008A48" Type="Standard" EnumName="OBJECT_TSN_LIMB_0D" Offset="0x8A48" />
-        <Limb Name="object_tsn_Standardlimb_008A54" Type="Standard" EnumName="OBJECT_TSN_LIMB_0E" Offset="0x8A54" />
-        <Limb Name="object_tsn_Standardlimb_008A60" Type="Standard" EnumName="OBJECT_TSN_LIMB_0F" Offset="0x8A60" />
-        <Limb Name="object_tsn_Standardlimb_008A6C" Type="Standard" EnumName="OBJECT_TSN_LIMB_10" Offset="0x8A6C" />
-        <Skeleton Name="object_tsn_Skel_008AB8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TSN_LIMB_NONE" LimbMax="OBJECT_TSN_LIMB_MAX" EnumName="ObjectTsnLimb" Offset="0x8AB8" />
-        <Animation Name="object_tsn_Anim_0092FC" Offset="0x92FC" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tsubo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tsubo.xml
deleted file mode 100644
index 8bbebfc85..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_tsubo.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <!-- Object for normal brown pot/jar -->
-    <File Name="object_tsubo" Segment="6">
-        <Texture Name="gPotWallTex" OutName="pot_wall" Format="rgba16" Width="32" Height="64" Offset="0x0" />
-        <Texture Name="gPotRimTex" OutName="pot_rim" Format="rgba16" Width="16" Height="16" Offset="0x1000" />
-        <Texture Name="gPotShardTex" OutName="pot_shard" Format="rgba16" Width="16" Height="16" Offset="0x1200" />
-        <DList Name="gPotDL" Offset="0x17C0" />
-        <DList Name="gPotShardDL" Offset="0x1960" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_twig.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_twig.xml
deleted file mode 100644
index 7b9c6c191..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_twig.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="object_twig" Segment="6">
-        <Texture Name="object_twig_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <Texture Name="object_twig_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800" />
-        <Texture Name="object_twig_Tex_001000" OutName="tex_001000" Format="rgba16" Width="16" Height="32" Offset="0x1000" />
-        <DList Name="object_twig_DL_0014C0" Offset="0x14C0" />
-        <DList Name="object_twig_DL_0014C8" Offset="0x14C8" />
-        <Collision Name="object_twig_Colheader_0016C0" Offset="0x16C0" />
-        <DList Name="object_twig_DL_001C30" Offset="0x1C30" />
-        <DList Name="object_twig_DL_001C38" Offset="0x1C38" />
-        <Collision Name="object_twig_Colheader_0020A0" Offset="0x20A0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_uch.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_uch.xml
deleted file mode 100644
index d82bf5b10..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_uch.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Root>
-    <!-- Assets for the Ghosts, more-commonly known as the aliens -->
-    <File Name="object_uch" Segment="6">
-        <!-- Assets for the beam of light coming from the alien's eyes. -->
-        <DList Name="gAlienEyeBeamDL" Offset="0x80" />
-        <Texture Name="gAlienEyeBeamMaskTex" OutName="alien_eye_beam_mask" Format="i8" Width="32" Height="32" Offset="0x130" />
-        <TextureAnimation Name="gAlienEyeBeamTexAnim" Offset="0x550" />
-
-        <!-- An empty texture animation, seemingly planned to animate something on the alien's body. -->
-        <TextureAnimation Name="gAlienEmptyTexAnim" Offset="0x560" />
-
-        <!-- Alien Animations -->
-        <Animation Name="gAlienDeathAnim" Offset="0x608" /> <!-- Original name is "uch_die_body" -->
-        <Animation Name="gAlienJerkingAnim" Offset="0x6C8" /> <!-- Original name is "uch_gaku_body" (probably short for the onomatopoeia for "jerking") -->
-
-        <!-- Assets for the flash of light that appears when an alien dies. -->
-        <DList Name="gAlienDeathFlashDL" Offset="0x720" />
-        <Texture Name="gAlienDeathFlashMaskTex" OutName="alien_death_flash_mask" Format="ia16" Width="32" Height="32" Offset="0x7B8" />
-
-        <!-- Alien Animations -->
-        <Animation Name="gAlienHoldingCowAnim" Offset="0x1674" /> <!-- Original name is "uch_take_body" -->
-        <Animation Name="gAlienFloatAnim" Offset="0x1D80" /> <!-- Original name is "uch_wait_body" -->
-
-        <!-- Alien Limb DisplayLists -->
-        <DList Name="gAlienHeadDL" Offset="0x2CD0" />
-        <DList Name="gAlienRightEyeDL" Offset="0x2F08" />
-        <DList Name="gAlienLeftEyeDL" Offset="0x2FA8" />
-        <DList Name="gAlienLeftShoulderDL" Offset="0x3048" />
-        <DList Name="gAlienLeftUpperArmDL" Offset="0x3128" />
-        <DList Name="gAlienLeftForearmDL" Offset="0x3290" />
-        <DList Name="gAlienLeftHandDL" Offset="0x3410" />
-        <DList Name="gAlienTorsoDL" Offset="0x35E8" />
-        <DList Name="gAlienRightShoulderDL" Offset="0x37E0" />
-        <DList Name="gAlienRightUpperArmDL" Offset="0x38C0" />
-        <DList Name="gAlienRightForearmDL" Offset="0x3A28" />
-        <DList Name="gAlienRightHandDL" Offset="0x3BA8" />
-
-        <!-- Alien Textures -->
-        <Texture Name="gAlienTLUT" OutName="alien_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3D80" />
-        <Texture Name="gAlienTorsoTex" OutName="alien_torso" Format="ci8" Width="16" Height="16" Offset="0x3F80" />
-        <Texture Name="gAlienHandsAndTorsoUndersideTex" OutName="alien_hands_and_torso_underside" Format="ci8" Width="16" Height="16" Offset="0x4080" />
-        <Texture Name="gAlienHeadFrontAndArmsTex" OutName="alien_head_front_and_arms" Format="ci8" Width="16" Height="32" Offset="0x4180" />
-        <Texture Name="gAlienHeadBackTex" OutName="alien_head_back" Format="ci8" Width="16" Height="32" Offset="0x4380" />
-        <Texture Name="gAlienEyeTex" OutName="alien_eye" Format="rgba16" Width="32" Height="32" Offset="0x4580" />
-
-        <!-- Alien Limbs -->
-        <Limb Name="gAlienRootLimb" Type="Standard" EnumName="ALIEN_LIMB_ROOT" Offset="0x4D80" />
-        <Limb Name="gAlienTorsoLimb" Type="Standard" EnumName="ALIEN_LIMB_TORSO" Offset="0x4D8C" />
-        <Limb Name="gAlienRightShoulderLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_SHOULDER" Offset="0x4D98" />
-        <Limb Name="gAlienRightUpperArmLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_UPPER_ARM" Offset="0x4DA4" />
-        <Limb Name="gAlienRightForearmLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_FOREARM" Offset="0x4DB0" />
-        <Limb Name="gAlienRightHandLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_HAND" Offset="0x4DBC" />
-        <Limb Name="gAlienLeftShoulderLimb" Type="Standard" EnumName="ALIEN_LIMB_LEFT_SHOULDER" Offset="0x4DC8" />
-        <Limb Name="gAlienLeftUpperArmLimb" Type="Standard" EnumName="ALIEN_LIMB_LEFT_UPPER_ARM" Offset="0x4DD4" />
-        <Limb Name="gAlienLeftForearmLimb" Type="Standard" EnumName="ALIEN_LIMB_LEFT_FOREARM" Offset="0x4DE0" />
-        <Limb Name="gAlienLeftHandLimb" Type="Standard" EnumName="ALIEN_LIMB_LEFT_HAND" Offset="0x4DEC" />
-        <Limb Name="gAlienHeadLimb" Type="Standard" EnumName="ALIEN_LIMB_HEAD" Offset="0x4DF8" />
-        <Limb Name="gAlienLeftEyeLimb" Type="Standard" EnumName="ALIEN_LIMB_LEFT_EYE" Offset="0x4E04" />
-        <Limb Name="gAlienRightEyeLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_EYE" Offset="0x4E10" />
-
-        <!-- Alien Skeleton -->
-        <Skeleton Name="gAlienSkel" Type="Flex" LimbType="Standard" LimbNone="ALIEN_LIMB_NONE" LimbMax="ALIEN_LIMB_MAX" EnumName="AlienLimb" Offset="0x4E50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_um.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_um.xml
deleted file mode 100644
index aac86a9a7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_um.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<Root>
-    <File Name="object_um" Segment="6">
-        <DList Name="object_um_DL_000040" Offset="0x40" />
-        <Texture Name="object_um_Tex_0000C8" OutName="tex_0000C8" Format="rgba16" Width="32" Height="32" Offset="0xC8" />
-        <DList Name="object_um_DL_000910" Offset="0x910" />
-        <Texture Name="object_um_Tex_000998" OutName="tex_000998" Format="rgba16" Width="32" Height="32" Offset="0x998" />
-        <DList Name="object_um_DL_0011E0" Offset="0x11E0" />
-        <Texture Name="object_um_Tex_001268" OutName="tex_001268" Format="rgba16" Width="32" Height="32" Offset="0x1268" />
-        <DList Name="object_um_DL_001EE0" Offset="0x1EE0" />
-        <Texture Name="object_um_Tex_002148" OutName="tex_002148" Format="rgba16" Width="32" Height="32" Offset="0x2148" />
-        <Texture Name="object_um_Tex_002948" OutName="tex_002948" Format="rgba16" Width="32" Height="32" Offset="0x2948" />
-        <Texture Name="object_um_Tex_003148" OutName="tex_003148" Format="rgba16" Width="32" Height="32" Offset="0x3148" />
-
-        <!-- The bottles which the bandits try to destroy in the milk-run minigame. Referred as "milk-bottles" by Cremia in-game. -->
-        <DList Name="gUmMinigamePotDL" Offset="0x3C60" />
-        <Texture Name="object_um_Tex_003F00" OutName="tex_003F00" Format="rgba16" Width="16" Height="16" Offset="0x3F00" />
-        <Texture Name="object_um_Tex_004100" OutName="tex_004100" Format="rgba16" Width="8" Height="8" Offset="0x4100" />
-        <DList Name="object_um_DL_0043E0" Offset="0x43E0" />
-        <Texture Name="object_um_Tex_004500" OutName="tex_004500" Format="i8" Width="32" Height="32" Offset="0x4500" />
-        <DList Name="object_um_DL_004B60" Offset="0x4B60" />
-        <Texture Name="object_um_Tex_004C80" OutName="tex_004C80" Format="i8" Width="32" Height="32" Offset="0x4C80" />
-        <DList Name="gUmBrokenMinigamePotDL" Offset="0x52B0" />
-        <Texture Name="object_um_TLUT_0054D0" OutName="tlut_0054D0" Format="rgba16" Width="16" Height="16" Offset="0x54D0" />
-        <Texture Name="object_um_Tex_0056D0" OutName="tex_0056D0" Format="ci8" Width="8" Height="8" Offset="0x56D0" />
-        <Texture Name="object_um_Tex_005710" OutName="tex_005710" Format="ci8" Width="32" Height="64" Offset="0x5710" />
-        <Texture Name="object_um_Tex_005F10" OutName="tex_005F10" Format="ci8" Width="32" Height="32" Offset="0x5F10" />
-        <DList Name="object_um_DL_0067C0" Offset="0x67C0" /> <!-- pre-minigame pot? -->
-        <Texture Name="object_um_TLUT_006AD0" OutName="tlut_006AD0" Format="rgba16" Width="16" Height="16" Offset="0x6AD0" />
-        <Texture Name="object_um_Tex_006CD0" OutName="tex_006CD0" Format="ci8" Width="8" Height="8" Offset="0x6CD0" />
-        <Texture Name="object_um_Tex_006D10" OutName="tex_006D10" Format="ci8" Width="32" Height="64" Offset="0x6D10" />
-        <Texture Name="object_um_Tex_007510" OutName="tex_007510" Format="rgba16" Width="32" Height="32" Offset="0x7510" />
-
-        <!-- <Blob Name="object_um_Blob_007D10" Size="0x10" Offset="0x7D10" /> -->
-
-        <Collision Name="object_um_Colheader_007E20" Offset="0x7E20" />
-        <Collision Name="object_um_Colheader_007F50" Offset="0x7F50" />
-
-        <DList Name="object_um_DL_00DF20" Offset="0xDF20" />
-        <DList Name="object_um_DL_00E2F0" Offset="0xE2F0" />
-        <DList Name="object_um_DL_00E6A8" Offset="0xE6A8" />
-        <DList Name="object_um_DL_00ED18" Offset="0xED18" />
-        <DList Name="object_um_DL_00EEB0" Offset="0xEEB0" />
-        <DList Name="object_um_DL_00F150" Offset="0xF150" />
-        <DList Name="object_um_DL_00F2D8" Offset="0xF2D8" />
-        <DList Name="object_um_DL_00F590" Offset="0xF590" />
-        <DList Name="object_um_DL_00F828" Offset="0xF828" />
-        <DList Name="object_um_DL_00F9B0" Offset="0xF9B0" />
-        <DList Name="object_um_DL_00FBF8" Offset="0xFBF8" />
-        <DList Name="object_um_DL_010178" Offset="0x10178" />
-        <DList Name="object_um_DL_0103E0" Offset="0x103E0" />
-        <DList Name="object_um_DL_010908" Offset="0x10908" />
-        <DList Name="object_um_DL_010AA8" Offset="0x10AA8" />
-        <DList Name="object_um_DL_010B40" Offset="0x10B40" />
-        <DList Name="object_um_DL_010BD8" Offset="0x10BD8" />
-        <DList Name="object_um_DL_010CC8" Offset="0x10CC8" />
-        <DList Name="object_um_DL_0114B8" Offset="0x114B8" />
-
-        <Limb Name="gUmWagonSeatAndShaftsLimb" Type="Standard" EnumName="UM_LIMB_SEAT_AND_SHAFTS" Offset="0x11CA8" /> <!-- Chair and donkey attachment -->
-        <Limb Name="gUmWagonRootLimb" Type="Standard" EnumName="UM_LIMB_WAGON_ROOT" Offset="0x11CB4" />
-        <Limb Name="gUmWagonRightWheelLimb" Type="Standard" EnumName="UM_LIMB_WAGON_RIGHT_WHEEL" Offset="0x11CC0" />
-        <Limb Name="gUmWagonLeftWheelLimb" Type="Standard" EnumName="UM_LIMB_WAGON_LEFT_WHEEL" Offset="0x11CCC" />
-        <Limb Name="gUmWagonCartBedLimb" Type="Standard" EnumName="UM_LIMB_WAGON_CART_BED" Offset="0x11CD8" />
-        <Limb Name="gUmWagonHandBrakeLimb" Type="Standard" EnumName="UM_LIMB_WAGON_HAND_BRAKE" Offset="0x11CE4" />
-        <Limb Name="gUmWagonCartCoverLimb" Type="Standard" EnumName="UM_LIMB_WAGON_CART_COVER" Offset="0x11CF0" />
-        <Limb Name="gUmWagonLeftLeafSpringLimb" Type="Standard" EnumName="UM_LIMB_WAGON_LEFT_LEAF_SPRING" Offset="0x11CFC" />
-        <Limb Name="gUmWagonRightLeafSpringLimb" Type="Standard" EnumName="UM_LIMB_WAGON_RIGHT_LEAF_SPRING" Offset="0x11D08" />
-        <Limb Name="gUmWagonSteeringWheelLimb" Type="Standard" EnumName="UM_LIMB_WAGON_STEERING_WHEEL" Offset="0x11D14" />
-        <Limb Name="gUmCremiaRootLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_ROOT" Offset="0x11D20" />
-        <Limb Name="gUmCremiaTorsoLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_TORSO" Offset="0x11D2C" />
-        <Limb Name="gUmCremiaHeadLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_HEAD" Offset="0x11D38" />
-        <Limb Name="gUmCremiaHairEndLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_HAIR_END" Offset="0x11D44" />
-        <Limb Name="gUmCremiaLeftUpperArmLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_LEFT_UPPER_ARM" Offset="0x11D50" />
-        <Limb Name="gUmCremiaLeftForearmLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_LEFT_FOREARM" Offset="0x11D5C" />
-        <Limb Name="gUmCremiaLeftHandLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_LEFT_HAND" Offset="0x11D68" />
-        <Limb Name="gUmCremiaRightUpperArmLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_RIGHT_UPPER_ARM" Offset="0x11D74" />
-        <Limb Name="gUmCremiaRightForearmLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_RIGHT_FOREARM" Offset="0x11D80" />
-        <Limb Name="gUmCremiaRightHandLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_RIGHT_HAND" Offset="0x11D8C" />
-        <Limb Name="gUmCremiaLowerBodyLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_LOWER_BODY" Offset="0x11D98" />
-
-        <Skeleton Name="gUmSkel" Type="Flex" LimbType="Standard" LimbNone="UM_LIMB_NONE" LimbMax="UM_LIMB_MAX" EnumName="ObjectUmLimb" Offset="0x11DF8" />
-
-        <Animation Name="gUmGallopAnim" Offset="0x1213C" />
-        <Animation Name="gUmLookBackAnim" Offset="0x126C4" />
-        <Animation Name="gUmTrotAnim" Offset="0x12CC0" />
-
-        <Texture Name="object_um_TLUT_012CD0" OutName="tlut_012CD0" Format="rgba16" Width="16" Height="16" Offset="0x12CD0" />
-        <Texture Name="object_um_TLUT_012ED0" OutName="tlut_012ED0" Format="rgba16" Width="16" Height="16" Offset="0x12ED0" />
-        <Texture Name="object_um_TLUT_0130D0" OutName="tlut_0130D0" Format="rgba16" Width="16" Height="16" Offset="0x130D0" />
-        <Texture Name="object_um_TLUT_0132D0" OutName="tlut_0132D0" Format="rgba16" Width="16" Height="16" Offset="0x132D0" />
-        <Texture Name="object_um_Tex_0134D0" OutName="tex_0134D0" Format="ci8" Width="32" Height="32" Offset="0x134D0" />
-        <Texture Name="object_um_Tex_0138D0" OutName="tex_0138D0" Format="ci8" Width="32" Height="32" Offset="0x138D0" />
-        <Texture Name="object_um_Tex_013CD0" OutName="tex_013CD0" Format="rgba16" Width="32" Height="32" Offset="0x13CD0" />
-        <Texture Name="object_um_Tex_0144D0" OutName="tex_0144D0" Format="ci8" Width="32" Height="64" Offset="0x144D0" />
-        <Texture Name="object_um_Tex_014CD0" OutName="tex_014CD0" Format="ci8" Width="32" Height="64" Offset="0x14CD0" />
-        <Texture Name="object_um_Tex_0154D0" OutName="tex_0154D0" Format="ci8" Width="32" Height="64" Offset="0x154D0" />
-        <Texture Name="object_um_Tex_015CD0" OutName="tex_015CD0" Format="rgba16" Width="32" Height="32" Offset="0x15CD0" />
-
-        <Texture Name="gUmCremiaEyeOpenTex" OutName="cremia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x164D0" TlutOffset="0x130D0" />
-        <Texture Name="gUmCremiaEyeHalfTex" OutName="cremia_eye_half" Format="ci8" Width="32" Height="32" Offset="0x168D0" TlutOffset="0x130D0" />
-        <Texture Name="gUmCremiaEyeClosedTex" OutName="cremia_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x16CD0" TlutOffset="0x130D0" />
-        <Texture Name="gUmCremiaEyeHappyTex" OutName="cremia_eye_happy" Format="ci8" Width="32" Height="32" Offset="0x170D0" TlutOffset="0x130D0" />
-        <Texture Name="gUmCremiaEyeAngryTex" OutName="cremia_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x174D0" TlutOffset="0x130D0" />
-        <Texture Name="gUmCremiaEyeSadTex" OutName="cremia_eye_sad" Format="ci8" Width="32" Height="32" Offset="0x178D0" TlutOffset="0x130D0" />
-
-        <Texture Name="gUmMouthNormalTex" OutName="mouth_normal" Format="ci8" Width="32" Height="16" Offset="0x17CD0" TlutOffset="0x130D0" />
-        <Texture Name="gUmMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x17ED0" TlutOffset="0x130D0" />
-        <Texture Name="gUmMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="16" Offset="0x180D0" TlutOffset="0x130D0" />
-        <Texture Name="gUmMouthHangingOpenTex" OutName="mouth_hanging_open" Format="ci8" Width="32" Height="16" Offset="0x182D0" TlutOffset="0x130D0" />
-
-        <Texture Name="object_um_Tex_0184D0" OutName="tex_0184D0" Format="ci8" Width="8" Height="8" Offset="0x184D0" />
-        <Texture Name="object_um_Tex_018510" OutName="tex_018510" Format="ci8" Width="16" Height="16" Offset="0x18510" />
-        <Texture Name="object_um_Tex_018610" OutName="tex_018610" Format="ci8" Width="16" Height="16" Offset="0x18610" />
-        <Texture Name="object_um_Tex_018710" OutName="tex_018710" Format="ci8" Width="8" Height="8" Offset="0x18710" />
-        <Texture Name="object_um_Tex_018750" OutName="tex_018750" Format="ci8" Width="16" Height="16" Offset="0x18750" />
-        <Texture Name="object_um_Tex_018850" OutName="tex_018850" Format="ci8" Width="16" Height="16" Offset="0x18850" />
-        <Texture Name="object_um_Tex_018950" OutName="tex_018950" Format="ci8" Width="8" Height="16" Offset="0x18950" />
-        <Texture Name="object_um_Tex_0189D0" OutName="tex_0189D0" Format="ci8" Width="8" Height="8" Offset="0x189D0" />
-        <Texture Name="object_um_Tex_018A10" OutName="tex_018A10" Format="rgba16" Width="16" Height="32" Offset="0x18A10" />
-        <Texture Name="object_um_Tex_018E10" OutName="tex_018E10" Format="ci8" Width="32" Height="16" Offset="0x18E10" />
-        <Texture Name="object_um_Tex_019010" OutName="tex_019010" Format="ci8" Width="16" Height="32" Offset="0x19010" />
-        <Texture Name="object_um_Tex_019210" OutName="tex_019210" Format="ci8" Width="16" Height="16" Offset="0x19210" />
-        <Texture Name="object_um_Tex_019310" OutName="tex_019310" Format="ci8" Width="16" Height="32" Offset="0x19310" />
-        <Texture Name="object_um_Tex_019510" OutName="tex_019510" Format="ci8" Width="64" Height="16" Offset="0x19510" />
-        <Animation Name="gUmIdleAnim" Offset="0x19E10" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_umajump.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_umajump.xml
deleted file mode 100644
index cec43c3a6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_umajump.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="object_umajump" Segment="6">
-        <Texture Name="object_umajump_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="64" Offset="0x0" />
-        <Texture Name="object_umajump_Tex_000800" OutName="tex_000800" Format="rgba16" Width="16" Height="64" Offset="0x800" />
-        <DList Name="gHorseJumpFenceDL" Offset="0x1220" />
-        <Collision Name="object_umajump_Colheader_001438" Offset="0x1438" />
-        <Collision Name="object_umajump_Colheader_001558" Offset="0x1558" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_utubo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_utubo.xml
deleted file mode 100644
index 4ce3d64f0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_utubo.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <!-- Assets for Deep Python -->
-    <File Name="object_utubo" Segment="6">
-        <Animation Name="gDeepPythonMultiDirectionalSwayAnim" Offset="0x82C" /> <!-- Unused -->
-
-        <!-- Deep Python Limb DisplayLists -->
-        <DList Name="gDeepPythonHeadDL" Offset="0x20B0" />
-        <DList Name="gDeepPythonJawDL" Offset="0x2358" />
-        <DList Name="gDeepPythonCollarDL" Offset="0x2440" />
-        <DList Name="gDeepPythonBodySegment1DL" Offset="0x2580" />
-        <DList Name="gDeepPythonBodySegment2DL" Offset="0x2738" />
-        <DList Name="gDeepPythonBodySegment3DL" Offset="0x28A0" />
-        <DList Name="gDeepPythonBodySegment4DL" Offset="0x2A08" />
-        <DList Name="gDeepPythonBodySegment7DL" Offset="0x2B18" />
-        <DList Name="gDeepPythonBodySegment6DL" Offset="0x2C28" />
-        <DList Name="gDeepPythonBodySegment5DL" Offset="0x2D38" />
-
-        <!-- Deep Python Textures -->
-        <Texture Name="gDeepPythonHeadAndCollarTLUT" OutName="deep_python_head_and_collar_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2E48" />
-        <Texture Name="gDeepPythonBodySegment1FrontTLUT" OutName="deep_python_body_segment_1_front_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2E68" />
-        <Texture Name="gDeepPythonBodyTLUT" OutName="deep_python_body_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2E88" />
-        <Texture Name="gDeepPythonHeadAndCollarTex" OutName="deep_python_head_and_collar" Format="ci4" Width="64" Height="64" Offset="0x2EA8" />
-        <Texture Name="gDeepPythonEyeTex" OutName="deep_python_eye" Format="rgba16" Width="32" Height="32" Offset="0x36A8" />
-        <Texture Name="gDeepPythonBodySegment1FrontTex" OutName="deep_python_body_segment_1_front" Format="ci4" Width="32" Height="32" Offset="0x3EA8" />
-        <Texture Name="gDeepPythonBodyTex" OutName="deep_python_body" Format="ci4" Width="32" Height="32" Offset="0x40A8" />
-
-        <!-- Deep Python Limbs -->
-        <Limb Name="gDeepPythonRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_ROOT" Offset="0x42A8" />
-        <Limb Name="gDeepPythonMiddleBodyRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_MIDDLE_BODY_ROOT" Offset="0x42B4" />
-        <Limb Name="gDeepPythonBodySegment4Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_4" Offset="0x42C0" />
-        <Limb Name="gDeepPythonBodySegment5Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_5" Offset="0x42CC" />
-        <Limb Name="gDeepPythonBodySegment6Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_6" Offset="0x42D8" />
-        <Limb Name="gDeepPythonBodySegment7Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_7" Offset="0x42E4" />
-        <Limb Name="gDeepPythonBodySegment3Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_3" Offset="0x42F0" />
-        <Limb Name="gDeepPythonUpperBodyRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_UPPER_BODY_ROOT" Offset="0x42FC" />
-        <Limb Name="gDeepPythonBodySegment2Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_2" Offset="0x4308" />
-        <Limb Name="gDeepPythonBodySegment1Limb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_BODY_SEGMENT_1" Offset="0x4314" />
-        <Limb Name="gDeepPythonHeadAndCollarRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_HEAD_AND_COLLAR_ROOT" Offset="0x4320" />
-        <Limb Name="gDeepPythonCollarLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_COLLAR" Offset="0x432C" />
-        <Limb Name="gDeepPythonHeadLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_HEAD" Offset="0x4338" />
-        <Limb Name="gDeepPythonJawRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_JAW_ROOT" Offset="0x4344" />
-        <Limb Name="gDeepPythonJawLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_JAW" Offset="0x4350" />
-
-        <!-- Deep Python Skeleton -->
-        <Skeleton Name="gDeepPythonSkel" Type="Flex" LimbType="Standard" LimbNone="DEEP_PYTHON_LIMB_NONE" LimbMax="DEEP_PYTHON_LIMB_MAX" EnumName="DeepPythonLimb" Offset="0x4398" />
-
-        <!-- Deep Python Animations -->
-        <Animation Name="gDeepPythonUnusedSideSwayAnim" Offset="0x4518" /> <!-- Unused duplicate of gDeepPythonSmallSideSwayAnim -->
-        <Animation Name="gDeepPythonVerticalSwayAnim" Offset="0x4740" /> <!-- Referenced by En_Dragon, but never actually used in the final game. -->
-        <Animation Name="gDeepPythonSmallSideSwayAnim" Offset="0x48B8" /> <!-- Original name might be "utubo_wait" -->
-        <Animation Name="gDeepPythonLargeSideSwayAnim" Offset="0x4ABC" /> <!-- Original name might be "utubo_yoko" ("side-to-side") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_visiblock.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_visiblock.xml
deleted file mode 100644
index cae048322..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_visiblock.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <!-- Object for Lens of Truth Platform -->
-    <File Name="object_visiblock" Segment="6">
-        <DList Name="gLensOfTruthPlatformDL" Offset="0x140" />
-        <DList Name="gLensOfTruthPlatformEmptyDL" Offset="0x1E8" />
-        <Texture Name="gLensOfTruthPlatformTex" OutName="lens_of_truth_platform" Format="rgba16" Width="32" Height="32" Offset="0x1F0" />
-        <Collision Name="gLensOfTruthPlatformCol" Offset="0xAD0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_vm.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_vm.xml
deleted file mode 100644
index 8fb9fde20..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_vm.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-    <File Name="object_vm" Segment="6">
-        <!-- Beamos Animations -->
-        <Animation Name="gBeamosAnim" Offset="0x68" />
-        
-        <!-- Beamos Limb DisplayLists -->
-        <DList Name="gBeamosBodyDL" Offset="0x1E00" />
-        <DList Name="gBeamosTopEyelidDL" Offset="0x22B0" />
-        <DList Name="gBeamosBottomEyelidDL" Offset="0x2460" />
-        <DList Name="gBeamosEyeDL" Offset="0x2610" />
-
-        <!-- Beamos Laser DisplayList -->
-        <DList Name="gBeamosLaserDL" Offset="0x2728" />
-
-        <!-- Beamos DisplayList Textures -->
-        <Texture Name="gBeamosBodyGradientTex" OutName="beamos_body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0" />
-        <Texture Name="gBeamosGrayMetalTex" OutName="beamos_gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840" />
-        <Texture Name="gBeamosBoltAndMetalTex" OutName="beamos_bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940" />
-        <Texture Name="gBeamosInnerEyeLidTex" OutName="beamos_inner_eye_lid" Format="rgba16" Width="16" Height="8" Offset="0x2D40" />
-        <Texture Name="gBeamosEyeOutlineTex" OutName="beamos_eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40" />
-        <Texture Name="gBeamosEyeTex" OutName="beamos_eye" Format="rgba16" Width="32" Height="16" Offset="0x3040" />
-        <Texture Name="gBeamosBodyTex" OutName="beamos_body" Format="rgba16" Width="16" Height="16" Offset="0x3440" />
-        <Texture Name="gBeamosLaserTex" OutName="beamos_laser" Format="rgba16" Width="8" Height="8" Offset="0x3640" />
-        <Texture Name="gBeamosTeethTex" OutName="beamos_teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0" />
-
-        <!-- Beamos Skeleton Limbs -->
-        <Limb Name="gBeamosRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_ROOT" Offset="0x3EC0" />
-        <Limb Name="gBeamosHeadRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_HEAD_ROOT" Offset="0x3ECC" />
-        <Limb Name="gBeamosTopEyelidRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_TOP_EYELID_ROOT" Offset="0x3ED8" />
-        <Limb Name="gBeamosTopEyelidWrapperLimb" Type="Standard" EnumName="BEAMOS_LIMB_TOP_EYELID_WRAPPER" Offset="0x3EE4" />
-        <Limb Name="gBeamosTopEyelidLimb" Type="Standard" EnumName="BEAMOS_LIMB_TOP_EYELID" Offset="0x3EF0" />
-        <Limb Name="gBeamosBottomEyelidRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_BOTTOM_EYELID_ROOT" Offset="0x3EFC" />
-        <Limb Name="gBeamosBottomEyelidWrapperLimb" Type="Standard" EnumName="BEAMOS_LIMB_BOTTOM_EYELID_WRAPPER" Offset="0x3F08" />
-        <Limb Name="gBeamosBottomEyelidLimb" Type="Standard" EnumName="BEAMOS_LIMB_BOTTEM_EYELID" Offset="0x3F14" />
-        <Limb Name="gBeamosEyeLimb" Type="Standard" EnumName="BEAMOS_LIMB_EYE" Offset="0x3F20" />
-        <Limb Name="gBeamosBodyLimb" Type="Standard" EnumName="BEAMOS_LIMB_BODY" Offset="0x3F2C" />
-
-        <!-- Beamos Skeleton -->
-        <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" LimbNone="BEAMOS_LIMB_NONE" LimbMax="BEAMOS_LIMB_MAX" EnumName="BeamosLimb" Offset="0x3F60" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wallmaster.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wallmaster.xml
deleted file mode 100644
index afe3843e3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wallmaster.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Root>
-    <!-- Assets for both Wallmasters and Floormasters. -->
-    <File Name="object_wallmaster" Segment="6">
-        <Animation Name="gWallmasterDamageAnim" Offset="0x590" /> <!-- Original name is "wm_damage" -->
-        <Animation Name="gWallmasterRecoverFromDamageAnim" Offset="0xEA4" /> <!-- Original name is "wm_damage_wait" -->
-        <Animation Name="gWallmasterJumpAnim" Offset="0x19CC" /> <!-- Original name is "wm_f_jump" -->
-        <Animation Name="gFloormasterTurnAnim" Offset="0x2158" /> <!-- Original name is "wm_l_turn" -->
-        <Animation Name="gWallmasterLungeAnim" Offset="0x299C" /> <!-- Original name is "wm_link_hangup" -->
-        <Animation Name="gWallmasterMissAnim" Offset="0x3120" /> <!-- Unused. Original name is "wm_miss" -->
-        <Animation Name="gFloormasterTapFingerAnim" Offset="0x39B0" /> <!-- Original name is "wm_motionA" -->
-        <Animation Name="gWallmasterWalkAnim" Offset="0x41F4" /> <!-- Original name is "wm_move" -->
-
-        <!-- Wallmaster/Floormaster Limb DisplayLists -->
-        <DList Name="gWallmasterThumbDistalDL" Offset="0x6660" />
-        <DList Name="gWallmasterThumbMiddleDL" Offset="0x6800" />
-        <DList Name="gWallmasterThumbProximalDL" Offset="0x6A20" />
-        <DList Name="gWallmasterWristDL" Offset="0x6C58" />
-        <DList Name="gWallmasterMiddleFingerDistalDL" Offset="0x6E98" />
-        <DList Name="gWallmasterMiddleFingerMiddleDL" Offset="0x7038" />
-        <DList Name="gWallmasterMiddleFingerProximalDL" Offset="0x7258" />
-        <DList Name="gWallmasterRingFingerDistalDL" Offset="0x7408" />
-        <DList Name="gWallmasterRingFingerMiddleDL" Offset="0x75A8" />
-        <DList Name="gWallmasterRingFingerProximalDL" Offset="0x77C8" />
-        <DList Name="gWallmasterIndexFingerDistalDL" Offset="0x7978" />
-        <DList Name="gWallmasterIndexFingerMiddleDL" Offset="0x7B18" />
-        <DList Name="gWallmasterIndexFingerProximalDL" Offset="0x7CE8" />
-        <DList Name="gWallmasterHandDL" Offset="0x7E98" />
-
-        <!-- Wallmaster/Floormaster Little Finger DisplayList. Not part of the skeleton, unlike the other fingers. -->
-        <DList Name="gWallmasterLittleFingerDL" Offset="0x8688" />
-
-        <!-- Wallmaster/Floormaster Textures -->
-        <Texture Name="gWallmasterWristTopTex" OutName="wallmaster_wrist_top" Format="rgba16" Width="8" Height="16" Offset="0x88F0" />
-        <Texture Name="gWallmasterWristSidesTex" OutName="wallmaster_wrist_sides" Format="rgba16" Width="8" Height="16" Offset="0x89F0" />
-        <Texture Name="gWallmasterHandBackTex" OutName="wallmaster_hand_back" Format="rgba16" Width="8" Height="8" Offset="0x8AF0" />
-        <Texture Name="gWallmasterFingerTipTex" OutName="wallmaster_finger_tip" Format="rgba16" Width="4" Height="16" Offset="0x8B70" />
-        <Texture Name="gWallmasterJointsAndSidesTex" OutName="wallmaster_joints_and_sides" Format="rgba16" Width="4" Height="8" Offset="0x8BF0" />
-        <Texture Name="gWallmasterPalmAndFingerPadTex" OutName="wallmaster_palm_and_finger_pad" Format="rgba16" Width="8" Height="16" Offset="0x8C30" />
-        <Texture Name="gWallmasterKnuckleAndFingerTopTex" OutName="wallmaster_knuckle_and_finger_top" Format="rgba16" Width="8" Height="16" Offset="0x8D30" />
-
-        <!-- Wallmaster/Floormaster Limbs -->
-        <Limb Name="gWallmasterRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_ROOT" Offset="0x8E30" />
-        <Limb Name="gWallmasterHandLimb" Type="Standard" EnumName="WALLMASTER_LIMB_HAND" Offset="0x8E3C" />
-        <Limb Name="gWallmasterIndexFingerRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_INDEX_FINGER_ROOT" Offset="0x8E48" />
-        <Limb Name="gWallmasterIndexFingerProximalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_INDEX_FINGER_PROXIMAL" Offset="0x8E54" />
-        <Limb Name="gWallmasterIndexFingerDistalRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_INDEX_FINGER_DISTAL_ROOT" Offset="0x8E60" />
-        <Limb Name="gWallmasterIndexFingerMiddleLimb" Type="Standard" EnumName="WALLMASTER_LIMB_INDEX_FINGER_MIDDLE" Offset="0x8E6C" />
-        <Limb Name="gWallmasterIndexFingerDistalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_INDEX_FINGER_DISTAL" Offset="0x8E78" />
-        <Limb Name="gWallmasterRingFingerRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_RING_FINGER_ROOT" Offset="0x8E84" />
-        <Limb Name="gWallmasterRingFingerProximalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_RING_FINGER_PROXIMAL" Offset="0x8E90" />
-        <Limb Name="gWallmasterRingFingerDistalRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_RING_FINGER_DISTAL_ROOT" Offset="0x8E9C" />
-        <Limb Name="gWallmasterRingFingerMiddleLimb" Type="Standard" EnumName="WALLMASTER_LIMB_RING_FINGER_MIDDLE" Offset="0x8EA8" />
-        <Limb Name="gWallmasterRingFingerDistalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_RING_FINGER_DISTAL" Offset="0x8EB4" />
-        <Limb Name="gWallmasterMiddleFingerRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_MIDDLE_FINGER_ROOT" Offset="0x8EC0" />
-        <Limb Name="gWallmasterMiddleFingerProximalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_MIDDLE_FINGER_PROXIMAL" Offset="0x8ECC" />
-        <Limb Name="gWallmasterMiddleFingerDistalRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_MIDDLE_FINGER_DISTAL_ROOT" Offset="0x8ED8" />
-        <Limb Name="gWallmasterMiddleFingerMiddleLimb" Type="Standard" EnumName="WALLMASTER_LIMB_MIDDLE_FINGER_MIDDLE" Offset="0x8EE4" />
-        <Limb Name="gWallmasterMiddleFingerDistalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_MIDDLE_FINGER_DISTAL" Offset="0x8EF0" />
-        <Limb Name="gWallmasterWristRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_WRIST_ROOT" Offset="0x8EFC" />
-        <Limb Name="gWallmasterWristLimb" Type="Standard" EnumName="WALLMASTER_LIMB_WRIST" Offset="0x8F08" />
-        <Limb Name="gWallmasterThumbRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_ROOT" Offset="0x8F14" />
-        <Limb Name="gWallmasterThumbProximalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_PROXIMAL" Offset="0x8F20" />
-        <Limb Name="gWallmasterThumbDistalRootLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_DISTAL_ROOT" Offset="0x8F2C" />
-        <Limb Name="gWallmasterThumbMiddleLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_MIDDLE" Offset="0x8F38" />
-        <Limb Name="gWallmasterThumbDistalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_DISTAL" Offset="0x8F44" />
-
-        <!-- Wallmaster/Floormaster Skeleton-->
-        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" LimbNone="WALLMASTER_LIMB_NONE" LimbMax="WALLMASTER_LIMB_MAX" EnumName="WallmasterLimb" Offset="0x8FB0" />
-        
-        <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244" /> <!-- Original name is "wm_move_wait" -->
-        <Animation Name="gWallmasterHoverAnim" Offset="0x9520" /> <!-- Original name is "wm_success" -->
-        <Animation Name="gWallmasterIdleAnim" Offset="0x9DB0" /> <!-- Original name is "wm_wait" -->
-        <Animation Name="gWallmasterStandUpAnim" Offset="0xA054" /> <!-- Original name is "wm_wait_move" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_warp1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_warp1.xml
deleted file mode 100644
index 0f6fe168b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_warp1.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<Root>
-    <!-- Assets for the warp portal, warp crystal, the boss warp platform, and related effects. -->
-    <File Name="object_warp1" Segment="6">
-        <!-- Assets for the portal that the player can walk into to warp out of boss rooms. Often called a "blue warp". -->
-        <DList Name="gWarpPortalDL" Offset="0x1A0" /> <!-- Original name is "warp_2_modelT" -->
-        <Texture Name="gWarpPortalTex" OutName="warp_portal" Format="i8" Width="64" Height="64" Offset="0x2C0" />
-
-        <!-- Warp Crystal Animation -->
-        <Animation Name="gWarpCrystalAnim" Offset="0x1374" /> <!-- Original name is "crystal_anim" -->
-
-        <!-- Warp Crystal Limb DisplayLists -->
-        <DList Name="gWarpCrystalBottomDL" Offset="0x1750" />
-        <DList Name="gWarpCrystalTopSegment1DL" Offset="0x1828" />
-        <DList Name="gWarpCrystalTopSegment2DL" Offset="0x18B0" />
-        <DList Name="gWarpCrystalTopSegment3DL" Offset="0x1938" />
-        <DList Name="gWarpCrystalTopSegment4DL" Offset="0x19C0" />
-        <DList Name="gWarpCrystalTopSegment5DL" Offset="0x1A48" />
-        <DList Name="gWarpCrystalTopSegment6DL" Offset="0x1AD0" />
-
-        <!-- Warp Crystal Limb Texture -->
-        <Texture Name="gWarpCrystalTex" OutName="warp_crystal" Format="i8" Width="64" Height="64" Offset="0x1B58" />
-
-        <!-- Warp Crystal Limbs -->
-        <Limb Name="gWarpCrystalRootLimb" Type="Standard" EnumName="WARP_CRYSTAL_LIMB_ROOT" Offset="0x2B58" />
-        <Limb Name="gWarpCrystalWrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_LIMB_WRAPPER" Offset="0x2B64" />
-        <Limb Name="gWarpCrystalBottomLimb" Type="Standard" EnumName="WARP_CRYSTAL_LIMB_BOTTOM" Offset="0x2B70" />
-        <Limb Name="gWarpCrystalTopSegment1RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_1_ROOT" Offset="0x2B7C" />
-        <Limb Name="gWarpCrystalTopSegment1WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_1_WRAPPER" Offset="0x2B88" />
-        <Limb Name="gWarpCrystalTopSegment1Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_1" Offset="0x2B94" />
-        <Limb Name="gWarpCrystalTopSegment2RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_2_ROOT" Offset="0x2BA0" />
-        <Limb Name="gWarpCrystalTopSegment2WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_2_WRAPPER" Offset="0x2BAC" />
-        <Limb Name="gWarpCrystalTopSegment2Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_2" Offset="0x2BB8" />
-        <Limb Name="gWarpCrystalTopSegment3RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_3_ROOT" Offset="0x2BC4" />
-        <Limb Name="gWarpCrystalTopSegment3WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_3_WRAPPER" Offset="0x2BD0" />
-        <Limb Name="gWarpCrystalTopSegment3Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_3" Offset="0x2BDC" />
-        <Limb Name="gWarpCrystalTopSegment4RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_4_ROOT" Offset="0x2BE8" />
-        <Limb Name="gWarpCrystalTopSegment4WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_4_WRAPPER" Offset="0x2BF4" />
-        <Limb Name="gWarpCrystalTopSegment4Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_4" Offset="0x2C00" />
-        <Limb Name="gWarpCrystalTopSegment5RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_5_ROOT" Offset="0x2C0C" />
-        <Limb Name="gWarpCrystalTopSegment5WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_5_WRAPPER" Offset="0x2C18" />
-        <Limb Name="gWarpCrystalTopSegment5Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_5" Offset="0x2C24" />
-        <Limb Name="gWarpCrystalTopSegment6RootLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_6_ROOT" Offset="0x2C30" />
-        <Limb Name="gWarpCrystalTopSegment6WrapperLimb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_6_WRAPPER" Offset="0x2C3C" />
-        <Limb Name="gWarpCrystalTopSegment6Limb" Type="Standard" EnumName="WARP_CRYSTAL_TOP_SEGMENT_6" Offset="0x2C48" />
-
-        <!-- Warp Crystal Skeleton -->
-        <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" LimbNone="WARP_CRYSTAL_LIMB_NONE" LimbMax="WARP_CRYSTAL_LIMB_MAX" EnumName="WarpCrystalLimb" Offset="0x2CA8" />
-
-        <!-- Assets for the beam that falls from the sky to activate a boss warp. -->
-        <DList Name="gWarpBossWarpActivationBeamDL" Offset="0x3230" /> <!-- Original name is "boss_warp1_modelT" -->
-        <DList Name="gWarpBossWarpActivationBeamEmptyDL" Offset="0x34C8" />
-        <Texture Name="gWarpBossWarpActivationBeamTex" OutName="warp_boss_warp_activation_beam" Format="i8" Width="32" Height="64" Offset="0x34D0" />
-        <Texture Name="gWarpBossWarpActivationBeamMaskTex" OutName="warp_boss_warp_activation_beam_mask" Format="i8" Width="32" Height="64" Offset="0x3CD0" />
-        <TextureAnimation Name="gWarpBossWarpActivationBeamTexAnim" Offset="0x44D8" />
-
-        <!-- Assets for the light shafts that rise upwards from an activated boss warp. -->
-        <DList Name="gWarpBossWarpLightShaftsDL" Offset="0x4690" /> <!-- Original name is "boss_warp2_modelT" -->
-        <DList Name="gWarpBossWarpLightShaftsEmptyDL" Offset="0x47C8" />
-        <Texture Name="gWarpBossWarpLightShaftsTex" OutName="warp_boss_warp_light_shafts" Format="i4" Width="64" Height="64" Offset="0x47D0" />
-        <Texture Name="gWarpBossWarpLightShaftsMaskTex" OutName="warp_boss_warp_light_shafts_mask" Format="i4" Width="64" Height="64" Offset="0x4FD0" />
-        <TextureAnimation Name="gWarpBossWarpLightShaftsTexAnim" Offset="0x57D8" />
-
-        <!-- Assets for the glow that covers the top of an activated boss warp platform. -->
-        <DList Name="gWarpBossWarpGlowEmptyDL" Offset="0x58C0" />
-        <DList Name="gWarpBossWarpGlowDL" Offset="0x58C8" /> <!-- Original name is "boss_warp3_model" -->
-        <Texture Name="gWarpBossWarpGlowBottomMaskTex" OutName="warp_boss_warp_glow_bottom_mask" Format="i4" Width="64" Height="64" Offset="0x5A30" />
-        <Texture Name="gWarpBossWarpGlowTopMaskTex" OutName="warp_boss_warp_glow_top_mask" Format="i4" Width="64" Height="64" Offset="0x6230" />
-        <Texture Name="gWarpBossWarpGlowTex" OutName="warp_boss_warp_glow" Format="i8" Width="32" Height="64" Offset="0x6A30" />
-        <TextureAnimation Name="gWarpBossWarpGlowTexAnim" Offset="0x7238" />
-
-        <!-- Assets for the Majora's Mask-shaped boss warp platform. -->
-        <DList Name="gWarpBossWarpPlatformDL" Offset="0x76C0" /> <!-- Original name is "m2_BossWarp_model" -->
-        <Texture Name="gWarpBossWarpPlatformBottomTLUT" OutName="warp_boss_warp_platform_bottom_tlut" Format="rgba16" Width="4" Height="4" Offset="0x78A0" />
-        <Texture Name="gWarpBossWarpPlatformTopTLUT" OutName="warp_boss_warp_platform_top_tlut" Format="rgba16" Width="4" Height="4" Offset="0x78C0" />
-        <Texture Name="gWarpBossWarpPlatformBottomTex" OutName="warp_boss_warp_platform_bottom" Format="ci4" Width="64" Height="64" Offset="0x78E0" />
-        <Texture Name="gWarpBossWarpPlatformTopTex" OutName="warp_boss_warp_platform_top" Format="ci4" Width="64" Height="64" Offset="0x80E0" />
-        <Collision Name="gWarpBossWarpPlatformCol" Offset="0x8BD4" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_warp_uzu.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_warp_uzu.xml
deleted file mode 100644
index 4924c86ca..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_warp_uzu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_warp_uzu" Segment="6">
-        <DList Name="object_warp_uzu_DL_000EC0" Offset="0xEC0" />
-        <Texture Name="object_warp_uzu_TLUT_0019D0" OutName="tlut_0019D0" Format="rgba16" Width="16" Height="16" Offset="0x19D0" />
-        <Texture Name="object_warp_uzu_Tex_001BD0" OutName="tex_001BD0" Format="rgba16" Width="16" Height="32" Offset="0x1BD0" />
-        <Texture Name="object_warp_uzu_Tex_001FD0" OutName="tex_001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" />
-        <Texture Name="object_warp_uzu_Tex_002010" OutName="tex_002010" Format="ci8" Width="32" Height="32" Offset="0x2010" />
-        <Texture Name="object_warp_uzu_Tex_002410" OutName="tex_002410" Format="ci8" Width="8" Height="8" Offset="0x2410" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_water_effect.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_water_effect.xml
deleted file mode 100644
index e3cd9ec27..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_water_effect.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Root>
-    <File Name="object_water_effect" Segment="6">
-        <DList Name="object_water_effect_DL_000180" Offset="0x180" />
-        <DList Name="object_water_effect_DL_000420" Offset="0x420" />
-        <DList Name="object_water_effect_DL_000730" Offset="0x730" />
-        <DList Name="object_water_effect_DL_000A48" Offset="0xA48" />
-        <DList Name="object_water_effect_DL_000CD8" Offset="0xCD8" />
-        <TextureAnimation Name="object_water_effect_Matanimheader_000DD0" Offset="0xDD0" />
-        <TextureAnimation Name="object_water_effect_Matanimheader_000DE0" Offset="0xDE0" />
-        <TextureAnimation Name="object_water_effect_Matanimheader_000E0C" Offset="0xE0C" />
-        <TextureAnimation Name="object_water_effect_Matanimheader_000E40" Offset="0xE40" />
-        <TextureAnimation Name="object_water_effect_Matanimheader_000E58" Offset="0xE58" />
-        <Texture Name="object_water_effect_Tex_000E60" OutName="tex_000E60" Format="i4" Width="32" Height="64" Offset="0xE60" />
-        <Texture Name="object_water_effect_Tex_001260" OutName="tex_001260" Format="i4" Width="64" Height="64" Offset="0x1260" />
-        <Texture Name="object_water_effect_Tex_001A60" OutName="tex_001A60" Format="i8" Width="32" Height="64" Offset="0x1A60" />
-        <Texture Name="object_water_effect_Tex_002260" OutName="tex_002260" Format="i4" Width="64" Height="64" Offset="0x2260" />
-        <Texture Name="object_water_effect_Tex_002A60" OutName="tex_002A60" Format="i4" Width="64" Height="64" Offset="0x2A60" />
-        <Texture Name="object_water_effect_Tex_003260" OutName="tex_003260" Format="i4" Width="64" Height="64" Offset="0x3260" />
-        <Texture Name="object_water_effect_Tex_003A60" OutName="tex_003A60" Format="i4" Width="64" Height="64" Offset="0x3A60" />
-        <DList Name="object_water_effect_DL_004260" Offset="0x4260" />
-        <DList Name="object_water_effect_DL_0042B0" Offset="0x42B0" />
-        <DList Name="object_water_effect_DL_0042F8" Offset="0x42F8" />
-        <DList Name="object_water_effect_DL_004340" Offset="0x4340" />
-        <DList Name="object_water_effect_DL_0043E8" Offset="0x43E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdhand.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdhand.xml
deleted file mode 100644
index 311d9299f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdhand.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Root>
-    <File Name="object_wdhand" Segment="6">
-        <Animation Name="object_wdhand_Anim_0000F4" Offset="0xF4" />
-        <Animation Name="object_wdhand_Anim_000364" Offset="0x364" />
-        <Animation Name="object_wdhand_Anim_000534" Offset="0x534" />
-        <Animation Name="object_wdhand_Anim_000854" Offset="0x854" />
-        <Texture Name="object_wdhand_Tex_000870" OutName="tex_000870" Format="rgba16" Width="16" Height="32" Offset="0x870" />
-        <Texture Name="object_wdhand_Tex_000C70" OutName="tex_000C70" Format="rgba16" Width="16" Height="32" Offset="0xC70" />
-        <Texture Name="object_wdhand_Tex_001070" OutName="tex_001070" Format="rgba16" Width="16" Height="32" Offset="0x1070" />
-        <DList Name="object_wdhand_DL_0014C0" Offset="0x14C0" />
-        <DList Name="object_wdhand_DL_0015B0" Offset="0x15B0" />
-        <DList Name="object_wdhand_DL_001908" Offset="0x1908" />
-        <DList Name="object_wdhand_DL_001998" Offset="0x1998" />
-        <DList Name="object_wdhand_DL_001A20" Offset="0x1A20" />
-        <DList Name="object_wdhand_DL_001AD0" Offset="0x1AD0" />
-        <DList Name="object_wdhand_DL_001B80" Offset="0x1B80" />
-        <DList Name="object_wdhand_DL_001C40" Offset="0x1C40" />
-        <DList Name="object_wdhand_DL_001CF0" Offset="0x1CF0" />
-        <Limb Name="object_wdhand_Standardlimb_001DB0" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_01" Offset="0x1DB0" />
-        <Limb Name="object_wdhand_Standardlimb_001DBC" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_02" Offset="0x1DBC" />
-        <Limb Name="object_wdhand_Standardlimb_001DC8" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_03" Offset="0x1DC8" />
-        <Limb Name="object_wdhand_Standardlimb_001DD4" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_04" Offset="0x1DD4" />
-        <Limb Name="object_wdhand_Standardlimb_001DE0" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_05" Offset="0x1DE0" />
-        <Limb Name="object_wdhand_Standardlimb_001DEC" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_06" Offset="0x1DEC" />
-        <Limb Name="object_wdhand_Standardlimb_001DF8" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_07" Offset="0x1DF8" />
-        <Skeleton Name="object_wdhand_Skel_001E20" Type="Flex" LimbType="Standard" LimbNone="OBJECT_WDHAND_LIMB_NONE" LimbMax="OBJECT_WDHAND_LIMB_MAX" EnumName="ObjectWdhandLimb" Offset="0x1E20" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor01.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor01.xml
deleted file mode 100644
index b18158a14..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor01.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Lottery Shop / Curiosity Shop / Mayor's House Door -->
-    <File Name="object_wdor01" Segment="6">
-        <DList Name="gLotteryCuriosityShopMayorHouseDoorEmptyDL" Offset="0x540" />
-        <DList Name="gLotteryCuriosityShopMayorHouseDoorDL" Offset="0x548" />
-        <Texture Name="gLotteryCuriosityShopMayorHouseDoorTex" OutName="lottery_curiosity_shop_mayor_house_door" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor02.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor02.xml
deleted file mode 100644
index f192bf8f5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor02.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Post Office / Trading Post Door -->
-    <File Name="object_wdor02" Segment="6">
-        <DList Name="gPostOfficeTradingPostDoorEmptyDL" Offset="0x540" />
-        <DList Name="gPostOfficeTradingPostDoorDL" Offset="0x548" />
-        <Texture Name="gPostOfficeTradingPostDoorTex" OutName="post_office_trading_post_door" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor03.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor03.xml
deleted file mode 100644
index 545a68242..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor03.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Object for Stock Pot Inn & Swordsman's School Door -->
-    <File Name="object_wdor03" Segment="6">
-        <DList Name="gInnSchoolDoorEmptyDL" Offset="0x540" />
-        <DList Name="gInnSchoolDoorDL" Offset="0x548" />
-        <Texture Name="gInnScoolDoorTex" OutName="inn_school_door" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor04.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor04.xml
deleted file mode 100644
index d47e78a8e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor04.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_wdor04" Segment="6">
-        <DList Name="gMilkBarDoorEndDL" Offset="0x500"/>
-        <DList Name="gMilkBarDoorDL" Offset="0x508"/>
-        <Texture Name="gMilkBarDoorTex" OutName="milk_bar_door" Format="rgba16" Width="32" Height="64" Offset="0x670"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor05.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor05.xml
deleted file mode 100644
index 6eb0f4ed0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wdor05.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="object_wdor05" Segment="6">
-        <DList Name="gMusicBoxHouseEndDL" Offset="0x500"/>
-        <DList Name="gMusicBoxHouseDoorDL" Offset="0x508"/>
-        <Texture Name="gMusicBoxHouseDoorTex" OutName="music_box_house_door" Format="rgba16" Width="32" Height="64" Offset="0x670"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wf.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wf.xml
deleted file mode 100644
index 0d8fdb68c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wf.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<Root>
-    <!-- Assets for Wolfos and White Wolfos -->
-    <File Name="object_wf" Segment="6">
-        <!-- White Wolfos Textures -->
-        <Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0" />
-        <Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100" />
-        <Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180" />
-        <Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200" />
-        <Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280" />
-
-        <!-- White Wolfos Eye Textures -->
-        <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300" />
-
-        <!-- White Wolfos Limb DisplayLists -->
-        <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20" />
-        <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8" />
-        <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8" />
-        <DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8" />
-        <DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98" />
-        <DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98" />
-        <DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88" />
-        <DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078" />
-        <DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148" />
-        <DList Name="gWolfosWhiteThoraxDL" Offset="0x2248" />
-        <DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368" />
-        <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490" />
-        <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0" />
-        <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8" />
-
-        <!-- White Wolfos Eye Textures -->
-        <Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8" />
-        <Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8" />
-
-        <!-- White Wolfos Limb DisplayLists -->
-        <DList Name="gWolfosWhiteTailDL" Offset="0x3488" />
-        <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528" />
-        <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0" />
-        <DList Name="gWolfosWhiteHeadDL" Offset="0x36B8" />
-        <DList Name="gWolfosWhiteEyesDL" Offset="0x39D8" />
-
-        <!-- White Wolfos Limbs -->
-        <Limb Name="gWolfosWhiteRootLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_ROOT" Offset="0x3A70" />
-        <Limb Name="gWolfosWhiteBackLeftThighLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_THIGH" Offset="0x3A7C" />
-        <Limb Name="gWolfosWhiteBackLeftShinLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_SHIN" Offset="0x3A88" />
-        <Limb Name="gWolfosWhiteBackLeftPasternLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_PASTERN" Offset="0x3A94" />
-        <Limb Name="gWolfosWhiteBackLeftPawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_PAW" Offset="0x3AA0" />
-        <Limb Name="gWolfosWhiteTailLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_TAIL" Offset="0x3AAC" />
-        <Limb Name="gWolfosWhiteAbdomenLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_ABDOMEN" Offset="0x3AB8" />
-        <Limb Name="gWolfosWhiteBackRightThighLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_THIGH" Offset="0x3AC4" />
-        <Limb Name="gWolfosWhiteBackRightShinLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_SHIN" Offset="0x3AD0" />
-        <Limb Name="gWolfosWhiteBackRightPasternLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_PASTERN" Offset="0x3ADC" />
-        <Limb Name="gWolfosWhiteBackRightPawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_PAW" Offset="0x3AE8" />
-        <Limb Name="gWolfosWhiteThoraxLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_THORAX" Offset="0x3AF4" />
-        <Limb Name="gWolfosWhiteFrontRightUpperLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x3B00" />
-        <Limb Name="gWolfosWhiteFrontRightLowerLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x3B0C" />
-        <Limb Name="gWolfosWhiteFrontRightClawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_RIGHT_CLAW" Offset="0x3B18" />
-        <Limb Name="gWolfosWhiteHeadRootLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_HEAD_ROOT" Offset="0x3B24" />
-        <Limb Name="gWolfosWhiteHeadLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_HEAD" Offset="0x3B30" />
-        <Limb Name="gWolfosWhiteEyesLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_EYES" Offset="0x3B3C" />
-        <Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x3B48" />
-        <Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x3B54" />
-        <Limb Name="gWolfosWhiteFrontLeftClawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_LEFT_CLAW" Offset="0x3B60" />
-
-        <!-- White Wolfos Skeleton -->
-        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" LimbNone="WOLFOS_WHITE_LIMB_NONE" LimbMax="WOLFOS_WHITE_LIMB_MAX" EnumName="WolfosWhiteLimb" Offset="0x3BC0" />
-
-        <!-- Wolfos/White Wolfos Animations -->
-        <Animation Name="gWolfosSlashAnim" Offset="0x4638" /> <!-- Original name is "wolfman_attack" -->
-        <Animation Name="gWolfosBackflipAnim" Offset="0x4A90" /> <!-- Original name is "wolfman_back_jump" -->
-        <Animation Name="gWolfosBlockAnim" Offset="0x4C44" /> <!-- Original name is "wolfman_defense" -->
-        <Animation Name="gWolfosRearUpFallOverAnim" Offset="0x53D0" /> <!-- Original name is "wolfman_down" -->
-        <Animation Name="gWolfosRunAnim" Offset="0x5700" /> <!-- Original name is "wolfman_run" -->
-
-        <!-- Wolfos Limb DisplayLists -->
-        <DList Name="gWolfosNormalAbdomenDL" Offset="0x6D10" />
-        <DList Name="gWolfosNormalBackRightThighDL" Offset="0x6DD8" />
-        <DList Name="gWolfosNormalBackRightShinDL" Offset="0x6EC8" />
-        <DList Name="gWolfosNormalBackRightPasternDL" Offset="0x6FB8" />
-        <DList Name="gWolfosNormalBackRightPawDL" Offset="0x7088" />
-        <DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7188" />
-        <DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7278" />
-        <DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7368" />
-        <DList Name="gWolfosNormalBackLeftPawDL" Offset="0x7438" />
-        <DList Name="gWolfosNormalThoraxDL" Offset="0x7538" />
-        <DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7658" />
-        <DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7770" />
-        <DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7880" />
-        <DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7998" />
-
-        <!-- Wolfos Eye Textures -->
-        <Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7AA8" />
-
-        <!-- Wolfos Textures -->
-        <Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7CA8" />
-        <Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x80A8" />
-        <Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x8128" />
-        <Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x81A8" />
-        <Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x8228" />
-
-        <!-- Wolfos Eye Textures -->
-        <Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x82A8" />
-        <Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x84A8" />
-
-        <!-- Wolfos Limb DisplayLists -->
-        <DList Name="gWolfosNormalTailDL" Offset="0x8E98" />
-        <DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8F38" />
-        <DList Name="gWolfosNormalFrontRightClawDL" Offset="0x9000" />
-        <DList Name="gWolfosNormalHeadDL" Offset="0x90C8" />
-        <DList Name="gWolfosNormalEyesDL" Offset="0x93E8" />
-
-        <!-- Wolfos Limbs -->
-        <Limb Name="gWolfosNormalRootLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_ROOT" Offset="0x9480" />
-        <Limb Name="gWolfosNormalBackLeftThighLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_THIGH" Offset="0x948C" />
-        <Limb Name="gWolfosNormalBackLeftShinLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_SHIN" Offset="0x9498" />
-        <Limb Name="gWolfosNormalBackLeftPasternLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_PASTERN" Offset="0x94A4" />
-        <Limb Name="gWolfosNormalBackLeftPawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_PAW" Offset="0x94B0" />
-        <Limb Name="gWolfosNormalTailLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_TAIL" Offset="0x94BC" />
-        <Limb Name="gWolfosNormalAbdomenLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_ABDOMEN" Offset="0x94C8" />
-        <Limb Name="gWolfosNormalBackRightThighLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_THIGH" Offset="0x94D4" />
-        <Limb Name="gWolfosNormalBackRightShinLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_SHIN" Offset="0x94E0" />
-        <Limb Name="gWolfosNormalBackRightPasternLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_PASTERN" Offset="0x94EC" />
-        <Limb Name="gWolfosNormalBackRightPawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_PAW" Offset="0x94F8" />
-        <Limb Name="gWolfosNormalThoraxLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_THORAX" Offset="0x9504" />
-        <Limb Name="gWolfosNormalFrontRightUpperLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x9510" />
-        <Limb Name="gWolfosNormalFrontRightLowerLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x951C" />
-        <Limb Name="gWolfosNormalFrontRightClawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_RIGHT_CLAW" Offset="0x9528" />
-        <Limb Name="gWolfosNormalHeadRootLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_HEAD_ROOT" Offset="0x9534" />
-        <Limb Name="gWolfosNormalHeadLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_HEAD" Offset="0x9540" />
-        <Limb Name="gWolfosNormalEyesLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_EYES" Offset="0x954C" />
-        <Limb Name="gWolfosNormalFrontLeftUpperLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x9558" />
-        <Limb Name="gWolfosNormalFrontLeftLowerLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x9564" />
-        <Limb Name="gWolfosNormalFrontLeftClawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_LEFT_CLAW" Offset="0x9570" />
-
-        <!-- Wolfos Skeleton -->
-        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" LimbNone="WOLFOS_NORMAL_LIMB_NONE" LimbMax="WOLFOS_NORMAL_LIMB_MAX" EnumName="WolfosNormalLimb" Offset="0x95D0" />
-
-        <!-- Wolfos/White Wolfos Animations -->
-        <Animation Name="gWolfosSidestepAnim" Offset="0x9808" /> <!-- Original name is "wolfman_side_walk" -->
-        <Animation Name="gWolfosDamagedAnim" Offset="0x9A50" /> <!-- Originla name is "wolfman_tail_hit" -->
-        <Animation Name="gWolfosWaitAnim" Offset="0xA3CC" /> <!-- Original name is "wolfman_wait" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wiz.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wiz.xml
deleted file mode 100644
index 51fcae3a7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wiz.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<Root>
-    <!-- Assets for Wizrobe, its platforms, and its magical attacks. -->
-    <File Name="object_wiz" Segment="6">
-        <!-- Wizrobe Animation -->
-        <Animation Name="gWizrobeAttackAnim" Offset="0x7B0" /> <!-- Original name is "wiz_atack" -->
-
-        <!-- Assets for the smoke that rises from the ice pool -->
-        <Texture Name="gWizrobeIceSmokeTex" OutName="wizrobe_ice_smoke" Format="i4" Width="32" Height="64" Offset="0x7C0" />
-        <Texture Name="gWizrobeIceSmokeMaskTex" OutName="wizrobe_ice_smoke_mask" Format="i4" Width="32" Height="32" Offset="0xBC0" />
-        <Texture Name="gWizrobeUnusedTex" OutName="wizrobe_unused" Format="i4" Width="16" Height="16" Offset="0xDC0" />
-        <DList Name="gWizrobeIceSmokeMaterialDL" Offset="0xE70" />
-        <DList Name="gWizrobeUnusedIceSmokeMaterialDL" Offset="0xF28" />
-        <DList Name="gWizrobeIceSmokeModelDL" Offset="0xFD8" /> <!-- Original name might have been "wiz_coolball_modelT" or "wiz_icesmoke" -->
-
-        <!-- Assets for the Wizrobe platform -->
-        <DList Name="gWizrobePlatformEmptyDL" Offset="0x10E0" /> <!-- Empty, probably was the transparent version of the following DL -->
-        <DList Name="gWizrobePlatformDL" Offset="0x10E8" /> <!-- Original name is "wiz_daiza_model" ("pedestal") -->
-        <Texture Name="gWizrobePlatformTex" OutName="wizrobe_platform" Format="rgba16" Width="16" Height="32" Offset="0x1198" />
-        <TextureAnimation Name="gWizrobePlatformEmptyTexAnim" Offset="0x15A0" />
-        <Collision Name="gWizrobePlatformCol" Offset="0x1690" />
-
-        <!-- Assets for the light that appears from the platform when the Wizrobe appears -->
-        <DList Name="gWizrobePlatformLightDL" Offset="0x1860" /> <!-- Original name is "wiz_daizalight_model" -->
-        <Texture Name="gWizrobePlatformLightMaskTex" OutName="wizrobe_platform_light_mask" Format="i4" Width="32" Height="32" Offset="0x19F0" />
-        <Texture Name="gWizrobePlatformLightBaseTex" OutName="wizrobe_platform_light_base" Format="i4" Width="16" Height="32" Offset="0x1BF0" />
-        <Texture Name="gWizrobePlatformLightRaysTex" OutName="wizrobe_platform_light_rays" Format="i8" Width="32" Height="32" Offset="0x1CF0" />
-        <TextureAnimation Name="gWizrobePlatformLightTexAnim" Offset="0x211C" />
-
-        <!-- Wizrobe Animations -->
-        <Animation Name="gWizrobeDamageAnim" Offset="0x2218" /> <!-- Original name is "wiz_damage" -->
-        <Animation Name="gWizrobeDanceAnim" Offset="0x2458" /> <!-- Original name is "wiz_dance" -->
-        <Animation Name="gWizrobeRunAnim" Offset="0x25F0" /> <!-- Original name is "wiz_dash" -->
-
-        <!-- Assets for the small flames during the Fire Wizrobe fight -->
-        <DList Name="gWizrobeSmallFlameDL" Offset="0x2630" /> <!-- Original name is "wiz_fire_model" -->
-        <Texture Name="gWizrobeSmallFlameTex" OutName="wizrobe_small_flame" Format="i4" Width="32" Height="32" Offset="0x2700" />
-        <Texture Name="gWizrobeSmallFlameMaskTex" OutName="wizrobe_small_flame_mask" Format="i4" Width="32" Height="32" Offset="0x2900" />
-
-        <!-- An unused texture animation that scrolls textures. It works okay with the small flames, so that was likely its original purpose. -->
-        <TextureAnimation Name="gWizrobeUnusedScrollTexAnim" Offset="0x2B08" />
-
-        <!-- Assets for the Wizrobe's magic projectile -->
-        <DList Name="gWizrobeMagicProjectileDL" Offset="0x2B40" /> <!-- Original name is "wiz_fireball_model" -->
-        <Texture Name="gWizrobeMagicProjectileTex" OutName="wizrobe_magic_projectile" Format="i4" Width="32" Height="32" Offset="0x2BD0" />
-
-        <!-- An unused texture animation that changes. Based on its placement, it may have been originally used with the magic projectile. -->
-        <TextureAnimation Name="gWizrobeUnusedColorChangingTexAnim" Offset="0x2DF4" />
-
-        <!-- Assets for the pool of fire that forms when the Fire Wizrobe's projectile hits something -->
-        <Texture Name="gWizrobeFirePoolTex" OutName="wizrobe_fire_pool" Format="i4" Width="32" Height="32" Offset="0x2E00" />
-        <DList Name="gWizrobeFirePoolDL" Offset="0x3120" /> <!-- Original name is "wiz_firefloor_modelT" -->
-
-        <!-- Assets for the smoke that comes off the Fire Wizrobe's fire -->
-        <Texture Name="gWizrobeFireSmokeTex" OutName="wizrobe_fire_smoke" Format="i4" Width="32" Height="64" Offset="0x31E0" />
-        <DList Name="gWizrobeFireSmokeDL" Offset="0x3640" /> <!-- Original name is "wiz_firesmoke_modelT" -->
-
-        <!-- Assets for the big flame during the Fire Wizrobe fight-->
-        <Texture Name="gWizrobeBigFlameTex" OutName="wizrobe_big_flame" Format="i8" Width="32" Height="32" Offset="0x3700" />
-        <Texture Name="gWizrobeBigFlameMaskTex" OutName="wizrobe_big_flame_mask" Format="i4" Width="32" Height="64" Offset="0x3B00" />
-        <DList Name="gWizrobeBigFlameDL" Offset="0x3FC0" /> <!-- Original name is "wiz_firewall_modelT" -->
-
-        <!-- Texture for the ice pool -->
-        <Texture Name="gWizrobeIcePoolTex" OutName="wizrobe_ice_pool" Format="i8" Width="64" Height="64" Offset="0x40B0" />
-
-        <!-- Unused vertices. Based on its placement, this may have been originally used with the ice pool. -->
-        <Array Name="gWizrobeUnusedVtx" Count="4" Offset="0x50B0">
-            <Vtx/>
-        </Array>
-
-        <!-- DisplayList for the ice pool -->
-        <DList Name="gWizrobeIcePoolDL" Offset="0x5190" /> <!-- Original name is "wiz_icefloor03_modelT" -->
-
-        <!-- Assets for the gleam on top of the ice pool-->
-        <Texture Name="gWizrobeIcePoolShineTex" OutName="wizrobe_ice_pool_shine" Format="i4" Width="32" Height="64" Offset="0x5230" />
-        <Texture Name="gWizrobeIcePoolShineMaskTex" OutName="wizrobe_ice_pool_shine_mask" Format="i4" Width="16" Height="16" Offset="0x5630" />
-        <DList Name="gWizrobeIcePoolShineDL" Offset="0x5750" /> <!-- Original name is "wiz_icefloor03_pika_modelT" ("pika" = onomatopoeic for "sparkle, glisten") -->
-
-        <!-- Assets for the glowing light in the center of the Wizrobe platform -->
-        <DList Name="gWizrobePlatformCenterDL" Offset="0x5870" /> <!-- Original name is "wiz_lighthole_modelT" -->
-        <DList Name="gWizrobePlatformCenterEmptyDL" Offset="0x5938" /> <!-- Empty, was probably the opaque version of the previous DL -->
-        <Texture Name="gWizrobePlatformCenterMaskTex" OutName="wizrobe_platform_center_mask" Format="i4" Width="32" Height="32" Offset="0x5940" />
-        <Texture Name="gWizrobePlatformCenterTex" OutName="wizrobe_platform_center" Format="i4" Width="16" Height="32" Offset="0x5B40" />
-        <TextureAnimation Name="gWizrobePlatformCenterTexAnim" Offset="0x5C64" />
-
-        <!-- Wizrobe Animations -->
-        <Animation Name="gWizrobeWindUpAnim" Offset="0x60E8" /> <!-- Original name is "wiz_preatack" -->
-        <Animation Name="gWizrobeIdleAnim" Offset="0x66C0" /> <!-- Original name is "wiz_wait" -->
-
-        <!-- Wizrobe Limb DisplayLists -->
-        <DList Name="gWizrobePelvisDL" Offset="0x8640" />
-        <DList Name="gWizrobeRightThighDL" Offset="0x86F0" />
-        <DList Name="gWizrobeRightShinDL" Offset="0x8790" />
-        <DList Name="gWizrobeRightFootDL" Offset="0x8868" />
-        <DList Name="gWizrobeLeftThighDL" Offset="0x8938" />
-        <DList Name="gWizrobeLeftShinDL" Offset="0x89D8" />
-        <DList Name="gWizrobeLeftFootDL" Offset="0x8AB0" />
-        <DList Name="gWizrobeLoinclothDL" Offset="0x8B80" />
-        <DList Name="gWizrobeTorsoDL" Offset="0x8C10" />
-        <DList Name="gWizrobeNeckDL" Offset="0x8CE8" /> <!-- Also includes the nose and ears for some reason. -->
-        <DList Name="gWizrobeJawDL" Offset="0x8F18" />
-        <DList Name="gWizrobeHeadDL" Offset="0x91D8" />
-        <DList Name="gWizrobeRightUpperArmDL" Offset="0x9560" />
-        <DList Name="gWizrobeRightForearmDL" Offset="0x9608" />
-        <DList Name="gWizrobeRightHandDL" Offset="0x96E0" />
-        <DList Name="gWizrobeStaffDL" Offset="0x97B8" />
-        <DList Name="gWizrobeLeftUpperArmDL" Offset="0x9918" />
-        <DList Name="gWizrobeLeftForearmDL" Offset="0x99C0" />
-        <DList Name="gWizrobeLeftHandDL" Offset="0x9A98" />
-
-        <!-- Wizrobe Textures -->
-        <Texture Name="gWizrobeFaceSkinTex" OutName="wizrobe_face_skin" Format="rgba16" Width="8" Height="8" Offset="0x9B70" />
-        <Texture Name="gWizrobeRobeTex" OutName="wizrobe_robe" Format="rgba16" Width="32" Height="32" Offset="0x9BF0" />
-        <Texture Name="gWizrobeHairTex" OutName="wizrobe_hair" Format="rgba16" Width="8" Height="16" Offset="0xA3F0" />
-        <Texture Name="gWizrobeEyeOrbitTex" OutName="wizrobe_eye_orbit" Format="rgba16" Width="16" Height="16" Offset="0xA4F0" />
-        <Texture Name="gWizrobeEyeTex" OutName="wizrobe_eye" Format="rgba16" Width="16" Height="16" Offset="0xA6F0" />
-        <Texture Name="gWizrobeLowerLipTex" OutName="wizrobe_lower_lip" Format="rgba16" Width="8" Height="8" Offset="0xA8F0" />
-        <Texture Name="gWizrobeNoseTex" OutName="wizrobe_nose" Format="rgba16" Width="8" Height="16" Offset="0xA970" />
-        <Texture Name="gWizrobeEarTex" OutName="wizrobe_ear" Format="rgba16" Width="16" Height="4" Offset="0xAA70" />
-        <Texture Name="gWizrobeStaffTipTex" OutName="wizrobe_staff_tip" Format="rgba16" Width="16" Height="16" Offset="0xAAF0" />
-        <Texture Name="gWizrobeStaffTex" OutName="wizrobe_staff" Format="rgba16" Width="16" Height="16" Offset="0xACF0" />
-        <Texture Name="gWizrobeBandTex" OutName="wizrobe_band" Format="rgba16" Width="16" Height="16" Offset="0xAEF0" />
-        <Texture Name="gWizrobeFootTex" OutName="wizrobe_foot" Format="rgba16" Width="16" Height="8" Offset="0xB0F0" />
-
-        <!-- Wizrobe Limbs -->
-        <Limb Name="gWizrobePelvisLimb" Type="Standard" EnumName="WIZROBE_LIMB_PELVIS" Offset="0xB1F0" />
-        <Limb Name="gWizrobeTorsoLimb" Type="Standard" EnumName="WIZROBE_LIMB_TORSO" Offset="0xB1FC" />
-        <Limb Name="gWizrobeLeftUpperArmLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_UPPER_ARM" Offset="0xB208" />
-        <Limb Name="gWizrobeLeftForearmLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_FOREARM" Offset="0xB214" />
-        <Limb Name="gWizrobeLeftHandLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_HAND" Offset="0xB220" />
-        <Limb Name="gWizrobeRightUpperArmLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_UPPER_ARM" Offset="0xB22C" />
-        <Limb Name="gWizrobeRightForearmLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_FOREARM" Offset="0xB238" />
-        <Limb Name="gWizrobeRightHandLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_HAND" Offset="0xB244" />
-        <Limb Name="gWizrobeStaffLimb" Type="Standard" EnumName="WIZROBE_LIMB_STAFF" Offset="0xB250" />
-        <Limb Name="gWizrobeNeckLimb" Type="Standard" EnumName="WIZROBE_LIMB_NECK" Offset="0xB25C" />
-        <Limb Name="gWizrobeHeadLimb" Type="Standard" EnumName="WIZROBE_LIMB_HEAD" Offset="0xB268" />
-        <Limb Name="gWizrobeJawLimb" Type="Standard" EnumName="WIZROBE_LIMB_JAW" Offset="0xB274" />
-        <Limb Name="gWizrobeLoinclothLimb" Type="Standard" EnumName="WIZROBE_LIMB_LOINCLOTH" Offset="0xB280" />
-        <Limb Name="gWizrobeLeftThighLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_THIGH" Offset="0xB28C" />
-        <Limb Name="gWizrobeLeftShinLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_SHIN" Offset="0xB298" />
-        <Limb Name="gWizrobeLeftFootLimb" Type="Standard" EnumName="WIZROBE_LIMB_LEFT_FOOT" Offset="0xB2A4" />
-        <Limb Name="gWizrobeRightThighLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_THIGH" Offset="0xB2B0" />
-        <Limb Name="gWizrobeRightShinLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_SHIN" Offset="0xB2BC" />
-        <Limb Name="gWizrobeRightFootLimb" Type="Standard" EnumName="WIZROBE_LIMB_RIGHT_FOOT" Offset="0xB2C8" />
-
-        <!-- Wizrobe Skeleton -->
-        <Skeleton Name="gWizrobeSkel" Type="Flex" LimbType="Standard" LimbNone="WIZROBE_LIMB_NONE" LimbMax="WIZROBE_LIMB_MAX" EnumName="WizrobeLimb" Offset="0xB320" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wood02.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wood02.xml
deleted file mode 100644
index 6265ebf04..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_wood02.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="assets/objects/gameplay_field_keep/"/>
-    <File Name="object_wood02" Segment="6">
-        <DList Name="object_wood02_DL_000090" Offset="0x90" />
-        <DList Name="object_wood02_DL_000160" Offset="0x160" />
-        <DList Name="object_wood02_DL_000340" Offset="0x340" />
-        <DList Name="object_wood02_DL_000440" Offset="0x440" />
-        <Texture Name="object_wood02_Tex_0004D0" OutName="tex_0004D0" Format="rgba16" Width="16" Height="16" Offset="0x4D0" />
-        <DList Name="object_wood02_DL_000700" Offset="0x700" />
-        <Texture Name="object_wood02_Tex_000790" OutName="tex_000790" Format="rgba16" Width="32" Height="32" Offset="0x790" />
-        <Texture Name="object_wood02_Tex_000F90" OutName="tex_000F90" Format="ia4" Width="32" Height="128" Offset="0xF90" />
-        <Texture Name="object_wood02_Tex_001790" OutName="tex_001790" Format="ia8" Width="32" Height="128" Offset="0x1790" />
-        <Texture Name="object_wood02_Tex_002790" OutName="tex_002790" Format="ia4" Width="32" Height="128" Offset="0x2790" />
-        <Texture Name="object_wood02_Tex_002F90" OutName="tex_002F90" Format="rgba16" Width="32" Height="32" Offset="0x2F90" />
-        <Texture Name="object_wood02_Tex_003790" OutName="tex_003790" Format="ia8" Width="32" Height="128" Offset="0x3790" />
-        <Texture Name="object_wood02_Tex_004790" OutName="tex_004790" Format="ia8" Width="32" Height="64" Offset="0x4790" />
-        <Texture Name="object_wood02_Tex_004F90" OutName="tex_004F90" Format="ia8" Width="32" Height="128" Offset="0x4F90" />
-        <Texture Name="object_wood02_Tex_005F90" OutName="tex_005F90" Format="ia8" Width="32" Height="64" Offset="0x5F90" />
-        <Texture Name="object_wood02_Tex_006790" OutName="tex_006790" Format="ia8" Width="32" Height="64" Offset="0x6790" />
-        <Texture Name="object_wood02_Tex_006F90" OutName="tex_006F90" Format="ia8" Width="32" Height="64" Offset="0x6F90" />
-        <DList Name="object_wood02_DL_0078D0" Offset="0x78D0" />
-        <DList Name="object_wood02_DL_007968" Offset="0x7968" />
-        <Collision Name="object_wood02_Colheader_007A70" Offset="0x7A70" />
-        <DList Name="object_wood02_DL_007AD0" Offset="0x7AD0" />
-        <DList Name="object_wood02_DL_007CA0" Offset="0x7CA0" />
-        <DList Name="object_wood02_DL_007D38" Offset="0x7D38" />
-        <DList Name="object_wood02_DL_007E20" Offset="0x7E20" />
-        <DList Name="object_wood02_DL_0080D0" Offset="0x80D0" />
-        <DList Name="object_wood02_DL_008160" Offset="0x8160" />
-        <Texture Name="object_wood02_Tex_008230" OutName="tex_008230" Format="ia8" Width="32" Height="64" Offset="0x8230" />
-        <Texture Name="object_wood02_Tex_008A30" OutName="tex_008A30" Format="rgba16" Width="32" Height="32" Offset="0x8A30" />
-        <DList Name="object_wood02_DL_0092A0" Offset="0x92A0" />
-        <DList Name="object_wood02_DL_009340" Offset="0x9340" />
-        <DList Name="object_wood02_DL_0093D0" Offset="0x93D0" />
-        <DList Name="object_wood02_DL_0095B0" Offset="0x95B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yabusame_point.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yabusame_point.xml
deleted file mode 100644
index a7a3cac85..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yabusame_point.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_yabusame_point" Segment="6">
-        <Texture Name="gYabusamePoint30Tex" OutName="points_30" Format="ia8" Width="48" Height="24" Offset="0x0"/>
-        <Texture Name="gYabusamePoint60Tex" OutName="points_60" Format="ia8" Width="48" Height="24" Offset="0x480"/>
-        <Texture Name="gYabusamePoint100Tex" OutName="points_100" Format="ia8" Width="48" Height="24" Offset="0x900"/>
-        <DList Name="gYabusamePointDL" Offset="0xDC0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yado_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yado_obj.xml
deleted file mode 100644
index d5d0467d4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yado_obj.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="object_yado_obj" Segment="6">
-        <DList Name="object_yado_obj_DL_000320" Offset="0x320" />
-        <DList Name="object_yado_obj_DL_000430" Offset="0x430" />
-        <Texture Name="object_yado_obj_Tex_0005D8" OutName="tex_0005D8" Format="ia16" Width="16" Height="32" Offset="0x5D8" />
-        <Texture Name="object_yado_obj_Tex_0009D8" OutName="tex_0009D8" Format="rgba16" Width="32" Height="16" Offset="0x9D8" />
-        <Texture Name="object_yado_obj_Tex_000DD8" OutName="tex_000DD8" Format="i8" Width="16" Height="16" Offset="0xDD8" />
-        <Texture Name="object_yado_obj_Tex_000ED8" OutName="tex_000ED8" Format="ia16" Width="16" Height="32" Offset="0xED8" />
-        <TextureAnimation Name="object_yado_obj_Matanimheader_0012E8" Offset="0x12E8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yb.xml
deleted file mode 100644
index 6c0ae86df..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yb.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<Root>
-    <File Name="object_yb" Segment="6">
-        <!-- animation wont play in z64utils, attempts to play in game are crash -->
-        <!-- actor uses link animation so this might be reading incorrectly -->
-        <Animation Name="object_yb_Anim_000200" Offset="0x200" />
-        <!-- since these blobs are right after the animation, and that animation doesnt work... assume this is part of why -->
-        <!-- <Blob Name="object_yb_Blob_002080" Size="0x30" Offset="0x2080" /> -->
-        <!-- <Blob Name="object_yb_Blob_002D50" Size="0x30" Offset="0x2D50" /> -->
-        <DList Name="gYbPantsAndBellyButtonDL" Offset="0x3400" />
-        <DList Name="gYbRightThighDL" Offset="0x3610" />
-        <DList Name="gYbRightShinDL" Offset="0x37B0" />
-        <DList Name="gYbRightFoodDL" Offset="0x3900" />
-        <DList Name="gYbLeftThighDL" Offset="0x3BC8" />
-        <DList Name="gYbLeftShinDL" Offset="0x3D68" />
-        <DList Name="gYbLeftFootDL" Offset="0x3EB8" />
-        <DList Name="gYbEndDisplayList4108DL" Offset="0x4108" />
-        <DList Name="gYbUpperTorsoDL" Offset="0x4110" />
-        <DList Name="gYbHeadDL" Offset="0x4310" />
-        <DList Name="gYbPonyTailDL" Offset="0x47F8" />
-        <DList Name="gYbEndDisplayList4970DL" Offset="0x4970" />
-        <DList Name="gYbRightUpperArmDL" Offset="0x4978" />
-        <DList Name="gYbRightForearmDL" Offset="0x4AA0" />
-        <DList Name="gYbRightHandDL" Offset="0x4BC0" />
-        <DList Name="gYbLeftUpperArmDL" Offset="0x4D98" />
-        <DList Name="gYbLeftForearmDL" Offset="0x4EC0" />
-        <DList Name="gYbLeftHandDL" Offset="0x4FE0" />
-        <Texture Name="gYbTLUT" OutName="yb_tlut" Format="rgba16" Width="16" Height="16" Offset="0x51B8" />
-        <Texture Name="gYbForeheadBlotchTex" OutName="yb_forhead_blotch" Format="ci8" Width="8" Height="8" Offset="0x53B8" />
-        <Texture Name="gYbPonytailTex" OutName="yb_ponytail" Format="ci8" Width="8" Height="16" Offset="0x53F8" />
-        <Texture Name="gYbFingersTex" OutName="yb_fingers" Format="ci8" Width="16" Height="16" Offset="0x5478" />
-        <Texture Name="gYbToesTex" OutName="yb_toes" Format="ci8" Width="16" Height="16" Offset="0x5578" />
-        <Texture Name="gYbHairlineTex" OutName="yb_hairline" Format="ci8" Width="16" Height="16" Offset="0x5678" />
-        <Texture Name="gYbBellybuttonTex" OutName="yb_bellybutton" Format="ci8" Width="8" Height="16" Offset="0x5778" />
-        <Texture Name="gYbNoseTex" OutName="yb_nose" Format="ci8" Width="16" Height="16" Offset="0x57F8" />
-        <Texture Name="gYbEyeTex" OutName="yb_eye" Format="ci8" Width="32" Height="32" Offset="0x58F8" />
-        <Texture Name="gYbPantsTex" OutName="yb_pants" Format="i8" Width="16" Height="16" Offset="0x5CF8" />
-        <!-- some limbs wont highlight in z64utils, some guesswork here -->
-        <Limb Name="gYbMainRootLimb" Type="Standard" EnumName="YB_LIMB_MAIN_ROOT" Offset="0x5DF8" />
-        <Limb Name="gYbPantsLimb" Type="Standard" EnumName="YB_LIMB_PANTS" Offset="0x5E04" />
-        <Limb Name="gYbLegsRootLimb" Type="Standard" EnumName="YB_LIMB_LEGS_ROOT" Offset="0x5E10" />
-        <Limb Name="gYbRightThighLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_THIGH" Offset="0x5E1C" />
-        <Limb Name="gYbRightShinLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_SHIN" Offset="0x5E28" />
-        <Limb Name="gYbRightFootLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_FOOT" Offset="0x5E34" />
-        <Limb Name="gYbLeftThighLimb" Type="Standard" EnumName="YB_LIMB_LEFT_THIGH" Offset="0x5E40" />
-        <Limb Name="gYbLeftShinLimb" Type="Standard" EnumName="YB_LIMB_LEFT_SHIN" Offset="0x5E4C" />
-        <Limb Name="gYbLeftFootLimb" Type="Standard" EnumName="YB_LIMB_LEFT_FOOT" Offset="0x5E58" />
-        <Limb Name="gYbChestRootLimb" Type="Standard" EnumName="YB_LIMB_CHEST_ROOT" Offset="0x5E64" />
-        <Limb Name="gYbHeadLimb" Type="Standard" EnumName="YB_LIMB_HEAD" Offset="0x5E70" />
-        <Limb Name="gYbPonyTailLimb" Type="Standard" EnumName="YB_LIMB_PONYTAIL" Offset="0x5E7C" />
-        <!-- TODO: Name empty limb based on Player's Skeleton -->
-        <Limb Name="gYbEmpty5E88Limb" Type="Standard" EnumName="YB_LIMB_EMPTY_5E88" Offset="0x5E88" />
-        <Limb Name="gYbLeftUpperArmLimb" Type="Standard" EnumName="YB_LIMB_LEFT_UPPER_ARM" Offset="0x5E94" />
-        <Limb Name="gYbLeftForearmLimb" Type="Standard" EnumName="YB_LIMB_LEFT_FOREARM" Offset="0x5EA0" />
-        <Limb Name="gYbLeftHandLimb" Type="Standard" EnumName="YB_LIMB_LEFT_HAND" Offset="0x5EAC" />
-        <Limb Name="gYbRightUpperArmLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_UPPER_ARM" Offset="0x5EB8" />
-        <Limb Name="gYbRightForearmLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_FOREARM" Offset="0x5EC4" />
-        <Limb Name="gYbRightHandLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_HAND" Offset="0x5ED0" />
-        <Limb Name="gYbEmpty5EDCLimb" Type="Standard" EnumName="YB_LIMB_EMPTY_5EDC" Offset="0x5EDC" />
-        <Limb Name="gYbUpperTorsoLimb" Type="Standard" EnumName="YB_LIMB_TORSO" Offset="0x5EE8" />
-        <Skeleton Name="gYbSkel" Type="Flex" LimbType="Standard" LimbNone="YB_LIMB_NONE" LimbMax="YB_LIMB_MAX" EnumName="ObjectYbLimb" Offset="0x5F48" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yukimura_obj.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yukimura_obj.xml
deleted file mode 100644
index e7f6d14d2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yukimura_obj.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <!-- Dependencies -->
-    <ExternalFile XmlPath="code/actor.xml" OutPath="assets/code/actor/"/>
-
-    <File Name="object_yukimura_obj" Segment="6">
-        <DList Name="object_yukimura_obj_DL_000640" Offset="0x640" />
-        <DList Name="object_yukimura_obj_DL_000758" Offset="0x758" />
-        <DList Name="object_yukimura_obj_DL_000870" Offset="0x870" />
-        <DList Name="object_yukimura_obj_DL_000890" Offset="0x890" />
-        <DList Name="object_yukimura_obj_DL_0008C0" Offset="0x8C0" />
-        <Texture Name="object_yukimura_obj_Tex_0008D8" OutName="tex_0008D8" Format="rgba16" Width="16" Height="8" Offset="0x8D8" />
-        <Texture Name="object_yukimura_obj_Tex_0009D8" OutName="tex_0009D8" Format="rgba16" Width="32" Height="16" Offset="0x9D8" />
-        <DList Name="object_yukimura_obj_DL_000EB0" Offset="0xEB0" />
-        <DList Name="object_yukimura_obj_DL_000F98" Offset="0xF98" />
-        <Texture Name="object_yukimura_obj_Tex_001078" OutName="tex_001078" Format="rgba16" Width="32" Height="32" Offset="0x1078" />
-        <Texture Name="object_yukimura_obj_Tex_001878" OutName="tex_001878" Format="i4" Width="64" Height="64" Offset="0x1878" />
-        <TextureAnimation Name="object_yukimura_obj_Matanimheader_002090" Offset="0x2090" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yukiyama.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yukiyama.xml
deleted file mode 100644
index 5e7215f82..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_yukiyama.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="object_yukiyama" Segment="6">
-        <DList Name="object_yukiyama_DL_001250" Offset="0x1250" />
-        <DList Name="object_yukiyama_DL_0013A8" Offset="0x13A8" />
-        <Texture Name="object_yukiyama_Tex_001A60" OutName="tex_001A60" Format="ia16" Width="32" Height="8" Offset="0x1A60" />
-        <Texture Name="object_yukiyama_Tex_001C60" OutName="tex_001C60" Format="i8" Width="32" Height="128" Offset="0x1C60" />
-        <Texture Name="object_yukiyama_Tex_002C60" OutName="tex_002C60" Format="rgba16" Width="16" Height="128" Offset="0x2C60" />
-        <Texture Name="object_yukiyama_Tex_003C60" OutName="tex_003C60" Format="i4" Width="64" Height="64" Offset="0x3C60" />
-        <Texture Name="object_yukiyama_Tex_004460" OutName="tex_004460" Format="rgba16" Width="16" Height="64" Offset="0x4460" />
-        <Texture Name="object_yukiyama_Tex_004C60" OutName="tex_004C60" Format="i8" Width="32" Height="32" Offset="0x4C60" />
-        <Texture Name="object_yukiyama_Tex_005060" OutName="tex_005060" Format="rgba16" Width="32" Height="32" Offset="0x5060" />
-        <Texture Name="object_yukiyama_Tex_005860" OutName="tex_005860" Format="rgba16" Width="32" Height="32" Offset="0x5860" />
-        <Texture Name="object_yukiyama_Tex_006060" OutName="tex_006060" Format="rgba16" Width="32" Height="32" Offset="0x6060" />
-        <TextureAnimation Name="object_yukiyama_Matanimheader_006868" Offset="0x6868" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zg.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zg.xml
deleted file mode 100644
index 6ff35fe48..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="object_zg" Segment="6">
-        <Texture Name="gTowerCollapseBarMetalTex" OutName="tower_collapse_bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="gTowerCollapseBarFlameTex" OutName="tower_collapse_bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
-        <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
-        <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zl1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zl1.xml
deleted file mode 100644
index ed7fbf987..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zl1.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<Root>
-    <!-- Object for Child Zelda 1 -->
-    <File Name="object_zl1" Segment="6">
-        <!-- Animation -->
-        <Animation Name="gChildZelda1Anim_00438" Offset="0x438" />
-
-        <!-- Palette -->
-        <Texture Name="gChildZelda1TLUT_0450" OutName="child_zelda_1_tlut_0450" Format="rgba16" Width="16" Height="16" Offset="0x450" />
-
-        <!-- Textures -->
-        <Texture Name="gChildZelda1DressGradientTex" OutName="child_zelda_1_dress_gradient" Format="ci8" Width="8" Height="8" Offset="0x650" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1PurpleDressPatternTex" OutName="child_zelda_1_purple_dress_pattern" Format="ci8" Width="16" Height="16" Offset="0x690" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1TriforceSashTex" OutName="child_zelda_1_triforce_sash" Format="ci8" Width="32" Height="64" Offset="0x790" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1BeltTex" OutName="child_zelda_1_belt" Format="ci8" Width="32" Height="8" Offset="0xF90" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1BeltLoopsTex" OutName="child_zelda_1_belt_loops" Format="ci8" Width="8" Height="8" Offset="0x1090" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1DressWrinklesTex" OutName="child_zelda_1_dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x10D0" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1BackOfHandTex" OutName="child_zelda_1_back_of_hand" Format="rgba16" Width="16" Height="16" Offset="0x14D0" />
-        <Texture Name="gChildZelda1BraceletTex" OutName="child_zelda_1_bracelet" Format="ci8" Width="16" Height="16" Offset="0x16D0" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1BlueUndershirtGradient1Tex" OutName="child_zelda_1_blue_undershirt_gradient_1" Format="rgba16" Width="8" Height="8" Offset="0x17D0" />
-        <Texture Name="gChildZelda1BlueUndershirtGradient2Tex" OutName="child_zelda_1_blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x1850" />
-        <Texture Name="gChildZelda1Tex_1A50" OutName="child_zelda_1_tex_1A50" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1StripedShoulderPatternTex" OutName="child_zelda_1_striped_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1A90" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1UndershirtWrinklesTex" OutName="child_zelda_1_undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x1AD0" TlutOffset="0x450" />
-        <Texture Name="gChildZelda1PendantTex" OutName="child_zelda_1_pendant" Format="rgba16" Width="32" Height="32" Offset="0x1BD0" />
-
-        <!-- Child Zelda 1 Limb DisplayLists -->
-        <DList Name="gChildZelda1TorsoDL" Offset="0x4B50" />
-        <DList Name="gChildZelda1RightUpperArmDL" Offset="0x54D0" />
-        <DList Name="gChildZelda1RightForearmDL" Offset="0x5738" />
-        <DList Name="gChildZelda1RightHandDL" Offset="0x5888" />
-        <DList Name="gChildZelda1LeftUpperArmDL" Offset="0x5A68" />
-        <DList Name="gChildZelda1LeftForearmDL" Offset="0x5CD8" />
-        <DList Name="gChildZelda1LeftHandDL" Offset="0x5E28" />
-        <DList Name="gChildZelda1WaistDL" Offset="0x6008" />
-        <DList Name="gChildZelda1Dress1DL" Offset="0x6828" />
-        <DList Name="gChildZelda1Dress2DL" Offset="0x69E0" />
-        <DList Name="gChildZelda1Dress3DL" Offset="0x6BA0" />
-
-
-        <!-- Textures -->
-        <Texture Name="gChildZelda1TLUT_6CD8" OutName="child_zelda_1_tlut_6CD8" Format="rgba16" Width="252" Height="1" Offset="0x6CD8" />
-        <Texture Name="gChildZelda1TLUT_6ED0" OutName="child_zelda_1_tlut_6ED0" Format="rgba16" Width="252" Height="1" Offset="0x6ED0" />
-        <Texture Name="gChildZelda1TLUT_70C8" OutName="child_zelda_1_tlut_70C8" Format="rgba16" Width="160" Height="1" Offset="0x70C8" />
-        <Texture Name="gChildZelda1EyeOpenLookingUpRightTex" OutName="child_zelda_1_eye_open_looking_up_right" Format="ci8" Width="32" Height="32" Offset="0x7208" TlutOffset="0x6CD8" />
-        <!-- <Blob Name="object_zl1_Blob_0072C8" Size="0x740" Offset="0x72C8" /> -->
-        <Texture Name="gChildZelda1MouthNeutralTex" OutName="child_zelda_1_mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x7608" TlutOffset="0x6ED0" />
-        <Texture Name="gChildZelda1HeaddressGradientTex" OutName="child_zelda_1_headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x7A08" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1SkinGradientTex" OutName="child_zelda_1_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x7A48" />
-        <Texture Name="gChildZelda1HeaddressTriforceEmblemTex" OutName="child_zelda_1_headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x7AC8" />
-        <Texture Name="gChildZelda1PointedHairOnSideTex" OutName="child_zelda_1_pointed_hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x7EC8" />
-        <Texture Name="gChildZelda1HairTex" OutName="child_zelda_1_hair" Format="rgba16" Width="16" Height="8" Offset="0x80C8" />
-        <Texture Name="gChildZelda1Tex_81C8" OutName="child_zelda_1_tex_81C8" Format="ci8" Width="8" Height="8" Offset="0x81C8" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1EarTex" OutName="child_zelda_1_ear" Format="rgba16" Width="16" Height="16" Offset="0x8208" />
-        <Texture Name="gChildZelda1AlternateDressPatternTex" OutName="child_zelda_1_alternate_dress_pattern" Format="ci8" Width="8" Height="8" Offset="0x8408" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1AlternateDressBeltTex" OutName="child_zelda_1_alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x8448" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1AlternateDressGradientTex" OutName="child_zelda_1_alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x8548" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1AlternateDressLiningTex" OutName="child_zelda_1_alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x8648" />
-        <Texture Name="gChildZelda1BootTex" OutName="child_zelda_1_boot" Format="rgba16" Width="8" Height="8" Offset="0x8748" />
-        <Texture Name="gChildZelda1BootShaftTex" OutName="child_zelda_1_boot_shaft" Format="rgba16" Width="8" Height="8" Offset="0x87C8" />
-        <Texture Name="gChildZelda1EyeOpenLookingLeftTex" OutName="child_zelda_1_eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x8848" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1EyeOpenLookingRightTex" OutName="child_zelda_1_eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x8C48" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1MouthFrowningTex" OutName="child_zelda_1_mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0" />
-        <Texture Name="gChildZelda1EyeHalf1Tex" OutName="child_zelda_1_eye_half_1" Format="ci8" Width="32" Height="32" Offset="0x9448" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1EyeHalf2Tex" OutName="child_zelda_1_eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x9848" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1EyeClosedTex" OutName="child_zelda_1_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9C48" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1EyeWideTex" OutName="child_zelda_1_eye_wide" Format="ci8" Width="32" Height="32" Offset="0xA048" TlutOffset="0x6CD8" />
-        <Texture Name="gChildZelda1MouthOpenTex" OutName="child_zelda_1_mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0" />
-        <Texture Name="gChildZelda1Tex_A848" OutName="child_zelda_1_tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848" />
-        <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="child_zelda_1_headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1HeaddressStripeTex" OutName="child_zelda_1_headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8" />
-        <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="child_zelda_1_mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0" />
-
-        <!-- Child Zelda 1 Limb DisplayLists -->
-        <DList Name="gChildZelda1HeadDL" Offset="0xCD98" />
-        <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8" />
-        <DList Name="gChildZelda1LeftFootDL" Offset="0xE748" />
-        <DList Name="gChildZelda1RightFootDL" Offset="0xEA78" />
-        <DList Name="gChildZelda1RightLegDL" Offset="0xEDA8" />
-        <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00" />
-        <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8" />
-
-        <!-- Child Zelda 1 Limbs -->
-        <Limb Name="gChildZelda1RootLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_ROOT" Offset="0xF4C8" />
-        <Limb Name="gChildZelda1WaistLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_WAIST" Offset="0xF4D4" />
-        <Limb Name="gChildZelda1LeftLegLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_LEFT_LEG" Offset="0xF4E0" />
-        <Limb Name="gChildZelda1LeftFootLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_LEFT_FOOT" Offset="0xF4EC" />
-        <Limb Name="gChildZelda1RightLegLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_RIGHT_LEG" Offset="0xF4F8" />
-        <Limb Name="gChildZelda1RightFootLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_RIGHT_FOOT" Offset="0xF504" />
-        <Limb Name="gChildZelda1Dress1Limb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_DRESS_1" Offset="0xF510" />
-        <Limb Name="gChildZelda1Dress2Limb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_DRESS_2" Offset="0xF51C" />
-        <Limb Name="gChildZelda1Dress3Limb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_DRESS_3" Offset="0xF528" />
-        <Limb Name="gChildZelda1TorsoLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_TORSO" Offset="0xF534" />
-        <Limb Name="gChildZelda1LeftUpperArmLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_LEFT_UPPER_ARM" Offset="0xF540" />
-        <Limb Name="gChildZelda1LeftForearmLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_LEFT_FOREARM" Offset="0xF54C" />
-        <Limb Name="gChildZelda1LeftHandLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_LEFT_HAND" Offset="0xF558" />
-        <Limb Name="gChildZelda1RightUpperArmLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_RIGHT_UPPER_ARM" Offset="0xF564" />
-        <Limb Name="gChildZelda1RightForearmLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_RIGHT_FOREARM" Offset="0xF570" />
-        <Limb Name="gChildZelda1RightHandLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_RIGHT_HAND" Offset="0xF57C" />
-        <Limb Name="gChildZelda1HeadLimb" Type="Standard" EnumName="CHILD_ZELDA_1_LIMB_HEAD" Offset="0xF588" />
-
-        <!-- Child Zelda 1 Skeleton -->
-        <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" LimbNone="CHILD_ZELDA_1_LIMB_NONE" LimbMax="CHILD_ZELDA_1_LIMB_MAX" EnumName="ChildZelda1Limb" Offset="0xF5D8" />
-        
-        <!-- Animations -->
-        <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38" />
-        <Animation Name="gChildZelda1Anim_11348" Offset="0x11348" />
-        <Animation Name="gChildZelda1Anim_116E4" Offset="0x116E4" />
-        <Animation Name="gChildZelda1Anim_12B88" Offset="0x11B88" />
-        <Animation Name="gChildZelda1Anim_12118" Offset="0x12118" />
-        <Animation Name="gChildZelda1Anim_12B04" Offset="0x12B04" />
-        <Animation Name="gChildZelda1Anim_12F80" Offset="0x12F80" />
-        <Animation Name="gChildZelda1Anim_132D8" Offset="0x132D8" />
-        <Animation Name="gChildZelda1Anim_138E0" Offset="0x138E0" />
-        <Animation Name="gChildZelda1Anim_13F10" Offset="0x13F10" />
-        <Animation Name="gChildZelda1Anim_143A8" Offset="0x143A8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zl4.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zl4.xml
deleted file mode 100644
index 2c5eff1ef..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zl4.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<Root>
-    <!-- Child Zelda: from the cutscene where Deku Link recalls how to play Song of Time after getting his Ocarina back -->
-    <File Name="object_zl4" Segment="6">
-        <!-- Everything up to and including the skeleton is retained from the beginning of OoT's object_zl4 -->
-        <Animation Name="gDmZl4IdleAnim" Offset="0x654" />
-        <Texture Name="gDmZl4DressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x670" />
-        <Texture Name="gDmZl4EyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x870" />
-        <Texture Name="gDmZl4MouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA70" />
-        <Texture Name="gDmZl4DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0xC70" />
-        <Texture Name="gDmZl4DressPurpleTex" OutName="purple_dress_patern" Format="ci8" Width="16" Height="16" Offset="0xCB0" />
-        <Texture Name="gDmZl4TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0xDB0" />
-        <Texture Name="gDmZl4BootLacesTex" OutName="boot_laces" Format="rgba16" Width="8" Height="8" Offset="0x15B0" />
-        <Texture Name="gDmZl4BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x1630" />
-        <Texture Name="gDmZl4AltDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x16B0" />
-        <Texture Name="gDmZl4AltDressTex" OutName="alternate_dress_patern" Format="ci8" Width="8" Height="8" Offset="0x17B0" />
-        <Texture Name="gDmZl4DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x17F0" />
-        <Texture Name="gDmZl4AltDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" />
-        <Texture Name="gDmZl4AltDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x1CF0" />
-
-        <!-- not named in OOT, some blue blemish center -->
-        <Texture Name="gDmZl4_001DF0_Tex" OutName="tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" />
-        <Texture Name="gDmZl4HeadressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x1E30" />
-        <Texture Name="gDmZl4HeadressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x2230" />
-        <!-- not named in OOT, gradient with dark blotch bottom-->
-        <Texture Name="gDmZl4_002270_Tex" OutName="tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" />
-        <Texture Name="gDmZl4HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0x22F0" />
-        <Texture Name="gDmZl4EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x24F0" />
-        <Texture Name="gDmZl4HairOnSideTex" OutName="hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x26F0" />
-        <Texture Name="gDmZl4SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x28F0" />
-        <!-- not named in OOT, some skin blemish center -->
-        <Texture Name="gDmZl4_002970_Tex" OutName="tex_002970" Format="rgba16" Width="8" Height="8" Offset="0x2970" />
-        <Texture Name="gDmZl4HairTex" OutName="hair" Format="rgba16" Width="16" Height="8" Offset="0x29F0" />
-
-        <!-- Eye Textures -->
-        <Texture Name="gDmZl4EyeOpenNormalTex" OutName="eye_open_normal" Format="ci8" Width="32" Height="32" Offset="0x2AF0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeHalfTex" OutName="eye_blinking" Format="ci8" Width="32" Height="32" Offset="0x2EF0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x32F0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeWideTex" OutName="eye_wide" Format="ci8" Width="32" Height="32" Offset="0x36F0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeHappyTex" OutName="eye_happy" Format="ci8" Width="32" Height="32" Offset="0x3AF0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeOpenLookingLeftTex" OutName="eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x3EF0" TlutOffset="0x870"/>
-        <Texture Name="gDmZl4EyeOpenLookingRightTex" OutName="eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x42F0" TlutOffset="0x870"/>
-
-        <!-- Mouth Textures -->
-        <Texture Name="gZl4MouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x46F0" TlutOffset="0xA70"/>
-        <Texture Name="gZl4MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0x4AF0" TlutOffset="0xA70"/>
-        <Texture Name="gZl4MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x4EF0" TlutOffset="0xA70"/>
-        <Texture Name="gZl4MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x52F0" TlutOffset="0xA70"/>
-
-        <Texture Name="gDmZl4FingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x56F0" />
-        <Texture Name="gDmZl4BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x58F0" />
-        <Texture Name="gDmZl4BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient" Format="rgba16" Width="8" Height="8" Offset="0x59F0" />
-        <Texture Name="gDmZl4BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x5A70" />
-        <Texture Name="gDmZl4StripedShoulderTex" OutName="striped_shoulder_patern" Format="ci8" Width="8" Height="8" Offset="0x5C70" />
-        <Texture Name="gDmZl4UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x5CB0" />
-        <Texture Name="gDmZl4PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" />
-
-        <DList Name="gDmZl4ChestDL" Offset="0xA630" />
-        <DList Name="gDmZl4HeadDL" Offset="0xAFC8" />
-        <DList Name="gDmZl4RightUpperArmDL" Offset="0xB8D8" />
-        <DList Name="gDmZl4RightForearmDL" Offset="0xBB40" />
-        <DList Name="gDmZl4RightHandDL" Offset="0xBC90" />
-        <DList Name="gDmZl4LeftUpperArmDL" Offset="0xBE70" />
-        <DList Name="gDmZl4LeftForearmDL" Offset="0xC0E0" />
-        <DList Name="gDmZl4LeftHandDL" Offset="0xC230" />
-        <DList Name="gDmZl4HorseRidingDressDL" Offset="0xC410" />
-        <DList Name="gDmZl4WaistDL" Offset="0xC8D0" />
-        <DList Name="gDmZl4Dress1DL" Offset="0xD0E8" />
-        <DList Name="gDmZl4Dress2DL" Offset="0xD2A0" />
-        <DList Name="gDmZl4Dress3DL" Offset="0xD460" />
-        <DList Name="gDmZl4RightLegDL" Offset="0xD598" />
-        <DList Name="gDmZl4RightBootDL" Offset="0xD5E8" />
-        <DList Name="gDmZl4LeftLegDL" Offset="0xD728" />
-        <DList Name="gDmZl4LeftBootDL" Offset="0xD778" />
-
-        <!-- Ocarina, drawn to right hand in OverrideLimbDraw -->
-        <Texture Name="gDmZl4OcarinaTex" OutName="ocarina" Format="rgba16" Width="32" Height="16" Offset="0xD8B8" />
-        <DList Name="gDmZl4OcarinaDL" Offset="0xDE08" />
-
-        <Limb Name="gDmZl4RootLimb" Type="Standard" EnumName="ZL4_LIMB_ROOT" Offset="0xDF28" />
-        <Limb Name="gDmZl4WaistLimb" Type="Standard" EnumName="ZL4_LIMB_WAIST" Offset="0xDF34" />
-        <Limb Name="gDmZl4LeftLegLimb" Type="Standard" EnumName="ZL4_LIMB_LEFT_LEG" Offset="0xDF40" />
-        <Limb Name="gDmZl4LeftFootLimb" Type="Standard" EnumName="ZL4_LIMB_LEFT_FOOT" Offset="0xDF4C" />
-        <Limb Name="gDmZl4RightLegLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_LEG" Offset="0xDF58" />
-        <Limb Name="gDmZl4RightFootLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_FOOT" Offset="0xDF64" />
-        <Limb Name="gDmZl4Dress1Limb" Type="Standard" EnumName="ZL4_LIMB_DRESS_1" Offset="0xDF70" />
-        <Limb Name="gDmZl4Dress2Limb" Type="Standard" EnumName="ZL4_LIMB_DRESS_2" Offset="0xDF7C" />
-        <Limb Name="gDmZl4Dress3Limb" Type="Standard" EnumName="ZL4_LIMB_DRESS_3" Offset="0xDF88" />
-        <Limb Name="gDmZl4TorsoLimb" Type="Standard" EnumName="ZL4_LIMB_TORSO" Offset="0xDF94" />
-        <Limb Name="gDmZl4LeftUpperArmLimb" Type="Standard" EnumName="ZL4_LIMB_LEFT_UPPER_ARM" Offset="0xDFA0" />
-        <Limb Name="gDmZl4LeftForearmLimb" Type="Standard" EnumName="ZL4_LIMB_LEFT_FOREARM" Offset="0xDFAC" />
-        <Limb Name="gDmZl4LeftHandLimb" Type="Standard" EnumName="ZL4_LIMB_LEFT_HAND" Offset="0xDFB8" />
-        <Limb Name="gDmZl4RightUpperArmLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_UPPER_ARM" Offset="0xDFC4" />
-        <Limb Name="gDmZl4RightForearmLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_FOREARM" Offset="0xDFD0" />
-        <Limb Name="gDmZl4RightHandLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_HAND" Offset="0xDFDC" />
-        <Limb Name="gDmZl4HeadLimb" Type="Standard" EnumName="ZL4_LIMB_HEAD" Offset="0xDFE8" />
-        <Skeleton Name="gZl4Skel" Type="Flex" LimbType="Standard" LimbNone="ZL4_LIMB_NONE" LimbMax="ZL4_LIMB_MAX" EnumName="Zl4Limb" Offset="0xE038" />
-
-        
-        <!-- Unused Flute Animations -->
-        <Animation Name="gDmZl4HoldingFluteInFrontAnim" Offset="0xFDC8" />
-        <Animation Name="gDmZl4RaiseFluteToPlayAnim" Offset="0x10334" />
-        <Animation Name="gDmZl4LowerFluteAfterPlayAnim" Offset="0x105C8" />
-        <Animation Name="gDmZl4PlayingFluteAnim" Offset="0x10D50" />
-
-        <!-- Used in MM -->
-        <Animation Name="gDmZl4TurningAroundAnim" Offset="0xF250" />
-        <Animation Name="gDmZl4FacingAwayIdleAnim" Offset="0x11294" />
-        <Animation Name="gDmZl4GivingItemStartAnim" Offset="0x11BB8" />
-        <Animation Name="gDmZl4GivingItemLoopAnim" Offset="0x122E0" />
-        <Animation Name="gDmZl4RaisingOcarinaToPlayAnim" Offset="0x12A84" />
-        <Animation Name="gDmZl4PlayingOcarinaAnim" Offset="0x1303C" />
-
-        <!-- Unused Backflipping Animation -->
-        <Animation Name="gDmZl4BackflipAnim" Offset="0x13934" />
-        <Animation Name="gDmZl4BackflipPrepareAnim" Offset="0x13F2C" />
-        <Animation Name="gDmZl4BackflipPrepareHoldingReadyAnim" Offset="0x14558" />
-
-        <!-- Used in MM --> 
-        <Animation Name="gDmZl4TurningAround2Anim" Offset="0x15494" />
-        <Animation Name="gDmZl4HandsOverEmblemLoopAnim" Offset="0x15A4C" />
-        <Animation Name="gDmZl4FacingAwayHandsOverEmblemLoopAnim" Offset="0x15DA0" />
-
-        <!-- Unused in MM, copy of OoT Animations in object_zl4:(0xE050 -> End) --> 
-        <Animation Name="gDmZl4Anim_016328" Offset="0x16328" />
-        <Animation Name="gDmZl4Anim_016924" Offset="0x16924" />
-        <Animation Name="gDmZl4Anim_016E04" Offset="0x16E04" />
-        <Animation Name="gDmZl4Anim_0175F4" Offset="0x175F4" />
-        <Animation Name="gDmZl4Anim_018B58" Offset="0x18B58" />
-        <Animation Name="gDmZl4Anim_018FA8" Offset="0x18FA8" />
-        <Animation Name="gDmZl4Anim_0193F8" Offset="0x193F8" />
-        <Animation Name="gDmZl4Anim_019894" Offset="0x19894" />
-        <Animation Name="gDmZl4Anim_01A344" Offset="0x1A344" />
-        <Animation Name="gDmZl4Anim_01ABB8" Offset="0x1ABB8" />
-        <Animation Name="gDmZl4Anim_01AFE0" Offset="0x1AFE0" />
-        <Animation Name="gDmZl4Anim_01B388" Offset="0x1B388" />
-        <Animation Name="gDmZl4Anim_01B7B0" Offset="0x1B7B0" />
-        <Animation Name="gDmZl4Anim_01BC00" Offset="0x1BC00" />
-        <Animation Name="gDmZl4Anim_01DC74" Offset="0x1DC74" />
-        <Animation Name="gDmZl4Anim_01E714" Offset="0x1E714" />
-        <Animation Name="gDmZl4Anim_01EA68" Offset="0x1EA68" />
-        <Animation Name="gDmZl4Anim_01EFCC" Offset="0x1EFCC" />
-        <Animation Name="gDmZl4Anim_01F578" Offset="0x1F578" />
-        <Animation Name="gDmZl4Anim_01FDBC" Offset="0x1FDBC" />
-        <Animation Name="gDmZl4Anim_0205F8" Offset="0x205F8" />
-        <Animation Name="gDmZl4Anim_020E6C" Offset="0x20E6C" />
-        <Animation Name="gDmZl4Anim_021360" Offset="0x21360" />
-        <Animation Name="gDmZl4Anim_02167C" Offset="0x2167C" />
-        <Animation Name="gDmZl4Anim_02205C" Offset="0x2205C" />
-        <Animation Name="gDmZl4Anim_022840" Offset="0x22840" />
-        <Animation Name="gDmZl4Anim_022BE8" Offset="0x22BE8" />
-        <Animation Name="gDmZl4Anim_0235D4" Offset="0x235D4" />
-        <Animation Name="gDmZl4Anim_023A50" Offset="0x23A50" />
-        <Animation Name="gDmZl4Anim_0241F4" Offset="0x241F4" />
-        <Animation Name="gDmZl4Anim_024510" Offset="0x24510" />
-        <Animation Name="gDmZl4Anim_024B68" Offset="0x24B68" />
-
-        <!-- Unused Flute -->
-        <DList Name="gDmZl4FluteDL" Offset="0x24D80" />
-        <DList Name="gDmZl4FluteWrapperDL" Offset="0x24E40" />
-        <Texture Name="gDmZl4FluteHoleTex" OutName="flute_hole" Format="rgba16" Width="16" Height="8" Offset="0x24E50" />
-        
-        <TextureAnimation Name="gDmZlEmptyTexAnim" Offset="0x24F50" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zm.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zm.xml
deleted file mode 100644
index c35d5aecb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zm.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Root>
-    <File Name="object_zm" Segment="6">
-        <Animation Name="object_zm_Anim_000C80" Offset="0xC80" />
-        <Animation Name="object_zm_Anim_001324" Offset="0x1324" />
-        <Animation Name="object_zm_Anim_0016A4" Offset="0x16A4" />
-        <Animation Name="object_zm_Anim_001DF0" Offset="0x1DF0" />
-        <Animation Name="object_zm_Anim_0022C8" Offset="0x22C8" />
-        <Animation Name="object_zm_Anim_0028B8" Offset="0x28B8" />
-        <Animation Name="object_zm_Anim_002F20" Offset="0x2F20" />
-        <Animation Name="object_zm_Anim_003AA8" Offset="0x3AA8" />
-        <DList Name="object_zm_DL_0063A0" Offset="0x63A0" />
-        <DList Name="object_zm_DL_0066D0" Offset="0x66D0" />
-        <DList Name="object_zm_DL_006898" Offset="0x6898" />
-        <DList Name="object_zm_DL_0069D8" Offset="0x69D8" />
-        <DList Name="object_zm_DL_006C38" Offset="0x6C38" />
-        <DList Name="object_zm_DL_006E00" Offset="0x6E00" />
-        <DList Name="object_zm_DL_006F40" Offset="0x6F40" />
-        <DList Name="object_zm_DL_007178" Offset="0x7178" />
-        <DList Name="object_zm_DL_0076F8" Offset="0x76F8" />
-        <DList Name="object_zm_DL_0078A0" Offset="0x78A0" />
-        <DList Name="object_zm_DL_007A18" Offset="0x7A18" />
-        <DList Name="object_zm_DL_007B18" Offset="0x7B18" />
-        <DList Name="object_zm_DL_007C38" Offset="0x7C38" />
-        <DList Name="object_zm_DL_007D60" Offset="0x7D60" />
-        <DList Name="object_zm_DL_007E60" Offset="0x7E60" />
-        <DList Name="object_zm_DL_007F80" Offset="0x7F80" />
-        <Texture Name="object_zm_TLUT_0080A8" OutName="tlut_0080A8" Format="rgba16" Width="16" Height="16" Offset="0x80A8" />
-        <Texture Name="object_zm_Tex_0082A8" OutName="tex_0082A8" Format="ci8" Width="8" Height="8" Offset="0x82A8" />
-        <Texture Name="object_zm_Tex_0082E8" OutName="tex_0082E8" Format="ci8" Width="32" Height="32" Offset="0x82E8" />
-        <Texture Name="object_zm_Tex_0086E8" OutName="tex_0086E8" Format="ci8" Width="32" Height="32" Offset="0x86E8" />
-        <Texture Name="object_zm_Tex_008AE8" OutName="tex_008AE8" Format="ci8" Width="32" Height="32" Offset="0x8AE8" />
-        <Texture Name="object_zm_Tex_008EE8" OutName="tex_008EE8" Format="ci8" Width="16" Height="16" Offset="0x8EE8" />
-        <Texture Name="object_zm_Tex_008FE8" OutName="tex_008FE8" Format="rgba16" Width="32" Height="32" Offset="0x8FE8" />
-        <Texture Name="object_zm_Tex_0097E8" OutName="tex_0097E8" Format="rgba16" Width="8" Height="8" Offset="0x97E8" />
-        <Texture Name="object_zm_Tex_009868" OutName="tex_009868" Format="ci8" Width="16" Height="16" Offset="0x9868" />
-        <Texture Name="object_zm_Tex_009968" OutName="tex_009968" Format="ci8" Width="16" Height="16" Offset="0x9968" />
-        <Texture Name="object_zm_Tex_009A68" OutName="tex_009A68" Format="rgba16" Width="16" Height="16" Offset="0x9A68" />
-        <Texture Name="object_zm_Tex_009C68" OutName="tex_009C68" Format="ci8" Width="32" Height="32" Offset="0x9C68" />
-        <Texture Name="object_zm_Tex_00A068" OutName="tex_00A068" Format="ci8" Width="32" Height="32" Offset="0xA068" />
-        <Texture Name="object_zm_Tex_00A468" OutName="tex_00A468" Format="ci8" Width="32" Height="32" Offset="0xA468" />
-        <Limb Name="object_zm_Standardlimb_00A868" Type="Standard" EnumName="OBJECT_ZM_LIMB_01" Offset="0xA868" />
-        <Limb Name="object_zm_Standardlimb_00A874" Type="Standard" EnumName="OBJECT_ZM_LIMB_02" Offset="0xA874" />
-        <Limb Name="object_zm_Standardlimb_00A880" Type="Standard" EnumName="OBJECT_ZM_LIMB_03" Offset="0xA880" />
-        <Limb Name="object_zm_Standardlimb_00A88C" Type="Standard" EnumName="OBJECT_ZM_LIMB_04" Offset="0xA88C" />
-        <Limb Name="object_zm_Standardlimb_00A898" Type="Standard" EnumName="OBJECT_ZM_LIMB_05" Offset="0xA898" />
-        <Limb Name="object_zm_Standardlimb_00A8A4" Type="Standard" EnumName="OBJECT_ZM_LIMB_06" Offset="0xA8A4" />
-        <Limb Name="object_zm_Standardlimb_00A8B0" Type="Standard" EnumName="OBJECT_ZM_LIMB_07" Offset="0xA8B0" />
-        <Limb Name="object_zm_Standardlimb_00A8BC" Type="Standard" EnumName="OBJECT_ZM_LIMB_08" Offset="0xA8BC" />
-        <Limb Name="object_zm_Standardlimb_00A8C8" Type="Standard" EnumName="OBJECT_ZM_LIMB_09" Offset="0xA8C8" />
-        <Limb Name="object_zm_Standardlimb_00A8D4" Type="Standard" EnumName="OBJECT_ZM_LIMB_0A" Offset="0xA8D4" />
-        <Limb Name="object_zm_Standardlimb_00A8E0" Type="Standard" EnumName="OBJECT_ZM_LIMB_0B" Offset="0xA8E0" />
-        <Limb Name="object_zm_Standardlimb_00A8EC" Type="Standard" EnumName="OBJECT_ZM_LIMB_0C" Offset="0xA8EC" />
-        <Limb Name="object_zm_Standardlimb_00A8F8" Type="Standard" EnumName="OBJECT_ZM_LIMB_0D" Offset="0xA8F8" />
-        <Limb Name="object_zm_Standardlimb_00A904" Type="Standard" EnumName="OBJECT_ZM_LIMB_0E" Offset="0xA904" />
-        <Limb Name="object_zm_Standardlimb_00A910" Type="Standard" EnumName="OBJECT_ZM_LIMB_0F" Offset="0xA910" />
-        <Limb Name="object_zm_Standardlimb_00A91C" Type="Standard" EnumName="OBJECT_ZM_LIMB_10" Offset="0xA91C" />
-        <Limb Name="object_zm_Standardlimb_00A928" Type="Standard" EnumName="OBJECT_ZM_LIMB_11" Offset="0xA928" />
-        <Skeleton Name="object_zm_Skel_00A978" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZM_LIMB_NONE" LimbMax="OBJECT_ZM_LIMB_MAX" EnumName="ObjectZmLimb" Offset="0xA978" />
-        <Animation Name="object_zm_Anim_00B3E0" Offset="0xB3E0" />
-        <Animation Name="object_zm_Anim_00B894" Offset="0xB894" />
-        <Animation Name="object_zm_Anim_00BC08" Offset="0xBC08" />
-        <Animation Name="object_zm_Anim_00C880" Offset="0xC880" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zo.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zo.xml
deleted file mode 100644
index 0cd5c8546..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zo.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<Root>
-    <!-- Object for the Zoras -->
-    <File Name="object_zo" Segment="6">
-        <!-- Animations -->
-        <Animation Name="gZoraHandsOnHipsTappingFootAnim" Offset="0x598" />
-        <Animation Name="gZoraArmsOpenAnim" Offset="0xD48" />
-        <Animation Name="gZoraThrowRupeeAnim" Offset="0x219C" />
-        <Animation Name="gZoraWalkAnim" Offset="0x2898" />
-
-        <!-- Effects -->
-        <Texture Name="gZoraBubbleTex" OutName="zora_bubble" Format="ia8" Width="16" Height="16" Offset="0x28B0" />
-        <DList Name="gZoraBubbleMaterialDL" Offset="0x29F0" />
-        <DList Name="gZoraBubbleModelDL" Offset="0x2A50" />
-
-        <Texture Name="gZoraSplashTex" OutName="zora_splash" Format="i8" Width="16" Height="16" Offset="0x2A70" />
-        <DList Name="gZoraSplashMaterialDL" Offset="0x2BA0" />
-        <DList Name="gZoraSplashModelDL" Offset="0x2C10" />
-
-        <!-- Animations -->
-        <Animation Name="gZoraSurfacingAnim" Offset="0x3610" />
-        <Animation Name="gZoraTreadingWaterAnim" Offset="0x4168" />
-        <Animation Name="gZoraIdleAnim" Offset="0x4248" />
-
-        <!-- Textures -->
-        <Texture Name="gZoraTLUT" OutName="zora_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4260" />
-        <Texture Name="gZoraFinTex" OutName="zora_fin" Format="ci8" Width="32" Height="32" Offset="0x4460" />
-        <Texture Name="gZoraBackAndHeadTailTex" OutName="zora_back_head_tail" Format="ci8" Width="32" Height="64" Offset="0x4860" />
-        <Texture Name="gZoraSkinTex" OutName="zora_skin" Format="ci8" Width="8" Height="8" Offset="0x5060" />
-        <Texture Name="gZoraEyeOpenTex" OutName="zora_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x50A0" />
-        <Texture Name="gZoraEyeHalfTex" OutName="zora_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x58A0" />
-        <Texture Name="gZoraEyeClosedTex" OutName="zora_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x60A0" />
-        <Texture Name="gZoraMouthTex" OutName="zora_mouth" Format="rgba16" Width="32" Height="32" Offset="0x68A0" />
-        <Texture Name="gZoraHandTex" OutName="zora_hand" Format="ci8" Width="16" Height="16" Offset="0x70A0" />
-        <Texture Name="gZoraKneeTex" OutName="zora_knee" Format="ci8" Width="8" Height="8" Offset="0x71A0" />
-
-        <!-- DLists -->
-        <DList Name="gZoraPelvisDL" Offset="0xA2A0" />
-        <DList Name="gZoraTorsoDL" Offset="0xA448" />
-        <DList Name="gZoraHeadDL" Offset="0xA7C0" />
-        <DList Name="gZoraHeadTail1DL" Offset="0xAA38" />
-        <DList Name="gZoraHeadTail2DL" Offset="0xABD8" />
-        <DList Name="gZoraHeadTail3DL" Offset="0xAD70" />
-        <DList Name="gZoraHeadTailFinDL" Offset="0xAF08" />
-        <DList Name="gZoraRightUpperArmDL" Offset="0xB148" />
-        <DList Name="gZoraRightForearmDL" Offset="0xB3A8" />
-        <DList Name="gZoraRightHandDL" Offset="0xB688" />
-        <DList Name="gZoraLeftUpperArmDL" Offset="0xB890" />
-        <DList Name="gZoraLeftForearmDL" Offset="0xBAF0" />
-        <DList Name="gZoraLeftHandDL" Offset="0xBDD0" />
-        <DList Name="gZoraRightThighDL" Offset="0xBFD8" />
-        <DList Name="gZoraRightShinDL" Offset="0xC2B8" />
-        <DList Name="gZoraRightFootDL" Offset="0xC590" />
-        <DList Name="gZoraLeftThighDL" Offset="0xC858" />
-        <DList Name="gZoraLeftShinDL" Offset="0xCB38" />
-        <DList Name="gZoraLeftFootDL" Offset="0xCE10" />
-
-        <!-- Skeleton -->
-        <Limb Name="gZoraPelvisLimb" Type="Standard" EnumName="ZORA_LIMB_PELVIS" Offset="0xD0D8" />
-        <Limb Name="gZoraLeftThighLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_THIGH" Offset="0xD0E4" />
-        <Limb Name="gZoraLeftShinLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_SHIN" Offset="0xD0F0" />
-        <Limb Name="gZoraLeftFootLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_FOOT" Offset="0xD0FC" />
-        <Limb Name="gZoraRightThighLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_THIGH" Offset="0xD108" />
-        <Limb Name="gZoraRightShinLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_SHIN" Offset="0xD114" />
-        <Limb Name="gZoraRightFootLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_FOOT" Offset="0xD120" />
-        <Limb Name="gZoraTorsoLimb" Type="Standard" EnumName="ZORA_LIMB_TORSO" Offset="0xD12C" />
-        <Limb Name="gZoraLeftUpperArmLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_UPPER_ARM" Offset="0xD138" />
-        <Limb Name="gZoraLeftForearmLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_FOREARM" Offset="0xD144" />
-        <Limb Name="gZoraLeftHandLimb" Type="Standard" EnumName="ZORA_LIMB_LEFT_HAND" Offset="0xD150" />
-        <Limb Name="gZoraRightUpperArmLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_UPPER_ARM" Offset="0xD15C" />
-        <Limb Name="gZoraRightForearmLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_FOREARM" Offset="0xD168" />
-        <Limb Name="gZoraRightHandLimb" Type="Standard" EnumName="ZORA_LIMB_RIGHT_HAND" Offset="0xD174" />
-        <Limb Name="gZoraHeadLimb" Type="Standard" EnumName="ZORA_LIMB_HEAD" Offset="0xD180" />
-        <Limb Name="gZoraHeadTail1Limb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_1" Offset="0xD18C" />
-        <Limb Name="gZoraHeadTail2Limb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_2" Offset="0xD198" />
-        <Limb Name="gZoraHeadTail3Limb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_3" Offset="0xD1A4" />
-        <Limb Name="gZoraHeadTailFinLimb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_FIN" Offset="0xD1B0" />
-        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" LimbNone="ZORA_LIMB_NONE" LimbMax="ZORA_LIMB_MAX" EnumName="ZoraLimb" Offset="0xD208" />
-
-        <!-- Effects -->
-        <DList Name="gZoraRippleMaterialDL" Offset="0xD220" />
-        <DList Name="gZoraRippleModelDL" Offset="0xD288" />
-
-        <DList Name="object_zo_DL_00D2A0" Offset="0xD2A0" />
-        <DList Name="object_zo_DL_00D2B8" Offset="0xD2B8" />
-
-        <!-- Animations -->
-        <Animation Name="gZoraStandAnim" Offset="0xDE20" />
-        <Animation Name="gZoraListenAnim" Offset="0xDF54" />
-        <Animation Name="gZoraRunAnim" Offset="0xE400" />
-        <Animation Name="gZoraBobHandAnim" Offset="0xEDF0" />
-        <Animation Name="gZoraSitAnim" Offset="0xF4E8" />
-        <Animation Name="gZoraFixSpeakerStartAnim" Offset="0xFDF0" />
-        <Animation Name="gZoraFixSpeakerLoopAnim" Offset="0x10B18" />
-        <Animation Name="gZoraFixSpeakerEndAnim" Offset="0x11424" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zob.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zob.xml
deleted file mode 100644
index 8d27f260f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zob.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<Root>
-    <File Name="object_zob" Segment="6">
-        <Animation Name="object_zob_Anim_001FD4" Offset="0x1FD4" />
-        <Animation Name="object_zob_Anim_0027D0" Offset="0x27D0" />
-        <Animation Name="object_zob_Anim_002B38" Offset="0x2B38" />
-        <Animation Name="object_zob_Anim_0037A0" Offset="0x37A0" />
-        <Animation Name="object_zob_Anim_0043C4" Offset="0x43C4" />
-        <Animation Name="object_zob_Anim_005224" Offset="0x5224" />
-        <Animation Name="object_zob_Anim_005E90" Offset="0x5E90" />
-        <Animation Name="object_zob_Anim_006998" Offset="0x6998" />
-        <DList Name="object_zob_DL_00A700" Offset="0xA700" />
-        <DList Name="object_zob_DL_00A880" Offset="0xA880" />
-        <DList Name="object_zob_DL_00AA58" Offset="0xAA58" />
-        <DList Name="object_zob_DL_00AB80" Offset="0xAB80" />
-        <DList Name="object_zob_DL_00AE08" Offset="0xAE08" />
-        <DList Name="object_zob_DL_00AF90" Offset="0xAF90" />
-        <DList Name="object_zob_DL_00B150" Offset="0xB150" />
-        <DList Name="object_zob_DL_00B3B8" Offset="0xB3B8" />
-        <DList Name="object_zob_DL_00B4E0" Offset="0xB4E0" />
-        <DList Name="object_zob_DL_00B768" Offset="0xB768" />
-        <DList Name="object_zob_DL_00B8F0" Offset="0xB8F0" />
-        <DList Name="object_zob_DL_00BC48" Offset="0xBC48" />
-        <DList Name="object_zob_DL_00BD10" Offset="0xBD10" />
-        <DList Name="object_zob_DL_00BDC8" Offset="0xBDC8" />
-        <DList Name="object_zob_DL_00BE90" Offset="0xBE90" />
-        <DList Name="object_zob_DL_00BF48" Offset="0xBF48" />
-        <DList Name="object_zob_DL_00C140" Offset="0xC140" />
-        <DList Name="object_zob_DL_00C370" Offset="0xC370" />
-        <DList Name="object_zob_DL_00C528" Offset="0xC528" />
-        <DList Name="object_zob_DL_00C7B0" Offset="0xC7B0" />
-        <DList Name="object_zob_DL_00C9E0" Offset="0xC9E0" />
-        <DList Name="object_zob_DL_00CB98" Offset="0xCB98" />
-        <Texture Name="object_zob_TLUT_00CE20" OutName="tlut_00CE20" Format="rgba16" Width="16" Height="16" Offset="0xCE20" />
-        <Texture Name="object_zob_TLUT_00D020" OutName="tlut_00D020" Format="rgba16" Width="16" Height="16" Offset="0xD020" />
-        <Texture Name="object_zob_Tex_00D220" OutName="tex_00D220" Format="ci8" Width="8" Height="8" Offset="0xD220" />
-        <Texture Name="object_zob_Tex_00D260" OutName="tex_00D260" Format="ci8" Width="32" Height="32" Offset="0xD260" />
-        <Texture Name="object_zob_Tex_00D660" OutName="tex_00D660" Format="rgba16" Width="16" Height="16" Offset="0xD660" />
-        <Texture Name="object_zob_Tex_00D860" OutName="tex_00D860" Format="rgba16" Width="16" Height="16" Offset="0xD860" />
-        <Texture Name="object_zob_Tex_00DA60" OutName="tex_00DA60" Format="rgba16" Width="32" Height="32" Offset="0xDA60" />
-        <Texture Name="object_zob_Tex_00E260" OutName="tex_00E260" Format="ci8" Width="8" Height="8" Offset="0xE260" />
-        <Texture Name="object_zob_Tex_00E2A0" OutName="tex_00E2A0" Format="rgba16" Width="32" Height="32" Offset="0xE2A0" />
-        <Texture Name="object_zob_Tex_00EAA0" OutName="tex_00EAA0" Format="rgba16" Width="32" Height="32" Offset="0xEAA0" />
-        <Texture Name="object_zob_Tex_00F2A0" OutName="tex_00F2A0" Format="rgba16" Width="32" Height="32" Offset="0xF2A0" />
-        <Texture Name="object_zob_Tex_00FAA0" OutName="tex_00FAA0" Format="rgba16" Width="16" Height="16" Offset="0xFAA0" />
-        <Texture Name="object_zob_Tex_00FCA0" OutName="tex_00FCA0" Format="rgba16" Width="16" Height="16" Offset="0xFCA0" />
-        <Texture Name="object_zob_Tex_00FEA0" OutName="tex_00FEA0" Format="rgba16" Width="32" Height="32" Offset="0xFEA0" />
-        <Limb Name="object_zob_Standardlimb_0106A0" Type="Standard" EnumName="OBJECT_ZOB_LIMB_01" Offset="0x106A0" />
-        <Limb Name="object_zob_Standardlimb_0106AC" Type="Standard" EnumName="OBJECT_ZOB_LIMB_02" Offset="0x106AC" />
-        <Limb Name="object_zob_Standardlimb_0106B8" Type="Standard" EnumName="OBJECT_ZOB_LIMB_03" Offset="0x106B8" />
-        <Limb Name="object_zob_Standardlimb_0106C4" Type="Standard" EnumName="OBJECT_ZOB_LIMB_04" Offset="0x106C4" />
-        <Limb Name="object_zob_Standardlimb_0106D0" Type="Standard" EnumName="OBJECT_ZOB_LIMB_05" Offset="0x106D0" />
-        <Limb Name="object_zob_Standardlimb_0106DC" Type="Standard" EnumName="OBJECT_ZOB_LIMB_06" Offset="0x106DC" />
-        <Limb Name="object_zob_Standardlimb_0106E8" Type="Standard" EnumName="OBJECT_ZOB_LIMB_07" Offset="0x106E8" />
-        <Limb Name="object_zob_Standardlimb_0106F4" Type="Standard" EnumName="OBJECT_ZOB_LIMB_08" Offset="0x106F4" />
-        <Limb Name="object_zob_Standardlimb_010700" Type="Standard" EnumName="OBJECT_ZOB_LIMB_09" Offset="0x10700" />
-        <Limb Name="object_zob_Standardlimb_01070C" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0A" Offset="0x1070C" />
-        <Limb Name="object_zob_Standardlimb_010718" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0B" Offset="0x10718" />
-        <Limb Name="object_zob_Standardlimb_010724" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0C" Offset="0x10724" />
-        <Limb Name="object_zob_Standardlimb_010730" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0D" Offset="0x10730" />
-        <Limb Name="object_zob_Standardlimb_01073C" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0E" Offset="0x1073C" />
-        <Limb Name="object_zob_Standardlimb_010748" Type="Standard" EnumName="OBJECT_ZOB_LIMB_0F" Offset="0x10748" />
-        <Limb Name="object_zob_Standardlimb_010754" Type="Standard" EnumName="OBJECT_ZOB_LIMB_10" Offset="0x10754" />
-        <Limb Name="object_zob_Standardlimb_010760" Type="Standard" EnumName="OBJECT_ZOB_LIMB_11" Offset="0x10760" />
-        <Limb Name="object_zob_Standardlimb_01076C" Type="Standard" EnumName="OBJECT_ZOB_LIMB_12" Offset="0x1076C" />
-        <Limb Name="object_zob_Standardlimb_010778" Type="Standard" EnumName="OBJECT_ZOB_LIMB_13" Offset="0x10778" />
-        <Limb Name="object_zob_Standardlimb_010784" Type="Standard" EnumName="OBJECT_ZOB_LIMB_14" Offset="0x10784" />
-        <Limb Name="object_zob_Standardlimb_010790" Type="Standard" EnumName="OBJECT_ZOB_LIMB_15" Offset="0x10790" />
-        <Limb Name="object_zob_Standardlimb_01079C" Type="Standard" EnumName="OBJECT_ZOB_LIMB_16" Offset="0x1079C" />
-        <Limb Name="object_zob_Standardlimb_0107A8" Type="Standard" EnumName="OBJECT_ZOB_LIMB_17" Offset="0x107A8" />
-        <Skeleton Name="object_zob_Skel_010810" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOB_LIMB_NONE" LimbMax="OBJECT_ZOB_LIMB_MAX" EnumName="ObjectZobLimb" Offset="0x10810" />
-        <Animation Name="object_zob_Anim_011144" Offset="0x11144" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zod.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zod.xml
deleted file mode 100644
index a926e6ef9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zod.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<Root>
-    <!-- Assets for Tijo, the drummer of The Indigo-Go's. -->
-    <File Name="object_zod" Segment="6">
-        <!-- Tijo Animations -->
-        <Animation Name="gTijoPlayingVivaceAnim" Offset="0x2E8" />
-        <Animation Name="gTijoReadyToPlayAnim" Offset="0x894" />
-        <Animation Name="gTijoArmsFoldedAnim" Offset="0xA9C" />
-        <Animation Name="gTijoPlayingLentoAnim" Offset="0xD94" />
-
-        <!-- Tijo DisplayLists -->
-        <DList Name="gTijoLowerBodyChairDL" Offset="0x39A0" />
-        <DList Name="gTijoUpperBodyDL" Offset="0x3DA0" />
-        <DList Name="gTijoRightArmDL" Offset="0x4018" />
-        <DList Name="gTijoRightForearmDL" Offset="0x4130" />
-        <DList Name="gTijoRightHandDL" Offset="0x4258" />
-        <DList Name="gTijoLeftArmDL" Offset="0x43E8" />
-        <DList Name="gTijoLeftForearmDL" Offset="0x4500" />
-        <DList Name="gTijoLeftHandDL" Offset="0x4628" />
-        <DList Name="gTijoHeadDL" Offset="0x47B8" />
-
-        <!-- Tijo Textures /> -->
-        <Texture Name="gTijoSkinTex" OutName="tijo_skin" Format="rgba16" Width="8" Height="8" Offset="0x4B50" />
-        <Texture Name="gTijoChairTex" OutName="tijo_chair" Format="rgba16" Width="32" Height="32" Offset="0x4BD0" />
-        <Texture Name="gTijoHandTex" OutName="tijo_hand" Format="rgba16" Width="16" Height="16" Offset="0x53D0" />
-        <Texture Name="gTijoNoseTex" OutName="tijo_nose" Format="rgba16" Width="8" Height="8" Offset="0x55D0" />
-        <Texture Name="gTijoSkinSpotsTex" OutName="tijo_skin_spots" Format="rgba16" Width="32" Height="32" Offset="0x5650" />
-        <Texture Name="gTijoEyesOpenTex" OutName="tijo_eyes_open" Format="rgba16" Width="32" Height="32" Offset="0x5E50" />
-        <Texture Name="gTijoEyesHalfOpenTex" OutName="tijo_eyes_half_open" Format="rgba16" Width="32" Height="32" Offset="0x6650" />
-        <Texture Name="gTijoEyesClosedTex" OutName="tijo_eyes_closed" Format="rgba16" Width="32" Height="32" Offset="0x6E50" />
-        <Texture Name="gTijoMouthClosedTex" OutName="tijo_mouth_closed" Format="rgba16" Width="32" Height="32" Offset="0x7650" />
-        <Texture Name="gTijoMouthOpenTex" OutName="tijo_mouth_open" Format="rgba16" Width="32" Height="32" Offset="0x7E50" />
-
-        <!-- <Blob Name="object_zod_Blob_008650" Size="0x1E10" Offset="0x8650" /> -->
-
-        <!-- Tijo Drums DisplayLists /> -->
-        <DList Name="gTijoDrumFrameDL" Offset="0xA460" />
-        <DList Name="gTijoRideCymbalDL" Offset="0xA550" />
-        <DList Name="gTijoCrashCymbalDL" Offset="0xA5E0" />
-        <DList Name="gTijoHiHatDL" Offset="0xA670" />
-        <DList Name="gTijoDrum1DL" Offset="0xA700" />
-        <DList Name="gTijoDrum2DL" Offset="0xA8F8" />
-        <DList Name="gTijoDrum3DL" Offset="0xAAF0" />
-        <DList Name="gTijoDrum4DL" Offset="0xACE8" />
-        <DList Name="gTijoDrum5DL" Offset="0xAEE0" />
-        <DList Name="gTijoBassDrumDL" Offset="0xB0D8" />
-
-        <!-- Tijo Drums Textures -->
-        <Texture Name="gTijoDrumFrameTex" OutName="tijo_drum_stands" Format="rgba16" Width="32" Height="32" Offset="0xB348" />
-        <Texture Name="gTijoCymbalHiHatTex" OutName="tijo_cymbal_hihat" Format="rgba16" Width="32" Height="32" Offset="0xBB48" />
-        <Texture Name="gTijoDrumsSkinTex" OutName="tijo_drums_skin" Format="rgba16" Width="8" Height="8" Offset="0xC348" />
-        <Texture Name="gTijoDrumsEyesTex" OutName="tijo_eyes" Format="rgba16" Width="32" Height="32" Offset="0xC3C8" />
-        <Texture Name="gTijoDrumsMouthTex" OutName="tijo_drums_mouth" Format="rgba16" Width="16" Height="16" Offset="0xCBC8" />
-        <Texture Name="gTijoDrumsHairTex" OutName="tijo_drums_hair" Format="rgba16" Width="32" Height="32" Offset="0xCDC8" />
-
-        <!-- Tijo Limbs -->
-        <Limb Name="gTijoLowerBodyChairLimb" Type="Standard" EnumName="TIJO_LIMB_BODY_CHAIR" Offset="0xD5C8" />
-        <Limb Name="gTijoUpperBodyLimb" Type="Standard" EnumName="TIJO_LIMB_UPPER_BODY" Offset="0xD5D4" />
-        <Limb Name="gTijoHeadLimb" Type="Standard" EnumName="TIJO_LIMB_HEAD" Offset="0xD5E0" />
-        <Limb Name="gTijoLeftArmLimb" Type="Standard" EnumName="TIJO_LIMB_LEFT_ARM" Offset="0xD5EC" />
-        <Limb Name="gTijoLeftForearmLimb" Type="Standard" EnumName="TIJO_LIMB_LEFT_FOREARM" Offset="0xD5F8" />
-        <Limb Name="gTijoLeftHandLimb" Type="Standard" EnumName="TIJO_LIMB_LEFT_HAND" Offset="0xD604" />
-        <Limb Name="gTijoRightArmLimb" Type="Standard" EnumName="TIJO_LIMB_RIGHT_ARM" Offset="0xD610" />
-        <Limb Name="gTijoRightForearmLimb" Type="Standard" EnumName="TIJO_LIMB_RIGHT_FOREARM" Offset="0xD61C" />
-        <Limb Name="gTijoRightHandLimb" Type="Standard" EnumName="TIJO_LIMB_RIGHT_HAND" Offset="0xD628" />
-
-        <!-- Tijo Skeleton -->
-        <Skeleton Name="gTijoSkel" Type="Flex" LimbType="Standard" LimbNone="TIJO_LIMB_NONE" LimbMax="TIJO_LIMB_MAX" EnumName="TijoLimb" Offset="0xD658" />
-
-        <!-- Tijo Andantino Animation -->
-        <Animation Name="gTijoPlayingAndantinoAnim" Offset="0xD9B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zog.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zog.xml
deleted file mode 100644
index c6bc9eed7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zog.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<Root>
-    <File Name="object_zog" Segment="6">
-        <Animation Name="object_zog_Anim_001000" Offset="0x1000" />
-        <Animation Name="object_zog_Anim_001970" Offset="0x1970" />
-        <Animation Name="object_zog_Anim_002344" Offset="0x2344" />
-        <Animation Name="object_zog_Anim_002894" Offset="0x2894" />
-        <Animation Name="object_zog_Anim_0030E0" Offset="0x30E0" />
-        <Animation Name="object_zog_Anim_0037F8" Offset="0x37F8" />
-        <Animation Name="object_zog_Anim_0041D0" Offset="0x41D0" />
-        <Animation Name="object_zog_Anim_004BDC" Offset="0x4BDC" />
-        <Animation Name="object_zog_Anim_0055B4" Offset="0x55B4" />
-        <DList Name="gMikauGraveDirtDL" Offset="0x69F0" />
-        <DList Name="gMikauGraveDL" Offset="0x6AA0" />
-        <Texture Name="gMikauGraveDirtTex" OutName="mikau_grave_dirt" Format="rgba16" Width="16" Height="32" Offset="0x6FD0" />
-        <Texture Name="gMikauGraveJawTex" OutName="mikau_grave_jaw" Format="rgba16" Width="16" Height="16" Offset="0x73D0" />
-        <Texture Name="gMikauGraveEyeTex" OutName="mikau_grave_eye" Format="rgba16" Width="16" Height="16" Offset="0x75D0" />
-        <Texture Name="gMikauGraveTeethTex" OutName="mikau_grave_teeth" Format="rgba16" Width="16" Height="16" Offset="0x77D0" />
-        <Texture Name="gMikauGraveSpinousTex" OutName="mikau_grave_spinous" Format="rgba16" Width="16" Height="32" Offset="0x79D0" />
-        <Texture Name="gMikauGraveBoneTex" OutName="mikau_grave_bone" Format="rgba16" Width="16" Height="32" Offset="0x7DD0" />
-        <Texture Name="gMikauGraveWoodenStickTex" OutName="mikau_grave_wooden_stick" Format="rgba16" Width="32" Height="8" Offset="0x81D0" />
-        <Texture Name="gMikauGraveCordTex" OutName="mikau_grave_cord" Format="rgba16" Width="16" Height="8" Offset="0x83D0" />
-        <Collision Name="gMikauGraveCol" Offset="0x8670" />
-        <Animation Name="object_zog_Anim_008EB8" Offset="0x8EB8" />
-        <Animation Name="object_zog_Anim_00931C" Offset="0x931C" />
-        <Animation Name="object_zog_Anim_0099A4" Offset="0x99A4" />
-        <Animation Name="object_zog_Anim_009EC4" Offset="0x9EC4" />
-        <Animation Name="object_zog_Anim_00B01C" Offset="0xB01C" />
-        <Animation Name="object_zog_Anim_00BF38" Offset="0xBF38" />
-        <Animation Name="object_zog_Anim_00CA94" Offset="0xCA94" />
-        <Animation Name="object_zog_Anim_00ECBC" Offset="0xECBC" />
-        <Animation Name="object_zog_Anim_00F110" Offset="0xF110" />
-        <Animation Name="object_zog_Anim_00FC0C" Offset="0xFC0C" />
-        <Animation Name="object_zog_Anim_0106B0" Offset="0x106B0" />
-        <Animation Name="object_zog_Anim_014B10" Offset="0x14B10" />
-        <Animation Name="object_zog_Anim_01579C" Offset="0x1579C" />
-        <Animation Name="object_zog_Anim_015B80" Offset="0x15B80" />
-        <Animation Name="object_zog_Anim_0166F4" Offset="0x166F4" />
-        <Animation Name="object_zog_Anim_017170" Offset="0x17170" />
-        <Animation Name="object_zog_Anim_018600" Offset="0x18600" />
-        <Animation Name="object_zog_Anim_01A06C" Offset="0x1A06C" />
-        <Animation Name="object_zog_Anim_01A990" Offset="0x1A990" />
-        <Animation Name="object_zog_Anim_01AD58" Offset="0x1AD58" />
-        <Animation Name="object_zog_Anim_01B72C" Offset="0x1B72C" />
-        <Animation Name="object_zog_Anim_01BC88" Offset="0x1BC88" />
-        <DList Name="object_zog_DL_01F830" Offset="0x1F830" />
-        <DList Name="object_zog_DL_01F9A8" Offset="0x1F9A8" />
-        <DList Name="object_zog_DL_01FB40" Offset="0x1FB40" />
-        <DList Name="object_zog_DL_01FFA0" Offset="0x1FFA0" />
-        <DList Name="object_zog_DL_0201C8" Offset="0x201C8" />
-        <DList Name="object_zog_DL_0204D0" Offset="0x204D0" />
-        <DList Name="object_zog_DL_020690" Offset="0x20690" />
-        <DList Name="object_zog_DL_0209B8" Offset="0x209B8" />
-        <DList Name="object_zog_DL_020CC0" Offset="0x20CC0" />
-        <DList Name="object_zog_DL_020E80" Offset="0x20E80" />
-        <DList Name="object_zog_DL_021360" Offset="0x21360" />
-        <DList Name="object_zog_DL_021438" Offset="0x21438" />
-        <DList Name="object_zog_DL_021510" Offset="0x21510" />
-        <DList Name="object_zog_DL_021850" Offset="0x21850" />
-        <DList Name="object_zog_DL_021A88" Offset="0x21A88" />
-        <DList Name="object_zog_DL_021D48" Offset="0x21D48" />
-        <DList Name="object_zog_DL_021FF0" Offset="0x21FF0" />
-        <DList Name="object_zog_DL_022228" Offset="0x22228" />
-        <DList Name="object_zog_DL_0224E8" Offset="0x224E8" />
-        <Texture Name="object_zog_TLUT_022790" OutName="tlut_022790" Format="rgba16" Width="16" Height="16" Offset="0x22790" />
-        <Texture Name="object_zog_TLUT_022990" OutName="tlut_022990" Format="rgba16" Width="16" Height="16" Offset="0x22990" />
-        <Texture Name="object_zog_Tex_022B90" OutName="tex_022B90" Format="ci8" Width="8" Height="8" Offset="0x22B90" />
-        <Texture Name="object_zog_Tex_022BD0" OutName="tex_022BD0" Format="ci8" Width="32" Height="32" Offset="0x22BD0" />
-        <Texture Name="object_zog_Tex_022FD0" OutName="tex_022FD0" Format="ci8" Width="32" Height="32" Offset="0x22FD0" />
-        <Texture Name="object_zog_Tex_0233D0" OutName="tex_0233D0" Format="rgba16" Width="16" Height="16" Offset="0x233D0" />
-        <Texture Name="object_zog_Tex_0235D0" OutName="tex_0235D0" Format="ci8" Width="32" Height="64" Offset="0x235D0" />
-        <Texture Name="object_zog_Tex_023DD0" OutName="tex_023DD0" Format="ci8" Width="8" Height="16" Offset="0x23DD0" />
-        <Texture Name="object_zog_Tex_023E50" OutName="tex_023E50" Format="rgba16" Width="16" Height="16" Offset="0x23E50" />
-        <Texture Name="object_zog_Tex_024050" OutName="tex_024050" Format="ci8" Width="16" Height="16" Offset="0x24050" />
-        <Texture Name="object_zog_Tex_024150" OutName="tex_024150" Format="rgba16" Width="16" Height="16" Offset="0x24150" />
-        <Texture Name="object_zog_Tex_024350" OutName="tex_024350" Format="ci8" Width="16" Height="32" Offset="0x24350" />
-        <Texture Name="object_zog_Tex_024550" OutName="tex_024550" Format="ci8" Width="16" Height="32" Offset="0x24550" />
-        <Texture Name="object_zog_Tex_024750" OutName="tex_024750" Format="rgba16" Width="32" Height="32" Offset="0x24750" />
-        <Texture Name="object_zog_Tex_024F50" OutName="tex_024F50" Format="rgba16" Width="32" Height="32" Offset="0x24F50" />
-        <Texture Name="object_zog_Tex_025750" OutName="tex_025750" Format="rgba16" Width="32" Height="32" Offset="0x25750" />
-        <Texture Name="object_zog_Tex_025F50" OutName="tex_025F50" Format="rgba16" Width="32" Height="32" Offset="0x25F50" />
-        <Texture Name="object_zog_Tex_026750" OutName="tex_026750" Format="rgba16" Width="32" Height="32" Offset="0x26750" />
-
-        <DList Name="object_zog_DL_0280A0" Offset="0x280A0" />
-        <DList Name="object_zog_DL_0280A8" Offset="0x280A8" />
-        <Texture Name="object_zog_Tex_028610" OutName="tex_028610" Format="rgba16" Width="16" Height="16" Offset="0x28610" />
-        <Texture Name="object_zog_Tex_028810" OutName="tex_028810" Format="rgba16" Width="16" Height="32" Offset="0x28810" />
-        <Texture Name="object_zog_Tex_028C10" OutName="tex_028C10" Format="rgba16" Width="16" Height="32" Offset="0x28C10" />
-        <Limb Name="object_zog_Standardlimb_029010" Type="Standard" EnumName="OBJECT_ZOG_LIMB_01" Offset="0x29010" />
-        <Limb Name="object_zog_Standardlimb_02901C" Type="Standard" EnumName="OBJECT_ZOG_LIMB_02" Offset="0x2901C" />
-        <Limb Name="object_zog_Standardlimb_029028" Type="Standard" EnumName="OBJECT_ZOG_LIMB_03" Offset="0x29028" />
-        <Limb Name="object_zog_Standardlimb_029034" Type="Standard" EnumName="OBJECT_ZOG_LIMB_04" Offset="0x29034" />
-        <Limb Name="object_zog_Standardlimb_029040" Type="Standard" EnumName="OBJECT_ZOG_LIMB_05" Offset="0x29040" />
-        <Limb Name="object_zog_Standardlimb_02904C" Type="Standard" EnumName="OBJECT_ZOG_LIMB_06" Offset="0x2904C" />
-        <Limb Name="object_zog_Standardlimb_029058" Type="Standard" EnumName="OBJECT_ZOG_LIMB_07" Offset="0x29058" />
-        <Limb Name="object_zog_Standardlimb_029064" Type="Standard" EnumName="OBJECT_ZOG_LIMB_08" Offset="0x29064" />
-        <Limb Name="object_zog_Standardlimb_029070" Type="Standard" EnumName="OBJECT_ZOG_LIMB_09" Offset="0x29070" />
-        <Limb Name="object_zog_Standardlimb_02907C" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0A" Offset="0x2907C" />
-        <Limb Name="object_zog_Standardlimb_029088" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0B" Offset="0x29088" />
-        <Limb Name="object_zog_Standardlimb_029094" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0C" Offset="0x29094" />
-        <Limb Name="object_zog_Standardlimb_0290A0" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0D" Offset="0x290A0" />
-        <Limb Name="object_zog_Standardlimb_0290AC" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0E" Offset="0x290AC" />
-        <Limb Name="object_zog_Standardlimb_0290B8" Type="Standard" EnumName="OBJECT_ZOG_LIMB_0F" Offset="0x290B8" />
-        <Limb Name="object_zog_Standardlimb_0290C4" Type="Standard" EnumName="OBJECT_ZOG_LIMB_10" Offset="0x290C4" />
-        <Limb Name="object_zog_Standardlimb_0290D0" Type="Standard" EnumName="OBJECT_ZOG_LIMB_11" Offset="0x290D0" />
-        <Limb Name="object_zog_Standardlimb_0290DC" Type="Standard" EnumName="OBJECT_ZOG_LIMB_12" Offset="0x290DC" />
-        <Limb Name="object_zog_Standardlimb_0290E8" Type="Standard" EnumName="OBJECT_ZOG_LIMB_13" Offset="0x290E8" />
-        <Limb Name="object_zog_Standardlimb_0290F4" Type="Standard" EnumName="OBJECT_ZOG_LIMB_14" Offset="0x290F4" />
-        <Limb Name="object_zog_Standardlimb_029100" Type="Standard" EnumName="OBJECT_ZOG_LIMB_15" Offset="0x29100" />
-        <Limb Name="object_zog_Standardlimb_02910C" Type="Standard" EnumName="OBJECT_ZOG_LIMB_16" Offset="0x2910C" />
-        <Skeleton Name="object_zog_Skel_029170" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOG_LIMB_NONE" LimbMax="OBJECT_ZOG_LIMB_MAX" EnumName="ObjectZogLimb" Offset="0x29170" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zoraband.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zoraband.xml
deleted file mode 100644
index 53a3d5a7b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zoraband.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="object_zoraband" Segment="6">
-        <DList Name="object_zoraband_DL_000180" Offset="0x180" />
-        <DList Name="object_zoraband_DL_0002A8" Offset="0x2A8" />
-        <Texture Name="object_zoraband_Tex_000330" OutName="tex_000330" Format="i8" Width="32" Height="32" Offset="0x330" />
-        <Texture Name="object_zoraband_Tex_000730" OutName="tex_000730" Format="i8" Width="32" Height="32" Offset="0x730" />
-        <Texture Name="object_zoraband_Tex_000B30" OutName="tex_000B30" Format="i8" Width="32" Height="32" Offset="0xB30" />
-        <TextureAnimation Name="object_zoraband_Matanimheader_000F38" Offset="0xF38" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zoraegg.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zoraegg.xml
deleted file mode 100644
index 0fd05641d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zoraegg.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Root>
-    <!-- Object for Zora Baby and Zora Egg -->
-    <File Name="object_zoraegg" Segment="6">
-        <!-- The animations when all the eggs hatch and the Zora babies swim up -->
-        <Animation Name="gZoraBabySwimUpAnim" Offset="0x5D4" />
-        <Animation Name="gZoraBabyHatchAnim" Offset="0x1E08" />
-        
-        <!-- Zora Baby Dlists -->
-        <DList Name="gZoraBabyHeadDL" Offset="0x2550" />
-        <DList Name="gZoraBabyTail1DL" Offset="0x27C8" />
-        <DList Name="gZoraBabyTail2DL" Offset="0x2A60" />
-        <DList Name="gZoraBabyTailFinDL" Offset="0x2B60" />
-        <DList Name="gZoraBabyRightPectoralFinDL" Offset="0x2C70" />
-        <DList Name="gZoraBabyLeftPectoralFinDL" Offset="0x2D30" />
-        
-        <!-- Zora Baby Textures -->
-        <Texture Name="gZoraBabyTLUT" OutName="zora_baby_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2DF0" />
-        <Texture Name="gZoraBabyTailFinTex" OutName="zora_baby_tail_fin" Format="ci8" Width="32" Height="32" Offset="0x2FF0" />
-        <Texture Name="gZoraBabySkinTex" OutName="zora_baby_skin" Format="ci8" Width="8" Height="8" Offset="0x33F0" />
-        <Texture Name="gZoraBabyEyeOpenTex" OutName="zora_baby_eye_open" Format="ci8" Width="32" Height="32" Offset="0x3430" />
-        <Texture Name="gZoraBabySkinPatternTex" OutName="zora_baby_skin_pattern" Format="ci8" Width="32" Height="64" Offset="0x3830" />
-        <Texture Name="gZoraBabyPectoralFinTex" OutName="zora_baby_pectoral_fin" Format="ci8" Width="32" Height="32" Offset="0x4030" />
-        <Texture Name="gZoraBabyEyeHalfTex" OutName="zora_baby_eye_half" Format="ci8" Width="32" Height="32" Offset="0x4430" />
-        <Texture Name="gZoraBabyEyeClosedTex" OutName="zora_baby_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4830" />
-
-        <!-- Zora Baby Limbs -->
-        <Limb Name="gZoraBabyHeadLimb" Type="Standard" EnumName="ZORA_BABY_LIMB_HEAD" Offset="0x4C30" />
-        <Limb Name="gZoraBabyTail1Limb" Type="Standard" EnumName="ZORA_BABY_LIMB_TAIL1" Offset="0x4C3C" />
-        <Limb Name="gZoraBabyTail2Limb" Type="Standard" EnumName="ZORA_BABY_LIMB_TAIL2" Offset="0x4C48" />
-        <Limb Name="gZoraBabyTailFinLimb" Type="Standard" EnumName="ZORA_BABY_LIMB_TAIL_FIN" Offset="0x4C54" />
-        <Limb Name="gZoraBabyRightPectoralFinLimb" Type="Standard" EnumName="ZORA_BABY_LIMB_RIGHT_PECTORAL_FIN" Offset="0x4C60" />
-        <Limb Name="gZoraBabyLeftPectoralFinLimb" Type="Standard" EnumName="ZORA_BABY_LIMB_LEFT_PECTORAL_FIN" Offset="0x4C6C" />
-
-        <!-- Zora baby Skeleton -->
-        <Skeleton Name="gZoraBabySkel" Type="Flex" LimbType="Standard" LimbNone="ZORA_BABY_LIMB_NONE" LimbMax="ZORA_BABY_LIMB_MAX" EnumName="ZoraBabyLimb" Offset="0x4C90" />
-        
-        <!-- Animations -->
-        <Animation Name="gZoraBabyFormNoteAnim" Offset="0x4D20" />
-        <Animation Name="gZoraBabySongLearnedAnim" Offset="0x4E04" />
-        <Animation Name="gZoraBabyNoteAnim" Offset="0x4FE4" />
-        <Animation Name="gZoraBabySwimAnim" Offset="0x5098" />
-        
-        <!-- Zora Egg -->
-        <DList Name="gZoraEggDL" Offset="0x5250" />
-        <Texture Name="gZoraEggTLUT" OutName="zora_egg_tlut" Format="rgba16" Width="16" Height="16" Offset="0x53B0" />
-        <Texture Name="gZoraEggTex" OutName="zora_egg" Format="ci8" Width="32" Height="32" Offset="0x55B0" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zos.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zos.xml
deleted file mode 100644
index 5b3b12345..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zos.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<Root>
-    <!-- Assets for Evan, the pianist of The Indigo-Go's. -->
-    <File Name="object_zos" Segment="6">
-        <!-- Evan Animations -->
-        <Animation Name="gEvanSlowPlayAnim" Offset="0x1CFC" /> <!-- Original name is "ev_ensou_loop" ("musical performance​") -->
-        <Animation Name="gEvanInspiredAnim" Offset="0x48D4" /> <!-- Original name is "zK_furimuki" ("to turn around") -->
-        <Animation Name="gEvanPlayRightAnim" Offset="0x5E04" /> <!-- Original name is "zK_play01" -->
-        <Animation Name="gEvanPlayLeftAnim" Offset="0x7334" /> <!-- Original name is "zK_play02" -->
-        <Animation Name="gEvanTalkFootTapAnim" Offset="0x7C40" /> <!-- Original name is "zK_talk01" -->
-        <Animation Name="gEvanTalkLookDownAnim" Offset="0x8630" /> <!-- Original name is "zK_talk02" -->
-        <Animation Name="gEvanTalkArmsOutAnim" Offset="0x90CC" /> <!-- Original name is "zK_talk03" -->
-        <Animation Name="gEvanTalkHandsOnHipsAnim" Offset="0x9830" /> <!-- Original name is "zK_talk04" -->
-        <Animation Name="gEvanLeanOnKeyboardAnim" Offset="0xA164" /> <!-- Original name is "zK_wait01" -->
-
-        <!-- Evan Limb DisplayLists -->
-        <DList Name="gEvanPelvisDL" Offset="0xD2B0" />
-        <DList Name="gEvanTorsoDL" Offset="0xD3E0" />
-        <DList Name="gEvanRightUpperArmDL" Offset="0xD658" />
-        <DList Name="gEvanRightForearmDL" Offset="0xD7A8" />
-        <DList Name="gEvanRightHandDL" Offset="0xD900" />
-        <DList Name="gEvanLeftUpperArmDL" Offset="0xDA90" />
-        <DList Name="gEvanLeftForearmDL" Offset="0xDB90" />
-        <DList Name="gEvanLeftHandDL" Offset="0xDCE8" />
-        <DList Name="gEvanHeadDL" Offset="0xDE78" />
-        <DList Name="gEvanUpperHeadFinDL" Offset="0xE328" />
-        <DList Name="gEvanLowerHeadFinDL" Offset="0xE400" />
-        <DList Name="gEvanRightThighDL" Offset="0xE4C8" />
-        <DList Name="gEvanRightShinDL" Offset="0xE700" />
-        <DList Name="gEvanRightFootDL" Offset="0xE8A0" />
-        <DList Name="gEvanLeftThighDL" Offset="0xEA80" />
-        <DList Name="gEvanLeftShinDL" Offset="0xEC98" />
-        <DList Name="gEvanLeftFootDL" Offset="0xEE38" />
-
-        <!-- Evan Textures -->
-        <Texture Name="gEvanFingersTLUT" OutName="evan_fingers_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF018" />
-        <Texture Name="gEvanSpottedSkinTex" OutName="evan_spotted_skin" Format="rgba16" Width="32" Height="32" Offset="0xF218" />
-        <Texture Name="gEvanFingersTex" OutName="evan_fingers" Format="ci8" Width="16" Height="16" Offset="0xFA18" />
-        <Texture Name="gEvanMouthEdgeTex" OutName="evan_mouth_edge" Format="rgba16" Width="8" Height="8" Offset="0xFB18" />
-        <Texture Name="gEvanMouthAndFinsTex" OutName="evan_mouth_and_fins" Format="rgba16" Width="8" Height="8" Offset="0xFB98" />
-        <Texture Name="gEvanSkinTex" OutName="evan_skin" Format="rgba16" Width="8" Height="8" Offset="0xFC18" />
-        <Texture Name="gEvanHeadphoneClamTex" OutName="evan_headphone_clam" Format="rgba16" Width="32" Height="32" Offset="0xFC98" />
-        <Texture Name="gEvanHeadphoneBoneTex" OutName="evan_headphone_bone" Format="rgba16" Width="16" Height="32" Offset="0x10498" />
-        <Texture Name="gEvanArmbandTex" OutName="evan_armband" Format="rgba16" Width="8" Height="8" Offset="0x10898" />
-        <Texture Name="gEvanEyeOpenTex" OutName="evan_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x10918" />
-        <Texture Name="gEvanEyeHalfTex" OutName="evan_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x11118" />
-        <Texture Name="gEvanEyeClosedTex" OutName="evan_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x11918" />
-
-        <!-- Evan's Keyboard DisplayLists -->
-        <DList Name="gEvanKeyboardDL" Offset="0x13088" /> <!-- Original name is "zK_gakki_model" -->
-        <DList Name="gEvanUnknownWhiteTriangleDL" Offset="0x136E0" /> <!-- The purpose of this is unknown. It cannot be seen in-game. -->
-
-        <!-- Evan's Keyboard Textures -->
-        <Texture Name="gEvanKeyboardRibKeysTex" OutName="evan_keyboard_rib_keys" Format="rgba16" Width="32" Height="32" Offset="0x13728" />
-        <Texture Name="gEvanKeyboardSkullTex" OutName="evan_keyboard_skull" Format="rgba16" Width="32" Height="32" Offset="0x13F28" />
-        <Texture Name="gEvanKeyboardBoneTex" OutName="evan_keyboard_bone" Format="rgba16" Width="32" Height="32" Offset="0x14728" />
-        <Texture Name="gEvanKeyboardOtherKeysTex" OutName="evan_keyboard_other_keys" Format="rgba16" Width="16" Height="16" Offset="0x14F28" />
-
-        <!-- Evan Limbs -->
-        <Limb Name="gEvanPelvisLimb" Type="Standard" EnumName="EVAN_LIMB_PELVIS" Offset="0x15128" />
-        <Limb Name="gEvanLeftThighLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_THIGH" Offset="0x15134" />
-        <Limb Name="gEvanLeftShinLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_SHIN" Offset="0x15140" />
-        <Limb Name="gEvanLeftFootLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_FOOT" Offset="0x1514C" />
-        <Limb Name="gEvanRightThighLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_THIGH" Offset="0x15158" />
-        <Limb Name="gEvanRightShinLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_SHIN" Offset="0x15164" />
-        <Limb Name="gEvanRightFootLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_FOOT" Offset="0x15170" />
-        <Limb Name="gEvanTorsoLimb" Type="Standard" EnumName="EVAN_LIMB_TORSO" Offset="0x1517C" />
-        <Limb Name="gEvanHeadLimb" Type="Standard" EnumName="EVAN_LIMB_HEAD" Offset="0x15188" />
-        <Limb Name="gEvanUpperHeadFinLimb" Type="Standard" EnumName="EVAN_LIMB_UPPER_HEAD_FIN" Offset="0x15194" />
-        <Limb Name="gEvanLowerHeadFinLimb" Type="Standard" EnumName="EVAN_LIMB_LOWER_HEAD_FIN" Offset="0x151A0" />
-        <Limb Name="gEvanLeftUpperArmLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_UPPER_ARM" Offset="0x151AC" />
-        <Limb Name="gEvanLeftForearmLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_FOREARM" Offset="0x151B8" />
-        <Limb Name="gEvanLeftHandLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_HAND" Offset="0x151C4" />
-        <Limb Name="gEvanRightUpperArmLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_UPPER_ARM" Offset="0x151D0" />
-        <Limb Name="gEvanRightForearmLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_FOREARM" Offset="0x151DC" />
-        <Limb Name="gEvanRightHandLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_HAND" Offset="0x151E8" />
-
-        <!-- Evan Skeleton -->
-        <Skeleton Name="gEvanSkel" Type="Flex" LimbType="Standard" LimbNone="EVAN_LIMB_NONE" LimbMax="EVAN_LIMB_MAX" EnumName="EvanLimb" Offset="0x15238" />
-
-        <!-- Evan Animations -->
-        <Animation Name="gEvanLeanOnKeyboardAndSighAnim" Offset="0x1621C" /> <!-- Original name is "zK_wait02" -->
-        <Animation Name="gEvanHandsOnHipsAnim" Offset="0x16980" /> <!-- Original name is "zK_wait03" -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zov.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zov.xml
deleted file mode 100644
index 31b9bcd7b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/objects/object_zov.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<Root>
-    <!-- Assets for Lulu - Zora Vocalist -->
-    <File Name="object_zov" Segment="6">
-
-        <!-- Lulu Animations -->
-        <Animation Name="gLuluTurnAndWalkAnim" Offset="0x17D4" />
-        <Animation Name="gLuluWalkLoopAnim" Offset="0x23F4" />
-        <Animation Name="gLuluSingStartAnim" Offset="0x2B5C" />
-        <Animation Name="gLuluSingLoopAnim" Offset="0x418C" />
-        <Animation Name="gLuluLookForwardAndLeftAnim" Offset="0x5A6C" />
-        <Animation Name="gLuluLookLeftLoopAnim" Offset="0x66A4" />
-        <Animation Name="gLuluPutHandsDownAnim" Offset="0x8120" />
-        <Animation Name="gLuluLookAroundAnim" Offset="0xA888" />
-        <Animation Name="gLuluLookForwardAndDownAnim" Offset="0xB4CC" />
-        <Animation Name="gLuluAngleHeadAnim" Offset="0xC510" />
-        <Animation Name="gLuluNodAnim" Offset="0xCAA8" />
-        <Animation Name="gLuluLookDownAnim" Offset="0xD3EC" />
-
-        <!-- Lulu Limb DLists -->
-        <DList Name="gLuluTorsoDL" Offset="0x107B0" />
-        <DList Name="gLuluRightUpperArmDL" Offset="0x10BC0" />
-        <DList Name="gLuluRightForearmDL" Offset="0x10E60" />
-        <DList Name="gLuluRightHandDL" Offset="0x10FF0" />
-        <DList Name="gLuluRightArmUpperFinDL" Offset="0x11230" />
-        <DList Name="gLuluRightArmLowerFinDL" Offset="0x11300" />
-        <DList Name="gLuluLeftUpperArmDL" Offset="0x113F0" />
-        <DList Name="gLuluLeftForearmDL" Offset="0x11690" />
-        <DList Name="gLuluLeftHandDL" Offset="0x11820" />
-        <DList Name="gLuluLeftArmUpperFinDL" Offset="0x11A60" />
-        <DList Name="gLuluLeftArmLowerFinDL" Offset="0x11B30" />
-        <DList Name="gLuluHeadDL" Offset="0x11C20" />
-        <DList Name="gLuluPelvisDL" Offset="0x122E0" />
-        <DList Name="gLuluRightThighDL" Offset="0x123C0" />
-        <DList Name="gLuluRightShinDL" Offset="0x12560" />
-        <DList Name="gLuluRightLegFinDL" Offset="0x127D0" />
-        <DList Name="gLuluRightFootDL" Offset="0x12890" />
-        <DList Name="gLuluLeftThighDL" Offset="0x12B20" />
-        <DList Name="gLuluLeftShinDL" Offset="0x12CB8" />
-        <DList Name="gLuluLeftLegFinDL" Offset="0x12F28" />
-        <DList Name="gLuluLeftFootDL" Offset="0x12FE8" />
-
-        <!-- Lulu Textures -->
-        <Texture Name="gLuluTLUT" OutName="lulu_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13278" />
-        <Texture Name="gLuluEarringTex" OutName="lulu_earring" Format="rgba16" Width="8" Height="16" Offset="0x13478" />
-        <Texture Name="gLuluSkinTex" OutName="lulu_skin" Format="ci8" Width="8" Height="8" Offset="0x13578" />
-        <Texture Name="gLuluNostrilTex" OutName="lulu_nostril" Format="ci8" Width="8" Height="8" Offset="0x135B8" />
-        <Texture Name="gLuluMouthClosedTex" OutName="lulu_mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x135F8" />
-        <Texture Name="gLuluHeadSkinTex" OutName="lulu_head_skin" Format="ci8" Width="16" Height="16" Offset="0x139F8" />
-        <Texture Name="gLuluEarCavityTex" OutName="lulu_ear_cavity" Format="ci8" Width="8" Height="8" Offset="0x13AF8" />
-        <Texture Name="gLuluHeadHoleTex" OutName="lulu_head_hole" Format="ci8" Width="16" Height="16" Offset="0x13B38" />
-        <Texture Name="gLuluEyeOpenTex" OutName="lulu_eye_open" Format="ci8" Width="32" Height="32" Offset="0x13C38" />
-        <Texture Name="gLuluEarTex" OutName="lulu_ear" Format="ci8" Width="16" Height="16" Offset="0x14038" />
-        <Texture Name="gLuluEyeClosedTex" OutName="lulu_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x14138" />
-        <Texture Name="gLuluMouthOpenTex" OutName="lulu_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x14538" />
-        <Texture Name="gLuluSpottedSkinTex" OutName="lulu_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x14938" />
-        <Texture Name="gLuluMouthOpenFullTex" OutName="lulu_mouth_open_full" Format="ci8" Width="32" Height="32" Offset="0x14D38" />
-        <Texture Name="gLuluEyeHalfTex" OutName="lulu_eye_half" Format="ci8" Width="32" Height="32" Offset="0x15138" />
-        <Texture Name="gLuluSkinShadowTex" OutName="lulu_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x15538" />
-        <Texture Name="gLuluKneeAndElbowTex" OutName="lulu_knee_and_elbow" Format="ci8" Width="16" Height="16" Offset="0x15578" />
-        <Texture Name="gLuluFingersTex" OutName="lulu_fingers" Format="ci8" Width="16" Height="16" Offset="0x15678" />
-        <Texture Name="gLuluDressPatternTex" OutName="lulu_dress_pattern" Format="rgba16" Width="32" Height="32" Offset="0x15778" />
-        <Texture Name="gLuluDressStringTex" OutName="lulu_dress_string" Format="ci8" Width="16" Height="16" Offset="0x15F78" />
-        <Texture Name="gLuluDressLoopTex" OutName="lulu_dress_loop" Format="ci8" Width="8" Height="16" Offset="0x16078" />
-        
-        <!-- Lulu Limbs and Skeleton -->
-        <Limb Name="gLuluRootLimb" Type="Standard" EnumName="LULU_LIMB_ROOT" Offset="0x160F8" />
-        <Limb Name="gLuluPelvisLimb" Type="Standard" EnumName="LULU_LIMB_PELVIS" Offset="0x16104" />
-        <Limb Name="gLuluLeftThighLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_THIGH" Offset="0x16110" />
-        <Limb Name="gLuluLeftShinLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_SHIN" Offset="0x1611C" />
-        <Limb Name="gLuluLeftFootLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_FOOT" Offset="0x16128" />
-        <Limb Name="gLuluLeftLegFinLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_LEG_FIN" Offset="0x16134" />
-        <Limb Name="gLuluRightThighLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_THIGH" Offset="0x16140" />
-        <Limb Name="gLuluRightShinLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_SHIN" Offset="0x1614C" />
-        <Limb Name="gLuluRightFootLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_FOOT" Offset="0x16158" />
-        <Limb Name="gLuluRightLegFinLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_LEG_FIN" Offset="0x16164" />
-        <Limb Name="gLuluTorsoLimb" Type="Standard" EnumName="LULU_LIMB_TORSO" Offset="0x16170" />
-        <Limb Name="gLuluHeadLimb" Type="Standard" EnumName="LULU_LIMB_HEAD" Offset="0x1617C" />
-        <Limb Name="gLuluLeftUpperArmLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_UPPER_ARM" Offset="0x16188" />
-        <Limb Name="gLuluLeftArmUpperFinLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_ARM_UPPER_FIN" Offset="0x16194" />
-        <Limb Name="gLuluLeftArmLowerFinLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_ARM_LOWER_FIN" Offset="0x161A0" />
-        <Limb Name="gLuluLeftForearmLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_FOREARM" Offset="0x161AC" />
-        <Limb Name="gLuluLeftHandLimb" Type="Standard" EnumName="LULU_LIMB_LEFT_HAND" Offset="0x161B8" />
-        <Limb Name="gLuluRightUpperArmLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_UPPER_ARM" Offset="0x161C4" />
-        <Limb Name="gLuluRightArmUpperFinLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_ARM_UPPER_FIN" Offset="0x161D0" />
-        <Limb Name="gLuluRightArmLowerFinLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_ARM_LOWER_FIN" Offset="0x161DC" />
-        <Limb Name="gLuluRightForearmLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_FOREARM" Offset="0x161E8" />
-        <Limb Name="gLuluRightHandLimb" Type="Standard" EnumName="LULU_LIMB_RIGHT_HAND" Offset="0x161F4" />
-        <Skeleton Name="gLuluSkel" Type="Flex" LimbType="Standard" LimbNone="LULU_LIMB_NONE" LimbMax="LULU_LIMB_MAX" EnumName="LuluLimb" Offset="0x16258" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Arrow_Fire.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Arrow_Fire.xml
deleted file mode 100644
index 893f335d0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Arrow_Fire.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <File Name="ovl_Arrow_Fire" BaseAddress="0x80920340" RangeStart="0xAB0" RangeEnd="0x1ED0">
-        <Texture Name="gFireArrowMaskTex" OutName="fire_arrow_mask" Format="i8" Width="32" Height="64" Offset="0x12B0"/>
-        <Texture Name="gFireArrowTex" OutName="fire_arrow" Format="i8" Width="32" Height="64" Offset="0xAB0"/>
-
-        <Array Name="gFireArrowVtx" Count="43" Offset="0x1AB0">
-            <Vtx/>
-        </Array>
-        <DList Name="gFireArrowMaterialDL" Offset="0x1D60"/>
-        <DList Name="gFireArrowModelDL" Offset="0x1E10"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Arrow_Ice.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Arrow_Ice.xml
deleted file mode 100644
index bec512600..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Arrow_Ice.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <!-- Ice Arrow assets -->
-    <File Name="ovl_Arrow_Ice" BaseAddress="0x80922430" RangeStart="0x980" RangeEnd="0x1DA0">
-        <Texture Name="gIceArrowTex" OutName="ice_arrow" Format="i8" Width="32" Height="64" Offset="0x980"/>
-        <Texture Name="gIceArrowMaskTex" OutName="ice_arrow_mask" Format="i8" Width="32" Height="64" Offset="0x1180"/>
-        <Array Name="gIceArrowVtx" Count="43" Offset="0x1980">
-            <Vtx/>
-        </Array>
-        <DList Name="gIceArrowMaterialDL" Offset="0x1C30"/>
-        <DList Name="gIceArrowModelDL" Offset="0x1CE0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Arrow_Light.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Arrow_Light.xml
deleted file mode 100644
index 3d5ae87b8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Arrow_Light.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-  <File Name="ovl_Arrow_Light" BaseAddress="0x80924300" RangeStart="0x960" RangeEnd="0x1D80">
-    
-    <Texture Name="gLightArrowTex" OutName="light_arrow" Format="i8" Width="32" Height="64" Offset="0x960"/>
-    <Texture Name="gLightArrowMaskTex" OutName="light_arrow_mask" Format="i8" Width="32" Height="64" Offset="0x1160"/>
-    <Array Name="gLightArrowVtx" Count="43" Offset="0x1960">
-      <Vtx/>
-    </Array>
-    
-    <DList Name="gLightArrowMaterialDL" Offset="0x1C10"/>
-    <DList Name="gLightArrowModelDL" Offset="0x1CC0"/>
-  </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Boss_05.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Boss_05.xml
deleted file mode 100644
index 8eef13a4e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Boss_05.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Root>
-    <File Name="ovl_Boss_05" BaseAddress="0x809EE4E0" RangeStart="0x3540" RangeEnd="0x364C">
-        <Collision Name="sBioBabaLilypadCol" Offset="0x3620" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Dm_Char01.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Dm_Char01.xml
deleted file mode 100644
index 2aa05fcb6..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Dm_Char01.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <!-- Vertices for the dynamic water that moves when Woodfall Temple is raised. -->
-    <File Name="ovl_Dm_Char01" BaseAddress="0x80AA81E0" RangeStart="0x1BE0" RangeEnd="0x28B0">
-        <Array Name="gWoodfallSceneryDynamicPoisonWaterVtx" Count="205" Offset="0x1BE0">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Dm_Char08.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Dm_Char08.xml
deleted file mode 100644
index 4d96a8eb4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Dm_Char08.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-    <File Name="ovl_Dm_Char08" BaseAddress="0x80AAF050" RangeStart="0x2320" RangeEnd="0x266C">
-        <Array Name="sTurtleGreatBayTempleColPolygons" Count="19" Offset="0x2350">
-            <CollisionPoly/>
-        </Array>
-        <Array Name="sTurtleGreatBayTempleColPolygons2" Count="19" Offset="0x2480">
-            <CollisionPoly/>
-        </Array>
-        <Array Name="sTurtleGreatBayTempleColVertices" Count="12" Offset="0x25B0">
-            <Vector Type="s16" Dimensions="3" />
-        </Array>
-        <Array Name="sTurtleGreatBayTempleColVertices2" Count="12" Offset="0x25F8">
-            <Vector Type="s16" Dimensions="3" />
-        </Array>
-        <Collision Name="sTurtleGreatBayTempleCol" Offset="0x2640"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Effect_Ss_Fhg_Flash.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Effect_Ss_Fhg_Flash.xml
deleted file mode 100644
index 0c23d17cd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Effect_Ss_Fhg_Flash.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_Effect_Ss_Fhg_Flash" BaseAddress="0x8097C990" RangeStart="0x550" RangeEnd="0xA08">
-        <DList Name="gEffFhgFlashDL" Offset="0x590"/>
-        <Texture Name="gEffFhgFlashTex" OutName="eff_fhg_flash" Format="i8" Width="32" Height="32" Offset="0x608" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bigslime.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bigslime.xml
deleted file mode 100644
index fe92a87fb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bigslime.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="ovl_En_Bigslime" BaseAddress="0x808E4FC0" RangeStart="0x8680" RangeEnd="0xAF00">
-        <Array Name="sBigslimeStaticVtx" Count="162" Offset="0x8680">
-            <Vtx/>
-        </Array>
-        <Array Name="sBigslimeDynamicState0Vtx" Count="162" Offset="0x90A0">
-            <Vtx/>
-        </Array>
-        <Array Name="sBigslimeDynamicState1Vtx" Count="162" Offset="0x9AC0">
-            <Vtx/>
-        </Array>
-        <Array Name="sBigslimeTargetVtx" Count="162" Offset="0xA4E0">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bom.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bom.xml
deleted file mode 100644
index bc4b7fead..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <!-- Assets for the Powder Keg -->
-    <File Name="ovl_En_Bom" BaseAddress="0x80870DB0" RangeStart="0x2160" RangeEnd="0x3610">
-        <!-- Texture and DisplayLists for the Powder Keg's fuse -->
-        <Array Name="gPowderKegFuseVtx" Count="8" Offset="0x2160">
-            <Vtx/>
-        </Array> 
-        <Texture Name="gPowderKegFuseTex" OutName="powder_keg_fuse" Format="i8" Width="2" Height="2" Offset="0x21E0"/>
-        <DList Name="gPowderKegFuseMaterialDL" Offset="0x21E8"/>
-        <DList Name="gPowderKegFuseModel1DL" Offset="0x2270"/>
-        <DList Name="gPowderKegFuseModel2DL" Offset="0x2290"/>
-
-        <!-- Textures and DisplayList for the Powder Keg -->
-        <Texture Name="gPowderKegBarrelTLUT" OutName="powder_keg_barrel_tlut" Format="rgba16" Width="16" Height="16" Offset="0x22B0"/>
-        <Texture Name="gPowderKegBarrelTex" OutName="powder_keg_barrel" Format="ci8" Width="32" Height="32" Offset="0x24B0"/>
-        <DList Name="gPowderKegBarrelDL" Offset="0x2EF0"/>
-
-        <!-- Textures and DisplayList for the Goron Skull on the side of the Powder Keg -->
-        <Texture Name="gPowderKegGoronSkullTLUT" OutName="powder_keg_goron_skull_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3048"/>
-        <Texture Name="gPowderKegGoronSkullTex" OutName="powder_keg_goron_skull" Format="ci8" Width="16" Height="32" Offset="0x3248"/>
-        <DList Name="gPowderKegGoronSkullDL" Offset="0x3548"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bom_Bowl_Man.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bom_Bowl_Man.xml
deleted file mode 100644
index 7e0b6d08b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bom_Bowl_Man.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_En_Bom_Bowl_Man" BaseAddress="0x809C4790" RangeStart="0x1A50" RangeEnd="0x1A70">
-        <DList Name="gEnBomBowlMan_D_809C61E0" Offset="0x1A50"/>
-        <DList Name="gEnBomBowlMan_D_809C61F0" Offset="0x1A60"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bombers.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bombers.xml
deleted file mode 100644
index c6fc64246..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bombers.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_En_Bombers" BaseAddress="0x80C03530" RangeStart="0x12C8" RangeEnd="0x12E8">
-        <DList Name="ovl_En_Bombers_DL_12C8" Offset="0x12C8" />
-        <DList Name="ovl_En_Bombers_DL_12D8" Offset="0x12D8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bomjima.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bomjima.xml
deleted file mode 100644
index 5aada4887..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bomjima.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_En_Bomjima" BaseAddress="0x80BFE170" RangeStart="0x2998" RangeEnd="0x29B8">
-        <DList Name="gEnBomjima_D_80C00B08" Offset="0x2998"/>
-        <DList Name="gEnBomjima_D_80C00B18" Offset="0x29A8"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bomjimb.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bomjimb.xml
deleted file mode 100644
index af42c7956..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Bomjimb.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_En_Bomjimb" BaseAddress="0x80C00EA0" RangeStart="0x23A0" RangeEnd="0x23C0">
-        <DList Name="gEnBomjimb_D_80C03240" Offset="0x23A0"/>
-        <DList Name="gEnBomjimb_D_80C03250" Offset="0x23B0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Clear_Tag.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Clear_Tag.xml
deleted file mode 100644
index 0cbfcf80a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Clear_Tag.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<Root>
-    <File Name="ovl_En_Clear_Tag" BaseAddress="0x80947F60" RangeStart="0x2F00" RangeEnd="0x5D00">
-
-        <!-- Debris from explosion -->
-        <DList Name="gClearTagDebrisEffectMaterialDL" Offset="0x3130"/>
-        <Texture Name="gClearTagDebrisEffectTex" OutName="clear_tag_debris_effect" Format="rgba16" Width="16" Height="16" Offset="0x2F00"/>
-        <DList Name="gClearTagDebrisEffectDL" Offset="0x31B0"/>
-        <Array Name="gClearTagDebrisEffectVtx" Count="3" Offset="0x3100">
-            <Vtx/>
-        </Array>
-
-        <!-- Used for inner black smoke cloud from explosion: multi-texture -->
-        <DList Name="gClearTagFireEffectMaterialDL" Offset="0x37F8"/>
-        <Texture Name="gClearTagFireEffectFlickerTex" OutName="clear_tag_fire_effect_flicker" Format="i4" Width="32" Height="64" Offset="0x31C8"/>
-        <Texture Name="gClearTagFireEffectBackgroundTex" OutName="clear_tag_fire_effect_background" Format="i4" Width="32" Height="32" Offset="0x35C8"/>
-        <DList Name="gClearTagFireEffectDL" Offset="0x38A0"/>
-        <Array Name="gClearTagFireEffectVtx" Count="3" Offset="0x37C8">
-            <Vtx/>
-        </Array>
-
-        <!-- Used for spherical outer-most white-yellow cloud from explosions -->
-        <DList Name="gClearTagFlashEffectDL" Offset="0x4900"/>
-        <Texture Name="gClearTagFlashEffectTex" OutName="clear_tag_flash_effect" Format="i8" Width="64" Height="64" Offset="0x38C0"/>
-        <Array Name="gClearTagFlashEffectVtx" Count="4" Offset="0x48C0">
-            <Vtx/>
-        </Array>
-
-        <!-- Used for spherical outer-most cloud from explosions applied to floor poly -->
-        <DList Name="gClearTagFlashEffectGroundDL" Offset="0x4BB0"/>
-        <Texture Name="gClearTagFlashEffectGroundTex" OutName="clear_tag_flash_ground_effect" Format="i4" Width="32" Height="32" Offset="0x4980"/>
-        <Array Name="gClearTagFlashEffectGroundVtx" Count="3" Offset="0x4B80">
-            <Vtx/>
-        </Array>
-
-        <!-- Used for spherical glowing light orbs squished thin into light rays -->
-        <DList Name="gClearTagLightRayEffectMaterialDL" Offset="0x5C78"/>
-        <Texture Name="gClearTagLightRayEffectTex" OutName="clear_tag_light_ray_effect" Format="i8" Width="64" Height="64" Offset="0x4C38"/>
-        <DList Name="gClearTagLightRayEffectDL" Offset="0x5CE8"/>
-        <Array Name="gClearTagLightRayEffectVtx" Count="4" Offset="0x5C38">
-            <Vtx/>
-        </Array>
-
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Gakufu.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Gakufu.xml
deleted file mode 100644
index 92b2672d4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Gakufu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="ovl_En_Gakufu" BaseAddress="0x80AFC960" RangeStart="0x8D0" RangeEnd="0x950">
-        <Array Name="gGakufuButtonIndexVtx" Count="4" Offset="0x8D0">
-            <Vtx/>
-        </Array>
-        <DList Name="gGakufuButtonIndexDL" Offset="0x910"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Holl.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Holl.xml
deleted file mode 100644
index 2baa5737c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Holl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_En_Holl" BaseAddress="0x80899960" RangeStart="0x0BF0" RangeEnd="0x0C58">
-        <Array Name="gEnHollCentralPlaneVtx" Count="4" Offset="0x0BF0">
-            <Vtx/>
-        </Array>
-
-        <DList Name="gEnHollCentralPlaneDL" Offset="0x0C30"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Horse_Game_Check.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Horse_Game_Check.xml
deleted file mode 100644
index bcb8ea695..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Horse_Game_Check.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Root>
-    <File Name="ovl_En_Horse_Game_Check" BaseAddress="0x808F8AA0" RangeStart="0x1080" RangeEnd="0x10F4">
-        <Collision Name="ovl_En_Horse_Game_Check_Colheader_0010C8" Offset="0x10C8" />
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Kanban.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Kanban.xml
deleted file mode 100644
index 386cfc663..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Kanban.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_En_Kanban" BaseAddress="0x80954960" RangeStart="0x3440" RangeEnd="0x3500">
-        <Array Name="gEnKanban_D_80957DA0" Count="4" Offset="0x3440">
-            <Vtx/>
-        </Array>
-
-        <DList Name="gEnKanban_D_80957DE0" Offset="0x3480"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Mm2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Mm2.xml
deleted file mode 100644
index 979b8fc5a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Mm2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="ovl_En_Mm2" BaseAddress="0x809A2030" RangeStart="0x240" RangeEnd="0xAD0">
-        <Texture Name="sEnMm2EnvelopeTex" OutName="mm2_envelope" Format="i8" Width="32" Height="32" Offset="0x240"/>
-        <Texture Name="sEnMm2LetterTex" OutName="mm2_letter" Format="rgba16" Width="16" Height="16" Offset="0x640"/>
-        <Array Name="sEnMm21Vtx" Count="10" Offset="0x840">
-            <Vtx/>
-        </Array>
-        <Array Name="sEnMm22Vtx" Count="12" Offset="0x8E0">
-            <Vtx/>
-        </Array>
-        <DList Name="sEnMm2DL" Offset="0x9A8"/> <!-- Original name is "mm_myletter_model" -->
-    </File>
-</Root>
-
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Mm3.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Mm3.xml
deleted file mode 100644
index 207b5ec8f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Mm3.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Root>
-    <File Name="ovl_En_Mm3" BaseAddress="0x80A6F0A0" RangeStart="0x1448" RangeEnd="0x1450">
-        <DList Name="sEnMm3DL" Offset="0x1448"/>
-    </File>
-</Root>
-
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Sda.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Sda.xml
deleted file mode 100644
index 7e257ee20..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Sda.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_En_Sda" BaseAddress="0x809468D0" RangeStart="0x1458" RangeEnd="0x14E8">
-        <Array Name="ovl_En_Sda_Vtx_1458" Count="4" Offset="0x1458">
-            <Vtx/>
-        </Array>
-        <DList Name="ovl_En_Sda_DL_1498" Offset="0x1498"/>
-        <DList Name="ovl_En_Sda_DL_14B8" Offset="0x14B8"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Sth.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Sth.xml
deleted file mode 100644
index a0d90d9e8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Sth.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <File Name="ovl_En_Sth" BaseAddress="0x80B66D30" RangeStart="0x1890" RangeEnd="0x646C">
-        <DList Name="gEnSthHeadDL" Offset="0x34A0"/>
-        <DList Name="gEnSthExtraHairDL" Offset="0x37C0"/>
-
-        <Animation Name="gEnSthSignalAnim" Offset="0x3F50" /> <!-- Original name is "sth_ko_matsu" ("matsu" = "to wait​") -->
-        <Animation Name="gEnSthBendDownAnim" Offset="0x45B4" /> <!-- Original name is "sth_kibunwaru" ("bad mood") -->
-        <Animation Name="gEnSthTalkWithHandUpAnim" Offset="0x4CC0" /> <!-- Original name is "sth_talk2000" -->
-        <Animation Name="gEnSthWaitAnim" Offset="0x533C" /> <!-- Original name is "sth_wait2000" -->
-        <Animation Name="gEnSthLookUpAnim" Offset="0x59B8" /> <!-- Original name is "sth_miageru" ("look up") -->
-        <Animation Name="gEnSthLookAroundAnim" Offset="0x5E40" /> <!-- Original name is "sth_kyorokyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="gEnSthPleadAnim" Offset="0x6354" /> <!-- Original name is "sth_onegai" ("request; favor (to ask); wish") -->
-        <Animation Name="gEnSthPanicAnim" Offset="0x645C" /> <!-- Original name is "sth_tasukete" ("help!​") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Sth2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Sth2.xml
deleted file mode 100644
index cd458db36..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Sth2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="ovl_En_Sth2" BaseAddress="0x80BF74E0" RangeStart="0x460" RangeEnd="0x2B30">
-        <Texture Name="gEnSth2SkinBlotchTex" OutName="en_sth2_skin_blotch" Format="rgba16" Width="8" Height="8" Offset="0x460"/>
-        <Texture Name="gEnSth2HairWithSkinTex" OutName="en_sth2_hair_with_skin" Format="rgba16" Width="8" Height="16" Offset="0x4E0"/>
-        <Texture Name="gEnSth2EarTex" OutName="en_sth2_ear" Format="rgba16" Width="8" Height="8" Offset="0x5E0"/>
-        <Texture Name="gEnSth2NoseTex" OutName="en_sth2_nose" Format="rgba16" Width="8" Height="8" Offset="0x660"/>
-        <Texture Name="gEnSth2EyeTex" OutName="en_sth2_eye" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
-        <Texture Name="gEnSth2MouthTex" OutName="en_sth2_mouth" Format="rgba16" Width="32" Height="16" Offset="0xEE0"/>
-        <Texture Name="gEnSth2HairTex" OutName="en_sth2_hair" Format="rgba16" Width="8" Height="16" Offset="0x12E0"/>
-        <DList Name="gEnSth2HeadDL" Offset="0x2070"/>
-        <DList Name="gEnSth2HairDL" Offset="0x2390"/>
-        <Animation Name="gEnSth2WavingHandAnim" Offset="0x2B20"/> <!-- Original name is "sth_ko_matsu" ("matsu" = "to wait​") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Syateki_Okuta.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Syateki_Okuta.xml
deleted file mode 100644
index aa38c8533..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Syateki_Okuta.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <!-- Shooting Gallery Octorok assets -->
-    <File Name="ovl_En_Syateki_Okuta" BaseAddress="0x80A35FF0" RangeStart="0x1640" RangeEnd="0x1B98">
-        <!-- DisplayList that turns certain Octoroks blue -->
-        <DList Name="gShootingGalleryOctorokBlueMaterialDL" Offset="0x1640"/>
-
-        <!-- Textures and DisplayLists for the cross and circle indicators that appear when you shoot an Octorok -->
-        <Texture Name="gShootingGalleryOctorokCrossTex" OutName="shooting_gallery_octorok_cross" Format="ia16" Width="16" Height="16" Offset="0x1658"/>
-        <Texture Name="gShootingGalleryOctorokCircleTex" OutName="shooting_gallery_octorok_circle" Format="ia16" Width="16" Height="16" Offset="0x1858"/>
-        <DList Name="gShootingGalleryOctorokCrossDL" Offset="0x1A98"/> <!-- Original name is "okuta_peke_model" ("peke" = "x (mark); cross") -->
-        <DList Name="gShootingGalleryOctorokCircleDL" Offset="0x1B18"/> <!-- Original name is "okuta_maru_model" ("maru" = "circle") -->
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Tanron1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Tanron1.xml
deleted file mode 100644
index 17cf5faf5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Tanron1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="ovl_En_Tanron1" BaseAddress="0x80BB4E00" RangeStart="0x1028" RangeEnd="0x1918">
-        <Texture Name="ovl_En_Tanron1_DL_001428" OutName="tex_001428" Format="rgba16" Width="16" Height="32" Offset="0x1428"/>
-        <DList Name="ovl_En_Tanron1_DL_001888" Offset="0x1888"/>
-        <DList Name="ovl_En_Tanron1_DL_001900" Offset="0x1900"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Tru.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Tru.xml
deleted file mode 100644
index e242db4c3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_En_Tru.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Root>
-    <File Name="ovl_En_Tru" BaseAddress="0x80A85620" RangeStart="0x33B0" RangeEnd="0x5C30">
-        <Texture Name="D_80A889D0" OutName="en_tru_33B0" Format="i4" Width="32" Height="64" Offset="0x33B0"/>
-        <Texture Name="D_80A88DD0" OutName="en_tru_37B0" Format="i4" Width="32" Height="32" Offset="0x37B0"/>
-        <Array Name="D_80A88FD0" Count="3" Offset="0x39B0">
-            <Vtx/>
-        </Array>
-        <DList Name="D_80A89000" Offset="0x39E0"/>
-        <DList Name="D_80A890A8" Offset="0x3A88"/>
-
-        <Texture Name="D_80A890C8" OutName="en_tru_3AA8" Format="i8" Width="64" Height="64" Offset="0x3AA8"/>
-        <Array Name="D_80A8A0C8" Count="4" Offset="0x4AA8">
-            <Vtx/>
-        </Array>
-        <DList Name="D_80A8A108" Offset="0x4AE8"/>
-
-        <Texture Name="D_80A8A188" OutName="en_tru_4B68" Format="i8" Width="64" Height="64" Offset="0x4B68"/>
-        <Array Name="D_80A8B188" Count="4" Offset="0x5B68">
-            <Vtx/>
-        </Array>
-        <DList Name="D_80A8B1C8" Offset="0x5BA8"/>
-        <DList Name="D_80A8B238" Offset="0x5C18"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Entotu.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Entotu.xml
deleted file mode 100644
index e6e6c64cf..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Entotu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="ovl_Obj_Entotu" BaseAddress="0x80A34700" RangeStart="0x0D10" RangeEnd="0x0D80">
-        <Array Name="ovl_Obj_Entotu_Vtx_000D10" Count="7" Offset="0xD10">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Grass.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Grass.xml
deleted file mode 100644
index 5c8d55e4a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Grass.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="assets/objects/gameplay_field_keep/"/>
-    <File Name="ovl_Obj_Grass" BaseAddress="0x809A9110" RangeStart="0x18E0" RangeEnd="0x19F0">
-        <DList Name="gObjGrass_D_809AA9F0" Offset="0x18E0"/>
-        <DList Name="gObjGrass_D_809AAA68" Offset="0x1958"/>
-        <DList Name="gObjGrass_D_809AAAE0" Offset="0x19D0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Jgame_Light.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Jgame_Light.xml
deleted file mode 100644
index d1f182271..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Jgame_Light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="ovl_Obj_Jgame_Light" BaseAddress="0x80C152F0" RangeStart="0x8FC" RangeEnd="0xE40">
-        <!-- @bug: Based on the DList, this should be an invalid i16 -->
-        <Texture Name="sObjJgameLightIncorrectTex" OutName="obj_jgamelight_incorrect" Format="ia16" Width="16" Height="16" Offset="0x8FC"/>
-        <!-- @bug: Based on the DList, this should be an invalid i16 -->
-        <Texture Name="sObjJgameLightCorrectTex" OutName="obj_jgamelight_correct" Format="ia16" Width="16" Height="16" Offset="0xAFC"/>
-
-        <DList Name="gObjJgameLightIncorrectDL" Offset="0xD40"/>
-        <DList Name="gObjJgameLightCorrectDL" Offset="0xDC0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Smork.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Smork.xml
deleted file mode 100644
index 745c6b6af..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Smork.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="ovl_Obj_Smork" BaseAddress="0x80A3D680" RangeStart="0x0C10" RangeEnd="0x0C80">
-        <Array Name="ovl_Obj_Smork_Vtx_000C10" Count="7" Offset="0xC10">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Toudai.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Toudai.xml
deleted file mode 100644
index 989c47a72..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Obj_Toudai.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="ovl_Obj_Toudai" BaseAddress="0x80A33B00" RangeStart="0xA90" RangeEnd="0xB70">
-        <Array Name="ovl_Obj_Toudai_Vtx_D_80A34590" Count="14" Offset="0xA90">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Spot.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Spot.xml
deleted file mode 100644
index f4e9beea7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Spot.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Spot" BaseAddress="0x80972680" RangeStart="0x720" RangeEnd="0xDF8">
-        <Texture Name="sSunSongEffectTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x720"/>
-        <DList Name="sSunSongEffectCylinderMaterialDL" Offset="0xCD0"/>
-        <DList Name="sSunSongEffectCylinderModelDL" Offset="0xD68"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Storm.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Storm.xml
deleted file mode 100644
index 6b8dc0228..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Storm.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-    <File Name="ovl_Oceff_Storm" BaseAddress="0x80981760" RangeStart="0x830" RangeEnd="0x1BC0">
-        <Texture Name="sSongOfStormsEffectTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x830"/>
-        <DList Name="sSongOfStormsMaterialDL" Offset="0x1830"/>
-        <Array Name="sSongOfStormsCylinderVtx" Count="27" Offset="0x18D8">
-            <Vtx/>
-        </Array>
-        <DList Name="sSongOfStormsCylinderMaterialDL" Offset="0x1A88"/>
-        <DList Name="sSongOfStormsCylinderModelDL" Offset="0x1B30"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe.xml
deleted file mode 100644
index 883de8970..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe" BaseAddress="0x809764B0" RangeStart="0x4F0" RangeEnd="0xCB0">
-        <Texture Name="sSongOfTimeEffectTex" OutName="song_of_time_effect" Format="i8" Width="32" Height="32" Offset="0x4F0"/>
-        <Array Name="sSongOfTimeFrustumVtx" Count="40" Offset="0x8F0">
-            <Vtx/>
-        </Array>
-        <DList Name="sSongOfTimeFrustumMaterialDL" Offset="0xB70"/>
-        <DList Name="sSongOfTimeFrustumModelDL" Offset="0xBF8"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe2.xml
deleted file mode 100644
index c43ced3c0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe2" BaseAddress="0x80986270" RangeStart="0x420" RangeEnd="0x1688">
-        <Texture Name="sEponaSongEffect1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x420"/>
-        <Texture Name="sEponaSongEffect2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC20"/>
-        <Array Name="sEponaSongFrustumVtx" Count="22" Offset="0x1420">
-            <Vtx/>
-        </Array>
-        <DList Name="sEponaSongFrustumMaterialDL" Offset="0x1580"/>
-        <DList Name="sEponaSongFrustumModelDL" Offset="0x1628"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe3.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe3.xml
deleted file mode 100644
index d8be72985..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe3.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe3" BaseAddress="0x809879E0" RangeStart="0x430" RangeEnd="0x1678">
-        <Texture Name="sSariaSongEffectTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/>
-        <Array Name="sSariaSongFrustumVtx" Count="22" Offset="0x1430">
-            <Vtx/>
-        </Array>
-        <DList Name="sSariaSongFrustrumMaterialDL" Offset="0x1590"/>
-        <DList Name="sSariaSongFrustumModelDL" Offset="0x1618"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe4.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe4.xml
deleted file mode 100644
index 995ad18b1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe4.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-    <File Name="ovl_Oceff_Wipe4" BaseAddress="0x8099D780" RangeStart="0x430" RangeEnd="0xF18">
-        <Texture Name="sScarecrowSongEffectTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x430"/>
-        <Array Name="sScarecrowSongFrustumVtx" Count="22" Offset="0xC30">
-            <Vtx/>
-        </Array>
-        <DList Name="sScarecrowSongMaterialDL" Offset="0xD90"/>
-        <DList Name="sScarecrowSongUnusedMaterialDL" Offset="0xDF8"/>
-        <DList Name="sScarecrowSongModelDL" Offset="0xE60"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe5.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe5.xml
deleted file mode 100644
index 52f197428..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe5" BaseAddress="0x80BC7AD0" RangeStart="0x440" RangeEnd="0x1630">
-        <TextureAnimation Name="gOceff5TexAnim" Offset="0x448" />
-        <Array Name="gOceff5Vtx" Count="22" Offset="0x1450"> 
-            <Vtx/>
-        </Array>
-        <DList Name="gOceff5DL" Offset="0x15B0"/> 
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe6.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe6.xml
deleted file mode 100644
index e64c8cc71..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe6.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe6" BaseAddress="0x80BCA5A0" RangeStart="0x330" RangeEnd="0x5B8">
-        <TextureAnimation Name="ovl_Oceff_Wipe6_Matanimheader_000338" Offset="0x338" />
-        <Array Name="gOceff6Vtx" Count="22" Offset="0x340">
-            <Vtx/>
-        </Array>
-        <DList Name="gOceff6DL" Offset="0x4A0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe7.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe7.xml
deleted file mode 100644
index 4a49fedcb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_Oceff_Wipe7.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="ovl_Oceff_Wipe7" BaseAddress="0x80BCDCB0" RangeStart="0x330" RangeEnd="0xDB8">
-        <Texture Name="sSongofHealingEffectTex" OutName="song_of_healing_effect" Format="i8" Width="32" Height="64" Offset="0x330"/>
-        <TextureAnimation Name="sSongofHealingEffectTexAnim" Offset="0xB38" />
-        <Array Name="sSongofHealingEffectFrustrumVtx" Count="22" Offset="0xB40">
-            <Vtx/>
-        </Array>
-        <DList Name="sSongOfHealingEffectFrustumDL" Offset="0xCA0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_fbdemo_triforce.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_fbdemo_triforce.xml
deleted file mode 100644
index ed23e36c3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_fbdemo_triforce.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="ovl_fbdemo_triforce" BaseAddress="0x80AC5070" RangeStart="0x5C0" RangeEnd="0x690">
-        <DList Name="sTransTriforceDL" Offset="0x5C0"/>
-        <Array Name="sTransTriforceVtx" Count="10" Offset="0x5F0">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_fbdemo_wipe1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_fbdemo_wipe1.xml
deleted file mode 100644
index 281c8ebfb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_fbdemo_wipe1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <File Name="ovl_fbdemo_wipe1" BaseAddress="0x80AC57B0" RangeStart="0x470" RangeEnd="0xEF8">
-        <Array Name="sTransWipe1Vtx" Count="25" Offset="0x470">
-            <Vtx/>
-        </Array>
-        <Texture Name="sTransWipe1Tex" OutName="trans_wipe" Format="i4" Width="64" Height="64" Offset="0x600"/>
-        <DList Name="sTransWipe1DL" Offset="0xE00"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_fbdemo_wipe3.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_fbdemo_wipe3.xml
deleted file mode 100644
index fe4804689..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_fbdemo_wipe3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="ovl_fbdemo_wipe3" BaseAddress="0x80AC6740" RangeStart="0x520" RangeEnd="0x1C10">
-        <Texture Name="fbdemo_tex_000520" OutName="tex_000520" Format="i8" Width="16" Height="64" Offset="0x520"/>
-        <Texture Name="fbdemo_tex_000920" OutName="tex_000920" Format="i8" Width="16" Height="64" Offset="0x920"/>
-        <Texture Name="fbdemo_tex_000D20" OutName="tex_000D20" Format="i8" Width="16" Height="64" Offset="0xD20"/>
-        <Texture Name="fbdemo_tex_001120" OutName="tex_001120" Format="i8" Width="16" Height="64" Offset="0x1120"/>
-        <Texture Name="fbdemo_tex_001520" OutName="tex_001520" Format="i8" Width="16" Height="64" Offset="0x1520"/>
-        <Array Name="sTransWipe3Vtx" Count="34" Offset="0x1920">
-            <Vtx/>
-        </Array>
-        <DList Name="sTransWipe3DL" Offset="0x1B40"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_file_choose.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_file_choose.xml
deleted file mode 100644
index cac6f3d9d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/overlays/ovl_file_choose.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Root>
-    <File Name="ovl_file_choose" BaseAddress="0x80804010" RangeStart="0xFDE0" RangeEnd="0x101E0">
-        <Array Name="D_80813DF0" Count="20" Offset="0xFDE0" Static="Off">
-            <Vtx/>
-        </Array>
-        <Array Name="D_80813F30" Count="32" Offset="0xFF20" Static="Off">
-            <Vtx/>
-        </Array>
-        <Array Name="gOptionsDividerTopVtx" Count="4" Offset="0x10120" Static="Off">
-            <Vtx/>
-        </Array>
-        <Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0x10160" Static="Off">
-            <Vtx/>
-        </Array>
-        <Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0x101A0" Static="Off">
-            <Vtx/>
-        </Array>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/KAKUSIANA/KAKUSIANA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/KAKUSIANA/KAKUSIANA.xml
deleted file mode 100644
index cc5a3c999..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/KAKUSIANA/KAKUSIANA.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<Root>
-    <File Name="KAKUSIANA" Segment="2" Game="MM">
-        <Scene Name="KAKUSIANA" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_00" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_01" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_02" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_02" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_03" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_03" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_04" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_04" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_05" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_05" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_06" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_06" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_07" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_07" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_08" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_08" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_09" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_09" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_10" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_10" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_11" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_11" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_12" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_12" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_13" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_13" Offset="0x0"/>
-    </File>
-    <File Name="KAKUSIANA_room_14" Segment="3" Game="MM">
-        <Room Name="KAKUSIANA_room_14" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/SPOT00/SPOT00.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/SPOT00/SPOT00.xml
deleted file mode 100644
index b060c7ba3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/SPOT00/SPOT00.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="SPOT00" Segment="2" Game="MM">
-        <Scene Name="SPOT00" Offset="0x0"/>
-    </File>
-    <File Name="SPOT00_room_00" Segment="3" Game="MM">
-        <Room Name="SPOT00_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
deleted file mode 100644
index 9c1a84c8c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
-    <File Name="Z2_00KEIKOKU" Segment="2" Game="MM">
-        <Scene Name="Z2_00KEIKOKU" Offset="0x0"/>
-        <Cutscene Name="gTerminaFieldClockTowerOpeningCs" Offset="0x9D8"/> <!-- Original name is "clock_t_change" -->
-        <Cutscene Name="gTerminaFieldTelescopeDay1And2Cs" Offset="0x11F8"/> <!-- Original name is "findoutstk" -->
-        <Cutscene Name="gTerminaFieldMoonCrashCs" Offset="0x1A48"/> <!-- Original name is "moon_atack" -->
-        <Cutscene Name="gTerminaFieldTelescopeDay3Cs" Offset="0x2A88"/> <!-- Original name is "findoutstk_3rd" -->
-        <Cutscene Name="gTerminaFieldTelescopeFinalHoursCs" Offset="0x32A8"/> <!-- Original name is "findoutstk_mad" -->
-        <Cutscene Name="gTerminaFieldSkullKidDrawingStartCs" Offset="0x3A68"/> <!-- Original name is "find_rakugaki" ("rakugaki" = "graffiti") -->
-        <Cutscene Name="gTerminaFieldSkullKidDrawingEndCs" Offset="0x4208"/> <!-- Original name is "rakugaki_end" -->
-        <Cutscene Name="gTerminaFieldIntroFromWestClockTownCs" Offset="0x4568"/> <!-- Original name is "sc1st01_001valley0" -->
-        <Cutscene Name="gTerminaFieldIntroFromNorthClockTownCs" Offset="0x4858"/> <!-- Original name is "sc1st01_001valley1" -->
-        <Cutscene Name="gTerminaFieldIntroFromEastClockTownCs" Offset="0x4A68"/> <!-- Original name is "sc1st01_001valley2" -->
-        <Cutscene Name="gTerminaFieldIntroFromSouthClockTownCs" Offset="0x4C78"/> <!-- Original name is "sc1st01_001valley3" -->
-        <Cutscene Name="gTerminaFieldGiantsGatherToStopMoonCs" Offset="0xDE2C"/> <!-- Original name is "k_s_start" ("k" is probably short for "kyojin", meaning "giant") -->
-        <Cutscene Name="gTerminaFieldGiantsStopMoonFailureCs" Offset="0xFA3C"/> <!-- Original name is "k_s_sippai" ("failure") -->
-        <Cutscene Name="gTerminaFieldGiantsStopMoonSuccessCs" Offset="0x1040C"/> <!-- Original name is "k_s_seikou" ("success") -->
-        <Cutscene Name="gTerminaFieldFirstCycleClockTowerOpeningCs" Offset="0x11414"/> <!-- Original name is "clock_t_change"; exact duplicate of gTerminaFieldClockTowerOpeningCs -->
-        <Cutscene Name="gTerminaFieldSkullKidFlashbackRainCs" Offset="0x11E80"/> <!-- Original name is "memory" -->
-        <Cutscene Name="gTerminaFieldSkullKidFlashbackDrawingWithFairiesCs" Offset="0x133B0"/> <!-- Original name is "rakugaki" -->
-        <Cutscene Name="gTerminaFieldSkullKidFlashbackPlayingWithFairiesCs" Offset="0x137E0"/> <!-- Original name is "asobu" ("to play; to enjoy oneself; to have a good time") -->
-        <Cutscene Name="gTerminaFieldCremiaHugCs" Offset="0x1421C"/> <!-- Original name is "climia_dakisime" ("dakisime" = "to hug someone close") -->
-        <Cutscene Name="gTerminaFieldGiantsDepartCs" Offset="0x1507C"/> <!-- Original name is "aftermoonclash" -->
-        <Cutscene Name="gTerminaFieldHappyMaskSalesmanAndLinkDepartCs" Offset="0x174EC"/> <!-- Original name is "bye_omenya" ("omenya" = "mask salesman") -->
-        <Cutscene Name="gTerminaFieldMoonsDestructionCs" Offset="0x1A1FC"/> <!-- Original name is "moonclash" -->
-        <Cutscene Name="gTerminaFieldCreditsWeddingCs" Offset="0x1B114"/> <!-- Original name is "sc_meoto" ("meoto" = "married couple; husband and wife; man and wife​") -->
-        <Cutscene Name="gTerminaFieldCreditsPostmanCs" Offset="0x1BC94"/> <!-- Original name is "sc_posthut" -->
-    </File>
-    <File Name="Z2_00KEIKOKU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_00KEIKOKU_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
deleted file mode 100644
index 9676cbc39..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_10YUKIYAMANOMURA" Segment="2" Game="MM">
-        <Scene Name="Z2_10YUKIYAMANOMURA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_10YUKIYAMANOMURA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_10YUKIYAMANOMURA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
deleted file mode 100644
index 943e58e58..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_10YUKIYAMANOMURA2" Segment="2" Game="MM">
-        <Scene Name="Z2_10YUKIYAMANOMURA2" Offset="0x0"/>
-    </File>
-    <File Name="Z2_10YUKIYAMANOMURA2_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_10YUKIYAMANOMURA2_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_10YUKIYAMANOMURA2_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_10YUKIYAMANOMURA2_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
deleted file mode 100644
index 986823c90..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_11GORONNOSATO" Segment="2" Game="MM">
-        <Scene Name="Z2_11GORONNOSATO" Offset="0x0"/>
-    </File>
-    <File Name="Z2_11GORONNOSATO_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_11GORONNOSATO_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_11GORONNOSATO_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_11GORONNOSATO_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
deleted file mode 100644
index 9e6925131..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_11GORONNOSATO2" Segment="2" Game="MM">
-        <Scene Name="Z2_11GORONNOSATO2" Offset="0x0"/>
-    </File>
-    <File Name="Z2_11GORONNOSATO2_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_11GORONNOSATO2_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_11GORONNOSATO2_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_11GORONNOSATO2_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
deleted file mode 100644
index 740f6a15a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_12HAKUGINMAE" Segment="2" Game="MM">
-        <Scene Name="Z2_12HAKUGINMAE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_12HAKUGINMAE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_12HAKUGINMAE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml
deleted file mode 100644
index 5a6ad2c19..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_13HUBUKINOMITI/Z2_13HUBUKINOMITI.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_13HUBUKINOMITI" Segment="2" Game="MM">
-        <Scene Name="Z2_13HUBUKINOMITI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_13HUBUKINOMITI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_13HUBUKINOMITI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
deleted file mode 100644
index 6c368004f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_14YUKIDAMANOMITI" Segment="2" Game="MM">
-        <Scene Name="Z2_14YUKIDAMANOMITI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_14YUKIDAMANOMITI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_14YUKIDAMANOMITI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml
deleted file mode 100644
index e3637907c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_16GORON_HOUSE/Z2_16GORON_HOUSE.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_16GORON_HOUSE" Segment="2" Game="MM">
-        <Scene Name="Z2_16GORON_HOUSE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_16GORON_HOUSE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_16GORON_HOUSE_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_16GORON_HOUSE_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_16GORON_HOUSE_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
deleted file mode 100644
index ed6beb36e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_17SETUGEN" Segment="2" Game="MM">
-        <Scene Name="Z2_17SETUGEN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_17SETUGEN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_17SETUGEN_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
deleted file mode 100644
index 1ac9488d7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
-    <File Name="Z2_17SETUGEN2" Segment="2" Game="MM">
-        <Scene Name="Z2_17SETUGEN2" Offset="0x0"/>
-    </File>
-    <File Name="Z2_17SETUGEN2_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_17SETUGEN2_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
deleted file mode 100644
index d144c9e8e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
-    <File Name="Z2_20SICHITAI" Segment="2" Game="MM">
-        <Scene Name="Z2_20SICHITAI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI_room_02" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
deleted file mode 100644
index 144914621..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
-    <File Name="Z2_20SICHITAI2" Segment="2" Game="MM">
-        <Scene Name="Z2_20SICHITAI2" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI2_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI2_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI2_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI2_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_20SICHITAI2_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_20SICHITAI2_room_02" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml
deleted file mode 100644
index 03b04f989..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_21MITURINMAE/Z2_21MITURINMAE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_21MITURINMAE" Segment="2" Game="MM">
-        <Scene Name="Z2_21MITURINMAE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_21MITURINMAE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_21MITURINMAE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
deleted file mode 100644
index 77f382ecc..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
-    <File Name="Z2_22DEKUCITY" Segment="2" Game="MM">
-        <Scene Name="Z2_22DEKUCITY" Offset="0x0"/>
-    </File>
-    <File Name="Z2_22DEKUCITY_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_22DEKUCITY_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_22DEKUCITY_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_22DEKUCITY_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_22DEKUCITY_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_22DEKUCITY_room_02" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
deleted file mode 100644
index f6c852dc9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
-    <File Name="Z2_24KEMONOMITI" Segment="2" Game="MM">
-        <Scene Name="Z2_24KEMONOMITI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_24KEMONOMITI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_24KEMONOMITI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
deleted file mode 100644
index 83e362742..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
-    <File Name="Z2_26SARUNOMORI" Segment="2" Game="MM">
-        <Scene Name="Z2_26SARUNOMORI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_26SARUNOMORI_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_26SARUNOMORI_room_08" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_30GYOSON/Z2_30GYOSON.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
deleted file mode 100644
index f24a37254..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
-    <File Name="Z2_30GYOSON" Segment="2" Game="MM">
-        <Scene Name="Z2_30GYOSON" Offset="0x0"/>
-    </File>
-    <File Name="Z2_30GYOSON_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_30GYOSON_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_31MISAKI/Z2_31MISAKI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
deleted file mode 100644
index afd35a817..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
-    <File Name="Z2_31MISAKI" Segment="2" Game="MM">
-        <Scene Name="Z2_31MISAKI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_31MISAKI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_31MISAKI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_33ZORACITY/Z2_33ZORACITY.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_33ZORACITY/Z2_33ZORACITY.xml
deleted file mode 100644
index 693a30a58..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_33ZORACITY/Z2_33ZORACITY.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_33ZORACITY" Segment="2" Game="MM">
-        <Scene Name="Z2_33ZORACITY" Offset="0x0"/>
-    </File>
-    <File Name="Z2_33ZORACITY_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_33ZORACITY_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_35TAKI/Z2_35TAKI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_35TAKI/Z2_35TAKI.xml
deleted file mode 100644
index b123f1b9c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_35TAKI/Z2_35TAKI.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_35TAKI" Segment="2" Game="MM">
-        <Scene Name="Z2_35TAKI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_35TAKI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_35TAKI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_8ITEMSHOP/Z2_8ITEMSHOP.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_8ITEMSHOP/Z2_8ITEMSHOP.xml
deleted file mode 100644
index b3775346a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_8ITEMSHOP/Z2_8ITEMSHOP.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_8ITEMSHOP" Segment="2" Game="MM">
-        <Scene Name="Z2_8ITEMSHOP" Offset="0x0"/>
-    </File>
-    <File Name="Z2_8ITEMSHOP_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_8ITEMSHOP_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_ALLEY/Z2_ALLEY.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_ALLEY/Z2_ALLEY.xml
deleted file mode 100644
index d410d2098..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_ALLEY/Z2_ALLEY.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_ALLEY" Segment="2" Game="MM">
-        <Scene Name="Z2_ALLEY" Offset="0x0"/>
-    </File>
-    <File Name="Z2_ALLEY_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_ALLEY_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
deleted file mode 100644
index 3b03e8e5e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="misc/scene_texture_02/"/>
-    <File Name="Z2_AYASHIISHOP" Segment="2" Game="MM">
-        <Scene Name="Z2_AYASHIISHOP" Offset="0x0"/>
-    </File>
-    <File Name="Z2_AYASHIISHOP_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_AYASHIISHOP_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_AYASHIISHOP_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_AYASHIISHOP_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BACKTOWN/Z2_BACKTOWN.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BACKTOWN/Z2_BACKTOWN.xml
deleted file mode 100644
index 6289ccf82..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BACKTOWN/Z2_BACKTOWN.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_BACKTOWN" Segment="2" Game="MM">
-        <Scene Name="Z2_BACKTOWN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BACKTOWN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_BACKTOWN_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BANDROOM/Z2_BANDROOM.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BANDROOM/Z2_BANDROOM.xml
deleted file mode 100644
index 2277236aa..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BANDROOM/Z2_BANDROOM.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<Root>
-    <File Name="Z2_BANDROOM" Segment="2" Game="MM">
-        <Scene Name="Z2_BANDROOM" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BANDROOM_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_BANDROOM_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BANDROOM_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_BANDROOM_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BANDROOM_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_BANDROOM_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BANDROOM_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_BANDROOM_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BANDROOM_room_04" Segment="3" Game="MM">
-        <Texture Name="Z2_BANDROOM_room_04Tex_005A38" Format="rgba16" Width="64" Height="64" Offset="0x5A38"/>
-
-        <Room Name="Z2_BANDROOM_room_04" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BOMYA/Z2_BOMYA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BOMYA/Z2_BOMYA.xml
deleted file mode 100644
index 4fd948a88..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BOMYA/Z2_BOMYA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_BOMYA" Segment="2" Game="MM">
-        <Scene Name="Z2_BOMYA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BOMYA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_BOMYA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BOTI/Z2_BOTI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BOTI/Z2_BOTI.xml
deleted file mode 100644
index 830df7f79..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BOTI/Z2_BOTI.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_BOTI" Segment="2" Game="MM">
-        <Scene Name="Z2_BOTI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BOTI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_BOTI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BOTI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_BOTI_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BOWLING/Z2_BOWLING.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BOWLING/Z2_BOWLING.xml
deleted file mode 100644
index 794d73271..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_BOWLING/Z2_BOWLING.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_BOWLING" Segment="2" Game="MM">
-        <Scene Name="Z2_BOWLING" Offset="0x0"/>
-    </File>
-    <File Name="Z2_BOWLING_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_BOWLING_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_CASTLE/Z2_CASTLE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_CASTLE/Z2_CASTLE.xml
deleted file mode 100644
index 3af97020c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_CASTLE/Z2_CASTLE.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-    <File Name="Z2_CASTLE" Segment="2" Game="MM">
-        <Scene Name="Z2_CASTLE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_00" Segment="3" Game="MM">
-        <Texture Name="Z2_CASTLE_room_00Tex_00FFB8" Format="rgba16" Width="64" Height="64" Offset="0xFFB8"/>
-        <Texture Name="Z2_CASTLE_room_00Tex_0127B8" Format="rgba16" Width="32" Height="128" Offset="0x127B8"/>
-
-        <Room Name="Z2_CASTLE_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_04" Segment="3" Game="MM">
-        <Texture Name="Z2_CASTLE_room_04Tex_004AC0" Format="rgba16" Width="64" Height="64" Offset="0x4AC0"/>
-
-        <Room Name="Z2_CASTLE_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CASTLE_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_CASTLE_room_09" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_CLOCKTOWER/Z2_CLOCKTOWER.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_CLOCKTOWER/Z2_CLOCKTOWER.xml
deleted file mode 100644
index b6a593a0c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_CLOCKTOWER/Z2_CLOCKTOWER.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_CLOCKTOWER" Segment="2" Game="MM">
-        <Scene Name="Z2_CLOCKTOWER" Offset="0x0"/>
-    </File>
-    <File Name="Z2_CLOCKTOWER_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_CLOCKTOWER_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DANPEI/Z2_DANPEI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DANPEI/Z2_DANPEI.xml
deleted file mode 100644
index 444e3782f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DANPEI/Z2_DANPEI.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Root>
-    <File Name="Z2_DANPEI" Segment="2" Game="MM">
-        <Scene Name="Z2_DANPEI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI_room_08" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DANPEI2TEST/Z2_DANPEI2TEST.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DANPEI2TEST/Z2_DANPEI2TEST.xml
deleted file mode 100644
index 3906b57f3..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DANPEI2TEST/Z2_DANPEI2TEST.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_DANPEI2TEST" Segment="2" Game="MM">
-        <Scene Name="Z2_DANPEI2TEST" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI2TEST_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI2TEST_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DANPEI2TEST_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_DANPEI2TEST_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DEKUTES/Z2_DEKUTES.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DEKUTES/Z2_DEKUTES.xml
deleted file mode 100644
index 070d35cdb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DEKUTES/Z2_DEKUTES.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_DEKUTES" Segment="2" Game="MM">
-        <Scene Name="Z2_DEKUTES" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DEKUTES_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_DEKUTES_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DEKU_KING/Z2_DEKU_KING.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DEKU_KING/Z2_DEKU_KING.xml
deleted file mode 100644
index b283b92c0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DEKU_KING/Z2_DEKU_KING.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_DEKU_KING" Segment="2" Game="MM">
-        <Scene Name="Z2_DEKU_KING" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DEKU_KING_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_DEKU_KING_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DOUJOU/Z2_DOUJOU.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
deleted file mode 100644
index a6b7a1a6a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
-    <File Name="Z2_DOUJOU" Segment="2" Game="MM">
-        <Scene Name="Z2_DOUJOU" Offset="0x0"/>
-    </File>
-    <File Name="Z2_DOUJOU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_DOUJOU_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F01/Z2_F01.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F01/Z2_F01.xml
deleted file mode 100644
index cde89cdda..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F01/Z2_F01.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_F01" Segment="2" Game="MM">
-        <Scene Name="Z2_F01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_F01_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_F01_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F01C/Z2_F01C.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F01C/Z2_F01C.xml
deleted file mode 100644
index ac179c6d2..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F01C/Z2_F01C.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_F01C" Segment="2" Game="MM">
-        <Scene Name="Z2_F01C" Offset="0x0"/>
-    </File>
-    <File Name="Z2_F01C_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_F01C_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F01_B/Z2_F01_B.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F01_B/Z2_F01_B.xml
deleted file mode 100644
index 96c605641..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F01_B/Z2_F01_B.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_F01_B" Segment="2" Game="MM">
-        <Scene Name="Z2_F01_B" Offset="0x0"/>
-    </File>
-    <File Name="Z2_F01_B_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_F01_B_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F40/Z2_F40.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F40/Z2_F40.xml
deleted file mode 100644
index d233785f4..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F40/Z2_F40.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_F40" Segment="2" Game="MM">
-        <Scene Name="Z2_F40" Offset="0x0"/>
-    </File>
-    <File Name="Z2_F40_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_F40_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F41/Z2_F41.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F41/Z2_F41.xml
deleted file mode 100644
index d34ed75c7..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_F41/Z2_F41.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_F41" Segment="2" Game="MM">
-        <Scene Name="Z2_F41" Offset="0x0"/>
-    </File>
-    <File Name="Z2_F41_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_F41_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_FISHERMAN/Z2_FISHERMAN.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_FISHERMAN/Z2_FISHERMAN.xml
deleted file mode 100644
index 3fdd11f3f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_FISHERMAN/Z2_FISHERMAN.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_FISHERMAN" Segment="2" Game="MM">
-        <Scene Name="Z2_FISHERMAN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_FISHERMAN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_FISHERMAN_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_GORONRACE/Z2_GORONRACE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_GORONRACE/Z2_GORONRACE.xml
deleted file mode 100644
index f2e92ddb1..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_GORONRACE/Z2_GORONRACE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_GORONRACE" Segment="2" Game="MM">
-        <Scene Name="Z2_GORONRACE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_GORONRACE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_GORONRACE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_GORONSHOP/Z2_GORONSHOP.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_GORONSHOP/Z2_GORONSHOP.xml
deleted file mode 100644
index a7671c9bd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_GORONSHOP/Z2_GORONSHOP.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_GORONSHOP" Segment="2" Game="MM">
-        <Texture Name="Z2_GORONSHOPTex_004630" Format="i8" Width="128" Height="64" Offset="0x4630"/>
-        <Texture Name="Z2_GORONSHOPTex_009230" Format="rgba16" Width="64" Height="64" Offset="0x9230"/>
-
-        <Scene Name="Z2_GORONSHOP" Offset="0x0"/>
-    </File>
-    <File Name="Z2_GORONSHOP_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_GORONSHOP_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_GORON_HAKA/Z2_GORON_HAKA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_GORON_HAKA/Z2_GORON_HAKA.xml
deleted file mode 100644
index 8b7dceaab..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_GORON_HAKA/Z2_GORON_HAKA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_GORON_HAKA" Segment="2" Game="MM">
-        <Scene Name="Z2_GORON_HAKA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_GORON_HAKA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_GORON_HAKA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_HAKASHITA/Z2_HAKASHITA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_HAKASHITA/Z2_HAKASHITA.xml
deleted file mode 100644
index 24763ee09..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_HAKASHITA/Z2_HAKASHITA.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <File Name="Z2_HAKASHITA" Segment="2" Game="MM">
-        <Scene Name="Z2_HAKASHITA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKASHITA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_HAKASHITA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKASHITA_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_HAKASHITA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKASHITA_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_HAKASHITA_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKASHITA_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_HAKASHITA_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKASHITA_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_HAKASHITA_room_04" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_HAKUGIN/Z2_HAKUGIN.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_HAKUGIN/Z2_HAKUGIN.xml
deleted file mode 100644
index 9f3f39a8a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_HAKUGIN/Z2_HAKUGIN.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<Root>
-    <File Name="Z2_HAKUGIN" Segment="2" Game="MM">
-        <Scene Name="Z2_HAKUGIN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_11" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_12" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_12" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_room_13" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_room_13" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_HAKUGIN_BS/Z2_HAKUGIN_BS.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_HAKUGIN_BS/Z2_HAKUGIN_BS.xml
deleted file mode 100644
index ca1c2dd11..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_HAKUGIN_BS/Z2_HAKUGIN_BS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_HAKUGIN_BS" Segment="2" Game="MM">
-        <Scene Name="Z2_HAKUGIN_BS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_HAKUGIN_BS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_HAKUGIN_BS_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_ICHIBA/Z2_ICHIBA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_ICHIBA/Z2_ICHIBA.xml
deleted file mode 100644
index 145b7b62d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_ICHIBA/Z2_ICHIBA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_ICHIBA" Segment="2" Game="MM">
-        <Scene Name="Z2_ICHIBA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_ICHIBA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_ICHIBA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_IKANA/Z2_IKANA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_IKANA/Z2_IKANA.xml
deleted file mode 100644
index 9d646a360..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_IKANA/Z2_IKANA.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<Root>
-    <File Name="Z2_IKANA" Segment="2" Game="MM">
-        <Scene Name="Z2_IKANA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANA_room_00" Segment="3" Game="MM">
-        <Texture Name="Z2_IKANA_room_00Tex_020A40" Format="rgba16" Width="64" Height="64" Offset="0x20A40"/>
-
-        <Room Name="Z2_IKANA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANA_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_IKANA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANA_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_IKANA_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANA_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_IKANA_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANA_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_IKANA_room_04" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_IKANAMAE/Z2_IKANAMAE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_IKANAMAE/Z2_IKANAMAE.xml
deleted file mode 100644
index 3a738c04a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_IKANAMAE/Z2_IKANAMAE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_IKANAMAE" Segment="2" Game="MM">
-        <Scene Name="Z2_IKANAMAE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKANAMAE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_IKANAMAE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_IKNINSIDE/Z2_IKNINSIDE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_IKNINSIDE/Z2_IKNINSIDE.xml
deleted file mode 100644
index 540e552a9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_IKNINSIDE/Z2_IKNINSIDE.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_IKNINSIDE" Segment="2" Game="MM">
-        <Scene Name="Z2_IKNINSIDE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKNINSIDE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_IKNINSIDE_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_IKNINSIDE_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_IKNINSIDE_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INISIE_BS/Z2_INISIE_BS.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INISIE_BS/Z2_INISIE_BS.xml
deleted file mode 100644
index 933ce678e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INISIE_BS/Z2_INISIE_BS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_INISIE_BS" Segment="2" Game="MM">
-        <Scene Name="Z2_INISIE_BS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_BS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_BS_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INISIE_N/Z2_INISIE_N.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INISIE_N/Z2_INISIE_N.xml
deleted file mode 100644
index 2954a41fe..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INISIE_N/Z2_INISIE_N.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-    <File Name="Z2_INISIE_N" Segment="2" Game="MM">
-        <Scene Name="Z2_INISIE_N" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_N_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_N_room_11" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INISIE_R/Z2_INISIE_R.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INISIE_R/Z2_INISIE_R.xml
deleted file mode 100644
index 7ca232478..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INISIE_R/Z2_INISIE_R.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-    <File Name="Z2_INISIE_R" Segment="2" Game="MM">
-        <Scene Name="Z2_INISIE_R" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INISIE_R_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_INISIE_R_room_11" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INSIDETOWER/Z2_INSIDETOWER.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INSIDETOWER/Z2_INSIDETOWER.xml
deleted file mode 100644
index b35391b77..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_INSIDETOWER/Z2_INSIDETOWER.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_INSIDETOWER" Segment="2" Game="MM">
-        <Scene Name="Z2_INSIDETOWER" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INSIDETOWER_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_INSIDETOWER_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_INSIDETOWER_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_INSIDETOWER_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KAIZOKU/Z2_KAIZOKU.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KAIZOKU/Z2_KAIZOKU.xml
deleted file mode 100644
index ac8789051..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KAIZOKU/Z2_KAIZOKU.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_KAIZOKU" Segment="2" Game="MM">
-        <Scene Name="Z2_KAIZOKU" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KAIZOKU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KAIZOKU_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KAJIYA/Z2_KAJIYA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
deleted file mode 100644
index 158669f8f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="misc/scene_texture_02/"/>
-    <File Name="Z2_KAJIYA" Segment="2" Game="MM">
-        <Scene Name="Z2_KAJIYA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KAJIYA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KAJIYA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KINDAN2/Z2_KINDAN2.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KINDAN2/Z2_KINDAN2.xml
deleted file mode 100644
index 3283d92ad..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KINDAN2/Z2_KINDAN2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <File Name="Z2_KINDAN2" Segment="2" Game="MM">
-        <Scene Name="Z2_KINDAN2" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINDAN2_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_KINDAN2_room_05" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KINSTA1/Z2_KINSTA1.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KINSTA1/Z2_KINSTA1.xml
deleted file mode 100644
index 1ae2684c5..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KINSTA1/Z2_KINSTA1.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <File Name="Z2_KINSTA1" Segment="2" Game="MM">
-        <Scene Name="Z2_KINSTA1" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KINSTA1_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_KINSTA1_room_05" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KOEPONARACE/Z2_KOEPONARACE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KOEPONARACE/Z2_KOEPONARACE.xml
deleted file mode 100644
index b0edf047e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KOEPONARACE/Z2_KOEPONARACE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_KOEPONARACE" Segment="2" Game="MM">
-        <Scene Name="Z2_KOEPONARACE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KOEPONARACE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KOEPONARACE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KONPEKI_ENT/Z2_KONPEKI_ENT.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KONPEKI_ENT/Z2_KONPEKI_ENT.xml
deleted file mode 100644
index d306e587a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KONPEKI_ENT/Z2_KONPEKI_ENT.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Root>
-    <File Name="Z2_KONPEKI_ENT" Segment="2" Game="MM">
-        <Texture Name="Z2_KONPEKI_ENTTex_005020" Format="rgba16" Width="64" Height="64" Offset="0x5020"/>
-
-        <Scene Name="Z2_KONPEKI_ENT" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KONPEKI_ENT_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KONPEKI_ENT_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KYOJINNOMA/Z2_KYOJINNOMA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KYOJINNOMA/Z2_KYOJINNOMA.xml
deleted file mode 100644
index 23450a3eb..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_KYOJINNOMA/Z2_KYOJINNOMA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_KYOJINNOMA" Segment="2" Game="MM">
-        <Scene Name="Z2_KYOJINNOMA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_KYOJINNOMA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_KYOJINNOMA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LABO/Z2_LABO.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LABO/Z2_LABO.xml
deleted file mode 100644
index 7aa23fc76..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LABO/Z2_LABO.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_LABO" Segment="2" Game="MM">
-        <Scene Name="Z2_LABO" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LABO_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LABO_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_BS/Z2_LAST_BS.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_BS/Z2_LAST_BS.xml
deleted file mode 100644
index fc488975d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_BS/Z2_LAST_BS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_LAST_BS" Segment="2" Game="MM">
-        <Scene Name="Z2_LAST_BS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_BS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_BS_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_DEKU/Z2_LAST_DEKU.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_DEKU/Z2_LAST_DEKU.xml
deleted file mode 100644
index 409e6829a..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_DEKU/Z2_LAST_DEKU.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_LAST_DEKU" Segment="2" Game="MM">
-        <Scene Name="Z2_LAST_DEKU" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_DEKU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_DEKU_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_DEKU_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_DEKU_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_GORON/Z2_LAST_GORON.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_GORON/Z2_LAST_GORON.xml
deleted file mode 100644
index 94f212234..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_GORON/Z2_LAST_GORON.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_LAST_GORON" Segment="2" Game="MM">
-        <Scene Name="Z2_LAST_GORON" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_GORON_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_GORON_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_GORON_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_GORON_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_LINK/Z2_LAST_LINK.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_LINK/Z2_LAST_LINK.xml
deleted file mode 100644
index 3ad2ba8f0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_LINK/Z2_LAST_LINK.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Root>
-    <File Name="Z2_LAST_LINK" Segment="2" Game="MM">
-        <Scene Name="Z2_LAST_LINK" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_LINK_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_LINK_room_07" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_ZORA/Z2_LAST_ZORA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_ZORA/Z2_LAST_ZORA.xml
deleted file mode 100644
index 5090c76a8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LAST_ZORA/Z2_LAST_ZORA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_LAST_ZORA" Segment="2" Game="MM">
-        <Scene Name="Z2_LAST_ZORA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LAST_ZORA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LAST_ZORA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LOST_WOODS/Z2_LOST_WOODS.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LOST_WOODS/Z2_LOST_WOODS.xml
deleted file mode 100644
index 0c41a1b29..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_LOST_WOODS/Z2_LOST_WOODS.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Root>
-    <File Name="Z2_LOST_WOODS" Segment="2" Game="MM">
-        <Texture Name="Z2_LOST_WOODSTex_00B9D0" Format="ia16" Width="64" Height="64" Offset="0xB9D0"/>
-
-        <Scene Name="Z2_LOST_WOODS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LOST_WOODS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_LOST_WOODS_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LOST_WOODS_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_LOST_WOODS_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_LOST_WOODS_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_LOST_WOODS_room_02" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MAP_SHOP/Z2_MAP_SHOP.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MAP_SHOP/Z2_MAP_SHOP.xml
deleted file mode 100644
index 237791f40..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MAP_SHOP/Z2_MAP_SHOP.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_MAP_SHOP" Segment="2" Game="MM">
-        <Scene Name="Z2_MAP_SHOP" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MAP_SHOP_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_MAP_SHOP_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MILK_BAR/Z2_MILK_BAR.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MILK_BAR/Z2_MILK_BAR.xml
deleted file mode 100644
index 1c8a42e62..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MILK_BAR/Z2_MILK_BAR.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_MILK_BAR" Segment="2" Game="MM">
-        <Scene Name="Z2_MILK_BAR" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MILK_BAR_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_MILK_BAR_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MITURIN/Z2_MITURIN.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MITURIN/Z2_MITURIN.xml
deleted file mode 100644
index d1a6af9cd..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MITURIN/Z2_MITURIN.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<Root>
-    <File Name="Z2_MITURIN" Segment="2" Game="MM">
-        <Scene Name="Z2_MITURIN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_11" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_room_12" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_room_12" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MITURIN_BS/Z2_MITURIN_BS.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MITURIN_BS/Z2_MITURIN_BS.xml
deleted file mode 100644
index 33402da41..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MITURIN_BS/Z2_MITURIN_BS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_MITURIN_BS" Segment="2" Game="MM">
-        <Scene Name="Z2_MITURIN_BS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MITURIN_BS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_MITURIN_BS_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MUSICHOUSE/Z2_MUSICHOUSE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MUSICHOUSE/Z2_MUSICHOUSE.xml
deleted file mode 100644
index 2e5dc83d0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_MUSICHOUSE/Z2_MUSICHOUSE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_MUSICHOUSE" Segment="2" Game="MM">
-        <Scene Name="Z2_MUSICHOUSE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_MUSICHOUSE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_MUSICHOUSE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_OKUJOU/Z2_OKUJOU.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_OKUJOU/Z2_OKUJOU.xml
deleted file mode 100644
index f3970315b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_OKUJOU/Z2_OKUJOU.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_OKUJOU" Segment="2" Game="MM">
-        <Scene Name="Z2_OKUJOU" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OKUJOU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_OKUJOU_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_OMOYA/Z2_OMOYA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_OMOYA/Z2_OMOYA.xml
deleted file mode 100644
index 5354762c8..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_OMOYA/Z2_OMOYA.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Root>
-    <File Name="Z2_OMOYA" Segment="2" Game="MM">
-        <Scene Name="Z2_OMOYA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OMOYA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_OMOYA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OMOYA_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_OMOYA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OMOYA_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_OMOYA_room_02" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_OPENINGDAN/Z2_OPENINGDAN.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_OPENINGDAN/Z2_OPENINGDAN.xml
deleted file mode 100644
index 901c1698c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_OPENINGDAN/Z2_OPENINGDAN.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_OPENINGDAN" Segment="2" Game="MM">
-        <Scene Name="Z2_OPENINGDAN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OPENINGDAN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_OPENINGDAN_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_OPENINGDAN_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_OPENINGDAN_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_PIRATE/Z2_PIRATE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_PIRATE/Z2_PIRATE.xml
deleted file mode 100644
index 1b459de39..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_PIRATE/Z2_PIRATE.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<Root>
-    <File Name="Z2_PIRATE" Segment="2" Game="MM">
-        <Scene Name="Z2_PIRATE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_11" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_12" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_12" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_13" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_13" Offset="0x0"/>
-    </File>
-    <File Name="Z2_PIRATE_room_14" Segment="3" Game="MM">
-        <Room Name="Z2_PIRATE_room_14" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_POSTHOUSE/Z2_POSTHOUSE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_POSTHOUSE/Z2_POSTHOUSE.xml
deleted file mode 100644
index a0b71568b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_POSTHOUSE/Z2_POSTHOUSE.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_POSTHOUSE" Segment="2" Game="MM">
-        <Scene Name="Z2_POSTHOUSE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_POSTHOUSE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_POSTHOUSE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_RANDOM/Z2_RANDOM.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_RANDOM/Z2_RANDOM.xml
deleted file mode 100644
index 0f4eafc22..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_RANDOM/Z2_RANDOM.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Root>
-    <File Name="Z2_RANDOM" Segment="2" Game="MM">
-        <Scene Name="Z2_RANDOM" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_RANDOM_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_RANDOM_room_05" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_REDEAD/Z2_REDEAD.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_REDEAD/Z2_REDEAD.xml
deleted file mode 100644
index a2d1b14ac..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_REDEAD/Z2_REDEAD.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<Root>
-    <File Name="Z2_REDEAD" Segment="2" Game="MM">
-        <Scene Name="Z2_REDEAD" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_11" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_12" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_12" Offset="0x0"/>
-    </File>
-    <File Name="Z2_REDEAD_room_13" Segment="3" Game="MM">
-        <Room Name="Z2_REDEAD_room_13" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
deleted file mode 100644
index 3ef612381..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
-    <File Name="Z2_ROMANYMAE" Segment="2" Game="MM">
-        <Scene Name="Z2_ROMANYMAE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_ROMANYMAE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_ROMANYMAE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SEA/Z2_SEA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SEA/Z2_SEA.xml
deleted file mode 100644
index ad6ec3617..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SEA/Z2_SEA.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Root>
-    <File Name="Z2_SEA" Segment="2" Game="MM">
-        <Scene Name="Z2_SEA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_04" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_05" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_05" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_06" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_06" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_07" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_07" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_08" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_08" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_09" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_09" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_10" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_10" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_11" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_11" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_12" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_12" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_13" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_13" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_14" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_14" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_room_15" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_room_15" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SEA_BS/Z2_SEA_BS.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SEA_BS/Z2_SEA_BS.xml
deleted file mode 100644
index e602e7a7b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SEA_BS/Z2_SEA_BS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_SEA_BS" Segment="2" Game="MM">
-        <Scene Name="Z2_SEA_BS" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SEA_BS_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SEA_BS_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SECOM/Z2_SECOM.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SECOM/Z2_SECOM.xml
deleted file mode 100644
index 39cdd9fce..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SECOM/Z2_SECOM.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Root>
-    <File Name="Z2_SECOM" Segment="2" Game="MM">
-        <Scene Name="Z2_SECOM" Offset="0x0"/>
-        <!-- This texture is used in an "AnimatedMaterial", and must be declared to use the proper symbol -->
-        <Texture Name="gSakonsHidoutConveyorBeltTex" OutName="sakons_hideout_conveyor_belt" Height="32" Width="32" Format="rgba16" Offset="0x47F0"/>
-    </File>
-    <File Name="Z2_SECOM_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SECOM_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SECOM_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_SECOM_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SINKAI/Z2_SINKAI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SINKAI/Z2_SINKAI.xml
deleted file mode 100644
index 6a3df8b2e..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SINKAI/Z2_SINKAI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
-    <File Name="Z2_SINKAI" Segment="2" Game="MM">
-        <Scene Name="Z2_SINKAI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SINKAI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SINKAI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
deleted file mode 100644
index 72f476631..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
-    <File Name="Z2_SONCHONOIE" Segment="2" Game="MM">
-        <Scene Name="Z2_SONCHONOIE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SONCHONOIE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SONCHONOIE_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SONCHONOIE_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_SONCHONOIE_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SONCHONOIE_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_SONCHONOIE_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SONCHONOIE_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_SONCHONOIE_room_03" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SOUGEN/Z2_SOUGEN.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SOUGEN/Z2_SOUGEN.xml
deleted file mode 100644
index 56ff81de0..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SOUGEN/Z2_SOUGEN.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_SOUGEN" Segment="2" Game="MM">
-        <Scene Name="Z2_SOUGEN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SOUGEN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SOUGEN_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SYATEKI_MIZU/Z2_SYATEKI_MIZU.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SYATEKI_MIZU/Z2_SYATEKI_MIZU.xml
deleted file mode 100644
index f4592c69b..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SYATEKI_MIZU/Z2_SYATEKI_MIZU.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_SYATEKI_MIZU" Segment="2" Game="MM">
-        <Scene Name="Z2_SYATEKI_MIZU" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SYATEKI_MIZU_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SYATEKI_MIZU_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SYATEKI_MORI/Z2_SYATEKI_MORI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SYATEKI_MORI/Z2_SYATEKI_MORI.xml
deleted file mode 100644
index 32a4c7ce9..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_SYATEKI_MORI/Z2_SYATEKI_MORI.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_SYATEKI_MORI" Segment="2" Game="MM">
-        <Scene Name="Z2_SYATEKI_MORI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_SYATEKI_MORI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_SYATEKI_MORI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TAKARAKUJI/Z2_TAKARAKUJI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TAKARAKUJI/Z2_TAKARAKUJI.xml
deleted file mode 100644
index d305a1e91..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TAKARAKUJI/Z2_TAKARAKUJI.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_TAKARAKUJI" Segment="2" Game="MM">
-        <Scene Name="Z2_TAKARAKUJI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TAKARAKUJI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TAKARAKUJI_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TAKARAYA/Z2_TAKARAYA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TAKARAYA/Z2_TAKARAYA.xml
deleted file mode 100644
index d2845c468..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TAKARAYA/Z2_TAKARAYA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_TAKARAYA" Segment="2" Game="MM">
-        <Scene Name="Z2_TAKARAYA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TAKARAYA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TAKARAYA_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TENMON_DAI/Z2_TENMON_DAI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TENMON_DAI/Z2_TENMON_DAI.xml
deleted file mode 100644
index f572992ed..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TENMON_DAI/Z2_TENMON_DAI.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Root>
-    <File Name="Z2_TENMON_DAI" Segment="2" Game="MM">
-        <Scene Name="Z2_TENMON_DAI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TENMON_DAI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TENMON_DAI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TENMON_DAI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_TENMON_DAI_room_01" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TORIDE/Z2_TORIDE.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TORIDE/Z2_TORIDE.xml
deleted file mode 100644
index 4003e785d..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TORIDE/Z2_TORIDE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
-    <File Name="Z2_TORIDE" Segment="2" Game="MM">
-        <Scene Name="Z2_TORIDE" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TORIDE_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TORIDE_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TOUGITES/Z2_TOUGITES.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TOUGITES/Z2_TOUGITES.xml
deleted file mode 100644
index 65752111f..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TOUGITES/Z2_TOUGITES.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_TOUGITES" Segment="2" Game="MM">
-        <Scene Name="Z2_TOUGITES" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TOUGITES_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TOUGITES_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TOWN/Z2_TOWN.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TOWN/Z2_TOWN.xml
deleted file mode 100644
index be025d5ff..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_TOWN/Z2_TOWN.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_TOWN" Segment="2" Game="MM">
-        <Scene Name="Z2_TOWN" Offset="0x0"/>
-    </File>
-    <File Name="Z2_TOWN_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_TOWN_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_WITCH_SHOP/Z2_WITCH_SHOP.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_WITCH_SHOP/Z2_WITCH_SHOP.xml
deleted file mode 100644
index 1401d5832..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_WITCH_SHOP/Z2_WITCH_SHOP.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-    <File Name="Z2_WITCH_SHOP" Segment="2" Game="MM">
-        <Scene Name="Z2_WITCH_SHOP" Offset="0x0"/>
-    </File>
-    <File Name="Z2_WITCH_SHOP_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_WITCH_SHOP_room_00" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_YADOYA/Z2_YADOYA.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_YADOYA/Z2_YADOYA.xml
deleted file mode 100644
index 03801385c..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_YADOYA/Z2_YADOYA.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Root>
-    <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
-    <File Name="Z2_YADOYA" Segment="2" Game="MM">
-        <Scene Name="Z2_YADOYA" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YADOYA_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_YADOYA_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YADOYA_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_YADOYA_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YADOYA_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_YADOYA_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YADOYA_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_YADOYA_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YADOYA_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_YADOYA_room_04" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_YOUSEI_IZUMI/Z2_YOUSEI_IZUMI.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_YOUSEI_IZUMI/Z2_YOUSEI_IZUMI.xml
deleted file mode 100644
index 10ebda0ba..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/scenes/Z2_YOUSEI_IZUMI/Z2_YOUSEI_IZUMI.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Root>
-    <File Name="Z2_YOUSEI_IZUMI" Segment="2" Game="MM">
-        <Scene Name="Z2_YOUSEI_IZUMI" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YOUSEI_IZUMI_room_00" Segment="3" Game="MM">
-        <Room Name="Z2_YOUSEI_IZUMI_room_00" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YOUSEI_IZUMI_room_01" Segment="3" Game="MM">
-        <Room Name="Z2_YOUSEI_IZUMI_room_01" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YOUSEI_IZUMI_room_02" Segment="3" Game="MM">
-        <Room Name="Z2_YOUSEI_IZUMI_room_02" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YOUSEI_IZUMI_room_03" Segment="3" Game="MM">
-        <Room Name="Z2_YOUSEI_IZUMI_room_03" Offset="0x0"/>
-    </File>
-    <File Name="Z2_YOUSEI_IZUMI_room_04" Segment="3" Game="MM">
-        <Room Name="Z2_YOUSEI_IZUMI_room_04" Offset="0x0"/>
-    </File>
-</Root>
diff --git a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/text/message_data_static.xml b/Android/app/src/main/assets/assets/extractor/xmls/N64_US/text/message_data_static.xml
deleted file mode 100644
index dfbb98c74..000000000
--- a/Android/app/src/main/assets/assets/extractor/xmls/N64_US/text/message_data_static.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Root>
-  <File Name="message_data_static">
-    <TextMM Name="message_data_static" CodeOffset="0x1210D8"/>
-  </File>
-	<File Name="staff_message_data_static">
-		<TextMM Name="staff_message_data_static" CodeOffset="0x12A048"/>
-	</File>
-</Root>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4260cff9..2672631be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,6 +130,16 @@ install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_MM.txt" DESTINATIO
 install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_MM.txt" DESTINATION ./assets/extractor/symbols COMPONENT 2s2h)
 endif()
 
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
+file(COPY "${CMAKE_SOURCE_DIR}/mm/assets/extractor/" DESTINATION "${CMAKE_SOURCE_DIR}/Android/app/src/main/assets/assets/extractor")
+file(COPY "${CMAKE_SOURCE_DIR}/mm/assets/xml/" DESTINATION "${CMAKE_SOURCE_DIR}/Android/app/src/main/assets/assets/extractor/xmls")
+file(COPY "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/filelists/" DESTINATION "${CMAKE_SOURCE_DIR}/Android/app/src/main/assets/assets/extractor/filelists")
+file(COPY "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ActorList_MM.txt" DESTINATION "${CMAKE_SOURCE_DIR}/Android/app/src/main/assets/assets/extractor/symbols")
+file(COPY "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_MM.txt" DESTINATION "${CMAKE_SOURCE_DIR}/Android/app/src/main/assets/assets/extractor/symbols")
+file(COPY "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_MM.txt" DESTINATION "${CMAKE_SOURCE_DIR}/Android/app/src/main/assets/assets/extractor/symbols")
+endif()
+
+
 find_package(Python3 COMPONENTS Interpreter)
 
 # Target to generate OTRs