Created inital yaml for decompressed rom, edited makefile to build it and fixed all undefined symbol/multiple definition errors
This commit is contained in:
@@ -5,14 +5,14 @@
|
||||
void func_8038BF28(Actor *this);
|
||||
|
||||
/* .data */
|
||||
ActorInfo D_80390AE0 = {
|
||||
ActorInfo RBB_D_80390AE0 = {
|
||||
0x31, 0x1C9, 0x41D, 0x0, NULL,
|
||||
func_8038BF28, NULL, func_80325888,
|
||||
0, 0, 0.0f, 0
|
||||
};
|
||||
|
||||
/* .code */
|
||||
void func_8038BEA0(Actor *this, s32 arg1){
|
||||
void RBB_func_8038BEA0(Actor *this, s32 arg1){
|
||||
if(arg1 == 1)
|
||||
func_80335924(this->unk148, ASSET_141_ANIM_ANCHOR_LOWERED, 0.0f, 5.5f);
|
||||
|
||||
@@ -31,14 +31,14 @@ void func_8038BF28(Actor *this){
|
||||
this->position_z = 1460.0f;
|
||||
this->marker->propPtr->unk8_3 = 1;
|
||||
this->yaw = 0.0f;
|
||||
func_8038BEA0(this, 1);
|
||||
RBB_func_8038BEA0(this, 1);
|
||||
if(jiggyscore_isSpawned(JIGGY_53_RBB_SNORKEL)){
|
||||
marker_despawn(this->marker);
|
||||
}
|
||||
}
|
||||
else{
|
||||
if(this->state == 1 && mapSpecificFlags_get(8)){
|
||||
func_8038BEA0(this, 2);
|
||||
RBB_func_8038BEA0(this, 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user