summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/elite_four.inc20
-rw-r--r--data/scripts/field_move_scripts.inc12
-rw-r--r--data/scripts/mevent.inc39
-rw-r--r--data/scripts/pc.inc42
-rw-r--r--data/scripts/prof_birch.inc61
-rw-r--r--data/scripts/roulette.inc49
-rw-r--r--data/scripts/unusual_weather.inc9
7 files changed, 104 insertions, 128 deletions
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
index c60e3889e..e7aada698 100644
--- a/data/scripts/elite_four.inc
+++ b/data/scripts/elite_four.inc
@@ -1,7 +1,3 @@
-EverGrandeCity_DrakesRoom_EventScript_2723F8:: @ 82723F8
-EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8
-EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8
-EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8
PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
@@ -21,10 +17,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
special DrawWholeMapView
return
-EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475
-EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475
-EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475
-EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475
+PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRACK_DOOR
@@ -37,10 +30,8 @@ EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475
special DrawWholeMapView
return
-EverGrandeCity_DrakesRoom_EventScript_2724BC:: @ 82724BC
-EverGrandeCity_GlaciasRoom_EventScript_2724BC:: @ 82724BC
-EverGrandeCity_PhoebesRoom_EventScript_2724BC:: @ 82724BC
-EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC
+@ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible
+PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 82724BC
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
@@ -61,10 +52,7 @@ EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC
setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
return
-EverGrandeCity_DrakesRoom_EventScript_27255F:: @ 827255F
-EverGrandeCity_GlaciasRoom_EventScript_27255F:: @ 827255F
-EverGrandeCity_PhoebesRoom_EventScript_27255F:: @ 827255F
-EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F
+PokemonLeague_EliteFour_EventScript_CloseDoor:: @ 827255F
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 71d4b725c..bd98a3676 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -3,7 +3,7 @@ EventScript_CutTree:: @ 82906BB
lockall
goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
checkpartymove MOVE_CUT
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CheckTreeCantCut
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
@@ -62,7 +62,7 @@ EventScript_RockSmash:: @ 82907A6
lockall
goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
checkpartymove MOVE_ROCK_SMASH
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSmashRock
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
@@ -129,7 +129,7 @@ EventScript_StrengthBoulder:: @ 82908BA
goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
checkpartymove MOVE_STRENGTH
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantStrength
setfieldeffectargument 0, VAR_RESULT
msgbox Text_WantToStrength, MSGBOX_YESNO
@@ -190,7 +190,7 @@ Text_StrengthActivated: @ 8290A16
EventScript_UseWaterfall:: @ 8290A49
lockall
checkpartymove MOVE_WATERFALL
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantWaterfall
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
@@ -225,7 +225,7 @@ Text_MonUsedWaterfall: @ 8290AFC
EventScript_UseDive:: @ 8290B0F
lockall
checkpartymove MOVE_DIVE
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantDive
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
@@ -250,7 +250,7 @@ EventScript_EndDive:: @ 8290B58
EventScript_UseDiveUnderwater:: @ 8290B5A
lockall
checkpartymove MOVE_DIVE
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSurface
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
diff --git a/data/scripts/mevent.inc b/data/scripts/mevent.inc
index 29f9c47d5..88f44e002 100644
--- a/data/scripts/mevent.inc
+++ b/data/scripts/mevent.inc
@@ -1,27 +1,26 @@
-
EventScript_Questionnaire:: @ 827381B
lockall
- msgbox gText_FillOutQuestionnaire, MSGBOX_YESNO
+ msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq EventScript_2738FD
+ goto_if_eq Mevent_EventScript_Release
setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
call Common_ShowEasyChatScreen
lock
faceplayer
specialvar VAR_0x8008, GetMartEmployeeObjectEventId
compare VAR_0x8004, 1
- goto_if_eq EventScript_27386D
+ goto_if_eq Mevent_EventScript_PlayerInputMysteryEventPhrase
compare VAR_0x8004, 2
- goto_if_eq EventScript_2738B5
+ goto_if_eq Mevent_EventScript_PlayerInputMysteryGiftPhrase
compare VAR_RESULT, 0
- goto_if_eq EventScript_2738FD
+ goto_if_eq Mevent_EventScript_Release
compare VAR_RESULT, 1
- goto_if_eq EventScript_2738FF
+ goto_if_eq Mevent_EventScript_QuestionnaireThankYou
end
-EventScript_27386D:: @ 827386D
- goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF
- goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF
+Mevent_EventScript_PlayerInputMysteryEventPhrase:: @ 827386D
+ goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou
+ goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, Mevent_EventScript_QuestionnaireThankYou
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
playse SE_PIN
@@ -29,15 +28,15 @@ EventScript_27386D:: @ 827386D
waitmovement 0
applymovement VAR_0x8008, Common_Movement_Delay48
waitmovement 0
- msgbox gUnknown_08273506, MSGBOX_DEFAULT
+ msgbox Mevent_Text_YouKnowThoseWordsEvent, MSGBOX_DEFAULT
setflag FLAG_SYS_MYSTERY_EVENT_ENABLE
- msgbox gUnknown_08273559, MSGBOX_DEFAULT
+ msgbox Mevent_Text_YouCanAccessMysteryEvent, MSGBOX_DEFAULT
releaseall
end
-EventScript_2738B5:: @ 82738B5
- goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF
- goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF
+Mevent_EventScript_PlayerInputMysteryGiftPhrase:: @ 82738B5
+ goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou
+ goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, Mevent_EventScript_QuestionnaireThankYou
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
playse SE_PIN
@@ -45,19 +44,19 @@ EventScript_2738B5:: @ 82738B5
waitmovement 0
applymovement VAR_0x8008, Common_Movement_Delay48
waitmovement 0
- msgbox gUnknown_08273446, MSGBOX_DEFAULT
+ msgbox Mevent_Text_YouKnowThoseWordsGift, MSGBOX_DEFAULT
setflag FLAG_SYS_MYSTERY_GIFT_ENABLE
- msgbox gUnknown_082734CC, MSGBOX_DEFAULT
+ msgbox Mevent_Text_YouCanAccessMysteryGift, MSGBOX_DEFAULT
releaseall
end
-EventScript_2738FD:: @ 82738FD
+Mevent_EventScript_Release:: @ 82738FD
releaseall
end
-EventScript_2738FF:: @ 82738FF
+Mevent_EventScript_QuestionnaireThankYou:: @ 82738FF
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
- msgbox gText_ThankYouForTakingQuestionnaire, MSGBOX_DEFAULT
+ msgbox Mevent_Text_QuestionnaireThankYou, MSGBOX_DEFAULT
releaseall
end
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
index d5e51e412..b3602ee6f 100644
--- a/data/scripts/pc.inc
+++ b/data/scripts/pc.inc
@@ -4,63 +4,63 @@ EventScript_PC:: @ 8271D92
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox Text_BootUpPC, MSGBOX_DEFAULT
- goto EventScript_271DAC
+ goto EventScript_PCMainMenu
end
-EventScript_271DAC:: @ 8271DAC
+EventScript_PCMainMenu:: @ 8271DAC
message gText_WhichPCShouldBeAccessed
waitmessage
special ScriptMenu_CreatePCMultichoice
waitstate
- goto EventScript_271DBC
+ goto EventScript_AccessPC
end
-EventScript_271DBC:: @ 8271DBC
+EventScript_AccessPC:: @ 8271DBC
switch VAR_RESULT
- case 0, EventScript_271E0E
- case 1, EventScript_271DF9
- case 2, EventScript_271E54
- case 3, EventScript_271E47
- case MULTI_B_PRESSED, EventScript_271E47
+ case 0, EventScript_AccessPokemonStorage
+ case 1, EventScript_AccessPlayersPC
+ case 2, EventScript_AccessHallOfFame
+ case 3, EventScript_TurnOffPC
+ case MULTI_B_PRESSED, EventScript_TurnOffPC
end
-EventScript_271DF9:: @ 8271DF9
+EventScript_AccessPlayersPC:: @ 8271DF9
playse SE_PC_LOGIN
msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT
special PlayerPC
waitstate
- goto EventScript_271DAC
+ goto EventScript_PCMainMenu
end
-EventScript_271E0E:: @ 8271E0E
+EventScript_AccessPokemonStorage:: @ 8271E0E
playse SE_PC_LOGIN
- call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35
- call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E
+ call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC
+ call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC
msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT
special ShowPokemonStorageSystemPC
waitstate
- goto EventScript_271DAC
+ goto EventScript_PCMainMenu
end
-EventScript_271E35:: @ 8271E35
+EventScript_AccessSomeonesPC:: @ 8271E35
msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT
return
-EventScript_271E3E:: @ 8271E3E
+EventScript_AccessLanettesPC:: @ 8271E3E
msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT
return
-EventScript_271E47:: @ 8271E47
+EventScript_TurnOffPC:: @ 8271E47
setvar VAR_0x8004, 0
playse SE_PC_OFF
special DoPCTurnOffEffect
releaseall
end
-EventScript_271E54:: @ 8271E54
- goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47
+EventScript_AccessHallOfFame:: @ 8271E54
+ goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
playse SE_PC_LOGIN
special AccessHallOfFamePC
waitstate
- goto EventScript_271DBC
+ goto EventScript_AccessPC
end
diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc
index 249f45376..50284d590 100644
--- a/data/scripts/prof_birch.inc
+++ b/data/scripts/prof_birch.inc
@@ -1,94 +1,89 @@
-LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD
-Route101_EventScript_2720AD:: @ 82720AD
-Route103_EventScript_2720AD:: @ 82720AD
+ProfBirch_EventScript_UpdateLocation:: @ 82720AD
compare VAR_PETALBURG_GYM_STATE, 0
goto_if_eq Common_EventScript_NopReturn
- goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A
+ goto_if_set FLAG_SYS_GAME_CLEAR, ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 0
- call_if_eq Route101_EventScript_27211A
+ call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 1
- call_if_eq Route101_EventScript_27211A
+ call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 2
- call_if_eq Route101_EventScript_272127
+ call_if_eq ProfBirch_EventScript_MoveToRoute101
compare VAR_BIRCH_STATE, 3
- call_if_eq Route101_EventScript_272127
+ call_if_eq ProfBirch_EventScript_MoveToRoute101
compare VAR_BIRCH_STATE, 4
- call_if_eq Route101_EventScript_272134
+ call_if_eq ProfBirch_EventScript_MoveToRoute103
compare VAR_BIRCH_STATE, 5
- call_if_eq Route101_EventScript_272134
+ call_if_eq ProfBirch_EventScript_MoveToRoute103
compare VAR_BIRCH_STATE, 6
- call_if_eq Route101_EventScript_27211A
+ call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 7
- call_if_eq Route101_EventScript_27211A
+ call_if_eq ProfBirch_EventScript_MoveToLab
return
-Route101_EventScript_27211A:: @ 827211A
+ProfBirch_EventScript_MoveToLab:: @ 827211A
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_ROUTE_103_BIRCH
return
-Route101_EventScript_272127:: @ 8272127
+ProfBirch_EventScript_MoveToRoute101:: @ 8272127
clearflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_HIDE_ROUTE_103_BIRCH
return
-Route101_EventScript_272134:: @ 8272134
+ProfBirch_EventScript_MoveToRoute103:: @ 8272134
clearflag FLAG_HIDE_ROUTE_103_BIRCH
setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
return
-LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141
-Route101_EventScript_272141:: @ 8272141
-Route103_EventScript_272141:: @ 8272141
+ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141
lock
faceplayer
- goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155
- goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2
+ goto_if_unset FLAG_HAS_MATCH_CALL, ProfBirch_EventScript_AskRatePokedex
+ goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
-Route101_EventScript_272155:: @ 8272155
+ProfBirch_EventScript_AskRatePokedex:: @ 8272155
msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq Route101_EventScript_27216F
- call Route101_EventScript_272184
+ goto_if_eq ProfBirch_EventScript_DeclineRating
+ call ProfBirch_EventScript_RatePokedex
release
end
-Route101_EventScript_27216F:: @ 827216F
+ProfBirch_EventScript_DeclineRating:: @ 827216F
msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT
release
end
-Route101_EventScript_272179:: @ 8272179
+ProfBirch_EventScript_ShowRatingMessage:: @ 8272179
copyvar VAR_0x8004, VAR_0x8009
special ShowPokedexRatingMessage
waitmessage
waitbuttonpress
return
-EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184
-Route101_EventScript_272184:: @ 8272184
+ProfBirch_EventScript_RatePokedex:: @ 8272184
setvar VAR_0x8004, 0
specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
copyvar VAR_0x800A, VAR_RESULT
- buffernumberstring 0, VAR_0x8008
- buffernumberstring 1, VAR_0x8009
+ buffernumberstring 0, VAR_0x8008 @ Num Hoenn seen
+ buffernumberstring 1, VAR_0x8009 @ Num Hoenn caught
msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT
- call Route101_EventScript_272179
+ call ProfBirch_EventScript_ShowRatingMessage
compare VAR_0x800A, 0
- goto_if_eq Common_EventScript_NopReturn
+ goto_if_eq Common_EventScript_NopReturn @ National dex not enabled
setvar VAR_0x8004, 1
specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
- buffernumberstring 0, VAR_0x8008
- buffernumberstring 1, VAR_0x8009
+ buffernumberstring 0, VAR_0x8008 @ Num National seen
+ buffernumberstring 1, VAR_0x8009 @ Num National caught
msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT
return
diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc
index 1dda5e17b..791069088 100644
--- a/data/scripts/roulette.inc
+++ b/data/scripts/roulette.inc
@@ -1,70 +1,71 @@
-MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1
+Roulette_EventScript_Table1:: @ 82A5AB1
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 0
- getpricereduction 2
+ getpricereduction POKENEWS_GAME_CORNER
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D
+ goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, 128
- goto MauvilleCity_GameCorner_EventScript_2A5B0D
+ goto Roulette_EventScript_Play
end
-MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF
+Roulette_EventScript_Table2:: @ 82A5ADF
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 1
- getpricereduction 2
+ getpricereduction POKENEWS_GAME_CORNER
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D
+ goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, 128
- goto MauvilleCity_GameCorner_EventScript_2A5B0D
+ goto Roulette_EventScript_Play
end
-MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D
+Roulette_EventScript_Play:: @ 82A5B0D
special PlayRoulette
waitstate
end
-gUnknown_082A5B12:: @ 82A5B12
+Roulette_Text_PlayMinimumWagerIsX:: @ 82A5B12
.string "The minimum wager at this table\n"
.string "is {STR_VAR_1}. Do you want to play?$"
-gUnknown_082A5B4E:: @ 82A5B4E
+Roulette_Text_NotEnoughCoins:: @ 82A5B4E
.string "You don't have enough COINS.$"
-gUnknown_082A5B6B:: @ 82A5B6B
+Roulette_Text_SpecialRateTable:: @ 82A5B6B
.string "Special rate table right now!$"
-gUnknown_082A5B89:: @ 82A5B89
+Roulette_Text_ControlsInstruction:: @ 82A5B89
.string "Place your wager with the + Control\n"
.string "Pad, then press the A Button.$"
-gUnknown_082A5BCB:: @ 82A5BCB
+Roulette_Text_ItsAHit:: @ 82A5BCB
.string "It's a hit!$"
-gUnknown_082A5BD7:: @ 82A5BD7
+Roulette_Text_Jackpot:: @ 82A5BD7
.string "Jackpot!$"
-gUnknown_082A5BE0:: @ 82A5BE0
+Roulette_Text_NothingDoing:: @ 82A5BE0
.string "Nothing doing!$"
-gUnknown_082A5BEF:: @ 82A5BEF
+Roulette_Text_YouveWonXCoins:: @ 82A5BEF
.string "You've won {STR_VAR_1} COINS!$"
-gUnknown_082A5C04:: @ 82A5C04
+Roulette_Text_NoCoinsLeft:: @ 82A5C04
.string "No COINS left…$"
-gUnknown_082A5C13:: @ 82A5C13
+Roulette_Text_KeepPlaying:: @ 82A5C13
.string "Keep playing?$"
-gUnknown_082A5C21:: @ 82A5C21
+Roulette_Text_BoardWillBeCleared:: @ 82A5C21
.string "The ROULETTE board will be cleared.$"
-gUnknown_082A5C45:: @ 82A5C45
+@ Unused
+Roulette_Text_YouDontHaveACoinCase:: @ 82A5C45
.string "You don't have a COIN CASE.$"
-gUnknown_082A5C61:: @ 82A5C61
+Roulette_Text_CoinCaseIsFull:: @ 82A5C61
.string "Your COIN CASE is full!\n"
.string "Coins can be exchanged for prizes.$"
diff --git a/data/scripts/unusual_weather.inc b/data/scripts/unusual_weather.inc
index e9eae89c2..ad6985ac8 100644
--- a/data/scripts/unusual_weather.inc
+++ b/data/scripts/unusual_weather.inc
@@ -158,14 +158,7 @@ UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
setmetatile 43, 22, METATILE_General_RoughWater, 0
return
-Route105_EventScript_273D13:: @ 8273D13
-Route114_EventScript_273D13:: @ 8273D13
-Route115_EventScript_273D13:: @ 8273D13
-Route116_EventScript_273D13:: @ 8273D13
-Route118_EventScript_273D13:: @ 8273D13
-Route125_EventScript_273D13:: @ 8273D13
-Route127_EventScript_273D13:: @ 8273D13
-Route129_EventScript_273D13:: @ 8273D13
+UnusualWeather_EventScript_HideMapNamePopup:: @ 8273D13
setflag FLAG_HIDE_MAP_NAME_POPUP
return