summaryrefslogtreecommitdiff
path: root/engine/map_setup.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2016-08-11 15:55:32 -0400
committerGitHub <noreply@github.com>2016-08-11 15:55:32 -0400
commit700321a7fb2d6c852ffc91cc0b8867526cb76813 (patch)
tree1a81b2ef5a4d7a2e5a9433e990ea178f5083acbf /engine/map_setup.asm
parentc33ba049a5a993fc678fd1698645039ce4974022 (diff)
parent050a0162b89c645c4a2a3ed311c4da791fb3de6c (diff)
Merge pull request #342 from PikalaxALT/master
More label interpretations
Diffstat (limited to 'engine/map_setup.asm')
-rw-r--r--engine/map_setup.asm10
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