diff --git a/include/enums.h b/include/enums.h
index 504637c2..58f696ce 100644
--- a/include/enums.h
+++ b/include/enums.h
@@ -1449,7 +1449,121 @@ enum honeycomb_e
 
 enum mumbotoken_e
 {
-	MUMBOTOKEN_01_MM_HILL = 1
+	MUMBOTOKEN_01_MM_STUMP_NEAR_CONGA = 1,
+    MUMBOTOKEN_02_MM_BEHIND_RUINS,
+    MUMBOTOKEN_03_MM_UNDER_RAMP_TO_MUMBOS_SKULL,
+    MUMBOTOKEN_04_MM_BEHIND_PINK_JINJO,
+    MUMBOTOKEN_05_MM_INSIDE_TICKERS_TOWER,
+    MUMBOTOKEN_06_TTC_INSIDE_SALTY_HIPPO,
+    MUMBOTOKEN_07_TTC_INSIDE_LOCKUP_1,
+    MUMBOTOKEN_08_TTC_INSIDE_LOCKUP_2,
+    MUMBOTOKEN_09_TTC_SALTY_HIPPO_MAST,
+    MUMBOTOKEN_0A_TTC_BEHIND_LIGHTHOUSE_DOOR,
+    MUMBOTOKEN_0B_TTC_ON_FLOATING_BOX,
+    MUMBOTOKEN_0C_TTC_BEHIND_PILLAR_UNDERWATER,
+    MUMBOTOKEN_0D_TTC_POND_BOTTOM,
+    MUMBOTOKEN_0E_TTC_FLOATING_ABOVE_SHOCKJUMP_PAD,
+    MUMBOTOKEN_0F_TTC_BEHIND_NIPPER,
+    MUMBOTOKEN_10_CC_CHOMPA_BEHIND_CLANKERS_TAIL,
+    MUMBOTOKEN_11_CC_ABOVE_LEVEL_ENTRANCE,
+    MUMBOTOKEN_12_CC_TUNNEL_RIGHT_OF_CLANKER,
+    MUMBOTOKEN_13_CC_ALCOVE_WITH_OPEN_GRATE,
+    MUMBOTOKEN_14_CC_CLANKERS_LEFT_TOOTH,
+    MUMBOTOKEN_15_BGS_UNDER_HUT_1,
+    MUMBOTOKEN_16_BGS_UNDER_HUT_2,
+    MUMBOTOKEN_17_BGS_TOP_OF_POLE_NEXT_TO_BIG_EGG,
+    MUMBOTOKEN_18_BGS_BEHIND_YELLOW_JINJO,
+    MUMBOTOKEN_19_BGS_FLOATING_BETWEEN_HUT_AND_CROCTUS,
+    MUMBOTOKEN_1A_BGS_BEHIND_MUMBOS_SKULL,
+    MUMBOTOKEN_1B_BGS_ALCOVE_ABOVE_YELLOW_FLIBBITS,
+    MUMBOTOKEN_1C_BGS_BEHIND_TIPTUP,
+    MUMBOTOKEN_1D_BGS_INSIDE_MR_VILES,
+    MUMBOTOKEN_1E_BGS_INSIDE_MUMBOS_SKULL,
+    MUMBOTOKEN_1F_FP_SNOWMAN_LEFT_FOOT,
+    MUMBOTOKEN_20_FP_SNOWMAN_RIGHT_FOOT,
+    MUMBOTOKEN_21_FP_BEHIND_PILE_PRESENT_BOXES,
+    MUMBOTOKEN_22_FP_ABOVE_CHIMNEY_FLIGHT_PAD,
+    MUMBOTOKEN_23_FP_INSIDE_SIR_SLUSH_NEAR_SNOWMANS_LEFT_FOOT,
+    MUMBOTOKEN_24_FP_INSIDE_SIR_SLUSH_NEAR_SNOWMANS_RIGHT_FOOT,
+    MUMBOTOKEN_25_FP_CHRISTMAS_TREE_POT,
+    MUMBOTOKEN_26_FP_TIP_OF_SCARF,
+    MUMBOTOKEN_27_FP_WATER_BEHIND_SNOWMAN,
+    MUMBOTOKEN_28_FP_INSIDE_BOGGYS_IGLOO,
+    MUMBOTOKEN_29_GV_TOP_OF_JINXYS_NOSE,
+    MUMBOTOKEN_2A_GV_SAND_RIGHT_OF_JINXY,
+    MUMBOTOKEN_2B_GV_BOTTOM_OF_MOAT,
+    MUMBOTOKEN_2C_GV_TOP_OF_PYRAMID,
+    MUMBOTOKEN_2D_GV_FRONT_OF_STAR_DOOR,
+    MUMBOTOKEN_2E_GV_INSIDE_MEMORY_GAME_ROOM,
+    MUMBOTOKEN_2F_GV_BEHIND_SANDYBUTTS_SARCOPHAGUS,
+    MUMBOTOKEN_30_GV_INSIDE_WATER_PYRAMID,
+    MUMBOTOKEN_31_GV_NEXT_TO_RUBEE,
+    MUMBOTOKEN_32_GV_INSIDE_JINXY,
+    MUMBOTOKEN_33_MMM_HIDDEN_NEAR_FOUNTAIN,
+    MUMBOTOKEN_34_MMM_NEAR_FRONT_TUMBLARS_SHED,
+    MUMBOTOKEN_35_MMM_ALCOVE_CLOCK_TOWER,
+    MUMBOTOKEN_36_MMM_NEXT_TO_MAZE_HEDGE_RAMP,
+    MUMBOTOKEN_37_MMM_IN_THE_MAZE,
+    MUMBOTOKEN_38_MMM_BEHIND_CHURCH,
+    MUMBOTOKEN_39_MMM_INSIDE_WHIPCRACK_IN_FOUNTAIN,
+    MUMBOTOKEN_3A_MMM_TOP_OF_WOOD_BEAM_INSIDE_CHURCH,
+    MUMBOTOKEN_3B_MMM_TOP_OF_STOOL_INSIDE_CHURCH,
+    MUMBOTOKEN_3C_MMM_TOP_OF_TUMBLARS_SHED,
+    MUMBOTOKEN_3D_MMM_INSIDE_LOGGO_AND_INSIDE_BARREL_IN_CELLAR, // Bug: Two tokens have same ID
+    MUMBOTOKEN_3E_MMM_IN_CHIMNEY_INSIDE_DINNING_ROOM,
+    MUMBOTOKEN_3F_MMM_INSIDE_WELL,
+    MUMBOTOKEN_40_MMM_INSIDE_BEDROOM,
+    MUMBOTOKEN_41_MMM_SINK_IN_LOGGOS_ROOM,
+    MUMBOTOKEN_42_RBB_TOP_OF_SHIPS_CHIMNEY,
+    MUMBOTOKEN_43_RBB_SHIPS_PROW,
+    MUMBOTOKEN_44_RBB_ON_LIFE_BOAT,
+    MUMBOTOKEN_45_RBB_FRONT_OF_CHOMPA_LEFT_OF_SHIP,
+    MUMBOTOKEN_46_RBB_TOXIC_WASTE_POND,
+    MUMBOTOKEN_47_RBB_UNDER_CHOMPA_IN_WITCH_SWITCH_TOWER,
+    MUMBOTOKEN_48_RBB_UNDER_CHOMPA_INSIDE_FIRST_BLUE_CONTAINER,
+    MUMBOTOKEN_49_RBB_TOP_OF_BOX_INSIDE_SECOND_BLUE_CONTAINER,
+    MUMBOTOKEN_4A_RBB_TOP_OF_BUNK_IN_CABIN,
+    MUMBOTOKEN_4B_RBB_INSIDE_NAVIGATION_ROOM,
+    MUMBOTOKEN_4C_RBB_INSIDE_KITCHEN,
+    MUMBOTOKEN_4D_RBB_ENGINE_ROOM_LEFT_PIPE,
+    MUMBOTOKEN_4E_RBB_ENGINE_ROOM_RIGHT_PIPE,
+    MUMBOTOKEN_4F_RBB_ENGINE_ROOM_SPINNING_PLATFORM,
+    MUMBOTOKEN_50_RBB_TOP_OF_BOX_INSIDE_TNT_ROOM,
+    MUMBOTOKEN_51_LAIR_BEHIND_PURPLE_CAULDRON,
+    MUMBOTOKEN_52_LAIR_CCW_JIGGY_PODIUM,
+    MUMBOTOKEN_53_LAIR_TOP_OF_PIPE_IN_ORANGE_CAULDRON_ROOM,
+    MUMBOTOKEN_54_LAIR_TOP_OF_CC_ENTRANCE,
+    MUMBOTOKEN_55_LAIR_BEHIND_SARCOPHAGUS,
+    MUMBOTOKEN_56_LAIR_ADVENT_TOP_WINDOW,
+    MUMBOTOKEN_57_LAIR_BEHIND_MUMBO_IN_CRYPT,
+    MUMBOTOKEN_58_LAIR_ABOVE_NOTE_DOOR_WATER_AREA,
+    MUMBOTOKEN_59_LAIR_UNDERWATER_RBB_ENTRANCE_AREA,
+    MUMBOTOKEN_5A_LAIR_WHIPCRACK_NEAR_MMM_JIGGY_PODIUM,
+    MUMBOTOKEN_5B_CCW_SPRING_UNFINISHED_WOOD_TREEHOUSE,
+    MUMBOTOKEN_5C_CCW_SPRING_TOP_OF_BRANCH,
+    MUMBOTOKEN_5D_CCW_SPRING_FRONT_OF_EYRIE,
+    MUMBOTOKEN_5E_CCW_SPRING_THORN_FIELD_FRONT_OF_MUMBOS_SKULL,
+    MUMBOTOKEN_5F_CCW_SPRING_SNAREBEAR_NEAR_BIG_FLOWER,
+    MUMBOTOKEN_60_CCW_SPRING_SNAREBEAR_NEAR_ENTRANCE,
+    MUMBOTOKEN_61_CCW_SPRING_TOP_OF_BEEHIVE,
+    MUMBOTOKEN_62_CCW_SPRING_NABNUTS_HOUSE,
+    MUMBOTOKEN_63_CCW_SUMMER_PLATFORMS_BEFORE_EYRIES_NEST,
+    MUMBOTOKEN_64_CCW_SUMMER_BIG_FLOWER_FIELD,
+    MUMBOTOKEN_65_CCW_SUMMER_SNAREBEAR_NEAR_THORN_FIELD,
+    MUMBOTOKEN_66_CCW_SUMMER_TOP_OF_BRANCH,
+    MUMBOTOKEN_67_CCW_SUMMER_ENTRANCE_GNAWTYS_HOUSE,
+    MUMBOTOKEN_68_CCW_SUMMER_FLOATING_ABOVE_BIG_CLUCKER,
+    MUMBOTOKEN_69_CCW_SUMMER_INSIDE_MUMBOS_SKULL,
+    MUMBOTOKEN_6A_CCW_AUTUMN_FLOATING_ABOVE_BIG_CLUCKER,
+    MUMBOTOKEN_6B_CCW_AUTUMN_SNAREBEAR_NEAR_ENTRANCE,
+    MUMBOTOKEN_6C_CCW_AUTUMN_SNAREBEAR_TOP_OF_TREE,
+    MUMBOTOKEN_6D_CCW_AUTUMN_LEAF_NEAR_TREEHOUSE,
+    MUMBOTOKEN_6E_CCW_AUTUMN_TOP_OF_BRANCH,
+    MUMBOTOKEN_6F_CCW_WINTER_BIG_FLOWER,
+    MUMBOTOKEN_70_CCW_WINTER_FROZEN_RIVER_NEAR_FLIGHT_PAD,
+    MUMBOTOKEN_71_CCW_WINTER_BROKEN_BEEHIVE,
+    MUMBOTOKEN_72_CCW_WINTER_WALKWAY_FRONT_OF_NABNUTS_HOUSE,
+    MUMBOTOKEN_73_CCW_WINTER_SIR_SLUSH_BETWEEN_BIG_FLOWER_AND_MUMBOS_SKULL
 };
 
 enum actor_e