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

46
data/maps/objects/VictoryRoad2F.asm
View file

@ -1,30 +1,30 @@
VictoryRoad2F_Object:
db $7d ; border block
def_warps
warp 0, 8, 2, VICTORY_ROAD_1F
warp 29, 7, 3, LAST_MAP
warp 29, 8, 3, LAST_MAP
warp 23, 7, 0, VICTORY_ROAD_3F
warp 25, 14, 2, VICTORY_ROAD_3F
warp 27, 7, 1, VICTORY_ROAD_3F
warp 1, 1, 3, VICTORY_ROAD_3F
def_warp_events
warp_event 0, 8, VICTORY_ROAD_1F, 2
warp_event 29, 7, LAST_MAP, 3
warp_event 29, 8, LAST_MAP, 3
warp_event 23, 7, VICTORY_ROAD_3F, 0
warp_event 25, 14, VICTORY_ROAD_3F, 2
warp_event 27, 7, VICTORY_ROAD_3F, 1
warp_event 1, 1, VICTORY_ROAD_3F, 3
def_signs
def_bg_events
def_objects
object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9
object SPRITE_SUPER_NERD, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2
object SPRITE_COOLTRAINER_M, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5
object SPRITE_SUPER_NERD, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6
object SPRITE_SUPER_NERD, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5
object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50
object SPRITE_POKE_BALL, 27, 5, STAY, NONE, 7, TM_SUBMISSION
object SPRITE_POKE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL
object SPRITE_POKE_BALL, 9, 11, STAY, NONE, 9, TM_MEGA_KICK
object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC
object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person
def_object_events
object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 9
object_event 21, 13, SPRITE_SUPER_NERD, STAY, LEFT, 2, OPP_JUGGLER, 2
object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5
object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6
object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5
object_event 11, 5, SPRITE_BIRD, STAY, UP, 6, MOLTRES, 50
object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION
object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL
object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK
object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 10, GUARD_SPEC
object_event 4, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
object_event 5, 5, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
object_event 23, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person
def_warps_to VICTORY_ROAD_2F