Eduardo Quezada 661becc3b6 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2 ...

# Conflicts:
#	src/debug.c

2023-10-30 08:05:14 -03:00

..

abnormal_weather.inc

…

apprentice.inc

…

battle_pike.inc

…

berry_blender.inc

…

berry_tree.inc

…

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

…

day_care.inc

…

debug.inc

Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2

2023-10-30 08:05:14 -03: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

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

Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829

2023-08-31 14:28:01 -04: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

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

Add temp var aliases

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

pc.inc

…

pkmn_center_nurse.inc

…

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

…

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

…