Eduardo Quezada 021074cd2e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # src/data/graphics/pokemon.h # src/data/pokemon/species_info.h # src/data/pokemon/species_info/gen_1_families.h # src/data/pokemon/species_info/gen_2_families.h # src/data/pokemon/species_info/gen_4_families.h # src/data/pokemon/species_info/gen_5_families.h # src/data/pokemon/species_info/gen_8_families.h		2024-05-28 14:28:33 -04:00
..
bag
balls
battle_anims	Upgraded Dragon Darts Animation (#4620)	2024-05-28 10:17:52 +02:00
battle_frontier
battle_interface	fixed psychic type tera icon (#4435)	2024-04-24 18:08:20 +02:00
battle_terrain
battle_transitions
berries
berry_blender
berry_crush
berry_fix
birch_speech
cable_car
cave_transition
contest
credits
decorations
diploma
dodrio_berry_picking
door_anims
easy_chat
evolution_scene
expansion_intro
field_effects
fonts	Narrower fonts	2024-04-25 18:40:37 +01:00
frontier_pass
interface	Change Frostbite abbreviation from FSB to FRB (#4355)	2024-04-10 09:16:32 +02:00
intro
items	Sceptilite & Salandit sprite fixes (#4614)	2024-05-24 11:28:35 +02:00
link
mail
map_popup
misc
naming_screen
object_events	Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-05-18 10:12:17 -04:00
party_menu
picture_frame
pokeblock
pokedex	Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526	2024-05-26 18:34:26 -04:00
pokemon	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-05-28 14:28:33 -04:00
pokemon_jump
pokemon_storage
pokenav
rayquaza_scene
reset_rtc_screen
rotating_gates
roulette
shop
slot_machine
starter_choose
summary_screen
text_window
title_screen
trade
trainer_card
trainer_hill
trainers
types	Terastallization (#4110)	2024-04-24 11:17:46 +02:00
union_room_chat
unused
wallclock
weather
wireless_status_screen
wonder_card
wonder_news