diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/maps/objects/VermilionGym.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/VermilionGym.asm')
| -rw-r--r-- | data/maps/objects/VermilionGym.asm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index a91c66ca..5e45d0d5 100644 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm @@ -1,3 +1,10 @@ + object_const_def + const_export VERMILIONGYM_LT_SURGE + const_export VERMILIONGYM_GENTLEMAN + const_export VERMILIONGYM_SUPER_NERD + const_export VERMILIONGYM_SAILOR + const_export VERMILIONGYM_GYM_GUIDE + VermilionGym_Object: db $3 ; border block @@ -8,10 +15,10 @@ VermilionGym_Object: def_bg_events def_object_events - object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1 - object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3 - object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1 - object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8 - object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person + object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, TEXT_VERMILIONGYM_LT_SURGE, OPP_LT_SURGE, 1 + object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, TEXT_VERMILIONGYM_GENTLEMAN, OPP_GENTLEMAN, 3 + object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_VERMILIONGYM_SUPER_NERD, OPP_ROCKER, 1 + object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, TEXT_VERMILIONGYM_SAILOR, OPP_SAILOR, 8 + object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_VERMILIONGYM_GYM_GUIDE def_warps_to VERMILION_GYM |