Rename Business Scrub animations from decomp (#7348)

This commit is contained in:
Jordan Longstaff
2026-10-09 09:27:44 -04:00
committed by GitHub
parent ecd889c201
commit 098c671394
16 changed files with 127 additions and 127 deletions
@@ -81,11 +81,11 @@ static const ALIGN_ASSET(2) char gBusinessScrubDekuNutTex[] = dgBusinessScrubDek
#define dgBusinessScrubDekuNutDL "__OTR__objects/object_shopnuts/gBusinessScrubDekuNutDL"
static const ALIGN_ASSET(2) char gBusinessScrubDekuNutDL[] = dgBusinessScrubDekuNutDL;
#define dgBusinessScrubAnim_1EC "__OTR__objects/object_shopnuts/gBusinessScrubAnim_1EC"
static const ALIGN_ASSET(2) char gBusinessScrubAnim_1EC[] = dgBusinessScrubAnim_1EC;
#define dgBusinessScrubThrowNutAnim "__OTR__objects/object_shopnuts/gBusinessScrubThrowNutAnim"
static const ALIGN_ASSET(2) char gBusinessScrubThrowNutAnim[] = dgBusinessScrubThrowNutAnim;
#define dgBusinessScrubAnim_39C "__OTR__objects/object_shopnuts/gBusinessScrubAnim_39C"
static const ALIGN_ASSET(2) char gBusinessScrubAnim_39C[] = dgBusinessScrubAnim_39C;
#define dgBusinessScrubPeekBurrowAnim "__OTR__objects/object_shopnuts/gBusinessScrubPeekBurrowAnim"
static const ALIGN_ASSET(2) char gBusinessScrubPeekBurrowAnim[] = dgBusinessScrubPeekBurrowAnim;
#define dgBusinessScrubRotateAnim "__OTR__objects/object_shopnuts/gBusinessScrubRotateAnim"
static const ALIGN_ASSET(2) char gBusinessScrubRotateAnim[] = dgBusinessScrubRotateAnim;
@@ -99,14 +99,14 @@ static const ALIGN_ASSET(2) char gBusinessScrubLookAroundAnim[] = dgBusinessScru
#define dgBusinessScrubNervousIdleAnim "__OTR__objects/object_shopnuts/gBusinessScrubNervousIdleAnim"
static const ALIGN_ASSET(2) char gBusinessScrubNervousIdleAnim[] = dgBusinessScrubNervousIdleAnim;
#define dgBusinessScrubAnim_139C "__OTR__objects/object_shopnuts/gBusinessScrubAnim_139C"
static const ALIGN_ASSET(2) char gBusinessScrubAnim_139C[] = dgBusinessScrubAnim_139C;
#define dgBusinessScrubInitialAnim "__OTR__objects/object_shopnuts/gBusinessScrubInitialAnim"
static const ALIGN_ASSET(2) char gBusinessScrubInitialAnim[] = dgBusinessScrubInitialAnim;
#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;
#define dgBusinessScrubPeekAnim "__OTR__objects/object_shopnuts/gBusinessScrubPeekAnim"
static const ALIGN_ASSET(2) char gBusinessScrubPeekAnim[] = dgBusinessScrubPeekAnim;
#endif // OBJECTS_OBJECT_SHOPNUTS_H
@@ -11,25 +11,25 @@
external_files:
- ntsc_1-0/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- ntsc_1-1/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- ntsc_1-2/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- ntsc_j_gc/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- ntsc_j_gc_collection/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- ntsc_j_mq/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- ntsc_u_gc/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- ntsc_u_mq/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- pal_1-0/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- pal_1-1/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- pal_gc/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- pal_gc_dbg/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- pal_mq/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -11,25 +11,25 @@
external_files:
- pal_mq_dbg/objects/gameplay_keep.yml
gBusinessScrubAnim_139C:
gBusinessScrubInitialAnim:
type: OOT:ANIMATION
offset: 0x139C
symbol: gBusinessScrubAnim_139C
symbol: gBusinessScrubInitialAnim
gBusinessScrubAnim_1EC:
gBusinessScrubThrowNutAnim:
type: OOT:ANIMATION
offset: 0x1EC
symbol: gBusinessScrubAnim_1EC
symbol: gBusinessScrubThrowNutAnim
gBusinessScrubAnim_39C:
gBusinessScrubPeekBurrowAnim:
type: OOT:ANIMATION
offset: 0x39C
symbol: gBusinessScrubAnim_39C
symbol: gBusinessScrubPeekBurrowAnim
gBusinessScrubAnim_4574:
gBusinessScrubPeekAnim:
type: OOT:ANIMATION
offset: 0x4574
symbol: gBusinessScrubAnim_4574
symbol: gBusinessScrubPeekAnim
gBusinessScrubBodyDL:
type: GFX
@@ -64,7 +64,7 @@ void EnShopnuts_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &gBusinessScrubSkel, &gBusinessScrubAnim_4574, this->jointTable,
SkelAnime_InitFlex(play, &this->skelAnime, &gBusinessScrubSkel, &gBusinessScrubPeekAnim, this->jointTable,
this->morphTable, 18);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
@@ -92,7 +92,7 @@ void EnShopnuts_Destroy(Actor* thisx, PlayState* play) {
}
void EnShopnuts_SetupWait(EnShopnuts* this) {
Animation_PlayOnceSetSpeed(&this->skelAnime, &gBusinessScrubAnim_139C, 0.0f);
Animation_PlayOnceSetSpeed(&this->skelAnime, &gBusinessScrubInitialAnim, 0.0f);
this->animFlagAndTimer = Rand_S16Offset(100, 50);
this->collider.dim.height = 5;
this->collider.base.acFlags &= ~AC_ON;
@@ -106,12 +106,12 @@ void EnShopnuts_SetupLookAround(EnShopnuts* this) {
}
void EnShopnuts_SetupThrowNut(EnShopnuts* this) {
Animation_PlayOnce(&this->skelAnime, &gBusinessScrubAnim_1EC);
Animation_PlayOnce(&this->skelAnime, &gBusinessScrubThrowNutAnim);
this->actionFunc = EnShopnuts_ThrowNut;
}
void EnShopnuts_SetupStand(EnShopnuts* this) {
Animation_MorphToLoop(&this->skelAnime, &gBusinessScrubAnim_4574, -3.0f);
Animation_MorphToLoop(&this->skelAnime, &gBusinessScrubPeekAnim, -3.0f);
if (this->actionFunc == EnShopnuts_ThrowNut) {
this->animFlagAndTimer = 2 | 0x1000; // sets timer and flag
} else {
@@ -121,7 +121,7 @@ void EnShopnuts_SetupStand(EnShopnuts* this) {
}
void EnShopnuts_SetupBurrow(EnShopnuts* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &gBusinessScrubAnim_39C, -5.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &gBusinessScrubPeekBurrowAnim, -5.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DOWN);
this->actionFunc = EnShopnuts_Burrow;
}
@@ -256,8 +256,8 @@ void EnShopnuts_Update(Actor* thisx, PlayState* play) {
if (this->actionFunc == EnShopnuts_Wait) {
Actor_SetFocus(&this->actor, this->skelAnime.curFrame);
} else if (this->actionFunc == EnShopnuts_Burrow) {
Actor_SetFocus(&this->actor,
20.0f - ((this->skelAnime.curFrame * 20.0f) / Animation_GetLastFrame(&gBusinessScrubAnim_39C)));
Actor_SetFocus(&this->actor, 20.0f - ((this->skelAnime.curFrame * 20.0f) /
Animation_GetLastFrame(&gBusinessScrubPeekBurrowAnim)));
} else {
Actor_SetFocus(&this->actor, 20.0f);
}