summaryrefslogtreecommitdiff
path: root/src/d/d_s_open.cpp
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2023-10-13 19:40:46 -0700
committerJasper St. Pierre <jstpierre@mecheye.net>2023-10-13 19:40:46 -0700
commitfca11f6233672010ee6e5f617c34aa1ca62631f2 (patch)
treeda017f62396fcf99109960f9c1396da2d5e504a5 /src/d/d_s_open.cpp
parenta5641b0ba9e6222749fbc78307943b83db618c93 (diff)
jpn/pal fix
Diffstat (limited to 'src/d/d_s_open.cpp')
-rw-r--r--src/d/d_s_open.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp
index 9d2d46a2..394bdab2 100644
--- a/src/d/d_s_open.cpp
+++ b/src/d/d_s_open.cpp
@@ -64,11 +64,17 @@ s32 dScnOpen_c::create() {
JUT_ASSERT(0x48, rt == cPhs_COMPLEATE_e);
return rt;
}
+
+ return rt;
}
/* 80232BC4-80232CAC .text execute__10dScnOpen_cFv */
BOOL dScnOpen_c::execute() {
+#if VERSION != VERSION_JPN
if (mpProc->field_0x2b0 >= 5 && !fopOvlpM_IsPeek() && !dComIfG_resetToOpening(this)) {
+#else
+ if (!fopOvlpM_IsPeek() && !dComIfG_resetToOpening(this)) {
+#endif
if (fpcM_GetName(this) == PROC_OPEN2_SCENE && (CPad_CHECK_TRIG_A(0) || CPad_CHECK_TRIG_B(0) || CPad_CHECK_TRIG_START(0))) {
field_0x1d4 = 1;
mDoAud_bgmStop(20);