Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix "PlantCloak" references #5821

Merged
merged 4 commits into from
Dec 20, 2024
Merged

Fix "PlantCloak" references #5821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
586d4bc
Fix Wormadam Plant again
AsparagusEduardo Dec 17, 2024
bc9fd3c
Fixed teachable learnset reference
AsparagusEduardo Dec 20, 2024
396fc18
Renamed Level up learnset for consistency
AsparagusEduardo Dec 20, 2024
d9f91b5
Renamed all "PlantCloak" to "Plant"
AsparagusEduardo Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/data/graphics/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14459,11 +14459,11 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
#endif //P_FAMILY_SHIELDON

#if P_FAMILY_BURMY
const u32 gMonFrontPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4bpp.lz");
const u32 gMonPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/normal.gbapal.lz");
const u32 gMonBackPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/back.4bpp.lz");
const u32 gMonShinyPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz");
const u8 gMonIcon_BurmyPlantCloak[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp");
const u32 gMonFrontPic_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4bpp.lz");
const u32 gMonPalette_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/normal.gbapal.lz");
const u32 gMonBackPic_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/back.4bpp.lz");
const u32 gMonShinyPalette_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz");
const u8 gMonIcon_BurmyPlant[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp");
#if P_FOOTPRINTS
const u8 gMonFootprint_Burmy[] = INCBIN_U8("graphics/pokemon/burmy/footprint.1bpp");
#endif //P_FOOTPRINTS
Expand All @@ -14481,24 +14481,24 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u8 gMonIcon_BurmyTrash[] = INCBIN_U8("graphics/pokemon/burmy/trash/icon.4bpp");

#if OW_POKEMON_OBJECT_EVENTS
const u32 gObjectEventPic_BurmyPlantCloak[] = INCBIN_COMP("graphics/pokemon/burmy/overworld.4bpp");
const u32 gObjectEventPic_BurmyPlant[] = INCBIN_COMP("graphics/pokemon/burmy/overworld.4bpp");
const u32 gObjectEventPic_BurmySandy[] = INCBIN_COMP("graphics/pokemon/burmy/sandy/overworld.4bpp");
const u32 gObjectEventPic_BurmyTrash[] = INCBIN_COMP("graphics/pokemon/burmy/trash/overworld.4bpp");
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
const u32 gOverworldPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/overworld_normal.gbapal.lz");
const u32 gOverworldPalette_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/overworld_normal.gbapal.lz");
const u32 gOverworldPalette_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/overworld_normal.gbapal.lz");
const u32 gOverworldPalette_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/overworld_normal.gbapal.lz");
const u32 gShinyOverworldPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/overworld_shiny.gbapal.lz");
const u32 gShinyOverworldPalette_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/overworld_shiny.gbapal.lz");
const u32 gShinyOverworldPalette_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/overworld_shiny.gbapal.lz");
const u32 gShinyOverworldPalette_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/overworld_shiny.gbapal.lz");
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
#endif //OW_POKEMON_OBJECT_EVENTS

const u32 gMonFrontPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz");
const u32 gMonPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/normal.gbapal.lz");
const u32 gMonBackPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/back.4bpp.lz");
const u32 gMonShinyPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz");
const u8 gMonIcon_WormadamPlantCloak[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp");
const u32 gMonFrontPic_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz");
const u32 gMonPalette_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/normal.gbapal.lz");
const u32 gMonBackPic_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/back.4bpp.lz");
const u32 gMonShinyPalette_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz");
const u8 gMonIcon_WormadamPlant[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp");
#if P_FOOTPRINTS
const u8 gMonFootprint_Wormadam[] = INCBIN_U8("graphics/pokemon/wormadam/footprint.1bpp");
#endif //P_FOOTPRINTS
Expand All @@ -14516,14 +14516,14 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u8 gMonIcon_WormadamTrash[] = INCBIN_U8("graphics/pokemon/wormadam/trash/icon.4bpp");

#if OW_POKEMON_OBJECT_EVENTS
const u32 gObjectEventPic_WormadamPlantCloak[] = INCBIN_COMP("graphics/pokemon/wormadam/overworld.4bpp");
const u32 gObjectEventPic_WormadamPlant[] = INCBIN_COMP("graphics/pokemon/wormadam/overworld.4bpp");
const u32 gObjectEventPic_WormadamSandy[] = INCBIN_COMP("graphics/pokemon/wormadam/sandy/overworld.4bpp");
const u32 gObjectEventPic_WormadamTrash[] = INCBIN_COMP("graphics/pokemon/wormadam/trash/overworld.4bpp");
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
const u32 gOverworldPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/overworld_normal.gbapal.lz");
const u32 gOverworldPalette_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/overworld_normal.gbapal.lz");
const u32 gOverworldPalette_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/overworld_normal.gbapal.lz");
const u32 gOverworldPalette_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/overworld_normal.gbapal.lz");
const u32 gShinyOverworldPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/overworld_shiny.gbapal.lz");
const u32 gShinyOverworldPalette_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/overworld_shiny.gbapal.lz");
const u32 gShinyOverworldPalette_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/overworld_shiny.gbapal.lz");
const u32 gShinyOverworldPalette_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/overworld_shiny.gbapal.lz");
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
Expand Down
8 changes: 4 additions & 4 deletions src/data/object_events/object_event_pic_tables_followers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3136,17 +3136,17 @@ static const struct SpriteFrameImage sPicTable_Bastiodon[] = {
#endif //P_FAMILY_SHIELDON

#if P_FAMILY_BURMY
static const struct SpriteFrameImage sPicTable_BurmyPlantCloak[] = {
overworld_ascending_frames(gObjectEventPic_BurmyPlantCloak, 4, 4),
static const struct SpriteFrameImage sPicTable_BurmyPlant[] = {
overworld_ascending_frames(gObjectEventPic_BurmyPlant, 4, 4),
};
static const struct SpriteFrameImage sPicTable_BurmySandy[] = {
overworld_ascending_frames(gObjectEventPic_BurmySandy, 4, 4),
};
static const struct SpriteFrameImage sPicTable_BurmyTrash[] = {
overworld_ascending_frames(gObjectEventPic_BurmyTrash, 4, 4),
};
static const struct SpriteFrameImage sPicTable_WormadamPlantCloak[] = {
overworld_ascending_frames(gObjectEventPic_WormadamPlantCloak, 4, 4),
static const struct SpriteFrameImage sPicTable_WormadamPlant[] = {
overworld_ascending_frames(gObjectEventPic_WormadamPlant, 4, 4),
};
static const struct SpriteFrameImage sPicTable_WormadamSandy[] = {
overworld_ascending_frames(gObjectEventPic_WormadamSandy, 4, 4),
Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/level_up_learnsets/gen_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7717,7 +7717,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = {
LEVEL_UP_END
};

static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = {
static const struct LevelUpMove sWormadamPlantLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE(10, MOVE_PROTECT),
LEVEL_UP_MOVE(15, MOVE_BUG_BITE),
Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/level_up_learnsets/gen_2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7961,7 +7961,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = {
LEVEL_UP_END
};

static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = {
static const struct LevelUpMove sWormadamPlantLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE(10, MOVE_PROTECT),
LEVEL_UP_MOVE(15, MOVE_BUG_BITE),
Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/level_up_learnsets/gen_3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8187,7 +8187,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = {
LEVEL_UP_END
};

static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = {
static const struct LevelUpMove sWormadamPlantLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE(10, MOVE_PROTECT),
LEVEL_UP_MOVE(15, MOVE_BUG_BITE),
Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/level_up_learnsets/gen_4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9461,7 +9461,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = {
LEVEL_UP_END
};

static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = {
static const struct LevelUpMove sWormadamPlantLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE(10, MOVE_PROTECT),
LEVEL_UP_MOVE(15, MOVE_BUG_BITE),
Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/level_up_learnsets/gen_5.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9920,7 +9920,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = {
LEVEL_UP_END
};

static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = {
static const struct LevelUpMove sWormadamPlantLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE(10, MOVE_PROTECT),
LEVEL_UP_MOVE(15, MOVE_BUG_BITE),
Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/level_up_learnsets/gen_6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10382,7 +10382,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = {
LEVEL_UP_END
};

static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = {
static const struct LevelUpMove sWormadamPlantLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE(10, MOVE_PROTECT),
LEVEL_UP_MOVE(15, MOVE_BUG_BITE),
Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/level_up_learnsets/gen_7.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10610,7 +10610,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = {
LEVEL_UP_END
};

static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = {
static const struct LevelUpMove sWormadamPlantLevelUpLearnset[] = {
LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE),
LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE),
LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH),
Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/level_up_learnsets/gen_8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10633,7 +10633,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = {
LEVEL_UP_END
};

static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = {
static const struct LevelUpMove sWormadamPlantLevelUpLearnset[] = {
LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE),
LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE),
LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH),
Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/level_up_learnsets/gen_9.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10291,7 +10291,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = {
LEVEL_UP_END
};

static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = {
static const struct LevelUpMove sWormadamPlantLevelUpLearnset[] = {
LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE),
LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE),
LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH),
Expand Down
36 changes: 18 additions & 18 deletions src/data/pokemon/species_info/gen_4_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,29 +1656,29 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.pokemonOffset = 24,
.trainerScale = 256,
.trainerOffset = 0,
.frontPic = gMonFrontPic_BurmyPlantCloak,
.frontPic = gMonFrontPic_BurmyPlant,
.frontPicSize = MON_COORDS_SIZE(32, 56),
.frontPicYOffset = 13,
.frontAnimFrames = sAnims_Burmy,
.frontAnimId = ANIM_V_STRETCH,
.enemyMonElevation = 10,
.backPic = gMonBackPic_BurmyPlantCloak,
.backPic = gMonBackPic_BurmyPlant,
.backPicSize = MON_COORDS_SIZE(40, 56),
.backPicYOffset = 6,
.backAnimId = BACK_ANIM_H_SHAKE,
.palette = gMonPalette_BurmyPlantCloak,
.shinyPalette = gMonShinyPalette_BurmyPlantCloak,
.iconSprite = gMonIcon_BurmyPlantCloak,
.palette = gMonPalette_BurmyPlant,
.shinyPalette = gMonShinyPalette_BurmyPlant,
.iconSprite = gMonIcon_BurmyPlant,
.iconPalIndex = 1,
SHADOW(-1, 8, SHADOW_SIZE_S)
FOOTPRINT(Burmy)
OVERWORLD(
sPicTable_BurmyPlantCloak,
sPicTable_BurmyPlant,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
gOverworldPalette_BurmyPlantCloak,
gShinyOverworldPalette_BurmyPlantCloak
gOverworldPalette_BurmyPlant,
gShinyOverworldPalette_BurmyPlant
)
.tmIlliterate = TRUE,
.levelUpLearnset = sBurmyLevelUpLearnset,
Expand Down Expand Up @@ -1858,32 +1858,32 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.pokemonOffset = 13,
.trainerScale = 256,
.trainerOffset = 0,
.frontPic = gMonFrontPic_WormadamPlantCloak,
.frontPic = gMonFrontPic_WormadamPlant,
.frontPicSize = MON_COORDS_SIZE(48, 56),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Wormadam,
.frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT,
.enemyMonElevation = 8,
.backPic = gMonBackPic_WormadamPlantCloak,
.backPic = gMonBackPic_WormadamPlant,
.backPicSize = MON_COORDS_SIZE(56, 64),
.backPicYOffset = 2,
.backAnimId = BACK_ANIM_V_SHAKE,
.palette = gMonPalette_WormadamPlantCloak,
.shinyPalette = gMonShinyPalette_WormadamPlantCloak,
.iconSprite = gMonIcon_WormadamPlantCloak,
.palette = gMonPalette_WormadamPlant,
.shinyPalette = gMonShinyPalette_WormadamPlant,
.iconSprite = gMonIcon_WormadamPlant,
.iconPalIndex = 1,
SHADOW(0, 9, SHADOW_SIZE_S)
FOOTPRINT(Wormadam)
OVERWORLD(
sPicTable_WormadamPlantCloak,
sPicTable_WormadamPlant,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
gOverworldPalette_WormadamPlantCloak,
gShinyOverworldPalette_WormadamPlantCloak
gOverworldPalette_WormadamPlant,
gShinyOverworldPalette_WormadamPlant
)
.levelUpLearnset = sWormadamPlantCloakLevelUpLearnset,
.teachableLearnset = sWormadamPlantCloakTeachableLearnset,
.levelUpLearnset = sWormadamPlantLevelUpLearnset,
.teachableLearnset = sWormadamPlantTeachableLearnset,
.formSpeciesIdTable = sWormadamFormSpeciesIdTable,
},

Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/teachable_learnsets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18903,7 +18903,7 @@ static const u16 sBurmyTeachableLearnset[] = {
MOVE_UNAVAILABLE,
};

static const u16 sWormadamPlantCloakTeachableLearnset[] = {
static const u16 sWormadamPlantTeachableLearnset[] = {
MOVE_ATTRACT,
MOVE_BULLET_SEED,
MOVE_DIG,
Expand Down
Loading