diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
| commit | 4b36a9d2e1d6b6ac823fbb14e8f0ba750b0eecc2 (patch) | |
| tree | fcbbd0247503a200c4c1d8df690a676b49a09efd /macros/map.asm | |
| parent | e3ee39f3344107f666099448401d28b04c983cd6 (diff) | |
| parent | a6656a986bf9dde51561cab090648e0117b173ad (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'macros/map.asm')
| -rw-r--r-- | macros/map.asm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/macros/map.asm b/macros/map.asm index eb78be725..f153806da 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -21,13 +21,10 @@ xy_trigger: macro ;\1: number: controlled by dotrigger/domaptrigger ;\2: y: top to bottom, starts at 0 ;\3: x: left to right, starts at 0 -;\4: unknown1: $0 -;\5: script pointer -;\6: unknown2: $0 -;\7: unknown3: $0 - db \1, \2, \3, \4 - dw \5 - db \6, \7 +;\4: script pointer + db \1, \2, \3, $0 + dw \4 + db $0, $0 endm signpost: macro |