Hedara e758d55a03 Merge remote-tracking branch 'pret/master' into pret-merge ...

Manual cleanups to the Magma Storm animation and AnimTask_InvertScreenColor

 Conflicts:
	asm/macros/battle_anim_script.inc
	data/battle_anim_scripts.s
	include/constants/battle_anim.h
	src/battle_anim_bug.c
	src/battle_anim_dragon.c
	src/battle_anim_effects_1.c
	src/battle_anim_normal.c

2026-01-31 19:20:54 +01:00

..

battle_frontier

Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727

2025-07-27 11:59:07 -04: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 remote-tracking branch 'pret/master' into pret-merge

2026-01-31 19:20:54 +01:00

battle_script.inc

Add enum for battle script commands (#8778)

2026-01-03 13:52:21 +00: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

Misc style and whitespace cleanup (#8681)

2026-01-02 18:01:43 +01:00

field_effect_script.inc

meta: included COLOR_MAP constants in field_effect_script. Credit: SDH

2024-09-08 16:02:51 -04: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

Remove trailing whitespace - Master (#9011)

2026-01-25 10:12:41 +01:00

map.inc

Merge remote-tracking branch 'pret/master' into pret-merge

2026-01-01 22:16:58 +01: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