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

Merge branch 'mr-origin-86'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-08 01:58:19 -05:00
parent 06204d3b68 7f41a49ef8
commit 680cf7a950
34 changed files with 568 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,16 +5,24 @@
extern void func_802EE6CC(f32[3], s32[4], s32[4], s32, f32, f32, s32, s32, s32);
typedef struct {
s32 unk0;
s32 unk4;
}ActorLocal_Lockup;
s32 closed_ticks_counter;
s32 open_ticks_counter;
} ActorLocal_Lockup;
Actor *func_803894C0(ActorMarker *this, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_80389600(Actor *this);
static Actor *__chLockup_drawFunc(ActorMarker *this, Gfx **gfx, Mtx **mtx, Vtx **vtx);
static void __chLockup_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 D_8038C760[] ={
{0, 0.0f},
ActorAnimationInfo gChLockupAnimations[6] ={
{NULL, NULL},
{ASSET_BC_ANIM_LOCKUP, 8000000.0f},
{ASSET_BC_ANIM_LOCKUP, 4.0f},
{ASSET_BC_ANIM_LOCKUP, 8000000.0f},
@@ -22,55 +30,53 @@ ActorAnimationInfo D_8038C760[] ={
{ASSET_BC_ANIM_LOCKUP, 8000000.0f}
};
ActorInfo D_8038C790 = {
ActorInfo gChLockupSlow = {
MARKER_A4_LOCKUP_SLOW, ACTOR_151_LOCKUP_SLOW, ASSET_3D4_MODEL_LOCKUP,
1, D_8038C760,
func_80389600, actor_update_func_80326224, func_803894C0,
1, gChLockupAnimations,
__chLockup_updateFunc, actor_update_func_80326224, __chLockup_drawFunc,
2500, 0x366, 0.0f, 0
};
ActorInfo D_8038C7B4 = {
ActorInfo gChLockupMedium = {
MARKER_F6_LOCKUP_MEDIUM, ACTOR_152_LOCKUP_MEDIUM, ASSET_3D4_MODEL_LOCKUP,
1, D_8038C760,
func_80389600, actor_update_func_80326224, func_803894C0,
1, gChLockupAnimations,
__chLockup_updateFunc, actor_update_func_80326224, __chLockup_drawFunc,
2500, 0x366, 0.0f, 0
};
ActorInfo D_8038C7D8 = {
ActorInfo gChLockupFast = {
MARKER_F7_LOCKUP_FAST, ACTOR_153_LOCKUP_FAST, ASSET_3D4_MODEL_LOCKUP,
1, D_8038C760,
func_80389600, actor_update_func_80326224, func_803894C0,
1, gChLockupAnimations,
__chLockup_updateFunc, actor_update_func_80326224, __chLockup_drawFunc,
2500, 0x366, 0.0f, 0
};
s32 D_8038C7FC[4] = {120, 120, 120, 120};
s32 D_8038C80C[4] = {0,0,0,0};
static s32 sLockup_CloseColor[4] = {120, 120, 120, 120};
static s32 sLockup_CloseVelocity[3] = {0,0,0};
/* .code */
Actor *func_803894C0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
static 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_func_80389530(Actor *this){
subaddie_set_state_with_direction(this, 1, 0.2f, 1);
static 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 func_8038959C(Actor *this){
static void __chLockup_open(Actor *this){
func_80389468();
subaddie_set_state_with_direction(this, 2, 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 func_80389600(Actor *this){
static void __chLockup_updateFunc(Actor *this){
ActorLocal_Lockup *local = (ActorLocal_Lockup *)&this->local;
s32 tmp_v1;
int i;
@@ -81,25 +87,25 @@ void func_80389600(Actor *this){
&& func_80329530(this, 320)
&& !func_80329530(this, 160)
&& !func_8028ECAC()
&& gcdialog_showText(0xA15, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showText(ASSET_A15_TEXT_TTC_LOCKUP_SPAWNED, 0, NULL, NULL, NULL, NULL)
){
this->has_met_before = TRUE;
}//L803896AC
}
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
}
switch(this->state){
case 1: //L803896F0
case CH_LOCKUP_STATE_CLOSED:
if(!this->initialized){
this->marker->propPtr->unk8_3 = TRUE;
subaddie_set_state_with_direction(this, 1, 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;
}//L80389758
local->unk0++;
}
local->closed_ticks_counter++;
tmp_v1 = (this->modelCacheIndex == ACTOR_151_LOCKUP_SLOW) ? 0x1E :
(this->modelCacheIndex == ACTOR_152_LOCKUP_MEDIUM) ? 0x14 :
@@ -107,47 +113,47 @@ void func_80389600(Actor *this){
10000;
if(!(local->unk0 < tmp_v1)){
local->unk0 = 0;
func_8038959C(this);
if(!(local->closed_ticks_counter < tmp_v1)){
local->closed_ticks_counter = 0;
__chLockup_open(this);
}
break;
case 2: //L803897DC
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, 3, 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 3: //L80389864
local->unk4++;
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 :
(this->modelCacheIndex == ACTOR_153_LOCKUP_FAST) ? 0xA :
10000;
if(!(local->unk4 < tmp_v1)){
local->unk4 = 0;
subaddie_set_state_with_direction(this, 4, 0.5f, 1);
if(!(local->open_ticks_counter < tmp_v1)){
local->open_ticks_counter = 0;
subaddie_set_state_with_direction(this, CH_LOCKUP_STATE_CLOSING, 0.5f, 1);
}
break;
case 4: //L803898F4
case 5: //L803898F4
case CH_LOCKUP_STATE_CLOSING:
case CH_LOCKUP_STATE_CLOSING2:
if(this->marker->unk14_21 && actor_animationIsAt(this, 0.99f)){
TTC_func_80389530(this);
__chLockup_close(this);
for(i = 5; i < 0xe; i++){
func_8034A174(this->marker->unk44, i, this->unk1C);
func_802EE6CC(this->unk1C, D_8038C80C, D_8038C7FC, 1, 0.4f, 50.0f, 0xb4, 0xa0, 0);
func_802EE6CC(this->unk1C, sLockup_CloseVelocity, sLockup_CloseColor, 1, 0.4f, 50.0f, 0xb4, 0xa0, 0);
}
}
break;
}//L8038999C
}
}