pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add MobileError-related labels

Browse Source 
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:
mid-kid 2017-11-26 11:35:13 +01:00
parent 89d6a24644
commit 09d9f2c1ef
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/specials.asm
View File

@ -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

10
maps/BattleTower1F.asm
View File

@ -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

2
misc/mobile_40.asm
View File

@ -326,7 +326,7 @@ Function10020b: ; 10020b
ld a, $01
ld [rSVBK], a
callba Function17f555
callba DisplayMobileError
pop af
ld [rSVBK], a

2
misc/mobile_45.asm
View File

@ -7533,7 +7533,7 @@ Function117bb6:
.asm_117bd0
ld a, $2
ld [wc303], a
callba Function17f555
callba DisplayMobileError
ld a, $80
ld [wJumptableIndex], a
ret

2
misc/mobile_5c.asm
View File

@ -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

8
misc/mobile_5f.asm
View File

@ -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