From 0c4bf512d08d3779d1185dd08b3f21041f2b6044 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 9 Dec 2015 11:57:08 -0500 Subject: [PATCH] itemfragment --- macros/map.asm | 8 ++++++++ maps/BurnedTower1F.asm | 2 +- maps/BurnedTowerB1F.asm | 2 +- maps/DarkCaveBlackthornEntrance.asm | 4 ++-- maps/DarkCaveVioletEntrance.asm | 8 ++++---- maps/DragonsDenB1F.asm | 4 ++-- maps/FightingDojo.asm | 2 +- maps/GoldenrodDeptStoreB1F.asm | 8 ++++---- maps/IcePath1F.asm | 6 +++--- maps/IcePathB1F.asm | 2 +- maps/IcePathB2FBlackthornSide.asm | 2 +- maps/IcePathB2FMahoganySide.asm | 4 ++-- maps/IcePathB3F.asm | 2 +- maps/IlexForest.asm | 8 ++++---- maps/LakeofRage.asm | 4 ++-- maps/MountMortar1FInside.asm | 14 +++++++------- maps/MountMortar1FOutside.asm | 4 ++-- maps/MountMortar2FInside.asm | 12 ++++++------ maps/MountMortarB1F.asm | 10 +++++----- maps/NationalPark.asm | 4 ++-- maps/NationalParkBugContest.asm | 4 ++-- maps/OlivineLighthouse3F.asm | 2 +- maps/OlivineLighthouse5F.asm | 6 +++--- maps/OlivineLighthouse6F.asm | 2 +- maps/RadioTower5F.asm | 2 +- maps/RockTunnel1F.asm | 4 ++-- maps/RockTunnelB1F.asm | 6 +++--- maps/Route12.asm | 4 ++-- maps/Route15.asm | 2 +- maps/Route2.asm | 8 ++++---- maps/Route25.asm | 2 +- maps/Route26.asm | 2 +- maps/Route27.asm | 4 ++-- maps/Route29.asm | 2 +- maps/Route30.asm | 2 +- maps/Route31.asm | 4 ++-- maps/Route32.asm | 4 ++-- maps/Route34.asm | 2 +- maps/Route35.asm | 2 +- maps/Route4.asm | 2 +- maps/Route42.asm | 4 ++-- maps/Route43.asm | 2 +- maps/Route44.asm | 6 +++--- maps/Route45.asm | 8 ++++---- maps/Route46.asm | 2 +- maps/RuinsofAlphAerodactylItemRoom.asm | 8 ++++---- maps/RuinsofAlphHoOhItemRoom.asm | 8 ++++---- maps/RuinsofAlphKabutoItemRoom.asm | 8 ++++---- maps/RuinsofAlphOmanyteItemRoom.asm | 8 ++++---- maps/SilverCaveItemRooms.asm | 4 ++-- maps/SilverCaveRoom1.asm | 8 ++++---- maps/SilverCaveRoom2.asm | 6 +++--- maps/SlowpokeWellB1F.asm | 2 +- maps/SlowpokeWellB2F.asm | 2 +- maps/SproutTower1F.asm | 2 +- maps/SproutTower2F.asm | 2 +- maps/SproutTower3F.asm | 4 ++-- maps/TeamRocketBaseB1F.asm | 6 +++--- maps/TeamRocketBaseB2F.asm | 2 +- maps/TeamRocketBaseB3F.asm | 10 +++++----- maps/TinTower3F.asm | 2 +- maps/TinTower4F.asm | 6 +++--- maps/TinTower5F.asm | 2 +- maps/TinTower6F.asm | 2 +- maps/TinTower7F.asm | 2 +- maps/TinTower8F.asm | 6 +++--- maps/TinTower9F.asm | 2 +- maps/TohjoFalls.asm | 2 +- maps/UndergroundPathSwitchRoomEntrances.asm | 4 ++-- maps/UndergroundWarehouse.asm | 6 +++--- maps/UnionCave1F.asm | 8 ++++---- maps/UnionCaveB1F.asm | 4 ++-- maps/UnionCaveB2F.asm | 4 ++-- maps/VictoryRoad.asm | 10 +++++----- maps/VioletCity.asm | 4 ++-- maps/WarehouseEntrance.asm | 2 +- maps/WhirlIslandB1F.asm | 10 +++++----- maps/WhirlIslandB2F.asm | 6 +++--- maps/WhirlIslandNE.asm | 2 +- maps/WhirlIslandSW.asm | 2 +- 80 files changed, 186 insertions(+), 178 deletions(-) diff --git a/macros/map.asm b/macros/map.asm index 113b05898..a51184b84 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -170,3 +170,11 @@ elevfloor: MACRO db \1, \2 map \3 ENDM + +itemfragment: MACRO +if _NARG == 2 + db \1, \2 +else + db \1, 1 +endc +endm diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index dd3e7b070..be0d7180b 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -144,7 +144,7 @@ MapBurnedTower1FSignpostItem1: ItemFragment_0x185ccb: - db HP_UP, 1 + itemfragment HP_UP MovementData_0x185ccd: step_left diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 1b86d73ca..f3137342a 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -124,7 +124,7 @@ UnknownScript_0x18622a: end ItemFragment_0x186231: - db TM_ENDURE, 1 + itemfragment TM_ENDURE BurnedTowerB1FBoulder: jumpstd strengthboulder diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 715341916..7cc6fd3a9 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -28,10 +28,10 @@ UnknownScript_0x18c739: end ItemFragment_0x18c73b: - db REVIVE, 1 + itemfragment REVIVE ItemFragment_0x18c73d: - db TM_SNORE, 1 + itemfragment TM_SNORE UnknownText_0x18c73f: text "Whoa! You startled" diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 2320303ab..7a6767207 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -16,16 +16,16 @@ DarkCaveVioletEntrance_MapScriptHeader: db 0 ItemFragment_0x18c68e: - db POTION, 1 + itemfragment POTION ItemFragment_0x18c690: - db FULL_HEAL, 1 + itemfragment FULL_HEAL ItemFragment_0x18c692: - db HYPER_POTION, 1 + itemfragment HYPER_POTION ItemFragment_0x18c694: - db DIRE_HIT, 1 + itemfragment DIRE_HIT DarkCaveVioletEntranceRock: jumpstd smashrock diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index c5568f3ac..7016b6fa7 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -179,10 +179,10 @@ MapDragonsDenB1FSignpost0Script: jumptext UnknownText_0x18cc2e ItemFragment_0x18c9a1: - db CALCIUM, 1 + itemfragment CALCIUM ItemFragment_0x18c9a3: - db MAX_ELIXER, 1 + itemfragment MAX_ELIXER MapDragonsDenB1FSignpostItem1: dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index ec2eae82a..ad95734b7 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -19,7 +19,7 @@ MapFightingDojoSignpost1Script: jumptext UnknownText_0x189be0 ItemFragment_0x189b6a: - db FOCUS_BAND, 1 + itemfragment FOCUS_BAND UnknownText_0x189b6c: text "Hello!" diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 8ff2e9f03..9332be697 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -68,16 +68,16 @@ MachopScript_0x7d7b9: end ItemFragment_0x7d7c3: - db ETHER, 1 + itemfragment ETHER ItemFragment_0x7d7c5: - db AMULET_COIN, 1 + itemfragment AMULET_COIN ItemFragment_0x7d7c7: - db BURN_HEAL, 1 + itemfragment BURN_HEAL ItemFragment_0x7d7c9: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL UnknownText_0x7d7cb: text "Hey, kid! You're" diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 6ab88a560..4da8d5084 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -11,13 +11,13 @@ IcePath1F_MapScriptHeader: db 0 ItemFragment_0x7e472: - db HM_WATERFALL, 1 + itemfragment HM_WATERFALL ItemFragment_0x7e474: - db PP_UP, 1 + itemfragment PP_UP ItemFragment_0x7e476: - db PROTEIN, 1 + itemfragment PROTEIN IcePath1F_MapEventHeader: ; filler diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index d86b52870..86a69de02 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -78,7 +78,7 @@ IcePathB1FBoulder: jumpstd strengthboulder ItemFragment_0x7e50d: - db IRON, 1 + itemfragment IRON MapIcePathB1FSignpostItem0: dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 3b8f2b2d4..c4b8d9df3 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -9,7 +9,7 @@ IcePathB2FBlackthornSide_MapScriptHeader: db 0 ItemFragment_0x7e646: - db TM_REST, 1 + itemfragment TM_REST MapIcePathB2FBlackthornSideSignpostItem0: dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 84d0ab309..406a8216f 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -17,10 +17,10 @@ BoulderScript_0x7e5a3: jumptext UnknownText_0x7e5ad ItemFragment_0x7e5a6: - db FULL_HEAL, 1 + itemfragment FULL_HEAL ItemFragment_0x7e5a8: - db MAX_POTION, 1 + itemfragment MAX_POTION MapIcePathB2FMahoganySideSignpostItem0: dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index cf4e867b9..dc2b41001 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -10,7 +10,7 @@ IcePathB3F_MapScriptHeader: db 0 ItemFragment_0x7e66f: - db NEVERMELTICE, 1 + itemfragment NEVERMELTICE IcePathB3FRock: jumpstd smashrock diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index cb1ff2870..b6a637205 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -405,16 +405,16 @@ IlexForestLassScript: jumptextfaceplayer Text_IlexForestLass ItemFragment_0x6ee10: - db REVIVE, 1 + itemfragment REVIVE ItemFragment_0x6ee12: - db X_ATTACK, 1 + itemfragment X_ATTACK ItemFragment_0x6ee14: - db ANTIDOTE, 1 + itemfragment ANTIDOTE ItemFragment_0x6ee16: - db ETHER, 1 + itemfragment ETHER MapIlexForestSignpostItem1: dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index b0d11abe2..2213b2012 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -231,10 +231,10 @@ WesleyNotWednesdayScript: end ItemFragment_0x70148: - db ELIXER, 1 + itemfragment ELIXER ItemFragment_0x7014a: - db TM_DETECT, 1 + itemfragment TM_DETECT MapLakeofRageSignpostItem2: dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 3ead2c21e..c34717597 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -43,25 +43,25 @@ MountMortar1FBoulder: jumpstd strengthboulder ItemFragment_0x7de7c: - db ESCAPE_ROPE, 1 + itemfragment ESCAPE_ROPE ItemFragment_0x7de7e: - db MAX_REVIVE, 1 + itemfragment MAX_REVIVE ItemFragment_0x7de80: - db HYPER_POTION, 1 + itemfragment HYPER_POTION ItemFragment_0x7de82: - db MAX_POTION, 1 + itemfragment MAX_POTION ItemFragment_0x7de84: - db NUGGET, 1 + itemfragment NUGGET ItemFragment_0x7de86: - db IRON, 1 + itemfragment IRON ItemFragment_0x7de88: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL MapMountMortar1FInsideSignpostItem0: dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 484f389c9..f4494f6ed 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -10,10 +10,10 @@ MountMortar1FOutside_MapScriptHeader: db 0 ItemFragment_0x7ddf6: - db ETHER, 1 + itemfragment ETHER ItemFragment_0x7ddf8: - db REVIVE, 1 + itemfragment REVIVE MapMountMortar1FOutsideSignpostItem0: dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 12ef920d7..846aa3180 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -26,22 +26,22 @@ SupernerdHughScript: end ItemFragment_0x7e0de: - db MAX_POTION, 1 + itemfragment MAX_POTION ItemFragment_0x7e0e0: - db RARE_CANDY, 1 + itemfragment RARE_CANDY ItemFragment_0x7e0e2: - db TM_DEFENSE_CURL, 1 + itemfragment TM_DEFENSE_CURL ItemFragment_0x7e0e4: - db DRAGON_SCALE, 1 + itemfragment DRAGON_SCALE ItemFragment_0x7e0e6: - db ELIXER, 1 + itemfragment ELIXER ItemFragment_0x7e0e8: - db ESCAPE_ROPE, 1 + itemfragment ESCAPE_ROPE MapMountMortar2FInsideSignpostItem0: dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index d515bbc8b..f8ea9a10a 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -57,19 +57,19 @@ MountMortarB1FBoulder: jumpstd strengthboulder ItemFragment_0x7e240: - db HYPER_POTION, 1 + itemfragment HYPER_POTION ItemFragment_0x7e242: - db CARBOS, 1 + itemfragment CARBOS ItemFragment_0x7e244: - db FULL_RESTORE, 1 + itemfragment FULL_RESTORE ItemFragment_0x7e246: - db MAX_ETHER, 1 + itemfragment MAX_ETHER ItemFragment_0x7e248: - db PP_UP, 1 + itemfragment PP_UP MapMountMortarB1FSignpostItem0: dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 9997b59f1..32397a31e 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -299,10 +299,10 @@ MapNationalParkSignpost3Script: jumptext UnknownText_0x5c7c6 ItemFragment_0x5c1cc: - db PARLYZ_HEAL, 1 + itemfragment PARLYZ_HEAL ItemFragment_0x5c1ce: - db TM_DIG, 1 + itemfragment TM_DIG MapNationalParkSignpostItem2: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index f74d8f12b..144cb7036 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -109,10 +109,10 @@ MapNationalParkBugContestSignpost3Script: jumptext UnknownText_0x5cc1d ItemFragment_0x5c945: - db PARLYZ_HEAL, 1 + itemfragment PARLYZ_HEAL ItemFragment_0x5c947: - db TM_DIG, 1 + itemfragment TM_DIG MapNationalParkBugContestSignpostItem2: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 82a145f0a..aacd8b37a 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -45,7 +45,7 @@ SailorTerrellScript: end ItemFragment_0x5b279: - db ETHER, 1 + itemfragment ETHER Bird_keeperTheoSeenText: text "Why are you here?" diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index d8aee5047..6577faded 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -35,13 +35,13 @@ SailorErnestScript: end ItemFragment_0x609aa: - db RARE_CANDY, 1 + itemfragment RARE_CANDY ItemFragment_0x609ac: - db SUPER_REPEL, 1 + itemfragment SUPER_REPEL ItemFragment_0x609ae: - db TM_SWAGGER, 1 + itemfragment TM_SWAGGER MapOlivineLighthouse5FSignpostItem0: dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 6edd97777..a2ce7254d 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -128,7 +128,7 @@ UnknownScript_0x60c51: end ItemFragment_0x60c66: - db SUPER_POTION, 1 + itemfragment SUPER_POTION MovementData_0x60c68: slow_step_up diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 295897ecf..a0c75646c 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -144,7 +144,7 @@ Ben: jumptextfaceplayer BenText ItemFragment_0x600fe: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL MapRadioTower5FSignpost0Script: jumptext SignpostRadioTower5FOffice diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index d4118017c..c6cf26611 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -10,10 +10,10 @@ RockTunnel1F_MapScriptHeader: db 0 ItemFragment_0x743b5: - db ELIXER, 1 + itemfragment ELIXER ItemFragment_0x743b7: - db TM_STEEL_WING, 1 + itemfragment TM_STEEL_WING MapRockTunnel1FSignpostItem0: dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 67e6aeeb1..9f5321ee2 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -11,13 +11,13 @@ RockTunnelB1F_MapScriptHeader: db 0 ItemFragment_0x74409: - db IRON, 1 + itemfragment IRON ItemFragment_0x7440b: - db PP_UP, 1 + itemfragment PP_UP ItemFragment_0x7440d: - db REVIVE, 1 + itemfragment REVIVE MapRockTunnelB1FSignpostItem0: dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION diff --git a/maps/Route12.asm b/maps/Route12.asm index 9b1dba040..50ef063c0 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -64,10 +64,10 @@ MapRoute12Signpost1Script: jumptext UnknownText_0x1a72c1 ItemFragment_0x1a700b: - db CALCIUM, 1 + itemfragment CALCIUM ItemFragment_0x1a700d: - db NUGGET, 1 + itemfragment NUGGET MapRoute12SignpostItem2: dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER diff --git a/maps/Route15.asm b/maps/Route15.asm index 3f121ab8e..3519945e7 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -84,7 +84,7 @@ MapRoute15Signpost0Script: jumptext UnknownText_0x1aa8e3 ItemFragment_0x1aa5e4: - db PP_UP, 1 + itemfragment PP_UP TeacherColetteSeenText: text "Have you forgotten" diff --git a/maps/Route2.asm b/maps/Route2.asm index 24a2bb69d..08a309d14 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -55,16 +55,16 @@ MapRoute2Signpost1Script: jumptext UnknownText_0x1ac49f ItemFragment_0x1ac2fe: - db DIRE_HIT, 1 + itemfragment DIRE_HIT ItemFragment_0x1ac300: - db MAX_POTION, 1 + itemfragment MAX_POTION ItemFragment_0x1ac302: - db CARBOS, 1 + itemfragment CARBOS ItemFragment_0x1ac304: - db ELIXER, 1 + itemfragment ELIXER FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 diff --git a/maps/Route25.asm b/maps/Route25.asm index 64d99e39e..53115d8dc 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -190,7 +190,7 @@ MapRoute25Signpost0Script: jumptext UnknownText_0x19f567 ItemFragment_0x19efe3: - db PROTEIN, 1 + itemfragment PROTEIN MapRoute25SignpostItem1: dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION diff --git a/maps/Route26.asm b/maps/Route26.asm index 3e909edea..dc81d71c0 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -252,7 +252,7 @@ FruitTreeScript_0x1a4ec2: fruittree FRUITTREE_ROUTE_26 ItemFragment_0x1a4ec4: - db MAX_ELIXER, 1 + itemfragment MAX_ELIXER CooltrainermJakeSeenText: text "I'm making my" diff --git a/maps/Route27.asm b/maps/Route27.asm index 5f8e3cd26..fec3294c7 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -304,10 +304,10 @@ MapRoute27Signpost0Script: jumptext UnknownText_0x1a0e7f ItemFragment_0x1a0a62: - db TM_SOLARBEAM, 1 + itemfragment TM_SOLARBEAM ItemFragment_0x1a0a64: - db RARE_CANDY, 1 + itemfragment RARE_CANDY MovementData_0x1a0a66: step_left diff --git a/maps/Route29.asm b/maps/Route29.asm index 3ccdc0ddf..72b0d7d03 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -217,7 +217,7 @@ FruitTreeScript_0x1a1089: fruittree FRUITTREE_ROUTE_29 ItemFragment_0x1a108b: - db POTION, 1 + itemfragment POTION MovementData_0x1a108d: step_up diff --git a/maps/Route30.asm b/maps/Route30.asm index bcaa9eb1e..40a66d668 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -239,7 +239,7 @@ MapRoute30Signpost3Script: jumptext UnknownText_0x1a1b66 ItemFragment_0x1a17f5: - db ANTIDOTE, 1 + itemfragment ANTIDOTE FruitTreeScript_0x1a17f7: fruittree FRUITTREE_ROUTE_30_1 diff --git a/maps/Route31.asm b/maps/Route31.asm index a0ed6dec0..b2e615cd7 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -264,10 +264,10 @@ FruitTreeScript_0x1a55f9: fruittree FRUITTREE_ROUTE_31 ItemFragment_0x1a55fb: - db POTION, 1 + itemfragment POTION ItemFragment_0x1a55fd: - db POKE_BALL, 1 + itemfragment POKE_BALL UnknownText_0x1a55ff: text "DARK CAVE…" diff --git a/maps/Route32.asm b/maps/Route32.asm index e9e488e8b..642889314 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -493,10 +493,10 @@ FriedaNotFridayScript: end ItemFragment_0x190773: - db GREAT_BALL, 1 + itemfragment GREAT_BALL ItemFragment_0x190775: - db REPEL, 1 + itemfragment REPEL Route32Sign: jumptext Route32SignText diff --git a/maps/Route34.asm b/maps/Route34.asm index d9e386a95..fb82b2556 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -488,7 +488,7 @@ MapRoute34Signpost2Script: jumptext UnknownText_0x78a52 ItemFragment_0x7832b: - db NUGGET, 1 + itemfragment NUGGET MapRoute34SignpostItem3: dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY diff --git a/maps/Route35.asm b/maps/Route35.asm index b4a159cbe..bb05388c8 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -271,7 +271,7 @@ MapRoute35Signpost1Script: jumptext UnknownText_0x19cf94 ItemFragment_0x19ca7c: - db TM_ROLLOUT, 1 + itemfragment TM_ROLLOUT FruitTreeScript_0x19ca7e: fruittree FRUITTREE_ROUTE_35 diff --git a/maps/Route4.asm b/maps/Route4.asm index 6bf7f276e..4b72e3566 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -48,7 +48,7 @@ MapRoute4Signpost0Script: jumptext UnknownText_0x1ae384 ItemFragment_0x1ae20f: - db HP_UP, 1 + itemfragment HP_UP MapRoute4SignpostItem1: dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL diff --git a/maps/Route42.asm b/maps/Route42.asm index 196ffcd80..959554f3b 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -199,10 +199,10 @@ MapRoute42Signpost3Script: jumptext UnknownText_0x1a95a1 ItemFragment_0x1a9349: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL ItemFragment_0x1a934b: - db SUPER_POTION, 1 + itemfragment SUPER_POTION FruitTreeScript_0x1a934d: fruittree FRUITTREE_ROUTE_42_1 diff --git a/maps/Route43.asm b/maps/Route43.asm index b82a84174..b2ec20174 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -325,7 +325,7 @@ FruitTreeScript_0x19d266: fruittree FRUITTREE_ROUTE_43 ItemFragment_0x19d268: - db MAX_ETHER, 1 + itemfragment MAX_ETHER PokemaniacBenSeenText: text "I love #MON!" diff --git a/maps/Route44.asm b/maps/Route44.asm index 81bf8686b..e7973152e 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -309,13 +309,13 @@ FruitTreeScript_0x19da40: fruittree FRUITTREE_ROUTE_44 ItemFragment_0x19da42: - db MAX_REVIVE, 1 + itemfragment MAX_REVIVE ItemFragment_0x19da44: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL ItemFragment_0x19da46: - db MAX_REPEL, 1 + itemfragment MAX_REPEL MapRoute44SignpostItem2: dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER diff --git a/maps/Route45.asm b/maps/Route45.asm index 592937932..1abefc471 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -300,16 +300,16 @@ FruitTreeScript_0x19e294: fruittree FRUITTREE_ROUTE_45 ItemFragment_0x19e296: - db NUGGET, 1 + itemfragment NUGGET ItemFragment_0x19e298: - db REVIVE, 1 + itemfragment REVIVE ItemFragment_0x19e29a: - db ELIXER, 1 + itemfragment ELIXER ItemFragment_0x19e29c: - db MAX_POTION, 1 + itemfragment MAX_POTION MapRoute45SignpostItem1: dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP diff --git a/maps/Route46.asm b/maps/Route46.asm index 05dd3c7df..17f0955c4 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -162,7 +162,7 @@ MapRoute46Signpost0Script: jumptext UnknownText_0x1a99be ItemFragment_0x1a978d: - db X_SPEED, 1 + itemfragment X_SPEED FruitTreeScript_0x1a978f: fruittree FRUITTREE_ROUTE_46_1 diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index 1ea6976e6..91d6087c1 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -12,16 +12,16 @@ RuinsofAlphAerodactylItemRoom_MapScriptHeader: db 0 ItemFragment_0x59ab6: - db GOLD_BERRY, 1 + itemfragment GOLD_BERRY ItemFragment_0x59ab8: - db MOON_STONE, 1 + itemfragment MOON_STONE ItemFragment_0x59aba: - db HEAL_POWDER, 1 + itemfragment HEAL_POWDER ItemFragment_0x59abc: - db ENERGY_ROOT, 1 + itemfragment ENERGY_ROOT MapRuinsofAlphAerodactylItemRoomSignpost1Script: jumptext UnknownText_0x59ac1 diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index 6578c223d..3ceaf78fc 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -12,16 +12,16 @@ RuinsofAlphHoOhItemRoom_MapScriptHeader: db 0 ItemFragment_0x59918: - db GOLD_BERRY, 1 + itemfragment GOLD_BERRY ItemFragment_0x5991a: - db MYSTERYBERRY, 1 + itemfragment MYSTERYBERRY ItemFragment_0x5991c: - db REVIVAL_HERB, 1 + itemfragment REVIVAL_HERB ItemFragment_0x5991e: - db CHARCOAL, 1 + itemfragment CHARCOAL MapRuinsofAlphHoOhItemRoomSignpost1Script: jumptext UnknownText_0x59923 diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index 3e771583a..11c467d87 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -12,16 +12,16 @@ RuinsofAlphKabutoItemRoom_MapScriptHeader: db 0 ItemFragment_0x599a2: - db BERRY, 1 + itemfragment BERRY ItemFragment_0x599a4: - db PSNCUREBERRY, 1 + itemfragment PSNCUREBERRY ItemFragment_0x599a6: - db HEAL_POWDER, 1 + itemfragment HEAL_POWDER ItemFragment_0x599a8: - db ENERGYPOWDER, 1 + itemfragment ENERGYPOWDER MapRuinsofAlphKabutoItemRoomSignpost1Script: jumptext UnknownText_0x599ad diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index cb030b494..4c7bea7db 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -12,16 +12,16 @@ RuinsofAlphOmanyteItemRoom_MapScriptHeader: db 0 ItemFragment_0x59a2c: - db MYSTERYBERRY, 1 + itemfragment MYSTERYBERRY ItemFragment_0x59a2e: - db MYSTIC_WATER, 1 + itemfragment MYSTIC_WATER ItemFragment_0x59a30: - db STARDUST, 1 + itemfragment STARDUST ItemFragment_0x59a32: - db STAR_PIECE, 1 + itemfragment STAR_PIECE MapRuinsofAlphOmanyteItemRoomSignpost1Script: jumptext UnknownText_0x59a37 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 000ce091f..093a91f5e 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -10,10 +10,10 @@ SilverCaveItemRooms_MapScriptHeader: db 0 ItemFragment_0x18c65e: - db MAX_REVIVE, 1 + itemfragment MAX_REVIVE ItemFragment_0x18c660: - db FULL_RESTORE, 1 + itemfragment FULL_RESTORE SilverCaveItemRooms_MapEventHeader: ; filler diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 8f837b931..d103fc78f 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -12,16 +12,16 @@ SilverCaveRoom1_MapScriptHeader: db 0 ItemFragment_0x18c554: - db MAX_ELIXER, 1 + itemfragment MAX_ELIXER ItemFragment_0x18c556: - db PROTEIN, 1 + itemfragment PROTEIN ItemFragment_0x18c558: - db ESCAPE_ROPE, 1 + itemfragment ESCAPE_ROPE ItemFragment_0x18c55a: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL MapSilverCaveRoom1SignpostItem0: dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 88cf949b8..b364ddb31 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -11,13 +11,13 @@ SilverCaveRoom2_MapScriptHeader: db 0 ItemFragment_0x18c5b2: - db CALCIUM, 1 + itemfragment CALCIUM ItemFragment_0x18c5b4: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL ItemFragment_0x18c5b6: - db PP_UP, 1 + itemfragment PP_UP MapSilverCaveRoom2SignpostItem0: dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index f3d20e993..f8ffcc94a 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -124,7 +124,7 @@ SlowpokeWellB1FBoulder: jumpstd strengthboulder ItemFragment_0x5a6a3: - db SUPER_POTION, 1 + itemfragment SUPER_POTION KurtSlowpokeWellVictoryMovementData: step_left diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 32b7c529c..b8e38800a 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -30,7 +30,7 @@ UnknownScript_0x5ad22: end ItemFragment_0x5ad28: - db TM_RAIN_DANCE, 1 + itemfragment TM_RAIN_DANCE UnknownText_0x5ad2a: text "I'm waiting to see" diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index cb899e8e2..ec86497c9 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -37,7 +37,7 @@ SageChowScript: end ItemFragment_0x18451e: - db PARLYZ_HEAL, 1 + itemfragment PARLYZ_HEAL MapSproutTower1FSignpost1Script: jumptext UnknownText_0x1846d6 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index d43363a5b..6022c0637 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -36,7 +36,7 @@ MapSproutTower2FSignpost0Script: jumptext UnknownText_0x1848c8 ItemFragment_0x1847a7: - db X_ACCURACY, 1 + itemfragment X_ACCURACY SageNicoSeenText: text "However hard we" diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 6eb846d41..b487e2f3e 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -134,10 +134,10 @@ MapSproutTower3FSignpost5Script: jumptext UnknownText_0x184f61 ItemFragment_0x184a19: - db POTION, 1 + itemfragment POTION ItemFragment_0x184a1b: - db ESCAPE_ROPE, 1 + itemfragment ESCAPE_ROPE MovementData_0x184a1d: step_up diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 48f2b9647..3f3064aef 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -536,13 +536,13 @@ UnknownScript_0x6cabe: end ItemFragment_0x6cac4: - db HYPER_POTION, 1 + itemfragment HYPER_POTION ItemFragment_0x6cac6: - db NUGGET, 1 + itemfragment NUGGET ItemFragment_0x6cac8: - db GUARD_SPEC, 1 + itemfragment GUARD_SPEC MapTeamRocketBaseB1FSignpostItem8: dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 793dcac37..e70cc37d2 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -360,7 +360,7 @@ UnknownScript_0x6d207: end ItemFragment_0x6d20d: - db TM_THIEF, 1 + itemfragment TM_THIEF MapTeamRocketBaseB2FSignpostItem22: dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index ea4fbf13e..8de459926 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -211,19 +211,19 @@ MapTeamRocketBaseB3FSignpost9Script: jumpstd teamrocketoath ItemFragment_0x6e120: - db PROTEIN, 1 + itemfragment PROTEIN ItemFragment_0x6e122: - db X_SPECIAL, 1 + itemfragment X_SPECIAL ItemFragment_0x6e124: - db FULL_HEAL, 1 + itemfragment FULL_HEAL ItemFragment_0x6e126: - db ICE_HEAL, 1 + itemfragment ICE_HEAL ItemFragment_0x6e128: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL MovementData_0x6e12a: step_right diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 038afbc53..8b71fe54a 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -9,7 +9,7 @@ TinTower3F_MapScriptHeader: db 0 ItemFragment_0x185a37: - db FULL_HEAL, 1 + itemfragment FULL_HEAL TinTower3F_MapEventHeader: ; filler diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index b50356d88..18194a7a6 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -11,13 +11,13 @@ TinTower4F_MapScriptHeader: db 0 ItemFragment_0x185a58: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL ItemFragment_0x185a5a: - db PP_UP, 1 + itemfragment PP_UP ItemFragment_0x185a5c: - db ESCAPE_ROPE, 1 + itemfragment ESCAPE_ROPE MapTinTower4FSignpostItem0: dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 41bdb04ff..3351bdfcb 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -9,7 +9,7 @@ TinTower5F_MapScriptHeader: db 0 ItemFragment_0x185aa9: - db RARE_CANDY, 1 + itemfragment RARE_CANDY MapTinTower5FSignpostItem0: dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 82c6f41f4..8b1c14d2b 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -9,7 +9,7 @@ TinTower6F_MapScriptHeader: db 0 ItemFragment_0x185ae4: - db MAX_POTION, 1 + itemfragment MAX_POTION TinTower6F_MapEventHeader: ; filler diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 2d6a4e4ce..6e0e3e1e0 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -9,7 +9,7 @@ TinTower7F_MapScriptHeader: db 0 ItemFragment_0x185b05: - db MAX_REVIVE, 1 + itemfragment MAX_REVIVE TinTower7F_MapEventHeader: ; filler diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 1a72e7690..1e9798e9d 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -11,13 +11,13 @@ TinTower8F_MapScriptHeader: db 0 ItemFragment_0x185b35: - db NUGGET, 1 + itemfragment NUGGET ItemFragment_0x185b37: - db MAX_ELIXER, 1 + itemfragment MAX_ELIXER ItemFragment_0x185b39: - db FULL_RESTORE, 1 + itemfragment FULL_RESTORE TinTower8F_MapEventHeader: ; filler diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 02f24da7b..385fe8215 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -9,7 +9,7 @@ TinTower9F_MapScriptHeader: db 0 ItemFragment_0x185b88: - db HP_UP, 1 + itemfragment HP_UP UnknownText_0x185b8a: text "HO-OH: Shaoooh!" diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 9145f9943..bdc15bc63 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -9,7 +9,7 @@ TohjoFalls_MapScriptHeader: db 0 ItemFragment_0x18db02: - db MOON_STONE, 1 + itemfragment MOON_STONE TohjoFalls_MapEventHeader: ; filler diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 6966c6c9a..46597ea57 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -624,10 +624,10 @@ UndergroundPathSwitchRoomEntrances_UpdateDoors: end ItemFragment_0x7ce7d: - db SMOKE_BALL, 1 + itemfragment SMOKE_BALL ItemFragment_0x7ce7f: - db FULL_HEAL, 1 + itemfragment FULL_HEAL MapUndergroundPathSwitchRoomEntrancesSignpostItem4: dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index ee1e4aba5..677f3aef9 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -92,13 +92,13 @@ UnknownScript_0x7d9de: end ItemFragment_0x7d9e4: - db MAX_ETHER, 1 + itemfragment MAX_ETHER ItemFragment_0x7d9e6: - db TM_SLEEP_TALK, 1 + itemfragment TM_SLEEP_TALK ItemFragment_0x7d9e8: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL GruntM24SeenText: text "How did you get" diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index fdc84a956..58b7a5243 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -72,16 +72,16 @@ FirebreatherRayScript: end ItemFragment_0x59c00: - db GREAT_BALL, 1 + itemfragment GREAT_BALL ItemFragment_0x59c02: - db X_ATTACK, 1 + itemfragment X_ATTACK ItemFragment_0x59c04: - db POTION, 1 + itemfragment POTION ItemFragment_0x59c06: - db AWAKENING, 1 + itemfragment AWAKENING UnknownScript_0x59c08: jumptext UnknownText_0x59f29 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 278e414d1..1030f0186 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -59,10 +59,10 @@ HikerLeonardScript: end ItemFragment_0x5a016: - db TM_SWIFT, 1 + itemfragment TM_SWIFT ItemFragment_0x5a018: - db X_DEFEND, 1 + itemfragment X_DEFEND UnionCaveB1FBoulder: jumpstd strengthboulder diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 1d5ad3d3b..db270174e 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -74,10 +74,10 @@ CooltrainerfEmmaScript: end ItemFragment_0x5a36a: - db ELIXER, 1 + itemfragment ELIXER ItemFragment_0x5a36c: - db HYPER_POTION, 1 + itemfragment HYPER_POTION CooltrainermNickSeenText: text "There are two" diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index c857fa346..1648fd072 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -99,19 +99,19 @@ UnknownScript_0x7451f: end ItemFragment_0x74529: - db TM_EARTHQUAKE, 1 + itemfragment TM_EARTHQUAKE ItemFragment_0x7452b: - db MAX_REVIVE, 1 + itemfragment MAX_REVIVE ItemFragment_0x7452d: - db FULL_RESTORE, 1 + itemfragment FULL_RESTORE ItemFragment_0x7452f: - db FULL_HEAL, 1 + itemfragment FULL_HEAL ItemFragment_0x74531: - db HP_UP, 1 + itemfragment HP_UP MapVictoryRoadSignpostItem0: dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 1dea698bc..db42d7f2e 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -91,10 +91,10 @@ VioletCityMartSign: jumpstd martsign ItemFragment_0x1a8421: - db PP_UP, 1 + itemfragment PP_UP ItemFragment_0x1a8423: - db RARE_CANDY, 1 + itemfragment RARE_CANDY FruitTreeScript_0x1a8425: fruittree FRUITTREE_VIOLET_CITY diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 4f5afb66a..2abd7462b 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -408,7 +408,7 @@ WarehouseEntranceScript_ShopClosed: end ItemFragment_0x7c306: - db COIN_CASE, 1 + itemfragment COIN_CASE MapWarehouseEntranceSignpost1Script: jumptext UnknownText_0x7c91a diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 730bdaf4e..b1c258a99 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -14,19 +14,19 @@ WhirlIslandB1F_MapScriptHeader: db 0 ItemFragment_0x18c410: - db FULL_RESTORE, 1 + itemfragment FULL_RESTORE ItemFragment_0x18c412: - db CARBOS, 1 + itemfragment CARBOS ItemFragment_0x18c414: - db CALCIUM, 1 + itemfragment CALCIUM ItemFragment_0x18c416: - db NUGGET, 1 + itemfragment NUGGET ItemFragment_0x18c418: - db ESCAPE_ROPE, 1 + itemfragment ESCAPE_ROPE WhirlIslandB1FBoulder: jumpstd strengthboulder diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 5c3823411..985c901f7 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -11,13 +11,13 @@ WhirlIslandB2F_MapScriptHeader: db 0 ItemFragment_0x18c4b8: - db FULL_RESTORE, 1 + itemfragment FULL_RESTORE ItemFragment_0x18c4ba: - db MAX_REVIVE, 1 + itemfragment MAX_REVIVE ItemFragment_0x18c4bc: - db MAX_ELIXER, 1 + itemfragment MAX_ELIXER WhirlIslandB2F_MapEventHeader: ; filler diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 5999d0d01..7e176819f 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -9,7 +9,7 @@ WhirlIslandNE_MapScriptHeader: db 0 ItemFragment_0x18c396: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL WhirlIslandNE_MapEventHeader: ; filler diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 298f68a64..313c76310 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -9,7 +9,7 @@ WhirlIslandSW_MapScriptHeader: db 0 ItemFragment_0x18c3bc: - db ULTRA_BALL, 1 + itemfragment ULTRA_BALL WhirlIslandSW_MapEventHeader: ; filler