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

Merge branch 'mr-origin-80'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-26 19:10:37 -05:00
parent e8eed5ecb9 249f5a7329
commit 8a312a3e64
170 changed files with 1495 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
include/enums.h
View File

@@ -1364,7 +1364,7 @@ enum sfx_e
SFX_3F2_UNKNOWN, //gold_chest_ttc
SFX_3F5_UNKNOWN = 0x3F5, //RBB/code_5F80
SFX_3F6_UNKNOWN, //lair/code_0 func_803880BC
SFX_3F6_RUBBING, //lair/code_0 func_803880BC
SFX_3F7_UNKNOWN, //gv/histup
SFX_3F8_UNKNOWN, //gv/histup
SFX_3F9_UNKNOWN, //chmole
@@ -1723,10 +1723,9 @@ enum actor_e
ACTOR_47_EMPTY_HONEYCOMB,
ACTOR_49_EXTRA_LIFE = 0x49,
ACTOR_4A_WOOD_EXPLOSION = 0x4A,
ACTOR_4C_STEAM = 0x4C,
ACTOR_4A_WOOD_EXPLOSION,
ACTOR_4B_WOOD_EXPLOSION_2,
ACTOR_4C_STEAM,
ACTOR_4D_STEAM_2,
ACTOR_50_HONEYCOMB = 0x50,
@@ -2290,9 +2289,18 @@ enum bs_e
BS_A5_WONDERWING_UNKA5
};
enum map_flags_e
{
mapflag_mm_main_hit_with_orange = 8
enum mm_specific_flags {
MM_SPECIFIC_FLAG_0_CHIMPY_STUMP_RAISED,
MM_SPECIFIC_FLAG_1_ORANGE_HAS_BEEN_COLLECTED,
MM_SPECIFIC_FLAG_2_ORANGE_HAS_BEEN_RETURNED,
MM_SPECIFIC_FLAG_3_CHIMPY_HAS_LEAVED,
MM_SPECIFIC_FLAG_4_SHAKE,
MM_SPECIFIC_FLAG_6_UNKNOWN = 0x6,
MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE = 0x8,
MM_SPECIFIC_FLAG_9_JUJU_HAS_HALF_TURNED,
MM_SPECIFIC_FLAG_A_UNKNOWN
};
enum item_e
@@ -3973,6 +3981,12 @@ enum asset_e
ASSET_8A0_SPRITE_WATER_DROP = 0x8a0,
ASSET_A0B_TEXT_UNKNOWN = 0xA0B,
ASSET_A0C_TEXT_UNKNOWN = 0xA0C,
ASSET_A0D_TEXT_UNKNOWN = 0xA0D,
ASSET_A14_TEXT_UNKNOWN = 0xA14,
ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED = 0xa17,
ASSET_A1F_DIALOG_SHOCKJUMP_LEARN = VER_SELECT(0xa1f, 0x91f, 0, 0),
@@ -3986,6 +4000,8 @@ enum asset_e
ASSET_A27_TEXT_BOTTLES_ALL_TTC_MOVES_LEARNED,
ASSET_A28_TEXT_LEAKY_DONE,
ASSET_A2A_TEXT_UNKNOWN = 0xA2A,
ASSET_A6F_TEXT_CHARMER_MEET = 0xA6F,
ASSET_A70_TEXT_CHARMER_HELPED,
ASSET_A71_TEXT_TRUNKER_MEET,
@@ -4036,20 +4052,46 @@ enum asset_e
ASSET_B4A_DIALOG_TALON_TROT_REFRESHER,
ASSET_B4B_DIALOG_EGGS_REFRESHER,
ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER,
ASSET_B4D_TEXT_UNKNOWN,
ASSET_B4E_TEXT_BOTTLES_ALL_MM_MOVES_LEARNED = 0xB4E,
ASSET_B51_TEXT_BOTTLES_HOW_TO_EXIT_LEVEL = 0xb51,
ASSET_B9F_TEXT_UNKNOWN = 0xb9f,
ASSET_BFF_TEXT_UNKNOWN = 0xbff,
ASSET_C01_TEXT_UNKNOWN = 0xc01,
ASSET_C02_TEXT_UNKNOWN,
ASSET_C05_TEXT_UNKNOWN = 0xc05,
ASSET_C08_TEXT_UNKNOWN = 0xc08,
ASSET_C09_TEXT_UNKNOWN,
ASSET_C0A_TEXT_UNKNOWN,
ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST = 0xc15,
ASSET_C17_TEXT_UNKNOWN = 0xC17,
ASSET_C18_TEXT_UNKNOWN,
ASSET_C19_TEXT_UNKNOWN,
ASSET_C1A_TEXT_UNKNOWN,
ASSET_C1E_TEXT_UNKNOWN = 0xc1e,
ASSET_C1F_TEXT_UNKNOWN,
ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE = 0xC20,
ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN = 0xC21,
ASSET_C22_DIALOG_PRESENT_COLLECTIBLE_MEET_RED = 0xC22,
ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN,
ASSET_C22_DIALOG_PRESENT_COLLECTIBLE_MEET_RED,
ASSET_C23_DIALOG_BEAKBOMB_LEARN,
ASSET_C24_DIALOG_BEAKBOMB_REFRESHER,
ASSET_C26_TEXT_UNKNOWN = 0xc26,
ASSET_C27_TEXT_UNKNOWN,
ASSET_C2A_TEXT_BOTTLES_ALL_FP_GV_MOVES_LEARNED = 0xC2A,
ASSET_C2B_TEXT_UNKNOWN,
ASSET_C63_TEXT_MR_VILE_INTRO = 0xC63,
ASSET_C64_TEXT_MR_VILE_ROUND_1_START,
@@ -4066,11 +4108,18 @@ enum asset_e
ASSET_C6F_TEXT_MR_VILE_LOSE_ROUND_3_REMATCH,
ASSET_C70_TEXT_MR_VILE_WIN_ROUND_2_REMATCH,
ASSET_C71_TEXT_MR_VILE_WIN_ROUND_3_REMATCH,
ASSET_C72_TEXT_UNKNOWN,
ASSET_C74_TEXT_UNKNOWN = 0xc74,
ASSET_C76_TEXT_UNKNOWN = 0xc76,
text_flibbits_meet = 0xc81,
text_flibbits_defeat = 0xc82,
text_flibbits_return = 0xc83,
ASSET_C86_TEXT_UNKNOWN = 0xc86,
ASSET_C88_DIALOG_LONGLEG_LEARN = 0xC88,
ASSET_C89_DIALOG_LONGLEG_REFRESHER,
ASSET_C8A_TEXT_BOTTLES_ALL_BGS_MOVES_LEARNED,
@@ -4088,6 +4137,10 @@ enum asset_e
ASSET_C97_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_3,
ASSET_C98_TEXT_MR_VILE_GIVES_PRIZE,
ASSET_CC7_TEXT_UNKNOWN = 0xcc7,
ASSET_D2B_TEXT_UNKNOWN = 0xd2b,
ASSET_D32_DIALOG_MUTANT_CRAB_MEET = 0xD32,
ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT,
ASSET_D34_TEXT_GLOOP_MEET,
@@ -4138,16 +4191,16 @@ enum asset_e
ASSET_DFA_TEXT_BOTTLES_JUMP_REFRESHER = 0xDFA,
ASSET_DFB_TEXT_BOTTLES_DIVE_LEARN,
ASSET_DFD_TEXT_BOTTLES_SWIM_LEARN = 0xDFD,
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_E03_TEXT_BOTTLES_CLIMB_REFRESHER = 0xE03,
ASSET_E02_TEXT_UNKNOWN,
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,
@@ -4162,15 +4215,25 @@ enum asset_e
ASSET_E11_TEXT_BOTTLES_BRIDGE_STILL_BROKEN,
ASSET_E12_TEXT_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_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT = 0xE1D,
ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER = VER_SELECT(0xE1F, 0xa61, 0, 0),
ASSET_E20_DIALOG_BOTTLES_BONUS_NOT_READY,
ASSET_E21_DIALOG_BOTTLES_BONUS_DISCOVERED,
ASSET_E24_TEXT_UNKNOWN = 0xE24,
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_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0),
@@ -4182,7 +4245,18 @@ enum asset_e
ASSET_F64_DIALOG_NOTEDOORS_LEARN = 0xf64,
ASSET_F65_DIALOG_NOTEDOORS_REFRESHER,
ASSET_F79_TEXT_UNKNOWN = 0xf79,
ASSET_F7A_TEXT_UNKNOWN,
ASSET_FAD_TEXT_UNKNOWN = 0xfad,
ASSET_FBE_TEXT_UNKNOWN = 0xfbe,
ASSET_FBF_TEXT_UNKNOWN,
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
ASSET_10A2_TEXT_UNKNOWN,
ASSET_10E7_TEXT_UNKNOWN = 0x10E7,
ASSET_146B_MODEL_TTC_TREASURE_TROVE_COVE_OPA = 0x146B,
ASSET_146C_MODEL_TTC_TREASURE_TROVE_COVE_XLU,

8
include/functions.h
View File

@@ -25,8 +25,6 @@
extern f32 fabsf(f32);
#pragma intrinsic (fabsf)
#define TUPLE_ASSIGN(out, a, b, c) {\
out[0] = a;\
out[1] = b;\
@@ -395,7 +393,7 @@ void func_8030E0FC(u8, f32, f32, f32);
f32 func_8030E200(u8);
void func_8030E2C4(u8);
void func_8030E394(u8 indx);
void func_8030E484(enum sfx_e uid);
void sfxsource_playHighPriority(enum sfx_e uid);
void func_8030E4E4(enum sfx_e uid);
void sfxsource_play(enum sfx_e uid, s32 sample_rate);
void func_8030E540(enum sfx_e uid);
@@ -434,7 +432,7 @@ void subaddie_set_state(Actor *, u32);
ActorMarker *func_8032B16C(enum jiggy_e jiggy_id);
int subaddie_maybe_set_state(Actor *, s32, f32);
void subaddie_set_state_with_direction(Actor * this, s32 myAnimId, f32 arg2, s32 direction);
int subaddie_maybe_set_state_position_direction(Actor *, s32, f32, s32, f32 );
bool subaddie_maybe_set_state_position_direction(Actor *, s32, f32, s32, f32 );
void func_80328CEC(Actor *, s32, s32, s32);
void func_80328FB0(Actor *, f32);
int func_80329030(Actor *, s32);
@@ -543,7 +541,7 @@ void __spawnQueue_add_1(GenFunction_1, s32);
void func_802FAD64(enum item_e);
void nodeprop_getPosition(NodeProp *, f32[3]);
bool func_80311480(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32));
bool gcdialog_showText(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32));
void ability_unlock(enum ability_e);
extern void func_802EE278(Actor *, s32, s32, s32, f32, f32);

4
include/prop.h
View File

@@ -166,7 +166,7 @@ typedef struct actor_s{
AnimCtrl *animctrl;
ActorAnimationInfo *unk18;
TUPLE(f32, unk1C);
f32 unk28; //used in cheggs
f32 actor_specific_1_f; //used in cheggs
TUPLE(f32, velocity);
u32 unk38_31:10;
u32 unk38_21:9;
@@ -260,7 +260,7 @@ typedef struct actor_s{
u32 unk138_28:1;
u32 unk138_27:2;
u32 unk138_25:1;
u32 is_first_encounter:TRUE;
u32 has_met_before:1;
u32 unk138_23:1;
u32 unk138_22:1;
u32 unk138_21:1;