From 0bb9760d875deab7f1ffcfe1326737206efd8d0c Mon Sep 17 00:00:00 2001 From: Clownacy Date: Mon, 18 Feb 2019 21:30:22 +0000 Subject: [PATCH] Rearranged #includes --- src/ArmsItem.cpp | 15 +++++----- src/ArmsItem.h | 1 + src/Back.cpp | 9 +++--- src/Boss.cpp | 17 +++++------ src/Boss.h | 1 + src/BossAlmo1.cpp | 2 ++ src/BossAlmo2.cpp | 3 +- src/BossBallos.cpp | 2 ++ src/BossFrog.cpp | 3 +- src/BossIronH.cpp | 3 +- src/BossLife.cpp | 5 ++-- src/BossOhm.cpp | 10 ++++--- src/BossOhm.h | 1 + src/BossPress.cpp | 3 +- src/BossTwinD.cpp | 3 +- src/BossX.cpp | 3 +- src/BulHit.cpp | 8 ++++-- src/BulHit.h | 1 + src/Bullet.cpp | 6 ++-- src/Bullet.h | 2 ++ src/Caret.cpp | 2 +- src/Caret.h | 1 + src/CommonDefines.h | 1 + src/Config.cpp | 8 +++--- src/Config.h | 1 + src/Draw.cpp | 8 +++--- src/Draw.h | 2 ++ src/Ending.cpp | 18 ++++++------ src/Ending.h | 1 + src/Escape.cpp | 3 +- src/Escape.h | 1 + src/Fade.cpp | 5 ++-- src/Fade.h | 1 + src/Flags.cpp | 2 +- src/Flags.h | 2 ++ src/Frame.cpp | 9 +++--- src/Frame.h | 1 + src/Game.cpp | 68 +++++++++++++++++++++++--------------------- src/Game.h | 1 + src/Generic.cpp | 2 ++ src/Generic.h | 1 + src/GenericLoad.cpp | 6 ++-- src/GenericLoad.h | 1 + src/Input.cpp | 8 ++++-- src/Input.h | 1 + src/KeyControl.cpp | 1 + src/KeyControl.h | 1 + src/Main.cpp | 24 +++++++++------- src/Main.h | 1 + src/Map.cpp | 7 +++-- src/Map.h | 1 + src/MapName.cpp | 3 +- src/MapName.h | 1 + src/MiniMap.cpp | 10 ++++--- src/MiniMap.h | 1 + src/MyChar.cpp | 17 +++++------ src/MyChar.h | 2 ++ src/MycHit.cpp | 18 ++++++------ src/MycHit.h | 1 + src/MycParam.cpp | 21 +++++++------- src/MycParam.h | 2 ++ src/NpChar.cpp | 21 +++++++------- src/NpChar.h | 2 ++ src/NpcAct.h | 2 +- src/NpcAct000.cpp | 16 +++++------ src/NpcAct020.cpp | 12 ++++---- src/NpcAct040.cpp | 12 ++++---- src/NpcAct060.cpp | 20 ++++++------- src/NpcAct080.cpp | 16 +++++------ src/NpcAct100.cpp | 14 ++++----- src/NpcAct120.cpp | 16 +++++------ src/NpcAct140.cpp | 18 ++++++------ src/NpcAct160.cpp | 18 ++++++------ src/NpcAct180.cpp | 20 ++++++------- src/NpcAct200.cpp | 14 ++++----- src/NpcAct220.cpp | 14 ++++----- src/NpcAct240.cpp | 14 ++++----- src/NpcAct260.cpp | 16 +++++------ src/NpcAct280.cpp | 14 ++++----- src/NpcAct300.cpp | 18 ++++++------ src/NpcAct320.cpp | 18 ++++++------ src/NpcAct340.cpp | 18 ++++++------ src/NpcHit.cpp | 18 ++++++------ src/NpcHit.h | 1 + src/NpcTbl.cpp | 5 ++-- src/NpcTbl.h | 4 ++- src/Organya.cpp | 6 ++-- src/Organya.h | 1 + src/Profile.cpp | 21 +++++++------- src/Profile.h | 2 ++ src/Resource.cpp | 3 ++ src/Resource.h | 1 + src/SelStage.cpp | 5 ++-- src/SelStage.h | 1 + src/Shoot.cpp | 11 +++---- src/Shoot.h | 1 + src/Sound.cpp | 7 +++-- src/Sound.h | 1 + src/Stage.cpp | 21 +++++++------- src/Star.cpp | 6 ++-- src/Star.h | 1 + src/Tags.h | 1 + src/TextScr.cpp | 44 ++++++++++++++-------------- src/TextScr.h | 3 ++ src/Triangle.cpp | 4 ++- src/Triangle.h | 1 + src/Types.h | 1 + src/ValueView.cpp | 4 +-- src/ValueView.h | 1 + src/WindowsWrapper.h | 1 + 110 files changed, 480 insertions(+), 372 deletions(-) diff --git a/src/ArmsItem.cpp b/src/ArmsItem.cpp index 47cc9925..f18b94dc 100644 --- a/src/ArmsItem.cpp +++ b/src/ArmsItem.cpp @@ -1,15 +1,16 @@ +#include "ArmsItem.h" + #include #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; diff --git a/src/ArmsItem.h b/src/ArmsItem.h index 72cccc8d..8faa785d 100644 --- a/src/ArmsItem.h +++ b/src/ArmsItem.h @@ -1,4 +1,5 @@ #pragma once + struct ARMS { int code; diff --git a/src/Back.cpp b/src/Back.cpp index bfc3ec5f..b60586cd 100644 --- a/src/Back.cpp +++ b/src/Back.cpp @@ -1,15 +1,16 @@ #include "Back.h" #include + #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; diff --git a/src/Boss.cpp b/src/Boss.cpp index e5584f94..90854e23 100644 --- a/src/Boss.cpp +++ b/src/Boss.cpp @@ -1,9 +1,10 @@ +#include "Boss.h" + #include #include #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]; diff --git a/src/Boss.h b/src/Boss.h index d0af8597..3c8d6b47 100644 --- a/src/Boss.h +++ b/src/Boss.h @@ -1,4 +1,5 @@ #pragma once + #include "NpChar.h" #define BOSS_MAX 20 diff --git a/src/BossAlmo1.cpp b/src/BossAlmo1.cpp index cb9e1914..418c3feb 100644 --- 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" diff --git a/src/BossAlmo2.cpp b/src/BossAlmo2.cpp index 6335ac08..5fdfa864 100644 --- 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) { diff --git a/src/BossBallos.cpp b/src/BossBallos.cpp index 3f8ccc6b..1da627e7 100644 --- 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" diff --git a/src/BossFrog.cpp b/src/BossFrog.cpp index 1e34a0a5..bd65b611 100644 --- 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) { diff --git a/src/BossIronH.cpp b/src/BossIronH.cpp index 370c7e17..e9fbe74d 100644 --- 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) { diff --git a/src/BossLife.cpp b/src/BossLife.cpp index 5df2297f..cdd42b3f 100644 --- 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 { diff --git a/src/BossOhm.cpp b/src/BossOhm.cpp index b5d792ad..4ea7def8 100644 --- a/src/BossOhm.cpp +++ b/src/BossOhm.cpp @@ -1,15 +1,17 @@ +#include "BossOhm.h" + #include #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() { diff --git a/src/BossOhm.h b/src/BossOhm.h index 8b6fea74..d332f27d 100644 --- a/src/BossOhm.h +++ b/src/BossOhm.h @@ -1,2 +1,3 @@ #pragma once + void ActBossChar_Omega(); diff --git a/src/BossPress.cpp b/src/BossPress.cpp index ab25ff95..a8e41cda 100644 --- 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) { diff --git a/src/BossTwinD.cpp b/src/BossTwinD.cpp index 12f2baf5..240c7882 100644 --- 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) { diff --git a/src/BossX.cpp b/src/BossX.cpp index 89981474..1ee4531e 100644 --- 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) { diff --git a/src/BulHit.cpp b/src/BulHit.cpp index 5f0c4073..3d7fe199 100644 --- a/src/BulHit.cpp +++ b/src/BulHit.cpp @@ -1,13 +1,15 @@ +#include "BulHit.h" + #include #include #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) { diff --git a/src/BulHit.h b/src/BulHit.h index 3c12ef97..c6af92a7 100644 --- a/src/BulHit.h +++ b/src/BulHit.h @@ -1,2 +1,3 @@ #pragma once + void HitBulletMap(); diff --git a/src/Bullet.cpp b/src/Bullet.cpp index c198a8a9..96672301 100644 --- 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] = { diff --git a/src/Bullet.h b/src/Bullet.h index 9d91da4b..fdc49918 100644 --- a/src/Bullet.h +++ b/src/Bullet.h @@ -1,5 +1,7 @@ #pragma once + #include + #include "WindowsWrapper.h" struct BULLET diff --git a/src/Caret.cpp b/src/Caret.cpp index f8b0b563..0b23010f 100644 --- 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]; diff --git a/src/Caret.h b/src/Caret.h index 8523ddb7..95af4602 100644 --- a/src/Caret.h +++ b/src/Caret.h @@ -1,4 +1,5 @@ #pragma once + #include "WindowsWrapper.h" struct CARET_TABLE diff --git a/src/CommonDefines.h b/src/CommonDefines.h index 2a135b90..fe7da48e 100644 --- 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 diff --git a/src/Config.cpp b/src/Config.cpp index 35277f18..bb218de6 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -1,15 +1,15 @@ #include -#include "Types.h" -#include "CommonDefines.h" -#include #include +#include #include #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) { diff --git a/src/Config.h b/src/Config.h index 5e600d3d..6409e354 100644 --- a/src/Config.h +++ b/src/Config.h @@ -1,4 +1,5 @@ #pragma once + #include struct CONFIG diff --git a/src/Draw.cpp b/src/Draw.cpp index 32ee95e2..8eeb0faf 100644 --- a/src/Draw.cpp +++ b/src/Draw.cpp @@ -1,8 +1,6 @@ #include -#include "Types.h" -#include "CommonDefines.h" -#include #include +#include #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 { diff --git a/src/Draw.h b/src/Draw.h index 48580e57..58bfd21f 100644 --- a/src/Draw.h +++ b/src/Draw.h @@ -1,5 +1,7 @@ #pragma once + #include + #include "WindowsWrapper.h" extern RECT grcGame; diff --git a/src/Ending.cpp b/src/Ending.cpp index 793663f8..046b3dca 100644 --- a/src/Ending.cpp +++ b/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]; diff --git a/src/Ending.h b/src/Ending.h index 3cc7ec63..b9bdfeb9 100644 --- a/src/Ending.h +++ b/src/Ending.h @@ -1,4 +1,5 @@ #pragma once + #include struct CREDIT diff --git a/src/Escape.cpp b/src/Escape.cpp index 795fcd29..99ee388b 100644 --- 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" diff --git a/src/Escape.h b/src/Escape.h index 393ea8ce..b2be505f 100644 --- a/src/Escape.h +++ b/src/Escape.h @@ -1,2 +1,3 @@ #pragma once + int Call_Escape(); diff --git a/src/Fade.cpp b/src/Fade.cpp index 4c439944..cd305abc 100644 --- a/src/Fade.cpp +++ b/src/Fade.cpp @@ -1,10 +1,11 @@ +#include "Fade.h" + #include #include "WindowsWrapper.h" -#include "Fade.h" -#include "Game.h" #include "Draw.h" +#include "Game.h" FADE gFade; diff --git a/src/Fade.h b/src/Fade.h index 95da7f80..06c3da0e 100644 --- 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) diff --git a/src/Flags.cpp b/src/Flags.cpp index 99309502..7da02b15 100644 --- a/src/Flags.cpp +++ b/src/Flags.cpp @@ -1,7 +1,7 @@ #include "Flags.h" -#include #include +#include uint8_t gFlagNPC[1000]; uint8_t gSkipFlag[0x40]; diff --git a/src/Flags.h b/src/Flags.h index 5e5c01c0..4fb6daea 100644 --- a/src/Flags.h +++ b/src/Flags.h @@ -1,5 +1,7 @@ #pragma once + #include + extern uint8_t gFlagNPC[1000]; extern uint8_t gSkipFlag[0x40]; diff --git a/src/Frame.cpp b/src/Frame.cpp index c6b5f4de..c20e67f8 100644 --- a/src/Frame.cpp +++ b/src/Frame.cpp @@ -1,12 +1,13 @@ +#include "Frame.h" + #include -#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; diff --git a/src/Frame.h b/src/Frame.h index 9a40f13e..0026a6b3 100644 --- a/src/Frame.h +++ b/src/Frame.h @@ -1,4 +1,5 @@ #pragma once + struct FRAME { int x; diff --git a/src/Game.cpp b/src/Game.cpp index fa5fbd50..15d240ad 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -1,47 +1,49 @@ -#include +#include "Game.h" + #include +#include #include + #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; diff --git a/src/Game.h b/src/Game.h index 58fe6416..19be7142 100644 --- a/src/Game.h +++ b/src/Game.h @@ -1,4 +1,5 @@ #pragma once + extern int g_GameFlags; extern int gCounter; diff --git a/src/Generic.cpp b/src/Generic.cpp index e1bec542..d36da3ed 100644 --- a/src/Generic.cpp +++ b/src/Generic.cpp @@ -1,3 +1,5 @@ +#include "Generic.h" + #include #include diff --git a/src/Generic.h b/src/Generic.h index 39b31705..e8074046 100644 --- a/src/Generic.h +++ b/src/Generic.h @@ -1,4 +1,5 @@ #pragma once + #include bool GetCompileVersion(int *v1, int *v2, int *v3, int *v4); diff --git a/src/GenericLoad.cpp b/src/GenericLoad.cpp index 7c1c660f..80e915da 100644 --- 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] = { diff --git a/src/GenericLoad.h b/src/GenericLoad.h index 3dcfb217..20b2136c 100644 --- a/src/GenericLoad.h +++ b/src/GenericLoad.h @@ -1,2 +1,3 @@ #pragma once + bool LoadGenericData(); diff --git a/src/Input.cpp b/src/Input.cpp index 7426bf97..d4d3ede3 100644 --- a/src/Input.cpp +++ b/src/Input.cpp @@ -1,12 +1,14 @@ -#include "Types.h" -#include "CommonDefines.h" +#include "Input.h" + #include #include + #include "WindowsWrapper.h" -#include "Input.h" +#include "CommonDefines.h" #include "Tags.h" +#include "Types.h" #define JOYSTICK_DEADZONE 10000 diff --git a/src/Input.h b/src/Input.h index 078a082a..2e5ff41b 100644 --- a/src/Input.h +++ b/src/Input.h @@ -1,4 +1,5 @@ #pragma once + extern bool gbUseJoystick; extern int gJoystickButtonTable[8]; diff --git a/src/KeyControl.cpp b/src/KeyControl.cpp index aa5f5c38..aa67f578 100644 --- a/src/KeyControl.cpp +++ b/src/KeyControl.cpp @@ -1,4 +1,5 @@ #include "KeyControl.h" + int gKey; int gKeyTrg; diff --git a/src/KeyControl.h b/src/KeyControl.h index 70ca0e4a..251600eb 100644 --- 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 diff --git a/src/Main.cpp b/src/Main.cpp index da8b0195..8e994364 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -1,25 +1,27 @@ +#include "Main.h" + #include -#include "Types.h" -#include "CommonDefines.h" #include -#include +#include #include + #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; diff --git a/src/Main.h b/src/Main.h index f2a0d57b..8d059ff1 100644 --- a/src/Main.h +++ b/src/Main.h @@ -1,3 +1,4 @@ #pragma once + void PutFramePerSecound(); int GetFramePerSecound(); diff --git a/src/Map.cpp b/src/Map.cpp index 1cf765a3..c6e4c54b 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -1,3 +1,5 @@ +#include "Map.h" + #include #include #include @@ -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 diff --git a/src/Map.h b/src/Map.h index 68e43d26..176301a9 100644 --- a/src/Map.h +++ b/src/Map.h @@ -1,4 +1,5 @@ #pragma once + #include struct MAP_DATA diff --git a/src/MapName.cpp b/src/MapName.cpp index 015d8908..4cfe28d5 100644 --- a/src/MapName.cpp +++ b/src/MapName.cpp @@ -1,8 +1,9 @@ +#include "MapName.h" + #include #include #include "CommonDefines.h" -#include "MapName.h" #include "Draw.h" MAP_NAME gMapName; diff --git a/src/MapName.h b/src/MapName.h index ea5e4415..92933f77 100644 --- a/src/MapName.h +++ b/src/MapName.h @@ -1,4 +1,5 @@ #pragma once + struct MAP_NAME { int flag; diff --git a/src/MiniMap.cpp b/src/MiniMap.cpp index e588b26a..d8490a78 100644 --- a/src/MiniMap.cpp +++ b/src/MiniMap.cpp @@ -1,18 +1,20 @@ +#include "MiniMap.h" + #include #include #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]; diff --git a/src/MiniMap.h b/src/MiniMap.h index b998c8ca..cbeca307 100644 --- a/src/MiniMap.h +++ b/src/MiniMap.h @@ -1,4 +1,5 @@ #pragma once + #include extern int8_t gMapping[0x80]; diff --git a/src/MyChar.cpp b/src/MyChar.cpp index 4a05c8a0..a328b666 100644 --- a/src/MyChar.cpp +++ b/src/MyChar.cpp @@ -1,21 +1,22 @@ +#include "MyChar.h" + #include #include #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; diff --git a/src/MyChar.h b/src/MyChar.h index ade4fff4..a3d568c1 100644 --- a/src/MyChar.h +++ b/src/MyChar.h @@ -1,5 +1,7 @@ #pragma once + #include + #include "WindowsWrapper.h" struct MYCHAR diff --git a/src/MycHit.cpp b/src/MycHit.cpp index 498435a8..458c0787 100644 --- a/src/MycHit.cpp +++ b/src/MycHit.cpp @@ -1,18 +1,20 @@ +#include "MycHit.h" + #include #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() { diff --git a/src/MycHit.h b/src/MycHit.h index 10be598f..a4ad0ed3 100644 --- a/src/MycHit.h +++ b/src/MycHit.h @@ -1,4 +1,5 @@ #pragma once + void ResetMyCharFlag(); void HitMyCharMap(); void HitMyCharNpChar(); diff --git a/src/MycParam.cpp b/src/MycParam.cpp index c02db6ea..076d9a48 100644 --- a/src/MycParam.cpp +++ b/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] = { diff --git a/src/MycParam.h b/src/MycParam.h index 1de454d3..de66ce9e 100644 --- a/src/MycParam.h +++ b/src/MycParam.h @@ -1,5 +1,7 @@ #pragma once + #include + struct ARMS_LEVEL { int exp[3]; diff --git a/src/NpChar.cpp b/src/NpChar.cpp index 85a08003..8588c058 100644 --- a/src/NpChar.cpp +++ b/src/NpChar.cpp @@ -1,3 +1,5 @@ +#include "NpChar.h" + #include #include #include @@ -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; diff --git a/src/NpChar.h b/src/NpChar.h index 2ba81838..746b04e7 100644 --- a/src/NpChar.h +++ b/src/NpChar.h @@ -1,5 +1,7 @@ #pragma once + #include + #include "WindowsWrapper.h" #include "Draw.h" diff --git a/src/NpcAct.h b/src/NpcAct.h index 7bfc54d3..5b9263c5 100644 --- a/src/NpcAct.h +++ b/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); \ No newline at end of file +void ActNpc360(NPCHAR *npc); diff --git a/src/NpcAct000.cpp b/src/NpcAct000.cpp index ee8a0118..653f77b8 100644 --- 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) diff --git a/src/NpcAct020.cpp b/src/NpcAct020.cpp index bcbe5188..f4b980ab 100644 --- 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) diff --git a/src/NpcAct040.cpp b/src/NpcAct040.cpp index 02fe7b33..c0a6aca9 100644 --- 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) diff --git a/src/NpcAct060.cpp b/src/NpcAct060.cpp index eefcc7e9..4be42c60 100644 --- 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 "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) diff --git a/src/NpcAct080.cpp b/src/NpcAct080.cpp index f7b30fb8..940d6b95 100644 --- 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) diff --git a/src/NpcAct100.cpp b/src/NpcAct100.cpp index 48d81858..9d2a040b 100644 --- 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) diff --git a/src/NpcAct120.cpp b/src/NpcAct120.cpp index 41470ae1..51ca4586 100644 --- 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) diff --git a/src/NpcAct140.cpp b/src/NpcAct140.cpp index 1edda041..53cfd11d 100644 --- 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) diff --git a/src/NpcAct160.cpp b/src/NpcAct160.cpp index 64a0684f..7291de11 100644 --- 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) diff --git a/src/NpcAct180.cpp b/src/NpcAct180.cpp index a049f74d..e0f741af 100644 --- a/src/NpcAct180.cpp +++ b/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) diff --git a/src/NpcAct200.cpp b/src/NpcAct200.cpp index 163925b9..6c1806f5 100644 --- 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) diff --git a/src/NpcAct220.cpp b/src/NpcAct220.cpp index c4d67c60..eb7e81f3 100644 --- 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) diff --git a/src/NpcAct240.cpp b/src/NpcAct240.cpp index abe8b140..b97079a3 100644 --- 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) diff --git a/src/NpcAct260.cpp b/src/NpcAct260.cpp index cf84aa58..02c58916 100644 --- 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) diff --git a/src/NpcAct280.cpp b/src/NpcAct280.cpp index e080f21f..d9982731 100644 --- 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) diff --git a/src/NpcAct300.cpp b/src/NpcAct300.cpp index 746f9aaf..ea69a74e 100644 --- a/src/NpcAct300.cpp +++ b/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) diff --git a/src/NpcAct320.cpp b/src/NpcAct320.cpp index b521c224..7992cfd9 100644 --- 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) diff --git a/src/NpcAct340.cpp b/src/NpcAct340.cpp index fe701095..742216ff 100644 --- 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) diff --git a/src/NpcHit.cpp b/src/NpcHit.cpp index 9bf64dcd..e41c6483 100644 --- 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 "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) { diff --git a/src/NpcHit.h b/src/NpcHit.h index 2a36f40a..50f65e88 100644 --- 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); diff --git a/src/NpcTbl.cpp b/src/NpcTbl.cpp index f7ca6e71..7d4eb33c 100644 --- a/src/NpcTbl.cpp +++ b/src/NpcTbl.cpp @@ -1,11 +1,12 @@ +#include "NpcTbl.h" + #include #include #include -#include "NpcTbl.h" -#include "NpcAct.h" #include "File.h" #include "Generic.h" +#include "NpcAct.h" NPC_TABLE *gNpcTable; diff --git a/src/NpcTbl.h b/src/NpcTbl.h index 19e43a8f..e7604d41 100644 --- a/src/NpcTbl.h +++ b/src/NpcTbl.h @@ -1,7 +1,9 @@ #pragma once + #include -#include "NpChar.h" + #include "Draw.h" +#include "NpChar.h" struct NPC_TBL_RECT { diff --git a/src/Organya.cpp b/src/Organya.cpp index a4f05035..71be9854 100644 --- a/src/Organya.cpp +++ b/src/Organya.cpp @@ -1,16 +1,18 @@ +#include "Organya.h" + #include #include #include #include #include + #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 diff --git a/src/Organya.h b/src/Organya.h index d3180711..dbf43c5d 100644 --- a/src/Organya.h +++ b/src/Organya.h @@ -1,4 +1,5 @@ #pragma once + #include //Below are Organya song data structures diff --git a/src/Profile.cpp b/src/Profile.cpp index fb9439d7..826fef3c 100644 --- a/src/Profile.cpp +++ b/src/Profile.cpp @@ -1,3 +1,5 @@ +#include "Profile.h" + #include #include #include @@ -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"; diff --git a/src/Profile.h b/src/Profile.h index 999b7791..d9f527a1 100644 --- a/src/Profile.h +++ b/src/Profile.h @@ -1,5 +1,7 @@ #pragma once + #include + #include "ArmsItem.h" #include "SelStage.h" diff --git a/src/Resource.cpp b/src/Resource.cpp index 0d14833e..bde9f45c 100644 --- a/src/Resource.cpp +++ b/src/Resource.cpp @@ -1,7 +1,10 @@ +#include "Resource.h" + #include #include #include + #include "WindowsWrapper.h" #include "Resource/ORG/ACCESS.org.h" diff --git a/src/Resource.h b/src/Resource.h index cf507c85..89d552e6 100644 --- a/src/Resource.h +++ b/src/Resource.h @@ -1,4 +1,5 @@ #pragma once + #include SDL_RWops* FindResource(const char *name); diff --git a/src/SelStage.cpp b/src/SelStage.cpp index 1e576cde..75fafe7b 100644 --- a/src/SelStage.cpp +++ b/src/SelStage.cpp @@ -2,13 +2,14 @@ #include +#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]; diff --git a/src/SelStage.h b/src/SelStage.h index 586d17d4..7a2000bd 100644 --- a/src/SelStage.h +++ b/src/SelStage.h @@ -1,4 +1,5 @@ #pragma once + struct PERMIT_STAGE { int index; diff --git a/src/Shoot.cpp b/src/Shoot.cpp index 57bfafed..228652ea 100644 --- 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; diff --git a/src/Shoot.h b/src/Shoot.h index f5c02a1e..e0fbb055 100644 --- a/src/Shoot.h +++ b/src/Shoot.h @@ -1,3 +1,4 @@ #pragma once + void ResetSpurCharge(void); void ShootBullet(); diff --git a/src/Sound.cpp b/src/Sound.cpp index 2eadcc30..79c7a432 100644 --- a/src/Sound.cpp +++ b/src/Sound.cpp @@ -1,11 +1,12 @@ -#include -#include +#include "Sound.h" + #include +#include #include +#include #include -#include "Sound.h" #include "Organya.h" #include "PixTone.h" diff --git a/src/Sound.h b/src/Sound.h index 6fffc424..2bbcbc3a 100644 --- a/src/Sound.h +++ b/src/Sound.h @@ -1,4 +1,5 @@ #pragma once + #include #include diff --git a/src/Stage.cpp b/src/Stage.cpp index 425057ca..39cad12e 100644 --- a/src/Stage.cpp +++ b/src/Stage.cpp @@ -1,26 +1,27 @@ +#include "Stage.h" + #include #include #include #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} diff --git a/src/Star.cpp b/src/Star.cpp index 9567b4c1..202598ab 100644 --- a/src/Star.cpp +++ b/src/Star.cpp @@ -1,11 +1,13 @@ +#include "Star.h" + #include #include "WindowsWrapper.h" -#include "MyChar.h" -#include "Draw.h" #include "Bullet.h" +#include "Draw.h" #include "Game.h" +#include "MyChar.h" static struct { diff --git a/src/Star.h b/src/Star.h index ddf82d4d..15179727 100644 --- a/src/Star.h +++ b/src/Star.h @@ -1,4 +1,5 @@ #pragma once + void InitStar(); void ActStar(); void PutStar(int fx, int fy); diff --git a/src/Tags.h b/src/Tags.h index 7cc408c1..6c240cab 100644 --- a/src/Tags.h +++ b/src/Tags.h @@ -1,4 +1,5 @@ #pragma once + #include "CommonDefines.h" extern char gModulePath[PATH_LENGTH]; diff --git a/src/TextScr.cpp b/src/TextScr.cpp index 6cd68665..98c67b3d 100644 --- a/src/TextScr.cpp +++ b/src/TextScr.cpp @@ -1,3 +1,5 @@ +#include "TextScr.h" + #include #include #include @@ -5,33 +7,31 @@ #include "WindowsWrapper.h" -#include "CommonDefines.h" -#include "TextScr.h" -#include "Draw.h" -#include "Tags.h" #include "ArmsItem.h" -#include "MyChar.h" -#include "Fade.h" -#include "Stage.h" -#include "Frame.h" -#include "MycParam.h" -#include "Flags.h" -#include "Ending.h" -#include "Profile.h" -#include "Map.h" -#include "MiniMap.h" #include "Boss.h" -#include "MapName.h" -#include "KeyControl.h" -#include "NpChar.h" -#include "Sound.h" -#include "Organya.h" -#include "Game.h" -#include "Map.h" #include "BossLife.h" -#include "SelStage.h" +#include "CommonDefines.h" +#include "Draw.h" +#include "Ending.h" +#include "Fade.h" +#include "Flags.h" #include "Flash.h" +#include "Frame.h" +#include "Game.h" #include "Generic.h" +#include "KeyControl.h" +#include "Map.h" +#include "MapName.h" +#include "MiniMap.h" +#include "MyChar.h" +#include "MycParam.h" +#include "NpChar.h" +#include "Organya.h" +#include "Profile.h" +#include "SelStage.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 diff --git a/src/TextScr.h b/src/TextScr.h index 2811461b..ca575e96 100644 --- a/src/TextScr.h +++ b/src/TextScr.h @@ -1,6 +1,9 @@ #pragma once + #include + #include "WindowsWrapper.h" + #include "CommonDefines.h" struct TEXT_SCRIPT diff --git a/src/Triangle.cpp b/src/Triangle.cpp index 4fcef18d..a850b586 100644 --- a/src/Triangle.cpp +++ b/src/Triangle.cpp @@ -1,5 +1,7 @@ -#include +#include "Triangle.h" + #include +#include int gSin[0x100]; int16_t gTan[0x21]; diff --git a/src/Triangle.h b/src/Triangle.h index 41311fe5..8d2ab68a 100644 --- a/src/Triangle.h +++ b/src/Triangle.h @@ -1,4 +1,5 @@ #pragma once + #include void InitTriangleTable(); diff --git a/src/Types.h b/src/Types.h index 77add6be..bf91c76d 100644 --- 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 diff --git a/src/ValueView.cpp b/src/ValueView.cpp index 7a637d0b..25c3e5bd 100644 --- 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]; diff --git a/src/ValueView.h b/src/ValueView.h index 2a11ff87..e4e6ac71 100644 --- a/src/ValueView.h +++ b/src/ValueView.h @@ -1,4 +1,5 @@ #pragma once + #include "WindowsWrapper.h" struct VALUEVIEW diff --git a/src/WindowsWrapper.h b/src/WindowsWrapper.h index fbc9eb22..87b43c13 100644 --- a/src/WindowsWrapper.h +++ b/src/WindowsWrapper.h @@ -1,4 +1,5 @@ #pragma once + int rep_rand(); void rep_srand(unsigned int seed);