Eduardo Quezada e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 ... # Conflicts: # include/battle.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_dome.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/battle_tower.c # src/data/pokemon/species_info.h # src/pokemon.c		2022-11-24 15:36:00 -03:00
..
bard_music	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030	2022-10-30 12:30:38 -03:00
battle_frontier	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007	2022-10-07 14:52:32 -03:00
decoration
easy_chat	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04:00
field_effects	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
graphics	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig	2022-10-07 14:05:45 -03:00
object_events	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030	2022-10-30 12:30:38 -03:00
pokemon	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124	2022-11-24 15:36:00 -03:00
pokemon_graphics	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations	2022-11-03 23:31:20 -03:00
region_map	Update gitignore/spacing for new region map data	2022-10-30 12:22:41 -04:00
text	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig	2022-09-18 18:25:05 -03:00
tilesets	Give tileset palettes proper type, name compressed secret base tiles	2022-10-08 02:02:12 -04:00
trainer_graphics	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
.gitignore	Update gitignore/spacing for new region map data	2022-10-30 12:22:41 -04:00
battle_anim.h	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
battle_moves.h	Config for Dark Void being only usable by Darkrai	2022-11-03 21:36:12 -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	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007	2022-10-07 14:52:32 -03:00
items.h	Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney	2022-11-01 20:09:30 -04:00
lilycove_lady.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
map_group_count.h	Automated creation of MAP_GROUP_COUNT for the debug menu	2022-09-09 23:34:05 -04:00
party_menu.h	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags	2022-09-27 10:13:32 -03:00
pointillism_points.h
pokedex_area_glow.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
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	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124	2022-11-24 15:36:00 -03:00
wallpapers.h
wild_encounters.json
wild_encounters.json.txt