thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-07 16:15:23 +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

26
data/maps/objects/CeladonGym.asm
View file

@ -1,20 +1,20 @@
CeladonGym_Object:
db $3 ; border block
def_warps
warp 4, 17, 6, LAST_MAP
warp 5, 17, 6, LAST_MAP
def_warp_events
warp_event 4, 17, LAST_MAP, 6
warp_event 5, 17, LAST_MAP, 6
def_signs
def_bg_events
def_objects
object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1
object SPRITE_COOLTRAINER_F, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17
object SPRITE_BEAUTY, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1
object SPRITE_COOLTRAINER_F, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
object SPRITE_BEAUTY, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2
object SPRITE_COOLTRAINER_F, 6, 3, STAY, DOWN, 6, OPP_LASS, 18
object SPRITE_BEAUTY, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3
object SPRITE_COOLTRAINER_F, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
def_object_events
object_event 4, 3, SPRITE_ERIKA, STAY, DOWN, 1, OPP_ERIKA, 1
object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 17
object_event 7, 10, SPRITE_BEAUTY, STAY, LEFT, 3, OPP_BEAUTY, 1
object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
object_event 1, 5, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 2
object_event 6, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 18
object_event 3, 3, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 3
object_event 5, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
def_warps_to CELADON_GYM