Eduardo Quezada 3d9c7732f6 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # include/event_object_movement.h # src/data.c # src/data/graphics/pokemon.h # src/data/pokemon/species_info/gen_4_families.h		2024-04-20 13:23:14 -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	Fixes Gulp Missile Dive / Power Herb interaction (#4371)	2024-04-09 10:32:11 +02: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	Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-03-17 23:41:23 -03: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	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-01-17 18:11:35 -03:00
movement.inc	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-01-17 18:11:35 -03: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