diff --git a/gflib/sprite.c b/gflib/sprite.c index 851cc6d3c3..58ca5e2b5d 100644 --- a/gflib/sprite.c +++ b/gflib/sprite.c @@ -751,9 +751,17 @@ void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct SpriteFram { if (sSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS) { - sSpriteCopyRequests[sSpriteCopyRequestCount].src = images[index].data; + if (!images[0].relativeFrames) + { + sSpriteCopyRequests[sSpriteCopyRequestCount].src = images[index].data; + sSpriteCopyRequests[sSpriteCopyRequestCount].size = images[index].size; + } + else + { + sSpriteCopyRequests[sSpriteCopyRequestCount].src = images[0].data + images[0].size * index; + sSpriteCopyRequests[sSpriteCopyRequestCount].size = images[0].size; + } sSpriteCopyRequests[sSpriteCopyRequestCount].dest = (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileNum; - sSpriteCopyRequests[sSpriteCopyRequestCount].size = images[index].size; sSpriteCopyRequestCount++; } } diff --git a/gflib/sprite.h b/gflib/sprite.h index 86527bc4c0..270a755b44 100644 --- a/gflib/sprite.h +++ b/gflib/sprite.h @@ -26,11 +26,13 @@ struct SpriteFrameImage { const void *data; u16 size; + bool8 relativeFrames; }; #define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr} #define overworld_frame(ptr, width, height, frame) {.data = (u8 *)ptr + (width * height * frame * 64)/2, .size = (width * height * 64)/2} +#define overworld_ascending_frames(ptr, width, height) {.data = (u8 *)ptr, .size = (width * height * 64)/2, .relativeFrames=TRUE} struct SpritePalette { diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 2f2cf689be..a1e9fc22cf 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -1,5 +1,4 @@ -const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/walking.4bpp"); -const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/brendan/running.4bpp"); +const u32 gObjectEventPic_BrendanNormalRunning[] = INCBIN_U32("graphics/object_events/pics/people/brendan/walking.4bpp", "graphics/object_events/pics/people/brendan/running.4bpp"); const u16 gObjectEventPal_Brendan[] = INCBIN_U16("graphics/object_events/palettes/brendan.gbapal"); const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp"); const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp"); @@ -32,8 +31,7 @@ const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/object_events/p const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/brendan/underwater.4bpp"); const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/may/underwater.4bpp"); const u16 gObjectEventPal_PlayerUnderwater[] = INCBIN_U16("graphics/object_events/palettes/player_underwater.gbapal"); -const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/walking.4bpp"); -const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/object_events/pics/people/may/running.4bpp"); +const u32 gObjectEventPic_MayNormalRunning[] = INCBIN_U32("graphics/object_events/pics/people/may/walking.4bpp", "graphics/object_events/pics/people/may/running.4bpp"); const u16 gObjectEventPal_May[] = INCBIN_U16("graphics/object_events/palettes/may.gbapal"); const u16 gObjectEventPal_MayReflection[] = INCBIN_U16("graphics/object_events/palettes/may_reflection.gbapal"); const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/walking.4bpp"); diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h index 1b8c9c727a..aa9f4e1532 100755 --- a/src/data/object_events/object_event_pic_tables.h +++ b/src/data/object_events/object_event_pic_tables.h @@ -1,64 +1,13 @@ static const struct SpriteFrameImage sPicTable_BrendanNormal[] = { - overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 0), - overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 1), - overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 2), - overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 3), - overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 4), - overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 5), - overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 6), - overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 7), - overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 8), - overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 0), - overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 1), - overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 2), - overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 3), - overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 4), - overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 5), - overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 6), - overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 7), - overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_BrendanNormalRunning, 2, 4), }; static const struct SpriteFrameImage sPicTable_BrendanMachBike[] = { - overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 0), - overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 1), - overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 2), - overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 3), - overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 4), - overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 5), - overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 6), - overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 7), - overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 8), + overworld_ascending_frames(gObjectEventPic_BrendanMachBike, 4, 4), }; static const struct SpriteFrameImage sPicTable_BrendanAcroBike[] = { - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 0), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 1), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 2), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 3), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 4), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 5), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 6), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 7), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 8), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 9), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 10), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 11), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 12), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 13), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 14), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 15), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 16), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 17), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 18), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 19), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 20), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 21), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 22), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 23), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 24), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 25), - overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 26), + overworld_ascending_frames(gObjectEventPic_BrendanAcroBike, 4, 4), }; static const struct SpriteFrameImage sPicTable_BrendanSurfing[] = { @@ -89,285 +38,99 @@ static const struct SpriteFrameImage sPicTable_BrendanUnderwater[] = { }; static const struct SpriteFrameImage sPicTable_BrendanFieldMove[] = { - overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 0), - overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 1), - overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 2), - overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 3), - overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 4), + overworld_ascending_frames(gObjectEventPic_BrendanFieldMove, 4, 4), }; static const struct SpriteFrameImage sPicTable_QuintyPlump[] = { - overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 0), - overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 1), - overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 2), - overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 3), - overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 4), - overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 5), - overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 6), + overworld_ascending_frames(gObjectEventPic_QuintyPlump, 4, 4), }; static const struct SpriteFrameImage sPicTable_NinjaBoy[] = { - overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 0), - overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 1), - overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 2), - overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 3), - overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 4), - overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 5), - overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 6), - overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 7), - overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 8), + overworld_ascending_frames(gObjectEventPic_NinjaBoy, 2, 2), }; static const struct SpriteFrameImage sPicTable_Twin[] = { - overworld_frame(gObjectEventPic_Twin, 2, 4, 0), - overworld_frame(gObjectEventPic_Twin, 2, 4, 1), - overworld_frame(gObjectEventPic_Twin, 2, 4, 2), - overworld_frame(gObjectEventPic_Twin, 2, 4, 3), - overworld_frame(gObjectEventPic_Twin, 2, 4, 4), - overworld_frame(gObjectEventPic_Twin, 2, 4, 5), - overworld_frame(gObjectEventPic_Twin, 2, 4, 6), - overworld_frame(gObjectEventPic_Twin, 2, 4, 7), - overworld_frame(gObjectEventPic_Twin, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Twin, 2, 4), }; static const struct SpriteFrameImage sPicTable_Boy1[] = { - overworld_frame(gObjectEventPic_Boy1, 2, 4, 0), - overworld_frame(gObjectEventPic_Boy1, 2, 4, 1), - overworld_frame(gObjectEventPic_Boy1, 2, 4, 2), - overworld_frame(gObjectEventPic_Boy1, 2, 4, 3), - overworld_frame(gObjectEventPic_Boy1, 2, 4, 4), - overworld_frame(gObjectEventPic_Boy1, 2, 4, 5), - overworld_frame(gObjectEventPic_Boy1, 2, 4, 6), - overworld_frame(gObjectEventPic_Boy1, 2, 4, 7), - overworld_frame(gObjectEventPic_Boy1, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Boy1, 2, 4), }; static const struct SpriteFrameImage sPicTable_Girl1[] = { - overworld_frame(gObjectEventPic_Girl1, 2, 4, 0), - overworld_frame(gObjectEventPic_Girl1, 2, 4, 1), - overworld_frame(gObjectEventPic_Girl1, 2, 4, 2), - overworld_frame(gObjectEventPic_Girl1, 2, 4, 3), - overworld_frame(gObjectEventPic_Girl1, 2, 4, 4), - overworld_frame(gObjectEventPic_Girl1, 2, 4, 5), - overworld_frame(gObjectEventPic_Girl1, 2, 4, 6), - overworld_frame(gObjectEventPic_Girl1, 2, 4, 7), - overworld_frame(gObjectEventPic_Girl1, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Girl1, 2, 4), }; static const struct SpriteFrameImage sPicTable_Boy2[] = { - overworld_frame(gObjectEventPic_Boy2, 2, 4, 0), - overworld_frame(gObjectEventPic_Boy2, 2, 4, 1), - overworld_frame(gObjectEventPic_Boy2, 2, 4, 2), - overworld_frame(gObjectEventPic_Boy2, 2, 4, 3), - overworld_frame(gObjectEventPic_Boy2, 2, 4, 4), - overworld_frame(gObjectEventPic_Boy2, 2, 4, 5), - overworld_frame(gObjectEventPic_Boy2, 2, 4, 6), - overworld_frame(gObjectEventPic_Boy2, 2, 4, 7), - overworld_frame(gObjectEventPic_Boy2, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Boy2, 2, 4), }; static const struct SpriteFrameImage sPicTable_Girl2[] = { - overworld_frame(gObjectEventPic_Girl2, 2, 4, 0), - overworld_frame(gObjectEventPic_Girl2, 2, 4, 1), - overworld_frame(gObjectEventPic_Girl2, 2, 4, 2), - overworld_frame(gObjectEventPic_Girl2, 2, 4, 3), - overworld_frame(gObjectEventPic_Girl2, 2, 4, 4), - overworld_frame(gObjectEventPic_Girl2, 2, 4, 5), - overworld_frame(gObjectEventPic_Girl2, 2, 4, 6), - overworld_frame(gObjectEventPic_Girl2, 2, 4, 7), - overworld_frame(gObjectEventPic_Girl2, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Girl2, 2, 4), }; static const struct SpriteFrameImage sPicTable_LittleBoy[] = { - overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 0), - overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 1), - overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 2), - overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 3), - overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 4), - overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 5), - overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 6), - overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 7), - overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 8), + overworld_ascending_frames(gObjectEventPic_LittleBoy, 2, 2), }; static const struct SpriteFrameImage sPicTable_LittleGirl[] = { - overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 0), - overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 1), - overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 2), - overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 3), - overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 4), - overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 5), - overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 6), - overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 7), - overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 8), + overworld_ascending_frames(gObjectEventPic_LittleGirl, 2, 2), }; static const struct SpriteFrameImage sPicTable_Boy3[] = { - overworld_frame(gObjectEventPic_Boy3, 2, 4, 0), - overworld_frame(gObjectEventPic_Boy3, 2, 4, 1), - overworld_frame(gObjectEventPic_Boy3, 2, 4, 2), - overworld_frame(gObjectEventPic_Boy3, 2, 4, 3), - overworld_frame(gObjectEventPic_Boy3, 2, 4, 4), - overworld_frame(gObjectEventPic_Boy3, 2, 4, 5), - overworld_frame(gObjectEventPic_Boy3, 2, 4, 6), - overworld_frame(gObjectEventPic_Boy3, 2, 4, 7), - overworld_frame(gObjectEventPic_Boy3, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Boy3, 2, 4), }; static const struct SpriteFrameImage sPicTable_Girl3[] = { - overworld_frame(gObjectEventPic_Girl3, 2, 4, 0), - overworld_frame(gObjectEventPic_Girl3, 2, 4, 1), - overworld_frame(gObjectEventPic_Girl3, 2, 4, 2), - overworld_frame(gObjectEventPic_Girl3, 2, 4, 3), - overworld_frame(gObjectEventPic_Girl3, 2, 4, 4), - overworld_frame(gObjectEventPic_Girl3, 2, 4, 5), - overworld_frame(gObjectEventPic_Girl3, 2, 4, 6), - overworld_frame(gObjectEventPic_Girl3, 2, 4, 7), - overworld_frame(gObjectEventPic_Girl3, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Girl3, 2, 4), }; static const struct SpriteFrameImage sPicTable_RichBoy[] = { - overworld_frame(gObjectEventPic_RichBoy, 2, 4, 0), - overworld_frame(gObjectEventPic_RichBoy, 2, 4, 1), - overworld_frame(gObjectEventPic_RichBoy, 2, 4, 2), - overworld_frame(gObjectEventPic_RichBoy, 2, 4, 3), - overworld_frame(gObjectEventPic_RichBoy, 2, 4, 4), - overworld_frame(gObjectEventPic_RichBoy, 2, 4, 5), - overworld_frame(gObjectEventPic_RichBoy, 2, 4, 6), - overworld_frame(gObjectEventPic_RichBoy, 2, 4, 7), - overworld_frame(gObjectEventPic_RichBoy, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_RichBoy, 2, 4), }; static const struct SpriteFrameImage sPicTable_Woman1[] = { - overworld_frame(gObjectEventPic_Woman1, 2, 4, 0), - overworld_frame(gObjectEventPic_Woman1, 2, 4, 1), - overworld_frame(gObjectEventPic_Woman1, 2, 4, 2), - overworld_frame(gObjectEventPic_Woman1, 2, 4, 3), - overworld_frame(gObjectEventPic_Woman1, 2, 4, 4), - overworld_frame(gObjectEventPic_Woman1, 2, 4, 5), - overworld_frame(gObjectEventPic_Woman1, 2, 4, 6), - overworld_frame(gObjectEventPic_Woman1, 2, 4, 7), - overworld_frame(gObjectEventPic_Woman1, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Woman1, 2, 4), }; static const struct SpriteFrameImage sPicTable_FatMan[] = { - overworld_frame(gObjectEventPic_FatMan, 2, 4, 0), - overworld_frame(gObjectEventPic_FatMan, 2, 4, 1), - overworld_frame(gObjectEventPic_FatMan, 2, 4, 2), - overworld_frame(gObjectEventPic_FatMan, 2, 4, 3), - overworld_frame(gObjectEventPic_FatMan, 2, 4, 4), - overworld_frame(gObjectEventPic_FatMan, 2, 4, 5), - overworld_frame(gObjectEventPic_FatMan, 2, 4, 6), - overworld_frame(gObjectEventPic_FatMan, 2, 4, 7), - overworld_frame(gObjectEventPic_FatMan, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_FatMan, 2, 4), }; static const struct SpriteFrameImage sPicTable_PokefanF[] = { - overworld_frame(gObjectEventPic_PokefanF, 2, 4, 0), - overworld_frame(gObjectEventPic_PokefanF, 2, 4, 1), - overworld_frame(gObjectEventPic_PokefanF, 2, 4, 2), - overworld_frame(gObjectEventPic_PokefanF, 2, 4, 3), - overworld_frame(gObjectEventPic_PokefanF, 2, 4, 4), - overworld_frame(gObjectEventPic_PokefanF, 2, 4, 5), - overworld_frame(gObjectEventPic_PokefanF, 2, 4, 6), - overworld_frame(gObjectEventPic_PokefanF, 2, 4, 7), - overworld_frame(gObjectEventPic_PokefanF, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_PokefanF, 2, 4), }; static const struct SpriteFrameImage sPicTable_Man1[] = { - overworld_frame(gObjectEventPic_Man1, 2, 4, 0), - overworld_frame(gObjectEventPic_Man1, 2, 4, 1), - overworld_frame(gObjectEventPic_Man1, 2, 4, 2), - overworld_frame(gObjectEventPic_Man1, 2, 4, 3), - overworld_frame(gObjectEventPic_Man1, 2, 4, 4), - overworld_frame(gObjectEventPic_Man1, 2, 4, 5), - overworld_frame(gObjectEventPic_Man1, 2, 4, 6), - overworld_frame(gObjectEventPic_Man1, 2, 4, 7), - overworld_frame(gObjectEventPic_Man1, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Man1, 2, 4), }; static const struct SpriteFrameImage sPicTable_Woman2[] = { - overworld_frame(gObjectEventPic_Woman2, 2, 4, 0), - overworld_frame(gObjectEventPic_Woman2, 2, 4, 1), - overworld_frame(gObjectEventPic_Woman2, 2, 4, 2), - overworld_frame(gObjectEventPic_Woman2, 2, 4, 3), - overworld_frame(gObjectEventPic_Woman2, 2, 4, 4), - overworld_frame(gObjectEventPic_Woman2, 2, 4, 5), - overworld_frame(gObjectEventPic_Woman2, 2, 4, 6), - overworld_frame(gObjectEventPic_Woman2, 2, 4, 7), - overworld_frame(gObjectEventPic_Woman2, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Woman2, 2, 4), }; static const struct SpriteFrameImage sPicTable_ExpertM[] = { - overworld_frame(gObjectEventPic_ExpertM, 2, 4, 0), - overworld_frame(gObjectEventPic_ExpertM, 2, 4, 1), - overworld_frame(gObjectEventPic_ExpertM, 2, 4, 2), - overworld_frame(gObjectEventPic_ExpertM, 2, 4, 3), - overworld_frame(gObjectEventPic_ExpertM, 2, 4, 4), - overworld_frame(gObjectEventPic_ExpertM, 2, 4, 5), - overworld_frame(gObjectEventPic_ExpertM, 2, 4, 6), - overworld_frame(gObjectEventPic_ExpertM, 2, 4, 7), - overworld_frame(gObjectEventPic_ExpertM, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_ExpertM, 2, 4), }; static const struct SpriteFrameImage sPicTable_ExpertF[] = { - overworld_frame(gObjectEventPic_ExpertF, 2, 4, 0), - overworld_frame(gObjectEventPic_ExpertF, 2, 4, 1), - overworld_frame(gObjectEventPic_ExpertF, 2, 4, 2), - overworld_frame(gObjectEventPic_ExpertF, 2, 4, 3), - overworld_frame(gObjectEventPic_ExpertF, 2, 4, 4), - overworld_frame(gObjectEventPic_ExpertF, 2, 4, 5), - overworld_frame(gObjectEventPic_ExpertF, 2, 4, 6), - overworld_frame(gObjectEventPic_ExpertF, 2, 4, 7), - overworld_frame(gObjectEventPic_ExpertF, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_ExpertF, 2, 4), }; static const struct SpriteFrameImage sPicTable_Man2[] = { - overworld_frame(gObjectEventPic_Man2, 2, 4, 0), - overworld_frame(gObjectEventPic_Man2, 2, 4, 1), - overworld_frame(gObjectEventPic_Man2, 2, 4, 2), - overworld_frame(gObjectEventPic_Man2, 2, 4, 3), - overworld_frame(gObjectEventPic_Man2, 2, 4, 4), - overworld_frame(gObjectEventPic_Man2, 2, 4, 5), - overworld_frame(gObjectEventPic_Man2, 2, 4, 6), - overworld_frame(gObjectEventPic_Man2, 2, 4, 7), - overworld_frame(gObjectEventPic_Man2, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Man2, 2, 4), }; static const struct SpriteFrameImage sPicTable_Woman3[] = { - overworld_frame(gObjectEventPic_Woman3, 2, 4, 0), - overworld_frame(gObjectEventPic_Woman3, 2, 4, 1), - overworld_frame(gObjectEventPic_Woman3, 2, 4, 2), - overworld_frame(gObjectEventPic_Woman3, 2, 4, 3), - overworld_frame(gObjectEventPic_Woman3, 2, 4, 4), - overworld_frame(gObjectEventPic_Woman3, 2, 4, 5), - overworld_frame(gObjectEventPic_Woman3, 2, 4, 6), - overworld_frame(gObjectEventPic_Woman3, 2, 4, 7), - overworld_frame(gObjectEventPic_Woman3, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Woman3, 2, 4), }; static const struct SpriteFrameImage sPicTable_PokefanM[] = { - overworld_frame(gObjectEventPic_PokefanM, 2, 4, 0), - overworld_frame(gObjectEventPic_PokefanM, 2, 4, 1), - overworld_frame(gObjectEventPic_PokefanM, 2, 4, 2), - overworld_frame(gObjectEventPic_PokefanM, 2, 4, 3), - overworld_frame(gObjectEventPic_PokefanM, 2, 4, 4), - overworld_frame(gObjectEventPic_PokefanM, 2, 4, 5), - overworld_frame(gObjectEventPic_PokefanM, 2, 4, 6), - overworld_frame(gObjectEventPic_PokefanM, 2, 4, 7), - overworld_frame(gObjectEventPic_PokefanM, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_PokefanM, 2, 4), }; static const struct SpriteFrameImage sPicTable_Woman4[] = { - overworld_frame(gObjectEventPic_Woman4, 2, 4, 0), - overworld_frame(gObjectEventPic_Woman4, 2, 4, 1), - overworld_frame(gObjectEventPic_Woman4, 2, 4, 2), - overworld_frame(gObjectEventPic_Woman4, 2, 4, 3), - overworld_frame(gObjectEventPic_Woman4, 2, 4, 4), - overworld_frame(gObjectEventPic_Woman4, 2, 4, 5), - overworld_frame(gObjectEventPic_Woman4, 2, 4, 6), - overworld_frame(gObjectEventPic_Woman4, 2, 4, 7), - overworld_frame(gObjectEventPic_Woman4, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Woman4, 2, 4), }; static const struct SpriteFrameImage sPicTable_Cook[] = { @@ -383,15 +146,7 @@ static const struct SpriteFrameImage sPicTable_Cook[] = { }; static const struct SpriteFrameImage sPicTable_LinkReceptionist[] = { - overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 0), - overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 1), - overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 2), - overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 3), - overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 4), - overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 5), - overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 6), - overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 7), - overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_LinkReceptionist, 2, 4), }; static const struct SpriteFrameImage sPicTable_OldMan[] = { @@ -407,327 +162,111 @@ static const struct SpriteFrameImage sPicTable_OldMan[] = { }; static const struct SpriteFrameImage sPicTable_OldWoman[] = { - overworld_frame(gObjectEventPic_OldWoman, 2, 4, 0), - overworld_frame(gObjectEventPic_OldWoman, 2, 4, 1), - overworld_frame(gObjectEventPic_OldWoman, 2, 4, 2), - overworld_frame(gObjectEventPic_OldWoman, 2, 4, 3), - overworld_frame(gObjectEventPic_OldWoman, 2, 4, 4), - overworld_frame(gObjectEventPic_OldWoman, 2, 4, 5), - overworld_frame(gObjectEventPic_OldWoman, 2, 4, 6), - overworld_frame(gObjectEventPic_OldWoman, 2, 4, 7), - overworld_frame(gObjectEventPic_OldWoman, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_OldWoman, 2, 4), }; static const struct SpriteFrameImage sPicTable_Camper[] = { - overworld_frame(gObjectEventPic_Camper, 2, 4, 0), - overworld_frame(gObjectEventPic_Camper, 2, 4, 1), - overworld_frame(gObjectEventPic_Camper, 2, 4, 2), - overworld_frame(gObjectEventPic_Camper, 2, 4, 3), - overworld_frame(gObjectEventPic_Camper, 2, 4, 4), - overworld_frame(gObjectEventPic_Camper, 2, 4, 5), - overworld_frame(gObjectEventPic_Camper, 2, 4, 6), - overworld_frame(gObjectEventPic_Camper, 2, 4, 7), - overworld_frame(gObjectEventPic_Camper, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Camper, 2, 4), }; static const struct SpriteFrameImage sPicTable_Picnicker[] = { - overworld_frame(gObjectEventPic_Picnicker, 2, 4, 0), - overworld_frame(gObjectEventPic_Picnicker, 2, 4, 1), - overworld_frame(gObjectEventPic_Picnicker, 2, 4, 2), - overworld_frame(gObjectEventPic_Picnicker, 2, 4, 3), - overworld_frame(gObjectEventPic_Picnicker, 2, 4, 4), - overworld_frame(gObjectEventPic_Picnicker, 2, 4, 5), - overworld_frame(gObjectEventPic_Picnicker, 2, 4, 6), - overworld_frame(gObjectEventPic_Picnicker, 2, 4, 7), - overworld_frame(gObjectEventPic_Picnicker, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Picnicker, 2, 4), }; static const struct SpriteFrameImage sPicTable_Man3[] = { - overworld_frame(gObjectEventPic_Man3, 2, 4, 0), - overworld_frame(gObjectEventPic_Man3, 2, 4, 1), - overworld_frame(gObjectEventPic_Man3, 2, 4, 2), - overworld_frame(gObjectEventPic_Man3, 2, 4, 3), - overworld_frame(gObjectEventPic_Man3, 2, 4, 4), - overworld_frame(gObjectEventPic_Man3, 2, 4, 5), - overworld_frame(gObjectEventPic_Man3, 2, 4, 6), - overworld_frame(gObjectEventPic_Man3, 2, 4, 7), - overworld_frame(gObjectEventPic_Man3, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Man3, 2, 4), }; static const struct SpriteFrameImage sPicTable_Woman5[] = { - overworld_frame(gObjectEventPic_Woman5, 2, 4, 0), - overworld_frame(gObjectEventPic_Woman5, 2, 4, 1), - overworld_frame(gObjectEventPic_Woman5, 2, 4, 2), - overworld_frame(gObjectEventPic_Woman5, 2, 4, 3), - overworld_frame(gObjectEventPic_Woman5, 2, 4, 4), - overworld_frame(gObjectEventPic_Woman5, 2, 4, 5), - overworld_frame(gObjectEventPic_Woman5, 2, 4, 6), - overworld_frame(gObjectEventPic_Woman5, 2, 4, 7), - overworld_frame(gObjectEventPic_Woman5, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Woman5, 2, 4), }; static const struct SpriteFrameImage sPicTable_Youngster[] = { - overworld_frame(gObjectEventPic_Youngster, 2, 4, 0), - overworld_frame(gObjectEventPic_Youngster, 2, 4, 1), - overworld_frame(gObjectEventPic_Youngster, 2, 4, 2), - overworld_frame(gObjectEventPic_Youngster, 2, 4, 3), - overworld_frame(gObjectEventPic_Youngster, 2, 4, 4), - overworld_frame(gObjectEventPic_Youngster, 2, 4, 5), - overworld_frame(gObjectEventPic_Youngster, 2, 4, 6), - overworld_frame(gObjectEventPic_Youngster, 2, 4, 7), - overworld_frame(gObjectEventPic_Youngster, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Youngster, 2, 4), }; static const struct SpriteFrameImage sPicTable_BugCatcher[] = { - overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 0), - overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 1), - overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 2), - overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 3), - overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 4), - overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 5), - overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 6), - overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 7), - overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_BugCatcher, 2, 4), }; static const struct SpriteFrameImage sPicTable_PsychicM[] = { - overworld_frame(gObjectEventPic_PsychicM, 2, 4, 0), - overworld_frame(gObjectEventPic_PsychicM, 2, 4, 1), - overworld_frame(gObjectEventPic_PsychicM, 2, 4, 2), - overworld_frame(gObjectEventPic_PsychicM, 2, 4, 3), - overworld_frame(gObjectEventPic_PsychicM, 2, 4, 4), - overworld_frame(gObjectEventPic_PsychicM, 2, 4, 5), - overworld_frame(gObjectEventPic_PsychicM, 2, 4, 6), - overworld_frame(gObjectEventPic_PsychicM, 2, 4, 7), - overworld_frame(gObjectEventPic_PsychicM, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_PsychicM, 2, 4), }; static const struct SpriteFrameImage sPicTable_SchoolKidM[] = { - overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 0), - overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 1), - overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 2), - overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 3), - overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 4), - overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 5), - overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 6), - overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 7), - overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_SchoolKidM, 2, 4), }; static const struct SpriteFrameImage sPicTable_Maniac[] = { - overworld_frame(gObjectEventPic_Maniac, 2, 4, 0), - overworld_frame(gObjectEventPic_Maniac, 2, 4, 1), - overworld_frame(gObjectEventPic_Maniac, 2, 4, 2), - overworld_frame(gObjectEventPic_Maniac, 2, 4, 3), - overworld_frame(gObjectEventPic_Maniac, 2, 4, 4), - overworld_frame(gObjectEventPic_Maniac, 2, 4, 5), - overworld_frame(gObjectEventPic_Maniac, 2, 4, 6), - overworld_frame(gObjectEventPic_Maniac, 2, 4, 7), - overworld_frame(gObjectEventPic_Maniac, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Maniac, 2, 4), }; static const struct SpriteFrameImage sPicTable_HexManiac[] = { - overworld_frame(gObjectEventPic_HexManiac, 2, 4, 0), - overworld_frame(gObjectEventPic_HexManiac, 2, 4, 1), - overworld_frame(gObjectEventPic_HexManiac, 2, 4, 2), - overworld_frame(gObjectEventPic_HexManiac, 2, 4, 3), - overworld_frame(gObjectEventPic_HexManiac, 2, 4, 4), - overworld_frame(gObjectEventPic_HexManiac, 2, 4, 5), - overworld_frame(gObjectEventPic_HexManiac, 2, 4, 6), - overworld_frame(gObjectEventPic_HexManiac, 2, 4, 7), - overworld_frame(gObjectEventPic_HexManiac, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_HexManiac, 2, 4), }; static const struct SpriteFrameImage sPicTable_SwimmerM[] = { - overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 0), - overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 1), - overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 2), - overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 3), - overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 4), - overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 5), - overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 6), - overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 7), - overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_SwimmerM, 2, 4), }; static const struct SpriteFrameImage sPicTable_SwimmerF[] = { - overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 0), - overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 1), - overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 2), - overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 3), - overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 4), - overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 5), - overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 6), - overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 7), - overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_SwimmerF, 2, 4), }; static const struct SpriteFrameImage sPicTable_BlackBelt[] = { - overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 0), - overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 1), - overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 2), - overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 3), - overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 4), - overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 5), - overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 6), - overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 7), - overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_BlackBelt, 2, 4), }; static const struct SpriteFrameImage sPicTable_Beauty[] = { - overworld_frame(gObjectEventPic_Beauty, 2, 4, 0), - overworld_frame(gObjectEventPic_Beauty, 2, 4, 1), - overworld_frame(gObjectEventPic_Beauty, 2, 4, 2), - overworld_frame(gObjectEventPic_Beauty, 2, 4, 3), - overworld_frame(gObjectEventPic_Beauty, 2, 4, 4), - overworld_frame(gObjectEventPic_Beauty, 2, 4, 5), - overworld_frame(gObjectEventPic_Beauty, 2, 4, 6), - overworld_frame(gObjectEventPic_Beauty, 2, 4, 7), - overworld_frame(gObjectEventPic_Beauty, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Beauty, 2, 4), }; static const struct SpriteFrameImage sPicTable_Scientist1[] = { - overworld_frame(gObjectEventPic_Scientist1, 2, 4, 0), - overworld_frame(gObjectEventPic_Scientist1, 2, 4, 1), - overworld_frame(gObjectEventPic_Scientist1, 2, 4, 2), - overworld_frame(gObjectEventPic_Scientist1, 2, 4, 3), - overworld_frame(gObjectEventPic_Scientist1, 2, 4, 4), - overworld_frame(gObjectEventPic_Scientist1, 2, 4, 5), - overworld_frame(gObjectEventPic_Scientist1, 2, 4, 6), - overworld_frame(gObjectEventPic_Scientist1, 2, 4, 7), - overworld_frame(gObjectEventPic_Scientist1, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Scientist1, 2, 4), }; static const struct SpriteFrameImage sPicTable_Lass[] = { - overworld_frame(gObjectEventPic_Lass, 2, 4, 0), - overworld_frame(gObjectEventPic_Lass, 2, 4, 1), - overworld_frame(gObjectEventPic_Lass, 2, 4, 2), - overworld_frame(gObjectEventPic_Lass, 2, 4, 3), - overworld_frame(gObjectEventPic_Lass, 2, 4, 4), - overworld_frame(gObjectEventPic_Lass, 2, 4, 5), - overworld_frame(gObjectEventPic_Lass, 2, 4, 6), - overworld_frame(gObjectEventPic_Lass, 2, 4, 7), - overworld_frame(gObjectEventPic_Lass, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Lass, 2, 4), }; static const struct SpriteFrameImage sPicTable_Gentleman[] = { - overworld_frame(gObjectEventPic_Gentleman, 2, 4, 0), - overworld_frame(gObjectEventPic_Gentleman, 2, 4, 1), - overworld_frame(gObjectEventPic_Gentleman, 2, 4, 2), - overworld_frame(gObjectEventPic_Gentleman, 2, 4, 3), - overworld_frame(gObjectEventPic_Gentleman, 2, 4, 4), - overworld_frame(gObjectEventPic_Gentleman, 2, 4, 5), - overworld_frame(gObjectEventPic_Gentleman, 2, 4, 6), - overworld_frame(gObjectEventPic_Gentleman, 2, 4, 7), - overworld_frame(gObjectEventPic_Gentleman, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Gentleman, 2, 4), }; static const struct SpriteFrameImage sPicTable_Sailor[] = { - overworld_frame(gObjectEventPic_Sailor, 2, 4, 0), - overworld_frame(gObjectEventPic_Sailor, 2, 4, 1), - overworld_frame(gObjectEventPic_Sailor, 2, 4, 2), - overworld_frame(gObjectEventPic_Sailor, 2, 4, 3), - overworld_frame(gObjectEventPic_Sailor, 2, 4, 4), - overworld_frame(gObjectEventPic_Sailor, 2, 4, 5), - overworld_frame(gObjectEventPic_Sailor, 2, 4, 6), - overworld_frame(gObjectEventPic_Sailor, 2, 4, 7), - overworld_frame(gObjectEventPic_Sailor, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Sailor, 2, 4), }; static const struct SpriteFrameImage sPicTable_Fisherman[] = { - overworld_frame(gObjectEventPic_Fisherman, 2, 4, 0), - overworld_frame(gObjectEventPic_Fisherman, 2, 4, 1), - overworld_frame(gObjectEventPic_Fisherman, 2, 4, 2), - overworld_frame(gObjectEventPic_Fisherman, 2, 4, 3), - overworld_frame(gObjectEventPic_Fisherman, 2, 4, 4), - overworld_frame(gObjectEventPic_Fisherman, 2, 4, 5), - overworld_frame(gObjectEventPic_Fisherman, 2, 4, 6), - overworld_frame(gObjectEventPic_Fisherman, 2, 4, 7), - overworld_frame(gObjectEventPic_Fisherman, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Fisherman, 2, 4), }; static const struct SpriteFrameImage sPicTable_RunningTriathleteM[] = { - overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 0), - overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 1), - overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 2), - overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 3), - overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 4), - overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 5), - overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 6), - overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 7), - overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_RunningTriathleteM, 2, 4), }; static const struct SpriteFrameImage sPicTable_RunningTriathleteF[] = { - overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 0), - overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 1), - overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 2), - overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 3), - overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 4), - overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 5), - overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 6), - overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 7), - overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_RunningTriathleteF, 2, 4), }; static const struct SpriteFrameImage sPicTable_TuberF[] = { - overworld_frame(gObjectEventPic_TuberF, 2, 2, 0), - overworld_frame(gObjectEventPic_TuberF, 2, 2, 1), - overworld_frame(gObjectEventPic_TuberF, 2, 2, 2), - overworld_frame(gObjectEventPic_TuberF, 2, 2, 3), - overworld_frame(gObjectEventPic_TuberF, 2, 2, 4), - overworld_frame(gObjectEventPic_TuberF, 2, 2, 5), - overworld_frame(gObjectEventPic_TuberF, 2, 2, 6), - overworld_frame(gObjectEventPic_TuberF, 2, 2, 7), - overworld_frame(gObjectEventPic_TuberF, 2, 2, 8), + overworld_ascending_frames(gObjectEventPic_TuberF, 2, 2), }; static const struct SpriteFrameImage sPicTable_TuberM[] = { - overworld_frame(gObjectEventPic_TuberM, 2, 2, 0), - overworld_frame(gObjectEventPic_TuberM, 2, 2, 1), - overworld_frame(gObjectEventPic_TuberM, 2, 2, 2), - overworld_frame(gObjectEventPic_TuberM, 2, 2, 3), - overworld_frame(gObjectEventPic_TuberM, 2, 2, 4), - overworld_frame(gObjectEventPic_TuberM, 2, 2, 5), - overworld_frame(gObjectEventPic_TuberM, 2, 2, 6), - overworld_frame(gObjectEventPic_TuberM, 2, 2, 7), - overworld_frame(gObjectEventPic_TuberM, 2, 2, 8), + overworld_ascending_frames(gObjectEventPic_TuberM, 2, 2), }; static const struct SpriteFrameImage sPicTable_Hiker[] = { - overworld_frame(gObjectEventPic_Hiker, 2, 4, 0), - overworld_frame(gObjectEventPic_Hiker, 2, 4, 1), - overworld_frame(gObjectEventPic_Hiker, 2, 4, 2), - overworld_frame(gObjectEventPic_Hiker, 2, 4, 3), - overworld_frame(gObjectEventPic_Hiker, 2, 4, 4), - overworld_frame(gObjectEventPic_Hiker, 2, 4, 5), - overworld_frame(gObjectEventPic_Hiker, 2, 4, 6), - overworld_frame(gObjectEventPic_Hiker, 2, 4, 7), - overworld_frame(gObjectEventPic_Hiker, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Hiker, 2, 4), }; static const struct SpriteFrameImage sPicTable_CyclingTriathleteM[] = { - overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 0), - overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 1), - overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 2), - overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 3), - overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 4), - overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 5), - overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 6), - overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 7), - overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 8), + overworld_ascending_frames(gObjectEventPic_CyclingTriathleteM, 4, 4), }; static const struct SpriteFrameImage sPicTable_CyclingTriathleteF[] = { - overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 0), - overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 1), - overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 2), - overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 3), - overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 4), - overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 5), - overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 6), - overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 7), - overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 8), + overworld_ascending_frames(gObjectEventPic_CyclingTriathleteF, 4, 4), }; static const struct SpriteFrameImage sPicTable_Nurse[] = { @@ -748,87 +287,31 @@ static const struct SpriteFrameImage sPicTable_ItemBall[] = { }; static const struct SpriteFrameImage sPicTable_ProfBirch[] = { - overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 0), - overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 1), - overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 2), - overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 3), - overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 4), - overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 5), - overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 6), - overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 7), - overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_ProfBirch, 2, 4), }; static const struct SpriteFrameImage sPicTable_Man4[] = { - overworld_frame(gObjectEventPic_Man4, 2, 4, 0), - overworld_frame(gObjectEventPic_Man4, 2, 4, 1), - overworld_frame(gObjectEventPic_Man4, 2, 4, 2), - overworld_frame(gObjectEventPic_Man4, 2, 4, 3), - overworld_frame(gObjectEventPic_Man4, 2, 4, 4), - overworld_frame(gObjectEventPic_Man4, 2, 4, 5), - overworld_frame(gObjectEventPic_Man4, 2, 4, 6), - overworld_frame(gObjectEventPic_Man4, 2, 4, 7), - overworld_frame(gObjectEventPic_Man4, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Man4, 2, 4), }; static const struct SpriteFrameImage sPicTable_Man5[] = { - overworld_frame(gObjectEventPic_Man5, 2, 4, 0), - overworld_frame(gObjectEventPic_Man5, 2, 4, 1), - overworld_frame(gObjectEventPic_Man5, 2, 4, 2), - overworld_frame(gObjectEventPic_Man5, 2, 4, 3), - overworld_frame(gObjectEventPic_Man5, 2, 4, 4), - overworld_frame(gObjectEventPic_Man5, 2, 4, 5), - overworld_frame(gObjectEventPic_Man5, 2, 4, 6), - overworld_frame(gObjectEventPic_Man5, 2, 4, 7), - overworld_frame(gObjectEventPic_Man5, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Man5, 2, 4), }; static const struct SpriteFrameImage sPicTable_ReporterM[] = { - overworld_frame(gObjectEventPic_ReporterM, 2, 4, 0), - overworld_frame(gObjectEventPic_ReporterM, 2, 4, 1), - overworld_frame(gObjectEventPic_ReporterM, 2, 4, 2), - overworld_frame(gObjectEventPic_ReporterM, 2, 4, 3), - overworld_frame(gObjectEventPic_ReporterM, 2, 4, 4), - overworld_frame(gObjectEventPic_ReporterM, 2, 4, 5), - overworld_frame(gObjectEventPic_ReporterM, 2, 4, 6), - overworld_frame(gObjectEventPic_ReporterM, 2, 4, 7), - overworld_frame(gObjectEventPic_ReporterM, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_ReporterM, 2, 4), }; static const struct SpriteFrameImage sPicTable_ReporterF[] = { - overworld_frame(gObjectEventPic_ReporterF, 2, 4, 0), - overworld_frame(gObjectEventPic_ReporterF, 2, 4, 1), - overworld_frame(gObjectEventPic_ReporterF, 2, 4, 2), - overworld_frame(gObjectEventPic_ReporterF, 2, 4, 3), - overworld_frame(gObjectEventPic_ReporterF, 2, 4, 4), - overworld_frame(gObjectEventPic_ReporterF, 2, 4, 5), - overworld_frame(gObjectEventPic_ReporterF, 2, 4, 6), - overworld_frame(gObjectEventPic_ReporterF, 2, 4, 7), - overworld_frame(gObjectEventPic_ReporterF, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_ReporterF, 2, 4), }; static const struct SpriteFrameImage sPicTable_MauvilleOldMan1[] = { - overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 0), - overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 1), - overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 2), - overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 3), - overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 4), - overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 5), - overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 6), - overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 7), - overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_MauvilleOldMan1, 2, 4), }; static const struct SpriteFrameImage sPicTable_MauvilleOldMan2[] = { - overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 0), - overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 1), - overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 2), - overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 3), - overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 4), - overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 5), - overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 6), - overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 7), - overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_MauvilleOldMan2, 2, 4), }; static const struct SpriteFrameImage sPicTable_UnusedNatuDoll[] = { @@ -856,53 +339,23 @@ static const struct SpriteFrameImage sPicTable_UnusedPorygon2Doll[] = { }; static const struct SpriteFrameImage sPicTable_CuttableTree[] = { - overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 0), - overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 1), - overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 2), - overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 3), + overworld_ascending_frames(gObjectEventPic_CuttableTree, 2, 2), }; static const struct SpriteFrameImage sPicTable_MartEmployee[] = { - overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 0), - overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 1), - overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 2), - overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 3), - overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 4), - overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 5), - overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 6), - overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 7), - overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_MartEmployee, 2, 4), }; static const struct SpriteFrameImage sPicTable_RooftopSaleWoman[] = { - overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 0), - overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 1), - overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 2), - overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 3), - overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 4), - overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 5), - overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 6), - overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 7), - overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_RooftopSaleWoman, 2, 4), }; static const struct SpriteFrameImage sPicTable_Teala[] = { - overworld_frame(gObjectEventPic_Teala, 2, 4, 0), - overworld_frame(gObjectEventPic_Teala, 2, 4, 1), - overworld_frame(gObjectEventPic_Teala, 2, 4, 2), - overworld_frame(gObjectEventPic_Teala, 2, 4, 3), - overworld_frame(gObjectEventPic_Teala, 2, 4, 4), - overworld_frame(gObjectEventPic_Teala, 2, 4, 5), - overworld_frame(gObjectEventPic_Teala, 2, 4, 6), - overworld_frame(gObjectEventPic_Teala, 2, 4, 7), - overworld_frame(gObjectEventPic_Teala, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Teala, 2, 4), }; static const struct SpriteFrameImage sPicTable_BreakableRock[] = { - overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 0), - overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 1), - overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 2), - overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 3), + overworld_ascending_frames(gObjectEventPic_BreakableRock, 2, 2), }; static const struct SpriteFrameImage sPicTable_PushableBoulder[] = { @@ -954,102 +407,27 @@ static const struct SpriteFrameImage sPicTable_BirchsBag[] = { }; static const struct SpriteFrameImage sPicTable_EnemyZigzagoon[] = { - overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 0), - overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 1), - overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 2), - overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 3), - overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 4), - overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 5), - overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 6), - overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 7), - overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 8), + overworld_ascending_frames(gObjectEventPic_EnemyZigzagoon, 4, 4), }; static const struct SpriteFrameImage sPicTable_Poochyena[] = { - overworld_frame(gObjectEventPic_Poochyena, 4, 4, 0), - overworld_frame(gObjectEventPic_Poochyena, 4, 4, 1), - overworld_frame(gObjectEventPic_Poochyena, 4, 4, 2), - overworld_frame(gObjectEventPic_Poochyena, 4, 4, 3), - overworld_frame(gObjectEventPic_Poochyena, 4, 4, 4), - overworld_frame(gObjectEventPic_Poochyena, 4, 4, 5), - overworld_frame(gObjectEventPic_Poochyena, 4, 4, 6), - overworld_frame(gObjectEventPic_Poochyena, 4, 4, 7), - overworld_frame(gObjectEventPic_Poochyena, 4, 4, 8), + overworld_ascending_frames(gObjectEventPic_Poochyena, 4, 4), }; static const struct SpriteFrameImage sPicTable_Artist[] = { - overworld_frame(gObjectEventPic_Artist, 2, 4, 0), - overworld_frame(gObjectEventPic_Artist, 2, 4, 1), - overworld_frame(gObjectEventPic_Artist, 2, 4, 2), - overworld_frame(gObjectEventPic_Artist, 2, 4, 3), - overworld_frame(gObjectEventPic_Artist, 2, 4, 4), - overworld_frame(gObjectEventPic_Artist, 2, 4, 5), - overworld_frame(gObjectEventPic_Artist, 2, 4, 6), - overworld_frame(gObjectEventPic_Artist, 2, 4, 7), - overworld_frame(gObjectEventPic_Artist, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Artist, 2, 4), }; static const struct SpriteFrameImage sPicTable_MayNormal[] = { - overworld_frame(gObjectEventPic_MayNormal, 2, 4, 0), - overworld_frame(gObjectEventPic_MayNormal, 2, 4, 1), - overworld_frame(gObjectEventPic_MayNormal, 2, 4, 2), - overworld_frame(gObjectEventPic_MayNormal, 2, 4, 3), - overworld_frame(gObjectEventPic_MayNormal, 2, 4, 4), - overworld_frame(gObjectEventPic_MayNormal, 2, 4, 5), - overworld_frame(gObjectEventPic_MayNormal, 2, 4, 6), - overworld_frame(gObjectEventPic_MayNormal, 2, 4, 7), - overworld_frame(gObjectEventPic_MayNormal, 2, 4, 8), - overworld_frame(gObjectEventPic_MayRunning, 2, 4, 0), - overworld_frame(gObjectEventPic_MayRunning, 2, 4, 1), - overworld_frame(gObjectEventPic_MayRunning, 2, 4, 2), - overworld_frame(gObjectEventPic_MayRunning, 2, 4, 3), - overworld_frame(gObjectEventPic_MayRunning, 2, 4, 4), - overworld_frame(gObjectEventPic_MayRunning, 2, 4, 5), - overworld_frame(gObjectEventPic_MayRunning, 2, 4, 6), - overworld_frame(gObjectEventPic_MayRunning, 2, 4, 7), - overworld_frame(gObjectEventPic_MayRunning, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_MayNormalRunning, 2, 4), }; static const struct SpriteFrameImage sPicTable_MayMachBike[] = { - overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 0), - overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 1), - overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 2), - overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 3), - overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 4), - overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 5), - overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 6), - overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 7), - overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 8), + overworld_ascending_frames(gObjectEventPic_MayMachBike, 4, 4), }; static const struct SpriteFrameImage sPicTable_MayAcroBike[] = { - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 0), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 1), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 2), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 3), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 4), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 5), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 6), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 7), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 8), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 9), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 10), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 11), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 12), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 13), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 14), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 15), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 16), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 17), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 18), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 19), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 20), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 21), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 22), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 23), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 24), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 25), - overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 26), + overworld_ascending_frames(gObjectEventPic_MayAcroBike, 4, 4), }; static const struct SpriteFrameImage sPicTable_MaySurfing[] = { @@ -1080,23 +458,11 @@ static const struct SpriteFrameImage sPicTable_MayUnderwater[] = { }; static const struct SpriteFrameImage sPicTable_MayFieldMove[] = { - overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 0), - overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 1), - overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 2), - overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 3), - overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 4), + overworld_ascending_frames(gObjectEventPic_MayFieldMove, 4, 4), }; static const struct SpriteFrameImage sPicTable_Cameraman[] = { - overworld_frame(gObjectEventPic_Cameraman, 2, 4, 0), - overworld_frame(gObjectEventPic_Cameraman, 2, 4, 1), - overworld_frame(gObjectEventPic_Cameraman, 2, 4, 2), - overworld_frame(gObjectEventPic_Cameraman, 2, 4, 3), - overworld_frame(gObjectEventPic_Cameraman, 2, 4, 4), - overworld_frame(gObjectEventPic_Cameraman, 2, 4, 5), - overworld_frame(gObjectEventPic_Cameraman, 2, 4, 6), - overworld_frame(gObjectEventPic_Cameraman, 2, 4, 7), - overworld_frame(gObjectEventPic_Cameraman, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Cameraman, 2, 4), }; static const struct SpriteFrameImage sPicTable_MovingBox[] = { @@ -1108,75 +474,27 @@ static const struct SpriteFrameImage sPicTable_CableCar[] = { }; static const struct SpriteFrameImage sPicTable_Scientist2[] = { - overworld_frame(gObjectEventPic_Scientist2, 2, 4, 0), - overworld_frame(gObjectEventPic_Scientist2, 2, 4, 1), - overworld_frame(gObjectEventPic_Scientist2, 2, 4, 2), - overworld_frame(gObjectEventPic_Scientist2, 2, 4, 3), - overworld_frame(gObjectEventPic_Scientist2, 2, 4, 4), - overworld_frame(gObjectEventPic_Scientist2, 2, 4, 5), - overworld_frame(gObjectEventPic_Scientist2, 2, 4, 6), - overworld_frame(gObjectEventPic_Scientist2, 2, 4, 7), - overworld_frame(gObjectEventPic_Scientist2, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Scientist2, 2, 4), }; static const struct SpriteFrameImage sPicTable_DevonEmployee[] = { - overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 0), - overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 1), - overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 2), - overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 3), - overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 4), - overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 5), - overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 6), - overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 7), - overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_DevonEmployee, 2, 4), }; static const struct SpriteFrameImage sPicTable_AquaMemberM[] = { - overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 0), - overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 1), - overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 2), - overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 3), - overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 4), - overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 5), - overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 6), - overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 7), - overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_AquaMemberM, 2, 4), }; static const struct SpriteFrameImage sPicTable_AquaMemberF[] = { - overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 0), - overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 1), - overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 2), - overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 3), - overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 4), - overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 5), - overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 6), - overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 7), - overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_AquaMemberF, 2, 4), }; static const struct SpriteFrameImage sPicTable_MagmaMemberM[] = { - overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 0), - overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 1), - overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 2), - overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 3), - overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 4), - overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 5), - overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 6), - overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 7), - overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_MagmaMemberM, 2, 4), }; static const struct SpriteFrameImage sPicTable_MagmaMemberF[] = { - overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 0), - overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 1), - overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 2), - overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 3), - overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 4), - overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 5), - overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 6), - overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 7), - overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_MagmaMemberF, 2, 4), }; static const struct SpriteFrameImage sPicTable_Sidney[] = { @@ -1324,93 +642,31 @@ static const struct SpriteFrameImage sPicTable_Tate[] = { }; static const struct SpriteFrameImage sPicTable_Wallace[] = { - overworld_frame(gObjectEventPic_Wallace, 2, 4, 0), - overworld_frame(gObjectEventPic_Wallace, 2, 4, 1), - overworld_frame(gObjectEventPic_Wallace, 2, 4, 2), - overworld_frame(gObjectEventPic_Wallace, 2, 4, 3), - overworld_frame(gObjectEventPic_Wallace, 2, 4, 4), - overworld_frame(gObjectEventPic_Wallace, 2, 4, 5), - overworld_frame(gObjectEventPic_Wallace, 2, 4, 6), - overworld_frame(gObjectEventPic_Wallace, 2, 4, 7), - overworld_frame(gObjectEventPic_Wallace, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Wallace, 2, 4), }; static const struct SpriteFrameImage sPicTable_Steven[] = { - overworld_frame(gObjectEventPic_Steven, 2, 4, 0), - overworld_frame(gObjectEventPic_Steven, 2, 4, 1), - overworld_frame(gObjectEventPic_Steven, 2, 4, 2), - overworld_frame(gObjectEventPic_Steven, 2, 4, 3), - overworld_frame(gObjectEventPic_Steven, 2, 4, 4), - overworld_frame(gObjectEventPic_Steven, 2, 4, 5), - overworld_frame(gObjectEventPic_Steven, 2, 4, 6), - overworld_frame(gObjectEventPic_Steven, 2, 4, 7), - overworld_frame(gObjectEventPic_Steven, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Steven, 2, 4), }; static const struct SpriteFrameImage sPicTable_Wally[] = { - overworld_frame(gObjectEventPic_Wally, 2, 4, 0), - overworld_frame(gObjectEventPic_Wally, 2, 4, 1), - overworld_frame(gObjectEventPic_Wally, 2, 4, 2), - overworld_frame(gObjectEventPic_Wally, 2, 4, 3), - overworld_frame(gObjectEventPic_Wally, 2, 4, 4), - overworld_frame(gObjectEventPic_Wally, 2, 4, 5), - overworld_frame(gObjectEventPic_Wally, 2, 4, 6), - overworld_frame(gObjectEventPic_Wally, 2, 4, 7), - overworld_frame(gObjectEventPic_Wally, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Wally, 2, 4), }; static const struct SpriteFrameImage sPicTable_RubySapphireLittleBoy[] = { - overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 0), - overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 1), - overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 2), - overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 3), - overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 4), - overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 5), - overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 6), - overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 7), - overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 8), + overworld_ascending_frames(gObjectEventPic_RubySapphireLittleBoy, 2, 2), }; static const struct SpriteFrameImage sPicTable_BrendanFishing[] = { - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 0), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 1), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 2), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 3), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 4), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 5), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 6), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 7), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 8), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 9), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 10), - overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 11), + overworld_ascending_frames(gObjectEventPic_BrendanFishing, 4, 4), }; static const struct SpriteFrameImage sPicTable_MayFishing[] = { - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 0), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 1), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 2), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 3), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 4), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 5), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 6), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 7), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 8), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 9), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 10), - overworld_frame(gObjectEventPic_MayFishing, 4, 4, 11), + overworld_ascending_frames(gObjectEventPic_MayFishing, 4, 4), }; static const struct SpriteFrameImage sPicTable_HotSpringsOldWoman[] = { - overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 0), - overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 1), - overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 2), - overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 3), - overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 4), - overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 5), - overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 6), - overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 7), - overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_HotSpringsOldWoman, 2, 4), }; static const struct SpriteFrameImage sPicTable_SSTidal[] = { @@ -1642,15 +898,7 @@ static const struct SpriteFrameImage sPicTable_GameboyKid[] = { }; static const struct SpriteFrameImage sPicTable_ContestJudge[] = { - overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 0), - overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 1), - overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 2), - overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 3), - overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 4), - overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 5), - overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 6), - overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 7), - overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_ContestJudge, 2, 4), }; static const struct SpriteFrameImage sPicTable_BrendanWatering[] = { @@ -1686,27 +934,11 @@ static const struct SpriteFrameImage sPicTable_MayDecorating[] = { }; static const struct SpriteFrameImage sPicTable_Archie[] = { - overworld_frame(gObjectEventPic_Archie, 2, 4, 0), - overworld_frame(gObjectEventPic_Archie, 2, 4, 1), - overworld_frame(gObjectEventPic_Archie, 2, 4, 2), - overworld_frame(gObjectEventPic_Archie, 2, 4, 3), - overworld_frame(gObjectEventPic_Archie, 2, 4, 4), - overworld_frame(gObjectEventPic_Archie, 2, 4, 5), - overworld_frame(gObjectEventPic_Archie, 2, 4, 6), - overworld_frame(gObjectEventPic_Archie, 2, 4, 7), - overworld_frame(gObjectEventPic_Archie, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Archie, 2, 4), }; static const struct SpriteFrameImage sPicTable_Maxie[] = { - overworld_frame(gObjectEventPic_Maxie, 2, 4, 0), - overworld_frame(gObjectEventPic_Maxie, 2, 4, 1), - overworld_frame(gObjectEventPic_Maxie, 2, 4, 2), - overworld_frame(gObjectEventPic_Maxie, 2, 4, 3), - overworld_frame(gObjectEventPic_Maxie, 2, 4, 4), - overworld_frame(gObjectEventPic_Maxie, 2, 4, 5), - overworld_frame(gObjectEventPic_Maxie, 2, 4, 6), - overworld_frame(gObjectEventPic_Maxie, 2, 4, 7), - overworld_frame(gObjectEventPic_Maxie, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Maxie, 2, 4), }; static const struct SpriteFrameImage sPicTable_KyogreFront[] = { @@ -1866,15 +1098,7 @@ static const struct SpriteFrameImage sPicTable_Wingull[] = { }; static const struct SpriteFrameImage sPicTable_TuberMSwimming[] = { - overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 0), - overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 1), - overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 2), - overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 3), - overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 4), - overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 5), - overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 6), - overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 7), - overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 8), + overworld_ascending_frames(gObjectEventPic_TuberMSwimming, 2, 2), }; static const struct SpriteFrameImage sPicTable_Azurill[] = { @@ -1890,39 +1114,15 @@ static const struct SpriteFrameImage sPicTable_Azurill[] = { }; static const struct SpriteFrameImage sPicTable_Mom[] = { - overworld_frame(gObjectEventPic_Mom, 2, 4, 0), - overworld_frame(gObjectEventPic_Mom, 2, 4, 1), - overworld_frame(gObjectEventPic_Mom, 2, 4, 2), - overworld_frame(gObjectEventPic_Mom, 2, 4, 3), - overworld_frame(gObjectEventPic_Mom, 2, 4, 4), - overworld_frame(gObjectEventPic_Mom, 2, 4, 5), - overworld_frame(gObjectEventPic_Mom, 2, 4, 6), - overworld_frame(gObjectEventPic_Mom, 2, 4, 7), - overworld_frame(gObjectEventPic_Mom, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Mom, 2, 4), }; static const struct SpriteFrameImage sPicTable_Scott[] = { - overworld_frame(gObjectEventPic_Scott, 2, 4, 0), - overworld_frame(gObjectEventPic_Scott, 2, 4, 1), - overworld_frame(gObjectEventPic_Scott, 2, 4, 2), - overworld_frame(gObjectEventPic_Scott, 2, 4, 3), - overworld_frame(gObjectEventPic_Scott, 2, 4, 4), - overworld_frame(gObjectEventPic_Scott, 2, 4, 5), - overworld_frame(gObjectEventPic_Scott, 2, 4, 6), - overworld_frame(gObjectEventPic_Scott, 2, 4, 7), - overworld_frame(gObjectEventPic_Scott, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Scott, 2, 4), }; static const struct SpriteFrameImage sPicTable_Juan[] = { - overworld_frame(gObjectEventPic_Juan, 2, 4, 0), - overworld_frame(gObjectEventPic_Juan, 2, 4, 1), - overworld_frame(gObjectEventPic_Juan, 2, 4, 2), - overworld_frame(gObjectEventPic_Juan, 2, 4, 3), - overworld_frame(gObjectEventPic_Juan, 2, 4, 4), - overworld_frame(gObjectEventPic_Juan, 2, 4, 5), - overworld_frame(gObjectEventPic_Juan, 2, 4, 6), - overworld_frame(gObjectEventPic_Juan, 2, 4, 7), - overworld_frame(gObjectEventPic_Juan, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Juan, 2, 4), }; static const struct SpriteFrameImage sPicTable_MysteryEventDeliveryman[] = { @@ -1942,27 +1142,11 @@ static const struct SpriteFrameImage sPicTable_Statue[] = { }; static const struct SpriteFrameImage sPicTable_Dusclops[] = { - overworld_frame(gObjectEventPic_Dusclops, 2, 4, 0), - overworld_frame(gObjectEventPic_Dusclops, 2, 4, 1), - overworld_frame(gObjectEventPic_Dusclops, 2, 4, 2), - overworld_frame(gObjectEventPic_Dusclops, 2, 4, 3), - overworld_frame(gObjectEventPic_Dusclops, 2, 4, 4), - overworld_frame(gObjectEventPic_Dusclops, 2, 4, 5), - overworld_frame(gObjectEventPic_Dusclops, 2, 4, 6), - overworld_frame(gObjectEventPic_Dusclops, 2, 4, 7), - overworld_frame(gObjectEventPic_Dusclops, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Dusclops, 2, 4), }; static const struct SpriteFrameImage sPicTable_Kirlia[] = { - overworld_frame(gObjectEventPic_Kirlia, 2, 4, 0), - overworld_frame(gObjectEventPic_Kirlia, 2, 4, 1), - overworld_frame(gObjectEventPic_Kirlia, 2, 4, 2), - overworld_frame(gObjectEventPic_Kirlia, 2, 4, 3), - overworld_frame(gObjectEventPic_Kirlia, 2, 4, 4), - overworld_frame(gObjectEventPic_Kirlia, 2, 4, 5), - overworld_frame(gObjectEventPic_Kirlia, 2, 4, 6), - overworld_frame(gObjectEventPic_Kirlia, 2, 4, 7), - overworld_frame(gObjectEventPic_Kirlia, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Kirlia, 2, 4), }; static const struct SpriteFrameImage sPicTable_UnionRoomAttendant[] = { @@ -1990,39 +1174,15 @@ static const struct SpriteFrameImage sPicTable_Sudowoodo[] = { }; static const struct SpriteFrameImage sPicTable_Mew[] = { - overworld_frame(gObjectEventPic_Mew, 2, 4, 0), - overworld_frame(gObjectEventPic_Mew, 2, 4, 1), - overworld_frame(gObjectEventPic_Mew, 2, 4, 2), - overworld_frame(gObjectEventPic_Mew, 2, 4, 3), - overworld_frame(gObjectEventPic_Mew, 2, 4, 4), - overworld_frame(gObjectEventPic_Mew, 2, 4, 5), - overworld_frame(gObjectEventPic_Mew, 2, 4, 6), - overworld_frame(gObjectEventPic_Mew, 2, 4, 7), - overworld_frame(gObjectEventPic_Mew, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Mew, 2, 4), }; static const struct SpriteFrameImage sPicTable_Red[] = { - overworld_frame(gObjectEventPic_Red, 2, 4, 0), - overworld_frame(gObjectEventPic_Red, 2, 4, 1), - overworld_frame(gObjectEventPic_Red, 2, 4, 2), - overworld_frame(gObjectEventPic_Red, 2, 4, 3), - overworld_frame(gObjectEventPic_Red, 2, 4, 4), - overworld_frame(gObjectEventPic_Red, 2, 4, 5), - overworld_frame(gObjectEventPic_Red, 2, 4, 6), - overworld_frame(gObjectEventPic_Red, 2, 4, 7), - overworld_frame(gObjectEventPic_Red, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Red, 2, 4), }; static const struct SpriteFrameImage sPicTable_Leaf[] = { - overworld_frame(gObjectEventPic_Leaf, 2, 4, 0), - overworld_frame(gObjectEventPic_Leaf, 2, 4, 1), - overworld_frame(gObjectEventPic_Leaf, 2, 4, 2), - overworld_frame(gObjectEventPic_Leaf, 2, 4, 3), - overworld_frame(gObjectEventPic_Leaf, 2, 4, 4), - overworld_frame(gObjectEventPic_Leaf, 2, 4, 5), - overworld_frame(gObjectEventPic_Leaf, 2, 4, 6), - overworld_frame(gObjectEventPic_Leaf, 2, 4, 7), - overworld_frame(gObjectEventPic_Leaf, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Leaf, 2, 4), }; static const struct SpriteFrameImage sPicTable_Deoxys[] = { @@ -2042,87 +1202,31 @@ static const struct SpriteFrameImage sPicTable_BirthIslandStone[] = { }; static const struct SpriteFrameImage sPicTable_Anabel[] = { - overworld_frame(gObjectEventPic_Anabel, 2, 4, 0), - overworld_frame(gObjectEventPic_Anabel, 2, 4, 1), - overworld_frame(gObjectEventPic_Anabel, 2, 4, 2), - overworld_frame(gObjectEventPic_Anabel, 2, 4, 3), - overworld_frame(gObjectEventPic_Anabel, 2, 4, 4), - overworld_frame(gObjectEventPic_Anabel, 2, 4, 5), - overworld_frame(gObjectEventPic_Anabel, 2, 4, 6), - overworld_frame(gObjectEventPic_Anabel, 2, 4, 7), - overworld_frame(gObjectEventPic_Anabel, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Anabel, 2, 4), }; static const struct SpriteFrameImage sPicTable_Tucker[] = { - overworld_frame(gObjectEventPic_Tucker, 2, 4, 0), - overworld_frame(gObjectEventPic_Tucker, 2, 4, 1), - overworld_frame(gObjectEventPic_Tucker, 2, 4, 2), - overworld_frame(gObjectEventPic_Tucker, 2, 4, 3), - overworld_frame(gObjectEventPic_Tucker, 2, 4, 4), - overworld_frame(gObjectEventPic_Tucker, 2, 4, 5), - overworld_frame(gObjectEventPic_Tucker, 2, 4, 6), - overworld_frame(gObjectEventPic_Tucker, 2, 4, 7), - overworld_frame(gObjectEventPic_Tucker, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Tucker, 2, 4), }; static const struct SpriteFrameImage sPicTable_Spenser[] = { - overworld_frame(gObjectEventPic_Spenser, 2, 4, 0), - overworld_frame(gObjectEventPic_Spenser, 2, 4, 1), - overworld_frame(gObjectEventPic_Spenser, 2, 4, 2), - overworld_frame(gObjectEventPic_Spenser, 2, 4, 3), - overworld_frame(gObjectEventPic_Spenser, 2, 4, 4), - overworld_frame(gObjectEventPic_Spenser, 2, 4, 5), - overworld_frame(gObjectEventPic_Spenser, 2, 4, 6), - overworld_frame(gObjectEventPic_Spenser, 2, 4, 7), - overworld_frame(gObjectEventPic_Spenser, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Spenser, 2, 4), }; static const struct SpriteFrameImage sPicTable_Greta[] = { - overworld_frame(gObjectEventPic_Greta, 2, 4, 0), - overworld_frame(gObjectEventPic_Greta, 2, 4, 1), - overworld_frame(gObjectEventPic_Greta, 2, 4, 2), - overworld_frame(gObjectEventPic_Greta, 2, 4, 3), - overworld_frame(gObjectEventPic_Greta, 2, 4, 4), - overworld_frame(gObjectEventPic_Greta, 2, 4, 5), - overworld_frame(gObjectEventPic_Greta, 2, 4, 6), - overworld_frame(gObjectEventPic_Greta, 2, 4, 7), - overworld_frame(gObjectEventPic_Greta, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Greta, 2, 4), }; static const struct SpriteFrameImage sPicTable_Noland[] = { - overworld_frame(gObjectEventPic_Noland, 2, 4, 0), - overworld_frame(gObjectEventPic_Noland, 2, 4, 1), - overworld_frame(gObjectEventPic_Noland, 2, 4, 2), - overworld_frame(gObjectEventPic_Noland, 2, 4, 3), - overworld_frame(gObjectEventPic_Noland, 2, 4, 4), - overworld_frame(gObjectEventPic_Noland, 2, 4, 5), - overworld_frame(gObjectEventPic_Noland, 2, 4, 6), - overworld_frame(gObjectEventPic_Noland, 2, 4, 7), - overworld_frame(gObjectEventPic_Noland, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Noland, 2, 4), }; static const struct SpriteFrameImage sPicTable_Lucy[] = { - overworld_frame(gObjectEventPic_Lucy, 2, 4, 0), - overworld_frame(gObjectEventPic_Lucy, 2, 4, 1), - overworld_frame(gObjectEventPic_Lucy, 2, 4, 2), - overworld_frame(gObjectEventPic_Lucy, 2, 4, 3), - overworld_frame(gObjectEventPic_Lucy, 2, 4, 4), - overworld_frame(gObjectEventPic_Lucy, 2, 4, 5), - overworld_frame(gObjectEventPic_Lucy, 2, 4, 6), - overworld_frame(gObjectEventPic_Lucy, 2, 4, 7), - overworld_frame(gObjectEventPic_Lucy, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Lucy, 2, 4), }; static const struct SpriteFrameImage sPicTable_Brandon[] = { - overworld_frame(gObjectEventPic_Brandon, 2, 4, 0), - overworld_frame(gObjectEventPic_Brandon, 2, 4, 1), - overworld_frame(gObjectEventPic_Brandon, 2, 4, 2), - overworld_frame(gObjectEventPic_Brandon, 2, 4, 3), - overworld_frame(gObjectEventPic_Brandon, 2, 4, 4), - overworld_frame(gObjectEventPic_Brandon, 2, 4, 5), - overworld_frame(gObjectEventPic_Brandon, 2, 4, 6), - overworld_frame(gObjectEventPic_Brandon, 2, 4, 7), - overworld_frame(gObjectEventPic_Brandon, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_Brandon, 2, 4), }; static const struct SpriteFrameImage sPicTable_Lugia[] = { @@ -2150,25 +1254,9 @@ static const struct SpriteFrameImage sPicTable_HoOh[] = { }; static const struct SpriteFrameImage sPicTable_RubySapphireBrendan[] = { - overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 0), - overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 1), - overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 2), - overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 3), - overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 4), - overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 5), - overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 6), - overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 7), - overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_RubySapphireBrendanNormal, 2, 4), }; static const struct SpriteFrameImage sPicTable_RubySapphireMay[] = { - overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 0), - overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 1), - overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 2), - overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 3), - overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 4), - overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 5), - overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 6), - overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 7), - overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 8), + overworld_ascending_frames(gObjectEventPic_RubySapphireMayNormal, 2, 4), };