pokeemerald/tools
Eduardo Quezada 0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	data/maps/BattleFrontier_Lounge7/scripts.inc
#	include/battle_anim.h
#	include/battle_message.h
#	include/constants/items.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_anim_throw.c
#	src/battle_anim_utility_funcs.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/party_menu.h
#	src/data/pokemon/tmhm_learnsets.h
#	src/daycare.c
#	src/field_specials.c
#	src/hall_of_fame.c
#	src/party_menu.c
#	src/pokemon.c
#	src/tv.c
2023-08-31 14:28:01 -04:00
..
aif2pcm Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
bin2c [Round 3] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 21:24:44 -05:00
gbafix Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-23 10:51:26 -04:00
gbagfx Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 2023-08-31 14:28:01 -04:00
jsonproc Fix build of jsonproc 2022-11-02 19:51:43 -05:00
mapjson Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge 2023-05-12 13:48:52 +02:00
mgba Test moves, items, and abilities in battle 2023-02-01 13:53:57 +00:00
mgba-rom-test-hydra Make Hydra respect -jN (#3132) 2023-07-14 19:10:42 +02:00
mid2agb use floats for tempo calculation 2022-06-28 00:11:59 -04:00
patchelf Hydra OSX support 2023-05-03 15:36:17 +02:00
preproc Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 2023-03-03 11:00:50 -03:00
ramscrgen [Round 3] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 21:24:44 -05:00
rsfont Fix finding libpng in gbagfx and rsfont 2022-03-16 14:41:12 +01:00
scaninc Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 2023-03-03 11:00:50 -03:00