Hedara c27930eabf Merge commit '678fdf9' into pret-merge ...

Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp

2025-05-27 19:22:40 +02:00

..

abnormal_weather.inc

…

apprentice.inc

Generate local IDs from map.json files

2024-10-12 03:04:24 -04:00

battle_pike.inc

Merge commit '678fdf9' into pret-merge

2025-05-27 19:22:40 +02:00

berry_blender.inc

Generate local IDs from map.json files

2024-10-12 03:04:24 -04:00

berry_tree.inc

(Default Off) Item Description Headers (#4767)

2024-09-03 20:22:01 +02:00

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

[Rebase of #4286] Reordered Debug_EventScript_InflictStatus1 (#4372)

2024-04-14 17:31:39 -04:00

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

Add Steven Multi to debug menu (#6064)

2025-01-20 22:29:21 +01: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

Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge

2025-02-12 13:34:28 +01:00

field_poison.inc

…

flash.inc

…

follower.inc

Metatile + commas

2024-05-30 13:56:14 -04:00

gabby_and_ty.inc

Generate local IDs from map.json files

2024-10-12 03:04:24 -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

…

gift_stamp_card.inc

…

gift_trainer.inc

…

hall_of_fame.inc

…

interview.inc

…

item_ball_scripts.inc

…

kecleon.inc

…

lilycove_lady.inc

Generate local IDs from map.json files

2024-10-12 03:04:24 -04:00

mauville_man.inc

Document bard music (#2053)

2025-01-17 17:54:38 +00:00

move_tutors.inc

…

movement.inc

fix: Made Common_Movement_* 'safe' for followers

2024-04-27 22:47:41 -04:00

new_game.inc

Generate local IDs from map.json files

2024-10-12 03:04:24 -04:00

obtain_item.inc

(Default Off) Item Description Headers (#4767)

2024-09-03 20:22:01 +02:00

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

Fix Pokeblock script missing a releaseall

2024-05-19 12:52:04 +02:00

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

…