summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2018-08-19 03:50:15 -0600
committerIIMarckus <iimarckus@gmail.com>2018-08-19 03:50:15 -0600
commitb03d1b2c62c9b0775b2db471396b777fb7227bdd (patch)
tree72f90b26aaf2672489d73da2e10416740c5cc606 /constants
parent48c2d217a03b0872bc0ea79c869893d00ee610a3 (diff)
Add map objects for National Park.
Diffstat (limited to 'constants')
-rw-r--r--constants/event_flags.asm4
-rw-r--r--constants/std_constants.asm6
2 files changed, 2 insertions, 8 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index 926b7e70..f11f5bfb 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -618,9 +618,9 @@
const EVENT_GAVE_KURT_PNK_APRICORN
; Phone events
const EVENT_JACK_ASKED_FOR_PHONE_NUMBER
- const EVENT_260
+ const EVENT_JACK_READY_FOR_REMATCH
const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
- const EVENT_262
+ const EVENT_BEVERLY_READY_FOR_REMATCH
const EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
const EVENT_264
const EVENT_GOT_PROTEIN_FROM_HUEY
diff --git a/constants/std_constants.asm b/constants/std_constants.asm
index 039b2707..9cfcbc8a 100644
--- a/constants/std_constants.asm
+++ b/constants/std_constants.asm
@@ -31,9 +31,6 @@
enum numberdeclinedm
enum phonefullm
enum rematchm
- enum giftm
- enum packfullm
- enum rematchgiftm
enum asknumber1f
enum asknumber2f
enum registerednumberf
@@ -41,9 +38,6 @@
enum numberdeclinedf
enum phonefullf
enum rematchf
- enum giftf
- enum packfullf
- enum rematchgiftf
enum gymstatue1
enum gymstatue2
enum receiveitem