Eduardo Quezada 75ad61e5bf Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # data/battle_scripts_1.s # include/constants/battle_move_effects.h # src/battle_ai_main.c # src/battle_ai_util.c # src/battle_tv.c # src/data/battle_moves.h # src/data/graphics/pokemon.h		2024-02-19 10:13:13 -03:00
..
bag
balls
battle_anims
battle_frontier
battle_interface
battle_terrain
battle_transitions	Refactor mugshots (#4000)	2024-01-16 00:45:13 +01:00
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	PLA aux item sprites (#4160)	2024-02-10 18:08:09 +01:00
link
mail
map_popup
misc
naming_screen
object_events
party_menu
picture_frame
pokeblock
pokedex	Fix HGSS Dex List Decapped Tileset (#4126)	2024-02-03 20:07:47 +01:00
pokemon	Merge branch '_RHH/master' into _RHH/upcoming	2024-02-19 10:13:13 -03: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