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/Route12.asm
View file

@ -1,26 +1,26 @@
Route12_Object:
db $43 ; border block
def_warps
warp 10, 15, 0, ROUTE_12_GATE_1F
warp 11, 15, 1, ROUTE_12_GATE_1F
warp 10, 21, 2, ROUTE_12_GATE_1F
warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE
def_warp_events
warp_event 10, 15, ROUTE_12_GATE_1F, 0
warp_event 11, 15, ROUTE_12_GATE_1F, 1
warp_event 10, 21, ROUTE_12_GATE_1F, 2
warp_event 11, 77, ROUTE_12_SUPER_ROD_HOUSE, 0
def_signs
sign 13, 13, 11 ; Route12Text11
sign 11, 63, 12 ; Route12Text12
def_bg_events
bg_event 13, 13, 11 ; Route12Text11
bg_event 11, 63, 12 ; Route12Text12
def_objects
object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person
object SPRITE_FISHER, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3
object SPRITE_FISHER, 5, 39, STAY, UP, 3, OPP_FISHER, 4
object SPRITE_COOLTRAINER_M, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
object SPRITE_SUPER_NERD, 14, 76, STAY, UP, 5, OPP_ROCKER, 2
object SPRITE_FISHER, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5
object SPRITE_FISHER, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6
object SPRITE_FISHER, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11
object SPRITE_POKE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY
object SPRITE_POKE_BALL, 5, 89, STAY, NONE, 10, IRON
def_object_events
object_event 10, 62, SPRITE_SNORLAX, STAY, DOWN, 1 ; person
object_event 14, 31, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 3
object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4
object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
object_event 14, 76, SPRITE_SUPER_NERD, STAY, UP, 5, OPP_ROCKER, 2
object_event 12, 40, SPRITE_FISHER, STAY, LEFT, 6, OPP_FISHER, 5
object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6
object_event 6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11
object_event 14, 35, SPRITE_POKE_BALL, STAY, NONE, 9, TM_PAY_DAY
object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, 10, IRON
def_warps_to ROUTE_12