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/hall_of_fame.inc53
-rw-r--r--data/scripts/new_game.inc4
3 files changed, 56 insertions, 3 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/hall_of_fame.inc b/data/scripts/hall_of_fame.inc
new file mode 100644
index 000000000..c57358dd5
--- /dev/null
+++ b/data/scripts/hall_of_fame.inc
@@ -0,0 +1,53 @@
+EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1
+ special SetChampionSaveWarp
+ setflag FLAG_IS_CHAMPION
+ call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries
+ compare VAR_FOSSIL_MANIAC_STATE, 0
+ call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady
+ clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+ call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
+ setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
+ clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
+ clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
+ setvar VAR_STEVENS_HOUSE_STATE, 2
+ setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
+ clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
+ clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
+ clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
+ setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS
+ clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
+ setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL
+ special UpdateTrainerFanClubGameClear
+ call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent
+ call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum
+ setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
+ setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
+ compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0
+ call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent
+ return
+
+EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829
+ clearflag FLAG_DEFEATED_MEW
+ clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS
+ clearflag FLAG_DEFEATED_DEOXYS
+ clearflag FLAG_DEFEATED_LUGIA
+ clearflag FLAG_DEFEATED_HO_OH
+ return
+
+EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839
+ setvar VAR_FOSSIL_MANIAC_STATE, 1
+ return
+
+EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F
+ clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
+ return
+
+EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843
+ setvar VAR_LITTLEROOT_HOUSES_STATE, 3
+ setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3
+ clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
+ return
+
+EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851
+ setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1
+ return
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index 20a2b0222..cba1c68ba 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -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