diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2023-05-28 10:21:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-28 00:21:28 -0700 |
| commit | fcb6ae541fa4773b2db436e85daa9cdbb9ae45a5 (patch) | |
| tree | d5a67cd217fa0d593f714d766c3b9dee8ca754c2 /src/d/s/d_s_name.cpp | |
| parent | 2baa07dbf6452e8dc5d241c6d5982be1df354e61 (diff) | |
setFadeColor fix, some d_msg_flow functions (#339)
Diffstat (limited to 'src/d/s/d_s_name.cpp')
| -rw-r--r-- | src/d/s/d_s_name.cpp | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp index 77bc75d70d..87cadcd654 100644 --- a/src/d/s/d_s_name.cpp +++ b/src/d/s/d_s_name.cpp @@ -474,29 +474,19 @@ void dScnName_c::FileSelectMain() { } /* 80258E78-80258F20 2537B8 00A8+00 1/1 0/0 0/0 .text FileSelectMainNormal__10dScnName_cFv */ -#ifdef NONMATCHING void dScnName_c::FileSelectMainNormal() { - if (dFs_c->isSelectEnd() == true) { + switch(dFs_c->isSelectEnd()) { + case 1: field_0x41e = 15; mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); mDoGph_gInf_c::startFadeOut(15); field_0x41d = 2; field_0x420 = 1; + break; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::FileSelectMainNormal() { - nofralloc -#include "asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s" -} -#pragma pop -#endif /* 80258F20-80258FD4 253860 00B4+00 1/0 0/0 0/0 .text FileSelectClose__10dScnName_cFv */ -#ifdef NONMATCHING void dScnName_c::FileSelectClose() { field_0x41e--; @@ -509,16 +499,6 @@ void dScnName_c::FileSelectClose() { field_0x420 = 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::FileSelectClose() { - nofralloc -#include "asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s" -} -#pragma pop -#endif /* 80258FD4-80259008 253914 0034+00 1/0 0/0 0/0 .text brightCheckOpen__10dScnName_cFv */ void dScnName_c::brightCheckOpen() { |