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;

4
src/MMM/code_16B0.c
View File

@@ -180,8 +180,8 @@ void func_80388028(Actor *this){
f32 sp44;
f32 sp40;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->unk16C_0 = TRUE;
marker_setCollisionScripts(this->marker, NULL, MMM_func_80387CF4, func_80387D1C);
__spawnQueue_add_1((GenFunction_1)func_80387D48, reinterpret_cast(s32, this->marker));

8
src/MMM/code_2040.c
View File

@@ -288,7 +288,7 @@ void func_80388BDC(Actor *this) {
func_802D3D74(this);
mapSpecificFlags_set(1, ((this->yaw > 260.0f) && (this->yaw < 330.0f)) ? TRUE : FALSE);
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
if (this->yaw != 0.0f) {
this->lifetime_value = 0.5f;
subaddie_set_state(this, 7);
@@ -298,7 +298,7 @@ void func_80388BDC(Actor *this) {
this->unk38_31 = 0;
this->lifetime_value = 0.0f;
}
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
}
switch (this->state) {
@@ -370,8 +370,8 @@ void func_80388FE4(Actor *this) {
void func_80389004(Actor *this){
func_802D3CE8(this);
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(levelSpecificFlags_get(0x2e))
marker_despawn(this->marker);
}

4
src/MMM/code_2F60.c
View File

@@ -62,8 +62,8 @@ Actor *func_80389350(ActorMarker* marker, Gfx** graphics, Mtx** matrix, Vtx** ve
}
void func_803893A4(Actor *this){
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);
this->unk38_31 = 2;