diff options
| author | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
| commit | ca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch) | |
| tree | 209a500e3bda6c2109e5acec60448e9e52f8c2af /home/text.asm | |
| parent | Use more ldpikacry (diff) | |
| parent | Require RGBDS 0.9.3 for its DMG palette specs (#513) (diff) | |
| download | pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/home/text.asm b/home/text.asm index 7c3589fd..6a7b51f4 100644 --- a/home/text.asm +++ b/home/text.asm @@ -285,7 +285,7 @@ _ContTextNoPause:: ; move both rows of text in the normal text box up one row ; always called twice in a row -; first time, copy the two rows of text to the "in between" rows that are usually emtpy +; first time, copy the two rows of text to the "in between" rows that are usually empty ; second time, copy the bottom row of text into the top row of text ScrollTextUpOneLine:: hlcoord 0, 14 ; top row of text @@ -501,7 +501,7 @@ TextCommand_PAUSE:: push bc call Joypad ldh a, [hJoyHeld] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr nz, .done ld c, 30 ; half a second call DelayFrames @@ -577,7 +577,7 @@ TextCommand_DOTS:: call Joypad pop de ldh a, [hJoyHeld] ; joypad state - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr nz, .next ; if so, skip the delay ld c, 10 call DelayFrames @@ -611,7 +611,7 @@ TextCommand_FAR:: ld a, [hli] ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a push hl ld l, e @@ -621,7 +621,7 @@ TextCommand_FAR:: pop af ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a jp NextTextCommand TextCommandJumpTable:: |