sovereignx/graphics
Eduardo Quezada ddc752eb14 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	asm/macros/event.inc
#	data/field_effect_scripts.s
#	data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
#	data/script_cmd_table.inc
#	graphics/pokemon/castform/sunny/anim_front.png
#	graphics/pokemon/castform/sunny/normal.pal
#	include/battle_util.h
#	include/constants/event_object_movement.h
#	include/constants/field_effects.h
#	src/battle_controller_player.c
#	src/battle_util.c
#	src/data/object_events/movement_action_func_tables.h
#	src/data/object_events/object_event_pic_tables.h
#	src/data/trainer_graphics/back_pic_anims.h
#	src/daycare.c
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/load_save.c
#	src/scrcmd.c
#	src/trainer_see.c
2024-01-17 18:11:35 -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 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-01-17 18:11:35 -03:00
fonts
frontier_pass
interface Renamed Battle Move "Split" to the proper "Category" (#3774) 2023-12-20 10:08:26 +01:00
intro
items Add Indigo Disk item data (#3854) 2023-12-28 23:00:34 +01:00
link
mail
map_popup
misc
naming_screen
object_events
party_menu
picture_frame
pokeblock
pokedex
pokemon Replaces some older gen9 sprites with Pokemoncommunity ones (#3969) 2024-01-11 10:23:57 +01: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