pokeemerald/src/data
Biffalo XIII 2cc26d935a Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	data/battle_scripts_1.s
#	include/config/pokemon.h
#	src/birch_pc.c
2024-01-11 19:51:11 -03:00
..
bard_music Fix accidental symbol replacements 2023-12-12 23:18:35 +01:00
battle_frontier Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into secondary_effects_overhaul_merge 2024-01-01 03:50:36 +09:00
decoration
easy_chat Matching merge from upstream pret 2023-01-20 12:31:54 -03:00
field_effects Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
graphics Revert "Organized pokemon graphics by generation (#3868)" (#3959) 2024-01-10 15:49:58 -03:00
object_events Fix extended berry stage palettes 2024-01-05 11:32:59 +01:00
pokemon Merge branch '_RHH/master' into _RHH/upcoming 2024-01-11 19:51:11 -03:00
pokemon_graphics Add Indigo Disk Pokemon data (#3878) 2024-01-01 01:38:50 +01:00
region_map Update gitignore/spacing for new region map data 2022-10-30 12:22:41 -04:00
text Refactor trainer classes (#3875) 2024-01-04 13:30:42 +01:00
tilesets Give tileset palettes proper type, name compressed secret base tiles 2022-10-08 02:02:12 -04:00
.gitignore Update gitignore/spacing for new region map data 2022-10-30 12:22:41 -04:00
abilities.h Ability flags update (#3886) 2024-01-01 15:03:34 +01:00
battle_anim.h Adds combined pledge move effects (#3336) 2023-11-21 16:23:22 +01:00
battle_moves.h Applied more review fixes 2024-01-12 03:02:48 +09:00
battle_partners.h Partner Battle refactor (#3592) 2023-12-20 12:38:28 +01:00
contest_moves.h Metronome move fix (#3852) 2023-12-28 16:57:29 +01:00
contest_opponents.h Add species defines for base forms with names (#3248) 2023-10-23 12:59:15 +01:00
contest_text_tables.h
credits.h Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
heal_locations.h
item_icon_table.h Add Indigo Disk item data (#3854) 2023-12-28 23:00:34 +01:00
items.h Add power item config (#3961) 2024-01-11 09:34:19 +01: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 Automated creation of MAP_GROUP_COUNT for the debug menu 2022-09-09 23:34:05 -04:00
partner_parties.h Partner Battle refactor (#3592) 2023-12-20 12:38:28 +01:00
party_menu.h Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears 2023-12-30 20:49:05 +01:00
pointillism_points.h Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
pokedex_area_glow.h
script_menu.h Add Mulch effects 2023-12-03 13:17:34 +01:00
trade.h Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
trainer_parties.h Add species defines for base forms with names (#3248) 2023-10-23 12:59:15 +01:00
trainers.h EVERYTHING_CUSTOMIZED -> TRAINER_PARTY 2023-07-05 18:31:08 -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 Added Japan-only Walda PC icons (#3550) 2023-11-18 00:54:13 +01:00
wild_encounters.json
wild_encounters.json.txt