Eduardo Quezada 51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 ... # Conflicts: # data/battle_scripts_2.s # include/constants/battle_string_ids.h # include/constants/songs.h # src/battle_message.c # src/data/pokemon/species_info.h		2023-03-19 20:28:56 -03:00
..
abilities.h
apprentice.h
battle_ai.h
battle_anim.h	Matching merge from upstream pret	2023-01-20 12:31:54 -03:00
battle_arena.h
battle_dome.h
battle_factory.h
battle_frontier_mons.h
battle_frontier_trainers.h
battle_frontier.h
battle_move_effects.h	Added Psyblade and Hydro Steam	2023-03-17 09:25:39 -03:00
battle_palace.h
battle_pike.h
battle_pyramid.h	Misc field_specials cleanup	2023-02-01 11:48:55 -05:00
battle_script_commands.h	Add MOVE_SHELL_TRAP Effect (#2716)	2023-02-22 13:55:34 +00:00
battle_setup.h
battle_string_ids.h	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319	2023-03-19 20:28:56 -03:00
battle_tent_mons.h
battle_tent_trainers.h
battle_tent.h
battle_tower.h
battle.h	add messages for stockpile effects wear off	2023-02-27 12:31:29 +01:00
berry.h
cable_club.h
coins.h
contest.h
daycare.h	Remove unused INHERITED_IV_COUNT define	2023-01-31 09:44:47 +01:00
decorations.h
easy_chat.h
event_bg.h
event_object_movement.h
event_objects.h	Sync clone object macro	2023-02-08 13:11:10 -05:00
field_effects.h
field_poison.h
field_specials.h	Misc field_specials cleanup	2023-02-01 11:48:55 -05:00
field_tasks.h
field_weather.h
flags.h	Fix wrong route in item flag name	2023-02-25 13:48:39 -08:00
frontier_util.h
game_stat.h	Fix Best Streak stat name	2023-01-20 11:25:04 -05:00
global.h
heal_locations.h
hold_effects.h
item_effects.h
item.h
items.h	Added Gen9 item data and fixed Punching Glove's effect	2023-01-24 16:47:54 -03:00
layouts.h
lilycove_lady.h
map_groups.h
map_scripts.h
map_types.h
maps.h
mauville_old_man.h
metatile_behaviors.h
metatile_labels.h	Sort metatile labels alphabetically	2023-02-14 14:36:27 -05:00
moves.h	Added Psyblade and Hydro Steam	2023-03-17 09:25:39 -03:00
mystery_gift.h
opponents.h
party_menu.h
pokedex.h
pokemon_debug.h
pokemon.h	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319	2023-03-19 20:28:56 -03:00
region_map_sections.h
rgb.h	add silk trap anim	2023-01-28 09:03:18 -05:00
roulette.h
script_menu.h
secret_bases.h
slot_machine.h
songs.h	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319	2023-03-19 20:28:56 -03:00
sound.h
species.h	enamorus_t cry, basculegionf sprite, new typhlosion back sprite	2023-02-23 15:20:12 +01:00
trade.h	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214	2023-02-15 14:11:03 -03:00
trainer_hill.h
trainer_types.h
trainers.h
tv.h
union_room.h
vars.h
weather.h
wild_encounter.h
z_move_effects.h