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

48
data/maps/objects/SSAnneB1FRooms.asm
View file

@ -1,31 +1,31 @@
SSAnneB1FRooms_Object:
db $c ; border block
def_warps
warp 2, 5, 4, SS_ANNE_B1F
warp 3, 5, 4, SS_ANNE_B1F
warp 12, 5, 3, SS_ANNE_B1F
warp 13, 5, 3, SS_ANNE_B1F
warp 22, 5, 2, SS_ANNE_B1F
warp 23, 5, 2, SS_ANNE_B1F
warp 2, 15, 1, SS_ANNE_B1F
warp 3, 15, 1, SS_ANNE_B1F
warp 12, 15, 0, SS_ANNE_B1F
warp 13, 15, 0, SS_ANNE_B1F
def_warp_events
warp_event 2, 5, SS_ANNE_B1F, 4
warp_event 3, 5, SS_ANNE_B1F, 4
warp_event 12, 5, SS_ANNE_B1F, 3
warp_event 13, 5, SS_ANNE_B1F, 3
warp_event 22, 5, SS_ANNE_B1F, 2
warp_event 23, 5, SS_ANNE_B1F, 2
warp_event 2, 15, SS_ANNE_B1F, 1
warp_event 3, 15, SS_ANNE_B1F, 1
warp_event 12, 15, SS_ANNE_B1F, 0
warp_event 13, 15, SS_ANNE_B1F, 0
def_signs
def_bg_events
def_objects
object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3
object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4
object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5
object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6
object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7
object SPRITE_FISHER, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
object SPRITE_SUPER_NERD, 10, 13, STAY, RIGHT, 7 ; person
object SPRITE_MONSTER, 11, 12, STAY, NONE, 8 ; person
object SPRITE_POKE_BALL, 20, 2, STAY, NONE, 9, ETHER
object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 10, TM_REST
object SPRITE_POKE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
def_object_events
object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3
object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4
object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5
object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6
object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, 5, OPP_SAILOR, 7
object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2
object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person
object_event 11, 12, SPRITE_MONSTER, STAY, NONE, 8 ; person
object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION
def_warps_to SS_ANNE_B1F_ROOMS