documentation: core2/ba/physics
This commit is contained in:
@@ -96,7 +96,7 @@ void func_803867F4(void){
|
||||
void func_80386850(ActorMarker *caller_marker, enum asset_e text_id, s32 arg2){
|
||||
Actor *caller = marker_getActor(caller_marker);
|
||||
if(text_id == 0xA80){
|
||||
func_80328B8C(caller, 2, 0.0f, 1);
|
||||
subaddie_set_state_with_direction(caller, 2, 0.0f, 1);
|
||||
actor_playAnimationOnce(caller);
|
||||
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
|
||||
timedFunc_set_0(1.0f, func_803867F4);
|
||||
@@ -162,7 +162,7 @@ void chAncientOne_update(Actor *this){
|
||||
}
|
||||
}
|
||||
|
||||
func_80328B8C(this, 2, 0.0f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
if(this->unkF4_8 < 5){
|
||||
D_80390C28[this->unkF4_8]->propPtr->unk8_4 = TRUE;
|
||||
@@ -198,7 +198,7 @@ void chAncientOne_update(Actor *this){
|
||||
break;
|
||||
case 2: //L80386DCC
|
||||
if(actor_animationIsAt(this, 0.999f)){
|
||||
func_80328B8C(this, 3, 0.9999f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.9999f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
}
|
||||
break;
|
||||
|
@@ -70,7 +70,7 @@ Actor *func_8038DA18(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
|
||||
|
||||
void GV_func_8038DB0C(Actor *this){
|
||||
func_80328B8C(this, 1, 0.99f, 0);
|
||||
subaddie_set_state_with_direction(this, 1, 0.99f, 0);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@ void func_8038DBDC(Actor *this){
|
||||
this->initialized = TRUE;
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
actor_collisionOff(this);
|
||||
func_80328B8C(this, 1, 0.99f, 0);
|
||||
subaddie_set_state_with_direction(this, 1, 0.99f, 0);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
|
||||
D_80391AB8 = 0;
|
||||
func_8038DB4C(0);
|
||||
@@ -120,7 +120,7 @@ void func_8038DBDC(Actor *this){
|
||||
}//L8038DC90
|
||||
if(func_8038E178() != (s32)this->unk1C[0] || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
|
||||
if(15.0f <= this->unk60){
|
||||
func_80328B8C(this, 2, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
|
||||
animctrl_setDuration(this->animctrl, 2.0f);
|
||||
this->unk1C[0] = (f32)func_8038E178();
|
||||
@@ -135,7 +135,7 @@ void func_8038DBDC(Actor *this){
|
||||
if(!(func_8038E178() < 5)){
|
||||
func_8038DB88(this);
|
||||
if(D_80391AB8){
|
||||
func_80328B8C(this, 3, 0.99f, 0);
|
||||
subaddie_set_state_with_direction(this, 3, 0.99f, 0);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
|
||||
this->unk1C[0] = 0.0f;
|
||||
}
|
||||
@@ -158,7 +158,7 @@ void func_8038DBDC(Actor *this){
|
||||
break;
|
||||
case 3: //8038DE44
|
||||
if(!(this->unk38_31 < 0x21)){
|
||||
func_80328B8C(this, 4, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.01f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
|
||||
animctrl_setDuration(this->animctrl, 3.0f);
|
||||
func_803865F8();
|
||||
@@ -170,7 +170,7 @@ void func_8038DBDC(Actor *this){
|
||||
break;
|
||||
case 4: //8038DEBC
|
||||
if(actor_animationIsAt(this, 0.99f)){
|
||||
func_80328B8C(this, 5, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_LOOP);
|
||||
animctrl_setDuration(this->animctrl, 2.0f);
|
||||
func_8038DB58(0);
|
||||
@@ -191,7 +191,7 @@ void func_8038DBDC(Actor *this){
|
||||
break;
|
||||
case 5: //8038DFC8
|
||||
if(func_8038DB64() == 0x127){
|
||||
func_80328B8C(this, 6, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 6, 0.01f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_LOOP);
|
||||
animctrl_setDuration(this->animctrl, 1.6f);
|
||||
func_80386608();
|
||||
|
@@ -37,7 +37,7 @@ s32 D_80390E88[4] = {0, 0, 0, 0};
|
||||
void GV_func_803894B0(Actor *this){
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
actor_collisionOff(this);
|
||||
func_80328B8C(this, 1, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
|
||||
this->unk38_31 = 0;
|
||||
this->initialized = TRUE;
|
||||
}
|
||||
@@ -72,7 +72,7 @@ void chSarcophagus_update(Actor *this){
|
||||
GV_func_803894B0(this);
|
||||
}
|
||||
if(func_80329530(this, 500) && func_8038957C(this)){
|
||||
func_80328B8C(this, 2, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
|
||||
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
|
||||
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
|
||||
|
||||
@@ -88,13 +88,13 @@ void chSarcophagus_update(Actor *this){
|
||||
this->unk38_31 = 1;
|
||||
}
|
||||
if(actor_animationIsAt(this, 0.5f)){
|
||||
func_80328B8C(this, 3, 0.5f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.5f, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
case 3: //L80389788
|
||||
if(!func_80329530(this, 700)){
|
||||
func_80328B8C(this, 4, 0.5f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.5f, 1);
|
||||
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
|
||||
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
|
||||
}
|
||||
@@ -110,7 +110,7 @@ void chSarcophagus_update(Actor *this){
|
||||
}
|
||||
|
||||
if(actor_animationIsAt(this, 0.99f)){
|
||||
func_80328B8C(this, 1, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
|
||||
}
|
||||
else if(actor_animationIsAt(this, 0.9f)){
|
||||
FUNC_8030E8B4(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 32000, this->position, 1250, 2500);
|
||||
@@ -123,7 +123,7 @@ void chSarcophagus_updateSNS(Actor *this){
|
||||
if(!this->initialized){
|
||||
GV_func_803894B0(this);
|
||||
if(fileProgressFlag_get(FILEPROG_A4_GV_SNS_SARCOPHAGUS_OPEN))
|
||||
func_80328B8C(this, 3, 0.5f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.5f, 1);
|
||||
this->unk1C[0] = 0.0f;
|
||||
}
|
||||
|
||||
@@ -132,7 +132,7 @@ void chSarcophagus_updateSNS(Actor *this){
|
||||
if(this->unk1C[0] != 0.0f){
|
||||
this->unk1C[0] -= 1.0f;
|
||||
if(this->unk1C[0] == 0.0f){
|
||||
func_80328B8C(this, 5, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
|
||||
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 0.5f, 32000, this->position, 1250, 2500);
|
||||
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 0.5f, 32000, this->position, 1250, 2500);
|
||||
}
|
||||
@@ -145,7 +145,7 @@ void chSarcophagus_updateSNS(Actor *this){
|
||||
break;
|
||||
case 5://L803899DC
|
||||
if(actor_animationIsAt(this, 0.5f)){
|
||||
func_80328B8C(this, 3, 0.5f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.5f, 1);
|
||||
FUNC_8030E624(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 25000);
|
||||
}
|
||||
break;
|
||||
|
@@ -24,17 +24,17 @@ s32 D_80391A34;
|
||||
|
||||
/* .code */
|
||||
void GV_func_803863F0(Actor *this){
|
||||
func_80328B8C(this, 1, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
|
||||
D_80391A30 = FALSE;
|
||||
}
|
||||
|
||||
void GV_func_80386420(Actor *this){
|
||||
func_80328B8C(this, 2, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
|
||||
this->unk38_31 = 0x23;
|
||||
}
|
||||
|
||||
void func_80386464(Actor *this){
|
||||
func_80328B8C(this, 3, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.0001f, 1);
|
||||
}
|
||||
|
||||
void chtoots_update(Actor *this){
|
||||
|
@@ -25,13 +25,13 @@ ActorInfo D_80390ED0 = { MARKER_A9_RUBEE, ACTOR_11B_RUBEE, ASSET_3DD_MODEL_RUBEE
|
||||
void func_80389A20(ActorMarker *caller, enum asset_e text_id, s32 arg2){
|
||||
Actor *this = marker_getActor(caller);
|
||||
func_8038E18C();
|
||||
func_80328B8C(this, 3, 0.0f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.0f, 1);
|
||||
}
|
||||
|
||||
void func_80389A60(Actor *this){
|
||||
func_80311480(ASSET_A70_TEXT_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL);
|
||||
this->unk138_24 = TRUE;
|
||||
func_80328A84(this, 5);
|
||||
subaddie_set_state(this, 5);
|
||||
}
|
||||
|
||||
void func_80389ABC(Actor *this){
|
||||
@@ -75,7 +75,7 @@ void func_80389B1C(Actor *this){
|
||||
func_80389ABC(this);
|
||||
}
|
||||
else if(actor_animationIsAt(this, 0.99f)){
|
||||
func_80328B38(this, 2, 0.9f);
|
||||
subaddie_maybe_set_state(this, 2, 0.9f);
|
||||
}
|
||||
|
||||
if( actor_animationIsAt(this, 0.42f)
|
||||
@@ -96,7 +96,7 @@ void func_80389B1C(Actor *this){
|
||||
func_80389ABC(this);
|
||||
}
|
||||
else if(actor_animationIsAt(this, 0.99f)){
|
||||
func_80328B38(this, 1, 0.4f);
|
||||
subaddie_maybe_set_state(this, 1, 0.4f);
|
||||
}
|
||||
break;
|
||||
case 3: //L80389E14
|
||||
@@ -106,12 +106,12 @@ void func_80389B1C(Actor *this){
|
||||
}
|
||||
|
||||
if( actor_animationIsAt(this, 0.99f)){
|
||||
func_80328A84(this, 4);
|
||||
subaddie_set_state(this, 4);
|
||||
}
|
||||
break;
|
||||
case 4: //L80389E64
|
||||
if(!func_8038E178())
|
||||
func_80328A84(this, 2);
|
||||
subaddie_set_state(this, 2);
|
||||
break;
|
||||
}//L80389E80
|
||||
}
|
||||
|
@@ -88,7 +88,7 @@ void func_8038A31C(Actor *this){
|
||||
this->unk1C[0] = 1.0;
|
||||
this->alpha_124_19 = 0xff;
|
||||
if(this->unk54 != 0.0f){
|
||||
func_80328B8C(this, 2, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.02f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
|
||||
}
|
||||
break;
|
||||
@@ -96,7 +96,7 @@ void func_8038A31C(Actor *this){
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
this->unk1C[0] = 1.0;
|
||||
if(45.0f <= this->velocity[0]){
|
||||
func_80328B8C(this, 3, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.02f, 1);
|
||||
this->velocity[0] = 0.0f;
|
||||
}
|
||||
else{
|
||||
@@ -115,7 +115,7 @@ void func_8038A31C(Actor *this){
|
||||
this->unk1C[0] = 0.0;
|
||||
this->alpha_124_19 = 0;
|
||||
if(this->unk54 == 0.0f){
|
||||
func_80328B8C(this, 4, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.02f, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -123,7 +123,7 @@ void func_8038A31C(Actor *this){
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
this->unk1C[0] = 1.0;
|
||||
if(45.0f <= this->velocity[0]){
|
||||
func_80328B8C(this, 1, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.02f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_LOOP);
|
||||
this->velocity[0] = 0.0f;
|
||||
}
|
||||
|
@@ -104,7 +104,7 @@ void func_8038ADFC(f32 pos[3], s32 cnt){
|
||||
|
||||
void func_8038AF10(Actor *this){
|
||||
animctrl_setSmoothTransition(this->animctrl, TRUE);
|
||||
func_80328B8C(this, 3, 0.00001f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.00001f, 1);
|
||||
actor_loopAnimation(this);
|
||||
this->unk28 = 16.0f;
|
||||
this->unk1C[0] = 1.0f;
|
||||
@@ -124,7 +124,7 @@ void func_8038AFF4(ActorMarker *this_marker, ActorMarker *other_marker){
|
||||
Actor *this = marker_getActor(this_marker);
|
||||
func_8032B4DC(this, other_marker, 0xC);
|
||||
actor_collisionOff(this);
|
||||
func_80328B8C(this, ASSET_9_ANIM_BSDIE, 0.00001f, 1);
|
||||
subaddie_set_state_with_direction(this, ASSET_9_ANIM_BSDIE, 0.00001f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
this->unk1C[0] = 0.0f;
|
||||
func_8030E878(SFX_D7_GRABBA_DEATH, 1.0f, 32000, this->position, 2250.0f, 4500.0f);
|
||||
@@ -189,7 +189,7 @@ void func_8038B124(Actor *this){
|
||||
&& func_803292E0(this)
|
||||
){
|
||||
animctrl_setSmoothTransition(this->animctrl, 0);
|
||||
func_80328B8C(this, 2, 0.00001f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.00001f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
this->yaw = (f32)func_80329784(this);
|
||||
this->unk28 = 0.0f;
|
||||
@@ -221,12 +221,12 @@ void func_8038B124(Actor *this){
|
||||
case 3: //L8038B494
|
||||
func_8030E2C4(this->unk44_31);
|
||||
if(func_80329530(this, 175)){
|
||||
func_80328B8C(this, 4, 0.00001f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.00001f, 1);
|
||||
actor_loopAnimation(this);
|
||||
this->unk1C[0] = 1.0f;
|
||||
}
|
||||
else if(!func_80329530(this, 1100) || !func_8038AF78(this, 8.0f, 16.0f)){
|
||||
func_80328B8C(this, 8, 0.00001f, 1);
|
||||
subaddie_set_state_with_direction(this, 8, 0.00001f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
this->unk1C[0] = 1.0f;
|
||||
func_802BB3DC(0, 6.0f, 0.92f);
|
||||
@@ -249,7 +249,7 @@ void func_8038B124(Actor *this){
|
||||
this->yaw_ideal = func_80329784(this);
|
||||
func_80328FB0(this, 8.0f);
|
||||
if(this->unk38_31 >= 20){
|
||||
func_80328B8C(this, 5, 0.00001f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.00001f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
this->unk38_31 = 0;
|
||||
this->unk1C[0] = 1.0f;
|
||||
@@ -269,7 +269,7 @@ void func_8038B124(Actor *this){
|
||||
func_8030E878(SFX_3_DULL_CANNON_SHOT, 1.0f, 32000, this->position, 2250.0f, 4500.0f);
|
||||
}//L8038B734
|
||||
if(0.98 < animctrl_getAnimTimer(this->animctrl)){
|
||||
func_80328B8C(this, 6, 0.99f, 0);
|
||||
subaddie_set_state_with_direction(this, 6, 0.99f, 0);
|
||||
actor_playAnimationOnce(this);
|
||||
this->unk60 = 0.0f;
|
||||
this->unk1C[0] = 1.0f;
|
||||
@@ -278,7 +278,7 @@ void func_8038B124(Actor *this){
|
||||
|
||||
case 6: //L8038B78C
|
||||
if(75.0f <= this->unk60){
|
||||
func_80328B8C(this, 7, 0.00001f, 1);
|
||||
subaddie_set_state_with_direction(this, 7, 0.00001f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
this->unk1C[0] = 1.0f;
|
||||
}
|
||||
@@ -295,14 +295,14 @@ void func_8038B124(Actor *this){
|
||||
|
||||
case 8: //L8038B820
|
||||
if(0.98 < animctrl_getAnimTimer(this->animctrl)){
|
||||
func_80328B8C(this, 1, 0.00001f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.00001f, 1);
|
||||
this->unk1C[0] = 0.0f;
|
||||
this->unk1C[1] = 2.0f;
|
||||
}
|
||||
break;
|
||||
|
||||
case 9: //L8038B870
|
||||
func_80328A84(this, 0xA);
|
||||
subaddie_set_state(this, 0xA);
|
||||
func_8038ACEC(this->position, 2);
|
||||
func_8034A174(this->marker->unk44, 5, GV_D_80391A70);
|
||||
func_8038ACEC(GV_D_80391A70, 2);
|
||||
|
@@ -47,7 +47,7 @@ extern s32 D_80391A80;
|
||||
/* .code */
|
||||
void func_8038B988(ActorMarker *caller, enum asset_e text_id, s32 arg2){
|
||||
Actor *this = marker_getActor(caller);
|
||||
func_80328B8C(this, 5, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
|
||||
actor_loopAnimation(this);
|
||||
func_802BAFE4(0x13);
|
||||
FUNC_8030E624(SFX_8D_BOGGY_OHWW, 0.9f, 32000);
|
||||
@@ -56,7 +56,7 @@ void func_8038B988(ActorMarker *caller, enum asset_e text_id, s32 arg2){
|
||||
}
|
||||
|
||||
void func_8038BA08(Actor *this){
|
||||
func_80328B8C(this, 6, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 6, 0.01f, 1);
|
||||
actor_loopAnimation(this);
|
||||
this->unk100 = NULL;
|
||||
D_80391A80 = 3;
|
||||
@@ -182,7 +182,7 @@ void GV_func_8038BEA0(Actor *this){
|
||||
this->unk100 = func_8032B16C(JIGGY_3E_GV_GRABBA);
|
||||
local->unk0 = this->unk100 != NULL ? this->unk100->unk5C : NULL;
|
||||
}
|
||||
func_80328B8C(this, this->state, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, this->state, 0.01f, 1);
|
||||
this->unk58_0 = FALSE;
|
||||
this->marker->propPtr->unk8_3 = FALSE;
|
||||
}//L8038BFF4
|
||||
@@ -195,7 +195,7 @@ void GV_func_8038BEA0(Actor *this){
|
||||
this->unk58_0 = FALSE;
|
||||
this->marker->propPtr->unk8_3 = FALSE;
|
||||
if(func_8038BB24(this)){
|
||||
func_80328B8C(this, 2, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
this->unk38_31 = 0;
|
||||
D_80391A80 = this->state;
|
||||
@@ -208,7 +208,7 @@ void GV_func_8038BEA0(Actor *this){
|
||||
|
||||
case 2: //L8038C108
|
||||
if(actor_animationIsAt(this, 0.69f)){
|
||||
func_80328B8C(this, 3, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.01f, 1);
|
||||
actor_loopAnimation(this);
|
||||
D_80391A80 = this->state;
|
||||
if(this->unk100){
|
||||
@@ -230,7 +230,7 @@ void GV_func_8038BEA0(Actor *this){
|
||||
func_8038BA08(this);
|
||||
}
|
||||
else if(this->unk38_31 >= 0xC){
|
||||
func_80328B8C(this, 4, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.01f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
D_80391A80 = this->state;
|
||||
func_802BB3DC(0, 12.0f, 0.92f);
|
||||
@@ -257,7 +257,7 @@ void GV_func_8038BEA0(Actor *this){
|
||||
func_8038BA08(this);
|
||||
}
|
||||
else if(actor_animationIsAt(this, 0.89f)){
|
||||
func_80328B8C(this, 1, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
|
||||
actor_loopAnimation(this);
|
||||
D_80391A80 = this->state;
|
||||
}
|
||||
|
@@ -49,13 +49,13 @@ void GV_func_8038C658(Actor *this){
|
||||
|
||||
if(!this->unk16C_4 && this->initialized){
|
||||
this->unk16C_4 = TRUE;
|
||||
func_80328B8C(this, this->state, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, this->state, 0.01f, 1);
|
||||
}
|
||||
sp24 = GV_func_8038C5BC();
|
||||
if(GV_D_80391A90)
|
||||
marker_despawn(this->marker);
|
||||
if(this->state != sp24)
|
||||
func_80328A84(this, sp24);
|
||||
subaddie_set_state(this, sp24);
|
||||
}
|
||||
|
||||
void func_8038C748(void){
|
||||
|
@@ -23,7 +23,7 @@ ActorInfo D_803912B8 = { MARKER_F9_JINXY, ACTOR_1F7_JINXY, ASSET_422_MODEL_JINXY
|
||||
/* .code */
|
||||
void func_8038D450(ActorMarker *this_marker){
|
||||
Actor *this = marker_getActor(this_marker);
|
||||
func_80328AC8(this, 3);
|
||||
subaddie_set_state_forward(this, 3);
|
||||
}
|
||||
|
||||
void func_8038D47C(Actor *this){
|
||||
@@ -83,13 +83,13 @@ void func_8038D47C(Actor *this){
|
||||
case 1: //L8038D6C0
|
||||
if(!mapSpecificFlags_get(0xE) && mapSpecificFlags_get(0) + mapSpecificFlags_get(1) == 1){
|
||||
mapSpecificFlags_set(0xE, TRUE);
|
||||
func_80328AC8(this, 2);
|
||||
subaddie_set_state_forward(this, 2);
|
||||
this->unk38_31 = 1;
|
||||
}
|
||||
else if(!mapSpecificFlags_get(0xF) && mapSpecificFlags_get(0) + mapSpecificFlags_get(1) == 2){
|
||||
mapSpecificFlags_set(0xF, TRUE);
|
||||
func_8028F918(2);
|
||||
func_80328AC8(this, 3);
|
||||
subaddie_set_state_forward(this, 3);
|
||||
func_802BAFE4(0);
|
||||
}
|
||||
break;
|
||||
@@ -104,7 +104,7 @@ void func_8038D47C(Actor *this){
|
||||
if(--this->unk38_31 == 0){
|
||||
func_80311480(ASSET_A7C_TEXT_JINXY_ONE_EGG, 4, NULL, NULL, NULL, NULL);
|
||||
mapSpecificFlags_set(0x14, TRUE);
|
||||
func_80328AC8(this, 1);
|
||||
subaddie_set_state_forward(this, 1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -126,7 +126,7 @@ void func_8038D47C(Actor *this){
|
||||
}
|
||||
}
|
||||
if(actor_animationIsAt(this, 0.99f)){
|
||||
func_80328AC8(this, 1);
|
||||
subaddie_set_state_forward(this, 1);
|
||||
}
|
||||
break;
|
||||
case 4: //L8038D910
|
||||
|
@@ -34,7 +34,7 @@ void func_8038E1A8(Actor *this){
|
||||
if(sp24){
|
||||
sp24->velocity_y = 1.0f;
|
||||
}
|
||||
func_80328B8C(this, 1, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.02f, 1);
|
||||
}
|
||||
else{
|
||||
if(actor_animationIsAt(this, 0.2f))
|
||||
@@ -57,7 +57,7 @@ void func_8038E2FC(ActorMarker *this_marker){
|
||||
Actor *this = marker_getActor(this_marker);
|
||||
Actor *other = func_8032A7AC(this);
|
||||
if(other){
|
||||
func_80328B8C(this, 2, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.02f, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -229,7 +229,7 @@ void func_8038E648(Actor *this){
|
||||
this->pitch = 0.0f;
|
||||
if(mapSpecificFlags_get(5)){
|
||||
func_802BAFE4(2);
|
||||
func_80328A84(this, 6);
|
||||
subaddie_set_state(this, 6);
|
||||
this->unk38_31 = 600;
|
||||
func_80244BB0(0, 0x6A, 0x7ff8, 0.3f);
|
||||
func_802D68F0(25);
|
||||
@@ -240,7 +240,7 @@ void func_8038E648(Actor *this){
|
||||
case 6: //L8038E700
|
||||
this->pitch += (this->pitch < 1.0) ? 0.017 : 1.09;
|
||||
if(90.0f <= this->pitch){
|
||||
func_80328A84(this, 7);
|
||||
subaddie_set_state(this, 7);
|
||||
this->pitch = 90.0f;
|
||||
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
|
||||
func_80244C78(0);
|
||||
@@ -250,7 +250,7 @@ void func_8038E648(Actor *this){
|
||||
case 7: //L8038E78C
|
||||
this->unk38_31 -= time_getDelta();
|
||||
if(this->unk38_31 == 0){
|
||||
func_80328A84(this, 8);
|
||||
subaddie_set_state(this, 8);
|
||||
func_80244BB0(0, 0x6A, 0x7ff8, 0.3f);
|
||||
}
|
||||
break;
|
||||
@@ -258,7 +258,7 @@ void func_8038E648(Actor *this){
|
||||
case 8: //L8038E894
|
||||
this->pitch -= 1.5;
|
||||
if(this->pitch <= 0.0f){
|
||||
func_80328A84(this, 1);
|
||||
subaddie_set_state(this, 1);
|
||||
this->pitch = 0.0f;
|
||||
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
|
||||
mapSpecificFlags_set(5, FALSE);
|
||||
@@ -295,7 +295,7 @@ void func_8038E97C(Actor *this){
|
||||
this->position_z += 117.0;
|
||||
this->position_y += 130.0;
|
||||
this->unk38_31 = 30;
|
||||
func_80328A84(this, 8);
|
||||
subaddie_set_state(this, 8);
|
||||
func_80244BB0(1, 0x6A, 0x7ff8, 0.3f);
|
||||
}
|
||||
}//L8038EA6C
|
||||
@@ -313,7 +313,7 @@ void func_8038E97C(Actor *this){
|
||||
this->position_y = tmp_f0 - (f32)130.0/30.0f;
|
||||
this->unk38_31 -= 1;
|
||||
if(this->unk38_31 == 0){
|
||||
func_80328A84(this, 1);
|
||||
subaddie_set_state(this, 1);
|
||||
func_80244C78(1);
|
||||
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
|
||||
}
|
||||
@@ -329,7 +329,7 @@ void chKazooieDoor_update(Actor *this){
|
||||
if(mapSpecificFlags_get(6)){
|
||||
func_8025A6EC(COMUSIC_2B_DING_B, -1);
|
||||
func_802BAFE4(3);
|
||||
func_80328A84(this, 6);
|
||||
subaddie_set_state(this, 6);
|
||||
func_80244BB0(1, 0x6a, 0x7ff8, 0.3f);
|
||||
this->unk1C[1] = this->position_y + 210.0f;
|
||||
this->unk1C[0] = this->position_y;
|
||||
@@ -340,7 +340,7 @@ void chKazooieDoor_update(Actor *this){
|
||||
this->position_y += 1.8;
|
||||
this->position_z -= 1.3319999999999999;
|
||||
if(this->unk1C[1] <= this->position_y){
|
||||
func_80328A84(this, 7);
|
||||
subaddie_set_state(this, 7);
|
||||
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
|
||||
func_80244C78(1);
|
||||
this->unk38_31 = 450;
|
||||
@@ -350,7 +350,7 @@ void chKazooieDoor_update(Actor *this){
|
||||
case 7: //L8038EC70
|
||||
this->unk38_31--;
|
||||
if(this->unk38_31 == 0){
|
||||
func_80328A84(this, 8);
|
||||
subaddie_set_state(this, 8);
|
||||
func_80244BB0(1, 0x6a, 0x7ff8, 0.3f);
|
||||
}
|
||||
break;
|
||||
@@ -360,7 +360,7 @@ void chKazooieDoor_update(Actor *this){
|
||||
this->position_z += 1.3319999999999999;
|
||||
if(this->position_y <= this->unk1C[0]){
|
||||
this->position_y = this->unk1C[0];
|
||||
func_80328A84(this, 1);
|
||||
subaddie_set_state(this, 1);
|
||||
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
|
||||
func_80244C78(1);
|
||||
mapSpecificFlags_set(6, FALSE);
|
||||
|
Reference in New Issue
Block a user