From f220cc6236fe2eeb157faead834763a389d0f033 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 4 Jul 2025 11:01:14 +0200 Subject: [PATCH] fix ornament flag 114 file --- src/data/ornament/flag11.h | 113 ------------------------------------ src/data/ornament/flag114.h | 113 ++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 113 deletions(-) diff --git a/src/data/ornament/flag11.h b/src/data/ornament/flag11.h index ba30433ee..8226ff5ef 100644 --- a/src/data/ornament/flag11.h +++ b/src/data/ornament/flag11.h @@ -1,116 +1,3 @@ -static const axmain sAxMainFlag114; -const SiroArchive gAxFlag114 = {"SIRO", &sAxMainFlag114}; - -static const ax_pose sFlag114Pose1[] = { - AX_POSE(0, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), - AX_POSE_TERMINATOR -}; -static const ax_pose sFlag114Pose2[] = { - AX_POSE(1, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), - AX_POSE_TERMINATOR -}; -static const ax_pose sFlag114Pose3[] = { - AX_POSE(2, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), - AX_POSE_TERMINATOR -}; -static const ax_pose sFlag114Pose4[] = { - AX_POSE(3, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), - AX_POSE_TERMINATOR -}; -static const ax_pose sFlag114Pose5[] = { - AX_POSE(4, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), - AX_POSE_TERMINATOR -}; -static const ax_pose sFlag114Pose6[] = { - AX_POSE(5, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), - AX_POSE_TERMINATOR -}; -static const ax_anim sFlag114Anims_1_1[] = { - { .frames = 4, .unkFlags = 0, .poseId = 0, .offset = {0, 0}, .shadow = {0, 0} }, - { .frames = 4, .unkFlags = 0, .poseId = 1, .offset = {0, 0}, .shadow = {0, 0} }, - { .frames = 4, .unkFlags = 0, .poseId = 2, .offset = {0, 0}, .shadow = {0, 0} }, - { .frames = 4, .unkFlags = 0, .poseId = 3, .offset = {0, 0}, .shadow = {0, 0} }, - { .frames = 4, .unkFlags = 0, .poseId = 4, .offset = {0, 0}, .shadow = {0, 0} }, - { .frames = 4, .unkFlags = 0, .poseId = 5, .offset = {0, 0}, .shadow = {0, 0} }, - AX_ANIM_TERMINATOR -}; -static const u8 sFlag114Gfx1[] = INCBIN_U8("graphics/ornament/Flag114/sprite_1.4bpp"); -static const ax_sprite sFlag114Sprites1[] = { - {sFlag114Gfx1, ARRAY_COUNT(sFlag114Gfx1)}, - {NULL, 128}, - {NULL, 0}, -}; -static const u8 sFlag114Gfx2[] = INCBIN_U8("graphics/ornament/Flag114/sprite_2.4bpp"); -static const ax_sprite sFlag114Sprites2[] = { - {sFlag114Gfx2, ARRAY_COUNT(sFlag114Gfx2)}, - {NULL, 128}, - {NULL, 0}, -}; -static const u8 sFlag114Gfx3[] = INCBIN_U8("graphics/ornament/Flag114/sprite_3.4bpp"); -static const ax_sprite sFlag114Sprites3[] = { - {sFlag114Gfx3, ARRAY_COUNT(sFlag114Gfx3)}, - {NULL, 128}, - {NULL, 0}, -}; -static const u8 sFlag114Gfx4[] = INCBIN_U8("graphics/ornament/Flag114/sprite_4.4bpp"); -static const ax_sprite sFlag114Sprites4[] = { - {sFlag114Gfx4, ARRAY_COUNT(sFlag114Gfx4)}, - {NULL, 128}, - {NULL, 0}, -}; -static const u8 sFlag114Gfx5[] = INCBIN_U8("graphics/ornament/Flag114/sprite_5.4bpp"); -static const ax_sprite sFlag114Sprites5[] = { - {sFlag114Gfx5, ARRAY_COUNT(sFlag114Gfx5)}, - {NULL, 128}, - {NULL, 0}, -}; -static const u8 sFlag114Gfx6[] = INCBIN_U8("graphics/ornament/Flag114/sprite_6.4bpp"); -static const ax_sprite sFlag114Sprites6[] = { - {sFlag114Gfx6, ARRAY_COUNT(sFlag114Gfx6)}, - {NULL, 128}, - {NULL, 0}, -}; - -static const ax_pose *const sAxPosesFlag114[] = { - sFlag114Pose1, - sFlag114Pose2, - sFlag114Pose3, - sFlag114Pose4, - sFlag114Pose5, - sFlag114Pose6, -}; - -static const ax_anim *const sFlag114AnimTable1[] = { - sFlag114Anims_1_1, - sFlag114Anims_1_1, - sFlag114Anims_1_1, - sFlag114Anims_1_1, - sFlag114Anims_1_1, - sFlag114Anims_1_1, - sFlag114Anims_1_1, - sFlag114Anims_1_1, -}; - -static const ax_anim *const *const sAxAnimationsFlag114[] = { - sFlag114AnimTable1, -}; - -static const ax_sprite *const sAxSpritesFlag114[] = { - sFlag114Sprites1, - sFlag114Sprites2, - sFlag114Sprites3, - sFlag114Sprites4, - sFlag114Sprites5, - sFlag114Sprites6, -}; - -static const axmain sAxMainFlag114 = { - .poses = sAxPosesFlag114, - .animations = sAxAnimationsFlag114, - .animCount = ARRAY_COUNT(sAxAnimationsFlag114), - .spriteData = sAxSpritesFlag114, - .positions = NULL, -}; const RGB gFlag11Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag11.pmdpal") }; static const axmain sAxMainFlag11; diff --git a/src/data/ornament/flag114.h b/src/data/ornament/flag114.h index 6dcd897ce..bdace10dd 100644 --- a/src/data/ornament/flag114.h +++ b/src/data/ornament/flag114.h @@ -1,2 +1,115 @@ const RGB gFlag114Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag114.pmdpal") }; +static const axmain sAxMainFlag114; +const SiroArchive gAxFlag114 = {"SIRO", &sAxMainFlag114}; + +static const ax_pose sFlag114Pose1[] = { + AX_POSE(0, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), + AX_POSE_TERMINATOR +}; +static const ax_pose sFlag114Pose2[] = { + AX_POSE(1, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), + AX_POSE_TERMINATOR +}; +static const ax_pose sFlag114Pose3[] = { + AX_POSE(2, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), + AX_POSE_TERMINATOR +}; +static const ax_pose sFlag114Pose4[] = { + AX_POSE(3, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), + AX_POSE_TERMINATOR +}; +static const ax_pose sFlag114Pose5[] = { + AX_POSE(4, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), + AX_POSE_TERMINATOR +}; +static const ax_pose sFlag114Pose6[] = { + AX_POSE(5, OAM1(240, ST_OAM_SQUARE , 1), OAM2(240, ST_OAM_SIZE_2, FLIP(0, 0), 0, 0), OAM3(0, 3, 13)), + AX_POSE_TERMINATOR +}; +static const ax_anim sFlag114Anims_1_1[] = { + { .frames = 4, .unkFlags = 0, .poseId = 0, .offset = {0, 0}, .shadow = {0, 0} }, + { .frames = 4, .unkFlags = 0, .poseId = 1, .offset = {0, 0}, .shadow = {0, 0} }, + { .frames = 4, .unkFlags = 0, .poseId = 2, .offset = {0, 0}, .shadow = {0, 0} }, + { .frames = 4, .unkFlags = 0, .poseId = 3, .offset = {0, 0}, .shadow = {0, 0} }, + { .frames = 4, .unkFlags = 0, .poseId = 4, .offset = {0, 0}, .shadow = {0, 0} }, + { .frames = 4, .unkFlags = 0, .poseId = 5, .offset = {0, 0}, .shadow = {0, 0} }, + AX_ANIM_TERMINATOR +}; +static const u8 sFlag114Gfx1[] = INCBIN_U8("graphics/ornament/Flag114/sprite_1.4bpp"); +static const ax_sprite sFlag114Sprites1[] = { + {sFlag114Gfx1, ARRAY_COUNT(sFlag114Gfx1)}, + {NULL, 128}, + {NULL, 0}, +}; +static const u8 sFlag114Gfx2[] = INCBIN_U8("graphics/ornament/Flag114/sprite_2.4bpp"); +static const ax_sprite sFlag114Sprites2[] = { + {sFlag114Gfx2, ARRAY_COUNT(sFlag114Gfx2)}, + {NULL, 128}, + {NULL, 0}, +}; +static const u8 sFlag114Gfx3[] = INCBIN_U8("graphics/ornament/Flag114/sprite_3.4bpp"); +static const ax_sprite sFlag114Sprites3[] = { + {sFlag114Gfx3, ARRAY_COUNT(sFlag114Gfx3)}, + {NULL, 128}, + {NULL, 0}, +}; +static const u8 sFlag114Gfx4[] = INCBIN_U8("graphics/ornament/Flag114/sprite_4.4bpp"); +static const ax_sprite sFlag114Sprites4[] = { + {sFlag114Gfx4, ARRAY_COUNT(sFlag114Gfx4)}, + {NULL, 128}, + {NULL, 0}, +}; +static const u8 sFlag114Gfx5[] = INCBIN_U8("graphics/ornament/Flag114/sprite_5.4bpp"); +static const ax_sprite sFlag114Sprites5[] = { + {sFlag114Gfx5, ARRAY_COUNT(sFlag114Gfx5)}, + {NULL, 128}, + {NULL, 0}, +}; +static const u8 sFlag114Gfx6[] = INCBIN_U8("graphics/ornament/Flag114/sprite_6.4bpp"); +static const ax_sprite sFlag114Sprites6[] = { + {sFlag114Gfx6, ARRAY_COUNT(sFlag114Gfx6)}, + {NULL, 128}, + {NULL, 0}, +}; + +static const ax_pose *const sAxPosesFlag114[] = { + sFlag114Pose1, + sFlag114Pose2, + sFlag114Pose3, + sFlag114Pose4, + sFlag114Pose5, + sFlag114Pose6, +}; + +static const ax_anim *const sFlag114AnimTable1[] = { + sFlag114Anims_1_1, + sFlag114Anims_1_1, + sFlag114Anims_1_1, + sFlag114Anims_1_1, + sFlag114Anims_1_1, + sFlag114Anims_1_1, + sFlag114Anims_1_1, + sFlag114Anims_1_1, +}; + +static const ax_anim *const *const sAxAnimationsFlag114[] = { + sFlag114AnimTable1, +}; + +static const ax_sprite *const sAxSpritesFlag114[] = { + sFlag114Sprites1, + sFlag114Sprites2, + sFlag114Sprites3, + sFlag114Sprites4, + sFlag114Sprites5, + sFlag114Sprites6, +}; + +static const axmain sAxMainFlag114 = { + .poses = sAxPosesFlag114, + .animations = sAxAnimationsFlag114, + .animCount = ARRAY_COUNT(sAxAnimationsFlag114), + .spriteData = sAxSpritesFlag114, + .positions = NULL, +};