Eduardo Quezada 341ce6fd95 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 ...

# Conflicts:
#	.github/workflows/build.yml
#	README.md
#	gflib/sprite.c
#	graphics/pokemon/banette/anim_front.png
#	graphics/pokemon/banette/normal.pal
#	graphics/pokemon/sentret/normal.pal
#	graphics/pokemon/togetic/anim_front.png
#	graphics/pokemon/togetic/normal.pal
#	include/battle_script_commands.h
#	include/data.h
#	ld_script.txt
#	src/battle_controller_player.c
#	src/bike.c
#	src/event_object_movement.c

2023-06-16 21:25:16 -04:00

..

berry_trees

Purged the bKGD warning once and for all

2023-02-24 02:01:55 -03:00

cushions

Rename event_object directories

2019-11-21 00:44:55 -05:00

dolls

Rename event_object directories

2019-11-21 00:44:55 -05:00

misc

Added affine animations for followers entering/exiting pokeball.

2021-05-05 19:58:44 -04:00

people

Rename event_object directories

2019-11-21 00:44:55 -05:00

pokemon

Updated Squirtle & evolutions OW graphics. Credit: andrian_timeswift

2023-01-12 21:33:16 -05:00