summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/scripts/maps/BattleTower_BattleRoom.inc4
-rw-r--r--data/scripts/maps/BattleTower_Lobby.inc6
-rw-r--r--data/scripts/maps/MossdeepCity_GameCorner_1F.inc4
-rw-r--r--data/scripts/maps/MossdeepCity_GameCorner_B1F.inc4
-rw-r--r--data/specials.inc16
5 files changed, 17 insertions, 17 deletions
diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc
index 3f1aad4a0..dbab17a8b 100644
--- a/data/scripts/maps/BattleTower_BattleRoom.inc
+++ b/data/scripts/maps/BattleTower_BattleRoom.inc
@@ -16,7 +16,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
addobject 1
applymovement 1, BattleTower_BattleRoom_Movement_160AC0
waitmovement 0
- special sub_8135474
+ special PrintBattleTowerTrainerGreeting
msgbox 0x20234cc, 4
waitmessage
closemessage
@@ -116,7 +116,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94
BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1
fadescreen 1
- special sub_8135C38
+ special BattleTower_SoftReset
end
BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 3227df991..75d4f8731 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -79,7 +79,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
special sub_81358A4
compare RESULT, 6
goto_if_eq BattleTower_Lobby_EventScript_16037D
- special sub_8135E50
+ special AwardBattleTowerRibbons
compare RESULT, 0
goto_if_eq BattleTower_Lobby_EventScript_16037D
message BattleTower_Lobby_Text_19A6BE
@@ -97,7 +97,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D
waitmessage
setvar 0x8004, 13
special sub_8135668
- special sub_8135D84
+ special DetermineBattleTowerPrize
setvar 0x8004, 3
special sub_8135BA0
playse 55
@@ -109,7 +109,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
special sub_8135668
message BattleTower_Lobby_Text_19A4BB
waitmessage
- special sub_8135DEC
+ special GiveBattleTowerPrize
switch RESULT
case 0, BattleTower_Lobby_EventScript_160408
message BattleTower_Lobby_Text_19A506
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index 66ad747f9..cef02df2c 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
@@ -5,7 +5,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52
.byte 0
MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62
- special sub_813601C
+ special ValidateEReaderTrainer
compare RESULT, 1
call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71
end
@@ -16,7 +16,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71
return
MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84
- special sub_813601C
+ special ValidateEReaderTrainer
compare RESULT, 0
call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E
compare 0x40c0, 0
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index 886c64d29..11b3ce7a3 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
@@ -4,7 +4,7 @@ MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55
.byte 0
MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60
- special sub_8134AB4
+ special SetEReaderTrainerGfxId
end
MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64
@@ -15,7 +15,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
lockall
applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9
waitmovement 0
- special sub_81360C0
+ special PrintEReaderTrainerGreeting
msgbox 0x20234cc, 4
closemessage
setvar 0x8004, 2
diff --git a/data/specials.inc b/data/specials.inc
index 6ce9b5b1e..841385233 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -241,19 +241,19 @@ gSpecials::
def_special sub_8134548
def_special sub_81347F8
def_special CheckPartyBattleTowerBanlist
- def_special sub_8135474
- def_special sub_81360C0
+ def_special PrintBattleTowerTrainerGreeting
+ def_special PrintEReaderTrainerGreeting
def_special sub_813556C
def_special sub_8135668
def_special sub_81358A4
def_special sub_8135A14
def_special sub_8135BA0
- def_special sub_8135C38
- def_special sub_8135D84
- def_special sub_8135DEC
- def_special sub_8135E50
+ def_special BattleTower_SoftReset
+ def_special DetermineBattleTowerPrize
+ def_special GiveBattleTowerPrize
+ def_special AwardBattleTowerRibbons
def_special ChooseBattleTowerPlayerParty
- def_special sub_813601C
+ def_special ValidateEReaderTrainer
def_special sub_810F404
def_special ReducePlayerPartyToThree
def_special BedroomPC
@@ -329,7 +329,7 @@ gSpecials::
def_special sp13F_fall_to_last_warp
def_special ShowContestEntryMonPic
def_special sub_80C5164
- def_special sub_8134AB4
+ def_special SetEReaderTrainerGfxId
def_special ScrSpecial_StartSouthernIslandBattle
def_special SetRoute119Weather
def_special SetRoute123Weather