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

Merge branch 'master' into banjo-kazooie-var_renames

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-01 15:31:34 -05:00
parent 011bea824c 9cb645df24
commit 35a2c13ea9
402 changed files with 8000 additions and 7857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ void func_8038BADC(ActorMarker *marker, enum asset_e text_id, s32 arg2) {
func_80311480(0xD38, 0xC, this->position, this->marker, func_8038BADC, NULL);
return;
}
func_80328A84(this, 1);
subaddie_set_state(this, 1);
}
void func_8038BBC0(Actor *this) {
@@ -69,7 +69,7 @@ void func_8038BC24(void) {
s32 phi_s1;
if (fileProgressFlag_get(FILEPROG_5C_FF_PATTERN_SET) && !func_803203FC(0x62)) {
func_8034A8BC(fileProgressFlag_getN(FILEPROG_D3_FF_PATTERN, 8));
rand_seed(fileProgressFlag_getN(FILEPROG_D3_FF_PATTERN, 8));
for(phi_s1 = 0; phi_s1 < func_8031A45C(3); phi_s1++){
phi_s0 = 0x26 + 2*phi_s1;
temp_v0 = randi2(0, 3);
@@ -181,14 +181,14 @@ void chBrentilda_update(Actor *this) {
if (!fileProgressFlag_get(FILEPROG_96_MET_BRENTILDA)) {
func_80311480(ASSET_10A1_DIALOG_BRENTILDA_MEET, 0xA, this->position, this->marker, func_8038BADC, NULL);
fileProgressFlag_set(FILEPROG_96_MET_BRENTILDA, TRUE);
func_80328A84(this, 2);
subaddie_set_state(this, 2);
return;
}
if (func_8028EFC8() && (sp78[FACE_BUTTON(BUTTON_B)] == 1)) {
this->unk10_12++;
this->unk10_12 %= 3;
func_80311174(local->unk0 + this->unk10_12, 0xB, this->position, this->marker, func_8038BADC, NULL, func_8038BA30);
func_80328A84(this, 2);
subaddie_set_state(this, 2);
return;
}
} else {
@@ -197,13 +197,13 @@ void chBrentilda_update(Actor *this) {
break;
case 2:
if (actor_animationIsAt(this, 0.999f)) {
func_80328A84(this, 3);
subaddie_set_state(this, 3);
return;
}
break;
case 3:
if (actor_animationIsAt(this, 0.999f)) {
func_80328A84(this, 2);
subaddie_set_state(this, 2);
}
break;
}

8
src/lair/ch/cauldron.c
View File

@@ -80,7 +80,7 @@ enum file_progress_e chWarpCauldron_getPairedFileProgressFlagIndex(Actor *this){
}
void func_8038A704(Actor *this){
func_80328B8C(this, 3, 0.99f, 1);
subaddie_set_state_with_direction(this, 3, 0.99f, 1);
}
void func_8038A730(Actor *this, f32 *arg1, enum sfx_e arg2, enum sfx_e arg3, u32 arg4) {
@@ -158,7 +158,7 @@ void func_8038AB90(Actor *this, s32 arg1, s32 arg2, enum sfx_e sfx_id, f32 sfx_t
func_80324D2C(7.0f, COMUSIC_8C_JINJONATOR_POWERUP);
}
this->unk10_12 = 0;
func_80328AC8(this, arg1);
subaddie_set_state_forward(this, arg1);
actor_playAnimationOnce(this);
func_8028FCBC();
if (sfx_id != SFX_0_BLOOP) {
@@ -235,7 +235,7 @@ void chWarpCauldron_update(Actor *this) {
this->unk38_31 = randi2(0, phi_v0 - sp4C);
}
this->scale = 1.8f;
func_80328B8C(this, 6, 0.99f, 1);
subaddie_set_state_with_direction(this, 6, 0.99f, 1);
func_802D09B8(this, 2);
}
if (fileProgressFlag_get(chWarpCauldron_getFileProgressFlagIndex(this))) {
@@ -270,7 +270,7 @@ void chWarpCauldron_update(Actor *this) {
case 1: //L8038B0F4
if (func_8038A690(this)) {
func_8028F918(2);
func_80328AC8(this, 2);
subaddie_set_state_forward(this, 2);
this->unk38_0 = FALSE;
func_8038A96C(this, 1);
func_802BAFE4(D_80393620[this->unkF4_8 - 1].unk3);