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

62
src/lair/code_5ED0.c
View File

@@ -48,7 +48,7 @@ enum FF_Action
/* .h */
void func_8038D670(enum FF_Action next_state);// ff_set_state
void func_8038C6BC(void);
void lair_func_8038C6BC(void);
/* extern */
extern void func_802FACA4(enum item_e);
@@ -114,7 +114,7 @@ extern struct {
/* .code */
// FF: get total number of questions per type
s16 func_8038C2C0(enum ff_question_type_e type)
s16 lair_func_8038C2C0(enum ff_question_type_e type)
{
return FF_QuestionTypeInfoArr[type].totalQuestionCount;
}
@@ -129,13 +129,13 @@ void func_8038C2D4(enum ff_question_type_e type)
}
// FF: set isAsked flag for type and question
void func_8038C338(enum ff_question_type_e type, s32 questionIdx, int val)
void lair_func_8038C338(enum ff_question_type_e type, s32 questionIdx, int val)
{
func_803208C0(FF_QuestionTypeInfoArr[type].startingFlagIdx + questionIdx, val);
}
// FF: get isAsked flag for type and question
int func_8038C370(enum ff_question_type_e type, s32 questionIdx)
int lair_func_8038C370(enum ff_question_type_e type, s32 questionIdx)
{
return func_803207F0(FF_QuestionTypeInfoArr[type].startingFlagIdx + questionIdx);
}
@@ -148,7 +148,7 @@ void func_8038C3A0(u32 a0, BKVtxRef *a1, Vtx *a2, Struct_lair_5ED0_0 *a3)
a2->v.cn[2] = a1->v.v.cn[2] * a3->unk10;
}
void *func_8038C5B8(s32 a0)
void *lair_func_8038C5B8(s32 a0)
{
Struct_lair_5ED0_0 *ptr;
@@ -169,25 +169,25 @@ void *func_8038C5B8(s32 a0)
return ptr;
}
void func_8038C610(s32 a0)
void lair_func_8038C610(s32 a0)
{
func_8034DEB4(func_8034C528(a0 + 200), -3000);
}
void func_8038C640(s32 a0, Struct_lair_5ED0_0 *a1)
void lair_func_8038C640(s32 a0, Struct_lair_5ED0_0 *a1)
{
s32 i;
for (i = 0; i < ARRLEN(a1->unk0); i++)
if (a1->unk0[i])
func_8038C610(a1->unk0[i]);
lair_func_8038C610(a1->unk0[i]);
a1->unk9 = 1;
func_803208C0(a0 - FF_QNF_CNT, TRUE);
}
void func_8038C6BC(void)
void lair_func_8038C6BC(void)
{
s32 s1, s3;
@@ -202,7 +202,7 @@ void func_8038C6BC(void)
if (ptr->unk9 == s3)
{
ptr->unk10 = 0.95f;
func_8038C640(s1, ptr);
lair_func_8038C640(s1, ptr);
}
else
{
@@ -260,7 +260,7 @@ void func_8038CC10(void)
func_8030E2C4(D_8037DCB8->UNK_18);
}
void func_8038CC9C(void)
void lair_func_8038CC9C(void)
{
if (!D_8037DCB8->UNK_18)
return;
@@ -283,7 +283,7 @@ void func_8038CCEC(void)
func_802C5994();
}
void func_8038CD48(void)
void lair_func_8038CD48(void)
{
if (D_8037DCB8 == NULL)
return;
@@ -301,7 +301,7 @@ void func_8038CD48(void)
D_8037DCB8->unk20 = NULL;
if (D_8037DCB8->UNK_18)
func_8038CC9C();
lair_func_8038CC9C();
if (!func_803203FC(1) && !func_803203FC(2))
func_803204E4(0, FALSE);
@@ -344,7 +344,7 @@ void func_8038CE28(void)
func_8038BC24();
}
void func_8038CF18(void)
void lair_func_8038CF18(void)
{
s32 i;
@@ -368,7 +368,7 @@ void func_8038CF18(void)
func_803463F4(ITEM_27_JOKER_CARD, func_80345FA0(ITEM_27_JOKER_CARD) * -1);
}
func_8038C6BC();
lair_func_8038C6BC();
ptr = D_8037DCB8->unk48->data;
@@ -576,10 +576,10 @@ void func_8038D548(s32 a0)
s32 s0;
for (s0 = FF_QNF_START; s0 != FF_QNF_END; s0++)
func_8038C610(s0);
lair_func_8038C610(s0);
if (a0)
func_8038C610(296);
lair_func_8038C610(296);
}
void func_8038D5A0(void)
@@ -589,7 +589,7 @@ void func_8038D5A0(void)
for (s0 = FF_QNF_START; s0 != FF_QNF_END; s0++, ptr++)
{
func_8038C610(s0);
lair_func_8038C610(s0);
ptr->unk9 = 1;
@@ -679,10 +679,10 @@ void func_8038D670(enum FF_Action next_state) {
case FFA_6_TRIGGER_QUESTION_POST_EFFECTS: //L8038D940
func_8038D48C();
if (D_8037DCB8->unkF == 1) {
func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4);
func_8038C338(D_8037DCB8->ffQuestionType, D_8037DCB8->unkC, 1);
lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4);
lair_func_8038C338(D_8037DCB8->ffQuestionType, D_8037DCB8->unkC, 1);
D_8037DCB8->unk3C[D_8037DCB8->ffQuestionType]++;
if (func_8038C2C0(D_8037DCB8->ffQuestionType) == D_8037DCB8->unk3C[D_8037DCB8->ffQuestionType]) {
if (lair_func_8038C2C0(D_8037DCB8->ffQuestionType) == D_8037DCB8->unk3C[D_8037DCB8->ffQuestionType]) {
D_8037DCB8->unk3C[D_8037DCB8->ffQuestionType] = 0;
func_8038C2D4(D_8037DCB8->ffQuestionType);
}
@@ -723,7 +723,7 @@ void func_8038D670(enum FF_Action next_state) {
}
if (D_8037DCB8->unk4->unk8 >= 7) {
func_803208C0(func_8038D60C(D_8037DCB8->unk8), TRUE);
func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4);
lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4);
}
if (func_803203FC(0xA3)) {
func_80356540(0xA4);
@@ -816,10 +816,10 @@ void func_8038DE34(enum ff_question_type_e type)
do
{
// Generate random question index in the valid range for the type
randQuestionIdx = randi2(0, func_8038C2C0(type));
randQuestionIdx = randi2(0, lair_func_8038C2C0(type));
// Try again if question already asked
} while (func_8038C370(type, randQuestionIdx));
} while (lair_func_8038C370(type, randQuestionIdx));
// Save to storage struct
D_8037DCB8->unkC = randQuestionIdx;
@@ -850,7 +850,7 @@ void func_8038DE34(enum ff_question_type_e type)
}
// Try again if question already asked
} while (func_8038C370(type, D_8037DCB8->unkC));
} while (lair_func_8038C370(type, D_8037DCB8->unkC));
}
}
@@ -866,7 +866,7 @@ void func_8038DFBC(void)
timed_playSfx(0.75f, 0x51, 0.5f, 32760);
timedFunc_set_0(1.0f, func_8038CC10);
timedFunc_set_0(2.2f, func_8038CC9C);
timedFunc_set_0(2.2f, lair_func_8038CC9C);
}
void func_8038E070(void)
@@ -876,7 +876,7 @@ void func_8038E070(void)
func_8028F918(2);
}
void func_8038E0B0(void) {
void lair_func_8038E0B0(void) {
s32 sp48[6]; //buttons
s32 temp_v0;
s32 sp3C[2]; //joystick
@@ -900,7 +900,7 @@ void func_8038E0B0(void) {
}
}
D_8037DCB8->unk8 = temp_v0;
D_8037DCB8->unk4 = func_8038C5B8(D_8037DCB8->unk8);
D_8037DCB8->unk4 = lair_func_8038C5B8(D_8037DCB8->unk8);
}
sp38 = MIN((D_8037DCB8->unk8 != 0) ? D_8037DCB8->unk4->unk8 : -1, FFTT_7_JOKER);
if ((D_8037DCB8->unk8 != 0) && (D_8037DCB8->unk4->unk9 == 0) && func_8028F20C()) {
@@ -983,7 +983,7 @@ void func_8038E0B0(void) {
}
if (func_8028EFC8() && (sp48[FACE_BUTTON(BUTTON_B)] == 1)) {
if ((item_getCount(ITEM_27_JOKER_CARD) > 0) && (sp28 < 0x5B)) {
func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4);
lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4);
item_dec(ITEM_27_JOKER_CARD);
func_8030E6D4(SFX_3EA_UNKNOWN);
func_80356540(0xA9);
@@ -997,7 +997,7 @@ void func_8038E0B0(void) {
}
} else {
if (D_8037DCB8->unk4->unk9 == 2) {
func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4);
lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4);
}
}
break;
@@ -1053,7 +1053,7 @@ void func_8038E0B0(void) {
}
}
void func_8038E768(Gfx **dl, Mtx **m, Vtx **v)
void lair_func_8038E768(Gfx **dl, Mtx **m, Vtx **v)
{
if (map_get() != MAP_8E_GL_FURNACE_FUN)
return;