diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /engine/map_setup.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'engine/map_setup.asm')
| -rw-r--r-- | engine/map_setup.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 952c12ac1..dc013ffdd 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -204,9 +204,9 @@ ReadMapSetupScript: ; 1541d ld c, a ld b, 0 ld hl, MapSetupCommands -rept 3 add hl, bc -endr + add hl, bc + add hl, bc ; bank ld b, [hl] @@ -258,8 +258,8 @@ MapSetupCommands: ; 15440 dba LoadMapPalettes ; 11 dba LoadWildMonData ; 12 dba RefreshMapSprites ; 13 - dba RunCallback_05_03 ; 14 - dba RunCallback_03 ; 15 + dba HandleNewMap ; 14 + dba InitCommandQueue ; 15 dba LoadObjectsRunCallback_02 ; 16 dba LoadSpawnPoint ; 17 dba EnterMapConnection ; 18 @@ -289,7 +289,7 @@ MapSetupCommands: ; 15440 DontScrollText: ; 154ca xor a - ld [wc2d7], a + ld [wDisableTextAcceleration], a ret ; 154cf |