summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/berry_tree.inc30
-rw-r--r--data/scripts/gabby_and_ty.inc4
-rw-r--r--data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc2
-rw-r--r--data/scripts/maps/BattleFrontier_BattlePyramidTop.inc4
-rw-r--r--data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc2
-rw-r--r--data/scripts/maps/NavelRock_Top.inc4
-rw-r--r--data/scripts/maps/SkyPillar_Top.inc8
-rw-r--r--data/scripts/maps/SootopolisCity.inc28
-rw-r--r--data/scripts/maps/SouthernIsland_Interior.inc4
-rw-r--r--data/scripts/pokeblocks.inc2
10 files changed, 44 insertions, 44 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 2828036e0..1fda1133f 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,5 +1,5 @@
BerryTreeScript:: @ 82742F9
- special FieldObjectInteractionGetBerryTreeData
+ special EventObjectInteractionGetBerryTreeData
switch VAR_0x8004
case 255, Route102_EventScript_27434F
case 0, Route102_EventScript_274359
@@ -54,7 +54,7 @@ Route102_EventScript_2743AF:: @ 82743AF
Route102_EventScript_2743B1:: @ 82743B1
lockall
- special FieldObjectInteractionGetBerryCountString
+ special EventObjectInteractionGetBerryCountString
message Route102_Text_274560
waitmessage
waitbuttonpress
@@ -62,7 +62,7 @@ Route102_EventScript_2743B1:: @ 82743B1
Route102_EventScript_2743C1:: @ 82743C1
lockall
- special FieldObjectInteractionGetBerryName
+ special EventObjectInteractionGetBerryName
message Route102_Text_274579
waitmessage
waitbuttonpress
@@ -70,7 +70,7 @@ Route102_EventScript_2743C1:: @ 82743C1
Route102_EventScript_2743D1:: @ 82743D1
lockall
- special FieldObjectInteractionGetBerryName
+ special EventObjectInteractionGetBerryName
message Route102_Text_27458A
waitmessage
waitbuttonpress
@@ -79,7 +79,7 @@ Route102_EventScript_2743D1:: @ 82743D1
Route102_EventScript_2743E1:: @ 82743E1
call Route102_EventScript_2743F6
lockall
- special FieldObjectInteractionGetBerryName
+ special EventObjectInteractionGetBerryName
message Route102_Text_2745AB
waitmessage
waitbuttonpress
@@ -105,7 +105,7 @@ Route102_EventScript_274421:: @ 8274421
buffernumberstring 1, VAR_0x8006
lock
faceplayer
- special FieldObjectInteractionGetBerryCountString
+ special EventObjectInteractionGetBerryCountString
msgbox Route102_Text_2745EE, 5
compare VAR_RESULT, 1
goto_eq Route102_EventScript_274448
@@ -113,11 +113,11 @@ Route102_EventScript_274421:: @ 8274421
goto_eq Route102_EventScript_274479
Route102_EventScript_274448:: @ 8274448
- special FieldObjectInteractionPickBerryTree
+ special EventObjectInteractionPickBerryTree
compare VAR_0x8004, 0
goto_eq Route102_EventScript_274470
special sub_80EED34
- special FieldObjectInteractionRemoveBerryTree
+ special EventObjectInteractionRemoveBerryTree
message Route102_Text_27461B
playfanfare MUS_ME_KINOMI
waitmessage
@@ -145,7 +145,7 @@ Route102_EventScript_274479:: @ 8274479
Route102_EventScript_274482:: @ 8274482
lockall
- special FieldObjectInteractionGetBerryTreeData
+ special EventObjectInteractionGetBerryTreeData
call Route102_EventScript_2744DD
releaseall
end
@@ -154,7 +154,7 @@ Route102_EventScript_27448D:: @ 827448D
checkitem ITEM_WAILMER_PAIL, 1
compare VAR_RESULT, 0
goto_eq Route102_EventScript_2744BE
- special FieldObjectInteractionGetBerryName
+ special EventObjectInteractionGetBerryName
msgbox Route102_Text_2746E4, 5
compare VAR_RESULT, 1
goto_eq Route102_EventScript_2744C4
@@ -166,14 +166,14 @@ Route102_EventScript_2744BE:: @ 82744BE
end
Route102_EventScript_2744C0:: @ 82744C0
- special FieldObjectInteractionGetBerryTreeData
+ special EventObjectInteractionGetBerryTreeData
lockall
Route102_EventScript_2744C4:: @ 82744C4
- special FieldObjectInteractionGetBerryName
+ special EventObjectInteractionGetBerryName
message Route102_Text_274710
waitmessage
- special FieldObjectInteractionWaterBerryTree
+ special EventObjectInteractionWaterBerryTree
special sub_80FAFF8
waitstate
message Route102_Text_274723
@@ -183,10 +183,10 @@ Route102_EventScript_2744C4:: @ 82744C4
end
Route102_EventScript_2744DD:: @ 82744DD
- special FieldObjectInteractionPlantBerryTree
+ special EventObjectInteractionPlantBerryTree
incrementgamestat 3
special sub_80EED10
- special FieldObjectInteractionGetBerryCountString
+ special EventObjectInteractionGetBerryCountString
message Route102_Text_274535
waitmessage
waitbuttonpress
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 269ef2530..0cf683bb8 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -213,7 +213,7 @@ Route120_EventScript_28CF36:: @ 828CF36
Route111_EventScript_28CF56:: @ 828CF56
special GabbyAndTyBeforeInterview
- special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+ special GabbyAndTySetScriptVarsToEventObjectLocalIds
compare VAR_FACING, 2
call_if 1, Route111_EventScript_28CF94
compare VAR_FACING, 1
@@ -247,7 +247,7 @@ Route111_EventScript_28CFC3:: @ 828CFC3
Route118_EventScript_28CFC3:: @ 828CFC3
Route120_EventScript_28CFC3:: @ 828CFC3
special GabbyAndTyBeforeInterview
- special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+ special GabbyAndTySetScriptVarsToEventObjectLocalIds
compare VAR_FACING, 2
call_if 1, Route111_EventScript_28CF94
compare VAR_FACING, 1
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
index 3461f8275..bcaa7dfe1 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
@@ -112,7 +112,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4
closemessage
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2
waitmovement 0
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
index d071639f8..05cee99b9 100644
--- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
@@ -138,7 +138,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
special sub_81A1780
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4
@@ -185,7 +185,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
special sub_81A1780
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
index 03b7928aa..fb76a5fc7 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
@@ -10,7 +10,7 @@ MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
end
MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74
- special ScrSpecial_SetMauvilleOldManMapObjGfx
+ special ScrSpecial_SetMauvilleOldManEventObjGfx
end
MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78
diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc
index 6193a092e..c05d32088 100644
--- a/data/scripts/maps/NavelRock_Top.inc
+++ b/data/scripts/maps/NavelRock_Top.inc
@@ -38,7 +38,7 @@ NavelRock_Top_EventScript_26915B:: @ 826915B
NavelRock_Top_EventScript_26916F:: @ 826916F
lockall
setvar VAR_TEMP_1, 1
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
setvar VAR_0x8004, 3
setvar VAR_0x8005, 35
special sub_813B80C
@@ -59,7 +59,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
applymovement 127, NavelRock_Top_Movement_269234
applymovement 1, NavelRock_Top_Movement_26923A
waitmovement 0
- special RemoveScriptFieldObject
+ special RemoveScriptEventObject
setvar VAR_0x8004, 250
setvar VAR_0x8005, 70
setvar VAR_0x8006, 0
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index a652c7897..a2ea5ed1d 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/scripts/maps/SkyPillar_Top.inc
@@ -98,10 +98,10 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
fadeoutbgm 1
applymovement 255, SkyPillar_Top_Movement_2725B2
waitmovement 0
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, SkyPillar_Top_Movement_239858
waitmovement 0
- special RemoveScriptFieldObject
+ special RemoveScriptEventObject
applymovement 1, SkyPillar_Top_Movement_23983A
waitmovement 0
waitse
@@ -128,10 +128,10 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
closemessage
delay 20
fadeinbgm 1
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, SkyPillar_Top_Movement_23985C
waitmovement 0
- special RemoveScriptFieldObject
+ special RemoveScriptEventObject
setvar VAR_0x405E, 5
setvar VAR_0x40CA, 1
setvar VAR_0x40D7, 1
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 793b6f4fd..6dac80f4b 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -212,10 +212,10 @@ SootopolisCity_EventScript_1E5926:: @ 81E5926
SootopolisCity_EventScript_1E5946:: @ 81E5946
delay 60
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5A68
waitmovement 0
- special RemoveScriptFieldObject
+ special RemoveScriptEventObject
delay 60
fadescreenspeed 1, 8
setweather 15
@@ -269,12 +269,12 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
applymovement 10, SootopolisCity_Movement_1E5BCF
applymovement 9, SootopolisCity_Movement_1E5BF0
waitmovement 0
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 10, SootopolisCity_Movement_1E5BD6
applymovement 9, SootopolisCity_Movement_1E5BF7
applymovement 127, SootopolisCity_Movement_1E5A75
waitmovement 0
- special RemoveScriptFieldObject
+ special RemoveScriptEventObject
setvar VAR_0x405E, 2
clearflag FLAG_SPECIAL_FLAG_0x4000
releaseall
@@ -312,10 +312,10 @@ SootopolisCity_Movement_1E5A75: @ 81E5A75
SootopolisCity_EventScript_1E5A82:: @ 81E5A82
delay 60
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5BA4
waitmovement 0
- special RemoveScriptFieldObject
+ special RemoveScriptEventObject
delay 60
fadescreenspeed 1, 8
setweather 15
@@ -369,12 +369,12 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
applymovement 10, SootopolisCity_Movement_1E5BCF
applymovement 9, SootopolisCity_Movement_1E5BF0
waitmovement 0
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 10, SootopolisCity_Movement_1E5BD6
applymovement 9, SootopolisCity_Movement_1E5BF7
applymovement 127, SootopolisCity_Movement_1E5BAE
waitmovement 0
- special RemoveScriptFieldObject
+ special RemoveScriptEventObject
setvar VAR_0x405E, 2
clearflag FLAG_SPECIAL_FLAG_0x4000
releaseall
@@ -502,10 +502,10 @@ SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
delay 60
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5A68
waitmovement 0
- special RemoveScriptFieldObject
+ special RemoveScriptEventObject
delay 60
fadescreenspeed 1, 8
call SootopolisCity_EventScript_1E5D82
@@ -516,7 +516,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
special sub_813B7D8
waitstate
playse SE_T_KAMI
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5E63
waitmovement 0
waitse
@@ -555,10 +555,10 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
delay 60
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5BA4
waitmovement 0
- special RemoveScriptFieldObject
+ special RemoveScriptEventObject
delay 60
fadescreenspeed 1, 8
call SootopolisCity_EventScript_1E5D82
@@ -568,7 +568,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
setvar VAR_0x8004, 1
special sub_813B7D8
waitstate
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5E63
applymovement 255, SootopolisCity_Movement_1E5E68
waitmovement 0
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index b7d4e101c..f78f938ca 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -66,7 +66,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
goto_if 0, SouthernIsland_Interior_EventScript_242B9A
setflag FLAG_0x0CE
setflag FLAG_0x002
- special SpawnScriptFieldObject
+ special SpawnScriptEventObject
applymovement 127, SouthernIsland_Interior_Movement_242BCA
waitmovement 0
delay 50
@@ -80,7 +80,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
applymovement 2, SouthernIsland_Interior_Movement_242BDA
waitmovement 0
delay 50
- special RemoveScriptFieldObject
+ special RemoveScriptEventObject
setvar VAR_LAST_TALKED, 2
compare VAR_0x40D5, 0
call_if 1, SouthernIsland_Interior_EventScript_242BA4
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 39cca8244..9d4aa80b6 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -683,7 +683,7 @@ LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA
specialvar VAR_RESULT, GetLinkPartnerNames
copyvar VAR_0x8008, VAR_RESULT
copyvar VAR_0x8004, VAR_0x8008
- special SpawnLinkPartnerFieldObject
+ special SpawnLinkPartnerEventObject
goto LilycoveCity_ContestLobby_EventScript_2941C4
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 18:18:18 +0000