diff options
127 files changed, 245 insertions, 209 deletions
diff --git a/docs/map_scripts.md b/docs/map_scripts.md index c6b1c58ba..e6794b543 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -16,7 +16,7 @@ ## `.MapCallbacks: db` *N* -- **`dbw` *type*, *script*** +- **`callback` *type*, *script*** Callback types: @@ -30,11 +30,21 @@ Callback types: - **`MAPCALLBACK_CMDQUEUE`** - **`dbw CMDQUEUE_STONETABLE,` *table_pointer*** - - **`stonetable` *warp_id*, *person*, *script*** - - **`db -1 ; end`** +<!-- need pre tags here; can't use inline bold/italic formatting in Markdown code blocks --> +<pre> + callback MAPCALLBACK_CMDQUEUE, .Boulders + +.Boulders: + writecmdqueue .BoulderCmdQueue + return + +.BoulderCmdQueue: + cmdqueue CMDQUEUE_STONETABLE, .BoulderTable + +.BoulderTable: + stonetable <i>warp_id</i>, <i>person</i>, <i>script</i> + db -1 ; end +</pre> ## Event scripts @@ -54,8 +64,10 @@ Callback types: ## `MapName_MapEventHeader:` +```asm ; filler db 0, 0 +``` ## `.Warps: db` *N* @@ -80,11 +92,11 @@ BG event types: - **`BGEVENT_IFSET/IFNOTSET`** - **`dw` *event_flag*, *script*** + **`conditional_event` *event_flag*, *script*** - **`BGEVENT_ITEM`** - **`dwb` *event_flag*, *item_id*** + **`hiddenitem` *event_flag*, *item_id*** - **`BGEVENT_COPY`** diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index e9703531d..31a1f16d9 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -9,6 +9,12 @@ scene_script: MACRO dw \1, 0 ENDM +callback: MACRO +;\1: type: a MAPCALLBACK_* constant +;\2: script pointer + dbw \1, \2 +ENDM + warp_def: MACRO ;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 @@ -23,9 +29,10 @@ coord_event: MACRO ;\2: y: top to bottom, starts at 0 ;\3: scene id: controlled by setscene/setmapscene ;\4: script pointer - db \3, \2, \1, $0 + db \3, \2, \1 + db 0 ; filler dw \4 - db $0, $0 + db 0, 0 ; filler ENDM bg_event: MACRO @@ -91,6 +98,12 @@ else endc ENDM +hiddenitem: MACRO +;\1: flag: an EVENT_* constant +;\2: item: from constants/item_constants.asm + dwb \1, \2 +ENDM + elevfloor: MACRO ;\1: floor: a FLOOR_* constant ;\2: warp destination: starts at 1 @@ -99,10 +112,22 @@ elevfloor: MACRO map \3 ENDM +conditional_event: MACRO +;\1: flag: an EVENT_* constant +;\2: script pointer + dw \1, \2 +ENDM + +cmdqueue: MACRO +;\1: type: a CMDQUEUE_* constant +;\2: data pointer + dbw \1, \2 + dw 0 ; filler +ENDM + stonetable: MACRO ;\1: warp id ;\2: object_event id ;\3: script pointer - db \1, \2 - dw \3 + dbbw \1, \2, \3 ENDM diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index a0c3ab79e..a345898f0 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -21,7 +21,7 @@ AzaleaTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .Flypoint + callback MAPCALLBACK_NEWMAP, .Flypoint .DummyScene0: end @@ -211,7 +211,7 @@ WhiteApricornTree: fruittree FRUITTREE_AZALEA_TOWN AzaleaTownHiddenFullHeal: - dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL AzaleaTownRivalBattleApproachMovement1: step LEFT diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 6ed01da6f..adb0c5f21 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -10,8 +10,8 @@ BattleTowerOutside_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, .Callback1 - dbw MAPCALLBACK_OBJECTS, .Callback2 + callback MAPCALLBACK_TILES, .Callback1 + callback MAPCALLBACK_OBJECTS, .Callback2 .Callback1: return diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index c5cd10235..178e986bd 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -15,8 +15,8 @@ BlackthornCity_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .FlyPoint - dbw MAPCALLBACK_OBJECTS, .Santos + callback MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_OBJECTS, .Santos .FlyPoint: setflag ENGINE_FLYPOINT_BLACKTHORN diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 4ea64fd18..8e997132a 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -11,7 +11,7 @@ BlackthornGym1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .Boulders + callback MAPCALLBACK_TILES, .Boulders .Boulders: checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 270ec0481..77f338e7b 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -14,15 +14,14 @@ BlackthornGym2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_CMDQUEUE, .Boulders + callback MAPCALLBACK_CMDQUEUE, .Boulders .Boulders: writecmdqueue .BoulderCmdQueue return .BoulderCmdQueue: - dbw CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp - dw 0 ; filler + cmdqueue CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp .BoulderTable: stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 9e9ad1894..568ca0476 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -9,7 +9,7 @@ BrunosRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .BrunosRoomDoors + callback MAPCALLBACK_TILES, .BrunosRoomDoors .LockDoor: priorityjump .BrunosDoorLocksBehindYou diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 246946e76..89fd33e5d 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -14,7 +14,7 @@ BurnedTower1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HoleAndLadder + callback MAPCALLBACK_TILES, .HoleAndLadder .EusineScene: priorityjump .MeetEusine @@ -131,10 +131,10 @@ BurnedTower1FRock: jumpstd smashrock BurnedTower1FHiddenEther: - dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER + hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER BurnedTower1FHiddenUltraBall: - dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL BurnedTower1FHPUp: itemball HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 0125d41a9..1a3aac3d3 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -17,7 +17,7 @@ BurnedTowerB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .LadderCallback + callback MAPCALLBACK_TILES, .LadderCallback .DummyScene0: end diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index bfc5265ea..bcd254a2f 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -15,7 +15,7 @@ CeladonCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CELADON @@ -75,7 +75,7 @@ CeladonCityPokecenterSign: jumpstd pokecentersign CeladonCityHiddenPpUp: - dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP + hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP CeladonCityFisherText: text "This POLIWRATH is" diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 15b9a752b..8789ebc6b 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -8,7 +8,7 @@ CeladonDeptStore6F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .Callback + callback MAPCALLBACK_TILES, .Callback .Callback: changeblock 12, 0, $03 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 47a991d21..23dd9444a 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -12,7 +12,7 @@ CeruleanCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CERULEAN @@ -147,7 +147,7 @@ CeruleanCityMartSign: jumpstd martsign CeruleanCityHiddenBerserkGene: - dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE + hiddenitem EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE CeruleanCityCooltrainerMText1: text "KANTO's POWER" diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 844286fa8..144b690b1 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -135,7 +135,7 @@ CeruleanGymGuyScript: end CeruleanGymHiddenMachinePart: - dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART + hiddenitem EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 40bc7d4ee..37464afd5 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -13,7 +13,7 @@ CherrygroveCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 078915791..44d61317a 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -20,7 +20,7 @@ CianwoodCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune + callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune .DummyScene0: end @@ -145,10 +145,10 @@ CianwoodCityRock: jumpstd smashrock CianwoodCityHiddenRevive: - dwb EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE CianwoodCityHiddenMaxEther: - dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER MovementData_0x1a00da: set_sliding diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 50b26a8f5..36d25a127 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -7,7 +7,7 @@ CinnabarIsland_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CINNABAR @@ -35,7 +35,7 @@ CinnabarIslandPokecenterSign: jumpstd pokecentersign CinnabarIslandHiddenRareCandy: - dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY CinnabarIslandBlueTeleport: teleport_from diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index be3742ef3..eba9d42fc 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -11,8 +11,8 @@ Colosseum_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_OBJECTS, .SetWhichChris - dbw MAPCALLBACK_NEWMAP, .PreparePokecenter2F + callback MAPCALLBACK_OBJECTS, .SetWhichChris + callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F .InitializeColosseum: priorityjump .InitializeAndPreparePokecenter2F diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 5456973dc..d7925313f 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -12,7 +12,7 @@ CopycatsHouse2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Callback + callback MAPCALLBACK_OBJECTS, .Callback .Callback: checkflag ENGINE_PLAYER_IS_FEMALE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 42510fd44..b7806dcef 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -31,7 +31,7 @@ DarkCaveVioletEntranceRock: jumpstd smashrock DarkCaveVioletEntranceHiddenElixer: - dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER + hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER DarkCaveVioletEntrance_MapEventHeader: ; filler diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 0d06cea93..447f52971 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -8,7 +8,7 @@ DayCare_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback + callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: checkflag ENGINE_DAY_CARE_MAN_HAS_EGG diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index d2bdb03bf..92e39d7b4 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -12,7 +12,7 @@ DiglettsCavePokefanMScript: jumptextfaceplayer DiglettsCavePokefanMText DiglettsCaveHiddenMaxRevive: - dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE + hiddenitem EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE DiglettsCavePokefanMText: text "A bunch of DIGLETT" diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 81dc33341..678678c07 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -17,7 +17,7 @@ DragonsDenB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckSilver + callback MAPCALLBACK_NEWMAP, .CheckSilver .DummyScene0: end @@ -183,13 +183,13 @@ DragonsDenB1FMaxElixer: itemball MAX_ELIXER DragonsDenB1FHiddenRevive: - dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE DragonsDenB1FHiddenMaxPotion: - dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION DragonsDenB1FHiddenMaxElixer: - dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER MovementDragonsDen_ClairWalksToYou: slow_step RIGHT diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 322b403f6..a81a466e2 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -13,7 +13,7 @@ EcruteakCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_ECRUTEAK @@ -88,7 +88,7 @@ EcruteakCityMartSign: jumpstd martsign EcruteakCityHiddenHyperPotion: - dwb EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 69dbfcbfa..57c040d43 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -12,7 +12,7 @@ EcruteakHouse_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .InitializeSages + callback MAPCALLBACK_OBJECTS, .InitializeSages .DummyScene0: end diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index bd228e93b..47451a677 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -18,7 +18,7 @@ ElmsLab_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .MoveElmCallback + callback MAPCALLBACK_OBJECTS, .MoveElmCallback .MeetElm: priorityjump .WalkUpToElm diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 79824c76d..8010d3beb 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -10,7 +10,7 @@ FuchsiaCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_FUCHSIA diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 6f612692c..5ce8b92cc 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -21,8 +21,8 @@ GoldenrodCity_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria - dbw MAPCALLBACK_OBJECTS, .MoveTutor + callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria + callback MAPCALLBACK_OBJECTS, .MoveTutor .FlyPointAndFloria: setflag ENGINE_FLYPOINT_GOLDENROD diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 9039975cd..ab4b197aa 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -12,7 +12,7 @@ GoldenrodDeptStore5F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .CheckIfSunday + callback MAPCALLBACK_OBJECTS, .CheckIfSunday .CheckIfSunday: checkcode VAR_WEEKDAY diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index f2e88b6a1..035bc1107 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -14,8 +14,8 @@ GoldenrodDeptStoreB1F_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, UnknownScript_0x7d781 - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac + callback MAPCALLBACK_TILES, UnknownScript_0x7d781 + callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac UnknownScript_0x7d781: checkevent EVENT_RECEIVED_CARD_KEY diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index baed07d79..24fc33ded 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -14,8 +14,8 @@ GoldenrodDeptStoreRoof_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock - dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk + callback MAPCALLBACK_TILES, .CheckSaleChangeBlock + callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk .CheckSaleChangeBlock: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 628cb852e..dd3203ac7 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -18,7 +18,7 @@ GoldenrodGameCorner_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Callback + callback MAPCALLBACK_OBJECTS, .Callback .Callback: checkevent EVENT_BEAT_ELITE_FOUR diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 3a07046fd..cd3d7ec15 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -15,9 +15,9 @@ GoldenrodUnderground_MapScriptHeader: .MapCallbacks: db 3 - dbw MAPCALLBACK_NEWMAP, .ResetSwitches - dbw MAPCALLBACK_TILES, .CheckBasementKey - dbw MAPCALLBACK_OBJECTS, .CheckDayOfWeek + callback MAPCALLBACK_NEWMAP, .ResetSwitches + callback MAPCALLBACK_TILES, .CheckBasementKey + callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek .ResetSwitches: clearevent EVENT_SWITCH_1 @@ -409,13 +409,13 @@ MapGoldenrodUndergroundSignpost1Script: jumptext UnknownText_0x7c91a GoldenrodUndergroundHiddenParlyzHeal: - dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL + hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL GoldenrodUndergroundHiddenSuperPotion: - dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION GoldenrodUndergroundHiddenAntidote: - dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE + hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE SupernerdEricSeenText: text "I got booted out" diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index f3b7f4946..85eb1bc1b 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -51,7 +51,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .UpdateDoorPositions + callback MAPCALLBACK_TILES, .UpdateDoorPositions .DummyScene0: end @@ -630,10 +630,10 @@ GoldenrodUndergroundSwitchRoomEntrancesFullHeal: itemball FULL_HEAL GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion: - dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive: - dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE UndergroundSilverApproachMovement1: step DOWN diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 49ae5e39f..e87f3ab1b 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -13,7 +13,7 @@ GoldenrodUndergroundWarehouse_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .ResetSwitches + callback MAPCALLBACK_NEWMAP, .ResetSwitches .ResetSwitches: clearevent EVENT_SWITCH_1 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 58c75e63d..7bb6d0406 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -11,15 +11,14 @@ IcePathB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_CMDQUEUE, .SetUpStoneTable + callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: writecmdqueue .CommandQueue return .CommandQueue: - dbw CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp - dw 0 ; filler + cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp .StoneTable: stonetable 3, ICEPATHB1F_BOULDER1, .Boulder1 @@ -69,7 +68,7 @@ IcePathB1FIron: itemball IRON IcePathB1FHiddenMaxPotion: - dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION IcePathBoulderFellThroughText: text "The boulder fell" diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 2e20d36ae..544d7d600 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -12,7 +12,7 @@ IcePathB2FBlackthornSideTMRest: itemball TM_REST IcePathB2FBlackthornSideHiddenIceHeal: - dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL + hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL IcePathB2FBlackthornSide_MapEventHeader: ; filler diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 1b837eb11..c01252f98 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -23,7 +23,7 @@ IcePathB2FMahoganySideMaxPotion: itemball MAX_POTION IcePathB2FMahoganySideHiddenCarbos: - dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS + hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS UnknownText_0x7e5ad: text "It's immovably" diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 880839d97..ad4e473f8 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -17,7 +17,7 @@ IlexForest_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback + callback MAPCALLBACK_OBJECTS, .FarfetchdCallback .FarfetchdCallback: checkevent EVENT_GOT_HM01_CUT @@ -414,13 +414,13 @@ IlexForestEther: itemball ETHER IlexForestHiddenEther: - dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER + hiddenitem EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER IlexForestHiddenSuperPotion: - dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION IlexForestHiddenFullHeal: - dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL IlexForestBoulder: ; unused diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index f5f156565..223d92a0c 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -13,7 +13,7 @@ IndigoPlateauPokecenter1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .PrepareElite4 + callback MAPCALLBACK_NEWMAP, .PrepareElite4 .DummyScene: end diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index cb1743d8a..6eccbad60 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -9,7 +9,7 @@ KarensRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .KarensRoomDoors + callback MAPCALLBACK_TILES, .KarensRoomDoors .LockDoor: priorityjump .KarensDoorLocksBehindYou diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 2c6900d89..04580cdbb 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -9,7 +9,7 @@ KogasRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .KogasRoomDoors + callback MAPCALLBACK_TILES, .KogasRoomDoors .LockDoor: priorityjump .KogasDoorLocksBehindYou diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index c941bcdb3..aa28b6076 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -10,9 +10,10 @@ KrissHouse2F_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .InitializeRoom - dbw MAPCALLBACK_TILES, .SetSpawn + callback MAPCALLBACK_NEWMAP, .InitializeRoom + callback MAPCALLBACK_TILES, .SetSpawn +; unused .Null: end @@ -20,11 +21,11 @@ KrissHouse2F_MapScriptHeader: special ToggleDecorationsVisibility setevent EVENT_IN_YOUR_ROOM checkevent EVENT_INITIALIZED_EVENTS - iftrue .SkipInizialization + iftrue .SkipInitialization jumpstd initializeevents return -.SkipInizialization: +.SkipInitialization: return .SetSpawn: @@ -46,7 +47,7 @@ GameConsole: describedecoration DECODESC_CONSOLE KrissHousePoster: - dw EVENT_KRISS_ROOM_POSTER, .Script + conditional_event EVENT_KRISS_ROOM_POSTER, .Script .Script: describedecoration DECODESC_POSTER diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index c9d9589e9..478e94e5c 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -11,7 +11,7 @@ KurtsHouse_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .KurtCallback + callback MAPCALLBACK_OBJECTS, .KurtCallback .KurtCallback: checkevent EVENT_CLEARED_SLOWPOKE_WELL diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 92de41cc8..882e42b22 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -20,8 +20,8 @@ LakeOfRage_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .FlyPoint - dbw MAPCALLBACK_OBJECTS, .Wesley + callback MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_OBJECTS, .Wesley .DummyScene0: end @@ -232,13 +232,13 @@ LakeOfRageTMDetect: itemball TM_DETECT LakeOfRageHiddenFullRestore: - dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE LakeOfRageHiddenRareCandy: - dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY LakeOfRageHiddenMaxPotion: - dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x70155: teleport_from diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 9b73671d6..330943b8c 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -11,7 +11,7 @@ LancesRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .LancesRoomDoors + callback MAPCALLBACK_TILES, .LancesRoomDoors .LockDoor: priorityjump .LancesDoorLocksBehindYou diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 35bfdb12a..57806ef41 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -10,7 +10,7 @@ LavenderTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_LAVENDER diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 2dbdf203d..e0c610f71 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -13,7 +13,7 @@ MahoganyMart1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .MahoganyMart1FStaircase + callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase .DummyScene0: end diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 5ed0450c2..a5327330b 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -12,7 +12,7 @@ MahoganyTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index ea372868a..c914e669f 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -10,8 +10,8 @@ MountMoonSquare_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone - dbw MAPCALLBACK_OBJECTS, .DisappearRock + callback MAPCALLBACK_NEWMAP, .DisappearMoonStone + callback MAPCALLBACK_OBJECTS, .DisappearRock .DummyScene: end @@ -75,7 +75,7 @@ ClefairyDance: end MountMoonSquareHiddenMoonStone: - dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE + hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE DontLitterSign: jumptext DontLitterSignText diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 050abdc74..983fd9839 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -64,7 +64,7 @@ MountMortar1FInsideUltraBall: itemball ULTRA_BALL MountMortar1FInsideHiddenMaxRepel: - dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL + hiddenitem EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL PokemaniacMillerSeenText: text "I'm not losing" diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index b06d8786a..4e8dcf331 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -16,7 +16,7 @@ MountMortar1FOutsideRevive: itemball REVIVE MountMortar1FOutsideHiddenHyperPotion: - dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION MountMortar1FOutside_MapEventHeader: ; filler diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index f44b33db3..4d401da9c 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -44,7 +44,7 @@ MountMortar2FInsideEscapeRope: itemball ESCAPE_ROPE MountMortar2FInsideHiddenFullRestore: - dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE SupernerdHughSeenText: text "Yo! MARKUS!" diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 968c8fe2e..2bfea9fec 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -72,7 +72,7 @@ MountMortarB1FPPUp: itemball PP_UP MountMortarB1FHiddenMaxRevive: - dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE + hiddenitem EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE UnknownText_0x7e24d: text "Hey!" diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index cb841b187..56f861384 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -305,7 +305,7 @@ NationalParkTMDig: itemball TM_DIG NationalParkHiddenFullHeal: - dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL NationalParkLassText: text "Look! Check out my" diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 3f9225eaf..07e6455ac 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -115,7 +115,7 @@ NationalParkBugContestTMDig: itemball TM_DIG NationalParkBugContestHiddenFullHeal: - dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x5c94c: text "DON: I'm going to" diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 56b5f14db..dee94a7c9 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -11,7 +11,7 @@ NewBarkTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 0f01ab008..112d96035 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -12,7 +12,7 @@ OlivineCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 07f6d95e1..fdd32455c 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -44,7 +44,7 @@ OlivineLighthouse5FTMSwagger: itemball TM_SWAGGER OlivineLighthouse5FHiddenHyperPotion: - dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION SailorErnestSeenText: text "I wanted to battle" diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 0aeaad328..ca51d41de 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -234,7 +234,7 @@ CooltrainerFScript_0x74a22: end OlivinePortHiddenProtein: - dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN + hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN MovementData_0x74a30: step DOWN diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index f11cf6d65..e1e6006c9 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -8,7 +8,7 @@ PalletTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_PALLET diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 44ea440a7..876bacfb0 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -11,7 +11,7 @@ PewterCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_PEWTER diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 3ac8c1388..3b62ec884 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -13,7 +13,7 @@ RadioTower3F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .CardKeyShutterCallback + callback MAPCALLBACK_TILES, .CardKeyShutterCallback .CardKeyShutterCallback: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index cdc3f04a7..6288f23f3 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -16,10 +16,10 @@ RockTunnel1FTMSteelWing: itemball TM_STEEL_WING RockTunnel1FHiddenXAccuracy: - dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY + hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY RockTunnel1FHiddenXDefend: - dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND + hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND RockTunnel1F_MapEventHeader: ; filler diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 549f1c868..26b465c11 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -20,7 +20,7 @@ RockTunnelB1FRevive: itemball REVIVE RockTunnelB1FHiddenMaxPotion: - dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION RockTunnelB1F_MapEventHeader: ; filler diff --git a/maps/Route11.asm b/maps/Route11.asm index 6034dcd37..ecb1003a7 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -63,7 +63,7 @@ FruitTreeScript_0x68055: fruittree FRUITTREE_ROUTE_11 Route11HiddenRevive: - dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE YoungsterOwenSeenText: text "There's no cheat-" diff --git a/maps/Route12.asm b/maps/Route12.asm index 778177c81..ac585f51b 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -70,7 +70,7 @@ Route12Nugget: itemball NUGGET Route12HiddenElixer: - dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER + hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER FisherMartinSeenText: text "Patience is the" diff --git a/maps/Route13.asm b/maps/Route13.asm index 64274d758..014bd4c70 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -77,7 +77,7 @@ Route13DirectionsSign: jumptext Route13DirectionsSignText Route13HiddenCalcium: - dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM + hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM PokefanmAlexSeenText: text "Bow down before my" diff --git a/maps/Route16.asm b/maps/Route16.asm index 14e8cbebc..8d7141f57 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -4,7 +4,7 @@ Route16_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike + callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: checkcode VAR_YCOORD diff --git a/maps/Route17.asm b/maps/Route17.asm index c906db984..9ed64340e 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -10,7 +10,7 @@ Route17_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike + callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: setflag ENGINE_ALWAYS_ON_BIKE @@ -62,10 +62,10 @@ TrainerBikerGlenn: end Route17HiddenMaxEther: - dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER Route17HiddenMaxElixer: - dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER BikerRileySeenText: text "Hey, you! You're" diff --git a/maps/Route19.asm b/maps/Route19.asm index eee48f089..5309598b6 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -12,7 +12,7 @@ Route19_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .ClearRocks + callback MAPCALLBACK_TILES, .ClearRocks .ClearRocks: checkevent EVENT_CINNABAR_ROCKS_CLEARED diff --git a/maps/Route2.asm b/maps/Route2.asm index 47abdc9f5..508758448 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -70,16 +70,16 @@ FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 Route2HiddenMaxEther: - dwb EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER Route2HiddenFullHeal: - dwb EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL Route2HiddenFullRestore: - dwb EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE Route2HiddenRevive: - dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE BugCatcherRobSeenText: text "My bug #MON are" diff --git a/maps/Route20.asm b/maps/Route20.asm index 7137999fe..67118d5cb 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -9,7 +9,7 @@ Route20_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .ClearRocks + callback MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: setevent EVENT_CINNABAR_ROCKS_CLEARED diff --git a/maps/Route23.asm b/maps/Route23.asm index 87ba72d9c..c82ae6462 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -4,7 +4,7 @@ Route23_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_INDIGO_PLATEAU diff --git a/maps/Route25.asm b/maps/Route25.asm index 00f52d1e9..15a2ded4e 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -191,7 +191,7 @@ Route25Protein: itemball PROTEIN Route25HiddenPotion: - dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION + hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION MovementData_0x19efe8: big_step DOWN diff --git a/maps/Route28.asm b/maps/Route28.asm index fa93fdc31..225039518 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -9,7 +9,7 @@ Route28Sign: jumptext Route28SignText Route28HiddenRareCandy: - dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY Route28SignText: text "ROUTE 28" diff --git a/maps/Route29.asm b/maps/Route29.asm index 9be77fafe..fca71310d 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -16,7 +16,7 @@ Route29_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Tuscany + callback MAPCALLBACK_OBJECTS, .Tuscany .DummyScene0: end diff --git a/maps/Route30.asm b/maps/Route30.asm index ed6fa98ef..4884beeee 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -248,7 +248,7 @@ Route30FruitTree2: fruittree FRUITTREE_ROUTE_30_2 Route30HiddenPotion: - dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION + hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION Route30_JoeysRattataAttacksMovement: fix_facing diff --git a/maps/Route31.asm b/maps/Route31.asm index 4ef8ae314..15a76a3cf 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -13,7 +13,7 @@ Route31_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckMomCall + callback MAPCALLBACK_NEWMAP, .CheckMomCall .CheckMomCall: checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST diff --git a/maps/Route32.asm b/maps/Route32.asm index 07b4db57d..bad2f617b 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -23,7 +23,7 @@ Route32_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Frieda + callback MAPCALLBACK_OBJECTS, .Frieda .DummyScene0: end @@ -506,10 +506,10 @@ Route32PokecenterSign: jumpstd pokecentersign Route32HiddenGreatBall: - dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL + hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL Route32HiddenSuperPotion: - dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION Movement_Route32CooltrainerMPushesYouBackToViolet: step UP diff --git a/maps/Route34.asm b/maps/Route34.asm index a82cb350b..04ea74ab7 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -19,7 +19,7 @@ Route34_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback + callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: checkflag ENGINE_DAY_CARE_MAN_HAS_EGG @@ -488,10 +488,10 @@ Route34Nugget: itemball NUGGET Route34HiddenRareCandy: - dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY Route34HiddenSuperPotion: - dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION Route34MovementData_DayCareManWalksBackInside: slow_step LEFT diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 18b010bff..db9f31f39 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -10,7 +10,7 @@ Route34IlexForestGate_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .IsForestRestless + callback MAPCALLBACK_OBJECTS, .IsForestRestless .IsForestRestless: checkevent EVENT_FOREST_IS_RESTLESS diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 80bf1531c..3d4a6647b 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -12,8 +12,8 @@ Route35NationalParkGate_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning - dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable + callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning + callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable .DummyScene0: end diff --git a/maps/Route36.asm b/maps/Route36.asm index cdc2360e9..db1f8419e 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -17,7 +17,7 @@ Route36_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ArthurCallback + callback MAPCALLBACK_OBJECTS, .ArthurCallback .DummyScene0: end diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index cc74c5dfb..90fe2555c 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -21,8 +21,8 @@ Route36NationalParkGate_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning - dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable + callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning + callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable .DummyScene0: end diff --git a/maps/Route37.asm b/maps/Route37.asm index 8821f951e..233a299b9 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -13,7 +13,7 @@ Route37_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Sunny + callback MAPCALLBACK_OBJECTS, .Sunny .Sunny: checkcode VAR_WEEKDAY @@ -114,7 +114,7 @@ FruitTreeScript_0x1a8e0d: fruittree FRUITTREE_ROUTE_37_3 Route37HiddenEther: - dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER + hiddenitem EVENT_ROUTE_37_HIDDEN_ETHER, ETHER TwinsAnnandanne1SeenText: text "ANN: ANNE and I" diff --git a/maps/Route39.asm b/maps/Route39.asm index b1044d293..6038df139 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -180,7 +180,7 @@ FruitTreeScript_0x1a5bf4: fruittree FRUITTREE_ROUTE_39 Route39HiddenNugget: - dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET + hiddenitem EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET Route39MiltankText: text "MILTANK: Mooo!" diff --git a/maps/Route4.asm b/maps/Route4.asm index 8a36de84a..c28394c0f 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -51,7 +51,7 @@ Route4HPUp: itemball HP_UP Route4HiddenUltraBall: - dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL BirdKeeperHankSeenText: text "I'm raising my" diff --git a/maps/Route40.asm b/maps/Route40.asm index 73f089bd2..7cbefca10 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -18,7 +18,7 @@ Route40_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .MonicaCallback + callback MAPCALLBACK_OBJECTS, .MonicaCallback .MonicaCallback: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR @@ -135,7 +135,7 @@ Route40Rock: jumpstd smashrock Route40HiddenHyperPotion: - dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a621c: step RIGHT diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index f37b78669..9562c3ae4 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -8,7 +8,7 @@ Route40BattleTowerGate_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ShowSailor + callback MAPCALLBACK_OBJECTS, .ShowSailor .ShowSailor: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route41.asm b/maps/Route41.asm index 95618e692..29eb35e04 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -132,7 +132,7 @@ Route41Rock: jumpstd smashrock Route41HiddenMaxEther: - dwb EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER SwimmermCharlieSeenText: text "The water's warm" diff --git a/maps/Route42.asm b/maps/Route42.asm index ad820796b..46606e647 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -212,7 +212,7 @@ FruitTreeScript_0x1a9351: fruittree FRUITTREE_ROUTE_42_3 Route42HiddenMaxPotion: - dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x1a9356: set_sliding diff --git a/maps/Route43.asm b/maps/Route43.asm index 8b0c7b307..afad4a606 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -14,7 +14,7 @@ Route43_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckIfRockets + callback MAPCALLBACK_NEWMAP, .CheckIfRockets .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 9a59957db..7548394a5 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -13,7 +13,7 @@ Route43Gate_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckIfRockets + callback MAPCALLBACK_NEWMAP, .CheckIfRockets .RocketShakedown: priorityjump .RocketTakeover diff --git a/maps/Route44.asm b/maps/Route44.asm index 9e6504097..31fe9223f 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -318,7 +318,7 @@ Route44MaxRepel: itemball MAX_REPEL Route44HiddenElixer: - dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER + hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER FisherWilton1SeenText: text "Aack! You made me" diff --git a/maps/Route45.asm b/maps/Route45.asm index 786a5db7c..63db10a95 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -312,7 +312,7 @@ Route45MaxPotion: itemball MAX_POTION Route45HiddenPpUp: - dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP + hiddenitem EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP HikerErikSeenText: text "Be prepared for" diff --git a/maps/Route9.asm b/maps/Route9.asm index b8ad4eeb0..f98b45310 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -83,7 +83,7 @@ Route9Sign: jumptext Route9SignText Route9HiddenEther: - dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER + hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER CamperDeanSeenText: text "I came to explore" diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index a575828f6..216c079e7 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -6,7 +6,7 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index ec90edc03..16a978cbf 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -6,7 +6,7 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: special SpecialHoOhChamber diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index bbaaa4ad3..14e096b58 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -10,7 +10,7 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 21583e485..1bfa3b076 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -6,7 +6,7 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: special SpecialOmanyteChamber diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 8dc42daee..39c85fa05 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -13,7 +13,7 @@ RuinsOfAlphOutside_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ScientistCallback + callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: end diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index e9606cd42..7c73e1e2d 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -11,7 +11,7 @@ RuinsOfAlphResearchCenter_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ScientistCallback + callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: end diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 38d3eed48..d016d61c7 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -14,7 +14,7 @@ SaffronCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_SAFFRON diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 52f1c1b16..0672b7dab 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -4,7 +4,7 @@ SilverCaveOutside_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_SILVER_CAVE @@ -17,7 +17,7 @@ MtSilverSign: jumptext MtSilverSignText SilverCaveOutsideHiddenFullRestore: - dwb EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE MtSilverSignText: text "MT.SILVER" diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 335c4a834..f75946854 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -24,10 +24,10 @@ SilverCaveRoom1UltraBall: itemball ULTRA_BALL SilverCaveRoom1HiddenDireHit: - dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT + hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT SilverCaveRoom1HiddenUltraBall: - dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL SilverCaveRoom1_MapEventHeader: ; filler diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 6bb381e3a..57072f858 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -20,7 +20,7 @@ SilverCaveRoom2PPUp: itemball PP_UP SilverCaveRoom2HiddenMaxPotion: - dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION SilverCaveRoom2_MapEventHeader: ; filler diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 503477338..48f980f9a 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -13,7 +13,7 @@ TeamRocketBaseB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .HideSecurityGrunt + callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt .DummyScene: end @@ -540,7 +540,7 @@ TeamRocketBaseB1FGuardSpec: itemball GUARD_SPEC TeamRocketBaseB1FHiddenRevive: - dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE SecurityCameraMovement1: big_step RIGHT diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 9c4b2f66f..0225d1e4d 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -24,7 +24,7 @@ TeamRocketBaseB2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .TransmitterDoorCallback + callback MAPCALLBACK_TILES, .TransmitterDoorCallback .DummyScene0: end @@ -315,7 +315,7 @@ UnknownScript_0x6d184: end TeamRocketBaseB2FLockedDoor: - dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script + conditional_event EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script .Script: opentext @@ -356,7 +356,7 @@ TeamRocketBaseB2FTMThief: itemball TM_THIEF TeamRocketBaseB2FHiddenFullHeal: - dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x6d212: step RIGHT diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 3801be542..4a110c4e3 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -24,7 +24,7 @@ TeamRocketBaseB3F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .CheckGiovanniDoor + callback MAPCALLBACK_TILES, .CheckGiovanniDoor .LanceGetsPassword: priorityjump LanceGetPasswordScript @@ -174,7 +174,7 @@ TrainerScientistMitch: end TeamRocketBaseB3FLockedDoor: - dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE, .Script + conditional_event EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE, .Script .Script: opentext diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index b199df655..3ea686c32 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -10,7 +10,7 @@ TimeCapsule_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .SetWhichChris + callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTimeCapsule: priorityjump .InitializeAndPreparePokecenter2F diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index cfbb966f5..7c6f1aee8 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -18,8 +18,8 @@ TinTower1F_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_OBJECTS, .NPCsCallback - dbw MAPCALLBACK_TILES, .StairsCallback + callback MAPCALLBACK_OBJECTS, .NPCsCallback + callback MAPCALLBACK_TILES, .StairsCallback .FaceSuicune: priorityjump .SuicuneBattle diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 7a19c395b..4faf141cd 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -20,7 +20,7 @@ TinTower4FEscapeRope: itemball ESCAPE_ROPE TinTower4FHiddenMaxPotion: - dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION TinTower4F_MapEventHeader: ; filler diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 968cf61fc..4bb02de9d 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -12,10 +12,10 @@ TinTower5FRareCandy: itemball RARE_CANDY TinTower5FHiddenFullRestore: - dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE TinTower5FHiddenCarbos: - dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS + hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS TinTower5F_MapEventHeader: ; filler diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 8d5eed029..b04c47800 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -7,7 +7,7 @@ TinTowerRoof_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .HoOh + callback MAPCALLBACK_OBJECTS, .HoOh .HoOh: checkevent EVENT_FOUGHT_HO_OH diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 2e1318363..deffd661b 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -10,7 +10,7 @@ TradeCenter_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .SetWhichChris + callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTradeCenter: priorityjump .InitializeAndPreparePokecenter2F diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 45807676a..0f47d7cb8 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -6,10 +6,10 @@ UndergroundPath_MapScriptHeader: db 0 UndergroundPathHiddenFullRestore: - dwb EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE UndergroundPathHiddenXSpecial: - dwb EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL + hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL UndergroundPath_MapEventHeader: ; filler diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 8aa4ddd5e..ec6c30385 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -12,7 +12,7 @@ UnionCaveB2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Lapras + callback MAPCALLBACK_OBJECTS, .Lapras .Lapras: checkflag ENGINE_UNION_CAVE_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 3dee2616b..d84aaa4cb 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -12,7 +12,7 @@ VermilionCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VERMILION @@ -123,7 +123,7 @@ VermilionCityMartSign: jumpstd martsign VermilionCityHiddenFullHeal: - dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL VermilionCityTeacherText: text "VERMILION PORT is" diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 9698eae6c..d318b98de 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -11,7 +11,7 @@ VermilionPort_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end @@ -195,7 +195,7 @@ SuperNerdScript_0x74ee6: end VermilionPortHiddenIron: - dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON + hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON MovementData_0x74ef1: step DOWN diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index c4b85dfbb..d8fc51043 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -112,10 +112,10 @@ VictoryRoadHPUp: itemball HP_UP VictoryRoadHiddenMaxPotion: - dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION VictoryRoadHiddenFullHeal: - dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x74539: step LEFT diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 34939ff3e..63dd3b92c 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -14,7 +14,7 @@ VioletCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VIOLET @@ -98,7 +98,7 @@ VioletCityFruitTreeScript: fruittree FRUITTREE_VIOLET_CITY VioletCityHiddenHyperPotion: - dwb EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION VioletCityFollowEarl_MovementData: big_step DOWN diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 5b5e077cb..c29422c52 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -10,7 +10,7 @@ ViridianCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VIRIDIAN diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 92bb755b7..c84725509 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -32,13 +32,13 @@ WhirlIslandB1FBoulder: jumpstd strengthboulder WhirlIslandB1FHiddenRareCandy: - dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY WhirlIslandB1FHiddenUltraBall: - dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL WhirlIslandB1FHiddenFullRestore: - dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE WhirlIslandB1F_MapEventHeader: ; filler diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 39285cc15..7ee64bf74 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -7,7 +7,7 @@ WhirlIslandLugiaChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Lugia + callback MAPCALLBACK_OBJECTS, .Lugia .Lugia: checkevent EVENT_FOUGHT_LUGIA diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 81ece5a06..9ea754d1a 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -9,7 +9,7 @@ WillsRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .WillsRoomDoors + callback MAPCALLBACK_TILES, .WillsRoomDoors .LockDoor: priorityjump .WillsDoorLocksBehindYou diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 1a7b959ff..c3440c889 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -14,7 +14,7 @@ WiseTriosRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .WiseTrioCallback + callback MAPCALLBACK_OBJECTS, .WiseTrioCallback .DummyScene0: end |