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

74
src/lair/code_0.c
View File

@@ -20,25 +20,25 @@ extern void *func_8034C2C4(ActorMarker *, s32);
void func_803863F0(Actor *this);
void func_803864B0(Actor *this);
void func_80386550(Actor *this);
void lair_func_803863F0(Actor *this);
void lair_func_803864B0(Actor *this);
void lair_func_80386550(Actor *this);
Actor *func_8038664C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_80386D78(Actor *this);
void SM_CRCs_are_valid(Actor *this);
void func_80386780(Actor *this);
void func_803867A8(Actor *this);
void func_80386D20(Actor *this);
void func_803870DC(Actor *this);
Actor *func_80387560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
Actor *lair_func_80387560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_80387730(Actor *this);
void func_803880BC(Actor *this);
void func_8038824C(Actor *this);
void func_803882B0(Actor *this);
void func_80388524(Actor *this);
void func_80388FC8(Actor *this);
void func_80389204(Actor *this);
void lair_func_80389204(Actor *this);
void func_803893B8(Actor *this);
void func_803894B0(Actor *this);
void lair_func_803894B0(Actor *this);
void func_8038982C(Actor *this);
void func_80389898(Actor *this);
void func_80389D08(Actor *this);
@@ -57,7 +57,7 @@ void func_80389FF4(Actor *this);
void func_8038A014(Actor *this);
void func_8038A034(Actor *this);
void func_8038A064(Actor *this);
void func_8038A084(Actor *this);
void lair_func_8038A084(Actor *this);
void func_8038A0A4(Actor *this);
extern ActorInfo D_80393560;
@@ -86,7 +86,7 @@ extern ActorInfo D_80394C94;
/* .data */
extern ActorAnimationInfo D_80392CB0[];
extern ActorInfo D_80392D90 = { 0x270, 0x2D8, 0x3B2, 0x1, NULL, func_802D3D54, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
extern ActorInfo lair_D_80392D90 = { 0x270, 0x2D8, 0x3B2, 0x1, NULL, func_802D3D54, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
extern ActorInfo D_80392DB4 = { 0x110, 0x214, 0x4AB, 0x1, D_80392CB0, func_803896D4, func_80326224, func_80325888, 0, 0, 0.0f, 0};
extern ActorInfo D_80392DD8 = { 0x113, 0x217, 0x4A9, 0x1, D_80392CB0, func_803896F4, func_80326224, func_80325888, 0, 0, 0.0f, 0};
extern ActorInfo D_80392DFC = { 0x115, 0x219, 0x4AA, 0x1, D_80392CB0, func_80389714, func_80326224, func_80325888, 0, 0, 0.0f, 0};
@@ -95,14 +95,14 @@ extern ActorInfo D_80392E44 = { 0x11C, 0x222, 0x4B2, 0x1, D_80392CB0, func_80389
extern ActorInfo D_80392E68 = { 0x11D, 0x223, 0x4B0, 0x1, D_80392CB0, func_80389784, func_80326224, func_80325888, 0, 0, 0.0f, 0};
extern ActorInfo D_80392E8C = { 0x232, 0x23C, 0x4B8, 0x1, D_80392CB0, func_803897AC, func_80326224, func_80325888, 0, 0, 0.0f, 0};
extern ActorInfo D_80392EB0 = { 0x23F, 0x246, 0x534, 0x1, D_80392CB0, func_80386D20, func_80326224, func_80325888, 0, 0, 0.0f, 0};
extern ActorInfo D_80392ED4 = { 0x241, 0x248, 0x540, 0x1, D_80392CB0, SM_CRCs_are_valid, func_80326224, func_80325888, 0, 0, 0.0f, 0};
extern ActorInfo D_80392EF8 = { 0x109, 0x20D, 0x4A1, 0x1, D_80392CB0, func_80386550, func_80326224, func_80325888, 0, 0, 0.0f, 0x85};
extern ActorInfo D_80392ED4 = { 0x241, 0x248, 0x540, 0x1, D_80392CB0, func_80386780, func_80326224, func_80325888, 0, 0, 0.0f, 0};
extern ActorInfo D_80392EF8 = { 0x109, 0x20D, 0x4A1, 0x1, D_80392CB0, lair_func_80386550, func_80326224, func_80325888, 0, 0, 0.0f, 0x85};
extern ActorInfo D_80392F1C = { 0x264, 0x2E5, 0x550, 0x19, D_80392CB0, func_80388524, func_80326224, func_80325888, 0, 0, 0.0f, 0};
extern ActorInfo D_80392F40 = { 0x224, 0x230, 0x4BF, 0xB, D_80392CB0, func_803863F0, func_80326224, func_80325888, 0, 0, 0.0f, 0x88};
extern ActorInfo D_80392F64 = { 0x225, 0x231, 0x4D5, 0xE, D_80392CB0, func_803864B0, func_80326224, func_80325888, 0, 0, 0.0f, 0x88};
extern ActorInfo D_80392F40 = { 0x224, 0x230, 0x4BF, 0xB, D_80392CB0, lair_func_803863F0, func_80326224, func_80325888, 0, 0, 0.0f, 0x88};
extern ActorInfo D_80392F64 = { 0x225, 0x231, 0x4D5, 0xE, D_80392CB0, lair_func_803864B0, func_80326224, func_80325888, 0, 0, 0.0f, 0x88};
extern ActorInfo D_80392F88 = { 0x111, 0x215, 0x4A4, 0x1, NULL, func_80388FC8, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
extern ActorInfo D_80392FAC = { 0x112, 0x216, 0x4A5, 0x1, NULL, func_80388FC8, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
extern ActorInfo D_80392FD0 = { 0x114, 0x218, 0x4A6, 0x1, NULL, func_80389204, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
extern ActorInfo D_80392FD0 = { 0x114, 0x218, 0x4A6, 0x1, NULL, lair_func_80389204, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
extern ActorInfo D_80392FF4 = { 0x10D, 0x211, 0x4A3, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
extern ActorInfo D_80393018 = { 0x22C, 0x23A, 0x4D9, 0x1, NULL, func_803882B0, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
extern ActorInfo D_8039303C = { 0x164, 0x259, 0x507, 0x1, NULL, func_803880BC, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
@@ -118,16 +118,16 @@ extern ActorInfo D_80393180 = { 0x228, 0x235, 0x4D7, 0x1, NULL, func_80388524, f
extern ActorInfo D_803931A4 = { 0x229, 0x236, 0x4D8, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x8B};
extern ActorInfo D_803931C8 = { MARKER_121_GLASS_EYE, ACTOR_227_GLASS_EYE, ASSET_4BD_MODEL_GLASS_EYE, 0x1, NULL, func_8038A034, func_80326224, func_80325888, 0, 0, 0.0f, 0x89};
extern ActorInfo D_803931EC = { 0x116, 0x21A, 0x4AC, 0x1, NULL, func_803893B8, func_80326224, func_80325E78, 0, 0, 0.0f, 0x82};
extern ActorInfo D_80393210 = { 0x117, 0x21B, 0x4AD, 0x1, NULL, func_803894B0, func_80326224, func_80325E78, 0, 0, 0.0f, 0x82};
extern ActorInfo D_80393210 = { 0x117, 0x21B, 0x4AD, 0x1, NULL, lair_func_803894B0, func_80326224, func_80325E78, 0, 0, 0.0f, 0x82};
extern ActorInfo D_80393234 = { 0x10B, 0x20F, 0x4B4, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x90};
extern ActorInfo D_80393258 = { 0x10C, 0x210, 0x4AE, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x84};
extern ActorInfo D_8039327C = { 0x10E, 0x212, 0x4A7, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x7F};
extern ActorInfo D_803932A0 = { 0x120, 0x226, 0x4BC, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x87};
extern ActorInfo D_803932C4 = { 0x122, 0x228, 0x4BE, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x8C};
extern ActorInfo D_803932E8 = { 0x10F, 0x213, 0x4A8, 0x1, NULL, func_803875F0, func_80326224, func_80325E78, 0, 0, 0.0f, 0x80};
extern ActorInfo D_8039330C = { 0x118, 0x21E, 0x4B1, 0x1, NULL, func_8038A084, func_80326224, func_80325E78, 0, 0, 0.0f, 0x8F};
extern ActorInfo D_8039330C = { 0x118, 0x21E, 0x4B1, 0x1, NULL, lair_func_8038A084, func_80326224, func_80325E78, 0, 0, 0.0f, 0x8F};
extern ActorInfo D_80393330 = { 0x119, 0x21F, 0x4B6, 0x1, NULL, func_8038A0A4, func_80326224, func_80325E78, 0, 0, 0.0f, 0x92};
extern ActorInfo D_80393354 = { 0x266, 0x2E3, 0x563, 0x1, NULL, func_803870DC, func_80326224, func_80387560, 0, 0, 0.0f, 0};
extern ActorInfo D_80393354 = { 0x266, 0x2E3, 0x563, 0x1, NULL, func_803870DC, func_80326224, lair_func_80387560, 0, 0, 0.0f, 0};
extern ActorInfo D_80393378 = { 0x17D, 0x1E1, 0x517, 0x1, NULL, func_80389D08, func_80326224, func_80389E10, 0, 0, 0.0f, 0x8D};
extern ActorInfo D_8039339C = { 0x234, 0x23E, 0x4E1, 0x12, D_80392CB0, func_8038982C, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
extern ActorInfo D_803933C0 = { 0x163, 0x258, 0x511, 0x12, D_80392CB0, func_80389898, func_80326224, func_8038664C, 0, 0, 0.0f, 0x8E};
@@ -147,7 +147,7 @@ extern s32 D_80393504[4];
//chcobweb
void func_803863F0(Actor *this)
void lair_func_803863F0(Actor *this)
{
if(!this->initialized)
{
@@ -171,7 +171,7 @@ void func_803863F0(Actor *this)
}
//chbigyellowcobweb
void func_803864B0(Actor *this)
void lair_func_803864B0(Actor *this)
{
if (!this->initialized)
{
@@ -194,7 +194,7 @@ void func_803864B0(Actor *this)
}
}
void func_80386550(Actor *this)
void lair_func_80386550(Actor *this)
{
if (!this->initialized)
{
@@ -265,7 +265,7 @@ ParticleEmitter *func_803866D8(s32 a0)
return ptr;
}
void SM_CRCs_are_valid(Actor *this)
void func_80386780(Actor *this)
{
func_802D4AC0(this, 0x8000C6, 0xC7);
}
@@ -376,7 +376,7 @@ void func_80386D20(Actor *this)
func_802D4A9C(this, 0);
}
void chwasp_setState(void)
void func_80386D40(void)
{
func_802D68F0(0xC);
item_set(ITEM_6_HOURGLASS, TRUE);
@@ -442,7 +442,7 @@ void func_80386D78(Actor *this) {
this->unk60 = 26.0f;
this->position[1] = this->unk1C[1];
func_802BAFE4(0x80);
timedFunc_set_0(3.0f, chwasp_setState);
timedFunc_set_0(3.0f, func_80386D40);
}
}
@@ -520,7 +520,7 @@ void func_803870DC(Actor *this) {
}
}
Actor *func_80387560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx)
Actor *lair_func_80387560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx)
{
Actor *actor = marker_getActor(marker);
u32 i;
@@ -853,7 +853,7 @@ void func_8038824C(Actor *this)
}
void func_80388278(Actor *this)
void lair_func_80388278(Actor *this)
{
void func_802F9D38(s32);
@@ -1145,7 +1145,7 @@ void func_80388524(Actor *this) {
this->position[1] += 5.0f;
if (this->unk1C[1] < this->position[1]) {
func_80388404(0x36, SFX_6C_LOCKUP_CLOSING, 1.0f, 15000);
func_80388278(this);
lair_func_80388278(this);
marker_despawn(this->marker);
}
break;
@@ -1154,7 +1154,7 @@ void func_80388524(Actor *this) {
this->position[1] += 5.0f;
if (this->unk1C[1] < this->position[1]) {
func_80388404(0x33, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 17000);
func_80388278(this);
lair_func_80388278(this);
marker_despawn(this->marker);
}
break;
@@ -1179,7 +1179,7 @@ void func_80388524(Actor *this) {
this->position[1] += 5.0f;
if (this->unk1C[1] < this->position[1]) {
func_80388404(0x38, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 17000);
func_80388278(this);
lair_func_80388278(this);
marker_despawn(this->marker);
}
break;
@@ -1196,7 +1196,7 @@ void func_80388524(Actor *this) {
this->position[1] += 3.2;
if (this->unk1C[1] <= this->position[1]) {
func_80388404(0x39, SFX_6C_LOCKUP_CLOSING, 1.0f, 20000);
func_80388278(this);
lair_func_80388278(this);
marker_despawn(this->marker);
}
break;
@@ -1206,7 +1206,7 @@ void func_80388524(Actor *this) {
sp28 = func_80326EEC(0x236);
this->unk1C[0] += 3.6;
if (this->unk1C[0] > 250.0f) {
func_80388278(this);
lair_func_80388278(this);
marker_despawn(this->marker);
marker_despawn(sp28->marker);
func_80320004(0x35, TRUE);
@@ -1299,7 +1299,7 @@ void func_80388FC8(Actor *this)
}
}
void func_80389204(Actor *this)
void lair_func_80389204(Actor *this)
{
func_802D3D74(this);
@@ -1399,7 +1399,7 @@ void func_803893B8(Actor *this)
}
}
void func_803894B0(Actor *this)
void lair_func_803894B0(Actor *this)
{
void func_802EE2E8(Actor *, s32, s32, s32, f32, f32, f32);
func_802D3D74(this);
@@ -1511,7 +1511,7 @@ void func_80389898(Actor *this)
if (this->unk10_12)
{
func_80328AC8(this, 0x13);
func_803298AC(this);
actor_playAnimationOnce(this);
func_80320004(BKPROG_9E_CRYPT_COFFIN_LID_OPEN, TRUE);
}
@@ -1561,7 +1561,7 @@ void func_80389934(Actor *this)
if (--this->unk1C[0] == 0)
{
func_80328AC8(this, 0x17);
func_803298AC(this);
actor_playAnimationOnce(this);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.6f, 32000);
func_8025A6EC(COMUSIC_3D_JIGGY_SPAWN, 0x7FFF);
}
@@ -1766,7 +1766,7 @@ void func_8038A064(Actor *this)
func_80389FA8(this, BKPROG_C5_RAREWARE_BOX_BROKEN);
}
void func_8038A084(Actor *this)
void lair_func_8038A084(Actor *this)
{
func_80389FA8(this, BKPROG_CD_GRATE_TO_WATER_SWITCH_3_OPEN);
}
@@ -1776,7 +1776,7 @@ void func_8038A0A4(Actor *this)
func_80389FA8(this, BKPROG_CE_GRATE_TO_MMM_PUZZLE_OPEN);
}
void func_8038A0C4(void)
void lair_func_8038A0C4(void)
{
spawnableActorList_add(&D_80392F40, actor_new, 0x18628);
spawnableActorList_add(&D_80392F64, actor_new, 0x18608);
@@ -1847,5 +1847,5 @@ void func_8038A0C4(void)
spawnableActorList_add(&D_80394CF0, actor_new, 0x80508);
spawnableActorList_add(&D_80394C94, actor_new, 0x500);
spawnableActorList_add(&D_80393354, actor_new, 0x8602);
spawnableActorList_add(&D_80392D90, actor_new, 0x20000);
spawnableActorList_add(&lair_D_80392D90, actor_new, 0x20000);
}

10
src/lair/code_42A0.c
View File

@@ -71,7 +71,7 @@ void func_8038A730(Actor *this, f32 *arg1, enum sfx_e arg2, enum sfx_e arg3, u32
}
}
void func_8038A864(Actor *this) {
void lair_func_8038A864(Actor *this) {
switch (this->state) {
case 2:
func_8038A730(this, D_80393670, SFX_3F_CAULDRON_SQEAK_1, SFX_40_CAULDRON_SQEAK_2, 11000);
@@ -172,7 +172,7 @@ void func_8038ADC0(ActorMarker *marker, enum asset_e text_id, s32 arg2){
func_80320004(0xF3, TRUE);
}
bool func_8038ADF0(s32 arg0, s32 arg1) {
bool lair_func_8038ADF0(s32 arg0, s32 arg1) {
s32 phi_v1;
phi_v1 = arg1 - arg0;
@@ -192,7 +192,7 @@ void func_8038AE2C(Actor *this) {
s32 sp38;
f32 sp34;
func_8038A864(this);
lair_func_8038A864(this);
if (!this->unk16C_4) {
sp50 = FALSE;
this->unk16C_4 = TRUE;
@@ -375,8 +375,8 @@ void func_8038AE2C(Actor *this) {
}
func_8038AC7C(this);
sp38 = func_80329784(this);
if( func_8038ADF0(sp38, (s32) this->velocity[0])
|| func_8038ADF0((s32) this->velocity[0], sp38)
if( lair_func_8038ADF0(sp38, (s32) this->velocity[0])
|| lair_func_8038ADF0((s32) this->velocity[0], sp38)
) {
this->yaw_ideal = (f32) sp38;
}

4
src/lair/code_5640.c
View File

@@ -29,7 +29,7 @@ void func_8038BA30(ActorMarker *marker, enum asset_e text_id, s32 arg2){
func_80320424(0x20 + this->unkF4_8*6 + phi_v1, 2);
}
void func_8038BA88(ActorMarker *marker, enum asset_e text_id, s32 arg2){
void lair_func_8038BA88(ActorMarker *marker, enum asset_e text_id, s32 arg2){
Actor *this;
this = marker_getActor(marker);
@@ -44,7 +44,7 @@ void func_8038BADC(ActorMarker *marker, enum asset_e text_id, s32 arg2) {
if (text_id == ((ActorLocal_lair_5640 *)&this->local)->unk0 + 2) {
if (!func_8031FF1C(this->unkF4_8 + 0xE8)) {
if (item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL)) {
func_80311480(0x10A2, 0xF, this->position, this->marker, func_8038BADC, func_8038BA88);
func_80311480(0x10A2, 0xF, this->position, this->marker, func_8038BADC, lair_func_8038BA88);
return;
}
}

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;

18
src/lair/code_86F0.c
View File

@@ -22,11 +22,11 @@ typedef struct {
}Struct_lair_86F0_0;
void func_8038F350(Actor *this, s32 next_state);
void func_8038F924(Actor *this);
void lair_func_8038F924(Actor *this);
/* .data */
ActorInfo D_803947B0 = { 0x1EB, 0x3B7, 0x48B, 0x1, NULL, func_8038F924, func_80326224, func_80325888, 0, 0, 0.0f, 0};
ActorInfo D_803947D4 = { 0x1EB, 0x3BC, 0x538, 0x1, NULL, func_8038F924, func_80326224, func_80325888, 0, 0, 0.0f, 0};
ActorInfo D_803947B0 = { 0x1EB, 0x3B7, 0x48B, 0x1, NULL, lair_func_8038F924, func_80326224, func_80325888, 0, 0, 0.0f, 0};
ActorInfo D_803947D4 = { 0x1EB, 0x3BC, 0x538, 0x1, NULL, lair_func_8038F924, func_80326224, func_80325888, 0, 0, 0.0f, 0};
Struct_lair_86F0_0 D_803947F8[0xb] ={
{0x01, 0x1, 0x5D},
{0x02, 0x2, 0x5E},
@@ -373,7 +373,7 @@ void func_8038F350(Actor *this, s32 next_state){
}
void func_8038F800(Actor *this) {
void lair_func_8038F800(Actor *this) {
s32 temp_v0;
s32 phi_s0;
@@ -385,7 +385,7 @@ void func_8038F800(Actor *this) {
}
}
void func_8038F894(Actor *this, s32 arg1) {
void lair_func_8038F894(Actor *this, s32 arg1) {
if (item_getCount(ITEM_26_JIGGY_TOTAL) > 0) {
func_8038F350(this, arg1);
return;
@@ -399,7 +399,7 @@ void func_8038F894(Actor *this, s32 arg1) {
func_80320004(0xDE, 1);
}
void func_8038F924(Actor *this) {
void lair_func_8038F924(Actor *this) {
ActorLocal_lair_86F0 *local;
s32 sp7C[6]; //buttons
s32 phi_v1;
@@ -426,7 +426,7 @@ void func_8038F924(Actor *this) {
local->unk4++;
local->unk0 |= (1 << func_8038F0EC(this));
}
func_8038F800(this);
lair_func_8038F800(this);
marker_setCollisionScripts(this->marker, func_8038EC94, NULL, NULL);
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
@@ -494,11 +494,11 @@ void func_8038F924(Actor *this) {
case 4: //L8038FE28
if ((func_803114C4() != 0xF7C) && (func_803114C4() != 0xF7D)) {
if (sp7C[FACE_BUTTON(BUTTON_A)] == 1) {
func_8038F894(this, 5);
lair_func_8038F894(this, 5);
} else if (sp7C[FACE_BUTTON(BUTTON_B)] == 1) {
func_8038F350(this, 1);
} else if ((sp6C[0] == 1) && func_8031FF1C(0xE0)) {
func_8038F894(this, 6);
lair_func_8038F894(this, 6);
} else if (sp7C[FACE_BUTTON(BUTTON_C_DOWN)] == 1) {
if (local->unk4) {
func_8038F350(this, 8);

6
src/lair/code_9C40.c
View File

@@ -35,7 +35,7 @@ s32 func_80390084(void) {
return phi_s1;
}
void func_803900DC(ActorMarker *marker, enum asset_e text_id, s32 arg2){
void lair_func_803900DC(ActorMarker *marker, enum asset_e text_id, s32 arg2){
}
@@ -64,10 +64,10 @@ void func_80390174(ActorMarker *marker, s32 arg1) {
sp28 = this->marker->unk14_20 - 0x16D;
func_8028F94C(2, this->position);
if (func_8031FF1C(sp28 + 0xAD)) {
func_80311480(sp28 + 0xF83, 0xE, this->position, this->marker, func_803900EC, func_803900DC);
func_80311480(sp28 + 0xF83, 0xE, this->position, this->marker, func_803900EC, lair_func_803900DC);
return;
}
func_80311174(func_80390084() + 0xFA5, 0xE, this->position, this->marker, func_803900EC, func_803900DC, func_80390158);
func_80311174(func_80390084() + 0xFA5, 0xE, this->position, this->marker, func_803900EC, lair_func_803900DC, func_80390158);
}
void func_8039024C(Actor *this){

6
src/lair/code_AD70.c
View File

@@ -72,7 +72,7 @@ void func_80391160(f32 pos[3], u32 count)
particleEmitter_emitN(p, count);
}
void func_80391254(f32 pos[3], u32 count, enum asset_e sprite)
void lair_func_80391254(f32 pos[3], u32 count, enum asset_e sprite)
{
ParticleEmitter *p = partEmitList_pushNew(count);
particleEmitter_setSprite(p, sprite);
@@ -189,8 +189,8 @@ void func_80391810(Actor *this, s32 next_state) {
break;
case 2:
FUNC_8030E8B4(SFX_148_GRUNTY_SPELL_LANDING, 1.0f, 20000, this->position, 1500, 3000);
func_80391254(this->position, 2, 0x4A0);
func_80391254(this->position, 2, 0x6C1);
lair_func_80391254(this->position, 2, 0x4A0);
lair_func_80391254(this->position, 2, 0x6C1);
func_80391160(this->position, 4);
func_8039137C(this->position, 4, 0x711);
func_8039137C(this->position, 4, 0x712);