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

Renaming gcdialog_showText function

Browse Source
This commit is contained in:
Nabnut
2024-09-19 12:32:04 +02:00
parent db8a200799
commit 6cf31d1df0
100 changed files with 386 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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){
func_80311480(ASSET_B39_TEXT_CONGA_HIT_BY_EGG, 4, actorPtr->position, 0, 0, 0);
gcdialog_showText(ASSET_B39_TEXT_CONGA_HIT_BY_EGG, 4, actorPtr->position, 0, 0, 0);
}
}
}
@@ -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
&& func_80311480(ASSET_B37_TEXT_CONGA_SAFE_UP_HERE, 0, 0, 0, 0, 0)
&& gcdialog_showText(ASSET_B37_TEXT_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->is_first_encounter){
if(func_80311480((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_TEXT_CONGA_MEET_AS_TERMITE : ASSET_B3C_TEXT_CONGA_MEET, 0, this->position, 0,0,0)){
this->is_first_encounter = 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);
func_80311480(ASSET_B38_TEXT_CONGA_DEFEAT, 0xe, this->position, this->marker, func_80387370, NULL);
gcdialog_showText(ASSET_B38_TEXT_CONGA_DEFEAT, 0xe, this->position, this->marker, func_80387370, NULL);
}
break;

2
src/MM/ch/jujuhitbox.c
View File

@@ -134,7 +134,7 @@ void func_80388E20(Actor *this){
&& !func_8028ECAC()
){
if( !this->is_first_encounter ){
if(func_80311480(ASSET_B44_TEXT_JUJU_MEET, 0, 0, 0, NULL, NULL)){
if(gcdialog_showText(ASSET_B44_TEXT_JUJU_MEET, 0, 0, 0, NULL, NULL)){
this->is_first_encounter = TRUE;
}
}

4
src/MM/ch/lmonkey.c
View File

@@ -96,7 +96,7 @@ void chLMonkey_update(Actor *this){
if (mapSpecificFlags_get(MM_SPECIFIC_FLAG_2_UNKNOWN)) {
subaddie_set_state(this, 4);
if (!jiggyscore_isCollected(JIGGY_9_MM_CHIMPY)) {
func_80311480(ASSET_B40_DIALOG_CHIMPY_COMPLETE, 0xE, this->position, this->marker, __chLMonkey_complete, NULL);
gcdialog_showText(ASSET_B40_DIALOG_CHIMPY_COMPLETE, 0xE, this->position, this->marker, __chLMonkey_complete, NULL);
}
else {//L803886E8
__chLMonkey_complete(this->marker, ASSET_B40_DIALOG_CHIMPY_COMPLETE, -1);
@@ -109,7 +109,7 @@ void chLMonkey_update(Actor *this){
&& !item_getCount(ITEM_19_ORANGE)
&& !this->is_first_encounter
) {
func_80311480(ASSET_B3F_DIALOG_CHIMPY_MEET, 0xe, this->position, NULL, NULL, NULL);
gcdialog_showText(ASSET_B3F_DIALOG_CHIMPY_MEET, 0xe, this->position, NULL, NULL, NULL);
this->is_first_encounter = TRUE;
}//L80388774
actor_loopAnimation(this);

2
src/MM/ch/orange.c
View File

@@ -30,7 +30,7 @@ f32 D_80389A00[3] = {0.0f, 0.0f, 0.0f};
void __chorange_collisionCallback(ActorMarker *marker, ActorMarker *other_marker) {
if (!player_isDead() &&
!mapSpecificFlags_get(MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE) &&
func_80311480(ASSET_B3A_TEXT_CONGA_HITS_PLAYER, 0, 0, 0, NULL, NULL)) {
gcdialog_showText(ASSET_B3A_TEXT_CONGA_HITS_PLAYER, 0, 0, 0, NULL, NULL)) {
mapSpecificFlags_set(MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE, TRUE);
}

4
src/MM/ch/orangepad.c
View File

@@ -55,7 +55,7 @@ void func_80386444(ActorMarker *marker) {
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
if (!jiggyscore_isCollected(JIGGY_8_MM_ORANGE_PADS)) {
func_80311480(0xB3B, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(0xB3B, 4, NULL, NULL, NULL, NULL);
}
}// L803865D8
@@ -106,7 +106,7 @@ void chorangepad_update(Actor *this) {
!mapSpecificFlags_get(MM_SPECIFIC_FLAG_6_UNKNOWN) &&
closest_actor->state != 3) {
if (func_80311480(0xb3d, 0, NULL, NULL, NULL, NULL)) {
if (gcdialog_showText(0xb3d, 0, NULL, NULL, NULL, NULL)) {
mapSpecificFlags_set(MM_SPECIFIC_FLAG_6_UNKNOWN, TRUE);
}
}