Documenting Player Utilities and Related

This commit is contained in:
Shmoopi
2024-11-03 17:19:48 +00:00
committed by Banjo Kazooie
parent 1772033ec8
commit 0d223bfc2b
78 changed files with 243 additions and 240 deletions

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;

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;

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)){