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

document various assets, bsStoredState.c, and stateTimers.c

Browse Source
This commit is contained in:
Banjo Kazooie
2023-02-16 13:21:40 -06:00
parent dd74091cb7
commit 1c4d1b54cd
107 changed files with 1649 additions and 1255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MM/ch/conga.c
View File

@@ -44,7 +44,7 @@ ActorAnimationInfo chCongaAnimations[9] = {
{ASSET_54_ANIM_CONGA_THROW, 1.4f},
{ASSET_55_ANIM_CONGA_BEAT_CHEST, 0.4f},
{ASSET_56_ANIM_CONGA_RAISE_ARMS, 0.9f},
{0xA2, 1.6f},
{ASSET_A2_ANIM_CONGA_THROW_2, 1.6f},
{ASSET_52_ANIM_CONGA_OW, 1.0f}
};
@@ -223,7 +223,7 @@ void func_803876D0(Actor *this){
func_80304D4C(sp40, &((ActorLocal_Conga *)&this->local)->unk10);
}
if(0.0f == this->unk28){
this->unk28 = (actorArray_findActorFromMarkerId(MARKER_36_ORANGE_COLLECTABLE) != NULL)? 2.0f: 1.0f;
this->unk28 = (actorArray_findActorFromMarkerId(MARKER_36_ORANGE_COLLECTIBLE) != NULL)? 2.0f: 1.0f;
}
if(0.0f != this->velocity_x){
this->velocity_x -= 1.0f;

18
src/MM/ch/grublin.c
View File

@@ -28,16 +28,16 @@ void func_80388A80(Actor *);
/* .data */
ActorAnimationInfo chGrublinAnimations[11] = {
{0, 0.0f},
{0x62, 4.0f},
{0x62, 0.7f},
{0x63, 0.7f},
{0x64, 0.9f},
{ASSET_62_ANIM_GRUBLIN_IDLE, 4.0f},
{ASSET_62_ANIM_GRUBLIN_IDLE, 0.7f},
{ASSET_63_ANIM_GRUBLIN_WALK, 0.7f},
{ASSET_64_ANIM_GRUBLIN_JUMP, 0.9f},
{ASSET_94_ANIM_GRUBLIN_DIE, 1.0f},
{0x62, 1.5f},
{0x63, 0.5f},
{0x62, 1.5f},
{0x62, 1000000.0f},
{0x62, 1000000.0f}
{ASSET_62_ANIM_GRUBLIN_IDLE, 1.5f},
{ASSET_63_ANIM_GRUBLIN_WALK, 0.5f},
{ASSET_62_ANIM_GRUBLIN_IDLE, 1.5f},
{ASSET_62_ANIM_GRUBLIN_IDLE, 1000000.0f},
{ASSET_62_ANIM_GRUBLIN_IDLE, 1000000.0f}
};
ActorInfo chgrublinInfo = { MARKER_5_GRUBLIN, ACTOR_6_GRUBLIN, ASSET_3C5_MODEL_GRUBLIN,

20
src/MM/ch/hut.c
View File

@@ -23,19 +23,10 @@ extern s32 D_8037DCB0; //mm_hut_smash_count
/* .data */
ActorAnimationInfo chhutAnimations[3] = {
{0, 0.0f},
{0x4E, 0.25f},
{0x4E, 1000000.0f}
{ASSET_4E_ANIM_MUDHUT_SMASH, 0.25f},
{ASSET_4E_ANIM_MUDHUT_SMASH, 1000000.0f}
};
s32 D_803898D8[6] = { 0, 1, 2, 3, 6, 4};
ActorInfo chhutInfo = { MARKER_51_MM_HUT, ACTOR_9_MM_HUT, ASSET_7D7_MODEL_MM_HUT,
0, chhutAnimations,
chhut_update, func_80326224, chhut_draw,
0, 0x100, 0.0f, 0
};
/* .code */
Actor *chhut_draw(ActorMarker *this, Gfx **arg1, Mtx **arg2, Vtx **arg3){
Actor *actorPtr;
@@ -64,6 +55,7 @@ void func_803869EC(ActorMarker *this){
}
void chhut_update(Actor *this){
static s32 D_803898D8[6] = { 0, 1, 2, 3, 6, 4};
f32 sp3C[3];
f32 sp30[3];
@@ -119,3 +111,9 @@ void chhut_update(Actor *this){
void mm_resetHuts(void){
D_8037DCB0 = 0;
}
ActorInfo chhutInfo = { MARKER_51_MM_HUT, ACTOR_9_MM_HUT, ASSET_7D7_MODEL_MM_HUT,
0, chhutAnimations,
chhut_update, func_80326224, chhut_draw,
0, 0x100, 0.0f, 0
};

38
src/MM/ch/lmonkey.c
View File

@@ -12,28 +12,28 @@ s32 func_8028F31C(f32 *, f32, s32, Actor **);
void func_8028FA34(s32, Actor *);
void func_803885D0(Actor *);
void chLMonkey_update(Actor *);
/* .data */
ActorAnimationInfo chlmonkeyAnimations[5] = {
{0, 0.0f},
{0x5C, 2.3f},
{0x5B, 0.67f},
{0x5D, 0.5f},
{0x5C, 2.3f}
{ASSET_5C_ANIM_CHIMPY_IDLE, 2.3f},
{ASSET_5B_ANIM_CHIMPY_JUMP, 0.67f},
{ASSET_5D_ANIM_CHIMPY_WALK, 0.5f},
{ASSET_5C_ANIM_CHIMPY_IDLE, 2.3f}
};
ActorInfo chlmonkeyInfo = { MARKER_A_CHIMPY, ACTOR_F_CHIMPY, ASSET_35D_MODEL_CHIMPY,
1, chlmonkeyAnimations,
NULL, func_803885D0, func_80325888,
NULL, chLMonkey_update, func_80325888,
2500, 0, 0.8f, 0
};
/* .code */
void func_80388300(Actor **arg0){
func_8028F31C((*arg0)->position, 800.0f, ACTOR_29_ORANGE_COLLECTABLE, arg0);
if( func_80329530(*arg0, 0x159)
&& carriedObj_getMarkerId() == MARKER_36_ORANGE_COLLECTABLE
func_8028F31C((*arg0)->position, 800.0f, ACTOR_29_ORANGE_COLLECTIBLE, arg0);
if( func_80329530(*arg0, 345)
&& carriedObj_getMarkerId() == MARKER_36_ORANGE_COLLECTIBLE
&& func_8028FC34()
){
func_8028FA34(0xc6, *arg0);
@@ -61,30 +61,30 @@ void MM_func_803883AC(Actor *this){
}
}
void func_803884C0(s32 x, s32 y, s32 z){
void __chLMonkey_spawnJiggy(s32 x, s32 y, s32 z){
f32 sp1C[3];
TUPLE_ASSIGN(sp1C, x, y, z);
jiggySpawn(JIGGY_9_MM_CHIMPY, sp1C);
}
void func_80388514(ActorMarker *marker, enum asset_e arg1, s32 arg2){
void __chLMonkey_complete(ActorMarker *marker, enum asset_e arg1, s32 arg2){
Actor * actor = marker_getActor(marker);
mapSpecificFlags_set(4,1);
func_80328A84(actor, 3);
timed_setCameraToNode(2.3f, 0x12);
timedFunc_set_3(2.9f,func_803884C0, actor->position_x, actor->position_y + 150.0f, actor->position_z);
timedFunc_set_3(2.9f,__chLMonkey_spawnJiggy, actor->position_x, actor->position_y + 150.0f, actor->position_z);
func_80324E88(4.3f);
func_80324E38(4.3f, 0);
}
void func_803885D0(Actor *this){
void chLMonkey_update(Actor *this){
func_8028E668(this->position, 35.0f, 0.0f, 65.0f);
actor_collisionOff(this);
this->marker->propPtr->unk8_3 = 1;
if(map_get() != MAP_2_MM_MUMBOS_MOUNTAIN){
func_80343DEC(this);
}else{//L80388630
if(func_80329530(this, 0x2BC) && !func_803114B0()){
if(func_80329530(this, 700) && !func_803114B0()){
MM_func_803883AC(this);
}//L8038865C
switch(this->state){
@@ -92,18 +92,18 @@ void func_803885D0(Actor *this){
if(mapSpecificFlags_get(2)){
func_80328A84(this, 4);
if(!jiggyscore_isCollected(JIGGY_9_MM_CHIMPY)){
func_80311480(0xB40, 0xE, this->position, this->marker, func_80388514, NULL);
func_80311480(ASSET_B40_DIALOG_CHIMPY_COMPLETE, 0xE, this->position, this->marker, __chLMonkey_complete, NULL);
}else{//L803886E8
func_80388514(this->marker, 0xB40, -1);
__chLMonkey_complete(this->marker, ASSET_B40_DIALOG_CHIMPY_COMPLETE, -1);
}//L80388898
}else{
func_80388300(&this);
if( func_80329530(this, 0x159)
&& !func_80329530(this, 0x96)
if( func_80329530(this, 345)
&& !func_80329530(this, 150)
&& !item_getCount(ITEM_19_ORANGE)
&& !this->unk138_24
){
func_80311480(0xb3f, 0xe, this->position, NULL, NULL, NULL);
func_80311480(ASSET_B3F_DIALOG_CHIMPY_MEET, 0xe, this->position, NULL, NULL, NULL);
this->unk138_24 = 1;
}//L80388774
actor_loopAnimation(this);