ref: 7b1661dcf972717bdc787f7e5f44717a7239afaa
parent: 4caa023347881c710d8d242b64ff09880176225f
parent: b311888a12236747f1e6e9f1f011178225d8405f
author: Clownacy <Clownacy@users.noreply.github.com>
date: Thu Sep 3 20:58:26 EDT 2020
Merge branch 'accurate' into portable
--- a/src/Bullet.cpp
+++ b/src/Bullet.cpp
@@ -102,7 +102,7 @@
}
}
-BULLET_TABLE gBulTbl[46] = {+BULLET_TABLE gBulTbl[] = {// Null
{0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0}},// Snake
--- a/src/Caret.cpp
+++ b/src/Caret.cpp
@@ -38,7 +38,7 @@
CARET gCrt[CARET_MAX];
// Sprite offsets
-CARET_TABLE gCaretTable[18] = {+CARET_TABLE gCaretTable[] = { {0, 0}, // CARET_NULL { 4 * 0x200, 4 * 0x200}, // CARET_BUBBLE { 8 * 0x200, 8 * 0x200}, // CARET_PROJECTILE_DISSIPATION--- a/src/MapName.cpp
+++ b/src/MapName.cpp
@@ -15,7 +15,7 @@
int a;
// Handle "Studio Pixel presents" text in the intro, using an obfuscated string
- unsigned char presentText[24] = {+ unsigned char presentText[] = {#ifdef JAPANESE
// "開発室Pixel presents"
0x8A - 1, // 開
--- a/src/NpcTbl.cpp
+++ b/src/NpcTbl.cpp
@@ -11,7 +11,7 @@
#include "NpcAct.h"
// Npc function table
-const NPCFUNCTION gpNpcFuncTbl[361] = {+const NPCFUNCTION gpNpcFuncTbl[] = {ActNpc000,
ActNpc001,
ActNpc002,
--- a/src/Stage.cpp
+++ b/src/Stage.cpp
@@ -30,7 +30,7 @@
unsigned int gOldPos;
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("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"), /* タマゴ回廊 */@@ -203,7 +203,7 @@
}
// Music
-const char* const gMusicTable[42] = {+const char* const gMusicTable[] = {"XXXX",
"WANPAKU",
"ANZEN",
--
⑨