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,20 +1,20 @@
Route3_Object:
db $2c ; border block
def_warps
def_warp_events
def_signs
sign 59, 9, 10 ; Route3Text10
def_bg_events
bg_event 59, 9, 10 ; Route3Text10
def_objects
object SPRITE_SUPER_NERD, 57, 11, STAY, NONE, 1 ; person
object SPRITE_YOUNGSTER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4
object SPRITE_YOUNGSTER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1
object SPRITE_COOLTRAINER_F, 16, 9, STAY, LEFT, 4, OPP_LASS, 1
object SPRITE_YOUNGSTER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5
object SPRITE_COOLTRAINER_F, 23, 4, STAY, LEFT, 6, OPP_LASS, 2
object SPRITE_YOUNGSTER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2
object SPRITE_YOUNGSTER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6
object SPRITE_COOLTRAINER_F, 33, 10, STAY, UP, 9, OPP_LASS, 3
def_object_events
object_event 57, 11, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
object_event 10, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4
object_event 14, 4, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_YOUNGSTER, 1
object_event 16, 9, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 1
object_event 19, 5, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_BUG_CATCHER, 5
object_event 23, 4, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 2
object_event 22, 9, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_YOUNGSTER, 2
object_event 24, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6
object_event 33, 10, SPRITE_COOLTRAINER_F, STAY, UP, 9, OPP_LASS, 3
def_warps_to ROUTE_3