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

Merge branch 'mr-origin-72'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:43:08 -05:00
parent 351f4e9fea 6307691657
commit 0d83006835
14 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/ch/badShad.c
View File

@@ -27,7 +27,7 @@ void chBadShad_update(Actor *this){
s32 iVar1;
if(!this->initialized){
this->initialized = TRUE;
this->marker->collidable = 0;
this->marker->collidable = FALSE;
}
if(!this->despawn_flag && this->unk1C_x < (f32)(globalTimer_getTime() - 1) ){
//unlink

2
src/core2/ch/code_468E0.c
View File

@@ -35,7 +35,7 @@ void func_802CD8C0(Actor *this){
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->unk2C_1 = 1;
this->marker->collidable = 0;
this->marker->collidable = FALSE;
*(s32*)this->unkBC = 0; //TODO Make struct
if(volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){
marker_despawn(this->marker);

2
src/core2/ch/jigsawdance.c
View File

@@ -41,7 +41,7 @@ Actor *__chJigsawDance_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3
void __chJigsawDance_update(Actor * this){
AnimCtrl *plyrMvmt;
this->marker->collidable = 0;
this->marker->collidable = FALSE;
switch(this->state){
case 1:
break;

2
src/core2/ch/jinjo.c
View File

@@ -53,7 +53,7 @@ void __chJinjo_802CDBA8(ActorMarker *this, ActorMarker *other){
if(item_adjustByDiffWithHud(ITEM_12_JINJOS, 1 << (this->id + 6) ) == 0x1f)
localPtr->unk4 = 1;
actor_loopAnimation(actorPtr);
this->collidable = 0;
this->collidable = FALSE;
}
}