Hedara 9d80ad530d Merge branch 'master' into master-to-upcoming ... Conflicts: Makefile data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc data/maps/MtChimney/scripts.inc data/maps/MtPyre_Summit/scripts.inc data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc include/constants/event_objects.h include/constants/expansion.h src/battle_script_commands.c src/battle_util.c src/field_screen_effect.c		2025-05-28 14:26:15 +02:00
..
abnormal_weather.inc
apprentice.inc
battle_pike.inc	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
berry_blender.inc
berry_tree.inc
cable_club.inc	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
cave_hole.inc	OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA	2024-10-12 23:34:02 -04:00
cave_of_origin.inc
check_furniture.inc
config.inc
contest_hall.inc	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
day_care.inc	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
debug.inc	Time menu for RTC in debug menu. (#6634)	2025-04-23 19:34:37 +02:00
dexnav.inc	some more fixes	2024-11-03 10:11:05 -05:00
elite_four.inc	OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA	2024-10-12 23:34:02 -04:00
field_move_scripts.inc	Follower NPCs (follow-me) (#6500)	2025-04-27 14:56:18 +02:00
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	Document bard music (#2053)	2025-01-17 17:54:38 +00:00
move_tutors.inc
movement.inc	Follower NPCs (follow-me) (#6500)	2025-04-27 14:56:18 +02:00
new_game.inc
obtain_item.inc
pc_transfer.inc
pc.inc
pkmn_center_nurse.inc	Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge	2025-02-12 13:34:28 +01:00
players_house.inc	OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA	2024-10-12 23:34:02 -04:00
prof_birch.inc
profile_man.inc
questionnaire.inc
record_mix.inc
repel.inc
rival_graphics.inc
roulette.inc
safari_zone.inc
secret_base.inc	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
secret_power_tm.inc
set_gym_trainers.inc
shared_secret_base.inc
std_msgbox.inc	Review comments	2025-02-12 14:31:42 +01:00
surf.inc
test_signpost.inc
trainer_battle.inc
trainer_hill.inc	Trainer Battle Parameter Consolidation (#5982)	2025-01-25 22:02:39 +01:00
trainer_script.inc	Arbitrary trainer scripts + map script/trigger softlock prevention (#5033)	2025-01-08 10:27:00 +00:00
tv.inc