Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More review comments

Browse Source
This commit is contained in:
Eduardo Quezada 2024-05-28 18:32:20 -04:00
parent 5812ca79c6
commit ff480dec27
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/event_objects.h
View File

@ -408,7 +408,7 @@
#define OBJ_EVENT_PAL_TAG_BALL_BEAST 0x1169
// Gen VIII
#define OBJ_EVENT_PAL_TAG_BALL_STRANGE 0x116A
#endif
#endif //OW_MON_POKEBALLS
// Used as a placeholder follower graphic
#define OBJ_EVENT_PAL_TAG_SUBSTITUTE 0x7611
#define OBJ_EVENT_PAL_TAG_EMOTES 0x8002

4
src/data/pokemon/species_info.h
View File

@ -24,7 +24,7 @@
.followerShinyPalette = DEFAULT_2(NULL, __VA_ARGS__),
#else
#define FOLLOWER_PAL(...)
#endif
#endif //OW_FOLLOWERS_SHARE_PALETTE == FALSE
#define FOLLOWER(picTable, _size, shadow, _tracks, ...) \
.followerData = { \
@ -48,7 +48,7 @@
FOLLOWER_PAL(__VA_ARGS__)
#else
#define FOLLOWER(picTable, _size, shadow, _tracks, ...)
#endif
#endif //OW_FOLLOWERS_ENABLED
// Maximum value for a female Pokémon is 254 (MON_FEMALE) which is 100% female.
// 255 (MON_GENDERLESS) is reserved for genderless Pokémon.

13
src/event_object_movement.c
View File

@ -529,8 +529,8 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = {
// Gen VIII
#ifdef ITEM_STRANGE_BALL
{gObjectEventPal_StrangeBall, OBJ_EVENT_PAL_TAG_BALL_STRANGE},
#endif
#endif
#endif //ITEM_STRANGE_BALL
#endif //W_MON_POKEBALLS
{gObjectEventPal_Substitute, OBJ_EVENT_PAL_TAG_SUBSTITUTE},
{gObjectEventPaletteEmotes, OBJ_EVENT_PAL_TAG_EMOTES},
#ifdef BUGFIX
@ -1673,7 +1673,7 @@ u8 SpawnSpecialObjectEventParameterized(u16 graphicsId, u8 movementBehavior, u8
y -= MAP_OFFSET;
objectEventTemplate.localId = localId;
objectEventTemplate.graphicsId = graphicsId;
// objectEventTemplate.kind = OBJ_KIND_NORMAL;
objectEventTemplate.kind = OBJ_KIND_NORMAL;
objectEventTemplate.x = x;
objectEventTemplate.y = y;
objectEventTemplate.elevation = elevation;
@ -1837,7 +1837,7 @@ struct Pokemon *GetFirstLiveMon(void)
for (i = 0; i < PARTY_SIZE; i++)
{
if (gPlayerParty[i].hp > 0 && !(gPlayerParty[i].box.isEgg || gPlayerParty[i].box.isBadEgg))
return &gPlayerParty[i];
return &gPlayerParty[i];
}
return NULL;
}
@ -9621,11 +9621,6 @@ static void (*const sGroundEffectFuncs[])(struct ObjectEvent *objEvent, struct S
GroundEffect_Seaweed // GROUND_EFFECT_FLAG_SEAWEED
};
static void UNUSED GroundEffect_Shadow(struct ObjectEvent *objEvent, struct Sprite *sprite)
{
SetUpShadow(objEvent, sprite);
}
static void DoFlaggedGroundEffects(struct ObjectEvent *objEvent, struct Sprite *sprite, u32 flags)
{
u8 i;