dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Doc field move scripts completely, use fldeff constants for dofieldeffect

Browse Source 
Fix labels

Fix labels again

Delete extra boulder scripts

Now it should build fine
This commit is contained in:
Fontbane
2019-04-04 23:26:53 -04:00
committed by huderlem
parent 621e5d2263
commit 4a09a5da33
46 changed files with 284 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
View File

@@ -42,11 +42,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
setfieldeffectargument 0, 10
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
delay 20
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -72,15 +72,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
setfieldeffectargument 0, 8
setfieldeffectargument 1, 5
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 11
setfieldeffectargument 1, 3
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -89,19 +89,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
setfieldeffectargument 0, 16
setfieldeffectargument 1, 3
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 25
setfieldeffectargument 1, 2
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 24
setfieldeffectargument 1, 6
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -112,28 +112,28 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3
setfieldeffectargument 0, 42
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3
setfieldeffectargument 0, 20
setfieldeffectargument 1, 5
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3
setfieldeffectargument 0, 1
setfieldeffectargument 1, 12
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3
setfieldeffectargument 0, 1
setfieldeffectargument 1, 2
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3

4
data/maps/BirthIsland_Exterior/scripts.inc
View File

@@ -68,9 +68,9 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
setfieldeffectargument 0, 1
setfieldeffectargument 1, 58
setfieldeffectargument 2, 26
dofieldeffect 65
dofieldeffect FLDEFF_65
playbgm MUS_RG_DEOEYE, 0
waitfieldeffect 65
waitfieldeffect FLDEFF_65
addobject 2
applymovement 2, BirthIsland_Exterior_Movement_268054
waitmovement 0

4
data/maps/EverGrandeCity_HallOfFame/scripts.inc
View File

@@ -38,8 +38,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
delay 20
dofieldeffect 62
waitfieldeffect 62
dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
delay 40
setvar VAR_TEMP_1, 1
call EverGrandeCity_HallOfFame_EventScript_2717C1

12
data/maps/FieryPath/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_14"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_15"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_16"
},
{

14
data/maps/GraniteCave_B2F/map.json
View File

@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_13"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_14"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_16"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_17"
}
],

4
data/maps/LilycoveCity/scripts.inc
View File

@@ -391,10 +391,10 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
waitmovement 0
delay 50
setfieldeffectargument 0, 1
dofieldeffect 30
dofieldeffect FLDEFF_NPCFLY_OUT
delay 15
removeobject VAR_LAST_TALKED
waitfieldeffect 30
waitfieldeffect FLDEFF_NPCFLY_OUT
savebgm MUS_DUMMY
fadedefaultbgm
setflag FLAG_MET_RIVAL_LILYCOVE

6
data/maps/MagmaHideout_1F/map.json
View File

@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
}
],

4
data/maps/MagmaHideout_4F/scripts.inc
View File

@@ -12,8 +12,8 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
setfieldeffectargument 0, 18
setfieldeffectargument 1, 42
setfieldeffectargument 2, 0
dofieldeffect 54
waitfieldeffect 54
dofieldeffect FLDEFF_SPARKLE
waitfieldeffect FLDEFF_SPARKLE
setvar VAR_RESULT, 1
playfanfare MUS_ME_TAMA
playse SE_TAMA

4
data/maps/MirageTower_3F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MirageTower_3F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MirageTower_3F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
}
],

2
data/maps/MirageTower_4F/map.json
View File

@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MirageTower_4F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
}
],

4
data/maps/PetalburgWoods/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{

4
data/maps/Route103/map.json
View File

@@ -204,7 +204,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -217,7 +217,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{

2
data/maps/Route104/map.json
View File

@@ -417,7 +417,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{

4
data/maps/Route110_TrickHouseEntrance/scripts.inc
View File

@@ -759,8 +759,8 @@ Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459
setfieldeffectargument 0, VAR_0x8004
setfieldeffectargument 1, VAR_0x8005
setfieldeffectargument 2, VAR_0x8006
dofieldeffect 54
waitfieldeffect 54
dofieldeffect FLDEFF_SPARKLE
waitfieldeffect FLDEFF_SPARKLE
delay 10
return

22
data/maps/Route110_TrickHousePuzzle1/map.json
View File

@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_14"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_17"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_16"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_15"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_19"
},
{
@@ -154,7 +154,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_18"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_1B"
},
{
@@ -193,7 +193,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_1C"
},
{
@@ -206,7 +206,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_1E"
}
],

4
data/maps/Route110_TrickHousePuzzle3/map.json
View File

@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_16"
}
],

20
data/maps/Route110_TrickHousePuzzle4/map.json
View File

@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_14"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_15"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_16"
},
{
@@ -154,7 +154,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_17"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_18"
},
{
@@ -180,7 +180,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_19"
},
{
@@ -193,7 +193,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_1A"
}
],

6
data/maps/Route111/map.json
View File

@@ -222,7 +222,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -235,7 +235,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
},
{
@@ -378,7 +378,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{

10
data/maps/Route114/map.json
View File

@@ -165,7 +165,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -256,7 +256,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
},
{
@@ -269,7 +269,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_13"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_14"
},
{
@@ -295,7 +295,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{

2
data/maps/Route115/map.json
View File

@@ -217,7 +217,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{

10
data/maps/Route116/map.json
View File

@@ -74,7 +74,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -178,7 +178,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{
@@ -204,7 +204,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_14"
},
{
@@ -360,7 +360,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_15"
},
{

2
data/maps/Route117/map.json
View File

@@ -217,7 +217,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route117_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{

2
data/maps/Route118/map.json
View File

@@ -183,7 +183,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route118_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{

6
data/maps/Route120/map.json
View File

@@ -295,7 +295,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -438,7 +438,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_14"
},
{
@@ -451,7 +451,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{

4
data/maps/Route120/scripts.inc
View File

@@ -245,10 +245,10 @@ Route120_EventScript_1F572C:: @ 81F572C
waitmovement 0
delay 50
setfieldeffectargument 0, 1
dofieldeffect 30
dofieldeffect FLDEFF_NPCFLY_OUT
delay 15
removeobject 31
waitfieldeffect 30
waitfieldeffect FLDEFF_NPCFLY_OUT
setmetatile 13, 15, 663, 0
setmetatile 12, 16, 671, 0
setmetatile 12, 17, 161, 0

6
data/maps/Route121/map.json
View File

@@ -222,7 +222,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -235,7 +235,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -313,7 +313,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{

6
data/maps/Route123/map.json
View File

@@ -256,7 +256,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -269,7 +269,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{

8
data/maps/Route128/scripts.inc
View File

@@ -48,8 +48,8 @@ Route128_EventScript_1F6B57:: @ 81F6B57
removeobject 4
delay 100
setfieldeffectargument 0, 1
dofieldeffect 30
waitfieldeffect 30
dofieldeffect FLDEFF_NPCFLY_OUT
waitfieldeffect FLDEFF_NPCFLY_OUT
addobject 3
applymovement 3, Route128_Movement_1F6C87
waitmovement 0
@@ -69,10 +69,10 @@ Route128_EventScript_1F6B57:: @ 81F6B57
waitmovement 0
delay 50
setfieldeffectargument 0, 1
dofieldeffect 30
dofieldeffect FLDEFF_NPCFLY_OUT
delay 15
removeobject 3
waitfieldeffect 30
waitfieldeffect FLDEFF_NPCFLY_OUT
clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_ROUTE128_STATE, 2
releaseall

4
data/maps/RusturfTunnel/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RusturfTunnel_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RusturfTunnel_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2"
},
{

12
data/maps/SafariZone_North/map.json
View File

@@ -66,7 +66,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_North_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -79,7 +79,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_North_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
},
{
@@ -92,7 +92,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_North_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_13"
},
{
@@ -105,7 +105,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_North_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_14"
},
{
@@ -118,7 +118,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_North_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{
@@ -131,7 +131,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_North_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_16"
},
{

10
data/maps/SafariZone_Northeast/map.json
View File

@@ -61,7 +61,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northeast_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northeast_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_13"
},
{
@@ -100,7 +100,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northeast_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -113,7 +113,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northeast_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_14"
},
{
@@ -126,7 +126,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northeast_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
},
{

6
data/maps/SeafloorCavern_Room1/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room1_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room1_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room1_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_13"
},
{

16
data/maps/SeafloorCavern_Room2/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room2_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room2_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room2_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room2_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_15"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room2_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_16"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room2_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_18"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room2_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_19"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room2_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_17"
}
],

14
data/maps/SeafloorCavern_Room3/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room3_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room3_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_14"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room3_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_15"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room3_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_16"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room3_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_17"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room3_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_18"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room3_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_19"
},
{

12
data/maps/SeafloorCavern_Room5/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room5_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room5_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room5_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room5_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room5_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_16"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room5_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_14"
}
],

24
data/maps/SeafloorCavern_Room8/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_14"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_15"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_16"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_17"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_18"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_19"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_1A"
},
{
@@ -154,7 +154,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_1B"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room8_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_1C"
}
],

4
data/maps/SeafloorCavern_Room9/scripts.inc
View File

@@ -40,8 +40,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
setfieldeffectargument 0, 16
setfieldeffectargument 1, 42
setfieldeffectargument 2, 0
dofieldeffect 54
waitfieldeffect 54
dofieldeffect FLDEFF_SPARKLE
waitfieldeffect FLDEFF_SPARKLE
closemessage
setvar VAR_RESULT, 0
playfanfare MUS_ME_TAMA

2
data/maps/ShoalCave_LowTideLowerRoom/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideLowerRoom_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{

28
data/maps/VictoryRoad_B1F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_14"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_17"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_16"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_1E"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_19"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_1A"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_1B"
},
{
@@ -154,7 +154,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_1C"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_1D"
},
{
@@ -180,7 +180,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_1F"
},
{
@@ -232,7 +232,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{

240
data/scripts/field_move_scripts.inc
View File

@@ -1,221 +1,189 @@
PetalburgWoods_EventScript_2906BB:: @ 82906BB
Route103_EventScript_2906BB:: @ 82906BB
Route104_EventScript_2906BB:: @ 82906BB
Route110_TrickHousePuzzle1_EventScript_2906BB:: @ 82906BB
Route111_EventScript_2906BB:: @ 82906BB
Route116_EventScript_2906BB:: @ 82906BB
Route117_EventScript_2906BB:: @ 82906BB
Route118_EventScript_2906BB:: @ 82906BB
Route120_EventScript_2906BB:: @ 82906BB
Route121_EventScript_2906BB:: @ 82906BB
Route123_EventScript_2906BB:: @ 82906BB
EventScript_CutTree:: @ 82906BB
lockall
goto_if_unset FLAG_BADGE01_GET, Route103_EventScript_CheckTreeCantCut
goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
checkpartymove MOVE_CUT
compare VAR_RESULT, 6
goto_if_eq Route103_EventScript_290721
goto_if_eq EventScript_CheckTreeCantCut
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
buffermovename 1, MOVE_CUT
msgbox Route103_Text_29072E, MSGBOX_YESNO
msgbox Text_WantToCut, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route103_EventScript_29072B
msgbox Route103_Text_290771, MSGBOX_DEFAULT
goto_if_eq EventScript_CancelCut
msgbox Text_MonUsedHM, MSGBOX_DEFAULT
closemessage
dofieldeffect 2
dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
goto Route103_EventScript_290710
goto EventScript_CutTreeDown
end
Route103_EventScript_290705:: @ 8290705
EventScript_FldEffCut:: @ 8290705
lockall
dofieldeffect 2
dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
goto Route103_EventScript_290710
goto EventScript_CutTreeDown
end
Route103_EventScript_290710:: @ 8290710
applymovement VAR_LAST_TALKED, Route103_Movement_29071F
EventScript_CutTreeDown:: @ 8290710
applymovement VAR_LAST_TALKED, Movement_CutTreeDown
waitmovement 0
removeobject VAR_LAST_TALKED
releaseall
end
Route103_Movement_29071F: @ 829071F
Movement_CutTreeDown: @ 829071F
cut_tree
step_end
Route103_EventScript_CheckTreeCantCut:: @ 8290721
msgbox Route103_Text_29077D, MSGBOX_DEFAULT
EventScript_CheckTreeCantCut:: @ 8290721
msgbox Text_CantCut, MSGBOX_DEFAULT
releaseall
end
Route103_EventScript_29072B:: @ 829072B
EventScript_CancelCut:: @ 829072B
closemessage
releaseall
end
Route103_Text_29072E: @ 829072E
Text_WantToCut: @ 829072E
.string "This tree looks like it can be\n"
.string "CUT down!\p"
.string "Would you like to CUT it?$"
Route103_Text_290771: @ 8290771
Route111_Text_290771: @ 8290771
Text_MonUsedHM: @ 8290771
.string "{STR_VAR_1} used {STR_VAR_2}!$"
Route103_Text_29077D: @ 829077D
Text_CantCut: @ 829077D
.string "This tree looks like it can be\n"
.string "CUT down!$"
GraniteCave_B2F_EventScript_2907A6:: @ 82907A6
MirageTower_3F_EventScript_2907A6:: @ 82907A6
MirageTower_4F_EventScript_2907A6:: @ 82907A6
Route110_TrickHousePuzzle3_EventScript_2907A6:: @ 82907A6
Route111_EventScript_2907A6:: @ 82907A6
Route114_EventScript_2907A6:: @ 82907A6
Route115_EventScript_2907A6:: @ 82907A6
RusturfTunnel_EventScript_2907A6:: @ 82907A6
SafariZone_North_EventScript_2907A6:: @ 82907A6
SafariZone_Northeast_EventScript_2907A6:: @ 82907A6
SeafloorCavern_Room1_EventScript_2907A6:: @ 82907A6
SeafloorCavern_Room2_EventScript_2907A6:: @ 82907A6
SeafloorCavern_Room5_EventScript_2907A6:: @ 82907A6
VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6
EventScript_RockSmash:: @ 82907A6
lockall
goto_if_unset FLAG_BADGE03_GET, Route111_EventScript_29082D
goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
checkpartymove MOVE_ROCK_SMASH
compare VAR_RESULT, 6
goto_if_eq Route111_EventScript_29082D
goto_if_eq EventScript_CantSmashRock
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
buffermovename 1, MOVE_ROCK_SMASH
msgbox Route111_Text_29083A, MSGBOX_YESNO
msgbox Text_WantToSmash, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route111_EventScript_290837
msgbox Route111_Text_290771, MSGBOX_DEFAULT
goto_if_eq EventScript_CancelSmash
msgbox Text_MonUsedHM, MSGBOX_DEFAULT
closemessage
dofieldeffect 37
dofieldeffect FLDEFF_USE_ROCK_SMASH
waitstate
goto Route111_EventScript_2907FB
goto EventScript_RockSmash
end
Route111_EventScript_2907F0:: @ 82907F0
EventScript_FldEffRockSmash:: @ 82907F0
lockall
dofieldeffect 37
dofieldeffect FLDEFF_USE_ROCK_SMASH
waitstate
goto Route111_EventScript_2907FB
goto EventScript_RockSmash
end
Route111_EventScript_2907FB:: @ 82907FB
applymovement VAR_LAST_TALKED, Route111_Movement_29082B
EventScript_SmashRock:: @ 82907FB
applymovement VAR_LAST_TALKED, Movement_SmashRock
waitmovement 0
removeobject VAR_LAST_TALKED
specialvar VAR_RESULT, TryUpdateRusturfTunnelState
compare VAR_RESULT, 1
goto_if_eq Route111_EventScript_290829
goto_if_eq EventScript_EndSmash
special RockSmashWildEncounter
compare VAR_RESULT, 0
goto_if_eq Route111_EventScript_290829
goto_if_eq EventScript_EndSmash
waitstate
releaseall
end
Route111_EventScript_290829:: @ 8290829
EventScript_EndSmash:: @ 8290829
releaseall
end
Route111_Movement_29082B: @ 829082B
Movement_SmashRock: @ 829082B
rock_smash_break
step_end
Route111_EventScript_29082D:: @ 829082D
msgbox Route111_Text_29087F, MSGBOX_DEFAULT
EventScript_CantSmashRock:: @ 829082D
msgbox Text_CantSmash, MSGBOX_DEFAULT
releaseall
end
Route111_EventScript_290837:: @ 8290837
EventScript_CancelSmash:: @ 8290837
closemessage
releaseall
end
Route111_Text_29083A: @ 829083A
Text_WantToSmash: @ 829083A
.string "This rock appears to be breakable.\n"
.string "Would you like to use ROCK SMASH?$"
Route111_Text_29087F: @ 829087F
Text_CantSmash: @ 829087F
.string "It's a rugged rock, but a POKéMON\n"
.string "may be able to smash it.$"
FieryPath_EventScript_2908BA:: @ 82908BA
MagmaHideout_1F_EventScript_2908BA:: @ 82908BA
Route110_TrickHousePuzzle4_EventScript_2908BA:: @ 82908BA
SeafloorCavern_Room1_EventScript_2908BA:: @ 82908BA
SeafloorCavern_Room2_EventScript_2908BA:: @ 82908BA
SeafloorCavern_Room3_EventScript_2908BA:: @ 82908BA
SeafloorCavern_Room5_EventScript_2908BA:: @ 82908BA
SeafloorCavern_Room8_EventScript_2908BA:: @ 82908BA
ShoalCave_LowTideLowerRoom_EventScript_2908BA:: @ 82908BA
VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA
EventScript_StrengthBoulder:: @ 82908BA
lockall
goto_if_unset FLAG_BADGE04_GET, FieryPath_EventScript_290915
goto_if_set FLAG_SYS_USE_STRENGTH, FieryPath_EventScript_29091F
goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
checkpartymove MOVE_STRENGTH
compare VAR_RESULT, 6
goto_if_eq FieryPath_EventScript_290915
goto_if_eq EventScript_CantStrength
setfieldeffectargument 0, VAR_RESULT
msgbox FieryPath_Text_29092C, MSGBOX_YESNO
msgbox Text_WantToStrength, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq FieryPath_EventScript_290929
goto_if_eq EventScript_CancelStrength
closemessage
dofieldeffect 40
dofieldeffect FLDEFF_USE_STRENGTH
waitstate
goto FieryPath_EventScript_290908
goto EventScript_ActivateStrength
end
FieryPath_EventScript_2908FD:: @ 82908FD
EventScript_FldEffStrength:: @ 82908FD
lockall
dofieldeffect 40
dofieldeffect FLDEFF_USE_STRENGTH
waitstate
goto FieryPath_EventScript_290908
goto EventScript_ActivateStrength
end
FieryPath_EventScript_290908:: @ 8290908
EventScript_ActivateStrength:: @ 8290908
setflag FLAG_SYS_USE_STRENGTH
msgbox FieryPath_Text_29098C, MSGBOX_DEFAULT
msgbox Text_MonUsedStrength, MSGBOX_DEFAULT
releaseall
end
FieryPath_EventScript_290915:: @ 8290915
msgbox FieryPath_Text_2909D6, MSGBOX_DEFAULT
EventScript_CantStrength:: @ 8290915
msgbox Text_CantStrength, MSGBOX_DEFAULT
releaseall
end
FieryPath_EventScript_29091F:: @ 829091F
msgbox FieryPath_Text_290A16, MSGBOX_DEFAULT
EventScript_CheckActivatedBoulder:: @ 829091F
msgbox Text_StrengthActivated, MSGBOX_DEFAULT
releaseall
end
FieryPath_EventScript_290929:: @ 8290929
EventScript_CancelStrength:: @ 8290929
closemessage
releaseall
end
FieryPath_Text_29092C: @ 829092C
Text_WantToStrength: @ 829092C
.string "It's a big boulder, but a POKéMON\n"
.string "may be able to push it aside.\p"
.string "Would you like to use STRENGTH?$"
FieryPath_Text_29098C: @ 829098C
Text_MonUsedStrength: @ 829098C
.string "{STR_VAR_1} used STRENGTH!\p"
.string "{STR_VAR_1}'s STRENGTH made it\n"
.string "possible to move boulders around!$"
FieryPath_Text_2909D6: @ 82909D6
Text_CantStrength: @ 82909D6
.string "It's a big boulder, but a POKéMON\n"
.string "may be able to push it aside.$"
FieryPath_Text_290A16: @ 8290A16
Text_StrengthActivated: @ 8290A16
.string "STRENGTH made it possible to move\n"
.string "boulders around.$"
@@ -223,59 +191,59 @@ EventScript_UseWaterfall:: @ 8290A49
lockall
checkpartymove MOVE_WATERFALL
compare VAR_RESULT, 6
goto_if_eq EventScript_290A84
goto_if_eq EventScript_CantWaterfall
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
msgbox Text_290AC3, MSGBOX_YESNO
msgbox Text_WantToWaterfall, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_290A8C
msgbox Text_290AFC, MSGBOX_DEFAULT
dofieldeffect 43
goto EventScript_290A8C
goto_if_eq EventScript_EndWaterfall
msgbox Text_MonUsedWaterfall, MSGBOX_DEFAULT
dofieldeffect FLDEFF_USE_WATERFALL
goto EventScript_EndWaterfall
EventScript_CannotUseWaterfall:: @ 8290A83
lockall
EventScript_290A84:: @ 8290A84
msgbox Text_290A8E, MSGBOX_DEFAULT
EventScript_CantWaterfall:: @ 8290A84
msgbox Text_CantWaterfall, MSGBOX_DEFAULT
EventScript_290A8C:: @ 8290A8C
EventScript_EndWaterfall:: @ 8290A8C
releaseall
end
Text_290A8E: @ 8290A8E
Text_CantWaterfall: @ 8290A8E
.string "A wall of water is crashing down with\n"
.string "a mighty roar.$"
Text_290AC3: @ 8290AC3
Text_WantToWaterfall: @ 8290AC3
.string "It's a large waterfall.\n"
.string "Would you like to use WATERFALL?$"
Text_290AFC: @ 8290AFC
Text_MonUsedWaterfall: @ 8290AFC
.string "{STR_VAR_1} used WATERFALL.$"
EventScript_UseDive:: @ 8290B0F
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, 6
goto_if_eq EventScript_290B4E
goto_if_eq EventScript_CantDive
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
setfieldeffectargument 1, 1
msgbox Text_290BE8, MSGBOX_YESNO
msgbox Text_WantToDive, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_290B58
msgbox Text_290C1A, MSGBOX_DEFAULT
dofieldeffect 44
goto EventScript_290B58
goto_if_eq EventScript_EndDive
msgbox Text_MonUsedDive, MSGBOX_DEFAULT
dofieldeffect FLDEFF_USE_DIVE
goto EventScript_EndDive
end
EventScript_290B4E:: @ 8290B4E
msgbox Text_290BAA, MSGBOX_DEFAULT
EventScript_CantDive:: @ 8290B4E
msgbox Text_CantDive, MSGBOX_DEFAULT
releaseall
end
EventScript_290B58:: @ 8290B58
EventScript_EndDive:: @ 8290B58
releaseall
end
@@ -283,50 +251,50 @@ EventScript_UseDiveUnderwater:: @ 8290B5A
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, 6
goto_if_eq EventScript_290B99
goto_if_eq EventScript_CantSurface
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
setfieldeffectargument 1, 1
msgbox Text_290C6E, MSGBOX_YESNO
msgbox Text_WantToSurface, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_290BA8
msgbox Text_290C1A, MSGBOX_DEFAULT
dofieldeffect 44
goto EventScript_290BA8
goto_if_eq EventScript_EndSurface
msgbox Text_MonUsedDive, MSGBOX_DEFAULT
dofieldeffect FLDEFF_USE_DIVE
goto EventScript_EndSurface
end
EventScript_290B99:: @ 8290B99
EventScript_CantSurface:: @ 8290B99
lockall
msgbox Text_290C28, MSGBOX_DEFAULT
goto EventScript_290BA8
msgbox Text_CantSurface, MSGBOX_DEFAULT
goto EventScript_EndSurface
end
EventScript_290BA8:: @ 8290BA8
EventScript_EndSurface:: @ 8290BA8
releaseall
end
Text_290BAA: @ 8290BAA
Text_CantDive: @ 8290BAA
.string "The sea is deep here. A POKéMON\n"
.string "may be able to go underwater.$"
Text_290BE8: @ 8290BE8
Text_WantToDive: @ 8290BE8
.string "The sea is deep here.\n"
.string "Would you like to use DIVE?$"
Text_290C1A: @ 8290C1A
Text_MonUsedDive: @ 8290C1A
.string "{STR_VAR_1} used DIVE.$"
Text_290C28: @ 8290C28
Text_CantSurface: @ 8290C28
.string "Light is filtering down from above.\n"
.string "A POKéMON may be able to surface.$"
Text_290C6E: @ 8290C6E
Text_WantToSurface: @ 8290C6E
.string "Light is filtering down from above.\n"
.string "Would you like to use DIVE?$"
EventScript_290CAE:: @ 8290CAE
msgbox Text_290CB7, MSGBOX_SIGN
EventScript_FailSweetScent:: @ 8290CAE
msgbox Text_FailSweetScent, MSGBOX_SIGN
end
Text_290CB7: @ 8290CB7
Text_FailSweetScent: @ 8290CB7
.string "Looks like there's nothing here…$"

8
data/scripts/secret_base.inc
View File

@@ -339,7 +339,7 @@ EventScript_275A50:: @ 8275A50
msgbox gText_23B704, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_275CDE
msgbox Route103_Text_290771, MSGBOX_DEFAULT
msgbox Text_MonUsedHM, MSGBOX_DEFAULT
closemessage
dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
waitstate
@@ -371,7 +371,7 @@ EventScript_275AA9:: @ 8275AA9
msgbox Text_274779, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_275CDE
msgbox Route103_Text_290771, MSGBOX_DEFAULT
msgbox Text_MonUsedHM, MSGBOX_DEFAULT
closemessage
dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
waitstate
@@ -403,7 +403,7 @@ EventScript_275B02:: @ 8275B02
msgbox Text_274825, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_275CDE
msgbox Route103_Text_290771, MSGBOX_DEFAULT
msgbox Text_MonUsedHM, MSGBOX_DEFAULT
closemessage
dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
waitstate
@@ -508,7 +508,7 @@ EventScript_275BE8:: @ 8275BE8
goto_if_eq EventScript_275CDE
bufferpartymonnick 0, VAR_0x8004
buffermovename 1, MOVE_SECRET_POWER
msgbox Route103_Text_290771, MSGBOX_DEFAULT
msgbox Text_MonUsedHM, MSGBOX_DEFAULT
closemessage
closemessage
compare VAR_0x8007, 1

6
include/event_scripts.h
View File

@@ -381,10 +381,10 @@ extern const u8 SecretBase_RedCave1_Text_2758CC[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[];
//field effects
extern const u8 FieryPath_EventScript_2908FD[];
extern const u8 EventScript_290CAE[];
extern const u8 EventScript_FldEffStrength[];
extern const u8 EventScript_FailSweetScent[];
extern const u8 EventScript_2926F8[];
extern const u8 Route111_EventScript_2907F0[];
extern const u8 EventScript_FldEffRockSmash[];
//player pc
extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_1F863F[];

4
src/fldeff_cut.c
View File

@@ -23,7 +23,7 @@
extern struct MapPosition gPlayerFacingPosition;
extern const u8 Route103_EventScript_290705[];
extern const u8 EventScript_FldEffCut[];
extern const u8 FarawayIsland_Interior_EventScript_267EDB[];
extern const u8 gFieldEffectPic_CutGrass[];
@@ -327,7 +327,7 @@ bool8 FldEff_UseCutOnGrass(void)
static void FieldCallback_CutTree(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
ScriptContext1_SetupScript(Route103_EventScript_290705);
ScriptContext1_SetupScript(EventScript_FldEffCut);
}
bool8 FldEff_UseCutOnTree(void)

2
src/fldeff_rocksmash.c
View File

@@ -140,7 +140,7 @@ bool8 SetUpFieldMove_RockSmash(void)
static void sub_81356C4(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
ScriptContext1_SetupScript(Route111_EventScript_2907F0);
ScriptContext1_SetupScript(EventScript_FldEffRockSmash);
}
bool8 FldEff_UseRockSmash(void)

2
src/fldeff_strength.c
View File

@@ -30,7 +30,7 @@ bool8 SetUpFieldMove_Strength(void)
static void FldEff_UseStrength(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
ScriptContext1_SetupScript(FieryPath_EventScript_2908FD);
ScriptContext1_SetupScript(EventScript_FldEffStrength);
}
bool8 sub_8145E2C(void)

2
src/fldeff_sweetscent.c
View File

@@ -93,7 +93,7 @@ static void FailSweetScentEncounter(u8 taskId)
{
CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100);
sub_80AC3E4();
ScriptContext1_SetupScript(EventScript_290CAE);
ScriptContext1_SetupScript(EventScript_FailSweetScent);
DestroyTask(taskId);
}
}