Eduardo Quezada 755e260da4 Merge branch 'RHH/master' into RHH/upcoming ...

# Conflicts:
#	include/constants/battle_move_effects.h
#	test/battle/move_effect/multi_hit.c

2023-09-10 18:38:46 -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/sync/pret_20230214

2023-02-15 14:11:03 -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

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

2023-08-31 14:28:01 -04: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 branch 'RHH/master' into RHH/upcoming

2023-09-10 18:38:46 -03:00

pokemon_graphics

resize golduck

2023-08-22 20:31:13 +12:00

region_map

Update gitignore/spacing for new region map data

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

text

Generation 6 Experience Share (#3276)

2023-09-07 23:18:18 -03:00

tilesets

Give tileset palettes proper type, name compressed secret base tiles

2022-10-08 02:02:12 -04:00

trainer_graphics

Add NUM_MON_PIC_FRAMES, and trainer pic size constants

2022-10-10 23:16:08 -04:00

.gitignore

Update gitignore/spacing for new region map data

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

battle_anim.h

Add new Substitute doll sprites (#3263)

2023-09-04 19:48:43 -03:00

battle_moves.h

Merge branch 'RHH/master' into RHH/upcoming

2023-09-10 18:38:46 -03:00

contest_moves.h

Added Psyblade and Hydro Steam

2023-03-17 09:25:39 -03:00

contest_opponents.h

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

2023-08-31 14:28:01 -04: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 icon for Clear Amulet (#3078)

2023-06-26 18:19:33 -04:00

items.h

Generation 6 Experience Share (#3276)

2023-09-07 23:18:18 -03: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

party_menu.h

Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243)

2023-08-21 12:49:17 +01: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

Sync trade anim

2023-01-09 15:32:04 -05:00

trainer_parties.h

TrainerMonCustomized -> TrainerMon

2023-07-05 18:29:28 -04: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

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