summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-01-21 14:38:09 -0600
committerGitHub <noreply@github.com>2018-01-21 14:38:09 -0600
commitf4455bb2a522f4b99f17fb9ddc4e44d3ada011c9 (patch)
tree267b12b275a02bba2a7b58240e83f31beffb2ead /include/constants
parent5feb270e97b135d3b9ffe6a3d51d151afa6631c8 (diff)
parentfbf91fabcf6c3ce07c78a0962754f32994cced9e (diff)
Merge pull request #180 from DizzyEggg/decompile_mystery_event_script
Decompile mystery event script
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/flags.h2
-rw-r--r--include/constants/vars.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 941f40efb..63e053cbd 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -484,7 +484,7 @@
#define FLAG_0x1E1 0x1E1
#define FLAG_0x1E2 0x1E2
#define FLAG_0x1E3 0x1E3
-#define FLAG_0x1E4 0x1E4
+#define FLAG_MYSTERY_EVENT_DONE 0x1E4
#define FLAG_0x1E5 0x1E5
#define FLAG_0x1E6 0x1E6
#define FLAG_0x1E7 0x1E7
diff --git a/include/constants/vars.h b/include/constants/vars.h
index b8bd46a96..c0e3313b6 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -48,7 +48,7 @@
#define VAR_HAPPINESS_STEP_COUNTER 0x402A
#define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C
-#define VAR_0x402D 0x402D
+#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D
#define VAR_0x402E 0x402E
#define VAR_FRONTIER_MANIAC_FACILITY 0x402F
@@ -226,7 +226,7 @@
#define VAR_0x40DA 0x40DA
#define VAR_0x40DB 0x40DB
#define VAR_0x40DC 0x40DC
-#define VAR_0x40DD 0x40DD
+#define VAR_EVENT_PICHU_SLOT 0x40DD
#define VAR_0x40DE 0x40DE
#define VAR_0x40DF 0x40DF
#define VAR_0x40E0 0x40E0