diff --git a/graphics/backspr/gBackShinySpriteGigaBlastoise.png b/graphics/backspr/gBackShinySpriteGigaBlastoise.png new file mode 100644 index 0000000..cd9d607 Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaBlastoise.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaButterfree.png b/graphics/backspr/gBackShinySpriteGigaButterfree.png new file mode 100644 index 0000000..a9bce5a Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaButterfree.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaCharizard.png b/graphics/backspr/gBackShinySpriteGigaCharizard.png new file mode 100644 index 0000000..508e18c Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaCharizard.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaEevee.png b/graphics/backspr/gBackShinySpriteGigaEevee.png new file mode 100644 index 0000000..1e104f8 Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaEevee.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaGarbodor.png b/graphics/backspr/gBackShinySpriteGigaGarbodor.png new file mode 100644 index 0000000..645dae3 Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaGarbodor.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaGengar.png b/graphics/backspr/gBackShinySpriteGigaGengar.png new file mode 100644 index 0000000..67f5bc6 Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaGengar.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaKingler.png b/graphics/backspr/gBackShinySpriteGigaKingler.png new file mode 100644 index 0000000..d1a624a Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaKingler.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaLapras.png b/graphics/backspr/gBackShinySpriteGigaLapras.png new file mode 100644 index 0000000..ee056d3 Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaLapras.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaMachamp.png b/graphics/backspr/gBackShinySpriteGigaMachamp.png new file mode 100644 index 0000000..aea4de0 Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaMachamp.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaMelmetal.png b/graphics/backspr/gBackShinySpriteGigaMelmetal.png new file mode 100644 index 0000000..d1cbe4b Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaMelmetal.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaMeowth.png b/graphics/backspr/gBackShinySpriteGigaMeowth.png new file mode 100644 index 0000000..16298c6 Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaMeowth.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaPikachu.png b/graphics/backspr/gBackShinySpriteGigaPikachu.png new file mode 100644 index 0000000..fefeab9 Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaPikachu.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaSnorlax.png b/graphics/backspr/gBackShinySpriteGigaSnorlax.png new file mode 100644 index 0000000..c90fff9 Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaSnorlax.png differ diff --git a/graphics/backspr/gBackShinySpriteGigaVenusaur.png b/graphics/backspr/gBackShinySpriteGigaVenusaur.png new file mode 100644 index 0000000..be48289 Binary files /dev/null and b/graphics/backspr/gBackShinySpriteGigaVenusaur.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaBlastoise.png b/graphics/frontspr/gFrontSpriteGigaBlastoise.png new file mode 100644 index 0000000..c4608e6 Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaBlastoise.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaButterfree.png b/graphics/frontspr/gFrontSpriteGigaButterfree.png new file mode 100644 index 0000000..0fc4c4c Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaButterfree.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaCharizard.png b/graphics/frontspr/gFrontSpriteGigaCharizard.png new file mode 100644 index 0000000..c1f4300 Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaCharizard.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaEevee.png b/graphics/frontspr/gFrontSpriteGigaEevee.png new file mode 100644 index 0000000..315b69a Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaEevee.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaGarbodor.png b/graphics/frontspr/gFrontSpriteGigaGarbodor.png new file mode 100644 index 0000000..9856f28 Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaGarbodor.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaGengar.png b/graphics/frontspr/gFrontSpriteGigaGengar.png new file mode 100644 index 0000000..bbcd175 Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaGengar.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaKingler.png b/graphics/frontspr/gFrontSpriteGigaKingler.png new file mode 100644 index 0000000..075fc47 Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaKingler.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaLapras.png b/graphics/frontspr/gFrontSpriteGigaLapras.png new file mode 100644 index 0000000..aff7e7d Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaLapras.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaMachamp.png b/graphics/frontspr/gFrontSpriteGigaMachamp.png new file mode 100644 index 0000000..feff2a8 Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaMachamp.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaMelmetal.png b/graphics/frontspr/gFrontSpriteGigaMelmetal.png new file mode 100644 index 0000000..a48b191 Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaMelmetal.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaMeowth.png b/graphics/frontspr/gFrontSpriteGigaMeowth.png new file mode 100644 index 0000000..3f7cf49 Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaMeowth.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaPikachu.png b/graphics/frontspr/gFrontSpriteGigaPikachu.png new file mode 100644 index 0000000..75f0c2b Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaPikachu.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaSnorlax.png b/graphics/frontspr/gFrontSpriteGigaSnorlax.png new file mode 100644 index 0000000..ef39f86 Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaSnorlax.png differ diff --git a/graphics/frontspr/gFrontSpriteGigaVenusaur.png b/graphics/frontspr/gFrontSpriteGigaVenusaur.png new file mode 100644 index 0000000..b7dde75 Binary files /dev/null and b/graphics/frontspr/gFrontSpriteGigaVenusaur.png differ diff --git a/include/sprite_data.h b/include/sprite_data.h index faac06a..ca92bfd 100644 --- a/include/sprite_data.h +++ b/include/sprite_data.h @@ -1077,7 +1077,7 @@ extern const u8 gFrontSprite1098PikachuCapAlolaTiles[]; extern const u8 gFrontSprite1099PikachuCapPartnerTiles[]; extern const u8 gFrontSprite1100PichuSpikyTiles[]; extern const u8 gFrontSprite1101XerneasNaturalTiles[]; -/*extern const u8 gFrontSprite1102GrookeyTiles[]; +extern const u8 gFrontSprite1102GrookeyTiles[]; extern const u8 gFrontSprite1103ThwackeyTiles[]; extern const u8 gFrontSprite1104RillaboomTiles[]; extern const u8 gFrontSprite1105ScorbunnyTiles[]; @@ -1203,20 +1203,20 @@ extern const u8 gFrontSprite1224DarmanitanGTiles[]; extern const u8 gFrontSprite1225DarmanitanGZenTiles[]; extern const u8 gFrontSprite1226YamaskGTiles[]; extern const u8 gFrontSprite1227StunfiskGTiles[]; -extern const u8 gFrontSprite1228VenusaurGigaTiles[]; -extern const u8 gFrontSprite1229CharizardGigaTiles[]; -extern const u8 gFrontSprite1230BlastoiseGigaTiles[]; -extern const u8 gFrontSprite1231ButterfreeGigaTiles[]; -extern const u8 gFrontSprite1232PikachuGigaTiles[]; -extern const u8 gFrontSprite1233MeowthGigaTiles[]; -extern const u8 gFrontSprite1234MachampGigaTiles[]; -extern const u8 gFrontSprite1235GengarGigaTiles[]; -extern const u8 gFrontSprite1236KinglerGigaTiles[]; -extern const u8 gFrontSprite1237LaprasGigaTiles[]; -extern const u8 gFrontSprite1238EeveeGigaTiles[]; -extern const u8 gFrontSprite1239SnorlaxGigaTiles[]; -extern const u8 gFrontSprite1240GarbodorGigaTiles[]; -extern const u8 gFrontSprite1241MelmetalGigaTiles[]; +extern const u8 gFrontSpriteGigaVenusaurTiles[]; +extern const u8 gFrontSpriteGigaCharizardTiles[]; +extern const u8 gFrontSpriteGigaBlastoiseTiles[]; +extern const u8 gFrontSpriteGigaButterfreeTiles[]; +extern const u8 gFrontSpriteGigaPikachuTiles[]; +extern const u8 gFrontSpriteGigaMeowthTiles[]; +extern const u8 gFrontSpriteGigaMachampTiles[]; +extern const u8 gFrontSpriteGigaGengarTiles[]; +extern const u8 gFrontSpriteGigaKinglerTiles[]; +extern const u8 gFrontSpriteGigaLaprasTiles[]; +extern const u8 gFrontSpriteGigaEeveeTiles[]; +extern const u8 gFrontSpriteGigaSnorlaxTiles[]; +extern const u8 gFrontSpriteGigaGarbodorTiles[]; +extern const u8 gFrontSpriteGigaMelmetalTiles[]; extern const u8 gFrontSprite1242RillaboomGigaTiles[]; extern const u8 gFrontSprite1243CinderaceGigaTiles[]; extern const u8 gFrontSprite1244InteleonGigaTiles[]; @@ -1237,7 +1237,7 @@ extern const u8 gFrontSprite1258CopperajahGigaTiles[]; extern const u8 gFrontSprite1259DuraludonGigaTiles[]; extern const u8 gFrontSprite1260UrshifuSilentGigaTiles[]; extern const u8 gFrontSprite1261UrshifuRapidGigaTiles[]; -*/ + extern const u8 gFrontSprite252Tiles[]; extern const u8 gBackShinySprite000NoneTiles[]; @@ -2317,7 +2317,7 @@ extern const u8 gBackShinySprite1098PikachuCapAlolaTiles[]; extern const u8 gBackShinySprite1099PikachuCapPartnerTiles[]; extern const u8 gBackShinySprite1100PichuSpikyTiles[]; extern const u8 gBackShinySprite1101XerneasNaturalTiles[]; -/* extern const u8 gBackShinySprite1102GrookeyTiles[]; +extern const u8 gBackShinySprite1102GrookeyTiles[]; extern const u8 gBackShinySprite1103ThwackeyTiles[]; extern const u8 gBackShinySprite1104RillaboomTiles[]; extern const u8 gBackShinySprite1105ScorbunnyTiles[]; @@ -2443,20 +2443,20 @@ extern const u8 gBackShinySprite1224DarmanitanGTiles[]; extern const u8 gBackShinySprite1225DarmanitanGZenTiles[]; extern const u8 gBackShinySprite1226YamaskGTiles[]; extern const u8 gBackShinySprite1227StunfiskGTiles[]; -extern const u8 gBackShinySprite1228VenusaurGigaTiles[]; -extern const u8 gBackShinySprite1229CharizardGigaTiles[]; -extern const u8 gBackShinySprite1230BlastoiseGigaTiles[]; -extern const u8 gBackShinySprite1231ButterfreeGigaTiles[]; -extern const u8 gBackShinySprite1232PikachuGigaTiles[]; -extern const u8 gBackShinySprite1233MeowthGigaTiles[]; -extern const u8 gBackShinySprite1234MachampGigaTiles[]; -extern const u8 gBackShinySprite1235GengarGigaTiles[]; -extern const u8 gBackShinySprite1236KinglerGigaTiles[]; -extern const u8 gBackShinySprite1237LaprasGigaTiles[]; -extern const u8 gBackShinySprite1238EeveeGigaTiles[]; -extern const u8 gBackShinySprite1239SnorlaxGigaTiles[]; -extern const u8 gBackShinySprite1240GarbodorGigaTiles[]; -extern const u8 gBackShinySprite1241MelmetalGigaTiles[]; +extern const u8 gBackShinySpriteGigaVenusaurTiles[]; +extern const u8 gBackShinySpriteGigaCharizardTiles[]; +extern const u8 gBackShinySpriteGigaBlastoiseTiles[]; +extern const u8 gBackShinySpriteGigaButterfreeTiles[]; +extern const u8 gBackShinySpriteGigaPikachuTiles[]; +extern const u8 gBackShinySpriteGigaMeowthTiles[]; +extern const u8 gBackShinySpriteGigaMachampTiles[]; +extern const u8 gBackShinySpriteGigaGengarTiles[]; +extern const u8 gBackShinySpriteGigaKinglerTiles[]; +extern const u8 gBackShinySpriteGigaLaprasTiles[]; +extern const u8 gBackShinySpriteGigaEeveeTiles[]; +extern const u8 gBackShinySpriteGigaSnorlaxTiles[]; +extern const u8 gBackShinySpriteGigaGarbodorTiles[]; +extern const u8 gBackShinySpriteGigaMelmetalTiles[]; extern const u8 gBackShinySprite1242RillaboomGigaTiles[]; extern const u8 gBackShinySprite1243CinderaceGigaTiles[]; extern const u8 gBackShinySprite1244InteleonGigaTiles[]; @@ -2477,7 +2477,6 @@ extern const u8 gBackShinySprite1258CopperajahGigaTiles[]; extern const u8 gBackShinySprite1259DuraludonGigaTiles[]; extern const u8 gBackShinySprite1260UrshifuSilentGigaTiles[]; extern const u8 gBackShinySprite1261UrshifuRapidGigaTiles[]; -*/ extern const u8 gBackShinySprite252Tiles[]; #pragma once @@ -3559,7 +3558,7 @@ extern const u8 gFrontSprite1098PikachuCapAlolaPal[]; extern const u8 gFrontSprite1099PikachuCapPartnerPal[]; extern const u8 gFrontSprite1100PichuSpikyPal[]; extern const u8 gFrontSprite1101XerneasNaturalPal[]; -/* extern const u8 gFrontSprite1102GrookeyPal[]; +extern const u8 gFrontSprite1102GrookeyPal[]; extern const u8 gFrontSprite1103ThwackeyPal[]; extern const u8 gFrontSprite1104RillaboomPal[]; extern const u8 gFrontSprite1105ScorbunnyPal[]; @@ -3685,20 +3684,20 @@ extern const u8 gFrontSprite1224DarmanitanGPal[]; extern const u8 gFrontSprite1225DarmanitanGZenPal[]; extern const u8 gFrontSprite1226YamaskGPal[]; extern const u8 gFrontSprite1227StunfiskGPal[]; -extern const u8 gFrontSprite1228VenusaurGigaPal[]; -extern const u8 gFrontSprite1229CharizardGigaPal[]; -extern const u8 gFrontSprite1230BlastoiseGigaPal[]; -extern const u8 gFrontSprite1231ButterfreeGigaPal[]; -extern const u8 gFrontSprite1232PikachuGigaPal[]; -extern const u8 gFrontSprite1233MeowthGigaPal[]; -extern const u8 gFrontSprite1234MachampGigaPal[]; -extern const u8 gFrontSprite1235GengarGigaPal[]; -extern const u8 gFrontSprite1236KinglerGigaPal[]; -extern const u8 gFrontSprite1237LaprasGigaPal[]; -extern const u8 gFrontSprite1238EeveeGigaPal[]; -extern const u8 gFrontSprite1239SnorlaxGigaPal[]; -extern const u8 gFrontSprite1240GarbodorGigaPal[]; -extern const u8 gFrontSprite1241MelmetalGigaPal[]; +extern const u8 gFrontSpriteGigaVenusaurPal[]; +extern const u8 gFrontSpriteGigaCharizardPal[]; +extern const u8 gFrontSpriteGigaBlastoisePal[]; +extern const u8 gFrontSpriteGigaButterfreePal[]; +extern const u8 gFrontSpriteGigaPikachuPal[]; +extern const u8 gFrontSpriteGigaMeowthPal[]; +extern const u8 gFrontSpriteGigaMachampPal[]; +extern const u8 gFrontSpriteGigaGengarPal[]; +extern const u8 gFrontSpriteGigaKinglerPal[]; +extern const u8 gFrontSpriteGigaLaprasPal[]; +extern const u8 gFrontSpriteGigaEeveePal[]; +extern const u8 gFrontSpriteGigaSnorlaxPal[]; +extern const u8 gFrontSpriteGigaGarbodorPal[]; +extern const u8 gFrontSpriteGigaMelmetalPal[]; extern const u8 gFrontSprite1242RillaboomGigaPal[]; extern const u8 gFrontSprite1243CinderaceGigaPal[]; extern const u8 gFrontSprite1244InteleonGigaPal[]; @@ -3719,7 +3718,6 @@ extern const u8 gFrontSprite1258CopperajahGigaPal[]; extern const u8 gFrontSprite1259DuraludonGigaPal[]; extern const u8 gFrontSprite1260UrshifuSilentGigaPal[]; extern const u8 gFrontSprite1261UrshifuRapidGigaPal[]; -*/ extern const u8 gFrontSprite252Pal[]; extern const u8 gBackShinySprite000NonePal[]; @@ -4799,7 +4797,7 @@ extern const u8 gBackShinySprite1098PikachuCapAlolaPal[]; extern const u8 gBackShinySprite1099PikachuCapPartnerPal[]; extern const u8 gBackShinySprite1100PichuSpikyPal[]; extern const u8 gBackShinySprite1101XerneasNaturalPal[]; -/* extern const u8 gBackShinySprite1102GrookeyPal[]; +extern const u8 gBackShinySprite1102GrookeyPal[]; extern const u8 gBackShinySprite1103ThwackeyPal[]; extern const u8 gBackShinySprite1104RillaboomPal[]; extern const u8 gBackShinySprite1105ScorbunnyPal[]; @@ -4925,20 +4923,20 @@ extern const u8 gBackShinySprite1224DarmanitanGPal[]; extern const u8 gBackShinySprite1225DarmanitanGZenPal[]; extern const u8 gBackShinySprite1226YamaskGPal[]; extern const u8 gBackShinySprite1227StunfiskGPal[]; -extern const u8 gBackShinySprite1228VenusaurGigaPal[]; -extern const u8 gBackShinySprite1229CharizardGigaPal[]; -extern const u8 gBackShinySprite1230BlastoiseGigaPal[]; -extern const u8 gBackShinySprite1231ButterfreeGigaPal[]; -extern const u8 gBackShinySprite1232PikachuGigaPal[]; -extern const u8 gBackShinySprite1233MeowthGigaPal[]; -extern const u8 gBackShinySprite1234MachampGigaPal[]; -extern const u8 gBackShinySprite1235GengarGigaPal[]; -extern const u8 gBackShinySprite1236KinglerGigaPal[]; -extern const u8 gBackShinySprite1237LaprasGigaPal[]; -extern const u8 gBackShinySprite1238EeveeGigaPal[]; -extern const u8 gBackShinySprite1239SnorlaxGigaPal[]; -extern const u8 gBackShinySprite1240GarbodorGigaPal[]; -extern const u8 gBackShinySprite1241MelmetalGigaPal[]; +extern const u8 gBackShinySpriteGigaVenusaurPal[]; +extern const u8 gBackShinySpriteGigaCharizardPal[]; +extern const u8 gBackShinySpriteGigaBlastoisePal[]; +extern const u8 gBackShinySpriteGigaButterfreePal[]; +extern const u8 gBackShinySpriteGigaPikachuPal[]; +extern const u8 gBackShinySpriteGigaMeowthPal[]; +extern const u8 gBackShinySpriteGigaMachampPal[]; +extern const u8 gBackShinySpriteGigaGengarPal[]; +extern const u8 gBackShinySpriteGigaKinglerPal[]; +extern const u8 gBackShinySpriteGigaLaprasPal[]; +extern const u8 gBackShinySpriteGigaEeveePal[]; +extern const u8 gBackShinySpriteGigaSnorlaxPal[]; +extern const u8 gBackShinySpriteGigaGarbodorPal[]; +extern const u8 gBackShinySpriteGigaMelmetalPal[]; extern const u8 gBackShinySprite1242RillaboomGigaPal[]; extern const u8 gBackShinySprite1243CinderaceGigaPal[]; extern const u8 gBackShinySprite1244InteleonGigaPal[]; @@ -4959,7 +4957,6 @@ extern const u8 gBackShinySprite1258CopperajahGigaPal[]; extern const u8 gBackShinySprite1259DuraludonGigaPal[]; extern const u8 gBackShinySprite1260UrshifuSilentGigaPal[]; extern const u8 gBackShinySprite1261UrshifuRapidGigaPal[]; -*/ extern const u8 gBackShinySprite252Pal[]; extern const u8 gIconSprite000NoneTiles[]; @@ -6039,7 +6036,7 @@ extern const u8 gIconSprite1098PikachuCapAlolaTiles[]; extern const u8 gIconSprite1099PikachuCapPartnerTiles[]; extern const u8 gIconSprite1100PichuSpikyTiles[]; extern const u8 gIconSprite1101XerneasNaturalTiles[]; -/* extern const u8 gIconSprite1102GrookeyTiles[]; +extern const u8 gIconSprite1102GrookeyTiles[]; extern const u8 gIconSprite1103ThwackeyTiles[]; extern const u8 gIconSprite1104RillaboomTiles[]; extern const u8 gIconSprite1105ScorbunnyTiles[]; @@ -6165,20 +6162,20 @@ extern const u8 gIconSprite1224DarmanitanGTiles[]; extern const u8 gIconSprite1225DarmanitanGZenTiles[]; extern const u8 gIconSprite1226YamaskGTiles[]; extern const u8 gIconSprite1227StunfiskGTiles[]; -extern const u8 gIconSprite1228VenusaurGigaTiles[]; -extern const u8 gIconSprite1229CharizardGigaTiles[]; -extern const u8 gIconSprite1230BlastoiseGigaTiles[]; -extern const u8 gIconSprite1231ButterfreeGigaTiles[]; -extern const u8 gIconSprite1232PikachuGigaTiles[]; -extern const u8 gIconSprite1233MeowthGigaTiles[]; -extern const u8 gIconSprite1234MachampGigaTiles[]; -extern const u8 gIconSprite1235GengarGigaTiles[]; -extern const u8 gIconSprite1236KinglerGigaTiles[]; -extern const u8 gIconSprite1237LaprasGigaTiles[]; -extern const u8 gIconSprite1238EeveeGigaTiles[]; -extern const u8 gIconSprite1239SnorlaxGigaTiles[]; -extern const u8 gIconSprite1240GarbodorGigaTiles[]; -extern const u8 gIconSprite1241MelmetalGigaTiles[]; +extern const u8 gIconSpriteGigaVenusaurTiles[]; +extern const u8 gIconSpriteGigaCharizardTiles[]; +extern const u8 gIconSpriteGigaBlastoiseTiles[]; +extern const u8 gIconSpriteGigaButterfreeTiles[]; +extern const u8 gIconSpriteGigaPikachuTiles[]; +extern const u8 gIconSpriteGigaMeowthTiles[]; +extern const u8 gIconSpriteGigaMachampTiles[]; +extern const u8 gIconSpriteGigaGengarTiles[]; +extern const u8 gIconSpriteGigaKinglerTiles[]; +extern const u8 gIconSpriteGigaLaprasTiles[]; +extern const u8 gIconSpriteGigaEeveeTiles[]; +extern const u8 gIconSpriteGigaSnorlaxTiles[]; +extern const u8 gIconSpriteGigaGarbodorTiles[]; +extern const u8 gIconSpriteGigaMelmetalTiles[]; extern const u8 gIconSprite1242RillaboomGigaTiles[]; extern const u8 gIconSprite1243CinderaceGigaTiles[]; extern const u8 gIconSprite1244InteleonGigaTiles[]; @@ -6199,5 +6196,5 @@ extern const u8 gIconSprite1258CopperajahGigaTiles[]; extern const u8 gIconSprite1259DuraludonGigaTiles[]; extern const u8 gIconSprite1260UrshifuSilentGigaTiles[]; extern const u8 gIconSprite1261UrshifuRapidGigaTiles[]; -*/ + extern const u8 gIconSprite252Tiles[]; diff --git a/linker.ld b/linker.ld index 3bb25b5..f5af216 100644 --- a/linker.ld +++ b/linker.ld @@ -1,7 +1,7 @@ OUTPUT_ARCH(arm) MEMORY { - rom : ORIGIN = (0x08000000 + 0x16cdd20), LENGTH = 32M + rom : ORIGIN = (0x08000000 + 0x1900000), LENGTH = 32M ewram : ORIGIN = 0x02000000, LENGTH = 4M - 4k } diff --git a/scripts/insert.py b/scripts/insert.py index 27099fc..92f4a8a 100644 --- a/scripts/insert.py +++ b/scripts/insert.py @@ -7,7 +7,7 @@ import sys from datetime import datetime import _io -OFFSET_TO_PUT = 0x16cdd20 +OFFSET_TO_PUT = 0x1900000 SOURCE_ROM = "Pokemon Unbound.gba" ROM_NAME = "test.gba" diff --git a/scripts/make.py b/scripts/make.py index 9f95a48..4200477 100644 --- a/scripts/make.py +++ b/scripts/make.py @@ -9,7 +9,7 @@ import sys ############ ROM_NAME = "Pokemon Unbound.gba" # The name of your rom -OFFSET_TO_PUT = 0x16cdd20 +OFFSET_TO_PUT = 0x1900000 SEARCH_FREE_SPACE = False # Set to True if you want the script to search for free space # Set to False if you don't want to search for free space as you update the engine diff --git a/src/Back_Pic_Coords_Table.c b/src/Back_Pic_Coords_Table.c index fba280a..1f4279f 100644 --- a/src/Back_Pic_Coords_Table.c +++ b/src/Back_Pic_Coords_Table.c @@ -6146,72 +6146,72 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] = [SPECIES_VENUSAUR_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 11, }, [SPECIES_CHARIZARD_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 1, }, [SPECIES_BLASTOISE_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 5, }, [SPECIES_BUTTERFREE_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 3, }, [SPECIES_PIKACHU_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 0, }, [SPECIES_MEOWTH_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 5, }, [SPECIES_MACHAMP_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 3, }, [SPECIES_GENGAR_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 6, }, [SPECIES_KINGLER_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 5, }, [SPECIES_LAPRAS_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 1, }, [SPECIES_EEVEE_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 7, }, [SPECIES_SNORLAX_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 5, }, [SPECIES_GARBODOR_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 2, }, [SPECIES_MELMETAL_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 14, }, [SPECIES_RILLABOOM_GIGA] = { diff --git a/src/Back_Pic_Table.c b/src/Back_Pic_Table.c index 9f7bc5f..4690d6d 100644 --- a/src/Back_Pic_Table.c +++ b/src/Back_Pic_Table.c @@ -1233,22 +1233,24 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES] = [SPECIES_DARMANITAN_G] = {gBackShinySprite1224DarmanitanGTiles, (64 * 64) / 2, SPECIES_DARMANITAN_G}, [SPECIES_DARMANITAN_G_ZEN] = {gBackShinySprite1225DarmanitanGZenTiles, (64 * 64) / 2, SPECIES_DARMANITAN_G_ZEN}, [SPECIES_YAMASK_G] = {gBackShinySprite1226YamaskGTiles, (64 * 64) / 2, SPECIES_YAMASK_G}, - [SPECIES_STUNFISK_G] = {gBackShinySprite1227StunfiskGTiles, (64 * 64) / 2, SPECIES_STUNFISK_G}, - [SPECIES_VENUSAUR_GIGA] = {gBackShinySprite1228VenusaurGigaTiles, (64 * 64) / 2, SPECIES_VENUSAUR_GIGA}, - [SPECIES_CHARIZARD_GIGA] = {gBackShinySprite1229CharizardGigaTiles, (64 * 64) / 2, SPECIES_CHARIZARD_GIGA}, - [SPECIES_BLASTOISE_GIGA] = {gBackShinySprite1230BlastoiseGigaTiles, (64 * 64) / 2, SPECIES_BLASTOISE_GIGA}, - [SPECIES_BUTTERFREE_GIGA] = {gBackShinySprite1231ButterfreeGigaTiles, (64 * 64) / 2, SPECIES_BUTTERFREE_GIGA}, - [SPECIES_PIKACHU_GIGA] = {gBackShinySprite1232PikachuGigaTiles, (64 * 64) / 2, SPECIES_PIKACHU_GIGA}, - [SPECIES_MEOWTH_GIGA] = {gBackShinySprite1233MeowthGigaTiles, (64 * 64) / 2, SPECIES_MEOWTH_GIGA}, - [SPECIES_MACHAMP_GIGA] = {gBackShinySprite1234MachampGigaTiles, (64 * 64) / 2, SPECIES_MACHAMP_GIGA}, - [SPECIES_GENGAR_GIGA] = {gBackShinySprite1235GengarGigaTiles, (64 * 64) / 2, SPECIES_GENGAR_GIGA}, - [SPECIES_KINGLER_GIGA] = {gBackShinySprite1236KinglerGigaTiles, (64 * 64) / 2, SPECIES_KINGLER_GIGA}, - [SPECIES_LAPRAS_GIGA] = {gBackShinySprite1237LaprasGigaTiles, (64 * 64) / 2, SPECIES_LAPRAS_GIGA}, - [SPECIES_EEVEE_GIGA] = {gBackShinySprite1238EeveeGigaTiles, (64 * 64) / 2, SPECIES_EEVEE_GIGA}, - [SPECIES_SNORLAX_GIGA] = {gBackShinySprite1239SnorlaxGigaTiles, (64 * 64) / 2, SPECIES_SNORLAX_GIGA}, - [SPECIES_GARBODOR_GIGA] = {gBackShinySprite1240GarbodorGigaTiles, (64 * 64) / 2, SPECIES_GARBODOR_GIGA}, - [SPECIES_MELMETAL_GIGA] = {gBackShinySprite1241MelmetalGigaTiles, (64 * 64) / 2, SPECIES_MELMETAL_GIGA}, - [SPECIES_RILLABOOM_GIGA] = {gBackShinySprite1242RillaboomGigaTiles, (64 * 64) / 2, SPECIES_RILLABOOM_GIGA}, + [SPECIES_STUNFISK_G] = {gBackShinySprite1227StunfiskGTiles, (64 * 64) / 2, SPECIES_STUNFISK_G},*/ + + [SPECIES_VENUSAUR_GIGA] = {gBackShinySpriteGigaVenusaurTiles, (64 * 64) / 2, SPECIES_VENUSAUR_GIGA}, + [SPECIES_CHARIZARD_GIGA] = {gBackShinySpriteGigaCharizardTiles, (64 * 64) / 2, SPECIES_CHARIZARD_GIGA}, + [SPECIES_BLASTOISE_GIGA] = {gBackShinySpriteGigaBlastoiseTiles, (64 * 64) / 2, SPECIES_BLASTOISE_GIGA}, + [SPECIES_BUTTERFREE_GIGA] = {gBackShinySpriteGigaButterfreeTiles, (64 * 64) / 2, SPECIES_BUTTERFREE_GIGA}, + [SPECIES_PIKACHU_GIGA] = {gBackShinySpriteGigaPikachuTiles, (64 * 64) / 2, SPECIES_PIKACHU_GIGA}, + [SPECIES_MEOWTH_GIGA] = {gBackShinySpriteGigaMeowthTiles, (64 * 64) / 2, SPECIES_MEOWTH_GIGA}, + [SPECIES_MACHAMP_GIGA] = {gBackShinySpriteGigaMachampTiles, (64 * 64) / 2, SPECIES_MACHAMP_GIGA}, + [SPECIES_GENGAR_GIGA] = {gBackShinySpriteGigaGengarTiles, (64 * 64) / 2, SPECIES_GENGAR_GIGA}, + [SPECIES_KINGLER_GIGA] = {gBackShinySpriteGigaKinglerTiles, (64 * 64) / 2, SPECIES_KINGLER_GIGA}, + [SPECIES_LAPRAS_GIGA] = {gBackShinySpriteGigaLaprasTiles, (64 * 64) / 2, SPECIES_LAPRAS_GIGA}, + [SPECIES_EEVEE_GIGA] = {gBackShinySpriteGigaEeveeTiles, (64 * 64) / 2, SPECIES_EEVEE_GIGA}, + [SPECIES_SNORLAX_GIGA] = {gBackShinySpriteGigaSnorlaxTiles, (64 * 64) / 2, SPECIES_SNORLAX_GIGA}, + [SPECIES_GARBODOR_GIGA] = {gBackShinySpriteGigaGarbodorTiles, (64 * 64) / 2, SPECIES_GARBODOR_GIGA}, + [SPECIES_MELMETAL_GIGA] = {gBackShinySpriteGigaMelmetalTiles, (64 * 64) / 2, SPECIES_MELMETAL_GIGA}, + +/* [SPECIES_RILLABOOM_GIGA] = {gBackShinySprite1242RillaboomGigaTiles, (64 * 64) / 2, SPECIES_RILLABOOM_GIGA}, [SPECIES_CINDERACE_GIGA] = {gBackShinySprite1243CinderaceGigaTiles, (64 * 64) / 2, SPECIES_CINDERACE_GIGA}, [SPECIES_INTELEON_GIGA] = {gBackShinySprite1244InteleonGigaTiles, (64 * 64) / 2, SPECIES_INTELEON_GIGA}, [SPECIES_CORVIKNIGHT_GIGA] = {gBackShinySprite1245CorviknightGigaTiles, (64 * 64) / 2, SPECIES_CORVIKNIGHT_GIGA}, diff --git a/src/Enemy_Elevation_Table.c b/src/Enemy_Elevation_Table.c index bfce05c..0510ed4 100644 --- a/src/Enemy_Elevation_Table.c +++ b/src/Enemy_Elevation_Table.c @@ -1233,7 +1233,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_VENUSAUR_GIGA] = 0x0, [SPECIES_CHARIZARD_GIGA] = 0x0, [SPECIES_BLASTOISE_GIGA] = 0x0, - [SPECIES_BUTTERFREE_GIGA] = 0x0, + [SPECIES_BUTTERFREE_GIGA] = 0x11, [SPECIES_PIKACHU_GIGA] = 0x0, [SPECIES_MEOWTH_GIGA] = 0x0, [SPECIES_MACHAMP_GIGA] = 0x0, diff --git a/src/Evolution Table.c b/src/Evolution Table.c index 00f64d8..cee0cb7 100644 --- a/src/Evolution Table.c +++ b/src/Evolution Table.c @@ -10,20 +10,20 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = { [SPECIES_BULBASAUR] = {{EVO_LEVEL, 16, SPECIES_IVYSAUR, 0}}, [SPECIES_IVYSAUR] = {{EVO_LEVEL, 32, SPECIES_VENUSAUR, 0}}, - [SPECIES_VENUSAUR] = {{EVO_MEGA, ITEM_VENUSAURITE, SPECIES_VENUSAUR_MEGA, MEGA_VARIANT_STANDARD}/*, - {EVO_GIGANTAMAX, TRUE, SPECIES_VENUSAUR_GIGA, 0}*/}, + [SPECIES_VENUSAUR] = {{EVO_MEGA, ITEM_VENUSAURITE, SPECIES_VENUSAUR_MEGA, MEGA_VARIANT_STANDARD}, + {EVO_GIGANTAMAX, TRUE, SPECIES_VENUSAUR_GIGA, 0}}, [SPECIES_CHARMANDER] = {{EVO_LEVEL, 16, SPECIES_CHARMELEON, 0}}, [SPECIES_CHARMELEON] = {{EVO_LEVEL, 36, SPECIES_CHARIZARD, 0}}, [SPECIES_CHARIZARD] = {{EVO_MEGA, ITEM_CHARIZARDITE_X, SPECIES_CHARIZARD_MEGA_X, MEGA_VARIANT_STANDARD}, - {EVO_MEGA, ITEM_CHARIZARDITE_Y, SPECIES_CHARIZARD_MEGA_Y, MEGA_VARIANT_STANDARD}/*, - {EVO_GIGANTAMAX, TRUE, SPECIES_CHARIZARD_GIGA, 0}*/}, + {EVO_MEGA, ITEM_CHARIZARDITE_Y, SPECIES_CHARIZARD_MEGA_Y, MEGA_VARIANT_STANDARD}, + {EVO_GIGANTAMAX, TRUE, SPECIES_CHARIZARD_GIGA, 0}}, [SPECIES_SQUIRTLE] = {{EVO_LEVEL, 16, SPECIES_WARTORTLE, 0}}, [SPECIES_WARTORTLE] = {{EVO_LEVEL, 36, SPECIES_BLASTOISE, 0}}, - [SPECIES_BLASTOISE] = {{EVO_MEGA, ITEM_BLASTOISINITE, SPECIES_BLASTOISE_MEGA, MEGA_VARIANT_STANDARD}/*, - {EVO_GIGANTAMAX, TRUE, SPECIES_BLASTOISE_GIGA, 0}*/}, + [SPECIES_BLASTOISE] = {{EVO_MEGA, ITEM_BLASTOISINITE, SPECIES_BLASTOISE_MEGA, MEGA_VARIANT_STANDARD}, + {EVO_GIGANTAMAX, TRUE, SPECIES_BLASTOISE_GIGA, 0}}, [SPECIES_CATERPIE] = {{EVO_LEVEL, 7, SPECIES_METAPOD, 0}}, [SPECIES_METAPOD] = {{EVO_LEVEL, 10, SPECIES_BUTTERFREE, 0}}, -// [SPECIES_BUTTERFREE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_BUTTERFREE_GIGA, 0}}, + [SPECIES_BUTTERFREE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_BUTTERFREE_GIGA, 0}}, [SPECIES_WEEDLE] = {{EVO_LEVEL, 7, SPECIES_KAKUNA, 0}}, [SPECIES_KAKUNA] = {{EVO_LEVEL, 10, SPECIES_BEEDRILL, 0}}, [SPECIES_BEEDRILL] = {{EVO_MEGA, ITEM_BEEDRILLITE, SPECIES_BEEDRILL_MEGA, MEGA_VARIANT_STANDARD}}, @@ -34,8 +34,24 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW, 0}}, [SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK, 0}}, [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU, 0}, - {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU_A, 0}/*, - {EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}*/}, + {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU_A, 0}, + {EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_SURFING] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_FLYING] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_COSPLAY] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_LIBRE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_POP_STAR] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_ROCK_STAR] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_BELLE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_PHD] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_CAP_ORIGINAL] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_CAP_HOENN] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_CAP_SINNOH] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_CAP_UNOVA] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_CAP_KALOS] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_CAP_ALOLA] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_PIKACHU_CAP_PARTNER] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, + [SPECIES_SANDSHREW] = {{EVO_LEVEL, 22, SPECIES_SANDSLASH, 0}}, [SPECIES_NIDORAN_F] = {{EVO_LEVEL, 16, SPECIES_NIDORINA, 0}}, [SPECIES_NIDORINA] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN, 0}}, @@ -52,8 +68,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PARAS] = {{EVO_LEVEL, 24, SPECIES_PARASECT, 0}}, [SPECIES_VENONAT] = {{EVO_LEVEL, 31, SPECIES_VENOMOTH, 0}}, [SPECIES_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO, 0}}, - [SPECIES_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_PERSIAN, 0}/*, - {EVO_GIGANTAMAX, TRUE, SPECIES_MEOWTH_GIGA, 0}*/}, + [SPECIES_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_PERSIAN, 0}, + {EVO_GIGANTAMAX, TRUE, SPECIES_MEOWTH_GIGA, 0}}, [SPECIES_PSYDUCK] = {{EVO_LEVEL, 33, SPECIES_GOLDUCK, 0}}, [SPECIES_MANKEY] = {{EVO_LEVEL, 28, SPECIES_PRIMEAPE, 0}}, [SPECIES_GROWLITHE] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE, 0}}, @@ -68,7 +84,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_MACHOP] = {{EVO_LEVEL, 28, SPECIES_MACHOKE, 0}}, [SPECIES_MACHOKE] = {{EVO_TRADE, 0, SPECIES_MACHAMP, 0}, {EVO_ITEM, ITEM_LINK_STONE, SPECIES_MACHAMP, 0}}, -// [SPECIES_MACHAMP] = {{EVO_GIGANTAMAX, TRUE, SPECIES_MACHAMP_GIGA, 0}}, + [SPECIES_MACHAMP] = {{EVO_GIGANTAMAX, TRUE, SPECIES_MACHAMP_GIGA, 0}}, [SPECIES_BELLSPROUT] = {{EVO_LEVEL, 21, SPECIES_WEEPINBELL, 0}}, [SPECIES_WEEPINBELL] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL, 0}}, [SPECIES_TENTACOOL] = {{EVO_LEVEL, 30, SPECIES_TENTACRUEL, 0}}, @@ -89,13 +105,13 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_GASTLY] = {{EVO_LEVEL, 25, SPECIES_HAUNTER, 0}}, [SPECIES_HAUNTER] = {{EVO_TRADE, 0, SPECIES_GENGAR, 0}, {EVO_ITEM, ITEM_LINK_STONE, SPECIES_GENGAR, 0}}, - [SPECIES_GENGAR] = {{EVO_MEGA, ITEM_GENGARITE, SPECIES_GENGAR_MEGA, MEGA_VARIANT_STANDARD}/*, - {EVO_GIGANTAMAX, TRUE, SPECIES_GENGAR_GIGA, 0}*/}, + [SPECIES_GENGAR] = {{EVO_MEGA, ITEM_GENGARITE, SPECIES_GENGAR_MEGA, MEGA_VARIANT_STANDARD}, + {EVO_GIGANTAMAX, TRUE, SPECIES_GENGAR_GIGA, 0}}, [SPECIES_ONIX] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX, 0}, {EVO_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX, 0}}, [SPECIES_DROWZEE] = {{EVO_LEVEL, 26, SPECIES_HYPNO, 0}}, [SPECIES_KRABBY] = {{EVO_LEVEL, 28, SPECIES_KINGLER, 0}}, -// [SPECIES_KINGLER] = {{EVO_GIGANTAMAX, TRUE, SPECIES_KINGLER_GIGA, 0}}, + [SPECIES_KINGLER] = {{EVO_GIGANTAMAX, TRUE, SPECIES_KINGLER_GIGA, 0}}, [SPECIES_VOLTORB] = {{EVO_LEVEL, 30, SPECIES_ELECTRODE, 0}}, [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR, 0}}, [SPECIES_CUBONE] = {{EVO_LEVEL_DAY, 28, SPECIES_MAROWAK, 0}, @@ -122,7 +138,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PINSIR] = {{EVO_MEGA, ITEM_PINSIRITE, SPECIES_PINSIR_MEGA, MEGA_VARIANT_STANDARD}}, [SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS, 0}}, [SPECIES_GYARADOS] = {{EVO_MEGA, ITEM_GYARADOSITE, SPECIES_GYARADOS_MEGA, MEGA_VARIANT_STANDARD}}, -// [SPECIES_LAPRAS] = {{EVO_GIGANTAMAX, TRUE, SPECIES_LAPRAS_GIGA, 0}}, + [SPECIES_LAPRAS] = {{EVO_GIGANTAMAX, TRUE, SPECIES_LAPRAS_GIGA, 0}}, [SPECIES_EEVEE] = {{EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON, 0}, {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON, 0}, {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON, 0}, @@ -130,14 +146,14 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON, 0}, {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_LEAFEON, 0}, {EVO_ITEM, ITEM_ICE_STONE, SPECIES_GLACEON, 0}, - {EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, 0}/*, - {EVO_GIGANTAMAX, TRUE, SPECIES_EEVEE_GIGA, 0}*/}, + {EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, 0}, + {EVO_GIGANTAMAX, TRUE, SPECIES_EEVEE_GIGA, 0}}, [SPECIES_PORYGON] = {{EVO_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2, 0}, {EVO_TRADE_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2, 0}}, [SPECIES_OMANYTE] = {{EVO_LEVEL, 40, SPECIES_OMASTAR, 0}}, [SPECIES_KABUTO] = {{EVO_LEVEL, 40, SPECIES_KABUTOPS, 0}}, [SPECIES_AERODACTYL] = {{EVO_MEGA, ITEM_AERODACTYLITE, SPECIES_AERODACTYL_MEGA, MEGA_VARIANT_STANDARD}}, -// [SPECIES_SNORLAX] = {{EVO_GIGANTAMAX, TRUE, SPECIES_SNORLAX_GIGA, 0}}, + [SPECIES_SNORLAX] = {{EVO_GIGANTAMAX, TRUE, SPECIES_SNORLAX_GIGA, 0}}, [SPECIES_DRATINI] = {{EVO_LEVEL, 30, SPECIES_DRAGONAIR, 0}}, [SPECIES_DRAGONAIR] = {{EVO_LEVEL, 55, SPECIES_DRAGONITE, 0}}, [SPECIES_MEWTWO] = {{EVO_MEGA, ITEM_MEWTWONITE_X, SPECIES_MEWTWO_MEGA_X, MEGA_VARIANT_STANDARD}, @@ -379,7 +395,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_TIRTOUGA] = {{EVO_LEVEL, 37, SPECIES_CARRACOSTA, 0}}, [SPECIES_ARCHEN] = {{EVO_LEVEL, 37, SPECIES_ARCHEOPS, 0}}, [SPECIES_TRUBBISH] = {{EVO_LEVEL, 36, SPECIES_GARBODOR, 0}}, -// [SPECIES_GARBODOR] = {{EVO_GIGANTAMAX, TRUE, SPECIES_GARBODOR_GIGA, 0}}, + [SPECIES_GARBODOR] = {{EVO_GIGANTAMAX, TRUE, SPECIES_GARBODOR_GIGA, 0}}, [SPECIES_ZORUA] = {{EVO_LEVEL, 30, SPECIES_ZOROARK, 0}}, [SPECIES_MINCCINO] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_CINCCINO, 0}}, [SPECIES_GOTHITA] = {{EVO_LEVEL, 32, SPECIES_GOTHORITA, 0}}, @@ -583,7 +599,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_NECROZMA_ULTRA] = {{EVO_MEGA, ITEM_NONE, SPECIES_NECROZMA_DUSK_MANE, MEGA_VARIANT_ULTRA_BURST}, {EVO_MEGA, ITEM_NONE, SPECIES_NECROZMA_DAWN_WINGS, MEGA_VARIANT_ULTRA_BURST}}, [SPECIES_MELTAN] = {{EVO_ITEM, ITEM_METAL_COAT, SPECIES_MELMETAL, 0}}, -// [SPECIES_MELMETAL] = {{EVO_GIGANTAMAX, TRUE, SPECIES_MELMETAL_GIGA, 0}}, + [SPECIES_MELMETAL] = {{EVO_GIGANTAMAX, TRUE, SPECIES_MELMETAL_GIGA, 0}}, [SPECIES_GROOKEY] = {{EVO_LEVEL, 16, SPECIES_THWACKEY, 0}}, [SPECIES_THWACKEY] = {{EVO_LEVEL, 35, SPECIES_RILLABOOM, 0}}, // [SPECIES_RILLABOOM] = {{EVO_GIGANTAMAX, TRUE, SPECIES_RILLABOOM_GIGA, 0}}, @@ -670,8 +686,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_DARUMAKA_G] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_G, 0}}, [SPECIES_YAMASK_G] = {{EVO_LEVEL, 35, SPECIES_RUNERIGUS, 0}, {EVO_DAMAGE_LOCATION, 0, SPECIES_RUNERIGUS, 0}}, - -/* [SPECIES_VENUSAUR_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_VENUSAUR, 0}}, + + [SPECIES_VENUSAUR_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_VENUSAUR, 0}}, [SPECIES_CHARIZARD_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_CHARIZARD, 0}}, [SPECIES_BLASTOISE_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_BLASTOISE, 0}}, [SPECIES_BUTTERFREE_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_BUTTERFREE, 0}}, @@ -704,5 +720,5 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_COPPERAJAH_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_COPPERAJAH, 0}}, [SPECIES_DURALUDON_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_DURALUDON, 0}}, [SPECIES_URSHIFU_SINGLE_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_URSHIFU_SINGLE, 0}}, - [SPECIES_URSHIFU_RAPID_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_URSHIFU_RAPID, 0}}, */ + [SPECIES_URSHIFU_RAPID_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_URSHIFU_RAPID, 0}}, }; diff --git a/src/Front_Pic_Coords_Table.c b/src/Front_Pic_Coords_Table.c index 5aaf7f7..c8a89e9 100644 --- a/src/Front_Pic_Coords_Table.c +++ b/src/Front_Pic_Coords_Table.c @@ -6136,72 +6136,72 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_VENUSAUR_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 5, }, [SPECIES_CHARIZARD_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 0, }, [SPECIES_BLASTOISE_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 5, }, [SPECIES_BUTTERFREE_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 3, }, [SPECIES_PIKACHU_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 2, }, [SPECIES_MEOWTH_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 3, }, [SPECIES_MACHAMP_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 0, }, [SPECIES_GENGAR_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 7, }, [SPECIES_KINGLER_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 0, }, [SPECIES_LAPRAS_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 0, }, [SPECIES_EEVEE_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 8, }, [SPECIES_SNORLAX_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 0, }, [SPECIES_GARBODOR_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 2, }, [SPECIES_MELMETAL_GIGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 1, }, [SPECIES_RILLABOOM_GIGA] = { diff --git a/src/Front_Pic_Table.c b/src/Front_Pic_Table.c index 7a0b794..956c94a 100644 --- a/src/Front_Pic_Table.c +++ b/src/Front_Pic_Table.c @@ -1233,22 +1233,24 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES] = [SPECIES_DARMANITAN_G] = {gFrontSprite1224DarmanitanGTiles, (64 * 64) / 2, SPECIES_DARMANITAN_G}, [SPECIES_DARMANITAN_G_ZEN] = {gFrontSprite1225DarmanitanGZenTiles, (64 * 64) / 2, SPECIES_DARMANITAN_G_ZEN}, [SPECIES_YAMASK_G] = {gFrontSprite1226YamaskGTiles, (64 * 64) / 2, SPECIES_YAMASK_G}, - [SPECIES_STUNFISK_G] = {gFrontSprite1227StunfiskGTiles, (64 * 64) / 2, SPECIES_STUNFISK_G}, - [SPECIES_VENUSAUR_GIGA] = {gFrontSprite1228VenusaurGigaTiles, (64 * 64) / 2, SPECIES_VENUSAUR_GIGA}, - [SPECIES_CHARIZARD_GIGA] = {gFrontSprite1229CharizardGigaTiles, (64 * 64) / 2, SPECIES_CHARIZARD_GIGA}, - [SPECIES_BLASTOISE_GIGA] = {gFrontSprite1230BlastoiseGigaTiles, (64 * 64) / 2, SPECIES_BLASTOISE_GIGA}, - [SPECIES_BUTTERFREE_GIGA] = {gFrontSprite1231ButterfreeGigaTiles, (64 * 64) / 2, SPECIES_BUTTERFREE_GIGA}, - [SPECIES_PIKACHU_GIGA] = {gFrontSprite1232PikachuGigaTiles, (64 * 64) / 2, SPECIES_PIKACHU_GIGA}, - [SPECIES_MEOWTH_GIGA] = {gFrontSprite1233MeowthGigaTiles, (64 * 64) / 2, SPECIES_MEOWTH_GIGA}, - [SPECIES_MACHAMP_GIGA] = {gFrontSprite1234MachampGigaTiles, (64 * 64) / 2, SPECIES_MACHAMP_GIGA}, - [SPECIES_GENGAR_GIGA] = {gFrontSprite1235GengarGigaTiles, (64 * 64) / 2, SPECIES_GENGAR_GIGA}, - [SPECIES_KINGLER_GIGA] = {gFrontSprite1236KinglerGigaTiles, (64 * 64) / 2, SPECIES_KINGLER_GIGA}, - [SPECIES_LAPRAS_GIGA] = {gFrontSprite1237LaprasGigaTiles, (64 * 64) / 2, SPECIES_LAPRAS_GIGA}, - [SPECIES_EEVEE_GIGA] = {gFrontSprite1238EeveeGigaTiles, (64 * 64) / 2, SPECIES_EEVEE_GIGA}, - [SPECIES_SNORLAX_GIGA] = {gFrontSprite1239SnorlaxGigaTiles, (64 * 64) / 2, SPECIES_SNORLAX_GIGA}, - [SPECIES_GARBODOR_GIGA] = {gFrontSprite1240GarbodorGigaTiles, (64 * 64) / 2, SPECIES_GARBODOR_GIGA}, - [SPECIES_MELMETAL_GIGA] = {gFrontSprite1241MelmetalGigaTiles, (64 * 64) / 2, SPECIES_MELMETAL_GIGA}, - [SPECIES_RILLABOOM_GIGA] = {gFrontSprite1242RillaboomGigaTiles, (64 * 64) / 2, SPECIES_RILLABOOM_GIGA}, + [SPECIES_STUNFISK_G] = {gFrontSprite1227StunfiskGTiles, (64 * 64) / 2, SPECIES_STUNFISK_G},*/ + + [SPECIES_VENUSAUR_GIGA] = {gFrontSpriteGigaVenusaurTiles, (64 * 64) / 2, SPECIES_VENUSAUR_GIGA}, + [SPECIES_CHARIZARD_GIGA] = {gFrontSpriteGigaCharizardTiles, (64 * 64) / 2, SPECIES_CHARIZARD_GIGA}, + [SPECIES_BLASTOISE_GIGA] = {gFrontSpriteGigaBlastoiseTiles, (64 * 64) / 2, SPECIES_BLASTOISE_GIGA}, + [SPECIES_BUTTERFREE_GIGA] = {gFrontSpriteGigaButterfreeTiles, (64 * 64) / 2, SPECIES_BUTTERFREE_GIGA}, + [SPECIES_PIKACHU_GIGA] = {gFrontSpriteGigaPikachuTiles, (64 * 64) / 2, SPECIES_PIKACHU_GIGA}, + [SPECIES_MEOWTH_GIGA] = {gFrontSpriteGigaMeowthTiles, (64 * 64) / 2, SPECIES_MEOWTH_GIGA}, + [SPECIES_MACHAMP_GIGA] = {gFrontSpriteGigaMachampTiles, (64 * 64) / 2, SPECIES_MACHAMP_GIGA}, + [SPECIES_GENGAR_GIGA] = {gFrontSpriteGigaGengarTiles, (64 * 64) / 2, SPECIES_GENGAR_GIGA}, + [SPECIES_KINGLER_GIGA] = {gFrontSpriteGigaKinglerTiles, (64 * 64) / 2, SPECIES_KINGLER_GIGA}, + [SPECIES_LAPRAS_GIGA] = {gFrontSpriteGigaLaprasTiles, (64 * 64) / 2, SPECIES_LAPRAS_GIGA}, + [SPECIES_EEVEE_GIGA] = {gFrontSpriteGigaEeveeTiles, (64 * 64) / 2, SPECIES_EEVEE_GIGA}, + [SPECIES_SNORLAX_GIGA] = {gFrontSpriteGigaSnorlaxTiles, (64 * 64) / 2, SPECIES_SNORLAX_GIGA}, + [SPECIES_GARBODOR_GIGA] = {gFrontSpriteGigaGarbodorTiles, (64 * 64) / 2, SPECIES_GARBODOR_GIGA}, + [SPECIES_MELMETAL_GIGA] = {gFrontSpriteGigaMelmetalTiles, (64 * 64) / 2, SPECIES_MELMETAL_GIGA}, + +/* [SPECIES_RILLABOOM_GIGA] = {gFrontSprite1242RillaboomGigaTiles, (64 * 64) / 2, SPECIES_RILLABOOM_GIGA}, [SPECIES_CINDERACE_GIGA] = {gFrontSprite1243CinderaceGigaTiles, (64 * 64) / 2, SPECIES_CINDERACE_GIGA}, [SPECIES_INTELEON_GIGA] = {gFrontSprite1244InteleonGigaTiles, (64 * 64) / 2, SPECIES_INTELEON_GIGA}, [SPECIES_CORVIKNIGHT_GIGA] = {gFrontSprite1245CorviknightGigaTiles, (64 * 64) / 2, SPECIES_CORVIKNIGHT_GIGA}, diff --git a/src/Icon_Palette_Table.c b/src/Icon_Palette_Table.c index b356c4d..99eeb6d 100644 --- a/src/Icon_Palette_Table.c +++ b/src/Icon_Palette_Table.c @@ -1230,20 +1230,23 @@ const u8 gMonIconPaletteIndices[NUM_SPECIES] = [SPECIES_DARMANITAN_G_ZEN] = 0x0, [SPECIES_YAMASK_G] = 0x0, [SPECIES_STUNFISK_G] = 0x0, - [SPECIES_VENUSAUR_GIGA] = 0x0, + + //Temp Data + [SPECIES_VENUSAUR_GIGA] = 0x1, [SPECIES_CHARIZARD_GIGA] = 0x0, - [SPECIES_BLASTOISE_GIGA] = 0x0, + [SPECIES_BLASTOISE_GIGA] = 0x2, [SPECIES_BUTTERFREE_GIGA] = 0x0, - [SPECIES_PIKACHU_GIGA] = 0x0, - [SPECIES_MEOWTH_GIGA] = 0x0, + [SPECIES_PIKACHU_GIGA] = 0x2, + [SPECIES_MEOWTH_GIGA] = 0x1, [SPECIES_MACHAMP_GIGA] = 0x0, - [SPECIES_GENGAR_GIGA] = 0x0, + [SPECIES_GENGAR_GIGA] = 0x2, [SPECIES_KINGLER_GIGA] = 0x0, - [SPECIES_LAPRAS_GIGA] = 0x0, - [SPECIES_EEVEE_GIGA] = 0x0, - [SPECIES_SNORLAX_GIGA] = 0x0, - [SPECIES_GARBODOR_GIGA] = 0x0, - [SPECIES_MELMETAL_GIGA] = 0x0, + [SPECIES_LAPRAS_GIGA] = 0x2, + [SPECIES_EEVEE_GIGA] = 0x2, + [SPECIES_SNORLAX_GIGA] = 0x1, + [SPECIES_GARBODOR_GIGA] = 0x1, + [SPECIES_MELMETAL_GIGA] = 0x2, + [SPECIES_RILLABOOM_GIGA] = 0x0, [SPECIES_CINDERACE_GIGA] = 0x0, [SPECIES_INTELEON_GIGA] = 0x0, diff --git a/src/Icon_Table.c b/src/Icon_Table.c index 1c9872c..cfde516 100644 --- a/src/Icon_Table.c +++ b/src/Icon_Table.c @@ -1230,22 +1230,25 @@ const u8* const gMonIconTable[NUM_SPECIES] = [SPECIES_DARMANITAN_G] = gIconSprite1224DarmanitanGTiles, [SPECIES_DARMANITAN_G_ZEN] = gIconSprite1225DarmanitanGZenTiles, [SPECIES_YAMASK_G] = gIconSprite1226YamaskGTiles, - [SPECIES_STUNFISK_G] = gIconSprite1227StunfiskGTiles, - [SPECIES_VENUSAUR_GIGA] = gIconSprite1228VenusaurGigaTiles, - [SPECIES_CHARIZARD_GIGA] = gIconSprite1229CharizardGigaTiles, - [SPECIES_BLASTOISE_GIGA] = gIconSprite1230BlastoiseGigaTiles, - [SPECIES_BUTTERFREE_GIGA] = gIconSprite1231ButterfreeGigaTiles, - [SPECIES_PIKACHU_GIGA] = gIconSprite1232PikachuGigaTiles, - [SPECIES_MEOWTH_GIGA] = gIconSprite1233MeowthGigaTiles, - [SPECIES_MACHAMP_GIGA] = gIconSprite1234MachampGigaTiles, - [SPECIES_GENGAR_GIGA] = gIconSprite1235GengarGigaTiles, - [SPECIES_KINGLER_GIGA] = gIconSprite1236KinglerGigaTiles, - [SPECIES_LAPRAS_GIGA] = gIconSprite1237LaprasGigaTiles, - [SPECIES_EEVEE_GIGA] = gIconSprite1238EeveeGigaTiles, - [SPECIES_SNORLAX_GIGA] = gIconSprite1239SnorlaxGigaTiles, - [SPECIES_GARBODOR_GIGA] = gIconSprite1240GarbodorGigaTiles, - [SPECIES_MELMETAL_GIGA] = gIconSprite1241MelmetalGigaTiles, - [SPECIES_RILLABOOM_GIGA] = gIconSprite1242RillaboomGigaTiles, + [SPECIES_STUNFISK_G] = gIconSprite1227StunfiskGTiles,*/ + + //Temp Data + [SPECIES_VENUSAUR_GIGA] = gIconSprite003VenusaurTiles, + [SPECIES_CHARIZARD_GIGA] = gIconSprite006CharizardTiles, + [SPECIES_BLASTOISE_GIGA] = gIconSprite009BlastoiseTiles, + [SPECIES_BUTTERFREE_GIGA] = gIconSprite012ButterfreeTiles, + [SPECIES_PIKACHU_GIGA] = gIconSprite025PikachuTiles, + [SPECIES_MEOWTH_GIGA] = gIconSprite052MeowthTiles, + [SPECIES_MACHAMP_GIGA] = gIconSprite068MachampTiles, + [SPECIES_GENGAR_GIGA] = gIconSprite094GengarTiles, + [SPECIES_KINGLER_GIGA] = gIconSprite099KinglerTiles, + [SPECIES_LAPRAS_GIGA] = gIconSprite131LaprasTiles, + [SPECIES_EEVEE_GIGA] = gIconSprite133EeveeTiles, + [SPECIES_SNORLAX_GIGA] = gIconSprite143SnorlaxTiles, + [SPECIES_GARBODOR_GIGA] = gIconSprite622GarbodorTiles, + [SPECIES_MELMETAL_GIGA] = gIconSprite1084MelmetalTiles, + +/* [SPECIES_RILLABOOM_GIGA] = gIconSprite1242RillaboomGigaTiles, [SPECIES_CINDERACE_GIGA] = gIconSprite1243CinderaceGigaTiles, [SPECIES_INTELEON_GIGA] = gIconSprite1244InteleonGigaTiles, [SPECIES_CORVIKNIGHT_GIGA] = gIconSprite1245CorviknightGigaTiles, diff --git a/src/Palette_Table.c b/src/Palette_Table.c index 68f3cec..b3d5a72 100644 --- a/src/Palette_Table.c +++ b/src/Palette_Table.c @@ -1233,22 +1233,24 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES] = [SPECIES_DARMANITAN_G] = {gFrontSprite1224DarmanitanGPal, SPECIES_DARMANITAN_G, 0x0}, [SPECIES_DARMANITAN_G_ZEN] = {gFrontSprite1225DarmanitanGZenPal, SPECIES_DARMANITAN_G_ZEN, 0x0}, [SPECIES_YAMASK_G] = {gFrontSprite1226YamaskGPal, SPECIES_YAMASK_G, 0x0}, - [SPECIES_STUNFISK_G] = {gFrontSprite1227StunfiskGPal, SPECIES_STUNFISK_G, 0x0}, - [SPECIES_VENUSAUR_GIGA] = {gFrontSprite1228VenusaurGigaPal, SPECIES_VENUSAUR_GIGA, 0x0}, - [SPECIES_CHARIZARD_GIGA] = {gFrontSprite1229CharizardGigaPal, SPECIES_CHARIZARD_GIGA, 0x0}, - [SPECIES_BLASTOISE_GIGA] = {gFrontSprite1230BlastoiseGigaPal, SPECIES_BLASTOISE_GIGA, 0x0}, - [SPECIES_BUTTERFREE_GIGA] = {gFrontSprite1231ButterfreeGigaPal, SPECIES_BUTTERFREE_GIGA, 0x0}, - [SPECIES_PIKACHU_GIGA] = {gFrontSprite1232PikachuGigaPal, SPECIES_PIKACHU_GIGA, 0x0}, - [SPECIES_MEOWTH_GIGA] = {gFrontSprite1233MeowthGigaPal, SPECIES_MEOWTH_GIGA, 0x0}, - [SPECIES_MACHAMP_GIGA] = {gFrontSprite1234MachampGigaPal, SPECIES_MACHAMP_GIGA, 0x0}, - [SPECIES_GENGAR_GIGA] = {gFrontSprite1235GengarGigaPal, SPECIES_GENGAR_GIGA, 0x0}, - [SPECIES_KINGLER_GIGA] = {gFrontSprite1236KinglerGigaPal, SPECIES_KINGLER_GIGA, 0x0}, - [SPECIES_LAPRAS_GIGA] = {gFrontSprite1237LaprasGigaPal, SPECIES_LAPRAS_GIGA, 0x0}, - [SPECIES_EEVEE_GIGA] = {gFrontSprite1238EeveeGigaPal, SPECIES_EEVEE_GIGA, 0x0}, - [SPECIES_SNORLAX_GIGA] = {gFrontSprite1239SnorlaxGigaPal, SPECIES_SNORLAX_GIGA, 0x0}, - [SPECIES_GARBODOR_GIGA] = {gFrontSprite1240GarbodorGigaPal, SPECIES_GARBODOR_GIGA, 0x0}, - [SPECIES_MELMETAL_GIGA] = {gFrontSprite1241MelmetalGigaPal, SPECIES_MELMETAL_GIGA, 0x0}, - [SPECIES_RILLABOOM_GIGA] = {gFrontSprite1242RillaboomGigaPal, SPECIES_RILLABOOM_GIGA, 0x0}, + [SPECIES_STUNFISK_G] = {gFrontSprite1227StunfiskGPal, SPECIES_STUNFISK_G, 0x0},*/ + + [SPECIES_VENUSAUR_GIGA] = {gFrontSpriteGigaVenusaurPal, SPECIES_VENUSAUR_GIGA, 0x0}, + [SPECIES_CHARIZARD_GIGA] = {gFrontSpriteGigaCharizardPal, SPECIES_CHARIZARD_GIGA, 0x0}, + [SPECIES_BLASTOISE_GIGA] = {gFrontSpriteGigaBlastoisePal, SPECIES_BLASTOISE_GIGA, 0x0}, + [SPECIES_BUTTERFREE_GIGA] = {gFrontSpriteGigaButterfreePal, SPECIES_BUTTERFREE_GIGA, 0x0}, + [SPECIES_PIKACHU_GIGA] = {gFrontSpriteGigaPikachuPal, SPECIES_PIKACHU_GIGA, 0x0}, + [SPECIES_MEOWTH_GIGA] = {gFrontSpriteGigaMeowthPal, SPECIES_MEOWTH_GIGA, 0x0}, + [SPECIES_MACHAMP_GIGA] = {gFrontSpriteGigaMachampPal, SPECIES_MACHAMP_GIGA, 0x0}, + [SPECIES_GENGAR_GIGA] = {gFrontSpriteGigaGengarPal, SPECIES_GENGAR_GIGA, 0x0}, + [SPECIES_KINGLER_GIGA] = {gFrontSpriteGigaKinglerPal, SPECIES_KINGLER_GIGA, 0x0}, + [SPECIES_LAPRAS_GIGA] = {gFrontSpriteGigaLaprasPal, SPECIES_LAPRAS_GIGA, 0x0}, + [SPECIES_EEVEE_GIGA] = {gFrontSpriteGigaEeveePal, SPECIES_EEVEE_GIGA, 0x0}, + [SPECIES_SNORLAX_GIGA] = {gFrontSpriteGigaSnorlaxPal, SPECIES_SNORLAX_GIGA, 0x0}, + [SPECIES_GARBODOR_GIGA] = {gFrontSpriteGigaGarbodorPal, SPECIES_GARBODOR_GIGA, 0x0}, + [SPECIES_MELMETAL_GIGA] = {gFrontSpriteGigaMelmetalPal, SPECIES_MELMETAL_GIGA, 0x0}, + +/* [SPECIES_RILLABOOM_GIGA] = {gFrontSprite1242RillaboomGigaPal, SPECIES_RILLABOOM_GIGA, 0x0}, [SPECIES_CINDERACE_GIGA] = {gFrontSprite1243CinderaceGigaPal, SPECIES_CINDERACE_GIGA, 0x0}, [SPECIES_INTELEON_GIGA] = {gFrontSprite1244InteleonGigaPal, SPECIES_INTELEON_GIGA, 0x0}, [SPECIES_CORVIKNIGHT_GIGA] = {gFrontSprite1245CorviknightGigaPal, SPECIES_CORVIKNIGHT_GIGA, 0x0}, diff --git a/src/Shiny_Palette_Table.c b/src/Shiny_Palette_Table.c index 689377a..31a9aed 100644 --- a/src/Shiny_Palette_Table.c +++ b/src/Shiny_Palette_Table.c @@ -1233,22 +1233,25 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES] = [SPECIES_DARMANITAN_G] = {gBackShinySprite1224DarmanitanGPal, SPECIES_DARMANITAN_G + NUM_SPECIES, 0x0}, [SPECIES_DARMANITAN_G_ZEN] = {gBackShinySprite1225DarmanitanGZenPal, SPECIES_DARMANITAN_G_ZEN + NUM_SPECIES, 0x0}, [SPECIES_YAMASK_G] = {gBackShinySprite1226YamaskGPal, SPECIES_YAMASK_G + NUM_SPECIES, 0x0}, - [SPECIES_STUNFISK_G] = {gBackShinySprite1227StunfiskGPal, SPECIES_STUNFISK_G + NUM_SPECIES, 0x0}, - [SPECIES_VENUSAUR_GIGA] = {gBackShinySprite1228VenusaurGigaPal, SPECIES_VENUSAUR_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_CHARIZARD_GIGA] = {gBackShinySprite1229CharizardGigaPal, SPECIES_CHARIZARD_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_BLASTOISE_GIGA] = {gBackShinySprite1230BlastoiseGigaPal, SPECIES_BLASTOISE_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_BUTTERFREE_GIGA] = {gBackShinySprite1231ButterfreeGigaPal, SPECIES_BUTTERFREE_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_PIKACHU_GIGA] = {gBackShinySprite1232PikachuGigaPal, SPECIES_PIKACHU_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_MEOWTH_GIGA] = {gBackShinySprite1233MeowthGigaPal, SPECIES_MEOWTH_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_MACHAMP_GIGA] = {gBackShinySprite1234MachampGigaPal, SPECIES_MACHAMP_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_GENGAR_GIGA] = {gBackShinySprite1235GengarGigaPal, SPECIES_GENGAR_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_KINGLER_GIGA] = {gBackShinySprite1236KinglerGigaPal, SPECIES_KINGLER_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_LAPRAS_GIGA] = {gBackShinySprite1237LaprasGigaPal, SPECIES_LAPRAS_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_EEVEE_GIGA] = {gBackShinySprite1238EeveeGigaPal, SPECIES_EEVEE_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_SNORLAX_GIGA] = {gBackShinySprite1239SnorlaxGigaPal, SPECIES_SNORLAX_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_GARBODOR_GIGA] = {gBackShinySprite1240GarbodorGigaPal, SPECIES_GARBODOR_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_MELMETAL_GIGA] = {gBackShinySprite1241MelmetalGigaPal, SPECIES_MELMETAL_GIGA + NUM_SPECIES, 0x0}, - [SPECIES_RILLABOOM_GIGA] = {gBackShinySprite1242RillaboomGigaPal, SPECIES_RILLABOOM_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_STUNFISK_G] = {gBackShinySprite1227StunfiskGPal, SPECIES_STUNFISK_G + NUM_SPECIES, 0x0}, */ + + //Temp Data + [SPECIES_VENUSAUR_GIGA] = {gBackShinySpriteGigaVenusaurPal, SPECIES_VENUSAUR_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_CHARIZARD_GIGA] = {gBackShinySpriteGigaCharizardPal, SPECIES_CHARIZARD_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_BLASTOISE_GIGA] = {gBackShinySpriteGigaBlastoisePal, SPECIES_BLASTOISE_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_BUTTERFREE_GIGA] = {gBackShinySpriteGigaButterfreePal, SPECIES_BUTTERFREE_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_PIKACHU_GIGA] = {gBackShinySpriteGigaPikachuPal, SPECIES_PIKACHU_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_MEOWTH_GIGA] = {gBackShinySpriteGigaMeowthPal, SPECIES_MEOWTH_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_MACHAMP_GIGA] = {gBackShinySpriteGigaMachampPal, SPECIES_MACHAMP_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_GENGAR_GIGA] = {gBackShinySpriteGigaGengarPal, SPECIES_GENGAR_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_KINGLER_GIGA] = {gBackShinySpriteGigaKinglerPal, SPECIES_KINGLER_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_LAPRAS_GIGA] = {gBackShinySpriteGigaLaprasPal, SPECIES_LAPRAS_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_EEVEE_GIGA] = {gBackShinySpriteGigaEeveePal, SPECIES_EEVEE_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_SNORLAX_GIGA] = {gBackShinySpriteGigaSnorlaxPal, SPECIES_SNORLAX_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_GARBODOR_GIGA] = {gBackShinySpriteGigaGarbodorPal, SPECIES_GARBODOR_GIGA + NUM_SPECIES, 0x0}, + [SPECIES_MELMETAL_GIGA] = {gBackShinySpriteGigaMelmetalPal, SPECIES_MELMETAL_GIGA + NUM_SPECIES, 0x0}, + +/* [SPECIES_RILLABOOM_GIGA] = {gBackShinySprite1242RillaboomGigaPal, SPECIES_RILLABOOM_GIGA + NUM_SPECIES, 0x0}, [SPECIES_CINDERACE_GIGA] = {gBackShinySprite1243CinderaceGigaPal, SPECIES_CINDERACE_GIGA + NUM_SPECIES, 0x0}, [SPECIES_INTELEON_GIGA] = {gBackShinySprite1244InteleonGigaPal, SPECIES_INTELEON_GIGA, + NUM_SPECIES, 0x0}, [SPECIES_CORVIKNIGHT_GIGA] = {gBackShinySprite1245CorviknightGigaPal, SPECIES_CORVIKNIGHT_GIGA + NUM_SPECIES, 0x0},