kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

refac: make leaky functions static where applicable

Browse Source
This commit is contained in:
Bl00D4NGEL
2024-10-04 17:54:05 +02:00
parent 581b467d2f
commit 3ef65d7f0e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/TTC/ch/leaky.c
View File

@@ -6,11 +6,11 @@ extern void func_8028E668(f32 [3], f32, f32, f32);
extern void func_8028F9DC(s32); extern void func_8028F9DC(s32);
extern void func_803272D0(f32 arg0[3], f32 arg1, s32 arg2, int (*arg3)(Actor *)); extern void func_803272D0(f32 arg0[3], f32 arg1, s32 arg2, int (*arg3)(Actor *));
void chLeaky_updateFunc(Actor *this); static void __chLeaky_updateFunc(Actor *this);
/* .data */ /* .data */
ActorAnimationInfo gChLeakyAnimations[3] = { ActorAnimationInfo gChLeakyAnimations[3] = {
{0x000, 0.0f}, {NULL, NULL},
{ASSET_239_ANIM_LEAKY_IDLE, 2.5f}, {ASSET_239_ANIM_LEAKY_IDLE, 2.5f},
{ASSET_239_ANIM_LEAKY_IDLE, 2.5f} {ASSET_239_ANIM_LEAKY_IDLE, 2.5f}
}; };
@@ -18,21 +18,21 @@ ActorAnimationInfo gChLeakyAnimations[3] = {
ActorInfo gChLeaky = { ActorInfo gChLeaky = {
MARKER_33_LEAKY, ACTOR_1E_LEAKY, ASSET_51A_MODEL_LEAKY, MARKER_33_LEAKY, ACTOR_1E_LEAKY, ASSET_51A_MODEL_LEAKY,
0x1, gChLeakyAnimations, 0x1, gChLeakyAnimations,
chLeaky_updateFunc, func_80326224, actor_draw, __chLeaky_updateFunc, func_80326224, actor_draw,
0, 0, 0.0f, 0 0, 0, 0.0f, 0
}; };
/* .code */ /* .code */
bool chLeaky_isCurrentModelShrapnel(Actor *this){ static bool __chLeaky_isCurrentModelShrapnel(Actor *this){
return this->modelCacheIndex == ACTOR_56_SHRAPNEL; return this->modelCacheIndex == ACTOR_56_SHRAPNEL;
} }
void func_80388F88(void){ static void __func_80388F88(void){
static f32 D_8038C73C[3] = {2500.0f, 250.0f, 4600.0f}; static f32 D_8038C73C[3] = {2500.0f, 250.0f, 4600.0f};
func_803272D0(D_8038C73C, 2000.0f, 2, chLeaky_isCurrentModelShrapnel); func_803272D0(D_8038C73C, 2000.0f, 2, __chLeaky_isCurrentModelShrapnel);
} }
void chLeaky_updateFunc(Actor *this) { static void __chLeaky_updateFunc(Actor *this) {
void *temp_v0_2; void *temp_v0_2;
func_8028E668(this->position, 100.0f, -20.0f, 100.0f); func_8028E668(this->position, 100.0f, -20.0f, 100.0f);
@@ -82,7 +82,7 @@ void chLeaky_updateFunc(Actor *this) {
} }
} }
void chLeaky_showDoneText(ActorMarker *caller, enum asset_e text_id, s32 arg2){ static void __chLeaky_showDoneText(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller); Actor *this = marker_getActor(caller);
Struct73s *temp_v0; Struct73s *temp_v0;
subaddie_set_state(this, 2); subaddie_set_state(this, 2);
@@ -93,7 +93,7 @@ void chLeaky_showDoneText(ActorMarker *caller, enum asset_e text_id, s32 arg2){
func_80324E38(0.0f, 3); func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.5f, 7); timed_setStaticCameraToNode(0.5f, 7);
timedFunc_set_0(1.0f, func_80388F88); timedFunc_set_0(1.0f, __func_80388F88);
func_80324E38(2.5f, 0); func_80324E38(2.5f, 0);
timedFunc_set_1(2.5f, func_8028F9DC, 2); timedFunc_set_1(2.5f, func_8028F9DC, 2);
timedFunc_set_3(2.5f, (GenFunction_3)func_802E4078, MAP_A_TTC_SANDCASTLE, 0, 0); timedFunc_set_3(2.5f, (GenFunction_3)func_802E4078, MAP_A_TTC_SANDCASTLE, 0, 0);
@@ -113,6 +113,6 @@ bool chLeaky_eggCollision(ActorMarker *marker){
levelSpecificFlags_set(2, TRUE); levelSpecificFlags_set(2, TRUE);
levelSpecificFlags_set(5, TRUE); levelSpecificFlags_set(5, TRUE);
gcdialog_showText(ASSET_A28_TEXT_LEAKY_DONE, 0x2a, this->position, this->marker, chLeaky_showDoneText, NULL); gcdialog_showText(ASSET_A28_TEXT_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_showDoneText, NULL);
return TRUE; return TRUE;
} }