diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /home/text.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/home/text.asm b/home/text.asm index 3401eba50..4b0d0d5df 100644 --- a/home/text.asm +++ b/home/text.asm @@ -315,7 +315,7 @@ endm Char15:: ; 117b ld c, l ld b, h - callba Function17f036 + farcall Function17f036 jp PlaceNextChar ; 1186 @@ -391,7 +391,7 @@ PlaceEnemysName:: ; 121b ld de, String12a2 call PlaceString push bc - callab Battle_GetTrainerName + callfar Battle_GetTrainerName pop hl ld de, StringBuffer1 jr PlaceCommandCharacter |