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,24 +1,24 @@
SilphCo4F_Object:
db $2e ; border block
def_warps
warp 24, 0, 1, SILPH_CO_3F
warp 26, 0, 1, SILPH_CO_5F
warp 20, 0, 0, SILPH_CO_ELEVATOR
warp 11, 7, 3, SILPH_CO_10F
warp 17, 3, 3, SILPH_CO_6F
warp 3, 15, 4, SILPH_CO_10F
warp 17, 11, 5, SILPH_CO_10F
def_warp_events
warp_event 24, 0, SILPH_CO_3F, 1
warp_event 26, 0, SILPH_CO_5F, 1
warp_event 20, 0, SILPH_CO_ELEVATOR, 0
warp_event 11, 7, SILPH_CO_10F, 3
warp_event 17, 3, SILPH_CO_6F, 3
warp_event 3, 15, SILPH_CO_10F, 4
warp_event 17, 11, SILPH_CO_10F, 5
def_signs
def_bg_events
def_objects
object SPRITE_SILPH_WORKER, 6, 2, STAY, NONE, 1 ; person
object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26
object SPRITE_SCIENTIST, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5
object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27
object SPRITE_POKE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL
object SPRITE_POKE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE
object SPRITE_POKE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE
def_object_events
object_event 6, 2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
object_event 9, 14, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 26
object_event 14, 6, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 5
object_event 26, 10, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 27
object_event 3, 9, SPRITE_POKE_BALL, STAY, NONE, 5, FULL_HEAL
object_event 4, 7, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_REVIVE
object_event 5, 8, SPRITE_POKE_BALL, STAY, NONE, 7, ESCAPE_ROPE
def_warps_to SILPH_CO_4F