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

renamed Actor.unk16C_4 to Actor.volatile_initialized

Browse Source
This commit is contained in:
mariob92
2024-09-10 11:20:14 +02:00
parent b77274c9ea
commit 062344a1fb
192 changed files with 430 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CCW/ch/grublinhood.c
View File

@@ -176,7 +176,7 @@ void chgrublinhood_update(Actor *this) {
local = (ActorLocal_CCW_8050 *)&this->local;
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
__chgrublinhood_initialize(this);
local->season = __get_current_season(this);
}

4
src/CCW/code_0.c
View File

@@ -25,8 +25,8 @@ void func_80386468(ActorMarker* marker, ActorMarker *arg1) {
}
void func_803864B8(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
marker_setCollisionScripts(this->marker, NULL, NULL, func_80386468);
CCW_func_803863F0(this, 1);

4
src/CCW/code_14B0.c
View File

@@ -69,8 +69,8 @@ void CCW_func_80387A40(Actor *this) {
local = (ActorLocal_CCW_14B0 *)&this->local;
sp68 = time_getDelta();
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = CCW_func_80387A20;
local->unk4 = &D_8038EC00[0];
while((local->unk4->unk0 != 0) && (map_get() != local->unk4->unk0)) {

4
src/CCW/code_160.c
View File

@@ -126,8 +126,8 @@ void func_8038687C(Actor *this) {
sp88 = time_getDelta();
local = (ActorLocal_CCW_160 *)&this->local;
if(!this->unk16C_4) {
this->unk16C_4 = TRUE;
if(!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
local->unk0 = 1;
local->unk4 = 0;

4
src/CCW/code_1B20.c
View File

@@ -141,8 +141,8 @@ void func_80388478(Actor *this) {
ActorLocal_CCW_1B20 *local;
local = (ActorLocal_CCW_1B20 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
func_803300C0(this->marker, func_80388260);
marker_setCollisionScripts(this->marker, NULL, CCW_func_80388278, func_803882A4);
actor_collisionOn(this);

4
src/CCW/code_21A0.c
View File

@@ -22,8 +22,8 @@ void func_80388590(Actor *this, s32 next_state){
}
void func_803885F8(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(fileProgressFlag_get(FILEPROG_E5_CCW_FLOWER_AUTUMN)){
func_80388590(this, 1);
}

4
src/CCW/code_2270.c
View File

@@ -133,8 +133,8 @@ void chGobiCCW_update(Actor *this) {
f32 sp40;
local = (ActorLocal_chGobiCCW*)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
this->marker->actorFreeFunc = chGobiCCW_free;
this->unk138_24 = FALSE;

8
src/CCW/code_2B00.c
View File

@@ -84,7 +84,7 @@ void func_80388FD4(Actor *this) {
this->unk10_12 = func_80388EF0(this);
this->initialized = TRUE;
}
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
if (fileProgressFlag_get(this->unk10_12 + FILEPROG_8B_CCW_SPRING_OPEN)) {
actor_playAnimationOnce(this);
subaddie_set_state_with_direction(this, 4, 0.999f, 1);
@@ -93,7 +93,7 @@ void func_80388FD4(Actor *this) {
marker_setCollisionScripts(this->marker, 0, &func_80388F50, 0);
}
this->unk38_0 = FALSE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
}
if( (this->state == 4)
&& this->unk38_0
@@ -135,13 +135,13 @@ void func_80389268(Actor *this) {
actor_collisionOff(this);
this->initialized = TRUE;
}
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->unk1C[0] = this->position[0];
this->unk1C[1] = this->position[1];
this->unk1C[2] = this->position[2];
this->unk1C[1] += 250.0f;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
if (fileProgressFlag_get(this->unk10_12 + FILEPROG_8B_CCW_SPRING_OPEN)) {
subaddie_set_state(this, 3);
}

4
src/CCW/code_3050.c
View File

@@ -49,8 +49,8 @@ void func_803895F4(Actor *this) {
f32 sp2C;
f32 sp28;
if(!this->unk16C_4) {
this->unk16C_4 = TRUE;
if(!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
marker_setCollisionScripts(this->marker, NULL, NULL, &func_8038950C);
func_80389440(this, 1);

4
src/CCW/code_3310.c
View File

@@ -211,8 +211,8 @@ void CCW_func_80389BFC(Actor *this) {
local = (ActorLocal_CCW_3310 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
this->unk138_24 = FALSE;
this->position[0] = -4900.0f;

4
src/CCW/code_3DA0.c
View File

@@ -88,8 +88,8 @@ void chcaterpillar_update(Actor *this){
sp8C = func_8028E86C() == this->marker;
sp84 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
local->unk0[0] = this->position[0];
local->unk0[1] = this->position[1];
local->unk0[2] = this->position[2];

4
src/CCW/code_4530.c
View File

@@ -76,8 +76,8 @@ void func_8038AA8C(Actor *this) {
f32 sp44;
f32 sp40;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
mapSpecificFlags_set(5, FALSE);
if( (!fileProgressFlag_get(FILEPROG_E8_AUTMN_EYRIE_FED) || jiggyscore_isSpawned(JIGGY_49_CCW_EYRIE))
&& !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)

4
src/CCW/code_4960.c
View File

@@ -64,8 +64,8 @@ void func_8038AEBC(Actor *this) {
f32 sp30;
f32 sp2C;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
func_8038AD50(this, 1);
return;
}

4
src/CCW/code_4D00.c
View File

@@ -59,8 +59,8 @@ void func_8038B19C(Actor *this) {
local = (ActorLocal_CCW_4D00 *)&this->local;
tick = time_getDelta();
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->unk138_24 = FALSE;
func_8038B0F0(this, 1);
}

4
src/CCW/code_50D0.c
View File

@@ -85,8 +85,8 @@ void func_8038B814(Actor *this, s32 next_state) {
}
void func_8038B87C(Actor *this) {
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->unk138_24 = FALSE;
func_8038B814(this, 1);
}

4
src/CCW/code_5540.c
View File

@@ -115,8 +115,8 @@ void chnabnut_update(Actor *this) {
f32 sp24;
local = (ActorLocal_CCW_5540 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
D_8038F350[0] = this->position[0];
D_8038F350[1] = this->position[1];
D_8038F350[2] = this->position[2];

4
src/CCW/code_5BF0.c
View File

@@ -90,9 +90,9 @@ Actor *func_8038C380(ActorMarker* marker, Gfx** gfx, Mtx** mtx, Vtx** vtx) {
void func_8038C41C(Actor *this) {
f32 sp2C[3];
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
this->unk138_24 = FALSE;
return;
}

4
src/CCW/code_61E0.c
View File

@@ -61,8 +61,8 @@ void func_8038C7A8(Actor *this) {
local = (ActorLocal_CCW_61E0 *)&this->local;
sp44 = time_getDelta();
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
return;
}

4
src/CCW/code_6620.c
View File

@@ -88,9 +88,9 @@ void func_8038CC4C(Actor *this) {
f32 sp38[3];
local = (ActorLocal_CCW_6620 *)&this->local;
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
this->unk138_24 = FALSE;
local->unk0 = &D_8038F490[0];
while(local->unk0->map_id != 0 && map_get() != local->unk0->map_id){

4
src/CCW/code_6AC0.c
View File

@@ -79,9 +79,9 @@ void func_8038CFB4(Actor *this) {
f32 sp6C;
f32 sp60[3];
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
this->unk138_24 = FALSE;
func_8038CEB0(this, 1);
if (jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY) != 0) {

4
src/CCW/code_6EC0.c
View File

@@ -50,9 +50,9 @@ void func_8038D368(Actor *this) {
f32 plyr_pos[3];
local = (ActorLocal_CCW_6EC0 *)&this->local;
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
this->unk138_24 = FALSE;
local->unk0 = D_8038F600;
while (local->unk0->map != 0 && map_get() != local->unk0->map) {

4
src/CCW/code_7120.c
View File

@@ -102,9 +102,9 @@ void func_8038D85C(Actor *this) {
f32 tick;
tick = time_getDelta();
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, 0, &func_8038D81C, 0);
func_8038D6D8(this, 1);
if (jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY) != 0) {

4
src/CCW/code_7570.c
View File

@@ -24,8 +24,8 @@ void func_8038D9E0(Actor *this) {
f32 sp20;
ActorMarker *temp_v0;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->depth_mode = 2;
this->marker->unk40_22 = TRUE;
func_8038D960(this, 1);

4
src/CCW/code_7BF0.c
View File

@@ -59,8 +59,8 @@ void func_8038E0C8(Actor *this) {
if(!subaddie_playerIsWithinSphere(this, 3000)) return;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
func_8028746C(this->animctrl, func_8038E060);
func_8028748C(this->animctrl, (s32) this->marker);
this->marker->propPtr->unk8_3 = TRUE;

4
src/CCW/code_950.c
View File

@@ -110,8 +110,8 @@ void chwasp_update(Actor *this) {
sp68 = time_getDelta();
local = (ActorLocal_CCW_950 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = func_8038717C;
local->unk0 = func_8030D90C();
local->unk4 = 0;