diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-23 12:59:19 -0400 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-23 12:59:19 -0400 |
commit | 432df825d4039a44a49fff01ef843395ab5abb3d (patch) | |
tree | 5a2dce3edf871a8d420b927411cee6ef1f931781 /macros/trainer.asm | |
parent | 185b0a1c86e442d9c3ecd38d7c3fc7cfdb24be21 (diff) |
Replaced GROUP_, MAP_ references with the map macro
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro
Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme
Added new macro elevfloor to simplify the definition of elevators under this new scheme
Diffstat (limited to 'macros/trainer.asm')
-rw-r--r-- | macros/trainer.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/macros/trainer.asm b/macros/trainer.asm index b7c8ad803..2e6c61884 100644 --- a/macros/trainer.asm +++ b/macros/trainer.asm @@ -1,11 +1,11 @@ -trainerclass: MACRO
- enum \1
-const_value = 1
-ENDM
-
-trainer: MACRO
- ; flag, group, id, seen text, win text, lost text, talk-again text
- dw \1
- db \2, \3
- dw \4, \5, \6, \7
-ENDM
+trainerclass: MACRO + enum \1 +const_value = 1 +ENDM + +trainer: MACRO + ; flag, group, id, seen text, win text, lost text, talk-again text + dw \1 + db \2, \3 + dw \4, \5, \6, \7 +ENDM |