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 /engine | |
| parent | 603524b4896f38c2d6163308277a74b44d22be8f (diff) | |
| parent | f52f20edb76fb40e183473ea23bf65acbe493c6c (diff) | |
Merge pull request #568 from mid-kid/master
ゴロゴロ
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/overworld/events.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index b3dfc1983..e9fcc108c 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -248,7 +248,7 @@ PlayerEvents: call Dummy_CheckScriptFlags3Bit5 ; This is a waste of time - call CheckTrainerBattle3 + call CheckTrainerBattle_GetPlayerEvent jr c, .ok call CheckTileEvent @@ -289,10 +289,10 @@ PlayerEvents: scf ret -CheckTrainerBattle3: +CheckTrainerBattle_GetPlayerEvent: nop nop - call CheckTrainerBattle2 + call CheckTrainerBattle jr nc, .nope ld a, PLAYEREVENT_SEENBYTRAINER |