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
..
map.json	Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)	2024-01-14 21:35:45 +01:00
scripts.inc	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-02-17 23:40:08 -03:00