atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
sovereignx/data
History
Eduardo Quezada 124c17d315 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	README.md
#	data/field_effect_scripts.s
#	data/maps/AncientTomb/scripts.inc
#	data/maps/DesertRuins/scripts.inc
#	data/maps/IslandCave/scripts.inc
#	data/scripts/follower.inc
#	graphics/object_events/pics/pokemon/wailord.png
#	graphics/object_events/pics/pokemon_old/substitute.png
#	include/constants/event_objects.h
#	include/global.h
#	remote_build.sh
#	spritesheet_rules.mk
#	src/bike.c
#	src/data/object_events/object_event_anims.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info_followers.h
#	src/data/object_events/object_event_pic_tables.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_screen_effect.c
#	src/overworld.c
#	src/palette.c
#	src/pokemon_summary_screen.c
#	src/scrcmd.c
#	src/trainer_see.c
2024-02-17 23:40:08 -03:00
..
layouts Added dynamic palette support for virtual objects. 2022-08-17 19:58:46 -04:00
maps Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 2024-02-17 23:40:08 -03:00
scripts Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 2024-02-17 23:40:08 -03: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 Merge branch '_RHH/master' into _RHH/upcoming 2024-02-10 17:53:32 -03:00
battle_scripts_1.s Merge branch '_RHH/master' into _RHH/upcoming 2024-02-10 17:53:32 -03: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 Whitespace, documentation and style 2024-01-22 19:12:52 -03: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 Remove address comments 2021-07-20 15:18:31 -04:00
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-02-13 20:35:05 -03:00
sound_data.s Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
specials.inc Implemented Custom/Complex/Expanded GiveMon scripting command (#3924) 2024-02-08 09:11:13 +01:00