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

43
src/SM/ch/attacktutorial.c
View File

@@ -73,10 +73,10 @@ void chAttackTutorial_setState(Actor * this, s32 arg1){
case 5:
if(this->unk10_12 == 0){
ability_unlock(ABILITY_4_CLAW_SWIPE);
func_80311480(0xDFF, 0xE, this->unk1C, this->marker, func_80387288, func_80387258);
gcdialog_showText(ASSET_DFF_TEXT_BOTTLES_CLAW_SWIPE_LEARN, 0xE, this->unk1C, this->marker, func_80387288, func_80387258);
}
else{
func_80311480((this->unk10_12 == 1) ? 0xe15 : 0xe17, 0xE, this->unk1C, this->marker, func_80387288, NULL);
gcdialog_showText((this->unk10_12 == 1) ? ASSET_E15_TEXT_UNKNOWN : ASSET_E17_TEXT_UNKNOWN, 0xE, this->unk1C, this->marker, func_80387288, NULL);
}
break;
case 2://L803873E0
@@ -185,35 +185,36 @@ void func_80387764(ActorMarker * marker){
sp2C = 0xE;
}
switch (actor->unk10_12)
{
case 0x1: //L803877D8
sp34 = temp_a2 ? 0xe15 : 0xe14; //dialog enums
break;
switch (actor->unk10_12) {
case 0x1: //L803877D8
sp34 = temp_a2 ? ASSET_E15_TEXT_UNKNOWN : ASSET_E14_TEXT_UNKNOWN; //dialog enums
break;
case 0x2: //L803877F4
sp34 = temp_a2 ? 0xe17 : 0xe16; //dialog enums
break;
case 0x2: //L803877F4
sp34 = temp_a2 ? ASSET_E17_TEXT_UNKNOWN : ASSET_E16_TEXT_UNKNOWN; //dialog enums
break;
case 3: //L80387810
sp34 = temp_a2 ? 0xe19 : 0xe18; //dialog enums
break;
default:
//sp34 = actor->unk38_31;
break;
case 3: //L80387810
sp34 = temp_a2 ? ASSET_E19_TEXT_UNKNOWN : ASSET_E18_TEXT_UNKNOWN; //dialog enums
break;
default:
//sp34 = actor->unk38_31;
break;
}//L8038782C
if(sp34 == 0xe19){
if (sp34 == ASSET_E19_TEXT_UNKNOWN) {
func_8028F94C(2, actor->unk1C);
}
//L80387848
if(!mapSpecificFlags_get(3) && chmole_learnedAllSpiralMountainAbilities() && temp_a2){
if (!mapSpecificFlags_get(3) && chmole_learnedAllSpiralMountainAbilities() && temp_a2) {
mapSpecificFlags_set(3, 1);
sp34 = 0xE12;
sp34 = ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES;
}//L80387898
if(temp_a2){
if (temp_a2) {
timed_setStaticCameraToNode(0.0f, 6);
}//L803878B0
func_80311480(sp34, sp2C, actor->unk1C, actor->marker, func_80387690, NULL);
gcdialog_showText(sp34, sp2C, actor->unk1C, actor->marker, func_80387690, NULL);
actor->unk38_31++;
}

12
src/SM/code_2990.c
View File

@@ -213,7 +213,7 @@ void func_803892C8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
actor = marker_getActor(marker);
if(!mapSpecificFlags_get(3) && chmole_learnedAllSpiralMountainAbilities()){
mapSpecificFlags_set(3, 1);
func_80311480(ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, func_803892C8, NULL);
gcdialog_showText(ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, func_803892C8, NULL);
}//L8038933C
else{
if(!(text_id == ASSET_DF3_TEXT_BOTTLES_INTRODUCTION
@@ -225,7 +225,7 @@ void func_803892C8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
case ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED:
break;
case ASSET_DF3_TEXT_BOTTLES_INTRODUCTION: /* 2FB8 803893A8 3C188039 */
func_80311480(ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER, 0x8e, actor->position, actor->marker, func_803892C8, __chsmmole_additionalAbilityLearnActions);
gcdialog_showText(ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER, 0x8e, actor->position, actor->marker, func_803892C8, __chsmmole_additionalAbilityLearnActions);
break;
case ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER: /* 2FEC 803893DC 9209003B */
@@ -249,7 +249,7 @@ void func_803892C8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
default:
if(actor->state != 5)
func_80311480(ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED, 4, NULL, NULL, NULL, NULL);
func_80388FA0(actor, actor->state == 5 ? 1:4);
break;
@@ -363,7 +363,7 @@ void chsmmole_80389610(Actor * this){
break;
}//L80389904
if(sp2C){
func_80311480(sp2C, sp28, this->position, this->marker, func_803892C8, __chsmmole_additionalAbilityLearnActions);
gcdialog_showText(sp2C, sp28, this->position, this->marker, func_803892C8, __chsmmole_additionalAbilityLearnActions);
}
}
@@ -567,13 +567,13 @@ void chsmmole_Update(Actor * this){
if( user_input != -1){ //button was pressed
fileProgressFlag_set(FILEPROG_DB_SKIPPED_TUTORIAL, (user_input)?0:1);
func_80311480((user_input)? 0xe07 : 0xe09, 0xe, this->position, this->marker, func_803892C8, __chsmmole_additionalAbilityLearnActions);
gcdialog_showText((user_input)? 0xe07 : 0xe09, 0xe, this->position, this->marker, func_803892C8, __chsmmole_additionalAbilityLearnActions);
if(!user_input){
chsmmole_skipIntroTutorial(); //give all SM moves
}
this->unk38_0 = 0;
}else if(!this->is_first_encounter && 5.0 < this->lifetime_value){
func_80311480(0xe1d, 0x86, this->position, this->marker, func_803892C8, NULL);
gcdialog_showText(0xe1d, 0x86, this->position, this->marker, func_803892C8, NULL);
this->is_first_encounter = TRUE;
}
}

10
src/SM/code_4070.c
View File

@@ -43,7 +43,7 @@ void func_8038A4DC(Actor *this, s32 arg1){
}else{//L8038A560
func_8038A460(this);
ability_unlock(ABILITY_A_HOLD_A_JUMP_HIGHER);
func_80311480(0xdf6, 0xe, this->unk1C, this->marker, func_8038A488, NULL);
gcdialog_showText(0xdf6, 0xe, this->unk1C, this->marker, func_8038A488, NULL);
this->sm_4070.unk0 = 0xe1a;
mapSpecificFlags_set(8, 0);
}
@@ -95,7 +95,7 @@ void SM_func_8038A5D8(Actor *this){
if(mapSpecificFlags_get(8)){
func_8038A460(this);
ability_unlock(ABILITY_7_FEATHERY_FLAP);
func_80311480(0xdf7, 0xa, this->unk1C, this->marker, func_8038A488, NULL);
gcdialog_showText(0xdf7, 0xa, this->unk1C, this->marker, func_8038A488, NULL);
this->sm_4070.unk0 = 0xe1b;
mapSpecificFlags_set(8,0);
}//L8038A730
@@ -103,7 +103,7 @@ void SM_func_8038A5D8(Actor *this){
if(mapSpecificFlags_get(9)){
func_8038A460(this);
ability_unlock(ABILITY_8_FLAP_FLIP);
func_80311480(0xdf8, 0xa, this->unk1C, this->marker, func_8038A488, NULL);
gcdialog_showText(0xdf8, 0xa, this->unk1C, this->marker, func_8038A488, NULL);
this->sm_4070.unk0 = 0xe1c;
mapSpecificFlags_set(9,0);
}//L8038A794
@@ -119,7 +119,7 @@ void SM_func_8038A5D8(Actor *this){
temp_a0 = 0xdf9;
}
func_80311480(temp_a0, 0xe, this->unk1C, this->marker, func_8038A488, NULL);
gcdialog_showText(temp_a0, 0xe, this->unk1C, this->marker, func_8038A488, NULL);
mapSpecificFlags_set(0xa,0);
this->sm_4070.unk0 = 0;
}
@@ -133,7 +133,7 @@ void SM_func_8038A5D8(Actor *this){
&& func_8028F20C()
){
if(this->sm_4070.unk0)
func_80311480(temp_a0 = this->sm_4070.unk0, 0, NULL, NULL, NULL, NULL);
gcdialog_showText(temp_a0 = this->sm_4070.unk0, 0, NULL, NULL, NULL, NULL);
}
break;