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

Fight and other docu

Browse Source
This commit is contained in:
Mario
2024-10-08 05:54:59 +00:00
committed by Banjo Kazooie
parent ea4b9ab1a6
commit cd336b9b58
223 changed files with 2692 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/TTC/ch/clam.c
View File

@@ -19,7 +19,7 @@ ActorAnimationInfo chClamAnimations[] = {
ActorInfo chClam = {
MARKER_15_CLAM, ACTOR_69_CLAM, ASSET_351_MODEL_CLAM,
0x1, chClamAnimations,
chClam_update, func_80326224, actor_draw,
chClam_update, actor_update_func_80326224, actor_draw,
4500, 0x366, 1.6f, 0
};
@@ -134,8 +134,8 @@ bool __chClam_rotateTowardTarget(Actor *this, s32 arg1) {
void __chClam_particalEmitterInit(ParticleEmitter *pCtrl, f32 position[3]){
particleEmitter_setPosition(pCtrl, position);
func_802EF9F8(pCtrl, 0.7f);
func_802EFA18(pCtrl, 3);
particleEmitter_func_802EF9F8(pCtrl, 0.7f);
particleEmitter_func_802EFA18(pCtrl, 3);
func_802EFA20(pCtrl, 0.8f, 1.0f);
particleEmitter_setSfx(pCtrl, SFX_1F_HITTING_AN_ENEMY_3, 10000);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
@@ -145,7 +145,7 @@ void __chClam_particalEmitterInit(ParticleEmitter *pCtrl, f32 position[3]){
}
void __chClam_emitLargeShellParticles(f32 position[3], s32 count){
static struct41s D_8038C3F4 = {
static ParticleSettingsVelocityAcceleration D_8038C3F4 = {
{{-50.0f, 750.0f, -50.0f}, {120.0f, 900.0f, 120.0f}},
{{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}}
};
@@ -161,7 +161,7 @@ void __chClam_emitLargeShellParticles(f32 position[3], s32 count){
}
void __chClam_emitEyeParticles(f32 position[3], s32 count){
static struct41s D_8038C424 = {
static ParticleSettingsVelocityAcceleration D_8038C424 = {
{{-80.0f, 400.0f, -80.0f}, {160.0f, 860.0f, 160.0f}},
{{ 0.0f, -1400.0f, 0.0f}, { 0.0f, -1400.0f, 0.0f}}
};
@@ -177,7 +177,7 @@ void __chClam_emitEyeParticles(f32 position[3], s32 count){
}
void __chClam_emitSmallShellParticles(f32 position[3], s32 count){
static struct41s D_8038C454 = {
static ParticleSettingsVelocityAcceleration D_8038C454 = {
{{-200.0f, 850.0f, -200.0f}, {400.0f, 1000.0f, 400.0f}},
{{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}}
};
@@ -201,7 +201,7 @@ void __chClam_emitEatencollectibleParticles(f32 position[3], enum asset_e sprite
0.0f, 0.5f
};
static struct41s D_8038C4AC = {
static ParticleSettingsVelocityAcceleration D_8038C4AC = {
{{-340.0f, 100.0f, -340.0f}, {340.0f, 250.0f, 340.0f}},
{{ 0.0f, -1200.0f, 0.0f}, { 0.0f, -1200.0f, 0.0f}}
};

2
src/TTC/ch/leaky.c
View File

@@ -18,7 +18,7 @@ ActorAnimationInfo D_8038C700[] = {
ActorInfo D_8038C718 = {
MARKER_33_LEAKY, ACTOR_1E_LEAKY, ASSET_51A_MODEL_LEAKY,
0x1, D_8038C700,
chLeaky_update, func_80326224, actor_draw,
chLeaky_update, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};

6
src/TTC/ch/lockup.c
View File

@@ -25,21 +25,21 @@ ActorAnimationInfo D_8038C760[] ={
ActorInfo D_8038C790 = {
MARKER_A4_LOCKUP_SLOW, ACTOR_151_LOCKUP_SLOW, ASSET_3D4_MODEL_LOCKUP,
1, D_8038C760,
func_80389600, func_80326224, func_803894C0,
func_80389600, actor_update_func_80326224, func_803894C0,
2500, 0x366, 0.0f, 0
};
ActorInfo D_8038C7B4 = {
MARKER_F6_LOCKUP_MEDIUM, ACTOR_152_LOCKUP_MEDIUM, ASSET_3D4_MODEL_LOCKUP,
1, D_8038C760,
func_80389600, func_80326224, func_803894C0,
func_80389600, actor_update_func_80326224, func_803894C0,
2500, 0x366, 0.0f, 0
};
ActorInfo D_8038C7D8 = {
MARKER_F7_LOCKUP_FAST, ACTOR_153_LOCKUP_FAST, ASSET_3D4_MODEL_LOCKUP,
1, D_8038C760,
func_80389600, func_80326224, func_803894C0,
func_80389600, actor_update_func_80326224, func_803894C0,
2500, 0x366, 0.0f, 0
};

4
src/TTC/ch/nipper.c
View File

@@ -21,7 +21,7 @@ ActorAnimationInfo D_8038C540[] = {
ActorInfo D_8038C580 = {
MARKER_A5_NIPPER, ACTOR_117_NIPPER, ASSET_3D5_MODEL_NIPPER,
0x1, D_8038C540,
func_80388434, func_80326224, func_80387EB0,
func_80388434, actor_update_func_80326224, func_80387EB0,
0, 0x299, 10.0f, 0
};
@@ -45,7 +45,7 @@ void func_80387DC0(f32 *position, s32 count) {
particleEmitter_setRGB(pCtrl, D_8038C5A4);
particleEmitter_setStartingFrameRange(pCtrl, 0, 7);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-10.0f, -5.0f, -10.0f,
10.0f, 10.0f, 10.0f
);

2
src/TTC/ch/treasure.c
View File

@@ -15,7 +15,7 @@ ActorAnimationInfo gChTreasureAnim[]={
ActorInfo gChTreasureInfo = {
MARKER_DB_BURIED_TREASURE, ACTOR_F4_BURIED_TREASURE, ASSET_42C_MODEL_BURIED_TREASURE,
1, gChTreasureAnim,
chtreasure_update, func_80326224, actor_draw,
chtreasure_update, actor_update_func_80326224, actor_draw,
0, 0, 1.7f, 0
};

8
src/TTC/ch/treasurehunt.c
View File

@@ -38,21 +38,21 @@ s32 D_8038C898[6] = {
ActorInfo D_8038C8B0 = {
MARKER_62_RED_ARROW, ACTOR_53_RED_ARROW, ASSET_3E9_MODEL_RED_ARROW,
0, NULL,
TTC_func_80389E90, func_80326224, func_8038A0D0,
TTC_func_80389E90, actor_update_func_80326224, func_8038A0D0,
0, 0x400, 0.0f, 0
};
ActorInfo D_8038C8D4 = {
MARKER_63_RED_QUESTION_MARK, ACTOR_54_RED_QUESTION_MARK, ASSET_3EB_MODEL_RED_QUESTION_MARK,
0, NULL,
TTC_func_80389E90, func_80326224, func_8038A0D0,
TTC_func_80389E90, actor_update_func_80326224, func_8038A0D0,
0, 0x400, 0.0f, 0
};
ActorInfo D_8038C8F8 = {
MARKER_64_RED_X, ACTOR_55_RED_X, ASSET_3EA_MODEL_RED_X,
0, NULL,
TTC_func_80389E90, func_80326224, func_8038A0D0,
TTC_func_80389E90, actor_update_func_80326224, func_8038A0D0,
0, 0x400, 0.0f, 0
};
@@ -65,7 +65,7 @@ ParticleScaleAndLifetimeRanges D_8038C928 = {
0.0f, 0.01f
};
struct42s D_8038C950 = {
ParticleSettingsVelocityPosition D_8038C950 = {
{{-230.0f, 30.0f, -230.0f}, {230.0f, 110.0f, 230.0f}},
{{-60.0f, 0.0f, -60.0f}, {60.0f, 30.0f, 60.0f}},
};

16
src/TTC/code_26D0.c
View File

@@ -35,56 +35,56 @@ void func_80388D8C(Actor *this);
ActorInfo D_8038C5E0 = {
0xA1, 0x10E, 0x3D2,
0x1, NULL,
func_802D3D54, func_80326224, actor_drawFullDepth,
func_802D3D54, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C604 = {
MARKER_EA_LIGHTHOUSE_DOOR, ACTOR_13E_LIGHTHOUSE_DOOR, ASSET_3D6_MODEL_LIGHTHOUSE_DOOR,
0x1, NULL,
func_802D3D54, func_80326224, actor_drawFullDepth,
func_802D3D54, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C628 = {
MARKER_167_SHARKFOOD_ISLAND, ACTOR_25C_SHARKFOOD_ISLAND, ASSET_50A_MODEL_SHARKFOOD_ISLAND,
0x1, NULL,
func_80388D8C, func_80326224, actor_drawFullDepth,
func_80388D8C, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C64C = {
0x267, 0x2E2, 0x3BD,
0x1, NULL,
func_80388D34, func_80326224, actor_drawFullDepth,
func_80388D34, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C670 = {
0x26A, 0x2DF, 0x3BE,
0x1, NULL,
TTC_func_80388C78, func_80326224, actor_drawFullDepth,
TTC_func_80388C78, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C694 = {
0x268, 0x2E0, 0x3B6,
0x1, NULL,
TTC_func_80388C78, func_80326224, actor_drawFullDepth,
TTC_func_80388C78, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C6B8 = {
0x269, 0x2E1, 0x3B7,
0x1, NULL,
TTC_func_80388C78, func_80326224, actor_drawFullDepth,
TTC_func_80388C78, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C6DC = {
MARKER_1D5_PALM_TREE, ACTOR_31E_PALM_TREE, ASSET_3A9_MODEL_PALM_TREE,
0x1, NULL,
func_80388CB8, func_80326224, actor_drawFullDepth,
func_80388CB8, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};