diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /macros/scripts/maps.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'macros/scripts/maps.asm')
| -rw-r--r-- | macros/scripts/maps.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index d8734d4eb..e9703531d 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -1,24 +1,24 @@ -map: macro +map: MACRO ;\1: map id db GROUP_\1, MAP_\1 -endm +ENDM -scene_script: macro +scene_script: MACRO ;\1: script pointer dw \1, 0 -endm +ENDM -warp_def: macro +warp_def: MACRO ;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 ;\3: warp destination: starts at 1 ;\4: map id: from constants/map_constants.asm db \2, \1, \3 map \4 -endm +ENDM -coord_event: macro +coord_event: MACRO ;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 ;\3: scene id: controlled by setscene/setmapscene @@ -26,18 +26,18 @@ coord_event: macro db \3, \2, \1, $0 dw \4 db $0, $0 -endm +ENDM -bg_event: macro +bg_event: MACRO ;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 ;\3: function: a BGEVENT_* constant ;\4: script pointer db \2, \1, \3 dw \4 -endm +ENDM -object_event: macro +object_event: MACRO ;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 ;\3: sprite: a SPRITE_* constant @@ -65,10 +65,10 @@ object_event: macro dw \9 shift dw \9 -endm +ENDM -trainer: macro +trainer: MACRO ;\1: flag: an EVENT_BEAT_* constant ;\2: trainer group ;\3: trainer id @@ -79,9 +79,9 @@ trainer: macro dw \1 db \2, \3 dw \4, \5, \6, \7 -endm +ENDM -itemball: macro +itemball: MACRO ;\1: item: from constants/item_constants.asm ;\2: quantity: default 1 if _NARG == 2 @@ -89,9 +89,9 @@ if _NARG == 2 else db \1, 1 endc -endm +ENDM -elevfloor: macro +elevfloor: MACRO ;\1: floor: a FLOOR_* constant ;\2: warp destination: starts at 1 ;\3: map id @@ -99,10 +99,10 @@ elevfloor: macro map \3 ENDM -stonetable: macro +stonetable: MACRO ;\1: warp id ;\2: object_event id ;\3: script pointer db \1, \2 dw \3 -endm +ENDM |