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 /home/palettes.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 'home/palettes.asm')
| -rw-r--r-- | home/palettes.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/palettes.asm b/home/palettes.asm index 80e4e25ec..bf414eee7 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -246,7 +246,7 @@ CopyPals:: ; d50 ; copy c palettes in order b from de to hl push bc - ld c, 4 ; NUM_PAL_COLORS + ld c, NUM_PAL_COLORS .loop push de push hl @@ -280,7 +280,7 @@ CopyPals:: ; d50 jr nz, .loop ; de += 8 (next pal) - ld a, 1 palettes ; NUM_PAL_COLORS * 2 ; bytes per pal + ld a, NUM_PAL_COLORS * 2 add e jr nc, .ok inc d @@ -303,8 +303,8 @@ ClearVBank1:: ; d79 ld a, 1 ld [rVBK], a - ld hl, VTiles0 - ld bc, VRAM_End - VTiles0 + ld hl, VRAM_Begin + ld bc, VRAM_End - VRAM_Begin xor a call ByteFill |