summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-01-06 00:44:08 -0800
committerYamaArashi <shadow962@live.com>2017-01-06 00:44:08 -0800
commit8a4775755cf763d1d940eb6b43fa23c3576bd683 (patch)
tree59093b95467885e243d4bc9095b75ff7454b1713
parentd75c71970719db126bef05b89bc6a43e138e5483 (diff)
move vars to header
-rw-r--r--include/vars.h25
-rw-r--r--src/pokemon_size_record.c2
2 files changed, 14 insertions, 13 deletions
diff --git a/include/vars.h b/include/vars.h
index 265f903ba..4661bbd52 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -1,21 +1,24 @@
#ifndef GUARD_VARS_H
#define GUARD_VARS_H
-#define VAR_RECYCLE_GOODS 0x4020
-#define VAR_REPEL_STEP_COUNT 0x4021
+#define VAR_RECYCLE_GOODS 0x4020
+#define VAR_REPEL_STEP_COUNT 0x4021
-#define VAR_FIRST_POKE 0x4023
-#define VAR_MIRAGE_RND_H 0x4024
-#define VAR_MIRAGE_RND_L 0x4025
+#define VAR_FIRST_POKE 0x4023
+#define VAR_MIRAGE_RND_H 0x4024
+#define VAR_MIRAGE_RND_L 0x4025
-#define VAR_RESET_RTC_ENABLE 0x402C
+#define VAR_RESET_RTC_ENABLE 0x402C
-#define VAR_DAYS 0x4040
+#define VAR_DAYS 0x4040
-#define VAR_POKELOT_PRIZE 0x4045
-#define VAR_NATIONAL_DEX 0x4046
+#define VAR_POKELOT_PRIZE 0x4045
+#define VAR_NATIONAL_DEX 0x4046
+#define VAR_SHROOMISH_SIZE_RECORD 0x4047
-#define VAR_POKELOT_RND1 0x404B
-#define VAR_POKELOT_RND2 0x404C
+#define VAR_POKELOT_RND1 0x404B
+#define VAR_POKELOT_RND2 0x404C
+
+#define VAR_BARBOACH_SIZE_RECORD 0x404F
#endif // GUARD_VARS_H
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index d8e3620ec..6cf3411a9 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -38,8 +38,6 @@ static const struct UnknownStruct sBigMonSizeTable[] =
{ 1700, 1, -26 },
};
-#define VAR_SHROOMISH_SIZE_RECORD 0x4047
-#define VAR_BARBOACH_SIZE_RECORD 0x404F
#define CM_PER_INCH 2.54
static u32 GetMonSizeHash(struct Pokemon *pkmn)