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

file_progress_e documentation

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GV/ch/buriedpyramid.c
View File

@@ -59,7 +59,7 @@ void chBuriedPyramid_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
local->raised_state = func_8031FF44(BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2);
local->raised_state = fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2);
this->position_x = 67.0f;
this->position_y = (local->raised_state/3.0)*1050.0 + 1375.0;
this->position_z = 400.0f;

39
src/GV/code_30C0.c → src/GV/ch/sarcophagus.c
View File

@@ -5,30 +5,31 @@
extern void func_802EE6CC(f32[3], s32[4], s32[4], s32, f32, f32, s32, s32, s32);
void func_80389634(Actor *this);
void func_803898B8(Actor *this);
void chSarcophagus_update(Actor *this);
void chSarcophagus_updateSNS(Actor *this);
/* .data */
ActorAnimationInfo GV_D_80390E00[] = {
ActorAnimationInfo chSarcophagusAnimations[] = {
{0x00, 0.0f},
{0xCD, 8000000.0f},
{0xCD, 2.5f},
{0xCD, 8000000.0f},
{0xCD, 1.6f},
{0xCD, 4.5f},
{ASSET_CD_ANIM_SARCOPHAGUS_OPEN, 8000000.0f},
{ASSET_CD_ANIM_SARCOPHAGUS_OPEN, 2.5f},
{ASSET_CD_ANIM_SARCOPHAGUS_OPEN, 8000000.0f},
{ASSET_CD_ANIM_SARCOPHAGUS_OPEN, 1.6f},
{ASSET_CD_ANIM_SARCOPHAGUS_OPEN, 4.5f},
};
ActorInfo GV_D_80390E30 = { 0xA8, 0x11A, 0x33D,
0x1, GV_D_80390E00,
func_80389634, func_80326224, func_80325888,
ActorInfo chSarcophagus = { MARKER_A8_GV_MAZE_SARCOPHAGUS, ACTOR_11A_GV_MAZE_SARCOPHAGUS, ASSET_33D_MODEL_SARCOPHAGUS,
0x1, chSarcophagusAnimations,
chSarcophagus_update, func_80326224, func_80325888,
2500, 0, 0.0f, 0
};
ActorInfo D_80390E54 = { 0x23B, 0x244, 0x33D,
0x1, GV_D_80390E00,
func_803898B8, func_80326224, func_80325888,
ActorInfo chSNSSarcophagus = { MARKER_23B_GV_SNS_SARCOPHAGUS, ACTOR_244_GV_SNS_SARCOPHAGUS, ASSET_33D_MODEL_SARCOPHAGUS,
0x1, chSarcophagusAnimations,
chSarcophagus_updateSNS, func_80326224, func_80325888,
0, 0, 0.0f, 0
};
s32 D_80390E78[4] = {0xff, 0xd0, 0x5d, 0xb4};
s32 D_80390E88[4] = {0, 0, 0, 0};
@@ -62,7 +63,7 @@ int func_8038957C(Actor *this){
return 0;
}
void func_80389634(Actor *this){
void chSarcophagus_update(Actor *this){
int i;
switch(this->state){
@@ -92,7 +93,7 @@ void func_80389634(Actor *this){
break;
case 3: //L80389788
if(!func_80329530(this, 0x2bc)){
if(!func_80329530(this, 700)){
func_80328B8C(this, 4, 0.5f, 1);
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
@@ -118,10 +119,10 @@ void func_80389634(Actor *this){
}//L803898A8
}
void func_803898B8(Actor *this){
void chSarcophagus_updateSNS(Actor *this){
if(!this->initialized){
GV_func_803894B0(this);
if(func_8031FF1C(BKPROG_A4_UNKOWN))
if(fileProgressFlag_get(FILEPROG_A4_GV_SNS_SARCOPHAGUS_OPEN))
func_80328B8C(this, 3, 0.5f, 1);
this->unk1C[0] = 0.0f;
}
@@ -137,7 +138,7 @@ void func_803898B8(Actor *this){
}
}
else{//L803899C0
if(func_8031FF1C(BKPROG_A3_UNKOWN)){
if(fileProgressFlag_get(FILEPROG_A3_GV_SNS_SWITCH_PRESSED)){
this->unk1C[0] = 33.0f;
}
}

8
src/GV/code_6370.c
View File

@@ -50,13 +50,13 @@ void func_8038C760(Actor *this, s32 arg1){
timed_setCameraToNode(0.0f, 8);
if(arg1 < 3){
timed_setCameraToNode(3.5f, arg1 + 0x15);
timedFunc_set_3(3.5f, (GenMethod_3)func_80320044, BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, arg1, 2);
timedFunc_set_3(3.5f, (GenMethod_3)fileProgressFlag_setN, FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, arg1, 2);
func_80324E88(6.5f);
func_80324E38(6.5f, 0);
}
else{
timedFunc_set_2(3.5f, (GenMethod_2)func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
timedFunc_set_3(3.5f, (GenMethod_3)func_80320044, BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, arg1, 2);
timedFunc_set_3(3.5f, (GenMethod_3)fileProgressFlag_setN, FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, arg1, 2);
func_80324E88(6.0f);
func_80324E38(6.0f, 0);
}
@@ -158,7 +158,7 @@ void func_8038CC98(Actor *this){
f32 sp48[3];
if(!this->unk16C_4){
sp7C = func_8031FF44(BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2);
sp7C = fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2);
this->unk16C_4 = TRUE;
this->marker->unk30 = func_8038C880;
local->unk8 = &D_803911F0[this->modelCacheIndex - 0x285];
@@ -185,7 +185,7 @@ void func_8038CC98(Actor *this){
}
if(this->state == 1){
if(func_8031FF44(BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2) == *local->unk8){
if(fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2) == *local->unk8){
func_8038C8A0(this, 2);
}
}

2
src/GV/code_6F80.c
View File

@@ -28,7 +28,7 @@ void func_8038D3AC(Actor *this){
this->unk16C_4 = TRUE;
marker_setCollisionScripts(this->marker, func_8038D370, NULL, NULL);
D_80391AA0 = 0;
if(func_8031FF44(BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2) == 3){
if(fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2) == 3){
marker_despawn(this->marker);
}
}

10
src/GV/code_7FF0.c
View File

@@ -20,8 +20,8 @@ extern ActorInfo chGobi2;
extern ActorInfo chGobi3;
extern ActorInfo chTrunker;
extern ActorInfo GV_D_80390DD0;
extern ActorInfo GV_D_80390E30;
extern ActorInfo D_80390E54;
extern ActorInfo chSarcophagus;
extern ActorInfo chSNSSarcophagus;
extern ActorInfo D_80390ED0;
extern ActorInfo D_80390F00;
extern ActorInfo D_80390FD0;
@@ -301,7 +301,7 @@ void func_8038E97C(Actor *this){
}//L8038EA6C
if(this->position_y == this->unk1C[0] + -300.0f){
if(func_8031FF44(BKPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2) == 3){
if(fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2) == 3){
this->position_y = this->unk1C[0];
}
}
@@ -476,8 +476,8 @@ void GV_func_8038F154(void)
spawnableActorList_add(&chGobi3, actor_new, 0X9A8);
spawnableActorList_add(&chTrunker, actor_new, 0XD80);
spawnableActorList_add(&GV_D_80390DD0, actor_new, 0X4004);
spawnableActorList_add(&GV_D_80390E30, actor_new, 0X448);
spawnableActorList_add(&D_80390E54, actor_new, 0X48);
spawnableActorList_add(&chSarcophagus, actor_new, 0X448);
spawnableActorList_add(&chSNSSarcophagus, actor_new, 0X48);
spawnableActorList_add(&D_80390ED0, actor_new, 0X180);
spawnableActorList_add(&D_80390F00, actor_new, 0X80);
spawnableActorList_add(&D_80390FD0, actor_new, 0X4048);