Eduardo Quezada 7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs ... # Conflicts: # src/battle_script_commands.c		2022-09-05 14:43:04 -04:00
..
bard_music
battle_frontier	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-22 22:57:02 -04:00
decoration
easy_chat	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04:00
field_effects	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
graphics	Update to latest master branch + allow Reveal Glass to work with Enamorus	2022-08-24 15:00:48 +07:00
object_events	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04:00
pokemon	Updated to latest master branch + add PLA's data to teachable_learnsets.h	2022-08-29 21:01:31 +07:00
pokemon_graphics	Update to latest master branch + allow Reveal Glass to work with Enamorus	2022-08-24 15:00:48 +07:00
region_map	Synced Route 4 and 10's MapSec labels	2022-08-16 18:23:37 -04:00
text	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs	2022-09-05 14:43:04 -04:00
trainer_graphics	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
.gitignore
battle_anim.h	Cleaned up use of configs be almost exclusively preproc functions	2022-08-23 21:00:08 -04:00
battle_moves.h	Added Z-Move stats for LA's moves	2022-08-30 20:29:36 -03:00
contest_moves.h	Added Legends: Arceus' move data	2022-08-30 19:32:44 -03:00
contest_opponents.h
contest_text_tables.h
credits.h
heal_locations.h
item_icon_table.h
items.h	Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs	2022-08-27 02:42:22 -04:00
lilycove_lady.h
party_menu.h	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04:00
pointillism_points.h
pokedex_area_glow.h
script_menu.h
trade.h	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
trainer_parties.h
trainers.h	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04:00
union_room.h
wallpapers.h
wild_encounters.json
wild_encounters.json.txt