pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Map callback constants

Browse Source
This commit is contained in:
PikalaxALT 2016-01-06 07:44:50 -05:00
parent 80aba7fc13
commit ce019e6347
100 changed files with 191 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
constants/map_setup_constants.asm
View File

@ -12,6 +12,13 @@ const_value SET $f1
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

4
engine/events.asm
View File

@ -350,7 +350,7 @@ CheckTileEvent: ; 96874
call CheckCoordEventScriptFlag
jr z, .coord_events_disabled
call CheckCurrentNextMapXYTriggers
call CheckCurrentMapXYTriggers
jr c, .coord_event
.coord_events_disabled
@ -391,7 +391,7 @@ CheckTileEvent: ; 96874
ret
.coord_event
ld hl, EngineBuffer5
ld hl, wCurCoordEventScriptAddr
ld a, [hli]
ld h, [hl]
ld l, a

2
engine/map_setup.asm
View File

@ -306,7 +306,7 @@ SuspendMapAnims: ; 154d3
; 154d7
LoadObjectsRunCallback_02: ; 154d7
ld a, 2
ld a, MAPCALLBACK_OBJECTS
call RunMapCallback
callba LoadObjectMasks
callba InitializeVisibleSprites

2
engine/overworld.asm
View File

@ -166,7 +166,7 @@ endr
RunCallback_04: ; 14209
ld a, $4
ld a, MAPCALLBACK_SPRITES
call RunMapCallback
call GetUsedSprites
call .LoadMiscTiles

2
engine/startmenu.asm
View File

@ -146,7 +146,7 @@ StartMenu:: ; 125cd
call .DrawBugContestStatus
call UpdateSprites
call ret_d90
call Function2b5c
call FinishExitMenu
ret
; 126d3

4
engine/warp_connection.asm
View File

@ -5,11 +5,11 @@ RunCallback_05_03: ; 1045b0
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

131
home/map.asm
View File

@ -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 @@ GetDestinationWarpNumber:: ; 2252
ret
.IncreaseHLTwice
rept 2
inc hl
endr
inc hl
scf
ret
; 22a7
@ -424,9 +423,8 @@ ReadMapEventHeader:: ; 2336
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 @@ ReadWarps:: ; 23da
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 @@ LoadBlockData:: ; 24cd
call ByteFill
call ChangeMap
call FillMapConnections
ld a, $1
ld a, MAPCALLBACK_TILES
call RunMapCallback
ret
; 24e4
@ -1198,7 +1196,7 @@ MaskObject:: ; 2712
ld d, $0
ld hl, wObjectMasks
add hl, de
ld [hl], -1 ; ,masked
ld [hl], -1 ; , masked
ret
; 271e
@ -1340,9 +1338,8 @@ UpdateBGMapRow:: ; 27d3
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 @@ SaveScreen_LoadNeighbor:: ; 28f7
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 @@ GetMovementPermissions:: ; 2914
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 @@ GetMovementPermissions:: ; 2914
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 @@ GetUpDownCollision:: ; 294d
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,93 +1626,93 @@ GetLeftRightCollision:: ; 296c
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
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
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
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
ret
; 29ff
Function29ff:: ; 29ff
.CheckHiNybble
and $f0
cp $b0
ret z
@ -1733,9 +1730,8 @@ GetFacingTileCoord:: ; 2a07
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 @@ GetCoordTile:: ; 2a3c
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 @@ endr
.nocarry
rr e
jr nc, .nocarry2
rept 2
inc hl
endr
inc hl
.nocarry2
ld a, [TilesetCollisionBank]
@ -1895,16 +1889,16 @@ CheckIfFacingTileCoordIsSign:: ; 2aaa
.copysign
pop hl
ld de, EngineBuffer1
ld de, wCurSignpostYCoord
ld bc, 5 ; signpost event length
call CopyBytes
scf
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 @@ CheckCurrentNextMapXYTriggers:: ; 2ad4
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 @@ CheckStandingOnXYTrigger:: ; 2ae7
.copytrigger
pop hl
ld de, EngineBuffer1
ld de, wCurCoordEventTriggerID
ld bc, 8 ; xy-trigger size
call CopyBytes
scf
@ -1992,7 +1985,7 @@ CloseSubmenu:: ; 2b3c
call UpdateSprites
call Call_ExitMenu
call ret_d90
jr Function2b5c
jr FinishExitMenu
; 2b4d
ExitAllMenus:: ; 2b4d
@ -2001,7 +1994,7 @@ ExitAllMenus:: ; 2b4d
call ReloadTilesetAndPalettes
call UpdateSprites
call ret_d90
Function2b5c:: ; 2b5c
FinishExitMenu:: ; 2b5c
ld b, SCGB_MAPPALS
call GetSGBLayout
callba LoadOW_BGPal7
@ -2066,8 +2059,6 @@ GetMapHeaderPointer:: ; 2be5
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 @@ GetAnyMapHeaderPointer:: ; 0x2bed
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 @@ GetMapHeaderMember:: ; 0x2c04
ld b, a
ld a, [MapNumber]
ld c, a
; fallthrough
GetAnyMapHeaderMember:: ; 0x2c0c
; bankswitch
ld a, [hROMBank]
@ -2142,8 +2130,6 @@ SwitchToMapBank:: ; 2c1c
ld b, a
ld a, [MapNumber]
ld c, a
; 2c24
SwitchToAnyMapBank:: ; 2c24
call GetAnyMapBank
rst Bankswitch
@ -2155,8 +2141,6 @@ GetMapBank:: ; 2c29
ld b, a
ld a, [MapNumber]
ld c, a
; 2c31
GetAnyMapBank:: ; 2c31
push hl
push de
@ -2253,8 +2237,7 @@ GetMapPermission:: ; 2c8a
ret
; 2c98
Function2c98:: ; 2c98
ret
ret ; XXX
; 2c99
GetAnyMapPermission:: ; 2c99

2
maps/AzaleaTown.asm
View File

@ -25,7 +25,7 @@ AzaleaTown_MapScriptHeader:
db 1
; callbacks
dbw 5, .Flypoint
dbw MAPCALLBACK_NEWMAP, .Flypoint
.Trigger0
end

4
maps/BattleTowerOutside.asm
View File

@ -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

4
maps/BlackthornCity.asm
View File

@ -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

2
maps/BlackthornGym1F.asm
View File

@ -13,7 +13,7 @@ BlackthornGym1F_MapScriptHeader:
db 1
; callbacks
dbw 1, .Boulders
dbw MAPCALLBACK_TILES, .Boulders
.Boulders
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1

4
maps/BlackthornGym2F.asm
View File

@ -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

2
maps/BrunosRoom.asm
View File

@ -14,7 +14,7 @@ BrunosRoom_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x180998
dbw MAPCALLBACK_TILES, UnknownScript_0x180998
UnknownScript_0x180993:
priorityjump UnknownScript_0x1809ad

2
maps/BurnedTower1F.asm
View File

@ -19,7 +19,7 @@ BurnedTower1F_MapScriptHeader:
; callbacks
dbw 1, .HoleAndLadder
dbw MAPCALLBACK_TILES, .HoleAndLadder
.Trigger0:
priorityjump .EusineTrigger

2
maps/BurnedTowerB1F.asm
View File

@ -22,7 +22,7 @@ BurnedTowerB1F_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x186160
dbw MAPCALLBACK_TILES, UnknownScript_0x186160
UnknownScript_0x18615e:
end

2
maps/CeladonCity.asm
View File

@ -17,7 +17,7 @@ CeladonCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_CELADON

2
maps/CeladonDeptStore6F.asm
View File

@ -11,7 +11,7 @@ CeladonDeptStore6F_MapScriptHeader:
; callbacks
dbw 1, .Callback
dbw MAPCALLBACK_TILES, .Callback
.Callback:
changeblock $c, $0, $3

2
maps/CeruleanCity.asm
View File

@ -14,7 +14,7 @@ CeruleanCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_CERULEAN

2
maps/CherrygroveCity.asm
View File

@ -17,7 +17,7 @@ CherrygroveCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0
end

2
maps/CianwoodCity.asm
View File

@ -24,7 +24,7 @@ CianwoodCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPointAndSuicune
dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
.Trigger0
end

2
maps/CinnabarIsland.asm
View File

@ -9,7 +9,7 @@ CinnabarIsland_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_CINNABAR

4
maps/Colosseum.asm
View File

@ -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

2
maps/CopycatsHouse2F.asm
View File

@ -15,7 +15,7 @@ CopycatsHouse2F_MapScriptHeader:
; callbacks
dbw 2, CopycatsHouse2FCallback
dbw MAPCALLBACK_OBJECTS, CopycatsHouse2FCallback
CopycatsHouse2FCallback:
checkflag ENGINE_PLAYER_IS_FEMALE

2
maps/DayCare.asm
View File

@ -11,7 +11,7 @@ DayCare_MapScriptHeader:
; callbacks
dbw 2, .EggCheckCallback
dbw MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback:
checkflag ENGINE_DAYCARE_MAN_HAS_EGG

2
maps/DragonsDenB1F.asm
View File

@ -22,7 +22,7 @@ DragonsDenB1F_MapScriptHeader:
; callbacks
dbw 5, .CheckSilver
dbw MAPCALLBACK_NEWMAP, .CheckSilver
.Trigger0:
end

2
maps/EcruteakCity.asm
View File

@ -15,7 +15,7 @@ EcruteakCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_ECRUTEAK

2
maps/EcruteakHouse.asm
View File

@ -17,7 +17,7 @@ EcruteakHouse_MapScriptHeader:
; callbacks
dbw 2, .InitializeSages
dbw MAPCALLBACK_OBJECTS, .InitializeSages
.Trigger0:
end

2
maps/ElmsLab.asm
View File

@ -23,7 +23,7 @@ ElmsLab_MapScriptHeader:
; callbacks
dbw 2, .Callback_MoveElm
dbw MAPCALLBACK_OBJECTS, .Callback_MoveElm
.Trigger0:
priorityjump ElmsLab_AutowalkUpToElm

2
maps/FuchsiaCity.asm
View File

@ -12,7 +12,7 @@ FuchsiaCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_FUCHSIA

4
maps/GoldenrodCity.asm
View File

@ -23,8 +23,8 @@ GoldenrodCity_MapScriptHeader:
db 2
; callbacks
dbw 5, .FlyPointAndFloria
dbw 2, .MoveTutor
dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria
dbw MAPCALLBACK_OBJECTS, .MoveTutor
.FlyPointAndFloria
setflag ENGINE_FLYPOINT_GOLDENROD

2
maps/GoldenrodDeptStore5F.asm
View File

@ -15,7 +15,7 @@ GoldenrodDeptStore5F_MapScriptHeader:
; callbacks
dbw 2, .CheckIfSunday
dbw MAPCALLBACK_OBJECTS, .CheckIfSunday
.CheckIfSunday:
checkcode VAR_WEEKDAY

4
maps/GoldenrodDeptStoreB1F.asm
View File

@ -17,9 +17,9 @@ GoldenrodDeptStoreB1F_MapScriptHeader:
; 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

4
maps/GoldenrodDeptStoreRoof.asm
View File

@ -17,9 +17,9 @@ GoldenrodDeptStoreRoof_MapScriptHeader:
; callbacks
dbw 1, .CheckSaleChangeBlock
dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock
dbw 2, .CheckSaleChangeClerk
dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk
.CheckSaleChangeBlock:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON

2
maps/GoldenrodGameCorner.asm
View File

@ -21,7 +21,7 @@ GoldenrodGameCorner_MapScriptHeader:
; callbacks
dbw 2, .Callback
dbw MAPCALLBACK_OBJECTS, .Callback
.Callback
checkevent EVENT_BEAT_ELITE_FOUR

4
maps/IcePathB1F.asm
View File

@ -14,14 +14,14 @@ IcePathB1F_MapScriptHeader:
; callbacks
dbw 3, .SetUpStoneTable
dbw MAPCALLBACK_PALETTES, .SetUpStoneTable
.SetUpStoneTable:
writecmdqueue .CommandQueue
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:

2
maps/IlexForest.asm
View File

@ -20,7 +20,7 @@ IlexForest_MapScriptHeader:
; callbacks
dbw 2, .FarfetchdCallback
dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback
.FarfetchdCallback:
checkevent EVENT_GOT_HM01_CUT

2
maps/IndigoPlateauPokeCenter1F.asm
View File

@ -18,7 +18,7 @@ IndigoPlateauPokeCenter1F_MapScriptHeader:
; callbacks
dbw 5, UnknownScript_0x18000a
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x18000a
UnknownScript_0x180009:
end

2
maps/KarensRoom.asm
View File

@ -14,7 +14,7 @@ KarensRoom_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x180bc1
dbw MAPCALLBACK_TILES, UnknownScript_0x180bc1
UnknownScript_0x180bbc:
priorityjump UnknownScript_0x180bd6

2
maps/KogasRoom.asm
View File

@ -14,7 +14,7 @@ KogasRoom_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x18072d
dbw MAPCALLBACK_TILES, UnknownScript_0x18072d
UnknownScript_0x180728:
priorityjump UnknownScript_0x180742

4
maps/KrissHouse2F.asm
View File

@ -13,9 +13,9 @@ KrissHouse2F_MapScriptHeader:
; callbacks
dbw 5, .InitializeRoom
dbw MAPCALLBACK_NEWMAP, .InitializeRoom
dbw 1, .SetSpawn
dbw MAPCALLBACK_TILES, .SetSpawn
.Null:
end

2
maps/KurtsHouse.asm
View File

@ -14,7 +14,7 @@ KurtsHouse_MapScriptHeader:
; callbacks
dbw 2, UnknownScript_0x18e154
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18e154
UnknownScript_0x18e154:
checkevent EVENT_CLEARED_SLOWPOKE_WELL

4
maps/LakeofRage.asm
View File

@ -25,8 +25,8 @@ LakeofRage_MapScriptHeader:
; callbacks
dbw 5, .FlyPoint
dbw 2, .Wesley
dbw MAPCALLBACK_NEWMAP, .FlyPoint
dbw MAPCALLBACK_OBJECTS, .Wesley
.Trigger0
end

2
maps/LancesRoom.asm
View File

@ -16,7 +16,7 @@ LancesRoom_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x180e3e
dbw MAPCALLBACK_TILES, UnknownScript_0x180e3e
UnknownScript_0x180e39:
priorityjump UnknownScript_0x180e53

2
maps/LavenderTown.asm
View File

@ -12,7 +12,7 @@ LavenderTown_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_LAVENDER

2
maps/MahoganyMart1F.asm
View File

@ -18,7 +18,7 @@ MahoganyMart1F_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x6c35b
dbw MAPCALLBACK_TILES, UnknownScript_0x6c35b
UnknownScript_0x6c356:
end

2
maps/MahoganyTown.asm
View File

@ -16,7 +16,7 @@ MahoganyTown_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0
end

4
maps/MountMoonSquare.asm
View File

@ -15,9 +15,9 @@ MountMoonSquare_MapScriptHeader:
; callbacks
dbw 5, UnknownScript_0x77093
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x77093
dbw 2, UnknownScript_0x77097
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x77097
UnknownScript_0x77092:
end

2
maps/NewBarkTown.asm
View File

@ -15,7 +15,7 @@ NewBarkTown_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0
end

2
maps/OlivineCity.asm
View File

@ -16,7 +16,7 @@ OlivineCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0
end

2
maps/PalletTown.asm
View File

@ -10,7 +10,7 @@ PalletTown_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_PALLET

2
maps/PewterCity.asm
View File

@ -13,7 +13,7 @@ PewterCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_PEWTER

2
maps/RadioTower3F.asm
View File

@ -16,7 +16,7 @@ RadioTower3F_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x5e543
dbw MAPCALLBACK_TILES, UnknownScript_0x5e543
UnknownScript_0x5e543:
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER

2
maps/Route16.asm
View File

@ -8,7 +8,7 @@ Route16_MapScriptHeader:
; callbacks
dbw 5, UnknownScript_0x1ad318
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad318
UnknownScript_0x1ad318:
checkcode VAR_YCOORD

2
maps/Route17.asm
View File

@ -13,7 +13,7 @@ Route17_MapScriptHeader:
; callbacks
dbw 5, UnknownScript_0x1ad0ab
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad0ab
UnknownScript_0x1ad0ab:
setflag ENGINE_ALWAYS_ON_BIKE

2
maps/Route19.asm
View File

@ -15,7 +15,7 @@ Route19_MapScriptHeader:
; callbacks
dbw 1, .ClearRocks
dbw MAPCALLBACK_TILES, .ClearRocks
.ClearRocks
checkevent EVENT_CINNABAR_ROCKS_CLEARED

2
maps/Route20.asm
View File

@ -12,7 +12,7 @@ Route20_MapScriptHeader:
; callbacks
dbw 5, .ClearRocks
dbw MAPCALLBACK_NEWMAP, .ClearRocks
.ClearRocks
setevent EVENT_CINNABAR_ROCKS_CLEARED

2
maps/Route23.asm
View File

@ -7,7 +7,7 @@ Route23_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_INDIGO_PLATEAU

2
maps/Route29.asm
View File

@ -21,7 +21,7 @@ Route29_MapScriptHeader:
; callbacks
dbw 2, .Tuscany
dbw MAPCALLBACK_OBJECTS, .Tuscany
.Trigger0:
end

2
maps/Route31.asm
View File

@ -16,7 +16,7 @@ Route31_MapScriptHeader:
; callbacks
dbw 5, .CheckMomCall
dbw MAPCALLBACK_NEWMAP, .CheckMomCall
.CheckMomCall:
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST

2
maps/Route32.asm
View File

@ -28,7 +28,7 @@ Route32_MapScriptHeader:
; callbacks
dbw 2, .Frieda
dbw MAPCALLBACK_OBJECTS, .Frieda
.Trigger0:
end

2
maps/Route34.asm
View File

@ -22,7 +22,7 @@ Route34_MapScriptHeader:
; callbacks
dbw 2, .EggCheckCallback
dbw MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback:
checkflag ENGINE_DAYCARE_MAN_HAS_EGG

2
maps/Route34IlexForestGate.asm
View File

@ -13,7 +13,7 @@ Route34IlexForestGate_MapScriptHeader:
; callbacks
dbw 2, UnknownScript_0x62d2d
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x62d2d
UnknownScript_0x62d2d:
checkevent EVENT_FOREST_IS_RESTLESS

4
maps/Route35NationalParkgate.asm
View File

@ -17,9 +17,9 @@ Route35NationalParkgate_MapScriptHeader:
; callbacks
dbw 5, Route35NationalParkgate_CheckIfStillInContest
dbw MAPCALLBACK_NEWMAP, Route35NationalParkgate_CheckIfStillInContest
dbw 2, Route35NationalParkgate_CheckIfContestDay
dbw MAPCALLBACK_OBJECTS, Route35NationalParkgate_CheckIfContestDay
Route35NationalParkgate_Trigger1:
end

2
maps/Route36.asm
View File

@ -22,7 +22,7 @@ Route36_MapScriptHeader:
; callbacks
dbw 2, ArthurCallback
dbw MAPCALLBACK_OBJECTS, ArthurCallback
UnknownScript_0x19400d:
end

4
maps/Route36NationalParkgate.asm
View File

@ -26,9 +26,9 @@ Route36NationalParkgate_MapScriptHeader:
; callbacks
dbw 5, .CheckIfContestRunning
dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning
dbw 2, .CheckIfContestAvailable
dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
.Trigger0:
end

2
maps/Route37.asm
View File

@ -16,7 +16,7 @@ Route37_MapScriptHeader:
; callbacks
dbw 2, SunnyCallback
dbw MAPCALLBACK_OBJECTS, SunnyCallback
SunnyCallback:
checkcode VAR_WEEKDAY

2
maps/Route40.asm
View File

@ -21,7 +21,7 @@ Route40_MapScriptHeader:
; callbacks
dbw 2, MonicaCallback
dbw MAPCALLBACK_OBJECTS, MonicaCallback
MonicaCallback:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR

2
maps/Route40BattleTowerGate.asm
View File

@ -11,7 +11,7 @@ Route40BattleTowerGate_MapScriptHeader:
; callbacks
dbw 2, UnknownScript_0x9f665
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x9f665
UnknownScript_0x9f665:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR

2
maps/Route43.asm
View File

@ -17,7 +17,7 @@ Route43_MapScriptHeader:
; callbacks
dbw 5, UnknownScript_0x19d051
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x19d051
UnknownScript_0x19d051:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT

2
maps/Route43Gate.asm
View File

@ -16,7 +16,7 @@ Route43Gate_MapScriptHeader:
; callbacks
dbw 5, UnknownScript_0x19abca
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x19abca
UnknownScript_0x19abc5:
priorityjump UnknownScript_0x19abda

2
maps/RuinsofAlphAerodactylChamber.asm
View File

@ -12,7 +12,7 @@ RuinsofAlphAerodactylChamber_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x58db9
dbw MAPCALLBACK_TILES, UnknownScript_0x58db9
UnknownScript_0x58dad:
checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER

2
maps/RuinsofAlphHoOhChamber.asm
View File

@ -12,7 +12,7 @@ RuinsofAlphHoOhChamber_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x5857c
dbw MAPCALLBACK_TILES, UnknownScript_0x5857c
UnknownScript_0x5856d:
special SpecialHoOhChamber

2
maps/RuinsofAlphKabutoChamber.asm
View File

@ -15,7 +15,7 @@ RuinsofAlphKabutoChamber_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x58737
dbw MAPCALLBACK_TILES, UnknownScript_0x58737
UnknownScript_0x5872b:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER

2
maps/RuinsofAlphOmanyteChamber.asm
View File

@ -12,7 +12,7 @@ RuinsofAlphOmanyteChamber_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x58bf8
dbw MAPCALLBACK_TILES, UnknownScript_0x58bf8
UnknownScript_0x58be9:
special SpecialOmanyteChamber

2
maps/RuinsofAlphOutside.asm
View File

@ -18,7 +18,7 @@ RuinsofAlphOutside_MapScriptHeader:
; callbacks
dbw 2, UnknownScript_0x5800f
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x5800f
UnknownScript_0x5800d:
end

2
maps/RuinsofAlphResearchCenter.asm
View File

@ -16,7 +16,7 @@ RuinsofAlphResearchCenter_MapScriptHeader:
; callbacks
dbw 2, UnknownScript_0x59185
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x59185
UnknownScript_0x59180:
end

2
maps/SaffronCity.asm
View File

@ -16,7 +16,7 @@ SaffronCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_SAFFRON

2
maps/SilverCaveOutside.asm
View File

@ -7,7 +7,7 @@ SilverCaveOutside_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_SILVER_CAVE

2
maps/TeamRocketBaseB1F.asm
View File

@ -18,7 +18,7 @@ TeamRocketBaseB1F_MapScriptHeader:
; callbacks
dbw 2, .Callback1
dbw MAPCALLBACK_OBJECTS, .Callback1
.Trigger0:
end

2
maps/TeamRocketBaseB2F.asm
View File

@ -29,7 +29,7 @@ TeamRocketBaseB2F_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x6cf89
dbw MAPCALLBACK_TILES, UnknownScript_0x6cf89
UnknownScript_0x6cf85:
end

2
maps/TeamRocketBaseB3F.asm
View File

@ -29,7 +29,7 @@ TeamRocketBaseB3F_MapScriptHeader:
; callbacks
dbw 1, .CheckGiovanniDoor
dbw MAPCALLBACK_TILES, .CheckGiovanniDoor
.Trigger0:
priorityjump LanceScript_0x6dffc

2
maps/TimeCapsule.asm
View File

@ -15,7 +15,7 @@ TimeCapsule_MapScriptHeader:
; callbacks
dbw 2, TimeCapsule_SetWhichChris
dbw MAPCALLBACK_OBJECTS, TimeCapsule_SetWhichChris
.Trigger0:
priorityjump TimeCapsule_Initialize

4
maps/TinTower1F.asm
View File

@ -23,9 +23,9 @@ TinTower1F_MapScriptHeader:
; callbacks
dbw 2, UnknownScript_0x18502f
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18502f
dbw 1, UnknownScript_0x185084
dbw MAPCALLBACK_TILES, UnknownScript_0x185084
UnknownScript_0x18502a:
priorityjump UnknownScript_0x18508f

2
maps/TinTowerRoof.asm
View File

@ -10,7 +10,7 @@ TinTowerRoof_MapScriptHeader:
; callbacks
dbw 2, UnknownScript_0x77230
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x77230
UnknownScript_0x77230:
checkevent EVENT_FOUGHT_HO_OH

2
maps/TradeCenter.asm
View File

@ -15,7 +15,7 @@ TradeCenter_MapScriptHeader:
; callbacks
dbw 2, TradeCenter_SetWhichChris
dbw MAPCALLBACK_OBJECTS, TradeCenter_SetWhichChris
.Trigger0:
priorityjump TradeCenter_Initialize

2
maps/UndergroundPathSwitchRoomEntrances.asm
View File

@ -56,7 +56,7 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader:
; callbacks
dbw 1, .UpdateDoorPositions
dbw MAPCALLBACK_TILES, .UpdateDoorPositions
.Trigger0:
end

2
maps/UndergroundWarehouse.asm
View File

@ -16,7 +16,7 @@ UndergroundWarehouse_MapScriptHeader:
; callbacks
dbw 5, .ResetSwitches
dbw MAPCALLBACK_NEWMAP, .ResetSwitches
.ResetSwitches:
clearevent EVENT_SWITCH_1

2
maps/UnionCaveB2F.asm
View File

@ -15,7 +15,7 @@ UnionCaveB2F_MapScriptHeader:
; callbacks
dbw 2, UnknownScript_0x5a30d
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x5a30d
UnknownScript_0x5a30d:
checkflag ENGINE_UNION_CAVE_LAPRAS

2
maps/VermilionCity.asm
View File

@ -14,7 +14,7 @@ VermilionCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_VERMILION

2
maps/VermilionPort.asm
View File

@ -15,7 +15,7 @@ VermilionPort_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0
end

2
maps/VioletCity.asm
View File

@ -16,7 +16,7 @@ VioletCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_VIOLET

2
maps/ViridianCity.asm
View File

@ -12,7 +12,7 @@ ViridianCity_MapScriptHeader:
db 1
; callbacks
dbw 5, .FlyPoint
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
setflag ENGINE_FLYPOINT_VIRIDIAN

6
maps/WarehouseEntrance.asm
View File

@ -18,11 +18,11 @@ WarehouseEntrance_MapScriptHeader:
; 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

2
maps/WhirlIslandLugiaChamber.asm
View File

@ -10,7 +10,7 @@ WhirlIslandLugiaChamber_MapScriptHeader:
; callbacks
dbw 2, UnknownScript_0x18c504
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18c504
UnknownScript_0x18c504:
checkevent EVENT_FOUGHT_LUGIA

2
maps/WillsRoom.asm
View File

@ -14,7 +14,7 @@ WillsRoom_MapScriptHeader:
; callbacks
dbw 1, UnknownScript_0x1804cb
dbw MAPCALLBACK_TILES, UnknownScript_0x1804cb
UnknownScript_0x1804c6:
priorityjump UnknownScript_0x1804e0

2
maps/WiseTriosRoom.asm
View File

@ -19,7 +19,7 @@ WiseTriosRoom_MapScriptHeader:
; callbacks
dbw 2, UnknownScript_0x98574
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x98574
UnknownScript_0x98572:
end

4
misc/mobile_40.asm
View File

@ -3061,7 +3061,7 @@ Function1013aa: ; 1013aa
call ReloadTilesetAndPalettes
callba Function106464
call UpdateSprites
call Function2b5c
call FinishExitMenu
ret
; 1013c0
@ -3069,7 +3069,7 @@ Function1013c0: ; 1013c0
callba BlankScreen
callba MobileFunc_106462
callba Function106464
call Function2b5c
call FinishExitMenu
ret
; 1013d6

2
misc/mobile_46.asm
View File

@ -5573,7 +5573,7 @@ Function11a9ce: ; 11a9ce
callba MobileFunc_106462
callba Function106464
call ret_d90
callba Function2b5c
callba FinishExitMenu
call UpdateSprites
ret
; 11a9f0

2
misc/mobile_5f.asm
View File

@ -4708,7 +4708,7 @@ Function17f555: ; 17f555
Function17f5c3: ; 17f5c3
call Function17f5e4
callba Function2b5c
callba FinishExitMenu
ld a, $1
ld [wc303], a
ret

14
wram.asm
View File

@ -1905,6 +1905,8 @@ MenuItemsList::
CurFruitTree::
CurInput::
wElevatorPointerBank::
wCurCoordEventTriggerID::
wCurSignpostYCoord::
EngineBuffer1:: ; d03e
ds 1
@ -1913,24 +1915,30 @@ wJumpStdScriptBuffer::
CurFruit:: ; d03f
MartPointerBank::
wElevatorPointerLo::
wCurCoordEventMapY::
wCurSignpostXCoord::
EngineBuffer2::
ds 1
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 @@ wCurrentCaller:: ds 2
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::