diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-10-21 00:36:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 00:36:06 -0400 |
| commit | 12666e3c70deb3a8859a22d32e31967cb971b69d (patch) | |
| tree | 3fc17d094e2c992f09834d52eaf5838707666516 /home/trainers.asm | |
| parent | 603524b4896f38c2d6163308277a74b44d22be8f (diff) | |
| parent | f52f20edb76fb40e183473ea23bf65acbe493c6c (diff) | |
Merge pull request #568 from mid-kid/master
ゴロゴロ
Diffstat (limited to 'home/trainers.asm')
| -rw-r--r-- | home/trainers.asm | 8 |
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 |