ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-16 10:38:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
pokeemerald/src/data
History
Eduardo Quezada 1580f892a5 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/constants/pokemon.h
#	src/battle_script_commands.c
2022-12-19 18:53:26 -03:00
..
bard_music
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 12:30:38 -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
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
field_effects
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
graphics
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig
2022-10-07 14:05:45 -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 branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
2022-12-19 18:53:26 -03:00
pokemon_graphics
Finished cleaning up the animations to the new standard
2022-12-16 20:58:41 -03:00
region_map
Update gitignore/spacing for new region map data
2022-10-30 12:22:41 -04:00
text
Fix Headlong Rush description
2022-12-04 18:14:27 +01: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
Tidying graphics - Trio Weather
2022-09-09 21:57:40 +07:00
battle_moves.h
Update move flags
2022-12-04 21:56:40 +01: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
…
heal_locations.h
…
item_icon_table.h
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
2022-10-07 14:52:32 -03:00
items.h
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange
2022-11-05 20:11:33 -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
…
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
…
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
…
wild_encounters.json
…
wild_encounters.json.txt
…