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

2
src/core2/ch/collectible.c
View File

@@ -82,7 +82,7 @@ bool chCollectible_collectItem(Actor* actor, enum file_progress_e arg1, enum ass
if(!func_802FADD4(0x1b)){
item_inc(itemId);
} else {
func_803463F4(itemId,1);
item_adjustByDiffWithoutHud(itemId,1);
}
if(!actor || !actor->unk38_0)

8
src/core2/ch/gameSelect.c
View File

@@ -20,8 +20,8 @@ void func_802C5740(Actor *this);
extern void func_802C71F0(Actor *);
extern void func_802C74F4(Actor *, s32, f32 );
extern void func_8031FB14(s32, s32);
extern void func_8031F678(s32, s32);
extern void warp_lairEnterLairFromSMLevel(s32, s32);
extern void warp_smExitBanjosHouse(s32, s32);
extern void func_80335110(s32);
extern void func_8024E60C(s32, s32[3]);
@@ -413,10 +413,10 @@ void func_802C4C14(Actor *this){
if(this->state == 4 && (sp84 == 0 || sp84 == 1))
sp44 = 0.25f;
if(mole_learnedAllSpiralMountainAbilities() && fileProgressFlag_get(FILEPROG_BD_ENTER_LAIR_CUTSCENE)){
timedFunc_set_2(sp44, (GenFunction_2)func_8031FB14, 0, 0);
timedFunc_set_2(sp44, (GenFunction_2)warp_lairEnterLairFromSMLevel, 0, 0);
}
else{//L802C5188
timedFunc_set_2(sp44, (GenFunction_2)func_8031F678, 0, 0);
timedFunc_set_2(sp44, (GenFunction_2)warp_smExitBanjosHouse, 0, 0);
}//L802C51A0
timedFunc_set_1(sp44, (GenFunction_1)func_80335110, 1);
}//L802C51B8

2
src/core2/ch/jinjo.c
View File

@@ -51,7 +51,7 @@ void __chJinjo_802CDBA8(ActorMarker *this, ActorMarker *other){
fileProgressFlag_set(FILEPROG_E_JINJO_TEXT, 1);
}
subaddie_set_state_with_direction(actorPtr, 6, 0.0f , -1);
if(func_803463D4(ITEM_12_JINJOS, 1 << (this->unk14_20 + 6) ) == 0x1f)
if(item_adjustByDiffWithHud(ITEM_12_JINJOS, 1 << (this->unk14_20 + 6) ) == 0x1f)
localPtr->unk4 = 1;
actor_loopAnimation(actorPtr);
this->collidable = 0;

6
src/core2/ch/mole.c
View File

@@ -200,13 +200,13 @@ void mole_additionalAbilityLearnActions(ActorMarker *marker, enum asset_e arg1,
mole_setStaticCamera(actor);
break;
case 5: // Egg Firing
func_803463D4(ITEM_D_EGGS, 50);
item_adjustByDiffWithHud(ITEM_D_EGGS, 50);
break;
case 6: // Flight
func_803463D4(ITEM_F_RED_FEATHER, 25);
item_adjustByDiffWithHud(ITEM_F_RED_FEATHER, 25);
break;
case 7: // Wonderwing
func_803463D4(ITEM_10_GOLD_FEATHER, 5);
item_adjustByDiffWithHud(ITEM_10_GOLD_FEATHER, 5);
break;
case 8: // Refill Health
item_set(ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL));