diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /charmap.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'charmap.asm')
| -rw-r--r-- | charmap.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/charmap.asm b/charmap.asm index 283508416..bd5813b00 100644 --- a/charmap.asm +++ b/charmap.asm @@ -7,10 +7,10 @@ charmap "<LNBRK>", $22 charmap "<POKE>", $24 ; "<PO><KE>" charmap "%", $25 ; soft linebreak in landmark names - charmap "<RED>", $38 ; RedsName - charmap "<GREEN>", $39 ; GreensName + charmap "<RED>", $38 ; wRedsName + charmap "<GREEN>", $39 ; wGreensName charmap "<ENEMY>", $3f - charmap "<MOM>", $49 ; MomsName + charmap "<MOM>", $49 ; wMomsName charmap "<PKMN>", $4a ; "<PK><MN>" charmap "<_CONT>", $4b ; implements "<CONT>" charmap "<SCROLL>", $4c @@ -18,8 +18,8 @@ charmap "<LINE>", $4f charmap "@", $50 ; string terminator charmap "<PARA>", $51 - charmap "<PLAYER>", $52 ; PlayerName - charmap "<RIVAL>", $53 ; RivalName + charmap "<PLAYER>", $52 ; wPlayerName + charmap "<RIVAL>", $53 ; wRivalName charmap "#", $54 ; "POKé" charmap "<CONT>", $55 charmap "<……>", $56 ; "……" |