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,21 +1,21 @@
CinnabarGym_Object:
db $2e ; border block
def_warps
warp 16, 17, 1, LAST_MAP
warp 17, 17, 1, LAST_MAP
def_warp_events
warp_event 16, 17, LAST_MAP, 1
warp_event 17, 17, LAST_MAP, 1
def_signs
def_bg_events
def_objects
object SPRITE_MIDDLE_AGED_MAN, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1
object SPRITE_SUPER_NERD, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9
object SPRITE_SUPER_NERD, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4
object SPRITE_SUPER_NERD, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10
object SPRITE_SUPER_NERD, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5
object SPRITE_SUPER_NERD, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11
object SPRITE_SUPER_NERD, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6
object SPRITE_SUPER_NERD, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12
object SPRITE_GYM_GUIDE, 16, 13, STAY, DOWN, 9 ; person
def_object_events
object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 1, OPP_BLAINE, 1
object_event 17, 2, SPRITE_SUPER_NERD, STAY, DOWN, 2, OPP_SUPER_NERD, 9
object_event 17, 8, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_BURGLAR, 4
object_event 11, 4, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_SUPER_NERD, 10
object_event 11, 8, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_BURGLAR, 5
object_event 11, 14, SPRITE_SUPER_NERD, STAY, DOWN, 6, OPP_SUPER_NERD, 11
object_event 3, 14, SPRITE_SUPER_NERD, STAY, DOWN, 7, OPP_BURGLAR, 6
object_event 3, 8, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_SUPER_NERD, 12
object_event 16, 13, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person
def_warps_to CINNABAR_GYM