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

# Conflicts:
#	src/data/graphics/pokemon.h

2024-02-19 13:49:10 -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

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

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

2024-02-19 13:49:10 -03: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-02-19 13:49:10 -03: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

Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)

2024-01-26 15:25:52 -03:00

battle_anim.h

Adds combined pledge move effects (#3336)

2023-11-21 16:23:22 +01:00

battle_move_effects.h

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-19 10:13:13 -03:00

battle_partners.h

Adds Tidy Up + minor Dragon Cheer follow up (#4136)

2024-02-18 20:00:36 +01: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

…

item_icon_table.h

PLA aux item sprites (#4160)

2024-02-10 18:08:09 +01:00

items.h

Adjusted item description alignment (#4088)

2024-01-29 12:02:54 +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

moves_info.h

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-19 10:13:13 -03:00

partner_parties.h

Sets neutral nature and ability 0 as default in trainer control (#4172)

2024-02-18 15:02:58 +01: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

Add species defines for base forms with names (#3248)

2023-10-23 12:59:15 +01:00

trainers.h

Refactor mugshots (#4000)

2024-01-16 00:45:13 +01: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

Testing follower pokemon.

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

wild_encounters.json.txt

…