sovereignx/graphics
Eduardo Quezada 124c17d315 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	README.md
#	data/field_effect_scripts.s
#	data/maps/AncientTomb/scripts.inc
#	data/maps/DesertRuins/scripts.inc
#	data/maps/IslandCave/scripts.inc
#	data/scripts/follower.inc
#	graphics/object_events/pics/pokemon/wailord.png
#	graphics/object_events/pics/pokemon_old/substitute.png
#	include/constants/event_objects.h
#	include/global.h
#	remote_build.sh
#	spritesheet_rules.mk
#	src/bike.c
#	src/data/object_events/object_event_anims.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info_followers.h
#	src/data/object_events/object_event_pic_tables.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_screen_effect.c
#	src/overworld.c
#	src/palette.c
#	src/pokemon_summary_screen.c
#	src/scrcmd.c
#	src/trainer_see.c
2024-02-17 23:40:08 -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
intro
items PLA aux item sprites (#4160) 2024-02-10 18:08:09 +01: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-02-17 23:40:08 -03:00
party_menu
picture_frame
pokeblock
pokedex Fix HGSS Dex List Decapped Tileset (#4126) 2024-02-03 20:07:47 +01:00
pokemon Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 2024-02-17 23:40:08 -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