Eduardo Quezada 92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax ... # Conflicts: # asm/macros/battle_script.inc # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle.h # include/battle_controllers.h # include/battle_interface.h # include/config/battle.h # include/constants/battle.h # include/constants/battle_anim.h # include/constants/battle_move_effects.h # include/constants/battle_string_ids.h # include/data.h # include/random.h # sound/cry_tables.inc # src/battle_anim_new.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/species_info.h # src/data/text/move_names.h # test/test_runner_battle.c		2023-10-09 16:51:41 -03:00
..
battle.h	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax	2023-10-09 16:51:41 -03:00
debug.h	ai delay timer	2023-09-12 10:35:05 +02:00
item.h	Add new sell value of 1/4 of an item's price, with config (#3315)	2023-10-05 09:14:42 -03:00
overworld.h	Add config for pressing B in the PC	2023-09-21 16:26:00 +02:00
pokemon.h	Add Ability inheritance	2023-04-30 12:58:18 +02:00