Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
pokeemmo/src/data
History
Eduardo Quezada 0caf79f702 Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2 
# Conflicts:
#	graphics/pokemon/cherrim/anim_front.png
#	graphics/pokemon/scyther/anim_front.png
#	graphics/pokemon/scyther/front.png
#	graphics/pokemon/shinx/anim_front.png
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/front_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon_icon.c
2022-09-13 20:44:49 -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 'RHH/battle_engine' into RHH_masterMerge
2022-07-22 22:57:02 -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
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
graphics
Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2
2022-09-13 20:44:49 -03:00
object_events
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
pokemon
Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE
2022-09-09 15:39:48 -03:00
pokemon_graphics
Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2
2022-09-13 20:44:49 -03:00
region_map
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
text
Merge pull request #2273 from LOuroboros/zazaForms
2022-09-09 14:15:53 -04:00
trainer_graphics
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
.gitignore
Convert wild encounter data to JSON
2019-05-08 17:06:39 -05:00
battle_anim.h
Tyding graphics - Acupressure
2022-09-09 00:25:43 +07:00
battle_moves.h
Added Z-Move stats for LA's moves
2022-08-30 20:29:36 -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
Index heal location data, use better names
2020-04-28 19:59:08 -05:00
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
party_menu.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04: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 branch 'master' into doc-union
2021-10-07 16:10:35 -04: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