diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/field_region_map.c | |
parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
Merge pull request #1 from pret/master
be up to date with the master
Diffstat (limited to 'src/field_region_map.c')
-rw-r--r-- | src/field_region_map.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/field_region_map.c b/src/field_region_map.c index 66e3d968c..58b0e37bc 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -1,17 +1,12 @@ #include "global.h" -#include "asm.h" +#include "field_region_map.h" #include "main.h" #include "menu.h" #include "palette.h" +#include "region_map.h" #include "sprite.h" -#include "text.h" #include "strings2.h" - -extern void sub_80FA8EC(u32, u8); -extern void sub_80FAB10(void); -extern u8 sub_80FAB60(void); -extern void sub_80FBCF0(u32, u8); -extern void sub_80FBB3C(u16, u16); +#include "text.h" struct RegionMapStruct { @@ -30,12 +25,6 @@ struct UnkStruct extern struct UnkStruct unk_2000000; -void CB2_FieldInitRegionMap(void); -void CB2_FieldRegionMap(void); -void VBlankCB_FieldRegionMap(void); -void sub_813EFDC(void); -void sub_813F0C8(void); - void FieldInitRegionMap(MainCallback callback) { SetVBlankCallback(NULL); |