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

10
src/SM/ch/vegetables.c
View File

@@ -329,9 +329,9 @@ void func_80388080(Actor *this){
switch (this->state)
{
case 1: //L803882B0
if(mapSpecificFlags_get(0xC) || func_803203FC(0xC1) || this->unk10_12){
if(mapSpecificFlags_get(0xC) || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) || this->unk10_12){
//L803882E4
if(mapSpecificFlags_get(0xC) || func_803203FC(0xC1)){ //L8038830C
if(mapSpecificFlags_get(0xC) || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){ //L8038830C
this->unk1C_y += (local->unkC == 3)? 120.0 : 0.0;
}else{//L80388350
this->unk1C_y += (local->unkC == 3)? 270.0 : 85.0;
@@ -372,7 +372,7 @@ void func_80388080(Actor *this){
}else{//L80388520
if(local->unkC == 1){
this->unk28 = 3.0f;
if(mapSpecificFlags_get(0xC) || func_803203FC(0xC1)){//L80388554
if(mapSpecificFlags_get(0xC) || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){//L80388554
if(!func_80329030(this, 0) && func_80329480(this)){
func_80328CEC(this, (s32)this->yaw, 0x78, 0xb4);
this->unk38_0 = 1;
@@ -396,7 +396,7 @@ void func_80388080(Actor *this){
func_80328CEC(this, (s32)this->yaw, 0x78, 0xB4);
this->unk38_0 = 1;
}//L80388698
if(mapSpecificFlags_get(0xC) || (func_803203FC(0xC1) && func_803292E0(this))){
if(mapSpecificFlags_get(0xC) || (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && func_803292E0(this))){
this->yaw_moving = func_80329784(this);
}else{//L803886E4
if(randf() < 0.02){//D_8038B1D0){
@@ -427,7 +427,7 @@ void func_80388080(Actor *this){
func_80387E64(this);
}
this->unk28 = 5.0f;
if(mapSpecificFlags_get(0xC) || (func_803203FC(0xc1))){ //L8038892C
if(mapSpecificFlags_get(0xC) || (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE))){ //L8038892C
if(!func_80387FA8(this, local, (s32)this->yaw, (s32)this->unk28)){
if(func_80329480(this)){
func_80328CEC(this, (s32)this->yaw, 0x78, 0xb4);