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,17 +1,17 @@
PokemonTower6F_Object:
db $1 ; border block
def_warps
warp 18, 9, 1, POKEMON_TOWER_5F
warp 9, 16, 0, POKEMON_TOWER_7F
def_warp_events
warp_event 18, 9, POKEMON_TOWER_5F, 1
warp_event 9, 16, POKEMON_TOWER_7F, 0
def_signs
def_bg_events
def_objects
object SPRITE_CHANNELER, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19
object SPRITE_CHANNELER, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20
object SPRITE_CHANNELER, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21
object SPRITE_POKE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY
object SPRITE_POKE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
def_object_events
object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19
object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY
def_warps_to POKEMON_TOWER_6F