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

Merge branch 'master' of https://gitlab.com/banjo.decomp/banjo-kazooie into core1_docu

Browse Source
This commit is contained in:
mariob92
2024-10-15 10:40:52 +02:00
parent a5b65b87fa d1b41e109d
commit 9495386470
57 changed files with 3157 additions and 2134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

290
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, // unused
VOLATILE_FLAG_77_SANDCASTLE_SET_HEALTH_TO_MAX,
VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS,
VOLATILE_FLAG_79, // unused
VOLATILE_FLAG_7A, // unused
@@ -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,
@@ -4431,7 +4460,7 @@ 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_TEXT_UNKNOWN,
ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION,
ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0),
@@ -4450,8 +4479,8 @@ enum asset_e
ASSET_FAD_TEXT_UNKNOWN = 0xfad,
ASSET_FBE_TEXT_UNKNOWN = 0xfbe,
ASSET_FBF_TEXT_UNKNOWN,
ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING = 0xfbe,
ASSET_FBF_DIALOG_ERASED_SAVE,
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
ASSET_10A2_TEXT_UNKNOWN,
@@ -4500,6 +4529,210 @@ 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,
@@ -4855,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,
@@ -4937,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,
@@ -5135,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

2
include/functions.h
View File

@@ -508,7 +508,7 @@ f32 climbGetBottomY(void);
f32 climbGetTopY(void);
void func_802596AC(f32 a0[3], f32 a1[3], f32 a2[3], f32 a3[3]);
void pfsManager_getControllerFaceButtonState(s32, s32 [6]);
void controller_copyFaceButtons(s32, s32 [6]);
void __spawnQueue_add_1(GenFunction_1, s32);
#define SPAWNQUEUE_ADD_1(method, arg0) __spawnQueue_add_1((GenFunction_1) (method), reinterpret_cast(s32, (arg0)))

2
include/prop.h
View File

@@ -146,7 +146,7 @@ typedef struct jinjo_s{
}ActorLocal_Jinjo;
typedef struct ch_sm_4070{
s32 unk0;
s32 dialog_id;
}ActorLocal_SM_4070;
typedef struct actor_s{