Created inital yaml for decompressed rom, edited makefile to build it and fixed all undefined symbol/multiple definition errors
This commit is contained in:
@@ -21,7 +21,7 @@ void func_80328B8C(Actor*, s32, f32, s32);
|
||||
void func_802C8F70(f32);
|
||||
void func_80324E88(f32);
|
||||
Actor *func_8032811C(s32 actor_id, s32 position[3], s32 yaw);
|
||||
void func_80387F44(void);
|
||||
void MM_func_80387F44(void);
|
||||
|
||||
void func_803876D0(Actor *);
|
||||
|
||||
@@ -180,7 +180,7 @@ void func_803873C8(ActorMarker *congaMarker){
|
||||
f32 iVelY;
|
||||
|
||||
congaPtr->unk10_12 -= (congaPtr->unk10_12 && ( conga_state == 7));
|
||||
func_80387F44();
|
||||
MM_func_80387F44();
|
||||
congaPtr->unk28 = 2.0f;
|
||||
orangePtr = func_8032811C(ACTOR_14_ORANGE_PROJECTILE, conga_localPtr->orangeSpawnPosition, congaPtr->yaw);
|
||||
|
||||
|
@@ -44,7 +44,7 @@ void func_80388300(Actor **arg0){
|
||||
if(arg0);
|
||||
}
|
||||
|
||||
void func_803883AC(Actor *this){
|
||||
void MM_func_803883AC(Actor *this){
|
||||
f32 sp2C;
|
||||
f32 sp28;
|
||||
static D_80389A5C = 0;
|
||||
@@ -85,7 +85,7 @@ void func_803885D0(Actor *this){
|
||||
func_80343DEC(this);
|
||||
}else{//L80388630
|
||||
if(func_80329530(this, 0x2BC) && !func_803114B0()){
|
||||
func_803883AC(this);
|
||||
MM_func_803883AC(this);
|
||||
}//L8038865C
|
||||
switch(this->state){
|
||||
case 1://L80388690
|
||||
|
@@ -11,13 +11,13 @@
|
||||
f32 func_80309724(f32*);
|
||||
|
||||
/* public functions */
|
||||
void func_80387FF4(Actor *this);
|
||||
void MM_func_80387FF4(Actor *this);
|
||||
Actor* func_80388188(ActorMarker *, Gfx **, Mtx**, Vtx**);
|
||||
|
||||
/* .data */
|
||||
ActorInfo chorangeInfo = { MARKER_C_ORANGE_PROJECTILE, ACTOR_14_ORANGE_PROJECTILE, ASSET_2D2_MODEL_ORANGE,
|
||||
1, NULL,
|
||||
func_80387FF4, func_80326224, func_80388188,
|
||||
MM_func_80387FF4, func_80326224, func_80388188,
|
||||
0, 0, 0.6f, 0
|
||||
};
|
||||
|
||||
@@ -35,7 +35,7 @@ void func_80387F90(ActorMarker *arg0, ActorMarker *other_marker){
|
||||
if(arg0);
|
||||
}
|
||||
|
||||
void func_80387FF4(Actor * this){
|
||||
void MM_func_80387FF4(Actor * this){
|
||||
f32 temp_f2;
|
||||
f32 temp_f0;
|
||||
|
||||
|
@@ -19,7 +19,7 @@ ActorInfo chorangepadInfo = { MARKER_66_ORANGE_PAD, ACTOR_57_ORANGE_PAD, ASSET_2
|
||||
};
|
||||
|
||||
/*.code */
|
||||
void func_803863F0(s32 x, s32 y, s32 z){
|
||||
void MM_func_803863F0(s32 x, s32 y, s32 z){
|
||||
f32 pos[3];
|
||||
|
||||
TUPLE_ASSIGN(pos, x, y, z);
|
||||
@@ -49,7 +49,7 @@ void func_80386444(ActorMarker *arg0){
|
||||
|
||||
func_802BAFE4(temp_a0);
|
||||
sp44[1] += 50.0f;
|
||||
timedFunc_set_3(0.6f, (TFQM3) func_803863F0, (s32)sp44[0], (s32)sp44[1], (s32)sp44[2]);
|
||||
timedFunc_set_3(0.6f, (TFQM3) MM_func_803863F0, (s32)sp44[0], (s32)sp44[1], (s32)sp44[2]);
|
||||
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
|
||||
if(!jiggyscore_isCollected(JIGGY_8_MM_ORANGE_PADS)){
|
||||
func_80311480(0xB3B, 4, NULL, NULL, NULL, NULL);
|
||||
|
@@ -15,7 +15,7 @@ extern ActorInfo chjujuInfo;
|
||||
extern ActorInfo chorangepadInfo;
|
||||
extern ActorInfo chlmonkeyInfo;
|
||||
|
||||
void func_803888B0(void){
|
||||
void MM_func_803888B0(void){
|
||||
spawnableActorList_add( &chhutInfo, actor_new, 0X400);
|
||||
spawnableActorList_add( &chchimpystump, actor_new, 0x0);
|
||||
spawnableActorList_add( &chgrublinInfo, actor_new, 0X2000121);
|
||||
|
@@ -27,7 +27,7 @@ void func_80387EC0(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void func_80387F44(void) {
|
||||
void MM_func_80387F44(void) {
|
||||
s32 sp1C;
|
||||
|
||||
osPiReadIo(0x578, (u32 *)&sp1C);
|
||||
|
Reference in New Issue
Block a user