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

Merge branch 'documentation' into 'master'

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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);
}