diff options
| author | IIMarckus <iimarckus@gmail.com> | 2018-10-04 00:04:18 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2018-10-04 00:04:18 -0600 |
| commit | d34ed8847fafac0fba47f54db5b8e6ce5e4c927b (patch) | |
| tree | 8f7db7a54c8cd7a168ea5e8bb12bff4de2afd54e /constants | |
| parent | 6910c7a29002fd01fe4bb330b63294eafdb92865 (diff) | |
Add map objects from bank 4A.
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 14 | ||||
| -rw-r--r-- | constants/map_constants.asm | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 471eaa8f..613ebfac 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -630,17 +630,17 @@ const EVENT_GOT_CALCIUM_FROM_ERIN const EVENT_KENJI_ON_BREAK const EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER - const EVENT_26C + const EVENT_GAVEN_READY_FOR_REMATCH const EVENT_BETH_ASKED_FOR_PHONE_NUMBER - const EVENT_26E + const EVENT_BETH_READY_FOR_REMATCH const EVENT_JOSE_ASKED_FOR_PHONE_NUMBER - const EVENT_270 + const EVENT_JOSE_READY_FOR_REMATCH const EVENT_REENA_ASKED_FOR_PHONE_NUMBER - const EVENT_272 + const EVENT_REENA_READY_FOR_REMATCH const EVENT_JOEY_ASKED_FOR_PHONE_NUMBER - const EVENT_274 + const EVENT_JOEY_READY_FOR_REMATCH const EVENT_WADE_ASKED_FOR_PHONE_NUMBER - const EVENT_276 + const EVENT_WADE_READY_FOR_REMATCH const EVENT_RALPH_ASKED_FOR_PHONE_NUMBER const EVENT_RALPH_READY_FOR_REMATCH const EVENT_LIZ_ASKED_FOR_PHONE_NUMBER @@ -1777,7 +1777,7 @@ const EVENT_ROUTE_27_TM_SOLARBEAM const EVENT_ROUTE_27_RARE_CANDY const EVENT_ROUTE_29_POTION - const EVENT_ROUTE_31_POTION + const EVENT_ROUTE_31_ANTIDOTE const EVENT_ROUTE_31_POKE_BALL const EVENT_ROUTE_32_GREAT_BALL const EVENT_ROUTE_32_POTION diff --git a/constants/map_constants.asm b/constants/map_constants.asm index cb874504..ea2ff37d 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -360,7 +360,7 @@ ENDM map_const ROUTE_28, 9, 20 ; 1 map_const SILVER_CAVE_OUTSIDE, 18, 20 ; 2 map_const SILVER_CAVE_POKECENTER_1F, 4, 5 ; 3 - map_const ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 ; 4 + map_const ROUTE_28_STEEL_WING_HOUSE, 4, 4 ; 4 newgroup ; 20 @@ -437,8 +437,8 @@ ENDM map_const PLAYERS_HOUSE_2F, 3, 4 ; 7 map_const PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8 map_const ELMS_HOUSE, 4, 4 ; 9 - map_const ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 - map_const ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 + map_const ROUTE_26_HEAL_HOUSE, 4, 4 ; 10 + map_const DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 map_const ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12 map_const ROUTE_29_ROUTE_46_GATE, 4, 5 ; 13 @@ -470,6 +470,6 @@ ENDM map_const CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6 map_const GUIDE_GENTS_HOUSE, 4, 4 ; 7 map_const CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8 - map_const ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 ; 9 + map_const ROUTE_30_BERRY_HOUSE, 4, 4 ; 9 map_const MR_POKEMONS_HOUSE, 4, 4 ; 10 map_const ROUTE_31_VIOLET_GATE, 4, 5 ; 11 |