diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /home/print_text.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'home/print_text.asm')
| -rw-r--r-- | home/print_text.asm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/home/print_text.asm b/home/print_text.asm index 66f0b5e01..8a8a7dd9f 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -1,4 +1,4 @@ -PrintLetterDelay:: ; 313d +PrintLetterDelay:: ; Wait before printing the next letter. ; The text speed setting in wOptions is actually a frame count: @@ -79,9 +79,8 @@ PrintLetterDelay:: ; 313d pop de pop hl ret -; 318c -CopyDataUntil:: ; 318c +CopyDataUntil:: ; Copy [hl .. bc) to de. ; In other words, the source data is @@ -98,19 +97,16 @@ CopyDataUntil:: ; 318c cp c jr nz, CopyDataUntil ret -; 0x3198 -PrintNum:: ; 3198 +PrintNum:: homecall _PrintNum ret -; 31a4 -MobilePrintNum:: ; 31a4 +MobilePrintNum:: homecall _MobilePrintNum ret -; 31b0 -FarPrintText:: ; 31b0 +FarPrintText:: ld [hBuffer], a ld a, [hROMBank] push af @@ -122,4 +118,3 @@ FarPrintText:: ; 31b0 pop af rst Bankswitch ret -; 31be |