diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 14:33:05 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 14:33:05 -0400 |
| commit | 437c7404e90dc7fb853b0c6c74a234cd2a2e3c56 (patch) | |
| tree | 55a4304581cf61e65146a21d3bcdda24b943d859 /constants | |
| parent | fda549a27af144cdb601bbd85dba439fce533afc (diff) | |
| parent | 93747a4839a7fa0ee342076c8d9a616256a8cab0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokegold
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index db0cc597..5f2bff06 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1673,8 +1673,8 @@ const EVENT_VIOLET_CITY_RARE_CANDY const EVENT_LAKE_OF_RAGE_MAX_ETHER const EVENT_LAKE_OF_RAGE_TM_DETECT - const EVENT_SPROUT_TOWER1F_PARLYZ_HEAL - const EVENT_SPROUT_TOWER2F_X_ACCURACY + const EVENT_SPROUT_TOWER_1F_PARLYZ_HEAL + const EVENT_SPROUT_TOWER_2F_X_DEFEND const EVENT_SPROUT_TOWER_3F_POTION const EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE const EVENT_TIN_TOWER_3F_FULL_HEAL @@ -1704,12 +1704,12 @@ const EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE const EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER const EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY - const EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + const EVENT_OLIVINE_LIGHTHOUSE_5F_GREAT_BALL const EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER const EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION const EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION const EVENT_TEAM_ROCKET_BASE_B1F_NUGGET - const EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC + const EVENT_TEAM_ROCKET_BASE_B1F_X_ACCURACY const EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL const EVENT_TEAM_ROCKET_BASE_B3F_DIRE_HIT @@ -1737,7 +1737,7 @@ const EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER const EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE const EVENT_MOUNT_MORTAR_B1F_HYPER_POTION - const EVENT_MOUNT_MORTAR_B1F_CARBOS + const EVENT_MOUNT_MORTAR_B1F_FULL_HEAL const EVENT_GOT_HM07_WATERFALL const EVENT_ICE_PATH_1F_PP_UP const EVENT_ICE_PATH_B1F_IRON @@ -1769,7 +1769,7 @@ const EVENT_VICTORY_ROAD_MAX_REVIVE const EVENT_VICTORY_ROAD_FULL_RESTORE const EVENT_VICTORY_ROAD_FULL_HEAL - const EVENT_UNION_CAVE_X_SPECIAL + const EVENT_VICTORY_ROAD_X_SPECIAL const EVENT_DRAGONS_DEN_B1F_DRAGON_FANG const EVENT_TOHJO_FALLS_MOON_STONE const EVENT_ROUTE_26_MAX_ELIXER |