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
berry_tree_graphics_tables.h
movement_action_func_tables.h
movement_type_func_tables.h
object_event_anims.h
object_event_graphics_info_pointers.h	Adding missing externs	2022-09-05 09:49:20 -04:00
object_event_graphics_info.h
object_event_graphics.h
object_event_pic_tables.h
object_event_subsprites.h