summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/BattleTower1F.asm12
-rw-r--r--maps/BattleTowerBattleRoom.asm4
-rw-r--r--maps/FastShipCabins_SE_SSE_CaptainsCabin.asm2
-rw-r--r--maps/GoldenrodBikeShop.asm2
-rw-r--r--maps/Route32.asm2
5 files changed, 11 insertions, 11 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index a405783ea..a0f27d74d 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -154,7 +154,7 @@ Script_BattleTowerHopeToServeYouAgain:
closetext
end
-UnreferencedScript_0x9e4b6:
+Script_MobileError2: ; unreferenced
special BattleTowerMobileError
closetext
end
@@ -164,7 +164,7 @@ Script_WaitButton:
closetext
end
-UnreferencedScript_0x9e4be:
+Script_ChooseChallenge2: ; unreferenced
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
@@ -183,7 +183,7 @@ UnreferencedScript_0x9e4be:
closetext
end
-UnreferencedScript_0x9e4ea:
+Script_StartChallenge: ; unreferenced
setval BATTLETOWERACTION_LEVEL_CHECK
special BattleTowerAction
ifnotequal $0, Script_AMonLevelExceeds
@@ -196,11 +196,11 @@ UnreferencedScript_0x9e4ea:
special BattleTowerAction
ifequal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted
- sjump continue
+ sjump .continue
.zero
writetext Text_CantBeRegistered
-continue:
+.continue
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
writetext Text_SaveBeforeReentry
@@ -218,7 +218,7 @@ continue:
waitbutton
sjump Script_ResumeBattleTowerChallenge
-UnreferencedScript_0x9e53b:
+Script_ReachedBattleLimit: ; unreferenced
writetext Text_FiveDayBattleLimit_Mobile
waitbutton
sjump Script_BattleTowerHopeToServeYouAgain
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 8d05ee828..0b0cc3cb1 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -110,7 +110,7 @@ Script_BeatenAllTrainers2:
writetext Text_CongratulationsYouveBeatenAllTheTrainers
sjump Script_GivePlayerHisPrize
-UnreferencedScript_0x9f4eb:
+Script_TooMuchTimeElapsedNoRegister: ; unreferenced
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
opentext
@@ -119,7 +119,7 @@ UnreferencedScript_0x9f4eb:
closetext
end
-UnreferencedScript_0x9f4f7:
+Script_ChallengeCanceled: ; unreferenced
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
setval BATTLETOWERACTION_06
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 00d7af45c..84adc5975 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -16,7 +16,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScripts:
db 0 ; callbacks
-.UnreferencedDummyScene:
+.DummyScene: ; unreferenced
end
SSAquaCaptain:
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index c4a05e3fa..06f2d0e67 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -6,7 +6,7 @@ GoldenrodBikeShop_MapScripts:
db 0 ; callbacks
-.UnreferencedDummyScene:
+.DummyScene: ; unreferenced
end
GoldenrodBikeShopClerkScript:
diff --git a/maps/Route32.asm b/maps/Route32.asm
index fe57225eb..33219612e 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -57,7 +57,7 @@ Route32CooltrainerMContinueScene:
closetext
end
-.Unreferenced:
+.GoToSproutTower: ; unreferenced
writetext Route32CooltrainerMText_UnusedSproutTower
waitbutton
closetext