Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
fakuzatsu
0625c90277
fix tests when B_USE_FROSTBITE is TRUE ( #4986 )
2024-07-17 23:23:52 +02:00
Eduardo Quezada
fb708b7ed3
Merge branch '_RHH/master' into _RHH/upcoming
2024-07-10 10:05:10 -04:00
Eduardo Quezada
de609a2f5b
Added missing redirect abilities Gen 3-4 config ( #4920 )
...
* Added missing redirect abilities Gen 3-4 config
* Combined 3 Battle Script Natives into 1
* Cleaner FindMonThatAbsorbsOpponentsMove
2024-07-07 09:52:59 +02:00
Eduardo Quezada
8b09ef09fa
Merge branch '_RHH/master' into _RHH/upcoming
2024-06-07 12:25:08 -04:00
sneed
7fd0239370
Rampage moves always confuse on final turn ( #4722 )
...
* rampage moves confuse on the final turn
* fix B_RAMPAGE_CANCELLING < GEN_5
* Remove pointless assumes
2024-06-05 05:38:04 +02:00
sneed
87e2526665
Add switching message macros for tests ( #4717 )
...
* Add switching message macros
* Add test
2024-06-03 19:59:28 -04:00
sneed
a8bb82778a
Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN ( #4557 )
2024-05-12 15:07:43 +02:00
Eduardo Quezada
1ceae6e100
Merge branch '_RHH/master' into _RHH/upcoming
2024-05-06 15:29:21 -04:00
Eduardo Quezada
5ec08ee98c
Small Battle Test reorganization ( #4504 )
...
* Fixed test folders + Chud Chew test name fixes
* Adjusted file names + merged Burn Up and Double Shock files
* Added Spit Up/Swallow files that point to Stockpile's file
* Multiple changes (see description)
- Moved secondary effect files to their own folder.
- Split hit_set_entry_hazards.c to separate files for Spikes/Stealth Rock.
- Grouped Hex/Venoshock to the same file
2024-05-06 09:36:52 +02:00
