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
..
map.json	Fix wrong route in item flag name	2023-02-25 13:48:39 -08:00
scripts.inc	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-12-01 20:18:57 -08:00