Merge master into ObjEvent rename

Browse Source

...

This commit is contained in:

GriffinR

2019-12-21 05:19:27 -05:00

parent 949509aade 026e1108b2

commit 68cdd7b1cb

67 changed files with 1026 additions and 822 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

graphics/object_events/pics/effects/unknown_33.png → graphics/event_objects/pics/effects/lavaridge_gym_warp.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 406 B After Width:  |  Height:  |  Size: 406 B

graphics/object_events/pics/effects/lavaridge_gym_warp.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 406 B