diff options
39 files changed, 50 insertions, 210 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 11ec30d74..8879df208 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1434,3 +1434,11 @@ setorcopyvar 0x8001, \amount callstd \function .endm + + .macro giveitemfanfaremsg msg, item, amount=1, fanfare=MUS_FANFA1, function=9 + loadword 0, \msg + setorcopyvar 0x8000, \item + setorcopyvar 0x8001, \amount + setorcopyvar 0x8002, \fanfare + callstd \function + .endm diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 54cb0417a..e8ff33eee 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -22,11 +22,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D241 additem ITEM_COIN_CASE, 1 - loadword 0, gUnknown_8197A38 - setorcopyvar VAR_0x8000, 260 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE setflag FLAG_0x243 release end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 98c2f4756..f13e36eea 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -197,11 +197,7 @@ EventScript_16662E:: @ 816662E compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_166677 additem ITEM_TM28, 1 - loadword 0, gUnknown_817EEBF - setorcopyvar VAR_0x8000, 316 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 loadword 0, gUnknown_817EEED callstd 4 closemessage diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 6fb4bfdfc..4a3271ed1 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -39,11 +39,7 @@ EventScript_16AC15:: @ 816AC15 EventScript_16AC22:: @ 816AC22 loadword 0, gUnknown_81927B2 callstd 4 - loadword 0, gUnknown_81927E1 - setorcopyvar VAR_0x8000, 360 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, BGM_FRLG_ME_KEYITEM 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 0c696ca64..e57532979 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -32,11 +32,7 @@ EventScript_16AAF9:: @ 816AAF9 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AB3A additem ITEM_TM03, 1 - loadword 0, gUnknown_81923F1 - setorcopyvar VAR_0x8000, 291 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 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 97ce3d7f0..e206f46db 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -85,11 +85,7 @@ EventScript_16DA34:: @ 816DA34 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16DA75 additem ITEM_TM38, 1 - loadword 0, gUnknown_81996FF - setorcopyvar VAR_0x8000, 326 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 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 40edfa858..df15b2d46 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -32,11 +32,7 @@ EventScript_16D780:: @ 816D780 compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_16D7DF additem ITEM_HM04, 1 - loadword 0, gUnknown_8199068 - setorcopyvar VAR_0x8000, 342 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8199068, ITEM_HM04 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 41ea7a40d..ff59fdb4b 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -32,11 +32,7 @@ EventScript_16D5A6:: @ 816D5A6 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D5E7 additem ITEM_TM06, 1 - loadword 0, gUnknown_819858F - setorcopyvar VAR_0x8000, 294 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 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 f14e1bb32..e9470babb 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -28,11 +28,7 @@ EventScript_16D849:: @ 816D849 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D88A additem ITEM_GOOD_ROD, 1 - loadword 0, gUnknown_819925E - setorcopyvar VAR_0x8000, 263 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD 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 f5000c69d..1070e8850 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -13,11 +13,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A goto_if 1, EventScript_16B1A0 setflag FLAG_0x23D additem ITEM_POKE_FLUTE, 1 - loadword 0, gUnknown_81937BD - setorcopyvar VAR_0x8000, 350 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, BGM_FRLG_ME_KEYITEM 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 23e8a361e..bc9266e8b 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -8,10 +8,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 setflag FLAG_0x2DD removeobject 1 additem ITEM_RUBY, 1 - loadword 0, gUnknown_817ADC5 - setorcopyvar VAR_0x8000, 373 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, BGM_FRLG_ME_KEYITEM release end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 923635aa3..721af3880 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -65,11 +65,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B goto_if 1, EventScript_1607DE removeobject 1 additem ITEM_DOME_FOSSIL, 1 - loadword 0, gUnknown_8172ECD - setorcopyvar VAR_0x8000, 358 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, BGM_FRLG_ME_KEYITEM closemessage special sub_8112364 delay 10 @@ -103,11 +99,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F goto_if 1, EventScript_1607DE removeobject 2 additem ITEM_HELIX_FOSSIL, 1 - loadword 0, gUnknown_8172EB2 - setorcopyvar VAR_0x8000, 357 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, BGM_FRLG_ME_KEYITEM 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 e63a08d64..e52bdad8d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -113,22 +113,14 @@ EventScript_170CB1:: @ 8170CB1 waitmovement 0 loadword 0, gUnknown_81A0FB1 callstd 4 - loadword 0, gUnknown_81A10EE - setorcopyvar VAR_0x8000, 280 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, BGM_FRLG_ME_KEYITEM additem ITEM_METEORITE, 1 applymovement 3, Movement_1A75ED waitmovement 0 loadword 0, gUnknown_81A1113 callstd 4 additem ITEM_TRI_PASS, 1 - loadword 0, gUnknown_81A231B - setorcopyvar VAR_0x8000, 367 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, BGM_FRLG_ME_KEYITEM loadword 0, gUnknown_81A1150 callstd 4 compare_var_to_value VAR_0x4058, 2 @@ -171,11 +163,7 @@ EventScript_170E58:: @ 8170E58 setflag FLAG_0x039 setvar VAR_0x4058, 2 additem ITEM_TOWN_MAP, 1 - loadword 0, gUnknown_81A1218 - setorcopyvar VAR_0x8000, 361 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, BGM_FRLG_ME_KEYITEM return Movement_170E7D:: @ 8170E7D diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 88a265589..1d7959229 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -181,11 +181,7 @@ EventScript_168EF6:: @ 8168EF6 waitmovement 0 delay 12 additem ITEM_TOWN_MAP, 1 - loadword 0, gUnknown_818D661 - setorcopyvar VAR_0x8000, 361 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_818D661, ITEM_TOWN_MAP, 1, BGM_FRLG_ME_KEYITEM release end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 6af16d8d5..2d310234e 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -740,11 +740,7 @@ EventScript_16961E:: @ 816961E loadword 0, gUnknown_818E612 callstd 4 additem ITEM_POKE_BALL, 5 - loadword 0, gUnknown_818E6B3 - setorcopyvar VAR_0x8000, 4 - setorcopyvar VAR_0x8001, 5 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 loadword 0, gUnknown_818E6D0 callstd 4 setvar VAR_0x8004, 0 @@ -1049,11 +1045,7 @@ EventScript_169A45:: @ 8169A45 loadword 0, gUnknown_818E89C callstd 4 additem ITEM_POKE_BALL, 5 - loadword 0, gUnknown_818E6B3 - setorcopyvar VAR_0x8000, 4 - setorcopyvar VAR_0x8001, 5 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 setflag FLAG_0x247 release end diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index c517f90a7..3d9ee1d2f 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -34,11 +34,7 @@ EventScript_16A5F3:: @ 816A5F3 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16A634 additem ITEM_TM39, 1 - loadword 0, gUnknown_8190FDB - setorcopyvar VAR_0x8000, 327 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 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 0b33be6c8..94b04c528 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -178,11 +178,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE setflag FLAG_0x25E removeobject 4 additem ITEM_OLD_AMBER, 1 - loadword 0, gUnknown_8190866 - setorcopyvar VAR_0x8000, 354 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, BGM_FRLG_ME_KEYITEM release end diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 353fac943..791cab192 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -52,11 +52,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_EVERSTONE, 1 - loadword 0, gUnknown_819E786 - setorcopyvar VAR_0x8000, 195 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE 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 54a98787e..10f9539b5 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -86,11 +86,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_ITEMFINDER, 1 - loadword 0, gUnknown_819EB37 - setorcopyvar VAR_0x8000, 261 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER 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 ec7b5e0a9..1973de14c 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -22,11 +22,7 @@ EventScript_16FF34:: @ 816FF34 additem ITEM_SUPER_ROD, 1 loadword 0, gUnknown_819F05B callstd 4 - loadword 0, gUnknown_819F0B2 - setorcopyvar VAR_0x8000, 264 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD 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 393b191f5..adf7f0040 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -25,11 +25,7 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16FEF7 additem ITEM_TM27, 1 - loadword 0, gUnknown_819EE9F - setorcopyvar VAR_0x8000, 315 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 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 5c25559c3..8685b0528 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -41,11 +41,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_EXP_SHARE, 1 - loadword 0, gUnknown_819F6FD - setorcopyvar VAR_0x8000, 182 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE 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 3b5c5868e..d48a944dc 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -12,11 +12,7 @@ Route16_House_EventScript_17014F:: @ 817014F compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_17019B additem ITEM_HM02, 1 - loadword 0, gUnknown_819F8C0 - setorcopyvar VAR_0x8000, 340 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 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 60644f527..f72336971 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -43,11 +43,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_AMULET_COIN, 1 - loadword 0, gUnknown_819FC68 - setorcopyvar VAR_0x8000, 189 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_0x2FD loadword 0, gUnknown_819FC93 callstd 4 diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 8b27df5f5..a083019e1 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -58,11 +58,7 @@ EventScript_168678:: @ 8168678 EventScript_1686B9:: @ 81686B9 additem ITEM_NUGGET, 1 - loadword 0, gUnknown_8188C93 - setorcopyvar VAR_0x8000, 110 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8188C93, ITEM_NUGGET 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 d609226bf..3c412fb75 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -120,11 +120,7 @@ EventScript_17064A:: @ 817064A compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1706BE additem ITEM_SS_TICKET, 1 - loadword 0, gUnknown_81A028E - setorcopyvar VAR_0x8000, 265 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, BGM_FRLG_ME_KEYITEM 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 2e8c9101c..513ac758b 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -23,11 +23,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_HM05, 1 - loadword 0, gUnknown_819D7A1 - setorcopyvar VAR_0x8000, 343 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 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 aa693b700..23e1d6b36 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -19,11 +19,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A loadword 0, gUnknown_81736A6 callstd 4 additem ITEM_HM01, 1 - loadword 0, gUnknown_81737AF - setorcopyvar VAR_0x8000, 339 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, BGM_FRLG_ME_KEYITEM 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 3f5fe1e38..6e9e27f70 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -12,11 +12,7 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16249F additem ITEM_HM03, 1 - loadword 0, gUnknown_8177E92 - setorcopyvar VAR_0x8000, 341 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 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 83ef16597..343379bbd 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -35,11 +35,7 @@ EventScript_16EE3D:: @ 816EE3D compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16EE7E additem ITEM_TM04, 1 - loadword 0, gUnknown_819B7D3 - setorcopyvar VAR_0x8000, 292 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 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 d1b3ad033..8d45865f0 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -12,11 +12,7 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F0AB additem ITEM_TM29, 1 - loadword 0, gUnknown_819C16C - setorcopyvar VAR_0x8000, 317 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 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 01f9254d5..ac317f89c 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -21,11 +21,7 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_161E6B additem ITEM_MASTER_BALL, 1 - loadword 0, gUnknown_8176FBD - setorcopyvar VAR_0x8000, 1 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, BGM_FRLG_ME_KEYITEM loadword 0, gUnknown_8176FEB callstd 4 setflag FLAG_0x250 diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index cf1dded03..94101ba9b 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -53,11 +53,7 @@ EventScript_16781A:: @ 816781A checkitemspace ITEM_FULL_RESTORE, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_167865 - loadword 0, gUnknown_81827BE - setorcopyvar VAR_0x8000, 19 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE 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 e027a97fe..bb39c4f80 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -186,11 +186,7 @@ EventScript_1715C4:: @ 81715C4 goto_if 1, EventScript_1715FF additem ITEM_MOON_STONE, 1 setflag FLAG_0x2FB - loadword 0, gUnknown_81A2A9A - setorcopyvar VAR_0x8000, 94 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81A2A9A, ITEM_MOON_STONE release end diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index f3229a4e1..22dc7f6a9 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -249,11 +249,7 @@ EventScript_16B9AF:: @ 816B9AF compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16B9F0 additem ITEM_TM34, 1 - loadword 0, gUnknown_8194D87 - setorcopyvar VAR_0x8000, 322 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 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 b4b9d1126..3e07e1143 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -28,11 +28,7 @@ EventScript_16B3D9:: @ 816B3D9 additem ITEM_OLD_ROD, 1 loadword 0, gUnknown_8193F2A callstd 4 - loadword 0, gUnknown_8193F81 - setorcopyvar VAR_0x8000, 262 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD 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 30f31c6f5..4fc8d5b25 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -29,11 +29,7 @@ EventScript_16B4B1:: @ 816B4B1 goto_if 1, EventScript_16B4F2 setflag FLAG_0x241 additem ITEM_BIKE_VOUCHER, 1 - loadword 0, gUnknown_819474E - setorcopyvar VAR_0x8000, 352 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, BGM_FRLG_ME_KEYITEM loadword 0, gUnknown_819477C callstd 4 release diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index c06fa00cc..283b4e15b 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -37,11 +37,7 @@ EventScript_169F2F:: @ 8169F2F compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_169F70 additem ITEM_TM26, 1 - loadword 0, gUnknown_818F675 - setorcopyvar VAR_0x8000, 314 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 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 66ed9683d..250538d21 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -32,11 +32,7 @@ EventScript_16A205:: @ 816A205 callstd 4 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 additem ITEM_OAKS_PARCEL, 1 - loadword 0, gUnknown_8190289 - setorcopyvar VAR_0x8000, 349 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, BGM_FRLG_ME_KEYITEM setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end |