From 39d8b6c83f72f2c47ea088087891fab4a5946034 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 12 Jul 2015 02:50:14 -0400 Subject: [PATCH] Minor update to previous --- constants/event_flags.asm | 52 +++---------------------------------- constants/std_constants.asm | 2 +- wram.asm | 2 +- 3 files changed, 5 insertions(+), 51 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index a3f3567d7..89d74e77e 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -2001,53 +2001,7 @@ const EVENT_7CD const EVENT_7CE const EVENT_7CF - const EVENT_7D0 - const EVENT_7D1 - const EVENT_7D2 - const EVENT_7D3 - const EVENT_7D4 - const EVENT_7D5 - const EVENT_7D6 - const EVENT_7D7 - const EVENT_7D8 - const EVENT_7D9 - const EVENT_7DA - const EVENT_7DB - const EVENT_7DC - const EVENT_7DD - const EVENT_7DE - const EVENT_7DF - const EVENT_7E0 - const EVENT_7E1 - const EVENT_7E2 - const EVENT_7E3 - const EVENT_7E4 - const EVENT_7E5 - const EVENT_7E6 - const EVENT_7E7 - const EVENT_7E8 - const EVENT_7E9 - const EVENT_7EA - const EVENT_7EB - const EVENT_7EC - const EVENT_7ED - const EVENT_7EE - const EVENT_7EF - const EVENT_7F0 - const EVENT_7F1 - const EVENT_7F2 - const EVENT_7F3 - const EVENT_7F4 - const EVENT_7F5 - const EVENT_7F6 - const EVENT_7F7 - const EVENT_7F8 - const EVENT_7F9 - const EVENT_7FA - const EVENT_7FB - const EVENT_7FC - const EVENT_7FD - const EVENT_7FE - const EVENT_7FF -EVENT_ALWAYS_THERE EQU $ffff +NUM_EVENTS EQU const_value + +EVENT_ALWAYS_THERE EQU -1 diff --git a/constants/std_constants.asm b/constants/std_constants.asm index ef132522c..039b27073 100644 --- a/constants/std_constants.asm +++ b/constants/std_constants.asm @@ -48,6 +48,6 @@ enum gymstatue2 enum receiveitem enum receivetogepiegg - enum pc + enum pcscript enum gamecornercoinvendor enum happinesschecknpc diff --git a/wram.asm b/wram.asm index 45e3a6c7a..9bec48548 100644 --- a/wram.asm +++ b/wram.asm @@ -2255,7 +2255,7 @@ EventFlags:: ; da72 ;PoliceAtElmsLabEvent:: ; db52 ;SalesmanMahoganyTownEvent:: ; db5c ;RedGyaradosEvent:: ; db5c - flag_array 2000 + flag_array NUM_EVENTS ; db6c ds 6