summaryrefslogtreecommitdiff
path: root/engine
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 /engine
parente68713d20ef8e41d6dcd418a6a8138ceaee3883f (diff)
Rename CheckTrainerBattle
Renamed to be more in line with our current coding standards. Hopefully this is slightly more readable.
Diffstat (limited to 'engine')
-rw-r--r--engine/overworld/events.asm6
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