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

..

battle_frontier

Trainer Battle Parameter Consolidation (#5982)

2025-01-25 22:02:39 +01:00

asm.inc

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

2022-04-02 18:45:18 -03:00

battle_anim_script.inc

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-27 16:26:37 -04:00

battle_script.inc

Fix Wish healing even if the target is Heal Blocked (#6979)

2025-05-25 23:01:11 +02:00

battle_tent.inc

Removed trailing spaces in the most relevant files

2021-08-24 19:59:32 -03:00

contest_ai_script.inc

Fix incorrect point macros in contest_ai_script.inc

2024-09-08 12:50:35 +03:00

event.inc

Merge commit '678fdf9' into pret-merge

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

field_effect_script.inc

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

2022-04-02 18:45:18 -03:00

function.inc

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

2022-04-02 18:45:18 -03:00

m4a.inc

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

2022-04-02 18:45:18 -03:00

map.inc

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-01-17 18:11:35 -03:00

movement.inc

Replace Incorrect Slow Stairs Movement with Correct One (#6275)

2025-03-16 14:51:36 -07:00

music_voice.inc

Further removed trailing whitespaces

2022-09-13 16:26:36 -03:00

trainer_hill.inc

Clean up some trainer hill

2022-03-31 12:54:07 -04:00