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/BGS/ch/code_8A60.c
View File

@@ -10,13 +10,13 @@ void func_8038F06C(Actor *this);
ActorAnimationInfo D_80390B90[] = {
{0x00, 0.0f},
{0x00, 0.0f},
{0xD4, 0.15f},
{0xD5, 0.5f},
{ASSET_D4_ANIM_SWITCH_DOWN, 0.15f},
{ASSET_D5_ANIM_SWITCH_UP, 0.5f},
{0x00, 0.0f},
{0x00, 0.0f},
{0xD4, 0.15f},
{0xD5, 0.5f},
{0xD5, 1e+8f}
{ASSET_D4_ANIM_SWITCH_DOWN, 0.15f},
{ASSET_D5_ANIM_SWITCH_UP, 0.5f},
{ASSET_D5_ANIM_SWITCH_UP, 1e+8f}
};
ActorInfo D_80390BD8 = {MARKER_F5_BGS_ELEVATED_WALKWAY_SWITCH, ACTOR_14E_BGS_ELEVATED_WALKWAY_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH, 1, D_80390B90, func_8038EEA4, func_80326224, func_80325888, 0, 0, 0.0f, 0};
ActorInfo D_80390BFC = {MARKER_FD_BGS_MAZE_SWITCH, ACTOR_1FB_BGS_MAZE_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH, 1, D_80390B90, func_8038F06C, func_80326224, func_80325888, 0, 0, 0.0f, 0};

13
src/BGS/ch/mudhut.c
View File

@@ -1,9 +1,12 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/statetimer.h"
/* TODO move declarations to respective headers*/
void func_8028F710(s32, f32);
extern void player_stateTimer_set(enum state_timer_e, f32);
extern f32 player_stateTimer_get(enum state_timer_e);
void func_802C4218(u32,f32,f32,f32);
void func_80328A84(Actor *, u32);
@@ -17,8 +20,8 @@ void chmudhut_update(Actor *this);
ActorAnimationInfo D_80390B30[4] = {
{0, 0.0f},
{0, 0.0f},
{anim_mudhut_smashing, 0.25f},
{anim_mudhut_smashing, 1000000.0f}
{ASSET_4E_ANIM_MUDHUT_SMASH, 0.25f},
{ASSET_4E_ANIM_MUDHUT_SMASH, 1000000.0f}
};
u32 D_80390B50[6] = {0xA, 0xA, 0xB, 0xA, 0xA, 0xC};
@@ -30,8 +33,8 @@ ActorInfo D_80390B68 = {MARKER_D5_BGS_MUD_HUT, ACTOR_C_MUD_HUT, ASSET_7D8_MODEL_
/* .code section */
void func_8038EA30(void){
if((getGameMode() != GAME_MODE_7_ATTRACT_DEMO) && (1.5 < func_8028E80C(2)) ){
func_8028F710(2, 1.5);
if((getGameMode() != GAME_MODE_7_ATTRACT_DEMO) && (1.5 < player_stateTimer_get(2)) ){
player_stateTimer_set(STATE_TIMER_2_LONGLEG, 1.5);
}
}

2
src/BGS/code_3420.c
View File

@@ -621,7 +621,7 @@ void chvilegame_update(Actor *this) {
item_set(ITEM_1A_PLAYER_VILE_SCORE, local->player_score);
item_set(ITEM_1B_VILE_VILE_SCORE, local->vile_score);
if ((sp2C != 0) && (local->player_score == 0)) {
func_802FA5D0();
itemPrint_reset();
}
if (item_empty(ITEM_6_HOURGLASS)) {
if (func_803203FC(2)) {