ref: ce019e6347435a89fe53037db993049958fc837e
parent: 80aba7fc13c89d8799776ed479aa13ca69c718fe
author: PikalaxALT <[email protected]>
date: Wed Jan 6 02:44:50 EST 2016
Map callback constants
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -12,6 +12,13 @@
const MAPSETUP_BADWARP
const MAPSETUP_FLY
+const_value SET 1
+ const MAPCALLBACK_TILES
+ const MAPCALLBACK_OBJECTS
+ const MAPCALLBACK_PALETTES
+ const MAPCALLBACK_SPRITES
+ const MAPCALLBACK_NEWMAP
+
; Command descriptions from Condensation water's scripting compendium. const_def
const_def
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -350,7 +350,7 @@
call CheckCoordEventScriptFlag
jr z, .coord_events_disabled
- call CheckCurrentNextMapXYTriggers
+ call CheckCurrentMapXYTriggers
jr c, .coord_event
.coord_events_disabled
@@ -391,7 +391,7 @@
ret
.coord_event
- ld hl, EngineBuffer5
+ ld hl, wCurCoordEventScriptAddr
ld a, [hli]
ld h, [hl]
ld l, a
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -306,7 +306,7 @@
; 154d7
LoadObjectsRunCallback_02: ; 154d7
- ld a, 2
+ ld a, MAPCALLBACK_OBJECTS
call RunMapCallback
callba LoadObjectMasks
callba InitializeVisibleSprites
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -166,7 +166,7 @@
RunCallback_04: ; 14209
- ld a, $4
+ ld a, MAPCALLBACK_SPRITES
call RunMapCallback
call GetUsedSprites
call .LoadMiscTiles
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -146,7 +146,7 @@
call .DrawBugContestStatus
call UpdateSprites
call ret_d90
- call Function2b5c
+ call FinishExitMenu
ret
; 126d3
--- a/engine/warp_connection.asm
+++ b/engine/warp_connection.asm
@@ -5,11 +5,11 @@
call ResetFlashIfOutOfCave
call GetCurrentMapTrigger
call ResetBikeFlags
- ld a, $5
+ ld a, MAPCALLBACK_NEWMAP
call RunMapCallback
RunCallback_03: ; 1045c4
callba ClearCmdQueue
- ld a, $3
+ ld a, MAPCALLBACK_PALETTES
call RunMapCallback
call GetMapHeaderTimeOfDayNybble
ld [wMapTimeOfDay], a
--- a/home/map.asm
+++ b/home/map.asm
@@ -2,7 +2,7 @@
Clearwc7e8:: ; 210f
ld hl, wc7e8
- ld bc, $0018
+ ld bc, 24
ld a, $0
call ByteFill
ret
@@ -308,9 +308,8 @@
ret
.IncreaseHLTwice
-rept 2
inc hl
-endr
+ inc hl
scf
ret
; 22a7
@@ -424,9 +423,8 @@
ld a, [hli]
ld h, [hl]
ld l, a
-rept 2
inc hl
-endr
+ inc hl
call ReadWarps
call ReadCoordEvents
call ReadSignposts
@@ -563,11 +561,11 @@
ReadCoordEvents:: ; 23f1
ld a, [hli]
ld c, a
- ld [wCurrentNextMapXYTriggerCount], a
+ ld [wCurrentMapXYTriggerCount], a
ld a, l
- ld [wCurrentNextMapXYTriggerHeaderPointer], a
+ ld [wCurrentMapXYTriggerHeaderPointer], a
ld a, h
- ld [wCurrentNextMapXYTriggerHeaderPointer + 1], a
+ ld [wCurrentMapXYTriggerHeaderPointer + 1], a
ld a, c
and a
@@ -737,7 +735,7 @@
call ByteFill
call ChangeMap
call FillMapConnections
- ld a, $1
+ ld a, MAPCALLBACK_TILES
call RunMapCallback
ret
; 24e4
@@ -1198,7 +1196,7 @@
ld d, $0
ld hl, wObjectMasks
add hl, de
- ld [hl], -1 ; ,masked
+ ld [hl], -1 ; , masked
ret
; 271e
@@ -1340,9 +1338,8 @@
ld a, d
ld [hli], a
ld a, e
-rept 2
inc a
-endr
+ inc a
and $1f
ld b, a
ld a, e
@@ -1568,8 +1565,8 @@
GetMovementPermissions:: ; 2914
xor a
ld [TilePermissions], a
- call GetLeftRightCollision
- call GetUpDownCollision
+ call .LeftRight
+ call .UpDown
; get coords of current tile
ld a, [PlayerNextMapX]
ld d, a
@@ -1577,12 +1574,12 @@
ld e, a
call GetCoordTile
ld [PlayerNextTile], a
- call Function29ff
+ call .CheckHiNybble
ret nz
ld a, [PlayerNextTile]
and 7
- ld hl, .data_2945
+ ld hl, .MovementPermissionsData
add l
ld l, a
ld a, 0
@@ -1595,11 +1592,11 @@
ret
; 2945
-.data_2945 ; 2945
+.MovementPermissionsData ; 2945
db 1, 2, 4, 8, 9, 10, 5, 6
; 294d
-GetUpDownCollision:: ; 294d
+.UpDown
ld a, [PlayerNextMapX]
ld d, a
ld a, [PlayerNextMapY]
@@ -1609,17 +1606,17 @@
inc e
call GetCoordTile
ld [TileDown], a
- call Function298b
+ call .Down
pop de
dec e
call GetCoordTile
ld [TileUp], a
- call Function29a8
+ call .Up
ret
; 296c
-GetLeftRightCollision:: ; 296c
+.LeftRight
ld a, [PlayerNextMapX]
ld d, a
ld a, [PlayerNextMapY]
@@ -1629,29 +1626,29 @@
dec d
call GetCoordTile
ld [TileLeft], a
- call Function29e2
+ call .Left
pop de
inc d
call GetCoordTile
ld [TileRight], a
- call Function29c5
+ call .Right
ret
; 298b
-Function298b:: ; 298b
- call Function29ff
+.Down
+ call .CheckHiNybble
ret nz
ld a, [TileDown]
and 7
cp $2
- jr z, .ok
+ jr z, .ok_down
cp $6
- jr z, .ok
+ jr z, .ok_down
cp $7
ret nz
-.ok
+.ok_down
ld a, [TilePermissions]
or FACE_DOWN
ld [TilePermissions], a
@@ -1658,19 +1655,19 @@
ret
; 29a8
-Function29a8:: ; 29a8
- call Function29ff
+.Up
+ call .CheckHiNybble
ret nz
ld a, [TileUp]
and 7
cp $3
- jr z, .ok
+ jr z, .ok_up
cp $4
- jr z, .ok
+ jr z, .ok_up
cp $5
ret nz
-.ok
+.ok_up
ld a, [TilePermissions]
or FACE_UP
ld [TilePermissions], a
@@ -1677,19 +1674,19 @@
ret
; 29c5
-Function29c5:: ; 29c5
- call Function29ff
+.Right
+ call .CheckHiNybble
ret nz
ld a, [TileRight]
and 7
cp $1
- jr z, .ok
+ jr z, .ok_right
cp $5
- jr z, .ok
+ jr z, .ok_right
cp $7
ret nz
-.ok
+.ok_right
ld a, [TilePermissions]
or FACE_RIGHT
ld [TilePermissions], a
@@ -1696,19 +1693,19 @@
ret
; 29e2
-Function29e2:: ; 29e2
- call Function29ff
+.Left
+ call .CheckHiNybble
ret nz
ld a, [TileLeft]
and 7
cp $0
- jr z, .ok
+ jr z, .ok_left
cp $4
- jr z, .ok
+ jr z, .ok_left
cp $6
ret nz
-.ok
+.ok_left
ld a, [TilePermissions]
or FACE_LEFT
ld [TilePermissions], a
@@ -1715,7 +1712,7 @@
ret
; 29ff
-Function29ff:: ; 29ff
+.CheckHiNybble
and $f0
cp $b0
ret z
@@ -1733,9 +1730,8 @@
srl a
ld l, a
ld h, 0
-rept 2
- add hl,hl
-endr
+ add hl, hl
+ add hl, hl
ld de, .Directions
add hl, de
@@ -1777,9 +1773,8 @@
jr z, .nope
ld l, a
ld h, $0
-rept 2
- add hl,hl
-endr
+ add hl, hl
+ add hl, hl
ld a, [TilesetCollisionAddress]
ld c, a
ld a, [TilesetCollisionAddress + 1]
@@ -1792,9 +1787,8 @@
.nocarry
rr e
jr nc, .nocarry2
-rept 2
inc hl
-endr
+ inc hl
.nocarry2
ld a, [TilesetCollisionBank]
@@ -1895,7 +1889,7 @@
.copysign
pop hl
- ld de, EngineBuffer1
+ ld de, wCurSignpostYCoord
ld bc, 5 ; signpost event length
call CopyBytes
scf
@@ -1902,9 +1896,9 @@
ret
; 2ad4
-CheckCurrentNextMapXYTriggers:: ; 2ad4
+CheckCurrentMapXYTriggers:: ; 2ad4
; If there are no xy triggers, we don't need to be here.
- ld a, [wCurrentNextMapXYTriggerCount]
+ ld a, [wCurrentMapXYTriggerCount]
and a
ret z
; Copy the trigger count into c.
@@ -1912,16 +1906,15 @@
ld a, [hROMBank]
push af
call SwitchToMapScriptHeaderBank
- call CheckStandingOnXYTrigger
+ call .TriggerCheck
pop hl
ld a, h
rst Bankswitch
ret
-; 2ae7
-CheckStandingOnXYTrigger:: ; 2ae7
+.TriggerCheck
; Checks to see if you are standing on an xy-trigger. If yes, copies the trigger to EngineBuffer1 and sets carry.
- ld hl, wCurrentNextMapXYTriggerHeaderPointer
+ ld hl, wCurrentMapXYTriggerHeaderPointer
ld a, [hli]
ld h, [hl]
ld l, a
@@ -1969,7 +1962,7 @@
.copytrigger
pop hl
- ld de, EngineBuffer1
+ ld de, wCurCoordEventTriggerID
ld bc, 8 ; xy-trigger size
call CopyBytes
scf
@@ -1992,7 +1985,7 @@
call UpdateSprites
call Call_ExitMenu
call ret_d90
- jr Function2b5c
+ jr FinishExitMenu
; 2b4d
ExitAllMenus:: ; 2b4d
@@ -2001,7 +1994,7 @@
call ReloadTilesetAndPalettes
call UpdateSprites
call ret_d90
-Function2b5c:: ; 2b5c
+FinishExitMenu:: ; 2b5c
ld b, SCGB_MAPPALS
call GetSGBLayout
callba LoadOW_BGPal7
@@ -2066,8 +2059,6 @@
ld b, a
ld a, [MapNumber]
ld c, a
-; 2bed
-
GetAnyMapHeaderPointer:: ; 0x2bed
; Prior to calling this function, you must have switched banks so that
; MapGroupPointers is visible.
@@ -2085,9 +2076,8 @@
ld c, b
ld b, 0
ld hl, MapGroupPointers
-rept 2
add hl, bc
-endr
+ add hl, bc
ld a, [hli]
ld h, [hl]
@@ -2116,8 +2106,6 @@
ld b, a
ld a, [MapNumber]
ld c, a
- ; fallthrough
-
GetAnyMapHeaderMember:: ; 0x2c0c
; bankswitch
ld a, [hROMBank]
@@ -2142,8 +2130,6 @@
ld b, a
ld a, [MapNumber]
ld c, a
-; 2c24
-
SwitchToAnyMapBank:: ; 2c24
call GetAnyMapBank
rst Bankswitch
@@ -2155,8 +2141,6 @@
ld b, a
ld a, [MapNumber]
ld c, a
-; 2c31
-
GetAnyMapBank:: ; 2c31
push hl
push de
@@ -2253,8 +2237,7 @@
ret
; 2c98
-Function2c98:: ; 2c98
- ret
+ ret ; XXX
; 2c99
GetAnyMapPermission:: ; 2c99
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -25,7 +25,7 @@
db 1
; callbacks
- dbw 5, .Flypoint
+ dbw MAPCALLBACK_NEWMAP, .Flypoint
.Trigger0
end
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -12,8 +12,8 @@
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 @@
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 @@
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,7 +16,7 @@
db 1
; callbacks
- dbw 3, .Boulders
+ dbw MAPCALLBACK_PALETTES, .Boulders
.Boulders
writecmdqueue .BoulderCmdQueue
@@ -23,7 +23,7 @@
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 @@
; 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 @@
; callbacks
- dbw 1, .HoleAndLadder
+ dbw MAPCALLBACK_TILES, .HoleAndLadder
.Trigger0:
priorityjump .EusineTrigger
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -22,7 +22,7 @@
; 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 @@
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 @@
; 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 @@
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 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0
end
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -24,7 +24,7 @@
db 1
; callbacks
- dbw 5, .FlyPointAndSuicune
+ dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
.Trigger0
end
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -9,7 +9,7 @@
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 @@
; 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 @@
; 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 @@
; 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 @@
; callbacks
- dbw 5, .CheckSilver
+ dbw MAPCALLBACK_NEWMAP, .CheckSilver
.Trigger0:
end
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -15,7 +15,7 @@
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 @@
; callbacks
- dbw 2, .InitializeSages
+ dbw MAPCALLBACK_OBJECTS, .InitializeSages
.Trigger0:
end
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -23,7 +23,7 @@
; callbacks
- dbw 2, .Callback_MoveElm
+ dbw MAPCALLBACK_OBJECTS, .Callback_MoveElm
.Trigger0:
priorityjump ElmsLab_AutowalkUpToElm
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -12,7 +12,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_FUCHSIA
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -23,8 +23,8 @@
db 2
; callbacks
- dbw 5, .FlyPointAndFloria
- dbw 2, .MoveTutor
+ dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria
+ dbw MAPCALLBACK_OBJECTS, .MoveTutor
.FlyPointAndFloria
setflag ENGINE_FLYPOINT_GOLDENROD
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -15,7 +15,7 @@
; callbacks
- dbw 2, .CheckIfSunday
+ dbw MAPCALLBACK_OBJECTS, .CheckIfSunday
.CheckIfSunday:
checkcode VAR_WEEKDAY
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -17,9 +17,9 @@
; callbacks
- dbw 1, UnknownScript_0x7d781
+ dbw MAPCALLBACK_TILES, UnknownScript_0x7d781
- dbw 5, UnknownScript_0x7d7ac
+ dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac
UnknownScript_0x7d781:
checkevent EVENT_RECEIVED_CARD_KEY
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -17,9 +17,9 @@
; callbacks
- dbw 1, .CheckSaleChangeBlock
+ dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock
- dbw 2, .CheckSaleChangeClerk
+ dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk
.CheckSaleChangeBlock:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -21,7 +21,7 @@
; callbacks
- dbw 2, .Callback
+ dbw MAPCALLBACK_OBJECTS, .Callback
.Callback
checkevent EVENT_BEAT_ELITE_FOUR
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -14,7 +14,7 @@
; callbacks
- dbw 3, .SetUpStoneTable
+ dbw MAPCALLBACK_PALETTES, .SetUpStoneTable
.SetUpStoneTable:
writecmdqueue .CommandQueue
@@ -21,7 +21,7 @@
return
.CommandQueue:
- dbw 2, .StoneTable ; check if any stones are sitting on a warp
+ dbw MAPCALLBACK_OBJECTS, .StoneTable ; check if any stones are sitting on a warp
db 0, 0 ; filler
.StoneTable:
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -20,7 +20,7 @@
; callbacks
- dbw 2, .FarfetchdCallback
+ dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback
.FarfetchdCallback:
checkevent EVENT_GOT_HM01_CUT
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -18,7 +18,7 @@
; callbacks
- dbw 5, UnknownScript_0x18000a
+ dbw MAPCALLBACK_NEWMAP, UnknownScript_0x18000a
UnknownScript_0x180009:
end
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -14,7 +14,7 @@
; callbacks
- dbw 1, UnknownScript_0x180bc1
+ dbw MAPCALLBACK_TILES, UnknownScript_0x180bc1
UnknownScript_0x180bbc:
priorityjump UnknownScript_0x180bd6
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -14,7 +14,7 @@
; callbacks
- dbw 1, UnknownScript_0x18072d
+ dbw MAPCALLBACK_TILES, UnknownScript_0x18072d
UnknownScript_0x180728:
priorityjump UnknownScript_0x180742
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -13,9 +13,9 @@
; callbacks
- dbw 5, .InitializeRoom
+ dbw MAPCALLBACK_NEWMAP, .InitializeRoom
- dbw 1, .SetSpawn
+ dbw MAPCALLBACK_TILES, .SetSpawn
.Null:
end
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -14,7 +14,7 @@
; callbacks
- dbw 2, UnknownScript_0x18e154
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18e154
UnknownScript_0x18e154:
checkevent EVENT_CLEARED_SLOWPOKE_WELL
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -25,8 +25,8 @@
; callbacks
- dbw 5, .FlyPoint
- dbw 2, .Wesley
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
+ dbw MAPCALLBACK_OBJECTS, .Wesley
.Trigger0
end
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -16,7 +16,7 @@
; callbacks
- dbw 1, UnknownScript_0x180e3e
+ dbw MAPCALLBACK_TILES, UnknownScript_0x180e3e
UnknownScript_0x180e39:
priorityjump UnknownScript_0x180e53
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -12,7 +12,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_LAVENDER
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -18,7 +18,7 @@
; callbacks
- dbw 1, UnknownScript_0x6c35b
+ dbw MAPCALLBACK_TILES, UnknownScript_0x6c35b
UnknownScript_0x6c356:
end
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -16,7 +16,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0
end
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -15,9 +15,9 @@
; callbacks
- dbw 5, UnknownScript_0x77093
+ dbw MAPCALLBACK_NEWMAP, UnknownScript_0x77093
- dbw 2, UnknownScript_0x77097
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x77097
UnknownScript_0x77092:
end
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -15,7 +15,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0
end
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -16,7 +16,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0
end
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -10,7 +10,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_PALLET
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -13,7 +13,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_PEWTER
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -16,7 +16,7 @@
; callbacks
- dbw 1, UnknownScript_0x5e543
+ dbw MAPCALLBACK_TILES, UnknownScript_0x5e543
UnknownScript_0x5e543:
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -8,7 +8,7 @@
; callbacks
- dbw 5, UnknownScript_0x1ad318
+ dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad318
UnknownScript_0x1ad318:
checkcode VAR_YCOORD
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -13,7 +13,7 @@
; callbacks
- dbw 5, UnknownScript_0x1ad0ab
+ dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad0ab
UnknownScript_0x1ad0ab:
setflag ENGINE_ALWAYS_ON_BIKE
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -15,7 +15,7 @@
; callbacks
- dbw 1, .ClearRocks
+ dbw MAPCALLBACK_TILES, .ClearRocks
.ClearRocks
checkevent EVENT_CINNABAR_ROCKS_CLEARED
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -12,7 +12,7 @@
; callbacks
- dbw 5, .ClearRocks
+ dbw MAPCALLBACK_NEWMAP, .ClearRocks
.ClearRocks
setevent EVENT_CINNABAR_ROCKS_CLEARED
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -7,7 +7,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_INDIGO_PLATEAU
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -21,7 +21,7 @@
; callbacks
- dbw 2, .Tuscany
+ dbw MAPCALLBACK_OBJECTS, .Tuscany
.Trigger0:
end
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -16,7 +16,7 @@
; callbacks
- dbw 5, .CheckMomCall
+ dbw MAPCALLBACK_NEWMAP, .CheckMomCall
.CheckMomCall:
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -28,7 +28,7 @@
; callbacks
- dbw 2, .Frieda
+ dbw MAPCALLBACK_OBJECTS, .Frieda
.Trigger0:
end
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -22,7 +22,7 @@
; callbacks
- dbw 2, .EggCheckCallback
+ dbw MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback:
checkflag ENGINE_DAYCARE_MAN_HAS_EGG
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -13,7 +13,7 @@
; callbacks
- dbw 2, UnknownScript_0x62d2d
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x62d2d
UnknownScript_0x62d2d:
checkevent EVENT_FOREST_IS_RESTLESS
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -17,9 +17,9 @@
; callbacks
- dbw 5, Route35NationalParkgate_CheckIfStillInContest
+ dbw MAPCALLBACK_NEWMAP, Route35NationalParkgate_CheckIfStillInContest
- dbw 2, Route35NationalParkgate_CheckIfContestDay
+ dbw MAPCALLBACK_OBJECTS, Route35NationalParkgate_CheckIfContestDay
Route35NationalParkgate_Trigger1:
end
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -22,7 +22,7 @@
; callbacks
- dbw 2, ArthurCallback
+ dbw MAPCALLBACK_OBJECTS, ArthurCallback
UnknownScript_0x19400d:
end
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -26,9 +26,9 @@
; callbacks
- dbw 5, .CheckIfContestRunning
+ dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning
- dbw 2, .CheckIfContestAvailable
+ dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
.Trigger0:
end
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -16,7 +16,7 @@
; callbacks
- dbw 2, SunnyCallback
+ dbw MAPCALLBACK_OBJECTS, SunnyCallback
SunnyCallback:
checkcode VAR_WEEKDAY
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -21,7 +21,7 @@
; callbacks
- dbw 2, MonicaCallback
+ dbw MAPCALLBACK_OBJECTS, MonicaCallback
MonicaCallback:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -11,7 +11,7 @@
; callbacks
- dbw 2, UnknownScript_0x9f665
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x9f665
UnknownScript_0x9f665:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -17,7 +17,7 @@
; callbacks
- dbw 5, UnknownScript_0x19d051
+ dbw MAPCALLBACK_NEWMAP, UnknownScript_0x19d051
UnknownScript_0x19d051:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -16,7 +16,7 @@
; callbacks
- dbw 5, UnknownScript_0x19abca
+ dbw MAPCALLBACK_NEWMAP, UnknownScript_0x19abca
UnknownScript_0x19abc5:
priorityjump UnknownScript_0x19abda
--- a/maps/RuinsofAlphAerodactylChamber.asm
+++ b/maps/RuinsofAlphAerodactylChamber.asm
@@ -12,7 +12,7 @@
; callbacks
- dbw 1, UnknownScript_0x58db9
+ dbw MAPCALLBACK_TILES, UnknownScript_0x58db9
UnknownScript_0x58dad:
checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
--- a/maps/RuinsofAlphHoOhChamber.asm
+++ b/maps/RuinsofAlphHoOhChamber.asm
@@ -12,7 +12,7 @@
; callbacks
- dbw 1, UnknownScript_0x5857c
+ dbw MAPCALLBACK_TILES, UnknownScript_0x5857c
UnknownScript_0x5856d:
special SpecialHoOhChamber
--- a/maps/RuinsofAlphKabutoChamber.asm
+++ b/maps/RuinsofAlphKabutoChamber.asm
@@ -15,7 +15,7 @@
; callbacks
- dbw 1, UnknownScript_0x58737
+ dbw MAPCALLBACK_TILES, UnknownScript_0x58737
UnknownScript_0x5872b:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
--- a/maps/RuinsofAlphOmanyteChamber.asm
+++ b/maps/RuinsofAlphOmanyteChamber.asm
@@ -12,7 +12,7 @@
; callbacks
- dbw 1, UnknownScript_0x58bf8
+ dbw MAPCALLBACK_TILES, UnknownScript_0x58bf8
UnknownScript_0x58be9:
special SpecialOmanyteChamber
--- a/maps/RuinsofAlphOutside.asm
+++ b/maps/RuinsofAlphOutside.asm
@@ -18,7 +18,7 @@
; callbacks
- dbw 2, UnknownScript_0x5800f
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x5800f
UnknownScript_0x5800d:
end
--- a/maps/RuinsofAlphResearchCenter.asm
+++ b/maps/RuinsofAlphResearchCenter.asm
@@ -16,7 +16,7 @@
; callbacks
- dbw 2, UnknownScript_0x59185
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x59185
UnknownScript_0x59180:
end
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -16,7 +16,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_SAFFRON
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -7,7 +7,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_SILVER_CAVE
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -18,7 +18,7 @@
; callbacks
- dbw 2, .Callback1
+ dbw MAPCALLBACK_OBJECTS, .Callback1
.Trigger0:
end
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -29,7 +29,7 @@
; callbacks
- dbw 1, UnknownScript_0x6cf89
+ dbw MAPCALLBACK_TILES, UnknownScript_0x6cf89
UnknownScript_0x6cf85:
end
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -29,7 +29,7 @@
; callbacks
- dbw 1, .CheckGiovanniDoor
+ dbw MAPCALLBACK_TILES, .CheckGiovanniDoor
.Trigger0:
priorityjump LanceScript_0x6dffc
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -15,7 +15,7 @@
; callbacks
- dbw 2, TimeCapsule_SetWhichChris
+ dbw MAPCALLBACK_OBJECTS, TimeCapsule_SetWhichChris
.Trigger0:
priorityjump TimeCapsule_Initialize
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -23,9 +23,9 @@
; callbacks
- dbw 2, UnknownScript_0x18502f
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18502f
- dbw 1, UnknownScript_0x185084
+ dbw MAPCALLBACK_TILES, UnknownScript_0x185084
UnknownScript_0x18502a:
priorityjump UnknownScript_0x18508f
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -10,7 +10,7 @@
; callbacks
- dbw 2, UnknownScript_0x77230
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x77230
UnknownScript_0x77230:
checkevent EVENT_FOUGHT_HO_OH
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -15,7 +15,7 @@
; callbacks
- dbw 2, TradeCenter_SetWhichChris
+ dbw MAPCALLBACK_OBJECTS, TradeCenter_SetWhichChris
.Trigger0:
priorityjump TradeCenter_Initialize
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -56,7 +56,7 @@
; callbacks
- dbw 1, .UpdateDoorPositions
+ dbw MAPCALLBACK_TILES, .UpdateDoorPositions
.Trigger0:
end
--- a/maps/UndergroundWarehouse.asm
+++ b/maps/UndergroundWarehouse.asm
@@ -16,7 +16,7 @@
; callbacks
- dbw 5, .ResetSwitches
+ dbw MAPCALLBACK_NEWMAP, .ResetSwitches
.ResetSwitches:
clearevent EVENT_SWITCH_1
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -15,7 +15,7 @@
; callbacks
- dbw 2, UnknownScript_0x5a30d
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x5a30d
UnknownScript_0x5a30d:
checkflag ENGINE_UNION_CAVE_LAPRAS
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -14,7 +14,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_VERMILION
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -15,7 +15,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0
end
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -16,7 +16,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_VIOLET
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -12,7 +12,7 @@
db 1
; callbacks
- dbw 5, .FlyPoint
+ dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_VIRIDIAN
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -18,11 +18,11 @@
; callbacks
- dbw 5, .ResetSwitches
+ dbw MAPCALLBACK_NEWMAP, .ResetSwitches
- dbw 1, .CheckBasementKey
+ dbw MAPCALLBACK_TILES, .CheckBasementKey
- dbw 2, .CheckDayOfWeek
+ dbw MAPCALLBACK_OBJECTS, .CheckDayOfWeek
.ResetSwitches:
clearevent EVENT_SWITCH_1
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -10,7 +10,7 @@
; callbacks
- dbw 2, UnknownScript_0x18c504
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18c504
UnknownScript_0x18c504:
checkevent EVENT_FOUGHT_LUGIA
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -14,7 +14,7 @@
; callbacks
- dbw 1, UnknownScript_0x1804cb
+ dbw MAPCALLBACK_TILES, UnknownScript_0x1804cb
UnknownScript_0x1804c6:
priorityjump UnknownScript_0x1804e0
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -19,7 +19,7 @@
; callbacks
- dbw 2, UnknownScript_0x98574
+ dbw MAPCALLBACK_OBJECTS, UnknownScript_0x98574
UnknownScript_0x98572:
end
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -3061,7 +3061,7 @@
call ReloadTilesetAndPalettes
callba Function106464
call UpdateSprites
- call Function2b5c
+ call FinishExitMenu
ret
; 1013c0
@@ -3069,7 +3069,7 @@
callba BlankScreen
callba MobileFunc_106462
callba Function106464
- call Function2b5c
+ call FinishExitMenu
ret
; 1013d6
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -5573,7 +5573,7 @@
callba MobileFunc_106462
callba Function106464
call ret_d90
- callba Function2b5c
+ callba FinishExitMenu
call UpdateSprites
ret
; 11a9f0
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -4708,7 +4708,7 @@
Function17f5c3: ; 17f5c3
call Function17f5e4
- callba Function2b5c
+ callba FinishExitMenu
ld a, $1
ld [wc303], a
ret
--- a/wram.asm
+++ b/wram.asm
@@ -1905,6 +1905,8 @@
CurFruitTree::
CurInput::
wElevatorPointerBank::
+wCurCoordEventTriggerID::
+wCurSignpostYCoord::
EngineBuffer1:: ; d03e
ds 1
@@ -1913,6 +1915,8 @@
CurFruit:: ; d03f
MartPointerBank::
wElevatorPointerLo::
+wCurCoordEventMapY::
+wCurSignpostXCoord::
EngineBuffer2::
ds 1
@@ -1919,18 +1923,22 @@
wd040::
wElevatorPointerHi::
MartPointer:: ; d040
+wCurCoordEventMapX::
+wCurSignpostType::
EngineBuffer3::
ds 1
wd041::
wElevatorOriginFloor::
-EngineBuffer4::
wTempTrainerHeader::
wTempTrainerEventFlagLo::
+wCurSignpostScriptAddr::
+EngineBuffer4::
ds 1
wTempTrainerEventFlagHi::
MovementAnimation:: ; d042
+wCurCoordEventScriptAddr::
EngineBuffer5::
ds 1
@@ -2963,8 +2971,8 @@
wCurrMapWarpCount:: ds 1
wCurrMapWarpHeaderPointer:: ds 1
wdbfd:: ds 1
-wCurrentNextMapXYTriggerCount:: ds 1
-wCurrentNextMapXYTriggerHeaderPointer:: ds 1
+wCurrentMapXYTriggerCount:: ds 1
+wCurrentMapXYTriggerHeaderPointer:: ds 1
wdc00:: ds 1
wCurrentMapSignpostCount:: ds 1
wCurrentMapSignpostHeaderPointer::