summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-09-10 22:47:24 -0700
committerBryan Bishop <kanzure@gmail.com>2013-09-10 22:47:24 -0700
commit18656332b7b4ca67461d4cd4b6b8282d3bc7ab0c (patch)
treec5edf9bb9811384df6994e85f49d082921223d4f /main.asm
parent5f6ecb8d1ed1af55ba79e8db342c07368d7f6760 (diff)
parente11a56a1f654de05043eeefac0061e6d2c1b67ba (diff)
Merge pull request #202 from yenatch/rgbasm-objects
makefile: support multiple rgbasm objects
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/main.asm b/main.asm
index 011e7d966..3961dcba0 100644
--- a/main.asm
+++ b/main.asm
@@ -86589,7 +86589,7 @@ SECTION "bank6C",ROMX,BANK[$6C]
; Common text I
-INCLUDE "text/common.tx"
+INCLUDE "text/common.asm"
; Map Scripts XXV
@@ -86599,10 +86599,10 @@ INCLUDE "maps/Route10North.asm"
SECTION "bank6D",ROMX,BANK[$6D]
-INCLUDE "text/phone/mom.tx"
-INCLUDE "text/phone/bill.tx"
-INCLUDE "text/phone/elm.tx"
-INCLUDE "text/phone/trainers1.tx"
+INCLUDE "text/phone/mom.asm"
+INCLUDE "text/phone/bill.asm"
+INCLUDE "text/phone/elm.asm"
+INCLUDE "text/phone/trainers1.asm"
SECTION "bank6E",ROMX,BANK[$6E]
@@ -86617,21 +86617,21 @@ SECTION "bank6F",ROMX,BANK[$6F]
; Common text II
-INCLUDE "text/common_2.tx"
+INCLUDE "text/common_2.asm"
SECTION "bank70",ROMX,BANK[$70]
; Common text III
-INCLUDE "text/common_3.tx"
+INCLUDE "text/common_3.asm"
SECTION "bank71",ROMX,BANK[$71]
; Common text IV
-INCLUDE "text/common_4.tx"
+INCLUDE "text/common_4.asm"
SECTION "bank72",ROMX,BANK[$72]