Revert "Revert "Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack""

This reverts commit e772de43d5.
This commit is contained in:
Llinos Evans 2023-04-09 14:03:02 +01:00
parent e772de43d5
commit 4389e86fd1
18 changed files with 107 additions and 110 deletions

View file

@ -12,5 +12,6 @@ CeruleanPokecenter_Object:
object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person
object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader
def_warps_to CERULEAN_POKECENTER

View file

@ -12,5 +12,6 @@ LavenderPokecenter_Object:
object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person
object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader
def_warps_to LAVENDER_POKECENTER

View file

@ -8,6 +8,6 @@ VermilionDock_Object:
def_bg_events
def_object_events
object_event 22, 0, SPRITE_POKE_BALL, STAY, NONE, 2, OLDSEACHART
object_event 22, 0, SPRITE_POKE_BALL, STAY, NONE, 2, OLD_SEA_MAP
def_warps_to VERMILION_DOCK