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

78
src/TTC/ch/lockup.c
View File

@@ -9,11 +9,19 @@ typedef struct {
s32 open_ticks_counter;
} ActorLocal_Lockup;
Actor *TTC_Lockup_drawFunc(ActorMarker *this, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void TTC_Lockup_updateFunc(Actor *this);
Actor *chLockup_drawFunc(ActorMarker *this, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void chLock_updateFunc(Actor *this);
enum ch_lockup_states_e {
CH_LOCKUP_STATE_CLOSED = 1, // L803896F0
CH_LOCKUP_STATE_OPENING = 2, // L803897DC
CH_LOCKUP_STATE_OPEN = 3, // L80389864
CH_LOCKUP_STATE_CLOSING = 4, // L803898F4
CH_LOCKUP_STATE_CLOSING2 = 5 // L803898F4
};
/* .data */
ActorAnimationInfo TTC_LOCKUP_ANIMATIONS[6] ={
ActorAnimationInfo gChLockupAnimations[6] ={
{0, 0.0f},
{ASSET_BC_ANIM_LOCKUP, 8000000.0f},
{ASSET_BC_ANIM_LOCKUP, 4.0f},
@@ -22,61 +30,53 @@ ActorAnimationInfo TTC_LOCKUP_ANIMATIONS[6] ={
{ASSET_BC_ANIM_LOCKUP, 8000000.0f}
};
ActorInfo TTC_LOCKUP_ACTOR_SLOW = {
ActorInfo gChLockupSlow = {
MARKER_A4_LOCKUP_SLOW, ACTOR_151_LOCKUP_SLOW, ASSET_3D4_MODEL_LOCKUP,
1, TTC_LOCKUP_ANIMATIONS,
TTC_Lockup_updateFunc, func_80326224, TTC_Lockup_drawFunc,
1, gChLockupAnimations,
chLock_updateFunc, func_80326224, chLockup_drawFunc,
2500, 0x366, 0.0f, 0
};
ActorInfo TTC_LOCKUP_ACTOR_MEDIUM = {
ActorInfo gChLockupMedium = {
MARKER_F6_LOCKUP_MEDIUM, ACTOR_152_LOCKUP_MEDIUM, ASSET_3D4_MODEL_LOCKUP,
1, TTC_LOCKUP_ANIMATIONS,
TTC_Lockup_updateFunc, func_80326224, TTC_Lockup_drawFunc,
1, gChLockupAnimations,
chLock_updateFunc, func_80326224, chLockup_drawFunc,
2500, 0x366, 0.0f, 0
};
ActorInfo TTC_LOCKUP_ACTOR_FAST = {
ActorInfo gChLockupFast = {
MARKER_F7_LOCKUP_FAST, ACTOR_153_LOCKUP_FAST, ASSET_3D4_MODEL_LOCKUP,
1, TTC_LOCKUP_ANIMATIONS,
TTC_Lockup_updateFunc, func_80326224, TTC_Lockup_drawFunc,
1, gChLockupAnimations,
chLock_updateFunc, func_80326224, chLockup_drawFunc,
2500, 0x366, 0.0f, 0
};
s32 TTC_LOCKUP_CLOSE_COLOR[4] = {120, 120, 120, 120};
s32 TTC_LOCKUP_CLOSE_VELOCITY[3] = {0,0,0};
enum ttc_lockup_states_e {
TTC_LOCKUP_STATE_CLOSED = 1, // lockup closed (L803896F0)
TTC_LOCKUP_STATE_OPENING = 2, // lockup opened (L803897DC)
TTC_LOCKUP_STATE_OPEN = 3, // L80389864
TTC_LOCKUP_STATE_CLOSING = 4, // L803898F4
TTC_LOCKUP_STATE_CLOSING2 = 5 // L803898F4
};
s32 CH_LOCKUP_CLOSE_COLOR[4] = {120, 120, 120, 120};
s32 CH_LOCKUP_CLOSE_VELOCITY[3] = {0,0,0};
/* .code */
Actor *TTC_Lockup_drawFunc(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *chLockup_drawFunc(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor * actor = marker_getActor(marker);
func_8033A45C(3, actor->unk38_31);
func_8033A45C(4, actor->unk38_31);
actor_draw(marker, gfx, mtx, vtx);
}
void TTC_Lockup_close(Actor *this){
subaddie_set_state_with_direction(this, TTC_LOCKUP_STATE_CLOSED, 0.2f, 1);
void chLockup_close(Actor *this){
subaddie_set_state_with_direction(this, CH_LOCKUP_STATE_CLOSED, 0.2f, 1);
this->marker->collidable = FALSE;
this->unk38_31 = 0;
FUNC_8030E8B4(SFX_6C_LOCKUP_CLOSING, 1.0f, 32000, this->position, 1250, 2500);
}
void TTC_Lockup_open(Actor *this){
void chLockup_open(Actor *this){
func_80389468();
subaddie_set_state_with_direction(this, TTC_LOCKUP_STATE_OPENING, 0.2f, 1);
subaddie_set_state_with_direction(this, CH_LOCKUP_STATE_OPENING, 0.2f, 1);
this->unk38_31 = 1;
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
}
void TTC_Lockup_updateFunc(Actor *this){
void chLock_updateFunc(Actor *this){
ActorLocal_Lockup *local = (ActorLocal_Lockup *)&this->local;
s32 tmp_v1;
int i;
@@ -97,10 +97,10 @@ void TTC_Lockup_updateFunc(Actor *this){
}
switch(this->state){
case TTC_LOCKUP_STATE_CLOSED:
case CH_LOCKUP_STATE_CLOSED:
if(!this->initialized){
this->marker->propPtr->unk8_3 = TRUE;
subaddie_set_state_with_direction(this, TTC_LOCKUP_STATE_CLOSED, 0.2f, 1);
subaddie_set_state_with_direction(this, CH_LOCKUP_STATE_CLOSED, 0.2f, 1);
this->marker->collidable = FALSE;
this->unk38_31 = 0;
this->initialized = TRUE;
@@ -115,24 +115,24 @@ void TTC_Lockup_updateFunc(Actor *this){
if(!(local->closed_ticks_counter < tmp_v1)){
local->closed_ticks_counter = 0;
TTC_Lockup_open(this);
chLockup_open(this);
}
break;
case TTC_LOCKUP_STATE_OPENING:
case CH_LOCKUP_STATE_OPENING:
if(subaddie_playerIsWithinSphere(this, 400) && func_8028FB48(0x8000000)){
func_8028F428(0xA, this->marker);
}
if(actor_animationIsAt(this, 0.5f)){
subaddie_set_state_with_direction(this, TTC_LOCKUP_STATE_OPEN, 0.5f, 1);
subaddie_set_state_with_direction(this, CH_LOCKUP_STATE_OPEN, 0.5f, 1);
}
if(0.15 < animctrl_getAnimTimer(this->animctrl)){
this->marker->collidable = TRUE;
}
break;
case TTC_LOCKUP_STATE_OPEN:
case CH_LOCKUP_STATE_OPEN:
local->open_ticks_counter++;
tmp_v1 = (this->modelCacheIndex == ACTOR_151_LOCKUP_SLOW) ? 0x1E :
(this->modelCacheIndex == ACTOR_152_LOCKUP_MEDIUM) ? 0x14 :
@@ -141,17 +141,17 @@ void TTC_Lockup_updateFunc(Actor *this){
if(!(local->open_ticks_counter < tmp_v1)){
local->open_ticks_counter = 0;
subaddie_set_state_with_direction(this, TTC_LOCKUP_STATE_CLOSING, 0.5f, 1);
subaddie_set_state_with_direction(this, CH_LOCKUP_STATE_CLOSING, 0.5f, 1);
}
break;
case TTC_LOCKUP_STATE_CLOSING:
case TTC_LOCKUP_STATE_CLOSING2:
case CH_LOCKUP_STATE_CLOSING:
case CH_LOCKUP_STATE_CLOSING2:
if(this->marker->unk14_21 && actor_animationIsAt(this, 0.99f)){
TTC_Lockup_close(this);
chLockup_close(this);
for(i = 5; i < 0xe; i++){
func_8034A174(this->marker->unk44, i, this->unk1C);
func_802EE6CC(this->unk1C, TTC_LOCKUP_CLOSE_VELOCITY, TTC_LOCKUP_CLOSE_COLOR, 1, 0.4f, 50.0f, 0xb4, 0xa0, 0);
func_802EE6CC(this->unk1C, CH_LOCKUP_CLOSE_VELOCITY, CH_LOCKUP_CLOSE_COLOR, 1, 0.4f, 50.0f, 0xb4, 0xa0, 0);
}
}
break;