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

Merge branch 'mr-origin-91'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-08 02:13:18 -05:00
parent 3cd3b3e5da ee5d7e2fd8
commit 6fb4f2b3f1
25 changed files with 289 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/lair/code_0.c
View File

@@ -178,12 +178,12 @@ s16 D_80393454[] = {
FILEPROG_37_MMM_OPEN,
FILEPROG_38_RBB_OPEN,
FILEPROG_39_CCW_OPEN,
0
NULL
};
s16 D_80393468[] = {
0,
0,
NULL,
NULL,
VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC,
VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS,
VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP,
@@ -191,7 +191,7 @@ s16 D_80393468[] = {
VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM,
VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB,
VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW,
0
NULL
};
s16 D_8039347C[] = {50, 180, 260, 350, 450, 640, 765, 810, 828, 846, 864, 882}; //notedoor_notes_required_to_open
@@ -662,7 +662,7 @@ void func_80387730(Actor *this) {
this->alpha_124_19 = 0xFF;
this->unk1C[1] = 0.0f;
this->unk1C[2] = 3.5f;
if (fileProgressFlag_get(this->unkF4_8 + 0x39)) {
if (fileProgressFlag_get(this->unkF4_8 + FILEPROG_39_CCW_OPEN)) {
marker_despawn(this->marker);
return;
}
@@ -681,7 +681,7 @@ void func_80387730(Actor *this) {
this->unk1C[1] = 0.0f;
this->unk1C[2] = 3.5f;
}
if (!fileProgressFlag_get(this->unkF4_8 + 0x39) && ability_isUnlocked(ABILITY_13_1ST_NOTEDOOR)) {
if (!fileProgressFlag_get(this->unkF4_8 + FILEPROG_39_CCW_OPEN) && ability_isUnlocked(ABILITY_13_1ST_NOTEDOOR)) {
player_getPosition(spAC);
if ((ml_distance_vec3f(spAC, this->position) < 500.0f) && (func_803114C4() != 0xF64)) {
func_802FACA4(0xC);
@@ -711,7 +711,7 @@ void func_80387730(Actor *this) {
this->alpha_124_19 -= 7;
}
if (this->alpha_124_19 == 0) {
fileProgressFlag_set(this->unkF4_8 + 0x39, TRUE);
fileProgressFlag_set(this->unkF4_8 + FILEPROG_39_CCW_OPEN, TRUE);
marker_despawn(this->marker);
func_8028F918(0);
func_8028F66C(BS_INTR_35);
@@ -825,14 +825,14 @@ void func_80387F1C(void)
}
}
void func_80387F78(Actor *this, u32 flag)
void func_80387F78(Actor *this, enum file_progress_e progress_flag)
{
if (this->unk1C[0] != 2.f)
{
if (this->unk1C[0] != 0 && fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE))
{
u32 flagState = fileProgressFlag_get(flag);
fileProgressFlag_set(flag, TRUE);
u32 flagState = fileProgressFlag_get(progress_flag);
fileProgressFlag_set(progress_flag, TRUE);
if (flagState == FALSE
&& !jiggyscore_isSpawned(JIGGY_35_LAIR_CC_WITCH_SWITCH)
@@ -844,7 +844,7 @@ void func_80387F78(Actor *this, u32 flag)
}
}
if (fileProgressFlag_get(flag))
if (fileProgressFlag_get(progress_flag))
{
this->position_y -= 4.5; // f64
@@ -966,12 +966,12 @@ void func_803882B0(Actor *this)
}
}
void func_80388404(enum file_progress_e flag, enum sfx_e sfx, f32 a2, s32 a3)
void func_80388404(enum file_progress_e progress_flag, enum sfx_e sfx, f32 a2, s32 a3)
{
if (fileProgressFlag_get(flag) == FALSE)
if (fileProgressFlag_get(progress_flag) == FALSE)
func_8030E6A4(sfx, a2, a3);
fileProgressFlag_set(flag, TRUE);
fileProgressFlag_set(progress_flag, TRUE);
}
void func_80388450(Actor *actor1, Actor *actor2)
@@ -1730,7 +1730,7 @@ void func_80389D08(Actor *this)
this->volatile_initialized = TRUE;
this->lifetime_value = 0;
if (fileProgressFlag_get(0xA5))
if (fileProgressFlag_get(FILEPROG_A5_LAIR_CRYPT_GATE_OPEN))
{
marker_despawn(this->marker);
return;

2
src/lair/code_86F0.c
View File

@@ -18,7 +18,7 @@ typedef struct {
typedef struct {
u8 cost;
u8 size_bits;
u16 progress_flag;
u16 progress_flag; // enum file_progress_e
}Struct_lair_86F0_0;
void func_8038F350(Actor *this, s32 next_state);

11
src/lair/code_9C40.c
View File

@@ -28,7 +28,7 @@ s32 func_80390084(void) {
s32 phi_s1;
for(phi_s0 = 0, phi_s1 = 0; phi_s0 < 3; phi_s0++){
if (fileProgressFlag_get(phi_s0 + 0xAD)) {
if (fileProgressFlag_get(phi_s0 + FILEPROG_AD_CHEATO_BLUEEGGS_UNLOCKED)) {
phi_s1++;
}
}
@@ -44,8 +44,8 @@ void func_803900EC(ActorMarker *marker, enum asset_e text_id, s32 arg2){
sp1C = marker->id - 0x16D;
func_8028F918(0);
if (!fileProgressFlag_get(sp1C + 0xAD)) {
fileProgressFlag_set(sp1C + 0xAD, 1);
if (!fileProgressFlag_get(sp1C + FILEPROG_AD_CHEATO_BLUEEGGS_UNLOCKED)) {
fileProgressFlag_set(sp1C + FILEPROG_AD_CHEATO_BLUEEGGS_UNLOCKED, 1);
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
}
}
@@ -63,7 +63,8 @@ void func_80390174(ActorMarker *marker, s32 arg1) {
this = marker_getActor(marker);
sp28 = this->marker->id - 0x16D;
func_8028F94C(2, this->position);
if (fileProgressFlag_get(sp28 + 0xAD)) {
if (fileProgressFlag_get(sp28 + FILEPROG_AD_CHEATO_BLUEEGGS_UNLOCKED)) {
// cheato hint texts
gcdialog_showText(sp28 + 0xF83, 0xE, this->position, this->marker, func_803900EC, lair_func_803900DC);
return;
}
@@ -106,7 +107,7 @@ void func_803902B8(Actor *this) {
}
this->unk38_0 = sp58;
sp58 = ml_vec3f_within_distance(this->position, sp5C, 400.0f);
if (fileProgressFlag_get(sp54 + 0xAD)) {
if (fileProgressFlag_get(sp54 + FILEPROG_AD_CHEATO_BLUEEGGS_UNLOCKED)) {
func_8024E55C(0, sp3C);
sp58 &= (sp3C[FACE_BUTTON(BUTTON_B)] == 1) || func_8028EC04();
}