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

Label used movement steps

Browse Source
This commit is contained in:
GriffinR
2020-01-09 00:15:41 -05:00
parent 16dc234d99
commit c39d295386
83 changed files with 3281 additions and 3272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs_seeker.c
+11 -11
View File
@@ -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"