falso
/
banjo-kazooie
mirror of https://github.com/n64decomp/banjo-kazooie.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SM/.data section fully defined

This commit is contained in:
Banjo Kazooie 2022-07-08 12:10:06 -05:00
parent 070a42061a
commit 8b26b543a9
143 changed files with 964 additions and 795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/bsint.h
View File

@ -20,7 +20,7 @@ typedef struct bs_map_s{
} bsMap;
void bsList_clearAll(void);
void bsList_setInitMethod(s32 i, bsStateMethod func);
void bsList_setInitMethod(enum bs_e i, bsStateMethod func);
void bsList_setUpdateMethod(s32 i, bsStateMethod func);
void bsList_setEndMethod(s32 i, bsStateMethod func);
void bsList_setInterruptMethod(s32 i, bsStateMethod func);

30
include/enums.h
View File

@ -2800,5 +2800,35 @@ enum common_particle_e{
COMMON_PARTICLE_4_EGG_ASS = 4
};
enum bsgroup_e {
BSGROUP_3_WONDERWING = 0x3,
BSGROUP_5_CLIMB = 0x5,
BSGROUP_6_TURBO_TALON_TRAINERS,
BSGROUP_7_CROC_ATTACK,
BSGROUP_8_TROT,
BSGROUP_9_LONG_LEG,
BSGROUP_A_FLYING,
BSGROUP_B_ATTACKING,
BSGROUP_C_WALRUS_SLED,
BSGROUP_D_TRANSFORMING
};
enum bswatergroup_e{
BSWATERGROUP_0_NONE,
BSWATERGROUP_1_SURFACE,
BSWATERGROUP_2_UNDERWATER
};
enum misc_flag_e{
MISC_FLAG_1_ON_FLIGHT_PAD = 0x1,
MISC_FLAG_2_ON_SPRING_PAD,
MISC_FLAG_E_TOUCHING_WADING_BOOTS = 0xE,
MISC_FLAG_10_TOUCHING_TURBO_TRAINERS = 0x10,
MISC_FLAG_1B_TRANSFORMING = 0x1B
};
#endif

2
include/functions.h
View File

@ -415,7 +415,7 @@ Actor * func_803056FC(enum actor_e id, s32 pos[3], s32 yaw);
f32 func_80309724(f32[3]);
BKModelBin *func_8030A428(s32);
u8 func_8030D90C(void);
void func_8030DA80(u8 indx, enum sfx_e uid);
void sfxsource_setSfxId(u8 indx, enum sfx_e uid);
void func_8030DBB4(u8, f32);
void func_8030DD14(u8, int);
void func_8030DF68(u8, f32[3]);

5
include/structs.h
View File

@ -451,9 +451,8 @@ typedef struct struct_31_s{
} struct31s;
typedef struct struct_32_s{
f32 unk0[2];
f32 unk8[2];
f32 unk10[2];
f32 unk0[3];
f32 unkC[3];
} struct32s;
typedef struct struct_33_s{

4
progress/progress_core2.svg
View File

@ -17,7 +17,7 @@
<text x="22.0" y="14">core2</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="78.5" y="15" fill="#010101" fill-opacity=".3">71.8271%</text>
<text x="77.5" y="14">71.8271%</text>
<text x="78.5" y="15" fill="#010101" fill-opacity=".3">71.8675%</text>
<text x="77.5" y="14">71.8675%</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

4
progress/progress_total.svg
View File

@ -17,7 +17,7 @@
<text x="75.0" y="14">Banjo-Kazooie (us.v10)</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="184.5" y="15" fill="#010101" fill-opacity=".3">78.2084%</text>
<text x="183.5" y="14">78.2084%</text>
<text x="184.5" y="15" fill="#010101" fill-opacity=".3">78.2315%</text>
<text x="183.5" y="14">78.2315%</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

2
src/BGS/code_3420.c
View File

@ -46,7 +46,7 @@ enum asset_e D_80390A18[] = {0xC6D, 0xC70, 0xC71, 0xC8E, 0, 0, 0,
/* .code */
bool func_80389810(f32 arg0[3]) {
if (func_8028ECAC() != 7) {
if (func_8028ECAC() != BSGROUP_7_CROC_ATTACK) {
return FALSE;
}
func_8028E9C4(2, arg0);

4
src/CC/code_1F70.c
View File

@ -94,9 +94,9 @@ void func_80388518(s32 arg0){
if(D_80389FA0.unk21 == 2){
func_8030DD90(D_80389FA0.unk4, 0);
func_8030DBB4(D_80389FA0.unk4, 1.0f);
func_8030DA80(D_80389FA0.unk4, SFX_7D_ANCHOR_LIFTING);
sfxsource_setSfxId(D_80389FA0.unk4, SFX_7D_ANCHOR_LIFTING);
func_8030DD14(D_80389FA0.unk4, 3);
func_8030DABC(D_80389FA0.unk4, 27000);
sfxsource_setSampleRate(D_80389FA0.unk4, 27000);
func_8030E2C4(D_80389FA0.unk4);
}

4
src/CC/code_530.c
View File

@ -43,9 +43,9 @@ void func_80386920(Actor *this, s32 next_state){
if(next_state == 2 || next_state == 3 || next_state == 4){
func_8030DD90(local->unk0, 1);
func_8030DBB4(local->unk0, 0.3f);
func_8030DA80(local->unk0, 0x3ec);
sfxsource_setSfxId(local->unk0, 0x3ec);
func_8030DD14(local->unk0, 3);
func_8030DABC(local->unk0, 28000);
sfxsource_setSampleRate(local->unk0, 28000);
func_8030E2C4(local->unk0);
}

8
src/CCW/code_14B0.c
View File

@ -3,7 +3,7 @@
#include "variables.h"
extern void func_8030DBFC(u8, f32, f32, f32);
extern void func_8030DABC(u8, s32);
extern void sfxsource_setSampleRate(u8, s32);
typedef struct{
s16 unk0;
@ -73,10 +73,10 @@ void func_80387A40(Actor *this) {
}
local->unk0 = func_8030D90C();
local->unk18[0] = local->unk18[1] = local->unk18[2] = 0.0f;
func_8030DA80(local->unk0, 0x3FA);
sfxsource_setSfxId(local->unk0, 0x3FA);
func_8030DD14(local->unk0, 2);
func_8030DBB4(local->unk0, 0.9f);
func_8030DABC(local->unk0, 0);
sfxsource_setSampleRate(local->unk0, 0);
func_803878A0(this, 1);
return;
}
@ -112,7 +112,7 @@ void func_80387A40(Actor *this) {
func_8030DEB4(local->unk0, 500.0f, 1500.0f);
func_8030DF68(local->unk0, this->position);
func_8030E2C4(local->unk0);
func_8030DABC(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));
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)) {
player_getPosition(sp44);
if (sp44[2] > -600.0f) {

2
src/CCW/code_2B00.c
View File

@ -110,7 +110,7 @@ void func_803891B0(void* marker) {
Actor* actor = marker_getActor(reinterpret_cast(ActorMarker*, marker));
actor->unk44_31 = func_8030ED2C(SFX_3EC_CCW_DOOR_OPENING, 3);
func_8030DD90(actor->unk44_31, 0);
func_8030DABC(actor->unk44_31, 0x2AF8);
sfxsource_setSampleRate(actor->unk44_31, 0x2AF8);
func_8030DBB4(actor->unk44_31, 0.3f);
func_8030E2C4(actor->unk44_31);
}

6
src/CCW/code_950.c
View File

@ -116,10 +116,10 @@ void chwasp_update(Actor *this) {
local->unk0 = func_8030D90C();
local->unk4 = 0;
local->unk14 = 1000.0f;
func_8030DA80(local->unk0, 0x3FA);
sfxsource_setSfxId(local->unk0, 0x3FA);
func_8030DD14(local->unk0, 2);
func_8030DBB4(local->unk0, 0.9f);
func_8030DABC(local->unk0, 0);
sfxsource_setSampleRate(local->unk0, 0);
marker_setCollisionScripts(this->marker, func_80387124, NULL, func_80387150);
chwasp_setState(this, 1);
return;
@ -211,5 +211,5 @@ void chwasp_update(Actor *this) {
func_8030DEB4(local->unk0, 500.0f, 1500.0f);
func_8030DF68(local->unk0, this->position);
func_8030E2C4(local->unk0);
func_8030DABC(local->unk0, (s32) ((local->unk18 / local->unk14) * 10000.0f));
sfxsource_setSampleRate(local->unk0, (s32) ((local->unk18 / local->unk14) * 10000.0f));
}

2
src/FP/code_11F0.c
View File

@ -147,7 +147,7 @@ void func_8038794C(Actor *this){
}//L80387B38
if(!this->unk138_24 && func_80329530(this, 0x1f4)){
if(!func_8028ECAC() || func_8028ECAC() == 8){
if(!func_8028ECAC() || func_8028ECAC() == BSGROUP_8_TROT){
if(func_80311480(0xbff, 0x2a, this->position, NULL, NULL, NULL)){
for(i = 0; i <5; i++ ){
timedFunc_set_1(D_80391BEC[i], (TFQM1)func_8038787C, (s32)this->marker);

2
src/FP/code_1FF0.c
View File

@ -81,4 +81,4 @@ void func_80388584(Actor *this){
func_80328B8C(this, 1, 0.0001f, 1);
}
}
}
}

8
src/FP/code_2350.c
View File

@ -62,7 +62,7 @@ struct31s D_80391D30 = {
};
struct42s D_80391D58 = {
{{-10.0f, 10.0f}, {-10.0f, 10.0f}, {240.0f, 10.0f}},
{{-10.0f, 10.0f, -10.0f}, {10.0f, 240.0f, 10.0f}},
{{0.0f, 0.0f, 0.0f}, {0.0f, 20.0f, 0.0f}}
};
@ -204,7 +204,7 @@ bool func_80388CA0(Actor *this){
ActorLocal_FP_2350 *local = (ActorLocal_FP_2350 *)&this->local;
u32 sp20;
if(func_8028ECAC() != 0 && func_8028ECAC() != 8)
if(func_8028ECAC() != 0 && func_8028ECAC() != BSGROUP_8_TROT)
return FALSE;
if( !func_80329530(this, 1100) ){
@ -466,11 +466,11 @@ void func_803896FC(Actor *this){
if(func_80388CA0(this)){
func_80388B18(this, local->unk19);
}//L803899DC
else if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == 12){
else if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == BSGROUP_C_WALRUS_SLED){
func_803888E4(this);
}
else if( func_80329530(this, 0x1C2)
&& !func_8028ECAC()
&& func_8028ECAC() == 0
&& func_8028F20C()
&& func_8028EFC8()
&& sp3C[1] == 1

2
src/FP/code_3E00.c
View File

@ -127,7 +127,7 @@ void func_8038A384(Actor *this){
switch(this->state){
case 1://L8038A5B0
if(!levelSpecificFlags_get(0x19) && func_80329530(this, 0xfa)){
if(func_8028ECAC() == 0 || func_8028ECAC() == 8){
if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){
if(sp34 == 0
&& !jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)
&& !jiggyscore_isSpawned(JIGGY_2C_FP_BOGGY_3)

4
src/FP/code_4770.c
View File

@ -259,7 +259,7 @@ void func_8038B2C8(ActorMarker *caller, enum asset_e text_id, s32 arg2){
}
void func_8038B39C(void){
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == 6){
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS){
func_8028F710(3, 2.0f);
}
func_8028F918(1);
@ -317,7 +317,7 @@ void func_8038B544(void){
break;
case 2: //L8038B61C
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == 6){
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS){
func_8028F710(3, 20.0f);
}

2
src/FP/code_4D0.c
View File

@ -85,7 +85,7 @@ void func_80386AA4(Actor *this){
}
break;
case 3://L80386B50
if(func_8028ECAC() != 0xC){
if(func_8028ECAC() != BSGROUP_C_WALRUS_SLED){
func_80386920(this, 2);
}
break;

10
src/FP/code_6AE0.c
View File

@ -33,7 +33,7 @@ struct31s D_8039210C = {
};
struct43s D_80392134 = {
{{-200.0f, 200.0f}, {-200.0f, 200.0f}, {400.0f, 200.0f}},
{{-200.0f, 200.0f, -200.0f}, {200.0f, 400.0f, 200.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
{{-100.0f, 0.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}
};
@ -50,7 +50,7 @@ struct31s D_8039217C = {
s32 D_803921A4[3] = { 0xDC, 0xDC, 0xE6};
struct43s D_803921B0 = {
{{-200.0f, 0.0f}, {-200.0f, 200.0f}, {200.0f, 200.0f}},
{{-200.0f, 0.0f, -200.0f}, {200.0f, 200.0f, 200.0f}},
{{ 0.0f, -10.0f, 0.0f}, { 0.0f, -10.0f, 0.0f}},
{{-50.0f, 0.0f, -50.0f}, {50.0f, 200.0f, 50.0f}}
};
@ -64,7 +64,7 @@ struct31s D_803921F8 = {
};
struct43s D_80392220 = {
{{-300.0f, 400.0f}, {-300.0f, 300.0f}, {800.0f, 300.0f}},
{{-300.0f, 400.0f, -300.0f}, {300.0f, 800.0f, 300.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
{{-80.0f, 80.0f, -80.0f}, {80.0f, 80.0f, 80.0f}}
};
@ -79,7 +79,7 @@ struct31s D_80392268 ={
};
struct43s D_80392290 = {
{{-300.0f, 400.0f}, {-300.0f, 300.0f}, {800.0f, 300.0f}},
{{-300.0f, 400.0f, -300.0f}, {300.0f, 800.0f, 300.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
{{-80.0f, 80.0f, -80.0f}, {80.0f, 80.0f, 80.0f}}
};
@ -95,7 +95,7 @@ struct31s D_803922D8 = {
s32 D_80392300[3] = { 0xDC, 0xDC, 0xE6};
struct43s D_8039230C = {
{{-100.0f, 0.0f}, {-100.0f, 100.0f}, {100.0f, 100.0f}},
{{-100.0f, 0.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
{{0.0f, -10.0f, 0.0f}, {0.0f, -10.0f, 0.0f}},
{{-80.0f, 0.0f, -80.0f}, {50.0f, 200.0f, 80.0f}}
};

2
src/FP/code_790.c
View File

@ -29,7 +29,7 @@ struct31s D_80391AD4 = {
};
struct43s D_80391AFC = {
{{-300.0f, 350.0f}, {-300.0f, 300.0f}, {800.0f, 300.0f}},
{{-300.0f, 350.0f, -300.0f}, {300.0f, 800.0f, 300.0f}},
{{0.0f, -800.0f, 0.0f}, {0.0f, -800.0f, 0.0f}},
{{-50.0f, -50.0f, -50.0f}, {50.0f, 50.0f, 50.0f}}
};

10
src/FP/code_8E20.c
View File

@ -87,7 +87,7 @@ void func_8038F41C(Actor *this){
}
void func_8038F454(Actor *this){
if(!mapSpecificFlags_get(7) && func_8028ECAC() != 0xA && func_80329530(this, 1000) ){
if(!mapSpecificFlags_get(7) && func_8028ECAC() != BSGROUP_A_FLYING && func_80329530(this, 1000) ){
mapSpecificFlags_set(7, TRUE);
func_80328A84(this, 2);
actor_loopAnimation(this);
@ -203,7 +203,7 @@ void func_8038F7AC(Actor *this){
actor_collisionOn(this);
switch(this->state){
case 1: //L8038F984
if(func_8028ECAC() == 0xa){
if(func_8028ECAC() == BSGROUP_A_FLYING){
func_8038F454(this);
break;
}
@ -232,7 +232,7 @@ void func_8038F7AC(Actor *this){
break;
case 4: //L8038FAD0
if(!func_80329530(this, 2000) && func_8028ECAC() != 0xA){
if(!func_80329530(this, 2000) && func_8028ECAC() != BSGROUP_A_FLYING){
func_8038F560(this);
break;
}
@ -254,7 +254,7 @@ void func_8038F7AC(Actor *this){
case 6: //L8038FBA8
func_8038F6C4(this, local->unk18, 1.0f);
if( func_80329530(this, 1700) ) break;
if( func_8028ECAC() == 0xA ) break;
if( func_8028ECAC() == BSGROUP_A_FLYING ) break;
func_8038F560(this);
@ -269,7 +269,7 @@ void func_8038F7AC(Actor *this){
if(!func_8038F6C4(this, local->unkC, 4.5f))
break;
if(func_80329530(this, 1000) || func_8028ECAC() == 0xA){
if(func_80329530(this, 1000) || func_8028ECAC() == BSGROUP_A_FLYING){
func_8038F528(this);
break;
}

2
src/FP/code_9EA0.c
View File

@ -70,7 +70,7 @@ void func_80390388(Actor *this){
}
if( func_80329530(this, 0xFA)
&& (func_8028ECAC() == 0 || func_8028ECAC() == 8)
&& (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)
){
if(0.0f == this->unk1C[0] && func_80390334()){
if(func_80311480(0xc1f, 0xb, this->position, NULL, NULL, NULL)){

4
src/FP/code_A40.c
View File

@ -94,9 +94,9 @@ void chXmasTree_update(Actor *this){
func_803300D8(this->marker, func_80386EAC);
if(this->unk44_31 == 0){
this->unk44_31 = func_8030D90C();
func_8030DA80(this->unk44_31, SFX_415_UNKNOWN);
sfxsource_setSfxId(this->unk44_31, SFX_415_UNKNOWN);
func_8030DD14(this->unk44_31, 3);
func_8030DABC(this->unk44_31, 28000);
sfxsource_setSampleRate(this->unk44_31, 28000);
}
func_802C3BF8(func_80386FB4);
func_802C3C88(func_80386FE0, this->marker);

6
src/GV/code_4740.c
View File

@ -28,7 +28,7 @@ ActorInfo D_80391098 = { MARKER_AD_SLAPPA, ACTOR_120_SLAPPA, ASSET_376_MODEL_SLA
s32 D_803910BC[3] = {175, 100, 0};
s32 D_803910C8[3] = {175, 140, 0};
struct43s D_803910D4 = {
{{-120.0f, 550.0f}, {-120.0f, 120.0f}, {950.0f, 120.0f}},
{{-120.0f, 550.0f, -120.0f}, {120.0f, 950.0f, 120.0f}},
{{0.0f, -1400.0f, 0.0f}, {0.0f, -1400.0f, 0.0f}},
{{-100.0f, 0.0f, -100.0f}, {100.0f, 30.0f, 100.0f}}
};
@ -167,10 +167,10 @@ void func_8038B124(Actor *this){
this->unk1C[1] = 0.0f;
if(this->unk44_31 == 0){
this->unk44_31 = func_8030D90C();
func_8030DA80(this->unk44_31, SFX_3EC_CCW_DOOR_OPENING);
sfxsource_setSfxId(this->unk44_31, SFX_3EC_CCW_DOOR_OPENING);
func_8030DD14(this->unk44_31, 2);
func_8030DBB4(this->unk44_31, 0.1f);
func_8030DABC(this->unk44_31, 32000);
sfxsource_setSampleRate(this->unk44_31, 32000);
}
}//L8038B25C

8
src/GV/code_5570.c
View File

@ -58,7 +58,7 @@ void func_8038BA08(Actor *this){
actor_loopAnimation(this);
this->unk100 = NULL;
D_80391A80 = 3;
if(func_8028ECAC() == 6)
if(func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS)
func_8028F710(3, 0.0f);
func_80311480(ASSET_A79_TEXT_GRABBA_DEFEAT, 0xf, this->position, this->marker, func_8038B988, NULL);
@ -171,10 +171,10 @@ void func_8038BEA0(Actor *this){
this->unk16C_4 = TRUE;
if(this->unk44_31 == 0){
this->unk44_31 = func_8030D90C();
func_8030DA80(this->unk44_31, SFX_3EC_CCW_DOOR_OPENING);
sfxsource_setSfxId(this->unk44_31, SFX_3EC_CCW_DOOR_OPENING);
func_8030DD14(this->unk44_31, 2);
func_8030DBB4(this->unk44_31, 0.1f);
func_8030DABC(this->unk44_31, 32000);
sfxsource_setSampleRate(this->unk44_31, 32000);
}
if(this->unk100 == NULL){
this->unk100 = func_8032B16C(JIGGY_3E_GV_GRABBA);
@ -234,7 +234,7 @@ void func_8038BEA0(Actor *this){
func_802BB3DC(0, 12.0f, 0.92f);
}
else if(func_80329530(this, 600)){
if(func_8028ECAC() == 6){
if(func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS){
this->unk38_31++;
}
else{

4
src/GV/code_6370.c
View File

@ -78,10 +78,10 @@ void func_8038C8A0(Actor *this, s32 next_state){
if(next_state == 4 || next_state == 5){
local->unk4 = func_8030D90C();
func_8030DA80(local->unk4, SFX_3EC_CCW_DOOR_OPENING);
sfxsource_setSfxId(local->unk4, SFX_3EC_CCW_DOOR_OPENING);
func_8030DD14(local->unk4, 3);
func_8030DBB4(local->unk4, 0.8f);
func_8030DABC(local->unk4, 0);
sfxsource_setSampleRate(local->unk4, 0);
func_8030E2C4(local->unk4);
}//L8038C9B8

2
src/GV/code_7060.c
View File

@ -71,7 +71,7 @@ void func_8038D47C(Actor *this){
if(!mapSpecificFlags_get(0x14)){
player_getPosition(sp3C);
if(!func_8028ECAC()){
if(func_8028ECAC() == 0){
if( ml_vec3f_distance(sp3C, this->unk1C) < 100.0f || ml_vec3f_distance(sp3C, this->velocity) < 100.0f){
if(func_80311480(ASSET_A7B_TEXT_JINXY_MEET, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(0x14, 1);

4
src/GV/code_D60.c
View File

@ -143,9 +143,9 @@ void func_80387408(Actor *this){
if(func_8025773C(&local->unk10, tick)){
for(i = 0; i < 2; i++){
func_8030DA80(local->unk0[i], SFX_3F9_UNKNOWN);
sfxsource_setSfxId(local->unk0[i], SFX_3F9_UNKNOWN);
func_8030DD14(local->unk0[i], 3);
func_8030DABC(local->unk0[i], 32000);
sfxsource_setSampleRate(local->unk0[i], 32000);
func_8030E2C4(local->unk0[i]);
}
}

10
src/MMM/code_47D0.c
View File

@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_8030DABC(u8, s32);
extern void sfxsource_setSampleRate(u8, s32);
extern f32 func_80258640(f32[3], f32[3]);
typedef struct {
@ -75,10 +75,10 @@ void func_8038ADF0(Struct_MMM_47D0_0 *arg0, Struct68s *arg1) {
func_8038AA30(arg0, arg1);
func_80351A14(arg1, (Struct68DrawMethod)func_8038AC40);
sp3F = func_80351758(arg1);
func_8030DA80(sp3F, SFX_3EC_CCW_DOOR_OPENING);
sfxsource_setSfxId(sp3F, SFX_3EC_CCW_DOOR_OPENING);
func_8030DD14(sp3F, 3);
func_8030DBB4(sp3F, 0.6f);
func_8030DABC(sp3F, 0);
sfxsource_setSampleRate(sp3F, 0);
func_8030E2C4(sp3F);
func_8035179C(arg1, sp28);
sp38 = 500.0f;
@ -169,10 +169,10 @@ void func_8038AF90(Struct_MMM_47D0_0 *arg0, Struct68s *arg1, f32 arg2) {
}
if (arg0->unk4 == 1) {
sp38 = func_80351758(arg1);
func_8030DABC(sp38, 0);
sfxsource_setSampleRate(sp38, 0);
} else {
sp38 = func_80351758(arg1);
func_8030DABC(sp38, (s32) ((gu_sqrtf(arg0->unkC[0]*arg0->unkC[0] + arg0->unkC[1]*arg0->unkC[1] + arg0->unkC[2]*arg0->unkC[2]) / 400.0) * 15000.0));
sfxsource_setSampleRate(sp38, (s32) ((gu_sqrtf(arg0->unkC[0]*arg0->unkC[0] + arg0->unkC[1]*arg0->unkC[1] + arg0->unkC[2]*arg0->unkC[2]) / 400.0) * 15000.0));
}
player_getPosition(sp48);
func_8035179C(arg1, sp54);

8
src/MMM/code_5000.c
View File

@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_8030DABC(u8, s32);
extern void sfxsource_setSampleRate(u8, s32);
void func_8038B6FC(Struct5Fs *arg0, Struct68s *arg1);
@ -77,9 +77,9 @@ void func_8038B630(Struct5Fs *arg0, Struct68s *arg1){
phi_s0 = func_80351758(arg1);
func_8030E394(phi_s0);
func_8030DBB4(phi_s0, sp20);
func_8030DA80(phi_s0, 0x3f3);
sfxsource_setSfxId(phi_s0, 0x3f3);
func_8030DD14(phi_s0, 3);
func_8030DABC(phi_s0, 0x7fff);
sfxsource_setSampleRate(phi_s0, 0x7fff);
func_8030E2C4(phi_s0);
arg0->unk14 = 1.5f;
if(pad);
@ -118,7 +118,7 @@ void func_8038B790(Struct5Fs *arg0, Struct68s *arg1, f32 arg2) {
if (arg0->unk14 <= 0.0f) {
func_80351954(arg1);
} else if (arg0->unk14 <= 1.0f) {
func_8030DABC(func_80351758(arg1), (s32)(arg0->unk14 * 32767.0f));
sfxsource_setSampleRate(func_80351758(arg1), (s32)(arg0->unk14 * 32767.0f));
}
}

11
src/RBB/code_1570.c
View File

@ -38,15 +38,8 @@ struct31s D_80390304 = {
f32 D_8039032C[3] = {3700.0f, -300.0f, -300.0f};
f32 D_80390338[3] = {4500.0f, 100.0f, 400.0f};
struct41s D_80390344= {
{
{-700.0f, 200.0f},
{-700.0f, 700.0f},
{ 500.0f, 700.0f}
},
{
{ 0.0f, -800.0f, 0.0f},
{ 0.0f, -800.0f, 0.0f}
}
{{-700.0f, 200.0f, -700.0f}, {700.0f, 500.0f, 700.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}}
};
/*.code */

4
src/RBB/code_27E0.c
View File

@ -55,9 +55,9 @@ void func_80388C20(Actor *this){
func_8030DEB4(local->unk0, 1000.0f, 2000.0f);
func_8030DF68(local->unk0, &this->position);
func_8030DBB4(local->unk0, 0.5f);
func_8030DA80(local->unk0, SFX_9F_GENERATOR_RUNNING);
sfxsource_setSfxId(local->unk0, SFX_9F_GENERATOR_RUNNING);
func_8030DD14(local->unk0, 3);
func_8030DABC(local->unk0, 0);
sfxsource_setSampleRate(local->unk0, 0);
func_8030E2C4(local->unk0);
}//L80388CFC
if(this->state == 0){

4
src/RBB/code_5F80.c
View File

@ -74,14 +74,14 @@ ActorInfo D_80390C3C = {
s32 D_80390C60[3] = {0xDE, 0xA7, 0x71};
struct41s D_80390C6C = {
{ {-200.0f, 200.0f}, {-200.0f, 200.0f}, {500.0f, 200.0f} },
{ {-200.0f, 200.0f, -200.0f}, {200.0f, 500.0f, 200.0f} },
{ {0.0f, -800.0f, 0.0f}, {0.0f, -800.0f, 0.0f} }
};
s32 D_80390C9C[3] = {0xDE, 0xA7, 0x71};
struct43s D_80390CA8 = {
{ {-200.0f, 0.0f}, {-200.0f, 200.0f}, {-50.0f, 200.0f} },
{ {-200.0f, 0.0f, -200.0f}, {200.0f, -50.0f, 200.0f} },
{ {0.0f, 200.0f, 0.0f}, {0.0f, 400.0f, 0.0f} },
{ {-10.0f, -10.0f, -10.0f}, {10.0f, 10.0f, 10.0f} }
};

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

@ -77,19 +77,63 @@ ActorInfo D_8038AD7C = { 0x1E8, ACTOR_COLLYWOBBLE_B, MODEL_COLLYWOBBLE, 1, chCau
func_80388080, func_80326224, func_80387DF4,
0, 0, 2.0f, 0
};
extern s32 D_8038ADA0[3];
extern struct31s D_8038ADAC;
extern struct42s D_8038ADD4;
s32 D_8038ADA0[3] = {0xFF, 0xFF, 0xFF};
extern struct31s D_8038AE04;
extern struct43s D_8038AE2C;
struct31s D_8038ADAC = {
{0.1f, 0.5f},
{1.5f, 3.0f},
{0.0f, 0.01f},
{1.0f, 1.5f},
0.0f, 0.01f,
};
extern struct31s D_8038AE74;
extern struct43s D_8038AE9C;
struct42s D_8038ADD4 = {
{{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
{{-40.0f, -40.0f, -40.0f}, {40.0f, 40.0f, 40.0f}}
};
extern struct31s D_8038AEE4;
extern struct43s D_8038AF0C;
struct31s D_8038AE04 = {
{0.5f, 0.75f},
{0.4f, 0.6f},
{0.0f, 0.01f},
{4.0f, 4.0f},
0.0f, 0.2f
};
struct43s D_8038AE2C = {
{{-100.0f, 200.0f, -100.0f}, {100.0f, 400.0f, 100.0f}},
{{0.0f, -600.0f, 0.0f}, {0.0f, -600.0f, 0.0f}},
{{-80.0f, -80.0f, -80.0f}, {80.0f, 80.0f, 80.0f}}
};
struct31s D_8038AE74 = {
{1.0f, 1.0f},
{1.0f, 1.0f},
{0.0f, 0.01f},
{2.0f, 2.0f},
0.0f, 0.5f
};
struct43s D_8038AE9C = {
{{-100.0f, 400.0f, -100.0f}, {100.0f, 600.0f, 100.0f}},
{{0.0f, -600.0f, 0.0f}, {0.0f, -600.0f, 0.0f}},
{{-20.0f, -20.0f, -20.0f}, {20.0f, 20.0f, 20.0f}}
};
struct31s D_8038AEE4 = {
{0.6f, 0.8f},
{0.5f, 0.7f},
{0.0f, 0.01f},
{4.0f, 4.0f},
0.0f, 0.5f
};
struct43s D_8038AF0C ={
{{-200.0f, 200.0f, -200.0f}, {200.0f, 600.0f, 200.0f}},
{{0.0f, -900.0f, 0.0f}, {0.0f, -900.0f, 0.0f}},
{{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
};
/* .code */
void func_80387910(ParticleEmitter *arg0, f32 *arg1, s32 arg2){

17
src/SM/code_0.c
View File

@ -2,8 +2,17 @@
#include "functions.h"
#include "variables.h"
void func_80288F78(Actor*, f32, s32);
extern void func_80288F78(Actor*, f32, s32);
typedef struct {
s16 unk0;
//u8 pad2[2];
void (*unk4)(Actor *, s32);
s32 pad8;
s32 padC;
}Struct_SM_0;
/* .code */
void func_803863F0(Actor *this, s32 arg1) {
func_80288F78(this, 0.20f, 0xF280FA);
}
@ -16,3 +25,9 @@ void func_80386420(Actor *arg0, s32 arg1) {
func_80288F78(arg0, 0.80f, 0x3ED8C3E);
func_80288F78(arg0, 0.87f, 0x21F336);
}
/* .data */
Struct_SM_0 D_8038AAC0[2] = {
{0x20A, func_803863F0, 0, 0},
{0x208, func_80386420, 0, 0},
};

10
src/SM/code_2990.c
View File

@ -45,7 +45,7 @@ SM2900Struct D_8038AFB4[8] = {
{0xdfb, 0xdfe, 5, ABILITY_F_DIVE},
{ -1, 0xe00, 6, ABILITY_B_RATATAT_RAP},
{0xe04, 0xe06, 8, ABILITY_0_BARGE},
{ -1, 0xdf8, 4, ABILITY_8_FLIP},
{ -1, 0xdfa, 4, ABILITY_8_FLIP},
{0xe01, 0xe03, 7, ABILITY_5_CLIMB},
{0xe10, 0xe11, 0x11, -1},
};
@ -131,10 +131,10 @@ void func_80388FA0(Actor *this, s32 arg1){
func_80328B8C(other, 3, 0.0001f, 1);
actor_playAnimationOnce(this);
this->unk44_31 = func_8030D90C();
func_8030DA80(this->unk44_31, 0x3f9);
sfxsource_setSfxId(this->unk44_31, 0x3f9);
func_8030DD14(this->unk44_31, 2);
func_8030DBB4(this->unk44_31, 1.4f);
func_8030DABC(this->unk44_31, 0x6590);
sfxsource_setSampleRate(this->unk44_31, 0x6590);
func_8028F918(0);
break;
case 1:
@ -156,10 +156,10 @@ void func_80388FA0(Actor *this, s32 arg1){
animctrl_setSmoothTransition(this->animctrl, 1);
actor_playAnimationOnce(this);
this->unk44_31 = func_8030D90C();
func_8030DA80(this->unk44_31, 0x3f9);
sfxsource_setSfxId(this->unk44_31, 0x3f9);
func_8030DD14(this->unk44_31, 2);
func_8030DBB4(this->unk44_31, 1.4f);
func_8030DABC(this->unk44_31, 0x6590);
sfxsource_setSampleRate(this->unk44_31, 0x6590);
func_80388F24(this);
func_8028F94C(2, this->position);
break;

45
src/SM/code_3FC0.c
View File

@ -5,12 +5,47 @@
extern f32 D_80365E04[3][3];
/* .data */
//ActorAnimation D_8038AFF0[3]; //chBanjosBedAnimations
//extern ActorInfo D_8038B008; //chBanjosBed
//extern ActorInfo D_8038B044; //chBanjosChair
//extern ActorInfo D_8038B080; //chBanjosStove
void func_8038A3B0(Actor *this);
/* .data */
ActorAnimationInfo D_8038AFF0[] = {
{0, 0.0f},
{0x248, 1.816f},
{0x248, 9e+09f},
};//chBanjosBedAnimations
ActorInfo D_8038B008 = {
0xE1, 0x198, 0x530,
2, D_8038AFF0,
func_8038A3B0, func_80326224, func_80325888,
0, 0, 0.0f, 0
};//chBanjosBed
ActorAnimationInfo D_8038B02C[] = {
{0, 0.0f},
{0x247, 3.0f},
{0x247, 9e+09f},
};//chBanjosChairAnimations
ActorInfo D_8038B044 ={
0xE2, 0x199, 0x52F,
2, D_8038B02C,
func_8038A3B0, func_80326224, func_80325888,
0, 0, 0.0f, 0
};//chBanjosChair
ActorAnimationInfo D_8038B068[] = {
{0, 0.0f},
{0x249, 1.0f},
{0x249, 9e+09f},
};//chBanjosStoveAnimations
ActorInfo D_8038B080 ={
0xE3, 0x19A, 0x337,
2, D_8038B068,
func_8038A3B0, func_80326224, func_80325888,
0, 0, 0.0f, 0
};//chBanjosStove
/* .code */

2
src/SM/code_4070.c
View File

@ -13,7 +13,7 @@ void func_8038A4DC(Actor *this, s32 arg1);
/* .data */
ActorInfo D_8038B0B0 = { 0x1ED, 0x3B9, 0, 1, NULL,
func_8038A5D8, func_80326224, func_802D94B4,
func_8038A5D8, func_80326224, func_80325340,
0, 0, 0.0f, 0
};

44
src/SM/code_5B0.c
View File

@ -6,17 +6,47 @@
void func_803869A0(Actor*, f32, f32);
void func_802C4218(s32, f32, f32, f32);
void func_80386EF4(Actor *this);
void func_80386A00(Actor *this);
/*.data */
ActorAnimationInfo D_8038AAF0[] = {
{0, 0.f},
{0x2B9, 5.0f}
};
extern struct43s D_8038AB48;
ActorInfo D_8038AB00 = {
0x135, 0x16F, 0x42D,
1, NULL,
func_80386EF4, func_80326224, func_80325E78,
2000, 0, 5.0f, 0
};
extern s32 D_8038AB90;
ActorInfo D_8038AB24 = {
0x29D, 0x3CA, 0x47B,
1, D_8038AAF0,
func_80386A00, func_80326224, func_80325E78,
0, 0, 0.0f, 0
};
extern struct43s D_8038AB9C;
struct43s D_8038AB48 = {
{{-200.0f, 600.0f, -200.0f}, {200.0f, 800.0f, 200.0f}},
{{0.0f, -1800.0f, 0.0f}, {0.0f, -1800.0f, 0.0f}},
{{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}
};
s32 D_8038AB90[3] = {0xFF, 0xFF, 0xFF};
struct43s D_8038AB9C = {
{{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}},
{{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}
};
/* .code */
void func_803869A0(Actor *this, f32 arg1, f32 arg2) {
if (actor_animationIsAt(this, arg1)) {
func_8030E878(SFX_98_DEAF_THUD, arg2, 0x7D00, this->position, 2000.0f, 4000.0f);
func_8030E878(SFX_98_DEAF_THUD, arg2, 32000, this->position, 2000.0f, 4000.0f);
}
}
@ -56,7 +86,7 @@ void func_80386B04(ParticleEmitter *p_ctrl, f32 *arg1, s32 arg2, f32 arg3) {
}
void func_80386C2C(ParticleEmitter *p_ctrl, f32 *arg1, s32 arg2, f32 arg3) {
func_802EFFA8(p_ctrl, &D_8038AB90);
func_802EFFA8(p_ctrl, D_8038AB90);
particleEmitter_setSprite(p_ctrl, ASSET_700_SPRITE_DUST);
func_802EFA5C(p_ctrl, 0.00f, 0.01f);
particleEmitter_setStartingFrameRange(p_ctrl, 0, 7);
@ -73,9 +103,9 @@ void func_80386D68(Actor *this){
FUNC_8030E8B4(SFX_9B_BOULDER_BREAKING_1, 1.0f, 32000, this->position, 1000, 2000);
this->unk44_31 = func_8030D90C();
func_8030DA80(this->unk44_31, 0x3F9);
sfxsource_setSfxId(this->unk44_31, 0x3F9);
func_8030DD14(this->unk44_31, 3);
func_8030DABC(this->unk44_31, 0x7D00);
sfxsource_setSampleRate(this->unk44_31, 32000);
func_8030DBB4(this->unk44_31, (0.01 < (2.0 - this->scale))? (2.0 - this->scale): 0.01);
func_8030E2C4(this->unk44_31);
func_80386B04(partEmitList_pushNew(0xA), this->position, 0xA, this->scale);

10
src/SM/code_BF0.c
View File

@ -2,7 +2,17 @@
#include "functions.h"
#include "variables.h"
void func_80386FE0(Actor *this);
/* .data */
ActorInfo D_8038ABF0 = {
0x134, 0x16E, 0,
1, NULL,
func_80386FE0, func_80326224, func_80325340,
2000, 0, 0.0f, 0
};
/* .code */
void func_80386FE0(Actor *this){
if(!this->unk16C_4){
this->unk10_12 = 0;

46
src/SM/code_F0.c
View File

@ -7,12 +7,32 @@ int ability_hasLearned(s32);
extern s32 D_80275650;
extern s32 D_8038AAE0;
extern s32 D_8038AAE4;
extern union {
extern ActorInfo D_8038AB00;
extern ActorInfo D_8038ABF0;
extern ActorInfo D_8038AC20; //chAttackTutorial
extern ActorInfo D_8038AC78; //chCarrot Slave?
extern ActorInfo D_8038ACE8; //ch onion A
extern ActorInfo D_8038AD58; //ch cauliflower A
extern ActorInfo D_8038AC9C; //chCarrot FreeRange?
extern ActorInfo D_8038AD0C; //ch onion B
extern ActorInfo D_8038AD7C; //ch cauliflower B
extern ActorInfo D_8038AF90; //D_8038AF90 bottles
extern ActorInfo D_8038B0B0; //chJumpTutorial code_4070
extern ActorInfo D_8038B0E0;
extern ActorInfo D_8038B008; //chBanjosBed
extern ActorInfo D_8038B044; //chBanjosChair
extern ActorInfo D_8038B080; //chBanjosStove
extern ActorInfo D_8038AB24;
/* .data */
s32 D_8038AAE0 = 0x000FE2C1; //SM_code_crc_1
s32 D_8038AAE4 = 0x8C0992D1; //SM_code_crc_2
union {
u8 byte[4];
s32 word;
} D_8038AAE8;
} D_8038AAE8 = {0x00, 0x01, 0xEB, 0x56}; //SM_data_crc_1
s32 D_8038AAEC = 0;
extern struct
{
@ -117,24 +137,6 @@ int func_80386780(void){
return 0;
}
extern ActorInfo D_8038AB00;
extern ActorInfo D_8038ABF0;
extern ActorInfo D_8038AC20; //chAttackTutorial
extern ActorInfo D_8038AC78; //chCarrot Slave?
extern ActorInfo D_8038ACE8; //ch onion A
extern ActorInfo D_8038AD58; //ch cauliflower A
extern ActorInfo D_8038AC9C; //chCarrot FreeRange?
extern ActorInfo D_8038AD0C; //ch onion B
extern ActorInfo D_8038AD7C; //ch cauliflower B
extern ActorInfo D_8038AF90; //D_8038AF90 bottles
extern ActorInfo D_8038B0B0; //chJumpTutorial code_4070
extern ActorInfo D_8038B0E0;
extern ActorInfo D_8038B008; //chBanjosBed
extern ActorInfo D_8038B044; //chBanjosChair
extern ActorInfo D_8038B080; //chBanjosStove
extern ActorInfo D_8038AB24;
void func_80386810(void)
{
spawnableActorList_add(&D_8038AB00, actor_new, 0X2000180);

4
src/TTC/code_35D0.c
View File

@ -66,7 +66,7 @@ struct31s D_8038C928 = {
};
struct42s D_8038C950 = {
{{-230.0f, 30.0f}, {-230.0f, 230.0f}, {110.0f, 230.0f}},
{{-230.0f, 30.0f, -230.0f}, {230.0f, 110.0f, 230.0f}},
{{-60.0f, 0.0f, -60.0f}, {60.0f, 30.0f, 60.0f}},
};
@ -157,7 +157,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
D_8038D708[1] = (f32)arg0[1];
D_8038D708[2] = (f32)arg0[2];
D_8038D708[1] = func_80309724(D_8038D708);
func_802C3F04(func_802C4140, 0xF4, reinterpret_cast(s32, D_8038D708[0]), reinterpret_cast(s32, D_8038D708[1]), reinterpret_cast(s32, D_8038D708[2]));
func_802C3F04((GenMethod_4)func_802C4140, 0xF4, reinterpret_cast(s32, D_8038D708[0]), reinterpret_cast(s32, D_8038D708[1]), reinterpret_cast(s32, D_8038D708[2]));
D_8038D700 = partEmitList_pushNew(3);
func_802EFFA8(D_8038D700, D_8038C91C);
particleEmitter_setSprite(D_8038D700, ASSET_700_SPRITE_DUST);

8
src/TTC/code_3E30.c
View File

@ -355,14 +355,14 @@ void func_8038B094(void){
D_8038D720.unk9 = func_8030D90C();
func_8030DBB4(D_8038D720.unk9, 0.1f);
func_8030DA80(D_8038D720.unk9, SFX_3EC_CCW_DOOR_OPENING);
sfxsource_setSfxId(D_8038D720.unk9, SFX_3EC_CCW_DOOR_OPENING);
func_8030DD14(D_8038D720.unk9, 3);
func_8030DABC(D_8038D720.unk9, 28000);
sfxsource_setSampleRate(D_8038D720.unk9, 28000);
D_8038D720.unkA = func_8030D90C();
func_8030DA80(D_8038D720.unkA, SFX_3_DULL_CANNON_SHOT);
sfxsource_setSfxId(D_8038D720.unkA, SFX_3_DULL_CANNON_SHOT);
func_8030DD14(D_8038D720.unkA, 3);
func_8030DABC(D_8038D720.unkA, 0x7fff);
sfxsource_setSampleRate(D_8038D720.unkA, 0x7fff);
func_8038A328();
func_8038AFC8();

4
src/core1/code_11AC0.c
View File

@ -146,7 +146,7 @@ void func_8024F890(u8 arg0, enum comusic_e arg1){
alCSPSetSeq(&D_80281720[arg0].cseqp, &D_80281720[arg0].cseq);
alCSPPlay(&D_80281720[arg0].cseqp);
alCSPSetVol(&D_80281720[arg0].cseqp, D_80281720[arg0].unk0);
if(player_is_present() && func_8028EE84() == 2){
if(player_is_present() && func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8025F3F0(&D_80281720[arg0].cseqp, 0.0f, 1.0f);
}
else{
@ -257,7 +257,7 @@ void func_8024FE44(u8 arg0, f32 arg1, f32 arg2){
D_80281720[arg0].unk17C = arg1;
D_80281720[arg0].unk180 = arg2;
if(func_80250074(arg0) == 0){
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8025F3F0(&D_80281720[arg0].cseqp, 0.0f, 1.0f);
}else{
func_8025F3F0(&D_80281720[arg0].cseqp, arg1, arg2);

6
src/core1/code_7090.c
View File

@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_8030DABC(u8, s32);
extern void sfxsource_setSampleRate(u8, s32);
extern void func_8030E2C4(u8);
@ -49,9 +49,9 @@ void func_80244BB0(s32 arg0, s32 arg1, s32 arg2, f32 arg3){
i = func_8030D90C();
indx = i;
if(i){
func_8030DA80(indx, func_80255D44(arg1));
sfxsource_setSfxId(indx, func_80255D44(arg1));
func_8030DBB4(indx, arg3);
func_8030DABC(indx, arg2);
sfxsource_setSampleRate(indx, arg2);
func_8030E2C4(indx);
func_80244C78(arg0);
D_802758E0[arg0] = indx;

22
src/core1/done/code_CE60.c
View File

@ -162,7 +162,7 @@ void func_8024AED8(void){
}
void func_8024AF00(s32 arg0, s32 arg1){
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(arg0);
}
else{
@ -200,7 +200,7 @@ void func_8024AF48(void){
case MAP_7_TTC_TREASURE_TROVE_COVE: // L8024B094
func_8024A9EC(0);
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x600);
}
else if(func_8024A8DC(-0x12C, 0x58c, 0x866)
@ -220,7 +220,7 @@ void func_8024AF48(void){
case MAP_B_CC_CLANKERS_CAVERN: // L8024B158
func_8024A9EC(0);
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(!(D_802806F8[1] < 0x28b)){
func_8024A8AC(0x8180, 5.0f);
}
@ -234,7 +234,7 @@ void func_8024AF48(void){
break;
case MAP_12_GV_GOBIS_VALLEY:// L8024B1BC
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8020);
}
else if(func_8024A8DC(-0xf96, 0x1626, 0xe74)){
@ -254,7 +254,7 @@ void func_8024AF48(void){
break;
case MAP_1_SM_SPIRAL_MOUNTAIN: // L8024B23C
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x9000);
}
else{
@ -352,7 +352,7 @@ void func_8024AF48(void){
break;
case MAP_45_CCW_AUTUMN:// L8024B4D4
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x600);
}
else{
@ -374,7 +374,7 @@ void func_8024AF48(void){
break;
case MAP_27_FP_FREEZEEZY_PEAK:// L8024B538
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x400);
}
else if( mapSpecificFlags_get(0) && !jiggyscore_isCollected(JIGGY_2F_FP_XMAS_TREE)){
@ -445,7 +445,7 @@ void func_8024AF48(void){
break;
case MAP_6B_GL_180_NOTE_DOOR:// L8024B704
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8800);
}
else if(func_8024A8DC(0x10eb, 0x4f5, 0x730)) {
@ -468,7 +468,7 @@ void func_8024AF48(void){
break;
case MAP_70_GL_CC_LOBBY:// L8024B7B4
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8100);
}
else if(func_8024A8DC(-0x19d6, -0x1d3, 0x71e)){
@ -512,7 +512,7 @@ void func_8024AF48(void){
break;
case MAP_71_GL_STATUE_ROOM:// L8024B8C0
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x200);
}
else if(func_8024A8DC(-0xf0e, -0x15a, 0x302)){
@ -562,7 +562,7 @@ void func_8024AF48(void){
break;
case MAP_78_GL_RBB_AND_MMM_PUZZLE:// L8024BA98
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8200);
}
else if(0x15a <= D_802806F8[1] && func_8024A8DC(-0x89a, 0x21a, 0x368)){

12
src/core2/bs/ant.c
View File

@ -31,7 +31,7 @@ void func_8029E3E0(void){
}
void func_8029E448(int arg0){
func_8030EAAC(SFX_3D_TICKER_WALKING, arg0 ? 0.96f : 1.04f, 0x36b0, 8);
func_8030EAAC(SFX_3D_TICKER_WALKING, arg0 ? 0.96f : 1.04f, 14000, 8);
}
@ -51,8 +51,8 @@ void func_8029E4EC(void){
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
func_802933FC(3);
func_802933FC(4);
miscflag_clear(3);
miscflag_clear(4);
func_80293D74();
}
func_80289F10(1);
@ -81,8 +81,8 @@ void bsant_idle_init(void){
func_80297970(0.0f);
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_802933E8(3);
func_802933E8(4);
miscflag_set(3);
miscflag_set(4);
func_802900B4();
}
@ -263,7 +263,7 @@ void bsant_fall_update(void){
break;
}
if(func_8028B2E8()){
if(func_802933C0(0x19))
if(miscflag_isTrue(0x19))
sp2C = func_80292738();
else
sp2C = BS_35_ANT_IDLE;

24
src/core2/bs/bBarge.c
View File

@ -80,9 +80,9 @@ void bsbarge_init(void){
func_8029E070(1);
D_8037D2A6 = 0;
D_8037D2A5 = 0;
func_802933FC(0xA);
func_802933FC(0xB);
func_802933FC(0xC);
miscflag_clear(0xA);
miscflag_clear(0xB);
miscflag_clear(0xC);
func_8029E3C0(2, 0.01f);
}
@ -94,7 +94,7 @@ void bsbarge_update(void){
sp24 = 0;
plyrMvmnt = _player_getAnimCtrlPtr();
if(button_released(BUTTON_B))
func_802933E8(0xA);
miscflag_set(0xA);
switch(D_8037D2A5){
case 0:
if(animctrl_isAt(plyrMvmnt, 0.1392f))
@ -103,8 +103,8 @@ void bsbarge_update(void){
if(!animctrl_isStopped(plyrMvmnt))
break;
if(func_802933D0(0xA)){
func_802933E8(0xC);
if(miscflag_isFalse(0xA)){
miscflag_set(0xC);
D_8037D2A0 = 850.0f;
}else{
D_8037D2A0 = 500.0f;
@ -114,13 +114,13 @@ void bsbarge_update(void){
break;
case 1:
func_8029E1A8(1);
if(func_802933D0(0xB) && func_8029E2E0(1, 0.1f)){
if(func_802933C0(0xC)){
func_8030E560(SFX_4_KAZOOIE_RUUUUUH, 0x7530);
if(miscflag_isFalse(0xB) && func_8029E2E0(1, 0.1f)){
if(miscflag_isTrue(0xC)){
func_8030E560(SFX_4_KAZOOIE_RUUUUUH, 30000);
}else{
func_8030E560(SFX_43_KAZOOIE_RUH, 0x7530);
func_8030E560(SFX_43_KAZOOIE_RUH, 30000);
}
func_802933E8(0xB);
miscflag_set(0xB);
}
if(!func_8029E384(1))
break;
@ -146,7 +146,7 @@ void bsbarge_update(void){
break;
case 3:
func_8029E1A8(0);
if(func_802933D0(0xC) || func_8029E384(0)){
if(miscflag_isFalse(0xC) || func_8029E384(0)){
D_8037D2A0 -= 80.0f;
}
func_80297970(D_8037D2A0);

6
src/core2/bs/bFlap.c
View File

@ -29,7 +29,7 @@ void bsbflap_init(void) {
player_setYVelocity(0.0f);
gravity_set(D_80364A14);
func_8029E070(1);
func_802933E8(0x12);
miscflag_set(0x12);
func_8029E3C0(0, 2.5f);
D_8037D30C = func_8030D90C();
func_80299BD4();
@ -40,9 +40,9 @@ void bsbflap_init(void) {
void func_802A2790(s32 arg0, f32 arg1, s32 arg2) {
func_8030E394(D_8037D30C);
func_8030DA80(D_8037D30C, arg0);
sfxsource_setSfxId(D_8037D30C, arg0);
func_8030DBB4(D_8037D30C, arg1);
func_8030DABC(D_8037D30C, arg2);
sfxsource_setSampleRate(D_8037D30C, arg2);
func_8030DD90(D_8037D30C, 0);
func_8030DD14(D_8037D30C, 3);
func_8030E2C4(D_8037D30C);

8
src/core2/bs/bFly.c
View File

@ -179,7 +179,7 @@ void bsbfly_enter_end(void){
void bsbfly_init(void){
func_8028A010(ANIM_BANJO_FLY, 0.62f);
func_8029C7F4(1,1,3,3);
if(func_802933C0(9)){
if(miscflag_isTrue(9)){
func_80297970(0.0f);
}else{
func_80297970(600.0f);
@ -260,7 +260,7 @@ void bsbfly_update(void){
func_8030EBC8(SFX_2_CLAW_SWIPE, 0.6f, 0.7f, 0x2710, 0x2ee0);
}
gravity_set(-300.0f);
if(func_802933C0(9)){
if(miscflag_isTrue(9)){
func_80297BF8(0.0f);
func_80297A0C(0);
sp38 = 0.0f;
@ -408,7 +408,7 @@ void func_802A411C(void) {
ml_vec3f_copy(sp28, &D_8037D338);
ml_vec3f_normalize(sp28);
sp24 = mlAbsF(sp34[0] * sp28[0] + sp34[1] * sp28[1] + sp34[2] * sp28[2]);
if (func_802933C0(8) || ((sp44 & 0x80) != 0)) {
if (miscflag_isTrue(8) || ((sp44 & 0x80) != 0)) {
func_802A4078();
next_state = BS_18_FLY_KNOCKBACK;
} else if (0.4 < sp24) {
@ -781,7 +781,7 @@ void func_802A503C(void){
void func_802A505C(void){
if(bs_getInterruptType() == 9){
func_8029A86C(2);
func_802933E8(7);
miscflag_set(7);
func_8029CCC4();
}else{
func_80296608();

10
src/core2/bs/bLongLeg.c
View File

@ -65,7 +65,7 @@ void func_802A5374(void){
func_8029E0F4(1);
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_802933E8(3);
miscflag_set(3);
}
void func_802A5404(void){
@ -82,7 +82,7 @@ void func_802A5404(void){
roll_setIdeal(0.0f);
func_802917C4(2);
func_803219F4(1);
func_802933FC(3);
miscflag_clear(3);
func_8029E180(4, 0.5f);
func_802A531C();
}
@ -114,9 +114,9 @@ void func_802A5548(void){
void bsblongleg_enter_init(void){
D_8037D361 = func_8030D90C();
func_8030DA80(D_8037D361, SFX_2C_PULLING_NOISE);
sfxsource_setSfxId(D_8037D361, SFX_2C_PULLING_NOISE);
func_8030E04C(D_8037D361, 0.8f, 1.9f, 1.2f);
func_802933FC(0xe);
miscflag_clear(MISC_FLAG_E_TOUCHING_WADING_BOOTS);
if(bsbtrot_inSet(bs_getPrevState()))
func_802A54A8();
else
@ -271,7 +271,7 @@ void bsblongleg_exit_init(void){
func_8029957C(2);
func_80297970(0.0f);
D_8037D361 = func_8030D90C();
func_8030DA80(D_8037D361, SFX_2C_PULLING_NOISE);
sfxsource_setSfxId(D_8037D361, SFX_2C_PULLING_NOISE);
func_8030E04C(D_8037D361, 1.4f, 0.4f, -1.2f);
}

2
src/core2/bs/bPeck.c
View File

@ -63,7 +63,7 @@ void func_802A664C(void){
sp1C = 1.32f;
break;
}
func_802933E8(5);
miscflag_set(5);
func_8030E58C(SFX_42_KAZOOIE_RAH, sp1C);
player_setYVelocity(D_80364A64);
D_8037D375++;

2
src/core2/bs/bShock.c
View File

@ -33,7 +33,7 @@ void bsbshock_charge_init(void){
func_8029E070(1);
func_80299BD4();
D_8037D382 = func_8030D90C();
func_8030DA80(D_8037D382, SFX_2C_PULLING_NOISE);
sfxsource_setSfxId(D_8037D382, SFX_2C_PULLING_NOISE);
func_8030E04C(D_8037D382, 1.4f, 0.4f, -1.2f);
func_80292158(-50.0f);
func_80298528(-50.0f);

6
src/core2/bs/bSwim.c
View File

@ -81,7 +81,7 @@ void func_802A744C(void) {
}
bool func_802A7508(enum bs_e move_id){
bool bsbswim_inSet(enum bs_e move_id){
return move_id == BS_2B_DIVE_IDLE
|| move_id == BS_2C_DIVE_B
|| move_id == BS_39_DIVE_A
@ -94,11 +94,11 @@ bool func_802A7508(enum bs_e move_id){
}
bool func_802A7588(void){
return func_802A7508(bs_getState());
return bsbswim_inSet(bs_getState());
}
void func_802A75B0(void) {
if (!func_802A7508(bs_getNextState())) {
if (!bsbswim_inSet(bs_getNextState())) {
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
func_80297B94();

18
src/core2/bs/bTrot.c
View File

@ -102,15 +102,15 @@ void func_802A8A40(void){
func_8029E064(1);
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_802933E8(3);
miscflag_set(3);
func_8029CF48(4,1,0.24f);
func_80292090(2);
}
void func_802A8AD8(void){
func_80299650(func_80291684(3), func_80291670(3));
if(func_802933C0(0x10) &&(bs_getState() != BS_17_BTROT_EXIT)){
func_802933FC(0x10);
if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) &&(bs_getState() != BS_17_BTROT_EXIT)){
miscflag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
func_802917E4(3, func_80294A40());
func_803219F4(4);
}
@ -118,7 +118,7 @@ void func_802A8AD8(void){
if(func_802916CC(3)){
if(func_8029DFE0()){
func_8029E0DC(0);
if(func_802933D0(0x14))
if(miscflag_isFalse(0x14))
func_8030E484(0x3eb);
func_803219F4(1);
}
@ -139,7 +139,7 @@ void func_802A8BB0(void){
func_8029E064(0);
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
func_802933FC(3);
miscflag_clear(3);
if(next_state != BS_5A_LOADZONE)
func_802917E4(3, 0.0f);
func_802A8AD8();
@ -173,10 +173,10 @@ enum asset_e func_802A8D00(enum asset_e arg0, enum asset_e arg1){
}
enum bs_e func_802A8D34(enum bs_e arg0){
if(func_802933C0(0xf))
if(miscflag_isTrue(0xf))
return arg0;
if(func_802933C0(1))
if(miscflag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD))
return BS_23_FLY_ENTER;
return BS_8_BTROT_JUMP;
@ -373,7 +373,7 @@ void bsbtrot_jump_update(void){
if(func_80291698(3))
func_802A87C0();
if(func_802933C0(0xF))
if(miscflag_isTrue(0xF))
func_802978A4();
else
func_802A89D4();
@ -584,7 +584,7 @@ void bsbtrot_fall_update(void){
if(func_80291698(3))
func_802A87C0();
if(func_802933C0(0xf))
if(miscflag_isTrue(0xf))
func_802978A4();
else
func_802A89D4();

2
src/core2/bs/bbuster.c
View File

@ -122,7 +122,7 @@ void bsbbuster_update(void){
func_80250D94(1.0f, 0.3f, 0.4f);
D_8037D2B6++;
}
D_8037D2B9 = func_802933C0(8);
D_8037D2B9 = miscflag_isTrue(8);
func_8029445C(sp30);
//L8029FF78
if(((0.0f <= sp30[1])? sp30[1] : -sp30[1]) < 1.0){

8
src/core2/bs/bee.c
View File

@ -17,8 +17,8 @@ void func_802A02C0(void){
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
func_802933FC(3);
func_802933FC(4);
miscflag_clear(3);
miscflag_clear(4);
func_80293D74();
}
func_80289F10(1);
@ -29,8 +29,8 @@ void func_802A0340(void){
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_80293D48(50.0f, 25.0f);
func_802933E8(3);
func_802933E8(4);
miscflag_set(3);
miscflag_set(4);
}
}

4
src/core2/bs/beeFly.c
View File

@ -154,7 +154,7 @@ void bsbeefly_enter(void){
mvmnt = bs_getPrevState();
func_8028A010(ASSET_1DC_ANIM_BEE_FLY, 0.38);
func_8029C7F4(1, 1, 3, 3);
if(func_802933C0(9))
if(miscflag_isTrue(9))
func_80297970(0.0f);
else
func_80297970(600.0f);
@ -237,7 +237,7 @@ void bsbeefly_update(void){
}
break;
}//L802A0DF0
if(func_802933C0(9)){
if(miscflag_isTrue(9)){
func_80297BF8(0.0f);
func_80297A0C(0);
sp38 = 0.0f;

6
src/core2/bs/beeMain.c
View File

@ -276,7 +276,7 @@ void func_802A170C(void){
break;
}
if(func_8028B2E8()){
if(func_802933C0(0x19)){
if(miscflag_isTrue(0x19)){
sp2c = func_80292738();
}else{
if(func_8029B300() > 0)
@ -287,7 +287,7 @@ void func_802A170C(void){
}
}
else{
if(func_802933D0(0xf) && button_pressed(BUTTON_A))
if(miscflag_isFalse(0xf) && button_pressed(BUTTON_A))
sp2c = BS_BEE_FLY;
}//L802A189C
if(player_inWater())
@ -515,7 +515,7 @@ void func_802A2054(void){
}
void func_802A2098(void){
func_802933FC(0x1A);
miscflag_clear(0x1A);
func_8028A010(ASSET_1DE_ANIM_BEE_IDLE, 3.0f);
yaw_setIdeal(func_8029B41C());
func_8029C7F4(1,1,3,2);

14
src/core2/bs/croc.c
View File

@ -47,8 +47,8 @@ void func_802ABE04(void){
void func_802ABE70(void){
f32 sp1C = func_80291670(3);
func_80299650(func_80291684(3), sp1C);
if(func_802933C0(0x10) && bs_getState() != BS_17_BTROT_EXIT){
func_802933FC(0x10);
if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) && bs_getState() != BS_17_BTROT_EXIT){
miscflag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
func_802917E4(3, func_80294A40());
func_8025A6EC(COMUSIC_8A_GETTING_TURBO_TRAINERS, -1);
func_8029E0DC(1);
@ -79,8 +79,8 @@ void func_802ABFBC(void){
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
func_802933FC(3);
func_802933FC(4);
miscflag_clear(3);
miscflag_clear(4);
func_80293D74();
}
func_80289F10(1);
@ -107,8 +107,8 @@ void bscroc_idle_init(void){
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_80293D48(50.0f, 25.0f);
func_802933E8(3);
func_802933E8(4);
miscflag_set(3);
miscflag_set(4);
func_802900B4();
}
@ -310,7 +310,7 @@ void bscroc_fall_update(void){
if(func_8028B2E8()){
if(func_8029B300() > 0 || (D_8037D3EC == 2 && animctrl_isStopped(aCtrl))){
if(func_802933C0(0x19)){
if(miscflag_isTrue(0x19)){
next_state = func_80292738();
}else{
next_state = BS_5E_CROC_IDLE;

6
src/core2/bs/dronexform.c
View File

@ -311,7 +311,7 @@ void bsdronexform_init(void){
func_802B016C();
D_8037D470.unk31 = _player_getTransformation();
D_8037D470.unk30 = func_80294A4C();
func_802933E8(0x1b);
miscflag_set(MISC_FLAG_1B_TRANSFORMING);
D_8037D470.unk32 = 0;
__bsdronexform_setState(1);
}
@ -407,7 +407,7 @@ void bsdronexform_update(void){
sp24 = func_8029E1A8(0);
player_setYPosition(func_802B051C(0, 0.7f, 90.0f, 0.0f) + D_8037D470.unk2C);
if(sp24)
bs_setState(func_8029BF78());
bs_setState(bs_getIdleState());
break;
// 802B08AC 8
// 802B09A4 9
@ -420,7 +420,7 @@ void bsdronexform_end(void){
func_802AFADC();
func_802B014C();
func_80298A64();
func_802933FC(0x1b);
miscflag_clear(MISC_FLAG_1B_TRANSFORMING);
}
void bsdronexform_interrupt(void){};

6
src/core2/bs/jig.c
View File

@ -40,8 +40,8 @@ void bsjig_jiggy_init(void){
func_8029151C(0xC);
func_8029E070(1);
func_8030E6D4(SFX_33_BANJO_AHOO);
func_802933FC(7);
func_802933FC(0xf);
miscflag_clear(7);
miscflag_clear(0xf);
func_8028D5DC();
func_802C82C0(marker_getActor(D_8037D4B4), 1);
D_8037D4B0 = 0;
@ -162,7 +162,7 @@ void bsjig_notedoor_end(void){
void bsjig_notedoor_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
D_8037D4B2 = (bs_getPrevState() == BS_44_JIG_JIGGY);
func_802933FC(0x1A);
miscflag_clear(0x1A);
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, 0x282);
animctrl_setDuration(aCtrl, 3.6f);

16
src/core2/bs/jump.c
View File

@ -34,7 +34,7 @@ void bsjump_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
enum bs_e sp30;
D_8037D4C2 = func_802933C0(2);
D_8037D4C2 = miscflag_isTrue(2);
sp30 = bs_getPrevState();
if(bsclimb_inSet(sp30)){
climbRelease();
@ -88,7 +88,7 @@ void bsjump_update(void){
if(D_8037D4C2)
func_8029C348();
if(func_802933C0(0xf)){
if(miscflag_isTrue(0xf)){
func_802978A4();
}else{
func_802B6FA8();
@ -171,7 +171,7 @@ void bsjump_fall_init(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
int sp20;
if(func_802933C0(7) && 700.0f < func_80297AAC())
if(miscflag_isTrue(7) && 700.0f < func_80297AAC())
player_setYVelocity(700.0f);
sp20 = (bs_getPrevState() == BS_12_BFLIP)? 0 : 1;
@ -190,7 +190,7 @@ void bsjump_fall_update(void){
AnimCtrl *aCtrl = _player_getAnimCtrlPtr();
f32 sp1C[3];
if(func_802933C0(0xf))
if(miscflag_isTrue(0xf))
func_802978A4();
else
func_802B6FA8();
@ -212,11 +212,11 @@ void bsjump_fall_update(void){
case 1:
break;
}//L802B1824
if(func_802933D0(0xf)){
if(miscflag_isFalse(0xf)){
if(func_8028B424())
sp2C = BS_3D_FALL_TUMBLING;
if(should_flap() && func_802933D0(5))
if(should_flap() && miscflag_isFalse(5))
sp2C = BS_BFLAP;
if(should_peck())
@ -230,7 +230,7 @@ void bsjump_fall_update(void){
}
else if(player_inWater()){
func_8029CCC4();
if(func_802933C0(6) || func_802933C0(0x14)){
if(miscflag_isTrue(6) || miscflag_isTrue(0x14)){
sp2C = BS_D_TIMEOUT;
}
@ -380,7 +380,7 @@ void func_802B1DA4(void){
func_8028D5F4();
}
s32 func_802B1DC4(void){
bool bsjump_jumpingFromWater(void){
return D_8037D4C1;
}

10
src/core2/bs/pumpkin.c
View File

@ -52,8 +52,8 @@ void func_802B229C(void) {
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
func_802933FC(3);
func_802933FC(4);
miscflag_clear(3);
miscflag_clear(4);
func_80293D74();
}
func_80289F10(1);
@ -77,8 +77,8 @@ void func_802B2384(void) {
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_80293D48(50.0f, 25.0f);
func_802933E8(3);
func_802933E8(4);
miscflag_set(3);
miscflag_set(4);
func_802900B4();
}
@ -287,7 +287,7 @@ void func_802B2A5C(void) {
break;
}
if (func_8028B2E8() && ((func_8029B300() > 0) || (D_8037D4E0 == 2 && animctrl_isStopped(anim_ctrl)))) {
if (func_802933C0(0x19)) {
if (miscflag_isTrue(0x19)) {
next_state = func_80292738();
} else {
next_state = BS_48_PUMPKIN_IDLE;

8
src/core2/bs/rest.c
View File

@ -103,7 +103,7 @@ void func_802B3D1C(void) {
next_state = BS_77;
}
if (func_802B3BB0() != 0) {
next_state = func_8029BF78();
next_state = bs_getIdleState();
}
bs_setState(next_state);
}
@ -129,7 +129,7 @@ void func_802B3DBC(void) {
next_state = BS_77;
}
if (func_802B3BB0() != 0) {
next_state = func_8029BF78();
next_state = bs_getIdleState();
}
bs_setState(next_state);
}
@ -157,9 +157,9 @@ void func_802B3E64(void) {
next_state = BS_77;
}
if (func_802B3BB0()) {
next_state = func_8029BF78();
next_state = bs_getIdleState();
}
if (map_get() == MAP_27_FP_FREEZEEZY_PEAK && func_802933C0(0x14)) {
if (map_get() == MAP_27_FP_FREEZEEZY_PEAK && miscflag_isTrue(0x14)) {
next_state = func_8029CA94(next_state);
}
bs_setState(next_state);

2
src/core2/bs/stand.c
View File

@ -321,7 +321,7 @@ void func_802B5350(void){
}
else if(sp1C == 0x12){//L802B53D0
func_8029A86C(1);
if( _player_getTransformation() == TRANSFORM_1_BANJO && !func_802933C0(0xF) && func_802916CC(0)){
if( _player_getTransformation() == TRANSFORM_1_BANJO && !miscflag_isTrue(0xF) && func_802916CC(0)){
func_8028DE6C(carriedObject_getActorID());
func_8029A86C(2);
}

2
src/core2/bs/surf.c
View File

@ -31,7 +31,7 @@ void func_802B6064(void) {
next_state = BS_1_IDLE;
}
D_8037D560 = 0;
if (func_802933C0(6)) {
if (miscflag_isTrue(6)) {
next_state = BS_53_TIMEOUT;
}
bs_setState(next_state);

14
src/core2/bs/swim.c
View File

@ -4,7 +4,7 @@
extern void func_80295328(s32, f32);
bool func_802B5724(enum bs_e state_id);
bool bsswim_inset(enum bs_e state_id);
/* .data */
f32 D_80364D40 = 30.0f;
@ -85,7 +85,7 @@ void func_802B563C(void) {
void func_802B56D4(void) {
if (!func_802B5724(bs_getNextState())) {
if (!bsswim_inset(bs_getNextState())) {
func_80297B94();
gravity_reset();
func_8029B0C0();
@ -93,7 +93,7 @@ void func_802B56D4(void) {
}
}
bool func_802B5724(enum bs_e state_id){
bool bsswim_inset(enum bs_e state_id){
return state_id == BS_2D_SWIM_IDLE
|| state_id == BS_2E_SWIM
|| state_id == BS_4C_LANDING_IN_WATER
@ -114,7 +114,7 @@ void func_802B5774(void) {
} else {
transition_duration = 0.5f;
}
if (func_802A7508(prev_state) != 0) {
if (bsbswim_inSet(prev_state) != 0) {
if (prev_state == BS_54_SWIM_DIE) {
func_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, 30000);
} else {
@ -156,7 +156,7 @@ void func_802B5950(void) {
func_802B5480();
}
if (animctrl_isAt(anim_ctrl, 0.01f) != 0) {
func_8030EC20(SFX_DC_IDLE_PADDLING, 0.85f, 1.15f, 0x3E80U, 0x3E80U);
func_8030EC20(SFX_DC_IDLE_PADDLING, 0.85f, 1.15f, 16000, 16000);
}
if (animctrl_isAt(anim_ctrl, 0.4348f) != 0) {
func_802B5538(anim_ctrl);
@ -176,7 +176,7 @@ void func_802B5950(void) {
if (func_80294524() && button_pressed(BUTTON_A)) {
next_state = BS_5_JUMP;
}
if (func_802933C0(6) || func_802933C0(0x14)) {
if (miscflag_isTrue(6) || miscflag_isTrue(0x14)) {
next_state = BS_D_TIMEOUT;
}
bs_setState(next_state);
@ -253,7 +253,7 @@ void func_802B5C40(void) {
if (func_80294524() && button_pressed(BUTTON_A)) {
next_state = BS_5_JUMP;
}
if (func_802933C0(6) || func_802933C0(0x14)) {
if (miscflag_isTrue(6) || miscflag_isTrue(0x14)) {
next_state = BS_D_TIMEOUT;
}
bs_setState(next_state);

10
src/core2/bs/walrus.c
View File

@ -93,8 +93,8 @@ void func_802B8048(void){
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
func_802933FC(3);
func_802933FC(4);
miscflag_clear(3);
miscflag_clear(4);
func_80293D74();
func_8029CF48(4, 0, 0.0f);
}
@ -146,8 +146,8 @@ void bswalrus_idle_init(void){
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_80293D48(50.0f, 25.0f);
func_802933E8(3);
func_802933E8(4);
miscflag_set(3);
miscflag_set(4);
func_802900B4();
func_802B8110();
}
@ -350,7 +350,7 @@ void bswalrus_fall_update(void){
if( func_8029B300() > 0
|| (D_8037D5C8 == 2 && animctrl_isStopped(aCtrl))
){
if(func_802933C0(0x19))
if(miscflag_isTrue(0x19))
next_state = func_80292738();
else
next_state = BS_67_WALRUS_IDLE;

2
src/core2/bsList.c
View File

@ -20,7 +20,7 @@ void bsList_clearAll(void){
}while(i != 0xa6);
}
void bsList_setInitMethod(s32 i, bsStateMethod func){
void bsList_setInitMethod(enum bs_e i, bsStateMethod func){
D_8037C700[i].init_func = func;
}

6
src/core2/ch/beehive.c
View File

@ -55,7 +55,7 @@ void func_802CE8D4(Actor *this){
if( !func_8031FF1C(BKPROG_D_BEEHIVE_TEXT)
&& func_803296B8(this, 250, 300)
){
if(func_8028ECAC() == 0 || func_8028ECAC() == 8){
if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){
if( player_getTransformation() == TRANSFORM_1_BANJO
&& func_80311480(ASSET_D96_TEXT_BEEHIVE, 0, NULL, NULL, NULL, 0)
){
@ -69,8 +69,8 @@ void func_802CE8D4(Actor *this){
){
if(!this->unk38_0){
func_8030E394(this->unk44_31);
func_8030DA80(this->unk44_31, SFX_67_BEEHIVE_CLONK);
func_8030DABC(this->unk44_31, 12000);
sfxsource_setSfxId(this->unk44_31, SFX_67_BEEHIVE_CLONK);
sfxsource_setSampleRate(this->unk44_31, 12000);
func_8030DBB4(this->unk44_31, (animctrl_getAnimTimer(this->animctrl) + 0.9) - 0.4);
func_8030DF68(this->unk44_31, this->position);
func_8030DEB4(this->unk44_31, 300.0f, 1500.0f);

8
src/core2/ch/bigbutt.c
View File

@ -74,7 +74,7 @@ void func_802C5FF8(Actor *this){
if( !this->unk138_28
&& actor_animationIsAt(this, 0.4f)
&& randf() < 0.14
&& func_8028EE84() != 2
&& func_8028EE84() != BSWATERGROUP_2_UNDERWATER
){
func_8030E878(SFX_2B_BULL_MOO_1, randf2(0.9f, 1.1f), 32000, this->position, 0.0f, 2000.0f);
}
@ -136,7 +136,7 @@ void func_802C6240(Actor *this){
|| actor_animationIsAt(this, 0.4f)
|| actor_animationIsAt(this, 0.536f)
){
if(func_8028EE84() != 2){
if(func_8028EE84() != BSWATERGROUP_2_UNDERWATER){
func_8030E878(SFX_C8_CRUNCH,randf2(0.93f, 1.07f),10000, this->position, 0.0f, 1800.0f);
}
}
@ -203,7 +203,7 @@ void func_802C6240(Actor *this){
func_80328A84(this, 8);
}
func_802C5F44(this);
if(actor_animationIsAt(this, 0.35f) && func_8028EE84() != 2){
if(actor_animationIsAt(this, 0.35f) && func_8028EE84() != BSWATERGROUP_2_UNDERWATER){
func_8030E58C(SFX_3C_BULL_GROWN, randf()/10.0f + 1.0);
this->unk10_12--;
}
@ -239,7 +239,7 @@ void func_802C6240(Actor *this){
this->unk44_31 = func_8030D90C();
tmp_a0 = this->unk44_31;
}
func_8030DA80(tmp_a0, SFX_18_BIGBUTT_SLIDE);
sfxsource_setSfxId(tmp_a0, SFX_18_BIGBUTT_SLIDE);
func_8030DD14(this->unk44_31, 2);
func_8030DBB4(this->unk44_31, (randf()*0.1 - 0.05) + 1.0);
func_8030E2C4(this->unk44_31);

16
src/core2/ch/code_5AB30.c
View File

@ -45,7 +45,7 @@ struct31s D_80368694 = {
};
struct43s D_803686BC = {
{{-250.0f, 600.0f}, {-250.0f, 350.0f}, {960.0f, 350.0f}},
{{-250.0f, 600.0f, -250.0f}, {350.0f, 960.0f, 350.0f}},
{{0.0f, -1200.0f, 0.0f}, {0.0f, -1200.0f, 0.0f}},
{{-80.0f, 0.0f, -80.0f}, {80.0f, 200.0f, 80.0f}}
};
@ -58,7 +58,7 @@ Actor *func_802E1AC0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
ActorLocal_chSirSlush *local;
actor = marker_getActor(marker);
local = &actor->local;
local = (ActorLocal_chSirSlush *)&actor->local;
func_8033A45C(1, local->unk9);
func_8033A45C(2, local->unkA);
func_80325888(marker, gfx, mtx, vtx);
@ -177,13 +177,13 @@ int func_802E1F70(ActorMarker *marker, s32 arg1){
return 1;
}
void func_802E1FD0(ActorMarker *marker, s32 arg1){
void func_802E1FD0(ActorMarker *marker, ActorMarker *other_marker){
Actor *actor = marker_getActor(marker);
FUNC_8030E8B4(SFX_15_METALLIC_HIT_2, 1.0f, 30000, actor->position, 1500, 4500);
FUNC_8030E8B4(SFX_3EA_UNKNOWN, 1.0f, 30000, actor->position, 1500, 4500);
FUNC_8030E8B4(SFX_2F_ORANGE_SPLAT, 1.0f, 30000, actor->position, 1500, 4500);
func_802C3C88(func_802E1BD0, actor->marker);
func_802C3C88((GenMethod_1)func_802E1BD0, (s32)actor->marker);
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK)
func_8038A978();
func_802E1CB8(actor->position, 0xC);
@ -258,7 +258,7 @@ void func_802E20E8(Actor *this){
){//L802E2318
if(0.0 < local->unk4){
if( (func_8023DB5C() & 1)
|| func_8028ECAC() == 0xA
|| func_8028ECAC() == BSGROUP_A_FLYING
){//L802E236C
local->unk4 -= sp38;
}
@ -266,7 +266,7 @@ void func_802E20E8(Actor *this){
else{//L802E2380
if( func_802E1EB4(this, 0x1f4, 0xabe)
&& func_802E1E5C(this, 3)
&& func_8028EE84() != 2
&& func_8028EE84() != BSWATERGROUP_2_UNDERWATER
&& !func_802E208C()
){
func_80328B8C(this, 2, 0.01f, 1);
@ -282,7 +282,7 @@ void func_802E20E8(Actor *this){
else if(
0.98 < animctrl_getAnimTimer(this->animctrl)
|| !func_802E1EB4(this, 0x1f4, 0xabe)
|| func_8028EE84() == 2
|| func_8028EE84() == BSWATERGROUP_2_UNDERWATER
|| func_802E208C()
){
func_802E1DA0(this);
@ -309,7 +309,7 @@ void func_802E20E8(Actor *this){
&& local->unkB
){
func_8030E878(SFX_8F_SNOWBALL_FLYING, randf2(0.95f, 1.05f), 30000, this->position, 800.0f, 3050.0f);
func_802C3C88(func_802E1B24, this->marker);
func_802C3C88((GenMethod_1)func_802E1B24, (s32)this->marker);
local->unk9 = FALSE;
}

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

@ -27,7 +27,7 @@ s32 D_80372AE4[3] = {0xff, 0xff, 0xfe};
struct_core2_D2AB0 D_80372AF0 = {0.0f, 0.0f, 1.0f, 1.4f};
struct43s D_80372B00 = {
{{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}},
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}},
{{0.0f, -650.0f, 0.0f}, {0.0f, -650.0f, 0.0f}},
{{-400.0f, 0.0f, -400.0f}, {400.0f, 0.0f, 400.0f}}
};

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

@ -38,7 +38,7 @@ struct31s D_80372CA4 = {
};
struct43s D_80372CCC = {
{{-5.0f, 10.0f}, {-5.0f, 5.0f}, {50.0f, 5.0f}},
{{-5.0f, 10.0f, -5.0f}, {5.0f, 50.0f, 5.0f}},
{{0.0f, 200.0f, 0.0f}, {0.0f, 1000.0f, 0.0f}},
{{-20.0f, -20.0f, -20.0f}, {20.0f, 20.0f, 20.0f}}
};

10
src/core2/ch/mole.c
View File

@ -122,10 +122,10 @@ void func_802D9530(Actor *this){
func_80328B8C(this, 4, 0.0001f, 1);
actor_playAnimationOnce(this);
this->unk44_31 = func_8030D90C();
func_8030DA80(this->unk44_31, SFX_3F9_UNKNOWN);
sfxsource_setSfxId(this->unk44_31, SFX_3F9_UNKNOWN);
func_8030DD14(this->unk44_31, 2);
func_8030DBB4(this->unk44_31, 1.4f);
func_8030DABC(this->unk44_31, 26000);
sfxsource_setSampleRate(this->unk44_31, 26000);
func_8028F918(0);
}
@ -239,10 +239,10 @@ void func_802D9ADC(Actor *this){
func_80328B8C(this, 2, 0.0001f, 1);
actor_playAnimationOnce(this);
this->unk44_31 = func_8030D90C();
func_8030DA80(this->unk44_31, SFX_3F9_UNKNOWN);
sfxsource_setSfxId(this->unk44_31, SFX_3F9_UNKNOWN);
func_8030DD14(this->unk44_31, 2);
func_8030DBB4(this->unk44_31, 1.4f);
func_8030DABC(this->unk44_31, 26000);
sfxsource_setSampleRate(this->unk44_31, 26000);
func_802D9658(this);
func_8028F94C(2, this->position);
}
@ -350,7 +350,7 @@ void func_802D9D60(Actor *this){
if(func_8028F20C() && func_8028F0D4() && !func_8028EC04()){
if( this->unkF4_8 == 0x12
&& !ability_isUnlocked(D_80367DC4[this->unkF4_8-9].unk5)
&& (!func_8028ECAC() || func_8028ECAC() == 8)
&& (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)
){
player_getPosition(sp34);
if(ml_vec3f_distance(sp34, this->velocity) < this->unk28){

6
src/core2/ch/soundsource.c
View File

@ -36,9 +36,9 @@ void func_802D0500(Actor *this){
ActorLocal_Core2_49570 *local = (ActorLocal_Core2_49570 *)this->local;
if(D_80367340[(s32)this->yaw].unk8 != -1){
if(this->unk1C[0] == this->unk1C[1])
func_8030DABC(local->unk0, D_80367340[(s32)this->yaw].unk8);
sfxsource_setSampleRate(local->unk0, D_80367340[(s32)this->yaw].unk8);
else{
func_8030DABC(local->unk0, (s32)((D_80367340[(s32)this->yaw].unk8/this->unk1C[1])*this->unk1C[0]));
sfxsource_setSampleRate(local->unk0, (s32)((D_80367340[(s32)this->yaw].unk8/this->unk1C[1])*this->unk1C[0]));
}
}
@ -57,7 +57,7 @@ void func_802D05A0(Actor *this, s32 next_state){
this->unk1C[1] = D_80367340[(s32)this->yaw].unk10;
}
local->unk0 = func_8030D90C();
func_8030DA80(local->unk0, D_80367340[(s32)this->yaw].unk0);
sfxsource_setSfxId(local->unk0, D_80367340[(s32)this->yaw].unk0);
func_8030DD14(local->unk0, 3);
func_8030DFF0(local->unk0, 1);
func_8030DF68(local->unk0, this->position);

18
src/core2/code_126C0.c
View File

@ -50,8 +50,8 @@ void func_80299650(f32 arg1, f32 arg2){
}
else if(arg2 < 1.0) {
if(1.0 <= arg1){
func_8030DA80(D_8037C6C4, SFX_1C_ALARMCLOCK);
func_8030DABC(D_8037C6C4, 0x7fff);
sfxsource_setSfxId(D_8037C6C4, SFX_1C_ALARMCLOCK);
sfxsource_setSampleRate(D_8037C6C4, 0x7fff);
func_8030E2C4(D_8037C6C4);
}
}
@ -60,8 +60,8 @@ void func_80299650(f32 arg1, f32 arg2){
f20 = 5.0f;
while(f20 > 0.0f){
if(f20 <= arg1 && arg2 < f20){
func_8030DA80(D_8037C6C4, (unks0) ? SFX_2A_CLOCK_TIC_1 : SFX_51_CLOCK_TIC_2);
func_8030DABC(D_8037C6C4, 0x7fff);
sfxsource_setSfxId(D_8037C6C4, (unks0) ? SFX_2A_CLOCK_TIC_1 : SFX_51_CLOCK_TIC_2);
sfxsource_setSampleRate(D_8037C6C4, 0x7fff);
func_8030E2C4(D_8037C6C4);
return;
}
@ -108,9 +108,9 @@ void func_80299900(void){
D_8037C6CC = 1.0f;
D_8037C6C1 = func_8030D90C();
func_8030DA80(D_8037C6C1, SFX_18_BIGBUTT_SLIDE);
sfxsource_setSfxId(D_8037C6C1, SFX_18_BIGBUTT_SLIDE);
func_8030DD54(D_8037C6C1, func_802998D0);
func_8030DABC(D_8037C6C1, 28000);
sfxsource_setSampleRate(D_8037C6C1, 28000);
func_8030DD14(D_8037C6C1, 2);
func_8030DD90(D_8037C6C1, 0);
@ -161,7 +161,7 @@ void func_80299BD4(void){
}
void func_80299BFC(f32 arg0){
func_8030DA80(D_8037C6C0, D_80364564[D_8037C6C8]);
sfxsource_setSfxId(D_8037C6C0, D_80364564[D_8037C6C8]);
func_8030DBB4(D_8037C6C0, arg0);
func_8030E2C4(D_8037C6C0);
++D_8037C6C8;
@ -170,9 +170,9 @@ void func_80299BFC(f32 arg0){
}
void func_80299C78(u8 indx, enum sfx_e sfx_id, f32 arg2, s32 arg3){
func_8030DA80(indx, sfx_id);
sfxsource_setSfxId(indx, sfx_id);
func_8030DBB4(indx, arg2);
func_8030DABC(indx, arg3);
sfxsource_setSampleRate(indx, arg3);
func_8030E2C4(indx);
}

2
src/core2/code_12F30.c
View File

@ -49,7 +49,7 @@ void func_80299EC0(f32 arg0[3]) {
arg0[2] = 255.0f;
if (D_8037C6F0.unk0 == 1) {
sp78 = 50;
} else if (!func_8028EE84()) {
} else if (func_8028EE84() != BSWATERGROUP_0_NONE) {
sp78 = 200;
} else {
sp78 = 250;

2
src/core2/code_13A00.c
View File

@ -158,7 +158,7 @@ void func_8029AE74(s32 arg0){
func_8029ACD4();
D_8037D194 = arg0;
tmp_v0 = func_8028ECAC();
if(tmp_v0 == 6 || tmp_v0 == 8 || tmp_v0 == 9){
if(tmp_v0 == BSGROUP_6_TURBO_TALON_TRAINERS || tmp_v0 == BSGROUP_8_TROT || tmp_v0 == BSGROUP_9_LONG_LEG){
func_802F494C(D_8037D190, 0.2f);
}
else{

103
src/core2/code_14420.c
View File

@ -19,6 +19,23 @@ typedef struct {
f32 anim_duration;
} Struct_core2_13FC0;
enum bs_14420_e{
BS14420_0_TERMITE,
BS14420_1_PUMPKIN,
BS14420_2_CROC,
BS14420_3_WALRUS,
BS14420_4_WATER_SURFACE,
BS14420_5_UNDERWATER,
BS14420_7_FLY = 0x7,
BS14420_8_TROT,
BS14420_A_WALRUS_SLED = 0xA,
BS14420_B_BEE,
BS14420_C_CLIMB,
BS14420_D_WONDERWING,
};
/* .data */
s32 D_80364620 = 0;
s16 D_80364624[14] = {0};
@ -93,10 +110,10 @@ enum bs_e func_8029B458(void){
enum bs_e func_8029B504(void){
enum bs_e sp1C;
if(func_802933C0(0xF))
if(miscflag_isTrue(0xF))
return 0;
func_802933E8(0xF);
miscflag_set(0xF);
sp1C = func_8029B458();
if(bs_getState() != sp1C)
return sp1C;
@ -265,55 +282,55 @@ enum bs_e func_8029BA80(void){
}
}
s32 func_8029BAF0(void){
enum bs_14420_e func_8029BAF0(void){
enum bs_e state_id = bs_getState();
switch (_player_getTransformation())
{
case TRANSFORM_3_PUMPKIN://L8029BB2C
return 1;
return BS14420_1_PUMPKIN;
case TRANSFORM_2_TERMITE://L8029BB34
return 0;
return BS14420_0_TERMITE;
case TRANSFORM_5_CROC://L8029BB3C
return 2;
return BS14420_2_CROC;
case TRANSFORM_4_WALRUS://L8029BB44
if (func_802B8190(state_id)) {
return 0xA;
return BS14420_A_WALRUS_SLED;
}
return 3;
return BS14420_3_WALRUS;
case TRANSFORM_6_BEE://L8029BB64
return 0xB;
return BS14420_B_BEE;
case TRANSFORM_1_BANJO://L8029BB6C
default:
if (bsclimb_inSet(state_id)) {
return 0xC;
return BS14420_C_CLIMB;
}
if (bsbfly_inSet(state_id)) {
return 7;
return BS14420_7_FLY;
}
if (bsbtrot_inSet(state_id)) {
return 8;
return BS14420_8_TROT;
}
if (func_80291670(2) != 0.0f) {
return 9;
}
if (func_802933C0(0x18)) {
return 5;
if (miscflag_isTrue(0x18)) {
return BS14420_5_UNDERWATER;
}
if (func_8028ECAC() == 3) {
return 0xD;
if (func_8028ECAC() == BSGROUP_3_WONDERWING) {
return BS14420_D_WONDERWING;
}
if (player_inWater()) {
switch(func_8028EE84()){
case 2:
return 5;
case 1:
case BSWATERGROUP_2_UNDERWATER:
return BS14420_5_UNDERWATER;
case BSWATERGROUP_1_SURFACE:
default:
return 4;
return BS14420_4_WATER_SURFACE;
}
}
@ -402,7 +419,7 @@ enum bs_e func_8029BF4C(void) {
return D_803648F0[func_8029BAF0()].state_id;
}
enum bs_e func_8029BF78(void){
enum bs_e bs_getIdleState(void){
switch (_player_getTransformation()) {
case TRANSFORM_3_PUMPKIN:
return BS_48_PUMPKIN_IDLE;
@ -421,10 +438,10 @@ enum bs_e func_8029BF78(void){
case TRANSFORM_1_BANJO:
default:
if (func_802933C0(0x16)) {
if (miscflag_isTrue(0x16)) {
return BS_24_FLY;
}
if (func_802933C0(0x18)) {
if (miscflag_isTrue(0x18)) {
return BS_2B_DIVE_IDLE;
}
if (func_80291670(3) != 0.0f) {
@ -579,7 +596,7 @@ void func_8029C674(void) {
D_8037D1E8 = FALSE;
if (func_80298850() == 4) {
D_8037D1E8 = TRUE;
func_802933E8(0x17);
miscflag_set(0x17);
func_802BE8D8();
func_8028E9C4(5, sp1C);
func_802C2A64(sp1C);
@ -604,7 +621,7 @@ void func_8029C6D0(void) {
void func_8029C748(void) {
if (D_8037D1E8) {
func_802933FC(0x17);
miscflag_clear(0x17);
func_802BE91C();
}
}
@ -613,10 +630,10 @@ enum bs_e func_8029C780(void){
if(button_held(BUTTON_Z) && can_flip())
return BS_12_BFLIP;
if(func_802933C0(2))
if(miscflag_isTrue(MISC_FLAG_2_ON_SPRING_PAD))
return BS_5_JUMP;
if(func_802933C0(1))
if(miscflag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD))
return BS_23_FLY_ENTER;
return BS_5_JUMP;
@ -683,7 +700,7 @@ void func_8029C984(void){
}
s32 func_8029C9C0(s32 arg0){
if(func_802933C0(0xF))
if(miscflag_isTrue(0xF))
return arg0;
if(button_pressed(BUTTON_A))
@ -705,28 +722,28 @@ s32 func_8029C9C0(s32 arg0){
}
s32 func_8029CA94(s32 arg0){
if(func_802933C0(0x19))
if(miscflag_isTrue(0x19))
arg0 = func_80292738();
if(func_802933C0(0x1A))
if(miscflag_isTrue(0x1A))
arg0 = (player_getTransformation() == TRANSFORM_6_BEE) ? 0x46 : BS_34_JIG_NOTEDOOR;
if(func_802933C0(0xE))
if(miscflag_isTrue(MISC_FLAG_E_TOUCHING_WADING_BOOTS))
arg0 = BS_25_LONGLEG_ENTER;
if(func_802933C0(0x10))
if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS))
arg0 = BS_14_BTROT_ENTER;
if(func_802933C0(0x6))
arg0 = 0x53;
if(miscflag_isTrue(0x6))
arg0 = BS_53_TIMEOUT;
if(func_802933C0(0x7))
if(miscflag_isTrue(0x7))
arg0 = BS_44_JIG_JIGGY;
if(func_802933C0(0x14))
if(miscflag_isTrue(0x14))
arg0 = (player_getTransformation() == TRANSFORM_4_WALRUS) ? 0x80 : 0x53;
func_802933FC(0xF);
miscflag_clear(0xF);
return arg0;
}
@ -763,14 +780,14 @@ void func_8029CBF4(void){
}
void func_8029CCC4(void){
if(func_802933D0(7)) return;
if( func_802933C0(0xF)
&& func_802933D0(6)
&& func_802933D0(20)
if(miscflag_isFalse(7)) return;
if( miscflag_isTrue(0xF)
&& miscflag_isFalse(6)
&& miscflag_isFalse(20)
){
func_802933FC(0xF);
miscflag_clear(0xF);
}
func_802933FC(7);
miscflag_clear(7);
func_802B0CD8();
item_inc(ITEM_E_JIGGY);
if(jiggyscore_total() == 100 && func_8031FF1C(BKPROG_FC_DEFEAT_GRUNTY)){

33
src/core2/code_16010.c
View File

@ -21,7 +21,7 @@ void func_8029CFF8(void){
}
void func_8029D01C(void){
func_802933FC(0x13);
miscflag_clear(0x13);
D_8037D210 = func_8030D90C();
D_8037D212 = 0;
}
@ -29,8 +29,8 @@ void func_8029D01C(void){
void func_8029D050(void){
func_80299E48();
func_8030E394(D_8037D210);
func_8030DA80(D_8037D210, SFX_14D_BANJO_FREEZING);
func_8030DABC(D_8037D210, 30000);
sfxsource_setSfxId(D_8037D210, SFX_14D_BANJO_FREEZING);
sfxsource_setSampleRate(D_8037D210, 30000);
func_8030DBB4(D_8037D210, 1.2f);
func_8030DD14(D_8037D210, 3);
func_8030E2C4(D_8037D210);
@ -41,8 +41,8 @@ void func_8029D050(void){
void func_8029D0D8(void) {
func_8030E394(D_8037D210);
func_8030DA80(D_8037D210, SFX_B0_SIZZLING_NOISE);
func_8030DABC(D_8037D210, 32000);
sfxsource_setSfxId(D_8037D210, SFX_B0_SIZZLING_NOISE);
sfxsource_setSampleRate(D_8037D210, 32000);
func_8030DBB4(D_8037D210, randf2(0.7f, 0.8f));
func_8030DD14(D_8037D210, 3);
func_8030E2C4(D_8037D210);
@ -58,8 +58,8 @@ void func_8029D194(void) {
func_802C3BF8(&func_8029D154);
FUNC_8030E624(SFX_A_BANJO_LANDING_05, 1.0f, 28000);
func_8030E394(D_8037D210);
func_8030DA80(D_8037D210, SFX_6D_CROC_BITE);
func_8030DABC(D_8037D210, 22000);
sfxsource_setSfxId(D_8037D210, SFX_6D_CROC_BITE);
sfxsource_setSampleRate(D_8037D210, 22000);
func_8030DD14(D_8037D210, 3);
player_getPosition(D_8037D218);
D_8037D218[1] = func_80294500();
@ -106,8 +106,8 @@ void func_8029D2F8(void) {
}
else if (D_8037D211 == 2) {
func_8030E394(D_8037D210);
func_8030DA80(D_8037D210, SFX_134_FREEZING_SHIVER);
func_8030DABC(D_8037D210, 20000);
sfxsource_setSfxId(D_8037D210, SFX_134_FREEZING_SHIVER);
sfxsource_setSampleRate(D_8037D210, 20000);
func_8030DBB4(D_8037D210, 1.2f);
func_8030DD14(D_8037D210, 3);
func_8030E2C4(D_8037D210);
@ -130,7 +130,7 @@ void func_8029D448(void) {
func_8030E394(D_8037D210);
return;
}
func_8030DABC(D_8037D210, temp_a1);
sfxsource_setSampleRate(D_8037D210, temp_a1);
}
}
@ -197,6 +197,7 @@ bool func_8029D66C(void){
return FALSE;
}
//can_take_ground_damage
bool func_8029D7B4(void){
enum bs_e sp1C;
@ -220,11 +221,11 @@ bool func_8029D7B4(void){
return func_8029D66C()
&& _player_getTransformation() == TRANSFORM_1_BANJO
&& func_802916CC(2)
&& func_8028ECAC() != 3
&& func_8028ECAC() != 9
&& func_802933D0(0xE)
&& func_8028ECAC() != BSGROUP_3_WONDERWING
&& func_8028ECAC() != BSGROUP_9_LONG_LEG
&& miscflag_isFalse(MISC_FLAG_E_TOUCHING_WADING_BOOTS)
&& sp1C != BS_25_LONGLEG_ENTER
&& func_8028EE84() != 2
&& func_8028EE84() != BSWATERGROUP_2_UNDERWATER
&& func_8028EC04() < 1U
&& func_80297C6C() != 3
&& bs_getState() != BS_3D_FALL_TUMBLING
@ -313,9 +314,9 @@ void func_8029D968(void){
break;
}
}
func_802933E8(0x13);
miscflag_set(0x13);
}
else{
func_802933FC(0x13);
miscflag_clear(0x13);
}
}

2
src/core2/code_27550.c
View File

@ -127,7 +127,7 @@ void func_802AEA2C(void) {
break;
case 3:
if (func_8029E1A8(0)) {
next_state = func_8029BF78();
next_state = bs_getIdleState();
}
break;
}

6
src/core2/code_27F40.c
View File

@ -29,7 +29,7 @@ void func_802AEEF4(void) {
sp1C[1] += 180.0f;
sp1C[2] = 0.0f;
func_802C2A8C(sp1C);
func_802933E8(0x17);
miscflag_set(0x17);
}
void func_802AEFB0(void) {
@ -54,7 +54,7 @@ void func_802AEFB0(void) {
sp1C = 1;
}
if (player_inWater()) {
if (player_getTransformation() == TRANSFORM_1_BANJO && func_8028EE84() == 0) {
if (player_getTransformation() == TRANSFORM_1_BANJO && func_8028EE84() == BSWATERGROUP_0_NONE) {
sp1C += 1;
}
} else if (func_8028B254(25) == 0) {
@ -74,5 +74,5 @@ void func_802AF164(void) {
func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
}
func_802BE91C();
func_802933FC(0x17);
miscflag_clear(0x17);
}

2
src/core2/code_28220.c
View File

@ -122,7 +122,7 @@ void func_802AF668(void) {
break;
case 3:
if (func_8029E1A8(0)) {
next_state = func_8029BF78();
next_state = bs_getIdleState();
}
break;
}

30
src/core2/code_2890.c
View File

@ -75,34 +75,34 @@ void func_80289A78(s32 arg0, s32 arg1) {
}
}
if ((D_8037BF4C & 1)) {
func_80289978(&sp2C, sp28, 2.0f, 1.0f);
func_8033A928(arg0, 6, &sp2C);
func_8033A928(arg0, 0x14, &sp2C);
func_80289978(sp2C, sp28, 2.0f, 1.0f);
func_8033A928(arg0, 6, sp2C);
func_8033A928(arg0, 0x14, sp2C);
}
if (D_8037BF4C & 2) {
func_80289978(&sp2C, sp28, 2.0f, 1.0f);
func_8033A928(arg0, 0x10, &sp2C);
func_8033A928(arg0, 0x1E, &sp2C);
func_80289978(sp2C, sp28, 2.0f, 1.0f);
func_8033A928(arg0, 0x10, sp2C);
func_8033A928(arg0, 0x1E, sp2C);
}
if (D_8037BF4C & 4) {
func_80289978(&sp2C, sp28, 2.0f, 1.0f);
func_8033A928(arg0, 0x12, &sp2C);
func_80289978(sp2C, sp28, 2.0f, 1.0f);
func_8033A928(arg0, 0x12, sp2C);
}
if (D_8037BF4C & 8) {
func_80289978(&sp2C, sp28, 0.2f, 0.5f);
func_8033A928(arg0, 0x12, &sp2C);
func_80289978(sp2C, sp28, 0.2f, 0.5f);
func_8033A928(arg0, 0x12, sp2C);
}
if (D_8037BF4C & 0x10) {
func_8033A968(arg0, 1, &D_803635E0);
}
if (D_8037BF4C & 0x20) {
func_80289978(&sp2C, sp28, 2.0f, 1.0f);
func_8033A928(arg0, 0x6C, &sp2C);
func_80289978(sp2C, sp28, 2.0f, 1.0f);
func_8033A928(arg0, 0x6C, sp2C);
}
if (D_8037BF4C & 0x40) {
func_80289978(&sp2C, sp28, 2.0f, 1.0f);
func_8033A928(arg0, 0x64, &sp2C);
func_8033A928(arg0, 0x67, &sp2C);
func_80289978(sp2C, sp28, 2.0f, 1.0f);
func_8033A928(arg0, 0x64, sp2C);
func_8033A928(arg0, 0x67, sp2C);
}
if (map_get() == MAP_A_TTC_SANDCASTLE) {
if ((D_8037BF4C & 0x80) && (player_getTransformation() != TRANSFORM_7_WISHWASHY)) {

2
src/core2/code_3480.c
View File

@ -84,7 +84,7 @@ s32 func_8028A5C0(void){
if(!func_8028F25C() && func_80321960() == 3)
func_803219F4(1);
if(func_802933C0(0x17) && !func_8028F25C()){
if(miscflag_isTrue(0x17) && !func_8028F25C()){
if(func_8028A41C(183.0f, -100.0f, 75.0f)){
if(func_802DE41C() == 6){
if(!D_8037DCCC){

2
src/core2/code_356B0.c
View File

@ -530,7 +530,7 @@ void func_802BD3CC(f32 arg0[3]) {
player_getPosition(arg0);
sp2C = func_8028E82C();
if ((func_8028F2FC() != 0) && (func_8028EE84() != 2) && (player_getTransformation() == TRANSFORM_1_BANJO)) {
if ((func_8028F2FC() != 0) && (func_8028EE84() != BSWATERGROUP_2_UNDERWATER) && (player_getTransformation() == TRANSFORM_1_BANJO)) {
temp_f0 = func_8028EF88();
temp_f2 = temp_f0 - 500.0f;
sp2C = ml_map_f(arg0[1], temp_f0 - 80.0f, temp_f2, temp_f0, temp_f2);

2
src/core2/code_38150.c
View File

@ -7,7 +7,7 @@ f32 D_8037DAA0;
/* .code */
void func_802BF0E0(f32 arg0[3]){
if(func_8028ECAC() == 5){
if(func_8028ECAC() == BSGROUP_5_CLIMB){
func_802C0150(3);
}
else{

18
src/core2/code_39D0.c
View File

@ -49,8 +49,8 @@ s32 can_egg(void){
}
int can_flap(void){
return func_802933D0(0x12)
&& func_802933D0(0x5)
return miscflag_isFalse(0x12)
&& miscflag_isFalse(0x5)
&& ability_hasLearned(ABILITY_7_FLAP);
}
@ -67,13 +67,13 @@ s32 func_8028AB48(void){
}
int can_peck(void){
return func_802933D0(0x5)
&& func_802933D0(0x12)
return miscflag_isFalse(0x5)
&& miscflag_isFalse(0x12)
&& ability_hasLearned(ABILITY_B_RATATAT_RAP);
}
int func_8028ABB8(void){
if(func_802933C0(0x14) || func_802933C0(0x19))
if(miscflag_isTrue(0x14) || miscflag_isTrue(0x19))
return 0;
if(bs_getState() == BS_56_RECOIL)
return 0;
@ -182,7 +182,7 @@ int func_8028B0E0(f32 arg0[3], f32 arg1){
s32 func_8028B120(void){return 0;}
int func_8028B128(void){
return func_802933C0(0x13);
return miscflag_isTrue(0x13);
}
int func_8028B148(void){
@ -222,8 +222,8 @@ bool func_8028B3B4(void) {
bool sp1C;
bool sp18;
sp1C = func_80294610(0x10) && func_802933D0(3);
sp18 = func_80294610(0x40) && func_802933D0(4);
sp1C = func_80294610(0x10) && miscflag_isFalse(3);
sp18 = func_80294610(0x40) && miscflag_isFalse(4);
if(sp1C || sp18)
return TRUE;
return FALSE;
@ -277,7 +277,7 @@ void func_8028B534(void){
D_8037BF62 = 1;
}
else{
if(func_8028B2E8() || sp1C == 0xA || sp1C == 5){
if(func_8028B2E8() || sp1C == BSGROUP_A_FLYING || sp1C == BSGROUP_5_CLIMB){
D_8037BF62 = 0;
}
}

10
src/core2/code_39EF0.c
View File

@ -37,8 +37,8 @@ struct {
f32 D_8037DC10;
/* .code */
bool func_802C0E80(void){
return (map_get() == MAP_27_FP_FREEZEEZY_PEAK) && (func_8028ECAC() == 10);
bool __is_flying_in_FP(void){
return (map_get() == MAP_27_FP_FREEZEEZY_PEAK) && (func_8028ECAC() == BSGROUP_A_FLYING);
}
struct56s *func_802C0EC0(void){
@ -131,7 +131,7 @@ s32 func_802C11C8(f32 arg0[3]) {
sp2C = func_802C0EC0();
func_802C0FF4(sp4C);
if (func_8028EE84() == 2) {
if (func_8028EE84() == BSWATERGROUP_2_UNDERWATER) {
func_802BD82C(20.0f, 200.0f);
} else {
func_802BD82C(80.0f, 200.0f);
@ -188,7 +188,7 @@ void func_802C14E0(void) {
D_8037DBE0.unk2C = 2;
}
func_802BD384(sp40);
if ((D_8037DBE0.unk28 == -1) || (func_802C11C8(sp40) == 0) || func_802C0E80()) {
if ((D_8037DBE0.unk28 == -1) || (func_802C11C8(sp40) == 0) || __is_flying_in_FP()) {
D_8037DBE0.unk28 = 0;
return;
}
@ -227,7 +227,7 @@ void func_802C16CC(s32 arg0) {
s32 sp34;
s16 *sp30;
if ((func_8028ECAC() != 4) && !func_802C0E80()){
if ((func_8028ECAC() != 4) && !__is_flying_in_FP()){
sp38 = func_80334524(arg0);
if(sp38 != D_8037DBE0.unk28 && D_8037DBE0.unk28 != -1){
player_getPosition(sp54);

2
src/core2/code_43800.c
View File

@ -32,7 +32,7 @@ Actor *func_802CA7BC(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
f32 sp40;
f32 sp34[3];
sp60 = (func_8028EE84() == 2) ? 8.0f : 4.0f;
sp60 = (func_8028EE84() == BSWATERGROUP_2_UNDERWATER) ? 8.0f : 4.0f;
this = marker_getActor(marker);
if( !func_8028F070()
|| !func_8028F150()

2
src/core2/code_43A40.c
View File

@ -39,7 +39,7 @@ extern struct31s D_80366F8C = {
extern struct43s D_80366FB4 = {
{{-360.0f, 360.0f}, {-360.0, 360.0f}, {660.0f, 360.0f}},
{{-360.0f, 360.0f, -360.0}, {360.0f, 660.0f, 360.0f}},
{{0.0f, -1200.0f, 0.0f}, {0.0f, -1200.0f, 0.0f}},
{{0.0f, 0.0f, 0.0f}, {0.0f, 40.0f, 0.0f}}
};

10
src/core2/code_45310.c
View File

@ -272,9 +272,9 @@ void func_802CCBF4(Actor *this) {
local = (ActorLocal_Core2_45310 * )&this->local;
local->unk0 = func_8030D90C();
func_8030DBB4(local->unk0, 0.9f);
func_8030DA80(local->unk0, 0x3FA);
sfxsource_setSfxId(local->unk0, 0x3FA);
func_8030DD14(local->unk0, 2);
func_8030DABC(local->unk0, 0);
sfxsource_setSampleRate(local->unk0, 0);
}
void func_802CCC5C(Actor *this) {
@ -356,7 +356,7 @@ void func_802CCC5C(Actor *this) {
phi_f12 = 0.0f;
}
if (phi_f12 > 0.0f) {
func_8030DABC(local->unk0, (s32) (phi_f12 * 10000.0f));
sfxsource_setSampleRate(local->unk0, (s32) (phi_f12 * 10000.0f));
func_8030E2C4(local->unk0);
}
}
@ -447,7 +447,7 @@ void func_802CCC5C(Actor *this) {
&& !func_8028F25C()
&& (sp58 > 800.0f)
&& (this->marker->unk14_21)
&& (func_8028EE84() != 2)
&& (func_8028EE84() != BSWATERGROUP_2_UNDERWATER)
&& func_802CC57C(this, sp8C)
) {
sp8C[0] = 0.0f;
@ -464,7 +464,7 @@ void func_802CCC5C(Actor *this) {
spBC = 1;
}
if (this->state == 3) {
if (func_8028F25C() || (func_8028EE84() == 2)) {
if (func_8028F25C() || (func_8028EE84() == BSWATERGROUP_2_UNDERWATER)) {
func_802CC640(this, 4);
} else {
if (local->unk3A == 0) {

10
src/core2/code_47BD0.c
View File

@ -245,7 +245,7 @@ void func_802CF434(Actor *this) {
void func_802CF518(Actor *this) {
if( func_803292E0(this)
&& func_80329530(this, 900)
&& !func_8028EE84()
&& func_8028EE84() == BSWATERGROUP_0_NONE
&& player_getTransformation() != TRANSFORM_6_BEE
) {
func_80328A84(this, 3);
@ -256,7 +256,7 @@ void func_802CF57C(Actor *this) {
ActorLocal_core2_47BD0 *local;
local = (ActorLocal_core2_47BD0 *) &this->local;
if (!func_803292E0(this) || !func_80329530(this, 900) || func_8028EE84()) {
if (!func_803292E0(this) || !func_80329530(this, 900) || func_8028EE84() != BSWATERGROUP_0_NONE) {
func_80328A84(this, 5);
func_802CEF54(this, local->unkC, 100.0f);
}
@ -296,7 +296,7 @@ void func_802CF610(Actor *this, ParticleEmitter *p_ctrl, f32 position[3]) {
void func_802CF7CC(Actor *this) {
if (D_8037DCBC == 0) {
this->unk44_31 = func_8030D90C();
func_8030DA80(this->unk44_31, 0x3FA);
sfxsource_setSfxId(this->unk44_31, 0x3FA);
func_8030DD14(this->unk44_31, 2);
func_8030DD90(this->unk44_31, 2);
D_8037DCBC = 1;
@ -484,7 +484,7 @@ block_40:
case 1:
if( !func_8031FF1C(0x8F)
&& func_803296B8(this, 0xFA, 0x12C)
&& ((func_8028ECAC() == 0) || (func_8028ECAC() == 8))
&& ((func_8028ECAC() == 0) || (func_8028ECAC() == BSGROUP_8_TROT))
&& (player_getTransformation() == TRANSFORM_1_BANJO)
&& func_80311480(0xDA6, 0, NULL, NULL, NULL, NULL)
) {
@ -524,7 +524,7 @@ block_40:
func_8030DEB4(this->unk44_31, 500.0f, 1500.0f);
func_8030DF68(this->unk44_31, this->position);
func_8030E2C4(this->unk44_31);
func_8030DABC(this->unk44_31, ((gu_sqrtf(this->velocity[0]*this->velocity[0] + this->velocity[1]*this->velocity[1] + this->velocity[2]*this->velocity[2])/ this->unk28) * 8000.0f) + 2000.0f);
sfxsource_setSampleRate(this->unk44_31, ((gu_sqrtf(this->velocity[0]*this->velocity[0] + this->velocity[1]*this->velocity[1] + this->velocity[2]*this->velocity[2])/ this->unk28) * 8000.0f) + 2000.0f);
}
}
}

32
src/core2/code_47C0.c
View File

@ -141,7 +141,7 @@ void func_8028B904(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
func_80296CC0(&sp1C);
func_80296CB4(arg3);
if(func_802933C0(7)){
if(miscflag_isTrue(7)){
func_8029CDA0();
}
else{
@ -686,7 +686,7 @@ void func_8028BCA0(Prop *prop){
break;
case 0x6B: //L8028CD20
if(func_8028EE84() == 2){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_803463D4(ITEM_17_AIR, func_80301DBC(2));
}
break;
@ -713,7 +713,7 @@ void func_8028BCA0(Prop *prop){
case 0xD4: //L8028CDEC
case 0x242: //L8028CDEC
if(ability_isUnlocked(ABILITY_D_SHOCK_JUMP)){
func_802933E8(2);
miscflag_set(MISC_FLAG_2_ON_SPRING_PAD);
}else{
if(!func_80320454(0xC, 1)){
func_80311480(0xA24, 4, 0, 0, 0, 0);
@ -725,7 +725,7 @@ void func_8028BCA0(Prop *prop){
case 0x240: //L8028CE3C
case 0x261: //L8028CE3C
if(ability_isUnlocked(ABILITY_9_FLY)){
func_802933E8(1);
miscflag_set(MISC_FLAG_1_ON_FLIGHT_PAD);
}
else if(! func_80320454(0xD, 1)){
func_80311480(0xA25, 4, 0, 0, 0, 0);
@ -744,7 +744,7 @@ void func_8028BCA0(Prop *prop){
if(chwadingboots_802D6E0C(actor) == 0)
return;
func_802933E8(0xe);
miscflag_set(MISC_FLAG_E_TOUCHING_WADING_BOOTS);
func_802A6388(chwadingboots_802D6E4C(actor));
bs_checkInterrupt(0x1B);
func_802C3F04(func_802C418C, 0x4E, reinterpret_cast(u32, prop->actorProp.x), reinterpret_cast(u32, prop->actorProp.y), reinterpret_cast(u32, prop->actorProp.z));
@ -768,7 +768,7 @@ void func_8028BCA0(Prop *prop){
if(chtrainers_802CA708(actor) == 0)
return;
func_802933E8(0x10);
miscflag_set(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
func_80294AE8(chtrainers_802CA748(actor));
bs_checkInterrupt(0x1A);
func_802C3F04(func_802C418C, 0x4E, reinterpret_cast(u32, prop->actorProp.x), reinterpret_cast(u32, prop->actorProp.y), reinterpret_cast(u32, prop->actorProp.z));
@ -798,7 +798,7 @@ void func_8028BCA0(Prop *prop){
plyr_collision_type = 0;
}
if(obj_collision_type){
func_802933E8(8);
miscflag_set(8);
}
func_8032FFF4(playerMarker, marker, plyr_collision_type);
func_8032FFF4(marker, playerMarker, obj_collision_type);
@ -812,10 +812,10 @@ void func_8028BCA0(Prop *prop){
switch (tmp2)
{
case 0x2E8:
func_802933E8(1); //on flight pad
miscflag_set(MISC_FLAG_1_ON_FLIGHT_PAD); //on flight pad
break;
case 0x2DD: //on shock spring pad
func_802933E8(2);
miscflag_set(MISC_FLAG_2_ON_SPRING_PAD);
break;
default:
func_80332790(tmp2);
@ -865,9 +865,9 @@ void playerMarker_init(void){
playerMarker->unk2C_1 = 1;
marker_setCollisionScripts(playerMarker, NULL, func_80291634, func_80291610);
func_803300B8(playerMarker, func_8028D7B8);
func_802933FC(1);
func_802933FC(2);
func_802933FC(8);
miscflag_clear(MISC_FLAG_1_ON_FLIGHT_PAD);
miscflag_clear(MISC_FLAG_2_ON_SPRING_PAD);
miscflag_clear(8);
func_8028D638(0,0);
func_8033D2F4();
D_8037BF8C = 0;
@ -898,11 +898,11 @@ void func_8028D2E4(void){
D_8037BF88 = 0;
}
}//L8028D364
func_802933FC(8);
miscflag_clear(8);
if(playerMarker->collidable){
temp_s0_2 = func_8028B750();
func_802933FC(1);
func_802933FC(2);
miscflag_clear(MISC_FLAG_1_ON_FLIGHT_PAD);
miscflag_clear(MISC_FLAG_2_ON_SPRING_PAD);
_player_getPosition(sp168);
func_8032F64C(sp168, playerMarker);
for(D_8037BF8C = NULL, i = 0, temp_s2 = 0; i < 2;i++){//L8028D3DC
@ -1016,7 +1016,7 @@ void func_8028D7B8(s32 arg0, ActorMarker *arg1, s32 arg2){
s32 tmp_v0;
if(func_8033D5A4(arg2))
func_802933E8(8);
miscflag_set(8);
if((func_80297C6C() != 3 && func_8028F1E0()) || !sp20){
if(!func_8028F25C()){

2
src/core2/code_4A6F0.c
View File

@ -101,7 +101,7 @@ bool func_802D181C(s32 arg0) {
void func_802D186C(Actor *this) {
if (this->unk44_31 == 0) {
this->unk44_31 = func_8030ED2C(SFX_5F_MUMBO_BUGABUGOW_MUFFLED, 3);
func_8030DABC(this->unk44_31, 0x7FFF);
sfxsource_setSampleRate(this->unk44_31, 0x7FFF);
}
}

4
src/core2/code_4C020.c
View File

@ -346,7 +346,7 @@ bool func_802D42F8(Actor *this) {
void func_802D4388(Actor *this){
func_802D3CE8(this);
this->unk38_0 = ( map_get() == MAP_7A_GL_CRYPT || item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->unkF4_8 || func_802D42F8(this)) ? TRUE : FALSE;
mapSpecificFlags_set(0x1F, (func_8028F20C() && func_8028FB48(0x78000000)) || func_8028ECAC() == 0xD);
mapSpecificFlags_set(0x1F, (func_8028F20C() && func_8028FB48(0x78000000)) || func_8028ECAC() == BSGROUP_D_TRANSFORMING);
switch(this->state){
case 0x12: //L802D4468
if(this->unk38_0 && mapSpecificFlags_get(0x1F)){
@ -412,7 +412,7 @@ void func_802D4680(Actor *this){
break;
case 1:
if(func_80258640(this->position, sp1C) < 150.0f && func_8028F20C()){
if(func_8028ECAC() == 0 || func_8028ECAC() == 8){
if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){
if(map_get() == MAP_8E_GL_FURNACE_FUN){
func_803204E4(0, 0);
func_802D4614(MAP_80_GL_FF_ENTRANCE);

2
src/core2/code_54D50.c
View File

@ -31,7 +31,7 @@ struct40s D_80367F60 = {
};
struct43s D_80367F90 ={
{{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}},
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}},
{{0.0f, -650.0f, 0.0f}, {0.0f, -650.0f, 0.0f}},
{{-200.0f, 0.0f, -200.0f}, {200.0f, 0.0f, 200.0f}}
};

15
src/core2/code_67650.c
View File

@ -525,9 +525,8 @@ void func_802EFC28(ParticleEmitter *this, struct40s *arg1){
void particleEmitter_setVelocityAndAccelerationRanges(ParticleEmitter *this, struct41s *arg1){
particleEmitter_setParticleVelocityRange(this,
arg1->unk0.unk0[0], arg1->unk0.unk0[1],
arg1->unk0.unk8[0], arg1->unk0.unk8[1],
arg1->unk0.unk10[0], arg1->unk0.unk10[1]
arg1->unk0.unk0[0], arg1->unk0.unk0[1], arg1->unk0.unk0[2],
arg1->unk0.unkC[0], arg1->unk0.unkC[1], arg1->unk0.unkC[2]
);
particleEmitter_setParticleAccelerationRange(this,
arg1->unk18.unk0[0], arg1->unk18.unk0[1], arg1->unk18.unk0[2],
@ -537,9 +536,8 @@ void particleEmitter_setVelocityAndAccelerationRanges(ParticleEmitter *this, str
void particleEmitter_setPositionAndVelocityRanges(ParticleEmitter *this, struct42s *arg1){
particleEmitter_setParticleVelocityRange(this,
arg1->unk0.unk0[0], arg1->unk0.unk0[1],
arg1->unk0.unk8[0], arg1->unk0.unk8[1],
arg1->unk0.unk10[0], arg1->unk0.unk10[1]
arg1->unk0.unk0[0], arg1->unk0.unk0[1], arg1->unk0.unk0[2],
arg1->unk0.unkC[0], arg1->unk0.unkC[1], arg1->unk0.unkC[2]
);
particleEmitter_setParticleSpawnPositionRange( this,
@ -550,9 +548,8 @@ void particleEmitter_setPositionAndVelocityRanges(ParticleEmitter *this, struct4
void particleEmitter_setPositionVelocityAndAccelerationRanges(ParticleEmitter *this, struct43s* arg1){
particleEmitter_setParticleVelocityRange(this,
arg1->unk0.unk0[0], arg1->unk0.unk0[1],
arg1->unk0.unk8[0], arg1->unk0.unk8[1],
arg1->unk0.unk10[0], arg1->unk0.unk10[1]
arg1->unk0.unk0[0], arg1->unk0.unk0[1], arg1->unk0.unk0[2],
arg1->unk0.unkC[0], arg1->unk0.unkC[1], arg1->unk0.unkC[2]
);
particleEmitter_setParticleAccelerationRange(this,
arg1->unk18.unk0[0], arg1->unk18.unk0[1], arg1->unk18.unk0[2],

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