Removed unnecessary undefined_syms entries, fixed some symbol names

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

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

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;
}

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);

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;
}
}

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

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;
}

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;
}

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;
}

View File

@ -8,3 +8,4 @@ osMapTLBRdb = 0x80002C70;
__osProbeTLB = 0x80003BD0;
__osDisableInt = 0x80003FC0;
__osRestoreInt = 0x80003FE0;
bk_boot_BSS_START = 0x80005270;

View File

@ -1,173 +1,11 @@
D_8023DF9C = 0x8023DF9C;
__heap_align = 0x80254470;
func_8025FE6C = 0x8025FE6C;
n_alAuxBusPull = 0x80260160;
func_8026A2E0 = 0x8026A2E0;
osPiRawStartDma = 0x8026B970;
osEPiRawStartDma = 0x8026BA50;
alEnvmixerParam = 0x8026FEC4;
alEnvmixerPull = 0x802702F0;
alLoadParam = 0x80270930;
alAdpcmPull = 0x80270FDC;
alResampleParam = 0x80271480;
func_8027156C = 0x8027156C;
alAuxBusParam = 0x80271780;
alAuxBusPull = 0x802717B0;
alMainBusParam = 0x80271890;
alMainBusPull = 0X802718C0;
alSaveParam = 0x802719E0;
alSavePull = 0x80271A14;
func_80272590 = 0x80272590;
D_80276E84 = 0x80276E84;
func_80291610 = 0x80291610;
func_80291AAC = 0x80291AAC;
func_802C71F0 = 0x802C71F0;
func_802C8A54 = 0x802C8A54;
func_802C8AA8 = 0x802C8AA8;
func_802C8AF8 = 0x802C8AF8;
func_802C8B4C = 0x802C8B4C;
func_802C8BA8 = 0x802C8BA8;
func_802C8C04 = 0x802C8C04;
func_802D7558 = 0x802D7558;
func_802D75B4 = 0x802D75B4;
func_802D7610 = 0x802D7610;
func_802DEB18 = 0x802DEB18;
func_802DF99C = 0x802DF99C;
func_802E4078 = 0x802E4078;
func_8030E484 = 0x8030E484;
func_8030E510 = 0x8030E510;
func_80311714 = 0x80311714;
gcpausemenu_80314AC8 = 0x80314AC8;
func_8031CC40 = 0x8031CC40;
func_8031F678 = 0x8031F678;
func_8031FB14 = 0x8031FB14;
func_803253A0 = 0x803253A0;
func_803255FC = 0x803255FC;
func_80325760 = 0x80325760;
func_80325794 = 0x80325794;
actor_new = 0x803272F8;
func_80329958 = 0x80329958;
func_80329904 = 0x80329904;
func_80335110 = 0x80335110;
item_inc = 0x80345F24;
item_set = 0x80346414;
func_80347B54 = 0x80347B54;
func_80347B80 = 0x80347B80;
func_80347C5C = 0x80347C5C;
func_80347C70 = 0x80347C70;
func_80347CC8 = 0x80347CC8;
func_80347CF4 = 0x80347CF4;
func_80347DD0 = 0x80347DD0;
func_80347DE4 = 0x80347DE4;
func_8034BB08 = 0x8034BB08;
func_80352614 = 0x80352614;
func_803526DC = 0x803526DC;
func_80352F58 = 0x80352F58;
func_80352FF4 = 0x80352FF4;
fxegg_head_destroy = 0x80353A90;
fxegg_ass_update = 0x80353CC8;
fxegg_ass_destroy = 0x80353FB4;
func_803540AC = 0x803540AC;
func_803541D8 = 0x803541D8;
func_803543F4 = 0x803543F4;
func_8035451C = 0x8035451C;
func_8035489C = 0x8035489C;
func_80354990 = 0x80354990;
func_80354C18 = 0x80354C18;
func_80354DC8 = 0x80354DC8;
func_80354EEC = 0x80354EEC;
func_80355004 = 0x80355004;
func_80355134 = 0x80355134;
func_80355294 = 0x80355294;
func_803553E8 = 0x803553E8;
func_80355548 = 0x80355548;
func_8035570C = 0x8035570C;
func_8035585C = 0x8035585C;
func_80355B00 = 0x80355B00;
func_80355C4C = 0x80355C4C;
func_80355D50 = 0x80355D50;
func_80355E80 = 0x80355E80;
func_803562E8 = 0x803562E8;
func_80356364 = 0x80356364;
func_8035644C = 0x8035644C;
func_8035646C = 0x8035646C;
func_803298D8 = 0x803298D8;
func_8038FE30 = 0x8038FE30;
D_803649FC = 0x803649FC;
D_80364998 = 0x80364998;
D_80364CD0 = 0x80364CD0;
D_80375788 = 0x80375788;
D_803773D0 = 0x803773D0;
D_80389B60 = 0x80389B60;
D_80378534 = 0x80378534;
D_80389C00 = 0x80389C00;
D_80389B88 = 0x80389B88;
//D_80389C78 = 0x80389C78;
D_8036C4D0 = 0x8036C4D0;
D_80008720 = 0x80008720;
__osDispatchThread = 0x8026AA64;
D_80005180 = 0x80005180;
D_800051A0 = 0x800051A0;
piThreadStack = 0x80283600;
chorangepadInfo = 0x80389890;
chhutInfo = 0x803898F0;
chchimpystump = 0x80389920;
chcongaInfo = 0x80389998;
chorangeInfo = 0x803899D0;
chlmonkeyInfo = 0x80389A38;
chgrublinInfo = 0x80389AB8;
chjujuhitboxInfo = 0x80389AE0;
chjujuInfo = 0x80389B10;
bgs_D_803907B8 = 0x803907B8;
bgs_D_80391190 = 0x80391190;
bgs_D_80391220 = 0x80391220;
bgs_D_80391228 = 0x80391228;
D_80391728 = 0x80391728;
D_8038B1C0 = 0x8038B1C0;
D_8038B1D8 = 0x8038B1D8;
D_00005E70 = 0x00005E70;
D_803907AE = 0x803907AE;
D_80389A5C = 0x80389A5C;
D_00001050 = 0x00001050;
func_8032886C = 0x8032886C;
func_8034A754 = 0x8034A754;
func_8034A7BC = 0x8034A7BC;
func_802DA498 = 0x802DA498;
/* lair */
FF_QuestionTypeInfoArr = 0x80394340;
D_80395104 = 0x80395104;
func_802BAE20 = 0x802BAE20;
func_80345FA0 = 0x80345FA0;
func_8031841C = 0x8031841C;
func_803183FC = 0x803183FC;
debugStr_quiz_longText = 0x803950C0;
func_8025AB44 = 0x8025AB44;
func_803183EC = 0x803183EC;
func_8031840C = 0x8031840C;
D_80395168 = 0x80395168;
D_80395170 = 0x80395170;
D_80395180 = 0x80395180;
D_80395118 = 0x80395118;
boot_D_80005270 = 0x80005270;
D_80392EB0 = 0x80392EB0;
D_80392E20 = 0x80392E20;
lair_D_80392D90 = 0x80392D90;
MMM_D_8038C510 = 0x8038C510;
func_803863F0 = 0x803863F0;
D_8038D6A0 = 0x8038D6A0;
D_8038D378 = 0x8038D378;
D_8038D4DC = 0x8038D4DC;
D_8038D534 = 0x8038D534;
@ -180,3 +18,16 @@ FP_D_80392840 = 0x80392840;
core1_D_803727F4 = 0x803727F4;
__osBaseTimer = 0x80285D00;
FP_D_80392864 = 0x80392864;
n_aspMainTextStart = _binary_bin_core1_n_aspMain_text_bin_start;
n_aspMainTextEnd = _binary_bin_core1_n_aspMain_text_bin_end;
gSPF3DEX_fifoTextStart = _binary_bin_core1_gSPF3DEX_fifo_text_bin_start;
gSPF3DEX_fifoTextEnd = _binary_bin_core1_gSPF3DEX_fifo_text_bin_end;
gSPL3DEX_fifoTextStart = _binary_bin_core1_gSPL3DEX_fifo_text_bin_start;
gSPL3DEX_fifoTextEnd = _binary_bin_core1_gSPL3DEX_fifo_text_bin_end;
n_aspMainDataStart = _binary_bin_core1_n_aspMain_data_bin_start;
n_aspMainDataEnd = _binary_bin_core1_n_aspMain_data_bin_end;
gSPF3DEX_fifoDataStart = _binary_bin_core1_gSPF3DEX_fifo_data_bin_start;
gSPF3DEX_fifoDataEnd = _binary_bin_core1_gSPF3DEX_fifo_data_bin_end;
gSPL3DEX_fifoDataStart = _binary_bin_core1_gSPL3DEX_fifo_data_bin_start;
gSPL3DEX_fifoDataEnd = _binary_bin_core1_gSPL3DEX_fifo_data_bin_end;