summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/CeladonCity_Gym/scripts.inc6
-rw-r--r--data/maps/CeladonCity_Restaurant/scripts.inc2
-rw-r--r--data/maps/CeruleanCity/scripts.inc2
-rw-r--r--data/maps/CeruleanCity_BikeShop/scripts.inc2
-rw-r--r--data/maps/CeruleanCity_Gym/scripts.inc2
-rw-r--r--data/maps/CinnabarIsland_Gym/scripts.inc2
-rw-r--r--data/maps/FuchsiaCity_Building1/scripts.inc2
-rw-r--r--data/maps/FuchsiaCity_Gym/scripts.inc2
-rw-r--r--data/maps/FuchsiaCity_House2/scripts.inc2
-rw-r--r--data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc2
-rw-r--r--data/maps/MtEmber_RubyPath_B3F/scripts.inc2
-rw-r--r--data/maps/MtMoon_B2F/scripts.inc4
-rw-r--r--data/maps/OneIsland_PokemonCenter_1F/scripts.inc6
-rw-r--r--data/maps/PalletTown_GarysHouse/scripts.inc2
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/scripts.inc4
-rw-r--r--data/maps/PewterCity_Gym/scripts.inc2
-rw-r--r--data/maps/PewterCity_Museum_1F/scripts.inc2
-rw-r--r--data/maps/Route10_PokemonCenter_1F/scripts.inc2
-rw-r--r--data/maps/Route11_EastEntrance_2F/scripts.inc2
-rw-r--r--data/maps/Route12_FishingHouse/scripts.inc2
-rw-r--r--data/maps/Route12_NorthEntrance_2F/scripts.inc2
-rw-r--r--data/maps/Route15_WestEntrance_2F/scripts.inc2
-rw-r--r--data/maps/Route16_House/scripts.inc2
-rw-r--r--data/maps/Route16_NorthEntrance_2F/scripts.inc2
-rw-r--r--data/maps/Route24/scripts.inc2
-rw-r--r--data/maps/Route25_SeaCottage/scripts.inc2
-rw-r--r--data/maps/Route2_EastBuilding/scripts.inc2
-rw-r--r--data/maps/SSAnne_CaptainsOffice/scripts.inc2
-rw-r--r--data/maps/SafariZone_SecretHouse/scripts.inc2
-rw-r--r--data/maps/SaffronCity_Gym/scripts.inc2
-rw-r--r--data/maps/SaffronCity_House3/scripts.inc2
-rw-r--r--data/maps/SilphCo_11F/scripts.inc2
-rw-r--r--data/maps/ThreeIsland/scripts.inc2
-rw-r--r--data/maps/TwoIsland_JoyfulGameCorner/scripts.inc2
-rw-r--r--data/maps/VermilionCity_Gym/scripts.inc2
-rw-r--r--data/maps/VermilionCity_House1/scripts.inc2
-rw-r--r--data/maps/VermilionCity_PokemonFanClub/scripts.inc2
-rw-r--r--data/maps/ViridianCity_Gym/scripts.inc2
-rw-r--r--data/maps/ViridianCity_Mart/scripts.inc2
39 files changed, 45 insertions, 45 deletions
diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc
index de2ed3f54..30e71939c 100644
--- a/data/maps/CeladonCity_Gym/scripts.inc
+++ b/data/maps/CeladonCity_Gym/scripts.inc
@@ -36,10 +36,10 @@ EventScript_16D0C6:: @ 816D0C6
goto_if 1, EventScript_16D107
additem ITEM_TM19, 1
loadword 0, gUnknown_81973BA
- setorcopyvar VAR_0x8000, 307
+ setorcopyvar VAR_0x8000, ITEM_TM19
setorcopyvar VAR_0x8001, 1
- setorcopyvar VAR_0x8002, 257
- callstd 9
+ setorcopyvar VAR_0x8002, MUS_FANFA1
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x293
loadword 0, gUnknown_81973D7
callstd 4
diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc
index 347eb7008..54cb0417a 100644
--- a/data/maps/CeladonCity_Restaurant/scripts.inc
+++ b/data/maps/CeladonCity_Restaurant/scripts.inc
@@ -26,7 +26,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
setorcopyvar VAR_0x8000, 260
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x243
release
end
diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc
index f2f773d22..98c2f4756 100644
--- a/data/maps/CeruleanCity/scripts.inc
+++ b/data/maps/CeruleanCity/scripts.inc
@@ -201,7 +201,7 @@ EventScript_16662E:: @ 816662E
setorcopyvar VAR_0x8000, 316
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_817EEED
callstd 4
closemessage
diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc
index 80a25d69e..6fb4bfdfc 100644
--- a/data/maps/CeruleanCity_BikeShop/scripts.inc
+++ b/data/maps/CeruleanCity_BikeShop/scripts.inc
@@ -43,7 +43,7 @@ EventScript_16AC22:: @ 816AC22
setorcopyvar VAR_0x8000, 360
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x271
additem ITEM_BICYCLE, 1
removeitem ITEM_BIKE_VOUCHER, 1
diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc
index 7dec220b6..0c696ca64 100644
--- a/data/maps/CeruleanCity_Gym/scripts.inc
+++ b/data/maps/CeruleanCity_Gym/scripts.inc
@@ -36,7 +36,7 @@ EventScript_16AAF9:: @ 816AAF9
setorcopyvar VAR_0x8000, 291
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x297
loadword 0, gUnknown_81922BF
callstd 4
diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc
index a5397c97a..97ce3d7f0 100644
--- a/data/maps/CinnabarIsland_Gym/scripts.inc
+++ b/data/maps/CinnabarIsland_Gym/scripts.inc
@@ -89,7 +89,7 @@ EventScript_16DA34:: @ 816DA34
setorcopyvar VAR_0x8000, 326
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x24E
loadword 0, gUnknown_8199652
callstd 4
diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc
index ebec8f693..40edfa858 100644
--- a/data/maps/FuchsiaCity_Building1/scripts.inc
+++ b/data/maps/FuchsiaCity_Building1/scripts.inc
@@ -36,7 +36,7 @@ EventScript_16D780:: @ 816D780
setorcopyvar VAR_0x8000, 342
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x23A
removeitem ITEM_GOLD_TEETH, 1
release
diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc
index 0333627db..41ea7a40d 100644
--- a/data/maps/FuchsiaCity_Gym/scripts.inc
+++ b/data/maps/FuchsiaCity_Gym/scripts.inc
@@ -36,7 +36,7 @@ EventScript_16D5A6:: @ 816D5A6
setorcopyvar VAR_0x8000, 294
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x259
loadword 0, gUnknown_81985AB
callstd 4
diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc
index 135c68a77..f14e1bb32 100644
--- a/data/maps/FuchsiaCity_House2/scripts.inc
+++ b/data/maps/FuchsiaCity_House2/scripts.inc
@@ -32,7 +32,7 @@ EventScript_16D849:: @ 816D849
setorcopyvar VAR_0x8000, 263
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_8199296
callstd 4
setflag FLAG_0x244
diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
index d8ade4c2a..f5000c69d 100644
--- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
+++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
@@ -17,7 +17,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A
setorcopyvar VAR_0x8000, 350
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_81937E5
callstd 4
release
diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc
index 520b3ba31..23e8a361e 100644
--- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc
+++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc
@@ -12,6 +12,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49
setorcopyvar VAR_0x8000, 373
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
release
end
diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc
index 99a5c392e..923635aa3 100644
--- a/data/maps/MtMoon_B2F/scripts.inc
+++ b/data/maps/MtMoon_B2F/scripts.inc
@@ -69,7 +69,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B
setorcopyvar VAR_0x8000, 358
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
closemessage
special sub_8112364
delay 10
@@ -107,7 +107,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F
setorcopyvar VAR_0x8000, 357
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
closemessage
special sub_8112364
delay 10
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
index df9064d78..e63a08d64 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -117,7 +117,7 @@ EventScript_170CB1:: @ 8170CB1
setorcopyvar VAR_0x8000, 280
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
additem ITEM_METEORITE, 1
applymovement 3, Movement_1A75ED
waitmovement 0
@@ -128,7 +128,7 @@ EventScript_170CB1:: @ 8170CB1
setorcopyvar VAR_0x8000, 367
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_81A1150
callstd 4
compare_var_to_value VAR_0x4058, 2
@@ -175,7 +175,7 @@ EventScript_170E58:: @ 8170E58
setorcopyvar VAR_0x8000, 361
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
return
Movement_170E7D:: @ 8170E7D
diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc
index 80a77835a..88a265589 100644
--- a/data/maps/PalletTown_GarysHouse/scripts.inc
+++ b/data/maps/PalletTown_GarysHouse/scripts.inc
@@ -185,7 +185,7 @@ EventScript_168EF6:: @ 8168EF6
setorcopyvar VAR_0x8000, 361
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
release
end
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 9f6b65822..6af16d8d5 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -744,7 +744,7 @@ EventScript_16961E:: @ 816961E
setorcopyvar VAR_0x8000, 4
setorcopyvar VAR_0x8001, 5
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_818E6D0
callstd 4
setvar VAR_0x8004, 0
@@ -1053,7 +1053,7 @@ EventScript_169A45:: @ 8169A45
setorcopyvar VAR_0x8000, 4
setorcopyvar VAR_0x8001, 5
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x247
release
end
diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc
index 73cfc41bf..c517f90a7 100644
--- a/data/maps/PewterCity_Gym/scripts.inc
+++ b/data/maps/PewterCity_Gym/scripts.inc
@@ -38,7 +38,7 @@ EventScript_16A5F3:: @ 816A5F3
setorcopyvar VAR_0x8000, 327
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x254
loadword 0, gUnknown_8190FF8
callstd 4
diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc
index 5b981a5c4..0b33be6c8 100644
--- a/data/maps/PewterCity_Museum_1F/scripts.inc
+++ b/data/maps/PewterCity_Museum_1F/scripts.inc
@@ -182,7 +182,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE
setorcopyvar VAR_0x8000, 354
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
release
end
diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc
index 44c859362..353fac943 100644
--- a/data/maps/Route10_PokemonCenter_1F/scripts.inc
+++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc
@@ -56,7 +56,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
setorcopyvar VAR_0x8000, 195
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x2FA
loadword 0, gUnknown_819E7AF
callstd 4
diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc
index ceb2901d6..54a98787e 100644
--- a/data/maps/Route11_EastEntrance_2F/scripts.inc
+++ b/data/maps/Route11_EastEntrance_2F/scripts.inc
@@ -90,7 +90,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
setorcopyvar VAR_0x8000, 261
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x252
loadword 0, gUnknown_819EB59
callstd 4
diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc
index 51f6ace07..ec7b5e0a9 100644
--- a/data/maps/Route12_FishingHouse/scripts.inc
+++ b/data/maps/Route12_FishingHouse/scripts.inc
@@ -26,7 +26,7 @@ EventScript_16FF34:: @ 816FF34
setorcopyvar VAR_0x8000, 264
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x255
loadword 0, gUnknown_819F0EB
callstd 4
diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc
index a4b08a4dd..393b191f5 100644
--- a/data/maps/Route12_NorthEntrance_2F/scripts.inc
+++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc
@@ -29,7 +29,7 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A
setorcopyvar VAR_0x8000, 315
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_819EEC6
callstd 4
setflag FLAG_0x25B
diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc
index 5de7395c9..5c25559c3 100644
--- a/data/maps/Route15_WestEntrance_2F/scripts.inc
+++ b/data/maps/Route15_WestEntrance_2F/scripts.inc
@@ -45,7 +45,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
setorcopyvar VAR_0x8000, 182
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x256
loadword 0, gUnknown_819F71F
callstd 4
diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc
index 95b86aca1..3b5c5868e 100644
--- a/data/maps/Route16_House/scripts.inc
+++ b/data/maps/Route16_House/scripts.inc
@@ -16,7 +16,7 @@ Route16_House_EventScript_17014F:: @ 817014F
setorcopyvar VAR_0x8000, 340
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_819F8E0
callstd 4
setflag FLAG_0x238
diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc
index 979bcc3f5..60644f527 100644
--- a/data/maps/Route16_NorthEntrance_2F/scripts.inc
+++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc
@@ -47,7 +47,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
setorcopyvar VAR_0x8000, 189
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x2FD
loadword 0, gUnknown_819FC93
callstd 4
diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc
index f9025fde0..8b27df5f5 100644
--- a/data/maps/Route24/scripts.inc
+++ b/data/maps/Route24/scripts.inc
@@ -62,7 +62,7 @@ EventScript_1686B9:: @ 81686B9
setorcopyvar VAR_0x8000, 110
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
message Text_188CDB
waitmessage
playbgm BGM_FRLG_SUSPICIOUS_EYE, 0
diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc
index 841bb5159..d609226bf 100644
--- a/data/maps/Route25_SeaCottage/scripts.inc
+++ b/data/maps/Route25_SeaCottage/scripts.inc
@@ -124,7 +124,7 @@ EventScript_17064A:: @ 817064A
setorcopyvar VAR_0x8000, 265
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x235
setflag FLAG_0x031
setflag FLAG_0x234
diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc
index c11cc3309..2e8c9101c 100644
--- a/data/maps/Route2_EastBuilding/scripts.inc
+++ b/data/maps/Route2_EastBuilding/scripts.inc
@@ -27,7 +27,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
setorcopyvar VAR_0x8000, 343
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x23B
loadword 0, gUnknown_819D7C1
callstd 4
diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc
index 56e5b2fec..aa693b700 100644
--- a/data/maps/SSAnne_CaptainsOffice/scripts.inc
+++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc
@@ -23,7 +23,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
setorcopyvar VAR_0x8000, 339
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_81737D2
callstd 4
setflag FLAG_0x237
diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc
index 5421aa298..3f5fe1e38 100644
--- a/data/maps/SafariZone_SecretHouse/scripts.inc
+++ b/data/maps/SafariZone_SecretHouse/scripts.inc
@@ -16,7 +16,7 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453
setorcopyvar VAR_0x8000, 341
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_8177EB7
callstd 4
setflag FLAG_0x239
diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc
index 4924a6c2c..83ef16597 100644
--- a/data/maps/SaffronCity_Gym/scripts.inc
+++ b/data/maps/SaffronCity_Gym/scripts.inc
@@ -39,7 +39,7 @@ EventScript_16EE3D:: @ 816EE3D
setorcopyvar VAR_0x8000, 292
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x29A
loadword 0, gUnknown_819B685
callstd 4
diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc
index fd0628823..d1b3ad033 100644
--- a/data/maps/SaffronCity_House3/scripts.inc
+++ b/data/maps/SaffronCity_House3/scripts.inc
@@ -16,7 +16,7 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F
setorcopyvar VAR_0x8000, 317
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_819C18F
callstd 4
setflag FLAG_0x245
diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc
index c3f864c14..01f9254d5 100644
--- a/data/maps/SilphCo_11F/scripts.inc
+++ b/data/maps/SilphCo_11F/scripts.inc
@@ -25,7 +25,7 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE
setorcopyvar VAR_0x8000, 1
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_8176FEB
callstd 4
setflag FLAG_0x250
diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc
index cfb5507b8..cf1dded03 100644
--- a/data/maps/ThreeIsland/scripts.inc
+++ b/data/maps/ThreeIsland/scripts.inc
@@ -57,7 +57,7 @@ EventScript_16781A:: @ 816781A
setorcopyvar VAR_0x8000, 19
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
additem ITEM_FULL_RESTORE, 1
setflag FLAG_0x2FC
loadword 0, gUnknown_81827F1
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
index 58b6052f2..e027a97fe 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
@@ -190,7 +190,7 @@ EventScript_1715C4:: @ 81715C4
setorcopyvar VAR_0x8000, 94
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
release
end
diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc
index b2a2fa8b1..f3229a4e1 100644
--- a/data/maps/VermilionCity_Gym/scripts.inc
+++ b/data/maps/VermilionCity_Gym/scripts.inc
@@ -253,7 +253,7 @@ EventScript_16B9AF:: @ 816B9AF
setorcopyvar VAR_0x8000, 322
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x231
loadword 0, gUnknown_8194DA8
callstd 4
diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc
index 870b24620..b4b9d1126 100644
--- a/data/maps/VermilionCity_House1/scripts.inc
+++ b/data/maps/VermilionCity_House1/scripts.inc
@@ -32,7 +32,7 @@ EventScript_16B3D9:: @ 816B3D9
setorcopyvar VAR_0x8000, 262
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x240
loadword 0, gUnknown_8193FAF
callstd 4
diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc
index 58c03b78b..30f31c6f5 100644
--- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc
+++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc
@@ -33,7 +33,7 @@ EventScript_16B4B1:: @ 816B4B1
setorcopyvar VAR_0x8000, 352
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
loadword 0, gUnknown_819477C
callstd 4
release
diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc
index d714546da..c06fa00cc 100644
--- a/data/maps/ViridianCity_Gym/scripts.inc
+++ b/data/maps/ViridianCity_Gym/scripts.inc
@@ -41,7 +41,7 @@ EventScript_169F2F:: @ 8169F2F
setorcopyvar VAR_0x8000, 314
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 257
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x298
loadword 0, gUnknown_818F695
callstd 4
diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc
index c1a07d1e0..66ed9683d 100644
--- a/data/maps/ViridianCity_Mart/scripts.inc
+++ b/data/maps/ViridianCity_Mart/scripts.inc
@@ -36,7 +36,7 @@ EventScript_16A205:: @ 816A205
setorcopyvar VAR_0x8000, 349
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, 318
- callstd 9
+ callstd 9 @ gStdScript_ItemMessageAndFanfare
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5
releaseall
end