diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:14:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:19:52 -0500 |
| commit | 6b2d0ae841f5a7ff851d462b12f09eac998d2d8f (patch) | |
| tree | 280e64b26f9b525606de02701f0c9a768301c4d2 /home/serial.asm | |
| parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
Fix merge conflicts
Diffstat (limited to 'home/serial.asm')
| -rw-r--r-- | home/serial.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/home/serial.asm b/home/serial.asm index d5df52a23..1ebf00389 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -273,15 +273,15 @@ Function83b:: ; 83b ; 862 Function862:: ; 862 - call Function309d + call LoadTileMapToTempTileMap callab Function4000 call Function87d - jp Function30b4 + jp Call_LoadTempTileMapToTileMap ; 871 Function871:: ; 871 - call Function309d + call LoadTileMapToTempTileMap callab Function4000 jp Function87d ; 87d |