merging in mon animations PR

Browse source

# Conflicts:
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/pokemon.c

...

This commit is contained in:

Eduardo Quezada 2022-10-02 21:20:56 -03:00

parent fe107645f7 5e399955d5

commit 70907fa375

2 changed files with 3806 additions and 2650 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

4425

src/data/pokemon_graphics/front_pic_anims.h

View file

File diff suppressed because it is too large Load diff

2031

src/pokemon.c

View file

File diff suppressed because it is too large Load diff