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

core2/code_935F0.c done

Browse Source
This commit is contained in:
Banjo Kazooie
2022-08-17 23:03:46 -05:00
parent 1b417fb873
commit 51284af959
36 changed files with 787 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lair/code_5640.c
View File

@@ -184,7 +184,7 @@ void func_8038BCF0(Actor *this) {
func_80328A84(this, 2);
return;
}
if (func_8028EFC8() && (sp78[BUTTON_Z] == 1)) {
if (func_8028EFC8() && (sp78[FACE_BUTTON(BUTTON_B)] == 1)) {
this->unk10_12++;
this->unk10_12 %= 3;
func_80311174(local->unk0 + this->unk10_12, 0xB, this->position, this->marker, func_8038BADC, NULL, func_8038BA30);

8
src/lair/code_5ED0.c
View File

@@ -703,7 +703,7 @@ void func_8038D670(enum FF_Action next_state) {
}
} else {
if (D_8037DCB8->unk4->unk8 == FFTT_6_SKULL) {
func_80314AC8(0);
gcpausemenu_80314AC8(0);
if (func_80305248(sp30, 0x377, D_8037DCB8->playerPosition)) {
func_8038D548(1);
func_8028F5F8(sp30);
@@ -973,7 +973,7 @@ void func_8038E0B0(void) {
func_80356540(0xAA);
}
if ((D_8037DCB8->unk4->unk9 == 2) && (func_8028ECAC() == 0)) {
if (func_8028EFEC() && (sp48[BUTTON_START] == 1)) {
if (func_8028EFEC() && (sp48[FACE_BUTTON(BUTTON_A)] == 1)) {
func_803114D0();
player_getRotation(D_8037DCB8->playerRotation);
D_8037DCB8->ffQuestionType = func_8038DCD4(sp38);
@@ -981,7 +981,7 @@ void func_8038E0B0(void) {
func_8038D670(3);
return;
}
if (func_8028EFC8() && (sp48[BUTTON_Z] == 1)) {
if (func_8028EFC8() && (sp48[FACE_BUTTON(BUTTON_B)] == 1)) {
if ((item_getCount(ITEM_27_JOKER_CARD) > 0) && (sp28 < 0x5B)) {
func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4);
item_dec(ITEM_27_JOKER_CARD);
@@ -1006,7 +1006,7 @@ void func_8038E0B0(void) {
if ((D_8037DCB8->ffQuestionType == 2) && D_80394354[D_8037DCB8->unkC].unk0 == 2){
gczoombox_update(D_8037DCB8->unk20);
}
if ((D_8037DCB8->unk12 == 0) && func_8028EFC8() && (sp48[BUTTON_Z] == 1)) {
if ((D_8037DCB8->unk12 == 0) && func_8028EFC8() && (sp48[FACE_BUTTON(BUTTON_B)] == 1)) {
func_80324C58();
func_8038D670(4);
}

10
src/lair/code_86F0.c
View File

@@ -75,7 +75,7 @@ void func_8038EB94(void){
func_80320004(BKPROG_B9_DOUBLE_HEALTH, TRUE);
func_80347958();
func_803463D4(ITEM_14_HEALTH, 0);
func_80314AC8(1);
gcpausemenu_80314AC8(1);
}
void func_8038EBEC(ActorMarker *marker) {
@@ -95,7 +95,7 @@ void func_8038EBEC(ActorMarker *marker) {
}
if (this->unkF4_8 == 0xB) {
timedFunc_set_0(1.5f, func_8038EB94);
func_80314AC8(0);
gcpausemenu_80314AC8(0);
}
}
@@ -493,13 +493,13 @@ void func_8038F924(Actor *this) {
case 4: //L8038FE28
if ((func_803114C4() != 0xF7C) && (func_803114C4() != 0xF7D)) {
if (sp7C[BUTTON_START] == 1) {
if (sp7C[FACE_BUTTON(BUTTON_A)] == 1) {
func_8038F894(this, 5);
} else if (sp7C[BUTTON_Z] == 1) {
} else if (sp7C[FACE_BUTTON(BUTTON_B)] == 1) {
func_8038F350(this, 1);
} else if ((sp6C[0] == 1) && func_8031FF1C(0xE0)) {
func_8038F894(this, 6);
} else if (sp7C[BUTTON_R] == 1) {
} else if (sp7C[FACE_BUTTON(BUTTON_C_DOWN)] == 1) {
if (local->unk4) {
func_8038F350(this, 8);
} else {

2
src/lair/code_9C40.c
View File

@@ -108,7 +108,7 @@ void func_803902B8(Actor *this) {
sp58 = func_80259384(this->position, sp5C, 400.0f);
if (func_8031FF1C(sp54 + 0xAD)) {
func_8024E55C(0, sp3C);
sp58 &= (sp3C[BUTTON_Z] == TRUE) || func_8028EC04();
sp58 &= (sp3C[FACE_BUTTON(BUTTON_B)] == 1) || func_8028EC04();
}
if (sp58 && !*(s32 *)&this->local) {
func_80390174(this->marker, 0);