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
..
gmax	removed duplicate sprites and changed folder format for gmax	2022-10-27 19:44:06 -07:00
anim_front.png	A selection of animation frames (redone) (#3090)	2023-06-30 14:13:42 +02:00
back.png	Revert unneeded sprite changes from 3051 (#3205)	2023-08-25 16:33:15 -04:00
footprint.png	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602	2023-06-02 11:45:28 -04:00
icon.png	Revert unneeded sprite changes from 3051 (#3205)	2023-08-25 16:33:15 -04:00
normal.pal	Add Gen 8 Pokemon data.	2020-12-16 12:57:36 -08:00
shiny.pal	Add Gen 8 Pokemon data.	2020-12-16 12:57:36 -08:00