Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix form change table pointer defines #3692

Merged
merged 1 commit into from
Dec 11, 2023
+21 −9
Merged

Fix form change table pointer defines #3692

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix form change table pointer defines
  • Loading branch information
@Bassoonian
Bassoonian committed Dec 11, 2023
commit 1c6d551eeb515363854ba5c05ba975051747939d
30 changes: 21 additions & 9 deletions src/data/pokemon/form_change_table_pointers.h
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
const struct Fusion *const gFusionTablePointers[NUM_SPECIES] =
{
#if P_GEN_5_POKEMON == TRUE
#if P_FAMILY_KYUREM
[SPECIES_KYUREM] = sKyuremFusionTable,
[SPECIES_KYUREM_BLACK] = sKyuremFusionTable,
#if P_FAMILY_RESHIRAM
[SPECIES_KYUREM_WHITE] = sKyuremFusionTable,
[SPECIES_RESHIRAM] = sKyuremFusionTable,
#endif //P_FAMILY_RESHIRAM
#if P_FAMILY_ZEKROM
[SPECIES_KYUREM_BLACK] = sKyuremFusionTable,
[SPECIES_ZEKROM] = sKyuremFusionTable,
#endif
#if P_GEN_7_POKEMON == TRUE
#endif //P_FAMILY_ZEKROM
#endif //P_FAMILY_KYUREM
#if P_FAMILY_NECROZMA
[SPECIES_NECROZMA] = sNecrozmaFusionTable,
#if P_FAMILY_SOLGALEO
[SPECIES_NECROZMA_DAWN_WINGS] = sNecrozmaFusionTable,
[SPECIES_NECROZMA_DUSK_MANE] = sNecrozmaFusionTable,
[SPECIES_SOLGALEO] = sNecrozmaFusionTable,
#endif //P_FAMILY_SOLGALEO
#if P_FAMILY_LUNALA
Comment on lines +19 to +20
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should be P_FAMILY_COSMOG. As they are, they're disabled since there's no Solgaleo/Lunala toggles.

[SPECIES_NECROZMA_DUSK_MANE] = sNecrozmaFusionTable,
[SPECIES_LUNALA] = sNecrozmaFusionTable,
#endif
#if P_GEN_8_POKEMON == TRUE
#endif //P_FAMILY_LUNALA
#endif //P_FAMILY_NECROZMA
#if P_FAMILY_CALYREX
[SPECIES_CALYREX] = sCalyrexFusionTable,
[SPECIES_CALYREX_ICE_RIDER] = sCalyrexFusionTable,
#if P_FAMILY_SPECTRIER
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexFusionTable,
[SPECIES_SPECTRIER] = sCalyrexFusionTable,
#endif //P_FAMILY_SPECTRIER
#if P_FAMILY_GLASTRIER
[SPECIES_CALYREX_ICE_RIDER] = sCalyrexFusionTable,
[SPECIES_GLASTRIER] = sCalyrexFusionTable,
#endif
#endif //P_FAMILY_GLASTRIER
#endif //P_FAMILY_CALYREX
};