summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/battle_pike.inc38
-rw-r--r--data/scripts/field_poison.inc38
-rw-r--r--data/scripts/trainer_hill.inc8
3 files changed, 42 insertions, 42 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 18:42:16 +0000