diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 4 | ||||
| -rw-r--r-- | constants/event_flags.asm | 8 | ||||
| -rw-r--r-- | constants/map_constants.asm | 26 |
3 files changed, 19 insertions, 19 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index e1ac69bf..d41a2528 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -104,7 +104,7 @@ engine_flag_def ENGINE_MT_MOON_SQUARE_CLEFAIRY, wWeeklyFlags, 0 ; mt moon square clefairy engine_flag_def ENGINE_UNION_CAVE_LAPRAS, wWeeklyFlags, 1 ; union cave lapras ; $58 engine_flag_def ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT, wWeeklyFlags, 2 ; goldenrod underground haircut used - engine_flag_def ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT, wWeeklyFlags, 3 ; goldenrod mall happiness event floor05 person07 - engine_flag_def ENGINE_TEA_IN_BLUES_HOUSE, wWeeklyFlags, 4 ; tea in blues house + engine_flag_def ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN, wWeeklyFlags, 3 ; goldenrod mall happiness event floor05 person07 + engine_flag_def ENGINE_DAISYS_GROOMING, wWeeklyFlags, 4 ; tea in blues house engine_flag_def ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT, wWeeklyFlags, 5 ; indigo plateau rival fight NUM_ENGINE_FLAGS EQU const_value diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 932bb7c7..99b3d036 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -785,10 +785,10 @@ const EVENT_LEARNED_SLOWPOKETAIL const EVENT_LEARNED_RATICATE_TAIL const EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE - const EVENT_WAREHOUSE_LAYOUT_1 - const EVENT_WAREHOUSE_LAYOUT_2 - const EVENT_WAREHOUSE_LAYOUT_3 - const EVENT_WAREHOUSE_BLOCKED_OFF + const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1 + const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 + const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 + const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF const EVENT_LEFT_MONS_WITH_CONTEST_OFFICER const EVENT_WILLS_ROOM_ENTRANCE_CLOSED const EVENT_WILLS_ROOM_EXIT_OPEN diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0fcef278..b24deb25 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -245,18 +245,18 @@ ENDM map_const GOLDENROD_BILLS_HOUSE, 4, 4 ; 6 map_const GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7 map_const GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 - map_const GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 - map_const GOLDENROD_NAME_RATER, 4, 4 ; 10 - map_const GOLDENROD_DEPT_STORE_1F, 4, 8 ; 11 - map_const GOLDENROD_DEPT_STORE_2F, 4, 8 ; 12 - map_const GOLDENROD_DEPT_STORE_3F, 4, 8 ; 13 - map_const GOLDENROD_DEPT_STORE_4F, 4, 8 ; 14 - map_const GOLDENROD_DEPT_STORE_5F, 4, 8 ; 15 - map_const GOLDENROD_DEPT_STORE_6F, 4, 8 ; 16 - map_const GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2 ; 17 - map_const GOLDENROD_DEPT_STORE_ROOF, 4, 8 ; 18 - map_const GOLDENROD_GAME_CORNER, 7, 10 ; 19 - map_const GOLDENROD_POKECENTER_1F, 4, 5 ; 20 + map_const GOLDENROD_POKECENTER_1F, 4, 5 ; 9 + map_const GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 10 + map_const GOLDENROD_NAME_RATER, 4, 4 ; 11 + map_const GOLDENROD_DEPT_STORE_1F, 4, 8 ; 12 + map_const GOLDENROD_DEPT_STORE_2F, 4, 8 ; 13 + map_const GOLDENROD_DEPT_STORE_3F, 4, 8 ; 14 + map_const GOLDENROD_DEPT_STORE_4F, 4, 8 ; 15 + map_const GOLDENROD_DEPT_STORE_5F, 4, 8 ; 16 + map_const GOLDENROD_DEPT_STORE_6F, 4, 8 ; 17 + map_const GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2 ; 18 + map_const GOLDENROD_DEPT_STORE_ROOF, 4, 8 ; 19 + map_const GOLDENROD_GAME_CORNER, 7, 10 ; 20 map_const ILEX_FOREST_AZALEA_GATE, 4, 5 ; 21 map_const ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 22 map_const DAYCARE, 4, 5 ; 23 @@ -453,7 +453,7 @@ ENDM map_const SAFFRON_POKECENTER_1F, 4, 5 ; 6 map_const SAFFRON_POKECENTER_2F_BETA, 4, 8 ; 7 map_const MR_PSYCHICS_HOUSE, 4, 4 ; 8 - map_const SAFFRON_TRAIN_STATION, 9, 10 ; 9 + map_const SAFFRON_MAGNET_TRAIN_STATION, 9, 10 ; 9 map_const SILPH_CO_1F, 4, 8 ; 10 map_const COPYCATS_HOUSE_1F, 4, 4 ; 11 map_const COPYCATS_HOUSE_2F, 3, 5 ; 12 |