diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 5f38029a5d..55e4cc3517 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -5128,7 +5128,7 @@ BattleScript_EffectBatonPass::
 	goto BattleScript_MoveEnd
 
 BattleScript_EffectRapidSpin::
-.if B_SPEED_BUFFING_RAPID_SPIN == GEN_8
+.if B_SPEED_BUFFING_RAPID_SPIN >= GEN_8
 	attackcanceler
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
 	attackstring
diff --git a/src/data/items.h b/src/data/items.h
index 802cd325da..5e15b27344 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -6,7 +6,7 @@
     #define EVO_HELD_ITEM_FIELD_FUNC ItemUseOutOfBattle_CannotUse
 #endif
 
-#if I_GEM_BOOST_POWER >= GEN_5
+#if I_GEM_BOOST_POWER >= GEN_6
     #define GEM_BOOST_PARAM 30
 #else
     #define GEM_BOOST_PARAM 50