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

Warps & Misc Documentation

Browse Source
This commit is contained in:
Cyrus Kashef
2024-08-31 18:41:14 -05:00
parent de50021481
commit c6fdd863ed
21 changed files with 793 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lair/code_5ED0.c
View File

@@ -65,7 +65,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_80318614(gczoombox_t *, s32);
extern bool func_803183A4(gczoombox_t *, u8 *);
@@ -608,7 +608,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;
@@ -642,7 +642,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();
@@ -964,7 +964,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);
}

8
src/lair/code_86F0.c
View File

@@ -74,7 +74,7 @@ void func_8038EB94(void){
func_802FAFC0(ITEM_14_HEALTH, COMUSIC_2B_DING_B);
fileProgressFlag_set(FILEPROG_B9_DOUBLE_HEALTH, TRUE);
func_80347958();
func_803463D4(ITEM_14_HEALTH, 0);
item_adjustByDiffWithHud(ITEM_14_HEALTH, 0);
gcpausemenu_80314AC8(1);
}
@@ -318,7 +318,7 @@ void func_8038F350(Actor *this, s32 next_state){
local->unk4--;
local->unk0 &= ~(1 << temp_s1);
fileProgressFlag_setN(D_803947F8[this->unkF4_8 - 1].progress_flag, local->unk4, D_803947F8[this->unkF4_8 - 1].size_bits);
func_803463F4(ITEM_26_JIGGY_TOTAL, 1);
item_adjustByDiffWithoutHud(ITEM_26_JIGGY_TOTAL, 1);
}
break;
@@ -331,7 +331,7 @@ void func_8038F350(Actor *this, s32 next_state){
func_8038F1EC(this, temp_s1, 1);
local->unk0 |= (1 << temp_s1);
fileProgressFlag_setN(D_803947F8[this->unkF4_8 - 1].progress_flag, local->unk4, D_803947F8[this->unkF4_8 - 1].size_bits);
func_803463F4(ITEM_26_JIGGY_TOTAL, -1);
item_adjustByDiffWithoutHud(ITEM_26_JIGGY_TOTAL, -1);
func_8038F250(this);
}
break;
@@ -351,7 +351,7 @@ void func_8038F350(Actor *this, s32 next_state){
temp_s1 = func_8038F0EC(this);
func_8038F1EC(this, temp_s1, 1);
local->unk0 |= (1 << temp_s1);
func_803463F4(ITEM_26_JIGGY_TOTAL, -1);
item_adjustByDiffWithoutHud(ITEM_26_JIGGY_TOTAL, -1);
}
fileProgressFlag_setN(D_803947F8[this->unkF4_8 - 1].progress_flag, local->unk4, D_803947F8[this->unkF4_8 - 1].size_bits);
func_8038F250(this);

6
src/lair/code_A170.c
View File

@@ -34,17 +34,17 @@ Actor *func_80390560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_803905CC(ActorMarker *marker, ActorMarker *other_marker){
switch (marker->unk14_20) {
case 0x170:
func_80346448(ITEM_D_EGGS);
item_setMaxCount(ITEM_D_EGGS);
fxSparkle_giantBlueEgg(&marker->propPtr->x);
func_8025A6EC(SFX_EGG_REFILL, -1);
break;
case 0x171:
func_80346448(ITEM_F_RED_FEATHER);
item_setMaxCount(ITEM_F_RED_FEATHER);
fxSparkle_giantRedFeather(&marker->propPtr->x);
func_8025A6EC(SFX_RED_FEATHER_REFILL, -1);
break;
case 0x172:
func_80346448(ITEM_10_GOLD_FEATHER);
item_setMaxCount(ITEM_10_GOLD_FEATHER);
fxSparkle_giantGoldFeather(&marker->propPtr->x);
func_8025A6EC(SFX_GOLD_FEATHER_REFILL, -1);
break;