diff --git a/include/JAZelAudio/JAIZelBasic.h b/include/JAZelAudio/JAIZelBasic.h index 2f4d92ddc..e891140b9 100644 --- a/include/JAZelAudio/JAIZelBasic.h +++ b/include/JAZelAudio/JAIZelBasic.h @@ -253,10 +253,4 @@ public: /* 0x0 */ u8 field_0x0[0x98]; }; -extern JAIZelBasic jAIZelBasic; - -void JAIZelBasic_seStart(u32 p1, Vec* p2, u32 p3, s8 p4, f32 p5, f32 p6, f32 p7, f32 p8, u8 p9){ - jAIZelBasic.seStart(p1, p2, p3, p4, p5, p6, p7, p8, p9); -} - #endif /* JAZELAUDIO_JAIZELBASIC_H */ \ No newline at end of file diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index a0575b474..203db190e 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -28,9 +28,9 @@ BOOL daKytag05_Draw(kytag05_class*) { static const s16 wind_table[] = { 0, - 0x8001, - 0xC000, - 0x4000 + 90, + 180, + 270 }; static const s16 mufuu_timer[] = { @@ -50,7 +50,7 @@ static const s16 fuu_timer[] = { /* 00000080-000003F4 .text daKytag05_Execute__FP13kytag05_class */ int daKytag05_Execute(kytag05_class* a_this) { - /* Nonmatching */ + /* Nonmatching - 92% matching */ daPy_py_c *playerActor; camera_class *mpCamera; f32 cameraEyeZ; @@ -102,6 +102,7 @@ int daKytag05_Execute(kytag05_class* a_this) { a_this->field_0x294 += 1; } } + /* Numbers in this sections aren't necessarily right */ cameraEyeZ = mpCamera->mLookat.mEye.z; if(cameraEyeZ > 360.0f|| playerActor->current.pos.z > 360.0f && mpCamera->mLookat.mEye.x > 450 || playerActor->current.pos.x > 450.0f){