Accounted for expansion in FollowerSparkleCoords
Added check to make sure the sparkle coordinates for each follower was in the correct order, depending on expansion.
This commit is contained in:
W1serV1ser committed
1 parent
4f18a3fa89
commit
96db459f46
1 file changed
+114
+114
@@ -485,6 +485,7 @@ static const u8 FollowerSparkleCoords[][6] =
|
||||
{15, 9, 15, 9, 8, 9}, // Seedot
|
||||
{15, 12, 15, 12, 9, 12}, // Nuzleaf
|
||||
{16, 12, 16, 12, 13, 12}, // Shiftry
|
||||
#ifndef POKEMON_EXPANSION
|
||||
{15, 9, 15, 8, 12, 8}, // Nincada
|
||||
{15, 12, 15, 12, 12, 12}, // Ninjask
|
||||
{16, 13, 16, 14, 12, 13}, // Shedinja
|
||||
@@ -596,6 +597,119 @@ static const u8 FollowerSparkleCoords[][6] =
|
||||
{15, 13, 15, 13, 10, 12}, // Jirachi
|
||||
{16, 14, 16, 14, 9, 13}, // Deoxys (Normal)
|
||||
{16, 11, 16, 11, 7, 11}, // Chimecho
|
||||
#else
|
||||
{15, 9, 15, 9, 10, 8}, // Taillow
|
||||
{15, 13, 15, 12, 16, 15}, // Swellow
|
||||
{15, 11, 15, 10, 12, 13}, // Wingull
|
||||
{16, 14, 16, 14, 14, 13}, // Pelipper
|
||||
{9, 15, 9, 9, 9}, // Ralts
|
||||
{15, 11, 15, 11, 9, 11}, // Kirlia
|
||||
{16, 12, 16, 13, 10, 12}, // Gardevoir
|
||||
{15, 9, 15, 9, 10, 9}, // Surskit
|
||||
{16, 14, 16, 15, 10, 14}, // Masquerain
|
||||
{15, 9, 15, 9, 10, 9}, // Shroomish
|
||||
{16, 12, 16, 12, 12, 12}, // Breloom
|
||||
{15, 9, 15, 9, 12, 8}, // Slakoth
|
||||
{16, 11, 16, 11, 14, 11}, // Vigoroth
|
||||
{16, 15, 16, 14, 14, 14}, // Slaking
|
||||
{15, 9, 15, 8, 12, 8}, // Nincada
|
||||
{15, 12, 15, 12, 12, 12}, // Ninjask
|
||||
{16, 13, 16, 14, 12, 13}, // Shedinja
|
||||
{16, 8, 16, 8, 8, 8}, // Whismur
|
||||
{16, 11, 16, 11, 9, 12}, // Loudred
|
||||
{16, 14, 16, 14, 17, 15}, // Exploud
|
||||
{16, 10, 16, 10, 9, 11}, // Makuhita
|
||||
{14, 14, 14, 13, 14, 13}, // Hariyama
|
||||
{17, 9, 14, 8, 13, 7}, // Azurill
|
||||
{15, 11, 15, 11, 11, 11}, // Nosepass
|
||||
{15, 10, 15, 9, 12, 9}, // Skitty
|
||||
{16, 13, 16, 12, 13, 12}, // Delcatty
|
||||
{16, 9, 16, 9, 9, 10}, // Sableye
|
||||
{17, 11, 14, 11, 13, 11}, // Mawile
|
||||
{16, 8, 16, 8, 9, 8}, // Aron
|
||||
{15, 13, 15, 12, 16, 10}, // Lairon
|
||||
{15, 15, 15, 14, 16, 14}, // Aggron
|
||||
{15, 12, 15, 11, 8, 11}, // Meditite
|
||||
{15, 13, 15, 13, 8, 13}, // Medicham
|
||||
{15, 11, 15, 9, 13, 8}, // Electrike
|
||||
{15, 13, 15, 13, 14, 13}, // Manectric
|
||||
{15, 9, 15, 9, 9, 9}, // Plusle
|
||||
{15, 9, 15, 9, 9, 9}, // Minun
|
||||
{15, 14, 15, 14, 12, 12}, // Volbeat
|
||||
{16, 13, 16, 13, 11, 12}, // Illumise
|
||||
{15, 10, 15, 10, 8, 10}, // Roselia
|
||||
{16, 9, 16, 9, 10, 9}, // Gulpin
|
||||
{16, 14, 16, 14, 14, 14}, // Swalot
|
||||
{15, 12, 15, 12, 11, 11}, // Carvanha
|
||||
{16, 14, 16, 12, 13, 14}, // Sharpedo
|
||||
{16, 11, 16, 11, 13, 11}, // Wailmer
|
||||
{32, 19, 32, 18, 38, 12}, // Wailord
|
||||
{15, 12, 15, 12, 15, 12}, // Numel
|
||||
{15, 14, 15, 14, 17, 12}, // Camerupt
|
||||
{16, 10, 16, 11, 15, 10}, // Torkoal
|
||||
{15, 11, 15, 11, 8, 10}, // Spoink
|
||||
{15, 11, 15, 11, 11, 11}, // Grumpig
|
||||
{16, 10, 16, 10, 9, 11}, // Spinda
|
||||
{16, 8, 16, 8, 10, 8}, // Trapinch
|
||||
{16, 13, 16, 11, 15, 14}, // Vibrava
|
||||
{16, 17, 16, 17, 15, 14}, // Flygon
|
||||
{15, 9, 15, 9, 8, 9}, // Cacnea
|
||||
{15, 12, 15, 12, 11, 12}, // Cacturne
|
||||
{16, 12, 16, 11, 11, 10}, // Swablu
|
||||
{16, 16, 16, 16, 14, 15}, // Altaria
|
||||
{15, 12, 15, 12, 13, 12}, // Zangoose
|
||||
{18, 14, 14, 14, 16, 10}, // Seviper
|
||||
{16, 11, 16, 11, 10, 11}, // Lunatone
|
||||
{16, 13, 16, 13, 8, 13}, // Solrock
|
||||
{15, 9, 16, 9, 9, 11}, // Barboach
|
||||
{15, 10, 15, 11, 14, 9}, // Whiscash
|
||||
{15, 10, 15, 11, 11, 10}, // Corphish
|
||||
{16, 13, 16, 13, 13, 12}, // Crawdaunt
|
||||
{16, 11, 16, 11, 7, 11}, // Baltoy
|
||||
{16, 14, 16, 14, 11, 13}, // Claydol
|
||||
{16, 11, 16, 12, 10, 11}, // Lileep
|
||||
{16, 15, 16, 15, 12, 15}, // Cradily
|
||||
{16, 11, 16, 10, 14, 9}, // Anorith
|
||||
{15, 13, 15, 12, 13, 13}, // Armaldo
|
||||
{16, 9, 16, 9, 10, 9}, // Feebas
|
||||
{19, 13, 11, 12, 14, 13}, // Milotic
|
||||
{15, 11, 15, 10, 7, 10}, // Castform
|
||||
{16, 11, 16, 11, 10, 11}, // Kecleon
|
||||
{15, 11, 15, 11, 8, 11}, // Shuppet
|
||||
{17, 10, 16, 10, 9, 10}, // Banette
|
||||
{16, 12, 16, 11, 9, 12}, // Duskull
|
||||
{15, 13, 15, 13, 13, 13}, // Dusclops
|
||||
{16, 13, 16, 13, 16, 13}, // Tropius
|
||||
{16, 11, 16, 11, 7, 11}, // Chimecho
|
||||
{14, 14, 16, 14, 15, 13}, // Absol
|
||||
{16, 10, 16, 10, 10, 9}, // Wynaut
|
||||
{15, 9, 15, 9, 9, 9}, // Snorunt
|
||||
{16, 12, 16, 12, 11, 14}, // Glalie
|
||||
{15, 9, 15, 9, 11, 9}, // Spheal
|
||||
{15, 12, 15, 13, 15, 12}, // Sealeo
|
||||
{15, 13, 15, 14, 16, 14}, // Walrein
|
||||
{15, 8, 15, 8, 8, 9}, // Clamperl
|
||||
{18, 15, 11, 14, 14, 14}, // Huntail
|
||||
{17, 16, 12, 14, 15, 11}, // Gorebyss
|
||||
{15, 13, 15, 12, 14, 10}, // Relicanth
|
||||
{16, 9, 16, 9, 8, 9}, // Luvdisc
|
||||
{16, 11, 16, 11, 10, 10}, // Bagon
|
||||
{16, 10, 16, 10, 11, 10}, // Shelgon
|
||||
{16, 14, 16, 13, 16, 13}, // Salamence
|
||||
{15, 13, 15, 12, 12, 12}, // Beldum
|
||||
{16, 14, 16, 13, 15, 13}, // Metang
|
||||
{16, 14, 16, 14, 13, 13}, // Metagross
|
||||
{15, 14, 15, 14, 11, 14}, // Regirock
|
||||
{15, 13, 15, 13, 12, 13}, // Regice
|
||||
{16, 13, 16, 13, 10, 13}, // Registeel
|
||||
{16, 15, 16, 14, 16, 15}, // Latias
|
||||
{16, 15, 16, 14, 15, 15}, // Latios
|
||||
{16, 17, 16, 15, 16, 14}, // Kyogre
|
||||
{15, 16, 16, 16, 16, 16}, // Groudon
|
||||
{16, 17, 16, 16, 16, 16}, // Rayquaza
|
||||
{15, 13, 15, 13, 10, 12}, // Jirachi
|
||||
{16, 14, 16, 14, 9, 13}, // Deoxys (Normal)
|
||||
#endif
|
||||
{16, 15, 16, 15, 12, 13}, // Deoxys (Speed)
|
||||
{16, 13, 16, 13, 10, 13}, // Deoxys (Defense)
|
||||
{16, 14, 16, 14, 10, 14}, // Deoxys (Attack)
|
||||
|
||||
Reference in new issue
Block a user