kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

document: SM characters

Browse Source
This commit is contained in:
Bl00D4NGEL
2024-10-15 20:59:24 +02:00
parent d1b41e109d
commit 543fee63e4
13 changed files with 1238 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

379
include/enums.h
View File

@@ -328,7 +328,7 @@ enum volatile_flags_e {
VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS,
VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS,
VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS,
VOLATILE_FLAG_77_SANDCASTLE_SET_HEALTH_TO_MAX,
VOLATILE_FLAG_77, // unused
VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS,
VOLATILE_FLAG_79, // unused
VOLATILE_FLAG_7A, // unused
@@ -1633,7 +1633,7 @@ enum honeycomb_e
HONEYCOMB_14_SM_WATERFALL,
HONEYCOMB_15_SM_UNDERWATER,
HONEYCOMB_16_SM_TREE,
HONEYCOMB_17_SM_COLIWOBBLE,
HONEYCOMB_17_SM_COLLIWOBBLE,
HONEYCOMB_18_SM_QUARRIES
};
@@ -1975,13 +1975,12 @@ enum actor_e
ACTOR_160_BOGGY_1,
ACTOR_163_BAT = 0x163,
ACTOR_164_COLLYWOBBLE_A,
ACTOR_165_BAWL_A,
ACTOR_166_TOPPER_A,
ACTOR_164_COLLYWOBBLE_THE_CAULIFLOWER_A,
ACTOR_165_BAWL_THE_ONION_A,
ACTOR_166_TOPPER_THE_CARROT_A,
ACTOR_167_ATTACK_TUTORIAL,
ACTOR_16E_UNKNOWN = 0x16E,
ACTOR_16F_QUARRIE,
ACTOR_16F_QUARRIE = 0x16F,
ACTOR_172_RBB_EGG_TOLL = 0x172,
@@ -2167,8 +2166,8 @@ enum actor_e
ACTOR_36C_25_MUMBO_TOKEN_SIGN,
ACTOR_COLLYWOBBLE_B = 0x36D,
ACTOR_BAWL_B = 0x36E,
ACTOR_TOPPER_B = 0x36F,
ACTOR_BAWL_THE_ONION_B = 0x36E,
ACTOR_TOPPER_THE_CARROT_B = 0x36F,
ACTOR_370_GOLD_FEATHER = 0x370,
ACTOR_374_VACATION_TEXT_TRIGGER = 0x374,
@@ -2213,10 +2212,11 @@ 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_3BF_GRUNTLING_BLUE = 0x3BF,
ACTOR_3C0_GRUNTLING_BLACK,
ACTOR_3C1_PURPLE_TEEHEE,
ACTOR_3C2_GIANT_GRAVESTONE,
@@ -2447,15 +2447,15 @@ 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_4, // if true the claw swipe can be leared
SM_SPECIFIC_FLAG_5, // learned all attack moves
SM_SPECIFIC_FLAG_7 = 0x7,
SM_SPECIFIC_FLAG_7 = 0x7, // cauliflower dead?
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_C = 0xC, // learned all attack moves
SM_SPECIFIC_FLAG_E = 0xE,
SM_SPECIFIC_FLAG_F,
@@ -2476,7 +2476,6 @@ 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
@@ -2510,10 +2509,11 @@ enum item_e
ITEM_6_HOURGLASS,
ITEM_7_SKULL_HOURGLASS,
ITEM_9_PROPELLOR = 0x9,
ITEM_B_XMAS_TREE = 0xb,
ITEM_C_NOTE,
ITEM_C_NOTE = 0xC,
ITEM_D_EGGS,
ITEM_E_JIGGY,
ITEM_F_RED_FEATHER,
@@ -2948,7 +2948,7 @@ enum asset_e
ASSET_225_ANIM_COLLYWOBBLE_UNKNOWN,
ASSET_226_ANIM_BAWL_UNKNOWN,
ASSET_227_ANIM_BAWL_UNKNOWN,
ASSET_228_ANIM_BANJO_SLED = 0x228,
ASSET_228_ANIM_BANJO_SLED,
ASSET_229_ANIM_WHIPCRACK_ATTACK,
ASSET_22A_ANIM_WHIPCRACK_IDLE,
ASSET_22B_ANIM_NABNUT_FAT,
@@ -3531,14 +3531,14 @@ enum asset_e
// 4ea FP Finish Banner
// 4eb FP Start Banner
// 4ec FP Race Rostrum
ASSET_4ED_MODEL_TOPPER = 0x4ed,
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)
ASSET_4F0_MODEL_TOPPER_UNKNOWN,
ASSET_4F1_MODEL_BAWL_OR_COLLIWOBBLE_UNKNOWN,
ASSET_4F2_MODEL_COLLIWOBBLE_LARGE_DEATH,
ASSET_4F3_MODEL_COLLIWOBBLE_SMALL_DEATH,
ASSET_4F4_MODEL_COLLIWOBBLE_STEM_DEATH,
// 4f5 CCW Spring Switch
// 4f6 CCW Summer Switch
// 4f7 CCW Autumn Switch
@@ -4213,7 +4213,7 @@ enum asset_e
ASSET_A24_DIALOG_JUMP_PAD_DISCOVERED,
ASSET_A25_DIALOG_FLY_DISC_DISCOVERED,
ASSET_A26_DIALOG_NEED_RED_FEATHERS_TO_FLY,
ASSET_A27_TEXT_BOTTLES_ALL_TTC_MOVES_LEARNED,
ASSET_A27_DIALOG_BOTTLES_ALL_TTC_MOVES_LEARNED,
ASSET_A28_TEXT_LEAKY_DONE,
ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED = 0xA2A,
@@ -4279,9 +4279,9 @@ enum asset_e
ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER,
ASSET_B4D_TEXT_UNKNOWN,
ASSET_B4E_TEXT_BOTTLES_ALL_MM_MOVES_LEARNED = 0xB4E,
ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED = 0xB4E,
ASSET_B51_TEXT_BOTTLES_HOW_TO_EXIT_LEVEL = 0xb51,
ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL = 0xb51,
ASSET_B9F_TEXT_UNKNOWN = 0xb9f,
@@ -4315,7 +4315,7 @@ enum asset_e
ASSET_C26_TEXT_UNKNOWN = 0xc26,
ASSET_C27_TEXT_UNKNOWN,
ASSET_C2A_TEXT_BOTTLES_ALL_FP_GV_MOVES_LEARNED = 0xC2A,
ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED = 0xC2A,
ASSET_C2B_TEXT_UNKNOWN,
ASSET_C63_TEXT_MR_VILE_INTRO = 0xC63,
@@ -4347,7 +4347,7 @@ enum asset_e
ASSET_C88_DIALOG_LONGLEG_LEARN = 0xC88,
ASSET_C89_DIALOG_LONGLEG_REFRESHER,
ASSET_C8A_TEXT_BOTTLES_ALL_BGS_MOVES_LEARNED,
ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED,
ASSET_C8D_TEXT_MR_VILE_EXTRA_CHALLENGE_INTRO = 0xC8D,
ASSET_C8E_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_1,
@@ -4371,9 +4371,9 @@ enum asset_e
ASSET_D34_TEXT_GLOOP_MEET,
ASSET_D35_DIALOG_WONDERWING_LEARN,
ASSET_D36_DIALOG_WONDERWING_REFRESHER,
ASSET_D37_TEXT_BOTTLES_ALL_CC_MOVES_LEARNED,
ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED,
ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH,
ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED,
ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED,
ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH,
ASSET_D8F_DIALOG_MUMBO_MEET = 0xD8F,
ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR,
@@ -4407,51 +4407,52 @@ enum asset_e
ASSET_DB4_DIALOG_SNS_EGG_2_TEXT,
ASSET_DB5_DIALOG_ICE_KEY_TEXT,
ASSET_DF3_TEXT_BOTTLES_INTRODUCTION = 0xDF3,
ASSET_DF4_TEXT_BOTTLES_CAMERA_CONTROL_LEARN,
ASSET_DF5_TEXT_BOTTLES_CAMERA_CONTROL_REFRESHER,
ASSET_DF6_TEXT_BOTTLES_HIGH_JUMP_LEARN,
ASSET_DF7_TEXT_BOTTLES_FEATHERY_FLAP_LEARN,
ASSET_DF8_TEXT_BOTTLES_FLAP_FLIP_LEARN,
ASSET_DF9_TEXT_BOTTLES_UNKNOWN,
ASSET_DFA_TEXT_BOTTLES_JUMP_REFRESHER,
ASSET_DFB_TEXT_BOTTLES_DIVE_LEARN,
ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION = 0xDF3,
ASSET_DF4_DIALOG_BOTTLES_CAMERA_CONTROL_LEARN,
ASSET_DF5_DIALOG_BOTTLES_CAMERA_CONTROL_REFRESHER,
ASSET_DF6_DIALOG_BOTTLES_HIGH_JUMP_LEARN,
ASSET_DF7_DIALOG_BOTTLES_FEATHERY_FLAP_LEARN,
ASSET_DF8_DIALOG_BOTTLES_FLAP_FLIP_LEARN,
ASSET_DF9_DIALOG_BOTTLES_UNKNOWN,
ASSET_DFA_DIALOG_BOTTLES_JUMP_REFRESHER,
ASSET_DFB_DIALOG_BOTTLES_DIVE_LEARN,
ASSET_DFC_TEXT_UNKNOWN,
ASSET_DFD_TEXT_BOTTLES_SWIM_LEARN,
ASSET_DFE_TEXT_BOTTLES_DIVE_REFRESHER,
ASSET_DFF_TEXT_BOTTLES_CLAW_SWIPE_LEARN,
ASSET_E00_TEXT_BOTTLES_ATTACK_REFRESHER = 0xE00,
ASSET_E01_TEXT_BOTTLES_CLIMB_LEARN,
ASSET_DFD_DIALOG_BOTTLES_SWIM_LEARN,
ASSET_DFE_DIALOG_BOTTLES_DIVE_REFRESHER,
ASSET_DFF_DIALOG_BOTTLES_CLAW_SWIPE_LEARN,
ASSET_E00_DIALOG_BOTTLES_ATTACK_REFRESHER = 0xE00,
ASSET_E01_DIALOG_BOTTLES_CLIMB_LEARN,
ASSET_E02_TEXT_UNKNOWN,
ASSET_E03_TEXT_BOTTLES_CLIMB_REFRESHER,
ASSET_E04_TEXT_BOTTLES_BEAK_BARGE_LEARN,
ASSET_E03_DIALOG_BOTTLES_CLIMB_REFRESHER,
ASSET_E04_DIALOG_BOTTLES_BEAK_BARGE_LEARN,
ASSET_E05_TEXT_UNKNOWN,
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,
ASSET_E0C_TEXT_BOTTLES_REFUSE_HELP_3,
ASSET_E0D_TEXT_BOTTLES_REFUSE_HELP_4,
ASSET_E0E_TEXT_BOTTLES_REFUSE_HELP_5,
ASSET_E0F_TEXT_BOTTLES_STOP_WASTING_TIME_BEFORE_FURNACE_FUN, // Skip tutorial, bother bottles, gives help, retalk to bottles
ASSET_E10_TEXT_BOTTLES_BRIDGE_BROKEN,
ASSET_E11_TEXT_BOTTLES_BRIDGE_STILL_BROKEN,
ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES,
ASSET_E06_DIALOG_BOTTLES_BEAK_BARGE_REFRESHER,
ASSET_E07_DIALOG_BOTTLES_UNKNOWN,
ASSET_E08_DIALOG_BOTTLES_FIND_ANOTHER_MOLEHILL,
ASSET_E09_DIALOG_BOTTLES_SKIPPED_TUTORIAL,
ASSET_E0A_DIALOG_BOTTLES_REFUSE_HELP_1,
ASSET_E0B_DIALOG_BOTTLES_REFUSE_HELP_2,
ASSET_E0C_DIALOG_BOTTLES_REFUSE_HELP_3,
ASSET_E0D_DIALOG_BOTTLES_REFUSE_HELP_4,
ASSET_E0E_DIALOG_BOTTLES_REFUSE_HELP_5,
ASSET_E0F_DIALOG_BOTTLES_STOP_WASTING_TIME_BEFORE_FURNACE_FUN, // Skip tutorial, bother bottles, gives help, retalk to bottles
ASSET_E10_DIALOG_BOTTLES_BRIDGE_BROKEN,
ASSET_E11_DIALOG_BOTTLES_BRIDGE_STILL_BROKEN,
ASSET_E12_DIALOG_BOTTLES_LEARNED_TUTORIAL_MOVES,
ASSET_E14_TEXT_UNKNOWN = 0xE14,
ASSET_E15_TEXT_UNKNOWN,
ASSET_E16_TEXT_UNKNOWN,
ASSET_E17_TEXT_UNKNOWN,
ASSET_E18_TEXT_UNKNOWN,
ASSET_E19_TEXT_UNKNOWN,
ASSET_E1A_TEXT_BOTTLES_UNKNOWN,
ASSET_E1B_TEXT_BOTTLES_UNKNOWN,
ASSET_E1C_TEXT_BOTTLES_UNKNOWN,
ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT,
ASSET_E14_DIALOG_ATTACK_TUTORIAL_SUCCESSFUL_KILL = 0xE14,
ASSET_E15_DIALOG_ATTACK_TUTORIAL_FORWARD_ROLL,
ASSET_E16_DIALOG_ATTACK_TUTORIAL_SUCCESSFUL_KILL,
ASSET_E17_DIALOG_ATTACK_TUTORIAL_RATATAT_RAP,
ASSET_E18_DIALOG_ATTACK_TUTORIAL_SUCCESSFUL_KILL,
ASSET_E19_DIALOG_ATTACK_TUTORIAL_LEARNED_ALL_MOVES,
ASSET_E1A_DIALOG_BOTTLES_UNKNOWN,
ASSET_E1B_DIALOG_BOTTLES_UNKNOWN,
ASSET_E1C_DIALOG_BOTTLES_UNKNOWN,
ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER = VER_SELECT(0xE1F, 0xa61, 0, 0),
ASSET_E1D_DIALOG_BOTTLES_TUTORIAL_OFFER_WAIT = 0xE1D,
ASSET_E1F_DIALOG_BOTTLES_TUTORIAL_OFFER = VER_SELECT(0xE1F, 0xa61, 0, 0),
ASSET_E20_DIALOG_BOTTLES_BONUS_NOT_READY,
ASSET_E21_DIALOG_BOTTLES_BONUS_DISCOVERED,
@@ -4459,8 +4460,8 @@ enum asset_e
ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER = VER_SELECT(0xE35, 0xa77, 0, 0),
ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun
ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION,
ASSET_E37_DIALOG_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun
ASSET_E38_TEXT_UNKNOWN,
ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0),
@@ -4479,8 +4480,8 @@ enum asset_e
ASSET_FAD_TEXT_UNKNOWN = 0xfad,
ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING = 0xfbe,
ASSET_FBF_DIALOG_ERASED_SAVE,
ASSET_FBE_TEXT_UNKNOWN = 0xfbe,
ASSET_FBF_TEXT_UNKNOWN,
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
ASSET_10A2_TEXT_UNKNOWN,
@@ -4529,210 +4530,6 @@ enum asset_e
ASSET_1157_TEXT_FINALBOSS_PHASE_5_OPTION_4,
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_146C_MODEL_TTC_TREASURE_TROVE_COVE_XLU,
ASSET_146D_MODEL_TTC_NIPPERS_SHELL_OPA,
@@ -5088,15 +4885,13 @@ 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_128_COLLYWOBBLE_THE_CAULIFLOWER_A,
MARKER_129_BAWL_THE_ONION_A,
MARKER_12A_TOPPER_THE_CARROT_A,
MARKER_12B_ATTACK_TUTORIAL,
MARKER_134_UNKNOWN = 0x134,
MARKER_135_QUARRIE,
MARKER_135_QUARRIE = 0x135,
MARKER_161_GV_WITCH_SWITCH = 0x161,
MARKER_162_BGS_WITCH_SWITCH,
@@ -5166,14 +4961,13 @@ enum marker_e{
MARKER_1E5_GOLD_FEATHER_COLLECTIBLE = 0x1E5,
MARKER_1E6_TOPPER_B,
MARKER_1E7_BAWL_B,
MARKER_1E8_COLLYWOBBLE_B,
MARKER_1E6_TOPPER_THE_CARROT_B,
MARKER_1E7_BAWL_THE_ONION_B,
MARKER_1E8_COLLYWOBBLE_THE_CAULIFLOWER_B,
MARKER_1E9_MUMBO_COST_SIGN,
MARKER_1EA_GRUNTLING_RED,
MARKER_1ED_JUMP_TUTORIAL = 0x1ED,
MARKER_1F1_GRUNTLING_BLACK = 0x1F1,
MARKER_1F4_TOOTS = 0x1F4,
@@ -5372,11 +5166,6 @@ 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

2
include/functions.h
View File

@@ -466,7 +466,7 @@ void func_80324E38(f32, s32);
void timed_playSfx(f32, enum sfx_e, f32, s32);
f32 ml_distance_vec3f(f32 [3], f32 [3]);
void timed_setStaticCameraToNode(f32, s32);
void timed_exitStaticCamera(f32);
void timed_exitStaticCamera(f32 time);
int actor_animationIsAt(Actor*, f32);
void rumbleManager_80250E94(f32, f32, f32, f32, f32, f32);

2
include/prop.h
View File

@@ -155,7 +155,7 @@ typedef struct actor_s{
u32 state:6; /* unk10_31*/
u32 unk10_25:7;
u32 unk10_18:6;
u32 unk10_12:4;
u32 unk10_12:4; // number of defeated enemies in SM attack tutorial
u32 unk10_8:1;
u32 unk10_7:1;
u32 unk10_6:2;