kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Created inital yaml for decompressed rom, edited makefile to build it and fixed all undefined symbol/multiple definition errors

Browse Source
This commit is contained in:
Mr-Wiseguy
2022-10-28 02:46:26 -04:00
parent cc8a6ffc78
commit e1bf4549e3
174 changed files with 3648 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MMM/ch/napper.c
View File

@@ -175,7 +175,7 @@ void chnapper_update(Actor *this){
__chnapper_setState(this, 2);
}
if(func_80389530() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){
if(MMM_func_80389530() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){
__chnapper_setState(this, 3);
}
}//L80386F74

4
src/MMM/code_16B0.c
View File

@@ -78,7 +78,7 @@ void func_80387B14(Actor *this, s32 next_state){
}
void func_80387CF4(ActorMarker *this_marker, ActorMarker *other_marker) {
void MMM_func_80387CF4(ActorMarker *this_marker, ActorMarker *other_marker) {
func_8030E6D4(0x1E);
}
@@ -176,7 +176,7 @@ void func_80388028(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
this->unk16C_0 = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_80387CF4, func_80387D1C);
marker_setCollisionScripts(this->marker, NULL, MMM_func_80387CF4, func_80387D1C);
__spawnqueue_add_1(func_80387D48, this->marker);
func_80387B14(this, (this->state < 5) ? 1 : 6);
}//L803880B4

8
src/MMM/code_2040.c
View File

@@ -160,7 +160,7 @@ ActorInfo D_8038BDFC = {
s32 D_8038BE20[4] = {0x87, 0x87, 0x87, 0xB4};
/* .code */
f32 func_80388430(Actor *this, s32 arg1, s32 arg2, f32 arg3) {
f32 MMM_func_80388430(Actor *this, s32 arg1, s32 arg2, f32 arg3) {
f32 sp4C[3];
f32 sp40[3];
f32 sp34[3];
@@ -230,11 +230,11 @@ void func_803888B8(Actor *this){
case 4:
switch(this->marker->unk14_20){
case 0x9F:
this->roll = func_80388430(this, 0, -1, this->roll);
this->roll = MMM_func_80388430(this, 0, -1, this->roll);
break;
case 0xa0:
case 0xff:
this->pitch = func_80388430(this, 2, 1, this->pitch);
this->pitch = MMM_func_80388430(this, 2, 1, this->pitch);
break;
}
break;
@@ -390,7 +390,7 @@ void func_803890B8(Actor *this) {
func_8038AC04();
}
void func_803890E0(void){
void MMM_func_803890E0(void){
spawnableActorList_add(&D_8038BC28, actor_new, 0);
spawnableActorList_add(&D_8038BCDC, actor_new, 0);
spawnableActorList_add(&D_8038BC4C, actor_new, 0);

2
src/MMM/code_3120.c
View File

@@ -20,7 +20,7 @@ u8 func_80389524() {
return D_8038C4E0.unk0;
}
u8 func_80389530() {
u8 MMM_func_80389530() {
return D_8038C4E0.unk2;
}

26
src/MMM/code_3420.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_8038B6D4(f32* arg0, s32 arg1);
extern void MMM_func_8038B6D4(f32* arg0, s32 arg1);
/* internal definitions */
typedef struct {
@@ -145,7 +145,7 @@ extern struct {
}D_8038C4F0;
/* .code */
void func_80389810(ActorMarker *caller, enum asset_e text_id, s32 arg2) {
void MMM_func_80389810(ActorMarker *caller, enum asset_e text_id, s32 arg2) {
switch (D_8038C4F0.unkC) {
case 2:
func_80389A0C(3);
@@ -162,11 +162,11 @@ void func_80389810(ActorMarker *caller, enum asset_e text_id, s32 arg2) {
}
}
void func_803898A0() {
void MMM_func_803898A0() {
jiggySpawn(JIGGY_60_MMM_MOTZHAND, D_8038C1E0);
}
void func_803898C8() {
void MMM_func_803898C8() {
func_8025A58C(0, 450);
}
@@ -175,10 +175,10 @@ void func_803898EC() {
}
void func_80389910() {
func_80311480(0xAD5, 0xE, NULL, NULL, func_80389810, NULL);
func_80311480(0xAD5, 0xE, NULL, NULL, MMM_func_80389810, NULL);
timedFunc_set_2(0.0f, func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
timed_setCameraToNode(2.0f, 0);
timedFunc_set_0(2.1f, func_803898A0);
timedFunc_set_0(2.1f, MMM_func_803898A0);
timedFunc_set_0(6.0f, func_803898EC);
func_80324E88(6.0f);
func_80324E38(6.0f, 0);
@@ -195,10 +195,10 @@ void func_80389A0C(s32 next_state){
if(next_state == 2){
if(D_8038C4F0.unkD == 0){
D_8038C4F0.unkD = 1;
func_80311480(0xad3, 4, NULL, NULL, func_80389810, NULL);
func_80311480(0xad3, 4, NULL, NULL, MMM_func_80389810, NULL);
}
else{//L80389A84
func_80311480(0xad6, 4, NULL, NULL, func_80389810, NULL);
func_80311480(0xad6, 4, NULL, NULL, MMM_func_80389810, NULL);
}
}//L80389A9C
@@ -215,18 +215,18 @@ void func_80389A0C(s32 next_state){
}//L80389AF4
if(next_state == 4){
func_80311480(0xadd, 4, NULL, NULL, func_80389810, NULL);
func_80311480(0xadd, 4, NULL, NULL, MMM_func_80389810, NULL);
func_80387720(D_8038C4F0.unk4);
}
if(next_state == 5){
D_8038C4F0.unkD++;
func_80311480(0xad4, 4, NULL, NULL, func_80389810, NULL);
func_80311480(0xad4, 4, NULL, NULL, MMM_func_80389810, NULL);
func_80387720(D_8038C4F0.unk4);
}
if(next_state == 6){
func_803898C8();
MMM_func_803898C8();
timedFunc_set_0(1.25f, func_803899BC);
func_80387654(D_8038C4F0.unk4);
}
@@ -266,7 +266,7 @@ void func_80389BCC(s32 key_indx, f32 position[3]) {
}
}
void func_80389CD8() {}
void MMM_func_80389CD8() {}
void func_80389CE0() {}
@@ -296,7 +296,7 @@ int func_80389CE8(s32 arg0, s32 arg1, s32 arg2){
void func_80389D9C(s32 key_id){
s32 sp24;
sp24 = D_8038C198[key_id].unk1;
func_8038B6D4(func_803517B8(sp24), func_803517E8(sp24));
MMM_func_8038B6D4(func_803517B8(sp24), func_803517E8(sp24));
D_8038C4F0.unk0++;
}

64
src/MMM/code_3D50.c
View File

@@ -65,7 +65,7 @@ struct {
u8 unk8;
BKModel *unkC;
s32 unk10;
} D_8038C510;
} MMM_D_8038C510;
/* .code */
void func_8038A140(UNK_TYPE(s32) arg0) {
@@ -78,20 +78,20 @@ void func_8038A140(UNK_TYPE(s32) arg0) {
timedFunc_set_1(3.0f, func_8038A140, 3);
}
if (arg0 == 3) {
if (D_8038C510.unk8 == 1) {
if (MMM_D_8038C510.unk8 == 1) {
mapSpecificFlags_set(3, 1);
}
item_set(ITEM_0_HOURGLASS_TIMER, 75*60 - 1);
item_set(6, 1);
}
if (D_8038C510.unk8 == 3) {
if (MMM_D_8038C510.unk8 == 3) {
item_set(6, 0);
mapSpecificFlags_set(4, 1);
}
if (arg0 == 4) {
func_8028F66C(BS_INTR_F);
}
D_8038C510.unk8 = arg0;
MMM_D_8038C510.unk8 = arg0;
}
Struct_MMM_3D50_0 *func_8038A26C(s32 arg0){
@@ -116,7 +116,7 @@ void func_8038A2B8(void){
}
}
void func_8038A2F0(s32 mesh_id, BKVtxRef *ref_vert, Vtx* vert, Struct_MMM_3D50_0 *arg3) {
void MMM_func_8038A2F0(s32 mesh_id, BKVtxRef *ref_vert, Vtx* vert, Struct_MMM_3D50_0 *arg3) {
f32 temp_f2;
if (arg3->unk4 < 0.5) {
@@ -134,7 +134,7 @@ void func_8038A2F0(s32 mesh_id, BKVtxRef *ref_vert, Vtx* vert, Struct_MMM_3D50_0
}
void func_8038A54C(Struct_MMM_3D50_0 *arg0, s32 arg1){
void MMM_func_8038A54C(Struct_MMM_3D50_0 *arg0, s32 arg1){
s32 v0 = arg0->unk3;
arg0->unk3 = arg1;
arg0->unk4 = 0.0f;
@@ -165,10 +165,10 @@ void func_8038A750(void){
for(v1 = &D_8038C1F0[0]; v1->unk0 != 0; v1++){
v1->unk4 += f20;
if(v1->unk3 == 1){
func_8033F120(D_8038C510.unk0, v1->unk0, func_8038A2F0, v1);
func_8033F120(MMM_D_8038C510.unk0, v1->unk0, MMM_func_8038A2F0, v1);
}
else if(v1->unk3 == 3){
func_8033F120(D_8038C510.unk0, v1->unk0, func_8038A58C, v1);
func_8033F120(MMM_D_8038C510.unk0, v1->unk0, func_8038A58C, v1);
}
}
}
@@ -179,9 +179,9 @@ void func_8038A82C(Struct_MMM_3D50_0 * arg0){
Struct_MMM_3D50_1 *iPtr;
if(arg0->unk2 == 'X'){
func_8038A54C(arg0, 1);
MMM_func_8038A54C(arg0, 1);
player_getPosition(sp44);
func_8038AD10(D_8038C510.unkC, D_8038C510.unk10, sp38);
func_8038AD10(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10, sp38);
sp38[1] = sp44[1];
func_8028F620(sp38, 300.0f, -1500.0f);
return;
@@ -189,10 +189,10 @@ void func_8038A82C(Struct_MMM_3D50_0 * arg0){
for(iPtr = &D_8038C2F0[0]; iPtr->unk0 != 0; iPtr++){//L8038A8C8
if(arg0->unk2 == iPtr->unk0[iPtr->unk4]){
iPtr->unk4++;
func_8038A54C(arg0, 3);
MMM_func_8038A54C(arg0, 3);
if( iPtr->unk0[iPtr->unk4] == 0){
func_8038A140(5);
func_8038AF3C(D_8038C510.unkC, D_8038C510.unk10);
func_8038AF3C(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
}
else{
@@ -216,12 +216,12 @@ void func_8038A994() {
void func_8038A9B4(void){
D_8038C510.unk8 = 0;
MMM_D_8038C510.unk8 = 0;
if(map_get() == MAP_24_MMM_TUMBLARS_SHED){
D_8038C510.unkC = NULL;
D_8038C510.unk0 = func_80309744(0);
D_8038C510.unk4 = NULL;
MMM_D_8038C510.unkC = NULL;
MMM_D_8038C510.unk0 = func_80309744(0);
MMM_D_8038C510.unk4 = NULL;
func_8038A2B8();
func_8038A964();
@@ -235,8 +235,8 @@ void func_8038A9B4(void){
}
void func_8038AA30(BKModel *arg0, s32 arg1){
D_8038C510.unkC = arg0;
D_8038C510.unk10 = arg1;
MMM_D_8038C510.unkC = arg0;
MMM_D_8038C510.unk10 = arg1;
}
void func_8038AA44(void){
@@ -244,12 +244,12 @@ void func_8038AA44(void){
f32 sp28[3];
Struct_MMM_3D50_0 *sp24;
if(D_8038C510.unk8 == 0) return;
if(MMM_D_8038C510.unk8 == 0) return;
func_8038A750();
if( D_8038C510.unk8 == 1
&& D_8038C510.unkC != NULL
&& func_8038AD4C(D_8038C510.unkC, D_8038C510.unk10)
if( MMM_D_8038C510.unk8 == 1
&& MMM_D_8038C510.unkC != NULL
&& func_8038AD4C(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10)
){
if(!levelSpecificFlags_get(0x2f)){
levelSpecificFlags_set(0x2f, TRUE);
@@ -260,33 +260,33 @@ void func_8038AA44(void){
}
}
if(D_8038C510.unk8 == 3){
if(MMM_D_8038C510.unk8 == 3){
if(item_empty(ITEM_6_HOURGLASS)){
func_8038A140(4);
}
else if( D_8038C510.unkC != NULL
&& func_8038AD4C(D_8038C510.unkC, D_8038C510.unk10)
else if( MMM_D_8038C510.unkC != NULL
&& func_8038AD4C(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10)
){
func_8038AD10(D_8038C510.unkC, D_8038C510.unk10, sp28);
tmp_v0 = func_8033F3C0(D_8038C510.unk0, sp28);
func_8038AD10(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10, sp28);
tmp_v0 = func_8033F3C0(MMM_D_8038C510.unk0, sp28);
if(tmp_v0){
sp24 = func_8038A26C(tmp_v0);
if( sp24
&& sp24->unk3 == 2
&& sp24 != D_8038C510.unk4
&& sp24 != MMM_D_8038C510.unk4
){
func_8038A82C(sp24);
D_8038C510.unk4 = sp24;
MMM_D_8038C510.unk4 = sp24;
}
}
else{
D_8038C510.unk4 = 0;
MMM_D_8038C510.unk4 = 0;
}
}
}//L8038AB7C
if( D_8038C510.unk8 == 5
&& func_8038AD38(D_8038C510.unkC, D_8038C510.unk10)
if( MMM_D_8038C510.unk8 == 5
&& func_8038AD38(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10)
){
func_8038A140(6);
}

6
src/MMM/code_47D0.c
View File

@@ -14,7 +14,7 @@ typedef struct {
}Struct_MMM_47D0_0;
/* .code */
void func_8038ABC0(s32 arg0) {
void MMM_func_8038ABC0(s32 arg0) {
if (getGameMode() != 7) {
func_80295864(func_802957F0() & ~arg0);
}
@@ -22,7 +22,7 @@ void func_8038ABC0(s32 arg0) {
void func_8038AC04(void){
if((*(u32*)PHYS_TO_K1(0x1D0)) - 0x356BAAAE){
func_8038ABC0(0x820);
MMM_func_8038ABC0(0x820);
}
}
@@ -61,7 +61,7 @@ bool func_8038AD4C(s32 arg0, s32 arg1) {
&& (func_8028ECAC() == 0);
}
void func_8038ADF0(Struct_MMM_47D0_0 *arg0, Struct68s *arg1) {
void MMM_func_8038ADF0(Struct_MMM_47D0_0 *arg0, Struct68s *arg1) {
u8 sp3F;
f32 sp38;
Actor *jiggy;

2
src/MMM/code_5000.c
View File

@@ -86,7 +86,7 @@ void func_8038B630(Struct5Fs *arg0, Struct68s *arg1){
}
void func_8038B6D4(Struct5Fs * arg0, Struct68s *arg1) {
void MMM_func_8038B6D4(Struct5Fs * arg0, Struct68s *arg1) {
arg0->unk0 = 1.0f;
func_8038B6FC(arg0, arg1);
}

6
src/MMM/code_DC0.c
View File

@@ -29,7 +29,7 @@ void func_803871D4(s32 arg0) {
levelSpecificFlags_setN(0x39, arg0, 3);
}
void func_803871FC(Actor *this){
void MMM_func_803871FC(Actor *this){
switch(this->state){
case 1:
func_8033A45C(3, FALSE);
@@ -50,7 +50,7 @@ void func_80387280(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
if(!this->initialized){
this->initialized = TRUE;
this->unk130 = func_803871FC;
this->unk130 = MMM_func_803871FC;
}
switch(this->state){
@@ -66,7 +66,7 @@ void func_80387280(Actor *this){
}
}
bool func_80387340(ActorMarker *marker){
bool MMM_func_80387340(ActorMarker *marker){
Actor *actor = marker_getActor(marker);
f32 sp20[3];
s32 sp1C;