You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
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".
This commit is contained in:
@@ -161,7 +161,7 @@ SpecialsPointers:: ; c029
|
|||||||
add_special Special_Menu_ChallengeExplanationCancel
|
add_special Special_Menu_ChallengeExplanationCancel
|
||||||
add_special Function17d2b6
|
add_special Function17d2b6
|
||||||
add_special Function17d2ce
|
add_special Function17d2ce
|
||||||
add_special Function17f53d
|
add_special BattleTowerMobileError
|
||||||
add_special AskMobileOrCable
|
add_special AskMobileOrCable
|
||||||
add_special SpecialHoOhChamber
|
add_special SpecialHoOhChamber
|
||||||
add_special Function102142
|
add_special Function102142
|
||||||
|
@@ -91,7 +91,7 @@ Script_ChooseChallenge: ; 0x9e40f
|
|||||||
special BattleTowerAction
|
special BattleTowerAction
|
||||||
special BattleTowerRoomMenu
|
special BattleTowerRoomMenu
|
||||||
if_equal $a, Script_Menu_ChallengeExplanationCancel
|
if_equal $a, Script_Menu_ChallengeExplanationCancel
|
||||||
if_not_equal $0, UnknownScript_0x9e550
|
if_not_equal $0, Script_MobileError
|
||||||
writebyte BATTLETOWERACTION_11
|
writebyte BATTLETOWERACTION_11
|
||||||
special BattleTowerAction
|
special BattleTowerAction
|
||||||
writetext Text_RightThisWayToYourBattleRoom
|
writetext Text_RightThisWayToYourBattleRoom
|
||||||
@@ -159,7 +159,7 @@ Script_BattleTowerHopeToServeYouAgain:
|
|||||||
end
|
end
|
||||||
|
|
||||||
UnreferencedScript_0x9e4b6:
|
UnreferencedScript_0x9e4b6:
|
||||||
special Function17f53d
|
special BattleTowerMobileError
|
||||||
closetext
|
closetext
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -178,7 +178,7 @@ UnreferencedScript_0x9e4be:
|
|||||||
special BattleTowerAction
|
special BattleTowerAction
|
||||||
special Function1700ba
|
special Function1700ba
|
||||||
if_equal $a, Script_Menu_ChallengeExplanationCancel
|
if_equal $a, Script_Menu_ChallengeExplanationCancel
|
||||||
if_not_equal $0, UnknownScript_0x9e550
|
if_not_equal $0, Script_MobileError
|
||||||
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
|
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
|
||||||
spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
|
spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
|
||||||
writetext Text_PleaseConfirmOnThisMonitor
|
writetext Text_PleaseConfirmOnThisMonitor
|
||||||
@@ -237,8 +237,8 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549
|
|||||||
waitbutton
|
waitbutton
|
||||||
jump Script_Menu_ChallengeExplanationCancel
|
jump Script_Menu_ChallengeExplanationCancel
|
||||||
|
|
||||||
UnknownScript_0x9e550:
|
Script_MobileError:
|
||||||
special Function17f53d
|
special BattleTowerMobileError
|
||||||
closetext
|
closetext
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@@ -326,7 +326,7 @@ Function10020b: ; 10020b
|
|||||||
ld a, $01
|
ld a, $01
|
||||||
ld [rSVBK], a
|
ld [rSVBK], a
|
||||||
|
|
||||||
callba Function17f555
|
callba DisplayMobileError
|
||||||
|
|
||||||
pop af
|
pop af
|
||||||
ld [rSVBK], a
|
ld [rSVBK], a
|
||||||
|
@@ -7533,7 +7533,7 @@ Function117bb6:
|
|||||||
.asm_117bd0
|
.asm_117bd0
|
||||||
ld a, $2
|
ld a, $2
|
||||||
ld [wc303], a
|
ld [wc303], a
|
||||||
callba Function17f555
|
callba DisplayMobileError
|
||||||
ld a, $80
|
ld a, $80
|
||||||
ld [wJumptableIndex], a
|
ld [wJumptableIndex], a
|
||||||
ret
|
ret
|
||||||
|
@@ -658,7 +658,7 @@ Function171c41: ; 171c41 (5c:5c41)
|
|||||||
callba Function106464
|
callba Function106464
|
||||||
ld a, $2
|
ld a, $2
|
||||||
ld [wc303], a
|
ld [wc303], a
|
||||||
callba Function17f555
|
callba DisplayMobileError
|
||||||
asm_171c60: ; 171c60 (5c:5c60)
|
asm_171c60: ; 171c60 (5c:5c60)
|
||||||
ld a, $80
|
ld a, $80
|
||||||
ld [wcd49], a
|
ld [wcd49], a
|
||||||
|
@@ -3003,7 +3003,7 @@ Function17e309: ; 17e309
|
|||||||
call ClearScreen
|
call ClearScreen
|
||||||
call Function17e349
|
call Function17e349
|
||||||
call Function17d5f6
|
call Function17d5f6
|
||||||
callba Function17f555
|
callba DisplayMobileError
|
||||||
call Function17e349
|
call Function17e349
|
||||||
call Function17dcaf
|
call Function17dcaf
|
||||||
xor a
|
xor a
|
||||||
@@ -4623,7 +4623,7 @@ Function17f524: ; 17f524
|
|||||||
jr .asm_17f536
|
jr .asm_17f536
|
||||||
; 17f53d
|
; 17f53d
|
||||||
|
|
||||||
Function17f53d: ; 17f53d
|
BattleTowerMobileError: ; 17f53d
|
||||||
call FadeToMenu
|
call FadeToMenu
|
||||||
xor a
|
xor a
|
||||||
ld [wc303], a
|
ld [wc303], a
|
||||||
@@ -4632,7 +4632,7 @@ Function17f53d: ; 17f53d
|
|||||||
ld a, $1
|
ld a, $1
|
||||||
ld [rSVBK], a
|
ld [rSVBK], a
|
||||||
|
|
||||||
call Function17f555
|
call DisplayMobileError
|
||||||
|
|
||||||
pop af
|
pop af
|
||||||
ld [rSVBK], a
|
ld [rSVBK], a
|
||||||
@@ -4640,7 +4640,7 @@ Function17f53d: ; 17f53d
|
|||||||
ret
|
ret
|
||||||
; 17f555
|
; 17f555
|
||||||
|
|
||||||
Function17f555: ; 17f555
|
DisplayMobileError: ; 17f555
|
||||||
.loop
|
.loop
|
||||||
call JoyTextDelay
|
call JoyTextDelay
|
||||||
call .RunJumptable
|
call .RunJumptable
|
||||||
|
Reference in New Issue
Block a user