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

Conflicts:
	include/constants/battle_ai.h
	src/battle_ai_script_commands.c
	src/battle_gfx_sfx_util.c
	src/pokemon_summary_screen.c
	src/trainer_pokemon_sprites.c

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

Document magic number in createspriteontargets (#8551)

2025-12-17 10:43:57 +01:00

battle_script.inc

fix poisons absorbing toxic spikes when fainting from other hazards (#8644)

2025-12-23 21:47:42 +01: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

19/11/25 Master to upcoming merge

2025-11-19 18:20:30 +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

Key split restructure (#2168)

2025-08-02 02:11:50 +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