summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-09 00:15:41 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-09 12:57:13 -0500
commitc39d295386654b34982d384a332b8cb7b2e55e24 (patch)
tree523bc7c9fee26d0b42258a2f1bf344ba2946af08 /src
parent16dc234d9964e41443b965dc774a0ff60d3338fa (diff)
Label used movement steps
Diffstat (limited to 'src')
-rw-r--r--src/vs_seeker.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index 46a0649d7..8478e2114 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -547,25 +547,25 @@ static const VsSeekerData sVsSeekerData[] = {
};
static const u8 gUnknown_8453F5C[] = {
- step_1c,
- step_1c,
- step_1c,
+ delay_16,
+ delay_16,
+ delay_16,
step_end
};
static const u8 gUnknown_8453F60[] = {
- step_62,
+ emote_exclamation_mark,
step_end
};
static const u8 sMovementScript_TrainerNoRematch[] = {
- step_64,
+ emote_x,
step_end
};
-static const u8 gUnknown_8453F64[] = {
- step_2d,
- step_65,
+static const u8 sMovementScript_TrainerRematch[] = {
+ walk_in_place_fastest_down,
+ emote_double_exclamation_mark,
step_end
};
@@ -963,7 +963,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
{
gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[vsSeekerIdx].localId] = r7;
npc_coords_shift_still(&gObjectEvents[sVsSeeker->trainerInfo[vsSeekerIdx].objectEventId]);
- StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], gUnknown_8453F64);
+ StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerRematch);
sVsSeeker->trainerIdxArray[sVsSeeker->numRematchableTrainers] = r8;
sVsSeeker->runningBehaviourEtcArray[sVsSeeker->numRematchableTrainers] = GetRunningBehaviorFromGraphicsId(sVsSeeker->trainerInfo[vsSeekerIdx].graphicsId);
sVsSeeker->numRematchableTrainers++;
@@ -1127,7 +1127,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
"\tbl npc_coords_shift_still\n"
"\tldr r0, [r6]\n"
"\tadds r0, r5\n"
- "\tldr r1, _0810CB60 @ =gUnknown_8453F64\n"
+ "\tldr r1, _0810CB60 @ =sMovementScript_TrainerRematch\n"
"\tbl StartTrainerObjectMovementScript\n"
"\tldr r2, [r6]\n"
"\tmov r3, r10\n"
@@ -1197,7 +1197,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
"_0810CB54: .4byte gSaveBlock1Ptr\n"
"_0810CB58: .4byte 0x0000063a\n"
"_0810CB5C: .4byte gObjectEvents\n"
- "_0810CB60: .4byte gUnknown_8453F64\n"
+ "_0810CB60: .4byte sMovementScript_TrainerRematch\n"
"_0810CB64: .4byte 0x00000431\n"
"_0810CB68: .4byte sVsSeeker\n"
"_0810CB6C: .4byte 0x00000801\n"