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

Documenting Player Utilities and Related

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

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;