From db39a0968dc6f496e75c59cb1d7795028d679b38 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 1 Jul 2024 23:45:16 -0700 Subject: [PATCH] fix build --- include/d/d_s_open.h | 2 +- src/d/d_s_open.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d/d_s_open.h b/include/d/d_s_open.h index 7fd3f0f6b..da1ce372b 100644 --- a/include/d/d_s_open.h +++ b/include/d/d_s_open.h @@ -62,7 +62,7 @@ public: /* 0x2AC */ s32 mTimer; /* 0x2B0 */ s32 mState; /* 0x2B4 */ f32 mScale; - /* 0x010 */ u8 pad2[0x014]; + /* 0x2B8 */ u8 pad2[0x010]; }; class dScnOpen_c : public scene_class { diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp index 6f6b70c72..c561a07d6 100644 --- a/src/d/d_s_open.cpp +++ b/src/d/d_s_open.cpp @@ -41,7 +41,7 @@ s32 dScnOpen_c::create() { /* 80232BC4-80232CAC .text execute__10dScnOpen_cFv */ BOOL dScnOpen_c::execute() { #if VERSION != VERSION_JPN - if (mpProc->field_0x2b0 >= 5 && !fopOvlpM_IsPeek() && !dComIfG_resetToOpening(this)) { + if (mpProc->mState >= 5 && !fopOvlpM_IsPeek() && !dComIfG_resetToOpening(this)) { #else if (!fopOvlpM_IsPeek() && !dComIfG_resetToOpening(this)) { #endif @@ -55,7 +55,7 @@ BOOL dScnOpen_c::execute() { } mpProc->proc_execute(); - if (mpProc->field_0x2b0 == 44) + if (mpProc->mState == 44) changeGameScene(); return TRUE;