From be4ce5901fa7b53a1a169715f20eb56257950181 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 5 Nov 2025 14:48:53 +0100 Subject: [PATCH] Fix Kyurem typo in swap move tables (#8139) --- include/pokemon.h | 4 ++-- src/data/pokemon/form_change_table_pointers.h | 4 ++-- src/party_menu.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index 296713e59d..8852ba3c97 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -654,10 +654,10 @@ extern const struct Fusion *const gFusionTablePointers[NUM_SPECIES]; #if P_FUSION_FORMS #if P_FAMILY_KYUREM #if P_FAMILY_RESHIRAM -extern const u16 gKyurenWhiteSwapMoveTable[][2]; +extern const u16 gKyuremWhiteSwapMoveTable[][2]; #endif //P_FAMILY_RESHIRAM #if P_FAMILY_ZEKROM -extern const u16 gKyurenBlackSwapMoveTable[][2]; +extern const u16 gKyuremBlackSwapMoveTable[][2]; #endif //P_FAMILY_ZEKROM #endif //P_FAMILY_KYUREM #endif //P_FUSION_FORMS diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index ad2e6a040d..1af386a897 100644 --- a/src/data/pokemon/form_change_table_pointers.h +++ b/src/data/pokemon/form_change_table_pointers.h @@ -38,14 +38,14 @@ const struct Fusion *const gFusionTablePointers[NUM_SPECIES] = #if P_FUSION_FORMS #if P_FAMILY_KYUREM #if P_FAMILY_RESHIRAM -const u16 gKyurenWhiteSwapMoveTable[][2] = +const u16 gKyuremWhiteSwapMoveTable[][2] = { {MOVE_SCARY_FACE, MOVE_FUSION_FLARE}, {MOVE_GLACIATE, MOVE_ICE_BURN}, }; #endif //P_FAMILY_RESHIRAM #if P_FAMILY_ZEKROM -const u16 gKyurenBlackSwapMoveTable[][2] = +const u16 gKyuremBlackSwapMoveTable[][2] = { {MOVE_SCARY_FACE, MOVE_FUSION_BOLT}, {MOVE_GLACIATE, MOVE_FREEZE_SHOCK}, diff --git a/src/party_menu.c b/src/party_menu.c index 891066dd41..04b2233102 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -6431,11 +6431,11 @@ static void Task_TryItemUseFusionChange(u8 taskId) #if P_FAMILY_KYUREM #if P_FAMILY_RESHIRAM if (gTasks[taskId].tExtraMoveHandling == SWAP_EXTRA_MOVES_KYUREM_WHITE) - SwapFusionMonMoves(mon, gKyurenWhiteSwapMoveTable, FUSE_MON); + SwapFusionMonMoves(mon, gKyuremWhiteSwapMoveTable, FUSE_MON); #endif //P_FAMILY_RESHIRAM #if P_FAMILY_ZEKROM if (gTasks[taskId].tExtraMoveHandling == SWAP_EXTRA_MOVES_KYUREM_BLACK) - SwapFusionMonMoves(mon, gKyurenBlackSwapMoveTable, FUSE_MON); + SwapFusionMonMoves(mon, gKyuremBlackSwapMoveTable, FUSE_MON); #endif //P_FAMILY_ZEKROM #endif //P_FAMILY_KYUREM if (gTasks[taskId].moveToLearn != 0) @@ -6446,11 +6446,11 @@ static void Task_TryItemUseFusionChange(u8 taskId) #if P_FAMILY_KYUREM #if P_FAMILY_RESHIRAM if (gTasks[taskId].tExtraMoveHandling == SWAP_EXTRA_MOVES_KYUREM_WHITE) - SwapFusionMonMoves(mon, gKyurenWhiteSwapMoveTable, UNFUSE_MON); + SwapFusionMonMoves(mon, gKyuremWhiteSwapMoveTable, UNFUSE_MON); #endif //P_FAMILY_RESHIRAM #if P_FAMILY_ZEKROM if (gTasks[taskId].tExtraMoveHandling == SWAP_EXTRA_MOVES_KYUREM_BLACK) - SwapFusionMonMoves(mon, gKyurenBlackSwapMoveTable, UNFUSE_MON); + SwapFusionMonMoves(mon, gKyuremBlackSwapMoveTable, UNFUSE_MON); #endif //P_FAMILY_ZEKROM #endif //P_FAMILY_KYUREM if ( gTasks[taskId].tExtraMoveHandling == FORGET_EXTRA_MOVES)