En_Door (#571)

* progress

* it matches mostly

* symbols

* done for now

* fix warnings and stuff

* formatter

* NON_EQUIVALENT

* pr fixes

* formatter and actorfixer

* fix pm

* more fixes

* PR fixes

* it actually builds again

* matching function

Co-authored-by: Louis <louist103@pop-os.localdomain>

9 files changed, 25 insertions, 25 deletions

diff --git a/assets/xml/objects/gameplay_field_keep.xml b/assets/xml/objects/gameplay_field_keep.xml
index 537d596a6..a73a2f28d 100644
--- a/assets/xml/objects/gameplay_field_keep.xml
+++ b/assets/xml/objects/gameplay_field_keep.xml
@@ -26,12 +26,12 @@
         <DList Name="gameplay_field_keep_DL_003870" Offset="0x3870" />
         <DList Name="gameplay_field_keep_DL_003938" Offset="0x3938" />
         <Collision Name="gameplay_field_keep_Colheader_003A60" Offset="0x3A60" />
-        <DList Name="gameplay_field_keep_DL_003FD0" Offset="0x3FD0" />
-        <DList Name="gameplay_field_keep_DL_004050" Offset="0x4050" />
-        <DList Name="gameplay_field_keep_DL_004228" Offset="0x4228" />
+        <DList Name="gFieldWoodDoorFrameDL" Offset="0x3FD0" />
+        <DList Name="gFieldWoodDoorLeftDL" Offset="0x4050" />
+        <DList Name="gFieldWoodDoorRightDL" Offset="0x4228" />
         <Texture Name="gameplay_field_keep_Tex_004400" OutName="tex_004400" Format="rgba16" Width="16" Height="16" Offset="0x4400" />
         <Texture Name="gameplay_field_keep_Tex_004600" OutName="tex_004600" Format="rgba16" Width="16" Height="16" Offset="0x4600" />
-        <Texture Name="gameplay_field_keep_Tex_004800" OutName="tex_004800" Format="i4" Width="64" Height="128" Offset="0x4800" />
+        <Texture Name="gFieldWoodDoorTex" OutName="wood_door" Format="i4" Width="64" Height="128" Offset="0x4800" />
         <Texture Name="gameplay_field_keep_TLUT_005800" OutName="tlut_005800" Format="rgba16" Width="4" Height="4" Offset="0x5800" />
         <Texture Name="gameplay_field_keep_Tex_005828" OutName="tex_005828" Format="ci4" Width="64" Height="64" Offset="0x5828" />
         <DList Name="gameplay_field_keep_DL_0061E8" Offset="0x61E8" />
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index a6504f2f3..265f1d560 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -882,8 +882,8 @@
         <Animation Name="gameplay_keep_Anim_0205A0" Offset="0x205A0" />
         <Animation Name="gameplay_keep_Anim_020658" Offset="0x20658" />
         <DList Name="gameplay_keep_DL_020B30" Offset="0x20B30" />
-        <DList Name="gameplay_keep_DL_020BB8" Offset="0x20BB8" />
-        <DList Name="gameplay_keep_DL_020D00" Offset="0x20D00" />
+        <DList Name="gDoorLeftDL" Offset="0x20BB8" />
+        <DList Name="gDoorRightDL" Offset="0x20D00" />
         <Texture Name="gameplay_keep_Tex_020E38" OutName="tex_020E38" Format="rgba16" Width="32" Height="64" Offset="0x20E38" />
         <DList Name="gameplay_keep_DL_0221B8" Offset="0x221B8" />
         <Texture Name="gameplay_keep_Tex_0222E8" OutName="tex_0222E8" Format="i4" Width="32" Height="64" Offset="0x222E8" />
@@ -892,14 +892,14 @@
         <Limb Name="gameplay_keep_Standardlimb_022AF4" Type="Standard" Offset="0x22AF4" />
         <Limb Name="gameplay_keep_Standardlimb_022B00" Type="Standard" Offset="0x22B00" />
         <Limb Name="gameplay_keep_Standardlimb_022B0C" Type="Standard" Offset="0x22B0C" />
-        <Skeleton Name="gameplay_keep_Skel_022B28" Type="Normal" LimbType="Standard" Offset="0x22B28" />
+        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x22B28" />
         <Animation Name="gameplay_keep_Anim_022BE8" Offset="0x22BE8" />
         <Animation Name="gameplay_keep_Anim_022CA8" Offset="0x22CA8" />
         <Animation Name="gameplay_keep_Anim_022D90" Offset="0x22D90" />
         <Animation Name="gameplay_keep_Anim_022E68" Offset="0x22E68" />
         <Blob Name="gameplay_keep_zeroes_unk_00022E78" Size="0xA8" Offset="0x22E78" />
         <Animation Name="gameplay_keep_Anim_022FF0" Offset="0x22FF0" />
-        <Collision Name="gameplay_keep_Colheader_023100" Offset="0x23100" />
+        <Collision Name="gDoorCol" Offset="0x23100" />
         <DList Name="gameplay_keep_DL_023130" Offset="0x23130" />
         <DList Name="gOwlStatueWhiteFlashDL" Offset="0x23210" />
         <DList Name="gameplay_keep_DL_023288" Offset="0x23288" />
diff --git a/assets/xml/objects/object_dor02.xml b/assets/xml/objects/object_dor02.xml
index 0b64a9b1b..c60fa9ba9 100644
--- a/assets/xml/objects/object_dor02.xml
+++ b/assets/xml/objects/object_dor02.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_dor02" Segment="6">
-        <DList Name="object_dor02_DL_000420" Offset="0x420" />
-        <DList Name="object_dor02_DL_000428" Offset="0x428" />
-        <Texture Name="object_dor02_Tex_000610" OutName="tex_000610" Format="rgba16" Width="32" Height="64" Offset="0x610" />
+        <DList Name="object_dor02_DL_000420" Offset="0x420"/>
+        <DList Name="gZoraHallDoorDL" Offset="0x428"/>
+        <Texture Name="gZoraHallDoorTex" OutName="zora_hall_door" Format="rgba16" Width="32" Height="64" Offset="0x610"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dor03.xml b/assets/xml/objects/object_dor03.xml
index c374837ea..941fa6fcc 100644
--- a/assets/xml/objects/object_dor03.xml
+++ b/assets/xml/objects/object_dor03.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="object_dor03" Segment="6">
-        <DList Name="object_dor03_DL_0003C0" Offset="0x3C0" />
-        <Texture Name="object_dor03_Tex_0004D0" OutName="tex_0004D0" Format="rgba16" Width="32" Height="64" Offset="0x4D0" />
+        <DList Name="gSwampDoorDL" Offset="0x3C0" />
+        <Texture Name="gSwampDoorTex" OutName="swamp_door" Format="rgba16" Width="32" Height="64" Offset="0x4D0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dor04.xml b/assets/xml/objects/object_dor04.xml
index 2d1ac5611..394f5a6fe 100644
--- a/assets/xml/objects/object_dor04.xml
+++ b/assets/xml/objects/object_dor04.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_dor04" Segment="6">
-        <DList Name="object_dor04_DL_000460" Offset="0x460" />
-        <DList Name="object_dor04_DL_000468" Offset="0x468" />
-        <Texture Name="object_dor04_Tex_000658" OutName="tex_000658" Format="rgba16" Width="64" Height="32" Offset="0x658" />
+        <DList Name="gMagicHagPotionShopDoorEndDL" Offset="0x460"/>
+        <DList Name="gMagicHagPotionShopDoorDL" Offset="0x468"/>
+        <Texture Name="gMagicHagPotionShopDoorTex" OutName="magic_hag_potion_shop_door" Format="rgba16" Width="64" Height="32" Offset="0x658"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_kaizoku_obj.xml b/assets/xml/objects/object_kaizoku_obj.xml
index a38d16827..8dd96770a 100644
--- a/assets/xml/objects/object_kaizoku_obj.xml
+++ b/assets/xml/objects/object_kaizoku_obj.xml
@@ -28,8 +28,8 @@
         <Texture Name="object_kaizoku_obj_Tex_009108" OutName="tex_009108" Format="ci8" Width="32" Height="32" Offset="0x9108" />
         <Texture Name="object_kaizoku_obj_Tex_009508" OutName="tex_009508" Format="ci4" Width="4" Height="4" Offset="0x9508" />
         <Collision Name="object_kaizoku_obj_Colheader_009A88" Offset="0x9A88" />
-        <DList Name="object_kaizoku_obj_DL_009F20" Offset="0x9F20" />
-        <Texture Name="object_kaizoku_obj_Tex_00A210" OutName="tex_00A210" Format="rgba16" Width="16" Height="64" Offset="0xA210" />
+        <DList Name="gPiratesFortressDoorDL" Offset="0x9F20" />
+        <Texture Name="gPiratesFortressDoorTexDL" OutName="door_tex" Format="rgba16" Width="16" Height="64" Offset="0xA210" />
         <Texture Name="object_kaizoku_obj_Tex_00AA10" OutName="tex_00AA10" Format="i4" Width="32" Height="32" Offset="0xAA10" />
         <DList Name="object_kaizoku_obj_DL_00AD50" Offset="0xAD50" />
         <Texture Name="object_kaizoku_obj_TLUT_00AF38" OutName="tlut_00AF38" Format="rgba16" Width="4" Height="4" Offset="0xAF38" />
diff --git a/assets/xml/objects/object_numa_obj.xml b/assets/xml/objects/object_numa_obj.xml
index e8035b3e8..a450cf11a 100644
--- a/assets/xml/objects/object_numa_obj.xml
+++ b/assets/xml/objects/object_numa_obj.xml
@@ -12,7 +12,7 @@
         <DList Name="object_numa_obj_DL_004448" Offset="0x4448" />
         <DList Name="object_numa_obj_DL_0051B0" Offset="0x51B0" />
         <DList Name="object_numa_obj_DL_0051B8" Offset="0x51B8" />
-        <DList Name="object_numa_obj_DL_005DF0" Offset="0x5DF0" />
+        <DList Name="gWoodfallDoorDL" Offset="0x5DF0" />
         <Texture Name="object_numa_obj_Tex_005FC0" OutName="tex_005FC0" Format="rgba16" Width="32" Height="64" Offset="0x5FC0" />
         <DList Name="object_numa_obj_DL_007150" Offset="0x7150" />
         <Texture Name="object_numa_obj_Tex_0072B0" OutName="tex_0072B0" Format="rgba16" Width="32" Height="64" Offset="0x72B0" />
diff --git a/assets/xml/objects/object_wdor04.xml b/assets/xml/objects/object_wdor04.xml
index 040df1598..07ad601dd 100644
--- a/assets/xml/objects/object_wdor04.xml
+++ b/assets/xml/objects/object_wdor04.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_wdor04" Segment="6">
-        <DList Name="object_wdor04_DL_000500" Offset="0x500" />
-        <DList Name="object_wdor04_DL_000508" Offset="0x508" />
-        <Texture Name="object_wdor04_Tex_000670" OutName="tex_000670" Format="rgba16" Width="32" Height="64" Offset="0x670" />
+        <DList Name="gMilkBarDoorEndDL" Offset="0x500"/>
+        <DList Name="gMilkBarDoorDL" Offset="0x508"/>
+        <Texture Name="gMilkBarDoorTex" OutName="milk_bar_door_tex" Format="rgba16" Width="32" Height="64" Offset="0x670"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_wdor05.xml b/assets/xml/objects/object_wdor05.xml
index f8fda2322..6eb0f4ed0 100644
--- a/assets/xml/objects/object_wdor05.xml
+++ b/assets/xml/objects/object_wdor05.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_wdor05" Segment="6">
-        <DList Name="object_wdor05_DL_000500" Offset="0x500" />
-        <DList Name="object_wdor05_DL_000508" Offset="0x508" />
-        <Texture Name="object_wdor05_Tex_000670" OutName="tex_000670" Format="rgba16" Width="32" Height="64" Offset="0x670" />
+        <DList Name="gMusicBoxHouseEndDL" Offset="0x500"/>
+        <DList Name="gMusicBoxHouseDoorDL" Offset="0x508"/>
+        <Texture Name="gMusicBoxHouseDoorTex" OutName="music_box_house_door" Format="rgba16" Width="32" Height="64" Offset="0x670"/>
     </File>
 </Root>