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

6
src/FP/ch/bearcub.c
View File

@@ -41,9 +41,9 @@ ActorInfo D_80391E50 = { MARKER_1FC_POLAR_BEAR_CUB_RED, ACTOR_1EC_POLAR_BEAR_CUB
f32 FP_D_80391E74[3] = {-5.0f, 180.0f, 1.0f};
Struct_FP_3E00 D_80391E80[] ={
{0x11, MARKER_1FD_BLUE_PRESENT_COLLECTABLE, ACTOR_1ED_BLUE_PRESENT_COLLECTABLE, 0x1EE},
{0x12, MARKER_1FE_GREEN_PRESENT_COLLECTABLE, ACTOR_1EF_GREEN_PRESENT_COLLECTABLE, 0x1F0},
{0x13, MARKER_1FF_RED_PRESENT_COLLECTABLE, ACTOR_1F1_RED_PRESENT_COLLECTABLE, 0x1F2}
{0x11, MARKER_1FD_BLUE_PRESENT_COLLECTIBLE, ACTOR_1ED_BLUE_PRESENT_COLLECTIBLE, 0x1EE},
{0x12, MARKER_1FE_GREEN_PRESENT_COLLECTIBLE, ACTOR_1EF_GREEN_PRESENT_COLLECTIBLE, 0x1F0},
{0x13, MARKER_1FF_RED_PRESENT_COLLECTIBLE, ACTOR_1F1_RED_PRESENT_COLLECTIBLE, 0x1F2}
};
/* .code */

2
src/FP/ch/present.c
View File

@@ -7,7 +7,7 @@ void func_8038F144(Actor *this);
/* .data */
ActorAnimationInfo D_803924A0[] = {
{0, 0.0f},
{ASSET_18A_XMAS_GIFT, 1.5f}
{ASSET_18A_ANIM_XMAS_GIFT, 1.5f}
};
ActorInfo D_803924B0 = { MARKER_208_BLUE_PRESENT, ACTOR_33A_BLUE_PRESENT, ASSET_47F_MODEL_XMAS_GIFT_BLUE,

8
src/FP/racectrl.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);
typedef struct {
ActorMarker *marker;
@@ -265,7 +267,7 @@ void func_8038B2C8(ActorMarker *caller, enum asset_e text_id, s32 arg2){
void func_8038B39C(void){
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS){
func_8028F710(3, 2.0f);
player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 2.0f);
}
func_8028F918(1);
func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 28000);
@@ -323,7 +325,7 @@ void func_8038B544(void){
case 2: //L8038B61C
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == BSGROUP_6_TURBO_TALON_TRAINERS){
func_8028F710(3, 20.0f);
player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 20.0f);
}
if(D_80392F70[0x26].marker == NULL) break;