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

Merge remote-tracking branch 'origin/master' into pal

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-07 21:13:37 -05:00
parent 3f210f38b8 347c3edcdf
commit 3460bb81e5
156 changed files with 1857 additions and 1784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/actor.h
View File

@@ -6,7 +6,7 @@
#define ACTOR_FLAG_UNKNOWN_1 (1 << 1) // 0x2
#define ACTOR_FLAG_UNKNOWN_2 (1 << 2) // 0x4
#define ACTOR_FLAG_UNKNOWN_3 (1 << 3) // 0x8
#define ACTOR_FLAG_UNKNOWN_4 (1 << 4) // 0x10
#define ACTOR_FLAG_UNKNOWN_4 (1 << 4) // 0x10 - only used by GV Jinxy Head 2
#define ACTOR_FLAG_UNKNOWN_5 (1 << 5) // 0x20
#define ACTOR_FLAG_UNKNOWN_6 (1 << 6) // 0x40
#define ACTOR_FLAG_UNKNOWN_7 (1 << 7) // 0x80
@@ -20,14 +20,15 @@
#define ACTOR_FLAG_UNKNOWN_15 (1 << 15) // 0x8000
#define ACTOR_FLAG_UNKNOWN_16 (1 << 16) // 0x10000
#define ACTOR_FLAG_UNKNOWN_17 (1 << 17) // 0x20000
#define ACTOR_FLAG_UNKNOWN_18 (1 << 18) // 0x40000
#define ACTOR_FLAG_UNKNOWN_18 (1 << 18) // 0x40000 - never used?
#define ACTOR_FLAG_UNKNOWN_19 (1 << 19) // 0x80000
#define ACTOR_FLAG_UNKNOWN_20 (1 << 20) // 0x100000
#define ACTOR_FLAG_UNKNOWN_21 (1 << 21) // 0x200000
#define ACTOR_FLAG_UNKNOWN_22 (1 << 22) // 0x400000
#define ACTOR_FLAG_UNKNOWN_22 (1 << 22) // 0x400000 - used by overlay texts
#define ACTOR_FLAG_UNKNOWN_23 (1 << 23) // 0x800000
#define ACTOR_FLAG_UNKNOWN_24 (1 << 24) // 0x1000000
#define ACTOR_FLAG_UNKNOWN_25 (1 << 25) // 0x2000000
#define ACTOR_FLAG_UNKNOWN_26 (1 << 26) // 0x4000000
#define ACTOR_FLAG_UNKNOWN_27 (1 << 27) // 0x4000000
#endif // ACTOR_H

31
include/enums.h
View File

@@ -12,8 +12,10 @@
#define SPRITE_TYPE_RGBA32 (1 << 11)
enum file_progress_e{
FILEPROG_3_MUSIC_NOTE_TEXT = 0x3,
FILEPROG_0_UNKNOWN,
FILEPROG_1_UNKNOWN,
FILEPROG_2_UNKNOWN,
FILEPROG_3_MUSIC_NOTE_TEXT,
FILEPROG_4_MUMBO_TOKEN_TEXT,
FILEPROG_5_BLUE_EGG_TEXT,
FILEPROG_6_RED_FEATHER_TEXT,
@@ -227,6 +229,10 @@ enum file_progress_e{
FILEPROG_FD_BANNED_CHEATCODES_ENTERED //2 bit
};
enum volatile_progress_e{
VOLAPROG_0_UNKNOWN
};
enum unkflags_1{
UNKFLAGS1_6_HAS_SEEN_BOSS_BOOM_BOX_FF_MINIGAME = 0x6,
UNKFLAGS1_7_HAS_SEEN_VILE_FF_MINIGAME,
@@ -1988,13 +1994,13 @@ enum actor_e
ACTOR_387_PORTRAIT_OF_TEEHEE,
ACTOR_388_PORTRAIT_OF_MINION,
ACTOR_389_GRUNTY_SPELL_FIREBALL,
ACTOR_38B_GRUNTILDA_FINAL_BOSS = 0x38B,
ACTOR_38A_GREEN_BLAST,
ACTOR_38B_GRUNTILDA_FINAL_BOSS,
ACTOR_39F_FIGHT_FLIGHT_PAD = 0x39F,
ACTOR_3A0_ICECUBE_B,
ACTOR_3A1_STONE_JINJO = 0x3A1,
ACTOR_3A2_JINJO_STATUE_BASE = 0x3A2,
ACTOR_3A1_STONE_JINJO,
ACTOR_3A2_JINJO_STATUE_BASE,
ACTOR_3A5_BOSS_JINJO_ORANGE = 0x3A5,
ACTOR_3A6_BOSS_JINJO_GREEN,
@@ -3692,7 +3698,7 @@ enum asset_e
ASSET_6C4_SPRITE_SMOKE_YELLOW,
ASSET_6C5_SPRITE_SMOKE_ORANGE,
ASSET_6C6_SPRITE_SMOKE_PINK,
ASSET_6C7_SPRITE_SMOKE_GREEN_2,
ASSET_6C7_GREEN_BLAST,
ASSET_6C8_SPRITE_SMOKE_BLUE,
ASSET_6C9_SPRITE_GREEN_SPELL_ATTACK,
@@ -4305,8 +4311,9 @@ enum marker_e{
MARKER_4B_CC_SCREW,
MARKER_4C_CLANKER_TOKEN_TOOTH_EXT,
MARKER_4D_CLANKER_JIGGY_TOOTH_EXT,
MARKER_51_MM_HUT = 0x51,
MARKER_50_BEEHIVE = 0x50,
MARKER_51_MM_HUT,
MARKER_52_JIGGY,
MARKER_53_EMPTY_HONEYCOMB,
@@ -4573,9 +4580,9 @@ enum marker_e{
MARKER_25A_PORTRAIT_OF_TEEHEE,
MARKER_25B_PORTRAIT_OF_MINION,
MARKER_25C_GRUNTY_SPELL_FIREBALL,
MARKER_25E_GRUNTILDA_FINAL_BOSS = 0x25E,
MARKER_25F_ICECUBE_B = 0x25F,
MARKER_25D_GREEN_BLAST,
MARKER_25E_GRUNTILDA_FINAL_BOSS,
MARKER_25F_ICECUBE_B,
MARKER_261_FIGHT_FLIGHT_PAD = 0x261,

12
include/functions.h
View File

@@ -238,7 +238,7 @@ void particleEmitter_setParticleFramerateRange(ParticleEmitter *, f32, f32);
void particleEmitter_setParticleSpawnPositionRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
void func_802EFB70(ParticleEmitter *, f32, f32);
void func_802EFB84(ParticleEmitter *, f32, f32);
void func_802EFB98(ParticleEmitter *, struct31s *);
void particleEmitter_setScaleAndLifetimeRanges(ParticleEmitter *, ParticleScaleAndLifetimeRanges *);
void particleEmitter_setVelocityAndAccelerationRanges(ParticleEmitter *, struct41s *);
void particleEmitter_setPositionAndVelocityRanges(ParticleEmitter *this, struct42s *arg1);
void particleEmitter_setAngularVelocityRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
@@ -552,4 +552,14 @@ extern void fxSparkle_chTreasure(s16[3]);
extern void actor_collisionOn(Actor *);
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 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);
extern void spawnableActorList_addIfMapVisited(ActorInfo *arg0, Actor *(*arg1)(s32[3], s32, ActorInfo *, u32), u32 arg2, enum map_e arg3);
extern void marker_setActorUpdateFunc(ActorMarker *marker, ActorUpdateFunc method);
extern void marker_setActorUpdate2Func(ActorMarker *marker, ActorUpdateFunc method);
#endif

44
include/prop.h
View File

@@ -73,20 +73,20 @@ typedef void (*ActorUpdateFunc)(struct actor_s *);
typedef void (*ActorFreeFunc)(struct actor_s *);
typedef struct actorMarker_s{
ActorProp* propPtr;
struct cude_s* cubePtr;
MarkerDrawFunc unk8;
MarkerCollisionFunc unkC; //ow_func
MarkerCollisionFunc unk10;
ActorProp* propPtr;
struct cude_s* cubePtr;
MarkerDrawFunc drawFunc;
MarkerCollisionFunc collisionFunc; //ow_func
MarkerCollisionFunc collision2Func;
u32 yaw:9;
u32 unk14_22:1;
u32 unk14_21:1;
u32 unk14_20:10; //contains jingo_id for chjinjo
u32 id:10; // marker_id
u32 unk14_10:11; //used in ch/jiggy
Struct6Cs *unk18;
MarkerCollisionFunc unk1C; //die_func
MarkerCollisionFunc dieFunc;
s32 unk20;
ActorUpdateFunc unk24;
ActorUpdateFunc actorUpdateFunc;
s32 unk28;
u32 actrArrayIdx:11; //unk2C
u32 pitch:9;
@@ -94,8 +94,8 @@ typedef struct actorMarker_s{
u32 unk2C_2:1;
u32 unk2C_1:1;
u32 collidable:1;
ActorFreeFunc unk30; //actor free method
s32 unk34;
ActorFreeFunc actorFreeFunc;
ActorUpdateFunc actorUpdate2Func;
s16 unk38[3];
u16 pad3E_15:1;
u16 modelId:13;
@@ -179,9 +179,9 @@ typedef struct actor_s{
u32 modelCacheIndex:10; //modelCacheIndex
s32 unk44_14:10;
u32 despawn_flag:1;
u32 unk44_2:1;
u32 unk44_1:1;
u32 unk44_0:1;
u32 unk44_2:1; // is set, when actors created inside Cube?
u32 unk44_1:1; // only used by blubber?
u32 unk44_0:1; // unused
f32 unk48; //used in chlmonkey (chimpy)
f32 unk4C;
/* 0x50 */ f32 yaw; //0x50
@@ -192,7 +192,7 @@ typedef struct actor_s{
u32 unk58_1: 1;
u32 unk58_0: 1;
f32 unk5C;
f32 unk60; //0x60
f32 unk60; // actor lifetime?
f32 yaw_ideal; //0x64
f32 pitch;//0x68
f32 unk6C;
@@ -220,7 +220,7 @@ typedef struct actor_s{
f32 unkEC; //animCtrl???
f32 stored_animctrl_duration; //animCtrlDuration
u32 unkF4_31:1;
u32 unkF4_30:1;
u32 unkF4_30:1; // has something to do with vertices
u32 unkF4_29:1;
u32 unkF4_28:1; //saved marker->propPtr->unk8_3
u32 unkF4_27:1; //saved marker->propPtr->unk8_2
@@ -236,12 +236,12 @@ typedef struct actor_s{
ActorMarker *unk100;
ActorMarker *unk104;
Struct62s *unk108;
// void ( *unk108)(struct actorMarker_s *, s32); //saved from marker->unkC
// void ( *unk108)(struct actorMarker_s *, s32); //saved from marker->collisionFunc
s32 unk10C; //saved marker->unk10
f32 roll;//110
f32 sound_timer;
TUPLE(f32, spawn_position); //0x118
u32 unk124_31:12;
u32 unk124_31:12; // only used by GV Jinxy Head 2
u32 alpha_124_19:8;
u32 unk124_11:2; //blend_mode?
u32 depth_mode:2; //render_mode (passed to modelRender_setDepthMode())
@@ -253,7 +253,7 @@ typedef struct actor_s{
f32 scale;
/* 0x12C */ struct actor_info_s *actor_info;
void (* unk130)(struct actor_s *);
vector(struct2s) **unk134; //vector<struct2s> //saved marker->unk1C
vector(struct2s) **unk134; //vector<struct2s> //saved marker->dieFunc
u32 unk138_31:1;
u32 unk138_30:1;
u32 unk138_29:1;
@@ -265,12 +265,12 @@ typedef struct actor_s{
u32 unk138_22:1;
u32 unk138_21:1;
u32 unk138_20:1;
u32 unk138_19:10; //saved maker->unk14_20
u32 unk138_19:10; //saved maker->id
u32 unk138_9:1;
u32 unk138_8:1;
u32 unk138_8:1; // set to one by ACTOR_FLAG_UNKNOWN_18, which no actor seems to use
u32 unk138_7:4;
u32 unk138_3:4;
void (*unk13C)(struct actorMarker_s *);//saved marker->unk30
ActorFreeFunc backupFreeFunc; // saved marker->actorFreeFunc
f32 unk140;
f32 unk144;
SkeletalAnimation *unk148;
@@ -284,7 +284,7 @@ typedef struct actor_s{
s8 pad167[0x1];
s32 unk168; //saved marker->unk58
u32 unk16C_31:27; //saved s1->marker->unk5C
u32 unk16C_4:1;
u32 unk16C_4:1; // initialization related?
u32 unk16C_3:1;
u32 unk16C_2:1;
u32 unk16C_1:1;

6
include/structs.h
View File

@@ -374,14 +374,14 @@ typedef struct particle_emitter{
struct particle *pList_capacity_12C; //capacity_end_ptr;
} ParticleEmitter;
typedef struct struct_31_s{
typedef struct particle_scale_and_lifetime_ranges_s{
f32 unk0[2]; //particle_starting_scale_range
f32 unk8[2]; //particle_starting_scale_range
f32 unk10[2]; //particle_spawn_interval_range
f32 unk18[2]; //particle_lifetime_range
f32 unk20; //particle_fade_in
f32 unk24; //particle_fade_in
} struct31s;
} ParticleScaleAndLifetimeRanges;
typedef struct struct_32_s{
f32 unk0[3];
@@ -399,7 +399,7 @@ typedef struct struct_34_s{
} struct34s;
typedef struct struct_40_s{
struct31s unk0;
ParticleScaleAndLifetimeRanges unk0;
f32 unk28;
f32 unk2C;
} struct40s;