Created inital yaml for decompressed rom, edited makefile to build it and fixed all undefined symbol/multiple definition errors
This commit is contained in:
@@ -6,16 +6,16 @@ Actor *func_803868C0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
|
||||
void func_80386AA4(Actor *this);
|
||||
|
||||
/* .data */
|
||||
ActorAnimationInfo D_80391A40 []= {
|
||||
ActorAnimationInfo FP_D_80391A40 []= {
|
||||
{ ASSET_1A1_ANIM_SLED, 1.0f},
|
||||
{ ASSET_1A1_ANIM_SLED, 1.0f},
|
||||
{ ASSET_1A1_ANIM_SLED, 1.0f},
|
||||
{ ASSET_1A1_ANIM_SLED, 1.0f}
|
||||
};
|
||||
|
||||
ActorInfo D_80391A60 = {
|
||||
ActorInfo FP_D_80391A60 = {
|
||||
MARKER_3C_RACE_SLED, ACTOR_182_RACE_SLED, ASSET_352_MODEL_SLED,
|
||||
0x0, D_80391A40,
|
||||
0x0, FP_D_80391A40,
|
||||
func_80386AA4, NULL, func_803868C0,
|
||||
1000, 0, 0.0f, 0
|
||||
};
|
||||
@@ -29,7 +29,7 @@ Actor *func_803868C0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
return this;
|
||||
}
|
||||
|
||||
void func_80386920(Actor *this, s32 next_state){
|
||||
void FP_func_80386920(Actor *this, s32 next_state){
|
||||
if(this->state != 1 || next_state != 1){
|
||||
func_80328A84(this, next_state);
|
||||
switch(next_state){
|
||||
@@ -60,7 +60,7 @@ void func_803869FC(ActorMarker *this_marker, ActorMarker *other_marker){
|
||||
&& player_getTransformation() == TRANSFORM_4_WALRUS
|
||||
&& func_8028F68C(BS_INTR_27_WALRUS_SLED, this->marker)
|
||||
){
|
||||
func_80386920(this, 3); //start_race
|
||||
FP_func_80386920(this, 3); //start_race
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -70,23 +70,23 @@ void func_80386AA4(Actor *this){
|
||||
if(!this->initialized){
|
||||
this->initialized = TRUE;
|
||||
marker_setCollisionScripts(this->marker, func_803869FC, NULL, NULL);
|
||||
func_80386920(this, 1);
|
||||
FP_func_80386920(this, 1);
|
||||
}
|
||||
|
||||
sp24 = mapSpecificFlags_get(4);
|
||||
if(sp24 == 0){
|
||||
func_80386920(this, 1);
|
||||
FP_func_80386920(this, 1);
|
||||
}
|
||||
|
||||
switch (this->state){
|
||||
case 1://L80386B38
|
||||
if(sp24){
|
||||
func_80386920(this, 2);
|
||||
FP_func_80386920(this, 2);
|
||||
}
|
||||
break;
|
||||
case 3://L80386B50
|
||||
if(func_8028ECAC() != BSGROUP_C_WALRUS_SLED){
|
||||
func_80386920(this, 2);
|
||||
FP_func_80386920(this, 2);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user