Eduardo Quezada afb1efe0d3 Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	src/battle_controller_player_partner.c

2024-01-28 18:11:44 -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

Add temp var aliases

2023-08-04 14:17:28 -04:00

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

Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion

2023-12-07 12:18:50 +01:00

elite_four.inc

…

field_move_scripts.inc

…

field_poison.inc

…

flash.inc

…

gabby_and_ty.inc

Add temp flag aliases

2023-08-03 15:55:06 -04:00

gift_altering_cave.inc

…

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

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

Document the trendy saying word group

2023-03-13 15:58:40 -04:00

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

Add temp var aliases

2023-08-04 14:17:28 -04:00

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

Reference TMs and HMs by move instead of number (#1732)

2023-08-09 10:51:01 -04:00

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

…