Rearranged #includes

src/ArmsItem.cpp

@@ -1,15 +1,16 @@
+#include "ArmsItem.h"
+
 #include <string.h>
 
 #include "CommonDefines.h"
-#include "TextScr.h"
-#include "ArmsItem.h"
 #include "Draw.h"
-#include "KeyControl.h"
 #include "Escape.h"
-#include "Sound.h"
-#include "Main.h"
 #include "Game.h"
+#include "KeyControl.h"
+#include "Main.h"
 #include "Shoot.h"
+#include "Sound.h"
+#include "TextScr.h"
 
 int gArmsEnergyX = 16;
 
@@ -417,7 +418,7 @@ bool CheckItem(int a)
 
 bool CheckArms(int a)
 {
-  for (int i = 0; i < ARMS_MAX; i++)
+	for (int i = 0; i < ARMS_MAX; i++)
 	{
 		if (gArmsData[i].code == a)
 			return true;
@@ -458,7 +459,7 @@ void FullArmsEnergy()
 int RotationArms()
 {
 	int arms_num;
-	for ( arms_num = 0; gArmsData[arms_num].code != 0; arms_num++);
+	for (arms_num = 0; gArmsData[arms_num].code != 0; arms_num++);
 	if (!arms_num)
 		return 0;
 	

src/ArmsItem.h

@@ -1,4 +1,5 @@
 #pragma once
+
 struct ARMS
 {
 	int code;

src/Back.cpp

@@ -1,15 +1,16 @@
 #include "Back.h"
 
 #include <stdio.h>
+
 #include "WindowsWrapper.h"
 
-#include "Tags.h"
+#include "Draw.h"
+#include "File.h"
 #include "Frame.h"
 #include "Game.h"
-#include "Draw.h"
-#include "Stage.h"
 #include "Map.h"
-#include "File.h"
+#include "Stage.h"
+#include "Tags.h"
 
 BACK gBack;
 int gWaterY;

src/Boss.cpp

@@ -1,9 +1,10 @@
+#include "Boss.h"
+
 #include <stdint.h>
 #include <string.h>
 
 #include "WindowsWrapper.h"
 
-#include "Boss.h"
 #include "BossAlmo1.h"
 #include "BossAlmo2.h"
 #include "BossBallos.h"
@@ -13,16 +14,16 @@
 #include "BossPress.h"
 #include "BossTwinD.h"
 #include "BossX.h"
-#include "NpChar.h"
-#include "MyChar.h"
-#include "Sound.h"
-#include "NpcHit.h"
+#include "Bullet.h"
 #include "Caret.h"
-#include "TextScr.h"
-#include "ValueView.h"
 #include "Draw.h"
 #include "Map.h"
-#include "Bullet.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "NpcHit.h"
+#include "Sound.h"
+#include "TextScr.h"
+#include "ValueView.h"
 
 NPCHAR gBoss[BOSS_MAX];
 

src/Boss.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "NpChar.h"
 
 #define BOSS_MAX 20

src/BossAlmo1.cpp

@@ -1,5 +1,7 @@
 #include "BossAlmo1.h"
 
+#include "WindowsWrapper.h"
+
 #include "Boss.h"
 #include "Frame.h"
 #include "Game.h"

src/BossAlmo2.cpp

@@ -1,5 +1,7 @@
 #include "BossAlmo2.h"
 
+#include "WindowsWrapper.h"
+
 #include "Boss.h"
 #include "Flash.h"
 #include "Frame.h"
@@ -9,7 +11,6 @@
 #include "NpChar.h"
 #include "Sound.h"
 #include "Triangle.h"
-#include "WindowsWrapper.h"
 
 static void ActBossCharA_Head(NPCHAR *npc)
 {

src/BossBallos.cpp

@@ -1,5 +1,7 @@
 #include "BossBallos.h"
 
+#include "WindowsWrapper.h"
+
 #include "Boss.h"
 #include "Flash.h"
 #include "Frame.h"

src/BossFrog.cpp

@@ -1,5 +1,7 @@
 #include "BossFrog.h"
 
+#include "WindowsWrapper.h"
+
 #include "Boss.h"
 #include "Frame.h"
 #include "Game.h"
@@ -7,7 +9,6 @@
 #include "NpChar.h"
 #include "Sound.h"
 #include "Triangle.h"
-#include "WindowsWrapper.h"
 
 static void ActBossChar02_01(void)
 {

src/BossIronH.cpp

@@ -1,11 +1,12 @@
 #include "BossIronH.h"
 
+#include "WindowsWrapper.h"
+
 #include "Boss.h"
 #include "Frame.h"
 #include "Game.h"
 #include "MyChar.h"
 #include "Sound.h"
-#include "WindowsWrapper.h"
 
 void ActBossChar_Ironhead(void)
 {

src/BossLife.cpp

@@ -1,10 +1,11 @@
+#include "BossLife.h"
+
 #include "WindowsWrapper.h"
 
 #include "CommonDefines.h"
-#include "BossLife.h"
+#include "Boss.h"
 #include "Draw.h"
 #include "NpChar.h"
-#include "Boss.h"
 
 static struct
 {

src/BossOhm.cpp

@@ -1,15 +1,17 @@
+#include "BossOhm.h"
+
 #include <string.h>
 
 #include "WindowsWrapper.h"
 
 #include "Boss.h"
-#include "NpChar.h"
-#include "MyChar.h"
-#include "Sound.h"
-#include "Frame.h"
 #include "Bullet.h"
 #include "Flash.h"
+#include "Frame.h"
 #include "Game.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "Sound.h"
 
 void ActBoss01_12()
 {

src/BossOhm.h

@@ -1,2 +1,3 @@
 #pragma once
+
 void ActBossChar_Omega();

src/BossPress.cpp

@@ -1,10 +1,11 @@
 #include "BossPress.h"
 
+#include "WindowsWrapper.h"
+
 #include "Boss.h"
 #include "Game.h"
 #include "Map.h"
 #include "Sound.h"
-#include "WindowsWrapper.h"
 
 void ActBossChar_Press(void)
 {

src/BossTwinD.cpp

@@ -1,5 +1,7 @@
 #include "BossTwinD.h"
 
+#include "WindowsWrapper.h"
+
 #include "Boss.h"
 #include "Flash.h"
 #include "Game.h"
@@ -7,7 +9,6 @@
 #include "NpChar.h"
 #include "Sound.h"
 #include "Triangle.h"
-#include "WindowsWrapper.h"
 
 static void ActBossCharT_DragonBody(NPCHAR *npc)
 {

src/BossX.cpp

@@ -1,5 +1,7 @@
 #include "BossX.h"
 
+#include "WindowsWrapper.h"
+
 #include "Boss.h"
 #include "Flash.h"
 #include "Frame.h"
@@ -8,7 +10,6 @@
 #include "NpChar.h"
 #include "Sound.h"
 #include "Triangle.h"
-#include "WindowsWrapper.h"
 
 static void ActBossChar03_01(NPCHAR *npc)
 {

src/BulHit.cpp

@@ -1,13 +1,15 @@
+#include "BulHit.h"
+
 #include <stdio.h>
 #include <string.h>
 
 #include "Bullet.h"
-#include "NpChar.h"
 #include "Caret.h"
-#include "Sound.h"
-#include "MyChar.h"
 #include "Game.h"
 #include "Map.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "Sound.h"
 
 void Vanish(BULLET *bul)
 {

src/BulHit.h

@@ -1,2 +1,3 @@
 #pragma once
+
 void HitBulletMap();

src/Bullet.cpp

@@ -4,11 +4,11 @@
 
 #include "Draw.h"
 #include "Caret.h"
-#include "NpChar.h"
-#include "MyChar.h"
-#include "Sound.h"
 #include "Game.h"
 #include "KeyControl.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "Sound.h"
 
 BULLET_TABLE gBulTbl[46] =
 {

src/Bullet.h

@@ -1,5 +1,7 @@
 #pragma once
+
 #include <stdint.h>
+
 #include "WindowsWrapper.h"
 
 struct BULLET

src/Caret.cpp

@@ -5,8 +5,8 @@
 #include "WindowsWrapper.h"
 
 #include "Draw.h"
-#include "Triangle.h"
 #include "Game.h"
+#include "Triangle.h"
 
 #define CARET_MAX 0x40
 CARET gCrt[CARET_MAX];

src/Caret.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "WindowsWrapper.h"
 
 struct CARET_TABLE

src/CommonDefines.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #define PATH_LENGTH 260 //Pixel had the path size locked to 260 (dangerously low), if you tried to open the executable in a path with more than around 220 characters, it'd crash.
 
 #define WINDOW_WIDTH 320

src/Config.cpp

@@ -1,15 +1,15 @@
 #include <stddef.h>
-#include "Types.h"
-#include "CommonDefines.h"
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <string.h>
 
 #include "WindowsWrapper.h"
 
-#include "Tags.h"
+#include "CommonDefines.h"
 #include "Config.h"
 #include "File.h"
+#include "Tags.h"
+#include "Types.h"
 
 bool LoadConfigData(CONFIG *conf)
 {

src/Config.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <stdint.h>
 
 struct CONFIG

src/Draw.cpp

@@ -1,8 +1,6 @@
 #include <stddef.h>
-#include "Types.h"
-#include "CommonDefines.h"
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 
 #ifdef WINDOWS
 #define RECT WINRECT
@@ -22,10 +20,12 @@
 
 #include "WindowsWrapper.h"
 
+#include "CommonDefines.h"
 #include "Draw.h"
 #include "Font.h"
-#include "Tags.h"
 #include "Resource.h"
+#include "Tags.h"
+#include "Types.h"
 
 struct SURFACE
 {

src/Draw.h

@@ -1,5 +1,7 @@
 #pragma once
+
 #include <stdint.h>
+
 #include "WindowsWrapper.h"
 
 extern RECT grcGame;

src/Ending.cpp

@@ -7,17 +7,17 @@
 
 #include "WindowsWrapper.h"
 
-#include "Tags.h"
-#include "Generic.h"
-#include "Flags.h"
-#include "KeyControl.h"
-#include "Escape.h"
-#include "Organya.h"
-#include "MycParam.h"
-#include "Main.h"
-#include "Stage.h"
 #include "Draw.h"
+#include "Escape.h"
+#include "Flags.h"
+#include "Generic.h"
+#include "KeyControl.h"
+#include "Main.h"
+#include "MycParam.h"
+#include "Organya.h"
+#include "Stage.h"
 #include "TextScr.h"
+#include "Tags.h"
 
 CREDIT Credit;
 STRIP Strip[MAX_STRIP];

src/Ending.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <stdint.h>
 
 struct CREDIT

src/Escape.cpp

@@ -1,7 +1,8 @@
+#include "Escape.h"
+
 #include "WindowsWrapper.h"
 
 #include "CommonDefines.h"
-#include "Escape.h"
 #include "Draw.h"
 #include "KeyControl.h"
 #include "Main.h"

src/Escape.h

@@ -1,2 +1,3 @@
 #pragma once
+
 int Call_Escape();

src/Fade.cpp

@@ -1,10 +1,11 @@
+#include "Fade.h"
+
 #include <string.h>
 
 #include "WindowsWrapper.h"
 
-#include "Fade.h"
-#include "Game.h"
 #include "Draw.h"
+#include "Game.h"
 
 FADE gFade;
 

src/Fade.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "CommonDefines.h"
 
 #define FADE_WIDTH	(((WINDOW_WIDTH - 1) >> 4) + 1)

src/Flags.cpp

@@ -1,7 +1,7 @@
 #include "Flags.h"
 
-#include <cstring>
 #include <stdint.h>
+#include <string.h>
 
 uint8_t gFlagNPC[1000];
 uint8_t gSkipFlag[0x40];

src/Flags.h

@@ -1,5 +1,7 @@
 #pragma once
+
 #include <stdint.h>
+
 extern uint8_t gFlagNPC[1000];
 extern uint8_t gSkipFlag[0x40];
 

src/Frame.cpp

@@ -1,12 +1,13 @@
+#include "Frame.h"
+
 #include <string.h>
 
-#include "Frame.h"
+#include "Boss.h"
+#include "CommonDefines.h"
+#include "Game.h"
 #include "Map.h"
 #include "MyChar.h"
 #include "NpChar.h"
-#include "Game.h"
-#include "CommonDefines.h"
-#include "Boss.h"
 
 FRAME gFrame;
 

src/Frame.h

@@ -1,4 +1,5 @@
 #pragma once
+
 struct FRAME
 {
 	int x;

src/Game.cpp

@@ -1,47 +1,49 @@
-#include <string>
+#include "Game.h"
+
 #include <stdlib.h>
+#include <string.h>
 
 #include <SDL_timer.h>
+
 #include "WindowsWrapper.h"
 
-#include "Tags.h"
-#include "NpcTbl.h"
-#include "NpChar.h"
-#include "NpcHit.h"
-#include "MiniMap.h"
-#include "Generic.h"
-#include "Boss.h"
-#include "GenericLoad.h"
 #include "ArmsItem.h"
-#include "TextScr.h"
-#include "Bullet.h"
-#include "BulHit.h"
-#include "Shoot.h"
-#include "Star.h"
-#include "Fade.h"
-#include "Frame.h"
-#include "Flags.h"
-#include "Escape.h"
-#include "Stage.h"
-#include "MyChar.h"
-#include "MycHit.h"
-#include "Caret.h"
-#include "Map.h"
-#include "Main.h"
-#include "MycParam.h"
-#include "MapName.h"
-#include "Sound.h"
-#include "Organya.h"
-#include "Profile.h"
-#include "MycParam.h"
 #include "Back.h"
-#include "KeyControl.h"
-#include "ValueView.h"
+#include "Boss.h"
+#include "BossLife.h"
+#include "BulHit.h"
+#include "Bullet.h"
+#include "Caret.h"
 #include "Draw.h"
 #include "Ending.h"
+#include "Escape.h"
+#include "Fade.h"
+#include "Flags.h"
 #include "Flash.h"
-#include "BossLife.h"
+#include "Frame.h"
+#include "Generic.h"
+#include "GenericLoad.h"
+#include "KeyControl.h"
+#include "Main.h"
+#include "Map.h"
+#include "MapName.h"
+#include "MiniMap.h"
+#include "MyChar.h"
+#include "MycHit.h"
+#include "MycParam.h"
+#include "NpChar.h"
+#include "NpcHit.h"
+#include "NpcTbl.h"
+#include "Organya.h"
+#include "Profile.h"
 #include "SelStage.h"
+#include "Shoot.h"
+#include "Sound.h"
+#include "Stage.h"
+#include "Star.h"
+#include "Tags.h"
+#include "TextScr.h"
+#include "ValueView.h"
 
 int g_GameFlags;
 int gCounter;

src/Game.h

@@ -1,4 +1,5 @@
 #pragma once
+
 extern int g_GameFlags;
 extern int gCounter;
 

src/Generic.cpp

@@ -1,3 +1,5 @@
+#include "Generic.h"
+
 #include <stdint.h>
 #include <stdio.h>
 

src/Generic.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <stdint.h>
 
 bool GetCompileVersion(int *v1, int *v2, int *v3, int *v4);

src/GenericLoad.cpp

@@ -1,8 +1,10 @@
+#include "GenericLoad.h"
+
 #include "CommonDefines.h"
 #include "Draw.h"
-#include "Sound.h"
-#include "PixTone.h"
 #include "Ending.h"
+#include "PixTone.h"
+#include "Sound.h"
 
 static const PIXTONEPARAMETER gPtpTable[139] =
 {

src/GenericLoad.h

@@ -1,2 +1,3 @@
 #pragma once
+
 bool LoadGenericData();

src/Input.cpp

@@ -1,12 +1,14 @@
-#include "Types.h"
-#include "CommonDefines.h"
+#include "Input.h"
+
 #include <stdint.h>
 
 #include <SDL.h>
+
 #include "WindowsWrapper.h"
 
-#include "Input.h"
+#include "CommonDefines.h"
 #include "Tags.h"
+#include "Types.h"
 
 #define JOYSTICK_DEADZONE 10000
 

src/Input.h

@@ -1,4 +1,5 @@
 #pragma once
+
 extern bool gbUseJoystick;
 extern int gJoystickButtonTable[8];
 

src/KeyControl.cpp

@@ -1,4 +1,5 @@
 #include "KeyControl.h"
+
 int gKey;
 int gKeyTrg;
 

src/KeyControl.h

@@ -1,4 +1,5 @@
 #pragma once
+
 enum KEYBIND
 {
 	//The movement keys go in the order of left, right, up and down

src/Main.cpp

@@ -1,25 +1,27 @@
+#include "Main.h"
+
 #include <stddef.h>
-#include "Types.h"
-#include "CommonDefines.h"
 #include <stdint.h>
-#include <string>
+#include <string.h>
 
 #include <SDL.h>
+
 #include "WindowsWrapper.h"
 
+#include "CommonDefines.h"
+#include "Config.h"
 #include "Draw.h"
-#include "Input.h"
-#include "Profile.h"
-#include "Organya.h"
-#include "Sound.h"
 #include "Game.h"
 #include "Generic.h"
-#include "MyChar.h"
-#include "Main.h"
-#include "Config.h"
+#include "Input.h"
 #include "KeyControl.h"
-#include "Triangle.h"
+#include "MyChar.h"
+#include "Organya.h"
+#include "Profile.h"
 #include "Resource.h"
+#include "Sound.h"
+#include "Triangle.h"
+#include "Types.h"
 
 // These two are defined in Draw.cpp. This is a bit of a hack.
 extern SDL_Window *gWindow;

src/Main.h

@@ -1,3 +1,4 @@
 #pragma once
+
 void PutFramePerSecound();
 int GetFramePerSecound();

src/Map.cpp

@@ -1,3 +1,5 @@
+#include "Map.h"
+
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -6,11 +8,10 @@
 #include "WindowsWrapper.h"
 
 #include "CommonDefines.h"
-#include "Map.h"
-#include "Tags.h"
 #include "Draw.h"
-#include "NpChar.h"
 #include "File.h"
+#include "NpChar.h"
+#include "Tags.h"
 
 #define PXM_BUFFER_SIZE 0x4B000
 

src/Map.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <stdint.h>
 
 struct MAP_DATA

src/MapName.cpp

@@ -1,8 +1,9 @@
+#include "MapName.h"
+
 #include <stdint.h>
 #include <string.h>
 
 #include "CommonDefines.h"
-#include "MapName.h"
 #include "Draw.h"
 
 MAP_NAME gMapName;

src/MapName.h

@@ -1,4 +1,5 @@
 #pragma once
+
 struct MAP_NAME
 {
 	int flag;

src/MiniMap.cpp

@@ -1,18 +1,20 @@
+#include "MiniMap.h"
+
 #include <stdint.h>
 #include <string.h>
 
 #include "WindowsWrapper.h"
 
 #include "CommonDefines.h"
-#include "MapName.h"
 #include "Draw.h"
 #include "Escape.h"
 #include "Game.h"
 #include "KeyControl.h"
-#include "Map.h"
-#include "Stage.h"
-#include "MyChar.h"
 #include "Main.h"
+#include "Map.h"
+#include "MapName.h"
+#include "MyChar.h"
+#include "Stage.h"
 
 int8_t gMapping[0x80];
 

src/MiniMap.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <stdint.h>
 
 extern int8_t gMapping[0x80];

src/MyChar.cpp

@@ -1,21 +1,22 @@
+#include "MyChar.h"
+
 #include <stdint.h>
 #include <string.h>
 
 #include "WindowsWrapper.h"
 
-#include "MyChar.h"
-#include "MycParam.h"
 #include "ArmsItem.h"
-#include "NpChar.h"
+#include "Caret.h"
 #include "Draw.h"
-#include "Sound.h"
-#include "ValueView.h"
-#include "KeyControl.h"
-#include "TextScr.h"
 #include "Flags.h"
 #include "Game.h"
+#include "KeyControl.h"
+#include "MycParam.h"
+#include "NpChar.h"
+#include "Sound.h"
 #include "Star.h"
-#include "Caret.h"
+#include "TextScr.h"
+#include "ValueView.h"
 
 MYCHAR gMC;
 

src/MyChar.h

@@ -1,5 +1,7 @@
 #pragma once
+
 #include <stdint.h>
+
 #include "WindowsWrapper.h"
 
 struct MYCHAR

src/MycHit.cpp

@@ -1,18 +1,20 @@
+#include "MycHit.h"
+
 #include <stdint.h>
 
 #include "WindowsWrapper.h"
 
-#include "MyChar.h"
-#include "NpChar.h"
-#include "Map.h"
-#include "Sound.h"
-#include "Caret.h"
-#include "Boss.h"
 #include "Back.h"
+#include "Boss.h"
+#include "Caret.h"
 #include "Game.h"
-#include "TextScr.h"
-#include "MycParam.h"
 #include "KeyControl.h"
+#include "Map.h"
+#include "MyChar.h"
+#include "MycParam.h"
+#include "NpChar.h"
+#include "Sound.h"
+#include "TextScr.h"
 
 void ResetMyCharFlag()
 {

src/MycHit.h

@@ -1,4 +1,5 @@
 #pragma once
+
 void ResetMyCharFlag();
 void HitMyCharMap();
 void HitMyCharNpChar();

src/MycParam.cpp

@@ -1,18 +1,19 @@
+#include "MycParam.h"
+
 #include "SDL.h"
 
-#include "Sound.h"
-#include "MyChar.h"
-#include "MycParam.h"
-#include "NpChar.h"
-#include "CommonDefines.h"
-#include "Tags.h"
 #include "ArmsItem.h"
-#include "ValueView.h"
-#include "TextScr.h"
-#include "Game.h"
-#include "Draw.h"
+#include "CommonDefines.h"
 #include "Caret.h"
+#include "Draw.h"
+#include "Game.h"
 #include "File.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "Sound.h"
+#include "Tags.h"
+#include "TextScr.h"
+#include "ValueView.h"
 
 ARMS_LEVEL gArmsLevelTable[14] =
 {

src/MycParam.h

@@ -1,5 +1,7 @@
 #pragma once
+
 #include <stdint.h>
+
 struct ARMS_LEVEL
 {
 	int exp[3];

src/NpChar.cpp

@@ -1,3 +1,5 @@
+#include "NpChar.h"
+
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -5,19 +7,18 @@
 
 #include "WindowsWrapper.h"
 
-#include "CommonDefines.h"
-#include "Tags.h"
-#include "NpChar.h"
-#include "Caret.h"
-#include "MyChar.h"
-#include "Game.h"
 #include "ArmsItem.h"
-#include "Flags.h"
-#include "Sound.h"
-#include "ValueView.h"
-#include "NpcTbl.h"
+#include "CommonDefines.h"
+#include "Caret.h"
 #include "Draw.h"
 #include "File.h"
+#include "Flags.h"
+#include "Game.h"
+#include "MyChar.h"
+#include "NpcTbl.h"
+#include "Sound.h"
+#include "Tags.h"
+#include "ValueView.h"
 
 NPCHAR gNPC[NPC_MAX];
 int gCurlyShoot_wait;

src/NpChar.h

@@ -1,5 +1,7 @@
 #pragma once
+
 #include <stdint.h>
+
 #include "WindowsWrapper.h"
 
 #include "Draw.h"

src/NpcAct.h

@@ -362,4 +362,4 @@ void ActNpc356(NPCHAR *npc);
 void ActNpc357(NPCHAR *npc);
 void ActNpc358(NPCHAR *npc);
 void ActNpc359(NPCHAR *npc);
-void ActNpc360(NPCHAR *npc);
+void ActNpc360(NPCHAR *npc);

src/NpcAct000.cpp

@@ -1,18 +1,16 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
-#include "MyChar.h"
-#include "NpChar.h"
+#include "WindowsWrapper.h"
+
+#include "Back.h"
+#include "Caret.h"
+#include "Frame.h"
 #include "Game.h"
 #include "Map.h"
+#include "MyChar.h"
+#include "NpChar.h"
 #include "Sound.h"
-#include "Frame.h"
-#include "Back.h"
 #include "Triangle.h"
-#include "Frame.h"
-#include "Map.h"
-#include "Caret.h"
 
 //Null
 void ActNpc000(NPCHAR *npc)

src/NpcAct020.cpp

@@ -1,15 +1,15 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
+#include "WindowsWrapper.h"
+
+#include "Back.h"
+#include "Caret.h"
+#include "Game.h"
+#include "Frame.h"
 #include "MyChar.h"
 #include "NpChar.h"
-#include "Game.h"
 #include "Sound.h"
-#include "Back.h"
 #include "Triangle.h"
-#include "Caret.h"
-#include "Frame.h"
 
 //Computer
 void ActNpc020(NPCHAR *npc)

src/NpcAct040.cpp

@@ -1,15 +1,15 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
+#include "WindowsWrapper.h"
+
+#include "Back.h"
+#include "Caret.h"
+#include "CommonDefines.h"
+#include "Game.h"
 #include "MyChar.h"
 #include "NpChar.h"
-#include "Game.h"
-#include "Caret.h"
 #include "Sound.h"
-#include "Back.h"
 #include "Triangle.h"
-#include "CommonDefines.h"
 
 //Santa
 void ActNpc040(NPCHAR *npc)

src/NpcAct060.cpp

@@ -1,18 +1,18 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
-#include "MyChar.h"
-#include "NpChar.h"
-#include "Game.h"
-#include "Sound.h"
+#include "WindowsWrapper.h"
+
 #include "Back.h"
-#include "Triangle.h"
-#include "Map.h"
 #include "CommonDefines.h"
-#include "Frame.h"
-#include "MycParam.h"
 #include "Flash.h"
+#include "Frame.h"
+#include "Game.h"
+#include "Map.h"
+#include "MyChar.h"
+#include "MycParam.h"
+#include "NpChar.h"
+#include "Sound.h"
+#include "Triangle.h"
 
 //Toroko
 void ActNpc060(NPCHAR *npc)

src/NpcAct080.cpp

@@ -1,17 +1,17 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
-#include "MyChar.h"
-#include "NpChar.h"
-#include "Game.h"
-#include "Sound.h"
+#include "WindowsWrapper.h"
+
 #include "Back.h"
-#include "Triangle.h"
 #include "Caret.h"
+#include "CommonDefines.h"
 #include "Flash.h"
 #include "Frame.h"
-#include "CommonDefines.h"
+#include "Game.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "Sound.h"
+#include "Triangle.h"
 
 //Gravekeeper
 void ActNpc080(NPCHAR *npc)

src/NpcAct100.cpp

@@ -1,16 +1,16 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
+#include "WindowsWrapper.h"
+
+#include "Back.h"
+#include "Bullet.h"
+#include "Caret.h"
+#include "Frame.h"
+#include "Game.h"
 #include "MyChar.h"
 #include "NpChar.h"
-#include "Game.h"
 #include "Sound.h"
-#include "Back.h"
 #include "Triangle.h"
-#include "Frame.h"
-#include "Caret.h"
-#include "Bullet.h"
 
 //Grate
 void ActNpc100(NPCHAR *npc)

src/NpcAct120.cpp

@@ -1,17 +1,17 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
+#include "WindowsWrapper.h"
+
+#include "Back.h"
+#include "Bullet.h"
+#include "Caret.h"
+#include "Frame.h"
+#include "Game.h"
+#include "KeyControl.h"
 #include "MyChar.h"
 #include "NpChar.h"
-#include "Game.h"
 #include "Sound.h"
-#include "Back.h"
 #include "Triangle.h"
-#include "Caret.h"
-#include "KeyControl.h"
-#include "Frame.h"
-#include "Bullet.h"
 
 //Colon (1)
 void ActNpc120(NPCHAR *npc)

src/NpcAct140.cpp

@@ -1,18 +1,18 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
-#include "MyChar.h"
-#include "NpChar.h"
-#include "Game.h"
-#include "Sound.h"
+#include "WindowsWrapper.h"
+
 #include "Back.h"
-#include "Triangle.h"
+#include "Bullet.h"
 #include "Caret.h"
+#include "CommonDefines.h"
 #include "Frame.h"
 #include "Flash.h"
-#include "Bullet.h"
-#include "CommonDefines.h"
+#include "Game.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "Sound.h"
+#include "Triangle.h"
 
 //Toroko (frenzied)
 void ActNpc140(NPCHAR *npc)

src/NpcAct160.cpp

@@ -1,18 +1,18 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
-#include "MyChar.h"
-#include "NpChar.h"
-#include "Game.h"
-#include "Sound.h"
+#include "WindowsWrapper.h"
+
 #include "Back.h"
-#include "Triangle.h"
-#include "Frame.h"
 #include "Caret.h"
-#include "MycParam.h"
 #include "CommonDefines.h"
+#include "Frame.h"
+#include "Game.h"
+#include "MyChar.h"
+#include "MycParam.h"
+#include "NpChar.h"
 #include "NpcHit.h"
+#include "Sound.h"
+#include "Triangle.h"
 
 //Puu Black
 void ActNpc160(NPCHAR *npc)

src/NpcAct180.cpp

@@ -1,18 +1,18 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
+#include "WindowsWrapper.h"
+
+#include "Back.h"
+#include "Bullet.h"
+#include "Caret.h"
+#include "Flags.h"
+#include "Frame.h"
+#include "Game.h"
 #include "MyChar.h"
 #include "NpChar.h"
-#include "Game.h"
-#include "Sound.h"
-#include "Back.h"
-#include "Triangle.h"
-#include "Caret.h"
-#include "Frame.h"
-#include "Bullet.h"
-#include "Flags.h"
 #include "NpcHit.h"
+#include "Sound.h"
+#include "Triangle.h"
 
 //Curly AI
 void ActNpc180(NPCHAR *npc)

src/NpcAct200.cpp

@@ -1,16 +1,16 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
-#include "MyChar.h"
-#include "NpChar.h"
-#include "Game.h"
-#include "Sound.h"
+#include "WindowsWrapper.h"
+
 #include "Back.h"
-#include "Triangle.h"
 #include "Bullet.h"
 #include "Caret.h"
 #include "Frame.h"
+#include "Game.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "Sound.h"
+#include "Triangle.h"
 
 //Dragon Zombie
 void ActNpc200(NPCHAR *npc)

src/NpcAct220.cpp

@@ -1,16 +1,16 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
-#include "MyChar.h"
-#include "NpChar.h"
-#include "Game.h"
-#include "Sound.h"
+#include "WindowsWrapper.h"
+
 #include "Back.h"
-#include "Triangle.h"
 #include "Bullet.h"
 #include "Caret.h"
 #include "Frame.h"
+#include "Game.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "Sound.h"
+#include "Triangle.h"
 
 //Shovel Brigade
 void ActNpc220(NPCHAR *npc)

src/NpcAct240.cpp

@@ -1,16 +1,16 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
-#include "MyChar.h"
-#include "NpChar.h"
-#include "Game.h"
-#include "Sound.h"
+#include "WindowsWrapper.h"
+
 #include "Back.h"
-#include "Triangle.h"
 #include "Caret.h"
 #include "Frame.h"
+#include "Game.h"
 #include "Map.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "Sound.h"
+#include "Triangle.h"
 
 //Mimiga (jailed)
 void ActNpc240(NPCHAR *npc)

src/NpcAct260.cpp

@@ -1,17 +1,17 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
-#include "MyChar.h"
-#include "NpChar.h"
-#include "Game.h"
-#include "Sound.h"
+#include "WindowsWrapper.h"
+
 #include "Back.h"
-#include "Triangle.h"
 #include "Caret.h"
-#include "Map.h"
 #include "Frame.h"
+#include "Game.h"
+#include "Map.h"
+#include "MyChar.h"
 #include "MycParam.h"
+#include "NpChar.h"
+#include "Sound.h"
+#include "Triangle.h"
 
 //Shovel Brigade (caged)
 void ActNpc260(NPCHAR *npc)

src/NpcAct280.cpp

@@ -1,16 +1,16 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
+#include "WindowsWrapper.h"
+
+#include "Back.h"
+#include "Boss.h"
+#include "Frame.h"
+#include "Game.h"
+#include "Map.h"
 #include "MyChar.h"
 #include "NpChar.h"
-#include "Game.h"
 #include "Sound.h"
-#include "Back.h"
 #include "Triangle.h"
-#include "Frame.h"
-#include "Map.h"
-#include "Boss.h"
 
 //Sue (being teleported by Misery)
 void ActNpc280(NPCHAR *npc)

src/NpcAct300.cpp

@@ -1,18 +1,18 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
+#include "WindowsWrapper.h"
+
+#include "Back.h"
+#include "Boss.h"
+#include "Bullet.h"
+#include "Caret.h"
+#include "Frame.h"
+#include "Game.h"
+#include "Map.h"
 #include "MyChar.h"
 #include "NpChar.h"
-#include "Game.h"
 #include "Sound.h"
-#include "Back.h"
 #include "Triangle.h"
-#include "Caret.h"
-#include "Boss.h"
-#include "Frame.h"
-#include "Map.h"
-#include "Bullet.h"
 
 //Demon crown (opening)
 void ActNpc300(NPCHAR *npc)

src/NpcAct320.cpp

@@ -1,18 +1,18 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
+#include "WindowsWrapper.h"
+
+#include "Back.h"
+#include "Bullet.h"
+#include "Caret.h"
+#include "Frame.h"
+#include "Game.h"
+#include "KeyControl.h"
+#include "Map.h"
 #include "MyChar.h"
 #include "NpChar.h"
-#include "Game.h"
 #include "Sound.h"
-#include "Back.h"
 #include "Triangle.h"
-#include "Frame.h"
-#include "Map.h"
-#include "Caret.h"
-#include "Bullet.h"
-#include "KeyControl.h"
 
 //Curly (carried, shooting)
 void ActNpc320(NPCHAR *npc)

src/NpcAct340.cpp

@@ -1,19 +1,19 @@
-#include "WindowsWrapper.h"
-
 #include "NpcAct.h"
 
+#include "WindowsWrapper.h"
+
+#include "Back.h"
+#include "Caret.h"
 #include "CommonDefines.h"
+#include "Flash.h"
+#include "Flags.h"
+#include "Frame.h"
+#include "Game.h"
+#include "Map.h"
 #include "MyChar.h"
 #include "NpChar.h"
-#include "Game.h"
 #include "Sound.h"
-#include "Back.h"
 #include "Triangle.h"
-#include "Flags.h"
-#include "Map.h"
-#include "Caret.h"
-#include "Frame.h"
-#include "Flash.h"
 
 //Ballos
 void ActNpc340(NPCHAR *npc)

src/NpcHit.cpp

@@ -1,14 +1,16 @@
-#include "NpChar.h"
-#include "ValueView.h"
-#include "Sound.h"
-#include "Flags.h"
-#include "Caret.h"
-#include "Game.h"
+#include "NpcHit.h"
+
 #include "Back.h"
 #include "Bullet.h"
-#include "MyChar.h"
-#include "TextScr.h"
+#include "Caret.h"
+#include "Flags.h"
+#include "Game.h"
 #include "Map.h"
+#include "MyChar.h"
+#include "NpChar.h"
+#include "Sound.h"
+#include "TextScr.h"
+#include "ValueView.h"
 
 void JadgeHitNpCharBlock(NPCHAR *npc, int x, int y)
 {

src/NpcHit.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "NpChar.h"
 
 void JadgeHitNpCharBlock(NPCHAR *npc, int x, int y);

src/NpcTbl.cpp

@@ -1,11 +1,12 @@
+#include "NpcTbl.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "NpcTbl.h"
-#include "NpcAct.h"
 #include "File.h"
 #include "Generic.h"
+#include "NpcAct.h"
 
 NPC_TABLE *gNpcTable;
 

src/NpcTbl.h

@@ -1,7 +1,9 @@
 #pragma once
+
 #include <stdint.h>
-#include "NpChar.h"
+
 #include "Draw.h"
+#include "NpChar.h"
 
 struct NPC_TBL_RECT
 {

src/Organya.cpp

@@ -1,16 +1,18 @@
+#include "Organya.h"
+
 #include <stdint.h>
 
 #include <SDL_rwops.h>
 #include <SDL_thread.h>
 #include <SDL_timer.h>
 #include <SDL_events.h>
+
 #include "WindowsWrapper.h"
 
 #include "CommonDefines.h"
-#include "Tags.h"
-#include "Organya.h"
 #include "Resource.h"
 #include "Sound.h"
+#include "Tags.h"
 
 #define PANDUMMY 0xFF
 #define VOLDUMMY 0xFF

src/Organya.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <stdint.h>
 
 //Below are Organya song data structures

src/Profile.cpp

@@ -1,3 +1,5 @@
+#include "Profile.h"
+
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -5,23 +7,22 @@
 
 #include "WindowsWrapper.h"
 
-#include "CommonDefines.h"
-#include "Tags.h"
-#include "Profile.h"
-#include "Fade.h"
 #include "ArmsItem.h"
+#include "BossLife.h"
+#include "CommonDefines.h"
+#include "Fade.h"
+#include "File.h"
 #include "Flags.h"
+#include "Frame.h"
+#include "Game.h"
 #include "MiniMap.h"
 #include "MyChar.h"
-#include "Star.h"
 #include "NpChar.h"
-#include "Frame.h"
 #include "SelStage.h"
-#include "ValueView.h"
 #include "Stage.h"
-#include "Game.h"
-#include "BossLife.h"
-#include "File.h"
+#include "Star.h"
+#include "Tags.h"
+#include "ValueView.h"
 
 const char *gDefaultName = "Profile.dat";
 const char *gProfileCode = "Do041220";

src/Profile.h

@@ -1,5 +1,7 @@
 #pragma once
+
 #include <stdint.h>
+
 #include "ArmsItem.h"
 #include "SelStage.h"
 

src/Resource.cpp

@@ -1,7 +1,10 @@
+#include "Resource.h"
+
 #include <stdint.h>
 #include <string>
 
 #include <SDL_rwops.h>
+
 #include "WindowsWrapper.h"
 
 #include "Resource/ORG/ACCESS.org.h"

src/Resource.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <SDL_rwops.h>
 
 SDL_RWops* FindResource(const char *name);

src/SelStage.cpp

@@ -2,13 +2,14 @@
 
 #include <string.h>
 
+#include "WindowsWrapper.h"
+
 #include "Draw.h"
 #include "Escape.h"
 #include "KeyControl.h"
 #include "Main.h"
-#include "TextScr.h"
 #include "Sound.h"
-#include "WindowsWrapper.h"
+#include "TextScr.h"
 
 PERMIT_STAGE gPermitStage[8];
 

src/SelStage.h

@@ -1,4 +1,5 @@
 #pragma once
+
 struct PERMIT_STAGE
 {
 	int index;

src/Shoot.cpp

@@ -1,11 +1,12 @@
-#include "ArmsItem.h"
-#include "MycParam.h"
 #include "Shoot.h"
-#include "Caret.h"
+
+#include "ArmsItem.h"
 #include "Bullet.h"
-#include "Sound.h"
-#include "MyChar.h"
+#include "Caret.h"
 #include "KeyControl.h"
+#include "MyChar.h"
+#include "MycParam.h"
+#include "Sound.h"
 
 int empty;
 int spur_charge;

src/Shoot.h

@@ -1,3 +1,4 @@
 #pragma once
+
 void ResetSpurCharge(void);
 void ShootBullet();

src/Sound.cpp

@@ -1,11 +1,12 @@
-#include <string>
-#include <math.h>
+#include "Sound.h"
+
 #include <algorithm>
+#include <math.h>
 #include <stdint.h>
+#include <string>
 
 #include <SDL.h>
 
-#include "Sound.h"
 #include "Organya.h"
 #include "PixTone.h"
 

src/Sound.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <stddef.h>
 #include <stdint.h>
 

src/Stage.cpp

@@ -1,26 +1,27 @@
+#include "Stage.h"
+
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "WindowsWrapper.h"
 
+#include "Back.h"
+#include "Boss.h"
+#include "Bullet.h"
+#include "Caret.h"
 #include "CommonDefines.h"
+#include "Draw.h"
+#include "Flash.h"
+#include "Frame.h"
 #include "Map.h"
 #include "MapName.h"
 #include "MyChar.h"
-#include "Bullet.h"
-#include "Boss.h"
-#include "Draw.h"
-#include "Tags.h"
-#include "Frame.h"
-#include "Caret.h"
 #include "NpChar.h"
-#include "TextScr.h"
 #include "Organya.h"
+#include "Tags.h"
+#include "TextScr.h"
 #include "ValueView.h"
-#include "Back.h"
-#include "Stage.h"
-#include "Flash.h"
 
 #ifdef JAPANESE
 #define STAGE_ENTRY(parts, map, bkType, back, npc, boss, boss_no, name_en, name_jp) {parts, map, bkType, back, npc, boss, boss_no, name_jp}

src/Star.cpp

@@ -1,11 +1,13 @@
+#include "Star.h"
+
 #include <string.h>
 
 #include "WindowsWrapper.h"
 
-#include "MyChar.h"
-#include "Draw.h"
 #include "Bullet.h"
+#include "Draw.h"
 #include "Game.h"
+#include "MyChar.h"
 
 static struct
 {