aboutsummaryrefslogtreecommitdiffstats
path: root/data/sgb
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-01-30 21:40:19 -0600
committerdannye <33dannye@gmail.com>2025-01-30 21:40:19 -0600
commit6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch)
tree39736ab1dd8ebcc57f8e981db6103285743d5530 /data/sgb
parentIdentify unnamed functions in map_sprites.asm (#126) (diff)
parentFix some label typos, and add some constants instead of raw numbers (#492) (diff)
downloadpokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz
pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz
pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/sgb')
-rw-r--r--data/sgb/sgb_palettes.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm
index 4f70558e..2c7537d0 100644
--- a/data/sgb/sgb_palettes.asm
+++ b/data/sgb/sgb_palettes.asm
@@ -43,7 +43,7 @@ SuperPalettes:
RGB 31,31,30, 16,16,16, 31,25,09, 06,06,06 ; PAL_PIKACHUS_BEACH_TITLE
assert_table_length NUM_SGB_PALS
-GBCBasePalettes:
+CGBBasePalettes:
; entries correspond to PAL_* constants
table_width 2 * 4
RGB 31,31,31, 16,31,04, 11,23,31, 03,03,03 ; PAL_ROUTE