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
..
alola_cap	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
belle	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
cosplay	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
gmax	removed duplicate sprites and changed folder format for gmax	2022-10-27 19:44:06 -07:00
hoenn_cap	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
kalos_cap	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
libre	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
original_cap	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
partner_cap	Revert unneeded sprite changes from 3051 (#3205)	2023-08-25 16:33:15 -04:00
ph_d	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
pop_star	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
rock_star	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
sinnoh_cap	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
unova_cap	Killed the bKGD invalid index warning	2023-06-07 23:13:07 -03:00
world_cap	Revert unneeded sprite changes from 3051 (#3205)	2023-08-25 16:33:15 -04:00
anim_front.png	tweak graveler, pikachu	2023-08-20 22:08:54 +12:00
anim_frontf.png	tweak graveler, pikachu	2023-08-20 22:08:54 +12:00
back.png	set background colour	2023-08-16 13:58:31 +12:00
backf.png	set background colour	2023-08-16 13:58:31 +12:00
footprint.png	Index pokemon footprint pngs	2023-05-09 22:43:48 -04:00
icon.png	Revert unneeded sprite changes from 3051 (#3205)	2023-08-25 16:33:15 -04:00
normal.pal	set background colour	2023-08-16 13:58:31 +12:00
shiny.pal	set background colour	2023-08-16 13:58:31 +12:00