diff options
Diffstat (limited to 'data/scripts/maps')
| -rw-r--r-- | data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/BattleFrontier_BattlePyramidTop.inc | 4 | ||||
| -rw-r--r-- | data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/NavelRock_Top.inc | 4 | ||||
| -rw-r--r-- | data/scripts/maps/SkyPillar_Top.inc | 8 | ||||
| -rw-r--r-- | data/scripts/maps/SootopolisCity.inc | 28 | ||||
| -rw-r--r-- | data/scripts/maps/SouthernIsland_Interior.inc | 4 |
7 files changed, 26 insertions, 26 deletions
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 |