diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
| commit | 794410352fd92ccf06974763e4b3be0b807641ab (patch) | |
| tree | 05f5dd861966762db9556082229cee82e8b5eed9 /home/text.asm | |
| parent | 9c5473e965520f672640daf4ee76622640e0de15 (diff) | |
| parent | 4bcd71e3227181baa536357af3d87a8d02af3890 (diff) | |
Merge pull request #328 from PikalaxALT/master
Split out most of main.asm
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/text.asm b/home/text.asm index d400ddd66..37208af9d 100644 --- a/home/text.asm +++ b/home/text.asm @@ -192,7 +192,7 @@ SetUpTextBox:: ; 106c push hl call SpeechTextBox call UpdateSprites - call Function321c + call ApplyTilemap pop hl ret ; 1078 @@ -714,7 +714,7 @@ FarString:: ; 13d4 ret ; 13e0 -Function13e0:: ; 13e0 +PokeFluteTerminatorCharacter:: ; 13e0 ld hl, .stop ret @@ -880,10 +880,10 @@ Text_TX_MOVE:: ; 1480 ; [$03][addr] ld a, [hli] - ld [wd0e4 + 2], a + ld [wMenuScrollPosition + 2], a ld c, a ld a, [hli] - ld [wd0e4 + 2 + 1], a + ld [wMenuScrollPosition + 2 + 1], a ld b, a ret ; 148b |