shithub: cstory

Info  •  Files  •  Log  •  Branches

Rearranged #includes

--- a/src/ArmsItem.cpp

+++ b/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 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 @@

 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;

--- a/src/ArmsItem.h

+++ b/src/ArmsItem.h

@@ -1,4 +1,5 @@

 #pragma once

+

 struct ARMS

 {

 	int code;

--- a/src/Back.cpp

+++ b/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;

--- a/src/Boss.cpp

+++ b/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 "Bullet.h"

+#include "Caret.h"

+#include "Draw.h"

+#include "Map.h"

 #include "MyChar.h"

-#include "Sound.h"

+#include "NpChar.h"

 #include "NpcHit.h"

-#include "Caret.h"

+#include "Sound.h"

 #include "TextScr.h"

 #include "ValueView.h"

-#include "Draw.h"

-#include "Map.h"

-#include "Bullet.h"

 NPCHAR gBoss[BOSS_MAX];

--- a/src/Boss.h

+++ b/src/Boss.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include "NpChar.h"

 #define BOSS_MAX 20

--- a/src/BossAlmo1.cpp

+++ b/src/BossAlmo1.cpp

@@ -1,5 +1,7 @@

 #include "BossAlmo1.h"

+#include "WindowsWrapper.h"

+

 #include "Boss.h"

 #include "Frame.h"

 #include "Game.h"

--- a/src/BossAlmo2.cpp

+++ b/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)

 {

--- a/src/BossBallos.cpp

+++ b/src/BossBallos.cpp

@@ -1,5 +1,7 @@

 #include "BossBallos.h"

+#include "WindowsWrapper.h"

+

 #include "Boss.h"

 #include "Flash.h"

 #include "Frame.h"

--- a/src/BossFrog.cpp

+++ b/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)

 {

--- a/src/BossIronH.cpp

+++ b/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)

 {

--- a/src/BossLife.cpp

+++ b/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

 {

--- a/src/BossOhm.cpp

+++ b/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()

 {

--- a/src/BossOhm.h

+++ b/src/BossOhm.h

@@ -1,2 +1,3 @@

 #pragma once

+

 void ActBossChar_Omega();

--- a/src/BossPress.cpp

+++ b/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)

 {

--- a/src/BossTwinD.cpp

+++ b/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)

 {

--- a/src/BossX.cpp

+++ b/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)

 {

--- a/src/BulHit.cpp

+++ b/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)

 {

--- a/src/BulHit.h

+++ b/src/BulHit.h

@@ -1,2 +1,3 @@

 #pragma once

+

 void HitBulletMap();

--- a/src/Bullet.cpp

+++ b/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] =

 {

--- a/src/Bullet.h

+++ b/src/Bullet.h

@@ -1,5 +1,7 @@

 #pragma once

+

 #include <stdint.h>

+

 #include "WindowsWrapper.h"

 struct BULLET

--- a/src/Caret.cpp

+++ b/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];

--- a/src/Caret.h

+++ b/src/Caret.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include "WindowsWrapper.h"

 struct CARET_TABLE

--- a/src/CommonDefines.h

+++ b/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

--- a/src/Config.cpp

+++ b/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)

 {

--- a/src/Config.h

+++ b/src/Config.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include <stdint.h>

 struct CONFIG

--- a/src/Draw.cpp

+++ b/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

 {

--- a/src/Draw.h

+++ b/src/Draw.h

@@ -1,5 +1,7 @@

 #pragma once

+

 #include <stdint.h>

+

 #include "WindowsWrapper.h"

 extern RECT grcGame;

--- a/src/Ending.cpp

+++ b/src/Ending.cpp

@@ -7,17 +7,17 @@

 #include "WindowsWrapper.h"

-#include "Tags.h"

-#include "Generic.h"

+#include "Draw.h"

+#include "Escape.h"

 #include "Flags.h"

+#include "Generic.h"

 #include "KeyControl.h"

-#include "Escape.h"

-#include "Organya.h"

-#include "MycParam.h"

 #include "Main.h"

+#include "MycParam.h"

+#include "Organya.h"

 #include "Stage.h"

-#include "Draw.h"

 #include "TextScr.h"

+#include "Tags.h"

 CREDIT Credit;

 STRIP Strip[MAX_STRIP];

--- a/src/Ending.h

+++ b/src/Ending.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include <stdint.h>

 struct CREDIT

--- a/src/Escape.cpp

+++ b/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"

--- a/src/Escape.h

+++ b/src/Escape.h

@@ -1,2 +1,3 @@

 #pragma once

+

 int Call_Escape();

--- a/src/Fade.cpp

+++ b/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;

--- a/src/Fade.h

+++ b/src/Fade.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include "CommonDefines.h"

 #define FADE_WIDTH	(((WINDOW_WIDTH - 1) >> 4) + 1)

--- a/src/Flags.cpp

+++ b/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];

--- a/src/Flags.h

+++ b/src/Flags.h

@@ -1,5 +1,7 @@

 #pragma once

+

 #include <stdint.h>

+

 extern uint8_t gFlagNPC[1000];

 extern uint8_t gSkipFlag[0x40];

--- a/src/Frame.cpp

+++ b/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;

--- a/src/Frame.h

+++ b/src/Frame.h

@@ -1,4 +1,5 @@

 #pragma once

+

 struct FRAME

 {

 	int x;

--- a/src/Game.cpp

+++ b/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 "Back.h"

+#include "Boss.h"

+#include "BossLife.h"

 #include "BulHit.h"

-#include "Shoot.h"

-#include "Star.h"

+#include "Bullet.h"

+#include "Caret.h"

+#include "Draw.h"

+#include "Ending.h"

+#include "Escape.h"

 #include "Fade.h"

-#include "Frame.h"

 #include "Flags.h"

-#include "Escape.h"

-#include "Stage.h"

+#include "Flash.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 "Caret.h"

-#include "Map.h"

-#include "Main.h"

 #include "MycParam.h"

-#include "MapName.h"

-#include "Sound.h"

+#include "NpChar.h"

+#include "NpcHit.h"

+#include "NpcTbl.h"

 #include "Organya.h"

 #include "Profile.h"

-#include "MycParam.h"

-#include "Back.h"

-#include "KeyControl.h"

-#include "ValueView.h"

-#include "Draw.h"

-#include "Ending.h"

-#include "Flash.h"

-#include "BossLife.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;

--- a/src/Game.h

+++ b/src/Game.h

@@ -1,4 +1,5 @@

 #pragma once

+

 extern int g_GameFlags;

 extern int gCounter;

--- a/src/Generic.cpp

+++ b/src/Generic.cpp

@@ -1,3 +1,5 @@

+#include "Generic.h"

+

 #include <stdint.h>

 #include <stdio.h>

--- a/src/Generic.h

+++ b/src/Generic.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include <stdint.h>

 bool GetCompileVersion(int *v1, int *v2, int *v3, int *v4);

--- a/src/GenericLoad.cpp

+++ b/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] =

 {

--- a/src/GenericLoad.h

+++ b/src/GenericLoad.h

@@ -1,2 +1,3 @@

 #pragma once

+

 bool LoadGenericData();

--- a/src/Input.cpp

+++ b/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

--- a/src/Input.h

+++ b/src/Input.h

@@ -1,4 +1,5 @@

 #pragma once

+

 extern bool gbUseJoystick;

 extern int gJoystickButtonTable[8];

--- a/src/KeyControl.cpp

+++ b/src/KeyControl.cpp

@@ -1,4 +1,5 @@

 #include "KeyControl.h"

+

 int gKey;

 int gKeyTrg;

--- a/src/KeyControl.h

+++ b/src/KeyControl.h

@@ -1,4 +1,5 @@

 #pragma once

+

 enum KEYBIND

 {

 	//The movement keys go in the order of left, right, up and down

--- a/src/Main.cpp

+++ b/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;

--- a/src/Main.h

+++ b/src/Main.h

@@ -1,3 +1,4 @@

 #pragma once

+

 void PutFramePerSecound();

 int GetFramePerSecound();

--- a/src/Map.cpp

+++ b/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

--- a/src/Map.h

+++ b/src/Map.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include <stdint.h>

 struct MAP_DATA

--- a/src/MapName.cpp

+++ b/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;

--- a/src/MapName.h

+++ b/src/MapName.h

@@ -1,4 +1,5 @@

 #pragma once

+

 struct MAP_NAME

 {

 	int flag;

--- a/src/MiniMap.cpp

+++ b/src/MiniMap.cpp

@@ -1,3 +1,5 @@

+#include "MiniMap.h"

+

 #include <stdint.h>

 #include <string.h>

@@ -4,15 +6,15 @@

 #include "WindowsWrapper.h"

 #include "CommonDefines.h"

-#include "MapName.h"

 #include "Draw.h"

 #include "Escape.h"

 #include "Game.h"

 #include "KeyControl.h"

+#include "Main.h"

 #include "Map.h"

-#include "Stage.h"

+#include "MapName.h"

 #include "MyChar.h"

-#include "Main.h"

+#include "Stage.h"

 int8_t gMapping[0x80];

--- a/src/MiniMap.h

+++ b/src/MiniMap.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include <stdint.h>

 extern int8_t gMapping[0x80];

--- a/src/MyChar.cpp

+++ b/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;

--- a/src/MyChar.h

+++ b/src/MyChar.h

@@ -1,5 +1,7 @@

 #pragma once

+

 #include <stdint.h>

+

 #include "WindowsWrapper.h"

 struct MYCHAR

--- a/src/MycHit.cpp

+++ b/src/MycHit.cpp

@@ -1,18 +1,20 @@

+#include "MycHit.h"

+

 #include <stdint.h>

 #include "WindowsWrapper.h"

+#include "Back.h"

+#include "Boss.h"

+#include "Caret.h"

+#include "Game.h"

+#include "KeyControl.h"

+#include "Map.h"

 #include "MyChar.h"

+#include "MycParam.h"

 #include "NpChar.h"

-#include "Map.h"

 #include "Sound.h"

-#include "Caret.h"

-#include "Boss.h"

-#include "Back.h"

-#include "Game.h"

 #include "TextScr.h"

-#include "MycParam.h"

-#include "KeyControl.h"

 void ResetMyCharFlag()

 {

--- a/src/MycHit.h

+++ b/src/MycHit.h

@@ -1,4 +1,5 @@

 #pragma once

+

 void ResetMyCharFlag();

 void HitMyCharMap();

 void HitMyCharNpChar();

--- a/src/MycParam.cpp

+++ b/src/MycParam.cpp

@@ -1,18 +1,19 @@

+#include "MycParam.h"

+

 #include "SDL.h"

-#include "Sound.h"

+#include "ArmsItem.h"

+#include "CommonDefines.h"

+#include "Caret.h"

+#include "Draw.h"

+#include "Game.h"

+#include "File.h"

 #include "MyChar.h"

-#include "MycParam.h"

 #include "NpChar.h"

-#include "CommonDefines.h"

+#include "Sound.h"

 #include "Tags.h"

-#include "ArmsItem.h"

-#include "ValueView.h"

 #include "TextScr.h"

-#include "Game.h"

-#include "Draw.h"

-#include "Caret.h"

-#include "File.h"

+#include "ValueView.h"

 ARMS_LEVEL gArmsLevelTable[14] =

 {

--- a/src/MycParam.h

+++ b/src/MycParam.h

@@ -1,5 +1,7 @@

 #pragma once

+

 #include <stdint.h>

+

 struct ARMS_LEVEL

 {

 	int exp[3];

--- a/src/NpChar.cpp

+++ b/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 "ArmsItem.h"

 #include "CommonDefines.h"

-#include "Tags.h"

-#include "NpChar.h"

 #include "Caret.h"

-#include "MyChar.h"

-#include "Game.h"

-#include "ArmsItem.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"

-#include "NpcTbl.h"

-#include "Draw.h"

-#include "File.h"

 NPCHAR gNPC[NPC_MAX];

 int gCurlyShoot_wait;

--- a/src/NpChar.h

+++ b/src/NpChar.h

@@ -1,5 +1,7 @@

 #pragma once

+

 #include <stdint.h>

+

 #include "WindowsWrapper.h"

 #include "Draw.h"

--- a/src/NpcAct.h

+++ b/src/NpcAct.h

@@ -362,4 +362,4 @@

 void ActNpc357(NPCHAR *npc);

 void ActNpc358(NPCHAR *npc);

 void ActNpc359(NPCHAR *npc);

-void ActNpc360(NPCHAR *npc);

\ No newline at end of file

+void ActNpc360(NPCHAR *npc);

--- a/src/NpcAct000.cpp

+++ b/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)

--- a/src/NpcAct020.cpp

+++ b/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)

--- a/src/NpcAct040.cpp

+++ b/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)

--- a/src/NpcAct060.cpp

+++ b/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 "Flash.h"

 #include "Frame.h"

+#include "Game.h"

+#include "Map.h"

+#include "MyChar.h"

 #include "MycParam.h"

-#include "Flash.h"

+#include "NpChar.h"

+#include "Sound.h"

+#include "Triangle.h"

 //Toroko

 void ActNpc060(NPCHAR *npc)

--- a/src/NpcAct080.cpp

+++ b/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)

--- a/src/NpcAct100.cpp

+++ b/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)

--- a/src/NpcAct120.cpp

+++ b/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)

--- a/src/NpcAct140.cpp

+++ b/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)

--- a/src/NpcAct160.cpp

+++ b/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)

--- a/src/NpcAct180.cpp

+++ b/src/NpcAct180.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 "Caret.h"

-#include "Frame.h"

 #include "Bullet.h"

+#include "Caret.h"

 #include "Flags.h"

+#include "Frame.h"

+#include "Game.h"

+#include "MyChar.h"

+#include "NpChar.h"

 #include "NpcHit.h"

+#include "Sound.h"

+#include "Triangle.h"

 //Curly AI

 void ActNpc180(NPCHAR *npc)

--- a/src/NpcAct200.cpp

+++ b/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)

--- a/src/NpcAct220.cpp

+++ b/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)

--- a/src/NpcAct240.cpp

+++ b/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)

--- a/src/NpcAct260.cpp

+++ b/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)

--- a/src/NpcAct280.cpp

+++ b/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)

--- a/src/NpcAct300.cpp

+++ b/src/NpcAct300.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 "Caret.h"

 #include "Boss.h"

+#include "Bullet.h"

+#include "Caret.h"

 #include "Frame.h"

+#include "Game.h"

 #include "Map.h"

-#include "Bullet.h"

+#include "MyChar.h"

+#include "NpChar.h"

+#include "Sound.h"

+#include "Triangle.h"

 //Demon crown (opening)

 void ActNpc300(NPCHAR *npc)

--- a/src/NpcAct320.cpp

+++ b/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)

--- a/src/NpcAct340.cpp

+++ b/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)

--- a/src/NpcHit.cpp

+++ b/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 "Caret.h"

+#include "Flags.h"

+#include "Game.h"

+#include "Map.h"

 #include "MyChar.h"

+#include "NpChar.h"

+#include "Sound.h"

 #include "TextScr.h"

-#include "Map.h"

+#include "ValueView.h"

 void JadgeHitNpCharBlock(NPCHAR *npc, int x, int y)

 {

--- a/src/NpcHit.h

+++ b/src/NpcHit.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include "NpChar.h"

 void JadgeHitNpCharBlock(NPCHAR *npc, int x, int y);

--- a/src/NpcTbl.cpp

+++ b/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;

--- a/src/NpcTbl.h

+++ b/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

 {

--- a/src/Organya.cpp

+++ b/src/Organya.cpp

@@ -1,3 +1,5 @@

+#include "Organya.h"

+

 #include <stdint.h>

 #include <SDL_rwops.h>

@@ -4,13 +6,13 @@

 #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

--- a/src/Organya.h

+++ b/src/Organya.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include <stdint.h>

 //Below are Organya song data structures

--- a/src/Profile.cpp

+++ b/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 "ArmsItem.h"

+#include "BossLife.h"

 #include "CommonDefines.h"

-#include "Tags.h"

-#include "Profile.h"

 #include "Fade.h"

-#include "ArmsItem.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";

--- a/src/Profile.h

+++ b/src/Profile.h

@@ -1,5 +1,7 @@

 #pragma once

+

 #include <stdint.h>

+

 #include "ArmsItem.h"

 #include "SelStage.h"

--- a/src/Resource.cpp

+++ b/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"

--- a/src/Resource.h

+++ b/src/Resource.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include <SDL_rwops.h>

 SDL_RWops* FindResource(const char *name);

--- a/src/SelStage.cpp

+++ b/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];

--- a/src/SelStage.h

+++ b/src/SelStage.h

@@ -1,4 +1,5 @@

 #pragma once

+

 struct PERMIT_STAGE

 {

 	int index;

--- a/src/Shoot.cpp

+++ b/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;

--- a/src/Shoot.h

+++ b/src/Shoot.h

@@ -1,3 +1,4 @@

 #pragma once

+

 void ResetSpurCharge(void);

 void ShootBullet();

--- a/src/Sound.cpp

+++ b/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"

--- a/src/Sound.h

+++ b/src/Sound.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include <stddef.h>

 #include <stdint.h>

--- a/src/Stage.cpp

+++ b/src/Stage.cpp

@@ -1,3 +1,5 @@

+#include "Stage.h"

+

 #include <stdint.h>

 #include <stdio.h>

 #include <string.h>

@@ -4,23 +6,22 @@

 #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}

--- a/src/Star.cpp

+++ b/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

 {

--- a/src/Star.h

+++ b/src/Star.h

@@ -1,4 +1,5 @@

 #pragma once

+

 void InitStar();

 void ActStar();

 void PutStar(int fx, int fy);

--- a/src/Tags.h

+++ b/src/Tags.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include "CommonDefines.h"

 extern char gModulePath[PATH_LENGTH];

--- a/src/TextScr.cpp

+++ b/src/TextScr.cpp

@@ -1,3 +1,5 @@

+#include "TextScr.h"

+

 #include <stdint.h>

 #include <stdio.h>

 #include <stdlib.h>

@@ -5,33 +7,31 @@

 #include "WindowsWrapper.h"

+#include "ArmsItem.h"

+#include "Boss.h"

+#include "BossLife.h"

 #include "CommonDefines.h"

-#include "TextScr.h"

 #include "Draw.h"

-#include "Tags.h"

-#include "ArmsItem.h"

-#include "MyChar.h"

+#include "Ending.h"

 #include "Fade.h"

-#include "Stage.h"

-#include "Frame.h"

-#include "MycParam.h"

 #include "Flags.h"

-#include "Ending.h"

-#include "Profile.h"

+#include "Flash.h"

+#include "Frame.h"

+#include "Game.h"

+#include "Generic.h"

+#include "KeyControl.h"

 #include "Map.h"

-#include "MiniMap.h"

-#include "Boss.h"

 #include "MapName.h"

-#include "KeyControl.h"

+#include "MiniMap.h"

+#include "MyChar.h"

+#include "MycParam.h"

 #include "NpChar.h"

-#include "Sound.h"

 #include "Organya.h"

-#include "Game.h"

-#include "Map.h"

-#include "BossLife.h"

+#include "Profile.h"

 #include "SelStage.h"

-#include "Flash.h"

-#include "Generic.h"

+#include "Sound.h"

+#include "Stage.h"

+#include "Tags.h"

 #define IS_COMMAND(c1, c2, c3) gTS.data[gTS.p_read + 1] == c1 && gTS.data[gTS.p_read + 2] == c2 && gTS.data[gTS.p_read + 3] == c3

--- a/src/TextScr.h

+++ b/src/TextScr.h

@@ -1,6 +1,9 @@

 #pragma once

+

 #include <stdint.h>

+

 #include "WindowsWrapper.h"

+

 #include "CommonDefines.h"

 struct TEXT_SCRIPT

--- a/src/Triangle.cpp

+++ b/src/Triangle.cpp

@@ -1,5 +1,7 @@

-#include <math.h>

+#include "Triangle.h"

+

 #include <stdint.h>

+#include <math.h>

 int gSin[0x100];

 int16_t gTan[0x21];

--- a/src/Triangle.h

+++ b/src/Triangle.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include <stdint.h>

 void InitTriangleTable();

--- a/src/Types.h

+++ b/src/Types.h

@@ -1,2 +1,3 @@

 #pragma once

+

 //This was originally some sort of POSIX standard thing? leftover from the linux port

--- a/src/ValueView.cpp

+++ b/src/ValueView.cpp

@@ -2,9 +2,9 @@

 #include "WindowsWrapper.h"

-#include "ValueView.h"

-#include "Game.h"

 #include "Draw.h"

+#include "Game.h"

+#include "ValueView.h"

 #define VALUEVIEW_MAX 0x10

 VALUEVIEW gVV[VALUEVIEW_MAX];

--- a/src/ValueView.h

+++ b/src/ValueView.h

@@ -1,4 +1,5 @@

 #pragma once

+

 #include "WindowsWrapper.h"

 struct VALUEVIEW

--- a/src/WindowsWrapper.h

+++ b/src/WindowsWrapper.h

@@ -1,4 +1,5 @@

 #pragma once

+

 int rep_rand();

 void rep_srand(unsigned int seed);

-- 

⑨