diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /macros/scripts/maps.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'macros/scripts/maps.asm')
| -rw-r--r-- | macros/scripts/maps.asm | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index e9703531d..31a1f16d9 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -9,6 +9,12 @@ scene_script: MACRO dw \1, 0 ENDM +callback: MACRO +;\1: type: a MAPCALLBACK_* constant +;\2: script pointer + dbw \1, \2 +ENDM + warp_def: MACRO ;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 @@ -23,9 +29,10 @@ coord_event: MACRO ;\2: y: top to bottom, starts at 0 ;\3: scene id: controlled by setscene/setmapscene ;\4: script pointer - db \3, \2, \1, $0 + db \3, \2, \1 + db 0 ; filler dw \4 - db $0, $0 + db 0, 0 ; filler ENDM bg_event: MACRO @@ -91,6 +98,12 @@ else endc ENDM +hiddenitem: MACRO +;\1: flag: an EVENT_* constant +;\2: item: from constants/item_constants.asm + dwb \1, \2 +ENDM + elevfloor: MACRO ;\1: floor: a FLOOR_* constant ;\2: warp destination: starts at 1 @@ -99,10 +112,22 @@ elevfloor: MACRO map \3 ENDM +conditional_event: MACRO +;\1: flag: an EVENT_* constant +;\2: script pointer + dw \1, \2 +ENDM + +cmdqueue: MACRO +;\1: type: a CMDQUEUE_* constant +;\2: data pointer + dbw \1, \2 + dw 0 ; filler +ENDM + stonetable: MACRO ;\1: warp id ;\2: object_event id ;\3: script pointer - db \1, \2 - dw \3 + dbbw \1, \2, \3 ENDM |