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
..
bard_music
battle_frontier
decoration
easy_chat
field_effects
graphics	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
object_events
pokemon	Reference TMs and HMs by move instead of number (#1732)	2023-08-09 10:51:01 -04:00
pokemon_graphics	resize golduck	2023-08-22 20:31:13 +12:00
region_map
text	Changed all instances of gSpeciesNames so that it uses GetSpeciesName	2023-07-07 14:37:51 -04:00
tilesets
trainer_graphics
.gitignore
battle_anim.h	[battle, anim] woodhammer animation overhaul (#3192)	2023-08-01 19:10:18 -04:00
battle_moves.h	Remove soundMove from Steam Eruption and replace it with sheerForceBoost (#3229)	2023-08-13 00:53:22 -04:00
contest_moves.h	Added Psyblade and Hydro Steam	2023-03-17 09:25:39 -03:00
contest_opponents.h	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
contest_text_tables.h
credits.h
heal_locations.h
item_icon_table.h	Added icon for Clear Amulet (#3078)	2023-06-26 18:19:33 -04:00
items.h	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
lilycove_lady.h	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
map_group_count.h
party_menu.h	Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243)	2023-08-21 12:49:17 +01:00
pointillism_points.h
pokedex_area_glow.h
script_menu.h
trade.h
trainer_parties.h	TrainerMonCustomized -> TrainerMon	2023-07-05 18:29:28 -04:00
trainers.h	EVERYTHING_CUSTOMIZED -> TRAINER_PARTY	2023-07-05 18:31:08 -04:00
union_room.h
wallpapers.h
wild_encounters.json
wild_encounters.json.txt