diff options
| author | scnorton <scnorton@biociphers.org> | 2019-01-07 16:53:28 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2019-01-07 16:53:28 -0500 |
| commit | 6da60e9b36303ac9d67a59db9092adb1dae6b43f (patch) | |
| tree | 17f9256f07ff23163cf13af85fdc36847549cbbe | |
| parent | 316975ebeae7ca15f9a55bcfc3c493a9f35c6242 (diff) | |
fieldmap: Common and EWRAM syms
| -rw-r--r-- | common_syms/fieldmap.txt | 1 | ||||
| -rw-r--r-- | include/fieldmap.h | 5 | ||||
| -rw-r--r-- | src/fieldmap.c | 1 | ||||
| -rw-r--r-- | sym_common.txt | 4 | ||||
| -rw-r--r-- | sym_ewram.txt | 12 |
5 files changed, 6 insertions, 17 deletions
diff --git a/common_syms/fieldmap.txt b/common_syms/fieldmap.txt new file mode 100644 index 000000000..b593fc3f2 --- /dev/null +++ b/common_syms/fieldmap.txt @@ -0,0 +1 @@ +VMap
\ No newline at end of file diff --git a/include/fieldmap.h b/include/fieldmap.h index 24e85aace..537626edc 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -11,10 +11,7 @@ #define NUM_PALS_TOTAL 13 #define VIRTUAL_MAP_SIZE 0x2800 -extern struct MapCoords { - int width; - int height; -} gUnknown_03005DC0; +extern struct BackupMapData VMap; u32 MapGridGetMetatileIdAt(int, int); u32 MapGridGetMetatileBehaviorAt(int, int); diff --git a/src/fieldmap.c b/src/fieldmap.c index 2984465c7..be5e1d54a 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -31,6 +31,7 @@ bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset); struct BackupMapData VMap; EWRAM_DATA u16 gBackupMapData[VIRTUAL_MAP_SIZE] = {}; EWRAM_DATA struct MapHeader gMapHeader = {}; +EWRAM_DATA struct Camera gCamera = {}; EWRAM_DATA struct ConnectionFlags gMapConnectionFlags = {}; const struct ConnectionFlags sDummyConnectionFlags = {}; diff --git a/sym_common.txt b/sym_common.txt index 7cb460c84..16c275b01 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -160,9 +160,9 @@ gUnknown_300502C: @ 300502C gUnknown_3005030: @ 3005030 .space 0x10 -VMap: @ 3005040 - .space 0x10 + .include "fieldmap.o" + .align 4 gUnknown_3005050: @ 3005050 .space 0x18 diff --git a/sym_ewram.txt b/sym_ewram.txt index 82d492d61..b978e59c4 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -593,17 +593,7 @@ gUnknown_2031DEA: @ 2031DEA gUnknown_2031DEC: @ 2031DEC .space 0x10 -gBackupMapData: @ 2031DFC - .space 0x5000 - -gMapHeader: @ 2036DFC - .space 0x1C - -gCamera: @ 2036E18 - .space 0xC - -gMapConnectionFlags: @ 2036E24 - .space 0x4 + .include "src/fieldmap.o" gUnknown_2036E28: @ 2036E28 .space 0x4 |