diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 18 | ||||
| -rw-r--r-- | constants/map_constants.asm | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 341298a4..ad423568 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -668,19 +668,19 @@ const EVENT_TULLY_ASKED_FOR_PHONE_NUMBER const EVENT_290 ; 290 const EVENT_BRENT_ASKED_FOR_PHONE_NUMBER - const EVENT_292 + const EVENT_BRENT_READY_FOR_REMATCH const EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER - const EVENT_294 + const EVENT_TIFFANY_READY_FOR_REMATCH const EVENT_VANCE_ASKED_FOR_PHONE_NUMBER - const EVENT_296 + const EVENT_VANCE_READY_FOR_REMATCH const EVENT_WILTON_ASKED_FOR_PHONE_NUMBER - const EVENT_298 + const EVENT_WILTON_READY_FOR_REMATCH const EVENT_KENJI_ASKED_FOR_PHONE_NUMBER - const EVENT_29A + const EVENT_KENJI_READY_FOR_REMATCH const EVENT_PARRY_ASKED_FOR_PHONE_NUMBER - const EVENT_29C + const EVENT_PARRY_READY_FOR_REMATCH const EVENT_ERIN_ASKED_FOR_PHONE_NUMBER - const EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD + const EVENT_ERIN_READY_FOR_REMATCH const EVENT_29F ; Ruins Of Alph puzzles const EVENT_SOLVED_HO_OH_PUZZLE ; 2a0 @@ -1787,11 +1787,11 @@ const EVENT_ROUTE_43_MAX_ETHER const EVENT_ROUTE_44_MAX_REVIVE const EVENT_ROUTE_44_ULTRA_BALL - const EVENT_ROUTE_45_NUGGET + const EVENT_ROUTE_45_X_SPECIAL const EVENT_ROUTE_45_REVIVE const EVENT_ROUTE_45_ELIXER const EVENT_ROUTE_45_MAX_POTION - const EVENT_ROUTE_46_X_SPEED + const EVENT_ROUTE_46_DIRE_HIT ; Johto people const EVENT_RIVAL_NEW_BARK_TOWN const EVENT_RIVAL_CHERRYGROVE_CITY diff --git a/constants/map_constants.asm b/constants/map_constants.asm index bd120e94..d9bd0ed0 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -422,7 +422,7 @@ ENDM map_const VIRIDIAN_MART, 4, 6 ; 8 map_const VIRIDIAN_POKECENTER_1F, 4, 5 ; 9 map_const VIRIDIAN_POKECENTER_2F_BETA, 4, 8 ; 10 - map_const ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 ; 11 + map_const ROUTE_2_NUGGET_HOUSE, 4, 4 ; 11 map_const ROUTE_2_GATE, 4, 5 ; 12 map_const VICTORY_ROAD_GATE, 9, 10 ; 13 @@ -440,7 +440,7 @@ ENDM 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_27_SANDSTORM_HOUSE, 4, 4 ; 12 - map_const ROUTE_29_46_GATE, 4, 5 ; 13 + map_const ROUTE_29_ROUTE_46_GATE, 4, 5 ; 13 newgroup ; 25 |