diff --git a/include/enums.h b/include/enums.h index b3104a48..160c44fe 100644 --- a/include/enums.h +++ b/include/enums.h @@ -4190,20 +4190,20 @@ enum asset_e ASSET_8A0_SPRITE_WATER_DROP = 0x8A0, - ASSET_A0B_TEXT_BLUBBER_FIRST_MEET = 0xA0B, - ASSET_A0C_TEXT_BLUBBER_HALF_GOLD, - ASSET_A0D_TEXT_BLUBBER_COMPLETE, - ASSET_A0E_TEXT_NIPPER_SPAWNED, + ASSET_A0B_DIALOG_BLUBBER_FIRST_MEET = 0xA0B, + ASSET_A0C_DIALOG_BLUBBER_HALF_GOLD, + ASSET_A0D_DIALOG_BLUBBER_COMPLETE, + ASSET_A0E_DIALOG_NIPPER_SPAWNED, - ASSET_A10_TEXT_TTC_NIPPER_HURT = 0xa10, + ASSET_A10_DIALOG_TTC_NIPPER_HURT = 0xa10, - ASSET_A14_TEXT_CLAM_TAUNT = 0xA14, - ASSET_A15_TEXT_TTC_LOCKUP_SPAWNED, + ASSET_A14_DIALOG_CLAM_TAUNT = 0xA14, + ASSET_A15_DIALOG_TTC_LOCKUP_SPAWNED, - ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED = 0xA17, - ASSET_A18_TEXT_TREASUREHUNT_FOLLOW_CLUES, - ASSET_A19_TEXT_TREASUREHUNT_SECOND_STEP, - ASSET_A1A_TEXT_LEAKY_FIRST_MEET, + ASSET_A17_DIALOG_BURIED_TREASURE_SPAWNED = 0xA17, + ASSET_A18_DIALOG_TREASUREHUNT_FOLLOW_CLUES, + ASSET_A19_DIALOG_TREASUREHUNT_SECOND_STEP, + ASSET_A1A_DIALOG_LEAKY_FIRST_MEET, ASSET_A1F_DIALOG_SHOCKJUMP_LEARN = VER_SELECT(0xa1f, 0x91f, 0, 0), ASSET_A20_DIALOG_FLY_LEARN, @@ -4213,63 +4213,63 @@ enum asset_e ASSET_A24_DIALOG_JUMP_PAD_DISCOVERED, ASSET_A25_DIALOG_FLY_DISC_DISCOVERED, ASSET_A26_DIALOG_NEED_RED_FEATHERS_TO_FLY, - ASSET_A27_TEXT_BOTTLES_ALL_TTC_MOVES_LEARNED, - ASSET_A28_TEXT_LEAKY_DONE, + ASSET_A27_DIALOG_BOTTLES_ALL_TTC_MOVES_LEARNED, + ASSET_A28_DIALOG_LEAKY_DONE, ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED = 0xA2A, - ASSET_A6F_TEXT_CHARMER_MEET = 0xA6F, - ASSET_A70_TEXT_CHARMER_HELPED, - ASSET_A71_TEXT_TRUNKER_MEET, - ASSET_A72_TEXT_TRUNKER_HELPED, - ASSET_A73_TEXT_GOBI_MEET, - ASSET_A74_TEXT_GOBI_HELPED, - ASSET_A75_TEXT_GOBI2_MEET, - ASSET_A76_TEXT_GOBI2_DONE, - ASSET_A77_TEXT_GOBI3_DONE, - ASSET_A78_TEXT_GRABBA_MEET, - ASSET_A79_TEXT_GRABBA_DEFEAT, - ASSET_A7A_TEXT_GRABBA_TOO_FAST, - ASSET_A7B_TEXT_JINXY_MEET, - ASSET_A7C_TEXT_JINXY_ONE_EGG, - ASSET_A7D_TEXT_JINXY_HELPED, - ASSET_A7E_TEXT_SAND_EELS_MEET, - ASSET_A7F_TEXT_ANICIENT_ONES_MEET, - ASSET_A80_TEXT_ANICIENT_ONES_DONE, - ASSET_A81_TEXT_SANDYBUTT_ENTER, - ASSET_A82_TEXT_SANDYBUTT_START_MAZE, - ASSET_A83_TEXT_SANDYBUTT_DONE, + ASSET_A6F_DIALOG_CHARMER_MEET = 0xA6F, + ASSET_A70_DIALOG_CHARMER_HELPED, + ASSET_A71_DIALOG_TRUNKER_MEET, + ASSET_A72_DIALOG_TRUNKER_HELPED, + ASSET_A73_DIALOG_GOBI_MEET, + ASSET_A74_DIALOG_GOBI_HELPED, + ASSET_A75_DIALOG_GOBI2_MEET, + ASSET_A76_DIALOG_GOBI2_DONE, + ASSET_A77_DIALOG_GOBI3_DONE, + ASSET_A78_DIALOG_GRABBA_MEET, + ASSET_A79_DIALOG_GRABBA_DEFEAT, + ASSET_A7A_DIALOG_GRABBA_TOO_FAST, + ASSET_A7B_DIALOG_JINXY_MEET, + ASSET_A7C_DIALOG_JINXY_ONE_EGG, + ASSET_A7D_DIALOG_JINXY_HELPED, + ASSET_A7E_DIALOG_SAND_EELS_MEET, + ASSET_A7F_DIALOG_ANICIENT_ONES_MEET, + ASSET_A80_DIALOG_ANICIENT_ONES_DONE, + ASSET_A81_DIALOG_SANDYBUTT_ENTER, + ASSET_A82_DIALOG_SANDYBUTT_START_MAZE, + ASSET_A83_DIALOG_SANDYBUTT_DONE, ASSET_A84_DIALOG_TURBOTRAINERS_LEARN, ASSET_A85_DIALOG_TURBOTRAINERS_REFRESHER, - ASSET_AD3_TEXT_UNKNOWN = 0xad3, - ASSET_AD4_TEXT_UNKNOWN, - ASSET_AD5_TEXT_UNKNOWN, - ASSET_AD6_TEXT_UNKNOWN, + ASSET_AD3_DIALOG_UNKNOWN = 0xad3, + ASSET_AD4_DIALOG_UNKNOWN, + ASSET_AD5_DIALOG_UNKNOWN, + ASSET_AD6_DIALOG_UNKNOWN, - ASSET_ADA_TEXT_UNKNOWN = 0xada, - ASSET_ADB_TEXT_UNKNOWN, + ASSET_ADA_DIALOG_UNKNOWN = 0xada, + ASSET_ADB_DIALOG_UNKNOWN, ASSET_ADC_DIALOG_UNKNOWN, - ASSET_ADD_TEXT_UNKNOWN, - ASSET_ADE_TEXT_LOGGO_AS_BEAR, - ASSET_ADF_TEXT_ENTER_LOGGO, - ASSET_AE0_TEXT_EXIT_LOGGO, + ASSET_ADD_DIALOG_UNKNOWN, + ASSET_ADE_DIALOG_LOGGO_AS_BEAR, + ASSET_ADF_DIALOG_ENTER_LOGGO, + ASSET_AE0_DIALOG_EXIT_LOGGO, - ASSET_B37_TEXT_CONGA_SAFE_UP_HERE = 0xb37, - ASSET_B38_TEXT_CONGA_DEFEAT, - ASSET_B39_TEXT_CONGA_HIT_BY_EGG, - ASSET_B3A_TEXT_CONGA_HITS_PLAYER, - ASSET_B3B_TEXT_CONGA_ORANGE_PAD_JIGGY, - ASSET_B3C_TEXT_CONGA_MEET, + ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE = 0xb37, + ASSET_B38_DIALOG_CONGA_DEFEAT, + ASSET_B39_DIALOG_CONGA_HIT_BY_EGG, + ASSET_B3A_DIALOG_CONGA_HITS_PLAYER, + ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY, + ASSET_B3C_DIALOG_CONGA_MEET, - ASSET_B3E_TEXT_CONGA_MEET_AS_TERMITE = VER_SELECT(0xb3e, 0x95c, 0, 0), + ASSET_B3E_DIALOG_CONGA_MEET_AS_TERMITE = VER_SELECT(0xb3e, 0x95c, 0, 0), ASSET_B3F_DIALOG_CHIMPY_MEET, ASSET_B40_DIALOG_CHIMPY_COMPLETE, ASSET_B41_DIALOG_TERMITE_COOL_SHORTS, ASSET_B42_DIALOG_TERMITE_COOL_BACKPACK, ASSET_B43_DIALOG_TERMITE_MEET_AS_BEAR, - ASSET_B44_TEXT_JUJU_MEET, - ASSET_B45_TEXT_JIGGY_COLLECT_10, + ASSET_B44_DIALOG_JUJU_MEET, + ASSET_B45_DIALOG_JIGGY_COLLECT_10, ASSET_B47_DIALOG_EGGS_LEARN = 0xb47, ASSET_B48_DIALOG_BEAKBUSTER_LEARN, @@ -4277,34 +4277,34 @@ enum asset_e ASSET_B4A_DIALOG_TALON_TROT_REFRESHER, ASSET_B4B_DIALOG_EGGS_REFRESHER, ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER, - ASSET_B4D_TEXT_UNKNOWN, + ASSET_B4D_DIALOG_UNKNOWN, - ASSET_B4E_TEXT_BOTTLES_ALL_MM_MOVES_LEARNED = 0xB4E, + ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED = 0xB4E, - ASSET_B51_TEXT_BOTTLES_HOW_TO_EXIT_LEVEL = 0xb51, + ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL = 0xb51, - ASSET_B9F_TEXT_UNKNOWN = 0xb9f, + ASSET_B9F_DIALOG_UNKNOWN = 0xb9f, - ASSET_BFF_TEXT_UNKNOWN = 0xbff, + ASSET_BFF_DIALOG_UNKNOWN = 0xbff, - ASSET_C01_TEXT_UNKNOWN = 0xc01, - ASSET_C02_TEXT_UNKNOWN, + ASSET_C01_DIALOG_UNKNOWN = 0xc01, + ASSET_C02_DIALOG_UNKNOWN, - ASSET_C05_TEXT_UNKNOWN = 0xc05, + ASSET_C05_DIALOG_UNKNOWN = 0xc05, - ASSET_C08_TEXT_UNKNOWN = 0xc08, - ASSET_C09_TEXT_UNKNOWN, - ASSET_C0A_TEXT_UNKNOWN, + ASSET_C08_DIALOG_UNKNOWN = 0xc08, + ASSET_C09_DIALOG_UNKNOWN, + ASSET_C0A_DIALOG_UNKNOWN, - ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST = 0xc15, + ASSET_C15_DIALOG_TWINKLIE_MINIGAME_LOST = 0xc15, - ASSET_C17_TEXT_UNKNOWN = 0xC17, - ASSET_C18_TEXT_UNKNOWN, - ASSET_C19_TEXT_UNKNOWN, - ASSET_C1A_TEXT_UNKNOWN, + ASSET_C17_DIALOG_UNKNOWN = 0xC17, + ASSET_C18_DIALOG_UNKNOWN, + ASSET_C19_DIALOG_UNKNOWN, + ASSET_C1A_DIALOG_UNKNOWN, - ASSET_C1E_TEXT_UNKNOWN = 0xc1e, - ASSET_C1F_TEXT_UNKNOWN, + ASSET_C1E_DIALOG_UNKNOWN = 0xc1e, + ASSET_C1F_DIALOG_UNKNOWN, ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE = 0xC20, ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN, @@ -4312,68 +4312,68 @@ enum asset_e ASSET_C23_DIALOG_BEAKBOMB_LEARN, ASSET_C24_DIALOG_BEAKBOMB_REFRESHER, - ASSET_C26_TEXT_UNKNOWN = 0xc26, - ASSET_C27_TEXT_UNKNOWN, + ASSET_C26_DIALOG_UNKNOWN = 0xc26, + ASSET_C27_DIALOG_UNKNOWN, - ASSET_C2A_TEXT_BOTTLES_ALL_FP_GV_MOVES_LEARNED = 0xC2A, - ASSET_C2B_TEXT_UNKNOWN, + ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED = 0xC2A, + ASSET_C2B_DIALOG_UNKNOWN, - ASSET_C63_TEXT_MR_VILE_INTRO = 0xC63, - ASSET_C64_TEXT_MR_VILE_ROUND_1_START, - ASSET_C65_TEXT_MR_VILE_PLAYER_DECLINES, - ASSET_C66_TEXT_MR_VILE_WINS_ROUND_1, - ASSET_C67_TEXT_MR_VILE_ROUND_2_START, - ASSET_C68_TEXT_MR_VILE_WINS_ROUND_2, - ASSET_C69_TEXT_MR_VILE_ROUND_3_START, - ASSET_C6A_TEXT_MR_VILE_WINS_ROUND_3, - ASSET_C6B_TEXT_MR_VILE_PLAYER_WINS, - ASSET_C6C_TEXT_MR_VILE_TRY_AGAIN, - ASSET_C6D_TEXT_MR_VILE_LOSE_ROUND_1_REMATCH, - ASSET_C6E_TEXT_MR_VILE_LOSE_ROUND_2_REMATCH, - 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_C63_DIALOG_MR_VILE_INTRO = 0xC63, + ASSET_C64_DIALOG_MR_VILE_ROUND_1_START, + ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, + ASSET_C66_DIALOG_MR_VILE_WINS_ROUND_1, + ASSET_C67_DIALOG_MR_VILE_ROUND_2_START, + ASSET_C68_DIALOG_MR_VILE_WINS_ROUND_2, + ASSET_C69_DIALOG_MR_VILE_ROUND_3_START, + ASSET_C6A_DIALOG_MR_VILE_WINS_ROUND_3, + ASSET_C6B_DIALOG_MR_VILE_PLAYER_WINS, + ASSET_C6C_DIALOG_MR_VILE_TRY_AGAIN, + ASSET_C6D_DIALOG_MR_VILE_LOSE_ROUND_1_REMATCH, + ASSET_C6E_DIALOG_MR_VILE_LOSE_ROUND_2_REMATCH, + ASSET_C6F_DIALOG_MR_VILE_LOSE_ROUND_3_REMATCH, + ASSET_C70_DIALOG_MR_VILE_WIN_ROUND_2_REMATCH, + ASSET_C71_DIALOG_MR_VILE_WIN_ROUND_3_REMATCH, + ASSET_C72_DIALOG_UNKNOWN, - ASSET_C74_TEXT_UNKNOWN = 0xc74, + ASSET_C74_DIALOG_UNKNOWN = 0xc74, - ASSET_C76_TEXT_UNKNOWN = 0xc76, + ASSET_C76_DIALOG_UNKNOWN = 0xc76, text_flibbits_meet = 0xc81, text_flibbits_defeat = 0xc82, text_flibbits_return = 0xc83, - ASSET_C86_TEXT_UNKNOWN = 0xc86, + ASSET_C86_DIALOG_UNKNOWN = 0xc86, ASSET_C88_DIALOG_LONGLEG_LEARN = 0xC88, ASSET_C89_DIALOG_LONGLEG_REFRESHER, - ASSET_C8A_TEXT_BOTTLES_ALL_BGS_MOVES_LEARNED, + ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED, - ASSET_C8D_TEXT_MR_VILE_EXTRA_CHALLENGE_INTRO = 0xC8D, - ASSET_C8E_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_1, - ASSET_C8F_TEXT_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE, - ASSET_C90_TEXT_MR_VILE_EXTRA_CHALLENGE_REMATCH_1, - ASSET_C91_TEXT_MR_VILE_EXTRA_CHALLENGE_REMATCH_2, - ASSET_C92_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_2, - ASSET_C93_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_3, - ASSET_C94_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_4, - ASSET_C95_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_1, - ASSET_C96_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_2, - ASSET_C97_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_3, - ASSET_C98_TEXT_MR_VILE_GIVES_PRIZE, + ASSET_C8D_DIALOG_MR_VILE_EXTRA_CHALLENGE_INTRO = 0xC8D, + ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, + ASSET_C8F_DIALOG_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE, + ASSET_C90_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_1, + ASSET_C91_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_2, + ASSET_C92_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_2, + ASSET_C93_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_3, + ASSET_C94_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_4, + ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1, + ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2, + ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3, + ASSET_C98_DIALOG_MR_VILE_GIVES_PRIZE, - ASSET_CC7_TEXT_UNKNOWN = 0xcc7, + ASSET_CC7_DIALOG_UNKNOWN = 0xcc7, - ASSET_D2B_TEXT_UNKNOWN = 0xd2b, + ASSET_D2B_DIALOG_UNKNOWN = 0xd2b, ASSET_D32_DIALOG_MUTANT_CRAB_MEET = 0xD32, ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT, - ASSET_D34_TEXT_GLOOP_MEET, + ASSET_D34_DIALOG_GLOOP_MEET, ASSET_D35_DIALOG_WONDERWING_LEARN, ASSET_D36_DIALOG_WONDERWING_REFRESHER, - ASSET_D37_TEXT_BOTTLES_ALL_CC_MOVES_LEARNED, - ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED, - ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH, + ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED, + ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, + ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH, ASSET_D8F_DIALOG_MUMBO_MEET = 0xD8F, ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, @@ -4390,7 +4390,7 @@ enum asset_e ASSET_D9B_DIALOG_JINJO_MEET_ORANGE, ASSET_DA5_DIALOG_WADINGBOOTS_MEET = 0xDA5, - ASSET_DA6_TEXT_BEEHIVE_WITH_BEES, + ASSET_DA6_DIALOG_BEEHIVE_WITH_BEES, ASSET_DA7_DIALOG_MUMBO_CCW_SUMMER, ASSET_DA8_DIALOG_MUMBO_CCW_AUTUMN, @@ -4407,59 +4407,59 @@ enum asset_e ASSET_DB4_DIALOG_SNS_EGG_2_TEXT, ASSET_DB5_DIALOG_ICE_KEY_TEXT, - ASSET_DF3_TEXT_BOTTLES_INTRODUCTION = 0xDF3, - ASSET_DF4_TEXT_BOTTLES_CAMERA_CONTROL_LEARN, - ASSET_DF5_TEXT_BOTTLES_CAMERA_CONTROL_REFRESHER, - ASSET_DF6_TEXT_BOTTLES_HIGH_JUMP_LEARN, - ASSET_DF7_TEXT_BOTTLES_FEATHERY_FLAP_LEARN, - ASSET_DF8_TEXT_BOTTLES_FLAP_FLIP_LEARN, - ASSET_DF9_TEXT_BOTTLES_UNKNOWN, - ASSET_DFA_TEXT_BOTTLES_JUMP_REFRESHER, - ASSET_DFB_TEXT_BOTTLES_DIVE_LEARN, - 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_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, - ASSET_E07_TEXT_BOTTLES_UNKNOWN, - ASSET_E08_TEXT_BOTTLES_FIND_ANOTHER_MOLEHILL, - ASSET_E09_TEXT_BOTTLES_SKIPPED_TUTORIAL, - ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1, - ASSET_E0B_TEXT_BOTTLES_REFUSE_HELP_2, - ASSET_E0C_TEXT_BOTTLES_REFUSE_HELP_3, - ASSET_E0D_TEXT_BOTTLES_REFUSE_HELP_4, - ASSET_E0E_TEXT_BOTTLES_REFUSE_HELP_5, - ASSET_E0F_TEXT_BOTTLES_STOP_WASTING_TIME_BEFORE_FURNACE_FUN, // Skip tutorial, bother bottles, gives help, retalk to bottles - ASSET_E10_TEXT_BOTTLES_BRIDGE_BROKEN, - ASSET_E11_TEXT_BOTTLES_BRIDGE_STILL_BROKEN, - ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, + ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION = 0xDF3, + ASSET_DF4_DIALOG_BOTTLES_CAMERA_CONTROL_LEARN, + ASSET_DF5_DIALOG_BOTTLES_CAMERA_CONTROL_REFRESHER, + ASSET_DF6_DIALOG_BOTTLES_HIGH_JUMP_LEARN, + ASSET_DF7_DIALOG_BOTTLES_FEATHERY_FLAP_LEARN, + ASSET_DF8_DIALOG_BOTTLES_FLAP_FLIP_LEARN, + ASSET_DF9_DIALOG_BOTTLES_UNKNOWN, + ASSET_DFA_DIALOG_BOTTLES_JUMP_REFRESHER, + ASSET_DFB_DIALOG_BOTTLES_DIVE_LEARN, + ASSET_DFC_DIALOG_UNKNOWN, + ASSET_DFD_DIALOG_BOTTLES_SWIM_LEARN, + ASSET_DFE_DIALOG_BOTTLES_DIVE_REFRESHER, + ASSET_DFF_DIALOG_BOTTLES_CLAW_SWIPE_LEARN, + ASSET_E00_DIALOG_BOTTLES_ATTACK_REFRESHER = 0xE00, + ASSET_E01_DIALOG_BOTTLES_CLIMB_LEARN, + ASSET_E02_DIALOG_UNKNOWN, + ASSET_E03_DIALOG_BOTTLES_CLIMB_REFRESHER, + ASSET_E04_DIALOG_BOTTLES_BEAK_BARGE_LEARN, + ASSET_E05_DIALOG_UNKNOWN, + ASSET_E06_DIALOG_BOTTLES_BEAK_BARGE_REFRESHER, + ASSET_E07_DIALOG_BOTTLES_UNKNOWN, + ASSET_E08_DIALOG_BOTTLES_FIND_ANOTHER_MOLEHILL, + ASSET_E09_DIALOG_BOTTLES_SKIPPED_TUTORIAL, + ASSET_E0A_DIALOG_BOTTLES_REFUSE_HELP_1, + ASSET_E0B_DIALOG_BOTTLES_REFUSE_HELP_2, + ASSET_E0C_DIALOG_BOTTLES_REFUSE_HELP_3, + ASSET_E0D_DIALOG_BOTTLES_REFUSE_HELP_4, + ASSET_E0E_DIALOG_BOTTLES_REFUSE_HELP_5, + ASSET_E0F_DIALOG_BOTTLES_STOP_WASTING_TIME_BEFORE_FURNACE_FUN, // Skip tutorial, bother bottles, gives help, retalk to bottles + ASSET_E10_DIALOG_BOTTLES_BRIDGE_BROKEN, + ASSET_E11_DIALOG_BOTTLES_BRIDGE_STILL_BROKEN, + ASSET_E12_DIALOG_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_E1A_TEXT_BOTTLES_UNKNOWN, - ASSET_E1B_TEXT_BOTTLES_UNKNOWN, - ASSET_E1C_TEXT_BOTTLES_UNKNOWN, - ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT, + ASSET_E14_DIALOG_UNKNOWN = 0xE14, + ASSET_E15_DIALOG_UNKNOWN, + ASSET_E16_DIALOG_UNKNOWN, + ASSET_E17_DIALOG_UNKNOWN, + ASSET_E18_DIALOG_UNKNOWN, + ASSET_E19_DIALOG_UNKNOWN, + ASSET_E1A_DIALOG_BOTTLES_UNKNOWN, + ASSET_E1B_DIALOG_BOTTLES_UNKNOWN, + ASSET_E1C_DIALOG_BOTTLES_UNKNOWN, + ASSET_E1D_DIALOG_BOTTLES_TUTORIAL_OFFER_WAIT, - ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER = VER_SELECT(0xE1F, 0xa61, 0, 0), + ASSET_E1F_DIALOG_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_E24_DIALOG_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_E37_DIALOG_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION, ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0), @@ -4474,60 +4474,60 @@ enum asset_e ASSET_F66_DIALOG_UNKNOWN, ASSET_F67_DIALOG_UNKNOWN, - ASSET_F79_TEXT_UNKNOWN = 0xf79, - ASSET_F7A_TEXT_UNKNOWN, + ASSET_F79_DIALOG_UNKNOWN = 0xf79, + ASSET_F7A_DIALOG_UNKNOWN, - ASSET_FAD_TEXT_UNKNOWN = 0xfad, + ASSET_FAD_DIALOG_UNKNOWN = 0xfad, ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING = 0xfbe, ASSET_FBF_DIALOG_ERASED_SAVE, ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1, - ASSET_10A2_TEXT_UNKNOWN, + ASSET_10A2_DIALOG_UNKNOWN, - ASSET_10E7_TEXT_UNKNOWN = 0x10E7, + ASSET_10E7_DIALOG_UNKNOWN = 0x10E7, - ASSET_10ED_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_1 = 0x10ED, - ASSET_10EE_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_2, - ASSET_10EF_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_3, - ASSET_10F0_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_4, - ASSET_10F1_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_5, + ASSET_10ED_DIALOG_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_1 = 0x10ED, + ASSET_10EE_DIALOG_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_2, + ASSET_10EF_DIALOG_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_3, + ASSET_10F0_DIALOG_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_4, + ASSET_10F1_DIALOG_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_5, - ASSET_10F2_TEXT_FINALBOSS_PHASE_1_OPTION_1 = 0x10F2, - ASSET_10F3_TEXT_FINALBOSS_PHASE_1_OPTION_2, - ASSET_10F4_TEXT_FINALBOSS_PHASE_1_OPTION_3, - ASSET_10F5_TEXT_FINALBOSS_PHASE_1_OPTION_4, - ASSET_10F6_TEXT_FINALBOSS_PHASE_1_OPTION_5, + ASSET_10F2_DIALOG_FINALBOSS_PHASE_1_OPTION_1 = 0x10F2, + ASSET_10F3_DIALOG_FINALBOSS_PHASE_1_OPTION_2, + ASSET_10F4_DIALOG_FINALBOSS_PHASE_1_OPTION_3, + ASSET_10F5_DIALOG_FINALBOSS_PHASE_1_OPTION_4, + ASSET_10F6_DIALOG_FINALBOSS_PHASE_1_OPTION_5, - ASSET_110B_TEXT_FINALBOSS_PHASE_2_OPTION_1 = 0x110B, - ASSET_110C_TEXT_FINALBOSS_PHASE_2_OPTION_2, - ASSET_110D_TEXT_FINALBOSS_PHASE_2_OPTION_3, - ASSET_110E_TEXT_FINALBOSS_PHASE_2_OPTION_4, - ASSET_110F_TEXT_FINALBOSS_PHASE_2_OPTION_5, + ASSET_110B_DIALOG_FINALBOSS_PHASE_2_OPTION_1 = 0x110B, + ASSET_110C_DIALOG_FINALBOSS_PHASE_2_OPTION_2, + ASSET_110D_DIALOG_FINALBOSS_PHASE_2_OPTION_3, + ASSET_110E_DIALOG_FINALBOSS_PHASE_2_OPTION_4, + ASSET_110F_DIALOG_FINALBOSS_PHASE_2_OPTION_5, - ASSET_111D_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_1 = 0x111D, - ASSET_111E_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_2, - ASSET_111F_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_3, - ASSET_1120_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_4, - ASSET_1121_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_5, + ASSET_111D_DIALOG_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_1 = 0x111D, + ASSET_111E_DIALOG_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_2, + ASSET_111F_DIALOG_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_3, + ASSET_1120_DIALOG_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_4, + ASSET_1121_DIALOG_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_5, - ASSET_1122_TEXT_FINALBOSS_PHASE_3_OPTION_1 = 0x1122, - ASSET_1123_TEXT_FINALBOSS_PHASE_3_OPTION_2, - ASSET_1124_TEXT_FINALBOSS_PHASE_3_OPTION_3, - ASSET_1125_TEXT_FINALBOSS_PHASE_3_OPTION_4, - ASSET_1126_TEXT_FINALBOSS_PHASE_3_OPTION_5, + ASSET_1122_DIALOG_FINALBOSS_PHASE_3_OPTION_1 = 0x1122, + ASSET_1123_DIALOG_FINALBOSS_PHASE_3_OPTION_2, + ASSET_1124_DIALOG_FINALBOSS_PHASE_3_OPTION_3, + ASSET_1125_DIALOG_FINALBOSS_PHASE_3_OPTION_4, + ASSET_1126_DIALOG_FINALBOSS_PHASE_3_OPTION_5, - ASSET_113B_TEXT_FINALBOSS_PHASE_4_OPTION_1 = 0x113B, - ASSET_113C_TEXT_FINALBOSS_PHASE_4_OPTION_2, - ASSET_113D_TEXT_FINALBOSS_PHASE_4_OPTION_3, - ASSET_113E_TEXT_FINALBOSS_PHASE_4_OPTION_4, - ASSET_113F_TEXT_FINALBOSS_PHASE_4_OPTION_5, + ASSET_113B_DIALOG_FINALBOSS_PHASE_4_OPTION_1 = 0x113B, + ASSET_113C_DIALOG_FINALBOSS_PHASE_4_OPTION_2, + ASSET_113D_DIALOG_FINALBOSS_PHASE_4_OPTION_3, + ASSET_113E_DIALOG_FINALBOSS_PHASE_4_OPTION_4, + ASSET_113F_DIALOG_FINALBOSS_PHASE_4_OPTION_5, - ASSET_1154_TEXT_FINALBOSS_PHASE_5_OPTION_1 = 0x1154, - ASSET_1155_TEXT_FINALBOSS_PHASE_5_OPTION_2, - ASSET_1156_TEXT_FINALBOSS_PHASE_5_OPTION_3, - ASSET_1157_TEXT_FINALBOSS_PHASE_5_OPTION_4, - ASSET_1158_TEXT_FINALBOSS_PHASE_5_OPTION_5, + ASSET_1154_DIALOG_FINALBOSS_PHASE_5_OPTION_1 = 0x1154, + ASSET_1155_DIALOG_FINALBOSS_PHASE_5_OPTION_2, + ASSET_1156_DIALOG_FINALBOSS_PHASE_5_OPTION_3, + ASSET_1157_DIALOG_FINALBOSS_PHASE_5_OPTION_4, + ASSET_1158_DIALOG_FINALBOSS_PHASE_5_OPTION_5, ASSET_1213_FF_QUIZ_QUESTION = 0x1213, ASSET_1214_FF_QUIZ_QUESTION, diff --git a/src/BGS/ch/code_2270.c b/src/BGS/ch/code_2270.c index c555ab04..38c23c2f 100644 --- a/src/BGS/ch/code_2270.c +++ b/src/BGS/ch/code_2270.c @@ -147,10 +147,10 @@ void chTiptup_setState(Actor *this, s32 arg1){ this->has_met_before = TRUE; if (unqPtr->unkA == 0) { - gcdialog_showText(ASSET_C72_TEXT_UNKNOWN, 0xe, this->position, this->marker, chTiptup_textEvent, 0); + gcdialog_showText(ASSET_C72_DIALOG_UNKNOWN, 0xe, this->position, this->marker, chTiptup_textEvent, 0); } else { - gcdialog_showText(ASSET_C74_TEXT_UNKNOWN, 0xf, this->position, this->marker, chTiptup_textEvent, 0); + gcdialog_showText(ASSET_C74_DIALOG_UNKNOWN, 0xf, this->position, this->marker, chTiptup_textEvent, 0); } } else { @@ -235,7 +235,7 @@ void chTiptup_choirHitReaction(ActorMarker *this, s32 arg1){ thisActor = marker_getActor(this); unqPtr = (ActorLocal_Tiptup *)&thisActor->local; if((s32)unqPtr->unk0 >= (s32) vector_size(unqPtr->unk4)){ - if(!mapSpecificFlags_get(0) && gcdialog_showText(ASSET_C76_TEXT_UNKNOWN, 0, 0, 0, 0, 0)) + if(!mapSpecificFlags_get(0) && gcdialog_showText(ASSET_C76_DIALOG_UNKNOWN, 0, 0, 0, 0, 0)) mapSpecificFlags_set(0,1); }else{ tmp = (Struct_BGS_2270_0s *)vector_at(unqPtr->unk4, unqPtr->unk0); diff --git a/src/BGS/ch/croctus.c b/src/BGS/ch/croctus.c index 5a6400d6..d68623df 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); - gcdialog_showText(ASSET_C86_TEXT_UNKNOWN, 0xE, this->position, this->marker, func_80387E68, NULL); + gcdialog_showText(ASSET_C86_DIALOG_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/code_3420.c b/src/BGS/code_3420.c index d8b1276e..f627f9c1 100644 --- a/src/BGS/code_3420.c +++ b/src/BGS/code_3420.c @@ -47,43 +47,43 @@ ActorInfo D_80390960 = { // Vile Wins enum asset_e D_80390984[] = { 0, - ASSET_C66_TEXT_MR_VILE_WINS_ROUND_1, - ASSET_C68_TEXT_MR_VILE_WINS_ROUND_2, - ASSET_C6A_TEXT_MR_VILE_WINS_ROUND_3, - ASSET_C92_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_2, - ASSET_C93_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_3, - ASSET_C94_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_4, + ASSET_C66_DIALOG_MR_VILE_WINS_ROUND_1, + ASSET_C68_DIALOG_MR_VILE_WINS_ROUND_2, + ASSET_C6A_DIALOG_MR_VILE_WINS_ROUND_3, + ASSET_C92_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_2, + ASSET_C93_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_3, + ASSET_C94_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_4, 0 }; // Player Wins enum asset_e D_803909A4[] = { 0, - ASSET_C67_TEXT_MR_VILE_ROUND_2_START, - ASSET_C69_TEXT_MR_VILE_ROUND_3_START, + ASSET_C67_DIALOG_MR_VILE_ROUND_2_START, + ASSET_C69_DIALOG_MR_VILE_ROUND_3_START, 0, - ASSET_C95_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_1, - ASSET_C96_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_2, - ASSET_C97_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_3 + ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1, + ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2, + ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3 }; // Player Wins Rematch enum asset_e D_803909C0[] = { 0, - ASSET_C6E_TEXT_MR_VILE_LOSE_ROUND_2_REMATCH, - ASSET_C6F_TEXT_MR_VILE_LOSE_ROUND_3_REMATCH, + ASSET_C6E_DIALOG_MR_VILE_LOSE_ROUND_2_REMATCH, + ASSET_C6F_DIALOG_MR_VILE_LOSE_ROUND_3_REMATCH, 0, - ASSET_C95_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_1, - ASSET_C96_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_2, - ASSET_C97_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_3 + ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1, + ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2, + ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3 }; // Player Declines enum asset_e D_803909DC[] = { - ASSET_C65_TEXT_MR_VILE_PLAYER_DECLINES, - ASSET_C65_TEXT_MR_VILE_PLAYER_DECLINES, - ASSET_C65_TEXT_MR_VILE_PLAYER_DECLINES, - ASSET_C8F_TEXT_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE, + ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, + ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, + ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, + ASSET_C8F_DIALOG_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE, 0, 0, 0 @@ -91,10 +91,10 @@ enum asset_e D_803909DC[] = { // Round 1 Regular & Extra Challenge enum asset_e BGS_D_803909F8[] = { - ASSET_C64_TEXT_MR_VILE_ROUND_1_START, + ASSET_C64_DIALOG_MR_VILE_ROUND_1_START, 0, 0, - ASSET_C8E_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_1, + ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, 0, 0, 0, @@ -102,10 +102,10 @@ enum asset_e BGS_D_803909F8[] = { }; enum asset_e D_80390A18[] = { - ASSET_C6D_TEXT_MR_VILE_LOSE_ROUND_1_REMATCH, - ASSET_C70_TEXT_MR_VILE_WIN_ROUND_2_REMATCH, - ASSET_C71_TEXT_MR_VILE_WIN_ROUND_3_REMATCH, - ASSET_C8E_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_1, + ASSET_C6D_DIALOG_MR_VILE_LOSE_ROUND_1_REMATCH, + ASSET_C70_DIALOG_MR_VILE_WIN_ROUND_2_REMATCH, + ASSET_C71_DIALOG_MR_VILE_WIN_ROUND_3_REMATCH, + ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, 0, 0, 0, diff --git a/src/CC/code_1F70.c b/src/CC/code_1F70.c index a039910c..6edc7908 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){ - gcdialog_showText(ASSET_D2B_TEXT_UNKNOWN, 0xE, D_80389FA0.unk28, NULL, NULL, NULL); + gcdialog_showText(ASSET_D2B_DIALOG_UNKNOWN, 0xE, D_80389FA0.unk28, NULL, NULL, NULL); D_80389FA0.unk48 = TRUE; } }//L8038918C diff --git a/src/CCW/code_3DA0.c b/src/CCW/code_3DA0.c index be0acaf1..df45d990 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)){ - gcdialog_showText(ASSET_CC7_TEXT_UNKNOWN, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_CC7_DIALOG_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/FP/ch/bearcub.c b/src/FP/ch/bearcub.c index d90bddcc..50885692 100644 --- a/src/FP/ch/bearcub.c +++ b/src/FP/ch/bearcub.c @@ -124,9 +124,9 @@ void func_8038A384(Actor *this){ }//L8038A4E4 sp34 = levelSpecificFlags_get(LEVEL_FLAG_11_FP_UNKNOWN) + levelSpecificFlags_get(LEVEL_FLAG_12_FP_UNKNOWN) + levelSpecificFlags_get(LEVEL_FLAG_13_FP_UNKNOWN); - sp38 = (sp34 == 1) ? ASSET_C17_TEXT_UNKNOWN - : (sp34 == 2) ? ASSET_C18_TEXT_UNKNOWN - : ASSET_C19_TEXT_UNKNOWN; + sp38 = (sp34 == 1) ? ASSET_C17_DIALOG_UNKNOWN + : (sp34 == 2) ? ASSET_C18_DIALOG_UNKNOWN + : ASSET_C19_DIALOG_UNKNOWN; this->yaw_ideal = (f32)func_80329784(this); func_80328FB0(this, 2.0f); @@ -140,7 +140,7 @@ void func_8038A384(Actor *this){ && !jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3) && !jiggyscore_isSpawned(JIGGY_2C_FP_BOGGY_3) ){ - if (gcdialog_showText(ASSET_C1A_TEXT_UNKNOWN, 0x2a, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(ASSET_C1A_DIALOG_UNKNOWN, 0x2a, NULL, NULL, NULL, NULL)) { levelSpecificFlags_set(LEVEL_FLAG_19_FP_UNKNOWN, TRUE); } } @@ -163,7 +163,7 @@ void func_8038A384(Actor *this){ } if(levelSpecificFlags_get(D_80391E80[sp3C].unk0)){ subaddie_set_state_with_direction(this, 2, 0.001f, 1); - if (sp38 == ASSET_C19_TEXT_UNKNOWN) { + if (sp38 == ASSET_C19_DIALOG_UNKNOWN) { gcdialog_showText(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL); } else { diff --git a/src/FP/ch/boggy1.c b/src/FP/ch/boggy1.c index 50e1ce2f..542a831a 100644 --- a/src/FP/ch/boggy1.c +++ b/src/FP/ch/boggy1.c @@ -86,7 +86,7 @@ void func_80387828(ActorMarker *caller, enum asset_e text_id, s32 arg2){ Actor *this = marker_getActor(caller); if (text_id == 0xc00) { - gcdialog_showText(ASSET_C2B_TEXT_UNKNOWN, 0xf, NULL, this->marker, NULL, func_803877A8); + gcdialog_showText(ASSET_C2B_DIALOG_UNKNOWN, 0xf, NULL, this->marker, NULL, func_803877A8); } } @@ -149,7 +149,7 @@ void func_8038794C(Actor *this){ if(!this->has_met_before && func_80329530(this, 0x1f4)){ if(!func_8028ECAC() || func_8028ECAC() == BSGROUP_8_TROT){ - if (gcdialog_showText(ASSET_BFF_TEXT_UNKNOWN, 0x2a, this->position, NULL, NULL, NULL)) { + if (gcdialog_showText(ASSET_BFF_DIALOG_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); } diff --git a/src/FP/ch/boggy2.c b/src/FP/ch/boggy2.c index e39ab5d4..9c0fffe4 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)){ - gcdialog_showText(ASSET_C0A_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C0A_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL); } else{ - gcdialog_showText(ASSET_C09_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C09_DIALOG_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)){ - gcdialog_showText(ASSET_C05_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C05_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL); } else{ - gcdialog_showText(ASSET_C02_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C02_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL); } } else{//L80388BB8 if(!volatileFlag_get(VOLATILE_FLAG_B3)){ - if(gcdialog_showText(ASSET_C01_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){ + if(gcdialog_showText(ASSET_C01_DIALOG_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(gcdialog_showText(ASSET_C08_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){ + if(gcdialog_showText(ASSET_C08_DIALOG_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) ){ - gcdialog_showText(ASSET_C01_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C01_DIALOG_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) ){ - gcdialog_showText(ASSET_C08_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showText(ASSET_C08_DIALOG_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 d9e0d484..fc605b85 100644 --- a/src/FP/ch/boggy3.c +++ b/src/FP/ch/boggy3.c @@ -77,14 +77,14 @@ void func_80390388(Actor *this){ && (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT) ){ if(0.0f == this->unk1C[0] && func_80390334()){ - if(gcdialog_showText(ASSET_C1F_TEXT_UNKNOWN, 0xb, this->position, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_C1F_DIALOG_UNKNOWN, 0xb, this->position, NULL, NULL, NULL)){ this->has_met_before = TRUE; this->unk1C[0] = 1.0f; } } else{ if( !this->has_met_before ){ - if(gcdialog_showText(ASSET_C1E_TEXT_UNKNOWN, 0x2b, this->position, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_C1E_DIALOG_UNKNOWN, 0x2b, this->position, NULL, NULL, NULL)){ this->has_met_before = TRUE; } } diff --git a/src/FP/ch/cavewozza.c b/src/FP/ch/cavewozza.c index 7271be98..9d5f25b1 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(LEVEL_FLAG_31_FP_UNKNOWN)) { - if (gcdialog_showText(ASSET_C27_TEXT_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(ASSET_C27_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) { levelSpecificFlags_set(LEVEL_FLAG_31_FP_UNKNOWN, TRUE); } } } else { if (!levelSpecificFlags_get(LEVEL_FLAG_32_FP_UNKNOWN)) { - if (gcdialog_showText(ASSET_C26_TEXT_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(ASSET_C26_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) { levelSpecificFlags_set(LEVEL_FLAG_32_FP_UNKNOWN, TRUE); } } diff --git a/src/FP/ch/twinklymuncher.c b/src/FP/ch/twinklymuncher.c index f1ef8082..54bbbd2e 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); - gcdialog_showText(ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL); + gcdialog_showText(ASSET_C15_DIALOG_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); diff --git a/src/GV/ch/ancientone.c b/src/GV/ch/ancientone.c index c57cab94..54dc7a82 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)){ - gcdialog_showText(ASSET_A80_TEXT_ANICIENT_ONES_DONE, 0xE, NULL, this->marker, func_80386850, NULL); + gcdialog_showText(ASSET_A80_DIALOG_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)){ - gcdialog_showText(ASSET_A7F_TEXT_ANICIENT_ONES_MEET, 0x4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A7F_DIALOG_ANICIENT_ONES_MEET, 0x4, NULL, NULL, NULL, NULL); } } diff --git a/src/GV/ch/gobi1.c b/src/GV/ch/gobi1.c index 27fa47f1..7248ce22 100644 --- a/src/GV/ch/gobi1.c +++ b/src/GV/ch/gobi1.c @@ -158,7 +158,7 @@ void chGobi1_update(Actor *this){ timed_playSfx(1.0f, SFX_84_GOBI_CRYING, 1.1f, 30000); timed_playSfx(2.0f, SFX_84_GOBI_CRYING, 1.3f, 30000); timed_playSfx(2.5f, SFX_74_WALKING_NOISE_5, 0.5f, 30000); - func_80324DBC(3.0f, ASSET_A74_TEXT_GOBI_HELPED, 0x2a, this->position, NULL, NULL, NULL); + func_80324DBC(3.0f, ASSET_A74_DIALOG_GOBI_HELPED, 0x2a, this->position, NULL, NULL, NULL); timed_playSfx(5.0f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000); timed_playSfx(5.6f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000); timed_playSfx(6.5f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000); diff --git a/src/GV/ch/gobi2.c b/src/GV/ch/gobi2.c index 0a95c9e2..9e78e898 100644 --- a/src/GV/ch/gobi2.c +++ b/src/GV/ch/gobi2.c @@ -85,7 +85,7 @@ void chGobi2_setState(Actor *this, s32 next_state){ timed_playSfx(0.8f, SFX_4B_GULPING, 0.8f, 28000); timed_playSfx(1.4f, SFX_4B_GULPING, 0.8f, 28000); timed_playSfx(2.0f, SFX_4B_GULPING, 0.8f, 28000); - func_80324DBC(3.0f, ASSET_A72_TEXT_TRUNKER_HELPED, 0x2A, D_80390CEC, this->marker, func_80387A2C, NULL); + func_80324DBC(3.0f, ASSET_A72_DIALOG_TRUNKER_HELPED, 0x2A, D_80390CEC, this->marker, func_80387A2C, NULL); }//L80387C94 if(next_state == 4){ @@ -203,7 +203,7 @@ void chGobi2_update(Actor *this){ if(!this->has_met_before){ if(func_80329530(this, 0xFA) && !func_80329530(this, 0x50)){ if(func_8028F2A0()){ - if(gcdialog_showText(ASSET_A75_TEXT_GOBI2_MEET, 0, this->position, NULL, NULL, NULL)) + if(gcdialog_showText(ASSET_A75_DIALOG_GOBI2_MEET, 0, this->position, NULL, NULL, NULL)) this->has_met_before = TRUE; } } diff --git a/src/GV/ch/gobi3.c b/src/GV/ch/gobi3.c index 7cd9deb8..3633cbae 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); - gcdialog_showText(ASSET_A77_TEXT_GOBI3_DONE, 0xe, this->position, this->marker, __chGobi3_runaway, NULL); + gcdialog_showText(ASSET_A77_DIALOG_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 6c54201e..a5380640 100644 --- a/src/GV/ch/mazectrl.c +++ b/src/GV/ch/mazectrl.c @@ -85,7 +85,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){ } if (!levelSpecificFlags_get(LEVEL_FLAG_16_GV_UNKNOWN)) { - gcdialog_showText(ASSET_A82_TEXT_SANDYBUTT_START_MAZE, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A82_DIALOG_SANDYBUTT_START_MAZE, 4, NULL, NULL, NULL, NULL); levelSpecificFlags_set(LEVEL_FLAG_16_GV_UNKNOWN, TRUE); } }//L8038F794 @@ -135,7 +135,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){ func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff); if(!levelSpecificFlags_get(LEVEL_FLAG_17_GV_UNKNOWN)){ - gcdialog_showText(ASSET_A83_TEXT_SANDYBUTT_DONE, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A83_DIALOG_SANDYBUTT_DONE, 4, NULL, NULL, NULL, NULL); levelSpecificFlags_set(LEVEL_FLAG_17_GV_UNKNOWN, TRUE); } } @@ -178,7 +178,7 @@ void chMazeCtrl_update(Actor *this){ if (!levelSpecificFlags_get(LEVEL_FLAG_15_GV_UNKNOWN) && ml_timer_update(&local->unk8, sp34) - && gcdialog_showText(ASSET_A81_TEXT_SANDYBUTT_ENTER, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(ASSET_A81_DIALOG_SANDYBUTT_ENTER, 0, NULL, NULL, NULL, NULL) ) { levelSpecificFlags_set(LEVEL_FLAG_15_GV_UNKNOWN, TRUE); } diff --git a/src/GV/ch/trunker.c b/src/GV/ch/trunker.c index 8beefe2b..6c22d026 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() ){ - gcdialog_showText(ASSET_A71_TEXT_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL); + gcdialog_showText(ASSET_A71_DIALOG_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL); this->has_met_before = TRUE; }//L80389254 diff --git a/src/GV/code_3630.c b/src/GV/code_3630.c index 0180d3d4..29c603dc 100644 --- a/src/GV/code_3630.c +++ b/src/GV/code_3630.c @@ -29,14 +29,14 @@ void func_80389A20(ActorMarker *caller, enum asset_e text_id, s32 arg2){ } void func_80389A60(Actor *this){ - gcdialog_showText(ASSET_A70_TEXT_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL); + gcdialog_showText(ASSET_A70_DIALOG_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL); this->has_met_before = TRUE; subaddie_set_state(this, 5); } void func_80389ABC(Actor *this){ if(this->unk138_23){ - func_80389A20(this->marker, ASSET_A70_TEXT_CHARMER_HELPED, -1); + func_80389A20(this->marker, ASSET_A70_DIALOG_CHARMER_HELPED, -1); } else{ this->unk138_23 = TRUE; @@ -63,7 +63,7 @@ void func_80389B1C(Actor *this){ if(this->state == 1 || this->state == 2){ if(! this->has_met_before && func_80329530(this, 250) && !func_80329530(this, 0x50)){ - gcdialog_showText(ASSET_A6F_TEXT_CHARMER_MEET, 0xe, this->position, NULL, NULL, NULL); + gcdialog_showText(ASSET_A6F_DIALOG_CHARMER_MEET, 0xe, this->position, NULL, NULL, NULL); this->has_met_before = TRUE; mapSpecificFlags_set(0, TRUE); } diff --git a/src/GV/code_5570.c b/src/GV/code_5570.c index 1f3b6770..1b374d10 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); - gcdialog_showText(ASSET_A79_TEXT_GRABBA_DEFEAT, 0xf, this->position, this->marker, func_8038B988, NULL); + gcdialog_showText(ASSET_A79_DIALOG_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->has_met_before){ - if(gcdialog_showText(ASSET_A78_TEXT_GRABBA_MEET, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_A78_DIALOG_GRABBA_MEET, 0, NULL, NULL, NULL, NULL)){ this->has_met_before = TRUE; } } @@ -276,7 +276,7 @@ void GV_func_8038BEA0(Actor *this){ } if(!this->unk138_23){ - if(gcdialog_showText(ASSET_A7A_TEXT_GRABBA_TOO_FAST, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_A7A_DIALOG_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 d65b7513..d2f46d26 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(gcdialog_showText(ASSET_A7B_TEXT_JINXY_MEET, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showText(ASSET_A7B_DIALOG_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){ - gcdialog_showText(ASSET_A7C_TEXT_JINXY_ONE_EGG, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A7C_DIALOG_JINXY_ONE_EGG, 4, NULL, NULL, NULL, NULL); mapSpecificFlags_set(0x14, TRUE); subaddie_set_state_forward(this, 1); } diff --git a/src/GV/code_7FF0.c b/src/GV/code_7FF0.c index b458937b..833c3968 100644 --- a/src/GV/code_7FF0.c +++ b/src/GV/code_7FF0.c @@ -177,7 +177,7 @@ void func_8038E460(Actor *this){//banjo_door if(!mapSpecificFlags_get(2)){ mapSpecificFlags_set(2, TRUE); func_8028F918(0); - func_80324DBC(4.0f, ASSET_A7D_TEXT_JINXY_HELPED, 4, NULL, NULL, NULL, NULL); + func_80324DBC(4.0f, ASSET_A7D_DIALOG_JINXY_HELPED, 4, NULL, NULL, NULL, NULL); } } } diff --git a/src/MM/ch/conga.c b/src/MM/ch/conga.c index 60cfb28e..b04cef54 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){ - gcdialog_showText(ASSET_B39_TEXT_CONGA_HIT_BY_EGG, 4, actorPtr->position, 0, 0, 0); + gcdialog_showText(ASSET_B39_DIALOG_CONGA_HIT_BY_EGG, 4, actorPtr->position, 0, 0, 0); } } } @@ -150,12 +150,12 @@ void func_80387168(ActorMarker *marker, ActorMarker *other_marker){ int func_803872EC(void){ s32 text_id = func_803114C4(); - return text_id == ASSET_B37_TEXT_CONGA_SAFE_UP_HERE - || text_id == ASSET_B38_TEXT_CONGA_DEFEAT + return text_id == ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE + || text_id == ASSET_B38_DIALOG_CONGA_DEFEAT || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) - || text_id == ASSET_B3B_TEXT_CONGA_ORANGE_PAD_JIGGY - || text_id == ASSET_B45_TEXT_JIGGY_COLLECT_10 - || text_id == ASSET_B51_TEXT_BOTTLES_HOW_TO_EXIT_LEVEL; + || text_id == ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY + || text_id == ASSET_B45_DIALOG_JIGGY_COLLECT_10 + || text_id == ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL; } void func_80387370(ActorMarker *this, enum asset_e text_id, s32 arg2){ @@ -249,14 +249,14 @@ void func_803876D0(Actor *this){ sp3C = func_80329530(this, 1000); if( func_8032A9E4(((ActorLocal_Conga *)&this->local)->unk10, ((ActorLocal_Conga *)&this->local)->unk18, ((ActorLocal_Conga *)&this->local)->unk1C) && !this->unk138_23 - && gcdialog_showText(ASSET_B37_TEXT_CONGA_SAFE_UP_HERE, 0, 0, 0, 0, 0) + && gcdialog_showText(ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE, 0, 0, 0, 0, 0) ){ this->unk138_23 = 1; mapSpecificFlags_set(MM_SPECIFIC_FLAG_A_UNKNOWN, TRUE); }//L803878F8 if( sp3C && !this->has_met_before){ - if(gcdialog_showText((player_getTransformation()== TRANSFORM_2_TERMITE) ? ASSET_B3E_TEXT_CONGA_MEET_AS_TERMITE : ASSET_B3C_TEXT_CONGA_MEET, 0, this->position, 0,0,0)){ + if(gcdialog_showText((player_getTransformation()== TRANSFORM_2_TERMITE) ? ASSET_B3E_DIALOG_CONGA_MEET_AS_TERMITE : ASSET_B3C_DIALOG_CONGA_MEET, 0, this->position, 0,0,0)){ this->has_met_before = TRUE; } } //L80387968 @@ -348,7 +348,7 @@ void func_803876D0(Actor *this){ actor_playAnimationOnce(this); if(actor_animationIsAt(this, 0.99f)){ subaddie_set_state_with_direction(this, 3, 0.0f, 1); - gcdialog_showText(ASSET_B38_TEXT_CONGA_DEFEAT, 0xe, this->position, this->marker, func_80387370, NULL); + gcdialog_showText(ASSET_B38_DIALOG_CONGA_DEFEAT, 0xe, this->position, this->marker, func_80387370, NULL); } break; diff --git a/src/MM/ch/jujuhitbox.c b/src/MM/ch/jujuhitbox.c index f9f15a40..7e0edd13 100644 --- a/src/MM/ch/jujuhitbox.c +++ b/src/MM/ch/jujuhitbox.c @@ -138,7 +138,7 @@ void chjujuhitbox_update(Actor *this) { } if (func_80329530(this, 0xfa) && !func_80329530(this, 0x50) && !func_8028ECAC()) { - if (!this->has_met_before && gcdialog_showText(ASSET_B44_TEXT_JUJU_MEET, 0, 0, 0, NULL, NULL)) { + if (!this->has_met_before && gcdialog_showText(ASSET_B44_DIALOG_JUJU_MEET, 0, 0, 0, NULL, NULL)) { this->has_met_before = TRUE; } } diff --git a/src/MM/ch/orange.c b/src/MM/ch/orange.c index ff0aa018..60925a33 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) && - gcdialog_showText(ASSET_B3A_TEXT_CONGA_HITS_PLAYER, 0, 0, 0, NULL, NULL)) { + gcdialog_showText(ASSET_B3A_DIALOG_CONGA_HITS_PLAYER, 0, 0, 0, NULL, NULL)) { mapSpecificFlags_set(MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE, TRUE); } diff --git a/src/MMM/ch/loggo.c b/src/MMM/ch/loggo.c index 3513d7f0..eb00a17c 100644 --- a/src/MMM/ch/loggo.c +++ b/src/MMM/ch/loggo.c @@ -44,7 +44,7 @@ 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 (gcdialog_showText(ASSET_ADF_TEXT_ENTER_LOGGO, 0x2B, this->position, this->marker, &__chLoggo_textCallback, 0) != 0) { + if (gcdialog_showText(ASSET_ADF_DIALOG_ENTER_LOGGO, 0x2B, this->position, this->marker, &__chLoggo_textCallback, 0) != 0) { actor_collisionOff(this); fileProgressFlag_set(FILEPROG_89_ENTERED_LOGGO_AS_PUMPKIN, TRUE); } @@ -58,7 +58,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 (gcdialog_showText(ASSET_ADE_TEXT_LOGGO_AS_BEAR, 0x2A, this->position, NULL, NULL, NULL)) { + if (gcdialog_showText(ASSET_ADE_DIALOG_LOGGO_AS_BEAR, 0x2A, this->position, NULL, NULL, NULL)) { fileProgressFlag_set(FILEPROG_88_TRIED_LOGGO_AS_BEAR, TRUE); } } @@ -84,7 +84,7 @@ void chLoggo_update(Actor *this) { this->lifetime_value = 0.0f; if (!fileProgressFlag_get(FILEPROG_8A_EXITED_LOGGO) && levelSpecificFlags_get(LEVEL_FLAG_33_MMM_UNKNOWN)) { - if (gcdialog_showText(ASSET_AE0_TEXT_EXIT_LOGGO, 4, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(ASSET_AE0_DIALOG_EXIT_LOGGO, 4, NULL, NULL, NULL, NULL)) { fileProgressFlag_set(FILEPROG_8A_EXITED_LOGGO, TRUE); } } diff --git a/src/MMM/code_3420.c b/src/MMM/code_3420.c index 2a15e7f9..827958d6 100644 --- a/src/MMM/code_3420.c +++ b/src/MMM/code_3420.c @@ -177,7 +177,7 @@ void func_803898EC() { } void func_80389910() { - gcdialog_showText(ASSET_AD5_TEXT_UNKNOWN, 0xE, NULL, NULL, MMM_func_80389810, NULL); + gcdialog_showText(ASSET_AD5_DIALOG_UNKNOWN, 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); @@ -198,10 +198,10 @@ void organMinigame_setState(s32 next_state){ if (next_state == 2) { if (D_8038C4F0.pattern == 0) { D_8038C4F0.pattern = 1; - gcdialog_showText(ASSET_AD3_TEXT_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL); + gcdialog_showText(ASSET_AD3_DIALOG_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL); } else {//L80389A84 - gcdialog_showText(ASSET_AD6_TEXT_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL); + gcdialog_showText(ASSET_AD6_DIALOG_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL); } }//L80389A9C @@ -218,13 +218,13 @@ void organMinigame_setState(s32 next_state){ }//L80389AF4 if(next_state == 4){ - gcdialog_showText(ASSET_ADD_TEXT_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL); + gcdialog_showText(ASSET_ADD_DIALOG_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL); func_80387720(D_8038C4F0.motzhand_marker); } if(next_state == 5){ D_8038C4F0.pattern++; - gcdialog_showText(ASSET_AD4_TEXT_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL); + gcdialog_showText(ASSET_AD4_DIALOG_UNKNOWN, 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 b2d971d2..635a9096 100644 --- a/src/MMM/code_47D0.c +++ b/src/MMM/code_47D0.c @@ -120,7 +120,7 @@ void __chTumblar_congratulationTextCallback(ActorMarker *marker, enum asset_e te } void chTumblar_congratulate(Struct_MMM_47D0_0 *arg0, s32 arg1) { - gcdialog_showText(ASSET_ADB_TEXT_UNKNOWN, 4, NULL, arg0->jiggy_marker, __chTumblar_congratulationTextCallback, NULL); + gcdialog_showText(ASSET_ADB_DIALOG_UNKNOWN, 4, NULL, arg0->jiggy_marker, __chTumblar_congratulationTextCallback, NULL); arg0->state = TUMBLAR_STATE_1_CONGRATULATING; } @@ -213,7 +213,7 @@ void chTumblar_update(Struct_MMM_47D0_0 *arg0, Struct68s *arg1, f32 tick) { func_8035179C_copyPosition(arg1, position); if (!mapSpecificFlags_get(MMM_SPECIFIC_FLAG_0_UNKNOWN) && arg0->state == TUMBLAR_STATE_0_IDLE && ml_vec3f_horizontal_distance_zero_likely(position, plyr_pos) < 250.0f) { - if (gcdialog_showText(ASSET_ADA_TEXT_UNKNOWN, 0, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(ASSET_ADA_DIALOG_UNKNOWN, 0, NULL, NULL, NULL, NULL)) { mapSpecificFlags_set(0, TRUE); } } diff --git a/src/RBB/ch/bossboombox.c b/src/RBB/ch/bossboombox.c index b3204aa3..d2859a48 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); - gcdialog_showText(ASSET_B9F_TEXT_UNKNOWN, 4, 0, 0, 0, 0); + gcdialog_showText(ASSET_B9F_DIALOG_UNKNOWN, 4, 0, 0, 0, 0); } }//L8038D278 } diff --git a/src/SM/ch/attacktutorial.c b/src/SM/ch/attacktutorial.c index 6e9ec693..48b1ba20 100644 --- a/src/SM/ch/attacktutorial.c +++ b/src/SM/ch/attacktutorial.c @@ -65,12 +65,12 @@ void __chAttackTutorial_learnedTextCallback(ActorMarker *marker, enum asset_e te func_8028F918(0); switch (text_id) { - case ASSET_E15_TEXT_UNKNOWN://L803872C8 + case ASSET_E15_DIALOG_UNKNOWN://L803872C8 ability_unlock(ABILITY_C_ROLL); chAttackTutorial_setState(actor, ATTACK_TUTORIAL_STATE_2_UNKNOWN); break; - case ASSET_E17_TEXT_UNKNOWN://L803872E4 + case ASSET_E17_DIALOG_UNKNOWN://L803872E4 ability_unlock(ABILITY_B_RATATAT_RAP); chAttackTutorial_setState(actor, ATTACK_TUTORIAL_STATE_2_UNKNOWN); break; @@ -84,10 +84,10 @@ void chAttackTutorial_setState(Actor *this, s32 state) { case ATTACK_TUTORIAL_STATE_5_UNKNOWN: if (this->unk10_12 == NULL) { ability_unlock(ABILITY_4_CLAW_SWIPE); - gcdialog_showText(ASSET_DFF_TEXT_BOTTLES_CLAW_SWIPE_LEARN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnedTextCallback, __chAttackTutorial_learnedTextActions); + gcdialog_showText(ASSET_DFF_DIALOG_BOTTLES_CLAW_SWIPE_LEARN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnedTextCallback, __chAttackTutorial_learnedTextActions); } else { - gcdialog_showText(this->unk10_12 == VEGETABLE_1_TOPPER ? ASSET_E15_TEXT_UNKNOWN : ASSET_E17_TEXT_UNKNOWN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnedTextCallback, NULL); + gcdialog_showText(this->unk10_12 == VEGETABLE_1_TOPPER ? ASSET_E15_DIALOG_UNKNOWN : ASSET_E17_DIALOG_UNKNOWN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnedTextCallback, NULL); } break; @@ -173,28 +173,28 @@ void __chAttackTutorial_attackTextCallback(ActorMarker *marker, enum asset_e tex Actor *actor = marker_getActor(marker); switch (text_id) { - case ASSET_DFF_TEXT_BOTTLES_CLAW_SWIPE_LEARN: + case ASSET_DFF_DIALOG_BOTTLES_CLAW_SWIPE_LEARN: func_8028F918(0); break; - case ASSET_E14_TEXT_UNKNOWN: - case ASSET_E16_TEXT_UNKNOWN: - case ASSET_E18_TEXT_UNKNOWN: + case ASSET_E14_DIALOG_UNKNOWN: + case ASSET_E16_DIALOG_UNKNOWN: + case ASSET_E18_DIALOG_UNKNOWN: __chAttackTutorial_spawnEnemy(actor, actor->unk10_12); break; - case ASSET_E15_TEXT_UNKNOWN: + case ASSET_E15_DIALOG_UNKNOWN: ability_unlock(ABILITY_C_ROLL); chAttackTutorial_setState(actor, ATTACK_TUTORIAL_STATE_2_UNKNOWN); break; - case ASSET_E17_TEXT_UNKNOWN: + case ASSET_E17_DIALOG_UNKNOWN: ability_unlock(ABILITY_B_RATATAT_RAP); chAttackTutorial_setState(actor, ATTACK_TUTORIAL_STATE_2_UNKNOWN); break; - case ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES: - case ASSET_E19_TEXT_UNKNOWN: + case ASSET_E12_DIALOG_BOTTLES_LEARNED_TUTORIAL_MOVES: + case ASSET_E19_DIALOG_UNKNOWN: chAttackTutorial_setState(actor, ATTACK_TUTORIAL_STATE_3_UNKNOWN); break; } @@ -216,15 +216,15 @@ void chAttackTutorial_talk(ActorMarker *marker) { switch (actor->unk10_12) { case VEGETABLE_1_TOPPER: //L803877D8 - text_id = try_count ? ASSET_E15_TEXT_UNKNOWN : ASSET_E14_TEXT_UNKNOWN; + text_id = try_count ? ASSET_E15_DIALOG_UNKNOWN : ASSET_E14_DIALOG_UNKNOWN; break; case VEGETABLE_2_BAWL: //L803877F4 - text_id = try_count ? ASSET_E17_TEXT_UNKNOWN : ASSET_E16_TEXT_UNKNOWN; + text_id = try_count ? ASSET_E17_DIALOG_UNKNOWN : ASSET_E16_DIALOG_UNKNOWN; break; case VEGETABLE_3_COLLY_WOBBLE: //L80387810 - text_id = try_count ? ASSET_E19_TEXT_UNKNOWN : ASSET_E18_TEXT_UNKNOWN; + text_id = try_count ? ASSET_E19_DIALOG_UNKNOWN : ASSET_E18_DIALOG_UNKNOWN; break; default: @@ -232,13 +232,13 @@ void chAttackTutorial_talk(ActorMarker *marker) { break; }//L8038782C - if (text_id == ASSET_E19_TEXT_UNKNOWN) { + if (text_id == ASSET_E19_DIALOG_UNKNOWN) { func_8028F94C(2, actor->unk1C); }//L80387848 if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities() && try_count) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); - text_id = ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES; + text_id = ASSET_E12_DIALOG_BOTTLES_LEARNED_TUTORIAL_MOVES; }//L80387898 if (try_count) { diff --git a/src/SM/ch/jumptutorial.c b/src/SM/ch/jumptutorial.c index 2f276b03..40eb5d1b 100644 --- a/src/SM/ch/jumptutorial.c +++ b/src/SM/ch/jumptutorial.c @@ -32,7 +32,7 @@ void __chJumpTutorial_setStaticCameraToNode4(Actor *this) { void __chJumpTutorial_textCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2) { Actor *actor = marker_getActor(caller); - if (text_id == ASSET_DF9_TEXT_BOTTLES_UNKNOWN || text_id == ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES) { + if (text_id == ASSET_DF9_DIALOG_BOTTLES_UNKNOWN || text_id == ASSET_E12_DIALOG_BOTTLES_LEARNED_TUTORIAL_MOVES) { chJumpTutorial_setState(actor, JUMP_TUTORIAL_STATE_3_DISAPPEARED); } @@ -56,8 +56,8 @@ void chJumpTutorial_setState(Actor *this, s32 state) { __chJumpTutorial_setStaticCameraToNode4(this); ability_unlock(ABILITY_A_HOLD_A_JUMP_HIGHER); - gcdialog_showText(ASSET_DF6_TEXT_BOTTLES_HIGH_JUMP_LEARN, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); - this->sm_4070.dialog_id = ASSET_E1A_TEXT_BOTTLES_UNKNOWN; + gcdialog_showText(ASSET_DF6_DIALOG_BOTTLES_HIGH_JUMP_LEARN, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); + this->sm_4070.dialog_id = ASSET_E1A_DIALOG_BOTTLES_UNKNOWN; mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE); } break; @@ -112,8 +112,8 @@ void chJumpTutorial_update(Actor *this) { __chJumpTutorial_setStaticCameraToNode4(this); ability_unlock(ABILITY_7_FEATHERY_FLAP); - gcdialog_showText(ASSET_DF7_TEXT_BOTTLES_FEATHERY_FLAP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); - this->sm_4070.dialog_id = ASSET_E1B_TEXT_BOTTLES_UNKNOWN; + gcdialog_showText(ASSET_DF7_DIALOG_BOTTLES_FEATHERY_FLAP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); + this->sm_4070.dialog_id = ASSET_E1B_DIALOG_BOTTLES_UNKNOWN; mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE); }//L8038A730 @@ -121,8 +121,8 @@ void chJumpTutorial_update(Actor *this) { __chJumpTutorial_setStaticCameraToNode4(this); ability_unlock(ABILITY_8_FLAP_FLIP); - gcdialog_showText(ASSET_DF8_TEXT_BOTTLES_FLAP_FLIP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); - this->sm_4070.dialog_id = ASSET_E1C_TEXT_BOTTLES_UNKNOWN; + gcdialog_showText(ASSET_DF8_DIALOG_BOTTLES_FLAP_FLIP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); + this->sm_4070.dialog_id = ASSET_E1C_DIALOG_BOTTLES_UNKNOWN; mapSpecificFlags_set(SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED, FALSE); }//L8038A794 @@ -132,10 +132,10 @@ void chJumpTutorial_update(Actor *this) { if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities()) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); - dialog_id = ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES; + dialog_id = ASSET_E12_DIALOG_BOTTLES_LEARNED_TUTORIAL_MOVES; } else { - dialog_id = ASSET_DF9_TEXT_BOTTLES_UNKNOWN; + dialog_id = ASSET_DF9_DIALOG_BOTTLES_UNKNOWN; } gcdialog_showText(dialog_id, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); diff --git a/src/SM/ch/smbottles.c b/src/SM/ch/smbottles.c index 48f41e98..969b4a06 100644 --- a/src/SM/ch/smbottles.c +++ b/src/SM/ch/smbottles.c @@ -48,14 +48,14 @@ ActorInfo chBottles = { }; ChSmBottlesDialog chSmBottlesDialogTable[8] = { - {ASSET_DF3_TEXT_BOTTLES_INTRODUCTION, ASSET_E08_TEXT_BOTTLES_FIND_ANOTHER_MOLEHILL, 0x1, -1}, - {ASSET_DF4_TEXT_BOTTLES_CAMERA_CONTROL_LEARN, ASSET_DF5_TEXT_BOTTLES_CAMERA_CONTROL_REFRESHER, 0x3, ABILITY_3_CAMERA_CONTROL}, - {ASSET_DFB_TEXT_BOTTLES_DIVE_LEARN, ASSET_DFE_TEXT_BOTTLES_DIVE_REFRESHER, 0x5, ABILITY_F_DIVE}, - {-1, ASSET_E00_TEXT_BOTTLES_ATTACK_REFRESHER, 0x6, ABILITY_B_RATATAT_RAP}, - {ASSET_E04_TEXT_BOTTLES_BEAK_BARGE_LEARN, ASSET_E06_TEXT_BOTTLES_BEAK_BARGE_REFRESHER, 0x8, ABILITY_0_BARGE}, - {-1, ASSET_DFA_TEXT_BOTTLES_JUMP_REFRESHER, 0x4, ABILITY_8_FLAP_FLIP}, - {ASSET_E01_TEXT_BOTTLES_CLIMB_LEARN, ASSET_E03_TEXT_BOTTLES_CLIMB_REFRESHER, 0x7, ABILITY_5_CLIMB}, - {ASSET_E10_TEXT_BOTTLES_BRIDGE_BROKEN, ASSET_E11_TEXT_BOTTLES_BRIDGE_STILL_BROKEN, 0x11, -1}, + {ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION, ASSET_E08_DIALOG_BOTTLES_FIND_ANOTHER_MOLEHILL, 0x1, -1}, + {ASSET_DF4_DIALOG_BOTTLES_CAMERA_CONTROL_LEARN, ASSET_DF5_DIALOG_BOTTLES_CAMERA_CONTROL_REFRESHER, 0x3, ABILITY_3_CAMERA_CONTROL}, + {ASSET_DFB_DIALOG_BOTTLES_DIVE_LEARN, ASSET_DFE_DIALOG_BOTTLES_DIVE_REFRESHER, 0x5, ABILITY_F_DIVE}, + {-1, ASSET_E00_DIALOG_BOTTLES_ATTACK_REFRESHER, 0x6, ABILITY_B_RATATAT_RAP}, + {ASSET_E04_DIALOG_BOTTLES_BEAK_BARGE_LEARN, ASSET_E06_DIALOG_BOTTLES_BEAK_BARGE_REFRESHER, 0x8, ABILITY_0_BARGE}, + {-1, ASSET_DFA_DIALOG_BOTTLES_JUMP_REFRESHER, 0x4, ABILITY_8_FLAP_FLIP}, + {ASSET_E01_DIALOG_BOTTLES_CLIMB_LEARN, ASSET_E03_DIALOG_BOTTLES_CLIMB_REFRESHER, 0x7, ABILITY_5_CLIMB}, + {ASSET_E10_DIALOG_BOTTLES_BRIDGE_BROKEN, ASSET_E11_DIALOG_BOTTLES_BRIDGE_STILL_BROKEN, 0x11, -1}, }; s32 chSmBottlesDialogIndex = 0; @@ -241,43 +241,43 @@ void __chSmBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 a if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities()) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); - gcdialog_showText(ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, __chSmBottles_textCallback, NULL); + gcdialog_showText(ASSET_E12_DIALOG_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, __chSmBottles_textCallback, NULL); }//L8038933C else { - if (!(text_id == ASSET_DF3_TEXT_BOTTLES_INTRODUCTION || text_id == ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER || text_id == ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT)) { + if (!(text_id == ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION || text_id == ASSET_E1F_DIALOG_BOTTLES_TUTORIAL_OFFER || text_id == ASSET_E1D_DIALOG_BOTTLES_TUTORIAL_OFFER_WAIT)) { timed_exitStaticCamera(0.0f); } switch (text_id) { - case ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED: + case ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED: break; - case ASSET_DF3_TEXT_BOTTLES_INTRODUCTION: /* 2FB8 803893A8 3C188039 */ - gcdialog_showText(ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER, 0x8e, actor->position, actor->marker, __chSmBottles_textCallback, __chSmBottles_textActions); + case ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION: /* 2FB8 803893A8 3C188039 */ + gcdialog_showText(ASSET_E1F_DIALOG_BOTTLES_TUTORIAL_OFFER, 0x8e, actor->position, actor->marker, __chSmBottles_textCallback, __chSmBottles_textActions); break; - case ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER: /* 2FEC 803893DC 9209003B */ + case ASSET_E1F_DIALOG_BOTTLES_TUTORIAL_OFFER: /* 2FEC 803893DC 9209003B */ actor->unk38_0 = TRUE; break; - case ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT: /* 2FFC 803893EC 920B0138 */ + case ASSET_E1D_DIALOG_BOTTLES_TUTORIAL_OFFER_WAIT: /* 2FFC 803893EC 920B0138 */ actor->has_met_before = FALSE; actor->lifetime_value = 0.0f; break; - case ASSET_DF6_TEXT_BOTTLES_HIGH_JUMP_LEARN: /* 3014 80389404 0C0A3E46 */ - case ASSET_DFF_TEXT_BOTTLES_CLAW_SWIPE_LEARN: /* 3014 80389404 0C0A3E46 */ + case ASSET_DF6_DIALOG_BOTTLES_HIGH_JUMP_LEARN: /* 3014 80389404 0C0A3E46 */ + case ASSET_DFF_DIALOG_BOTTLES_CLAW_SWIPE_LEARN: /* 3014 80389404 0C0A3E46 */ func_8028F918(0); break; - case ASSET_E09_TEXT_BOTTLES_SKIPPED_TUTORIAL: - case ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES: + case ASSET_E09_DIALOG_BOTTLES_SKIPPED_TUTORIAL: + case ASSET_E12_DIALOG_BOTTLES_LEARNED_TUTORIAL_MOVES: __chSmBottles_setState(actor, SM_BOTTLES_STATE_4_UNKNOWN); break; default: if (actor->state != SM_BOTTLES_STATE_5_UNKNOWN) { - gcdialog_showText(ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED, 0x4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0x4, NULL, NULL, NULL, NULL); } __chSmBottles_setState(actor, actor->state == SM_BOTTLES_STATE_5_UNKNOWN ? SM_BOTTLES_STATE_1_UNKNOWN : SM_BOTTLES_STATE_4_UNKNOWN); @@ -291,11 +291,11 @@ void __chSmBottles_getRefresherDialog(Actor *this, s32 *text_id, s32 *text_flags // Gives the player the ability if not learned. if (ability_isUnlocked(chSmBottlesDialogTable[this->unkF4_8 - 1].ability)) { if (fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)) { - *text_id = chSmBottlesDialogIndex + ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1; + *text_id = chSmBottlesDialogIndex + ASSET_E0A_DIALOG_BOTTLES_REFUSE_HELP_1; chSmBottlesDialogIndex++; chSmBottlesDialogIndex = MIN(chSmBottlesDialogIndex, 5); - if (*text_id != ASSET_E0E_TEXT_BOTTLES_REFUSE_HELP_5) { + if (*text_id != ASSET_E0E_DIALOG_BOTTLES_REFUSE_HELP_5) { *text_flags |= 1; } } @@ -303,8 +303,8 @@ void __chSmBottles_getRefresherDialog(Actor *this, s32 *text_id, s32 *text_flags *text_flags |= 1; *text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].refresher_text_id; - if (*text_id == ASSET_DFE_TEXT_BOTTLES_DIVE_REFRESHER && !ability_hasUsed(ABILITY_3_CAMERA_CONTROL)) { - *text_id = ASSET_DFD_TEXT_BOTTLES_SWIM_LEARN; + if (*text_id == ASSET_DFE_DIALOG_BOTTLES_DIVE_REFRESHER && !ability_hasUsed(ABILITY_3_CAMERA_CONTROL)) { + *text_id = ASSET_DFD_DIALOG_BOTTLES_SWIM_LEARN; } } } @@ -327,7 +327,7 @@ void __chSmBottles_talk(Actor *this) { text_flags |= 1; if (fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)) { - text_id = chSmBottlesDialogIndex + ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1; + text_id = chSmBottlesDialogIndex + ASSET_E0A_DIALOG_BOTTLES_REFUSE_HELP_1; chSmBottlesDialogIndex++; chSmBottlesDialogIndex = MIN(chSmBottlesDialogIndex, 5); } @@ -344,11 +344,11 @@ void __chSmBottles_talk(Actor *this) { case 8://L80389720 if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED)) { if (fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)) { - text_id = ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN; + text_id = ASSET_E37_DIALOG_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN; text_flags |= 1; } else if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)) { //L80389758 - text_id = ASSET_E0F_TEXT_BOTTLES_STOP_WASTING_TIME_BEFORE_FURNACE_FUN; + text_id = ASSET_E0F_DIALOG_BOTTLES_STOP_WASTING_TIME_BEFORE_FURNACE_FUN; text_flags |= 1; } else {//L80389780 @@ -610,7 +610,7 @@ void chSmBottles_update(Actor *this) { if (button_pressed != -1) { fileProgressFlag_set(FILEPROG_DB_SKIPPED_TUTORIAL, button_pressed ? 0 : 1); - gcdialog_showText(button_pressed ? ASSET_E07_TEXT_BOTTLES_UNKNOWN : ASSET_E09_TEXT_BOTTLES_SKIPPED_TUTORIAL, 0xe, this->position, this->marker, __chSmBottles_textCallback,__chSmBottles_textActions); + gcdialog_showText(button_pressed ? ASSET_E07_DIALOG_BOTTLES_UNKNOWN : ASSET_E09_DIALOG_BOTTLES_SKIPPED_TUTORIAL, 0xe, this->position, this->marker, __chSmBottles_textCallback,__chSmBottles_textActions); if (!button_pressed) { __chSmBottles_skipIntroTutorial(); @@ -619,7 +619,7 @@ void chSmBottles_update(Actor *this) { this->unk38_0 = FALSE; } else if (!this->has_met_before && 5.0 < this->lifetime_value) { - gcdialog_showText(ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT, 0x86, this->position, this->marker, __chSmBottles_textCallback, NULL); + gcdialog_showText(ASSET_E1D_DIALOG_BOTTLES_TUTORIAL_OFFER_WAIT, 0x86, this->position, this->marker, __chSmBottles_textCallback, NULL); this->has_met_before = TRUE; } } diff --git a/src/TTC/ch/blubber.c b/src/TTC/ch/blubber.c index d73a1b50..13f38460 100644 --- a/src/TTC/ch/blubber.c +++ b/src/TTC/ch/blubber.c @@ -63,7 +63,7 @@ static void __chBlubber_showTextCallback(ActorMarker *caller, enum asset_e text_ Actor *this = marker_getActor(caller); ActorLocal_Blubber *local = (ActorLocal_Blubber*)&this->local; - if(text_id == ASSET_A0D_TEXT_BLUBBER_COMPLETE || text_id == ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED){ + if(text_id == ASSET_A0D_DIALOG_BLUBBER_COMPLETE || text_id == ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED){ local->unk24 = 0; } else{ @@ -89,7 +89,7 @@ static void __chBlubber_showJiggySpawnedText(ActorMarker *marker){ this->actor_specific_1_f = 0.0f; if(!mapSpecificFlags_get(TTC_SPECIFIC_FLAG_2_BLUBBER_JIGGY_SPAWNED_TEXT_SHOWN)) { - text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED : ASSET_A0D_TEXT_BLUBBER_COMPLETE; + text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED : ASSET_A0D_DIALOG_BLUBBER_COMPLETE; gcdialog_showText(text_id, 0xf, this->position, this->marker, __chBlubber_showTextCallback, __chBlubber_showTextCallback2); mapSpecificFlags_set(TTC_SPECIFIC_FLAG_2_BLUBBER_JIGGY_SPAWNED_TEXT_SHOWN, TRUE); } @@ -157,7 +157,7 @@ static void __chBlubber_updateFunc(Actor *this){ && !this->has_met_before && item_getCount(ITEM_18_GOLD_BULLIONS) == 0 ){ - gcdialog_showText(ASSET_A0B_TEXT_BLUBBER_FIRST_MEET, 0xe, this->position, this->marker, __chBlubber_showTextCallback, NULL); + gcdialog_showText(ASSET_A0B_DIALOG_BLUBBER_FIRST_MEET, 0xe, this->position, this->marker, __chBlubber_showTextCallback, NULL); this->has_met_before = TRUE; subaddie_set_state_forward(this, CH_BLUBBER_STATE_3_UNKNOWN); } @@ -166,7 +166,7 @@ static void __chBlubber_updateFunc(Actor *this){ && !this->unk138_23 ){ if (item_getCount(ITEM_18_GOLD_BULLIONS) == 0) { - gcdialog_showText(ASSET_A0C_TEXT_BLUBBER_HALF_GOLD, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A0C_DIALOG_BLUBBER_HALF_GOLD, 4, NULL, NULL, NULL, NULL); } this->unk138_23 = TRUE; diff --git a/src/TTC/ch/clam.c b/src/TTC/ch/clam.c index 417ccf92..3679986a 100644 --- a/src/TTC/ch/clam.c +++ b/src/TTC/ch/clam.c @@ -245,7 +245,7 @@ static void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_ma if(func_80297C6C() == 3) return; - if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showText(ASSET_A14_TEXT_CLAM_TAUNT, 0, NULL, NULL, NULL, NULL)){ + if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showText(ASSET_A14_DIALOG_CLAM_TAUNT, 0, NULL, NULL, NULL, NULL)){ mapSpecificFlags_set(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN, TRUE); } diff --git a/src/TTC/ch/leaky.c b/src/TTC/ch/leaky.c index 528e23fc..df8719b7 100644 --- a/src/TTC/ch/leaky.c +++ b/src/TTC/ch/leaky.c @@ -60,7 +60,7 @@ static void __chLeaky_updateFunc(Actor *this) { && !this->has_met_before && func_80329530(this, 250) && !func_80329530(this, 160) && !func_8028ECAC() - && gcdialog_showText(ASSET_A1A_TEXT_LEAKY_FIRST_MEET, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(ASSET_A1A_DIALOG_LEAKY_FIRST_MEET, 0, NULL, NULL, NULL, NULL) ){ this->has_met_before = TRUE; } @@ -118,6 +118,6 @@ bool chLeaky_eggCollision(ActorMarker *marker){ levelSpecificFlags_set(2, TRUE); levelSpecificFlags_set(5, TRUE); - gcdialog_showText(ASSET_A28_TEXT_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_showDoneText, NULL); + gcdialog_showText(ASSET_A28_DIALOG_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_showDoneText, NULL); return TRUE; } diff --git a/src/TTC/ch/lockup.c b/src/TTC/ch/lockup.c index 3ead4eb2..99ff2b22 100644 --- a/src/TTC/ch/lockup.c +++ b/src/TTC/ch/lockup.c @@ -87,7 +87,7 @@ static void __chLockup_updateFunc(Actor *this){ && func_80329530(this, 320) && !func_80329530(this, 160) && !func_8028ECAC() - && gcdialog_showText(ASSET_A15_TEXT_TTC_LOCKUP_SPAWNED, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(ASSET_A15_DIALOG_TTC_LOCKUP_SPAWNED, 0, NULL, NULL, NULL, NULL) ){ this->has_met_before = TRUE; } diff --git a/src/TTC/ch/nipper.c b/src/TTC/ch/nipper.c index ec5c51ab..1e065481 100644 --- a/src/TTC/ch/nipper.c +++ b/src/TTC/ch/nipper.c @@ -156,7 +156,7 @@ static void __chNipper_dieFunc(ActorMarker *this_marker, ActorMarker *other_mark __chNipper_playDeathAnimation(this); this->lifetime_value = 80.0f; - gcdialog_showText(ASSET_A10_TEXT_TTC_NIPPER_HURT, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A10_DIALOG_TTC_NIPPER_HURT, 4, NULL, NULL, NULL, NULL); return; } @@ -243,7 +243,7 @@ static void __chNipper_updateFunc(Actor *this){ && temp_v0 != 10 ){ subaddie_set_state_with_direction(this, CH_NIPPER_STATE_5_SPAWNED, 0.01f, 1); - if(gcdialog_showText(ASSET_A0E_TEXT_NIPPER_SPAWNED, 0xf, this->position, this->marker, __chNipper_spawnedShowTextCallback, NULL)){ + if(gcdialog_showText(ASSET_A0E_DIALOG_NIPPER_SPAWNED, 0xf, this->position, this->marker, __chNipper_spawnedShowTextCallback, NULL)){ this->has_met_before = TRUE; } comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 5000, 300); diff --git a/src/TTC/ch/treasurehunt.c b/src/TTC/ch/treasurehunt.c index aeee0923..2583629e 100644 --- a/src/TTC/ch/treasurehunt.c +++ b/src/TTC/ch/treasurehunt.c @@ -116,10 +116,10 @@ static void __chTreasurehunt_spawnActorForNextStep(void) { static void __chTreasurehunt_checkStepProgress(s32 currentStep){ if(CH_TREASUREHUNT_PUZZLE_CURRENT_STEP == currentStep && __chTreasurehunt_isActiveHitboxBeakBusterHitbox()){ if(currentStep == 0 && !jiggyscore_isCollected(JIGGY_11_TTC_RED_X)){ - gcdialog_showText(ASSET_A18_TEXT_TREASUREHUNT_FOLLOW_CLUES, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A18_DIALOG_TREASUREHUNT_FOLLOW_CLUES, 4, NULL, NULL, NULL, NULL); } else if(currentStep == 4){ - gcdialog_showText(ASSET_A19_TEXT_TREASUREHUNT_SECOND_STEP, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A19_DIALOG_TREASUREHUNT_SECOND_STEP, 4, NULL, NULL, NULL, NULL); } CH_TREASUREHUNT_PUZZLE_CURRENT_STEP++; @@ -170,7 +170,7 @@ void chTreasurehunt_checkStepProgress5(s16 arg0[3], s32 arg1){ gcpausemenu_80314AC8(0); timedFunc_set_2(0.1f, (GenFunction_2) func_8028F45C, 9, (s32)&particleTargetPosition); timedFunc_set_1(0.1f, (GenFunction_1) gcpausemenu_80314AC8, 1); - gcdialog_showText(ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_A17_DIALOG_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL); CH_TREASUREHUNT_PUZZLE_CURRENT_STEP++; } } diff --git a/src/core2/abilityprogress.c b/src/core2/abilityprogress.c index b32c1547..535368ca 100644 --- a/src/core2/abilityprogress.c +++ b/src/core2/abilityprogress.c @@ -30,24 +30,24 @@ void ability_use(s32 arg0){ break; case 0x3://L8029569C // if(map_get() == MAP_1_SM_SPIRAL_MOUNTAIN){ - sp2C = ASSET_DFC_TEXT_UNKNOWN; + sp2C = ASSET_DFC_DIALOG_UNKNOWN; } break; case 0x4://L802956B8 // if(map_get() == MAP_1_SM_SPIRAL_MOUNTAIN){ - sp2C = ASSET_E02_TEXT_UNKNOWN; + sp2C = ASSET_E02_DIALOG_UNKNOWN; } break; case 0x5://L802956D4 //barge if(map_get() == MAP_1_SM_SPIRAL_MOUNTAIN){ - sp2C = ASSET_E05_TEXT_UNKNOWN; + sp2C = ASSET_E05_DIALOG_UNKNOWN; } break; case 0x6://L802956F0 //slide sp28 = 0; if (!ability_isUnlocked(ABILITY_10_TALON_TROT)) { if (map_get() == MAP_2_MM_MUMBOS_MOUNTAIN) { - sp2C = ASSET_B4D_TEXT_UNKNOWN; + sp2C = ASSET_B4D_DIALOG_UNKNOWN; } else { return; diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index f5e3b51c..c2c0a412 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -116,7 +116,7 @@ void __baMarker_8028B848(void){ s0 = ASSET_E57_DIALOG_FIRST_JIGGY; } else if(map_get() == MAP_2_MM_MUMBOS_MOUNTAIN){ - s0 = ASSET_B45_TEXT_JIGGY_COLLECT_10; + s0 = ASSET_B45_DIALOG_JIGGY_COLLECT_10; } if(s0){ diff --git a/src/core2/ch/beehive.c b/src/core2/ch/beehive.c index 78df9245..e29e7947 100644 --- a/src/core2/ch/beehive.c +++ b/src/core2/ch/beehive.c @@ -35,7 +35,7 @@ void chBeehive_die(ActorMarker *this, ActorMarker *other){ __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2])); actor->marker->propPtr->unk8_3 = 0; func_803115C4(ASSET_D96_DIALOG_BEEHIVE_MEET); - func_803115C4(ASSET_DA6_TEXT_BEEHIVE_WITH_BEES); + func_803115C4(ASSET_DA6_DIALOG_BEEHIVE_WITH_BEES); } void chBeehive_update(Actor *this){ diff --git a/src/core2/ch/bottlesbonus.c b/src/core2/ch/bottlesbonus.c index 1ef89412..cc489976 100644 --- a/src/core2/ch/bottlesbonus.c +++ b/src/core2/ch/bottlesbonus.c @@ -521,7 +521,7 @@ void chBottlesBonus_update(Actor *this) { func_8025A7DC(COMUSIC_98_BBONUS_PIECES_SHUFFLE); if (D_8037DCC7 == 0) { func_80311714(0); - gcdialog_showText(ASSET_E24_TEXT_UNKNOWN, 0x87, this->position, chBottlesBonusMarker, chBottlesBonus_startTimer, NULL); + gcdialog_showText(ASSET_E24_DIALOG_UNKNOWN, 0x87, this->position, chBottlesBonusMarker, chBottlesBonus_startTimer, NULL); func_80311714(1); D_8037DCC7 = 1; } diff --git a/src/core2/ch/gloop.c b/src/core2/ch/gloop.c index bd97fa88..ba5d505d 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) - && gcdialog_showText(ASSET_D34_TEXT_GLOOP_MEET, 0, NULL, NULL, NULL, NULL) + && gcdialog_showText(ASSET_D34_DIALOG_GLOOP_MEET, 0, NULL, NULL, NULL, NULL) ){ mapSpecificFlags_set(2, TRUE); } diff --git a/src/core2/ch/mole.c b/src/core2/ch/mole.c index 31822185..37ea0664 100644 --- a/src/core2/ch/mole.c +++ b/src/core2/ch/mole.c @@ -77,19 +77,19 @@ enum asset_e chmole_learnedAllLevelAbilitiesDialog(void){ int learned_all_moves = chmole_learnedAllLevelAbilities(level_id); switch(level_id){ case LEVEL_1_MUMBOS_MOUNTAIN: - return learned_all_moves ? ASSET_B4E_TEXT_BOTTLES_ALL_MM_MOVES_LEARNED : ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; case LEVEL_2_TREASURE_TROVE_COVE: - return learned_all_moves ? ASSET_A27_TEXT_BOTTLES_ALL_TTC_MOVES_LEARNED : ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? ASSET_A27_DIALOG_BOTTLES_ALL_TTC_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; case LEVEL_3_CLANKERS_CAVERN: - return learned_all_moves ? ASSET_D37_TEXT_BOTTLES_ALL_CC_MOVES_LEARNED : ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; case LEVEL_4_BUBBLEGLOOP_SWAMP: - return learned_all_moves ? ASSET_C8A_TEXT_BOTTLES_ALL_BGS_MOVES_LEARNED : ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; case LEVEL_5_FREEZEEZY_PEAK: - return learned_all_moves ? ASSET_C2A_TEXT_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; case LEVEL_7_GOBIS_VALLEY: - return learned_all_moves ? ASSET_C2A_TEXT_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; default: - return ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED; + return ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; } } @@ -157,9 +157,9 @@ void chmole_healthRefill(ActorMarker *marker, enum asset_e arg1, s32 arg2){ if( arg1 == moleTable[actor->unkF4_8-9].teach_text_id && item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL) ){ - gcdialog_showText(ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH, 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions); + gcdialog_showText(ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH, 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions); }//L802D9738 - else if(arg1 == moleTable[actor->unkF4_8-9].teach_text_id || arg1 == ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH){ + else if(arg1 == moleTable[actor->unkF4_8-9].teach_text_id || arg1 == ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH){ gcdialog_showText(chmole_learnedAllGameAbilities()? 0xa87 : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL); } else{//L802D97BC diff --git a/src/fight/chfinalboss.c b/src/fight/chfinalboss.c index 293fc577..9c9d8a9b 100644 --- a/src/fight/chfinalboss.c +++ b/src/fight/chfinalboss.c @@ -1956,7 +1956,7 @@ void chfinalboss_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); - gcdialog_showText(ASSET_10E7_TEXT_UNKNOWN, 0x2A, sp24->position, sp24->marker, chfinalboss_phase0_endTextCallback, NULL); + gcdialog_showText(ASSET_10E7_DIALOG_UNKNOWN, 0x2A, sp24->position, sp24->marker, chfinalboss_phase0_endTextCallback, NULL); } else{ gcdialog_showText(randi2(0, 5) + 0x10E8, 0x2B, sp24->position, sp24->marker, chfinalboss_phase0_endTextCallback, NULL); @@ -2069,7 +2069,7 @@ void chfinalboss_collisionActive(ActorMarker *marker, ActorMarker *other_marker) func_8030E878(SFX_EA_GRUNTY_LAUGH_1, randf2(0.95f, 1.05f), 32000, this->position, 5000.0f, 12000.0f); if (local->player_hit_in_phase1 == 0) { - if (gcdialog_showText(randi2(0, 5) + ASSET_10ED_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_1, 0, NULL, NULL, NULL, NULL)) { + if (gcdialog_showText(randi2(0, 5) + ASSET_10ED_DIALOG_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_1, 0, NULL, NULL, NULL, NULL)) { local->player_hit_in_phase1++; } } @@ -2078,7 +2078,7 @@ void chfinalboss_collisionActive(ActorMarker *marker, ActorMarker *other_marker) if (local->phase == FINALBOSS_PHASE_3_FLIGHT) { if ((local->player_hit_in_phase3 == 0) && (this->state != 0x1A)) { local->player_hit_in_phase3++; - gcdialog_showText(randi2(0, 5) + ASSET_111D_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_1, 0, NULL, NULL, NULL, NULL); + gcdialog_showText(randi2(0, 5) + ASSET_111D_DIALOG_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_1, 0, NULL, NULL, NULL, NULL); } } } diff --git a/src/fight/chspellfireball.c b/src/fight/chspellfireball.c index 3b4bcc8e..741a6e40 100644 --- a/src/fight/chspellfireball.c +++ b/src/fight/chspellfireball.c @@ -184,21 +184,21 @@ void chSpellFireball_collisionDie(ActorMarker *marker, ActorMarker *other) { switch(volatileFlag_getN(VOLATILE_FLAG_23_FINAL_BOSS_PHASE, 3)) { case FINALBOSS_PHASE_1_BROOMSTICK: - if (!sFightPlayerHitBySpellInPhase1 && gcdialog_showText(randi2(0, 5) + ASSET_10F2_TEXT_FINALBOSS_PHASE_1_OPTION_1, 0, 0, 0, 0, 0)) + if (!sFightPlayerHitBySpellInPhase1 && gcdialog_showText(randi2(0, 5) + ASSET_10F2_DIALOG_FINALBOSS_PHASE_1_OPTION_1, 0, 0, 0, 0, 0)) { sFightPlayerHitBySpellInPhase1 = TRUE; } break; case FINALBOSS_PHASE_2_AIR: - if (!sFightPlayerHitBySpellInPhase2 && gcdialog_showText(randi2(0, 5) + ASSET_110B_TEXT_FINALBOSS_PHASE_2_OPTION_1, 0, 0, 0, 0, 0)) + if (!sFightPlayerHitBySpellInPhase2 && gcdialog_showText(randi2(0, 5) + ASSET_110B_DIALOG_FINALBOSS_PHASE_2_OPTION_1, 0, 0, 0, 0, 0)) { sFightPlayerHitBySpellInPhase2 = TRUE; } break; case FINALBOSS_PHASE_3_FLIGHT: - if (!sFightPlayerHitBySpellInPhase3 && gcdialog_showText(randi2(0, 5) + ASSET_1122_TEXT_FINALBOSS_PHASE_3_OPTION_1, 0, 0, 0, 0, 0)) + if (!sFightPlayerHitBySpellInPhase3 && gcdialog_showText(randi2(0, 5) + ASSET_1122_DIALOG_FINALBOSS_PHASE_3_OPTION_1, 0, 0, 0, 0, 0)) { sFightPlayerHitBySpellInPhase3 = TRUE; } @@ -207,7 +207,7 @@ void chSpellFireball_collisionDie(ActorMarker *marker, ActorMarker *other) { case FINALBOSS_PHASE_4_JINJOS: if (!sFightPlayerHitBySpellInPhase4 && chfinalboss_isJinjoSpawned() && - gcdialog_showText(randi2(0, 5) + ASSET_113B_TEXT_FINALBOSS_PHASE_4_OPTION_1, 0, 0, 0, 0, 0)) + gcdialog_showText(randi2(0, 5) + ASSET_113B_DIALOG_FINALBOSS_PHASE_4_OPTION_1, 0, 0, 0, 0, 0)) { sFightPlayerHitBySpellInPhase4 = TRUE; } @@ -216,7 +216,7 @@ void chSpellFireball_collisionDie(ActorMarker *marker, ActorMarker *other) { case FINALBOSS_PHASE_5_JINJONATOR: if (!sFightPlayerHitBySpellInPhase5 && chfinalboss_isJinjonatorSpawned() && - gcdialog_showText(randi2(0, 5) + ASSET_1154_TEXT_FINALBOSS_PHASE_5_OPTION_1, 0, 0, 0, 0, 0)) + gcdialog_showText(randi2(0, 5) + ASSET_1154_DIALOG_FINALBOSS_PHASE_5_OPTION_1, 0, 0, 0, 0, 0)) { sFightPlayerHitBySpellInPhase5 = TRUE; } diff --git a/src/lair/ch/brentilda.c b/src/lair/ch/brentilda.c index 799a34e9..8b741d4b 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)) { - gcdialog_showText(ASSET_10A2_TEXT_UNKNOWN, 0xF, this->position, this->marker, func_8038BADC, lair_func_8038BA88); + gcdialog_showText(ASSET_10A2_DIALOG_UNKNOWN, 0xF, this->position, this->marker, func_8038BADC, lair_func_8038BA88); return; } } - gcdialog_showText(ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED, 0xC, this->position, this->marker, func_8038BADC, NULL); + gcdialog_showText(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xC, this->position, this->marker, func_8038BADC, NULL); return; } subaddie_set_state(this, 1); diff --git a/src/lair/ch/cauldron.c b/src/lair/ch/cauldron.c index 86e292a2..c5928e71 100644 --- a/src/lair/ch/cauldron.c +++ b/src/lair/ch/cauldron.c @@ -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()) { - gcdialog_showText(ASSET_F7A_TEXT_UNKNOWN, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_F7A_DIALOG_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))) { - gcdialog_showText(ASSET_F79_TEXT_UNKNOWN, 4, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_F79_DIALOG_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)) { - gcdialog_showText(ASSET_FAD_TEXT_UNKNOWN, 0xA, this->position, NULL, __chWarpCauldron_dingpotDialogCallback, NULL); + gcdialog_showText(ASSET_FAD_DIALOG_UNKNOWN, 0xA, this->position, NULL, __chWarpCauldron_dingpotDialogCallback, NULL); } this->unk38_0 = TRUE;