diff options
Diffstat (limited to 'macros/scripts')
| -rwxr-xr-x | macros/scripts/events.asm | 8 | ||||
| -rw-r--r-- | macros/scripts/maps.asm | 32 | ||||
| -rwxr-xr-x | macros/scripts/text.asm | 4 |
3 files changed, 22 insertions, 22 deletions
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index c5f90107..9e84ec62 100755 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -183,10 +183,10 @@ ENDM ;\3, \4, ... = additional (optional) event indices SetEvents: MACRO SetEvent \1 - rept _NARG - 1 + REPT _NARG - 1 SetEventReuseHL \2 shift - endr + ENDR ENDM @@ -235,10 +235,10 @@ ENDM ;\3 = event index (optional) ResetEvents: MACRO ResetEvent \1 - rept _NARG - 1 + REPT _NARG - 1 ResetEventReuseHL \2 shift - endr + ENDR ENDM diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index a30561b9..37da8c58 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -121,58 +121,58 @@ connection: MACRO ; Calculate tile offsets for source (current) and target maps _src = 0 _tgt = (\4) + 3 -if _tgt < 2 +IF _tgt < 2 _src = -_tgt _tgt = 0 -endc +ENDC -if "\1" == "north" +IF "\1" == "north" _blk = \3_WIDTH * (\3_HEIGHT - 3) + _src _map = _tgt _win = (\3_WIDTH + 6) * \3_HEIGHT + 1 _y = \3_HEIGHT * 2 - 1 _x = (\4) * -2 _len = CURRENT_MAP_WIDTH + 3 - (\4) -if _len > \3_WIDTH +IF _len > \3_WIDTH _len = \3_WIDTH -endc +ENDC -elif "\1" == "south" +ELIF "\1" == "south" _blk = _src _map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt _win = \3_WIDTH + 7 _y = 0 _x = (\4) * -2 _len = CURRENT_MAP_WIDTH + 3 - (\4) -if _len > \3_WIDTH +IF _len > \3_WIDTH _len = \3_WIDTH -endc +ENDC -elif "\1" == "west" +ELIF "\1" == "west" _blk = (\3_WIDTH * _src) + \3_WIDTH - 3 _map = (CURRENT_MAP_WIDTH + 6) * _tgt _win = (\3_WIDTH + 6) * 2 - 6 _y = (\4) * -2 _x = \3_WIDTH * 2 - 1 _len = CURRENT_MAP_HEIGHT + 3 - (\4) -if _len > \3_HEIGHT +IF _len > \3_HEIGHT _len = \3_HEIGHT -endc +ENDC -elif "\1" == "east" +ELIF "\1" == "east" _blk = (\3_WIDTH * _src) _map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3 _win = \3_WIDTH + 7 _y = (\4) * -2 _x = 0 _len = CURRENT_MAP_HEIGHT + 3 - (\4) -if _len > \3_HEIGHT +IF _len > \3_HEIGHT _len = \3_HEIGHT -endc +ENDC -else +ELSE fail "Invalid direction for 'connection'." -endc +ENDC db \3 dw \2_Blocks + _blk diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index b1e1727b..4bf2c1bc 100755 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -198,10 +198,10 @@ ENDM script_mart: MACRO db TX_SCRIPT_MART db _NARG ; number of items -rept _NARG +REPT _NARG db \1 ; item id shift -endr +ENDR db -1 ; end ENDM |