From d745cccf87587862137cbcd1cf4266cde6960010 Mon Sep 17 00:00:00 2001
From: krm01 <krm01@users.noreply.github.com>
Date: Fri, 7 Oct 2022 22:28:29 -0400
Subject: [Doc] Actor En_Bee - Giant Bee (#1089)

* all functions matching

* initial cleanup

* tatl hint

* clean up + SFX

* SFX

* more SFX

* func_800B3030

* SFX FIX

* castings

* clean up

* array of Vec3f

* for loop fix (Thanks @Maide)

* ACTORCAT_ITEMACTION

* docs for giant bee actor

* tidy up

* run format.sh

* rename idle anim to flying

* address review comments for names

* make format check happy

* wrap modulo in parens

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* clearer cast to f32

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* comments to object xml

* Update src/overlays/actors/ovl_En_Bee/z_en_bee.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_En_Bee/z_en_bee.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* better names for some temp variables

Co-authored-by: sonicdcer <alejandro.asenjo88@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
---
 assets/xml/objects/object_bee.xml | 58 +++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 24 deletions(-)

(limited to 'assets/xml/objects/object_bee.xml')

diff --git a/assets/xml/objects/object_bee.xml b/assets/xml/objects/object_bee.xml
index 735d191f3..8fcd930fa 100644
--- a/assets/xml/objects/object_bee.xml
+++ b/assets/xml/objects/object_bee.xml
@@ -1,28 +1,38 @@
 <Root>
+    <!-- Object for Bee -->
     <File Name="object_bee" Segment="6">
-        <Animation Name="object_bee_Anim_00005C" Offset="0x5C" />
-        <DList Name="object_bee_DL_000550" Offset="0x550" />
-        <DList Name="object_bee_DL_000780" Offset="0x780" />
-        <DList Name="object_bee_DL_000848" Offset="0x848" />
-        <DList Name="object_bee_DL_000918" Offset="0x918" />
-        <DList Name="object_bee_DL_0009D0" Offset="0x9D0" />
-        <Texture Name="object_bee_TLUT_000A88" OutName="tlut_000A88" Format="rgba16" Width="4" Height="4" Offset="0xA88" />
-        <Texture Name="object_bee_TLUT_000AA8" OutName="tlut_000AA8" Format="rgba16" Width="4" Height="4" Offset="0xAA8" />
-        <Texture Name="object_bee_TLUT_000AC8" OutName="tlut_000AC8" Format="rgba16" Width="4" Height="4" Offset="0xAC8" />
-        <Texture Name="object_bee_TLUT_000AE8" OutName="tlut_000AE8" Format="rgba16" Width="4" Height="4" Offset="0xAE8" />
-        <Texture Name="object_bee_Tex_000B08" OutName="tex_000B08" Format="ci4" Width="32" Height="32" Offset="0xB08" />
-        <Texture Name="object_bee_Tex_000D08" OutName="tex_000D08" Format="ci4" Width="32" Height="32" Offset="0xD08" />
-        <Texture Name="object_bee_Tex_000F08" OutName="tex_000F08" Format="ci4" Width="32" Height="32" Offset="0xF08" />
-        <Texture Name="object_bee_Tex_001108" OutName="tex_001108" Format="ci4" Width="32" Height="32" Offset="0x1108" />
-        <Limb Name="object_bee_Standardlimb_001308" Type="Standard" EnumName="OBJECT_BEE_LIMB_01" Offset="0x1308" />
-        <Limb Name="object_bee_Standardlimb_001314" Type="Standard" EnumName="OBJECT_BEE_LIMB_02" Offset="0x1314" />
-        <Limb Name="object_bee_Standardlimb_001320" Type="Standard" EnumName="OBJECT_BEE_LIMB_03" Offset="0x1320" />
-        <Limb Name="object_bee_Standardlimb_00132C" Type="Standard" EnumName="OBJECT_BEE_LIMB_04" Offset="0x132C" />
-        <Limb Name="object_bee_Standardlimb_001338" Type="Standard" EnumName="OBJECT_BEE_LIMB_05" Offset="0x1338" />
-        <Limb Name="object_bee_Standardlimb_001344" Type="Standard" EnumName="OBJECT_BEE_LIMB_06" Offset="0x1344" />
-        <Limb Name="object_bee_Standardlimb_001350" Type="Standard" EnumName="OBJECT_BEE_LIMB_07" Offset="0x1350" />
-        <Limb Name="object_bee_Standardlimb_00135C" Type="Standard" EnumName="OBJECT_BEE_LIMB_08" Offset="0x135C" />
-        <Limb Name="object_bee_Standardlimb_001368" Type="Standard" EnumName="OBJECT_BEE_LIMB_09" Offset="0x1368" />
-        <Skeleton Name="object_bee_Skel_001398" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BEE_LIMB_NONE" LimbMax="OBJECT_BEE_LIMB_MAX" EnumName="ObjectBeeLimb" Offset="0x1398" />
+        <!-- Bee Animations -->
+        <Animation Name="gBeeFlyingAnim" Offset="0x5C" />
+
+        <!-- Bee Limb DisplayLists -->
+        <DList Name="gBeeBodyDL" Offset="0x550" />
+        <DList Name="gBeeHeadDL" Offset="0x780" />
+        <DList Name="gBeeAntennaeDL" Offset="0x848" />
+        <DList Name="gBeeRightWingDL" Offset="0x918" />
+        <DList Name="gBeeLeftWingDL" Offset="0x9D0" />
+
+        <!-- Bee Textures -->
+        <Texture Name="gBeeWingTLUT" OutName="bee_wing_tlut" Format="rgba16" Width="4" Height="4" Offset="0xA88" />
+        <Texture Name="gBeeHeadTLUT" OutName="bee_head_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAA8" />
+        <Texture Name="gBeeBodyTLUT" OutName="bee_body_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAC8" />
+        <Texture Name="gBeeAntennaeTLUT" OutName="bee_antennae_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAE8" />
+        <Texture Name="gBeeWingTex" OutName="bee_wing" Format="ci4" Width="32" Height="32" Offset="0xB08" />
+        <Texture Name="gBeeHeadTex" OutName="bee_head" Format="ci4" Width="32" Height="32" Offset="0xD08" />
+        <Texture Name="gBeeBodyTex" OutName="bee_body" Format="ci4" Width="32" Height="32" Offset="0xF08" />
+        <Texture Name="gBeeAntennaeTex" OutName="bee_antennae" Format="ci4" Width="32" Height="32" Offset="0x1108" />
+
+        <!-- Bee Limbs -->
+        <Limb Name="gBeeRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_ROOT" Offset="0x1308" />
+        <Limb Name="gBeeWingsRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_WINGS_ROOT" Offset="0x1314" />
+        <Limb Name="gBeeLeftWingRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_LEFT_WING_ROOT" Offset="0x1320" />
+        <Limb Name="gBeeLeftWingLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_LEFT_WING" Offset="0x132C" />
+        <Limb Name="gBeeRightWingRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_RIGHT_WING_ROOT" Offset="0x1338" />
+        <Limb Name="gBeeRightWingLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_RIGHT_WING" Offset="0x1344" />
+        <Limb Name="gBeeBodyLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_BODY" Offset="0x1350" />
+        <Limb Name="gBeeAntennaeLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_ANTENNAE" Offset="0x135C" />
+        <Limb Name="gBeeHeadLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_HEAD" Offset="0x1368" />
+
+        <!-- Bee Skeleton -->
+        <Skeleton Name="gBeeSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BEE_LIMB_NONE" LimbMax="OBJECT_BEE_LIMB_MAX" EnumName="ObjectBeeLimb" Offset="0x1398" />
     </File>
 </Root>
-- 
cgit v1.2.3