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 @@
VictoryRoad1F_Object:
db $7d ; border block
def_warps
warp 8, 17, 2, LAST_MAP
warp 9, 17, 2, LAST_MAP
warp 1, 1, 0, VICTORY_ROAD_2F
def_warp_events
warp_event 8, 17, LAST_MAP, 2
warp_event 9, 17, LAST_MAP, 2
warp_event 1, 1, VICTORY_ROAD_2F, 0
def_signs
def_bg_events
def_objects
object SPRITE_COOLTRAINER_F, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
object SPRITE_COOLTRAINER_M, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 3, TM_SKY_ATTACK
object SPRITE_POKE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY
object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
def_object_events
object_event 7, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
object_event 3, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 3, TM_SKY_ATTACK
object_event 9, 2, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 5, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object_event 14, 2, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object_event 2, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
def_warps_to VICTORY_ROAD_1F