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

32
data/maps/objects/OaksLab.asm
View file

@ -1,23 +1,23 @@
OaksLab_Object:
db $3 ; border block
def_warps
warp 4, 11, 2, LAST_MAP
warp 5, 11, 2, LAST_MAP
def_warp_events
warp_event 4, 11, LAST_MAP, 2
warp_event 5, 11, LAST_MAP, 2
def_signs
def_bg_events
def_objects
object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1
object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person
object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person
object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person
object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person
object SPRITE_POKEDEX, 2, 1, STAY, NONE, 6 ; person
object SPRITE_POKEDEX, 3, 1, STAY, NONE, 7 ; person
object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person
object SPRITE_GIRL, 1, 9, WALK, UP_DOWN, 9 ; person
object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person
object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person
def_object_events
object_event 4, 3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1
object_event 6, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, 3 ; person
object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 4 ; person
object_event 5, 2, SPRITE_OAK, STAY, DOWN, 5 ; person
object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 6 ; person
object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 7 ; person
object_event 5, 10, SPRITE_OAK, STAY, UP, 8 ; person
object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 9 ; person
object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 10 ; person
object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 11 ; person
def_warps_to OAKS_LAB