Eduardo Quezada 80b193280d Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_main.c # src/data/item_icon_table.h # src/data/pokemon/species_info/gen_9_families.h		2024-05-27 10:13:42 -04:00
..
battle_frontier	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
asm.inc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
battle_anim_script.inc	Replace launchtemplate and launchtask in battle anims (#2640)	2023-05-27 17:32:53 -04:00
battle_script.inc	Merge branch '_RHH/master' into _RHH/upcoming	2024-05-27 10:13:42 -04:00
battle_tent.inc	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
contest_ai_script.inc	Document contest AI scripts	2020-08-21 14:57:17 -04:00
event.inc	checkteratype setteratype (#4460)	2024-04-30 00:12:34 +02:00
field_effect_script.inc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
function.inc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
m4a.inc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
map.inc	Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)	2024-01-14 21:35:45 +01:00
movement.inc	Port pokefirered's Vs. Seeker to pokeemerald (#3256)	2023-11-26 18:58:43 +01:00
music_voice.inc	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
trainer_hill.inc	Clean up some trainer hill	2022-03-31 12:54:07 -04:00