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

core2/code_94A20.c progress

Browse Source
This commit is contained in:
Banjo Kazooie
2022-08-19 13:49:30 -05:00
parent 51f66770d9
commit 07ca1d783d
56 changed files with 219 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lair/code_5640.c
View File

@@ -161,7 +161,7 @@ void func_8038BCF0(Actor *this) {
}
}
actor_setOpacity(this, sp74);
if (!func_803203FC(0x1F)) {
if (!func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) {
if ((phi_f2 < 600.0) && !this->unk38_0) {
comusic_8025AB44(COMUSIC_7A_BRENTILDA, -1, 0x1F4);
func_8032BB88(this, 0, 0x1F4);

2
src/lair/code_9C40.c
View File

@@ -91,7 +91,7 @@ void func_803902B8(Actor *this) {
sp54 = this->marker->unk14_20 - 0x16D;
if (!this->initialized) {
func_803300D8(this->marker, func_80390298);
this->unk138_24 = func_803203FC(0x1F);
this->unk138_24 = func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE);
this->initialized = TRUE;
}
_player_getPosition(sp5C);

2
src/lair/code_A810.c
View File

@@ -131,7 +131,7 @@ void func_80390E28(Actor *this) {
switch (this->state) {
case 0:
if( !func_8031A3BC() && (sp38 < 2) && (randf() < 0.1) && !mapSpecificFlags_get(0xA) && !func_803203FC(0x1F)) {
if( !func_8031A3BC() && (sp38 < 2) && (randf() < 0.1) && !mapSpecificFlags_get(0xA) && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) {
sp38++;
mapSpecificFlags_setN(0, sp38, 2);
func_80390D3C(this, (randf() < 0.5) ? 2 :1);

28
src/lair/code_BBD0.c
View File

@@ -19,10 +19,26 @@ ActorAnimationInfo D_80394BE0[] = {
{0x28E, 2.0f},
{0x1D0, 3.0f},
};
ActorInfo D_80394C28 = { 0x29A, 0x3C4, 0x55F, 0x1, D_80394BE0, func_8039217C, func_80326224, func_80325888, 0, 0, 3.0f, 0};
ActorInfo D_80394C4C = { 0x29A, 0x3C7, 0x560, 0x3, D_80394BE0, func_8039217C, func_80326224, func_80325888, 0, 0, 1.0f, 0};
ActorInfo D_80394C70 = { 0x29A, 0x3C6, 0x34C, 0x0, D_80394BE0, func_8039217C, func_80326224, func_80325888, 0, 0, 3.0f, 0};
ActorInfo D_80394C94 = { 0x29A, 0x3C8, 0x35B, 0x5, D_80394BE0, func_8039217C, func_80326224, func_80391FC0, 0, 0, 1.0f, 0};
ActorInfo D_80394C28 = { MARKER_29A_FF_PRIZE, ACTOR_3C4_FF_PRIZE_WASHING_CAULDRON, ASSET_55F_MODEL_FF_PRIZE_WASHING_CAULDRON,
0x1, D_80394BE0,
func_8039217C, func_80326224, func_80325888,
0, 0, 3.0f, 0
};
ActorInfo D_80394C4C = { MARKER_29A_FF_PRIZE, ACTOR_3C7_FF_PRIZE_GRUNTY_DOLL, ASSET_560_MODEL_FF_PRIZE_GRUNTY_DOLL,
0x3, D_80394BE0,
func_8039217C, func_80326224, func_80325888,
0, 0, 1.0f, 0
};
ActorInfo D_80394C70 = { MARKER_29A_FF_PRIZE, 0x3C6, 0x34C,
0x0, D_80394BE0,
func_8039217C, func_80326224, func_80325888,
0, 0, 3.0f, 0
};
ActorInfo D_80394C94 = { MARKER_29A_FF_PRIZE, ACTOR_3C8_FF_PRIZE_TOOTY, ASSET_35B_FF_PRIZE_TOOTY,
0x5, D_80394BE0,
func_8039217C, func_80326224, func_80391FC0,
0, 0, 1.0f, 0
};
/* .code */
Actor *func_80391FC0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
@@ -32,7 +48,7 @@ Actor *func_80391FC0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_80392014(Actor *this, enum sfx_e sfx_id, f32 arg2, f32 arg3, s32 arg4) {
if (mapSpecificFlags_get(0xA) || func_803203FC(0x1F)) {
if (mapSpecificFlags_get(0xA) || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) {
arg4 = arg4 * 0.5;
}
if (mapSpecificFlags_get(5)) {
@@ -103,7 +119,7 @@ void func_8039217C(Actor *this) {
break;
case 5: //L803923C0
if (func_803203FC(0x1F)) {
if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) {
func_80328A84(this, 8U);
break;
}

2
src/lair/code_C6C0.c
View File

@@ -13,7 +13,7 @@ ActorInfo D_80394D20 = { 0x29C, 0x3C9, 0x0, 0x0, NULL, func_80392B6C, func_80326
void func_80392AB0(ActorMarker *marker, enum asset_e text_id, s32 arg2){
comusic_8025AB44(COMUSIC_A9_TOOTY, 0, 2000);
func_8025AABC(0xA9);
func_8031B51C();
gcparade_beginFFParade();
}
void func_80392AF4(ActorMarker *marker, enum asset_e text_id, s32 arg2){