diff options
63 files changed, 90 insertions, 90 deletions
diff --git a/docs/map_scripts.md b/docs/map_scripts.md index 2302257e7..ba5a58784 100644 --- 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` diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 31a1f16d9..f7452080e 100644 --- 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 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index bb637fa26..83a29e7ad 100644 --- 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 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index f8e5ef52f..71b3c1caa 100644 --- 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 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 8075a5343..d1a116a40 100644 --- 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" diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 9980a4487..b30d1f310 100644 --- 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" diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index b1076ded5..bbc942b07 100644 --- 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 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index f05b7aeb3..82be11a81 100644 --- 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 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index ed4765d18..c817510ab 100644 --- 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 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 3eed4f41c..cea6b588b 100644 --- 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 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index b7ff38465..c894b3aeb 100644 --- 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" diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 10b079edf..0a858f4f5 100644 --- 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 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 4f8c46c7a..f2d7ebba9 100644 --- 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. diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index e8e566666..b8e35d8cf 100644 --- 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" diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 621c133fd..34104f302 100644 --- 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 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 2df927ebd..b0cba6d34 100644 --- 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" diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 1fe814b66..00caf4394 100644 --- 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 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index d70dc8492..6ee9284fe 100644 --- 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" diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 4d818133f..27f5528cd 100644 --- 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 diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index fdbbeb438..a624862ef 100644 --- 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 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 1d9848f3b..685924675 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -75,7 +75,7 @@ ClefairyDance: 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 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index a67ba1144..ab9964a42 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -64,7 +64,7 @@ MountMortar1FInsideUltraBall: 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" diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index d38f4f732..fbb7f8898 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -16,7 +16,7 @@ MountMortar1FOutsideRevive: 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 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 66120731f..94212e538 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -44,7 +44,7 @@ MountMortar2FInsideEscapeRope: 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!" diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 7d798c22e..44149c357 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -72,7 +72,7 @@ MountMortarB1FPPUp: 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!" diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 9429c5845..0e4c1005c 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -305,7 +305,7 @@ NationalParkTMDig: 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" diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index c69e55854..cc659bf43 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -115,7 +115,7 @@ NationalParkBugContestTMDig: 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" diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index ccee7f0c7..7c0ab40f2 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -44,7 +44,7 @@ OlivineLighthouse5FTMSwagger: 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" diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 0b9b8882a..6d78948fd 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -234,7 +234,7 @@ CooltrainerFScript_0x74a22: end OlivinePortHiddenProtein: - hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN + hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN MovementData_0x74a30: step DOWN diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 570b4b2f5..bd58c797f 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -16,10 +16,10 @@ RockTunnel1FTMSteelWing: 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 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index d94f1f412..579c76532 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -20,7 +20,7 @@ RockTunnelB1FRevive: 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 diff --git a/maps/Route11.asm b/maps/Route11.asm index 353877969..af83ce56c 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -63,7 +63,7 @@ FruitTreeScript_0x68055: 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-" diff --git a/maps/Route12.asm b/maps/Route12.asm index 3aaf37991..0d3dedca7 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -70,7 +70,7 @@ Route12Nugget: itemball NUGGET Route12HiddenElixer: - hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_ROUTE_12_HIDDEN_ELIXER FisherMartinSeenText: text "Patience is the" diff --git a/maps/Route13.asm b/maps/Route13.asm index 88753afbb..ae06e1051 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -77,7 +77,7 @@ Route13DirectionsSign: jumptext Route13DirectionsSignText Route13HiddenCalcium: - hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM + hiddenitem CALCIUM, EVENT_ROUTE_13_HIDDEN_CALCIUM PokefanmAlexSeenText: text "Bow down before my" diff --git a/maps/Route17.asm b/maps/Route17.asm index b2c1a820d..aeaf26f10 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -62,10 +62,10 @@ TrainerBikerGlenn: 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" diff --git a/maps/Route2.asm b/maps/Route2.asm index f4d910194..084dff802 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -70,16 +70,16 @@ FruitTreeScript_0x1ac306: 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" diff --git a/maps/Route25.asm b/maps/Route25.asm index 616a8ff8f..e6ca7eb77 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -191,7 +191,7 @@ Route25Protein: itemball PROTEIN Route25HiddenPotion: - hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION + hiddenitem POTION, EVENT_ROUTE_25_HIDDEN_POTION MovementData_0x19efe8: big_step DOWN diff --git a/maps/Route28.asm b/maps/Route28.asm index 5c1b58992..32a47f415 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -9,7 +9,7 @@ Route28Sign: 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" diff --git a/maps/Route30.asm b/maps/Route30.asm index 5d6fc0de8..c4276c3f9 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -248,7 +248,7 @@ Route30FruitTree2: fruittree FRUITTREE_ROUTE_30_2 Route30HiddenPotion: - hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION + hiddenitem POTION, EVENT_ROUTE_30_HIDDEN_POTION Route30_JoeysRattataAttacksMovement: fix_facing diff --git a/maps/Route32.asm b/maps/Route32.asm index 6b82252dc..451d719aa 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -506,10 +506,10 @@ Route32PokecenterSign: 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 diff --git a/maps/Route34.asm b/maps/Route34.asm index 786ffb022..8d78baad4 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -488,10 +488,10 @@ Route34Nugget: 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 diff --git a/maps/Route37.asm b/maps/Route37.asm index 27dd38893..442e76ab7 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -114,7 +114,7 @@ FruitTreeScript_0x1a8e0d: 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" diff --git a/maps/Route39.asm b/maps/Route39.asm index 9af608cbc..bf4ce814c 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -180,7 +180,7 @@ FruitTreeScript_0x1a5bf4: fruittree FRUITTREE_ROUTE_39 Route39HiddenNugget: - hiddenitem EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET + hiddenitem NUGGET, EVENT_ROUTE_39_HIDDEN_NUGGET Route39MiltankText: text "MILTANK: Mooo!" diff --git a/maps/Route4.asm b/maps/Route4.asm index a0bf7c4bc..b3dcede9d 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -51,7 +51,7 @@ Route4HPUp: 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" diff --git a/maps/Route40.asm b/maps/Route40.asm index 9124da140..c9e052b52 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -135,7 +135,7 @@ Route40Rock: 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 diff --git a/maps/Route41.asm b/maps/Route41.asm index 4b66164dd..20340e7cd 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -132,7 +132,7 @@ Route41Rock: 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" diff --git a/maps/Route42.asm b/maps/Route42.asm index c9d9ac30e..c9069e7a6 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -212,7 +212,7 @@ FruitTreeScript_0x1a9351: 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 diff --git a/maps/Route44.asm b/maps/Route44.asm index 6ab469c04..1995c4cb2 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -318,7 +318,7 @@ Route44MaxRepel: itemball MAX_REPEL Route44HiddenElixer: - hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_ROUTE_44_HIDDEN_ELIXER FisherWilton1SeenText: text "Aack! You made me" diff --git a/maps/Route45.asm b/maps/Route45.asm index 2b026b8d4..205f6b12a 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -312,7 +312,7 @@ Route45MaxPotion: 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" diff --git a/maps/Route9.asm b/maps/Route9.asm index cd1831f98..e7796bf31 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -83,7 +83,7 @@ Route9Sign: jumptext Route9SignText Route9HiddenEther: - hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ROUTE_9_HIDDEN_ETHER CamperDeanSeenText: text "I came to explore" diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 3e51cf7b2..7613026a3 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -17,7 +17,7 @@ MtSilverSign: 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" diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index fd04a1a6d..8ea6cf362 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -24,10 +24,10 @@ SilverCaveRoom1UltraBall: 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 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index eb6b9fd69..daa1bf0a2 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -20,7 +20,7 @@ SilverCaveRoom2PPUp: 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 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 7ecb7b71a..841b80f09 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -540,7 +540,7 @@ TeamRocketBaseB1FGuardSpec: 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 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index abfd227a1..d7af45ca2 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -356,7 +356,7 @@ TeamRocketBaseB2FTMThief: 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 diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 67fd4fda6..f58971358 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -20,7 +20,7 @@ TinTower4FEscapeRope: 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 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index ee2980b33..5bad496ee 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -12,10 +12,10 @@ TinTower5FRareCandy: 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 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 6834c043e..fd23de3d9 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -6,10 +6,10 @@ UndergroundPath_MapScripts: 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 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index d3e270ed7..978ac943d 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -123,7 +123,7 @@ VermilionCityMartSign: 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" diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index c71739ef6..793e841d1 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -195,7 +195,7 @@ SuperNerdScript_0x74ee6: end VermilionPortHiddenIron: - hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON + hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON MovementData_0x74ef1: step DOWN diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index e0389faeb..7bc86ec04 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -112,10 +112,10 @@ VictoryRoadHPUp: 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 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 6890ffa8a..684deb7e2 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -98,7 +98,7 @@ VioletCityFruitTreeScript: 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 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 8b816062f..3d6a94aac 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -32,13 +32,13 @@ WhirlIslandB1FBoulder: 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 |