summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/flag.asm2
-rw-r--r--home/trainers.asm8
2 files changed, 5 insertions, 5 deletions
diff --git a/home/flag.asm b/home/flag.asm
index 411f04184..e481cb6f7 100644
--- a/home/flag.asm
+++ b/home/flag.asm
@@ -38,7 +38,7 @@ FlagAction::
; 1 SET_FLAG set bit
; 2 CHECK_FLAG check bit
; de: bit number
-; hl: index within bit table
+; hl: pointer to the flag array
; get index within the byte
ld a, e
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