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

22
data/maps/objects/PokemonMansion3F.asm
View file

@ -1,18 +1,18 @@
PokemonMansion3F_Object:
db $1 ; border block
def_warps
warp 7, 10, 1, POKEMON_MANSION_2F
warp 6, 1, 3, POKEMON_MANSION_2F
warp 25, 14, 2, POKEMON_MANSION_2F
def_warp_events
warp_event 7, 10, POKEMON_MANSION_2F, 1
warp_event 6, 1, POKEMON_MANSION_2F, 3
warp_event 25, 14, POKEMON_MANSION_2F, 2
def_signs
def_bg_events
def_objects
object SPRITE_SUPER_NERD, 5, 11, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8
object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
object SPRITE_POKE_BALL, 25, 5, STAY, NONE, 4, IRON
object SPRITE_POKEDEX, 6, 12, STAY, NONE, 5 ; person
def_object_events
object_event 5, 11, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8
object_event 20, 11, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 12
object_event 1, 16, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_POTION
object_event 25, 5, SPRITE_POKE_BALL, STAY, NONE, 4, IRON
object_event 6, 12, SPRITE_POKEDEX, STAY, NONE, 5 ; person
def_warps_to POKEMON_MANSION_3F