diff options
| author | yenatch <yenatch@gmail.com> | 2013-12-21 00:56:04 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-12-21 00:56:04 -0500 |
| commit | d9ad10771c74ee74e165f09a662bbc2dc8ae5032 (patch) | |
| tree | 2bdb6ae6700a4f070c370ce18cf7bdb21e39b5d4 | |
| parent | 4a40c26f6ccc7f7c9c6f676b0f759ccd62ebd05a (diff) | |
move a palette map incbin into tilesets/palette_maps.asm
| -rw-r--r-- | main.asm | 2 | ||||
| -rw-r--r-- | tilesets/palette_maps.asm | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -46994,8 +46994,6 @@ Function4c03f: ; 4c03f INCLUDE "tilesets/palette_maps.asm" -INCBIN "baserom.gbc",$4ce05,$4ce1f - $4ce05 - TileCollisionTable: ; 4ce1f ; 00 land ; 01 water diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm index a7ef63c43..9f2f76676 100644 --- a/tilesets/palette_maps.asm +++ b/tilesets/palette_maps.asm @@ -105,7 +105,7 @@ Tileset20PalMap: ; 0x4caf5 INCBIN "tilesets/20_palette_map.bin" ; 0x4cb65 -INCBIN "baserom.gbc", $4cb65, $4cbd5-$4cb65 +INCBIN "baserom.gbc", $4cb65, $4cbd5 - $4cb65 Tileset29PalMap: ; 0x4cbd5 INCBIN "tilesets/29_palette_map.bin" @@ -127,3 +127,5 @@ Tileset04PalMap: ; 0x4cd95 INCBIN "tilesets/04_palette_map.bin" ; 0x4ce05 +INCBIN "baserom.gbc", $4ce05, $4ce1f - $4ce05 + |