7 files changed, 12 insertions, 7 deletions
diff --git a/source/bank_00.asm b/source/bank_00.asm
index 81b99a9..b2587ee 100644
--- a/source/bank_00.asm
+++ b/source/bank_00.asm
@@ -1,6 +1,7 @@
 INCLUDE "charmap.inc"
 INCLUDE "hardware.inc"
-INCLUDE "macros.inc"
+INCLUDE "code_macros.inc"
+INCLUDE "const_macros.inc"
 
 SECTION "reset", ROM0[$0000]
 reset::
diff --git a/source/bank_01.asm b/source/bank_01.asm
index 5cb8f34..a4b95bc 100644
--- a/source/bank_01.asm
+++ b/source/bank_01.asm
@@ -1,4 +1,6 @@
-INCLUDE "macros.inc"
+INCLUDE "code_macros.inc"
+INCLUDE "const_macros.inc"
+INCLUDE "gfx_macros.inc"
 INCLUDE "level_constants.inc"
 INCLUDE "puzzle_constants.inc"
 
diff --git a/source/bank_02.asm b/source/bank_02.asm
index 7b25e93..a98d5dc 100644
--- a/source/bank_02.asm
+++ b/source/bank_02.asm
@@ -1,5 +1,5 @@
 INCLUDE "charmap.inc"
-INCLUDE "macros.inc"
+INCLUDE "code_macros.inc"
 
 SECTION "text_char", ROMX[$4bf7], BANK[$02]
 far_textbox_print_char::
diff --git a/source/bank_05.asm b/source/bank_05.asm
index a479f82..2b99243 100644
--- a/source/bank_05.asm
+++ b/source/bank_05.asm
@@ -1,5 +1,6 @@
 INCLUDE "hardware.inc"
-INCLUDE "macros.inc"
+INCLUDE "code_macros.inc"
+INCLUDE "const_macros.inc"
 
 SECTION "tutorial", ROMX[$4000], BANK[$05]
 
diff --git a/source/bank_20.asm b/source/bank_20.asm
index 79d67cc..435c010 100644
--- a/source/bank_20.asm
+++ b/source/bank_20.asm
@@ -1,4 +1,5 @@
-INCLUDE "macros.inc"
+INCLUDE "code_macros.inc"
+INCLUDE "const_macros.inc"
 INCLUDE "level_constants.inc"
 INCLUDE "puzzle_constants.inc"
 
diff --git a/source/bank_28.asm b/source/bank_28.asm
index e5d96fe..bd5f1ce 100644
--- a/source/bank_28.asm
+++ b/source/bank_28.asm
@@ -1,5 +1,5 @@
 INCLUDE "hardware.inc"
-INCLUDE "macros.inc"
+INCLUDE "code_macros.inc"
 
 SECTION "function_28_426a", ROMX[$426a], BANK[$28]
 
diff --git a/source/bank_7c.asm b/source/bank_7c.asm
index 2c5f5da..82efa46 100644
--- a/source/bank_7c.asm
+++ b/source/bank_7c.asm
@@ -1,4 +1,4 @@
-INCLUDE "macros.inc"
+INCLUDE "gfx_macros.inc"
 
 SECTION "gfx_alphabets", ROMX[$4000], BANK[$7c]
 gfx_alphabets::