diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
| commit | 06bf25405c98257e47953b5d3c327e314ea371b3 (patch) | |
| tree | 81be5b612621bdd74f632dbedb9f85c4d1d203b9 /include/vars.h | |
| parent | 282cae4a9fbd019a973fb6618337d29a61f97f42 (diff) | |
| parent | be05c5bd52769b58316986bd7451cb2483571099 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-pika
Conflicts:
include/use_pokeblock.h
Diffstat (limited to 'include/vars.h')
| -rwxr-xr-x | include/vars.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/vars.h b/include/vars.h index f31ebde84..e08f344d4 100755 --- a/include/vars.h +++ b/include/vars.h @@ -1,7 +1,16 @@ #ifndef GUARD_VARS_H #define GUARD_VARS_H +#define VAR_0x4001 0x4001 +#define VAR_0x4002 0x4002 #define VAR_0x4003 0x4003 +#define VAR_0x4004 0x4004 +#define VAR_0x4005 0x4005 +#define VAR_0x4006 0x4006 +#define VAR_0x4007 0x4007 +#define VAR_0x4008 0x4008 +#define VAR_0x4009 0x4009 +#define VAR_0x400A 0x400A #define VAR_0x401F 0x401F #define VAR_RECYCLE_GOODS 0x4020 #define VAR_REPEL_STEP_COUNT 0x4021 |