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

documented volatile flag functions and enums and some Actor struct members

Browse Source
This commit is contained in:
mariob92
2024-09-08 12:22:27 +02:00
parent 347c3edcdf
commit 615e2bda33
111 changed files with 584 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CCW/ch/vacationtexttrigger.c
View File

@@ -30,7 +30,7 @@ static bool __playerIsWithinTrigger(s32 x, s32 z, s32 distance) {
void chVacationTextTrigger_update(Actor* this) {
// Despawn if already triggered
if (func_803203FC(UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT)) {
if (volatileFlag_get(VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT)) {
marker_despawn(this->marker);
return;
}
@@ -38,6 +38,6 @@ void chVacationTextTrigger_update(Actor* this) {
// Start dialog if player is within trigger
if (__playerIsWithinTrigger(0, -107, 188) != 0) {
func_80311480(0xDA9, 4, NULL, NULL, NULL, NULL);
func_803204E4(UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT, 1);
volatileFlag_set(VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT, 1);
}
}

20
src/CCW/code_160.c
View File

@@ -41,7 +41,7 @@ void func_803865F4(Actor *this, s32 next_state) {
local = (ActorLocal_CCW_160 *)&this->local;
local->unkC = 0.0f;
if (next_state == 2) {
if (!func_80320454(0xB5, 1)) {
if (!volatileFlag_getAndSet(0xB5, 1)) {
func_80311480(0xCE2, 4, NULL, this->marker, func_803865C4, NULL);
} else {
func_80311480(0xCE3, 4, NULL, NULL, NULL, NULL);
@@ -57,10 +57,10 @@ void func_803865F4(Actor *this, s32 next_state) {
}
if (next_state == 4) {
if (func_803203FC(2)) {
if (volatileFlag_get(VOLATILE_FLAG_2)) {
item_set(ITEM_6_HOURGLASS, FALSE);
func_803204E4(3, 0);
func_803204E4(5, 1);
volatileFlag_set(3, 0);
volatileFlag_set(5, 1);
} else {
func_80311480(0xCE4, 4, NULL, NULL, NULL, NULL);
func_8025A58C(-1, 400);
@@ -133,7 +133,7 @@ void func_8038687C(Actor *this) {
local->unk4 = 0;
local->unk8 = 0;
local->unkC = 0.0f;
if (func_803203FC(2)) {
if (volatileFlag_get(VOLATILE_FLAG_2)) {
this->position_y -= 300.0f;
}
func_803865F4(this, 1);
@@ -141,7 +141,7 @@ void func_8038687C(Actor *this) {
}
if ((s32)local->unk0 == 1) {
other = actorArray_findActorFromActorId(0x46);
if(func_803203FC(2)) {
if(volatileFlag_get(VOLATILE_FLAG_2)) {
local->unk0 = NULL;
if (other != NULL) {
actor_collisionOff(other);
@@ -198,7 +198,7 @@ void func_8038687C(Actor *this) {
local->unkC = randf2(0.5 - ((local->unk8 / 10) * 0.4), 1.0 - ((local->unk8 / 10) * 0.8));
}
if (this->state == 1) {
if (func_803203FC(2) && func_803203FC(3)) {
if (volatileFlag_get(VOLATILE_FLAG_2) && volatileFlag_get(VOLATILE_FLAG_3)) {
item_set(ITEM_6_HOURGLASS, 1);
item_set(ITEM_0_HOURGLASS_TIMER, 1800 - 1);
func_803865F4(this, 3);
@@ -209,9 +209,9 @@ void func_8038687C(Actor *this) {
}
}
}
if ((this->state == 3) && func_803203FC(2) && item_empty(ITEM_0_HOURGLASS_TIMER)) {
if ((this->state == 3) && volatileFlag_get(VOLATILE_FLAG_2) && item_empty(ITEM_0_HOURGLASS_TIMER)) {
item_set(ITEM_6_HOURGLASS, 0);
func_803204E4(3, 0);
func_803204E4(5, 0);
volatileFlag_set(3, 0);
volatileFlag_set(5, 0);
}
}

4
src/CCW/code_3DA0.c
View File

@@ -152,9 +152,9 @@ void chcaterpillar_update(Actor *this){
if(ml_distance_vec3f(this->position, sp74) < 50.0f){
func_8028F030(ACTOR_2A2_CATERPILLAR);
if(!func_803203FC(0xb2)){
if(!volatileFlag_get(0xb2)){
func_80311480(0xcc7, 4, NULL, NULL, NULL, NULL);
func_803204E4(0xb2, TRUE);
volatileFlag_set(0xb2, TRUE);
}
FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 0x1f4, 0x9c4);
marker_despawn(this->marker);

2
src/CCW/code_4530.c
View File

@@ -80,7 +80,7 @@ void func_8038AA8C(Actor *this) {
this->unk16C_4 = TRUE;
mapSpecificFlags_set(5, FALSE);
if( (!fileProgressFlag_get(FILEPROG_E8_AUTMN_EYRIE_FED) || jiggyscore_isSpawned(JIGGY_49_CCW_EYRIE))
&& !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)
&& !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)
) {
marker_despawn(this->marker);
}