summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@github.com>2013-02-09 04:54:18 -0500
committeryenatch <yenatch@github.com>2013-02-09 04:54:18 -0500
commit76b284c8f03b01758f7c95ccadeb5b28b67c493d (patch)
treeb99eeb3e3b4e4e42f64be0e74b7b8e75597763c8 /main.asm
parent70280c0c3f64e41edaed8d2726c6472bec395f55 (diff)
Dump and include trainer palettes
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm7
1 files changed, 6 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 8d9845006..63a7e00e8 100644
--- a/main.asm
+++ b/main.asm
@@ -4097,7 +4097,12 @@ INCBIN "baserom.gbc",$a8be,$a8d6 - $a8be
PokemonPalettes:
INCLUDE "gfx/pics/palette_pointers.asm"
-INCBIN "baserom.gbc",$b0ae,$c000 - $b0ae
+INCBIN "baserom.gbc",$b0ae,$b0d2 - $b0ae
+
+TrainerPalettes:
+INCLUDE "gfx/trainers/palette_pointers.asm"
+
+INCBIN "baserom.gbc",$b1de,$bc3a - $b1de
SECTION "bank3",DATA,BANK[$3]