diff --git a/src/constants/text_constants.asm b/src/constants/text_constants.asm index fc0b8197..c212e1c9 100644 --- a/src/constants/text_constants.asm +++ b/src/constants/text_constants.asm @@ -50,3 +50,7 @@ DEF TX_CTRL_END EQU $10 ; wFontWidth constants DEF FULL_WIDTH EQU $0 DEF HALF_WIDTH EQU $1 ; non-0 + +; wLineSeparation constants +DEF DOUBLE_SPACED EQU 0 +DEF SINGLE_SPACED EQU 1 ; non-0 diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index ebd3a3d8..7aef788a 100644 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -1300,7 +1300,7 @@ Func_80baa: Func_80c64: ; unreferenced ld a, [wLineSeparation] push af - ld a, $01 ; text isn't double-spaced + ld a, SINGLE_SPACED ld [wLineSeparation], a ; load opponent's name ld a, [wOpponentName] diff --git a/src/engine/challenge_machine.asm b/src/engine/challenge_machine.asm index 7110c626..4a584253 100644 --- a/src/engine/challenge_machine.asm +++ b/src/engine/challenge_machine.asm @@ -15,7 +15,7 @@ ChallengeMachine_Reset: ; if a challenge is already in progress, then resume ; otherwise, start a new 5 round challenge ChallengeMachine_Start:: - ld a, 0 ; text is double-spaced + ld a, DOUBLE_SPACED ld [wLineSeparation], a call LoadConsolePaletteData call ChallengeMachine_Initialize diff --git a/src/engine/duel/core.asm b/src/engine/duel/core.asm index 2472399a..9b425da4 100644 --- a/src/engine/duel/core.asm +++ b/src/engine/duel/core.asm @@ -4765,7 +4765,7 @@ LargeCardTileData: ; print lines of text with no separation between them SetNoLineSeparation: - ld a, $01 ; text isn't double-spaced + ld a, SINGLE_SPACED ; fallthrough SetLineSeparation: @@ -4774,7 +4774,7 @@ SetLineSeparation: ; separate lines of text by an empty line SetOneLineSeparation: - xor a ; text is double-spaced + xor a ; DOUBLE_SPACED jr SetLineSeparation ; given a number in hl, print it divided by 10 at b,c, with decimal part diff --git a/src/engine/menus/config.asm b/src/engine/menus/config.asm index 8ce1280c..b20950c1 100644 --- a/src/engine/menus/config.asm +++ b/src/engine/menus/config.asm @@ -5,7 +5,7 @@ _PauseMenu_Config: push af xor a ld [wConfigExitSettingsCursorPos], a - ld a, $01 ; text isn't double-spaced + ld a, SINGLE_SPACED ld [wLineSeparation], a call InitMenuScreen lb de, 0, 3 diff --git a/src/engine/menus/debug_main.asm b/src/engine/menus/debug_main.asm index 6ec0e553..9e7f9e03 100644 --- a/src/engine/menus/debug_main.asm +++ b/src/engine/menus/debug_main.asm @@ -15,7 +15,7 @@ Func_12661: call SetupText call EnableAndClearSpriteAnimations call Func_12871 - ld a, $01 ; text isn't double-spaced + ld a, SINGLE_SPACED ld [wLineSeparation], a ld a, [wDebugMenuSelection] ld hl, Unknown_128f7 @@ -29,7 +29,7 @@ Func_12661: bit 7, a jr nz, .asm_12698 ld [wDebugMenuSelection], a - xor a ; text is double-spaced + xor a ; DOUBLE_SPACED ld [wLineSeparation], a call Func_126b3 jr c, .asm_1266d diff --git a/src/engine/menus/deck_machine.asm b/src/engine/menus/deck_machine.asm index 238553e3..559ec754 100644 --- a/src/engine/menus/deck_machine.asm +++ b/src/engine/menus/deck_machine.asm @@ -183,10 +183,10 @@ GiftCenter_SendCard: lb de, 1, 3 call InitTextPrinting ldtx hl, CardSendingProceduresText - ld a, $01 ; text isn't double-spaced + ld a, SINGLE_SPACED ld [wLineSeparation], a call ProcessTextFromID - xor a ; text is double-spaced + xor a ; DOUBLE_SPACED ld [wLineSeparation], a ldtx hl, PleaseReadTheProceduresForSendingCardsText call DrawWideTextBox_WaitForInput diff --git a/src/engine/menus/glossary.asm b/src/engine/menus/glossary.asm index 03191416..c3d17db8 100644 --- a/src/engine/menus/glossary.asm +++ b/src/engine/menus/glossary.asm @@ -173,10 +173,10 @@ OpenGlossaryScreen: ld a, [hli] ld h, [hl] ld l, a - ld a, $01 ; text isn't double-spaced + ld a, SINGLE_SPACED ld [wLineSeparation], a call ProcessTextFromID - xor a ; text is double-spaced + xor a ; DOUBLE_SPACED ld [wLineSeparation], a call EnableLCD .loop diff --git a/src/engine/menus/start.asm b/src/engine/menus/start.asm index 3e8a8379..c0c7dd5d 100644 --- a/src/engine/menus/start.asm +++ b/src/engine/menus/start.asm @@ -109,7 +109,7 @@ HandleStartMenu: lb de, $30, $8f call SetupText call EnableAndClearSpriteAnimations - xor a ; text is double-spaced + xor a ; DOUBLE_SPACED ld [wLineSeparation], a call .DrawPlayerPortrait call .SetStartMenuParams diff --git a/src/engine/overworld/overworld.asm b/src/engine/overworld/overworld.asm index 01cffbb4..552f699b 100644 --- a/src/engine/overworld/overworld.asm +++ b/src/engine/overworld/overworld.asm @@ -16,7 +16,7 @@ LoadMap:: ld [wTileMapFill], a call LoadSymbolsFont call Set_OBJ_8x8 - xor a ; text is double-spaced + xor a ; DOUBLE_SPACED ld [wLineSeparation], a xor a ld [wd291], a diff --git a/src/engine/sequences/credits_sequence_commands.asm b/src/engine/sequences/credits_sequence_commands.asm index 62f1201a..f3b76f9b 100644 --- a/src/engine/sequences/credits_sequence_commands.asm +++ b/src/engine/sequences/credits_sequence_commands.asm @@ -326,7 +326,7 @@ CreditsSequenceCmd_DrawRectangle: jp AdvanceCreditsSequenceCmdPtrBy4 CreditsSequenceCmd_PrintText: - ld a, $01 ; text isn't double-spaced + ld a, SINGLE_SPACED ld [wLineSeparation], a push de ld d, c @@ -339,7 +339,7 @@ CreditsSequenceCmd_PrintText: jp AdvanceCreditsSequenceCmdPtrBy6 CreditsSequenceCmd_PrintTextBox: - ld a, $01 ; text isn't double-spaced + ld a, SINGLE_SPACED ld [wLineSeparation], a push de ld d, c diff --git a/src/home/process_text.asm b/src/home/process_text.asm index a981fc14..a5d307dd 100644 --- a/src/home/process_text.asm +++ b/src/home/process_text.asm @@ -111,7 +111,7 @@ ProcessSpecialTextCharacter:: call TerminateHalfWidthText ld a, [wLineSeparation] or a - call z, .next_line + call z, .next_line ; extra line if DOUBLE_SPACED .next_line xor a ldh [hTextLineCurPos], a diff --git a/src/wram.asm b/src/wram.asm index 391f5a2a..9d3dd165 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -882,7 +882,8 @@ wTilePatternSelector:: ; cd06 wTilePatternSelectorCorrection:: ; cd07 ds $1 -; if 0, text lines are separated by a blank line +; if 0 (DOUBLE_SPACED), text lines are separated by a blank line +; uses constants DOUBLE_SPACED and SINGLE_SPACED wLineSeparation:: ; cd08 ds $1