Merge branch 'master' into 'document/code_91E10'

include/enums.h

@@ -1980,7 +1980,8 @@ enum actor_e
     ACTOR_166_TOPPER_A,
     ACTOR_167_ATTACK_TUTORIAL,
 
-    ACTOR_16F_QUARRIE = 0x16F,
+    ACTOR_16E_UNKNOWN = 0x16E,
+    ACTOR_16F_QUARRIE,
 
     ACTOR_172_RBB_EGG_TOLL = 0x172,
 
@@ -2147,6 +2148,8 @@ enum actor_e
 
     ACTOR_33F_WOZZA_IN_CAVE         = 0x33F,
 
+    ACTOR_349_UNKNOWN = 0x349,
+
     ACTOR_34D_BEE_SWARM     = 0x34D,
     ACTOR_34E_LIMBO,
     ACTOR_34F_MUMMUM,
@@ -2210,7 +2213,8 @@ enum actor_e
 
     ACTOR_3AF_GRUNTY_SHADOW = 0x3AF,
 
-    ACTOR_3BA_UNKOWN        = 0x3ba,
+    ACTOR_3B9_JUMP_TUTORIAL = 0x3B9,
+    ACTOR_3BA_UNKNOWN,
 
     ACTOR_3BF_GRUNTLING_BLUE = 0x3bf,
     ACTOR_3C0_GRUNTLING_BLACK,
@@ -2439,6 +2443,25 @@ enum bs_e
     BS_A5_WONDERWING_UNKA5
 };
 
+enum sm_specific_flags {
+    SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES = 0x1,
+    SM_SPECIFIC_FLAG_2,
+    SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED,
+    SM_SPECIFIC_FLAG_4,
+    SM_SPECIFIC_FLAG_5,
+
+    SM_SPECIFIC_FLAG_7 = 0x7,
+    SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED,
+    SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED,
+    SM_SPECIFIC_FLAG_A,
+
+    SM_SPECIFIC_FLAG_C = 0xC,
+
+    SM_SPECIFIC_FLAG_E = 0xE,
+    SM_SPECIFIC_FLAG_F,
+    SM_SPECIFIC_FLAG_10
+};
+
 enum mm_specific_flags {
     MM_SPECIFIC_FLAG_0_CHIMPY_STUMP_RAISED,
     MM_SPECIFIC_FLAG_1_ORANGE_HAS_BEEN_COLLECTED,
@@ -2487,11 +2510,10 @@ enum item_e
     ITEM_6_HOURGLASS,
     ITEM_7_SKULL_HOURGLASS,
 
-
     ITEM_9_PROPELLOR = 0x9,
 
     ITEM_B_XMAS_TREE = 0xb,
-    ITEM_C_NOTE = 0xC,
+    ITEM_C_NOTE,
     ITEM_D_EGGS,
     ITEM_E_JIGGY,
     ITEM_F_RED_FEATHER,
@@ -2921,6 +2943,11 @@ enum asset_e
     ASSET_220_ANIM_SIR_SLUSH_DIE = 0x220,
     ASSET_221_ANIM_WOZZA_IN_CAVE,
 
+    ASSET_223_ANIM_TOPPER_UNKNOWN = 0x223,
+    ASSET_224_ANIM_TOPPER_UNKNOWN,
+    ASSET_225_ANIM_COLLYWOBBLE_UNKNOWN,
+    ASSET_226_ANIM_BAWL_UNKNOWN,
+    ASSET_227_ANIM_BAWL_UNKNOWN,
     ASSET_228_ANIM_BANJO_SLED = 0x228,
     ASSET_229_ANIM_WHIPCRACK_ATTACK,
     ASSET_22A_ANIM_WHIPCRACK_IDLE,
@@ -3504,14 +3531,14 @@ enum asset_e
     // 4ea FP Finish Banner
     // 4eb FP Start Banner
     // 4ec FP Race Rostrum
-    MODEL_TOPPER            = 0x4ed,
-    MODEL_COLLYWOBBLE       = 0x4ee,
-    MODEL_BAWL              = 0x4ef,
-    // 4f0 Colliwobble Large Stem (Upon Death)
-    // 4f1 Colliwobble Small Stem (Upon Death)
-    // 4f2 Colliwobble Large Leaf (Upon Death)
-    // 4f3 Colliwobble Small Leaf (Upon Death)
-    // 4f4 Colliwobble Stem (Upon Death)
+    ASSET_4ED_MODEL_TOPPER = 0x4ed,
+    ASSET_4EE_MODEL_COLLYWOBBLE,
+    ASSET_4EF_MODEL_BAWL,
+    ASSET_4F0_MODEL_UNKNOWN, // 4f0 Colliwobble Large Stem (Upon Death)
+    ASSET_4F1_MODEL_UNKNOWN, // 4f1 Colliwobble Small Stem (Upon Death)
+    ASSET_4F2_MODEL_UNKNOWN, // 4f2 Colliwobble Large Leaf (Upon Death)
+    ASSET_4F3_MODEL_UNKNOWN, // 4f3 Colliwobble Small Leaf (Upon Death)
+    ASSET_4F4_MODEL_UNKNOWN, // 4f4 Colliwobble Stem (Upon Death)
     // 4f5 CCW Spring Switch
     // 4f6 CCW Summer Switch
     // 4f7 CCW Autumn Switch
@@ -4386,8 +4413,8 @@ enum asset_e
     ASSET_DF6_TEXT_BOTTLES_HIGH_JUMP_LEARN,
     ASSET_DF7_TEXT_BOTTLES_FEATHERY_FLAP_LEARN,
     ASSET_DF8_TEXT_BOTTLES_FLAP_FLIP_LEARN,
-
-    ASSET_DFA_TEXT_BOTTLES_JUMP_REFRESHER = 0xDFA,
+    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,
@@ -4399,9 +4426,9 @@ enum asset_e
     ASSET_E03_TEXT_BOTTLES_CLIMB_REFRESHER,
     ASSET_E04_TEXT_BOTTLES_BEAK_BARGE_LEARN,
     ASSET_E05_TEXT_UNKNOWN,
-    ASSET_E06_TEXT_BOTTLES_BEAK_BARGE_REFRESHER = 0xE06,
-
-    ASSET_E08_TEXT_BOTTLES_FIND_ANOTHER_MOLEHILL = 0xE08,
+    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,
@@ -4419,8 +4446,10 @@ enum asset_e
     ASSET_E17_TEXT_UNKNOWN,
     ASSET_E18_TEXT_UNKNOWN,
     ASSET_E19_TEXT_UNKNOWN,
-
-    ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT = 0xE1D,
+    ASSET_E1A_TEXT_BOTTLES_UNKNOWN,
+    ASSET_E1B_TEXT_BOTTLES_UNKNOWN,
+    ASSET_E1C_TEXT_BOTTLES_UNKNOWN,
+    ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT,
 
     ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER = VER_SELECT(0xE1F, 0xa61, 0, 0),
     ASSET_E20_DIALOG_BOTTLES_BONUS_NOT_READY,
@@ -5059,13 +5088,15 @@ enum marker_e{
 
     MARKER_124_BOGGY_1         = 0x124,
 
+    MARKER_126_UNKNOWN = 0x126,
     MARKER_127_BAT = 0x127,
     MARKER_128_COLLYWOBBLE_A,
     MARKER_129_BAWL_A,
     MARKER_12A_TOPPER_A,
     MARKER_12B_ATTACK_TUTORIAL,
 
-    MARKER_135_QUARRIE = 0x135,
+    MARKER_134_UNKNOWN = 0x134,
+    MARKER_135_QUARRIE,
 
     MARKER_161_GV_WITCH_SWITCH = 0x161,
     MARKER_162_BGS_WITCH_SWITCH,
@@ -5141,6 +5172,8 @@ enum marker_e{
     MARKER_1E9_MUMBO_COST_SIGN,
     MARKER_1EA_GRUNTLING_RED,
 
+    MARKER_1ED_JUMP_TUTORIAL = 0x1ED,
+
     MARKER_1F1_GRUNTLING_BLACK = 0x1F1,
 
     MARKER_1F4_TOOTS = 0x1F4,
@@ -5339,6 +5372,11 @@ enum marker_collision_func_type_e {
     MARKER_COLLISION_FUNC_2_DIE
 };
 
+enum vegetable_e {
+    VEGETABLE_1_TOPPER = 1,
+    VEGETABLE_2_BAWL,
+    VEGETABLE_3_COLLY_WOBBLE
+};
 
 
 #endif