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

Merge branch 'mr-origin-53'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-01 16:26:51 -05:00
parent 35a2c13ea9 892f773f80
commit b26ae6b1f3
32 changed files with 1082 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lair/code_5ED0.c
View File

@@ -66,7 +66,7 @@ extern void ability_setAllLearned(s32); // set unlocked moves bitfield
extern s32 ability_getAllLearned(void); // get unlocked moves bitfield
extern s32 item_getCount(s32); // item count get
extern void func_803463F4(s32, s32); // item count set
extern void item_adjustByDiffWithoutHud(s32, s32); // item count set
extern void func_80250530(s32, u16, f32);
@@ -602,7 +602,7 @@ void func_8038CE28(void)
D_8037DCB8->unk3C[i] = 0;
// set joker card count to 0
func_803463F4(ITEM_27_JOKER_CARD, item_getCount(0x27) * -1);
item_adjustByDiffWithoutHud(ITEM_27_JOKER_CARD, item_getCount(0x27) * -1);
D_8037DCB8->unk8 = 0;
D_8037DCB8->unk4 = NULL;
@@ -636,7 +636,7 @@ void lair_func_8038CF18(void)
D_8037DCB8->unk3C[i] = 0;
// set joker card count to 0
func_803463F4(ITEM_27_JOKER_CARD, item_getCount(ITEM_27_JOKER_CARD) * -1);
item_adjustByDiffWithoutHud(ITEM_27_JOKER_CARD, item_getCount(ITEM_27_JOKER_CARD) * -1);
}
lair_func_8038C6BC();
@@ -958,7 +958,7 @@ void func_8038D670(enum FF_Action next_state) {
func_8038C2D4(D_8037DCB8->ffQuestionType);
}
if (((s32) D_8037DCB8->unk4->unk8 >= 7) && (quizQuestionAskedBitfield_get(func_8038D60C(D_8037DCB8->unk8)) == 0)) {
func_803463D4(ITEM_27_JOKER_CARD, D_8037DCB8->unk4->unk8 - 6);
item_adjustByDiffWithHud(ITEM_27_JOKER_CARD, D_8037DCB8->unk4->unk8 - 6);
quizQuestionAskedBitfield_set(func_8038D60C(D_8037DCB8->unk8), TRUE);
func_80356540(0xA8);
}