fix after prs

data/battle_ai_scripts.s

@@ -249,6 +249,7 @@ AI_CheckBadMove_CheckEffect: @ 82DC045
 	if_effect EFFECT_SHELL_SMASH, AI_CBM_ShellSmash
 	if_effect EFFECT_LAST_RESORT, AI_CBM_LastResort
 	if_effect EFFECT_BELCH, AI_CBM_Belch
+	if_effect EFFECT_DO_NOTHING, Score_Minus8
 	end
 	
 AI_CBM_Belch:
@@ -2078,7 +2079,7 @@ AI_CV_Encore_EncouragedMovesToEncore:
     .byte EFFECT_POISON
     .byte EFFECT_PARALYZE
     .byte EFFECT_LEECH_SEED
-    .byte EFFECT_SPLASH
+    .byte EFFECT_DO_NOTHING
     .byte EFFECT_ATTACK_UP_2
     .byte EFFECT_ENCORE
     .byte EFFECT_CONVERSION_2

src/battle_script_commands.c

@@ -2006,16 +2006,13 @@ void SetMoveEffect(bool32 primary, u32 certain)
         affectsUser = MOVE_EFFECT_AFFECTS_USER;
         gBattleScripting.battler = gBattlerTarget; // theoretically the attacker
     }
-    
-    // Just in case this flag is still set
-    if (gBattleScripting.moveEffect & MOVE_EFFECT_CERTAIN)
-        gBattleScripting.moveEffect &= ~(MOVE_EFFECT_CERTAIN);
-    
     else
     {
         gEffectBattler = gBattlerTarget;
         gBattleScripting.battler = gBattlerAttacker;
     }
+     // Just in case this flag is still set
+    gBattleScripting.moveEffect &= ~(MOVE_EFFECT_CERTAIN);
 
     if (GetBattlerAbility(gEffectBattler) == ABILITY_SHIELD_DUST && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
         && !primary && gBattleScripting.moveEffect <= 9)

src/data/text/abilities.h

@@ -438,7 +438,7 @@ const u8 gAbilityNames[ABILITIES_COUNT_GEN7][ABILITY_NAME_LENGTH + 1] =
     [ABILITY_POWER_CONSTRUCT] = _("Power Constr"),
     [ABILITY_CORROSION] = _("Corrosion"),
     [ABILITY_COMATOSE] = _("Comatose"),
-    [ABILITY_QUEENLY_MAJESTY] = _("Queenly Majesty"),
+    [ABILITY_QUEENLY_MAJESTY] = _("QueenMajesty"),
     [ABILITY_INNARDS_OUT] = _("Innards Out"),
     [ABILITY_DANCER] = _("Dancer"),
     [ABILITY_BATTERY] = _("Battery"),