From b8f2dabe0a6b36a1d03e39d6d08218fd54732f61 Mon Sep 17 00:00:00 2001 From: Orstedra Date: Sun, 25 May 2025 19:09:05 +0200 Subject: [PATCH] 100% --- include/d/d_camera.h | 2 +- include/d/t/d_t_gate_to_ground.h | 13 ++++++------- src/REL/d/t/d_t_gate_to_ground.cpp | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 7464f339..d641e098 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -6,7 +6,7 @@ extern "C" bool fn_80081FE0(void *, const char *); extern "C" bool fn_800918E0(void *, s32, s16); -extern "C" void fn_80080960(void *, int, int, int, int); +extern "C" void fn_80080960(void *, s32, s32, s8, s32); class dCamera_c : public dBase_c { public: diff --git a/include/d/t/d_t_gate_to_ground.h b/include/d/t/d_t_gate_to_ground.h index e0fa770c..05b95140 100644 --- a/include/d/t/d_t_gate_to_ground.h +++ b/include/d/t/d_t_gate_to_ground.h @@ -2,12 +2,11 @@ #define D_T_GATE_TO_GROUND_H #include "common.h" -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "m/m_mtx.h" #include "toBeSorted/actor_event.h" -#include "toBeSorted/event.h" -class dTgGateToGround_c : public dAcBase_c { +class dTgGateToGround_c : public dTg_c { public: dTgGateToGround_c() : mEventRelated(*this, nullptr) {} virtual ~dTgGateToGround_c() {} @@ -19,12 +18,12 @@ public: virtual int draw() override; // fn_205_2F0 private: - ActorEventRelated mEventRelated; + /* 0xfc */ ActorEventRelated mEventRelated; /* 0x14c */ mMtx_c matrix; - int delayFrames; + /* 0x17c */ int delayFrames; /* 0x180 */ s16 params_FF_FF_00_00; - /* 0x182 */ u8 params_00_00_FF_00; - /* 0x183 */ u8 params_00_00_00_FF; + /* 0x182 */ s8 params_00_00_FF_00; + /* 0x183 */ s8 params_00_00_00_FF; }; #endif diff --git a/src/REL/d/t/d_t_gate_to_ground.cpp b/src/REL/d/t/d_t_gate_to_ground.cpp index 01f816d7..fb2dfa6a 100644 --- a/src/REL/d/t/d_t_gate_to_ground.cpp +++ b/src/REL/d/t/d_t_gate_to_ground.cpp @@ -56,9 +56,9 @@ int dTgGateToGround_c::actorExecute() { delayFrames++; } } else { - if ((s8)params_00_00_00_FF != -1) { + if (params_00_00_00_FF != -1) { cam = dScGame_c::getCamera(0); - fn_80080960(cam->getField_0xD98(), (s8)params_00_00_00_FF, 0, (s8)roomid, 0); + fn_80080960(cam->getField_0xD98(), params_00_00_00_FF, 0, roomid, 0); } delayFrames = 0; }