summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s49
-rw-r--r--data/field_move_scripts.inc20
-rw-r--r--data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc28
-rw-r--r--data/scripts/maps/CaveOfOrigin_B4F.inc4
-rw-r--r--data/scripts/maps/EverGrandeCity_HallOfFame.inc4
-rw-r--r--data/scripts/maps/LilycoveCity.inc4
-rw-r--r--data/scripts/maps/MossdeepCity_House4.inc2
-rw-r--r--data/scripts/maps/Route110_TrickHouseEntrance.inc4
-rw-r--r--data/scripts/maps/Route120.inc4
-rw-r--r--data/scripts/maps/Route128.inc8
-rw-r--r--data/scripts/maps/SeafloorCavern_Room9.inc4
-rw-r--r--data/scripts/maps/SootopolisCity.inc4
-rw-r--r--data/specials.inc2
13 files changed, 69 insertions, 68 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 1839c3547..8a3672d7e 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,4 +1,5 @@
#include "constants/decorations.h"
+#include "constants/field_effects.h"
#include "constants/flags.h"
#include "constants/game_stat.h"
#include "constants/items.h"
@@ -399,7 +400,7 @@ gUnknown_0815F36C:: @ 815F36C
lockall
playse SE_PC_LOGON
message UnknownString_81A3A72
- dofieldeffect 61
+ dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON
waitstate
waitmessage
waitbuttonpress
@@ -459,7 +460,7 @@ gUnknown_0815F43A:: @ 815F43A
lockall
message UnknownString_81A3A72
playse SE_PC_LOGON
- dofieldeffect 61
+ dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON
waitstate
waitmessage
waitbuttonpress
@@ -530,7 +531,7 @@ EventScript_15F51D:
end
gUnknown_0815F523:: @ 815F523
- dofieldeffect 52
+ dofieldeffect FLDEFF_SAND_PILLAR
waitstate
end
@@ -1444,8 +1445,8 @@ do_heal_party:: @ 819FD7C
waitmessage
applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A083F
waitmovement 0
- dofieldeffect 25
- waitfieldeffect 25
+ dofieldeffect FLDEFF_POKECENTER_HEAL
+ waitfieldeffect FLDEFF_POKECENTER_HEAL
applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845
waitmovement 0
special ScrSpecial_HealPlayerParty
@@ -1815,7 +1816,7 @@ UseSurfScript:: @ 81A0117
compare RESULT, NO
goto_if_eq UseSurfScript_No
msgbox UsedSurfText, 4
- dofieldeffect 9
+ dofieldeffect FLDEFF_USE_SURF
UseSurfScript_No: @ 81A014C
releaseall
UseSurfScript_NoMon: @ 81A014D
@@ -3592,9 +3593,9 @@ SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4
gUnknown_081A2C51:: @ 81A2C51
special sub_80BB70C
- special sub_80BB63C
+ special CheckPlayerHasSecretBase
compare RESULT, 1
- goto_if_eq EventScript_1A2E45
+ goto_if_eq AskToMoveSecretBase
checkpartymove MOVE_SECRET_POWER
setfieldeffectargument 0, RESULT
buffermovename 1, MOVE_SECRET_POWER
@@ -3622,14 +3623,14 @@ EventScript_1A2CB0:
goto_if_eq EventScript_1A2F3A
msgbox UsedCutRockSmashText, 4
closemessage
- dofieldeffect 11
+ dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
waitstate
goto EventScript_1A2CFA
end
-gUnknown_081A2CE6:: @ 81A2CE6
+DoSecretBaseCaveFieldEffectScript:: @ 81A2CE6
lockall
- dofieldeffect 11
+ dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
waitstate
goto EventScript_1A2CFA
end
@@ -3653,14 +3654,14 @@ EventScript_1A2D08:
goto_if_eq EventScript_1A2F3A
msgbox UsedCutRockSmashText, 4
closemessage
- dofieldeffect 26
+ dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
waitstate
goto EventScript_1A2D52
end
-gUnknown_081A2D3E:: @ 81A2D3E
+DoSecretBaseTreeFieldEffectScript:: @ 81A2D3E
lockall
- dofieldeffect 26
+ dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
waitstate
goto EventScript_1A2D52
end
@@ -3684,14 +3685,14 @@ EventScript_1A2D60:
goto_if_eq EventScript_1A2F3A
msgbox UsedCutRockSmashText, 4
closemessage
- dofieldeffect 27
+ dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
waitstate
goto EventScript_1A2DAA
end
-gUnknown_081A2D96:: @ 81A2D96
+DoSecretBaseShrubFieldEffectScript:: @ 81A2D96
lockall
- dofieldeffect 27
+ dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
waitstate
goto EventScript_1A2DAA
end
@@ -3763,7 +3764,7 @@ EventScript_1A2E38:
waitstate
end
-EventScript_1A2E45:
+AskToMoveSecretBase:
checkpartymove MOVE_SECRET_POWER
compare RESULT, 6
goto_if_eq EventScript_1A2EF7
@@ -3790,17 +3791,17 @@ EventScript_1A2E45:
closemessage
closemessage
compare VAR_SPECIAL_7, 1
- goto_if_eq gUnknown_081A2CE6
+ goto_if_eq DoSecretBaseCaveFieldEffectScript
compare VAR_SPECIAL_7, 2
- goto_if_eq gUnknown_081A2CE6
+ goto_if_eq DoSecretBaseCaveFieldEffectScript
compare VAR_SPECIAL_7, 3
- goto_if_eq gUnknown_081A2CE6
+ goto_if_eq DoSecretBaseCaveFieldEffectScript
compare VAR_SPECIAL_7, 4
- goto_if_eq gUnknown_081A2CE6
+ goto_if_eq DoSecretBaseCaveFieldEffectScript
compare VAR_SPECIAL_7, 5
- goto_if_eq gUnknown_081A2D3E
+ goto_if_eq DoSecretBaseTreeFieldEffectScript
compare VAR_SPECIAL_7, 6
- goto_if_eq gUnknown_081A2D96
+ goto_if_eq DoSecretBaseShrubFieldEffectScript
releaseall
end
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index f5ba25643..5ce6c7fb9 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -12,14 +12,14 @@ S_CuttableTree:: @ 81B0DCC
goto_if_eq Cut_ChoseNo
msgbox UsedCutRockSmashText, 4
closemessage
- dofieldeffect 2
+ dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
goto DoTreeCutMovement
end
-S_UseCut:: @ 81B0E16
+DoCutFieldEffectScript:: @ 81B0E16
lockall
- dofieldeffect 2
+ dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
goto DoTreeCutMovement
end
@@ -69,14 +69,14 @@ S_BreakableRock:: @ 81B0EB7
goto_if_eq RockSmash_ChoseNo
msgbox UsedCutRockSmashText, 4
closemessage
- dofieldeffect 37
+ dofieldeffect FLDEFF_USE_ROCK_SMASH
waitstate
goto DoRockSmashMovement
end
S_UseRockSmash:: @ 81B0F01
lockall
- dofieldeffect 37
+ dofieldeffect FLDEFF_USE_ROCK_SMASH
waitstate
goto DoRockSmashMovement
end
@@ -133,14 +133,14 @@ S_PushableBoulder:: @ 81B0FCB
compare RESULT, NO
goto_if_eq Strength_ChoseNo
closemessage
- dofieldeffect 40
+ dofieldeffect FLDEFF_USE_STRENGTH
waitstate
goto UsedStrength
end
S_UseStrength:: @ 81B100E
lockall
- dofieldeffect 40
+ dofieldeffect FLDEFF_USE_STRENGTH
waitstate
goto UsedStrength
end
@@ -195,7 +195,7 @@ S_UseWaterfall:: @ 81B115A
compare RESULT, NO
goto_if_eq Waterfall_Done
msgbox UsedWaterfallText, 4
- dofieldeffect 43
+ dofieldeffect FLDEFF_USE_WATERFALL
goto Waterfall_Done
S_CannotUseWaterfall:: @ 81B1194
@@ -229,7 +229,7 @@ UseDiveScript:: @ 81B1220
compare RESULT, NO
goto_if_eq Dive_Done
msgbox UsedDiveText, 4
- dofieldeffect 44
+ dofieldeffect FLDEFF_USE_DIVE
goto Dive_Done
lockall
@@ -252,7 +252,7 @@ S_UseDiveUnderwater:: @ 81B1269
compare RESULT, NO
goto_if_eq UnderwaterDive_Done
msgbox UsedDiveText, 4
- dofieldeffect 44
+ dofieldeffect FLDEFF_USE_DIVE
goto UnderwaterDive_Done
UnderwaterCannotUseDive: @ 81B12A7
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
index 7f9b06500..5a5ab3005 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
@@ -42,11 +42,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B
setfieldeffectargument 0, 10
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
- dofieldeffect 54
+ dofieldeffect FLDEFF_SPARKLE
specialvar RESULT, FoundAbandonedShipRoom4Key
compare RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B
- waitfieldeffect 54
+ waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5
delay 20
compare RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B
- waitfieldeffect 54
+ waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -72,15 +72,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB
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 RESULT, FoundAbandonedShipRoom6Key
compare RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B
- waitfieldeffect 54
+ waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -89,19 +89,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23
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 RESULT, FoundAbandonedShipRoom2Key
compare RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B
- waitfieldeffect 54
+ waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -112,28 +112,28 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B
setfieldeffectargument 0, 42
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
- dofieldeffect 54
+ dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B
setfieldeffectargument 0, 20
setfieldeffectargument 1, 5
setfieldeffectargument 2, 0
- dofieldeffect 54
+ dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B
setfieldeffectargument 0, 1
setfieldeffectargument 1, 12
setfieldeffectargument 2, 0
- dofieldeffect 54
+ dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B
setfieldeffectargument 0, 1
setfieldeffectargument 1, 2
setfieldeffectargument 2, 0
- dofieldeffect 54
+ dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index aa79e1213..bba6d89bc 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -39,8 +39,8 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
setfieldeffectargument 0, 9
setfieldeffectargument 1, 13
setfieldeffectargument 2, 0
- dofieldeffect 54
- waitfieldeffect 54
+ dofieldeffect FLDEFF_SPARKLE
+ waitfieldeffect FLDEFF_SPARKLE
.ifdef SAPPHIRE
setvar RESULT, 3
.else
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
index 501f1e51c..c57f311b2 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
@@ -38,8 +38,8 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8
applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841
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_19FC13
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
index ee29b0f05..f632a4d41 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/scripts/maps/LilycoveCity.inc
@@ -397,10 +397,10 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B
waitmovement 0
delay 50
setfieldeffectargument 0, 1
- dofieldeffect 30
+ dofieldeffect FLDEFF_NPCFLY_OUT
delay 15
removeobject LAST_TALKED
- waitfieldeffect 30
+ waitfieldeffect FLDEFF_NPCFLY_OUT
savebgm 0
fadedefaultbgm
setflag FLAG_MET_RIVAL_LILYCOVE
diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc
index 5fb0f97ff..15ed22c5e 100644
--- a/data/scripts/maps/MossdeepCity_House4.inc
+++ b/data/scripts/maps/MossdeepCity_House4.inc
@@ -17,7 +17,7 @@ MossdeepCity_House4_EventScript_15AB46:: @ 815AB46
MossdeepCity_House4_EventScript_15AB50:: @ 815AB50
lock
faceplayer
- special sub_80BB63C
+ special CheckPlayerHasSecretBase
compare RESULT, 0
goto_if_eq MossdeepCity_House4_EventScript_15AB6D
special GetSecretBaseNearbyMapName
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index 3fceeb8d1..e7468ec4f 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -753,7 +753,7 @@ Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920
setfieldeffectargument 0, 32772
setfieldeffectargument 1, 32773
setfieldeffectargument 2, 32774
- dofieldeffect 54
- waitfieldeffect 54
+ dofieldeffect FLDEFF_SPARKLE
+ waitfieldeffect FLDEFF_SPARKLE
delay 10
return
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index b49834564..eb696b45b 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -240,10 +240,10 @@ Route120_EventScript_151908:: @ 8151908
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
diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc
index 6550db979..f580a7e0b 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/scripts/maps/Route128.inc
@@ -52,8 +52,8 @@ Route128_EventScript_15213F:: @ 815213F
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_15226F
waitmovement 0
@@ -77,10 +77,10 @@ Route128_EventScript_15213F:: @ 815213F
waitmovement 0
delay 50
setfieldeffectargument 0, 1
- dofieldeffect 30
+ dofieldeffect FLDEFF_NPCFLY_OUT
delay 15
removeobject 3
- waitfieldeffect 30
+ waitfieldeffect FLDEFF_NPCFLY_OUT
setvar VAR_ROUTE128_STATE, 2
releaseall
end
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index afc076a65..f9cd83cac 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -82,8 +82,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
setfieldeffectargument 0, 16
setfieldeffectargument 1, 42
setfieldeffectargument 2, 0
- dofieldeffect 54
- waitfieldeffect 54
+ dofieldeffect FLDEFF_SPARKLE
+ waitfieldeffect FLDEFF_SPARKLE
.ifdef SAPPHIRE
setvar RESULT, 0
.else
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 669d4ecfa..6222d3774 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -450,9 +450,9 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD
waitmovement 0
delay 50
setfieldeffectargument 0, 1
- dofieldeffect 30
+ dofieldeffect FLDEFF_NPCFLY_OUT
delay 15
removeobject LAST_TALKED
- waitfieldeffect 30
+ waitfieldeffect FLDEFF_NPCFLY_OUT
release
end
diff --git a/data/specials.inc b/data/specials.inc
index 73aa3e093..bb2065429 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -15,7 +15,7 @@ gSpecials::
def_special sub_80839A4
def_special sub_80839D0
def_special sub_80BB8CC
- def_special sub_80BB63C
+ def_special CheckPlayerHasSecretBase
def_special sub_80BBAF0
def_special sub_80BC440
def_special SecretBasePC_PackUp
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 15:59:07 +0000