Eduardo Quezada 39ed85635f Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # include/data.h # src/data/graphics/pokemon.h # src/data/pokemon/species_info.h # src/data/pokemon/species_info/gen_1_families.h # src/data/pokemon/species_info/gen_2_families.h # src/data/pokemon/species_info/gen_3_families.h # src/data/pokemon/species_info/gen_4_families.h # src/data/pokemon/species_info/gen_5_families.h # src/data/pokemon/species_info/gen_6_families.h # src/data/pokemon/species_info/gen_7_families.h # src/data/pokemon/species_info/gen_8_families.h		2024-03-17 23:41:23 -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	Pre-1.8 tweaks (#4275)	2024-03-12 12:21:03 +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
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