summaryrefslogtreecommitdiff
path: root/home/trainers.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-08-25 14:28:22 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-08-25 14:28:22 -0400
commiteb1e3636bb71509546c274bf2a5910d8e71a9600 (patch)
tree24d7742604073b2afb86c1225258f8217d1653e7 /home/trainers.asm
parent376c64468bab8d162da43fc6e1b6f0942943cf43 (diff)
Use labels instead of constants for HRAM
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
Diffstat (limited to 'home/trainers.asm')
-rw-r--r--home/trainers.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/home/trainers.asm b/home/trainers.asm
index 5def6cf17..ec475e218 100644
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -1,5 +1,5 @@
CheckTrainerBattle2::
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
call SwitchToMapScriptsBank
@@ -93,7 +93,7 @@ CheckTrainerBattle::
.startbattle
pop de
pop af
- ld [hLastTalked], a
+ ldh [hLastTalked], a
ld a, b
ld [wEngineBuffer2], a
ld a, c
@@ -110,7 +110,7 @@ LoadTrainer_continue::
call GetMapScriptsBank
ld [wEngineBuffer1], a
- ld a, [hLastTalked]
+ ldh a, [hLastTalked]
call GetMapObject
ld hl, MAPOBJECT_SCRIPT_POINTER