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

40
data/maps/objects/SilphCo7F.asm
View file

@ -1,27 +1,27 @@
SilphCo7F_Object:
db $2e ; border block
def_warps
warp 16, 0, 1, SILPH_CO_8F
warp 22, 0, 0, SILPH_CO_6F
warp 18, 0, 0, SILPH_CO_ELEVATOR
warp 5, 7, 3, SILPH_CO_11F
warp 5, 3, 8, SILPH_CO_3F
warp 21, 15, 3, SILPH_CO_5F
def_warp_events
warp_event 16, 0, SILPH_CO_8F, 1
warp_event 22, 0, SILPH_CO_6F, 0
warp_event 18, 0, SILPH_CO_ELEVATOR, 0
warp_event 5, 7, SILPH_CO_11F, 3
warp_event 5, 3, SILPH_CO_3F, 8
warp_event 21, 15, SILPH_CO_5F, 3
def_signs
def_bg_events
def_objects
object SPRITE_SILPH_WORKER, 1, 5, STAY, NONE, 1 ; person
object SPRITE_SILPH_WORKER, 13, 13, STAY, UP, 2 ; person
object SPRITE_SILPH_WORKER, 7, 10, STAY, NONE, 3 ; person
object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person
object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32
object SPRITE_SCIENTIST, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8
object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33
object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34
object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person
object SPRITE_POKE_BALL, 1, 9, STAY, NONE, 10, CALCIUM
object SPRITE_POKE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE
def_object_events
object_event 1, 5, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
object_event 13, 13, SPRITE_SILPH_WORKER, STAY, UP, 2 ; person
object_event 7, 10, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person
object_event 10, 8, SPRITE_ERIKA, STAY, NONE, 4 ; person
object_event 13, 1, SPRITE_ROCKET, STAY, DOWN, 5, OPP_ROCKET, 32
object_event 2, 13, SPRITE_SCIENTIST, STAY, DOWN, 6, OPP_SCIENTIST, 8
object_event 20, 2, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 33
object_event 19, 14, SPRITE_ROCKET, STAY, RIGHT, 8, OPP_ROCKET, 34
object_event 3, 7, SPRITE_BLUE, STAY, UP, 9 ; person
object_event 1, 9, SPRITE_POKE_BALL, STAY, NONE, 10, CALCIUM
object_event 24, 11, SPRITE_POKE_BALL, STAY, NONE, 11, TM_SWORDS_DANCE
def_warps_to SILPH_CO_7F