Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4

Browse Source

# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c

...

This commit is contained in:

Eduardo Quezada

2022-09-04 17:44:13 -03:00

parent 616ab63d94 b3c7b9e09f

commit 9241dc6fe7

355 changed files with 20064 additions and 19067 deletions

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

Download Patch File Download Diff File Expand all files Collapse all files

src/battle_anim_flying.c

+1289

File diff suppressed because it is too large Load Diff