Eduardo Quezada 502a56efd1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # include/global.h # src/data.c # src/data/pokemon/species_info/gen_7.h		2024-02-13 20:35:05 -03:00
..
abnormal_weather.inc
apprentice.inc
battle_pike.inc
berry_blender.inc
berry_tree.inc	Fix string with duplicate berry berry	2023-12-24 22:59:43 +01:00
cable_club.inc
cave_hole.inc
cave_of_origin.inc
check_furniture.inc
contest_hall.inc	Add extra key item bag space checks (#4066)	2024-01-26 21:11:04 +01:00
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
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	Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)	2024-01-14 21:35:45 +01:00
kecleon.inc
lilycove_lady.inc
mauville_man.inc
move_tutors.inc
movement.inc
new_game.inc
obtain_item.inc	Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)	2024-01-14 21:35:45 +01:00
pc_transfer.inc
pc.inc	Implement Pokemon Box Link functionality (#3837)	2023-12-28 11:47:00 +01:00
pkmn_center_nurse.inc
players_house.inc
prof_birch.inc
profile_man.inc
questionnaire.inc
record_mix.inc
repel.inc	Improved Repel / Lure Menu (#3594)	2023-11-23 21:31:33 +01:00
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	Incorporated upstream fixes	2023-10-27 11:04:10 -03:00
trainer_script.inc
tv.inc