Merge branch 'master' into banjo-kazooie-var_renames

include/enums.h

@@ -235,6 +235,8 @@ enum unkflags_1{
     UNKFLAGS1_A_HAS_SEEN_TIPTUP_FF_MINIGAME,
     UNKFLAGS1_B_HAS_SEEN_SANDCASTLE_FF_MINIGAME,
 
+    UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT = 0x13,
+
     UNKFLAGS1_1F_IN_CHARACTER_PARADE = 0x1F,
     UNKFLAGS1_20_BEGIN_CHARACTER_PARADE,
 
@@ -1654,8 +1656,8 @@ enum actor_e
     ACTOR_65_WADING_BOOTS = 0x65,
 
     ACTOR_67_SNIPPET = 0x67,
-
-    ACTOR_69_CLAM = 0x69,
+    ACTOR_68_SNACKER,
+    ACTOR_69_CLAM,
 
     ACTOR_6D_GV_BANJO_DOOR = 0x6D, 
 
@@ -1966,7 +1968,8 @@ enum actor_e
     ACTOR_TOPPER_B          = 0x36F,
     ACTOR_370_GOLD_FEATHER  = 0x370,
 
-    ACTOR_375_GRUBLIN_HOOD  = 0x375,
+    ACTOR_374_VACATION_TEXT_TRIGGER  = 0x374,
+    ACTOR_375_GRUBLIN_HOOD,
     ACTOR_376_FF_MINIGAME,
 
     ACTOR_379_UNKNOWN = 0x379,
@@ -2378,7 +2381,7 @@ enum asset_e
     /* [0x74, 0x75] empty */
     ASSET_76_ANIM_JIGSAWDANCE_HOLD = 0x76,
     ASSET_77_ANIM_BSTIMEOUT,
-    //ASSET_78 // snacker_swimming
+    ASSET_78_ANIM_SNACKER_SWIMMING,
     //ASSET_79 // Mumbo Concert Playing Instrument
     //ASSET_7A // Banjo Concert Angry
     //ASSET_7B // Banjo Concert Play
@@ -2556,8 +2559,8 @@ enum asset_e
     ASSET_14A_ANIM_BSREST_LISTEN,
 
     ASSET_153_ANIM_BURIED_TREASURE_APPEAR = 0x153,
-
-    ASSET_155_ANIM_CRAB_FLIP_UPRIGHT = 0x155,
+    ASSET_154_ANIM_SNACKER_EATING,
+    ASSET_155_ANIM_CRAB_FLIP_UPRIGHT,
     ASSET_156_ANIM_MUTANT_CRAB_WALK,
     ASSET_157_ANIM_MUTANT_CRAB_FLIP_UPSIDEDOWN,
     ASSET_158_ANIM_MUTANT_CRAB_UPSIDEDOWN,
@@ -2660,7 +2663,10 @@ enum asset_e
     ASSET_256_ANIM_TERMITE_OW,
 
     ASSET_25B_ANIM_ACORN_IDLE = 0x25B,
-
+    
+    ASSET_273_ANIM_SNACKER_HURT = 0x273,
+    ASSET_274_ANIM_SNACKER_DIE,
+    
     ASSET_281_ANIM_WISHYWASHY_DOOOH = 0x281,
     ASSET_282_ANIM_BSJIG_NOTEDOOR,
 
@@ -2894,7 +2900,7 @@ enum asset_e
     ASSET_3AD_FIRE_SPARKLE = 0x3AD,
     ASSET_3AE_MODEL_GRAVE_FLOWER_POT,
     // 3af (Green Plank?)
-    // 3b0 Snacker
+    ASSET_3B0_SNACKER = 0x3B0,
     // 3b1 Concert Mumbo
     // 3b2 (Two Poles?)
     // 3b3 Mumbo's Hut
@@ -4197,8 +4203,8 @@ enum marker_e{
     MARKER_11_WADING_BOOTS = 0x11,
 
     MARKER_13_SNIPPET = 0x13,
-
-    MARKER_15_CLAM = 0x15,
+    MARKER_14_SNACKER,
+    MARKER_15_CLAM,
 
     MARKER_28_CLANKER_SAWBLADE = 0x28,
 
@@ -4420,6 +4426,8 @@ enum marker_e{
 
     MARKER_1E1_FF_MINIGAME = 0x1E1,
     MARKER_1E2_GRUBLIN_HOOD,
+    MARKER_1E3_VACATION_TEXT_TRIGGER,
+
 
     MARKER_1E5_GOLD_FEATHER_COLLECTIBLE = 0x1E5,
     MARKER_1E6_TOPPER_B,