AlexOn1ine 1131b205f2 conflicts

2025-08-28 14:09:38 +02:00

..

cure_status.c

Replaces STATUS2 usage with volatiles in code (#7262)

2025-07-11 22:53:49 +02:00

dire_hit.c

Added test support for 5 battle configs (#5914)

2025-02-09 22:29:23 +01:00

escape.c

Encapsulate move data (#5852)

2025-01-01 20:34:33 +01:00

heal_and_cure_status.c

Changed Tackle for Scratch in tests (#6730)

2025-04-30 17:18:52 -04:00

increase_stat.c

Restore X item friendship increase (#7583)

2025-08-26 22:17:30 +02:00

restore_hp.c

Fix using items to heal partner in battle

2025-04-01 10:38:12 +02:00

restore_pp.c

Changed Tackle for Scratch in tests (#6730)

2025-04-30 17:18:52 -04:00

revive.c

Changed Tackle for Scratch in tests (#6730)

2025-04-30 17:18:52 -04:00

set_mist.c

Update battle messages to Gen 5+ standards (#3240)

2024-10-21 14:52:45 -03:00

throw_ball.c

Added last CannotUseItemsInBattle tests (#3789)

2023-12-21 20:06:12 +01:00