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

chore: replace \*_TEXT with \*_DIALOG

Browse Source
This commit is contained in:
Bl00D4NGEL
2024-10-15 20:14:46 +02:00
parent d1b41e109d
commit 916e83bf65
48 changed files with 390 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/MM/ch/conga.c
View File

@@ -140,7 +140,7 @@ void func_80387168(ActorMarker *marker, ActorMarker *other_marker){
){
func_8038708C(actorPtr, 2);
if(actorPtr->unk38_31 == 1){
gcdialog_showText(ASSET_B39_TEXT_CONGA_HIT_BY_EGG, 4, actorPtr->position, 0, 0, 0);
gcdialog_showText(ASSET_B39_DIALOG_CONGA_HIT_BY_EGG, 4, actorPtr->position, 0, 0, 0);
}
}
}
@@ -150,12 +150,12 @@ void func_80387168(ActorMarker *marker, ActorMarker *other_marker){
int func_803872EC(void){
s32 text_id = func_803114C4();
return text_id == ASSET_B37_TEXT_CONGA_SAFE_UP_HERE
|| text_id == ASSET_B38_TEXT_CONGA_DEFEAT
return text_id == ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE
|| text_id == ASSET_B38_DIALOG_CONGA_DEFEAT
|| volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)
|| text_id == ASSET_B3B_TEXT_CONGA_ORANGE_PAD_JIGGY
|| text_id == ASSET_B45_TEXT_JIGGY_COLLECT_10
|| text_id == ASSET_B51_TEXT_BOTTLES_HOW_TO_EXIT_LEVEL;
|| text_id == ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY
|| text_id == ASSET_B45_DIALOG_JIGGY_COLLECT_10
|| text_id == ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL;
}
void func_80387370(ActorMarker *this, enum asset_e text_id, s32 arg2){
@@ -249,14 +249,14 @@ void func_803876D0(Actor *this){
sp3C = func_80329530(this, 1000);
if( func_8032A9E4(((ActorLocal_Conga *)&this->local)->unk10, ((ActorLocal_Conga *)&this->local)->unk18, ((ActorLocal_Conga *)&this->local)->unk1C)
&& !this->unk138_23
&& gcdialog_showText(ASSET_B37_TEXT_CONGA_SAFE_UP_HERE, 0, 0, 0, 0, 0)
&& gcdialog_showText(ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE, 0, 0, 0, 0, 0)
){
this->unk138_23 = 1;
mapSpecificFlags_set(MM_SPECIFIC_FLAG_A_UNKNOWN, TRUE);
}//L803878F8
if( sp3C && !this->has_met_before){
if(gcdialog_showText((player_getTransformation()== TRANSFORM_2_TERMITE) ? ASSET_B3E_TEXT_CONGA_MEET_AS_TERMITE : ASSET_B3C_TEXT_CONGA_MEET, 0, this->position, 0,0,0)){
if(gcdialog_showText((player_getTransformation()== TRANSFORM_2_TERMITE) ? ASSET_B3E_DIALOG_CONGA_MEET_AS_TERMITE : ASSET_B3C_DIALOG_CONGA_MEET, 0, this->position, 0,0,0)){
this->has_met_before = TRUE;
}
} //L80387968
@@ -348,7 +348,7 @@ void func_803876D0(Actor *this){
actor_playAnimationOnce(this);
if(actor_animationIsAt(this, 0.99f)){
subaddie_set_state_with_direction(this, 3, 0.0f, 1);
gcdialog_showText(ASSET_B38_TEXT_CONGA_DEFEAT, 0xe, this->position, this->marker, func_80387370, NULL);
gcdialog_showText(ASSET_B38_DIALOG_CONGA_DEFEAT, 0xe, this->position, this->marker, func_80387370, NULL);
}
break;