More cleanup

This commit is contained in:
Clownacy 2020-09-27 22:02:45 +01:00
parent 97a042dcc0
commit 0730bb74ef
3 changed files with 39 additions and 36 deletions

View file

@ -62,7 +62,7 @@ void WriteMiniMapLine(int line)
a == 83 || a == 83 ||
a == 84 || a == 84 ||
a == 87 || a == 87 ||
a == 96 || // This is already listed above, so that part of the expression is always false a == 96 || // This is already listed above, so this part of the expression is always false
a == 112 || a == 112 ||
a == 115 || a == 115 ||
a == 116 || a == 116 ||
@ -123,8 +123,10 @@ int MiniMapLoop(void)
rcMiniMap.top = 0; rcMiniMap.top = 0;
rcMiniMap.bottom = gMap.length; rcMiniMap.bottom = gMap.length;
rcView.right = --rcView.left + gMap.width + 2; rcView.left -= 1;
rcView.bottom = --rcView.top + gMap.length + 2; rcView.right = rcView.left + gMap.width + 2;
rcView.top -= 1;
rcView.bottom = rcView.top + gMap.length + 2;
CortBox2(&rcMiniMap, 0, SURFACE_ID_MAP); CortBox2(&rcMiniMap, 0, SURFACE_ID_MAP);
line = 0; line = 0;

View file

@ -173,7 +173,7 @@ void DamageMyChar(int damage)
{ {
PlaySoundObject(17, SOUND_MODE_PLAY); PlaySoundObject(17, SOUND_MODE_PLAY);
gMC.cond = 0; gMC.cond = 0;
SetDestroyNpChar(gMC.x, gMC.y, 0x1400, 0x40); SetDestroyNpChar(gMC.x, gMC.y, 10 * 0x200, 0x40);
StartTextScript(40); StartTextScript(40);
} }
} }

View file

@ -211,7 +211,8 @@ int StageSelectLoop(int *p_event)
StopTextScript(); StopTextScript();
break; break;
} }
else if (gKeyTrg & gKeyCancel)
if (gKeyTrg & gKeyCancel)
{ {
StopTextScript(); StopTextScript();
LoadTextScript_Stage(old_script_path); LoadTextScript_Stage(old_script_path);