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

Renaming functions

Browse Source
This commit is contained in:
Adrien Bonnin
2024-09-09 19:51:23 +02:00
parent b77274c9ea
commit 1861ce5c0e
173 changed files with 752 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 @@ int __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