Eduardo Quezada 4b1aca19cb Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ...

# Conflicts:
#	src/battle_controller_link_opponent.c
#	src/battle_controller_opponent.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controllers.c
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
#	src/pokemon.c

2022-09-10 00:17:03 -04: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

Add TAG_NONE

2021-09-14 13:14:14 -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