From f4a72303cb15abbebefb907480b46737d6c51d9d Mon Sep 17 00:00:00 2001
From: playerskel <97991990+playerskel@users.noreply.github.com>
Date: Mon, 24 Jan 2022 00:09:02 +0100
Subject: [PATCH] Whitespace (#1112)

* remove trailing whitespaces

* minor docs tweaks

* some more trailing whitespaces

* few more tweaks
---
 Doxyfile                                      |  4 +-
 assets/xml/objects/gameplay_dangeon_keep.xml  |  4 +-
 assets/xml/objects/gameplay_field_keep.xml    |  4 +-
 assets/xml/objects/object_ani.xml             |  6 +-
 assets/xml/objects/object_aob.xml             |  2 +-
 assets/xml/objects/object_bird.xml            |  2 +-
 assets/xml/objects/object_blkobj.xml          |  2 +-
 assets/xml/objects/object_box.xml             |  2 +-
 assets/xml/objects/object_bv.xml              |  4 +-
 assets/xml/objects/object_crow.xml            |  2 +-
 assets/xml/objects/object_ddan_objects.xml    |  4 +-
 assets/xml/objects/object_dekunuts.xml        |  2 +-
 assets/xml/objects/object_dnk.xml             |  2 +-
 assets/xml/objects/object_dns.xml             |  2 +-
 assets/xml/objects/object_ds.xml              |  2 +-
 assets/xml/objects/object_dy_obj.xml          |  4 +-
 assets/xml/objects/object_ec.xml              |  2 +-
 assets/xml/objects/object_ei.xml              |  2 +-
 assets/xml/objects/object_fd.xml              |  2 +-
 assets/xml/objects/object_fd2.xml             |  2 +-
 assets/xml/objects/object_fhg.xml             |  4 +-
 assets/xml/objects/object_fu.xml              |  4 +-
 assets/xml/objects/object_fw.xml              |  2 +-
 assets/xml/objects/object_ge1.xml             |  2 +-
 assets/xml/objects/object_gla.xml             |  2 +-
 assets/xml/objects/object_gnd.xml             | 54 +++++++-------
 assets/xml/objects/object_gt.xml              |  8 +--
 assets/xml/objects/object_hintnuts.xml        |  2 +-
 assets/xml/objects/object_in.xml              |  2 +-
 assets/xml/objects/object_jj.xml              |  6 +-
 assets/xml/objects/object_km1.xml             |  8 +--
 assets/xml/objects/object_kw1.xml             |  8 +--
 assets/xml/objects/object_kz.xml              |  2 +-
 assets/xml/objects/object_link_boy.xml        | 38 +++++-----
 assets/xml/objects/object_link_child.xml      | 34 ++++-----
 assets/xml/objects/object_ma1.xml             |  2 +-
 assets/xml/objects/object_ma2.xml             |  2 +-
 assets/xml/objects/object_mizu_objects.xml    | 10 +--
 assets/xml/objects/object_mo.xml              |  6 +-
 assets/xml/objects/object_ms.xml              |  2 +-
 assets/xml/objects/object_oF1d_map.xml        |  8 +--
 assets/xml/objects/object_owl.xml             |  8 +--
 assets/xml/objects/object_po_sisters.xml      | 10 +--
 assets/xml/objects/object_ru1.xml             |  8 +--
 assets/xml/objects/object_ru2.xml             |  4 +-
 assets/xml/objects/object_sa.xml              |  4 +-
 assets/xml/objects/object_sd.xml              |  2 +-
 assets/xml/objects/object_skj.xml             |  4 +-
 assets/xml/objects/object_spot00_break.xml    |  2 +-
 assets/xml/objects/object_spot06_objects.xml  |  4 +-
 assets/xml/objects/object_spot08_obj.xml      |  4 +-
 assets/xml/objects/object_spot16_obj.xml      |  2 +-
 assets/xml/objects/object_sst.xml             |  2 +-
 assets/xml/objects/object_wf.xml              |  6 +-
 assets/xml/objects/object_zl1.xml             |  2 +-
 assets/xml/objects/object_zl4.xml             |  2 +-
 assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml   |  6 +-
 assets/xml/overlays/ovl_Bg_Jya_Cobra.xml      |  2 +-
 assets/xml/overlays/ovl_Boss_Ganon.xml        |  2 +-
 assets/xml/overlays/ovl_En_Bili.xml           |  2 +-
 assets/xml/overlays/ovl_End_Title.xml         |  4 +-
 assets/xml/scenes/dungeons/ddan.xml           |  2 +-
 assets/xml/scenes/overworld/souko.xml         |  4 +-
 docs/Documenting.md                           |  6 +-
 docs/tutorial/beginning_decomp.md             | 22 +++---
 docs/tutorial/contents.md                     | 34 ++++-----
 docs/tutorial/data.md                         |  8 +--
 docs/tutorial/draw_functions.md               | 13 ++--
 docs/tutorial/helper_scripts.md               |  2 +-
 docs/tutorial/introduction.md                 | 14 ++--
 docs/tutorial/merging.md                      |  2 +-
 docs/tutorial/object_decomp.md                |  2 +-
 docs/tutorial/other_functions.md              | 72 +++++++++----------
 docs/tutorial/pre-decomp.md                   |  2 +-
 docs/tutorial/types_structs_padding.md        |  6 +-
 extract_assets.py                             |  2 +-
 extract_baserom.py                            |  2 +-
 first_diff.py                                 |  4 +-
 format.sh                                     |  4 +-
 include/message_data_fmt.h                    |  4 +-
 include/message_data_static.h                 |  2 +-
 include/ultra64/controller.h                  |  2 +-
 include/ultra64/mbi.h                         |  4 +-
 include/ultra64/pfs.h                         |  2 +-
 include/ultra64/r4300.h                       |  4 +-
 include/z64.h                                 |  6 +-
 include/z64animation.h                        |  8 +--
 include/z64camera.h                           |  9 ++-
 include/z64collision_check.h                  | 10 +--
 include/z64cutscene.h                         |  8 +--
 include/z64cutscene_commands.h                | 18 ++---
 include/z64scene.h                            |  4 +-
 progress.py                                   |  2 +-
 src/code/z_map_data.c                         | 10 +--
 .../ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h |  4 +-
 .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h   |  4 +-
 .../ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h     |  2 +-
 .../actors/ovl_Boss_Dodongo/z_boss_dodongo.h  |  2 +-
 .../actors/ovl_Boss_Ganon/z_boss_ganon.h      |  2 +-
 src/overlays/actors/ovl_Demo_Du/z_demo_du.h   |  2 +-
 src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h   |  2 +-
 .../actors/ovl_Door_Shutter/z_door_shutter.h  |  8 +--
 src/overlays/actors/ovl_En_Ba/z_en_ba.h       |  6 +-
 src/overlays/actors/ovl_En_Bb/z_en_bb.h       |  2 +-
 src/overlays/actors/ovl_En_Dh/z_en_dh.h       |  4 +-
 .../actors/ovl_En_Dodongo/z_en_dodongo.h      |  2 +-
 src/overlays/actors/ovl_En_Dog/z_en_dog.h     |  2 +-
 .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h    |  2 +-
 src/overlays/actors/ovl_En_Fr/z_en_fr.h       | 14 ++--
 src/overlays/actors/ovl_En_Fu/z_en_fu.h       |  2 +-
 src/overlays/actors/ovl_En_Fz/z_en_fz.h       | 10 +--
 .../actors/ovl_En_G_Switch/z_en_g_switch.h    |  2 +-
 src/overlays/actors/ovl_En_Go/z_en_go.h       |  4 +-
 src/overlays/actors/ovl_En_Go2/z_en_go2.h     | 18 ++---
 .../actors/ovl_En_Heishi1/z_en_heishi1.h      |  2 +-
 .../actors/ovl_En_Heishi2/z_en_heishi2.h      |  2 +-
 src/overlays/actors/ovl_En_Nwc/z_en_nwc.h     |  2 +-
 src/overlays/actors/ovl_En_Skb/z_en_skb.h     |  4 +-
 src/overlays/actors/ovl_En_Tp/z_en_tp.h       |  2 +-
 .../ovl_En_Wonder_Item/z_en_wonder_item.h     |  2 +-
 .../z_eff_ss_fire_tail.h                      |  2 +-
 .../gamestates/ovl_file_choose/file_choose.h  | 56 +++++++--------
 sym_info.py                                   |  2 +-
 tools/assist.py                               |  2 +-
 tools/bootstrap_actors.py                     | 10 +--
 tools/bootstrap_fx.py                         |  4 +-
 tools/convert_chars.py                        |  8 +--
 tools/create_actor_headers.py                 |  6 +-
 tools/disasm_elf_msg.py                       |  2 +-
 tools/elf2rom.c                               |  4 +-
 tools/elf32.c                                 | 16 ++---
 tools/find_unused_asm.sh                      | 26 +++----
 tools/fix_data_stuff.py                       |  4 +-
 tools/format_s_files.py                       |  2 +-
 tools/get_actor_sizes.py                      | 10 +--
 tools/ichaindis.py                            |  6 +-
 tools/migrate-rodata.py                       |  7 +-
 tools/mkdmadata.c                             |  2 +-
 tools/mkldscript.c                            |  4 +-
 tools/msgdis.py                               | 18 ++---
 tools/overlayhelpers/filemap.py               | 22 +++---
 tools/overlayhelpers/lmapmark.py              |  2 +-
 tools/overlayhelpers/mapmark.py               |  4 +-
 tools/regconvert.py                           |  4 +-
 tools/spec.c                                  |  2 +-
 tools/specprocess.py                          |  2 +-
 tools/split_out_overlay_funcs.py              |  6 +-
 tools/util.c                                  |  4 +-
 tools/vt_fmt.py                               |  4 +-
 tools/vtxdis.c                                |  2 +-
 150 files changed, 493 insertions(+), 494 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index 67f2da713..8d98f6bf9 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Ocarina of Time Source"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         =
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -291,7 +291,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
 # the files are not read by doxygen.
 
-EXTENSION_MAPPING = 
+EXTENSION_MAPPING =
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
diff --git a/assets/xml/objects/gameplay_dangeon_keep.xml b/assets/xml/objects/gameplay_dangeon_keep.xml
index b8b31ecb4..d16eb4c41 100644
--- a/assets/xml/objects/gameplay_dangeon_keep.xml
+++ b/assets/xml/objects/gameplay_dangeon_keep.xml
@@ -41,8 +41,8 @@
         <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
         <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
         <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
-        <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/> 
-        <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/> 
+        <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
+        <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
         <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
         <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
         <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
diff --git a/assets/xml/objects/gameplay_field_keep.xml b/assets/xml/objects/gameplay_field_keep.xml
index b79593707..28fa975d7 100644
--- a/assets/xml/objects/gameplay_field_keep.xml
+++ b/assets/xml/objects/gameplay_field_keep.xml
@@ -41,10 +41,10 @@
         <Texture Name="gFieldUnusedFishTex" OutName="unused_fish" Format="rgba16" Width="64" Height="32" Offset="0x64A8"/>
         <Texture Name="gFieldUnusedFishBottomTex" OutName="unused_fish_bottom" Format="rgba16" Width="64" Height="32" Offset="0x074A8"/>
         <Texture Name="gFieldUnusedFishFinTex" OutName="unused_fish_fin" Format="rgba16" Width="32" Height="16" Offset="0x84A8"/>
-        <DList Name="gSilverRockDL" Offset="0xA3B8"/> 
+        <DList Name="gSilverRockDL" Offset="0xA3B8"/>
         <DList Name="gFieldKakeraDL" Offset="0xA880"/>
         <Texture Name="gFieldKakeraTex" OutName="kakera" Format="rgba16" Width="32" Height="32" Offset="0xA940"/>
-        <DList Name="gSilverRockFragmentsDL" Offset="0xA5E8"/>  
+        <DList Name="gSilverRockFragmentsDL" Offset="0xA5E8"/>
         <DList Name="gFieldBushDL" Offset="0xB9D0"/>
         <Texture Name="gFieldBushTex" OutName="bush" Format="rgba16" Width="32" Height="32" Offset="0xB140"/>
         <DList Name="gFieldBeehiveDL" Offset="0x95B0"/>
diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml
index c69656043..bb85f51a4 100644
--- a/assets/xml/objects/object_ani.xml
+++ b/assets/xml/objects/object_ani.xml
@@ -2,7 +2,7 @@
     <File Name="object_ani" Segment="6">
         <!-- Kakariko Roof Man Skeleton -->
         <Skeleton Name="gRoofManSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
-        
+
         <!-- Kakariko Roof Man Limbs -->
         <Limb Name="gRoofManRootLimb" LimbType="Standard" Offset="0x0"/>
         <Limb Name="gRoofManLeftThighLimb" LimbType="Standard" Offset="0xC"/>
@@ -35,8 +35,8 @@
         <DList Name="gRoofManRightUpperArmDL" Offset="0x4D70"/>
         <DList Name="gRoofManRightForearmDL" Offset="0x4C00"/>
         <DList Name="gRoofManRightHandDL" Offset="0x4A68"/>
-        <DList Name="gRoofManHeadDL" Offset="0x2CD8"/>  
-  
+        <DList Name="gRoofManHeadDL" Offset="0x2CD8"/>
+
         <!-- Kakariko Roof Man Palettes --> <!-- There's something weird going on with the TLUTs here... -->
         <Texture Name="gRoofMan1TLUT" OutName="roof_man_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x00108"/>
         <Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="ci8" Width="16" Height="16" Offset="0x1088"/>
diff --git a/assets/xml/objects/object_aob.xml b/assets/xml/objects/object_aob.xml
index e6202d0cf..61b28914b 100644
--- a/assets/xml/objects/object_aob.xml
+++ b/assets/xml/objects/object_aob.xml
@@ -20,7 +20,7 @@
         <Limb Name="gDogLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
         <Limb Name="gDogLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
 
-        
+
         <!-- Dog Lady Limb DisplayLists -->
         <DList Name="gDogLadyDressDL" Offset="0x5588"/>
         <DList Name="gDogLadyDL_54B8" Offset="0x54B8"/>
diff --git a/assets/xml/objects/object_bird.xml b/assets/xml/objects/object_bird.xml
index 167a5022d..c0b5cac3e 100644
--- a/assets/xml/objects/object_bird.xml
+++ b/assets/xml/objects/object_bird.xml
@@ -8,7 +8,7 @@
         <DList Name="gBirdRightWingDL" Offset="0x180"/>
         <DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
         <DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
-        
+
         <DList Name="gBirdBodyDL" Offset="0x280"/>
         <DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
         <DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
diff --git a/assets/xml/objects/object_blkobj.xml b/assets/xml/objects/object_blkobj.xml
index a073077b8..952729283 100644
--- a/assets/xml/objects/object_blkobj.xml
+++ b/assets/xml/objects/object_blkobj.xml
@@ -6,7 +6,7 @@
         <!-- Illusion Room DLists -->
         <DList Name="gIllusionRoomNormalDL" Offset="0x14E0"/>
         <DList Name="gIllusionRoomIllusionDL" Offset="0x53D0"/>
-        
+
         <!-- Unused Content -->
 
         <!-- Illusion room DLists -->
diff --git a/assets/xml/objects/object_box.xml b/assets/xml/objects/object_box.xml
index efcec619b..34162fc94 100644
--- a/assets/xml/objects/object_box.xml
+++ b/assets/xml/objects/object_box.xml
@@ -12,7 +12,7 @@
 
         <DList Name="gTreasureChestBossKeyChestFrontDL" Offset="0xAE8"/>
         <Texture Name="gTreasureChestBossKeyFrontTex" OutName="boss_key_front_tex" Format="rgba16" Width="32" Height="64" Offset="0x3798"/>
-        
+
         <DList Name="gTreasureChestChestSideAndLidDL" Offset="0x10C0"/>
         <Texture Name="gTreasureChestSideAndTopTex" OutName="side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2798"/>
 
diff --git a/assets/xml/objects/object_bv.xml b/assets/xml/objects/object_bv.xml
index 83ff039f5..b6ef9e45f 100644
--- a/assets/xml/objects/object_bv.xml
+++ b/assets/xml/objects/object_bv.xml
@@ -9,7 +9,7 @@
         <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x18870"/>
         <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x4E70"/>
         <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17FC8"/>
-        
+
         <Animation Name="gBarinadeBodyAnim" Offset="0x5184"/> <!-- Body anim 1-->
         <Animation Name="gBarinadeSupportAttachedAnim" Offset="0x166A8"/> <!-- Support anim 1 -->
         <Animation Name="gBarinadeZapperIdleAnim" Offset="0x18D18"/> <!-- Zapper anim 1 -->
@@ -48,7 +48,7 @@
         <!-- small spark -->
         <DList Name="gBarinadeDL_008F08" Offset="0x8F08"/>
         <DList Name="gBarinadeDL_008F70" Offset="0x8F70"/>
-        
+
         <Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x96F8"/>
         <Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0xA6F8"/>
         <Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xB6F8"/>
diff --git a/assets/xml/objects/object_crow.xml b/assets/xml/objects/object_crow.xml
index 77337c644..5304246a0 100644
--- a/assets/xml/objects/object_crow.xml
+++ b/assets/xml/objects/object_crow.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_crow" Segment="6">
         <Animation Name="gGuayFlyAnim" Offset="0xF0"/>
-    
+
         <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40"/>
         <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40"/>
         <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40"/>
diff --git a/assets/xml/objects/object_ddan_objects.xml b/assets/xml/objects/object_ddan_objects.xml
index 3fc563b96..b7df6ed84 100644
--- a/assets/xml/objects/object_ddan_objects.xml
+++ b/assets/xml/objects/object_ddan_objects.xml
@@ -11,12 +11,12 @@
         <Texture Name="gDodongoBarsBottomTex" OutName="door_bars_bottom" Format="rgba16" Width="32" Height="32" Offset="0x6760"/>
         <Texture Name="gDodongoTex_6F60" OutName="tex_6F60" Format="rgba16" Width="32" Height="32" Offset="0x6F60"/>
         <Texture Name="gDodongoFallingStairsVinesTex" OutName="falling_stairs_vines" Format="rgba16" Width="32" Height="64" Offset="0x7760"/>
-        
+
         <!-- Palettes -->
         <Texture Name="gDodongo1TLUT" OutName="tlut_1" Format="rgba16" Width="160" Height="1" Offset="0x02D0"/>
         <Texture Name="gDodongo2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x1E10"/> <!-- Palette seems to be actually 258 colors -->
         <Texture Name="gDodongo3TLUT" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x3D10"/> <!-- Palette seems to be actually 258 colors -->
-        
+
         <!-- Dodongo's Cavern DisplayLists -->
         <DList Name="gDodongoDoorDL" Offset="0xC0"/>
         <DList Name="gDodongoBarsDL" Offset="0x1F0"/>
diff --git a/assets/xml/objects/object_dekunuts.xml b/assets/xml/objects/object_dekunuts.xml
index 5fceef416..4a4508ee0 100644
--- a/assets/xml/objects/object_dekunuts.xml
+++ b/assets/xml/objects/object_dekunuts.xml
@@ -2,7 +2,7 @@
     <File Name="object_dekunuts" Segment="6">
         <!-- Deku Scrub skeleton -->
         <Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
-        
+
         <!-- Deku Scrub animations -->
         <Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
         <Animation Name="gDekuNutsDamageAnim" Offset="0x368"/>
diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml
index b1e79464b..1efec46aa 100644
--- a/assets/xml/objects/object_dnk.xml
+++ b/assets/xml/objects/object_dnk.xml
@@ -2,7 +2,7 @@
     <File Name="object_dnk" Segment="6">
         <!-- Forest Stage scrub skeleton -->
         <Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
-        
+
         <!-- Forest Stage scrub animations -->
         <Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
         <Animation Name="gDntStageHideAnim" Offset="0x430"/>
diff --git a/assets/xml/objects/object_dns.xml b/assets/xml/objects/object_dns.xml
index 086c4bd11..e66a63987 100644
--- a/assets/xml/objects/object_dns.xml
+++ b/assets/xml/objects/object_dns.xml
@@ -16,7 +16,7 @@
         <Texture Name="gDntJijiEyeOpenTex" Format="rgba16" Width="8" Height="8" Offset="0x30A0"/>
         <Texture Name="gDntJijiEyeHalfTex" Format="rgba16" Width="8" Height="8" Offset="0x2EA0"/>
         <Texture Name="gDntJijiEyeShutTex" Format="rgba16" Width="8" Height="8" Offset="0x3020"/>
-        
+
         <!-- Forest Stage leader flower -->
         <DList Name="gDntJijiFlowerDL" Offset="0x2310"/>
 
diff --git a/assets/xml/objects/object_ds.xml b/assets/xml/objects/object_ds.xml
index 0413a9e2e..b2fb1a5c2 100644
--- a/assets/xml/objects/object_ds.xml
+++ b/assets/xml/objects/object_ds.xml
@@ -31,7 +31,7 @@
         <Texture Name="gPotionShopLadyShirtPatternTex" OutName="shirt_pattern" Format="ci8" Width="16" Height="16" Offset="0x4118" TlutOffset="0x3918"/>
         <Texture Name="gPotionShopLadyCatPattern1Tex" OutName="cat_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x4218" TlutOffset="0x3918"/>
         <Texture Name="gPotionShopLadyCatPattern2Tex" OutName="cat_pattern_2" Format="ci8" Width="16" Height="16" Offset="0x4618" TlutOffset="0x3918"/>
-        
+
         <!-- Potion Shop Lady Animations-->
         <Animation Name="gPotionShopLadyAnim" Offset="0x39C"/>
     </File>
diff --git a/assets/xml/objects/object_dy_obj.xml b/assets/xml/objects/object_dy_obj.xml
index 4d141d546..9d7dae3e0 100644
--- a/assets/xml/objects/object_dy_obj.xml
+++ b/assets/xml/objects/object_dy_obj.xml
@@ -98,7 +98,7 @@
         <!-- Great Fairy Mouth Textures -->
         <Texture Name="gGreatFairyMouthClosedTex" OutName="mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x19130"/>
         <Texture Name="gGreatFairyMouthOpenTex" OutName="mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1A130"/>
-        
+
         <!-- Great Fairy Animations -->
         <Animation Name="gGreatFairyAnim_000108" Offset="0x108"/>
         <Animation Name="gGreatFairySpellFountainSpinShrinkAnim" Offset="0x92C"/>
@@ -116,6 +116,6 @@
         <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0x1BFB0">
             <Vtx/>
         </Array>
-        
+
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ec.xml b/assets/xml/objects/object_ec.xml
index 7ec83e284..fdeccef4c 100644
--- a/assets/xml/objects/object_ec.xml
+++ b/assets/xml/objects/object_ec.xml
@@ -2,7 +2,7 @@
     <File Name="object_ec" Segment="6">
         <Animation Name="gDemoEcCuccoLadyAnim" Offset="0xCD8"/>
         <Animation Name="gDemoEcCarpenterAnim" Offset="0x164C"/>
-        <Animation Name="gDemoEcWindmillManAnim" Offset="0x196C"/>        
+        <Animation Name="gDemoEcWindmillManAnim" Offset="0x196C"/>
         <Animation Name="gDemoEcGerudoAnim" Offset="0x2254"/>
         <Animation Name="gDemoEcGoronAnim" Offset="0x2FA0"/>
         <Animation Name="gDemoEcGoron2Anim" Offset="0x3A98"/>
diff --git a/assets/xml/objects/object_ei.xml b/assets/xml/objects/object_ei.xml
index e4132491f..cabad17ff 100644
--- a/assets/xml/objects/object_ei.xml
+++ b/assets/xml/objects/object_ei.xml
@@ -45,7 +45,7 @@
         <Texture Name="gStingerFinTex" OutName="fin" Format="rgba16" Width="8" Height="8" Offset="0x1640"/>
         <Texture Name="gStingerTailGradientTex" OutName="tail_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16C0"/>
         <Texture Name="gStingerTailConnectionGradientTex" OutName="tail_connection_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16E0"/>
-    
+
         <!-- Stinger Animations -->
         <Animation Name="gStingerPopOutAnim" Offset="0x288"/>
         <Animation Name="gStingerDiveAnim" Offset="0x4C4"/>
diff --git a/assets/xml/objects/object_fd.xml b/assets/xml/objects/object_fd.xml
index 1b96e9f22..d915b38c2 100644
--- a/assets/xml/objects/object_fd.xml
+++ b/assets/xml/objects/object_fd.xml
@@ -47,7 +47,7 @@
         <DList Name="gVolvagiaBodySeg16DL" Offset="0x8038"/>
         <DList Name="gVolvagiaBodySeg17DL" Offset="0x8080"/>
         <DList Name="gVolvagiaBodySeg18DL" Offset="0x80D8"/>
-        
+
         <!-- Particle display lists -->
         <DList Name="gVolvagiaEmberMaterialDL" Offset="0xA880"/>
         <DList Name="gVolvagiaEmberModelDL" Offset="0xA900"/>
diff --git a/assets/xml/objects/object_fd2.xml b/assets/xml/objects/object_fd2.xml
index 8689098b9..b3fbdcb21 100644
--- a/assets/xml/objects/object_fd2.xml
+++ b/assets/xml/objects/object_fd2.xml
@@ -24,7 +24,7 @@
         <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x2708"/>
         <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x2B08"/>
         <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x2F08"/>
-        
+
         <!-- Unused animation -->
         <Animation Name="gHoleVolvagiaAnim_00CDAC" Offset="0xCDAC"/> <!-- Looks tired. Low health animation? -->
 
diff --git a/assets/xml/objects/object_fhg.xml b/assets/xml/objects/object_fhg.xml
index f3a4a55ca..eb07d8eb3 100644
--- a/assets/xml/objects/object_fhg.xml
+++ b/assets/xml/objects/object_fhg.xml
@@ -16,10 +16,10 @@
         <Animation Name="gPhantomHorseUnusedRearingAnim" Offset="0x5804"/>
         <Animation Name="gPhantomHorseStillAnim" Offset="0x5990"/>
         <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xC180"/>
-        
+
         <!-- Boss title card -->
         <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
-    
+
         <!-- Energy attack DLists -->
         <DList Name="gPhantomWarpDL" Offset="0xFAA0"/>
         <DList Name="gPhantomLightningBlastDL" Offset="0xFCF8"/>
diff --git a/assets/xml/objects/object_fu.xml b/assets/xml/objects/object_fu.xml
index 82c449e3d..3947e438c 100644
--- a/assets/xml/objects/object_fu.xml
+++ b/assets/xml/objects/object_fu.xml
@@ -27,13 +27,13 @@
         <Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
         <Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
         <Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
-        
+
         <Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
         <Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
 
         <Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
         <Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
-        
+
         <Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
         <Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
         <Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
diff --git a/assets/xml/objects/object_fw.xml b/assets/xml/objects/object_fw.xml
index e71f83092..51462a316 100644
--- a/assets/xml/objects/object_fw.xml
+++ b/assets/xml/objects/object_fw.xml
@@ -91,7 +91,7 @@
         <Texture Name="gFlareDancerFuseTex" OutName="fuse" Format="rgba16" Width="16" Height="32" Offset="0x20F0"/>
         <Texture Name="gFlareDancerSwordHiltTex" OutName="sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
         <Texture Name="gFlareDancerCoreBodyTex" OutName="core_body" Format="rgba16" Width="16" Height="32" Offset="0x26F0"/>
-        
+
         <!-- Flare Dancer Animations -->
         <Animation Name="gFlareDancerCastingFireAnim" Offset="0x10B4"/>
         <Animation Name="gFlareDancerBackflipAnim" Offset="0x5C64"/>
diff --git a/assets/xml/objects/object_ge1.xml b/assets/xml/objects/object_ge1.xml
index 79e0768b8..c3c3e0db3 100644
--- a/assets/xml/objects/object_ge1.xml
+++ b/assets/xml/objects/object_ge1.xml
@@ -63,7 +63,7 @@
 
         <!-- White-clothed Gerudo Hair textures -->
         <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08" TlutOffset="0x2808"/>
-        
+
         <!-- White-clothed Gerudo Eye Textures -->
         <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x0708"/>
         <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0F08"/>
diff --git a/assets/xml/objects/object_gla.xml b/assets/xml/objects/object_gla.xml
index 499a3720d..ca4d9225d 100644
--- a/assets/xml/objects/object_gla.xml
+++ b/assets/xml/objects/object_gla.xml
@@ -70,7 +70,7 @@
         <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78" TlutOffset="0x4D08"/>
         <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578" TlutOffset="0x4D08"/>
         <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8" TlutOffset="0x4D08"/>
-        
+
         <!-- Purple-clothed Gerudo Animations -->
         <Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>
         <Animation Name="gGerudoPurpleUnusedSlashToStandingAnim" Offset="0x0780"/>
diff --git a/assets/xml/objects/object_gnd.xml b/assets/xml/objects/object_gnd.xml
index dfbe02315..53d2bbde4 100644
--- a/assets/xml/objects/object_gnd.xml
+++ b/assets/xml/objects/object_gnd.xml
@@ -1,9 +1,9 @@
 <Root>
     <File Name="object_gnd" Segment="6">
-        
+
         <!-- Skeleton -->
         <Skeleton Name="gPhantomGanonSkel" Type="Normal" LimbType="Standard" Offset="0xC710"/>
-        
+
         <!-- Riding animations -->
         <Animation Name="gPhantomGanonRideAnim" Offset="0x3CA4"/>
         <Animation Name="gPhantomGanonMaskOnAnim" Offset="0x1144"/>
@@ -18,16 +18,16 @@
 
         <Animation Name="gPhantomGanonThrowAnim" Offset="0xEC94"/>
         <Animation Name="gPhantomGanonThrowEndAnim" Offset="0xF48C"/>
-        
+
         <Animation Name="gPhantomGanonReturn1Anim" Offset="0x10FD4"/>
         <Animation Name="gPhantomGanonReturn2Anim" Offset="0x11800"/>
-        
+
         <Animation Name="gPhantomGanonBlockAnim" Offset="0x10344"/>
 
         <Animation Name="gPhantomGanonChargeWindupAnim" Offset="0x129E0"/>
         <Animation Name="gPhantomGanonChargeStartAnim" Offset="0x11F44"/>
         <Animation Name="gPhantomGanonChargeAnim" Offset="0x1267C"/>
-        
+
         <Animation Name="gPhantomGanonAirDamageAnim" Offset="0x108D8"/>
         <Animation Name="gPhantomGanonGroundDamageAnim" Offset="0xFAC8"/>
         <Animation Name="gPhantomGanonStunnedAnim" Offset="0x11BCC"/>
@@ -40,27 +40,27 @@
 
         <!-- Limb textures -->
         <Texture Name="gPhantomGanonLimbTex_00B380" OutName="phantom_ganon_limb_tex_00B380" Format="rgba16" Width="16" Height="32" Offset="0xB380"/>
-        <Texture Name="gPhantomGanonLimbTex_00A800" OutName="phantom_ganon_limb_tex_00A800" Format="rgba16" Width="8" Height="8" Offset="0xA800"/> 
-        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/> 
-        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/> 
-        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/> 
-        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/> 
-        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/> 
-        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/> 
-        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/> 
-        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/> 
-        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/> 
-        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/> 
-        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/> 
-        <Texture Name="gPhantomGanonLimbTex_00A200" OutName="phantom_ganon_limb_tex_00A200" Format="rgba16" Width="16" Height="16" Offset="0xA200"/> 
-        <Texture Name="gPhantomGanonLimbTex_00A400" OutName="phantom_ganon_limb_tex_00A400" Format="rgba16" Width="16" Height="16" Offset="0xA400"/> 
-        <Texture Name="gPhantomGanonLimbTex_00A600" OutName="phantom_ganon_limb_tex_00A600" Format="rgba16" Width="16" Height="16" Offset="0xA600"/> 
-        <Texture Name="gPhantomGanonLimbTex_00A880" OutName="phantom_ganon_limb_tex_00A880" Format="rgba16" Width="16" Height="16" Offset="0xA880"/> 
-        <Texture Name="gPhantomGanonLimbTex_00B780" OutName="phantom_ganon_limb_tex_00B780" Format="rgba16" Width="16" Height="16" Offset="0xB780"/> 
-        <Texture Name="gPhantomGanonLimbTex_00BA80" OutName="phantom_ganon_limb_tex_00BA80" Format="rgba16" Width="16" Height="16" Offset="0xBA80"/> 
-        <Texture Name="gPhantomGanonLimbTex_00BE80" OutName="phantom_ganon_limb_tex_00BE80" Format="rgba16" Width="16" Height="16" Offset="0xBE80"/> 
-        <Texture Name="gPhantomGanonLimbTex_00AA80" OutName="phantom_ganon_limb_tex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80"/> 
-        <Texture Name="gPhantomGanonLimbTex_00AF80" OutName="phantom_ganon_limb_tex_00AF80" Format="rgba16" Width="32" Height="16" Offset="0xAF80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A800" OutName="phantom_ganon_limb_tex_00A800" Format="rgba16" Width="8" Height="8" Offset="0xA800"/>
+        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/>
+        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/>
+        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/>
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/>
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/>
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/>
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/>
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/>
+        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/>
+        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/>
+        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/>
+        <Texture Name="gPhantomGanonLimbTex_00A200" OutName="phantom_ganon_limb_tex_00A200" Format="rgba16" Width="16" Height="16" Offset="0xA200"/>
+        <Texture Name="gPhantomGanonLimbTex_00A400" OutName="phantom_ganon_limb_tex_00A400" Format="rgba16" Width="16" Height="16" Offset="0xA400"/>
+        <Texture Name="gPhantomGanonLimbTex_00A600" OutName="phantom_ganon_limb_tex_00A600" Format="rgba16" Width="16" Height="16" Offset="0xA600"/>
+        <Texture Name="gPhantomGanonLimbTex_00A880" OutName="phantom_ganon_limb_tex_00A880" Format="rgba16" Width="16" Height="16" Offset="0xA880"/>
+        <Texture Name="gPhantomGanonLimbTex_00B780" OutName="phantom_ganon_limb_tex_00B780" Format="rgba16" Width="16" Height="16" Offset="0xB780"/>
+        <Texture Name="gPhantomGanonLimbTex_00BA80" OutName="phantom_ganon_limb_tex_00BA80" Format="rgba16" Width="16" Height="16" Offset="0xBA80"/>
+        <Texture Name="gPhantomGanonLimbTex_00BE80" OutName="phantom_ganon_limb_tex_00BE80" Format="rgba16" Width="16" Height="16" Offset="0xBE80"/>
+        <Texture Name="gPhantomGanonLimbTex_00AA80" OutName="phantom_ganon_limb_tex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80"/>
+        <Texture Name="gPhantomGanonLimbTex_00AF80" OutName="phantom_ganon_limb_tex_00AF80" Format="rgba16" Width="32" Height="16" Offset="0xAF80"/>
 
         <!-- Face DList -->
         <DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
@@ -69,7 +69,7 @@
         <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_tlut" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
         <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_tlut" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
         <Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
-        <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/> 
+        <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/>
         <Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>
 
         <!-- Unused Animations, seem to be corrupt -->
diff --git a/assets/xml/objects/object_gt.xml b/assets/xml/objects/object_gt.xml
index 1d79d4e39..dd48318d1 100644
--- a/assets/xml/objects/object_gt.xml
+++ b/assets/xml/objects/object_gt.xml
@@ -12,15 +12,15 @@
         <Texture Name="gTowerCollapseCsRailingTex" OutName="railing" Format="ia8" Width="32" Height="16" Offset="0xECF0"/>
         <Texture Name="gTowerCollapseCsTex_EEF0" OutName="tex_EEF0" Format="i4" Width="32" Height="64" Offset="0xEEF0"/>
         <Texture Name="gTowerCollapseCsTex_F2F0" OutName="tex_F2F0" Format="i8" Width="16" Height="32" Offset="0xF2F0"/>
-        <Texture Name="gTowerCollapseCsGrayFloorTex" OutName="gray_floor" Format="i8" Width="16" Height="32" Offset="0xF4F0"/>  
+        <Texture Name="gTowerCollapseCsGrayFloorTex" OutName="gray_floor" Format="i8" Width="16" Height="32" Offset="0xF4F0"/>
         <Texture Name="gTowerCollapseCsTex_F6F0" OutName="tex_F6F0" Format="i4" Width="64" Height="64" Offset="0xF6F0"/>
         <Texture Name="gTowerCollapseCsBoltedSidesTex" OutName="bolted_sides" Format="i8" Width="64" Height="64" Offset="0xFEF0"/>
-        <Texture Name="gTowerCollapseCsSpikeTex" OutName="spike" Format="ia8" Width="16" Height="16" Offset="0x10EF0"/>   
+        <Texture Name="gTowerCollapseCsSpikeTex" OutName="spike" Format="ia8" Width="16" Height="16" Offset="0x10EF0"/>
         <Texture Name="gTowerCollapseCsCollapsedCastleEdgeTex" OutName="collapsed_castle_edge" Format="i8" Width="64" Height="64" Offset="0x10FF0"/>
         <Texture Name="gTowerCollapseCsTex_11FF0" OutName="tex_11FF0" Format="i8" Width="32" Height="32" Offset="0x11FF0"/>
         <Texture Name="gTowerCollapseCsTex_123F0" OutName="tex_123F0" Format="rgba16" Width="16" Height="16" Offset="0x123F0"/>
         <Texture Name="gTowerCollapseCsTex_125F0" OutName="tex_125F0" Format="i8" Width="64" Height="64" Offset="0x125F0"/>
-        
+
         <!-- Tower Collapse DisplayLists -->
         <DList Name="gTowerCollapseCsExteriorStructureDL" Offset="0x2910"/>
         <DList Name="gTowerCollapseCsFlameSmokeDL" Offset="0x41A0"/>
@@ -33,6 +33,6 @@
         <!-- Tower Collapse Collision -->
         <Collision Name="gTowerCollapseCsCollapsedStructureInnerCol" Offset="0x5CB8"/>
         <Collision Name="gTowerCollapseCsCollapsedStructureOuterCol" Offset="0x91E4"/>
-        
+
     </File>
 </Root>
diff --git a/assets/xml/objects/object_hintnuts.xml b/assets/xml/objects/object_hintnuts.xml
index f419f7546..f7da2e8f5 100644
--- a/assets/xml/objects/object_hintnuts.xml
+++ b/assets/xml/objects/object_hintnuts.xml
@@ -2,7 +2,7 @@
     <File Name="object_hintnuts" Segment="6">
         <!-- Deku scrub skeleton -->
         <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
-        
+
         <!-- Deku Scrub animations -->
         <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
         <Animation Name="gHintNutsBurrowAnim" Offset="0x24CC"/>
diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml
index 84c114047..155b9c9ad 100644
--- a/assets/xml/objects/object_in.xml
+++ b/assets/xml/objects/object_in.xml
@@ -119,7 +119,7 @@
         <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
         <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
         <Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
-        
+
         <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
 
         <Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
diff --git a/assets/xml/objects/object_jj.xml b/assets/xml/objects/object_jj.xml
index 62bae8cb9..96ff7dc02 100644
--- a/assets/xml/objects/object_jj.xml
+++ b/assets/xml/objects/object_jj.xml
@@ -3,7 +3,7 @@
 
         <!-- Jabu Jabu animation (waggling fins etc.) -->
         <Animation Name="gJabuJabuAnim" Offset="0x1F4C"/>
-            
+
         <!-- Jabu Jabu eye textures -->
         <Texture Name="gJabuJabuEyeOpenTex" OutName="jabu_jabu_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x7698"/>
         <Texture Name="gJabuJabuEyeHalfTex" OutName="jabu_jabu_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x7A98"/>
@@ -24,7 +24,7 @@
         <DList Name="gJabuJabuRightMidFlipperDL" Offset="0x4648"/>
         <DList Name="gJabuJabuRightLowerFlipperDL" Offset="0x4578"/>
         <DList Name="gJabuJabuFlukeDL" Offset="0x44A0"/>
-        
+
         <!-- Jabu Jabu limbs -->
         <!-- Only limbs with attached dLists are included for now; others are indicated by spaces -->
 
@@ -72,6 +72,6 @@
         <Collision Name="gJabuJabuBodyCol" Offset="0x1830"/>
         <Collision Name="gJabuJabuUnusedCol" Offset="0xBA8C"/>
 
-            
+
     </File>
 </Root>
diff --git a/assets/xml/objects/object_km1.xml b/assets/xml/objects/object_km1.xml
index 0a918a798..4d1711925 100644
--- a/assets/xml/objects/object_km1.xml
+++ b/assets/xml/objects/object_km1.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_km1" Segment="6">
         <!-- The textures used by these limbs aren't 64-bit aligned -->
-        
+
         <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
         <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
         <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
@@ -17,9 +17,9 @@
         <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
         <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
         <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
-      
+
         <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
-      
+
         <!-- 32-bit aligned textures. -->
         <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
         <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC"/>
@@ -29,7 +29,7 @@
         <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" Width="16" Height="32" Offset="0x5BC" TlutOffset="0xFC"/>
         <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" Width="8" Height="8" Offset="0x7BC" TlutOffset="0xFC"/>
         <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x7FC" TlutOffset="0xFC"/>
-        
+
         <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C"/>
         <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
         <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
diff --git a/assets/xml/objects/object_kw1.xml b/assets/xml/objects/object_kw1.xml
index eab561b1f..534c223b2 100644
--- a/assets/xml/objects/object_kw1.xml
+++ b/assets/xml/objects/object_kw1.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_kw1" Segment="6">
         <!-- The textures used by these limbs aren't 64-bit aligned -->
-        
+
         <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
         <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
         <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
@@ -26,14 +26,14 @@
         <!-- Arm/neck texture-->
         <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x3FC" TlutOffset="0xFC"/>
         <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C"/>
-        
+
         <!-- Possibly a skin gradient texture -->
         <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
         <Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
-        
+
         <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0xCBC" TlutOffset="0xFC"/>
         <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0xCFC" TlutOffset="0xFC"/>
-        
+
         <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C"/>
         <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0xF0C" TlutOffset="0xD3C"/>
         <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xF4C" TlutOffset="0xD3C"/>
diff --git a/assets/xml/objects/object_kz.xml b/assets/xml/objects/object_kz.xml
index 20aeec4d9..303988c60 100644
--- a/assets/xml/objects/object_kz.xml
+++ b/assets/xml/objects/object_kz.xml
@@ -14,7 +14,7 @@
         <Texture Name="gKzEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/>
         <Texture Name="gKzEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/>
         <Texture Name="gKzEyeOpen2Tex" OutName="eye_open_2" Format="ci8" Width="32" Height="32" Offset="0x2070" TlutOffset="0x970"/>
-        
+
         <Texture Name="gKzHandAndFootTex" OutName="hand_and_foot" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/>
         <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/>
         <Texture Name="gKzCloakOutlineTex" OutName="cloak_outline" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/>
diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml
index 2f3cd943c..cd5ac2900 100644
--- a/assets/xml/objects/object_link_boy.xml
+++ b/assets/xml/objects/object_link_boy.xml
@@ -4,11 +4,11 @@
 
         <!-- Far Limb DLists-->
         <DList Name="gLinkAdultWaistFarDL" Offset="0x2F530"/>
-        
+
         <DList Name="gLinkAdultRightThighFarDL" Offset="0x2F7A0"/>
         <DList Name="gLinkAdultRightLegFarDL" Offset="0x2F9B8"/>
         <DList Name="gLinkAdultRightFootFarDL" Offset="0x2FB80"/>
-        
+
         <DList Name="gLinkAdultLeftThighFarDL" Offset="0x2FCA0"/>
         <DList Name="gLinkAdultLeftLegFarDL" Offset="0x2FEC0"/>
         <DList Name="gLinkAdultLeftFootFarDL" Offset="0x30088"/>
@@ -17,11 +17,11 @@
         <DList Name="gLinkAdultTorsoFarDL" Offset="0x30250"/>
         <DList Name="gLinkAdultHeadFarDL" Offset="0x30400"/>
         <DList Name="gLinkAdultHatFarDL" Offset="0x309B0"/>
-        
+
         <DList Name="gLinkAdultRightShoulderFarDL" Offset="0x30AA0"/>
         <DList Name="gLinkAdultRightArmFarDL" Offset="0x30C48"/>
         <DList Name="gLinkAdultRightHandFarDL" Offset="0x274F8"/>
-        
+
         <DList Name="gLinkAdultLeftShoulderFarDL" Offset="0x30EF8"/>
         <DList Name="gLinkAdultLeftArmFarDL" Offset="0x310A0"/>
         <DList Name="gLinkAdultLeftHandFarDL" Offset="0x26C58"/>
@@ -41,7 +41,7 @@
         <DList Name="gLinkAdultTorsoNearDL" Offset="0x363B8"/>
         <DList Name="gLinkAdultHeadNearDL" Offset="0x365E8"/>
         <DList Name="gLinkAdultHatNearDL" Offset="0x36D30"/>
-        
+
         <DList Name="gLinkAdultRightShoulderNearDL" Offset="0x36E58"/>
         <DList Name="gLinkAdultRightArmNearDL" Offset="0x37018"/>
         <DList Name="gLinkAdultRightHandNearDL" Offset="0x22498"/>
@@ -54,13 +54,13 @@
         <DList Name="gLinkAdultHandHoldingBottleDL" Offset="0x29600"/>
 
         <!-- Bodypart DLs not directly used in the skeleton -->
-        
+
         <!-- TODO check left vs right-->
         <DList Name="gLinkAdultRightHandClosedNearDL" Offset="0x226E0"/>
         <DList Name="gLinkAdultRightHandClosedFarDL" Offset="0x27690"/>
         <DList Name="gLinkAdultLeftHandHoldingMasterSwordNearDL" Offset="0x21F78"/>
         <DList Name="gLinkAdultLeftHandHoldingMasterSwordFarDL" Offset="0x27078"/>
-        
+
         <DList Name="gLinkAdultLeftHandClosedNearDL" Offset="0x21CE8"/>
         <DList Name="gLinkAdultLeftHandClosedFarDL" Offset="0x26DF0"/>
 
@@ -70,7 +70,7 @@
 
         <DList Name="gLinkAdultLeftArmOutNearDL" Offset="0x29FA0"/>
         <DList Name="gLinkAdultLeftHandOutNearDL" Offset="0x24B58"/>
-        
+
         <!-- Limbs-->
         <Limb Name="gLinkAdultRootLimb" LimbType="LOD" Offset="0x37650"/>
         <Limb Name="gLinkAdultWaistLimb" LimbType="LOD" Offset="0x37660"/>
@@ -128,7 +128,7 @@
         <Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
         <Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>
         <Texture Name="gLinkAdultSheathBandTex" OutName="sheath_band" Format="ci8" Width="32" Height="16" Offset="0xE838" TlutOffset="0xCB40"/>
-        
+
         <Texture Name="gLinkAdultMirrorShieldLowerDesignTex" OutName="mirror_shield_lower_design" Format="ia16" Width="32" Height="64" Offset="0xB280"/>
         <Texture Name="gLinkAdultMirrorShieldUpperDesignTex" OutName="mirror_shield_upper_design" Format="ia8" Width="64" Height="32" Offset="0xC280"/>
 
@@ -141,7 +141,7 @@
         <Texture Name="gLinkAdultClosedHandSideTex" OutName="closed_hand_side" Format="ci8" Width="16" Height="16" Offset="0xDB38" TlutOffset="0xCF50"/> <!-- TODO CHECK-->
 
         <Texture Name="gLinkAdultBowBodyTex" OutName="bow_body" Format="i8" Width="8" Height="8" Offset="0xCB00"/> <!-- TODO get proper name for this-->
-        
+
         <Texture Name="gLinkAdultSwordEmblemTex" OutName="sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xEA38" TlutOffset="0xCB40"/>
 
         <Texture Name="gLinkAdultArmOutSleeveTex" OutName="arm_out_sleeve" Format="ci8" Width="16" Height="32" Offset="0xEDB8" TlutOffset="0xD078"/>
@@ -150,14 +150,14 @@
 
         <Texture Name="gLinkAdultBoot2Tex" OutName="boot_2" Format="ci8" Width="16" Height="32" Offset="0x6300" TlutOffset="0x5800"/>
         <Texture Name="gLinkAdultBootBuckleTex" OutName="boot_buckle" Format="ci8" Width="32" Height="16" Offset="0x6500" TlutOffset="0x5800"/>
-        
+
         <Texture Name="gLinkAdultEarringTex" OutName="earring" Format="ia16" Width="32" Height="32" Offset="0x7180"/>
         <!-- Bow -->
         <DList Name="gLinkAdultRightHandHoldingBowNearDL" Offset="0x22DA8"/>
         <DList Name="gLinkAdultRightHandHoldingBowFarDL" Offset="0x27B88"/>
         <DList Name="gLinkAdultRightHandHoldingBowFirstPersonDL" Offset="0x2A248"/>
         <DList Name="gLinkAdultBowStringDL" Offset="0x2B108"/>
-        
+
         <DList Name="gLinkAdultLeftHandHoldingHammerNearDL" Offset="0x233E0"/>
         <DList Name="gLinkAdultLeftHandHoldingHammerFarDL" Offset="0x28288"/>
 
@@ -185,7 +185,7 @@
         <Texture Name="gLinkAdultLegTex" OutName="leg" Format="ci8" Width="16" Height="32" Offset="0x6100" TlutOffset="0x5A00"/>
         <Texture Name="gLinkAdultBootFarTex" OutName="boot_far" Format="ci8" Width="16" Height="32" Offset="0x5600" TlutOffset="0x5400"/>
         <Texture Name="gLinkAdultBootTex" OutName="boot" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x5800"/>
-        <Texture Name="gLinkAdultCollarTex" OutName="collar" Format="rgba16" Width="16" Height="32" Offset="0x9580"/>        
+        <Texture Name="gLinkAdultCollarTex" OutName="collar" Format="rgba16" Width="16" Height="32" Offset="0x9580"/>
         <Texture Name="gLinkAdultTunicTex" OutName="tunic" Format="ci8" Width="16" Height="32" Offset="0x9380" TlutOffset="0x5A00"/>
         <Texture Name="gLinkAdultNeckTex" OutName="neck" Format="ci8" Width="16" Height="32" Offset="0x7980" TlutOffset="0x5A00"/>
         <Texture Name="gLinkAdultNose2Tex" OutName="nose2" Format="ci8" Width="16" Height="16" Offset="0x5200"/>
@@ -198,7 +198,7 @@
         <DList Name="gLinkAdultRightGauntletPlate1DL" Offset="0x25598"/>
         <DList Name="gLinkAdultRightGauntletPlate2DL" Offset="0x25658"/>
         <DList Name="gLinkAdultRightGauntletPlate3DL" Offset="0x257B8"/>
-        
+
         <Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
         <Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
 
@@ -214,12 +214,12 @@
         <Texture Name="gLinkAdultHoverBootsHeelTex" OutName="hover_boots_heel" Format="rgba16" Width="16" Height="8" Offset="0xA580"/>
         <Texture Name="gLinkAdultHoverBootsJetTex" OutName="hover_boots_jet" Format="rgba16" Width="32" Height="32" Offset="0xA680"/>
         <Texture Name="gLinkAdultHoverBootsFeatherTex" OutName="hover_boots_feather" Format="rgba16" Width="32" Height="16" Offset="0xAE80"/>
-        
+
         <!-- Sword and sheath-->
         <Texture Name="gLinkAdultSheathTex" OutName="sheath" Format="ci8" Width="32" Height="32" Offset="0xDC38" TlutOffset="0xCB40"/>
         <Texture Name="gLinkAdultSwordPommelTex" OutName="sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xD0B8" TlutOffset="0xCB40"/>
         <Texture Name="gLinkAdultSwordGuardTex" OutName="sword_guard" Format="ci8" Width="32" Height="32" Offset="0xE438" TlutOffset="0xCB40"/>
-        
+
         <!-- Eyes -->
         <Texture Name="gLinkAdultEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/>
         <Texture Name="gLinkAdultEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/>
@@ -229,16 +229,16 @@
         <Texture Name="gLinkAdultEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/>
         <Texture Name="gLinkAdultEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5C00"/>
         <Texture Name="gLinkAdultEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5C00"/>
-        
+
         <!--Mouth-->
         <Texture Name="gLinkAdultMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5C00"/>
         <Texture Name="gLinkAdultMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5C00"/>
         <Texture Name="gLinkAdultMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5C00"/>
         <Texture Name="gLinkAdultMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5C00"/>
-        
+
         <Texture Name="gLinkAdultEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5C00"/>
         <Texture Name="gLinkAdultNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5C00"/>
-        
+
         <!-- Tluts -->
         <Texture Name="gLinkAdultHeadTlut" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
         <Texture Name="gLinkAdultTlut_005E00" OutName="tlut_5E00" Format="rgba16" Width="16" Height="16" Offset="0x5E00"/>
diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml
index 1fd6f846b..3d4c48fdc 100644
--- a/assets/xml/objects/object_link_child.xml
+++ b/assets/xml/objects/object_link_child.xml
@@ -2,10 +2,10 @@
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_link_child" Segment="6">
         <Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>
-        
-        <!--Far Limb DLists--> 
-        <DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>   
-        <DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>  
+
+        <!--Far Limb DLists-->
+        <DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>
+        <DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>
         <DList Name="gLinkChildSwordAndSheathFarDL" Offset="0x17360"/>
         <DList Name="gLinkChildWaistFarDL" Offset="0x1AEC8"/>
         <DList Name="gLinkChildRightThighFarDL" Offset="0x1B0F8"/>
@@ -22,7 +22,7 @@
         <DList Name="gLinkChildRightForearmFarDL" Offset="0x1C558"/>
         <DList Name="gLinkChildLeftShoulderFarDL" Offset="0x1C688"/>
         <DList Name="gLinkChildLeftForearmFarDL" Offset="0x1C848"/>
-        
+
         <!--Near Limb DLists-->
         <DList Name="gLinkChildLeftHandNearDL" Offset="0x13CB0"/>
         <DList Name="gLinkChildRightHandNearDL" Offset="0x141C0"/>
@@ -42,7 +42,7 @@
         <DList Name="gLinkChildRightForearmNearDL" Offset="0x21CB8"/>
         <DList Name="gLinkChildLeftShoulderNearDL" Offset="0x21E18"/>
         <DList Name="gLinkChildLeftForearmNearDL" Offset="0x21FE8"/>
-        
+
         <!--Limbs-->
         <Limb Name="gLinkChildRootLimb" LimbType="LOD" Offset="0x2CDC8"/>
         <Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
@@ -65,12 +65,12 @@
         <Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
         <Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
         <Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
-        
+
         <!--General DLists-->
         <DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
         <DList Name="gLinkChildLeftHandHoldingMasterSwordDL" Offset="0x15540"/>
         <DList Name="gLinkChildGoronBraceletDL" Offset="0x16118"/>
-        
+
         <!--Body Parts not used in Limbs-->
         <DList Name="gLinkChildLeftFistNearDL" Offset="0x13E18"/>
         <DList Name="gLinkChildRightHandClosedNearDL" Offset="0x14320"/>
@@ -109,7 +109,7 @@
         <DList Name="gLinkChildDekuShieldDL" Offset="0x224F8"/>
         <Mtx Name="gLinkChildDekuShieldMtx"  Offset="0x22648"/>
         <DList Name="gLinkChildDekuShieldWithMatrixDL" Offset="0x22688"/>
-        
+
         <!--Masks-->
         <DList Name="gLinkChildSkullMaskDL" Offset="0x2AD40"/>
         <DList Name="gLinkChildSpookyMaskDL" Offset="0x2AF70"/>
@@ -119,7 +119,7 @@
         <DList Name="gLinkChildZoraMaskDL" Offset="0x2B580"/>
         <DList Name="gLinkChildGerudoMaskDL" Offset="0x2B788"/>
         <DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
-        
+
         <!--Textures-->
         <Texture Name="gLinkChildNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
         <Texture Name="gLinkChildUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
@@ -148,13 +148,13 @@
         <Texture Name="gLinkChildSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
         <Texture Name="gLinkChildSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x27520"/>
         <Texture Name="gLinkChildSkullMaskEyeTex" OutName="skull_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x23B20"/>
-        
+
         <Texture Name="gLinkChildSpookyMaskTex" OutName="spooky_mask" Format="ia16" Width="32" Height="64" Offset="0x226A0"/>
         <Texture Name="gLinkChildKeatonMaskEyeBrowTex" OutName="keaton_mask_eye_brow" Format="rgba16" Width="32" Height="16" Offset="0x236A0"/>
         <Texture Name="gLinkChildKeatonMaskEarTex" OutName="keaton_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x23AA0"/>
         <Texture Name="gLinkChildMaskOfTruthCurveTex" OutName="mask_of_truth_curves" Format="rgba16" Width="16" Height="32" Offset="0x24D20"/>
         <Texture Name="gLinkChildMaskOfTruthTex" OutName="mask_of_truth" Format="rgba16" Width="32" Height="64" Offset="0x23D20"/>
-        
+
         <Texture Name="gLinkChildGoronMaskMouthTex" OutName="goron_mask_mouth" Format="rgba16" Width="64" Height="32" Offset="0x25120"/>
         <Texture Name="gLinkChildGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x26120"/>
         <Texture Name="gLinkChildGoronMaskNoseTex" OutName="goron_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x26920"/>
@@ -174,14 +174,14 @@
         <Texture Name="gLinkChildBunnyHoodEyeTex" OutName="bunny_hood_eye" Format="rgba16" Width="16" Height="16" Offset="0x2BA28"/>
         <Texture Name="gLinkChildBunnyHoodTex" OutName="bunny_hood" Format="rgba16" Width="16" Height="32" Offset="0x2BC28"/>
         <Texture Name="gLinkChildBunnyHoodEarTex" OutName="bunny_hood_ear" Format="rgba16" Width="16" Height="32" Offset="0x2C028"/>
-        
+
         <!--TLUTs-->
         <Texture Name="gLinkChildSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
         <Texture Name="gLinkChildHandTLUT" OutName="hand_tlut" Format="rgba16" Width="17" Height="4" Offset="0x9E88"/>
         <Texture Name="gLinkChildSwordsTLUT" OutName="swords_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9F10"/> <!--For both the kokiri sword sheath and master sword-->
         <Texture Name="gLinkChildSwordTLUT" OutName="sword_tlut" Format="rgba16" Width="27" Height="4" Offset="0xA118"/>
         <Texture Name="gLinkChildBeltTLUT" OutName="belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
-        
+
         <!--Eyes-->
         <Texture Name="gLinkChildEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
         <Texture Name="gLinkChildEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
@@ -191,7 +191,7 @@
         <Texture Name="gLinkChildEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
         <Texture Name="gLinkChildEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
         <Texture Name="gLinkChildEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
-        
+
         <!--Mouth-->
         <Texture Name="gLinkChildMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
         <Texture Name="gLinkChildMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
@@ -202,7 +202,7 @@
         <Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08" Static="On">
             <Vtx/>
         </Array>
-        
+
         <Array Name="gLinkChildVtx_01A428" Count="39" Offset="0x1A428" Static="On">
             <Vtx/>
         </Array>
@@ -222,5 +222,5 @@
         <Array Name="gLinkChildVtx_01FA28" Count="62" Offset="0x1FA28" Static="On">
             <Vtx/>
         </Array>
-    </File> 
+    </File>
 </Root>
diff --git a/assets/xml/objects/object_ma1.xml b/assets/xml/objects/object_ma1.xml
index 63eeb3895..466670e18 100644
--- a/assets/xml/objects/object_ma1.xml
+++ b/assets/xml/objects/object_ma1.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_ma1" Segment="6">
         <Skeleton Name="gMalonChildSkel" Type="Flex" LimbType="Standard" Offset="0x8460"/>
-    
+
         <Limb Name="gMalonChildRootLimb" LimbType="Standard" Offset="0x8340"/>
         <Limb Name="gMalonChildLeftThighLimb" LimbType="Standard" Offset="0x834C"/>
         <Limb Name="gMalonChildLeftShinLimb" LimbType="Standard" Offset="0x8358"/>
diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml
index ce5910fb8..0b6eabff7 100644
--- a/assets/xml/objects/object_ma2.xml
+++ b/assets/xml/objects/object_ma2.xml
@@ -21,7 +21,7 @@
         <Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
         <Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
         <Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
-        
+
         <Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
         <Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
 
diff --git a/assets/xml/objects/object_mizu_objects.xml b/assets/xml/objects/object_mizu_objects.xml
index 1abd73bc0..f25c29d6c 100644
--- a/assets/xml/objects/object_mizu_objects.xml
+++ b/assets/xml/objects/object_mizu_objects.xml
@@ -10,7 +10,7 @@
         <Collision Name="gObjectMizuObjectsMovebgCol_0015F8" Offset="0x15F8"/>
         <DList Name="gObjectMizuObjectsMovebgDL_002E10" Offset="0x2E10"/>
         <Collision Name="gObjectMizuObjectsMovebgCol_003590" Offset="0x3590"/>
-        
+
         <DList Name="gObjectMizuObjectsBwallDL_001770" Offset="0x1770"/>
         <DList Name="gObjectMizuObjectsBwallDL_001A30" Offset="0x1A30"/>
         <Collision Name="gObjectMizuObjectsBwallCol_001C58" Offset="0x1C58"/>
@@ -25,17 +25,17 @@
         <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/>
         <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/>
         <DList Name="gWaterTempleDoorRightDL" Offset="0x4A10"/>
-        
+
         <DList Name="gObjectMizuObjectsWaterDL_004B20" Offset="0x4B20"/>
-        
+
         <DList Name="gObjectMizuObjectsDoorShutterDL_005D90" Offset="0x5D90"/>
         <DList Name="gObjectMizuObjectsDoorShutterDL_007000" Offset="0x7000"/>
-        
+
         <DList Name="gObjectMizuObjectsShutterDL_007130" Offset="0x7130"/>
         <Collision Name="gObjectMizuObjectsShutterCol_007250" Offset="0x7250"/>
         <DList Name="gObjectMizuObjectsShutterDL_0072D0" Offset="0x72D0"/>
         <Collision Name="gObjectMizuObjectsShutterCol_0073F0" Offset="0x73F0"/>
-        
+
         <Collision Name="gObjectMizuObjectsUzuCol_0074EC" Offset="0x74EC"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_mo.xml b/assets/xml/objects/object_mo.xml
index a0e8ded40..df4b5c640 100644
--- a/assets/xml/objects/object_mo.xml
+++ b/assets/xml/objects/object_mo.xml
@@ -2,7 +2,7 @@
     <File Name="object_mo" Segment="6">
         <!-- Morpha's Title Card -->
         <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
-        
+
         <!-- DLists for Morpha's Core -->
         <DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
         <DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
@@ -63,12 +63,12 @@
         <!-- Unused content -->
 
         <!-- This is the dlist for EnVbBall for some reason. -->
-        <DList Name="gMorphaDL_000550" Offset="0x550"/> 
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
 
         <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
         <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
         <DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>
-        
+
         <Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_ms.xml b/assets/xml/objects/object_ms.xml
index a87d0e6b3..66923df8a 100644
--- a/assets/xml/objects/object_ms.xml
+++ b/assets/xml/objects/object_ms.xml
@@ -2,7 +2,7 @@
     <File Name="object_ms" Segment="6">
         <!-- Bean Salesman Skeleton -->
         <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x3DC0"/>
-        
+
         <!-- Bean Salesman Limbs -->
         <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" Offset="0x3D40"/>
         <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x3D4C"/>
diff --git a/assets/xml/objects/object_oF1d_map.xml b/assets/xml/objects/object_oF1d_map.xml
index c4f3a41f8..079189319 100644
--- a/assets/xml/objects/object_oF1d_map.xml
+++ b/assets/xml/objects/object_oF1d_map.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="object_oF1d_map" Segment="6">      
+    <File Name="object_oF1d_map" Segment="6">
         <!-- animations -->
         <Animation Name="gGoronAnim_000750" Offset="0x750"/>
         <Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
@@ -12,13 +12,13 @@
         <Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
         <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
         <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
-      
+
         <DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
         <DList Name="gGoronDL_00C140" Offset="0xC140"/>
 
         <DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
         <DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
-      
+
         <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
 
         <!-- Eye textures -->
@@ -30,6 +30,6 @@
         <!-- Mouth textures -->
         <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80"/>
         <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680"/>
-      
+
     </File>
 </Root>
diff --git a/assets/xml/objects/object_owl.xml b/assets/xml/objects/object_owl.xml
index fdc64b3aa..e6fa5ca37 100644
--- a/assets/xml/objects/object_owl.xml
+++ b/assets/xml/objects/object_owl.xml
@@ -53,11 +53,11 @@
         <Animation Name="gOwlGlideAnim" Offset="0xC1C4"/>
         <Animation Name="gOwlUnfoldWingsAnim" Offset="0xC684"/>
         <Animation Name="gOwlPerchAnim" Offset="0xC8A0"/>
-        
-        <!-- Owl Perching Skeleton -->
-        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>  
 
-        <!-- Eye Textures -->      
+        <!-- Owl Perching Skeleton -->
+        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>
+
+        <!-- Eye Textures -->
         <Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8"/>
         <Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8"/>
         <Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8"/>
diff --git a/assets/xml/objects/object_po_sisters.xml b/assets/xml/objects/object_po_sisters.xml
index e0c9f0834..775284344 100644
--- a/assets/xml/objects/object_po_sisters.xml
+++ b/assets/xml/objects/object_po_sisters.xml
@@ -18,11 +18,11 @@
         <DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
         <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
         <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
-        <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/> 
-        <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/> 
-        <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/> 
-        <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/> 
+        <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/>
+        <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/>
+        <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/>
+        <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/>
         <Collision Name="gPoSistersAmyBlockCol" Offset="0x7860"/>
-        <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/> 
+        <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ru1.xml b/assets/xml/objects/object_ru1.xml
index 3d413619f..482949c90 100644
--- a/assets/xml/objects/object_ru1.xml
+++ b/assets/xml/objects/object_ru1.xml
@@ -38,10 +38,10 @@
         <DList Name="gRutoChildLeftFinDL" Offset="0xDAC0"/>
         <DList Name="gRutoChildLeftHandDL" Offset="0xDDA8"/>
         <DList Name="gRutoChildHeadDL" Offset="0x119F8"/>
-        
+
         <Texture Name="gRutoChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xE038"/>
         <Texture Name="gRutoChildMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="12" Offset="0xE238"/>
-        
+
         <Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8" TlutOffset="0xE038"/>
         <Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238" TlutOffset="0xE038"/>
         <Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638" TlutOffset="0xE038"/>
@@ -60,9 +60,9 @@
         <Texture Name="gRutoChildUnkHeadCircleTex" OutName="tex_0000F038" Format="rgba16" Width="16" Height="16" Offset="0xF038"/> <!-- TODO rename me-->
         <Texture Name="gRutoChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x12200"/>
         <Texture Name="gRutoChildCircleGradientTex" OutName="circle_gradient" Format="rgba16" Width="16" Height="16" Offset="0x12400"/>
-        
+
         <Skeleton Name="gRutoChildSkel" Type="Flex" LimbType="Standard" Offset="0x12700"/>
-        
+
         <Limb Name="gRutoChildRootLimb" LimbType="Standard" Offset="0x12600"/>
         <Limb Name="gRutoChildLeftThighLimb" LimbType="Standard" Offset="0x1260C"/>
         <Limb Name="gRutoChildLeftShinLimb" LimbType="Standard" Offset="0x12618"/>
diff --git a/assets/xml/objects/object_ru2.xml b/assets/xml/objects/object_ru2.xml
index 2a8d70af3..d6cea2291 100644
--- a/assets/xml/objects/object_ru2.xml
+++ b/assets/xml/objects/object_ru2.xml
@@ -49,7 +49,7 @@
         <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
         <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
         <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
-        
+
         <!-- 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"/>
@@ -58,7 +58,7 @@
         <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="gAdultRutoSkinGradient" 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"/>
diff --git a/assets/xml/objects/object_sa.xml b/assets/xml/objects/object_sa.xml
index a19446453..8a6384040 100644
--- a/assets/xml/objects/object_sa.xml
+++ b/assets/xml/objects/object_sa.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_sa" Segment="6">
         <Skeleton Name="gSariaSkel" Type="Flex" LimbType="Standard" Offset="0xB1A0"/>
-        
+
         <Limb Name="gSariaRootLimb" LimbType="Standard" Offset="0xB0A0"/>
         <Limb Name="gSariaWaistLimb" LimbType="Standard" Offset="0xB0AC"/>
         <Limb Name="gSariaLeftThighLimb" LimbType="Standard" Offset="0xB0B8"/>
@@ -72,7 +72,7 @@
         <Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
 
         <Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
-        <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/> 
+        <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/>
         <Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
         <Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
         <Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
diff --git a/assets/xml/objects/object_sd.xml b/assets/xml/objects/object_sd.xml
index c72efeae1..c872472e7 100644
--- a/assets/xml/objects/object_sd.xml
+++ b/assets/xml/objects/object_sd.xml
@@ -52,7 +52,7 @@
         <Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
         <Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
         <Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
-        
+
         <!--Normal Guard Textures-->
         <Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
         <Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
diff --git a/assets/xml/objects/object_skj.xml b/assets/xml/objects/object_skj.xml
index 3abdd610f..9d9c1c3a0 100644
--- a/assets/xml/objects/object_skj.xml
+++ b/assets/xml/objects/object_skj.xml
@@ -23,7 +23,7 @@
         <Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
         <!--<Limb Name="gSkullKidRightHandLimb" LimbType="Standard" Offset="0x5EF8"/> ZAPD doesnt extract this limb correctly for some reason-->
         <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
-        
+
         <!--Limb DLists-->
         <DList Name="gSkullKidLeftUpperLegDL" Offset="0x3B90"/>
         <DList Name="gSkullKidLeftLowerLegDL" Offset="0x3C88"/>
@@ -52,7 +52,7 @@
         <Animation Name="gSkullKidFightingStanceAnim" Offset="0x8374"/>
         <Animation Name="gSkullKidWaitAnim" Offset="0x8B9C"/>
         <Animation Name="gSkullKidWalkToPlayerAnim" Offset="0x8E14"/>
-        
+
         <Texture Name="gSkullKidSkullMaskTex" OutName="skull_mask" Format="rgba16" Width="16" Height="16" Offset="0xF08"/>
         <Texture Name="gSkullKidSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1108"/>
         <Texture Name="gSkullKidSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x1188"/>
diff --git a/assets/xml/objects/object_spot00_break.xml b/assets/xml/objects/object_spot00_break.xml
index d3be88315..bee1361fa 100644
--- a/assets/xml/objects/object_spot00_break.xml
+++ b/assets/xml/objects/object_spot00_break.xml
@@ -7,7 +7,7 @@
         <Collision Name="gBrokenDrawbridgeCol" Offset="0x908"/>
 
         <DList Name="gBarbedWireFenceDL" Offset="0x980"/>
-        <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>  
+        <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>
         <Collision Name="gBarbedWireFenceCol" Offset="0xAF0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_spot06_objects.xml b/assets/xml/objects/object_spot06_objects.xml
index e3da63b0f..5084fd244 100644
--- a/assets/xml/objects/object_spot06_objects.xml
+++ b/assets/xml/objects/object_spot06_objects.xml
@@ -16,9 +16,9 @@
         <DList Name="gLakeHyliaZoraShortcutIceblockDL" Offset="0x1160"/>
         <Texture Name="gLakeHyliaZoraShortcutIceblockTex" OutName="zora_shortcut_iceblock" Format="rgba16" Width="16" Height="16" Offset="0x0F20"/>
         <Collision Name="gLakeHyliaZoraShortcutIceblockCol" Offset="0x1238"/>
-        
+
         <!-- Lake Hylia Water Temple Key -->
         <DList Name="gLakeHyliaWaterTempleKeyDL" Offset="0x2490"/>
-        <Texture Name="gLakeHyliaWaterTempleKeyTex" OutName="water_temple_key" Format="rgba16" Width="32" Height="64" Offset="0x1270"/>     
+        <Texture Name="gLakeHyliaWaterTempleKeyTex" OutName="water_temple_key" Format="rgba16" Width="32" Height="64" Offset="0x1270"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_spot08_obj.xml b/assets/xml/objects/object_spot08_obj.xml
index 4d71f3473..8d2aa760c 100644
--- a/assets/xml/objects/object_spot08_obj.xml
+++ b/assets/xml/objects/object_spot08_obj.xml
@@ -15,13 +15,13 @@
         <Texture Name="gZorasFountainIceberg2TLUT" OutName="iceberg_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x1950"/>
         <Texture Name="gZorasFountainIcebergSideTex" OutName="iceberg_side" Format="ci4" Width="64" Height="64" Offset="0x1970" TlutOffset="0x1930"/>
         <Texture Name="gZorasFountainIcebergTopTex" OutName="iceberg_top" Format="ci4" Width="64" Height="64" Offset="0x2170" TlutOffset="0x1950"/>
-        <Texture Name="gZorasFountainIcebergUndersideTex" OutName="iceberg_underside" Format="rgba16" Width="64" Height="8" Offset="0x3A00"/> 
+        <Texture Name="gZorasFountainIcebergUndersideTex" OutName="iceberg_underside" Format="rgba16" Width="64" Height="8" Offset="0x3A00"/>
         <Collision Name="gZorasFountainIcebergCol" Offset="0x2FD8"/>
 
         <!-- Zora's Fountain Bombable Wall -->
         <DList Name="gZorasFountainBombableWallDL" Offset="0x3898"/>
         <Texture Name="gZorasFountainBombableWallTLUT" OutName="bombable_wall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3010"/>
         <Texture Name="gZorasFountainBombableWallTex" OutName="bombable_wall" Format="ci4" Width="128" Height="32" Offset="0x3038" TlutOffset="0x3010"/>
-        <Collision Name="gZorasFountainBombableWallCol" Offset="0x39D4"/> 
+        <Collision Name="gZorasFountainBombableWallCol" Offset="0x39D4"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_spot16_obj.xml b/assets/xml/objects/object_spot16_obj.xml
index d39de812a..b7a6ff4d5 100644
--- a/assets/xml/objects/object_spot16_obj.xml
+++ b/assets/xml/objects/object_spot16_obj.xml
@@ -6,6 +6,6 @@
         <DList Name="gDeathMountainRingDL" Offset="0x1470"/>
         <Texture Name="gDodongosCavernRockTex" OutName="rock_tex" Format="i4" Width="64" Height="64" Offset="0x0000"/>
         <Texture Name="gDeathMountainRingTex" OutName="smoke_ring" Format="ia16" Width="32" Height="32" Offset="0x0C30"/>
-        
+
     </File>
 </Root>
diff --git a/assets/xml/objects/object_sst.xml b/assets/xml/objects/object_sst.xml
index dc7ca242c..378351b22 100644
--- a/assets/xml/objects/object_sst.xml
+++ b/assets/xml/objects/object_sst.xml
@@ -3,7 +3,7 @@
     <File Name="object_sst" Segment="6">
         <!-- Boss Title Card -->
         <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
-        
+
         <!-- Skeletons -->
         <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
         <Skeleton Name="gBongoRightHandSkel" Type="Flex" LimbType="Standard" Offset="0x0A350"/>
diff --git a/assets/xml/objects/object_wf.xml b/assets/xml/objects/object_wf.xml
index ebfb708d2..96ea84103 100644
--- a/assets/xml/objects/object_wf.xml
+++ b/assets/xml/objects/object_wf.xml
@@ -6,7 +6,7 @@
         <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"/>
         <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300"/>
-        
+
         <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20"/>
         <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8"/>
         <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8"/>
@@ -21,10 +21,10 @@
         <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490"/>
         <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0"/>
         <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8"/>
-        
+
         <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"/>
-        
+
         <DList Name="gWolfosWhiteTailDL" Offset="0x3488"/>
         <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528"/>
         <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0"/>
diff --git a/assets/xml/objects/object_zl1.xml b/assets/xml/objects/object_zl1.xml
index c7082a3db..1b8355060 100644
--- a/assets/xml/objects/object_zl1.xml
+++ b/assets/xml/objects/object_zl1.xml
@@ -96,7 +96,7 @@
         <Texture Name="gChildZelda1MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0"/>
         <Texture Name="gChildZelda1MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0"/>
         <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0"/>
-        
+
         <!-- Animations -->
         <Animation Name="gChildZelda1Anim_00438" Offset="0x00438"/>
         <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38"/>
diff --git a/assets/xml/objects/object_zl4.xml b/assets/xml/objects/object_zl4.xml
index b43e5ba34..e87a65465 100644
--- a/assets/xml/objects/object_zl4.xml
+++ b/assets/xml/objects/object_zl4.xml
@@ -43,7 +43,7 @@
         <Texture Name="gChildZeldaMouthHappyTex" OutName="child_zelda_mouth_happy" Format="i8" Width="32" Height="32" Offset="0x4AF0"/>
         <Texture Name="gChildZeldaMouthWorriedTex" OutName="child_zelda_mouth_worried" Format="i8" Width="32" Height="32" Offset="0x4EF0"/>
         <Texture Name="gChildZeldaMouthSurprisedTex" OutName="child_zelda_mouth_surprised" Format="i8" Width="32" Height="32" Offset="0x52F0"/>
-        
+
         <!-- Child Zelda's eye textures -->
         <Texture Name="gChildZeldaEyeOpenTex" OutName="child_zelda_eye_open" Format="i8" Width="32" Height="32" Offset="0x2AF0"/>
         <Texture Name="gChildZeldaEyeBlinkTex" OutName="child_zelda_eye_blink" Format="i8" Width="32" Height="32" Offset="0x2EF0"/>
diff --git a/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml b/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml
index 871c97b40..6b9a9a744 100644
--- a/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml
+++ b/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -1,13 +1,13 @@
 <Root>
     <File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80875920" RangeStart="0x11C0" RangeEnd="0x259C">
         <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x11C0"/>
-        
+
         <Array Name="sPlatformTopVtx" Count="4" Offset="0x19C8">
             <Vtx/>
         </Array>
         <DList Name="sPlatformMaterialDL" Offset="0x1A08"/>
         <DList Name="sPlatformTopDL" Offset="0x1A90"/>
-        
+
         <Array Name="sPlatformBottomVtx" Count="4" Offset="0x1AA8">
             <Vtx/>
         </Array>
@@ -23,7 +23,7 @@
             <Vtx/>
         </Array>
         <DList Name="sFlashDL" Offset="0x23D8"/>
-        
+
         <Collision Name="sCol" Offset="0x2570"/>
     </File>
 </Root>
diff --git a/assets/xml/overlays/ovl_Bg_Jya_Cobra.xml b/assets/xml/overlays/ovl_Bg_Jya_Cobra.xml
index 4e40918f8..874bb1ec6 100644
--- a/assets/xml/overlays/ovl_Bg_Jya_Cobra.xml
+++ b/assets/xml/overlays/ovl_Bg_Jya_Cobra.xml
@@ -5,6 +5,6 @@
         </Array>
 
         <DList Name="sShadowDL" Offset="0x19C0"/>
-    
+
     </File>
 </Root>
diff --git a/assets/xml/overlays/ovl_Boss_Ganon.xml b/assets/xml/overlays/ovl_Boss_Ganon.xml
index 49cd1b24a..e84792fa3 100644
--- a/assets/xml/overlays/ovl_Boss_Ganon.xml
+++ b/assets/xml/overlays/ovl_Boss_Ganon.xml
@@ -12,7 +12,7 @@
         <Texture Name="gDorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x18200" Static="Off"/>
         <Texture Name="gDorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18E00" Static="Off"/>
         <Texture Name="gDorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19A00" Static="Off"/>
-        
+
         <Texture Name="gDorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="ci8" Width="32" Height="64" Offset="0xFD38" Static="Off"/>
 
         <DList Name="gDorfLightStreak1DL" Offset="0x1FCF0" Static="Off"/>
diff --git a/assets/xml/overlays/ovl_En_Bili.xml b/assets/xml/overlays/ovl_En_Bili.xml
index 483a2fcd4..35c3fa301 100644
--- a/assets/xml/overlays/ovl_En_Bili.xml
+++ b/assets/xml/overlays/ovl_En_Bili.xml
@@ -2,6 +2,6 @@
     <File Name="ovl_En_Bili" BaseAddress="0x809BF8A0" RangeStart="0x1E50" RangeEnd="0x1E70">
         <DList Name="D_809C16F0" Offset="0x1E50"/>
         <DList Name="D_809C1700" Offset="0x1E60"/>
-    
+
     </File>
 </Root>
diff --git a/assets/xml/overlays/ovl_End_Title.xml b/assets/xml/overlays/ovl_End_Title.xml
index 82dceca25..841d45f6d 100644
--- a/assets/xml/overlays/ovl_End_Title.xml
+++ b/assets/xml/overlays/ovl_End_Title.xml
@@ -6,12 +6,12 @@
         <Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x2140"/>
         <Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2D40"/>
         <Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x3940"/>
-        
+
         <Array Name="sTriforceVtx" Count="6" Offset="0x3F40">
             <Vtx/>
         </Array>
         <DList Name="sTriforceDL" Offset="0x3FA0"/>
-        
+
         <DList Name="sPresentedByNintendoDL" Offset="0x4000"/>
     </File>
 </Root>
diff --git a/assets/xml/scenes/dungeons/ddan.xml b/assets/xml/scenes/dungeons/ddan.xml
index f6572b9f8..197839bde 100644
--- a/assets/xml/scenes/dungeons/ddan.xml
+++ b/assets/xml/scenes/dungeons/ddan.xml
@@ -12,7 +12,7 @@
         <Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78"/>
         <Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78"/>
         <Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78"/>
-        
+
         <Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
         <Scene Name="ddan_scene" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/overworld/souko.xml b/assets/xml/scenes/overworld/souko.xml
index 508beb85d..bc6336b36 100644
--- a/assets/xml/scenes/overworld/souko.xml
+++ b/assets/xml/scenes/overworld/souko.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="souko_scene" Segment="2">
-        <Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/> 
-        <Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/> 
+        <Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/>
+        <Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/>
         <Scene Name="souko_scene" Offset="0x0"/>
     </File>
     <File Name="souko_room_0" Segment="3">
diff --git a/docs/Documenting.md b/docs/Documenting.md
index f8b356649..03a12ebbd 100644
--- a/docs/Documenting.md
+++ b/docs/Documenting.md
@@ -4,9 +4,9 @@
 This project uses [Doxygen](https://www.doxygen.nl/index.html) to generate documentation pages from comments found in the source files. This guide focuses on writing compatible comments and ensuring consistency across the codebase.
 ```diff
 - Note -
-As the codebase is constantly changing, only document what is complete, well-understood and not 
+As the codebase is constantly changing, only document what is complete, well-understood and not
 already covered by good naming. This is especially true for function parameters and return values.
-Also note that there is no obligation to completing the documentation steps for functions you 
+Also note that there is no obligation to completing the documentation steps for functions you
 work on if you do not want to at the time.
 ```
 To generate a doxygen manual for the project, ensure you have doxygen installed and then cd into the project root directory and run `doxygen Doxyfile`.
@@ -97,4 +97,4 @@ For centered rendering on a separate line:
 /**
  * \f[ \textrm{Your LaTeX Here} \f]
  */
-```
\ No newline at end of file
+```
diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md
index 9c5aa45f1..c9421ffd3 100644
--- a/docs/tutorial/beginning_decomp.md
+++ b/docs/tutorial/beginning_decomp.md
@@ -60,8 +60,8 @@ The above is a rough ordering for the beginner. As you become more experienced,
 
 Associated to each actor is a `.data` file, containing data that the actor uses. This ranges from spawn positions, to display lists, to even some cutscene data. Since the structure of the data is very inconsistent between actors, automatic importing has been very limited, so the vast majority must be done manually.
 
-There are two ways of transfering the data into an actor: we can either 
-- import it all naively as words (`s32`s), which will still allow it to compile, and sort out the actual types later, or 
+There are two ways of transfering the data into an actor: we can either
+- import it all naively as words (`s32`s), which will still allow it to compile, and sort out the actual types later, or
 - we can extern each piece of data as we come across it, and come back to it later when we have a better idea of what it is.
 
 We will concentrate on the second here; the other is covered in [the document about data](data.md). Thankfully this means we essentially don't have to do anything to the data yet. Nevertheless, it is often quite helpful to copy over at least some of the data and leave it commented out for later replacement. *Data must go in the same order as in the data file, and data is "all or nothing": you cannot only import some of it*.
@@ -93,7 +93,7 @@ from the main directory of the repository. In this case, the C file is `src/over
 
 ![Copying the context](images/ctx.png)
 
-Now, open the file containing the assembly for `EnJj_Init`. 
+Now, open the file containing the assembly for `EnJj_Init`.
 
 ![Copying the Init asm](images/init_asm.png)
 
@@ -117,7 +117,7 @@ void EnJj_Init(EnJj *this, GlobalContext *globalCtx) {
     ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
     temp_v0 = this->actor.params;
     temp_a1 = this + 0x164;
-	[...]
+    [...]
 ```
 
 Typically for all buth the simplest functions, there is a lot that needs fixing before we are anywhere near seeing how close we are to the original code. You will notice that mips2c creates a lot of temporary variables. Usually most of these will turn out to not be real, and we need to remove the right ones to get the code to match.
@@ -217,7 +217,7 @@ void EnJj_Init(Actor *thisx, GlobalContext *globalCtx) {
 In the next sections, we shall sort out the various initialisation functions that occur in Init. There are several types, and one of the reasons we are using EnJj as the example is that it has several of the most common ones. A disadvantage of this actor is that it has an unusually complicated Init: we can see that it does three different things depending on the value of its params.
 
 ### Init chains
- 
+
 Almost always, one of the first items in `Init` is a function that looks like
 
 ```C
@@ -324,7 +324,7 @@ this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this-
 Next, replace `(DynaPolyActor *) this` by `&this->dyna`. There's not a lot more we can do to the DynaPoly stuff right now, so just remove the casts to void and move on.
 
 ### Colliders
- 
+
 The next common thing that actors have is colliders. Not every actor has these, but most do, even if they don't just use them for collision system purposes.
 
 The relevant functions in this actor are
@@ -355,7 +355,7 @@ Collider_SetCylinder(globalCtx, &this->collider, &this->dyna.actor, &D_80A88CB4)
 
 (You may prefer to just comment out temps initially, to keep track of where they were.)
 
-The last thing we need to deal with is the last variable of `Collider_SetCylinder`, which is again data. 
+The last thing we need to deal with is the last variable of `Collider_SetCylinder`, which is again data.
 
 <!--Also again we have a script to translate the raw data. This one is called `colliderinit.py`, and lives in `tools/overlayhelpers`. It takes the VRAM address of the data and the type of collider (for more info on use, pass it `-h`). We find
 ```
@@ -575,7 +575,7 @@ Unfortunately the others are not so easy to deal with. In order to find out what
 
 ```MIPS
 glabel func_80A87800
-/* 00000 80A87800 03E00008 */  jr      $ra                        
+/* 00000 80A87800 03E00008 */  jr      $ra
 /* 00004 80A87804 AC8502FC */  sw      $a1, 0x02FC($a0)           ## 000002FC
 ```
 
@@ -593,7 +593,7 @@ Put this between `struct EnJj;` and the actor struct in the header file. This al
 We have actually learnt three useful pieces of information from this, the other two being that the function above Init is simply
 ```C
 void func_80A87800(EnJj* this, EnJjActionFunc actionFunc) {
-	this->actionFunc = actionFunc;
+    this->actionFunc = actionFunc;
 }
 ```
 
@@ -695,7 +695,7 @@ extern UNK_TYPE D_0600BA8C;
 
 // #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87800.s")
 void func_80A87800(EnJj* this, EnJjActionFunc actionFunc) {
-	this->actionFunc = actionFunc;
+    this->actionFunc = actionFunc;
 }
 
 // #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s")
@@ -904,7 +904,7 @@ except we still have some stack issues. Now that `temp_v0` is only used once, it
 void EnJj_Init(Actor* thisx, GlobalContext* globalCtx2) {
     GlobalContext* globalCtx = globalCtx2;
     EnJj* this = THIS;
-	...
+    ...
 ```
 
 It turns out that this is enough to completely fix the diff:
diff --git a/docs/tutorial/contents.md b/docs/tutorial/contents.md
index c4a729141..477dc3bc6 100644
--- a/docs/tutorial/contents.md
+++ b/docs/tutorial/contents.md
@@ -12,29 +12,29 @@
 ## Decompilation
 
 - [Begining decompilation: order, Init and the actor struct](beginning_decomp.md)
-	- Order of decompilation
-	- Init and common actor features
-		- Initchains
-		- Actors and dynapoly actors
-		- Colliders
-		- Skelanime
-	
-	- Matching
-		- Using diff
-		- control flow (branches) -> instruction ordering -> register allocation -> stack
+    - Order of decompilation
+    - Init and common actor features
+        - Initchains
+        - Actors and dynapoly actors
+        - Colliders
+        - Skelanime
+
+    - Matching
+        - Using diff
+        - control flow (branches) -> instruction ordering -> register allocation -> stack
 
 - [The rest of the functions in the actor](other_functions.md)
     - Order of decompilation
     - Action Functions and other functions
 
-	- More on matching: the permuter
+    - More on matching: the permuter
 
 - [Draw functions](draw_functions.md)
 
 - [Data, migration and non-migration](data.md)
-	- Importing the data: early and late
-	- Fake symbols
-	- Inlining
+    - Importing the data: early and late
+    - Fake symbols
+    - Inlining
 
 ## [Object Decompilation](object_decomp.md)
 - Object files
@@ -46,9 +46,9 @@
 
 - [Preparing to merge](merging.md)
     - Preliminary documentation
-	- Preparing to PR
-	- Pull Requests
-	- Trello
+    - Preparing to PR
+    - Pull Requests
+    - Trello
 
 ## Appendices
 - [Types, Structs and Padding](types_structs_padding.md) (a miscellany of useful stuff)
diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md
index 1eead47c0..d3d1648d0 100644
--- a/docs/tutorial/data.md
+++ b/docs/tutorial/data.md
@@ -10,8 +10,8 @@
 
 Each actor's data is stored in a separate file. EnJj's data is in `data/overlays/actors/z_en_jj.data.s`, for example. At some point in the decompilation process we need to convert this raw data into recognisable information for the C to use.
 
-There are two main ways to do this: either 
-1. import the data first and type it later, or 
+There are two main ways to do this: either
+1. import the data first and type it later, or
 2. wait until the data appears in functions, extern it, then import it at the end
 
 Sometimes something between these two is appropriate: wait until the largest or strangest bits of data appear in functions, get some typing information out of that, and then import it, but for now, let's stick to both of these.
@@ -123,7 +123,7 @@ beginseg
     include "build/data/overlays/actors/z_en_tg.reloc.o"
 endseg
 ```
-and comment out the .data line, 
+and comment out the .data line,
 ```
 beginseg
     name "ovl_En_Tg"
@@ -211,7 +211,7 @@ void func_80B1871C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
     EnTg* this = THIS;
 
     Vec3f sp18 = D_80B18968;
-    
+
     if (limbIndex == 9) {
         Matrix_MultVec3f(&sp18, &this->actor.world2.pos);
     }
diff --git a/docs/tutorial/draw_functions.md b/docs/tutorial/draw_functions.md
index 4ad086778..8678ac03c 100644
--- a/docs/tutorial/draw_functions.md
+++ b/docs/tutorial/draw_functions.md
@@ -30,8 +30,8 @@ EnJj* this = THIS;
 in the declarations as before. From now on, the process is rather different from the decompilation process used for the other functions. Here is the output of mips2c after sorting out the actor struct from Init, and with the arguments set back to `Actor* thisx`:
 ```C
 void EnJj_Draw(Actor *thisx, GlobalContext *globalCtx) {
-	EnJj* this = THIS;
-	
+    EnJj* this = THIS;
+
     GraphicsContext *sp4C;
     Gfx *sp3C;
     EnJj *sp18;
@@ -166,7 +166,7 @@ Lastly, the penultimate and antepenultimate arguments of `SkelAnime_DrawFlexOpa`
 
 For more examples of graphics macros and the structure of Draw functions, we look at a function from `EnDntNormal`, which is some Deku Scrubs used in the minigame stuff in Lost Woods. This has a good selection of macros, and two functions that are commonly combined with Draw, namely OverrideLimbDraw and PostLimbDraw.
 
-The mips2c output for 
+The mips2c output for
 
 ```C
 void func_809F5A6C(Actor *thisx, GlobalContext *globalCtx) {
@@ -289,7 +289,8 @@ static Color_RGBA8 D_809F5E4C[] = {
     { 255, 255, 255, 255 }, { 255, 195, 175, 255 }, { 210, 255, 0, 255 },
     { 255, 255, 255, 255 }, { 210, 255, 0, 255 },   { 255, 195, 175, 255 },
     { 255, 255, 255, 255 }, { 255, 195, 175, 255 }, { 210, 255, 0, 255 },
-};```
+};
+```
 
 Now, we have two things to worry about: how to implement the negative pointer access, and how the second word is built. Negative accesses can be done by just subtracting 1, so that
 ```C
@@ -304,7 +305,7 @@ or rather, since it is a `Color_RGB8`,
 temp_v0_3->words.w1 = (temp_v1.b << 8) | (temp_v1.r << 0x18) | (temp_v1.g << 0x10) | 0xFF;
 ```
 
-The last thing to worry about is how to put this word into the macro. Let's think aboout what the word actually is in a concrete case; it is easiest to see what is going on in hex, so suppose we are in the case
+The last thing to worry about is how to put this word into the macro. Let's think about what the word actually is in a concrete case; it is easiest to see what is going on in hex, so suppose we are in the case
 ```C
 temp_v1 = { 0xFF, 0xC3, 0xAF, 0xFF };
 ```
@@ -465,7 +466,7 @@ s32 func_809F58E4(GlobalContext *globalCtx, s32 limbIndex, Gfx **dList, Vec3f *p
         OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1733);
         gDPPipeSync(POLY_OPA_DISP++);
         gDPSetEnvColor(POLY_OPA_DISP++, D_809F5E4C[this->type - 1].r, D_809F5E4C[this->type - 1].g, D_809F5E4C[this->type - 1].b, 255);
-        CLOSE_DISPS(globalCtx->state.gfxCtx, (const char*)"../z_en_dnt_nomal.c", 1743);
+        CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1743);
     }
     return 0;
 }
diff --git a/docs/tutorial/helper_scripts.md b/docs/tutorial/helper_scripts.md
index b75ba48fd..efdb31d47 100644
--- a/docs/tutorial/helper_scripts.md
+++ b/docs/tutorial/helper_scripts.md
@@ -66,7 +66,7 @@ Suggestions are saved in the function directory it imported the function into.
 
 ## first_diff
 
-Tells you where your built rom first differs from the baserom. It gives you a memory address that you can use to do, e.g. a binary diff, and also tries too find what function or data this address is in. Run with 
+Tells you where your built rom first differs from the baserom. It gives you a memory address that you can use to do, e.g. a binary diff, and also tries too find what function or data this address is in. Run with
 ```C
 ./first_diff.py
 ```
diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md
index cba8f8fcc..80798cd35 100644
--- a/docs/tutorial/introduction.md
+++ b/docs/tutorial/introduction.md
@@ -6,9 +6,9 @@ In this project, we are decompiling The Legend of Zelda: Ocarina of Time. This m
 glabel func_80A13098
 /* 00028 80A13098 8482001C */  lh      $v0, 0x001C($a0)           ## 0000001C
 /* 0002C 80A1309C 24010004 */  addiu   $at, $zero, 0x0004         ## $at = 00000004
-/* 00030 80A130A0 14410003 */  bne     $v0, $at, .L80A130B0       
+/* 00030 80A130A0 14410003 */  bne     $v0, $at, .L80A130B0
 /* 00034 80A130A4 244EFFFE */  addiu   $t6, $v0, 0xFFFE           ## $t6 = FFFFFFFE
-/* 00038 80A130A8 10000002 */  beq     $zero, $zero, .L80A130B4   
+/* 00038 80A130A8 10000002 */  beq     $zero, $zero, .L80A130B4
 /* 0003C 80A130AC A480001C */  sh      $zero, 0x001C($a0)         ## 0000001C
 .L80A130B0:
 /* 00040 80A130B0 A48E001C */  sh      $t6, 0x001C($a0)           ## 0000001C
@@ -19,7 +19,7 @@ glabel func_80A13098
 /* 00050 80A130C0 A1E20004 */  sb      $v0, 0x0004($t7)           ## 00000004
 /* 00054 80A130C4 A08201B8 */  sb      $v0, 0x01B8($a0)           ## 000001B8
 /* 00058 80A130C8 A08201B9 */  sb      $v0, 0x01B9($a0)           ## 000001B9
-/* 0005C 80A130CC 03E00008 */  jr      $ra                        
+/* 0005C 80A130CC 03E00008 */  jr      $ra
 /* 00060 80A130D0 A0980117 */  sb      $t8, 0x0117($a0)           ## 00000117
 ```
 
@@ -62,13 +62,13 @@ A lot of work has already been done on the code to bring it into a format that i
 
 An *actor* is any thing in the game that moves or performs actions or interactions: Link is an actor, enemies are actors, NPCs are actors, props like grass are actors (Fishing is also an actor, the largest one, but you don't need to know about it). The vast majority of actors are *overlays*, which means they are loaded only when the game needs them.
 
-In the code, each actor is associated to several files: there is 
+In the code, each actor is associated to several files: there is
 - the main .c file, e.g. `src/overlays/actors/ovl_En_Firefly/z_en_firefly.c`
 - the actor's Header file, e.g. `src/overlays/actors/ovl_En_Firefly/z_en_firefly.h`
-- various .o files that tell the `make` script how to incorporate it into building the ROM, 
+- various .o files that tell the `make` script how to incorporate it into building the ROM,
 
-and then for undecompiled actors, various assembly (.s) files, generally including: 
+and then for undecompiled actors, various assembly (.s) files, generally including:
 - one for the actor's *data* (this usually includes things like its collision information about how to draw it, and various other stuff that is used in it), e.g. `data/overlays/actors/z_en_firefly.data.s`
 - one for each function in the actor, e.g. `asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13098.s`
 
-The basic process of decomp is to take one of the .s files, run it through a decompilation program (mips_to_c) that reads the ASM very literally, and then, through humen ingenuity, reshape it into code that not only compiles in the first place, but completely matches the original code (well-written or otherwise).
\ No newline at end of file
+The basic process of decomp is to take one of the .s files, run it through a decompilation program (mips_to_c) that reads the ASM very literally, and then, through humen ingenuity, reshape it into code that not only compiles in the first place, but completely matches the original code (well-written or otherwise).
diff --git a/docs/tutorial/merging.md b/docs/tutorial/merging.md
index 7ae5a9920..f2554d31e 100644
--- a/docs/tutorial/merging.md
+++ b/docs/tutorial/merging.md
@@ -89,7 +89,7 @@ There is no need to wait for your PR to be approved and committed before working
 ## Trello
 
 It's helpful to use the labels on Trello.
-- RESERVED is obvious. 
+- RESERVED is obvious.
 - Work in Progress is for when you're actively working on something
 - Matched for when it is totally decompiled and matching
 - Documented if at least everything is named and odd code is commented. We'll likely wipe these and start over when proper documentation begins.
diff --git a/docs/tutorial/object_decomp.md b/docs/tutorial/object_decomp.md
index 7c2366c7a..a386d8d96 100644
--- a/docs/tutorial/object_decomp.md
+++ b/docs/tutorial/object_decomp.md
@@ -164,7 +164,7 @@ If you'd rather not have it tell you about the checksum, you can run `make COMPA
 
 ---
 
-To revert to the original texture, you can just run `extract_assets.py -s` on the object again. 
+To revert to the original texture, you can just run `extract_assets.py -s` on the object again.
 
 N.B. doing this will overwrite every custom texture, as will running `make setup`.
 
diff --git a/docs/tutorial/other_functions.md b/docs/tutorial/other_functions.md
index 1ee495748..97ed8d1ea 100644
--- a/docs/tutorial/other_functions.md
+++ b/docs/tutorial/other_functions.md
@@ -13,15 +13,15 @@ Following the scheme we gave last time, we have three options:
 Another option is to look at `Destroy`, which for smaller actors can often be done straight after Init, since it usually just removes colliders and deallocates dynapoly. However, glancing at the three given functions' assembly, there is an obvious standout:
 ```MIPS
 glabel func_80A87F44
-/* 00744 80A87F44 AFA40000 */  sw      $a0, 0x0000($sp)           
-/* 00748 80A87F48 03E00008 */  jr      $ra                        
-/* 0074C 80A87F4C AFA50004 */  sw      $a1, 0x0004($sp)           
+/* 00744 80A87F44 AFA40000 */  sw      $a0, 0x0000($sp)
+/* 00748 80A87F48 03E00008 */  jr      $ra
+/* 0074C 80A87F4C AFA50004 */  sw      $a1, 0x0004($sp)
 
 ```
 This is a classic "function with two arguments that does nothing". So we can simply comment out the appropriate pragma and put
 ```C
 void func_80A87F44(Actor* thisx, GlobalContext* globalCtx) {
-    
+
 }
 ```
 in the C file.
@@ -190,7 +190,7 @@ To use the permuter, clone the decomp-permuter repo from the link given in Disco
 
 It will put it in a subdirectory of `nonmatchings`. You then run
 ```sh
-./permuter.py nonmatchings/<function_name>/ 
+./permuter.py nonmatchings/<function_name>/
 ```
 to produce suggestions. There are various arguments that can be used, of which the most important initially is `-j`: `-jN` tells it to use `N` CPU threads.
 
@@ -217,7 +217,7 @@ The first suggestion looks plausible:
 -      func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->childActor->bgId);
 +      func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, new_var->bgId);
      }
- 
+
    }
 ```
 
@@ -285,7 +285,7 @@ void func_80A87C30(EnJj *this, GlobalContext *globalCtx) {
 }
 ```
 
-There are three things left to do to this function: 
+There are three things left to do to this function:
 - prototype the new action function, `func_80A87CEC`. This one is used before its definition, so needs to be prototyped at the top of the file.
 - extern `D_80A88CF0`, and since the arguments of `Math_Vec3f_DistXZ` are `Vec3f`s, convert it to floats. To do float conversion, either use an online converter, or get an extension for VSCode that can do it. The data becomes
 ```C
@@ -698,7 +698,7 @@ void func_80A87D94(EnJj *this, GlobalContext *globalCtx) {
 
 At the top we have
 ```C
-temp_v0 = *globalCtx->unk1D94;
+    temp_v0 = *globalCtx->unk1D94;
     if (temp_v0 != 1) {
         if (temp_v0 != 2) {
             if (temp_v0 != 3) {
@@ -721,18 +721,18 @@ void func_80A87D94(EnJj *this, GlobalContext *globalCtx) {
 
     switch (globalCtx->csCtx.npcActions[2]->action) {
         case 1:
-			temp_v1_3 = this->unk_30A;
-			phi_v1 = temp_v1_3;
-			if ((temp_v1_3 & 2) != 0) {
-				this->unk_30E = 0;
-				this->unk_30F = Rand_S16Offset((u16)0x14, (u16)0x14);
-				this->unk_310 = 0;
-				temp_t9 = this->unk_30A ^ 2;
-				this->unk_311 = 0;
-				this->unk_30A = temp_t9;
-				phi_v1 = temp_t9 & 0xFFFF;
-			}
-			break;
+            temp_v1_3 = this->unk_30A;
+            phi_v1 = temp_v1_3;
+            if ((temp_v1_3 & 2) != 0) {
+                this->unk_30E = 0;
+                this->unk_30F = Rand_S16Offset((u16)0x14, (u16)0x14);
+                this->unk_310 = 0;
+                temp_t9 = this->unk_30A ^ 2;
+                this->unk_311 = 0;
+                this->unk_30A = temp_t9;
+                phi_v1 = temp_t9 & 0xFFFF;
+            }
+            break;
         case 2:
             temp_t1 = this->unk_30A | 1;
             temp_v1_2 = temp_t1 & 0xFFFF;
@@ -744,23 +744,23 @@ void func_80A87D94(EnJj *this, GlobalContext *globalCtx) {
                 this->unk_30A = temp_t4;
                 phi_v1 = temp_t4 & 0xFFFF;
             }
-			break;
+            break;
         case 3:
-			temp_v1 = this->unk_30A;
-			temp_t7 = temp_v1 | 2;
-			phi_v1 = temp_v1;
-			if ((temp_v1 & 2) == 0) {
-				this->unk_30E = 0;
-				this->unk_30F = 0;
-				this->unk_310 = 1;
-				this->unk_311 = 0;
-				this->unk_30A = temp_t7;
-				phi_v1 = temp_t7 & 0xFFFF;
-			}
-			break;
+            temp_v1 = this->unk_30A;
+            temp_t7 = temp_v1 | 2;
+            phi_v1 = temp_v1;
+            if ((temp_v1 & 2) == 0) {
+                this->unk_30E = 0;
+                this->unk_30F = 0;
+                this->unk_310 = 1;
+                this->unk_311 = 0;
+                this->unk_30A = temp_t7;
+                phi_v1 = temp_t7 & 0xFFFF;
+            }
+            break;
         default:
-             phi_v1 = this->unk_30A;
-			break;
+            phi_v1 = this->unk_30A;
+            break;
     }
     if ((phi_v1 & 1) != 0) {
         Audio_PlayActorSound2((Actor *) this, (u16)0x206DU);
@@ -780,7 +780,7 @@ As usual, most of the remaining temps look fake. The only one that does not is p
 
 <details>
 <summary>
-	Matching C for `func_80A87D94`
+    Matching C for `func_80A87D94`
 </summary>
 
 ```C
diff --git a/docs/tutorial/pre-decomp.md b/docs/tutorial/pre-decomp.md
index 01d1d5f2d..ebd722fbd 100644
--- a/docs/tutorial/pre-decomp.md
+++ b/docs/tutorial/pre-decomp.md
@@ -28,4 +28,4 @@ Since actors cover so many different categories of stuff in the game, they come
 
 The general rule of thumb is to pick something with few, simple interactions with its environment. (For example, my first actor was BgIceTurara: icicles, which can do about 3 different things: break, fall, and grow.) This hopefully means that the functions are mostly small and simple. You are also probably better off if Draw and Init are small functions, although difficulty is sometimes not correlated to size.
 
-If in doubt, ask someone to have a quick look through the code to see if it's suitable.
\ No newline at end of file
+If in doubt, ask someone to have a quick look through the code to see if it's suitable.
diff --git a/docs/tutorial/types_structs_padding.md b/docs/tutorial/types_structs_padding.md
index ebd8c1646..fb87445ea 100644
--- a/docs/tutorial/types_structs_padding.md
+++ b/docs/tutorial/types_structs_padding.md
@@ -14,7 +14,7 @@ The following are the common data types used everywhere:
 | char  | 1 byte          | character      |
 | u8    | 1 byte          | unsigned byte  |
 | s8    | 1 byte          | signed byte    |
-| u16   | 2 bytes         | unsigned short | 
+| u16   | 2 bytes         | unsigned short |
 | s16   | 2 bytes         | signed short   |
 | u32   | 4 bytes/1 word  | unsigned int   |
 | s32   | 4 bytes/1 word  | signed int     |
@@ -43,8 +43,8 @@ Here are the usual names and the sizes of some of the most common structs used i
 | ----------------------- | --------------------- | --------------- |
 | `Actor`                 | `actor`               | 0x14C           |
 | `DynaPolyActor`         | `dyna`                | 0x164           |
-| `Vec3f`                 |                       | 0xC             | 
-| `Vec3s`                 |                       | 0x6             | 
+| `Vec3f`                 |                       | 0xC             |
+| `Vec3s`                 |                       | 0x6             |
 | `SkelAnime`             | `skelAnime`           | 0x44            |
 | `Vec3s[limbCount]`      | `jointTable`          | 0x6 * limbCount |
 | `Vec3s[limbCount]`      | `morphTable`          | 0x6 * limbCount |
diff --git a/extract_assets.py b/extract_assets.py
index 10768b9db..3875763b1 100755
--- a/extract_assets.py
+++ b/extract_assets.py
@@ -21,7 +21,7 @@ def ExtractFile(xmlPath, outputPath, outputSourcePath):
 
     if "overlays" in xmlPath:
         execStr += " --static"
-    
+
     if globalUnaccounted:
         execStr += " -Wunaccounted"
 
diff --git a/extract_baserom.py b/extract_baserom.py
index 544bda75c..e45bdea5e 100755
--- a/extract_baserom.py
+++ b/extract_baserom.py
@@ -1576,7 +1576,7 @@ def ExtractFunc(i):
     else:             # compressed
         compressed = True
         size = physEnd - physStart
-    
+
     print('extracting ' + filename + " (0x%08X, 0x%08X)" % (virtStart, virtEnd))
     write_output_file(filename, physStart, size)
     if compressed:
diff --git a/first_diff.py b/first_diff.py
index 3b8a9dd46..472ec1bcc 100755
--- a/first_diff.py
+++ b/first_diff.py
@@ -90,9 +90,9 @@ def search_rom_address(target_addr):
                 continue
 
             ram = int(line[16 : 16 + 18], 0)
-            rom = ram - ram_offset 
+            rom = ram - ram_offset
             sym = line.split()[-1]
-    
+
             if sym.startswith("0x"):
                 ram_offset = None
                 continue
diff --git a/format.sh b/format.sh
index 206544399..d5d3c2d49 100755
--- a/format.sh
+++ b/format.sh
@@ -7,9 +7,9 @@ COMPILER_OPTS="-fno-builtin -std=gnu90 -Iinclude -Isrc -D_LANGUAGE_C -DNON_MATCH
 
 # https://backreference.org/2010/05/23/sanitizing-files-with-no-trailing-newline/index.html
 # "gets the last character of the file pipes it into read, which will exit with
-# a nonzero exit code if it encounters EOF before newline (so, if the last 
+# a nonzero exit code if it encounters EOF before newline (so, if the last
 # character of the file isn't a newline). If read exits nonzero, then append a
-# newline onto the file using echo (if read exits 0, that satisfies the ||, so 
+# newline onto the file using echo (if read exits 0, that satisfies the ||, so
 # the echo command isn't run)." (https://stackoverflow.com/a/34865616)
 function add_final_newline () {
     for file in "$@"
diff --git a/include/message_data_fmt.h b/include/message_data_fmt.h
index fffac116c..7ec967b50 100644
--- a/include/message_data_fmt.h
+++ b/include/message_data_fmt.h
@@ -54,7 +54,7 @@
 
 /*
  *  Colors
- */ 
+ */
 
 #define COLOR_STR(N) EXPAND_AND_STRINGIFY(GLUE(\x4, N))
 
@@ -74,7 +74,7 @@
 
 #define ARG(x) x
 
-// while a control character, newlines are handled in the charmap conversion 
+// while a control character, newlines are handled in the charmap conversion
 // stage to allow normal newline \n usage in message_data_static files
 #define NEWLINE                 STR(CTRL_NEWLINE)
 #define END                     STR(CTRL_END)
diff --git a/include/message_data_static.h b/include/message_data_static.h
index 3b125647b..2d16f0dba 100644
--- a/include/message_data_static.h
+++ b/include/message_data_static.h
@@ -31,7 +31,7 @@ typedef struct {
     const char* segment;
 } MessageTableEntry;
 
-/* 
+/*
  *  Message Symbol Declarations
  */
 
diff --git a/include/ultra64/controller.h b/include/ultra64/controller.h
index 46e43aebd..f2038c824 100644
--- a/include/ultra64/controller.h
+++ b/include/ultra64/controller.h
@@ -102,7 +102,7 @@ typedef struct {
 } OSPifRam; // size = 0x40
 
 typedef struct {
-    /* 0x00 */ u16 type; 
+    /* 0x00 */ u16 type;
     /* 0x02 */ u8 status;
     /* 0x03 */ u8 errno;
 } OSContStatus; // size = 0x04
diff --git a/include/ultra64/mbi.h b/include/ultra64/mbi.h
index 565a51d71..8dd6963d8 100644
--- a/include/ultra64/mbi.h
+++ b/include/ultra64/mbi.h
@@ -12,10 +12,10 @@
 
 /*
  * the SHIFT macros are used to build display list commands, inserting
- * bit-fields into a 32-bit word. They take a value, a shift amount, 
+ * bit-fields into a 32-bit word. They take a value, a shift amount,
  * and a width.
  *
- * For the left shift, the lower bits of the value are masked, 
+ * For the left shift, the lower bits of the value are masked,
  * then shifted left.
  *
  * For the right shift, the value is shifted right, then the lower bits
diff --git a/include/ultra64/pfs.h b/include/ultra64/pfs.h
index 8c13a3b45..730c224b8 100644
--- a/include/ultra64/pfs.h
+++ b/include/ultra64/pfs.h
@@ -38,7 +38,7 @@
 #define PFS_ERR_NOPACK          1   /* no memory card is plugged or */
 #define PFS_ERR_NEW_PACK        2   /* ram pack has been changed to a  different one */
 #define PFS_ERR_INCONSISTENT    3   /* need to run Pfschecker*/
-#define PFS_ERR_CONTRFAIL       CONT_OVERRUN_ERROR              
+#define PFS_ERR_CONTRFAIL       CONT_OVERRUN_ERROR
 #define PFS_ERR_INVALID         5   /* invalid parameter or file not exist*/
 #define PFS_ERR_BAD_DATA        6   /* the data read from pack are bad*/
 #define PFS_DATA_FULL           7   /* no free pages on ram pack*/
diff --git a/include/ultra64/r4300.h b/include/ultra64/r4300.h
index 7f77dd4a7..42782f80c 100644
--- a/include/ultra64/r4300.h
+++ b/include/ultra64/r4300.h
@@ -294,7 +294,7 @@
 #define CACHERR_PIDX_MASK   0x00000007  // primary cache index
 #define CACHERR_PIDX_SHIFT  12          // bits 2..0 are paddr14..12
 
-/* 
+/*
  * R4000 family supports hardware watchpoints:
  *   C0_WATCHLO:
  *     bits 31..3 are bits 31..3 of physaddr to watch
@@ -337,7 +337,7 @@
 #define C0_TAGHI        C_REG(29)   // cache operations
 #define C0_ERROR_EPC    C_REG(30)   // ECC error prg. counter
 
-// floating-point status register 
+// floating-point status register
 #define C1_FPCSR        C_REG(31)
 
 #define FPCSR_FS        0x01000000  // flush denorm to zero
diff --git a/include/z64.h b/include/z64.h
index 37a920164..83dc9e360 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -509,9 +509,9 @@ typedef enum {
     /*  4 */ TEXT_STATE_CHOICE,
     /*  5 */ TEXT_STATE_EVENT,
     /*  6 */ TEXT_STATE_DONE,
-    /*  7 */ TEXT_STATE_SONG_DEMO_DONE, 
-    /*  8 */ TEXT_STATE_8, 
-    /*  9 */ TEXT_STATE_9, 
+    /*  7 */ TEXT_STATE_SONG_DEMO_DONE,
+    /*  8 */ TEXT_STATE_8,
+    /*  9 */ TEXT_STATE_9,
     /* 10 */ TEXT_STATE_AWAITING_NEXT
 } TextState;
 
diff --git a/include/z64animation.h b/include/z64animation.h
index b84cb26fa..31dd3e5dd 100755
--- a/include/z64animation.h
+++ b/include/z64animation.h
@@ -25,9 +25,9 @@ typedef enum {
     /* 5 */ ANIMMODE_LOOP_PARTIAL_INTERP
 } AnimationModes;
 
-typedef enum { 
-    /* -1 */ ANIMTAPER_DECEL = -1, 
-    /*  0 */ ANIMTAPER_NONE, 
+typedef enum {
+    /* -1 */ ANIMTAPER_DECEL = -1,
+    /*  0 */ ANIMTAPER_NONE,
     /*  1 */ ANIMTAPER_ACCEL
 } AnimationTapers;
 
@@ -65,7 +65,7 @@ typedef struct {
     /* 0x08 */ u8 dListCount;
 } FlexSkeletonHeader; // size = 0xC
 
-// Index into the frame data table. 
+// Index into the frame data table.
 typedef struct {
     /* 0x00 */ u16 x;
     /* 0x02 */ u16 y;
diff --git a/include/z64camera.h b/include/z64camera.h
index f4f064045..8bfd447da 100644
--- a/include/z64camera.h
+++ b/include/z64camera.h
@@ -55,7 +55,7 @@ typedef enum {
     /* 0x1E */ CAM_SET_CRAWLSPACE, // Used in all crawlspaces "RAIL3"
     /* 0x1F */ CAM_SET_START0, // Data is given in Temple of Time, but no surface uses it
     /* 0x20 */ CAM_SET_START1, // Scene/room door transitions that snap the camera to a fixed location (example: ganon's towers doors climbing up)
-    /* 0x21 */ CAM_SET_FREE0, // Full manual control is given over the camera 
+    /* 0x21 */ CAM_SET_FREE0, // Full manual control is given over the camera
     /* 0x22 */ CAM_SET_FREE2, // Various OnePoint Cutscenes, 10 total (example: falling chest)
     /* 0x23 */ CAM_SET_PIVOT_CORNER, // Inside the carpenter jail cells from theives hideout "CIRCLE4"
     /* 0x24 */ CAM_SET_PIVOT_WATER_SURFACE, // Player diving from the surface of the water to underwater "CIRCLE5"
@@ -391,7 +391,6 @@ typedef struct {
     { groundAtLerpStepScale, CAM_DATA_GROUND_AT_LERP_STEP_SCALE }
 
 typedef struct {
-    
     /* 0x00 */ SwingAnimation swing;
     /* 0x1C */ f32 unk_1C;
     /* 0x20 */ VecSph unk_20;
@@ -403,7 +402,7 @@ typedef struct {
     /* 0x08 */ f32 distMax;
     /* 0x0C */ f32 yawUpateRateTarget;
     /* 0x10 */ f32 maxYawUpdate;
-    /* 0x14 */ f32 unk_14; // never used.  
+    /* 0x14 */ f32 unk_14; // never used.
     /* 0x18 */ f32 atLERPScaleMax;
     /* 0x1C */ s16 interfaceFlags;
     /* 0x20 */ Jump1Anim anim;
@@ -954,7 +953,7 @@ typedef struct {
  * 0x2: Add atTargetInit to view's lookAt
  *      if initFlags & 0x6060: use world for focus point
  * 0x3: Add atTargetInit to camera's at
- * 0x4: Don't update targets? 
+ * 0x4: Don't update targets?
  * 0x8: flag to use atTagetInit as f32 pitch, yaw, r
  * 0x10: ? unused
  * 0x20: focus on player
@@ -1033,7 +1032,7 @@ typedef struct {
 typedef struct {
     /* 0x0 */ s16 interfaceFlags;
     /* 0x2 */ s16 unk_02;
-    /* 0x4 */ Demo6Anim anim; 
+    /* 0x4 */ Demo6Anim anim;
 } Demo6; // size = 0x14
 
 typedef struct {
diff --git a/include/z64collision_check.h b/include/z64collision_check.h
index 4dad0acc7..5cd2fdb42 100644
--- a/include/z64collision_check.h
+++ b/include/z64collision_check.h
@@ -14,7 +14,7 @@ typedef struct {
     /* 0x04 */ struct Actor* at; // Actor attached to what it collided with as an AT collider.
     /* 0x08 */ struct Actor* ac; // Actor attached to what it collided with as an AC collider.
     /* 0x0C */ struct Actor* oc; // Actor attached to what it collided with as an OC collider.
-    /* 0x10 */ u8 atFlags; // Information flags for AT collisions. 
+    /* 0x10 */ u8 atFlags; // Information flags for AT collisions.
     /* 0x11 */ u8 acFlags; // Information flags for AC collisions.
     /* 0x12 */ u8 ocFlags1; // Information flags for OC collisions.
     /* 0x13 */ u8 ocFlags2;  // Flags related to which colliders it can OC collide with.
@@ -24,7 +24,7 @@ typedef struct {
 
 typedef struct {
     /* 0x00 */ u8 colType; // Determines hitmarks and sound effects during AC collisions.
-    /* 0x01 */ u8 atFlags; // Information flags for AT collisions. 
+    /* 0x01 */ u8 atFlags; // Information flags for AT collisions.
     /* 0x02 */ u8 acFlags; // Information flags for OC collisions.
     /* 0x03 */ u8 ocFlags1; // Information flags for OC collisions.
     /* 0x04 */ u8 ocFlags2; // Flags related to which colliders it can OC collide with.
@@ -33,7 +33,7 @@ typedef struct {
 
 typedef struct {
     /* 0x00 */ u8 colType; // Determines hitmarks and sound effects during AC collisions.
-    /* 0x01 */ u8 atFlags; // Information flags for AT collisions. 
+    /* 0x01 */ u8 atFlags; // Information flags for AT collisions.
     /* 0x02 */ u8 acFlags; // Information flags for AC collisions.
     /* 0x03 */ u8 ocFlags1; // Information flags for OC collisions.
     /* 0x04 */ u8 shape; // JntSph, Cylinder, Tris, or Quad
@@ -258,7 +258,7 @@ typedef enum {
 /**
  * Affects the sound Link's sword makes when hitting it, hookability,
  * and possibly other things. It's definitely not flags, as all checks
- * are == or !=. Will probably need more actors decomped to truly 
+ * are == or !=. Will probably need more actors decomped to truly
  * understand what this is.
  */
 typedef enum {
@@ -343,7 +343,7 @@ typedef enum {
 
 #define DMG_ENTRY(damage, effect) ((damage) | ((effect) << 4))
 
-// These flags are not to be used in code until we figure out how we want to format them. They are only here for reference 
+// These flags are not to be used in code until we figure out how we want to format them. They are only here for reference
 #define DMG_DEKU_NUT     (1 << 0x00)
 #define DMG_DEKU_STICK   (1 << 0x01)
 #define DMG_SLINGSHOT    (1 << 0x02)
diff --git a/include/z64cutscene.h b/include/z64cutscene.h
index c50ae48c0..644c21bc6 100644
--- a/include/z64cutscene.h
+++ b/include/z64cutscene.h
@@ -139,14 +139,14 @@ typedef enum {
 
 /**
  * Special type for blocks of cutscene data, asm-processor checks
- * arrays for CutsceneData type and converts floats within the array 
- * to their IEEE-754 representation. The array must close with }; 
+ * arrays for CutsceneData type and converts floats within the array
+ * to their IEEE-754 representation. The array must close with };
  * on its own line.
- * 
+ *
  * Files that contain this type that are included in other C files
  * must include an 'EARLY' qualifier to inform asm-processor that it
  * must recursively process that include.
- * 
+ *
  * Example: #include "file.c" EARLY
  */
 typedef union CutsceneData {
diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h
index de99ed3d1..1150a2eaa 100644
--- a/include/z64cutscene_commands.h
+++ b/include/z64cutscene_commands.h
@@ -32,7 +32,7 @@
 
 /**
  * ARGS
- *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), 
+ *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a),
  *   s16 xPos (x), s16 yPos (y), s16 zPos (z)
  * FORMAT
  *   Capital U is Unused
@@ -56,7 +56,7 @@
 
 /**
  * ARGS
- *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), 
+ *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a),
  *   s16 xPos (x), s16 yPos (y), s16 zPos (z)
  * FORMAT
  *   Capital U is Unused
@@ -103,7 +103,7 @@
  *   s16 setting (m), s16 startFrame (s), s16 endFrame (e)
  * FORMAT
  *   Capital U is Unused
- *   mmmmssss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU 00000000 00000000 00000000 
+ *   mmmmssss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU 00000000 00000000 00000000
  *   size = 0x30
  */
 #define CS_LIGHTING(setting, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7) \
@@ -125,7 +125,7 @@
 
 /**
  * ARGS
- *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), 
+ *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a),
  *   s16 xPos (x), s16 yPos (y), s16 zPos (z)
  * FORMAT
  *   Capital U is Unused
@@ -149,7 +149,7 @@
     CS_CMD_CAM_AT_REL_TO_PLAYER, CMD_HH(0x0001, startFrame), CMD_HH(endFrame, 0x0000)
 /**
  * ARGS
- *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), 
+ *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a),
  *   s16 xPos (x), s16 yPos (y), s16 zPos (z)
  * FORMAT
  *   Capital U is Unused
@@ -173,7 +173,7 @@
 
 /**
  * ARGS
- *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), 
+ *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a),
  *   s16 xPos (x), s16 yPos (y), s16 zPos (z)
  * FORMAT
  *   Capital U is Unused
@@ -196,7 +196,7 @@
 
 /**
  * ARGS
- *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), 
+ *   s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a),
  *   s16 xPos (x), s16 yPos (y), s16 zPos (z)
  * FORMAT
  *   Capital U is Unused
@@ -237,7 +237,7 @@
 
 /**
  * ARGS
- *   s32 unk1 (a), s32 unk2 (b), s32 unk3 (c), s32 unk4 (d), s32 unk5 (e), s32 unk6 (f), 
+ *   s32 unk1 (a), s32 unk2 (b), s32 unk3 (c), s32 unk4 (d), s32 unk5 (e), s32 unk6 (f),
  *   s32 unk7 (g), s32 unk8 (h), s32 unk9 (i), s32 unk10 (j), s32 unk11 (k), s32 unk12 (l)
  * FORMAT
  *   aaaaaaaa bbbbbbbb cccccccc dddddddd eeeeeeee ffffffff gggggggg hhhhhhhh iiiiiiii jjjjjjjj kkkkkkkk llllllll
@@ -307,7 +307,7 @@
 
 /**
  * ARGS
- *   s16 messageId (i), s16 startFrame (s), s16 endFrame (e), s16 type (o), 
+ *   s16 messageId (i), s16 startFrame (s), s16 endFrame (e), s16 type (o),
  *   s16 topOptionBranch (y), s16 bottomOptionBranch (n)
  * FORMAT
  *   iiiissss eeeeoooo yyyynnnn
diff --git a/include/z64scene.h b/include/z64scene.h
index 8ac4e8a57..601efaf2e 100644
--- a/include/z64scene.h
+++ b/include/z64scene.h
@@ -486,13 +486,13 @@ typedef enum {
     { SCENE_CMD_ID_OBJECT_LIST, numObjects, CMD_PTR(objectList) }
 
 #define SCENE_CMD_LIGHT_LIST(numLights, lightList) \
-    { SCENE_CMD_ID_POS_LIGHT_LIST, numLights, CMD_PTR(lightList) } 
+    { SCENE_CMD_ID_POS_LIGHT_LIST, numLights, CMD_PTR(lightList) }
 
 #define SCENE_CMD_PATH_LIST(pathList) \
     { SCENE_CMD_ID_PATH_LIST, 0, CMD_PTR(pathList) }
 
 #define SCENE_CMD_TRANSITION_ACTOR_LIST(numActors, list) \
-    { SCENE_CMD_ID_TRANSI_ACTOR_LIST, numActors, CMD_PTR(list) } 
+    { SCENE_CMD_ID_TRANSI_ACTOR_LIST, numActors, CMD_PTR(list) }
 
 #define SCENE_CMD_ENV_LIGHT_SETTINGS(numLightSettings, lightSettingsList) \
     { SCENE_CMD_ID_ENV_LIGHT_SETTINGS, numLightSettings, CMD_PTR(lightSettingsList) }
diff --git a/progress.py b/progress.py
index 4d3da82e8..7f86da71b 100755
--- a/progress.py
+++ b/progress.py
@@ -33,7 +33,7 @@ def ReadAllLines(fileName):
 
 def GetFiles(path, ext):
     files = []
-    
+
     for r, d, f in os.walk(path):
         for file in f:
             if file.endswith(ext):
diff --git a/src/code/z_map_data.c b/src/code/z_map_data.c
index f518a124c..3ee22c7a0 100644
--- a/src/code/z_map_data.c
+++ b/src/code/z_map_data.c
@@ -302,15 +302,15 @@ static u8 sSwitchToRoom[10][51] = {
 
 static u8 sFloorID[10][8] = {
     /* clang-format off */
-    {    0,    0,    0, F_3F, F_2F, F_1F, F_B1, F_B2 }, 
+    {    0,    0,    0, F_3F, F_2F, F_1F, F_B1, F_B2 },
     {    0,    0,    0,    0,    0,    0, F_2F, F_1F },
-    {    0,    0,    0,    0,    0,    0, F_1F, F_B1 },          
+    {    0,    0,    0,    0,    0,    0, F_1F, F_B1 },
     {    0,    0,    0,    0, F_2F, F_1F, F_B1, F_B2 },
-    {    0,    0,    0, F_5F, F_4F, F_3F, F_2F, F_1F }, 
+    {    0,    0,    0, F_5F, F_4F, F_3F, F_2F, F_1F },
     {    0,    0,    0,    0, F_3F, F_2F, F_1F, F_B1 },
-    {    0,    0,    0,    0, F_4F, F_3F, F_2F, F_1F },    
+    {    0,    0,    0,    0, F_4F, F_3F, F_2F, F_1F },
     {    0,    0,    0,    0, F_B1, F_B2, F_B3, F_B4 },
-    {    0,    0,    0,    0,    0, F_B1, F_B2, F_B3 },       
+    {    0,    0,    0,    0,    0, F_B1, F_B2, F_B3 },
     {    0,    0,    0,    0,    0,    0,    0, F_1F },
 }; /* clang-format on */
 
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
index 6e1936e35..05bafd06d 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
@@ -18,11 +18,11 @@ typedef struct BgGndDarkmeiro {
 
 typedef enum {
     /* 0 */ DARKMEIRO_INVISIBLE_PATH,   // Textures for the invisible path in shadow trial.
-    
+
     /* 1 */ DARKMEIRO_CLEAR_BLOCK,      /* Clear blocks appear when their switch flag is set and
                                            disappear 64 frames after their switch flag is cleared.
                                            Clear blocks with flag 0x3F are always on.             */
-                                      
+
     /* 2 */ DARKMEIRO_BLOCK_TIMER       /* A block timer with switch flag N reacts to switch flags N+1
                                            and N+2 being set, setting its own switch flag and a timer
                                            for 304 frames. There are separate timers for N+1 and N+2,
diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h
index d1e8e86b7..5764b5ab4 100644
--- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h
+++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h
@@ -11,8 +11,8 @@ typedef void (*BgSpot15RrboxActionFunc)(struct BgSpot15Rrbox*, GlobalContext*);
 typedef struct BgSpot15Rrbox {
     /* 0x0000 */ DynaPolyActor dyna;
     /* 0x0164 */ BgSpot15RrboxActionFunc actionFunc;
-    /* 0x0168 */ s16 unk_168; 
-    /* 0x016C */ f32 unk_16C; 
+    /* 0x0168 */ s16 unk_168;
+    /* 0x016C */ f32 unk_16C;
     /* 0x0170 */ f32 unk_170;
     /* 0x0174 */ f32 unk_174;
     /* 0x0178 */ f32 unk_178;
diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h
index 865068b12..ee2c3e33f 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h
+++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h
@@ -11,7 +11,7 @@ typedef void (*BgTokiHikariActionFunc)(struct BgTokiHikari*, GlobalContext*);
 typedef struct BgTokiHikari {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ f32 unk_14C;
-    /* 0x0150 */ BgTokiHikariActionFunc actionFunc; 
+    /* 0x0150 */ BgTokiHikariActionFunc actionFunc;
 } BgTokiHikari; // size = 0x0154
 
 #endif
diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
index 62aefe8cc..3bc07819e 100644
--- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
+++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
@@ -53,7 +53,7 @@ typedef struct BossDodongo {
     /* 0x01CA */ char unk_1CA[0x2];
     /* 0x01CC */ s16 unk_1CC;
     /* 0x01CE */ char unk_1CE[0xC];
-    /* 0x01DA */ s16 unk_1DA; 
+    /* 0x01DA */ s16 unk_1DA;
     /* 0x01DC */ s16 unk_1DC;
     /* 0x01DE */ s16 unk_1DE;
     /* 0x01E0 */ s16 unk_1E0;
diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
index a3e3e503e..ac9241397 100644
--- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
+++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
@@ -105,7 +105,7 @@ typedef struct BossGanon {
     /* 0x02E4 */ u8 shockGlow;
     /* 0x02E6 */ s16 unk_2E6; // timer
     /* 0x02E8 */ s16 unk_2E8; // timer
-    /* 0x02EC */ Vec3f unk_2EC[18]; // body parts pos for ganondorf, used for other things as well 
+    /* 0x02EC */ Vec3f unk_2EC[18]; // body parts pos for ganondorf, used for other things as well
     /* 0x03C4 */ Vec3f unk_3C4[18];
     /* 0x049C */ f32 unk_49C[18];
     /* 0x04E4 */ s16 unk_4E4[18];
diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h
index 12e509ff7..93d91eb5f 100644
--- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h
+++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h
@@ -35,7 +35,7 @@ typedef enum DemoDu_Cutscene {
  * DEMO_DU_CS_GORONS_RUBY: Map selector -> Map 16 (SPOT16) -> Stage 01
  * DEMO_DU_CS_CHAMBER_AFTER_GANON: Map selector -> Map 21 -> Stage 02
  * DEMO_DU_CS_CREDITS: Map selector -> Map 16 (SPOT16) -> Stage 04
- * 
+ *
  */
 
 #endif
diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
index 0ff2f1bfb..928e92c19 100644
--- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
+++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
@@ -39,7 +39,7 @@ typedef enum {
     /* 14 */ DEMOGJ_TYPE_RUBBLE_PILE_7,
     /* 16 */ DEMOGJ_TYPE_DESTRUCTABLE_RUBBLE_1 = 16,   // This three rubbles are the ones that Ganon can destroy and drop collectables.
     /* 17 */ DEMOGJ_TYPE_DESTRUCTABLE_RUBBLE_2,        // They are spawned as soon as the others, but they have collision and are rendered only when Ganondorf has transformed into Ganon.
-    /* 22 */ DEMOGJ_TYPE_DESTRUCTABLE_RUBBLE_TALL = 22 //
+    /* 22 */ DEMOGJ_TYPE_DESTRUCTABLE_RUBBLE_TALL = 22
 } DemoGjType;
 
 #endif
diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
index d9a17f07b..1fe56dbc5 100644
--- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
+++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
@@ -6,18 +6,18 @@
 
 /**
  * Actor Parameters
- * 
+ *
  * |                  |         |
  * | Transition Index | Type    | Switch Flag
  * |------------------|---------|-------------
- * | 0 0 0 0 0 0      | 0 0 0 0 | 0 0 0 0 0 0 
+ * | 0 0 0 0 0 0      | 0 0 0 0 | 0 0 0 0 0 0
  * | 6                | 4       | 6
  * |
- * 
+ *
  * Transition Index     1111110000000000    Set by the actor engine when the door is spawned
  * Type                 0000001111000000
  * Switch Flag          0000000000111111
- * 
+ *
  */
 
 typedef enum {
diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.h b/src/overlays/actors/ovl_En_Ba/z_en_ba.h
index 008ec9597..22540be08 100644
--- a/src/overlays/actors/ovl_En_Ba/z_en_ba.h
+++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.h
@@ -17,9 +17,9 @@ typedef enum {
 
 typedef struct EnBa {
     /* 0x0000 */ Actor actor;
-    /* 0x014C */ s32 unk14C; 
-    /* 0x0150 */ EnBaActionFunc actionFunc; 
-    /* 0x0154 */ s16 upperParams; 
+    /* 0x014C */ s32 unk14C;
+    /* 0x0150 */ EnBaActionFunc actionFunc;
+    /* 0x0154 */ s16 upperParams;
     /* 0x0156 */ s16 unk156;
     /* 0x0158 */ Vec3f unk158[14];
     /* 0x0200 */ Vec3f unk200[14];
diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.h b/src/overlays/actors/ovl_En_Bb/z_en_bb.h
index e12306fd2..f964f23e5 100644
--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.h
+++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h
@@ -39,7 +39,7 @@ typedef struct EnBb {
     /* 0x02A0 */ Color_RGB8 flameEnvColor;
     /* 0x02A4 */ s32 blureIdx;
     /* 0x02A8 */ s16 fireIceTimer;
-    /* 0x02AA */ u8 dmgEffect;  
+    /* 0x02AA */ u8 dmgEffect;
     /* 0x02AC */ ColliderJntSph collider;
     /* 0x02CC */ ColliderJntSphElement elements[1];
     /* 0x030C */ BodyBreak bodyBreak;
diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.h b/src/overlays/actors/ovl_En_Dh/z_en_dh.h
index 2e8265447..37d716c59 100644
--- a/src/overlays/actors/ovl_En_Dh/z_en_dh.h
+++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.h
@@ -13,8 +13,8 @@ typedef struct EnDh {
     /* 0x014C */ SkelAnime skelAnime;
     /* 0x0170 */ Vec3s jointTable[16];
     /* 0x01F0 */ Vec3s limbRotTable[16];
-    /* 0x0250 */ u8 actionState; 
-    /* 0x0251 */ u8 retreat; 
+    /* 0x0250 */ u8 actionState;
+    /* 0x0251 */ u8 retreat;
     /* 0x0252 */ u8 drawDirtWave;
     /* 0x0254 */ EnDhActionFunc actionFunc;
     /* 0x0258 */ u8 unk_258; // Related to player->unk_845
diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
index 31fb24501..1889eaf03 100644
--- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
+++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
@@ -29,7 +29,7 @@ typedef struct EnDodongo {
     /* 0x034C */ Vec3f bodyScale;
     /* 0x0358 */ Vec3f icePos[9];
     /* 0x03C4 */ Color_RGBA8 bombSmokePrimColor;
-    /* 0x03C8 */ Color_RGBA8 bombSmokeEnvColor; 
+    /* 0x03C8 */ Color_RGBA8 bombSmokeEnvColor;
     /* 0x03CC */ u8 damageEffect;
     /* 0x03D0 */ s32 blureIdx;
     /* 0x03D4 */ ColliderQuad colliderAT;
diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.h b/src/overlays/actors/ovl_En_Dog/z_en_dog.h
index afaf027aa..83abbed7e 100644
--- a/src/overlays/actors/ovl_En_Dog/z_en_dog.h
+++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.h
@@ -20,7 +20,7 @@ typedef struct EnDog {
     /* 0x01EA */ s16 pad1;
     /* 0x01EC */ s16 behaviorTimer;
     /* 0x01EE */ s16 pad2;
-    /* 0x01F0 */ s16 nextBehavior; 
+    /* 0x01F0 */ s16 nextBehavior;
     /* 0x01F2 */ s16 behavior;
     /* 0x01F4 */ Vec3s jointTable[13];
     /* 0x0242 */ Vec3s morphTable[13];
diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h
index 2625aa3b6..7c2385128 100644
--- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h
+++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h
@@ -16,7 +16,7 @@ typedef struct EnExRuppy {
     /* 0x0154 */ s16 invisible;
     /* 0x0156 */ s16 timer;
     /* 0x0158 */ s16 rupeeValue;
-    /* 0x015A */ s16 unk_15A; 
+    /* 0x015A */ s16 unk_15A;
     /* 0x015C */ s16 galleryFlag;
     /* 0x0160 */ f32 unk_160;
 } EnExRuppy; // size = 0x0164
diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h
index ba2ef5014..dff80cd9b 100644
--- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h
+++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h
@@ -18,7 +18,7 @@ typedef enum {
 } FrogType;
 
 typedef enum {
-    /* 00 */ FROG_ZL, 
+    /* 00 */ FROG_ZL,
     /* 01 */ FROG_EPONA,
     /* 02 */ FROG_SARIA,
     /* 03 */ FROG_SUNS,
@@ -31,19 +31,19 @@ typedef enum {
 typedef struct EnFr {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ SkelAnime skelAnime;   // Frog Skeleton
-    /* 0x0190 */ Vec3s jointTable[24];                                   
+    /* 0x0190 */ Vec3s jointTable[24];
     /* 0x0220 */ Vec3s morphTable[24];
     /* 0x02B0 */ SkelAnime skelAnimeButterfly;  // Butterfly Skeleton above Frog during Frog Song
-    /* 0x02F4 */ Vec3s jointTableButterfly[8]; 
+    /* 0x02F4 */ Vec3s jointTableButterfly[8];
     /* 0x0324 */ Vec3s morphTableButterfly[8];
     /* 0x0354 */ EnFrActionFunc actionFunc;
-    /* 0x0358 */ LightNode* lightNode; // Frogs light up during the Frog Song, specifically the frog with the next note. 
+    /* 0x0358 */ LightNode* lightNode; // Frogs light up during the Frog Song, specifically the frog with the next note.
     /* 0x035C */ LightInfo lightInfo;
-    /* 0x036A */ s8 objBankIndex; 
+    /* 0x036A */ s8 objBankIndex;
     /* 0x036C */ s32 jumpCounter; // cyclic clock used to time celebratory frog jumps every 4 frames when child song is played.
     /* 0x0370 */ s32 blinkTimer; // blinking timer
     /* 0x0374 */ EnFrBlinkFunc blinkFunc; // unique case of using a function pointer for blinking
-    /* 0x0378 */ u8 eyeTexIndex; // index for blinking graphics 
+    /* 0x0378 */ u8 eyeTexIndex; // index for blinking graphics
     /* 0x0379 */ u8 isJumpingUp; // Conditional for jumping up from the log back onto the log
     /* 0x037A */ u8 isBelowWaterSurfaceCurrent;   // Used for diving effects
     /* 0x037B */ u8 isBelowWaterSurfacePrevious;
@@ -54,7 +54,7 @@ typedef struct EnFr {
     /* 0x0380 */ u8 ocarinaNoteIndex; // Related to unk_381
     /* 0x0381 */ u8 ocarinaNote; // Ocarina Note to Play for Frogs 2
     /* 0x0382 */ u8 songIndex; // Song index 1-7 (6 songs + custom HP Song): 5 = sos, 6 = all songs
-    /* 0x0383 */ u8 isJumpingToFrogSong; // Conditional: 
+    /* 0x0383 */ u8 isJumpingToFrogSong; // Conditional:
     /* 0x0384 */ char unk_384[0x02];
     /* 0x0386 */ s16 frogSongTimer; // timer #2 for frogs 2 HP
     /* 0x0388 */ s32 reward; // Prize for completing a song
diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h
index b9de1a1cf..a3d22b0d9 100644
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.h
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h
@@ -35,7 +35,7 @@ typedef struct EnFu {
     /* 0x01DC */ Vec3s jointTable[FU_LIMB_MAX];
     /* 0x023C */ Vec3s morphTable[FU_LIMB_MAX];
     /* 0x029C */ Vec3s lookAngleOffset; // offset applied to neck rotation to look at link when he is close
-    /* 0x02A2 */ Vec3s unk_2A2; 
+    /* 0x02A2 */ Vec3s unk_2A2;
     /* 0x02A8 */ u16 behaviorFlags;
     /* 0x02AA */ u16 facialExpression;
     /* 0x02AC */ EnFuActionFunc actionFunc;
diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h
index 536d2525f..03fb03717 100644
--- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h
+++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h
@@ -13,14 +13,14 @@ typedef struct {
     /* 0x0000 */ u8 type; // 0,1,2: State of freezard (1 not freezing, 2 freezing)
     /* 0x0001 */ u8 timer; // increments primAlphaState after reaching 7 (freezing), used in Gfx_TwoTexScroll
     /* 0x0004 */ Vec3f pos; // Random position within 20.0f of actor
-    /* 0x0010 */ Vec3f velocity; 
+    /* 0x0010 */ Vec3f velocity;
     /* 0x001C */ Vec3f accel;
     /* 0x0028 */ char unk_28[0x4];
     /* 0x002C */ s16 primAlpha; // transparency in RGBA colour system
     /* 0x002E */ s16 primAlphaState; // 0: increasing (more opaque) 1: decreasing (more transparent) 2: collision
-    /* 0x0030 */ f32 xyScale; // 
-    /* 0x0034 */ f32 xyScaleTarget; 
-    /* 0x0038 */ u8 isTimerMod8; // conditional, used to run CollisionCheck_SetAT 
+    /* 0x0030 */ f32 xyScale;
+    /* 0x0034 */ f32 xyScaleTarget;
+    /* 0x0038 */ u8 isTimerMod8; // conditional, used to run CollisionCheck_SetAT
 } EnFzEffectSsIceSmoke; // size = 0x3C
 
 typedef struct EnFz {
@@ -31,7 +31,7 @@ typedef struct EnFz {
     /* 0x01E8 */ ColliderCylinder collider3;
     /* 0x0234 */ Vec3f posOrigin; // Spawn position for moving freezard
     /* 0x0240 */ s16 counter; // A perpetual counter
-    /* 0x0242 */ s16 unusedTimer1; 
+    /* 0x0242 */ s16 unusedTimer1;
     /* 0x0244 */ s16 timer; // Used to time transition into next action. Can be 10, 20, 40, 60, 80, 100
     /* 0x0246 */ u8 updateBgInfo; // Always true in every instance
     /* 0x0247 */ u8 isMoving; // Freezard is moving in xz plane
diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h
index dba5b09c0..0bc7cce99 100644
--- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h
+++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h
@@ -44,7 +44,7 @@ typedef struct EnGSwitch {
     /* 0x0158 */ s16 colorIdx;
     /* 0x015A */ s16 broken;
     /* 0x015C */ s16 numEffects;
-    /* 0x015E */ s16 objId; 
+    /* 0x015E */ s16 objId;
     /* 0x0160 */ s16 index; // first or second rupee in two-rupee patterns
     /* 0x0162 */ s16 delayTimer; // delay between the two blue rupees appearing
     /* 0x0164 */ s16 waitTimer; // time rupee waits before retreating
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h
index 2aef4b168..f020e8de1 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.h
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.h
@@ -16,9 +16,9 @@ typedef s16 (*callback2_80A3ED24)(GlobalContext*, struct EnGo*);
 // /* 0x20 */ GORON1_DMT_DC_ENTRANCE,
 // /* 0x30 */ GORON1_DMT_ROLLING_SMALL,
 // /* 0x40 */ GORON1_DMT_BOMB_FLOWER,
-// /* 0x50 */ GORON1_CITY_ENTRANCE, 
+// /* 0x50 */ GORON1_CITY_ENTRANCE,
 // /* 0x60 */ GORON1_CITY_ISLAND,
-// /* 0x70 */ GORON1_CITY_LOST_WOODS, 
+// /* 0x70 */ GORON1_CITY_LOST_WOODS,
 // /* 0x80 */ // Not Used
 // /* 0x90 */ GORON1_DMT_BIGGORON,
 
diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.h b/src/overlays/actors/ovl_En_Go2/z_en_go2.h
index d31eb7678..079938097 100644
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.h
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.h
@@ -37,7 +37,7 @@ typedef enum {
 // /* 0x07 */ GORON_FIRE_BOSS_KEY
 // /* 0x08 */ GORON_FIRE_NEAR_BOSS
 // /* 0x09 */ GORON_FIRE_BOSS_KEY
-// /* 0x0A */ GORON_FIRE_MAZE_UPPER, 
+// /* 0x0A */ GORON_FIRE_MAZE_UPPER,
 // /* 0x0B */ GORON_FIRE_HIGHEST
 
 
@@ -69,7 +69,7 @@ typedef struct EnGo2 {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ SkelAnime skelAnime;
     /* 0x0190 */ EnGo2ActionFunc actionFunc;
-    /* 0x0194 */ struct_80034A14_arg1 unk_194;  
+    /* 0x0194 */ struct_80034A14_arg1 unk_194;
     /* 0x01BC */ ColliderCylinder collider;
     /* 0x0208 */ Path* path;
     /* 0x020C */ u8 unk_20C; // counter for GORON_CITY_LINK animation
@@ -78,18 +78,18 @@ typedef struct EnGo2 {
     /* 0x020F */ u8 isAwake; // Conditional
     /* 0x0210 */ s8 waypoint;
     /* 0x0211 */ u8 unk_211; // Conditional
-    // goron link: 0 - rolling, 1 - frozen 
-    // biggoron: 0 - give eyedrops, 1 - applying eyedrops, 2 - getting claimcheck 
-    // generic fire: 0 - 
-    /* 0x0212 */ u8 goronState; 
+    // goron link: 0 - rolling, 1 - frozen
+    // biggoron: 0 - give eyedrops, 1 - applying eyedrops, 2 - getting claimcheck
+    // generic fire: 0 -
+    /* 0x0212 */ u8 goronState;
     /* 0x0213 */ u8 eyeMouthTexState; // 0, 1, 2, 3
-    /* 0x0214 */ u8 eyeTexIndex; 
-    /* 0x0215 */ u8 mouthTexIndex; 
+    /* 0x0214 */ u8 eyeTexIndex;
+    /* 0x0215 */ u8 mouthTexIndex;
     /* 0x0216 */ u8 unk_216; // Set to z rotation, checked by waypoint
     /* 0x0218 */ f32 unk_218;
     /* 0x021C */ char unk_21C[0x04];
     /* 0x0220 */ f32 alpha; // Set to 0, used by func_80A45360, smoothed to this->actor.shape.unk_14 from either 0 or 255.0f
-    /* 0x0224 */ s16 blinkTimer; 
+    /* 0x0224 */ s16 blinkTimer;
     /* 0x0226 */ s16 unk_226[18]; // Remains unknown
     /* 0x024A */ s16 unk_24A[18]; // Remains unknown
     /* 0x026E */ u16 unk_26E; // Remains unknown = 1, 2, or 4: used in func_80034A14
diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h
index af1e4c9d0..8219a8d3b 100644
--- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h
+++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h
@@ -14,7 +14,7 @@ typedef struct EnHeishi1 {
     /* 0x0190 */ Vec3s jointTable[17];
     /* 0x01F6 */ Vec3s morphTable[17];
     /* 0x025C */ EnHeishi1ActionFunc actionFunc;
-    /* 0x0260 */ s16 activeTimer; 
+    /* 0x0260 */ s16 activeTimer;
     /* 0x0262 */ s16 headDirection;
     /* 0x0264 */ s16 headBehaviorDecided;
     /* 0x0266 */ s16 linkDetected;
diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h
index 86a7e0539..83335e49b 100644
--- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h
+++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h
@@ -18,7 +18,7 @@ typedef struct EnHeishi2 {
     /* 0x0260 */ Vec3s unk_260;
     /* 0x0266 */ char unk_266[0x06];
     /* 0x026C */ Vec3s unk_26C; // padding inbetween these
-    /* 0x0274 */ Vec3f unk_274; 
+    /* 0x0274 */ Vec3f unk_274;
     /* 0x0280 */ Vec3f unk_280; // camera related
     /* 0x028C */ Vec3f unk_28C; // camera related
     /* 0x0298 */ Vec3f unk_298; // camera related
diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
index 0597ce76c..dc8fee302 100644
--- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
+++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
@@ -22,7 +22,7 @@ typedef struct EnNwcChick {
     /* 0x30 */ Vec3s rot;
     /* 0x36 */ u16 height;
     /* 0x38 */ CollisionPoly* floorPoly;
-    /* 0x44 */ char unk_3C[0x20]; 
+    /* 0x44 */ char unk_3C[0x20];
 } EnNwcChick; // size = 0x5C
 
 typedef struct EnNwc {
diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
index 142b589c9..9f4559a4a 100644
--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
@@ -17,9 +17,9 @@ typedef struct EnSkb {
     /* 0x0281 */ u8 unk_281;
     /* 0x0282 */ u8 unk_282;
     /* 0x0283 */ u8 unk_283;
-    /* 0x0284 */ EnSkbActionFunc actionFunc; 
+    /* 0x0284 */ EnSkbActionFunc actionFunc;
     /* 0x0288 */ s16 unk_288;
-    /* 0x028C */ BodyBreak bodyBreak; 
+    /* 0x028C */ BodyBreak bodyBreak;
     /* 0x02A4 */ ColliderJntSph collider;
     /* 0x02C4 */ ColliderJntSphElement colliderItem[2];
 } EnSkb; // size = 0x0344
diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.h b/src/overlays/actors/ovl_En_Tp/z_en_tp.h
index c466304c7..3c60b02df 100644
--- a/src/overlays/actors/ovl_En_Tp/z_en_tp.h
+++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.h
@@ -15,7 +15,7 @@ typedef struct EnTp {
     /* 0x0154 */ EnTpActionFunc actionFunc;
     /* 0x0158 */ u8 damageEffect; // Used to propagate the effect to the other segments' actors
     /* 0x015A */ s16 timer;
-    /* 0x015C */ s16 unk_15C; // Multipurpose, used to change the horizontal position of tail segments 
+    /* 0x015C */ s16 unk_15C; // Multipurpose, used to change the horizontal position of tail segments
     /* 0x015E */ s16 alpha; // The dying types fade away
     /* 0x0160 */ s16 red;
     /* 0x0162 */ s16 kiraSpawnTimer;
diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h
index fc2f2e816..182c4ca2f 100644
--- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h
+++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h
@@ -11,7 +11,7 @@ typedef void (*EnWonderItemUpdateFunc)(struct EnWonderItem*, GlobalContext*);
 typedef struct EnWonderItem {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ EnWonderItemUpdateFunc updateFunc;
-    /* 0x0150 */ f32 unkHeight; // sets height of dummied out mode 4 
+    /* 0x0150 */ f32 unkHeight; // sets height of dummied out mode 4
     /* 0x0154 */ s16 wonderMode;
     /* 0x0156 */ s16 itemDrop;
     /* 0x0158 */ s16 numTagPoints;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
index 424d769f1..48b207944 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
@@ -10,7 +10,7 @@ typedef struct {
     /* 0x10 */ f32 scale;
     /* 0x14 */ Vec3f unk_14;
     /* 0x20 */ s16 unk_20;
-    /* 0x22 */ Color_RGBA8 primColor; 
+    /* 0x22 */ Color_RGBA8 primColor;
     /* 0x26 */ Color_RGBA8 envColor;
     /* 0x2A */ s16 type;
     /* 0x2C */ s16 bodyPart;
diff --git a/src/overlays/gamestates/ovl_file_choose/file_choose.h b/src/overlays/gamestates/ovl_file_choose/file_choose.h
index 3590d3048..b3cc2844f 100644
--- a/src/overlays/gamestates/ovl_file_choose/file_choose.h
+++ b/src/overlays/gamestates/ovl_file_choose/file_choose.h
@@ -169,35 +169,35 @@ typedef enum {
     /* 99 */ FS_KBD_BTN_NONE = 99
 } KeyboardButton;
 
-void FileChoose_SetupCopySource(GameState* thisx); 
-void FileChoose_SelectCopySource(GameState* thisx); 
-void FileChoose_SetupCopyDest1(GameState* thisx); 
-void FileChoose_SetupCopyDest2(GameState* thisx); 
-void FileChoose_SelectCopyDest(GameState* thisx); 
-void FileChoose_ExitToCopySource1(GameState* thisx); 
-void FileChoose_ExitToCopySource2(GameState* thisx); 
-void FileChoose_SetupCopyConfirm1(GameState* thisx); 
-void FileChoose_SetupCopyConfirm2(GameState* thisx); 
-void FileChoose_CopyConfirm(GameState* thisx); 
-void FileChoose_ReturnToCopyDest(GameState* thisx); 
-void FileChoose_CopyAnim1(GameState* thisx); 
-void FileChoose_CopyAnim2(GameState* thisx); 
-void FileChoose_CopyAnim3(GameState* thisx); 
-void FileChoose_CopyAnim4(GameState* thisx); 
-void FileChoose_CopyAnim5(GameState* thisx); 
+void FileChoose_SetupCopySource(GameState* thisx);
+void FileChoose_SelectCopySource(GameState* thisx);
+void FileChoose_SetupCopyDest1(GameState* thisx);
+void FileChoose_SetupCopyDest2(GameState* thisx);
+void FileChoose_SelectCopyDest(GameState* thisx);
+void FileChoose_ExitToCopySource1(GameState* thisx);
+void FileChoose_ExitToCopySource2(GameState* thisx);
+void FileChoose_SetupCopyConfirm1(GameState* thisx);
+void FileChoose_SetupCopyConfirm2(GameState* thisx);
+void FileChoose_CopyConfirm(GameState* thisx);
+void FileChoose_ReturnToCopyDest(GameState* thisx);
+void FileChoose_CopyAnim1(GameState* thisx);
+void FileChoose_CopyAnim2(GameState* thisx);
+void FileChoose_CopyAnim3(GameState* thisx);
+void FileChoose_CopyAnim4(GameState* thisx);
+void FileChoose_CopyAnim5(GameState* thisx);
 
-void FileChoose_ExitCopyToMain(GameState* thisx); 
-void FileChoose_SetupEraseSelect(GameState* thisx); 
-void FileChoose_EraseSelect(GameState* thisx); 
-void FileChoose_SetupEraseConfirm1(GameState* thisx); 
-void FileChoose_SetupEraseConfirm2(GameState* thisx); 
-void FileChoose_EraseConfirm(GameState* thisx); 
-void FileChoose_ExitToEraseSelect1(GameState* thisx); 
-void FileChoose_ExitToEraseSelect2(GameState* thisx); 
-void FileChoose_EraseAnim1(GameState* thisx); 
-void FileChoose_EraseAnim2(GameState* thisx); 
-void FileChoose_EraseAnim3(GameState* thisx); 
-void FileChoose_ExitEraseToMain(GameState* thisx); 
+void FileChoose_ExitCopyToMain(GameState* thisx);
+void FileChoose_SetupEraseSelect(GameState* thisx);
+void FileChoose_EraseSelect(GameState* thisx);
+void FileChoose_SetupEraseConfirm1(GameState* thisx);
+void FileChoose_SetupEraseConfirm2(GameState* thisx);
+void FileChoose_EraseConfirm(GameState* thisx);
+void FileChoose_ExitToEraseSelect1(GameState* thisx);
+void FileChoose_ExitToEraseSelect2(GameState* thisx);
+void FileChoose_EraseAnim1(GameState* thisx);
+void FileChoose_EraseAnim2(GameState* thisx);
+void FileChoose_EraseAnim3(GameState* thisx);
+void FileChoose_ExitEraseToMain(GameState* thisx);
 
 void FileChoose_UpdateKeyboardCursor(GameState* thisx);
 void FileChoose_StartNameEntry(GameState* thisx);
diff --git a/sym_info.py b/sym_info.py
index ed37d6ce2..753fb9a1a 100755
--- a/sym_info.py
+++ b/sym_info.py
@@ -62,7 +62,7 @@ def search_address(target_addr):
                 continue
 
             ram = int(line[16 : 16 + 18], 0)
-            rom = ram - ram_offset 
+            rom = ram - ram_offset
             sym = line.split()[-1]
 
             if sym.startswith("0x"):
diff --git a/tools/assist.py b/tools/assist.py
index 8deabc8f6..53c9bcd93 100755
--- a/tools/assist.py
+++ b/tools/assist.py
@@ -103,7 +103,7 @@ def diff_syms(qb, tb):
     else:
         larger = tb
         smaller = qb
-    
+
     len_ratio = len(smaller) / len(larger)
 
     n_bytes = len(smaller)
diff --git a/tools/bootstrap_actors.py b/tools/bootstrap_actors.py
index fc7f2d4eb..405278827 100644
--- a/tools/bootstrap_actors.py
+++ b/tools/bootstrap_actors.py
@@ -100,7 +100,7 @@ def bootstrap(ovl_path, ovl_text):
     if init_data is None or len(init_data.regs) == 0:
         return ""
     init_data = data_text[init_data.regs[0][0]:init_data.regs[0][1]]
-    
+
     lines = init_data.split("\n")
 
     init_var_label = lines[0][7:]
@@ -167,14 +167,14 @@ def bootstrap(ovl_path, ovl_text):
         init_vars += indent + "(ActorFunc)Actor_Noop,\n"
     else:
         init_vars += indent + "(ActorFunc)" + init_func_name + ",\n"
-    
+
     if destroy_func == "0x00000000":
         init_vars += indent + "NULL,\n"
     elif destroy_func == "Actor_Noop":
         init_vars += indent + "(ActorFunc)Actor_Noop,\n"
     else:
         init_vars += indent + "(ActorFunc)" + destroy_func_name + ",\n"
-    
+
     if update_func == "0x00000000":
         init_vars += indent + "NULL,\n"
     elif update_func == "Actor_Noop":
@@ -188,7 +188,7 @@ def bootstrap(ovl_path, ovl_text):
         init_vars += indent + "(ActorFunc)Actor_Noop,\n"
     else:
         init_vars += indent + "(ActorFunc)" + draw_func_name + ",\n"
-    
+
     init_vars += "};\n"
 
     return struct_text + "\n" + defines + "\n" + decs + "\n/*\n" + init_vars + "*/"
@@ -208,7 +208,7 @@ def main():
                         newline_spot = file_text.find("\n\n") + 1
                         newfile_text = file_text[:newline_spot] + "\n" + bootstrap_text + file_text[newline_spot:]
                         newfile_text = newfile_text.replace("\n\n\n\n\n", "\n")
-                        
+
                         with open(file_path, "w", newline="\n") as f:
                             f.write(newfile_text)
                     else:
diff --git a/tools/bootstrap_fx.py b/tools/bootstrap_fx.py
index d280f23cc..0d3187dd1 100755
--- a/tools/bootstrap_fx.py
+++ b/tools/bootstrap_fx.py
@@ -132,10 +132,10 @@ def get_header(header_path):
     ovl_name = path_split[-2]
     short_name = ovl_name[14:]
     init_vars_name = "".join(ovl_name[4:].split("_")) + "InitParams"
-    
+
     ifndef = "#ifndef _Z_EFF_SS_" + short_name.upper() + "_H_\n" + \
              "#define _Z_EFF_SS_" + short_name.upper() + "_H_\n\n"
-    
+
     includes = "#include <ultra64.h>\n#include <global.h>\n\n"
 
     struct = "typedef struct {\n" + \
diff --git a/tools/convert_chars.py b/tools/convert_chars.py
index c58886777..3778165e5 100644
--- a/tools/convert_chars.py
+++ b/tools/convert_chars.py
@@ -10,22 +10,22 @@ root_dir = script_dir + "/../"
 
 def handle_match(match):
     original_text = match.group()
-    
+
     match_text = original_text.replace("\\x", "")
 
     if match_text.lower() == "1b":
         return original_text
-    
+
     end = ""
     if original_text.lower().endswith("\\x1b"):
         end = original_text[-4:]
         match_text = match_text[:-2]
-        
+
     try:
         text = bytes.fromhex(match_text).decode("EUC-JP")
     except UnicodeDecodeError:
         return original_text
-    
+
     if text[2:].lower() == match_text.lower():
         return original_text
 
diff --git a/tools/create_actor_headers.py b/tools/create_actor_headers.py
index b3b28c818..f928d2f7d 100644
--- a/tools/create_actor_headers.py
+++ b/tools/create_actor_headers.py
@@ -18,12 +18,12 @@ includes = "#include <ultra64.h>\n#include <global.h>\n\n"
 def remove_struct(root, filename):
     with open(os.path.join(root, filename)) as f:
         c_text = f.read()
-    
+
     struct_start = c_text.find("typedef")
     struct_end = c_text.find("#define")
 
     struct = c_text[struct_start:struct_end]
-    
+
     newfile_text = "#include \"" + filename[:-2] + ".h\"" + "\n\n" + c_text[struct_end:]
     with open(os.path.join(root, filename), "w", newline="\n") as f:
         f.write(newfile_text)
@@ -51,7 +51,7 @@ def handle_file(root, filename):
     header_text += "extern const ActorInit " + init_vars_name + ";\n\n"
 
     header_text += "#endif\n"
-    
+
     with open(os.path.join(root, filename[:-2] + ".h"), "w", newline="\n") as f:
         f.write(header_text)
 
diff --git a/tools/disasm_elf_msg.py b/tools/disasm_elf_msg.py
index 4d58c9d27..840cf81c8 100644
--- a/tools/disasm_elf_msg.py
+++ b/tools/disasm_elf_msg.py
@@ -204,7 +204,7 @@ def disas_elfmsgs(start):
             assert False , "Encountered unknown type"
 
         ARG_2 = f"{bool(b0 & 1)}".lower()
-    
+
         # Get condition
         condition_type = b0 & 0x1E
 
diff --git a/tools/elf2rom.c b/tools/elf2rom.c
index 366c05f08..907e4e32b 100644
--- a/tools/elf2rom.c
+++ b/tools/elf2rom.c
@@ -50,7 +50,7 @@ static char *sprintf_alloc(const char *fmt, ...)
     va_end(args);
 
     buffer = malloc(size);
-    
+
     va_start(args, fmt);
     vsprintf(buffer, fmt, args);
     va_end(args);
@@ -155,7 +155,7 @@ static void parse_input_file(const char *filename)
             segment->romStart = find_rom_address(syms, numRomSymbols, segment->name, "Start");
             segment->romEnd = find_rom_address(syms, numRomSymbols, segment->name, "End");
         }
-            
+
     }
 
     g_romSize = find_symbol_value(syms, numRomSymbols, "_RomSize");
diff --git a/tools/elf32.c b/tools/elf32.c
index f5dcafc0d..51ac11a99 100644
--- a/tools/elf32.c
+++ b/tools/elf32.c
@@ -46,7 +46,7 @@ static const void *get_section_contents(struct Elf32 *e, int secnum)
 {
     size_t secoffset = e->shoff + secnum * 0x28;
     size_t dataoffset;
-    
+
     if (secnum >= e->shnum || secoffset >= e->dataSize)
         return NULL;
     dataoffset = e->read32(e->data + secoffset + 0x10);
@@ -102,14 +102,14 @@ bool elf32_init(struct Elf32 *e, const void *data, size_t size)
     e->shentsize = e->read16(e->data + 0x2E);
     e->shnum     = e->read16(e->data + 0x30);
     e->shstrndx  = e->read16(e->data + 0x32);
-    
+
     // find symbol table section
     e->symtabndx = -1;
     for (i = 0; i < e->shnum; i++)
     {
         const uint8_t *sechdr = get_section_header(e, i);
         uint32_t type = e->read32(sechdr + 0x04);
-        
+
         if (type == SHT_SYMTAB)
         {
             e->symtabndx = i;
@@ -123,12 +123,12 @@ bool elf32_init(struct Elf32 *e, const void *data, size_t size)
     {
         const uint8_t *sechdr = get_section_header(e, i);
         uint32_t type = e->read32(sechdr + 0x04);
-        
+
         if (type == SHT_STRTAB)
         {
             const char *strings = get_section_contents(e, e->shstrndx);
             const char *secname = strings + e->read32(sechdr + 0);
-            
+
             if (strcmp(secname, ".strtab") == 0)
             {
                 e->strtabndx = i;
@@ -136,19 +136,19 @@ bool elf32_init(struct Elf32 *e, const void *data, size_t size)
             }
         }
     }
-    
+
     e->numsymbols = 0;
     if (e->symtabndx != -1)
     {
         const uint8_t *sechdr = get_section_header(e, e->symtabndx);
         //const uint8_t *symtab = get_section_contents(e, e->symtabndx);
-        
+
         e->numsymbols = e->read32(sechdr + 0x14) / e->read32(sechdr + 0x24);
     }
 
     if (e->shoff + e->shstrndx * 0x28 >= e->dataSize)
         return false;
-    
+
     return true;
 }
 
diff --git a/tools/find_unused_asm.sh b/tools/find_unused_asm.sh
index 56009ed21..9c483d0d0 100755
--- a/tools/find_unused_asm.sh
+++ b/tools/find_unused_asm.sh
@@ -23,18 +23,18 @@ rm old_list.txt cur_list.txt old_data_list.txt data_list.txt list.txt
 
 if [ "$1" = "-d" ]
 then
-	if [ -s diff.txt ]
-	then
-		rm $(cat diff.txt)
-	fi
-	rm diff.txt
+    if [ -s diff.txt ]
+    then
+        rm $(cat diff.txt)
+    fi
+    rm diff.txt
 else
-	if [ -s diff.txt ]
-	then
-		cat diff.txt
-		rm diff.txt
-		exit 55
-	else
-		rm diff.txt
-	fi
+    if [ -s diff.txt ]
+    then
+        cat diff.txt
+        rm diff.txt
+        exit 55
+    else
+        rm diff.txt
+    fi
 fi
diff --git a/tools/fix_data_stuff.py b/tools/fix_data_stuff.py
index d5c2863fb..17565e7cd 100644
--- a/tools/fix_data_stuff.py
+++ b/tools/fix_data_stuff.py
@@ -45,9 +45,9 @@ def main():
         spec_text = spec_file.read()
 
     spec_text_replaced = re.sub(".*ovl_.*\.o.*\n", handle_actor_line, spec_text)
-    
+
     with open(root_dir + "spec", "w", newline="\n") as spec_file:
         spec_file.write(spec_text_replaced)
 
 
-main()
\ No newline at end of file
+main()
diff --git a/tools/format_s_files.py b/tools/format_s_files.py
index ecac74f43..a0b7b6bf3 100644
--- a/tools/format_s_files.py
+++ b/tools/format_s_files.py
@@ -49,7 +49,7 @@ def remove_balign_after_float(file_text):
 def format_file(file_path):
     with open(file_path) as f:
         orig_file_text = f.read()
-    
+
     file_text = orig_file_text
 
     # Condense 2+ empty lines to 1
diff --git a/tools/get_actor_sizes.py b/tools/get_actor_sizes.py
index 896030e29..7d62387e1 100755
--- a/tools/get_actor_sizes.py
+++ b/tools/get_actor_sizes.py
@@ -45,11 +45,11 @@ def count_non_matching():
                 actor_funcs[f_name] = file_size
 
             overlays[actor_dir] = {
-                "summary": (num_files, max_size, total_size, 
+                "summary": (num_files, max_size, total_size,
                     total_size / num_files),
                 "funcs": actor_funcs
             }
-    
+
     return overlays
 
 
@@ -60,7 +60,7 @@ def count_builded_funcs_and_instructions(f_path):
     f_lines = ""
     with open(f_path) as f:
         f_lines = f.readlines()
-    
+
     current = ""
     funcs = {}
     for line in f_lines:
@@ -101,7 +101,7 @@ def count_build():
 
                 file_path = os.path.join(ovl_path, f_name)
                 funcs = count_builded_funcs_and_instructions(file_path)
-                
+
                 if len(funcs) > 0:
                     num_files += len(funcs)
                     # round up the file size to a multiple of four.
@@ -111,7 +111,7 @@ def count_build():
                     actor_funcs = {**actor_funcs, **funcs}
 
             overlays[actor_dir] = {
-                "summary": (num_files, max_size, total_size, 
+                "summary": (num_files, max_size, total_size,
                     total_size / num_files),
                 "funcs": actor_funcs
             }
diff --git a/tools/ichaindis.py b/tools/ichaindis.py
index 50d909972..e20fd6e5a 100755
--- a/tools/ichaindis.py
+++ b/tools/ichaindis.py
@@ -45,7 +45,7 @@ def get_actor_var_names():
                 if "}" in line:
                     # Reached the end of the actor struct so break out
                     break
-                
+
                 # Parse out the memory address (from the comment) and the variable name
                 regex = r'.*\/\* (.*) \*\/\s+(struct)?\s*.+\s+(.+);.*'
                 actor_var_info = re.match(regex, line)
@@ -66,7 +66,7 @@ def main():
     parser.add_argument('offset', help='ROM offset or symbol of an InitChain')
     parser.add_argument('--names', action="store_true", help='Retrieve variable names from the actor struct')
     args = parser.parse_args()
-    
+
     # Get the ROM address, if the offset is already a ROM address it will just be returned.
     args.offset = get_rom_address(args.offset)
 
@@ -101,7 +101,7 @@ def main():
             var_name = actor_variable_names[var_name]
         else:
             var_name = "unk_" + var_name
-        
+
         print('    {0}({1}, {2}, {3}),'.format(ICHAIN_MACROS[t], var_name, value, ('ICHAIN_CONTINUE' if cont == 1 else 'ICHAIN_STOP')))
         if cont == 0:
             break
diff --git a/tools/migrate-rodata.py b/tools/migrate-rodata.py
index e0ed1cc81..0b5c9e271 100644
--- a/tools/migrate-rodata.py
+++ b/tools/migrate-rodata.py
@@ -103,7 +103,7 @@ def is_rodata(r):
 """
 For given asm and rodata files, build a rodata section for the asm file
 """
-def build_rodata(asm, rodata): 
+def build_rodata(asm, rodata):
     contained_syms = [s for s in asm_syms(asm) if s in rodata_syms(rodata)]
     contained_blocks = [b for b in rodata_blocks(rodata) if rodata_sym(b) in contained_syms]
     # TODO include arrays in rodata_list
@@ -188,7 +188,7 @@ Processes each individual file
  data\code\
 """
 def process_file(filename, identifier, delete_rodata):
-    folder_path = "asm" + sep + "non_matchings" + sep + ("code" + sep if identifier=="code" else "overlays" + sep + identifier.lower() + sep + "ovl_") + filename + sep 
+    folder_path = "asm" + sep + "non_matchings" + sep + ("code" + sep if identifier=="code" else "overlays" + sep + identifier.lower() + sep + "ovl_") + filename + sep
     rodata_path = "data" + sep + (sep if identifier=="code" else "overlays" + sep + identifier.lower() + sep + "z_") + filename.lower() + ".rodata.s"
     if filename == "player":
         folder_path = "asm" + sep + "non_matchings" + sep + "overlays" + sep + "actors" + sep + "ovl_player_actor" + sep
@@ -227,7 +227,7 @@ def process_files(filenames, identifier, spechandle, delete_rodata):
         files = filenames.split(",")
         for f in files:
             process_file(f, identifier, delete_rodata)
-    else: 
+    else:
         process_file(filenames, identifier, delete_rodata)
     if spechandle.lower() == "delete":
         modify_spec(filenames, identifier, True)
@@ -294,4 +294,3 @@ run(False)
     # command = "echo >> src/overlays/effects/ovl_" + effects[i] + "/z_" + effects[i].lower() + ".c"
     # os.system(command) # purpose of this is to "modify" each C file in order to prevent undefined symbol errors.
     #                    # the new line will be removed by format.sh
-    
diff --git a/tools/mkdmadata.c b/tools/mkdmadata.c
index 134cdd316..a9ed12db7 100644
--- a/tools/mkdmadata.c
+++ b/tools/mkdmadata.c
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     FILE *dmaout;
     void *spec;
     size_t size;
-    
+
     if (argc != 3)
     {
         usage(argv[0]);
diff --git a/tools/mkldscript.c b/tools/mkldscript.c
index c8424f822..f491a6a66 100644
--- a/tools/mkldscript.c
+++ b/tools/mkldscript.c
@@ -88,7 +88,7 @@ static void write_ld_script(FILE *fout)
         fprintf(fout, "        _%sSegmentDataEnd = .;\n", seg->name);
 
         fprintf(fout, "    _%sSegmentDataSize = ABSOLUTE( _%sSegmentDataEnd - _%sSegmentDataStart );\n", seg->name, seg->name, seg->name);
-        
+
         fprintf(fout, "        _%sSegmentRoDataStart = .;\n", seg->name);
 
         for (j = 0; j < seg->includesCount; j++)
@@ -135,7 +135,7 @@ static void write_ld_script(FILE *fout)
 
         if (seg->fields & (1 << STMT_increment))
             fprintf(fout, "    . += 0x%08X;\n", seg->increment);
-        
+
 
         fputs("    }\n", fout);
         //fprintf(fout, "    _RomSize += ( _%sSegmentDataEnd - _%sSegmentTextStart );\n", seg->name, seg->name);
diff --git a/tools/msgdis.py b/tools/msgdis.py
index 091b16ec0..823da6670 100644
--- a/tools/msgdis.py
+++ b/tools/msgdis.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
-# 
+#
 # message_data_static disassembler/decompiler
-# 
+#
 
 import re, struct
 from os import path
@@ -129,11 +129,11 @@ colors = {
 
 highscores = {
     0x00 : "HS_HORSE_ARCHERY",
-    0x01 : "HS_POE_POINTS",   
-    0x02 : "HS_LARGEST_FISH", 
-    0x03 : "HS_HORSE_RACE",   
-    0x04 : "HS_MARATHON",     
-    0x06 : "HS_DAMPE_RACE",   
+    0x01 : "HS_POE_POINTS",
+    0x02 : "HS_LARGEST_FISH",
+    0x03 : "HS_HORSE_RACE",
+    0x04 : "HS_MARATHON",
+    0x06 : "HS_DAMPE_RACE",
 }
 
 def format_char(byte):
@@ -195,7 +195,7 @@ def decode(read_bytes, box_type):
                 if byte == ord(ctrl):
                     name = control_codes[ctrl]
                     # single bytes
-                    if (name == "COLOR" or name == "SHIFT" or name == "BOX_BREAK_DELAYED" or 
+                    if (name == "COLOR" or name == "SHIFT" or name == "BOX_BREAK_DELAYED" or
                         name == "FADE" or name == "ITEM_ICON" or name == "TEXT_SPEED" or
                         name == "HIGHSCORE"):
                         buf.append("\" " + name + "(")
@@ -340,7 +340,7 @@ def dump_all_text():
                 with open("baserom/ger_message_data_static","rb") as infile:
                     infile.seek(ger_offset)
                     ger_text = fixup_message(decode(infile.read(ger_length), entry[1]).replace("\x00","",-1))
-                
+
                 fra_offset = segmented_to_physical(entry[5])
                 fra_length = next_entry[5] - entry[5]
                 with open("baserom/fra_message_data_static","rb") as infile:
diff --git a/tools/overlayhelpers/filemap.py b/tools/overlayhelpers/filemap.py
index c406fdfed..58dd7e0e4 100644
--- a/tools/overlayhelpers/filemap.py
+++ b/tools/overlayhelpers/filemap.py
@@ -36,7 +36,7 @@ def CreateAddrLookup(dict, recs, tracer):
     print(length)
     recs.append((recs[length-1][1], None, None))
     recs = sorted(recs, key=lambda x: x[0], reverse=True)
-    
+
     for i in range(length):
         if recs[i][0] != recs[i+1][1]:
             if tracer != "ra" or recs[i][0] != recs[i+1][1] + 0xFFF & -0x1000:
@@ -51,7 +51,7 @@ def CreateTable():
     vrecs = []
     rrecs = []
     vrecs.append((PVA(0x80157D90), PVA(0x80800000), None))
-    
+
     dict = {
         "va" : {},
         "ra" : {},
@@ -67,14 +67,14 @@ def CreateTable():
             vrecs.append(vrec)
             dict["ft"][li[7]] = (rrec[0], rrec[1])
     file = None
-    
+
     with open("filetable2.txt", "r") as file:
         for line in file:
             li = line.rstrip().split('\t')
             rrec = (int(li[2],16), int(li[3],16), li[5])
             rrecs.append(rrec)
             dict["ft"][li[5]] = (rrec[0], rrec[1])
-    
+
     CreateAddrLookup(dict["va"], vrecs, "va")
     CreateAddrLookup(dict["ra"], rrecs, "ra")
 
@@ -85,7 +85,7 @@ def AddressLookup(lookupTable, addr):
     start = 0;
     end = 0;
     key = None;
-    
+
     for k, v in lookupTable.items():
         if addr >= k:
             start = k
@@ -93,13 +93,13 @@ def AddressLookup(lookupTable, addr):
             break
         end = k
     return (key, start, end)
-        
+
 def GetFromVRam(addr):
     key, vramStart, vramEnd = AddressLookup(table["va"], PVA(addr))
-    
+
     if key is None:
         return None
-        
+
     ftl = table["ft"][key]
     vrom = AddrRange(ftl[0], ftl[1])
     vram = AddrRange(UVA(vramStart), UVA(vramEnd))
@@ -107,13 +107,13 @@ def GetFromVRam(addr):
     offset = addr - vram.start
 
     return FileResult(key, vrom, vram, offset)
-    
+
 def GetFromRom(addr):
     key, romStart, romEnd = AddressLookup(table["ra"], addr)
-    
+
     if key is None:
         return None
-        
+
     vrom = AddrRange(romStart, romEnd)
     offset = addr - vrom.start
 
diff --git a/tools/overlayhelpers/lmapmark.py b/tools/overlayhelpers/lmapmark.py
index 3b5c9ddc2..5075bcae8 100644
--- a/tools/overlayhelpers/lmapmark.py
+++ b/tools/overlayhelpers/lmapmark.py
@@ -69,7 +69,7 @@ def IND(n):
 
 
 scriptDir = os.path.dirname(os.path.realpath(__file__))
-repo = scriptDir + os.sep +  ".." + os.sep + ".."    
+repo = scriptDir + os.sep +  ".." + os.sep + ".."
 
 
 kaleido_scope_data = []
diff --git a/tools/overlayhelpers/mapmark.py b/tools/overlayhelpers/mapmark.py
index 8cc91ae77..8f0186bf9 100644
--- a/tools/overlayhelpers/mapmark.py
+++ b/tools/overlayhelpers/mapmark.py
@@ -110,7 +110,7 @@ for i in range(NUM_SCENES):
 cstr = HEADER
 
 for scenemap in scenemaps:
-    cstr += f"MapMarkData {GetDungeonSymbol(scenemap[0])}[] = {{\n" 
+    cstr += f"MapMarkData {GetDungeonSymbol(scenemap[0])}[] = {{\n"
     for mapId, map in enumerate(scenemap[1]):
         cstr += IND(1) + f"// {GetDungeonName(scenemap[0])} minimap {mapId}\n"
         cstr += IND(1) + "{\n"
@@ -130,7 +130,7 @@ for scenemap in scenemaps:
 
 cstr += "MapMarkData* gMapMarkDataTable[] = {\n"
 for scenemap in scenemaps:
-    cstr += f"    {GetDungeonSymbol(scenemap[0])},\n" 
+    cstr += f"    {GetDungeonSymbol(scenemap[0])},\n"
 cstr += "};\n"
 
 with open(sys.argv[1], "w") as file:
diff --git a/tools/regconvert.py b/tools/regconvert.py
index 48132422d..747b6a847 100755
--- a/tools/regconvert.py
+++ b/tools/regconvert.py
@@ -42,7 +42,7 @@ def read_file(filename):
 
         file_contents = file_contents[end:]
         match = pattern.search(file_contents)
-    
+
     parsed_contents += file_contents
     return parsed_contents
 
@@ -81,7 +81,7 @@ def main():
         else:
             write_file(filename, contents)
     else:
-        index = parse_number(args.index, args.hex)        
+        index = parse_number(args.index, args.hex)
         if args.offset:
             offset = index
             if not check_valid_offset(offset):
diff --git a/tools/spec.c b/tools/spec.c
index 06e0f6a80..a31c5c092 100644
--- a/tools/spec.c
+++ b/tools/spec.c
@@ -172,7 +172,7 @@ void parse_rom_spec(char *spec, struct Segment **segments, int *segment_count)
             if (currSeg != NULL)
             {
                 // ensure no duplicates (except for 'include' or 'pad_text')
-                if (stmt != STMT_include && stmt != STMT_include_data_with_rodata && stmt != STMT_pad_text && 
+                if (stmt != STMT_include && stmt != STMT_include_data_with_rodata && stmt != STMT_pad_text &&
                     (currSeg->fields & (1 << stmt)))
                     util_fatal_error("line %i: duplicate '%s' statement", lineNum, stmtName);
 
diff --git a/tools/specprocess.py b/tools/specprocess.py
index 234ea4bd2..082c21f24 100644
--- a/tools/specprocess.py
+++ b/tools/specprocess.py
@@ -52,4 +52,4 @@ for i in range(0, len(specLines)):
 
 specOut = open("build/spec_preproc", "w");
 specOut.writelines(specLines);
-specOut.close();
\ No newline at end of file
+specOut.close();
diff --git a/tools/split_out_overlay_funcs.py b/tools/split_out_overlay_funcs.py
index 691763bc2..c95457ac7 100644
--- a/tools/split_out_overlay_funcs.py
+++ b/tools/split_out_overlay_funcs.py
@@ -23,7 +23,7 @@ def handle_file(asm_root, asm_file, c_file_path):
     file_path = os.path.join(asm_root, asm_file)
     with open(file_path) as f:
         file_lines = f.readlines()
-    
+
     new_files = []
     num_rodata = 0
     for i, line in enumerate(file_lines):
@@ -53,10 +53,10 @@ def handle_file(asm_root, asm_file, c_file_path):
             new_file_lines = file_lines[new_file[0]:new_files[i+1][0]]
         else:
             new_file_lines = file_lines[new_file[0]:]
-        
+
         with open(os.path.join(asm_root, new_file[1]), mode="w", newline="\n") as out_file:
             out_file.writelines(new_file_lines)
-    
+
     os.remove(c_file_path)
 
     pragma_begin = "#pragma GLOBAL_ASM(\"" + asm_root.split("../")[1] + "/"
diff --git a/tools/util.c b/tools/util.c
index e826906cd..421215fce 100644
--- a/tools/util.c
+++ b/tools/util.c
@@ -59,13 +59,13 @@ void *util_read_whole_file(const char *filename, size_t *pSize)
 void util_write_whole_file(const char *filename, const void *data, size_t size)
 {
     FILE *file = fopen(filename, "wb");
-    
+
     if (file == NULL)
         util_fatal_error("failed to open file '%s' for writing: %s", filename, strerror(errno));
 
     if (fwrite(data, size, 1, file) != 1)
         util_fatal_error("error writing to file '%s': %s", filename, strerror(errno));
-    
+
     fclose(file);
 }
 
diff --git a/tools/vt_fmt.py b/tools/vt_fmt.py
index f278f826c..6925734f7 100755
--- a/tools/vt_fmt.py
+++ b/tools/vt_fmt.py
@@ -59,7 +59,7 @@ def vt_fmt(text):
 
         i += 1
 
-    
+
     if curLiteral:
         chars += '\"'
 
@@ -70,7 +70,7 @@ def main():
     parser = argparse.ArgumentParser(description='Properly formats VT macros')
     parser.add_argument('string', help='String to format')
     args = parser.parse_args()
-    
+
     print(vt_fmt(args.string))
 
 
diff --git a/tools/vtxdis.c b/tools/vtxdis.c
index 495d7cea9..86a8d0b2a 100644
--- a/tools/vtxdis.c
+++ b/tools/vtxdis.c
@@ -37,7 +37,7 @@ static const struct option cmdline_opts[] = {
 static uint32_t parse_int(const char *num){
     uint32_t ret;
     char outnum[21];
-    
+
     if(strlen(num) > 2 && num[0] == '0' && (num[1] == 'x' || num[1] == 'X')) {
         strncpy(outnum, &num[2], 20);
         sscanf(outnum, "%"SCNx32, &ret);