summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2017-11-26 11:35:13 +0100
committermid-kid <esteve.varela@gmail.com>2017-11-26 11:35:13 +0100
commit09d9f2c1ef48b0e33ba1616d7a3459f5d4431ce3 (patch)
tree83540e81ac5115575520cbc9715a933e6aed9922
parent89d6a246443d068c13d1c2413f9a70464b235d53 (diff)
Add MobileError-related labels
This function is called from a few different places in the mobile code, including from one special that is only executed when the BattleTowerRoomMenu special returns with a non-zero code. Since that special causes a blue "error" screen to appear, that looks the exact same as the one you'd get when trying to connect from the mobile trade corner/battle colosseum in a Pokémon Center's top floor, and this function contains a bunch of japanese strings in a jumptable, I think it's reasonable to assume it should be called "DisplayMobileError".
-rw-r--r--engine/specials.asm2
-rw-r--r--maps/BattleTower1F.asm10
-rw-r--r--misc/mobile_40.asm2
-rw-r--r--misc/mobile_45.asm2
-rwxr-xr-xmisc/mobile_5c.asm2
-rw-r--r--misc/mobile_5f.asm8
6 files changed, 13 insertions, 13 deletions
diff --git a/engine/specials.asm b/engine/specials.asm
index eeb012f7a..2548cf076 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -161,7 +161,7 @@ SpecialsPointers:: ; c029
add_special Special_Menu_ChallengeExplanationCancel
add_special Function17d2b6
add_special Function17d2ce
- add_special Function17f53d
+ add_special BattleTowerMobileError
add_special AskMobileOrCable
add_special SpecialHoOhChamber
add_special Function102142
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 4b251aa66..6cf6bdd50 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -91,7 +91,7 @@ Script_ChooseChallenge: ; 0x9e40f
special BattleTowerAction
special BattleTowerRoomMenu
if_equal $a, Script_Menu_ChallengeExplanationCancel
- if_not_equal $0, UnknownScript_0x9e550
+ if_not_equal $0, Script_MobileError
writebyte BATTLETOWERACTION_11
special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
@@ -159,7 +159,7 @@ Script_BattleTowerHopeToServeYouAgain:
end
UnreferencedScript_0x9e4b6:
- special Function17f53d
+ special BattleTowerMobileError
closetext
end
@@ -178,7 +178,7 @@ UnreferencedScript_0x9e4be:
special BattleTowerAction
special Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel
- if_not_equal $0, UnknownScript_0x9e550
+ if_not_equal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
writetext Text_PleaseConfirmOnThisMonitor
@@ -237,8 +237,8 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549
waitbutton
jump Script_Menu_ChallengeExplanationCancel
-UnknownScript_0x9e550:
- special Function17f53d
+Script_MobileError:
+ special BattleTowerMobileError
closetext
end
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 33dbdb091..8cd0311f0 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -326,7 +326,7 @@ Function10020b: ; 10020b
ld a, $01
ld [rSVBK], a
- callba Function17f555
+ callba DisplayMobileError
pop af
ld [rSVBK], a
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 0bfc7da38..d6743acc2 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -7533,7 +7533,7 @@ Function117bb6:
.asm_117bd0
ld a, $2
ld [wc303], a
- callba Function17f555
+ callba DisplayMobileError
ld a, $80
ld [wJumptableIndex], a
ret
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 7704794cf..2f1f1555c 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -658,7 +658,7 @@ Function171c41: ; 171c41 (5c:5c41)
callba Function106464
ld a, $2
ld [wc303], a
- callba Function17f555
+ callba DisplayMobileError
asm_171c60: ; 171c60 (5c:5c60)
ld a, $80
ld [wcd49], a
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index e94a51ad8..061b1357f 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -3003,7 +3003,7 @@ Function17e309: ; 17e309
call ClearScreen
call Function17e349
call Function17d5f6
- callba Function17f555
+ callba DisplayMobileError
call Function17e349
call Function17dcaf
xor a
@@ -4623,7 +4623,7 @@ Function17f524: ; 17f524
jr .asm_17f536
; 17f53d
-Function17f53d: ; 17f53d
+BattleTowerMobileError: ; 17f53d
call FadeToMenu
xor a
ld [wc303], a
@@ -4632,7 +4632,7 @@ Function17f53d: ; 17f53d
ld a, $1
ld [rSVBK], a
- call Function17f555
+ call DisplayMobileError
pop af
ld [rSVBK], a
@@ -4640,7 +4640,7 @@ Function17f53d: ; 17f53d
ret
; 17f555
-Function17f555: ; 17f555
+DisplayMobileError: ; 17f555
.loop
call JoyTextDelay
call .RunJumptable