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

@@ -253,7 +253,7 @@ void func_80388FC0(Actor *this){
ActorLocal_BGS_2270 *local;
local = (ActorLocal_BGS_2270 *)&this->local;
func_80320044(0, local->unkA, 2);
fileProgressFlag_setN(0, local->unkA, 2);
vector_free(local->unk4);
}
@@ -289,7 +289,7 @@ void func_80389080(Actor *this){
unqPtr->unk4 = vector_new(sizeof(Struct_BGS_2270_0s), 8);
unqPtr->unk8 = 0;
unqPtr->unk9 = 0;
unqPtr->unkA = func_8031FF44(0,2);
unqPtr->unkA = fileProgressFlag_getN(0,2);
unqPtr->unkB = 0;
unqPtr->unkC = 0.0f;
if(func_803203FC(2)){

View File

@@ -4,12 +4,13 @@
void chfrogminigame_update(Actor *);
void chFrogMinigame_setState(Actor * arg0, u32 arg1);
void chFrogMinigame_setState(Actor * arg0, u32 next_state);
void func_8025A58C(u32, u32);
void func_80324E88(f32);
ActorInfo BGS_D_80390AB0 = {MARKER_C4_YELLOW_FLIBBIT_CTRL, ACTOR_136_YELLOW_FLIBBIT_CONTROLLER, 0x00, 0x00, NULL,
ActorInfo chFrogMinigame = {MARKER_C4_YELLOW_FLIBBIT_CTRL, ACTOR_136_YELLOW_FLIBBIT_CONTROLLER, 0x00,
0x00, NULL,
chfrogminigame_update, NULL, func_80325340,
0, 0, 0.0f, 0
};
@@ -45,16 +46,16 @@ void func_8038CBB4(Actor * arg0){
arg0->bgs_6730.unk4 = 0;
}
void chFrogMinigame_setState(Actor * arg0, u32 arg1){
void chFrogMinigame_setState(Actor * arg0, u32 next_state){
ActorLocal_BGS_6730 *s0;
s0 = &arg0->bgs_6730;
if(arg1 == 2){
if(next_state == 2){
func_8028F8F8(0x12, 1);
func_8028F8F8(0x1F, 0);
mapSpecificFlags_set(0x10, 1);
if(!func_8031FF1C(0x1B)){
func_80320004(0x1B, 1);
if(!fileProgressFlag_get(FILEPROG_1B_MET_YELLOW_FLIBBITS)){
fileProgressFlag_set(FILEPROG_1B_MET_YELLOW_FLIBBITS, 1);
func_80311480(text_flibbits_meet, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}else{
if(!arg0->bgs_6730.unk8){
@@ -66,7 +67,7 @@ void chFrogMinigame_setState(Actor * arg0, u32 arg1){
}
}
}
if(arg1 == 3){
if(next_state == 3){
s0->unk0 = 1;
if(!s0->unk4){
func_8025A58C(0, 400);
@@ -81,7 +82,7 @@ void chFrogMinigame_setState(Actor * arg0, u32 arg1){
if(arg0->state == 3){
func_8028F8F8(0x12, 0);
func_8028F8F8(0x1F, 1);
if(arg1 == 1){
if(next_state == 1){
if(s0->unk4){
comusic_8025AB44(MUSIC_BGS_FLIBBIT_FIGHT, 18000, 100);
}
@@ -91,22 +92,22 @@ void chFrogMinigame_setState(Actor * arg0, u32 arg1){
}
}
if(arg1 == 4){
if(next_state == 4){
func_80311480(text_flibbits_defeat, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}
if(arg1 == 5){
if(next_state == 5){
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0x27);
timedFunc_set_0(0.2f, __chFrogMinigame_spawnJiggy);
func_80324E88(3.0f);
func_80324E38(3.0f, 0);
arg1 = 6;
next_state = 6;
}
if(arg1 == 6){
if(next_state == 6){
func_8028F8F8(0x12, 0);
func_8028F8F8(0x1F, 1);
}
arg0->state = arg1;
arg0->state = next_state;
}
void func_8038CE88(void){

View File

@@ -16,7 +16,7 @@ extern ActorInfo D_80390C88;
extern ActorInfo D_80390CC8;
extern ActorInfo D_80390D08;
extern ActorInfo D_80390D48;
extern ActorInfo BGS_D_80390AB0;
extern ActorInfo chFrogMinigame;
extern ActorInfo BGS_D_80390AE0;
extern ActorInfo D_80390960;
extern ActorInfo D_80390A40;
@@ -47,7 +47,7 @@ void BGS_func_8038F1E0(void){//bgs_updateSpawnableActors
spawnableActorList_add(&D_80390CC8, actor_new, 0x400042c);//tanktup_leg
spawnableActorList_add(&D_80390D08, actor_new, 0x400042c);//tanktup_leg
spawnableActorList_add(&D_80390D48, actor_new, 0x400042c);//tanktup_leg
spawnableActorList_add(&BGS_D_80390AB0, actor_new, 0x81);
spawnableActorList_add(&chFrogMinigame, actor_new, 0x81);
spawnableActorList_add(&BGS_D_80390AE0, actor_new, 0x20108a1); //yellow_flibbit
spawnableActorList_add(&D_80390960, actor_new, 0);
spawnableActorList_add(&D_80390A40, actor_new, 0x880); //yumblie