change more labelss

This commit is contained in:
JimB16
2015-08-25 01:56:30 +02:00
parent 4cd118b149
commit 706f289c70
9 changed files with 112 additions and 100 deletions

View File

@@ -67,7 +67,7 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
writebyte $1
special Special_Menu_ChallengeExplanationCancel
if_equal $1, Script_ChoseChallenge
if_equal $2, UnknownScript_0x9e4a5
if_equal $2, Script_BattleTowerExplanation
jump UnknownScript_0x9e4b0
Script_ChoseChallenge: ; 0x9e40f
@@ -116,7 +116,7 @@ UnknownScript_0x9e454:
warpcheck
end
UnknownScript_0x9e47a:
Script_GivePlayerHisPrize: ; 0x9e47a
writebyte $1c
special Function170687
writebyte $1b
@@ -124,7 +124,7 @@ UnknownScript_0x9e47a:
if_equal $12, Script_YourPackIsStuffedFull
itemtotext $0, $1
giveitem $ff, $5
writetext UnknownText_0x9eb7e
writetext Text_PlayerGotFive
writebyte $1d
special Function170687
loadmovesprites
@@ -140,7 +140,7 @@ Script_BattleTowerIntroductionYesNo: ; 0x9e49e
writetext Text_WouldYouLikeToHearAboutTheBattleTower
yesorno
iffalse UnknownScript_0x9e4a8
UnknownScript_0x9e4a5:
Script_BattleTowerExplanation: ; 0x9e4a5
writetext Text_BattleTowerIntroduction_2
UnknownScript_0x9e4a8:
writebyte $1
@@ -479,7 +479,7 @@ Text_ThankYou: ; 0x9ea3c
para ""
done
UnknownText_0x9ea49:
Text_ThanksForVisiting: ; 0x9ea49
text "Thanks for"
line "visiting!"
done
@@ -502,7 +502,7 @@ UnknownText_0x9ea5f:
para ""
done
UnknownText_0x9eaef:
Text_CongratulationsYouveBeatenAllTheTrainers: ; 0x9eaef
text "Congratulations!"
para "You've beaten all"
@@ -522,7 +522,7 @@ UnknownText_0x9eb45:
line "CENTER?"
done
UnknownText_0x9eb7e:
Text_PlayerGotFive: ; 0x9eb7e
text "<PLAYER> got five"
line "@"
text_from_ram StringBuffer4
@@ -699,7 +699,7 @@ UnknownText_0x9f076:
line "tomorrow."
done
UnknownText_0x9f0c1:
Text_TooMuchTimeElapsedNoRegister: ; 0x9f0c1
text "Sorry, but it's"
line "not possible to"

View File

@@ -3,25 +3,25 @@ BattleTowerBattleRoom_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9f419, $0000
dw Script_EnterBattleRoom, $0000
dw UnknownScript_0x9f420, $0000
.MapCallbacks:
db 0
UnknownScript_0x9f419:
Script_EnterBattleRoom: ; 0x9f419
disappear $2
priorityjump UnknownScript_0x9f421
priorityjump Script_BattleRoom
dotrigger $1
UnknownScript_0x9f420:
end
UnknownScript_0x9f421:
Script_BattleRoom: ; 0x9f421
applymovement PLAYER, MovementData_0x9e58c
UnknownScript_0x9f425:
; beat all 7 opponents in a row
Script_BattleRoomLoop: ; 0x9f425
writebyte $2
special Function170b44
special Function_LoadOpponentTrainerAndPokemons170b44
appear $2
warpsound
waitbutton
@@ -30,12 +30,12 @@ UnknownScript_0x9f425:
storetext 1
keeptextopen
loadmovesprites
special Function170215
special Function170215 ; calls predef startbattle
special FadeBlackBGMap
reloadmap
if_not_equal $0, UnknownScript_0x9f4c2
copybytetovar wcf64
if_equal $7, UnknownScript_0x9f4d9
if_equal $7, Script_BeatenAllTrainers
applymovement $2, MovementData_0x9e597
warpsound
disappear $2
@@ -54,17 +54,17 @@ UnknownScript_0x9f425:
loadfont
writetext Text_NextUpOpponentNo
yesorno
iffalse UnknownScript_0x9f483
UnknownScript_0x9f477:
iffalse Script_DontBattleNextOpponent
Script_ContinueAndBattleNextOpponent: ; 0x9f477
loadmovesprites
applymovement PLAYER, MovementData_0x9e5a9
applymovement $3, MovementData_0x9e5a1
jump UnknownScript_0x9f425
jump Script_BattleRoomLoop
UnknownScript_0x9f483:
Script_DontBattleNextOpponent: ; 0x9f483
writetext Text_SaveAndEndTheSession
yesorno
iffalse UnknownScript_0x9f4a3
iffalse Script_DontSaveAndEndTheSession
writebyte $7
special Function170687
writebyte $1f
@@ -75,10 +75,10 @@ UnknownScript_0x9f483:
waitbutton
special FadeBlackBGMap
special Reset
UnknownScript_0x9f4a3:
Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge
yesorno
iffalse UnknownScript_0x9f477
iffalse Script_ContinueAndBattleNextOpponent
writebyte $4
special Function170687
writebyte $6
@@ -96,25 +96,25 @@ UnknownScript_0x9f4c2:
writebyte $4
special Function170687
loadfont
writetext UnknownText_0x9ea49
writetext Text_ThanksForVisiting
closetext
loadmovesprites
end
UnknownScript_0x9f4d9:
Script_BeatenAllTrainers: ; 0x9f4d9
pause 60
special Special_BattleTowerFade
warpfacing $1, BATTLE_TOWER_1F, $7, $7
BattleTowerBattleRoomScript_0x9f4e4:
loadfont
writetext UnknownText_0x9eaef
jump UnknownScript_0x9e47a
writetext Text_CongratulationsYouveBeatenAllTheTrainers
jump Script_GivePlayerHisPrize
UnknownScript_0x9f4eb:
writebyte $4
special Function170687
loadfont
writetext UnknownText_0x9f0c1
writetext Text_TooMuchTimeElapsedNoRegister
closetext
loadmovesprites
end
@@ -125,7 +125,7 @@ UnknownScript_0x9f4f7:
writebyte $6
special Function170687
loadfont
writetext UnknownText_0x9ea49
writetext Text_ThanksForVisiting
writetext Text_WeHopeToServeYouAgain
closetext
loadmovesprites

View File

@@ -12,14 +12,13 @@ BattleTowerHallway_MapScriptHeader:
UnknownScript_0x9f5bb:
priorityjump UnknownScript_0x9f5c1
dotrigger $1
UnknownScript_0x9f5c0:
end
UnknownScript_0x9f5c1:
follow $2, PLAYER
callasm Function_0x9f5cb
jump UnknownScript_0x9f5dc
jump Script_WalkToChosenBattleRoom
Function_0x9f5cb:
@@ -36,35 +35,38 @@ Function_0x9f5cb:
ret
UnknownScript_0x9f5dc:
if_equal $3, UnknownScript_0x9f603
if_equal $4, UnknownScript_0x9f603
if_equal $5, UnknownScript_0x9f60a
if_equal $6, UnknownScript_0x9f60a
if_equal $7, UnknownScript_0x9f611
if_equal $8, UnknownScript_0x9f611
if_equal $9, UnknownScript_0x9f618
if_equal $a, UnknownScript_0x9f618
; enter different rooms for different levels to battle against
; at least it should look like that
; because all warps lead to the same room
Script_WalkToChosenBattleRoom: ; 0x9f5dc
if_equal 3, Script_WalkToBattleRoomL30L40
if_equal 4, Script_WalkToBattleRoomL30L40
if_equal 5, Script_WalkToBattleRoomL50L60
if_equal 6, Script_WalkToBattleRoomL50L60
if_equal 7, Script_WalkToBattleRoomL70L80
if_equal 8, Script_WalkToBattleRoomL70L80
if_equal 9, Script_WalkToBattleRoomL90L100
if_equal 10, Script_WalkToBattleRoomL90L100
applymovement $2, MovementData_0x9e57a
jump UnknownScript_0x9f61f
jump Script_PlayerEntersBattleRoom
UnknownScript_0x9f603:
Script_WalkToBattleRoomL30L40: ; 0x9f603
applymovement $2, MovementData_0x9e57c
jump UnknownScript_0x9f61f
jump Script_PlayerEntersBattleRoom
UnknownScript_0x9f60a:
Script_WalkToBattleRoomL50L60: ; 0x9f60a
applymovement $2, MovementData_0x9e586
jump UnknownScript_0x9f61f
jump Script_PlayerEntersBattleRoom
UnknownScript_0x9f611:
Script_WalkToBattleRoomL70L80: ; 0x9f611
applymovement $2, MovementData_0x9e584
jump UnknownScript_0x9f61f
jump Script_PlayerEntersBattleRoom
UnknownScript_0x9f618:
Script_WalkToBattleRoomL90L100: ; 0x9f618
applymovement $2, MovementData_0x9e582
jump UnknownScript_0x9f61f
jump Script_PlayerEntersBattleRoom
UnknownScript_0x9f61f:
Script_PlayerEntersBattleRoom: ; 0x9f61f
faceperson PLAYER, $2
loadfont
writetext Text_PleaseStepThisWay