summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc34
-rw-r--r--data/scripts/field_poison.inc2
-rw-r--r--data/scripts/hall_of_fame.inc53
-rw-r--r--data/scripts/interview.inc2
-rw-r--r--data/scripts/mystery_event_club.inc90
-rw-r--r--data/scripts/new_game.inc16
-rw-r--r--data/scripts/players_house.inc8
-rw-r--r--data/scripts/secret_power_tm.inc46
8 files changed, 153 insertions, 98 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index ebb2e6ef0..9d3bccaf9 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -388,9 +388,9 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
waitdooranim
release
compare VAR_0x8004, USING_MULTI_BATTLE
- goto_if_eq CableClub_EventScript_WarpToDoubleColosseum
+ goto_if_eq CableClub_EventScript_WarpTo4PColosseum
special SetCableClubWarp
- warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8
+ warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8
special sub_80AF948
waitstate
end
@@ -401,9 +401,9 @@ CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B
waitmovement 0
return
-CableClub_EventScript_WarpToDoubleColosseum:: @ 8277036
+CableClub_EventScript_WarpTo4PColosseum:: @ 8277036
special SetCableClubWarp
- warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8
+ warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8
special sub_80AF948
waitstate
end
@@ -710,63 +710,63 @@ EventScript_CableBoxResults:: @ 8277365
releaseall
end
-EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374
+EventScript_BattleColosseum2P_PlayerSpot0:: @ 8277374
setvar VAR_0x8005, 0
special ColosseumPlayerSpotTriggered
waitstate
end
-EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E
+EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E
setvar VAR_0x8005, 1
special ColosseumPlayerSpotTriggered
waitstate
end
-EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388
+EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388
fadescreen 1
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+ goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
setvar VAR_0x8005, 0
special ColosseumPlayerSpotTriggered
waitstate
end
-EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3
+EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3
fadescreen 1
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+ goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
setvar VAR_0x8005, 1
special ColosseumPlayerSpotTriggered
waitstate
end
-EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE
+EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE
fadescreen 1
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+ goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
setvar VAR_0x8005, 2
special ColosseumPlayerSpotTriggered
waitstate
end
-EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9
+EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9
fadescreen 1
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+ goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
setvar VAR_0x8005, 3
special ColosseumPlayerSpotTriggered
waitstate
end
-EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4
+EventScript_BattleColosseum4P_CancelSpotTrigger:: @ 82773F4
end
EventScript_TradeCenter_Chair0:: @ 82773F5
@@ -854,9 +854,9 @@ CableClub_EventScript_TooBusyToNotice:: @ 827749C
closemessage
end
-SingleBattleColosseum_EventScript_Attendant:: @ 82774A6
+BattleColosseum2P_EventScript_Attendant:: @ 82774A6
special Script_FacePlayer
- msgbox SingleBattleColosseum_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
+ msgbox BattleColosseum2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
special Script_ClearHeldMovement
closemessage
end
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..91a88f348
--- /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_MAY, 3
+ setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 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/interview.inc b/data/scripts/interview.inc
index 8b2b72f75..5036e8ec9 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -105,7 +105,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939
release
end
-SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943
+SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943
lock
faceplayer
specialvar VAR_RESULT, sub_80EF8F8
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 1df0ed88c..6687bbd47 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -1,97 +1,98 @@
MysteryEventClub_EventScript_Man:: @ 8291539
lock
faceplayer
- goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_2915F5
+ goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_GivenProfileBefore
msgbox MysteryEventClub_Text_CollectTrainerProfiles, MSGBOX_DEFAULT
- goto MysteryEventClub_EventScript_291552
+ goto MysteryEventClub_EventScript_AskToSeeProfile
end
-MysteryEventClub_EventScript_291552:: @ 8291552
- msgbox MysteryEventClub_Text_2916FF, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_AskToSeeProfile:: @ 8291552
+ msgbox MysteryEventClub_Text_MayISeeYourProfile, MSGBOX_DEFAULT
multichoice 17, 6, MULTI_YESNOINFO_2, 0
switch VAR_RESULT
- case 0, MysteryEventClub_EventScript_29159F
- case 1, MysteryEventClub_EventScript_2915EB
- case 2, MysteryEventClub_EventScript_291591
- case MULTI_B_PRESSED, MysteryEventClub_EventScript_2915EB
+ case 0, MysteryEventClub_EventScript_CreateProfile
+ case 1, MysteryEventClub_EventScript_DeclineShowProfile
+ case 2, MysteryEventClub_EventScript_Info
+ case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineShowProfile
end
-MysteryEventClub_EventScript_291591:: @ 8291591
+MysteryEventClub_EventScript_Info:: @ 8291591
msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT
- goto MysteryEventClub_EventScript_291552
+ goto MysteryEventClub_EventScript_AskToSeeProfile
end
-MysteryEventClub_EventScript_29159F:: @ 829159F
- msgbox MysteryEventClub_Text_291969, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_CreateProfile:: @ 829159F
+ msgbox MysteryEventClub_Text_LetsSeeItThen, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
- goto_if_eq MysteryEventClub_EventScript_2915CB
+ goto_if_eq MysteryEventClub_EventScript_CancelShowProfile
compare VAR_RESULT, 1
- goto_if_eq MysteryEventClub_EventScript_2915D5
+ goto_if_eq MysteryEventClub_EventScript_ShowProfile
end
-MysteryEventClub_EventScript_2915CB:: @ 82915CB
- msgbox MysteryEventClub_Text_2919DC, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_CancelShowProfile:: @ 82915CB
+ msgbox MysteryEventClub_Text_NotIntoItRightNow, MSGBOX_DEFAULT
release
end
-MysteryEventClub_EventScript_2915D5:: @ 82915D5
+MysteryEventClub_EventScript_ShowProfile:: @ 82915D5
setvar VAR_0x8004, 0
special sub_811EECC
waitmessage
delay 80
- msgbox MysteryEventClub_Text_291B22, MSGBOX_DEFAULT
+ msgbox MysteryEventClub_Text_FantasticProfile, MSGBOX_DEFAULT
release
end
-MysteryEventClub_EventScript_2915EB:: @ 82915EB
- msgbox MysteryEventClub_Text_291991, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_DeclineShowProfile:: @ 82915EB
+ msgbox MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile, MSGBOX_DEFAULT
release
end
-MysteryEventClub_EventScript_2915F5:: @ 82915F5
+MysteryEventClub_EventScript_GivenProfileBefore:: @ 82915F5
msgbox MysteryEventClub_Text_YouHaveWonderfulSmile, MSGBOX_DEFAULT
- goto MysteryEventClub_EventScript_291603
+ goto MysteryEventClub_EventScript_AskToSeeNewProfile
end
-MysteryEventClub_EventScript_291603:: @ 8291603
+MysteryEventClub_EventScript_AskToSeeNewProfile:: @ 8291603
msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT
multichoice 17, 6, MULTI_YESNOINFO_2, 0
switch VAR_RESULT
- case 0, MysteryEventClub_EventScript_291650
- case 1, MysteryEventClub_EventScript_29167C
- case 2, MysteryEventClub_EventScript_291642
- case MULTI_B_PRESSED, MysteryEventClub_EventScript_29167C
+ case 0, MysteryEventClub_EventScript_CreateNewProfile
+ case 1, MysteryEventClub_EventScript_DeclineNewProfile
+ case 2, MysteryEventClub_EventScript_InfoNewProfile
+ case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineNewProfile
end
-MysteryEventClub_EventScript_291642:: @ 8291642
+MysteryEventClub_EventScript_InfoNewProfile:: @ 8291642
msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT
- goto MysteryEventClub_EventScript_291603
+ goto MysteryEventClub_EventScript_AskToSeeNewProfile
end
-MysteryEventClub_EventScript_291650:: @ 8291650
- msgbox MysteryEventClub_Text_291A6B, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_CreateNewProfile:: @ 8291650
+ msgbox MysteryEventClub_Text_EvenBetterThanLastProfile, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
- goto_if_eq MysteryEventClub_EventScript_2915CB
+ goto_if_eq MysteryEventClub_EventScript_CancelShowProfile
compare VAR_RESULT, 1
- goto_if_eq MysteryEventClub_EventScript_2915D5
+ goto_if_eq MysteryEventClub_EventScript_ShowProfile
end
-MysteryEventClub_EventScript_29167C:: @ 829167C
- msgbox MysteryEventClub_Text_291ABA, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_DeclineNewProfile:: @ 829167C
+ msgbox MysteryEventClub_Text_LikeProfileWayItIs, MSGBOX_DEFAULT
release
end
-MysteryEventClub_EventScript_291686:: @ 8291686
+@ Unused
+MysteryEventClub_EventScript_Ret:: @ 8291686
return
MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687
@@ -100,7 +101,7 @@ MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687
.string "I have a hobby--collecting the profiles\n"
.string "of POKéMON TRAINERS.$"
-MysteryEventClub_Text_2916FF: @ 82916FF
+MysteryEventClub_Text_MayISeeYourProfile: @ 82916FF
.string "So, how about it?\n"
.string "May I see your profile?$"
@@ -123,16 +124,16 @@ MysteryEventClub_Text_EasyChatExplanation: @ 8291729
.string "Repeat for the remaining text choices,\n"
.string "and you'll have your very own profile.$"
-MysteryEventClub_Text_291969: @ 8291969
+MysteryEventClub_Text_LetsSeeItThen: @ 8291969
.string "Yes! Thank you!\n"
.string "So, let's see it, then.$"
-MysteryEventClub_Text_291991: @ 8291991
+MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile: @ 8291991
.string "Oh, no, really?\p"
.string "I imagine someone like you would have\n"
.string "a wonderful profile…$"
-MysteryEventClub_Text_2919DC: @ 82919DC
+MysteryEventClub_Text_NotIntoItRightNow: @ 82919DC
.string "Oh? You're not into it right now?\p"
.string "Well, anytime is good by me!$"
@@ -143,17 +144,17 @@ MysteryEventClub_Text_YouHaveWonderfulSmile: @ 8291A1B
MysteryEventClub_Text_MayISeeYourNewProfile: @ 8291A4F
.string "May I see your new profile?$"
-MysteryEventClub_Text_291A6B: @ 8291A6B
+MysteryEventClub_Text_EvenBetterThanLastProfile: @ 8291A6B
.string "Yes! Thank you!\p"
.string "I hope it's even better than the profile\n"
.string "you showed me before.$"
-MysteryEventClub_Text_291ABA: @ 8291ABA
+MysteryEventClub_Text_LikeProfileWayItIs: @ 8291ABA
.string "Oh, you like your profile the way it is.\p"
.string "I don't blame you--it's a wonderful\n"
.string "profile the way it is now.$"
-MysteryEventClub_Text_291B22: @ 8291B22
+MysteryEventClub_Text_FantasticProfile: @ 8291B22
.string "F-fantastic!\p"
.string "Your profile, it's wonderful!\n"
.string "It really says what you're about.\p"
@@ -161,7 +162,8 @@ MysteryEventClub_Text_291B22: @ 8291B22
.string "be captivated by you!\p"
.string "Thank you!$"
-MysteryEventClub_Text_291BB7: @ 8291BB7
+@ Unused
+MysteryEventClub_Text_YouKnowSecretSaying: @ 8291BB7
.string "Oh?\n"
.string "You know the secret saying!\p"
.string "That means you're now a fellow member\n"
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index e39c6eca6..b1ecae203 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -138,9 +138,9 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
- setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
+ setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
- setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
+ setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA
setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
setflag FLAG_HIDE_PETALBURG_GYM_WALLY
@@ -166,12 +166,12 @@ 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
- setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
- setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
+ setflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND
+ setflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA
setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE
setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1
setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2
@@ -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
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index acb1536e8..3a0675e5e 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -305,9 +305,9 @@ PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1
PlayersHouse_1F_EventScript_Mom:: @ 82929C5
lock
faceplayer
- compare VAR_LITTLEROOT_HOUSES_STATE, 4
+ compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4
goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard
- compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
+ compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4
goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard
goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom
goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty
@@ -502,8 +502,8 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2
copyvar VAR_ROAMER_POKEMON, VAR_RESULT
msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT
closemessage
- setvar VAR_LITTLEROOT_HOUSES_STATE, 4
- setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4
+ setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 4
+ setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4
releaseall
end
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index c89202ded..7be69ec58 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -1,4 +1,4 @@
-Route111_Text_2762C9: @ 82762C9
+Route111_Text_MakingRoomUseTMToMakeYourOwn: @ 82762C9
.string "What's that?\n"
.string "What am I doing?\p"
.string "I'm thinking about making my own room\n"
@@ -6,7 +6,7 @@ Route111_Text_2762C9: @ 82762C9
.string "I know! I'll give you this TM.\n"
.string "Will you use it to make your own room?$"
-Route111_Text_27636E: @ 827636E
+Route111_Text_ExplainSecretPower: @ 827636E
.string "Find a big tree that looks like it might\n"
.string "drop some vines.\p"
.string "Use SECRET POWER in front of the tree.\n"
@@ -24,59 +24,59 @@ Route111_Text_27636E: @ 827636E
.string "I'm going to look for other places, too.\n"
.string "Okay, bye!$"
-Route111_Text_27655C: @ 827655C
+Route111_Text_DontWantThis: @ 827655C
.string "Oh, you don't want this?\n"
.string "If you change your mind, tell me, okay?$"
-Route111_Text_27659D: @ 827659D
+Route111_Text_DontHaveAnyRoom: @ 827659D
.string "Oh, you don't have any room for this.\p"
.string "I'll hold on to it, so come back for it\n"
.string "another time, okay?$"
-Route111_EventScript_2765FF:: @ 82765FF
+Route111_EventScript_SecretPowerMan:: @ 82765FF
lock
faceplayer
- msgbox Route111_Text_2762C9, MSGBOX_YESNO
+ msgbox Route111_Text_MakingRoomUseTMToMakeYourOwn, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq Route111_EventScript_27661E
- msgbox Route111_Text_27655C, MSGBOX_DEFAULT
+ goto_if_eq Route111_EventScript_GiveSecretPower
+ msgbox Route111_Text_DontWantThis, MSGBOX_DEFAULT
release
end
-Route111_EventScript_27661E:: @ 827661E
+Route111_EventScript_GiveSecretPower:: @ 827661E
giveitem_std ITEM_TM43
- compare VAR_RESULT, 0
- goto_if_eq Route111_EventScript_276680
- msgbox Route111_Text_27636E, MSGBOX_DEFAULT
+ compare VAR_RESULT, FALSE
+ goto_if_eq Route111_EventScript_NoRoomForSecretPower
+ msgbox Route111_Text_ExplainSecretPower, MSGBOX_DEFAULT
closemessage
setflag FLAG_RECEIVED_SECRET_POWER
clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
compare VAR_FACING, DIR_WEST
- call_if_eq Route111_EventScript_27666A
+ call_if_eq Route111_EventScript_SecretPowerManExit
compare VAR_FACING, DIR_EAST
- call_if_eq Route111_EventScript_27666A
+ call_if_eq Route111_EventScript_SecretPowerManExit
compare VAR_FACING, DIR_NORTH
- call_if_eq Route111_EventScript_276675
+ call_if_eq Route111_EventScript_SecretPowerManExitNorth
removeobject VAR_LAST_TALKED
release
end
-Route111_EventScript_27666A:: @ 827666A
- applymovement VAR_LAST_TALKED, Route111_Movement_27668A
+Route111_EventScript_SecretPowerManExit:: @ 827666A
+ applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExit
waitmovement 0
return
-Route111_EventScript_276675:: @ 8276675
- applymovement VAR_LAST_TALKED, Route111_Movement_276696
+Route111_EventScript_SecretPowerManExitNorth:: @ 8276675
+ applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExitNorth
waitmovement 0
return
-Route111_EventScript_276680:: @ 8276680
- msgbox Route111_Text_27659D, MSGBOX_DEFAULT
+Route111_EventScript_NoRoomForSecretPower:: @ 8276680
+ msgbox Route111_Text_DontHaveAnyRoom, MSGBOX_DEFAULT
release
end
-Route111_Movement_27668A: @ 827668A
+Route111_Movement_SecretPowerManExit: @ 827668A
walk_down
walk_down
walk_down
@@ -90,7 +90,7 @@ Route111_Movement_27668A: @ 827668A
walk_down
step_end
-Route111_Movement_276696: @ 8276696
+Route111_Movement_SecretPowerManExitNorth: @ 8276696
walk_left
walk_down
walk_down
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 12:50:23 +0000