From b7ec1a02735bcd95a59650900a9d4625aa4d6171 Mon Sep 17 00:00:00 2001 From: arookas Date: Mon, 22 Feb 2016 21:05:02 -0500 Subject: [PATCH] Updated const definitions --- stdlib/common.sun | 6 ++-- stdlib/sound.sun | 92 +++++++++++++++++++++++------------------------ stdlib/system.sun | 14 ++++---- stdlib/talk.sun | 12 +++---- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/stdlib/common.sun b/stdlib/common.sun index 7a62ee8..5e1a153 100644 --- a/stdlib/common.sun +++ b/stdlib/common.sun @@ -10,9 +10,9 @@ builtin const int(x); builtin const float(x); builtin const typeof(x); -const TYPE_INT = 0; -const TYPE_FLOAT = 1; -const TYPE_STRING = 2; +var const TYPE_INT = 0; +var const TYPE_FLOAT = 1; +var const TYPE_STRING = 2; // debug builtin dump(); diff --git a/stdlib/sound.sun b/stdlib/sound.sun index 2ae4539..9302590 100644 --- a/stdlib/sound.sun +++ b/stdlib/sound.sun @@ -15,49 +15,49 @@ builtin startMontemanBGM(); builtin startMontemanFanfare(); // [arookas] these are from mSound.asn -const MSD_BGM_DOLPIC = 0x80010001; -const MSD_BGM_BIANCO = 0x80010002; -const MSD_BGM_MAMMA = 0x80010003; -const MSD_BGM_PINNAPACO_SEA = 0x80010004; -const MSD_BGM_PINNAPACO = 0x80010005; -const MSD_BGM_MARE_SEA = 0x80010006; -const MSD_BGM_MONTEVILLAGE = 0x80010007; -const MSD_BGM_SHILENA = 0x80010008; -const MSD_BGM_RICCO = 0x80010009; -const MSD_BGM_GET_SHINE = 0x8001000A; -const MSD_BGM_CHUBOSS = 0x8001000B; -const MSD_BGM_MISS = 0x8001000C; -const MSD_BGM_BOSS = 0x8001000D; -const MSD_BGM_MAP_SELECT = 0x8001000E; -const MSD_BGM_BOSSPAKU_DEMO = 0x8001000F; -const MSD_BGM_MAIN_TITLE = 0x80010010; -const MSD_BGM_CHUBOSS2 = 0x80010011; -const MSD_BGM_EXTRA = 0x80010012; -const MSD_BGM_DELFINO = 0x80010013; -const MSD_BGM_MAREVILLAGE = 0x80010014; -const MSD_BGM_CORONA = 0x80010015; -const MSD_BGM_KAGEMARIO = 0x80010016; -const MSD_BGM_CAMERA = 0x80010017; -const MSD_BGM_MONTE_ONSEN = 0x80010018; -const MSD_BGM_MECHAKUPPA = 0x80010019; -const MSD_BGM_AIRPORT = 0x8001001A; -const MSD_BGM_UNDERGROUND = 0x8001001B; -const MSD_BGM_TITLEBACK = 0x8001001C; -const MSD_BGM_MONTE_NIGHT = 0x8001001D; -const MSD_BGM_CASINO = 0x8001001E; -const MSD_BGM_EVENT = 0x8001001F; -const MSD_BGM_TIME_IVENT = 0x80010020; -const MSD_BGM_SKY_AND_SEA = 0x80010021; -const MSD_BGM_MONTE_RESCUE = 0x80010022; -const MSD_BGM_MERRY_GO_ROUND = 0x80010023; -const MSD_BGM_SCENARIO_SELECT = 0x80010024; -const MSD_BGM_FANFARE_CASINO = 0x80010025; -const MSD_BGM_FANFARE_RACE = 0x80010026; -const MSD_BGM_CAMERA_KAGE = 0x80010027; -const MSD_BGM_GAMEOVER = 0x80010028; -const MSD_BGM_BOSSHANA_2ND3RD = 0x80010029; -const MSD_BGM_BOSSGESO_2DN3RD = 0x8001002A; -const MSD_BGM_CHUBOSS_MANTA = 0x8001002B; -const MSD_BGM_MONTE_LAST = 0x8001002C; -const MSD_BGM_SHINE_APPEAR = 0x8001002D; -const MSD_BGM_KUPPA = 0x8001002E; +var const MSD_BGM_DOLPIC = 0x80010001; +var const MSD_BGM_BIANCO = 0x80010002; +var const MSD_BGM_MAMMA = 0x80010003; +var const MSD_BGM_PINNAPACO_SEA = 0x80010004; +var const MSD_BGM_PINNAPACO = 0x80010005; +var const MSD_BGM_MARE_SEA = 0x80010006; +var const MSD_BGM_MONTEVILLAGE = 0x80010007; +var const MSD_BGM_SHILENA = 0x80010008; +var const MSD_BGM_RICCO = 0x80010009; +var const MSD_BGM_GET_SHINE = 0x8001000A; +var const MSD_BGM_CHUBOSS = 0x8001000B; +var const MSD_BGM_MISS = 0x8001000C; +var const MSD_BGM_BOSS = 0x8001000D; +var const MSD_BGM_MAP_SELECT = 0x8001000E; +var const MSD_BGM_BOSSPAKU_DEMO = 0x8001000F; +var const MSD_BGM_MAIN_TITLE = 0x80010010; +var const MSD_BGM_CHUBOSS2 = 0x80010011; +var const MSD_BGM_EXTRA = 0x80010012; +var const MSD_BGM_DELFINO = 0x80010013; +var const MSD_BGM_MAREVILLAGE = 0x80010014; +var const MSD_BGM_CORONA = 0x80010015; +var const MSD_BGM_KAGEMARIO = 0x80010016; +var const MSD_BGM_CAMERA = 0x80010017; +var const MSD_BGM_MONTE_ONSEN = 0x80010018; +var const MSD_BGM_MECHAKUPPA = 0x80010019; +var const MSD_BGM_AIRPORT = 0x8001001A; +var const MSD_BGM_UNDERGROUND = 0x8001001B; +var const MSD_BGM_TITLEBACK = 0x8001001C; +var const MSD_BGM_MONTE_NIGHT = 0x8001001D; +var const MSD_BGM_CASINO = 0x8001001E; +var const MSD_BGM_EVENT = 0x8001001F; +var const MSD_BGM_TIME_IVENT = 0x80010020; +var const MSD_BGM_SKY_AND_SEA = 0x80010021; +var const MSD_BGM_MONTE_RESCUE = 0x80010022; +var const MSD_BGM_MERRY_GO_ROUND = 0x80010023; +var const MSD_BGM_SCENARIO_SELECT = 0x80010024; +var const MSD_BGM_FANFARE_CASINO = 0x80010025; +var const MSD_BGM_FANFARE_RACE = 0x80010026; +var const MSD_BGM_CAMERA_KAGE = 0x80010027; +var const MSD_BGM_GAMEOVER = 0x80010028; +var const MSD_BGM_BOSSHANA_2ND3RD = 0x80010029; +var const MSD_BGM_BOSSGESO_2DN3RD = 0x8001002A; +var const MSD_BGM_CHUBOSS_MANTA = 0x8001002B; +var const MSD_BGM_MONTE_LAST = 0x8001002C; +var const MSD_BGM_SHINE_APPEAR = 0x8001002D; +var const MSD_BGM_KUPPA = 0x8001002E; diff --git a/stdlib/system.sun b/stdlib/system.sun index e93181f..37a5953 100644 --- a/stdlib/system.sun +++ b/stdlib/system.sun @@ -10,19 +10,19 @@ // ================================================= \\ // known flags here -const SYS_SHINEGET = 0x10000; // add shine num to this +var const SYS_SHINEGET = 0x10000; // add shine num to this -const SYS_MARIOLIVES = 0x20001; +var const SYS_MARIOLIVES = 0x20001; -const SYS_SHINENUM = 0x40000; -const SYS_BLUECOINNUM = 0x40001; -const SYS_GOLDCOINNUM = 0x40002; +var const SYS_SHINENUM = 0x40000; +var const SYS_BLUECOINNUM = 0x40001; +var const SYS_GOLDCOINNUM = 0x40002; builtin getSystemFlag(flag); builtin setSystemFlag(flag, value); -function setOnSystemFlag(flag) { setSystemFlag(flag, true); } -function setOffSystemFlag(flag) { setSystemFlag(flag, false); } +function setOnSystemFlag(flag) { setSystemFlag(flag, true); } +function setOffSystemFlag(flag) { setSystemFlag(flag, false); } // [arookas] custom utility function incSystemFlag(flag) { diff --git a/stdlib/talk.sun b/stdlib/talk.sun index 30f7724..1c18e0d 100644 --- a/stdlib/talk.sun +++ b/stdlib/talk.sun @@ -10,8 +10,8 @@ // ================================================= \\ // flags -const TALKF_WAIT = 0; -const TALKF_CLOSE = (1 << 0); +var const TALKF_WAIT = 0; +var const TALKF_CLOSE = (1 << 0); // builtins builtin getTalkMode(); @@ -62,8 +62,8 @@ function talk(msgID, flags) { } } -function talkAndWait(msgID) { talk(msgID, TALKF_WAIT); } -function talkAndClose(msgID) { talk(msgID, TALKF_CLOSE); } +function talkAndWait(msgID) { talk(msgID, TALKF_WAIT); } +function talkAndClose(msgID) { talk(msgID, TALKF_CLOSE); } // ================================================= \\ // SELECT @@ -89,8 +89,8 @@ function select(msgID, flags) { return getTalkSelectedValue(); } -function talkAndSelect(msgID) { return select(msgID, TALKF_WAIT); } -function talkAndSelectClose(msgID) { return select(msgID, TALKF_CLOSE); } +function talkAndSelect(msgID) { return select(msgID, TALKF_WAIT); } +function talkAndSelectClose(msgID) { return select(msgID, TALKF_CLOSE); } // ================================================= \\ // FORCE