diff options
author | garak <garakmon@gmail.com> | 2018-12-19 21:35:32 -0500 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-12-19 21:35:32 -0500 |
commit | af208a6bbb671cbf471d08856994470e707c5051 (patch) | |
tree | 9a57703eecf8c18f444454f2fae8f5dccf19d408 /src/region_map.c | |
parent | 7e170a06cc3155a6a8785af0b910434e5ab43d2b (diff) | |
parent | f801eed3a84862d88af0d5e43c6b6754e36001f2 (diff) |
Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff
Diffstat (limited to 'src/region_map.c')
-rw-r--r-- | src/region_map.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/region_map.c b/src/region_map.c index c5bcd424b..d7b53d631 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -2,7 +2,7 @@ #include "main.h" #include "text.h" #include "menu.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "palette.h" #include "party_menu.h" @@ -34,15 +34,6 @@ // Static type declarations -struct RegionMapLocation -{ - u8 x; - u8 y; - u8 width; - u8 height; - const u8 *name; -}; - // Static RAM declarations static EWRAM_DATA struct RegionMap *gRegionMap = NULL; |