diff --git a/graphics/pokemon/alcremie/gmax/back.png b/graphics/pokemon/alcremie/gigantamax/back.png similarity index 100% rename from graphics/pokemon/alcremie/gmax/back.png rename to graphics/pokemon/alcremie/gigantamax/back.png diff --git a/graphics/pokemon/alcremie/gmax/front.png b/graphics/pokemon/alcremie/gigantamax/front.png similarity index 100% rename from graphics/pokemon/alcremie/gmax/front.png rename to graphics/pokemon/alcremie/gigantamax/front.png diff --git a/graphics/pokemon/alcremie/gmax/icon.png b/graphics/pokemon/alcremie/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/alcremie/gmax/icon.png rename to graphics/pokemon/alcremie/gigantamax/icon.png diff --git a/graphics/pokemon/alcremie/gmax/normal.pal b/graphics/pokemon/alcremie/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/alcremie/gmax/normal.pal rename to graphics/pokemon/alcremie/gigantamax/normal.pal diff --git a/graphics/pokemon/alcremie/gmax/shiny.pal b/graphics/pokemon/alcremie/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/gmax/shiny.pal rename to graphics/pokemon/alcremie/gigantamax/shiny.pal diff --git a/graphics/pokemon/appletun/gmax/back.png b/graphics/pokemon/appletun/gigantamax/back.png similarity index 100% rename from graphics/pokemon/appletun/gmax/back.png rename to graphics/pokemon/appletun/gigantamax/back.png diff --git a/graphics/pokemon/appletun/gmax/front.png b/graphics/pokemon/appletun/gigantamax/front.png similarity index 100% rename from graphics/pokemon/appletun/gmax/front.png rename to graphics/pokemon/appletun/gigantamax/front.png diff --git a/graphics/pokemon/appletun/gmax/icon.png b/graphics/pokemon/appletun/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/appletun/gmax/icon.png rename to graphics/pokemon/appletun/gigantamax/icon.png diff --git a/graphics/pokemon/appletun/gmax/normal.pal b/graphics/pokemon/appletun/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/appletun/gmax/normal.pal rename to graphics/pokemon/appletun/gigantamax/normal.pal diff --git a/graphics/pokemon/appletun/gmax/shiny.pal b/graphics/pokemon/appletun/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/appletun/gmax/shiny.pal rename to graphics/pokemon/appletun/gigantamax/shiny.pal diff --git a/graphics/pokemon/blastoise/gmax/back.png b/graphics/pokemon/blastoise/gigantamax/back.png similarity index 100% rename from graphics/pokemon/blastoise/gmax/back.png rename to graphics/pokemon/blastoise/gigantamax/back.png diff --git a/graphics/pokemon/blastoise/gmax/front.png b/graphics/pokemon/blastoise/gigantamax/front.png similarity index 100% rename from graphics/pokemon/blastoise/gmax/front.png rename to graphics/pokemon/blastoise/gigantamax/front.png diff --git a/graphics/pokemon/blastoise/gmax/icon.png b/graphics/pokemon/blastoise/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/blastoise/gmax/icon.png rename to graphics/pokemon/blastoise/gigantamax/icon.png diff --git a/graphics/pokemon/blastoise/gmax/normal.pal b/graphics/pokemon/blastoise/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/blastoise/gmax/normal.pal rename to graphics/pokemon/blastoise/gigantamax/normal.pal diff --git a/graphics/pokemon/blastoise/gmax/shiny.pal b/graphics/pokemon/blastoise/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/blastoise/gmax/shiny.pal rename to graphics/pokemon/blastoise/gigantamax/shiny.pal diff --git a/graphics/pokemon/butterfree/gmax/back.png b/graphics/pokemon/butterfree/gigantamax/back.png similarity index 100% rename from graphics/pokemon/butterfree/gmax/back.png rename to graphics/pokemon/butterfree/gigantamax/back.png diff --git a/graphics/pokemon/butterfree/gmax/front.png b/graphics/pokemon/butterfree/gigantamax/front.png similarity index 100% rename from graphics/pokemon/butterfree/gmax/front.png rename to graphics/pokemon/butterfree/gigantamax/front.png diff --git a/graphics/pokemon/butterfree/gmax/icon.png b/graphics/pokemon/butterfree/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/butterfree/gmax/icon.png rename to graphics/pokemon/butterfree/gigantamax/icon.png diff --git a/graphics/pokemon/butterfree/gmax/normal.pal b/graphics/pokemon/butterfree/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/butterfree/gmax/normal.pal rename to graphics/pokemon/butterfree/gigantamax/normal.pal diff --git a/graphics/pokemon/butterfree/gmax/shiny.pal b/graphics/pokemon/butterfree/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/butterfree/gmax/shiny.pal rename to graphics/pokemon/butterfree/gigantamax/shiny.pal diff --git a/graphics/pokemon/centiskorch/gmax/back.png b/graphics/pokemon/centiskorch/gigantamax/back.png similarity index 100% rename from graphics/pokemon/centiskorch/gmax/back.png rename to graphics/pokemon/centiskorch/gigantamax/back.png diff --git a/graphics/pokemon/centiskorch/gmax/front.png b/graphics/pokemon/centiskorch/gigantamax/front.png similarity index 100% rename from graphics/pokemon/centiskorch/gmax/front.png rename to graphics/pokemon/centiskorch/gigantamax/front.png diff --git a/graphics/pokemon/centiskorch/gmax/icon.png b/graphics/pokemon/centiskorch/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/centiskorch/gmax/icon.png rename to graphics/pokemon/centiskorch/gigantamax/icon.png diff --git a/graphics/pokemon/centiskorch/gmax/normal.pal b/graphics/pokemon/centiskorch/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/centiskorch/gmax/normal.pal rename to graphics/pokemon/centiskorch/gigantamax/normal.pal diff --git a/graphics/pokemon/centiskorch/gmax/shiny.pal b/graphics/pokemon/centiskorch/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/centiskorch/gmax/shiny.pal rename to graphics/pokemon/centiskorch/gigantamax/shiny.pal diff --git a/graphics/pokemon/charizard/gmax/back.png b/graphics/pokemon/charizard/gigantamax/back.png similarity index 100% rename from graphics/pokemon/charizard/gmax/back.png rename to graphics/pokemon/charizard/gigantamax/back.png diff --git a/graphics/pokemon/charizard/gmax/front.png b/graphics/pokemon/charizard/gigantamax/front.png similarity index 100% rename from graphics/pokemon/charizard/gmax/front.png rename to graphics/pokemon/charizard/gigantamax/front.png diff --git a/graphics/pokemon/charizard/gmax/icon.png b/graphics/pokemon/charizard/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/charizard/gmax/icon.png rename to graphics/pokemon/charizard/gigantamax/icon.png diff --git a/graphics/pokemon/charizard/gmax/normal.pal b/graphics/pokemon/charizard/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/charizard/gmax/normal.pal rename to graphics/pokemon/charizard/gigantamax/normal.pal diff --git a/graphics/pokemon/charizard/gmax/shiny.pal b/graphics/pokemon/charizard/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/charizard/gmax/shiny.pal rename to graphics/pokemon/charizard/gigantamax/shiny.pal diff --git a/graphics/pokemon/cinderace/gmax/back.png b/graphics/pokemon/cinderace/gigantamax/back.png similarity index 100% rename from graphics/pokemon/cinderace/gmax/back.png rename to graphics/pokemon/cinderace/gigantamax/back.png diff --git a/graphics/pokemon/cinderace/gmax/front.png b/graphics/pokemon/cinderace/gigantamax/front.png similarity index 100% rename from graphics/pokemon/cinderace/gmax/front.png rename to graphics/pokemon/cinderace/gigantamax/front.png diff --git a/graphics/pokemon/cinderace/gmax/icon.png b/graphics/pokemon/cinderace/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/cinderace/gmax/icon.png rename to graphics/pokemon/cinderace/gigantamax/icon.png diff --git a/graphics/pokemon/cinderace/gmax/normal.pal b/graphics/pokemon/cinderace/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/cinderace/gmax/normal.pal rename to graphics/pokemon/cinderace/gigantamax/normal.pal diff --git a/graphics/pokemon/cinderace/gmax/shiny.pal b/graphics/pokemon/cinderace/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/cinderace/gmax/shiny.pal rename to graphics/pokemon/cinderace/gigantamax/shiny.pal diff --git a/graphics/pokemon/coalossal/gmax/back.png b/graphics/pokemon/coalossal/gigantamax/back.png similarity index 100% rename from graphics/pokemon/coalossal/gmax/back.png rename to graphics/pokemon/coalossal/gigantamax/back.png diff --git a/graphics/pokemon/coalossal/gmax/front.png b/graphics/pokemon/coalossal/gigantamax/front.png similarity index 100% rename from graphics/pokemon/coalossal/gmax/front.png rename to graphics/pokemon/coalossal/gigantamax/front.png diff --git a/graphics/pokemon/coalossal/gmax/icon.png b/graphics/pokemon/coalossal/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/coalossal/gmax/icon.png rename to graphics/pokemon/coalossal/gigantamax/icon.png diff --git a/graphics/pokemon/coalossal/gmax/normal.pal b/graphics/pokemon/coalossal/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/coalossal/gmax/normal.pal rename to graphics/pokemon/coalossal/gigantamax/normal.pal diff --git a/graphics/pokemon/coalossal/gmax/shiny.pal b/graphics/pokemon/coalossal/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/coalossal/gmax/shiny.pal rename to graphics/pokemon/coalossal/gigantamax/shiny.pal diff --git a/graphics/pokemon/copperajah/gmax/back.png b/graphics/pokemon/copperajah/gigantamax/back.png similarity index 100% rename from graphics/pokemon/copperajah/gmax/back.png rename to graphics/pokemon/copperajah/gigantamax/back.png diff --git a/graphics/pokemon/copperajah/gmax/front.png b/graphics/pokemon/copperajah/gigantamax/front.png similarity index 100% rename from graphics/pokemon/copperajah/gmax/front.png rename to graphics/pokemon/copperajah/gigantamax/front.png diff --git a/graphics/pokemon/copperajah/gmax/icon.png b/graphics/pokemon/copperajah/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/copperajah/gmax/icon.png rename to graphics/pokemon/copperajah/gigantamax/icon.png diff --git a/graphics/pokemon/copperajah/gmax/normal.pal b/graphics/pokemon/copperajah/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/copperajah/gmax/normal.pal rename to graphics/pokemon/copperajah/gigantamax/normal.pal diff --git a/graphics/pokemon/copperajah/gmax/shiny.pal b/graphics/pokemon/copperajah/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/copperajah/gmax/shiny.pal rename to graphics/pokemon/copperajah/gigantamax/shiny.pal diff --git a/graphics/pokemon/corviknight/gmax/back.png b/graphics/pokemon/corviknight/gigantamax/back.png similarity index 100% rename from graphics/pokemon/corviknight/gmax/back.png rename to graphics/pokemon/corviknight/gigantamax/back.png diff --git a/graphics/pokemon/corviknight/gmax/front.png b/graphics/pokemon/corviknight/gigantamax/front.png similarity index 100% rename from graphics/pokemon/corviknight/gmax/front.png rename to graphics/pokemon/corviknight/gigantamax/front.png diff --git a/graphics/pokemon/corviknight/gmax/icon.png b/graphics/pokemon/corviknight/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/corviknight/gmax/icon.png rename to graphics/pokemon/corviknight/gigantamax/icon.png diff --git a/graphics/pokemon/corviknight/gmax/normal.pal b/graphics/pokemon/corviknight/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/corviknight/gmax/normal.pal rename to graphics/pokemon/corviknight/gigantamax/normal.pal diff --git a/graphics/pokemon/corviknight/gmax/shiny.pal b/graphics/pokemon/corviknight/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/corviknight/gmax/shiny.pal rename to graphics/pokemon/corviknight/gigantamax/shiny.pal diff --git a/graphics/pokemon/drednaw/gmax/back.png b/graphics/pokemon/drednaw/gigantamax/back.png similarity index 100% rename from graphics/pokemon/drednaw/gmax/back.png rename to graphics/pokemon/drednaw/gigantamax/back.png diff --git a/graphics/pokemon/drednaw/gmax/front.png b/graphics/pokemon/drednaw/gigantamax/front.png similarity index 100% rename from graphics/pokemon/drednaw/gmax/front.png rename to graphics/pokemon/drednaw/gigantamax/front.png diff --git a/graphics/pokemon/drednaw/gmax/icon.png b/graphics/pokemon/drednaw/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/drednaw/gmax/icon.png rename to graphics/pokemon/drednaw/gigantamax/icon.png diff --git a/graphics/pokemon/drednaw/gmax/normal.pal b/graphics/pokemon/drednaw/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/drednaw/gmax/normal.pal rename to graphics/pokemon/drednaw/gigantamax/normal.pal diff --git a/graphics/pokemon/drednaw/gmax/shiny.pal b/graphics/pokemon/drednaw/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/drednaw/gmax/shiny.pal rename to graphics/pokemon/drednaw/gigantamax/shiny.pal diff --git a/graphics/pokemon/duraludon/gmax/back.png b/graphics/pokemon/duraludon/gigantamax/back.png similarity index 100% rename from graphics/pokemon/duraludon/gmax/back.png rename to graphics/pokemon/duraludon/gigantamax/back.png diff --git a/graphics/pokemon/duraludon/gmax/front.png b/graphics/pokemon/duraludon/gigantamax/front.png similarity index 100% rename from graphics/pokemon/duraludon/gmax/front.png rename to graphics/pokemon/duraludon/gigantamax/front.png diff --git a/graphics/pokemon/duraludon/gmax/icon.png b/graphics/pokemon/duraludon/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/duraludon/gmax/icon.png rename to graphics/pokemon/duraludon/gigantamax/icon.png diff --git a/graphics/pokemon/duraludon/gmax/normal.pal b/graphics/pokemon/duraludon/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/duraludon/gmax/normal.pal rename to graphics/pokemon/duraludon/gigantamax/normal.pal diff --git a/graphics/pokemon/duraludon/gmax/shiny.pal b/graphics/pokemon/duraludon/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/duraludon/gmax/shiny.pal rename to graphics/pokemon/duraludon/gigantamax/shiny.pal diff --git a/graphics/pokemon/eevee/gmax/back.png b/graphics/pokemon/eevee/gigantamax/back.png similarity index 100% rename from graphics/pokemon/eevee/gmax/back.png rename to graphics/pokemon/eevee/gigantamax/back.png diff --git a/graphics/pokemon/eevee/gmax/front.png b/graphics/pokemon/eevee/gigantamax/front.png similarity index 100% rename from graphics/pokemon/eevee/gmax/front.png rename to graphics/pokemon/eevee/gigantamax/front.png diff --git a/graphics/pokemon/eevee/gmax/icon.png b/graphics/pokemon/eevee/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/eevee/gmax/icon.png rename to graphics/pokemon/eevee/gigantamax/icon.png diff --git a/graphics/pokemon/eevee/gmax/normal.pal b/graphics/pokemon/eevee/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/eevee/gmax/normal.pal rename to graphics/pokemon/eevee/gigantamax/normal.pal diff --git a/graphics/pokemon/eevee/gmax/shiny.pal b/graphics/pokemon/eevee/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/eevee/gmax/shiny.pal rename to graphics/pokemon/eevee/gigantamax/shiny.pal diff --git a/graphics/pokemon/flapple/gmax/back.png b/graphics/pokemon/flapple/gigantamax/back.png similarity index 100% rename from graphics/pokemon/flapple/gmax/back.png rename to graphics/pokemon/flapple/gigantamax/back.png diff --git a/graphics/pokemon/flapple/gmax/front.png b/graphics/pokemon/flapple/gigantamax/front.png similarity index 100% rename from graphics/pokemon/flapple/gmax/front.png rename to graphics/pokemon/flapple/gigantamax/front.png diff --git a/graphics/pokemon/flapple/gmax/icon.png b/graphics/pokemon/flapple/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/flapple/gmax/icon.png rename to graphics/pokemon/flapple/gigantamax/icon.png diff --git a/graphics/pokemon/flapple/gmax/normal.pal b/graphics/pokemon/flapple/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/flapple/gmax/normal.pal rename to graphics/pokemon/flapple/gigantamax/normal.pal diff --git a/graphics/pokemon/flapple/gmax/shiny.pal b/graphics/pokemon/flapple/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/flapple/gmax/shiny.pal rename to graphics/pokemon/flapple/gigantamax/shiny.pal diff --git a/graphics/pokemon/garbodor/gmax/back.png b/graphics/pokemon/garbodor/gigantamax/back.png similarity index 100% rename from graphics/pokemon/garbodor/gmax/back.png rename to graphics/pokemon/garbodor/gigantamax/back.png diff --git a/graphics/pokemon/garbodor/gmax/front.png b/graphics/pokemon/garbodor/gigantamax/front.png similarity index 100% rename from graphics/pokemon/garbodor/gmax/front.png rename to graphics/pokemon/garbodor/gigantamax/front.png diff --git a/graphics/pokemon/garbodor/gmax/icon.png b/graphics/pokemon/garbodor/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/garbodor/gmax/icon.png rename to graphics/pokemon/garbodor/gigantamax/icon.png diff --git a/graphics/pokemon/garbodor/gmax/normal.pal b/graphics/pokemon/garbodor/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/garbodor/gmax/normal.pal rename to graphics/pokemon/garbodor/gigantamax/normal.pal diff --git a/graphics/pokemon/garbodor/gmax/shiny.pal b/graphics/pokemon/garbodor/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/garbodor/gmax/shiny.pal rename to graphics/pokemon/garbodor/gigantamax/shiny.pal diff --git a/graphics/pokemon/gengar/gmax/back.png b/graphics/pokemon/gengar/gigantamax/back.png similarity index 100% rename from graphics/pokemon/gengar/gmax/back.png rename to graphics/pokemon/gengar/gigantamax/back.png diff --git a/graphics/pokemon/gengar/gmax/front.png b/graphics/pokemon/gengar/gigantamax/front.png similarity index 100% rename from graphics/pokemon/gengar/gmax/front.png rename to graphics/pokemon/gengar/gigantamax/front.png diff --git a/graphics/pokemon/gengar/gmax/icon.png b/graphics/pokemon/gengar/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/gengar/gmax/icon.png rename to graphics/pokemon/gengar/gigantamax/icon.png diff --git a/graphics/pokemon/gengar/gmax/normal.pal b/graphics/pokemon/gengar/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/gengar/gmax/normal.pal rename to graphics/pokemon/gengar/gigantamax/normal.pal diff --git a/graphics/pokemon/gengar/gmax/shiny.pal b/graphics/pokemon/gengar/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/gengar/gmax/shiny.pal rename to graphics/pokemon/gengar/gigantamax/shiny.pal diff --git a/graphics/pokemon/grimmsnarl/gmax/back.png b/graphics/pokemon/grimmsnarl/gigantamax/back.png similarity index 100% rename from graphics/pokemon/grimmsnarl/gmax/back.png rename to graphics/pokemon/grimmsnarl/gigantamax/back.png diff --git a/graphics/pokemon/grimmsnarl/gmax/front.png b/graphics/pokemon/grimmsnarl/gigantamax/front.png similarity index 100% rename from graphics/pokemon/grimmsnarl/gmax/front.png rename to graphics/pokemon/grimmsnarl/gigantamax/front.png diff --git a/graphics/pokemon/grimmsnarl/gmax/icon.png b/graphics/pokemon/grimmsnarl/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/grimmsnarl/gmax/icon.png rename to graphics/pokemon/grimmsnarl/gigantamax/icon.png diff --git a/graphics/pokemon/grimmsnarl/gmax/normal.pal b/graphics/pokemon/grimmsnarl/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/grimmsnarl/gmax/normal.pal rename to graphics/pokemon/grimmsnarl/gigantamax/normal.pal diff --git a/graphics/pokemon/grimmsnarl/gmax/shiny.pal b/graphics/pokemon/grimmsnarl/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/grimmsnarl/gmax/shiny.pal rename to graphics/pokemon/grimmsnarl/gigantamax/shiny.pal diff --git a/graphics/pokemon/hatterene/gmax/back.png b/graphics/pokemon/hatterene/gigantamax/back.png similarity index 100% rename from graphics/pokemon/hatterene/gmax/back.png rename to graphics/pokemon/hatterene/gigantamax/back.png diff --git a/graphics/pokemon/hatterene/gmax/front.png b/graphics/pokemon/hatterene/gigantamax/front.png similarity index 100% rename from graphics/pokemon/hatterene/gmax/front.png rename to graphics/pokemon/hatterene/gigantamax/front.png diff --git a/graphics/pokemon/hatterene/gmax/icon.png b/graphics/pokemon/hatterene/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/hatterene/gmax/icon.png rename to graphics/pokemon/hatterene/gigantamax/icon.png diff --git a/graphics/pokemon/hatterene/gmax/normal.pal b/graphics/pokemon/hatterene/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/hatterene/gmax/normal.pal rename to graphics/pokemon/hatterene/gigantamax/normal.pal diff --git a/graphics/pokemon/hatterene/gmax/shiny.pal b/graphics/pokemon/hatterene/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/hatterene/gmax/shiny.pal rename to graphics/pokemon/hatterene/gigantamax/shiny.pal diff --git a/graphics/pokemon/inteleon/gmax/back.png b/graphics/pokemon/inteleon/gigantamax/back.png similarity index 100% rename from graphics/pokemon/inteleon/gmax/back.png rename to graphics/pokemon/inteleon/gigantamax/back.png diff --git a/graphics/pokemon/inteleon/gmax/front.png b/graphics/pokemon/inteleon/gigantamax/front.png similarity index 100% rename from graphics/pokemon/inteleon/gmax/front.png rename to graphics/pokemon/inteleon/gigantamax/front.png diff --git a/graphics/pokemon/inteleon/gmax/icon.png b/graphics/pokemon/inteleon/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/inteleon/gmax/icon.png rename to graphics/pokemon/inteleon/gigantamax/icon.png diff --git a/graphics/pokemon/inteleon/gmax/normal.pal b/graphics/pokemon/inteleon/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/inteleon/gmax/normal.pal rename to graphics/pokemon/inteleon/gigantamax/normal.pal diff --git a/graphics/pokemon/inteleon/gmax/shiny.pal b/graphics/pokemon/inteleon/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/inteleon/gmax/shiny.pal rename to graphics/pokemon/inteleon/gigantamax/shiny.pal diff --git a/graphics/pokemon/kingler/gmax/back.png b/graphics/pokemon/kingler/gigantamax/back.png similarity index 100% rename from graphics/pokemon/kingler/gmax/back.png rename to graphics/pokemon/kingler/gigantamax/back.png diff --git a/graphics/pokemon/kingler/gmax/front.png b/graphics/pokemon/kingler/gigantamax/front.png similarity index 100% rename from graphics/pokemon/kingler/gmax/front.png rename to graphics/pokemon/kingler/gigantamax/front.png diff --git a/graphics/pokemon/kingler/gmax/icon.png b/graphics/pokemon/kingler/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/kingler/gmax/icon.png rename to graphics/pokemon/kingler/gigantamax/icon.png diff --git a/graphics/pokemon/kingler/gmax/normal.pal b/graphics/pokemon/kingler/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/kingler/gmax/normal.pal rename to graphics/pokemon/kingler/gigantamax/normal.pal diff --git a/graphics/pokemon/kingler/gmax/shiny.pal b/graphics/pokemon/kingler/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/kingler/gmax/shiny.pal rename to graphics/pokemon/kingler/gigantamax/shiny.pal diff --git a/graphics/pokemon/lapras/gmax/back.png b/graphics/pokemon/lapras/gigantamax/back.png similarity index 100% rename from graphics/pokemon/lapras/gmax/back.png rename to graphics/pokemon/lapras/gigantamax/back.png diff --git a/graphics/pokemon/lapras/gmax/front.png b/graphics/pokemon/lapras/gigantamax/front.png similarity index 100% rename from graphics/pokemon/lapras/gmax/front.png rename to graphics/pokemon/lapras/gigantamax/front.png diff --git a/graphics/pokemon/lapras/gmax/icon.png b/graphics/pokemon/lapras/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/lapras/gmax/icon.png rename to graphics/pokemon/lapras/gigantamax/icon.png diff --git a/graphics/pokemon/lapras/gmax/normal.pal b/graphics/pokemon/lapras/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/lapras/gmax/normal.pal rename to graphics/pokemon/lapras/gigantamax/normal.pal diff --git a/graphics/pokemon/lapras/gmax/shiny.pal b/graphics/pokemon/lapras/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/lapras/gmax/shiny.pal rename to graphics/pokemon/lapras/gigantamax/shiny.pal diff --git a/graphics/pokemon/machamp/gmax/back.png b/graphics/pokemon/machamp/gigantamax/back.png similarity index 100% rename from graphics/pokemon/machamp/gmax/back.png rename to graphics/pokemon/machamp/gigantamax/back.png diff --git a/graphics/pokemon/machamp/gmax/front.png b/graphics/pokemon/machamp/gigantamax/front.png similarity index 100% rename from graphics/pokemon/machamp/gmax/front.png rename to graphics/pokemon/machamp/gigantamax/front.png diff --git a/graphics/pokemon/machamp/gmax/icon.png b/graphics/pokemon/machamp/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/machamp/gmax/icon.png rename to graphics/pokemon/machamp/gigantamax/icon.png diff --git a/graphics/pokemon/machamp/gmax/normal.pal b/graphics/pokemon/machamp/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/machamp/gmax/normal.pal rename to graphics/pokemon/machamp/gigantamax/normal.pal diff --git a/graphics/pokemon/machamp/gmax/shiny.pal b/graphics/pokemon/machamp/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/machamp/gmax/shiny.pal rename to graphics/pokemon/machamp/gigantamax/shiny.pal diff --git a/graphics/pokemon/melmetal/gmax/back.png b/graphics/pokemon/melmetal/gigantamax/back.png similarity index 100% rename from graphics/pokemon/melmetal/gmax/back.png rename to graphics/pokemon/melmetal/gigantamax/back.png diff --git a/graphics/pokemon/melmetal/gmax/front.png b/graphics/pokemon/melmetal/gigantamax/front.png similarity index 100% rename from graphics/pokemon/melmetal/gmax/front.png rename to graphics/pokemon/melmetal/gigantamax/front.png diff --git a/graphics/pokemon/melmetal/gmax/icon.png b/graphics/pokemon/melmetal/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/melmetal/gmax/icon.png rename to graphics/pokemon/melmetal/gigantamax/icon.png diff --git a/graphics/pokemon/melmetal/gmax/normal.pal b/graphics/pokemon/melmetal/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/melmetal/gmax/normal.pal rename to graphics/pokemon/melmetal/gigantamax/normal.pal diff --git a/graphics/pokemon/melmetal/gmax/shiny.pal b/graphics/pokemon/melmetal/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/melmetal/gmax/shiny.pal rename to graphics/pokemon/melmetal/gigantamax/shiny.pal diff --git a/graphics/pokemon/meowth/gmax/back.png b/graphics/pokemon/meowth/gigantamax/back.png similarity index 100% rename from graphics/pokemon/meowth/gmax/back.png rename to graphics/pokemon/meowth/gigantamax/back.png diff --git a/graphics/pokemon/meowth/gmax/front.png b/graphics/pokemon/meowth/gigantamax/front.png similarity index 100% rename from graphics/pokemon/meowth/gmax/front.png rename to graphics/pokemon/meowth/gigantamax/front.png diff --git a/graphics/pokemon/meowth/gmax/icon.png b/graphics/pokemon/meowth/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/meowth/gmax/icon.png rename to graphics/pokemon/meowth/gigantamax/icon.png diff --git a/graphics/pokemon/meowth/gmax/normal.pal b/graphics/pokemon/meowth/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/meowth/gmax/normal.pal rename to graphics/pokemon/meowth/gigantamax/normal.pal diff --git a/graphics/pokemon/meowth/gmax/shiny.pal b/graphics/pokemon/meowth/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/meowth/gmax/shiny.pal rename to graphics/pokemon/meowth/gigantamax/shiny.pal diff --git a/graphics/pokemon/orbeetle/gmax/back.png b/graphics/pokemon/orbeetle/gigantamax/back.png similarity index 100% rename from graphics/pokemon/orbeetle/gmax/back.png rename to graphics/pokemon/orbeetle/gigantamax/back.png diff --git a/graphics/pokemon/orbeetle/gmax/front.png b/graphics/pokemon/orbeetle/gigantamax/front.png similarity index 100% rename from graphics/pokemon/orbeetle/gmax/front.png rename to graphics/pokemon/orbeetle/gigantamax/front.png diff --git a/graphics/pokemon/orbeetle/gmax/icon.png b/graphics/pokemon/orbeetle/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/orbeetle/gmax/icon.png rename to graphics/pokemon/orbeetle/gigantamax/icon.png diff --git a/graphics/pokemon/orbeetle/gmax/normal.pal b/graphics/pokemon/orbeetle/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/orbeetle/gmax/normal.pal rename to graphics/pokemon/orbeetle/gigantamax/normal.pal diff --git a/graphics/pokemon/orbeetle/gmax/shiny.pal b/graphics/pokemon/orbeetle/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/orbeetle/gmax/shiny.pal rename to graphics/pokemon/orbeetle/gigantamax/shiny.pal diff --git a/graphics/pokemon/pikachu/gmax/back.png b/graphics/pokemon/pikachu/gigantamax/back.png similarity index 100% rename from graphics/pokemon/pikachu/gmax/back.png rename to graphics/pokemon/pikachu/gigantamax/back.png diff --git a/graphics/pokemon/pikachu/gmax/front.png b/graphics/pokemon/pikachu/gigantamax/front.png similarity index 100% rename from graphics/pokemon/pikachu/gmax/front.png rename to graphics/pokemon/pikachu/gigantamax/front.png diff --git a/graphics/pokemon/pikachu/gmax/icon.png b/graphics/pokemon/pikachu/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/pikachu/gmax/icon.png rename to graphics/pokemon/pikachu/gigantamax/icon.png diff --git a/graphics/pokemon/pikachu/gmax/normal.pal b/graphics/pokemon/pikachu/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/gmax/normal.pal rename to graphics/pokemon/pikachu/gigantamax/normal.pal diff --git a/graphics/pokemon/pikachu/gmax/shiny.pal b/graphics/pokemon/pikachu/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/gmax/shiny.pal rename to graphics/pokemon/pikachu/gigantamax/shiny.pal diff --git a/graphics/pokemon/rillaboom/gmax/back.png b/graphics/pokemon/rillaboom/gigantamax/back.png similarity index 100% rename from graphics/pokemon/rillaboom/gmax/back.png rename to graphics/pokemon/rillaboom/gigantamax/back.png diff --git a/graphics/pokemon/rillaboom/gmax/front.png b/graphics/pokemon/rillaboom/gigantamax/front.png similarity index 100% rename from graphics/pokemon/rillaboom/gmax/front.png rename to graphics/pokemon/rillaboom/gigantamax/front.png diff --git a/graphics/pokemon/rillaboom/gmax/icon.png b/graphics/pokemon/rillaboom/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/rillaboom/gmax/icon.png rename to graphics/pokemon/rillaboom/gigantamax/icon.png diff --git a/graphics/pokemon/rillaboom/gmax/normal.pal b/graphics/pokemon/rillaboom/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/rillaboom/gmax/normal.pal rename to graphics/pokemon/rillaboom/gigantamax/normal.pal diff --git a/graphics/pokemon/rillaboom/gmax/shiny.pal b/graphics/pokemon/rillaboom/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/rillaboom/gmax/shiny.pal rename to graphics/pokemon/rillaboom/gigantamax/shiny.pal diff --git a/graphics/pokemon/sandaconda/gmax/back.png b/graphics/pokemon/sandaconda/gigantamax/back.png similarity index 100% rename from graphics/pokemon/sandaconda/gmax/back.png rename to graphics/pokemon/sandaconda/gigantamax/back.png diff --git a/graphics/pokemon/sandaconda/gmax/front.png b/graphics/pokemon/sandaconda/gigantamax/front.png similarity index 100% rename from graphics/pokemon/sandaconda/gmax/front.png rename to graphics/pokemon/sandaconda/gigantamax/front.png diff --git a/graphics/pokemon/sandaconda/gmax/icon.png b/graphics/pokemon/sandaconda/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/sandaconda/gmax/icon.png rename to graphics/pokemon/sandaconda/gigantamax/icon.png diff --git a/graphics/pokemon/sandaconda/gmax/normal.pal b/graphics/pokemon/sandaconda/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/sandaconda/gmax/normal.pal rename to graphics/pokemon/sandaconda/gigantamax/normal.pal diff --git a/graphics/pokemon/sandaconda/gmax/shiny.pal b/graphics/pokemon/sandaconda/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/sandaconda/gmax/shiny.pal rename to graphics/pokemon/sandaconda/gigantamax/shiny.pal diff --git a/graphics/pokemon/snorlax/gmax/back.png b/graphics/pokemon/snorlax/gigantamax/back.png similarity index 100% rename from graphics/pokemon/snorlax/gmax/back.png rename to graphics/pokemon/snorlax/gigantamax/back.png diff --git a/graphics/pokemon/snorlax/gmax/front.png b/graphics/pokemon/snorlax/gigantamax/front.png similarity index 100% rename from graphics/pokemon/snorlax/gmax/front.png rename to graphics/pokemon/snorlax/gigantamax/front.png diff --git a/graphics/pokemon/snorlax/gmax/icon.png b/graphics/pokemon/snorlax/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/snorlax/gmax/icon.png rename to graphics/pokemon/snorlax/gigantamax/icon.png diff --git a/graphics/pokemon/snorlax/gmax/normal.pal b/graphics/pokemon/snorlax/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/snorlax/gmax/normal.pal rename to graphics/pokemon/snorlax/gigantamax/normal.pal diff --git a/graphics/pokemon/snorlax/gmax/shiny.pal b/graphics/pokemon/snorlax/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/snorlax/gmax/shiny.pal rename to graphics/pokemon/snorlax/gigantamax/shiny.pal diff --git a/graphics/pokemon/toxtricity/gmax/back.png b/graphics/pokemon/toxtricity/gigantamax/back.png similarity index 100% rename from graphics/pokemon/toxtricity/gmax/back.png rename to graphics/pokemon/toxtricity/gigantamax/back.png diff --git a/graphics/pokemon/toxtricity/gmax/front.png b/graphics/pokemon/toxtricity/gigantamax/front.png similarity index 100% rename from graphics/pokemon/toxtricity/gmax/front.png rename to graphics/pokemon/toxtricity/gigantamax/front.png diff --git a/graphics/pokemon/toxtricity/gmax/icon.png b/graphics/pokemon/toxtricity/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/toxtricity/gmax/icon.png rename to graphics/pokemon/toxtricity/gigantamax/icon.png diff --git a/graphics/pokemon/toxtricity/gmax/normal.pal b/graphics/pokemon/toxtricity/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/toxtricity/gmax/normal.pal rename to graphics/pokemon/toxtricity/gigantamax/normal.pal diff --git a/graphics/pokemon/toxtricity/gmax/shiny.pal b/graphics/pokemon/toxtricity/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/toxtricity/gmax/shiny.pal rename to graphics/pokemon/toxtricity/gigantamax/shiny.pal diff --git a/graphics/pokemon/urshifu/gmax_rapid_strike_style/back.png b/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.png similarity index 100% rename from graphics/pokemon/urshifu/gmax_rapid_strike_style/back.png rename to graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.png diff --git a/graphics/pokemon/urshifu/gmax_rapid_strike_style/front.png b/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.png similarity index 100% rename from graphics/pokemon/urshifu/gmax_rapid_strike_style/front.png rename to graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.png diff --git a/graphics/pokemon/urshifu/gmax_rapid_strike_style/icon.png b/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.png similarity index 100% rename from graphics/pokemon/urshifu/gmax_rapid_strike_style/icon.png rename to graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.png diff --git a/graphics/pokemon/urshifu/gmax_rapid_strike_style/normal.pal b/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/urshifu/gmax_rapid_strike_style/normal.pal rename to graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.pal diff --git a/graphics/pokemon/urshifu/gmax_rapid_strike_style/shiny.pal b/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/urshifu/gmax_rapid_strike_style/shiny.pal rename to graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.pal diff --git a/graphics/pokemon/urshifu/gmax/back.png b/graphics/pokemon/urshifu/single_strike_style_gigantamax/back.png similarity index 100% rename from graphics/pokemon/urshifu/gmax/back.png rename to graphics/pokemon/urshifu/single_strike_style_gigantamax/back.png diff --git a/graphics/pokemon/urshifu/gmax/front.png b/graphics/pokemon/urshifu/single_strike_style_gigantamax/front.png similarity index 100% rename from graphics/pokemon/urshifu/gmax/front.png rename to graphics/pokemon/urshifu/single_strike_style_gigantamax/front.png diff --git a/graphics/pokemon/urshifu/gmax/icon.png b/graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.png similarity index 100% rename from graphics/pokemon/urshifu/gmax/icon.png rename to graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.png diff --git a/graphics/pokemon/urshifu/gmax/normal.pal b/graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/urshifu/gmax/normal.pal rename to graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.pal diff --git a/graphics/pokemon/urshifu/gmax/shiny.pal b/graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/urshifu/gmax/shiny.pal rename to graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.pal diff --git a/graphics/pokemon/venusaur/gmax/back.png b/graphics/pokemon/venusaur/gigantamax/back.png similarity index 100% rename from graphics/pokemon/venusaur/gmax/back.png rename to graphics/pokemon/venusaur/gigantamax/back.png diff --git a/graphics/pokemon/venusaur/gmax/front.png b/graphics/pokemon/venusaur/gigantamax/front.png similarity index 100% rename from graphics/pokemon/venusaur/gmax/front.png rename to graphics/pokemon/venusaur/gigantamax/front.png diff --git a/graphics/pokemon/venusaur/gmax/icon.png b/graphics/pokemon/venusaur/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/venusaur/gmax/icon.png rename to graphics/pokemon/venusaur/gigantamax/icon.png diff --git a/graphics/pokemon/venusaur/gmax/normal.pal b/graphics/pokemon/venusaur/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/venusaur/gmax/normal.pal rename to graphics/pokemon/venusaur/gigantamax/normal.pal diff --git a/graphics/pokemon/venusaur/gmax/shiny.pal b/graphics/pokemon/venusaur/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/venusaur/gmax/shiny.pal rename to graphics/pokemon/venusaur/gigantamax/shiny.pal diff --git a/include/config/battle.h b/include/config/battle.h index a5c16d2591..fce8c196ef 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -160,7 +160,7 @@ #define B_FLAG_NO_BAG_USE 0 // If this flag is set, the ability to use the bag in battle is disabled. #define B_FLAG_NO_CATCHING 0 // If this flag is set, the ability to catch wild Pokémon is disabled. #define B_FLAG_AI_VS_AI_BATTLE 0 // If this flag is set, the player's mons will be controlled by the ai next battles. -#define B_FLAG_DYNAMAX_BATTLE 0 // If this flag is set, the ability to Dynamax in battle is enabled for all trainers. +#define B_FLAG_DYNAMAX_BATTLE FLAG_UNUSED_0x020 // If this flag is set, the ability to Dynamax in battle is enabled for all trainers. // Var Settings // To use the following features in scripting, replace the 0s with the var ID you're assigning it to. diff --git a/include/constants/species.h b/include/constants/species.h index 471f9e38a8..2b41b32ea9 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1372,42 +1372,42 @@ #define SPECIES_BASCULEGION_FEMALE FORMS_START + 329 // Gigantamax Forms -#define SPECIES_VENUSAUR_GMAX FORMS_START + 330 -#define SPECIES_BLASTOISE_GMAX FORMS_START + 331 -#define SPECIES_CHARIZARD_GMAX FORMS_START + 332 -#define SPECIES_BUTTERFREE_GMAX FORMS_START + 333 -#define SPECIES_PIKACHU_GMAX FORMS_START + 334 -#define SPECIES_MEOWTH_GMAX FORMS_START + 335 -#define SPECIES_MACHAMP_GMAX FORMS_START + 336 -#define SPECIES_GENGAR_GMAX FORMS_START + 337 -#define SPECIES_KINGLER_GMAX FORMS_START + 338 -#define SPECIES_LAPRAS_GMAX FORMS_START + 339 -#define SPECIES_EEVEE_GMAX FORMS_START + 340 -#define SPECIES_SNORLAX_GMAX FORMS_START + 341 -#define SPECIES_GARBODOR_GMAX FORMS_START + 342 -#define SPECIES_MELMETAL_GMAX FORMS_START + 343 -#define SPECIES_RILLABOOM_GMAX FORMS_START + 344 -#define SPECIES_CINDERACE_GMAX FORMS_START + 345 -#define SPECIES_INTELEON_GMAX FORMS_START + 346 -#define SPECIES_CORVIKNIGHT_GMAX FORMS_START + 347 -#define SPECIES_ORBEETLE_GMAX FORMS_START + 348 -#define SPECIES_DREDNAW_GMAX FORMS_START + 349 -#define SPECIES_COALOSSAL_GMAX FORMS_START + 350 -#define SPECIES_FLAPPLE_GMAX FORMS_START + 351 -#define SPECIES_APPLETUN_GMAX FORMS_START + 352 -#define SPECIES_SANDACONDA_GMAX FORMS_START + 353 -#define SPECIES_TOXTRICITY_GMAX FORMS_START + 354 -#define SPECIES_CENTISKORCH_GMAX FORMS_START + 355 -#define SPECIES_HATTERENE_GMAX FORMS_START + 356 -#define SPECIES_GRIMMSNARL_GMAX FORMS_START + 357 -#define SPECIES_ALCREMIE_GMAX FORMS_START + 358 -#define SPECIES_COPPERAJAH_GMAX FORMS_START + 359 -#define SPECIES_DURALUDON_GMAX FORMS_START + 360 -#define SPECIES_URSHIFU_GMAX FORMS_START + 361 -#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX FORMS_START + 362 +#define SPECIES_VENUSAUR_GIGANTAMAX FORMS_START + 330 +#define SPECIES_BLASTOISE_GIGANTAMAX FORMS_START + 331 +#define SPECIES_CHARIZARD_GIGANTAMAX FORMS_START + 332 +#define SPECIES_BUTTERFREE_GIGANTAMAX FORMS_START + 333 +#define SPECIES_PIKACHU_GIGANTAMAX FORMS_START + 334 +#define SPECIES_MEOWTH_GIGANTAMAX FORMS_START + 335 +#define SPECIES_MACHAMP_GIGANTAMAX FORMS_START + 336 +#define SPECIES_GENGAR_GIGANTAMAX FORMS_START + 337 +#define SPECIES_KINGLER_GIGANTAMAX FORMS_START + 338 +#define SPECIES_LAPRAS_GIGANTAMAX FORMS_START + 339 +#define SPECIES_EEVEE_GIGANTAMAX FORMS_START + 340 +#define SPECIES_SNORLAX_GIGANTAMAX FORMS_START + 341 +#define SPECIES_GARBODOR_GIGANTAMAX FORMS_START + 342 +#define SPECIES_MELMETAL_GIGANTAMAX FORMS_START + 343 +#define SPECIES_RILLABOOM_GIGANTAMAX FORMS_START + 344 +#define SPECIES_CINDERACE_GIGANTAMAX FORMS_START + 345 +#define SPECIES_INTELEON_GIGANTAMAX FORMS_START + 346 +#define SPECIES_CORVIKNIGHT_GIGANTAMAX FORMS_START + 347 +#define SPECIES_ORBEETLE_GIGANTAMAX FORMS_START + 348 +#define SPECIES_DREDNAW_GIGANTAMAX FORMS_START + 349 +#define SPECIES_COALOSSAL_GIGANTAMAX FORMS_START + 350 +#define SPECIES_FLAPPLE_GIGANTAMAX FORMS_START + 351 +#define SPECIES_APPLETUN_GIGANTAMAX FORMS_START + 352 +#define SPECIES_SANDACONDA_GIGANTAMAX FORMS_START + 353 +#define SPECIES_TOXTRICITY_GIGANTAMAX FORMS_START + 354 +#define SPECIES_CENTISKORCH_GIGANTAMAX FORMS_START + 355 +#define SPECIES_HATTERENE_GIGANTAMAX FORMS_START + 356 +#define SPECIES_GRIMMSNARL_GIGANTAMAX FORMS_START + 357 +#define SPECIES_ALCREMIE_GIGANTAMAX FORMS_START + 358 +#define SPECIES_COPPERAJAH_GIGANTAMAX FORMS_START + 359 +#define SPECIES_DURALUDON_GIGANTAMAX FORMS_START + 360 +#define SPECIES_URSHIFU_GIGANTAMAX FORMS_START + 361 +#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX FORMS_START + 362 #define FORMS_START SPECIES_ENAMORUS -#define SPECIES_EGG SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX + 1 +#define SPECIES_EGG SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX + 1 #define NUM_SPECIES SPECIES_EGG diff --git a/include/graphics.h b/include/graphics.h index 4b0ff29107..ba84769f22 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2643,39 +2643,39 @@ extern const u32 gMonBackPic_CalyrexIceRider[]; extern const u32 gMonBackPic_CalyrexShadowRider[]; extern const u32 gMonBackPic_EnamorusTherian[]; extern const u32 gMonBackPic_BasculegionFemale[]; -extern const u32 gMonBackPic_VenusaurGmax[]; -extern const u32 gMonBackPic_CharizardGmax[]; -extern const u32 gMonBackPic_BlastoiseGmax[]; -extern const u32 gMonBackPic_ButterfreeGmax[]; -extern const u32 gMonBackPic_PikachuGmax[]; -extern const u32 gMonBackPic_MeowthGmax[]; -extern const u32 gMonBackPic_MachampGmax[]; -extern const u32 gMonBackPic_GengarGmax[]; -extern const u32 gMonBackPic_KinglerGmax[]; -extern const u32 gMonBackPic_LaprasGmax[]; -extern const u32 gMonBackPic_EeveeGmax[]; -extern const u32 gMonBackPic_SnorlaxGmax[]; -extern const u32 gMonBackPic_GarbodorGmax[]; -extern const u32 gMonBackPic_MelmetalGmax[]; -extern const u32 gMonBackPic_RillaboomGmax[]; -extern const u32 gMonBackPic_CinderaceGmax[]; -extern const u32 gMonBackPic_InteleonGmax[]; -extern const u32 gMonBackPic_CorviknightGmax[]; -extern const u32 gMonBackPic_OrbeetleGmax[]; -extern const u32 gMonBackPic_DrednawGmax[]; -extern const u32 gMonBackPic_CoalossalGmax[]; -extern const u32 gMonBackPic_FlappleGmax[]; -extern const u32 gMonBackPic_AppletunGmax[]; -extern const u32 gMonBackPic_SandacondaGmax[]; -extern const u32 gMonBackPic_ToxtricityGmax[]; -extern const u32 gMonBackPic_CentiskorchGmax[]; -extern const u32 gMonBackPic_HattereneGmax[]; -extern const u32 gMonBackPic_GrimmsnarlGmax[]; -extern const u32 gMonBackPic_AlcremieGmax[]; -extern const u32 gMonBackPic_CopperajahGmax[]; -extern const u32 gMonBackPic_DuraludonGmax[]; -extern const u32 gMonBackPic_UrshifuGmax[]; -extern const u32 gMonBackPic_UrshifuRapidStrikeGmax[]; +extern const u32 gMonBackPic_VenusaurGigantamax[]; +extern const u32 gMonBackPic_CharizardGigantamax[]; +extern const u32 gMonBackPic_BlastoiseGigantamax[]; +extern const u32 gMonBackPic_ButterfreeGigantamax[]; +extern const u32 gMonBackPic_PikachuGigantamax[]; +extern const u32 gMonBackPic_MeowthGigantamax[]; +extern const u32 gMonBackPic_MachampGigantamax[]; +extern const u32 gMonBackPic_GengarGigantamax[]; +extern const u32 gMonBackPic_KinglerGigantamax[]; +extern const u32 gMonBackPic_LaprasGigantamax[]; +extern const u32 gMonBackPic_EeveeGigantamax[]; +extern const u32 gMonBackPic_SnorlaxGigantamax[]; +extern const u32 gMonBackPic_GarbodorGigantamax[]; +extern const u32 gMonBackPic_MelmetalGigantamax[]; +extern const u32 gMonBackPic_RillaboomGigantamax[]; +extern const u32 gMonBackPic_CinderaceGigantamax[]; +extern const u32 gMonBackPic_InteleonGigantamax[]; +extern const u32 gMonBackPic_CorviknightGigantamax[]; +extern const u32 gMonBackPic_OrbeetleGigantamax[]; +extern const u32 gMonBackPic_DrednawGigantamax[]; +extern const u32 gMonBackPic_CoalossalGigantamax[]; +extern const u32 gMonBackPic_FlappleGigantamax[]; +extern const u32 gMonBackPic_AppletunGigantamax[]; +extern const u32 gMonBackPic_SandacondaGigantamax[]; +extern const u32 gMonBackPic_ToxtricityGigantamax[]; +extern const u32 gMonBackPic_CentiskorchGigantamax[]; +extern const u32 gMonBackPic_HattereneGigantamax[]; +extern const u32 gMonBackPic_GrimmsnarlGigantamax[]; +extern const u32 gMonBackPic_AlcremieGigantamax[]; +extern const u32 gMonBackPic_CopperajahGigantamax[]; +extern const u32 gMonBackPic_DuraludonGigantamax[]; +extern const u32 gMonBackPic_UrshifuGigantamax[]; +extern const u32 gMonBackPic_UrshifuRapidStrikeGigantamax[]; #endif extern const u32 gMonPalette_CircledQuestionMark[]; @@ -3908,39 +3908,39 @@ extern const u32 gMonPalette_CalyrexIceRider[]; extern const u32 gMonPalette_CalyrexShadowRider[]; extern const u32 gMonPalette_EnamorusTherian[]; extern const u32 gMonPalette_BasculegionFemale[]; -extern const u32 gMonPalette_VenusaurGmax[]; -extern const u32 gMonPalette_CharizardGmax[]; -extern const u32 gMonPalette_BlastoiseGmax[]; -extern const u32 gMonPalette_ButterfreeGmax[]; -extern const u32 gMonPalette_PikachuGmax[]; -extern const u32 gMonPalette_MeowthGmax[]; -extern const u32 gMonPalette_MachampGmax[]; -extern const u32 gMonPalette_GengarGmax[]; -extern const u32 gMonPalette_KinglerGmax[]; -extern const u32 gMonPalette_LaprasGmax[]; -extern const u32 gMonPalette_EeveeGmax[]; -extern const u32 gMonPalette_SnorlaxGmax[]; -extern const u32 gMonPalette_GarbodorGmax[]; -extern const u32 gMonPalette_MelmetalGmax[]; -extern const u32 gMonPalette_RillaboomGmax[]; -extern const u32 gMonPalette_CinderaceGmax[]; -extern const u32 gMonPalette_InteleonGmax[]; -extern const u32 gMonPalette_CorviknightGmax[]; -extern const u32 gMonPalette_OrbeetleGmax[]; -extern const u32 gMonPalette_DrednawGmax[]; -extern const u32 gMonPalette_CoalossalGmax[]; -extern const u32 gMonPalette_FlappleGmax[]; -extern const u32 gMonPalette_AppletunGmax[]; -extern const u32 gMonPalette_SandacondaGmax[]; -extern const u32 gMonPalette_ToxtricityGmax[]; -extern const u32 gMonPalette_CentiskorchGmax[]; -extern const u32 gMonPalette_HattereneGmax[]; -extern const u32 gMonPalette_GrimmsnarlGmax[]; -extern const u32 gMonPalette_AlcremieGmax[]; -extern const u32 gMonPalette_CopperajahGmax[]; -extern const u32 gMonPalette_DuraludonGmax[]; -extern const u32 gMonPalette_UrshifuGmax[]; -extern const u32 gMonPalette_UrshifuRapidStrikeGmax[]; +extern const u32 gMonPalette_VenusaurGigantamax[]; +extern const u32 gMonPalette_CharizardGigantamax[]; +extern const u32 gMonPalette_BlastoiseGigantamax[]; +extern const u32 gMonPalette_ButterfreeGigantamax[]; +extern const u32 gMonPalette_PikachuGigantamax[]; +extern const u32 gMonPalette_MeowthGigantamax[]; +extern const u32 gMonPalette_MachampGigantamax[]; +extern const u32 gMonPalette_GengarGigantamax[]; +extern const u32 gMonPalette_KinglerGigantamax[]; +extern const u32 gMonPalette_LaprasGigantamax[]; +extern const u32 gMonPalette_EeveeGigantamax[]; +extern const u32 gMonPalette_SnorlaxGigantamax[]; +extern const u32 gMonPalette_GarbodorGigantamax[]; +extern const u32 gMonPalette_MelmetalGigantamax[]; +extern const u32 gMonPalette_RillaboomGigantamax[]; +extern const u32 gMonPalette_CinderaceGigantamax[]; +extern const u32 gMonPalette_InteleonGigantamax[]; +extern const u32 gMonPalette_CorviknightGigantamax[]; +extern const u32 gMonPalette_OrbeetleGigantamax[]; +extern const u32 gMonPalette_DrednawGigantamax[]; +extern const u32 gMonPalette_CoalossalGigantamax[]; +extern const u32 gMonPalette_FlappleGigantamax[]; +extern const u32 gMonPalette_AppletunGigantamax[]; +extern const u32 gMonPalette_SandacondaGigantamax[]; +extern const u32 gMonPalette_ToxtricityGigantamax[]; +extern const u32 gMonPalette_CentiskorchGigantamax[]; +extern const u32 gMonPalette_HattereneGigantamax[]; +extern const u32 gMonPalette_GrimmsnarlGigantamax[]; +extern const u32 gMonPalette_AlcremieGigantamax[]; +extern const u32 gMonPalette_CopperajahGigantamax[]; +extern const u32 gMonPalette_DuraludonGigantamax[]; +extern const u32 gMonPalette_UrshifuGigantamax[]; +extern const u32 gMonPalette_UrshifuRapidStrikeGigantamax[]; #endif extern const u32 gMonPalette_Egg[]; @@ -5168,39 +5168,39 @@ extern const u32 gMonShinyPalette_CalyrexIceRider[]; extern const u32 gMonShinyPalette_CalyrexShadowRider[]; extern const u32 gMonShinyPalette_EnamorusTherian[]; extern const u32 gMonShinyPalette_BasculegionFemale[]; -extern const u32 gMonShinyPalette_VenusaurGmax[]; -extern const u32 gMonShinyPalette_CharizardGmax[]; -extern const u32 gMonShinyPalette_BlastoiseGmax[]; -extern const u32 gMonShinyPalette_ButterfreeGmax[]; -extern const u32 gMonShinyPalette_PikachuGmax[]; -extern const u32 gMonShinyPalette_MeowthGmax[]; -extern const u32 gMonShinyPalette_MachampGmax[]; -extern const u32 gMonShinyPalette_GengarGmax[]; -extern const u32 gMonShinyPalette_KinglerGmax[]; -extern const u32 gMonShinyPalette_LaprasGmax[]; -extern const u32 gMonShinyPalette_EeveeGmax[]; -extern const u32 gMonShinyPalette_SnorlaxGmax[]; -extern const u32 gMonShinyPalette_GarbodorGmax[]; -extern const u32 gMonShinyPalette_MelmetalGmax[]; -extern const u32 gMonShinyPalette_RillaboomGmax[]; -extern const u32 gMonShinyPalette_CinderaceGmax[]; -extern const u32 gMonShinyPalette_InteleonGmax[]; -extern const u32 gMonShinyPalette_CorviknightGmax[]; -extern const u32 gMonShinyPalette_OrbeetleGmax[]; -extern const u32 gMonShinyPalette_DrednawGmax[]; -extern const u32 gMonShinyPalette_CoalossalGmax[]; -extern const u32 gMonShinyPalette_FlappleGmax[]; -extern const u32 gMonShinyPalette_AppletunGmax[]; -extern const u32 gMonShinyPalette_SandacondaGmax[]; -extern const u32 gMonShinyPalette_ToxtricityGmax[]; -extern const u32 gMonShinyPalette_CentiskorchGmax[]; -extern const u32 gMonShinyPalette_HattereneGmax[]; -extern const u32 gMonShinyPalette_GrimmsnarlGmax[]; -extern const u32 gMonShinyPalette_AlcremieGmax[]; -extern const u32 gMonShinyPalette_CopperajahGmax[]; -extern const u32 gMonShinyPalette_DuraludonGmax[]; -extern const u32 gMonShinyPalette_UrshifuGmax[]; -extern const u32 gMonShinyPalette_UrshifuRapidStrikeGmax[]; +extern const u32 gMonShinyPalette_VenusaurGigantamax[]; +extern const u32 gMonShinyPalette_CharizardGigantamax[]; +extern const u32 gMonShinyPalette_BlastoiseGigantamax[]; +extern const u32 gMonShinyPalette_ButterfreeGigantamax[]; +extern const u32 gMonShinyPalette_PikachuGigantamax[]; +extern const u32 gMonShinyPalette_MeowthGigantamax[]; +extern const u32 gMonShinyPalette_MachampGigantamax[]; +extern const u32 gMonShinyPalette_GengarGigantamax[]; +extern const u32 gMonShinyPalette_KinglerGigantamax[]; +extern const u32 gMonShinyPalette_LaprasGigantamax[]; +extern const u32 gMonShinyPalette_EeveeGigantamax[]; +extern const u32 gMonShinyPalette_SnorlaxGigantamax[]; +extern const u32 gMonShinyPalette_GarbodorGigantamax[]; +extern const u32 gMonShinyPalette_MelmetalGigantamax[]; +extern const u32 gMonShinyPalette_RillaboomGigantamax[]; +extern const u32 gMonShinyPalette_CinderaceGigantamax[]; +extern const u32 gMonShinyPalette_InteleonGigantamax[]; +extern const u32 gMonShinyPalette_CorviknightGigantamax[]; +extern const u32 gMonShinyPalette_OrbeetleGigantamax[]; +extern const u32 gMonShinyPalette_DrednawGigantamax[]; +extern const u32 gMonShinyPalette_CoalossalGigantamax[]; +extern const u32 gMonShinyPalette_FlappleGigantamax[]; +extern const u32 gMonShinyPalette_AppletunGigantamax[]; +extern const u32 gMonShinyPalette_SandacondaGigantamax[]; +extern const u32 gMonShinyPalette_ToxtricityGigantamax[]; +extern const u32 gMonShinyPalette_CentiskorchGigantamax[]; +extern const u32 gMonShinyPalette_HattereneGigantamax[]; +extern const u32 gMonShinyPalette_GrimmsnarlGigantamax[]; +extern const u32 gMonShinyPalette_AlcremieGigantamax[]; +extern const u32 gMonShinyPalette_CopperajahGigantamax[]; +extern const u32 gMonShinyPalette_DuraludonGigantamax[]; +extern const u32 gMonShinyPalette_UrshifuGigantamax[]; +extern const u32 gMonShinyPalette_UrshifuRapidStrikeGigantamax[]; #endif extern const u8 gMonIcon_QuestionMark[]; @@ -6421,39 +6421,39 @@ extern const u8 gMonIcon_CalyrexIceRider[]; extern const u8 gMonIcon_CalyrexShadowRider[]; extern const u8 gMonIcon_EnamorusTherian[]; extern const u8 gMonIcon_BasculegionFemale[]; -extern const u8 gMonIcon_VenusaurGmax[]; -extern const u8 gMonIcon_CharizardGmax[]; -extern const u8 gMonIcon_BlastoiseGmax[]; -extern const u8 gMonIcon_ButterfreeGmax[]; -extern const u8 gMonIcon_PikachuGmax[]; -extern const u8 gMonIcon_MeowthGmax[]; -extern const u8 gMonIcon_MachampGmax[]; -extern const u8 gMonIcon_GengarGmax[]; -extern const u8 gMonIcon_KinglerGmax[]; -extern const u8 gMonIcon_LaprasGmax[]; -extern const u8 gMonIcon_EeveeGmax[]; -extern const u8 gMonIcon_SnorlaxGmax[]; -extern const u8 gMonIcon_GarbodorGmax[]; -extern const u8 gMonIcon_MelmetalGmax[]; -extern const u8 gMonIcon_RillaboomGmax[]; -extern const u8 gMonIcon_CinderaceGmax[]; -extern const u8 gMonIcon_InteleonGmax[]; -extern const u8 gMonIcon_CorviknightGmax[]; -extern const u8 gMonIcon_OrbeetleGmax[]; -extern const u8 gMonIcon_DrednawGmax[]; -extern const u8 gMonIcon_CoalossalGmax[]; -extern const u8 gMonIcon_FlappleGmax[]; -extern const u8 gMonIcon_AppletunGmax[]; -extern const u8 gMonIcon_SandacondaGmax[]; -extern const u8 gMonIcon_ToxtricityGmax[]; -extern const u8 gMonIcon_CentiskorchGmax[]; -extern const u8 gMonIcon_HattereneGmax[]; -extern const u8 gMonIcon_GrimmsnarlGmax[]; -extern const u8 gMonIcon_AlcremieGmax[]; -extern const u8 gMonIcon_CopperajahGmax[]; -extern const u8 gMonIcon_DuraludonGmax[]; -extern const u8 gMonIcon_UrshifuGmax[]; -extern const u8 gMonIcon_UrshifuRapidStrikeGmax[]; +extern const u8 gMonIcon_VenusaurGigantamax[]; +extern const u8 gMonIcon_CharizardGigantamax[]; +extern const u8 gMonIcon_BlastoiseGigantamax[]; +extern const u8 gMonIcon_ButterfreeGigantamax[]; +extern const u8 gMonIcon_PikachuGigantamax[]; +extern const u8 gMonIcon_MeowthGigantamax[]; +extern const u8 gMonIcon_MachampGigantamax[]; +extern const u8 gMonIcon_GengarGigantamax[]; +extern const u8 gMonIcon_KinglerGigantamax[]; +extern const u8 gMonIcon_LaprasGigantamax[]; +extern const u8 gMonIcon_EeveeGigantamax[]; +extern const u8 gMonIcon_SnorlaxGigantamax[]; +extern const u8 gMonIcon_GarbodorGigantamax[]; +extern const u8 gMonIcon_MelmetalGigantamax[]; +extern const u8 gMonIcon_RillaboomGigantamax[]; +extern const u8 gMonIcon_CinderaceGigantamax[]; +extern const u8 gMonIcon_InteleonGigantamax[]; +extern const u8 gMonIcon_CorviknightGigantamax[]; +extern const u8 gMonIcon_OrbeetleGigantamax[]; +extern const u8 gMonIcon_DrednawGigantamax[]; +extern const u8 gMonIcon_CoalossalGigantamax[]; +extern const u8 gMonIcon_FlappleGigantamax[]; +extern const u8 gMonIcon_AppletunGigantamax[]; +extern const u8 gMonIcon_SandacondaGigantamax[]; +extern const u8 gMonIcon_ToxtricityGigantamax[]; +extern const u8 gMonIcon_CentiskorchGigantamax[]; +extern const u8 gMonIcon_HattereneGigantamax[]; +extern const u8 gMonIcon_GrimmsnarlGigantamax[]; +extern const u8 gMonIcon_AlcremieGigantamax[]; +extern const u8 gMonIcon_CopperajahGigantamax[]; +extern const u8 gMonIcon_DuraludonGigantamax[]; +extern const u8 gMonIcon_UrshifuGigantamax[]; +extern const u8 gMonIcon_UrshifuRapidStrikeGigantamax[]; #endif extern const u8 gMonIcon_Egg[]; @@ -7372,39 +7372,39 @@ extern const u8 gMonFootprint_Calyrex[]; //extern const u8 gMonFootprint_Sneasler[]; //extern const u8 gMonFootprint_Overqwil[]; //extern const u8 gMonFootprint_Enamorus[]; -extern const u32 gMonFrontPic_VenusaurGmax[]; -extern const u32 gMonFrontPic_CharizardGmax[]; -extern const u32 gMonFrontPic_BlastoiseGmax[]; -extern const u32 gMonFrontPic_ButterfreeGmax[]; -extern const u32 gMonFrontPic_PikachuGmax[]; -extern const u32 gMonFrontPic_MeowthGmax[]; -extern const u32 gMonFrontPic_MachampGmax[]; -extern const u32 gMonFrontPic_GengarGmax[]; -extern const u32 gMonFrontPic_KinglerGmax[]; -extern const u32 gMonFrontPic_LaprasGmax[]; -extern const u32 gMonFrontPic_EeveeGmax[]; -extern const u32 gMonFrontPic_SnorlaxGmax[]; -extern const u32 gMonFrontPic_GarbodorGmax[]; -extern const u32 gMonFrontPic_MelmetalGmax[]; -extern const u32 gMonFrontPic_RillaboomGmax[]; -extern const u32 gMonFrontPic_CinderaceGmax[]; -extern const u32 gMonFrontPic_InteleonGmax[]; -extern const u32 gMonFrontPic_CorviknightGmax[]; -extern const u32 gMonFrontPic_OrbeetleGmax[]; -extern const u32 gMonFrontPic_DrednawGmax[]; -extern const u32 gMonFrontPic_CoalossalGmax[]; -extern const u32 gMonFrontPic_FlappleGmax[]; -extern const u32 gMonFrontPic_AppletunGmax[]; -extern const u32 gMonFrontPic_SandacondaGmax[]; -extern const u32 gMonFrontPic_ToxtricityGmax[]; -extern const u32 gMonFrontPic_CentiskorchGmax[]; -extern const u32 gMonFrontPic_HattereneGmax[]; -extern const u32 gMonFrontPic_GrimmsnarlGmax[]; -extern const u32 gMonFrontPic_AlcremieGmax[]; -extern const u32 gMonFrontPic_CopperajahGmax[]; -extern const u32 gMonFrontPic_DuraludonGmax[]; -extern const u32 gMonFrontPic_UrshifuGmax[]; -extern const u32 gMonFrontPic_UrshifuRapidStrikeGmax[]; +extern const u32 gMonFrontPic_VenusaurGigantamax[]; +extern const u32 gMonFrontPic_CharizardGigantamax[]; +extern const u32 gMonFrontPic_BlastoiseGigantamax[]; +extern const u32 gMonFrontPic_ButterfreeGigantamax[]; +extern const u32 gMonFrontPic_PikachuGigantamax[]; +extern const u32 gMonFrontPic_MeowthGigantamax[]; +extern const u32 gMonFrontPic_MachampGigantamax[]; +extern const u32 gMonFrontPic_GengarGigantamax[]; +extern const u32 gMonFrontPic_KinglerGigantamax[]; +extern const u32 gMonFrontPic_LaprasGigantamax[]; +extern const u32 gMonFrontPic_EeveeGigantamax[]; +extern const u32 gMonFrontPic_SnorlaxGigantamax[]; +extern const u32 gMonFrontPic_GarbodorGigantamax[]; +extern const u32 gMonFrontPic_MelmetalGigantamax[]; +extern const u32 gMonFrontPic_RillaboomGigantamax[]; +extern const u32 gMonFrontPic_CinderaceGigantamax[]; +extern const u32 gMonFrontPic_InteleonGigantamax[]; +extern const u32 gMonFrontPic_CorviknightGigantamax[]; +extern const u32 gMonFrontPic_OrbeetleGigantamax[]; +extern const u32 gMonFrontPic_DrednawGigantamax[]; +extern const u32 gMonFrontPic_CoalossalGigantamax[]; +extern const u32 gMonFrontPic_FlappleGigantamax[]; +extern const u32 gMonFrontPic_AppletunGigantamax[]; +extern const u32 gMonFrontPic_SandacondaGigantamax[]; +extern const u32 gMonFrontPic_ToxtricityGigantamax[]; +extern const u32 gMonFrontPic_CentiskorchGigantamax[]; +extern const u32 gMonFrontPic_HattereneGigantamax[]; +extern const u32 gMonFrontPic_GrimmsnarlGigantamax[]; +extern const u32 gMonFrontPic_AlcremieGigantamax[]; +extern const u32 gMonFrontPic_CopperajahGigantamax[]; +extern const u32 gMonFrontPic_DuraludonGigantamax[]; +extern const u32 gMonFrontPic_UrshifuGigantamax[]; +extern const u32 gMonFrontPic_UrshifuRapidStrikeGigantamax[]; #endif // trainer sprites diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index d2005a77d0..742516a0b6 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -56,39 +56,39 @@ struct GMaxMove static const struct GMaxMove sGMaxMoveTable[] = { - {SPECIES_VENUSAUR_GMAX, TYPE_GRASS, MOVE_G_MAX_VINE_LASH}, - {SPECIES_BLASTOISE_GMAX, TYPE_WATER, MOVE_G_MAX_CANNONADE}, - {SPECIES_CHARIZARD_GMAX, TYPE_FIRE, MOVE_G_MAX_WILDFIRE}, - {SPECIES_BUTTERFREE_GMAX, TYPE_BUG, MOVE_G_MAX_BEFUDDLE}, - {SPECIES_PIKACHU_GMAX, TYPE_ELECTRIC, MOVE_G_MAX_VOLT_CRASH}, - {SPECIES_MEOWTH_GMAX, TYPE_NORMAL, MOVE_G_MAX_GOLD_RUSH}, - {SPECIES_MACHAMP_GMAX, TYPE_FIGHTING, MOVE_G_MAX_CHI_STRIKE}, - {SPECIES_GENGAR_GMAX, TYPE_GHOST, MOVE_G_MAX_TERROR}, - {SPECIES_KINGLER_GMAX, TYPE_WATER, MOVE_G_MAX_FOAM_BURST}, - {SPECIES_LAPRAS_GMAX, TYPE_ICE, MOVE_G_MAX_RESONANCE}, - {SPECIES_EEVEE_GMAX, TYPE_NORMAL, MOVE_G_MAX_CUDDLE}, - {SPECIES_SNORLAX_GMAX, TYPE_NORMAL, MOVE_G_MAX_REPLENISH}, - {SPECIES_GARBODOR_GMAX, TYPE_POISON, MOVE_G_MAX_MALODOR}, - {SPECIES_MELMETAL_GMAX, TYPE_STEEL, MOVE_G_MAX_MELTDOWN}, - {SPECIES_RILLABOOM_GMAX, TYPE_GRASS, MOVE_G_MAX_DRUM_SOLO}, - {SPECIES_CINDERACE_GMAX, TYPE_FIRE, MOVE_G_MAX_FIREBALL}, - {SPECIES_INTELEON_GMAX, TYPE_WATER, MOVE_G_MAX_HYDROSNIPE}, - {SPECIES_CORVIKNIGHT_GMAX, TYPE_FLYING, MOVE_G_MAX_WIND_RAGE}, - {SPECIES_ORBEETLE_GMAX, TYPE_PSYCHIC, MOVE_G_MAX_GRAVITAS}, - {SPECIES_DREDNAW_GMAX, TYPE_WATER, MOVE_G_MAX_STONESURGE}, - {SPECIES_COALOSSAL_GMAX, TYPE_ROCK, MOVE_G_MAX_VOLCALITH}, - {SPECIES_FLAPPLE_GMAX, TYPE_GRASS, MOVE_G_MAX_TARTNESS}, - {SPECIES_APPLETUN_GMAX, TYPE_GRASS, MOVE_G_MAX_SWEETNESS}, - {SPECIES_SANDACONDA_GMAX, TYPE_GROUND, MOVE_G_MAX_SANDBLAST}, - {SPECIES_TOXTRICITY_GMAX, TYPE_ELECTRIC, MOVE_G_MAX_STUN_SHOCK}, - {SPECIES_CENTISKORCH_GMAX, TYPE_FIRE, MOVE_G_MAX_CENTIFERNO}, - {SPECIES_HATTERENE_GMAX, TYPE_FAIRY, MOVE_G_MAX_SMITE}, - {SPECIES_GRIMMSNARL_GMAX, TYPE_DARK, MOVE_G_MAX_SNOOZE}, - {SPECIES_ALCREMIE_GMAX, TYPE_FAIRY, MOVE_G_MAX_FINALE}, - {SPECIES_COPPERAJAH_GMAX, TYPE_STEEL, MOVE_G_MAX_STEELSURGE}, - {SPECIES_DURALUDON_GMAX, TYPE_DRAGON, MOVE_G_MAX_DEPLETION}, - {SPECIES_URSHIFU_GMAX, TYPE_DARK, MOVE_G_MAX_ONE_BLOW}, - {SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX, TYPE_WATER, MOVE_G_MAX_RAPID_FLOW}, + {SPECIES_VENUSAUR_GIGANTAMAX, TYPE_GRASS, MOVE_G_MAX_VINE_LASH}, + {SPECIES_BLASTOISE_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_CANNONADE}, + {SPECIES_CHARIZARD_GIGANTAMAX, TYPE_FIRE, MOVE_G_MAX_WILDFIRE}, + {SPECIES_BUTTERFREE_GIGANTAMAX, TYPE_BUG, MOVE_G_MAX_BEFUDDLE}, + {SPECIES_PIKACHU_GIGANTAMAX, TYPE_ELECTRIC, MOVE_G_MAX_VOLT_CRASH}, + {SPECIES_MEOWTH_GIGANTAMAX, TYPE_NORMAL, MOVE_G_MAX_GOLD_RUSH}, + {SPECIES_MACHAMP_GIGANTAMAX, TYPE_FIGHTING, MOVE_G_MAX_CHI_STRIKE}, + {SPECIES_GENGAR_GIGANTAMAX, TYPE_GHOST, MOVE_G_MAX_TERROR}, + {SPECIES_KINGLER_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_FOAM_BURST}, + {SPECIES_LAPRAS_GIGANTAMAX, TYPE_ICE, MOVE_G_MAX_RESONANCE}, + {SPECIES_EEVEE_GIGANTAMAX, TYPE_NORMAL, MOVE_G_MAX_CUDDLE}, + {SPECIES_SNORLAX_GIGANTAMAX, TYPE_NORMAL, MOVE_G_MAX_REPLENISH}, + {SPECIES_GARBODOR_GIGANTAMAX, TYPE_POISON, MOVE_G_MAX_MALODOR}, + {SPECIES_MELMETAL_GIGANTAMAX, TYPE_STEEL, MOVE_G_MAX_MELTDOWN}, + {SPECIES_RILLABOOM_GIGANTAMAX, TYPE_GRASS, MOVE_G_MAX_DRUM_SOLO}, + {SPECIES_CINDERACE_GIGANTAMAX, TYPE_FIRE, MOVE_G_MAX_FIREBALL}, + {SPECIES_INTELEON_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_HYDROSNIPE}, + {SPECIES_CORVIKNIGHT_GIGANTAMAX, TYPE_FLYING, MOVE_G_MAX_WIND_RAGE}, + {SPECIES_ORBEETLE_GIGANTAMAX, TYPE_PSYCHIC, MOVE_G_MAX_GRAVITAS}, + {SPECIES_DREDNAW_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_STONESURGE}, + {SPECIES_COALOSSAL_GIGANTAMAX, TYPE_ROCK, MOVE_G_MAX_VOLCALITH}, + {SPECIES_FLAPPLE_GIGANTAMAX, TYPE_GRASS, MOVE_G_MAX_TARTNESS}, + {SPECIES_APPLETUN_GIGANTAMAX, TYPE_GRASS, MOVE_G_MAX_SWEETNESS}, + {SPECIES_SANDACONDA_GIGANTAMAX, TYPE_GROUND, MOVE_G_MAX_SANDBLAST}, + {SPECIES_TOXTRICITY_GIGANTAMAX, TYPE_ELECTRIC, MOVE_G_MAX_STUN_SHOCK}, + {SPECIES_CENTISKORCH_GIGANTAMAX, TYPE_FIRE, MOVE_G_MAX_CENTIFERNO}, + {SPECIES_HATTERENE_GIGANTAMAX, TYPE_FAIRY, MOVE_G_MAX_SMITE}, + {SPECIES_GRIMMSNARL_GIGANTAMAX, TYPE_DARK, MOVE_G_MAX_SNOOZE}, + {SPECIES_ALCREMIE_GIGANTAMAX, TYPE_FAIRY, MOVE_G_MAX_FINALE}, + {SPECIES_COPPERAJAH_GIGANTAMAX, TYPE_STEEL, MOVE_G_MAX_STEELSURGE}, + {SPECIES_DURALUDON_GIGANTAMAX, TYPE_DRAGON, MOVE_G_MAX_DEPLETION}, + {SPECIES_URSHIFU_GIGANTAMAX, TYPE_DARK, MOVE_G_MAX_ONE_BLOW}, + {SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_RAPID_FLOW}, }; // forward declarations @@ -288,15 +288,15 @@ static u16 GetTypeBasedMaxMove(u16 battlerId, u16 type) // Gigantamax check u16 species = gBattleMons[battlerId].species; u16 targetSpecies = GetBattleFormChangeTargetSpecies(battlerId, FORM_CHANGE_BATTLE_GIGANTAMAX); - if (species >= (SPECIES_VENUSAUR_GMAX) - && sGMaxMoveTable[species - (SPECIES_VENUSAUR_GMAX)].moveType == type) + if (species >= (SPECIES_VENUSAUR_GIGANTAMAX) + && sGMaxMoveTable[species - (SPECIES_VENUSAUR_GIGANTAMAX)].moveType == type) { - return sGMaxMoveTable[species - (SPECIES_VENUSAUR_GMAX)].gmaxMove; + return sGMaxMoveTable[species - (SPECIES_VENUSAUR_GIGANTAMAX)].gmaxMove; } else if (targetSpecies != SPECIES_NONE - && sGMaxMoveTable[targetSpecies - (SPECIES_VENUSAUR_GMAX)].moveType == type) + && sGMaxMoveTable[targetSpecies - (SPECIES_VENUSAUR_GIGANTAMAX)].moveType == type) { - return sGMaxMoveTable[targetSpecies - (SPECIES_VENUSAUR_GMAX)].gmaxMove; + return sGMaxMoveTable[targetSpecies - (SPECIES_VENUSAUR_GIGANTAMAX)].gmaxMove; } // regular Max Move diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 8c71f6d7e6..4785c4717f 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -1289,39 +1289,39 @@ const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz"); const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz"); const u32 gMonFrontPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/front.4bpp.lz"); -const u32 gMonFrontPic_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax/front.4bpp.lz"); -const u32 gMonFrontPic_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax_rapid_strike_style/front.4bpp.lz"); +const u32 gMonFrontPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_UrshifuGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_UrshifuRapidStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.4bpp.lz"); #endif const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz"); @@ -2607,39 +2607,39 @@ const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/i const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz"); const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz"); const u32 gMonBackPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/back.4bpp.lz"); -const u32 gMonBackPic_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/back.4bpp.lz"); -const u32 gMonBackPic_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/back.4bpp.lz"); -const u32 gMonBackPic_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/back.4bpp.lz"); -const u32 gMonBackPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/back.4bpp.lz"); -const u32 gMonBackPic_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/back.4bpp.lz"); -const u32 gMonBackPic_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/back.4bpp.lz"); -const u32 gMonBackPic_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/back.4bpp.lz"); -const u32 gMonBackPic_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/back.4bpp.lz"); -const u32 gMonBackPic_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/back.4bpp.lz"); -const u32 gMonBackPic_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/back.4bpp.lz"); -const u32 gMonBackPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/back.4bpp.lz"); -const u32 gMonBackPic_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/back.4bpp.lz"); -const u32 gMonBackPic_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/back.4bpp.lz"); -const u32 gMonBackPic_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/back.4bpp.lz"); -const u32 gMonBackPic_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/back.4bpp.lz"); -const u32 gMonBackPic_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/back.4bpp.lz"); -const u32 gMonBackPic_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/back.4bpp.lz"); -const u32 gMonBackPic_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/back.4bpp.lz"); -const u32 gMonBackPic_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/back.4bpp.lz"); -const u32 gMonBackPic_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/back.4bpp.lz"); -const u32 gMonBackPic_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/back.4bpp.lz"); -const u32 gMonBackPic_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/back.4bpp.lz"); -const u32 gMonBackPic_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/back.4bpp.lz"); -const u32 gMonBackPic_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/back.4bpp.lz"); -const u32 gMonBackPic_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/back.4bpp.lz"); -const u32 gMonBackPic_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/back.4bpp.lz"); -const u32 gMonBackPic_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/back.4bpp.lz"); -const u32 gMonBackPic_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/back.4bpp.lz"); -const u32 gMonBackPic_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/back.4bpp.lz"); -const u32 gMonBackPic_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/back.4bpp.lz"); -const u32 gMonBackPic_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/back.4bpp.lz"); -const u32 gMonBackPic_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax/back.4bpp.lz"); -const u32 gMonBackPic_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax_rapid_strike_style/back.4bpp.lz"); +const u32 gMonBackPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_UrshifuGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_UrshifuRapidStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.4bpp.lz"); #endif const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz"); @@ -3872,39 +3872,39 @@ const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/i const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz"); const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz"); const u32 gMonPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/normal.gbapal.lz"); -const u32 gMonPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/normal.gbapal.lz"); -const u32 gMonPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/normal.gbapal.lz"); -const u32 gMonPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/normal.gbapal.lz"); -const u32 gMonPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/normal.gbapal.lz"); -const u32 gMonPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/normal.gbapal.lz"); -const u32 gMonPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/normal.gbapal.lz"); -const u32 gMonPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/normal.gbapal.lz"); -const u32 gMonPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/normal.gbapal.lz"); -const u32 gMonPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/normal.gbapal.lz"); -const u32 gMonPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/normal.gbapal.lz"); -const u32 gMonPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/normal.gbapal.lz"); -const u32 gMonPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/normal.gbapal.lz"); -const u32 gMonPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/normal.gbapal.lz"); -const u32 gMonPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/normal.gbapal.lz"); -const u32 gMonPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/normal.gbapal.lz"); -const u32 gMonPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/normal.gbapal.lz"); -const u32 gMonPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/normal.gbapal.lz"); -const u32 gMonPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/normal.gbapal.lz"); -const u32 gMonPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/normal.gbapal.lz"); -const u32 gMonPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/normal.gbapal.lz"); -const u32 gMonPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/normal.gbapal.lz"); -const u32 gMonPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/normal.gbapal.lz"); -const u32 gMonPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/normal.gbapal.lz"); -const u32 gMonPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/normal.gbapal.lz"); -const u32 gMonPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/normal.gbapal.lz"); -const u32 gMonPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/normal.gbapal.lz"); -const u32 gMonPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/normal.gbapal.lz"); -const u32 gMonPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/normal.gbapal.lz"); -const u32 gMonPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/normal.gbapal.lz"); -const u32 gMonPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/normal.gbapal.lz"); -const u32 gMonPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/normal.gbapal.lz"); -const u32 gMonPalette_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax/normal.gbapal.lz"); -const u32 gMonPalette_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax_rapid_strike_style/normal.gbapal.lz"); +const u32 gMonPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_UrshifuGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_UrshifuRapidStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.gbapal.lz"); #endif const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz"); @@ -5132,39 +5132,39 @@ const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/caly const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz"); const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz"); const u32 gMonShinyPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/shiny.gbapal.lz"); -const u32 gMonShinyPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax_rapid_strike_style/shiny.gbapal.lz"); +const u32 gMonShinyPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_UrshifuGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_UrshifuRapidStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.gbapal.lz"); #endif const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp"); @@ -6385,39 +6385,39 @@ const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_ri const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp"); const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp"); const u8 gMonIcon_BasculegionFemale[] = INCBIN_U8("graphics/pokemon/basculegion/female/icon.4bpp"); -const u8 gMonIcon_VenusaurGmax[] = INCBIN_U8("graphics/pokemon/venusaur/gmax/icon.4bpp"); -const u8 gMonIcon_CharizardGmax[] = INCBIN_U8("graphics/pokemon/charizard/gmax/icon.4bpp"); -const u8 gMonIcon_BlastoiseGmax[] = INCBIN_U8("graphics/pokemon/blastoise/gmax/icon.4bpp"); -const u8 gMonIcon_ButterfreeGmax[] = INCBIN_U8("graphics/pokemon/butterfree/gmax/icon.4bpp"); -const u8 gMonIcon_PikachuGmax[] = INCBIN_U8("graphics/pokemon/pikachu/gmax/icon.4bpp"); -const u8 gMonIcon_MeowthGmax[] = INCBIN_U8("graphics/pokemon/meowth/gmax/icon.4bpp"); -const u8 gMonIcon_MachampGmax[] = INCBIN_U8("graphics/pokemon/machamp/gmax/icon.4bpp"); -const u8 gMonIcon_GengarGmax[] = INCBIN_U8("graphics/pokemon/gengar/gmax/icon.4bpp"); -const u8 gMonIcon_KinglerGmax[] = INCBIN_U8("graphics/pokemon/kingler/gmax/icon.4bpp"); -const u8 gMonIcon_LaprasGmax[] = INCBIN_U8("graphics/pokemon/lapras/gmax/icon.4bpp"); -const u8 gMonIcon_EeveeGmax[] = INCBIN_U8("graphics/pokemon/eevee/gmax/icon.4bpp"); -const u8 gMonIcon_SnorlaxGmax[] = INCBIN_U8("graphics/pokemon/snorlax/gmax/icon.4bpp"); -const u8 gMonIcon_GarbodorGmax[] = INCBIN_U8("graphics/pokemon/garbodor/gmax/icon.4bpp"); -const u8 gMonIcon_MelmetalGmax[] = INCBIN_U8("graphics/pokemon/melmetal/gmax/icon.4bpp"); -const u8 gMonIcon_RillaboomGmax[] = INCBIN_U8("graphics/pokemon/rillaboom/gmax/icon.4bpp"); -const u8 gMonIcon_CinderaceGmax[] = INCBIN_U8("graphics/pokemon/cinderace/gmax/icon.4bpp"); -const u8 gMonIcon_InteleonGmax[] = INCBIN_U8("graphics/pokemon/inteleon/gmax/icon.4bpp"); -const u8 gMonIcon_CorviknightGmax[] = INCBIN_U8("graphics/pokemon/corviknight/gmax/icon.4bpp"); -const u8 gMonIcon_OrbeetleGmax[] = INCBIN_U8("graphics/pokemon/orbeetle/gmax/icon.4bpp"); -const u8 gMonIcon_DrednawGmax[] = INCBIN_U8("graphics/pokemon/drednaw/gmax/icon.4bpp"); -const u8 gMonIcon_CoalossalGmax[] = INCBIN_U8("graphics/pokemon/coalossal/gmax/icon.4bpp"); -const u8 gMonIcon_FlappleGmax[] = INCBIN_U8("graphics/pokemon/flapple/gmax/icon.4bpp"); -const u8 gMonIcon_AppletunGmax[] = INCBIN_U8("graphics/pokemon/appletun/gmax/icon.4bpp"); -const u8 gMonIcon_SandacondaGmax[] = INCBIN_U8("graphics/pokemon/sandaconda/gmax/icon.4bpp"); -const u8 gMonIcon_ToxtricityGmax[] = INCBIN_U8("graphics/pokemon/toxtricity/gmax/icon.4bpp"); -const u8 gMonIcon_CentiskorchGmax[] = INCBIN_U8("graphics/pokemon/centiskorch/gmax/icon.4bpp"); -const u8 gMonIcon_HattereneGmax[] = INCBIN_U8("graphics/pokemon/hatterene/gmax/icon.4bpp"); -const u8 gMonIcon_GrimmsnarlGmax[] = INCBIN_U8("graphics/pokemon/grimmsnarl/gmax/icon.4bpp"); -const u8 gMonIcon_AlcremieGmax[] = INCBIN_U8("graphics/pokemon/alcremie/gmax/icon.4bpp"); -const u8 gMonIcon_CopperajahGmax[] = INCBIN_U8("graphics/pokemon/copperajah/gmax/icon.4bpp"); -const u8 gMonIcon_DuraludonGmax[] = INCBIN_U8("graphics/pokemon/duraludon/gmax/icon.4bpp"); -const u8 gMonIcon_UrshifuGmax[] = INCBIN_U8("graphics/pokemon/urshifu/gmax/icon.4bpp"); -const u8 gMonIcon_UrshifuRapidStrikeGmax[] = INCBIN_U8("graphics/pokemon/urshifu/gmax_rapid_strike_style/icon.4bpp"); +const u8 gMonIcon_VenusaurGigantamax[] = INCBIN_U8("graphics/pokemon/venusaur/gigantamax/icon.4bpp"); +const u8 gMonIcon_CharizardGigantamax[] = INCBIN_U8("graphics/pokemon/charizard/gigantamax/icon.4bpp"); +const u8 gMonIcon_BlastoiseGigantamax[] = INCBIN_U8("graphics/pokemon/blastoise/gigantamax/icon.4bpp"); +const u8 gMonIcon_ButterfreeGigantamax[] = INCBIN_U8("graphics/pokemon/butterfree/gigantamax/icon.4bpp"); +const u8 gMonIcon_PikachuGigantamax[] = INCBIN_U8("graphics/pokemon/pikachu/gigantamax/icon.4bpp"); +const u8 gMonIcon_MeowthGigantamax[] = INCBIN_U8("graphics/pokemon/meowth/gigantamax/icon.4bpp"); +const u8 gMonIcon_MachampGigantamax[] = INCBIN_U8("graphics/pokemon/machamp/gigantamax/icon.4bpp"); +const u8 gMonIcon_GengarGigantamax[] = INCBIN_U8("graphics/pokemon/gengar/gigantamax/icon.4bpp"); +const u8 gMonIcon_KinglerGigantamax[] = INCBIN_U8("graphics/pokemon/kingler/gigantamax/icon.4bpp"); +const u8 gMonIcon_LaprasGigantamax[] = INCBIN_U8("graphics/pokemon/lapras/gigantamax/icon.4bpp"); +const u8 gMonIcon_EeveeGigantamax[] = INCBIN_U8("graphics/pokemon/eevee/gigantamax/icon.4bpp"); +const u8 gMonIcon_SnorlaxGigantamax[] = INCBIN_U8("graphics/pokemon/snorlax/gigantamax/icon.4bpp"); +const u8 gMonIcon_GarbodorGigantamax[] = INCBIN_U8("graphics/pokemon/garbodor/gigantamax/icon.4bpp"); +const u8 gMonIcon_MelmetalGigantamax[] = INCBIN_U8("graphics/pokemon/melmetal/gigantamax/icon.4bpp"); +const u8 gMonIcon_RillaboomGigantamax[] = INCBIN_U8("graphics/pokemon/rillaboom/gigantamax/icon.4bpp"); +const u8 gMonIcon_CinderaceGigantamax[] = INCBIN_U8("graphics/pokemon/cinderace/gigantamax/icon.4bpp"); +const u8 gMonIcon_InteleonGigantamax[] = INCBIN_U8("graphics/pokemon/inteleon/gigantamax/icon.4bpp"); +const u8 gMonIcon_CorviknightGigantamax[] = INCBIN_U8("graphics/pokemon/corviknight/gigantamax/icon.4bpp"); +const u8 gMonIcon_OrbeetleGigantamax[] = INCBIN_U8("graphics/pokemon/orbeetle/gigantamax/icon.4bpp"); +const u8 gMonIcon_DrednawGigantamax[] = INCBIN_U8("graphics/pokemon/drednaw/gigantamax/icon.4bpp"); +const u8 gMonIcon_CoalossalGigantamax[] = INCBIN_U8("graphics/pokemon/coalossal/gigantamax/icon.4bpp"); +const u8 gMonIcon_FlappleGigantamax[] = INCBIN_U8("graphics/pokemon/flapple/gigantamax/icon.4bpp"); +const u8 gMonIcon_AppletunGigantamax[] = INCBIN_U8("graphics/pokemon/appletun/gigantamax/icon.4bpp"); +const u8 gMonIcon_SandacondaGigantamax[] = INCBIN_U8("graphics/pokemon/sandaconda/gigantamax/icon.4bpp"); +const u8 gMonIcon_ToxtricityGigantamax[] = INCBIN_U8("graphics/pokemon/toxtricity/gigantamax/icon.4bpp"); +const u8 gMonIcon_CentiskorchGigantamax[] = INCBIN_U8("graphics/pokemon/centiskorch/gigantamax/icon.4bpp"); +const u8 gMonIcon_HattereneGigantamax[] = INCBIN_U8("graphics/pokemon/hatterene/gigantamax/icon.4bpp"); +const u8 gMonIcon_GrimmsnarlGigantamax[] = INCBIN_U8("graphics/pokemon/grimmsnarl/gigantamax/icon.4bpp"); +const u8 gMonIcon_AlcremieGigantamax[] = INCBIN_U8("graphics/pokemon/alcremie/gigantamax/icon.4bpp"); +const u8 gMonIcon_CopperajahGigantamax[] = INCBIN_U8("graphics/pokemon/copperajah/gigantamax/icon.4bpp"); +const u8 gMonIcon_DuraludonGigantamax[] = INCBIN_U8("graphics/pokemon/duraludon/gigantamax/icon.4bpp"); +const u8 gMonIcon_UrshifuGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.4bpp"); +const u8 gMonIcon_UrshifuRapidStrikeGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.4bpp"); #endif const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index 9e6483cd2d..b9d3bc0d91 100644 --- a/src/data/pokemon/form_change_table_pointers.h +++ b/src/data/pokemon/form_change_table_pointers.h @@ -2,35 +2,35 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = { [SPECIES_VENUSAUR] = sVenusaurFormChangeTable, [SPECIES_VENUSAUR_MEGA] = sVenusaurFormChangeTable, - [SPECIES_VENUSAUR_GMAX] = sVenusaurFormChangeTable, + [SPECIES_VENUSAUR_GIGANTAMAX] = sVenusaurFormChangeTable, [SPECIES_CHARIZARD] = sCharizardFormChangeTable, [SPECIES_CHARIZARD_MEGA_X] = sCharizardFormChangeTable, [SPECIES_CHARIZARD_MEGA_Y] = sCharizardFormChangeTable, - [SPECIES_CHARIZARD_GMAX] = sCharizardFormChangeTable, + [SPECIES_CHARIZARD_GIGANTAMAX] = sCharizardFormChangeTable, [SPECIES_BLASTOISE] = sBlastoiseFormChangeTable, [SPECIES_BLASTOISE_MEGA] = sBlastoiseFormChangeTable, - [SPECIES_BLASTOISE_GMAX] = sBlastoiseFormChangeTable, + [SPECIES_BLASTOISE_GIGANTAMAX] = sBlastoiseFormChangeTable, [SPECIES_BUTTERFREE] = sButterfreeFormChangeTable, - [SPECIES_BUTTERFREE_GMAX] = sButterfreeFormChangeTable, + [SPECIES_BUTTERFREE_GIGANTAMAX] = sButterfreeFormChangeTable, [SPECIES_BEEDRILL] = sBeedrillFormChangeTable, [SPECIES_BEEDRILL_MEGA] = sBeedrillFormChangeTable, [SPECIES_PIDGEOT] = sPidgeotFormChangeTable, [SPECIES_PIDGEOT_MEGA] = sPidgeotFormChangeTable, [SPECIES_PIKACHU] = sPikachuFormChangeTable, - [SPECIES_PIKACHU_GMAX] = sPikachuFormChangeTable, + [SPECIES_PIKACHU_GIGANTAMAX] = sPikachuFormChangeTable, [SPECIES_MEOWTH] = sMeowthFormChangeTable, - [SPECIES_MEOWTH_GMAX] = sMeowthFormChangeTable, + [SPECIES_MEOWTH_GIGANTAMAX] = sMeowthFormChangeTable, [SPECIES_ALAKAZAM] = sAlakazamFormChangeTable, [SPECIES_ALAKAZAM_MEGA] = sAlakazamFormChangeTable, [SPECIES_MACHAMP] = sMachampFormChangeTable, - [SPECIES_MACHAMP_GMAX] = sMachampFormChangeTable, + [SPECIES_MACHAMP_GIGANTAMAX] = sMachampFormChangeTable, [SPECIES_SLOWBRO] = sSlowbroFormChangeTable, [SPECIES_SLOWBRO_MEGA] = sSlowbroFormChangeTable, [SPECIES_GENGAR] = sGengarFormChangeTable, [SPECIES_GENGAR_MEGA] = sGengarFormChangeTable, - [SPECIES_GENGAR_GMAX] = sGengarFormChangeTable, + [SPECIES_GENGAR_GIGANTAMAX] = sGengarFormChangeTable, [SPECIES_KINGLER] = sKinglerFormChangeTable, - [SPECIES_KINGLER_GMAX] = sKinglerFormChangeTable, + [SPECIES_KINGLER_GIGANTAMAX] = sKinglerFormChangeTable, [SPECIES_KANGASKHAN] = sKangaskhanFormChangeTable, [SPECIES_KANGASKHAN_MEGA] = sKangaskhanFormChangeTable, [SPECIES_PINSIR] = sPinsirFormChangeTable, @@ -38,13 +38,13 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_GYARADOS] = sGyaradosFormChangeTable, [SPECIES_GYARADOS_MEGA] = sGyaradosFormChangeTable, [SPECIES_LAPRAS] = sLaprasFormChangeTable, - [SPECIES_LAPRAS_GMAX] = sLaprasFormChangeTable, + [SPECIES_LAPRAS_GIGANTAMAX] = sLaprasFormChangeTable, [SPECIES_EEVEE] = sEeveeFormChangeTable, - [SPECIES_EEVEE_GMAX] = sEeveeFormChangeTable, + [SPECIES_EEVEE_GIGANTAMAX] = sEeveeFormChangeTable, [SPECIES_AERODACTYL] = sAerodactylFormChangeTable, [SPECIES_AERODACTYL_MEGA] = sAerodactylFormChangeTable, [SPECIES_SNORLAX] = sSnorlaxFormChangeTable, - [SPECIES_SNORLAX_GMAX] = sSnorlaxFormChangeTable, + [SPECIES_SNORLAX_GIGANTAMAX] = sSnorlaxFormChangeTable, [SPECIES_MEWTWO] = sMewtwoFormChangeTable, [SPECIES_MEWTWO_MEGA_X] = sMewtwoFormChangeTable, [SPECIES_MEWTWO_MEGA_Y] = sMewtwoFormChangeTable, @@ -159,7 +159,7 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianFormChangeTable, [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = sDarmanitanGalarianFormChangeTable, [SPECIES_GARBODOR] = sGarbodorFormChangeTable, - [SPECIES_GARBODOR_GMAX] = sGarbodorFormChangeTable, + [SPECIES_GARBODOR_GIGANTAMAX] = sGarbodorFormChangeTable, [SPECIES_TORNADUS] = sTornadusFormChangeTable, [SPECIES_TORNADUS_THERIAN] = sTornadusFormChangeTable, [SPECIES_THUNDURUS] = sThundurusFormChangeTable, @@ -235,58 +235,58 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_NECROZMA_DUSK_MANE] = sNecrozmaDuskManeFormChangeTable, [SPECIES_NECROZMA_DAWN_WINGS] = sNecrozmaDawnWingsFormChangeTable, [SPECIES_MELMETAL] = sMelmetalFormChangeTable, - [SPECIES_MELMETAL_GMAX] = sMelmetalFormChangeTable, + [SPECIES_MELMETAL_GIGANTAMAX] = sMelmetalFormChangeTable, #endif #if P_GEN_8_POKEMON == TRUE [SPECIES_RILLABOOM] = sRillaboomFormChangeTable, - [SPECIES_RILLABOOM_GMAX] = sRillaboomFormChangeTable, + [SPECIES_RILLABOOM_GIGANTAMAX] = sRillaboomFormChangeTable, [SPECIES_CINDERACE] = sCinderaceFormChangeTable, - [SPECIES_CINDERACE_GMAX] = sCinderaceFormChangeTable, + [SPECIES_CINDERACE_GIGANTAMAX] = sCinderaceFormChangeTable, [SPECIES_INTELEON] = sInteleonFormChangeTable, - [SPECIES_INTELEON_GMAX] = sInteleonFormChangeTable, + [SPECIES_INTELEON_GIGANTAMAX] = sInteleonFormChangeTable, [SPECIES_CORVIKNIGHT] = sCorviknightFormChangeTable, - [SPECIES_CORVIKNIGHT_GMAX] = sCorviknightFormChangeTable, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = sCorviknightFormChangeTable, [SPECIES_ORBEETLE] = sOrbeetleFormChangeTable, - [SPECIES_ORBEETLE_GMAX] = sOrbeetleFormChangeTable, + [SPECIES_ORBEETLE_GIGANTAMAX] = sOrbeetleFormChangeTable, [SPECIES_DREDNAW] = sDrednawFormChangeTable, - [SPECIES_DREDNAW_GMAX] = sDrednawFormChangeTable, + [SPECIES_DREDNAW_GIGANTAMAX] = sDrednawFormChangeTable, [SPECIES_COALOSSAL] = sCoalossalFormChangeTable, - [SPECIES_COALOSSAL_GMAX] = sCoalossalFormChangeTable, + [SPECIES_COALOSSAL_GIGANTAMAX] = sCoalossalFormChangeTable, [SPECIES_FLAPPLE] = sFlappleFormChangeTable, - [SPECIES_FLAPPLE_GMAX] = sFlappleFormChangeTable, + [SPECIES_FLAPPLE_GIGANTAMAX] = sFlappleFormChangeTable, [SPECIES_APPLETUN] = sAppletunFormChangeTable, - [SPECIES_APPLETUN_GMAX] = sAppletunFormChangeTable, + [SPECIES_APPLETUN_GIGANTAMAX] = sAppletunFormChangeTable, [SPECIES_SANDACONDA] = sSandacondaFormChangeTable, - [SPECIES_SANDACONDA_GMAX] = sSandacondaFormChangeTable, + [SPECIES_SANDACONDA_GIGANTAMAX] = sSandacondaFormChangeTable, [SPECIES_CRAMORANT] = sCramorantFormChangeTable, [SPECIES_CRAMORANT_GULPING] = sCramorantFormChangeTable, [SPECIES_CRAMORANT_GORGING] = sCramorantFormChangeTable, [SPECIES_TOXTRICITY] = sToxtricityFormChangeTable, - [SPECIES_TOXTRICITY_GMAX] = sToxtricityFormChangeTable, + [SPECIES_TOXTRICITY_GIGANTAMAX] = sToxtricityFormChangeTable, [SPECIES_CENTISKORCH] = sCentiskorchFormChangeTable, - [SPECIES_CENTISKORCH_GMAX] = sCentiskorchFormChangeTable, + [SPECIES_CENTISKORCH_GIGANTAMAX] = sCentiskorchFormChangeTable, [SPECIES_HATTERENE] = sHattereneFormChangeTable, - [SPECIES_HATTERENE_GMAX] = sHattereneFormChangeTable, + [SPECIES_HATTERENE_GIGANTAMAX] = sHattereneFormChangeTable, [SPECIES_GRIMMSNARL] = sGrimmsnarlFormChangeTable, - [SPECIES_GRIMMSNARL_GMAX] = sGrimmsnarlFormChangeTable, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = sGrimmsnarlFormChangeTable, [SPECIES_ALCREMIE] = sAlcremieFormChangeTable, - [SPECIES_ALCREMIE_GMAX] = sAlcremieFormChangeTable, + [SPECIES_ALCREMIE_GIGANTAMAX] = sAlcremieFormChangeTable, [SPECIES_EISCUE] = sEiscueFormChangeTable, [SPECIES_EISCUE_NOICE_FACE] = sEiscueFormChangeTable, [SPECIES_MORPEKO] = sMorpekoFormChangeTable, [SPECIES_MORPEKO_HANGRY] = sMorpekoFormChangeTable, [SPECIES_COPPERAJAH] = sCopperajahFormChangeTable, - [SPECIES_COPPERAJAH_GMAX] = sCopperajahFormChangeTable, + [SPECIES_COPPERAJAH_GIGANTAMAX] = sCopperajahFormChangeTable, [SPECIES_DURALUDON] = sDuraludonFormChangeTable, - [SPECIES_DURALUDON_GMAX] = sDuraludonFormChangeTable, + [SPECIES_DURALUDON_GIGANTAMAX] = sDuraludonFormChangeTable, [SPECIES_ZACIAN] = sZacianFormChangeTable, [SPECIES_ZACIAN_CROWNED_SWORD] = sZacianFormChangeTable, [SPECIES_ZAMAZENTA] = sZamazentaFormChangeTable, [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaFormChangeTable, [SPECIES_URSHIFU] = sUrshifuFormChangeTable, - [SPECIES_URSHIFU_GMAX] = sUrshifuFormChangeTable, + [SPECIES_URSHIFU_GIGANTAMAX] = sUrshifuFormChangeTable, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = sUrshifuRapidStrikeFormChangeTable, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = sUrshifuRapidStrikeFormChangeTable, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeFormChangeTable, [SPECIES_ENAMORUS] = sEnamorusFormChangeTable, [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormChangeTable, #endif diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index bacec5c4a1..62963d95f6 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -1,19 +1,19 @@ static const struct FormChange sVenusaurFormChangeTable[] = { {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_VENUSAUR_MEGA, ITEM_VENUSAURITE}, - {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_VENUSAUR_GMAX}, + {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_VENUSAUR_GIGANTAMAX}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sCharizardFormChangeTable[] = { {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_CHARIZARD_MEGA_X, ITEM_CHARIZARDITE_X}, {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_CHARIZARD_MEGA_Y, ITEM_CHARIZARDITE_Y}, - {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CHARIZARD_GMAX}, + {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CHARIZARD_GIGANTAMAX}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sBlastoiseFormChangeTable[] = { {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_BLASTOISE_MEGA, ITEM_BLASTOISINITE}, - {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_BLASTOISE_GMAX}, + {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_BLASTOISE_GIGANTAMAX}, {FORM_CHANGE_TERMINATOR}, }; @@ -39,7 +39,7 @@ static const struct FormChange sSlowbroFormChangeTable[] = { static const struct FormChange sGengarFormChangeTable[] = { {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_GENGAR_MEGA, ITEM_GENGARITE}, - {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GENGAR_GMAX}, + {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GENGAR_GIGANTAMAX}, {FORM_CHANGE_TERMINATOR}, }; @@ -608,10 +608,10 @@ static const struct FormChange sEnamorusFormChangeTable[] = { #endif // Gigantamax Forms -#define GIGANTAMAX_FORM(species) \ - { \ - {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_##species##_GMAX}, \ - {FORM_CHANGE_TERMINATOR}, \ +#define GIGANTAMAX_FORM(species) \ + { \ + {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_##species##_GIGANTAMAX},\ + {FORM_CHANGE_TERMINATOR}, \ }; static const struct FormChange sButterfreeFormChangeTable[] = GIGANTAMAX_FORM(BUTTERFREE) diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index ff92bae00e..b27fc1ae0e 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -594,38 +594,38 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = // Basculegion [SPECIES_BASCULEGION_FEMALE] = sBasculegionFormSpeciesIdTable, // Gigantamax Forms - [SPECIES_VENUSAUR_GMAX] = sVenusaurFormSpeciesIdTable, - [SPECIES_CHARIZARD_GMAX] = sCharizardFormSpeciesIdTable, - [SPECIES_BLASTOISE_GMAX] = sBlastoiseFormSpeciesIdTable, - [SPECIES_BUTTERFREE_GMAX] = sButterfreeFormSpeciesIdTable, - [SPECIES_PIKACHU_GMAX] = sPikachuFormSpeciesIdTable, - [SPECIES_MEOWTH_GMAX] = sMeowthFormSpeciesIdTable, - [SPECIES_MACHAMP_GMAX] = sMachampFormSpeciesIdTable, - [SPECIES_GENGAR_GMAX] = sGengarFormSpeciesIdTable, - [SPECIES_KINGLER_GMAX] = sKinglerFormSpeciesIdTable, - [SPECIES_LAPRAS_GMAX] = sLaprasFormSpeciesIdTable, - [SPECIES_EEVEE_GMAX] = sEeveeFormSpeciesIdTable, - [SPECIES_SNORLAX_GMAX] = sSnorlaxFormSpeciesIdTable, - [SPECIES_GARBODOR_GMAX] = sGarbodorFormSpeciesIdTable, - [SPECIES_MELMETAL_GMAX] = sMelmetalFormSpeciesIdTable, - [SPECIES_RILLABOOM_GMAX] = sRillaboomFormSpeciesIdTable, - [SPECIES_CINDERACE_GMAX] = sCinderaceFormSpeciesIdTable, - [SPECIES_INTELEON_GMAX] = sInteleonFormSpeciesIdTable, - [SPECIES_CORVIKNIGHT_GMAX] = sCorviknightFormSpeciesIdTable, - [SPECIES_ORBEETLE_GMAX] = sOrbeetleFormSpeciesIdTable, - [SPECIES_DREDNAW_GMAX] = sDrednawFormSpeciesIdTable, - [SPECIES_COALOSSAL_GMAX] = sCoalossalFormSpeciesIdTable, - [SPECIES_FLAPPLE_GMAX] = sFlappleFormSpeciesIdTable, - [SPECIES_APPLETUN_GMAX] = sAppletunFormSpeciesIdTable, - [SPECIES_SANDACONDA_GMAX] = sSandacondaFormSpeciesIdTable, - [SPECIES_TOXTRICITY_GMAX] = sToxtricityFormSpeciesIdTable, - [SPECIES_CENTISKORCH_GMAX] = sCentiskorchFormSpeciesIdTable, - [SPECIES_HATTERENE_GMAX] = sHattereneFormSpeciesIdTable, - [SPECIES_GRIMMSNARL_GMAX] = sGrimmsnarlFormSpeciesIdTable, - [SPECIES_ALCREMIE_GMAX] = sAlcremieFormSpeciesIdTable, - [SPECIES_COPPERAJAH_GMAX] = sCopperajahFormSpeciesIdTable, - [SPECIES_DURALUDON_GMAX] = sDuraludonFormSpeciesIdTable, - [SPECIES_URSHIFU_GMAX] = sUrshifuFormSpeciesIdTable, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = sUrshifuFormSpeciesIdTable, + [SPECIES_VENUSAUR_GIGANTAMAX] = sVenusaurFormSpeciesIdTable, + [SPECIES_CHARIZARD_GIGANTAMAX] = sCharizardFormSpeciesIdTable, + [SPECIES_BLASTOISE_GIGANTAMAX] = sBlastoiseFormSpeciesIdTable, + [SPECIES_BUTTERFREE_GIGANTAMAX] = sButterfreeFormSpeciesIdTable, + [SPECIES_PIKACHU_GIGANTAMAX] = sPikachuFormSpeciesIdTable, + [SPECIES_MEOWTH_GIGANTAMAX] = sMeowthFormSpeciesIdTable, + [SPECIES_MACHAMP_GIGANTAMAX] = sMachampFormSpeciesIdTable, + [SPECIES_GENGAR_GIGANTAMAX] = sGengarFormSpeciesIdTable, + [SPECIES_KINGLER_GIGANTAMAX] = sKinglerFormSpeciesIdTable, + [SPECIES_LAPRAS_GIGANTAMAX] = sLaprasFormSpeciesIdTable, + [SPECIES_EEVEE_GIGANTAMAX] = sEeveeFormSpeciesIdTable, + [SPECIES_SNORLAX_GIGANTAMAX] = sSnorlaxFormSpeciesIdTable, + [SPECIES_GARBODOR_GIGANTAMAX] = sGarbodorFormSpeciesIdTable, + [SPECIES_MELMETAL_GIGANTAMAX] = sMelmetalFormSpeciesIdTable, + [SPECIES_RILLABOOM_GIGANTAMAX] = sRillaboomFormSpeciesIdTable, + [SPECIES_CINDERACE_GIGANTAMAX] = sCinderaceFormSpeciesIdTable, + [SPECIES_INTELEON_GIGANTAMAX] = sInteleonFormSpeciesIdTable, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = sCorviknightFormSpeciesIdTable, + [SPECIES_ORBEETLE_GIGANTAMAX] = sOrbeetleFormSpeciesIdTable, + [SPECIES_DREDNAW_GIGANTAMAX] = sDrednawFormSpeciesIdTable, + [SPECIES_COALOSSAL_GIGANTAMAX] = sCoalossalFormSpeciesIdTable, + [SPECIES_FLAPPLE_GIGANTAMAX] = sFlappleFormSpeciesIdTable, + [SPECIES_APPLETUN_GIGANTAMAX] = sAppletunFormSpeciesIdTable, + [SPECIES_SANDACONDA_GIGANTAMAX] = sSandacondaFormSpeciesIdTable, + [SPECIES_TOXTRICITY_GIGANTAMAX] = sToxtricityFormSpeciesIdTable, + [SPECIES_CENTISKORCH_GIGANTAMAX] = sCentiskorchFormSpeciesIdTable, + [SPECIES_HATTERENE_GIGANTAMAX] = sHattereneFormSpeciesIdTable, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = sGrimmsnarlFormSpeciesIdTable, + [SPECIES_ALCREMIE_GIGANTAMAX] = sAlcremieFormSpeciesIdTable, + [SPECIES_COPPERAJAH_GIGANTAMAX] = sCopperajahFormSpeciesIdTable, + [SPECIES_DURALUDON_GIGANTAMAX] = sDuraludonFormSpeciesIdTable, + [SPECIES_URSHIFU_GIGANTAMAX] = sUrshifuFormSpeciesIdTable, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuFormSpeciesIdTable, #endif }; diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 565f4805d5..9e468b6661 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1,7 +1,7 @@ static const u16 sVenusaurFormSpeciesIdTable[] = { SPECIES_VENUSAUR, SPECIES_VENUSAUR_MEGA, - SPECIES_VENUSAUR_GMAX, + SPECIES_VENUSAUR_GIGANTAMAX, FORM_SPECIES_END, }; @@ -9,20 +9,20 @@ static const u16 sCharizardFormSpeciesIdTable[] = { SPECIES_CHARIZARD, SPECIES_CHARIZARD_MEGA_X, SPECIES_CHARIZARD_MEGA_Y, - SPECIES_CHARIZARD_GMAX, + SPECIES_CHARIZARD_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sBlastoiseFormSpeciesIdTable[] = { SPECIES_BLASTOISE, SPECIES_BLASTOISE_MEGA, - SPECIES_BLASTOISE_GMAX, + SPECIES_BLASTOISE_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sButterfreeFormSpeciesIdTable[] = { SPECIES_BUTTERFREE, - SPECIES_BUTTERFREE_GMAX, + SPECIES_BUTTERFREE_GIGANTAMAX, FORM_SPECIES_END, }; @@ -66,7 +66,7 @@ static const u16 sPikachuFormSpeciesIdTable[] = { SPECIES_PIKACHU_ALOLA_CAP, SPECIES_PIKACHU_PARTNER_CAP, SPECIES_PIKACHU_WORLD_CAP, - SPECIES_PIKACHU_GMAX, + SPECIES_PIKACHU_GIGANTAMAX, FORM_SPECIES_END, }; @@ -116,7 +116,7 @@ static const u16 sMeowthFormSpeciesIdTable[] = { SPECIES_MEOWTH, SPECIES_MEOWTH_ALOLAN, SPECIES_MEOWTH_GALARIAN, - SPECIES_MEOWTH_GMAX, + SPECIES_MEOWTH_GIGANTAMAX, FORM_SPECIES_END, }; @@ -146,7 +146,7 @@ static const u16 sArcanineFormSpeciesIdTable[] = { static const u16 sMachampFormSpeciesIdTable[] = { SPECIES_MACHAMP, - SPECIES_MACHAMP_GMAX, + SPECIES_MACHAMP_GIGANTAMAX, FORM_SPECIES_END, }; @@ -213,14 +213,14 @@ static const u16 sMukFormSpeciesIdTable[] = { static const u16 sKinglerFormSpeciesIdTable[] = { SPECIES_KINGLER, - SPECIES_KINGLER_GMAX, + SPECIES_KINGLER_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sGengarFormSpeciesIdTable[] = { SPECIES_GENGAR, SPECIES_GENGAR_MEGA, - SPECIES_GENGAR_GMAX, + SPECIES_GENGAR_GIGANTAMAX, FORM_SPECIES_END, }; @@ -280,13 +280,13 @@ static const u16 sGyaradosFormSpeciesIdTable[] = { static const u16 sLaprasFormSpeciesIdTable[] = { SPECIES_LAPRAS, - SPECIES_LAPRAS_GMAX, + SPECIES_LAPRAS_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sEeveeFormSpeciesIdTable[] = { SPECIES_EEVEE, - SPECIES_EEVEE_GMAX, + SPECIES_EEVEE_GIGANTAMAX, FORM_SPECIES_END, }; @@ -298,7 +298,7 @@ static const u16 sAerodactylFormSpeciesIdTable[] = { static const u16 sSnorlaxFormSpeciesIdTable[] = { SPECIES_SNORLAX, - SPECIES_SNORLAX_GMAX, + SPECIES_SNORLAX_GIGANTAMAX, FORM_SPECIES_END, }; @@ -771,7 +771,7 @@ static const u16 sZoroarkFormSpeciesIdTable[] = { static const u16 sGarbodorFormSpeciesIdTable[] = { SPECIES_GARBODOR, - SPECIES_GARBODOR_GMAX, + SPECIES_GARBODOR_GIGANTAMAX, FORM_SPECIES_END, }; @@ -1096,68 +1096,68 @@ static const u16 sMagearnaFormSpeciesIdTable[] = { #if P_GEN_8_POKEMON == TRUE static const u16 sMelmetalFormSpeciesIdTable[] = { SPECIES_MELMETAL, - SPECIES_MELMETAL_GMAX, + SPECIES_MELMETAL_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sRillaboomFormSpeciesIdTable[] = { SPECIES_RILLABOOM, - SPECIES_RILLABOOM_GMAX, + SPECIES_RILLABOOM_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sCinderaceFormSpeciesIdTable[] = { SPECIES_CINDERACE, - SPECIES_CINDERACE_GMAX, + SPECIES_CINDERACE_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sInteleonFormSpeciesIdTable[] = { SPECIES_INTELEON, - SPECIES_INTELEON_GMAX, + SPECIES_INTELEON_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sCorviknightFormSpeciesIdTable[] = { SPECIES_CORVIKNIGHT, - SPECIES_CORVIKNIGHT_GMAX, + SPECIES_CORVIKNIGHT_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sOrbeetleFormSpeciesIdTable[] = { SPECIES_ORBEETLE, - SPECIES_ORBEETLE_GMAX, + SPECIES_ORBEETLE_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sDrednawFormSpeciesIdTable[] = { SPECIES_DREDNAW, - SPECIES_DREDNAW_GMAX, + SPECIES_DREDNAW_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sCoalossalFormSpeciesIdTable[] = { SPECIES_COALOSSAL, - SPECIES_COALOSSAL_GMAX, + SPECIES_COALOSSAL_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sFlappleFormSpeciesIdTable[] = { SPECIES_FLAPPLE, - SPECIES_FLAPPLE_GMAX, + SPECIES_FLAPPLE_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sAppletunFormSpeciesIdTable[] = { SPECIES_APPLETUN, - SPECIES_APPLETUN_GMAX, + SPECIES_APPLETUN_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sSandacondaFormSpeciesIdTable[] = { SPECIES_SANDACONDA, - SPECIES_SANDACONDA_GMAX, + SPECIES_SANDACONDA_GIGANTAMAX, FORM_SPECIES_END, }; @@ -1171,19 +1171,19 @@ static const u16 sCramorantFormSpeciesIdTable[] = { static const u16 sToxtricityFormSpeciesIdTable[] = { SPECIES_TOXTRICITY, SPECIES_TOXTRICITY_LOW_KEY, - SPECIES_TOXTRICITY_GMAX, + SPECIES_TOXTRICITY_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sCentiskorchFormSpeciesIdTable[] = { SPECIES_CENTISKORCH, - SPECIES_CENTISKORCH_GMAX, + SPECIES_CENTISKORCH_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sHattereneFormSpeciesIdTable[] = { SPECIES_HATTERENE, - SPECIES_HATTERENE_GMAX, + SPECIES_HATTERENE_GIGANTAMAX, FORM_SPECIES_END, }; @@ -1201,7 +1201,7 @@ static const u16 sPolteageistFormSpeciesIdTable[] = { static const u16 sGrimmsnarlFormSpeciesIdTable[] = { SPECIES_GRIMMSNARL, - SPECIES_GRIMMSNARL_GMAX, + SPECIES_GRIMMSNARL_GIGANTAMAX, FORM_SPECIES_END, }; @@ -1238,13 +1238,13 @@ static const u16 sMorpekoFormSpeciesIdTable[] = { static const u16 sCopperajahFormSpeciesIdTable[] = { SPECIES_COPPERAJAH, - SPECIES_COPPERAJAH_GMAX, + SPECIES_COPPERAJAH_GIGANTAMAX, FORM_SPECIES_END, }; static const u16 sDuraludonFormSpeciesIdTable[] = { SPECIES_DURALUDON, - SPECIES_DURALUDON_GMAX, + SPECIES_DURALUDON_GIGANTAMAX, FORM_SPECIES_END, }; @@ -1269,8 +1269,8 @@ static const u16 sEternatusFormSpeciesIdTable[] = { static const u16 sUrshifuFormSpeciesIdTable[] = { SPECIES_URSHIFU, SPECIES_URSHIFU_RAPID_STRIKE_STYLE, - SPECIES_URSHIFU_GMAX, - SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX, + SPECIES_URSHIFU_GIGANTAMAX, + SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 4b1615c181..a99c39aa96 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -1337,38 +1337,38 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = // Basculegion [SPECIES_BASCULEGION_FEMALE] = sBasculegionLevelUpLearnset, // Gigantamax Forms - [SPECIES_VENUSAUR_GMAX] = sVenusaurLevelUpLearnset, - [SPECIES_CHARIZARD_GMAX] = sCharizardLevelUpLearnset, - [SPECIES_BLASTOISE_GMAX] = sBlastoiseLevelUpLearnset, - [SPECIES_BUTTERFREE_GMAX] = sButterfreeLevelUpLearnset, - [SPECIES_PIKACHU_GMAX] = sPikachuLevelUpLearnset, - [SPECIES_MEOWTH_GMAX] = sMeowthLevelUpLearnset, - [SPECIES_MACHAMP_GMAX] = sMachampLevelUpLearnset, - [SPECIES_GENGAR_GMAX] = sGengarLevelUpLearnset, - [SPECIES_KINGLER_GMAX] = sKinglerLevelUpLearnset, - [SPECIES_LAPRAS_GMAX] = sLaprasLevelUpLearnset, - [SPECIES_EEVEE_GMAX] = sEeveeLevelUpLearnset, - [SPECIES_SNORLAX_GMAX] = sSnorlaxLevelUpLearnset, - [SPECIES_GARBODOR_GMAX] = sGarbodorLevelUpLearnset, - [SPECIES_MELMETAL_GMAX] = sMelmetalLevelUpLearnset, - [SPECIES_RILLABOOM_GMAX] = sRillaboomLevelUpLearnset, - [SPECIES_CINDERACE_GMAX] = sCinderaceLevelUpLearnset, - [SPECIES_INTELEON_GMAX] = sInteleonLevelUpLearnset, - [SPECIES_CORVIKNIGHT_GMAX] = sCorviknightLevelUpLearnset, - [SPECIES_ORBEETLE_GMAX] = sOrbeetleLevelUpLearnset, - [SPECIES_DREDNAW_GMAX] = sDrednawLevelUpLearnset, - [SPECIES_COALOSSAL_GMAX] = sCoalossalLevelUpLearnset, - [SPECIES_FLAPPLE_GMAX] = sFlappleLevelUpLearnset, - [SPECIES_APPLETUN_GMAX] = sAppletunLevelUpLearnset, - [SPECIES_SANDACONDA_GMAX] = sSandacondaLevelUpLearnset, - [SPECIES_TOXTRICITY_GMAX] = sToxtricityLevelUpLearnset, - [SPECIES_CENTISKORCH_GMAX] = sCentiskorchLevelUpLearnset, - [SPECIES_HATTERENE_GMAX] = sHattereneLevelUpLearnset, - [SPECIES_GRIMMSNARL_GMAX] = sGrimmsnarlLevelUpLearnset, - [SPECIES_ALCREMIE_GMAX] = sAlcremieLevelUpLearnset, - [SPECIES_COPPERAJAH_GMAX] = sCopperajahLevelUpLearnset, - [SPECIES_DURALUDON_GMAX] = sDuraludonLevelUpLearnset, - [SPECIES_URSHIFU_GMAX] = sUrshifuLevelUpLearnset, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = sUrshifuRapidStrikeStyleLevelUpLearnset, + [SPECIES_VENUSAUR_GIGANTAMAX] = sVenusaurLevelUpLearnset, + [SPECIES_CHARIZARD_GIGANTAMAX] = sCharizardLevelUpLearnset, + [SPECIES_BLASTOISE_GIGANTAMAX] = sBlastoiseLevelUpLearnset, + [SPECIES_BUTTERFREE_GIGANTAMAX] = sButterfreeLevelUpLearnset, + [SPECIES_PIKACHU_GIGANTAMAX] = sPikachuLevelUpLearnset, + [SPECIES_MEOWTH_GIGANTAMAX] = sMeowthLevelUpLearnset, + [SPECIES_MACHAMP_GIGANTAMAX] = sMachampLevelUpLearnset, + [SPECIES_GENGAR_GIGANTAMAX] = sGengarLevelUpLearnset, + [SPECIES_KINGLER_GIGANTAMAX] = sKinglerLevelUpLearnset, + [SPECIES_LAPRAS_GIGANTAMAX] = sLaprasLevelUpLearnset, + [SPECIES_EEVEE_GIGANTAMAX] = sEeveeLevelUpLearnset, + [SPECIES_SNORLAX_GIGANTAMAX] = sSnorlaxLevelUpLearnset, + [SPECIES_GARBODOR_GIGANTAMAX] = sGarbodorLevelUpLearnset, + [SPECIES_MELMETAL_GIGANTAMAX] = sMelmetalLevelUpLearnset, + [SPECIES_RILLABOOM_GIGANTAMAX] = sRillaboomLevelUpLearnset, + [SPECIES_CINDERACE_GIGANTAMAX] = sCinderaceLevelUpLearnset, + [SPECIES_INTELEON_GIGANTAMAX] = sInteleonLevelUpLearnset, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = sCorviknightLevelUpLearnset, + [SPECIES_ORBEETLE_GIGANTAMAX] = sOrbeetleLevelUpLearnset, + [SPECIES_DREDNAW_GIGANTAMAX] = sDrednawLevelUpLearnset, + [SPECIES_COALOSSAL_GIGANTAMAX] = sCoalossalLevelUpLearnset, + [SPECIES_FLAPPLE_GIGANTAMAX] = sFlappleLevelUpLearnset, + [SPECIES_APPLETUN_GIGANTAMAX] = sAppletunLevelUpLearnset, + [SPECIES_SANDACONDA_GIGANTAMAX] = sSandacondaLevelUpLearnset, + [SPECIES_TOXTRICITY_GIGANTAMAX] = sToxtricityLevelUpLearnset, + [SPECIES_CENTISKORCH_GIGANTAMAX] = sCentiskorchLevelUpLearnset, + [SPECIES_HATTERENE_GIGANTAMAX] = sHattereneLevelUpLearnset, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = sGrimmsnarlLevelUpLearnset, + [SPECIES_ALCREMIE_GIGANTAMAX] = sAlcremieLevelUpLearnset, + [SPECIES_COPPERAJAH_GIGANTAMAX] = sCopperajahLevelUpLearnset, + [SPECIES_DURALUDON_GIGANTAMAX] = sDuraludonLevelUpLearnset, + [SPECIES_URSHIFU_GIGANTAMAX] = sUrshifuLevelUpLearnset, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleLevelUpLearnset, #endif }; diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 4dc49fda85..25f491cf28 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -24836,167 +24836,167 @@ const struct SpeciesInfo gSpeciesInfo[] = }, // Gigantamax Forms - [SPECIES_VENUSAUR_GMAX] = + [SPECIES_VENUSAUR_GIGANTAMAX] = { VENUSAUR_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_CHARIZARD_GMAX] = + [SPECIES_CHARIZARD_GIGANTAMAX] = { CHARIZARD_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_BLASTOISE_GMAX] = + [SPECIES_BLASTOISE_GIGANTAMAX] = { BLASTOISE_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_BUTTERFREE_GMAX] = + [SPECIES_BUTTERFREE_GIGANTAMAX] = { BUTTERFREE_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_PIKACHU_GMAX] = + [SPECIES_PIKACHU_GIGANTAMAX] = { PIKACHU_MISC_INFO(PERCENT_FEMALE(50), FLIP), .gigantamax = TRUE, }, - [SPECIES_MEOWTH_GMAX] = + [SPECIES_MEOWTH_GIGANTAMAX] = { MEOWTH_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_MACHAMP_GMAX] = + [SPECIES_MACHAMP_GIGANTAMAX] = { MACHAMP_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_GENGAR_GMAX] = + [SPECIES_GENGAR_GIGANTAMAX] = { GENGAR_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_KINGLER_GMAX] = + [SPECIES_KINGLER_GIGANTAMAX] = { KINGLER_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_LAPRAS_GMAX] = + [SPECIES_LAPRAS_GIGANTAMAX] = { LAPRAS_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_EEVEE_GMAX] = + [SPECIES_EEVEE_GIGANTAMAX] = { EEVEE_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_SNORLAX_GMAX] = + [SPECIES_SNORLAX_GIGANTAMAX] = { SNORLAX_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_GARBODOR_GMAX] = + [SPECIES_GARBODOR_GIGANTAMAX] = { GARBODOR_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_MELMETAL_GMAX] = + [SPECIES_MELMETAL_GIGANTAMAX] = { MELMETAL_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_RILLABOOM_GMAX] = + [SPECIES_RILLABOOM_GIGANTAMAX] = { RILLABOOM_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_CINDERACE_GMAX] = + [SPECIES_CINDERACE_GIGANTAMAX] = { CINDERACE_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_INTELEON_GMAX] = + [SPECIES_INTELEON_GIGANTAMAX] = { INTELEON_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_CORVIKNIGHT_GMAX] = + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = { CORVIKNIGHT_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_ORBEETLE_GMAX] = + [SPECIES_ORBEETLE_GIGANTAMAX] = { ORBEETLE_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_DREDNAW_GMAX] = + [SPECIES_DREDNAW_GIGANTAMAX] = { DREDNAW_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_COALOSSAL_GMAX] = + [SPECIES_COALOSSAL_GIGANTAMAX] = { COALOSSAL_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_FLAPPLE_GMAX] = + [SPECIES_FLAPPLE_GIGANTAMAX] = { FLAPPLE_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_APPLETUN_GMAX] = + [SPECIES_APPLETUN_GIGANTAMAX] = { APPLETUN_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_SANDACONDA_GMAX] = + [SPECIES_SANDACONDA_GIGANTAMAX] = { SANDACONDA_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_TOXTRICITY_GMAX] = + [SPECIES_TOXTRICITY_GIGANTAMAX] = { TOXTRICITY_MISC_INFO(ABILITY_PLUS), .gigantamax = TRUE, }, - [SPECIES_CENTISKORCH_GMAX] = + [SPECIES_CENTISKORCH_GIGANTAMAX] = { CENTISKORCH_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_HATTERENE_GMAX] = + [SPECIES_HATTERENE_GIGANTAMAX] = { HATTERENE_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_GRIMMSNARL_GMAX] = + [SPECIES_GRIMMSNARL_GIGANTAMAX] = { GRIMMSNARL_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_ALCREMIE_GMAX] = + [SPECIES_ALCREMIE_GIGANTAMAX] = { ALCREMIE_MISC_INFO(BODY_COLOR_PINK), .gigantamax = TRUE, }, - [SPECIES_COPPERAJAH_GMAX] = + [SPECIES_COPPERAJAH_GIGANTAMAX] = { COPPERAJAH_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_DURALUDON_GMAX] = + [SPECIES_DURALUDON_GIGANTAMAX] = { DURALUDON_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_URSHIFU_GMAX] = + [SPECIES_URSHIFU_GIGANTAMAX] = { URSHIFU_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { URSHIFU_RAPID_STRIKE_STYLE_MISC_INFO, .gigantamax = TRUE, diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index af55f21bf5..b4505e9219 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -1337,38 +1337,38 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = // Basculegion [SPECIES_BASCULEGION_FEMALE] = sBasculegionTeachableLearnset, // Gigantamax Forms - [SPECIES_VENUSAUR_GMAX] = sVenusaurTeachableLearnset, - [SPECIES_CHARIZARD_GMAX] = sCharizardTeachableLearnset, - [SPECIES_BLASTOISE_GMAX] = sBlastoiseTeachableLearnset, - [SPECIES_BUTTERFREE_GMAX] = sButterfreeTeachableLearnset, - [SPECIES_PIKACHU_GMAX] = sPikachuTeachableLearnset, - [SPECIES_MEOWTH_GMAX] = sMeowthTeachableLearnset, - [SPECIES_MACHAMP_GMAX] = sMachampTeachableLearnset, - [SPECIES_GENGAR_GMAX] = sGengarTeachableLearnset, - [SPECIES_KINGLER_GMAX] = sKinglerTeachableLearnset, - [SPECIES_LAPRAS_GMAX] = sLaprasTeachableLearnset, - [SPECIES_EEVEE_GMAX] = sEeveeTeachableLearnset, - [SPECIES_SNORLAX_GMAX] = sSnorlaxTeachableLearnset, - [SPECIES_GARBODOR_GMAX] = sGarbodorTeachableLearnset, - [SPECIES_MELMETAL_GMAX] = sMelmetalTeachableLearnset, - [SPECIES_RILLABOOM_GMAX] = sRillaboomTeachableLearnset, - [SPECIES_CINDERACE_GMAX] = sCinderaceTeachableLearnset, - [SPECIES_INTELEON_GMAX] = sInteleonTeachableLearnset, - [SPECIES_CORVIKNIGHT_GMAX] = sCorviknightTeachableLearnset, - [SPECIES_ORBEETLE_GMAX] = sOrbeetleTeachableLearnset, - [SPECIES_DREDNAW_GMAX] = sDrednawTeachableLearnset, - [SPECIES_COALOSSAL_GMAX] = sCoalossalTeachableLearnset, - [SPECIES_FLAPPLE_GMAX] = sFlappleTeachableLearnset, - [SPECIES_APPLETUN_GMAX] = sAppletunTeachableLearnset, - [SPECIES_SANDACONDA_GMAX] = sSandacondaTeachableLearnset, - [SPECIES_TOXTRICITY_GMAX] = sToxtricityTeachableLearnset, - [SPECIES_CENTISKORCH_GMAX] = sCentiskorchTeachableLearnset, - [SPECIES_HATTERENE_GMAX] = sHattereneTeachableLearnset, - [SPECIES_GRIMMSNARL_GMAX] = sGrimmsnarlTeachableLearnset, - [SPECIES_ALCREMIE_GMAX] = sAlcremieTeachableLearnset, - [SPECIES_COPPERAJAH_GMAX] = sCopperajahTeachableLearnset, - [SPECIES_DURALUDON_GMAX] = sDuraludonTeachableLearnset, - [SPECIES_URSHIFU_GMAX] = sUrshifuTeachableLearnset, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = sUrshifuRapidStrikeStyleTeachableLearnset, + [SPECIES_VENUSAUR_GIGANTAMAX] = sVenusaurTeachableLearnset, + [SPECIES_CHARIZARD_GIGANTAMAX] = sCharizardTeachableLearnset, + [SPECIES_BLASTOISE_GIGANTAMAX] = sBlastoiseTeachableLearnset, + [SPECIES_BUTTERFREE_GIGANTAMAX] = sButterfreeTeachableLearnset, + [SPECIES_PIKACHU_GIGANTAMAX] = sPikachuTeachableLearnset, + [SPECIES_MEOWTH_GIGANTAMAX] = sMeowthTeachableLearnset, + [SPECIES_MACHAMP_GIGANTAMAX] = sMachampTeachableLearnset, + [SPECIES_GENGAR_GIGANTAMAX] = sGengarTeachableLearnset, + [SPECIES_KINGLER_GIGANTAMAX] = sKinglerTeachableLearnset, + [SPECIES_LAPRAS_GIGANTAMAX] = sLaprasTeachableLearnset, + [SPECIES_EEVEE_GIGANTAMAX] = sEeveeTeachableLearnset, + [SPECIES_SNORLAX_GIGANTAMAX] = sSnorlaxTeachableLearnset, + [SPECIES_GARBODOR_GIGANTAMAX] = sGarbodorTeachableLearnset, + [SPECIES_MELMETAL_GIGANTAMAX] = sMelmetalTeachableLearnset, + [SPECIES_RILLABOOM_GIGANTAMAX] = sRillaboomTeachableLearnset, + [SPECIES_CINDERACE_GIGANTAMAX] = sCinderaceTeachableLearnset, + [SPECIES_INTELEON_GIGANTAMAX] = sInteleonTeachableLearnset, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = sCorviknightTeachableLearnset, + [SPECIES_ORBEETLE_GIGANTAMAX] = sOrbeetleTeachableLearnset, + [SPECIES_DREDNAW_GIGANTAMAX] = sDrednawTeachableLearnset, + [SPECIES_COALOSSAL_GIGANTAMAX] = sCoalossalTeachableLearnset, + [SPECIES_FLAPPLE_GIGANTAMAX] = sFlappleTeachableLearnset, + [SPECIES_APPLETUN_GIGANTAMAX] = sAppletunTeachableLearnset, + [SPECIES_SANDACONDA_GIGANTAMAX] = sSandacondaTeachableLearnset, + [SPECIES_TOXTRICITY_GIGANTAMAX] = sToxtricityTeachableLearnset, + [SPECIES_CENTISKORCH_GIGANTAMAX] = sCentiskorchTeachableLearnset, + [SPECIES_HATTERENE_GIGANTAMAX] = sHattereneTeachableLearnset, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = sGrimmsnarlTeachableLearnset, + [SPECIES_ALCREMIE_GIGANTAMAX] = sAlcremieTeachableLearnset, + [SPECIES_COPPERAJAH_GIGANTAMAX] = sCopperajahTeachableLearnset, + [SPECIES_DURALUDON_GIGANTAMAX] = sDuraludonTeachableLearnset, + [SPECIES_URSHIFU_GIGANTAMAX] = sUrshifuTeachableLearnset, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleTeachableLearnset, #endif }; diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index dd53a65a6f..6cbaa6c493 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1359,39 +1359,39 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = // Basculegion [SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, // Gigantamax Forms - [SPECIES_VENUSAUR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, - [SPECIES_CHARIZARD_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_BLASTOISE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_BUTTERFREE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_PIKACHU_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MEOWTH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_MACHAMP_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_GENGAR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_KINGLER_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_LAPRAS_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_EEVEE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_SNORLAX_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_GARBODOR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_MELMETAL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, - [SPECIES_RILLABOOM_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_CINDERACE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_INTELEON_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_CORVIKNIGHT_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_ORBEETLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_DREDNAW_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, - [SPECIES_COALOSSAL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_FLAPPLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_APPLETUN_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_SANDACONDA_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_TOXTRICITY_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CENTISKORCH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_HATTERENE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_GRIMMSNARL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_ALCREMIE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_COPPERAJAH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_DURALUDON_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_URSHIFU_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_VENUSAUR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_CHARIZARD_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_BLASTOISE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_BUTTERFREE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_PIKACHU_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_MEOWTH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_MACHAMP_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_GENGAR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_KINGLER_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_LAPRAS_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_EEVEE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_SNORLAX_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_GARBODOR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_MELMETAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, + [SPECIES_RILLABOOM_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_CINDERACE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_INTELEON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_ORBEETLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_DREDNAW_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, + [SPECIES_COALOSSAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_FLAPPLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_APPLETUN_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_SANDACONDA_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_TOXTRICITY_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CENTISKORCH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_HATTERENE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_ALCREMIE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_COPPERAJAH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_DURALUDON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, #endif [SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 }, }; diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 9fe8add43f..06316431cc 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1336,39 +1336,39 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(BASCULEGION_FEMALE, gMonBackPic_BasculegionFemale), // Gigantamax Forms - SPECIES_SPRITE(VENUSAUR_GMAX, gMonBackPic_VenusaurGmax), - SPECIES_SPRITE(CHARIZARD_GMAX, gMonBackPic_CharizardGmax), - SPECIES_SPRITE(BLASTOISE_GMAX, gMonBackPic_BlastoiseGmax), - SPECIES_SPRITE(BUTTERFREE_GMAX, gMonBackPic_ButterfreeGmax), - SPECIES_SPRITE(PIKACHU_GMAX, gMonBackPic_PikachuGmax), - SPECIES_SPRITE(MEOWTH_GMAX, gMonBackPic_MeowthGmax), - SPECIES_SPRITE(MACHAMP_GMAX, gMonBackPic_MachampGmax), - SPECIES_SPRITE(GENGAR_GMAX, gMonBackPic_GengarGmax), - SPECIES_SPRITE(KINGLER_GMAX, gMonBackPic_KinglerGmax), - SPECIES_SPRITE(LAPRAS_GMAX, gMonBackPic_LaprasGmax), - SPECIES_SPRITE(EEVEE_GMAX, gMonBackPic_EeveeGmax), - SPECIES_SPRITE(SNORLAX_GMAX, gMonBackPic_SnorlaxGmax), - SPECIES_SPRITE(GARBODOR_GMAX, gMonBackPic_GarbodorGmax), - SPECIES_SPRITE(MELMETAL_GMAX, gMonBackPic_MelmetalGmax), - SPECIES_SPRITE(RILLABOOM_GMAX, gMonBackPic_RillaboomGmax), - SPECIES_SPRITE(CINDERACE_GMAX, gMonBackPic_CinderaceGmax), - SPECIES_SPRITE(INTELEON_GMAX, gMonBackPic_InteleonGmax), - SPECIES_SPRITE(CORVIKNIGHT_GMAX, gMonBackPic_CorviknightGmax), - SPECIES_SPRITE(ORBEETLE_GMAX, gMonBackPic_OrbeetleGmax), - SPECIES_SPRITE(DREDNAW_GMAX, gMonBackPic_DrednawGmax), - SPECIES_SPRITE(COALOSSAL_GMAX, gMonBackPic_CoalossalGmax), - SPECIES_SPRITE(FLAPPLE_GMAX, gMonBackPic_FlappleGmax), - SPECIES_SPRITE(APPLETUN_GMAX, gMonBackPic_AppletunGmax), - SPECIES_SPRITE(SANDACONDA_GMAX, gMonBackPic_SandacondaGmax), - SPECIES_SPRITE(TOXTRICITY_GMAX, gMonBackPic_ToxtricityGmax), - SPECIES_SPRITE(CENTISKORCH_GMAX, gMonBackPic_CentiskorchGmax), - SPECIES_SPRITE(HATTERENE_GMAX, gMonBackPic_HattereneGmax), - SPECIES_SPRITE(GRIMMSNARL_GMAX, gMonBackPic_GrimmsnarlGmax), - SPECIES_SPRITE(ALCREMIE_GMAX, gMonBackPic_AlcremieGmax), - SPECIES_SPRITE(COPPERAJAH_GMAX, gMonBackPic_CopperajahGmax), - SPECIES_SPRITE(DURALUDON_GMAX, gMonBackPic_DuraludonGmax), - SPECIES_SPRITE(URSHIFU_GMAX, gMonBackPic_UrshifuGmax), - SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE_GMAX, gMonBackPic_UrshifuRapidStrikeGmax), + SPECIES_SPRITE(VENUSAUR_GIGANTAMAX, gMonBackPic_VenusaurGigantamax), + SPECIES_SPRITE(CHARIZARD_GIGANTAMAX, gMonBackPic_CharizardGigantamax), + SPECIES_SPRITE(BLASTOISE_GIGANTAMAX, gMonBackPic_BlastoiseGigantamax), + SPECIES_SPRITE(BUTTERFREE_GIGANTAMAX, gMonBackPic_ButterfreeGigantamax), + SPECIES_SPRITE(PIKACHU_GIGANTAMAX, gMonBackPic_PikachuGigantamax), + SPECIES_SPRITE(MEOWTH_GIGANTAMAX, gMonBackPic_MeowthGigantamax), + SPECIES_SPRITE(MACHAMP_GIGANTAMAX, gMonBackPic_MachampGigantamax), + SPECIES_SPRITE(GENGAR_GIGANTAMAX, gMonBackPic_GengarGigantamax), + SPECIES_SPRITE(KINGLER_GIGANTAMAX, gMonBackPic_KinglerGigantamax), + SPECIES_SPRITE(LAPRAS_GIGANTAMAX, gMonBackPic_LaprasGigantamax), + SPECIES_SPRITE(EEVEE_GIGANTAMAX, gMonBackPic_EeveeGigantamax), + SPECIES_SPRITE(SNORLAX_GIGANTAMAX, gMonBackPic_SnorlaxGigantamax), + SPECIES_SPRITE(GARBODOR_GIGANTAMAX, gMonBackPic_GarbodorGigantamax), + SPECIES_SPRITE(MELMETAL_GIGANTAMAX, gMonBackPic_MelmetalGigantamax), + SPECIES_SPRITE(RILLABOOM_GIGANTAMAX, gMonBackPic_RillaboomGigantamax), + SPECIES_SPRITE(CINDERACE_GIGANTAMAX, gMonBackPic_CinderaceGigantamax), + SPECIES_SPRITE(INTELEON_GIGANTAMAX, gMonBackPic_InteleonGigantamax), + SPECIES_SPRITE(CORVIKNIGHT_GIGANTAMAX, gMonBackPic_CorviknightGigantamax), + SPECIES_SPRITE(ORBEETLE_GIGANTAMAX, gMonBackPic_OrbeetleGigantamax), + SPECIES_SPRITE(DREDNAW_GIGANTAMAX, gMonBackPic_DrednawGigantamax), + SPECIES_SPRITE(COALOSSAL_GIGANTAMAX, gMonBackPic_CoalossalGigantamax), + SPECIES_SPRITE(FLAPPLE_GIGANTAMAX, gMonBackPic_FlappleGigantamax), + SPECIES_SPRITE(APPLETUN_GIGANTAMAX, gMonBackPic_AppletunGigantamax), + SPECIES_SPRITE(SANDACONDA_GIGANTAMAX, gMonBackPic_SandacondaGigantamax), + SPECIES_SPRITE(TOXTRICITY_GIGANTAMAX, gMonBackPic_ToxtricityGigantamax), + SPECIES_SPRITE(CENTISKORCH_GIGANTAMAX, gMonBackPic_CentiskorchGigantamax), + SPECIES_SPRITE(HATTERENE_GIGANTAMAX, gMonBackPic_HattereneGigantamax), + SPECIES_SPRITE(GRIMMSNARL_GIGANTAMAX, gMonBackPic_GrimmsnarlGigantamax), + SPECIES_SPRITE(ALCREMIE_GIGANTAMAX, gMonBackPic_AlcremieGigantamax), + SPECIES_SPRITE(COPPERAJAH_GIGANTAMAX, gMonBackPic_CopperajahGigantamax), + SPECIES_SPRITE(DURALUDON_GIGANTAMAX, gMonBackPic_DuraludonGigantamax), + SPECIES_SPRITE(URSHIFU_GIGANTAMAX, gMonBackPic_UrshifuGigantamax), + SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, gMonBackPic_UrshifuRapidStrikeGigantamax), #endif SPECIES_SPRITE(EGG, gMonFrontPic_Egg), }; diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 65e385eee0..436e7e1dd7 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -268,5 +268,5 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_SINISTEA_ANTIQUE] = 10, [SPECIES_POLTEAGEIST_ANTIQUE] = 12, [SPECIES_ETERNATUS_ETERNAMAX] = 13, - [SPECIES_BUTTERFREE_GMAX] = 10, + [SPECIES_BUTTERFREE_GIGANTAMAX] = 10, }; diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 02af47f774..562415d940 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -10154,202 +10154,202 @@ static const union AnimCmd sAnim_DecidueyeHisuian_1[] = }; #endif -static const union AnimCmd sAnim_VENUSAUR_GMAX_1[] = +static const union AnimCmd sAnim_VENUSAUR_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_CHARIZARD_GMAX_1[] = +static const union AnimCmd sAnim_CHARIZARD_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_BLASTOISE_GMAX_1[] = +static const union AnimCmd sAnim_BLASTOISE_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_BUTTERFREE_GMAX_1[] = +static const union AnimCmd sAnim_BUTTERFREE_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_PIKACHU_GMAX_1[] = +static const union AnimCmd sAnim_PIKACHU_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEOWTH_GMAX_1[] = +static const union AnimCmd sAnim_MEOWTH_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MACHAMP_GMAX_1[] = +static const union AnimCmd sAnim_MACHAMP_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_GENGAR_GMAX_1[] = +static const union AnimCmd sAnim_GENGAR_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_KINGLER_GMAX_1[] = +static const union AnimCmd sAnim_KINGLER_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_LAPRAS_GMAX_1[] = +static const union AnimCmd sAnim_LAPRAS_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_EEVEE_GMAX_1[] = +static const union AnimCmd sAnim_EEVEE_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_SNORLAX_GMAX_1[] = +static const union AnimCmd sAnim_SNORLAX_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; #if P_GEN_5_POKEMON == TRUE -static const union AnimCmd sAnim_GARBODOR_GMAX_1[] = +static const union AnimCmd sAnim_GARBODOR_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; #endif #if P_GEN_7_POKEMON == TRUE -static const union AnimCmd sAnim_MELMETAL_GMAX_1[] = +static const union AnimCmd sAnim_MELMETAL_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; #endif #if P_GEN_8_POKEMON == TRUE -static const union AnimCmd sAnim_RILLABOOM_GMAX_1[] = +static const union AnimCmd sAnim_RILLABOOM_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_CINDERACE_GMAX_1[] = +static const union AnimCmd sAnim_CINDERACE_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_INTELEON_GMAX_1[] = +static const union AnimCmd sAnim_INTELEON_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_CORVIKNIGHT_GMAX_1[] = +static const union AnimCmd sAnim_CORVIKNIGHT_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ORBEETLE_GMAX_1[] = +static const union AnimCmd sAnim_ORBEETLE_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_DREDNAW_GMAX_1[] = +static const union AnimCmd sAnim_DREDNAW_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_COALOSSAL_GMAX_1[] = +static const union AnimCmd sAnim_COALOSSAL_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_FLAPPLE_GMAX_1[] = +static const union AnimCmd sAnim_FLAPPLE_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_APPLETUN_GMAX_1[] = +static const union AnimCmd sAnim_APPLETUN_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_SANDACONDA_GMAX_1[] = +static const union AnimCmd sAnim_SANDACONDA_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_TOXTRICITY_GMAX_1[] = +static const union AnimCmd sAnim_TOXTRICITY_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_CENTISKORCH_GMAX_1[] = +static const union AnimCmd sAnim_CENTISKORCH_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_HATTERENE_GMAX_1[] = +static const union AnimCmd sAnim_HATTERENE_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_GRIMMSNARL_GMAX_1[] = +static const union AnimCmd sAnim_GRIMMSNARL_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALCREMIE_GMAX_1[] = +static const union AnimCmd sAnim_ALCREMIE_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_COPPERAJAH_GMAX_1[] = +static const union AnimCmd sAnim_COPPERAJAH_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_DURALUDON_GMAX_1[] = +static const union AnimCmd sAnim_DURALUDON_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_URSHIFU_GMAX_1[] = +static const union AnimCmd sAnim_URSHIFU_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_URSHIFU_RAPID_STRIKE_STYLE_GMAX_1[] = +static const union AnimCmd sAnim_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -11849,44 +11849,44 @@ SINGLE_ANIMATION(LycanrocDusk); SINGLE_ANIMATION(EnamorusTherian); #endif // Gigantamax Forms -SINGLE_ANIMATION(VENUSAUR_GMAX); -SINGLE_ANIMATION(CHARIZARD_GMAX); -SINGLE_ANIMATION(BLASTOISE_GMAX); -SINGLE_ANIMATION(BUTTERFREE_GMAX); -SINGLE_ANIMATION(PIKACHU_GMAX); -SINGLE_ANIMATION(MEOWTH_GMAX); -SINGLE_ANIMATION(MACHAMP_GMAX); -SINGLE_ANIMATION(GENGAR_GMAX); -SINGLE_ANIMATION(KINGLER_GMAX); -SINGLE_ANIMATION(LAPRAS_GMAX); -SINGLE_ANIMATION(EEVEE_GMAX); -SINGLE_ANIMATION(SNORLAX_GMAX); +SINGLE_ANIMATION(VENUSAUR_GIGANTAMAX); +SINGLE_ANIMATION(CHARIZARD_GIGANTAMAX); +SINGLE_ANIMATION(BLASTOISE_GIGANTAMAX); +SINGLE_ANIMATION(BUTTERFREE_GIGANTAMAX); +SINGLE_ANIMATION(PIKACHU_GIGANTAMAX); +SINGLE_ANIMATION(MEOWTH_GIGANTAMAX); +SINGLE_ANIMATION(MACHAMP_GIGANTAMAX); +SINGLE_ANIMATION(GENGAR_GIGANTAMAX); +SINGLE_ANIMATION(KINGLER_GIGANTAMAX); +SINGLE_ANIMATION(LAPRAS_GIGANTAMAX); +SINGLE_ANIMATION(EEVEE_GIGANTAMAX); +SINGLE_ANIMATION(SNORLAX_GIGANTAMAX); #if P_GEN_5_POKEMON == TRUE -SINGLE_ANIMATION(GARBODOR_GMAX); +SINGLE_ANIMATION(GARBODOR_GIGANTAMAX); #endif #if P_GEN_7_POKEMON == TRUE -SINGLE_ANIMATION(MELMETAL_GMAX); +SINGLE_ANIMATION(MELMETAL_GIGANTAMAX); #endif #if P_GEN_8_POKEMON == TRUE -SINGLE_ANIMATION(RILLABOOM_GMAX); -SINGLE_ANIMATION(CINDERACE_GMAX); -SINGLE_ANIMATION(INTELEON_GMAX); -SINGLE_ANIMATION(CORVIKNIGHT_GMAX); -SINGLE_ANIMATION(ORBEETLE_GMAX); -SINGLE_ANIMATION(DREDNAW_GMAX); -SINGLE_ANIMATION(COALOSSAL_GMAX); -SINGLE_ANIMATION(FLAPPLE_GMAX); -SINGLE_ANIMATION(APPLETUN_GMAX); -SINGLE_ANIMATION(SANDACONDA_GMAX); -SINGLE_ANIMATION(TOXTRICITY_GMAX); -SINGLE_ANIMATION(CENTISKORCH_GMAX); -SINGLE_ANIMATION(HATTERENE_GMAX); -SINGLE_ANIMATION(GRIMMSNARL_GMAX); -SINGLE_ANIMATION(ALCREMIE_GMAX); -SINGLE_ANIMATION(COPPERAJAH_GMAX); -SINGLE_ANIMATION(DURALUDON_GMAX); -SINGLE_ANIMATION(URSHIFU_GMAX); -SINGLE_ANIMATION(URSHIFU_RAPID_STRIKE_STYLE_GMAX); +SINGLE_ANIMATION(RILLABOOM_GIGANTAMAX); +SINGLE_ANIMATION(CINDERACE_GIGANTAMAX); +SINGLE_ANIMATION(INTELEON_GIGANTAMAX); +SINGLE_ANIMATION(CORVIKNIGHT_GIGANTAMAX); +SINGLE_ANIMATION(ORBEETLE_GIGANTAMAX); +SINGLE_ANIMATION(DREDNAW_GIGANTAMAX); +SINGLE_ANIMATION(COALOSSAL_GIGANTAMAX); +SINGLE_ANIMATION(FLAPPLE_GIGANTAMAX); +SINGLE_ANIMATION(APPLETUN_GIGANTAMAX); +SINGLE_ANIMATION(SANDACONDA_GIGANTAMAX); +SINGLE_ANIMATION(TOXTRICITY_GIGANTAMAX); +SINGLE_ANIMATION(CENTISKORCH_GIGANTAMAX); +SINGLE_ANIMATION(HATTERENE_GIGANTAMAX); +SINGLE_ANIMATION(GRIMMSNARL_GIGANTAMAX); +SINGLE_ANIMATION(ALCREMIE_GIGANTAMAX); +SINGLE_ANIMATION(COPPERAJAH_GIGANTAMAX); +SINGLE_ANIMATION(DURALUDON_GIGANTAMAX); +SINGLE_ANIMATION(URSHIFU_GIGANTAMAX); +SINGLE_ANIMATION(URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX); #endif const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = @@ -13160,44 +13160,44 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_ENAMORUS_THERIAN] = sAnims_EnamorusTherian, [SPECIES_BASCULEGION_FEMALE] = sAnims_Basculegion, #endif - [SPECIES_VENUSAUR_GMAX] = sAnims_VENUSAUR_GMAX, - [SPECIES_CHARIZARD_GMAX] = sAnims_CHARIZARD_GMAX, - [SPECIES_BLASTOISE_GMAX] = sAnims_BLASTOISE_GMAX, - [SPECIES_BUTTERFREE_GMAX] = sAnims_BUTTERFREE_GMAX, - [SPECIES_PIKACHU_GMAX] = sAnims_PIKACHU_GMAX, - [SPECIES_MEOWTH_GMAX] = sAnims_MEOWTH_GMAX, - [SPECIES_MACHAMP_GMAX] = sAnims_MACHAMP_GMAX, - [SPECIES_GENGAR_GMAX] = sAnims_GENGAR_GMAX, - [SPECIES_KINGLER_GMAX] = sAnims_KINGLER_GMAX, - [SPECIES_LAPRAS_GMAX] = sAnims_LAPRAS_GMAX, - [SPECIES_EEVEE_GMAX] = sAnims_EEVEE_GMAX, - [SPECIES_SNORLAX_GMAX] = sAnims_SNORLAX_GMAX, + [SPECIES_VENUSAUR_GIGANTAMAX] = sAnims_VENUSAUR_GIGANTAMAX, + [SPECIES_CHARIZARD_GIGANTAMAX] = sAnims_CHARIZARD_GIGANTAMAX, + [SPECIES_BLASTOISE_GIGANTAMAX] = sAnims_BLASTOISE_GIGANTAMAX, + [SPECIES_BUTTERFREE_GIGANTAMAX] = sAnims_BUTTERFREE_GIGANTAMAX, + [SPECIES_PIKACHU_GIGANTAMAX] = sAnims_PIKACHU_GIGANTAMAX, + [SPECIES_MEOWTH_GIGANTAMAX] = sAnims_MEOWTH_GIGANTAMAX, + [SPECIES_MACHAMP_GIGANTAMAX] = sAnims_MACHAMP_GIGANTAMAX, + [SPECIES_GENGAR_GIGANTAMAX] = sAnims_GENGAR_GIGANTAMAX, + [SPECIES_KINGLER_GIGANTAMAX] = sAnims_KINGLER_GIGANTAMAX, + [SPECIES_LAPRAS_GIGANTAMAX] = sAnims_LAPRAS_GIGANTAMAX, + [SPECIES_EEVEE_GIGANTAMAX] = sAnims_EEVEE_GIGANTAMAX, + [SPECIES_SNORLAX_GIGANTAMAX] = sAnims_SNORLAX_GIGANTAMAX, #if P_GEN_5_POKEMON == TRUE - [SPECIES_GARBODOR_GMAX] = sAnims_GARBODOR_GMAX, + [SPECIES_GARBODOR_GIGANTAMAX] = sAnims_GARBODOR_GIGANTAMAX, #endif #if P_GEN_7_POKEMON == TRUE - [SPECIES_MELMETAL_GMAX] = sAnims_MELMETAL_GMAX, + [SPECIES_MELMETAL_GIGANTAMAX] = sAnims_MELMETAL_GIGANTAMAX, #endif #if P_GEN_8_POKEMON == TRUE - [SPECIES_RILLABOOM_GMAX] = sAnims_RILLABOOM_GMAX, - [SPECIES_CINDERACE_GMAX] = sAnims_CINDERACE_GMAX, - [SPECIES_INTELEON_GMAX] = sAnims_INTELEON_GMAX, - [SPECIES_CORVIKNIGHT_GMAX] = sAnims_CORVIKNIGHT_GMAX, - [SPECIES_ORBEETLE_GMAX] = sAnims_ORBEETLE_GMAX, - [SPECIES_DREDNAW_GMAX] = sAnims_DREDNAW_GMAX, - [SPECIES_COALOSSAL_GMAX] = sAnims_COALOSSAL_GMAX, - [SPECIES_FLAPPLE_GMAX] = sAnims_FLAPPLE_GMAX, - [SPECIES_APPLETUN_GMAX] = sAnims_APPLETUN_GMAX, - [SPECIES_SANDACONDA_GMAX] = sAnims_SANDACONDA_GMAX, - [SPECIES_TOXTRICITY_GMAX] = sAnims_TOXTRICITY_GMAX, - [SPECIES_CENTISKORCH_GMAX] = sAnims_CENTISKORCH_GMAX, - [SPECIES_HATTERENE_GMAX] = sAnims_HATTERENE_GMAX, - [SPECIES_GRIMMSNARL_GMAX] = sAnims_GRIMMSNARL_GMAX, - [SPECIES_ALCREMIE_GMAX] = sAnims_ALCREMIE_GMAX, - [SPECIES_COPPERAJAH_GMAX] = sAnims_COPPERAJAH_GMAX, - [SPECIES_DURALUDON_GMAX] = sAnims_DURALUDON_GMAX, - [SPECIES_URSHIFU_GMAX] = sAnims_URSHIFU_GMAX, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = sAnims_URSHIFU_RAPID_STRIKE_STYLE_GMAX, + [SPECIES_RILLABOOM_GIGANTAMAX] = sAnims_RILLABOOM_GIGANTAMAX, + [SPECIES_CINDERACE_GIGANTAMAX] = sAnims_CINDERACE_GIGANTAMAX, + [SPECIES_INTELEON_GIGANTAMAX] = sAnims_INTELEON_GIGANTAMAX, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = sAnims_CORVIKNIGHT_GIGANTAMAX, + [SPECIES_ORBEETLE_GIGANTAMAX] = sAnims_ORBEETLE_GIGANTAMAX, + [SPECIES_DREDNAW_GIGANTAMAX] = sAnims_DREDNAW_GIGANTAMAX, + [SPECIES_COALOSSAL_GIGANTAMAX] = sAnims_COALOSSAL_GIGANTAMAX, + [SPECIES_FLAPPLE_GIGANTAMAX] = sAnims_FLAPPLE_GIGANTAMAX, + [SPECIES_APPLETUN_GIGANTAMAX] = sAnims_APPLETUN_GIGANTAMAX, + [SPECIES_SANDACONDA_GIGANTAMAX] = sAnims_SANDACONDA_GIGANTAMAX, + [SPECIES_TOXTRICITY_GIGANTAMAX] = sAnims_TOXTRICITY_GIGANTAMAX, + [SPECIES_CENTISKORCH_GIGANTAMAX] = sAnims_CENTISKORCH_GIGANTAMAX, + [SPECIES_HATTERENE_GIGANTAMAX] = sAnims_HATTERENE_GIGANTAMAX, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = sAnims_GRIMMSNARL_GIGANTAMAX, + [SPECIES_ALCREMIE_GIGANTAMAX] = sAnims_ALCREMIE_GIGANTAMAX, + [SPECIES_COPPERAJAH_GIGANTAMAX] = sAnims_COPPERAJAH_GIGANTAMAX, + [SPECIES_DURALUDON_GIGANTAMAX] = sAnims_DURALUDON_GIGANTAMAX, + [SPECIES_URSHIFU_GIGANTAMAX] = sAnims_URSHIFU_GIGANTAMAX, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sAnims_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, #endif [SPECIES_EGG] = sAnims_Egg, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index f8eb3c5aa6..50e3a541a8 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -1341,39 +1341,39 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = // Basculegion [SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, // Gigantamax Forms - [SPECIES_VENUSAUR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_CHARIZARD_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BLASTOISE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_BUTTERFREE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_PIKACHU_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_MEOWTH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_MACHAMP_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GENGAR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_KINGLER_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LAPRAS_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_EEVEE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_SNORLAX_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GARBODOR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MELMETAL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_RILLABOOM_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CINDERACE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_INTELEON_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CORVIKNIGHT_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_ORBEETLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DREDNAW_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_COALOSSAL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLAPPLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_APPLETUN_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_SANDACONDA_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOXTRICITY_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CENTISKORCH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_HATTERENE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GRIMMSNARL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ALCREMIE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_COPPERAJAH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DURALUDON_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_URSHIFU_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VENUSAUR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_CHARIZARD_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_BLASTOISE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_BUTTERFREE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_PIKACHU_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_MEOWTH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_MACHAMP_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GENGAR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_KINGLER_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_LAPRAS_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_EEVEE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_SNORLAX_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GARBODOR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_MELMETAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_RILLABOOM_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CINDERACE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_INTELEON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_ORBEETLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DREDNAW_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_COALOSSAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLAPPLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_APPLETUN_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_SANDACONDA_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TOXTRICITY_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CENTISKORCH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_HATTERENE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ALCREMIE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_COPPERAJAH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DURALUDON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif // Egg [SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 }, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index a99214f0e2..33a6afb5db 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1335,39 +1335,39 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(BASCULEGION_FEMALE, gMonFrontPic_BasculegionFemale), // Gigantamax Forms - SPECIES_SPRITE(VENUSAUR_GMAX, gMonFrontPic_VenusaurGmax), - SPECIES_SPRITE(CHARIZARD_GMAX, gMonFrontPic_CharizardGmax), - SPECIES_SPRITE(BLASTOISE_GMAX, gMonFrontPic_BlastoiseGmax), - SPECIES_SPRITE(BUTTERFREE_GMAX, gMonFrontPic_ButterfreeGmax), - SPECIES_SPRITE(PIKACHU_GMAX, gMonFrontPic_PikachuGmax), - SPECIES_SPRITE(MEOWTH_GMAX, gMonFrontPic_MeowthGmax), - SPECIES_SPRITE(MACHAMP_GMAX, gMonFrontPic_MachampGmax), - SPECIES_SPRITE(GENGAR_GMAX, gMonFrontPic_GengarGmax), - SPECIES_SPRITE(KINGLER_GMAX, gMonFrontPic_KinglerGmax), - SPECIES_SPRITE(LAPRAS_GMAX, gMonFrontPic_LaprasGmax), - SPECIES_SPRITE(EEVEE_GMAX, gMonFrontPic_EeveeGmax), - SPECIES_SPRITE(SNORLAX_GMAX, gMonFrontPic_SnorlaxGmax), - SPECIES_SPRITE(GARBODOR_GMAX, gMonFrontPic_GarbodorGmax), - SPECIES_SPRITE(MELMETAL_GMAX, gMonFrontPic_MelmetalGmax), - SPECIES_SPRITE(RILLABOOM_GMAX, gMonFrontPic_RillaboomGmax), - SPECIES_SPRITE(CINDERACE_GMAX, gMonFrontPic_CinderaceGmax), - SPECIES_SPRITE(INTELEON_GMAX, gMonFrontPic_InteleonGmax), - SPECIES_SPRITE(CORVIKNIGHT_GMAX, gMonFrontPic_CorviknightGmax), - SPECIES_SPRITE(ORBEETLE_GMAX, gMonFrontPic_OrbeetleGmax), - SPECIES_SPRITE(DREDNAW_GMAX, gMonFrontPic_DrednawGmax), - SPECIES_SPRITE(COALOSSAL_GMAX, gMonFrontPic_CoalossalGmax), - SPECIES_SPRITE(FLAPPLE_GMAX, gMonFrontPic_FlappleGmax), - SPECIES_SPRITE(APPLETUN_GMAX, gMonFrontPic_AppletunGmax), - SPECIES_SPRITE(SANDACONDA_GMAX, gMonFrontPic_SandacondaGmax), - SPECIES_SPRITE(TOXTRICITY_GMAX, gMonFrontPic_ToxtricityGmax), - SPECIES_SPRITE(CENTISKORCH_GMAX, gMonFrontPic_CentiskorchGmax), - SPECIES_SPRITE(HATTERENE_GMAX, gMonFrontPic_HattereneGmax), - SPECIES_SPRITE(GRIMMSNARL_GMAX, gMonFrontPic_GrimmsnarlGmax), - SPECIES_SPRITE(ALCREMIE_GMAX, gMonFrontPic_AlcremieGmax), - SPECIES_SPRITE(COPPERAJAH_GMAX, gMonFrontPic_CopperajahGmax), - SPECIES_SPRITE(DURALUDON_GMAX, gMonFrontPic_DuraludonGmax), - SPECIES_SPRITE(URSHIFU_GMAX, gMonFrontPic_UrshifuGmax), - SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE_GMAX, gMonFrontPic_UrshifuRapidStrikeGmax), + SPECIES_SPRITE(VENUSAUR_GIGANTAMAX, gMonFrontPic_VenusaurGigantamax), + SPECIES_SPRITE(CHARIZARD_GIGANTAMAX, gMonFrontPic_CharizardGigantamax), + SPECIES_SPRITE(BLASTOISE_GIGANTAMAX, gMonFrontPic_BlastoiseGigantamax), + SPECIES_SPRITE(BUTTERFREE_GIGANTAMAX, gMonFrontPic_ButterfreeGigantamax), + SPECIES_SPRITE(PIKACHU_GIGANTAMAX, gMonFrontPic_PikachuGigantamax), + SPECIES_SPRITE(MEOWTH_GIGANTAMAX, gMonFrontPic_MeowthGigantamax), + SPECIES_SPRITE(MACHAMP_GIGANTAMAX, gMonFrontPic_MachampGigantamax), + SPECIES_SPRITE(GENGAR_GIGANTAMAX, gMonFrontPic_GengarGigantamax), + SPECIES_SPRITE(KINGLER_GIGANTAMAX, gMonFrontPic_KinglerGigantamax), + SPECIES_SPRITE(LAPRAS_GIGANTAMAX, gMonFrontPic_LaprasGigantamax), + SPECIES_SPRITE(EEVEE_GIGANTAMAX, gMonFrontPic_EeveeGigantamax), + SPECIES_SPRITE(SNORLAX_GIGANTAMAX, gMonFrontPic_SnorlaxGigantamax), + SPECIES_SPRITE(GARBODOR_GIGANTAMAX, gMonFrontPic_GarbodorGigantamax), + SPECIES_SPRITE(MELMETAL_GIGANTAMAX, gMonFrontPic_MelmetalGigantamax), + SPECIES_SPRITE(RILLABOOM_GIGANTAMAX, gMonFrontPic_RillaboomGigantamax), + SPECIES_SPRITE(CINDERACE_GIGANTAMAX, gMonFrontPic_CinderaceGigantamax), + SPECIES_SPRITE(INTELEON_GIGANTAMAX, gMonFrontPic_InteleonGigantamax), + SPECIES_SPRITE(CORVIKNIGHT_GIGANTAMAX, gMonFrontPic_CorviknightGigantamax), + SPECIES_SPRITE(ORBEETLE_GIGANTAMAX, gMonFrontPic_OrbeetleGigantamax), + SPECIES_SPRITE(DREDNAW_GIGANTAMAX, gMonFrontPic_DrednawGigantamax), + SPECIES_SPRITE(COALOSSAL_GIGANTAMAX, gMonFrontPic_CoalossalGigantamax), + SPECIES_SPRITE(FLAPPLE_GIGANTAMAX, gMonFrontPic_FlappleGigantamax), + SPECIES_SPRITE(APPLETUN_GIGANTAMAX, gMonFrontPic_AppletunGigantamax), + SPECIES_SPRITE(SANDACONDA_GIGANTAMAX, gMonFrontPic_SandacondaGigantamax), + SPECIES_SPRITE(TOXTRICITY_GIGANTAMAX, gMonFrontPic_ToxtricityGigantamax), + SPECIES_SPRITE(CENTISKORCH_GIGANTAMAX, gMonFrontPic_CentiskorchGigantamax), + SPECIES_SPRITE(HATTERENE_GIGANTAMAX, gMonFrontPic_HattereneGigantamax), + SPECIES_SPRITE(GRIMMSNARL_GIGANTAMAX, gMonFrontPic_GrimmsnarlGigantamax), + SPECIES_SPRITE(ALCREMIE_GIGANTAMAX, gMonFrontPic_AlcremieGigantamax), + SPECIES_SPRITE(COPPERAJAH_GIGANTAMAX, gMonFrontPic_CopperajahGigantamax), + SPECIES_SPRITE(DURALUDON_GIGANTAMAX, gMonFrontPic_DuraludonGigantamax), + SPECIES_SPRITE(URSHIFU_GIGANTAMAX, gMonFrontPic_UrshifuGigantamax), + SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, gMonFrontPic_UrshifuRapidStrikeGigantamax), #endif SPECIES_SPRITE(EGG, gMonFrontPic_Egg), }; diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 76a7ff040c..caf4578a68 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1335,39 +1335,39 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(BASCULEGION_FEMALE, gMonPalette_BasculegionFemale), // Gigantamax Forms - SPECIES_PAL(VENUSAUR_GMAX, gMonPalette_VenusaurGmax), - SPECIES_PAL(CHARIZARD_GMAX, gMonPalette_CharizardGmax), - SPECIES_PAL(BLASTOISE_GMAX, gMonPalette_BlastoiseGmax), - SPECIES_PAL(BUTTERFREE_GMAX, gMonPalette_ButterfreeGmax), - SPECIES_PAL(PIKACHU_GMAX, gMonPalette_PikachuGmax), - SPECIES_PAL(MEOWTH_GMAX, gMonPalette_MeowthGmax), - SPECIES_PAL(MACHAMP_GMAX, gMonPalette_MachampGmax), - SPECIES_PAL(GENGAR_GMAX, gMonPalette_GengarGmax), - SPECIES_PAL(KINGLER_GMAX, gMonPalette_KinglerGmax), - SPECIES_PAL(LAPRAS_GMAX, gMonPalette_LaprasGmax), - SPECIES_PAL(EEVEE_GMAX, gMonPalette_EeveeGmax), - SPECIES_PAL(SNORLAX_GMAX, gMonPalette_SnorlaxGmax), - SPECIES_PAL(GARBODOR_GMAX, gMonPalette_GarbodorGmax), - SPECIES_PAL(MELMETAL_GMAX, gMonPalette_MelmetalGmax), - SPECIES_PAL(RILLABOOM_GMAX, gMonPalette_RillaboomGmax), - SPECIES_PAL(CINDERACE_GMAX, gMonPalette_CinderaceGmax), - SPECIES_PAL(INTELEON_GMAX, gMonPalette_InteleonGmax), - SPECIES_PAL(CORVIKNIGHT_GMAX, gMonPalette_CorviknightGmax), - SPECIES_PAL(ORBEETLE_GMAX, gMonPalette_OrbeetleGmax), - SPECIES_PAL(DREDNAW_GMAX, gMonPalette_DrednawGmax), - SPECIES_PAL(COALOSSAL_GMAX, gMonPalette_CoalossalGmax), - SPECIES_PAL(FLAPPLE_GMAX, gMonPalette_FlappleGmax), - SPECIES_PAL(APPLETUN_GMAX, gMonPalette_AppletunGmax), - SPECIES_PAL(SANDACONDA_GMAX, gMonPalette_SandacondaGmax), - SPECIES_PAL(TOXTRICITY_GMAX, gMonPalette_ToxtricityGmax), - SPECIES_PAL(CENTISKORCH_GMAX, gMonPalette_CentiskorchGmax), - SPECIES_PAL(HATTERENE_GMAX, gMonPalette_HattereneGmax), - SPECIES_PAL(GRIMMSNARL_GMAX, gMonPalette_GrimmsnarlGmax), - SPECIES_PAL(ALCREMIE_GMAX, gMonPalette_AlcremieGmax), - SPECIES_PAL(COPPERAJAH_GMAX, gMonPalette_CopperajahGmax), - SPECIES_PAL(DURALUDON_GMAX, gMonPalette_DuraludonGmax), - SPECIES_PAL(URSHIFU_GMAX, gMonPalette_UrshifuGmax), - SPECIES_PAL(URSHIFU_RAPID_STRIKE_STYLE_GMAX, gMonPalette_UrshifuRapidStrikeGmax), + SPECIES_PAL(VENUSAUR_GIGANTAMAX, gMonPalette_VenusaurGigantamax), + SPECIES_PAL(CHARIZARD_GIGANTAMAX, gMonPalette_CharizardGigantamax), + SPECIES_PAL(BLASTOISE_GIGANTAMAX, gMonPalette_BlastoiseGigantamax), + SPECIES_PAL(BUTTERFREE_GIGANTAMAX, gMonPalette_ButterfreeGigantamax), + SPECIES_PAL(PIKACHU_GIGANTAMAX, gMonPalette_PikachuGigantamax), + SPECIES_PAL(MEOWTH_GIGANTAMAX, gMonPalette_MeowthGigantamax), + SPECIES_PAL(MACHAMP_GIGANTAMAX, gMonPalette_MachampGigantamax), + SPECIES_PAL(GENGAR_GIGANTAMAX, gMonPalette_GengarGigantamax), + SPECIES_PAL(KINGLER_GIGANTAMAX, gMonPalette_KinglerGigantamax), + SPECIES_PAL(LAPRAS_GIGANTAMAX, gMonPalette_LaprasGigantamax), + SPECIES_PAL(EEVEE_GIGANTAMAX, gMonPalette_EeveeGigantamax), + SPECIES_PAL(SNORLAX_GIGANTAMAX, gMonPalette_SnorlaxGigantamax), + SPECIES_PAL(GARBODOR_GIGANTAMAX, gMonPalette_GarbodorGigantamax), + SPECIES_PAL(MELMETAL_GIGANTAMAX, gMonPalette_MelmetalGigantamax), + SPECIES_PAL(RILLABOOM_GIGANTAMAX, gMonPalette_RillaboomGigantamax), + SPECIES_PAL(CINDERACE_GIGANTAMAX, gMonPalette_CinderaceGigantamax), + SPECIES_PAL(INTELEON_GIGANTAMAX, gMonPalette_InteleonGigantamax), + SPECIES_PAL(CORVIKNIGHT_GIGANTAMAX, gMonPalette_CorviknightGigantamax), + SPECIES_PAL(ORBEETLE_GIGANTAMAX, gMonPalette_OrbeetleGigantamax), + SPECIES_PAL(DREDNAW_GIGANTAMAX, gMonPalette_DrednawGigantamax), + SPECIES_PAL(COALOSSAL_GIGANTAMAX, gMonPalette_CoalossalGigantamax), + SPECIES_PAL(FLAPPLE_GIGANTAMAX, gMonPalette_FlappleGigantamax), + SPECIES_PAL(APPLETUN_GIGANTAMAX, gMonPalette_AppletunGigantamax), + SPECIES_PAL(SANDACONDA_GIGANTAMAX, gMonPalette_SandacondaGigantamax), + SPECIES_PAL(TOXTRICITY_GIGANTAMAX, gMonPalette_ToxtricityGigantamax), + SPECIES_PAL(CENTISKORCH_GIGANTAMAX, gMonPalette_CentiskorchGigantamax), + SPECIES_PAL(HATTERENE_GIGANTAMAX, gMonPalette_HattereneGigantamax), + SPECIES_PAL(GRIMMSNARL_GIGANTAMAX, gMonPalette_GrimmsnarlGigantamax), + SPECIES_PAL(ALCREMIE_GIGANTAMAX, gMonPalette_AlcremieGigantamax), + SPECIES_PAL(COPPERAJAH_GIGANTAMAX, gMonPalette_CopperajahGigantamax), + SPECIES_PAL(DURALUDON_GIGANTAMAX, gMonPalette_DuraludonGigantamax), + SPECIES_PAL(URSHIFU_GIGANTAMAX, gMonPalette_UrshifuGigantamax), + SPECIES_PAL(URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, gMonPalette_UrshifuRapidStrikeGigantamax), #endif SPECIES_PAL(EGG, gMonPalette_Egg), }; diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 1fbcb109ef..13e19d4ca3 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1334,39 +1334,39 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(BASCULEGION_FEMALE, gMonShinyPalette_BasculegionFemale), // Gigantamax Forms - SPECIES_SHINY_PAL(VENUSAUR_GMAX, gMonShinyPalette_VenusaurGmax), - SPECIES_SHINY_PAL(CHARIZARD_GMAX, gMonShinyPalette_CharizardGmax), - SPECIES_SHINY_PAL(BLASTOISE_GMAX, gMonShinyPalette_BlastoiseGmax), - SPECIES_SHINY_PAL(BUTTERFREE_GMAX, gMonShinyPalette_ButterfreeGmax), - SPECIES_SHINY_PAL(PIKACHU_GMAX, gMonShinyPalette_PikachuGmax), - SPECIES_SHINY_PAL(MEOWTH_GMAX, gMonShinyPalette_MeowthGmax), - SPECIES_SHINY_PAL(MACHAMP_GMAX, gMonShinyPalette_MachampGmax), - SPECIES_SHINY_PAL(GENGAR_GMAX, gMonShinyPalette_GengarGmax), - SPECIES_SHINY_PAL(KINGLER_GMAX, gMonShinyPalette_KinglerGmax), - SPECIES_SHINY_PAL(LAPRAS_GMAX, gMonShinyPalette_LaprasGmax), - SPECIES_SHINY_PAL(EEVEE_GMAX, gMonShinyPalette_EeveeGmax), - SPECIES_SHINY_PAL(SNORLAX_GMAX, gMonShinyPalette_SnorlaxGmax), - SPECIES_SHINY_PAL(GARBODOR_GMAX, gMonShinyPalette_GarbodorGmax), - SPECIES_SHINY_PAL(MELMETAL_GMAX, gMonShinyPalette_MelmetalGmax), - SPECIES_SHINY_PAL(RILLABOOM_GMAX, gMonShinyPalette_RillaboomGmax), - SPECIES_SHINY_PAL(CINDERACE_GMAX, gMonShinyPalette_CinderaceGmax), - SPECIES_SHINY_PAL(INTELEON_GMAX, gMonShinyPalette_InteleonGmax), - SPECIES_SHINY_PAL(CORVIKNIGHT_GMAX, gMonShinyPalette_CorviknightGmax), - SPECIES_SHINY_PAL(ORBEETLE_GMAX, gMonShinyPalette_OrbeetleGmax), - SPECIES_SHINY_PAL(DREDNAW_GMAX, gMonShinyPalette_DrednawGmax), - SPECIES_SHINY_PAL(COALOSSAL_GMAX, gMonShinyPalette_CoalossalGmax), - SPECIES_SHINY_PAL(FLAPPLE_GMAX, gMonShinyPalette_FlappleGmax), - SPECIES_SHINY_PAL(APPLETUN_GMAX, gMonShinyPalette_AppletunGmax), - SPECIES_SHINY_PAL(SANDACONDA_GMAX, gMonShinyPalette_SandacondaGmax), - SPECIES_SHINY_PAL(TOXTRICITY_GMAX, gMonShinyPalette_ToxtricityGmax), - SPECIES_SHINY_PAL(CENTISKORCH_GMAX, gMonShinyPalette_CentiskorchGmax), - SPECIES_SHINY_PAL(HATTERENE_GMAX, gMonShinyPalette_HattereneGmax), - SPECIES_SHINY_PAL(GRIMMSNARL_GMAX, gMonShinyPalette_GrimmsnarlGmax), - SPECIES_SHINY_PAL(ALCREMIE_GMAX, gMonShinyPalette_AlcremieGmax), - SPECIES_SHINY_PAL(COPPERAJAH_GMAX, gMonShinyPalette_CopperajahGmax), - SPECIES_SHINY_PAL(DURALUDON_GMAX, gMonShinyPalette_DuraludonGmax), - SPECIES_SHINY_PAL(URSHIFU_GMAX, gMonShinyPalette_UrshifuGmax), - SPECIES_SHINY_PAL(URSHIFU_RAPID_STRIKE_STYLE_GMAX, gMonShinyPalette_UrshifuRapidStrikeGmax), + SPECIES_SHINY_PAL(VENUSAUR_GIGANTAMAX, gMonShinyPalette_VenusaurGigantamax), + SPECIES_SHINY_PAL(CHARIZARD_GIGANTAMAX, gMonShinyPalette_CharizardGigantamax), + SPECIES_SHINY_PAL(BLASTOISE_GIGANTAMAX, gMonShinyPalette_BlastoiseGigantamax), + SPECIES_SHINY_PAL(BUTTERFREE_GIGANTAMAX, gMonShinyPalette_ButterfreeGigantamax), + SPECIES_SHINY_PAL(PIKACHU_GIGANTAMAX, gMonShinyPalette_PikachuGigantamax), + SPECIES_SHINY_PAL(MEOWTH_GIGANTAMAX, gMonShinyPalette_MeowthGigantamax), + SPECIES_SHINY_PAL(MACHAMP_GIGANTAMAX, gMonShinyPalette_MachampGigantamax), + SPECIES_SHINY_PAL(GENGAR_GIGANTAMAX, gMonShinyPalette_GengarGigantamax), + SPECIES_SHINY_PAL(KINGLER_GIGANTAMAX, gMonShinyPalette_KinglerGigantamax), + SPECIES_SHINY_PAL(LAPRAS_GIGANTAMAX, gMonShinyPalette_LaprasGigantamax), + SPECIES_SHINY_PAL(EEVEE_GIGANTAMAX, gMonShinyPalette_EeveeGigantamax), + SPECIES_SHINY_PAL(SNORLAX_GIGANTAMAX, gMonShinyPalette_SnorlaxGigantamax), + SPECIES_SHINY_PAL(GARBODOR_GIGANTAMAX, gMonShinyPalette_GarbodorGigantamax), + SPECIES_SHINY_PAL(MELMETAL_GIGANTAMAX, gMonShinyPalette_MelmetalGigantamax), + SPECIES_SHINY_PAL(RILLABOOM_GIGANTAMAX, gMonShinyPalette_RillaboomGigantamax), + SPECIES_SHINY_PAL(CINDERACE_GIGANTAMAX, gMonShinyPalette_CinderaceGigantamax), + SPECIES_SHINY_PAL(INTELEON_GIGANTAMAX, gMonShinyPalette_InteleonGigantamax), + SPECIES_SHINY_PAL(CORVIKNIGHT_GIGANTAMAX, gMonShinyPalette_CorviknightGigantamax), + SPECIES_SHINY_PAL(ORBEETLE_GIGANTAMAX, gMonShinyPalette_OrbeetleGigantamax), + SPECIES_SHINY_PAL(DREDNAW_GIGANTAMAX, gMonShinyPalette_DrednawGigantamax), + SPECIES_SHINY_PAL(COALOSSAL_GIGANTAMAX, gMonShinyPalette_CoalossalGigantamax), + SPECIES_SHINY_PAL(FLAPPLE_GIGANTAMAX, gMonShinyPalette_FlappleGigantamax), + SPECIES_SHINY_PAL(APPLETUN_GIGANTAMAX, gMonShinyPalette_AppletunGigantamax), + SPECIES_SHINY_PAL(SANDACONDA_GIGANTAMAX, gMonShinyPalette_SandacondaGigantamax), + SPECIES_SHINY_PAL(TOXTRICITY_GIGANTAMAX, gMonShinyPalette_ToxtricityGigantamax), + SPECIES_SHINY_PAL(CENTISKORCH_GIGANTAMAX, gMonShinyPalette_CentiskorchGigantamax), + SPECIES_SHINY_PAL(HATTERENE_GIGANTAMAX, gMonShinyPalette_HattereneGigantamax), + SPECIES_SHINY_PAL(GRIMMSNARL_GIGANTAMAX, gMonShinyPalette_GrimmsnarlGigantamax), + SPECIES_SHINY_PAL(ALCREMIE_GIGANTAMAX, gMonShinyPalette_AlcremieGigantamax), + SPECIES_SHINY_PAL(COPPERAJAH_GIGANTAMAX, gMonShinyPalette_CopperajahGigantamax), + SPECIES_SHINY_PAL(DURALUDON_GIGANTAMAX, gMonShinyPalette_DuraludonGigantamax), + SPECIES_SHINY_PAL(URSHIFU_GIGANTAMAX, gMonShinyPalette_UrshifuGigantamax), + SPECIES_SHINY_PAL(URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, gMonShinyPalette_UrshifuRapidStrikeGigantamax), #endif SPECIES_SHINY_PAL(EGG, gMonPalette_Egg), }; diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index adb09121c8..8b366ac17c 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -1339,38 +1339,38 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { // Basculegion [SPECIES_BASCULEGION_FEMALE] = _("Bsculegion"), // Gigantamax Forms - [SPECIES_VENUSAUR_GMAX] = _("Venusaur"), - [SPECIES_CHARIZARD_GMAX] = _("Charizard"), - [SPECIES_BLASTOISE_GMAX] = _("Blastoise"), - [SPECIES_BUTTERFREE_GMAX] = _("Butterfree"), - [SPECIES_PIKACHU_GMAX] = _("Pikachu"), - [SPECIES_MEOWTH_GMAX] = _("Meowth"), - [SPECIES_MACHAMP_GMAX] = _("Machamp"), - [SPECIES_GENGAR_GMAX] = _("Gengar"), - [SPECIES_KINGLER_GMAX] = _("Kingler"), - [SPECIES_LAPRAS_GMAX] = _("Lapras"), - [SPECIES_EEVEE_GMAX] = _("Eevee"), - [SPECIES_SNORLAX_GMAX] = _("Snorlax"), - [SPECIES_GARBODOR_GMAX] = _("Garbodor"), - [SPECIES_MELMETAL_GMAX] = _("Melmetal"), - [SPECIES_RILLABOOM_GMAX] = _("Rillaboom"), - [SPECIES_CINDERACE_GMAX] = _("Cinderace"), - [SPECIES_INTELEON_GMAX] = _("Inteleon"), - [SPECIES_CORVIKNIGHT_GMAX] = _("Corviknigh"), - [SPECIES_ORBEETLE_GMAX] = _("Orbeetle"), - [SPECIES_DREDNAW_GMAX] = _("Drednaw"), - [SPECIES_COALOSSAL_GMAX] = _("Coalossal"), - [SPECIES_FLAPPLE_GMAX] = _("Flapple"), - [SPECIES_APPLETUN_GMAX] = _("Appletun"), - [SPECIES_SANDACONDA_GMAX] = _("Sandaconda"), - [SPECIES_TOXTRICITY_GMAX] = _("Toxtricity"), - [SPECIES_CENTISKORCH_GMAX] = _("Centiskorc"), - [SPECIES_HATTERENE_GMAX] = _("Hatterene"), - [SPECIES_GRIMMSNARL_GMAX] = _("Grimmsnarl"), - [SPECIES_ALCREMIE_GMAX] = _("Alcremie"), - [SPECIES_COPPERAJAH_GMAX] = _("Copperajah"), - [SPECIES_DURALUDON_GMAX] = _("Duraludon"), - [SPECIES_URSHIFU_GMAX] = _("Urshifu"), - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = _("Urshifu"), + [SPECIES_VENUSAUR_GIGANTAMAX] = _("Venusaur"), + [SPECIES_CHARIZARD_GIGANTAMAX] = _("Charizard"), + [SPECIES_BLASTOISE_GIGANTAMAX] = _("Blastoise"), + [SPECIES_BUTTERFREE_GIGANTAMAX] = _("Butterfree"), + [SPECIES_PIKACHU_GIGANTAMAX] = _("Pikachu"), + [SPECIES_MEOWTH_GIGANTAMAX] = _("Meowth"), + [SPECIES_MACHAMP_GIGANTAMAX] = _("Machamp"), + [SPECIES_GENGAR_GIGANTAMAX] = _("Gengar"), + [SPECIES_KINGLER_GIGANTAMAX] = _("Kingler"), + [SPECIES_LAPRAS_GIGANTAMAX] = _("Lapras"), + [SPECIES_EEVEE_GIGANTAMAX] = _("Eevee"), + [SPECIES_SNORLAX_GIGANTAMAX] = _("Snorlax"), + [SPECIES_GARBODOR_GIGANTAMAX] = _("Garbodor"), + [SPECIES_MELMETAL_GIGANTAMAX] = _("Melmetal"), + [SPECIES_RILLABOOM_GIGANTAMAX] = _("Rillaboom"), + [SPECIES_CINDERACE_GIGANTAMAX] = _("Cinderace"), + [SPECIES_INTELEON_GIGANTAMAX] = _("Inteleon"), + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = _("Corviknigh"), + [SPECIES_ORBEETLE_GIGANTAMAX] = _("Orbeetle"), + [SPECIES_DREDNAW_GIGANTAMAX] = _("Drednaw"), + [SPECIES_COALOSSAL_GIGANTAMAX] = _("Coalossal"), + [SPECIES_FLAPPLE_GIGANTAMAX] = _("Flapple"), + [SPECIES_APPLETUN_GIGANTAMAX] = _("Appletun"), + [SPECIES_SANDACONDA_GIGANTAMAX] = _("Sandaconda"), + [SPECIES_TOXTRICITY_GIGANTAMAX] = _("Toxtricity"), + [SPECIES_CENTISKORCH_GIGANTAMAX] = _("Centiskorc"), + [SPECIES_HATTERENE_GIGANTAMAX] = _("Hatterene"), + [SPECIES_GRIMMSNARL_GIGANTAMAX] = _("Grimmsnarl"), + [SPECIES_ALCREMIE_GIGANTAMAX] = _("Alcremie"), + [SPECIES_COPPERAJAH_GIGANTAMAX] = _("Copperajah"), + [SPECIES_DURALUDON_GIGANTAMAX] = _("Duraludon"), + [SPECIES_URSHIFU_GIGANTAMAX] = _("Urshifu"), + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"), #endif }; diff --git a/src/pokemon.c b/src/pokemon.c index 7d9cae1206..b71549257f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1684,39 +1684,39 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = // Basculegion [SPECIES_BASCULEGION_FEMALE - 1] = NATIONAL_DEX_BASCULEGION, // Gigantamax Forms - [SPECIES_VENUSAUR_GMAX - 1] = NATIONAL_DEX_VENUSAUR, - [SPECIES_CHARIZARD_GMAX - 1] = NATIONAL_DEX_CHARIZARD, - [SPECIES_BLASTOISE_GMAX - 1] = NATIONAL_DEX_BLASTOISE, - [SPECIES_BUTTERFREE_GMAX - 1] = NATIONAL_DEX_BUTTERFREE, - [SPECIES_PIKACHU_GMAX - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_MEOWTH_GMAX - 1] = NATIONAL_DEX_MEOWTH, - [SPECIES_MACHAMP_GMAX - 1] = NATIONAL_DEX_MACHAMP, - [SPECIES_GENGAR_GMAX - 1] = NATIONAL_DEX_GENGAR, - [SPECIES_KINGLER_GMAX - 1] = NATIONAL_DEX_KINGLER, - [SPECIES_LAPRAS_GMAX - 1] = NATIONAL_DEX_LAPRAS, - [SPECIES_EEVEE_GMAX - 1] = NATIONAL_DEX_EEVEE, - [SPECIES_SNORLAX_GMAX - 1] = NATIONAL_DEX_SNORLAX, - [SPECIES_GARBODOR_GMAX - 1] = NATIONAL_DEX_GARBODOR, - [SPECIES_MELMETAL_GMAX - 1] = NATIONAL_DEX_MELMETAL, - [SPECIES_RILLABOOM_GMAX - 1] = NATIONAL_DEX_RILLABOOM, - [SPECIES_CINDERACE_GMAX - 1] = NATIONAL_DEX_CINDERACE, - [SPECIES_INTELEON_GMAX - 1] = NATIONAL_DEX_INTELEON, - [SPECIES_CORVIKNIGHT_GMAX - 1] = NATIONAL_DEX_CORVIKNIGHT, - [SPECIES_ORBEETLE_GMAX - 1] = NATIONAL_DEX_ORBEETLE, - [SPECIES_DREDNAW_GMAX - 1] = NATIONAL_DEX_DREDNAW, - [SPECIES_COALOSSAL_GMAX - 1] = NATIONAL_DEX_COALOSSAL, - [SPECIES_FLAPPLE_GMAX - 1] = NATIONAL_DEX_FLAPPLE, - [SPECIES_APPLETUN_GMAX - 1] = NATIONAL_DEX_APPLETUN, - [SPECIES_SANDACONDA_GMAX - 1] = NATIONAL_DEX_SANDACONDA, - [SPECIES_TOXTRICITY_GMAX - 1] = NATIONAL_DEX_TOXTRICITY, - [SPECIES_CENTISKORCH_GMAX - 1] = NATIONAL_DEX_CENTISKORCH, - [SPECIES_HATTERENE_GMAX - 1] = NATIONAL_DEX_HATTERENE, - [SPECIES_GRIMMSNARL_GMAX - 1] = NATIONAL_DEX_GRIMMSNARL, - [SPECIES_ALCREMIE_GMAX - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_COPPERAJAH_GMAX - 1] = NATIONAL_DEX_COPPERAJAH, - [SPECIES_DURALUDON_GMAX - 1] = NATIONAL_DEX_DURALUDON, - [SPECIES_URSHIFU_GMAX - 1] = NATIONAL_DEX_URSHIFU, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX - 1] = NATIONAL_DEX_URSHIFU, + [SPECIES_VENUSAUR_GIGANTAMAX - 1] = NATIONAL_DEX_VENUSAUR, + [SPECIES_CHARIZARD_GIGANTAMAX - 1] = NATIONAL_DEX_CHARIZARD, + [SPECIES_BLASTOISE_GIGANTAMAX - 1] = NATIONAL_DEX_BLASTOISE, + [SPECIES_BUTTERFREE_GIGANTAMAX - 1] = NATIONAL_DEX_BUTTERFREE, + [SPECIES_PIKACHU_GIGANTAMAX - 1] = NATIONAL_DEX_PIKACHU, + [SPECIES_MEOWTH_GIGANTAMAX - 1] = NATIONAL_DEX_MEOWTH, + [SPECIES_MACHAMP_GIGANTAMAX - 1] = NATIONAL_DEX_MACHAMP, + [SPECIES_GENGAR_GIGANTAMAX - 1] = NATIONAL_DEX_GENGAR, + [SPECIES_KINGLER_GIGANTAMAX - 1] = NATIONAL_DEX_KINGLER, + [SPECIES_LAPRAS_GIGANTAMAX - 1] = NATIONAL_DEX_LAPRAS, + [SPECIES_EEVEE_GIGANTAMAX - 1] = NATIONAL_DEX_EEVEE, + [SPECIES_SNORLAX_GIGANTAMAX - 1] = NATIONAL_DEX_SNORLAX, + [SPECIES_GARBODOR_GIGANTAMAX - 1] = NATIONAL_DEX_GARBODOR, + [SPECIES_MELMETAL_GIGANTAMAX - 1] = NATIONAL_DEX_MELMETAL, + [SPECIES_RILLABOOM_GIGANTAMAX - 1] = NATIONAL_DEX_RILLABOOM, + [SPECIES_CINDERACE_GIGANTAMAX - 1] = NATIONAL_DEX_CINDERACE, + [SPECIES_INTELEON_GIGANTAMAX - 1] = NATIONAL_DEX_INTELEON, + [SPECIES_CORVIKNIGHT_GIGANTAMAX - 1] = NATIONAL_DEX_CORVIKNIGHT, + [SPECIES_ORBEETLE_GIGANTAMAX - 1] = NATIONAL_DEX_ORBEETLE, + [SPECIES_DREDNAW_GIGANTAMAX - 1] = NATIONAL_DEX_DREDNAW, + [SPECIES_COALOSSAL_GIGANTAMAX - 1] = NATIONAL_DEX_COALOSSAL, + [SPECIES_FLAPPLE_GIGANTAMAX - 1] = NATIONAL_DEX_FLAPPLE, + [SPECIES_APPLETUN_GIGANTAMAX - 1] = NATIONAL_DEX_APPLETUN, + [SPECIES_SANDACONDA_GIGANTAMAX - 1] = NATIONAL_DEX_SANDACONDA, + [SPECIES_TOXTRICITY_GIGANTAMAX - 1] = NATIONAL_DEX_TOXTRICITY, + [SPECIES_CENTISKORCH_GIGANTAMAX - 1] = NATIONAL_DEX_CENTISKORCH, + [SPECIES_HATTERENE_GIGANTAMAX - 1] = NATIONAL_DEX_HATTERENE, + [SPECIES_GRIMMSNARL_GIGANTAMAX - 1] = NATIONAL_DEX_GRIMMSNARL, + [SPECIES_ALCREMIE_GIGANTAMAX - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_COPPERAJAH_GIGANTAMAX - 1] = NATIONAL_DEX_COPPERAJAH, + [SPECIES_DURALUDON_GIGANTAMAX - 1] = NATIONAL_DEX_DURALUDON, + [SPECIES_URSHIFU_GIGANTAMAX - 1] = NATIONAL_DEX_URSHIFU, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX - 1] = NATIONAL_DEX_URSHIFU, #endif }; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 6ab7ad9fdf..07c288d0bb 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1295,39 +1295,39 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian, [SPECIES_BASCULEGION_FEMALE] = gMonIcon_BasculegionFemale, // Gigantamax Forms - [SPECIES_VENUSAUR_GMAX] = gMonIcon_VenusaurGmax, - [SPECIES_CHARIZARD_GMAX] = gMonIcon_CharizardGmax, - [SPECIES_BLASTOISE_GMAX] = gMonIcon_BlastoiseGmax, - [SPECIES_BUTTERFREE_GMAX] = gMonIcon_ButterfreeGmax, - [SPECIES_PIKACHU_GMAX] = gMonIcon_PikachuGmax, - [SPECIES_MEOWTH_GMAX] = gMonIcon_MeowthGmax, - [SPECIES_MACHAMP_GMAX] = gMonIcon_MachampGmax, - [SPECIES_GENGAR_GMAX] = gMonIcon_GengarGmax, - [SPECIES_KINGLER_GMAX] = gMonIcon_KinglerGmax, - [SPECIES_LAPRAS_GMAX] = gMonIcon_LaprasGmax, - [SPECIES_EEVEE_GMAX] = gMonIcon_EeveeGmax, - [SPECIES_SNORLAX_GMAX] = gMonIcon_SnorlaxGmax, - [SPECIES_GARBODOR_GMAX] = gMonIcon_GarbodorGmax, - [SPECIES_MELMETAL_GMAX] = gMonIcon_MelmetalGmax, - [SPECIES_RILLABOOM_GMAX] = gMonIcon_RillaboomGmax, - [SPECIES_CINDERACE_GMAX] = gMonIcon_CinderaceGmax, - [SPECIES_INTELEON_GMAX] = gMonIcon_InteleonGmax, - [SPECIES_CORVIKNIGHT_GMAX] = gMonIcon_CorviknightGmax, - [SPECIES_ORBEETLE_GMAX] = gMonIcon_OrbeetleGmax, - [SPECIES_DREDNAW_GMAX] = gMonIcon_DrednawGmax, - [SPECIES_COALOSSAL_GMAX] = gMonIcon_CoalossalGmax, - [SPECIES_FLAPPLE_GMAX] = gMonIcon_FlappleGmax, - [SPECIES_APPLETUN_GMAX] = gMonIcon_AppletunGmax, - [SPECIES_SANDACONDA_GMAX] = gMonIcon_SandacondaGmax, - [SPECIES_TOXTRICITY_GMAX] = gMonIcon_ToxtricityGmax, - [SPECIES_CENTISKORCH_GMAX] = gMonIcon_CentiskorchGmax, - [SPECIES_HATTERENE_GMAX] = gMonIcon_HattereneGmax, - [SPECIES_GRIMMSNARL_GMAX] = gMonIcon_GrimmsnarlGmax, - [SPECIES_ALCREMIE_GMAX] = gMonIcon_AlcremieGmax, - [SPECIES_COPPERAJAH_GMAX] = gMonIcon_CopperajahGmax, - [SPECIES_DURALUDON_GMAX] = gMonIcon_DuraludonGmax, - [SPECIES_URSHIFU_GMAX] = gMonIcon_UrshifuGmax, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = gMonIcon_UrshifuRapidStrikeGmax, + [SPECIES_VENUSAUR_GIGANTAMAX] = gMonIcon_VenusaurGigantamax, + [SPECIES_CHARIZARD_GIGANTAMAX] = gMonIcon_CharizardGigantamax, + [SPECIES_BLASTOISE_GIGANTAMAX] = gMonIcon_BlastoiseGigantamax, + [SPECIES_BUTTERFREE_GIGANTAMAX] = gMonIcon_ButterfreeGigantamax, + [SPECIES_PIKACHU_GIGANTAMAX] = gMonIcon_PikachuGigantamax, + [SPECIES_MEOWTH_GIGANTAMAX] = gMonIcon_MeowthGigantamax, + [SPECIES_MACHAMP_GIGANTAMAX] = gMonIcon_MachampGigantamax, + [SPECIES_GENGAR_GIGANTAMAX] = gMonIcon_GengarGigantamax, + [SPECIES_KINGLER_GIGANTAMAX] = gMonIcon_KinglerGigantamax, + [SPECIES_LAPRAS_GIGANTAMAX] = gMonIcon_LaprasGigantamax, + [SPECIES_EEVEE_GIGANTAMAX] = gMonIcon_EeveeGigantamax, + [SPECIES_SNORLAX_GIGANTAMAX] = gMonIcon_SnorlaxGigantamax, + [SPECIES_GARBODOR_GIGANTAMAX] = gMonIcon_GarbodorGigantamax, + [SPECIES_MELMETAL_GIGANTAMAX] = gMonIcon_MelmetalGigantamax, + [SPECIES_RILLABOOM_GIGANTAMAX] = gMonIcon_RillaboomGigantamax, + [SPECIES_CINDERACE_GIGANTAMAX] = gMonIcon_CinderaceGigantamax, + [SPECIES_INTELEON_GIGANTAMAX] = gMonIcon_InteleonGigantamax, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = gMonIcon_CorviknightGigantamax, + [SPECIES_ORBEETLE_GIGANTAMAX] = gMonIcon_OrbeetleGigantamax, + [SPECIES_DREDNAW_GIGANTAMAX] = gMonIcon_DrednawGigantamax, + [SPECIES_COALOSSAL_GIGANTAMAX] = gMonIcon_CoalossalGigantamax, + [SPECIES_FLAPPLE_GIGANTAMAX] = gMonIcon_FlappleGigantamax, + [SPECIES_APPLETUN_GIGANTAMAX] = gMonIcon_AppletunGigantamax, + [SPECIES_SANDACONDA_GIGANTAMAX] = gMonIcon_SandacondaGigantamax, + [SPECIES_TOXTRICITY_GIGANTAMAX] = gMonIcon_ToxtricityGigantamax, + [SPECIES_CENTISKORCH_GIGANTAMAX] = gMonIcon_CentiskorchGigantamax, + [SPECIES_HATTERENE_GIGANTAMAX] = gMonIcon_HattereneGigantamax, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = gMonIcon_GrimmsnarlGigantamax, + [SPECIES_ALCREMIE_GIGANTAMAX] = gMonIcon_AlcremieGigantamax, + [SPECIES_COPPERAJAH_GIGANTAMAX] = gMonIcon_CopperajahGigantamax, + [SPECIES_DURALUDON_GIGANTAMAX] = gMonIcon_DuraludonGigantamax, + [SPECIES_URSHIFU_GIGANTAMAX] = gMonIcon_UrshifuGigantamax, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = gMonIcon_UrshifuRapidStrikeGigantamax, #endif [SPECIES_EGG] = gMonIcon_Egg, }; @@ -2562,39 +2562,39 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CALYREX_SHADOW_RIDER] = 0, [SPECIES_ENAMORUS_THERIAN] = 1, [SPECIES_BASCULEGION_FEMALE] = 0, - [SPECIES_VENUSAUR_GMAX] = 0, - [SPECIES_CHARIZARD_GMAX] = 0, - [SPECIES_BLASTOISE_GMAX] = 0, - [SPECIES_BUTTERFREE_GMAX] = 0, - [SPECIES_PIKACHU_GMAX] = 2, - [SPECIES_MEOWTH_GMAX] = 1, - [SPECIES_MACHAMP_GMAX] = 0, - [SPECIES_GENGAR_GMAX] = 2, - [SPECIES_KINGLER_GMAX] = 0, - [SPECIES_LAPRAS_GMAX] = 2, - [SPECIES_EEVEE_GMAX] = 2, - [SPECIES_SNORLAX_GMAX] = 3, - [SPECIES_GARBODOR_GMAX] = 0, - [SPECIES_MELMETAL_GMAX] = 0, - [SPECIES_RILLABOOM_GMAX] = 1, - [SPECIES_CINDERACE_GMAX] = 0, - [SPECIES_INTELEON_GMAX] = 0, - [SPECIES_CORVIKNIGHT_GMAX] = 0, - [SPECIES_ORBEETLE_GMAX] = 0, - [SPECIES_DREDNAW_GMAX] = 0, - [SPECIES_COALOSSAL_GMAX] = 0, - [SPECIES_FLAPPLE_GMAX] = 1, - [SPECIES_APPLETUN_GMAX] = 1, - [SPECIES_SANDACONDA_GMAX] = 1, - [SPECIES_TOXTRICITY_GMAX] = 0, - [SPECIES_CENTISKORCH_GMAX] = 0, - [SPECIES_HATTERENE_GMAX] = 0, - [SPECIES_GRIMMSNARL_GMAX] = 0, - [SPECIES_ALCREMIE_GMAX] = 1, - [SPECIES_COPPERAJAH_GMAX] = 0, - [SPECIES_DURALUDON_GMAX] = 0, - [SPECIES_URSHIFU_GMAX] = 0, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = 0, + [SPECIES_VENUSAUR_GIGANTAMAX] = 0, + [SPECIES_CHARIZARD_GIGANTAMAX] = 0, + [SPECIES_BLASTOISE_GIGANTAMAX] = 0, + [SPECIES_BUTTERFREE_GIGANTAMAX] = 0, + [SPECIES_PIKACHU_GIGANTAMAX] = 2, + [SPECIES_MEOWTH_GIGANTAMAX] = 1, + [SPECIES_MACHAMP_GIGANTAMAX] = 0, + [SPECIES_GENGAR_GIGANTAMAX] = 2, + [SPECIES_KINGLER_GIGANTAMAX] = 0, + [SPECIES_LAPRAS_GIGANTAMAX] = 2, + [SPECIES_EEVEE_GIGANTAMAX] = 2, + [SPECIES_SNORLAX_GIGANTAMAX] = 3, + [SPECIES_GARBODOR_GIGANTAMAX] = 0, + [SPECIES_MELMETAL_GIGANTAMAX] = 0, + [SPECIES_RILLABOOM_GIGANTAMAX] = 1, + [SPECIES_CINDERACE_GIGANTAMAX] = 0, + [SPECIES_INTELEON_GIGANTAMAX] = 0, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = 0, + [SPECIES_ORBEETLE_GIGANTAMAX] = 0, + [SPECIES_DREDNAW_GIGANTAMAX] = 0, + [SPECIES_COALOSSAL_GIGANTAMAX] = 0, + [SPECIES_FLAPPLE_GIGANTAMAX] = 1, + [SPECIES_APPLETUN_GIGANTAMAX] = 1, + [SPECIES_SANDACONDA_GIGANTAMAX] = 1, + [SPECIES_TOXTRICITY_GIGANTAMAX] = 0, + [SPECIES_CENTISKORCH_GIGANTAMAX] = 0, + [SPECIES_HATTERENE_GIGANTAMAX] = 0, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = 0, + [SPECIES_ALCREMIE_GIGANTAMAX] = 1, + [SPECIES_COPPERAJAH_GIGANTAMAX] = 0, + [SPECIES_DURALUDON_GIGANTAMAX] = 0, + [SPECIES_URSHIFU_GIGANTAMAX] = 0, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = 0, #endif [SPECIES_EGG] = 1, }; diff --git a/test/dynamax.c b/test/dynamax.c index cdbc17ec97..db7176a550 100644 --- a/test/dynamax.c +++ b/test/dynamax.c @@ -457,7 +457,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Pokemon with Gigantamax forms change upon Dynamaxi } WHEN { TURN { MOVE(player, MOVE_TACKLE, dynamax: TRUE); } } THEN { - EXPECT_EQ(player->species, SPECIES_VENUSAUR_GMAX); + EXPECT_EQ(player->species, SPECIES_VENUSAUR_GIGANTAMAX); } }