summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/data/field_event_obj/event_object_pic_tables.h52
-rwxr-xr-xsrc/data/field_event_obj/field_effect_objects.h2
2 files changed, 27 insertions, 27 deletions
diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h
index 53f5976f1..80a4e12ac 100755
--- a/src/data/field_event_obj/event_object_pic_tables.h
+++ b/src/data/field_event_obj/event_object_pic_tables.h
@@ -66,16 +66,16 @@ const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = {
const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = {
overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0),
- overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 1),
overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2),
+ overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 4),
overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0),
overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0),
- overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 1),
- overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 1),
overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2),
overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2),
- overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 3),
overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 4),
+ overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 4),
+ overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 1),
+ overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 3),
overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 5),
};
@@ -122,15 +122,15 @@ const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = {
};
const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = {
- overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 0),
- overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 1),
- overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 2),
- overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 3),
- overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 4),
- overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 5),
- overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 6),
- overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 7),
- overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 8),
+ overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 0),
+ overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 1),
+ overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 2),
+ overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 3),
+ overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 4),
+ overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 5),
+ overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 6),
+ overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 7),
+ overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 8),
};
const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = {
@@ -1057,16 +1057,16 @@ const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = {
const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = {
overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0),
- overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 1),
overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2),
+ overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 4),
overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0),
overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0),
- overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 1),
- overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 1),
overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2),
overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2),
- overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 3),
overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 4),
+ overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 4),
+ overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 1),
+ overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 3),
overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 5),
};
@@ -1658,24 +1658,24 @@ const struct SpriteFrameImage gEventObjectPicTable_ContestOldMan[] = {
const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = {
overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 0),
- overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 1),
overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 2),
+ overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 4),
+ overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 1),
+ overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 1),
overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 3),
overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 3),
- overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 4),
- overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 4),
overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 5),
overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 5),
};
const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = {
overworld_frame(gEventObjectPic_MayWatering, 32, 32, 0),
- overworld_frame(gEventObjectPic_MayWatering, 32, 32, 1),
overworld_frame(gEventObjectPic_MayWatering, 32, 32, 2),
+ overworld_frame(gEventObjectPic_MayWatering, 32, 32, 4),
+ overworld_frame(gEventObjectPic_MayWatering, 32, 32, 1),
+ overworld_frame(gEventObjectPic_MayWatering, 32, 32, 1),
overworld_frame(gEventObjectPic_MayWatering, 32, 32, 3),
overworld_frame(gEventObjectPic_MayWatering, 32, 32, 3),
- overworld_frame(gEventObjectPic_MayWatering, 32, 32, 4),
- overworld_frame(gEventObjectPic_MayWatering, 32, 32, 4),
overworld_frame(gEventObjectPic_MayWatering, 32, 32, 5),
overworld_frame(gEventObjectPic_MayWatering, 32, 32, 5),
};
@@ -1858,12 +1858,12 @@ const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = {
const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = {
overworld_frame(gEventObjectPic_Wingull, 16, 16, 0),
- overworld_frame(gEventObjectPic_Wingull, 16, 16, 1),
overworld_frame(gEventObjectPic_Wingull, 16, 16, 2),
+ overworld_frame(gEventObjectPic_Wingull, 16, 16, 4),
+ overworld_frame(gEventObjectPic_Wingull, 16, 16, 1),
+ overworld_frame(gEventObjectPic_Wingull, 16, 16, 1),
overworld_frame(gEventObjectPic_Wingull, 16, 16, 3),
overworld_frame(gEventObjectPic_Wingull, 16, 16, 3),
- overworld_frame(gEventObjectPic_Wingull, 16, 16, 4),
- overworld_frame(gEventObjectPic_Wingull, 16, 16, 4),
overworld_frame(gEventObjectPic_Wingull, 16, 16, 5),
overworld_frame(gEventObjectPic_Wingull, 16, 16, 5),
};
diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h
index 785a15872..e8d15918f 100755
--- a/src/data/field_event_obj/field_effect_objects.h
+++ b/src/data/field_event_obj/field_effect_objects.h
@@ -987,7 +987,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = {
};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = {
- overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 0),
+ {.data = (u8*)gEventObjectPic_Rayquaza, .size = ((64*64)/2) /4}
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 19:56:25 +0000