From 107c0288cc46e378c67dc4ae2e39cfd2e5fcbc25 Mon Sep 17 00:00:00 2001
From: Billy <1184136+philtyl@users.noreply.github.com>
Date: Wed, 20 Sep 2023 01:41:42 +0000
Subject: Dekunut Salesman Docs (#1493)

* Dekunut Salesman Docs

* Update src/overlays/actors/ovl_En_Dns/z_en_dns.c

Remove extra param from debug logging

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* * Full Deku/Potion name usage
* Dialog -> CanBuy
* Revert debug logging symbols
* Proper declaration spacing
* Fix en_shopnuts header doc
* Biz -> Business

* Fix missed deku prefix's

* Synchronize CanBuy sticks and nuts

* Fix enum naming

* Clarified CanBuy success values

* anon review

* fig review

* macro changes

* fix macro usage

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
---
 assets/xml/objects/object_shopnuts.xml | 46 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'assets/xml/objects')

diff --git a/assets/xml/objects/object_shopnuts.xml b/assets/xml/objects/object_shopnuts.xml
index a4e12e38a..105ce8824 100644
--- a/assets/xml/objects/object_shopnuts.xml
+++ b/assets/xml/objects/object_shopnuts.xml
@@ -1,26 +1,26 @@
 <Root>
     <File Name="object_shopnuts" Segment="6">
         <!-- Business Scrub Skeleton -->
-        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" Offset="0x41A8"/>
+        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" LimbNone="BUSINESS_SCRUB_LIMB_NONE" LimbMax="BUSINESS_SCRUB_LIMB_MAX" EnumName="BusinessScrubLimb" Offset="0x41A8"/>
 
         <!-- Business Scrub Limbs -->
-        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" Offset="0x4098"/>
-        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" Offset="0x40A4"/>
-        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" Offset="0x40B0"/>
-        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" Offset="0x40BC"/>
-        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" Offset="0x40C8"/>
-        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" Offset="0x40D4"/>
-        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" Offset="0x40E0"/>
-        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" Offset="0x40EC"/>
-        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" Offset="0x40F8"/>
-        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" Offset="0x4104"/>
-        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" Offset="0x4110"/>
-        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" Offset="0x411C"/>
-        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" Offset="0x4128"/>
-        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" Offset="0x4134"/>
-        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" Offset="0x4140"/>
-        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" Offset="0x414C"/>
-        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" Offset="0x4158"/>
+        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_ROOT" Offset="0x4098"/>
+        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_THIGH" Offset="0x40A4"/>
+        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_SHIN" Offset="0x40B0"/>
+        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_FOOT" Offset="0x40BC"/>
+        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_THIGH" Offset="0x40C8"/>
+        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_SHIN" Offset="0x40D4"/>
+        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_FOOT" Offset="0x40E0"/>
+        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_TOP_LEAF" Offset="0x40EC"/>
+        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_NOSE" Offset="0x40F8"/>
+        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_UPPER_ARM" Offset="0x4104"/>
+        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_FOREARM" Offset="0x4110"/>
+        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_LEFT_HAND" Offset="0x411C"/>
+        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_UPPER_ARM" Offset="0x4128"/>
+        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_FOREARM" Offset="0x4134"/>
+        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_RIGHT_HAND" Offset="0x4140"/>
+        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_EYES" Offset="0x414C"/>
+        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" EnumName="BUSINESS_SCRUB_LIMB_BODY" Offset="0x4158"/>
 
         <!-- Business Scrub Limb DisplayLists -->
         <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
@@ -54,14 +54,14 @@
         <DList Name="gBusinessScrubDekuNutDL" Offset="0x4008"/>
 
         <!-- Business Scrub Animations -->
-        <Animation Name="gBusinessScrubAnim_1EC" Offset="0x1EC"/>
-        <Animation Name="gBusinessScrubAnim_39C" Offset="0x39C"/>
+        <Animation Name="gBusinessScrubThrowNutAnim" Offset="0x1EC"/>
+        <Animation Name="gBusinessScrubPeekBurrowAnim" Offset="0x39C"/>
         <Animation Name="gBusinessScrubRotateAnim" Offset="0x764"/>
         <Animation Name="gBusinessScrubNervousTransitionAnim" Offset="0x9A0"/>
         <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/>
         <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/>
-        <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/>
-        <Animation Name="gBusinessScrubAnim_4404" Offset="0x4404"/>
-        <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/>
+        <Animation Name="gBusinessScrubInitialAnim" Offset="0x139C"/>
+        <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/>
+        <Animation Name="gBusinessScrubPeekAnim" Offset="0x4574"/>
     </File>
 </Root>
-- 
cgit v1.2.3