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 document/sandcastle

Browse Source
This commit is contained in:
Bl00D4NGEL
2024-10-10 22:18:47 +02:00
parent c07c907d97 6fb4f2b3f1
commit 1cf3980d5b
287 changed files with 4204 additions and 3793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/core2/core2.h
View File

@@ -8,7 +8,7 @@
void func_80351A04(Struct68s *arg0, s32 arg1);
void func_80351A14(Struct68s *arg0, Struct68DrawMethod arg1);
void func_8035179C(Struct68s* arg0, f32 arg1[3]);
void func_8035179C_copyPosition(Struct68s* arg0, f32 arg1[3]);
void func_80351814(Struct68s *arg0, f32 arg1[3]);
f32 func_80351830(Struct68s *arg0);

2
include/core2/particle.h
View File

@@ -15,7 +15,7 @@ void particleEmitter_setParticleCallback(ParticleEmitter *this, void (*arg1)(Par
void func_802EFA20(ParticleEmitter *this, f32, f32);
void func_802EFA34(ParticleEmitter *this, f32);
void func_802EFA40(ParticleEmitter *this, f32 (*)[3]);
void func_802EFA78(ParticleEmitter *this, s32 arg1);
void particleEmitter_func_802EFA78(ParticleEmitter *this, s32 arg1);
void func_802EFF5C(ParticleEmitter *this, f32, f32, f32);
void func_802EFF7C(ParticleEmitter *this, f32, f32, f32);
void func_802EFF9C(ParticleEmitter *this, f32);

282
include/enums.h
View File

@@ -13,11 +13,11 @@
#define SPRITE_TYPE_RGBA16 (1 << 10) ////0x400
#define SPRITE_TYPE_RGBA32 (1 << 11)
enum file_progress_e{
FILEPROG_0_UNKNOWN,
FILEPROG_1_UNKNOWN,
FILEPROG_2_UNKNOWN,
FILEPROG_3_MUSIC_NOTE_TEXT,
enum file_progress_e {
FILEPROG_0_TIPTUP_MINIGAME_PROGRESS,
// unused
// unused
FILEPROG_3_MUSIC_NOTE_TEXT = 0x03,
FILEPROG_4_MUMBO_TOKEN_TEXT,
FILEPROG_5_BLUE_EGG_TEXT,
FILEPROG_6_RED_FEATHER_TEXT,
@@ -79,17 +79,17 @@ enum file_progress_e{
FILEPROG_46_CCW_WITCH_SWITCH_JIGGY_PRESSED,
FILEPROG_47_FP_WITCH_SWITCH_JIGGY_PRESSED,
FILEPROG_48_FP_WITCH_SWITCH_ADVENT_DOOR_OPEN,
// {index=0x49, type="Prog", level=6, name="Pink Cauldron 1 Active"},
// {index=0x4A, type="Prog", level=6, name="Pink Cauldron 2 Active"},
// {index=0x4B, type="Prog", level=6, name="Green Cauldron 1 Active"},
// {index=0x4C, type="Prog", level=6, name="Green Cauldron 2 Active"},
// {index=0x4D, type="Prog", level=6, name="Red Cauldron 1 Active"},
// {index=0x4E, type="Prog", level=6, name="Red Cauldron 2 Active"},
// -- 0x4F - Unused Cauldron Pair?
// -- 0x50 - Unused Cauldron Pair?
// {index=0x51, type="Prog", level=6, name="Yellow Cauldron 1 Active"},
// {index=0x52, type="Prog", level=6, name="Yellow Cauldron 2 Active"},
FILEPROG_53_CCW_PUZZLE_PODIUM_SWITCH_PRESSED = 0x53,
FILEPROG_49_PINK_CAULDRON_1_ACTIVE,
FILEPROG_4A_PINK_CAULDRON_2_ACTIVE,
FILEPROG_4B_GREEN_CAULDRON_1_ACTIVE,
FILEPROG_4C_GREEN_CAULDRON_2_ACTIVE,
FILEPROG_4D_RED_CAULDRON_1_ACTIVE,
FILEPROG_4E_RED_CAULDRON_2_ACTIVE,
FILEPROG_4F_UNUSED_CAULDRON_1_ACTIVE,
FILEPROG_50_UNUSED_CAULDRON_2_ACTIVE,
FILEPROG_51_YELLOW_CAULDRON_1_ACTIVE,
FILEPROG_52_YELLOW_CAULDRON_2_ACTIVE,
FILEPROG_53_CCW_PUZZLE_PODIUM_SWITCH_PRESSED,
FILEPROG_54_CCW_PUZZLE_PODIUM_ACTIVE,
FILEPROG_55_FF_BK_SQUARE_INSTRUCTIONS,
FILEPROG_56_FF_PICTURE_SQUARE_INSTRUCTIONS,
@@ -110,7 +110,6 @@ enum file_progress_e{
FILEPROG_76_CCW_PUZZLE_PIECES_PLACED = 0x76, //4 bit
FILEPROG_7A_DOG_PUZZLE_PIECES_PLACED = 0x7A, //5 bit
FILEPROG_7F_DOUBLE_HEALTH_PUZZLE_PIECES_PLACED = 0x7F, //3 bit
// {index=0x82, unknown}
FILEPROG_82_MET_TWINKLIES = 0x82,
FILEPROG_83_MAGIC_GET_WEAK_TEXT,
FILEPROG_84_MAGIC_ALL_GONE_TEXT,
@@ -130,8 +129,8 @@ enum file_progress_e{
FILEPROG_92_PAID_WALRUS_COST,
FILEPROG_93_PAID_CROC_COST,
FILEPROG_94_PAID_BEE_COST,
FILEPROG_96_MET_BRENTILDA = 0x96,
FILEPROG_95_UNKNOWN,
FILEPROG_96_MET_BRENTILDA,
FILEPROG_97_ENTERED_LAIR_TEXT,
FILEPROG_98_EXITED_LEVEL_TEXT,
FILEPROG_99_PAST_50_NOTE_DOOR_TEXT,
@@ -201,8 +200,8 @@ enum file_progress_e{
FILEPROG_DE_USED_ALL_YOUR_PUZZLE_PIECES,
FILEPROG_DF_CAN_REMOVE_ALL_PUZZLE_PIECES,
FILEPROG_E0_CAN_PLACE_ALL_PUZZLE_PIECES,
FILEPROG_E2_DOOR_OF_GRUNTY_OPEN = 0xE2,
FILEPROG_E1_UNKNOWN, // is set in cutscene_skipGameOverCutsceneCheck
FILEPROG_E2_DOOR_OF_GRUNTY_OPEN,
FILEPROG_E3_CCW_FLOWER_SPRING,
FILEPROG_E4_CCW_FLOWER_SUMMER,
FILEPROG_E5_CCW_FLOWER_AUTUMN,
@@ -225,10 +224,49 @@ enum file_progress_e{
FILEPROG_F6_SEEN_DOOR_OF_GRUNTY_PUZZLE_PODIUM,
FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT,
FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE = 0xF8, //2bit
// FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE = 0xF9, //2bit
FILEPROG_FA_UNKNOWN = 0xFA, // Something that's set in FF
FILEPROG_FC_DEFEAT_GRUNTY = 0xFC,
FILEPROG_FD_BANNED_CHEATCODES_ENTERED //2 bit
FILEPROG_FD_BANNED_CHEATCODES_ENTERED, //2 bit
FILEPROG_FF_SANDCASTLE_OPEN_DOOR_TWO = 0xFF,
FILEPROG_100_SANDCASTLE_OPEN_DOOR_THREE,
FILEPROG_101_SANDCASTLE_OPEN_DOOR_FOUR,
FILEPROG_102_SANDCASTLE_OPEN_DOOR_FIVE,
FILEPROG_103_SANDCASTLE_OPEN_DOOR_SIX,
FILEPROG_104_SANDCASTLE_OPEN_DOOR_SEVEN,
FILEPROG_105_SANDCASTLE_PUZZLE_COMPLETE_CC,
FILEPROG_106_SANDCASTLE_PUZZLE_COMPLETE_BGS,
FILEPROG_107_SANDCASTLE_PUZZLE_COMPLETE_FP,
FILEPROG_108_SANDCASTLE_PUZZLE_COMPLETE_GV,
FILEPROG_109_SANDCASTLE_PUZZLE_COMPLETE_MMM,
FILEPROG_10A_SANDCASTLE_PUZZLE_COMPLETE_RBB,
FILEPROG_10B_SANDCASTLE_PUZZLE_COMPLETE_CCC,
FILEPROG_10C_SANDCASTLE_RAISE_PIPES_TO_CC,
FILEPROG_10D_SANDCASTLE_RAISE_PIPE_TO_BRENTILDA,
FILEPROG_10E_SANDCASTLE_OPEN_CC,
FILEPROG_10F_SANDCASTLE_REMOVE_GRILL_NEAR_BGS_JIGGY,
FILEPROG_110_SANDCASTLE_CCC_JIGGY_PODIUM,
FILEPROG_111_SANDCASTLE_REMOVE_GRILL_AND_HAT_FROM_STATUE,
FILEPROG_112_SANDCASTLE_REMOVE_ICE,
FILEPROG_113_SANDCASTLE_OPEN_BGS,
FILEPROG_114_SANDCASTLE_REMOVE_BREAKABLE_WALLS,
FILEPROG_115_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED,
FILEPROG_116_SANDCASTLE_OPEN_GV,
FILEPROG_117_SANDCASTLE_REMOVE_WEBS,
FILEPROG_118_SANDCASTLE_REMOVE_GLASS_EYE,
FILEPROG_119_SANDCASTLE_FLIGHT_UNLOCKED,
FILEPROG_11A_SANDCASTLE_OPEN_FP,
FILEPROG_11B_SANDCASTLE_OPEN_MMM,
FILEPROG_11C_SANDCASTLE_REMOVE_CRYPT_GATE,
FILEPROG_11D_SANDCASTLE_REMOVE_CRYPT_COFFIN_LID,
FILEPROG_11E_SANDCASTLE_REMOVE_GRATE_NEAR_WATER_SWITCH,
FILEPROG_11F_SANDCASTLE_OPEN_RBB,
FILEPROG_120_SANDCASTLE_REMOVE_GRILL_NEAR_RBB_JIGGY,
FILEPROG_121_SANDCASTLE_REMOVE_TUNNEL_GRILL_NEAR_RBB_JIGGY,
FILEPROG_122_SANDCASTLE_OPEN_CCW,
FILEPROG_123_CHEAT_ENTERED
};
enum volatile_flags_e {
@@ -376,7 +414,62 @@ enum volatile_flags_e {
enum level_flags_e
{
LEVEL_FLAG_0_CC_TOKEN_TOOTH_OPEN = 0,
LEVEL_FLAG_1_CC_JIGGY_TOOTH_OPEN = 1
LEVEL_FLAG_1_CC_JIGGY_TOOTH_OPEN,
LEVEL_FLAG_2_TTC_UNKNOWN,
LEVEL_FLAG_3_RBB_UNKNOWN,
LEVEL_FLAG_4_RBB_UNKNOWN,
LEVEL_FLAG_5_TTC_UNKNOWN,
LEVEL_FLAG_6_GV_UNKNOWN,
LEVEL_FLAG_B_MM_UNKNOWN = 0xB,
LEVEL_FLAG_C_MM_UNKNOWN,
LEVEL_FLAG_D_MM_UNKNOWN,
LEVEL_FLAG_E_CC_UNKNOWN,
LEVEL_FLAG_10_CCW_UNKNOWN = 0x10,
LEVEL_FLAG_11_FP_UNKNOWN,
LEVEL_FLAG_12_FP_UNKNOWN,
LEVEL_FLAG_13_FP_UNKNOWN,
LEVEL_FLAG_14_TTC_UNKNOWN,
LEVEL_FLAG_15_GV_UNKNOWN,
LEVEL_FLAG_16_GV_UNKNOWN,
LEVEL_FLAG_17_GV_UNKNOWN,
LEVEL_FLAG_19_FP_UNKNOWN = 0x19,
LEVEL_FLAG_1A_UNKNOWN,
LEVEL_FLAG_1B_MMM_UNKNOWN,
LEVEL_FLAG_1C_MM_UNKNOWN,
LEVEL_FLAG_1D_TTC_UNKNOWN,
LEVEL_FLAG_1E_CC_UNKNOWN,
LEVEL_FLAG_1F_BGS_UNKNOWN,
LEVEL_FLAG_20_FP_UNKNOWN,
LEVEL_FLAG_21_GV_UNKNOWN,
LEVEL_FLAG_22_MMM_UNKNOWN,
LEVEL_FLAG_23_RBB_UNKNOWN,
LEVEL_FLAG_24_CCW_UNKNOWN,
LEVEL_FLAG_25_CCW_UNKNOWN,
LEVEL_FLAG_26_FP_UNKNOWN,
LEVEL_FLAG_27_RBB_UNKNOWN,
LEVEL_FLAG_28_RBB_UNKNOWN,
LEVEL_FLAG_29_FP_UNKNOWN,
LEVEL_FLAG_2A_FP_UNKNOWN,
LEVEL_FLAG_2B_FP_UNKNOWN,
LEVEL_FLAG_2C_FP_UNKNOWN,
LEVEL_FLAG_2D_RBB_UNKNOWN,
LEVEL_FLAG_2E_MMM_UNKNOWN,
LEVEL_FLAG_2F_MMM_UNKNOWN,
LEVEL_FLAG_30_RBB_UNKNOWN,
LEVEL_FLAG_31_FP_UNKNOWN,
LEVEL_FLAG_32_FP_UNKNOWN,
LEVEL_FLAG_33_MMM_UNKNOWN,
LEVEL_FLAG_34_UNKNOWN,
LEVEL_FLAG_38_CCW_UNKNOWN = 0x38,
LEVEL_FLAG_3C_LAIR_UNKNOWN = 0x3C,
LEVEL_FLAG_3D_LAIR_UNKNOWN,
LEVEL_FLAG_3E_UNKNOWN,
LEVEL_FLAG_3F_LAIR_UNKNOWN
};
enum transformation_e
@@ -1191,7 +1284,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,
@@ -2103,7 +2196,8 @@ enum actor_e
ACTOR_3A1_STONE_JINJO,
ACTOR_3A2_JINJO_STATUE_BASE,
ACTOR_3A5_BOSS_JINJO_ORANGE = 0x3A5,
ACTOR_3A4_BOSS_JINJO_BASE_IDX = 0x3A4,
ACTOR_3A5_BOSS_JINJO_ORANGE,
ACTOR_3A6_BOSS_JINJO_GREEN,
ACTOR_3A7_BOSS_JINJO_PINK,
ACTOR_3A8_BOSS_JINJO_YELLOW,
@@ -2112,6 +2206,7 @@ enum actor_e
ACTOR_3AA_GRUNTY_SPELL_GREEN_ATTACK = 0x3AA,
ACTOR_3AB_GRUNTY_SPELL_BARRIER,
ACTOR_3AC_JINJONATOR,
ACTOR_3AD_JINJONATOR_STATUE_BASE_ACTIVATOR,
ACTOR_3AF_GRUNTY_SHADOW = 0x3AF,
@@ -2130,6 +2225,48 @@ enum actor_e
ACTOR_3CA_ROCK_TRAPPING_GRUNTY = 0x3CA
};
enum bundle_e {
BUNDLE_0_MM_HUT_MUSIC_NOTE,
BUNDLE_1_MM_HUT_BLUE_EGG,
BUNDLE_2_MM_HUT_GRUBLIN,
BUNDLE_3_MM_HUT_JINJO_GREEN,
BUNDLE_4_MM_HUT_JIGGY,
BUNDLE_5__HONEYCOMB,
BUNDLE_6_MM_HUT_EXTRA_LIFE,
BUNDLE_7__JIGGY,
BUNDLE_8__JIGGY,
BUNDLE_9__JIGGY,
BUNDLE_A_BGS_HUT_SHOCKSPRING_PAD,
BUNDLE_B_BGS_HUT_MUSIC_NOTE,
BUNDLE_C_BGS_HUT_JIGGY,
BUNDLE_D__EMPTY_HONEYCOMB,
BUNDLE_E_YUMYUM_BLUE_EGG,
BUNDLE_F_YUMYUM_RED_FEATHER,
BUNDLE_10__JIGGY,
BUNDLE_11__UNKNOWN,
BUNDLE_12__JIGGY,
BUNDLE_13__MUSIC_NOTE,
BUNDLE_14__HONEYCOMB,
BUNDLE_15__JIGGY,
BUNDLE_16__HONEYCOMB,
BUNDLE_17__HONEYCOMB,
BUNDLE_18__HONEYCOMB,
BUNDLE_19__HONEYCOMB,
BUNDLE_1A__HONEYCOMB,
BUNDLE_1B__HONEYCOMB,
BUNDLE_1C__HONEYCOMB,
BUNDLE_1D__HONEYCOMB,
BUNDLE_1E__JIGGY,
BUNDLE_1F_SM_EMPTY_HONEYCOMB,
BUNDLE_20__UNKOWN,
BUNDLE_21__ICECUBE_B,
BUNDLE_22__HONEYCOMB,
BUNDLE_23__HONEYCOMB,
BUNDLE_24__HONEYCOMB,
BUNDLE_25__HONEYCOMB,
BUNDLE_26__HONEYCOMB
};
enum bs_e
{
BS_0_NONE = 0,
@@ -2328,6 +2465,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,
@@ -2755,14 +2903,21 @@ enum asset_e
ASSET_1E0_ANIM_BEE_OW = 0x1e0,
ASSET_1E1_ANIM_BEE_DIE,
ASSET_1E2_ANIM_BEE_JUMP,
ASSET_1E3_ANIM_UNKNOWN,
ASSET_1ED_ANIM_GRAVESTONE_OW = 0x1ED,
ASSET_1EE_ANIM_GRAVESTONE_DIE,
ASSET_1F4_ANIM_SHRAPNEL_IDLE = 0x1F4,
ASSET_1F0_ANIM_UNKNOWN = 0x1F0,
ASSET_1F1_ANIM_UNKNOWN,
ASSET_1F2_ANIM_UNKNOWN,
ASSET_1F3_ANIM_UNKNOWN,
ASSET_1F4_ANIM_SHRAPNEL_IDLE,
ASSET_1F5_ANIM_TRANSITION_FALLING_JIGGIES,
ASSET_217_ANIM_UNKNOWN = 0x217,
ASSET_220_ANIM_SIR_SLUSH_DIE = 0x220,
ASSET_221_ANIM_WOZZA_IN_CAVE,
@@ -3451,10 +3606,10 @@ enum asset_e
ASSET_553_MODEL_BROOMSTICK_PIECE_SHORT,
ASSET_554_MODEL_BROOMSTICK_PIECE_LONG,
ASSET_555_MODEL_BROOMSTICK_PIECE_EYE,
// 556 Blast When Yellow Jinjo Hits Gruntilda
// 557 Blast When Orange Jinjo Hits Gruntilda
// 558 Blast When Green Jinjo Hits Gruntilda
// 559 Blast When Pink Jinjo Hits Gruntilda
ASSET_556_MODEL_YELLOW_JINJO_BLAST,
ASSET_557_MODEL_ORANGE_JINJO_BLAST,
ASSET_558_MODEL_GREEN_JINJO_BLAST,
ASSET_559_MODEL_PINK_JINJO_BLAST,
// 55a BK World Entry/Exit Pad
// 55b FP Boggy's Igloo
ASSET_55C_MODEL_PRESS_START_OVERLAY = 0x55C,
@@ -3898,6 +4053,8 @@ enum asset_e
ASSET_7E6_SPRITE_VILE,
ASSET_7E7_SPRITE_CROC_BANJO,
ASSET_7EA_SPRITE_RED_HEALTH = 0x7ea,
ASSET_7EE_JOKER_CARD = 0x7ee,
ASSET_7EF_SPRITE_BANJO,
ASSET_7F0_SPRITE_BOTTLES,
@@ -4058,7 +4215,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_ADC_DIALOG_UNKNOWN,
ASSET_ADD_TEXT_UNKNOWN,
ASSET_ADE_TEXT_LOGGO_AS_BEAR,
ASSET_ADF_TEXT_ENTER_LOGGO,
ASSET_AE0_TEXT_EXIT_LOGGO,
@@ -4276,6 +4442,8 @@ enum asset_e
ASSET_F64_DIALOG_NOTEDOORS_LEARN = 0xf64,
ASSET_F65_DIALOG_NOTEDOORS_REFRESHER,
ASSET_F66_DIALOG_UNKNOWN,
ASSET_F67_DIALOG_UNKNOWN,
ASSET_F79_TEXT_UNKNOWN = 0xf79,
ASSET_F7A_TEXT_UNKNOWN,
@@ -4290,6 +4458,48 @@ enum asset_e
ASSET_10E7_TEXT_UNKNOWN = 0x10E7,
ASSET_10ED_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_1 = 0x10ED,
ASSET_10EE_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_2,
ASSET_10EF_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_3,
ASSET_10F0_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_4,
ASSET_10F1_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_5,
ASSET_10F2_TEXT_FINALBOSS_PHASE_1_OPTION_1 = 0x10F2,
ASSET_10F3_TEXT_FINALBOSS_PHASE_1_OPTION_2,
ASSET_10F4_TEXT_FINALBOSS_PHASE_1_OPTION_3,
ASSET_10F5_TEXT_FINALBOSS_PHASE_1_OPTION_4,
ASSET_10F6_TEXT_FINALBOSS_PHASE_1_OPTION_5,
ASSET_110B_TEXT_FINALBOSS_PHASE_2_OPTION_1 = 0x110B,
ASSET_110C_TEXT_FINALBOSS_PHASE_2_OPTION_2,
ASSET_110D_TEXT_FINALBOSS_PHASE_2_OPTION_3,
ASSET_110E_TEXT_FINALBOSS_PHASE_2_OPTION_4,
ASSET_110F_TEXT_FINALBOSS_PHASE_2_OPTION_5,
ASSET_111D_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_1 = 0x111D,
ASSET_111E_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_2,
ASSET_111F_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_3,
ASSET_1120_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_4,
ASSET_1121_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_5,
ASSET_1122_TEXT_FINALBOSS_PHASE_3_OPTION_1 = 0x1122,
ASSET_1123_TEXT_FINALBOSS_PHASE_3_OPTION_2,
ASSET_1124_TEXT_FINALBOSS_PHASE_3_OPTION_3,
ASSET_1125_TEXT_FINALBOSS_PHASE_3_OPTION_4,
ASSET_1126_TEXT_FINALBOSS_PHASE_3_OPTION_5,
ASSET_113B_TEXT_FINALBOSS_PHASE_4_OPTION_1 = 0x113B,
ASSET_113C_TEXT_FINALBOSS_PHASE_4_OPTION_2,
ASSET_113D_TEXT_FINALBOSS_PHASE_4_OPTION_3,
ASSET_113E_TEXT_FINALBOSS_PHASE_4_OPTION_4,
ASSET_113F_TEXT_FINALBOSS_PHASE_4_OPTION_5,
ASSET_1154_TEXT_FINALBOSS_PHASE_5_OPTION_1 = 0x1154,
ASSET_1155_TEXT_FINALBOSS_PHASE_5_OPTION_2,
ASSET_1156_TEXT_FINALBOSS_PHASE_5_OPTION_3,
ASSET_1157_TEXT_FINALBOSS_PHASE_5_OPTION_4,
ASSET_1158_TEXT_FINALBOSS_PHASE_5_OPTION_5,
ASSET_146B_MODEL_TTC_TREASURE_TROVE_COVE_OPA = 0x146B,
ASSET_146C_MODEL_TTC_TREASURE_TROVE_COVE_XLU,
ASSET_146D_MODEL_TTC_NIPPERS_SHELL_OPA,
@@ -4568,8 +4778,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,
@@ -4581,8 +4791,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,

30
include/functions.h
View File

@@ -203,19 +203,19 @@ void func_8030DA44(u8);
void particleEmitter_emitInVolume(ParticleEmitter *, f32[3], f32[3], s32);
ParticleEmitter *particleEmitter_new(u32 capacity);
void particleEmitter_setParticleAccelerationRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
void func_802EF9F8(ParticleEmitter *, f32);
void func_802EFA18(ParticleEmitter *, s32);
void particleEmitter_setAccelerationRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
void particleEmitter_func_802EF9F8(ParticleEmitter *, f32);
void particleEmitter_func_802EFA18(ParticleEmitter *, s32);
void particleEmitter_setFade(ParticleEmitter *, f32, f32);
void particleEmitter_setDrawMode(ParticleEmitter *, s32);
void particleEmitter_setStartingFrameRange(ParticleEmitter *this, s32 arg1, s32 arg2);
void particleEmitter_setParticleFramerateRange(ParticleEmitter *, f32, f32);
void particleEmitter_setParticleSpawnPositionRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
void particleEmitter_setSpawnPositionRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
void particleEmitter_setStartingScaleRange(ParticleEmitter *, f32, f32);
void particleEmitter_setFinalScaleRange(ParticleEmitter *, f32, f32);
void particleEmitter_setScaleAndLifetimeRanges(ParticleEmitter *, ParticleScaleAndLifetimeRanges *);
void particleEmitter_setVelocityAndAccelerationRanges(ParticleEmitter *, struct41s *);
void particleEmitter_setPositionAndVelocityRanges(ParticleEmitter *this, struct42s *arg1);
void particleEmitter_setVelocityAndAccelerationRanges(ParticleEmitter *, ParticleSettingsVelocityAcceleration *);
void particleEmitter_setPositionAndVelocityRanges(ParticleEmitter *this, ParticleSettingsVelocityPosition *arg1);
void particleEmitter_setAngularVelocityRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
void particleEmitter_setSpawnIntervalRange(ParticleEmitter *, f32, f32);
void particleEmitter_setParticleLifeTimeRange(ParticleEmitter *, f32, f32);
@@ -391,7 +391,7 @@ void func_8030EBC8(enum sfx_e uid, f32 arg1, f32 arg2, s32 arg3, s32 arg4);
void func_8030EC20(enum sfx_e uid, f32 arg1, f32 arg2, u32 arg3, u32 arg4);
u8 func_8030ED2C(enum sfx_e uid, s32 arg1);
void fileProgressFlag_setN(s32, s32, s32);
void fileProgressFlag_setN(enum file_progress_e, s32, s32);
Actor *marker_getActorAndRotation(ActorMarker *marker, f32 rotation[3]);
Actor *func_80325934(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
Actor *actor_drawFullDepth(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -406,7 +406,7 @@ int func_80328A2C(Actor *, f32, s32, f32);
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);
void subaddie_set_state_with_direction(Actor * this, s32 myAnimId, f32 anim_start_position, s32 direction);
bool subaddie_maybe_set_state_position_direction(Actor *, s32, f32, s32, f32 );
void func_80328CEC(Actor *, s32, s32, s32);
void func_80328FB0(Actor *, f32);
@@ -499,7 +499,7 @@ void actor_playAnimationOnce(Actor *);
void actor_loopAnimation(Actor *);
/* used in fight */
void func_80326224(Actor *this);
void actor_update_func_80326224(Actor *this);
void func_802F9FD0(s32, f32, f32, f32);
void func_80324D54(f32, enum sfx_e, f32, s32, f32 [3], f32, f32);
@@ -526,7 +526,7 @@ extern void subaddie_set_state_forward(Actor *, s32);
extern BKModelBin *marker_loadModelBin(ActorMarker *this);
extern Struct70s *func_8034C2C4(ActorMarker *marker, s32 arg1);
extern void func_80326310(Actor *this);
extern void func_80326310(Actor *this); // actor_setBlendStateFadeOut ??
extern ActorMarker *marker_init(s32 *pos, MarkerDrawFunc draw_func, int arg2, int marker_id, int arg4);
extern s32 asset_getFlag(enum asset_e arg0);
extern void spawnableActorList_add(ActorInfo *arg0, Actor *(*arg1)(s32[3], s32, ActorInfo *, u32), u32 arg2);
@@ -535,11 +535,11 @@ extern void marker_setActorUpdateFunc(ActorMarker *marker, ActorUpdateFunc metho
extern void marker_setActorUpdate2Func(ActorMarker *marker, ActorUpdateFunc method);
extern void marker_callCollisionFunc(ActorMarker *, ActorMarker *, enum marker_collision_func_type_e);
extern enum marker_collision_func_type_e func_8033D574(struct5Cs *arg0);
extern s32 volatileFlag_get(s32);
extern s32 volatileFlag_getN(s32 index, s32 numBits);
extern s32 volatileFlag_getAndSet(s32 index, s32 arg1);
extern void volatileFlag_set(s32 index, s32 set);
extern void volatileFlag_setN(s32 startIndex, s32 set, s32 length);
extern s32 volatileFlag_get(enum volatile_flags_e);
extern s32 volatileFlag_getN(enum volatile_flags_e index, s32 numBits);
extern s32 volatileFlag_getAndSet(enum volatile_flags_e index, s32 arg1);
extern void volatileFlag_set(enum volatile_flags_e index, s32 set);
extern void volatileFlag_setN(enum volatile_flags_e startIndex, s32 set, s32 length);
extern void itemscore_noteScores_clear(void);
extern s32 itemscore_noteScores_get(enum level_e lvl_id);

10
include/prop.h
View File

@@ -165,10 +165,10 @@ typedef struct actor_s{
u32 is_bundle:1;
AnimCtrl *animctrl;
ActorAnimationInfo *unk18;
TUPLE(f32, unk1C); // actor position?
TUPLE(f32, unk1C); // actor position? // used as "home" for chbat
f32 actor_specific_1_f; //used in cheggs
TUPLE(f32, velocity);
u32 unk38_31:10;
u32 unk38_31:10; // hit count for jinjo base in fight
u32 unk38_21:9;
u32 unk38_13:9;
u32 stored_animctrl_playbackType_:3; //animctrlPlaybackType
@@ -230,10 +230,12 @@ typedef struct actor_s{
u32 unkF4_22:1;
u32 initialized:1; //unkF4_21;
u32 unkF4_20:12;
u32 unkF4_8:9;
u32 unkF4_8:9; /* jinjo id in final fight.
* Is used to determine file progress related stuff, can also be a file_progress_e
*/
f32 stored_animctrl_subrangeMin; //animCtrl_SubRangeStart
f32 stored_animctrl_subrangeMax; //animCtrl_SubRangeEnd
ActorMarker *unk100;
ActorMarker *unk100; // child actor marker ?
ActorMarker *unk104;
Struct62s *unk108;
// void ( *unk108)(struct actorMarker_s *, s32); //saved from marker->collisionFunc

48
include/structs.h
View File

@@ -384,41 +384,41 @@ typedef struct particle_scale_and_lifetime_ranges_s{
} ParticleScaleAndLifetimeRanges;
typedef struct struct_32_s{
f32 unk0[3];
f32 unkC[3];
} struct32s;
f32 min[3];
f32 max[3];
} ParticleSettingsVelocity;
typedef struct struct_33_s{
f32 unk0[3];
f32 unkC[3];
} struct33s;
f32 min[3];
f32 max[3];
} ParticleSettingsAcceleration;
typedef struct struct_34_s{
f32 unk0[3];
f32 unkC[3];
} struct34s;
f32 min[3];
f32 max[3];
} ParticleSettingsSpawnPosition;
typedef struct struct_40_s{
ParticleScaleAndLifetimeRanges unk0;
f32 unk28;
f32 unk2C;
} struct40s;
ParticleScaleAndLifetimeRanges scale_and_lifetime;
f32 drawmode;
f32 count;
} ParticleSettingsScaleAndLifetimeDrawModeEmitCount;
typedef struct struct_41_s{
struct32s unk0;
struct33s unk18;
} struct41s;
ParticleSettingsVelocity velocity;
ParticleSettingsAcceleration acceleration;
} ParticleSettingsVelocityAcceleration;
typedef struct struct_42_s{
struct32s unk0;
struct34s unk18;
} struct42s;
ParticleSettingsVelocity velocity;
ParticleSettingsSpawnPosition spawn_position;
} ParticleSettingsVelocityPosition;
typedef struct struct_43_s{
struct32s unk0;
struct33s unk18;
struct34s unk30;
} struct43s;
ParticleSettingsVelocity velocity;
ParticleSettingsAcceleration acceleration;
ParticleSettingsSpawnPosition spawn_position;
} ParticleSettingsVelocityAccelerationPosition;
typedef struct {
u32 unk0_31:11;
@@ -593,7 +593,7 @@ typedef struct struct_68_s{
Struct68DrawMethod unk8;
BKModelBin *unkC;
u8 pad10[0x4];
f32 unk14[3]; //position
f32 position[3];
f32 unk20[3]; //rotation
f32 unk2C; //scale
u8 unk30;