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

@ -1,27 +1,27 @@
PowerPlant_Object:
db $2e ; border block
def_warps
warp 4, 35, 3, LAST_MAP
warp 5, 35, 3, LAST_MAP
warp 0, 11, 3, LAST_MAP
def_warp_events
warp_event 4, 35, LAST_MAP, 3
warp_event 5, 35, LAST_MAP, 3
warp_event 0, 11, LAST_MAP, 3
def_signs
def_bg_events
def_objects
object SPRITE_POKE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40
object SPRITE_POKE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40
object SPRITE_POKE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40
object SPRITE_POKE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43
object SPRITE_POKE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40
object SPRITE_POKE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40
object SPRITE_POKE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43
object SPRITE_POKE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40
object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50
object SPRITE_POKE_BALL, 7, 25, STAY, NONE, 10, CARBOS
object SPRITE_POKE_BALL, 28, 3, STAY, NONE, 11, HP_UP
object SPRITE_POKE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY
object SPRITE_POKE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER
object SPRITE_POKE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT
def_object_events
object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40
object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, 2, VOLTORB, 40
object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, 3, VOLTORB, 40
object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, 4, ELECTRODE, 43
object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, 5, VOLTORB, 40
object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, 6, VOLTORB, 40
object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, 7, ELECTRODE, 43
object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, 8, VOLTORB, 40
object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50
object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP
object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY
object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_THUNDER
object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, 14, TM_REFLECT
def_warps_to POWER_PLANT