summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/berry_tree.inc2
-rw-r--r--data/scripts/cable_club.inc2
-rw-r--r--data/scripts/day_care.inc2
-rw-r--r--data/scripts/maps/BattleTower_BattleRoom.inc4
-rw-r--r--data/scripts/maps/IslandCave.inc2
-rw-r--r--data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc2
-rw-r--r--data/scripts/maps/LilycoveCity_Harbor.inc2
-rw-r--r--data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc6
-rw-r--r--data/scripts/maps/MossdeepCity_GameCorner_B1F.inc2
-rw-r--r--data/scripts/maps/Route101.inc2
-rw-r--r--data/scripts/maps/Route110.inc2
-rw-r--r--data/scripts/maps/SlateportCity.inc2
-rw-r--r--data/scripts/players_house.inc2
13 files changed, 16 insertions, 16 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 1bbe7d355..f4707d8cb 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,4 +1,4 @@
-BerryTreeScript:: @ 81A14DD
+S_BerryTree:: @ 81A14DD
special FieldObjectInteractionGetBerryTreeData
switch 0x8004
case 255, Route102_EventScript_1A1533
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 5728b52d8..6507677e0 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -215,7 +215,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5
OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
- special HealPlayerParty
+ special ScrSpecial_HealPlayerParty
special SavePlayerParty
special LoadPlayerBag
copyvar 0x4087, 0x8004
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index b5b3d4670..dcc4b44e7 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -282,7 +282,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
release
end
-Event_EggHatch:: @ 81B25BC
+S_EggHatch:: @ 81B25BC
lockall
msgbox UnknownString_81B2C68, 4
special EggHatch
diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc
index 176d8e8e8..2f0fb97b9 100644
--- a/data/scripts/maps/BattleTower_BattleRoom.inc
+++ b/data/scripts/maps/BattleTower_BattleRoom.inc
@@ -20,7 +20,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
msgbox 0x20234cc, 4
waittext
closebutton
- special HealPlayerParty
+ special ScrSpecial_HealPlayerParty
setvar 0x8004, 0
setvar 0x8005, 0
special sub_813556C
@@ -56,7 +56,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961
special sub_8135A14
fanfare 368
waitfanfare
- special HealPlayerParty
+ special ScrSpecial_HealPlayerParty
BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2
msgbox BattleTower_BattleRoom_Text_19AD09, 5
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index 8f2ce6dc1..2f8ba2121 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -31,7 +31,7 @@ IslandCave_MapScript1_15EF15:: @ 815EF15
setflag 2133
end
-gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19
+S_OpenRegiceChamber:: @ 815EF19
setmaptile 7, 19, 554, 1
setmaptile 8, 19, 555, 1
setmaptile 9, 19, 556, 1
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index dcf74b77c..09d19c1c5 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
@@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD
message LilycoveCity_CoveLilyMotel_2F_Text_18708F
waittext
call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5
- special sub_810D6A4
+ special ScrSpecial_ShowDiploma
waitstate
release
end
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index f8ff8f9f3..aca6b16d4 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
@@ -135,7 +135,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
callif 1, LilycoveCity_Harbor_EventScript_1599CE
pause 30
spriteinvisible 255, 0, 0
- special HealPlayerParty
+ special ScrSpecial_HealPlayerParty
setvar 0x8004, 2
call LilycoveCity_Harbor_EventScript_1A040E
warp SouthernIsland_Exterior, 255, 13, 22
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
index 6adea2eb2..2786c930c 100644
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
@@ -21,7 +21,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
special sub_80FA148
compare RESULT, 1
jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71
- special sub_80F9F3C
+ special ScrSpecial_CountPokemonMoves
compare RESULT, 1
jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64
msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
@@ -30,7 +30,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
fadescreen 0
compare 0x8005, 4
jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
- special sub_80F9F84
+ special ScrSpecial_GetPokemonNicknameAndMoveName
msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5
switch RESULT
case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53
@@ -47,7 +47,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
end
LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64
- special sub_80F9F84
+ special ScrSpecial_GetPokemonNicknameAndMoveName
msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4
releaseall
end
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index a5a013d5f..c7d1201fd 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
@@ -29,7 +29,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
compare RESULT, 2
callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE
closebutton
- special HealPlayerParty
+ special ScrSpecial_HealPlayerParty
move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF
waitmove 0
special LoadPlayerParty
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 1acd4b598..d945aadfc 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -229,7 +229,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F
move 2, Route101_Movement_14EAD7
waitmove 0
msgbox Route101_Text_16D191, 4
- special HealPlayerParty
+ special ScrSpecial_HealPlayerParty
setflag 720
clearflag 721
setflag 700
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
index d8c19d92c..a77feaa0f 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/scripts/maps/Route110.inc
@@ -25,7 +25,7 @@ Route110_MapScript2_14F933:: @ 814F933
.2byte 0
Route110_EventScript_14F93D:: @ 814F93D
- special BeginCyclingRoadChallenge
+ special ScrSpecial_BeginCyclingRoadChallenge
setvar 0x40a9, 2
return
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 48eb5c1df..e156f8948 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -69,7 +69,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0
specialval RESULT, LeadMonHasEffortRibbon
compare RESULT, 1
callif 1, SlateportCity_EventScript_14BB35
- specialval RESULT, GetLeadMonEVCount
+ specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut
compare RESULT, 0
callif 1, SlateportCity_EventScript_14BB2B
msgbox SlateportCity_Text_164691, 4
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index ca4b2bdb9..e9f379b24 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -107,7 +107,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91
inccounter GAME_STAT_CHECKED_CLOCK
fadescreen 1
- special sub_810D6B8
+ special ScrSpecial_ViewWallClock
waitstate
releaseall
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 22:51:45 +0000