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

Merge branch 'naming_actor_properties' into 'master'

Browse Source 
Renaming functions

See merge request banjo.decomp/banjo-kazooie!68
This commit is contained in:
Banjo Kazooie
2024-09-13 23:37:12 +00:00
parent 07e6954ac9 1861ce5c0e
commit 333e1b8600
173 changed files with 752 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/ba/marker.c
View File

@@ -159,7 +159,7 @@ void __baMarker_8028B9A8(s32 arg0){
s32 ideal_yaw[3];
tmp_v0 = cubeList_findNodePropByActorId(0x1F6, 0);
func_80304D4C(tmp_v0, &ideal_yaw);
nodeprop_getPosition_s32(tmp_v0, &ideal_yaw);
func_802CA1CC(arg0);
func_8032811C(ACTOR_47_EMPTY_HONEYCOMB, &ideal_yaw, 0);
func_8025A6EC(COMUSIC_2B_DING_B, 28000);

4
src/core2/bs/droneenter.c
View File

@@ -74,8 +74,8 @@ void __bsDroneEnter_initParticleTypes(ParticleEmitter *p_ctrl, enum asset_e spri
particleEmitter_manualFree(p_ctrl);
particleEmitter_setSprite(p_ctrl, sprite_id);
particleEmitter_setFade(p_ctrl, 0.3f, 0.8f);
func_802EFB70(p_ctrl, 0.15f, 0.22f);
func_802EFB84(p_ctrl, 0.03f, 0.05f);
particleEmitter_setStartingScaleRange(p_ctrl, 0.15f, 0.22f);
particleEmitter_setFinalScaleRange(p_ctrl, 0.03f, 0.05f);
particleEmitter_setAngularVelocityRange(p_ctrl, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
particleEmitter_setParticleLifeTimeRange(p_ctrl, 0.55f, 0.55f);
}

4
src/core2/bs/dronevanish.c
View File

@@ -60,8 +60,8 @@ void __bsDroneVanish_particleEmitInit(ParticleEmitter *p_ctrl, enum asset_e spri
particleEmitter_setSprite(p_ctrl, sprite_id);
particleEmitter_setFade(p_ctrl, 0.3f, 0.8f);
particleEmitter_setParticleSpawnPositionRange(p_ctrl, -45.0f, 0.0f, -45.0f, 45.0f, 0.0f, 45.0f);
func_802EFB70(p_ctrl, 0.15f, 0.22f);
func_802EFB84(p_ctrl, 0.03f, 0.05f);
particleEmitter_setStartingScaleRange(p_ctrl, 0.15f, 0.22f);
particleEmitter_setFinalScaleRange(p_ctrl, 0.03f, 0.05f);
particleEmitter_setAngularVelocityRange(p_ctrl, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
particleEmitter_setParticleLifeTimeRange(p_ctrl, 0.55f, 0.55f);
}

20
src/core2/bs/dronexform.c
View File

@@ -37,7 +37,7 @@ void func_802AF7A0(ParticleEmitter *arg0, enum asset_e arg1){
particleEmitter_setSprite(arg0, arg1);
particleEmitter_setParticleAccelerationRange(arg0, 0.0f, -50.0f, 0.0f, 0.0f, -50.0f, 0.0f);
particleEmitter_setFade(arg0, 0.4f, 0.8f);
func_802EFB84(arg0, 0.03f, 0.03f);
particleEmitter_setFinalScaleRange(arg0, 0.03f, 0.03f);
particleEmitter_setAngularVelocityRange(arg0, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
particleEmitter_setParticleLifeTimeRange(arg0, 0.65f, 0.65f);
func_802EFF50(arg0, 1.0f);
@@ -48,7 +48,7 @@ void func_802AF88C(ParticleEmitter * arg0, f32 arg1, f32 arg2){
arg1*30.0f, 10.0f, arg2*30.0f,
arg1*30.0f, 10.0f, arg2*30.0f
);
func_802EFB70(arg0, D_8037D470.unk14, D_8037D470.unk14);
particleEmitter_setStartingScaleRange(arg0, D_8037D470.unk14, D_8037D470.unk14);
}
void func_802AF900(void){
@@ -148,8 +148,8 @@ void func_802AFBB8(f32 arg0[3]){
particleEmitter_setFade(s0, 0.7f, 0.8f);
particleEmitter_setParticleFramerateRange(s0, 12.0f, 12.0f);
particleEmitter_setPosition(s0, arg0);
func_802EFB70(s0, 3.2f, 3.2f);
func_802EFB84(s0, 3.2f, 3.2f);
particleEmitter_setStartingScaleRange(s0, 3.2f, 3.2f);
particleEmitter_setFinalScaleRange(s0, 3.2f, 3.2f);
particleEmitter_setParticleLifeTimeRange(s0, 0.8f, 0.8f);
particleEmitter_emitN(s0, 1);
@@ -158,8 +158,8 @@ void func_802AFBB8(f32 arg0[3]){
particleEmitter_setFade(s0, 0.1f, 0.8f);
particleEmitter_setParticleFramerateRange(s0, 15.0f, 15.0f);
particleEmitter_setPosition(s0, arg0);
func_802EFB70(s0, 3.0f, 3.0f);
func_802EFB84(s0, 3.0f, 3.0f);
particleEmitter_setStartingScaleRange(s0, 3.0f, 3.0f);
particleEmitter_setFinalScaleRange(s0, 3.0f, 3.0f);
particleEmitter_setParticleLifeTimeRange(s0, 0.65f, 0.65f);
particleEmitter_emitN(s0, 1);
@@ -167,8 +167,8 @@ void func_802AFBB8(f32 arg0[3]){
particleEmitter_setSprite(s0, ASSET_713_SPRITE_SPARKLE_YELLOW); //sparkle
particleEmitter_setVelocityAndAccelerationRanges(s0, &D_80364BB0);
particleEmitter_setFade(s0, 0.0f, 0.6f);
func_802EFB70(s0, 0.28f, 0.32f);
func_802EFB84(s0, 0.03f, 0.03f);
particleEmitter_setStartingScaleRange(s0, 0.28f, 0.32f);
particleEmitter_setFinalScaleRange(s0, 0.03f, 0.03f);
particleEmitter_setAngularVelocityRange(s0, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
particleEmitter_setParticleLifeTimeRange(s0, 2.0f, 2.0f);
func_802EFF50(s0, 1.0f);
@@ -187,8 +187,8 @@ void func_802AFBB8(f32 arg0[3]){
particleEmitter_setSprite(s0, ASSET_716_SPRITE_SPARKLE_WHITE); //sparkle
particleEmitter_setVelocityAndAccelerationRanges(s0, &D_80364C40);
particleEmitter_setFade(s0, 0.0f, 0.6f);
func_802EFB70(s0, 0.28f, 0.32f);
func_802EFB84(s0, 0.03f, 0.03f);
particleEmitter_setStartingScaleRange(s0, 0.28f, 0.32f);
particleEmitter_setFinalScaleRange(s0, 0.03f, 0.03f);
particleEmitter_setAngularVelocityRange(s0, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
particleEmitter_setParticleLifeTimeRange(s0, 2.0f, 2.0f);
func_802EFF50(s0, 1.0f);

2
src/core2/ch/badShad.c
View File

@@ -24,7 +24,7 @@ f32 D_8037DE20[3];
void chBadShad_update(Actor *this){
s32 iVar1;
if(!this->initialized){
this->initialized = 1;
this->initialized = TRUE;
this->marker->collidable = 0;
}
if(!this->despawn_flag && this->unk1C_x < (f32)(globalTimer_getTime() - 1) ){

8
src/core2/ch/bigbutt.c
View File

@@ -121,7 +121,7 @@ void func_802C6240(Actor *this){
this->marker->dieFunc = func_802C61C0;
this->marker->collisionFunc = func_802C60AC;
this->marker->collision2Func = func_802C6150;
this->unk138_24 = 0;
this->is_first_encounter = FALSE;
this->unk16C_0 = 1;
this->initialized = TRUE;
return;
@@ -291,14 +291,14 @@ void func_802C6240(Actor *this){
actor_playAnimationOnce(this);
if(actor_animationIsAt(this, 0.95f)){
subaddie_set_state_with_direction(this, 0xe, 0.99f, 1);
this->unk60 = 4.0f;
this->lifetime_value = 4.0f;
}
break;
case 0xe: //L802C6C7C
actor_playAnimationOnce(this);
this->unk60 -= time_getDelta();
if(this->unk60 <= 0.0f){
this->lifetime_value -= time_getDelta();
if(this->lifetime_value <= 0.0f){
this->unk166 = 0x63;
subaddie_set_state_forward(this, 0xF);
}

14
src/core2/ch/bottlesbonus.c
View File

@@ -436,7 +436,7 @@ void chBottlesBonus_startTimer(s32 arg0, s32 arg1, s32 arg2) {
actor = marker_getActor(chBottlesBonusMarker);
actor->state = 4;
actor->unk60 = 0.0f;
actor->lifetime_value = 0.0f;
timedFunc_set_2(0.25f, item_set, ITEM_6_HOURGLASS, TRUE);
timedFunc_set_2(0.25f, item_set, ITEM_0_HOURGLASS_TIMER, D_803681A0[chBottleBonusPuzzleIndex + 1].time_seconds * 60 - 1);
}
@@ -456,7 +456,7 @@ void chBottlesBonus_update(Actor *this) {
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
actor_collisionOff(this);
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
D_8037DEB4 = D_8037DEB0 = 0;
marker_setFreeMethod(this->marker, chBottlesBonus_free);
if (chBottleBonusBookselfModelBin == 0) {
@@ -502,11 +502,11 @@ void chBottlesBonus_update(Actor *this) {
}
}
}
this->unk60 += sp50;
this->lifetime_value += sp50;
switch(this->state){
case 1:
if ((this->unk60 > 2.0) && gctransition_done()) {
this->unk60 = 0.0f;
if ((this->lifetime_value > 2.0) && gctransition_done()) {
this->lifetime_value = 0.0f;
func_8025A6EC(COMUSIC_98_BBONUS_PIECES_SHUFFLE, -1);
comusic_8025AB44(COMUSIC_95_BBONUS_A, 0, 2000);
func_8025AABC(COMUSIC_95_BBONUS_A);
@@ -532,7 +532,7 @@ void chBottlesBonus_update(Actor *this) {
case 3:
break;
case 4:
if (this->unk60 > 2.0) {
if (this->lifetime_value > 2.0) {
func_8025AEA0(COMUSIC_94_BBONUS, ((item_getCount(ITEM_0_HOURGLASS_TIMER) * 0x201D2) / (s32) ((D_803681A0[chBottleBonusPuzzleIndex + 1].time_seconds * 60) - 1)) + 330000);
if ((item_getCount(ITEM_6_HOURGLASS) == 0) && (chBottlesBonusCursor_isPuzzleCompleted() == 0)) {
chBottlesBonus_lose(&D_8037DCC9, 0xE26);
@@ -547,7 +547,7 @@ void chBottlesBonus_update(Actor *this) {
void __chBottlesBonus_spawn(void){
Actor *actor;
if(chBottlesBonusMarker == NULL){
actor = func_8032813C(0x1E0, D_803682C4, 0);
actor = spawn_actor_f32(0x1E0, D_803682C4, 0);
chBottlesBonusMarker = actor->marker;
chBottlesBonusCursor_spawn();
func_802DF270();

2
src/core2/ch/bottlesbonuscursor.c
View File

@@ -168,7 +168,7 @@ void chBottlesBonusCursor_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
}
ActorMarker *chBottlesBonusCursor_spawn(void){
Actor *this = func_8032813C(0x2B4, D_80368400, 0);
Actor *this = spawn_actor_f32(0x2B4, D_80368400, 0);
chBottlesBonusCursorMarker = this->marker;
return chBottlesBonusCursorMarker;
}

6
src/core2/ch/bubble.c
View File

@@ -29,8 +29,8 @@ s32 __chBubble_func_802C5C70(f32 arg0[3], f32 arg1, ActorMarker *marker){
this->position_y = arg0[1] - arg1/2;
this->position_z = arg0[2];
func_8032AA58(this, arg1/200.0);
this->unk60 -= time_getDelta();
if(this->unk60 < 0.0f){
this->lifetime_value -= time_getDelta();
if(this->lifetime_value < 0.0f){
sp1C = 1;
}
if(sp1C)
@@ -56,6 +56,6 @@ void chBubble_update(Actor *this){
marker_setCollisionScripts(this->marker, __chBubble_collisionCallback, NULL, NULL);
marker_setFreeMethod(this->marker, __chBubble_freeCallback);
func_802F32C4(func_8032994C(), this->position, 200.0f, this->marker, __chBubble_func_802C5C70);
this->unk60 = 10.0f;
this->lifetime_value = 10.0f;
}
}

6
src/core2/ch/collectible.c
View File

@@ -88,7 +88,7 @@ bool chCollectible_collectItem(Actor* actor, enum file_progress_e arg1, enum ass
if(!actor || !actor->unk38_0)
return TRUE;
actor->unk60 = arg5;
actor->lifetime_value = arg5;
chCollectible_setState(actor, 1);
return FALSE;
}
@@ -160,8 +160,8 @@ void chCollectible_update(Actor *this) {
switch (this->state) {
case 1:
if (this->unk60 > 0.0) {
this->unk60 -= time_getDelta();
if (this->lifetime_value > 0.0) {
this->lifetime_value -= time_getDelta();
} else {
chCollectible_setState(this, 2);
}

24
src/core2/ch/crab.c
View File

@@ -78,7 +78,7 @@ void __chCrab_ow(ActorMarker *marker, ActorMarker *other) {
Actor *this;
this = marker_getActor(marker);
this->unk60 = 3.0f;
this->lifetime_value = 3.0f;
subaddie_set_state(this, 6);
actor_playAnimationOnce(this);
if (marker->id == MARKER_13_SNIPPET) {
@@ -108,7 +108,7 @@ void __chCrab_emitClawPiece(ParticleEmitter *p_ctrl, f32 position[3], enum asset
__chCrab_particleEmitterSetup(p_ctrl, position);
particleEmitter_setParticleAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(p_ctrl, model_id);
func_802EFB70(p_ctrl, 0.5f, 0.8f);
particleEmitter_setStartingScaleRange(p_ctrl, 0.5f, 0.8f);
particleEmitter_setAngularVelocityRange(p_ctrl, -800.0f, -800.0f, -800.0f, 800.0f, 800.0f, 800.0f);
particleEmitter_setParticleVelocityRange(p_ctrl, -200.0f, 850.0f, -200.0f, 400.0f, 1000.0f, 400.0f);
particleEmitter_emitN(p_ctrl, 2);
@@ -118,7 +118,7 @@ void __chCrab_emitLegPiece(ParticleEmitter *p_ctrl, f32 position[3], enum asset_
__chCrab_particleEmitterSetup(p_ctrl, position);
particleEmitter_setParticleAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(p_ctrl, model_id);
func_802EFB70(p_ctrl, 0.5f, 0.8f);
particleEmitter_setStartingScaleRange(p_ctrl, 0.5f, 0.8f);
particleEmitter_setAngularVelocityRange(p_ctrl, -800.0f, -800.0f, -800.0f, 800.0f, 800.0f, 800.0f);
particleEmitter_setParticleVelocityRange(p_ctrl, -200.0f, 850.0f, -200.0f, 400.0f, 1000.0f, 400.0f);
particleEmitter_emitN(p_ctrl, 6);
@@ -128,7 +128,7 @@ void __chCrab_emitHeadPiece(ParticleEmitter *p_ctrl, f32 position[3], enum asset
__chCrab_particleEmitterSetup(p_ctrl, position);
particleEmitter_setParticleAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(p_ctrl, model_id);
func_802EFB70(p_ctrl, 1.0f, 1.0f);
particleEmitter_setStartingScaleRange(p_ctrl, 1.0f, 1.0f);
particleEmitter_setAngularVelocityRange(p_ctrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setParticleVelocityRange(p_ctrl, -50.0f, 750.0f, -50.0f, 120.0f, 900.0f, 120.0f);
particleEmitter_emitN(p_ctrl, 1);
@@ -180,7 +180,7 @@ void __chCrab_die(ActorMarker *marker, ActorMarker *other){
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 32750, this->position, 950, 1900);
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 28000, this->position, 950, 1900);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
this->unk60 = 5.0f;
this->lifetime_value = 5.0f;
marker->collidable = FALSE;
this->unk138_27 = 1;
marker_despawn(marker);
@@ -239,7 +239,7 @@ void chCrab_update(Actor *this) {
marker_setCollisionScripts(this->marker, __chCrab_touch, __chCrab_ow, __chCrab_die);
func_803300C0(this->marker, &__chCrab_802CB76C);
this->unk124_0 = this->unk138_31 = FALSE;
this->unk138_24 = FALSE;
this->is_first_encounter = FALSE;
this->unk16C_4 = TRUE;
animctrl_setTransitionDuration(this->animctrl, 0.25f);
if (map_get() == MAP_A_TTC_SANDCASTLE) {
@@ -273,7 +273,7 @@ void chCrab_update(Actor *this) {
func_80311480(ASSET_D32_DIALOG_MUTANT_CRAB_MEET, 0xF, this->position, NULL, __chCrab_mutantTextCallback, NULL);
mapSpecificFlags_set(0, TRUE);
levelSpecificFlags_set(0xE, TRUE);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
}
if (map_get() == MAP_A_TTC_SANDCASTLE) {
@@ -292,8 +292,8 @@ void chCrab_update(Actor *this) {
}
if (levelSpecificFlags_get(0xE)) {
if ((this->state != 8) && (this->state != 9)) {
subaddie_set_state_with_direction(this, (this->unk138_24) ? 8 : 9, 0.0f, 1);
this->unk138_24 = FALSE;
subaddie_set_state_with_direction(this, (this->is_first_encounter) ? 8 : 9, 0.0f, 1);
this->is_first_encounter = FALSE;
}
}
@@ -353,8 +353,8 @@ void chCrab_update(Actor *this) {
break;
case 5: //L802CC0AC
this->unk60 = MAX(0.0, this->unk60 - sp30);
if (this->unk60 == 0.0f) {
this->lifetime_value = MAX(0.0, this->lifetime_value - sp30);
if (this->lifetime_value == 0.0f) {
subaddie_set_state(this, 7);
actor_playAnimationOnce(this);
if (this->marker->id == 0x16B) {
@@ -368,7 +368,7 @@ void chCrab_update(Actor *this) {
case 6: //L802CC18C
if (animctrl_isStopped(this->animctrl)) {
if (this->unk60 == 0.0f) {
if (this->lifetime_value == 0.0f) {
func_80326310(this);
} else {
subaddie_set_state(this, 5);

12
src/core2/ch/drips.c
View File

@@ -41,8 +41,8 @@ void func_80359A40(f32 position[3], struct_core2_D2AB0 *arg1, s32 cnt){
particleEmitter_setDrawMode(pCtrl, PART_EMIT_ROTATABLE);
particleEmitter_setRGB(pCtrl, D_80372AE4);
particleEmitter_setPosition(pCtrl, position);
func_802EFB70(pCtrl, 0.1f, 0.1f);
func_802EFB84(pCtrl, 1.0f, 1.4f);
particleEmitter_setStartingScaleRange(pCtrl, 0.1f, 0.1f);
particleEmitter_setFinalScaleRange(pCtrl, 1.0f, 1.4f);
particleEmitter_setSpawnIntervalRange(pCtrl, arg1->unk0, arg1->unk4);
particleEmitter_setParticleLifeTimeRange(pCtrl, arg1->unk8, arg1->unkC);
particleEmitter_setFade(pCtrl, 0.0f, 0.5f);
@@ -72,9 +72,9 @@ void chdrips_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
actor_collisionOff(this);
this->unk60 = this->yaw/360.0;
this->lifetime_value = this->yaw/360.0;
}
if(__chdrips_playerWithinDist(this, 5000) && randf() < this->unk60){
if(__chdrips_playerWithinDist(this, 5000) && randf() < this->lifetime_value){
pCtrl = partEmitMgr_newEmitter(1);
particleEmitter_setModel(pCtrl, ASSET_8A0_SPRITE_WATER_DROP);
particleEmitter_setPosition(pCtrl, this->position);
@@ -83,8 +83,8 @@ void chdrips_update(Actor *this){
particleEmitter_setParticleCallback(pCtrl, __chdrips_particleCallback);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 7.0f, 7.0f);
func_802EFB70(pCtrl, 0.1f, 0.1f);
func_802EFB84(pCtrl, 0.1f, 0.1f);
particleEmitter_setStartingScaleRange(pCtrl, 0.1f, 0.1f);
particleEmitter_setFinalScaleRange(pCtrl, 0.1f, 0.1f);
particleEmitter_emitN(pCtrl, 1);
}
}

8
src/core2/ch/firefx.c
View File

@@ -25,8 +25,8 @@ void __chfirefx_spawnSmoke(f32 position[3], f32 scale){
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange(pCtrl, 0.0f, 110.0f*scale, 0.0f, 0.0f, 110.0f*scale, 0.0f);
particleEmitter_setParticleVelocityRange(pCtrl, 0.0f, 40.0f*scale, 0.0f, 0.0f, 90.0f*scale, 0.0f);
func_802EFB70(pCtrl, 2.6*scale, 3.2*scale);
func_802EFB84(pCtrl, 5.0*scale, 6.0*scale);
particleEmitter_setStartingScaleRange(pCtrl, 2.6*scale, 3.2*scale);
particleEmitter_setFinalScaleRange(pCtrl, 5.0*scale, 6.0*scale);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 4.0f, 7.0f);
particleEmitter_setFade(pCtrl, 0.3f, 0.7f);
@@ -44,8 +44,8 @@ void __chfirefx_spawnSpark(f32 position[3], f32 scale){
particleEmitter_setParticleSpawnPositionRange(pCtrl, 0.0f, 20.0f*scale, 0.0f, 0.0f, 20.0f*scale, 0.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -30.0f*scale, 120.0f*scale, -30.0f*scale, 60.0f*scale, 360.0f*scale, 60.0f*scale);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -50.0f, 0.0f, 0.0f, -90.0f, 0.0f);
func_802EFB70(pCtrl, 0.1*scale, 0.2*scale);
func_802EFB84(pCtrl, 0.2*scale, 0.4*scale);
particleEmitter_setStartingScaleRange(pCtrl, 0.1*scale, 0.2*scale);
particleEmitter_setFinalScaleRange(pCtrl, 0.2*scale, 0.4*scale);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 0.9f, 1.3f);
particleEmitter_setFade(pCtrl, 0.3f, 0.7f);

4
src/core2/ch/flotsam.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern f32 func_80309724(f32[3]);
extern f32 mapModel_getFloorY(f32[3]);
typedef struct {
f32 unk0;
@@ -261,7 +261,7 @@ void func_8035C8F4(Actor *this){
this->marker->unk14_21 = FALSE;
this->marker->actorFreeFunc = func_8035C8C8;
marker_setCollisionScripts(this->marker, func_8035C6C4, func_8035C6C4, func_8035C6F0);
local->unk4 = func_80309724(this->position);
local->unk4 = mapModel_getFloorY(this->position);
local->pCtrl_8 = NULL;
local->unk34[0] = this->yaw;
local->unk34[2] = local->unk34[1] = local->unk34[0];

2
src/core2/ch/gameSelect.c
View File

@@ -287,7 +287,7 @@ void func_802C4BB4(ActorMarker *marker){
sp20 = marker->id - 0xe4;
this = marker_getActor(marker);
sp18 = this->scale;
other = func_8032813C(sp20 + 0x198, this->position, (s32)this->yaw);
other = spawn_actor_f32(sp20 + 0x198, this->position, (s32)this->yaw);
other->scale = sp18;
}

12
src/core2/ch/ghost.c
View File

@@ -60,8 +60,8 @@ void func_8035AFE0(f32 scale, f32 pos[3], s32 cnt, enum asset_e sprite_id, s32 a
-100.0f*scale, -20.0f*scale, -100.0f*scale,
100.0f*scale, 100.0f*scale, 100.0f*scale
);
func_802EFB70(pCtrl, scale*0.4, scale*0.6);
func_802EFB84(pCtrl, scale*1.0, scale*1.4);
particleEmitter_setStartingScaleRange(pCtrl, scale*0.4, scale*0.6);
particleEmitter_setFinalScaleRange(pCtrl, scale*1.0, scale*1.4);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 1.0f, 1.4f);
particleEmitter_setFade(pCtrl, 0.0f, 0.01f);
@@ -96,7 +96,7 @@ void func_8035B2C4(ActorMarker *this_marker, ActorMarker *other_marker){
void func_8035B3B4(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
this->unk60 = 1.0f;
this->lifetime_value = 1.0f;
}
int func_8035B3E4(Actor *this){
@@ -208,7 +208,7 @@ void func_8035B900(Actor *this){
this->marker->propPtr->unk8_3 = FALSE;
actor_collisionOn(this);
this->velocity_z = 0.0f;
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
this->unk1C[0] = this->position_y + this->scale*100.0f;
this->velocity_y = this->scale*2.0;
this->velocity_x = this->unk1C[0];
@@ -216,8 +216,8 @@ void func_8035B900(Actor *this){
animctrl_setTransitionDuration(this->animctrl, 0.8f);
}//L8035B9D4
if(0.0 < this->unk60 - sp2C){
this->unk60 -= sp2C;
if(0.0 < this->lifetime_value - sp2C){
this->lifetime_value -= sp2C;
}
else{//L8035BA08
switch(this->state){

2
src/core2/ch/gloop.c
View File

@@ -38,7 +38,7 @@ void chgloop_spawnBubble(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
sp1C[0] = reinterpret_cast(f32, arg0);
sp1C[1] = reinterpret_cast(f32, arg1);
sp1C[2] = reinterpret_cast(f32, arg2);
func_8032813C(ACTOR_E7_GLOOP_BUBBLE, sp1C, (s32)reinterpret_cast(f32, arg3));
spawn_actor_f32(ACTOR_E7_GLOOP_BUBBLE, sp1C, (s32)reinterpret_cast(f32, arg3));
}
void chgloop_update(Actor *this){

20
src/core2/ch/icecube.c
View File

@@ -114,7 +114,7 @@ void func_8035A04C(f32 position[3], s32 cnt, enum asset_e model_id, f32 scale){
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1000.0f, 0.0f, 0.0f, -1000.0f, 0.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -400.0f*scale, 450.0f*scale, -400.0f*scale, 400.0f*scale, 600.0f*scale, 400.0f*scale);
particleEmitter_setAngularVelocityRange(pCtrl, 100.0f*scale, 100.0f*scale, 100.0f*scale, 250.0f*scale, 250.0f*scale, 250.0f*scale);
func_802EFB70(pCtrl, scale*0.2, scale*0.4);
particleEmitter_setStartingScaleRange(pCtrl, scale*0.2, scale*0.4);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.02f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 2.2f, 2.2f);
particleEmitter_setFade(pCtrl, 0.0f, 0.3f);
@@ -130,8 +130,8 @@ void func_8035A228(f32 position[3], s32 cnt, enum asset_e sprite_id, f32 scale){
particleEmitter_setParticleSpawnPositionRange(pCtrl, -50.0f*scale, 0.0f, -50.0f*scale, 50.0f*scale, 200.0f*scale, 50.0f*scale);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -10.0f, 0.0f, 0.0f, -10.0f, 0.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -280.0f*scale, 0.0f, -280.0f*scale, 280.0f*scale, 280.0f*scale, 280.0f*scale);
func_802EFB70(pCtrl, scale*0.6, scale*0.8);
func_802EFB84(pCtrl, scale*1.0, scale*1.4);
particleEmitter_setStartingScaleRange(pCtrl, scale*0.6, scale*0.8);
particleEmitter_setFinalScaleRange(pCtrl, scale*1.0, scale*1.4);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 1.2f, 1.8f);
particleEmitter_setFade(pCtrl, 0.0f, 0.01f);
@@ -146,8 +146,8 @@ void func_8035A3F8(f32 position[3], s32 cnt, enum asset_e sprite_id, f32 scale){
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -10.0f, 0.0f, 0.0f, -10.0f, 0.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -60.0f*scale, 0.0f, -60.0f*scale, 60.0f*scale, 60.0f*scale, 60.0f*scale);
func_802EFB70(pCtrl, scale*0.4, scale*0.6);
func_802EFB84(pCtrl, scale*0.8, scale*1.2);
particleEmitter_setStartingScaleRange(pCtrl, scale*0.4, scale*0.6);
particleEmitter_setFinalScaleRange(pCtrl, scale*0.8, scale*1.2);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 0.5f, 0.7f);
particleEmitter_setFade(pCtrl, 0.0f, 0.3f);
@@ -276,11 +276,11 @@ void chicecube_update(Actor *this){
this->alpha_124_19 = 0x50;
actor_setOpacity(this, this->alpha_124_19);
this->unk38_31 = 0;
this->unk60 = 1.0f;
this->lifetime_value = 1.0f;
}//L8035ABC0
if(this->unk60 <= 0.0){
if(-99999.0 != this->unk60){
this->unk60 = -99999.0f;
if(this->lifetime_value <= 0.0){
if(-99999.0 != this->lifetime_value){
this->lifetime_value = -99999.0f;
actor_collisionOn(this);
this->unk1C[0] =this->position[0];
this->unk1C[1] =this->position[1];
@@ -289,7 +289,7 @@ void chicecube_update(Actor *this){
}
}
else{//L8035AC3C
this->unk60 -= sp3C;
this->lifetime_value -= sp3C;
}
if(0.0 >= this->velocity[1]){

2
src/core2/ch/jigsawdance.c
View File

@@ -30,7 +30,7 @@ Actor *__chJigsawDance_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3
Actor *thisActor = marker_getActor(this);
if(!thisActor->initialized){
thisActor->initialized = 1;
thisActor->initialized = TRUE;
return thisActor;
}
else{

2
src/core2/ch/jinjo.c
View File

@@ -104,7 +104,7 @@ void chJinjo_update(Actor * this){
local = &this->jinjo;
if(!this->initialized){
this->initialized = 1;
this->initialized = TRUE;
local->unk0 = 1;
local->unk4 = 0;
local->unk8 = (this->position_y < func_80309B24(this->position));

6
src/core2/ch/mole.c
View File

@@ -163,9 +163,9 @@ void chmole_healthRefill(ActorMarker *marker, enum asset_e arg1, s32 arg2){
func_80311480(chmole_learnedAllGameAbilities()? 0xa87 : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL);
}
else{//L802D97BC
if(actor->unk138_24){
if(actor->is_first_encounter){
func_80347A14(1);
actor->unk138_24 = FALSE;
actor->is_first_encounter = FALSE;
}
timed_exitStaticCamera(0.0f);
if(actor->state == 5){
@@ -229,7 +229,7 @@ int chmole_learnAbility(Actor *this){
// New Ability: Learn Dialog & Misc Actions
else{
func_80347A14(0);
this->unk138_24 = 1;
this->is_first_encounter = TRUE;
sp2C = moleTable[this->unkF4_8-9].learn_text;
ability_unlock(moleTable[this->unkF4_8-9].ability);
switch(moleTable[this->unkF4_8-9].ability){

2
src/core2/ch/overlaycopyright.c
View File

@@ -34,7 +34,7 @@ void chOverlayCopyright_update(Actor *this){
void __chOverlayCopyright_spawn(void) {
Actor *actor;
if (chOverlayCopyrightMarker == 0) {
actor = func_8032813C(ACTOR_1DD_COPYRIGHT_OVERLAY, D_803680D0, 0);
actor = spawn_actor_f32(ACTOR_1DD_COPYRIGHT_OVERLAY, D_803680D0, 0);
chOverlayCopyrightMarker = actor->marker;
}
}

4
src/core2/ch/overlaynocontroller.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern Actor *func_8032813C(enum actor_e, f32[3], s32);
extern Actor *spawn_actor_f32(enum actor_e, f32[3], s32);
extern void actor_postdrawMethod(ActorMarker *marker);
Actor *chOverlayNoController_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -73,7 +73,7 @@ void chOverlayNoController_update(Actor *this) {
void __chOverlayNoController_spawn(void){
if(chOverlayNoController_marker == NULL){
chOverlayNoController_marker = func_8032813C(ACTOR_1DF_NO_CONTROLLER_OVERLAY, D_80368168, 0)->marker;
chOverlayNoController_marker = spawn_actor_f32(ACTOR_1DF_NO_CONTROLLER_OVERLAY, D_80368168, 0)->marker;
}
}

6
src/core2/ch/overlaypressstart.c
View File

@@ -5,7 +5,7 @@
extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
extern void actor_predrawMethod(Actor *);
extern void actor_postdrawMethod(ActorMarker *);
extern Actor *func_8032813C(enum actor_e id, f32[3], s32);
extern Actor *spawn_actor_f32(enum actor_e id, f32[3], s32);
Actor *chOverlayPressStart_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -69,7 +69,7 @@ void chOverlayPressStart_func_802DCC78(ActorMarker *this){
void chOverlayPressStart_update(Actor *this){
if(!this->initialized){
this->initialized = 1;
this->initialized = TRUE;
this->depth_mode = MODEL_RENDER_DEPTH_NONE;
actor_collisionOff(this);
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
@@ -85,7 +85,7 @@ void chOverlayPressStart_update(Actor *this){
void __chOverlayPressStart_spawn(void){
if(D_8037DE80 == NULL){
D_8037DE80 = func_8032813C(ACTOR_1DE_PRESS_START_OVERLAY, D_80368118, 0)->marker;
D_8037DE80 = spawn_actor_f32(ACTOR_1DE_PRESS_START_OVERLAY, D_80368118, 0)->marker;
}
}

20
src/core2/ch/shrapnel.c
View File

@@ -50,7 +50,7 @@ void chShrapnel_func_802D0AB8(Actor *this) {
void chShrapnel_spawnExplodeActor(s32 arg0){
Actor *this = reinterpret_cast(Actor *, arg0);
func_8032813C(0xF3, this->unk1C, 0);
spawn_actor_f32(0xF3, this->unk1C, 0);
}
void chShrapnel_emitExplosion(Actor *this) {
@@ -65,8 +65,8 @@ void chShrapnel_emitExplosion(Actor *this) {
particleEmitter_setParticleFramerateRange(temp_v0, 4.0f, 4.0f);
particleEmitter_setParticleSpawnPositionRange(temp_v0, 0.0f, 200.0f, 0.0f, 0.0f, 200.0f, 0.0f);
particleEmitter_setPosition(temp_v0, this->position);
func_802EFB70(temp_v0, 3.0f, 3.0f);
func_802EFB84(temp_v0, 8.0f, 8.0f);
particleEmitter_setStartingScaleRange(temp_v0, 3.0f, 3.0f);
particleEmitter_setFinalScaleRange(temp_v0, 8.0f, 8.0f);
particleEmitter_setParticleLifeTimeRange(temp_v0, 0.5f, 0.5f);
particleEmitter_setParticleVelocityRange(temp_v0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
particleEmitter_emitN(temp_v0, 1);
@@ -81,8 +81,8 @@ void chShrapnel_emitSmoke(Actor *this) {
particleEmitter_setFade(temp_v0, 0.05f, 0.1f);
particleEmitter_setStartingFrameRange(temp_v0, 0, 7);
particleEmitter_setPosition(temp_v0, this->position);
func_802EFB70(temp_v0, 1.0f, 1.5f);
func_802EFB84(temp_v0, 2.0f, 3.0f);
particleEmitter_setStartingScaleRange(temp_v0, 1.0f, 1.5f);
particleEmitter_setFinalScaleRange(temp_v0, 2.0f, 3.0f);
particleEmitter_setParticleSpawnPositionRange(temp_v0, -75.0f, 25.0f, -75.0f, 75.0f, 75.0f, 75.0f);
particleEmitter_setParticleVelocityRange(temp_v0, -70.0f, 50.0f, -70.0f, 70.0f, 100.0f, 70.0f);
particleEmitter_setRGB(temp_v0, D_803673F8);
@@ -99,7 +99,7 @@ void chShrapnel_emitBodyParts(Actor *this, enum asset_e model_id, s32 n) {
func_802EFA18(temp_v0, 1);
particleEmitter_setModel(temp_v0, model_id);
particleEmitter_setPosition(temp_v0, this->position);
func_802EFB70(temp_v0, 0.05f, 2.0f);
particleEmitter_setStartingScaleRange(temp_v0, 0.05f, 2.0f);
particleEmitter_setAngularVelocityRange(temp_v0, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setSpawnIntervalRange(temp_v0, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(temp_v0, 10.0f, 10.0f);
@@ -147,15 +147,15 @@ void chshrapnel_update(Actor *this) {
this->unk4C = 0.0f;
}
chShrapnel_func_802D0FC8(this);
this->unk60 += tick;
if (M_PI <= this->unk60) {
this->unk60 -= M_PI;
this->lifetime_value += tick;
if (M_PI <= this->lifetime_value) {
this->lifetime_value -= M_PI;
}
this->unk1C[0] = this->position[0];
this->unk1C[1] = this->position[1];
this->unk1C[2] = this->position[2];
this->unk1C[1] = func_80309B24(this->position) - 15.0f;
this->position[1] = this->unk1C[1] - (sinf(this->unk60 * 4.0f) * 10.0f);
this->position[1] = this->unk1C[1] - (sinf(this->lifetime_value * 4.0f) * 10.0f);
_player_getPosition(player_position);
switch (this->state) {
case 1:

8
src/core2/ch/snacker.c
View File

@@ -79,12 +79,12 @@ static void __chsnacker_start_dialog(Actor *this) {
this->unk28 = 0.0f;
if (level_get() == LEVEL_2_TREASURE_TROVE_COVE) {
text_index = mapSpecificFlags_getN(8, 3);
if( !this->unk138_24 ) {
if( !this->is_first_encounter ) {
if(text_index < 4) {
if(func_80311480(0xA1B + text_index, 0, NULL, NULL, NULL, NULL)){
text_index++;
mapSpecificFlags_setN(8, text_index, 3);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
}
}
@@ -99,7 +99,7 @@ bool func_802E0DC0(f32 snacker_position[3]){
player_getPosition(player_position);
return (4000000.0f < ml_distanceSquared_vec3f(player_position, snacker_position))
|| ( (snacker_position[1] - func_80309724(snacker_position) < 70.0f) && (func_80309B24(snacker_position) - snacker_position[1] < 70.0f));
|| ( (snacker_position[1] - mapModel_getFloorY(snacker_position) < 70.0f) && (func_80309B24(snacker_position) - snacker_position[1] < 70.0f));
}
void func_802E0E88(Actor *this){
@@ -359,7 +359,7 @@ void chSnacker_spawn(void) {
}
}
snacker = func_8032813C(ACTOR_68_SNACKER, spawn_position, 0);
snacker = spawn_actor_f32(ACTOR_68_SNACKER, spawn_position, 0);
s_chSnacker_marker = snacker->marker;
local = (ChSnackerLocal *)&snacker->local;

6
src/core2/ch/snowball.c
View File

@@ -122,7 +122,7 @@ void chSnowball_update(Actor *this) {
this->velocity[1] = (sp58[1] - this->position[1])/32 - -32.0f;
this->velocity[2] = (sp58[2] - this->position[2])/32;
local->unk4 = 0;
this->unk60 = 6.0f;
this->lifetime_value = 6.0f;
}
switch (this->state) {
case 1:
@@ -150,8 +150,8 @@ void chSnowball_update(Actor *this) {
}
}
local->unk4++;
if (this->unk60 > 0.0) {
this->unk60 -= time_getDelta();
if (this->lifetime_value > 0.0) {
this->lifetime_value -= time_getDelta();
} else {
marker_despawn(this->marker);
}

2
src/core2/ch/snowmanhat.c
View File

@@ -26,7 +26,7 @@ void chSnowmanHat_update(Actor *this){
if( 360.0f <= this->pitch)
this->pitch -= 360.0f;
if(this->position_y <= func_80309724(this->position)){
if(this->position_y <= mapModel_getFloorY(this->position)){
subaddie_set_state(this, 2);
FUNC_8030E8B4(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 32750, this->position, 2250, 4500);
}

2
src/core2/ch/soundsource.c
View File

@@ -110,7 +110,7 @@ void func_802D096C(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
sp1C[0] = reinterpret_cast(f32, arg0);
sp1C[1] = reinterpret_cast(f32, arg1);
sp1C[2] = reinterpret_cast(f32, arg2);
func_8032813C(0x28B, sp1C, arg3);
spawn_actor_f32(0x28B, sp1C, arg3);
}

14
src/core2/ch/termite.c
View File

@@ -81,7 +81,7 @@ void __chTermite_emitLegs(ParticleEmitter *pCtrl, f32 position[3]){
__chTermite_setupParticleEmitter(pCtrl, position);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(pCtrl, ASSET_393_MODEL_TERMITE_LEG);
func_802EFB70(pCtrl, 0.5f, 0.8f);
particleEmitter_setStartingScaleRange(pCtrl, 0.5f, 0.8f);
particleEmitter_setAngularVelocityRange(pCtrl, -800.0f, -800.0f, -800.0f, 800.0f, 800.0f, 800.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -200.0f, 850.0f, -200.0f, 400.0f, 1000.0f, 400.0f);
particleEmitter_emitN(pCtrl, 6);
@@ -91,7 +91,7 @@ void __chTermite_emitHead(ParticleEmitter *pCtrl, f32 position[3]){
__chTermite_setupParticleEmitter(pCtrl, position);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(pCtrl, ASSET_394_MODEL_TERMITE_HEAD);
func_802EFB70(pCtrl, 1.0f, 1.0f);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -50.0f, 750.0f, -50.0f, 120.0f, 900.0f, 120.0f);
particleEmitter_emitN(pCtrl, 1);
@@ -101,7 +101,7 @@ void __chTermite_emitBody(ParticleEmitter *pCtrl, f32 position[3]){
__chTermite_setupParticleEmitter(pCtrl, position);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(pCtrl, ASSET_395_MODEL_TERMITE_BODY);
func_802EFB70(pCtrl, 1.0f, 1.0f);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -50.0f, 750.0f, -50.0f, 120.0f, 900.0f, 120.0f);
particleEmitter_emitN(pCtrl, 1);
@@ -111,7 +111,7 @@ void __chTermite_emitEyes(ParticleEmitter *pCtrl, f32 position[3]){
__chTermite_setupParticleEmitter(pCtrl, position);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1400.0f, 0.0f, 0.0f, -1400.0f, 0.0f);
particleEmitter_setModel(pCtrl, ASSET_396_MODEL_TERMITE_EYES);
func_802EFB70(pCtrl, 1.0f, 1.0f);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
particleEmitter_setAngularVelocityRange(pCtrl, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -80.0f, 400.0f, -80.0f, 160.0f, 860.0f, 160.0f);
particleEmitter_emitN(pCtrl, 2);
@@ -141,7 +141,7 @@ void __chTermite_testCallback(ActorMarker *caller, enum asset_e text_id, s32 arg
Actor *this;
this = marker_getActor(caller);
this->unk138_24 = FALSE;
this->is_first_encounter = FALSE;
levelSpecificFlags_set(0xd, FALSE);
}
@@ -154,7 +154,7 @@ void chTermite_update(Actor *this) {
if (!this->unk16C_4) {
marker_setCollisionScripts(this->marker, NULL, __chTermite_ow, __chTermite_die);
this->unk124_0 = this->unk138_31 = FALSE;
this->unk138_24 = FALSE;
this->is_first_encounter = FALSE;
this->unk16C_0 = TRUE;
this->unk16C_4 = TRUE;
}
@@ -168,7 +168,7 @@ void chTermite_update(Actor *this) {
func_80311480(ASSET_B43_DIALOG_TERMITE_MEET_AS_BEAR, 7, this->position, this->marker, __chTermite_testCallback, NULL);
mapSpecificFlags_set(0, TRUE);
levelSpecificFlags_set(0xD, TRUE);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
if( func_80329530(this, 300)

6
src/core2/ch/whipcrack.c
View File

@@ -32,7 +32,7 @@ void __chwhipcrack_spawnPieces(Actor *this, enum asset_e model_id, s32 cnt){
120.0f, 300.0f, 120.0f
);
particleEmitter_setPosition(pCtrl, this->position);
func_802EFB70(pCtrl, 0.5f, 1.0f);
particleEmitter_setStartingScaleRange(pCtrl, 0.5f, 1.0f);
particleEmitter_setAngularVelocityRange(pCtrl,
-500.0f, -500.0f, -500.0f,
500.0f, 500.0f, 500.0f
@@ -52,8 +52,8 @@ void __chwhipcrack_spawnSmoke(Actor *this, s32 cnt){
particleEmitter_setFade(pCtrl, 0.05f, 0.1f);
particleEmitter_setStartingFrameRange(pCtrl, 0, 7);
particleEmitter_setPosition(pCtrl, this->position);
func_802EFB70(pCtrl, 3.0f, 3.5f);
func_802EFB84(pCtrl, 4.5f, 5.5f);
particleEmitter_setStartingScaleRange(pCtrl, 3.0f, 3.5f);
particleEmitter_setFinalScaleRange(pCtrl, 4.5f, 5.5f);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
-50.0f, 50.0f, -50.0f,
50.0f, 200.0f, 50.0f

6
src/core2/code_16010.c
View File

@@ -51,9 +51,9 @@ void func_8029D0D8(void) {
}
void func_8029D154(void){
f32 sp1C[3];
player_getPosition(sp1C);
func_8032813C(0x188, sp1C, (s32)yaw_get());
f32 plyr_pos[3];
player_getPosition(plyr_pos);
spawn_actor_f32(0x188, plyr_pos, (s32)yaw_get());
}
void func_8029D194(void) {

6
src/core2/code_3EC30.c
View File

@@ -11,14 +11,14 @@ ActorInfo D_80365FB0 = { 0x65, 0xF3, 0x0, 0x0, 0x0, func_802C5BC0, func_80326224
void func_802C5BC0(Actor *this){
if(!this->initialized){
actor_collisionOff(this);
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
this->pitch = 90.0f;
fxRipple_802F3554(4, this->position);
this->initialized = TRUE;
}
else{
this->unk60 += time_getDelta();
if(2.0 < this->unk60)
this->lifetime_value += time_getDelta();
if(2.0 < this->lifetime_value)
marker_despawn(this->marker);
}
}

12
src/core2/code_400F0.c
View File

@@ -70,10 +70,10 @@ void func_802C70DC(Actor *actor, Struct_Core2_400F0_0 * arg1, s32 arg2){
tmp_f20 = time_getDelta();
while(0.0f < tmp_f20){
actor->unk60 -= tmp_f20;
if(0.0f < actor->unk60)
actor->lifetime_value -= tmp_f20;
if(0.0f < actor->lifetime_value)
break;
tmp_f20 = mlAbsF(actor->unk60);
tmp_f20 = mlAbsF(actor->lifetime_value);
s0 = &arg1[actor->unk154];
func_802C7080(actor, s0->unk4, s0->unk8, s0->unkC);
s0++;
@@ -91,7 +91,7 @@ void func_802C70DC(Actor *actor, Struct_Core2_400F0_0 * arg1, s32 arg2){
actor->unk154++;
}
//L802C71B8
actor->unk60 = s0->unk0;
actor->lifetime_value = s0->unk0;
}//L802C71CC
}
@@ -124,7 +124,7 @@ void func_802C7318(Actor *actor){
local->unk0[i] = 0.0f;
local->unk8[i] = 0.0f;
}
actor->unk60 = 0.0f;
actor->lifetime_value = 0.0f;
actor->unk154 = 0;
actor->unk124_5 = 0;
reinterpret_cast(s32, actor->unkBC) = 1;
@@ -194,7 +194,7 @@ void func_802C7568(enum actor_e actor_id, s32 arg1, f32 arg2){
void func_802C75A0(Actor *actor, s32 arg1){
actor->unk124_5 = arg1;
actor->unk154 = 0;
actor->unk60 = 0.0f;
actor->lifetime_value = 0.0f;
}
void func_802C75C8(enum actor_e actor_id, s32 arg1){

2
src/core2/code_41460.c
View File

@@ -166,7 +166,7 @@ Actor *func_802C8580(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
sp68[2] = (f32)position[2];
sp68[0] += s0->unk30[0]*3.0f;
s0->unk50 = func_80309724(&sp68);
s0->unk50 = mapModel_getFloorY(&sp68);
s0->unk14[2] = 0.0f;
s0->unk14[1] = 0.0f;

2
src/core2/code_41FB0.c
View File

@@ -153,7 +153,7 @@ Actor *func_802C8FE4(s32 arg0, f32 position[3], Actor *arg2){
D_8037DDB4 += 360.0/sp74->count;
while(360.0 <= D_8037DDB4){ D_8037DDB4 -= 360.0;}
//L802C9114
actor =(i == 0 && arg2) ? arg2 : func_8032813C(sp74->actor_id, position, 0);
actor =(i == 0 && arg2) ? arg2 : spawn_actor_f32(sp74->actor_id, position, 0);
actor->unk10_0 = 1;
s0 = (struct41FB0s_1 *) &actor->unkBC;
s0->unk0 = arg0;

4
src/core2/code_42CB0.c
View File

@@ -98,7 +98,7 @@ void chHoneycomb_update(Actor *this){
int i;
if(!this->initialized){
this->unk60 = (randf() < 0.5) ? 200.0 : -200.0;
this->lifetime_value = (randf() < 0.5) ? 200.0 : -200.0;
this->initialized = TRUE;
if( this->marker->id == MARKER_53_EMPTY_HONEYCOMB){
if(local->uid == 0)
@@ -146,7 +146,7 @@ void chHoneycomb_update(Actor *this){
}
}
this->yaw += time_getDelta()*this->unk60;
this->yaw += time_getDelta()*this->lifetime_value;
if(360.0f <= this->yaw) this->yaw -= 360.0f;
if(this->yaw < 0.0f) this->yaw += 360.0f;

6
src/core2/code_45310.c
View File

@@ -313,7 +313,7 @@ void func_802CCC5C(Actor *this) {
local->unk30[0] = (s16) this->position[0];
local->unk30[1] = (s16) this->position[1];
local->unk30[2] = (s16) this->position[2];
local->unk30[1] = (s16) func_80309724(this->position);
local->unk30[1] = (s16) mapModel_getFloorY(this->position);
temp_f0 = func_80309B24(this->position);
if (local->unk30[1] < temp_f0) {
local->unk30[1] = (s16) (s32) temp_f0;
@@ -500,8 +500,8 @@ void func_802CCC5C(Actor *this) {
this->position[2] = this->position[2] + sp40[2];
this->position[1] += local->unk36 * spB8;
local->unk36 -= 3000.0f * spB8;
if (this->position[1] < func_80309724(this->position)) {
this->position[1] = func_80309724(this->position);
if (this->position[1] < mapModel_getFloorY(this->position)) {
this->position[1] = mapModel_getFloorY(this->position);
skeletalAnim_set(this->unk148, 0x111, 0.1f, 1.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 1.2f, 32200);

14
src/core2/code_47BD0.c
View File

@@ -288,7 +288,7 @@ void chBeeSwarm_802CF610(Actor *this, ParticleEmitter *p_ctrl, f32 position[3])
particleEmitter_setFade(p_ctrl, 0.0f, 0.65f);
particleEmitter_setParticleAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(p_ctrl,this->marker->modelId);
func_802EFB70(p_ctrl, 0.25f, 0.25f);
particleEmitter_setStartingScaleRange(p_ctrl, 0.25f, 0.25f);
particleEmitter_setAngularVelocityRange(p_ctrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setParticleVelocityRange(p_ctrl, -300.0f, 750.0f, -300.0f, 300.0f, 900.0f, 300.0f);
particleEmitter_emitN(p_ctrl, 1);
@@ -376,7 +376,7 @@ void chBeeSwarm_update(Actor *this) {
fileProgressFlag_set(FILEPROG_D_BEEHIVE_TEXT, TRUE);
}
subaddie_set_state(this, (this->unk100 != NULL) ? 1 : 2);
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
chBeeSwarm_802CF040(this);
this->unk38_0 = volatileFlag_get(VOLATILE_FLAG_1) | volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE);
}
@@ -479,18 +479,18 @@ void chBeeSwarm_update(Actor *this) {
break;
case 4:
spB4[1] += 50.0f;
this->unk60 += dt;
if ((this->unk60 - 0.5 > 0.0) && (local->unk0 > 0) && (func_8028ECAC() != 3)) {
this->lifetime_value += dt;
if ((this->lifetime_value - 0.5 > 0.0) && (local->unk0 > 0) && (func_8028ECAC() != 3)) {
func_8028F504(0xD);
this->unk60 -= 0.5;
this->lifetime_value -= 0.5;
}
if ((this->unk60 > 0.2) && (func_8028ECAC() == 3)) {
if ((this->lifetime_value > 0.2) && (func_8028ECAC() == 3)) {
if (local->unk0-- > 0) {
sp68[0] = local->unk8[local->unk0].unk0[0] + this->position[0];
sp68[1] = local->unk8[local->unk0].unk0[1] + this->position[1];
sp68[2] = local->unk8[local->unk0].unk0[2] + this->position[2];
chBeeSwarm_802CF610(this, partEmitMgr_newEmitter(1), sp68);
this->unk60 -= 0.2;
this->lifetime_value -= 0.2;
}
}
if (local->unk0 == 0) {

28
src/core2/code_4A6F0.c
View File

@@ -160,7 +160,7 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
break;
case ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE: //L802D1A98
this->unk138_24 = FALSE;
this->is_first_encounter = FALSE;
if(this->unk38_31 != 0){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, -this->unk38_31);
@@ -229,12 +229,12 @@ void chMumbo_update(Actor *this) {
if(!this->initialized){
this->initialized = TRUE;
this->marker->propPtr->unk8_3 = FALSE;
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
if (chMumbo_func_802D181C(0x201)) {
this->unk60 = 1.0f;
this->lifetime_value = 1.0f;
subaddie_set_state(this, 7U);
} else if (chMumbo_func_802D181C(0x202)) {
this->unk60 = 2.0f;
this->lifetime_value = 2.0f;
subaddie_set_state(this, 8U);
}
}
@@ -249,7 +249,7 @@ void chMumbo_update(Actor *this) {
}
this->unk38_0 = (item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->unk38_31);
this->unk10_12 = 0;
this->unk138_24 = 0;
this->is_first_encounter = FALSE;
this->unk16C_4 = TRUE;
}
@@ -333,7 +333,7 @@ void chMumbo_update(Actor *this) {
) {
func_80311480(ASSET_DAE_DIALOG_MUMBO_TREX_START, 6, NULL, this->marker, __chMumbo_textCallback, NULL);
fileProgressFlag_set(FILEPROG_BA_HAS_SEEN_TREX_TEXT, 1);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
subaddie_set_state(this, 3);
} else if (
sp44
@@ -385,7 +385,7 @@ void chMumbo_update(Actor *this) {
}
if (actor_animationIsAt(this, 0.01f)) {
if ( this->unk138_24
if ( this->is_first_encounter
|| (this->unk10_12 == 0
&& (player_getTransformation() != TRANSFORM_1_BANJO)
&& (player_getTransformation() != TRANSFORM_7_WISHWASHY))
@@ -407,7 +407,7 @@ void chMumbo_update(Actor *this) {
func_8025A58C(-1, 1000);
}
if (actor_animationIsAt(this, 0.999f)) {
if (!this->unk138_24) {
if (!this->is_first_encounter) {
func_8028F918(0);
}
func_8025A7DC(COMUSIC_1D_MUMBO_TRANSFORMATION);
@@ -416,7 +416,7 @@ void chMumbo_update(Actor *this) {
chMumbo_func_802D1B8C(this, D_8037DDF0);
break;
}
if (this->unk138_24) {
if (this->is_first_encounter) {
subaddie_set_state(this, 3);
func_80311480(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 6, NULL, this->marker, __chMumbo_textCallback, NULL);
break;
@@ -483,11 +483,11 @@ Actor *chMumbo_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
f32 sp44[3];
f32 sp38[3] = D_80367510;
func_8033A45C(4, (this->unk60 == 0.0f));
func_8033A45C(5, (this->unk60 == 1.0f));
func_8033A45C(6, (this->unk60 == 0.0f));
func_8033A45C(7, (this->unk60 == 1.0f));
func_8033A45C(8, (this->unk60 == 2.0f));
func_8033A45C(4, (this->lifetime_value == 0.0f));
func_8033A45C(5, (this->lifetime_value == 1.0f));
func_8033A45C(6, (this->lifetime_value == 0.0f));
func_8033A45C(7, (this->lifetime_value == 1.0f));
func_8033A45C(8, (this->lifetime_value == 2.0f));
func_8033A45C(9, 0);
out = actor_draw(marker, gfx, mtx, vtx);
if( marker->unk14_21 && out->state == 8){

4
src/core2/code_4BE10.c
View File

@@ -29,8 +29,8 @@ void func_802D2DA0(Actor *this) {
if (--this->unk38_31 == 0) {
marker_despawn(this->marker);
}
pCtrl = partEmitMgr_newEmitter((s32) this->unk60);
for(phi_s6 = 0; phi_s6 < (s32)this->unk60; phi_s6++){
pCtrl = partEmitMgr_newEmitter((s32) this->lifetime_value);
for(phi_s6 = 0; phi_s6 < (s32)this->lifetime_value; phi_s6++){
for(i = 0; i < 3; i++){
sp70[i] = this->position[i] + randf()*2*this->unkF4_8 - ((i == 1)? 0: this->unkF4_8);
}

2
src/core2/code_4C020.c
View File

@@ -167,7 +167,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) {
FUNC_8030E624(SFX_82_METAL_BREAK, 0.7f, 32736);
FUNC_8030E624(SFX_82_METAL_BREAK, 0.6f, 32736);
func_802D2FB0(sp2C, 0x14, -0x1E, 0x190, 3.0f, 0x15E, 0x50, 0x96);
sp2C->unk60 = 1.0f;
sp2C->lifetime_value = 1.0f;
fileProgressFlag_set(FILEPROG_A5_LAIR_CRYPT_GATE_OPEN, 1);
break;

4
src/core2/code_509D0.c
View File

@@ -77,8 +77,8 @@ void __chLevelCollectible_presentCollectEmitSparkles(f32 position[3], enum asset
particleEmitter_setParticleAccelerationRange(p_emitter, 0.0f, -250.0f, 0.0f, 0.0f, -250.0f, 0.0f);
particleEmitter_setParticleVelocityRange(p_emitter, -100.0f, 200.0f, -100.0f, 100.0f, 350.0f, 100.0f);
particleEmitter_setAngularVelocityRange(p_emitter, 0.0f, 0.0f, 200.0f, 0.0f, 0.0f, 240.0f);
func_802EFB70(p_emitter, 0.47f, 0.47f);
func_802EFB84(p_emitter, 0.03f, 0.03f);
particleEmitter_setStartingScaleRange(p_emitter, 0.47f, 0.47f);
particleEmitter_setFinalScaleRange(p_emitter, 0.03f, 0.03f);
particleEmitter_setFade(p_emitter, 0.4f, 0.8f);
particleEmitter_setParticleLifeTimeRange(p_emitter, 0.9f, 0.9f);
particleEmitter_emitN(p_emitter, 8);

2
src/core2/code_517A0.c
View File

@@ -44,7 +44,7 @@ void func_802D8730(Actor *this) {
if (this->velocity_y < 0.0f) {
this->velocity_y = 0.07f;
pCtrl = func_802F4094(this->position, 40.0f);
func_802EFB70(pCtrl, 0.05f, 0.06f);
particleEmitter_setStartingScaleRange(pCtrl, 0.05f, 0.06f);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -3400.0f, 0.0f, 0.0f, -3400.0f, 0.0f);
particleEmitter_setRGB(pCtrl, D_80367C84);
particleEmitter_setParticleVelocityRange(pCtrl, -180.0f, 200.0f, -180.0f, 180.0f, 400.0f, 180.0f);

12
src/core2/code_51950.c
View File

@@ -47,7 +47,7 @@ void func_802D88E0(Actor *this) {
if (this->position_y > -16000.0f) {
this->position_y += this->unk1C[1];
}
if (this->unk60 > 0.5) {
if (this->lifetime_value > 0.5) {
pCtrl = partEmitMgr_newEmitter(1U);
for(i = 0; i < 3; i++){
sp5C[i] = this->position[i] + (randf()*2)*25 - ((i == 1) ? 0 : 25);
@@ -59,13 +59,13 @@ void func_802D88E0(Actor *this) {
func_802EFF50(pCtrl, 1.0f);
particleEmitter_setSpawnInterval(pCtrl, 0.25f);
}
this->unk60 -= time_getDelta();
if (this->unk60 < 0.0f) {
this->lifetime_value -= time_getDelta();
if (this->lifetime_value < 0.0f) {
marker_despawn(this->marker);
return;
}
temp_f10 = (s32) ml_map_f(this->unk60, 0.0f, 0.3f, 0.0f, 255.0f);
temp_f10 = (s32) ml_map_f(this->lifetime_value, 0.0f, 0.3f, 0.0f, 255.0f);
actor_setOpacity(this, temp_f10);
if (temp_f10 == 0) {
marker_despawn(this->marker);
@@ -81,11 +81,11 @@ void func_802D8B20(enum actor_e actor_id){
player_getPosition(plyr_pos);
temp2 = player_getYaw();
temp_v0 = (randf() > 0.5) ? 0x1E : -0x1E;
feather = func_8032813C(actor_id, plyr_pos, (s32) (temp2 + temp_v0));
feather = spawn_actor_f32(actor_id, plyr_pos, (s32) (temp2 + temp_v0));
func_8032AA58(feather, 0.45f);
feather->unk28 = 22.0f;
feather->unk1C[1] = 48.0f;
feather->unk60 = 1.2f;
feather->lifetime_value = 1.2f;
}
void func_802D8BE4(bool gold_feather){

12
src/core2/code_53A10.c
View File

@@ -58,16 +58,16 @@ void func_802DAA14(Actor *this){
}
if(!this->initialized){
this->unk60 = 0.5f;
this->initialized = 1;
this->lifetime_value = 0.5f;
this->initialized = TRUE;
}
if(0.0f < this->unk60){
this->unk60 -= time_getDelta();
if(0.0f < this->lifetime_value){
this->lifetime_value -= time_getDelta();
return;
}
if(!this->unk138_24){
if(!this->is_first_encounter){
if(level_get() == LEVEL_A_MAD_MONSTER_MANSION){
text_id = 0xadc;
}
@@ -79,6 +79,6 @@ void func_802DAA14(Actor *this){
text_id = tmp;
}
func_80311480(text_id, 4, NULL, this->marker, func_802DA9A0, NULL);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
}

10
src/core2/code_53C10.c
View File

@@ -39,7 +39,7 @@ void func_802DABA0(ParticleEmitter *pCtrl, f32 position[3], f32 scale, enum asse
func_802EFA18(pCtrl, 5);
func_802EFA20(pCtrl, 0.8f, 1.0f);
particleEmitter_setSfx(pCtrl, SFX_1F_HITTING_AN_ENEMY_3, 6000);
func_802EFB70(pCtrl, scale, scale);
particleEmitter_setStartingScaleRange(pCtrl, scale, scale);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 3.5f, 3.5f);
particleEmitter_setFade(pCtrl, 0.0f, 0.65f);
@@ -222,7 +222,7 @@ void func_802DB4E0(ActorMarker *marker, s32 arg1){
subaddie_set_state_with_direction(actor, 9, 0.0f, 1);
actor_playAnimationOnce(actor);
actor_collisionOff(actor);
actor->unk60 = randf2(3.0f, 6.0f);
actor->lifetime_value = randf2(3.0f, 6.0f);
}
void func_802DB548(ActorMarker *marker, ActorMarker *other_marker) {
@@ -243,7 +243,7 @@ void func_802DB5A0(Actor *this) {
if (!this->unk16C_4) {
marker_setCollisionScripts(this->marker, &func_802DB440, local->unk30, local->unk34);
this->marker->propPtr->unk8_3 = FALSE;
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
this->unk124_0 = this->unk138_31 = FALSE;
local->unk38 = 0;
this->unk16C_4 = TRUE;
@@ -370,8 +370,8 @@ void func_802DB5A0(Actor *this) {
if (animctrl_getAnimTimer(this->animctrl) != 0.0f) {
func_802DB2F8(this);
}
if (this->unk60 > 0.0f) {
this->unk60 -= time_getDelta();
if (this->lifetime_value > 0.0f) {
this->lifetime_value -= time_getDelta();
break;
}
subaddie_set_state_with_direction(this, 0xA, 0.0f, 1);

8
src/core2/code_54D50.c
View File

@@ -44,8 +44,8 @@ void func_802DBCE0(ParticleEmitter *pCtrl, f32 arg1[3]){
particleEmitter_setSprite(other, ASSET_70C_SPRITE_RIPPLE);
particleEmitter_setDrawMode(other, 1);
particleEmitter_setPosition(other, arg1);
func_802EFB70(other, 0.1f, 0.1f);
func_802EFB84(other, 1.0f, 1.4f);
particleEmitter_setStartingScaleRange(other, 0.1f, 0.1f);
particleEmitter_setFinalScaleRange(other, 1.0f, 1.4f);
particleEmitter_setParticleLifeTimeRange(other, 1.0f, 1.4f);
particleEmitter_setFade(other, 0.0f, 0.5f);
particleEmitter_emitN(other, 1);
@@ -97,8 +97,8 @@ void func_802DC018(Actor *this){
}
if(func_802DBF94(this, 600) && randf() < 0.2){
tmp_f0 = randf2(0.01f, 0.06f);
func_802EFB70(local->unk0, tmp_f0, tmp_f0);
func_802EFB84(local->unk0, tmp_f0, tmp_f0);
particleEmitter_setStartingScaleRange(local->unk0, tmp_f0, tmp_f0);
particleEmitter_setFinalScaleRange(local->unk0, tmp_f0, tmp_f0);
particleEmitter_emitN(local->unk0, 1);
}//L802DC0F4
}

2
src/core2/code_55390.c
View File

@@ -74,7 +74,7 @@ void func_802DC45C(Actor *this){
void func_802DC4C4(void) {
Actor *actor;
if (D_8037DE40 == 0) {
actor = func_8032813C(ACTOR_1DB_GAME_OVER, D_80368040, 0);
actor = spawn_actor_f32(ACTOR_1DB_GAME_OVER, D_80368040, 0);
D_8037DE40 = actor->marker;
func_8025A58C(0, 5000);
func_8025AB00();

2
src/core2/code_556C0.c
View File

@@ -37,7 +37,7 @@ void func_802DC67C(Actor *this){
void func_802DC6E4(void) {
Actor *actor;
if (D_8037DE50 == 0) {
actor = func_8032813C(0x19C, D_80368070, 0);
actor = spawn_actor_f32(0x19C, D_80368070, 0);
D_8037DE50 = actor->marker;
func_8025A58C(0, 5000);
func_8025AB00();

2
src/core2/code_55850.c
View File

@@ -69,7 +69,7 @@ void func_802DC900(Actor *this){
void func_802DC960(void) {
Actor *actor;
if (D_8037DE60 == 0) {
actor = func_8032813C(0x1DC, D_803680A0, 0);
actor = spawn_actor_f32(0x1DC, D_803680A0, 0);
D_8037DE60 = actor->marker;
}
}

2
src/core2/code_57C70.c
View File

@@ -156,7 +156,7 @@ void func_802DEE1C(Actor *this) {
void func_802DF04C(void){
Actor *this;
if(D_8037DFE0 == NULL){
this = func_8032813C(0x19B, D_80368330, 0);
this = spawn_actor_f32(0x19B, D_80368330, 0);
D_8037DFE0 = this->marker;
}
}

2
src/core2/code_581D0.c
View File

@@ -41,7 +41,7 @@ Actor *func_802DF160(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
void func_802DF270(void){
Actor *this;
if(D_8037E000 == NULL){
this = func_8032813C(0x2B5, D_80368360, 0);
this = spawn_actor_f32(0x2B5, D_80368360, 0);
D_8037E000 = this->marker;
}
}

4
src/core2/code_66D90.c
View File

@@ -46,8 +46,8 @@ ParticleEmitter *func_802EDD8C(f32 pos[3], f32 xz_range, f32 arg2){
);
particleEmitter_setPosition(pCtrl, pos);
particleEmitter_setRGB(pCtrl, D_80368850);
func_802EFB70(pCtrl, 0.05f, 0.09f);
func_802EFB84(pCtrl, 0.05f, 0.09f);
particleEmitter_setStartingScaleRange(pCtrl, 0.05f, 0.09f);
particleEmitter_setFinalScaleRange(pCtrl, 0.05f, 0.09f);
func_802EFF50(pCtrl, 10.0f);
func_802EFF5C(pCtrl, 0.25f, 0.25f, 0.0f);
func_802EFF7C(pCtrl, 0.0f, 0.1f, 0.0f);

6
src/core2/code_66FB0.c
View File

@@ -45,7 +45,7 @@ void func_802EDF40(f32 pos[3], s32 arg1, s32 cnt, f32 arg3, f32 arg4, f32 arg5,
f32 tmp_f0;
if(arg1 < 0x3e7){
particleEmitter_setModel(pCtrl, D_80368860[arg1]);
func_802EFB70(pCtrl, arg3 * 0.6, arg3 * 1.1);
particleEmitter_setStartingScaleRange(pCtrl, arg3 * 0.6, arg3 * 1.1);
particleEmitter_setAngularVelocityRange(pCtrl, 400.0f, 400.0f, 400.0f, 800.0f, 800.0f, 800.0f);
}
else{//L802EE008
@@ -56,8 +56,8 @@ void func_802EDF40(f32 pos[3], s32 arg1, s32 cnt, f32 arg3, f32 arg4, f32 arg5,
else{
particleEmitter_setStartingFrameRange(pCtrl, 0, 0);
}
func_802EFB70(pCtrl, arg3, arg3);
func_802EFB84(pCtrl, arg3, arg3);
particleEmitter_setStartingScaleRange(pCtrl, arg3, arg3);
particleEmitter_setFinalScaleRange(pCtrl, arg3, arg3);
particleEmitter_setAngularVelocityRange(pCtrl, 0, 0, 0, 0, 0, 0);
func_802EFF9C(pCtrl, 0);
}//L802EE0B4

4
src/core2/code_67650.c
View File

@@ -77,8 +77,8 @@ void func_802EE6CC(f32 position[3], f32 velocity[3], s32 color[4], s32 arg3, f32
}
particleEmitter_setDrawMode(p_ctrl, sp3C);
particleEmitter_setParticleLifeTimeRange(p_ctrl, arg4, arg4);
func_802EFB70(p_ctrl, arg6 / 175.0, arg6 / 175.0);
func_802EFB84(p_ctrl, (arg6 + arg7) / 175.0, (arg6 + arg7) / 175.0);
particleEmitter_setStartingScaleRange(p_ctrl, arg6 / 175.0, arg6 / 175.0);
particleEmitter_setFinalScaleRange(p_ctrl, (arg6 + arg7) / 175.0, (arg6 + arg7) / 175.0);
if (arg8 == 0) {
particleEmitter_setParticleFramerateRange(p_ctrl, (15.0 / arg4), (15.0 / arg4));
} else {

4
src/core2/code_6AEF0.c
View File

@@ -28,8 +28,8 @@ ParticleEmitter *func_802F1EC8(f32 *position) {
particleEmitter_setParticleVelocityRange(p_emitter, -10.0f, 10.0f, -10.0f, 10.0f, 240.0f, 10.0f);
particleEmitter_setRGB(p_emitter, D_80368AA0);
particleEmitter_setFade(p_emitter, 0.2f, 0.3f);
func_802EFB70(p_emitter, 0.2f, 0.4f);
func_802EFB84(p_emitter, 0.85f, 0.9f);
particleEmitter_setStartingScaleRange(p_emitter, 0.2f, 0.4f);
particleEmitter_setFinalScaleRange(p_emitter, 0.85f, 0.9f);
particleEmitter_setParticleLifeTimeRange(p_emitter, 0.3f, 0.35f);
return p_emitter;
}

4
src/core2/code_6B30.c
View File

@@ -4,7 +4,7 @@
#include "core2/ba/carry.h"
#include "core2/ba/physics.h"
extern Actor *func_8032813C(enum actor_e, f32[3], s32);
extern Actor *spawn_actor_f32(enum actor_e, f32[3], s32);
/* .bss */
u8 D_8037BFA0;
@@ -116,7 +116,7 @@ void func_8028DE0C(enum actor_e actor_id){
f32 sp20[3];
baModel_getPosition(sp20);
actor = func_8032813C(actor_id, sp20, (s32) yaw_get());
actor = spawn_actor_f32(actor_id, sp20, (s32) yaw_get());
actor->unk138_22 = TRUE;
bacarry_set_marker(actor->marker);
bs_setState(BS_3A_CARRY_IDLE);

4
src/core2/code_6CD20.c
View File

@@ -42,8 +42,8 @@ void func_802F3CF8(f32 arg0[3], s32 arg1, s32 arg2){
);
func_802EFF50(pCtrl, 1.0f);
particleEmitter_setFade(pCtrl, 0.1f, 0.5f);
func_802EFB70(pCtrl, 0.1f, 0.2f);
func_802EFB84(pCtrl, 0.4f, 0.5f);
particleEmitter_setStartingScaleRange(pCtrl, 0.1f, 0.2f);
particleEmitter_setFinalScaleRange(pCtrl, 0.4f, 0.5f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 0.75f, 0.75f);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80368D88);
if(arg1 == 0){

4
src/core2/code_6CEC0.c
View File

@@ -25,8 +25,8 @@ ParticleEmitter *func_802F3E98(f32 pos[3], enum asset_e sprite_id){
);
particleEmitter_setFade(this, 0.4f, 0.8f);
particleEmitter_setPosition(this, pos);
func_802EFB70(this, 0.22f, 0.22f);
func_802EFB84(this, 0.03f, 0.03f);
particleEmitter_setStartingScaleRange(this, 0.22f, 0.22f);
particleEmitter_setFinalScaleRange(this, 0.03f, 0.03f);
particleEmitter_setAngularVelocityRange(this,
0.0f, 0.0f, 200.0f,
0.0f, 0.0f, 240.0f

4
src/core2/code_6D030.c
View File

@@ -53,8 +53,8 @@ ParticleEmitter *func_802F4094(f32 pos[3], f32 arg1){
);
particleEmitter_setPosition(pCtrl, pos);
particleEmitter_setRGB(pCtrl, D_80368DD0);
func_802EFB70(pCtrl, 0.02f, 0.04f);
func_802EFB84(pCtrl, 0.01f, 0.01f);
particleEmitter_setStartingScaleRange(pCtrl, 0.02f, 0.04f);
particleEmitter_setFinalScaleRange(pCtrl, 0.01f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 2.0f, 2.0f);
func_802EFF50(pCtrl, 10.0f);
return pCtrl;

4
src/core2/code_6D270.c
View File

@@ -56,8 +56,8 @@ ParticleEmitter *func_802F4274(f32 arg0[3]) {
particleEmitter_setParticleLifeTimeRange(temp_v0, 0.7f, 0.7f);
particleEmitter_setPosition(temp_v0, sp2C);
particleEmitter_setRGB(temp_v0, D_80368DE0);
func_802EFB70(temp_v0, 0.8, 0.8);
func_802EFB84(temp_v0, 0.8, 0.8);
particleEmitter_setStartingScaleRange(temp_v0, 0.8, 0.8);
particleEmitter_setFinalScaleRange(temp_v0, 0.8, 0.8);
return temp_v0;
}

19
src/core2/code_7AF80.c
View File

@@ -1036,16 +1036,12 @@ s32 nodeprop_getRadius(NodeProp *arg0) {
return arg0->unk6.radius;
}
void func_80304D4C(NodeProp *arg0, s32 dst[3]) {
dst[0] = arg0->x;
dst[1] = arg0->y;
dst[2] = arg0->z;
void nodeprop_getPosition_s32(NodeProp *nodeProp, s32 dst[3]) {
TUPLE_ASSIGN(dst, nodeProp->x, nodeProp->y, nodeProp->z)
}
void nodeprop_getPosition(NodeProp *arg0, f32 arg1[3]) {
arg1[0] = arg0->x;
arg1[1] = arg0->y;
arg1[2] = arg0->z;
void nodeprop_getPosition(NodeProp *nodeProp, f32 dst[3]) {
TUPLE_ASSIGN(dst, nodeProp->x, nodeProp->y, nodeProp->z)
}
u32 func_80304DA8(NodeProp *arg0) {
@@ -1249,7 +1245,7 @@ Actor * func_803055E0(enum actor_e arg0, s32 arg1[3], s32 arg2, s32 arg3, s32 ar
if(actor){
tmp = func_80305510(arg3);
if(tmp != NULL){
func_80304D4C(tmp, sp34);
nodeprop_getPosition_s32(tmp, sp34);
actor->unk44_14 = func_80341D5C(arg1, sp34);
}
else{
@@ -1266,12 +1262,13 @@ Actor * func_803055E0(enum actor_e arg0, s32 arg1[3], s32 arg2, s32 arg3, s32 ar
return actor;
}
Actor *spawn_actor(enum actor_e arg0, s32 arg1[3], s32 arg2) {
Actor *spawn_actor(enum actor_e arg0, s32 pos[3], s32 rot) {
s32 i;
arg0 = (!dummy_func_80320248()) ? (ACTOR_4_BIGBUTT) : (arg0);
for (i = 0; i < sSpawnableActorSize; i++) {
if (arg0 == sSpawnableActorList[i].infoPtr->actorId) {
return sSpawnableActorList[i].spawnFunc(arg1, arg2, ((0, sSpawnableActorList[i])).infoPtr, sSpawnableActorList[i].unk8);
return sSpawnableActorList[i].spawnFunc(pos, rot, ((0, sSpawnableActorList[i])).infoPtr, sSpawnableActorList[i].unk8);
}
}

6
src/core2/code_935F0.c
View File

@@ -104,7 +104,7 @@ void func_8031A678(Actor *this){
void __chMinigame_textCallback1(ActorMarker *marker, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(marker);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
void __chMinigame_transformToCroc(ActorMarker *marker, enum asset_e text_id, s32 arg2){
@@ -164,7 +164,7 @@ void chMinigame_update(Actor *this){
func_8028FAB0(this->position);
this->unk1C[0] = 0.0f; this->unk1C[1] = this->yaw; this->unk1C[2] = 0.0f;
func_8028FAEC(this->unk1C);
this->unk138_24 = 0;
this->is_first_encounter = FALSE;
if(this->unk10_12 >= 7){
marker_despawn(this->marker);
return;
@@ -177,7 +177,7 @@ void chMinigame_update(Actor *this){
if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){
switch(this->state){
case MINIGAME_STATE_1_INTRODUCE_GAME://L8031AB2C
if(this->unk138_24)
if(this->is_first_encounter)
__chMinigame_setState(this, MINIGAME_STATE_2_IN_PROGESS);
break;
case MINIGAME_STATE_2_IN_PROGESS://L8031AB50

14
src/core2/code_9E370.c
View File

@@ -835,7 +835,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
suLastBaddie->unk44_0 = 0;
suLastBaddie->initialized = FALSE;
suLastBaddie->unk16C_4 = 0;
suLastBaddie->unk60 = 0.0f;
suLastBaddie->lifetime_value = 0.0f;
suLastBaddie->unk10_0 = 0;
suLastBaddie->unk104 = NULL;
suLastBaddie->unk100 = NULL;
@@ -882,7 +882,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
suLastBaddie->unk14C[0] = NULL;
suLastBaddie->unk14C[1] = NULL;
suLastBaddie->unk138_27 = 0;
suLastBaddie->unk138_24 = 0;
suLastBaddie->is_first_encounter = FALSE;
suLastBaddie->unk138_23 = 0;
suLastBaddie->unk138_22 = 0;
suLastBaddie->unk138_21 = 0;
@@ -1059,13 +1059,15 @@ Actor *func_8032811C(enum actor_e id, s32 (* pos)[3], s32 rot){
return spawn_actor(id, pos, rot);
}
Actor *func_8032813C(enum actor_e id, f32 pos[3], s32 rot){
s32 sp24[3];
Actor *spawn_actor_f32(enum actor_e id, f32 pos[3], s32 rot){
s32 pos_float[3];
int i;
for(i = 0; i< 3; i++){
sp24[i] = pos[i];
pos_float[i] = pos[i];
}
spawn_actor(id, &sp24, rot);
spawn_actor(id, &pos_float, rot);
}
Actor * spawn_child_actor(enum actor_e id, Actor ** parent){

2
src/core2/code_A4D00.c
View File

@@ -247,7 +247,7 @@ bool func_8032C4AC(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3) {
f32 sp30;
if (arg0->unk138_8) {
arg0->position[1] = func_80309724(arg0->position);
arg0->position[1] = mapModel_getFloorY(arg0->position);
}
else{
sp30 = func_8033229C(arg0->marker) / 3.0;

2
src/core2/code_C0CF0.c
View File

@@ -8,7 +8,7 @@ extern void func_80329904(ActorMarker *, s32, f32 *);
/* .code */
void func_80347C80(Struct81s *arg0){
Actor *actor;
actor = func_8032813C(ACTOR_46_JIGGY, arg0->position, 0);
actor = spawn_actor_f32(ACTOR_46_JIGGY, arg0->position, 0);
actor->unk54 = 3.0f;
func_803333DC(arg0, actor);
}

2
src/core2/code_C8760.c
View File

@@ -44,7 +44,7 @@ void func_8034F774(void){
particleEmitter_setParticleFramerateRange(D_803720A0.unk0, 15.0f, 30.0f);
particleEmitter_setSpawnIntervalRange(D_803720A0.unk0, 0.0f, 1.0f);
particleEmitter_setParticleLifeTimeRange(D_803720A0.unk0, 216000.0f, 216000.0f);
func_802EFB70(D_803720A0.unk0, 1.8f, 2.2f);
particleEmitter_setStartingScaleRange(D_803720A0.unk0, 1.8f, 2.2f);
particleEmitter_emitUniformLine(D_803720A0.unk0, &sp38, &sp2C, 10);
particleEmitter_setSpawnInterval(D_803720A0.unk0, 0.0f);
D_803720A0.unk5 = func_8030D90C();

4
src/core2/code_D0CA0.c
View File

@@ -460,8 +460,8 @@ void func_80358684(Actor *this) {
this->position[2] = this->position[2] + sp3C[2];
this->position[1] += local->unk36*sp88;
local->unk36 -= 3000.0f * sp88;
if (this->position[1] < func_80309724(this->position)) {
this->position[1] = func_80309724(this->position);
if (this->position[1] < mapModel_getFloorY(this->position)) {
this->position[1] = mapModel_getFloorY(this->position);
next_state = 7;
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 1.2f, 32200);
timed_playSfx(0.1f, SFX_66_BIRD_AUUGHH, 1.6f, 32000);

4
src/core2/code_D6600.c
View File

@@ -113,8 +113,8 @@ void func_8035D95C(ActorMarker *marker) {
func_8034A174(marker->unk44, 5, sp34);
pCtrl = func_802EDD8C(sp34, 20.0f, func_80309B24(sp34));
particleEmitter_setParticleVelocityRange(pCtrl, -50.0f, -50.0f, -50.0f, 50.0f, 50.0f, 50.0f);
func_802EFB70(pCtrl, 0.1f, 0.2f);
func_802EFB84(pCtrl, 0.1f, 0.2f);
particleEmitter_setStartingScaleRange(pCtrl, 0.1f, 0.2f);
particleEmitter_setFinalScaleRange(pCtrl, 0.1f, 0.2f);
particleEmitter_emitN(pCtrl, 3);
}
}

12
src/core2/code_D89E0.c
View File

@@ -3,7 +3,7 @@
#include "variables.h"
extern f32 func_80309724(f32[3]);
extern f32 mapModel_getFloorY(f32[3]);
extern f32 func_80257204(f32, f32, f32, f32);
#define SQ(x) ((x) * (x))
@@ -330,7 +330,7 @@ bool func_8036054C(Actor *this) {
s32 phi_s1;
s32 phi_s2;
if (this->unk60 == 0.0f) {
if (this->lifetime_value == 0.0f) {
this->yaw_ideal = func_80257204(this->position[0], this->position[2], this->unk1C[0], this->unk1C[2]);
func_8035FFAC(this, func_803603AC(this, -110, 2));
}
@@ -338,13 +338,13 @@ bool func_8036054C(Actor *this) {
func_80328FB0(this, 5.0f);
func_80360044(this);
if (func_80329480(this) != 0) {
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
} else {
return TRUE;
}
}
for(phi_s2 = 0; !func_80360198(this) && phi_s2 < 1; phi_s2++){
this->unk60 = 45.0f;
this->lifetime_value = 45.0f;
func_80328CEC(this, (s32) this->yaw, 90, 180);
phi_s1 = 0;
do{
@@ -368,7 +368,7 @@ bool func_8036054C(Actor *this) {
} else {
this->velocity[1] = (f32) randi2(0, 0);
}
if (this->position[1] <= func_80309724(this->position)) {
if (this->position[1] <= mapModel_getFloorY(this->position)) {
this->velocity[0] = 3.0f;
}
return TRUE;
@@ -482,7 +482,7 @@ void func_80360828(Actor *this){
sp34 = time_getDelta();
func_8032CA80(this, this->unk38_0 ? 0x13 : 0x4);
if(func_8035FC98(this, this->velocity_x * sp34)){
this->position_y = func_80309724(this->position);
this->position_y = mapModel_getFloorY(this->position);
subaddie_set_state_with_direction(this, 8, 0.01f, 1);
actor_playAnimationOnce(this);
func_8030E6A4(SFX_1F_HITTING_AN_ENEMY_3, 1.2f, 32200);

8
src/core2/code_DA760.c
View File

@@ -46,21 +46,21 @@ void func_80361870(Actor *this){
this->unk16C_4 = 1;
}
if(!this->unk138_24 && func_80329530(this, 400) && !func_80329530(this, 50)){
if(!this->is_first_encounter && func_80329530(this, 400) && !func_80329530(this, 50)){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_31_MM_OPEN) && level_get() == LEVEL_6_LAIR){
text_id = fileProgressFlag_get(FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT)? 0xF80 : 0xF7F;
if(func_80311480(text_id, 0, 0, 0, 0, 0)){
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
}
else if(func_803616F0(this)){
sp28 = (volatileFlag_get(VOLATILE_FLAG_16)?0xf6e:0xf68) + this->unkF4_8 - 1;
if(!volatileFlag_get(VOLATILE_FLAG_16) && level_get() == LEVEL_6_LAIR){
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
else{
if(func_80311480(sp28, 0, 0, 0, 0, 0)){
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
volatileFlag_set(VOLATILE_FLAG_16, 0);
}
}

6
src/core2/code_DB010.c
View File

@@ -534,11 +534,11 @@ void func_80362E94(Actor *this){
default: //L8036316C
if(!this->unk16C_4){
this->unk16C_4 = 1;
this->unk60 = this->scale*10.0;
this->lifetime_value = this->scale*10.0;
}
this->unk60 = MAX(0.0, this->unk60 - tick);
if(0.0f == this->unk60){
this->lifetime_value = MAX(0.0, this->lifetime_value - tick);
if(0.0f == this->lifetime_value){
switch(this->unkF4_8){
case 2: //L8036325C
func_80361FA0(this->position);

2
src/core2/eggshatter.c
View File

@@ -26,7 +26,7 @@ void eggShatter_init(void){
particleEmitter_setModel(gEggShatter_controller, 0x360);
func_802EF9F8(gEggShatter_controller, 0.6f);
func_802EFA18(gEggShatter_controller, 0);
func_802EFB70(gEggShatter_controller, 0.8f, 1.0f);
particleEmitter_setStartingScaleRange(gEggShatter_controller, 0.8f, 1.0f);
particleEmitter_setAngularVelocityRange(gEggShatter_controller, 400.0f, 400.0f, 400.0f, 800.0f, 800.0f, 800.0f);
particleEmitter_setSpawnIntervalRange(gEggShatter_controller, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(gEggShatter_controller, 1.5f, 1.5f);

4
src/core2/fx/ripple.c
View File

@@ -85,8 +85,8 @@ ParticleEmitter *__fxRipple_create(s32 arg0, f32 position[3], bool arg2){
particleEmitter_setFade(p_emitter, 0.0f, var_s0->fade_out);
particleEmitter_setPosition(p_emitter, spawn_position);
particleEmitter_setRGB(p_emitter, rgb);
func_802EFB70(p_emitter, var_s0->unkC[0], var_s0->unkC[1]);
func_802EFB84(p_emitter, var_s0->unk14[0], var_s0->unk14[1]);
particleEmitter_setStartingScaleRange(p_emitter, var_s0->unkC[0], var_s0->unkC[1]);
particleEmitter_setFinalScaleRange(p_emitter, var_s0->unk14[0], var_s0->unk14[1]);
particleEmitter_setParticleLifeTimeRange(p_emitter, var_s0->lifetime.min, var_s0->lifetime.max);
func_802EFF50(p_emitter, 100.0f);
return p_emitter;

22
src/core2/fx/sparkle.c
View File

@@ -24,7 +24,7 @@ void fxSparkle_emptyHoneycomb(s16 position[3]){
ParticleEmitter *p_emitter = __fxSparkle_create(position, 10.0f, ASSET_713_SPRITE_SPARKLE_YELLOW);
particleEmitter_setPositionAndVelocityRanges(p_emitter, &D_80368BD0);
func_802EFB70(p_emitter, 0.32f, 0.32f);
particleEmitter_setStartingScaleRange(p_emitter, 0.32f, 0.32f);
particleEmitter_emitN(p_emitter, 10);
}
@@ -36,7 +36,7 @@ void fxSparkle_honeycomb(s16 position[3]){
ParticleEmitter *p_emitter = __fxSparkle_create(position, 10.0f, ASSET_713_SPRITE_SPARKLE_YELLOW);
particleEmitter_setPositionAndVelocityRanges(p_emitter, &D_80368C00);
func_802EFB70(p_emitter, 0.32f, 0.32f);
particleEmitter_setStartingScaleRange(p_emitter, 0.32f, 0.32f);
particleEmitter_emitN(p_emitter, 7);
}
@@ -65,7 +65,7 @@ void fxSparkle_giantBlueEgg(s16 position[3]){
};
ParticleEmitter *p_emitter = __fxSparkle_create(position, 25.0f, ASSET_716_SPRITE_SPARKLE_WHITE);
particleEmitter_setPositionAndVelocityRanges(p_emitter, &D_80368C30);
func_802EFB70(p_emitter, 0.5f, 0.5f);
particleEmitter_setStartingScaleRange(p_emitter, 0.5f, 0.5f);
particleEmitter_emitN(p_emitter, 12);
particleEmitter_setParticleLifeTimeRange(p_emitter, 1.5f, 1.5f);
}
@@ -76,7 +76,7 @@ void fxSparkle_redFeather(s16 position[3]){
-75.0f, 100.0f, -75.0f,
75.0f, 250.0f, 75.0f
);
func_802EFB70(p_emitter, 0.3f, 0.3f);
particleEmitter_setStartingScaleRange(p_emitter, 0.3f, 0.3f);
particleEmitter_emitN(p_emitter, 5);
}
@@ -87,7 +87,7 @@ void fxSparkle_giantRedFeather(s16 position[3]){
};
ParticleEmitter *p_emitter = __fxSparkle_create(position, 40.0f, ASSET_715_SPRITE_SPARKLE_RED);
particleEmitter_setPositionAndVelocityRanges(p_emitter, &D_80368C60);
func_802EFB70(p_emitter, 0.5f, 0.5f);
particleEmitter_setStartingScaleRange(p_emitter, 0.5f, 0.5f);
particleEmitter_emitN(p_emitter, 10);
}
@@ -97,7 +97,7 @@ void fxSparkle_goldFeather(s16 position[3]){
-75.0f, 100.0f, -75.0f,
75.0f, 250.0f, 75.0f
);
func_802EFB70(p_emitter, 0.3f, 0.3f);
particleEmitter_setStartingScaleRange(p_emitter, 0.3f, 0.3f);
particleEmitter_emitN(p_emitter, 5);
}
@@ -108,7 +108,7 @@ void fxSparkle_giantGoldFeather(s16 position[3]){
};
ParticleEmitter *p_emitter = __fxSparkle_create(position, 40.0f, ASSET_713_SPRITE_SPARKLE_YELLOW);
particleEmitter_setPositionAndVelocityRanges(p_emitter, &D_80368C90);
func_802EFB70(p_emitter, 0.5f, 0.5f);
particleEmitter_setStartingScaleRange(p_emitter, 0.5f, 0.5f);
particleEmitter_emitN(p_emitter, 10);
}
@@ -119,7 +119,7 @@ void fxSparkle_mumboToken(s16 position[3]){
};
ParticleEmitter *p_emitter = __fxSparkle_create(position, 10.0f, ASSET_718_SPRITE_SPARKLE_WHITE_2);
particleEmitter_setPositionAndVelocityRanges(p_emitter, &D_80368CC0);
func_802EFB70(p_emitter, 0.4f, 0.4f);
particleEmitter_setStartingScaleRange(p_emitter, 0.4f, 0.4f);
particleEmitter_emitN(p_emitter, 7);
particleEmitter_setParticleLifeTimeRange(p_emitter, 1.5f, 1.5f);
}
@@ -131,7 +131,7 @@ void fxSparkle_extraLife(s16 position[3]){
};
ParticleEmitter *p_emitter = __fxSparkle_create(position, 10.0f, ASSET_713_SPRITE_SPARKLE_YELLOW);
particleEmitter_setPositionAndVelocityRanges(p_emitter, &D_80368CF0);
func_802EFB70(p_emitter, 0.27f, 0.27f);
particleEmitter_setStartingScaleRange(p_emitter, 0.27f, 0.27f);
particleEmitter_emitN(p_emitter, 5);
}
@@ -142,7 +142,7 @@ void fxSparkle_brentilda(s16 position[3]){
};
ParticleEmitter *p_emitter = __fxSparkle_create(position, 10.0f, ASSET_713_SPRITE_SPARKLE_YELLOW);
particleEmitter_setPositionAndVelocityRanges(p_emitter, &D_80368D20);
func_802EFB70(p_emitter, 0.25f, 0.3f);
particleEmitter_setStartingScaleRange(p_emitter, 0.25f, 0.3f);
particleEmitter_emitN(p_emitter, 1);
}
@@ -153,7 +153,7 @@ void fxSparkle_chTreasure(s16 position[3]){
};
ParticleEmitter *p_emitter = __fxSparkle_create(position, 10.0f, ASSET_713_SPRITE_SPARKLE_YELLOW);
particleEmitter_setPositionAndVelocityRanges(p_emitter, &D_80368D50);
func_802EFB70(p_emitter, 0.45f, 0.6f);
particleEmitter_setStartingScaleRange(p_emitter, 0.45f, 0.6f);
particleEmitter_setParticleLifeTimeRange(p_emitter, 0.5f, 0.8f);
particleEmitter_emitN(p_emitter, 3);
}

2
src/core2/mapModel.c
View File

@@ -373,7 +373,7 @@ s32 func_80309714(void){
return mapModel.collision_opa->unk12;
}
f32 func_80309724(f32 arg0[3]){
f32 mapModel_getFloorY(f32 arg0[3]){
return func_80308FDC(arg0, 0x1e0000);
}

14
src/core2/particle.c
View File

@@ -323,8 +323,8 @@ ParticleEmitter * particleEmitter_new(u32 capacity){
func_802EFA20(this, 1.0f, 1.0f);
particleEmitter_setStartingFrameRange(this, 0, 0);
particleEmitter_setParticleFramerateRange(this, 0.0f, 0.0f);
func_802EFB70(this, 1.0f, 1.0f);
func_802EFB84(this, 0.0f, 0.0f);
particleEmitter_setStartingScaleRange(this, 1.0f, 1.0f);
particleEmitter_setFinalScaleRange(this, 0.0f, 0.0f);
particleEmitter_setAngularVelocityRange(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
particleEmitter_setSpawnIntervalRange(this, 0.0f, 5.0f);
particleEmitter_setParticleLifeTimeRange(this, 0.0f, 5.0f);
@@ -449,12 +449,12 @@ void particleEmitter_setPosition(ParticleEmitter * this, f32 position[3]){
this->postion_28[2] = position[2];
}
void func_802EFB70(ParticleEmitter * this, f32 min, f32 max){
void particleEmitter_setStartingScaleRange(ParticleEmitter * this, f32 min, f32 max){
this->particleStartingScaleRange_AC_min = min;
this->particleStartingScaleRange_AC_max = max;
}
void func_802EFB84(ParticleEmitter * this, f32 min, f32 max){
void particleEmitter_setFinalScaleRange(ParticleEmitter * this, f32 min, f32 max){
this->particleFinalScaleRange_B4_min = min;
this->particleFinalScaleRange_B4_max = max;
}
@@ -712,8 +712,8 @@ void func_802F053C(ParticleEmitter *this, f32 arg1[3]){
particleEmitter_setStartingFrameRange(this, 0, 7);
particleEmitter_setParticleSpawnPositionRange(this, -80.0f, 0.0f, -80.0f, 80.0f, 60.0f, 80.0f);
particleEmitter_setPosition(this, arg1);
func_802EFB70(this, 1.0f, 1.0f);
func_802EFB84(this, 2.0f, 3.0f);
particleEmitter_setStartingScaleRange(this, 1.0f, 1.0f);
particleEmitter_setFinalScaleRange(this, 2.0f, 3.0f);
particleEmitter_setSpawnIntervalRange(this, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(this, 3.0f, 4.0f);
particleEmitter_setParticleVelocityRange(this, -200.0f, 0.0f, -200.0f, 200.0f, 100.0f, 200.0f);
@@ -729,7 +729,7 @@ void func_802F066C(ParticleEmitter *this, f32 position[3]){
120.0f, 60.0f, 120.0f
);
particleEmitter_setPosition(this, position);
func_802EFB70(this, 0.2f, 0.3f);
particleEmitter_setStartingScaleRange(this, 0.2f, 0.3f);
particleEmitter_setAngularVelocityRange(this,
-300.0f, -300.0f, -300.0f,
300.0f, 300.0f, 300.0f

2
src/core2/spawnqueue.c
View File

@@ -539,7 +539,7 @@ Actor *func_802C4140(enum actor_e actor_id, s32 x, s32 y, s32 z){
position[0] = reinterpret_cast(f32, x);
position[1] = reinterpret_cast(f32, y);
position[2] = reinterpret_cast(f32, z);
return func_8032813C(reinterpret_cast(enum actor_e, actor_id), position, 0);
return spawn_actor_f32(reinterpret_cast(enum actor_e, actor_id), position, 0);
}