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

Merge remote-tracking branch 'origin/master' into pal

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-07 21:13:37 -05:00
parent 3f210f38b8 347c3edcdf
commit 3460bb81e5
156 changed files with 1857 additions and 1784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/SM/ch/vegetables.c
View File

@@ -80,7 +80,7 @@ ActorInfo D_8038AD7C = { MARKER_1E8_COLLYWOBBLE_B, ACTOR_COLLYWOBBLE_B, MODEL_CO
s32 D_8038ADA0[3] = {0xFF, 0xFF, 0xFF};
struct31s D_8038ADAC = {
ParticleScaleAndLifetimeRanges D_8038ADAC = {
{0.1f, 0.5f},
{1.5f, 3.0f},
{0.0f, 0.01f},
@@ -93,7 +93,7 @@ struct42s D_8038ADD4 = {
{{-40.0f, -40.0f, -40.0f}, {40.0f, 40.0f, 40.0f}}
};
struct31s D_8038AE04 = {
ParticleScaleAndLifetimeRanges D_8038AE04 = {
{0.5f, 0.75f},
{0.4f, 0.6f},
{0.0f, 0.01f},
@@ -107,7 +107,7 @@ struct43s D_8038AE2C = {
{{-80.0f, -80.0f, -80.0f}, {80.0f, 80.0f, 80.0f}}
};
struct31s D_8038AE74 = {
ParticleScaleAndLifetimeRanges D_8038AE74 = {
{1.0f, 1.0f},
{1.0f, 1.0f},
{0.0f, 0.01f},
@@ -121,7 +121,7 @@ struct43s D_8038AE9C = {
{{-20.0f, -20.0f, -20.0f}, {20.0f, 20.0f, 20.0f}}
};
struct31s D_8038AEE4 = {
ParticleScaleAndLifetimeRanges D_8038AEE4 = {
{0.6f, 0.8f},
{0.5f, 0.7f},
{0.0f, 0.01f},
@@ -142,7 +142,7 @@ void func_80387910(ParticleEmitter *arg0, f32 *arg1, s32 arg2){
particleEmitter_setSprite(arg0, ASSET_700_SPRITE_DUST);
particleEmitter_setStartingFrameRange(arg0, 0, 7);
particleEmitter_setPosition(arg0, arg1);
func_802EFB98(arg0, &D_8038ADAC);
particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038ADAC);
particleEmitter_setPositionAndVelocityRanges(arg0, &D_8038ADD4);
particleEmitter_emitN(arg0, arg2);
}
@@ -154,7 +154,7 @@ void func_803879B8(ParticleEmitter *arg0, f32 *arg1, s32 arg2, enum asset_e mode
particleEmitter_setPosition(arg0, arg1);
particleEmitter_setDrawMode(arg0, 2);
particleEmitter_setAngularVelocityRange(arg0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
func_802EFB98(arg0, &D_8038AE04);
particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AE04);
particleEmitter_setPositionVelocityAndAccelerationRanges(arg0, &D_8038AE2C);
particleEmitter_emitN(arg0, arg2);
}
@@ -166,7 +166,7 @@ void func_80387A80(ParticleEmitter *arg0, f32 *arg1, s32 arg2, enum asset_e mode
particleEmitter_setPosition(arg0, arg1);
particleEmitter_setDrawMode(arg0, 2);
particleEmitter_setAngularVelocityRange(arg0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
func_802EFB98(arg0, &D_8038AE74);
particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AE74);
particleEmitter_setPositionVelocityAndAccelerationRanges(arg0, &D_8038AE9C);
particleEmitter_emitN(arg0, arg2);
}
@@ -179,7 +179,7 @@ void func_80387B48(ParticleEmitter *arg0, f32 arg1[3], s32 arg2, enum asset_e mo
particleEmitter_setDrawMode(arg0, 2);
particleEmitter_setAngularVelocityRange(arg0, 150.0f, -300.0f, -300.0f, 300.0f, 300.0f, -150.0f);
particleEmitter_setSfx(arg0, SFX_1F_HITTING_AN_ENEMY_3, 8000);
func_802EFB98(arg0, &D_8038AEE4);
particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AEE4);
particleEmitter_setPositionVelocityAndAccelerationRanges(arg0, &D_8038AF0C);
particleEmitter_emitN(arg0, arg2);
}
@@ -287,7 +287,7 @@ void func_80388080(Actor *this){
if(!this->initialized){
switch(this->marker->unk14_20){
switch(this->marker->id){
default:
local->unkC = 3; //cauliflower
break;

4
src/SM/code_2990.c
View File

@@ -142,7 +142,7 @@ void func_80388FA0(Actor *this, s32 arg1){
case 4:
other = subaddie_getLinkedActor(this);
myOther = this->unk100;
if(myOther && other && myOther->unk14_20 == 0xB8)
if(myOther && other && myOther->id == 0xB8)
subaddie_set_state_with_direction(other, 3, 0.0001f, 1);
actor_playAnimationOnce(this);
this->unk44_31 = func_8030D90C();
@@ -166,7 +166,7 @@ void func_80388FA0(Actor *this, s32 arg1){
case 2:
other = subaddie_getLinkedActor(this);
myOther = this->unk100;
if(myOther && other && myOther->unk14_20 == 0xB8)
if(myOther && other && myOther->id == 0xB8)
subaddie_set_state_with_direction(other, 2, 0.0001f, 1);
animctrl_setSmoothTransition(this->animctrl, 1);
actor_playAnimationOnce(this);

2
src/SM/code_3FC0.c
View File

@@ -50,7 +50,7 @@ ActorInfo D_8038B080 ={
/* .code */
void func_8038A3B0(Actor *this){
s32 sp24 = this->marker->unk14_20 - 0xe1;
s32 sp24 = this->marker->id - 0xe1;
if(this->marker->unk14_21)
func_8034A174(this->marker->unk44, 0x1f, D_80365E04[sp24]);

33
src/SM/code_F0.c
View File

@@ -2,6 +2,7 @@
#include "functions.h"
#include "variables.h"
#include "prop.h"
#include "actor.h"
int ability_hasLearned(s32);
@@ -139,20 +140,20 @@ bool SM_CRCs_are_valid(void){
void SM_func_80386810(void)
{
spawnableActorList_add(&D_8038AB00, actor_new, 0X2000180);
spawnableActorList_add(&D_8038ABF0, actor_new, 0X80);
spawnableActorList_add(&D_8038AC20, actor_new, 0);
spawnableActorList_add(&D_8038AC78, actor_new, 0X2000121);
spawnableActorList_add(&D_8038ACE8, actor_new, 0X2000121);
spawnableActorList_add(&D_8038AD58, actor_new, 0X2200121);
spawnableActorList_add(&D_8038AC9C, actor_new, 0X2000121);
spawnableActorList_add(&D_8038AD0C, actor_new, 0X2000121);
spawnableActorList_add(&D_8038AD7C, actor_new, 0X2200121);
spawnableActorList_add(&chSmMole, actor_new, 0X100);
spawnableActorList_add(&D_8038B0B0, actor_new, 0);
spawnableActorList_add(&D_8038B0E0, actor_new, 0);
spawnableActorList_add(&D_8038B008, actor_new, 0X6C8);
spawnableActorList_add(&D_8038B044, actor_new, 0X6C8);
spawnableActorList_add(&D_8038B080, actor_new, 0X6C8);
spawnableActorList_add(&D_8038AB24, actor_new, 0X400);
spawnableActorList_add(&D_8038AB00, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25);
spawnableActorList_add(&D_8038ABF0, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_8038AC20, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038AC78, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25);
spawnableActorList_add(&D_8038ACE8, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25);
spawnableActorList_add(&D_8038AD58, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_21 | ACTOR_FLAG_UNKNOWN_25);
spawnableActorList_add(&D_8038AC9C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25);
spawnableActorList_add(&D_8038AD0C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25);
spawnableActorList_add(&D_8038AD7C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_21 | ACTOR_FLAG_UNKNOWN_25);
spawnableActorList_add(&chSmMole, actor_new, ACTOR_FLAG_UNKNOWN_8);
spawnableActorList_add(&D_8038B0B0, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038B0E0, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038B008, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038B044, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038B080, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038AB24, actor_new, ACTOR_FLAG_UNKNOWN_10);
}