thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-08 00:25:28 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unify map event gen1 gen2 (#335)

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

88
data/maps/objects/SaffronGym.asm
View file

@ -1,51 +1,51 @@
SaffronGym_Object:
db $2e ; border block
def_warps
warp 8, 17, 2, LAST_MAP
warp 9, 17, 2, LAST_MAP
warp 1, 3, 22, SAFFRON_GYM
warp 5, 3, 15, SAFFRON_GYM
warp 1, 5, 18, SAFFRON_GYM
warp 5, 5, 8, SAFFRON_GYM
warp 1, 9, 27, SAFFRON_GYM
warp 5, 9, 16, SAFFRON_GYM
warp 1, 11, 5, SAFFRON_GYM
warp 5, 11, 13, SAFFRON_GYM
warp 1, 15, 23, SAFFRON_GYM
warp 5, 15, 30, SAFFRON_GYM
warp 1, 17, 17, SAFFRON_GYM
warp 5, 17, 9, SAFFRON_GYM
warp 9, 3, 26, SAFFRON_GYM
warp 11, 3, 3, SAFFRON_GYM
warp 9, 5, 7, SAFFRON_GYM
warp 11, 5, 12, SAFFRON_GYM
warp 11, 11, 4, SAFFRON_GYM
warp 11, 15, 31, SAFFRON_GYM
warp 15, 3, 24, SAFFRON_GYM
warp 19, 3, 28, SAFFRON_GYM
warp 15, 5, 2, SAFFRON_GYM
warp 19, 5, 10, SAFFRON_GYM
warp 15, 9, 20, SAFFRON_GYM
warp 19, 9, 29, SAFFRON_GYM
warp 15, 11, 14, SAFFRON_GYM
warp 19, 11, 6, SAFFRON_GYM
warp 15, 15, 21, SAFFRON_GYM
warp 19, 15, 25, SAFFRON_GYM
warp 15, 17, 11, SAFFRON_GYM
warp 19, 17, 19, SAFFRON_GYM
def_warp_events
warp_event 8, 17, LAST_MAP, 2
warp_event 9, 17, LAST_MAP, 2
warp_event 1, 3, SAFFRON_GYM, 22
warp_event 5, 3, SAFFRON_GYM, 15
warp_event 1, 5, SAFFRON_GYM, 18
warp_event 5, 5, SAFFRON_GYM, 8
warp_event 1, 9, SAFFRON_GYM, 27
warp_event 5, 9, SAFFRON_GYM, 16
warp_event 1, 11, SAFFRON_GYM, 5
warp_event 5, 11, SAFFRON_GYM, 13
warp_event 1, 15, SAFFRON_GYM, 23
warp_event 5, 15, SAFFRON_GYM, 30
warp_event 1, 17, SAFFRON_GYM, 17
warp_event 5, 17, SAFFRON_GYM, 9
warp_event 9, 3, SAFFRON_GYM, 26
warp_event 11, 3, SAFFRON_GYM, 3
warp_event 9, 5, SAFFRON_GYM, 7
warp_event 11, 5, SAFFRON_GYM, 12
warp_event 11, 11, SAFFRON_GYM, 4
warp_event 11, 15, SAFFRON_GYM, 31
warp_event 15, 3, SAFFRON_GYM, 24
warp_event 19, 3, SAFFRON_GYM, 28
warp_event 15, 5, SAFFRON_GYM, 2
warp_event 19, 5, SAFFRON_GYM, 10
warp_event 15, 9, SAFFRON_GYM, 20
warp_event 19, 9, SAFFRON_GYM, 29
warp_event 15, 11, SAFFRON_GYM, 14
warp_event 19, 11, SAFFRON_GYM, 6
warp_event 15, 15, SAFFRON_GYM, 21
warp_event 19, 15, SAFFRON_GYM, 25
warp_event 15, 17, SAFFRON_GYM, 11
warp_event 19, 17, SAFFRON_GYM, 19
def_signs
def_bg_events
def_objects
object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1
object SPRITE_CHANNELER, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22
object SPRITE_YOUNGSTER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1
object SPRITE_CHANNELER, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23
object SPRITE_YOUNGSTER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2
object SPRITE_CHANNELER, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24
object SPRITE_YOUNGSTER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3
object SPRITE_YOUNGSTER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4
object SPRITE_GYM_GUIDE, 10, 15, STAY, DOWN, 9 ; person
def_object_events
object_event 9, 8, SPRITE_GIRL, STAY, DOWN, 1, OPP_SABRINA, 1
object_event 10, 1, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 22
object_event 17, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1
object_event 3, 7, SPRITE_CHANNELER, STAY, DOWN, 4, OPP_CHANNELER, 23
object_event 17, 7, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2
object_event 3, 13, SPRITE_CHANNELER, STAY, DOWN, 6, OPP_CHANNELER, 24
object_event 17, 13, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3
object_event 3, 1, SPRITE_YOUNGSTER, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4
object_event 10, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person
def_warps_to SAFFRON_GYM