summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rwxr-xr-xsrc/data/object_events/object_event_anims.h32
-rwxr-xr-xsrc/data/object_events/object_event_graphics.h2
-rwxr-xr-xsrc/data/object_events/object_event_subsprites.h96
3 files changed, 65 insertions, 65 deletions
diff --git a/src/data/object_events/object_event_anims.h b/src/data/object_events/object_event_anims.h
index a5fb41462..f96e52de5 100755
--- a/src/data/object_events/object_event_anims.h
+++ b/src/data/object_events/object_event_anims.h
@@ -413,56 +413,56 @@ static const union AnimCmd sAnim_GetOnOffSurfBlobEast[] =
ANIMCMD_JUMP(0),
};
-static const union AnimCmd sAnim_BunnyHoppyBackWheelSouth[] =
+static const union AnimCmd sAnim_BunnyHopBackWheelSouth[] =
{
ANIMCMD_FRAME(9, 4),
ANIMCMD_FRAME(10, 4),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_BunnyHoppyBackWheelNorth[] =
+static const union AnimCmd sAnim_BunnyHopBackWheelNorth[] =
{
ANIMCMD_FRAME(13, 4),
ANIMCMD_FRAME(14, 4),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_BunnyHoppyBackWheelWest[] =
+static const union AnimCmd sAnim_BunnyHopBackWheelWest[] =
{
ANIMCMD_FRAME(17, 4),
ANIMCMD_FRAME(18, 4),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_BunnyHoppyBackWheelEast[] =
+static const union AnimCmd sAnim_BunnyHopBackWheelEast[] =
{
ANIMCMD_FRAME(17, 4, .hFlip = TRUE),
ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_BunnyHoppyFrontWheelSouth[] =
+static const union AnimCmd sAnim_BunnyHopFrontWheelSouth[] =
{
ANIMCMD_FRAME(11, 4),
ANIMCMD_FRAME(12, 4),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_BunnyHoppyFrontWheelNorth[] =
+static const union AnimCmd sAnim_BunnyHopFrontWheelNorth[] =
{
ANIMCMD_FRAME(15, 4),
ANIMCMD_FRAME(16, 4),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_BunnyHoppyFrontWheelWest[] =
+static const union AnimCmd sAnim_BunnyHopFrontWheelWest[] =
{
ANIMCMD_FRAME(19, 4),
ANIMCMD_FRAME(20, 4),
ANIMCMD_END,
};
-static const union AnimCmd sAnim_BunnyHoppyFrontWheelEast[] =
+static const union AnimCmd sAnim_BunnyHopFrontWheelEast[] =
{
ANIMCMD_FRAME(19, 4, .hFlip = TRUE),
ANIMCMD_FRAME(20, 4, .hFlip = TRUE),
@@ -1024,14 +1024,14 @@ static const union AnimCmd *const sAnimTable_AcroBike[] = {
[ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
[ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
[ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
- [ANIM_BUNNY_HOPPY_BACK_WHEEL_SOUTH] = sAnim_BunnyHoppyBackWheelSouth,
- [ANIM_BUNNY_HOPPY_BACK_WHEEL_NORTH] = sAnim_BunnyHoppyBackWheelNorth,
- [ANIM_BUNNY_HOPPY_BACK_WHEEL_WEST] = sAnim_BunnyHoppyBackWheelWest,
- [ANIM_BUNNY_HOPPY_BACK_WHEEL_EAST] = sAnim_BunnyHoppyBackWheelEast,
- [ANIM_BUNNY_HOPPY_FRONT_WHEEL_SOUTH] = sAnim_BunnyHoppyFrontWheelSouth,
- [ANIM_BUNNY_HOPPY_FRONT_WHEEL_NORTH] = sAnim_BunnyHoppyFrontWheelNorth,
- [ANIM_BUNNY_HOPPY_FRONT_WHEEL_WEST] = sAnim_BunnyHoppyFrontWheelWest,
- [ANIM_BUNNY_HOPPY_FRONT_WHEEL_EAST] = sAnim_BunnyHoppyFrontWheelEast,
+ [ANIM_BUNNY_HOP_BACK_WHEEL_SOUTH] = sAnim_BunnyHopBackWheelSouth,
+ [ANIM_BUNNY_HOP_BACK_WHEEL_NORTH] = sAnim_BunnyHopBackWheelNorth,
+ [ANIM_BUNNY_HOP_BACK_WHEEL_WEST] = sAnim_BunnyHopBackWheelWest,
+ [ANIM_BUNNY_HOP_BACK_WHEEL_EAST] = sAnim_BunnyHopBackWheelEast,
+ [ANIM_BUNNY_HOP_FRONT_WHEEL_SOUTH] = sAnim_BunnyHopFrontWheelSouth,
+ [ANIM_BUNNY_HOP_FRONT_WHEEL_NORTH] = sAnim_BunnyHopFrontWheelNorth,
+ [ANIM_BUNNY_HOP_FRONT_WHEEL_WEST] = sAnim_BunnyHopFrontWheelWest,
+ [ANIM_BUNNY_HOP_FRONT_WHEEL_EAST] = sAnim_BunnyHopFrontWheelEast,
[ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH] = sAnim_StandingWheelieBackWheelSouth,
[ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH] = sAnim_StandingWheelieBackWheelNorth,
[ANIM_STANDING_WHEELIE_BACK_WHEEL_WEST] = sAnim_StandingWheelieBackWheelWest,
diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h
index 81d83a856..6ee56cc78 100755
--- a/src/data/object_events/object_event_graphics.h
+++ b/src/data/object_events/object_event_graphics.h
@@ -305,7 +305,7 @@ const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/pale
const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/field_effects/pics/ground_impact_dust.4bpp");
const u32 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U32("graphics/field_effects/pics/jump_tall_grass.4bpp");
const u32 gUnusedGrass3[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_3.4bpp");
-const u32 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp");
+const u32 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U32("graphics/field_effects/pics/jump_long_grass.4bpp");
const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/field_effects/pics/unknown_17.4bpp");
const u32 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_2.4bpp");
const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/field_effects/pics/long_grass.4bpp");
diff --git a/src/data/object_events/object_event_subsprites.h b/src/data/object_events/object_event_subsprites.h
index b508509ca..808491992 100755
--- a/src/data/object_events/object_event_subsprites.h
+++ b/src/data/object_events/object_event_subsprites.h
@@ -78,12 +78,12 @@ static const struct Subsprite sOamTable_16x16_4[] = {
};
static const struct SubspriteTable sOamTables_16x16[] = {
- {0, NULL},
- {1, sOamTable_16x16_0},
- {1, sOamTable_16x16_1},
- {2, sOamTable_16x16_2},
- {2, sOamTable_16x16_3},
- {2, sOamTable_16x16_4}
+ {},
+ {ARRAY_COUNT(sOamTable_16x16_0), sOamTable_16x16_0},
+ {ARRAY_COUNT(sOamTable_16x16_1), sOamTable_16x16_1},
+ {ARRAY_COUNT(sOamTable_16x16_2), sOamTable_16x16_2},
+ {ARRAY_COUNT(sOamTable_16x16_3), sOamTable_16x16_3},
+ {ARRAY_COUNT(sOamTable_16x16_4), sOamTable_16x16_4}
};
static const struct Subsprite sOamTable_16x32_0[] = {
@@ -174,12 +174,12 @@ static const struct Subsprite sOamTable_16x32_4[] = {
};
static const struct SubspriteTable sOamTables_16x32[] = {
- {0, NULL},
- {1, sOamTable_16x32_0},
- {1, sOamTable_16x32_1},
- {3, sOamTable_16x32_2},
- {2, sOamTable_16x32_3},
- {2, sOamTable_16x32_4}
+ {},
+ {ARRAY_COUNT(sOamTable_16x32_0), sOamTable_16x32_0},
+ {ARRAY_COUNT(sOamTable_16x32_1), sOamTable_16x32_1},
+ {ARRAY_COUNT(sOamTable_16x32_2), sOamTable_16x32_2},
+ {ARRAY_COUNT(sOamTable_16x32_3), sOamTable_16x32_3},
+ {ARRAY_COUNT(sOamTable_16x32_4), sOamTable_16x32_4}
};
static const struct Subsprite sOamTable_32x32_0[] = {
@@ -270,12 +270,12 @@ static const struct Subsprite sOamTable_32x32_4[] = {
};
static const struct SubspriteTable sOamTables_32x32[] = {
- {0, NULL},
- {1, sOamTable_32x32_0},
- {1, sOamTable_32x32_1},
- {3, sOamTable_32x32_2},
- {2, sOamTable_32x32_3},
- {2, sOamTable_32x32_4}
+ {},
+ {ARRAY_COUNT(sOamTable_32x32_0), sOamTable_32x32_0},
+ {ARRAY_COUNT(sOamTable_32x32_1), sOamTable_32x32_1},
+ {ARRAY_COUNT(sOamTable_32x32_2), sOamTable_32x32_2},
+ {ARRAY_COUNT(sOamTable_32x32_3), sOamTable_32x32_3},
+ {ARRAY_COUNT(sOamTable_32x32_4), sOamTable_32x32_4}
};
static const struct Subsprite sOamTable_48x48[] = {
@@ -378,12 +378,12 @@ static const struct Subsprite sOamTable_48x48[] = {
};
static const struct SubspriteTable sOamTables_48x48[] = {
- {12, sOamTable_48x48},
- {12, sOamTable_48x48},
- {12, sOamTable_48x48},
- {12, sOamTable_48x48},
- {12, sOamTable_48x48},
- {12, sOamTable_48x48}
+ {ARRAY_COUNT(sOamTable_48x48), sOamTable_48x48},
+ {ARRAY_COUNT(sOamTable_48x48), sOamTable_48x48},
+ {ARRAY_COUNT(sOamTable_48x48), sOamTable_48x48},
+ {ARRAY_COUNT(sOamTable_48x48), sOamTable_48x48},
+ {ARRAY_COUNT(sOamTable_48x48), sOamTable_48x48},
+ {ARRAY_COUNT(sOamTable_48x48), sOamTable_48x48}
};
static const struct Subsprite sOamTable_64x32_0[] = {
@@ -432,12 +432,12 @@ static const struct Subsprite sOamTable_64x32_3[] = {
// Unused
static const struct SubspriteTable sOamTables_64x32[] = {
- {0, NULL},
- {1, sOamTable_64x32_0},
- {1, sOamTable_64x32_1},
- {1, sOamTable_64x32_2},
- {1, sOamTable_64x32_3},
- {1, sOamTable_64x32_3}
+ {},
+ {ARRAY_COUNT(sOamTable_64x32_0), sOamTable_64x32_0},
+ {ARRAY_COUNT(sOamTable_64x32_1), sOamTable_64x32_1},
+ {ARRAY_COUNT(sOamTable_64x32_2), sOamTable_64x32_2},
+ {ARRAY_COUNT(sOamTable_64x32_3), sOamTable_64x32_3},
+ {ARRAY_COUNT(sOamTable_64x32_3), sOamTable_64x32_3}
};
static const struct Subsprite sOamTable_64x64_0[] = {
@@ -485,12 +485,12 @@ static const struct Subsprite sOamTable_64x64_3[] = {
};
static const struct SubspriteTable sOamTables_64x64[] = {
- {0, NULL},
- {1, sOamTable_64x64_0},
- {1, sOamTable_64x64_1},
- {1, sOamTable_64x64_2},
- {1, sOamTable_64x64_3},
- {1, sOamTable_64x64_3}
+ {},
+ {ARRAY_COUNT(sOamTable_64x64_0), sOamTable_64x64_0},
+ {ARRAY_COUNT(sOamTable_64x64_1), sOamTable_64x64_1},
+ {ARRAY_COUNT(sOamTable_64x64_2), sOamTable_64x64_2},
+ {ARRAY_COUNT(sOamTable_64x64_3), sOamTable_64x64_3},
+ {ARRAY_COUNT(sOamTable_64x64_3), sOamTable_64x64_3}
};
static const struct Subsprite sOamTable_96x40_0[] = {
@@ -987,12 +987,12 @@ static const struct Subsprite sOamTable_96x40_3[] = {
// Used by SS Tidal
static const struct SubspriteTable sOamTables_96x40[] = {
- {15, sOamTable_96x40_0},
- {15, sOamTable_96x40_0},
- {15, sOamTable_96x40_1},
- {15, sOamTable_96x40_2},
- {15, sOamTable_96x40_3},
- {15, sOamTable_96x40_3}
+ {ARRAY_COUNT(sOamTable_96x40_0), sOamTable_96x40_0},
+ {ARRAY_COUNT(sOamTable_96x40_0), sOamTable_96x40_0},
+ {ARRAY_COUNT(sOamTable_96x40_1), sOamTable_96x40_1},
+ {ARRAY_COUNT(sOamTable_96x40_2), sOamTable_96x40_2},
+ {ARRAY_COUNT(sOamTable_96x40_3), sOamTable_96x40_3},
+ {ARRAY_COUNT(sOamTable_96x40_3), sOamTable_96x40_3}
};
static const struct Subsprite sOamTable_88x32_0[] = {
@@ -1521,10 +1521,10 @@ static const struct Subsprite sOamTable_88x32_3[] = {
// Used by Submarine Shadow
static const struct SubspriteTable sOamTables_88x32[] = {
- {16, sOamTable_88x32_0},
- {16, sOamTable_88x32_0},
- {16, sOamTable_88x32_1},
- {16, sOamTable_88x32_2},
- {16, sOamTable_88x32_3},
- {16, sOamTable_88x32_3}
+ {ARRAY_COUNT(sOamTable_88x32_0), sOamTable_88x32_0},
+ {ARRAY_COUNT(sOamTable_88x32_0), sOamTable_88x32_0},
+ {ARRAY_COUNT(sOamTable_88x32_1), sOamTable_88x32_1},
+ {ARRAY_COUNT(sOamTable_88x32_2), sOamTable_88x32_2},
+ {ARRAY_COUNT(sOamTable_88x32_3), sOamTable_88x32_3},
+ {ARRAY_COUNT(sOamTable_88x32_3), sOamTable_88x32_3}
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-07 19:02:19 +0000