summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-04 20:20:14 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-04 20:20:14 -0500
commit3cadc7b012c3d11f227d71814f729952d0f56c21 (patch)
treebaebe666292937ae3f70b42d83dad214c8eb192e /maps
parent7fd20e63223e777872618b3eac7cf49f8b105fec (diff)
give/takeitem *, 1: the 1 is optional
Diffstat (limited to 'maps')
-rw-r--r--maps/AzaleaGym.asm2
-rw-r--r--maps/AzaleaTown.asm2
-rw-r--r--maps/BillsHouse.asm10
-rw-r--r--maps/BlackthornCity.asm2
-rw-r--r--maps/BlackthornGym1F.asm2
-rw-r--r--maps/CeladonCafe.asm2
-rw-r--r--maps/CeladonDeptStore6F.asm6
-rw-r--r--maps/CeladonGameCornerPrizeRoom.asm6
-rw-r--r--maps/CeladonGym.asm2
-rw-r--r--maps/CeladonMansionRoofHouse.asm2
-rw-r--r--maps/CharcoalKiln.asm2
-rw-r--r--maps/CherrygroveCity.asm2
-rw-r--r--maps/CianwoodCity.asm2
-rw-r--r--maps/CianwoodGym.asm2
-rw-r--r--maps/CianwoodPharmacy.asm2
-rw-r--r--maps/CopycatsHouse2F.asm4
-rw-r--r--maps/DanceTheatre.asm2
-rw-r--r--maps/DarkCaveBlackthornEntrance.asm2
-rw-r--r--maps/DragonsDenB1F.asm4
-rw-r--r--maps/EcruteakGym.asm2
-rw-r--r--maps/EcruteakItemfinderHouse.asm2
-rw-r--r--maps/ElmsLab.asm10
-rw-r--r--maps/FastShipCabins_SE_SSE_CaptainsCabin.asm4
-rw-r--r--maps/FuchsiaGym.asm2
-rw-r--r--maps/GoldenrodBikeShop.asm2
-rw-r--r--maps/GoldenrodDeptStore5F.asm4
-rw-r--r--maps/GoldenrodDeptStore6F.asm6
-rw-r--r--maps/GoldenrodFlowerShop.asm2
-rw-r--r--maps/GoldenrodGameCorner.asm6
-rw-r--r--maps/GoldenrodGym.asm2
-rw-r--r--maps/GoldenrodPokeCenter1F.asm10
-rw-r--r--maps/IlexForest.asm6
-rw-r--r--maps/KurtsHouse.asm18
-rw-r--r--maps/LakeofRage.asm4
-rw-r--r--maps/LakeofRageHiddenPowerHouse.asm2
-rw-r--r--maps/LakeofRageMagikarpHouse.asm2
-rw-r--r--maps/MahoganyGym.asm2
-rw-r--r--maps/MahoganyTown.asm2
-rw-r--r--maps/MrPokemonsHouse.asm6
-rw-r--r--maps/MrPsychicsHouse.asm2
-rw-r--r--maps/NationalPark.asm4
-rw-r--r--maps/OlivineCafe.asm2
-rw-r--r--maps/OlivineGoodRodHouse.asm2
-rw-r--r--maps/OlivineGym.asm2
-rw-r--r--maps/OlivineLighthouse2F.asm4
-rw-r--r--maps/OlivineLighthouse6F.asm2
-rw-r--r--maps/PewterCity.asm2
-rw-r--r--maps/PokemonFanClub.asm4
-rw-r--r--maps/PowerPlant.asm4
-rw-r--r--maps/RadioTower1F.asm6
-rw-r--r--maps/RadioTower2F.asm2
-rw-r--r--maps/RadioTower3F.asm2
-rw-r--r--maps/RadioTower4F.asm2
-rw-r--r--maps/RadioTower5F.asm4
-rw-r--r--maps/Route12SuperRodHouse.asm2
-rw-r--r--maps/Route25.asm2
-rw-r--r--maps/Route27.asm2
-rw-r--r--maps/Route27SandstormHouse.asm2
-rw-r--r--maps/Route28FamousSpeechHouse.asm2
-rw-r--r--maps/Route29.asm2
-rw-r--r--maps/Route2NuggetSpeechHouse.asm2
-rw-r--r--maps/Route30.asm4
-rw-r--r--maps/Route30BerrySpeechHouse.asm2
-rw-r--r--maps/Route31.asm10
-rw-r--r--maps/Route32.asm6
-rw-r--r--maps/Route32PokeCenter1F.asm2
-rw-r--r--maps/Route34.asm4
-rw-r--r--maps/Route34IlexForestGate.asm2
-rw-r--r--maps/Route35Goldenrodgate.asm2
-rw-r--r--maps/Route36.asm8
-rw-r--r--maps/Route36NationalParkgate.asm8
-rw-r--r--maps/Route37.asm2
-rw-r--r--maps/Route38.asm2
-rw-r--r--maps/Route39.asm2
-rw-r--r--maps/Route39Barn.asm2
-rw-r--r--maps/Route39Farmhouse.asm4
-rw-r--r--maps/Route40.asm2
-rw-r--r--maps/Route42.asm2
-rw-r--r--maps/Route43.asm2
-rw-r--r--maps/Route43Gate.asm2
-rw-r--r--maps/Route44.asm10
-rw-r--r--maps/Route45.asm6
-rw-r--r--maps/Route46.asm4
-rw-r--r--maps/Route5CleanseTagSpeechHouse.asm2
-rw-r--r--maps/SilphCo1F.asm2
-rw-r--r--maps/SlowpokeWellB2F.asm2
-rw-r--r--maps/SproutTower3F.asm2
-rw-r--r--maps/TeamRocketBaseB2F.asm2
-rw-r--r--maps/TinTower1F.asm2
-rw-r--r--maps/UndergroundWarehouse.asm2
-rw-r--r--maps/VermilionCity.asm2
-rw-r--r--maps/VioletGym.asm2
-rw-r--r--maps/ViridianCity.asm2
93 files changed, 159 insertions, 159 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index cd22312ae..32796ee5d 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -34,7 +34,7 @@ BugsyScript:
setevent EVENT_BEAT_BUG_CATCHER_JOSH
writetext BugsyText_HiveBadgeSpeech
keeptextopen
- verbosegiveitem TM_FURY_CUTTER, 1
+ verbosegiveitem TM_FURY_CUTTER
iffalse .NoRoomForFuryCutter
setevent EVENT_GOT_TM49_FURY_CUTTER
writetext BugsyText_FuryCutterSpeech
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index bbc574c4b..e31eb8da4 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -155,7 +155,7 @@ UnknownScript_0x1980e5:
keeptextopen
writetext UnknownText_0x198628
closetext
- verbosegiveitem GS_BALL, 1
+ verbosegiveitem GS_BALL
spriteface $d, LEFT
setflag ENGINE_HAVE_EXAMINED_GS_BALL
clearevent EVENT_ILEX_FOREST_LASS
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index f049e96e3..f5077287b 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -117,7 +117,7 @@ UnknownScript_0x18963b:
checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x189592
scall UnknownScript_0x1896b5
- verbosegiveitem EVERSTONE, 1
+ verbosegiveitem EVERSTONE
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
@@ -128,7 +128,7 @@ UnknownScript_0x189652:
checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895b3
scall UnknownScript_0x1896b5
- verbosegiveitem LEAF_STONE, 1
+ verbosegiveitem LEAF_STONE
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
@@ -139,7 +139,7 @@ UnknownScript_0x189669:
checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895d4
scall UnknownScript_0x1896b5
- verbosegiveitem WATER_STONE, 1
+ verbosegiveitem WATER_STONE
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
@@ -150,7 +150,7 @@ UnknownScript_0x189680:
checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x18961a
scall UnknownScript_0x1896b5
- verbosegiveitem FIRE_STONE, 1
+ verbosegiveitem FIRE_STONE
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
@@ -159,7 +159,7 @@ UnknownScript_0x189680:
UnknownScript_0x189697:
scall UnknownScript_0x1896b5
- verbosegiveitem THUNDERSTONE, 1
+ verbosegiveitem THUNDERSTONE
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
loadmovesprites
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index 889f4e374..1c396777f 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -93,7 +93,7 @@ SantosScript:
.MetSantos
writetext SantosGivesGiftText
keeptextopen
- verbosegiveitem SPELL_TAG, 1
+ verbosegiveitem SPELL_TAG
iffalse SantosDoneScript
setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
writetext SantosGaveGiftText
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 60e11880a..5bd21b7bc 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -62,7 +62,7 @@ UnknownScript_0x194e69:
iftrue UnknownScript_0x194e94
writetext UnknownText_0x195196
keeptextopen
- giveitem TM_DRAGONBREATH, 1
+ giveitem TM_DRAGONBREATH
iffalse UnknownScript_0x194e8e
itemtotext TM_DRAGONBREATH, $0
writetext UnknownText_0x1951bf
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index ffb70ee4b..dd626fe31 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -86,7 +86,7 @@ EatathonContestPoster:
CeladonCafeTrashcan:
checkevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
iftrue .TrashEmpty
- giveitem LEFTOVERS, 1
+ giveitem LEFTOVERS
iffalse .PackFull
loadfont
itemtotext LEFTOVERS, $0
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 2d8703dd7..e73f1bfdb 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -36,7 +36,7 @@ CeladonVendingMachine:
.FreshWater
checkmoney $0, 200
if_equal $2, .NotEnoughMoney
- giveitem FRESH_WATER, 1
+ giveitem FRESH_WATER
iffalse .NotEnoughSpace
takemoney $0, 200
itemtotext FRESH_WATER, $0
@@ -45,7 +45,7 @@ CeladonVendingMachine:
.SodaPop
checkmoney $0, 300
if_equal $2, .NotEnoughMoney
- giveitem SODA_POP, 1
+ giveitem SODA_POP
iffalse .NotEnoughSpace
takemoney $0, 300
itemtotext SODA_POP, $0
@@ -54,7 +54,7 @@ CeladonVendingMachine:
.Lemonade
checkmoney $0, 350
if_equal $2, .NotEnoughMoney
- giveitem LEMONADE, 1
+ giveitem LEMONADE
iffalse .NotEnoughSpace
takemoney $0, 350
itemtotext LEMONADE, $0
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index bdea5f770..781833311 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -35,7 +35,7 @@ CeladonPrizeRoom_tmcounterloop:
itemtotext TM_DOUBLE_TEAM, $0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
- giveitem TM_DOUBLE_TEAM, 1
+ giveitem TM_DOUBLE_TEAM
iffalse CeladonPrizeRoom_notenoughroom
takecoins 1500
jump CeladonPrizeRoom_purchased
@@ -46,7 +46,7 @@ CeladonPrizeRoom_tmcounterloop:
itemtotext TM_PSYCHIC, $0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
- giveitem TM_PSYCHIC, 1
+ giveitem TM_PSYCHIC
iffalse CeladonPrizeRoom_notenoughroom
takecoins 3500
jump CeladonPrizeRoom_purchased
@@ -57,7 +57,7 @@ CeladonPrizeRoom_tmcounterloop:
itemtotext TM_HYPER_BEAM, $0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
- giveitem TM_HYPER_BEAM, 1
+ giveitem TM_HYPER_BEAM
iffalse CeladonPrizeRoom_notenoughroom
takecoins 7500
jump CeladonPrizeRoom_purchased
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index db63741b8..f8c53a138 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -32,7 +32,7 @@ ErikaScript_0x72a6a:
iftrue UnknownScript_0x72aae
writetext UnknownText_0x72cb0
keeptextopen
- verbosegiveitem TM_GIGA_DRAIN, 1
+ verbosegiveitem TM_GIGA_DRAIN
iffalse UnknownScript_0x72aae
setevent EVENT_GOT_TM19_GIGA_DRAIN
UnknownScript_0x72aae:
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index 46a5b6124..25c3a0dbe 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -22,7 +22,7 @@ PharmacistScript_0x71afd:
UnknownScript_0x71b14:
writetext UnknownText_0x71ba3
keeptextopen
- verbosegiveitem TM_CURSE, 1
+ verbosegiveitem TM_CURSE
iffalse UnknownScript_0x71b25
setevent EVENT_GOT_TM03_CURSE
UnknownScript_0x71b21:
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
index cc6a4107e..62dc02425 100644
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -44,7 +44,7 @@ CharcoalKilnApprentice:
.Thanks
writetext CharcoalKilnApprenticeText2
keeptextopen
- verbosegiveitem CHARCOAL, 1
+ verbosegiveitem CHARCOAL
iffalse .Done
setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
loadmovesprites
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 0aec4b65e..f41cf424b 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -213,7 +213,7 @@ MysticWaterGuy:
iftrue UnknownScript_0x19c183
writetext UnknownText_0x19c766
keeptextopen
- verbosegiveitem MYSTIC_WATER, 1
+ verbosegiveitem MYSTIC_WATER
iffalse UnknownScript_0x19c187
setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
UnknownScript_0x19c183:
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 7829b0960..6db6dc7e8 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -89,7 +89,7 @@ PokefanFScript_0x1a0084:
UnknownScript_0x1a009c:
writetext UnknownText_0x1a01e3
keeptextopen
- verbosegiveitem HM_FLY, 1
+ verbosegiveitem HM_FLY
iffalse UnknownScript_0x1a00b1
setevent EVENT_GOT_HM02_FLY
writetext UnknownText_0x1a021d
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 26f4654a3..cacd4090d 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -49,7 +49,7 @@ ChuckScript_0x9d60f:
setevent EVENT_BEAT_BLACKBELT_LUNG
writetext UnknownText_0x9d84d
keeptextopen
- verbosegiveitem TM_DYNAMICPUNCH, 1
+ verbosegiveitem TM_DYNAMICPUNCH
iffalse UnknownScript_0x9d67f
setevent EVENT_GOT_TM01_DYNAMICPUNCH
writetext UnknownText_0x9d8da
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index 56f49f2a0..f9e776d38 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -20,7 +20,7 @@ CianwoodPharmacist:
iffalse .Mart
writetext PharmacistGiveSecretpotionText
keeptextopen
- giveitem SECRETPOTION, 1
+ giveitem SECRETPOTION
writetext ReceivedSecretpotionText
playsound SFX_KEY_ITEM
waitbutton
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index 7f82335ca..b078c8ec6 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -106,7 +106,7 @@ Copycat:
loadfont
writetext UnknownText_0x18b17f
keeptextopen
- takeitem LOST_ITEM, 1
+ takeitem LOST_ITEM
setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
clearevent EVENT_COPYCATS_HOUSE_2F_DOLL
jump .Part14
@@ -116,7 +116,7 @@ Copycat:
.Part14
writetext UnknownText_0x18b1e2
keeptextopen
- verbosegiveitem PASS, 1
+ verbosegiveitem PASS
iffalse .Part22
setevent EVENT_GOT_PASS_FROM_COPYCAT
writetext UnknownText_0x18b214
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index 397b2beea..1d094c98d 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -96,7 +96,7 @@ UnknownScript_0x994ff:
UnknownScript_0x99505:
writetext UnknownText_0x9991a
keeptextopen
- verbosegiveitem HM_SURF, 1
+ verbosegiveitem HM_SURF
setevent EVENT_GOT_HM03_SURF
writetext UnknownText_0x9999b
closetext
diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
index d5ccaf8ba..ecfcb0862 100644
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -12,7 +12,7 @@ PharmacistScript_0x18c720:
iftrue UnknownScript_0x18c735
writetext UnknownText_0x18c73f
keeptextopen
- verbosegiveitem BLACKGLASSES, 1
+ verbosegiveitem BLACKGLASSES
iffalse UnknownScript_0x18c739
setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
UnknownScript_0x18c735:
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 99aa96dfe..b8a11e636 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -49,7 +49,7 @@ UnknownScript_0x18c8b8:
loadfont
writetext UnknownText_0x18c9bf
keeptextopen
- giveitem TM_DRAGONBREATH, 1
+ giveitem TM_DRAGONBREATH
iffalse UnknownScript_0x18c8f4
itemtotext TM_DRAGONBREATH, $0
writetext UnknownText_0x18c9fb
@@ -122,7 +122,7 @@ TwinsLeaandpia2Script:
end
PokeBallScript_0x18c95a:
- giveitem DRAGON_FANG, 1
+ giveitem DRAGON_FANG
iffalse UnknownScript_0x18c970
disappear $2
loadfont
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 4cd1a2a58..af89cbb90 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -48,7 +48,7 @@ MortyScript_0x99d58:
setevent EVENT_BEAT_MEDIUM_GRACE
writetext UnknownText_0x9a059
keeptextopen
- verbosegiveitem TM_SHADOW_BALL, 1
+ verbosegiveitem TM_SHADOW_BALL
iffalse UnknownScript_0x99db5
setevent EVENT_GOT_TM30_SHADOW_BALL
writetext UnknownText_0x9a0ec
diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
index 35a33bd4b..dd5ec85de 100644
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -15,7 +15,7 @@ CooltrainerMScript_0x9a5fb:
iffalse UnknownScript_0x9a61a
writetext UnknownText_0x9a6b5
keeptextopen
- verbosegiveitem ITEMFINDER, 1
+ verbosegiveitem ITEMFINDER
setevent EVENT_GOT_ITEMFINDER
UnknownScript_0x9a614:
writetext UnknownText_0x9a70e
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index fed21c05b..27f9e3280 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -327,7 +327,7 @@ ElmAfterTheftScript:
keeptextopen
writetext ElmAfterTheftText2
closetext
- takeitem MYSTERY_EGG, 1
+ takeitem MYSTERY_EGG
scall ElmJumpBackScript1
writetext ElmAfterTheftText3
closetext
@@ -379,7 +379,7 @@ ShowElmTogepiScript:
ElmGiveEverstoneScript:
writetext ElmGiveEverstoneText1
keeptextopen
- verbosegiveitem EVERSTONE, 1
+ verbosegiveitem EVERSTONE
iffalse ElmScript_NoRoomForEverstone
writetext ElmGiveEverstoneText2
closetext
@@ -397,7 +397,7 @@ ElmScript_NoRoomForEverstone:
ElmGiveMasterBallScript:
writetext ElmGiveMasterBallText1
keeptextopen
- verbosegiveitem MASTER_BALL, 1
+ verbosegiveitem MASTER_BALL
iffalse .notdone
setevent EVENT_GOT_MASTER_BALL_FROM_ELM
writetext ElmGiveMasterBallText2
@@ -409,7 +409,7 @@ ElmGiveMasterBallScript:
ElmGiveTicketScript:
writetext ElmGiveTicketText1
keeptextopen
- verbosegiveitem S_S_TICKET, 1
+ verbosegiveitem S_S_TICKET
setevent EVENT_GOT_SS_TICKET_FROM_ELM
writetext ElmGiveTicketText2
closetext
@@ -472,7 +472,7 @@ AideScript_GivePotions:
loadfont
writetext AideText_GiveYouPotions
keeptextopen
- verbosegiveitem POTION, 1
+ verbosegiveitem POTION
writetext AideText_AlwaysBusy
closetext
loadmovesprites
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 70ac3449e..bd050cb96 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -87,7 +87,7 @@ GentlemanScript_0x75f1f:
UnknownScript_0x75f37:
writetext UnknownText_0x7619b
keeptextopen
- verbosegiveitem METAL_COAT, 1
+ verbosegiveitem METAL_COAT
iffalse UnknownScript_0x75f44
setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
UnknownScript_0x75f44:
@@ -106,7 +106,7 @@ UnknownScript_0x75f44:
UnknownScript_0x75f58:
writetext UnknownText_0x7619b
keeptextopen
- verbosegiveitem METAL_COAT, 1
+ verbosegiveitem METAL_COAT
iffalse UnknownScript_0x75f65
setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
UnknownScript_0x75f65:
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index d69a3f435..211c470a0 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -42,7 +42,7 @@ UnknownScript_0x195e02:
iftrue UnknownScript_0x195e15
writetext UnknownText_0x196002
keeptextopen
- verbosegiveitem TM_TOXIC, 1
+ verbosegiveitem TM_TOXIC
iffalse UnknownScript_0x195e15
setevent EVENT_GOT_TM06_TOXIC
UnknownScript_0x195e15:
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index db9dfdbba..42b8cfabd 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -19,7 +19,7 @@ ClerkScript_0x54750:
writetext UnknownText_0x547f8
keeptextopen
waitbutton
- giveitem BICYCLE, 1
+ giveitem BICYCLE
writetext UnknownText_0x54848
playsound SFX_KEY_ITEM
waitbutton
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index fc715179d..bc7078ede 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -70,7 +70,7 @@ ReceptionistScript_0x560ce:
.VeryHappy:
writetext UnknownText_0x5615a
keeptextopen
- verbosegiveitem TM_RETURN, 1
+ verbosegiveitem TM_RETURN
iffalse .Done
setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
loadmovesprites
@@ -85,7 +85,7 @@ ReceptionistScript_0x560ce:
.NotVeryHappy:
writetext UnknownText_0x561d8
keeptextopen
- verbosegiveitem TM_FRUSTRATION, 1
+ verbosegiveitem TM_FRUSTRATION
iffalse .Done
setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
loadmovesprites
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 265e61ef1..8619a516e 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -22,7 +22,7 @@ GoldenrodVendingMachine:
.FreshWater
checkmoney $0, 200
if_equal $2, .NotEnoughMoney
- giveitem FRESH_WATER, 1
+ giveitem FRESH_WATER
iffalse .NotEnoughSpace
takemoney $0, 200
itemtotext FRESH_WATER, $0
@@ -31,7 +31,7 @@ GoldenrodVendingMachine:
.SodaPop
checkmoney $0, 300
if_equal $2, .NotEnoughMoney
- giveitem SODA_POP, 1
+ giveitem SODA_POP
iffalse .NotEnoughSpace
takemoney $0, 300
itemtotext SODA_POP, $0
@@ -40,7 +40,7 @@ GoldenrodVendingMachine:
.Lemonade
checkmoney $0, 350
if_equal $2, .NotEnoughMoney
- giveitem LEMONADE, 1
+ giveitem LEMONADE
iffalse .NotEnoughSpace
takemoney $0, 350
itemtotext LEMONADE, $0
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index 6a9a6ee69..29106e91e 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -20,7 +20,7 @@ FlowerShopTeacherScript:
loadfont
writetext UnknownText_0x554c2
keeptextopen
- verbosegiveitem SQUIRTBOTTLE, 1
+ verbosegiveitem SQUIRTBOTTLE
setevent EVENT_GOT_SQUIRTBOTTLE
loadmovesprites
setevent EVENT_FLORIA_AT_SUDOWOODO
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index ff5db5f81..ad2b04cc2 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -64,7 +64,7 @@ UnknownScript_0x56c4d:
itemtotext TM_THUNDER, $0
scall UnknownScript_0x56ca1
iffalse UnknownScript_0x56cbd
- giveitem TM_THUNDER, 1
+ giveitem TM_THUNDER
iffalse UnknownScript_0x56cb7
takecoins 5500
jump UnknownScript_0x56ca6
@@ -75,7 +75,7 @@ UnknownScript_0x56c69:
itemtotext TM_BLIZZARD, $0
scall UnknownScript_0x56ca1
iffalse UnknownScript_0x56cbd
- giveitem TM_BLIZZARD, 1
+ giveitem TM_BLIZZARD
iffalse UnknownScript_0x56cb7
takecoins 5500
jump UnknownScript_0x56ca6
@@ -86,7 +86,7 @@ UnknownScript_0x56c85:
itemtotext TM_FIRE_BLAST, $0
scall UnknownScript_0x56ca1
iffalse UnknownScript_0x56cbd
- giveitem TM_FIRE_BLAST, 1
+ giveitem TM_FIRE_BLAST
iffalse UnknownScript_0x56cb7
takecoins 5500
jump UnknownScript_0x56ca6
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index bdaed919b..ba9d1a5b1 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -60,7 +60,7 @@ WhitneyScript_0x5400c:
UnknownScript_0x54064:
writetext UnknownText_0x5428b
keeptextopen
- verbosegiveitem TM_ATTRACT, 1
+ verbosegiveitem TM_ATTRACT
iffalse UnknownScript_0x5407b
setevent EVENT_GOT_TM45_ATTRACT
writetext UnknownText_0x54302
diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm
index 9053e2bca..a41d3e739 100644
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -27,7 +27,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft:
loadfont
writetext UnknownText_0x622f0
closetext
- verbosegiveitem GS_BALL, 1
+ verbosegiveitem GS_BALL
setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
writetext UnknownText_0x62359
@@ -59,7 +59,7 @@ GoldenrodPokeCenter1F_GSBallTriggerRight:
loadfont
writetext UnknownText_0x622f0
closetext
- verbosegiveitem GS_BALL, 1
+ verbosegiveitem GS_BALL
setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
writetext UnknownText_0x62359
@@ -86,13 +86,13 @@ PokefanFScript_0x61024:
writetext UnknownText_0x6248c
yesorno
iffalse UnknownScript_0x6104b
- takeitem EON_MAIL, 1
+ takeitem EON_MAIL
iffalse UnknownScript_0x6104b
writetext UnknownText_0x62549
closetext
writetext UnknownText_0x624a4
closetext
- verbosegiveitem REVIVE, 1
+ verbosegiveitem REVIVE
iffalse UnknownScript_0x61051
writetext UnknownText_0x624e9
closetext
@@ -106,7 +106,7 @@ UnknownScript_0x6104b:
end
UnknownScript_0x61051:
- giveitem EON_MAIL, 1
+ giveitem EON_MAIL
writetext UnknownText_0x6252a
closetext
loadmovesprites
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index bf625052e..290127a0d 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -339,7 +339,7 @@ BlackBeltScript_0x6edae:
iftrue UnknownScript_0x6edd8
writetext UnknownText_0x6f099
keeptextopen
- verbosegiveitem HM_CUT, 1
+ verbosegiveitem HM_CUT
setevent EVENT_GOT_HM01_CUT
writetext UnknownText_0x6f141
closetext
@@ -365,7 +365,7 @@ RockerScript_0x6edde:
iftrue UnknownScript_0x6edf3
writetext UnknownText_0x6f21b
keeptextopen
- verbosegiveitem TM_HEADBUTT, 1
+ verbosegiveitem TM_HEADBUTT
iffalse UnknownScript_0x6edf7
setevent EVENT_GOT_TM02_HEADBUTT
UnknownScript_0x6edf3:
@@ -439,7 +439,7 @@ UnknownScript_0x6ee38:
end
UnknownScript_0x6ee42:
- takeitem GS_BALL, 1
+ takeitem GS_BALL
clearevent EVENT_FOREST_IS_RESTLESS
setevent EVENT_AZALEA_TOWN_KURT
disappear $8
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 36eebd1cd..10cfd1349 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -66,7 +66,7 @@ KurtScript_0x18e178:
.ClearedSlowpokeWell:
writetext UnknownText_0x18e615
keeptextopen
- verbosegiveitem LURE_BALL, 1
+ verbosegiveitem LURE_BALL
iffalse .NoRoomForBall
setevent EVENT_KURT_GAVE_YOU_LURE_BALL
.GotLureBall:
@@ -192,7 +192,7 @@ KurtScript_0x18e178:
iftrue KurtMakingBallsScript
writetext UnknownText_0x18e7fb
keeptextopen
- verbosegiveitem2 LEVEL_BALL, $16
+ verbosegiveitem2 LEVEL_BALL, VAR_KURT_APRICORNS
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_RED_APRICORN
jump ._ThatTurnedOutGreat
@@ -202,7 +202,7 @@ KurtScript_0x18e178:
iftrue KurtMakingBallsScript
writetext UnknownText_0x18e7fb
keeptextopen
- verbosegiveitem2 LURE_BALL, $16
+ verbosegiveitem2 LURE_BALL, VAR_KURT_APRICORNS
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_BLU_APRICORN
jump ._ThatTurnedOutGreat
@@ -212,7 +212,7 @@ KurtScript_0x18e178:
iftrue KurtMakingBallsScript
writetext UnknownText_0x18e7fb
keeptextopen
- verbosegiveitem2 MOON_BALL, $16
+ verbosegiveitem2 MOON_BALL, VAR_KURT_APRICORNS
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_YLW_APRICORN
jump ._ThatTurnedOutGreat
@@ -222,7 +222,7 @@ KurtScript_0x18e178:
iftrue KurtMakingBallsScript
writetext UnknownText_0x18e7fb
keeptextopen
- verbosegiveitem2 FRIEND_BALL, $16
+ verbosegiveitem2 FRIEND_BALL, VAR_KURT_APRICORNS
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_GRN_APRICORN
jump ._ThatTurnedOutGreat
@@ -232,7 +232,7 @@ KurtScript_0x18e178:
iftrue KurtMakingBallsScript
writetext UnknownText_0x18e7fb
keeptextopen
- verbosegiveitem2 FAST_BALL, $16
+ verbosegiveitem2 FAST_BALL, VAR_KURT_APRICORNS
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_WHT_APRICORN
jump ._ThatTurnedOutGreat
@@ -242,7 +242,7 @@ KurtScript_0x18e178:
iftrue KurtMakingBallsScript
writetext UnknownText_0x18e7fb
keeptextopen
- verbosegiveitem2 HEAVY_BALL, $16
+ verbosegiveitem2 HEAVY_BALL, VAR_KURT_APRICORNS
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_BLK_APRICORN
jump ._ThatTurnedOutGreat
@@ -252,7 +252,7 @@ KurtScript_0x18e178:
iftrue KurtMakingBallsScript
writetext UnknownText_0x18e7fb
keeptextopen
- verbosegiveitem2 LOVE_BALL, $16
+ verbosegiveitem2 LOVE_BALL, VAR_KURT_APRICORNS
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_PNK_APRICORN
jump ._ThatTurnedOutGreat
@@ -266,7 +266,7 @@ KurtScript_0x18e178:
closetext
loadmovesprites
setevent EVENT_GAVE_GS_BALL_TO_KURT
- takeitem GS_BALL, 1
+ takeitem GS_BALL
setflag ENGINE_KURT_MAKING_BALLS
end
diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm
index af5461c48..2cd260cd0 100644
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -85,7 +85,7 @@ GyaradosScript_0x70063:
UnknownScript_0x7007a:
returnafterbattle
loadfont
- giveitem RED_SCALE, 1
+ giveitem RED_SCALE
waitbutton
writetext UnknownText_0x703df
playsound SFX_ITEM
@@ -195,7 +195,7 @@ WesleyScript:
.MetWesley
writetext WesleyGivesGiftText
keeptextopen
- verbosegiveitem BLACKBELT, 1
+ verbosegiveitem BLACKBELT
iffalse WesleyDoneScript
setevent EVENT_GOT_BLACKBELT_FROM_WESLEY
writetext WesleyGaveGiftText
diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm
index fcbfc4e5a..6a3744289 100644
--- a/maps/LakeofRageHiddenPowerHouse.asm
+++ b/maps/LakeofRageHiddenPowerHouse.asm
@@ -12,7 +12,7 @@ HiddenPowerGuy:
iftrue .AlreadyGotItem
writetext HiddenPowerGuyText1
keeptextopen
- verbosegiveitem TM_HIDDEN_POWER, 1
+ verbosegiveitem TM_HIDDEN_POWER
iffalse .Done
setevent EVENT_GOT_TM10_HIDDEN_POWER
writetext HiddenPowerGuyText2
diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm
index b19769b8e..e197d90fd 100644
--- a/maps/LakeofRageMagikarpHouse.asm
+++ b/maps/LakeofRageMagikarpHouse.asm
@@ -50,7 +50,7 @@ UnknownScript_0x19a6e0:
UnknownScript_0x19a6fe:
writetext UnknownText_0x19a977
keeptextopen
- verbosegiveitem ELIXER, 1
+ verbosegiveitem ELIXER
iffalse UnknownScript_0x19a711
writetext UnknownText_0x19a9c3
closetext
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 7888001fd..b1a3d8851 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -35,7 +35,7 @@ PryceScript_0x199a9e:
setevent EVENT_BEAT_BOARDER_DOUGLAS
writetext UnknownText_0x199d55
keeptextopen
- verbosegiveitem TM_ICY_WIND, 1
+ verbosegiveitem TM_ICY_WIND
iffalse UnknownScript_0x199af4
setevent EVENT_GOT_TM16_ICY_WIND
writetext UnknownText_0x199def
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 2adef6804..ce93c18a8 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -56,7 +56,7 @@ UnknownScript_0x190040:
iffalse UnknownScript_0x190072
checkmoney $0, 300
if_equal $2, UnknownScript_0x19006c
- giveitem RAGECANDYBAR, 1
+ giveitem RAGECANDYBAR
iffalse UnknownScript_0x190078
waitbutton
playsound SFX_TRANSACTION
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index fabe40dac..d66ad7506 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -28,7 +28,7 @@ UnknownScript_0x196e56:
writetext UnknownText_0x196fa8
keeptextopen
waitbutton
- giveitem MYSTERY_EGG, 1
+ giveitem MYSTERY_EGG
writetext UnknownText_0x196fd2
playsound SFX_KEY_ITEM
waitbutton
@@ -69,9 +69,9 @@ UnknownScript_0x196eb0:
writetext UnknownText_0x197476
yesorno
iffalse UnknownScript_0x196ec3
- verbosegiveitem EXP_SHARE, 1
+ verbosegiveitem EXP_SHARE
iffalse UnknownScript_0x196ec7
- takeitem RED_SCALE, 1
+ takeitem RED_SCALE
jump UnknownScript_0x196eaa
UnknownScript_0x196ec3:
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
index 0ab0c8f67..703e425d4 100644
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -12,7 +12,7 @@ MrPsychic:
iftrue .AlreadyGotItem
writetext MrPsychicText1
keeptextopen
- verbosegiveitem TM_PSYCHIC, 1
+ verbosegiveitem TM_PSYCHIC
iffalse .Done
setevent EVENT_GOT_TM29_PSYCHIC
.AlreadyGotItem
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 8010c3d08..c6bfa3540 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -18,7 +18,7 @@ TeacherScript_0x5c008:
iftrue UnknownScript_0x5c01d
writetext UnknownText_0x5c265
keeptextopen
- verbosegiveitem QUICK_CLAW, 1
+ verbosegiveitem QUICK_CLAW
iffalse UnknownScript_0x5c021
setevent EVENT_GOT_QUICK_CLAW
UnknownScript_0x5c01d:
@@ -216,7 +216,7 @@ UnknownScript_0x5c163:
UnknownScript_0x5c177:
scall UnknownScript_0x5c1a7
- verbosegiveitem NUGGET, 1
+ verbosegiveitem NUGGET
iffalse UnknownScript_0x5c186
clearflag ENGINE_BEVERLY_HAS_NUGGET
jump UnknownScript_0x5c19b
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
index a23b89266..799b6bac6 100644
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -12,7 +12,7 @@ SailorScript_0x9c8c1:
iftrue UnknownScript_0x9c8d3
writetext UnknownText_0x9c8df
keeptextopen
- verbosegiveitem HM_STRENGTH, 1
+ verbosegiveitem HM_STRENGTH
setevent EVENT_GOT_HM04_STRENGTH
UnknownScript_0x9c8d3:
writetext UnknownText_0x9c965
diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
index 87fc6219a..52a969d1c 100644
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -15,7 +15,7 @@ GoodRodGuru:
iffalse .DontWantIt
writetext GiveGoodRodText
keeptextopen
- verbosegiveitem GOOD_ROD, 1
+ verbosegiveitem GOOD_ROD
writetext GaveGoodRodText
closetext
loadmovesprites
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index 8b259b46b..ecdcf8e33 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -30,7 +30,7 @@ JasmineScript_0x9c12f:
iftrue UnknownScript_0x9c172
writetext UnknownText_0x9c354
keeptextopen
- verbosegiveitem TM_IRON_TAIL, 1
+ verbosegiveitem TM_IRON_TAIL
iffalse UnknownScript_0x9c176
setevent EVENT_GOT_TM23_IRON_TAIL
writetext UnknownText_0x9c3a5
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index 3062d615f..0b84dad11 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -94,7 +94,7 @@ UnknownScript_0x5afc7:
checkevent EVENT_GOT_PROTEIN_FROM_HUEY
iftrue UnknownScript_0x5b03e
scall UnknownScript_0x5b076
- verbosegiveitem PROTEIN, 1
+ verbosegiveitem PROTEIN
iffalse UnknownScript_0x5b06f
setevent EVENT_GOT_PROTEIN_FROM_HUEY
jump UnknownScript_0x5b05f
@@ -106,7 +106,7 @@ UnknownScript_0x5b03f:
loadfont
writetext UnknownText_0x5b1b6
closetext
- verbosegiveitem PROTEIN, 1
+ verbosegiveitem PROTEIN
iffalse UnknownScript_0x5b06f
clearevent EVENT_HUEY_PROTEIN
setevent EVENT_GOT_PROTEIN_FROM_HUEY
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 8f491ebcf..3feed5100 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -27,7 +27,7 @@ UnknownScript_0x60bab:
iffalse UnknownScript_0x60c25
writetext UnknownText_0x60dc3
keeptextopen
- takeitem SECRETPOTION, 1
+ takeitem SECRETPOTION
writetext UnknownText_0x60dea
closetext
loadmovesprites
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index 47f0cbbd2..9541a9f58 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -25,7 +25,7 @@ GrampsScript_0x18c00f:
iftrue UnknownScript_0x18c023
writetext UnknownText_0x18c0c6
keeptextopen
- verbosegiveitem SILVER_WING, 1
+ verbosegiveitem SILVER_WING
setevent EVENT_GOT_SILVER_WING
loadmovesprites
end
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index be1383480..c7d1d3844 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -20,7 +20,7 @@ GentlemanScript_0x1917e9:
UnknownScript_0x191802:
writetext UnknownText_0x191a3d
keeptextopen
- verbosegiveitem RARE_CANDY, 1
+ verbosegiveitem RARE_CANDY
iffalse UnknownScript_0x19181f
setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
writetext UnknownText_0x191a72
@@ -69,7 +69,7 @@ UnknownScript_0x191844:
writetext UnknownText_0x191c5a
keeptextopen
waitbutton
- giveitem LOST_ITEM, 1
+ giveitem LOST_ITEM
iffalse UnknownScript_0x191865
disappear $6
writetext UnknownText_0x191d0a
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index ac334e530..b60672af9 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -154,7 +154,7 @@ UnknownScript_0x188e8d:
UnknownScript_0x188e93:
writetext UnknownText_0x18936e
keeptextopen
- takeitem MACHINE_PART, 1
+ takeitem MACHINE_PART
setevent EVENT_RETURNED_MACHINE_PART
clearevent EVENT_SAFFRON_TRAIN_STATION_POPULATION
setevent EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
@@ -166,7 +166,7 @@ UnknownScript_0x188eac:
iftrue UnknownScript_0x188ec5
writetext UnknownText_0x1893c4
keeptextopen
- verbosegiveitem TM_ZAP_CANNON, 1
+ verbosegiveitem TM_ZAP_CANNON
iffalse UnknownScript_0x188ec3
setevent EVENT_GOT_TM07_ZAP_CANNON
writetext UnknownText_0x1893f4
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index dd3d4e2d0..84630c3b2 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -65,7 +65,7 @@ GentlemanScript_0x5cd3d:
playsound SFX_1ST_PLACE
waitbutton
keeptextopen
- giveitem MASTER_BALL, 1
+ giveitem MASTER_BALL
iffalse .BagFull
itemnotify
setflag ENGINE_LUCKY_NUMBER_SHOW
@@ -76,7 +76,7 @@ GentlemanScript_0x5cd3d:
playsound SFX_2ND_PLACE
waitbutton
keeptextopen
- giveitem EXP_SHARE, 1
+ giveitem EXP_SHARE
iffalse .BagFull
itemnotify
setflag ENGINE_LUCKY_NUMBER_SHOW
@@ -87,7 +87,7 @@ GentlemanScript_0x5cd3d:
playsound SFX_3RD_PLACE
waitbutton
keeptextopen
- giveitem PP_UP, 1
+ giveitem PP_UP
iffalse .BagFull
itemnotify
setflag ENGINE_LUCKY_NUMBER_SHOW
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index bf99ee5fb..67ee63962 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -151,7 +151,7 @@ UnknownScript_0x5d800:
writetext UnknownText_0x5dcf4
keeptextopen
setevent EVENT_MET_BUENA
- verbosegiveitem BLUE_CARD, 1
+ verbosegiveitem BLUE_CARD
UnknownScript_0x5d80a:
writetext UnknownText_0x5de10
closetext
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 164a22c6b..c7da85658 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -61,7 +61,7 @@ UnknownScript_0x5e584:
UnknownScript_0x5e58a:
writetext UnknownText_0x5e7e2
keeptextopen
- verbosegiveitem TM_SUNNY_DAY, 1
+ verbosegiveitem TM_SUNNY_DAY
iffalse UnknownScript_0x5e5a1
writetext UnknownText_0x5e821
closetext
diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
index 2fb0b6875..07349e512 100644
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -23,7 +23,7 @@ TeacherScript_0x5eb85:
UnknownScript_0x5eb99:
writetext UnknownText_0x5ecab
keeptextopen
- verbosegiveitem PINK_BOW, 1
+ verbosegiveitem PINK_BOW
iffalse UnknownScript_0x5ebb0
writetext UnknownText_0x5ecef
closetext
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index a7516aa10..ad0071ea7 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -40,7 +40,7 @@ UnknownScript_0x60011:
loadfont
writetext UnknownText_0x60246
keeptextopen
- verbosegiveitem BASEMENT_KEY, 1
+ verbosegiveitem BASEMENT_KEY
loadmovesprites
dotrigger $1
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3
@@ -117,7 +117,7 @@ UnknownScript_0x6006e:
loadfont
writetext UnknownText_0x605b2
keeptextopen
- verbosegiveitem CLEAR_BELL, 1
+ verbosegiveitem CLEAR_BELL
writetext UnknownText_0x6062c
closetext
loadmovesprites
diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
index c4b21e728..4fd67e033 100644
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -15,7 +15,7 @@ FishingGuruScript_0x7f484:
iffalse UnknownScript_0x7f4a6
writetext UnknownText_0x7f52f
keeptextopen
- verbosegiveitem SUPER_ROD, 1
+ verbosegiveitem SUPER_ROD
iffalse UnknownScript_0x7f4aa
setevent EVENT_GOT_SUPER_ROD
UnknownScript_0x7f4a0:
diff --git a/maps/Route25.asm b/maps/Route25.asm
index a99538b90..d1b181802 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -153,7 +153,7 @@ CooltrainerMScript_0x19efac:
iftrue UnknownScript_0x19efc7
writetext UnknownText_0x19f43b
keeptextopen
- verbosegiveitem NUGGET, 1
+ verbosegiveitem NUGGET
iffalse UnknownScript_0x19efde
setevent EVENT_CLEARED_NUGGET_BRIDGE
UnknownScript_0x19efc7:
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 6a1f52f8d..b3944a440 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -119,7 +119,7 @@ UnknownScript_0x1a08ff:
UnknownScript_0x1a0945:
scall UnknownScript_0x1a0973
- verbosegiveitem STAR_PIECE, 1
+ verbosegiveitem STAR_PIECE
iffalse UnknownScript_0x1a0954
clearflag ENGINE_JOSE_HAS_STAR_PIECE
jump UnknownScript_0x1a0963
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 04f3a155d..a219b935d 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -19,7 +19,7 @@ SandstormHouseWoman:
.Loyal
writetext SandstormHouseWomanLoyalText
keeptextopen
- verbosegiveitem TM_SANDSTORM, 1
+ verbosegiveitem TM_SANDSTORM
iffalse .Done
setevent EVENT_GOT_TM37_SANDSTORM
.AlreadyGotItem
diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm
index add88ec34..9a9499602 100644
--- a/maps/Route28FamousSpeechHouse.asm
+++ b/maps/Route28FamousSpeechHouse.asm
@@ -18,7 +18,7 @@ Celebrity:
iftrue .AlreadyGotItem
writetext CelebrityText1
keeptextopen
- verbosegiveitem TM_STEEL_WING, 1
+ verbosegiveitem TM_STEEL_WING
iffalse .Done
setevent EVENT_GOT_TM47_STEEL_WING
.Done
diff --git a/maps/Route29.asm b/maps/Route29.asm
index a50f02aba..ea99094aa 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -176,7 +176,7 @@ TuscanyScript:
.MetTuscany
writetext TuscanyGivesGiftText
keeptextopen
- verbosegiveitem PINK_BOW, 1
+ verbosegiveitem PINK_BOW
iffalse TuscanyDoneScript
setevent EVENT_GOT_PINK_BOW_FROM_TUSCANY
writetext TuscanyGaveGiftText
diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm
index e020d41a2..143897a9d 100644
--- a/maps/Route2NuggetSpeechHouse.asm
+++ b/maps/Route2NuggetSpeechHouse.asm
@@ -12,7 +12,7 @@ FisherScript_0x9b847:
iftrue .GotItem
writetext UnknownText_0x9b865
keeptextopen
- verbosegiveitem NUGGET, 1
+ verbosegiveitem NUGGET
iffalse .Done
setevent EVENT_GOT_NUGGET_FROM_GUY
.GotItem
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 362337b8b..0e994d1bc 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -117,7 +117,7 @@ UnknownScript_0x1a16e0:
checkevent EVENT_GOT_HP_UP_FROM_JOEY
iftrue UnknownScript_0x1a176e
scall UnknownScript_0x1a17a6
- verbosegiveitem HP_UP, 1
+ verbosegiveitem HP_UP
iffalse UnknownScript_0x1a179f
setevent EVENT_GOT_HP_UP_FROM_JOEY
jump UnknownScript_0x1a178f
@@ -129,7 +129,7 @@ UnknownScript_0x1a176f:
loadfont
writetext UnknownText_0x1a1bc0
closetext
- verbosegiveitem HP_UP, 1
+ verbosegiveitem HP_UP
iffalse UnknownScript_0x1a179f
clearevent EVENT_JOEY_HP_UP
setevent EVENT_GOT_HP_UP_FROM_JOEY
diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm
index baf20ad5b..177f93781 100644
--- a/maps/Route30BerrySpeechHouse.asm
+++ b/maps/Route30BerrySpeechHouse.asm
@@ -12,7 +12,7 @@ PokefanMScript_0x196d64:
iftrue UnknownScript_0x196d79
writetext UnknownText_0x196d82
keeptextopen
- verbosegiveitem BERRY, 1
+ verbosegiveitem BERRY
iffalse UnknownScript_0x196d7d
setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
UnknownScript_0x196d79:
diff --git a/maps/Route31.asm b/maps/Route31.asm
index a68f1af06..f75097b3a 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -120,19 +120,19 @@ UnknownScript_0x1a5507:
checkevent EVENT_WADE_HAS_BITTER_BERRY
iftrue .BitterBerry
.Berry
- verbosegiveitem BERRY, 1
+ verbosegiveitem BERRY
iffalse .PackFull
jump .Done
.Psncureberry
- verbosegiveitem PSNCUREBERRY, 1
+ verbosegiveitem PSNCUREBERRY
iffalse .PackFull
jump .Done
.Przcureberry
- verbosegiveitem PRZCUREBERRY, 1
+ verbosegiveitem PRZCUREBERRY
iffalse .PackFull
jump .Done
.BitterBerry
- verbosegiveitem BITTER_BERRY, 1
+ verbosegiveitem BITTER_BERRY
iffalse .PackFull
.Done
clearflag ENGINE_WADE_HAS_ITEM
@@ -201,7 +201,7 @@ UnknownScript_0x1a5584:
writetext UnknownText_0x1a57ba
keeptextopen
setevent EVENT_GAVE_KENYA
- verbosegiveitem TM_NIGHTMARE, 1
+ verbosegiveitem TM_NIGHTMARE
iffalse UnknownScript_0x1a55b3
setevent EVENT_GOT_TM50_NIGHTMARE
UnknownScript_0x1a55af:
diff --git a/maps/Route32.asm b/maps/Route32.asm
index a3d9ecdb6..85ea0b36a 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -57,7 +57,7 @@ UnknownScript_0x190489:
UnknownScript_0x19048f:
writetext UnknownText_0x190925
keeptextopen
- verbosegiveitem MIRACLE_SEED, 1
+ verbosegiveitem MIRACLE_SEED
iffalse UnknownScript_0x1904a9
setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
jump UnknownScript_0x1904a5
@@ -98,7 +98,7 @@ FisherScript_0x1904ce:
iftrue UnknownScript_0x1904e3
writetext UnknownText_0x191133
keeptextopen
- verbosegiveitem TM_ROAR, 1
+ verbosegiveitem TM_ROAR
iffalse UnknownScript_0x1904e7
setevent EVENT_GOT_TM05_ROAR
UnknownScript_0x1904e3:
@@ -455,7 +455,7 @@ FriedaScript:
.MetFrieda
writetext FriedaGivesGiftText
keeptextopen
- verbosegiveitem POISON_BARB, 1
+ verbosegiveitem POISON_BARB
iffalse FriedaDoneScript
setevent EVENT_GOT_POISON_BARB_FROM_FRIEDA
writetext FriedaGaveGiftText
diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm
index 0fea8bd1c..eaff59e08 100644
--- a/maps/Route32PokeCenter1F.asm
+++ b/maps/Route32PokeCenter1F.asm
@@ -18,7 +18,7 @@ FishingGuruScript_0x69b55:
iffalse UnknownScript_0x69b74
writetext UnknownText_0x69be8
keeptextopen
- verbosegiveitem OLD_ROD, 1
+ verbosegiveitem OLD_ROD
writetext UnknownText_0x69c1b
closetext
loadmovesprites
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 39edd9560..9c29e9459 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -293,7 +293,7 @@ UnknownScript_0x7819f:
UnknownScript_0x78213:
scall UnknownScript_0x78244
- verbosegiveitem LEAF_STONE, 1
+ verbosegiveitem LEAF_STONE
iffalse UnknownScript_0x78225
clearflag ENGINE_GINA_HAS_LEAF_STONE
setevent EVENT_GINA_GAVE_LEAF_STONE
@@ -450,7 +450,7 @@ CooltrainerfKateScript:
iftrue UnknownScript_0x78319
writetext UnknownText_0x788e2
keeptextopen
- verbosegiveitem SOFT_SAND, 1
+ verbosegiveitem SOFT_SAND
iffalse UnknownScript_0x7831d
setevent EVENT_GOT_SOFT_SAND_FROM_KATE
UnknownScript_0x78319:
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 3468c7120..1c4fd0cbb 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -48,7 +48,7 @@ TeacherScript_0x62d63:
iftrue UnknownScript_0x62d7e
writetext UnknownText_0x62d9d
keeptextopen
- verbosegiveitem TM_SWEET_SCENT, 1
+ verbosegiveitem TM_SWEET_SCENT
iffalse UnknownScript_0x62d82
setevent EVENT_GOT_TM12_SWEET_SCENT
UnknownScript_0x62d7e:
diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm
index 8e855aaec..3d5b4c5e9 100644
--- a/maps/Route35Goldenrodgate.asm
+++ b/maps/Route35Goldenrodgate.asm
@@ -49,7 +49,7 @@ OfficerScript_0x69d37:
.questcomplete:
writetext UnknownText_0x69f8b
keeptextopen
- verbosegiveitem HP_UP, 1
+ verbosegiveitem HP_UP
iffalse .bagfull
setevent EVENT_GOT_HP_UP_FROM_RANDY
.gothpup:
diff --git a/maps/Route36.asm b/maps/Route36.asm
index e7693cfbe..dc28758bd 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -90,7 +90,7 @@ UnknownScript_0x19407b:
disappear $4
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
special RunCallback_04
- special Function14168
+ special RefreshSprites
end
LassScript_0x19408c:
@@ -135,7 +135,7 @@ FisherScript_0x1940b9:
UnknownScript_0x1940cd:
writetext UnknownText_0x1944d0
keeptextopen
- verbosegiveitem TM_ROCK_SMASH, 1
+ verbosegiveitem TM_ROCK_SMASH
iffalse UnknownScript_0x1940de
setevent EVENT_GOT_TM08_ROCK_SMASH
UnknownScript_0x1940da:
@@ -254,7 +254,7 @@ UnknownScript_0x194140:
UnknownScript_0x1941b4:
scall UnknownScript_0x1941e5
- verbosegiveitem FIRE_STONE, 1
+ verbosegiveitem FIRE_STONE
iffalse UnknownScript_0x1941c6
clearflag ENGINE_ALAN_HAS_FIRE_STONE
setevent EVENT_ALAN_GAVE_FIRE_STONE
@@ -325,7 +325,7 @@ ArthurScript:
.MetArthur
writetext ArthurGivesGiftText
keeptextopen
- verbosegiveitem HARD_STONE, 1
+ verbosegiveitem HARD_STONE
iffalse ArthurDoneScript
setevent EVENT_GOT_HARD_STONE_FROM_ARTHUR
writetext ArthurGaveGiftText
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index 025133902..4985b5476 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -241,7 +241,7 @@ Route36Officer_ContestHasConcluded:
.Sunstone:
writetext UnknownText_0x6b97f
keeptextopen
- verbosegiveitem SUN_STONE, 1
+ verbosegiveitem SUN_STONE
iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
loadmovesprites
@@ -250,7 +250,7 @@ Route36Officer_ContestHasConcluded:
.Everstone:
writetext UnknownText_0x6b97f
keeptextopen
- verbosegiveitem EVERSTONE, 1
+ verbosegiveitem EVERSTONE
iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
loadmovesprites
@@ -259,7 +259,7 @@ Route36Officer_ContestHasConcluded:
.GoldBerry:
writetext UnknownText_0x6b97f
keeptextopen
- verbosegiveitem GOLD_BERRY, 1
+ verbosegiveitem GOLD_BERRY
iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
loadmovesprites
@@ -268,7 +268,7 @@ Route36Officer_ContestHasConcluded:
.Berry:
writetext UnknownText_0x6b97f
keeptextopen
- verbosegiveitem BERRY, 1
+ verbosegiveitem BERRY
iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_BERRY
loadmovesprites
diff --git a/maps/Route37.asm b/maps/Route37.asm
index d2dc3e11f..fe220cdcd 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -74,7 +74,7 @@ SunnyScript:
writetext SunnyGivesGiftText2
keeptextopen
.next
- verbosegiveitem MAGNET, 1
+ verbosegiveitem MAGNET
iffalse SunnyDoneScript
setevent EVENT_GOT_MAGNET_FROM_SUNNY
writetext SunnyGaveGiftText
diff --git a/maps/Route38.asm b/maps/Route38.asm
index 54e209a16..71aba2773 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -120,7 +120,7 @@ UnknownScript_0x1a1d82:
UnknownScript_0x1a1df6:
scall UnknownScript_0x1a1e27
- verbosegiveitem THUNDERSTONE, 1
+ verbosegiveitem THUNDERSTONE
iffalse UnknownScript_0x1a1e08
clearflag ENGINE_DANA_HAS_THUNDERSTONE
setevent EVENT_DANA_GAVE_THUNDERSTONE
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 174830ffa..5553f483b 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -46,7 +46,7 @@ UnknownScript_0x1a5b36:
UnknownScript_0x1a5b4a:
scall UnknownScript_0x1a5b7a
- verbosegiveitem NUGGET, 1
+ verbosegiveitem NUGGET
iffalse UnknownScript_0x1a5b59
clearflag ENGINE_DEREK_HAS_NUGGET
jump UnknownScript_0x1a5b6e
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index f0257a7db..eb44481a0 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -63,7 +63,7 @@ TaurosScript_0x9ccaa:
iffalse .Refused
checkitem BERRY
iffalse .NoBerriesInBag
- takeitem BERRY, 1
+ takeitem BERRY
copybytetovar MooMooBerries
addvar 1
copyvartobyte MooMooBerries
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index 9b63096d7..ce736a806 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -25,7 +25,7 @@ UnknownScript_0x9cec5:
iffalse UnknownScript_0x9cf02
checkmoney $0, 500
if_equal $2, UnknownScript_0x9cef6
- giveitem MOOMOO_MILK, 1
+ giveitem MOOMOO_MILK
iffalse UnknownScript_0x9cefc
takemoney $0, 500
special Function24ae8
@@ -76,7 +76,7 @@ PokefanFScript_0x9cf0e:
UnknownScript_0x9cf22:
writetext UnknownText_0x9d156
keeptextopen
- verbosegiveitem TM_SNORE, 1
+ verbosegiveitem TM_SNORE
iffalse UnknownScript_0x9cf33
setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
UnknownScript_0x9cf2f:
diff --git a/maps/Route40.asm b/maps/Route40.asm
index b8cd1bc88..e96a01422 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -96,7 +96,7 @@ MonicaScript:
.MetMonica
writetext MonicaGivesGiftText
keeptextopen
- verbosegiveitem SHARP_BEAK, 1
+ verbosegiveitem SHARP_BEAK
iffalse MonicaDoneScript
setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
writetext MonicaGaveGiftText
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 2a3582b24..1ee15cffb 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -108,7 +108,7 @@ UnknownScript_0x1a927f:
UnknownScript_0x1a92dc:
scall UnknownScript_0x1a930d
- verbosegiveitem WATER_STONE, 1
+ verbosegiveitem WATER_STONE
iffalse UnknownScript_0x1a92ee
clearflag ENGINE_TULLY_HAS_WATER_STONE
setevent EVENT_TULLY_GAVE_WATER_STONE
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 7be3e3ebc..8c12f8d02 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -251,7 +251,7 @@ UnknownScript_0x19d1c1:
UnknownScript_0x19d21e:
scall UnknownScript_0x19d255
- verbosegiveitem PINK_BOW, 1
+ verbosegiveitem PINK_BOW
iffalse UnknownScript_0x19d230
clearflag ENGINE_TIFFANY_HAS_PINK_BOW
setevent EVENT_TIFFANY_GAVE_PINK_BOW
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 741ddaaf2..c863bc937 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -113,7 +113,7 @@ OfficerScript_0x19ac85:
iftrue UnknownScript_0x19ac9c
writetext UnknownText_0x19ad9b
keeptextopen
- verbosegiveitem TM_SLUDGE_BOMB, 1
+ verbosegiveitem TM_SLUDGE_BOMB
iffalse UnknownScript_0x19aca0
setevent EVENT_GOT_TM36_SLUDGE_BOMB
loadmovesprites
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 43082d590..2cbb5e40e 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -73,7 +73,7 @@ UnknownScript_0x19d86a:
checkevent EVENT_GOT_CARBOS_FROM_VANCE
iftrue UnknownScript_0x19d8ca
scall UnknownScript_0x19d90a
- verbosegiveitem CARBOS, 1
+ verbosegiveitem CARBOS
iffalse UnknownScript_0x19d903
setevent EVENT_GOT_CARBOS_FROM_VANCE
jump UnknownScript_0x19d8eb
@@ -85,7 +85,7 @@ UnknownScript_0x19d8cb:
loadfont
writetext UnknownText_0x19dc67
closetext
- verbosegiveitem CARBOS, 1
+ verbosegiveitem CARBOS
iffalse UnknownScript_0x19d903
clearevent EVENT_VANCE_CARBOS
setevent EVENT_GOT_CARBOS_FROM_VANCE
@@ -223,17 +223,17 @@ UnknownScript_0x19d9b4:
checkevent EVENT_WILTON_HAS_POKE_BALL
iftrue UnknownScript_0x19d9db
UnknownScript_0x19d9c9:
- verbosegiveitem ULTRA_BALL, 1
+ verbosegiveitem ULTRA_BALL
iffalse UnknownScript_0x19d9e7
jump UnknownScript_0x19d9e1
UnknownScript_0x19d9d2:
- verbosegiveitem GREAT_BALL, 1
+ verbosegiveitem GREAT_BALL
iffalse UnknownScript_0x19d9e7
jump UnknownScript_0x19d9e1
UnknownScript_0x19d9db:
- verbosegiveitem POKE_BALL, 1
+ verbosegiveitem POKE_BALL
iffalse UnknownScript_0x19d9e7
UnknownScript_0x19d9e1:
clearflag ENGINE_WILTON_HAS_ITEM
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 35c1c054e..e21515ef0 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -43,7 +43,7 @@ UnknownScript_0x19e0e4:
checkevent EVENT_KENJI_ON_BREAK
iffalse UnknownScript_0x19e127
scall UnknownScript_0x19e137
- verbosegiveitem PP_UP, 1
+ verbosegiveitem PP_UP
iffalse UnknownScript_0x19e118
clearevent EVENT_KENJI_ON_BREAK
special Special_SampleKenjiBreakCountdown
@@ -199,7 +199,7 @@ UnknownScript_0x19e1b8:
checkevent EVENT_GOT_IRON_FROM_PARRY
iftrue UnknownScript_0x19e218
scall UnknownScript_0x19e146
- verbosegiveitem IRON, 1
+ verbosegiveitem IRON
iffalse UnknownScript_0x19e13f
setevent EVENT_GOT_IRON_FROM_PARRY
jump UnknownScript_0x19e127
@@ -211,7 +211,7 @@ UnknownScript_0x19e219:
loadfont
writetext UnknownText_0x19e52c
closetext
- verbosegiveitem IRON, 1
+ verbosegiveitem IRON
iffalse UnknownScript_0x19e13f
clearevent EVENT_PARRY_IRON
setevent EVENT_GOT_IRON_FROM_PARRY
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 968ddfb22..91ddfe8b5 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -84,7 +84,7 @@ UnknownScript_0x1a96da:
checkevent EVENT_GOT_CALCIUM_FROM_ERIN
iftrue UnknownScript_0x1a973a
scall UnknownScript_0x1a9772
- verbosegiveitem CALCIUM, 1
+ verbosegiveitem CALCIUM
iffalse UnknownScript_0x1a976b
setevent EVENT_GOT_CALCIUM_FROM_ERIN
jump UnknownScript_0x1a975b
@@ -96,7 +96,7 @@ UnknownScript_0x1a973b:
loadfont
writetext UnknownText_0x1a9927
closetext
- verbosegiveitem CALCIUM, 1
+ verbosegiveitem CALCIUM
iffalse UnknownScript_0x1a976b
clearevent EVENT_ERIN_CALCIUM
setevent EVENT_GOT_CALCIUM_FROM_ERIN
diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm
index 9002ee420..f1a57e338 100644
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ b/maps/Route5CleanseTagSpeechHouse.asm
@@ -12,7 +12,7 @@ GrannyScript_0x18b634:
iftrue UnknownScript_0x18b649
writetext UnknownText_0x18b655
keeptextopen
- verbosegiveitem CLEANSE_TAG, 1
+ verbosegiveitem CLEANSE_TAG
iffalse UnknownScript_0x18b64d
setevent EVENT_GOT_CLEANSE_TAG
UnknownScript_0x18b649:
diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
index 91b1423c4..de52fd6f6 100644
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -15,7 +15,7 @@ OfficerScript_0x18abe8:
iftrue UnknownScript_0x18abfd
writetext UnknownText_0x18ac36
keeptextopen
- verbosegiveitem UP_GRADE, 1
+ verbosegiveitem UP_GRADE
iffalse UnknownScript_0x18ac01
setevent EVENT_GOT_UP_GRADE
UnknownScript_0x18abfd:
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index 56255a4c9..a5816de3b 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -12,7 +12,7 @@ GymGuyScript_0x5ad0b:
iftrue UnknownScript_0x5ad22
writetext UnknownText_0x5ad2a
keeptextopen
- verbosegiveitem KINGS_ROCK, 1
+ verbosegiveitem KINGS_ROCK
iffalse UnknownScript_0x5ad20
setevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
UnknownScript_0x5ad20:
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index daeae5805..f0dece4d3 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -71,7 +71,7 @@ SageLiScript:
loadfont
writetext UnknownText_0x184cc2
keeptextopen
- verbosegiveitem HM_FLASH, 1
+ verbosegiveitem HM_FLASH
setevent EVENT_GOT_HM05_FLASH
setevent EVENT_BEAT_SAGE_LI
writetext UnknownText_0x184d13
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 7b6892d61..fe6aa731f 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -276,7 +276,7 @@ UnknownScript_0x6d184:
loadfont
writetext UnknownText_0x6d809
keeptextopen
- verbosegiveitem HM_WHIRLPOOL, 1
+ verbosegiveitem HM_WHIRLPOOL
setevent EVENT_GOT_HM06_WHIRLPOOL
writetext UnknownText_0x6d8f8
closetext
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 33e8674b8..ee0e6277d 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -189,7 +189,7 @@ SageScript_0x185188:
iftrue UnknownScript_0x1851b0
writetext UnknownText_0x185629
keeptextopen
- verbosegiveitem RAINBOW_WING, 1
+ verbosegiveitem RAINBOW_WING
loadmovesprites
refreshscreen $0
earthquake 72
diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm
index 60f4a5656..7d519ca97 100644
--- a/maps/UndergroundWarehouse.asm
+++ b/maps/UndergroundWarehouse.asm
@@ -69,7 +69,7 @@ GentlemanScript_0x7d9bf:
iftrue UnknownScript_0x7d9de
writetext UnknownText_0x7dbc6
keeptextopen
- verbosegiveitem CARD_KEY, 1
+ verbosegiveitem CARD_KEY
setevent EVENT_RECEIVED_CARD_KEY
setevent EVENT_WAREHOUSE_LAYOUT_1
clearevent EVENT_WAREHOUSE_LAYOUT_2
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index f3df277be..d80b56b12 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -85,7 +85,7 @@ VermilionGymBadgeGuy:
.AllBadges
writetext UnknownText_0x1aacf3
keeptextopen
- verbosegiveitem HP_UP, 1
+ verbosegiveitem HP_UP
iffalse .Done
setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY
.AlreadyGotItem
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 3ba553ae2..041ba6f4e 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -34,7 +34,7 @@ FalknerScript_0x683c2:
specialphonecall SPECIALCALL_ASSISTANT
writetext UnknownText_0x685c8
keeptextopen
- verbosegiveitem TM_MUD_SLAP, 1
+ verbosegiveitem TM_MUD_SLAP
iffalse .NoRoomForMudSlap
setevent EVENT_GOT_TM31_MUD_SLAP
writetext UnknownText_0x68648
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index 32282c1ad..eecc84915 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -52,7 +52,7 @@ FisherScript_0x1a9a75:
iftrue UnknownScript_0x1a9a8a
writetext UnknownText_0x1a9cc4
keeptextopen
- verbosegiveitem TM_DREAM_EATER, 1
+ verbosegiveitem TM_DREAM_EATER
iffalse UnknownScript_0x1a9a8e
setevent EVENT_GOT_TM42_DREAM_EATER
UnknownScript_0x1a9a8a: