aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/ViridianGym.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-09-26 23:20:57 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-09-26 23:20:57 -0400
commitd48a318dbf4b9e07da57980adb5894f5eadb11f7 (patch)
tree9fd47f6aeb205591c421b178a4f870d2502ceef9 /data/maps/objects/ViridianGym.asm
parentFix typos (#334) (diff)
downloadpokeyellow-d48a318dbf4b9e07da57980adb5894f5eadb11f7.tar.gz
pokeyellow-d48a318dbf4b9e07da57980adb5894f5eadb11f7.tar.xz
pokeyellow-d48a318dbf4b9e07da57980adb5894f5eadb11f7.zip
Align `object_event` coordinates
Fixes #336
Diffstat (limited to 'data/maps/objects/ViridianGym.asm')
-rw-r--r--data/maps/objects/ViridianGym.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm
index ead8b290..4b9a159e 100644
--- a/data/maps/objects/ViridianGym.asm
+++ b/data/maps/objects/ViridianGym.asm
@@ -8,16 +8,16 @@ ViridianGym_Object:
def_bg_events
def_object_events
- object_event 2, 1, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
- object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
+ object_event 2, 1, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
+ object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 6
- object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3
- object_event 3, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 7
- object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
- object_event 10, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 8
- object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4
- object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
+ object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3
+ object_event 3, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 7
+ object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
+ object_event 10, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 8
+ object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4
+ object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 10 ; person
- object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 11, REVIVE
+ object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 11, REVIVE
def_warps_to VIRIDIAN_GYM