diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 7e1bbd33d9..83506a3615 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -8,6 +8,7 @@
 #include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/game_stat.h"
+#include "constants/battle_config.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/battle_script.inc"
 	.include "constants/constants.inc"
@@ -3823,6 +3824,7 @@ BattleScript_EffectBatonPass::
 	goto BattleScript_MoveEnd
 
 BattleScript_EffectRapidSpin::
+.if B_SPEED_BUFFING_RAPID_SPIN == GEN_8
 	attackcanceler
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
 	attackstring
@@ -3854,6 +3856,10 @@ BattleScript_EffectRapidSpinEnd::
 	tryfaintmon BS_TARGET, FALSE, NULL
 	moveendall
 	end
+.else
+	setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
+.endif
+	goto BattleScript_EffectHit
 
 BattleScript_EffectSonicboom::
 	attackcanceler
diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h
index 73f528b2d9..b90606bdd6 100644
--- a/include/constants/battle_config.h
+++ b/include/constants/battle_config.h
@@ -82,6 +82,7 @@
 #define B_DISABLE_TURNS             GEN_6 // Disable's turns. See Cmd_disablelastusedattack.
 #define B_INCINERATE_GEMS           GEN_6 // In Gen6+, Incinerate can destroy Gems.
 #define B_MINIMIZE_DMG_ACC          GEN_6 // In Gen6+, moves that causes double damage to minimized Pokémon will also skip accuracy checks.
+#define B_SPEED_BUFFING_RAPID_SPIN  GEN_3 // In Gen8, Rapid Spin raises the user's Speed by 1 stage.
 
 // Ability settings
 #define B_ABILITY_POP_UP            GEN_6 // In Gen5+, the Pokémon abilities are displayed in a pop-up, when they activate in battle.