ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-16 18:48:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
pokeemerald/src/data
History
Eduardo Quezada 44754f8ca7 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/constants/pokemon_config.h
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon_icon.c
2022-10-07 15:27:16 -03:00
..
bard_music
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07:00
battle_frontier
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
2022-09-10 00:17:03 -04: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/feature/palleteConversion2
2022-10-07 15:27:16 -03:00
object_events
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
2022-09-10 00:17:03 -04:00
pokemon
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig
2022-10-07 14:05:45 -03:00
pokemon_graphics
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2
2022-10-07 15:27:16 -03:00
region_map
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
text
Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig
2022-09-18 18:25:05 -03:00
trainer_graphics
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
.gitignore
…
battle_anim.h
Tidying graphics - Trio Weather
2022-09-09 21:57:40 +07:00
battle_moves.h
Separate config for updated move types
2022-09-26 07:50:43 -03:00
contest_moves.h
Added Legends: Arceus' move data
2022-08-30 19:32:44 -03: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
…
item_icon_table.h
Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb
2022-01-16 18:44:03 -03:00
items.h
Fix Lure prices
2022-09-11 18:06:05 +02: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
…
trainers.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
union_room.h
Added missing uses of Fairy type for Union Room and Battle Factory
2022-09-11 12:41:56 -04:00
wallpapers.h
Doc storage - cleanup
2021-04-18 01:44:25 -04:00
wild_encounters.json
…
wild_encounters.json.txt
…