summaryrefslogtreecommitdiff
path: root/engine/overworld/map_setup.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2018-08-25 22:23:45 -0400
committerGitHub <noreply@github.com>2018-08-25 22:23:45 -0400
commit3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch)
tree3d747166409fdc94f0fd1aa760693a7ee5bd2156 /engine/overworld/map_setup.asm
parent89681d231611938a791f4256e602c88c2f9aa3e1 (diff)
parentb2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff)
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'engine/overworld/map_setup.asm')
-rw-r--r--engine/overworld/map_setup.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm
index b09404240..5cf350a0a 100644
--- a/engine/overworld/map_setup.asm
+++ b/engine/overworld/map_setup.asm
@@ -1,5 +1,5 @@
RunMapSetupScript::
- ld a, [hMapEntryMethod]
+ ldh a, [hMapEntryMethod]
and $f
dec a
ld c, a
@@ -114,12 +114,12 @@ DontScrollText:
ActivateMapAnims:
ld a, $1
- ld [hMapAnims], a
+ ldh [hMapAnims], a
ret
SuspendMapAnims:
xor a
- ld [hMapAnims], a
+ ldh [hMapAnims], a
ret
LoadObjectsRunCallback_02: