thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +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

58
macros/scripts/maps.asm
View file

@ -1,22 +1,22 @@
def_objects: MACRO
REDEF _NUM_OBJECTS EQUS "_NUM_OBJECTS_\@"
db {_NUM_OBJECTS}
{_NUM_OBJECTS} = 0
def_object_events: MACRO
REDEF _NUM_OBJECT_EVENTS EQUS "_NUM_OBJECT_EVENTS_\@"
db {_NUM_OBJECT_EVENTS}
{_NUM_OBJECT_EVENTS} = 0
ENDM
;\1 sprite id
;\2 x position
;\3 y position
;\1 x position
;\2 y position
;\3 sprite id
;\4 movement (WALK/STAY)
;\5 range or direction
;\6 text id
;\7 items only: item id
;\7 trainers only: trainer class/pokemon id
;\8 trainers only: trainer number/pokemon level
object: MACRO
db \1
db \3 + 4
object_event: MACRO
db \3
db \2 + 4
db \1 + 4
db \4
db \5
IF _NARG > 7
@ -29,43 +29,43 @@ object: MACRO
ELSE
db \6
ENDC
{_NUM_OBJECTS} = {_NUM_OBJECTS} + 1
{_NUM_OBJECT_EVENTS} = {_NUM_OBJECT_EVENTS} + 1
ENDM
def_warps: MACRO
REDEF _NUM_WARPS EQUS "_NUM_WARPS_\@"
db {_NUM_WARPS}
{_NUM_WARPS} = 0
def_warp_events: MACRO
REDEF _NUM_WARP_EVENTS EQUS "_NUM_WARP_EVENTS_\@"
db {_NUM_WARP_EVENTS}
{_NUM_WARP_EVENTS} = 0
ENDM
;\1 x position
;\2 y position
;\3 destination warp id
;\4 destination map (-1 = wLastMap)
warp: MACRO
db \2, \1, \3, \4
_WARP_{d:{_NUM_WARPS}}_X = \1
_WARP_{d:{_NUM_WARPS}}_Y = \2
{_NUM_WARPS} = {_NUM_WARPS} + 1
;\3 destination map (-1 = wLastMap)
;\4 destination warp id
warp_event: MACRO
db \2, \1, \4, \3
_WARP_{d:{_NUM_WARP_EVENTS}}_X = \1
_WARP_{d:{_NUM_WARP_EVENTS}}_Y = \2
{_NUM_WARP_EVENTS} = {_NUM_WARP_EVENTS} + 1
ENDM
def_signs: MACRO
REDEF _NUM_SIGNS EQUS "_NUM_SIGNS_\@"
db {_NUM_SIGNS}
{_NUM_SIGNS} = 0
def_bg_events: MACRO
REDEF _NUM_BG_EVENTS EQUS "_NUM_BG_EVENTS_\@"
db {_NUM_BG_EVENTS}
{_NUM_BG_EVENTS} = 0
ENDM
;\1 x position
;\2 y position
;\3 sign id
sign: MACRO
bg_event: MACRO
db \2, \1, \3
{_NUM_SIGNS} = {_NUM_SIGNS} + 1
{_NUM_BG_EVENTS} = {_NUM_BG_EVENTS} + 1
ENDM
;\1 source map
def_warps_to: MACRO
FOR n, _NUM_WARPS
FOR n, _NUM_WARP_EVENTS
warp_to _WARP_{d:n}_X, _WARP_{d:n}_Y, \1_WIDTH
ENDR
ENDM