diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-19 19:06:49 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-03-19 19:32:13 -0400 |
| commit | 9c1a8011d91fa2b0704abc5e7e7318212dc375c1 (patch) | |
| tree | 604a81e46ef936ee5b6816fea759b000377b8db4 /include | |
| parent | 33b65b547000387fcdce9fe497da9b217544ece6 (diff) | |
Move heal location data
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/heal_locations.h | 25 | ||||
| -rw-r--r-- | include/constants/spawn_points.h | 26 | ||||
| -rw-r--r-- | include/heal_location.h | 14 |
3 files changed, 27 insertions, 38 deletions
diff --git a/include/constants/heal_locations.h b/include/constants/heal_locations.h new file mode 100644 index 000000000..1c613d464 --- /dev/null +++ b/include/constants/heal_locations.h @@ -0,0 +1,25 @@ +#ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H +#define GUARD_CONSTANTS_HEAL_LOCATIONS_H + +#define SPAWN_PALLET_TOWN 1 +#define SPAWN_VIRIDIAN_CITY 2 +#define SPAWN_PEWTER_CITY 3 +#define SPAWN_CERULEAN_CITY 4 +#define SPAWN_LAVENDER_TOWN 5 +#define SPAWN_VERMILION_CITY 6 +#define SPAWN_CELADON_CITY 7 +#define SPAWN_FUCHSIA_CITY 8 +#define SPAWN_CINNABAR_ISLAND 9 +#define SPAWN_INDIGO_PLATEAU 10 +#define SPAWN_SAFFRON_CITY 11 +#define SPAWN_ROUTE4 12 +#define SPAWN_ROUTE10 13 +#define SPAWN_ONE_ISLAND 14 +#define SPAWN_TWO_ISLAND 15 +#define SPAWN_THREE_ISLAND 16 +#define SPAWN_FOUR_ISLAND 17 +#define SPAWN_FIVE_ISLAND 18 +#define SPAWN_SEVEN_ISLAND 19 +#define SPAWN_SIX_ISLAND 20 + +#endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H diff --git a/include/constants/spawn_points.h b/include/constants/spawn_points.h deleted file mode 100644 index eea133bd1..000000000 --- a/include/constants/spawn_points.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef GUARD_CONSTANTS_SPAWN_POINTS_H -#define GUARD_CONSTANTS_SPAWN_POINTS_H - -#define SPAWN_PALLET_TOWN 1 -#define SPAWN_VIRIDIAN_CITY 2 -#define SPAWN_PEWTER_CITY 3 -#define SPAWN_CERULEAN_CITY 4 -#define SPAWN_LAVENDER_TOWN 5 -#define SPAWN_VERMILION_CITY 6 -#define SPAWN_CELADON_CITY 7 -#define SPAWN_FUCHSIA_CITY 8 -#define SPAWN_CINNABAR_ISLAND 9 -#define SPAWN_INDIGO_PLATEAU 10 -#define SPAWN_SAFFRON_CITY 11 -#define SPAWN_ROUTE4 12 -#define SPAWN_ROUTE10 13 -#define SPAWN_ONE_ISLAND 14 -#define SPAWN_TWO_ISLAND 15 -#define SPAWN_THREE_ISLAND 16 -#define SPAWN_FOUR_ISLAND 17 -#define SPAWN_FIVE_ISLAND 18 -#define SPAWN_SEVEN_ISLAND 19 -#define SPAWN_SIX_ISLAND 20 -#define NUM_SPAWN_POINTS 20 - -#endif //GUARD_CONSTANTS_SPAWN_POINTS_H diff --git a/include/heal_location.h b/include/heal_location.h index aaa2178c6..9680f8fdd 100644 --- a/include/heal_location.h +++ b/include/heal_location.h @@ -3,13 +3,6 @@ #include "global.h" -// Exported type declarations - -struct UnkStruct_0859F534 { - const union AffineAnimCmd *const *const affineAnims; - void (* callback)(struct Sprite *sprite); -}; - struct HealLocation { s8 group; @@ -18,10 +11,7 @@ struct HealLocation s16 y; }; -// Exported RAM declarations - -// Exported ROM declarations - const struct HealLocation *GetHealLocationPointer(u32 loc); +void SetWhiteoutRespawnWarpAndHealerNpc(struct WarpData * warp); -#endif //GUARD_HEAL_LOCATION_H +#endif // GUARD_HEAL_LOCATION_H |