ref: dea26c663961a19073927e11c140d5ae576f275f
parent: b88928e9aa8aa9ee72b17b62462ef5ed82e8638d
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Tue Jan 23 07:59:21 EST 2018
hiddenitem, like itemball and object_event, puts the item first and the event last
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -110,7 +110,7 @@
- `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 @@
- `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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -75,7 +75,7 @@
end
MountMoonSquareHiddenMoonStone:
- hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
+ hiddenitem MOON_STONE, EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE
DontLitterSign:
jumptext DontLitterSignText
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -64,7 +64,7 @@
itemball ULTRA_BALL
MountMortar1FInsideHiddenMaxRepel:
- hiddenitem EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL
+ hiddenitem MAX_REPEL, EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL
PokemaniacMillerSeenText:
text "I'm not losing"
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -16,7 +16,7 @@
itemball REVIVE
MountMortar1FOutsideHiddenHyperPotion:
- hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION
+ hiddenitem HYPER_POTION, EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION
MountMortar1FOutside_MapEvents:
; filler
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -44,7 +44,7 @@
itemball ESCAPE_ROPE
MountMortar2FInsideHiddenFullRestore:
- hiddenitem EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
+ hiddenitem FULL_RESTORE, EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE
SupernerdHughSeenText:
text "Yo! MARKUS!"
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -72,7 +72,7 @@
itemball PP_UP
MountMortarB1FHiddenMaxRevive:
- hiddenitem EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
+ hiddenitem MAX_REVIVE, EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE
UnknownText_0x7e24d:
text "Hey!"
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -305,7 +305,7 @@
itemball TM_DIG
NationalParkHiddenFullHeal:
- hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
+ hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL
NationalParkLassText:
text "Look! Check out my"
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -115,7 +115,7 @@
itemball TM_DIG
NationalParkBugContestHiddenFullHeal:
- hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
+ hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL
UnknownText_0x5c94c:
text "DON: I'm going to"
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -44,7 +44,7 @@
itemball TM_SWAGGER
OlivineLighthouse5FHiddenHyperPotion:
- hiddenitem EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION
+ hiddenitem HYPER_POTION, EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION
SailorErnestSeenText:
text "I wanted to battle"
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -234,7 +234,7 @@
end
OlivinePortHiddenProtein:
- hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN
+ hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN
MovementData_0x74a30:
step DOWN
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -16,10 +16,10 @@
itemball TM_STEEL_WING
RockTunnel1FHiddenXAccuracy:
- hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY
+ hiddenitem X_ACCURACY, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY
RockTunnel1FHiddenXDefend:
- hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND
+ hiddenitem X_DEFEND, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND
RockTunnel1F_MapEvents:
; filler
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -20,7 +20,7 @@
itemball REVIVE
RockTunnelB1FHiddenMaxPotion:
- hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
+ hiddenitem MAX_POTION, EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION
RockTunnelB1F_MapEvents:
; filler
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -63,7 +63,7 @@
fruittree FRUITTREE_ROUTE_11
Route11HiddenRevive:
- hiddenitem EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE
+ hiddenitem REVIVE, EVENT_ROUTE_11_HIDDEN_REVIVE
YoungsterOwenSeenText:
text "There's no cheat-"
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -70,7 +70,7 @@
itemball NUGGET
Route12HiddenElixer:
- hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER
+ hiddenitem ELIXER, EVENT_ROUTE_12_HIDDEN_ELIXER
FisherMartinSeenText:
text "Patience is the"
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -77,7 +77,7 @@
jumptext Route13DirectionsSignText
Route13HiddenCalcium:
- hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM
+ hiddenitem CALCIUM, EVENT_ROUTE_13_HIDDEN_CALCIUM
PokefanmAlexSeenText:
text "Bow down before my"
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -62,10 +62,10 @@
end
Route17HiddenMaxEther:
- hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER
+ hiddenitem MAX_ETHER, EVENT_ROUTE_17_HIDDEN_MAX_ETHER
Route17HiddenMaxElixer:
- hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER
+ hiddenitem MAX_ELIXER, EVENT_ROUTE_17_HIDDEN_MAX_ELIXER
BikerRileySeenText:
text "Hey, you! You're"
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -70,16 +70,16 @@
fruittree FRUITTREE_ROUTE_2
Route2HiddenMaxEther:
- hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER
+ hiddenitem MAX_ETHER, EVENT_ROUTE_2_HIDDEN_MAX_ETHER
Route2HiddenFullHeal:
- hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL
+ hiddenitem FULL_HEAL, EVENT_ROUTE_2_HIDDEN_FULL_HEAL
Route2HiddenFullRestore:
- hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE
+ hiddenitem FULL_RESTORE, EVENT_ROUTE_2_HIDDEN_FULL_RESTORE
Route2HiddenRevive:
- hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE
+ hiddenitem REVIVE, EVENT_ROUTE_2_HIDDEN_REVIVE
BugCatcherRobSeenText:
text "My bug #MON are"
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -191,7 +191,7 @@
itemball PROTEIN
Route25HiddenPotion:
- hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION
+ hiddenitem POTION, EVENT_ROUTE_25_HIDDEN_POTION
MovementData_0x19efe8:
big_step DOWN
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -9,7 +9,7 @@
jumptext Route28SignText
Route28HiddenRareCandy:
- hiddenitem EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY
+ hiddenitem RARE_CANDY, EVENT_ROUTE_28_HIDDEN_RARE_CANDY
Route28SignText:
text "ROUTE 28"
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -248,7 +248,7 @@
fruittree FRUITTREE_ROUTE_30_2
Route30HiddenPotion:
- hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION
+ hiddenitem POTION, EVENT_ROUTE_30_HIDDEN_POTION
Route30_JoeysRattataAttacksMovement:
fix_facing
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -506,10 +506,10 @@
jumpstd pokecentersign
Route32HiddenGreatBall:
- hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL
+ hiddenitem GREAT_BALL, EVENT_ROUTE_32_HIDDEN_GREAT_BALL
Route32HiddenSuperPotion:
- hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION
+ hiddenitem SUPER_POTION, EVENT_ROUTE_32_HIDDEN_SUPER_POTION
Movement_Route32CooltrainerMPushesYouBackToViolet:
step UP
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -488,10 +488,10 @@
itemball NUGGET
Route34HiddenRareCandy:
- hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY
+ hiddenitem RARE_CANDY, EVENT_ROUTE_34_HIDDEN_RARE_CANDY
Route34HiddenSuperPotion:
- hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION
+ hiddenitem SUPER_POTION, EVENT_ROUTE_34_HIDDEN_SUPER_POTION
Route34MovementData_DayCareManWalksBackInside:
slow_step LEFT
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -114,7 +114,7 @@
fruittree FRUITTREE_ROUTE_37_3
Route37HiddenEther:
- hiddenitem EVENT_ROUTE_37_HIDDEN_ETHER, ETHER
+ hiddenitem ETHER, EVENT_ROUTE_37_HIDDEN_ETHER
TwinsAnnandanne1SeenText:
text "ANN: ANNE and I"
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -180,7 +180,7 @@
fruittree FRUITTREE_ROUTE_39
Route39HiddenNugget:
- hiddenitem EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET
+ hiddenitem NUGGET, EVENT_ROUTE_39_HIDDEN_NUGGET
Route39MiltankText:
text "MILTANK: Mooo!"
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -51,7 +51,7 @@
itemball HP_UP
Route4HiddenUltraBall:
- hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
+ hiddenitem ULTRA_BALL, EVENT_ROUTE_4_HIDDEN_ULTRA_BALL
BirdKeeperHankSeenText:
text "I'm raising my"
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -135,7 +135,7 @@
jumpstd smashrock
Route40HiddenHyperPotion:
- hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION
+ hiddenitem HYPER_POTION, EVENT_ROUTE_40_HIDDEN_HYPER_POTION
MovementData_0x1a621c:
step RIGHT
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -132,7 +132,7 @@
jumpstd smashrock
Route41HiddenMaxEther:
- hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER
+ hiddenitem MAX_ETHER, EVENT_ROUTE_41_HIDDEN_MAX_ETHER
SwimmermCharlieSeenText:
text "The water's warm"
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -212,7 +212,7 @@
fruittree FRUITTREE_ROUTE_42_3
Route42HiddenMaxPotion:
- hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION
+ hiddenitem MAX_POTION, EVENT_ROUTE_42_HIDDEN_MAX_POTION
MovementData_0x1a9356:
set_sliding
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -318,7 +318,7 @@
itemball MAX_REPEL
Route44HiddenElixer:
- hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
+ hiddenitem ELIXER, EVENT_ROUTE_44_HIDDEN_ELIXER
FisherWilton1SeenText:
text "Aack! You made me"
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -312,7 +312,7 @@
itemball MAX_POTION
Route45HiddenPpUp:
- hiddenitem EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP
+ hiddenitem PP_UP, EVENT_ROUTE_45_HIDDEN_PP_UP
HikerErikSeenText:
text "Be prepared for"
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -83,7 +83,7 @@
jumptext Route9SignText
Route9HiddenEther:
- hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER
+ hiddenitem ETHER, EVENT_ROUTE_9_HIDDEN_ETHER
CamperDeanSeenText:
text "I came to explore"
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -17,7 +17,7 @@
jumptext MtSilverSignText
SilverCaveOutsideHiddenFullRestore:
- hiddenitem EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
+ hiddenitem FULL_RESTORE, EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE
MtSilverSignText:
text "MT.SILVER"
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -24,10 +24,10 @@
itemball ULTRA_BALL
SilverCaveRoom1HiddenDireHit:
- hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT
+ hiddenitem DIRE_HIT, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT
SilverCaveRoom1HiddenUltraBall:
- hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL
+ hiddenitem ULTRA_BALL, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL
SilverCaveRoom1_MapEvents:
; filler
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -20,7 +20,7 @@
itemball PP_UP
SilverCaveRoom2HiddenMaxPotion:
- hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION
+ hiddenitem MAX_POTION, EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION
SilverCaveRoom2_MapEvents:
; filler
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -540,7 +540,7 @@
itemball GUARD_SPEC
TeamRocketBaseB1FHiddenRevive:
- hiddenitem EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE
+ hiddenitem REVIVE, EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE
SecurityCameraMovement1:
big_step RIGHT
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -356,7 +356,7 @@
itemball TM_THIEF
TeamRocketBaseB2FHiddenFullHeal:
- hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
+ hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL
MovementData_0x6d212:
step RIGHT
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -20,7 +20,7 @@
itemball ESCAPE_ROPE
TinTower4FHiddenMaxPotion:
- hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION
+ hiddenitem MAX_POTION, EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
TinTower4F_MapEvents:
; filler
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -12,10 +12,10 @@
itemball RARE_CANDY
TinTower5FHiddenFullRestore:
- hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE
+ hiddenitem FULL_RESTORE, EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE
TinTower5FHiddenCarbos:
- hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS
+ hiddenitem CARBOS, EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
TinTower5F_MapEvents:
; filler
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -6,10 +6,10 @@
db 0
UndergroundPathHiddenFullRestore:
- hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE
+ hiddenitem FULL_RESTORE, EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE
UndergroundPathHiddenXSpecial:
- hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL
+ hiddenitem X_SPECIAL, EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL
UndergroundPath_MapEvents:
; filler
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -123,7 +123,7 @@
jumpstd martsign
VermilionCityHiddenFullHeal:
- hiddenitem EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL
+ hiddenitem FULL_HEAL, EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL
VermilionCityTeacherText:
text "VERMILION PORT is"
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -195,7 +195,7 @@
end
VermilionPortHiddenIron:
- hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON
+ hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON
MovementData_0x74ef1:
step DOWN
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -112,10 +112,10 @@
itemball HP_UP
VictoryRoadHiddenMaxPotion:
- hiddenitem EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION
+ hiddenitem MAX_POTION, EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION
VictoryRoadHiddenFullHeal:
- hiddenitem EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL
+ hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL
MovementData_0x74539:
step LEFT
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -98,7 +98,7 @@
fruittree FRUITTREE_VIOLET_CITY
VioletCityHiddenHyperPotion:
- hiddenitem EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION
+ hiddenitem HYPER_POTION, EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION
VioletCityFollowEarl_MovementData:
big_step DOWN
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -32,13 +32,13 @@
jumpstd strengthboulder
WhirlIslandB1FHiddenRareCandy:
- hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY
+ hiddenitem RARE_CANDY, EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY
WhirlIslandB1FHiddenUltraBall:
- hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
+ hiddenitem ULTRA_BALL, EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL
WhirlIslandB1FHiddenFullRestore:
- hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE
+ hiddenitem FULL_RESTORE, EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE
WhirlIslandB1F_MapEvents:
; filler