From 43286f43737fbaf9032182b85638da59634e67e7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 8 Dec 2020 14:33:46 -0500 Subject: Match pokegold's battle transition code more closely --- data/pokemon/palettes.inc | 62 +++++++++++++++++++++++------------------------ data/super_palettes.inc | 4 +-- 2 files changed, 33 insertions(+), 33 deletions(-) (limited to 'data') diff --git a/data/pokemon/palettes.inc b/data/pokemon/palettes.inc index 71a526d..8016446 100755 --- a/data/pokemon/palettes.inc +++ b/data/pokemon/palettes.inc @@ -18,8 +18,8 @@ PokemonPalettes: db PAL_BROWNMON ; PIDGEY db PAL_BROWNMON ; PIDGEOTTO db PAL_BROWNMON ; PIDGEOT - db PAL_GREYMON ; RATTATA - db PAL_GREYMON ; RATICATE + db PAL_GRAYMON ; RATTATA + db PAL_GRAYMON ; RATICATE db PAL_BROWNMON ; SPEAROW db PAL_BROWNMON ; FEAROW db PAL_PURPLEMON ; EKANS @@ -65,23 +65,23 @@ PokemonPalettes: db PAL_YELLOWMON ; ABRA db PAL_YELLOWMON ; KADABRA db PAL_YELLOWMON ; ALAKAZAM - db PAL_GREYMON ; MACHOP - db PAL_GREYMON ; MACHOKE - db PAL_GREYMON ; MACHAMP + db PAL_GRAYMON ; MACHOP + db PAL_GRAYMON ; MACHOKE + db PAL_GRAYMON ; MACHAMP db PAL_GREENMON ; BELLSPROUT db PAL_GREENMON ; WEEPINBELL db PAL_GREENMON ; VICTREEBEL db PAL_CYANMON ; TENTACOOL db PAL_CYANMON ; TENTACRUEL - db PAL_GREYMON ; GEODUDE - db PAL_GREYMON ; GRAVELER - db PAL_GREYMON ; GOLEM + db PAL_GRAYMON ; GEODUDE + db PAL_GRAYMON ; GRAVELER + db PAL_GRAYMON ; GOLEM db PAL_REDMON ; PONYTA db PAL_REDMON ; RAPIDASH db PAL_PINKMON ; SLOWPOKE db PAL_PINKMON ; SLOWBRO - db PAL_GREYMON ; MAGNEMITE - db PAL_GREYMON ; MAGNETON + db PAL_GRAYMON ; MAGNEMITE + db PAL_GRAYMON ; MAGNETON db PAL_BROWNMON ; FARFETCHD db PAL_BROWNMON ; DODUO db PAL_BROWNMON ; DODRIO @@ -89,12 +89,12 @@ PokemonPalettes: db PAL_BLUEMON ; DEWGONG db PAL_PURPLEMON ; GRIMER db PAL_PURPLEMON ; MUK - db PAL_GREYMON ; SHELLDER - db PAL_GREYMON ; CLOYSTER + db PAL_GRAYMON ; SHELLDER + db PAL_GRAYMON ; CLOYSTER db PAL_PURPLEMON ; GASTLY db PAL_PURPLEMON ; HAUNTER db PAL_PURPLEMON ; GENGAR - db PAL_GREYMON ; ONIX + db PAL_GRAYMON ; ONIX db PAL_YELLOWMON ; DROWZEE db PAL_YELLOWMON ; HYPNO db PAL_REDMON ; KRABBY @@ -103,15 +103,15 @@ PokemonPalettes: db PAL_YELLOWMON ; ELECTRODE db PAL_PINKMON ; EXEGGCUTE db PAL_GREENMON ; EXEGGUTOR - db PAL_GREYMON ; CUBONE - db PAL_GREYMON ; MAROWAK + db PAL_GRAYMON ; CUBONE + db PAL_GRAYMON ; MAROWAK db PAL_BROWNMON ; HITMONLEE db PAL_BROWNMON ; HITMONCHAN db PAL_PINKMON ; LICKITUNG db PAL_PURPLEMON ; KOFFING db PAL_PURPLEMON ; WEEZING - db PAL_GREYMON ; RHYHORN - db PAL_GREYMON ; RHYDON + db PAL_GRAYMON ; RHYHORN + db PAL_GRAYMON ; RHYDON db PAL_PINKMON ; CHANSEY db PAL_BLUEMON ; TANGELA db PAL_BROWNMON ; KANGASKHAN @@ -120,33 +120,33 @@ PokemonPalettes: db PAL_REDMON ; GOLDEEN db PAL_REDMON ; SEAKING db PAL_REDMON ; STARYU - db PAL_GREYMON ; STARMIE + db PAL_GRAYMON ; STARMIE db PAL_PINKMON ; MRMIME db PAL_GREENMON ; SCYTHER db PAL_MEWMON ; JYNX db PAL_YELLOWMON ; ELECTABUZZ db PAL_REDMON ; MAGMAR db PAL_BROWNMON ; PINSIR - db PAL_GREYMON ; TAUROS + db PAL_GRAYMON ; TAUROS db PAL_REDMON ; MAGIKARP db PAL_BLUEMON ; GYARADOS db PAL_CYANMON ; LAPRAS - db PAL_GREYMON ; DITTO - db PAL_GREYMON ; EEVEE + db PAL_GRAYMON ; DITTO + db PAL_GRAYMON ; EEVEE db PAL_CYANMON ; VAPOREON db PAL_YELLOWMON ; JOLTEON db PAL_REDMON ; FLAREON - db PAL_GREYMON ; PORYGON + db PAL_GRAYMON ; PORYGON db PAL_BLUEMON ; OMANYTE db PAL_BLUEMON ; OMASTAR db PAL_BROWNMON ; KABUTO db PAL_BROWNMON ; KABUTOPS - db PAL_GREYMON ; AERODACTYL + db PAL_GRAYMON ; AERODACTYL db PAL_PINKMON ; SNORLAX db PAL_BLUEMON ; ARTICUNO db PAL_YELLOWMON ; ZAPDOS db PAL_REDMON ; MOLTRES - db PAL_GREYMON ; DRATINI + db PAL_GRAYMON ; DRATINI db PAL_BLUEMON ; DRAGONAIR db PAL_BROWNMON ; DRAGONITE db PAL_MEWMON ; MEWTWO @@ -186,8 +186,8 @@ PokemonPalettes: db PAL_REDMON ; PARA db PAL_PURPLEMON ; KOKUMO db PAL_PURPLEMON ; TWOHEAD - db PAL_GREYMON ; YOROIDORI - db PAL_GREYMON ; ANIMON + db PAL_GRAYMON ; YOROIDORI + db PAL_GRAYMON ; ANIMON db PAL_BROWNMON ; HINAZU db PAL_YELLOWMON ; SUNNY db PAL_CYANMON ; PAON @@ -205,9 +205,9 @@ PokemonPalettes: db PAL_REDMON ; MITSUBOSHI db PAL_REDMON ; PUCHICORN db PAL_YELLOWMON ; EIFIE - db PAL_GREYMON ; BLACKY - db PAL_GREYMON ; TURBAN - db PAL_GREYMON ; BETBABY + db PAL_GRAYMON ; BLACKY + db PAL_GRAYMON ; TURBAN + db PAL_GRAYMON ; BETBABY db PAL_BLUEMON ; TEPPOUO db PAL_REDMON ; OKUTANK db PAL_BROWNMON ; GONGU @@ -238,9 +238,9 @@ PokemonPalettes: db PAL_REDMON ; HELGAA db PAL_BROWNMON ; WOLFMAN db PAL_BROWNMON ; WARWOLF - db PAL_GREYMON ; PORYGON2 + db PAL_GRAYMON ; PORYGON2 db PAL_PINKMON ; NAMEIL - db PAL_GREYMON ; HAGANEIL + db PAL_GRAYMON ; HAGANEIL db PAL_BLUEMON ; KINGDRA db PAL_YELLOWMON ; RAI db PAL_REDMON ; EN diff --git a/data/super_palettes.inc b/data/super_palettes.inc index 02fbed3..5dba6d8 100644 --- a/data/super_palettes.inc +++ b/data/super_palettes.inc @@ -23,7 +23,7 @@ SuperPalettes:: RGB 28,28,28, 20,26,16, 09,20,11, 04,04,04 ; GREENMON RGB 28,28,28, 30,22,24, 28,15,21, 04,04,04 ; PINKMON RGB 28,28,28, 31,28,14, 26,20,00, 04,04,04 ; YELLOWMON - RGB 28,28,28, 26,21,22, 15,15,18, 04,04,04 ; GREYMON + RGB 28,28,28, 26,21,22, 15,15,18, 04,04,04 ; GRAYMON RGB 28,28,28, 23,19,13, 14,12,17, 04,04,04 ; SHINY_MEWMON RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; SHINY_BLUEMON RGB 28,28,28, 22,15,16, 17,02,05, 04,04,04 ; SHINY_REDMON @@ -33,7 +33,7 @@ SuperPalettes:: RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; SHINY_GREENMON RGB 28,28,28, 21,25,29, 30,22,24, 04,04,04 ; SHINY_PINKMON RGB 28,28,28, 26,23,16, 29,14,09, 04,04,04 ; SHINY_YELLOWMON - RGB 28,28,28, 18,18,18, 10,10,10, 04,04,04 ; SHINY_GREYMON + RGB 28,28,28, 18,18,18, 10,10,10, 04,04,04 ; SHINY_GRAYMON RGB 28,28,28, 30,26,15, 09,20,11, 04,04,04 ; GREEN_BAR RGB 28,28,28, 30,26,15, 26,20,00, 04,04,04 ; YELLOW_BAR RGB 28,28,28, 30,26,15, 26,10,06, 04,04,04 ; RED_BAR -- cgit v1.2.3