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
escape.c
heal_and_cure_status.c
increase_stat.c	Restore X item friendship increase (#7583)	2025-08-26 22:17:30 +02:00
restore_hp.c
restore_pp.c
revive.c
set_mist.c
throw_ball.c