Citrine Pass and a few little tweaks

This commit is contained in:
MementoMartha 2022-10-02 17:16:30 +01:00
parent f6f43781b8
commit a05796ece5
14 changed files with 59 additions and 43 deletions

View file

@ -2,16 +2,16 @@ PokemonTower6F_Object:
db $1 ; border block
def_warp_events
warp_event 18, 9, POKEMON_TOWER_2F, 2
warp_event 3, 9, POKEMON_TOWER_2F, 2
warp_event 9, 16, POKEMON_TOWER_7F, 1
def_bg_events
def_object_events
object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19
object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY
object_event 9, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19
object_event 12, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
object_event 5, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
object_event 15, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 7, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY
def_warps_to POKEMON_TOWER_6F

View file

@ -29,5 +29,6 @@ VermilionCity_Object:
object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person
object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person
object_event 31, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 14 ; person
object_event 11, 30, SPRITE_SAILOR, STAY, UP, 15 ; person
def_warps_to VERMILION_CITY