diff options
| author | IIMarckus <iimarckus@gmail.com> | 2018-09-20 20:31:09 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2018-09-20 20:31:09 -0600 |
| commit | f7c1a2cd8ffb4c00ba0261ed57fe6ea5349af8a4 (patch) | |
| tree | a34be0dd9493cc16758aef7e3ca3547c1ee9c5c6 /constants | |
| parent | f5ce33c3dc240c7f1f9a1cb894ba041b5692c8bd (diff) | |
Add map scripts from bank 45.
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 24 | ||||
| -rw-r--r-- | constants/map_constants.asm | 9 |
2 files changed, 16 insertions, 17 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index a0f67d37..12d5fce1 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1712,9 +1712,9 @@ const EVENT_TEAM_ROCKET_BASE_B1F_NUGGET const EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC const EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF - const EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN - const EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + const EVENT_TEAM_ROCKET_BASE_B3F_DIRE_HIT + const EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL const EVENT_ILEX_FOREST_REVIVE const EVENT_WAREHOUSE_ENTRANCE_COIN_CASE @@ -1837,16 +1837,16 @@ const EVENT_DAY_CARE_MAN_ON_ROUTE_34 const EVENT_DAY_CARE_MON_1 const EVENT_DAY_CARE_MON_2 - const EVENT_ILEX_FOREST_FARFETCHD - const EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER - const EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - const EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY - const EVENT_ILEX_FOREST_LASS - const EVENT_COPYCAT_1 - const EVENT_COPYCAT_2 - const EVENT_GOLDENROD_SALE_OFF - const EVENT_GOLDENROD_SALE_ON - const EVENT_6F2 + const EVENT_ILEX_FOREST_FARFETCHD1 + const EVENT_ILEX_FOREST_FARFETCHD2 + const EVENT_ILEX_FOREST_FARFETCHD3 + const EVENT_ILEX_FOREST_FARFETCHD4 + const EVENT_ILEX_FOREST_FARFETCHD5 + const EVENT_ILEX_FOREST_FARFETCHD6 + const EVENT_ILEX_FOREST_FARFETCHD7 + const EVENT_ILEX_FOREST_FARFETCHD8 + const EVENT_ILEX_FOREST_FARFETCHD9 + const EVENT_ILEX_FOREST_FARFETCHD10 const EVENT_ILEX_FOREST_APPRENTICE const EVENT_ILEX_FOREST_CHARCOAL_MASTER const EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 5bb98f0a..c41643c8 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -255,11 +255,10 @@ ENDM 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 + map_const GOLDENROD_GAME_CORNER, 7, 10 ; 19 + map_const ILEX_FOREST_AZALEA_GATE, 4, 5 ; 20 + map_const ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 21 + map_const DAYCARE, 4, 5 ; 22 newgroup ; 12 |