From c279bbb557e310a642ca20773677757f0f9ac5bb Mon Sep 17 00:00:00 2001 From: JordanLongstaff Date: Wed, 17 Dec 2025 11:15:13 -0500 Subject: [PATCH] Re-rename functions --- .../actors/ovl_En_Bombers2/z_en_bombers2.c | 30 +++++++++---------- tools/disasm/n64-jp-1.1/functions.txt | 8 ++--- tools/disasm/n64-us/functions.txt | 8 ++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index 5e190a7e0c..bda1862eb5 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -20,10 +20,10 @@ void EnBombers2_Update(Actor* thisx, PlayState* play); void EnBombers2_Draw(Actor* thisx, PlayState* play); void EnBombers2_AwaitTalk(EnBombers2* this, PlayState* play); -void EnBombers2_UpdateTalk(EnBombers2* this, PlayState* play); -void EnBombers2_WalkToSide(EnBombers2* this, PlayState* play); -void EnBombers2_SetupIdle(EnBombers2* this); -void EnBombers2_StartTalking(EnBombers2* this); +void EnBombers2_Talking(EnBombers2* this, PlayState* play); +void EnBombers2_Walking(EnBombers2* this, PlayState* play); +void EnBombers2_SetupAwaitTalk(EnBombers2* this); +void EnBombers2_SetupTalking(EnBombers2* this); void EnBombers2_StartWalking(EnBombers2* this, PlayState* play); ActorProfile En_Bombers2_Profile = { @@ -131,7 +131,7 @@ void EnBombers2_Init(Actor* thisx, PlayState* play) { if (this->csId == 0) { Actor_Kill(&this->actor); } - EnBombers2_SetupIdle(this); + EnBombers2_SetupAwaitTalk(this); } void EnBombers2_Destroy(Actor* thisx, PlayState* play) { @@ -150,7 +150,7 @@ void EnBombers2_ChangeAnim(EnBombers2* this, s32 animIndex, f32 playSpeed) { sAnimationModes[this->animIndex], -10.0f); } -void EnBombers2_SetupIdle(EnBombers2* this) { +void EnBombers2_SetupAwaitTalk(EnBombers2* this) { if (!this->hasMovedAside) { EnBombers2_ChangeAnim(this, ENBOMBERS_ANIM_4, 1.0f); } else { @@ -197,7 +197,7 @@ void EnBombers2_AwaitTalk(EnBombers2* this, PlayState* play) { if (Actor_TalkOfferAccepted(&this->actor, &play->state)) { this->bodyRotTargetAngle = this->actor.world.rot.y; SET_WEEKEVENTREG(WEEKEVENTREG_TALKED_TO_BOMBERS_GUARD); - EnBombers2_StartTalking(this); + EnBombers2_SetupTalking(this); return; } if (yawDiffAbs < 0x3BB5) { @@ -205,7 +205,7 @@ void EnBombers2_AwaitTalk(EnBombers2* this, PlayState* play) { } } -void EnBombers2_StartTalking(EnBombers2* this) { +void EnBombers2_SetupTalking(EnBombers2* this) { if ((this->textIdIndex == 0) || (this->textIdIndex == 1)) { EnBombers2_ChangeAnim(this, ENBOMBERS_ANIM_5, 1.0f); } else { @@ -217,10 +217,10 @@ void EnBombers2_StartTalking(EnBombers2* this) { EnBombers2_ChangeAnim(this, ENBOMBERS_ANIM_6, 1.0f); } this->action = ENBOMBERS2_ACTION_TALKING; - this->actionFunc = EnBombers2_UpdateTalk; + this->actionFunc = EnBombers2_Talking; } -void EnBombers2_UpdateTalk(EnBombers2* this, PlayState* play) { +void EnBombers2_Talking(EnBombers2* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 curFrame = this->skelAnime.curFrame; @@ -275,7 +275,7 @@ void EnBombers2_UpdateTalk(EnBombers2* this, PlayState* play) { if (Text_GetFaceReaction(play, FACE_REACTION_SET_BOMBERS_HIDEOUT_GUARD) != 0) { this->headRotTargetZ = 0; Message_CloseTextbox(play); - EnBombers2_SetupIdle(this); + EnBombers2_SetupAwaitTalk(this); } else { s32 j; @@ -286,7 +286,7 @@ void EnBombers2_UpdateTalk(EnBombers2* this, PlayState* play) { case 7: this->headRotTargetZ = 0; Message_CloseTextbox(play); - EnBombers2_SetupIdle(this); + EnBombers2_SetupAwaitTalk(this); break; case 2: @@ -343,10 +343,10 @@ void EnBombers2_StartWalking(EnBombers2* this, PlayState* play) { } this->bodyRotTargetAngle = Math_Vec3f_Yaw(&this->actor.home.pos, &this->walkTarget); this->action = ENBOMBERS2_ACTION_WALKING; - this->actionFunc = EnBombers2_WalkToSide; + this->actionFunc = EnBombers2_Walking; } -void EnBombers2_WalkToSide(EnBombers2* this, PlayState* play) { +void EnBombers2_Walking(EnBombers2* this, PlayState* play) { if (this->animPhase == 0) { if (CutsceneManager_GetCurrentCsId() == CS_ID_GLOBAL_TALK) { CutsceneManager_Stop(CS_ID_GLOBAL_TALK); @@ -375,7 +375,7 @@ void EnBombers2_WalkToSide(EnBombers2* this, PlayState* play) { this->hasMovedAside = true; this->actor.textId = sTextIds[this->textIdIndex]; Message_StartTextbox(play, this->actor.textId, &this->actor); - this->actionFunc = EnBombers2_UpdateTalk; + this->actionFunc = EnBombers2_Talking; } } else { Math_ApproachF(&this->actor.world.pos.x, this->walkTarget.x, 0.3f, 1.0f); diff --git a/tools/disasm/n64-jp-1.1/functions.txt b/tools/disasm/n64-jp-1.1/functions.txt index cf501e5136..0df99b0fe2 100644 --- a/tools/disasm/n64-jp-1.1/functions.txt +++ b/tools/disasm/n64-jp-1.1/functions.txt @@ -16522,12 +16522,12 @@ EnBombers_Draw = 0x80C074A4; // type:func size:0x13C EnBombers2_Init = 0x80C077C0; // type:func size:0x150 EnBombers2_Destroy = 0x80C07910; // type:func size:0x2C EnBombers2_ChangeAnim = 0x80C0793C; // type:func size:0x94 -EnBombers2_SetupIdle = 0x80C079D0; // type:func size:0x60 +EnBombers2_SetupAwaitTalk = 0x80C079D0; // type:func size:0x60 EnBombers2_AwaitTalk = 0x80C07A30; // type:func size:0x160 -EnBombers2_StartTalking = 0x80C07B90; // type:func size:0x8C -EnBombers2_UpdateTalk = 0x80C07C1C; // type:func size:0x32C +EnBombers2_SetupTalking = 0x80C07B90; // type:func size:0x8C +EnBombers2_Talking = 0x80C07C1C; // type:func size:0x32C EnBombers2_StartWalking = 0x80C07F48; // type:func size:0x154 -EnBombers2_WalkToSide = 0x80C0809C; // type:func size:0x1EC +EnBombers2_Walking = 0x80C0809C; // type:func size:0x1EC EnBombers2_Update = 0x80C08288; // type:func size:0x2DC EnBombers2_OverrideLimbDraw = 0x80C08564; // type:func size:0x84 EnBombers2_Draw = 0x80C085E8; // type:func size:0x128 diff --git a/tools/disasm/n64-us/functions.txt b/tools/disasm/n64-us/functions.txt index b398f205ad..ce6a4f09d2 100644 --- a/tools/disasm/n64-us/functions.txt +++ b/tools/disasm/n64-us/functions.txt @@ -16532,12 +16532,12 @@ EnBombers_Draw = 0x80C04614; // type:func EnBombers2_Init = 0x80C04930; // type:func EnBombers2_Destroy = 0x80C04A80; // type:func EnBombers2_ChangeAnim = 0x80C04AAC; // type:func -EnBombers2_SetupIdle = 0x80C04B40; // type:func +EnBombers2_SetupAwaitTalk = 0x80C04B40; // type:func EnBombers2_AwaitTalk = 0x80C04BA0; // type:func -EnBombers2_StartTalking = 0x80C04D00; // type:func -EnBombers2_UpdateTalk = 0x80C04D8C; // type:func +EnBombers2_SetupTalking = 0x80C04D00; // type:func +EnBombers2_Talking = 0x80C04D8C; // type:func EnBombers2_StartWalking = 0x80C050B8; // type:func -EnBombers2_WalkToSide = 0x80C0520C; // type:func +EnBombers2_Walking = 0x80C0520C; // type:func EnBombers2_Update = 0x80C053F8; // type:func EnBombers2_OverrideLimbDraw = 0x80C056D4; // type:func EnBombers2_Draw = 0x80C05758; // type:func