dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary include

Browse Source
This commit is contained in:
PikalaxALT
2017-10-28 21:44:52 -04:00
parent bbda7125f6
commit 27cee8bcf1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/heal_location.c
+5 -6
View File
@@ -2,7 +2,6 @@
// Includes // Includes
#include "global.h" #include "global.h"
#include "map_constants.h" #include "map_constants.h"
#include "sprite.h"
#include "heal_location.h" #include "heal_location.h"
#define HEAL_LOCATION(map, x, y) {MAP_GROUP_##map, MAP_ID_##map, x, y} #define HEAL_LOCATION(map, x, y) {MAP_GROUP_##map, MAP_ID_##map, x, y}
@@ -15,7 +14,7 @@
// .rodata // .rodata
static const struct HealLocation sSpawnLocations[] = { static const struct HealLocation sHealLocations[] = {
HEAL_LOCATION(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 4, 2), HEAL_LOCATION(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 4, 2),
HEAL_LOCATION(LITTLEROOT_TOWN_MAYS_HOUSE_2F, 4, 2), HEAL_LOCATION(LITTLEROOT_TOWN_MAYS_HOUSE_2F, 4, 2),
HEAL_LOCATION(PETALBURG_CITY, 20, 17), HEAL_LOCATION(PETALBURG_CITY, 20, 17),
@@ -40,7 +39,7 @@ static const struct HealLocation sSpawnLocations[] = {
HEAL_LOCATION(BATTLE_FRONTIER_OUTSIDE_EAST, 3, 52) HEAL_LOCATION(BATTLE_FRONTIER_OUTSIDE_EAST, 3, 52)
}; };
#define NUM_HEAL_LOCATIONS (ARRAY_COUNT(sSpawnLocations)) #define NUM_HEAL_LOCATIONS (ARRAY_COUNT(sHealLocations))
// .text // .text
@@ -50,7 +49,7 @@ static u32 GetHealLocationIndexFromMapGroupAndNum(u16 mapGroup, u16 mapNum)
for (i = 0; i < NUM_HEAL_LOCATIONS; i ++) for (i = 0; i < NUM_HEAL_LOCATIONS; i ++)
{ {
if (sSpawnLocations[i].group == mapGroup && sSpawnLocations[i].map == mapNum) if (sHealLocations[i].group == mapGroup && sHealLocations[i].map == mapNum)
{ {
return i + 1; return i + 1;
} }
@@ -67,7 +66,7 @@ const struct HealLocation *GetHealLocationPointerFromMapGroupAndNum(u16 mapGroup
{ {
return NULL; return NULL;
} }
return &sSpawnLocations[loc - 1]; return &sHealLocations[loc - 1];
} }
const struct HealLocation *GetHealLocationPointer(u32 loc) const struct HealLocation *GetHealLocationPointer(u32 loc)
@@ -80,5 +79,5 @@ const struct HealLocation *GetHealLocationPointer(u32 loc)
{ {
return NULL; return NULL;
} }
return &sSpawnLocations[loc - 1]; return &sHealLocations[loc - 1];
} }