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

vs_seeker map object gfx ids

Browse Source
This commit is contained in:
PikalaxALT
2019-10-21 13:15:45 -04:00
parent d7d93b22d2
commit 62eec64e40
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs_seeker.c
+33 -32
View File
@@ -22,8 +22,9 @@
#include "map_obj_80688E4.h" #include "map_obj_80688E4.h"
#include "map_obj_8097404.h" #include "map_obj_8097404.h"
#include "unk_810c3a4.h" #include "unk_810c3a4.h"
#include "constants/movement_commands.h"
#include "vs_seeker.h" #include "vs_seeker.h"
#include "constants/movement_commands.h"
#include "constants/map_objects.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/maps.h" #include "constants/maps.h"
@@ -1304,7 +1305,7 @@ static bool8 sub_810CD80(const VsSeekerData *vsSeekerData, u16 trainerBattleOppo
if (rematchIdx == -1) if (rematchIdx == -1)
return FALSE; return FALSE;
if (rematchIdx >= 0 && rematchIdx < ARRAY_COUNT(sVsSeekerData)) if (rematchIdx >= 0 && rematchIdx < NELEMS(sVsSeekerData))
{ {
if (IsThisTrainerRematchable(gSpecialVar_LastTalked)) if (IsThisTrainerRematchable(gSpecialVar_LastTalked))
return TRUE; return TRUE;
@@ -1334,7 +1335,7 @@ static s32 sub_810CE10(const VsSeekerData * a0, u16 a1)
u32 r1; u32 r1;
s32 r3; s32 r3;
for (r1 = 0; r1 < ARRAY_COUNT(sVsSeekerData); r1++) for (r1 = 0; r1 < NELEMS(sVsSeekerData); r1++)
{ {
for (r3 = 0; r3 < 6; r3++) for (r3 = 0; r3 < 6; r3++)
{ {
@@ -1374,7 +1375,7 @@ static bool8 sub_810CED0(const VsSeekerData * a0, u16 a1)
if (r1 == -1) if (r1 == -1)
return FALSE; return FALSE;
if ((u32)r1 >= ARRAY_COUNT(sVsSeekerData)) if ((u32)r1 >= NELEMS(sVsSeekerData))
return FALSE; return FALSE;
if (!IsThisTrainerRematchable(gSpecialVar_LastTalked)) if (!IsThisTrainerRematchable(gSpecialVar_LastTalked))
return FALSE; return FALSE;
@@ -1413,32 +1414,32 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId)
{ {
switch (graphicsId) switch (graphicsId)
{ {
case 0x11: case MAP_OBJ_GFX_LITTLE_GIRL:
case 0x12: case MAP_OBJ_GFX_YOUNGSTER:
case 0x13: case MAP_OBJ_GFX_BOY:
case 0x14: case MAP_OBJ_GFX_BUG_CATCHER:
case 0x16: case MAP_OBJ_GFX_LASS:
case 0x17: case MAP_OBJ_GFX_WOMAN_1:
case 0x18: case MAP_OBJ_GFX_BATTLE_GIRL:
case 0x19: case MAP_OBJ_GFX_MAN:
case 0x1a: case MAP_OBJ_GFX_ROCKER:
case 0x1c: case MAP_OBJ_GFX_WOMAN_2:
case 0x1d: case MAP_OBJ_GFX_BEAUTY:
case 0x1e: case MAP_OBJ_GFX_BALDING_MAN:
case 0x25: case MAP_OBJ_GFX_TUBER_F:
case 0x27: case MAP_OBJ_GFX_CAMPER:
case 0x28: case MAP_OBJ_GFX_PICNICKER:
case 0x29: case MAP_OBJ_GFX_COOLTRAINER_M:
case 0x2a: case MAP_OBJ_GFX_COOLTRAINER_F:
case 0x2d: case MAP_OBJ_GFX_SWIMMER_M_LAND:
case 0x2e: case MAP_OBJ_GFX_SWIMMER_F_LAND:
case 0x36: case MAP_OBJ_GFX_BLACKBELT:
case 0x38: case MAP_OBJ_GFX_HIKER:
case 0x3e: case MAP_OBJ_GFX_SAILOR:
return 0x4e; return 0x4e;
case 0x24: case MAP_OBJ_GFX_TUBER_M_1:
case 0x2b: case MAP_OBJ_GFX_SWIMMER_M_WATER:
case 0x2c: case MAP_OBJ_GFX_SWIMMER_F_WATER:
return 0x4f; return 0x4f;
default: default:
return 0x4d; return 0x4d;
@@ -1470,7 +1471,7 @@ static s32 GetRematchIdx(const VsSeekerData * vsSeekerData, u16 trainerFlagIdx)
{ {
u32 i; u32 i;
for (i = 0; i < ARRAY_COUNT(sVsSeekerData); i++) for (i = 0; i < NELEMS(sVsSeekerData); i++)
{ {
if (vsSeekerData[i].trainerIdxs[0] == trainerFlagIdx) if (vsSeekerData[i].trainerIdxs[0] == trainerFlagIdx)
return i; return i;
@@ -1490,7 +1491,7 @@ void sub_810D0D0(void)
{ {
u8 i; u8 i;
for (i = 0; i < 100; i++) for (i = 0; i < NELEMS(gSaveBlock1Ptr->trainerRematches); i++)
gSaveBlock1Ptr->trainerRematches[i] = 0; gSaveBlock1Ptr->trainerRematches[i] = 0;
} }
@@ -1517,7 +1518,7 @@ static u8 GetNextAvailableRematchTrainer(const VsSeekerData * vsSeekerData, u16
u32 i; u32 i;
s32 j; s32 j;
for (i = 0; i < ARRAY_COUNT(sVsSeekerData); i++) for (i = 0; i < NELEMS(sVsSeekerData); i++)
{ {
if (vsSeekerData[i].trainerIdxs[0] == trainerFlagNo) if (vsSeekerData[i].trainerIdxs[0] == trainerFlagNo)
{ {