diff options
| author | huderlem <huderlem@gmail.com> | 2019-03-08 13:28:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 13:28:49 -0600 |
| commit | d637317e324a9055ae42286046dd4b081f39d51a (patch) | |
| tree | 99c243e92cae64a2b60b5c4b86e161db9072a7b0 /include/fieldmap.h | |
| parent | bd157b301dea3526a4c373737dc8167d9a02b168 (diff) | |
| parent | 5886f82ef5593fda68687c2e44b2feef76028ce3 (diff) | |
Merge pull request #592 from Phlosioneer/extern-cleanup
Extern cleanup
Diffstat (limited to 'include/fieldmap.h')
| -rw-r--r-- | include/fieldmap.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h index 24bc4989a..bb5b0e290 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -9,6 +9,8 @@ #define NUM_PALS_TOTAL 13 #define MAX_MAP_DATA_SIZE 0x2800 +#include "main.h" + extern struct BackupMapLayout gBackupMapLayout; u32 MapGridGetMetatileIdAt(int, int); @@ -37,11 +39,16 @@ void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout); void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout); void apply_map_tileset2_palette(struct MapLayout const *mapLayout); void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout); -extern void copy_map_tileset1_to_vram(const struct MapLayout *); -extern void copy_map_tileset2_to_vram(const struct MapLayout *); +void copy_map_tileset1_to_vram(const struct MapLayout *); +void copy_map_tileset2_to_vram(const struct MapLayout *); +struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *connection); +struct MapConnection *sub_8088A8C(s16 x, s16 y); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); void SpriteCB_HallOfFameMonitor(struct Sprite *); +// field_region_map.c +void FieldInitRegionMap(MainCallback callback); + #endif //GUARD_FIELDMAP_H |