ref: 157e5fd4b8eda6377890cabecff7fa99915670f6
parent: 3eed7c4ab0fcf95acad67031b0637ffc0399ac10
author: JimB16 <f1@jimb.de>
date: Mon Aug 24 13:04:13 EDT 2015
changed labels
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -156,7 +156,7 @@
add_special Function11c1ab
add_special Function170687
add_special Special_DisplayUnownWords
- add_special Function17d224
+ add_special Special_Menu_ChallengeExplanationCancel
add_special Function17d2b6
add_special Function17d2ce
add_special Function17f53d
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -59,37 +59,37 @@
keeptextopen
writebyte $0
special Function170687
- if_not_equal $0, UnknownScript_0x9e3fc
+ if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump UnknownScript_0x9e49e
-UnknownScript_0x9e3fc:
- writetext UnknownText_0x9e5ea
+Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
+ writetext Text_WantToGoIntoABattleRoom
writebyte $1
- special Function17d224
- if_equal $1, UnknownScript_0x9e40f
+ special Special_Menu_ChallengeExplanationCancel
+ if_equal $1, Script_ChoseChallenge
if_equal $2, UnknownScript_0x9e4a5
jump UnknownScript_0x9e4b0
-UnknownScript_0x9e40f:
+Script_ChoseChallenge: ; 0x9e40f
writebyte $1a
special Function170687
special SpecialCheckForBattleTowerRules
- if_not_equal $0, UnknownScript_0x9e4bb
- writetext UnknownText_0x9ef1f
+ if_not_equal $0, Script_CloseText
+ writetext Text_SaveBeforeEnteringBattleRoom
yesorno
- iffalse UnknownScript_0x9e3fc
+ iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $0
special Special_TryQuickSave
- iffalse UnknownScript_0x9e3fc
+ iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $1
writebyte $1
special Function170687
special Function1700b0
- if_equal $a, UnknownScript_0x9e3fc
+ if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, UnknownScript_0x9e550
writebyte $11
special Function170687
- writetext UnknownText_0x9e60a
+ writetext Text_RightThisWayToYourBattleRoom
closetext
loadmovesprites
writebyte $1e
@@ -145,7 +145,7 @@
UnknownScript_0x9e4a8:
writebyte $1
special Function170687
- jump UnknownScript_0x9e3fc
+ jump Script_Menu_ChallengeExplanationCancel
UnknownScript_0x9e4b0:
writetext UnknownText_0x9ec09
@@ -158,7 +158,7 @@
loadmovesprites
end
-UnknownScript_0x9e4bb:
+Script_CloseText: ; 0x9e4bb
closetext
loadmovesprites
end
@@ -165,15 +165,15 @@
UnknownScript_0x9e4be:
- writetext UnknownText_0x9ef1f
+ writetext Text_SaveBeforeEnteringBattleRoom
yesorno
- iffalse UnknownScript_0x9e3fc
+ iffalse Script_Menu_ChallengeExplanationCancel
special Special_TryQuickSave
- iffalse UnknownScript_0x9e3fc
+ iffalse Script_Menu_ChallengeExplanationCancel
writebyte $1
special Function170687
special Function1700ba
- if_equal $a, UnknownScript_0x9e3fc
+ if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, UnknownScript_0x9e550
writetext UnknownText_0x9e9eb
spriteface $2, LEFT
@@ -191,7 +191,7 @@
special Function170687
if_not_equal $0, UnknownScript_0x9e549
special SpecialCheckForBattleTowerRules
- if_not_equal $0, UnknownScript_0x9e4bb
+ if_not_equal $0, Script_CloseText
writebyte $5
special Function170687
if_equal $0, UnknownScript_0x9e512
@@ -202,19 +202,19 @@
writetext UnknownText_0x9ec6d
UnknownScript_0x9e515:
yesorno
- iffalse UnknownScript_0x9e3fc
+ iffalse Script_Menu_ChallengeExplanationCancel
writetext UnknownText_0x9ef79
yesorno
- iffalse UnknownScript_0x9e3fc
+ iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $0
special Special_TryQuickSave
- iffalse UnknownScript_0x9e3fc
+ iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $1
writebyte $6
special Function170687
writebyte $12
special Function170687
- writetext UnknownText_0x9e60a
+ writetext Text_RightThisWayToYourBattleRoom
closetext
jump UnknownScript_0x9e44e
@@ -226,12 +226,12 @@
UnknownScript_0x9e542:
writetext UnknownText_0x9f1e5
closetext
- jump UnknownScript_0x9e3fc
+ jump Script_Menu_ChallengeExplanationCancel
UnknownScript_0x9e549:
writetext UnknownText_0x9f217
closetext
- jump UnknownScript_0x9e3fc
+ jump Script_Menu_ChallengeExplanationCancel
UnknownScript_0x9e550:
special Function17f53d
@@ -354,12 +354,12 @@
line "to a BATTLE ROOM."
done
-UnknownText_0x9e5ea:
+Text_WantToGoIntoABattleRoom: ; 0x9e5ea
text "Want to go into a"
line "BATTLE ROOM?"
done
-UnknownText_0x9e60a:
+Text_RightThisWayToYourBattleRoom: ; 0x9e60a
text "Right this way to"
line "your BATTLE ROOM."
done
@@ -556,7 +556,7 @@
line "way."
done
-UnknownText_0x9ec3d:
+UnknownText_0x9ec3d: ; 0x9ec3d
text "Would you like to"
line "hear about the"
cont "BATTLE TOWER?"
@@ -647,7 +647,7 @@
line "the CENTER."
done
-UnknownText_0x9ef1f:
+Text_SaveBeforeEnteringBattleRoom: ; 0x9ef1f
text "Before entering"
line "the BATTLE ROOM,"
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -23500,38 +23500,38 @@
Jumptable_170696: ; 170696 (5c:4696)
- dw Function17075f
- dw Function170788
- dw Function170778
- dw Function170799
- dw Function17079d
- dw Function1707ac
- dw Function1707f4
- dw Function170868
- dw Function170881
- dw Function17089a
- dw Function1708b1
- dw Function1708b9
- dw Function1708c8
- dw Function1708f0
- dw Function17093c
- dw Function1709aa
- dw Function1709bb
- dw Function170a9c
- dw Function170aa0
- dw Function170aaf
- dw Function170abe
- dw Function170ad7
- dw Function170807
- dw Function17081d
- dw Function170ae8
- dw Function170b16
- dw Function1706d6
- dw Function1706ee
- dw Function17071b
- dw Function170729
- dw Function17073e
- dw Function170737
+ dw Function17075f ; 0x00
+ dw Function170788 ; 0x01
+ dw Function170778 ; 0x02
+ dw Function170799 ; 0x03
+ dw Function17079d ; 0x04
+ dw Function1707ac ; 0x05
+ dw Function1707f4 ; 0x06
+ dw Function170868 ; 0x07
+ dw Function170881 ; 0x08
+ dw Function17089a ; 0x09
+ dw Function1708b1 ; 0x0a
+ dw Function1708b9 ; 0x0b
+ dw Function1708c8 ; 0x0c
+ dw Function1708f0 ; 0x0d
+ dw Function17093c ; 0x0e
+ dw Function1709aa ; 0x0f
+ dw Function1709bb ; 0x10
+ dw Function170a9c ; 0x11
+ dw Function170aa0 ; 0x12
+ dw Function170aaf ; 0x13
+ dw Function170abe ; 0x14
+ dw Function170ad7 ; 0x15
+ dw Function170807 ; 0x16
+ dw Function17081d ; 0x17
+ dw Function170ae8 ; 0x18
+ dw Function170b16 ; 0x19
+ dw Function1706d6 ; 0x1a
+ dw Function1706ee ; 0x1b
+ dw Function17071b ; 0x1c
+ dw Function170729 ; 0x1d
+ dw Function17073e ; 0x1e
+ dw Function170737 ; 0x1f
Function1706d6: ; 1706d6 (5c:46d6)
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -425,7 +425,7 @@
ret
; 17d224
-Function17d224: ; 17d224
+Special_Menu_ChallengeExplanationCancel: ; 17d224
ld a, [ScriptVar]
and a
jr nz, .asm_17d234