diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-11 11:15:39 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-07-11 11:15:39 -0500 |
| commit | e1170a09c9a870f209f2b2f8fe3bd4fc3e9a263a (patch) | |
| tree | 5325d750ae0ec2900e5501840f83617b92f289ce /include/macros | |
| parent | 4fbad04ec2de7ca2529620f292356f1916b4d59d (diff) | |
Trim fat from coord_event macro
Diffstat (limited to 'include/macros')
| -rw-r--r-- | include/macros/map.inc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/macros/map.inc b/include/macros/map.inc index 5a4b550b0..f5f09dea9 100644 --- a/include/macros/map.inc +++ b/include/macros/map.inc @@ -34,16 +34,21 @@ inc _num_warps .endm - .macro coord_event x, y, byte1, byte2, word1, word2, word3, script + .macro coord_event x, y, elevation, trigger, index, script .2byte \x, \y - .byte \byte1, \byte2 - .2byte \word1, \word2, \word3 + .byte \elevation, 0 + .2byte \trigger, \index, 0 .4byte \script inc _num_traps .endm - .macro coord_weather_event x, y, height, weather - coord_event \x, \y, \height, 0, \weather, 0, 0, 0x0 + .macro coord_weather_event x, y, elevation, weather + .2byte \x, \y + .byte \elevation, 0 + .2byte \weather + .2byte 0, 0 + .4byte 0 + inc _num_traps .endm .macro bg_event x, y, elevation, kind, arg6, arg7, arg8 |