diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
| commit | 2b7961759b3786725b95ee8f4a0b6e556091db7a (patch) | |
| tree | 6287d4bb7bad7d012f804dc18856341a09fc015b /engine/palettes.asm | |
| parent | Merge branch 'master' of https://github.com/iimarckus/pokered (diff) | |
| download | pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.gz pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.xz pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.zip | |
Fixes.
Diffstat (limited to 'engine/palettes.asm')
| -rwxr-xr-x | engine/palettes.asm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engine/palettes.asm b/engine/palettes.asm index 080998ff..810f8e77 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -255,7 +255,6 @@ SetPal_TrainerCard: ; 72025 (1c:6025) ld de, wTrainerCardBlkPacket ret -<<<<<<< HEAD SendUnknownPalPacket_7205d:: ; 7205d (1c:605d) ld hl,UnknownPalPacket_72811 ld de,BlkPacket_WholeScreen @@ -314,7 +313,6 @@ DeterminePaletteIDOutOfBattle: ; 72094 (1c:6094) ld a, [hl] ret -<<<<<<< HEAD Func_720ad:: ; 720ad (1c:60ad) ld a,e and a @@ -914,7 +912,6 @@ Func_72470:: ; 72470 (1c:6470) push de add a add a -<<<<<<< HEAD add a or $80 ld [rBGPI],a @@ -1157,7 +1154,7 @@ CopySGBBorderTiles: ; 725fb (1c:65fb) ; This function converts 2BPP planar data into this format by mapping ; 2BPP colors 0-3 to 4BPP colors 0-3. 4BPP colors 4-15 are not used. ld b, 128 -.loop +.tileLoop ; Copy bit planes 1 and 2 of the tile data. ld c, 16 .copyLoop |