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

Merge branch 'mr-origin-70'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:37:54 -05:00
parent 50e1368ae1 062344a1fb
commit 351f4e9fea
192 changed files with 430 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GV/ch/ancientone.c
View File

@@ -111,8 +111,8 @@ void chAncientOne_update(Actor *this){
f32 sp34;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(jiggyscore_isSpawned(JIGGY_46_GV_ANCIENT_ONES)){
marker_despawn(this->marker);
return;

4
src/GV/ch/buriedpyramid.c
View File

@@ -56,8 +56,8 @@ void chBuriedPyramid_update(Actor *this){
f32 max;
f32 min;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
local->raised_state = fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2);
this->position_x = 67.0f;

4
src/GV/ch/gobi1.c
View File

@@ -113,8 +113,8 @@ void chGobi1_update(Actor *this){
f32 sp48[3];
tick = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, func_803873B0, NULL, NULL);
marker->actorFreeFunc = func_8038736C;
marker->propPtr->unk8_3 = TRUE;

4
src/GV/ch/gobi2.c
View File

@@ -170,8 +170,8 @@ void chGobi2_update(Actor *this){
sp34 = this->marker;
sp2C = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, __chGobi2_ow, NULL, NULL);
sp34->actorFreeFunc = __chGobi2_80387EFC;
local->unk4 = skeletalAnim_new();

4
src/GV/ch/gobi3.c
View File

@@ -115,8 +115,8 @@ void chGobi3_ow(ActorMarker *this_marker, ActorMarker *other_marker){
}
void chGobi3_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, chGobi3_ow, NULL, NULL);
this->unk1C[0] = 0.0f;
this->unk1C[1] = 0.0f;

4
src/GV/ch/gobirock.c
View File

@@ -97,8 +97,8 @@ void chGobiRock_update(Actor *this){
Actor *sp28;
f32 sp24 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
sp34->actorFreeFunc = chGobiRock_free;
sp34->propPtr->unk8_3 = TRUE;
marker_setCollisionScripts(this->marker, NULL, NULL, __chGobiRock_destroy);

4
src/GV/ch/gobirope.c
View File

@@ -37,8 +37,8 @@ void chGobiRope_setState(Actor *this, s32 next_state){
void chGobiRope_update(Actor *this){
Actor *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;
actor_collisionOff(this);
sp2C = actorArray_findClosestActorFromActorId(this->position, ACTOR_12E_GOBI_1, -1, &sp28);

4
src/GV/ch/mazectrl.c
View File

@@ -150,8 +150,8 @@ void chMazeCtrl_update(Actor *this){
ActorLocal_GVMazeCtrl *local = (ActorLocal_GVMazeCtrl *)&this->local;
sp34 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = __chMazeCtrl_8038F5E4;
if(this->state == 2){
comusic_8025AB44(COMUSIC_26_GV_SANDYBUTT_DANGER, 30000, 30000);

4
src/GV/ch/toots.c
View File

@@ -38,8 +38,8 @@ void func_80386464(Actor *this){
}
void chtoots_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
D_80391A30 = 0;
D_80391A34 = 0;
}

4
src/GV/ch/trunker.c
View File

@@ -56,8 +56,8 @@ Actor *chTrucker_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx)
void chTrucker_update(Actor *this){
ActorMarker *marker = this->marker;
s32 sp28 = 0;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
mapSpecificFlags_set(0xC, FALSE);

4
src/GV/code_3630.c
View File

@@ -46,11 +46,11 @@ void func_80389ABC(Actor *this){
}
void func_80389B1C(Actor *this){
if(!this->unk16C_4){
if(!this->volatile_initialized){
this->lifetime_value = (f32) func_8038E184();
this->is_first_encounter = jiggyscore_isCollected(JIGGY_43_GV_HISTUP) || mapSpecificFlags_get(0);
this->unk138_23 = jiggyscore_isCollected(JIGGY_43_GV_HISTUP) || mapSpecificFlags_get(2);
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
}
if(!this->initialized){

4
src/GV/code_3BB0.c
View File

@@ -45,8 +45,8 @@ void func_80389FA0(f32 position[3]){
}
void GV_func_8038A084(Actor *this){
if(this->unkF4_8 == 6 && !this->unk16C_4){
this->unk16C_4 = TRUE;
if(this->unkF4_8 == 6 && !this->volatile_initialized){
this->volatile_initialized = TRUE;
if( jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID) && this->yaw == 1.0f){
this->unk38_31 = TRUE;
}

4
src/GV/code_3D90.c
View File

@@ -67,8 +67,8 @@ void func_8038A314(Actor *this){}
void func_8038A31C(Actor *this){
Actor *sp24;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
actor_collisionOff(this);
__spawnQueue_add_1((GenFunction_1)func_8038A2C0, reinterpret_cast(s32, this->marker));
this->velocity[0] = 0.0f;

4
src/GV/code_43B0.c
View File

@@ -80,8 +80,8 @@ void GV_func_8038A9C0(Actor *this){
this->velocity_y = 0.0f;
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
__spawnQueue_add_1((GenFunction_1)func_8038A8CC, (s32)this->marker);

4
src/GV/code_4740.c
View File

@@ -155,8 +155,8 @@ void func_8038B124(Actor *this){
this->velocity_z = this->position_z;
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(this->state == 0xa)
marker_despawn(this->marker);

4
src/GV/code_5570.c
View File

@@ -169,8 +169,8 @@ void GV_func_8038BEA0(Actor *this){
func_80333270(JIGGY_3E_GV_GRABBA, this->position, func_8038BB6C, this->marker);
}//L8038BF24
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(this->unk44_31 == 0){
this->unk44_31 = func_8030D90C();
sfxsource_setSfxId(this->unk44_31, SFX_3EC_CCW_DOOR_OPENING);

4
src/GV/code_61E0.c
View File

@@ -47,8 +47,8 @@ void GV_func_8038C658(Actor *this){
this->position_y += 4.0f;
}
if(!this->unk16C_4 && this->initialized){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized && this->initialized){
this->volatile_initialized = TRUE;
subaddie_set_state_with_direction(this, this->state, 0.01f, 1);
}
sp24 = GV_func_8038C5BC();

4
src/GV/code_6370.c
View File

@@ -157,9 +157,9 @@ void func_8038CC98(Actor *this){
f32 sp54;
f32 sp48[3];
if(!this->unk16C_4){
if(!this->volatile_initialized){
sp7C = fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2);
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = func_8038C880;
local->unk8 = &D_803911F0[this->modelCacheIndex - 0x285];
local->unk10 = 0;

4
src/GV/code_6F80.c
View File

@@ -24,8 +24,8 @@ int func_8038D388(void){
}
void func_8038D3AC(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, func_8038D370, NULL, NULL);
D_80391AA0 = 0;
if(fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2) == 3){

4
src/GV/code_7060.c
View File

@@ -61,9 +61,9 @@ void func_8038D47C(Actor *this){
this->initialized = TRUE;
}//L8038D590
if(!this->unk16C_4){
if(!this->volatile_initialized){
mapSpecificFlags_set(0x10, 0);
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -3){
timedFunc_set_1(1.5f, (GenFunction_1)func_8038D450, reinterpret_cast(s32, this->marker));
}

8
src/GV/code_7FF0.c
View File

@@ -189,8 +189,8 @@ void func_8038E4DC(Actor *this){
this->initialized = TRUE;
this->unk1C[0] = this->unk48;
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(exit_get() == 3){
if(0.65 < this->unk48 && this->unk48 < 0.95){
func_80343E20(0x6a, 0x7ff8, 0.32842f, 0x34);
@@ -289,8 +289,8 @@ void func_8038E97C(Actor *this){
this->position_y += -300.0f;
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(exit_get() == 7){
this->position_z += 117.0;
this->position_y += 130.0;