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
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
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
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
maps.s
mb_berry_fix.gba
mb_colosseum.gba
mb_ereader.gba
multiboot_berry_glitch_fix.s
multiboot_ereader.s
multiboot_pokemon_colosseum.s
mystery_event_script_cmd_table.s
mystery_gift.s
script_cmd_table.inc	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-02-13 20:35:05 -03:00
sound_data.s
specials.inc	Implemented Custom/Complex/Expanded GiveMon scripting command (#3924)	2024-02-08 09:11:13 +01:00