diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-04 08:46:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-04 08:46:37 -0500 |
| commit | 27be0bfe05d161d60f977d19bee5b2812f0b5e16 (patch) | |
| tree | d78c8310fd6a896914960d5831ed53514c623867 /engine/events.asm | |
| parent | 0add51451cda9d4221af137f83e2429d3577310c (diff) | |
| parent | c087d44c420a25dc95f61690e8d3c82932187d67 (diff) | |
Merge branch 'scriptmacrorenaming' of github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'engine/events.asm')
| -rw-r--r-- | engine/events.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/events.asm b/engine/events.asm index 0d708cdde..51e7288bc 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -227,7 +227,7 @@ HandleMapTimeAndJoypad: ; 967c1 ; 967d1 Function967d1: ; 967d1 - callba Function576a ; engine/map_objects.asm + callba HandleNPCStep ; engine/map_objects.asm callba _HandlePlayerStep call _CheckObjectEnteringVisibleRange ret |