Merge branch 'master' into document-eventscripts

1 files changed, 25 insertions, 25 deletions

diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
index 3ebb57ff9..87915cd2c 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
@@ -3,17 +3,17 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapScripts:: @ 825F070
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, MSGBOX_DEFAULT
-	special sub_813A958
+	special ShowBattlePointsWindow
 	return
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, MSGBOX_DEFAULT
-	special sub_813A988
+	special CloseBattlePointsWindow
 	release
 	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,9 +39,9 @@ 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
+	special UpdateBattlePointsWindow
 	playse SE_REGI
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT
 	compare VAR_TEMP_2, 0
@@ -51,7 +51,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, MSGBOX_DEFAULT
-	special sub_813A988
+	special CloseBattlePointsWindow
 	release
 	end
 
@@ -60,9 +60,9 @@ 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
+	special UpdateBattlePointsWindow
 	playse SE_REGI
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT
 	compare VAR_TEMP_2, 2
@@ -72,7 +72,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166
 	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, MSGBOX_DEFAULT
-	special sub_813A988
+	special CloseBattlePointsWindow
 	release
 	end
 
@@ -85,11 +85,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173:: @ 825F173
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185
-	setvar VAR_0x8004, 3
-	special sub_813AA18
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
 	waitstate
-	special sub_813AA44
+	special CloseFrontierExchangeCornerItemIconWindow
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E
 	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241
@@ -204,11 +204,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C:: @ 825F37C
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E
-	setvar VAR_0x8004, 4
-	special sub_813AA18
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
 	waitstate
-	special sub_813AA44
+	special CloseFrontierExchangeCornerItemIconWindow
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0
 	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413
@@ -273,11 +273,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F:: @ 825F49F
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1
-	setvar VAR_0x8004, 5
-	special sub_813AA18
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
 	waitstate
-	special sub_813AA44
+	special CloseFrontierExchangeCornerItemIconWindow
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E
 	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541
@@ -352,11 +352,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0:: @ 825F5F0
 	end
 
 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602
-	setvar VAR_0x8004, 6
-	special sub_813AA18
-	special sub_813A128
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
 	waitstate
-	special sub_813AA44
+	special CloseFrontierExchangeCornerItemIconWindow
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690
 	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3