diff options
author | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
commit | 46023e742c7704c449ae7ec9c2a592cd923f40e6 (patch) | |
tree | 9f6c6591e60f83003f6abccb5a28cfb3004ad2ab /src/field/pokedex_area_screen.c | |
parent | cb674ce14dc43f99dd76f456e69ab8a90cc3d506 (diff) | |
parent | 2bd2dd1db7252a928a84cd65ea0510ed1533fa9b (diff) |
Merge branch 'master' into german_debug
Conflicts:
asm/pokemon_storage_system.s
data/pokemon_storage_system.s
src/pokemon/pokemon_1.c
src/pokemon/pokemon_storage_system.c
sym_common.txt
sym_ewram.txt
Diffstat (limited to 'src/field/pokedex_area_screen.c')
-rw-r--r-- | src/field/pokedex_area_screen.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/field/pokedex_area_screen.c b/src/field/pokedex_area_screen.c new file mode 100644 index 000000000..67ca276c4 --- /dev/null +++ b/src/field/pokedex_area_screen.c @@ -0,0 +1,20 @@ + +// Includes +#include "global.h" + +// Static type declarations + +// Static RAM declarations + +EWRAM_DATA u16 gUnknown_02039260 = 0; +EWRAM_DATA u16 gUnknown_02039262 = 0; +EWRAM_DATA u16 gUnknown_02039264 = 0; +EWRAM_DATA u16 gUnknown_02039266 = 0; +EWRAM_DATA u16 gUnknown_02039268 = 0; +EWRAM_DATA u16 gUnknown_0203926A = 0; + +// Static ROM declarations + +// .rodata + +// .text |