Eduardo Quezada 35a76248d1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	src/data/pokemon/species_info/gen_4_families.h

2024-05-06 16:03:29 -04:00

..

bard_music

Fix accidental symbol replacements

2023-12-12 23:18:35 +01:00

battle_frontier

Customizable FrontierMon Sets (#4313)

2024-03-29 08:47:17 +01:00

decoration

Removed trailing spaces in the most relevant files

2021-08-24 19:59:32 -03:00

easy_chat

Matching merge from upstream pret

2023-01-20 12:31:54 -03:00

field_effects

Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers

2024-02-17 23:40:08 -03:00

graphics

Shiny Gen 7 sprites (gotta fix regular palettes)

2024-04-26 11:43:34 -04:00

object_events

Moved follower settings to overworld config

2024-02-18 00:16:59 -03:00

pokemon

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-05-06 16:03:29 -04:00

pokemon_graphics

Merge branch '_RHH/master' into _RHH/upcoming

2024-01-19 09:34:05 -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 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers

2024-02-17 23:40:08 -03: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

Make Fur Coat breakable (#4459)

2024-04-28 22:48:34 +02:00

battle_anim.h

remove some unused data (#4239)

2024-03-04 17:36:23 +01:00

battle_move_effects.h

Add Tera Starstorm move + make Tera Blast displayed type reflect current type due to tera state (#4447)

2024-04-27 19:35:29 +02:00

battle_partners.h

Make trainerproc compatible with partners (#4421)

2024-04-22 17:03:36 +02:00

battle_partners.party

Make trainerproc compatible with partners (#4421)

2024-04-22 17:03:36 +02:00

contest_moves.h

Move data unification (#3999)

2024-01-29 08:51:32 -03: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

Clean up contest strings (#3876)

2024-02-02 10:55:39 +01:00

credits.h

Solved a bunch of -Wall errors on modern

2023-09-20 19:01:08 -03:00

heal_locations.h

Index heal location data, use better names

2020-04-28 19:59:08 -05:00

item_icon_table.h

Automatically display TM/HM icons based on their move (#4452)

2024-04-29 19:29:00 +02:00

items.h

Official GF names by default (#4241)

2024-04-25 14:23:08 -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

Automated creation of MAP_GROUP_COUNT for the debug menu

2022-09-09 23:34:05 -04:00

moves_info.h

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-05 19:50:12 -04:00

partner_parties.h

Make trainerproc compatible with partners (#4421)

2024-04-22 17:03:36 +02:00

party_menu.h

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

pointillism_points.h

Solved a bunch of -Wall errors on modern

2023-09-20 19:01:08 -03:00

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

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

Competitive-formatted parties (#3545)

2024-04-06 15:05:15 -03:00

trainers.h

Competitive-formatted parties (#3545)

2024-04-06 15:05:15 -03:00

trainers.party

Competitive-formatted parties (#3545)

2024-04-06 15:05:15 -03:00

union_room.h

Consolidate type properties (#4185)

2024-03-12 07:57:38 -03:00

wallpapers.h

Added Japan-only Walda PC icons (#3550)

2023-11-18 00:54:13 +01:00

wild_encounters.json

Testing follower pokemon.

2021-03-03 00:51:43 -05:00

wild_encounters.json.txt

remove empty groups from wild encounter fields json objects

2019-10-14 18:12:03 -05:00