diff options
41 files changed, 156 insertions, 79 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 1eebf3df8..cff61440b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -45,16 +45,16 @@ gSpecialVars:: @ 815FD0C .align 2 gStdScripts:: @ 8160450 - .4byte gStdScript_81A667B - .4byte gStdScript_81A67B3 - .4byte gStdScript_81A4E3F - .4byte gStdScript_81A4E4A - .4byte gStdScript_81A4E54 - .4byte gStdScript_81A4E5C - .4byte gStdScript_81A501F - .4byte gStdScript_81A676C - .4byte gStdScript_81A8E58 - .4byte gStdScript_81A4E66 + .4byte gStdScript_0 + .4byte gStdScript_1 + .4byte gStdScript_2 + .4byte gStdScript_3 + .4byte gStdScript_4 + .4byte gStdScript_5 + .4byte gStdScript_Message_WaitButton_AndRelease + .4byte gStdScript_7 + .4byte gStdScript_8 + .4byte gStdScript_ItemMessageAndFanfare gStdScriptsEnd:: .include "data/map_event_scripts.inc" diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 39bad2fcc..58bc6868a 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -5214,37 +5214,89 @@ gUnknown_8197057:: @ 8197057 .incbin "baserom.gba", 0x197057, 0x23 Text_19707A:: @ 819707A - .incbin "baserom.gba", 0x19707A, 0x23 + .string "Which prize would you like?$" + +gUnknown_8197096:: @ 8197096 + .string "はい どうぞ$" gUnknown_819709D:: @ 819709D - .incbin "baserom.gba", 0x19709D, 0x15 + .string "So, you want the {STR_VAR_1}?$" gUnknown_81970B2:: @ 81970B2 - .incbin "baserom.gba", 0x1970B2, 0x23 + .string "Okay, a TM of {STR_VAR_2}\n" + .string "is what you want?$" gUnknown_81970D5:: @ 81970D5 - .incbin "baserom.gba", 0x1970D5, 0x3F + .string "Sorry, you’ll need more COINS\n" + .string "than that.$" + +gUnknown_81970FE:: @ 81970FE + .string "おきゃくさん もう もてないよ$" + +gUnknown_819710E:: @ 819710E + .string "あっ そう$" Text_197114:: @ 8197114 - .incbin "baserom.gba", 0x197114, 0x14C + .string "Hello…\n" + .string "Lovely weather, isn’t it?\l" + .string "It’s so pleasant…\p" + + .string "…Oh, dear…\n" + .string "I must have dozed off. Welcome.\p" + + .string "My name is ERIKA.\n" + .string "I am the LEADER of CELADON GYM.\p" + + .string "I am a student of the art of\n" + .string "flower arranging.\p" + + .string "My POKéMON are solely of the\n" + .string "GRASS type.\p" + + .string "…Oh, I’m sorry, I had no idea that\n" + .string "you wished to challenge me.\p" + + .string "Very well, but I shall not lose.{PLAY_BGM BGM_FRLG_LEADER_EYE}$" Text_197260:: @ 8197260 - .incbin "baserom.gba", 0x197260, 0x58 + .string "Oh!\n" + .string "I concede defeat.\l" + .string "You are remarkably strong.\p" + + .string "I must confer on you the\n" + .string "RAINBOWBADGE.$" gUnknown_81972B8:: @ 81972B8 - .incbin "baserom.gba", 0x1972B8, 0x6F + .string "You are cataloging POKéMON?\n" + .string "I must say I’m impressed.\p" + + .string "I would never collect POKéMON if\n" + .string "they were unattractive.$" gUnknown_8197327:: @ 8197327 - .incbin "baserom.gba", 0x197327, 0x93 + .string "The RAINBOWBADGE will make\n" + .string "POKéMON up to Lv. 50 obey.\p" + + .string "It also allows POKéMON to use\n" + .string "STRENGTH in and out of battle.\p" + + .string "Please also take this with you.$" gUnknown_81973BA:: @ 81973BA - .incbin "baserom.gba", 0x1973BA, 0x1D + .string "{PLAYER} received TM19\n" + .string "from ERIKA.$" gUnknown_81973D7:: @ 81973D7 - .incbin "baserom.gba", 0x1973D7, 0x86 + .string "TM19 contains GIGA DRAIN.\p" + + .string "Half the damage it inflicts is\n" + .string "drained to heal your POKéMON.\p" + + .string "Wouldn’t you agree that it’s a\n" + .string "wonderful move?$" gUnknown_819745D:: @ 819745D - .incbin "baserom.gba", 0x19745D, 0x1F + .string "You should make room for this.$" Text_19747C:: @ 819747C .incbin "baserom.gba", 0x19747C, 0x48 @@ -7038,7 +7090,7 @@ gUnknown_81A4DF5:: @ 81A4DF5 gUnknown_81A4E26:: @ 81A4E26 .incbin "baserom.gba", 0x1A4E26, 0x19 -gStdScript_81A4E3F:: @ 81A4E3F +gStdScript_2:: @ 81A4E3F lock faceplayer message 0x0 @@ -7047,7 +7099,7 @@ gStdScript_81A4E3F:: @ 81A4E3F release return -gStdScript_81A4E4A:: @ 81A4E4A +gStdScript_3:: @ 81A4E4A lockall message 0x0 waitmessage @@ -7055,28 +7107,28 @@ gStdScript_81A4E4A:: @ 81A4E4A releaseall return -gStdScript_81A4E54:: @ 81A4E54 +gStdScript_4:: @ 81A4E54 message 0x0 waitmessage waitbuttonpress return -gStdScript_81A4E5C:: @ 81A4E5C +gStdScript_5:: @ 81A4E5C message 0x0 waitmessage yesnobox 20, 8 return -gStdScript_81A4E66:: @ 81A4E66 +gStdScript_ItemMessageAndFanfare:: @ 81A4E66 textcolor 3 - compare_var_to_value VAR_0x8002, 257 + compare_var_to_value VAR_0x8002, MUS_FANFA1 call_if 1, EventScript_1A4EA2 - compare_var_to_value VAR_0x8002, 318 + compare_var_to_value VAR_0x8002, BGM_FRLG_ME_KEYITEM call_if 1, EventScript_1A4EA6 message 0x0 waitmessage waitfanfare - compare_var_to_value VAR_0x8002, 257 + compare_var_to_value VAR_0x8002, MUS_FANFA1 call_if 1, EventScript_1A4EAA setorcopyvar VAR_0x8000, VAR_0x8000 setorcopyvar VAR_0x8001, VAR_0x8001 @@ -7126,7 +7178,7 @@ gUnknown_81A4F3E:: @ 81A4F3E gUnknown_81A4F73:: @ 81A4F73 .incbin "baserom.gba", 0x1A4F73, 0xAC -gStdScript_81A501F:: @ 81A501F +gStdScript_Message_WaitButton_AndRelease:: @ 81A501F message 0x0 waitmessage waitbuttonpress @@ -7250,7 +7302,7 @@ EventScript_1A6578:: @ 81A6578 EventScript_1A6675:: @ 81A6675 .incbin "baserom.gba", 0x1A6675, 0x6 -gStdScript_81A667B:: @ 81A667B +gStdScript_0:: @ 81A667B copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID textcolor 3 additem VAR_0x8000, VAR_0x8001 @@ -7334,7 +7386,7 @@ EventScript_1A6768:: @ 81A6768 playfanfare MUS_FANFA1 return -gStdScript_81A676C:: @ 81A676C +gStdScript_7:: @ 81A676C adddecor VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT call EventScript_1A677A @@ -7362,7 +7414,7 @@ EventScript_1A67AD:: @ 81A67AD setvar VAR_RESULT, 0 return -gStdScript_81A67B3:: @ 81A67B3 +gStdScript_1:: @ 81A67B3 lock faceplayer waitse @@ -7923,7 +7975,7 @@ gUnknown_81A8DD8:: @ 81A8DD8 gUnknown_81A8DFD:: @ 81A8DFD .incbin "baserom.gba", 0x1A8DFD, 0x5B -gStdScript_81A8E58:: @ 81A8E58 +gStdScript_8:: @ 81A8E58 .incbin "baserom.gba", 0x1A8E58, 0x6D EventScript_1A8EC5:: @ 81A8EC5 @@ -10266,16 +10318,20 @@ gUnknown_81C5FDC:: gUnknown_81C601C:: .string "My RATTATA reduced the foe’s HP\n" .string "to zero, so it wins!\p" + .string "The POKéMON that took part in the\n" .string "battle get EXP. Points.\p" + .string "When a POKéMON collects enough\n" .string "EXP. Points, it levels up.\p" + .string "Leveling up makes your POKéMON\n" .string "stronger than before.$" gUnknown_81C60FA:: .string "POKé DUDE: Uh-oh…\n" .string "My RATTATA has been poisoned…\p" + .string "If a POKéMON is poisoned, it loses\n" .string "HP steadily.$" @@ -10286,6 +10342,7 @@ gUnknown_81C615A:: gUnknown_81C6196:: .string "Using an item on a POKéMON uses\n" .string "up one turn, though.\p" + .string "Now, it’s the opponent’s turn!$" gUnknown_81C61EA:: @@ -10295,41 +10352,53 @@ gUnknown_81C61EA:: gUnknown_81C6202:: .string "POKé DUDE: The move BUBBLE is\n" .string "a WATER-type attack.\p" + .string "The targeted ODDISH is a\n" .string "GRASS/POISON-type POKéMON.\p" + .string "The WATER-type attack is absorbed\n" .string "by the GRASS-type POKéMON…\p" + .string "As a result, the move becomes not\n" .string "very effective, and inflicts only\l" .string "half the usual damage.$" gUnknown_81C6301:: .string "Uh-oh, this is not good!\p" + .string "The ABSORB attack you just saw\n" .string "is a GRASS-type move.\p" + .string "POLIWAG is a WATER-type POKéMON.\p" + .string "So, ABSORB becomes super\n" .string "effective, doubling the damage.$" gUnknown_81C63A9:: .string "It’s not going to be easy to win\n" .string "with this matchup…\p" + .string "Let’s try shifting POKéMON!$" gUnknown_81C63F9:: .string "Shifting POKéMON in and out uses\n" .string "up one turn.\p" + .string "Now, it’s the opponent’s turn.$" gUnknown_81C6446:: .string "BUTTERFREE is a BUG/FLYING-type\n" .string "POKéMON.\p" + .string "Against this POKéMON, a GRASS-\n" .string "type attack…\p" + .string "…inflicts only half the usual\n" .string "damage on a BUG-type POKéMON…\p" + .string "…And, it also causes only half the\n" .string "damage on a FLYING-type POKéMON.\p" + .string "Therefore, BUTTERFREE, being a\n" .string "BUG/FLYING POKéMON, only takes\l" .string "one quarter of the usual damage.$" @@ -10337,10 +10406,13 @@ gUnknown_81C6446:: gUnknown_81C657A:: .string "ODDISH is a GRASS/POISON-type\n" .string "POKéMON.\p" + .string "A FLYING- or PSYCHIC-type attack\n" .string "is super effective against it.\p" + .string "One of those types of attacks will\n" .string "inflict double the usual damage.\p" + .string "Okay, here we go!$" gUnknown_81C6637:: @@ -10351,14 +10423,17 @@ gUnknown_81C6645:: .string "POKé DUDE: When you’re trying to\n" .string "catch a POKéMON, don’t throw any\l" .string "POKé BALLS right away.\p" + .string "First, you need to weaken it by\n" .string "reducing its HP.$" gUnknown_81C66CF:: .string "Okay, that should be good enough.\p" + .string "But, if it’s possible, it would be\n" .string "best if the target has a status\l" .string "problem.\p" + .string "For instance, it would be easier\n" .string "to catch if it were asleep or\l" .string "paralyzed.$" @@ -10366,9 +10441,11 @@ gUnknown_81C66CF:: gUnknown_81C6787:: .string "This will make the POKéMON a lot\n" .string "easier to catch!\p" + .string "Oh, yes. If you paralyze a\n" .string "POKéMON, you can’t make it fall\l" .string "asleep on top of paralysis.\p" + .string "In other words, you can’t double\n" .string "up status problems, okay?$" 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 |