diff options
author | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
commit | 19fbf024ff7e5bedc0f297a44c7df298a9bd0ef4 (patch) | |
tree | e9a928ac0d8eaaca476d8704b95fbf5f6838d994 /src/overworld.c | |
parent | caa13f877797edbb7a1e13bf00b537bafbd4315a (diff) | |
parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) |
fix merge conflicts
Diffstat (limited to 'src/overworld.c')
-rw-r--r-- | src/overworld.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/overworld.c b/src/overworld.c new file mode 100644 index 000000000..c538595f2 --- /dev/null +++ b/src/overworld.c @@ -0,0 +1,19 @@ + +// Includes +#include "global.h" + +// Static type declarations + +// Static RAM declarations +IWRAM_DATA void *gUnknown_03000E0C; +IWRAM_DATA u8 gUnknown_03000E10[4]; +IWRAM_DATA u8 (*gUnknown_03000E14)(u32); +IWRAM_DATA u8 gUnknown_03000E18; +IWRAM_DATA u8 gUnknown_03000E19; +IWRAM_DATA void *rom4_c_unused_03000e1c; + +// Static ROM declarations + +// .rodata + +// .text |