Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts

2025-09-08 08:13:02 -07:00 · 2018-01-13 00:47:38 -05:00
parent d054116458
commit 5a3822fe86
127 changed files with 245 additions and 209 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- a/Show More
+++ b/Show More