Hedara 0eeba00d1b Merge branch 'master' into master-upcoming-2025-04-30 ... Conflicts: include/battle.h include/constants/expansion.h include/graphics.h src/battle_bg.c src/battle_util.c src/data/graphics/battle_terrain.h src/data/graphics/pokemon.h src/pokeblock_feed.c src/pokemon_sprite_visualizer.c		2025-04-30 15:22:37 +02:00
..
bag
balls
battle_anims	Replaced Blue Sky background for Rock Field (#6516)	2025-04-07 11:04:21 +02:00
battle_environment
battle_frontier
battle_interface	Resized gimmick indicators to reduce VRAM usage (#6319)	2025-02-22 12:28:53 -03:00
battle_transitions
berries
berry_blender
berry_crush
berry_fix
birch_speech
cable_car
cave_transition	Fix CaveTransition pals	2025-01-15 10:08:02 +01:00
contest
credits
decorations
dexnav
diploma
dodrio_berry_picking
door_anims
easy_chat
evolution_scene
expansion_intro
field_effects
fonts	Type Effectiveness Indicators when selecting moves (#6559)	2025-04-12 01:03:45 +02:00
frontier_pass
interface
intro
items
link
mail
map_popup
misc	Merge remote-tracking branch 'pret/master' into new-pret-merge	2025-04-29 20:27:33 +02:00
naming_screen
object_events
party_menu
picture_frame
pokeblock
pokedex
pokemon	New Lurantis animation (#6725)	2025-04-30 12:45:29 +02:00
pokemon_jump
pokemon_storage
pokenav
rayquaza_scene
reset_rtc_screen
rotating_gates
roulette
shop
slot_machine
starter_choose
summary_screen	IV/EV Info on Summary Screen (#6027)	2025-01-20 09:41:31 +01:00
text_window
title_screen
trade
trainer_card
trainer_hill
trainers
types
union_room_chat
unused
wallclock
weather
wireless_status_screen
wonder_card
wonder_news