rh-hideout · AsparagusEduardo · Jan 11, 2024 · Nov 18, 2023 · Nov 18, 2023 · Nov 20, 2023
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
@@ -55,7 +55,7 @@ gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectOHKO                    @ EFFECT_OHKO
 	.4byte BattleScript_EffectHit                     @ EFFECT_FUSION_COMBO
 	.4byte BattleScript_EffectSuperFang               @ EFFECT_SUPER_FANG
-	.4byte BattleScript_EffectArgFixedDamage          @ EFFECT_ARG_FIXED_DAMAGE
+	.4byte BattleScript_EffectFixedDamageArg          @ EFFECT_FIXED_DAMAGE_ARG
 	.4byte BattleScript_EffectHealBlock               @ EFFECT_HEAL_BLOCK
 	.4byte BattleScript_EffectRecoilIfMiss            @ EFFECT_RECOIL_IF_MISS
 	.4byte BattleScript_EffectMist                    @ EFFECT_MIST
@@ -1430,17 +1430,20 @@ BattleScript_FailIfNotArgType:
 	goto BattleScript_HitFromCritCalc
 
 BattleScript_RemoveFireType::
-	losetype BS_ATTACKER, TYPE_FIRE
 	printstring STRINGID_ATTACKERLOSTFIRETYPE
 	waitmessage B_WAIT_TIME_LONG
 	return
 
 BattleScript_RemoveElectricType::
-	losetype BS_ATTACKER, TYPE_ELECTRIC
 	printstring STRINGID_ATTACKERLOSTELECTRICTYPE
 	waitmessage B_WAIT_TIME_LONG
 	return
 
+BattleScript_RemoveGenericType::
+	printstring STRINGID_ATTACKERLOSTITSTYPE
+	waitmessage B_WAIT_TIME_LONG
+	return
+
 BattleScript_DefDown::
 	modifybattlerstatstage BS_TARGET, STAT_DEF, DECREASE, 1, BattleScript_DefDown_Ret, ANIM_ON
 BattleScript_DefDown_Ret:
@@ -4816,7 +4819,7 @@ BattleScript_EffectBatonPass::
 	switchineffects BS_ATTACKER
 	goto BattleScript_MoveEnd
 
-BattleScript_EffectArgFixedDamage::
+BattleScript_EffectFixedDamageArg::
 	attackcanceler
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
 	attackstring

diff --git a/include/battle_ai_util.h b/include/battle_ai_util.h
@@ -190,5 +190,9 @@ void IncreaseConfusionScore(u32 battlerAtk, u32 battlerDef, u32 move, s32 *score
 void IncreaseFrostbiteScore(u32 battlerAtk, u32 battlerDef, u32 move, s32 *score);
 
 s32 AI_CalcPartyMonDamage(u32 move, u32 battlerAtk, u32 battlerDef, struct BattlePokemon switchinCandidate, bool8 isPartyMonAttacker);
+s32 AI_CheckMoveEffects(u32 battlerAtk, u32 battlerDef, u32 move, s32 score, struct AiLogicData *aiData, u32 predictedMove, bool32 isDoubleBattle);
+s32 AI_TryToClearStats(u32 battlerAtk, u32 battlerDef, bool32 isDoubleBattle);
+bool32 AI_ShouldCopyStatChanges(u32 battlerAtk, u32 battlerDef);
+s32 AI_ShouldSetUpHazards(u32 battlerAtk, u32 battlerDef, struct AiLogicData *aiData);
 
 #endif //GUARD_BATTLE_AI_UTIL_H
diff --git a/include/battle_scripts.h b/include/battle_scripts.h
@@ -523,6 +523,7 @@ extern const u8 BattleScript_EffectRaiseCritAlliesAnim[];
 extern const u8 BattleScript_EffectHealOneSixthAllies[];
 extern const u8 BattleScript_EffectCureStatusAllies[];
 extern const u8 BattleScript_EffectRecycleBerriesAllies[];
+extern const u8 BattleScript_RemoveGenericType[];
 
 // dynamax and max raids
 extern const u8 BattleScript_DynamaxBegins[];

diff --git a/include/battle_util.h b/include/battle_util.h
@@ -247,5 +247,6 @@ bool32 MoveEffectIsGuaranteed(u32 battler, u32 battlerAbility, const struct Addi
 u8 GetBattlerType(u32 battler, u8 typeIndex);
 bool8 CanMonParticipateInSkyBattle(struct Pokemon *mon);
 bool8 IsMonBannedFromSkyBattles(u16 species);
+void RemoveBattlerType(u32 battler, u8 type);
 
 #endif // GUARD_BATTLE_UTIL_H
diff --git a/include/config/battle.h b/include/config/battle.h
@@ -197,7 +197,7 @@
 #define B_THUNDERSTORM_TERRAIN      TRUE       // If TRUE, overworld Thunderstorm generates Rain and Electric Terrain as in Gen 8.
 #define B_FOG_TERRAIN               TRUE       // If TRUE, overworld Fog generates Misty Terrain as in Gen 8.
 #define B_TERRAIN_TYPE_BOOST        GEN_LATEST // In Gen8, damage is boosted by 30% instead of 50%.
-#define B_SECRET_POWER_EFFECT       GEN_LATEST // Secret Power's effects change depending on terrain and generation. See MOVE_EFFECT_SECRET_POWER.
+#define B_SECRET_POWER_EFFECT       GEN_LATEST // Secret Power's effects change depending on terrain and generation. See MOVE_EFFECT_SECRET_POWER's case in `SetMoveEffect`.
 #define B_SECRET_POWER_ANIMATION    GEN_LATEST // Secret Power's animations change depending on terrain and generation.
 #define B_NATURE_POWER_MOVES        GEN_LATEST // Nature Power calls different moves depending on terrain and generation. See sNaturePowerMoves.
 #define B_CAMOUFLAGE_TYPES          GEN_LATEST // Camouflage changes the user to different types depending on terrain and generation. See sTerrainToType.

diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h
@@ -34,7 +34,7 @@
 #define EFFECT_OHKO                         30
 #define EFFECT_FUSION_COMBO                 31
 #define EFFECT_SUPER_FANG                   32
-#define EFFECT_ARG_FIXED_DAMAGE             33
+#define EFFECT_FIXED_DAMAGE_ARG             33
 #define EFFECT_HEAL_BLOCK                   34
 #define EFFECT_RECOIL_IF_MISS               35
 #define EFFECT_MIST                         36

diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h
@@ -699,8 +699,9 @@
 #define STRINGID_HOSPITALITYRESTORATION               697
 #define STRINGID_ELECTROSHOCKCHARGING                 698
 #define STRINGID_ITEMWASUSEDUP                        699
+#define STRINGID_ATTACKERLOSTITSTYPE                  700
 
-#define BATTLESTRINGS_COUNT                           700
+#define BATTLESTRINGS_COUNT                           701
 
 // This is the string id that gBattleStringsTable starts with.
 // String ids before this (e.g. STRINGID_INTROMSG) are not in the table,

diff --git a/include/pokemon.h b/include/pokemon.h
@@ -451,8 +451,9 @@ struct BattleMove
     u16 accuracy:7;
     u16 recoil:7;
     u16 criticalHitStage:2;
+    u8 padding:6; // coming soon...
+    u8 numAdditionalEffects:2; // limited to 3 - don't want to get too crazy
     u8 pp;
-    u8 secondaryEffectChance;
 
     u16 target;
     s8 priority;
@@ -507,17 +508,15 @@ struct BattleMove
     u32 parentalBondBanned:1;
     u32 skyBattleBanned:1;
     u32 sketchBanned:1;
-    u32 numAdditionalEffects:2; // limited to 3 - don't want to get too crazy
 
-    u16 argument;
+    u32 argument; // also coming soon
 
     // primary/secondary effects
     const struct AdditionalEffect *additionalEffects;
 };
 
-#define ADDITIONAL_EFFECTS(...) EFFECTS_ARR( __VA_ARGS__ ), .numAdditionalEffects = ARRAY_COUNT(EFFECTS_ARR( __VA_ARGS__ ))
-
 #define EFFECTS_ARR(...) (const struct AdditionalEffect[]) {__VA_ARGS__}
+#define ADDITIONAL_EFFECTS(...) EFFECTS_ARR( __VA_ARGS__ ), .numAdditionalEffects = ARRAY_COUNT(EFFECTS_ARR( __VA_ARGS__ ))
 
 struct AdditionalEffect
 {