Unify map event gen1 gen2 (#335)

* Update sign to bg_event #289

* Rename warp to warp_event

* Replace object to object_event

* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
This commit is contained in:
Yoann Fievez 2021-09-27 04:56:09 +02:00 committed by GitHub
parent f1285f8584
commit 2c4f35848b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
224 changed files with 2622 additions and 2622 deletions

View file

@ -1,28 +1,28 @@
ViridianCity_Object:
db $f ; border block
def_warps
warp 23, 25, 0, VIRIDIAN_POKECENTER
warp 29, 19, 0, VIRIDIAN_MART
warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE
warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE
warp 32, 7, 0, VIRIDIAN_GYM
def_warp_events
warp_event 23, 25, VIRIDIAN_POKECENTER, 0
warp_event 29, 19, VIRIDIAN_MART, 0
warp_event 21, 15, VIRIDIAN_SCHOOL_HOUSE, 0
warp_event 21, 9, VIRIDIAN_NICKNAME_HOUSE, 0
warp_event 32, 7, VIRIDIAN_GYM, 0
def_signs
sign 17, 17, 8 ; ViridianCityText8
sign 19, 1, 9 ; ViridianCityText9
sign 21, 29, 10 ; ViridianCityText10
sign 30, 19, 11 ; MartSignText
sign 24, 25, 12 ; PokeCenterSignText
sign 27, 7, 13 ; ViridianCityText13
def_bg_events
bg_event 17, 17, 8 ; ViridianCityText8
bg_event 19, 1, 9 ; ViridianCityText9
bg_event 21, 29, 10 ; ViridianCityText10
bg_event 30, 19, 11 ; MartSignText
bg_event 24, 25, 12 ; PokeCenterSignText
bg_event 27, 7, 13 ; ViridianCityText13
def_objects
object SPRITE_YOUNGSTER, 13, 20, WALK, ANY_DIR, 1 ; person
object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person
object SPRITE_YOUNGSTER, 30, 25, WALK, ANY_DIR, 3 ; person
object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person
object SPRITE_GAMBLER_ASLEEP, 18, 9, STAY, NONE, 5 ; person
object SPRITE_FISHER, 6, 23, STAY, DOWN, 6 ; person
object SPRITE_GAMBLER, 17, 5, WALK, LEFT_RIGHT, 7 ; person
def_object_events
object_event 13, 20, SPRITE_YOUNGSTER, WALK, ANY_DIR, 1 ; person
object_event 30, 8, SPRITE_GAMBLER, STAY, NONE, 2 ; person
object_event 30, 25, SPRITE_YOUNGSTER, WALK, ANY_DIR, 3 ; person
object_event 17, 9, SPRITE_GIRL, STAY, RIGHT, 4 ; person
object_event 18, 9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, 5 ; person
object_event 6, 23, SPRITE_FISHER, STAY, DOWN, 6 ; person
object_event 17, 5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 7 ; person
def_warps_to VIRIDIAN_CITY