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

2
src/core2/ba/marker.c
View File

@@ -321,7 +321,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case 0x28: //L8028BF74
if( plyr_hitbox_type == HITBOX_6_WONDERWING){
func_8030E484(SFX_20_METAL_CLANK_1);
sfxsource_playHighPriority(SFX_20_METAL_CLANK_1);
}
else{
func_8030E6D4(SFX_65_METALLIC_SCRATCH);

2
src/core2/bs/bFly.c
View File

@@ -513,7 +513,7 @@ void func_802A4664(void){
func_80299E90();
next_state = bs_getNextState();
if(next_state == BS_20_LANDING || next_state == BS_24_FLY || next_state == BS_2D_SWIM_IDLE){
func_8030E484(SFX_3EA_UNKNOWN);
sfxsource_playHighPriority(SFX_3EA_UNKNOWN);
}
func_802A34C8();
func_8029E070(0);

2
src/core2/bs/bLongLeg.c
View File

@@ -58,7 +58,7 @@ int bslongleg_inSet(s32 move_indx){
void func_802A531C(void){
func_80299650(stateTimer_getPrevious(STATE_TIMER_2_LONGLEG), stateTimer_get(STATE_TIMER_2_LONGLEG));
if(stateTimer_isAt(STATE_TIMER_2_LONGLEG, 0.01f))
func_8030E484(SFX_3EB_UNKNOWN);
sfxsource_playHighPriority(SFX_3EB_UNKNOWN);
}
void func_802A5374(void){

4
src/core2/bs/bShock.c
View File

@@ -145,7 +145,7 @@ void bsbshock_init(void){
baphysics_set_horizontal_velocity(yaw_getIdeal(), baphysics_get_target_horizontal_velocity());
baphysics_set_vertical_velocity(D_80364A70);
baphysics_set_gravity(D_80364A74);
func_8030E484(SFX_E_SHOCKSPRING_BOING);
sfxsource_playHighPriority(SFX_E_SHOCKSPRING_BOING);
func_8029E064(1);
func_8029E070(1);
ability_use(9);
@@ -162,7 +162,7 @@ void bsbshock_update(void){
func_802B6FA8();
baphysics_get_velocity(sp20);
if(animctrl_isAt(aCtrl, 0.7f))
func_8030E484(SFX_53_BANJO_HUIII);
sfxsource_playHighPriority(SFX_53_BANJO_HUIII);
if(button_released(BUTTON_A) && 0.0f < sp20[1])
baphysics_reset_gravity();

4
src/core2/bs/bTrot.c
View File

@@ -123,7 +123,7 @@ void func_802A8AD8(void){
if(func_8029DFE0()){
func_8029E0DC(0);
if(miscFlag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE))
func_8030E484(0x3eb);
sfxsource_playHighPriority(0x3eb);
func_803219F4(1);
}
}else{
@@ -365,7 +365,7 @@ void bsbtrot_jump_init(void){
baphysics_set_horizontal_velocity(yaw_getIdeal(), baphysics_get_target_horizontal_velocity());
baphysics_set_vertical_velocity(D_80364ABC);
baphysics_set_gravity(D_80364AC0);
func_8030E484(SFX_48_KAZOOIE_RUUH);
sfxsource_playHighPriority(SFX_48_KAZOOIE_RUUH);
D_8037D3A4 = 0;
}

2
src/core2/bs/croc.c
View File

@@ -581,7 +581,7 @@ void bscroc_eat_bad_update(void){
}
if(animctrl_isAt(aCtrl, 0.6671f)){
func_8030E484(SFX_C6_SHAKING_MOUTH);
sfxsource_playHighPriority(SFX_C6_SHAKING_MOUTH);
}
if(animctrl_isStopped(aCtrl)){

2
src/core2/bs/jig.c
View File

@@ -71,7 +71,7 @@ void bsjig_jiggy_update(void){
}
if(animctrl_isAt(aCtrl, 0.94f))
func_8030E484(0x3ea);
sfxsource_playHighPriority(0x3ea);
if(animctrl_isStopped(aCtrl)){
if(D_8037D4B1)

4
src/core2/ch/bigbutt.c
View File

@@ -121,7 +121,7 @@ void func_802C6240(Actor *this){
this->marker->dieFunc = func_802C61C0;
this->marker->collisionFunc = func_802C60AC;
this->marker->collision2Func = func_802C6150;
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
this->unk16C_0 = 1;
this->initialized = TRUE;
return;
@@ -265,7 +265,7 @@ void func_802C6240(Actor *this){
subaddie_set_state_with_direction(this, 1, 0.65f, 1);
func_8030DA44(this->unk44_31);
this->unk44_31 = 0;
func_8030E484(SFX_19_BANJO_LANDING_08);
sfxsource_playHighPriority(SFX_19_BANJO_LANDING_08);
}
}//L802C6B1C
break;

2
src/core2/ch/bottlesbonuscursor.c
View File

@@ -320,7 +320,7 @@ void chBottlesBonusCursor_update(Actor *this) {
held_piece = &D_8037E248[D_8037E5C0.unk0];
held_piece->state = 2;
chBottlesBonusCursor_func_802DF928(D_8037E5C0.unk0);
func_8030E484(SFX_112_TINKER_ATTENTION);
sfxsource_playHighPriority(SFX_112_TINKER_ATTENTION);
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
}
}

8
src/core2/ch/crab.c
View File

@@ -239,7 +239,7 @@ void chCrab_update(Actor *this) {
marker_setCollisionScripts(this->marker, __chCrab_touch, __chCrab_ow, __chCrab_die);
func_803300C0(this->marker, &__chCrab_802CB76C);
this->unk124_0 = this->unk138_31 = FALSE;
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
this->volatile_initialized = TRUE;
animctrl_setTransitionDuration(this->animctrl, 0.25f);
if (map_get() == MAP_A_TTC_SANDCASTLE) {
@@ -273,7 +273,7 @@ void chCrab_update(Actor *this) {
gcdialog_showText(ASSET_D32_DIALOG_MUTANT_CRAB_MEET, 0xF, this->position, NULL, __chCrab_mutantTextCallback, NULL);
mapSpecificFlags_set(0, TRUE);
levelSpecificFlags_set(0xE, TRUE);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}
if (map_get() == MAP_A_TTC_SANDCASTLE) {
@@ -292,8 +292,8 @@ void chCrab_update(Actor *this) {
}
if (levelSpecificFlags_get(0xE)) {
if ((this->state != 8) && (this->state != 9)) {
subaddie_set_state_with_direction(this, (this->is_first_encounter) ? 8 : 9, 0.0f, 1);
this->is_first_encounter = FALSE;
subaddie_set_state_with_direction(this, (this->has_met_before) ? 8 : 9, 0.0f, 1);
this->has_met_before = FALSE;
}
}

4
src/core2/ch/gameSelect.c
View File

@@ -454,7 +454,7 @@ void func_802C4C14(Actor *this){
break;
case 2://L802C5364
timedFunc_set_2(0.15f, (GenFunction_2)sfxsource_play, SFX_32_BANJO_EGHEE, 28000);
sfxsource_play(SFX_3F6_UNKNOWN, 28000);
sfxsource_play(SFX_3F6_RUBBING, 28000);
func_8030E540(SFX_8F_SNOWBALL_FLYING);
break;
}//L802C5394
@@ -462,7 +462,7 @@ void func_802C4C14(Actor *this){
levelSpecificFlags_set(sp84 + 0x35, 1);
}
else{//L802C53B4
func_8030E484(SFX_3EA_UNKNOWN);
sfxsource_playHighPriority(SFX_3EA_UNKNOWN);
subaddie_set_state(this, 3);
}
}else{//L802C53D0

6
src/core2/ch/mole.c
View File

@@ -163,9 +163,9 @@ void chmole_healthRefill(ActorMarker *marker, enum asset_e arg1, s32 arg2){
gcdialog_showText(chmole_learnedAllGameAbilities()? 0xa87 : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL);
}
else{//L802D97BC
if(actor->is_first_encounter){
if(actor->has_met_before){
func_80347A14(1);
actor->is_first_encounter = FALSE;
actor->has_met_before = FALSE;
}
timed_exitStaticCamera(0.0f);
if(actor->state == 5){
@@ -229,7 +229,7 @@ int chmole_learnAbility(Actor *this){
// New Ability: Learn Dialog & Misc Actions
else{
func_80347A14(0);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
sp2C = moleTable[this->unkF4_8-9].learn_text;
ability_unlock(moleTable[this->unkF4_8-9].ability);
switch(moleTable[this->unkF4_8-9].ability){

4
src/core2/ch/snacker.c
View File

@@ -79,12 +79,12 @@ static void __chsnacker_start_dialog(Actor *this) {
this->actor_specific_1_f = 0.0f;
if (level_get() == LEVEL_2_TREASURE_TROVE_COVE) {
text_index = mapSpecificFlags_getN(8, 3);
if( !this->is_first_encounter ) {
if( !this->has_met_before ) {
if(text_index < 4) {
if(gcdialog_showText(0xA1B + text_index, 0, NULL, NULL, NULL, NULL)){
text_index++;
mapSpecificFlags_setN(8, text_index, 3);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}
}

6
src/core2/ch/termite.c
View File

@@ -146,7 +146,7 @@ void __chTermite_testCallback(ActorMarker *caller, enum asset_e text_id, s32 arg
Actor *this;
this = marker_getActor(caller);
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
levelSpecificFlags_set(0xd, FALSE);
}
@@ -159,7 +159,7 @@ void chTermite_update(Actor *this) {
if (!this->volatile_initialized) {
marker_setCollisionScripts(this->marker, NULL, __chTermite_ow, __chTermite_die);
this->unk124_0 = this->unk138_31 = FALSE;
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
this->unk16C_0 = TRUE;
this->volatile_initialized = TRUE;
}
@@ -173,7 +173,7 @@ void chTermite_update(Actor *this) {
gcdialog_showText(ASSET_B43_DIALOG_TERMITE_MEET_AS_BEAR, 7, this->position, this->marker, __chTermite_testCallback, NULL);
mapSpecificFlags_set(0, TRUE);
levelSpecificFlags_set(0xD, TRUE);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
if( func_80329530(this, 300)

14
src/core2/code_4A6F0.c
View File

@@ -160,7 +160,7 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
break;
case ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE: //L802D1A98
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
if(this->unk38_31 != 0){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, -this->unk38_31);
@@ -249,7 +249,7 @@ void chMumbo_update(Actor *this) {
}
this->unk38_0 = (item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->unk38_31);
this->unk10_12 = 0;
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
this->volatile_initialized = TRUE;
}
@@ -273,7 +273,7 @@ void chMumbo_update(Actor *this) {
case 2: //L802D1F90
if (actor_animationIsAt(this, 0.25f) != 0) {
func_8030E484(0x41);
sfxsource_playHighPriority(0x41);
}
actor_playAnimationOnce(this);
if (actor_animationIsAt(this, 0.999f)) {
@@ -333,7 +333,7 @@ void chMumbo_update(Actor *this) {
) {
gcdialog_showText(ASSET_DAE_DIALOG_MUMBO_TREX_START, 6, NULL, this->marker, __chMumbo_textCallback, NULL);
fileProgressFlag_set(FILEPROG_BA_HAS_SEEN_TREX_TEXT, 1);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
subaddie_set_state(this, 3);
} else if (
sp44
@@ -385,7 +385,7 @@ void chMumbo_update(Actor *this) {
}
if (actor_animationIsAt(this, 0.01f)) {
if ( this->is_first_encounter
if ( this->has_met_before
|| (this->unk10_12 == 0
&& (player_getTransformation() != TRANSFORM_1_BANJO)
&& (player_getTransformation() != TRANSFORM_7_WISHWASHY))
@@ -407,7 +407,7 @@ void chMumbo_update(Actor *this) {
func_8025A58C(-1, 1000);
}
if (actor_animationIsAt(this, 0.999f)) {
if (!this->is_first_encounter) {
if (!this->has_met_before) {
func_8028F918(0);
}
func_8025A7DC(COMUSIC_1D_MUMBO_TRANSFORMATION);
@@ -416,7 +416,7 @@ void chMumbo_update(Actor *this) {
chMumbo_func_802D1B8C(this, D_8037DDF0);
break;
}
if (this->is_first_encounter) {
if (this->has_met_before) {
subaddie_set_state(this, 3);
gcdialog_showText(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 6, NULL, this->marker, __chMumbo_textCallback, NULL);
break;

4
src/core2/code_53A10.c
View File

@@ -67,7 +67,7 @@ void func_802DAA14(Actor *this){
return;
}
if(!this->is_first_encounter){
if(!this->has_met_before){
if(level_get() == LEVEL_A_MAD_MONSTER_MANSION){
text_id = 0xadc;
}
@@ -79,6 +79,6 @@ void func_802DAA14(Actor *this){
text_id = tmp;
}
gcdialog_showText(text_id, 4, NULL, this->marker, func_802DA9A0, NULL);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}

2
src/core2/code_85800.c
View File

@@ -838,7 +838,7 @@ int func_8030E3FC(u8 indx){
}
}
void func_8030E484(enum sfx_e uid){
void sfxsource_playHighPriority(enum sfx_e uid){
func_8030D6C4(uid, 1.0f, 22000, 0, 2);
}

6
src/core2/code_935F0.c
View File

@@ -104,7 +104,7 @@ void func_8031A678(Actor *this){
void __chMinigame_textCallback1(ActorMarker *marker, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(marker);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
void __chMinigame_transformToCroc(ActorMarker *marker, enum asset_e text_id, s32 arg2){
@@ -164,7 +164,7 @@ void chMinigame_update(Actor *this){
func_8028FAB0(this->position);
this->unk1C[0] = 0.0f; this->unk1C[1] = this->yaw; this->unk1C[2] = 0.0f;
func_8028FAEC(this->unk1C);
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
if(this->unk10_12 >= 7){
marker_despawn(this->marker);
return;
@@ -177,7 +177,7 @@ void chMinigame_update(Actor *this){
if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){
switch(this->state){
case MINIGAME_STATE_1_INTRODUCE_GAME://L8031AB2C
if(this->is_first_encounter)
if(this->has_met_before)
__chMinigame_setState(this, MINIGAME_STATE_2_IN_PROGESS);
break;
case MINIGAME_STATE_2_IN_PROGESS://L8031AB50

2
src/core2/code_9E370.c
View File

@@ -883,7 +883,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
suLastBaddie->unk14C[0] = NULL;
suLastBaddie->unk14C[1] = NULL;
suLastBaddie->unk138_27 = 0;
suLastBaddie->is_first_encounter = FALSE;
suLastBaddie->has_met_before = FALSE;
suLastBaddie->unk138_23 = 0;
suLastBaddie->unk138_22 = 0;
suLastBaddie->unk138_21 = 0;

8
src/core2/code_DA760.c
View File

@@ -46,21 +46,21 @@ void func_80361870(Actor *this){
this->volatile_initialized = TRUE;
}
if(!this->is_first_encounter && func_80329530(this, 400) && !func_80329530(this, 50)){
if(!this->has_met_before && func_80329530(this, 400) && !func_80329530(this, 50)){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_31_MM_OPEN) && level_get() == LEVEL_6_LAIR){
text_id = fileProgressFlag_get(FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT)? 0xF80 : 0xF7F;
if(gcdialog_showText(text_id, 0, 0, 0, 0, 0)){
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}
else if(func_803616F0(this)){
sp28 = (volatileFlag_get(VOLATILE_FLAG_16)?0xf6e:0xf68) + this->unkF4_8 - 1;
if(!volatileFlag_get(VOLATILE_FLAG_16) && level_get() == LEVEL_6_LAIR){
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
else{
if(gcdialog_showText(sp28, 0, 0, 0, 0, 0)){
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
volatileFlag_set(VOLATILE_FLAG_16, 0);
}
}

2
src/core2/fx/honeycarrierscore.c
View File

@@ -233,7 +233,7 @@ void fxhoneycarrierscore_update(s32 arg0, struct8s *arg1){
timedFunc_set_2(0.25f, (GenFunction_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
item_adjustByDiffWithHud(ITEM_14_HEALTH, 0);
timedFunc_set_1(1.25f, (GenFunction_1)item_inc, ITEM_15_HEALTH_TOTAL);
timedFunc_set_1(1.25f, (GenFunction_1)func_8030E484, SFX_3EA_UNKNOWN);
timedFunc_set_1(1.25f, (GenFunction_1)sfxsource_playHighPriority, SFX_3EA_UNKNOWN);
timedFunc_set_2(1.25f, (GenFunction_2)item_set, ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL)+1);
timedFunc_set_1(1.5f, (GenFunction_1)gcpausemenu_80314AC8, 1);
}