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

38
data/maps/objects/Route15.asm
View file

@ -1,26 +1,26 @@
Route15_Object:
db $43 ; border block
def_warps
warp 7, 8, 0, ROUTE_15_GATE_1F
warp 7, 9, 1, ROUTE_15_GATE_1F
warp 14, 8, 2, ROUTE_15_GATE_1F
warp 14, 9, 3, ROUTE_15_GATE_1F
def_warp_events
warp_event 7, 8, ROUTE_15_GATE_1F, 0
warp_event 7, 9, ROUTE_15_GATE_1F, 1
warp_event 14, 8, ROUTE_15_GATE_1F, 2
warp_event 14, 9, ROUTE_15_GATE_1F, 3
def_signs
sign 39, 9, 12 ; Route15Text12
def_bg_events
bg_event 39, 9, 12 ; Route15Text12
def_objects
object SPRITE_COOLTRAINER_F, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20
object SPRITE_COOLTRAINER_F, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21
object SPRITE_COOLTRAINER_M, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6
object SPRITE_COOLTRAINER_M, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7
object SPRITE_BEAUTY, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9
object SPRITE_BEAUTY, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10
object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3
object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4
object SPRITE_COOLTRAINER_F, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22
object SPRITE_COOLTRAINER_F, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23
object SPRITE_POKE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE
def_object_events
object_event 41, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20
object_event 53, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21
object_event 31, 13, SPRITE_COOLTRAINER_M, STAY, UP, 3, OPP_BIRD_KEEPER, 6
object_event 35, 13, SPRITE_COOLTRAINER_M, STAY, UP, 4, OPP_BIRD_KEEPER, 7
object_event 53, 11, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 9
object_event 41, 10, SPRITE_BEAUTY, STAY, RIGHT, 6, OPP_BEAUTY, 10
object_event 48, 10, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 3
object_event 46, 10, SPRITE_BIKER, STAY, DOWN, 8, OPP_BIKER, 4
object_event 37, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22
object_event 18, 13, SPRITE_COOLTRAINER_F, STAY, UP, 10, OPP_JR_TRAINER_F, 23
object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, 11, TM_RAGE
def_warps_to ROUTE_15