From de760e697f7f62c9ba17c5d005c1d10309f5d529 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 31 May 2024 08:28:57 -0400 Subject: [PATCH] More review --- src/battle_util.c | 10 +++++----- src/event_object_movement.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 5b93c63717..729b1aee23 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -10349,13 +10349,13 @@ uq4_12_t GetTypeEffectiveness(struct Pokemon *mon, u8 moveType) || (moveType == TYPE_FIRE && abilityDef == ABILITY_FLASH_FIRE) || (moveType == TYPE_GRASS && abilityDef == ABILITY_SAP_SIPPER) || (moveType == TYPE_GROUND && (abilityDef == ABILITY_LEVITATE - || abilityDef == ABILITY_EARTH_EATER)) + || abilityDef == ABILITY_EARTH_EATER)) || (moveType == TYPE_WATER && (abilityDef == ABILITY_WATER_ABSORB - || abilityDef == ABILITY_DRY_SKIN - || abilityDef == ABILITY_STORM_DRAIN)) + || abilityDef == ABILITY_DRY_SKIN + || abilityDef == ABILITY_STORM_DRAIN)) || (moveType == TYPE_ELECTRIC && (abilityDef == ABILITY_LIGHTNING_ROD // TODO: Add Gen 3/4 config check - || abilityDef == ABILITY_VOLT_ABSORB - || abilityDef == ABILITY_MOTOR_DRIVE))) + || abilityDef == ABILITY_VOLT_ABSORB + || abilityDef == ABILITY_MOTOR_DRIVE))) { modifier = UQ_4_12(0.0); } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 874e8f661b..f57c6ec19b 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -537,7 +537,7 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = { #ifdef ITEM_STRANGE_BALL {gObjectEventPal_StrangeBall, OBJ_EVENT_PAL_TAG_BALL_STRANGE}, #endif //ITEM_STRANGE_BALL -#endif //W_MON_POKEBALLS +#endif //OW_MON_POKEBALLS {gObjectEventPal_Substitute, OBJ_EVENT_PAL_TAG_SUBSTITUTE}, {gObjectEventPaletteEmotes, OBJ_EVENT_PAL_TAG_EMOTES}, #ifdef BUGFIX @@ -2063,9 +2063,9 @@ void UpdateFollowingPokemon(void) // 2. Map is indoors and gfx is larger than 32x32 // 3. flag is set if (OW_FOLLOWERS_ENABLED == FALSE - || !GetFollowerInfo(&species, &form, &shiny) - || (gMapHeader.mapType == MAP_TYPE_INDOOR && SpeciesToGraphicsInfo(species, 0)->oam->size > ST_OAM_SIZE_2) - || FlagGet(FLAG_TEMP_HIDE_FOLLOWER)) + || !GetFollowerInfo(&species, &form, &shiny) + || (gMapHeader.mapType == MAP_TYPE_INDOOR && SpeciesToGraphicsInfo(species, 0)->oam->size > ST_OAM_SIZE_2) + || FlagGet(FLAG_TEMP_HIDE_FOLLOWER)) { RemoveFollowingPokemon(); return; @@ -6712,10 +6712,10 @@ static void InitJumpRegular(struct ObjectEvent *objectEvent, struct Sprite *spri { // For follower only, match the anim duration of the player's movement, whether dashing, walking or jumping if (objectEvent->localId == OBJ_EVENT_ID_FOLLOWER - && type == JUMP_TYPE_HIGH - && distance == JUMP_DISTANCE_FAR - // In some areas (i.e Meteor Falls), the player can jump as the follower jumps, so preserve type in this case - && PlayerGetCopyableMovement() != COPY_MOVE_JUMP2) + && type == JUMP_TYPE_HIGH + && distance == JUMP_DISTANCE_FAR + // In some areas (i.e Meteor Falls), the player can jump as the follower jumps, so preserve type in this case + && PlayerGetCopyableMovement() != COPY_MOVE_JUMP2) type = TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH) ? JUMP_TYPE_FASTER : JUMP_TYPE_FAST; InitJump(objectEvent, sprite, direction, distance, type); SetStepAnimHandleAlternation(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection));