summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-09-13 14:24:07 -0400
committerhuderlem <huderlem@gmail.com>2019-09-17 16:50:17 -0500
commitaac9658a8ee9a23bbb7cf8a56496a49b8cdbe61d (patch)
tree9356521698b20844deb99aee7fecca22b323a4f7 /data
parent06af24bce58b9285166d27fc371ad3c3dbb63a29 (diff)
Document some field_specials data
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s7
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc22
-rw-r--r--data/maps/BattleFrontier_Lounge3/scripts.inc6
-rw-r--r--data/maps/BattleFrontier_Lounge7/scripts.inc24
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/scripts.inc4
-rw-r--r--data/maps/BattleFrontier_ScottsHouse/scripts.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc34
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc4
-rw-r--r--data/maps/MauvilleCity_GameCorner/scripts.inc2
-rw-r--r--data/maps/Route113_GlassWorkshop/scripts.inc4
-rw-r--r--data/maps/SlateportCity/scripts.inc4
-rw-r--r--data/maps/VerdanturfTown_BattleTentLobby/scripts.inc4
-rw-r--r--data/scripts/cable_club.inc4
-rw-r--r--data/specials.inc26
14 files changed, 75 insertions, 72 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index a7ca8ce4f..f4f2169d9 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -7,6 +7,7 @@
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h"
+#include "constants/field_specials.h"
#include "constants/flags.h"
#include "constants/decorations.h"
#include "constants/items.h"
@@ -1505,7 +1506,7 @@ Std_FindItem:: @ 8271BFD
EventScript_PickItemUp:: @ 8271C3A
removeobject VAR_LAST_TALKED
giveitem VAR_0x8004, VAR_0x8005
- specialvar VAR_RESULT, sub_81398C0
+ specialvar VAR_RESULT, BufferTMHMMoveName
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 1
call_if_eq EventScript_271C8F
@@ -1557,7 +1558,7 @@ EventScript_HiddenItemScript:: @ 8271CB7
EventScript_271CE8:: @ 8271CE8
copyvar VAR_0x8008, VAR_0x8004
copyvar VAR_0x8004, VAR_0x8005
- specialvar VAR_RESULT, sub_81398C0
+ specialvar VAR_RESULT, BufferTMHMMoveName
compare VAR_RESULT, 1
goto_if_eq EventScript_271D0E
compare VAR_RESULT, 0
@@ -2945,7 +2946,7 @@ EventScript_Questionnaire:: @ 827381B
call Common_ShowEasyChatScreen
lock
faceplayer
- specialvar VAR_0x8008, sub_813B490
+ specialvar VAR_0x8008, GetMartEmployeeObjectEventId
compare VAR_0x8004, 1
goto_if_eq EventScript_27386D
compare VAR_0x8004, 2
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
index 3ebb57ff9..1f0b1be93 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
@@ -13,7 +13,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D
end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A
- specialvar VAR_TEMP_1, sub_813AA04
+ specialvar VAR_TEMP_1, GetFrontierBattlePoints
compare VAR_TEMP_1, VAR_0x8008
goto_if_ge BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT
@@ -39,7 +39,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D
copyvar VAR_0x8004, VAR_0x8008
- special sub_813A9A4
+ special TakeFrontierBattlePoints
givedecoration VAR_0x8009
special sub_813A8FC
playse SE_REGI
@@ -60,7 +60,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166
copyvar VAR_0x8004, VAR_0x8008
- special sub_813A9A4
+ special TakeFrontierBattlePoints
giveitem VAR_0x8009, 1
special sub_813A8FC
playse SE_REGI
@@ -85,9 +85,9 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173:: @ 825F173
end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185
- setvar VAR_0x8004, 3
+ setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1
special sub_813AA18
- special sub_813A128
+ special ShowScrollableMultichoice
waitstate
special sub_813AA44
switch VAR_RESULT
@@ -204,9 +204,9 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C:: @ 825F37C
end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E
- setvar VAR_0x8004, 4
+ setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2
special sub_813AA18
- special sub_813A128
+ special ShowScrollableMultichoice
waitstate
special sub_813AA44
switch VAR_RESULT
@@ -273,9 +273,9 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F:: @ 825F49F
end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR
special sub_813AA18
- special sub_813A128
+ special ShowScrollableMultichoice
waitstate
special sub_813AA44
switch VAR_RESULT
@@ -352,9 +352,9 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0:: @ 825F5F0
end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602
- setvar VAR_0x8004, 6
+ setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR
special sub_813AA18
- special sub_813A128
+ special ShowScrollableMultichoice
waitstate
special sub_813AA44
switch VAR_RESULT
diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc
index 7977e75b4..6ecfd75cb 100644
--- a/data/maps/BattleFrontier_Lounge3/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge3/scripts.inc
@@ -56,7 +56,7 @@ BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46
end
BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
- specialvar VAR_TEMP_1, sub_813AA04
+ specialvar VAR_TEMP_1, GetFrontierBattlePoints
compare VAR_TEMP_1, VAR_0x8008
goto_if_ge BattleFrontier_Lounge3_EventScript_261E75
msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT
@@ -67,7 +67,7 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75
copyvar VAR_0x8004, VAR_0x8008
- special sub_813A9A4
+ special TakeFrontierBattlePoints
setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
special sub_813A8FC
playse SE_REGI
@@ -127,7 +127,7 @@ BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2
call_if_eq BattleFrontier_Lounge3_EventScript_261F94
msgbox BattleFrontier_Lounge3_Text_2633D4, 9
- special sub_813A9D0
+ special GiveFrontierBattlePoints
msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT
setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0
release
diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc
index 1339b54c9..94585b618 100644
--- a/data/maps/BattleFrontier_Lounge7/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge7/scripts.inc
@@ -21,9 +21,9 @@ BattleFrontier_Lounge7_EventScript_265284:: @ 8265284
waitmessage
special sub_813A958
setvar VAR_TEMP_E, 0
- setvar VAR_0x8004, 9
+ setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_1
setvar VAR_0x8006, 0
- special sub_813A128
+ special ShowScrollableMultichoice
waitstate
copyvar VAR_TEMP_D, VAR_RESULT
switch VAR_RESULT
@@ -45,9 +45,9 @@ BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F
message BattleFrontier_Lounge7_Text_2658EF
waitmessage
setvar VAR_TEMP_E, 0
- setvar VAR_0x8004, 9
+ setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_1
setvar VAR_0x8006, 1
- special sub_813A128
+ special ShowScrollableMultichoice
waitstate
copyvar VAR_TEMP_D, VAR_RESULT
switch VAR_RESULT
@@ -135,9 +135,9 @@ BattleFrontier_Lounge7_EventScript_265474:: @ 8265474
waitmessage
special sub_813A958
setvar VAR_TEMP_E, 1
- setvar VAR_0x8004, 10
+ setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
setvar VAR_0x8006, 0
- special sub_813A128
+ special ShowScrollableMultichoice
waitstate
copyvar VAR_TEMP_D, VAR_RESULT
switch VAR_RESULT
@@ -159,9 +159,9 @@ BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F
message BattleFrontier_Lounge7_Text_2658EF
waitmessage
setvar VAR_TEMP_E, 1
- setvar VAR_0x8004, 10
+ setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
setvar VAR_0x8006, 1
- special sub_813A128
+ special ShowScrollableMultichoice
waitstate
copyvar VAR_TEMP_D, VAR_RESULT
switch VAR_RESULT
@@ -241,16 +241,18 @@ BattleFrontier_Lounge7_EventScript_265645:: @ 8265645
release
end
+@ VAR_0x8004 here is used to determine which move name to buffer
+@ VAR_0x8005 here is used to determine which move tutor was spoken to
BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F
copyvar VAR_0x8004, VAR_TEMP_D
copyvar VAR_0x8005, VAR_TEMP_E
- special sub_813AC7C
+ special BufferBattleFrontierTutorMoveName
buffernumberstring 1, VAR_0x8008
copyvar VAR_0x8004, VAR_TEMP_C
msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_Lounge7_EventScript_2656CA
- specialvar VAR_TEMP_1, sub_813AA04
+ specialvar VAR_TEMP_1, GetFrontierBattlePoints
compare VAR_TEMP_1, VAR_0x8008
goto_if_ge BattleFrontier_Lounge7_EventScript_265696
msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT
@@ -269,7 +271,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696
goto_if_eq BattleFrontier_Lounge7_EventScript_265645
msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT
copyvar VAR_0x8004, VAR_0x8008
- special sub_813A9A4
+ special TakeFrontierBattlePoints
release
end
diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
index 5f0952cb0..f342655dc 100644
--- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
@@ -136,8 +136,8 @@ BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310
BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320
message BattleFrontier_ReceptionGate_Text_26689D
waitmessage
- setvar VAR_0x8004, 8
- special sub_813A128
+ setvar VAR_0x8004, SCROLL_MULTI_BF_RECEPTIONIST
+ special ShowScrollableMultichoice
waitstate
switch VAR_RESULT
case 0, BattleFrontier_ReceptionGate_EventScript_2663AE
diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
index 6ff8fc146..b59adefcc 100644
--- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
@@ -218,7 +218,7 @@ BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9
end
BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
- special sub_813A9D0
+ special GiveFrontierBattlePoints
msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9
msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT
setflag FLAG_SCOTT_GIVES_BATTLE_POINTS
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index 18fc0404b..5e8c39ff1 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
@@ -11,7 +11,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
message gUnknown_08272C1D
waitmessage
setvar VAR_0x8004, 0
- specialvar VAR_RESULT, sub_81399F4
+ specialvar VAR_RESULT, GetDeptStoreDefaultFloorChoice
switch VAR_RESULT
case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689
case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695
@@ -57,52 +57,52 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5
end
LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718
- setvar VAR_0x8006, 4
+ setvar VAR_0x8006, DEPT_STORE_FLOORNUM_1F
setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1
- compare VAR_DEPT_STORE_FLOOR, 4
+ compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
- setvar VAR_DEPT_STORE_FLOOR, 4
+ setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
end
LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740
- setvar VAR_0x8006, 5
+ setvar VAR_0x8006, DEPT_STORE_FLOORNUM_2F
setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1
- compare VAR_DEPT_STORE_FLOOR, 5
+ compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
- setvar VAR_DEPT_STORE_FLOOR, 5
+ setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
end
LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768
- setvar VAR_0x8006, 6
+ setvar VAR_0x8006, DEPT_STORE_FLOORNUM_3F
setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1
- compare VAR_DEPT_STORE_FLOOR, 6
+ compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
- setvar VAR_DEPT_STORE_FLOOR, 6
+ setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
end
LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790
- setvar VAR_0x8006, 7
+ setvar VAR_0x8006, DEPT_STORE_FLOORNUM_4F
setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1
- compare VAR_DEPT_STORE_FLOOR, 7
+ compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
- setvar VAR_DEPT_STORE_FLOOR, 7
+ setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
end
LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8
- setvar VAR_0x8006, 8
+ setvar VAR_0x8006, DEPT_STORE_FLOORNUM_5F
setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1
- compare VAR_DEPT_STORE_FLOOR, 8
+ compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
- setvar VAR_DEPT_STORE_FLOOR, 8
+ setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
end
@@ -123,6 +123,6 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
return
LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
- special SetDepartmentStoreFloorVar
+ special SetDeptStoreFloor
return
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 62fdd3427..948c447bf 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -558,8 +558,8 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
special BufferStreakTrainerText
message LilycoveCity_PokemonTrainerFanClub_Text_281C95
waitmessage
- setvar VAR_0x8004, 2
- special sub_813A128
+ setvar VAR_0x8004, SCROLL_MULTI_POKEMON_FAN_CLUB_RATER
+ special ShowScrollableMultichoice
waitstate
setvar VAR_0x8004, 8
switch VAR_RESULT
diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index a401841c2..03e3f6c70 100644
--- a/data/maps/MauvilleCity_GameCorner/scripts.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
@@ -288,7 +288,7 @@ MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77
goto MauvilleCity_GameCorner_EventScript_20FF8A
MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A
- special sub_81398C0
+ special BufferTMHMMoveName
msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_210118
diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index 03f71d235..401a952ed 100644
--- a/data/maps/Route113_GlassWorkshop/scripts.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
@@ -52,8 +52,8 @@ Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D
Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7
setvar VAR_0x8009, 0
- setvar VAR_0x8004, 1
- special sub_813A128
+ setvar VAR_0x8004, SCROLL_MULTI_GLASS_WORKSHOP_VENDOR
+ special ShowScrollableMultichoice
waitstate
switch VAR_RESULT
case 0, Route113_GlassWorkshop_EventScript_26EE1E
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index 6751e1318..64d7f1c0f 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -748,8 +748,8 @@ SlateportCity_EventScript_1DD3C0:: @ 81DD3C0
SlateportCity_EventScript_1DD3CA:: @ 81DD3CA
message SlateportCity_Text_1DEE67
waitmessage
- setvar VAR_0x8004, 7
- special sub_813A128
+ setvar VAR_0x8004, SCROLL_MULTI_BERRY_POWDER_VENDOR
+ special ShowScrollableMultichoice
waitstate
switch VAR_RESULT
case 0, SlateportCity_EventScript_1DD46E
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
index 15d0e5eb6..783d9ec85 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
@@ -332,8 +332,8 @@ VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02
VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11
message VerdanturfTown_BattleTentLobby_Text_24EF88
waitmessage
- setvar VAR_0x8004, 12
- special sub_813A128
+ setvar VAR_0x8004, SCROLL_MULTI_BATTLE_TENT_RULES
+ special ShowScrollableMultichoice
waitstate
switch VAR_RESULT
case 0, VerdanturfTown_BattleTentLobby_EventScript_201B7E
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 8501edadd..76988dfeb 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -978,7 +978,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B
faceplayer
setvar VAR_FRONTIER_FACILITY, 8
goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335
- specialvar VAR_RESULT, sub_813990C
+ specialvar VAR_RESULT, IsBadEggInParty
compare VAR_RESULT, 1
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B
copyvar VAR_0x8007, VAR_LAST_TALKED
@@ -1086,7 +1086,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4
faceplayer
setvar VAR_FRONTIER_FACILITY, 9
goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335
- specialvar VAR_RESULT, sub_813990C
+ specialvar VAR_RESULT, IsBadEggInParty
compare VAR_RESULT, 1
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B
specialvar VAR_RESULT, IsWirelessAdapterConnected
diff --git a/data/specials.inc b/data/specials.inc
index ba93b098d..25fb4fee3 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -227,7 +227,7 @@ gSpecials:: @ 81DBA64
def_special ShowPokedexRatingMessage
def_special DoPCTurnOnEffect
def_special DoPCTurnOffEffect
- def_special SetDepartmentStoreFloorVar
+ def_special SetDeptStoreFloor
def_special DoLotteryCornerComputerEffect
def_special EndLotteryCornerComputerEffect
def_special sub_81B951C
@@ -285,7 +285,7 @@ gSpecials:: @ 81DBA64
def_special DoSoftReset
def_special GameClear
def_special ShakeScreenInElevator
- def_special nullsub_55
+ def_special ShowGlassWorkshopMenu
def_special SpawnCameraObject
def_special RemoveCameraObject
def_special GetPokeblockNameByMonNature
@@ -339,7 +339,7 @@ gSpecials:: @ 81DBA64
def_special ScriptGetMultiplayerId
def_special ScriptGetPartyMonSpecies
def_special sub_81B98DC
- def_special nullsub_54
+ def_special TryInitBattleTowerAwardManEventObject
def_special MoveOutOfSecretBaseFromOutside
def_special LoadPlayerBag
def_special sub_80B05B4
@@ -356,7 +356,7 @@ gSpecials:: @ 81DBA64
def_special sub_80EE2CC
def_special sub_80EE72C
def_special sub_80EE7C0
- def_special nullsub_55
+ def_special ShowGlassWorkshopMenu
def_special PutFanClubSpecialOnTheAir
def_special sub_80EED10
def_special sub_80EED34
@@ -422,7 +422,7 @@ gSpecials:: @ 81DBA64
def_special DoMirageTowerCeilingCrumble
def_special SetMirageTowerVisibility
def_special StartPlayerDescendMirageTower
- def_special sub_81398C0
+ def_special BufferTMHMMoveName
def_special IsWirelessAdapterConnected
def_special BerryBlenderLinkBecomeLeader
def_special BerryBlenderLinkJoinGroup
@@ -433,7 +433,7 @@ gSpecials:: @ 81DBA64
def_special sub_801DC20
def_special sub_81B8958
def_special sub_8018090
- def_special sub_813990C
+ def_special IsBadEggInParty
def_special ValidateReceivedWonderCard
def_special HasAtLeastOneBerry
def_special sub_802C920
@@ -441,7 +441,7 @@ gSpecials:: @ 81DBA64
def_special sub_8027A5C
def_special sub_8027AAC
def_special sub_8139980
- def_special sub_81399F4
+ def_special GetDeptStoreDefaultFloorChoice
def_special sub_8139D98
def_special sub_80F905C
def_special sub_800B518
@@ -454,7 +454,7 @@ gSpecials:: @ 81DBA64
def_special sub_80F9134
def_special sub_80F9154
def_special sub_80B3028
- def_special sub_813A128
+ def_special ShowScrollableMultichoice
def_special sub_813A630
def_special sub_813A080
def_special sub_81C6A94
@@ -466,9 +466,9 @@ gSpecials:: @ 81DBA64
def_special sub_813A958
def_special sub_813A8FC
def_special sub_813A988
- def_special sub_813A9D0
- def_special sub_813A9A4
- def_special sub_813AA04
+ def_special GiveFrontierBattlePoints
+ def_special TakeFrontierBattlePoints
+ def_special GetFrontierBattlePoints
def_special sub_813AA18
def_special sub_813AA44
def_special DisplayBerryPowderVendorMenu
@@ -482,7 +482,7 @@ gSpecials:: @ 81DBA64
def_special sub_81C72A4
def_special sp106_CreateStartMenu
def_special CountPlayerTrainerStars
- def_special sub_813AC7C
+ def_special BufferBattleFrontierTutorMoveName
def_special sub_813ADB8
def_special sub_813ADD4
def_special sub_81B892C
@@ -501,7 +501,7 @@ gSpecials:: @ 81DBA64
def_special sub_8175280
def_special CreateUnusualWeatherEvent
def_special GetUnusualWeatherMapNameAndType
- def_special sub_813B490
+ def_special GetMartEmployeeObjectEventId
def_special sub_80A08CC
def_special Unused_SetWeatherSunny
def_special sub_81AFDA0