Eduardo Quezada 18aff2db3b Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # asm/macros/battle_anim_script.inc # data/battle_anim_scripts.s # include/constants/battle_anim.h # src/battle_anim.c # src/data/battle_anim.h		2024-07-27 16:26:37 -04:00
..
bag
balls
battle_anims	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-27 16:26:37 -04:00
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	Correct berry fix graphics colors, more PLTT constant use (#1892)	2023-08-09 12:49:21 -04:00
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	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/master' into _RHH/upcoming	2024-07-27 16:26:37 -04:00
pokemon_jump
pokemon_storage
pokenav
rayquaza_scene
reset_rtc_screen
rotating_gates
roulette
shop
slot_machine
starter_choose
summary_screen
text_window	Extract data from text window	2018-01-20 00:49:21 -06:00
title_screen
trade
trainer_card
trainer_hill
trainers
types	Set TYPE_NONE as type 0 + other type data tweaks (#4462)	2024-06-01 07:38:22 +02:00
union_room_chat
unused
wallclock
weather
wireless_status_screen
wonder_card	Fix leftover icon_shadow names	2021-10-17 03:22:55 -04:00
wonder_news