diff --git a/graphics/event_objects/pics/people/brendan/surfing.png b/graphics/event_objects/pics/people/brendan/surfing.png index 692121a90d..c0ddb14f6a 100644 Binary files a/graphics/event_objects/pics/people/brendan/surfing.png and b/graphics/event_objects/pics/people/brendan/surfing.png differ diff --git a/graphics/event_objects/pics/people/brendan/watering.png b/graphics/event_objects/pics/people/brendan/watering.png index ace9c2bcda..e348d8994d 100644 Binary files a/graphics/event_objects/pics/people/brendan/watering.png and b/graphics/event_objects/pics/people/brendan/watering.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike.png b/graphics/event_objects/pics/people/may/acro_bike.png new file mode 100644 index 0000000000..37e8811069 Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/00.png b/graphics/event_objects/pics/people/may/acro_bike/00.png deleted file mode 100644 index 389f29985c..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/00.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/01.png b/graphics/event_objects/pics/people/may/acro_bike/01.png deleted file mode 100644 index d6b698965d..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/01.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/02.png b/graphics/event_objects/pics/people/may/acro_bike/02.png deleted file mode 100644 index ecb59b54f4..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/02.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/03.png b/graphics/event_objects/pics/people/may/acro_bike/03.png deleted file mode 100644 index dfdd7a56a8..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/03.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/04.png b/graphics/event_objects/pics/people/may/acro_bike/04.png deleted file mode 100644 index 6a6fa22fd2..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/04.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/05.png b/graphics/event_objects/pics/people/may/acro_bike/05.png deleted file mode 100644 index 3b73f3367f..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/05.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/06.png b/graphics/event_objects/pics/people/may/acro_bike/06.png deleted file mode 100644 index 368f0a05b3..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/06.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/07.png b/graphics/event_objects/pics/people/may/acro_bike/07.png deleted file mode 100644 index e43d75556c..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/07.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/08.png b/graphics/event_objects/pics/people/may/acro_bike/08.png deleted file mode 100644 index ec9ef52e6f..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/08.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/09.png b/graphics/event_objects/pics/people/may/acro_bike/09.png deleted file mode 100644 index 55522bd5b9..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/09.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/10.png b/graphics/event_objects/pics/people/may/acro_bike/10.png deleted file mode 100644 index eff73287ff..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/10.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/11.png b/graphics/event_objects/pics/people/may/acro_bike/11.png deleted file mode 100644 index 092fffddb1..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/11.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/12.png b/graphics/event_objects/pics/people/may/acro_bike/12.png deleted file mode 100644 index 233a032665..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/12.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/13.png b/graphics/event_objects/pics/people/may/acro_bike/13.png deleted file mode 100644 index f1736a0ec4..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/13.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/14.png b/graphics/event_objects/pics/people/may/acro_bike/14.png deleted file mode 100644 index bf4ade7f03..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/14.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/15.png b/graphics/event_objects/pics/people/may/acro_bike/15.png deleted file mode 100644 index 9fccb50268..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/15.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/16.png b/graphics/event_objects/pics/people/may/acro_bike/16.png deleted file mode 100644 index 6d34e41bf3..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/16.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/17.png b/graphics/event_objects/pics/people/may/acro_bike/17.png deleted file mode 100644 index e01484497f..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/17.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/18.png b/graphics/event_objects/pics/people/may/acro_bike/18.png deleted file mode 100644 index a4bee4772e..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/18.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/19.png b/graphics/event_objects/pics/people/may/acro_bike/19.png deleted file mode 100644 index f7e10f1325..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/19.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/20.png b/graphics/event_objects/pics/people/may/acro_bike/20.png deleted file mode 100644 index f9f34e4ae4..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/20.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/21.png b/graphics/event_objects/pics/people/may/acro_bike/21.png deleted file mode 100644 index 8784ce762d..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/21.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/22.png b/graphics/event_objects/pics/people/may/acro_bike/22.png deleted file mode 100644 index 8753ad9c98..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/22.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/23.png b/graphics/event_objects/pics/people/may/acro_bike/23.png deleted file mode 100644 index c2d8a60cbe..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/23.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/24.png b/graphics/event_objects/pics/people/may/acro_bike/24.png deleted file mode 100644 index 1836e5fed5..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/24.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/25.png b/graphics/event_objects/pics/people/may/acro_bike/25.png deleted file mode 100644 index d939701710..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/25.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/acro_bike/26.png b/graphics/event_objects/pics/people/may/acro_bike/26.png deleted file mode 100644 index 8a5ba8ef66..0000000000 Binary files a/graphics/event_objects/pics/people/may/acro_bike/26.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/field_move.png b/graphics/event_objects/pics/people/may/field_move.png new file mode 100644 index 0000000000..41aa13627f Binary files /dev/null and b/graphics/event_objects/pics/people/may/field_move.png differ diff --git a/graphics/event_objects/pics/people/may/field_move/0.png b/graphics/event_objects/pics/people/may/field_move/0.png deleted file mode 100644 index 9fecaa3d4f..0000000000 Binary files a/graphics/event_objects/pics/people/may/field_move/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/field_move/1.png b/graphics/event_objects/pics/people/may/field_move/1.png deleted file mode 100644 index 47341322bb..0000000000 Binary files a/graphics/event_objects/pics/people/may/field_move/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/field_move/2.png b/graphics/event_objects/pics/people/may/field_move/2.png deleted file mode 100644 index bdd23f0cfd..0000000000 Binary files a/graphics/event_objects/pics/people/may/field_move/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/field_move/3.png b/graphics/event_objects/pics/people/may/field_move/3.png deleted file mode 100644 index c72277f745..0000000000 Binary files a/graphics/event_objects/pics/people/may/field_move/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/field_move/4.png b/graphics/event_objects/pics/people/may/field_move/4.png deleted file mode 100644 index 9e62b6869d..0000000000 Binary files a/graphics/event_objects/pics/people/may/field_move/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing.png b/graphics/event_objects/pics/people/may/fishing.png new file mode 100644 index 0000000000..e8d3533f35 Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing.png differ diff --git a/graphics/event_objects/pics/people/may/fishing/00.png b/graphics/event_objects/pics/people/may/fishing/00.png deleted file mode 100644 index 24d435e84d..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/00.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/01.png b/graphics/event_objects/pics/people/may/fishing/01.png deleted file mode 100644 index f4ec1ccdd1..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/01.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/02.png b/graphics/event_objects/pics/people/may/fishing/02.png deleted file mode 100644 index 9d2e66b4f8..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/02.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/03.png b/graphics/event_objects/pics/people/may/fishing/03.png deleted file mode 100644 index a7078e584d..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/03.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/04.png b/graphics/event_objects/pics/people/may/fishing/04.png deleted file mode 100644 index f135404bc4..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/04.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/05.png b/graphics/event_objects/pics/people/may/fishing/05.png deleted file mode 100644 index cb45778ac2..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/05.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/06.png b/graphics/event_objects/pics/people/may/fishing/06.png deleted file mode 100644 index 910e2f780a..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/06.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/07.png b/graphics/event_objects/pics/people/may/fishing/07.png deleted file mode 100644 index a13b1cad5f..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/07.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/08.png b/graphics/event_objects/pics/people/may/fishing/08.png deleted file mode 100644 index 2976434818..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/08.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/09.png b/graphics/event_objects/pics/people/may/fishing/09.png deleted file mode 100644 index 069eb2b205..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/09.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/10.png b/graphics/event_objects/pics/people/may/fishing/10.png deleted file mode 100644 index 5eca2728d0..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/10.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/fishing/11.png b/graphics/event_objects/pics/people/may/fishing/11.png deleted file mode 100644 index 9895c388a2..0000000000 Binary files a/graphics/event_objects/pics/people/may/fishing/11.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/mach_bike.png b/graphics/event_objects/pics/people/may/mach_bike.png new file mode 100644 index 0000000000..4e199b84a8 Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/0.png b/graphics/event_objects/pics/people/may/mach_bike/0.png deleted file mode 100644 index 389f29985c..0000000000 Binary files a/graphics/event_objects/pics/people/may/mach_bike/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/1.png b/graphics/event_objects/pics/people/may/mach_bike/1.png deleted file mode 100644 index d6b698965d..0000000000 Binary files a/graphics/event_objects/pics/people/may/mach_bike/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/2.png b/graphics/event_objects/pics/people/may/mach_bike/2.png deleted file mode 100644 index ecb59b54f4..0000000000 Binary files a/graphics/event_objects/pics/people/may/mach_bike/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/3.png b/graphics/event_objects/pics/people/may/mach_bike/3.png deleted file mode 100644 index dfdd7a56a8..0000000000 Binary files a/graphics/event_objects/pics/people/may/mach_bike/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/4.png b/graphics/event_objects/pics/people/may/mach_bike/4.png deleted file mode 100644 index 6a6fa22fd2..0000000000 Binary files a/graphics/event_objects/pics/people/may/mach_bike/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/5.png b/graphics/event_objects/pics/people/may/mach_bike/5.png deleted file mode 100644 index 3b73f3367f..0000000000 Binary files a/graphics/event_objects/pics/people/may/mach_bike/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/6.png b/graphics/event_objects/pics/people/may/mach_bike/6.png deleted file mode 100644 index 368f0a05b3..0000000000 Binary files a/graphics/event_objects/pics/people/may/mach_bike/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/7.png b/graphics/event_objects/pics/people/may/mach_bike/7.png deleted file mode 100644 index e43d75556c..0000000000 Binary files a/graphics/event_objects/pics/people/may/mach_bike/7.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/mach_bike/8.png b/graphics/event_objects/pics/people/may/mach_bike/8.png deleted file mode 100644 index ec9ef52e6f..0000000000 Binary files a/graphics/event_objects/pics/people/may/mach_bike/8.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/00.png b/graphics/event_objects/pics/people/may/normal/00.png deleted file mode 100644 index 58aac207f1..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/00.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/01.png b/graphics/event_objects/pics/people/may/normal/01.png deleted file mode 100644 index 2c3641e0ad..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/01.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/02.png b/graphics/event_objects/pics/people/may/normal/02.png deleted file mode 100644 index 32b7120a5c..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/02.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/03.png b/graphics/event_objects/pics/people/may/normal/03.png deleted file mode 100644 index d1047dff89..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/03.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/04.png b/graphics/event_objects/pics/people/may/normal/04.png deleted file mode 100644 index 848166557e..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/04.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/05.png b/graphics/event_objects/pics/people/may/normal/05.png deleted file mode 100644 index 5e6ec70ffc..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/05.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/06.png b/graphics/event_objects/pics/people/may/normal/06.png deleted file mode 100644 index 0e318b4667..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/06.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/07.png b/graphics/event_objects/pics/people/may/normal/07.png deleted file mode 100644 index e11b30b65a..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/07.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/08.png b/graphics/event_objects/pics/people/may/normal/08.png deleted file mode 100644 index 4aae3e9d66..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/08.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/09.png b/graphics/event_objects/pics/people/may/normal/09.png deleted file mode 100644 index eae4c02ee9..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/09.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/10.png b/graphics/event_objects/pics/people/may/normal/10.png deleted file mode 100644 index 2a678208e0..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/10.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/11.png b/graphics/event_objects/pics/people/may/normal/11.png deleted file mode 100644 index 7ca7d3e6f4..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/11.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/12.png b/graphics/event_objects/pics/people/may/normal/12.png deleted file mode 100644 index 1e2d408949..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/12.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/13.png b/graphics/event_objects/pics/people/may/normal/13.png deleted file mode 100644 index ca020591c1..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/13.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/14.png b/graphics/event_objects/pics/people/may/normal/14.png deleted file mode 100644 index 6a5a2e3e52..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/14.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/15.png b/graphics/event_objects/pics/people/may/normal/15.png deleted file mode 100644 index 06d8131673..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/15.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/16.png b/graphics/event_objects/pics/people/may/normal/16.png deleted file mode 100644 index c1fe3d367d..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/16.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/normal/17.png b/graphics/event_objects/pics/people/may/normal/17.png deleted file mode 100644 index 334c70cf14..0000000000 Binary files a/graphics/event_objects/pics/people/may/normal/17.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/running.png b/graphics/event_objects/pics/people/may/running.png new file mode 100644 index 0000000000..40808c9650 Binary files /dev/null and b/graphics/event_objects/pics/people/may/running.png differ diff --git a/graphics/event_objects/pics/people/may/surfing.png b/graphics/event_objects/pics/people/may/surfing.png new file mode 100644 index 0000000000..5b783f4991 Binary files /dev/null and b/graphics/event_objects/pics/people/may/surfing.png differ diff --git a/graphics/event_objects/pics/people/may/surfing/0.png b/graphics/event_objects/pics/people/may/surfing/0.png deleted file mode 100644 index 98b152f5f3..0000000000 Binary files a/graphics/event_objects/pics/people/may/surfing/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/surfing/1.png b/graphics/event_objects/pics/people/may/surfing/1.png deleted file mode 100644 index 45ae647056..0000000000 Binary files a/graphics/event_objects/pics/people/may/surfing/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/surfing/2.png b/graphics/event_objects/pics/people/may/surfing/2.png deleted file mode 100644 index eb6f7675ef..0000000000 Binary files a/graphics/event_objects/pics/people/may/surfing/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/surfing/3.png b/graphics/event_objects/pics/people/may/surfing/3.png deleted file mode 100644 index 18756fe1b5..0000000000 Binary files a/graphics/event_objects/pics/people/may/surfing/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/surfing/4.png b/graphics/event_objects/pics/people/may/surfing/4.png deleted file mode 100644 index ac89a2672b..0000000000 Binary files a/graphics/event_objects/pics/people/may/surfing/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/surfing/5.png b/graphics/event_objects/pics/people/may/surfing/5.png deleted file mode 100644 index 2569df0083..0000000000 Binary files a/graphics/event_objects/pics/people/may/surfing/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/underwater.png b/graphics/event_objects/pics/people/may/underwater.png new file mode 100644 index 0000000000..8a2d654656 Binary files /dev/null and b/graphics/event_objects/pics/people/may/underwater.png differ diff --git a/graphics/event_objects/pics/people/may/underwater/0.png b/graphics/event_objects/pics/people/may/underwater/0.png deleted file mode 100644 index 678dc4bb6e..0000000000 Binary files a/graphics/event_objects/pics/people/may/underwater/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/underwater/1.png b/graphics/event_objects/pics/people/may/underwater/1.png deleted file mode 100644 index 697cec2d13..0000000000 Binary files a/graphics/event_objects/pics/people/may/underwater/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/underwater/2.png b/graphics/event_objects/pics/people/may/underwater/2.png deleted file mode 100644 index 423f01f88e..0000000000 Binary files a/graphics/event_objects/pics/people/may/underwater/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/underwater/3.png b/graphics/event_objects/pics/people/may/underwater/3.png deleted file mode 100644 index 4118573a37..0000000000 Binary files a/graphics/event_objects/pics/people/may/underwater/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/walking.png b/graphics/event_objects/pics/people/may/walking.png new file mode 100644 index 0000000000..b50bf12295 Binary files /dev/null and b/graphics/event_objects/pics/people/may/walking.png differ diff --git a/graphics/event_objects/pics/people/may/watering.png b/graphics/event_objects/pics/people/may/watering.png new file mode 100644 index 0000000000..28c5b41beb Binary files /dev/null and b/graphics/event_objects/pics/people/may/watering.png differ diff --git a/graphics/event_objects/pics/people/may/watering/0.png b/graphics/event_objects/pics/people/may/watering/0.png deleted file mode 100644 index 11e8944a18..0000000000 Binary files a/graphics/event_objects/pics/people/may/watering/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/watering/1.png b/graphics/event_objects/pics/people/may/watering/1.png deleted file mode 100644 index 84aa555022..0000000000 Binary files a/graphics/event_objects/pics/people/may/watering/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/watering/2.png b/graphics/event_objects/pics/people/may/watering/2.png deleted file mode 100644 index 5d68e49940..0000000000 Binary files a/graphics/event_objects/pics/people/may/watering/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/watering/3.png b/graphics/event_objects/pics/people/may/watering/3.png deleted file mode 100644 index c0f732d725..0000000000 Binary files a/graphics/event_objects/pics/people/may/watering/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/watering/4.png b/graphics/event_objects/pics/people/may/watering/4.png deleted file mode 100644 index 85657cc6c6..0000000000 Binary files a/graphics/event_objects/pics/people/may/watering/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/people/may/watering/5.png b/graphics/event_objects/pics/people/may/watering/5.png deleted file mode 100644 index 939671a315..0000000000 Binary files a/graphics/event_objects/pics/people/may/watering/5.png and /dev/null differ diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 407bc20e03..42385f0c42 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -48,33 +48,11 @@ const u32 gEventObjectPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/ const u32 gEventObjectPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/0.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/1.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/2.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/3.4bpp"); -const u32 gEventObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/0.4bpp"); -const u32 gEventObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/1.4bpp"); -const u32 gEventObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/2.4bpp"); -const u32 gEventObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/3.4bpp"); +const u32 gEventObjectPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); +const u32 gEventObjectPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal"); -const u32 gEventObjectPic_MayNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/00.4bpp"); -const u32 gEventObjectPic_MayNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/01.4bpp"); -const u32 gEventObjectPic_MayNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/02.4bpp"); -const u32 gEventObjectPic_MayNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/03.4bpp"); -const u32 gEventObjectPic_MayNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/04.4bpp"); -const u32 gEventObjectPic_MayNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/05.4bpp"); -const u32 gEventObjectPic_MayNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/06.4bpp"); -const u32 gEventObjectPic_MayNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/07.4bpp"); -const u32 gEventObjectPic_MayNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/08.4bpp"); -const u32 gEventObjectPic_MayNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/09.4bpp"); -const u32 gEventObjectPic_MayNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/10.4bpp"); -const u32 gEventObjectPic_MayNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/11.4bpp"); -const u32 gEventObjectPic_MayNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/12.4bpp"); -const u32 gEventObjectPic_MayNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/13.4bpp"); -const u32 gEventObjectPic_MayNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/14.4bpp"); -const u32 gEventObjectPic_MayNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/15.4bpp"); -const u32 gEventObjectPic_MayNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/16.4bpp"); -const u32 gEventObjectPic_MayNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/17.4bpp"); +const u32 gEventObjectPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp"); +const u32 gEventObjectPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp"); const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal"); const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal"); const u32 gEventObjectPic_RubySapphireMay_0[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/00.4bpp"); @@ -111,71 +89,12 @@ const u16 NullPalette_84A5638[16] = {}; const u16 NullPalette_84A5658[16] = {}; const u16 NullPalette_84A5678[16] = {}; const u16 NullPalette_84A5698[16] = {}; -const u32 gEventObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/0.4bpp"); -const u32 gEventObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/1.4bpp"); -const u32 gEventObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/2.4bpp"); -const u32 gEventObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/3.4bpp"); -const u32 gEventObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/4.4bpp"); -const u32 gEventObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/5.4bpp"); -const u32 gEventObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/6.4bpp"); -const u32 gEventObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/7.4bpp"); -const u32 gEventObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/8.4bpp"); -const u32 gEventObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/00.4bpp"); -const u32 gEventObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/01.4bpp"); -const u32 gEventObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/02.4bpp"); -const u32 gEventObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/03.4bpp"); -const u32 gEventObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/04.4bpp"); -const u32 gEventObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/05.4bpp"); -const u32 gEventObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/06.4bpp"); -const u32 gEventObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/07.4bpp"); -const u32 gEventObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/08.4bpp"); -const u32 gEventObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/09.4bpp"); -const u32 gEventObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/10.4bpp"); -const u32 gEventObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/11.4bpp"); -const u32 gEventObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/12.4bpp"); -const u32 gEventObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/13.4bpp"); -const u32 gEventObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/14.4bpp"); -const u32 gEventObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/15.4bpp"); -const u32 gEventObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/16.4bpp"); -const u32 gEventObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/17.4bpp"); -const u32 gEventObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/18.4bpp"); -const u32 gEventObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/19.4bpp"); -const u32 gEventObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/20.4bpp"); -const u32 gEventObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/21.4bpp"); -const u32 gEventObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/22.4bpp"); -const u32 gEventObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/23.4bpp"); -const u32 gEventObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/24.4bpp"); -const u32 gEventObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/25.4bpp"); -const u32 gEventObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/26.4bpp"); -const u32 gEventObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/0.4bpp"); -const u32 gEventObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/3.4bpp"); -const u32 gEventObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/1.4bpp"); -const u32 gEventObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/4.4bpp"); -const u32 gEventObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/2.4bpp"); -const u32 gEventObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/5.4bpp"); -const u32 gEventObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/0.4bpp"); -const u32 gEventObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/1.4bpp"); -const u32 gEventObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/2.4bpp"); -const u32 gEventObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/3.4bpp"); -const u32 gEventObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/4.4bpp"); -const u32 gEventObjectPic_MayFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/00.4bpp"); -const u32 gEventObjectPic_MayFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/01.4bpp"); -const u32 gEventObjectPic_MayFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/02.4bpp"); -const u32 gEventObjectPic_MayFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/03.4bpp"); -const u32 gEventObjectPic_MayFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/04.4bpp"); -const u32 gEventObjectPic_MayFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/05.4bpp"); -const u32 gEventObjectPic_MayFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/06.4bpp"); -const u32 gEventObjectPic_MayFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/07.4bpp"); -const u32 gEventObjectPic_MayFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/08.4bpp"); -const u32 gEventObjectPic_MayFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/09.4bpp"); -const u32 gEventObjectPic_MayFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/10.4bpp"); -const u32 gEventObjectPic_MayFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/11.4bpp"); -const u32 gEventObjectPic_MayWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/0.4bpp"); -const u32 gEventObjectPic_MayWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/3.4bpp"); -const u32 gEventObjectPic_MayWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/1.4bpp"); -const u32 gEventObjectPic_MayWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/4.4bpp"); -const u32 gEventObjectPic_MayWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/2.4bpp"); -const u32 gEventObjectPic_MayWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/5.4bpp"); +const u32 gEventObjectPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); +const u32 gEventObjectPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); +const u32 gEventObjectPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); +const u32 gEventObjectPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); +const u32 gEventObjectPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); +const u32 gEventObjectPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal"); const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal"); const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal");