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

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

@@ -12,14 +12,14 @@ Actor *func_8038DA18(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorAnimationInfo D_803912E0[] = {
{0x00, 0.0f},
{0xD1, 800000.0f},
{0xE2, 2.0f},
{0xD1, 800000.0f},
{0xD0, 6.0f},
{0xCF, 2.0f},
{0xD1, 1.6f},
{ASSET_D1_ANIM_HISTUP_HIDE, 800000.0f},
{ASSET_E2_ANIM_HISTUP_PEEK, 2.0f},
{ASSET_D1_ANIM_HISTUP_HIDE, 800000.0f},
{ASSET_D0_ANIM_HISTUP_GROW, 6.0f},
{ASSET_CF_ANIM_HISTUP_RAISED, 2.0f},
{ASSET_D1_ANIM_HISTUP_HIDE, 1.6f},
};
ActorInfo D_80391318 = { 0xAA, 0x11C, 0x3DE,
ActorInfo D_80391318 = { MARKER_AA_HISTUP, ACTOR_11C_HISTUP, ASSET_3DE_MODEL_HISTUP,
0x1, D_803912E0,
func_8038DBDC, func_80326224, func_8038DA18,
2500, 0, 1.7f, 0

10
src/GV/code_3630.c
View File

@@ -7,11 +7,11 @@ void func_80389B1C(Actor *this);
/* .data */
ActorAnimationInfo D_80390EA0[] = {
{0x00, 0.0f},
{0xDF, 4.5f},
{0xE3, 2.0f},
{0xE4, 1.95f},
{0xCE, 2.4f},
{0xDF, 4.5f}
{ASSET_DF_ANIM_RUBEE_PET_TOOTS, 4.5f},
{ASSET_E3_ANIM_RUBEE_IDLE, 2.0f},
{ASSET_E4_ANIM_RUBEE_PLAY, 1.95f},
{ASSET_CE_ANIM_RUBEE_STOP_PLAYING, 2.4f},
{ASSET_DF_ANIM_RUBEE_PET_TOOTS, 4.5f}
};
ActorInfo D_80390ED0 = { MARKER_A9_RUBEE, ACTOR_11B_RUBEE, ASSET_3DD_MODEL_RUBEE,

8
src/GV/code_3B10.c
View File

@@ -2,7 +2,9 @@
#include "functions.h"
#include "variables.h"
extern void func_8028F710(s32, f32);
#include "core2/statetimer.h"
extern void player_stateTimer_set(s32, f32);
extern f32 player_stateTimer_get(enum state_timer_e);
/* .data */
//TODO Implement CRC calculation in Makefile(?)
@@ -13,8 +15,8 @@ u32 D_80390F38 = 0x0003031C; //GV.data CRC1 (with this value = 0)
/* .code */
void func_80389F00(void){
if(getGameMode() != GAME_MODE_7_ATTRACT_DEMO && 2.0f < func_8028E80C(3)){
func_8028F710(3, 2.0f);
if(getGameMode() != GAME_MODE_7_ATTRACT_DEMO && 2.0f < player_stateTimer_get(STATE_TIMER_3_TURBO_TALON)){
player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 2.0f);
}
}

12
src/GV/code_3D90.c
View File

@@ -12,11 +12,11 @@ Actor *func_8038A180(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorAnimationInfo D_80390FA0[] = {
{0, 0.0f},
{0xC9, 2.0f},
{0xC9, 2.0f},
{0xC9, 2.0f},
{0xC9, 2.0f},
{0xC9, 2.0f},
{ASSET_C9_ANIM_MAGIC_CARPET, 2.0f},
{ASSET_C9_ANIM_MAGIC_CARPET, 2.0f},
{ASSET_C9_ANIM_MAGIC_CARPET, 2.0f},
{ASSET_C9_ANIM_MAGIC_CARPET, 2.0f},
{ASSET_C9_ANIM_MAGIC_CARPET, 2.0f},
};
ActorInfo D_80390FD0 = { MARKER_B0_MAGIC_CARPET_2, ACTOR_123_MAGIC_CARPET_2, ASSET_3DC_MODEL_MAGIC_CARPET,
0x1, D_80390FA0,
@@ -35,7 +35,7 @@ Actor *func_8038A180(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if( this->unk54 == 0.0f
&& this->unk48 != this->unk1C[1]
&& this_marker->unk14_21
&& func_80329530(this, 0xbb8)
&& func_80329530(this, 3000)
){
func_8033E73C(this->marker, 6, func_80329904);
func_8033E3F0(0xc, this->marker->unk14_21);

4
src/GV/code_43B0.c
View File

@@ -13,7 +13,7 @@ Actor *func_8038A7A0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorAnimationInfo D_80391000[] = {
{0, 0.0f},
{0xC9, 2.0f}
{ASSET_C9_ANIM_MAGIC_CARPET, 2.0f}
};
ActorInfo D_80391010 = { MARKER_A7_MAGIC_CARPET_1, ACTOR_119_MAGIC_CARPET_1, ASSET_3DC_MODEL_MAGIC_CARPET,
@@ -101,7 +101,7 @@ void GV_func_8038A9C0(Actor *this){
}
this->unk1C[2] = this->unk1C[1];
this->unk1C[1] = this->unk48;
if(this->unk100 && sp24 && this->unk100->unk14_20 == MARKER_AF_MAGIC_CARPET_SHADOW){
if(this->unk100 != NULL && sp24 != NULL && this->unk100->unk14_20 == MARKER_AF_MAGIC_CARPET_SHADOW){
sp24->unk1C[0] = func_8038A860(sp24, this);
}
}

2
src/GV/code_4740.c
View File

@@ -124,7 +124,7 @@ void func_8038AFF4(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
func_8032B4DC(this, other_marker, 0xC);
actor_collisionOff(this);
func_80328B8C(this, ASSET_9_ANIM_BANJO_DIE, 0.00001f, 1);
func_80328B8C(this, ASSET_9_ANIM_BSDIE, 0.00001f, 1);
actor_playAnimationOnce(this);
this->unk1C[0] = 0.0f;
func_8030E878(SFX_D7_GRABBA_DEATH, 1.0f, 32000, this->position, 2250.0f, 4500.0f);

6
src/GV/code_5570.c
View File

@@ -3,7 +3,9 @@
#include "variables.h"
extern void func_8025AE50(s32, f32);
extern void func_8028F710(s32, f32);
#include "core2/statetimer.h"
extern void player_stateTimer_set(s32, f32);
typedef struct {
s32 unk0;
@@ -59,7 +61,7 @@ void func_8038BA08(Actor *this){
this->unk100 = NULL;
D_80391A80 = 3;
if(func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS)
func_8028F710(3, 0.0f);
player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 0.0f);
func_80311480(ASSET_A79_TEXT_GRABBA_DEFEAT, 0xf, this->position, this->marker, func_8038B988, NULL);
comusic_8025AB44(COMUSIC_57_TURBO_TRAINERS, 7000, 700);