thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-08 00:25:28 +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

42
data/maps/objects/SilphCo5F.asm
View file

@ -1,28 +1,28 @@
SilphCo5F_Object:
db $2e ; border block
def_warps
warp 24, 0, 1, SILPH_CO_6F
warp 26, 0, 1, SILPH_CO_4F
warp 20, 0, 0, SILPH_CO_ELEVATOR
warp 27, 3, 5, SILPH_CO_7F
warp 9, 15, 4, SILPH_CO_9F
warp 11, 5, 4, SILPH_CO_3F
warp 3, 15, 5, SILPH_CO_3F
def_warp_events
warp_event 24, 0, SILPH_CO_6F, 1
warp_event 26, 0, SILPH_CO_4F, 1
warp_event 20, 0, SILPH_CO_ELEVATOR, 0
warp_event 27, 3, SILPH_CO_7F, 5
warp_event 9, 15, SILPH_CO_9F, 4
warp_event 11, 5, SILPH_CO_3F, 4
warp_event 3, 15, SILPH_CO_3F, 5
def_signs
def_bg_events
def_objects
object SPRITE_SILPH_WORKER, 13, 9, STAY, NONE, 1 ; person
object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28
object SPRITE_SCIENTIST, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6
object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1
object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29
object SPRITE_POKE_BALL, 2, 13, STAY, NONE, 6, TM_TAKE_DOWN
object SPRITE_POKE_BALL, 4, 6, STAY, NONE, 7, PROTEIN
object SPRITE_POKE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY
object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person
object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person
object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person
def_object_events
object_event 13, 9, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
object_event 8, 16, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 28
object_event 8, 3, SPRITE_SCIENTIST, STAY, RIGHT, 3, OPP_SCIENTIST, 6
object_event 18, 10, SPRITE_ROCKER, STAY, UP, 4, OPP_JUGGLER, 1
object_event 28, 4, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 29
object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, 6, TM_TAKE_DOWN
object_event 4, 6, SPRITE_POKE_BALL, STAY, NONE, 7, PROTEIN
object_event 21, 16, SPRITE_POKE_BALL, STAY, NONE, 8, CARD_KEY
object_event 22, 12, SPRITE_CLIPBOARD, STAY, NONE, 9 ; person
object_event 25, 10, SPRITE_CLIPBOARD, STAY, NONE, 10 ; person
object_event 24, 6, SPRITE_CLIPBOARD, STAY, NONE, 11 ; person
def_warps_to SILPH_CO_5F