Eduardo Quezada fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_util.c # src/data/pokemon/species_info/gen_7_families.h # test/battle/ability/download.c # test/battle/ability/intimidate.c # test/battle/ability/supreme_overlord.c # test/battle/ability/zero_to_hero.c # test/battle/ai/ai.c # test/battle/move_effect/plasma_fists.c		2024-07-05 14:25:25 -04:00
..
bag
balls
battle_anims
battle_frontier
battle_interface	Gimmick Refactor (#4449)	2024-06-22 22:25:40 +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
frontier_pass
interface
intro
items
link
mail
map_popup
misc
naming_screen
object_events
party_menu
picture_frame
pokeblock
pokedex
pokemon	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-05 14:25:25 -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
union_room_chat
unused
wallclock
weather
wireless_status_screen
wonder_card
wonder_news