Hedara a2ef3284dd Merge branch 'master' into master-to-upcoming ... Conflicts: data/battle_scripts_1.s include/battle_util.h include/constants/battle.h src/battle_script_commands.c src/battle_util.c		2025-10-29 18:42:59 +01:00
..
ai.h	Z Status move handling: Conversion, Detect, Nature Power, Transform (#7721)	2025-09-24 19:55:29 +02:00
battle.h	Master to upcoming merge	2025-10-25 16:19:32 +02:00
caps.h	Merge level_caps and ev_caps into one caps file (#5429)	2024-09-27 23:40:49 +02:00
debug.h	Add making release build	2025-07-07 10:24:45 -10:00
dexnav.h	Corrected Dexnav config related comment (#6610)	2025-04-13 21:49:38 -04:00
fishing.h	Update fishing odds to match official games (#7574)	2025-10-04 09:05:28 -07:00
follower_npc.h	Follower NPCs (follow-me) (#6500)	2025-04-27 14:56:18 +02:00
general.h	Removed SAVE_TYPE_ERROR_SCREEN config (#7836)	2025-10-02 19:55:39 +02:00
item.h	New Feature: ORAS Dowsing (#7211)	2025-10-27 17:41:07 +01:00
overworld.h	Implement field_name_box (#7697)	2025-09-14 20:45:18 +02:00
pokedex_plus_hgss.h	Disable unowned evo methods (#7103)	2025-06-25 21:29:59 +02:00
pokemon.h	Revert HGSS dex and movelist changes (#8016)	2025-10-23 13:52:25 +02:00
save.h	Adjust description of FREE_MATCH_CALL (#4590)	2024-05-19 10:13:14 +02:00
species_enabled.h	Fixed silent Klefki cry (#4392)	2024-04-14 21:06:17 +02:00
summary_screen.h	fix: hypertraining a stat now optionally reflects in the summary screen (#8035)	2025-10-25 19:15:03 -07:00
test.h	merge master 31/07/25	2025-08-01 12:18:11 +02:00