diff --git a/src/MapName.cpp b/src/MapName.cpp
index 0a40ab79..ea257a4e 100644
--- a/src/MapName.cpp
+++ b/src/MapName.cpp
@@ -16,12 +16,12 @@ void ReadyMapName(const char *str)
 	// Handle "Studio Pixel presents" text in the intro, using an obfuscated string
 	unsigned char presentText[24] = {
 #ifdef JAPANESE
-		// "ŠJ”­ŽºPixel presents"
-		0x8A - 1,	// ŠJ
+		// "開発室Pixel presents"
+		0x8A - 1,	// é–‹
 		0x4A - 1,
-		0x94 - 1,	// ”­
+		0x94 - 1,	// 発
 		0xAD - 1,
-		0x8E - 1,	// Žº
+		0x8E - 1,	// 室
 		0xBA - 1,
 		'P' - 1,
 		'i' - 1,
diff --git a/src/NpChar.cpp b/src/NpChar.cpp
index ba3d9fd0..d2e2e02d 100644
--- a/src/NpChar.cpp
+++ b/src/NpChar.cpp
@@ -142,7 +142,7 @@ void SetNpChar(int code_char, int x, int y, int xm, int ym, int dir, NPCHAR *npc
 
 	// Set NPC parameters
 	memset(&gNPC[n], 0, sizeof(NPCHAR));
-	gNPC[n].cond |= 0x80u;
+	gNPC[n].cond |= 0x80;
 	gNPC[n].direct = dir;
 	gNPC[n].code_char = code_char;
 	gNPC[n].x = x;
diff --git a/src/NpcAct140.cpp b/src/NpcAct140.cpp
index 032a4c35..e9a8575c 100644
--- a/src/NpcAct140.cpp
+++ b/src/NpcAct140.cpp
@@ -1949,6 +1949,8 @@ void ActNpc158(NPCHAR *npc)
 // Monster X (defeated)
 void ActNpc159(NPCHAR *npc)
 {
+	int i;
+
 	RECT rect = {144, 128, 192, 200};
 
 	switch (npc->act_no)
@@ -1956,7 +1958,7 @@ void ActNpc159(NPCHAR *npc)
 		case 0:
 			npc->act_no = 1;
 
-			for (int i = 0; i < 8; ++i)
+			for (i = 0; i < 8; ++i)
 				SetNpChar(4, npc->x + (Random(-16, 16) * 0x200), npc->y + (Random(-16, 16) * 0x200), Random(-341, 341), Random(-341, 341), 0, 0, 0x100);
 			// Fallthrough
 		case 1:
diff --git a/src/NpcAct180.cpp b/src/NpcAct180.cpp
index ba41f9a2..7d781346 100644
--- a/src/NpcAct180.cpp
+++ b/src/NpcAct180.cpp
@@ -970,6 +970,8 @@ void ActNpc189(NPCHAR *npc)
 // Broken robot
 void ActNpc190(NPCHAR *npc)
 {
+	int i;
+
 	RECT rect[2] = {
 		{192, 32, 208, 48},
 		{208, 32, 224, 48},
@@ -983,7 +985,7 @@ void ActNpc190(NPCHAR *npc)
 
 		case 10:
 			PlaySoundObject(72, 1);
-			for (int i = 0; i < 8; i++)
+			for (i = 0; i < 8; i++)
 				SetNpChar(4, npc->x, npc->y + (Random(-8, 8) << 9), Random(-8, -2) << 9, Random(-3, 3) << 9, 0, 0, 0x100);
 			npc->cond = 0;
 			break;