fix sticky hold softlock (#4885)

rh-hideout · Jun 29, 2024 · 75be596 · 75be596
1 parent 26ef19d
commit 75be596
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
@@ -8573,7 +8573,7 @@ BattleScript_SynchronizeActivates::
 	return
 
 BattleScript_NoItemSteal::
-	pause B_WAIT_TIME_SHORT
+	call BattleScript_AbilityPopUpTarget
 	printstring STRINGID_PKMNSXMADEYINEFFECTIVE
 	waitmessage B_WAIT_TIME_LONG
 	return

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
@@ -3454,7 +3454,7 @@ void SetMoveEffect(bool32 primary, bool32 certain)
                     }
                     else if (GetBattlerAbility(gBattlerTarget) == ABILITY_STICKY_HOLD)
                     {
-                        BattleScriptPushCursor();
+                        BattleScriptPush(gBattlescriptCurrInstr + 1);
                         gBattlescriptCurrInstr = BattleScript_NoItemSteal;
 
                         gLastUsedAbility = gBattleMons[gBattlerTarget].ability;

diff --git a/test/battle/ability/sticky_hold.c b/test/battle/ability/sticky_hold.c
@@ -0,0 +1,18 @@
+#include "global.h"
+#include "test/battle.h"
+
+SINGLE_BATTLE_TEST("Sticky Hold prevents item theft")
+{
+    GIVEN {
+        ASSUME(MoveHasAdditionalEffect(MOVE_THIEF, MOVE_EFFECT_STEAL_ITEM));
+        PLAYER(SPECIES_URSALUNA) { Item(ITEM_NONE); }
+        OPPONENT(SPECIES_GASTRODON) { Ability(ABILITY_STICKY_HOLD); Item(ITEM_LIFE_ORB); }
+    } WHEN {
+        TURN { MOVE(player, MOVE_THIEF); }
+    } SCENE {
+        MESSAGE("Ursaluna used Thief!");
+        ABILITY_POPUP(opponent, ABILITY_STICKY_HOLD);
+        MESSAGE("Foe Gastrodon's Sticky Hold made Thief ineffective!");
+    }
+}
+