dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs_seeker.c
+10 -8
View File
@@ -575,7 +575,7 @@ static const u8 sMovementScript_TrainerNoRematch[] = {
};
static const u8 sMovementScript_TrainerRematch[] = {
MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN,
MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK,
MOVEMENT_ACTION_STEP_END
};
@@ -640,9 +640,9 @@ void VsSeekerResetObjectMovementAfterChargeComplete(void)
{
if ((templates[i].objUnion.normal.trainerType == TRAINER_TYPE_NORMAL
|| templates[i].objUnion.normal.trainerType == TRAINER_TYPE_BURIED)
&& (templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_VS_SEEKER_4D
|| templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_VS_SEEKER_4E
|| templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_VS_SEEKER_4F))
&& (templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_RAISE_HAND_AND_STOP
|| templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_RAISE_HAND_AND_JUMP
|| templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_RAISE_HAND_AND_SWIM))
{
movementType = GetRandomFaceDirectionMovementType();
TryGetObjectEventIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objEventId);
@@ -700,7 +700,9 @@ static void ResetMovementOfRematchableTrainers(void)
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
struct ObjectEvent * objectEvent = &gObjectEvents[i];
if (objectEvent->movementType == MOVEMENT_TYPE_VS_SEEKER_4D || objectEvent->movementType == MOVEMENT_TYPE_VS_SEEKER_4E || objectEvent->movementType == MOVEMENT_TYPE_VS_SEEKER_4F)
if (objectEvent->movementType == MOVEMENT_TYPE_RAISE_HAND_AND_STOP
|| objectEvent->movementType == MOVEMENT_TYPE_RAISE_HAND_AND_JUMP
|| objectEvent->movementType == MOVEMENT_TYPE_RAISE_HAND_AND_SWIM)
{
u8 movementType = GetRandomFaceDirectionMovementType();
if (objectEvent->active && gSprites[objectEvent->spriteId].data[0] == i)
@@ -1144,13 +1146,13 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId)
case OBJ_EVENT_GFX_BLACKBELT:
case OBJ_EVENT_GFX_HIKER:
case OBJ_EVENT_GFX_SAILOR:
return MOVEMENT_TYPE_VS_SEEKER_4E;
return MOVEMENT_TYPE_RAISE_HAND_AND_JUMP;
case OBJ_EVENT_GFX_TUBER_M_WATER:
case OBJ_EVENT_GFX_SWIMMER_M_WATER:
case OBJ_EVENT_GFX_SWIMMER_F_WATER:
return MOVEMENT_TYPE_VS_SEEKER_4F;
return MOVEMENT_TYPE_RAISE_HAND_AND_SWIM;
default:
return MOVEMENT_TYPE_VS_SEEKER_4D;
return MOVEMENT_TYPE_RAISE_HAND_AND_STOP;
}
}