Disable newline if text overflows; revert who/which window width

This is a problem because the game doesn't do auto newlines lazily; that
is, it will greedily scroll the text box on overflow, even if there's
nothing left to be printed.

This behaviour causes a problem when displaying "Which?" in the Equip
screens, because the width of that string is exactly the width of the
window. Because the window is only one line tall, the game was scrolling
down and the string would get erased.

Previously this was worked around by increasing the width of the window,
but recently I have found that it looks weird with the Goods window open.
So this is a slightly different workaround. I don't think we ever wanted
auto-newline-on-overflow _anyway_ since we're putting manual linebreaks
everywhere. Hopefully this doesn't cause problems.
This commit is contained in:
jeffman 2017-04-06 01:38:59 -04:00
parent 4337d2e266
commit 83f88e7f17
1 changed files with 3 additions and 4 deletions

View File

@ -215,10 +215,6 @@ b 0x80C4C58
.org 0x80C4E68 :: nop
.org 0x80C4E76 :: nop
// Widen the who/where/etc window
.org 0x80B77B4 :: mov r3,5
.org 0x80BA9E2 :: mov r3,5
//---------------------------------------------------------
// C4B2C hacks (Equip window loop)
//---------------------------------------------------------
@ -249,6 +245,9 @@ bl c980c_resetx_newline
.org 0x80CA274 :: bl c980c_resetx_other4
.org 0x80CA30E :: bl c980c_resetx_newline
// Disable newline if the text overflows
.org 0x80CA2FA :: nop
// Custom codes check
.org 0x80CA2BC
bl c980c_custom_codes