Eduardo Quezada e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h		2022-10-30 12:30:38 -03:00
..
base_oam.h	Move field effects data and graphics into own directory, and cleanup naming for object events	2020-02-12 17:32:51 -06:00
berry_tree_graphics_tables.h	Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.	2021-12-15 19:33:35 -08:00
movement_action_func_tables.h	Clean up lock/unlock anim movement	2022-08-12 21:18:10 -04:00
movement_type_func_tables.h	Document files with a few remaining symbols	2021-11-02 18:06:06 -04:00
object_event_anims.h	Fix bunny hoppy typo	2022-02-28 13:34:39 -05:00
object_event_graphics_info_pointers.h	Adding missing externs	2022-09-05 09:49:20 -04:00
object_event_graphics_info.h	Use constants for overworld object palette slots	2022-09-27 20:16:48 -04:00
object_event_graphics.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge	2022-04-13 20:51:35 +02:00
object_event_pic_tables.h	Document some objev anims, make objevgfx info static	2021-04-05 19:52:35 -04:00
object_event_subsprites.h	Use ARRAY_COUNT for obj event subsprite tables	2022-03-03 14:54:05 -05:00