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

10
src/TTC/ch/blubber.c
View File

@@ -22,11 +22,11 @@ Actor *func_80387D6C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorAnimationInfo D_8038C4E0[] = {
{0x00, 0.0f},
{0xB5, 2.0f},
{0xB6, 2.0f},
{0xB6, 2.0f},
{0xB7, 1.4f},
{0xB8, 0.8f}
{ASSET_B5_ANIM_BLUBBER_WALK, 2.0f},
{ASSET_B6_ANIM_BLUBBER_CRY, 2.0f},
{ASSET_B6_ANIM_BLUBBER_CRY, 2.0f},
{ASSET_B7_ANIM_BLUBBER_DANCE, 1.4f},
{ASSET_B8_ANIM_BLUBBER_RUN, 0.8f}
};
ActorInfo TTC_D_8038C510 = {

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

@@ -11,9 +11,9 @@ void chClam_update(Actor *this);
/* .data */
ActorAnimationInfo chClamAnimations[] = {
{0x00, 0.0f},
{0xAA, 2.0f},
{0x24, 1.0f},
{0xAB, 0.6f}
{ASSET_AA_ANIM_CLAM_IDLE, 2.0f},
{ASSET_24_ANIM_CLAM_HOP, 1.0f},
{ASSET_AB_ANIM_CLAM_EAT, 0.6f}
};
ActorInfo chClam = {
@@ -196,7 +196,7 @@ void __chClam_emitSmallShellParticles(f32 position[3], s32 count){
particleEmitter_emitN(pCtrl, count);
}
void __chClam_emitEatenCollectableParticles(f32 position[3], enum asset_e sprite_id, s32 count){
void __chClam_emitEatencollectibleParticles(f32 position[3], enum asset_e sprite_id, s32 count){
static struct31s D_8038C484 = {
{0.2f, 0.35f},
{0.0f, 0.0f},
@@ -282,7 +282,7 @@ void chClam_update(Actor *this){
sp44 = sp4C->marker->unk14_20;
}
if(sp44 == MARKER_60_BLUE_EGG_COLLECTABLE || sp44 == 0xb5){
if(sp44 == MARKER_60_BLUE_EGG_COLLECTIBLE || sp44 == MARKER_B5_RED_FEATHER_COLLECTIBLE){
if(this->position_y <= sp48 + 15.0f && sp48 - 15.0f <= this->position_y){
this->position_y = sp48;
this->unk38_31 = sp44;
@@ -351,11 +351,11 @@ void chClam_update(Actor *this){
func_8034A174(this->marker->unk44, 5, sp38);
switch(this->unk38_31){
case MARKER_60_BLUE_EGG_COLLECTABLE:
__chClam_emitEatenCollectableParticles(sp38, ASSET_718_SPRITE_SPARKLE_WHITE_2, 8);
case MARKER_60_BLUE_EGG_COLLECTIBLE:
__chClam_emitEatencollectibleParticles(sp38, ASSET_718_SPRITE_SPARKLE_WHITE_2, 8);
break;
case MARKER_B5_RED_FEATHER_COLLECTABLE:
__chClam_emitEatenCollectableParticles(sp38, ASSET_715_SPRITE_SPARKLE_RED, 8);
case MARKER_B5_RED_FEATHER_COLLECTIBLE:
__chClam_emitEatencollectibleParticles(sp38, ASSET_715_SPRITE_SPARKLE_RED, 8);
break;
}
break;

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

@@ -15,11 +15,11 @@ void func_80389600(Actor *this);
/* .data */
ActorAnimationInfo D_8038C760[] ={
{0, 0.0f},
{0xBC, 8000000.0f},
{0xBC, 4.0f},
{0xBC, 8000000.0f},
{0xBC, 1.4f},
{0xBC, 8000000.0f}
{ASSET_BC_ANIM_LOCKUP, 8000000.0f},
{ASSET_BC_ANIM_LOCKUP, 4.0f},
{ASSET_BC_ANIM_LOCKUP, 8000000.0f},
{ASSET_BC_ANIM_LOCKUP, 1.4f},
{ASSET_BC_ANIM_LOCKUP, 8000000.0f}
};
ActorInfo D_8038C790 = {

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

@@ -9,12 +9,12 @@ Actor *func_80387EB0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorAnimationInfo D_8038C540[] = {
{0x00, 0.0f},
{0xC0, 2.0f},
{0xBD, 1.5f},
{0xBF, 1.2f},
{0xBE, 1.3f},
{0xC0, 2.0f},
{0x133, 3.0f},
{ASSET_C0_ANIM_NIPPER_IDLE, 2.0f},
{ASSET_BD_ANIM_NIPPER_VULNERABLE, 1.5f},
{ASSET_BF_ANIM_NIPPER_ATTACK, 1.2f},
{ASSET_BE_ANIM_NIPPER_OW, 1.3f},
{ASSET_C0_ANIM_NIPPER_IDLE, 2.0f},
{ASSET_133_ANIM_NIPPER_DIE, 3.0f},
{0x00, 0.0f}
};