atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
sovereignx/data
History
Eduardo Quezada 5b8be2a144 Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder 
# Conflicts:
#	data/battle_scripts_1.s
#	src/data/pokemon/level_up_learnsets.h
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/pokemon.c
2022-11-21 17:52:19 -03:00
..
layouts
maps Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-10-30 12:30:38 -03:00
scripts Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures 2022-10-30 12:16:09 -03:00
text Fixed instances of .string being used with spaces instead of tabs 2022-08-15 14:32:01 -04:00
tilesets Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
battle_anim_scripts.s fix whitespace 2022-10-16 23:39:12 -04:00
battle_scripts_1.s Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder 2022-11-21 17:52:19 -03:00
battle_scripts_2.s Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 23:51:29 -08:00
contest_ai_scripts.s Incorporate commented bug fixes in contest AI scripts 2022-08-19 19:45:15 -04:00
event_scripts.s Item config for repel prompt 2022-09-12 10:21:52 -03:00
field_effect_scripts.s Continue battle_transition documenting 2021-10-29 11:24:36 -04:00
map_events.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
maps.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mb_berry_fix.gba Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mb_colosseum.gba Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mb_ereader.gba Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
multiboot_berry_glitch_fix.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
multiboot_ereader.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
multiboot_pokemon_colosseum.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mystery_event_script_cmd_table.s
mystery_gift.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
script_cmd_table.inc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
sound_data.s Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
specials.inc Fixed battle frontier tutors (for real this time) 2022-08-27 22:45:10 -04:00