diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-15 01:31:19 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-15 01:31:19 -0500 |
| commit | 8c5d8a550780ec370f340ad2537c5ec418740839 (patch) | |
| tree | b2763c4d325426183f9f7d9aefc27d0e2d9c9d9a /src/fieldmap.c | |
| parent | 86a26c9282f03c751fc67e7da6e0d4014f69a688 (diff) | |
| parent | 6f4bf2cb0535b1a7dc72029c65d93e3ebdb19f95 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/fieldmap.c')
| -rw-r--r-- | src/fieldmap.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index 0301115d5..2ed2266f5 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -2,13 +2,6 @@ #include "fieldmap.h" #include "palette.h" -struct BackupMapData -{ - s32 width; - s32 height; - u16 *map; -}; - extern struct MapHeader * const get_mapheader_by_bank_and_number(u8, u8); extern void mapheader_run_script_with_tag_x1(void); extern void sub_80BB970(struct MapEvents *); @@ -32,7 +25,6 @@ struct Coords32 }; extern const struct Coords32 gUnknown_0821664C[]; -extern struct BackupMapData gUnknown_03004870; EWRAM_DATA static u16 gUnknown_02029828[0x2800] = {0}; EWRAM_DATA struct MapHeader gMapHeader = {0}; @@ -48,7 +40,6 @@ void fillSouthConnection(struct MapHeader *, struct MapHeader *, s32); void fillNorthConnection(struct MapHeader *, struct MapHeader *, s32); void fillWestConnection(struct MapHeader *, struct MapHeader *, s32); void fillEastConnection(struct MapHeader *, struct MapHeader *, s32); -u32 GetBehaviorByMetatileId(u16 metatile); struct MapConnection *sub_8056A64(u8 direction, int x, int y); bool8 sub_8056ABC(u8 direction, int x, int y, struct MapConnection *connection); bool8 sub_8056B20(int x, int src_width, int dest_width, int offset); |