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/MMM/ch/loggo.c
View File

@@ -62,8 +62,8 @@ void chLoggo_update(Actor *this){
s32 sp34;
sp44 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOn(this);
marker_setCollisionScripts(this->marker, __chLoggo_collide, NULL, NULL);

4
src/MMM/ch/motzhand.c
View File

@@ -126,8 +126,8 @@ void chmotzhand_update(Actor *this){
sp48 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(jiggyscore_isSpawned(JIGGY_60_MMM_MOTZHAND)){
marker_despawn(this->marker);
return;

4
src/MMM/ch/napper.c
View File

@@ -108,8 +108,8 @@ void chnapper_update(Actor *this){
sp68 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->scale = 0.5f;
marker_setCollisionScripts(this->marker, func_80386ACC, NULL, NULL);
local->unk10 = TRUE;