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

8
src/fight/chbossjinjo.c
View File

@@ -195,8 +195,8 @@ void chBossJinjo_update(Actor *this){
s16 sp42;
s16 sp40;
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
func_80324CFC(0.0f, SFX_JINJO_STATUE_POWERUP, 32000);
func_80324D2C(this->lifetime_value + 2.26, SFX_JINJO_STATUE_POWERUP);
}//L8038C8A4
@@ -349,8 +349,8 @@ void func_8038CED8(f32 arg0[3], enum asset_e model_id, f32 arg2, f32 arg3){
void chBossJinjo_func_8038D014(Actor *this){
s32 temp_a1;
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = 0;
actor_collisionOff(this);
this->alpha_124_19 = 0x7d;

4
src/fight/chbossjinjobase.c
View File

@@ -108,8 +108,8 @@ void chBossJinjoBase_update(Actor *this) {
this->unkF4_29 = 0;
marker_loadModelBin(this->marker);
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, chBossJinjoBase_getHitByEgg, NULL);
marker_setFreeMethod(this->marker, fight_func_8038D510);
this->marker->propPtr->unk8_3 = 1;

4
src/fight/chfinalboss.c
View File

@@ -2172,8 +2172,8 @@ void chfinalboss_update(Actor *this){
f32 sp40[3];
f32 sp34[3];
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
func_803300C0(this->marker, func_8038B834);
marker_setCollisionScripts(this->marker, func_8038BB8C, func_8038B9AC, NULL);
this->marker->propPtr->unk8_3 = 0;

4
src/fight/chgreenblast.c
View File

@@ -100,8 +100,8 @@ void chGreenBlast_update(Actor *this){
f32 delta_time = time_getDelta();
f32 target_position[3];
if (!this->unk16C_4) {
this->unk16C_4 = 1;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, NULL, chGreenBlast_collisionDie);
this->marker->propPtr->unk8_3 = 0;
actor_collisionOn(this);

4
src/fight/chjinjonator.c
View File

@@ -159,8 +159,8 @@ void chjinjonator_update(Actor *this){
sp58 = time_getDelta();
sp54 = animctrl_getDuration(this->animctrl);
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
local->unk18 = 0.40000000000000013 / (this->lifetime_value + 3.3);
local->unk14 = 0.7f;
func_8025A6EC(JINGLE_MENACING_GRUNTILDA_B, 20000);

4
src/fight/chjinjonatorbase.c
View File

@@ -118,8 +118,8 @@ void chjinjonatorbase_update(Actor *this){
marker_loadModelBin(this->marker);
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_8038E120, NULL);
this->marker->propPtr->unk8_3 = 1;
actor_collisionOn(this);

4
src/fight/chspellbarrier.c
View File

@@ -68,8 +68,8 @@ void chspellbarrier_update(Actor *this){
f32 sp38 = time_getDelta();
ActorMarker *jinjo_marker;
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_8038E780, NULL);
marker_setFreeMethod(this->marker, func_8038E7EC);
this->marker->propPtr->unk8_3 = 0;

4
src/fight/chspellfireball.c
View File

@@ -276,8 +276,8 @@ void func_8038F620(Actor *this){
ActorLocal_fight_87A0 * local = (ActorLocal_fight_87A0 *)&this->local;
f32 sp40 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, NULL, func_8038F3B4);
this->marker->propPtr->unk8_3 = 0;
actor_collisionOn(this);

4
src/fight/chstonejinjo.c
View File

@@ -40,8 +40,8 @@ void chstonejinjo_spawnJinjo(ActorMarker *marker) {
}
void chstonejinjo_update(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);
if (this->unkF4_8 == BOSSJINJO_JINJONATOR) {