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

Merge branch 'mr-origin-89'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-08 02:06:56 -05:00
parent 680cf7a950 4bf7028254
commit 3cd3b3e5da
40 changed files with 709 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CCW/code_2270.c
View File

@@ -140,7 +140,7 @@ void chGobiCCW_update(Actor *this) {
this->has_met_before = FALSE;
local->unk4 = skeletalAnim_new();
local->spit_model = assetcache_get(ASSET_3F3_MODEL_GOBI_SPIT);
marker_setCollisionScripts(this->marker, 0, func_8038894C, 0);
marker_setCollisionScripts(this->marker, NULL, func_8038894C, NULL);
if(!jiggyscore_isSpawned(JIGGY_4D_CCW_FLOWER)) {
fileProgressFlag_set(FILEPROG_E5_CCW_FLOWER_AUTUMN, FALSE);
}

2
src/CCW/code_2B00.c
View File

@@ -90,7 +90,7 @@ void func_80388FD4(Actor *this) {
subaddie_set_state_with_direction(this, 4, 0.999f, 1);
actor_collisionOff(this);
} else {
marker_setCollisionScripts(this->marker, 0, &func_80388F50, 0);
marker_setCollisionScripts(this->marker, NULL, &func_80388F50, NULL);
}
this->unk38_0 = FALSE;
this->volatile_initialized = TRUE;

2
src/CCW/code_7120.c
View File

@@ -105,7 +105,7 @@ void func_8038D85C(Actor *this) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, 0, &func_8038D81C, 0);
marker_setCollisionScripts(this->marker, NULL, &func_8038D81C, NULL);
func_8038D6D8(this, 1);
if (jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY) != FALSE) {