PAL: match core1/ba/marker.c

include/enums.h

@@ -3975,14 +3975,16 @@ enum asset_e
 
     ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED = 0xa17,
 
-    ASSET_A1F_DIALOG_SHOCKJUMP_LEARN = 0xa1f,
+    ASSET_A1F_DIALOG_SHOCKJUMP_LEARN  = VER_SELECT(0xa1f, 0x91f, 0, 0),
     ASSET_A20_DIALOG_FLY_LEARN,
-
-    ASSET_A22_DIALOG_FLY_REFRESHER = 0xa22,
+    ASSET_A21_DIALOG_BLUBBER_MEET,
+    ASSET_A22_DIALOG_FLY_REFRESHER,
     ASSET_A23_DIALOG_SHOCKJUMP_REFRESHER,
-
-    ASSET_A27_TEXT_BOTTLES_ALL_TTC_MOVES_LEARNED = 0xA27,
-    ASSET_A28_TEXT_LEAKY_DONE = 0xA28,
+    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_A6F_TEXT_CHARMER_MEET = 0xA6F,
     ASSET_A70_TEXT_CHARMER_HELPED,
@@ -4019,7 +4021,7 @@ enum asset_e
     ASSET_B3B_TEXT_CONGA_ORANGE_PAD_JIGGY,
     ASSET_B3C_TEXT_CONGA_MEET,
 
-    ASSET_B3E_TEXT_CONGA_MEET_AS_TERMITE  = 0xb3e,
+    ASSET_B3E_TEXT_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,
@@ -4123,6 +4125,9 @@ enum asset_e
     ASSET_DB0_DIALOG_MUMBO_MISTAKE_0,
     ASSET_DB1_DIALOG_MUMBO_MISTAKE_1,
     ASSET_DB2_DIALOG_MUMBO_MISTAKE_2,
+    ASSET_DB3_DIALOG_SNS_EGG_1_TEXT = VER_SELECT(0xdb3, 0xa31, 0, 0),
+    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,
@@ -4167,6 +4172,8 @@ enum asset_e
     
     ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun
 
+    ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0),
+
     ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL = 0xF5b,
     ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV,
     ASSET_F5D_DIALOG_MUMBO_MAGIC_RUN_OUT_FULL,