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

40
data/maps/objects/SSAnne1FRooms.asm
View file

@ -1,27 +1,27 @@
SSAnne1FRooms_Object:
db $c ; border block
def_warps
warp 0, 0, 2, SS_ANNE_1F
warp 10, 0, 3, SS_ANNE_1F
warp 20, 0, 4, SS_ANNE_1F
warp 0, 10, 5, SS_ANNE_1F
warp 10, 10, 6, SS_ANNE_1F
warp 20, 10, 7, SS_ANNE_1F
def_warp_events
warp_event 0, 0, SS_ANNE_1F, 2
warp_event 10, 0, SS_ANNE_1F, 3
warp_event 20, 0, SS_ANNE_1F, 4
warp_event 0, 10, SS_ANNE_1F, 5
warp_event 10, 10, SS_ANNE_1F, 6
warp_event 20, 10, SS_ANNE_1F, 7
def_signs
def_bg_events
def_objects
object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1
object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2
object SPRITE_YOUNGSTER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8
object SPRITE_COOLTRAINER_F, 13, 11, STAY, LEFT, 4, OPP_LASS, 11
object SPRITE_GIRL, 22, 3, WALK, UP_DOWN, 5 ; person
object SPRITE_MIDDLE_AGED_MAN, 0, 14, STAY, NONE, 6 ; person
object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person
object SPRITE_FAIRY, 3, 11, STAY, DOWN, 8 ; person
object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person
object SPRITE_POKE_BALL, 12, 15, STAY, NONE, 10, TM_BODY_SLAM
object SPRITE_GENTLEMAN, 21, 13, WALK, LEFT_RIGHT, 11 ; person
def_object_events
object_event 2, 3, SPRITE_GENTLEMAN, STAY, LEFT, 1, OPP_GENTLEMAN, 1
object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 2
object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, 3, OPP_YOUNGSTER, 8
object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 11
object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person
object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 6 ; person
object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, 7 ; person
object_event 3, 11, SPRITE_FAIRY, STAY, DOWN, 8 ; person
object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, 9 ; person
object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM
object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person
def_warps_to SS_ANNE_1F_ROOMS