Renaming functions
This commit is contained in:
@@ -89,7 +89,7 @@ void __chgrublinhood_die(ActorMarker* marker, s32 arg1) {
|
||||
__chgrublinhood_emitHat(pCtrl, actor, ASSET_52D_MODEL_GRUBLIN_HOOD_HAT);
|
||||
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32,actor->position_x), reinterpret_cast(s32,actor->position_y), reinterpret_cast(s32,actor->position_z));
|
||||
actor_collisionOff(actor);
|
||||
actor->unk138_24 = 1;
|
||||
actor->is_first_encounter = TRUE;
|
||||
}
|
||||
|
||||
Actor *chgrublinhood_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
@@ -109,7 +109,7 @@ Actor *chgrublinhood_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
func_8033A45C(11, (local->season < AUTUMN) ? 0 : (local->season == AUTUMN) ? 1 : 2);
|
||||
func_8033A45C(12, (local->season == WINTER) ? 2 : 1);
|
||||
func_8033A45C(13, (local->season == WINTER) ? 1 : 0);
|
||||
func_8033A45C(14, (this->unk138_24)? 0 : 1);
|
||||
func_8033A45C(14, (this->is_first_encounter)? FALSE : TRUE);
|
||||
return actor_draw(marker, gfx, mtx, vtx);
|
||||
}
|
||||
|
||||
|
@@ -137,7 +137,7 @@ void chGobiCCW_update(Actor *this) {
|
||||
this->unk16C_4 = TRUE;
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
this->marker->actorFreeFunc = chGobiCCW_free;
|
||||
this->unk138_24 = FALSE;
|
||||
this->is_first_encounter = FALSE;
|
||||
local->unk4 = skeletalAnim_new();
|
||||
local->spit_model = assetcache_get(ASSET_3F3_MODEL_GOBI_SPIT);
|
||||
marker_setCollisionScripts(this->marker, 0, func_8038894C, 0);
|
||||
@@ -159,13 +159,13 @@ void chGobiCCW_update(Actor *this) {
|
||||
return;
|
||||
}
|
||||
if(this->state == 1){
|
||||
if (!this->unk138_24) {
|
||||
if (!this->is_first_encounter) {
|
||||
player_getPosition(sp48);
|
||||
if (ml_distance_vec3f(this->position, sp48) < 600.0f) {
|
||||
if (local->unk0->unk2 != 0) {
|
||||
func_80311480((s32) local->unk0->unk2, 4, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
this->unk138_24 = TRUE;
|
||||
this->is_first_encounter = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -214,7 +214,7 @@ void CCW_func_80389BFC(Actor *this) {
|
||||
if (!this->unk16C_4) {
|
||||
this->unk16C_4 = TRUE;
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
this->unk138_24 = FALSE;
|
||||
this->is_first_encounter = FALSE;
|
||||
this->position[0] = -4900.0f;
|
||||
this->position[1] = 4619.0f;
|
||||
this->position[2] = 0.0f;
|
||||
@@ -253,12 +253,12 @@ void CCW_func_80389BFC(Actor *this) {
|
||||
}
|
||||
if (this->state == 1) {
|
||||
player_getPosition(sp4C);
|
||||
if( !this->unk138_24
|
||||
if( !this->is_first_encounter
|
||||
&& (local->unkC[2] >= 6500)
|
||||
&& (sp4C[2] < 6500.0f)
|
||||
&& (local->unk0->unk28 != 0)
|
||||
){
|
||||
this->unk138_24 = TRUE;
|
||||
this->is_first_encounter = TRUE;
|
||||
func_80324E38(0.0f, 3);
|
||||
timed_setStaticCameraToNode(0.0f, local->unk0->unk24);
|
||||
func_80324DBC(0.0f, local->unk0->unk28, 6, NULL, this->marker, func_80389700, NULL);
|
||||
|
@@ -28,7 +28,7 @@ f32 func_8038A190(Actor *this, f32 *arg1) {
|
||||
f32 temp_f0;
|
||||
f32 temp_f2;
|
||||
|
||||
temp_f0 = func_80309724(arg1);
|
||||
temp_f0 = mapModel_getFloorY(arg1);
|
||||
temp_f2 = this->position[1];
|
||||
if (((temp_f2 + 50.0f) < temp_f0) || (temp_f0 < (temp_f2 - 50.0f))) {
|
||||
return temp_f2;
|
||||
|
@@ -61,7 +61,7 @@ void func_8038B19C(Actor *this) {
|
||||
|
||||
if (!this->unk16C_4) {
|
||||
this->unk16C_4 = TRUE;
|
||||
this->unk138_24 = FALSE;
|
||||
this->is_first_encounter = FALSE;
|
||||
func_8038B0F0(this, 1);
|
||||
}
|
||||
|
||||
@@ -88,8 +88,8 @@ void func_8038B19C(Actor *this) {
|
||||
func_8038B0F0(this, 1);
|
||||
}
|
||||
}
|
||||
if (!this->unk138_24 && func_803292E0(this)) {
|
||||
this->unk138_24 = TRUE;
|
||||
if (!this->is_first_encounter && func_803292E0(this)) {
|
||||
this->is_first_encounter = TRUE;
|
||||
func_80311480(0xCC8, 0, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
func_8028E668(this->position, 300.0f, -50.0f, 120.0f);
|
||||
|
@@ -87,11 +87,11 @@ void func_8038B814(Actor *this, s32 next_state) {
|
||||
void func_8038B87C(Actor *this) {
|
||||
if (!this->unk16C_4) {
|
||||
this->unk16C_4 = TRUE;
|
||||
this->unk138_24 = FALSE;
|
||||
this->is_first_encounter = FALSE;
|
||||
func_8038B814(this, 1);
|
||||
}
|
||||
if (!this->unk138_24 && func_803292E0(this)) {
|
||||
this->unk138_24 = TRUE;
|
||||
if (!this->is_first_encounter && func_803292E0(this)) {
|
||||
this->is_first_encounter = TRUE;
|
||||
func_80311480(0xCC9, 0, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
func_8028E668(this->position, 300.0f, -50.0f, 120.0f);
|
||||
|
@@ -121,7 +121,7 @@ void chnabnut_update(Actor *this) {
|
||||
D_8038F350[1] = this->position[1];
|
||||
D_8038F350[2] = this->position[2];
|
||||
if (this->state == 0) {
|
||||
this->unk138_24 = FALSE;
|
||||
this->is_first_encounter = FALSE;
|
||||
local->returned_acorn_count = NULL;
|
||||
}
|
||||
chnabnut_setState(this, 1);
|
||||
@@ -133,15 +133,15 @@ void chnabnut_update(Actor *this) {
|
||||
|
||||
if (this->state == NABNUT_STATE_1_SAD) {
|
||||
player_getPosition(sp30);
|
||||
if (!this->unk138_24 && (ml_distance_vec3f(this->position, sp30) < 400.0f)) {
|
||||
this->unk138_24 = TRUE;
|
||||
if (!this->is_first_encounter && (ml_distance_vec3f(this->position, sp30) < 400.0f)) {
|
||||
this->is_first_encounter = TRUE;
|
||||
func_80311480(0xCCA, 0xE, this->position, NULL, NULL, NULL);
|
||||
}
|
||||
if (item_getCount(ITEM_23_ACORNS) > 0) {
|
||||
func_80258A4C(this->position, this->yaw - 90.0f, sp30, &sp2C, &sp28, &sp24);
|
||||
this->yaw += sp24 * 10.0f;
|
||||
}
|
||||
if (this->unk138_24 && !func_803114B0()) {
|
||||
if (this->is_first_encounter && !func_803114B0()) {
|
||||
func_8028F364(this->position, 500.0f, 200.0f, ACTOR_2A9_ACORN, &this);
|
||||
if ((carriedObj_getActorId() == ACTOR_2A9_ACORN) && (ml_distance_vec3f(this->position, sp30) < 300.0f) && func_8028FC34()) {
|
||||
func_8028FA54(D_8038F350);
|
||||
|
@@ -93,7 +93,7 @@ void func_8038C41C(Actor *this) {
|
||||
if (!this->unk16C_4) {
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
this->unk16C_4 = TRUE;
|
||||
this->unk138_24 = FALSE;
|
||||
this->is_first_encounter = FALSE;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -114,8 +114,8 @@ void func_8038C41C(Actor *this) {
|
||||
|
||||
if ((this->marker->id == 0x1CB) && (this->state == 2)) {
|
||||
player_getPosition(sp2C);
|
||||
if (!this->unk138_24 && (ml_distance_vec3f(this->position, sp2C) < 400.0f)) {
|
||||
this->unk138_24 = TRUE;
|
||||
if (!this->is_first_encounter && (ml_distance_vec3f(this->position, sp2C) < 400.0f)) {
|
||||
this->is_first_encounter = TRUE;
|
||||
func_80311480(0xCCD, 0, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
}
|
||||
|
@@ -45,8 +45,8 @@ void func_8038CA10(ActorMarker *marker) {
|
||||
if (this->marker->unk14_21) {
|
||||
if (0.65 < (f64) randf()) {
|
||||
pCtrl = func_802EDD8C(local->unk4, 0.0f, this->position[1] + 500.0f);
|
||||
func_802EFB70(pCtrl, 0.04f, 0.05f);
|
||||
func_802EFB84(pCtrl, 0.18f, 0.2f);
|
||||
particleEmitter_setStartingScaleRange(pCtrl, 0.04f, 0.05f);
|
||||
particleEmitter_setFinalScaleRange(pCtrl, 0.18f, 0.2f);
|
||||
particleEmitter_setParticleSpawnPositionRange(pCtrl, -10.0f, 0.0f, -10.0f, 10.0f, 20.0f, 10.0f);
|
||||
particleEmitter_setParticleVelocityRange(pCtrl, 0.0f, 31.0f, 0.0f, 0.0f, 37.0f, 0.0f);
|
||||
particleEmitter_emitN(pCtrl, 1);
|
||||
@@ -91,7 +91,7 @@ void func_8038CC4C(Actor *this) {
|
||||
if (!this->unk16C_4) {
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
this->unk16C_4 = TRUE;
|
||||
this->unk138_24 = FALSE;
|
||||
this->is_first_encounter = FALSE;
|
||||
local->unk0 = &D_8038F490[0];
|
||||
while(local->unk0->map_id != 0 && map_get() != local->unk0->map_id){
|
||||
local->unk0++;
|
||||
@@ -113,12 +113,12 @@ void func_8038CC4C(Actor *this) {
|
||||
this->yaw += 30.0f * sp44;
|
||||
}
|
||||
}
|
||||
if (!this->unk138_24) {
|
||||
if (!this->is_first_encounter) {
|
||||
player_getPosition(sp38);
|
||||
if (ml_distance_vec3f(this->position, sp38) < 900.0f) {
|
||||
if (local->unk0->map_id != MAP_46_CCW_WINTER || func_8028F2FC()) {
|
||||
func_80311480(local->unk0->unk4, 4, NULL, NULL, NULL, NULL);
|
||||
this->unk138_24 = TRUE;
|
||||
this->is_first_encounter = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -82,7 +82,7 @@ void func_8038CFB4(Actor *this) {
|
||||
if (!this->unk16C_4) {
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
this->unk16C_4 = TRUE;
|
||||
this->unk138_24 = FALSE;
|
||||
this->is_first_encounter = FALSE;
|
||||
func_8038CEB0(this, 1);
|
||||
if (jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY) != 0) {
|
||||
levelSpecificFlags_set(0x25, 1);
|
||||
@@ -114,11 +114,11 @@ void func_8038CFB4(Actor *this) {
|
||||
}
|
||||
|
||||
if (this->state == 1) {
|
||||
if (!this->unk138_24) {
|
||||
if (!this->is_first_encounter) {
|
||||
player_getPosition(sp60);
|
||||
if (ml_distance_vec3f(this->position, sp60) < 900.0f) {
|
||||
func_80311480(0xCCF, 4, NULL, NULL, NULL, NULL);
|
||||
this->unk138_24 = TRUE;
|
||||
this->is_first_encounter = TRUE;
|
||||
}
|
||||
}
|
||||
if (levelSpecificFlags_get(0x25) != 0) {
|
||||
|
@@ -53,7 +53,7 @@ void func_8038D368(Actor *this) {
|
||||
if (!this->unk16C_4) {
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
this->unk16C_4 = TRUE;
|
||||
this->unk138_24 = FALSE;
|
||||
this->is_first_encounter = FALSE;
|
||||
local->unk0 = D_8038F600;
|
||||
while (local->unk0->map != 0 && map_get() != local->unk0->map) {
|
||||
local->unk0++;
|
||||
@@ -66,7 +66,7 @@ void func_8038D368(Actor *this) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(!this->unk138_24){
|
||||
if(!this->is_first_encounter){
|
||||
player_getPosition(plyr_pos);
|
||||
if (ml_distance_vec3f(this->position, plyr_pos) < 600.0f) {
|
||||
if (!jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY)) {
|
||||
@@ -76,7 +76,7 @@ void func_8038D368(Actor *this) {
|
||||
func_80311480(local->unk0->unk4, 4, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
}
|
||||
this->unk138_24 = TRUE;
|
||||
this->is_first_encounter = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -30,8 +30,8 @@ void CCW_func_8038D510(Actor *this) {
|
||||
particleEmitter_setFade(pCtrl, 0.01f, 0.5f);
|
||||
particleEmitter_setStartingFrameRange(pCtrl, 0, 7);
|
||||
particleEmitter_setPosition(pCtrl, this->position);
|
||||
func_802EFB70(pCtrl, 1.0f, 2.0f);
|
||||
func_802EFB84(pCtrl, 3.0f, 4.0f);
|
||||
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 2.0f);
|
||||
particleEmitter_setFinalScaleRange(pCtrl, 3.0f, 4.0f);
|
||||
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038F670);
|
||||
particleEmitter_setRGB(pCtrl, D_8038F664);
|
||||
particleEmitter_setParticleLifeTimeRange(pCtrl, 3.0f, 4.0f);
|
||||
@@ -52,7 +52,7 @@ void func_8038D5DC(Actor *this) {
|
||||
func_802EFA18(pCtrl, 3);
|
||||
particleEmitter_setModel(pCtrl, 0x896);
|
||||
particleEmitter_setPosition(pCtrl, this->position);
|
||||
func_802EFB70(pCtrl, 0.05f, 0.3f);
|
||||
particleEmitter_setStartingScaleRange(pCtrl, 0.05f, 0.3f);
|
||||
particleEmitter_setAngularVelocityRange(pCtrl,
|
||||
-600.0f, -600.0f, -600.0f,
|
||||
600.0f, 600.0f, 600.0f
|
||||
|
Reference in New Issue
Block a user