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

fix rebase conflicts

Browse Source
This commit is contained in:
garak
2019-12-12 16:10:45 -05:00
parent fc13e1ef6f
commit 7a0edab573
6 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs_seeker.c
+3 -3
View File
@@ -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)