diff options
| author | Jordan Longstaff <JordanLongstaff@users.noreply.github.com> | 2025-01-15 11:23:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-15 11:23:06 -0500 |
| commit | 0497ad20d820228d61a66ec7bb4c07fb8b2352c1 (patch) | |
| tree | 6fab51bb9be515ad52f31d1b3f6df27182756335 /soh/assets | |
| parent | a86205b99985e1f74ae5ceace8b2a01768052dbb (diff) | |
Rename Business Scrub functions/flags from decomp (#4776)
* Rename Business Scrub functions/flags from decomp
* Update XML references
Diffstat (limited to 'soh/assets')
7 files changed, 8 insertions, 8 deletions
diff --git a/soh/assets/objects/object_shopnuts/object_shopnuts.h b/soh/assets/objects/object_shopnuts/object_shopnuts.h index f7408c648..a5879943b 100644 --- a/soh/assets/objects/object_shopnuts/object_shopnuts.h +++ b/soh/assets/objects/object_shopnuts/object_shopnuts.h @@ -102,8 +102,8 @@ static const ALIGN_ASSET(2) char gBusinessScrubNervousIdleAnim[] = dgBusinessScr #define dgBusinessScrubAnim_139C "__OTR__objects/object_shopnuts/gBusinessScrubAnim_139C" static const ALIGN_ASSET(2) char gBusinessScrubAnim_139C[] = dgBusinessScrubAnim_139C; -#define dgBusinessScrubAnim_4404 "__OTR__objects/object_shopnuts/gBusinessScrubAnim_4404" -static const ALIGN_ASSET(2) char gBusinessScrubAnim_4404[] = dgBusinessScrubAnim_4404; +#define dgBusinessScrubLeaveBurrowAnim "__OTR__objects/object_shopnuts/gBusinessScrubLeaveBurrowAnim" +static const ALIGN_ASSET(2) char gBusinessScrubLeaveBurrowAnim[] = dgBusinessScrubLeaveBurrowAnim; #define dgBusinessScrubAnim_4574 "__OTR__objects/object_shopnuts/gBusinessScrubAnim_4574" static const ALIGN_ASSET(2) char gBusinessScrubAnim_4574[] = dgBusinessScrubAnim_4574; diff --git a/soh/assets/xml/GC_MQ_D/objects/object_shopnuts.xml b/soh/assets/xml/GC_MQ_D/objects/object_shopnuts.xml index a4e12e38a..7065f8941 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_shopnuts.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_shopnuts.xml @@ -61,7 +61,7 @@ <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/> <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/> <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/> - <Animation Name="gBusinessScrubAnim_4404" Offset="0x4404"/> + <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/> <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/> </File> </Root> diff --git a/soh/assets/xml/GC_MQ_PAL_F/objects/object_shopnuts.xml b/soh/assets/xml/GC_MQ_PAL_F/objects/object_shopnuts.xml index a4e12e38a..7065f8941 100644 --- a/soh/assets/xml/GC_MQ_PAL_F/objects/object_shopnuts.xml +++ b/soh/assets/xml/GC_MQ_PAL_F/objects/object_shopnuts.xml @@ -61,7 +61,7 @@ <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/> <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/> <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/> - <Animation Name="gBusinessScrubAnim_4404" Offset="0x4404"/> + <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/> <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/> </File> </Root> diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_shopnuts.xml b/soh/assets/xml/GC_NMQ_D/objects/object_shopnuts.xml index a4e12e38a..7065f8941 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_shopnuts.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_shopnuts.xml @@ -61,7 +61,7 @@ <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/> <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/> <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/> - <Animation Name="gBusinessScrubAnim_4404" Offset="0x4404"/> + <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/> <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/> </File> </Root> diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_shopnuts.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_shopnuts.xml index a4e12e38a..7065f8941 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_shopnuts.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_shopnuts.xml @@ -61,7 +61,7 @@ <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/> <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/> <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/> - <Animation Name="gBusinessScrubAnim_4404" Offset="0x4404"/> + <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/> <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/> </File> </Root> diff --git a/soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml b/soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml index a4e12e38a..7065f8941 100644 --- a/soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml +++ b/soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml @@ -61,7 +61,7 @@ <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/> <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/> <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/> - <Animation Name="gBusinessScrubAnim_4404" Offset="0x4404"/> + <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/> <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/> </File> </Root> diff --git a/soh/assets/xml/N64_PAL_11/objects/object_shopnuts.xml b/soh/assets/xml/N64_PAL_11/objects/object_shopnuts.xml index a4e12e38a..7065f8941 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_shopnuts.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_shopnuts.xml @@ -61,7 +61,7 @@ <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/> <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/> <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/> - <Animation Name="gBusinessScrubAnim_4404" Offset="0x4404"/> + <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/> <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/> </File> </Root> |
