Hedara 726f18f360 Merge remote-tracking branch 'pret/master' into pret-merge ... Conflicts: asm/macros/event.inc data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc data/scripts/trainer_hill.inc include/graphics.h		2025-06-24 10:42:24 +02:00
..
battle_frontier	Trainer Battle Parameter Consolidation (#5982)	2025-01-25 22:02:39 +01:00
asm.inc
battle_anim_script.inc
battle_script.inc	Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170)	2025-06-21 00:04:01 +02:00
battle_tent.inc
contest_ai_script.inc
event.inc	Merge remote-tracking branch 'pret/master' into pret-merge	2025-06-24 10:42:24 +02:00
field_effect_script.inc
function.inc
m4a.inc
map.inc
movement.inc	Replace Incorrect Slow Stairs Movement with Correct One (#6275)	2025-03-16 14:51:36 -07:00
music_voice.inc
trainer_hill.inc