aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/ViridianGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/ViridianGym.asm')
-rw-r--r--data/maps/objects/ViridianGym.asm35
1 files changed, 24 insertions, 11 deletions
diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm
index 735cecf4..87d2ef90 100644
--- a/data/maps/objects/ViridianGym.asm
+++ b/data/maps/objects/ViridianGym.asm
@@ -1,3 +1,16 @@
+ object_const_def
+ const_export VIRIDIANGYM_GIOVANNI
+ const_export VIRIDIANGYM_COOLTRAINER_M1
+ const_export VIRIDIANGYM_HIKER1
+ const_export VIRIDIANGYM_ROCKER1
+ const_export VIRIDIANGYM_HIKER2
+ const_export VIRIDIANGYM_COOLTRAINER_M2
+ const_export VIRIDIANGYM_HIKER3
+ const_export VIRIDIANGYM_ROCKER2
+ const_export VIRIDIANGYM_COOLTRAINER_M3
+ const_export VIRIDIANGYM_GYM_GUIDE
+ const_export VIRIDIANGYM_REVIVE
+
ViridianGym_Object:
db $3 ; border block
@@ -8,16 +21,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 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 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 10 ; person
- object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 11, REVIVE
+ object_event 2, 1, SPRITE_GIOVANNI, STAY, DOWN, TEXT_VIRIDIANGYM_GIOVANNI, OPP_GIOVANNI, 3
+ object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VIRIDIANGYM_COOLTRAINER_M1, OPP_COOLTRAINER_M, 9
+ object_event 11, 11, SPRITE_HIKER, STAY, UP, TEXT_VIRIDIANGYM_HIKER1, OPP_BLACKBELT, 6
+ object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, TEXT_VIRIDIANGYM_ROCKER1, OPP_TAMER, 3
+ object_event 3, 7, SPRITE_HIKER, STAY, LEFT, TEXT_VIRIDIANGYM_HIKER2, OPP_BLACKBELT, 7
+ object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_VIRIDIANGYM_COOLTRAINER_M2, OPP_COOLTRAINER_M, 10
+ object_event 10, 1, SPRITE_HIKER, STAY, DOWN, TEXT_VIRIDIANGYM_HIKER3, OPP_BLACKBELT, 8
+ object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, TEXT_VIRIDIANGYM_ROCKER2, OPP_TAMER, 4
+ object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VIRIDIANGYM_COOLTRAINER_M3, OPP_COOLTRAINER_M, 1
+ object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_VIRIDIANGYM_GYM_GUIDE
+ object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANGYM_REVIVE, REVIVE
def_warps_to VIRIDIAN_GYM