Hedara 51a5577f65 Merge branch 'master' into master-upcoming ...

Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c

2025-06-25 14:17:07 +02:00

..

ai.h

Haze Boosting AI Followup (#6966)

2025-06-11 18:30:22 +02:00

battle.h

Stat Change (Animation) Refactor (#7144)

2025-06-18 14:24:35 +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

Make Pokémon Sprite Visualizer name official (#4745)

2024-06-09 12:12:35 -04:00

dexnav.h

Corrected Dexnav config related comment (#6610)

2025-04-13 21:49:38 -04:00

follower_npc.h

Follower NPCs (follow-me) (#6500)

2025-04-27 14:56:18 +02:00

general.h

Add config options for removing bard phoneme audio to save ROM space (#7155)

2025-06-18 20:16:25 -07:00

item.h

Match current gen behavior for battle environment after fishing (#6099)

2025-01-26 22:39:14 +01:00

overworld.h

Update the description of OW_OBJECT_VANILLA_SHADOWS (#7184)

2025-06-23 15:40:13 +02:00

pokedex_plus_hgss.h

Pokedex Plus HGSS move configs (#6687)

2025-04-24 19:34:37 +02:00

pokemon.h

Disable P_TUTOR_MOVES_ARRAY config (#6693)

2025-04-25 12:33:03 +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

IV/EV Info on Summary Screen (#6027)

2025-01-20 09:41:31 +01:00

test.h

New sprite compressor (#5627)

2025-05-30 23:10:54 +02:00