diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-16 21:42:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 21:42:24 -0500 |
| commit | 8a924f1f783572ff395f617f99546b4c949c8b04 (patch) | |
| tree | 1b6c7de331cb983256651b11b8adf413a3a434f1 /macros.asm | |
| parent | 88d7e9a34a8b610b358cec1ccc6660634ca9ce80 (diff) | |
| parent | ed94962edf1668aba3f60938e8a5ba8040e2a59c (diff) | |
Merge pull request #30 from entrpntr/spring-cleaning
Spring Cleaning
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 24 |
1 files changed, 10 insertions, 14 deletions
@@ -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 |