From a9c2449c11ef3f0c4089c0741923790f83927c8f Mon Sep 17 00:00:00 2001
From: Tom Overton <tom-overton@users.noreply.github.com>
Date: Sun, 16 Jan 2022 10:36:19 -0800
Subject: [PATCH] Bring merged assets up to current standards (#570)

* Bring merged assets up to current standards

* Clarify bigslime
---
 assets/xml/objects/object_bigpo.xml      | 1 +
 assets/xml/objects/object_bigslime.xml   | 1 +
 assets/xml/objects/object_gmo.xml        | 3 ++-
 assets/xml/objects/object_mag.xml        | 1 +
 assets/xml/objects/object_tokei_step.xml | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/assets/xml/objects/object_bigpo.xml b/assets/xml/objects/object_bigpo.xml
index c41d5ff793..531a151c6a 100644
--- a/assets/xml/objects/object_bigpo.xml
+++ b/assets/xml/objects/object_bigpo.xml
@@ -1,4 +1,5 @@
 <Root>
+    <!-- Assets for Big Poes -->
     <File Name="object_bigpo" Segment="6">
         <Animation Name="gBigpoSwingLampAttackAnim" Offset="0x158" />
         <Animation Name="gBigpoShockAnim" Offset="0x454" />
diff --git a/assets/xml/objects/object_bigslime.xml b/assets/xml/objects/object_bigslime.xml
index 18b7025061..5b7530addf 100644
--- a/assets/xml/objects/object_bigslime.xml
+++ b/assets/xml/objects/object_bigslime.xml
@@ -1,4 +1,5 @@
 <Root>
+    <!-- Assets for the Gekko, Minislime, and Bigslime -->
     <File Name="object_bigslime" Segment="6">
         <Animation Name="gGekkoFullFistPumpAnim" Offset="0x994" />
         <Animation Name="gGekkoSurpriseJumpAnim" Offset="0x10F4" />
diff --git a/assets/xml/objects/object_gmo.xml b/assets/xml/objects/object_gmo.xml
index 4884d79190..266c703831 100644
--- a/assets/xml/objects/object_gmo.xml
+++ b/assets/xml/objects/object_gmo.xml
@@ -1,9 +1,10 @@
 <Root>
+    <!-- Assets for Nejiron -->
     <File Name="object_gmo" Segment="6">
         <Animation Name="gNejironIdleAnim" Offset="0x18" /> <!-- Original name might be "gm_default" -->
         <DList Name="gNejironBodyDL" Offset="0xB70" />
         <DList Name="gNejironEyesDL" Offset="0xE38" />
-        <Texture Name="gNejironBodyTLUT" OutName="nejiron_body_palette" Format="rgba16" Width="16" Height="16" Offset="0xEC8" />
+        <Texture Name="gNejironBodyTLUT" OutName="nejiron_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0xEC8" />
         <Texture Name="gNejironBodyTex" OutName="nejiron_body" Format="ci8" Width="32" Height="32" Offset="0x10C8" />
         <Texture Name="gNejironEyeOpenTex" OutName="nejiron_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x14C8" />
         <Texture Name="gNejironEyeHalfTex" OutName="nejiron_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x18C8" />
diff --git a/assets/xml/objects/object_mag.xml b/assets/xml/objects/object_mag.xml
index 6ec4426d8c..29d30daad7 100644
--- a/assets/xml/objects/object_mag.xml
+++ b/assets/xml/objects/object_mag.xml
@@ -1,4 +1,5 @@
 <Root>
+    <!-- Textures for the title screen -->
     <File Name="object_mag" Segment="6">
         <Texture Name="gTitleScreenZeldaLogoTex" OutName="title_screen_zelda_logo" Format="rgba32" Width="144" Height="64" Offset="0x0"/>
         <Texture Name="gTitleScreenMajorasMaskSubtitleTex" OutName="title_screen_majoras_mask_subtitle" Format="i8" Width="104" Height="16" Offset="0x9000"/>
diff --git a/assets/xml/objects/object_tokei_step.xml b/assets/xml/objects/object_tokei_step.xml
index ecdf14ac38..aac4b5ea91 100644
--- a/assets/xml/objects/object_tokei_step.xml
+++ b/assets/xml/objects/object_tokei_step.xml
@@ -1,4 +1,5 @@
 <Root>
+    <!-- Assets for the Clock Tower steps -->
     <File Name="object_tokei_step" Segment="6">
         <DList Name="gClocktowerPanelEmptyDL" Offset="0x80" />
         <DList Name="gClocktowerPanelDL" Offset="0x88" />