Skip to content

Commit 4a09a5d

Browse files
Fontbanehuderlem
Fontbane
authored and
huderlem
committed
Doc field move scripts completely, use fldeff constants for dofieldeffect
Fix labels Fix labels again Delete extra boulder scripts Now it should build fine
1 parent 621e5d2 commit 4a09a5d

File tree

46 files changed

+284
-316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+284
-316
lines changed

‎data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
4242
setfieldeffectargument 0, 10
4343
setfieldeffectargument 1, 10
4444
setfieldeffectargument 2, 0
45-
dofieldeffect 54
45+
dofieldeffect FLDEFF_SPARKLE
4646
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
4747
compare VAR_RESULT, 0
4848
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3
49-
waitfieldeffect 54
49+
waitfieldeffect FLDEFF_SPARKLE
5050
delay 10
5151
end
5252

@@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
6060
delay 20
6161
compare VAR_RESULT, 0
6262
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3
63-
waitfieldeffect 54
63+
waitfieldeffect FLDEFF_SPARKLE
6464
delay 10
6565
end
6666

@@ -72,15 +72,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
7272
setfieldeffectargument 0, 8
7373
setfieldeffectargument 1, 5
7474
setfieldeffectargument 2, 0
75-
dofieldeffect 54
75+
dofieldeffect FLDEFF_SPARKLE
7676
setfieldeffectargument 0, 11
7777
setfieldeffectargument 1, 3
7878
setfieldeffectargument 2, 0
79-
dofieldeffect 54
79+
dofieldeffect FLDEFF_SPARKLE
8080
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
8181
compare VAR_RESULT, 0
8282
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3
83-
waitfieldeffect 54
83+
waitfieldeffect FLDEFF_SPARKLE
8484
delay 10
8585
end
8686

@@ -89,19 +89,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
8989
setfieldeffectargument 0, 16
9090
setfieldeffectargument 1, 3
9191
setfieldeffectargument 2, 0
92-
dofieldeffect 54
92+
dofieldeffect FLDEFF_SPARKLE
9393
setfieldeffectargument 0, 25
9494
setfieldeffectargument 1, 2
9595
setfieldeffectargument 2, 0
96-
dofieldeffect 54
96+
dofieldeffect FLDEFF_SPARKLE
9797
setfieldeffectargument 0, 24
9898
setfieldeffectargument 1, 6
9999
setfieldeffectargument 2, 0
100-
dofieldeffect 54
100+
dofieldeffect FLDEFF_SPARKLE
101101
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
102102
compare VAR_RESULT, 0
103103
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3
104-
waitfieldeffect 54
104+
waitfieldeffect FLDEFF_SPARKLE
105105
delay 10
106106
end
107107

@@ -112,28 +112,28 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3
112112
setfieldeffectargument 0, 42
113113
setfieldeffectargument 1, 10
114114
setfieldeffectargument 2, 0
115-
dofieldeffect 54
115+
dofieldeffect FLDEFF_SPARKLE
116116
return
117117

118118
AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3
119119
setfieldeffectargument 0, 20
120120
setfieldeffectargument 1, 5
121121
setfieldeffectargument 2, 0
122-
dofieldeffect 54
122+
dofieldeffect FLDEFF_SPARKLE
123123
return
124124

125125
AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3
126126
setfieldeffectargument 0, 1
127127
setfieldeffectargument 1, 12
128128
setfieldeffectargument 2, 0
129-
dofieldeffect 54
129+
dofieldeffect FLDEFF_SPARKLE
130130
return
131131

132132
AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3
133133
setfieldeffectargument 0, 1
134134
setfieldeffectargument 1, 2
135135
setfieldeffectargument 2, 0
136-
dofieldeffect 54
136+
dofieldeffect FLDEFF_SPARKLE
137137
return
138138

139139
AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3

‎data/maps/BirthIsland_Exterior/scripts.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
6868
setfieldeffectargument 0, 1
6969
setfieldeffectargument 1, 58
7070
setfieldeffectargument 2, 26
71-
dofieldeffect 65
71+
dofieldeffect FLDEFF_65
7272
playbgm MUS_RG_DEOEYE, 0
73-
waitfieldeffect 65
73+
waitfieldeffect FLDEFF_65
7474
addobject 2
7575
applymovement 2, BirthIsland_Exterior_Movement_268054
7676
waitmovement 0

‎data/maps/EverGrandeCity_HallOfFame/scripts.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
3838
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
3939
waitmovement 0
4040
delay 20
41-
dofieldeffect 62
42-
waitfieldeffect 62
41+
dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
42+
waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
4343
delay 40
4444
setvar VAR_TEMP_1, 1
4545
call EverGrandeCity_HallOfFame_EventScript_2717C1

‎data/maps/FieryPath/map.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"movement_range_y": 0,
3838
"trainer_type": "0",
3939
"trainer_sight_or_berry_tree_id": "0",
40-
"script": "FieryPath_EventScript_2908BA",
40+
"script": "EventScript_StrengthBoulder",
4141
"flag": "FLAG_TEMP_11"
4242
},
4343
{
@@ -50,7 +50,7 @@
5050
"movement_range_y": 0,
5151
"trainer_type": "0",
5252
"trainer_sight_or_berry_tree_id": "0",
53-
"script": "FieryPath_EventScript_2908BA",
53+
"script": "EventScript_StrengthBoulder",
5454
"flag": "FLAG_TEMP_12"
5555
},
5656
{
@@ -63,7 +63,7 @@
6363
"movement_range_y": 0,
6464
"trainer_type": "0",
6565
"trainer_sight_or_berry_tree_id": "0",
66-
"script": "FieryPath_EventScript_2908BA",
66+
"script": "EventScript_StrengthBoulder",
6767
"flag": "FLAG_TEMP_13"
6868
},
6969
{
@@ -76,7 +76,7 @@
7676
"movement_range_y": 0,
7777
"trainer_type": "0",
7878
"trainer_sight_or_berry_tree_id": "0",
79-
"script": "FieryPath_EventScript_2908BA",
79+
"script": "EventScript_StrengthBoulder",
8080
"flag": "FLAG_TEMP_14"
8181
},
8282
{
@@ -89,7 +89,7 @@
8989
"movement_range_y": 0,
9090
"trainer_type": "0",
9191
"trainer_sight_or_berry_tree_id": "0",
92-
"script": "FieryPath_EventScript_2908BA",
92+
"script": "EventScript_StrengthBoulder",
9393
"flag": "FLAG_TEMP_15"
9494
},
9595
{
@@ -102,7 +102,7 @@
102102
"movement_range_y": 0,
103103
"trainer_type": "0",
104104
"trainer_sight_or_berry_tree_id": "0",
105-
"script": "FieryPath_EventScript_2908BA",
105+
"script": "EventScript_StrengthBoulder",
106106
"flag": "FLAG_TEMP_16"
107107
},
108108
{

‎data/maps/GraniteCave_B2F/map.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"movement_range_y": 1,
5151
"trainer_type": "0",
5252
"trainer_sight_or_berry_tree_id": "0",
53-
"script": "GraniteCave_B2F_EventScript_2907A6",
53+
"script": "EventScript_RockSmash",
5454
"flag": "FLAG_TEMP_11"
5555
},
5656
{
@@ -63,7 +63,7 @@
6363
"movement_range_y": 1,
6464
"trainer_type": "0",
6565
"trainer_sight_or_berry_tree_id": "0",
66-
"script": "GraniteCave_B2F_EventScript_2907A6",
66+
"script": "EventScript_RockSmash",
6767
"flag": "FLAG_TEMP_12"
6868
},
6969
{
@@ -76,7 +76,7 @@
7676
"movement_range_y": 1,
7777
"trainer_type": "0",
7878
"trainer_sight_or_berry_tree_id": "0",
79-
"script": "GraniteCave_B2F_EventScript_2907A6",
79+
"script": "EventScript_RockSmash",
8080
"flag": "FLAG_TEMP_13"
8181
},
8282
{
@@ -89,7 +89,7 @@
8989
"movement_range_y": 1,
9090
"trainer_type": "0",
9191
"trainer_sight_or_berry_tree_id": "0",
92-
"script": "GraniteCave_B2F_EventScript_2907A6",
92+
"script": "EventScript_RockSmash",
9393
"flag": "FLAG_TEMP_14"
9494
},
9595
{
@@ -102,7 +102,7 @@
102102
"movement_range_y": 1,
103103
"trainer_type": "0",
104104
"trainer_sight_or_berry_tree_id": "0",
105-
"script": "GraniteCave_B2F_EventScript_2907A6",
105+
"script": "EventScript_RockSmash",
106106
"flag": "FLAG_TEMP_15"
107107
},
108108
{
@@ -115,7 +115,7 @@
115115
"movement_range_y": 1,
116116
"trainer_type": "0",
117117
"trainer_sight_or_berry_tree_id": "0",
118-
"script": "GraniteCave_B2F_EventScript_2907A6",
118+
"script": "EventScript_RockSmash",
119119
"flag": "FLAG_TEMP_16"
120120
},
121121
{
@@ -128,7 +128,7 @@
128128
"movement_range_y": 1,
129129
"trainer_type": "0",
130130
"trainer_sight_or_berry_tree_id": "0",
131-
"script": "GraniteCave_B2F_EventScript_2907A6",
131+
"script": "EventScript_RockSmash",
132132
"flag": "FLAG_TEMP_17"
133133
}
134134
],

‎data/maps/LilycoveCity/scripts.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,10 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
391391
waitmovement 0
392392
delay 50
393393
setfieldeffectargument 0, 1
394-
dofieldeffect 30
394+
dofieldeffect FLDEFF_NPCFLY_OUT
395395
delay 15
396396
removeobject VAR_LAST_TALKED
397-
waitfieldeffect 30
397+
waitfieldeffect FLDEFF_NPCFLY_OUT
398398
savebgm MUS_DUMMY
399399
fadedefaultbgm
400400
setflag FLAG_MET_RIVAL_LILYCOVE

‎data/maps/MagmaHideout_1F/map.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"movement_range_y": 0,
6464
"trainer_type": "0",
6565
"trainer_sight_or_berry_tree_id": "0",
66-
"script": "MagmaHideout_1F_EventScript_2908BA",
66+
"script": "EventScript_StrengthBoulder",
6767
"flag": "FLAG_TEMP_11"
6868
},
6969
{
@@ -76,7 +76,7 @@
7676
"movement_range_y": 0,
7777
"trainer_type": "0",
7878
"trainer_sight_or_berry_tree_id": "0",
79-
"script": "MagmaHideout_1F_EventScript_2908BA",
79+
"script": "EventScript_StrengthBoulder",
8080
"flag": "FLAG_TEMP_12"
8181
},
8282
{
@@ -89,7 +89,7 @@
8989
"movement_range_y": 0,
9090
"trainer_type": "0",
9191
"trainer_sight_or_berry_tree_id": "0",
92-
"script": "MagmaHideout_1F_EventScript_2908BA",
92+
"script": "EventScript_StrengthBoulder",
9393
"flag": "FLAG_TEMP_13"
9494
}
9595
],

‎data/maps/MagmaHideout_4F/scripts.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
1212
setfieldeffectargument 0, 18
1313
setfieldeffectargument 1, 42
1414
setfieldeffectargument 2, 0
15-
dofieldeffect 54
16-
waitfieldeffect 54
15+
dofieldeffect FLDEFF_SPARKLE
16+
waitfieldeffect FLDEFF_SPARKLE
1717
setvar VAR_RESULT, 1
1818
playfanfare MUS_ME_TAMA
1919
playse SE_TAMA

‎data/maps/MirageTower_3F/map.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"movement_range_y": 1,
2525
"trainer_type": "0",
2626
"trainer_sight_or_berry_tree_id": "0",
27-
"script": "MirageTower_3F_EventScript_2907A6",
27+
"script": "EventScript_RockSmash",
2828
"flag": "FLAG_TEMP_11"
2929
},
3030
{
@@ -37,7 +37,7 @@
3737
"movement_range_y": 1,
3838
"trainer_type": "0",
3939
"trainer_sight_or_berry_tree_id": "0",
40-
"script": "MirageTower_3F_EventScript_2907A6",
40+
"script": "EventScript_RockSmash",
4141
"flag": "FLAG_TEMP_12"
4242
}
4343
],

‎data/maps/MirageTower_4F/map.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"movement_range_y": 1,
5151
"trainer_type": "0",
5252
"trainer_sight_or_berry_tree_id": "0",
53-
"script": "MirageTower_4F_EventScript_2907A6",
53+
"script": "EventScript_RockSmash",
5454
"flag": "FLAG_TEMP_11"
5555
}
5656
],

0 commit comments

Comments
 (0)