Merge branch 'mr-origin-86'

include/enums.h

@@ -1736,6 +1736,8 @@ enum actor_e
     ACTOR_E_BULL_INTRO,
     ACTOR_F_CHIMPY            = 0xF,
 
+    ACTOR_10E_BLUBBER_SHIP_TOP_HATCH = 0x10e,
+
     ACTOR_11_JUJU_CTRL       = 0x11,
     ACTOR_12_BEEHIVE,
     //ACTOR_13_SINKING_BOBBER
@@ -1914,6 +1916,10 @@ enum actor_e
     ACTOR_146_GV_KAZOOIE_TARGET,
     ACTOR_147_ANCIENT_ONE,
 
+    ACTOR_149_TTC_BLUBBER_UNKNOWN = 0x149,
+    ACTOR_14A_TTC_BLUBBER_UNKNOWN = 0x14a,
+    ACTOR_14B_TTC_BLUBBER_UNKNOWN = 0x14b,
+
     ACTOR_14E_BGS_ELEVATED_WALKWAY_SWITCH = 0x14E,
     ACTOR_14F_DESTROYED_JIGGY,
 
@@ -2071,6 +2077,11 @@ enum actor_e
 
     ACTOR_2DB_DINGPOT = 0x2DB,
 
+    ACTOR_2DF_LIGHTHOUSE_B = 0x2DF,
+    ACTOR_2E0_TTC_STAIRS_1,
+    ACTOR_2E1_TTC_STAIRS_2,
+    ACTOR_2E2_LIGHTHOUSE_A,
+    
     ACTOR_2E5_DOOR_OF_GRUNTY   = 0x2e5,
 
     ACTOR_30D_BOOM_BOX_FAST = 0x30D,
@@ -2404,6 +2415,18 @@ enum mm_specific_flags {
     MM_SPECIFIC_FLAG_A_UNKNOWN
 };
 
+
+enum ttc_specific_flags {
+    TTC_SPECIFIC_FLAG_0_BLUBBER_UNKNOWN,
+    TTC_SPECIFIC_FLAG_1_UNKNOWN, // something related to the sand castle
+    TTC_SPECIFIC_FLAG_2_BLUBBER_JIGGY_SPAWNED_TEXT_SHOWN,
+    TTC_SPECIFIC_FLAG_3_BLUBBER_SHOW_JIGGY_SPAWNED_TEXT_FLAG,
+    // unused
+    TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN = 0x5,
+    // unused
+    TTC_SPECIFIC_FLAG_7_NIPPER_FIRST_MEET_TEXT_SHOWN = 0x7
+};
+
 enum item_e
 {
     ITEM_0_HOURGLASS_TIMER = 0x0,
@@ -2856,7 +2879,7 @@ enum asset_e
     ASSET_236_ANIM_BSPUMPKIN_REBOUND = 0x236,
 
     ASSET_238_ANIM_LOGGO_IDLE = 0x238,
-
+    ASSET_239_ANIM_LEAKY_IDLE = 0x239,
     ASSET_240_ANIM_LOGGO_FLUSH = 0x240,
 
     ASSET_242_ANIM_GOBI_RELAXING  = 0x242,
@@ -3110,16 +3133,16 @@ enum asset_e
     // 3b3 Mumbo's Hut
     // Unused
     // Unused
-    // 3b6 TTC Stairs 1
-    // 3b7 TTC Stairs 2
+    ASSET_3B6_MODEL_TTC_STAIRS_1 = 0x3B6,
+    ASSET_3B7_MODEL_TTC_STAIRS_1,
     // Unused
     // Unused
     // Unused
     ASSET_3BB_MODEL_JINJO_YELLOW = 0x3BB,
     ASSET_3BC_MODEL_JINJO_ORANGE,
-    // 3bd TTC Lighthouse A
-    // 3be TTC Lighthouse B
-    ASSET_3BF_MODEL_PLAYER_SHADOW = 0x3BF,
+    ASSET_3BD_MODEL_LIGHTHOUSE_A,
+    ASSET_3BE_MODEL_LIGHTHOUSE_B,
+    ASSET_3BF_MODEL_PLAYER_SHADOW,
     ASSET_3C0_MODEL_JINJO_BLUE,
     ASSET_3C1_MODEL_JINJO_PINK,
     ASSET_3C2_MODEL_JINJO_GREEN,
@@ -3138,7 +3161,7 @@ enum asset_e
     // 3cf MMM Cellar Hatch
     // 3d0 MMM Locked Gate (Lock On Left)
     // 3d1 MMM Locked Gate (Lock On Right) 1
-    // 3d2 TTC Blubber's Ship Top Hatch
+    ASSET_3D2_MODEL_BLUBBER_SHIP_TOP_HATCH = 0x3d2,
     // 3d3 MMM Church Door
     // 3d4 Lockup
     ASSET_3D4_MODEL_LOCKUP = 0x3d4,
@@ -4080,17 +4103,24 @@ enum asset_e
 
     ASSET_896_MODEL_GOLD_ROCK = 0x896,
 
-    ASSET_89D_ZOOMBOX_SPRITE = 0x89d,
+    ASSET_89D_ZOOMBOX_SPRITE = 0x89D,
 
-    ASSET_8A0_SPRITE_WATER_DROP = 0x8a0,
+    ASSET_8A0_SPRITE_WATER_DROP = 0x8A0,
 
-    ASSET_A0B_TEXT_UNKNOWN = 0xA0B,
-    ASSET_A0C_TEXT_UNKNOWN = 0xA0C,
-    ASSET_A0D_TEXT_UNKNOWN = 0xA0D,
+    ASSET_A0B_TEXT_BLUBBER_FIRST_MEET = 0xA0B,
+    ASSET_A0C_TEXT_BLUBBER_HALF_GOLD,
+    ASSET_A0D_TEXT_BLUBBER_COMPLETE,
+    ASSET_A0E_TEXT_NIPPER_SPAWNED,
 
-    ASSET_A14_TEXT_UNKNOWN = 0xA14,
+    ASSET_A10_TEXT_TTC_NIPPER_HURT = 0xa10,
 
-    ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED = 0xa17,
+    ASSET_A14_TEXT_CLAM_TAUNT = 0xA14,
+    ASSET_A15_TEXT_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_A1F_DIALOG_SHOCKJUMP_LEARN  = VER_SELECT(0xa1f, 0x91f, 0, 0),
     ASSET_A20_DIALOG_FLY_LEARN,
@@ -4103,7 +4133,7 @@ enum asset_e
     ASSET_A27_TEXT_BOTTLES_ALL_TTC_MOVES_LEARNED,
     ASSET_A28_TEXT_LEAKY_DONE,
 
-    ASSET_A2A_TEXT_UNKNOWN = 0xA2A,
+    ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED = 0xA2A,
 
     ASSET_A6F_TEXT_CHARMER_MEET = 0xA6F,
     ASSET_A70_TEXT_CHARMER_HELPED,
@@ -4668,6 +4698,8 @@ enum marker_e{
 
     MARKER_99_TEEHEE = 0x99,
 
+    MARKER_A1_BLUBBER_SHIP_TOP_HATCH = 0xa1,
+
     MARKER_A3_BLUBBER = 0xA3,
     MARKER_A4_LOCKUP_SLOW,
     MARKER_A5_NIPPER,
@@ -4773,6 +4805,7 @@ enum marker_e{
     MARKER_169_SNS_EGG,
 
     MARKER_16B_SNIPPET_UPSIDEDOWN = 0x16B,
+    MARKER_16C_NIPPER,
 
     MARKER_173_CHUMP_FISH_2 = 0x173,
     MARKER_174_GAME_OVER = 0x174,
@@ -4905,6 +4938,11 @@ enum marker_e{
 
     MARKER_261_FIGHT_FLIGHT_PAD = 0x261,
 
+    MARKER_267_LIGHTHOUSE_A = 0x267,
+    MARKER_268_STAIRS_1,
+    MARKER_269_STAIRS_2,
+    MARKER_26A_LIGHTHOUSE_B,
+
     MARKER_276_STONE_JINJO = 0x276,
 
     MARKER_27A_JINJO_STATUE_BASE = 0x27A,