From 52aa9cedcf34c3cadcf163722130d9800f99caa7 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Sun, 29 Jul 2018 17:29:36 +0100 Subject: Merge May frames into sprite sheets Plus fix Brendan's surfing and watering frame order. --- .../event_objects/pics/people/brendan/surfing.png | Bin 873 -> 884 bytes .../event_objects/pics/people/brendan/watering.png | Bin 752 -> 757 bytes .../event_objects/pics/people/may/acro_bike.png | Bin 0 -> 2629 bytes .../event_objects/pics/people/may/acro_bike/00.png | Bin 302 -> 0 bytes .../event_objects/pics/people/may/acro_bike/01.png | Bin 297 -> 0 bytes .../event_objects/pics/people/may/acro_bike/02.png | Bin 339 -> 0 bytes .../event_objects/pics/people/may/acro_bike/03.png | Bin 304 -> 0 bytes .../event_objects/pics/people/may/acro_bike/04.png | Bin 305 -> 0 bytes .../event_objects/pics/people/may/acro_bike/05.png | Bin 299 -> 0 bytes .../event_objects/pics/people/may/acro_bike/06.png | Bin 299 -> 0 bytes .../event_objects/pics/people/may/acro_bike/07.png | Bin 336 -> 0 bytes .../event_objects/pics/people/may/acro_bike/08.png | Bin 340 -> 0 bytes .../event_objects/pics/people/may/acro_bike/09.png | Bin 301 -> 0 bytes .../event_objects/pics/people/may/acro_bike/10.png | Bin 313 -> 0 bytes .../event_objects/pics/people/may/acro_bike/11.png | Bin 291 -> 0 bytes .../event_objects/pics/people/may/acro_bike/12.png | Bin 281 -> 0 bytes .../event_objects/pics/people/may/acro_bike/13.png | Bin 297 -> 0 bytes .../event_objects/pics/people/may/acro_bike/14.png | Bin 295 -> 0 bytes .../event_objects/pics/people/may/acro_bike/15.png | Bin 283 -> 0 bytes .../event_objects/pics/people/may/acro_bike/16.png | Bin 284 -> 0 bytes .../event_objects/pics/people/may/acro_bike/17.png | Bin 331 -> 0 bytes .../event_objects/pics/people/may/acro_bike/18.png | Bin 333 -> 0 bytes .../event_objects/pics/people/may/acro_bike/19.png | Bin 334 -> 0 bytes .../event_objects/pics/people/may/acro_bike/20.png | Bin 335 -> 0 bytes .../event_objects/pics/people/may/acro_bike/21.png | Bin 314 -> 0 bytes .../event_objects/pics/people/may/acro_bike/22.png | Bin 315 -> 0 bytes .../event_objects/pics/people/may/acro_bike/23.png | Bin 302 -> 0 bytes .../event_objects/pics/people/may/acro_bike/24.png | Bin 303 -> 0 bytes .../event_objects/pics/people/may/acro_bike/25.png | Bin 337 -> 0 bytes .../event_objects/pics/people/may/acro_bike/26.png | Bin 341 -> 0 bytes .../event_objects/pics/people/may/field_move.png | Bin 0 -> 818 bytes .../event_objects/pics/people/may/field_move/0.png | Bin 295 -> 0 bytes .../event_objects/pics/people/may/field_move/1.png | Bin 295 -> 0 bytes .../event_objects/pics/people/may/field_move/2.png | Bin 293 -> 0 bytes .../event_objects/pics/people/may/field_move/3.png | Bin 324 -> 0 bytes .../event_objects/pics/people/may/field_move/4.png | Bin 327 -> 0 bytes graphics/event_objects/pics/people/may/fishing.png | Bin 0 -> 1640 bytes .../event_objects/pics/people/may/fishing/00.png | Bin 298 -> 0 bytes .../event_objects/pics/people/may/fishing/01.png | Bin 291 -> 0 bytes .../event_objects/pics/people/may/fishing/02.png | Bin 294 -> 0 bytes .../event_objects/pics/people/may/fishing/03.png | Bin 291 -> 0 bytes .../event_objects/pics/people/may/fishing/04.png | Bin 302 -> 0 bytes .../event_objects/pics/people/may/fishing/05.png | Bin 304 -> 0 bytes .../event_objects/pics/people/may/fishing/06.png | Bin 310 -> 0 bytes .../event_objects/pics/people/may/fishing/07.png | Bin 301 -> 0 bytes .../event_objects/pics/people/may/fishing/08.png | Bin 295 -> 0 bytes .../event_objects/pics/people/may/fishing/09.png | Bin 302 -> 0 bytes .../event_objects/pics/people/may/fishing/10.png | Bin 301 -> 0 bytes .../event_objects/pics/people/may/fishing/11.png | Bin 313 -> 0 bytes .../event_objects/pics/people/may/mach_bike.png | Bin 0 -> 1222 bytes .../event_objects/pics/people/may/mach_bike/0.png | Bin 302 -> 0 bytes .../event_objects/pics/people/may/mach_bike/1.png | Bin 297 -> 0 bytes .../event_objects/pics/people/may/mach_bike/2.png | Bin 339 -> 0 bytes .../event_objects/pics/people/may/mach_bike/3.png | Bin 304 -> 0 bytes .../event_objects/pics/people/may/mach_bike/4.png | Bin 305 -> 0 bytes .../event_objects/pics/people/may/mach_bike/5.png | Bin 299 -> 0 bytes .../event_objects/pics/people/may/mach_bike/6.png | Bin 299 -> 0 bytes .../event_objects/pics/people/may/mach_bike/7.png | Bin 336 -> 0 bytes .../event_objects/pics/people/may/mach_bike/8.png | Bin 340 -> 0 bytes .../event_objects/pics/people/may/normal/00.png | Bin 297 -> 0 bytes .../event_objects/pics/people/may/normal/01.png | Bin 294 -> 0 bytes .../event_objects/pics/people/may/normal/02.png | Bin 265 -> 0 bytes .../event_objects/pics/people/may/normal/03.png | Bin 289 -> 0 bytes .../event_objects/pics/people/may/normal/04.png | Bin 287 -> 0 bytes .../event_objects/pics/people/may/normal/05.png | Bin 286 -> 0 bytes .../event_objects/pics/people/may/normal/06.png | Bin 285 -> 0 bytes .../event_objects/pics/people/may/normal/07.png | Bin 271 -> 0 bytes .../event_objects/pics/people/may/normal/08.png | Bin 270 -> 0 bytes .../event_objects/pics/people/may/normal/09.png | Bin 283 -> 0 bytes .../event_objects/pics/people/may/normal/10.png | Bin 291 -> 0 bytes .../event_objects/pics/people/may/normal/11.png | Bin 262 -> 0 bytes .../event_objects/pics/people/may/normal/12.png | Bin 276 -> 0 bytes .../event_objects/pics/people/may/normal/13.png | Bin 275 -> 0 bytes .../event_objects/pics/people/may/normal/14.png | Bin 286 -> 0 bytes .../event_objects/pics/people/may/normal/15.png | Bin 284 -> 0 bytes .../event_objects/pics/people/may/normal/16.png | Bin 277 -> 0 bytes .../event_objects/pics/people/may/normal/17.png | Bin 280 -> 0 bytes graphics/event_objects/pics/people/may/running.png | Bin 0 -> 964 bytes graphics/event_objects/pics/people/may/surfing.png | Bin 0 -> 874 bytes .../event_objects/pics/people/may/surfing/0.png | Bin 300 -> 0 bytes .../event_objects/pics/people/may/surfing/1.png | Bin 291 -> 0 bytes .../event_objects/pics/people/may/surfing/2.png | Bin 284 -> 0 bytes .../event_objects/pics/people/may/surfing/3.png | Bin 303 -> 0 bytes .../event_objects/pics/people/may/surfing/4.png | Bin 296 -> 0 bytes .../event_objects/pics/people/may/surfing/5.png | Bin 287 -> 0 bytes .../event_objects/pics/people/may/underwater.png | Bin 0 -> 688 bytes .../event_objects/pics/people/may/underwater/0.png | Bin 290 -> 0 bytes .../event_objects/pics/people/may/underwater/1.png | Bin 283 -> 0 bytes .../event_objects/pics/people/may/underwater/2.png | Bin 286 -> 0 bytes .../event_objects/pics/people/may/underwater/3.png | Bin 285 -> 0 bytes graphics/event_objects/pics/people/may/walking.png | Bin 0 -> 887 bytes .../event_objects/pics/people/may/watering.png | Bin 0 -> 775 bytes .../event_objects/pics/people/may/watering/0.png | Bin 300 -> 0 bytes .../event_objects/pics/people/may/watering/1.png | Bin 292 -> 0 bytes .../event_objects/pics/people/may/watering/2.png | Bin 306 -> 0 bytes .../event_objects/pics/people/may/watering/3.png | Bin 305 -> 0 bytes .../event_objects/pics/people/may/watering/4.png | Bin 294 -> 0 bytes .../event_objects/pics/people/may/watering/5.png | Bin 306 -> 0 bytes src/data/field_event_obj/event_object_graphics.h | 101 ++------------------- 99 files changed, 10 insertions(+), 91 deletions(-) create mode 100644 graphics/event_objects/pics/people/may/acro_bike.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/00.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/01.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/02.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/03.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/04.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/05.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/06.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/07.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/08.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/09.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/10.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/11.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/12.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/13.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/14.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/15.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/16.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/17.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/18.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/19.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/20.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/21.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/22.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/23.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/24.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/25.png delete mode 100644 graphics/event_objects/pics/people/may/acro_bike/26.png create mode 100644 graphics/event_objects/pics/people/may/field_move.png delete mode 100644 graphics/event_objects/pics/people/may/field_move/0.png delete mode 100644 graphics/event_objects/pics/people/may/field_move/1.png delete mode 100644 graphics/event_objects/pics/people/may/field_move/2.png delete mode 100644 graphics/event_objects/pics/people/may/field_move/3.png delete mode 100644 graphics/event_objects/pics/people/may/field_move/4.png create mode 100644 graphics/event_objects/pics/people/may/fishing.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/00.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/01.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/02.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/03.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/04.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/05.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/06.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/07.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/08.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/09.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/10.png delete mode 100644 graphics/event_objects/pics/people/may/fishing/11.png create mode 100644 graphics/event_objects/pics/people/may/mach_bike.png delete mode 100644 graphics/event_objects/pics/people/may/mach_bike/0.png delete mode 100644 graphics/event_objects/pics/people/may/mach_bike/1.png delete mode 100644 graphics/event_objects/pics/people/may/mach_bike/2.png delete mode 100644 graphics/event_objects/pics/people/may/mach_bike/3.png delete mode 100644 graphics/event_objects/pics/people/may/mach_bike/4.png delete mode 100644 graphics/event_objects/pics/people/may/mach_bike/5.png delete mode 100644 graphics/event_objects/pics/people/may/mach_bike/6.png delete mode 100644 graphics/event_objects/pics/people/may/mach_bike/7.png delete mode 100644 graphics/event_objects/pics/people/may/mach_bike/8.png delete mode 100644 graphics/event_objects/pics/people/may/normal/00.png delete mode 100644 graphics/event_objects/pics/people/may/normal/01.png delete mode 100644 graphics/event_objects/pics/people/may/normal/02.png delete mode 100644 graphics/event_objects/pics/people/may/normal/03.png delete mode 100644 graphics/event_objects/pics/people/may/normal/04.png delete mode 100644 graphics/event_objects/pics/people/may/normal/05.png delete mode 100644 graphics/event_objects/pics/people/may/normal/06.png delete mode 100644 graphics/event_objects/pics/people/may/normal/07.png delete mode 100644 graphics/event_objects/pics/people/may/normal/08.png delete mode 100644 graphics/event_objects/pics/people/may/normal/09.png delete mode 100644 graphics/event_objects/pics/people/may/normal/10.png delete mode 100644 graphics/event_objects/pics/people/may/normal/11.png delete mode 100644 graphics/event_objects/pics/people/may/normal/12.png delete mode 100644 graphics/event_objects/pics/people/may/normal/13.png delete mode 100644 graphics/event_objects/pics/people/may/normal/14.png delete mode 100644 graphics/event_objects/pics/people/may/normal/15.png delete mode 100644 graphics/event_objects/pics/people/may/normal/16.png delete mode 100644 graphics/event_objects/pics/people/may/normal/17.png create mode 100644 graphics/event_objects/pics/people/may/running.png create mode 100644 graphics/event_objects/pics/people/may/surfing.png delete mode 100644 graphics/event_objects/pics/people/may/surfing/0.png delete mode 100644 graphics/event_objects/pics/people/may/surfing/1.png delete mode 100644 graphics/event_objects/pics/people/may/surfing/2.png delete mode 100644 graphics/event_objects/pics/people/may/surfing/3.png delete mode 100644 graphics/event_objects/pics/people/may/surfing/4.png delete mode 100644 graphics/event_objects/pics/people/may/surfing/5.png create mode 100644 graphics/event_objects/pics/people/may/underwater.png delete mode 100644 graphics/event_objects/pics/people/may/underwater/0.png delete mode 100644 graphics/event_objects/pics/people/may/underwater/1.png delete mode 100644 graphics/event_objects/pics/people/may/underwater/2.png delete mode 100644 graphics/event_objects/pics/people/may/underwater/3.png create mode 100644 graphics/event_objects/pics/people/may/walking.png create mode 100644 graphics/event_objects/pics/people/may/watering.png delete mode 100644 graphics/event_objects/pics/people/may/watering/0.png delete mode 100644 graphics/event_objects/pics/people/may/watering/1.png delete mode 100644 graphics/event_objects/pics/people/may/watering/2.png delete mode 100644 graphics/event_objects/pics/people/may/watering/3.png delete mode 100644 graphics/event_objects/pics/people/may/watering/4.png delete mode 100644 graphics/event_objects/pics/people/may/watering/5.png diff --git a/graphics/event_objects/pics/people/brendan/surfing.png b/graphics/event_objects/pics/people/brendan/surfing.png index 692121a90..c0ddb14f6 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 ace9c2bcd..e348d8994 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 000000000..37e881106 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 389f29985..000000000 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 d6b698965..000000000 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 ecb59b54f..000000000 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 dfdd7a56a..000000000 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 6a6fa22fd..000000000 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 3b73f3367..000000000 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 368f0a05b..000000000 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 e43d75556..000000000 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 ec9ef52e6..000000000 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 55522bd5b..000000000 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 eff73287f..000000000 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 092fffddb..000000000 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 233a03266..000000000 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 f1736a0ec..000000000 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 bf4ade7f0..000000000 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 9fccb5026..000000000 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 6d34e41bf..000000000 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 e01484497..000000000 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 a4bee4772..000000000 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 f7e10f132..000000000 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 f9f34e4ae..000000000 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 8784ce762..000000000 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 8753ad9c9..000000000 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 c2d8a60cb..000000000 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 1836e5fed..000000000 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 d93970171..000000000 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 8a5ba8ef6..000000000 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 000000000..41aa13627 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 9fecaa3d4..000000000 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 47341322b..000000000 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 bdd23f0cf..000000000 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 c72277f74..000000000 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 9e62b6869..000000000 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 000000000..e8d3533f3 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 24d435e84..000000000 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 f4ec1ccdd..000000000 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 9d2e66b4f..000000000 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 a7078e584..000000000 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 f135404bc..000000000 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 cb45778ac..000000000 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 910e2f780..000000000 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 a13b1cad5..000000000 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 297643481..000000000 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 069eb2b20..000000000 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 5eca2728d..000000000 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 9895c388a..000000000 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 000000000..4e199b84a 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 389f29985..000000000 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 d6b698965..000000000 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 ecb59b54f..000000000 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 dfdd7a56a..000000000 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 6a6fa22fd..000000000 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 3b73f3367..000000000 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 368f0a05b..000000000 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 e43d75556..000000000 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 ec9ef52e6..000000000 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 58aac207f..000000000 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 2c3641e0a..000000000 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 32b7120a5..000000000 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 d1047dff8..000000000 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 848166557..000000000 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 5e6ec70ff..000000000 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 0e318b466..000000000 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 e11b30b65..000000000 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 4aae3e9d6..000000000 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 eae4c02ee..000000000 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 2a678208e..000000000 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 7ca7d3e6f..000000000 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 1e2d40894..000000000 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 ca020591c..000000000 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 6a5a2e3e5..000000000 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 06d813167..000000000 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 c1fe3d367..000000000 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 334c70cf1..000000000 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 000000000..40808c965 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 000000000..5b783f499 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 98b152f5f..000000000 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 45ae64705..000000000 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 eb6f7675e..000000000 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 18756fe1b..000000000 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 ac89a2672..000000000 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 2569df008..000000000 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 000000000..8a2d65465 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 678dc4bb6..000000000 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 697cec2d1..000000000 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 423f01f88..000000000 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 4118573a3..000000000 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 000000000..b50bf1229 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 000000000..28c5b41be 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 11e8944a1..000000000 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 84aa55502..000000000 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 5d68e4994..000000000 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 c0f732d72..000000000 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 85657cc6c..000000000 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 939671a31..000000000 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 407bc20e0..42385f0c4 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"); -- cgit v1.2.3