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;