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,26 +1,26 @@
SafariZoneWest_Object:
db $0 ; border block
def_warps
warp 20, 0, 0, SAFARI_ZONE_NORTH
warp 21, 0, 1, SAFARI_ZONE_NORTH
warp 26, 0, 2, SAFARI_ZONE_NORTH
warp 27, 0, 3, SAFARI_ZONE_NORTH
warp 29, 22, 2, SAFARI_ZONE_CENTER
warp 29, 23, 3, SAFARI_ZONE_CENTER
warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE
warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE
def_warp_events
warp_event 20, 0, SAFARI_ZONE_NORTH, 0
warp_event 21, 0, SAFARI_ZONE_NORTH, 1
warp_event 26, 0, SAFARI_ZONE_NORTH, 2
warp_event 27, 0, SAFARI_ZONE_NORTH, 3
warp_event 29, 22, SAFARI_ZONE_CENTER, 2
warp_event 29, 23, SAFARI_ZONE_CENTER, 3
warp_event 3, 3, SAFARI_ZONE_SECRET_HOUSE, 0
warp_event 11, 11, SAFARI_ZONE_WEST_REST_HOUSE, 0
def_signs
sign 12, 12, 5 ; SafariZoneWestText5
sign 17, 3, 6 ; SafariZoneWestText6
sign 26, 4, 7 ; SafariZoneWestText7
sign 24, 22, 8 ; SafariZoneWestText8
def_bg_events
bg_event 12, 12, 5 ; SafariZoneWestText5
bg_event 17, 3, 6 ; SafariZoneWestText6
bg_event 26, 4, 7 ; SafariZoneWestText7
bg_event 24, 22, 8 ; SafariZoneWestText8
def_objects
object SPRITE_POKE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION
object SPRITE_POKE_BALL, 9, 7, STAY, NONE, 2, TM_DOUBLE_TEAM
object SPRITE_POKE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE
object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH
def_object_events
object_event 8, 20, SPRITE_POKE_BALL, STAY, NONE, 1, MAX_POTION
object_event 9, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_DOUBLE_TEAM
object_event 18, 18, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE
object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 4, GOLD_TEETH
def_warps_to SAFARI_ZONE_WEST