Eduardo Quezada 58436a077b Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/breaking/speciesReorder ... # Conflicts: # src/data/pokemon/base_stats.h # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/form_change_tables.h # src/data/pokemon/form_species_table_pointers.h # src/data/pokemon/teachable_learnsets.h # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h		2022-10-10 11:50:05 -03:00
..
bag
balls
battle_anims	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
battle_frontier	Standardize judgement vs judgment spelling	2022-08-20 22:58:46 -04:00
battle_interface	tweak z indicator position relative to healthbox	2022-07-18 09:44:04 -04:00
battle_terrain
battle_transitions	Ignore num_tiles if it would truncate non-transparent tiles (#1729)	2022-08-18 23:07:25 -04:00
berries
berry_blender
berry_crush
berry_fix
birch_speech
cable_car
cave_transition
contest
credits
decorations
diploma
dodrio_berry_picking
door_anims	Some field door comments	2022-05-18 13:03:02 -04:00
easy_chat
evolution_scene
field_effects
fonts
frontier_pass
interface
intro
items
link
mail
map_popup
misc
naming_screen	Split naming screen palettes/graphics, use correct image palettes, clean up	2022-08-09 09:27:28 -04:00
object_events
party_menu
picture_frame	Ignore num_tiles if it would truncate non-transparent tiles (#1729)	2022-08-18 23:07:25 -04:00
pokeblock
pokedex
pokemon	Spiky Eared Pichu second frame	2022-09-30 17:54:11 -03:00
pokemon_jump
pokemon_storage
pokenav
rayquaza_scene
reset_rtc_screen
rotating_gates
roulette
shop
slot_machine
spinda_spots
starter_choose
summary_screen
text_window
title_screen
trade
trainer_card
trainer_hill
trainers	Generate trainer pic palettes from image	2022-09-05 16:09:45 -04:00
types	Update fairy.png	2022-08-27 22:42:05 -04:00
union_room_chat
unused
wallclock
weather
wonder_card
wonder_news