splat update
This commit is contained in:
@@ -185,7 +185,7 @@ void func_802C4768(s32 gamenum){
|
||||
break;
|
||||
}//L802C4858
|
||||
strcat(D_8037DD48, ": TIME ");
|
||||
strcat(D_8037DD48, func_80311C64(itemscore_timeScores_getTotal()));
|
||||
strcat(D_8037DD48, gcpausemenu_TimeToA(itemscore_timeScores_getTotal()));
|
||||
strcat(D_8037DD48, ",");
|
||||
strcat(D_8037DD48, "");
|
||||
|
||||
|
@@ -5,8 +5,7 @@
|
||||
extern void func_802BE720(void);
|
||||
extern f32 func_8033A244(f32);
|
||||
extern void func_8033A280(f32);
|
||||
|
||||
extern u8 D_80329904[];
|
||||
extern void func_80329904(ActorMarker *, s32, f32 *);
|
||||
|
||||
typedef struct chjiggy_s{
|
||||
u32 unk0;
|
||||
@@ -129,7 +128,7 @@ void func_802C7DC0(Actor *this){
|
||||
if(this->marker->unk14_21){
|
||||
for(i = 0; i < 4; i++){
|
||||
if(randf() < 0.015){
|
||||
func_8033E73C(this->marker, i + 5, &D_80329904);
|
||||
func_8033E73C(this->marker, i + 5, func_80329904);
|
||||
func_8033E3F0(8, 1);
|
||||
}
|
||||
}
|
||||
|
@@ -81,7 +81,7 @@ struct41FB0s D_80366460[] = {
|
||||
{0x0009, ACTOR_47_EMPTY_HONEYCOMB, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 200.0f, 0.0f, 300.0f, 0.0f, 0.6f, 0.0f},
|
||||
/*YUM YUM EGG*/ {0x0001, ACTOR_52_BLUE_EGG, 1, SFX_21_EGG_BOUNCE_1, 1, 16000, 0.0f, 350.0f, 500.0f, 500.0f, 0.0f, 350.0f, 0.6f, 0.0f},
|
||||
/*YUM YUM FEATHER*/ {0x0001, ACTOR_129_RED_FEATHER, 1, SFX_21_EGG_BOUNCE_1, 1, 16000, 0.0f, 350.0f, 500.0f, 500.0f, 0.0f, 350.0f, 0.6f, 0.0f},
|
||||
{0x0005, ACTOR_46_JIGGY, 1, 0, 0, 0, 0.0f, 0.0f, 100.0f, 0.0f, 0.0f, 0.0f, 0.75f, 0.0f},
|
||||
/*0x10*/{0x0005, ACTOR_46_JIGGY, 1, 0, 0, 0, 0.0f, 0.0f, 100.0f, 0.0f, 0.0f, 0.0f, 0.75f, 0.0f},
|
||||
{0x0005, 0x06A, 1, 0, 0, 0, 0.0f, 0.0f, 200.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f},
|
||||
{0x0009, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 650.0f, 0.0f, 950.0f, 0.0f, 0.6f, 0.0f},
|
||||
{0x0001, ACTOR_51_MUSIC_NOTE, 1, SFX_21_EGG_BOUNCE_1, 1, 16000, 125.0f, 25.0f, 725.0f, 125.0f, 125.0f, 25.0f, 0.6f, 0.0f},
|
||||
|
@@ -48,7 +48,6 @@ typedef struct {
|
||||
}Actorlocal_Core2_9E370;
|
||||
|
||||
/* .data */
|
||||
extern s32 D_803255FC;
|
||||
extern ActorArray *D_8036E560; //actorArrayPtr
|
||||
extern s32 D_8036E564;
|
||||
extern s32 D_8036E568;
|
||||
@@ -972,7 +971,7 @@ Actor *actor_new(s32 (* position)[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
|
||||
}
|
||||
|
||||
if(flags & 0x100){
|
||||
D_80383390->unk130 = &D_803255FC;
|
||||
D_80383390->unk130 = func_803255FC;
|
||||
}
|
||||
|
||||
if(flags & 0x200){
|
||||
|
Reference in New Issue
Block a user