From 89edf6d9e989669f439fdfbf452ee4079e325785 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 17:33:50 -0500 Subject: Move all field object data into src/data and event_object_movement.c --- src/data/field_event_obj/event_object_subsprites.h | 342 +++++++++++++++++++++ 1 file changed, 342 insertions(+) create mode 100755 src/data/field_event_obj/event_object_subsprites.h (limited to 'src/data/field_event_obj/event_object_subsprites.h') diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/field_event_obj/event_object_subsprites.h new file mode 100755 index 000000000..2ed9023fa --- /dev/null +++ b/src/data/field_event_obj/event_object_subsprites.h @@ -0,0 +1,342 @@ +#ifndef GUARD_EVENT_OBJECT_SUBSPRITES_H +#define GUARD_EVENT_OBJECT_SUBSPRITES_H + +const struct Subsprite gFieldObjectSpriteOamTable_16x16_0[] = { + { -8, -8, 0, 1, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x16_1[] = { + { -8, -8, 0, 1, 0, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x16_2[] = { + { -8, -8, 1, 0, 0, 2}, + { -8, 0, 1, 0, 2, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x16_3[] = { + { -8, -8, 0, 1, 0, 2}, + { -8, -8, 0, 1, 0, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x16_4[] = { + { -8, -8, 0, 1, 0, 1}, + { -8, -8, 0, 1, 0, 3} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_16x16[] = { + {0, NULL}, + {1, gFieldObjectSpriteOamTable_16x16_0}, + {1, gFieldObjectSpriteOamTable_16x16_1}, + {2, gFieldObjectSpriteOamTable_16x16_2}, + {2, gFieldObjectSpriteOamTable_16x16_3}, + {2, gFieldObjectSpriteOamTable_16x16_4} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x32_0[] = { + { -8, -16, 2, 2, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x32_1[] = { + { -8, -16, 2, 2, 0, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x32_2[] = { + { -8, -16, 0, 1, 0, 2}, + { -8, 0, 1, 0, 4, 2}, + { -8, 8, 1, 0, 6, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x32_3[] = { + { -8, -16, 0, 1, 0, 2}, + { -8, 0, 0, 1, 4, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x32_4[] = { + { -8, -16, 0, 1, 0, 1}, + { -8, 0, 0, 1, 4, 3} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_16x32[] = { + {0, NULL}, + {1, gFieldObjectSpriteOamTable_16x32_0}, + {1, gFieldObjectSpriteOamTable_16x32_1}, + {3, gFieldObjectSpriteOamTable_16x32_2}, + {2, gFieldObjectSpriteOamTable_16x32_3}, + {2, gFieldObjectSpriteOamTable_16x32_4} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_32x32_0[] = { + {-16, -16, 0, 2, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_32x32_1[] = { + {-16, -16, 0, 2, 0, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_32x32_2[] = { + {-16, -16, 1, 2, 0, 2}, + {-16, 0, 1, 1, 8, 2}, + {-16, 8, 1, 1, 12, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_32x32_3[] = { + {-16, -16, 1, 2, 0, 2}, + {-16, 0, 1, 2, 8, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_32x32_4[] = { + {-16, -16, 1, 2, 0, 1}, + {-16, 0, 1, 2, 8, 3} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_32x32[] = { + {0, NULL}, + {1, gFieldObjectSpriteOamTable_32x32_0}, + {1, gFieldObjectSpriteOamTable_32x32_1}, + {3, gFieldObjectSpriteOamTable_32x32_2}, + {2, gFieldObjectSpriteOamTable_32x32_3}, + {2, gFieldObjectSpriteOamTable_32x32_4} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_Truck_0[] = { + {-24, -24, 1, 1, 0, 2}, + { 8, -24, 1, 0, 4, 2}, + {-24, -16, 1, 1, 6, 2}, + { 8, -16, 1, 0, 10, 2}, + {-24, -8, 1, 1, 12, 2}, + { 8, -8, 1, 0, 16, 2}, + {-24, 0, 1, 1, 18, 2}, + { 8, 0, 1, 0, 22, 2}, + {-24, 8, 1, 1, 24, 2}, + { 8, 8, 1, 0, 28, 2}, + {-24, 16, 1, 1, 30, 2}, + { 8, 16, 1, 0, 34, 2} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_Truck[] = { + {12, gFieldObjectSpriteOamTable_Truck_0}, + {12, gFieldObjectSpriteOamTable_Truck_0}, + {12, gFieldObjectSpriteOamTable_Truck_0}, + {12, gFieldObjectSpriteOamTable_Truck_0}, + {12, gFieldObjectSpriteOamTable_Truck_0}, + {12, gFieldObjectSpriteOamTable_Truck_0} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_Unused_0[] = { + {-32, -16, 1, 3, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_Unused_1[] = { + {-32, -16, 1, 3, 0, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_Unused_2[] = { + {-32, -16, 1, 3, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_Unused_3[] = { + {-32, -16, 1, 3, 0, 2} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_Unused[] = { + {0, NULL}, + {1, gFieldObjectSpriteOamTable_Unused_0}, + {1, gFieldObjectSpriteOamTable_Unused_1}, + {1, gFieldObjectSpriteOamTable_Unused_2}, + {1, gFieldObjectSpriteOamTable_Unused_3}, + {1, gFieldObjectSpriteOamTable_Unused_3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_64x64_0[] = { + {-32, -32, 0, 3, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_64x64_1[] = { + {-32, -32, 0, 3, 0, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_64x64_2[] = { + {-32, -32, 0, 3, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_64x64_3[] = { + {-32, -32, 0, 3, 0, 2} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_64x64[] = { + {0, NULL}, + {1, gFieldObjectSpriteOamTable_64x64_0}, + {1, gFieldObjectSpriteOamTable_64x64_1}, + {1, gFieldObjectSpriteOamTable_64x64_2}, + {1, gFieldObjectSpriteOamTable_64x64_3}, + {1, gFieldObjectSpriteOamTable_64x64_3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_0[] = { + {-48, -20, 1, 1, 0, 2}, + {-16, -20, 1, 1, 4, 2}, + { 16, -20, 1, 1, 8, 2}, + {-48, -12, 1, 1, 12, 2}, + {-16, -12, 1, 1, 16, 2}, + { 16, -12, 1, 1, 20, 2}, + {-48, -4, 1, 1, 24, 2}, + {-16, -4, 1, 1, 28, 2}, + { 16, -4, 1, 1, 32, 2}, + {-48, 4, 1, 1, 36, 2}, + {-16, 4, 1, 1, 40, 2}, + { 16, 4, 1, 1, 44, 2}, + {-48, 12, 1, 1, 48, 2}, + {-16, 12, 1, 1, 52, 2}, + { 16, 12, 1, 1, 56, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_1[] = { + {-48, -20, 1, 1, 0, 1}, + {-16, -20, 1, 1, 4, 1}, + { 16, -20, 1, 1, 8, 1}, + {-48, -12, 1, 1, 12, 1}, + {-16, -12, 1, 1, 16, 1}, + { 16, -12, 1, 1, 20, 1}, + {-48, -4, 1, 1, 24, 1}, + {-16, -4, 1, 1, 28, 1}, + { 16, -4, 1, 1, 32, 1}, + {-48, 4, 1, 1, 36, 1}, + {-16, 4, 1, 1, 40, 1}, + { 16, 4, 1, 1, 44, 1}, + {-48, 12, 1, 1, 48, 1}, + {-16, 12, 1, 1, 52, 1}, + { 16, 12, 1, 1, 56, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_2[] = { + {-48, -20, 1, 1, 0, 2}, + {-16, -20, 1, 1, 4, 2}, + { 16, -20, 1, 1, 8, 2}, + {-48, -12, 1, 1, 12, 2}, + {-16, -12, 1, 1, 16, 2}, + { 16, -12, 1, 1, 20, 2}, + {-48, -4, 1, 1, 24, 2}, + {-16, -4, 1, 1, 28, 2}, + { 16, -4, 1, 1, 32, 2}, + {-48, 4, 1, 1, 36, 2}, + {-16, 4, 1, 1, 40, 2}, + { 16, 4, 1, 1, 44, 2}, + {-48, 12, 1, 1, 48, 2}, + {-16, 12, 1, 1, 52, 2}, + { 16, 12, 1, 1, 56, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_3[] = { + {-48, -20, 1, 1, 0, 1}, + {-16, -20, 1, 1, 4, 1}, + { 16, -20, 1, 1, 8, 1}, + {-48, -12, 1, 1, 12, 1}, + {-16, -12, 1, 1, 16, 1}, + { 16, -12, 1, 1, 20, 1}, + {-48, -4, 1, 1, 24, 2}, + {-16, -4, 1, 1, 28, 2}, + { 16, -4, 1, 1, 32, 2}, + {-48, 4, 1, 1, 36, 2}, + {-16, 4, 1, 1, 40, 2}, + { 16, 4, 1, 1, 44, 2}, + {-48, 12, 1, 1, 48, 2}, + {-16, 12, 1, 1, 52, 2}, + { 16, 12, 1, 1, 56, 2} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_SSTidal[] = { + {15, gFieldObjectSpriteOamTable_SSTidal_0}, + {15, gFieldObjectSpriteOamTable_SSTidal_0}, + {15, gFieldObjectSpriteOamTable_SSTidal_1}, + {15, gFieldObjectSpriteOamTable_SSTidal_2}, + {15, gFieldObjectSpriteOamTable_SSTidal_3}, + {15, gFieldObjectSpriteOamTable_SSTidal_3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_0[] = { + {-48, -20, 1, 1, 0, 2}, + {-16, -20, 1, 1, 4, 2}, + { 16, -20, 1, 0, 8, 2}, + { 32, -20, 0, 0, 10, 2}, + {-48, -12, 1, 1, 11, 2}, + {-16, -12, 1, 1, 15, 2}, + { 16, -12, 1, 0, 19, 2}, + { 32, -12, 0, 0, 21, 2}, + {-48, -4, 1, 1, 22, 2}, + {-16, -4, 1, 1, 26, 2}, + { 16, -4, 1, 0, 30, 2}, + { 32, -4, 0, 0, 32, 2}, + {-48, 4, 1, 1, 33, 2}, + {-16, 4, 1, 1, 37, 2}, + { 16, 4, 1, 0, 41, 2}, + { 32, 4, 0, 0, 43, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_1[] = { + {-48, -20, 1, 1, 0, 1}, + {-16, -20, 1, 1, 4, 1}, + { 16, -20, 1, 0, 8, 1}, + { 32, -20, 0, 0, 10, 1}, + {-48, -12, 1, 1, 11, 1}, + {-16, -12, 1, 1, 15, 1}, + { 16, -12, 1, 0, 19, 1}, + { 32, -12, 0, 0, 21, 1}, + {-48, -4, 1, 1, 22, 1}, + {-16, -4, 1, 1, 26, 1}, + { 16, -4, 1, 0, 30, 1}, + { 32, -4, 0, 0, 32, 1}, + {-48, 4, 1, 1, 33, 1}, + {-16, 4, 1, 1, 37, 1}, + { 16, 4, 1, 0, 41, 1}, + { 32, 4, 0, 0, 43, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_2[] = { + {-48, -20, 1, 1, 0, 2}, + {-16, -20, 1, 1, 4, 2}, + { 16, -20, 1, 0, 8, 2}, + { 32, -20, 0, 0, 10, 2}, + {-48, -12, 1, 1, 11, 2}, + {-16, -12, 1, 1, 15, 2}, + { 16, -12, 1, 0, 19, 2}, + { 32, -12, 0, 0, 21, 2}, + {-48, -4, 1, 1, 22, 2}, + {-16, -4, 1, 1, 26, 2}, + { 16, -4, 1, 0, 30, 2}, + { 32, -4, 0, 0, 32, 2}, + {-48, 4, 1, 1, 33, 2}, + {-16, 4, 1, 1, 37, 2}, + { 16, 4, 1, 0, 41, 2}, + { 32, 4, 0, 0, 43, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_3[] = { + {-48, -20, 1, 1, 0, 1}, + {-16, -20, 1, 1, 4, 1}, + { 16, -20, 1, 0, 8, 1}, + { 32, -20, 0, 0, 10, 1}, + {-48, -12, 1, 1, 11, 1}, + {-16, -12, 1, 1, 15, 1}, + { 16, -12, 1, 0, 19, 1}, + { 32, -12, 0, 0, 21, 1}, + {-48, -4, 1, 1, 22, 2}, + {-16, -4, 1, 1, 26, 2}, + { 16, -4, 1, 0, 30, 2}, + { 32, -4, 0, 0, 32, 2}, + {-48, 4, 1, 1, 33, 2}, + {-16, 4, 1, 1, 37, 2}, + { 16, 4, 1, 0, 41, 2}, + { 32, 4, 0, 0, 43, 2} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_SubmarineShadow[] = { + {16, gFieldObjectSpriteOamTable_SubmarineShadow_0}, + {16, gFieldObjectSpriteOamTable_SubmarineShadow_0}, + {16, gFieldObjectSpriteOamTable_SubmarineShadow_1}, + {16, gFieldObjectSpriteOamTable_SubmarineShadow_2}, + {16, gFieldObjectSpriteOamTable_SubmarineShadow_3}, + {16, gFieldObjectSpriteOamTable_SubmarineShadow_3} +}; + +#endif //GUARD_EVENT_OBJECT_SUBSPRITES_H -- cgit v1.2.3 From aa9a45c16fbaee2fffc94e4741e0a1f203b244bc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 19:11:48 -0500 Subject: Rebrand 'map object' and 'field object' to 'event object' --- src/data/field_event_obj/event_object_subsprites.h | 166 ++++++++++----------- 1 file changed, 83 insertions(+), 83 deletions(-) (limited to 'src/data/field_event_obj/event_object_subsprites.h') diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/field_event_obj/event_object_subsprites.h index 2ed9023fa..db5fddf1e 100755 --- a/src/data/field_event_obj/event_object_subsprites.h +++ b/src/data/field_event_obj/event_object_subsprites.h @@ -1,105 +1,105 @@ #ifndef GUARD_EVENT_OBJECT_SUBSPRITES_H #define GUARD_EVENT_OBJECT_SUBSPRITES_H -const struct Subsprite gFieldObjectSpriteOamTable_16x16_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = { { -8, -8, 0, 1, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x16_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x16_1[] = { { -8, -8, 0, 1, 0, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x16_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x16_2[] = { { -8, -8, 1, 0, 0, 2}, { -8, 0, 1, 0, 2, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x16_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x16_3[] = { { -8, -8, 0, 1, 0, 2}, { -8, -8, 0, 1, 0, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x16_4[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x16_4[] = { { -8, -8, 0, 1, 0, 1}, { -8, -8, 0, 1, 0, 3} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_16x16[] = { +const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = { {0, NULL}, - {1, gFieldObjectSpriteOamTable_16x16_0}, - {1, gFieldObjectSpriteOamTable_16x16_1}, - {2, gFieldObjectSpriteOamTable_16x16_2}, - {2, gFieldObjectSpriteOamTable_16x16_3}, - {2, gFieldObjectSpriteOamTable_16x16_4} + {1, gEventObjectSpriteOamTable_16x16_0}, + {1, gEventObjectSpriteOamTable_16x16_1}, + {2, gEventObjectSpriteOamTable_16x16_2}, + {2, gEventObjectSpriteOamTable_16x16_3}, + {2, gEventObjectSpriteOamTable_16x16_4} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x32_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x32_0[] = { { -8, -16, 2, 2, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x32_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x32_1[] = { { -8, -16, 2, 2, 0, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x32_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x32_2[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 1, 0, 4, 2}, { -8, 8, 1, 0, 6, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x32_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x32_3[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 0, 1, 4, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x32_4[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x32_4[] = { { -8, -16, 0, 1, 0, 1}, { -8, 0, 0, 1, 4, 3} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_16x32[] = { +const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = { {0, NULL}, - {1, gFieldObjectSpriteOamTable_16x32_0}, - {1, gFieldObjectSpriteOamTable_16x32_1}, - {3, gFieldObjectSpriteOamTable_16x32_2}, - {2, gFieldObjectSpriteOamTable_16x32_3}, - {2, gFieldObjectSpriteOamTable_16x32_4} + {1, gEventObjectSpriteOamTable_16x32_0}, + {1, gEventObjectSpriteOamTable_16x32_1}, + {3, gEventObjectSpriteOamTable_16x32_2}, + {2, gEventObjectSpriteOamTable_16x32_3}, + {2, gEventObjectSpriteOamTable_16x32_4} }; -const struct Subsprite gFieldObjectSpriteOamTable_32x32_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_32x32_0[] = { {-16, -16, 0, 2, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_32x32_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_32x32_1[] = { {-16, -16, 0, 2, 0, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_32x32_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_32x32_2[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 1, 8, 2}, {-16, 8, 1, 1, 12, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_32x32_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_32x32_3[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 2, 8, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_32x32_4[] = { +const struct Subsprite gEventObjectSpriteOamTable_32x32_4[] = { {-16, -16, 1, 2, 0, 1}, {-16, 0, 1, 2, 8, 3} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_32x32[] = { +const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = { {0, NULL}, - {1, gFieldObjectSpriteOamTable_32x32_0}, - {1, gFieldObjectSpriteOamTable_32x32_1}, - {3, gFieldObjectSpriteOamTable_32x32_2}, - {2, gFieldObjectSpriteOamTable_32x32_3}, - {2, gFieldObjectSpriteOamTable_32x32_4} + {1, gEventObjectSpriteOamTable_32x32_0}, + {1, gEventObjectSpriteOamTable_32x32_1}, + {3, gEventObjectSpriteOamTable_32x32_2}, + {2, gEventObjectSpriteOamTable_32x32_3}, + {2, gEventObjectSpriteOamTable_32x32_4} }; -const struct Subsprite gFieldObjectSpriteOamTable_Truck_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = { {-24, -24, 1, 1, 0, 2}, { 8, -24, 1, 0, 4, 2}, {-24, -16, 1, 1, 6, 2}, @@ -114,66 +114,66 @@ const struct Subsprite gFieldObjectSpriteOamTable_Truck_0[] = { { 8, 16, 1, 0, 34, 2} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_Truck[] = { - {12, gFieldObjectSpriteOamTable_Truck_0}, - {12, gFieldObjectSpriteOamTable_Truck_0}, - {12, gFieldObjectSpriteOamTable_Truck_0}, - {12, gFieldObjectSpriteOamTable_Truck_0}, - {12, gFieldObjectSpriteOamTable_Truck_0}, - {12, gFieldObjectSpriteOamTable_Truck_0} +const struct SubspriteTable gEventObjectSpriteOamTables_Truck[] = { + {12, gEventObjectSpriteOamTable_Truck_0}, + {12, gEventObjectSpriteOamTable_Truck_0}, + {12, gEventObjectSpriteOamTable_Truck_0}, + {12, gEventObjectSpriteOamTable_Truck_0}, + {12, gEventObjectSpriteOamTable_Truck_0}, + {12, gEventObjectSpriteOamTable_Truck_0} }; -const struct Subsprite gFieldObjectSpriteOamTable_Unused_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_Unused_0[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_Unused_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_Unused_1[] = { {-32, -16, 1, 3, 0, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_Unused_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_Unused_2[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_Unused_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_Unused_3[] = { {-32, -16, 1, 3, 0, 2} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_Unused[] = { +const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = { {0, NULL}, - {1, gFieldObjectSpriteOamTable_Unused_0}, - {1, gFieldObjectSpriteOamTable_Unused_1}, - {1, gFieldObjectSpriteOamTable_Unused_2}, - {1, gFieldObjectSpriteOamTable_Unused_3}, - {1, gFieldObjectSpriteOamTable_Unused_3} + {1, gEventObjectSpriteOamTable_Unused_0}, + {1, gEventObjectSpriteOamTable_Unused_1}, + {1, gEventObjectSpriteOamTable_Unused_2}, + {1, gEventObjectSpriteOamTable_Unused_3}, + {1, gEventObjectSpriteOamTable_Unused_3} }; -const struct Subsprite gFieldObjectSpriteOamTable_64x64_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_64x64_0[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_64x64_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_64x64_1[] = { {-32, -32, 0, 3, 0, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_64x64_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_64x64_2[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_64x64_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_64x64_3[] = { {-32, -32, 0, 3, 0, 2} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_64x64[] = { +const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = { {0, NULL}, - {1, gFieldObjectSpriteOamTable_64x64_0}, - {1, gFieldObjectSpriteOamTable_64x64_1}, - {1, gFieldObjectSpriteOamTable_64x64_2}, - {1, gFieldObjectSpriteOamTable_64x64_3}, - {1, gFieldObjectSpriteOamTable_64x64_3} + {1, gEventObjectSpriteOamTable_64x64_0}, + {1, gEventObjectSpriteOamTable_64x64_1}, + {1, gEventObjectSpriteOamTable_64x64_2}, + {1, gEventObjectSpriteOamTable_64x64_3}, + {1, gEventObjectSpriteOamTable_64x64_3} }; -const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -191,7 +191,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_0[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -209,7 +209,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_1[] = { { 16, 12, 1, 1, 56, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -227,7 +227,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_2[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -245,16 +245,16 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_3[] = { { 16, 12, 1, 1, 56, 2} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_SSTidal[] = { - {15, gFieldObjectSpriteOamTable_SSTidal_0}, - {15, gFieldObjectSpriteOamTable_SSTidal_0}, - {15, gFieldObjectSpriteOamTable_SSTidal_1}, - {15, gFieldObjectSpriteOamTable_SSTidal_2}, - {15, gFieldObjectSpriteOamTable_SSTidal_3}, - {15, gFieldObjectSpriteOamTable_SSTidal_3} +const struct SubspriteTable gEventObjectSpriteOamTables_SSTidal[] = { + {15, gEventObjectSpriteOamTable_SSTidal_0}, + {15, gEventObjectSpriteOamTable_SSTidal_0}, + {15, gEventObjectSpriteOamTable_SSTidal_1}, + {15, gEventObjectSpriteOamTable_SSTidal_2}, + {15, gEventObjectSpriteOamTable_SSTidal_3}, + {15, gEventObjectSpriteOamTable_SSTidal_3} }; -const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -273,7 +273,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_0[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -292,7 +292,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_1[] = { { 32, 4, 0, 0, 43, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -311,7 +311,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_2[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -330,13 +330,13 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_3[] = { { 32, 4, 0, 0, 43, 2} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_SubmarineShadow[] = { - {16, gFieldObjectSpriteOamTable_SubmarineShadow_0}, - {16, gFieldObjectSpriteOamTable_SubmarineShadow_0}, - {16, gFieldObjectSpriteOamTable_SubmarineShadow_1}, - {16, gFieldObjectSpriteOamTable_SubmarineShadow_2}, - {16, gFieldObjectSpriteOamTable_SubmarineShadow_3}, - {16, gFieldObjectSpriteOamTable_SubmarineShadow_3} +const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = { + {16, gEventObjectSpriteOamTable_SubmarineShadow_0}, + {16, gEventObjectSpriteOamTable_SubmarineShadow_0}, + {16, gEventObjectSpriteOamTable_SubmarineShadow_1}, + {16, gEventObjectSpriteOamTable_SubmarineShadow_2}, + {16, gEventObjectSpriteOamTable_SubmarineShadow_3}, + {16, gEventObjectSpriteOamTable_SubmarineShadow_3} }; #endif //GUARD_EVENT_OBJECT_SUBSPRITES_H -- cgit v1.2.3