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/core2/bs/bEggAss.c
View File

@@ -30,7 +30,7 @@ void bseggass_update(void) {
has_eggs = (item_empty(ITEM_D_EGGS) == 0);
if (should_poop_egg()) {
if (has_eggs)
D_8037D2E0 = func_80258948(D_8037D2E0 + 1, 3);
D_8037D2E0 = ml_min_w(D_8037D2E0 + 1, 3);
else
func_80346C10(&sp28, -1, 0, ITEM_D_EGGS, 0);
}

2
src/core2/bs/bEggHead.c
View File

@@ -33,7 +33,7 @@ void bsegghead_update(void) {
has_eggs = (item_empty(ITEM_D_EGGS) == 0);
if (should_shoot_egg()) {
if (has_eggs)
D_8037D2F0 = func_80258948(D_8037D2F0 + 1, 3);
D_8037D2F0 = ml_min_w(D_8037D2F0 + 1, 3);
else
func_80346C10(&sp28, -1, 0, ITEM_D_EGGS, 0);
}

26
src/core2/code_3BB80.c
View File

@@ -193,15 +193,15 @@ void func_802C2B5C(void){
func_802E1790();
switch(loaded_asm_file){
case OVERLAY_2_WHALE:
cc_func_803870E0();
CC_func_803870E0();
break;
case OVERLAY_4_DESERT:
gv_func_80387118();
GV_func_80387118();
break;
case OVERLAY_5_BEACH:
break;
case OVERLAY_7_SWAMP:
bgs_func_803885DC();
BGS_func_803885DC();
break;
default:
break;
@@ -363,37 +363,37 @@ void func_802C2B5C(void){
cutscene_func_8038C4E0();
break;
case OVERLAY_B_TRAINING:
sm_func_80386810();
SM_func_80386810();
break;
case OVERLAY_3_HAUNTED:
mmm_func_803890E0();
MMM_func_803890E0();
break;
case OVERLAY_2_WHALE:
cc_func_80387DA0();
CC_func_80387DA0();
break;
case OVERLAY_4_DESERT:
gv_func_8038F154();
GV_func_8038F154();
break;
case OVERLAY_5_BEACH:
ttc_func_80388AC0();
TTC_func_80388AC0();
break;
case OVERLAY_6_JUNGLE:
mm_func_803888B0();
MM_func_803888B0();
break;
case OVERLAY_7_SWAMP:
bgs_func_8038F1E0();
BGS_func_8038F1E0();
break;
case OVERLAY_8_SHIP:
rbb_func_80386C48();
RBB_func_80386C48();
break;
case OVERLAY_9_SNOW:
fp_func_80391324();
FP_func_80391324();
spawnableActorList_add(&D_80367BC8, actor_new, 0x8);
spawnableActorList_add(&D_80367BEC, actor_new, 0x8);
spawnableActorList_add(&D_80367C10, actor_new, 0x8);
break;
case OVERLAY_A_TREE:
ccw_func_8038DB6C();
CCW_func_8038DB6C();
break;
}

2
src/core2/code_5C870.c
View File

@@ -377,7 +377,7 @@ void func_802E4214(s32 arg0){
D_8037E8E0.unkC = 0;
D_8037E8E0.unk1C = 0;
func_8033C070();
func_8025B0E4();
sns_save_and_update_global_data();
func_8030D86C();
func_80259A24();
func_80322764();

8
src/core2/code_9B990.c
View File

@@ -137,7 +137,7 @@ void __overlay_mmm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; }
void func_80322930(void){
func_8038953C();
func_80389CD8();
MMM_func_80389CD8();
func_8038A994();
}
@@ -158,7 +158,7 @@ void func_803229C0(s32 arg0, s32 arg1){
}
void __overlay_cc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_80388760(gfx, mtx, vtx);
CC_func_80388760(gfx, mtx, vtx);
}
void func_80322A00(void){
@@ -172,7 +172,7 @@ void func_80322A28(void){
}
void __overlay_cc_update(void){
func_80388F4C();
CC_func_80388F4C();
func_8038817C();
}
@@ -308,7 +308,7 @@ void func_80322DB0(void){
void func_80322DE8(void){
func_8038A7F0();
func_8038A9C0();
FP_func_8038A9C0();
func_8038B7A4();
func_803918C0();
}

4
src/core2/code_AD110.c
View File

@@ -292,7 +292,7 @@ extern void func_8031FB14(s32, s32);
extern void func_802C1674(s32, s32);
extern void func_802C169C(s32, s32);
extern void func_80389BFC(s32, s32);
extern void core2_func_80389BFC(s32, s32);
extern void func_80389C24(s32, s32);
extern void func_80389C4C(s32, s32);
extern void func_80389C74(s32, s32);
@@ -414,7 +414,7 @@ Method_core2_AD110 D_8036FE5C[]; /* ={
func_8033443C, func_8033443C, func_8033443C, func_8033443C,
func_8033443C, func_8033443C, func_8033443C, func_8033443C,
func_8033443C, func_8033443C, func_8033443C, func_8033443C,
func_8033443C, func_80389BFC, func_80389C24, func_80389C4C,
func_8033443C, core2_func_80389BFC, func_80389C24, func_80389C4C,
func_80389C74, func_80389C9C, func_80389CC4, func_802D2B94,
func_802D2C24, func_8033443C, func_8033443C, func_8033443C,
func_8033443C, func_8033443C, func_8033443C, func_8033443C,

4
src/core2/code_C4320.c
View File

@@ -211,13 +211,13 @@ void func_8034B8C0(enum map_e map_id, s32 demo_id) {
func_802E4A70();
}
if ((demo_id == 0x5B) || (demo_id == 0x5F)) {
func_8025BC04();
sns_backup_items_and_unlock_all();
}
}
void func_8034B940(void){
demo_free();
func_8025BCEC();
sns_restore_backed_up_items();
}
void func_8034B968(void){

2
src/core2/code_C4B0.c
View File

@@ -381,7 +381,7 @@ void func_80293F0C(void){
D_8037C27A = 0;
if (D_8037C27C) {
D_8037C280 = func_80258948(D_8037C280 + 1, 3);
D_8037C280 = ml_min_w(D_8037C280 + 1, 3);
} else {
D_8037C280 = 0;
}

2
src/core2/code_CC1E0.c
View File

@@ -112,7 +112,7 @@ s32 func_803531C8(u8 projectile_indx, s32 arg1){
break;
case MARKER_34_CEMETARY_POT: //L80353400
if(func_802458A8(sp40, other_marker, 0x3C) && func_80387340(other_marker)){
if(func_802458A8(sp40, other_marker, 0x3C) && MMM_func_80387340(other_marker)){
func_8033E984();
}
break;

4
src/core2/code_CF3E0.c
View File

@@ -78,7 +78,7 @@ void func_80356560(s32 arg0) {
//THIS VALUE
#ifndef CORE2_CODE_CRC2
#define CORE2_CODE_CRC2 0
#define CORE2_CODE_CRC2 0x9E44C2DC
#endif
// bk_boot segment start (skipping entry function)
@@ -88,7 +88,7 @@ extern u8 D_00005E70[];
// bk_boot segment crc next word
s32 D_803727F0 = 0;
s32 D_803727F4 = CORE2_CODE_CRC2;
s32 core2_D_803727F4 = CORE2_CODE_CRC2;
s32 D_803727F8 = 0;
s32 D_803727FC = 0;

4
src/core2/yaw.c
View File

@@ -72,7 +72,7 @@ void func_802990B4(void){
func_802991A8(1);
}
void func_80299118(void){
void yaw_update(void){
switch(D_8037C698){
case 0:
break;
@@ -96,7 +96,7 @@ void yaw_setIdeal(f32 arg0){
D_8037C694 = mlNormalizeAngle(arg0);
}
void func_802991D8(f32 arg0){
void yaw_set(f32 arg0){
D_8037C690 = mlNormalizeAngle(arg0);
}