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

refac: rename TTC_ prefixed functions to chXXX to conform to naming scheme

Browse Source
This commit is contained in:
Bl00D4NGEL
2024-09-29 02:09:44 +02:00
parent 97d2062611
commit 86a25f1345
9 changed files with 272 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/TTC/ch/blubber.c
View File

@@ -13,29 +13,29 @@ typedef struct {
s32 throw_target_radius;
NodeProp* gold_bullion_throw_target_node_prop;
s32 unk24; // bullions left to collect ? (changes from 4 to 0)
}ActorLocal_Blubber;
} ActorLocal_Blubber;
void TTC_Blubber_updateFunc(Actor *this);
void TTC_Blubber_update2Func(Actor *this);
Actor *TTC_Blubber_drawFunc(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void chBlubber_updateFunc(Actor *this);
void chBlubber_update2Func(Actor *this);
Actor *chBlubber_drawFunc(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
enum ttc_blubber_map_flags_e {
TTC_BLUBBER_MAP_FLAG_0_UNKNOWN = 0,
TTC_BLUBBER_MAP_FLAG_1_UNKNOWN = 1, // If this is not set some things will not run like showing the jiggy collected text
TTC_BLUBBER_MAP_FLAG_2_JIGGY_SPAWNED_TEXT_SHOWN = 2, // Jiggy collected text shown
TTC_BLUBBER_MAP_FLAG_3_SHOW_JIGGY_SPAWNED_TEXT_FLAG = 3
enum ch_blubber_map_flags_e {
CH_BLUBBER_MAP_FLAG_0_UNKNOWN = 0,
CH_BLUBBER_MAP_FLAG_1_UNKNOWN = 1, // If this is not set some things will not run like showing the jiggy collected text
CH_BLUBBER_MAP_FLAG_2_JIGGY_SPAWNED_TEXT_SHOWN = 2, // Jiggy collected text shown
CH_BLUBBER_MAP_FLAG_3_SHOW_JIGGY_SPAWNED_TEXT_FLAG = 3
};
enum ttc_blubber_states_e {
TTC_BLUBBER_STATE_1_UNKNOWN = 1, // initial state (80387A84)
TTC_BLUBBER_STATE_2_UNKNOWN = 2, // 80387B10
TTC_BLUBBER_STATE_3_UNKNOWN = 3,
TTC_BLUBBER_STATE_4_UNKNOWN = 4, // 80387C04
TTC_BLUBBER_STATE_5_UNKNOWN = 5 // 80387CD4
enum ch_blubber_states_e {
CH_BLUBBER_STATE_1_UNKNOWN = 1, // initial state (80387A84)
CH_BLUBBER_STATE_2_UNKNOWN = 2, // 80387B10
CH_BLUBBER_STATE_3_UNKNOWN = 3,
CH_BLUBBER_STATE_4_UNKNOWN = 4, // 80387C04
CH_BLUBBER_STATE_5_UNKNOWN = 5 // 80387CD4
};
/* .data */
ActorAnimationInfo TTC_BLUBBER_ACTOR_ANIMATIONS[6] = {
ActorAnimationInfo gChBlubberAnimations[6] = {
{0x00, 0.0f},
{ASSET_B5_ANIM_BLUBBER_WALK, 2.0f},
{ASSET_B6_ANIM_BLUBBER_CRY, 2.0f},
@@ -44,15 +44,15 @@ ActorAnimationInfo TTC_BLUBBER_ACTOR_ANIMATIONS[6] = {
{ASSET_B8_ANIM_BLUBBER_RUN, 0.8f}
};
ActorInfo TTC_BLUBBER_ACTOR = {
ActorInfo gChBlubber = {
MARKER_A3_BLUBBER, ACTOR_115_BLUBBER, ASSET_370_MODEL_BLUBBER,
0x1, TTC_BLUBBER_ACTOR_ANIMATIONS,
TTC_Blubber_updateFunc, TTC_Blubber_update2Func, TTC_Blubber_drawFunc,
0x1, gChBlubberAnimations,
chBlubber_updateFunc, chBlubber_update2Func, chBlubber_drawFunc,
0, 0x399, 1.8f, 0
};
/* .code */
void TTC_Blubber_initiliaze(Actor *this){
void chBlubber_initiliaze(Actor *this){
ActorLocal_Blubber *local = (ActorLocal_Blubber *)&this->local;
animctrl_setTransitionDuration(this->animctrl, 0.2f);
@@ -66,7 +66,7 @@ void TTC_Blubber_initiliaze(Actor *this){
func_8032A82C(this, 0x14C);
}
void TTC_Blubber_showTextCallback(ActorMarker *caller, enum asset_e text_id, s32 arg1){
void chBlubber_showTextCallback(ActorMarker *caller, enum asset_e text_id, s32 arg1){
Actor *this = marker_getActor(caller);
ActorLocal_Blubber *local = (ActorLocal_Blubber*)&this->local;
@@ -74,11 +74,11 @@ void TTC_Blubber_showTextCallback(ActorMarker *caller, enum asset_e text_id, s32
local->unk24 = 0;
}
else{
subaddie_set_state_with_direction(this, TTC_BLUBBER_STATE_2_UNKNOWN, 0, 1);
subaddie_set_state_with_direction(this, CH_BLUBBER_STATE_2_UNKNOWN, 0, 1);
}
}
void TTC_Blubber_showTextCallback2(ActorMarker *caller, enum asset_e text_id, s32 arg1){
void chBlubber_showTextCallback2(ActorMarker *caller, enum asset_e text_id, s32 arg1){
f32 sp24[3];
if(nodeProp_findPositionFromActorId(ACTOR_14B_TTC_BLUBBER_UNKNOWN, sp24)){
@@ -87,31 +87,31 @@ void TTC_Blubber_showTextCallback2(ActorMarker *caller, enum asset_e text_id, s3
}
}
void TTC_Blubber_showJiggySpawnedText(ActorMarker *marker){
void chBlubber_showJiggySpawnedText(ActorMarker *marker){
Actor *this = marker_getActor(reinterpret_cast(ActorMarker *, marker));
enum asset_e text_id;
subaddie_set_state(this, TTC_BLUBBER_STATE_4_UNKNOWN);
subaddie_set_state(this, CH_BLUBBER_STATE_4_UNKNOWN);
actor_loopAnimation(this);
this->actor_specific_1_f = 0.0f;
if(!mapSpecificFlags_get(TTC_BLUBBER_MAP_FLAG_2_JIGGY_SPAWNED_TEXT_SHOWN)) {
if(!mapSpecificFlags_get(CH_BLUBBER_MAP_FLAG_2_JIGGY_SPAWNED_TEXT_SHOWN)) {
text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED : ASSET_A0D_BLUBBER_COMPLETE;
gcdialog_showText(text_id, 0xf, this->position, this->marker, TTC_Blubber_showTextCallback, TTC_Blubber_showTextCallback2);
mapSpecificFlags_set(TTC_BLUBBER_MAP_FLAG_2_JIGGY_SPAWNED_TEXT_SHOWN, TRUE);
gcdialog_showText(text_id, 0xf, this->position, this->marker, chBlubber_showTextCallback, chBlubber_showTextCallback2);
mapSpecificFlags_set(CH_BLUBBER_MAP_FLAG_2_JIGGY_SPAWNED_TEXT_SHOWN, TRUE);
}
}
void TTC_Blubber_checkJiggySpawnedTextAndAdvanceState(Actor *this){
if( !mapSpecificFlags_get(TTC_BLUBBER_MAP_FLAG_1_UNKNOWN) ) return;
if( mapSpecificFlags_get(TTC_BLUBBER_MAP_FLAG_3_SHOW_JIGGY_SPAWNED_TEXT_FLAG) ) return;
void chBlubber_checkJiggySpawnedTextAndAdvanceState(Actor *this){
if( !mapSpecificFlags_get(CH_BLUBBER_MAP_FLAG_1_UNKNOWN) ) return;
if( mapSpecificFlags_get(CH_BLUBBER_MAP_FLAG_3_SHOW_JIGGY_SPAWNED_TEXT_FLAG) ) return;
this->yaw_ideal = (f32) func_80329784(this);
mapSpecificFlags_set(TTC_BLUBBER_MAP_FLAG_3_SHOW_JIGGY_SPAWNED_TEXT_FLAG, TRUE);
mapSpecificFlags_set(CH_BLUBBER_MAP_FLAG_3_SHOW_JIGGY_SPAWNED_TEXT_FLAG, TRUE);
func_8028F918(2);
timed_setStaticCameraToNode(0.0f, 4);
timedFunc_set_1(1.0f, (GenFunction_1)TTC_Blubber_showJiggySpawnedText, (s32)this->marker);
subaddie_set_state_with_direction(this, TTC_BLUBBER_STATE_1_UNKNOWN, 0.0f, 1);
timedFunc_set_1(1.0f, (GenFunction_1)chBlubber_showJiggySpawnedText, (s32)this->marker);
subaddie_set_state_with_direction(this, CH_BLUBBER_STATE_1_UNKNOWN, 0.0f, 1);
}
void func_8038771C(Actor *this){
@@ -131,7 +131,7 @@ void func_80387774(Actor **this_ptr){
&& bacarry_get_markerId() == MARKER_37_GOLD_BULLION
&& player_throwCarriedObject()
) {
func_8028FA34(!mapSpecificFlags_get(TTC_BLUBBER_MAP_FLAG_0_UNKNOWN) ? ACTOR_149_TTC_BLUBBER_UNKNOWN : ACTOR_14A_TTC_BLUBBER_UNKNOWN, *this_ptr);
func_8028FA34(!mapSpecificFlags_get(CH_BLUBBER_MAP_FLAG_0_UNKNOWN) ? ACTOR_149_TTC_BLUBBER_UNKNOWN : ACTOR_14A_TTC_BLUBBER_UNKNOWN, *this_ptr);
(*this_ptr)->has_met_before = TRUE;
}
@@ -145,17 +145,17 @@ void func_80387830(Actor *this , f32 arg1, f32 arg2){
}
}
void TTC_Blubber_updateFunc(Actor * this){
void chBlubber_updateFunc(Actor * this){
ActorLocal_Blubber *local;
this->marker->propPtr->unk8_3 = TRUE;
func_8028E668(this->position, 90.0f, -10.0f, 110.0f);
if(!mapSpecificFlags_get(TTC_BLUBBER_MAP_FLAG_1_UNKNOWN) && !func_80329530(this, 2500))
if(!mapSpecificFlags_get(CH_BLUBBER_MAP_FLAG_1_UNKNOWN) && !func_80329530(this, 2500))
return;
if(!this->volatile_initialized){
if(this->state == TTC_BLUBBER_STATE_3_UNKNOWN){
subaddie_set_state_with_direction(this, TTC_BLUBBER_STATE_2_UNKNOWN, 0.0f, 1);
if(this->state == CH_BLUBBER_STATE_3_UNKNOWN){
subaddie_set_state_with_direction(this, CH_BLUBBER_STATE_2_UNKNOWN, 0.0f, 1);
}
this->volatile_initialized = TRUE;
}//L80387970
@@ -164,12 +164,12 @@ void TTC_Blubber_updateFunc(Actor * this){
&& !this->has_met_before
&& item_getCount(ITEM_18_GOLD_BULLIONS) == 0
){
gcdialog_showText(ASSET_A0B_FIRST_MEET_BLUBBER, 0xe, this->position, this->marker, TTC_Blubber_showTextCallback, NULL);
gcdialog_showText(ASSET_A0B_FIRST_MEET_BLUBBER, 0xe, this->position, this->marker, chBlubber_showTextCallback, NULL);
this->has_met_before = TRUE;
subaddie_set_state_forward(this, TTC_BLUBBER_STATE_3_UNKNOWN);
subaddie_set_state_forward(this, CH_BLUBBER_STATE_3_UNKNOWN);
}
if( mapSpecificFlags_get(TTC_BLUBBER_MAP_FLAG_0_UNKNOWN)
if( mapSpecificFlags_get(CH_BLUBBER_MAP_FLAG_0_UNKNOWN)
&& !this->unk138_23
){
if (item_getCount(ITEM_18_GOLD_BULLIONS) == 0) {
@@ -181,26 +181,26 @@ void TTC_Blubber_updateFunc(Actor * this){
}//L80387A54
switch(this->state){//D_8038CD40
case TTC_BLUBBER_STATE_1_UNKNOWN:
case CH_BLUBBER_STATE_1_UNKNOWN:
if(!this->initialized){
actor_collisionOff(this);
TTC_Blubber_initiliaze(this);
chBlubber_initiliaze(this);
}
func_80387774(&this);
if(subaddie_maybe_set_state_position_direction(this, TTC_BLUBBER_STATE_2_UNKNOWN, 0.0f, 1, 0.007f))
if(subaddie_maybe_set_state_position_direction(this, CH_BLUBBER_STATE_2_UNKNOWN, 0.0f, 1, 0.007f))
break;
func_80328FB0(this, 3.0f);
func_8038771C(this);
func_80387830(this, 0.14f, 0.68f);
TTC_Blubber_checkJiggySpawnedTextAndAdvanceState(this);
chBlubber_checkJiggySpawnedTextAndAdvanceState(this);
break;
case TTC_BLUBBER_STATE_2_UNKNOWN:
case CH_BLUBBER_STATE_2_UNKNOWN:
func_80387774(&this);
if( actor_animationIsAt(this, 0.99f)
&& subaddie_maybe_set_state_position_direction(this, TTC_BLUBBER_STATE_1_UNKNOWN, 0.0f, 1, 0.78f)
&& subaddie_maybe_set_state_position_direction(this, CH_BLUBBER_STATE_1_UNKNOWN, 0.0f, 1, 0.78f)
){
this->actor_specific_1_f = 4.0f;
break;
@@ -218,18 +218,18 @@ void TTC_Blubber_updateFunc(Actor * this){
FUNC_8030E8B4(SFX_83_BLUBBER_CRYING, 0.91f, 17000, this->position, 1250, 2500);
}
TTC_Blubber_checkJiggySpawnedTextAndAdvanceState(this);
chBlubber_checkJiggySpawnedTextAndAdvanceState(this);
break;
case TTC_BLUBBER_STATE_3_UNKNOWN:
case CH_BLUBBER_STATE_3_UNKNOWN:
break;
case TTC_BLUBBER_STATE_4_UNKNOWN:
case CH_BLUBBER_STATE_4_UNKNOWN:
{
func_80328FB0(this, 3.0f);
local = (ActorLocal_Blubber*)&this->local;
if(actor_animationIsAt(this, 0.99f) && !local->unk24){
subaddie_set_state(this, TTC_BLUBBER_STATE_5_UNKNOWN);
subaddie_set_state(this, CH_BLUBBER_STATE_5_UNKNOWN);
this->actor_specific_1_f = 8.0f;
}
}
@@ -245,14 +245,14 @@ void TTC_Blubber_updateFunc(Actor * this){
}
break;
case TTC_BLUBBER_STATE_5_UNKNOWN:
case CH_BLUBBER_STATE_5_UNKNOWN:
local = (ActorLocal_Blubber*)&this->local;
func_8032A95C(this, local->unkE, 0x21c);
break;
}
}
void TTC_Blubber_update2Func(Actor *this){
void chBlubber_update2Func(Actor *this){
func_80343DEC(this);
if(0.99 <= this->unk48){
func_8028F918(0);
@@ -262,7 +262,7 @@ void TTC_Blubber_update2Func(Actor *this){
func_80387830(this, 0.5f, 0.97f);
}
Actor *TTC_Blubber_drawFunc(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *chBlubber_drawFunc(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8033A45C(4, 0);
return actor_draw(marker, gfx, mtx, vtx);
}