From 946d4c16ebae89eed70bfc3849d785ef5a91f359 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Mon, 28 Jan 2019 17:27:12 +0000 Subject: [PATCH] Merged stage table back into the code --- build/data/stage.tbl | Bin 19000 -> 0 bytes build/data/stage.tbl.jp | Bin 19000 -> 0 bytes src/Game.cpp | 3 +- src/MapName.cpp | 2 +- src/MapName.h | 2 +- src/Stage.cpp | 147 ++++++++++++++++++++++++++++------------ src/Stage.h | 2 - 7 files changed, 106 insertions(+), 50 deletions(-) delete mode 100644 build/data/stage.tbl delete mode 100644 build/data/stage.tbl.jp diff --git a/build/data/stage.tbl b/build/data/stage.tbl deleted file mode 100644 index 3282b582232bb66956037b531d0a7bf5c8cc5e66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19000 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 diff --git a/build/data/stage.tbl.jp b/build/data/stage.tbl.jp deleted file mode 100644 index 0a8310468cd4c5d7c8da0eae8b4f911297ad5762..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19000 zcmdU1TW=dh6do?6@GtlUs6fSg>?BRnxN)6`6c7!YW=V`4Z`nAZ^08*6~cxe$50!jr6eS$}xP%DH$2=ND)@!D~c^?ct*>sXK%ujkCpoNvx$&N(yA z34#AkV6u2r(Wi5`*QrH!p$NvoZ>txte+J$TNolvRfI4aV)1bpcik8SF@{6vyQ*0cv zZ}}xTvHVi7Tl&s0&A{v|#KGtxj#Iwt77Q~8p~paLk#Ux?dE?uPAkWKp|k?9TdXWhV&$mg+vNKcmJv^-P2S=!mp{Jv*~Bkg%GgzJfYY`(Yg?k3#k z1jE5}yBqSLemD3r_%yh;Z}p>(3`aVzHuUIgdo4D8myJPjtY=EMuT7P%?#&u~U~%I3 zoSR2DY~&F?Zhu}5%CffgD1c@Q%LkL*{G#z?Md*orR3}S+RewipQ2R(_6W%2-f{i?w z-Y~k5FDkFQDBqSz6)$#nZA`BQW(Nv0ASvw)j=j7#*sXlsF$ZBdlEpcwSG~b;M$XE9 zS=NzB^~LH+2mP?fYk@R`Roy4Poj2ss$j?p8Fgw@uXFA|-HTA^KE$Tij?npWL3vu%( zmJianq&`!*)zKCkueO)2;}gp{lZ$@-a>qBrMjO8ycMhTR+RggfFV$5eC(K{z zwM-b_wu?(x{g&HDvwo#^4^sw`$u7AlvL7${t}|~2a!ip}y`7CQ?0bbF^AzG(?S6gd z`c2S72quq)UIB;I6TPb5+`4AW1Veai{}^!#Imfh#sv)|8gYF-4QpN3cIRYwi%m(`% zKZgXW{qD3n$8j#0yRkW_eO$Xpq#?v9$DcubGJ3dw;9e7+k3s@L<)Qsm?e)s{fKe;G z0s+?lMX$6@41jfL$^)LOF}<>q2jD@ISPfazkx#Ud2b+W1N25*+!wM@LlVB}Ed0 zpKBa_;C&l;u(h(YkKH=bKQ@P^$Bh%&9CkPyu$p%E0m3WM%0C%(akTF(Et~ML{X^Gx5e}REBYs`!M5>5YBFKgSs^dUI$gLce>&_eDu=uK7#4@K~ABbzH*s50-y09z^XvIdv9d z#KBiiH68A?4IEg*LF$a{;0 zS>Vumf}?z?;*vO#`75ovsLs$09MnGQFV}96a~y_4%L}+&tNJd}D~hA`AUI3xV{$HA z1ZtydmKO?_fuSE)3Y*9c!b2-|{xRhG@NS_{_piz-c7F}rFJbnP_OlBpIna8g&(%;~ zi?c5QGi(fT;1y;1uj>q8sl@TMt>B}z(bb;-A55=Cv&CW_IOebpcf|3oTvhj$%EsSD zX?RQ?jr{{GmW`eFV*eO)@~}|H=wUq(_hNpR?t?ehOQw76EmdRkIIZ>%R2Z_c4>kt2 zF2yNwR81hvKGNAsE)rNMk0Z7ZU5C?mGQe#BRzr5DaE}lN?!)v7zpc*ITFL`H*}1bj zrEfHt2he)OewP~iyw*JZ9);u3H~aRwM;>hSirv4W=O2+-qYdnSyE~<;{?YeZEjIFq zeZRdm8TiB=QwVozJO_@NnssVC3bPODcLDz`67^R)P6Yd)jo)Q{mC@w;peyb5a4%^$Xh4Cgm3 zme?Gcei9f+H*iqB>H-e+JIEsX9}=N`;5d=3H?6~M+^fAG?81DI$s?ii6I8#lIsZ^K zF!+x@8gl?ce`0HEMwnsrWHR?>ma{+e> z_pq@K7MD;Q9oFw~6Z5-i4^a=vb{IhOJ6nt41@(i@8Nu9Y2!ZpWMk*74#(v2#NkOhd}rtU$-D<{ St_#tVdjRVnRF=pM_kRH(&R;tK diff --git a/src/Game.cpp b/src/Game.cpp index 1209e9bb..1a953ed4 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -594,7 +594,7 @@ bool Game() char path[PATH_LENGTH]; sprintf(path, "%s/npc.tbl", gDataPath); - if (LoadNpcTable(path) && InitStageTable()) + if (LoadNpcTable(path)) { InitTextScript2(); InitSkipFlags(); @@ -614,7 +614,6 @@ bool Game() EndMapData(); EndTextScript(); - ReleaseStageTable(); ReleaseNpcTable(); ReleaseCreditScript(); } diff --git a/src/MapName.cpp b/src/MapName.cpp index e8d70e9a..0db417a6 100644 --- a/src/MapName.cpp +++ b/src/MapName.cpp @@ -8,7 +8,7 @@ MAP_NAME gMapName; RECT rc = { 0, 0, 160, 12 }; -void ReadyMapName(char *str) +void ReadyMapName(const char *str) { //Reset map name flags gMapName.flag = 0; diff --git a/src/MapName.h b/src/MapName.h index c9f651c2..ea5e4415 100644 --- a/src/MapName.h +++ b/src/MapName.h @@ -6,7 +6,7 @@ struct MAP_NAME char name[0x20]; }; -void ReadyMapName(char *str); +void ReadyMapName(const char *str); void PutMapName(bool bMini); void StartMapName(); void RestoreMapName(); diff --git a/src/Stage.cpp b/src/Stage.cpp index 05ce86c3..b9e6fe25 100644 --- a/src/Stage.cpp +++ b/src/Stage.cpp @@ -19,52 +19,111 @@ #include "Back.h" #include "Stage.h" -STAGE_TABLE *gTMT; +#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} +#else +#define STAGE_ENTRY(parts, map, bkType, back, npc, boss, boss_no, name_en, name_jp) {parts, map, bkType, back, npc, boss, boss_no, name_en} +#endif + int gStageNo; -//Stage table functions -bool InitStageTable() -{ - //Get path - char path[PATH_LENGTH]; - sprintf(path, "%s/stage.tbl", gDataPath); - - //Open file - SDL_RWops *fp = SDL_RWFromFile(path, "rb"); - - if (!fp) - return false; - - //Get amount of stages and allocate stage data - size_t stages = SDL_RWsize(fp) / 0xC8; - gTMT = (STAGE_TABLE*)calloc(stages, sizeof(STAGE_TABLE)); - - //Read data - for (size_t i = 0; i < stages; i++) - { - SDL_RWread(fp, &gTMT[i].parts, 1, 0x20); - SDL_RWread(fp, &gTMT[i].map, 1, 0x20); - gTMT[i].bkType = SDL_ReadLE32(fp); - SDL_RWread(fp, &gTMT[i].back, 1, 0x20); - SDL_RWread(fp, &gTMT[i].npc, 1, 0x20); - SDL_RWread(fp, &gTMT[i].boss, 1, 0x20); - gTMT[i].boss_no = SDL_ReadU8(fp); - SDL_RWread(fp, &gTMT[i].name, 1, 0x20); - - //Padding (3 bytes) - uint8_t nul[3]; - SDL_RWread(fp, &nul, 1, 3); - } - - SDL_RWclose(fp); - return true; -} - -void ReleaseStageTable() -{ - free(gTMT); - gTMT = nullptr; -} +const STAGE_TABLE gTMT[95] = { + STAGE_ENTRY("0", "0", 4, "bk0", "Guest", "0", 0, "Null", "無"), + STAGE_ENTRY("Pens", "Pens1", 1, "bkBlue", "Guest", "0", 0, "Arthur's House", "アーサーの家"), + STAGE_ENTRY("Eggs", "Eggs", 1, "bkGreen", "Eggs1", "Ravil", 0, "Egg Corridor", "タマゴ回廊"), + STAGE_ENTRY("EggX", "EggX", 4, "bk0", "Eggs1", "0", 0, "Egg No. 00", "タマゴ No.00"), + STAGE_ENTRY("EggIn", "Egg6", 4, "bk0", "Eggs1", "0", 0, "Egg No. 06", "タマゴ No.06"), + STAGE_ENTRY("Store", "EggR", 4, "bk0", "Eggs1", "0", 0, "Egg Observation Room", "タマゴ監視室"), + STAGE_ENTRY("Weed", "Weed", 1, "bkBlue", "Weed", "0", 0, "Grasstown", "クサムラ"), + STAGE_ENTRY("Barr", "Santa", 4, "bk0", "Weed", "0", 0, "Santa's House", "サンタの家"), + STAGE_ENTRY("Barr", "Chako", 1, "bkBlue", "Guest", "0", 0, "Chaco's House", "チャコの家"), + STAGE_ENTRY("Maze", "MazeI", 4, "bk0", "Maze", "0", 0, "Labyrinth I", "迷宮Ｉ"), + STAGE_ENTRY("Sand", "Sand", 1, "bkGreen", "Sand", "Omg", 1, "Sand Zone", "砂区"), + STAGE_ENTRY("Mimi", "Mimi", 1, "bkBlue", "Guest", "0", 0, "Mimiga Village", "ミミガーの村"), + STAGE_ENTRY("Cave", "Cave", 4, "bk0", "Cemet", "0", 0, "First Cave", "最初の洞窟"), + STAGE_ENTRY("Cave", "Start", 4, "bk0", "Cemet", "0", 0, "Start Point", "スタート地点"), + STAGE_ENTRY("Mimi", "Barr", 4, "bk0", "Cemet", "Bllg", 0, "Shack", "バラック小屋"), + STAGE_ENTRY("Mimi", "Pool", 1, "bkBlue", "Guest", "0", 0, "Reservoir", "貯水池"), + STAGE_ENTRY("Mimi", "Cemet", 4, "bk0", "Cemet", "0", 0, "Graveyard", "はかば"), + STAGE_ENTRY("Mimi", "Plant", 1, "bkGreen", "Plant", "0", 0, "Yamashita Farm", "山下農園"), + STAGE_ENTRY("Store", "Shelt", 4, "bk0", "Eggs1", "0", 0, "Shelter", "シェルター"), + STAGE_ENTRY("Pens", "Comu", 1, "bkBlue", "Guest", "0", 0, "Assembly Hall", "集会場"), + STAGE_ENTRY("Mimi", "MiBox", 4, "bk0", "0", "0", 0, "Save Point", "セーブポイント"), + STAGE_ENTRY("Store", "EgEnd1", 4, "bk0", "0", "0", 0, "Side Room", "タマゴ回廊の個室"), + STAGE_ENTRY("Store", "Cthu", 4, "bk0", "0", "0", 0, "Cthulhu's Abode", "クトゥルーの住処"), + STAGE_ENTRY("EggIn", "Egg1", 4, "bk0", "Eggs1", "0", 0, "Egg No. 01", "タマゴ No.01"), + STAGE_ENTRY("Pens", "Pens2", 1, "bkBlue", "Guest", "0", 0, "Arthur's House", "アーサーの家"), + STAGE_ENTRY("Barr", "Malco", 1, "bkBlue", "Weed", "Bllg", 0, "Power Room", "電源室"), + STAGE_ENTRY("Barr", "WeedS", 1, "bkBlue", "0", "0", 0, "Save Point", "セーブポイント"), + STAGE_ENTRY("Store", "WeedD", 1, "bkBlue", "0", "0", 0, "Execution Chamber", "処刑室"), + STAGE_ENTRY("Weed", "Frog", 2, "bkGreen", "Weed", "Frog", 2, "Gum", "ガム"), + STAGE_ENTRY("Sand", "Curly", 4, "bk0", "Sand", "Curly", 0, "Sand Zone Residence", "砂区駐在所"), + STAGE_ENTRY("Pens", "WeedB", 1, "bkBlue", "Ravil", "0", 0, "Grasstown Hut", "クサムラの小屋"), + STAGE_ENTRY("River", "Stream", 5, "bkBlue", "Stream", "IronH", 5, "Main Artery", "大動脈"), + STAGE_ENTRY("Pens", "CurlyS", 4, "bk0", "Sand", "Curly", 0, "Small Room", "小部屋"), + STAGE_ENTRY("Barr", "Jenka1", 4, "bk0", "Sand", "Bllg", 0, "Jenka's House", "ジェンカの家"), + STAGE_ENTRY("Sand", "Dark", 1, "bkBlack", "Sand", "0", 0, "Deserted House", "廃屋"), + STAGE_ENTRY("Gard", "Gard", 1, "bkGard", "Toro", "Bllg", 0, "Sand Zone Storehouse", "砂区倉庫"), + STAGE_ENTRY("Barr", "Jenka2", 4, "bk0", "Sand", "Bllg", 0, "Jenka's House", "ジェンカの家"), + STAGE_ENTRY("Sand", "SandE", 1, "bkGreen", "Sand", "Bllg", 0, "Sand Zone", "砂区"), + STAGE_ENTRY("Maze", "MazeH", 4, "bk0", "Maze", "0", 0, "Labyrinth H", "迷宮Ｈ"), + STAGE_ENTRY("Maze", "MazeW", 1, "bkMaze", "Maze", "X", 3, "Labyrinth W", "迷宮Ｗ"), + STAGE_ENTRY("Maze", "MazeO", 4, "bk0", "Guest", "0", 0, "Camp", "キャンプ"), + STAGE_ENTRY("Maze", "MazeD", 4, "bk0", "Guest", "Dark", 0, "Clinic Ruins", "診療所跡"), + STAGE_ENTRY("Store", "MazeA", 4, "bk0", "Maze", "0", 0, "Labyrinth Shop", "迷宮の店"), + STAGE_ENTRY("Maze", "MazeB", 1, "bkBlue", "Maze", "0", 0, "Labyrinth B", "迷宮Ｂ"), + STAGE_ENTRY("Maze", "MazeS", 2, "bkGray", "Maze", "Bllg", 0, "Boulder Chamber", "大石の塞ぐ所"), + STAGE_ENTRY("Maze", "MazeM", 1, "bkRed", "Maze", "0", 0, "Labyrinth M", "迷宮Ｍ"), + STAGE_ENTRY("Cave", "Drain", 3, "bkWater", "Cemet", "0", 0, "Dark Place", "暗い所"), + STAGE_ENTRY("Almond", "Almond", 3, "bkWater", "Cemet", "Almo1", 4, "Core", "コア"), + STAGE_ENTRY("River", "River", 2, "bkGreen", "Weed", "0", 0, "Waterway", "水路"), + STAGE_ENTRY("Eggs", "Eggs2", 1, "bkGreen", "Eggs2", "0", 0, "Egg Corridor?", "タマゴ回廊？"), + STAGE_ENTRY("Store", "Cthu2", 4, "bk0", "Eggs1", "0", 0, "Cthulhu's Abode?", "クトゥルーの住処？"), + STAGE_ENTRY("Store", "EggR2", 4, "bk0", "Eggs1", "TwinD", 6, "Egg Observation Room?", "タマゴ監視室？"), + STAGE_ENTRY("EggX", "EggX2", 4, "bk0", "Eggs1", "0", 0, "Egg No. 00", "タマゴ No.00"), + STAGE_ENTRY("Oside", "Oside", 6, "bkMoon", "Moon", "0", 0, "Outer Wall", "外壁"), + STAGE_ENTRY("Store", "EgEnd2", 4, "bk0", "Eggs1", "0", 0, "Side Room", "タマゴ回廊の個室"), + STAGE_ENTRY("Store", "Itoh", 2, "bkBlue", "Guest", "0", 0, "Storehouse", "倉庫"), + STAGE_ENTRY("Cent", "Cent", 1, "bkGreen", "Guest", "Cent", 0, "Plantation", "大農園"), + STAGE_ENTRY("Jail", "Jail1", 4, "bk0", "Guest", "Cent", 0, "Jail No. 1", "第１牢"), + STAGE_ENTRY("Jail", "Momo", 4, "bk0", "Guest", "0", 0, "Hideout", "カクレガ"), + STAGE_ENTRY("Jail", "lounge", 4, "bk0", "Guest", "0", 0, "Rest Area", "休憩所"), + STAGE_ENTRY("Store", "CentW", 4, "bk0", "Guest", "Cent", 0, "Teleporter", "転送室"), + STAGE_ENTRY("Store", "Jail2", 4, "bk0", "Guest", "Cent", 0, "Jail No. 2", "第２牢"), + STAGE_ENTRY("White", "Blcny1", 7, "bkFog", "Ravil", "Heri", 0, "Balcony", "バルコニー"), + STAGE_ENTRY("Jail", "Priso1", 4, "bkGray", "Red", "0", 0, "Final Cave", "最後の洞窟"), + STAGE_ENTRY("White", "Ring1", 7, "bkFog", "Guest", "Miza", 0, "Throne Room", "王の玉座"), + STAGE_ENTRY("White", "Ring2", 7, "bkFog", "Guest", "Dr", 0, "The King's Table", "王の食卓"), + STAGE_ENTRY("Pens", "Prefa1", 4, "bk0", "0", "0", 0, "Prefab Building", "プレハブ"), + STAGE_ENTRY("Jail", "Priso2", 4, "bkGray", "Red", "0", 0, "Last Cave (Hidden)", "最後の洞窟・裏"), + STAGE_ENTRY("White", "Ring3", 4, "bk0", "Miza", "Almo2", 7, "Black Space", "黒い広間"), + STAGE_ENTRY("Pens", "Little", 2, "bkBlue", "Guest", "0", 0, "Little House", "リトル家"), + STAGE_ENTRY("White", "Blcny2", 7, "bkFog", "Ravil", "Heri", 0, "Balcony", "バルコニー"), + STAGE_ENTRY("Fall", "Fall", 1, "bkFall", "Guest", "Heri", 0, "Fall", "落下"), + STAGE_ENTRY("White", "Kings", 4, "bk0", "Kings", "0", 0, "u", "u"), + STAGE_ENTRY("Pens", "Pixel", 1, "bkBlue", "Guest", "0", 0, "Waterway Cabin", "水路の小部屋"), + STAGE_ENTRY("Maze", "e_Maze", 1, "bkMaze", "Guest", "Maze", 3, "", ""), + STAGE_ENTRY("Barr", "e_Jenk", 4, "bk0", "Sand", "Bllg", 0, "", ""), + STAGE_ENTRY("Barr", "e_Malc", 1, "bkBlue", "Weed", "Bllg", 0, "", ""), + STAGE_ENTRY("Mimi", "e_Ceme", 4, "bk0", "Plant", "0", 0, "", ""), + STAGE_ENTRY("Fall", "e_Sky", 1, "bkFall", "Guest", "Heri", 0, "", ""), + STAGE_ENTRY("Pens", "Prefa2", 4, "bk0", "0", "0", 0, "Prefab House", "プレハブ"), + STAGE_ENTRY("Hell", "Hell1", 2, "bkRed", "Hell", "0", 0, "Sacred Ground - B1", "聖域地下１階"), + STAGE_ENTRY("Hell", "Hell2", 2, "bkRed", "Hell", "0", 0, "Sacred Ground - B2", "聖域地下２階"), + STAGE_ENTRY("Hell", "Hell3", 1, "bkRed", "Hell", "Press", 8, "Sacred Ground - B3", "聖域地下３階"), + STAGE_ENTRY("Cave", "Mapi", 2, "bk0", "Cemet", "0", 0, "Storage", "物置"), + STAGE_ENTRY("Hell", "Hell4", 4, "bk0", "Hell", "0", 0, "Passage?", "通路？"), + STAGE_ENTRY("Hell", "Hell42", 4, "bk0", "Hell", "Press", 8, "Passage?", "通路？"), + STAGE_ENTRY("Hell", "Statue", 1, "bkBlue", "0", "Cent", 0, "Statue Chamber", "石像の間"), + STAGE_ENTRY("Hell", "Ballo1", 2, "bkBlue", "Priest", "Ballos", 9, "Seal Chamber", "封印の間"), + STAGE_ENTRY("White", "Ostep", 7, "bkFog", "0", "0", 0, "Corridor", "わたり廊下"), + STAGE_ENTRY("Labo", "e_Labo", 4, "bk0", "Guest", "0", 0, "", ""), + STAGE_ENTRY("Cave", "Pole", 4, "bk0", "Guest", "0", 0, "Hermit Gunsmith", "はぐれ銃鍛冶"), + STAGE_ENTRY("0", "Island", 4, "bk0", "Island", "0", 0, "", ""), + STAGE_ENTRY("Hell", "Ballo2", 2, "bkBlue", "Priest", "Bllg", 9, "Seal Chamber", "封印の間"), + STAGE_ENTRY("White", "e_Blcn", 7, "bkFog", "Miza", "0", 9, "", ""), + STAGE_ENTRY("Oside", "Clock", 6, "bkMoon", "Moon", "0", 0, "Clock Room", "時計屋"), +}; bool TransferStage(int no, int w, int x, int y) { diff --git a/src/Stage.h b/src/Stage.h index 2fe80b7e..ded03930 100644 --- a/src/Stage.h +++ b/src/Stage.h @@ -12,8 +12,6 @@ struct STAGE_TABLE char name[0x20]; }; -bool InitStageTable(); -void ReleaseStageTable(); bool TransferStage(int no, int w, int x, int y); void ChangeMusic(int no); void ReCallMusic();