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/TTC/ch/treasure.c
View File

@@ -48,7 +48,7 @@ void chtreasure_update(Actor *this){
if(!this->initialized){
this->initialized = TRUE;
if(this->unkF4_8 == 1 && !func_803203FC(0xC1)){
if(this->unkF4_8 == 1 && !func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
marker_despawn(this->marker);
return;
}

8
src/TTC/code_0.c
View File

@@ -84,8 +84,8 @@ bool func_803864B0(Actor *this, f32 arg1) {
this->unk28 = phi_f2 / arg1;
this->yaw_moving = func_80257204(this->position[0], this->position[2], sp3C[0], sp3C[2]);
if ((func_803203FC(0xC1) ? 0 : 0x11) < this->unk28) {
this->unk28 = (func_803203FC(0xC1) != 0) ? 0.0f : 17.0f;
if ((func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11) < this->unk28) {
this->unk28 = (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) != 0) ? 0.0f : 17.0f;
} else if (sp38 == 0) {
func_803863F0(SFX_AE_YUMYUM_TALKING, randf2(0.9f, 1.0f), 22000, this->position, 500.0f, 2000.0f);
}
@@ -107,13 +107,13 @@ bool func_80386760(Actor *this, s32 arg1) {
if (((f64) animctrl_getAnimTimer(this->animctrl) < 0.1) && ((f64) randf() < 0.5)) {
if (this->unk1C[0] != 0.0f) {
arg1 *= 2;
this->unk28 = (f32) randi2(0, 0.5*(func_803203FC(0xC1) ? 0 : 0x11));
this->unk28 = (f32) randi2(0, 0.5*(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11));
this->yaw_moving += (f32) randi2(-arg1, arg1);
} else if ((f64) randf() < 0.4) {
this->unk28 = 0.0f;
this->yaw_moving += (f32) randi2(-arg1, arg1);
} else {
this->unk28 = (f32) randi2(0.33 * (func_803203FC(0xC1) ? 0 : 0x11), func_803203FC(0xC1) ? 0 : 0x11);
this->unk28 = (f32) randi2(0.33 * (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11), func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11);
this->yaw_moving = this->yaw;
}
this->unk1C[0] = 0.0f;