Eduardo Quezada 9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 ... # Conflicts: # Makefile # include/constants/pokemon.h # include/pokemon.h # make_tools.mk # src/battle_ai_script_commands.c # src/battle_controllers.c # src/battle_main.c # src/battle_script_commands.c # src/party_menu.c # src/pokemon.c # src/trade.c # src/trainer_pokemon_sprites.c		2023-03-03 11:00:50 -03:00
..
backgrounds	Fix Giga Impact on contests.	2023-02-09 11:29:29 +01:00
masks	Document more battle anim effects	2021-02-28 09:54:55 -06:00
sprites	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303	2023-03-03 11:00:50 -03:00
unused	Fix two binary palettes	2023-02-17 13:27:39 -05:00