pokeemerald/data/scripts
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
..
abnormal_weather.inc
apprentice.inc
battle_pike.inc
berry_blender.inc
berry_tree.inc
cable_club.inc
cave_hole.inc
cave_of_origin.inc
check_furniture.inc
contest_hall.inc
day_care.inc
debug.inc Save-compatible SaveBlock3 (#4112) 2024-02-10 18:14:36 +01:00
elite_four.inc
field_move_scripts.inc
field_poison.inc
flash.inc
follower.inc Merge branch 'merrp/pr/style' into followers 2024-02-15 22:49:36 -05:00
gabby_and_ty.inc
gift_altering_cave.inc
gift_aurora_ticket.inc
gift_battle_card.inc
gift_mystic_ticket.inc
gift_old_sea_map.inc
gift_pichu.inc
gift_stamp_card.inc
gift_trainer.inc
hall_of_fame.inc
interview.inc
item_ball_scripts.inc
kecleon.inc
lilycove_lady.inc
mauville_man.inc
move_tutors.inc
movement.inc
new_game.inc
obtain_item.inc
pc_transfer.inc
pc.inc
pkmn_center_nurse.inc
players_house.inc
prof_birch.inc
profile_man.inc
questionnaire.inc
record_mix.inc
repel.inc
rival_graphics.inc
roulette.inc
safari_zone.inc
secret_base.inc
secret_power_tm.inc
set_gym_trainers.inc
shared_secret_base.inc
std_msgbox.inc
surf.inc
test_signpost.inc
trainer_battle.inc
trainer_hill.inc
trainer_script.inc
tv.inc