misc documentation
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "core2/particle.h"
|
||||
|
||||
|
||||
|
||||
@@ -124,39 +125,39 @@ void func_80387C5C(void){
|
||||
ParticleEmitter *actor;
|
||||
|
||||
func_802BB3DC(0, 60.0f, 0.9f);
|
||||
actor = partEmitList_pushNew(1);
|
||||
actor = partEmitMgr_newEmitter(1);
|
||||
particleEmitter_setSprite(actor, ASSET_4A0_SPRITE_EXPLOSION);
|
||||
func_802EFA5C(actor, 0.1f, 0.2f);
|
||||
func_802EFA70(actor, 8);
|
||||
particleEmitter_setFade(actor, 0.1f, 0.2f);
|
||||
particleEmitter_setDrawMode(actor, PART_EMIT_NO_LOOP);
|
||||
particleEmitter_setStartingFrameRange(actor, 0, 0);
|
||||
particleEmitter_setParticleFramerateRange(actor, 4.0f, 4.0f);
|
||||
func_802EFB70(actor, 10.0f, 10.0f);
|
||||
func_802EFB84(actor, 15.0f, 20.0f);
|
||||
func_802EFEC0(actor, 4.0f, 4.0f);
|
||||
particleEmitter_setParticleLifeTimeRange(actor, 4.0f, 4.0f);
|
||||
particleEmitter_setParticleVelocityRange(actor, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||
func_802EF3F4(actor, &D_803902D4, &D_803902E0, 1);
|
||||
particleEmitter_emitInVolume(actor, &D_803902D4, &D_803902E0, 1);
|
||||
}
|
||||
|
||||
void func_80387D80(void){
|
||||
ParticleEmitter *actor = partEmitList_pushNew(3);
|
||||
ParticleEmitter *actor = partEmitMgr_newEmitter(3);
|
||||
particleEmitter_setSprite(actor, ASSET_70E_SPRITE_SMOKE_2);
|
||||
particleEmitter_setStartingFrameRange(actor, 0, 7);
|
||||
func_802EFB98(actor, &D_80390304);
|
||||
particleEmitter_setParticleVelocityRange(actor, 0.0f, 100.0f, 0.0f, 0.0f, 200.0f ,0.0f);
|
||||
func_802EF3F4(actor, &D_803902EC, &D_803902F8, 3);
|
||||
particleEmitter_emitInVolume(actor, &D_803902EC, &D_803902F8, 3);
|
||||
}
|
||||
|
||||
void func_80387E20(void){
|
||||
ParticleEmitter *actor = partEmitList_pushNew(0x19);
|
||||
ParticleEmitter *actor = partEmitMgr_newEmitter(0x19);
|
||||
func_802EF9F8(actor, 0.6f);
|
||||
func_802EFA18(actor, 3);
|
||||
particleEmitter_setModel(actor, 0x427);
|
||||
func_802EFB70(actor, 0.05f, 0.4f);
|
||||
func_802EFE24(actor, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
|
||||
particleEmitter_setAngularVelocityRange(actor, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
|
||||
particleEmitter_setSpawnIntervalRange(actor, 0.0f, 0.01f);
|
||||
func_802EFEC0(actor, 10.0f, 10.0f);
|
||||
particleEmitter_setParticleLifeTimeRange(actor, 10.0f, 10.0f);
|
||||
particleEmitter_setVelocityAndAccelerationRanges(actor, &D_80390344);
|
||||
func_802EF3F4(actor, &D_8039032C, &D_80390338, 0x19);
|
||||
particleEmitter_emitInVolume(actor, &D_8039032C, &D_80390338, 0x19);
|
||||
}
|
||||
|
||||
void RBB_func_80387F18(ActorMarker *marker, s32 arg1){
|
||||
@@ -164,7 +165,7 @@ void RBB_func_80387F18(ActorMarker *marker, s32 arg1){
|
||||
}
|
||||
|
||||
void RBB_func_80387F44(void){
|
||||
func_80250E94(0.5f, 1.0f, 1.5f, 0.0f, 1.0f, 1.5f);
|
||||
rumbleManager_80250E94(0.5f, 1.0f, 1.5f, 0.0f, 1.0f, 1.5f);
|
||||
}
|
||||
|
||||
void func_80387F88(ActorMarker *marker){
|
||||
|
@@ -111,7 +111,7 @@ void func_803890BC(Actor *this){
|
||||
func_80388EB8(this, 1);
|
||||
}//L80389164
|
||||
|
||||
if(func_8025773C(&local->unk24, sp38))
|
||||
if(ml_timer_update(&local->unk24, sp38))
|
||||
func_80388EB8(this, (this->state == 1) ? 2 : 1);
|
||||
//L803891A8
|
||||
|
||||
@@ -119,7 +119,7 @@ void func_803890BC(Actor *this){
|
||||
local->unk1C += 0.25 * sp38;
|
||||
if(1.0f < local->unk1C)
|
||||
local->unk1C = 1.0f;
|
||||
func_80255FE4(sp2C, local->unk4, local->unk10, local->unk1C);
|
||||
ml_interpolate_vec3f(sp2C, local->unk4, local->unk10, local->unk1C);
|
||||
this->pitch = sp2C[0];
|
||||
this->yaw = sp2C[1];
|
||||
this->roll = sp2C[2];
|
||||
|
@@ -143,7 +143,7 @@ void func_8038944C(Actor *this){
|
||||
}
|
||||
}//L80389508
|
||||
|
||||
if(func_8025773C(&local->unk28, tick)){
|
||||
if(ml_timer_update(&local->unk28, tick)){
|
||||
if(this->state == 2)
|
||||
func_803892D8(this, 3);
|
||||
else if(this->state == 3)
|
||||
|
@@ -148,7 +148,7 @@ void func_8038A724(Actor *this){
|
||||
|
||||
if(this->state == 2){
|
||||
if(0.0f < local->unk1C){
|
||||
if(func_8025773C(&local->unk1C, sp1C)){
|
||||
if(ml_timer_update(&local->unk1C, sp1C)){
|
||||
func_8038A524(this, 3);
|
||||
}//L8038AA8C
|
||||
}else{
|
||||
@@ -163,7 +163,7 @@ void func_8038A724(Actor *this){
|
||||
|
||||
if(this->state == 3){
|
||||
if(0.0f < local->unk1C){
|
||||
if(func_8025773C(&local->unk1C, sp1C)){
|
||||
if(ml_timer_update(&local->unk1C, sp1C)){
|
||||
func_8038A524(this, 2);
|
||||
}//L8038AA8C
|
||||
}else{
|
||||
|
@@ -143,7 +143,7 @@ void func_8038AEB8(Actor *this){
|
||||
func_8038AC18(this, 1);
|
||||
}//L8038AF88
|
||||
|
||||
if(func_8025773C(&local->unk8, sp20))
|
||||
if(ml_timer_update(&local->unk8, sp20))
|
||||
func_8038AC18(this, 1);
|
||||
|
||||
if(this->state == 2){
|
||||
|
@@ -75,7 +75,7 @@ void RBB_func_8038B0B8(Actor *this, s32 arg1){
|
||||
func_80335924(this->unk148, local->unk0->unk12, 0.0f, 0.5f);
|
||||
func_80335A8C(this->unk148, 2);
|
||||
timed_playSfx(0.1f, local->unk0->unk14, 1.0f, 0x7d00);
|
||||
other = partEmitList_pushNew(0xa);
|
||||
other = partEmitMgr_newEmitter(0xa);
|
||||
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
|
||||
particleEmitter_setParticleAccelerationRange(other,
|
||||
0.0f, 100.0f, 0.0f,
|
||||
|
@@ -99,11 +99,11 @@ void RBB_func_8038C370(ActorMarker *marker, s32 arg1){
|
||||
|
||||
void func_8038C39C(Actor *this){
|
||||
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local;
|
||||
ParticleEmitter *other = partEmitList_pushNew(local->unk0->unkE);
|
||||
ParticleEmitter *other = partEmitMgr_newEmitter(local->unk0->unkE);
|
||||
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
|
||||
func_802EFA5C(other, 0.0f, 0.1f);
|
||||
particleEmitter_setFade(other, 0.0f, 0.1f);
|
||||
particleEmitter_setStartingFrameRange(other, 0, 7);
|
||||
func_802EFA70(other, 4);
|
||||
particleEmitter_setDrawMode(other, 4);
|
||||
particleEmitter_setPosition(other, this->position);
|
||||
func_802EFB70(other, local->unk0->unk4*1, local->unk0->unk4*3.0f);
|
||||
func_802EFB84(other, 3.0f*local->unk0->unk4, local->unk0->unk4*7.0f);
|
||||
@@ -115,16 +115,16 @@ void func_8038C39C(Actor *this){
|
||||
-50.0f, 100.0f, -50.0f,
|
||||
50.0f, 200.0f, 50.0f
|
||||
);
|
||||
func_802EFEC0(other, 0.5f, 1.0f);
|
||||
particleEmitter_setParticleLifeTimeRange(other, 0.5f, 1.0f);
|
||||
particleEmitter_emitN(other, local->unk0->unkE);
|
||||
}
|
||||
|
||||
void RBB_func_8038C538(Actor *this){
|
||||
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local;
|
||||
ParticleEmitter *other = partEmitList_pushNew(3*local->unk0->unkE);
|
||||
ParticleEmitter *other = partEmitMgr_newEmitter(3*local->unk0->unkE);
|
||||
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
|
||||
func_802EFA5C(other, 0.1f, 0.3f);
|
||||
func_802EFA70(other, 4);
|
||||
particleEmitter_setFade(other, 0.1f, 0.3f);
|
||||
particleEmitter_setDrawMode(other, 4);
|
||||
particleEmitter_setStartingFrameRange(other, 0, 7);
|
||||
particleEmitter_setPosition(other, this->position);
|
||||
func_802EFB70(other, local->unk0->unk4*1, local->unk0->unk4*6.0f);
|
||||
@@ -137,19 +137,19 @@ void RBB_func_8038C538(Actor *this){
|
||||
-70.0f, 50.0f, -70.0f,
|
||||
70.0f, 100.0f, 70.0f
|
||||
);
|
||||
func_802EFFA8(other, &D_80390C60);
|
||||
func_802EFEC0(other, 3.0f, 4.0f);
|
||||
particleEmitter_setRGB(other, &D_80390C60);
|
||||
particleEmitter_setParticleLifeTimeRange(other, 3.0f, 4.0f);
|
||||
particleEmitter_emitN(other, 3*local->unk0->unkE);
|
||||
|
||||
}
|
||||
|
||||
void RBB_func_8038C70C(Actor *this){
|
||||
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local;
|
||||
ParticleEmitter *other = partEmitList_pushNew(0xa);
|
||||
ParticleEmitter *other = partEmitMgr_newEmitter(0xa);
|
||||
|
||||
func_802EF9F8(other, 0.6f);
|
||||
func_802EFA18(other, 3);
|
||||
func_802EFA70(other, 4);
|
||||
particleEmitter_setDrawMode(other, 4);
|
||||
particleEmitter_setModel(other, 0x427);
|
||||
particleEmitter_setParticleSpawnPositionRange(other,
|
||||
local->unk0->unk4 * -300.0f, local->unk0->unk4 * 100.0f, local->unk0->unk4 * -300.0f,
|
||||
@@ -157,12 +157,12 @@ void RBB_func_8038C70C(Actor *this){
|
||||
);
|
||||
particleEmitter_setPosition(other, this->position);
|
||||
func_802EFB70(other, local->unk0->unk4*0.3, local->unk0->unk4*0.8);
|
||||
func_802EFE24(other,
|
||||
particleEmitter_setAngularVelocityRange(other,
|
||||
-600.0f, -600.0f, -600.0f,
|
||||
600.0f, 600.0f, 600.0f
|
||||
);
|
||||
particleEmitter_setSpawnIntervalRange(other, 0.0f, 0.01f);
|
||||
func_802EFEC0(other, 10.0f, 10.0f);
|
||||
particleEmitter_setParticleLifeTimeRange(other, 10.0f, 10.0f);
|
||||
particleEmitter_setVelocityAndAccelerationRanges(other, &D_80390C6C);
|
||||
particleEmitter_emitN(other, 10);
|
||||
|
||||
@@ -170,7 +170,7 @@ void RBB_func_8038C70C(Actor *this){
|
||||
|
||||
void func_8038C8A8(Actor * this){
|
||||
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local;
|
||||
ParticleEmitter *other = partEmitList_pushNew(5);
|
||||
ParticleEmitter *other = partEmitMgr_newEmitter(5);
|
||||
f32 sp24[3];
|
||||
|
||||
|
||||
@@ -178,15 +178,15 @@ void func_8038C8A8(Actor * this){
|
||||
sp24[1] += 50.0f;
|
||||
|
||||
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
|
||||
func_802EFA5C(other, 0.0, 0.5f);
|
||||
func_802EFA70(other, 4);
|
||||
particleEmitter_setFade(other, 0.0, 0.5f);
|
||||
particleEmitter_setDrawMode(other, 4);
|
||||
particleEmitter_setStartingFrameRange(other, 0, 7);
|
||||
particleEmitter_setPosition(other, sp24);
|
||||
func_802EFB70(other, local->unk0->unk4*1, local->unk0->unk4*3.0f);
|
||||
func_802EFB84(other, local->unk0->unk4*3.0f, local->unk0->unk4*6.0f);
|
||||
particleEmitter_setPositionVelocityAndAccelerationRanges(other, &D_80390CA8);
|
||||
func_802EFEC0(other, 1.0f, 2.0f);
|
||||
func_802EFFA8(other, &D_80390C9C);
|
||||
particleEmitter_setParticleLifeTimeRange(other, 1.0f, 2.0f);
|
||||
particleEmitter_setRGB(other, &D_80390C9C);
|
||||
particleEmitter_emitN(other, 5);
|
||||
}
|
||||
|
||||
@@ -547,7 +547,7 @@ void func_8038D8BC(Actor *this){
|
||||
}
|
||||
}
|
||||
else{//L8038DAA8
|
||||
if(ml_vec3f_distance(this->position, player_position) < 1200.0f){
|
||||
if(ml_distance_vec3f(this->position, player_position) < 1200.0f){
|
||||
RBB_func_8038CC9C(this, 2);
|
||||
}
|
||||
}
|
||||
@@ -583,7 +583,7 @@ void func_8038D8BC(Actor *this){
|
||||
func_8033568C(this->unk148, &sp54, &sp50);
|
||||
if(0.1 <= sp50 && sp50 <= 0.6){
|
||||
sp4C = (sp50 - 0.1)/0.5;
|
||||
func_80255FE4(this->position, local->unk8, local->unk14, sp4C);
|
||||
ml_interpolate_vec3f(this->position, local->unk8, local->unk14, sp4C);
|
||||
this->yaw = local->unk24 + sp4C*(local->unk28 - local->unk24);
|
||||
}
|
||||
|
||||
@@ -601,7 +601,7 @@ void func_8038D8BC(Actor *this){
|
||||
tmp_f2 = tmp_f2/0.3;
|
||||
else
|
||||
tmp_f2 = 1.0f;
|
||||
func_80255FE4(this->position, local->unk8, local->unk14, tmp_f2);
|
||||
ml_interpolate_vec3f(this->position, local->unk8, local->unk14, tmp_f2);
|
||||
}
|
||||
}//L8038DE10
|
||||
|
||||
|
@@ -72,12 +72,12 @@ void func_8038DF6C(Actor* this){
|
||||
}
|
||||
}
|
||||
}
|
||||
if(func_8025773C(&local->unk24[1], sp68)){
|
||||
if(ml_timer_update(&local->unk24[1], sp68)){
|
||||
local->unk24[1] = randf2(1.5f, 2.5f);
|
||||
FUNC_8030E8B4(SFX_40E_UNKNOWN, 1.5f, 20000, this->position, 500, 1500);
|
||||
}//L8038E118
|
||||
|
||||
if(func_8025773C(&local->unk24[2], sp68)){
|
||||
if(ml_timer_update(&local->unk24[2], sp68)){
|
||||
local->unk24[2] = randf2(3.5f, 5.5f);
|
||||
func_8030E878(SFX_69_WHIPCRACK_CREAKING, randf2(1.1f, 1.2f), 0x55f0, this->position, 500.0f, 1500.0f);
|
||||
}//L8038E184
|
||||
|
@@ -55,7 +55,7 @@ void func_8038E3D8(Actor *this){
|
||||
func_8038E3C0(this, 1);
|
||||
}//L8038E4C8
|
||||
|
||||
if(func_8025773C(&local->unk2C, sp5C)){
|
||||
if(ml_timer_update(&local->unk2C, sp5C)){
|
||||
local->unk2C = randf2(3.5f, 5.5f);
|
||||
func_8030E878(SFX_69_WHIPCRACK_CREAKING, randf2(1.1f, 1.2f), 22000, &this->position, 500.0f, 1500.0f);
|
||||
}//L8038E544
|
||||
|
@@ -1,8 +1,10 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "core2/particle.h"
|
||||
|
||||
extern void func_80255FE4(f32 [3], f32 [3], f32 [3], f32);
|
||||
|
||||
extern void ml_interpolate_vec3f(f32 [3], f32 [3], f32 [3], f32);
|
||||
extern void func_802C8F70(f32);
|
||||
extern int func_80309EB0(f32(*)[3], f32, f32 (*)[3], s32);
|
||||
extern int func_803342AC(f32(*)[3], f32(*)[3],f32);
|
||||
@@ -64,71 +66,71 @@ void func_8038E92C(Actor *this){
|
||||
|
||||
if(this->state == 2 && local->unk34 == 0)
|
||||
return;
|
||||
if(func_8025773C( &local->unk30, time_getDelta()))
|
||||
if(ml_timer_update( &local->unk30, time_getDelta()))
|
||||
func_8038F190(this, 3);
|
||||
}
|
||||
|
||||
void func_8038E998(Actor *this){
|
||||
ParticleEmitter *other = partEmitList_pushNew(2);
|
||||
ParticleEmitter *other = partEmitMgr_newEmitter(2);
|
||||
f32 temp_f0;
|
||||
|
||||
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
|
||||
func_802EFA5C(other, 0.0f, 0.1f);
|
||||
particleEmitter_setFade(other, 0.0f, 0.1f);
|
||||
particleEmitter_setStartingFrameRange(other, 0, 7);
|
||||
particleEmitter_setPosition(other, this->position);
|
||||
func_802EFB70(other, 0.25f, 0.75f);
|
||||
func_802EFB84(other, 0.75f, 1.75f);
|
||||
particleEmitter_setParticleSpawnPositionRange(other, -50.0f, 25.0f, -50.0f, 50.0f, 25.0f, 50.0f);
|
||||
particleEmitter_setParticleVelocityRange(other, -50.0f, 100.0f, -50.0f, 50.0f, 200.0f, 50.0f);
|
||||
func_802EFEC0(other, 0.5f, 1.0f);
|
||||
particleEmitter_setParticleLifeTimeRange(other, 0.5f, 1.0f);
|
||||
particleEmitter_emitN(other, 2);
|
||||
}
|
||||
|
||||
void func_8038EAB4(Actor *this){
|
||||
ParticleEmitter *other;
|
||||
func_802BB3DC(0, 60.0f, 0.9f);
|
||||
other = partEmitList_pushNew(1);
|
||||
other = partEmitMgr_newEmitter(1);
|
||||
particleEmitter_setSprite(other, ASSET_4A0_SPRITE_EXPLOSION);
|
||||
func_802EFA5C(other, 0.1f, 0.2f);
|
||||
func_802EFA70(other, 8);
|
||||
particleEmitter_setFade(other, 0.1f, 0.2f);
|
||||
particleEmitter_setDrawMode(other, PART_EMIT_NO_LOOP);
|
||||
particleEmitter_setStartingFrameRange(other, 0, 0);
|
||||
particleEmitter_setParticleFramerateRange(other, 4.0f, 4.0f);
|
||||
particleEmitter_setParticleSpawnPositionRange(other, 0.0f, 200.0f, 0.0f, 0.0f, 200.0f, 0.0f);
|
||||
particleEmitter_setPosition(other, this->position);
|
||||
func_802EFB70(other, 3.0f, 3.0f);
|
||||
func_802EFB84(other, 8.0f, 8.0f);
|
||||
func_802EFEC0(other, 0.5f, 0.5f);
|
||||
particleEmitter_setParticleLifeTimeRange(other, 0.5f, 0.5f);
|
||||
particleEmitter_setParticleVelocityRange(other, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||
particleEmitter_emitN(other, 1);
|
||||
}
|
||||
|
||||
void func_8038EC14(Actor *this){
|
||||
ParticleEmitter *other;
|
||||
other = partEmitList_pushNew(6);
|
||||
other = partEmitMgr_newEmitter(6);
|
||||
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
|
||||
func_802EFA5C(other, 0.05f, 0.1f);
|
||||
particleEmitter_setFade(other, 0.05f, 0.1f);
|
||||
particleEmitter_setStartingFrameRange(other, 0, 7);
|
||||
particleEmitter_setPosition(other, this->position);
|
||||
func_802EFB70(other, 1.0f, 1.5f);
|
||||
func_802EFB84(other, 2.0f, 3.0f);
|
||||
particleEmitter_setParticleSpawnPositionRange(other, -75.0f, 25.0f, -75.0f, 75.0f, 75.0f, 75.0f);
|
||||
particleEmitter_setParticleVelocityRange(other, -70.0f, 50.0f, -70.0f, 70.0f, 100.0f, 70.0f);
|
||||
func_802EFFA8(other, &RBB_D_80390DD0);
|
||||
func_802EFEC0(other, 3.0f, 4.0f);
|
||||
particleEmitter_setRGB(other, &RBB_D_80390DD0);
|
||||
particleEmitter_setParticleLifeTimeRange(other, 3.0f, 4.0f);
|
||||
particleEmitter_emitN(other, 6);
|
||||
}
|
||||
|
||||
void func_8038ED3C(Actor * actor, s32 arg1){
|
||||
ParticleEmitter *other = partEmitList_pushNew(0xa);
|
||||
ParticleEmitter *other = partEmitMgr_newEmitter(0xa);
|
||||
particleEmitter_setParticleAccelerationRange(other, 0.0f, -800.0f, 0.0f, 0.0f, -800.0f, 0.0f);
|
||||
func_802EF9F8(other, 0.6f);
|
||||
func_802EFA18(other, 3);
|
||||
particleEmitter_setModel(other, arg1);
|
||||
particleEmitter_setPosition(other, actor->position);
|
||||
func_802EFB70(other, 0.05f, 0.4f);
|
||||
func_802EFE24(other, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
|
||||
particleEmitter_setAngularVelocityRange(other, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
|
||||
particleEmitter_setSpawnIntervalRange(other, 0.0f, 0.01f);
|
||||
func_802EFEC0(other, 10.0f, 10.0f);
|
||||
particleEmitter_setParticleLifeTimeRange(other, 10.0f, 10.0f);
|
||||
particleEmitter_setParticleVelocityRange(other, -700.0f, 200.0f, -700.0f, 700.0f, 500.0f, 700.0f);
|
||||
particleEmitter_emitN(other, 0xa);
|
||||
}
|
||||
@@ -274,7 +276,7 @@ void func_8038F430(ActorMarker *marker, s32 arg1){
|
||||
|
||||
if(actor->state < 3){
|
||||
player_getPosition(&sp18);
|
||||
if(ml_vec3f_distance(&actor->position, &sp18) < 300.0f)
|
||||
if(ml_distance_vec3f(&actor->position, &sp18) < 300.0f)
|
||||
func_8028F55C(5, actor->marker);
|
||||
func_8038F190(actor, 3);
|
||||
}//L8038F4A4
|
||||
@@ -351,7 +353,7 @@ void func_8038F618(Actor *this){
|
||||
}
|
||||
func_8038E92C(this);
|
||||
if(this->state == 1){
|
||||
if(sp78 && ml_vec3f_distance(&this->position, &sp7C) < 500.0f){
|
||||
if(sp78 && ml_distance_vec3f(&this->position, &sp7C) < 500.0f){
|
||||
func_8038F190(this, 2);
|
||||
}
|
||||
}//L8038F7A0
|
||||
@@ -370,7 +372,7 @@ void func_8038F618(Actor *this){
|
||||
func_8033568C(this->unk148, &sp6C, &sp68);
|
||||
|
||||
if(0.1 <= sp68 && sp68 <= 0.6)
|
||||
func_80255FE4(this->position, &local->unk14, &local->unk20, (sp68 - 0.1) /0.5 );
|
||||
ml_interpolate_vec3f(this->position, &local->unk14, &local->unk20, (sp68 - 0.1) /0.5 );
|
||||
if(sp6C < 0.6 && 0.6 <= sp68)
|
||||
func_8030E878(SFX_6C_LOCKUP_CLOSING, 1.1 + randf2(-0.05f, 0.05f), 20000, this->position, 500.0f, 1000.0f);
|
||||
|
||||
@@ -385,7 +387,7 @@ void func_8038F618(Actor *this){
|
||||
|
||||
this->yaw += (sp44*400.0f)*sp70;
|
||||
if(func_80335794(this->unk148) > 0){
|
||||
if(ml_vec3f_distance(&this->position, &local->unk8) < 10.0f){
|
||||
if(ml_distance_vec3f(&this->position, &local->unk8) < 10.0f){
|
||||
func_8038F190(this, 1);
|
||||
}else{
|
||||
func_8038F190(this, 2);
|
||||
|
@@ -56,7 +56,7 @@ void func_8038FF70(void){
|
||||
func_8038FDE0(1);
|
||||
|
||||
if(D_803912C8 == 1)
|
||||
if(func_8025773C(&D_803912CC,time_getDelta()))
|
||||
if(ml_timer_update(&D_803912CC,time_getDelta()))
|
||||
func_8038FDE0(2);
|
||||
|
||||
if(D_803912C8 == 2)
|
||||
|
@@ -101,7 +101,7 @@ void func_80387488(ActorMarker *marker){
|
||||
player_getPosition(&sp1C);
|
||||
if(-50.0f < sp1C[1] && sp1C[1] < 600.0f){
|
||||
sp1C[1] = 0;
|
||||
if(ml_vec3f_distance(&sp1C, &D_80390264) < 500.0f){
|
||||
if(ml_distance_vec3f(&sp1C, &D_80390264) < 500.0f){
|
||||
timedFunc_set_1(1.0f, (GenMethod_1) func_80387488, (s32)actor->marker);
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user