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

Merge branch 'documentation' into 'master' 

Documenting Player Utilities and Related

See merge request banjo.decomp/banjo-kazooie!105
This commit is contained in:
Banjo Kazooie 2024-11-03 17:19:48 +00:00
parent 26d7a9e180 0d223bfc2b
commit 1a99579123
78 changed files with 243 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
decompressed.pal.yaml
View File

@ -511,7 +511,7 @@ segments:
- [0xF7B410, c, code_2240]
- [0xF7BA60, c, ba/anim]
- [0xF7C650, c, snackerctl]
- [0xF7CBA0, c, code_39D0]
- [0xF7CBA0, c, playerutils]
- [0xF7D990, c, ba/marker]
- [0xF7FD00, c, code_6B30]
- [0xF7FFA0, c, ba/carriedobj]
@ -1126,7 +1126,7 @@ segments:
- [0x10667D0, .rodata, anseq]
- [0x10667F0, .rodata, ba/anim]
- [0x1066860, .rodata, snackerctl]
- [0x1066870, .rodata, code_39D0]
- [0x1066870, .rodata, playerutils]
- [0x1066910, .rodata, ba/marker]
- [0x1066D40, .rodata, code_6B30]
- [0x1066E30, .rodata, code_7060]
@ -1379,7 +1379,7 @@ segments:
- [0x0106C980, .bss, anseq]
- [0x0106C980, .bss, ba/anim]
- [0x0106C980, .bss, snackerctl]
- [0x0106C980, .bss, code_39D0]
- [0x0106C980, .bss, playerutils]
- [0x0106C980, .bss, ba/marker]
- [0x0106C980, .bss, code_6B30]
- [0x0106C980, .bss, code_7060]

6
decompressed.us.v10.yaml
View File

@ -512,7 +512,7 @@ segments:
- [0xF57BA0, c, code_2240]
- [0xF581F0, c, ba/anim] # anstate???
- [0xF58DE0, c, snackerctl]
- [0xF59330, c, code_39D0]
- [0xF59330, c, playerutils]
- [0xF5A120, c, ba/marker] #babanjo? baavatar?
- [0xF5C490, c, code_6B30]
- [0xF5C730, c, ba/carriedobj]
@ -1125,7 +1125,7 @@ segments:
- [0x1042800, .rodata, anseq]
- [0x1042880, .rodata, ba/anim]
- [0x1042890, .rodata, snackerctl]
- [0x10428A0, .rodata, code_39D0]
- [0x10428A0, .rodata, playerutils]
- [0x1042940, .rodata, ba/marker]
- [0x1042D70, .rodata, code_6B30]
- [0x1042E60, .rodata, code_7060]
@ -1377,7 +1377,7 @@ segments:
- [0x1048560, .bss, anseq]
- [0x1048560, .bss, ba/anim]
- [0x1048560, .bss, snackerctl]
- [0x1048560, .bss, code_39D0]
- [0x1048560, .bss, playerutils]
- [0x1048560, .bss, ba/marker]
- [0x1048560, .bss, code_6B30]
- [0x1048560, .bss, code_7060]

2
include/bsint.h
View File

@ -27,7 +27,7 @@ enum bs_interrupt_e {
BS_INTR_10,
BS_INTR_11_DROWN,
BS_INTR_12, //something with carried objects
BS_INTR_13, //ff death square?
BS_INTR_13_FF_DEATH_SQUARE,
BS_INTR_14, //gv matching game?, forces jump state
BS_INTR_15,
BS_INTR_16_THROW_CARRIED_OBJ, //carry_object_throw_volume

25
include/enums.h
View File

@ -5314,9 +5314,12 @@ enum common_particle_e{
};
enum bsgroup_e {
BSGROUP_3_WONDERWING = 0x3,
BSGROUP_4_LOOK = 0x4,
BSGROUP_5_CLIMB = 0x5,
BSGROUP_0_NONE,
BSGROUP_1_INTR,
BSGROUP_2, // busy?
BSGROUP_3_WONDERWING,
BSGROUP_4_LOOK,
BSGROUP_5_CLIMB,
BSGROUP_6_TURBO_TALON_TRAINERS,
BSGROUP_7_CROC_ATTACK,
BSGROUP_8_TROT,
@ -5337,11 +5340,11 @@ enum misc_flag_e{
BA_FLAG_0, // unused
BA_FLAG_1_ON_FLIGHT_PAD,
BA_FLAG_2_ON_SPRING_PAD,
BA_FLAG_3,
BA_FLAG_4,
BA_FLAG_3, // idling?
BA_FLAG_4, // idling?
BA_FLAG_5_HAS_PECKED,
BA_FLAG_6,
BA_FLAG_7,
BA_FLAG_7_TOUCHING_JIGGY,
BA_FLAG_8,
BA_FLAG_9,
BA_FLAG_A,
@ -5353,14 +5356,14 @@ enum misc_flag_e{
BA_FLAG_10_TOUCHING_TURBO_TRAINERS,
BA_FLAG_11, // unused
BA_FLAG_12_HAS_FLAPPED, // has used flap
BA_FLAG_13, // related to ground damage ?
BA_FLAG_13_TOUCHING_DANGEROUS_GROUND, // related to ground damage
BA_FLAG_14_LOSE_BOGGY_RACE, // in difficult terrain (mud)
BA_FLAG_15_LOADZONE, // touching loadzone?
BA_FLAG_16, // related to flying
BA_FLAG_16_FLYING,
BA_FLAG_17_FIRST_PERSON_VIEW,
BA_FLAG_18, // related to underwater state
BA_FLAG_19, // related to transformations
BA_FLAG_1A, // related to bee transformation
BA_FLAG_18_UNDERWATER,
BA_FLAG_19_SHOULD_TRANSFORM,
BA_FLAG_1A_OPEN_NOTEDOOR,
BA_FLAG_1B_TRANSFORMING,
BA_FLAG_NUM_FLAGS

2
manual_syms.pal.txt
View File

@ -299,7 +299,7 @@ gcpausemenu_80314AC8 = 0x80314e1c;
func_8031B908 = 0x8031bce8;
func_8031C44C = 0x8031c82c;
func_8031C5AC = 0x8031c98c;
func_8031C5D4 = 0x8031c9b4;
floor_getXPosition = 0x8031c9b4;
func_8031C618 = 0x8031c9f8;
func_8031C638 = 0x8031ca18;
fileProgressFlag_get = 0x8032030c;

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

@ -140,7 +140,7 @@ void func_8038F6A4(Actor *this)
player_getPosition(sp48);
if (!this->has_met_before)
{
if ((((ml_vec3f_distance(local->unk18, sp48) < 250.0f) && (ml_vec3f_distance(local->unk18, sp48) > 80.0f)) && (!func_8028ECAC())) && (player_getTransformation() == TRANSFORM_1_BANJO))
if ((((ml_vec3f_distance(local->unk18, sp48) < 250.0f) && (ml_vec3f_distance(local->unk18, sp48) > 80.0f)) && (!player_movementGroup())) && (player_getTransformation() == TRANSFORM_1_BANJO))
{
gcdialog_showText(0xC7E, 0, 0, 0, 0, 0);
this->has_met_before = TRUE;

2
src/BGS/code_3420.c
View File

@ -112,7 +112,7 @@ enum asset_e D_80390A18[] = {
/* .code */
bool BGS_func_80389810(f32 arg0[3]) {
if (func_8028ECAC() != BSGROUP_7_CROC_ATTACK) {
if (player_movementGroup() != BSGROUP_7_CROC_ATTACK) {
return FALSE;
}
func_8028E9C4(2, arg0);

2
src/CCW/code_2B00.c
View File

@ -67,7 +67,7 @@ void func_80388F50(ActorMarker *marker, ActorMarker *other_marker){
Actor *this;
this = marker_getActor(marker);
if ((func_8028ECAC() != 1) && !this->unk38_0) {
if ((player_movementGroup() != BSGROUP_1_INTR) && !this->unk38_0) {
this->unk38_0 = TRUE;
actor_collisionOff(this);
subaddie_set_state_with_direction(this, 4, 0.0f, 1);

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

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

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

@ -148,7 +148,7 @@ void func_8038794C(Actor *this){
}//L80387B38
if(!this->has_met_before && func_80329530(this, 0x1f4)){
if(!func_8028ECAC() || func_8028ECAC() == BSGROUP_8_TROT){
if(!player_movementGroup() || player_movementGroup() == BSGROUP_8_TROT){
if (gcdialog_showText(ASSET_BFF_DIALOG_UNKNOWN, 0x2a, this->position, NULL, NULL, NULL)) {
for (i = 0; i < 5; i++) {
timedFunc_set_1(D_80391BEC[i], (GenFunction_1) func_8038787C, (s32) this->marker);

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

@ -177,7 +177,7 @@ bool FP_func_80388CA0(Actor *this){
ActorLocal_FP_2350 *local = (ActorLocal_FP_2350 *)&this->local;
u32 sp20;
if(func_8028ECAC() != 0 && func_8028ECAC() != BSGROUP_8_TROT)
if(player_movementGroup() != BSGROUP_0_NONE && player_movementGroup() != BSGROUP_8_TROT)
return FALSE;
if( !func_80329530(this, 1100) ){
@ -353,7 +353,7 @@ void func_803893E4(Actor *this, f32 arg1, u8 arg2){
this->unk4C = sp2C;
}
if((u8)arg2 == 2 && func_8028ECAC() != 6){
if((u8)arg2 == 2 && player_movementGroup() != BSGROUP_6_TURBO_TALON_TRAINERS){
this->unk4C = 1200.0f;
}
@ -464,11 +464,11 @@ void func_803896FC(Actor *this){
if(FP_func_80388CA0(this)){
func_80388B18(this, local->unk19);
}//L803899DC
else if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == BSGROUP_C_WALRUS_SLED){
else if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && player_movementGroup() == BSGROUP_C_WALRUS_SLED){
FP_func_803888E4(this);
}
else if( func_80329530(this, 0x1C2)
&& func_8028ECAC() == 0
&& player_movementGroup() == BSGROUP_0_NONE
&& func_8028F20C()
&& func_8028EFC8()
&& sp3C[FACE_BUTTON(BUTTON_B)] == 1

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

@ -74,7 +74,7 @@ void func_80390388(Actor *this){
}
if( func_80329530(this, 0xFA)
&& (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)
&& (player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT)
){
if(0.0f == this->unk1C[0] && func_80390334()){
if(gcdialog_showText(ASSET_C1F_DIALOG_UNKNOWN, 0xb, this->position, NULL, NULL, NULL)){

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

@ -85,7 +85,7 @@ void chRaceSled_update(Actor *this){
}
break;
case 3://L80386B50
if(func_8028ECAC() != BSGROUP_C_WALRUS_SLED){
if(player_movementGroup() != BSGROUP_C_WALRUS_SLED){
__chRaceSled_setState(this, 2);
}
break;

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

@ -101,7 +101,7 @@ void func_8038F41C(Actor *this){
}
void func_8038F454(Actor *this){
if(!mapSpecificFlags_get(7) && func_8028ECAC() != BSGROUP_A_FLYING && func_80329530(this, 1000) ){
if(!mapSpecificFlags_get(7) && player_movementGroup() != BSGROUP_A_FLYING && func_80329530(this, 1000) ){
mapSpecificFlags_set(7, TRUE);
subaddie_set_state(this, 2);
actor_loopAnimation(this);
@ -217,7 +217,7 @@ void FP_func_8038F7AC(Actor *this){
actor_collisionOn(this);
switch(this->state){
case 1: //L8038F984
if(func_8028ECAC() == BSGROUP_A_FLYING){
if(player_movementGroup() == BSGROUP_A_FLYING){
func_8038F454(this);
break;
}
@ -246,7 +246,7 @@ void FP_func_8038F7AC(Actor *this){
break;
case 4: //L8038FAD0
if(!func_80329530(this, 2000) && func_8028ECAC() != BSGROUP_A_FLYING){
if(!func_80329530(this, 2000) && player_movementGroup() != BSGROUP_A_FLYING){
func_8038F560(this);
break;
}
@ -268,7 +268,7 @@ void FP_func_8038F7AC(Actor *this){
case 6: //L8038FBA8
FP_func_8038F6C4(this, local->unk18, 1.0f);
if( func_80329530(this, 1700) ) break;
if( func_8028ECAC() == BSGROUP_A_FLYING ) break;
if( player_movementGroup() == BSGROUP_A_FLYING ) break;
func_8038F560(this);
@ -283,7 +283,7 @@ void FP_func_8038F7AC(Actor *this){
if(!FP_func_8038F6C4(this, local->unkC, 4.5f))
break;
if(func_80329530(this, 1000) || func_8028ECAC() == BSGROUP_A_FLYING){
if(func_80329530(this, 1000) || player_movementGroup() == BSGROUP_A_FLYING){
func_8038F528(this);
break;
}

4
src/FP/ma/slalom.c
View File

@ -275,7 +275,7 @@ void maSlalom_dialogCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2
}
void maSlalom_win(void){
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS){
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && player_movementGroup() == BSGROUP_6_TURBO_TALON_TRAINERS){
player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 2.0f);
}
func_8028F918(1);
@ -333,7 +333,7 @@ void maSlalom_update(void){
break;
case MA_SLALOM_STATE_2_RACING: //L8038B61C
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS){
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && player_movementGroup() == BSGROUP_6_TURBO_TALON_TRAINERS){
player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 20.0f);
}

4
src/GV/code_5570.c
View File

@ -60,7 +60,7 @@ void func_8038BA08(Actor *this){
actor_loopAnimation(this);
this->unk100 = NULL;
D_80391A80 = 3;
if(func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS)
if(player_movementGroup() == BSGROUP_6_TURBO_TALON_TRAINERS)
player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 0.0f);
gcdialog_showText(ASSET_A79_DIALOG_GRABBA_DEFEAT, 0xf, this->position, this->marker, func_8038B988, NULL);
@ -236,7 +236,7 @@ void GV_func_8038BEA0(Actor *this){
func_802BB3DC(0, 12.0f, 0.92f);
}
else if(func_80329530(this, 600)){
if(func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS){
if(player_movementGroup() == BSGROUP_6_TURBO_TALON_TRAINERS){
this->unk38_31++;
}
else{

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() == 0){
if(player_movementGroup() == BSGROUP_0_NONE){
if( ml_vec3f_distance(sp3C, this->unk1C) < 100.0f || ml_vec3f_distance(sp3C, this->velocity) < 100.0f){
if(gcdialog_showText(ASSET_A7B_DIALOG_JINXY_MEET, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(0x14, 1);

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

@ -275,7 +275,7 @@ void func_803876D0(Actor *this){
subaddie_maybe_set_state_position_direction(this, 6, 0, 1, 0.38f);
}
if( sp3C
&& func_8028ECAC() != 1
&& player_movementGroup() != BSGROUP_1_INTR
&& !__chConga_isPlayerNearCongaTree(this)
&& timedFuncQueue_is_empty()
&& !func_8032A9E4(((ActorLocal_Conga *)&this->local)->unk10, ((ActorLocal_Conga *)&this->local)->unk18, ((ActorLocal_Conga *)&this->local)->unk1C)
@ -283,7 +283,7 @@ void func_803876D0(Actor *this){
){
subaddie_set_state_with_direction(this, 4, 0.0f, 1);
}//L80387AC0
if( func_8028ECAC() != 1
if( player_movementGroup() != BSGROUP_1_INTR
&& __chConga_isPlayerNearCongaTree(this)
&& this->unk38_31 != 0
&& !func_803872EC()

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

@ -137,7 +137,7 @@ void chjujuhitbox_update(Actor *this) {
return;
}
if (func_80329530(this, 0xfa) && !func_80329530(this, 0x50) && !func_8028ECAC()) {
if (func_80329530(this, 0xfa) && !func_80329530(this, 0x50) && !player_movementGroup()) {
if (!this->has_met_before && gcdialog_showText(ASSET_B44_DIALOG_JUJU_MEET, 0, 0, 0, NULL, NULL)) {
this->has_met_before = TRUE;
}

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

@ -102,7 +102,7 @@ void chorangepad_update(Actor *this) {
}
if (func_80329530(this, 0x28) &&
!func_8028ECAC() &&
!player_movementGroup() &&
!mapSpecificFlags_get(MM_SPECIFIC_FLAG_6_UNKNOWN) &&
closest_actor->state != 3) {

2
src/MMM/code_47D0.c
View File

@ -67,7 +67,7 @@ bool chTumblar_isBanjoAbove(s32 arg0, s32 arg1) {
return func_803518D4(arg1) &&
ml_vec3f_horizontal_distance_zero_likely(position, plyr_pos) < 40.0f &&
player_getTransformation() == TRANSFORM_1_BANJO &&
func_8028ECAC() == 0;
player_movementGroup() == BSGROUP_0_NONE;
}
void chTumblar_init(Struct_MMM_47D0_0 *arg0, Struct68s *arg1) {

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

@ -87,7 +87,7 @@ void func_8038B900(Actor *this){
if(this->state == 1){
if( !this->has_met_before
&& func_80329530(this, 0x258)
&& !func_8028ECAC()
&& !player_movementGroup()
){
gcdialog_showText(0xb9b, 4, 0, 0, 0, 0);
this->has_met_before = TRUE;

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

@ -507,7 +507,7 @@ void chSmBottles_update(Actor *this) {
}
}
else {//L80389CBC
if (!func_80329530(this, 0xfa) || func_8028ECAC() || !func_8028F20C() || func_8028EC04()) {
if (!func_80329530(this, 0xfa) || player_movementGroup() || !func_8028F20C() || func_8028EC04()) {
break;
}

2
src/TTC/ch/leaky.c
View File

@ -59,7 +59,7 @@ static void __chLeaky_updateFunc(Actor *this) {
if( this->state == 1
&& !this->has_met_before
&& func_80329530(this, 250) && !func_80329530(this, 160)
&& !func_8028ECAC()
&& !player_movementGroup()
&& gcdialog_showText(ASSET_A1A_DIALOG_LEAKY_FIRST_MEET, 0, NULL, NULL, NULL, NULL)
){
this->has_met_before = TRUE;

2
src/TTC/ch/lockup.c
View File

@ -86,7 +86,7 @@ static void __chLockup_updateFunc(Actor *this){
&& !jiggyscore_isCollected(JIGGY_13_TTC_LOCKUP)
&& func_80329530(this, 320)
&& !func_80329530(this, 160)
&& !func_8028ECAC()
&& !player_movementGroup()
&& gcdialog_showText(ASSET_A15_DIALOG_TTC_LOCKUP_SPAWNED, 0, NULL, NULL, NULL, NULL)
){
this->has_met_before = TRUE;

8
src/TTC/ch/nipper.c
View File

@ -199,7 +199,7 @@ static void __chNipper_updateFunc(Actor *this){
s32 sp48;
s32 xVelocity;
f32 playerPosition[3];
s32 temp_v0;
enum bsgroup_e player_movement_group;
player_getPosition(playerPosition);
xVelocity = func_80309D58(playerPosition, 1);
@ -237,10 +237,10 @@ static void __chNipper_updateFunc(Actor *this){
}
if(__chNipper_shouldShowActor(this)){
temp_v0 = func_8028ECAC();
player_movement_group = player_movementGroup();
if( !this->has_met_before
&& temp_v0 != 1
&& temp_v0 != 10
&& player_movement_group != BSGROUP_1_INTR
&& player_movement_group != BSGROUP_A_FLYING
){
subaddie_set_state_with_direction(this, CH_NIPPER_STATE_5_SPAWNED, 0.01f, 1);
if(gcdialog_showText(ASSET_A0E_DIALOG_NIPPER_SPAWNED, 0xf, this->position, this->marker, __chNipper_spawnedShowTextCallback, NULL)){

4
src/core1/code_72B0.c
View File

@ -8,7 +8,7 @@ extern bool func_80320DB0(f32[3], f32, f32[3], u32);
extern bool func_80323240(struct56s *, f32, f32[3]);
extern BKCollisionTri *func_80320B98(f32[3], f32[3], f32[3], u32);
extern BKCollisionTri *func_80320C94(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3[3], s32 arg4, u32 arg5);
extern f32 func_8031C5D4(struct0*);
extern f32 floor_getXPosition(struct0*);
extern void func_8031C5AC(struct0 *, f32 *);
/* .bss */
@ -255,7 +255,7 @@ void func_8024560C(f32 arg0[3], struct0 *arg1, UNK_TYPE(s32) arg2, u8 *arg3, f32
func_8031C618(arg1, arg0);
func_8031C638(arg1, arg2);
func_8031C44C(arg1);
sp40 = func_8031C5D4(arg1);
sp40 = floor_getXPosition(arg1);
func_8031C5AC(arg1, sp44);
temp_v0 = *arg3;
*arg3 = 0;

2
src/core2/ba/drone.c
View File

@ -57,7 +57,7 @@ enum bs_e badrone_vanish(void){
}
enum bs_e badrone_transform(void){
baflag_clear(BA_FLAG_19);
baflag_clear(BA_FLAG_19_SHOULD_TRANSFORM);
badrone_set_type(BA_DRONE_TRANSFORM);
return func_8029BD90();
}

6
src/core2/ba/falldamage.c
View File

@ -122,9 +122,9 @@ void bafalldamage_init(void){
}
void bafalldamage_update(void){
s32 player_position;
player_position = func_8028ECAC();
if(player_isStable() || (player_getWaterState() != BSWATERGROUP_0_NONE) || player_position == BSGROUP_A_FLYING){
enum bsgroup_e player_movement_group;
player_movement_group = player_movementGroup();
if(player_isStable() || (player_getWaterState() != BSWATERGROUP_0_NONE) || player_movement_group == BSGROUP_A_FLYING){
bafalldamage_start();
bafalldamage_set_state(1);
}

18
src/core2/ba/marker.c
View File

@ -139,7 +139,7 @@ void __baMarker_8028B904(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
func_80296CC0(&sp1C);
func_80296CB4(arg3);
if(baflag_isTrue(BA_FLAG_7)){
if(baflag_isTrue(BA_FLAG_7_TOUCHING_JIGGY)){
func_8029CDA0();
}
else{
@ -198,7 +198,7 @@ void __baMarker_8028BB1C(s32 arg0, enum file_progress_e progress_flag, s32 arg2,
if(arg0 != 1)
return;
if(func_8028ECAC() == 1)
if(player_movementGroup() == BSGROUP_1_INTR)
return;
// if bit 0x400000 of fileProgressFlag is set, it's a volatile flag, else it's a file progress flag (for witch switches)
@ -370,7 +370,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
break;
case MARKER_F1_GV_STAR_SWITCH: //L8028C0C8
if(func_8028ECAC() == 1)
if(player_movementGroup() == BSGROUP_1_INTR)
return;
if(!mapSpecificFlags_get(5)){
mapSpecificFlags_set(5, 1);
@ -382,7 +382,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case MARKER_244_DINGPOT: //L8028C104
{
if(func_8028ECAC() == 1)
if(player_movementGroup() == BSGROUP_1_INTR)
return;
player_getPosition(spAC);
spAC[1] += 40.0f;
@ -414,7 +414,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case MARKER_FE_MMM_CLOCK_SWITCH: //L8028C1A4
if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER){
if(func_8028ECAC() == 1)
if(player_movementGroup() == BSGROUP_1_INTR)
return;
if(!mapSpecificFlags_get(0)){
mapSpecificFlags_set(0,1);
@ -425,7 +425,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case MARKER_23F_LAIR_FLIGHT_PAD_SWITCH: //L8028C1EC
if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER){
if(func_8028ECAC() == 1)
if(player_movementGroup() == BSGROUP_1_INTR)
return;
if(!mapSpecificFlags_get(0)){
mapSpecificFlags_set(0,1);
@ -436,7 +436,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case 0x110: //L8028C238
if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER){
if(func_8028ECAC() == 1)
if(player_movementGroup() == BSGROUP_1_INTR)
return;
if(!mapSpecificFlags_get(0)){
mapSpecificFlags_set(0, 1);
@ -447,7 +447,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case 0x113: //L8028C284
if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER){
if(func_8028ECAC() == 1)
if(player_movementGroup() == BSGROUP_1_INTR)
return;
if(!mapSpecificFlags_get(1)){
mapSpecificFlags_set(1,1);
@ -458,7 +458,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case 0x115: //L8028C2D0
if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER){
if(func_8028ECAC() == 1)
if(player_movementGroup() == BSGROUP_1_INTR)
return;
if(!mapSpecificFlags_get(2)){
mapSpecificFlags_set(2,1);

2
src/core2/ba/physics.c
View File

@ -62,7 +62,7 @@ void __baphysics_update_normal(void){
if(sp44 != 0.0f){
if(sp44 < 0){
//sp44 = 0.0f;
if(func_8028B3B4()){
if(player_isActive()){
sp40 = ml_map_f(sp40, 0.0f, 1.0f, sp44*0.5, -1.0f);
}
else{//L80296E3C

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

@ -94,7 +94,7 @@ void bsant_idle_update(void){
enum bs_e new_state = 0;
func_80299628(0);
if(func_8028B094())
if(player_shouldFall())
new_state = BS_38_ANT_FALL;
if(bainput_should_look_first_person_camera())
@ -138,7 +138,7 @@ void bsant_walk_update(void){
if(bastick_getZone() == 0 && baphysics_is_slower_than(1.0f))
sp1C = BS_35_ANT_IDLE;
if(func_8028B094())
if(player_shouldFall())
sp1C = BS_38_ANT_FALL;
if(bakey_pressed(BUTTON_A))
@ -267,7 +267,7 @@ void bsant_fall_update(void){
break;
}
if(player_isStable()){
if(baflag_isTrue(BA_FLAG_19))
if(baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM))
sp2C = badrone_transform();
else
sp2C = BS_35_ANT_IDLE;

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

@ -54,7 +54,7 @@ void bseggass_update(void) {
} else if (0.6 < (f64) anctrl_getAnimTimer(plyr_mvmt)) {
next_state = func_802ADCD4(0);
}
if (func_8028B094())
if (player_shouldFall())
next_state = BS_2F_FALL;
bs_setState(next_state);
}

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

@ -63,7 +63,7 @@ void bsegghead_update(void) {
} else if (0.65 < (f64) anctrl_getAnimTimer(aCtrl)) {
next_state = func_802ADCD4(0);
}
if (func_8028B094())
if (player_shouldFall())
next_state = BS_2F_FALL;
bs_setState(next_state);
}

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

@ -596,7 +596,7 @@ void func_802A48B4(void) {
if (anctrl_isStopped(sp18)) {
next_state = BS_1_IDLE;
}
if (func_8028B094()) {
if (player_shouldFall()) {
next_state = BS_2F_FALL;
}
break;
@ -743,7 +743,7 @@ void func_802A4EC8(void) {
if (player_isStable()) {
next_state = BS_20_LANDING;
}
if (anctrl_isStopped(sp18) && (func_8028B094() || func_80294530())) {
if (anctrl_isStopped(sp18) && (player_shouldFall() || func_80294530())) {
D_8037D346 = 1;
next_state = BS_24_FLY;
}
@ -784,7 +784,7 @@ void func_802A503C(void){
void func_802A505C(void){
if(bs_getInterruptType() == BS_INTR_9){
func_8029A86C(2);
baflag_set(BA_FLAG_7);
baflag_set(BA_FLAG_7_TOUCHING_JIGGY);
func_8029CCC4();
}else{
func_80296608();

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

@ -88,7 +88,7 @@ void bsbshock_charge_update(void){
}//L802A6CAC
if(func_8028B254(0x3C)){
if(anctrl_getAnimTimer(aCtrl) < 0.3637 && bakey_released(8)){
if(anctrl_getAnimTimer(aCtrl) < 0.3637 && bakey_released(BUTTON_A)){
D_8037D380 = 0;
}//L802A6CF4
if(player_isStable())

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

@ -51,7 +51,7 @@ void func_802A8850(void){
}
f32 func_802A88B0(void){
if(func_8028B128())
if(player_isOnDangerousGround())
return D_80364AA0;
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
@ -69,7 +69,7 @@ f32 func_802A8900(void){
}
f32 func_802A8934(void){
if(func_8028B128())
if(player_isOnDangerousGround())
return D_80364AB8;
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
@ -79,7 +79,7 @@ f32 func_802A8934(void){
}
f32 func_802A8984(void){
if(func_8028B128())
if(player_isOnDangerousGround())
return D_80364AB4;
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
@ -193,7 +193,7 @@ enum bs_e func_802A8D84(enum bs_e arg0){
if(bainput_should_look_first_person_camera())
arg0 = badrone_look();
if(func_8028B094())
if(player_shouldFall())
arg0 = BS_71_BTROT_FALL;
if(func_802A8C60())
@ -316,7 +316,7 @@ void bsbtrot_walk_update(void){
if(!bastick_getZone() && baphysics_is_slower_than(1.0f))
sp1C = BS_15_BTROT_IDLE;
if(func_8028B094())
if(player_shouldFall())
sp1C = BS_71_BTROT_FALL;
if(func_802A8C60())

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

@ -69,7 +69,7 @@ void func_802A10D4(void){
s0 = 0;
func_80299628(0);
if(func_8028B094())
if(player_shouldFall())
s0 = 0x88;
if(bainput_should_look_first_person_camera())
@ -111,7 +111,7 @@ void func_802A1214(void){
if(bastick_getZone() == 0 && baphysics_is_slower_than(1.0f))
s0 = BS_85_BEE_IDLE;
if(func_8028B094())
if(player_shouldFall())
s0 = BS_88_BEE_FALL;
if(bakey_pressed(BUTTON_A))
@ -274,7 +274,7 @@ void func_802A170C(void){
break;
}
if(player_isStable()){
if(baflag_isTrue(BA_FLAG_19)){
if(baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM)){
sp2c = badrone_transform();
}else{
if(bastick_getZone() > 0)
@ -513,7 +513,7 @@ void func_802A2054(void){
}
void func_802A2098(void){
baflag_clear(BA_FLAG_1A);
baflag_clear(BA_FLAG_1A_OPEN_NOTEDOOR);
baanim_playForDuration_loopSmooth(ASSET_1DE_ANIM_BEE_IDLE, 3.0f);
yaw_setIdeal(func_8029B41C());
func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);

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

@ -119,7 +119,7 @@ void bscroc_idle_update(void){
enum bs_e next_state = 0;
func_802ABE70();
func_80299628(0);
if(func_8028B094())
if(player_shouldFall())
next_state = BS_61_CROC_FALL;
if(bainput_should_look_first_person_camera())
@ -163,7 +163,7 @@ void bscroc_walk_update(void){
if(bastick_getZone() == 0 && baphysics_is_slower_than(1.0f))
next_state = BS_5E_CROC_IDLE;
if(func_8028B094())
if(player_shouldFall())
next_state = BS_61_CROC_FALL;
if(bakey_pressed(BUTTON_B))
@ -313,7 +313,7 @@ void bscroc_fall_update(void){
if(player_isStable()){
if(bastick_getZone() > 0 || (D_8037D3EC == 2 && anctrl_isStopped(aCtrl))){
if(baflag_isTrue(BA_FLAG_19)){
if(baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM)){
next_state = badrone_transform();
}else{
next_state = BS_5E_CROC_IDLE;
@ -544,7 +544,7 @@ void bscroc_bite_update(void){
}
if(D_8037D3F4 == 3){
if(func_8028B094())
if(player_shouldFall())
next_state = BS_61_CROC_FALL;
else
next_state = BS_CROC_WALK;

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

@ -161,7 +161,7 @@ void bscrouch_update(void){
if(player_isSliding())
sp34 = BS_SLIDE;
if(func_8028B094())
if(player_shouldFall())
sp34 = BS_2F_FALL;
sp34 = func_802ADCD4(sp34);

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

@ -42,7 +42,7 @@ void bsjig_jiggy_init(void){
func_8029151C(0xC);
func_8029E070(1);
func_8030E6D4(SFX_33_BANJO_AHOO);
baflag_clear(BA_FLAG_7);
baflag_clear(BA_FLAG_7_TOUCHING_JIGGY);
baflag_clear(BA_FLAG_F);
baMarker_collisionOff();
chJigsawDance_setState(marker_getActor(bsjig_gJiggyMarker), 1);
@ -164,7 +164,7 @@ void bsjig_notedoor_end(void){
void bsjig_notedoor_init(void){
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
D_8037D4B2 = (bs_getPrevState() == BS_44_JIG_JIGGY);
baflag_clear(BA_FLAG_1A);
baflag_clear(BA_FLAG_1A_OPEN_NOTEDOOR);
anctrl_reset(aCtrl);
anctrl_setIndex(aCtrl, ASSET_282_ANIM_BSJIG_NOTEDOOR);
anctrl_setDuration(aCtrl, 3.6f);

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

@ -173,7 +173,7 @@ void bsjump_fall_init(void){
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
int sp20;
if(baflag_isTrue(BA_FLAG_7) && 700.0f < baphysics_get_vertical_velocity())
if(baflag_isTrue(BA_FLAG_7_TOUCHING_JIGGY) && 700.0f < baphysics_get_vertical_velocity())
baphysics_set_vertical_velocity(700.0f);
sp20 = (bs_getPrevState() == BS_12_BFLIP)? 0 : 1;

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

@ -89,7 +89,7 @@ void bspumpkin_idle_update(void) {
s32 next_state;
next_state = 0;
if (func_8028B094()) {
if (player_shouldFall()) {
next_state = BS_4B_PUMPKIN_FALL;
}
if (bainput_should_look_first_person_camera()) {
@ -134,7 +134,7 @@ void bspumpkin_walk_update(void) {
if ((bastick_getZone() == 0) && baphysics_is_slower_than(1.0f)) {
next_state = BS_48_PUMPKIN_IDLE;
}
if (func_8028B094()) {
if (player_shouldFall()) {
next_state = BS_4B_PUMPKIN_FALL;
}
if (bakey_pressed(BUTTON_A)) {
@ -290,7 +290,7 @@ void bspumpkin_fall_update(void) {
break;
}
if (player_isStable() && ((bastick_getZone() > 0) || (D_8037D4E0 == 2 && anctrl_isStopped(anim_ctrl)))) {
if (baflag_isTrue(BA_FLAG_19)) {
if (baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM)) {
next_state = badrone_transform();
} else {
next_state = BS_48_PUMPKIN_IDLE;

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

@ -125,7 +125,7 @@ void func_802B3954(void) {
if (player_isFallTumbling() && D_8037D500 == 0) {
next_state = BS_3D_FALL_TUMBLING;
}
if (anctrl_isStopped(anim_ctrl) && func_8028B094() && (D_8037D500 == 0)) {
if (anctrl_isStopped(anim_ctrl) && player_shouldFall() && (D_8037D500 == 0)) {
next_state = BS_2F_FALL;
}
bs_setState(next_state);

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

@ -55,7 +55,7 @@ void bssplat_update(void){
if(140.0f < baphysics_get_target_horizontal_velocity())
func_802929F8();
if(func_8028B094())
if(player_shouldFall())
sp1C = BS_2F_FALL;
if(anctrl_isStopped(aCtrl)){
@ -71,7 +71,7 @@ void bssplat_update(void){
if(anctrl_isStopped(aCtrl))
sp1C = BS_1_IDLE;
if(func_8028B094())
if(player_shouldFall())
sp1C = BS_2F_FALL;
break;
}//L802B4808

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

@ -266,7 +266,7 @@ void bsstand_update(void) {
func_8029E070(0);
}
}
if (func_8028B094() != 0) {
if (player_shouldFall() != 0) {
next_state = BS_2F_FALL;
}
bs_setState(next_state);

22
src/core2/bs/walk.c
View File

@ -43,7 +43,7 @@ void func_802B6D00(void){
sp1C = bastick_getZonePosition();
sp18 = bastick_getZone();
if(func_8028B128()){
if(player_isOnDangerousGround()){
if(sp18 == 0){
baphysics_set_target_horizontal_velocity(0.0f);
}else{//L802B6D48
@ -158,13 +158,13 @@ void bswalk_creep_update(void){
next_state = BS_4_WALK_FAST;
break;
}//L802B7194
if(func_8028B128())
if(player_isOnDangerousGround())
next_state = BS_WALK_MUD;
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
if(player_shouldFall())
next_state = BS_2F_FALL;
if(bakey_held(BUTTON_Z))
@ -231,13 +231,13 @@ void bswalk_slow_upate(void){
next_state = BS_4_WALK_FAST;
break;
}//L802B7194
if(func_8028B128())
if(player_isOnDangerousGround())
next_state = BS_WALK_MUD;
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
if(player_shouldFall())
next_state = BS_2F_FALL;
if(bakey_held(BUTTON_Z))
@ -303,7 +303,7 @@ void bswalk_update(void){
next_state = BS_4_WALK_FAST;
break;
}//L802B76B8
if(func_8028B128())
if(player_isOnDangerousGround())
next_state = BS_WALK_MUD;
if(func_8028B4C4() && bsWalkSkidVelocity < baphysics_get_horizontal_velocity()){
@ -313,7 +313,7 @@ void bswalk_update(void){
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
if(player_shouldFall())
next_state = BS_2F_FALL;
if(bakey_held(BUTTON_Z))
@ -406,14 +406,14 @@ void bswalk_fast_update(void){
next_state = badrone_look();
break;
}//L802B7AA4
if(func_8028B128())
if(player_isOnDangerousGround())
next_state = BS_WALK_MUD;
if(func_8028B4C4() && bsWalkSkidVelocity < baphysics_get_horizontal_velocity()){
next_state = BS_SKID;
}
if(func_8028B094())
if(player_shouldFall())
next_state = BS_2F_FALL;
if(bakey_held(BUTTON_Z))
@ -453,7 +453,7 @@ void bswalk_mud_update(void){
func_8029AD28(0.4f, 4);
func_8029AD28(0.9f, 3);
func_802B6D00();
if(!func_8028B128())
if(!player_isOnDangerousGround())
next_state = BS_2_WALK_SLOW;
if(!bastick_getZone())
@ -462,7 +462,7 @@ void bswalk_mud_update(void){
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
if(player_shouldFall())
next_state = BS_2F_FALL;
if(bakey_held(BUTTON_Z))

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

@ -159,7 +159,7 @@ void bswalrus_idle_update(void){
func_80299628(0);
if(func_8028B094())
if(player_shouldFall())
next_state = BS_6A_WALRUS_FALL;
if(bainput_should_look_first_person_camera())
@ -197,7 +197,7 @@ void bswalrus_walk_update(void){
if(bastick_getZone() == 0 && baphysics_is_slower_than(1.0f))
next_state = BS_67_WALRUS_IDLE;
if(func_8028B094())
if(player_shouldFall())
next_state = BS_6A_WALRUS_FALL;
if(bakey_pressed(BUTTON_A))
@ -352,7 +352,7 @@ void bswalrus_fall_update(void){
if( bastick_getZone() > 0
|| (D_8037D5C8 == 2 && anctrl_isStopped(aCtrl))
){
if(baflag_isTrue(BA_FLAG_19))
if(baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM))
next_state = badrone_transform();
else
next_state = BS_67_WALRUS_IDLE;

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

@ -80,7 +80,7 @@ void func_802B9B14(void){
break;
case 5: // L802B9BE8
if(baanim_isStopped()){
if(func_8028ADF0())
if(wishyWashyFlag_get())
next_state = BS_1_IDLE;
else
func_802B9980(6);

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

@ -60,7 +60,7 @@ void chBeehive_update(Actor *this){
if( !fileProgressFlag_get(FILEPROG_D_BEEHIVE_TEXT)
&& subaddie_playerIsWithinCylinder(this, 250, 300)
){
if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){
if(player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT){
if( player_getTransformation() == TRANSFORM_1_BANJO
&& gcdialog_showText(ASSET_D96_DIALOG_BEEHIVE_MEET, 0, NULL, NULL, NULL, 0)
){

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

@ -265,7 +265,7 @@ void chCrab_update(Actor *this) {
&& is_mutant_snippet
&& !jiggyscore_isCollected(JIGGY_16_CC_SNIPPETS)
&& func_80329530(this, 500) && !func_80329530(this, 200)
&& !func_8028ECAC()
&& !player_movementGroup()
) {
if ((this->state != 6) && (this->state != 5)) {
gcdialog_showText(ASSET_D32_DIALOG_MUTANT_CRAB_MEET, 0xF, this->position, NULL, __chCrab_mutantTextCallback, NULL);

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

@ -384,7 +384,7 @@ void chmole_update(Actor *this){
if(func_8028F20C() && func_8028F0D4() && !func_8028EC04()){
if( this->unkF4_8 == 0x12
&& !ability_isUnlocked(moleTable[this->unkF4_8-9].ability)
&& (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)
&& (player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT)
){
player_getPosition(sp34);
if (ml_vec3f_distance(sp34, this->velocity) < this->actor_specific_1_f) {
@ -392,7 +392,7 @@ void chmole_update(Actor *this){
}
}
else{//L802DA054
if( !func_8028ECAC()
if( !player_movementGroup()
&& func_80329530(this, 0xFA)
&& func_8028EFC8()
&& sp50[FACE_BUTTON(BUTTON_B)] == 1

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

@ -260,7 +260,7 @@ void chSnowman_update(Actor *this){
){//L802E2318
if(0.0 < local->unk4){
if( (globalTimer_getTime() & 1)
|| func_8028ECAC() == BSGROUP_A_FLYING
|| player_movementGroup() == BSGROUP_A_FLYING
){//L802E236C
local->unk4 -= dt;
}

4
src/core2/ch/termite.c
View File

@ -168,7 +168,7 @@ void chTermite_update(Actor *this) {
&& !mapSpecificFlags_get(0)
&& func_80329530(this, 700)
&& !func_80329530(this, 150)
&& func_8028ECAC() == 0
&& player_movementGroup() == BSGROUP_0_NONE
&& player_getTransformation() == TRANSFORM_1_BANJO
) {
gcdialog_showText(ASSET_B43_DIALOG_TERMITE_MEET_AS_BEAR, 7, this->position, this->marker, __chTermite_testCallback, NULL);
@ -179,7 +179,7 @@ void chTermite_update(Actor *this) {
if( func_80329530(this, 300)
&& !func_80329530(this, 150)
&& func_8028ECAC() == 0
&& player_movementGroup() == BSGROUP_0_NONE
&& player_getTransformation() == TRANSFORM_2_TERMITE
) {
if (!levelSpecificFlags_get(LEVEL_FLAG_B_MM_UNKNOWN)) {

6
src/core2/code_13A00.c
View File

@ -155,11 +155,11 @@ void func_8029AE48(void){
}
void func_8029AE74(s32 arg0){
s32 tmp_v0;
enum bsgroup_e player_movement_group;
func_8029ACD4();
D_8037D194 = arg0;
tmp_v0 = func_8028ECAC();
if(tmp_v0 == BSGROUP_6_TURBO_TALON_TRAINERS || tmp_v0 == BSGROUP_8_TROT || tmp_v0 == BSGROUP_9_LONG_LEG){
player_movement_group = player_movementGroup();
if(player_movement_group == BSGROUP_6_TURBO_TALON_TRAINERS || player_movement_group == BSGROUP_8_TROT || player_movement_group == BSGROUP_9_LONG_LEG){
func_802F494C(D_8037D190, 0.2f);
}
else{

20
src/core2/code_14420.c
View File

@ -187,7 +187,7 @@ u8 D_8037D1E8;
/* .code */
f32 func_8029B3B0(f32 arg0) {
if (func_8028B128()) {
if (player_isOnDangerousGround()) {
return arg0 * 0.2;
}
if (func_8028B120()) {
@ -447,10 +447,10 @@ enum bs_14420_e func_8029BAF0(void){
if (stateTimer_get(STATE_TIMER_2_LONGLEG) != 0.0f) {
return BS14420_9_LONGLEG;
}
if (baflag_isTrue(BA_FLAG_18)) {
if (baflag_isTrue(BA_FLAG_18_UNDERWATER)) {
return BS14420_5_UNDERWATER;
}
if (func_8028ECAC() == BSGROUP_3_WONDERWING) {
if (player_movementGroup() == BSGROUP_3_WONDERWING) {
return BS14420_D_WONDERWING;
}
if (player_inWater()) {
@ -568,10 +568,10 @@ enum bs_e bs_getIdleState(void){
case TRANSFORM_1_BANJO:
default:
if (baflag_isTrue(BA_FLAG_16)) {
if (baflag_isTrue(BA_FLAG_16_FLYING)) {
return BS_24_FLY;
}
if (baflag_isTrue(BA_FLAG_18)) {
if (baflag_isTrue(BA_FLAG_18_UNDERWATER)) {
return BS_2B_DIVE_IDLE;
}
if (stateTimer_get(STATE_TIMER_3_TURBO_TALON) != 0.0f) {
@ -848,10 +848,10 @@ s32 func_8029C9C0(s32 arg0){
}
s32 func_8029CA94(s32 arg0){
if(baflag_isTrue(BA_FLAG_19))
if(baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM))
arg0 = badrone_transform();
if(baflag_isTrue(BA_FLAG_1A))
if(baflag_isTrue(BA_FLAG_1A_OPEN_NOTEDOOR))
arg0 = (player_getTransformation() == TRANSFORM_6_BEE) ? 0x46 : BS_34_JIG_NOTEDOOR;
if(baflag_isTrue(BA_FLAG_E_TOUCHING_WADING_BOOTS))
@ -863,7 +863,7 @@ s32 func_8029CA94(s32 arg0){
if(baflag_isTrue(BA_FLAG_6))
arg0 = BS_53_TIMEOUT;
if(baflag_isTrue(BA_FLAG_7))
if(baflag_isTrue(BA_FLAG_7_TOUCHING_JIGGY))
arg0 = BS_44_JIG_JIGGY;
if(baflag_isTrue(BA_FLAG_14_LOSE_BOGGY_RACE))
@ -906,14 +906,14 @@ void func_8029CBF4(void){
}
void func_8029CCC4(void){
if(baflag_isFalse(BA_FLAG_7)) return;
if(baflag_isFalse(BA_FLAG_7_TOUCHING_JIGGY)) return;
if( baflag_isTrue(BA_FLAG_F)
&& baflag_isFalse(BA_FLAG_6)
&& baflag_isFalse(BA_FLAG_14_LOSE_BOGGY_RACE)
){
baflag_clear(BA_FLAG_F);
}
baflag_clear(BA_FLAG_7);
baflag_clear(BA_FLAG_7_TOUCHING_JIGGY);
func_802B0CD8();
item_inc(ITEM_E_JIGGY);
if(jiggyscore_total() == 100 && fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)){

23
src/core2/code_16010.c
View File

@ -22,7 +22,7 @@ void func_8029CFF8(void){
}
void func_8029D01C(void){
baflag_clear(BA_FLAG_13);
baflag_clear(BA_FLAG_13_TOUCHING_DANGEROUS_GROUND);
D_8037D210 = sfxsource_createSfxsourceAndReturnIndex();
D_8037D212 = 0;
}
@ -199,8 +199,7 @@ bool func_8029D66C(void){
return FALSE;
}
//can_take_ground_damage
bool func_8029D7B4(void){
bool canTakeGroundDamage(void){
enum bs_e sp1C;
sp1C = bs_getState();
@ -223,8 +222,8 @@ bool func_8029D7B4(void){
return func_8029D66C()
&& bsStoredState_getTransformation() == TRANSFORM_1_BANJO
&& stateTimer_isDone(STATE_TIMER_2_LONGLEG)
&& func_8028ECAC() != BSGROUP_3_WONDERWING
&& func_8028ECAC() != BSGROUP_9_LONG_LEG
&& player_movementGroup() != BSGROUP_3_WONDERWING
&& player_movementGroup() != BSGROUP_9_LONG_LEG
&& baflag_isFalse(BA_FLAG_E_TOUCHING_WADING_BOOTS)
&& sp1C != BS_25_LONGLEG_ENTER
&& player_getWaterState() != BSWATERGROUP_2_UNDERWATER
@ -238,7 +237,7 @@ bool func_8029D7B4(void){
}
void func_8029D968(void){
s32 sp24;
s32 can_take_ground_damage;
BKCollisionTri *temp_v0;
s32 sp1C;
s32 sp18;
@ -261,11 +260,11 @@ void func_8029D968(void){
}
}//L8029DA18
sp24 = func_8029D7B4();
can_take_ground_damage = canTakeGroundDamage();
batimer_decrement(4);
if(sp24){
if(can_take_ground_damage){
if(map_get() == MAP_8E_GL_FURNACE_FUN){
if(bs_checkInterrupt(BS_INTR_13)){
if(bs_checkInterrupt(BS_INTR_13_FF_DEATH_SQUARE)){
func_8029D230();
}
}
@ -278,7 +277,7 @@ void func_8029D968(void){
baMotor_80250D94(1.0f, 0.5f, 0.4f);
}
if(item_empty(ITEM_14_HEALTH)){
bs_checkInterrupt(BS_INTR_13);
bs_checkInterrupt(BS_INTR_13_FF_DEATH_SQUARE);
}
}//L8029DAD0
@ -316,9 +315,9 @@ void func_8029D968(void){
break;
}
}
baflag_set(BA_FLAG_13);
baflag_set(BA_FLAG_13_TOUCHING_DANGEROUS_GROUND);
}
else{
baflag_clear(BA_FLAG_13);
baflag_clear(BA_FLAG_13_TOUCHING_DANGEROUS_GROUND);
}
}

6
src/core2/code_47BD0.c
View File

@ -445,7 +445,7 @@ void chBeeSwarm_update(Actor *this) {
switch (this->state) {
case 1:
if (!fileProgressFlag_get(FILEPROG_8F_MET_BEE_INFESTED_BEEHIVE) && subaddie_playerIsWithinCylinder(this, 250, 300)
&& ((func_8028ECAC() == 0) || (func_8028ECAC() == BSGROUP_8_TROT))
&& ((player_movementGroup() == BSGROUP_0_NONE) || (player_movementGroup() == BSGROUP_8_TROT))
&& (player_getTransformation() == TRANSFORM_1_BANJO)
&& (gcdialog_showText(0xDA6, 0, NULL, NULL, NULL, NULL) != 0)
) {
@ -479,11 +479,11 @@ void chBeeSwarm_update(Actor *this) {
case 4:
spB4[1] += 50.0f;
this->lifetime_value += dt;
if ((this->lifetime_value - 0.5 > 0.0) && (local->unk0 > 0) && (func_8028ECAC() != 3)) {
if ((this->lifetime_value - 0.5 > 0.0) && (local->unk0 > 0) && (player_movementGroup() != BSGROUP_3_WONDERWING)) {
func_8028F504(0xD);
this->lifetime_value -= 0.5;
}
if ((this->lifetime_value > 0.2) && (func_8028ECAC() == 3)) {
if ((this->lifetime_value > 0.2) && (player_movementGroup() == BSGROUP_3_WONDERWING)) {
if (local->unk0-- > 0) {
sp68[0] = local->unk8[local->unk0].unk0[0] + this->position[0];
sp68[1] = local->unk8[local->unk0].unk0[1] + this->position[1];

2
src/core2/code_4A6F0.c
View File

@ -309,7 +309,7 @@ void chMumbo_update(Actor *this) {
actor_loopAnimation(this);
sp48 = (map_get() == MAP_7A_GL_CRYPT) ? chMumbo_withinHorzDistToPlayer(0x442, 0, 0x3C) : chMumbo_withinHorzDistToPlayer(0, -0x5A, 0x3C);
if( sp48
&& func_8028ECAC() == 0
&& player_movementGroup() == BSGROUP_0_NONE
&& func_8028F20C()
&& func_8028EFC8()
){

4
src/core2/code_4C020.c
View File

@ -518,7 +518,7 @@ bool func_802D42F8(Actor *this) {
void func_802D4388(Actor *this){
func_802D3CE8(this);
this->unk38_0 = BOOL(map_get() == MAP_7A_GL_CRYPT || item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->unkF4_8 || func_802D42F8(this));
mapSpecificFlags_set(0x1F, (func_8028F20C() && func_8028FB48(0x78000000)) || func_8028ECAC() == BSGROUP_D_TRANSFORMING);
mapSpecificFlags_set(0x1F, (func_8028F20C() && func_8028FB48(0x78000000)) || player_movementGroup() == BSGROUP_D_TRANSFORMING);
switch(this->state){
case 0x12: //L802D4468
if(this->unk38_0 && mapSpecificFlags_get(0x1F)){
@ -584,7 +584,7 @@ void func_802D4680(Actor *this){
break;
case 1:
if(ml_vec3f_horizontal_distance_zero_likely(this->position, sp1C) < 150.0f && func_8028F20C()){
if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){
if(player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT){
if(map_get() == MAP_8E_GL_FURNACE_FUN){
volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, 0);
func_802D4614(MAP_80_GL_FF_ENTRANCE);

40
src/core2/code_7060.c
View File

@ -71,8 +71,8 @@ bool func_8028E060(s32 arg0, s32 *arg1){
void func_8028E0B0(ActorMarker *arg0){
bs_setState(bs_getIdleState());
bsStoredState_setTrot(FALSE);
baflag_clear(BA_FLAG_16);
baflag_clear(BA_FLAG_18);
baflag_clear(BA_FLAG_16_FLYING);
baflag_clear(BA_FLAG_18_UNDERWATER);
}
void func_8028E0F0(s32 arg0, s32 arg1[3]) {
@ -118,17 +118,17 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) {
switch (map_get()) {
case MAP_27_FP_FREEZEEZY_PEAK:
if (arg0 == 0xD) {
baflag_set(BA_FLAG_16);
baflag_set(BA_FLAG_16_FLYING);
}
break;
case MAP_77_GL_RBB_LOBBY:
if ((arg0 == 2) && func_802D6088()) {
baflag_set(BA_FLAG_18);
baflag_set(BA_FLAG_18_UNDERWATER);
}
break;
case MAP_76_GL_640_NOTE_DOOR:
if ((arg0 == 1) && func_802D60C4()) {
baflag_set(BA_FLAG_18);
baflag_set(BA_FLAG_18_UNDERWATER);
}
break;
}
@ -154,8 +154,8 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) {
func_8028F85C(sp7C);
func_80295A8C();
bsStoredState_setTrot(FALSE);
baflag_clear(BA_FLAG_16);
baflag_clear(BA_FLAG_18);
baflag_clear(BA_FLAG_16_FLYING);
baflag_clear(BA_FLAG_18_UNDERWATER);
func_8028E060(arg0, &sp6C);
yaw_setIdeal((f32) sp6C);
yaw_applyIdeal();
@ -198,7 +198,7 @@ void func_8028E4B0(void) {
D_8037BFB8 = 1;
func_80295A8C();
bsStoredState_setTrot(FALSE);
baflag_clear(BA_FLAG_16);
baflag_clear(BA_FLAG_16_FLYING);
yaw_setIdeal(D_8037BFCC);
yaw_applyIdeal();
} else if (func_8028DFF0(sp20, sp24)) {
@ -435,7 +435,7 @@ f32 func_8028EC64(f32 arg0[3]){
return sp1C;
}
enum bsgroup_e func_8028ECAC(void) {
enum bsgroup_e player_movementGroup(void) {
enum bs_e state_id;
s32 temp_a1;
@ -459,7 +459,7 @@ enum bsgroup_e func_8028ECAC(void) {
return BSGROUP_C_WALRUS_SLED;
}
if (baflag_isTrue(BA_FLAG_9) != 0) {
return 1;
return BSGROUP_1_INTR;
}
switch(state_id){
case BS_E_OW: //L8028EE00
@ -468,7 +468,7 @@ enum bsgroup_e func_8028ECAC(void) {
case BS_3F: //L8028EE00
case BS_41_DIE: //L8028EE00
case BS_44_JIG_JIGGY: //L8028EE00
return 1;
return BSGROUP_1_INTR;
case BS_1A_WONDERWING_ENTER: //L8028EE08
case BS_1B_WONDERWING_IDLE: //L8028EE08
@ -490,19 +490,19 @@ enum bsgroup_e func_8028ECAC(void) {
return BSGROUP_8_TROT;
case BS_B_UNKOWN: //L8028EE30
return 2;
return BSGROUP_2;
case BS_6E_CROC_BITE://L8028EE38
case BS_70_CROC_EAT_GOOD://L8028EE38
if(func_802AD3A0())
return 0;
return BSGROUP_0_NONE;
return BSGROUP_7_CROC_ATTACK;
default: //L8028EE58
if (player_getActiveHitbox(NULL) != 0) {
return BSGROUP_B_ATTACKING;
}
return 0;
return BSGROUP_0_NONE;
}
}
@ -578,9 +578,9 @@ bool func_8028F070(void){
}
bool func_8028F098(void){
switch(func_8028ECAC()){
case 1:
case 2:
switch(player_movementGroup()){
case BSGROUP_1_INTR:
case BSGROUP_2:
return FALSE;
default:
return TRUE;
@ -647,7 +647,7 @@ bool func_8028F280(void){
}
bool func_8028F2A0(void) {
return (func_8028ECAC() == 0) && !func_80294610(0xE000);
return (player_movementGroup() == BSGROUP_0_NONE) && !func_80294610(0xE000);
}
@ -916,7 +916,7 @@ void func_8028FB68(void){
}
bool func_8028FB88(enum transformation_e xform_id) {
if (func_8028ADF0() && xform_id == TRANSFORM_1_BANJO) {
if (wishyWashyFlag_get() && xform_id == TRANSFORM_1_BANJO) {
xform_id = TRANSFORM_7_WISHWASHY;
}
func_80294AF4(xform_id);
@ -924,7 +924,7 @@ bool func_8028FB88(enum transformation_e xform_id) {
}
bool func_8028FBD4(f32 arg0[3]) {
if (func_803114B0() || func_8028ECAC()) {
if (func_803114B0() || player_movementGroup()) {
return FALSE;
}
if (arg0 != NULL) {

2
src/core2/code_74420.c
View File

@ -38,7 +38,7 @@ void func_802FB458(struct8s *arg0) {
if (arg0 == D_80381530[var_v0]) {
sp20 = D_80381530[0];
func_802FB020(D_80381530[var_v0], 1);
if ((var_v0 == 0) || ((func_8028ECAC() != BSGROUP_A_FLYING)) || (func_802FDD0C(D_80381530[var_v0]) != ITEM_F_RED_FEATHER)) {
if ((var_v0 == 0) || ((player_movementGroup() != BSGROUP_A_FLYING)) || (func_802FDD0C(D_80381530[var_v0]) != ITEM_F_RED_FEATHER)) {
sp20->unk10 = 3.0f;
}
if (sp20->unk18 == 0) {

4
src/core2/code_85800.c
View File

@ -419,12 +419,12 @@ void func_8030D644(void){
}
}
void func_8030D6C4(enum sfx_e uid, f32 arg1, s32 sampleRate, s32 arg3, s32 arg4){
void func_8030D6C4(enum sfx_e uid, f32 volume, s32 sampleRate, s32 arg3, s32 arg4){
u8 indx = sfxsource_createSfxsourceAndReturnIndex();
if(indx){
sfxsource_setSfxId(indx, uid);
sfxsource_setSampleRate(indx, sampleRate);
sfxsource_playSfxAtVolume(indx, arg1);
sfxsource_playSfxAtVolume(indx, volume);
func_8030DCCC(indx, arg3);
func_8030DD14(indx, 1);
func_8030DD90(indx, arg4);

4
src/core2/code_9290.c
View File

@ -35,11 +35,11 @@ void func_80290298(void) {
is_pumpkin = player_getTransformation() == TRANSFORM_3_PUMPKIN;
sp30 = (func_8028B528() && !is_pumpkin) ? 6 : 1;
sp24 = func_8028B528() && !is_pumpkin;
if (D_8037C02C || player_isStable() || sp24 || func_8028ECAC() == BSGROUP_5_CLIMB || bs_getState() == BS_B_UNKOWN) {
if (D_8037C02C || player_isStable() || sp24 || player_movementGroup() == BSGROUP_5_CLIMB || bs_getState() == BS_B_UNKOWN) {
_player_getPosition(D_8037C020);
}
if (func_8028ECAC() == BSGROUP_A_FLYING) {
if (player_movementGroup() == BSGROUP_A_FLYING) {
D_8037C018 = -1;
}
else if (func_803077FC(D_8037C020, &D_8037C010, &D_8037C014, 0x12C, sp30)) {

2
src/core2/code_94A20.c
View File

@ -342,7 +342,7 @@ void func_8031C5AC(struct0 *this, f32 *dst)
{ ml_vec3f_copy(dst, &this->normX);
}
f32 func_8031C5D4(struct0 *this){
f32 floor_getXPosition(struct0 *this){
return this->posX;
}

2
src/core2/code_9BD0.c
View File

@ -119,7 +119,7 @@ int func_80290E8C(void){
void func_80290F14(void){
if( !func_80298850()
&& func_8028ECAC() != 4
&& player_movementGroup() != BSGROUP_4_LOOK
&& batimer_get(7) == 0.0f
&& bainput_should_zoom_out_camera()
){

9
src/core2/code_C4B0.c
View File

@ -5,7 +5,8 @@
#include "core2/ba/physics.h"
extern f32 func_8031C5D4(struct0*);
extern int func_80258424(f32 vec[3], f32 minX, f32 minY, f32 minZ, f32 maxX, f32 maxY, f32 maxZ);
extern f32 floor_getXPosition(struct0*);
extern void func_8031C5AC(struct0 *, f32 *);
extern f32 func_8031C5E4(struct0*);
extern void func_8031C5FC(struct0 *, f32);
@ -88,7 +89,7 @@ void func_8029350C(f32 *arg0) {
func_8031C618(D_8037C200, arg0);
func_8031C638(D_8037C200, baMarker_8028D694());
func_8031C44C(D_8037C200);
sp38 = func_8031C5D4(D_8037C200);
sp38 = floor_getXPosition(D_8037C200);
func_8031C5AC(D_8037C200, sp3C);
temp_v0 = D_8037C279;
D_8037C279 = FALSE;
@ -410,11 +411,11 @@ void func_80294390(void) {
}
f32 func_80294404(void){
return player_getYPosition() - func_8031C5D4(D_8037C200);
return player_getYPosition() - floor_getXPosition(D_8037C200);
}
f32 func_80294438(void){
return func_8031C5D4(D_8037C200);
return floor_getXPosition(D_8037C200);
}
void func_8029445C(f32 arg0[3]){

2
src/core2/code_D6600.c
View File

@ -62,7 +62,7 @@ void func_8035D65C(Actor *this) {
this->unk38_31--;
return;
}
if (func_80329530(this, 500) && func_8028B470() && func_8035D608(this)) {
if (func_80329530(this, 500) && player_isSwimming() && func_8035D608(this)) {
this->actor_specific_1_f = 2.0f;
subaddie_set_state_with_direction(this, 4, 0.0f, -1);
}

6
src/core2/code_D9B0.c
View File

@ -102,11 +102,11 @@ void func_80294B00(int arg0){
void func_80294B0C(void){
f32 sp1C = player_getYPosition();
int sp18 = func_8028ECAC();
enum bsgroup_e player_movement_group = player_movementGroup();
if( player_isStable()
|| player_inWater()
|| (sp18 == BSGROUP_A_FLYING && player_getActiveHitbox(0) != HITBOX_3_BEAK_BOMB)
|| sp18 == BSGROUP_5_CLIMB
|| (player_movement_group == BSGROUP_A_FLYING && player_getActiveHitbox(0) != HITBOX_3_BEAK_BOMB)
|| player_movement_group == BSGROUP_5_CLIMB
){////L80294B74
func_80294B00(1);
}

18
src/core2/code_EF50.c
View File

@ -46,13 +46,13 @@ enum bs_e func_80295EE0(enum bs_e arg0){
sp28 = 1;
}
switch(func_8028ECAC()){
case 6://L80295F5C
switch(player_movementGroup()){
case BSGROUP_6_TURBO_TALON_TRAINERS://L80295F5C
if(D_8037C3E0.unk18 != ASSET_3E_ANIM_BSBFLY_BEAKBOMB_CRASH){
sp2C++;
}
break;
case 9://L80295F78
case BSGROUP_9_LONG_LEG://L80295F78
sp2C++;
break;
}
@ -60,7 +60,7 @@ enum bs_e func_80295EE0(enum bs_e arg0){
func_8029CDA0();
}
else{
baflag_set(BA_FLAG_7);
baflag_set(BA_FLAG_7_TOUCHING_JIGGY);
if(sp2C){
func_8029CCC4();
}
@ -90,7 +90,7 @@ enum bs_e __get_rebound_state_id(void){
return BS_BEE_BOUNCE;
case TRANSFORM_1_BANJO:// L80296094
default:
if(func_8028ECAC() == BSGROUP_A_FLYING)
if(player_movementGroup() == BSGROUP_A_FLYING)
return BS_18_FLY_KNOCKBACK;
return BS_56_RECOIL;
}
@ -193,7 +193,7 @@ enum bs_e func_802962BC(u32 arg0){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER)
return BS_7F_DIVE_OW;
if(func_8028ECAC() == BSGROUP_A_FLYING)
if(player_movementGroup() == BSGROUP_A_FLYING)
return BS_FLY_OW;
return BS_E_OW;
}
@ -303,7 +303,7 @@ void func_80296608(void){
next_state = badrone_transform();
}
else{
baflag_set(BA_FLAG_19);
baflag_set(BA_FLAG_19_SHOULD_TRANSFORM);
next_state = func_8029B504();
}
break;
@ -336,7 +336,7 @@ void func_80296608(void){
codeA960_forceLoadzone(1);
sp2C = 2;
break;
case BS_INTR_13: //L80296760
case BS_INTR_13_FF_DEATH_SQUARE: //L80296760
item_set(ITEM_14_HEALTH, 0);
/* missing break ? */
case BS_INTR_B: //L8029676C
@ -423,7 +423,7 @@ void func_80296608(void){
sp2C = 2;
break;
case BS_INTR_35: //L80296984
baflag_set(BA_FLAG_1A);
baflag_set(BA_FLAG_1A_OPEN_NOTEDOOR);
next_state = func_8029B504();
sp2C = 2;
break;

2
src/core2/mapModel.c
View File

@ -258,7 +258,7 @@ void mapModel_opa_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
break;
case MAP_14_GV_SANDYBUTTS_MAZE:
func_8033A45C(5, (func_8028ECAC() == 4) ? 1 : 0);
func_8033A45C(5, (player_movementGroup() == BSGROUP_4_LOOK) ? 1 : 0);
break;
case MAP_E_MM_MUMBOS_SKULL:

2
src/core2/nc/dynamicCam10.c
View File

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

4
src/core2/nc/dynamicCam12.c
View File

@ -36,7 +36,7 @@ struct {
/* .code */
bool __is_flying_in_FP(void){
return (map_get() == MAP_27_FP_FREEZEEZY_PEAK) && (func_8028ECAC() == BSGROUP_A_FLYING);
return (map_get() == MAP_27_FP_FREEZEEZY_PEAK) && (player_movementGroup() == BSGROUP_A_FLYING);
}
struct56s *func_802C0EC0(void){
@ -226,7 +226,7 @@ void func_802C16CC(s32 arg0) {
s32 sp34;
s16 *sp30;
if ((func_8028ECAC() != BSGROUP_4_LOOK) && !__is_flying_in_FP()){
if ((player_movementGroup() != BSGROUP_4_LOOK) && !__is_flying_in_FP()){
sp38 = func_80334524(arg0);
if(sp38 != D_8037DBE0.unk28 && D_8037DBE0.unk28 != -1){
player_getPosition(player_or_node_position);

62
src/core2/code_39D0.c → src/core2/playerutils.c
View File

@ -75,11 +75,11 @@ int can_peck(void){
}
int func_8028ABB8(void){
if(baflag_isTrue(BA_FLAG_14_LOSE_BOGGY_RACE) || baflag_isTrue(BA_FLAG_19))
return 0;
if(bs_getState() == BS_56_RECOIL)
return 0;
return 1;
if(baflag_isTrue(BA_FLAG_14_LOSE_BOGGY_RACE) || baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM))
return 0;
if(bs_getState() == BS_56_RECOIL)
return 0;
return 1;
}
s32 can_roll(void){
@ -98,7 +98,7 @@ s32 can_trot(void){
return ability_hasLearned(ABILITY_10_TALON_TROT);
}
s32 func_8028AC98(void){
s32 can_trot_unused(void){
return ability_hasLearned(ABILITY_10_TALON_TROT);
}
@ -119,11 +119,11 @@ int can_view_first_person(void){
return 1;
}
int func_8028AD64(void){
int dummy_player_is_ant(void){
return bsant_inSet(bs_getState());
}
int func_8028AD8C(void){
int dummy_player_is_pumpkin(void){
return bspumpkin_inSet(bs_getState());
}
@ -131,38 +131,38 @@ int func_8028ADB4(void){
return func_8032190C() && map_get() != MAP_1_SM_SPIRAL_MOUNTAIN;
}
int func_8028ADF0(void){
int wishyWashyFlag_get(void){
return volatileFlag_get(VOLATILE_FLAG_9D_SANDCASTLE_WISHY_WASHY);
}
bool func_8028AE10(void) {
f32 sp2C;
f32 sp28;
f32 sp1C[3];
bool dummy_player_withinIdealYaw(void) {
f32 right_angle;
f32 left_angle;
f32 position[3];
f32 ideal_yaw;
_player_getPosition(sp1C);
_player_getPosition(position);
ideal_yaw = yaw_getIdeal();
sp2C = viewport_adjustAngleToRight(sp1C, 90.0f);
sp28 = viewport_adjustAngleToRight(sp1C, 270.0f);
if (sp28 < sp2C) {
return (sp2C < ideal_yaw) || (ideal_yaw < sp28);
right_angle = viewport_adjustAngleToRight(position, 90.0f);
left_angle = viewport_adjustAngleToRight(position, 270.0f);
if (left_angle < right_angle) {
return (right_angle < ideal_yaw) || (ideal_yaw < left_angle);
}
else{
return (sp2C < ideal_yaw) && (ideal_yaw < sp28);
return (right_angle < ideal_yaw) && (ideal_yaw < left_angle);
}
}
bool func_8028AED4(f32 arg0[3], f32 arg1) {
f32 sp2C[3];
f32 position[3];
f32 sp28;
u16 sp26;
u16 sp24;
s32 temp_v1;
s32 phi_a0;
_player_getPosition(sp2C);
func_80257F18(arg0, sp2C, &sp28);
_player_getPosition(position);
func_80257F18(arg0, position, &sp28);
sp26 = (u16) (sp28 * 182.044444);
sp24 = (u16) (player_getYaw() * 182.044444);
sp26 = (u16)((sp26 - sp24));
@ -171,7 +171,7 @@ bool func_8028AED4(f32 arg0[3], f32 arg1) {
return (phi_a0 < arg1 * 182.044444);
}
int func_8028B094(void){
int player_shouldFall(void){
return (60.0f < player_getYPosition() - func_80294438());
}
@ -183,8 +183,8 @@ int player_isInHorizontalRadius(f32 arg0[3], f32 arg1){
s32 func_8028B120(void){return 0;}
int func_8028B128(void){
return baflag_isTrue(BA_FLAG_13);
int player_isOnDangerousGround(void){
return baflag_isTrue(BA_FLAG_13_TOUCHING_DANGEROUS_GROUND);
}
bool player_isInRBB(void){
@ -220,7 +220,7 @@ int func_8028B394(void){
return func_8029CF20(4);
}
bool func_8028B3B4(void) {
bool player_isActive(void) {
bool sp1C;
bool sp18;
@ -232,18 +232,18 @@ bool func_8028B3B4(void) {
}
bool player_isFallTumbling(void){
s32 sp1C;
s32 damage;
if (player_isStable()) {
return FALSE;
}
if (!bafalldamage_get_damage(&sp1C)) {
if (!bafalldamage_get_damage(&damage)) {
return FALSE;
}
return TRUE;
}
bool func_8028B470(void){
bool player_isSwimming(void){
bool out;
switch(bs_getState()){
case BS_2B_DIVE_IDLE:
@ -274,12 +274,12 @@ int func_8028B528(void){
}
void func_8028B534(void){
s32 sp1C = func_8028ECAC();
enum bsgroup_e player_movement_group = player_movementGroup();
if(player_inWater()){
D_8037BF62 = 1;
}
else{
if(player_isStable() || sp1C == BSGROUP_A_FLYING || sp1C == BSGROUP_5_CLIMB){
if(player_isStable() || player_movement_group == BSGROUP_A_FLYING || player_movement_group == BSGROUP_5_CLIMB){
D_8037BF62 = 0;
}
}

4
src/core2/snackerctl.c
View File

@ -41,7 +41,7 @@ static SnackerCtlState __snackerctl_update_ttc(void){
f32 player_position[3];
_player_getPosition(player_position);
if(func_8028B470() || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){ //(swimming || ???)
if(player_isSwimming() || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){ //(swimming || ???)
if(player_position[1] < 600.0f
&& !__snackerctl_player_within_distance(2478.0f, 4586.0f, 1750.0f) //within 1750 of sandcastle center
&& !__snackerctl_player_within_distance(-400.0, 2315.0f, 2000.0f) //within 2000 of blubber's ship center
@ -56,7 +56,7 @@ static SnackerCtlState __snackerctl_update_ttc(void){
static SnackerCtlState __snackerctl_update_rbb(void){
SnackerCtlState nextState = 0;
f32 sp18[3];
if(func_8028B470()){
if(player_isSwimming()){
func_8028E964(sp18);
if(func_80309D58(sp18, 0))
nextState = SNACKER_CTL_STATE_1_RBB;

2
src/lair/ch/brentilda.c
View File

@ -176,7 +176,7 @@ void chBrentilda_update(Actor *this) {
}
}
if( (phi_f2 < 300.0)
&& (func_8028ECAC() == 0)
&& (player_movementGroup() == BSGROUP_0_NONE)
&& func_8028F20C()
&& !func_803114B0()) {
if (!fileProgressFlag_get(FILEPROG_96_MET_BRENTILDA)) {

4
src/lair/code_5ED0.c
View File

@ -976,7 +976,7 @@ void func_8038D670(enum FF_Action next_state) {
func_8028F5F8(sp30);
} else {
func_8038D548(0);
func_8028F66C(BS_INTR_13);
func_8028F66C(BS_INTR_13_FF_DEATH_SQUARE);
}
func_8030E6D4(SFX_125_AUDIENCE_CHEERING_2);
} else {
@ -1239,7 +1239,7 @@ void lair_func_8038E0B0(void) {
} else if (item_getCount(ITEM_14_HEALTH) == 1) {
volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_AA_FF_LOW_HEALTH);
}
if ((D_8037DCB8->unk4->unk9 == 2) && (func_8028ECAC() == 0)) {
if ((D_8037DCB8->unk4->unk9 == 2) && (player_movementGroup() == BSGROUP_0_NONE)) {
if (func_8028EFEC() && (sp48[FACE_BUTTON(BUTTON_A)] == 1)) {
func_803114D0();
player_getRotation(D_8037DCB8->playerRotation);

2
src/lair/code_86F0.c
View File

@ -485,7 +485,7 @@ void lair_func_8038F924(Actor *this) {
func_8035644C(FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT);
}
}
if (func_8038ECA8(this->marker) && this->has_met_before && !func_8038EB58(this) && (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)) {
if (func_8038ECA8(this->marker) && this->has_met_before && !func_8038EB58(this) && (player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT)) {
func_8038F350(this, 2);
}
break;