summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm24
1 files changed, 10 insertions, 14 deletions
diff --git a/macros.asm b/macros.asm
index ad584206..30056c9d 100644
--- a/macros.asm
+++ b/macros.asm
@@ -11,23 +11,19 @@ INCLUDE "macros/scripts/maps.asm"
INCLUDE "macros/scripts/events.asm"
INCLUDE "macros/scripts/text.asm"
INCLUDE "macros/scripts/movement.asm"
+INCLUDE "macros/scripts/battle_commands.asm"
+INCLUDE "macros/scripts/battle_anims.asm"
INCLUDE "macros/scripts/trade_anims.asm"
-INCLUDE "macros/move_effect.asm"
-INCLUDE "macros/move_anim.asm"
-INCLUDE "macros/pic.asm"
-INCLUDE "macros/mobile.asm"
-INCLUDE "macros/pals.asm"
-INCLUDE "macros/flag.asm"
-
-;INCLUDE "macros/legacy.asm"
+; TODO: Should this be included or not?
+; - Leave out for now so no code depending on legacy macros gets introduced
+;
+; INCLUDE "macros/legacy.asm"
dr: macro
-IF DEF(GOLD)
-INCBIN "baserom-gold.gbc", \1, \2 +- \1
-ELSE
-IF DEF(SILVER)
-INCBIN "baserom-silver.gbc", \1, \2 +- \1
-ENDC
+IF DEF(_GOLD)
+INCBIN "baserom-gold.gbc", \1, \2 - \1
+ELIF DEF(_SILVER)
+INCBIN "baserom-silver.gbc", \1, \2 - \1
ENDC
ENDM