duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename some background enums

Browse source
This commit is contained in:
Clownacy 2020-09-04 00:19:49 +01:00
parent d16aa4cc70
commit 9bba04b395
5 changed files with 110 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Back.cpp
View file

@ -69,8 +69,8 @@ void ActBack(void)
gBack.fx += 6 * 0x200;
break;
case BACKGROUND_TYPE_OUTSIDE_WITH_WIND:
case BACKGROUND_TYPE_OUTSIDE:
case BACKGROUND_TYPE_CLOUDS_WINDY:
case BACKGROUND_TYPE_CLOUDS:
++gBack.fx;
gBack.fx %= 640;
break;
@ -113,8 +113,8 @@ void PutBack(int fx, int fy)
break;
case BACKGROUND_TYPE_OUTSIDE_WITH_WIND:
case BACKGROUND_TYPE_OUTSIDE:
case BACKGROUND_TYPE_CLOUDS_WINDY:
case BACKGROUND_TYPE_CLOUDS:
// Draw sky
rect.top = 0;
rect.bottom = 88;

4
src/Back.h
View file

@ -10,8 +10,8 @@ enum
BACKGROUND_TYPE_WATER = 3, // No background - draws a water foreground layer instead
BACKGROUND_TYPE_BLACK = 4, // No background - just black
BACKGROUND_TYPE_AUTOSCROLL = 5, // Constantly scrolls to the left (used by Ironhead)
BACKGROUND_TYPE_OUTSIDE_WITH_WIND = 6, // Fancy parallax scrolling, items are blown to the left (used by bkMoon)
BACKGROUND_TYPE_OUTSIDE = 7 // Fancy parallax scrolling (used by bkFog)
BACKGROUND_TYPE_CLOUDS_WINDY = 6, // Fancy parallax scrolling, items are blown to the left (used by bkMoon)
BACKGROUND_TYPE_CLOUDS = 7 // Fancy parallax scrolling (used by bkFog)
};
typedef struct BACK

2
src/NpcAct000.cpp
View file

@ -35,7 +35,7 @@ void ActNpc000(NPCHAR *npc)
void ActNpc001(NPCHAR *npc)
{
// In wind
if (gBack.type == BACKGROUND_TYPE_AUTOSCROLL || gBack.type == BACKGROUND_TYPE_OUTSIDE_WITH_WIND)
if (gBack.type == BACKGROUND_TYPE_AUTOSCROLL || gBack.type == BACKGROUND_TYPE_CLOUDS_WINDY)
{
if (npc->act_no == 0)
{

4
src/NpcAct080.cpp
View file

@ -737,7 +737,7 @@ void ActNpc086(NPCHAR *npc)
npc->ani_no = 0;
}
if (gBack.type == BACKGROUND_TYPE_AUTOSCROLL || gBack.type == BACKGROUND_TYPE_OUTSIDE_WITH_WIND)
if (gBack.type == BACKGROUND_TYPE_AUTOSCROLL || gBack.type == BACKGROUND_TYPE_CLOUDS_WINDY)
{
if (npc->act_no == 0)
{
@ -818,7 +818,7 @@ void ActNpc087(NPCHAR *npc)
npc->ani_no = 0;
}
if (gBack.type == BACKGROUND_TYPE_AUTOSCROLL || gBack.type == BACKGROUND_TYPE_OUTSIDE_WITH_WIND)
if (gBack.type == BACKGROUND_TYPE_AUTOSCROLL || gBack.type == BACKGROUND_TYPE_CLOUDS_WINDY)
{
if (npc->act_no == 0)
{

16
src/Stage.cpp
View file

@ -87,7 +87,7 @@ const STAGE_TABLE gTMT[95] = {
STAGE_ENTRY("Store", "Cthu2", BACKGROUND_TYPE_BLACK, "bk0", "Eggs1", "0", 0, "Cthulhu's Abode?", "\x83\x4E\x83\x67\x83\x44\x83\x8B\x81\x5B\x82\xCC\x8F\x5A\x8F\x88\x81\x48"), /* クトゥルーの住処？ */
STAGE_ENTRY("Store", "EggR2", BACKGROUND_TYPE_BLACK, "bk0", "Eggs1", "TwinD", 6, "Egg Observation Room?", "\x83\x5E\x83\x7D\x83\x53\x8A\xC4\x8E\x8B\x8E\xBA\x81\x48"), /* タマゴ監視室？ */
STAGE_ENTRY("EggX", "EggX2", BACKGROUND_TYPE_BLACK, "bk0", "Eggs1", "0", 0, "Egg No. 00", "\x83\x5E\x83\x7D\x83\x53\x20\x4E\x6F\x2E\x30\x30"), /* タマゴ No.00 */
STAGE_ENTRY("Oside", "Oside", BACKGROUND_TYPE_OUTSIDE_WITH_WIND, "BkMoon", "Moon", "0", 0, "Outer Wall", "\x8A\x4F\x95\xC7"), /* 外壁 */
STAGE_ENTRY("Oside", "Oside", BACKGROUND_TYPE_CLOUDS_WINDY, "BkMoon", "Moon", "0", 0, "Outer Wall", "\x8A\x4F\x95\xC7"), /* 外壁 */
STAGE_ENTRY("Store", "EgEnd2", BACKGROUND_TYPE_BLACK, "bk0", "Eggs1", "0", 0, "Side Room", "\x83\x5E\x83\x7D\x83\x53\x89\xF1\x98\x4C\x82\xCC\x8C\xC2\x8E\xBA"), /* タマゴ回廊の個室 */
STAGE_ENTRY("Store", "Itoh", BACKGROUND_TYPE_MOVE_NEAR, "bkBlue", "Guest", "0", 0, "Storehouse", "\x91\x71\x8C\xC9"), /* 倉庫 */
STAGE_ENTRY("Cent", "Cent", BACKGROUND_TYPE_MOVE_DISTANT, "bkGreen", "Guest", "Cent", 0, "Plantation", "\x91\xE5\x94\x5F\x89\x80"), /* 大農園 */
@ -96,15 +96,15 @@ const STAGE_TABLE gTMT[95] = {
STAGE_ENTRY("Jail", "lounge", BACKGROUND_TYPE_BLACK, "bk0", "Guest", "0", 0, "Rest Area", "\x8B\x78\x8C\x65\x8F\x8A"), /* 休憩所 */
STAGE_ENTRY("Store", "CentW", BACKGROUND_TYPE_BLACK, "bk0", "Guest", "Cent", 0, "Teleporter", "\x93\x5D\x91\x97\x8E\xBA"), /* 転送室 */
STAGE_ENTRY("Store", "Jail2", BACKGROUND_TYPE_BLACK, "bk0", "Guest", "Cent", 0, "Jail No. 2", "\x91\xE6\x82\x51\x98\x53"), /* 第２牢 */
STAGE_ENTRY("White", "Blcny1", BACKGROUND_TYPE_OUTSIDE, "BkFog", "Ravil", "Heri", 0, "Balcony", "\x83\x6F\x83\x8B\x83\x52\x83\x6A\x81\x5B"), /* バルコニー */
STAGE_ENTRY("White", "Blcny1", BACKGROUND_TYPE_CLOUDS, "BkFog", "Ravil", "Heri", 0, "Balcony", "\x83\x6F\x83\x8B\x83\x52\x83\x6A\x81\x5B"), /* バルコニー */
STAGE_ENTRY("Jail", "Priso1", BACKGROUND_TYPE_BLACK, "BkGray", "Red", "0", 0, "Final Cave", "\x8D\xC5\x8C\xE3\x82\xCC\x93\xB4\x8C\x41"), /* 最後の洞窟 */
STAGE_ENTRY("White", "Ring1", BACKGROUND_TYPE_OUTSIDE, "BkFog", "Guest", "Miza", 0, "Throne Room", "\x89\xA4\x82\xCC\x8B\xCA\x8D\xC0"), /* 王の玉座 */
STAGE_ENTRY("White", "Ring2", BACKGROUND_TYPE_OUTSIDE, "BkFog", "Guest", "Dr", 0, "The King's Table", "\x89\xA4\x82\xCC\x90\x48\x91\xEC"), /* 王の食卓 */
STAGE_ENTRY("White", "Ring1", BACKGROUND_TYPE_CLOUDS, "BkFog", "Guest", "Miza", 0, "Throne Room", "\x89\xA4\x82\xCC\x8B\xCA\x8D\xC0"), /* 王の玉座 */
STAGE_ENTRY("White", "Ring2", BACKGROUND_TYPE_CLOUDS, "BkFog", "Guest", "Dr", 0, "The King's Table", "\x89\xA4\x82\xCC\x90\x48\x91\xEC"), /* 王の食卓 */
STAGE_ENTRY("Pens", "Prefa1", BACKGROUND_TYPE_BLACK, "Bk0", "0", "0", 0, "Prefab Building", "\x83\x76\x83\x8C\x83\x6E\x83\x75"), /* プレハブ */
STAGE_ENTRY("Jail", "Priso2", BACKGROUND_TYPE_BLACK, "BkGray", "Red", "0", 0, "Last Cave (Hidden)", "\x8D\xC5\x8C\xE3\x82\xCC\x93\xB4\x8C\x41\x81\x45\x97\xA0"), /* 最後の洞窟・裏 */
STAGE_ENTRY("White", "Ring3", BACKGROUND_TYPE_BLACK, "Bk0", "Miza", "Almo2", 7, "Black Space", "\x8D\x95\x82\xA2\x8D\x4C\x8A\xD4"), /* 黒い広間 */
STAGE_ENTRY("Pens", "Little", BACKGROUND_TYPE_MOVE_NEAR, "BkBlue", "Guest", "0", 0, "Little House", "\x83\x8A\x83\x67\x83\x8B\x89\xC6"), /* リトル家 */
STAGE_ENTRY("White", "Blcny2", BACKGROUND_TYPE_OUTSIDE, "BkFog", "Ravil", "Heri", 0, "Balcony", "\x83\x6F\x83\x8B\x83\x52\x83\x6A\x81\x5B"), /* バルコニー */
STAGE_ENTRY("White", "Blcny2", BACKGROUND_TYPE_CLOUDS, "BkFog", "Ravil", "Heri", 0, "Balcony", "\x83\x6F\x83\x8B\x83\x52\x83\x6A\x81\x5B"), /* バルコニー */
STAGE_ENTRY("Fall", "Fall", BACKGROUND_TYPE_MOVE_DISTANT, "BkFall", "Guest", "Heri", 0, "Fall", "\x97\x8E\x89\xBA"), /* 落下 */
STAGE_ENTRY("White", "Kings", BACKGROUND_TYPE_BLACK, "Bk0", "Kings", "0", 0, "u", "\x75"), /* u */
STAGE_ENTRY("Pens", "Pixel", BACKGROUND_TYPE_MOVE_DISTANT, "BkBlue", "Guest", "0", 0, "Waterway Cabin", "\x90\x85\x98\x48\x82\xCC\x8F\xAC\x95\x94\x89\xAE"), /* 水路の小部屋 */
@ -122,13 +122,13 @@ const STAGE_TABLE gTMT[95] = {
STAGE_ENTRY("Hell", "Hell42", BACKGROUND_TYPE_BLACK, "bk0", "Hell", "Press", 8, "Passage?", "\x92\xCA\x98\x48\x81\x48"), /* 通路？ */
STAGE_ENTRY("Hell", "Statue", BACKGROUND_TYPE_MOVE_DISTANT, "bkBlue", "0", "Cent", 0, "Statue Chamber", "\x90\xCE\x91\x9C\x82\xCC\x8A\xD4"), /* 石像の間 */
STAGE_ENTRY("Hell", "Ballo1", BACKGROUND_TYPE_MOVE_NEAR, "bkBlue", "Priest", "Ballos", 9, "Seal Chamber", "\x95\x95\x88\xF3\x82\xCC\x8A\xD4"), /* 封印の間 */
STAGE_ENTRY("White", "Ostep", BACKGROUND_TYPE_OUTSIDE, "BkFog", "0", "0", 0, "Corridor", "\x82\xED\x82\xBD\x82\xE8\x98\x4C\x89\xBA"), /* わたり廊下 */
STAGE_ENTRY("White", "Ostep", BACKGROUND_TYPE_CLOUDS, "BkFog", "0", "0", 0, "Corridor", "\x82\xED\x82\xBD\x82\xE8\x98\x4C\x89\xBA"), /* わたり廊下 */
STAGE_ENTRY("Labo", "e_Labo", BACKGROUND_TYPE_BLACK, "bk0", "Guest", "0", 0, "", ""),
STAGE_ENTRY("Cave", "Pole", BACKGROUND_TYPE_BLACK, "bk0", "Guest", "0", 0, "Hermit Gunsmith", "\x82\xCD\x82\xAE\x82\xEA\x8F\x65\x92\x62\x96\xE8"), /* はぐれ銃鍛冶 */
STAGE_ENTRY("0", "Island", BACKGROUND_TYPE_BLACK, "bk0", "Island", "0", 0, "", ""),
STAGE_ENTRY("Hell", "Ballo2", BACKGROUND_TYPE_MOVE_NEAR, "bkBlue", "Priest", "Bllg", 9, "Seal Chamber", "\x95\x95\x88\xF3\x82\xCC\x8A\xD4"), /* 封印の間 */
STAGE_ENTRY("White", "e_Blcn", BACKGROUND_TYPE_OUTSIDE, "BkFog", "Miza", "0", 9, "", ""),
STAGE_ENTRY("Oside", "Clock", BACKGROUND_TYPE_OUTSIDE_WITH_WIND, "BkMoon", "Moon", "0", 0, "Clock Room", "\x8E\x9E\x8C\x76\x89\xAE"), /* 時計屋 */
STAGE_ENTRY("White", "e_Blcn", BACKGROUND_TYPE_CLOUDS, "BkFog", "Miza", "0", 9, "", ""),
STAGE_ENTRY("Oside", "Clock", BACKGROUND_TYPE_CLOUDS_WINDY, "BkMoon", "Moon", "0", 0, "Clock Room", "\x8E\x9E\x8C\x76\x89\xAE"), /* 時計屋 */
};
BOOL TransferStage(int no, int w, int x, int y)