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

Renaming Juju

Browse Source
This commit is contained in:
Nabnut
2024-09-22 11:30:51 +02:00
parent 0224f95863
commit 249f5a7329
75 changed files with 426 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,10 +143,10 @@ void chBrentilda_update(Actor *this) {
if (phi_f2 < 500.0) {
if (sp74 < 0xFF) {
sp74 = (sp74 + 0xC < 0xFF) ? sp74 + 0xC : 0xFF;
if (!this->is_first_encounter) {
if (!this->has_met_before) {
comusic_playTrack(COMUSIC_81_ACTIVATING_BRENTILDA);
func_80324D2C(1.0f, COMUSIC_81_ACTIVATING_BRENTILDA);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
this->unk138_23 = FALSE;
}
}
@@ -159,7 +159,7 @@ void chBrentilda_update(Actor *this) {
comusic_playTrack(COMUSIC_8B_DEACTIVATE_BRENTILDA);
func_80324D2C(1.0f, COMUSIC_8B_DEACTIVATE_BRENTILDA);
this->unk138_23 = TRUE;
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
}
}
}

8
src/lair/code_0.c
View File

@@ -382,7 +382,7 @@ void func_803867A8(Actor *this) {
this->velocity[0] += 1.0f;
if((this->velocity[0] < 0.0f) || (this->velocity[0] > 19.0f)) {
this->velocity[0] = 0.0f;
func_8030E6A4(SFX_3F6_UNKNOWN, 0.5f, this->alpha_124_19*0x25 + 0x3840);
func_8030E6A4(SFX_3F6_RUBBING, 0.5f, this->alpha_124_19*0x25 + 0x3840);
}
}
}
@@ -390,7 +390,7 @@ void func_803867A8(Actor *this) {
this->velocity[0] += 1.0f;
if ((this->velocity[0] < 0.0f) || (this->velocity[0] > 19.0f)) {
this->velocity[0] = 0.0f;
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 0.5f, 24000, this->position, 100, 2300);
FUNC_8030E8B4(SFX_3F6_RUBBING, 0.5f, 24000, this->position, 100, 2300);
}
}
@@ -873,7 +873,7 @@ void func_803880BC(Actor *this)
__spawnQueue_add_1((GenFunction_1)func_80387E94, reinterpret_cast(s32, this->marker));
if (volatileFlag_get(VOLATILE_FLAG_BC_WITCH_SWITCH_PRESSED_CC) && !fileProgressFlag_get(FILEPROG_9A_CC_WITCH_SWITCH_PRESSED))
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.75f, 30000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.75f, 30000);
}
if (fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE))
@@ -1628,7 +1628,7 @@ void func_80389934(Actor *this)
{
subaddie_set_state_forward(this, 0x17);
actor_playAnimationOnce(this);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.6f, 32000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.6f, 32000);
func_8025A6EC(COMUSIC_3D_JIGGY_SPAWN, 0x7FFF);
}

10
src/lair/code_86F0.c
View File

@@ -197,7 +197,7 @@ void func_8038EFD8(Actor *this) {
f32 sp30[3];
f32 sp24[3];
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
player_getPosition(sp30);
sp24[0] = this->position[0];
sp24[1] = this->position[1];
@@ -421,7 +421,7 @@ void lair_func_8038F924(Actor *this) {
local->unk0 = 0;
local->unk4 = 0;
local->unk8 = (func_8038ECA8(this->marker)) ? 0xff : 1;
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
for(phi_v1 = 0; phi_v1 < sp64; phi_v1 ++){
local->unk4++;
local->unk0 |= (1 << func_8038F0EC(this));
@@ -473,8 +473,8 @@ void lair_func_8038F924(Actor *this) {
func_8038EDBC(this);
switch(this->state){
case 1://L8038FCD0
if (!this->is_first_encounter && (!func_8028F20C() || !func_8028FB48(0x08000000))) {
this->is_first_encounter = TRUE;
if (!this->has_met_before && (!func_8028F20C() || !func_8028FB48(0x08000000))) {
this->has_met_before = TRUE;
}
if (func_80329530(this, 300)) {
if ((this->unkF4_8 == 0xA) && !fileProgressFlag_get(FILEPROG_F6_SEEN_DOOR_OF_GRUNTY_PUZZLE_PODIUM)) {
@@ -486,7 +486,7 @@ void lair_func_8038F924(Actor *this) {
func_8035644C(FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT);
}
}
if (func_8038ECA8(this->marker) && this->is_first_encounter && !func_8038EB58(this) && (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)) {
if (func_8038ECA8(this->marker) && this->has_met_before && !func_8038EB58(this) && (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)) {
func_8038F350(this, 2);
}
break;

4
src/lair/code_9C40.c
View File

@@ -91,11 +91,11 @@ void func_803902B8(Actor *this) {
sp54 = this->marker->id - 0x16D;
if (!this->initialized) {
marker_setFreeMethod(this->marker, func_80390298);
this->is_first_encounter = volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE);
this->has_met_before = volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE);
this->initialized = TRUE;
}
_player_getPosition(sp5C);
sp58 = func_80259384(this->position, sp5C, 1750.0f) && !this->is_first_encounter;
sp58 = func_80259384(this->position, sp5C, 1750.0f) && !this->has_met_before;
if (sp58 && !this->unk38_0) {
func_8032BB88(this, 0, 0x1F4);
func_8025A6EC(COMUSIC_79_CHEATO, 0);

2
src/lair/code_A4A0.c
View File

@@ -56,7 +56,7 @@ void func_80390890(ActorMarker *marker, ActorMarker *other_marker) {
func_8030E878(SFX_C2_GRUBLIN_EGH, local->unkC_27*0.1 + 0.8, 32000, this->position, 1250.0f, 2500.0f);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
actor_collisionOff(this);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
void func_80390994(Actor *this) {

4
src/lair/code_AD70.c
View File

@@ -263,9 +263,9 @@ void func_80391B04(Actor *this) {
func_80391810(this, 2);
}
}
if ((local->unk8 < this->position[1]) && !this->is_first_encounter) {
if ((local->unk8 < this->position[1]) && !this->has_met_before) {
FUNC_8030E8B4(SFX_14E_SOFT_EXPLOSION, 1.0f, 20000, this->position, 1500, 3000);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
break;
case 3:

4
src/lair/code_C1C0.c
View File

@@ -104,8 +104,8 @@ void func_80392918(Actor *this) {
return;
}
func_80326224(this);
if ((this->unk48 > 0.5) && !this->is_first_encounter) {
this->is_first_encounter = TRUE;
if ((this->unk48 > 0.5) && !this->has_met_before) {
this->has_met_before = TRUE;
ncStaticCamera_setToNode(0x1E);
}
if ((0.999 < this->unk48) && !this->unk38_0) {