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

Move heal location data

Browse Source
This commit is contained in:
GriffinR
2020-03-19 19:06:49 -04:00
parent 33b65b5470
commit 9c1a8011d9
9 changed files with 124 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/heal_locations.h
+25
View File
@@ -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
include/constants/spawn_points.h
-26
View File
@@ -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
include/heal_location.h
+2 -12
View File
@@ -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