Eduardo Quezada 341ce6fd95 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 ... # Conflicts: # .github/workflows/build.yml # README.md # gflib/sprite.c # graphics/pokemon/banette/anim_front.png # graphics/pokemon/banette/normal.pal # graphics/pokemon/sentret/normal.pal # graphics/pokemon/togetic/anim_front.png # graphics/pokemon/togetic/normal.pal # include/battle_script_commands.h # include/data.h # ld_script.txt # src/battle_controller_player.c # src/bike.c # src/event_object_movement.c		2023-06-16 21:25:16 -04:00
..
abnormal_weather.inc
apprentice.inc
battle_pike.inc	Fixed follower bugs when returning from a battle facility challenge.	2022-05-20 00:18:41 -04:00
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	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
debug.inc	Fixed compile issue when disabling overworld debug menu (#3024)	2023-05-24 08:24:44 -04:00
elite_four.inc
field_move_scripts.inc	Added movements/scripts for overworld follower field moves.	2023-01-03 18:18:09 -05:00
field_poison.inc
flash.inc	Fixed object events not being unfrozen after using Flash.	2022-05-17 00:33:37 -04:00
follower.inc	Fixed some follower movements.	2022-10-22 18:50:27 -04:00
gabby_and_ty.inc
gift_altering_cave.inc	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
gift_aurora_ticket.inc
gift_battle_card.inc
gift_mystic_ticket.inc
gift_old_sea_map.inc
gift_pichu.inc	Updated term to modernFatefulEncounter	2023-02-11 22:36:42 -03:00
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	Document the trendy saying word group	2023-03-13 15:58:40 -04:00
move_tutors.inc	Removed tutor move distinction, combined llists	2022-08-25 19:56:47 -04:00
movement.inc
new_game.inc	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
obtain_item.inc
pc_transfer.inc
pc.inc
pkmn_center_nurse.inc	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
players_house.inc
prof_birch.inc
profile_man.inc
questionnaire.inc
record_mix.inc
repel.inc	Fixed reusable repels/lures function forcefully using items while menu config is on	2023-01-04 00:00:13 -03:00
rival_graphics.inc
roulette.inc	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
safari_zone.inc
secret_base.inc	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
secret_power_tm.inc
set_gym_trainers.inc
shared_secret_base.inc
std_msgbox.inc
surf.inc
test_signpost.inc
trainer_battle.inc	Fixed bug with applymovement not hiding followers after a battle.	2023-03-13 17:51:35 -04:00
trainer_hill.inc
trainer_script.inc
tv.inc