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/fight/chbossjinjobase.c
View File

@@ -136,7 +136,7 @@ void func_8038D568(Actor *this){
other = marker_getActor(this->unk100);
sp3C = this->velocity_y * sp48;
if(this->position_y + sp3C < this->unk1C[1]){
if( !func_8031FF1C(BKPROG_D2_HAS_SPAWNED_A_JINJO_STATUE_IN_FINAL_FIGHT) || this->unkF4_8 == 1){
if( !fileProgressFlag_get(FILEPROG_D2_HAS_SPAWNED_A_JINJO_STATUE_IN_FINAL_FIGHT) || this->unkF4_8 == 1){
func_8030E2C4(this->unk44_31);
func_8030E2C4(local->unk0);
}

14
src/fight/chfinalboss.c
View File

@@ -1570,7 +1570,7 @@ void chfinalboss_phase3_update(ActorMarker *marker) {
void func_80389F54(void) {
func_80320004(BKPROG_D2_HAS_SPAWNED_A_JINJO_STATUE_IN_FINAL_FIGHT, TRUE);
fileProgressFlag_set(FILEPROG_D2_HAS_SPAWNED_A_JINJO_STATUE_IN_FINAL_FIGHT, TRUE);
D_803927C4 = (u8)0;
}
@@ -1597,7 +1597,7 @@ void chfinalboss_phase4_setState(Actor *this, s32 arg1) {
if ((local->unk3 == 2) && (local->unkA == 0)) {
D_803927C8 = 1;
func_80311480(randi2(0, 5) + 0x1136, 4, NULL, NULL, NULL, NULL);
if ( !func_8031FF1C(BKPROG_D2_HAS_SPAWNED_A_JINJO_STATUE_IN_FINAL_FIGHT) ) {
if ( !fileProgressFlag_get(FILEPROG_D2_HAS_SPAWNED_A_JINJO_STATUE_IN_FINAL_FIGHT) ) {
local->unkA = 1U;
D_803927C4 = 1;
func_80324E38(0.0f, 1);
@@ -1725,8 +1725,8 @@ void chfinalboss_phase4_update(ActorMarker *marker) {
sp6C = chfinalboss_findCollidingJinjo(this, func_8033229C(this->marker));
if (sp6C != NULL) {
chbossjinjo_attack(sp6C);
if (!func_8031FF1C(BKPROG_D1_HAS_ACTIVATED_A_JINJO_STATUE_IN_FINAL_FIGHT)) {
func_80320004(BKPROG_D1_HAS_ACTIVATED_A_JINJO_STATUE_IN_FINAL_FIGHT, TRUE);
if (!fileProgressFlag_get(FILEPROG_D1_HAS_ACTIVATED_A_JINJO_STATUE_IN_FINAL_FIGHT)) {
fileProgressFlag_set(FILEPROG_D1_HAS_ACTIVATED_A_JINJO_STATUE_IN_FINAL_FIGHT, TRUE);
D_803927C4 = 0;
func_80324E88(1.0f);
func_80324E38(1.0f, 0);
@@ -2142,8 +2142,8 @@ void func_8038B780(ActorMarker *marker) {
Actor *sp24;
sp24 = marker_getActor(marker);
if (!func_8031FF1C(BKPROG_CF_HAS_ENTERED_FINAL_FIGHT)) {
func_80320004(BKPROG_CF_HAS_ENTERED_FINAL_FIGHT, TRUE);
if (!fileProgressFlag_get(FILEPROG_CF_HAS_ENTERED_FINAL_FIGHT)) {
fileProgressFlag_set(FILEPROG_CF_HAS_ENTERED_FINAL_FIGHT, TRUE);
func_80311480(0x10E7, 0x2A, sp24->position, sp24->marker, chfinalboss_phase0_endTextCallback, NULL);
}
else{
@@ -2421,7 +2421,7 @@ void func_8038C148(void) {
temp_f20 = sp34 + chjinjonator_80391234();
sp40 = chjinjonator_80391240();
camera_node = 0x14;
func_80320004(BKPROG_FC_DEFEAT_GRUNTY, TRUE);
fileProgressFlag_set(FILEPROG_FC_DEFEAT_GRUNTY, TRUE);
if (sp48->mirror_phase5 != 0) {
camera_node = 0x23;
}

2
src/fight/chstonejinjo.c
View File

@@ -120,7 +120,7 @@ void chstonejinjo_breakOpen(ActorMarker *marker){
actor_playAnimationOnce(actor);
animctrl_setDuration(actor->animctrl, actor->unk1C[0]);
SPAWNQUEUE_ADD_1(chstonejinjo_spawnJinjo, actor->marker);
if(!func_8031FF1C(BKPROG_D1_HAS_ACTIVATED_A_JINJO_STATUE_IN_FINAL_FIGHT) && actor->unkF4_8 != BOSSJINJO_JINJONATOR){
if(!fileProgressFlag_get(FILEPROG_D1_HAS_ACTIVATED_A_JINJO_STATUE_IN_FINAL_FIGHT) && actor->unkF4_8 != BOSSJINJO_JINJONATOR){
sp38 = 0x30 + actor->unkF4_8*2;
sp34 = chbossjinjo_8038D268();
sp30 = actor->unk1C[0] + sp34;