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

28
data/maps/objects/Route9.asm
View file

@ -1,21 +1,21 @@
Route9_Object:
db $2c ; border block
def_warps
def_warp_events
def_signs
sign 25, 7, 11 ; Route9Text11
def_bg_events
bg_event 25, 7, 11 ; Route9Text11
def_objects
object SPRITE_COOLTRAINER_F, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5
object SPRITE_COOLTRAINER_M, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7
object SPRITE_COOLTRAINER_M, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8
object SPRITE_COOLTRAINER_F, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6
object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11
object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6
object SPRITE_YOUNGSTER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5
object SPRITE_YOUNGSTER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
object SPRITE_POKE_BALL, 10, 15, STAY, NONE, 10, TM_TELEPORT
def_object_events
object_event 13, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5
object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7
object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8
object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6
object_event 16, 15, SPRITE_HIKER, STAY, LEFT, 5, OPP_HIKER, 11
object_event 43, 3, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6
object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, 8, OPP_HIKER, 5
object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_TELEPORT
def_warps_to ROUTE_9