summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s5
-rw-r--r--data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc4
-rw-r--r--data/maps/BattleFrontier_BattlePikeLobby/scripts.inc28
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc34
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc14
-rw-r--r--data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc26
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc34
-rw-r--r--data/maps/BattleFrontier_BattlePyramidTop/scripts.inc6
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc2
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc2
-rw-r--r--data/maps/SeafloorCavern_Room9/scripts.inc2
-rw-r--r--data/maps/TrainerHill_Entrance/scripts.inc2
-rw-r--r--data/scripts/battle_pike.inc38
-rw-r--r--data/scripts/field_poison.inc38
-rw-r--r--data/scripts/trainer_hill.inc8
-rw-r--r--data/specials.inc6
17 files changed, 127 insertions, 124 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 730788a66..2ffce2386 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,5 +1,7 @@
#include "constants/global.h"
#include "constants/battle.h"
+#include "constants/battle_pike.h"
+#include "constants/battle_pyramid.h"
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
#include "constants/berry.h"
@@ -10,6 +12,7 @@
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h"
+#include "constants/field_poison.h"
#include "constants/field_specials.h"
#include "constants/flags.h"
#include "constants/game_stat.h"
@@ -901,7 +904,7 @@ EventScript_PickItemUp:: @ 8271C3A
waitfanfare
waitmessage
bufferitemnameplural 1, VAR_0x8004, VAR_0x8005
- setvar VAR_0x8004, 12
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction
compare VAR_RESULT, 1
goto_if_eq EventScript_271C86
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
index 20e14b72b..44027d7ce 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
@@ -13,9 +13,9 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
- setvar VAR_0x8004, 20
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS
special CallBattlePikeFunction
- setvar VAR_0x8004, 24
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
setvar VAR_0x8005, 1
special CallBattlePikeFunction
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index c3f5e80de..541ffd313 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -26,16 +26,16 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
special HealPlayerParty
- setvar VAR_0x8004, 27
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
special CallBattlePikeFunction
lockall
msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special CallBattlePikeFunction
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 4
setvar VAR_0x8006, 0
special CallBattlePikeFunction
@@ -68,21 +68,21 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9
setvar VAR_0x8004, 8
special CallFrontierUtilFunc
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 3
special CallBattlePikeFunction
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 3
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
special LoadPlayerParty
special HealPlayerParty
- setvar VAR_0x8004, 27
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
special CallBattlePikeFunction
message BattleFrontier_BattlePikeLobby_Text_25C1DF
waitmessage
- setvar VAR_0x8004, 8
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 0
special CallBattlePikeFunction
playse SE_SAVE
@@ -103,15 +103,15 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 4
setvar VAR_0x8006, 0
special CallBattlePikeFunction
special LoadPlayerParty
special HealPlayerParty
- setvar VAR_0x8004, 27
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
special CallBattlePikeFunction
- setvar VAR_0x8004, 8
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 0
special CallBattlePikeFunction
playse SE_SAVE
@@ -176,17 +176,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special CallFrontierUtilFunc
- setvar VAR_0x8004, 28
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE
special CallBattlePikeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 4
setvar VAR_0x8006, 1
special CallBattlePikeFunction
- setvar VAR_0x8004, 26
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
special CallBattlePikeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
@@ -197,7 +197,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
delay 2
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
- setvar VAR_0x8004, 26
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
special CallBattlePikeFunction
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
index ea959387b..565e28d47 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
@@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171
setvar VAR_TEMP_0, 1
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6
@@ -27,7 +27,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6
delay 16
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
waitmovement 0
- setvar VAR_0x8004, 21
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 0
special CallBattlePikeFunction
msgbox gStringVar4, MSGBOX_DEFAULT
@@ -63,7 +63,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231
closemessage
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
waitmovement 0
- setvar VAR_0x8004, 21
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 0
special CallBattlePikeFunction
msgbox gStringVar4, MSGBOX_DEFAULT
@@ -102,7 +102,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF
lockall
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF
waitmovement 0
- setvar VAR_0x8004, 23
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN
special CallBattlePikeFunction
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC
@@ -136,7 +136,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
waitse
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7
waitmovement 0
- setvar VAR_0x8004, 22
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE
special CallBattlePikeFunction
switch VAR_RESULT
case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416
@@ -217,11 +217,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
waitmovement 0
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePikeFunction
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
@@ -279,7 +279,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB
waitmovement 0
- setvar VAR_0x8004, 21
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 0
special CallBattlePikeFunction
msgbox gStringVar4, MSGBOX_DEFAULT
@@ -287,7 +287,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
delay 16
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
waitmovement 0
- setvar VAR_0x8004, 21
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 1
special CallBattlePikeFunction
msgbox gStringVar4, MSGBOX_DEFAULT
@@ -317,7 +317,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605
message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA
waitmovement 0
- setvar VAR_0x8004, 12
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON
special CallBattlePikeFunction
copyvar VAR_0x8004, VAR_RESULT
compare VAR_0x8004, 0
@@ -335,7 +335,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
waitse
playmoncry SPECIES_KIRLIA, 0
waitmoncry
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
special CallBattlePikeFunction
compare VAR_RESULT, 2
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751
@@ -345,7 +345,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F
compare VAR_RESULT, 4
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766
- setvar VAR_0x8004, 15
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
special CallBattlePikeFunction
waitstate
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
@@ -372,13 +372,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
waitse
playmoncry SPECIES_DUSCLOPS, 0
waitmoncry
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
special CallBattlePikeFunction
compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774
- setvar VAR_0x8004, 15
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
special CallBattlePikeFunction
waitstate
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
@@ -578,7 +578,7 @@ BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA
step_end
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
switch VAR_RESULT
case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B
@@ -588,7 +588,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B
lock
faceplayer
- setvar VAR_0x8004, 14
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG
special CallBattlePikeFunction
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
@@ -605,7 +605,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E
- setvar VAR_0x8004, 13
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS
special CallBattlePikeFunction
compare VAR_RESULT, 2
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
index 9a4448226..a18ccda4c 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
@@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A
BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C
setvar VAR_TEMP_0, 1
- setvar VAR_0x8004, 6
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_6
special CallBattlePikeFunction
end
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
index 927222e8c..6416ad4d7 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -35,7 +35,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
lockall
message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75
waitmessage
- setvar VAR_0x8004, 8
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 1
special CallBattlePikeFunction
playse SE_SAVE
@@ -137,7 +137,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08
waitmessage
special LoadPlayerParty
- setvar VAR_0x8004, 8
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 2
special CallBattlePikeFunction
playse SE_SAVE
@@ -161,12 +161,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT
- case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222
+ case 0, BattleFrontier_BattlePike_EventScript_Retire
release
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78
- setvar VAR_0x8004, 17
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM
special CallBattlePikeFunction
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91
@@ -189,7 +189,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB
- setvar VAR_0x8004, 19
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
special CallBattlePikeFunction
compare VAR_RESULT, 4
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2
@@ -209,7 +209,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A
- setvar VAR_0x8004, 18
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM_ID
special CallBattlePikeFunction
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39
@@ -230,7 +230,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53
goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60
- setvar VAR_0x8004, 19
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
special CallBattlePikeFunction
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
index 723c666d8..ba862ebdf 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -12,7 +12,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43
BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
lockall
- setvar VAR_0x8004, 13
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 4
setvar VAR_0x8006, 1
setvar VAR_0x8007, 55
@@ -38,7 +38,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
end
BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
- setvar VAR_0x8004, 15
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE
special CallBattlePyramidFunction
setvar VAR_0x8004, 0
special CallFrontierUtilFunc
@@ -67,7 +67,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
setvar VAR_TEMP_D, 1
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
- setvar VAR_0x8004, 17
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
special CallBattlePyramidFunction
end
@@ -77,18 +77,18 @@ BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special CallFrontierUtilFunc
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 7
setvar VAR_0x8006, 255
special CallBattlePyramidFunction
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66
BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
- setvar VAR_0x8004, 13
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
- setvar VAR_0x8004, 14
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
special CallBattlePyramidFunction
special HealPlayerParty
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
@@ -96,7 +96,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
- setvar VAR_0x8004, 3
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 1
special CallBattlePyramidFunction
special SavePlayerParty
@@ -104,7 +104,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
- setvar VAR_0x8004, 9
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
special CallBattlePyramidFunction
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
@@ -118,7 +118,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA
end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
- setvar VAR_0x8004, 13
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 32
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
@@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
special CallFrontierUtilFunc
compare VAR_RESULT, 7
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
- setvar VAR_0x8004, 6
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
special CallBattlePyramidFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
@@ -154,7 +154,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
BattlePyramid_TrainerBattle:: @ 8252C4F
trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
- setvar VAR_0x8004, 10
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT
special CallBattlePyramidFunction
waitmessage
waitbuttonpress
@@ -163,12 +163,12 @@ BattlePyramid_TrainerBattle:: @ 8252C4F
end
BattlePyramid_FindItemBall:: @ 8252C6A
- setvar VAR_0x8004, 7
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_ITEM
special CallBattlePyramidFunction
callstd STD_FIND_ITEM
compare VAR_0x8007, 0
goto_if_eq BattlePyramid_FindItemBall_End
- setvar VAR_0x8004, 8
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_HIDE_ITEM
special CallBattlePyramidFunction
BattlePyramid_FindItemBall_End:: @ 8252C87
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index b2f7d4579..72abed5ef 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -32,11 +32,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
playse SE_EXPMAX
waitse
closemessage
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
@@ -68,7 +68,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
setvar VAR_0x8004, 8
special CallFrontierUtilFunc
special LoadPlayerParty
- setvar VAR_0x8004, 14
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
special CallBattlePyramidFunction
special HealPlayerParty
message BattleFrontier_BattlePyramidLobby_Text_2519F8
@@ -81,9 +81,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9
message BattleFrontier_BattlePyramidLobby_Text_251A77
waitmessage
- setvar VAR_0x8004, 4
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_REWARD
special CallBattlePyramidFunction
- setvar VAR_0x8004, 3
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 0
special CallBattlePyramidFunction
playse SE_SAVE
@@ -98,7 +98,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
setvar VAR_0x8004, 8
special CallFrontierUtilFunc
special LoadPlayerParty
- setvar VAR_0x8004, 14
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
special CallBattlePyramidFunction
special HealPlayerParty
lockall
@@ -108,11 +108,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
waitse
message BattleFrontier_BattlePyramidLobby_Text_251A77
waitmessage
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
- setvar VAR_0x8004, 3
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 0
special CallBattlePyramidFunction
playse SE_SAVE
@@ -179,9 +179,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special CallFrontierUtilFunc
- setvar VAR_0x8004, 0
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE
special CallBattlePyramidFunction
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special CallBattlePyramidFunction
@@ -193,9 +193,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
- setvar VAR_0x8004, 6
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
special CallBattlePyramidFunction
- setvar VAR_0x8004, 9
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
special CallBattlePyramidFunction
special LoadPlayerParty
closemessage
@@ -282,7 +282,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27
BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 5
special CallBattlePyramidFunction
compare VAR_RESULT, 0
@@ -292,7 +292,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
return
BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 3
special CallBattlePyramidFunction
goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
@@ -300,7 +300,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 6
special CallBattlePyramidFunction
compare VAR_RESULT, 0
@@ -310,7 +310,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
return
BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 4
special CallBattlePyramidFunction
goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
@@ -437,7 +437,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD
waitmovement 0
msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePyramidFunction
compare VAR_RESULT, 0
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
index 211ab0c87..8906d4c42 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -6,7 +6,7 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
.byte 0
BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
- setvar VAR_0x8004, 13
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 200
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
@@ -69,7 +69,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
end
BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
- setvar VAR_0x8004, 3
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 1
special CallBattlePyramidFunction
special SavePlayerParty
@@ -77,7 +77,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
- setvar VAR_0x8004, 9
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
special CallBattlePyramidFunction
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index 7bb60a655..4b2f088eb 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
.byte 0
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
- setvar VAR_0x8004, 17
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
special CallBattlePyramidFunction
end
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 51fb2da7e..71da27914 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -270,7 +270,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
switch VAR_RESULT
case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071
fadescreen 1
- special sp0C8_whiteout_maybe
+ special SetCB2WhiteOut
waitstate
MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index b5a29db7d..026c29700 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -30,7 +30,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT
setweather WEATHER_NONE
doweather
- special sub_80B05B4
+ special Script_FadeOutMapMusic
waitstate
msgbox SeafloorCavern_Room9_Text_235279, MSGBOX_DEFAULT
special WaitWeather
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 840822780..3b9fb77a4 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -114,7 +114,7 @@ TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
lock
faceplayer
- setvar VAR_0x8004, TRAINER_HILL_FUNC_10
+ setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN
special CallTrainerHillFunction
compare VAR_RESULT, 0
goto_if_eq TrainerHill_Entrance_EventScript_26821F
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index 581a789e4..9892ffb7b 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -3,9 +3,9 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25
- setvar VAR_0x8004, 4
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_UP_ROOM_OBJECTS
special CallBattlePikeFunction
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1
@@ -50,7 +50,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
compare VAR_RESULT, 3
goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35
@@ -92,11 +92,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePikeFunction
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
@@ -108,9 +108,9 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
- setvar VAR_0x8004, 0
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE
special CallBattlePikeFunction
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030
@@ -167,17 +167,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
- setvar VAR_0x8004, 25
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128
compare VAR_RESULT, 1
call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePikeFunction
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
@@ -189,7 +189,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
- setvar VAR_0x8004, 3
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144
@@ -200,14 +200,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128
- setvar VAR_0x8004, 24
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
setvar VAR_0x8005, 1
special CallBattlePikeFunction
return
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136
- setvar VAR_0x8004, 24
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
setvar VAR_0x8005, 0
special CallBattlePikeFunction
return
@@ -229,19 +229,19 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C
return
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
- setvar VAR_0x8004, 7
+ setvar VAR_0x8004,BATTLE_PIKE_FUNC_7
special CallBattlePikeFunction
- setvar VAR_0x8004, 25
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128
compare VAR_RESULT, 1
call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePikeFunction
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
@@ -253,7 +253,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
- setvar VAR_0x8004, 3
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144
@@ -275,7 +275,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D
closemessage
end
-BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222
+BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index 9f8058e4e..2ca9c7b06 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -1,51 +1,51 @@
-EventScript_Poison:: @ 82736BC
+EventScript_FieldPoison:: @ 82736BC
lockall
- special ExecuteWhiteOut
+ special TryFieldPoisonWhiteOut
waitstate
- compare VAR_RESULT, 1
- goto_if_eq EventScript_2736D9
- compare VAR_RESULT, 2
- goto_if_eq EventScript_2736F8
+ compare VAR_RESULT, FLDPSN_WHITEOUT
+ goto_if_eq EventScript_FieldWhiteOut
+ compare VAR_RESULT, FLDPSN_FRONTIER_WHITEOUT
+ goto_if_eq EventScript_FrontierFieldWhiteOut
releaseall
end
-EventScript_2736D9:: @ 82736D9
+EventScript_FieldWhiteOut:: @ 82736D9
message gText_PlayerWhitedOut
waitmessage
waitbuttonpress
- special sub_80B05B4
+ special Script_FadeOutMapMusic
waitstate
fadescreen 1
- call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4
- special sp0C8_whiteout_maybe
+ call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter
+ special SetCB2WhiteOut
waitstate
end
-EventScript_2736F4:: @ 82736F4
+EventScript_SetRespawnLavaridgePkmnCenter:: @ 82736F4
setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
return
-EventScript_2736F8:: @ 82736F8
+EventScript_FrontierFieldWhiteOut:: @ 82736F8
message gText_PlayerWhitedOut
waitmessage
waitbuttonpress
- setvar VAR_0x8004, 16
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN
special CallBattlePikeFunction
compare VAR_RESULT, 1
- goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222
- setvar VAR_0x8004, 12
+ goto_if_eq BattleFrontier_BattlePike_EventScript_Retire
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
- setvar VAR_0x8004, TRAINER_HILL_FUNC_10
+ setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN
special CallTrainerHillFunction
compare VAR_RESULT, 1
- goto_if_eq TrainerHill_1F_EventScript_2C83C9
- special sub_80B05B4
+ goto_if_eq TrainerHill_1F_EventScript_Lost
+ special Script_FadeOutMapMusic
waitstate
fadescreen 1
- special sp0C8_whiteout_maybe
+ special SetCB2WhiteOut
waitstate
end
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index 5b43118d1..7d898a93d 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -10,11 +10,11 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
setvar VAR_0x8005, 5
special CallFrontierUtilFunc
compare VAR_RESULT, B_OUTCOME_LOST
- goto_if_eq TrainerHill_1F_EventScript_2C83C9
+ goto_if_eq TrainerHill_1F_EventScript_Lost
compare VAR_RESULT, B_OUTCOME_DREW
- goto_if_eq TrainerHill_1F_EventScript_2C83C9
+ goto_if_eq TrainerHill_1F_EventScript_Lost
compare VAR_RESULT, B_OUTCOME_FORFEITED
- goto_if_eq TrainerHill_1F_EventScript_2C83C9
+ goto_if_eq TrainerHill_1F_EventScript_Lost
end
TrainerHill_1F_MapScript2_2C8372: @ 82C8372
@@ -56,7 +56,7 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF
waitstate
end
-TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9
+TrainerHill_1F_EventScript_Lost:: @ 82C83C9
setvar VAR_0x8004, TRAINER_HILL_FUNC_12
special CallTrainerHillFunction
setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST
diff --git a/data/specials.inc b/data/specials.inc
index 2c5cc28ce..bd2cac1b0 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -210,8 +210,8 @@ gSpecials:: @ 81DBA64
def_special ShowLinkBattleRecords
def_special IsEnoughForCostInVar0x8005
def_special SubtractMoneyFromVar0x8005
- def_special ExecuteWhiteOut
- def_special sp0C8_whiteout_maybe
+ def_special TryFieldPoisonWhiteOut
+ def_special SetCB2WhiteOut
def_special RotatingGate_InitPuzzle
def_special RotatingGate_InitPuzzleAndGraphics
def_special SetSSTidalFlag
@@ -342,7 +342,7 @@ gSpecials:: @ 81DBA64
def_special TryInitBattleTowerAwardManEventObject
def_special MoveOutOfSecretBaseFromOutside
def_special LoadPlayerBag
- def_special sub_80B05B4
+ def_special Script_FadeOutMapMusic
def_special SetPacifidlogTMReceivedDay
def_special GetDaysUntilPacifidlogTMAvailable
def_special HasAllHoennMons
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-29 15:07:30 +0000