summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm11
1 files changed, 8 insertions, 3 deletions
diff --git a/macros.asm b/macros.asm
index 39e3f7d7..adbf2632 100644
--- a/macros.asm
+++ b/macros.asm
@@ -1,19 +1,18 @@
INCLUDE "macros/enum.asm"
INCLUDE "macros/basestats.asm"
-INCLUDE "macros/event.asm"
+INCLUDE "macros/scripts/maps.asm"
+INCLUDE "macros/scripts/events.asm"
INCLUDE "macros/sound.asm"
INCLUDE "macros/text.asm"
INCLUDE "macros/charmap.asm"
INCLUDE "macros/move_effect.asm"
INCLUDE "macros/move_anim.asm"
INCLUDE "macros/movement.asm"
-INCLUDE "macros/map.asm"
INCLUDE "macros/pic.asm"
INCLUDE "macros/predef.asm"
INCLUDE "macros/rst.asm"
INCLUDE "macros/mobile.asm"
-INCLUDE "macros/trainer.asm"
INCLUDE "macros/trade_anim.asm"
INCLUDE "macros/pals.asm"
INCLUDE "macros/flag.asm"
@@ -282,6 +281,12 @@ else
endc
endm
+menu_coords: MACRO
+; x1, y1, x2, y2
+ db \2, \1 ; start coords
+ db \4, \3 ; end coords
+ENDM
+
jumptable: MACRO
ld a, [\2]
ld e, a