diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
| commit | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (patch) | |
| tree | 65b32493ea3eaef107ac73f804d23563da0f9ada /graphics | |
| parent | 949509aade2627ded031669c296453c3d0ea9e59 (diff) | |
| parent | 026e1108b26f4ce5cea362997135bd8efc7cb28a (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/event_objects/pics/effects/lavaridge_gym_warp.png (renamed from graphics/object_events/pics/effects/unknown_33.png) | bin | 406 -> 406 bytes |
| -rw-r--r-- | graphics/object_events/pics/effects/lavaridge_gym_warp.png | bin | 0 -> 406 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/graphics/object_events/pics/effects/unknown_33.png b/graphics/event_objects/pics/effects/lavaridge_gym_warp.png Binary files differindex 26b852200..26b852200 100644 --- a/graphics/object_events/pics/effects/unknown_33.png +++ b/graphics/event_objects/pics/effects/lavaridge_gym_warp.png diff --git a/graphics/object_events/pics/effects/lavaridge_gym_warp.png b/graphics/object_events/pics/effects/lavaridge_gym_warp.png Binary files differnew file mode 100644 index 000000000..26b852200 --- /dev/null +++ b/graphics/object_events/pics/effects/lavaridge_gym_warp.png |
