file_progress_e documentation

This commit is contained in:
Banjo Kazooie
2023-02-18 21:00:18 -06:00
parent 1aff1a433a
commit d0112a6d4a
86 changed files with 1162 additions and 1155 deletions

View File

@@ -55,7 +55,7 @@ void func_80387F64(Actor *this, s32 next_state){
if (map_get() == MAP_43_CCW_SPRING) {
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
}
func_80320004(local->unk0->unk8, 1);
fileProgressFlag_set(local->unk0->unk8, TRUE);
func_80335924(this->unk148, local->unk0->unk4, 0.0f, 6.0f);
func_80335A8C(this->unk148, 2);
if (map_get() == MAP_43_CCW_SPRING) {
@@ -107,7 +107,7 @@ Actor *CCW_func_803882F4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
s32 sp18;
this = marker_getActor(marker);
if ((this->state == 1) && !func_8031FF1C(0xE3)) {
if ((this->state == 1) && !fileProgressFlag_get(FILEPROG_E3_CCW_FLOWER_SPRING)) {
return func_80325340(marker, gfx, mtx, vtx);
}
@@ -147,16 +147,16 @@ void func_80388478(Actor *this) {
marker_setCollisionScripts(this->marker, NULL, CCW_func_80388278, func_803882A4);
actor_collisionOn(this);
if (!jiggyscore_isSpawned(JIGGY_4D_CCW_FLOWER)) {
func_80320004(0xE5, FALSE);
fileProgressFlag_set(FILEPROG_E5_CCW_FLOWER_AUTUMN, FALSE);
}
for(local->unk0 = &D_8038EC40[0]; local->unk0 < D_8038EC40 + 3; local->unk0++){
if(!func_8031FF1C(local->unk0->unk8)){
if(!fileProgressFlag_get(local->unk0->unk8)){
break;
}
}
if (!func_8031FF1C(0xE3) && (map_get() != MAP_43_CCW_SPRING)) {
if (!fileProgressFlag_get(FILEPROG_E3_CCW_FLOWER_SPRING) && (map_get() != MAP_43_CCW_SPRING)) {
marker_despawn(this->marker);
}
else{

View File

@@ -24,7 +24,7 @@ void func_80388590(Actor *this, s32 next_state){
void func_803885F8(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(func_8031FF1C(0xe5)){
if(fileProgressFlag_get(FILEPROG_E5_CCW_FLOWER_AUTUMN)){
func_80388590(this, 1);
}
else{

View File

@@ -142,16 +142,16 @@ void chGobiCCW_update(Actor *this) {
local->spit_model = assetcache_get(ASSET_3F3_MODEL_GOBI_SPIT);
marker_setCollisionScripts(this->marker, 0, func_8038894C, 0);
if(!jiggyscore_isSpawned(JIGGY_4D_CCW_FLOWER)) {
func_80320004(0xE5, 0);
fileProgressFlag_set(FILEPROG_E5_CCW_FLOWER_AUTUMN, FALSE);
}
local->unk0 = &D_8038ECD0[0];
while((local->unk0->map_id != 0) && (map_get() != local->unk0->map_id)) {
local->unk0++;
}
if( (map_get() == MAP_44_CCW_SUMMER) && func_8031FF1C(0xE3) && !func_8031FF1C(0xE4)) {
if( (map_get() == MAP_44_CCW_SUMMER) && fileProgressFlag_get(FILEPROG_E3_CCW_FLOWER_SPRING) && !fileProgressFlag_get(FILEPROG_E4_CCW_FLOWER_SUMMER)) {
CCW_func_8038868C(this, 1);
} else if( (map_get() == MAP_45_CCW_AUTUMN) && func_8031FF1C(0xE4) && !func_8031FF1C(0xE5) ) {
} else if( (map_get() == MAP_45_CCW_AUTUMN) && fileProgressFlag_get(FILEPROG_E4_CCW_FLOWER_SUMMER) && !fileProgressFlag_get(FILEPROG_E5_CCW_FLOWER_AUTUMN) ) {
CCW_func_8038868C(this, 1);
} else{
marker_despawn(this->marker);

View File

@@ -85,7 +85,7 @@ void func_80388FD4(Actor *this) {
this->initialized = TRUE;
}
if (!this->unk16C_4) {
if (func_8031FF1C(this->unk10_12 + 0x8B)) {
if (fileProgressFlag_get(this->unk10_12 + FILEPROG_8B_CCW_SPRING_OPEN)) {
actor_playAnimationOnce(this);
func_80328B8C(this, 4, 0.999f, 1);
actor_collisionOff(this);
@@ -142,7 +142,7 @@ void func_80389268(Actor *this) {
this->unk1C[1] += 250.0f;
this->unk16C_4 = TRUE;
if (func_8031FF1C(this->unk10_12 + 0x8B)) {
if (fileProgressFlag_get(this->unk10_12 + FILEPROG_8B_CCW_SPRING_OPEN)) {
func_80328A84(this, 3);
}
}

View File

@@ -15,7 +15,7 @@ void func_80389440(Actor *this, s32 next_state) {
if (next_state == 2) {
func_8030E510(SFX_AA_BGS_EGG_BREAKING_1, 28000);
this->marker->propPtr->unk8_3 = FALSE;
func_80320004(0xE6, 1);
fileProgressFlag_set(FILEPROG_E6_SPRING_EYRIE_HATCHED, TRUE);
func_80335924(this->unk148, 0x187, 0.0f, 2.0f);
func_80335A8C(this->unk148, 2);
func_80324E38(0.0f, 3);
@@ -54,7 +54,7 @@ void func_803895F4(Actor *this) {
this->marker->propPtr->unk8_3 = TRUE;
marker_setCollisionScripts(this->marker, NULL, NULL, &func_8038950C);
func_80389440(this, 1);
if ((func_8031FF1C(0xE6) != 0) || jiggyscore_isSpawned(JIGGY_49_CCW_EYRIE)) {
if (fileProgressFlag_get(FILEPROG_E6_SPRING_EYRIE_HATCHED) || jiggyscore_isSpawned(JIGGY_49_CCW_EYRIE)) {
marker_despawn(this->marker);
}
return;

View File

@@ -90,9 +90,9 @@ Struct_CCW_3310_1 D_8038F060[] = {
};
Struct_CCW_3310_0 D_8038F080[] = {
{MAP_43_CCW_SPRING, 0, 0xE6, 0, NULL, 3, 0, NULL, 0x18F, D_8038EFC0, 0x190, D_8038F030, 0, 0, 0, 0},
{MAP_44_CCW_SUMMER, 0xE6, 0xE7, 0x191, D_8038EEA0, 2, 0x192, D_8038EF20, 0x193, D_8038EFC0, 0x194, D_8038F030, 2, 5, 0x21A, 0xCD7},
{MAP_45_CCW_AUTUMN, 0xE7, 0xE8, 0x195, D_8038EEA0, 2, 0x196, D_8038EF20, 0x197, D_8038EFC0, 0x198, D_8038F030, 4, 0xA, 0x21B, 0xCDA},
{MAP_43_CCW_SPRING, 0, FILEPROG_E6_SPRING_EYRIE_HATCHED, 0, NULL, 3, 0, NULL, 0x18F, D_8038EFC0, 0x190, D_8038F030, 0, 0, 0, 0},
{MAP_44_CCW_SUMMER, FILEPROG_E6_SPRING_EYRIE_HATCHED, FILEPROG_E7_SUMMER_EYRIE_FED, 0x191, D_8038EEA0, 2, 0x192, D_8038EF20, 0x193, D_8038EFC0, 0x194, D_8038F030, 2, 5, 0x21A, 0xCD7},
{MAP_45_CCW_AUTUMN, FILEPROG_E7_SUMMER_EYRIE_FED, FILEPROG_E8_AUTMN_EYRIE_FED, 0x195, D_8038EEA0, 2, 0x196, D_8038EF20, 0x197, D_8038EFC0, 0x198, D_8038F030, 4, 0xA, 0x21B, 0xCDA},
0
};
@@ -131,7 +131,7 @@ void func_803897B8(Actor *this, s32 next_state) {
local->unk8 = local->unk0->unk8;
}
if ((this->state == 1) && (next_state == 2)) {
func_80320004(local->unk0->unk4, TRUE);
fileProgressFlag_set(local->unk0->unk4, TRUE);
}
if (next_state == 5) {
func_8028F784(1);
@@ -230,9 +230,9 @@ void CCW_func_80389BFC(Actor *this) {
local->unk0++;
}
if ((local->unk0->unk2 != 0) && !func_8031FF1C(local->unk0->unk2)) {
if ((local->unk0->unk2 != 0) && !fileProgressFlag_get(local->unk0->unk2)) {
marker_despawn(this->marker);
} else if (!func_8031FF1C(local->unk0->unk4)) {
} else if (!fileProgressFlag_get(local->unk0->unk4)) {
func_803897B8(this, 1);
} else {
func_803897B8(this, 4);
@@ -285,7 +285,7 @@ void CCW_func_80389BFC(Actor *this) {
}
}
}
if (func_8031FF1C(local->unk0->unk4)) {
if (fileProgressFlag_get(local->unk0->unk4)) {
func_803897B8(this, local->unk0->unkC);
}
}

View File

@@ -98,8 +98,8 @@ void chcaterpillar_update(Actor *this){
}
else{//L8038A408
map_id = map_get();
if ( !func_8031FF1C(BKPROG_E6_SPRING_EYRIE_HATCHED)
|| ( map_id == MAP_45_CCW_AUTUMN && !func_8031FF1C(BKPROG_E7_SUMMER_EYRIE_FED))
if ( !fileProgressFlag_get(FILEPROG_E6_SPRING_EYRIE_HATCHED)
|| ( map_id == MAP_45_CCW_AUTUMN && !fileProgressFlag_get(FILEPROG_E7_SUMMER_EYRIE_FED))
) {
chcaterpillar_setState(this, 5);
} else {

View File

@@ -79,7 +79,7 @@ void func_8038AA8C(Actor *this) {
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
mapSpecificFlags_set(5, FALSE);
if( (!func_8031FF1C(0xE8) || jiggyscore_isSpawned(JIGGY_49_CCW_EYRIE))
if( (!fileProgressFlag_get(FILEPROG_E8_AUTMN_EYRIE_FED) || jiggyscore_isSpawned(JIGGY_49_CCW_EYRIE))
&& !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)
) {
marker_despawn(this->marker);