diff options
| author | garak <garakmon@gmail.com> | 2019-12-12 16:10:45 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-12-17 15:05:23 -0500 |
| commit | 7a0edab5732b816536a35b0556d8fa1db13afa30 (patch) | |
| tree | 72ff670401204029da8370356cc4d6348d3f13b9 /src/vs_seeker.c | |
| parent | fc13e1ef6f0daa127b1ab0425d7cfcbed6aeafac (diff) | |
fix rebase conflicts
Diffstat (limited to 'src/vs_seeker.c')
| -rw-r--r-- | src/vs_seeker.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vs_seeker.c b/src/vs_seeker.c index ca74edcba..209b1623e 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -613,7 +613,7 @@ static void sub_810C3B8(u8 taskId) void sub_810C444(void) { - struct ObjectEventTemplate * templates = gSaveBlock1Ptr->mapObjectTemplates; + struct ObjectEventTemplate * templates = gSaveBlock1Ptr->objectEventTemplates; u8 i; u8 r6; u8 sp0; @@ -857,7 +857,7 @@ static void Task_VsSeeker_2(u8 taskId) static void GatherNearbyTrainerInfo(void) { - struct ObjectEventTemplate *templates = gSaveBlock1Ptr->mapObjectTemplates; + struct ObjectEventTemplate *templates = gSaveBlock1Ptr->objectEventTemplates; u8 fieldObjectId = 0; u8 vsSeekerObjectIdx = 0; s32 mapObjectIdx; @@ -1223,7 +1223,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) void sub_810CB90(void) { u8 sp0 = 0; - struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->mapObjectTemplates; + struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->objectEventTemplates; s32 r9 = sub_810CE10(sVsSeekerData, gTrainerBattleOpponent_A); if (r9 != -1) |