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);