summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 16:37:47 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 16:37:47 -0400
commit9878f01e29b1443d6c894c1332cbf381fa12646e (patch)
tree8e763ca94f2b90faaa470416055c320dbdb89cbf /macros.asm
parentccb01731fe8cd44ae4c8840ee8ddc02e6bdea97e (diff)
Organize macros/ like pokecrystal
While doing so I replaced the StopAllMusic macro with a SFX_STOP_ALL_MUSIC constant and applied it throughout the code.
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm16
1 files changed, 11 insertions, 5 deletions
diff --git a/macros.asm b/macros.asm
index b779ec5f..a092d25c 100644
--- a/macros.asm
+++ b/macros.asm
@@ -1,5 +1,11 @@
-INCLUDE "macros/asm_macros.asm"
-INCLUDE "macros/data_macros.asm"
-INCLUDE "macros/text_macros.asm"
-INCLUDE "macros/audio_macros.asm"
-INCLUDE "macros/event_macros.asm"
+INCLUDE "macros/enum.asm"
+INCLUDE "macros/predef.asm"
+INCLUDE "macros/farcall.asm"
+INCLUDE "macros/data.asm"
+INCLUDE "macros/code.asm"
+INCLUDE "macros/coords.asm"
+
+INCLUDE "macros/scripts/audio.asm"
+INCLUDE "macros/scripts/maps.asm"
+INCLUDE "macros/scripts/events.asm"
+INCLUDE "macros/scripts/text.asm"