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,22 +1,22 @@
RockTunnelB1F_Object:
db $3 ; border block
def_warps
warp 33, 25, 4, ROCK_TUNNEL_1F
warp 27, 3, 5, ROCK_TUNNEL_1F
warp 23, 11, 6, ROCK_TUNNEL_1F
warp 3, 3, 7, ROCK_TUNNEL_1F
def_warp_events
warp_event 33, 25, ROCK_TUNNEL_1F, 4
warp_event 27, 3, ROCK_TUNNEL_1F, 5
warp_event 23, 11, ROCK_TUNNEL_1F, 6
warp_event 3, 3, ROCK_TUNNEL_1F, 7
def_signs
def_bg_events
def_objects
object SPRITE_COOLTRAINER_F, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9
object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9
object SPRITE_SUPER_NERD, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3
object SPRITE_SUPER_NERD, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4
object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10
object SPRITE_COOLTRAINER_F, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11
object SPRITE_SUPER_NERD, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5
def_object_events
object_event 11, 13, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9
object_event 6, 10, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 9
object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_POKEMANIAC, 3
object_event 20, 21, SPRITE_SUPER_NERD, STAY, RIGHT, 4, OPP_POKEMANIAC, 4
object_event 30, 10, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 10
object_event 14, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11
object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5
def_warps_to ROCK_TUNNEL_B1F