diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
| commit | 94ed208164c3f6484a26923c5bc7664b9a3c4002 (patch) | |
| tree | e6141c9f312ae0edf4b4741a729b03fea1ddebf5 /data/maps/objects/Route4.asm | |
| parent | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (diff) | |
| parent | d48a318dbf4b9e07da57980adb5894f5eadb11f7 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route4.asm')
| -rw-r--r-- | data/maps/objects/Route4.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 13f25a80..27a72b23 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -12,8 +12,8 @@ Route4_Object: bg_event 27, 7, 6 ; Route4Text6 def_object_events - object_event 9, 8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 1 ; person - object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 4 - object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, 3, TM_WHIRLWIND + object_event 9, 8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 1 ; person + object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 4 + object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, 3, TM_WHIRLWIND def_warps_to ROUTE_4 |