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

72
data/maps/objects/FuchsiaCity.asm
View file

@ -1,43 +1,43 @@
FuchsiaCity_Object:
db $f ; border block
def_warps
warp 5, 13, 0, FUCHSIA_MART
warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE
warp 19, 27, 0, FUCHSIA_POKECENTER
warp 27, 27, 0, WARDENS_HOUSE
warp 18, 3, 0, SAFARI_ZONE_GATE
warp 5, 27, 0, FUCHSIA_GYM
warp 22, 13, 0, FUCHSIA_MEETING_ROOM
warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE
warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE
def_warp_events
warp_event 5, 13, FUCHSIA_MART, 0
warp_event 11, 27, FUCHSIA_BILLS_GRANDPAS_HOUSE, 0
warp_event 19, 27, FUCHSIA_POKECENTER, 0
warp_event 27, 27, WARDENS_HOUSE, 0
warp_event 18, 3, SAFARI_ZONE_GATE, 0
warp_event 5, 27, FUCHSIA_GYM, 0
warp_event 22, 13, FUCHSIA_MEETING_ROOM, 0
warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 1
warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 0
def_signs
sign 15, 23, 11 ; FuchsiaCityText11
sign 25, 15, 12 ; FuchsiaCityText12
sign 17, 5, 13 ; FuchsiaCityText13
sign 6, 13, 14 ; MartSignText
sign 20, 27, 15 ; PokeCenterSignText
sign 27, 29, 16 ; FuchsiaCityText16
sign 21, 15, 17 ; FuchsiaCityText17
sign 5, 29, 18 ; FuchsiaCityText18
sign 33, 7, 19 ; FuchsiaCityText19
sign 27, 7, 20 ; FuchsiaCityText20
sign 13, 7, 21 ; FuchsiaCityText21
sign 31, 13, 22 ; FuchsiaCityText22
sign 13, 15, 23 ; FuchsiaCityText23
sign 7, 7, 24 ; FuchsiaCityText24
def_bg_events
bg_event 15, 23, 11 ; FuchsiaCityText11
bg_event 25, 15, 12 ; FuchsiaCityText12
bg_event 17, 5, 13 ; FuchsiaCityText13
bg_event 6, 13, 14 ; MartSignText
bg_event 20, 27, 15 ; PokeCenterSignText
bg_event 27, 29, 16 ; FuchsiaCityText16
bg_event 21, 15, 17 ; FuchsiaCityText17
bg_event 5, 29, 18 ; FuchsiaCityText18
bg_event 33, 7, 19 ; FuchsiaCityText19
bg_event 27, 7, 20 ; FuchsiaCityText20
bg_event 13, 7, 21 ; FuchsiaCityText21
bg_event 31, 13, 22 ; FuchsiaCityText22
bg_event 13, 15, 23 ; FuchsiaCityText23
bg_event 7, 7, 24 ; FuchsiaCityText24
def_objects
object SPRITE_YOUNGSTER, 10, 12, WALK, LEFT_RIGHT, 1 ; person
object SPRITE_GAMBLER, 28, 17, WALK, LEFT_RIGHT, 2 ; person
object SPRITE_FISHER, 30, 14, STAY, DOWN, 3 ; person
object SPRITE_YOUNGSTER, 24, 8, STAY, UP, 4 ; person
object SPRITE_FAIRY, 31, 5, WALK, ANY_DIR, 5 ; person
object SPRITE_POKE_BALL, 25, 6, STAY, NONE, 6 ; person
object SPRITE_MONSTER, 12, 6, WALK, LEFT_RIGHT, 7 ; person
object SPRITE_MONSTER, 30, 12, WALK, LEFT_RIGHT, 8 ; person
object SPRITE_SEEL, 8, 17, WALK, ANY_DIR, 9 ; person
object SPRITE_FOSSIL, 6, 5, STAY, NONE, 10 ; person
def_object_events
object_event 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person
object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
object_event 31, 5, SPRITE_FAIRY, WALK, ANY_DIR, 5 ; person
object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person
object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, 8 ; person
object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person
object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, 10 ; person
def_warps_to FUCHSIA_CITY