summaryrefslogtreecommitdiff
path: root/home/trainers.asm
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2018-10-11 11:37:19 +0200
committermid-kid <esteve.varela@gmail.com>2018-10-11 11:39:09 +0200
commitf52f20edb76fb40e183473ea23bf65acbe493c6c (patch)
tree3fc17d094e2c992f09834d52eaf5838707666516 /home/trainers.asm
parente68713d20ef8e41d6dcd418a6a8138ceaee3883f (diff)
Rename CheckTrainerBattle
Renamed to be more in line with our current coding standards. Hopefully this is slightly more readable.
Diffstat (limited to 'home/trainers.asm')
-rw-r--r--home/trainers.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/home/trainers.asm b/home/trainers.asm
index ec475e218..8d13cf5b1 100644
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -1,16 +1,16 @@
-CheckTrainerBattle2::
+CheckTrainerBattle::
ldh a, [hROMBank]
push af
call SwitchToMapScriptsBank
- call CheckTrainerBattle
+ call _CheckTrainerBattle
pop bc
ld a, b
rst Bankswitch
ret
-CheckTrainerBattle::
+_CheckTrainerBattle::
; Check if any trainer on the map sees the player and wants to battle.
; Skip the player object.
@@ -35,7 +35,7 @@ CheckTrainerBattle::
add hl, de
ld a, [hl]
and $f
- cp $2
+ cp OBJECTTYPE_TRAINER
jr nz, .next
; Is visible on the map