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

Removed unnecessary undefined_syms entries, fixed some symbol names

Browse Source
This commit is contained in:
Mr-Wiseguy
2022-10-29 23:23:01 -04:00
parent e1bf4549e3
commit 91e1b93a22
10 changed files with 85 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MM/ch/conga.c
View File

@@ -48,7 +48,7 @@ ActorAnimationInfo chCongaAnimations[9] = {
{ASSET_52_ANIM_CONGA_OW, 1.0f}
};
ActorInfo D_80389998 = { MARKER_7_CONGA, ACTOR_8_CONGA, ASSET_35C_MODEL_CONGA,
ActorInfo chcongaInfo = { MARKER_7_CONGA, ACTOR_8_CONGA, ASSET_35C_MODEL_CONGA,
1, chCongaAnimations,
func_803876D0, func_80326224, func_80325888,
0, 0x333, 0.0f, 0

15
src/SM/code_F0.c
View File

@@ -25,10 +25,7 @@ extern ActorInfo D_8038B044; //chBanjosChair
extern ActorInfo D_8038B080; //chBanjosStove
extern ActorInfo D_8038AB24;
extern u32 D_803FFE00;
extern u32 D_803FFE04;
extern u32 D_803FFE08;
extern u32 D_803FFE0C;
extern u32 D_803FFE00[4];
/* .data */
s32 D_8038AAE0 = 0x000FE2C1; //compiled SM_code_crc_1
@@ -114,15 +111,15 @@ void func_80386614(u8 *arg0, u8 *arg1, s32 *arg2, s32 *arg3){
*arg3 = temp_v1;
}
extern s32 D_00005E70;
extern u8 crc_ROM_START[];
int func_803866CC(void){
u32 sp24;
if( (osPiReadIo((u32)&D_00005E70 + 8, &sp24), sp24 == D_803FFE00)
&& (osPiReadIo((u32)&D_00005E70 + 12, &sp24), sp24 == D_803FFE04)
&& (osPiReadIo((u32)&D_00005E70 + 16, &sp24), sp24 == D_803FFE08)
&& (osPiReadIo((u32)&D_00005E70 + 20, &sp24), sp24 == D_803FFE0C)
if( (osPiReadIo((u32)crc_ROM_START + 8, &sp24), sp24 == D_803FFE00[0])
&& (osPiReadIo((u32)crc_ROM_START + 12, &sp24), sp24 == D_803FFE00[1])
&& (osPiReadIo((u32)crc_ROM_START + 16, &sp24), sp24 == D_803FFE00[2])
&& (osPiReadIo((u32)crc_ROM_START + 20, &sp24), sp24 == D_803FFE00[3])
){
return 1;
}

63
src/core1/code_8C50.c
View File

@@ -20,38 +20,38 @@ void func_80247224(void);
#define CORE1_8C50_EVENT_CONT_TIMER 13
/* .extern */
extern u8 D_80272590[];
extern u8 D_802731F0[];
extern u8 D_80274620[];
extern u8 n_aspMainTextStart[];
extern u8 gSPF3DEX_fifoTextStart[];
extern u8 gSPL3DEX_fifoTextStart[];
extern u8 D_80278E80[]; //ucode_data
extern u8 D_80279130[];
extern u8 D_80279930[];
extern u8 n_aspMainDataStart[];
extern u8 gSPF3DEX_fifoDataStart[];
extern u8 gSPL3DEX_fifoDataStart[];
/* .data */
OSTask D_80275910 = {
/* type */ 2,
/* type */ M_AUDTASK,
/* flags */ 0,
NULL, 0, /* ucode_boot */
NULL, 0x1000, /* ucode */
NULL, 0x800, /* ucode_data */
NULL, 0, /* dram_stack */
NULL, NULL, /* output_buff */
NULL, 0, /* data */
NULL, 0, /* yield_data */
} ;
NULL, 0, /* ucode_boot */
NULL, SP_UCODE_SIZE, /* ucode */
NULL, SP_UCODE_DATA_SIZE, /* ucode_data */
NULL, 0, /* dram_stack */
NULL, NULL, /* output_buff */
NULL, 0, /* data */
NULL, 0, /* yield_data */
};
OSTask D_80275950 = {
/* type */ 1,
/* type */ M_GFXTASK,
/* flags */ 0,
NULL, 0, /* ucode_boot */
NULL, 0x1000, /* ucode */
NULL, 0x800, /* ucode_data */
0x80000400, 0x400, /* dram_stack */
0x80000800, 0x8000E800, /* output_buff */
NULL, 0, /* data */
NULL, 0xC00, /* yield_data */
} ;
NULL, 0, /* ucode_boot */
NULL, SP_UCODE_SIZE, /* ucode */
NULL, SP_UCODE_DATA_SIZE, /* ucode_data */
0x80000400, 0x400, /* dram_stack */
0x80000800, 0x8000E800, /* output_buff */
NULL, 0, /* data */
NULL, OS_YIELD_DATA_SIZE, /* yield_data */
};
s32 D_80275990 = 0;
s32 D_80275994 = 0;
@@ -60,7 +60,8 @@ s32 D_8027599C = 0;
/* .bss */
u64 D_8027EF40[0x185];
u64 D_8027EF40[OS_YIELD_DATA_SIZE / sizeof(u64)];
static u8 pad[0x28]; // 8027FB40
OSMesgQueue D_8027FB60;
OSMesg D_8027FB78[20];
OSMesgQueue D_8027FBC8;
@@ -120,8 +121,8 @@ void func_80246744(OSMesg arg0){
void func_80246794(Struct_Core1_8C50_s * arg0){
func_80255D0C(&D_80275910.t.ucode_boot, &D_80275910.t.ucode_boot_size);
D_80275910.t.ucode = D_80272590;
D_80275910.t.ucode_data = D_80278E80;
D_80275910.t.ucode = n_aspMainTextStart;
D_80275910.t.ucode_data = n_aspMainDataStart;
D_80275910.t.data_ptr = (void*) arg0->unk8;
D_80275910.t.data_size = (arg0->unkC - arg0->unk8) >> 3 << 3;
osWritebackDCache(D_80275910.t.data_ptr , D_80275910.t.data_size);
@@ -134,8 +135,8 @@ void func_80246794(Struct_Core1_8C50_s * arg0){
void func_80246844(Struct_Core1_8C50_s * arg0){
func_80255D0C(&D_80275950.t.ucode_boot, &D_80275950.t.ucode_boot_size);
D_80275950.t.ucode = D_802731F0;
D_80275950.t.ucode_data = D_80279130;
D_80275950.t.ucode = gSPF3DEX_fifoTextStart;
D_80275950.t.ucode_data = gSPF3DEX_fifoDataStart;
D_80275950.t.data_ptr = (void*) arg0->unk8;
D_80275950.t.data_size = (arg0->unkC - arg0->unk8) >> 3 << 3;
osWritebackDCache(D_80275950.t.data_ptr , D_80275950.t.data_size);
@@ -152,8 +153,8 @@ void func_80246844(Struct_Core1_8C50_s * arg0){
void func_8024692C(Struct_Core1_8C50_s * arg0){
func_80255D0C(&D_80275950.t.ucode_boot, &D_80275950.t.ucode_boot_size);
D_80275950.t.ucode = D_80274620;
D_80275950.t.ucode_data = D_80279930;
D_80275950.t.ucode = gSPL3DEX_fifoTextStart;
D_80275950.t.ucode_data = gSPL3DEX_fifoDataStart;
D_80275950.t.data_ptr = (void*) arg0->unk8;
D_80275950.t.data_size = (arg0->unkC - arg0->unk8) >> 3 << 3;
osWritebackDCache(D_80275950.t.data_ptr , D_80275950.t.data_size);

8
src/core1/done/audio/n_sl.c
View File

@@ -6,7 +6,7 @@
extern N_ALSynth *D_80276E80;
extern N_ALSynth *D_80276E84;
extern N_ALSynth *n_syn;
void n_alInit(N_ALGlobals *g, ALSynConfig *config)
{
@@ -15,10 +15,10 @@ void n_alInit(N_ALGlobals *g, ALSynConfig *config)
D_80276E80 = &g->drvr;
if (D_80276E84 != NULL)
if (n_syn != NULL)
return;
D_80276E84 = &g->drvr;
n_syn = &g->drvr;
n_alSynNew(config);
}
@@ -30,6 +30,6 @@ void n_alClose(N_ALGlobals *glob)
n_alSynDelete();
D_80276E80 = NULL;
D_80276E84 = NULL;
n_syn = NULL;
}
}

4
src/core1/done/audio/n_synthesizer.c
View File

@@ -9,7 +9,7 @@
#endif
extern ALCmdHandler n_alAuxBusPull;
extern ALCmdHandler func_8025FE6C;
extern ALCmdHandler n_alFxPull;
extern void alN_PVoiceNew(N_PVoice *mv, ALDMANew dmaNew, ALHeap *hp);
@@ -77,7 +77,7 @@ void n_alSynNew(ALSynConfig *c)
* Allocate an effect and set parameters
*/
n_syn->auxBus->fx = n_alSynAllocFX(0, c, hp);
n_syn->mainBus->filter.handler = &func_8025FE6C;
n_syn->mainBus->filter.handler = &n_alFxPull;
} else{
/*
* Connect the aux bus to the main bus

13
src/core2/code_CF3E0.c
View File

@@ -82,9 +82,10 @@ void func_80356560(s32 arg0) {
#endif
// bk_boot segment start (skipping entry function)
extern u8 D_00001050[];
extern u8 boot_bk_boot_ROM_START[];
// bk_boot segment end
extern u8 D_00005E70[];
extern u8 boot_bk_boot_ROM_END[];
extern u8 crc_ROM_START[];
// bk_boot segment crc next word
s32 D_803727F0 = 0;
@@ -101,10 +102,10 @@ s32 D_80372808 = 0;
// init bk_boot crc
void func_80356580(void) {
D_803727FC = (s32) D_00001050;
D_803727FC = (s32) boot_bk_boot_ROM_START;
D_80372800 = 0;
D_80372804 = -1;
D_80372808 = (s32) (D_00005E70 - D_00001050);
D_80372808 = (s32) (boot_bk_boot_ROM_END - boot_bk_boot_ROM_START);
}
// advance bk_boot crc by one word
@@ -137,10 +138,10 @@ s32 func_803565BC(void) {
D_80372808 = D_80372808 - 4;
} else {
D_803727FC = 0;
osPiReadIo((u32)D_00005E70 + 0, &crc1);
osPiReadIo((u32)crc_ROM_START + 0, &crc1);
if (crc1 != D_80372800)
return 0;
osPiReadIo((u32)D_00005E70 + 4, &crc2);
osPiReadIo((u32)crc_ROM_START + 4, &crc2);
if (crc2 != D_80372804)
return 0;
}

12
src/lair/code_0.c
View File

@@ -12,7 +12,7 @@ extern void func_802D3D74(Actor *this);
extern void func_802D4830(Actor *, s32, f32);
extern void func_802EE6CC(f32[3], f32[3], s32[4], s32, f32, f32, s32, s32, s32);
extern void func_80324CFC(f32, enum comusic_e, s32);
extern int func_8032886C(Actor *, f32);
extern int actor_animationIsAt(Actor *, f32);
extern void func_80328B8C(Actor *, s32, f32, s32);
extern void func_8033A45C(s32, s32);
extern void func_8034E0FC(void *, s32);
@@ -214,7 +214,7 @@ void lair_func_80386550(Actor *this)
this->pitch -= 2;
this->position_y--;
if (func_8032886C(this, 0.95f))
if (actor_animationIsAt(this, 0.95f))
{
func_80326310(this);
func_80328B8C(this, 10, 0.98f, 1);
@@ -1519,7 +1519,7 @@ void func_80389898(Actor *this)
}
case 19:
{
if (func_8032886C(this, 0.7f))
if (actor_animationIsAt(this, 0.7f))
marker_despawn(this->marker);
break;
@@ -1570,7 +1570,7 @@ void func_80389934(Actor *this)
}
case 23:
{
if (func_8032886C(this, 0.95f))
if (actor_animationIsAt(this, 0.95f))
{
func_80328B8C(this, 0x18, 0.999f, 1);
FUNC_8030E624(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 26000,);
@@ -1587,7 +1587,7 @@ void func_80389934(Actor *this)
f32 func_80389AAC(Actor *this, f32 a1)
{
// defs
f32 func_8034A754(f32, f32);
f32 randf2(f32, f32);
void *func_80309B48(f32 *, f32 *, f32 *, u32);
f32 vec3[3]; // $sp + 54
@@ -1642,7 +1642,7 @@ f32 func_80389AAC(Actor *this, f32 a1)
break;
}
func_8030E878(SFX_82_METAL_BREAK, func_8034A754(0.93f, 1.07f), 32760, this->position, 100, 1350.0f);
func_8030E878(SFX_82_METAL_BREAK, randf2(0.93f, 1.07f), 32760, this->position, 100, 1350.0f);
this->unk60 = 1;
}

27
src/lair/code_5ED0.c
View File

@@ -62,22 +62,21 @@ extern s32 func_803203FC(s32); // get volatile flag
extern void func_80295864(s32); // set unlocked moves bitfield
extern s32 func_802957F0(void); // get unlocked moves bitfield
extern s32 func_80345FA0(s32); // item count get
extern s32 item_getCount(s32); // item count get
extern void func_803463F4(s32, s32); // item count set
extern void func_80318614(gczoombox_t *, s32);
extern bool func_803183A4(gczoombox_t *, u8 *);
extern void func_8031841C(gczoombox_t *);
extern void func_803183FC(gczoombox_t *);
extern void gczoombox_minimize(gczoombox_t *);
extern void gczoombox_close(gczoombox_t *);
extern void func_8025AB44(s32, s32, s32);
extern void func_80250530(s32, u16, f32);
extern void func_8025A55C(s32, s32, s32);
extern void func_80324CFC(f32, s16, s16);
extern void func_803183EC(gczoombox_t *);
extern void func_8031840C(gczoombox_t *);
extern void gczoombox_open(gczoombox_t *);
extern void gczoombox_maximize(gczoombox_t *);
extern void *func_80309744(s32);
extern void func_8029A95C(s32); // set transformation
@@ -313,7 +312,7 @@ void lair_func_8038CD48(void)
void func_8038CE00(void)
{
func_802BBC58(1);
func_802BAE20(0);
set_camera_to_node(0);
}
void func_8038CE28(void)
@@ -331,7 +330,7 @@ void func_8038CE28(void)
D_8037DCB8->unk3C[i] = 0;
// set joker card count to 0
func_803463F4(ITEM_27_JOKER_CARD, func_80345FA0(0x27) * -1);
func_803463F4(ITEM_27_JOKER_CARD, item_getCount(0x27) * -1);
D_8037DCB8->unk8 = 0;
D_8037DCB8->unk4 = NULL;
@@ -365,7 +364,7 @@ void lair_func_8038CF18(void)
D_8037DCB8->unk3C[i] = 0;
// set joker card count to 0
func_803463F4(ITEM_27_JOKER_CARD, func_80345FA0(ITEM_27_JOKER_CARD) * -1);
func_803463F4(ITEM_27_JOKER_CARD, item_getCount(ITEM_27_JOKER_CARD) * -1);
}
lair_func_8038C6BC();
@@ -428,8 +427,8 @@ void func_8038D0BC(s32 a0, s32 a1)
if (a1 == 3)
{
func_80318614(D_8037DCB8->unk20, 0);
func_8031841C(D_8037DCB8->unk20);
func_803183FC(D_8037DCB8->unk20);
gczoombox_minimize(D_8037DCB8->unk20);
gczoombox_close(D_8037DCB8->unk20);
}
if (a1 == 6)
@@ -441,7 +440,7 @@ void func_8038D0BC(s32 a0, s32 a1)
void func_8038D16C(s32 a0, u16 a1)
{
func_8025A6EC(a0, 0);
func_8025AB44(a0, 28000, 500);
comusic_8025AB44(a0, 28000, 500);
func_80250530(func_8025ADD4(a0), a1, 0);
}
@@ -479,8 +478,8 @@ void func_8038D1E4(void)
0, 0, func_8038D0BC
);
func_80318614(D_8037DCB8->unk20, 0);
func_803183EC(D_8037DCB8->unk20);
func_8031840C(D_8037DCB8->unk20);
gczoombox_open(D_8037DCB8->unk20);
gczoombox_maximize(D_8037DCB8->unk20);
break;
}