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

Merge branch 'master' into banjo-kazooie-var_renames

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-01 15:31:34 -05:00
parent 011bea824c 9cb645df24
commit 35a2c13ea9
402 changed files with 8000 additions and 7857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BGS/bss_pad.c
View File

@@ -1 +1 @@
char pad_BGS_D_80391230[0x10];
char pad_BGS_D_80391230[0x10];

2
src/BGS/ch/code_2270.c
View File

@@ -38,7 +38,7 @@ void BGS_func_80388660(ActorMarker *this){
}
void BGS_func_8038868C(void){
jiggySpawn(JIGGY_27_BGS_TIPTUP, D_80390868);
jiggy_spawn(JIGGY_27_BGS_TIPTUP, D_80390868);
}
void func_803886B4(ActorMarker *this, s32 arg1){

4
src/BGS/ch/code_8A60.c
View File

@@ -25,7 +25,7 @@ void func_8038EE50(void){
f32 sp24[3];
if(nodeProp_findPositionFromActorId(0x14d, sp24)){
jiggySpawn(JIGGY_20_BGS_ELEVATED_WALKWAY, sp24);
jiggy_spawn(JIGGY_20_BGS_ELEVATED_WALKWAY, sp24);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp24[0]),
reinterpret_cast(s32, sp24[1]),
@@ -68,7 +68,7 @@ void func_8038F018(void){
f32 sp24[3];
if(nodeProp_findPositionFromActorId(0x1fc, sp24)){
jiggySpawn(JIGGY_25_BGS_MAZE, sp24);
jiggy_spawn(JIGGY_25_BGS_MAZE, sp24);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp24[0]),
reinterpret_cast(s32, sp24[1]),

16
src/BGS/ch/croctus.c
View File

@@ -65,7 +65,7 @@ void *func_80387D90(ActorMarker * arg0){
spawnPos[2] = this->position_z;
marker->propPtr->unk8_3 = 0;
func_802BAFE4(0x19);
jiggySpawn(JIGGY_22_CROCTUS, spawnPos);
jiggy_spawn(JIGGY_22_CROCTUS, spawnPos);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
}
@@ -92,7 +92,7 @@ void func_80387E68(ActorMarker *caller, enum asset_e text_id, s32 arg2){
timed_playSfx(1.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000);
func_80324CFC(0.4f, COMUSIC_43_ENTER_LEVEL_GLITTER, 22000);
func_80324D2C(4.5f, COMUSIC_43_ENTER_LEVEL_GLITTER);
func_80328B8C(this, 5, 0.79f, 1);
subaddie_set_state_with_direction(this, 5, 0.79f, 1);
func_80326310(this);
bgs_D_803907B8[this->unkF4_8]->propPtr->unk8_4 = TRUE;
timedFunc_set_1(1.1f, (GenFunction_1)func_80387E00, reinterpret_cast(s32, bgs_D_803907B8[this->unkF4_8]));
@@ -144,13 +144,13 @@ void func_80387FD4(Actor *this){
if (this->unkF4_8 == 1) {
func_8028F94C(2, this->position);
func_80311480(0xC86, 0xE, this->position, this->marker, func_80387E68, NULL);
func_80328B8C(this, 6, 0.79f, 1);
subaddie_set_state_with_direction(this, 6, 0.79f, 1);
} else {
timed_playSfx(0.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //0.4f
timed_playSfx(1.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //1.4f
func_80324CFC(0.4f, COMUSIC_43_ENTER_LEVEL_GLITTER, 22000);
func_80324D2C(4.5f, COMUSIC_43_ENTER_LEVEL_GLITTER);
func_80328B8C(this, 5, 0.79f, 1);
subaddie_set_state_with_direction(this, 5, 0.79f, 1);
if (this->unkF4_8 == 5) {
timedFunc_set_1(0.9f, (GenFunction_1) func_80387E40, (s32) this->marker);
} else {
@@ -172,7 +172,7 @@ void func_80387FD4(Actor *this){
case 1:// L80388370
this->unk60 += time_getDelta();
if(0.7 <= this->unk60){
func_80328B8C(this, 2, 0.0f, 1);
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
func_80387C90(this);
this->unk60 = 0.0f;
func_80324D54(0.1f, SFX_D0_GRIMLET_SQUEAK, 1.0f, 0x7530, this->position, 0.0f, 1800.0f);
@@ -181,14 +181,14 @@ void func_80387FD4(Actor *this){
case 2:// L80388400
if(actor_animationIsAt(this, 0.62f)){
func_80328B8C(this, 3, 0.62f, 1);
subaddie_set_state_with_direction(this, 3, 0.62f, 1);
}
break;
case 3:// L80388434
this->unk60 += time_getDelta();
if( this->unk60 >= 0.13 + 0.7/4 * (5 - this->unkF4_8)){
func_80328B8C(this, 4, 0.62f, 1);
subaddie_set_state_with_direction(this, 4, 0.62f, 1);
func_80387C90(this);
this->unk60 = 0.0f;
func_80324D54(0.3f, 0x406, 1.0f, 0x55f0, this->position, 0.0f, 1800.0f);
@@ -197,7 +197,7 @@ void func_80387FD4(Actor *this){
case 4:// L8038850C
if(actor_animationIsAt(this, 0.0f)){
func_80328B8C(this, 1, 0.0f, 1);
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
}
break;

2
src/BGS/ch/flibbit.c
View File

@@ -266,7 +266,7 @@ void func_80386EB0(ActorMarker *this, ActorMarker *other){
Actor *chflibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this;
ActorLocal_Flibbit *local;
s32 temp_a0;
BoneTransformList *temp_a0;
int i;
f32 sp7C[3];
f32 phi_f2;

2
src/BGS/ch/frogminigame.c
View File

@@ -22,7 +22,7 @@ u8 D_80391240[4];
/* .code */
static void __chFrogMinigame_spawnJiggy(void){
static f32 D_80390AD4[3] = {1985.0f, 200.0f, -1386.0f};
jiggySpawn(JIGGY_24_BGS_FLIBBITS, D_80390AD4);
jiggy_spawn(JIGGY_24_BGS_FLIBBITS, D_80390AD4);
}
static void __chFrogMinigame_textCallback(ActorMarker *marker, enum asset_e text_id, s32 arg2){

8
src/BGS/ch/leafboat.c
View File

@@ -93,7 +93,7 @@ void func_8038FD9C(Actor *this){
this->unk1C[0] = 1.0f;
this->alpha_124_19 = 0xff;
if(this->unk54 != 0.0f){
func_80328A84(this, 2);
subaddie_set_state(this, 2);
}
break;
@@ -104,7 +104,7 @@ void func_8038FD9C(Actor *this){
this->marker->propPtr->unk8_3 = 1;
this->unk1C[0] = 1.0f;
if(15.0f <= this->velocity_x){
func_80328A84(this, 3);
subaddie_set_state(this, 3);
this->velocity_x = 0.0f;
}
else{
@@ -124,7 +124,7 @@ void func_8038FD9C(Actor *this){
this->unk1C[0] = 0.0f;
this->alpha_124_19 = 0;
if (this->unk54 == 0.0f) {
func_80328A84(this, 4);
subaddie_set_state(this, 4);
}
break;
@@ -132,7 +132,7 @@ void func_8038FD9C(Actor *this){
this->marker->propPtr->unk8_3 = 1;
this->unk1C[0] = 1.0f;
if (this->velocity[0] >= 15.0f) {
func_80328A84(this, 1);
subaddie_set_state(this, 1);
this->velocity[0] = 0.0f;
} else {
if(tmp[5-(((s32)this->velocity_x)%6)]) {

6
src/BGS/ch/mudhut.c
View File

@@ -9,7 +9,7 @@ extern f32 player_stateTimer_get(enum state_timer_e);
void func_802C4218(u32,f32,f32,f32);
void func_80328A84(Actor *, u32);
void subaddie_set_state(Actor *, u32);
/* local declarations */
Actor *chmudhut_draw(ActorMarker *this, Gfx** gdl, Mtx** mtx, Vtx **vtx);
@@ -97,7 +97,7 @@ void chmudhut_update(Actor *this){
diffPos[1] += 130.0;
FUNC_8030E8B4(SFX_5B_HEAVY_STUFF_FALLING, 1.0f, 28000, this->position, 0x12C, 0xBB8);
func_80328A84(this, 2);
subaddie_set_state(this, 2);
this->marker->propPtr->unk8_3 = 0;
actor_playAnimationOnce(this);
if(tmp == 5){
@@ -111,7 +111,7 @@ void chmudhut_update(Actor *this){
reinterpret_cast(s32, diffPos[2])
);
} else {
jiggySpawn(JIGGY_23_BGS_HUTS, diffPos);
jiggy_spawn(JIGGY_23_BGS_HUTS, diffPos);
}
}
break;

6
src/BGS/ch/pinkegg.c
View File

@@ -85,14 +85,14 @@ void chpinkegg_collision(ActorMarker *this, ActorMarker *other_marker){
thisActor = marker_getActor(this);
this->propPtr->unk8_3 = 0;
func_8030E510(SFX_AA_BGS_EGG_BREAKING_1, 28000);
func_80328A84(thisActor, 3);
subaddie_set_state(thisActor, 3);
actor_playAnimationOnce(thisActor);
this->collidable = 0;
thisActor->unk124_6 = 0;
if(D_803906C4[(tmp = (ActorLocal_PinkEgg *) &thisActor->local)->unk0] != 0){
__spawnQueue_add_2(chpinkegg_spawn_next, thisActor->marker, tmp->unk0);
} else {
jiggySpawn(JIGGY_21_BGS_PINKEGG, thisActor->position);
jiggy_spawn(JIGGY_21_BGS_PINKEGG, thisActor->position);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
}
}
@@ -108,7 +108,7 @@ void chpinkegg_update(Actor *this){
case 1:
if(!((ActorLocal_PinkEgg *) &this->local)->unk4){
this->marker->collidable = 1;
func_80328A84(this,2);
subaddie_set_state(this,2);
}else{
((ActorLocal_PinkEgg *) &this->local)->unk4--;

10
src/BGS/ch/tanktup.c
View File

@@ -47,7 +47,7 @@ void func_8038F470(ActorMarker *this, s32 arg1, enum chtanktup_leg_e leg_id){
sp18[1] += 50.0f;
leg = func_8032813C(leg_id + ACTOR_E9_TANKTUP_LEG_FL, sp18, (s32)thisActor->yaw);
func_80328B8C(leg, arg1 + 1, 0, -1);
subaddie_set_state_with_direction(leg, arg1 + 1, 0, -1);
leg->unk10_12 = leg_id;
}
@@ -148,7 +148,7 @@ void func_8038F6A4(Actor *this)
}
if (local->unk10)
{
func_80328B8C(this, 2, 0.0f, -1);
subaddie_set_state_with_direction(this, 2, 0.0f, -1);
local->unk10 = 0;
sp44 = 0;
if(&sp44);
@@ -182,11 +182,11 @@ void func_8038F6A4(Actor *this)
{
if (!local->unk14)
{
func_80328B8C(this, 1, 0.0f, -1);
subaddie_set_state_with_direction(this, 1, 0.0f, -1);
}
else
{
func_80328B8C(this, 3, 0.0f, -1);
subaddie_set_state_with_direction(this, 3, 0.0f, -1);
actor_playAnimationOnce(this);
}
}
@@ -207,7 +207,7 @@ void func_8038F6A4(Actor *this)
func_8034A174(this->marker->unk44, 6, sp34);
func_802C8F70(this->yaw);
sp34[1] -= 125.0f;
jiggySpawn(JIGGY_26_BGS_TANKTUP, sp34);
jiggy_spawn(JIGGY_26_BGS_TANKTUP, sp34);
}
if (actor_animationIsAt(this, 0.9f) != 0)
{

2
src/BGS/ch/yellowflibbit.c
View File

@@ -297,7 +297,7 @@ Actor *func_8038DE5C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
s32 var_s0;
f32 var_f2;
f32 sp7C[3];
s32 temp_a0_2;
BoneTransformList *temp_a0_2;
this = marker_getActor(marker);
local = (ActorLocal_Yellow_Flibbit *)&this->local;

2
src/BGS/code_3030.c
View File

@@ -43,7 +43,7 @@ void func_80389488(Actor *this, s32 next_state) {
if (next_state == 3) {
func_8030E6A4(SFX_86_TIPTUP_CHORUS_AH, local->unk8, 0x7FFF);
skeletalAnim_set(this->unk148, ASSET_12F_ANIM_CHOIR_TURTLE_HURT, 0.1f, 1.75f);
skeletalAnim_setCallback_1(this->unk148, 0.9f, func_80389420, this->marker);
skeletalAnim_setCallback_1(this->unk148, 0.9f, (GenFunction_1)func_80389420, (s32)this->marker);
if (local->tiptup_marker != NULL) {
func_80388E94(local->tiptup_marker, local->unk0);
}

4
src/BGS/code_3420.c
View File

@@ -74,7 +74,7 @@ void BGS_func_80389850(Actor *this, s32 arg1) {
sp94[1] = vile->position[1] + sp7C[1];
sp94[2] = vile->position[2] + sp7C[2];
func_802C8F70(vile->yaw);
jiggySpawn(JIGGY_28_BGS_MR_VILE, sp94);
jiggy_spawn(JIGGY_28_BGS_MR_VILE, sp94);
} else {
sp7C[0] = 0.0f - vile->position[0];
sp7C[1] = 0.0f;
@@ -85,7 +85,7 @@ void BGS_func_80389850(Actor *this, s32 arg1) {
sp94[1] = vile->position[1] + sp7C[1];
sp94[2] = vile->position[2] + sp7C[2];
func_802C8F70(func_8025715C(sp7C[0], sp7C[2]));
jiggySpawn(JIGGY_28_BGS_MR_VILE, sp94);
jiggy_spawn(JIGGY_28_BGS_MR_VILE, sp94);
}
}
for(var_s0 = 2; var_s0 != 0x3C; var_s0++){

59
src/BGS/code_8DF0.c
View File

@@ -2,6 +2,7 @@
#include "functions.h"
#include "variables.h"
#include "prop.h"
#include "actor.h"
extern ActorInfo D_80390804;
extern ActorInfo D_80390690;
@@ -34,35 +35,35 @@ extern ActorInfo D_80390BD8;
extern ActorInfo D_80390BFC;
void BGS_func_8038F1E0(void){//bgs_updateSpawnableActors
spawnableActorList_add(&D_80390804, actor_new, 0x00000088);//croctus
spawnableActorList_add(&D_80390690, actor_new, 0x020108A1); //flibbit
spawnableActorList_add(&D_803906F8, actor_new, 0x400); //pink_egg_largest
spawnableActorList_add(&D_8039071C, actor_new, 0x400); //pink_egg_large
spawnableActorList_add(&D_80390740, actor_new, 0x400); //pink_egg_medium
spawnableActorList_add(&D_80390764, actor_new, 0x400); //pink_egg_small
spawnableActorList_add(&D_80390788, actor_new, 0x400); //pink_egg_smallest
spawnableActorList_add(&D_80390B68, actor_new, 0); //mudhut_top
spawnableActorList_add(&D_80390C40, actor_new, 0x4000548);//tanktup
spawnableActorList_add(&D_80390C88, actor_new, 0x400042c);//tanktup_leg
spawnableActorList_add(&D_80390CC8, actor_new, 0x400042c);//tanktup_leg
spawnableActorList_add(&D_80390D08, actor_new, 0x400042c);//tanktup_leg
spawnableActorList_add(&D_80390D48, actor_new, 0x400042c);//tanktup_leg
spawnableActorList_add(&chFrogMinigame, actor_new, 0x81);
spawnableActorList_add(&BGS_D_80390AE0, actor_new, 0x20108a1); //yellow_flibbit
spawnableActorList_add(&D_80390960, actor_new, 0);
spawnableActorList_add(&D_80390A40, actor_new, 0x880); //yumblie
spawnableActorList_add(&D_80390A70, actor_new, 0x9a2); //mr. vile
spawnableActorList_add(&D_80390830, actor_new, 0x888); //tiptup
spawnableActorList_add(&D_80390880, actor_new, 0x9a8); //tiptup_chiorMember
spawnableActorList_add(&D_803908A4, actor_new, 0x9a8); //tiptup_chiorMember
spawnableActorList_add(&D_803908C8, actor_new, 0x9a8); //tiptup_chiorMember
spawnableActorList_add(&D_803908EC, actor_new, 0x9a8); //tiptup_chiorMember
spawnableActorList_add(&D_80390910, actor_new, 0x9a8); //tiptup_chiorMember
spawnableActorList_add(&D_80390934, actor_new, 0x9a8); //tiptup_chiorMember
spawnableActorList_add(&D_80390DA8, actor_new, 0x4000); //leafboat
spawnableActorList_add(&D_80390D70, actor_new, 0x580); //bigAlligator
spawnableActorList_add(&D_80390BD8, actor_new, 8); //green_jiggy_switch
spawnableActorList_add(&D_80390BFC, actor_new, 8); //green_jiggy_switch
spawnableActorList_add(&D_80390804, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);//croctus
spawnableActorList_add(&D_80390690, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_0); //flibbit
spawnableActorList_add(&D_803906F8, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_largest
spawnableActorList_add(&D_8039071C, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_large
spawnableActorList_add(&D_80390740, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_medium
spawnableActorList_add(&D_80390764, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_small
spawnableActorList_add(&D_80390788, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_smallest
spawnableActorList_add(&D_80390B68, actor_new, ACTOR_FLAG_NONE); //mudhut_top
spawnableActorList_add(&D_80390C40, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_3);//tanktup
spawnableActorList_add(&D_80390C88, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&D_80390CC8, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&D_80390D08, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&D_80390D48, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&chFrogMinigame, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_0);
spawnableActorList_add(&BGS_D_80390AE0, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_0); //yellow_flibbit
spawnableActorList_add(&D_80390960, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_80390A40, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7); //yumblie
spawnableActorList_add(&D_80390A70, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_1); //mr. vile
spawnableActorList_add(&D_80390830, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup
spawnableActorList_add(&D_80390880, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&D_803908A4, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&D_803908C8, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&D_803908EC, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&D_80390910, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&D_80390934, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&D_80390DA8, actor_new, ACTOR_FLAG_UNKNOWN_14); //leafboat
spawnableActorList_add(&D_80390D70, actor_new, ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7); //bigAlligator
spawnableActorList_add(&D_80390BD8, actor_new, ACTOR_FLAG_UNKNOWN_3); //green_jiggy_switch
spawnableActorList_add(&D_80390BFC, actor_new, ACTOR_FLAG_UNKNOWN_3); //green_jiggy_switch
}

2
src/BGS/code_9750.c
View File

@@ -62,7 +62,7 @@ void func_8038FB40(ActorMarker *this, s32 arg1){
Actor * thisActor;
thisActor = marker_getActor(this);
func_80328A84(thisActor, 2);
subaddie_set_state(thisActor, 2);
actor_playAnimationOnce(thisActor);
FUNC_8030E624(SFX_A_BANJO_LANDING_05, 0.8f, 32750);
}

2
src/CC/ch/tooth.c
View File

@@ -84,7 +84,7 @@ extern void chTooth_update(Actor * this){
player_getPosition(sp24);
if(sp24[0] < 0.0f && 5400.0f < sp24[2]){
func_80333334(local->unk0->jiggy_id);
jiggySpawn(local->unk0->jiggy_id, local->unk0->jiggy_position);
jiggy_spawn(local->unk0->jiggy_id, local->unk0->jiggy_position);
}
else{//L8038774C
sp24[0] = local->unk0->jiggy_position[0];

4
src/CC/code_13C0.c
View File

@@ -149,7 +149,7 @@ void func_80387CC0(void){
if(getGameMode() == GAME_MODE_7_ATTRACT_DEMO)
return;
viewport_getRotation(sp1C);
viewport_get_rotation_vec3f(sp1C);
tmp_v0 = func_8023DB4C(0x7F);
if(tmp_v0 >= 0x40){
tmp_v0 = 0x7F - tmp_v0;
@@ -158,7 +158,7 @@ void func_80387CC0(void){
if(360.0f <= sp1C[2]){
sp1C[2] -= 360.0f;
}
viewport_setRotation(sp1C);
viewport_set_rotation_vec3f(sp1C);
}

43
src/CC/code_19B0.c
View File

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "actor.h"
extern ActorInfo D_80389AA0;
extern ActorInfo D_80389AD0;
@@ -27,25 +28,25 @@ extern ActorInfo D_80389E8C;
/* .code */
void CC_func_80387DA0(void)
{
spawnableActorList_add(&D_80389AA0, actor_new, 0X4080);
spawnableActorList_add(&D_80389E44, actor_new, 0X10080);
spawnableActorList_add(&D_80389E68, actor_new, 0X10080);
spawnableActorList_add(&D_80389E8C, actor_new, 0X10080);
spawnableActorList_add(&D_80389AD0, actor_new, 0X80);
spawnableActorList_add(&D_80389B00, actor_new, 0X80);
spawnableActorList_add(&D_80389B24, actor_new, 0X80);
spawnableActorList_add(&D_80389B90, actor_new, 0X80);
spawnableActorList_add(&D_80389BB4, actor_new, 0X80);
spawnableActorList_add(&D_80389C90, actor_new, 0X2488);
spawnableActorList_add(&D_80389CB4, actor_new, 0X2488);
spawnableActorList_add(&D_80389CD8, actor_new, 0X2488);
spawnableActorList_add(&D_80389CFC, actor_new, 0X2488);
spawnableActorList_add(&D_80389D20, actor_new, 0X2488);
spawnableActorList_add(&D_80389D44, actor_new, 0X2488);
spawnableActorList_add(&D_80389D68, actor_new, 0X2488);
spawnableActorList_add(&D_80389D8C, actor_new, 0X2488);
spawnableActorList_add(&D_80389DB0, actor_new, 0X2488);
spawnableActorList_add(&D_80389DD4, actor_new, 0X2488);
spawnableActorList_add(&D_80389DF8, actor_new, 0X2488);
spawnableActorList_add(&D_80389E1C, actor_new, 0X2488);
spawnableActorList_add(&D_80389AA0, actor_new, ACTOR_FLAG_UNKNOWN_14 | ACTOR_FLAG_UNKNOWN_7 );
spawnableActorList_add(&D_80389E44, actor_new, ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_7 );
spawnableActorList_add(&D_80389E68, actor_new, ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_7 );
spawnableActorList_add(&D_80389E8C, actor_new, ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_7 );
spawnableActorList_add(&D_80389AD0, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_80389B00, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_80389B24, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_80389B90, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_80389BB4, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_80389C90, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389CB4, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389CD8, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389CFC, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389D20, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389D44, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389D68, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389D8C, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389DB0, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389DD4, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389DF8, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_80389E1C, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
}

6
src/CC/code_1F70.c
View File

@@ -18,7 +18,7 @@ extern int func_80340020(s32, f32[3], s32, f32, s32, BKVertexList *, f32[3], f32
extern void boneTransformList_getBoneScale(s32, s32, f32[3]);
extern void boneTransformList_setBoneScale(s32, s32, f32[3]);
extern void func_8033A9A8(s32, s32, f32[3]);
extern void viewport_getPosition(f32[3]);
extern void viewport_get_position_vec3f(f32[3]);
extern void ml_vec3f_normalize(f32[3]);
extern void func_8033A45C(s32, s32);
extern void modelRender_setBoneTransformList(s32);
@@ -110,7 +110,7 @@ void func_80388518(s32 arg0){
}
void func_80388664(void) {
jiggySpawn(JIGGY_17_CC_CLANKER_RAISED, D_80389C00);
jiggy_spawn(JIGGY_17_CC_CLANKER_RAISED, D_80389C00);
}
void CC_func_8038868C(void) {
@@ -146,7 +146,7 @@ void CC_func_80388760(Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(D_80389FA0.unk21 == 0)
return;
viewport_getPosition(sp98);
viewport_get_position_vec3f(sp98);
if(sp98[0] < -2600.0f || 11600.0f < sp98[0])
return;

35
src/CCW/code_8050.c → src/CCW/ch/grublinhood.c
View File

@@ -36,11 +36,11 @@ typedef struct {
f32 unk3C;
} ActorLocal_CCW_8050;
void func_8038E964(Actor *this);
Actor *func_8038E56C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void chgrublinhood_update(Actor *this);
Actor *chgrublinhood_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorAnimationInfo D_8038F930[] = {
ActorAnimationInfo chGrublinHood_animations[] = {
{0x000, 0.0f},
{0x243, 4.0f},
{0x243, 0.7f},
@@ -54,15 +54,15 @@ ActorAnimationInfo D_8038F930[] = {
{0x243, 1e+06f}
};
ActorInfo D_8038F988 = {
ActorInfo chGrublinHood = {
MARKER_1E2_GRUBLIN_HOOD, ACTOR_375_GRUBLIN_HOOD, ASSET_52C_MODEL_GRUBLIN_HOOD,
0x1, D_8038F930,
func_8038E964, func_80326224, func_8038E56C,
0x1, chGrublinHood_animations,
chgrublinhood_update, func_80326224, chgrublinhood_draw,
2500, 0, 1.0f, 0
};
/* .code */
void func_8038E440(ParticleEmitter *pCtrl, Actor *actor, enum asset_e model_id){
void __chgrublinhood_emitHat(ParticleEmitter *pCtrl, Actor *actor, enum asset_e model_id){
static struct43s D_8038F9AC = {
{{-200.0f, 200.0f, -200.0f}, {200.0f, 400.0f, 200.0f}},
{{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}},
@@ -78,21 +78,21 @@ void func_8038E440(ParticleEmitter *pCtrl, Actor *actor, enum asset_e model_id){
particleEmitter_emitN(pCtrl, 1);
}
void func_8038E4C0(ActorMarker* marker, s32 arg1) {
void __chgrublinhood_die(ActorMarker* marker, s32 arg1) {
Actor* actor = marker_getActor(marker);
ParticleEmitter *pCtrl;
func_80328B8C(actor, 5, 0.0f, 1);
subaddie_set_state_with_direction(actor, 5, 0.0f, 1);
actor_playAnimationOnce(actor);
FUNC_8030E8B4(SFX_C2_GRUBLIN_EGH, 1.0f, 32000, actor->position, 1250, 2500);
pCtrl = partEmitMgr_newEmitter(1);
func_8038E440(pCtrl, actor, ASSET_52D_MODEL_GRUBLIN_HOOD_HAT);
__chgrublinhood_emitHat(pCtrl, actor, ASSET_52D_MODEL_GRUBLIN_HOOD_HAT);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32,actor->position_x), reinterpret_cast(s32,actor->position_y), reinterpret_cast(s32,actor->position_z));
actor_collisionOff(actor);
actor->unk138_24 = 1;
}
Actor *func_8038E56C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *chgrublinhood_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this;
ActorLocal_CCW_8050 *local;
@@ -113,10 +113,9 @@ Actor *func_8038E56C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
return actor_draw(marker, gfx, mtx, vtx);
}
void func_8038E868(Actor *this){
void __chgrublinhood_initialize(Actor *this){
ActorLocal_CCW_8050 *local = (ActorLocal_CCW_8050 *)&this->local;
local->unk8 = 6;
local->unk9 = 0xC;
local->unkA = 0x10;
@@ -126,14 +125,14 @@ void func_8038E868(Actor *this){
local->unk12 = 25000;
local->unkC_28 = 1;
local->unk30 = func_802DB548;
local->unk34 = func_8038E4C0;
local->unk34 = __chgrublinhood_die;
local->unk0 = 5.0f;
local->unk4 = 8.0f;
local->unk14 = 1.0f;
local->unk3C = 1.5f;
}
enum ccw_season_e func_8038E8FC(Actor *this){
enum ccw_season_e __get_current_season(Actor *this){
switch(map_get()){
case MAP_43_CCW_SPRING: //// 8038E930
case MAP_4A_CCW_SPRING_MUMBOS_SKULL:// 8038E930
@@ -171,15 +170,15 @@ enum ccw_season_e func_8038E8FC(Actor *this){
}
}
void func_8038E964(Actor *this) {
void chgrublinhood_update(Actor *this) {
ActorLocal_CCW_8050 *local;
f32 temp_a0;
local = (ActorLocal_CCW_8050 *)&this->local;
if (!this->unk16C_4) {
func_8038E868(this);
local->season = func_8038E8FC(this);
__chgrublinhood_initialize(this);
local->season = __get_current_season(this);
}
if(local->season < 4){

43
src/CCW/ch/vacationtexttrigger.c Normal file
View File

@@ -0,0 +1,43 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "math.h" // for SQ()
void chVacationTextTrigger_update(Actor* this);
/* .data */
ActorInfo gChVacationTextTrigger = {
MARKER_1E3_VACATION_TEXT_TRIGGER, ACTOR_374_VACATION_TEXT_TRIGGER, 0x0,
0x0, NULL,
chVacationTextTrigger_update, func_80326224, func_80325340,
0, 0, 0.0f, 0
};
/* .code */
/**
* @brief Returns if player is within a specified horizontal radius of the
* supplied x,z positions.
*/
static bool __playerIsWithinTrigger(s32 x, s32 z, s32 distance) {
s32 player_position[3];
player_getPosition_s32(player_position);
return (SQ(x - player_position[0]) + SQ(z - player_position[2])) < SQ(distance);
}
void chVacationTextTrigger_update(Actor* this) {
// Despawn if already triggered
if (func_803203FC(UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT)) {
marker_despawn(this->marker);
return;
}
// Start dialog if player is within trigger
if (__playerIsWithinTrigger(0, -107, 188) != 0) {
func_80311480(0xDA9, 4, NULL, NULL, NULL, NULL);
func_803204E4(UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT, 1);
}
}

4
src/CCW/code_14B0.c
View File

@@ -114,8 +114,8 @@ void CCW_func_80387A40(Actor *this) {
if(this->position[0]);
func_8030DBFC(local->unk0, 0.8f, 0.9f, 0.05f);
func_8030DEB4(local->unk0, 500.0f, 1500.0f);
func_8030DF68(local->unk0, this->position);
sfxsource_set_fade_distances(local->unk0, 500.0f, 1500.0f);
sfxsource_set_position(local->unk0, this->position);
func_8030E2C4(local->unk0);
sfxsource_setSampleRate(local->unk0, 2000.0f + 8000.0f*(gu_sqrtf(local->unk18[0]*local->unk18[0] + local->unk18[1]*local->unk18[1] + local->unk18[2]*local->unk18[2])/ local->unk8));
if (!mapSpecificFlags_get(local->unk4->unk2)) {

2
src/CCW/code_160.c
View File

@@ -162,7 +162,7 @@ void func_8038687C(Actor *this) {
if (local->unk0 != NULL) {
other = marker_getActor(local->unk0);
viewport_getPosition(sp78);
viewport_get_position_vec3f(sp78);
sp6C[0] = this->position[0] - sp78[0];
sp6C[1] = this->position[1] - sp78[1];
sp6C[2] = this->position[2] - sp78[2];

2
src/CCW/code_1B20.c
View File

@@ -33,7 +33,7 @@ f32 D_8038EC94[3] = {200.0f, 2120.0f, -5570.0f};
/* .code */
void func_80387F10() {
jiggySpawn(JIGGY_4D_CCW_FLOWER, D_8038EC94);
jiggy_spawn(JIGGY_4D_CCW_FLOWER, D_8038EC94);
}
void func_80387F38(ActorMarker* marker, s32 arg1) {

10
src/CCW/code_2B00.c
View File

@@ -70,7 +70,7 @@ void func_80388F50(ActorMarker *marker, ActorMarker *other_marker){
if ((func_8028ECAC() != 1) && !this->unk38_0) {
this->unk38_0 = TRUE;
actor_collisionOff(this);
func_80328B8C(this, 4, 0.0f, 1);
subaddie_set_state_with_direction(this, 4, 0.0f, 1);
actor_playAnimationOnce(this);
func_8030E6D4(SFX_90_SWITCH_PRESS);
}
@@ -87,7 +87,7 @@ void func_80388FD4(Actor *this) {
if (!this->unk16C_4) {
if (fileProgressFlag_get(this->unk10_12 + FILEPROG_8B_CCW_SPRING_OPEN)) {
actor_playAnimationOnce(this);
func_80328B8C(this, 4, 0.999f, 1);
subaddie_set_state_with_direction(this, 4, 0.999f, 1);
actor_collisionOff(this);
} else {
marker_setCollisionScripts(this->marker, 0, &func_80388F50, 0);
@@ -143,7 +143,7 @@ void func_80389268(Actor *this) {
this->unk16C_4 = TRUE;
if (fileProgressFlag_get(this->unk10_12 + FILEPROG_8B_CCW_SPRING_OPEN)) {
func_80328A84(this, 3);
subaddie_set_state(this, 3);
}
}
@@ -153,14 +153,14 @@ void func_80389268(Actor *this) {
if (levelSpecificFlags_get(this->unk10_12 + 7)) {
timedFunc_set_1(0.05f, func_803891B0, (s32) this->marker);
timedFunc_set_1(4.0f, func_8038921C, (s32) this->marker);
func_80328A84(this, 2);
subaddie_set_state(this, 2);
}
break;
case 2:
this->position[1] += 60.0f * time_getDelta();
if (this->unk1C[1] <= this->position[1]) {
levelSpecificFlags_set(this->unk10_12 + 7, FALSE);
func_80328A84(this, 3);
subaddie_set_state(this, 3);
}
break;
case 3:

2
src/CCW/code_4960.c
View File

@@ -95,7 +95,7 @@ void func_8038AEBC(Actor *this) {
func_80326224(this);
skeletalAnim_getProgressRange(this->unk148, &sp30, &sp2C);
if ((sp30 <= 0.5) && (sp2C >= 0.5)) {
jiggySpawn(JIGGY_49_CCW_EYRIE, this->position);
jiggy_spawn(JIGGY_49_CCW_EYRIE, this->position);
}
if (skeletalAnim_getLoopCount(this->unk148) > 0) {
func_8038AD50(this, 2);

2
src/CCW/code_5540.c
View File

@@ -56,7 +56,7 @@ void chnabnut_setState(Actor *this, s32 next_state) {
skeletalAnim_set(this->unk148, ASSET_22E_ANIM_NABNUT_STAND, 0.2f, 3.53f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_1_LOOP);
func_802C8F70(this->yaw - 40.0f);
jiggySpawn(JIGGY_4A_CCW_NABNUT, this->position);
jiggy_spawn(JIGGY_4A_CCW_NABNUT, this->position);
}
if (next_state == NABNUT_STATE_5_EXIT) {

8
src/CCW/code_76C0.c
View File

@@ -51,8 +51,8 @@ extern ActorInfo D_8038F720;
extern ActorInfo D_8038F744;
extern ActorInfo D_8038F768;
extern ActorInfo D_8038F78C;
extern ActorInfo D_8038F988;
extern ActorInfo D_8038FA00;
extern ActorInfo chGrublinHood;
extern ActorInfo gChVacationTextTrigger;
extern ActorInfo D_8038F7D4;
extern ActorInfo D_8038F7B0;
extern ActorInfo D_8038F888;
@@ -143,8 +143,8 @@ void CCW_func_8038DB6C(void)
spawnableActorList_add(&D_8038F744, actor_new, 0);
spawnableActorList_add(&D_8038F768, actor_new, 0);
spawnableActorList_add(&D_8038F78C, actor_new, 0);
spawnableActorList_add(&D_8038F988, actor_new, 0X2010121);
spawnableActorList_add(&D_8038FA00, actor_new, 0);
spawnableActorList_add(&chGrublinHood, actor_new, 0X2010121);
spawnableActorList_add(&gChVacationTextTrigger, actor_new, 0);
spawnableActorList_add(&D_8038F7D4, actor_new, 0X400);
spawnableActorList_add(&D_8038F7B0, actor_new, 0X400);
spawnableActorList_add(&D_8038F888, actor_new, 0X80);

4
src/CCW/code_7BF0.c
View File

@@ -21,12 +21,12 @@ ActorInfo D_8038F908 = {
/* .code */
void func_8038DFE0(Actor* actor) {
func_80328B8C(actor, 1, 0.001f, 1);
subaddie_set_state_with_direction(actor, 1, 0.001f, 1);
actor->unk38_31 = randi2(0, 0);
}
void CCW_func_8038E034(Actor* actor) {
func_80328B8C(actor, 2, 0.001f, 1);
subaddie_set_state_with_direction(actor, 2, 0.001f, 1);
}
void func_8038E060(s32 arg0, ActorMarker *marker){

31
src/CCW/code_8670.c
View File

@@ -1,31 +0,0 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
void func_8038EAD4(Actor *this);
/* .data */
ActorInfo D_8038FA00 = { 0x1E3, 0x374, 0x0, 0x0, NULL, func_8038EAD4, func_80326224, func_80325340, 0, 0, 0.0f, 0};
/* .code */
bool func_8038EA60(s32 arg0, s32 arg1, s32 arg2) {
s32 sp24;
s32 temp_a0;
s32 sp1C;
s32 temp_v1;
player_getPosition_s32(&sp1C);
temp_v1 = arg1 - sp24;
temp_a0 = arg0 - sp1C;
return ((temp_v1 * temp_v1) + (temp_a0 * temp_a0)) < (arg2 * arg2);
}
void func_8038EAD4(Actor* this) {
if (func_803203FC(0x13)) {
marker_despawn(this->marker);
return;
}
if (func_8038EA60(0, -0x6B, 0xBC) != 0) {
func_80311480(0xDA9, 4, NULL, NULL, NULL, NULL);
func_803204E4(0x13, 1);
}
}

4
src/CCW/code_950.c
View File

@@ -208,8 +208,8 @@ void chwasp_update(Actor *this) {
} else {
func_8030DBFC(local->unk0, 0.8f, 0.9f, 0.05f);
}
func_8030DEB4(local->unk0, 500.0f, 1500.0f);
func_8030DF68(local->unk0, this->position);
sfxsource_set_fade_distances(local->unk0, 500.0f, 1500.0f);
sfxsource_set_position(local->unk0, this->position);
func_8030E2C4(local->unk0);
sfxsource_setSampleRate(local->unk0, (s32) ((local->unk18 / local->unk14) * 10000.0f));
}

1
src/FP/bss_end_pad.c
View File

@@ -1 +0,0 @@
char pad_FP_803935A8[0x20];

2
src/FP/bss_pad.c
View File

@@ -1 +1 @@
char pad_FP_80392F10[0x10];
char pad_FP_80392F10[0x10];

8
src/FP/ch/bearcub.c
View File

@@ -51,7 +51,7 @@ void func_8038A1F0(Actor **this_ptr, enum marker_e carried_obj_marker_id, enum a
func_8028F31C((*this_ptr)->position, 600.0f, actor_id, this_ptr);
if(!func_80329530(*this_ptr, 400)) return;
if(carriedObj_getMarkerId() != carried_obj_marker_id) return;
if(bacarry_get_markerId() != carried_obj_marker_id) return;
if(!func_8028FC34()) return;
func_8028FA34(arg3, *this_ptr);
@@ -72,7 +72,7 @@ void func_8038A274(Actor *this){
void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){
if(text_id == 0xc19){
func_802BAFE4(0x25);
jiggySpawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74);
jiggy_spawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
func_8025A6EC(COMUSIC_5B_FP_IGLOO_HAPPY, 25000);
func_8025A58C(0, 4000);
@@ -111,7 +111,7 @@ void func_8038A384(Actor *this){
if( jiggyscore_isCollected(JIGGY_2E_FP_PRESENTS)
|| func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)
){
func_80328B8C(this, 2, randf2(0.0f, 0.9f), 1);
subaddie_set_state_with_direction(this, 2, randf2(0.0f, 0.9f), 1);
}
}//L8038A4E4
@@ -153,7 +153,7 @@ void func_8038A384(Actor *this){
break;
}
if(levelSpecificFlags_get(D_80391E80[sp3C].unk0)){
func_80328B8C(this, 2, 0.001f, 1);
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
if(sp38 == 0xc19){
func_80311480(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL);
}

10
src/FP/ch/boggy1.c
View File

@@ -47,14 +47,14 @@ Actor *func_803875E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_803876A4(Actor *this){
func_80328B8C(this, 2, 0.0001f, 1);
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
actor_playAnimationOnce(this);
FUNC_8030E8B4(SFX_8E_GRUNTLING_DAMAGE, 1.0f, 32000, this->position, 1250, 2500);
}
void func_803876F8(Actor *this){
this->marker->propPtr->unk8_3 = FALSE;
func_80328B8C(this, 5, 0.0001f, 1);
subaddie_set_state_with_direction(this, 5, 0.0001f, 1);
this->unk48 = 0.0f;
func_80343DEC(this);
}
@@ -73,10 +73,10 @@ void func_803877A8(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if(arg2 == 1){
jiggySpawn(JIGGY_2A_FP_BOGGY_1, this->velocity);
jiggy_spawn(JIGGY_2A_FP_BOGGY_1, this->velocity);
}
else if(arg2 == 2){
func_80328B8C(this, 4, 0.0001f, 1);
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
actor_loopAnimation(this);
actor_collisionOff(this);
}
@@ -178,7 +178,7 @@ void func_8038794C(Actor *this){
}//L80387CF4
if(actor_animationIsAt(this, 0.9999f)){
func_80328B8C(this, 3, 0.0001f, 1);
subaddie_set_state_with_direction(this, 3, 0.0001f, 1);
actor_loopAnimation(this);
}
break;

37
src/FP/ch/boggy2.c
View File

@@ -3,7 +3,8 @@
#include "variables.h"
extern void func_8028E668(f32[3], f32, f32, f32);
extern Actor *func_80328230(enum actor_e id, f32 pos[3], f32 rot[3]);
extern NodeProp *cubeList_findNodePropByActorId(enum actor_e, s32[3]);
extern f32 func_8038BE20(f32 arg0[3]);
typedef struct {
@@ -90,7 +91,7 @@ Actor *func_80388740(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void FP_func_803888E4(Actor *this){
static f32 D_80391D0C[3] = {1842.0f, 658.0f, 5758.0f};
static f32 D_80391D18[3] = {1463.0f, 635.0f, 5193.0f};
func_80328B8C(this, 0xC, 0.0001f, 1);
subaddie_set_state_with_direction(this, 0xC, 0.0001f, 1);
if(!jiggyscore_isSpawned(JIGGY_30_FP_BOGGY_2)){
if(mapSpecificFlags_get(5)){
func_80324DBC(0.1f, 0xc06, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
@@ -115,7 +116,7 @@ void FP_func_803888E4(Actor *this){
void func_80388A50(Actor *this){
ActorLocal_FP_2350 *local = (ActorLocal_FP_2350 *)&this->local;
func_80328B8C(this, 2, 0.0001f, 1);
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
timed_setStaticCameraToNode(0.0f, 4);
local->unk18 = 0;
}
@@ -206,7 +207,7 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
local->unk4 = partEmitMgr_newEmitter(16);
func_80388EE8(local->unk0);
func_80388EE8(local->unk4);
func_80328B8C(this, 4, 0.0001f, 1);
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
local->unk14 = (local->unk19 == 2) ? 1.0f : 0.0f;
this->marker->unk40_23 = TRUE;
break;
@@ -217,10 +218,10 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
mapSpecificFlags_set(6, TRUE);
break;
case 0:
func_80328B8C(this, 1, 0.0001f, 1);
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
break;
default:
func_80328B8C(this, 1, 0.0001f, 1);
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
break;
}
break;
@@ -432,7 +433,7 @@ void func_803896FC(Actor *this){
local->unk19 = 1;
this->unk38_31 = 2;
this->unk4C = 600.0f;
func_80328B8C(this, 11, 0.0001f, 1);
subaddie_set_state_with_direction(this, 11, 0.0001f, 1);
}
else{
local->unk19 = 1;
@@ -445,10 +446,10 @@ void func_803896FC(Actor *this){
if(!func_8038A1A0(this->marker)){
switch(this->unk38_31){
case 1://L80389920
func_80328B8C(this, 9, 0.0001f, 1);
subaddie_set_state_with_direction(this, 9, 0.0001f, 1);
break;
case 2://L80389938
func_80328B8C(this, 10, 0.0001f, 1);
subaddie_set_state_with_direction(this, 10, 0.0001f, 1);
break;
}
}//L80389950
@@ -500,9 +501,9 @@ void func_803896FC(Actor *this){
local->unk14 = 0.0f;
if( randf() < 0.02 && sp58 < 0.0){
if(randf() < 0.5)
func_80328B8C(this, 5, 0.0001f, 1);
subaddie_set_state_with_direction(this, 5, 0.0001f, 1);
else
func_80328B8C(this, 6, 0.0001f, 1);
subaddie_set_state_with_direction(this, 6, 0.0001f, 1);
}//L80389C18
func_803893E4(this, sp58, local->unk19);
@@ -516,7 +517,7 @@ void func_803896FC(Actor *this){
case 5:// L80389C80
case 6:// L80389C80
if(actor_animationIsAt(this, 0.9999f) || sp58 >= 0.0){
func_80328B8C(this, 4, 0.0001f, 1);
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
}//L80389CC8
func_803893E4(this, sp58, local->unk19);
@@ -528,7 +529,7 @@ void func_803896FC(Actor *this){
case 7:// L80389D34
if(actor_animationIsAt(this, 0.9999f)){
func_80328B8C(this, 4, 0.0001f, 1);
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
}//L80389D60
func_803893E4(this, sp58, local->unk19);
func_80388F90(this);
@@ -556,7 +557,7 @@ void func_803896FC(Actor *this){
func_80388F90(this);
}
if(actor_animationIsAt(this, 0.9999f)){
func_80328B8C(this, 11, 0.0001f, 1);
subaddie_set_state_with_direction(this, 11, 0.0001f, 1);
}
break;
@@ -567,7 +568,7 @@ void func_803896FC(Actor *this){
}
if(actor_animationIsAt(this, 0.9999f)){
func_80328B8C(this, 11, 0.0001f, 1);
subaddie_set_state_with_direction(this, 11, 0.0001f, 1);
}
break;
@@ -629,10 +630,10 @@ void func_8038A0E4(UNK_TYPE(s32) arg0, ActorMarker *marker){
if(actor){
if(actor->state != 7){
func_80328B8C(actor, 7, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 7, 0.0001f, 1);
}
else{
func_80328B8C(actor, 4, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 4, 0.0001f, 1);
}
};
}
@@ -641,7 +642,7 @@ void func_8038A150(UNK_TYPE(s32) arg0, ActorMarker *marker){
Actor *actor = marker_getActor(marker);
if(actor && actor->state != 8){
func_80328B8C(actor, 8, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 8, 0.0001f, 1);
};
}

2
src/FP/ch/racesled.c
View File

@@ -31,7 +31,7 @@ Actor *chRaceSled_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void __chRaceSled_setState(Actor *this, s32 next_state){
if(this->state != 1 || next_state != 1){
func_80328A84(this, next_state);
subaddie_set_state(this, next_state);
switch(next_state){
case 1: //L8038697C
this->unk10_12 = TRUE;

2
src/FP/ch/scarfsled.c
View File

@@ -21,7 +21,7 @@ ActorInfo chScarfSled = {
/* .code */
void __chScarfSled_setState(Actor *this, s32 next_state){
func_80328A84(this, next_state);
subaddie_set_state(this, next_state);
if(next_state == 2){
mapSpecificFlags_set(0xB, TRUE);

4
src/FP/ch/snowmanbutton.c
View File

@@ -50,7 +50,7 @@ void FP_func_80386BEC(Actor *this){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(12);
player_getPosition(plyr_pos);
func_80328B8C(this, 2, 0.01f, 1);
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
actor_collisionOff(this);
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
FUNC_8030E624(SFX_90_SWITCH_PRESS, 1.0f, 32000);
@@ -93,7 +93,7 @@ void FP_func_80386CF8(Actor *this){
break;
case 2:
if(actor_animationIsAt(this, 0.99f)){
func_80328B8C(this, 3, 0.99f, 0);
subaddie_set_state_with_direction(this, 3, 0.99f, 0);
}
break;
case 3:

14
src/FP/ch/twinkly.c
View File

@@ -3,6 +3,8 @@
#include "variables.h"
extern Actor *func_802EBAE0(UNK_TYPE(s32), f32 position[3], f32 rotation[3], f32 scale, UNK_TYPE(s32), UNK_TYPE(s32), UNK_TYPE(s32), f32, UNK_TYPE(s32));
extern Struct70s *func_8034C2C4(ActorMarker *marker, s32 arg1);
Actor *func_8038C0B0(ActorMarker *marker, UNK_TYPE(s32) arg1, f32 arg2, UNK_TYPE(s32) arg3);
Actor *func_8038C1F8(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_8038C9A0(Actor *this);
@@ -42,7 +44,7 @@ ActorInfo D_80391FF4 = { MARKER_203_TWINKLY_RED, ACTOR_335_TWINKLY_RED, ASSET_44
0, 0, 1.0f, 0
};
s32 FP_D_80392018[4] = {0, 0, 0, func_8038C0B0};
Struct6Cs FP_D_80392018 = {NULL, NULL, NULL, (void*)func_8038C0B0};
struct43s D_80392028 = {
{{-200.0f, 200.0f, -200.0f}, {200.0f, 400.0f, 200.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
@@ -242,7 +244,7 @@ void func_8038C8F0(ActorMarker *marker){
void func_8038C94C(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
func_80328A84(this, 6);
subaddie_set_state(this, 6);
__spawnQueue_add_1((GenFunction_1)func_8038C8F0, reinterpret_cast(s32, this->marker));
}
}
@@ -261,7 +263,7 @@ void func_8038C9A0(Actor *this){
this->marker->unk18 = &FP_D_80392018;
this->unk38_31 = 0;
if(0.0f != other->velocity[0]){
func_80328A84(this, 4);
subaddie_set_state(this, 4);
this->unk1C[1] = this->position_y + 50.0f;
this->unk1C[2] = this->position_y;
}
@@ -286,7 +288,7 @@ void func_8038C9A0(Actor *this){
switch(this->state){
case 1:// 8038CB2C
if(!func_8038C718(this, 0)){
func_80328B8C(this, 2, 0.001f, 1);
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
func_8038C428(this, D_80392088, randf2(20.0f, 24.0f));
this->unk60 = this->yaw;
}
@@ -311,7 +313,7 @@ void func_8038C9A0(Actor *this){
if(!func_8038C718(this, 0.0f)){
if(func_8038C844(this->position, D_80392088)){
func_80328B8C(this, 3, 0.001f, 1);
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
func_8038C428(this, D_80392094, 0.0f);
}
else{
@@ -341,7 +343,7 @@ void func_8038C9A0(Actor *this){
else{
func_80311480(0xc25, 0x2b, this->position, this->marker, func_8038C94C, NULL);
}
func_80328A84(this, 5);
subaddie_set_state(this, 5);
this->pitch -= 3.0f;
}
break;

16
src/FP/ch/twinklybox.c
View File

@@ -268,7 +268,7 @@ void func_8038D5C8(ActorMarker *this_marker, ActorMarker *other_marker){
func_8024BD08(0);
this->unk1C[2] = 428571.0f;
func_8025AEA0(0x68, (s32)this->unk1C[2]);
func_80328B8C(this, 3, 0.001f, 1);
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
actor_playAnimationOnce(this);
this->velocity[0] = 1.0f;
}//L8038D6B8
@@ -303,7 +303,7 @@ void func_8038D6C8(Actor *this){
this->unk1C[0] = -1.0f;
func_8028F8F8(7, FALSE);
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -1){
func_80328B8C(this, 3, 0.001f, 1);
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
actor_playAnimationOnce(this);
this->velocity[0] = 1.0f;
}
@@ -320,9 +320,9 @@ void func_8038D6C8(Actor *this){
break;
if(!(func_8023DB5C() & 1))
func_80328B8C(this, 2, 0.001f, 1);
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
else
func_80328B8C(this, 2, 0.999f, 0);
subaddie_set_state_with_direction(this, 2, 0.999f, 0);
actor_playAnimationOnce(this);
this->velocity[2] = randf2(1.4f, 2.0f);
@@ -335,7 +335,7 @@ void func_8038D6C8(Actor *this){
if( ( sp20 == TRUE && actor_animationIsAt(this, 0.999f) )
|| ( sp20 == FALSE && actor_animationIsAt(this, 0.001f) )
){
func_80328B8C(this, 1, 0.001f, 0);
subaddie_set_state_with_direction(this, 1, 0.001f, 0);
actor_playAnimationOnce(this);
break;
}
@@ -362,7 +362,7 @@ void func_8038D6C8(Actor *this){
timed_exitStaticCamera(0.0f);
func_8028F784(0);
func_80328B8C(this, 4, 0.999f, 1);
subaddie_set_state_with_direction(this, 4, 0.999f, 1);
actor_playAnimationOnce(this);
item_set(ITEM_0_HOURGLASS_TIMER, 80*60 - 1);
item_set(ITEM_6_HOURGLASS, TRUE);
@@ -381,7 +381,7 @@ void func_8038D6C8(Actor *this){
func_8025AEA0(COMUSIC_68_TWINKLY_MINIGAME, (s32)this->unk1C[2]);
if(item_getCount(ITEM_24_TWINKLY_SCORE) == 0){
func_80328B8C(this, 1, 0.001f, 1);
subaddie_set_state_with_direction(this, 1, 0.001f, 1);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_8038D3D8();
func_80324E38(0.0f, 3);
@@ -393,7 +393,7 @@ void func_8038D6C8(Actor *this){
}
if(item_empty(ITEM_6_HOURGLASS)){
func_80328B8C(this, 1, 0.001f, 0);
subaddie_set_state_with_direction(this, 1, 0.001f, 0);
actor_playAnimationOnce(this);
this->unk38_31 = 0;
item_set(ITEM_6_HOURGLASS, FALSE);

14
src/FP/ch/twinklymuncher.c
View File

@@ -35,23 +35,23 @@ Actor *func_8038DD70(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_8038DDC8(Actor *this){
actor_collisionOn(this);
func_80328B8C(this, 2, 0.03f, 1);
subaddie_set_state_with_direction(this, 2, 0.03f, 1);
actor_playAnimationOnce(this);
}
void func_8038DE08(Actor *this){
func_80328B8C(this, 3, 0.03f, 1);
subaddie_set_state_with_direction(this, 3, 0.03f, 1);
actor_loopAnimation(this);
}
void func_8038DE40(Actor *this){
func_80328B8C(this, 4, 0.03f, 1);
subaddie_set_state_with_direction(this, 4, 0.03f, 1);
actor_playAnimationOnce(this);
}
void func_8038DE78(Actor *this){
actor_collisionOff(this);
func_80328B8C(this, 5, 0.03f, 1);
subaddie_set_state_with_direction(this, 5, 0.03f, 1);
actor_playAnimationOnce(this);
}
@@ -93,7 +93,7 @@ Actor *func_8038DF34(Actor *this){
void func_8038E040(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
timed_exitStaticCamera(0.5f);
func_80328B8C(this, 7, 0.03f, 1);
subaddie_set_state_with_direction(this, 7, 0.03f, 1);
actor_playAnimationOnce(this);
}
@@ -129,7 +129,7 @@ void func_8038E094(Actor *this){
timed_setStaticCameraToNode(0.5f, 0xd);
func_80311480(ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);
this->velocity[0] = 1.0f;
func_80328B8C(this, 6, 0.03f, 1);
subaddie_set_state_with_direction(this, 6, 0.03f, 1);
actor_loopAnimation(this);
}
}
@@ -214,7 +214,7 @@ void func_8038E094(Actor *this){
case 5: //L8038E644
this->marker->propPtr->unk8_3 = TRUE;
if(actor_animationIsAt(this, 0.97f)){
func_80328B8C(this, 1, 0.97f, 0);
subaddie_set_state_with_direction(this, 1, 0.97f, 0);
actor_playAnimationOnce(this);
this->unk60 = 0.0f;
}

32
src/FP/ch/wozza.c
View File

@@ -49,19 +49,19 @@ Actor *func_8038F210(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_8038F274(void){
UNK_TYPE(s32) v0 = func_8034C528(0x191);
if(v0){
func_8034DE60(v0, 0.0f, -500.0f, 0.2f, 1);
Struct70s *v0 = func_8034C528(0x191);
if(v0 != NULL){
func_8034DE60(&v0->type_6D, 0.0f, -500.0f, 0.2f, 1);
}
}
void func_8038F2B8(Actor *this){
func_80328B8C(this, 3, 0.02f, 1);
subaddie_set_state_with_direction(this, 3, 0.02f, 1);
actor_loopAnimation(this);
}
void func_8038F2F0(Actor *this){
func_80328B8C(this, 11, 0.02f, 1);
subaddie_set_state_with_direction(this, 11, 0.02f, 1);
actor_loopAnimation(this);
func_8038F274();
}
@@ -96,14 +96,14 @@ void func_8038F3F4(ActorMarker *marker){
}
void func_8038F41C(Actor *this){
func_80328B8C(this, 1, 0.02f, 1);
subaddie_set_state_with_direction(this, 1, 0.02f, 1);
actor_loopAnimation(this);
}
void func_8038F454(Actor *this){
if(!mapSpecificFlags_get(7) && func_8028ECAC() != BSGROUP_A_FLYING && func_80329530(this, 1000) ){
mapSpecificFlags_set(7, TRUE);
func_80328A84(this, 2);
subaddie_set_state(this, 2);
actor_loopAnimation(this);
timed_setStaticCameraToNode(0.0f, 0x2e);
func_80324DBC(0.0f, 0xc1b, 0x2a, this->position, this->marker, func_8038F330, NULL);
@@ -115,12 +115,12 @@ void func_8038F454(Actor *this){
}
void func_8038F528(Actor *this){
func_80328B8C(this, 4, 0.02f, 1);
subaddie_set_state_with_direction(this, 4, 0.02f, 1);
actor_loopAnimation(this);
}
void func_8038F560(Actor *this){
func_80328B8C(this, 7, 0.02f, 1);
subaddie_set_state_with_direction(this, 7, 0.02f, 1);
actor_loopAnimation(this);
}
@@ -149,7 +149,7 @@ bool func_8038F5D4(Actor *this, f32 arg1[3], f32 arg2, f32 arg3, s32 arg4){
bool FP_func_8038F6C4(Actor *this, f32 arg1[3], f32 arg2){
s32 dTheta;
func_80328C64(this, func_803297C8(this, arg1));
subaddie_set_ideal_yaw(this, func_803297C8(this, arg1));
func_80328FB0(this, arg2);
dTheta = this->yaw - this->yaw_ideal;
if(-arg2 <= dTheta && dTheta <= arg2){
@@ -223,7 +223,7 @@ void FP_func_8038F7AC(Actor *this){
}
if(func_80329530(this, 1300) && player_getTransformation() == TRANSFORM_4_WALRUS){
func_80328B8C(this, 8, 0.02f, 1);
subaddie_set_state_with_direction(this, 8, 0.02f, 1);
actor_loopAnimation(this);
break;
}
@@ -252,7 +252,7 @@ void FP_func_8038F7AC(Actor *this){
}
if(func_8038F5D4(this, local->unk0, 30.0f, 12.0f, 0x3C)){
func_80328B8C(this, 5, 0.02f, 1);
subaddie_set_state_with_direction(this, 5, 0.02f, 1);
actor_playAnimationOnce(this);
}
break;
@@ -260,7 +260,7 @@ void FP_func_8038F7AC(Actor *this){
case 5: //L8038FB50
FP_func_8038F6C4(this, local->unk18, 1.0f);
if(0.97 < animctrl_getAnimTimer(this->animctrl)){
func_80328B8C(this, 6, 0.02f, 1);
subaddie_set_state_with_direction(this, 6, 0.02f, 1);
actor_loopAnimation(this);
}
break;
@@ -309,7 +309,7 @@ void FP_func_8038F7AC(Actor *this){
if(mapSpecificFlags_get(8)){
if(FP_func_8038F6C4(this, D_803925AC, 9.0f)){
func_80328B8C(this, 9, 0.02f, 1);
subaddie_set_state_with_direction(this, 9, 0.02f, 1);
actor_playAnimationOnce(this);
}
break;
@@ -331,7 +331,7 @@ void FP_func_8038F7AC(Actor *this){
case 9: //L8038FE14
FP_func_8038F6C4(this, D_803925AC, 9.0f);
if(0.97 < animctrl_getAnimTimer(this->animctrl)){
func_80328B8C(this, 10, 0.02f, 1);
subaddie_set_state_with_direction(this, 10, 0.02f, 1);
actor_loopAnimation(this);
}
break;
@@ -342,7 +342,7 @@ void FP_func_8038F7AC(Actor *this){
case 11: //L8038FE84
if(func_8038F5D4(this, local->unk24, 30.0f, 12.0f, 0x3C)){
func_80328A84(this, 12);
subaddie_set_state(this, 12);
}
break;

4
src/FP/ch/wozzasjig.c
View File

@@ -51,7 +51,7 @@ void func_8038FF54(Actor *this){
other = marker_getActor(this->unk100);
if(this->state != 9){
if(other->state == 9){
func_80328B8C(this, 9, 0.01f, 1);
subaddie_set_state_with_direction(this, 9, 0.01f, 1);
actor_playAnimationOnce(this);
}
else{
@@ -75,7 +75,7 @@ void func_8038FF54(Actor *this){
sp40[1] = (f32)(s32)sp40[1];
sp40[2] = (f32)(s32)sp40[2];
func_802C8F70(this->yaw + 90.0f);
jiggySpawn(JIGGY_32_FP_WOZZA, sp40);
jiggy_spawn(JIGGY_32_FP_WOZZA, sp40);
levelSpecificFlags_set(0x26, TRUE);
marker_despawn(this->marker);
}

10
src/FP/ch/xmastree.c
View File

@@ -47,7 +47,7 @@ void __chXmasTree_80386F3C(void){
}
void __chXmasTree_80386F84(Actor * this){
func_80328A84(this, 2);
subaddie_set_state(this, 2);
__chXmasTree_80386EF4(this, 0);
}
@@ -123,7 +123,7 @@ void chXmasTree_update(Actor *this){
case 2: // L80387294
if(!mapSpecificFlags_get(2)) break;
func_80328A84(this, 3);
subaddie_set_state(this, 3);
this->unk60 = 2.0f;
func_8025A6EC(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000);
func_802BAFE4(0x1A);
@@ -148,7 +148,7 @@ void chXmasTree_update(Actor *this){
}
else{//L803873BC
if(func_802BB270()){
func_80328A84(this, 4);
subaddie_set_state(this, 4);
__chXmasTree_80386EF4(this, 1);
item_set(ITEM_0_HOURGLASS_TIMER, 3600 - 1);
item_set(ITEM_6_HOURGLASS, TRUE);
@@ -159,7 +159,7 @@ void chXmasTree_update(Actor *this){
case 4: // L80387400
if(mapSpecificFlags_get(3)){
func_80328A84(this, 6);
subaddie_set_state(this, 6);
__chXmasTree_80386EF4(this, 1);
item_set(ITEM_6_HOURGLASS, FALSE);
tmp_a0 = this->unk44_31;
@@ -172,7 +172,7 @@ void chXmasTree_update(Actor *this){
}
else{//L80387470
if(item_empty(ITEM_6_HOURGLASS)){
func_80328A84(this, 5);
subaddie_set_state(this, 5);
mapSpecificFlags_set(2, FALSE);
this->unk60 = 0.1f;
if(!func_8038BFA0()){

6
src/FP/ch/xmastreestar.c
View File

@@ -104,14 +104,14 @@ void func_8038ECD8(Actor *this){
if(!mapSpecificFlags_get(2)) break;
if(mapSpecificFlags_get(3)) break;
func_80328A84(this, 2);
subaddie_set_state(this, 2);
this->unk38_31 = 0;
break;
case 2://L8038EF5C
if(!local->unk1A) return;
if(item_empty(ITEM_6_HOURGLASS)){
func_80328A84(this, 1);
subaddie_set_state(this, 1);
}
else{
this->marker->collidable = TRUE;
@@ -136,7 +136,7 @@ void func_8038ECD8(Actor *this){
}//L8038F090
if(!(this->unk38_31 < 3)){
func_80328A84(this, 1);
subaddie_set_state(this, 1);
mapSpecificFlags_set(3, 1);
}
}

8
src/FP/ch/xmastreeswitch.c
View File

@@ -28,7 +28,7 @@ Actor *func_8038E720(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_8038E774(Actor *this){
func_80328B8C(this, 2, 0.05f, 1);
subaddie_set_state_with_direction(this, 2, 0.05f, 1);
actor_playAnimationOnce(this);
this->marker->collidable = TRUE;
this->unk38_31 = 0;
@@ -70,7 +70,7 @@ void func_8038E940(Actor *this){
if(jiggyscore_isCollected(JIGGY_2F_FP_XMAS_TREE) || levelSpecificFlags_get(0x29)){
this->marker->propPtr->unk8_3 = TRUE;
this->marker->collidable = FALSE;
func_80328B8C(this, 3, 0.95f, 0);
subaddie_set_state_with_direction(this, 3, 0.95f, 0);
return;
}//L8038E9B8
@@ -79,7 +79,7 @@ void func_8038E940(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
this->marker->collidable = FALSE;
marker_setCollisionScripts(this->marker, NULL, func_8038E7CC, NULL);
func_80328B8C(this, 1, 0.05f, 1);
subaddie_set_state_with_direction(this, 1, 0.05f, 1);
this->unk38_31 = 0;
this->unk60 = 0.0f;
}//L8038EA3C
@@ -98,7 +98,7 @@ void func_8038E940(Actor *this){
if(this->unk38_31 < 3)
break;
func_80328B8C(this, 3, 0.05f, 1);
subaddie_set_state_with_direction(this, 3, 0.05f, 1);
actor_playAnimationOnce(this);
FUNC_8030E624(SFX_416, 0.8f, 32000);
this->marker->collidable = FALSE;

4
src/FP/code_19E0.c
View File

@@ -98,7 +98,7 @@ void func_8038811C(ActorMarker *this_marker, ActorMarker *other_marker){
if(this->state == 2)
return;
func_80328B8C(this, 2, 0.0001, 1);
subaddie_set_state_with_direction(this, 2, 0.0001, 1);
func_8030E878(SFX_6A_FLAGPOLE_WOBBLE, randf2(0.9f, 1.1f), 32000, this->position, 1000.0f, 2000.0f);
}
@@ -137,7 +137,7 @@ void func_803881AC(Actor *this){
if(this->state == 2){
if(actor_animationIsAt(this, 0.9999f)){
func_80328B8C(this, 1, 0.0001f, 1);
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
}
}

4
src/FP/code_1FF0.c
View File

@@ -38,7 +38,7 @@ Actor *func_803883E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_803884F4(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
if(this->state != 2){
func_80328B8C(this, 2, 0.0001f, 1);
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
func_8030E878(SFX_6A_FLAGPOLE_WOBBLE, randf2(0.9f, 1.1f), 32000, this->position, 1000.0f, 2000.0f);
}
}
@@ -78,7 +78,7 @@ void func_80388584(Actor *this){
func_8028E668(this->position, 200.0f, -10.0f, 30.0f);
if(this->state == 2){
if(actor_animationIsAt(this, 0.9999f)){
func_80328B8C(this, 1, 0.0001f, 1);
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
}
}
}

2
src/FP/code_ABD0.c
View File

@@ -225,7 +225,7 @@ void func_80391744(Actor *this, Actor* other){
}
void func_8039180C(Actor *this){
ActorMarker *sp24;
Actor *sp24;
if(!this->initialized){
sp24 = actorArray_findActorFromActorId(0x254);

10
src/FP/racectrl.c
View File

@@ -197,10 +197,10 @@ void func_8038B0F8(void){
void func_8038B130(enum jiggy_e jiggy_id){
if(jiggy_id == JIGGY_2C_FP_BOGGY_3 && !jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
jiggySpawn(jiggy_id, D_80391F38);
jiggy_spawn(jiggy_id, D_80391F38);
}
else{
jiggySpawn(jiggy_id, D_80391F2C);
jiggy_spawn(jiggy_id, D_80391F2C);
}
}
@@ -485,15 +485,15 @@ void FP_func_8038BA88(s32 arg0){
switch(FP_D_803935A8.unkC - FP_D_803935A8.unk8){
case 3:
func_8025AEA0(0x3a, 0x411aa);
func_8025AEA0(0x3a, 266666);
break;
case 2:
func_8025AEA0(0x3a, 0x493e0);
func_8025AEA0(0x3a, 300000);
break;
case 4:
break;
default:
func_8025AEA0(0x3a, 0x51615);
func_8025AEA0(0x3a, 333333);
break;

2
src/FP/sirslushgame.c
View File

@@ -53,7 +53,7 @@ void fp_sirslushgame_update(void){
if(D_80392F30.unk1C){
func_802BAFE4(0x12);
jiggySpawn(JIGGY_31_FP_SIR_SLUSH, D_80392F30.spawn_pos);
jiggy_spawn(JIGGY_31_FP_SIR_SLUSH, D_80392F30.spawn_pos);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
reinterpret_cast(s32, D_80392F30.spawn_pos[0]),
reinterpret_cast(s32, D_80392F30.spawn_pos[1]),

2
src/FP/snowmanbuttongame.c
View File

@@ -51,7 +51,7 @@ void fp_snowmanButtonGame_update(void){
if(D_80392F50.unk18){
func_802BAFE4(0x11);
jiggySpawn(JIGGY_2D_FP_SNOWMAN_BUTTONS, D_80392F50.spawn_pos);
jiggy_spawn(JIGGY_2D_FP_SNOWMAN_BUTTONS, D_80392F50.spawn_pos);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
reinterpret_cast(s32, D_80392F50.spawn_pos[0]),
reinterpret_cast(s32, D_80392F50.spawn_pos[1]),

2
src/GV/bss_pad.c
View File

@@ -1 +1 @@
char pad_GV_D_80391A20[0x10];
char pad_GV_D_80391A20[0x10];

8
src/GV/ch/ancientone.c
View File

@@ -88,7 +88,7 @@ void func_803867F4(void){
f32 sp24[3];
func_802BAFE4(4);
if(nodeProp_findPositionFromActorId(0x148, sp24)){
jiggySpawn(JIGGY_46_GV_ANCIENT_ONES, sp24);
jiggy_spawn(JIGGY_46_GV_ANCIENT_ONES, sp24);
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x4C, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
}
}
@@ -96,7 +96,7 @@ void func_803867F4(void){
void func_80386850(ActorMarker *caller_marker, enum asset_e text_id, s32 arg2){
Actor *caller = marker_getActor(caller_marker);
if(text_id == 0xA80){
func_80328B8C(caller, 2, 0.0f, 1);
subaddie_set_state_with_direction(caller, 2, 0.0f, 1);
actor_playAnimationOnce(caller);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
timedFunc_set_0(1.0f, func_803867F4);
@@ -162,7 +162,7 @@ void chAncientOne_update(Actor *this){
}
}
func_80328B8C(this, 2, 0.0f, 1);
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
actor_playAnimationOnce(this);
if(this->unkF4_8 < 5){
D_80390C28[this->unkF4_8]->propPtr->unk8_4 = TRUE;
@@ -198,7 +198,7 @@ void chAncientOne_update(Actor *this){
break;
case 2: //L80386DCC
if(actor_animationIsAt(this, 0.999f)){
func_80328B8C(this, 3, 0.9999f, 1);
subaddie_set_state_with_direction(this, 3, 0.9999f, 1);
actor_playAnimationOnce(this);
}
break;

2
src/GV/ch/gobi2.c
View File

@@ -34,7 +34,7 @@ void func_80387984(ActorMarker *this){
void __chGobi2_spawnJIggy(void){
static f32 jiggy_position[3] = {1150.0f, 1150.0f, 9200.0f};
jiggySpawn(JIGGY_45_GV_GOBI_2, jiggy_position);
jiggy_spawn(JIGGY_45_GV_GOBI_2, jiggy_position);
}
void func_803879D4(ActorMarker *this_marker){

2
src/GV/ch/gobirock.c
View File

@@ -120,7 +120,7 @@ void chGobiRock_update(Actor *this){
particleEmitter_update(local->unkC);
particleEmitter_update(local->unk10);
if(ml_timer_update(&local->unk14, sp24)){
jiggySpawn(JIGGY_44_GV_GOBI_1, jiggy_position);
jiggy_spawn(JIGGY_44_GV_GOBI_1, jiggy_position);
func_802BB3DC(0, 60.0f, 0.65f);
}
if(this->state == 2){

22
src/GV/ch/histup.c
View File

@@ -29,8 +29,8 @@ ActorInfo D_80391318 = { MARKER_AA_HISTUP, ACTOR_11C_HISTUP, ASSET_3DE_MODEL_HIS
extern struct {
s32 unk0;
s32 unk4;
s32 unk8;
}GV_D_80391AB0;
extern s32 D_80391AB8;
/* .code */
int func_8038D920(Actor *this, f32 arg1){
@@ -70,7 +70,7 @@ Actor *func_8038DA18(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void GV_func_8038DB0C(Actor *this){
func_80328B8C(this, 1, 0.99f, 0);
subaddie_set_state_with_direction(this, 1, 0.99f, 0);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
}
@@ -112,15 +112,15 @@ void func_8038DBDC(Actor *this){
this->initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
func_80328B8C(this, 1, 0.99f, 0);
subaddie_set_state_with_direction(this, 1, 0.99f, 0);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
D_80391AB8 = 0;
GV_D_80391AB0.unk8 = 0;
func_8038DB4C(0);
this->unk1C[0] = 0.0f;
}//L8038DC90
if(func_8038E178() != (s32)this->unk1C[0] || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
if(15.0f <= this->unk60){
func_80328B8C(this, 2, 0.01f, 1);
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
animctrl_setDuration(this->animctrl, 2.0f);
this->unk1C[0] = (f32)func_8038E178();
@@ -134,8 +134,8 @@ void func_8038DBDC(Actor *this){
case 2: //8038DD3C
if(!(func_8038E178() < 5)){
func_8038DB88(this);
if(D_80391AB8){
func_80328B8C(this, 3, 0.99f, 0);
if(GV_D_80391AB0.unk8){
subaddie_set_state_with_direction(this, 3, 0.99f, 0);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
this->unk1C[0] = 0.0f;
}
@@ -158,7 +158,7 @@ void func_8038DBDC(Actor *this){
break;
case 3: //8038DE44
if(!(this->unk38_31 < 0x21)){
func_80328B8C(this, 4, 0.01f, 1);
subaddie_set_state_with_direction(this, 4, 0.01f, 1);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
animctrl_setDuration(this->animctrl, 3.0f);
func_803865F8();
@@ -170,7 +170,7 @@ void func_8038DBDC(Actor *this){
break;
case 4: //8038DEBC
if(actor_animationIsAt(this, 0.99f)){
func_80328B8C(this, 5, 0.01f, 1);
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_LOOP);
animctrl_setDuration(this->animctrl, 2.0f);
func_8038DB58(0);
@@ -191,12 +191,12 @@ void func_8038DBDC(Actor *this){
break;
case 5: //8038DFC8
if(func_8038DB64() == 0x127){
func_80328B8C(this, 6, 0.01f, 1);
subaddie_set_state_with_direction(this, 6, 0.01f, 1);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_LOOP);
animctrl_setDuration(this->animctrl, 1.6f);
func_80386608();
func_8038DB4C(0);
D_80391AB8 = FALSE;
GV_D_80391AB0.unk8 = FALSE;
func_8025A58C(-1, 0x190);
func_8025A7DC(COMUSIC_27_GV_RUBEES_SONG);
if(!this->unk44_31){

16
src/GV/ch/mazectrl.c
View File

@@ -27,18 +27,18 @@ ActorInfo chMazeCtrl = { MARKER_1CD_GV_MAZE_CTRL, ACTOR_319_GV_MAZE_CTRL, 0x0,
void func_8038F520(f32 arg0){
static f32 D_803915E4[3] = {460.0f, 1400.0f, 0.0f};
static f32 D_803915F0[3] = {0.0f, 0.0f, 0.0f};
Struct6Ds *tmp_v0 = func_8034C528(0x19A);
Struct70s *tmp_v0 = func_8034C528(0x19A);
if(tmp_v0 != NULL){
func_8034DDF0(tmp_v0, D_803915E4, D_803915F0, arg0, 1);
func_8034DDF0(&tmp_v0->type_6D, D_803915E4, D_803915F0, arg0, 1);
}
}
void func_8038F56C(f32 arg0){
static f32 D_803915FC[3] = {0.0f, 0.0f, 0.0f};
static f32 D_80391608[3] = {460.0f, 1400.0f, 0.0f};
Struct6Ds *tmp_v0 = func_8034C528(0x19A);
Struct70s *tmp_v0 = func_8034C528(0x19A);
if(tmp_v0 != NULL){
func_8034DDF0(tmp_v0, D_803915FC, D_80391608, arg0, 1);
func_8034DDF0(&tmp_v0->type_6D, D_803915FC, D_80391608, arg0, 1);
}
}
@@ -56,7 +56,7 @@ void __chMazeCtrl_8038F5E4(Actor *this){
void __chMazeCtrl_setState(Actor *this, s32 next_state){
f32 plyr_pos[3];
Struct6Ds *tmp_v0;
Struct70s *tmp_v0;
ActorLocal_GVMazeCtrl *local;
f32 sp28[3];
@@ -111,7 +111,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
func_8030E6D4(SFX_52_BANJO_YAH_OH);
tmp_v0 = func_8034C528(400);
if(tmp_v0){
func_8034DE60(tmp_v0, 0.0f, -1700.0f, 1.0f, 1);
func_8034DE60(&tmp_v0->type_6D, 0.0f, -1700.0f, 1.0f, 1);
}
}//L8038F8C4
@@ -170,7 +170,7 @@ void chMazeCtrl_update(Actor *this){
player_getPosition(sp3C);
if(this->state == 1){
sp38 = func_8034C528(0x191);
sp38 = &func_8034C528(0x191)->type_6D;
if(sp38 != NULL && func_8034DC80(sp38, sp3C)){
__chMazeCtrl_setState(this, 2);
}
@@ -200,7 +200,7 @@ void chMazeCtrl_update(Actor *this){
}
if(this->state == 4){
sp30 = func_8034C528(0x190);
sp30 = &func_8034C528(0x190)->type_6D;
if(sp30 != NULL && func_8034DC78(sp30)){
__chMazeCtrl_setState(this, 0);
}

16
src/GV/ch/sarcophagus.c
View File

@@ -37,7 +37,7 @@ s32 D_80390E88[4] = {0, 0, 0, 0};
void GV_func_803894B0(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
func_80328B8C(this, 1, 0.01f, 1);
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
this->unk38_31 = 0;
this->initialized = TRUE;
}
@@ -72,7 +72,7 @@ void chSarcophagus_update(Actor *this){
GV_func_803894B0(this);
}
if(func_80329530(this, 500) && func_8038957C(this)){
func_80328B8C(this, 2, 0.01f, 1);
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
@@ -88,13 +88,13 @@ void chSarcophagus_update(Actor *this){
this->unk38_31 = 1;
}
if(actor_animationIsAt(this, 0.5f)){
func_80328B8C(this, 3, 0.5f, 1);
subaddie_set_state_with_direction(this, 3, 0.5f, 1);
}
break;
case 3: //L80389788
if(!func_80329530(this, 700)){
func_80328B8C(this, 4, 0.5f, 1);
subaddie_set_state_with_direction(this, 4, 0.5f, 1);
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
}
@@ -110,7 +110,7 @@ void chSarcophagus_update(Actor *this){
}
if(actor_animationIsAt(this, 0.99f)){
func_80328B8C(this, 1, 0.01f, 1);
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
}
else if(actor_animationIsAt(this, 0.9f)){
FUNC_8030E8B4(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 32000, this->position, 1250, 2500);
@@ -123,7 +123,7 @@ void chSarcophagus_updateSNS(Actor *this){
if(!this->initialized){
GV_func_803894B0(this);
if(fileProgressFlag_get(FILEPROG_A4_GV_SNS_SARCOPHAGUS_OPEN))
func_80328B8C(this, 3, 0.5f, 1);
subaddie_set_state_with_direction(this, 3, 0.5f, 1);
this->unk1C[0] = 0.0f;
}
@@ -132,7 +132,7 @@ void chSarcophagus_updateSNS(Actor *this){
if(this->unk1C[0] != 0.0f){
this->unk1C[0] -= 1.0f;
if(this->unk1C[0] == 0.0f){
func_80328B8C(this, 5, 0.01f, 1);
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 0.5f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 0.5f, 32000, this->position, 1250, 2500);
}
@@ -145,7 +145,7 @@ void chSarcophagus_updateSNS(Actor *this){
break;
case 5://L803899DC
if(actor_animationIsAt(this, 0.5f)){
func_80328B8C(this, 3, 0.5f, 1);
subaddie_set_state_with_direction(this, 3, 0.5f, 1);
FUNC_8030E624(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 25000);
}
break;

6
src/GV/ch/toots.c
View File

@@ -24,17 +24,17 @@ s32 D_80391A34;
/* .code */
void GV_func_803863F0(Actor *this){
func_80328B8C(this, 1, 0.0001f, 1);
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
D_80391A30 = FALSE;
}
void GV_func_80386420(Actor *this){
func_80328B8C(this, 2, 0.0001f, 1);
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
this->unk38_31 = 0x23;
}
void func_80386464(Actor *this){
func_80328B8C(this, 3, 0.0001f, 1);
subaddie_set_state_with_direction(this, 3, 0.0001f, 1);
}
void chtoots_update(Actor *this){

12
src/GV/code_3630.c
View File

@@ -25,13 +25,13 @@ ActorInfo D_80390ED0 = { MARKER_A9_RUBEE, ACTOR_11B_RUBEE, ASSET_3DD_MODEL_RUBEE
void func_80389A20(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
func_8038E18C();
func_80328B8C(this, 3, 0.0f, 1);
subaddie_set_state_with_direction(this, 3, 0.0f, 1);
}
void func_80389A60(Actor *this){
func_80311480(ASSET_A70_TEXT_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL);
this->unk138_24 = TRUE;
func_80328A84(this, 5);
subaddie_set_state(this, 5);
}
void func_80389ABC(Actor *this){
@@ -75,7 +75,7 @@ void func_80389B1C(Actor *this){
func_80389ABC(this);
}
else if(actor_animationIsAt(this, 0.99f)){
func_80328B38(this, 2, 0.9f);
subaddie_maybe_set_state(this, 2, 0.9f);
}
if( actor_animationIsAt(this, 0.42f)
@@ -96,7 +96,7 @@ void func_80389B1C(Actor *this){
func_80389ABC(this);
}
else if(actor_animationIsAt(this, 0.99f)){
func_80328B38(this, 1, 0.4f);
subaddie_maybe_set_state(this, 1, 0.4f);
}
break;
case 3: //L80389E14
@@ -106,12 +106,12 @@ void func_80389B1C(Actor *this){
}
if( actor_animationIsAt(this, 0.99f)){
func_80328A84(this, 4);
subaddie_set_state(this, 4);
}
break;
case 4: //L80389E64
if(!func_8038E178())
func_80328A84(this, 2);
subaddie_set_state(this, 2);
break;
}//L80389E80
}

8
src/GV/code_3D90.c
View File

@@ -88,7 +88,7 @@ void func_8038A31C(Actor *this){
this->unk1C[0] = 1.0;
this->alpha_124_19 = 0xff;
if(this->unk54 != 0.0f){
func_80328B8C(this, 2, 0.02f, 1);
subaddie_set_state_with_direction(this, 2, 0.02f, 1);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
}
break;
@@ -96,7 +96,7 @@ void func_8038A31C(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
this->unk1C[0] = 1.0;
if(45.0f <= this->velocity[0]){
func_80328B8C(this, 3, 0.02f, 1);
subaddie_set_state_with_direction(this, 3, 0.02f, 1);
this->velocity[0] = 0.0f;
}
else{
@@ -115,7 +115,7 @@ void func_8038A31C(Actor *this){
this->unk1C[0] = 0.0;
this->alpha_124_19 = 0;
if(this->unk54 == 0.0f){
func_80328B8C(this, 4, 0.02f, 1);
subaddie_set_state_with_direction(this, 4, 0.02f, 1);
}
break;
@@ -123,7 +123,7 @@ void func_8038A31C(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
this->unk1C[0] = 1.0;
if(45.0f <= this->velocity[0]){
func_80328B8C(this, 1, 0.02f, 1);
subaddie_set_state_with_direction(this, 1, 0.02f, 1);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_LOOP);
this->velocity[0] = 0.0f;
}

20
src/GV/code_4740.c
View File

@@ -104,7 +104,7 @@ void func_8038ADFC(f32 pos[3], s32 cnt){
void func_8038AF10(Actor *this){
animctrl_setSmoothTransition(this->animctrl, TRUE);
func_80328B8C(this, 3, 0.00001f, 1);
subaddie_set_state_with_direction(this, 3, 0.00001f, 1);
actor_loopAnimation(this);
this->unk28 = 16.0f;
this->unk1C[0] = 1.0f;
@@ -124,7 +124,7 @@ void func_8038AFF4(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
func_8032B4DC(this, other_marker, 0xC);
actor_collisionOff(this);
func_80328B8C(this, ASSET_9_ANIM_BSDIE, 0.00001f, 1);
subaddie_set_state_with_direction(this, ASSET_9_ANIM_BSDIE, 0.00001f, 1);
actor_playAnimationOnce(this);
this->unk1C[0] = 0.0f;
func_8030E878(SFX_D7_GRABBA_DEATH, 1.0f, 32000, this->position, 2250.0f, 4500.0f);
@@ -189,7 +189,7 @@ void func_8038B124(Actor *this){
&& func_803292E0(this)
){
animctrl_setSmoothTransition(this->animctrl, 0);
func_80328B8C(this, 2, 0.00001f, 1);
subaddie_set_state_with_direction(this, 2, 0.00001f, 1);
actor_playAnimationOnce(this);
this->yaw = (f32)func_80329784(this);
this->unk28 = 0.0f;
@@ -221,12 +221,12 @@ void func_8038B124(Actor *this){
case 3: //L8038B494
func_8030E2C4(this->unk44_31);
if(func_80329530(this, 175)){
func_80328B8C(this, 4, 0.00001f, 1);
subaddie_set_state_with_direction(this, 4, 0.00001f, 1);
actor_loopAnimation(this);
this->unk1C[0] = 1.0f;
}
else if(!func_80329530(this, 1100) || !func_8038AF78(this, 8.0f, 16.0f)){
func_80328B8C(this, 8, 0.00001f, 1);
subaddie_set_state_with_direction(this, 8, 0.00001f, 1);
actor_playAnimationOnce(this);
this->unk1C[0] = 1.0f;
func_802BB3DC(0, 6.0f, 0.92f);
@@ -249,7 +249,7 @@ void func_8038B124(Actor *this){
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 8.0f);
if(this->unk38_31 >= 20){
func_80328B8C(this, 5, 0.00001f, 1);
subaddie_set_state_with_direction(this, 5, 0.00001f, 1);
actor_playAnimationOnce(this);
this->unk38_31 = 0;
this->unk1C[0] = 1.0f;
@@ -269,7 +269,7 @@ void func_8038B124(Actor *this){
func_8030E878(SFX_3_DULL_CANNON_SHOT, 1.0f, 32000, this->position, 2250.0f, 4500.0f);
}//L8038B734
if(0.98 < animctrl_getAnimTimer(this->animctrl)){
func_80328B8C(this, 6, 0.99f, 0);
subaddie_set_state_with_direction(this, 6, 0.99f, 0);
actor_playAnimationOnce(this);
this->unk60 = 0.0f;
this->unk1C[0] = 1.0f;
@@ -278,7 +278,7 @@ void func_8038B124(Actor *this){
case 6: //L8038B78C
if(75.0f <= this->unk60){
func_80328B8C(this, 7, 0.00001f, 1);
subaddie_set_state_with_direction(this, 7, 0.00001f, 1);
actor_playAnimationOnce(this);
this->unk1C[0] = 1.0f;
}
@@ -295,14 +295,14 @@ void func_8038B124(Actor *this){
case 8: //L8038B820
if(0.98 < animctrl_getAnimTimer(this->animctrl)){
func_80328B8C(this, 1, 0.00001f, 1);
subaddie_set_state_with_direction(this, 1, 0.00001f, 1);
this->unk1C[0] = 0.0f;
this->unk1C[1] = 2.0f;
}
break;
case 9: //L8038B870
func_80328A84(this, 0xA);
subaddie_set_state(this, 0xA);
func_8038ACEC(this->position, 2);
func_8034A174(this->marker->unk44, 5, GV_D_80391A70);
func_8038ACEC(GV_D_80391A70, 2);

14
src/GV/code_5570.c
View File

@@ -47,7 +47,7 @@ extern s32 D_80391A80;
/* .code */
void func_8038B988(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
func_80328B8C(this, 5, 0.01f, 1);
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
actor_loopAnimation(this);
func_802BAFE4(0x13);
FUNC_8030E624(SFX_8D_BOGGY_OHWW, 0.9f, 32000);
@@ -56,7 +56,7 @@ void func_8038B988(ActorMarker *caller, enum asset_e text_id, s32 arg2){
}
void func_8038BA08(Actor *this){
func_80328B8C(this, 6, 0.01f, 1);
subaddie_set_state_with_direction(this, 6, 0.01f, 1);
actor_loopAnimation(this);
this->unk100 = NULL;
D_80391A80 = 3;
@@ -182,7 +182,7 @@ void GV_func_8038BEA0(Actor *this){
this->unk100 = func_8032B16C(JIGGY_3E_GV_GRABBA);
local->unk0 = this->unk100 != NULL ? this->unk100->unk5C : NULL;
}
func_80328B8C(this, this->state, 0.01f, 1);
subaddie_set_state_with_direction(this, this->state, 0.01f, 1);
this->unk58_0 = FALSE;
this->marker->propPtr->unk8_3 = FALSE;
}//L8038BFF4
@@ -195,7 +195,7 @@ void GV_func_8038BEA0(Actor *this){
this->unk58_0 = FALSE;
this->marker->propPtr->unk8_3 = FALSE;
if(func_8038BB24(this)){
func_80328B8C(this, 2, 0.01f, 1);
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
actor_playAnimationOnce(this);
this->unk38_31 = 0;
D_80391A80 = this->state;
@@ -208,7 +208,7 @@ void GV_func_8038BEA0(Actor *this){
case 2: //L8038C108
if(actor_animationIsAt(this, 0.69f)){
func_80328B8C(this, 3, 0.01f, 1);
subaddie_set_state_with_direction(this, 3, 0.01f, 1);
actor_loopAnimation(this);
D_80391A80 = this->state;
if(this->unk100){
@@ -230,7 +230,7 @@ void GV_func_8038BEA0(Actor *this){
func_8038BA08(this);
}
else if(this->unk38_31 >= 0xC){
func_80328B8C(this, 4, 0.01f, 1);
subaddie_set_state_with_direction(this, 4, 0.01f, 1);
actor_playAnimationOnce(this);
D_80391A80 = this->state;
func_802BB3DC(0, 12.0f, 0.92f);
@@ -257,7 +257,7 @@ void GV_func_8038BEA0(Actor *this){
func_8038BA08(this);
}
else if(actor_animationIsAt(this, 0.89f)){
func_80328B8C(this, 1, 0.01f, 1);
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
actor_loopAnimation(this);
D_80391A80 = this->state;
}

4
src/GV/code_61E0.c
View File

@@ -49,13 +49,13 @@ void GV_func_8038C658(Actor *this){
if(!this->unk16C_4 && this->initialized){
this->unk16C_4 = TRUE;
func_80328B8C(this, this->state, 0.01f, 1);
subaddie_set_state_with_direction(this, this->state, 0.01f, 1);
}
sp24 = GV_func_8038C5BC();
if(GV_D_80391A90)
marker_despawn(this->marker);
if(this->state != sp24)
func_80328A84(this, sp24);
subaddie_set_state(this, sp24);
}
void func_8038C748(void){

10
src/GV/code_7060.c
View File

@@ -23,7 +23,7 @@ ActorInfo D_803912B8 = { MARKER_F9_JINXY, ACTOR_1F7_JINXY, ASSET_422_MODEL_JINXY
/* .code */
void func_8038D450(ActorMarker *this_marker){
Actor *this = marker_getActor(this_marker);
func_80328AC8(this, 3);
subaddie_set_state_forward(this, 3);
}
void func_8038D47C(Actor *this){
@@ -83,13 +83,13 @@ void func_8038D47C(Actor *this){
case 1: //L8038D6C0
if(!mapSpecificFlags_get(0xE) && mapSpecificFlags_get(0) + mapSpecificFlags_get(1) == 1){
mapSpecificFlags_set(0xE, TRUE);
func_80328AC8(this, 2);
subaddie_set_state_forward(this, 2);
this->unk38_31 = 1;
}
else if(!mapSpecificFlags_get(0xF) && mapSpecificFlags_get(0) + mapSpecificFlags_get(1) == 2){
mapSpecificFlags_set(0xF, TRUE);
func_8028F918(2);
func_80328AC8(this, 3);
subaddie_set_state_forward(this, 3);
func_802BAFE4(0);
}
break;
@@ -104,7 +104,7 @@ void func_8038D47C(Actor *this){
if(--this->unk38_31 == 0){
func_80311480(ASSET_A7C_TEXT_JINXY_ONE_EGG, 4, NULL, NULL, NULL, NULL);
mapSpecificFlags_set(0x14, TRUE);
func_80328AC8(this, 1);
subaddie_set_state_forward(this, 1);
}
}
break;
@@ -126,7 +126,7 @@ void func_8038D47C(Actor *this){
}
}
if(actor_animationIsAt(this, 0.99f)){
func_80328AC8(this, 1);
subaddie_set_state_forward(this, 1);
}
break;
case 4: //L8038D910

2
src/GV/code_7D50.c
View File

@@ -4,7 +4,7 @@
struct {
s32 unk0;
u8 pad4[4];
s32 unk4;
s32 unk8;
}GV_D_80391AB0;

4
src/GV/code_7DB0.c
View File

@@ -34,7 +34,7 @@ void func_8038E1A8(Actor *this){
if(sp24){
sp24->velocity_y = 1.0f;
}
func_80328B8C(this, 1, 0.02f, 1);
subaddie_set_state_with_direction(this, 1, 0.02f, 1);
}
else{
if(actor_animationIsAt(this, 0.2f))
@@ -57,7 +57,7 @@ void func_8038E2FC(ActorMarker *this_marker){
Actor *this = marker_getActor(this_marker);
Actor *other = func_8032A7AC(this);
if(other){
func_80328B8C(this, 2, 0.02f, 1);
subaddie_set_state_with_direction(this, 2, 0.02f, 1);
}
}

20
src/GV/code_7FF0.c
View File

@@ -229,7 +229,7 @@ void func_8038E648(Actor *this){
this->pitch = 0.0f;
if(mapSpecificFlags_get(5)){
func_802BAFE4(2);
func_80328A84(this, 6);
subaddie_set_state(this, 6);
this->unk38_31 = 600;
func_80244BB0(0, 0x6A, 0x7ff8, 0.3f);
func_802D68F0(25);
@@ -240,7 +240,7 @@ void func_8038E648(Actor *this){
case 6: //L8038E700
this->pitch += (this->pitch < 1.0) ? 0.017 : 1.09;
if(90.0f <= this->pitch){
func_80328A84(this, 7);
subaddie_set_state(this, 7);
this->pitch = 90.0f;
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
func_80244C78(0);
@@ -250,7 +250,7 @@ void func_8038E648(Actor *this){
case 7: //L8038E78C
this->unk38_31 -= time_getDelta();
if(this->unk38_31 == 0){
func_80328A84(this, 8);
subaddie_set_state(this, 8);
func_80244BB0(0, 0x6A, 0x7ff8, 0.3f);
}
break;
@@ -258,7 +258,7 @@ void func_8038E648(Actor *this){
case 8: //L8038E894
this->pitch -= 1.5;
if(this->pitch <= 0.0f){
func_80328A84(this, 1);
subaddie_set_state(this, 1);
this->pitch = 0.0f;
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
mapSpecificFlags_set(5, FALSE);
@@ -295,7 +295,7 @@ void func_8038E97C(Actor *this){
this->position_z += 117.0;
this->position_y += 130.0;
this->unk38_31 = 30;
func_80328A84(this, 8);
subaddie_set_state(this, 8);
func_80244BB0(1, 0x6A, 0x7ff8, 0.3f);
}
}//L8038EA6C
@@ -313,7 +313,7 @@ void func_8038E97C(Actor *this){
this->position_y = tmp_f0 - (f32)130.0/30.0f;
this->unk38_31 -= 1;
if(this->unk38_31 == 0){
func_80328A84(this, 1);
subaddie_set_state(this, 1);
func_80244C78(1);
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
}
@@ -329,7 +329,7 @@ void chKazooieDoor_update(Actor *this){
if(mapSpecificFlags_get(6)){
func_8025A6EC(COMUSIC_2B_DING_B, -1);
func_802BAFE4(3);
func_80328A84(this, 6);
subaddie_set_state(this, 6);
func_80244BB0(1, 0x6a, 0x7ff8, 0.3f);
this->unk1C[1] = this->position_y + 210.0f;
this->unk1C[0] = this->position_y;
@@ -340,7 +340,7 @@ void chKazooieDoor_update(Actor *this){
this->position_y += 1.8;
this->position_z -= 1.3319999999999999;
if(this->unk1C[1] <= this->position_y){
func_80328A84(this, 7);
subaddie_set_state(this, 7);
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
func_80244C78(1);
this->unk38_31 = 450;
@@ -350,7 +350,7 @@ void chKazooieDoor_update(Actor *this){
case 7: //L8038EC70
this->unk38_31--;
if(this->unk38_31 == 0){
func_80328A84(this, 8);
subaddie_set_state(this, 8);
func_80244BB0(1, 0x6a, 0x7ff8, 0.3f);
}
break;
@@ -360,7 +360,7 @@ void chKazooieDoor_update(Actor *this){
this->position_z += 1.3319999999999999;
if(this->position_y <= this->unk1C[0]){
this->position_y = this->unk1C[0];
func_80328A84(this, 1);
subaddie_set_state(this, 1);
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
func_80244C78(1);
mapSpecificFlags_set(6, FALSE);

4
src/GV/code_9B70.c
View File

@@ -10,10 +10,10 @@ void func_8038FF68(void){
if(map_get() != MAP_12_GV_GOBIS_VALLEY) return;
if(jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID)){
func_8034DE60(func_8034C528(0x190), 0.0f, 270.0f, 0.0f, 1);
func_8034DE60(&func_8034C528(0x190)->type_6D, 0.0f, 270.0f, 0.0f, 1);
}
else{
func_8034E71C(func_8034C5AC(0x130), -1500, 0.0f);
func_8034E71C(&func_8034C5AC(0x130)->type_73, -1500, 0.0f);
}
}

4
src/GV/code_9C10.c
View File

@@ -17,13 +17,13 @@ void func_80390000(s32 arg0){
timed_setStaticCameraToNode(4.0f, 0x15);
func_80324E38(8.0f, 0);
tmp_v0 = func_8034C5AC(0x130);
tmp_v0 = &func_8034C5AC(0x130)->type_73;
if(tmp_v0){
func_8034E71C(tmp_v0, -1000, 0.0f);
func_8034E71C(tmp_v0, 0, 10.0f);
}
tmp_v0_2 = func_8034C528(0x190);
tmp_v0_2 = &func_8034C528(0x190)->type_6D;
if(tmp_v0_2){
func_8034DE60(tmp_v0_2, 0.0f, 270.0f, 0.0f, 1);
}

4
src/GV/matchinggame.c
View File

@@ -63,7 +63,7 @@ void func_80390218(void *arg0){
void __matchingGame_spawnJIggy(void){
static f32 jiggy_position[3] = {0.0f, 100.0f, 0.0f};
jiggySpawn(JIGGY_40_GV_MATCHING_GAME, jiggy_position);
jiggy_spawn(JIGGY_40_GV_MATCHING_GAME, jiggy_position);
}
void __matchingGame_setState(s32 next_state){
@@ -160,7 +160,7 @@ void gv_matchingGame_update(void){
player_getPosition(player_position);
sp4C = func_8033F3E8(mapModel_getModel(0), player_position, 0x190, 0x1a0);
if(sp4C){
sp48 = func_8034C528(sp4C);
sp48 = &func_8034C528(sp4C)->type_6D;
if(matchingGame.state == 1){
__matchingGame_setState(2);
}

1
src/MM/bss_pad.c
View File

@@ -1 +0,0 @@
char pad_MM_D_80389C80[0x10];

4
src/MM/ch/chimpystump.c
View File

@@ -44,7 +44,7 @@ void chchimpystump_update(Actor *this){
{
case 1:
if(mapSpecificFlags_get(0))
func_80328A84(this, 2);
subaddie_set_state(this, 2);
_chchimpystump_80386CA0(this);
break;
@@ -53,7 +53,7 @@ void chchimpystump_update(Actor *this){
this->position_y += 2.5;
if(this->unk28 <= this->position_y){
this->position_y = this->unk28;
func_80328A84(this, 3);
subaddie_set_state(this, 3);
func_802BB41C(1);
func_80244C78(0);
}

32
src/MM/ch/conga.c
View File

@@ -17,7 +17,7 @@
void func_80328FB0(Actor *, f32);
void func_80328B8C(Actor*, s32, f32, s32);
void subaddie_set_state_with_direction(Actor*, s32, f32, s32);
void func_802C8F70(f32);
void timed_exitStaticCamera(f32);
Actor *func_8032811C(s32 actor_id, s32 position[3], s32 yaw);
@@ -78,7 +78,7 @@ int func_80386ED0(Actor * this){
}
void func_80386FB0(Actor *this){
func_80328C64(this, func_80329784(this));
subaddie_set_ideal_yaw(this, func_80329784(this));
func_80328FB0(this, 3.0f);
}
@@ -92,7 +92,7 @@ void func_80386FE8(void){
}
void func_8038708C(Actor *this, s32 anim_id){
func_80328B8C(this, anim_id, 0.0f, 1);
subaddie_set_state_with_direction(this, anim_id, 0.0f, 1);
func_8030E58C(SFX_24_KONGA_NOISE_3, randf2(0.9f, 1.1f));
}
@@ -128,7 +128,7 @@ void func_80387168(ActorMarker *marker, ActorMarker *other_marker){
if( actorPtr->unk38_31 == 3
&& !jiggyscore_isCollected(JIGGY_A_MM_CONGA)
){
func_80328B8C(actorPtr, 8, 0 ,1);
subaddie_set_state_with_direction(actorPtr, 8, 0 ,1);
timed_setStaticCameraToNode(0.0f, 0x10);
func_80324E38(0.0f, 3);
FUNC_8030E624(SFX_84_GOBI_CRYING, 0.8f, 32750);
@@ -238,7 +238,7 @@ void func_803876D0(Actor *this){
){
if(this->state > 3 && this->state < 8){
actor_loopAnimation(this);
func_80328B8C(this, 1, 0.76f, 1);
subaddie_set_state_with_direction(this, 1, 0.76f, 1);
}
return;
}
@@ -269,7 +269,7 @@ void func_803876D0(Actor *this){
};
}//L80387A18
if(actor_animationIsAt(this, 0.66f)){
func_80328BD4(this, 6, 0, 1, 0.38f);
subaddie_maybe_set_state_position_direction(this, 6, 0, 1, 0.38f);
}
if( sp3C
&& func_8028ECAC() != 1
@@ -278,14 +278,14 @@ void func_803876D0(Actor *this){
&& !func_8032A9E4(((ActorLocal_Conga *)&this->local)->unk10, ((ActorLocal_Conga *)&this->local)->unk18, ((ActorLocal_Conga *)&this->local)->unk1C)
&& !func_803872EC()
){
func_80328B8C(this, 4, 0.0f, 1);
subaddie_set_state_with_direction(this, 4, 0.0f, 1);
}//L80387AC0
if( func_8028ECAC() != 1
&& func_80386ED0(this)
&& this->unk38_31 != 0
&& !func_803872EC()
){
func_80328B8C(this, 7, 0.0f, 1);
subaddie_set_state_with_direction(this, 7, 0.0f, 1);
}
break;
@@ -296,12 +296,12 @@ void func_803876D0(Actor *this){
if( animctrl_isPlayedForwards(this->animctrl) == TRUE
&& actor_animationIsAt(this, 0.0f)
){
func_80328B8C(this, 5, 0.0f, 1);
subaddie_set_state_with_direction(this, 5, 0.0f, 1);
}
else if( !animctrl_isPlayedForwards(this->animctrl)
&& actor_animationIsAt(this, 0.001f)
){
func_80328B8C(this, 1, 0.76f, 1);
subaddie_set_state_with_direction(this, 1, 0.76f, 1);
}
break;
@@ -310,7 +310,7 @@ void func_803876D0(Actor *this){
actor_loopAnimation(this);
func_80386FE8();
if( actor_animationIsAt(this, 0.99f)){
func_80328BD4(this, 6, 0.999f, 0, sp3C ? 1.0 : 0.4);
subaddie_maybe_set_state_position_direction(this, 6, 0.999f, 0, sp3C ? 1.0 : 0.4);
}//L80387C30
if( actor_animationIsAt(this, 0.9f)
|| actor_animationIsAt(this, 0.4f)
@@ -330,21 +330,21 @@ void func_803876D0(Actor *this){
|| !timedFuncQueue_is_empty()
|| func_803872EC()
){
func_80328B8C(this, 1, 0.0f, 1);
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
}
break;
case 2: //L80387D0C
actor_playAnimationOnce(this);
if(actor_animationIsAt(this, 0.99f)){
func_80328B8C(this, 1, 0.0f, 1);
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
}
break;
case 8: //L80387D4C
actor_playAnimationOnce(this);
if(actor_animationIsAt(this, 0.99f)){
func_80328B8C(this, 3, 0.0f, 1);
subaddie_set_state_with_direction(this, 3, 0.0f, 1);
func_80311480(ASSET_B38_TEXT_CONGA_DEFEAT, 0xe, this->position, this->marker, func_80387370, NULL);
}
break;
@@ -352,7 +352,7 @@ void func_803876D0(Actor *this){
case 3: //L80387DB8
actor_loopAnimation(this);
if(jiggyscore_isCollected(JIGGY_A_MM_CONGA)){
func_80328B8C(this, 1, 0.0f, 1);
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
}
break;
@@ -360,7 +360,7 @@ void func_803876D0(Actor *this){
if(this->unk10_12 == 0){
if(actor_animationIsAt(this, 0.97f)){
((ActorLocal_Conga *)&this->local)->unkC = 1;
func_80328B8C(this, 6, 0.0f, 1);
subaddie_set_state_with_direction(this, 6, 0.0f, 1);
}
}
break;

4
src/MM/ch/grublin.c
View File

@@ -21,7 +21,7 @@ typedef struct chgrublin_s{
void (*unk34)(ActorMarker *, s32);
}ActorLocal_Grublin;
void func_80328B8C(Actor *, s32, f32, s32);
void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
void func_80388A80(Actor *);
@@ -51,7 +51,7 @@ void func_803889A0(ActorMarker *this, s32 arg1){
Actor *actorPtr;
actorPtr = marker_getActor(this);
func_80328B8C(actorPtr, 5, 0.0f, 1);
subaddie_set_state_with_direction(actorPtr, 5, 0.0f, 1);
actor_playAnimationOnce(actorPtr);
FUNC_8030E8B4(SFX_C2_GRUBLIN_EGH, 1.0f, 32000, actorPtr->position, 1250, 2500);

6
src/MM/ch/hut.c
View File

@@ -82,7 +82,7 @@ void chhut_update(Actor *this){
sp3C[2] = this->position_z;
sp3C[1] += 125.0;
func_8030E484(SFX_5B_HEAVY_STUFF_FALLING);
func_80328A84(this, 1);
subaddie_set_state(this, 1);
actor_playAnimationOnce(this);
__spawnQueue_add_1((GenFunction_1)func_803869EC, (s32)this->marker);
func_802C8F70(this->yaw);
@@ -90,7 +90,7 @@ void chhut_update(Actor *this){
__spawnQueue_add_4((GenFunction_4)func_802C4218, D_803898D8[D_8037DCB0], *(s32*)(&sp3C[0]),*(s32*)(&sp3C[1]),*(s32*)(&sp3C[2]));
}
else{
jiggySpawn(JIGGY_5_MM_HUTS, sp3C);
jiggy_spawn(JIGGY_5_MM_HUTS, sp3C);
}
D_8037DCB0 = ( D_8037DCB0 + 1 ) % 6;
}
@@ -98,7 +98,7 @@ void chhut_update(Actor *this){
case 1: //L80386C2C
if(animctrl_getAnimTimer(this->animctrl) > 0.99){
animctrl_setTransitionDuration(this->animctrl, 0.0f);
func_80328A84(this, 2);
subaddie_set_state(this, 2);
this->position_y -= 160.0f;
}
break;

3
src/MM/ch/juju.c
View File

@@ -19,6 +19,7 @@ void func_80389598(Actor *this);
Actor* func_80389014(ActorMarker *, Gfx **, Mtx**, Vtx** );
/* .bss */
u8 MM_pad_80389C80[0x10];
s32 MM_D_80389C90;
/* .data */
@@ -89,7 +90,7 @@ void func_803891E8(s32 x, s32 y, s32 z, s32 yaw){
sp1C[0] = x;
sp1C[1] = y + 0x14;
sp1C[2] = z;
jiggySpawn(JIGGY_4_MM_JUJU, sp1C);
jiggy_spawn(JIGGY_4_MM_JUJU, sp1C);
}
void func_80389244(s32 x, s32 y, s32 z, s32 yaw){

14
src/MM/ch/lmonkey.c
View File

@@ -4,7 +4,7 @@
void func_8028E668(f32 *, f32, f32, f32);
int actor_animationIsAt(Actor *, f32);
void func_80328B8C(Actor *, s32, f32, s32);
void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
void timed_exitStaticCamera(f32);
void func_80324E38(f32,s32);
void timed_setStaticCameraToNode(f32, s32);
@@ -33,7 +33,7 @@ ActorInfo chlmonkeyInfo = { MARKER_A_CHIMPY, ACTOR_F_CHIMPY, ASSET_35D_MODEL_CHI
void func_80388300(Actor **arg0){
func_8028F31C((*arg0)->position, 800.0f, ACTOR_29_ORANGE_COLLECTIBLE, arg0);
if( func_80329530(*arg0, 345)
&& carriedObj_getMarkerId() == MARKER_36_ORANGE_COLLECTIBLE
&& bacarry_get_markerId() == MARKER_36_ORANGE_COLLECTIBLE
&& func_8028FC34()
){
func_8028FA34(0xc6, *arg0);
@@ -64,13 +64,13 @@ void MM_func_803883AC(Actor *this){
void __chLMonkey_spawnJiggy(s32 x, s32 y, s32 z){
f32 sp1C[3];
TUPLE_ASSIGN(sp1C, x, y, z);
jiggySpawn(JIGGY_9_MM_CHIMPY, sp1C);
jiggy_spawn(JIGGY_9_MM_CHIMPY, sp1C);
}
void __chLMonkey_complete(ActorMarker *marker, enum asset_e arg1, s32 arg2){
Actor * actor = marker_getActor(marker);
mapSpecificFlags_set(4,1);
func_80328A84(actor, 3);
subaddie_set_state(actor, 3);
timed_setStaticCameraToNode(2.3f, 0x12);
timedFunc_set_3(2.9f,__chLMonkey_spawnJiggy, actor->position_x, actor->position_y + 150.0f, actor->position_z);
timed_exitStaticCamera(4.3f);
@@ -90,7 +90,7 @@ void chLMonkey_update(Actor *this){
switch(this->state){
case 1://L80388690
if(mapSpecificFlags_get(2)){
func_80328A84(this, 4);
subaddie_set_state(this, 4);
if(!jiggyscore_isCollected(JIGGY_9_MM_CHIMPY)){
func_80311480(ASSET_B40_DIALOG_CHIMPY_COMPLETE, 0xE, this->position, this->marker, __chLMonkey_complete, NULL);
}else{//L803886E8
@@ -107,14 +107,14 @@ void chLMonkey_update(Actor *this){
this->unk138_24 = 1;
}//L80388774
actor_loopAnimation(this);
func_80328BD4(this, 2, 0.0f, -1, 0.02f);
subaddie_maybe_set_state_position_direction(this, 2, 0.0f, -1, 0.02f);
}
break;
case 2: //L803887A4
func_80388300(&this);
actor_playAnimationOnce(this);
if(actor_animationIsAt(this, 0.99f)){
func_80328B8C(this,1,0.0f,-1);
subaddie_set_state_with_direction(this,1,0.0f,-1);
}
break;
case 4: //L803887E4

2
src/MM/ch/orangepad.c
View File

@@ -24,7 +24,7 @@ void MM_func_803863F0(s32 x, s32 y, s32 z){
TUPLE_ASSIGN(pos, x, y, z);
jiggySpawn(JIGGY_8_MM_ORANGE_PADS, pos);
jiggy_spawn(JIGGY_8_MM_ORANGE_PADS, pos);
}
void func_80386444(ActorMarker *arg0){

19
src/MM/code_24C0.c
View File

@@ -2,6 +2,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "actor.h"
#include "prop.h"
@@ -16,13 +17,13 @@ extern ActorInfo chorangepadInfo;
extern ActorInfo chlmonkeyInfo;
void MM_func_803888B0(void){
spawnableActorList_add( &chhutInfo, actor_new, 0X400);
spawnableActorList_add( &chchimpystump, actor_new, 0x0);
spawnableActorList_add( &chgrublinInfo, actor_new, 0X2000121);
spawnableActorList_add( &chcongaInfo, actor_new, 0X2000160);
spawnableActorList_add( &chorangeInfo, actor_new, 0x0);
spawnableActorList_add( &chjujuhitboxInfo, actor_new, 0x0);
spawnableActorList_add( &chjujuInfo, actor_new, 0X4004);
spawnableActorList_add( &chorangepadInfo, actor_new, 0X40);
spawnableActorList_add( &chlmonkeyInfo, actor_new, 0X100);
spawnableActorList_add( &chhutInfo, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add( &chchimpystump, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add( &chgrublinInfo, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_0);
spawnableActorList_add( &chcongaInfo, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_5);
spawnableActorList_add( &chorangeInfo, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add( &chjujuhitboxInfo, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add( &chjujuInfo, actor_new, ACTOR_FLAG_UNKNOWN_14 | ACTOR_FLAG_UNKNOWN_2);
spawnableActorList_add( &chorangepadInfo, actor_new, ACTOR_FLAG_UNKNOWN_6);
spawnableActorList_add( &chlmonkeyInfo, actor_new, ACTOR_FLAG_UNKNOWN_8);
}

2
src/MMM/bss_pad.c
View File

@@ -1 +1 @@
char pad_D_8038C4C0[0x10];
char pad_D_8038C4C0[0x10];

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

@@ -24,7 +24,7 @@ ActorInfo chLoggo = {
void __chLoggo_flush(ActorMarker* marker) {
Actor* sp1C = marker_getActor(marker);
func_8028F918(2);
func_80328B8C(sp1C, 2, 0.01, 1);
subaddie_set_state_with_direction(sp1C, 2, 0.01, 1);
actor_playAnimationOnce(sp1C);
sp1C->unk60 = 3.2f;
}
@@ -67,7 +67,7 @@ void chLoggo_update(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOn(this);
marker_setCollisionScripts(this->marker, __chLoggo_collide, NULL, NULL);
func_80328B8C(this, 1, 0.01f, 1);
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
actor_loopAnimation(this);
this->unk60 = 0.0f;
if(!fileProgressFlag_get(FILEPROG_8A_EXITED_LOGGO) && levelSpecificFlags_get(0x33)){

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

@@ -153,7 +153,7 @@ void chnapper_update(Actor *this){
}//L80386DF4
if(this->state != 4){
viewport_getPosition(sp58);
viewport_get_position_vec3f(sp58);
sp4C[0] = this->position_x - sp58[0];
sp4C[1] = this->position_y - sp58[1];
sp4C[2] = this->position_z - sp58[2];

12
src/MMM/code_2040.c
View File

@@ -191,7 +191,7 @@ f32 MMM_func_80388430(Actor *this, s32 arg1, s32 arg2, f32 arg3) {
this->unk1C[1] = 11.0f;
break;
case 3:
func_80328A84(this, 5);
subaddie_set_state(this, 5);
break;
}
func_8030E878(SFX_82_METAL_BREAK, randf2(0.93f, 1.07f), 0x7FF8, this->position, 100.0f, 900.0f);
@@ -290,7 +290,7 @@ void func_80388BDC(Actor *this) {
if (!this->unk16C_4) {
if (this->yaw != 0.0f) {
this->unk60 = 0.5f;
func_80328A84(this, 7);
subaddie_set_state(this, 7);
this->unk38_31 = 1;
this->yaw = 270.0f;
} else {
@@ -305,7 +305,7 @@ void func_80388BDC(Actor *this) {
this->yaw = 0.0f;
if(mapSpecificFlags_get(0)) {
func_802BAFE4(0x21);
func_80328A84(this, 6);
subaddie_set_state(this, 6);
func_80244BB0(0, 0x6A, 0x7FF8, 0.3f);
mapSpecificFlags_set(2, 0);
func_8025A6EC(COMUSIC_4_MMM_CLOCK_VERSION, -1);
@@ -316,7 +316,7 @@ void func_80388BDC(Actor *this) {
case 6:
func_80388B2C(this, - (((this->yaw == 0.0f) || (359.0 < this->yaw)) ? 0.023 : 1.09));
if ((this->yaw <= 270.0f) && (this->yaw > 260.0f)) {
func_80328A84(this, 7U);
subaddie_set_state(this, 7U);
this->yaw = 270.0f;
func_8030E540(0x7F);
func_80244C78(0);
@@ -339,14 +339,14 @@ void func_80388BDC(Actor *this) {
} else {
func_802BAFE4(0x23);
}
func_80328A84(this, 8);
subaddie_set_state(this, 8);
func_80244BB0(0, 0x6A, 0x7FF8, 0.3f);
}
break;
case 8:
func_80388B2C(this, 1.3f);
if ((this->yaw >= 0.0f) && (this->yaw < 10.0f)) {
func_80328A84(this, 1U);
subaddie_set_state(this, 1U);
this->yaw = 0.0f;
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
mapSpecificFlags_set(0, 0);

4
src/MMM/code_2F60.c
View File

@@ -75,7 +75,7 @@ void func_803893A4(Actor *this){
break;
case 2:
if(actor_animationIsAt(this, 0.999f)){
func_80328B8C(this, 1, 0.001f, 0);
subaddie_set_state_with_direction(this, 1, 0.001f, 0);
actor_playAnimationOnce(this);
this->unk38_31 = 2;
}
@@ -86,7 +86,7 @@ void func_803893A4(Actor *this){
void func_80389484(ActorMarker * marker, f32 anim_duration){
Actor *this = marker_getActor(marker);
func_80328B8C(this, 2, 0.001f, 1);
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
actor_playAnimationOnce(this);
animctrl_setDuration(this->animctrl, anim_duration);
this->unk38_31 = 1;

2
src/MMM/code_3420.c
View File

@@ -163,7 +163,7 @@ void MMM_func_80389810(ActorMarker *caller, enum asset_e text_id, s32 arg2) {
}
void MMM_func_803898A0() {
jiggySpawn(JIGGY_60_MMM_MOTZHAND, D_8038C1E0);
jiggy_spawn(JIGGY_60_MMM_MOTZHAND, D_8038C1E0);
}
void MMM_func_803898C8() {

4
src/MMM/code_47D0.c
View File

@@ -128,7 +128,7 @@ void func_8038AF90(Struct_MMM_47D0_0 *arg0, Struct68s *arg1, f32 arg2) {
func_8028F66C(BS_INTR_D_SURF);
}
if (sp3C && ((sp40[0] != 0.0f) || (sp40[1] != 0.0f))) {
viewport_getRotation(sp70);
viewport_get_rotation_vec3f(sp70);
sp64[0] = sp40[0];
sp64[1] = 0.0f;
sp64[2] = -sp40[1];
@@ -147,7 +147,7 @@ void func_8038AF90(Struct_MMM_47D0_0 *arg0, Struct68s *arg1, f32 arg2) {
func_80351B28(arg1, sp54);
func_8035179C(arg1, sp54);
if (arg0->unk0 != NULL) {
viewport_getPosition(sp7C);
viewport_get_position_vec3f(sp7C);
sp64[0] = sp54[0] - sp7C[0];
sp64[2] = sp54[2] - sp7C[2];
sp64[1] = 0.0f;

4
src/MMM/code_DC0.c
View File

@@ -74,7 +74,7 @@ bool MMM_func_80387340(ActorMarker *marker){
if(actor->state == 2)
return FALSE;
func_80328A84(actor, 2);
subaddie_set_state(actor, 2);
animctrl_setPlaybackType(actor->animctrl, ANIMCTRL_ONCE);
sp1C = func_803871B0();
if(sp1C != 0){
@@ -83,7 +83,7 @@ bool MMM_func_80387340(ActorMarker *marker){
ml_vec3f_copy(sp20, actor->position);
sp20[1] += 80.0f;
func_8025A70C(COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
jiggySpawn(JIGGY_63_MMM_FLOWER_POTS, sp20);
jiggy_spawn(JIGGY_63_MMM_FLOWER_POTS, sp20);
}
else{
func_8025A70C(COMUSIC_2B_DING_B);

2
src/RBB/ch/anchorctrl.c
View File

@@ -31,7 +31,7 @@ void __chAnchorCtrl_spawnJiggy(ActorMarker *marker, s32 arg1, s32 arg2){
static f32 D_80390B34[3] = {-5100.0f, -2550.0f, 1470.0f};
Actor *actor = marker_getActor(marker);
jiggySpawn(JIGGY_53_RBB_SNORKEL, &D_80390B34);
jiggy_spawn(JIGGY_53_RBB_SNORKEL, &D_80390B34);
timed_setStaticCameraToNode(0.5f, 0xb);
__chAnchorCtrl_setState(actor, 3);
}

2
src/RBB/ch/bossboombox.c
View File

@@ -198,7 +198,7 @@ void chbossboombox_respawnJiggy(s32 position_x, s32 position_y, s32 position_z){
D_80391288[0] = (f32)position_x;
D_80391288[1] = (f32)(position_y + 0x28);
D_80391288[2] = (f32)position_z;
jiggySpawn(JIGGY_56_RBB_BOSS_BOOM_BOX, &D_80391288);
jiggy_spawn(JIGGY_56_RBB_BOSS_BOOM_BOX, &D_80391288);
}
void func_8038CA70(Actor *this, f32(*arg1)[3]){

22
src/RBB/ch/cog.c
View File

@@ -4,7 +4,7 @@
/* typedefs and declarations */
typedef struct {
u8 unk0;
u8 sfxsource_index;
}ActorLocal_RBB_27E0;
void func_80388C20(Actor *this);
@@ -38,7 +38,7 @@ void func_80388BD0(Actor *this, s32 arg1){
void func_80388BE8(Actor *actor){
ActorLocal_RBB_27E0 *local = (ActorLocal_RBB_27E0 *)&actor->local;
if(actor->modelCacheIndex == 0x17b){
func_8030DA44(local->unk0);
func_8030DA44(local->sfxsource_index);
}
}
@@ -51,14 +51,14 @@ void func_80388C20(Actor *this){
this->marker->unk30 = func_80388BE8;
this->unk16C_4 = 1;
if(this->modelCacheIndex == 0x17B){
local->unk0 = func_8030D90C();
func_8030DEB4(local->unk0, 1000.0f, 2000.0f);
func_8030DF68(local->unk0, &this->position);
func_8030DBB4(local->unk0, 0.5f);
sfxsource_setSfxId(local->unk0, SFX_9F_GENERATOR_RUNNING);
func_8030DD14(local->unk0, 3);
sfxsource_setSampleRate(local->unk0, 0);
func_8030E2C4(local->unk0);
local->sfxsource_index = func_8030D90C();
sfxsource_set_fade_distances(local->sfxsource_index, 1000.0f, 2000.0f);
sfxsource_set_position(local->sfxsource_index, &this->position);
func_8030DBB4(local->sfxsource_index, 0.5f);
sfxsource_setSfxId(local->sfxsource_index, SFX_9F_GENERATOR_RUNNING);
func_8030DD14(local->sfxsource_index, 3);
sfxsource_setSampleRate(local->sfxsource_index, 0);
func_8030E2C4(local->sfxsource_index);
}//L80388CFC
if(this->state == 0){
if(this->modelCacheIndex == 0x17B){
@@ -78,7 +78,7 @@ void func_80388C20(Actor *this){
if(360.0f <= this->roll)
this->roll -= 360.0f;
if(this->modelCacheIndex == 0x17B){
func_8030DB04(local->unk0, 0x61a8, &this->position, 1000.0f, 2000.0f);
func_8030DB04(local->sfxsource_index, 25000, &this->position, 1000.0f, 2000.0f);
}
}
}

2
src/RBB/ch/whistlectrl.c
View File

@@ -28,7 +28,7 @@ void __chWhistleCtrl_setState(Actor *actor, s32 arg1){
void __chWhistleCtrl_soundWhistle(void){
func_802C8F70(225.0f);
jiggySpawn(JIGGY_54_RBB_WHISTLE, D_80390A74);
jiggy_spawn(JIGGY_54_RBB_WHISTLE, D_80390A74);
}
void __chWhistleCtrl_correct(void){

2
src/RBB/code_640.c
View File

@@ -139,7 +139,7 @@ void func_80386A7C(Actor *this){
func_802D3D74(this);
this->depth_mode = 1;
viewport_getPosition(&sp2C);
viewport_get_position_vec3f(&sp2C);
sp28 = func_80386A30(&this->position);
temp_v0 = func_80386A30(&sp2C);
this->unk38_0 = 0;

16
src/RBB/propellorctrl.c
View File

@@ -2,16 +2,18 @@
#include "functions.h"
#include "variables.h"
s32 pad_803912C0[2];
u8 __propellorCtrlState;
f32 __propellorTimer;
void __propellorCtrl_setState(s32 arg0){
static f32 __propellorTimer;
void __propellorCtrl_setState(s32 arg0){
f32* timerPtr = &__propellorTimer;
*timerPtr = 0.0f;
__propellorTimer = 0.0f;
if(arg0 == 1)
__propellorTimer = 6.5f;
if(arg0 == 1) {
*timerPtr = 6.5f;
}
if(arg0 == 2){
item_set(ITEM_3_PROPELLOR_TIMER, 3900 - 1);
@@ -49,8 +51,6 @@ void rbb_propellorCtrl_start(void){
}
void rbb_propellorCtrl_update(void){
extern f32 __propellorTimer;
if( __propellorCtrlState == 0)
if(levelSpecificFlags_get(0x27) && levelSpecificFlags_get(0x28))
__propellorCtrl_setState(1);

2
src/SM/ch/attacktutorial.c
View File

@@ -98,7 +98,7 @@ void chAttackTutorial_setState(Actor * this, s32 arg1){
}
break;
}//L803874A8
func_80328A84(this, arg1);
subaddie_set_state(this, arg1);
}
int func_803874C4(void){

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

@@ -8,7 +8,7 @@
f32 func_80309724(f32*);
void func_802C4218(s32, f32, f32, f32);
void func_803252D0(f32, s32);
void func_80328B8C(Actor *, s32, f32, s32);
void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
//typedefs
typedef struct ch_vegatable{
@@ -208,7 +208,7 @@ void func_80387C28(Actor * this){
func_803252D0(1.5f, 7);
actor_collisionOff(this);
if(local->unkC != 3){
func_80328B8C(this, 3, 0.0f, 1);
subaddie_set_state_with_direction(this, 3, 0.0f, 1);
actor_playAnimationOnce(this);
}
else{
@@ -337,7 +337,7 @@ void func_80388080(Actor *this){
this->unk1C_y += (local->unkC == 3)? 270.0 : 85.0;
}
//L80388384
func_80328A84(this, 4);
subaddie_set_state(this, 4);
}
break;
case 4: //L8038839C
@@ -352,7 +352,7 @@ void func_80388080(Actor *this){
func_80387F00(this);
actor_collisionOn(this);
func_80328A84(this, 2);
subaddie_set_state(this, 2);
}//L80388494
if(!this->unk138_23){

8
src/SM/code_2990.c
View File

@@ -8,7 +8,7 @@ void func_8028E668(f32*, f32, f32, f32);
void func_80328FB0(Actor *, f32);
void func_8030DA44(u8);
void timed_exitStaticCamera(f32);
void func_80328B8C(Actor *, s32, f32, s32);
void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
//static types
typedef struct sm_2900_struct{
@@ -126,7 +126,7 @@ void func_80388FA0(Actor *this, s32 arg1){
other = subaddie_getLinkedActor(this);
myOther = this->unk100;
if(myOther && other && myOther->unk14_20 == 0xB8)
func_80328B8C(other, 3, 0.0001f, 1);
subaddie_set_state_with_direction(other, 3, 0.0001f, 1);
actor_playAnimationOnce(this);
this->unk44_31 = func_8030D90C();
sfxsource_setSfxId(this->unk44_31, 0x3f9);
@@ -150,7 +150,7 @@ void func_80388FA0(Actor *this, s32 arg1){
other = subaddie_getLinkedActor(this);
myOther = this->unk100;
if(myOther && other && myOther->unk14_20 == 0xB8)
func_80328B8C(other, 2, 0.0001f, 1);
subaddie_set_state_with_direction(other, 2, 0.0001f, 1);
animctrl_setSmoothTransition(this->animctrl, 1);
actor_playAnimationOnce(this);
this->unk44_31 = func_8030D90C();
@@ -162,7 +162,7 @@ void func_80388FA0(Actor *this, s32 arg1){
func_8028F94C(2, this->position);
break;
}
func_80328B8C(this, arg1, 0.0001f, 1);
subaddie_set_state_with_direction(this, arg1, 0.0001f, 1);
}
void func_80389214(ActorMarker *marker, enum asset_e text_id, s32 arg2){

2
src/SM/code_3FC0.c
View File

@@ -57,7 +57,7 @@ void func_8038A3B0(Actor *this){
actor_collisionOff(this);
if(this->state == 2 && levelSpecificFlags_get(sp24 + 0x35)){
func_80328A84(this, 1);
subaddie_set_state(this, 1);
actor_playAnimationOnce(this);
}

Some files were not shown because too many files have changed in this diff Show More