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

All Changes

Browse Source
This commit is contained in:
Moses Troyer
2025-08-16 17:15:49 +00:00
committed by Banjo Kazooie
parent fd208f77ca
commit c2dd933d22
389 changed files with 7824 additions and 6965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/bsint.h
View File

@@ -39,7 +39,7 @@ enum bs_interrupt_e {
BS_INTR_1C,
BS_INTR_1D,
BS_INTR_1E,
BS_INTR_1F,
BS_INTR_1F_HAZARD,
BS_INTR_20,
BS_INTR_21,
BS_INTR_22,

2
include/core1/pfsmanager.h
View File

@@ -36,7 +36,7 @@ f32 func_8024E420(s32 arg0, s32 arg1, s32 arg2);
void controller_copyFaceButtons(s32 controller_index, s32 dst[6]);
void pfsManager_getFirstControllerFaceButtonState(s32 controller_index, s32 dst[6]);
s32 func_8024E5E8(s32 arg0, s32 arg1);
s32 func_8024E60C(s32 controller_index, s32 dst[3]);
s32 controller_copySideButtons(s32 controller_index, s32 dst[3]);
s32 func_8024E640(s32 controller_index, s32 dst[3]);
f32 func_8024E668(s32 controller_index);
s32 controller_getStartButton(s32 controller_index);

15
include/core2/abilityprogress.h Normal file
View File

@@ -0,0 +1,15 @@
enum ability_used {
ABILITY_USED_JUMP = 0x0,
ABILITY_USED_FLAP = 0x1,
ABILITY_USED_FLIP = 0x2,
ABILITY_USED_SWIM = 0x3,
ABILITY_USED_CLIMB = 0x4,
ABILITY_USED_BEAK_BARGE = 0x5,
ABILITY_USED_SLIDE = 0x6,
ABILITY_USED_EGG = 0x7,
ABILITY_USED_FLY = 0x8,
ABILITY_USED_SHOCK = 0x9,
ABILITY_USED_PECK = 0xA,
ABILITY_USED_CLAW = 0xB,
ABILITY_USED_TWIRL = 0xC
};

75
include/core2/commonParticle.h Normal file
View File

@@ -0,0 +1,75 @@
#ifndef CORE2_COMMON_PARTICLE_H
#define CORE2_COMMON_PARTICLE_H
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/anim/sprite.h"
#define PARTICLE_LIMIT 40
typedef s32 (*FuncUnk40)(ActorMarker *, s32, f32[3]);
enum common_particle_e {
COMMON_PARTICLE_1_EGG_HEAD = 1,
COMMON_PARTICLE_2 = 2,
COMMON_PARTICLE_3 = 3,
COMMON_PARTICLE_4_EGG_ASS = 4,
COMMON_PARTICLE_5 = 5,
COMMON_PARTICLE_6 = 6,
COMMON_PARTICLE_7 = 7,
COMMON_PARTICLE_8_JIGGY_SHINE = 8,
COMMON_PARTICLE_9 = 9,
COMMON_PARTICLE_A = 10,
COMMON_PARTICLE_B = 11,
COMMON_PARTICLE_C = 12,
COMMON_PARTICLE_D = 13,
COMMON_PARTICLE_E = 14,
COMMON_PARTICLE_F = 15,
COMMON_PARTICLE_10 = 16,
COMMON_PARTICLE_11 = 17
};
typedef struct particle_struct_s {
f32 unk0;
f32 unk4;
f32 unk8;
f32 unkC;
f32 unk10;
f32 unk14;
u8 pad18[8];
s32 unk20;
s32 unk24;
s32 unk28;
u8 pad24[0x4];
ActorMarker *marker_30;
AnimSprite *animSprite;
ActorMarker *actorMarker;
s32 unk3C;
FuncUnk40 unk40;
u8 isInUse;
u8 projectileIndex;
u8 typeMapIndex;
u8 unk47;
} CommonParticle;
ActorMarker *commonParticle_getCurrentActorMarker(void);
FuncUnk40 func_8033E888(void);
u8 commonParticle_getCurrentProjectileIndex(void);
AnimSprite *commonParticle_getCurrentAnimSprite(void);
CommonParticle *commonParticle_getCurrentParticle(void);
void commonParticle_setCurrentInUseFalse(void);
void projectile_setSprite(u8, enum asset_e);
void func_8033FC34(u8, s32);
void projectile_setColor(u8, s32, s32, s32);
void func_8033FCD8(u8, s32);
void projectile_setRotation(u8, f32[3]);
void projectile_addRoll(u8, f32);
void projectile_setPosition(u8, f32[3]);
void func_8033FFE4(u8, s32, s32);
void func_80344E18(u8, s32);
void func_80344E3C(u8, f32[3]);
void func_80344D94(u8, f32[3]);
void func_80344EE4(u8, f32, f32);
#endif

10
include/core2/dustemitter.h Normal file
View File

@@ -0,0 +1,10 @@
#define EMITTER_COUNT 3
#define EMITTER_CAPACITY 0x20
enum dust_emitter_type_e {
DUST_EMITTER_TYPE_DUST = 0,
DUST_EMITTER_TYPE_BREAK_DUST = 1
};
extern void dustEmitter_empty(ParticleEmitter *);
extern void dustEmitter_emit(f32[3], f32[3], s32[4], bool, f32, f32, s32, s32, enum dust_emitter_type_e);

2
include/core2/particle.h
View File

@@ -12,7 +12,7 @@ void particleEmitter_setAlpha(ParticleEmitter *this, s32 alpha);
void particleEmitter_setSfx(ParticleEmitter *this, enum sfx_e sfx_id, s32 arg2);
void func_802EFA04(ParticleEmitter *this, f32);
void particleEmitter_setParticleCallback(ParticleEmitter *this, void (*arg1)(ParticleEmitter *this, f32 pos[3]));
void func_802EFA20(ParticleEmitter *this, f32, f32);
void particleEmitter_func_802EFA20(ParticleEmitter *this, f32, f32);
void func_802EFA34(ParticleEmitter *this, f32);
void func_802EFA40(ParticleEmitter *this, f32 (*)[3]);
void particleEmitter_func_802EFA78(ParticleEmitter *this, s32 arg1);

20
include/core2/particleemittermanager.h Normal file
View File

@@ -0,0 +1,20 @@
#define MAX_EMITTER_COUNT 16 // Effectively reduced by 1, as 0 is saved for an in-progress initialization and empty
typedef struct {
f32 freeTime;
ParticleEmitter *emitter;
u32 isActive: 1;
u32 capacity: 10;
u32 padding: 21;
} EmitterData;
ParticleEmitter *pem_getEmitterByIndex(u8 index);
u8 pem_newEmitter(s32 count);
void pem_freeAll(void);
void pem_setAllInactive(void);
void pem_free(u8 arg0);
void pem_updateAll(void);
void pem_freeEmitters(void);
void pem_defragAll(void);
void pem_freeDependencies(void);
void pem_initDependencies(void);

2
include/core2/statetimer.h
View File

@@ -9,7 +9,7 @@ enum state_timer_e{
STATE_TIMER_1_THROW = 1,
STATE_TIMER_2_LONGLEG,
STATE_TIMER_3_TURBO_TALON,
STATE_TIMER_4_UNKNOWN,
STATE_TIMER_4_IFRAME,
STATE_TIMER_5_UNKNOWN, //slide timer
STATE_TIMER_6_UNKNOWN //trot slide timer
};

5
include/core2/staticcamera.h Normal file
View File

@@ -0,0 +1,5 @@
enum static_camera_id_s {
MM_ORANGE_PAD_JIGGY_SPAWN_TOP = 0xE,
MM_ORANGE_PAD_JIGGY_SPAWN_LEFT = 0xF,
MM_ORANGE_PAD_JIGGY_SPAWN_RIGHT = 0x10
};

342
include/enums.h
View File

@@ -29,7 +29,7 @@ enum file_progress_e {
FILEPROG_C_EXTRA_LIFE_TEXT,
FILEPROG_D_BEEHIVE_TEXT,
FILEPROG_E_JINJO_TEXT,
FILEPROG_F_HAS_TOUCHED_PIRAHANA_WATER,
FILEPROG_F_HAS_TOUCHED_PIRANHA_WATER,
FILEPROG_10_HAS_TOUCHED_SAND_EEL_SAND,
FILEPROG_11_HAS_MET_MUMBO,
FILEPROG_12_HAS_TRANSFORMED_BEFORE,
@@ -129,7 +129,7 @@ enum file_progress_e {
FILEPROG_92_PAID_WALRUS_COST,
FILEPROG_93_PAID_CROC_COST,
FILEPROG_94_PAID_BEE_COST,
FILEPROG_95_UNKNOWN,
FILEPROG_95_UNUSED_UNKNOWN_ITEM_COLLECT,
FILEPROG_96_MET_BRENTILDA,
FILEPROG_97_ENTERED_LAIR_TEXT,
FILEPROG_98_EXITED_LEVEL_TEXT,
@@ -438,15 +438,17 @@ enum level_flags_e
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_1C_MM_OPEN = 0x1C, // See jigsawpicture.c
LEVEL_FLAG_1D_TTC_OPEN,
LEVEL_FLAG_1E_CC_OPEN,
LEVEL_FLAG_1F_BGS_OPEN,
LEVEL_FLAG_20_FP_OPEN,
LEVEL_FLAG_21_GV_OPEN,
LEVEL_FLAG_22_MMM_OPEN,
LEVEL_FLAG_23_RBB_OPEN,
LEVEL_FLAG_24_CCW_OPEN,
LEVEL_FLAG_25_CCW_UNKNOWN,
LEVEL_FLAG_26_FP_UNKNOWN,
LEVEL_FLAG_27_RBB_UNKNOWN,
@@ -464,12 +466,14 @@ enum level_flags_e
LEVEL_FLAG_33_MMM_UNKNOWN,
LEVEL_FLAG_34_UNKNOWN,
LEVEL_FLAG_35_UNKNOWN = 0x35,
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
LEVEL_FLAG_3F_LAIR_GRUNTY_DOOR_OPEN
};
enum transformation_e
@@ -1446,10 +1450,10 @@ enum sfx_e
SFX_191_STATIC,
SFX_3E9_UNKNOWN = 0x3e9, //bsbwhirl
SFX_3EA_UNKNOWN, //chjig
SFX_3EA_BANJO_GUH_HUH, //chjig
SFX_3EB_UNKNOWN, //bstimeout
SFX_3EC_CCW_DOOR_OPENING, //ccw and GV opening
SFX_3ED,
SFX_3ED_BUBBLE_POP,
SFX_3EE,
SFX_3EF,
SFX_3F0_FLIBBIT_TALKING,
@@ -1481,7 +1485,7 @@ enum sfx_e
SFX_414_XMAS_GIFT_TALKING,
SFX_415_UNKNOWN, //xmas tree
SFX_416,
SFX_417_UNKNOWN, //lair/func_8038EB94, double health
SFX_417_DOUBLE_HEALTH_UPGRADE,
SFX_419_UNKNOWN = 0x419,
SFX_41A_UNKNOWN = 0x41a
@@ -1890,7 +1894,7 @@ enum actor_e
ACTOR_F0_PINK_EGG_SMALLEST,
ACTOR_F1_LEAF_BOAT,
ACTOR_F2_BLACK_SNIPPET,
ACTOR_F3_EXPLOSION_RIPPLE,
ACTOR_F4_BURIED_TREASURE = 0xF4,
ACTOR_F5_MUTIE_SNIPPET,
ACTOR_F6_BIG_ALLIGATOR,
@@ -1993,6 +1997,8 @@ enum actor_e
ACTOR_181_SCARF_SLED = 0x181,
ACTOR_182_RACE_SLED = 0x182,
ACTOR_188_PIRANHA_WATER_PARTICLES = 0x188,
ACTOR_198_BANJOS_BED = 0x198,
ACTOR_199_BANJOS_CHAIR,
ACTOR_19A_BANJOS_STOVE,
@@ -2276,7 +2282,7 @@ enum bundle_e {
BUNDLE_1D__HONEYCOMB,
BUNDLE_1E__JIGGY,
BUNDLE_1F_SM_EMPTY_HONEYCOMB,
BUNDLE_20__UNKOWN,
BUNDLE_20__UNKNOWN,
BUNDLE_21__ICECUBE_B,
BUNDLE_22__HONEYCOMB,
BUNDLE_23__HONEYCOMB,
@@ -2285,46 +2291,45 @@ enum bundle_e {
BUNDLE_26__HONEYCOMB
};
enum bs_e
{
BS_0_NONE = 0,
enum bs_e {
BS_0_NONE = 0x0,
BS_1_IDLE = 0x1,
BS_2_WALK_SLOW,
BS_2_WALK_SLOW = 0x2,
BS_WALK = 0x3,
BS_4_WALK_FAST = 0x4,
BS_5_JUMP,
BS_5_JUMP = 0x5,
BS_CLAW = 0x6,
BS_CROUCH = 0x7,
BS_8_BTROT_JUMP,
BS_9_EGG_HEAD,
BS_A_EGG_ASS,
BS_B_UNKOWN,
BS_8_BTROT_JUMP = 0x8,
BS_9_EGG_HEAD = 0x9,
BS_A_EGG_ASS = 0xA,
BS_B_UNKOWN = 0xB,
BS_SKID = 0xC,
BS_D_TIMEOUT,
BS_E_OW,
BS_F_BBUSTER,
BS_D_TIMEOUT = 0xD,
BS_E_OW = 0xE,
BS_F_BBUSTER = 0xF,
BS_BFLAP = 0x10,
BS_11_BPECK,
BS_12_BFLIP,
BS_BBARGE = 0x13,
BS_14_BTROT_ENTER,
BS_15_BTROT_IDLE,
BS_16_BTROT_WALK,
BS_17_BTROT_EXIT ,
BS_18_FLY_KNOCKBACK,
BS_11_BPECK = 0x11,
BS_12_BFLIP = 0x12,
BS_BBARGE = 0x13,
BS_14_BTROT_ENTER = 0x14,
BS_15_BTROT_IDLE = 0x15,
BS_16_BTROT_WALK = 0x16,
BS_17_BTROT_EXIT = 0x17,
BS_18_FLY_KNOCKBACK = 0x18,
BS_1A_WONDERWING_ENTER = 0x1A,
BS_1B_WONDERWING_IDLE,
BS_1C_WONDERWING_WALK,
BS_1D_WONDERWING_JUMP,
BS_1E_WONDERWING_EXIT,
BS_1B_WONDERWING_IDLE = 0x1B,
BS_1C_WONDERWING_WALK = 0x1C,
BS_1D_WONDERWING_JUMP = 0x1D,
BS_1E_WONDERWING_EXIT = 0x1E,
BS_WALK_CREEP = 0x1F,
BS_20_LANDING = 0x20,
BS_BSHOCK_CHARGE = 0x21,
BS_BSHOCK_JUMP = 0x22,
BS_23_FLY_ENTER,
BS_24_FLY,
BS_25_LONGLEG_ENTER,
BS_23_FLY_ENTER = 0x23,
BS_24_FLY = 0x24,
BS_25_LONGLEG_ENTER = 0x25,
BS_26_LONGLEG_IDLE = 0x26,
BS_LONGLEG_WALK = 0x27,
BS_LONGLEG_JUMP = 0x28,
@@ -2338,89 +2343,87 @@ enum bs_e
BS_30_DIVE_ENTER = 0x30,
BS_ROLL = 0x31,
BS_SLIDE = 0x32,
//unk33,
BS_34_JIG_NOTEDOOR = 0x34,
BS_35_ANT_IDLE,
BS_35_ANT_IDLE = 0x35,
BS_ANT_WALK = 0x36,
BS_ANT_JUMP = 0x37,
BS_38_ANT_FALL,
BS_39_DIVE_A,
BS_3A_CARRY_IDLE,
BS_3B_CARRY_WALK,
BS_3C_TALK,
BS_3D_FALL_TUMBLING,
BS_3E_ANT_OW,
BS_3F,
BS_40_PUMPKIN_FLUSH,
BS_41_DIE,
BS_42_DINGPOT,
BS_43_ANT_DIE,
BS_44_JIG_JIGGY,
BS_45_BTROT_SLIDE,
//unk46
//unk47
BS_38_ANT_FALL = 0x38,
BS_39_DIVE_A = 0x39,
BS_3A_CARRY_IDLE = 0x3A,
BS_3B_CARRY_WALK = 0x3B,
BS_3C_TALK = 0x3C,
BS_3D_FALL_TUMBLING = 0x3D,
BS_3E_ANT_OW = 0x3E,
BS_3F = 0x3F,
BS_40_PUMPKIN_FLUSH = 0x40,
BS_41_DIE = 0x41,
BS_42_DINGPOT = 0x42,
BS_43_ANT_DIE = 0x43,
BS_44_JIG_JIGGY = 0x44,
BS_45_BTROT_SLIDE = 0x45,
BS_48_PUMPKIN_IDLE = 0x48,
BS_49_PUMPKIN_WALK = 0x49,
BS_4A_PUMPKIN_JUMP = 0x4A,
BS_4B_PUMPKIN_FALL = 0x4B,
BS_4C_LANDING_IN_WATER = 0x4c,
BS_4C_LANDING_IN_WATER = 0x4C,
BS_4D_PUMPKIN_OW = 0x4D,
BS_4E_PUMPKIN_DIE = 0x4E,
BS_4F_CLIMB_IDLE,
BS_50_CLIMB_MOVE,
BS_51_CLIMB_EXIT,
//unk52 //tumblar??? a.k.a bssurf
BS_4F_CLIMB_IDLE = 0x4F,
BS_50_CLIMB_MOVE = 0x50,
BS_51_CLIMB_EXIT = 0x51,
BS_52_UNKNOWN = 0x52, //tumblar??? a.k.a bssurf
BS_53_TIMEOUT = 0x53,
BS_54_SWIM_DIE = 0x54,
BS_LONGLEG_SLIDE = 0x55,
BS_56_RECOIL = 0x56,
BS_57_BOMB_END = 0x57,
BS_58_BEAKBOMB_CRASH,
BS_58_BEAKBOMB_CRASH = 0x58,
BS_59_BFLY_UNK59 = 0x59,
BS_5A_LOADZONE = 0x5A,
BS_CARRY_THROW = 0x5B,
BS_5E_CROC_IDLE = 0x5E,
BS_CROC_WALK = 0x5F,
BS_CROC_JUMP = 0x60,
BS_61_CROC_FALL = 0x61,
BS_62_LONGLEG_LOCKED = 0x62,
BS_CROC_OW = 0x63,
BS_CROC_DIE = 0x64,
BS_CROC_OW = 0x63,
BS_CROC_DIE = 0x64,
BS_67_WALRUS_IDLE = 0x67,
BS_WALRUS_WALK = 0x68,
BS_WALRUS_JUMP = 0x69,
BS_6A_WALRUS_FALL = 0x6A,
BS_6B_BEE_LOCKED,
//unk0x6B //[107] = "Locked", -- Bee, Mumbo Transform Cutscene
BS_6B_BEE_LOCKED = 0x6B, //[107] = "Locked", -- Bee, Mumbo Transform Cutscene
BS_WALRUS_OW = 0x6C,
BS_WALRUS_DIE = 0x6D,
BS_6E_CROC_BITE = 0x6E,
BS_CROC_EAT_BAD = 0x6F,
BS_70_CROC_EAT_GOOD = 0x70,
BS_71_BTROT_FALL = 0x71,
BS_SPLAT = 0x72, //get up after fall damage
BS_73_UNKNOWN = 0x73,
BS_74_UNKNOWN = 0x74,
BS_75_UNKNOWN = 0x75,
//0x73 locked_cutscene
//0x74 locked jiggypad, xform, bottles
//0x75 locked bottles
BS_SPLAT = 0x72, // Getting up after fall damage
BS_73_UNKNOWN = 0x73, // locked_cutscene
BS_74_UNKNOWN = 0x74, // locked jiggypad, xform, bottles
BS_75_UNKNOWN = 0x75, // locked bottles
BS_76_BFLY_LOCKED = 0x76,
BS_77_SWIM_LOCKED = 0x77, //0x77 locked swim
BS_78_DIVE_LOCKED = 0x78,//0x78 locked dive
BS_79_BTROT_LOCKED,
BS_WALK_MUD,
BS_BTROT_OW,
BS_7C_SLED,
BS_7D_WALRUS_SLED,
BS_7E_WALRUS_SLED,
BS_77_SWIM_LOCKED = 0x77,
BS_78_DIVE_LOCKED = 0x78,
BS_79_BTROT_LOCKED = 0x79,
BS_WALK_MUD = 0x7A,
BS_BTROT_OW = 0x7B,
BS_7C_SLED = 0x7C,
BS_7D_WALRUS_SLED = 0x7D,
BS_7E_WALRUS_SLED = 0x7E,
BS_7F_DIVE_OW = 0x7F,
BS_80_WALRUS_SLED_LOSE,
BS_80_WALRUS_SLED_LOSE = 0x80,
BS_81_WALRUS_SLED_LOCKED = 0x81,
BS_82_WALRUS_SLED_LOSE_IN_AIR,
BS_82_WALRUS_SLED_LOSE_IN_AIR = 0x82,
BS_85_BEE_IDLE = 0x85,
BS_BEE_WALK = 0x86,
@@ -2429,32 +2432,32 @@ enum bs_e
BS_BEE_OW = 0x89,
BS_BEE_DIE = 0x8A,
BS_BEE_FLY = 0x8c,
BS_BEE_FLY = 0x8C,
BS_8D_CROC_LOCKED = 0x8D,
BS_8E_ANT_LOCKED = 0x8E, //"Locked", -- Jiggy podium, Bottles' text outside Mumbo's
BS_8E_ANT_LOCKED = 0x8E, // "Locked", -- Jiggy podium, Bottles' text outside Mumbo's
BS_8F_PUMPKIN_LOCKED = 0x8F,
BS_FLY_OW = 0x91,
BS_92_ANT_DRONE,
BS_93_PUMPKIN_DRONE,
BS_94_CROC_DRONE,
BS_95_WALRUS_DRONE,
BS_96_SWIM_LOCKED,
BS_97_DIVE_LOCKED,
BS_98_WALK_DRONE,
BS_99_BFLY_DRONE,
BS_9A_BTROT_DRONE,
BS_92_ANT_DRONE = 0x92,
BS_93_PUMPKIN_DRONE = 0x93,
BS_94_CROC_DRONE = 0x94,
BS_95_WALRUS_DRONE = 0x95,
BS_96_SWIM_LOCKED = 0x96,
BS_97_DIVE_LOCKED = 0x97,
BS_98_WALK_DRONE = 0x98,
BS_99_BFLY_DRONE = 0x99,
BS_9A_BTROT_DRONE = 0x9A,
BS_9B_LONGLEG_DRONE = 0x9B,
BS_9C_WALRUS_SLED_DRONE = 0x9C,
BS_9D_BEE_DRONE = 0x9D,
BS_9E_CLIMB_LOCKED,
BS_9E_CLIMB_LOCKED = 0x9E,
BS_ANT_BOUNCE = 0x9F,
BS_PUMPKIN_BOUNCE = 0xA0,
BS_CROC_BOUNCE = 0xA1,
BS_WALRUS_BOUNCE = 0xA2,
BS_BEE_BOUNCE = 0xA3,
BS_A4_WONDERWING_DRONE = 0xA4,
BS_A5_WONDERWING_UNKA5
BS_A5_WONDERWING_UNKA5 = 0xA5
};
enum sm_specific_flags {
@@ -2467,7 +2470,7 @@ enum sm_specific_flags {
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_A_ABILITY_FLIP_UNLOCKED,
SM_SPECIFIC_FLAG_C = 0xC, // learned all attack moves
@@ -2483,7 +2486,7 @@ enum mm_specific_flags {
MM_SPECIFIC_FLAG_3_CHIMPY_HAS_LEAVED,
MM_SPECIFIC_FLAG_4_SHAKE,
MM_SPECIFIC_FLAG_6_UNKNOWN = 0x6,
MM_SPECIFIC_FLAG_CONGA_WARNED_BLOCKS = 0x6,
MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE = 0x8,
MM_SPECIFIC_FLAG_9_JUJU_HAS_HALF_TURNED,
@@ -2501,6 +2504,21 @@ enum ttc_specific_flags {
TTC_SPECIFIC_FLAG_7_NIPPER_FIRST_MEET_TEXT_SHOWN = 0x7
};
enum bgs_specific_flags {
BGS_SPECIFIC_FLAG_1 = 1,
BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_RESET = 2,
BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_TIMER_RUNNING = 3,
BGS_SPECIFIC_FLAG_WALKWAY_JIGGY = 4,
BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_SWITCH_PRESSED = 5,
BGS_SPECIFIC_FLAG_7 = 7,
BGS_SPECIFIC_FLAG_8 = 8,
BGS_SPECIFIC_FLAG_MAZE_JIGGY_SWITCH_PRESSED = 9,
BGS_SPECIFIC_FLAG_A = 0xA,
BGS_SPECIFIC_FLAG_MAZE_JIGGY_RESET = 0xB,
BGS_SPECIFIC_FLAG_MAZE_JIGGY_TIMER_RUNNING = 0xC,
BGS_SPECIFIC_FLAG_MAZE_JIGGY = 0xD
};
enum mmm_specific_flags {
MMM_SPECIFIC_FLAG_0_UNKNOWN,
MMM_SPECIFIC_FLAG_TUMBLAR_BROKEN,
@@ -2508,7 +2526,7 @@ enum mmm_specific_flags {
MMM_SPECIFIC_FLAG_3_UNKNOWN,
MMM_SPECIFIC_FLAG_4_UNKNOWN,
MMM_SPECIFIC_FLAG_5_UNKNOWN,
MMM_SPECIFIC_FLAG_6_UNKNOWN,
MMM_SPECIFIC_FLAG_CONGA_WARNED_BLOCKS,
MMM_SPECIFIC_FLAG_7_UNKNOWN
};
@@ -4203,6 +4221,8 @@ enum asset_e
ASSET_89D_ZOOMBOX_SPRITE = 0x89D,
ASSET_89F_MODEL_ORANGE_PARTICLE = 0x89F,
ASSET_8A0_SPRITE_WATER_DROP = 0x8A0,
ASSET_A0B_DIALOG_BLUBBER_FIRST_MEET = 0xA0B,
@@ -4222,7 +4242,7 @@ enum asset_e
ASSET_A1F_DIALOG_SHOCKJUMP_LEARN = VER_SELECT(0xa1f, 0x91f, 0, 0),
ASSET_A20_DIALOG_FLY_LEARN,
ASSET_A21_DIALOG_BLUBBER_MEET,
ASSET_A21_DIALOG_BLUBBER_TREASURE_MEET,
ASSET_A22_DIALOG_FLY_REFRESHER,
ASSET_A23_DIALOG_SHOCKJUMP_REFRESHER,
ASSET_A24_DIALOG_JUMP_PAD_DISCOVERED,
@@ -4257,6 +4277,8 @@ enum asset_e
ASSET_A84_DIALOG_TURBOTRAINERS_LEARN,
ASSET_A85_DIALOG_TURBOTRAINERS_REFRESHER,
ASSET_A88_DIALOG_GRUNTY_GV_MISS_TRAPDOOR = 0xA88,
ASSET_AD3_DIALOG_UNKNOWN = 0xad3,
ASSET_AD4_DIALOG_UNKNOWN,
ASSET_AD5_DIALOG_UNKNOWN,
@@ -4269,6 +4291,8 @@ enum asset_e
ASSET_ADE_DIALOG_LOGGO_AS_BEAR,
ASSET_ADF_DIALOG_ENTER_LOGGO,
ASSET_AE0_DIALOG_EXIT_LOGGO,
ASSET_AE1_DIALOG_GRUNTY_MMM_THORNS,
ASSET_AE2_DIALOG_GRUNTY_MMM_MISS_CHRUCH_DOOR,
ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE = 0xb37,
ASSET_B38_DIALOG_CONGA_DEFEAT,
@@ -4276,7 +4300,7 @@ enum asset_e
ASSET_B3A_DIALOG_CONGA_HITS_PLAYER,
ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY,
ASSET_B3C_DIALOG_CONGA_MEET,
ASSET_B3D_DIALOG_CONGA_DONT_TOUCH_BLOCKS,
ASSET_B3E_DIALOG_CONGA_MEET_AS_TERMITE = VER_SELECT(0xb3e, 0x95c, 0, 0),
ASSET_B3F_DIALOG_CHIMPY_MEET,
ASSET_B40_DIALOG_CHIMPY_COMPLETE,
@@ -4285,20 +4309,25 @@ enum asset_e
ASSET_B43_DIALOG_TERMITE_MEET_AS_BEAR,
ASSET_B44_DIALOG_JUJU_MEET,
ASSET_B45_DIALOG_JIGGY_COLLECT_10,
ASSET_B47_DIALOG_EGGS_LEARN = 0xb47,
ASSET_B46_DIALOG_COLLECT_ORANGE,
ASSET_B47_DIALOG_EGGS_LEARN = 0xB47,
ASSET_B48_DIALOG_BEAKBUSTER_LEARN,
ASSET_B49_DIALOG_TALON_TROT_LEARN,
ASSET_B4A_DIALOG_TALON_TROT_REFRESHER,
ASSET_B4B_DIALOG_EGGS_REFRESHER,
ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER,
ASSET_B4D_DIALOG_UNKNOWN,
ASSET_B4D_DIALOG_BOTTLES_SLIPPERY,
ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED = 0xB4E,
ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL = 0xb51,
ASSET_B50_DIALOG_BOTTLES_UNUSED_UNKNOWN_ITEM_COLLECT = 0xB50,
ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL = 0xB51,
ASSET_B9F_DIALOG_UNKNOWN = 0xb9f,
ASSET_BA0_DIALOG_GRUNTY_RBB_RED_HOT_OVENS = 0xBA0,
ASSET_BA1_DIALOG_GRUNTY_RBB_WATER_SWIM = 0xBA1,
ASSET_BA2_DIALOG_GRUNTY_RBB_WATER_DIVE = 0xBA2,
ASSET_BA3_DIALOG_GRUNTY_RBB_OILY_SCUM_UNUSED = 0xBA3,
ASSET_BFF_DIALOG_UNKNOWN = 0xbff,
@@ -4311,6 +4340,8 @@ enum asset_e
ASSET_C09_DIALOG_UNKNOWN,
ASSET_C0A_DIALOG_UNKNOWN,
ASSET_C11_DIALOG_FREEZING_WATER = 0xC11,
ASSET_C15_DIALOG_TWINKLIE_MINIGAME_LOST = 0xc15,
ASSET_C17_DIALOG_UNKNOWN = 0xC17,
@@ -4318,8 +4349,8 @@ enum asset_e
ASSET_C19_DIALOG_UNKNOWN,
ASSET_C1A_DIALOG_UNKNOWN,
ASSET_C1E_DIALOG_UNKNOWN = 0xc1e,
ASSET_C1F_DIALOG_UNKNOWN,
ASSET_C1E_DIALOG_BOGGY_LOOK_FOR_PRESENTS = 0xc1e,
ASSET_C1F_DIALOG_BOGGY_NEEDS_SLEEP,
ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE = 0xC20,
ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN,
@@ -4358,11 +4389,14 @@ enum asset_e
text_flibbits_defeat = 0xc82,
text_flibbits_return = 0xc83,
ASSET_C85_DIALOG_PIRANHA_WATER = 0xC85,
ASSET_C86_DIALOG_UNKNOWN = 0xc86,
ASSET_C88_DIALOG_LONGLEG_LEARN = 0xC88,
ASSET_C89_DIALOG_LONGLEG_REFRESHER,
ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED,
ASSET_C8B_DIALOG_GRUNTY_BGS_MISS_WALKWAY_JIGGY,
ASSET_C8C_DIALOG_GRUNTY_BGS_MISS_MAZE_JIGGY,
ASSET_C8D_DIALOG_MR_VILE_EXTRA_CHALLENGE_INTRO = 0xC8D,
ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1,
@@ -4379,6 +4413,10 @@ enum asset_e
ASSET_CC7_DIALOG_UNKNOWN = 0xcc7,
ASSET_CE6_DIALOG_GRUNTY_MMM_BRAMBLES = 0xCE6,
ASSET_CE7_DIALOG_GRUNTY_CCW_ICY_WATER_SWIM = 0xCE7,
ASSET_CE8_DIALOG_GRUNTY_CCW_ICY_WATER_UNUSED = 0xCE8,
ASSET_D2B_DIALOG_UNKNOWN = 0xd2b,
ASSET_D32_DIALOG_MUTANT_CRAB_MEET = 0xD32,
@@ -4387,7 +4425,7 @@ enum asset_e
ASSET_D35_DIALOG_WONDERWING_LEARN,
ASSET_D36_DIALOG_WONDERWING_REFRESHER,
ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED,
ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED,
ASSET_D38_DIALOG_EMPTY,
ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH,
ASSET_D8F_DIALOG_MUMBO_MEET = 0xD8F,
@@ -4403,6 +4441,14 @@ enum asset_e
ASSET_D99_DIALOG_JINJO_MEET_GREEN,
ASSET_D9A_DIALOG_JINJO_MEET_PINK,
ASSET_D9B_DIALOG_JINJO_MEET_ORANGE,
ASSET_D9C_DIALOG_MUSIC_NOTE_MEET,
ASSET_D9D_DIALOG_MUMBO_TOKEN_MEET,
ASSET_D9E_DIALOG_BLUE_EGG_MEET,
ASSET_D9F_DIALOG_RED_FEATHER_MEET,
ASSET_DA0_DIALOG_GOLD_FEATHER_MEET,
ASSET_DA1_DIALOG_HONEYCOMB_MEET,
ASSET_DA2_DIALOG_EMPTY_HONEYCOMB_MEET,
ASSET_DA3_DIALOG_EXTRA_LIFE_MEET,
ASSET_DA5_DIALOG_WADINGBOOTS_MEET = 0xDA5,
ASSET_DA6_DIALOG_BEEHIVE_WITH_BEES,
@@ -4421,6 +4467,7 @@ enum asset_e
ASSET_DB3_DIALOG_SNS_EGG_1_TEXT = VER_SELECT(0xdb3, 0xa31, 0, 0),
ASSET_DB4_DIALOG_SNS_EGG_2_TEXT,
ASSET_DB5_DIALOG_ICE_KEY_TEXT,
ASSET_DB6_DIALOG_MUMBO_WISHYWASHY,
ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION = 0xDF3,
ASSET_DF4_DIALOG_BOTTLES_CAMERA_CONTROL_LEARN,
@@ -4431,16 +4478,16 @@ enum asset_e
ASSET_DF9_DIALOG_BOTTLES_UNKNOWN,
ASSET_DFA_DIALOG_BOTTLES_JUMP_REFRESHER,
ASSET_DFB_DIALOG_BOTTLES_DIVE_LEARN,
ASSET_DFC_DIALOG_UNKNOWN,
ASSET_DFC_BOTTLES_UNDERWATER_TUTORIAL,
ASSET_DFD_DIALOG_BOTTLES_SWIM_LEARN,
ASSET_DFE_DIALOG_BOTTLES_DIVE_REFRESHER,
ASSET_DFF_DIALOG_BOTTLES_CLAW_SWIPE_LEARN,
ASSET_E00_DIALOG_BOTTLES_ATTACK_REFRESHER = 0xE00,
ASSET_E01_DIALOG_BOTTLES_CLIMB_LEARN,
ASSET_E02_DIALOG_UNKNOWN,
ASSET_E02_DIALOG_BOTTLES_CLIMB_OTHER,
ASSET_E03_DIALOG_BOTTLES_CLIMB_REFRESHER,
ASSET_E04_DIALOG_BOTTLES_BEAK_BARGE_LEARN,
ASSET_E05_DIALOG_UNKNOWN,
ASSET_E05_DIALOG_BOTTLES_KAZOOIE_BARGE,
ASSET_E06_DIALOG_BOTTLES_BEAK_BARGE_REFRESHER,
ASSET_E07_DIALOG_BOTTLES_UNKNOWN,
ASSET_E08_DIALOG_BOTTLES_FIND_ANOTHER_MOLEHILL,
@@ -4473,11 +4520,14 @@ enum asset_e
ASSET_E24_DIALOG_UNKNOWN = 0xE24,
ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER = VER_SELECT(0xE35, 0xa77, 0, 0),
ASSET_E36_DIALOG_BOTTLES_NO_BONUS = 0xE36,
ASSET_E37_DIALOG_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun
ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION,
ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0),
ASSET_F58_DIALOG_FIRST_PICTURE_INSTRUCTION = 0xF58,
ASSET_F59_DIALOG_FIRST_PICTURE_FIRST_PIECE_ALREADY_OBTAINED = 0xF59,
ASSET_F5A_DIALOG_FIRST_PICTURE_FIRST_PIECE_OBTAINED_AFTER = 0xF5A,
ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL = 0xF5b,
ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV,
@@ -4491,16 +4541,48 @@ enum asset_e
ASSET_F79_DIALOG_UNKNOWN = 0xf79,
ASSET_F7A_DIALOG_UNKNOWN,
ASSET_F7B_DIALOG_BOTTLES_JIGSAW_PICTURE_MEET,
ASSET_FAD_DIALOG_UNKNOWN = 0xfad,
ASSET_FA8_EGG_CHEAT_ACTIVATION = 0xFA8,
ASSET_FA9_RED_FEATHER_CHEAT_ACTIVATION,
ASSET_FAA_GOLD_FEATHER_CHEAT_ACTIVATION,
ASSET_F7C_DIALOG_BOTTLES_REMOVE_PIECE_INSTRUCTIONS = 0xF7C,
ASSET_F7D_DIALOG_BOTTLES_EXPLAINS_PLACE_ALL = 0xF7D,
ASSET_FAB_DIALOG_GRUNTY_DOOR_NEED_JIGGIES = 0xFAB,
ASSET_FAD_DIALOG_DINGPOT_MEET = 0xFAD,
ASSET_FBC_DIALOG_BOTTLES_OUT_OF_JIGGIES = 0xFBC,
ASSET_FBD_DIALOG_GRUNTY_NOT_ENOUGH_NOTES = 0xFBD,
ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING = 0xFBE,
ASSET_FBF_DIALOG_ERASED_SAVE,
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
ASSET_10A2_DIALOG_UNKNOWN,
ASSET_FC0_DIALOG_GRUNTY_DOOR_HAVE_JIGGIES = 0xFC0,
ASSET_10E7_DIALOG_UNKNOWN = 0x10E7,
ASSET_1032_DIALOG_FF_FIRST_ANSWER_CORRECT = 0x1032,
ASSET_1033_DIALOG_FF_NEXT_ANSWER_CORRECT,
ASSET_1034_DIALOG_FF_GRUNTY_ANSWER_CORRECT,
ASSET_1035_DIALOG_FF_FIRST_ANSWER_WRONG,
ASSET_1036_DIALOG_FF_NEXT_ANSWER_WRONG,
ASSET_1037_DIALOG_FF_CHOICE_IS_YOURS_UNUSED,
ASSET_1038_DIALOG_FF_GET_HONEYCOMB,
ASSET_1039_DIALOG_FF_GET_EXTRA_LIFE,
ASSET_103A_DIALOG_FF_GET_JOKER,
ASSET_103B_DIALOG_FF_USE_JOKER,
ASSET_103C_DIALOG_FF_LOW_HEALTH,
ASSET_103D_DIALOG_FF_LOW_HEALTH_ON_SKULL,
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
ASSET_10A2_DIALOG_BRENTILDA_HEAL,
ASSET_10E7_DIALOG_FINALBOSS_ENTERING_1 = 0x10E7,
ASSET_10E8_DIALOG_FINALBOSS_ENTERING_2 = 0x10E8,
ASSET_10E9_DIALOG_FINALBOSS_ENTERING_3 = 0x10E9,
ASSET_10EA_DIALOG_FINALBOSS_ENTERING_4 = 0x10E9,
ASSET_10EB_DIALOG_FINALBOSS_ENTERING_5 = 0x10E9,
ASSET_10EC_DIALOG_FINALBOSS_ENTERING_6 = 0x10EC,
ASSET_10ED_DIALOG_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_1 = 0x10ED,
ASSET_10EE_DIALOG_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_2,
@@ -5320,11 +5402,6 @@ enum ff_question_type_e{
FFQT_4_MINIGAME
};
enum common_particle_e{
COMMON_PARTICLE_1_EGG_HEAD = 1,
COMMON_PARTICLE_4_EGG_ASS = 4
};
enum bsgroup_e {
BSGROUP_0_NONE,
BSGROUP_1_INTR,
@@ -5400,4 +5477,13 @@ enum vegetable_e {
VEGETABLE_3_COLLY_WOBBLE
};
enum static_camera_id_e {
STATIC_CAMERA_D_WALKWAY_JIGGY_DESTROY = 0xD,
STATIC_CAMERA_1E_MAZE_JIGGY_DESTROY = 0x1E
};
enum ba_timer_id {
BA_TIMER_HAZARDS = 4
};
#endif

30
include/functions.h
View File

@@ -31,7 +31,7 @@ extern f32 fabsf(f32);
_SHIFTL((vol*1023), 21, 11) + _SHIFTL(sample_rate >> 5, 11, 10) + _SHIFTL(sfx_e, 0, 11)\
)
#define FUNC_8030E8B4(sfx_e, vol, sample_rate, position, e, f) func_8030E8B4(\
#define sfx_playFadeShorthandDefault(sfx_e, vol, sample_rate, position, e, f) sfx_playFadeShorthand(\
_SHIFTL((vol*1023), 21, 11) + _SHIFTL(sample_rate >> 5, 11, 10) + _SHIFTL(sfx_e, 0, 11), \
position, \
_SHIFTL(e, 0, 16) + _SHIFTL(f, 16, 16)\
@@ -90,7 +90,7 @@ s32 bs_getState(void);
s32 bs_getNextState(void);
void bs_updateState(void);
s32 bs_checkInterrupt(enum bs_interrupt_e arg0);
void func_8029A86C(s32 arg0);
void bs_setInterruptResponse(s32 arg0);
enum bs_interrupt_e bs_getInterruptType(void);
/* vla - variable length array*/
@@ -216,7 +216,7 @@ OSMesgQueue *pfsManager_getFrameReplyQ(void);
void baMotor_80250D94(f32, f32, f32);
void func_8025A6EC(enum comusic_e, s32);
void coMusicPlayer_playMusic(enum comusic_e, s32);
void comusic_playTrack(enum comusic_e);
void comusic_8025AB44(enum comusic_e comusic_id, s32 arg1, s32 arg2);
@@ -251,13 +251,13 @@ void baeyes_openSingleEye(s32, f32);
void bafalldamage_start(void);
void func_80293D48(f32, f32);
f32 func_80294438(void);
f32 func_80294500(void);
f32 floor_getCurrentFloorYPosition(void);
BKCollisionTri *func_802946F0(void);
void func_80294980(f32 arg0[3]);
f32 get_slope_timer(void);
f32 get_turbo_duration(void);
void func_80295C08(void (* arg0)(void));
void func_80297CCC(f32);
void bsiFrame_startWithValue(f32);
f32 pitch_getIdeal(void);
void pitch_setAngVel(f32, f32);
void func_80298528(f32);
@@ -314,7 +314,7 @@ void func_802D6264(f32, enum map_e, s32, s32, s32, enum file_progress_e);
Actor *func_802DC7E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void particleEmitter_emitN(ParticleEmitter *, int);
void func_802EFA20(ParticleEmitter *, f32, f32);
void particleEmitter_func_802EFA20(ParticleEmitter *, f32, f32);
ParticleEmitter *partEmitMgr_defragEmitter(ParticleEmitter *);
ParticleEmitter *func_802F4094(f32[3], f32);
@@ -330,28 +330,28 @@ BKModelBin *func_8030A428(s32);
u8 sfxsource_createSfxsourceAndReturnIndex(void);
void sfxsource_setSfxId(u8 indx, enum sfx_e uid);
void sfxsource_playSfxAtVolume(u8, f32);
void func_8030DD14(u8, int);
void sfxSource_setunk43_7ByIndex(u8, int);
void sfxsource_set_position(u8, f32[3]);
void func_8030DFF0(u8, s32);
void func_8030E04C(u8, f32, f32, f32);
void func_8030E0FC(u8, f32, f32, f32);
f32 func_8030E200(u8);
void func_8030E2C4(u8);
void func_8030E394(u8 indx);
void sfxSource_func_8030E2C4(u8);
void sfxSource_triggerCallbackByIndex(u8 indx);
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);
void gcsfx_playAtSampleRate(enum sfx_e uid, s32 sample_rate);
void gcsfx_play(enum sfx_e uid);
void func_8030E560(enum sfx_e uid, s32 arg1);
void func_8030E58C(enum sfx_e uid, f32 arg1);
void func_8030E5F4(enum sfx_e uid, f32 arg1);
void func_8030E624(u32);
void func_8030E6A4(enum sfx_e uid, f32 arg1, s32 arg2);
void gcsfx_playWithPitch(enum sfx_e uid, f32 pitch, s32 arg2);
void func_8030E6D4(enum sfx_e uid);
void func_8030E704(enum sfx_e uid);
void func_8030E760(enum sfx_e uid, f32 arg1, s32 arg2);
void func_8030E878(enum sfx_e uid, f32 arg1, u32 arg2, f32 arg3[3], f32 arg4, f32 arg5);
void func_8030E8B4(u32,f32 [3], u32);
void sfx_playFadeShorthand(u32,f32 [3], u32);
void func_8030E988(enum sfx_e uid, f32 arg1, u32 arg2, f32 arg3[3], f32 arg4, f32 arg5);
void func_8030E9C4(enum sfx_e uid, f32 arg1, u32 arg2, f32 arg3[3], f32 arg4, f32 arg5);
void func_8030EAAC(enum sfx_e uid, f32 arg1, s32 arg2, s32 arg3);
@@ -450,7 +450,7 @@ void sfxsource_set_fade_distances(u8, f32, f32);
void func_8030DB04(u8, s32, f32 position[3], f32, f32);
void func_802E4078(enum map_e map, s32 exit, s32 transition);
void transitionToMap(enum map_e map, s32 exit, s32 transition);
void levelSpecificFlags_set(s32, s32);
void func_803228D8(void);
@@ -479,7 +479,7 @@ void __spawnQueue_add_1(GenFunction_1, s32);
void func_802FAD64(enum item_e);
void nodeprop_getPosition(NodeProp *, f32[3]);
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));
bool gcdialog_showDialog(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);

9
include/music.h
View File

@@ -11,7 +11,7 @@ typedef struct struct_B_s{
f32 unk10;
} structBs;
typedef struct music_track_s{
typedef struct music_track_s {
s16 unk0;
u8 unk2;
u8 unk3;
@@ -25,10 +25,9 @@ typedef struct music_track_s{
u8 unk192[0xE];
} MusicTrack;
typedef struct music_track_meta_s{
typedef struct music_track_meta_s {
char *name;
u16 unk4;
// u8 pad6[2];
}MusicTrackMeta;
u16 volume;
} MusicTrackMeta;
#endif

11
include/prop.h
View File

@@ -87,7 +87,7 @@ typedef struct actorMarker_s{
MarkerCollisionFunc dieFunc;
s32 unk20;
ActorUpdateFunc actorUpdateFunc;
s32 unk28;
s32 commonParticleIndex;
u32 actrArrayIdx:11; //unk2C
u32 pitch:9;
u32 roll:9;
@@ -99,7 +99,7 @@ typedef struct actorMarker_s{
s16 unk38[3];
u16 pad3E_15:1;
u16 modelId:13;
u16 unk3E_1:1;
u16 isBanjoOnTop: TRUE;
u16 unk3E_0:1; //scaled
u32 unk40_31:4;
u32 unk40_27:4;
@@ -200,7 +200,7 @@ typedef struct actor_s{
f32 unk74;
u32 unk78_31:9;
u32 unk78_22:9;
u32 unk78_13:12; //default_spawn_yaw?
u32 secondaryId:12; //default_spawn_yaw? This seems to be a different ID to differentiate actors that are the same- IE orange switches or tolls
u32 stored_anctrl_forwards:1; //animCtrlDirection
u32 stored_anctrl_smoothTransistion:1; //animCtrlSmoothTransition
union
@@ -230,12 +230,13 @@ typedef struct actor_s{
u32 unkF4_22:1;
u32 initialized:1; //unkF4_21;
u32 unkF4_20:12;
u32 unkF4_8:9; /* jinjo id in final fight.
u32 actorTypeSpecificField:9; /* jinjo id in final fight.
* Is used to determine file progress related stuff, can also be a file_progress_e
* Also related to jigsaw pictures, as an id for each
*/
f32 stored_anctrl_subrangeMin; //animCtrl_SubRangeStart
f32 stored_anctrl_subrangeMax; //animCtrl_SubRangeEnd
ActorMarker *unk100; // child actor marker ?
ActorMarker *partnerActor; // child actor marker ? Calling this "partner" since it seems to relate to actors that are "paired" and not necessarily parent/child
ActorMarker *unk104;
Struct62s *unk108;
// void ( *unk108)(struct actorMarker_s *, s32); //saved from marker->collisionFunc

6
include/structs.h
View File

@@ -252,7 +252,7 @@ typedef struct struct_8_s{
typedef struct struct_11_s{
f32 unk0;
f32 unk4;
s32 unk8;
s32 volume;
s32 unkC;
s16 track_id; //trackId
s16 unk12;
@@ -268,10 +268,10 @@ typedef struct struct_12_s{
s32 unk1;
} struct12s;
typedef struct struct_13_s{
typedef struct dialog_s {
s32 cmd;
u8* str;
}struct13s;
} BKDialog;
typedef struct struct_14_s{
s16 unk0;