Map callback constants

2025-09-08 08:13:02 -07:00 · 2016-01-06 07:44:50 -05:00
parent 80aba7fc13
commit ce019e6347
100 changed files with 191 additions and 193 deletions
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -25,7 +25,7 @@ AzaleaTown_MapScriptHeader:
 	db 1

 	; callbacks
-	dbw 5, .Flypoint
+	dbw MAPCALLBACK_NEWMAP, .Flypoint

 .Trigger0
 	end
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -12,8 +12,8 @@ BattleTowerOutside_MapScriptHeader:
 	db 2

 	; callbacks
-	dbw 1, .Callback1
-	dbw 2, .Callback2
+	dbw MAPCALLBACK_TILES, .Callback1
+	dbw MAPCALLBACK_OBJECTS, .Callback2

 .Callback1
 	return
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -17,8 +17,8 @@ BlackthornCity_MapScriptHeader:
 	db 2

 	; callbacks
-	dbw 5, .FlyPoint
-	dbw 2, .Santos
+	dbw MAPCALLBACK_NEWMAP, .FlyPoint
+	dbw MAPCALLBACK_OBJECTS, .Santos

 .FlyPoint
 	setflag ENGINE_FLYPOINT_BLACKTHORN
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -13,7 +13,7 @@ BlackthornGym1F_MapScriptHeader:
 	db 1

 	; callbacks
-	dbw 1, .Boulders
+	dbw MAPCALLBACK_TILES, .Boulders

 .Boulders
 	checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -16,14 +16,14 @@ BlackthornGym2F_MapScriptHeader:
 	db 1

 	; callbacks
-	dbw 3, .Boulders
+	dbw MAPCALLBACK_PALETTES, .Boulders

 .Boulders
 	writecmdqueue .BoulderCmdQueue
 	return

 .BoulderCmdQueue
-	dbw 2, .BoulderTable ; check if any stones are sitting on a warp
+	dbw MAPCALLBACK_OBJECTS, .BoulderTable ; check if any stones are sitting on a warp
 	db 0, 0 ; filler

 .BoulderTable
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -14,7 +14,7 @@ BrunosRoom_MapScriptHeader:

 	; callbacks

-	dbw 1, UnknownScript_0x180998
+	dbw MAPCALLBACK_TILES, UnknownScript_0x180998

 UnknownScript_0x180993:
 	priorityjump UnknownScript_0x1809ad
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -19,7 +19,7 @@ BurnedTower1F_MapScriptHeader:

 	; callbacks

-	dbw 1, .HoleAndLadder
+	dbw MAPCALLBACK_TILES, .HoleAndLadder

 .Trigger0:
 	priorityjump .EusineTrigger
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -22,7 +22,7 @@ BurnedTowerB1F_MapScriptHeader:

 	; callbacks

-	dbw 1, UnknownScript_0x186160
+	dbw MAPCALLBACK_TILES, UnknownScript_0x186160

 UnknownScript_0x18615e:
 	end
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -17,7 +17,7 @@ CeladonCity_MapScriptHeader:
 	db 1

 	; callbacks
-	dbw 5, .FlyPoint
+	dbw MAPCALLBACK_NEWMAP, .FlyPoint

 .FlyPoint
 	setflag ENGINE_FLYPOINT_CELADON
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -11,7 +11,7 @@ CeladonDeptStore6F_MapScriptHeader:

 	; callbacks

-	dbw 1, .Callback
+	dbw MAPCALLBACK_TILES, .Callback

 .Callback:
 	changeblock $c, $0, $3
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -14,7 +14,7 @@ CeruleanCity_MapScriptHeader:
 	db 1

 	; callbacks
-	dbw 5, .FlyPoint
+	dbw MAPCALLBACK_NEWMAP, .FlyPoint

 .FlyPoint
 	setflag ENGINE_FLYPOINT_CERULEAN
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -17,7 +17,7 @@ CherrygroveCity_MapScriptHeader:
 	db 1

 	; callbacks
-	dbw 5, .FlyPoint
+	dbw MAPCALLBACK_NEWMAP, .FlyPoint

 .Trigger0
 	end
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -24,7 +24,7 @@ CianwoodCity_MapScriptHeader:
 	db 1

 	; callbacks
-	dbw 5, .FlyPointAndSuicune
+	dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune

 .Trigger0
 	end
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -9,7 +9,7 @@ CinnabarIsland_MapScriptHeader:
 	db 1

 	; callbacks
-	dbw 5, .FlyPoint
+	dbw MAPCALLBACK_NEWMAP, .FlyPoint

 .FlyPoint
 	setflag ENGINE_FLYPOINT_CINNABAR
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -16,9 +16,9 @@ Colosseum_MapScriptHeader:

 	; callbacks

-	dbw 2, ColosseumScript_SetWhichChris
+	dbw MAPCALLBACK_OBJECTS, ColosseumScript_SetWhichChris

-	dbw 5, ColosseumScript_InitializeCB
+	dbw MAPCALLBACK_NEWMAP, ColosseumScript_InitializeCB

 .Trigger0:
 	priorityjump ColosseumScript_Initialize
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -15,7 +15,7 @@ CopycatsHouse2F_MapScriptHeader:

 	; callbacks

-	dbw 2, CopycatsHouse2FCallback
+	dbw MAPCALLBACK_OBJECTS, CopycatsHouse2FCallback

 CopycatsHouse2FCallback:
 	checkflag ENGINE_PLAYER_IS_FEMALE
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -11,7 +11,7 @@ DayCare_MapScriptHeader:

 	; callbacks

-	dbw 2, .EggCheckCallback
+	dbw MAPCALLBACK_OBJECTS, .EggCheckCallback

 .EggCheckCallback:
 	checkflag ENGINE_DAYCARE_MAN_HAS_EGG
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -22,7 +22,7 @@ DragonsDenB1F_MapScriptHeader:

 	; callbacks

-	dbw 5, .CheckSilver
+	dbw MAPCALLBACK_NEWMAP, .CheckSilver

 .Trigger0:
 	end
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -15,7 +15,7 @@ EcruteakCity_MapScriptHeader:
 	db 1

 	; callbacks
-	dbw 5, .FlyPoint
+	dbw MAPCALLBACK_NEWMAP, .FlyPoint

 .FlyPoint
 	setflag ENGINE_FLYPOINT_ECRUTEAK
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -17,7 +17,7 @@ EcruteakHouse_MapScriptHeader:

 	; callbacks

-	dbw 2, .InitializeSages
+	dbw MAPCALLBACK_OBJECTS, .InitializeSages

 .Trigger0:
 	end
--- a/Show More
+++ b/Show More