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

Whitespace, documentation and style

2024-01-22 19:12:52 -03:00

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

Whitespace, documentation and style

2024-01-22 19:12:52 -03:00

debug.inc

Pre-1.8 tweaks (#4275)

2024-03-12 12:21:03 +01:00

elite_four.inc

…

field_move_scripts.inc

Whitespace, documentation and style

2024-01-22 19:12:52 -03:00

field_poison.inc

…

flash.inc

Whitespace, documentation and style

2024-01-22 19:12:52 -03:00

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

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

Whitespace, documentation and style

2024-01-22 19:12:52 -03:00

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

Whitespace, documentation and style

2024-01-22 19:12:52 -03:00

secret_power_tm.inc

…

set_gym_trainers.inc

…

shared_secret_base.inc

…

std_msgbox.inc

…

surf.inc

…

test_signpost.inc

…

trainer_battle.inc

Whitespace, documentation and style

2024-01-22 19:12:52 -03:00

trainer_hill.inc

Incorporated upstream fixes

2023-10-27 11:04:10 -03:00

trainer_script.inc

…

tv.inc

…