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

34
data/maps/objects/Route20.asm
View file

@ -1,24 +1,24 @@
Route20_Object:
db $43 ; border block
def_warps
warp 48, 5, 0, SEAFOAM_ISLANDS_1F
warp 58, 9, 2, SEAFOAM_ISLANDS_1F
def_warp_events
warp_event 48, 5, SEAFOAM_ISLANDS_1F, 0
warp_event 58, 9, SEAFOAM_ISLANDS_1F, 2
def_signs
sign 51, 7, 11 ; Route20Text11
sign 57, 11, 12 ; Route20Text12
def_bg_events
bg_event 51, 7, 11 ; Route20Text11
bg_event 57, 11, 12 ; Route20Text12
def_objects
object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9
object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15
object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6
object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24
object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10
object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11
object SPRITE_COOLTRAINER_M, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11
object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7
object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16
object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8
def_object_events
object_event 87, 8, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9
object_event 68, 11, SPRITE_SWIMMER, STAY, UP, 2, OPP_BEAUTY, 15
object_event 45, 10, SPRITE_SWIMMER, STAY, DOWN, 3, OPP_BEAUTY, 6
object_event 55, 14, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24
object_event 38, 13, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 10
object_event 87, 13, SPRITE_SWIMMER, STAY, UP, 6, OPP_SWIMMER, 11
object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11
object_event 25, 7, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7
object_event 24, 12, SPRITE_SWIMMER, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16
object_event 15, 8, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8
def_warps_to ROUTE_20