diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
| commit | 286c160c27e58caad32f776cec684eb8cb2cb22a (patch) | |
| tree | d89563a88a9674837896d6e88b9c9431b708bf97 /engine/menu/naming_screen.asm | |
| parent | c8a5720cca08631dcc20d036731e261a09a9a76e (diff) | |
| parent | 188ac8a9b4816dd98df0108314e58885c3b07452 (diff) | |
Merge branch 'master' of https://github.com/yenatch/pokered
Conflicts:
engine/battle/1c.asm
Diffstat (limited to 'engine/menu/naming_screen.asm')
| -rwxr-xr-x | engine/menu/naming_screen.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index bfafe778..26e7227f 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -325,7 +325,7 @@ DisplayNamingScreen: ; 6596 (1:6596) LoadEDTile: ; 675b (1:675b) ld de, ED_Tile - ld hl, $8f00 + ld hl, vFont + $700 ld bc, $1 jp CopyVideoDataDouble |