diff options
author | YamaArashi <shadow962@live.com> | 2016-01-28 00:38:12 -0800 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-01-28 00:38:12 -0800 |
commit | f67d25c17c8cc0104bea580e22490b48ffa7b37c (patch) | |
tree | 1330ab3b7d3f8531c4aa3c228254f2f6be884001 | |
parent | fa6dcdd71301bb0f3d1ec66383c3d6caa488b5f8 (diff) |
update charmap
-rw-r--r-- | asm/charmap.s | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/asm/charmap.s b/asm/charmap.s index a268ead96..f0ee45f01 100644 --- a/asm/charmap.s +++ b/asm/charmap.s @@ -255,23 +255,23 @@ .charmapconst PKMN, 0x53, 0x54 .charmapconst POKEBLOCK, 0x55, 0x56, 0x57, 0x58, 0x59 -; string refs +; string placeholders ; unknown (0xFD, 0x00) - .charmapconst PLAYER, 0xFD, 0x01 - .charmapconst STRVAR_1, 0xFD, 0x02 - .charmapconst STRVAR_2, 0xFD, 0x03 - .charmapconst STRVAR_3, 0xFD, 0x04 + .charmapconst PLAYER, 0xFD, 0x01 + .charmapconst STRVAR_1, 0xFD, 0x02 + .charmapconst STRVAR_2, 0xFD, 0x03 + .charmapconst STRVAR_3, 0xFD, 0x04 ; unknown (0xFD, 0x05) - .charmapconst RIVAL, 0xFD, 0x06 -; version-dependent strings (originally made for Ruby/Sapphire differences) - .charmapconst VERSION, 0xFD, 0x07 ; "EMERALD" - .charmapconst AQUA, 0xFD, 0x08 - .charmapconst MAGMA, 0xFD, 0x09 - .charmapconst ARCHIE, 0xFD, 0x0A - .charmapconst MAXIE, 0xFD, 0x0B - .charmapconst KYOGRE, 0xFD, 0x0C - .charmapconst GROUDON, 0xFD, 0x0D + .charmapconst RIVAL, 0xFD, 0x06 +; version-dependent strings + .charmapconst VERSION, 0xFD, 0x07 ; "RUBY" / "SAPPHIRE" + .charmapconst EVIL_TEAM, 0xFD, 0x08 ; "MAGMA" / "AQUA" + .charmapconst GOOD_TEAM, 0xFD, 0x09 ; "AQUA" / "MAGMA" + .charmapconst EVIL_TEAM_LEADER, 0xFD, 0x0A ; "MAXIE" / "ARCHIE" + .charmapconst GOOD_TEAM_LEADER, 0xFD, 0x0B ; "ARCHIE" / "MAXIE" + .charmapconst CUR_VERSION_MASCOT, 0xFD, 0x0C ; "GROUDON" / "KYOGRE" + .charmapconst OPP_VERSION_MASCOT, 0xFD, 0x0D ; "KYOGRE" / "GROUDON" - .charmapconst next, 0xFE - - .charmapescape 'n', 0xFE + .charmapescape 'l', 0xFA ; scroll up window + .charmapescape 'p', 0xFB ; new paragraph + .charmapescape 'n', 0xFE ; new line |