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

Merge branch 'accurate' into portable

Browse source
This commit is contained in:
Clownacy 2020-09-04 00:58:26 +01:00
commit 7b1661dcf9
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Bullet.cpp
View file

@ -102,7 +102,7 @@ void PutBullet(int fx, int fy)
} }
} }
BULLET_TABLE gBulTbl[46] = { BULLET_TABLE gBulTbl[] = {
// Null // Null
{0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0}}, {0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0}},
// Snake // Snake

2
src/Caret.cpp
View file

@ -38,7 +38,7 @@ struct CARET_TABLE
CARET gCrt[CARET_MAX]; CARET gCrt[CARET_MAX];
// Sprite offsets // Sprite offsets
CARET_TABLE gCaretTable[18] = { CARET_TABLE gCaretTable[] = {
{0, 0}, // CARET_NULL {0, 0}, // CARET_NULL
{ 4 * 0x200, 4 * 0x200}, // CARET_BUBBLE { 4 * 0x200, 4 * 0x200}, // CARET_BUBBLE
{ 8 * 0x200, 8 * 0x200}, // CARET_PROJECTILE_DISSIPATION { 8 * 0x200, 8 * 0x200}, // CARET_PROJECTILE_DISSIPATION

2
src/MapName.cpp
View file

@ -15,7 +15,7 @@ void ReadyMapName(const char *str)
int a; int a;
// Handle "Studio Pixel presents" text in the intro, using an obfuscated string // Handle "Studio Pixel presents" text in the intro, using an obfuscated string
unsigned char presentText[24] = { unsigned char presentText[] = {
#ifdef JAPANESE #ifdef JAPANESE
// "開発室Pixel presents" // "開発室Pixel presents"
0x8A - 1, // 開 0x8A - 1, // 開

2
src/NpcTbl.cpp
View file

@ -11,7 +11,7 @@
#include "NpcAct.h" #include "NpcAct.h"
// Npc function table // Npc function table
const NPCFUNCTION gpNpcFuncTbl[361] = { const NPCFUNCTION gpNpcFuncTbl[] = {
ActNpc000, ActNpc000,
ActNpc001, ActNpc001,
ActNpc002, ActNpc002,

4
src/Stage.cpp
View file

@ -30,7 +30,7 @@ MusicID gMusicNo;
unsigned int gOldPos; unsigned int gOldPos;
MusicID gOldNo; MusicID gOldNo;
const STAGE_TABLE gTMT[95] = { const STAGE_TABLE gTMT[] = {
STAGE_ENTRY("0", "0", BACKGROUND_TYPE_BLACK, "bk0", "Guest", "0", 0, "Null", "\x96\xB3"), /* 無 */ STAGE_ENTRY("0", "0", BACKGROUND_TYPE_BLACK, "bk0", "Guest", "0", 0, "Null", "\x96\xB3"), /* 無 */
STAGE_ENTRY("Pens", "Pens1", BACKGROUND_TYPE_MOVE_DISTANT, "bkBlue", "Guest", "0", 0, "Arthur's House", "\x83\x41\x81\x5B\x83\x54\x81\x5B\x82\xCC\x89\xC6"), /* アーサーの家 */ STAGE_ENTRY("Pens", "Pens1", BACKGROUND_TYPE_MOVE_DISTANT, "bkBlue", "Guest", "0", 0, "Arthur's House", "\x83\x41\x81\x5B\x83\x54\x81\x5B\x82\xCC\x89\xC6"), /* アーサーの家 */
STAGE_ENTRY("Eggs", "Eggs", BACKGROUND_TYPE_MOVE_DISTANT, "bkGreen", "Eggs1", "Ravil", 0, "Egg Corridor", "\x83\x5E\x83\x7D\x83\x53\x89\xF1\x98\x4C"), /* タマゴ回廊 */ STAGE_ENTRY("Eggs", "Eggs", BACKGROUND_TYPE_MOVE_DISTANT, "bkGreen", "Eggs1", "Ravil", 0, "Egg Corridor", "\x83\x5E\x83\x7D\x83\x53\x89\xF1\x98\x4C"), /* タマゴ回廊 */
@ -203,7 +203,7 @@ BOOL TransferStage(int no, int w, int x, int y)
} }
// Music // Music
const char* const gMusicTable[42] = { const char* const gMusicTable[] = {
"XXXX", "XXXX",
"WANPAKU", "WANPAKU",
"ANZEN", "ANZEN",