diff options
author | yenatch <yenatch@gmail.com> | 2018-06-30 17:50:33 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-30 17:50:33 -0400 |
commit | 2641f93ad084b1329b3f3b9f7c8c222445fc4832 (patch) | |
tree | fb048bbc8bb7257dbd8169e2442117da5d2b30d2 /home/text.asm | |
parent | 91f914718a263839daef24d44eda857bfc7cca95 (diff) | |
parent | da5125e1411f9599b883181c5ee6e31252d37ac8 (diff) |
Merge pull request #534 from Rangi42/master
[RTM] Fix triple newlines left over from removing address comments, and other improvements
Diffstat (limited to 'home/text.asm')
-rw-r--r-- | home/text.asm | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/home/text.asm b/home/text.asm index ceb249c4e..d74af02af 100644 --- a/home/text.asm +++ b/home/text.asm @@ -19,7 +19,6 @@ FillBoxWithByte:: jr nz, .row ret - ClearTileMap:: ; Fill wTileMap with blank tiles. @@ -34,7 +33,6 @@ ClearTileMap:: ret z jp WaitBGMap - ClearScreen:: ld a, PAL_BG_TEXT hlcoord 0, 0, wAttrMap @@ -42,7 +40,6 @@ ClearScreen:: call ByteFill jr ClearTileMap - TextBox:: ; Draw a text box at hl with room for b lines of c characters each. ; Places a border around the textbox, then switches the palette to the @@ -54,9 +51,7 @@ TextBox:: pop bc jr TextBoxPalette - TextBoxBorder:: - ; Top push hl ld a, "┌" @@ -102,7 +97,6 @@ TextBoxBorder:: jr nz, .loop ret - TextBoxPalette:: ; Fill text box width c height b at hl with pal 7 ld de, wAttrMap - wTileMap @@ -127,7 +121,6 @@ TextBoxPalette:: jr nz, .col ret - SpeechTextBox:: ; Standard textbox. hlcoord TEXTBOX_X, TEXTBOX_Y @@ -144,7 +137,6 @@ RadioTerminator:: ret .stop db "@" - PrintText:: call SetUpTextBox BuenaPrintText:: @@ -167,7 +159,6 @@ SetUpTextBox:: pop hl ret - PlaceString:: push hl @@ -285,14 +276,12 @@ ENDM call PrintLetterDelay jp NextChar - DayOfWeekChar:: ld c, l ld b, h farcall Function17f036 jp PlaceNextChar - print_name: MACRO push de ld de, \1 @@ -318,7 +307,6 @@ PlaceJPRoute: print_name PlaceJPRouteText PlaceWatashi: print_name PlaceWatashiText PlaceKokoWa: print_name PlaceKokoWaText - PlaceMoveTargetsName:: ld a, [hBattleTurn] xor 1 @@ -343,7 +331,6 @@ PlaceMoveUsersName:: ld de, wEnemyMonNick jr PlaceCommandCharacter - PlaceEnemysName:: push de @@ -377,7 +364,6 @@ PlaceEnemysName:: ld de, wOTClassName jr PlaceCommandCharacter - PlaceGenderedPlayerName:: push de ld de, wPlayerName @@ -391,7 +377,6 @@ PlaceGenderedPlayerName:: ld de, ChanSuffixText jr PlaceCommandCharacter - PlaceCommandCharacter:: call PlaceString ld h, b @@ -472,7 +457,6 @@ TextFar:: push hl jp NextChar - LineChar:: pop hl hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY + 2 @@ -502,7 +486,6 @@ Paragraph:: pop de jp NextChar - _ContText:: ld a, [wLinkMode] or a @@ -529,7 +512,6 @@ _ContTextNoPause:: pop de jp NextChar - ContText:: push de ld de, .cont @@ -543,7 +525,6 @@ ContText:: .cont: db "<_CONT>@" - PlaceDexEnd:: ; Ends a Pokédex entry in Gen 1. ; Dex entries are now regular strings. @@ -661,7 +642,6 @@ PokeFluteTerminatorCharacter:: .stop: db "@" - PlaceHLTextAtBC:: ld a, [wTextBoxFlags] push af |