diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-10-30 12:26:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 12:26:03 -0400 |
| commit | 7a42f1790ae1e9e357593879bd38c6596dcb03da (patch) | |
| tree | dbf4ee19995364f15a3b3f98925f606c50598334 /home/text.asm | |
| parent | a2b6befd7d12b2ad8bb97979a10519500dcdd870 (diff) | |
| parent | 1092983bde65bbf1a27eeabbfbceec1f278a4831 (diff) | |
Merge pull request #776 from Rangi42/unreferenced
Comment, remove, or revise many unreferenced labels
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/home/text.asm b/home/text.asm index d9236a7a7..eb3a58099 100644 --- a/home/text.asm +++ b/home/text.asm @@ -141,12 +141,15 @@ RadioTerminator:: PrintText:: call SetUpTextbox + ; fallthrough + BuenaPrintText:: push hl hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW call ClearBox pop hl + ; fallthrough PrintTextboxText:: bccoord TEXTBOX_INNERX, TEXTBOX_INNERY @@ -163,6 +166,7 @@ SetUpTextbox:: PlaceString:: push hl + ; fallthrough PlaceNextChar:: ld a, [de] @@ -173,7 +177,9 @@ PlaceNextChar:: pop hl ret - pop de ; unused +DummyChar:: ; unreferenced + pop de + ; fallthrough NextChar:: inc de @@ -242,7 +248,7 @@ ENDM dict "ﾞ", .place ; should be .diacritic jr .not_diacritic -.diacritic +.diacritic ; unreferenced ld b, a call Diacritic jp NextChar @@ -250,18 +256,19 @@ ENDM .not_diacritic cp FIRST_REGULAR_TEXT_CHAR jr nc, .place - +; dakuten or handakuten cp "パ" jr nc, .handakuten - -.dakuten +; dakuten cp FIRST_HIRAGANA_DAKUTEN_CHAR jr nc, .hiragana_dakuten +; katakana dakuten add "カ" - "ガ" - jr .katakana_dakuten + jr .place_dakuten + .hiragana_dakuten add "か" - "が" -.katakana_dakuten +.place_dakuten ld b, "ﾞ" ; dakuten call Diacritic jr .place @@ -269,11 +276,13 @@ ENDM .handakuten cp "ぱ" jr nc, .hiragana_handakuten +; katakana handakuten add "ハ" - "パ" - jr .katakana_handakuten + jr .place_handakuten + .hiragana_handakuten add "は" - "ぱ" -.katakana_handakuten +.place_handakuten ld b, "ﾟ" ; handakuten call Diacritic @@ -316,12 +325,13 @@ PlaceKokoWa: print_name PlaceKokoWaText PlaceMoveTargetsName:: ldh a, [hBattleTurn] xor 1 - jr PlaceMoveUsersName.place + jr PlaceBattlersName PlaceMoveUsersName:: ldh a, [hBattleTurn] + ; fallthrough -.place: +PlaceBattlersName: push de and a jr nz, .enemy |