Pokemon data, Gym Leader teams, palette updates and a couple of other fixes

This commit is contained in:
MementoMartha 2022-08-31 11:47:05 +01:00
parent ac45c8b5bc
commit f5a7cc9ffc
14 changed files with 221 additions and 201 deletions

View file

@ -1,53 +1,53 @@
SuperPalettes:
; entries correspond to PAL_* constants
table_width 2 * 4, SuperPalettes
RGB 31,29,31, 21,28,11, 20,26,31, 03,02,02 ; PAL_ROUTE
RGB 31,29,31, 25,28,27, 20,26,31, 03,02,02 ; PAL_PALLET
RGB 31,29,31, 17,26,03, 20,26,31, 03,02,02 ; PAL_VIRIDIAN
RGB 31,29,31, 23,25,16, 20,26,31, 03,02,02 ; PAL_PEWTER
RGB 31,29,31, 17,20,30, 20,26,31, 03,02,02 ; PAL_CERULEAN
RGB 31,29,31, 27,20,27, 20,26,31, 03,02,02 ; PAL_LAVENDER
RGB 31,29,31, 30,18,00, 20,26,31, 03,02,02 ; PAL_VERMILION
RGB 31,29,31, 16,30,22, 20,26,31, 03,02,02 ; PAL_CELADON
RGB 31,29,31, 31,15,22, 20,26,31, 03,02,02 ; PAL_FUCHSIA
RGB 31,29,31, 26,10,06, 20,26,31, 03,02,02 ; PAL_CINNABAR
RGB 31,29,31, 22,14,24, 20,26,31, 03,02,02 ; PAL_INDIGO
RGB 31,29,31, 27,27,03, 20,26,31, 03,02,02 ; PAL_SAFFRON
RGB 31,29,31, 20,26,31, 17,23,10, 03,02,02 ; PAL_TOWNMAP
RGB 31,31,31, 16,31,04, 11,23,31, 03,03,03 ; PAL_ROUTE
RGB 31,31,31, 23,17,31, 11,23,31, 03,03,03 ; PAL_PALLET
RGB 31,31,31, 19,31,00, 11,23,31, 03,03,03 ; PAL_VIRIDIAN
RGB 31,31,31, 18,18,15, 11,23,31, 03,03,03 ; PAL_PEWTER
RGB 31,31,31, 05,08,31, 11,23,31, 03,03,03 ; PAL_CERULEAN
RGB 31,31,31, 25,04,31, 11,23,31, 03,03,03 ; PAL_LAVENDER
RGB 31,31,31, 31,19,00, 11,23,31, 03,03,03 ; PAL_VERMILION
RGB 31,31,31, 05,31,05, 11,23,31, 03,03,03 ; PAL_CELADON
RGB 31,31,31, 31,15,15, 11,23,31, 03,03,03 ; PAL_FUCHSIA
RGB 31,31,31, 31,08,08, 11,23,31, 03,03,03 ; PAL_CINNABAR
RGB 31,31,31, 11,08,31, 11,23,31, 03,03,03 ; PAL_INDIGO
RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_SAFFRON
RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP
IF DEF(_RED)
RGB 31,29,31, 30,30,17, 17,23,10, 21,00,04 ; PAL_LOGO1
RGB 31,31,31, 31,31,00, 17,23,10, 23,03,03 ; PAL_LOGO1
ENDC
IF DEF(_BLUE)
RGB 31,29,31, 30,30,17, 21,00,04, 14,19,29 ; PAL_LOGO1
RGB 31,31,31, 31,31,00, 21,00,04, 03,03,23 ; PAL_LOGO1
ENDC
RGB 31,29,31, 30,30,17, 18,18,24, 07,07,16 ; PAL_LOGO2
RGB 31,29,31, 24,20,30, 11,20,30, 03,02,02 ; PAL_0F
RGB 31,29,31, 30,22,17, 16,14,19, 03,02,02 ; PAL_MEWMON
RGB 31,29,31, 18,20,27, 11,15,23, 03,02,02 ; PAL_BLUEMON
RGB 31,29,31, 31,20,10, 26,10,06, 03,02,02 ; PAL_REDMON
RGB 31,29,31, 21,25,29, 14,19,25, 03,02,02 ; PAL_CYANMON
RGB 31,29,31, 27,22,24, 21,15,23, 03,02,02 ; PAL_PURPLEMON
RGB 31,29,31, 28,20,15, 21,14,09, 03,02,02 ; PAL_BROWNMON
RGB 31,29,31, 20,26,16, 09,20,11, 03,02,02 ; PAL_GREENMON
RGB 31,29,31, 30,22,24, 28,15,21, 03,02,02 ; PAL_PINKMON
RGB 31,29,31, 31,28,14, 26,20,00, 03,02,02 ; PAL_YELLOWMON
RGB 31,29,31, 26,21,22, 15,15,18, 03,02,02 ; PAL_GREYMON
RGB 31,29,31, 26,21,22, 27,20,06, 03,02,02 ; PAL_SLOTS1
RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2
RGB 31,31,31, 13,01,31, 00,09,31, 01,01,01 ; PAL_0F
RGB 31,31,31, 30,17,11, 11,05,14, 03,03,03 ; PAL_MEWMON
RGB 31,31,31, 16,18,31, 00,01,25, 03,03,03 ; PAL_BLUEMON
RGB 31,31,31, 31,17,00, 31,00,00, 03,03,03 ; PAL_REDMON
RGB 31,31,31, 16,26,31, 00,17,31, 03,03,03 ; PAL_CYANMON
RGB 31,31,31, 25,15,31, 19,00,22, 03,03,03 ; PAL_PURPLEMON
RGB 31,31,31, 29,18,10, 17,09,05, 03,03,03 ; PAL_BROWNMON
RGB 31,31,31, 17,31,11, 01,22,06, 03,03,03 ; PAL_GREENMON
RGB 31,31,31, 31,15,18, 31,00,06, 03,03,03 ; PAL_PINKMON
RGB 31,31,31, 31,31,00, 28,14,00, 03,03,03 ; PAL_YELLOWMON
RGB 31,31,31, 18,18,19, 10,10,10, 03,03,03 ; PAL_GREYMON
RGB 31,31,31, 21,12,15, 21,14,00, 03,03,03 ; PAL_SLOTS1
IF DEF(_RED)
RGB 31,29,31, 31,31,17, 25,17,21, 03,02,02 ; PAL_SLOTS2
RGB 31,29,31, 22,31,16, 25,17,21, 03,02,02 ; PAL_SLOTS3
RGB 31,29,31, 16,19,29, 25,17,21, 03,02,02 ; PAL_SLOTS4
RGB 31,31,31, 31,31,00, 20,08,15, 03,03,03 ; PAL_SLOTS2
RGB 31,31,31, 03,31,09, 20,08,15, 03,03,03 ; PAL_SLOTS3
RGB 31,31,31, 09,05,30, 20,08,15, 03,03,03 ; PAL_SLOTS4
ENDC
IF DEF(_BLUE)
RGB 31,29,31, 31,31,17, 16,19,29, 03,02,02 ; PAL_SLOTS2
RGB 31,29,31, 22,31,16, 16,19,29, 03,02,02 ; PAL_SLOTS3
RGB 31,29,31, 25,17,21, 16,19,29, 03,02,02 ; PAL_SLOTS4
RGB 31,31,31, 31,31,00, 09,05,30, 03,03,03 ; PAL_SLOTS2
RGB 31,31,31, 03,31,09, 09,05,30, 03,03,03 ; PAL_SLOTS3
RGB 31,31,31, 20,08,15, 09,05,30, 03,03,03 ; PAL_SLOTS4
ENDC
RGB 31,29,31, 07,07,07, 02,03,03, 03,02,02 ; PAL_BLACK
RGB 31,29,31, 30,26,15, 09,20,11, 03,02,02 ; PAL_GREENBAR
RGB 31,29,31, 30,26,15, 26,20,00, 03,02,02 ; PAL_YELLOWBAR
RGB 31,29,31, 30,26,15, 26,10,06, 03,02,02 ; PAL_REDBAR
RGB 31,29,31, 30,22,17, 11,15,23, 03,02,02 ; PAL_BADGE
RGB 31,29,31, 21,14,09, 18,24,22, 03,02,02 ; PAL_CAVE
RGB 31,29,31, 31,28,14, 24,20,10, 03,02,02 ; PAL_GAMEFREAK
RGB 31,31,31, 03,03,03, 03,03,03, 03,03,03 ; PAL_BLACK
RGB 31,31,31, 31,31,00, 00,31,00, 03,03,03 ; PAL_GREENBAR
RGB 31,31,31, 31,31,00, 31,18,00, 03,03,03 ; PAL_YELLOWBAR
RGB 31,31,31, 31,31,00, 31,00,00, 03,03,03 ; PAL_REDBAR
RGB 31,31,31, 03,11,06, 03,17,11, 03,03,03 ; PAL_BADGE
RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE
RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK
assert_table_length NUM_SGB_PALS