Merge branch 'mr-origin-97'

This commit is contained in:
banjo.decomp
2024-10-19 23:19:49 -05:00
48 changed files with 390 additions and 390 deletions

View File

@@ -4198,20 +4198,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,
@@ -4221,63 +4221,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,
@@ -4285,34 +4285,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,
@@ -4320,68 +4320,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,
@@ -4398,7 +4398,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,
@@ -4415,59 +4415,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),
@@ -4482,60 +4482,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,