diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-04-08 12:19:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 12:19:56 -0400 |
| commit | 673b39642b4b0dd17bd51c45ecb504e4d228111b (patch) | |
| tree | f119115f6f64fe48636155627d420417aeaab3c4 /engine | |
| parent | d076dc25e05b68eb36e9930eba52e74be2c012ba (diff) | |
| parent | 865d623846520b210c140d1c8e20157c47c06726 (diff) | |
Merge pull request #708 from Rangi42/master
Remove unused nonmatching files for electro_ball.png and sgb_border.bin
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/gfx/color.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index aa29d413b..35ad66f7f 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1191,8 +1191,8 @@ PredefPals: INCLUDE "gfx/sgb/predef.pal" SGBBorderMap: -; interleaved tile ids and palette ids -INCBIN "gfx/sgb/sgb_border.bin" +; interleaved tile ids and palette ids, without the center 20x18 screen area +INCBIN "gfx/sgb/sgb_border.sgb.tilemap" SGBBorderPalettes: ; assumed to come after SGBBorderMap |