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

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