summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2018-04-10 23:44:12 +0200
committerxCrystal <rgr.crystal@gmail.com>2018-04-10 23:44:12 +0200
commit1c82f51723c8c2eb347f73a16e05c9a30199aabe (patch)
treeb0eb3f98f88dd4fced1dd4245f8bad55b07d45b0
parent7cce23ef764bcc3bfaed851f8d72dcadde1400f6 (diff)
Move Empty Bank sections to main.asm
-rw-r--r--src/gfx.asm20
-rw-r--r--src/main.asm22
-rw-r--r--src/text.asm6
-rw-r--r--tcg.link4
4 files changed, 26 insertions, 26 deletions
diff --git a/src/gfx.asm b/src/gfx.asm
index 475fd93..aa5527d 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -36,9 +36,6 @@ rept $2b68
db $ff
endr
-SECTION "Empty Bank 1F", ROMX
- emptybank
-
SECTION "Gfx 3", ROMX
INCROM $84000, $87828
@@ -905,22 +902,16 @@ FightingGfx: ; a8e12 (2a:4e12)
INCROM $a8e54, $ac000
SECTION "Gfx 13", ROMX
-INCBIN "baserom.gbc", $ac000, $4000
+ INCROM $ac000, $b0000
SECTION "Gfx 14", ROMX
-INCBIN "baserom.gbc", $b0000, $4000
+ INCROM $b0000, $b4000
SECTION "Gfx 15", ROMX
-INCBIN "baserom.gbc", $b4000, $4000
+ INCROM $b4000, $b8000
SECTION "Gfx 16", ROMX
-INCBIN "baserom.gbc", $b8000, $4000
-
-SECTION "Empty Bank 2F", ROMX
- emptybank
-
-SECTION "Empty Bank 30", ROMX
- emptybank
+ INCROM $b8000, $bc000
SECTION "Card Gfx 1", ROMX
@@ -1861,6 +1852,3 @@ RecycleCardGfx:: ; ef388 (3b:7388)
rept $970
db $ff
endr
-
-SECTION "Empty Bank 3C", ROMX
- emptybank
diff --git a/src/main.asm b/src/main.asm
index 8e60df6..1533d0d 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -30,10 +30,10 @@ INCLUDE "engine/booster_packs.asm"
SECTION "Bank 8", ROMX
INCLUDE "engine/bank08.asm"
-SECTION "Bank 9", ROMX
+SECTION "Empty Bank 9", ROMX
emptybank
-SECTION "Bank A", ROMX
+SECTION "Empty Bank A", ROMX
emptybank
SECTION "Effect Functions", ROMX
@@ -45,8 +45,26 @@ INCLUDE "data/decks.asm"
SECTION "Cards", ROMX
INCLUDE "data/cards.asm"
+SECTION "Empty Bank 1A", ROMX
+ emptybank
+
+SECTION "Empty Bank 1B", ROMX
+ emptybank
+
SECTION "Bank 1C", ROMX
INCLUDE "engine/bank1c.asm"
+SECTION "Empty Bank 1F", ROMX
+ emptybank
+
SECTION "Bank 20", ROMX
INCLUDE "engine/bank20.asm"
+
+SECTION "Empty Bank 2F", ROMX
+ emptybank
+
+SECTION "Empty Bank 30", ROMX
+ emptybank
+
+SECTION "Empty Bank 3C", ROMX
+ emptybank
diff --git a/src/text.asm b/src/text.asm
index c818938..7d2140e 100644
--- a/src/text.asm
+++ b/src/text.asm
@@ -40,9 +40,3 @@ INCLUDE "text/text12.asm"
SECTION "Text 13", ROMX
INCLUDE "text/text13.asm"
-
-SECTION "Empty Bank 1A", ROMX
- emptybank
-
-SECTION "Empty Bank 1B", ROMX
- emptybank
diff --git a/tcg.link b/tcg.link
index 1031f00..1d852c4 100644
--- a/tcg.link
+++ b/tcg.link
@@ -45,9 +45,9 @@ ROMX $07
ROMX $08
"Bank 8"
ROMX $09
- "Bank 9"
+ "Empty Bank 9"
ROMX $0a
- "Bank A"
+ "Empty Bank A"
ROMX $0b
"Effect Functions"
ROMX $0c