summaryrefslogtreecommitdiff
path: root/data/scripts/maps
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-01-01 13:59:39 -0600
committerMarcus Huderle <huderlem@gmail.com>2018-01-01 17:06:17 -0600
commit7158286302493c6fe34068926b351292af2cb6a9 (patch)
tree6a5266856de549509179018871d850d6ed6c649d /data/scripts/maps
parent56e2fe07d4e46ab73320d33a457802da48f9729a (diff)
Label a bunch more specials
Diffstat (limited to 'data/scripts/maps')
-rw-r--r--data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc8
-rw-r--r--data/scripts/maps/BattleTower_BattleRoom.inc20
-rw-r--r--data/scripts/maps/BattleTower_Elevator.inc2
-rw-r--r--data/scripts/maps/BattleTower_Lobby.inc50
-rw-r--r--data/scripts/maps/CaveOfOrigin_B4F.inc2
-rw-r--r--data/scripts/maps/FallarborTown_House2.inc6
-rw-r--r--data/scripts/maps/FortreeCity_House1.inc10
-rw-r--r--data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc2
-rw-r--r--data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc4
-rw-r--r--data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc2
-rw-r--r--data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc8
-rw-r--r--data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc82
-rw-r--r--data/scripts/maps/MauvilleCity_GameCorner.inc24
-rw-r--r--data/scripts/maps/MossdeepCity_GameCorner_1F.inc2
-rw-r--r--data/scripts/maps/MossdeepCity_GameCorner_B1F.inc2
-rw-r--r--data/scripts/maps/PacifidlogTown_House2.inc8
-rw-r--r--data/scripts/maps/PacifidlogTown_House3.inc10
-rw-r--r--data/scripts/maps/RustboroCity_House1.inc10
-rw-r--r--data/scripts/maps/SlateportCity_House1.inc4
-rw-r--r--data/scripts/maps/SootopolisCity_Gym_1F.inc2
-rw-r--r--data/scripts/maps/SootopolisCity_House8.inc4
21 files changed, 131 insertions, 131 deletions
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
index 343ef4233..9ad419da1 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
@@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect 54
- specialvar RESULT, sub_810F4D4
+ specialvar RESULT, FoundAbandonedShipRoom4Key
compare RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B
waitfieldeffect 54
@@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4
end
AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5
- specialvar RESULT, sub_810F488
+ specialvar RESULT, FoundAbandonedShipRoom1Key
compare RESULT, 1
goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA
delay 20
@@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB
setfieldeffectargument 1, 3
setfieldeffectargument 2, 0
dofieldeffect 54
- specialvar RESULT, sub_810F4FC
+ specialvar RESULT, FoundAbandonedShipRoom6Key
compare RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B
waitfieldeffect 54
@@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23
setfieldeffectargument 1, 6
setfieldeffectargument 2, 0
dofieldeffect 54
- specialvar RESULT, sub_810F4B0
+ specialvar RESULT, FoundAbandonedShipRoom2Key
compare RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B
waitfieldeffect 54
diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc
index 87ba8c01a..7853b3598 100644
--- a/data/scripts/maps/BattleTower_BattleRoom.inc
+++ b/data/scripts/maps/BattleTower_BattleRoom.inc
@@ -23,16 +23,16 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
special ScrSpecial_HealPlayerParty
setvar VAR_SPECIAL_4, 0
setvar VAR_SPECIAL_5, 0
- special sub_813556C
+ special StartSpecialBattle
waitstate
switch RESULT
case 1, BattleTower_BattleRoom_EventScript_160961
special LoadPlayerParty
setvar VAR_SPECIAL_4, 0
setvar VAR_SPECIAL_5, 5
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_SPECIAL_4, 14
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_SPECIAL_4, 3
special sub_810FF60
warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6
@@ -40,7 +40,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
BattleTower_BattleRoom_EventScript_160961:: @ 8160961
setvar VAR_SPECIAL_4, 6
- special sub_8135668
+ special SetBattleTowerProperty
switch RESULT
case 8, BattleTower_BattleRoom_EventScript_160A56
applymovement 1, BattleTower_BattleRoom_Movement_160AC6
@@ -53,7 +53,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961
msgbox BattleTower_BattleRoom_Text_19ACDC, 4
special LoadPlayerParty
special SavePlayerParty
- special sub_8135A14
+ special SetBattleTowerParty
playfanfare 368
waitfanfare
special ScrSpecial_HealPlayerParty
@@ -91,14 +91,14 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56
special LoadPlayerParty
setvar VAR_SPECIAL_4, 0
setvar VAR_SPECIAL_5, 4
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_SPECIAL_4, 2
setvar VAR_SPECIAL_5, 1
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_SPECIAL_4, 7
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_SPECIAL_4, 14
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_SPECIAL_4, 3
special sub_810FF60
warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6
@@ -106,7 +106,7 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56
BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94
setvar VAR_SPECIAL_4, 2
- special sub_8135BA0
+ special SaveBattleTowerProgress
message BattleTower_BattleRoom_Text_1C6CE1
delay 60
waitmessage
diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc
index fccfcdb2c..6749c5623 100644
--- a/data/scripts/maps/BattleTower_Elevator.inc
+++ b/data/scripts/maps/BattleTower_Elevator.inc
@@ -12,7 +12,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4
applymovement 1, BattleTower_Elevator_Movement_160835
applymovement 255, BattleTower_Elevator_Movement_160839
waitmovement 0
- special sub_810EBEC
+ special ShakeScreenInElevator
waitstate
delay 64
applymovement 1, BattleTower_Elevator_Movement_16083D
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 527bae389..4058d5aae 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -6,18 +6,18 @@ BattleTower_Lobby_MapScripts:: @ 816027E
.byte 0
BattleTower_Lobby_MapScript1_160293:: @ 8160293
- special sub_813610C
+ special TryEnableBravoTrainerBattleTower
call BattleTower_Lobby_EventScript_16029C
end
BattleTower_Lobby_EventScript_16029C:: @ 816029C
setvar VAR_SPECIAL_4, 10
- special sub_8135668
+ special SetBattleTowerProperty
checkflag FLAG_RECEIVED_GOLD_SHIELD
goto_if_eq BattleTower_Lobby_EventScript_1602E4
checkflag FLAG_RECEIVED_SILVER_SHIELD
goto_if_eq BattleTower_Lobby_EventScript_1602CD
- specialvar VAR_SPECIAL_7, sub_810F404
+ specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
compare VAR_SPECIAL_7, 50
goto_if 0, BattleTower_Lobby_EventScript_1602E4
clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
@@ -25,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C
return
BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
- specialvar VAR_SPECIAL_7, sub_810F404
+ specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
compare VAR_SPECIAL_7, 100
goto_if 0, BattleTower_Lobby_EventScript_1602E4
clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
@@ -76,7 +76,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
message BattleTower_Lobby_Text_19A487
waitmessage
setvar VAR_SPECIAL_4, 0
- special sub_81358A4
+ special BattleTowerUtil
compare RESULT, 6
goto_if_eq BattleTower_Lobby_EventScript_16037D
special AwardBattleTowerRibbons
@@ -90,23 +90,23 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
BattleTower_Lobby_EventScript_16037D:: @ 816037D
setvar VAR_SPECIAL_4, 8
- special sub_81358A4
+ special BattleTowerUtil
compare RESULT, 1
goto_if_eq BattleTower_Lobby_EventScript_1603AD
message BattleTower_Lobby_Text_19A589
waitmessage
setvar VAR_SPECIAL_4, 13
- special sub_8135668
+ special SetBattleTowerProperty
special DetermineBattleTowerPrize
setvar VAR_SPECIAL_4, 3
- special sub_8135BA0
+ special SaveBattleTowerProgress
playse 55
waitse
BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
setvar VAR_SPECIAL_4, 0
setvar VAR_SPECIAL_5, 3
- special sub_8135668
+ special SetBattleTowerProperty
message BattleTower_Lobby_Text_19A4BB
waitmessage
special GiveBattleTowerPrize
@@ -117,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
playfanfare 370
waitfanfare
setvar VAR_SPECIAL_4, 9
- special sub_81358A4
+ special BattleTowerUtil
compare RESULT, 49
goto_if 5, BattleTower_Lobby_EventScript_1603F8
msgbox BattleTower_Lobby_Text_19A617, 4
@@ -145,9 +145,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419
message BattleTower_Lobby_Text_19A589
waitmessage
setvar VAR_SPECIAL_4, 13
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_SPECIAL_4, 0
- special sub_8135BA0
+ special SaveBattleTowerProgress
playse 55
waitse
msgbox BattleTower_Lobby_Text_199FA9, 4
@@ -165,15 +165,15 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B
message BattleTower_Lobby_Text_19A5CE
waitmessage
setvar VAR_SPECIAL_4, 1
- special sub_8135BA0
+ special SaveBattleTowerProgress
playse 55
waitse
setvar VAR_SPECIAL_4, 8
setvar VAR_SPECIAL_5, 0
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_TEMP_0, 5
special SavePlayerParty
- special sub_8135A14
+ special SetBattleTowerParty
msgbox BattleTower_Lobby_Text_19A0A8, 4
closemessage
call BattleTower_Lobby_EventScript_160664
@@ -185,7 +185,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E
lock
faceplayer
setvar VAR_SPECIAL_4, 0
- special sub_81358A4
+ special BattleTowerUtil
compare RESULT, 6
goto_if_eq BattleTower_Lobby_EventScript_160342
special SavePlayerParty
@@ -214,7 +214,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
setvar VAR_SPECIAL_4, 1
copyvar VAR_SPECIAL_5, RESULT
copyvar VAR_SPECIAL_6, RESULT
- special sub_8135668
+ special SetBattleTowerProperty
msgbox BattleTower_Lobby_Text_19A07B, 4
fadescreen 1
special ChooseBattleTowerPlayerParty
@@ -229,16 +229,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
BattleTower_Lobby_EventScript_160587:: @ 8160587
setvar VAR_SPECIAL_4, 5
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_TEMP_0, 0
setvar VAR_SPECIAL_4, 11
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_SPECIAL_4, 0
setvar VAR_SPECIAL_5, 1
- special sub_8135668
+ special SetBattleTowerProperty
setvar VAR_SPECIAL_4, 8
setvar VAR_SPECIAL_5, 0
- special sub_8135668
+ special SetBattleTowerProperty
special LoadPlayerParty
closemessage
delay 2
@@ -249,7 +249,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
goto_if_eq BattleTower_Lobby_EventScript_160642
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
special SavePlayerParty
- special sub_8135A14
+ special SetBattleTowerParty
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
msgbox BattleTower_Lobby_Text_19A0A8, 4
closemessage
@@ -277,7 +277,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635
BattleTower_Lobby_EventScript_160642:: @ 8160642
setvar VAR_SPECIAL_4, 12
- special sub_8135668
+ special SetBattleTowerProperty
goto BattleTower_Lobby_EventScript_160652
BattleTower_Lobby_EventScript_16064F:: @ 816064F
@@ -286,7 +286,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F
BattleTower_Lobby_EventScript_160652:: @ 8160652
msgbox BattleTower_Lobby_Text_199FA9, 4
setvar VAR_SPECIAL_4, 11
- special sub_8135668
+ special SetBattleTowerProperty
BattleTower_Lobby_EventScript_160662:: @ 8160662
release
@@ -402,7 +402,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733
end
BattleTower_Lobby_EventScript_160773:: @ 8160773
- specialvar RESULT, sub_810F404
+ specialvar RESULT, GetBestBattleTowerStreak
compare RESULT, 100
goto_if 0, BattleTower_Lobby_EventScript_1607C5
msgbox BattleTower_Lobby_Text_19AAC4, 4
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index ee702c102..669b0a5fe 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -65,7 +65,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
special ScrSpecial_StartGroudonKyogreBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
- specialvar RESULT, sub_810E300
+ specialvar RESULT, GetBattleOutcome
compare RESULT, 1
call_if 1, CaveOfOrigin_B4F_EventScript_15DE73
setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc
index 081850326..0546ef5be 100644
--- a/data/scripts/maps/FallarborTown_House2.inc
+++ b/data/scripts/maps/FallarborTown_House2.inc
@@ -24,11 +24,11 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6
FallarborTown_House2_EventScript_153CE4:: @ 8153CE4
msgbox FallarborTown_House2_Text_177C3F, 4
- special sub_80F9A4C
+ special SelectMoveTutorMon
waitstate
compare VAR_SPECIAL_4, 255
goto_if_eq FallarborTown_House2_EventScript_153D60
- special sub_80FA148
+ special IsSelectedMonEgg
compare RESULT, 1
goto_if_eq FallarborTown_House2_EventScript_153D52
compare VAR_SPECIAL_5, 0
@@ -38,7 +38,7 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4
FallarborTown_House2_EventScript_153D1A:: @ 8153D1A
msgbox FallarborTown_House2_Text_177C5D, 4
- special sub_8132670
+ special TeachMoveTutorMove
waitstate
compare VAR_SPECIAL_4, 0
goto_if_eq FallarborTown_House2_EventScript_153CE4
diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc
index aee4141a8..f6f8aafa6 100644
--- a/data/scripts/maps/FortreeCity_House1.inc
+++ b/data/scripts/maps/FortreeCity_House1.inc
@@ -8,25 +8,25 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13
goto_if_eq FortreeCity_House1_EventScript_157EAD
setvar VAR_SPECIAL_8, 1
copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
- specialvar RESULT, sub_804D89C
+ specialvar RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_SPECIAL_9, RESULT
msgbox FortreeCity_House1_Text_18568C, 5
compare RESULT, 0
goto_if_eq FortreeCity_House1_EventScript_157E95
- special sub_80F9A0C
+ special SelectMonForNPCTrade
waitstate
copyvar VAR_SPECIAL_A, VAR_SPECIAL_4
compare VAR_SPECIAL_4, 255
goto_if_eq FortreeCity_House1_EventScript_157E95
copyvar VAR_SPECIAL_5, VAR_SPECIAL_A
- specialvar RESULT, sub_804DB2C
+ specialvar RESULT, GetTradeSpecies
copyvar VAR_SPECIAL_B, RESULT
compare RESULT, VAR_SPECIAL_9
goto_if 5, FortreeCity_House1_EventScript_157E9F
copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
copyvar VAR_SPECIAL_5, VAR_SPECIAL_A
- special sub_804DB68
- special sub_804E174
+ special CreateInGameTradePokemon
+ special DoInGameTradeScene
waitstate
bufferspeciesname 0, VAR_SPECIAL_9
msgbox FortreeCity_House1_Text_1856F7, 4
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index 00a10b655..7e221122b 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
@@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
checkflag FLAG_TEMP_2
call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
- specialvar RESULT, sub_8090FC0
+ specialvar RESULT, CompletedHoennPokedex
compare RESULT, 1
goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0
release
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
index 8233504dd..1198054f0 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C
checkflag FLAG_TEMP_2
call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF
copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR
- special sub_810E944
+ special DisplayCurrentElevatorFloor
message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6
waitmessage
multichoice 0, 0, 57, 0
@@ -74,7 +74,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8
erasebox 0, 0, 29, 19
applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845
waitmovement 0
- special sub_810EBEC
+ special ShakeScreenInElevator
waitstate
setflag FLAG_TEMP_2
return
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
index a9680e3a5..d4dedb0c2 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
@@ -21,7 +21,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
waitmessage
special RetrieveLotteryNumber
copyvar VAR_SPECIAL_8, RESULT
- special sub_810F9AC
+ special BufferLottoTicketNumber
msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4
applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843
waitmovement 0
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
index 1024d30e9..a3c8d23af 100644
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
@@ -14,11 +14,11 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE
LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4
- special sub_80F9A0C
+ special SelectMonForNPCTrade
waitstate
compare VAR_SPECIAL_4, 255
goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B
- special sub_80FA148
+ special IsSelectedMonEgg
compare RESULT, 1
goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71
special ScrSpecial_CountPokemonMoves
@@ -26,7 +26,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64
msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
fadescreen 1
- special sub_80F9EEC
+ special SelectMove
fadescreen 0
compare VAR_SPECIAL_5, 4
goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
@@ -39,7 +39,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
end
LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
- special sub_80FA0DC
+ special DeleteMonMove
playfanfare 378
waitfanfare
msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
index 2db702ffc..4656f0182 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
@@ -68,37 +68,37 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412
end
LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429
- special sub_810FCE8
+ special UpdateMovedLilycoveFanClubMembers
setvar VAR_SPECIAL_4, 8
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5
setvar VAR_SPECIAL_4, 9
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD
setvar VAR_SPECIAL_4, 10
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5
setvar VAR_SPECIAL_4, 11
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED
setvar VAR_SPECIAL_4, 12
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5
setvar VAR_SPECIAL_4, 13
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD
setvar VAR_SPECIAL_4, 14
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505
setvar VAR_SPECIAL_4, 15
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D
end
@@ -147,13 +147,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F
lock
faceplayer
setvar VAR_SPECIAL_4, 13
- special sub_810FDAC
+ special BufferStreakTrainerText
compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 7
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4
@@ -161,7 +161,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F
end
LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4
@@ -187,13 +187,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6
lock
faceplayer
setvar VAR_SPECIAL_4, 8
- special sub_810FDAC
+ special BufferStreakTrainerText
compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 7
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4
@@ -201,7 +201,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6
end
LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4
@@ -227,13 +227,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D
lock
faceplayer
setvar VAR_SPECIAL_4, 9
- special sub_810FDAC
+ special BufferStreakTrainerText
compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 7
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4
@@ -241,7 +241,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D
end
LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4
@@ -267,13 +267,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694
lock
faceplayer
setvar VAR_SPECIAL_4, 10
- special sub_810FDAC
+ special BufferStreakTrainerText
compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701
- specialvar RESULT, sub_810FD60
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 7
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4
@@ -281,7 +281,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694
end
LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4
@@ -307,11 +307,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B
lock
faceplayer
setvar VAR_SPECIAL_4, 11
- special sub_810FDAC
- specialvar RESULT, sub_810FD60
+ special BufferStreakTrainerText
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 7
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4
@@ -319,7 +319,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B
end
LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4
@@ -340,11 +340,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D
lock
faceplayer
setvar VAR_SPECIAL_4, 12
- special sub_810FDAC
- specialvar RESULT, sub_810FD60
+ special BufferStreakTrainerText
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 7
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4
@@ -352,7 +352,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D
end
LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4
@@ -373,11 +373,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF
lock
faceplayer
setvar VAR_SPECIAL_4, 14
- special sub_810FDAC
- specialvar RESULT, sub_810FD60
+ special BufferStreakTrainerText
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 7
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4
@@ -385,7 +385,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF
end
LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4
@@ -406,11 +406,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831
lock
faceplayer
setvar VAR_SPECIAL_4, 15
- special sub_810FDAC
- specialvar RESULT, sub_810FD60
+ special BufferStreakTrainerText
+ specialvar RESULT, ShouldMoveLilycoveFanClubMember
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 7
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4
@@ -418,7 +418,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831
end
LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865
- specialvar RESULT, sub_810FCB0
+ specialvar RESULT, GetNumMovedLilycoveFanClubMembers
compare RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc
index 6befb5fb9..c2b785254 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/scripts/maps/MauvilleCity_GameCorner.inc
@@ -525,7 +525,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 0
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -536,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 1
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -547,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 2
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -558,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 3
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -569,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 4
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -580,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 5
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -591,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 6
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -602,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 7
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -613,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 8
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -624,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 9
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -635,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 10
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
@@ -646,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar VAR_SPECIAL_4, 11
- specialvar RESULT, sub_810F424
+ specialvar RESULT, GetSlotMachineId
playslotmachine RESULT
releaseall
end
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index 1e7c26511..ad3b366a8 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
@@ -92,7 +92,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42
MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
special SavePlayerParty
- special sub_810F414
+ special BufferEReaderTrainerName
msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5
compare RESULT, 0
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index 9395633e7..9f20b6310 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
@@ -20,7 +20,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
closemessage
setvar VAR_SPECIAL_4, 2
setvar VAR_SPECIAL_5, 0
- special sub_813556C
+ special StartSpecialBattle
waitstate
compare RESULT, 3
call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc
index f073201ca..df7f42a8b 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/scripts/maps/PacifidlogTown_House2.inc
@@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4
checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
goto_if 0, PacifidlogTown_House2_EventScript_1A14DC
- specialvar RESULT, sub_810F908
+ specialvar RESULT, GetDaysUntilPacifidlogTMAvailable
compare RESULT, 0
call_if 1, PacifidlogTown_House2_EventScript_1541E8
return
@@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC
compare RESULT, 0
goto_if_eq PacifidlogTown_House2_EventScript_1A029B
setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
- special sub_810F950
+ special SetPacifidlogTMReceivedDay
msgbox PacifidlogTown_House2_Text_179283, 4
release
end
@@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225
compare RESULT, 0
goto_if_eq PacifidlogTown_House2_EventScript_1A029B
setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
- special sub_810F950
+ special SetPacifidlogTMReceivedDay
msgbox PacifidlogTown_House2_Text_179283, 4
release
end
PacifidlogTown_House2_EventScript_154254:: @ 8154254
- specialvar RESULT, sub_810F908
+ specialvar RESULT, GetDaysUntilPacifidlogTMAvailable
buffernumberstring 0, RESULT
msgbox PacifidlogTown_House2_Text_1792F2, 4
release
diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc
index b65c2e67d..f5f93f05a 100644
--- a/data/scripts/maps/PacifidlogTown_House3.inc
+++ b/data/scripts/maps/PacifidlogTown_House3.inc
@@ -8,25 +8,25 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E
goto_if_eq PacifidlogTown_House3_EventScript_154338
setvar VAR_SPECIAL_8, 2
copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
- specialvar RESULT, sub_804D89C
+ specialvar RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_SPECIAL_9, RESULT
msgbox PacifidlogTown_House3_Text_17940E, 5
compare RESULT, 0
goto_if_eq PacifidlogTown_House3_EventScript_154320
- special sub_80F9A0C
+ special SelectMonForNPCTrade
waitstate
copyvar VAR_SPECIAL_A, VAR_SPECIAL_4
compare VAR_SPECIAL_4, 255
goto_if_eq PacifidlogTown_House3_EventScript_154320
copyvar VAR_SPECIAL_5, VAR_SPECIAL_A
- specialvar RESULT, sub_804DB2C
+ specialvar RESULT, GetTradeSpecies
copyvar VAR_SPECIAL_B, RESULT
compare RESULT, VAR_SPECIAL_9
goto_if 5, PacifidlogTown_House3_EventScript_15432A
copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
copyvar VAR_SPECIAL_5, VAR_SPECIAL_A
- special sub_804DB68
- special sub_804E174
+ special CreateInGameTradePokemon
+ special DoInGameTradeScene
waitstate
bufferspeciesname 0, VAR_SPECIAL_9
msgbox PacifidlogTown_House3_Text_1794C4, 4
diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc
index cf91c31bd..2e0d106bb 100644
--- a/data/scripts/maps/RustboroCity_House1.inc
+++ b/data/scripts/maps/RustboroCity_House1.inc
@@ -8,25 +8,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D
goto_if_eq RustboroCity_House1_EventScript_157D13
setvar VAR_SPECIAL_8, 0
copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
- specialvar RESULT, sub_804D89C
+ specialvar RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_SPECIAL_9, RESULT
msgbox RustboroCity_House1_Text_184EBA, 5
compare RESULT, 0
goto_if_eq RustboroCity_House1_EventScript_157CFB
- special sub_80F9A0C
+ special SelectMonForNPCTrade
waitstate
copyvar VAR_SPECIAL_A, VAR_SPECIAL_4
compare VAR_SPECIAL_4, 255
goto_if_eq RustboroCity_House1_EventScript_157CFB
copyvar VAR_SPECIAL_5, VAR_SPECIAL_A
- specialvar RESULT, sub_804DB2C
+ specialvar RESULT, GetTradeSpecies
copyvar VAR_SPECIAL_B, RESULT
compare RESULT, VAR_SPECIAL_9
goto_if 5, RustboroCity_House1_EventScript_157D05
copyvar VAR_SPECIAL_4, VAR_SPECIAL_8
copyvar VAR_SPECIAL_5, VAR_SPECIAL_A
- special sub_804DB68
- special sub_804E174
+ special CreateInGameTradePokemon
+ special DoInGameTradeScene
waitstate
msgbox RustboroCity_House1_Text_184F6B, 4
setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED
diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc
index 2a25ded19..aa1157d7e 100644
--- a/data/scripts/maps/SlateportCity_House1.inc
+++ b/data/scripts/maps/SlateportCity_House1.inc
@@ -13,7 +13,7 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B
SlateportCity_House1_EventScript_15569C:: @ 815569C
msgbox SlateportCity_House1_Text_17D4DB, 4
- special sub_80F9A0C
+ special SelectMonForNPCTrade
waitstate
compare VAR_SPECIAL_4, 255
goto_if 5, SlateportCity_House1_EventScript_1556C9
@@ -34,7 +34,7 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9
special TV_CheckMonOTIDEqualsPlayerID
compare RESULT, 1
goto_if_eq SlateportCity_House1_EventScript_155726
- specialvar RESULT, sub_810F96C
+ specialvar RESULT, MonOTNameMatchesPlayer
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare RESULT, 1
goto_if_eq SlateportCity_House1_EventScript_155726
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index 9f2d6c35b..38514b03b 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -15,7 +15,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22
SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25
call SootopolisCity_Gym_1F_EventScript_15AF2E
- special sub_8069D78
+ special SetSootopolisGymCrackedIceMetatiles
end
SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E
diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc
index 6a72ec1da..91dd3490b 100644
--- a/data/scripts/maps/SootopolisCity_House8.inc
+++ b/data/scripts/maps/SootopolisCity_House8.inc
@@ -6,7 +6,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401
lock
faceplayer
msgbox SootopolisCity_House8_Text_1900F7, 4
- special sub_80F9A0C
+ special SelectMonForNPCTrade
waitstate
copyvar RESULT, VAR_SPECIAL_4
compare RESULT, 255
@@ -55,7 +55,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492
lock
faceplayer
msgbox SootopolisCity_House8_Text_190431, 4
- special sub_80F9A0C
+ special SelectMonForNPCTrade
waitstate
copyvar RESULT, VAR_SPECIAL_4
compare RESULT, 255