diff options
| author | IIMarckus <iimarckus@gmail.com> | 2018-10-03 23:15:33 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2018-10-03 23:15:49 -0600 |
| commit | 6910c7a29002fd01fe4bb330b63294eafdb92865 (patch) | |
| tree | d6644927ce08479553637b0a29142fbe4655e8aa /constants | |
| parent | ecda8b81ae8f3836927f36d42e122d4e29097366 (diff) | |
Add map objects from bank 4B.
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 18 | ||||
| -rw-r--r-- | constants/map_constants.asm | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index b5b9c2e8..471eaa8f 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -642,21 +642,21 @@ const EVENT_WADE_ASKED_FOR_PHONE_NUMBER const EVENT_276 const EVENT_RALPH_ASKED_FOR_PHONE_NUMBER - const EVENT_278 + const EVENT_RALPH_READY_FOR_REMATCH const EVENT_LIZ_ASKED_FOR_PHONE_NUMBER - const EVENT_27A + const EVENT_LIZ_READY_FOR_REMATCH const EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER - const EVENT_27C + const EVENT_ANTHONY_READY_FOR_REMATCH const EVENT_TODD_ASKED_FOR_PHONE_NUMBER - const EVENT_27E + const EVENT_TODD_READY_FOR_REMATCH const EVENT_GINA_ASKED_FOR_PHONE_NUMBER - const EVENT_280 ; 280 + const EVENT_GINA_READY_FOR_REMATCH ; 280 const EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER - const EVENT_282 + const EVENT_IRWIN_READY_FOR_REMATCH const EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER - const EVENT_284 + const EVENT_ARNIE_READY_FOR_REMATCH const EVENT_ALAN_ASKED_FOR_PHONE_NUMBER - const EVENT_286 + const EVENT_ALAN_READY_FOR_REMATCH const EVENT_287 const EVENT_288 const EVENT_DANA_ASKED_FOR_PHONE_NUMBER @@ -1780,7 +1780,7 @@ const EVENT_ROUTE_31_POTION const EVENT_ROUTE_31_POKE_BALL const EVENT_ROUTE_32_GREAT_BALL - const EVENT_ROUTE_32_REPEL + const EVENT_ROUTE_32_POTION const EVENT_ROUTE_35_TM_ROLLOUT const EVENT_ROUTE_42_ULTRA_BALL const EVENT_ROUTE_42_SUPER_POTION diff --git a/constants/map_constants.asm b/constants/map_constants.asm index d9bd0ed0..cb874504 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -258,7 +258,7 @@ ENDM 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 + map_const DAY_CARE, 4, 5 ; 22 newgroup ; 12 |