hiddenitem, like itemball and object_event, puts the item first and the event last

2025-04-09 05:44:44 -07:00 · 2018-01-23 12:59:21 -05:00
parent b88928e9aa
commit dea26c6639
63 changed files with 90 additions and 90 deletions
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -110,7 +110,7 @@ BG event types:
 - `BGEVENT_ITEM`

 <pre>
-	hiddenitem <i>event_flag</i>, <i>item_id</i>
+	hiddenitem <i>item_id</i>, <i>event_flag</i>
 </pre>

 - `BGEVENT_COPY`
@@ -162,7 +162,7 @@ Object types:
 - `OBJECTTYPE_ITEMBALL`

 <pre>
-	itemball <i>item_id</i>
+	itemball <i>item_id</i>[, <i>quantity</i>=1]
 </pre>

 - `OBJECTTYPE_TRAINER`
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -99,9 +99,9 @@ endc
 ENDM

 hiddenitem: MACRO
-;\1: flag: an EVENT_* constant
-;\2: item: from constants/item_constants.asm
-	dwb \1, \2
+;\1: item: from constants/item_constants.asm
+;\2: flag: an EVENT_* constant
+	dwb \2, \1
 ENDM

 elevfloor: MACRO
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -211,7 +211,7 @@ WhiteApricornTree:
 	fruittree FRUITTREE_AZALEA_TOWN

 AzaleaTownHiddenFullHeal:
-	hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL
+	hiddenitem FULL_HEAL, EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL

 AzaleaTownRivalBattleApproachMovement1:
 	step LEFT
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -131,10 +131,10 @@ BurnedTower1FRock:
 	jumpstd smashrock

 BurnedTower1FHiddenEther:
-	hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
+	hiddenitem ETHER, EVENT_BURNED_TOWER_1F_HIDDEN_ETHER

 BurnedTower1FHiddenUltraBall:
-	hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
+	hiddenitem ULTRA_BALL, EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL

 BurnedTower1FHPUp:
 	itemball HP_UP
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -75,7 +75,7 @@ CeladonCityPokecenterSign:
 	jumpstd pokecentersign

 CeladonCityHiddenPpUp:
-	hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP
+	hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP

 CeladonCityFisherText:
 	text "This POLIWRATH is"
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -147,7 +147,7 @@ CeruleanCityMartSign:
 	jumpstd martsign

 CeruleanCityHiddenBerserkGene:
-	hiddenitem EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE
+	hiddenitem BERSERK_GENE, EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY

 CeruleanCityCooltrainerMText1:
 	text "KANTO's POWER"
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -135,7 +135,7 @@ CeruleanGymGuyScript:
 	end

 CeruleanGymHiddenMachinePart:
-	hiddenitem EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART
+	hiddenitem MACHINE_PART, EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM

 CeruleanGymStatue1:
 	checkevent EVENT_TRAINERS_IN_CERULEAN_GYM
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -145,10 +145,10 @@ CianwoodCityRock:
 	jumpstd smashrock

 CianwoodCityHiddenRevive:
-	hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE
+	hiddenitem REVIVE, EVENT_CIANWOOD_CITY_HIDDEN_REVIVE

 CianwoodCityHiddenMaxEther:
-	hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER
+	hiddenitem MAX_ETHER, EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER

 MovementData_0x1a00da:
 	set_sliding
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -35,7 +35,7 @@ CinnabarIslandPokecenterSign:
 	jumpstd pokecentersign

 CinnabarIslandHiddenRareCandy:
-	hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY
+	hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY

 CinnabarIslandBlueTeleport:
 	teleport_from
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -31,7 +31,7 @@ DarkCaveVioletEntranceRock:
 	jumpstd smashrock

 DarkCaveVioletEntranceHiddenElixer:
-	hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER
+	hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER

 DarkCaveVioletEntrance_MapEvents:
 	; filler
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -12,7 +12,7 @@ DiglettsCavePokefanMScript:
 	jumptextfaceplayer DiglettsCavePokefanMText

 DiglettsCaveHiddenMaxRevive:
-	hiddenitem EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE
+	hiddenitem MAX_REVIVE, EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE

 DiglettsCavePokefanMText:
 	text "A bunch of DIGLETT"
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -183,13 +183,13 @@ DragonsDenB1FMaxElixer:
 	itemball MAX_ELIXER

 DragonsDenB1FHiddenRevive:
-	hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE
+	hiddenitem REVIVE, EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE

 DragonsDenB1FHiddenMaxPotion:
-	hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION

 DragonsDenB1FHiddenMaxElixer:
-	hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER
+	hiddenitem MAX_ELIXER, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER

 MovementDragonsDen_ClairWalksToYou:
 	slow_step RIGHT
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -88,7 +88,7 @@ EcruteakCityMartSign:
 	jumpstd martsign

 EcruteakCityHiddenHyperPotion:
-	hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION
+	hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION

 UnusedMissingDaughterText:
 ; This text is neither used nor referenced in the final game.
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -409,13 +409,13 @@ MapGoldenrodUndergroundSignpost1Script:
 	jumptext UnknownText_0x7c91a

 GoldenrodUndergroundHiddenParlyzHeal:
-	hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL
+	hiddenitem PARLYZ_HEAL, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL

 GoldenrodUndergroundHiddenSuperPotion:
-	hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION
+	hiddenitem SUPER_POTION, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION

 GoldenrodUndergroundHiddenAntidote:
-	hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE
+	hiddenitem ANTIDOTE, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE

 SupernerdEricSeenText:
 	text "I got booted out"
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -631,10 +631,10 @@ GoldenrodUndergroundSwitchRoomEntrancesFullHeal:
 	itemball FULL_HEAL

 GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion:
-	hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION

 GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive:
-	hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE
+	hiddenitem REVIVE, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE

 UndergroundSilverApproachMovement1:
 	step DOWN
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -68,7 +68,7 @@ IcePathB1FIron:
 	itemball IRON

 IcePathB1FHiddenMaxPotion:
-	hiddenitem EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION

 IcePathBoulderFellThroughText:
 	text "The boulder fell"
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -12,7 +12,7 @@ IcePathB2FBlackthornSideTMRest:
 	itemball TM_REST

 IcePathB2FBlackthornSideHiddenIceHeal:
-	hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL
+	hiddenitem ICE_HEAL, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL

 IcePathB2FBlackthornSide_MapEvents:
 	; filler
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -23,7 +23,7 @@ IcePathB2FMahoganySideMaxPotion:
 	itemball MAX_POTION

 IcePathB2FMahoganySideHiddenCarbos:
-	hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
+	hiddenitem CARBOS, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS

 IcePathB2FMahoganySideBoulderText:
 	text "It's immovably"
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -414,13 +414,13 @@ IlexForestEther:
 	itemball ETHER

 IlexForestHiddenEther:
-	hiddenitem EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER
+	hiddenitem ETHER, EVENT_ILEX_FOREST_HIDDEN_ETHER

 IlexForestHiddenSuperPotion:
-	hiddenitem EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION
+	hiddenitem SUPER_POTION, EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION

 IlexForestHiddenFullHeal:
-	hiddenitem EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL
+	hiddenitem FULL_HEAL, EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL

 IlexForestBoulder:
 ; unused
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -232,13 +232,13 @@ LakeOfRageTMDetect:
 	itemball TM_DETECT

 LakeOfRageHiddenFullRestore:
-	hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
+	hiddenitem FULL_RESTORE, EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE

 LakeOfRageHiddenRareCandy:
-	hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY
+	hiddenitem RARE_CANDY, EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY

 LakeOfRageHiddenMaxPotion:
-	hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION

 MovementData_0x70155:
 	teleport_from
--- a/Show More
+++ b/Show More