diff --git a/include/enums.h b/include/enums.h index f9b7a288..3c6078fc 100644 --- a/include/enums.h +++ b/include/enums.h @@ -3982,6 +3982,12 @@ enum asset_e ASSET_8A0_SPRITE_WATER_DROP = 0x8a0, + ASSET_A0B_TEXT_UNKNOWN = 0xA0B, + ASSET_A0C_TEXT_UNKNOWN = 0xA0C, + ASSET_A0D_TEXT_UNKNOWN = 0xA0D, + + ASSET_A14_TEXT_UNKNOWN = 0xA14, + ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED = 0xa17, ASSET_A1F_DIALOG_SHOCKJUMP_LEARN = VER_SELECT(0xa1f, 0x91f, 0, 0), @@ -3995,6 +4001,8 @@ enum asset_e ASSET_A27_TEXT_BOTTLES_ALL_TTC_MOVES_LEARNED, ASSET_A28_TEXT_LEAKY_DONE, + ASSET_A2A_TEXT_UNKNOWN = 0xA2A, + ASSET_A6F_TEXT_CHARMER_MEET = 0xA6F, ASSET_A70_TEXT_CHARMER_HELPED, ASSET_A71_TEXT_TRUNKER_MEET, @@ -4045,20 +4053,46 @@ enum asset_e ASSET_B4A_DIALOG_TALON_TROT_REFRESHER, ASSET_B4B_DIALOG_EGGS_REFRESHER, ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER, + ASSET_B4D_TEXT_UNKNOWN, ASSET_B4E_TEXT_BOTTLES_ALL_MM_MOVES_LEARNED = 0xB4E, ASSET_B51_TEXT_BOTTLES_HOW_TO_EXIT_LEVEL = 0xb51, + ASSET_B9F_TEXT_UNKNOWN = 0xb9f, + + ASSET_BFF_TEXT_UNKNOWN = 0xbff, + + ASSET_C01_TEXT_UNKNOWN = 0xc01, + ASSET_C02_TEXT_UNKNOWN, + + ASSET_C05_TEXT_UNKNOWN = 0xc05, + + ASSET_C08_TEXT_UNKNOWN = 0xc08, + ASSET_C09_TEXT_UNKNOWN, + ASSET_C0A_TEXT_UNKNOWN, + ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST = 0xc15, + ASSET_C17_TEXT_UNKNOWN = 0xC17, + ASSET_C18_TEXT_UNKNOWN, + ASSET_C19_TEXT_UNKNOWN, + ASSET_C1A_TEXT_UNKNOWN, + + ASSET_C1E_TEXT_UNKNOWN = 0xc1e, + ASSET_C1F_TEXT_UNKNOWN, + ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE = 0xC20, - ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN = 0xC21, - ASSET_C22_DIALOG_PRESENT_COLLECTIBLE_MEET_RED = 0xC22, + ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN, + ASSET_C22_DIALOG_PRESENT_COLLECTIBLE_MEET_RED, ASSET_C23_DIALOG_BEAKBOMB_LEARN, ASSET_C24_DIALOG_BEAKBOMB_REFRESHER, + ASSET_C26_TEXT_UNKNOWN = 0xc26, + ASSET_C27_TEXT_UNKNOWN, + ASSET_C2A_TEXT_BOTTLES_ALL_FP_GV_MOVES_LEARNED = 0xC2A, + ASSET_C2B_TEXT_UNKNOWN, ASSET_C63_TEXT_MR_VILE_INTRO = 0xC63, ASSET_C64_TEXT_MR_VILE_ROUND_1_START, @@ -4075,11 +4109,18 @@ enum asset_e ASSET_C6F_TEXT_MR_VILE_LOSE_ROUND_3_REMATCH, ASSET_C70_TEXT_MR_VILE_WIN_ROUND_2_REMATCH, ASSET_C71_TEXT_MR_VILE_WIN_ROUND_3_REMATCH, + ASSET_C72_TEXT_UNKNOWN, + + ASSET_C74_TEXT_UNKNOWN = 0xc74, + + ASSET_C76_TEXT_UNKNOWN = 0xc76, text_flibbits_meet = 0xc81, text_flibbits_defeat = 0xc82, text_flibbits_return = 0xc83, + ASSET_C86_TEXT_UNKNOWN = 0xc86, + ASSET_C88_DIALOG_LONGLEG_LEARN = 0xC88, ASSET_C89_DIALOG_LONGLEG_REFRESHER, ASSET_C8A_TEXT_BOTTLES_ALL_BGS_MOVES_LEARNED, @@ -4097,6 +4138,10 @@ enum asset_e ASSET_C97_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_3, ASSET_C98_TEXT_MR_VILE_GIVES_PRIZE, + ASSET_CC7_TEXT_UNKNOWN = 0xcc7, + + ASSET_D2B_TEXT_UNKNOWN = 0xd2b, + ASSET_D32_DIALOG_MUTANT_CRAB_MEET = 0xD32, ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT, ASSET_D34_TEXT_GLOOP_MEET, @@ -4147,16 +4192,16 @@ enum asset_e ASSET_DFA_TEXT_BOTTLES_JUMP_REFRESHER = 0xDFA, ASSET_DFB_TEXT_BOTTLES_DIVE_LEARN, - - ASSET_DFD_TEXT_BOTTLES_SWIM_LEARN = 0xDFD, + ASSET_DFC_TEXT_UNKNOWN, + ASSET_DFD_TEXT_BOTTLES_SWIM_LEARN, ASSET_DFE_TEXT_BOTTLES_DIVE_REFRESHER, ASSET_DFF_TEXT_BOTTLES_CLAW_SWIPE_LEARN, ASSET_E00_TEXT_BOTTLES_ATTACK_REFRESHER = 0xE00, ASSET_E01_TEXT_BOTTLES_CLIMB_LEARN, - - ASSET_E03_TEXT_BOTTLES_CLIMB_REFRESHER = 0xE03, + ASSET_E02_TEXT_UNKNOWN, + ASSET_E03_TEXT_BOTTLES_CLIMB_REFRESHER, ASSET_E04_TEXT_BOTTLES_BEAK_BARGE_LEARN, - + ASSET_E05_TEXT_UNKNOWN, ASSET_E06_TEXT_BOTTLES_BEAK_BARGE_REFRESHER = 0xE06, ASSET_E08_TEXT_BOTTLES_FIND_ANOTHER_MOLEHILL = 0xE08, @@ -4171,15 +4216,25 @@ enum asset_e ASSET_E11_TEXT_BOTTLES_BRIDGE_STILL_BROKEN, ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, + ASSET_E14_TEXT_UNKNOWN = 0xE14, + ASSET_E15_TEXT_UNKNOWN, + ASSET_E16_TEXT_UNKNOWN, + ASSET_E17_TEXT_UNKNOWN, + ASSET_E18_TEXT_UNKNOWN, + ASSET_E19_TEXT_UNKNOWN, + ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT = 0xE1D, ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER = VER_SELECT(0xE1F, 0xa61, 0, 0), ASSET_E20_DIALOG_BOTTLES_BONUS_NOT_READY, ASSET_E21_DIALOG_BOTTLES_BONUS_DISCOVERED, + ASSET_E24_TEXT_UNKNOWN = 0xE24, + ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER = VER_SELECT(0xE35, 0xa77, 0, 0), ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun + ASSET_E38_TEXT_UNKNOWN, ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0), @@ -4191,7 +4246,18 @@ enum asset_e ASSET_F64_DIALOG_NOTEDOORS_LEARN = 0xf64, ASSET_F65_DIALOG_NOTEDOORS_REFRESHER, + ASSET_F79_TEXT_UNKNOWN = 0xf79, + ASSET_F7A_TEXT_UNKNOWN, + + ASSET_FAD_TEXT_UNKNOWN = 0xfad, + + ASSET_FBE_TEXT_UNKNOWN = 0xfbe, + ASSET_FBF_TEXT_UNKNOWN, + ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1, + ASSET_10A2_TEXT_UNKNOWN, + + ASSET_10E7_TEXT_UNKNOWN = 0x10E7, ASSET_146B_MODEL_TTC_TREASURE_TROVE_COVE_OPA = 0x146B, ASSET_146C_MODEL_TTC_TREASURE_TROVE_COVE_XLU, diff --git a/include/functions.h b/include/functions.h index bf0a12cf..72c2ca22 100644 --- a/include/functions.h +++ b/include/functions.h @@ -541,7 +541,7 @@ void __spawnQueue_add_1(GenFunction_1, s32); void func_802FAD64(enum item_e); void nodeprop_getPosition(NodeProp *, f32[3]); -bool func_80311480(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)); +bool gcdialog_showText(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)); void ability_unlock(enum ability_e); extern void func_802EE278(Actor *, s32, s32, s32, f32, f32); diff --git a/manual_syms.pal.txt b/manual_syms.pal.txt index 4ad1b1c8..2c843d43 100644 --- a/manual_syms.pal.txt +++ b/manual_syms.pal.txt @@ -214,7 +214,7 @@ func_8030ED70 = 0x8030ef10; func_8030E394 = 0x8030e534; func_803012F8 = 0x803014d8; fxairscore_count_to_time = 0x80301f5c; -func_80311480 = 0x803116cc; +gcdialog_showText = 0x803116cc; gcpausemenu_80314AC8 = 0x80314e1c; func_8031B908 = 0x8031bce8; diff --git a/src/BGS/ch/code_2270.c b/src/BGS/ch/code_2270.c index 5951cbc0..73c7a4d6 100644 --- a/src/BGS/ch/code_2270.c +++ b/src/BGS/ch/code_2270.c @@ -142,17 +142,19 @@ void BGS_func_803888E4(Actor *this, s32 arg1){ if(this->state == 2){ skeletalAnim_set(this->unk148, ASSET_12B_ANIM_TIPTUP_IDLE, 1.0f, 9.0f); unqPtr->unkC = randf2(5.0f, 15.0f); - if(!this->is_first_encounter){ - this->is_first_encounter = TRUE; - if(unqPtr->unkA == 0){ - func_80311480(0xc72, 0xe, this->position, this->marker, func_80388784, 0); - }else{ - func_80311480(0xc74, 0xf, this->position, this->marker, func_80388784, 0); + if (!this->is_first_encounter) { + this->is_first_encounter = TRUE; + + if (unqPtr->unkA == 0) { + gcdialog_showText(ASSET_C72_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388784, 0); + } + else { + gcdialog_showText(ASSET_C74_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388784, 0); } } - else{ - func_80311480(D_80390854[unqPtr->unkA], 0xf, this->position, this->marker, func_80388784, 0); + else { + gcdialog_showText(D_80390854[unqPtr->unkA], 0xf, this->position, this->marker, func_80388784, 0); } } if(this->state == 3){ @@ -233,7 +235,7 @@ void func_80388E94(ActorMarker *this, s32 arg1){ thisActor = marker_getActor(this); unqPtr = (ActorLocal_BGS_2270 *)&thisActor->local; if((s32)unqPtr->unk0 >= (s32) vector_size(unqPtr->unk4)){ - if(!mapSpecificFlags_get(0) && func_80311480(0xc76, 0, 0, 0, 0, 0)) + if(!mapSpecificFlags_get(0) && gcdialog_showText(ASSET_C76_TEXT_UNKNOWN, 0, 0, 0, 0, 0)) mapSpecificFlags_set(0,1); }else{ tmp = (Struct_BGS_2270_0s *)vector_at(unqPtr->unk4, unqPtr->unk0); @@ -243,7 +245,7 @@ void func_80388E94(ActorMarker *this, s32 arg1){ else{ func_8028F55C(1, thisActor->marker); timedFunc_set_0(0.5f, BGS_func_80388760); - if(!mapSpecificFlags_get(1) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && func_80311480(0xc75, 0, NULL, NULL, NULL, NULL)) + if(!mapSpecificFlags_get(1) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && gcdialog_showText(0xc75, 0, NULL, NULL, NULL, NULL)) mapSpecificFlags_set(1,TRUE); } } @@ -340,7 +342,7 @@ void func_80389080(Actor *this){ if(this->state == 6){ if(ml_distance_vec3f(this->position, player_position) < 300.0f && !unqPtr->unk8){ unqPtr->unk8 = 1; - func_80311480(0xc7d, 4, 0, 0, 0, 0); + gcdialog_showText(0xc7d, 4, 0, 0, 0, 0); } } } diff --git a/src/BGS/ch/croctus.c b/src/BGS/ch/croctus.c index 114be9ca..350c93e5 100644 --- a/src/BGS/ch/croctus.c +++ b/src/BGS/ch/croctus.c @@ -143,7 +143,7 @@ void func_80387FD4(Actor *this){ func_8025A6EC(COMUSIC_2B_DING_B, 28000); //TODO ISSUE HERE if (this->unkF4_8 == 1) { func_8028F94C(2, this->position); - func_80311480(0xC86, 0xE, this->position, this->marker, func_80387E68, NULL); + gcdialog_showText(ASSET_C86_TEXT_UNKNOWN, 0xE, this->position, this->marker, func_80387E68, NULL); subaddie_set_state_with_direction(this, 6, 0.79f, 1); } else { timed_playSfx(0.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //0.4f diff --git a/src/BGS/ch/frogminigame.c b/src/BGS/ch/frogminigame.c index 432ff6a1..dc292ab2 100644 --- a/src/BGS/ch/frogminigame.c +++ b/src/BGS/ch/frogminigame.c @@ -56,10 +56,10 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){ mapSpecificFlags_set(0x10, 1); if(!fileProgressFlag_get(FILEPROG_1B_MET_YELLOW_FLIBBITS)){ fileProgressFlag_set(FILEPROG_1B_MET_YELLOW_FLIBBITS, 1); - func_80311480(text_flibbits_meet, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); + gcdialog_showText(text_flibbits_meet, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); }else{ if(!arg0->bgs_6730.unk8){ - func_80311480(text_flibbits_return, 0x4, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); + gcdialog_showText(text_flibbits_return, 0x4, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); } else{ __chFrogMinigame_textCallback(arg0->marker, text_flibbits_return, 0); @@ -92,9 +92,10 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){ } } - if(next_state == 4){ - func_80311480(text_flibbits_defeat, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); + if (next_state == 4) { + gcdialog_showText(text_flibbits_defeat, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); } + if(next_state == 5){ func_80324E38(0.0f, 3); timed_setStaticCameraToNode(0.0f, 0x27); diff --git a/src/BGS/ch/tanktup.c b/src/BGS/ch/tanktup.c index c7682fed..84b1e5a5 100644 --- a/src/BGS/ch/tanktup.c +++ b/src/BGS/ch/tanktup.c @@ -142,7 +142,7 @@ void func_8038F6A4(Actor *this) { if ((((ml_distance_vec3f(local->unk18, sp48) < 250.0f) && (ml_distance_vec3f(local->unk18, sp48) > 80.0f)) && (!func_8028ECAC())) && (player_getTransformation() == TRANSFORM_1_BANJO)) { - func_80311480(0xC7E, 0, 0, 0, 0, 0); + gcdialog_showText(0xC7E, 0, 0, 0, 0, 0); this->is_first_encounter = TRUE; } } @@ -163,7 +163,7 @@ void func_8038F6A4(Actor *this) if ((!this->unk138_23) && (!local->unk14)) { - if (func_80311480(0xC80, 0, 0, 0, 0, 0)) + if (gcdialog_showText(0xC80, 0, 0, 0, 0, 0)) { this->unk138_23 = 1; } @@ -214,7 +214,7 @@ void func_8038F6A4(Actor *this) func_8028F918(0); if (jiggyscore_isCollected(JIGGY_26_BGS_TANKTUP) == 0) { - func_80311480(0xC7F, 0xF, this->position, this->marker, func_8038F5E4, 0); + gcdialog_showText(0xC7F, 0xF, this->position, this->marker, func_8038F5E4, 0); } else { diff --git a/src/BGS/code_3420.c b/src/BGS/code_3420.c index 8ac58faf..6da32e1d 100644 --- a/src/BGS/code_3420.c +++ b/src/BGS/code_3420.c @@ -226,7 +226,7 @@ void func_80389C58(ActorMarker *marker) { this = marker_getActor(marker); local = (ActorLocal_BGS_3420 *)&this->local; BGS_func_80389850(this, 0); - func_80311480(D_80390984[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389BF8, NULL); + gcdialog_showText(D_80390984[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389BF8, NULL); } void BGS_func_80389CD8(ActorMarker *marker, enum asset_e text_id, s32 arg2){ @@ -246,9 +246,9 @@ void func_80389D20(ActorMarker *marker) { local = (ActorLocal_BGS_3420 *)&this->local; BGS_func_80389850(this, 0); if (local->unkC == local->unkD) { - func_80311480(D_803909A4[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, BGS_func_80389CD8, NULL); + gcdialog_showText(D_803909A4[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, BGS_func_80389CD8, NULL); } else { - func_80311480(D_803909C0[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, BGS_func_80389CD8, NULL); + gcdialog_showText(D_803909C0[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, BGS_func_80389CD8, NULL); } func_80347A14(0); } @@ -270,7 +270,7 @@ void func_80389E40(ActorMarker *marker) { local = (ActorLocal_BGS_3420 *)&this->local; BGS_func_80389850(this, 1); - func_80311480(0xC6B, 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389DF8, NULL); + gcdialog_showText(0xC6B, 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389DF8, NULL); } void func_80389EAC(ActorMarker *marker, enum asset_e text_id, s32 arg2){ @@ -310,7 +310,7 @@ void func_80389F08(ActorMarker *marker) { item_inc(ITEM_16_LIFE); } } - func_80311480(0xC98, 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389EAC, NULL); + gcdialog_showText(0xC98, 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389EAC, NULL); } @@ -332,22 +332,22 @@ void func_8038A068(Actor *this, s32 next_state) { func_8038C3B0(local->vile_marker); if (local->unkC == 3) { if (local->unkD >= 4) { - func_80311480(0xC91, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL); + gcdialog_showText(0xC91, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL); } else { - func_80311480((local->unkC == local->unkD) ? 0xC8D : 0xC90, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL); + gcdialog_showText((local->unkC == local->unkD) ? 0xC8D : 0xC90, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL); } } else { - func_80311480((local->unkC == local->unkD) ? 0xC63 : 0xC6C, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL); + gcdialog_showText((local->unkC == local->unkD) ? 0xC63 : 0xC6C, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL); } } if (next_state == 3) { - func_80311480(D_803909DC[local->unkC], 4, chVile_getPostion(local->vile_marker), this->marker, func_80389B98, NULL); + gcdialog_showText(D_803909DC[local->unkC], 4, chVile_getPostion(local->vile_marker), this->marker, func_80389B98, NULL); } if (next_state == 4) { if (local->unkC == local->unkD) { - func_80311480(BGS_D_803909F8[local->unkC], 0xE | ((BGS_D_803909F8[local->unkC] == 0xC8E) ? 1 : 0) | 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389BC8, NULL); + gcdialog_showText(BGS_D_803909F8[local->unkC], 0xE | ((BGS_D_803909F8[local->unkC] == 0xC8E) ? 1 : 0) | 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389BC8, NULL); } else { - func_80311480(D_80390A18[local->unkC], 0xF , chVile_getPostion(local->vile_marker), this->marker, func_80389BC8, NULL); + gcdialog_showText(D_80390A18[local->unkC], 0xF , chVile_getPostion(local->vile_marker), this->marker, func_80389BC8, NULL); } func_80347A14(0); } diff --git a/src/CC/code_1F70.c b/src/CC/code_1F70.c index 7c6f553d..e4a8e709 100644 --- a/src/CC/code_1F70.c +++ b/src/CC/code_1F70.c @@ -362,7 +362,7 @@ void CC_func_80388F4C(void){ if(D_80389FA0.unk20 && skeletalAnim_getAnimId(D_80389FA0.unk0) != ASSET_C4_ANIM_CLANKER_BITE){ skeletalAnim_set(D_80389FA0.unk0, ASSET_C4_ANIM_CLANKER_BITE, 1.0f, 10.0f); if(!D_80389FA0.unk48){ - func_80311480(0xd2b, 0xE, D_80389FA0.unk28, NULL, NULL, NULL); + gcdialog_showText(ASSET_D2B_TEXT_UNKNOWN, 0xE, D_80389FA0.unk28, NULL, NULL, NULL); D_80389FA0.unk48 = TRUE; } }//L8038918C diff --git a/src/CC/code_BF0.c b/src/CC/code_BF0.c index f823bd46..5ea52781 100644 --- a/src/CC/code_BF0.c +++ b/src/CC/code_BF0.c @@ -127,9 +127,7 @@ void func_803870F8(Actor *this){ else if(this->state == 2 && 1.0f <= local->unk8){ flagCnt = levelSpecificFlags_get(LEVEL_FLAG_0_CC_TOKEN_TOOTH_OPEN) + levelSpecificFlags_get(LEVEL_FLAG_1_CC_JIGGY_TOOTH_OPEN); if(!jiggyscore_isCollected(JIGGY_1B_CC_TOOTH)){ - func_80311480((local->unk0 == 1)? - ((flagCnt == 0)? 0xd30 : 0xd31) : - ((flagCnt == 0)? 0xd2e : 0xd2f), 4, NULL, NULL, NULL, NULL); + gcdialog_showText((local->unk0 == 1)? ((flagCnt == 0)? 0xd30 : 0xd31) : ((flagCnt == 0)? 0xd2e : 0xd2f), 4, NULL, NULL, NULL, NULL); } CC_func_80386FE0(this, 3); }//L80387474 diff --git a/src/CCW/ch/vacationtexttrigger.c b/src/CCW/ch/vacationtexttrigger.c index 16ad4dea..2cada924 100644 --- a/src/CCW/ch/vacationtexttrigger.c +++ b/src/CCW/ch/vacationtexttrigger.c @@ -37,7 +37,7 @@ void chVacationTextTrigger_update(Actor* this) { // Start dialog if player is within trigger if (__playerIsWithinTrigger(0, -107, 188) != 0) { - func_80311480(0xDA9, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xDA9, 4, NULL, NULL, NULL, NULL); volatileFlag_set(VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT, 1); } } diff --git a/src/CCW/code_14B0.c b/src/CCW/code_14B0.c index e0b6b204..c8fe17db 100644 --- a/src/CCW/code_14B0.c +++ b/src/CCW/code_14B0.c @@ -122,7 +122,7 @@ void CCW_func_80387A40(Actor *this) { player_getPosition(sp44); if (sp44[2] > -600.0f) { if (!local->unk4->unk3 || !jiggyscore_isCollected(local->unk4->unk3) ) { - func_80311480(local->unk4->unk4, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(local->unk4->unk4, 4, NULL, NULL, NULL, NULL); mapSpecificFlags_set(local->unk4->unk2, TRUE); } } diff --git a/src/CCW/code_160.c b/src/CCW/code_160.c index 7473bc64..90b317b0 100644 --- a/src/CCW/code_160.c +++ b/src/CCW/code_160.c @@ -45,9 +45,9 @@ void func_803865F4(Actor *this, s32 next_state) { local->unkC = 0.0f; if (next_state == 2) { if (!volatileFlag_getAndSet(VOLATILE_FLAG_B5, 1)) { - func_80311480(0xCE2, 4, NULL, this->marker, func_803865C4, NULL); + gcdialog_showText(0xCE2, 4, NULL, this->marker, func_803865C4, NULL); } else { - func_80311480(0xCE3, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCE3, 4, NULL, NULL, NULL, NULL); func_803865F4(this, 3); return; } @@ -65,7 +65,7 @@ void func_803865F4(Actor *this, s32 next_state) { volatileFlag_set(VOLATILE_FLAG_3, 0); volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 1); } else { - func_80311480(0xCE4, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCE4, 4, NULL, NULL, NULL, NULL); func_8025A58C(-1, 400); comusic_8025AB44(COMUSIC_4B_CCW_ZUBBA_FIGHT, 0, 400); func_8025AABC(COMUSIC_4B_CCW_ZUBBA_FIGHT); diff --git a/src/CCW/code_2270.c b/src/CCW/code_2270.c index e3213f0e..f17a802b 100644 --- a/src/CCW/code_2270.c +++ b/src/CCW/code_2270.c @@ -48,7 +48,7 @@ void CCW_func_8038868C(Actor *this, s32 next_state) { } if (next_state == 2) { if (local->unk0->unk4 != 0) { - func_80311480(local->unk0->unk4, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(local->unk0->unk4, 4, NULL, NULL, NULL, NULL); } skeletalAnim_set(this->unk148, ASSET_FC_ANIM_GOBI_SPITTING, 0.2f, 3.0f); skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE); @@ -73,7 +73,7 @@ void CCW_func_8038868C(Actor *this, s32 next_state) { } if (next_state == 5) { if (local->unk0->unk6 != 0) { - func_80311480((s32) local->unk0->unk6, 4, NULL, NULL, NULL, NULL); + gcdialog_showText((s32) local->unk0->unk6, 4, NULL, NULL, NULL, NULL); } skeletalAnim_set(this->unk148, ASSET_FD_ANIM_GOBI2_GETTING_UP, 0.23f, 0.5f); timed_setStaticCameraToNode(0.0f, 3); @@ -163,7 +163,7 @@ void chGobiCCW_update(Actor *this) { player_getPosition(sp48); if (ml_distance_vec3f(this->position, sp48) < 600.0f) { if (local->unk0->unk2 != 0) { - func_80311480((s32) local->unk0->unk2, 4, NULL, NULL, NULL, NULL); + gcdialog_showText((s32) local->unk0->unk2, 4, NULL, NULL, NULL, NULL); } this->is_first_encounter = TRUE; } diff --git a/src/CCW/code_3310.c b/src/CCW/code_3310.c index 39b00f2e..cfa4d230 100644 --- a/src/CCW/code_3310.c +++ b/src/CCW/code_3310.c @@ -153,14 +153,14 @@ void func_803897B8(Actor *this, s32 next_state) { skeletalAnim_set(this->unk148, local->unk0->unk14, 0.5f, 8.5f); skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE); if (local->unk0->map_id == MAP_43_CCW_SPRING) { - func_80311480(0xCD6, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCD6, 4, NULL, NULL, NULL, NULL); skeletalAnim_setCallback_0(this->unk148, 0.65f, &func_80389798); } if (local->unk0->map_id == MAP_44_CCW_SUMMER) { - func_80311480(0xCD9, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCD9, 4, NULL, NULL, NULL, NULL); } if (local->unk0->map_id == MAP_45_CCW_AUTUMN) { - func_80311480(0xCDB, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCDB, 4, NULL, NULL, NULL, NULL); } local->unk8 = local->unk0->unk18; } @@ -274,7 +274,7 @@ void CCW_func_80389BFC(Actor *this) { if ((local->unk0->unkE != 0) && (carriedObj_getActorId() == ACTOR_2A2_CATERPILLAR) && (ml_distance_vec3f(this->position, sp4C) < 1010.0f) && (func_8028FC34() != 0)) { func_8028FA54(D_8038FDE0); if ((local->unk0->map_id == MAP_44_CCW_SUMMER) && (local->unk4 == 0)) { - func_80311480(0xCD8, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCD8, 4, NULL, NULL, NULL, NULL); } local->unk4++; if (local->unk4 < local->unk0->unk25) { diff --git a/src/CCW/code_3DA0.c b/src/CCW/code_3DA0.c index 1ad8d044..be0acaf1 100644 --- a/src/CCW/code_3DA0.c +++ b/src/CCW/code_3DA0.c @@ -153,7 +153,7 @@ void chcaterpillar_update(Actor *this){ if(ml_distance_vec3f(this->position, sp74) < 50.0f){ func_8028F030(ACTOR_2A2_CATERPILLAR); if(!volatileFlag_get(VOLATILE_FLAG_B2)){ - func_80311480(0xcc7, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_CC7_TEXT_UNKNOWN, 4, NULL, NULL, NULL, NULL); volatileFlag_set(VOLATILE_FLAG_B2, TRUE); } FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 0x1f4, 0x9c4); diff --git a/src/CCW/code_4530.c b/src/CCW/code_4530.c index c31a6686..07220be6 100644 --- a/src/CCW/code_4530.c +++ b/src/CCW/code_4530.c @@ -44,7 +44,7 @@ void func_8038A950(Actor *this, s32 next_state) { skeletalAnim_set(this->unk148, 0x199, 0.0f, 6.5f); } if (next_state == 2) { - func_80311480(0xCDC, 0xA, this->position, this->marker, func_8038A920, NULL); + gcdialog_showText(0xCDC, 0xA, this->position, this->marker, func_8038A920, NULL); } if (next_state == 3) { skeletalAnim_set(this->unk148, 0x19A, 0.0f, 7.0f); diff --git a/src/CCW/code_4960.c b/src/CCW/code_4960.c index 43e6328a..1d363dbc 100644 --- a/src/CCW/code_4960.c +++ b/src/CCW/code_4960.c @@ -28,7 +28,7 @@ Struct_CCW_4960_0 D_8038F254[] = { /* .code */ void func_8038AD50(Actor *this, s32 next_state) { if (next_state == 2) { - func_80311480(0xCDD, 0, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCDD, 0, NULL, NULL, NULL, NULL); if (this->state == 1) { mapSpecificFlags_set(6, 0); timed_setStaticCameraToNode(0.0f, 1); diff --git a/src/CCW/code_4D00.c b/src/CCW/code_4D00.c index 96d5b63b..a3961621 100644 --- a/src/CCW/code_4D00.c +++ b/src/CCW/code_4D00.c @@ -90,7 +90,7 @@ void func_8038B19C(Actor *this) { } if (!this->is_first_encounter && func_803292E0(this)) { this->is_first_encounter = TRUE; - func_80311480(0xCC8, 0, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCC8, 0, NULL, NULL, NULL, NULL); } func_8028E668(this->position, 300.0f, -50.0f, 120.0f); } diff --git a/src/CCW/code_50D0.c b/src/CCW/code_50D0.c index aa0b87ab..5a4c867f 100644 --- a/src/CCW/code_50D0.c +++ b/src/CCW/code_50D0.c @@ -92,7 +92,7 @@ void func_8038B87C(Actor *this) { } if (!this->is_first_encounter && func_803292E0(this)) { this->is_first_encounter = TRUE; - func_80311480(0xCC9, 0, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCC9, 0, NULL, NULL, NULL, NULL); } func_8028E668(this->position, 300.0f, -50.0f, 120.0f); } diff --git a/src/CCW/code_5540.c b/src/CCW/code_5540.c index a3f49cf4..5f011c3d 100644 --- a/src/CCW/code_5540.c +++ b/src/CCW/code_5540.c @@ -49,7 +49,7 @@ void chnabnut_setState(Actor *this, s32 next_state) { skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE); func_80324E38(0.0f, 3); timed_setStaticCameraToNode(0.0f, 0xB); - func_80311480(0xCCC, 0x20, this->position, NULL, NULL, NULL); + gcdialog_showText(0xCCC, 0x20, this->position, NULL, NULL, NULL); } if (next_state == NABNUT_STATE_4_THANK_PLAYER) { @@ -135,7 +135,7 @@ void chnabnut_update(Actor *this) { player_getPosition(sp30); if (!this->is_first_encounter && (ml_distance_vec3f(this->position, sp30) < 400.0f)) { this->is_first_encounter = TRUE; - func_80311480(0xCCA, 0xE, this->position, NULL, NULL, NULL); + gcdialog_showText(0xCCA, 0xE, this->position, NULL, NULL, NULL); } if (item_getCount(ITEM_23_ACORNS) > 0) { func_80258A4C(this->position, this->yaw - 90.0f, sp30, &sp2C, &sp28, &sp24); @@ -149,7 +149,7 @@ void chnabnut_update(Actor *this) { if (local->returned_acorn_count == 6) { chnabnut_setState(this, NABNUT_STATE_2_WAIT); } else if (item_getCount(ITEM_23_ACORNS) == 1) { - func_80311480(0xCCB, 0x20, this->position, NULL, NULL, NULL); + gcdialog_showText(0xCCB, 0x20, this->position, NULL, NULL, NULL); } } } diff --git a/src/CCW/code_5BF0.c b/src/CCW/code_5BF0.c index 2218fb19..2988de7c 100644 --- a/src/CCW/code_5BF0.c +++ b/src/CCW/code_5BF0.c @@ -116,7 +116,7 @@ void func_8038C41C(Actor *this) { player_getPosition(sp2C); if (!this->is_first_encounter && (ml_distance_vec3f(this->position, sp2C) < 400.0f)) { this->is_first_encounter = TRUE; - func_80311480(0xCCD, 0, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCCD, 0, NULL, NULL, NULL, NULL); } } } diff --git a/src/CCW/code_6620.c b/src/CCW/code_6620.c index a83e8f46..fff4395c 100644 --- a/src/CCW/code_6620.c +++ b/src/CCW/code_6620.c @@ -117,7 +117,7 @@ void func_8038CC4C(Actor *this) { player_getPosition(sp38); if (ml_distance_vec3f(this->position, sp38) < 900.0f) { if (local->unk0->map_id != MAP_46_CCW_WINTER || func_8028F2FC()) { - func_80311480(local->unk0->unk4, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(local->unk0->unk4, 4, NULL, NULL, NULL, NULL); this->is_first_encounter = TRUE; } } diff --git a/src/CCW/code_6AC0.c b/src/CCW/code_6AC0.c index cda5e126..8a905765 100644 --- a/src/CCW/code_6AC0.c +++ b/src/CCW/code_6AC0.c @@ -61,7 +61,7 @@ void func_8038CEB0(Actor *this, s32 next_state) { this->marker->propPtr->unk8_3 = FALSE; skeletalAnim_set(this->unk148, 0x1A7, 0.2f, 3.0f); skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE); - func_80311480(0xCD0, 0x24, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCD0, 0x24, NULL, NULL, NULL, NULL); } if (next_state == 3) { skeletalAnim_set(this->unk148, 0x1A8, 0.2f, 0.5f); @@ -117,7 +117,7 @@ void func_8038CFB4(Actor *this) { if (!this->is_first_encounter) { player_getPosition(sp60); if (ml_distance_vec3f(this->position, sp60) < 900.0f) { - func_80311480(0xCCF, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xCCF, 4, NULL, NULL, NULL, NULL); this->is_first_encounter = TRUE; } } diff --git a/src/CCW/code_6EC0.c b/src/CCW/code_6EC0.c index 07af862c..7ec1b9aa 100644 --- a/src/CCW/code_6EC0.c +++ b/src/CCW/code_6EC0.c @@ -70,10 +70,10 @@ void func_8038D368(Actor *this) { player_getPosition(plyr_pos); if (ml_distance_vec3f(this->position, plyr_pos) < 600.0f) { if (!jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY)) { - func_80311480(local->unk0->unk2, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(local->unk0->unk2, 4, NULL, NULL, NULL, NULL); } else { if (local->unk0->unk4) { - func_80311480(local->unk0->unk4, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(local->unk0->unk4, 4, NULL, NULL, NULL, NULL); } } this->is_first_encounter = TRUE; diff --git a/src/FP/ch/bearcub.c b/src/FP/ch/bearcub.c index 8ab52e9c..e76131a8 100644 --- a/src/FP/ch/bearcub.c +++ b/src/FP/ch/bearcub.c @@ -116,9 +116,9 @@ void func_8038A384(Actor *this){ }//L8038A4E4 sp34 = levelSpecificFlags_get(0x11) + levelSpecificFlags_get(0x12) + levelSpecificFlags_get(0x13); - sp38 = (sp34 == 1) ? 0xC17 - : (sp34 == 2) ? 0xC18 - : 0xC19; + sp38 = (sp34 == 1) ? ASSET_C17_TEXT_UNKNOWN + : (sp34 == 2) ? ASSET_C18_TEXT_UNKNOWN + : ASSET_C19_TEXT_UNKNOWN; this->yaw_ideal = (f32)func_80329784(this); func_80328FB0(this, 2.0f); @@ -132,8 +132,9 @@ void func_8038A384(Actor *this){ && !jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3) && !jiggyscore_isSpawned(JIGGY_2C_FP_BOGGY_3) ){ - if(func_80311480(0xc1a, 0x2a, NULL, NULL, NULL, NULL)) + if (gcdialog_showText(ASSET_C1A_TEXT_UNKNOWN, 0x2a, NULL, NULL, NULL, NULL)) { levelSpecificFlags_set(0x19, TRUE); + } } } @@ -154,11 +155,11 @@ void func_8038A384(Actor *this){ } if(levelSpecificFlags_get(D_80391E80[sp3C].unk0)){ subaddie_set_state_with_direction(this, 2, 0.001f, 1); - if(sp38 == 0xc19){ - func_80311480(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL); + if (sp38 == ASSET_C19_TEXT_UNKNOWN) { + gcdialog_showText(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL); } - else{ - func_80311480(sp38, 0x3, this->position, this->marker, func_8038A318, NULL); + else { + gcdialog_showText(sp38, 0x3, this->position, this->marker, func_8038A318, NULL); } } else{//L8038A73C diff --git a/src/FP/ch/boggy1.c b/src/FP/ch/boggy1.c index 03e02cc8..d52a8d65 100644 --- a/src/FP/ch/boggy1.c +++ b/src/FP/ch/boggy1.c @@ -85,8 +85,8 @@ void func_803877A8(ActorMarker *caller, enum asset_e text_id, s32 arg2){ void func_80387828(ActorMarker *caller, enum asset_e text_id, s32 arg2){ Actor *this = marker_getActor(caller); - if(text_id == 0xc00){ - func_80311480(0xc2b, 0xf, NULL, this->marker, NULL, func_803877A8); + if (text_id == 0xc00) { + gcdialog_showText(ASSET_C2B_TEXT_UNKNOWN, 0xf, NULL, this->marker, NULL, func_803877A8); } } @@ -149,9 +149,9 @@ void func_8038794C(Actor *this){ if(!this->is_first_encounter && func_80329530(this, 0x1f4)){ if(!func_8028ECAC() || func_8028ECAC() == BSGROUP_8_TROT){ - if(func_80311480(0xbff, 0x2a, this->position, NULL, NULL, NULL)){ - for(i = 0; i <5; i++ ){ - timedFunc_set_1(D_80391BEC[i], (GenFunction_1)func_8038787C, (s32)this->marker); + if (gcdialog_showText(ASSET_BFF_TEXT_UNKNOWN, 0x2a, this->position, NULL, NULL, NULL)) { + for (i = 0; i < 5; i++) { + timedFunc_set_1(D_80391BEC[i], (GenFunction_1) func_8038787C, (s32) this->marker); } this->is_first_encounter = TRUE; } diff --git a/src/FP/ch/boggy2.c b/src/FP/ch/boggy2.c index 7bc6e623..eba59eee 100644 --- a/src/FP/ch/boggy2.c +++ b/src/FP/ch/boggy2.c @@ -124,10 +124,10 @@ void func_80388A50(Actor *this){ void func_80388A94(Actor *this){ func_80388A50(this); if(mapSpecificFlags_get(6)){ - func_80311480(0xc0a, 0xe, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C0A_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL); } else{ - func_80311480(0xc09, 0xe, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C09_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL); } } @@ -136,15 +136,15 @@ void func_80388B18(Actor *this, u8 arg1){ if(player_getTransformation() == TRANSFORM_4_WALRUS){ func_80388A50(this); if(mapSpecificFlags_get(5)){ - func_80311480(0xc05, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C05_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL); } else{ - func_80311480(0xc02, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C02_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL); } } else{//L80388BB8 if(!volatileFlag_get(VOLATILE_FLAG_B3)){ - if(func_80311480(0xc01, 0xe, this->position, this->marker, func_80388D70, NULL)){ + if(gcdialog_showText(ASSET_C01_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){ volatileFlag_set(VOLATILE_FLAG_B3, TRUE); func_80388A50(this); } @@ -154,7 +154,7 @@ void func_80388B18(Actor *this, u8 arg1){ else{//L80388C08 if(player_getTransformation() == TRANSFORM_4_WALRUS){ if(!volatileFlag_get(VOLATILE_FLAG_B4)){ - if(func_80311480(0xc08, 0xe, this->position, this->marker, func_80388D70, NULL)){ + if(gcdialog_showText(ASSET_C08_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){ volatileFlag_set(VOLATILE_FLAG_B4, TRUE); func_80388A50(this); } @@ -478,13 +478,13 @@ void func_803896FC(Actor *this){ && player_getTransformation() != TRANSFORM_4_WALRUS && volatileFlag_get(VOLATILE_FLAG_B3) ){ - func_80311480(0xC01, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C01_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL); } else if( local->unk19 == 2){ if( player_getTransformation() == TRANSFORM_4_WALRUS && volatileFlag_get(VOLATILE_FLAG_B4) ){ - func_80311480(0xC08, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C08_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL); } else if( player_getTransformation() != TRANSFORM_4_WALRUS){ func_80388A94(this); diff --git a/src/FP/ch/boggy3.c b/src/FP/ch/boggy3.c index df69d629..93308808 100644 --- a/src/FP/ch/boggy3.c +++ b/src/FP/ch/boggy3.c @@ -76,14 +76,14 @@ void func_80390388(Actor *this){ && (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT) ){ if(0.0f == this->unk1C[0] && func_80390334()){ - if(func_80311480(0xc1f, 0xb, this->position, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_C1F_TEXT_UNKNOWN, 0xb, this->position, NULL, NULL, NULL)){ this->is_first_encounter = TRUE; this->unk1C[0] = 1.0f; } } else{ if( !this->is_first_encounter ){ - if(func_80311480(0xc1e, 0x2b, this->position, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_C1E_TEXT_UNKNOWN, 0x2b, this->position, NULL, NULL, NULL)){ this->is_first_encounter = TRUE; } } diff --git a/src/FP/ch/cavewozza.c b/src/FP/ch/cavewozza.c index 02cd2f09..627f30f4 100644 --- a/src/FP/ch/cavewozza.c +++ b/src/FP/ch/cavewozza.c @@ -69,14 +69,14 @@ void func_80390630(Actor *this){ if(func_80329530(this, 350)){ if(player_getTransformation() == TRANSFORM_4_WALRUS){ if(!levelSpecificFlags_get(0x31)){ - if(func_80311480(0xc27, 0x23, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_C27_TEXT_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)){ levelSpecificFlags_set(0x31, TRUE); } } } else{ if(!levelSpecificFlags_get(0x32)){ - if(func_80311480(0xc26, 0x23, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_C26_TEXT_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)){ levelSpecificFlags_set(0x32, TRUE); } } diff --git a/src/FP/ch/twinkly.c b/src/FP/ch/twinkly.c index be79c1a1..218c7bff 100644 --- a/src/FP/ch/twinkly.c +++ b/src/FP/ch/twinkly.c @@ -336,11 +336,11 @@ void func_8038C9A0(Actor *this){ if(this->unk1C[1] <= this->position_y){ this->position_y = this->unk1C[1]; if(!fileProgressFlag_get(FILEPROG_82_MET_TWINKLIES)){ - func_80311480(0xc12, 0x2a, this->position, this->marker, func_8038C94C, NULL); + gcdialog_showText(0xc12, 0x2a, this->position, this->marker, func_8038C94C, NULL); fileProgressFlag_set(FILEPROG_82_MET_TWINKLIES, TRUE); } else{ - func_80311480(0xc25, 0x2b, this->position, this->marker, func_8038C94C, NULL); + gcdialog_showText(0xc25, 0x2b, this->position, this->marker, func_8038C94C, NULL); } subaddie_set_state(this, 5); this->pitch -= 3.0f; diff --git a/src/FP/ch/twinklybox.c b/src/FP/ch/twinklybox.c index 4a97ea5f..332dd390 100644 --- a/src/FP/ch/twinklybox.c +++ b/src/FP/ch/twinklybox.c @@ -177,7 +177,7 @@ void func_8038D294(ActorMarker *marker){ func_8038D01C(this->position, 12, ASSET_700_SPRITE_DUST); this->velocity[1] = 0.0f; FUNC_8030E8B4(SFX_30_MAGIC_POOF, 1.0f, 32000, this->position, 1000, 3500); - func_80311480(0xc13, 0, NULL, NULL, NULL, NULL); + gcdialog_showText(0xc13, 0, NULL, NULL, NULL, NULL); } void func_8038D324(Actor *this){ diff --git a/src/FP/ch/twinklymuncher.c b/src/FP/ch/twinklymuncher.c index 80d80c7f..735d4444 100644 --- a/src/FP/ch/twinklymuncher.c +++ b/src/FP/ch/twinklymuncher.c @@ -127,7 +127,7 @@ void func_8038E094(Actor *this){ if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){ if(this->state != 6 && this->state != 7 && 0.0f == this->velocity[0]){ timed_setStaticCameraToNode(0.5f, 0xd); - func_80311480(ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL); + gcdialog_showText(ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL); this->velocity[0] = 1.0f; subaddie_set_state_with_direction(this, 6, 0.03f, 1); actor_loopAnimation(this); @@ -201,7 +201,7 @@ void func_8038E094(Actor *this){ FUNC_8030E8B4(SFX_27_JINJO_HI, 1.6f, 32000, this->position, 1250, 2500); func_80324D54(0.35f, SFX_110_TWINKLY_DEATH, 1.0f, 32000, this->position, 1250.0f, 2500.0f); marker_despawn(sp38->marker); - if( !mapSpecificFlags_get(0xa) && func_80311480(0xc16, 0, NULL, NULL, NULL, NULL)){ + if( !mapSpecificFlags_get(0xa) && gcdialog_showText(0xc16, 0, NULL, NULL, NULL, NULL)){ mapSpecificFlags_set(0xa, TRUE); } } diff --git a/src/FP/ch/wozza.c b/src/FP/ch/wozza.c index 824d7b00..045710f8 100644 --- a/src/FP/ch/wozza.c +++ b/src/FP/ch/wozza.c @@ -273,7 +273,7 @@ void FP_func_8038F7AC(Actor *this){ func_8038F560(this); if(!local->unk30){ - if(func_80311480(0xc1d, 0x20, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(0xc1d, 0x20, NULL, NULL, NULL, NULL)){ local->unk30 = TRUE; } } @@ -300,7 +300,7 @@ void FP_func_8038F7AC(Actor *this){ } if(func_80329530(this, 500) && !this->is_first_encounter){ - if(func_80311480(0xc1c, 0xAA, this->position, this->marker, func_8038F330, func_8038F3C4)){ + if(gcdialog_showText(0xc1c, 0xAA, this->position, this->marker, func_8038F330, func_8038F3C4)){ timed_setStaticCameraToNode(0.0f, 0x2E); this->is_first_encounter = TRUE; } diff --git a/src/FP/ch/xmastree.c b/src/FP/ch/xmastree.c index bcbad51c..b18430d9 100644 --- a/src/FP/ch/xmastree.c +++ b/src/FP/ch/xmastree.c @@ -127,7 +127,7 @@ void chXmasTree_update(Actor *this){ this->lifetime_value = 2.0f; func_8025A6EC(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000); func_802BAFE4(0x1A); - func_80311480(0xC14, 0, NULL, NULL, NULL, NULL); + gcdialog_showText(0xC14, 0, NULL, NULL, NULL, NULL); break; case 3: // L803872F0 diff --git a/src/FP/racectrl.c b/src/FP/racectrl.c index 8fa28dbc..1aa762aa 100644 --- a/src/FP/racectrl.c +++ b/src/FP/racectrl.c @@ -527,7 +527,7 @@ void func_8038BC0C(s32 arg0){ FP_func_8038AB60(0); if(!player_isDead()){ func_8028F918(2); - func_80311480(0xc10, 0x20, NULL, NULL, func_8038B2C8, NULL); + gcdialog_showText(0xc10, 0x20, NULL, NULL, func_8038B2C8, NULL); }//L8038BD40 FP_D_803935A8.unk0 = 4; break; @@ -535,7 +535,7 @@ void func_8038BC0C(s32 arg0){ case 3: if(!FP_D_803935A8.unk19 && !player_isDead()){ FP_D_803935A8.unk19 = 1; - func_80311480(0xc0f, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showText(0xc0f, 0x20, NULL, NULL, NULL, NULL); }//L8038BD94 func_8025AEA0(0x3a, 0x411aa); break; @@ -543,7 +543,7 @@ void func_8038BC0C(s32 arg0){ case 2: if(!FP_D_803935A8.unk18 && !player_isDead()){ FP_D_803935A8.unk18 = 1; - func_80311480(0xc0e, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showText(0xc0e, 0x20, NULL, NULL, NULL, NULL); }//L8038BDF0 func_8025AEA0(0x3a, 0x493e0); break; diff --git a/src/GV/ch/ancientone.c b/src/GV/ch/ancientone.c index 0a3e291f..826a550d 100644 --- a/src/GV/ch/ancientone.c +++ b/src/GV/ch/ancientone.c @@ -149,7 +149,7 @@ void chAncientOne_update(Actor *this){ mapSpecificFlags_set(sp38, TRUE); if(sp38== 0xB){ if(!jiggyscore_isCollected(JIGGY_46_GV_ANCIENT_ONES)){ - func_80311480(ASSET_A80_TEXT_ANICIENT_ONES_DONE, 0xE, NULL, this->marker, func_80386850, NULL); + gcdialog_showText(ASSET_A80_TEXT_ANICIENT_ONES_DONE, 0xE, NULL, this->marker, func_80386850, NULL); } else{ func_80386850(this->marker, 0xA80, -1); @@ -158,7 +158,7 @@ void chAncientOne_update(Actor *this){ else { if(sp38== 7){ if(!jiggyscore_isCollected(JIGGY_46_GV_ANCIENT_ONES)){ - func_80311480(ASSET_A7F_TEXT_ANICIENT_ONES_MEET, 0x4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A7F_TEXT_ANICIENT_ONES_MEET, 0x4, NULL, NULL, NULL, NULL); } } diff --git a/src/GV/ch/gobi1.c b/src/GV/ch/gobi1.c index 891fe2d0..3479c443 100644 --- a/src/GV/ch/gobi1.c +++ b/src/GV/ch/gobi1.c @@ -180,7 +180,7 @@ void chGobi1_update(Actor *this){ && func_80329530(this, 250) && !func_80329530(this, 80) && func_8028F2A0() - && func_80311480(0xa73, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(0xa73, 0, NULL, NULL, NULL, NULL) ){ this->is_first_encounter = TRUE; } diff --git a/src/GV/ch/gobi2.c b/src/GV/ch/gobi2.c index c98c6638..5ca4ede1 100644 --- a/src/GV/ch/gobi2.c +++ b/src/GV/ch/gobi2.c @@ -203,7 +203,7 @@ void chGobi2_update(Actor *this){ if(!this->is_first_encounter){ if(func_80329530(this, 0xFA) && !func_80329530(this, 0x50)){ if(func_8028F2A0()){ - if(func_80311480(ASSET_A75_TEXT_GOBI2_MEET, 0, this->position, NULL, NULL, NULL)) + if(gcdialog_showText(ASSET_A75_TEXT_GOBI2_MEET, 0, this->position, NULL, NULL, NULL)) this->is_first_encounter = TRUE; } } diff --git a/src/GV/ch/gobi3.c b/src/GV/ch/gobi3.c index f3c55bb0..863cfd9e 100644 --- a/src/GV/ch/gobi3.c +++ b/src/GV/ch/gobi3.c @@ -72,7 +72,7 @@ void chGobi3_setState(Actor *this, s32 next_state){ if(next_state == 5){ skeletalAnim_set(this->unk148, 0xd9, 0.5f, 4.0f); - func_80311480(ASSET_A77_TEXT_GOBI3_DONE, 0xe, this->position, this->marker, __chGobi3_runaway, NULL); + gcdialog_showText(ASSET_A77_TEXT_GOBI3_DONE, 0xe, this->position, this->marker, __chGobi3_runaway, NULL); } if(next_state == 4){ diff --git a/src/GV/ch/mazectrl.c b/src/GV/ch/mazectrl.c index b4c46a36..1e9fa19b 100644 --- a/src/GV/ch/mazectrl.c +++ b/src/GV/ch/mazectrl.c @@ -84,7 +84,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){ timed_playSfx(1.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 32000); } if(!levelSpecificFlags_get(0x16)){ - func_80311480(ASSET_A82_TEXT_SANDYBUTT_START_MAZE, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A82_TEXT_SANDYBUTT_START_MAZE, 4, NULL, NULL, NULL, NULL); levelSpecificFlags_set(0x16, TRUE); } }//L8038F794 @@ -134,7 +134,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){ func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff); if(!levelSpecificFlags_get(0x17)){ - func_80311480(ASSET_A83_TEXT_SANDYBUTT_DONE, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A83_TEXT_SANDYBUTT_DONE, 4, NULL, NULL, NULL, NULL); levelSpecificFlags_set(0x17, TRUE); } } @@ -176,7 +176,7 @@ void chMazeCtrl_update(Actor *this){ } if( !levelSpecificFlags_get(0x15) && ml_timer_update(&local->unk8, sp34) - && func_80311480(ASSET_A81_TEXT_SANDYBUTT_ENTER, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(ASSET_A81_TEXT_SANDYBUTT_ENTER, 0, NULL, NULL, NULL, NULL) ){ levelSpecificFlags_set(0x15, TRUE); } diff --git a/src/GV/ch/trunker.c b/src/GV/ch/trunker.c index 8094676e..f77b7ad6 100644 --- a/src/GV/ch/trunker.c +++ b/src/GV/ch/trunker.c @@ -74,7 +74,7 @@ void chTrucker_update(Actor *this){ && !func_80329530(this, 80) && func_8028F2A0() ){ - func_80311480(ASSET_A71_TEXT_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL); + gcdialog_showText(ASSET_A71_TEXT_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL); this->is_first_encounter = TRUE; }//L80389254 diff --git a/src/GV/code_3630.c b/src/GV/code_3630.c index 96b47bb4..36c2e1bb 100644 --- a/src/GV/code_3630.c +++ b/src/GV/code_3630.c @@ -29,7 +29,7 @@ void func_80389A20(ActorMarker *caller, enum asset_e text_id, s32 arg2){ } void func_80389A60(Actor *this){ - func_80311480(ASSET_A70_TEXT_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL); + gcdialog_showText(ASSET_A70_TEXT_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL); this->is_first_encounter = TRUE; subaddie_set_state(this, 5); } @@ -63,7 +63,7 @@ void func_80389B1C(Actor *this){ if(this->state == 1 || this->state == 2){ if(! this->is_first_encounter && func_80329530(this, 250) && !func_80329530(this, 0x50)){ - func_80311480(ASSET_A6F_TEXT_CHARMER_MEET, 0xe, this->position, NULL, NULL, NULL); + gcdialog_showText(ASSET_A6F_TEXT_CHARMER_MEET, 0xe, this->position, NULL, NULL, NULL); this->is_first_encounter = TRUE; mapSpecificFlags_set(0, TRUE); } diff --git a/src/GV/code_5570.c b/src/GV/code_5570.c index 175b7799..64bd1dc5 100644 --- a/src/GV/code_5570.c +++ b/src/GV/code_5570.c @@ -63,7 +63,7 @@ void func_8038BA08(Actor *this){ if(func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS) player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 0.0f); - func_80311480(ASSET_A79_TEXT_GRABBA_DEFEAT, 0xf, this->position, this->marker, func_8038B988, NULL); + gcdialog_showText(ASSET_A79_TEXT_GRABBA_DEFEAT, 0xf, this->position, this->marker, func_8038B988, NULL); comusic_8025AB44(COMUSIC_57_TURBO_TRAINERS, 7000, 700); } @@ -245,7 +245,7 @@ void GV_func_8038BEA0(Actor *this){ } else{ if(!this->is_first_encounter){ - if(func_80311480(ASSET_A78_TEXT_GRABBA_MEET, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_A78_TEXT_GRABBA_MEET, 0, NULL, NULL, NULL, NULL)){ this->is_first_encounter = TRUE; } } @@ -276,7 +276,7 @@ void GV_func_8038BEA0(Actor *this){ } if(!this->unk138_23){ - if(func_80311480(ASSET_A7A_TEXT_GRABBA_TOO_FAST, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_A7A_TEXT_GRABBA_TOO_FAST, 0, NULL, NULL, NULL, NULL)){ this->unk138_23 = TRUE; } } diff --git a/src/GV/code_7060.c b/src/GV/code_7060.c index 9fb05f67..62affb7a 100644 --- a/src/GV/code_7060.c +++ b/src/GV/code_7060.c @@ -73,7 +73,7 @@ void func_8038D47C(Actor *this){ player_getPosition(sp3C); if(func_8028ECAC() == 0){ if( ml_distance_vec3f(sp3C, this->unk1C) < 100.0f || ml_distance_vec3f(sp3C, this->velocity) < 100.0f){ - if(func_80311480(ASSET_A7B_TEXT_JINXY_MEET, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_A7B_TEXT_JINXY_MEET, 0, NULL, NULL, NULL, NULL)){ mapSpecificFlags_set(0x14, 1); } } @@ -102,7 +102,7 @@ void func_8038D47C(Actor *this){ } if( actor_animationIsAt(this, 0.99f) ){ if(--this->unk38_31 == 0){ - func_80311480(ASSET_A7C_TEXT_JINXY_ONE_EGG, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A7C_TEXT_JINXY_ONE_EGG, 4, NULL, NULL, NULL, NULL); mapSpecificFlags_set(0x14, TRUE); subaddie_set_state_forward(this, 1); } diff --git a/src/MM/ch/conga.c b/src/MM/ch/conga.c index fd6f7165..6d44e77a 100644 --- a/src/MM/ch/conga.c +++ b/src/MM/ch/conga.c @@ -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; diff --git a/src/MM/ch/jujuhitbox.c b/src/MM/ch/jujuhitbox.c index d03d3a83..d2490515 100644 --- a/src/MM/ch/jujuhitbox.c +++ b/src/MM/ch/jujuhitbox.c @@ -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; } } diff --git a/src/MM/ch/lmonkey.c b/src/MM/ch/lmonkey.c index fd1a583d..7a39d6e3 100644 --- a/src/MM/ch/lmonkey.c +++ b/src/MM/ch/lmonkey.c @@ -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); diff --git a/src/MM/ch/orange.c b/src/MM/ch/orange.c index a550b53e..62f54a49 100644 --- a/src/MM/ch/orange.c +++ b/src/MM/ch/orange.c @@ -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); } diff --git a/src/MM/ch/orangepad.c b/src/MM/ch/orangepad.c index 5453d1e7..0943cac0 100644 --- a/src/MM/ch/orangepad.c +++ b/src/MM/ch/orangepad.c @@ -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); } } diff --git a/src/MMM/ch/loggo.c b/src/MMM/ch/loggo.c index f96c8d66..5d0809b8 100644 --- a/src/MMM/ch/loggo.c +++ b/src/MMM/ch/loggo.c @@ -36,7 +36,7 @@ void __chLoggo_textCallback(ActorMarker* caller, enum asset_e text_id, s32 arg3) void __chLoggo_collide(ActorMarker* this_marker, ActorMarker *other_marker) { Actor *this = marker_getActor(this_marker); if ((player_getTransformation() == TRANSFORM_3_PUMPKIN) && !fileProgressFlag_get(FILEPROG_89_ENTERED_LOGGO_AS_PUMPKIN)) { - if (func_80311480(ASSET_ADF_TEXT_ENTER_LOGGO, 0x2B, this->position, this->marker, &__chLoggo_textCallback, 0) != 0) { + if (gcdialog_showText(ASSET_ADF_TEXT_ENTER_LOGGO, 0x2B, this->position, this->marker, &__chLoggo_textCallback, 0) != 0) { actor_collisionOff(this); fileProgressFlag_set(FILEPROG_89_ENTERED_LOGGO_AS_PUMPKIN, TRUE); @@ -50,7 +50,7 @@ void __chLoggo_collide(ActorMarker* this_marker, ActorMarker *other_marker) { } if ((player_getTransformation() == TRANSFORM_1_BANJO) && !fileProgressFlag_get(FILEPROG_88_TRIED_LOGGO_AS_BEAR)){ - if(func_80311480(ASSET_ADE_TEXT_LOGGO_AS_BEAR, 0x2A, this->position, NULL, NULL, NULL)) { + if(gcdialog_showText(ASSET_ADE_TEXT_LOGGO_AS_BEAR, 0x2A, this->position, NULL, NULL, NULL)) { fileProgressFlag_set(FILEPROG_88_TRIED_LOGGO_AS_BEAR, TRUE); } } @@ -71,7 +71,7 @@ void chLoggo_update(Actor *this){ actor_loopAnimation(this); this->lifetime_value = 0.0f; if(!fileProgressFlag_get(FILEPROG_8A_EXITED_LOGGO) && levelSpecificFlags_get(0x33)){ - if(func_80311480(ASSET_AE0_TEXT_EXIT_LOGGO, 4, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_AE0_TEXT_EXIT_LOGGO, 4, NULL, NULL, NULL, NULL)){ fileProgressFlag_set(FILEPROG_8A_EXITED_LOGGO, TRUE); } } diff --git a/src/MMM/ch/napper.c b/src/MMM/ch/napper.c index 78afd1b3..d2e8e042 100644 --- a/src/MMM/ch/napper.c +++ b/src/MMM/ch/napper.c @@ -63,7 +63,7 @@ void func_80386ACC(ActorMarker *this_marker, ActorMarker *other_marker){ Actor *this = marker_getActor(this_marker); if(!this->is_first_encounter){ - if(func_80311480(0xad8, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(0xad8, 0, NULL, NULL, NULL, NULL)){ this->is_first_encounter = TRUE; } } diff --git a/src/MMM/code_3420.c b/src/MMM/code_3420.c index eea14df9..9abbb008 100644 --- a/src/MMM/code_3420.c +++ b/src/MMM/code_3420.c @@ -175,7 +175,7 @@ void func_803898EC() { } void func_80389910() { - func_80311480(0xAD5, 0xE, NULL, NULL, MMM_func_80389810, NULL); + gcdialog_showText(0xAD5, 0xE, NULL, NULL, MMM_func_80389810, NULL); timedFunc_set_2(0.0f, func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF); timed_setStaticCameraToNode(2.0f, 0); timedFunc_set_0(2.1f, MMM_func_803898A0); @@ -195,10 +195,10 @@ void organMinigame_setState(s32 next_state){ if(next_state == 2){ if(D_8038C4F0.pattern == 0){ D_8038C4F0.pattern = 1; - func_80311480(0xad3, 4, NULL, NULL, MMM_func_80389810, NULL); + gcdialog_showText(0xad3, 4, NULL, NULL, MMM_func_80389810, NULL); } else{//L80389A84 - func_80311480(0xad6, 4, NULL, NULL, MMM_func_80389810, NULL); + gcdialog_showText(0xad6, 4, NULL, NULL, MMM_func_80389810, NULL); } }//L80389A9C @@ -215,13 +215,13 @@ void organMinigame_setState(s32 next_state){ }//L80389AF4 if(next_state == 4){ - func_80311480(0xadd, 4, NULL, NULL, MMM_func_80389810, NULL); + gcdialog_showText(0xadd, 4, NULL, NULL, MMM_func_80389810, NULL); func_80387720(D_8038C4F0.motzhand_marker); } if(next_state == 5){ D_8038C4F0.pattern++; - func_80311480(0xad4, 4, NULL, NULL, MMM_func_80389810, NULL); + gcdialog_showText(0xad4, 4, NULL, NULL, MMM_func_80389810, NULL); func_80387720(D_8038C4F0.motzhand_marker); } diff --git a/src/MMM/code_47D0.c b/src/MMM/code_47D0.c index 7e15054f..1a3595fd 100644 --- a/src/MMM/code_47D0.c +++ b/src/MMM/code_47D0.c @@ -104,7 +104,7 @@ void func_8038AF0C(ActorMarker *marker, enum asset_e text_id, s32 arg2) { } void func_8038AF3C(Struct_MMM_47D0_0 *arg0, s32 arg1) { - func_80311480(0xADB, 4, NULL, arg0->unk0, func_8038AF0C, NULL); + gcdialog_showText(0xADB, 4, NULL, arg0->unk0, func_8038AF0C, NULL); arg0->unk4 = 1; } @@ -178,7 +178,7 @@ void func_8038AF90(Struct_MMM_47D0_0 *arg0, Struct68s *arg1, f32 arg2) { player_getPosition(sp48); func_8035179C(arg1, sp54); if (!mapSpecificFlags_get(0) && (arg0->unk4 == 0) && (func_80258640(sp54, sp48) < 250.0f)){ - if(func_80311480(0xADA, 0, NULL, NULL, NULL, NULL)) { + if(gcdialog_showText(0xADA, 0, NULL, NULL, NULL, NULL)) { mapSpecificFlags_set(0, TRUE); } } diff --git a/src/RBB/ch/bossboombox.c b/src/RBB/ch/bossboombox.c index 8fea46b3..6635d601 100644 --- a/src/RBB/ch/bossboombox.c +++ b/src/RBB/ch/bossboombox.c @@ -367,7 +367,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){ } else{//L8038D220 timedFunc_set_3(0.0f, (GenFunction_3)chbossboombox_respawnJiggy, (s32)this->position_x, (s32)this->position_y, (s32)this->position_z); - func_80311480(0xb9f, 4, 0, 0, 0, 0); + gcdialog_showText(ASSET_B9F_TEXT_UNKNOWN, 4, 0, 0, 0, 0); } }//L8038D278 } diff --git a/src/RBB/ch/dolphin.c b/src/RBB/ch/dolphin.c index 454b6bba..369d4f93 100644 --- a/src/RBB/ch/dolphin.c +++ b/src/RBB/ch/dolphin.c @@ -89,7 +89,7 @@ void func_8038B900(Actor *this){ && func_80329530(this, 0x258) && !func_8028ECAC() ){ - func_80311480(0xb9b, 4, 0, 0, 0, 0); + gcdialog_showText(0xb9b, 4, 0, 0, 0, 0); this->is_first_encounter = TRUE; } } diff --git a/src/SM/ch/attacktutorial.c b/src/SM/ch/attacktutorial.c index d6f4b6a6..a2a1945a 100644 --- a/src/SM/ch/attacktutorial.c +++ b/src/SM/ch/attacktutorial.c @@ -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++; } diff --git a/src/SM/code_2990.c b/src/SM/code_2990.c index 2987014b..7e4d8456 100644 --- a/src/SM/code_2990.c +++ b/src/SM/code_2990.c @@ -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; } } diff --git a/src/SM/code_4070.c b/src/SM/code_4070.c index e81fe197..3794b1ae 100644 --- a/src/SM/code_4070.c +++ b/src/SM/code_4070.c @@ -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; diff --git a/src/TTC/ch/blubber.c b/src/TTC/ch/blubber.c index 1c9985a6..b2a79151 100644 --- a/src/TTC/ch/blubber.c +++ b/src/TTC/ch/blubber.c @@ -82,8 +82,8 @@ void func_803875D4(ActorMarker *marker){ this->actor_specific_1_f = 0.0f; if(!mapSpecificFlags_get(2)) { - text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? 0xa2a : 0xa0d; - func_80311480( text_id, 0xf, this->position, this->marker, func_80387520, func_80387574); + text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_TEXT_UNKNOWN : ASSET_A0D_TEXT_UNKNOWN; + gcdialog_showText(text_id, 0xf, this->position, this->marker, func_80387520, func_80387574); mapSpecificFlags_set(2, TRUE); } } @@ -149,7 +149,7 @@ void func_803878CC(Actor * this){ && !this->is_first_encounter && item_getCount(ITEM_18_GOLD_BULLIONS) == 0 ){ - func_80311480(0xa0b, 0xe, this->position, this->marker, func_80387520, NULL); + gcdialog_showText(ASSET_A0B_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80387520, NULL); this->is_first_encounter = TRUE; subaddie_set_state_forward(this, 3); } @@ -157,8 +157,9 @@ void func_803878CC(Actor * this){ if( mapSpecificFlags_get(0) && !this->unk138_23 ){ - if(item_getCount(ITEM_18_GOLD_BULLIONS) == 0) - func_80311480(0xa0c, 4, NULL, NULL, NULL, NULL); + if (item_getCount(ITEM_18_GOLD_BULLIONS) == 0) { + gcdialog_showText(ASSET_A0C_TEXT_UNKNOWN, 4, NULL, NULL, NULL, NULL); + } this->unk138_23 = TRUE; this->is_first_encounter = TRUE; diff --git a/src/TTC/ch/clam.c b/src/TTC/ch/clam.c index 8cc23d61..4451cf9a 100644 --- a/src/TTC/ch/clam.c +++ b/src/TTC/ch/clam.c @@ -249,7 +249,7 @@ void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_marker){ if(func_80297C6C() == 3) return; - if( !mapSpecificFlags_get(5) && func_80311480(0xA14, 0, NULL, NULL, NULL, NULL)){ + if( !mapSpecificFlags_get(5) && gcdialog_showText(ASSET_A14_TEXT_UNKNOWN, 0, NULL, NULL, NULL, NULL)){ mapSpecificFlags_set(5, TRUE); } diff --git a/src/TTC/ch/leaky.c b/src/TTC/ch/leaky.c index 2e11ff9c..59e95927 100644 --- a/src/TTC/ch/leaky.c +++ b/src/TTC/ch/leaky.c @@ -57,7 +57,7 @@ void chLeaky_update(Actor *this) { && !this->is_first_encounter && func_80329530(this, 250) && !func_80329530(this, 160) && !func_8028ECAC() - && func_80311480(0xA1A, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(0xA1A, 0, NULL, NULL, NULL, NULL) ){ this->is_first_encounter = TRUE; } @@ -111,6 +111,6 @@ bool chLeaky_eggCollision(ActorMarker *marker){ levelSpecificFlags_set(2, TRUE); levelSpecificFlags_set(5, TRUE); - func_80311480(ASSET_A28_TEXT_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_startCutscene, NULL); + gcdialog_showText(ASSET_A28_TEXT_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_startCutscene, NULL); return TRUE; } diff --git a/src/TTC/ch/lockup.c b/src/TTC/ch/lockup.c index a13732bf..1a663474 100644 --- a/src/TTC/ch/lockup.c +++ b/src/TTC/ch/lockup.c @@ -81,7 +81,7 @@ void func_80389600(Actor *this){ && func_80329530(this, 320) && !func_80329530(this, 160) && !func_8028ECAC() - && func_80311480(0xA15, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(0xA15, 0, NULL, NULL, NULL, NULL) ){ this->is_first_encounter = TRUE; }//L803896AC diff --git a/src/TTC/ch/nipper.c b/src/TTC/ch/nipper.c index 0a9e4679..7074f2ac 100644 --- a/src/TTC/ch/nipper.c +++ b/src/TTC/ch/nipper.c @@ -147,7 +147,7 @@ void func_80388178(ActorMarker *this_marker, ActorMarker *other_marker) { TTC_func_80387FF4(this); this->lifetime_value = 80.0f; - func_80311480(0xA10, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xA10, 4, NULL, NULL, NULL, NULL); return; } @@ -168,7 +168,7 @@ void func_80388344(ActorMarker * this_marker, ActorMarker *other_marker){ this = marker_getActor(this_marker); if( !mapSpecificFlags_get(7) && this->is_first_encounter - && func_80311480(0xa0f, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(0xa0f, 0, NULL, NULL, NULL, NULL) ){ mapSpecificFlags_set(7, TRUE); } @@ -179,7 +179,7 @@ void func_803883C8(ActorMarker * this_marker, ActorMarker *other_marker){ Actor *this = marker_getActor(this_marker); if( !this->unk138_23 && this->is_first_encounter - && func_80311480(0xa11, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(0xa11, 0, NULL, NULL, NULL, NULL) ){ this->unk138_23 = TRUE; } @@ -234,7 +234,7 @@ void func_80388434(Actor *this){ && temp_v0 != 10 ){ subaddie_set_state_with_direction(this, 5, 0.01f, 1); - if(func_80311480(0xa0e, 0xf, this->position, this->marker, TTC_func_80387FB0, NULL)){ + if(gcdialog_showText(0xa0e, 0xf, this->position, this->marker, TTC_func_80387FB0, NULL)){ this->is_first_encounter = TRUE; } comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 5000, 300); diff --git a/src/TTC/ch/treasurehunt.c b/src/TTC/ch/treasurehunt.c index f423908f..5c31d7b0 100644 --- a/src/TTC/ch/treasurehunt.c +++ b/src/TTC/ch/treasurehunt.c @@ -116,10 +116,10 @@ void func_80389A9C(void) { void func_80389B38(s32 arg0){ if(D_8037DCB4 == arg0 && TTC_func_803899C0()){ if(arg0 == 0 && !jiggyscore_isCollected(JIGGY_11_TTC_RED_X)){ - func_80311480(0xA18, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xA18, 4, NULL, NULL, NULL, NULL); } else if(arg0 == 4){ - func_80311480(0xA19, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xA19, 4, NULL, NULL, NULL, NULL); } D_8037DCB4++; @@ -170,7 +170,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){ gcpausemenu_80314AC8(0); timedFunc_set_2(0.1f, (GenFunction_2) func_8028F45C, 9, (s32)&D_8038D708); timedFunc_set_1(0.1f, (GenFunction_1) gcpausemenu_80314AC8, 1); - func_80311480(ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL); D_8037DCB4++; }//L80389E70 } diff --git a/src/TTC/code_3E30.c b/src/TTC/code_3E30.c index 3c1d910d..9267fca5 100644 --- a/src/TTC/code_3E30.c +++ b/src/TTC/code_3E30.c @@ -681,7 +681,7 @@ void __sandcastleCodes_eraseGameDialogCallback(ActorMarker *caller, enum asset_e if (confirmed == 1) { __sandcastleCodes_setNumberEntered(3); func_8038B800(D_8038CAD4); - func_80311480(0xFBF, 0xC, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_FBF_TEXT_UNKNOWN, 0xC, NULL, NULL, NULL, NULL); gameFile_clear(func_802C5A30()); gameFile_8033CFD4(func_802C5A30()); func_802C5A3C(-1); @@ -710,11 +710,11 @@ void TTC_func_8038BBA0(s32 secretCodeIndex) { __sandcastleCodes_setNumberEntered(2); func_8038B800(secretCodeIndex); func_8038B5B4(); - func_80311480(0xFBE, 0xC, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_FBE_TEXT_UNKNOWN, 0xC, NULL, NULL, NULL, NULL); return; case 2: D_8038CAD4 = secretCodeIndex; - func_80311480(0xE38, 0xC, NULL, NULL, __sandcastleCodes_eraseGameDialogCallback, NULL); + gcdialog_showText(ASSET_E38_TEXT_UNKNOWN, 0xC, NULL, NULL, __sandcastleCodes_eraseGameDialogCallback, NULL); return; } return; diff --git a/src/core2/abilityprogress.c b/src/core2/abilityprogress.c index 4d1634fc..b32c1547 100644 --- a/src/core2/abilityprogress.c +++ b/src/core2/abilityprogress.c @@ -30,45 +30,49 @@ void ability_use(s32 arg0){ break; case 0x3://L8029569C // if(map_get() == MAP_1_SM_SPIRAL_MOUNTAIN){ - sp2C = 0xDFC; + sp2C = ASSET_DFC_TEXT_UNKNOWN; } break; case 0x4://L802956B8 // if(map_get() == MAP_1_SM_SPIRAL_MOUNTAIN){ - sp2C = 0xE02; + sp2C = ASSET_E02_TEXT_UNKNOWN; } break; case 0x5://L802956D4 //barge if(map_get() == MAP_1_SM_SPIRAL_MOUNTAIN){ - sp2C = 0xE05; + sp2C = ASSET_E05_TEXT_UNKNOWN; } break; case 0x6://L802956F0 //slide sp28 = 0; - if(!ability_isUnlocked(ABILITY_10_TALON_TROT)){ - if(map_get() == MAP_2_MM_MUMBOS_MOUNTAIN){ - sp2C = 0xB4D; + if (!ability_isUnlocked(ABILITY_10_TALON_TROT)) { + if (map_get() == MAP_2_MM_MUMBOS_MOUNTAIN) { + sp2C = ASSET_B4D_TEXT_UNKNOWN; } - else + else { return; + } } - else{ + else { abilityprogress_usedAbilities |= (1 << arg0); } break; case 0x8://L80295738 //fly - sp2C = 0xA26; + sp2C = ASSET_A26_DIALOG_NEED_RED_FEATHERS_TO_FLY; break; case 0x7://L80295740 //egg case 0x9://L80295740 //shock break; }//L80295744 - if(sp28) + + if (sp28) { comusic_playTrack(COMUSIC_2B_DING_B); - - if(sp2C) - func_80311480(sp2C, 4, NULL, NULL, NULL, 0); - + } + + if (sp2C) { + gcdialog_showText(sp2C, 4, NULL, NULL, NULL, 0); + } + abilityprogress_usedAbilities |= (1 << arg0); } @@ -77,7 +81,7 @@ int ability_hasUsed(enum ability_e move){ } void ability_setHasUsed(enum ability_e move){ - abilityprogress_usedAbilities |= (1 << move); + abilityprogress_usedAbilities |= (1 << move); } int ability_hasLearned(enum ability_e move){ @@ -97,9 +101,9 @@ void ability_clearAll(void){ void ability_setLearned(s32 move, s32 val){ if(val){ - abilityprogress_learnedAbilities |= (1 << move); + abilityprogress_learnedAbilities |= (1 << move); }else{ - abilityprogress_learnedAbilities &= ~(1 << move); + abilityprogress_learnedAbilities &= ~(1 << move); } } diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index a3f7c6a6..7acacdc7 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -123,7 +123,7 @@ void __baMarker_8028B848(void){ if(player_getTransformation() == TRANSFORM_1_BANJO){ __baMarker_8028B7F4(); } - func_80311480(s0, 0x2A, NULL, NULL, NULL, 0); + gcdialog_showText(s0, 0x2A, NULL, NULL, NULL, 0); } } @@ -717,7 +717,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ miscFlag_set(MISC_FLAG_2_ON_SPRING_PAD); }else{ if(!volatileFlag_getAndSet(VOLATILE_FLAG_C_HAS_SEEN_SPRING_PAD, 1)){ - func_80311480(ASSET_A24_DIALOG_JUMP_PAD_DISCOVERED, 4, 0, 0, 0, 0); + gcdialog_showText(ASSET_A24_DIALOG_JUMP_PAD_DISCOVERED, 4, 0, 0, 0, 0); } } break; @@ -729,7 +729,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ miscFlag_set(MISC_FLAG_1_ON_FLIGHT_PAD); } else if(! volatileFlag_getAndSet(VOLATILE_FLAG_D_HAS_SEEN_FLIGHT_PAD, 1)){ - func_80311480(ASSET_A25_DIALOG_FLY_DISC_DISCOVERED, 4, 0, 0, 0, 0); + gcdialog_showText(ASSET_A25_DIALOG_FLY_DISC_DISCOVERED, 4, 0, 0, 0, 0); } break; diff --git a/src/core2/bs/jig.c b/src/core2/bs/jig.c index 21b0e5a8..8ea501b5 100644 --- a/src/core2/bs/jig.c +++ b/src/core2/bs/jig.c @@ -134,7 +134,7 @@ void bsjig_jiggy_end(void){ } }//L802B0E88 if(sp2C != 0){ - func_80311480(sp2C, sp28, 0, 0, 0, 0); + gcdialog_showText(sp2C, sp28, 0, 0, 0, 0); } }//L802B0EA4 func_80298A64(); diff --git a/src/core2/ch/beehive.c b/src/core2/ch/beehive.c index 74a80315..0ba25e1c 100644 --- a/src/core2/ch/beehive.c +++ b/src/core2/ch/beehive.c @@ -62,7 +62,7 @@ void chBeehive_update(Actor *this){ ){ if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){ if( player_getTransformation() == TRANSFORM_1_BANJO - && func_80311480(ASSET_D96_DIALOG_BEEHIVE_MEET, 0, NULL, NULL, NULL, 0) + && gcdialog_showText(ASSET_D96_DIALOG_BEEHIVE_MEET, 0, NULL, NULL, NULL, 0) ){ fileProgressFlag_set(FILEPROG_D_BEEHIVE_TEXT, 1); } diff --git a/src/core2/ch/bottlesbonus.c b/src/core2/ch/bottlesbonus.c index 6e661681..3d5c7723 100644 --- a/src/core2/ch/bottlesbonus.c +++ b/src/core2/ch/bottlesbonus.c @@ -405,7 +405,7 @@ void chBottlesBonus_lose(u8 *arg0, enum asset_e text_id) { *arg0 = 1; timedFunc_set_0(2.0f, chBottlesBonusCursor_func_802DF99C); func_80311714(0); - func_80311480(text_id, 0x86, actor->position, chBottlesBonusMarker, chBottlesBonus_func_802DE224, NULL); + gcdialog_showText(text_id, 0x86, actor->position, chBottlesBonusMarker, chBottlesBonus_func_802DE224, NULL); func_80311714(1); } else{ @@ -424,7 +424,7 @@ void chBottlesBonus_completedPuzzle(void) { actor = marker_getActor(chBottlesBonusMarker); D_8037DCC0[chBottleBonusPuzzleIndex] = TRUE; func_80311714(0); - func_80311480(D_803681A0[chBottleBonusPuzzleIndex + 1].text_id, 0x86, actor->position, chBottlesBonusMarker, chBottlesBonus_IncrementPuzzle, NULL); + gcdialog_showText(D_803681A0[chBottleBonusPuzzleIndex + 1].text_id, 0x86, actor->position, chBottlesBonusMarker, chBottlesBonus_IncrementPuzzle, NULL); func_80311714(1); } @@ -521,7 +521,7 @@ void chBottlesBonus_update(Actor *this) { func_8025A7DC(COMUSIC_98_BBONUS_PIECES_SHUFFLE); if (D_8037DCC7 == 0) { func_80311714(0); - func_80311480(0xE24, 0x87, this->position, chBottlesBonusMarker, chBottlesBonus_startTimer, NULL); + gcdialog_showText(ASSET_E24_TEXT_UNKNOWN, 0x87, this->position, chBottlesBonusMarker, chBottlesBonus_startTimer, NULL); func_80311714(1); D_8037DCC7 = 1; } diff --git a/src/core2/ch/crab.c b/src/core2/ch/crab.c index c185f734..bd74921d 100644 --- a/src/core2/ch/crab.c +++ b/src/core2/ch/crab.c @@ -270,7 +270,7 @@ void chCrab_update(Actor *this) { && !func_8028ECAC() ) { if ((this->state != 6) && (this->state != 5)) { - func_80311480(ASSET_D32_DIALOG_MUTANT_CRAB_MEET, 0xF, this->position, NULL, __chCrab_mutantTextCallback, NULL); + 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; @@ -283,10 +283,10 @@ void chCrab_update(Actor *this) { && !jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE) && func_80329530(this, 1600) ) { - func_80311480(0xA12, 4, this->position, NULL, NULL, NULL); + gcdialog_showText(0xA12, 4, this->position, NULL, NULL, NULL); mapSpecificFlags_set(0, TRUE); } else if (mapSpecificFlags_get(1)) { - func_80311480(0xA13, 4, this->position, NULL, NULL, NULL); + gcdialog_showText(0xA13, 4, this->position, NULL, NULL, NULL); mapSpecificFlags_set(1, FALSE); } } diff --git a/src/core2/ch/gloop.c b/src/core2/ch/gloop.c index cf460ecb..4e172498 100644 --- a/src/core2/ch/gloop.c +++ b/src/core2/ch/gloop.c @@ -60,7 +60,7 @@ void chgloop_update(Actor *this){ if( !mapSpecificFlags_get(2) && func_80329530(this, 350) - && func_80311480(ASSET_D34_TEXT_GLOOP_MEET, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(ASSET_D34_TEXT_GLOOP_MEET, 0, NULL, NULL, NULL, NULL) ){ mapSpecificFlags_set(2, TRUE); } diff --git a/src/core2/ch/jinjo.c b/src/core2/ch/jinjo.c index 45fc9eed..f8fef90a 100644 --- a/src/core2/ch/jinjo.c +++ b/src/core2/ch/jinjo.c @@ -46,7 +46,7 @@ void __chJinjo_802CDBA8(ActorMarker *this, ActorMarker *other){ if(actorPtr->state < 5){ if(!fileProgressFlag_get(FILEPROG_E_JINJO_TEXT)){ - func_80311480(__chJinjo_getMeetDialogId(actorPtr->marker->id), 4, 0, 0, 0, 0); + gcdialog_showText(__chJinjo_getMeetDialogId(actorPtr->marker->id), 4, 0, 0, 0, 0); fileProgressFlag_set(FILEPROG_E_JINJO_TEXT, 1); } subaddie_set_state_with_direction(actorPtr, 6, 0.0f , -1); diff --git a/src/core2/ch/mole.c b/src/core2/ch/mole.c index ebfaf1fd..8ccff89f 100644 --- a/src/core2/ch/mole.c +++ b/src/core2/ch/mole.c @@ -157,10 +157,10 @@ void chmole_healthRefill(ActorMarker *marker, enum asset_e arg1, s32 arg2){ if( arg1 == moleTable[actor->unkF4_8-9].learn_text && item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL) ){ - func_80311480(ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH, 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions); + gcdialog_showText(ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH, 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions); }//L802D9738 else if(arg1 == moleTable[actor->unkF4_8-9].learn_text || arg1 == ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH){ - func_80311480(chmole_learnedAllGameAbilities()? 0xa87 : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL); + gcdialog_showText(chmole_learnedAllGameAbilities()? 0xa87 : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL); } else{//L802D97BC if(actor->is_first_encounter){ @@ -242,7 +242,7 @@ int chmole_learnAbility(Actor *this){ break; } }//L802D9A9C - func_80311480(sp2C, sp28, this->position, this->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions); + gcdialog_showText(sp2C, sp28, this->position, this->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions); return TRUE; } diff --git a/src/core2/ch/snacker.c b/src/core2/ch/snacker.c index a5d97e04..1f8b9537 100644 --- a/src/core2/ch/snacker.c +++ b/src/core2/ch/snacker.c @@ -81,7 +81,7 @@ static void __chsnacker_start_dialog(Actor *this) { text_index = mapSpecificFlags_getN(8, 3); if( !this->is_first_encounter ) { if(text_index < 4) { - if(func_80311480(0xA1B + text_index, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(0xA1B + text_index, 0, NULL, NULL, NULL, NULL)){ text_index++; mapSpecificFlags_setN(8, text_index, 3); this->is_first_encounter = TRUE; @@ -157,7 +157,7 @@ static void __chsnacker_ow(ActorMarker *marker, ActorMarker *other){ this = marker_getActor(marker); if(level_get() == LEVEL_2_TREASURE_TROVE_COVE && !player_isDead()){ - func_80311480(0xA29, 0, NULL, NULL, NULL, NULL); + gcdialog_showText(0xA29, 0, NULL, NULL, NULL, NULL); }//L802E10A4 if(this->state == 4){ diff --git a/src/core2/ch/termite.c b/src/core2/ch/termite.c index 0628766d..5ae10aed 100644 --- a/src/core2/ch/termite.c +++ b/src/core2/ch/termite.c @@ -170,7 +170,7 @@ void chTermite_update(Actor *this) { && func_8028ECAC() == 0 && player_getTransformation() == TRANSFORM_1_BANJO ) { - func_80311480(ASSET_B43_DIALOG_TERMITE_MEET_AS_BEAR, 7, this->position, this->marker, __chTermite_testCallback, NULL); + 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; @@ -182,11 +182,11 @@ void chTermite_update(Actor *this) { && player_getTransformation() == TRANSFORM_2_TERMITE ) { if (!levelSpecificFlags_get(0xB)) { - if (func_80311480(ASSET_B41_DIALOG_TERMITE_COOL_SHORTS, 0, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(ASSET_B41_DIALOG_TERMITE_COOL_SHORTS, 0, NULL, NULL, NULL, NULL)) { levelSpecificFlags_set(0xB, TRUE); this->unk138_23 = TRUE; } - } else if (!levelSpecificFlags_get(0xC) && !this->unk138_23 && (func_80311480(ASSET_B42_DIALOG_TERMITE_COOL_BACKPACK, 0, NULL, NULL, NULL, NULL))) { + } else if (!levelSpecificFlags_get(0xC) && !this->unk138_23 && (gcdialog_showText(ASSET_B42_DIALOG_TERMITE_COOL_BACKPACK, 0, NULL, NULL, NULL, NULL))) { levelSpecificFlags_set(0xC, TRUE); } } diff --git a/src/core2/ch/trainers.c b/src/core2/ch/trainers.c index df2d2cb1..91c950b0 100644 --- a/src/core2/ch/trainers.c +++ b/src/core2/ch/trainers.c @@ -81,7 +81,7 @@ void chtrainers_update(Actor *this){ && !volatileFlag_get(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES) && player_getTransformation() == TRANSFORM_1_BANJO ){ - if(func_80311480(0xda4, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(0xda4, 0, NULL, NULL, NULL, NULL)){ volatileFlag_set(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES, TRUE); } }//L802CA620 diff --git a/src/core2/ch/wadingboots.c b/src/core2/ch/wadingboots.c index c3f2aec1..8e4a93ab 100644 --- a/src/core2/ch/wadingboots.c +++ b/src/core2/ch/wadingboots.c @@ -69,7 +69,7 @@ void chwadingboots_update(Actor *this){ if(!func_80329530(this, 250)) break; if(player_getTransformation() != TRANSFORM_1_BANJO) break; - if(func_80311480(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0, NULL, NULL, NULL, NULL)){ volatileFlag_set(VOLATILE_FLAG_10_HAS_MEET_WADING_BOOTS, TRUE); } diff --git a/src/core2/code_14420.c b/src/core2/code_14420.c index 3461a6a8..6e607c4f 100644 --- a/src/core2/code_14420.c +++ b/src/core2/code_14420.c @@ -342,7 +342,7 @@ void func_8029B890(void){ func_8029B62C(); return; } - func_80311480(0xf81, 7, NULL, NULL, func_8029B85C, NULL); + gcdialog_showText(0xf81, 7, NULL, NULL, func_8029B85C, NULL); fileProgressFlag_set(FILEPROG_A8_HAS_DIED, TRUE); } else{ diff --git a/src/core2/code_47BD0.c b/src/core2/code_47BD0.c index c5086e53..5100954f 100644 --- a/src/core2/code_47BD0.c +++ b/src/core2/code_47BD0.c @@ -448,7 +448,7 @@ void chBeeSwarm_update(Actor *this) { if (!fileProgressFlag_get(FILEPROG_8F_MET_BEE_INFESTED_BEEHIVE) && subaddie_playerIsWithinCylinder(this, 250, 300) && ((func_8028ECAC() == 0) || (func_8028ECAC() == BSGROUP_8_TROT)) && (player_getTransformation() == TRANSFORM_1_BANJO) - && (func_80311480(0xDA6, 0, NULL, NULL, NULL, NULL) != 0) + && (gcdialog_showText(0xDA6, 0, NULL, NULL, NULL, NULL) != 0) ) { fileProgressFlag_set(FILEPROG_8F_MET_BEE_INFESTED_BEEHIVE, TRUE); } diff --git a/src/core2/code_4A6F0.c b/src/core2/code_4A6F0.c index 6298ab28..f76e583f 100644 --- a/src/core2/code_4A6F0.c +++ b/src/core2/code_4A6F0.c @@ -144,12 +144,12 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3 this = marker_getActor(caller); switch(text_id){ case ASSET_D8F_DIALOG_MUMBO_MEET: //L802D1A04 - func_80311480((this->unk38_0) ? ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS : ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS, 0xe, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showText((this->unk38_0) ? ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS : ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS, 0xe, this->position, this->marker, __chMumbo_textCallback, NULL); return; case ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR: //L802D1A40 fileProgressFlag_set(FILEPROG_12_HAS_TRANSFORMED_BEFORE, TRUE); - func_80311480(ASSET_D8F_DIALOG_MUMBO_MEET + D_8037DDF0, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_D8F_DIALOG_MUMBO_MEET + D_8037DDF0, 4, NULL, NULL, NULL, NULL); gcpausemenu_80314AC8(1); break; @@ -192,16 +192,16 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3 void chMumbo_func_802D1B8C(Actor *this, enum transformation_e transform_id) { if (this->unk10_12 != 0) { - func_80311480(fileProgressFlag_getN(FILEPROG_BB_MUMBO_MISTAKE_INDEX, 2) + ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showText(fileProgressFlag_getN(FILEPROG_BB_MUMBO_MISTAKE_INDEX, 2) + ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); return; } if (fileProgressFlag_get(FILEPROG_12_HAS_TRANSFORMED_BEFORE)) { if (this->velocity[0] == 0.0f) { - func_80311480(transform_id + ASSET_D8F_DIALOG_MUMBO_MEET, 6, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showText(transform_id + ASSET_D8F_DIALOG_MUMBO_MEET, 6, this->position, this->marker, __chMumbo_textCallback, NULL); return; } if (map_get() == MAP_7A_GL_CRYPT && transform_id == TRANSFORM_3_PUMPKIN && !fileProgressFlag_get(FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT)) { - func_80311480(ASSET_DAD_DIALOG_MUMBO_XFORM_IN_CRYPT, 6, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showText(ASSET_DAD_DIALOG_MUMBO_XFORM_IN_CRYPT, 6, this->position, this->marker, __chMumbo_textCallback, NULL); fileProgressFlag_set(FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT, TRUE); return; } @@ -209,7 +209,7 @@ void chMumbo_func_802D1B8C(Actor *this, enum transformation_e transform_id) { subaddie_set_state(this, 4U); return; } - func_80311480(ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showText(ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); } void chMumbo_update(Actor *this) { @@ -282,7 +282,7 @@ void chMumbo_update(Actor *this) { && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) ) { subaddie_set_state(this, 3); - func_80311480(ASSET_D8F_DIALOG_MUMBO_MEET, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showText(ASSET_D8F_DIALOG_MUMBO_MEET, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); fileProgressFlag_set(FILEPROG_11_HAS_MET_MUMBO, TRUE); break; } @@ -293,7 +293,7 @@ void chMumbo_update(Actor *this) { && this->unk38_0 ){ subaddie_set_state(this, 3); - func_80311480(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showText(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); fileProgressFlag_set(FILEPROG_DC_HAS_HAD_ENOUGH_TOKENS_BEFORE, TRUE); break; } @@ -331,7 +331,7 @@ void chMumbo_update(Actor *this) { && randf() < 0.01 && sp48 ) { - func_80311480(ASSET_DAE_DIALOG_MUMBO_TREX_START, 6, NULL, this->marker, __chMumbo_textCallback, NULL); + 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; subaddie_set_state(this, 3); @@ -360,7 +360,7 @@ void chMumbo_update(Actor *this) { break; } func_8025A6EC(COMUSIC_2C_BUZZER, 22000); - if ((levelSpecificFlags_get(0x3E) == 0) && (func_80311480(ASSET_DAC_DIALOG_MUMBO_FAIL_TO_BUY, 0, NULL, NULL, NULL, NULL) != 0)) { + if ((levelSpecificFlags_get(0x3E) == 0) && (gcdialog_showText(ASSET_DAC_DIALOG_MUMBO_FAIL_TO_BUY, 0, NULL, NULL, NULL, NULL) != 0)) { levelSpecificFlags_set(0x3E, 1); } } @@ -418,7 +418,7 @@ void chMumbo_update(Actor *this) { } if (this->is_first_encounter) { subaddie_set_state(this, 3); - func_80311480(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 6, NULL, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showText(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 6, NULL, this->marker, __chMumbo_textCallback, NULL); break; } gcpausemenu_80314AC8(1); @@ -435,7 +435,7 @@ void chMumbo_update(Actor *this) { sp48 = chMumbo_withinHorzDistToPlayer(0, -0x6B, 0xBC); } if (sp48 != 0) { - func_80311480(ASSET_DA7_DIALOG_MUMBO_CCW_SUMMER, 7, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_DA7_DIALOG_MUMBO_CCW_SUMMER, 7, NULL, NULL, NULL, NULL); volatileFlag_set(FILEPROG_11_HAS_MET_MUMBO, TRUE); } } @@ -451,7 +451,7 @@ void chMumbo_update(Actor *this) { sp48 = chMumbo_withinHorzDistToPlayer(0, -0x6B, 0xBC); } if (sp48 != 0) { - func_80311480(ASSET_DA8_DIALOG_MUMBO_CCW_AUTUMN, 7, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_DA8_DIALOG_MUMBO_CCW_AUTUMN, 7, NULL, NULL, NULL, NULL); volatileFlag_set(FILEPROG_12_HAS_TRANSFORMED_BEFORE, TRUE); } } @@ -512,7 +512,7 @@ void chMumbo_detransformWarn(s32 this, s32 arg1){ if(D_8037DDF3) return; - func_80311480(fileProgressFlag_getAndSet(FILEPROG_83_MAGIC_GET_WEAK_TEXT, TRUE) ? ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV : ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL, 0xe, NULL, NULL, NULL, NULL); + gcdialog_showText(fileProgressFlag_getAndSet(FILEPROG_83_MAGIC_GET_WEAK_TEXT, TRUE) ? ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV : ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL, 0xe, NULL, NULL, NULL, NULL); } void chMumbo_detransformTrigger(s32 this, s32 arg1){ @@ -520,7 +520,7 @@ void chMumbo_detransformTrigger(s32 this, s32 arg1){ xform = player_getTransformation(); if(xform == TRANSFORM_1_BANJO || xform == TRANSFORM_7_WISHWASHY || D_8037DDF1) return; - func_80311480(fileProgressFlag_getAndSet(FILEPROG_84_MAGIC_ALL_GONE_TEXT, TRUE) ? ASSET_F5E_DIALOG_MUMBO_MAGIC_RUN_OUT_ABREV: ASSET_F5D_DIALOG_MUMBO_MAGIC_RUN_OUT_FULL, 0xe, NULL, NULL, NULL, NULL); + gcdialog_showText(fileProgressFlag_getAndSet(FILEPROG_84_MAGIC_ALL_GONE_TEXT, TRUE) ? ASSET_F5E_DIALOG_MUMBO_MAGIC_RUN_OUT_ABREV: ASSET_F5D_DIALOG_MUMBO_MAGIC_RUN_OUT_FULL, 0xe, NULL, NULL, NULL, NULL); D_8037DDF1++; func_8028FB88(TRANSFORM_1_BANJO); } diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index fdbb74d8..8d35e27b 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -1057,7 +1057,7 @@ void func_802D5628(void){ }//L802D5F1C if(volatileFlag_get(VOLATILE_FLAG_22)){ - if(func_80311480(0xF82, 4, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(0xF82, 4, NULL, NULL, NULL, NULL)){ fileProgressFlag_set(FILEPROG_C1_BADDIES_ESCAPE_TEXT, TRUE); volatileFlag_set(VOLATILE_FLAG_22, 0); D_8037DE04 = 0.0f; @@ -1067,7 +1067,7 @@ void func_802D5628(void){ } } else{//L802D5FCC - if(func_80311480(D_8037DE00, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(D_8037DE00, 0, NULL, NULL, NULL, NULL)){ D_8037DE00++; if(!(D_8037DE00 < sp4C)){ D_8037DE00 = 0xF86; diff --git a/src/core2/code_53A10.c b/src/core2/code_53A10.c index 80535b34..c1a4cfc2 100644 --- a/src/core2/code_53A10.c +++ b/src/core2/code_53A10.c @@ -78,7 +78,7 @@ void func_802DAA14(Actor *this){ tmp = 0xf67; text_id = tmp; } - func_80311480(text_id, 4, NULL, this->marker, func_802DA9A0, NULL); + gcdialog_showText(text_id, 4, NULL, this->marker, func_802DA9A0, NULL); this->is_first_encounter = TRUE; } } diff --git a/src/core2/code_BEF20.c b/src/core2/code_BEF20.c index 8811349a..49149ff5 100644 --- a/src/core2/code_BEF20.c +++ b/src/core2/code_BEF20.c @@ -392,15 +392,15 @@ void func_80346DB4(s32 note_count) { if (D_80385FF0[level_id] < note_count) { D_80385FF0[level_id] = note_count; if ((level_get() == LEVEL_1_MUMBOS_MOUNTAIN) && (note_count == 50)) { - func_80311480(0xF74, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xF74, 4, NULL, NULL, NULL, NULL); } if (note_count == 100) { - func_80311480(0xF78, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xF78, 4, NULL, NULL, NULL, NULL); } if (note_count == 1) { levelSpecificFlags_set(0x34, TRUE); } - if (!levelSpecificFlags_get(0x34) && (func_80311480(0xF76, 0, NULL, NULL, NULL, NULL))) { + if (!levelSpecificFlags_get(0x34) && (gcdialog_showText(0xF76, 0, NULL, NULL, NULL, NULL))) { levelSpecificFlags_set(0x34, TRUE); } if (volatileFlag_get(VOLATILE_FLAG_17) == 0) { diff --git a/src/core2/code_CF3E0.c b/src/core2/code_CF3E0.c index 2a52de74..af97ebf8 100644 --- a/src/core2/code_CF3E0.c +++ b/src/core2/code_CF3E0.c @@ -83,7 +83,7 @@ s32 func_803563B8(enum file_progress_e progress_flag, s32 arg1) { } else { index = __findIndex(fileProgressDialogMap, progress_flag); if (index != -1) { - if (func_80311480(fileProgressDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) { + if (gcdialog_showText(fileProgressDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) { fileProgressFlag_set(progress_flag, 1); } return fileProgressFlag_get(progress_flag); @@ -109,7 +109,7 @@ s32 volatileFlag_setAndTriggerDialog(enum volatile_flags_e id, s32 arg1) { } else { index = __findIndex(gVolatileFlagDialogMap, id); if (index != -1) { - if (func_80311480(gVolatileFlagDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) { + if (gcdialog_showText(gVolatileFlagDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) { volatileFlag_set(id, 1); } return volatileFlag_get(id); diff --git a/src/core2/code_DA760.c b/src/core2/code_DA760.c index efa502f9..e2351fa4 100644 --- a/src/core2/code_DA760.c +++ b/src/core2/code_DA760.c @@ -49,7 +49,7 @@ void func_80361870(Actor *this){ if(!this->is_first_encounter && 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(func_80311480(text_id, 0, 0, 0, 0, 0)){ + if(gcdialog_showText(text_id, 0, 0, 0, 0, 0)){ this->is_first_encounter = TRUE; } } @@ -59,7 +59,7 @@ void func_80361870(Actor *this){ this->is_first_encounter = TRUE; } else{ - if(func_80311480(sp28, 0, 0, 0, 0, 0)){ + if(gcdialog_showText(sp28, 0, 0, 0, 0, 0)){ this->is_first_encounter = TRUE; volatileFlag_set(VOLATILE_FLAG_16, 0); } diff --git a/src/core2/gc/dialog.c b/src/core2/gc/dialog.c index be1f68e7..858888ea 100644 --- a/src/core2/gc/dialog.c +++ b/src/core2/gc/dialog.c @@ -942,7 +942,7 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca return 0; } -bool func_80311480(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)){ +bool gcdialog_showText(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)){ return func_80311174(text_id, arg1, pos, marker, callback, arg5, 0); } diff --git a/src/core2/snackerctl.c b/src/core2/snackerctl.c index c071b307..4fdcaf39 100644 --- a/src/core2/snackerctl.c +++ b/src/core2/snackerctl.c @@ -83,7 +83,7 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){ return 0; if(func_8034BB48() && chBottlesBonus_getPuzzleIndex() != 7){ - func_80311480(SNACKER_BB_DIALOG_0 + (chBottlesBonus_getPuzzleIndex() << 1), 6, D_80363610, NULL, NULL, NULL); + gcdialog_showText(SNACKER_BB_DIALOG_0 + (chBottlesBonus_getPuzzleIndex() << 1), 6, D_80363610, NULL, NULL, NULL); } if(!func_8028F25C() && func_80321960() == 3) func_803219F4(1); @@ -93,12 +93,12 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){ if(chBottlesBonus_getPuzzleIndex() == 6){ if(!D_8037DCCC){ func_8028F94C(4, &D_80363610); - func_80311480(SNACKER_BB_DIALOG_1, 0x6, D_80363610, NULL, func_8028A584, NULL); + gcdialog_showText(SNACKER_BB_DIALOG_1, 0x6, D_80363610, NULL, func_8028A584, NULL); } }//L8028A70C else if(chBottlesBonus_getPuzzleIndex() == 7){ func_8028F94C(4, &D_80363610); - func_80311480(ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER, 0x6, D_80363610, NULL, func_8028A558, NULL); + gcdialog_showText(ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER, 0x6, D_80363610, NULL, func_8028A558, NULL); D_8037DCCC = 1; }//L8028A764 else if(jiggyscore_isCollected(0x10)){ @@ -108,7 +108,7 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){ ){ if(!D_8037DCCA){ func_8028F94C(4, &D_80363610); - func_80311480(ASSET_E21_DIALOG_BOTTLES_BONUS_DISCOVERED, 6, D_80363610, 0, func_8028A584, NULL); + gcdialog_showText(ASSET_E21_DIALOG_BOTTLES_BONUS_DISCOVERED, 6, D_80363610, 0, func_8028A584, NULL); D_8037DCCA = 1; }else{ func_8028A584(0,0,0); @@ -118,7 +118,7 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){ else{ if(!D_8037DCCB){ func_8028F94C(4, &D_80363610); - func_80311480(ASSET_E20_DIALOG_BOTTLES_BONUS_NOT_READY, 6, D_80363610, 0, func_8028A558, NULL); + gcdialog_showText(ASSET_E20_DIALOG_BOTTLES_BONUS_NOT_READY, 6, D_80363610, 0, func_8028A558, NULL); D_8037DCCB = 1; } } diff --git a/src/core2/timedfuncqueue.c b/src/core2/timedfuncqueue.c index 419e1559..4a0a2970 100644 --- a/src/core2/timedfuncqueue.c +++ b/src/core2/timedfuncqueue.c @@ -127,10 +127,10 @@ void func_80324AA4(timefuncqueue_Struct2 *arg0){ void func_80324AEC(DelayedTextCallback *arg0) { if ((arg0->position[0] == 0.0f) && (arg0->position[1] == 0.0f) && (arg0->position[2] == 0.0f)) { - func_80311480(arg0->text_id, arg0->unk4, NULL, arg0->caller, arg0->callback_method_1, arg0->callback_method_2); + gcdialog_showText(arg0->text_id, arg0->unk4, NULL, arg0->caller, arg0->callback_method_1, arg0->callback_method_2); } else{ - func_80311480(arg0->text_id, arg0->unk4, arg0->position, arg0->caller, arg0->callback_method_1, arg0->callback_method_2); + gcdialog_showText(arg0->text_id, arg0->unk4, arg0->position, arg0->caller, arg0->callback_method_1, arg0->callback_method_2); } } diff --git a/src/fight/chfinalboss.c b/src/fight/chfinalboss.c index 68d6e1cb..9747ae8d 100644 --- a/src/fight/chfinalboss.c +++ b/src/fight/chfinalboss.c @@ -671,7 +671,7 @@ void chfinalboss_setPhase(ActorMarker *this, u32 phase_id) actor->unk1C_x = D_803927D0[(local->unk5)][0]; actor->unk1C_y = D_803927D0[(local->unk5)][1]; actor->unk1C_z = D_803927D0[(local->unk5)][2]; - func_80311480(randi2(0, 5) + 0x1106, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + 0x1106, 4, NULL, NULL, NULL, NULL); return; @@ -841,7 +841,7 @@ void func_80388110(ActorMarker *marker, enum asset_e text_id, s32 arg2) { actor = marker_getActor(marker); actorLocal = (ActorLocal_fight_180 *)&actor->local; ncStaticCamera_exit(); - func_80311480(randi2(0, 5) + 0x1101, 4, NULL, actor->marker, func_803880E0, NULL); + gcdialog_showText(randi2(0, 5) + 0x1101, 4, NULL, actor->marker, func_803880E0, NULL); actorLocal->unk9 = (u8)1; } @@ -1247,8 +1247,8 @@ void chfinalboss_phase2_update(ActorMarker *marker) { case 20: if (actor_animationIsAt(this, 0.9999f)) { if (local->hits >= 4) { - func_80311480(randi2(0, 5) + 0x1115, 0x20, NULL, NULL, NULL, NULL); - func_80311480(randi2(0, 3) + 0x111A, 4, NULL, this->marker, NULL, chfinalboss_phase2_endTextCallback); + gcdialog_showText(randi2(0, 5) + 0x1115, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 3) + 0x111A, 4, NULL, this->marker, NULL, chfinalboss_phase2_endTextCallback); chfinalboss_phase2_setState(this, 0x11); } else{ @@ -1353,7 +1353,7 @@ void chfinalboss_phase3_setState(Actor *this, s32 arg1) { case 26: fight_func_80386CF8(this); func_80324E38(0.0f, 1); - func_80311480(randi2(0, 5) + 0x112C, 0xA8, NULL, this->marker, chfinalboss_phase3_endTextCallback, NULL); + gcdialog_showText(randi2(0, 5) + 0x112C, 0xA8, NULL, this->marker, chfinalboss_phase3_endTextCallback, NULL); break; } } @@ -1494,7 +1494,7 @@ void chfinalboss_phase4_setState(Actor *this, s32 arg1) { if ((local->unk3 == 2) && (local->unkA == 0)) { iter.D_803928C4_ptr = &D_803928C4; D_803927C8 = 1; - func_80311480(randi2(0, 5) + 0x1136, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + 0x1136, 4, NULL, NULL, NULL, NULL); if ( !fileProgressFlag_get(FILEPROG_D2_HAS_SPAWNED_A_JINJO_STATUE_IN_FINAL_FIGHT) ) { local->unkA = 1U; D_803927C4 = 1; @@ -1556,7 +1556,7 @@ void chfinalboss_phase4_setState(Actor *this, s32 arg1) { break; case 34: actor_playAnimationOnce(this); - func_80311480(randi2(0, 5) + 0x1145, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + 0x1145, 0x20, NULL, NULL, NULL, NULL); func_8030E6A4(SFX_1F_HITTING_AN_ENEMY_3, randf2(0.95f, 1.05f), 32000); func_8030E6A4(SFX_133_GRUNTY_OHW, randf2(0.95f, 1.05f), 32000); this->unk44_31 = func_8030D90C(); @@ -1630,7 +1630,7 @@ void chfinalboss_phase4_update(ActorMarker *marker) { func_80324E38(1.0f, 0); } if (local->hits == 0) { - func_80311480(randi2(0, 5) + 0x1140, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + 0x1140, 0x20, NULL, NULL, NULL, NULL); } if ((local->hits + 1) < 4) { local->hits++; @@ -1762,7 +1762,7 @@ void chfinalboss_phase5_setState(Actor *this, s32 next_state) { subaddie_set_state_with_direction(this, next_state, 0.0001f, 1); switch (next_state) { case 35: - func_80311480(randi2(0, 5) + 0x114F, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + 0x114F, 4, NULL, NULL, NULL, NULL); if (local->mirror_phase5) { sp28 = 0x13; } @@ -1886,7 +1886,7 @@ void chfinalboss_phase5_update(ActorMarker *marker) { func_8028FAEC(D_803928C8); } if (__chFinalBossJinjonatorHits == 3) { - func_80311480(randi2(0, 5) + 0x1159, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + 0x1159, 0x20, NULL, NULL, NULL, NULL); } } } @@ -2036,10 +2036,10 @@ void func_8038B780(ActorMarker *marker) { sp24 = marker_getActor(marker); if (!fileProgressFlag_get(FILEPROG_CF_HAS_ENTERED_FINAL_FIGHT)) { fileProgressFlag_set(FILEPROG_CF_HAS_ENTERED_FINAL_FIGHT, TRUE); - func_80311480(0x10E7, 0x2A, sp24->position, sp24->marker, chfinalboss_phase0_endTextCallback, NULL); + gcdialog_showText(ASSET_10E7_TEXT_UNKNOWN, 0x2A, sp24->position, sp24->marker, chfinalboss_phase0_endTextCallback, NULL); } else{ - func_80311480(randi2(0, 5) + 0x10E8, 0x2B, sp24->position, sp24->marker, chfinalboss_phase0_endTextCallback, NULL); + gcdialog_showText(randi2(0, 5) + 0x10E8, 0x2B, sp24->position, sp24->marker, chfinalboss_phase0_endTextCallback, NULL); } } @@ -2091,7 +2091,7 @@ void func_8038B9AC(ActorMarker *marker, ActorMarker *other_marker) { switch (local->phase) { case 1: if (local->hits == 0) { - func_80311480(randi2(0, 5) + 0x10F7, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + 0x10F7, 0x20, NULL, NULL, NULL, NULL); } if ((local->hits + 1) < 5) { local->hits++; @@ -2105,7 +2105,7 @@ void func_8038B9AC(ActorMarker *marker, ActorMarker *other_marker) { if ((local->unk2 + 1) >= 3) { local->unk2 = 0; if (local->hits == 0) { - func_80311480(randi2(0, 5) + 0x1110, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + 0x1110, 0x20, NULL, NULL, NULL, NULL); } if ((local->hits + 1) < 5) { local->hits++; @@ -2119,7 +2119,7 @@ void func_8038B9AC(ActorMarker *marker, ActorMarker *other_marker) { break; case 3: if (local->hits == 0) { - func_80311480(randi2(0, 5) + 0x1127, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + 0x1127, 0x20, NULL, NULL, NULL, NULL); } if ((local->hits + 1) < 5) { local->hits++; @@ -2142,7 +2142,7 @@ void func_8038BB8C(ActorMarker *marker, ActorMarker *other_marker) { if (local->phase == 1) { func_8030E878(SFX_EA_GRUNTY_LAUGH_1, randf2(0.95f, 1.05f), 32000, this->position, 5000.0f, 12000.0f); if (local->unk10 == 0) { - if (func_80311480(randi2(0, 5) + 0x10ED, 0, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(randi2(0, 5) + 0x10ED, 0, NULL, NULL, NULL, NULL)) { local->unk10++; } } @@ -2151,7 +2151,7 @@ void func_8038BB8C(ActorMarker *marker, ActorMarker *other_marker) { temp_v0_2 = local->unk6; if ((local->unk6 == 0) && (this->state != 0x1A)) { local->unk6++; - func_80311480(randi2(0, 5) + 0x111D, 0, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + 0x111D, 0, NULL, NULL, NULL, NULL); } } } diff --git a/src/fight/chjinjonator.c b/src/fight/chjinjonator.c index 5da45a3f..e2dec998 100644 --- a/src/fight/chjinjonator.c +++ b/src/fight/chjinjonator.c @@ -337,7 +337,7 @@ void chjinjonator_update(Actor *this){ actor_playAnimationOnce(this); func_802BB41C(0); text_id = 0x115e + randi2(0,5); - func_80311480(text_id, 0x20, 0, 0, 0, 0); + gcdialog_showText(text_id, 0x20, 0, 0, 0, 0); } break; case 11: //80390EF8 diff --git a/src/fight/chspellfireball.c b/src/fight/chspellfireball.c index 23407535..25def0c1 100644 --- a/src/fight/chspellfireball.c +++ b/src/fight/chspellfireball.c @@ -228,28 +228,28 @@ void func_8038F3B4(ActorMarker *marker, ActorMarker *other){ func_8038F084(marker); switch(volatileFlag_getN(VOLATILE_FLAG_23_FINAL_BOSS_PHASE, 3)){ case 1: //8038F41C - if(!fight_D_803928E0 && func_80311480(randi2(0, 5) + 0x10f2, 0, 0, 0, 0, 0)) + if(!fight_D_803928E0 && gcdialog_showText(randi2(0, 5) + 0x10f2, 0, 0, 0, 0, 0)) fight_D_803928E0 = 1; break; case 2: //8038F468 - if(!D_803928E1 && func_80311480(randi2(0, 5) + 0x110b, 0, 0, 0, 0, 0)) + if(!D_803928E1 && gcdialog_showText(randi2(0, 5) + 0x110b, 0, 0, 0, 0, 0)) D_803928E1 = 1; break; case 3: //8038F4B4 - if(!D_803928E2 && func_80311480(randi2(0, 5) + 0x1122, 0, 0, 0, 0, 0)) + if(!D_803928E2 && gcdialog_showText(randi2(0, 5) + 0x1122, 0, 0, 0, 0, 0)) D_803928E2 = 1; break; case 4: //8038F500 if( !D_803928E3 && func_8038C2A4() - && func_80311480(randi2(0, 5) + 0x113b, 0, 0, 0, 0, 0) + && gcdialog_showText(randi2(0, 5) + 0x113b, 0, 0, 0, 0, 0) ) D_803928E3 = 1; break; case 5: if( !D_803928E4 && func_8038C2B0() - && func_80311480(randi2(0, 5) + 0x1154, 0, 0, 0, 0, 0) + && gcdialog_showText(randi2(0, 5) + 0x1154, 0, 0, 0, 0, 0) ) D_803928E4 = 1; break; diff --git a/src/lair/ch/brentilda.c b/src/lair/ch/brentilda.c index 9c919426..23a4a6fb 100644 --- a/src/lair/ch/brentilda.c +++ b/src/lair/ch/brentilda.c @@ -44,11 +44,11 @@ void func_8038BADC(ActorMarker *marker, enum asset_e text_id, s32 arg2) { if (text_id == ((ActorLocal_lair_5640 *)&this->local)->unk0 + 2) { if (!fileProgressFlag_get(this->unkF4_8 - 1 + FILEPROG_E9_HEALED_BY_BRENTILDA_1)) { if (item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL)) { - func_80311480(0x10A2, 0xF, this->position, this->marker, func_8038BADC, lair_func_8038BA88); + gcdialog_showText(ASSET_10A2_TEXT_UNKNOWN, 0xF, this->position, this->marker, func_8038BADC, lair_func_8038BA88); return; } } - func_80311480(0xD38, 0xC, this->position, this->marker, func_8038BADC, NULL); + gcdialog_showText(ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED, 0xC, this->position, this->marker, func_8038BADC, NULL); return; } subaddie_set_state(this, 1); @@ -182,7 +182,7 @@ void chBrentilda_update(Actor *this) { && func_8028F20C() && !func_803114B0()) { if (!fileProgressFlag_get(FILEPROG_96_MET_BRENTILDA)) { - func_80311480(ASSET_10A1_DIALOG_BRENTILDA_MEET, 0xA, this->position, this->marker, func_8038BADC, NULL); + gcdialog_showText(ASSET_10A1_DIALOG_BRENTILDA_MEET, 0xA, this->position, this->marker, func_8038BADC, NULL); fileProgressFlag_set(FILEPROG_96_MET_BRENTILDA, TRUE); subaddie_set_state(this, 2); return; diff --git a/src/lair/ch/cauldron.c b/src/lair/ch/cauldron.c index cd960f3a..bfe7a2b8 100644 --- a/src/lair/ch/cauldron.c +++ b/src/lair/ch/cauldron.c @@ -184,7 +184,7 @@ void func_8038AC7C(Actor *this) { if (35.0 < this->lifetime_value) { sp2C = (fileProgressFlag_get(FILEPROG_CF_HAS_ENTERED_FINAL_FIGHT)) ? 0xFB7 : 0xFAE; sp28 = (fileProgressFlag_get(FILEPROG_CF_HAS_ENTERED_FINAL_FIGHT)) ? 0xFBC : 0xFB7; - if (func_80311480(sp2C + this->unk38_31, 0, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(sp2C + this->unk38_31, 0, NULL, NULL, NULL, NULL)) { this->unk38_31++; this->lifetime_value = 0.0f; if (sp2C + this->unk38_31 >= sp28) { @@ -256,7 +256,7 @@ void chWarpCauldron_update(Actor *this) { } if (!fileProgressFlag_get(FILEPROG_F5_COMPLETED_A_WARP_CAULDRON_SET) && fileProgressFlag_get(chWarpCauldron_getPairedFileProgressFlagIndex(this))) { if (func_802D677C(-1) != map_get()) { - func_80311480(0xF7A, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_F7A_TEXT_UNKNOWN, 4, NULL, NULL, NULL, NULL); fileProgressFlag_set(FILEPROG_F5_COMPLETED_A_WARP_CAULDRON_SET, 1); } } @@ -278,7 +278,7 @@ void chWarpCauldron_update(Actor *this) { phi_a0 = (fileProgressFlag_get(chWarpCauldron_getPairedFileProgressFlagIndex(this)) != 0) ? SFX_107_CAULDRON_ACTIVATION_1 : SFX_108_CAULDRON_ACTIVATION_2; sfxsource_play(phi_a0, 32000); if (!fileProgressFlag_get(FILEPROG_F5_COMPLETED_A_WARP_CAULDRON_SET) && !fileProgressFlag_get(chWarpCauldron_getPairedFileProgressFlagIndex(this))) { - func_80311480(0xF79, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_F79_TEXT_UNKNOWN, 4, NULL, NULL, NULL, NULL); } if (fileProgressFlag_get(chWarpCauldron_getPairedFileProgressFlagIndex(this))){ switch(this->unkF4_8){ @@ -385,7 +385,7 @@ void chWarpCauldron_update(Actor *this) { case 6: //L8038B64C if (func_8038A690(this) && !fileProgressFlag_get(FILEPROG_F3_MET_DINGPOT)) { - func_80311480(0xFAD, 0xA, this->position, NULL, __chWarpCauldron_dingpotDialogCallback, NULL); + gcdialog_showText(ASSET_FAD_TEXT_UNKNOWN, 0xA, this->position, NULL, __chWarpCauldron_dingpotDialogCallback, NULL); } this->unk38_0 = TRUE; diff --git a/src/lair/code_5ED0.c b/src/lair/code_5ED0.c index aef1b78e..115b1884 100644 --- a/src/lair/code_5ED0.c +++ b/src/lair/code_5ED0.c @@ -1234,7 +1234,7 @@ void lair_func_8038E0B0(void) { func_802FACA4(0x16); if (sp38 != FFTT_0_NIL) { sp28 = sp38 - 1 + FILEPROG_55_FF_BK_SQUARE_INSTRUCTIONS; - if (!fileProgressFlag_get(sp28) && func_80311480(sp38 + 0x101E, 0, NULL, NULL, NULL, NULL)) { + if (!fileProgressFlag_get(sp28) && gcdialog_showText(sp38 + 0x101E, 0, NULL, NULL, NULL, NULL)) { fileProgressFlag_set(sp28, TRUE); } if ((sp38 == FFTT_6_SKULL) && (item_getCount(ITEM_16_LIFE) == 1)) { diff --git a/src/lair/code_86F0.c b/src/lair/code_86F0.c index 35a3f046..0fa4e15f 100644 --- a/src/lair/code_86F0.c +++ b/src/lair/code_86F0.c @@ -262,7 +262,7 @@ void func_8038F250(Actor *this){ && !func_8038EB58(this) && !fileProgressFlag_get(FILEPROG_DF_CAN_REMOVE_ALL_PUZZLE_PIECES) ) { - if (func_80311480(0xF7C, 2, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(0xF7C, 2, NULL, NULL, NULL, NULL)) { fileProgressFlag_set(FILEPROG_DF_CAN_REMOVE_ALL_PUZZLE_PIECES, TRUE); } } else if ((this->unkF4_8 >= 3) @@ -270,7 +270,7 @@ void func_8038F250(Actor *this){ && !func_8038EB58(this) && !fileProgressFlag_get(FILEPROG_E0_CAN_PLACE_ALL_PUZZLE_PIECES) ){ - if(func_80311480(0xF7D, 2, NULL, NULL, NULL, NULL)) { + if(gcdialog_showText(0xF7D, 2, NULL, NULL, NULL, NULL)) { fileProgressFlag_set(FILEPROG_E0_CAN_PLACE_ALL_PUZZLE_PIECES, TRUE); } } @@ -300,10 +300,10 @@ void func_8038F350(Actor *this, s32 next_state){ func_803115C4(0xF80); func_803115C4(0xF7F); if (item_getCount(ITEM_26_JIGGY_TOTAL) > 0) { - func_80311480(fileProgressFlag_get(FILEPROG_16_STOOD_ON_JIGSAW_PODIUM) ? 0xF5A : 0xF59, 6, sp50, this->marker, func_8038F078, NULL); + gcdialog_showText(fileProgressFlag_get(FILEPROG_16_STOOD_ON_JIGSAW_PODIUM) ? 0xF5A : 0xF59, 6, sp50, this->marker, func_8038F078, NULL); fileProgressFlag_set(FILEPROG_17_HAS_HAD_ENOUGH_JIGSAW_PIECES, 1); } else { - func_80311480(0xF58, 6, sp50, this->marker, func_8038F078, NULL); + gcdialog_showText(0xF58, 6, sp50, this->marker, func_8038F078, NULL); } fileProgressFlag_set(FILEPROG_16_STOOD_ON_JIGSAW_PODIUM, 1); fileProgressFlag_set(FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT, 1); @@ -395,7 +395,7 @@ void lair_func_8038F894(Actor *this, s32 arg1) { func_8038F350(this, 1); return; } - func_80311480(0xFBC, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(0xFBC, 4, NULL, NULL, NULL, NULL); fileProgressFlag_set(FILEPROG_DE_USED_ALL_YOUR_PUZZLE_PIECES, 1); } @@ -479,7 +479,7 @@ void lair_func_8038F924(Actor *this) { if (func_80329530(this, 300)) { if ((this->unkF4_8 == 0xA) && !fileProgressFlag_get(FILEPROG_F6_SEEN_DOOR_OF_GRUNTY_PUZZLE_PODIUM)) { phi_a0 = (item_getCount(ITEM_26_JIGGY_TOTAL) < D_803947F8[this->unkF4_8 - 1].cost) ? 0xFAB : 0xFC0; - if (func_80311480(phi_a0, 0, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(phi_a0, 0, NULL, NULL, NULL, NULL)) { fileProgressFlag_set(FILEPROG_F6_SEEN_DOOR_OF_GRUNTY_PUZZLE_PODIUM, TRUE); } } else if (this->unkF4_8 == 1) { diff --git a/src/lair/code_9C40.c b/src/lair/code_9C40.c index 7f0442e8..264cac74 100644 --- a/src/lair/code_9C40.c +++ b/src/lair/code_9C40.c @@ -64,7 +64,7 @@ void func_80390174(ActorMarker *marker, s32 arg1) { sp28 = this->marker->id - 0x16D; func_8028F94C(2, this->position); if (fileProgressFlag_get(sp28 + 0xAD)) { - func_80311480(sp28 + 0xF83, 0xE, this->position, this->marker, func_803900EC, lair_func_803900DC); + gcdialog_showText(sp28 + 0xF83, 0xE, this->position, this->marker, func_803900EC, lair_func_803900DC); return; } func_80311174(func_80390084() + 0xFA5, 0xE, this->position, this->marker, func_803900EC, lair_func_803900DC, func_80390158); diff --git a/src/lair/code_C1C0.c b/src/lair/code_C1C0.c index ea8e96a8..86a024a4 100644 --- a/src/lair/code_C1C0.c +++ b/src/lair/code_C1C0.c @@ -55,11 +55,11 @@ void func_80392690(ActorMarker *marker, enum asset_e text_id, s32 arg2){ void func_80392700(Actor *this) { if (mapSpecificFlags_get(4)) { if (fileProgressFlag_get(FILEPROG_F4_ENTER_FF_CUTSCENE)) { - func_80311480(0x1031, 0xF, this->position, this->marker, func_80392664, func_80392610); + gcdialog_showText(0x1031, 0xF, this->position, this->marker, func_80392664, func_80392610); } else { func_802BC280(); ncStaticCamera_setToNode(0x1F); - func_80311480(0x102C, 0xE, this->position, this->marker, func_80392664, func_80392610); + gcdialog_showText(0x102C, 0xE, this->position, this->marker, func_80392664, func_80392610); fileProgressFlag_set(FILEPROG_F4_ENTER_FF_CUTSCENE, TRUE); } mapSpecificFlags_set(4, 0); @@ -70,7 +70,7 @@ void func_80392700(Actor *this) { ncStaticCamera_setToNode(9); mapSpecificFlags_set(9, 1); func_8028F94C(2, this->position); - func_80311480(0x103F, 0x2A, this->position, this->marker, func_80392690, func_80392610); + gcdialog_showText(0x103F, 0x2A, this->position, this->marker, func_80392690, func_80392610); mapSpecificFlags_set(6, 0); subaddie_set_state_with_direction(this, 3, 0.0f, 1); actor_playAnimationOnce(this); diff --git a/src/lair/code_C6C0.c b/src/lair/code_C6C0.c index 19257db9..d54dc109 100644 --- a/src/lair/code_C6C0.c +++ b/src/lair/code_C6C0.c @@ -22,7 +22,7 @@ void func_80392AF4(ActorMarker *marker, enum asset_e text_id, s32 arg2){ void func_80392B1C(ActorMarker *marker) { func_8028E6EC(0); - func_80311480(0x1040, 8, NULL, marker, func_80392AB0, func_80392AF4); + gcdialog_showText(0x1040, 8, NULL, marker, func_80392AB0, func_80392AF4); } void func_80392B6C(Actor *this) {