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

Brentilda flags.

Browse Source
This commit is contained in:
MaikelChan
2023-08-09 19:40:11 +02:00
parent 6c12648934
commit 7af9cad5be
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/enums.h
View File

@@ -205,16 +205,16 @@ enum file_progress_e{
FILEPROG_E6_SPRING_EYRIE_HATCHED, FILEPROG_E6_SPRING_EYRIE_HATCHED,
FILEPROG_E7_SUMMER_EYRIE_FED, FILEPROG_E7_SUMMER_EYRIE_FED,
FILEPROG_E8_AUTMN_EYRIE_FED, FILEPROG_E8_AUTMN_EYRIE_FED,
FILEPROG_E9_TALKED_TO_BRENTILDA_1, FILEPROG_E9_HEALED_BY_BRENTILDA_1,
FILEPROG_EA_TALKED_TO_BRENTILDA_2, FILEPROG_EA_HEALED_BY_BRENTILDA_2,
FILEPROG_EB_TALKED_TO_BRENTILDA_3, FILEPROG_EB_HEALED_BY_BRENTILDA_3,
FILEPROG_EC_TALKED_TO_BRENTILDA_4, FILEPROG_EC_HEALED_BY_BRENTILDA_4,
FILEPROG_ED_TALKED_TO_BRENTILDA_5, FILEPROG_ED_HEALED_BY_BRENTILDA_5,
FILEPROG_EE_TALKED_TO_BRENTILDA_6, FILEPROG_EE_HEALED_BY_BRENTILDA_6,
FILEPROG_EF_TALKED_TO_BRENTILDA_7, FILEPROG_EF_HEALED_BY_BRENTILDA_7,
FILEPROG_F0_TALKED_TO_BRENTILDA_8, FILEPROG_F0_HEALED_BY_BRENTILDA_8,
FILEPROG_F1_TALKED_TO_BRENTILDA_9, FILEPROG_F1_HEALED_BY_BRENTILDA_9,
FILEPROG_F2_TALKED_TO_BRENTILDA_10, FILEPROG_F2_HEALED_BY_BRENTILDA_10,
FILEPROG_F3_MET_DINGPOT, FILEPROG_F3_MET_DINGPOT,
FILEPROG_F4_ENTER_FF_CUTSCENE, FILEPROG_F4_ENTER_FF_CUTSCENE,
FILEPROG_F5_COMPLETED_A_WARP_CAULDRON_SET, FILEPROG_F5_COMPLETED_A_WARP_CAULDRON_SET,

4
src/lair/ch/brentilda.c
View File

@@ -34,7 +34,7 @@ void lair_func_8038BA88(ActorMarker *marker, enum asset_e text_id, s32 arg2){
this = marker_getActor(marker); this = marker_getActor(marker);
item_set(ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL)); item_set(ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL));
fileProgressFlag_set(this->unkF4_8 - 1 + FILEPROG_E9_TALKED_TO_BRENTILDA_1, TRUE); fileProgressFlag_set(this->unkF4_8 - 1 + FILEPROG_E9_HEALED_BY_BRENTILDA_1, TRUE);
} }
void func_8038BADC(ActorMarker *marker, enum asset_e text_id, s32 arg2) { void func_8038BADC(ActorMarker *marker, enum asset_e text_id, s32 arg2) {
@@ -42,7 +42,7 @@ void func_8038BADC(ActorMarker *marker, enum asset_e text_id, s32 arg2) {
this = marker_getActor(marker); this = marker_getActor(marker);
if (text_id == ((ActorLocal_lair_5640 *)&this->local)->unk0 + 2) { if (text_id == ((ActorLocal_lair_5640 *)&this->local)->unk0 + 2) {
if (!fileProgressFlag_get(this->unkF4_8 - 1 + FILEPROG_E9_TALKED_TO_BRENTILDA_1)) { if (!fileProgressFlag_get(this->unkF4_8 - 1 + FILEPROG_E9_HEALED_BY_BRENTILDA_1)) {
if (item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL)) { if (item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL)) {
func_80311480(0x10A2, 0xF, this->position, this->marker, func_8038BADC, lair_func_8038BA88); func_80311480(0x10A2, 0xF, this->position, this->marker, func_8038BADC, lair_func_8038BA88);
return; return;