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

..

constants.inc

Reference TMs and HMs by move instead of number (#1732)

2023-08-09 10:51:01 -04:00

gba_constants.inc

Arbitrary trainer scripts + map script/trigger softlock prevention (#5033)

2025-01-08 10:27:00 +00:00

global.inc

Add include guards for assembly constants files

2023-09-03 20:57:54 -04:00

m4a_constants.inc

Document m4a xcmd_0C

2025-12-27 01:11:40 +00:00

tms_hms.inc

Add include guards for assembly constants files

2023-09-03 20:57:54 -04:00