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

2
src/GV/ch/ancientone.c
View File

@@ -28,7 +28,7 @@ ActorAnimationInfo chAncientOneAnimations[] = {
ActorInfo chAncientOne = { MARKER_F4_ANCIENT_ONE, ACTOR_147_ANCIENT_ONE, ASSET_3E8_MODEL_ANCIENT_ONE,
0x1, chAncientOneAnimations,
chAncientOne_update, func_80326224, chAncientOne_draw,
chAncientOne_update, actor_update_func_80326224, chAncientOne_draw,
0, 0x100, 0.0f, 0
};

2
src/GV/ch/gobi1.c
View File

@@ -202,7 +202,7 @@ void chGobi1_update(Actor *this){
}//L80387830
if(this->state == 4){
func_80326224(this);
actor_update_func_80326224(this);
tmp_s1 = func_8033A12C(marker_loadModelBin(this->marker));
if(tmp_s1){
player_getPosition(sp54);

2
src/GV/ch/gobi2.c
View File

@@ -224,7 +224,7 @@ void chGobi2_update(Actor *this){
}
if(this->state == 6){
func_80326224(this);
actor_update_func_80326224(this);
}
if(this->state == 8){

2
src/GV/ch/gobi3.c
View File

@@ -143,7 +143,7 @@ void chGobi3_update(Actor *this){
}
if(this->state == 4){
func_80326224(this);
actor_update_func_80326224(this);
if(timedFuncQueue_is_empty())
chGobi3_setState(this, 6);
}

2
src/GV/ch/gobirock.c
View File

@@ -17,7 +17,7 @@ Actor *chGobiRock_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx
/* .data */
ActorInfo chGobiRock = { MARKER_BE_GOBI_ROCK, ACTOR_130_GOBI_ROCK, ASSET_3E4_MODEL_GOBI_ROCK,
0, NULL,
chGobiRock_update, func_80326224, chGobiRock_draw,
chGobiRock_update, actor_update_func_80326224, chGobiRock_draw,
0, 0x533, 0.0f, 0
};

2
src/GV/ch/gobirope.c
View File

@@ -8,7 +8,7 @@ void chGobiRope_update(Actor *this);
/* .data */
ActorInfo chGobiRope = { MARKER_BD_GOBI_ROPE, ACTOR_12F_GOBI_ROPE, ASSET_3E3_MODEL_GOBI_ROPE,
0, NULL,
chGobiRope_update, func_80326224, actor_draw,
chGobiRope_update, actor_update_func_80326224, actor_draw,
0, 0x533, 0.0f, 0
};

2
src/GV/ch/histup.c
View File

@@ -21,7 +21,7 @@ ActorAnimationInfo D_803912E0[] = {
};
ActorInfo D_80391318 = { MARKER_AA_HISTUP, ACTOR_11C_HISTUP, ASSET_3DE_MODEL_HISTUP,
0x1, D_803912E0,
func_8038DBDC, func_80326224, func_8038DA18,
func_8038DBDC, actor_update_func_80326224, func_8038DA18,
2500, 0, 1.7f, 0
};

4
src/GV/ch/sarcophagus.c
View File

@@ -20,13 +20,13 @@ ActorAnimationInfo chSarcophagusAnimations[] = {
ActorInfo chSarcophagus = { MARKER_A8_GV_MAZE_SARCOPHAGUS, ACTOR_11A_GV_MAZE_SARCOPHAGUS, ASSET_33D_MODEL_SARCOPHAGUS,
0x1, chSarcophagusAnimations,
chSarcophagus_update, func_80326224, actor_draw,
chSarcophagus_update, actor_update_func_80326224, actor_draw,
2500, 0, 0.0f, 0
};
ActorInfo chSNSSarcophagus = { MARKER_23B_GV_SNS_SARCOPHAGUS, ACTOR_244_GV_SNS_SARCOPHAGUS, ASSET_33D_MODEL_SARCOPHAGUS,
0x1, chSarcophagusAnimations,
chSarcophagus_updateSNS, func_80326224, actor_draw,
chSarcophagus_updateSNS, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};

2
src/GV/ch/toots.c
View File

@@ -14,7 +14,7 @@ ActorAnimationInfo chTootsAnimations[] = {
ActorInfo chToots = { MARKER_1F4_TOOTS, ACTOR_1E4_TOOTS, ASSET_434_MODEL_TOOTS,
0x1, chTootsAnimations,
chtoots_update, func_80326224, actor_draw,
chtoots_update, actor_update_func_80326224, actor_draw,
2000, 0, 0.5f, 0
};

2
src/GV/code_2EE0.c
View File

@@ -13,7 +13,7 @@ extern ActorAnimationInfo D_80390DC0[]={
extern ActorInfo GV_D_80390DD0 = { MARKER_AF_MAGIC_CARPET_SHADOW, ACTOR_122_MAGIC_CARPET_SHADOW, ASSET_3E7_MODEL_MAGIC_CARPET_SHADOW,
0x1, D_80390DC0,
func_8038938C, func_80326224, func_803892D0,
func_8038938C, actor_update_func_80326224, func_803892D0,
2500, 0, 0.0f, 0
};

2
src/GV/code_3630.c
View File

@@ -16,7 +16,7 @@ ActorAnimationInfo D_80390EA0[] = {
ActorInfo D_80390ED0 = { MARKER_A9_RUBEE, ACTOR_11B_RUBEE, ASSET_3DD_MODEL_RUBEE,
0x2, D_80390EA0,
func_80389B1C, func_80326224, actor_draw,
func_80389B1C, actor_update_func_80326224, actor_draw,
2500, 0, 1.6f, 0
};

6
src/GV/code_3BB0.c
View File

@@ -8,11 +8,11 @@ void GV_func_8038A084(Actor *this);
/* .data */
ActorInfo D_80390F40 = { 0x24F, 0x37C, 0x0,
0, NULL,
GV_func_8038A084, func_80326224, func_80325340,
GV_func_8038A084, actor_update_func_80326224, func_80325340,
2000, 0, 0.0f, 0
};
struct40s D_80390F64 = {
ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80390F64 = {
{ {2.5f, 2.8f},
{4.0f, 5.0f},
{0.0f, 0.01f},
@@ -33,7 +33,7 @@ void func_80389FA0(f32 position[3]){
particleEmitter_setRGB(pCtrl, D_80390F94);
particleEmitter_setAlpha(pCtrl, 100);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange( pCtrl,
particleEmitter_setSpawnPositionRange( pCtrl,
-700.0f, 0.0f, -700.0f,
700.0f, 0.0f, 700.0f
);

14
src/GV/code_4740.c
View File

@@ -22,12 +22,12 @@ ActorAnimationInfo D_80391040[] ={
ActorInfo D_80391098 = { MARKER_AD_SLAPPA, ACTOR_120_SLAPPA, ASSET_376_MODEL_SLAPPA,
0x1, D_80391040,
func_8038B124, func_80326224, actor_draw,
func_8038B124, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
s32 D_803910BC[3] = {175, 100, 0};
s32 D_803910C8[3] = {175, 140, 0};
struct43s D_803910D4 = {
ParticleSettingsVelocityAccelerationPosition D_803910D4 = {
{{-120.0f, 550.0f, -120.0f}, {120.0f, 950.0f, 120.0f}},
{{0.0f, -1400.0f, 0.0f}, {0.0f, -1400.0f, 0.0f}},
{{-100.0f, 0.0f, -100.0f}, {100.0f, 30.0f, 100.0f}}
@@ -53,7 +53,7 @@ void func_8038AB30(ParticleEmitter *pCtrl, f32 position[3], s32 cnt){
void func_8038ABD8(f32 position[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
func_8038AB30(pCtrl, position, cnt);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-40.0f, -5.0f, -40.0f,
60.0f, 20.0f, 60.0f
);
@@ -71,7 +71,7 @@ void func_8038ABD8(f32 position[3], s32 cnt){
void func_8038ACEC(f32 pos[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
func_8038AB30(pCtrl, pos, cnt);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-80.0f, 20.0f, -80.0f,
120.0f, 120.0f, 120.0f
);
@@ -90,10 +90,10 @@ void func_8038ADFC(f32 pos[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
particleEmitter_setModel(pCtrl, 0x389);
particleEmitter_setPosition(pCtrl, pos);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_803910D4);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_803910D4);
particleEmitter_setAngularVelocityRange(pCtrl, -500.0f, -500.0f, -500.0f, 500.0f, 500.0f, 500.0f);
func_802EF9F8(pCtrl, 0.6f);
func_802EFA18(pCtrl, 2);
particleEmitter_func_802EF9F8(pCtrl, 0.6f);
particleEmitter_func_802EFA18(pCtrl, 2);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
particleEmitter_setDrawMode(pCtrl, 2);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);

6
src/GV/code_5570.c
View File

@@ -26,7 +26,7 @@ ActorAnimationInfo D_80391120[] ={
ActorInfo D_80391158 = { MARKER_A6_GRABBA, ACTOR_118_GRABBA, ASSET_371_MODEL_GRABBA,
0x1, D_80391120,
GV_func_8038BEA0, func_80326224, actor_draw,
GV_func_8038BEA0, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
@@ -122,7 +122,7 @@ void func_8038BBFC(ParticleEmitter *pCtrl, f32 position[3], s32 cnt){
void func_8038BC7C(f32 position[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
func_8038BBFC(pCtrl, position, cnt);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-60.0f, 0.0f, -60.0f,
60.0f, 30.0f, 60.0f
);
@@ -140,7 +140,7 @@ void func_8038BC7C(f32 position[3], s32 cnt){
void func_8038BD8C(f32 position[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
func_8038BBFC(pCtrl, position, cnt);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-40.0f, 0.0f, -40.0f,
40.0f, 30.0f, 40.0f
);

2
src/GV/code_61E0.c
View File

@@ -17,7 +17,7 @@ ActorAnimationInfo D_80391190[] = {
ActorInfo D_803911C0 = { 0xAC, 0x11E, 0x3E5,
0, D_80391190,
GV_func_8038C658, func_80326224, GV_func_8038C5D0,
GV_func_8038C658, actor_update_func_80326224, GV_func_8038C5D0,
0, 0, 0.0f, 0
};

6
src/GV/code_6370.c
View File

@@ -24,19 +24,19 @@ Actor *func_8038CC40(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
u8 D_803911F0[3] = {0, 1, 2};
ActorInfo D_803911F4 = { 0xBB, 0x285, 0x3E6,
0, NULL,
func_8038CC98, func_80326224, func_8038CC40,
func_8038CC98, actor_update_func_80326224, func_8038CC40,
0, 0, 0.0f, 0
};
ActorInfo D_80391218 = { 0xBB, 0x286, 0x3E6,
0, NULL,
func_8038CC98, func_80326224, func_8038CC40,
func_8038CC98, actor_update_func_80326224, func_8038CC40,
0, 0, 0.0f, 0
};
ActorInfo D_8039123C = { 0xBB, 0x287, 0x3E6,
0, NULL,
func_8038CC98, func_80326224, func_8038CC40,
func_8038CC98, actor_update_func_80326224, func_8038CC40,
0, 0, 0.0f, 0
};

2
src/GV/code_7060.c
View File

@@ -16,7 +16,7 @@ ActorAnimationInfo D_80391290[] = {
};
ActorInfo D_803912B8 = { MARKER_F9_JINXY, ACTOR_1F7_JINXY, ASSET_422_MODEL_JINXY,
0x1, D_80391290,
func_8038D47C, func_80326224, actor_draw,
func_8038D47C, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};

4
src/GV/code_7FC0.c
View File

@@ -11,13 +11,13 @@ ActorAnimationInfo GV_D_80391380[] = {
};
ActorInfo GV_D_80391390 = { 0xFA, 0x1F8, 0x423,
0x1, GV_D_80391380,
func_8038E3B0, func_80326224, actor_draw,
func_8038E3B0, actor_update_func_80326224, actor_draw,
0, 0x100, 0.0f, 0
};
ActorInfo D_803913B4 = { 0xFB, 0x1F9, 0x424,
0x1, GV_D_80391380,
func_8038E3B0, func_80326224, actor_draw,
func_8038E3B0, actor_update_func_80326224, actor_draw,
0, 0x100, 0.0f, 0
};

18
src/GV/code_7FF0.c
View File

@@ -82,25 +82,25 @@ ActorAnimationInfo D_803913E0[] = {
ActorInfo D_80391428 = { MARKER_EC_GV_SUN_SWITCH, ACTOR_13F_GV_SUN_SWITCH, ASSET_400_MODEL_SUN_SWITCH,
0x1, D_803913E0,
chSunSwitch_update, func_80326224, actor_draw,
chSunSwitch_update, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_8039144C = { MARKER_F1_GV_STAR_SWITCH, ACTOR_144_GV_STAR_SWITCH, ASSET_3D7_MODEL_STAR_SWITCH,
0x1, D_803913E0,
chStarSwitch_update, func_80326224, actor_draw,
chStarSwitch_update, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80391470 = { MARKER_F2_HONEYCOMB_SWITCH, ACTOR_145_HONEYCOMB_SWITCH, ASSET_438_MODEL_HONEYCOMB_SWITCH,
0x1, D_803913E0,
chHoneycombSwitch_update, func_80326224, actor_draw,
chHoneycombSwitch_update, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80391494 = { MARKER_23C_GV_SNS_SWITCH, ACTOR_245_GV_SNS_SWITCH, ASSET_515_MODEL_GV_SNS_SWITCH,
0x1, D_803913E0,
func_8038EF14, func_80326224, actor_draw,
func_8038EF14, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
@@ -118,31 +118,31 @@ ActorInfo D_803914DC = { MARKER_ED_GV_SUN_DOOR, ACTOR_140_GV_SUN_DOOR, ASSET_3FF
ActorInfo GV_D_80391500 = { MARKER_F0_GV_KAZOOIE_DOOR, ACTOR_143_GV_KAZOOIE_DOOR, ASSET_3D9_MODEL_GV_KAZOOIE_DOOR,
0x1, 0x0,
chKazooieDoor_update, func_80326224, func_80325F2C,
chKazooieDoor_update, actor_update_func_80326224, func_80325F2C,
0, 0, 0.0f, 0
};
ActorInfo GV_D_80391524 = { MARKER_EF_GV_STAR_HATCH, ACTOR_142_GV_STAR_HATCH, ASSET_3DB_MODEL_GV_STAR_HATCH,
0x1, 0x0,
func_8038E648, func_80326224, func_80325F2C,
func_8038E648, actor_update_func_80326224, func_80325F2C,
0, 0, 0.0f, 0
};
ActorInfo D_80391548 = { MARKER_F3_GV_KAZOOIE_TARGET, ACTOR_146_GV_KAZOOIE_TARGET, ASSET_3E2_MODEL_GV_KAZOOIE_TARGET,
0x1, 0x0,
chKazooieTarget_update, func_80326224, actor_drawFullDepth,
chKazooieTarget_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0x400, 0.0f, 0
};
ActorInfo D_8039156C = { MARKER_F8_GV_KAZOOIE_DOOR, ACTOR_1F5_GV_KAZOOIE_DOOR, ASSET_3D9_MODEL_GV_KAZOOIE_DOOR,
0x1, 0x0,
func_8038E97C, func_80326224, func_80325F2C,
func_8038E97C, actor_update_func_80326224, func_80325F2C,
0, 0, 0.0f, 0
};
ActorInfo D_80391590 = { MARKER_23A_GV_SNS_CHAMBER_DOOR, ACTOR_243_GV_SNS_CHAMBER_DOOR, ASSET_514_MODEL_GV_SNS_CHAMBER_DOOR,
0x1, 0x0,
func_8038E914, func_80326224, func_80325F2C,
func_8038E914, actor_update_func_80326224, func_80325F2C,
0, 0, 0.0f, 0
};