diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/constants/maps.h | 4 | ||||
-rw-r--r-- | include/wild_encounter.h | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/constants/maps.h b/include/constants/maps.h index 2fe255707..f96591f60 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -464,6 +464,10 @@ #define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8)) +#define MAP_NONE (0x7F | (0x7F << 8)) +#define MAP_UNDEFINED (0xFF | (0xFF << 8)) + + #define MAP_GROUP(map) (MAP_##map >> 8) #define MAP_NUM(map) (MAP_##map & 0xFF) diff --git a/include/wild_encounter.h b/include/wild_encounter.h index d4b343126..c9d7c3fa1 100644 --- a/include/wild_encounter.h +++ b/include/wild_encounter.h @@ -18,13 +18,13 @@ struct WildPokemonHeader { u8 mapGroup; u8 mapNum; - struct WildPokemonInfo *landMonsInfo; - struct WildPokemonInfo *waterMonsInfo; - struct WildPokemonInfo *rockSmashMonsInfo; - struct WildPokemonInfo *fishingMonsInfo; + const struct WildPokemonInfo *landMonsInfo; + const struct WildPokemonInfo *waterMonsInfo; + const struct WildPokemonInfo *rockSmashMonsInfo; + const struct WildPokemonInfo *fishingMonsInfo; }; -extern struct WildPokemonHeader gWildMonHeaders[]; +extern const struct WildPokemonHeader gWildMonHeaders[]; void DisableWildEncounters(bool8 disabled); bool8 StandardWildEncounter(u16 a, u16 b); |