give/takeitem *, 1: the 1 is optional

2025-04-09 05:44:44 -07:00 · 2015-11-04 20:20:14 -05:00
parent 7fd20e6322
commit 3cadc7b012
108 changed files with 1722 additions and 1663 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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:
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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
--- a/Show More
+++ b/Show More