ref: 0730bb74eff37e5cd2640eded4a11dd2f0a70003
parent: 97a042dcc00821c17852fe728588d04edb91a242
author: Clownacy <Clownacy@users.noreply.github.com>
date: Sun Sep 27 18:02:45 EDT 2020
More cleanup
--- a/src/MiniMap.cpp
+++ b/src/MiniMap.cpp
@@ -34,39 +34,39 @@
// No switch here.
if (a == 0)
Surface2Surface(x, line, &rcLevel[0], SURFACE_ID_MAP, SURFACE_ID_TEXT_BOX);
- else if (a == 68 ||
- a == 1 ||
- a == 64 ||
- a == 128 ||
- a == 129 ||
- a == 130 ||
- a == 131 ||
- a == 81 ||
- a == 82 ||
- a == 85 ||
- a == 86 ||
- a == 2 ||
- a == 96 ||
- a == 113 ||
- a == 114 ||
- a == 117 ||
- a == 118 ||
- a == 160 ||
- a == 161 ||
- a == 162 ||
- a == 163)
+ else if (a == 68 ||
+ a == 1 ||
+ a == 64 ||
+ a == 128 ||
+ a == 129 ||
+ a == 130 ||
+ a == 131 ||
+ a == 81 ||
+ a == 82 ||
+ a == 85 ||
+ a == 86 ||
+ a == 2 ||
+ a == 96 ||
+ a == 113 ||
+ a == 114 ||
+ a == 117 ||
+ a == 118 ||
+ a == 160 ||
+ a == 161 ||
+ a == 162 ||
+ a == 163)
Surface2Surface(x, line, &rcLevel[1], SURFACE_ID_MAP, SURFACE_ID_TEXT_BOX);
- else if (a == 67 ||
- a == 99 ||
- a == 80 ||
- a == 83 ||
- a == 84 ||
- a == 87 ||
- a == 96 || // This is already listed above, so that part of the expression is always false
- a == 112 ||
- a == 115 ||
- a == 116 ||
- a == 119)
+ else if (a == 67 ||
+ a == 99 ||
+ a == 80 ||
+ a == 83 ||
+ a == 84 ||
+ a == 87 ||
+ a == 96 || // This is already listed above, so this part of the expression is always false
+ a == 112 ||
+ a == 115 ||
+ a == 116 ||
+ a == 119)
Surface2Surface(x, line, &rcLevel[2], SURFACE_ID_MAP, SURFACE_ID_TEXT_BOX);
else
Surface2Surface(x, line, &rcLevel[3], SURFACE_ID_MAP, SURFACE_ID_TEXT_BOX);
@@ -123,8 +123,10 @@
rcMiniMap.top = 0;
rcMiniMap.bottom = gMap.length;
- rcView.right = --rcView.left + gMap.width + 2;
- rcView.bottom = --rcView.top + gMap.length + 2;
+ rcView.left -= 1;
+ rcView.right = rcView.left + gMap.width + 2;
+ rcView.top -= 1;
+ rcView.bottom = rcView.top + gMap.length + 2;
CortBox2(&rcMiniMap, 0, SURFACE_ID_MAP);
line = 0;
--- a/src/MycParam.cpp
+++ b/src/MycParam.cpp
@@ -173,7 +173,7 @@
{PlaySoundObject(17, SOUND_MODE_PLAY);
gMC.cond = 0;
- SetDestroyNpChar(gMC.x, gMC.y, 0x1400, 0x40);
+ SetDestroyNpChar(gMC.x, gMC.y, 10 * 0x200, 0x40);
StartTextScript(40);
}
}
--- a/src/SelStage.cpp
+++ b/src/SelStage.cpp
@@ -211,7 +211,8 @@
StopTextScript();
break;
}
- else if (gKeyTrg & gKeyCancel)
+
+ if (gKeyTrg & gKeyCancel)
{StopTextScript();
LoadTextScript_Stage(old_script_path);