Hedara 4873589c65 Merge remote-tracking branch 'pret/master' into new-pret-merge ... Conflicts: asm/macros/battle_script.inc data/battle_anim_scripts.s include/battle.h include/battle_controllers.h include/battle_setup.h include/constants/battle.h src/battle_anim_normal.c src/battle_anim_utility_funcs.c src/battle_bg.c src/battle_controllers.c src/battle_main.c src/battle_script_commands.c		2025-04-29 20:27:33 +02:00
..
battle_frontier	Trainer Battle Parameter Consolidation (#5982)	2025-01-25 22:02:39 +01: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	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-27 16:26:37 -04:00
battle_script.inc	Merge remote-tracking branch 'pret/master' into new-pret-merge	2025-04-29 20:27:33 +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	Fix incorrect point macros in contest_ai_script.inc	2024-09-08 12:50:35 +03:00
event.inc	Merge branch '_RHH/master' into _RHH/upcoming	2025-02-13 13:06:32 -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	Replace Incorrect Slow Stairs Movement with Correct One (#6275)	2025-03-16 14:51:36 -07: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