diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 01:30:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 01:30:36 -0500 |
| commit | da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch) | |
| tree | c212adfc53d1996c06f2e4be1d6e480e687a2ad8 /engine/color.asm | |
| parent | bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff) | |
| parent | 2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff) | |
Merge pull request #437 from roukaour/master
Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon
Diffstat (limited to 'engine/color.asm')
| -rw-r--r-- | engine/color.asm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engine/color.asm b/engine/color.asm index 23f953ebe..3eafbad70 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1008,8 +1008,8 @@ PushSGBBorder: ret SGB_ClearVRAM: - ld hl, VTiles0 - ld bc, VRAM_End - VTiles0 + ld hl, VRAM_Begin + ld bc, VRAM_End - VRAM_Begin xor a call ByteFill ret @@ -1218,8 +1218,9 @@ INCLUDE "data/palettes/hp_bar.pal" ExpBarPalette: INCLUDE "data/palettes/exp_bar.pal" -INCLUDE "gfx/pics/palette_pointers.asm" -INCLUDE "gfx/trainer_palettes.asm" +INCLUDE "data/pokemon/palettes.asm" + +INCLUDE "data/trainers/palettes.asm" LoadMapPals: farcall LoadSpecialMapPalette |