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

Merge branch 'mr-origin-73'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:47:15 -05:00
parent 0d83006835 692cfe0ee0
commit 68676056d2
32 changed files with 129 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,7 @@ void chBrentilda_update(Actor *this) {
if (sp74 < 0xFF) {
sp74 = (sp74 + 0xC < 0xFF) ? sp74 + 0xC : 0xFF;
if (!this->is_first_encounter) {
func_8025A70C(COMUSIC_81_ACTIVATING_BRENTILDA);
comusic_playTrack(COMUSIC_81_ACTIVATING_BRENTILDA);
func_80324D2C(1.0f, COMUSIC_81_ACTIVATING_BRENTILDA);
this->is_first_encounter = TRUE;
this->unk138_23 = FALSE;
@@ -156,7 +156,7 @@ void chBrentilda_update(Actor *this) {
if (sp74 >= 0x41) {
sp74 = (sp74 - 0xC >= 0x41) ? sp74 - 0xC : 0x40;
if (!this->unk138_23) {
func_8025A70C(COMUSIC_8B_DEACTIVATE_BRENTILDA);
comusic_playTrack(COMUSIC_8B_DEACTIVATE_BRENTILDA);
func_80324D2C(1.0f, COMUSIC_8B_DEACTIVATE_BRENTILDA);
this->unk138_23 = TRUE;
this->is_first_encounter = FALSE;

14
src/lair/code_5ED0.c
View File

@@ -1010,7 +1010,7 @@ void func_8038D670(enum FF_Action next_state) {
if (fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE) == 0) {
func_8025A55C(0, 0x1388, 0xB);
func_8025AB00();
func_8025A70C(JINGLE_DOOR_OF_GRUNTY_OPENED);
comusic_playTrack(JINGLE_DOOR_OF_GRUNTY_OPENED);
fileProgressFlag_set(FILEPROG_A6_FURNACE_FUN_COMPLETE, TRUE);
volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, FALSE);
volatileFlag_set(VOLATILE_FLAG_A6_FF_FOUND_HONEYCOMB, TRUE);
@@ -1178,23 +1178,23 @@ void lair_func_8038E0B0(void) {
if (D_8037DCB8->unk11) {
switch(sp38){
case FFTT_6_SKULL://L8038E26C
func_8025A70C(COMUSIC_7B_STEP_ON_SKULL_TILE);
comusic_playTrack(COMUSIC_7B_STEP_ON_SKULL_TILE);
break;
case FFTT_5_GRUNTY://L8038E280
func_8025A70C(COMUSIC_7C_STEP_ON_GRUNTY_TILE);
comusic_playTrack(COMUSIC_7C_STEP_ON_GRUNTY_TILE);
break;
case FFTT_1_BANJO://L8038E294
func_8025A70C(COMUSIC_7D_STEP_ON_BK_TILE);
comusic_playTrack(COMUSIC_7D_STEP_ON_BK_TILE);
break;
case FFTT_7_JOKER://L8038E2A8
func_8025A70C(COMUSIC_7E_STEP_ON_MINIGAME_TILE);
comusic_playTrack(COMUSIC_7E_STEP_ON_MINIGAME_TILE);
break;
case FFTT_3_MUSIC://L8038E2BC
func_8025A70C(COMUSIC_7F_STEP_ON_JOKER_TILE);
comusic_playTrack(COMUSIC_7F_STEP_ON_JOKER_TILE);
break;
case FFTT_2_PICTURE://L8038E2D0
@@ -1261,7 +1261,7 @@ void lair_func_8038E0B0(void) {
func_8038D670(8);
}
} else {
func_8025A70C(COMUSIC_2C_BUZZER);
comusic_playTrack(COMUSIC_2C_BUZZER);
}
}
}

12
src/lair/code_86F0.c
View File

@@ -311,7 +311,7 @@ void func_8038F350(Actor *this, s32 next_state){
case 8: //L8038F4AC
if (local->unk4 > 0) {
func_8025A70C(SFX_REMOVE_JIGGY);
comusic_playTrack(SFX_REMOVE_JIGGY);
this->lifetime_value = 1.0f;
temp_s1 = func_8038F0EC(this);
func_8038F1EC(this, temp_s1, 0);
@@ -324,7 +324,7 @@ void func_8038F350(Actor *this, s32 next_state){
case 5: //L8038F550
if (local->unk4 < func_8038EB24(this)) {
func_8025A70C(COMUSIC_67_INSERTING_JIGGY);
comusic_playTrack(COMUSIC_67_INSERTING_JIGGY);
this->lifetime_value = 1.0f;
local->unk4++;
temp_s1 = func_8038F0EC(this);
@@ -344,7 +344,7 @@ void func_8038F350(Actor *this, s32 next_state){
else{
sp4C = item_getCount(ITEM_26_JIGGY_TOTAL);
}
func_8025A70C(COMUSIC_67_INSERTING_JIGGY);
comusic_playTrack(COMUSIC_67_INSERTING_JIGGY);
this->lifetime_value = 1.0f;
for(phi_s0 = 0; phi_s0 < sp4C; phi_s0++){
local->unk4++;
@@ -359,7 +359,7 @@ void func_8038F350(Actor *this, s32 next_state){
break;
case 7: //L8038F724
func_8025A70C(COMUSIC_65_WORLD_OPENING_B);
comusic_playTrack(COMUSIC_65_WORLD_OPENING_B);
if (this->unkF4_8 == 1) {
func_80324DBC(1.0f, 0xF7E, 4, NULL, this->marker, func_8038F0C0, NULL);
} else if (this->unkF4_8 == 0xA) {
@@ -390,7 +390,7 @@ void lair_func_8038F894(Actor *this, s32 arg1) {
func_8038F350(this, arg1);
return;
}
func_8025A70C(COMUSIC_2C_BUZZER);
comusic_playTrack(COMUSIC_2C_BUZZER);
if (fileProgressFlag_get(FILEPROG_DE_USED_ALL_YOUR_PUZZLE_PIECES) != 0) {
func_8038F350(this, 1);
return;
@@ -503,7 +503,7 @@ void lair_func_8038F924(Actor *this) {
if (local->unk4) {
func_8038F350(this, 8);
} else {
func_8025A70C(COMUSIC_2C_BUZZER);
comusic_playTrack(COMUSIC_2C_BUZZER);
func_8038F350(this, 1);
}
}

2
src/lair/code_C1C0.c
View File

@@ -65,7 +65,7 @@ void func_80392700(Actor *this) {
mapSpecificFlags_set(4, 0);
}
if (mapSpecificFlags_get(6)) {
func_8025A70C(COMUSIC_A8_KLUNGO_BY_FALLEN_GRUNTY);
comusic_playTrack(COMUSIC_A8_KLUNGO_BY_FALLEN_GRUNTY);
func_802BC280();
ncStaticCamera_setToNode(9);
mapSpecificFlags_set(9, 1);

2
src/lair/code_C6C0.c
View File

@@ -46,7 +46,7 @@ void func_80392B6C(Actor *this) {
}
if (mapSpecificFlags_get(7) != 0) {
sp28 = ml_distance_vec3f(this->position, this->unk1C) / 350.0;
func_8025A70C(COMUSIC_A9_TOOTY);
comusic_playTrack(COMUSIC_A9_TOOTY);
mapSpecificFlags_set(7, 0);
mapSpecificFlags_set(9, 1);
ncStaticCamera_setToNode(0x10);