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

30
data/maps/objects/CinnabarIsland.asm
View file

@ -1,22 +1,22 @@
CinnabarIsland_Object:
db $43 ; border block
def_warps
warp 6, 3, 1, POKEMON_MANSION_1F
warp 18, 3, 0, CINNABAR_GYM
warp 6, 9, 0, CINNABAR_LAB
warp 11, 11, 0, CINNABAR_POKECENTER
warp 15, 11, 0, CINNABAR_MART
def_warp_events
warp_event 6, 3, POKEMON_MANSION_1F, 1
warp_event 18, 3, CINNABAR_GYM, 0
warp_event 6, 9, CINNABAR_LAB, 0
warp_event 11, 11, CINNABAR_POKECENTER, 0
warp_event 15, 11, CINNABAR_MART, 0
def_signs
sign 9, 5, 3 ; CinnabarIslandText3
sign 16, 11, 4 ; MartSignText
sign 12, 11, 5 ; PokeCenterSignText
sign 9, 11, 6 ; CinnabarIslandText6
sign 13, 3, 7 ; CinnabarIslandText7
def_bg_events
bg_event 9, 5, 3 ; CinnabarIslandText3
bg_event 16, 11, 4 ; MartSignText
bg_event 12, 11, 5 ; PokeCenterSignText
bg_event 9, 11, 6 ; CinnabarIslandText6
bg_event 13, 3, 7 ; CinnabarIslandText7
def_objects
object SPRITE_GIRL, 12, 5, WALK, LEFT_RIGHT, 1 ; person
object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
def_object_events
object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person
object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
def_warps_to CINNABAR_ISLAND