Fix misnamed character codes

Some character codes were erroneously named after their text command
counterparts. This has caused a lot of confusion with naming their
functions and with other things.

I've also removed the `dict2` macro and expanded the `dict` macro. This
really isn't something we should be doing for macros but I can't deny it
looks a lot neater than repeated code.
This commit is contained in:
mid-kid
2018-07-17 23:08:04 +02:00
parent 778d57ba21
commit 1fc7430a2b
8 changed files with 53 additions and 49 deletions

View File

@@ -8578,7 +8578,7 @@ ReadAndPrintLinkBattleRecord:
db " 0 0 0@"
.Format:
db " --- <LNBRK>"
db " --- <LF>"
db " - - -@"
.Record:
db "<PLAYER>'s RECORD@"

View File

@@ -61,20 +61,20 @@ _OptionsMenu:
ret
StringOptions:
db "TEXT SPEED<LNBRK>"
db " :<LNBRK>"
db "BATTLE SCENE<LNBRK>"
db " :<LNBRK>"
db "BATTLE STYLE<LNBRK>"
db " :<LNBRK>"
db "SOUND<LNBRK>"
db " :<LNBRK>"
db "PRINT<LNBRK>"
db " :<LNBRK>"
db "MENU ACCOUNT<LNBRK>"
db " :<LNBRK>"
db "FRAME<LNBRK>"
db " :TYPE<LNBRK>"
db "TEXT SPEED<LF>"
db " :<LF>"
db "BATTLE SCENE<LF>"
db " :<LF>"
db "BATTLE STYLE<LF>"
db " :<LF>"
db "SOUND<LF>"
db " :<LF>"
db "PRINT<LF>"
db " :<LF>"
db "MENU ACCOUNT<LF>"
db " :<LF>"
db "FRAME<LF>"
db " :TYPE<LF>"
db "CANCEL@"
GetOptionPointer:

View File

@@ -5,14 +5,14 @@ TownMap_ConvertLineBreakCharacters:
cp "@"
jr z, .end
cp "%"
jr z, .line_break
jr z, .line_feed
cp "¯"
jr z, .line_break
jr z, .line_feed
inc hl
jr .loop
.line_break
ld [hl], "<LNBRK>"
.line_feed
ld [hl], "<LF>"
.end
ld de, wStringBuffer1