dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fieldmap: Common and EWRAM syms

Browse Source
This commit is contained in:
scnorton
2019-01-07 16:53:28 -05:00
parent 316975ebea
commit 6da60e9b36
5 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common_syms/fieldmap.txt
+1
View File
@@ -0,0 +1 @@
VMap
include/fieldmap.h
+1 -4
View File
@@ -11,10 +11,7 @@
#define NUM_PALS_TOTAL 13 #define NUM_PALS_TOTAL 13
#define VIRTUAL_MAP_SIZE 0x2800 #define VIRTUAL_MAP_SIZE 0x2800
extern struct MapCoords { extern struct BackupMapData VMap;
int width;
int height;
} gUnknown_03005DC0;
u32 MapGridGetMetatileIdAt(int, int); u32 MapGridGetMetatileIdAt(int, int);
u32 MapGridGetMetatileBehaviorAt(int, int); u32 MapGridGetMetatileBehaviorAt(int, int);
src/fieldmap.c
+1
View File
@@ -31,6 +31,7 @@ bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset);
struct BackupMapData VMap; struct BackupMapData VMap;
EWRAM_DATA u16 gBackupMapData[VIRTUAL_MAP_SIZE] = {}; EWRAM_DATA u16 gBackupMapData[VIRTUAL_MAP_SIZE] = {};
EWRAM_DATA struct MapHeader gMapHeader = {}; EWRAM_DATA struct MapHeader gMapHeader = {};
EWRAM_DATA struct Camera gCamera = {};
EWRAM_DATA struct ConnectionFlags gMapConnectionFlags = {}; EWRAM_DATA struct ConnectionFlags gMapConnectionFlags = {};
const struct ConnectionFlags sDummyConnectionFlags = {}; const struct ConnectionFlags sDummyConnectionFlags = {};
sym_common.txt
+2 -2
View File
@@ -160,9 +160,9 @@ gUnknown_300502C: @ 300502C
gUnknown_3005030: @ 3005030 gUnknown_3005030: @ 3005030
.space 0x10 .space 0x10
VMap: @ 3005040 .include "fieldmap.o"
.space 0x10
.align 4
gUnknown_3005050: @ 3005050 gUnknown_3005050: @ 3005050
.space 0x18 .space 0x18
sym_ewram.txt
+1 -11
View File
@@ -593,17 +593,7 @@ gUnknown_2031DEA: @ 2031DEA
gUnknown_2031DEC: @ 2031DEC gUnknown_2031DEC: @ 2031DEC
.space 0x10 .space 0x10
gBackupMapData: @ 2031DFC .include "src/fieldmap.o"
.space 0x5000
gMapHeader: @ 2036DFC
.space 0x1C
gCamera: @ 2036E18
.space 0xC
gMapConnectionFlags: @ 2036E24
.space 0x4
gUnknown_2036E28: @ 2036E28 gUnknown_2036E28: @ 2036E28
.space 0x4 .space 0x4