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

4
src/GV/ch/gobi1.c
View File

@@ -176,13 +176,13 @@ void chGobi1_update(Actor *this){
}
if(this->state == 1 || this->state == 2){
if( !this->is_first_encounter
if( !this->has_met_before
&& func_80329530(this, 250)
&& !func_80329530(this, 80)
&& func_8028F2A0()
&& gcdialog_showText(0xa73, 0, NULL, NULL, NULL, NULL)
){
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}//L803877A4

4
src/GV/ch/gobi2.c
View File

@@ -200,11 +200,11 @@ void chGobi2_update(Actor *this){
}//L80388114
if(this->state == 2){
if(!this->is_first_encounter){
if(!this->has_met_before){
if(func_80329530(this, 0xFA) && !func_80329530(this, 0x50)){
if(func_8028F2A0()){
if(gcdialog_showText(ASSET_A75_TEXT_GOBI2_MEET, 0, this->position, NULL, NULL, NULL))
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}
}

14
src/GV/ch/mazectrl.c
View File

@@ -69,9 +69,9 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
item_set(ITEM_0_HOURGLASS_TIMER, 0xdd3);
item_set(ITEM_6_HOURGLASS, TRUE);
func_8038F520(1.0f);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.8f, 25000);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.7f, 25000);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.5f, 25000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.8f, 25000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.7f, 25000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.5f, 25000);
if(1500.0f < plyr_pos[0]){
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 8);
@@ -104,10 +104,10 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
}//L8038F850
if(next_state == 4){
FUNC_8030E624(SFX_3F6_UNKNOWN, 1.0f, 30000);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.8f, 29000);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.7f, 28000);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.5f, 31000);
FUNC_8030E624(SFX_3F6_RUBBING, 1.0f, 30000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.8f, 29000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.7f, 28000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.5f, 31000);
func_8030E6D4(SFX_52_BANJO_YAH_OH);
tmp_v0 = func_8034C528(400);
if(tmp_v0){

6
src/GV/ch/sarcophagus.c
View File

@@ -74,7 +74,7 @@ void chSarcophagus_update(Actor *this){
if(func_80329530(this, 500) && func_8038957C(this)){
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_RUBBING, 1.0f, 32000, this->position, 1250, 2500);
}
break;
@@ -96,7 +96,7 @@ void chSarcophagus_update(Actor *this){
if(!func_80329530(this, 700)){
subaddie_set_state_with_direction(this, 4, 0.5f, 1);
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_RUBBING, 1.0f, 32000, this->position, 1250, 2500);
}
break;
case 4: //L803897E4
@@ -134,7 +134,7 @@ void chSarcophagus_updateSNS(Actor *this){
if(this->unk1C[0] == 0.0f){
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 0.5f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 0.5f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_RUBBING, 0.5f, 32000, this->position, 1250, 2500);
}
}
else{//L803899C0

4
src/GV/ch/trunker.c
View File

@@ -69,13 +69,13 @@ void chTrucker_update(Actor *this){
}
}//L803891D8
if( this->state == 1
&& !this->is_first_encounter
&& !this->has_met_before
&& func_80329530(this, 250)
&& !func_80329530(this, 80)
&& func_8028F2A0()
){
gcdialog_showText(ASSET_A71_TEXT_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}//L80389254
if(this->state == 1 && mapSpecificFlags_get(0xC)){

8
src/GV/code_3630.c
View File

@@ -30,7 +30,7 @@ void func_80389A20(ActorMarker *caller, enum asset_e text_id, s32 arg2){
void func_80389A60(Actor *this){
gcdialog_showText(ASSET_A70_TEXT_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
subaddie_set_state(this, 5);
}
@@ -48,7 +48,7 @@ void func_80389ABC(Actor *this){
void func_80389B1C(Actor *this){
if(!this->volatile_initialized){
this->lifetime_value = (f32) func_8038E184();
this->is_first_encounter = jiggyscore_isCollected(JIGGY_43_GV_HISTUP) || mapSpecificFlags_get(0);
this->has_met_before = jiggyscore_isCollected(JIGGY_43_GV_HISTUP) || mapSpecificFlags_get(0);
this->unk138_23 = jiggyscore_isCollected(JIGGY_43_GV_HISTUP) || mapSpecificFlags_get(2);
this->volatile_initialized = TRUE;
}
@@ -62,9 +62,9 @@ void func_80389B1C(Actor *this){
animctrl_setTransitionDuration(this->animctrl, 0.15f);
if(this->state == 1 || this->state == 2){
if(! this->is_first_encounter && func_80329530(this, 250) && !func_80329530(this, 0x50)){
if(! this->has_met_before && func_80329530(this, 250) && !func_80329530(this, 0x50)){
gcdialog_showText(ASSET_A6F_TEXT_CHARMER_MEET, 0xe, this->position, NULL, NULL, NULL);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
mapSpecificFlags_set(0, TRUE);
}
}

4
src/GV/code_5570.c
View File

@@ -244,9 +244,9 @@ void GV_func_8038BEA0(Actor *this){
}
}
else{
if(!this->is_first_encounter){
if(!this->has_met_before){
if(gcdialog_showText(ASSET_A78_TEXT_GRABBA_MEET, 0, NULL, NULL, NULL, NULL)){
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}
}

10
src/GV/code_6370.c
View File

@@ -44,9 +44,9 @@ ActorInfo D_8039123C = { 0xBB, 0x287, 0x3E6,
void func_8038C760(Actor *this, s32 arg1){
ActorLocal_GV_6370 *local = (ActorLocal_GV_6370 *)&this->local;
chBuriedPyramid_setRaisedAmount(local->unk14, arg1);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.7f, 28000);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.9f, 29000);
FUNC_8030E624(SFX_3F6_UNKNOWN, 1.0f, 30000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.7f, 28000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.9f, 29000);
FUNC_8030E624(SFX_3F6_RUBBING, 1.0f, 30000);
timed_setStaticCameraToNode(0.0f, 8);
if(arg1 < 3){
timed_setStaticCameraToNode(3.5f, arg1 + 0x15);
@@ -95,7 +95,7 @@ void func_8038C8A0(Actor *this, s32 next_state){
local->unk18[2] = this->position_z;
if(this->state == 1){
rumbleManager_80250E94(0.0f, 0.6f, 1.0f, 0, 1.3f, 0.0f);
timed_playSfx(1.0f, SFX_3F6_UNKNOWN, 0.8f, 30000);
timed_playSfx(1.0f, SFX_3F6_RUBBING, 0.8f, 30000);
}
}//L8038CA6C
@@ -126,7 +126,7 @@ void func_8038C8A0(Actor *this, s32 next_state){
local->unk18[1] = this->position_y;
local->unk18[2] = this->position_z;
rumbleManager_80250D94(0.7f, 0.5f, 1.3f);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.8f, 30000);
FUNC_8030E624(SFX_3F6_RUBBING, 0.8f, 30000);
}
if(next_state == 8){

2
src/GV/matchinggame.c
View File

@@ -53,7 +53,7 @@ Struct_GV_9DB0_1 * func_803901A0(s32 arg0){
}
void func_803901F0(void *arg0){
FUNC_8030E624(SFX_3F6_UNKNOWN, 1.0f, 30000);
FUNC_8030E624(SFX_3F6_RUBBING, 1.0f, 30000);
}
void func_80390218(void *arg0){

6
src/GV/waterctrl.c
View File

@@ -29,9 +29,9 @@ void __waterCtrl_setState(s32 arg0){
func_80324E38(6.0f, 0);
tmp_v0 = func_8034C528(400);
if(tmp_v0){
func_8030E760(SFX_3F6_UNKNOWN, 0.7f, 28000);
func_8030E760(SFX_3F6_UNKNOWN, 0.9f, 29000);
func_8030E760(SFX_3F6_UNKNOWN, 1.0f, 30000);
func_8030E760(SFX_3F6_RUBBING, 0.7f, 28000);
func_8030E760(SFX_3F6_RUBBING, 0.9f, 29000);
func_8030E760(SFX_3F6_RUBBING, 1.0f, 30000);
func_8034DE60(tmp_v0, 0.0f, 400.0f, 2.5f, 1);
}
}