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

Merge branch 'mr-origin-89'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-08 02:06:56 -05:00
parent 680cf7a950 4bf7028254
commit 3cd3b3e5da
40 changed files with 709 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/enums.h
View File

@@ -1246,7 +1246,7 @@ enum sfx_e
SFX_12C_FF_QUESTION_START,
SFX_12D_CAMERA_ZOOM_CLOSEST,
SFX_12E_CAMERA_ZOOM_MEDIUM,
SFX_12F_FUUUCK_YOUUU,
SFX_12F_THAAANK_YOOOUUU,
// from her final fall
SFX_130_GRUNTY_ECHOING_CRY = 0x0130,
SFX_131_GRUNTY_WEEEGH,
@@ -2427,6 +2427,17 @@ enum ttc_specific_flags {
TTC_SPECIFIC_FLAG_7_NIPPER_FIRST_MEET_TEXT_SHOWN = 0x7
};
enum mmm_specific_flags {
MMM_SPECIFIC_FLAG_0_UNKNOWN,
MMM_SPECIFIC_FLAG_TUMBLAR_BROKEN,
MMM_SPECIFIC_FLAG_2_UNKNOWN,
MMM_SPECIFIC_FLAG_3_UNKNOWN,
MMM_SPECIFIC_FLAG_4_UNKNOWN,
MMM_SPECIFIC_FLAG_5_UNKNOWN,
MMM_SPECIFIC_FLAG_6_UNKNOWN,
MMM_SPECIFIC_FLAG_7_UNKNOWN
};
enum item_e
{
ITEM_0_HOURGLASS_TIMER = 0x0,
@@ -4159,7 +4170,16 @@ enum asset_e
ASSET_A84_DIALOG_TURBOTRAINERS_LEARN,
ASSET_A85_DIALOG_TURBOTRAINERS_REFRESHER,
ASSET_ADE_TEXT_LOGGO_AS_BEAR = 0xade,
ASSET_AD3_TEXT_UNKNOWN = 0xad3,
ASSET_AD4_TEXT_UNKNOWN,
ASSET_AD5_TEXT_UNKNOWN,
ASSET_AD6_TEXT_UNKNOWN,
ASSET_ADA_TEXT_UNKNOWN = 0xada,
ASSET_ADB_TEXT_UNKNOWN,
ASSET_ADD_TEXT_UNKNOWN = 0xadd,
ASSET_ADE_TEXT_LOGGO_AS_BEAR,
ASSET_ADF_TEXT_ENTER_LOGGO,
ASSET_AE0_TEXT_EXIT_LOGGO,
@@ -4711,8 +4731,8 @@ enum marker_e{
MARKER_AB_RUBEES_EGG_POT,
MARKER_AD_SLAPPA = 0xAD,
MARKER_AF_MAGIC_CARPET_SHADOW = 0xAF,
MARKER_AE_UNKNOWN,
MARKER_AF_MAGIC_CARPET_SHADOW,
MARKER_B0_MAGIC_CARPET_2,
MARKER_B1_SIR_SLUSH,
MARKER_B2_SNOWBALL,
@@ -4724,8 +4744,8 @@ enum marker_e{
MARKER_B9_FP_SNOWMAN_BUTTON = 0xB9,
MARKER_BA_XMAS_TREE,
MARKER_BC_GOBI_1 = 0xBC,
MARKER_BB_UNKNOWN,
MARKER_BC_GOBI_1,
MARKER_BD_GOBI_ROPE,
MARKER_BE_GOBI_ROCK,
MARKER_BF_GOBI_2,