diff --git a/graphics/object_events/pics/pokemon/groudon.png b/graphics/object_events/pics/pokemon/groudon.png index 5e18f5954f..baec3777a7 100644 Binary files a/graphics/object_events/pics/pokemon/groudon.png and b/graphics/object_events/pics/pokemon/groudon.png differ diff --git a/graphics/object_events/pics/pokemon/ho_oh.png b/graphics/object_events/pics/pokemon/ho_oh.png index 7e74249d2c..5a18f8dd2e 100644 Binary files a/graphics/object_events/pics/pokemon/ho_oh.png and b/graphics/object_events/pics/pokemon/ho_oh.png differ diff --git a/graphics/object_events/pics/pokemon/kyogre.png b/graphics/object_events/pics/pokemon/kyogre.png index 728a5ad377..3676217437 100644 Binary files a/graphics/object_events/pics/pokemon/kyogre.png and b/graphics/object_events/pics/pokemon/kyogre.png differ diff --git a/graphics/object_events/pics/pokemon/lugia.png b/graphics/object_events/pics/pokemon/lugia.png index 7ced3b4cab..31d53e8aab 100644 Binary files a/graphics/object_events/pics/pokemon/lugia.png and b/graphics/object_events/pics/pokemon/lugia.png differ diff --git a/graphics/object_events/pics/pokemon/rayquaza.png b/graphics/object_events/pics/pokemon/rayquaza.png index 948804138d..e0b0b8c200 100644 Binary files a/graphics/object_events/pics/pokemon/rayquaza.png and b/graphics/object_events/pics/pokemon/rayquaza.png differ diff --git a/graphics/object_events/pics/pokemon/steelix.png b/graphics/object_events/pics/pokemon/steelix.png index 5743c91d8b..a5461601e3 100644 Binary files a/graphics/object_events/pics/pokemon/steelix.png and b/graphics/object_events/pics/pokemon/steelix.png differ diff --git a/graphics/object_events/pics/pokemon/wailord.png b/graphics/object_events/pics/pokemon/wailord.png index a7032a856a..a1fc3a087a 100644 Binary files a/graphics/object_events/pics/pokemon/wailord.png and b/graphics/object_events/pics/pokemon/wailord.png differ diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 3b279745be..fe015fc85d 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -1379,7 +1379,7 @@ $(OBJEVENTGFXDIR)/pokemon/gligar.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/steelix.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 8 -mheight 8 + $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/snubbull.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 @@ -1502,10 +1502,10 @@ $(OBJEVENTGFXDIR)/pokemon/tyranitar.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 8 -mheight 8 + $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 8 -mheight 8 + $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/celebi.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 @@ -1718,7 +1718,7 @@ $(OBJEVENTGFXDIR)/pokemon/wailmer.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/wailord.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 8 -mheight 8 + $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/numel.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 @@ -1901,13 +1901,13 @@ $(OBJEVENTGFXDIR)/pokemon/latios.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 8 -mheight 8 + $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 8 -mheight 8 + $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 8 -mheight 8 + $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/jirachi.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index 97d685c9ff..ed53c4f7fb 100755 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -482,7 +482,7 @@ const struct ObjectEventGraphicsInfo gPokemonObjectGraphics[] = { [SPECIES_FORRETRESS] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Forretress, gDummySpriteAffineAnimTable}, [SPECIES_DUNSPARCE] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Dunsparce, gDummySpriteAffineAnimTable}, [SPECIES_GLIGAR] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Gligar, gDummySpriteAffineAnimTable}, - [SPECIES_STEELIX] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Following, sPicTable_Steelix, gDummySpriteAffineAnimTable}, + [SPECIES_STEELIX] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Steelix, gDummySpriteAffineAnimTable}, [SPECIES_SNUBBULL] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Snubbull, gDummySpriteAffineAnimTable}, [SPECIES_GRANBULL] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Granbull, gDummySpriteAffineAnimTable}, [SPECIES_QWILFISH] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Qwilfish, gDummySpriteAffineAnimTable}, @@ -523,8 +523,8 @@ const struct ObjectEventGraphicsInfo gPokemonObjectGraphics[] = { [SPECIES_LARVITAR] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Larvitar, gDummySpriteAffineAnimTable}, [SPECIES_PUPITAR] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Pupitar, gDummySpriteAffineAnimTable}, [SPECIES_TYRANITAR] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Tyranitar, gDummySpriteAffineAnimTable}, - [SPECIES_LUGIA] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Following, sPicTable_Lugia, gDummySpriteAffineAnimTable}, - [SPECIES_HO_OH] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Following, sPicTable_Ho_oh, gDummySpriteAffineAnimTable}, + [SPECIES_LUGIA] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Lugia, gDummySpriteAffineAnimTable}, + [SPECIES_HO_OH] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Ho_oh, gDummySpriteAffineAnimTable}, [SPECIES_CELEBI] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Celebi, gDummySpriteAffineAnimTable}, [SPECIES_TREECKO] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Treecko, gDummySpriteAffineAnimTable}, [SPECIES_GROVYLE] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Grovyle, gDummySpriteAffineAnimTable}, @@ -595,7 +595,7 @@ const struct ObjectEventGraphicsInfo gPokemonObjectGraphics[] = { [SPECIES_CARVANHA] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Carvanha, gDummySpriteAffineAnimTable}, [SPECIES_SHARPEDO] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Sharpedo, gDummySpriteAffineAnimTable}, [SPECIES_WAILMER] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Wailmer, gDummySpriteAffineAnimTable}, - [SPECIES_WAILORD] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Following, sPicTable_Wailord, gDummySpriteAffineAnimTable}, + [SPECIES_WAILORD] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Wailord, gDummySpriteAffineAnimTable}, [SPECIES_NUMEL] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Numel, gDummySpriteAffineAnimTable}, [SPECIES_CAMERUPT] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Camerupt, gDummySpriteAffineAnimTable}, [SPECIES_TORKOAL] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Torkoal, gDummySpriteAffineAnimTable}, @@ -656,9 +656,9 @@ const struct ObjectEventGraphicsInfo gPokemonObjectGraphics[] = { [SPECIES_REGISTEEL] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Registeel, gDummySpriteAffineAnimTable}, [SPECIES_LATIAS] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Latias, gDummySpriteAffineAnimTable}, [SPECIES_LATIOS] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Latios, gDummySpriteAffineAnimTable}, - [SPECIES_KYOGRE] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Following, sPicTable_Kyogre, gDummySpriteAffineAnimTable}, - [SPECIES_GROUDON] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Following, sPicTable_Groudon, gDummySpriteAffineAnimTable}, - [SPECIES_RAYQUAZA] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Following, sPicTable_Rayquaza, gDummySpriteAffineAnimTable}, + [SPECIES_KYOGRE] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Kyogre, gDummySpriteAffineAnimTable}, + [SPECIES_GROUDON] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Groudon, gDummySpriteAffineAnimTable}, + [SPECIES_RAYQUAZA] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Rayquaza, gDummySpriteAffineAnimTable}, [SPECIES_JIRACHI] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Jirachi, gDummySpriteAffineAnimTable}, [SPECIES_DEOXYS] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Deoxys, gDummySpriteAffineAnimTable}, }; diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h index 5f58c91350..76da0b0c62 100755 --- a/src/data/object_events/object_event_pic_tables.h +++ b/src/data/object_events/object_event_pic_tables.h @@ -3863,12 +3863,12 @@ static const struct SpriteFrameImage sPicTable_Gligar[] = { overworld_frame(gObjectEventPic_Gligar, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Steelix[] = { - overworld_frame(gObjectEventPic_Steelix, 8, 8, 0), - overworld_frame(gObjectEventPic_Steelix, 8, 8, 1), - overworld_frame(gObjectEventPic_Steelix, 8, 8, 2), - overworld_frame(gObjectEventPic_Steelix, 8, 8, 3), - overworld_frame(gObjectEventPic_Steelix, 8, 8, 4), - overworld_frame(gObjectEventPic_Steelix, 8, 8, 5), + overworld_frame(gObjectEventPic_Steelix, 4, 4, 0), + overworld_frame(gObjectEventPic_Steelix, 4, 4, 1), + overworld_frame(gObjectEventPic_Steelix, 4, 4, 2), + overworld_frame(gObjectEventPic_Steelix, 4, 4, 3), + overworld_frame(gObjectEventPic_Steelix, 4, 4, 4), + overworld_frame(gObjectEventPic_Steelix, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Snubbull[] = { overworld_frame(gObjectEventPic_Snubbull, 4, 4, 0), @@ -4191,20 +4191,20 @@ static const struct SpriteFrameImage sPicTable_Tyranitar[] = { overworld_frame(gObjectEventPic_Tyranitar, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Lugia[] = { - overworld_frame(gObjectEventPic_Lugia, 8, 8, 0), - overworld_frame(gObjectEventPic_Lugia, 8, 8, 1), - overworld_frame(gObjectEventPic_Lugia, 8, 8, 2), - overworld_frame(gObjectEventPic_Lugia, 8, 8, 3), - overworld_frame(gObjectEventPic_Lugia, 8, 8, 4), - overworld_frame(gObjectEventPic_Lugia, 8, 8, 5), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 2), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 3), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 4), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Ho_oh[] = { - overworld_frame(gObjectEventPic_Ho_oh, 8, 8, 0), - overworld_frame(gObjectEventPic_Ho_oh, 8, 8, 1), - overworld_frame(gObjectEventPic_Ho_oh, 8, 8, 2), - overworld_frame(gObjectEventPic_Ho_oh, 8, 8, 3), - overworld_frame(gObjectEventPic_Ho_oh, 8, 8, 4), - overworld_frame(gObjectEventPic_Ho_oh, 8, 8, 5), + overworld_frame(gObjectEventPic_Ho_oh, 4, 4, 0), + overworld_frame(gObjectEventPic_Ho_oh, 4, 4, 1), + overworld_frame(gObjectEventPic_Ho_oh, 4, 4, 2), + overworld_frame(gObjectEventPic_Ho_oh, 4, 4, 3), + overworld_frame(gObjectEventPic_Ho_oh, 4, 4, 4), + overworld_frame(gObjectEventPic_Ho_oh, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Celebi[] = { overworld_frame(gObjectEventPic_Celebi, 4, 4, 0), @@ -4767,12 +4767,12 @@ static const struct SpriteFrameImage sPicTable_Wailmer[] = { overworld_frame(gObjectEventPic_Wailmer, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Wailord[] = { - overworld_frame(gObjectEventPic_Wailord, 8, 8, 0), - overworld_frame(gObjectEventPic_Wailord, 8, 8, 1), - overworld_frame(gObjectEventPic_Wailord, 8, 8, 2), - overworld_frame(gObjectEventPic_Wailord, 8, 8, 3), - overworld_frame(gObjectEventPic_Wailord, 8, 8, 4), - overworld_frame(gObjectEventPic_Wailord, 8, 8, 5), + overworld_frame(gObjectEventPic_Wailord, 4, 4, 0), + overworld_frame(gObjectEventPic_Wailord, 4, 4, 1), + overworld_frame(gObjectEventPic_Wailord, 4, 4, 2), + overworld_frame(gObjectEventPic_Wailord, 4, 4, 3), + overworld_frame(gObjectEventPic_Wailord, 4, 4, 4), + overworld_frame(gObjectEventPic_Wailord, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Numel[] = { overworld_frame(gObjectEventPic_Numel, 4, 4, 0), @@ -5255,28 +5255,28 @@ static const struct SpriteFrameImage sPicTable_Latios[] = { overworld_frame(gObjectEventPic_Latios, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Kyogre[] = { - overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 0), - overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 1), - overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 2), - overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 3), - overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 4), - overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 5), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 4), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Groudon[] = { - overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 0), - overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 1), - overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 2), - overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 3), - overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 4), - overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 5), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 4), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Rayquaza[] = { - overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 0), - overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 1), - overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 2), - overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 3), - overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 4), - overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 5), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 2), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 3), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 4), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 5), }; static const struct SpriteFrameImage sPicTable_Jirachi[] = { overworld_frame(gObjectEventPic_Jirachi, 4, 4, 0),