atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
sovereignx/data
History
Eduardo Quezada 3d9c7732f6 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	include/event_object_movement.h
#	src/data.c
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info/gen_4_families.h
2024-04-20 13:23:14 -04:00
..
layouts Added dynamic palette support for virtual objects. 2022-08-17 19:58:46 -04:00
maps Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo 2024-03-25 16:03:56 -03:00
scripts Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-04-20 13:23:14 -04:00
text Clean up contest strings (#3876) 2024-02-02 10:55:39 +01:00
tilesets Merge branch 'master' into followers 2022-11-21 21:21:50 -05:00
battle_anim_scripts.s Add Fog weather (#4359) 2024-04-17 12:06:49 -04:00
battle_scripts_1.s Add Fog weather (#4359) 2024-04-17 12:06:49 -04:00
battle_scripts_2.s Merge branch '_RHH/master' into _RHH/upcoming 2024-02-10 17:53:32 -03:00
contest_ai_scripts.s Incorporated upstream fixes 2023-10-27 11:04:10 -03:00
event_scripts.s Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-04-20 13:23:14 -04:00
field_effect_scripts.s Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
map_events.s Updated existing OW pokemon events with new system. 2023-01-12 21:45:42 -05: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 '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-04-20 13:23:14 -04:00
sound_data.s Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
specials.inc Pre-1.8 tweaks (#4275) 2024-03-12 12:21:03 +01:00