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
..
battle_frontier	Fix partner palette problem (#4736)	2024-06-07 21:05:16 +02: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	Upgraded Dragon Darts Animation (#4620)	2024-05-28 10:17:52 +02:00
battle_script.inc	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-19 09:20:05 -04:00
battle_tent.inc
contest_ai_script.inc
event.inc	Add OW_FLAG_PAUSE_TIME, pausefakertc, resumefakertc and togglefakertc (#4954)	2024-07-13 20:44:27 +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	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