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

..

ability_shield.c

Fix mycelium might and ability shield (#4740)

2024-06-08 07:27:44 +02:00

air_balloon.c

Renamed "MoveHasMoveEffect" functions

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

attack_up.c

Move data unification (#3999)

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

berserk_gene.c

Move data unification (#3999)

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

clear_amulet.c

Review feedback

2024-06-08 20:47:19 -04:00

critical_hit_up.c

Move data unification (#3999)

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

cure_status.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-19 09:20:05 -04:00

custap_berry.c

Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)

2024-01-26 15:25:52 -03:00

defense_up.c

Move data unification (#3999)

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

eject_button.c

Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)

2024-01-26 15:25:52 -03:00

eject_pack.c

Add switching message macros for tests (#4717)

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

enigma_berry.c

Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)

2024-01-26 15:25:52 -03:00

gems.c

Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)

2024-01-26 15:25:52 -03:00

jaboca_berry.c

Move data unification (#3999)

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

kee_berry.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-08 12:19:51 -03:00

leftovers.c

Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)

2024-01-26 15:25:52 -03:00

maranga_berry.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-08 12:19:51 -03:00

metronome.c

Move data unification (#3999)

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

micle_berry.c

Move data unification (#3999)

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

mirror_herb.c

Fixes to Opportunist and Mirror Herb adjustments (#4928)

2024-07-19 11:01:46 +02:00

protective_pads.c

Fixes Protective Pads Fluffy interaction (#4340)

2024-04-04 14:48:57 +02:00

quick_claw.c

Speed Ignoring effect fixes (#4613)

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

random_stat_up.c

Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)

2024-01-26 15:25:52 -03:00

red_card.c

Add switching message macros for tests (#4717)

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

restore_stats.c

Small Battle Test reorganization (#4504)

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

rowap_berry.c

Move data unification (#3999)

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

safety_goggles.c

Enable GF item names by default

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

special_attack_up.c

Move data unification (#3999)

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

special_defense_up.c

Move data unification (#3999)

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

speed_up.c

Move data unification (#3999)

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

utility_umbrella.c

Move data unification (#3999)

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