diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2015-01-20 12:14:38 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2015-01-20 12:14:38 -0600 |
| commit | 567b576f60866f92eda1660ecd19bf3e6d7519c6 (patch) | |
| tree | 37f64e9b8e11b410fc6e3723827571e16dd07e0d /engine/color.asm | |
| parent | 4781d9a809565804a4b99024a69a51156fd2749e (diff) | |
| parent | 0fa7b553bddeb4ba70b216c93eb09226b2674beb (diff) | |
Merge pull request #268 from yenatch/master
remove preprocessor
Diffstat (limited to 'engine/color.asm')
| -rw-r--r-- | engine/color.asm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/color.asm b/engine/color.asm index fbbc45144..2dd282e79 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -190,7 +190,7 @@ Function8b4d: ; 8b4d ld a, [hSGB] and a ret z - ld hl, $5c26 + ld hl, PalPacket_9c26 jp Function9809 .asm_8b5c @@ -206,7 +206,7 @@ Function8b67: ; 8b67 ld a, [hSGB] and a ret z - ld hl, $5c36 + ld hl, PalPacket_9c36 jp Function9809 .asm_8b76 @@ -2155,6 +2155,7 @@ Palettes_b469: ; b469 RGB 31, 07, 01 RGB 00, 00, 00 +Palette_b471:: RGB 28, 31, 16 RGB 31, 19, 10 RGB 10, 09, 31 |