summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/field_poison.inc2
-rw-r--r--data/scripts/new_game.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index 2ca9c7b06..40b4cf658 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -16,7 +16,7 @@ EventScript_FieldWhiteOut:: @ 82736D9
special Script_FadeOutMapMusic
waitstate
fadescreen 1
- call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter
+ call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter
special SetCB2WhiteOut
waitstate
end
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index e39c6eca6..cba1c68ba 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -166,7 +166,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN
setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
- setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
+ setflag FLAG_HIDE_RUSTURF_TUNNEL_BRINEY
setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
@@ -199,8 +199,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
setflag FLAG_HIDE_ROUTE_104_RIVAL
setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
- setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
- setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
+ setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
+ setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE
setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
@@ -237,7 +237,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
setflag FLAG_HIDE_DEOXYS
setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
- setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
+ setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
setflag FLAG_HIDE_SKY_PILLAR_WALLACE
setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT