Eduardo Quezada fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	src/battle_util.c
#	src/data/pokemon/species_info/gen_7_families.h
#	test/battle/ability/download.c
#	test/battle/ability/intimidate.c
#	test/battle/ability/supreme_overlord.c
#	test/battle/ability/zero_to_hero.c
#	test/battle/ai/ai.c
#	test/battle/move_effect/plasma_fists.c

2024-07-05 14:25:25 -04:00

..

anger_point.c

Tests for Anger Point and Moxie (#4811)

2024-06-16 15:02:44 +02:00

anger_shell.c

Fix Berserk, Angel Shell, Wimp Out, Emergency Exit HP threshold (#4724)

2024-06-07 21:54:25 +02:00

armor_tail.c

#4635 follow up. Missing test comments (#4647)

2024-05-29 09:56:59 +02:00

ate_abilities.c

Gimmick Refactor (#4449)

2024-06-22 22:25:40 +02:00

bad_dreams.c

Species Simplifier™ - Part 3 (#3562)

2023-12-08 15:05:10 +01:00

battle_bond.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

beads_of_ruin.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00

beast_boost.c

Species Simplifier™ - Part 3 (#3562)

2023-12-08 15:05:10 +01:00

berserk.c

Fix Berserk, Angel Shell, Wimp Out, Emergency Exit HP threshold (#4724)

2024-06-07 21:54:25 +02:00

blaze.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

booster_energy.c

Change Battle Frontier validation to species flag (#4341)

2024-05-03 13:32:06 -04:00

clear_body.c

Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun

2024-06-18 15:27:06 +02:00

cloud_nine.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

color_change.c

Fixed incoming master test messages

2024-05-02 14:27:58 -04:00

comatose.c

Fix comatose transform gastro acid interaction (#4852)

2024-06-21 12:19:43 +02:00

compound_eyes.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

contrary.c

Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN (#4557)

2024-05-12 15:07:43 +02:00

corrosion.c

Tests for Corrosion, Acrobatics, Hone Claws, Hurricane (#4708)

2024-06-20 13:46:01 +02:00

costar.c

Add tests to complement PR4500 (#4511)

2024-05-06 19:59:37 +02:00

cotton_down.c

Fixes Cutton Down / Defiant interaction (#3657)

2023-12-08 17:29:29 +01:00

cud_chew.c

Small Battle Test reorganization (#4504)

2024-05-06 09:36:52 +02:00

cursed_body.c

Confusion, cursed body and poison touch trigger chance fixes and tests (#4831)

2024-06-18 20:07:40 +02:00

cute_charm.c

Add RandomChance macro and ability trigger chance config (#4829)

2024-06-18 20:13:44 +02:00

damp.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

dancer.c

Fixes Dancer triggering if the move's user didn't act (#4638)

2024-05-27 17:07:13 +02:00

dauntless_shield.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

dazzling.c

Small Ability Effect Move Block refactor (#4635)

2024-05-28 10:34:05 +02:00

defeatist.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

defiant.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

desolate_land.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

disguise.c

Disguise fixes + gen8 hp loss config (#4360)

2024-04-07 00:07:55 +02:00

download.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00

dragons_maw.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

drizzle.c

Organized tests into subfolders (#2822)

2023-08-12 20:00:15 +01:00

dry_skin.c

Fixes to strings + Hospitality (#4147)

2024-02-07 01:18:35 +01:00

earth_eater.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

effect_spore.c

Add RandomChance macro and ability trigger chance config (#4829)

2024-06-18 20:13:44 +02:00

electromorphosis.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

embody_aspect.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

emergency_exit.c

Fixes test description + small fix follow up (#4100)

2024-01-31 09:33:04 -03:00

flame_body.c

Add RandomChance macro and ability trigger chance config (#4829)

2024-06-18 20:13:44 +02:00

flower_gift.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

fluffy.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

forecast.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

frisk.c

Minor cleanup of Frisk test (#4441)

2024-04-25 10:11:01 +02:00

full_metal_body.c

Tests point to clear_body.c (#4837)

2024-06-20 00:38:56 +02:00

gale_wings.c

Gale Wings test (#4694)

2024-06-02 19:16:00 +02:00

good_as_gold.c

Small Ability Effect Move Block refactor (#4635)

2024-05-28 10:34:05 +02:00

gulp_missile.c

Gulp missile not triggering on faint fix and added form change type (#4502)

2024-05-07 06:44:17 -04:00

harvest.c

More weather and type-specific tests (#3260)

2023-10-14 22:58:31 -03:00

hospitality.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

hunger_switch.c

Species Simplifier™ - Part 3 (#3562)

2023-12-08 15:05:10 +01:00

hydration.c

Organized tests into subfolders (#2822)

2023-08-12 20:00:15 +01:00

hyper_cutter.c

Renamed "MoveHasMoveEffect" functions

2024-02-26 14:21:38 +09:00

ice_body.c

Organized tests into subfolders (#2822)

2023-08-12 20:00:15 +01:00

ice_scales.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

immunity.c

Renamed "MoveHasMoveEffect" functions

2024-02-26 14:21:38 +09:00

innards_out.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

inner_focus.c

intim changes

2023-10-18 22:14:49 +02:00

insomnia.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

intimidate.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00

intrepid_sword.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

keen_eye.c

Renamed "MoveHasMoveEffect" functions

2024-02-26 14:21:38 +09:00

leaf_guard.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

limber.c

Detect 'NOT x; NOT y;' (#3459)

2023-10-24 09:55:32 +02:00

lingering_aroma.c

FIx mummy and lingering aroma abilities (#4731)

2024-06-07 11:46:07 +02:00

magic_bounce.c

Fixes Magic Bounce in double battles (#4464)

2024-05-02 14:23:46 +02:00

magic_guard.c

Add check for Magic Guard to avoid taking recoil damage (#4578)

2024-05-15 15:40:40 +02:00

magician.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

minds_eye.c

Tests for Corrosion, Acrobatics, Hone Claws, Hurricane (#4708)

2024-06-20 13:46:01 +02:00

mirror_armor.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

moxie.c

Tests for Anger Point and Moxie (#4811)

2024-06-16 15:02:44 +02:00

mummy.c

FIx mummy and lingering aroma abilities (#4731)

2024-06-07 11:46:07 +02:00

mycelium_might.c

Speed Ignoring effect fixes (#4613)

2024-05-24 11:21:35 +02:00

neuroforce.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

oblivious.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

opportunist.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-10 17:53:32 -03:00

overcoat.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

overgrow.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

own_tempo.c

Remove Duplicate ai code from battle_ai_util.c (#4883)

2024-07-03 10:48:31 +02:00

parental_bond.c

Gimmick Refactor (#4449)

2024-06-22 22:25:40 +02:00

pastel_veil.c

Renamed "MoveHasMoveEffect" functions

2024-02-26 14:21:38 +09:00

poison_heal.c

Incorporate requested changes

2023-10-11 16:11:46 +02:00

poison_point.c

Add RandomChance macro and ability trigger chance config (#4829)

2024-06-18 20:13:44 +02:00

poison_puppeteer.c

Adds Ability Poison Puppeteer (#4416)

2024-04-20 22:23:20 +02:00

poison_touch.c

Confusion, cursed body and poison touch trigger chance fixes and tests (#4831)

2024-06-18 20:07:40 +02:00

prankster.c

Gimmick Refactor (#4449)

2024-06-22 22:25:40 +02:00

pressure.c

Add new move flags and update all flags for every move (#3425)

2023-10-19 20:16:37 -03:00

primordial_sea.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

protean.c

Gen 9 configs for Protean/Libero, Intrepid Sword and Dauntless Sword (#3614)

2023-12-12 00:08:44 +01:00

protosynthesis.c

Expanded species names

2024-04-25 18:40:37 +01:00

purifying_salt.c

Renamed "MoveHasMoveEffect" functions

2024-02-26 14:21:38 +09:00

quark_drive.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

queenly_majesty.c

#4635 follow up. Missing test comments (#4647)

2024-05-29 09:56:59 +02:00

quick_draw.c

Fixes Quick Draw (#3724)

2023-12-15 00:03:59 +01:00

rain_dish.c

Organized tests into subfolders (#2822)

2023-08-12 20:00:15 +01:00

rattled.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

rivalry.c

Fixed Rivalry's effect + Tests (#3381)

2023-10-09 12:14:18 +02:00

rocky_payload.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

sand_veil.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

sap_sipper.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

schooling.c

Species Simplifier™ - Part 3 (#3562)

2023-12-08 15:05:10 +01:00

scrappy.c

intim changes

2023-10-18 22:14:49 +02:00

seed_sower.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

sharpness.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

shed_skin.c

Add RandomChance macro and ability trigger chance config (#4829)

2024-06-18 20:13:44 +02:00

sheer_force.c

Merged from upcoming

2024-02-09 23:00:36 +09:00

shield_dust.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-27 10:13:42 -04:00

shields_down.c

Fixes Minior form change and likely other forms (#3822)

2023-12-25 20:18:52 +01:00

snow_cloak.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

snow_warning.c

Organized tests into subfolders (#2822)

2023-08-12 20:00:15 +01:00

speed_boost.c

Organized tests into subfolders (#2822)

2023-08-12 20:00:15 +01:00

stamina.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

static.c

Add RandomChance macro and ability trigger chance config (#4829)

2024-06-18 20:13:44 +02:00

steelworker.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

stench.c

Renamed "MoveHasMoveEffect" functions

2024-02-26 14:21:38 +09:00

sticky_hold.c

fix sticky hold softlock (#4885)

2024-06-29 18:54:58 +02:00

sturdy.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

supersweet_syrup.c

Intimidate and Super Sweet Sugar prints the right message and doesn't play animation when already at -6 (#4406)

2024-04-21 14:10:14 +02:00

supreme_overlord.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00

swarm.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

switch_in_abilities.c

Fix how switch-in effects are played out after multiple faints in the same turn (#4864)

2024-06-24 20:37:47 +02:00

sword_of_ruin.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00

tablets_of_ruin.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00

tangling_hair.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-26 11:52:55 -03:00

tera_shell.c

Add abilities Tera Shift, Tera Shell, and Teraform Zero (#4418)

2024-04-27 19:52:31 +02:00

tera_shift.c

Add abilities Tera Shift, Tera Shell, and Teraform Zero (#4418)

2024-04-27 19:52:31 +02:00

torrent.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

toxic_chain.c

Try fixing toxic_chain.c file (#4843)

2024-06-20 21:49:35 +02:00

toxic_debris.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

trace.c

Species Simplifier™ - Part 3 (#3562)

2023-12-08 15:05:10 +01:00

transistor.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

vessel_of_ruin.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00

volt_absorb.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

water_absorb.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

weak_armor.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

white_smoke.c

Tests point to clear_body.c (#4837)

2024-06-20 00:38:56 +02:00

wind_power.c

Enable GF move names by default

2024-04-25 18:40:37 +01:00

zen_mode.c

Species Simplifier™ - Part 3 (#3562)

2023-12-08 15:05:10 +01:00

zero_to_hero.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00