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

Merge branch 'mr-origin-98'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-19 23:50:51 -05:00
parent 15390deab1 af5b823880
commit 74deec4d39
9 changed files with 535 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
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_SANDCASTLE_SET_HEALTH_TO_MAX, // 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
};
@@ -1978,9 +1978,9 @@ 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,
@@ -2173,8 +2173,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,
@@ -2219,10 +2219,11 @@ enum actor_e
ACTOR_3AF_GRUNTY_SHADOW = 0x3AF,
ACTOR_3BA_UNKNOWN = 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,
@@ -2454,15 +2455,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,
@@ -2483,7 +2484,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
@@ -2517,10 +2517,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,
@@ -2955,7 +2956,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,
@@ -3538,14 +3539,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
@@ -4448,12 +4449,12 @@ enum asset_e
ASSET_E11_DIALOG_BOTTLES_BRIDGE_STILL_BROKEN,
ASSET_E12_DIALOG_BOTTLES_LEARNED_TUTORIAL_MOVES,
ASSET_E14_DIALOG_UNKNOWN = 0xE14,
ASSET_E15_DIALOG_UNKNOWN,
ASSET_E16_DIALOG_UNKNOWN,
ASSET_E17_DIALOG_UNKNOWN,
ASSET_E18_DIALOG_UNKNOWN,
ASSET_E19_DIALOG_UNKNOWN,
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,
@@ -4487,7 +4488,7 @@ enum asset_e
ASSET_FAD_DIALOG_UNKNOWN = 0xfad,
ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING = 0xfbe,
ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING = 0xFBE,
ASSET_FBF_DIALOG_ERASED_SAVE,
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
@@ -5096,11 +5097,10 @@ 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,
@@ -5174,14 +5174,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,
@@ -5386,5 +5385,4 @@ enum vegetable_e {
VEGETABLE_3_COLLY_WOBBLE
};
#endif

2
include/functions.h
View File

@@ -434,7 +434,7 @@ void func_8032AA58(Actor *, f32);
void func_80324E38(f32, s32);
void timed_playSfx(f32, enum sfx_e, f32, s32);
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;