fix: restore deleted enums.h lines
This commit is contained in:
220
include/enums.h
220
include/enums.h
@@ -328,7 +328,7 @@ enum volatile_flags_e {
|
|||||||
VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS,
|
VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS,
|
||||||
VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS,
|
VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS,
|
||||||
VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS,
|
VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS,
|
||||||
VOLATILE_FLAG_77, // unused
|
VOLATILE_FLAG_77_SANDCASTLE_SET_HEALTH_TO_MAX, // unused
|
||||||
VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS,
|
VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS,
|
||||||
VOLATILE_FLAG_79, // unused
|
VOLATILE_FLAG_79, // unused
|
||||||
VOLATILE_FLAG_7A, // unused
|
VOLATILE_FLAG_7A, // unused
|
||||||
@@ -1980,7 +1980,8 @@ enum actor_e
|
|||||||
ACTOR_166_TOPPER_THE_CARROT_A,
|
ACTOR_166_TOPPER_THE_CARROT_A,
|
||||||
ACTOR_167_ATTACK_TUTORIAL,
|
ACTOR_167_ATTACK_TUTORIAL,
|
||||||
|
|
||||||
ACTOR_16F_QUARRIE = 0x16F,
|
ACTOR_16E_UNKNOWN = 0x16E,
|
||||||
|
ACTOR_16F_QUARRIE,
|
||||||
|
|
||||||
ACTOR_172_RBB_EGG_TOLL = 0x172,
|
ACTOR_172_RBB_EGG_TOLL = 0x172,
|
||||||
|
|
||||||
@@ -2212,7 +2213,7 @@ enum actor_e
|
|||||||
|
|
||||||
ACTOR_3AF_GRUNTY_SHADOW = 0x3AF,
|
ACTOR_3AF_GRUNTY_SHADOW = 0x3AF,
|
||||||
|
|
||||||
ACTOR_3BA_UNKOWN = 0x3BA,
|
ACTOR_3BA_UNKNOWN = 0x3BA,
|
||||||
|
|
||||||
ACTOR_3B9_JUMP_TUTORIAL = 0x3B9,
|
ACTOR_3B9_JUMP_TUTORIAL = 0x3B9,
|
||||||
|
|
||||||
@@ -4461,7 +4462,7 @@ enum asset_e
|
|||||||
ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER = VER_SELECT(0xE35, 0xa77, 0, 0),
|
ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER = VER_SELECT(0xE35, 0xa77, 0, 0),
|
||||||
|
|
||||||
ASSET_E37_DIALOG_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun
|
ASSET_E37_DIALOG_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun
|
||||||
ASSET_E38_TEXT_UNKNOWN,
|
ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION,
|
||||||
|
|
||||||
ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0),
|
ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0),
|
||||||
|
|
||||||
@@ -4480,8 +4481,8 @@ enum asset_e
|
|||||||
|
|
||||||
ASSET_FAD_TEXT_UNKNOWN = 0xfad,
|
ASSET_FAD_TEXT_UNKNOWN = 0xfad,
|
||||||
|
|
||||||
ASSET_FBE_TEXT_UNKNOWN = 0xfbe,
|
ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING = 0xFBE,
|
||||||
ASSET_FBF_TEXT_UNKNOWN,
|
ASSET_FBF_DIALOG_ERASED_SAVE,
|
||||||
|
|
||||||
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
|
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
|
||||||
ASSET_10A2_TEXT_UNKNOWN,
|
ASSET_10A2_TEXT_UNKNOWN,
|
||||||
@@ -4530,6 +4531,210 @@ enum asset_e
|
|||||||
ASSET_1157_TEXT_FINALBOSS_PHASE_5_OPTION_4,
|
ASSET_1157_TEXT_FINALBOSS_PHASE_5_OPTION_4,
|
||||||
ASSET_1158_TEXT_FINALBOSS_PHASE_5_OPTION_5,
|
ASSET_1158_TEXT_FINALBOSS_PHASE_5_OPTION_5,
|
||||||
|
|
||||||
|
ASSET_1213_FF_QUIZ_QUESTION = 0x1213,
|
||||||
|
ASSET_1214_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1215_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1216_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1217_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1218_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1219_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_121A_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_121B_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_121C_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_121D_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_121E_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_121F_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1220_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1221_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1222_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1223_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1224_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1225_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1226_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1227_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1228_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1229_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_122A_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_122B_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_122C_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_122D_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_122E_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_122F_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1230_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1231_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1232_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1233_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1234_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1235_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1236_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1237_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1238_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1239_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_123A_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_123B_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_123C_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_123D_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_123E_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_123F_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1240_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1241_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1242_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1243_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1244_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1245_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1246_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1247_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1248_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1249_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_124A_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_124B_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_124C_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_124D_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_124E_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_124F_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1250_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1251_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1252_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1253_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1254_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1255_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1256_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1257_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1258_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1259_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_125A_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_125B_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_125C_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_125D_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_125E_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_125F_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1260_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1261_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1262_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1263_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1264_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1265_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1266_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1267_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1268_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1269_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_126A_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_126B_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_126C_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_126D_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_126E_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_126F_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1270_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1271_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1272_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1273_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1274_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1275_FF_QUIZ_QUESTION,
|
||||||
|
ASSET_1276_FF_QUIZ_QUESTION,
|
||||||
|
|
||||||
|
ASSET_12DB_FF_PICTURE_QUESTION = 0x12DB,
|
||||||
|
ASSET_12DC_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12DD_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12DE_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12DF_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12E0_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12E1_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12E2_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12E3_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12E4_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12E5_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12E6_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12E7_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12E8_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12E9_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12EA_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12EB_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12EC_FF_PICTURE_QUESTION,
|
||||||
|
ASSET_12ED_FF_PICTURE_QUESTION,
|
||||||
|
|
||||||
|
ASSET_13A3_FF_SOUND_QUESTION = 0x13A3,
|
||||||
|
ASSET_13A4_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13A5_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13A6_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13A7_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13A8_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13A9_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13AA_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13AB_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13AC_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13AD_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13AE_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13AF_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13B0_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13B1_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13B2_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13B3_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13B4_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13B5_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13B6_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13B7_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13B8_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13B9_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13BA_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13BB_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13BC_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13BD_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13BE_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13BF_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13C0_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13C1_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13C2_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13C3_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13C4_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13C5_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13C6_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13C7_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13C8_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13C9_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13CA_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13CB_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13CC_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13CD_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13CE_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13CF_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13D0_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13D1_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13D2_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13D3_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13D4_FF_SOUND_QUESTION,
|
||||||
|
ASSET_13D5_FF_SOUND_QUESTION,
|
||||||
|
|
||||||
|
ASSET_1407_FF_GRUNTY_QUESTION = 0x1407,
|
||||||
|
ASSET_1408_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1409_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_140A_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_140B_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_140C_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_140D_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_140E_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_140F_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1410_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1411_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1412_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1413_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1414_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1415_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1416_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1417_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1418_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1419_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_141A_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_141B_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_141C_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_141D_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_141E_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_141F_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1420_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1421_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1422_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1423_FF_GRUNTY_QUESTION,
|
||||||
|
ASSET_1424_FF_GRUNTY_QUESTION,
|
||||||
|
|
||||||
ASSET_146B_MODEL_TTC_TREASURE_TROVE_COVE_OPA = 0x146B,
|
ASSET_146B_MODEL_TTC_TREASURE_TROVE_COVE_OPA = 0x146B,
|
||||||
ASSET_146C_MODEL_TTC_TREASURE_TROVE_COVE_XLU,
|
ASSET_146C_MODEL_TTC_TREASURE_TROVE_COVE_XLU,
|
||||||
ASSET_146D_MODEL_TTC_NIPPERS_SHELL_OPA,
|
ASSET_146D_MODEL_TTC_NIPPERS_SHELL_OPA,
|
||||||
@@ -4891,7 +5096,8 @@ enum marker_e{
|
|||||||
MARKER_12A_TOPPER_THE_CARROT_A,
|
MARKER_12A_TOPPER_THE_CARROT_A,
|
||||||
MARKER_12B_ATTACK_TUTORIAL,
|
MARKER_12B_ATTACK_TUTORIAL,
|
||||||
|
|
||||||
MARKER_135_QUARRIE = 0x135,
|
MARKER_134_UNKNOWN = 0x134,
|
||||||
|
MARKER_135_QUARRIE,
|
||||||
|
|
||||||
MARKER_161_GV_WITCH_SWITCH = 0x161,
|
MARKER_161_GV_WITCH_SWITCH = 0x161,
|
||||||
MARKER_162_BGS_WITCH_SWITCH,
|
MARKER_162_BGS_WITCH_SWITCH,
|
||||||
|
Reference in New Issue
Block a user