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

Merge branch 'rh-hideout:master' into master

Browse Source
This commit is contained in:
RoamerX 2025-04-23 21:52:37 +08:00 committed by GitHub
commit d49d284cb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/battle_script_commands.c
View File

@ -4594,7 +4594,6 @@ void SetMoveEffect(bool32 primary, bool32 certain)
static bool32 CanApplyAdditionalEffect(const struct AdditionalEffect *additionalEffect) static bool32 CanApplyAdditionalEffect(const struct AdditionalEffect *additionalEffect)
{ {
// Self-targeting move effects only apply after the last mon has been hit
if (additionalEffect->self if (additionalEffect->self
&& NumAffectedSpreadMoveTargets() > 1 && NumAffectedSpreadMoveTargets() > 1
&& GetNextTarget(GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove), TRUE) != MAX_BATTLERS_COUNT) && GetNextTarget(GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove), TRUE) != MAX_BATTLERS_COUNT)

3
src/event_object_movement.c
View File

@ -1840,13 +1840,10 @@ u8 CreateObjectGraphicsSprite(u16 graphicsId, void (*callback)(struct Sprite *),
const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId);
struct Sprite *sprite; struct Sprite *sprite;
u8 spriteId; u8 spriteId;
bool32 isShiny = graphicsId & OBJ_EVENT_MON_SHINY;
spriteTemplate = Alloc(sizeof(struct SpriteTemplate)); spriteTemplate = Alloc(sizeof(struct SpriteTemplate));
CopyObjectGraphicsInfoToSpriteTemplate(graphicsId, callback, spriteTemplate, &subspriteTables); CopyObjectGraphicsInfoToSpriteTemplate(graphicsId, callback, spriteTemplate, &subspriteTables);
if (isShiny)
graphicsId -= SPECIES_SHINY_TAG;
if (OW_GFX_COMPRESS) if (OW_GFX_COMPRESS)
{ {