Eduardo Quezada 101ea6522d Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ...

# Conflicts:
#	src/battle_util.c

2023-02-02 17:56:13 -03:00

..

bard_music

Revert "Removed Unown hack"

2023-01-07 11:39:56 -03:00

battle_frontier

Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007

2022-10-07 14:52:32 -03: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

Cleaned trailing whitespace

2022-09-11 14:14:49 -04:00

graphics

Added Gen9 item data and fixed Punching Glove's effect

2023-01-24 16:47:54 -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 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange

2023-01-25 19:57:19 -03:00

pokemon_graphics

Revert "Removed Unown hack"

2023-01-07 11:39:56 -03:00

region_map

Update gitignore/spacing for new region map data

2022-10-30 12:22:41 -04:00

text

Added Gen9 item data and fixed Punching Glove's effect

2023-01-24 16:47:54 -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

Update battle_anim.h

2022-12-18 22:23:51 -08:00

battle_moves.h

Merge pull request #2603 from TeamAquasHideout/upcoming

2023-01-27 10:47:32 -03:00

contest_moves.h

Data entry for gen9 moves

2022-11-18 12:15:44 +01:00

contest_opponents.h

Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync

2021-11-21 10:41:12 -08:00

contest_text_tables.h

Removed trailing spaces in the most relevant files

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

credits.h

Document some credits

2021-03-29 08:52:40 -04:00

heal_locations.h

Index heal location data, use better names

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

item_icon_table.h

Added Gen9 item data and fixed Punching Glove's effect

2023-01-24 16:47:54 -03:00

items.h

Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange

2023-02-02 17:56:13 -03: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

Move pointillism points array to src

2021-03-18 17:36:18 -05: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

Removed trailing spaces in the most relevant files

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

trade.h

Fix inconsistent static s/g names

2022-05-17 14:00:02 -04:00

trainer_parties.h

Sync Crown Tundra and renamed moves Battle Engine defines.

2021-01-12 14:22:33 -08:00

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

Doc storage - cleanup

2021-04-18 01:44:25 -04:00

wild_encounters.json

Give proper names to underwater maps

2020-09-01 03:03:14 -04:00

wild_encounters.json.txt

remove empty groups from wild encounter fields json objects

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