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,25 +1,25 @@
SilphCo6F_Object:
db $2e ; border block
def_warps
warp 16, 0, 1, SILPH_CO_7F
warp 14, 0, 0, SILPH_CO_5F
warp 18, 0, 0, SILPH_CO_ELEVATOR
warp 3, 3, 4, SILPH_CO_4F
warp 23, 3, 6, SILPH_CO_2F
def_warp_events
warp_event 16, 0, SILPH_CO_7F, 1
warp_event 14, 0, SILPH_CO_5F, 0
warp_event 18, 0, SILPH_CO_ELEVATOR, 0
warp_event 3, 3, SILPH_CO_4F, 4
warp_event 23, 3, SILPH_CO_2F, 6
def_signs
def_bg_events
def_objects
object SPRITE_SILPH_WORKER, 10, 6, STAY, NONE, 1 ; person
object SPRITE_SILPH_WORKER, 20, 6, STAY, NONE, 2 ; person
object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person
object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person
object SPRITE_SILPH_WORKER, 18, 13, STAY, UP, 5 ; person
object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30
object SPRITE_SCIENTIST, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7
object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31
object SPRITE_POKE_BALL, 3, 12, STAY, NONE, 9, HP_UP
object SPRITE_POKE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY
def_object_events
object_event 10, 6, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
object_event 20, 6, SPRITE_SILPH_WORKER, STAY, NONE, 2 ; person
object_event 21, 6, SPRITE_ERIKA, STAY, DOWN, 3 ; person
object_event 11, 10, SPRITE_ERIKA, STAY, RIGHT, 4 ; person
object_event 18, 13, SPRITE_SILPH_WORKER, STAY, UP, 5 ; person
object_event 17, 3, SPRITE_ROCKET, STAY, RIGHT, 6, OPP_ROCKET, 30
object_event 7, 8, SPRITE_SCIENTIST, STAY, DOWN, 7, OPP_SCIENTIST, 7
object_event 14, 15, SPRITE_ROCKET, STAY, LEFT, 8, OPP_ROCKET, 31
object_event 3, 12, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP
object_event 2, 15, SPRITE_POKE_BALL, STAY, NONE, 10, X_ACCURACY
def_warps_to SILPH_CO_6F