pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

All map triggers use the maptrigger macro, not dw

Browse Source 
.MapTriggers and .MapCallbacks lists are formatted consistently with .Warps, .XYTriggers, .Signposts, and .PersonEvents
This commit is contained in:
Remy Oukaour 2017-12-10 17:53:21 -05:00
parent 66527d861f
commit 62f5913943
133 changed files with 659 additions and 1082 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maps/AzaleaGym.asm
View File

@ -14,7 +14,7 @@ AzaleaGym_MapScriptHeader:
.MapCallbacks:
db 0
BugsyScript:
AzaleaGymBugsyScript:
faceplayer
opentext
checkevent EVENT_BEAT_BUGSY
@ -380,7 +380,7 @@ AzaleaGym_MapEventHeader:
.PersonEvents:
db 7
person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugsyScript, -1
person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1
person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherAl, -1
person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1

6
maps/AzaleaPokeCenter1F.asm
View File

@ -7,14 +7,12 @@ const_value set 2
AzaleaPokeCenter1F_MapScriptHeader:
.MapTriggers:
db 1
; triggers
maptrigger .Trigger0
maptrigger .DummyTrigger
.MapCallbacks:
db 0
.Trigger0:
.DummyTrigger:
end
AzaleaPokeCenter1FNurseScript:

16
maps/AzaleaTown.asm
View File

@ -15,25 +15,21 @@ const_value set 2
AzaleaTown_MapScriptHeader:
.MapTriggers:
db 3
; triggers
maptrigger .Trigger0
maptrigger .Trigger1
maptrigger .Trigger2
maptrigger .DummyTrigger0
maptrigger .DummyTrigger1
maptrigger .DummyTrigger2
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .Flypoint
.Trigger0:
.DummyTrigger0:
end
.Trigger1:
.DummyTrigger1:
end
.Trigger2:
.DummyTrigger2:
end
.Flypoint:

2
maps/BattleTower1F.asm
View File

@ -8,8 +8,6 @@ const_value set 2
BattleTower1F_MapScriptHeader:
.MapTriggers:
db 2
; triggers
maptrigger .Trigger0
maptrigger .Trigger1

6
maps/BattleTowerBattleRoom.asm
View File

@ -5,10 +5,8 @@ const_value set 2
BattleTowerBattleRoom_MapScriptHeader:
.MapTriggers:
db 2
; triggers
dw .EnterBattleRoom, 0
dw .DummyTrigger, 0
maptrigger .EnterBattleRoom
maptrigger .DummyTrigger
.MapCallbacks:
db 0

2
maps/BattleTowerElevator.asm
View File

@ -4,8 +4,6 @@ const_value set 2
BattleTowerElevator_MapScriptHeader:
.MapTriggers:
db 2
; triggers
maptrigger .Trigger0
maptrigger .Trigger1

2
maps/BattleTowerHallway.asm
View File

@ -4,8 +4,6 @@ const_value set 2
BattleTowerHallway_MapScriptHeader:
.MapTriggers:
db 2
; triggers
maptrigger .Trigger0
maptrigger .Trigger1

2
maps/BattleTowerOutside.asm
View File

@ -10,8 +10,6 @@ BattleTowerOutside_MapScriptHeader:
.MapCallbacks:
db 2
; callbacks
dbw MAPCALLBACK_TILES, .Callback1
dbw MAPCALLBACK_OBJECTS, .Callback2

2
maps/BlackthornCity.asm
View File

@ -15,8 +15,6 @@ BlackthornCity_MapScriptHeader:
.MapCallbacks:
db 2
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint
dbw MAPCALLBACK_OBJECTS, .Santos

2
maps/BlackthornGym1F.asm
View File

@ -11,8 +11,6 @@ BlackthornGym1F_MapScriptHeader:
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_TILES, .Boulders
.Boulders:

2
maps/BlackthornGym2F.asm
View File

@ -14,8 +14,6 @@ BlackthornGym2F_MapScriptHeader:
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_CMDQUEUE, .Boulders
.Boulders:

13
maps/BrunosRoom.asm
View File

@ -4,23 +4,18 @@ const_value set 2
BrunosRoom_MapScriptHeader:
.MapTriggers:
db 2
; triggers
dw .Trigger0, 0
dw .Trigger1, 0
maptrigger .LockDoor
maptrigger .DummyTrigger
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_TILES, .BrunosRoomDoors
.Trigger0:
.LockDoor:
priorityjump .BrunosDoorLocksBehindYou
end
.Trigger1:
.DummyTrigger:
end
.BrunosRoomDoors:

21
maps/BurnedTower1F.asm
View File

@ -8,27 +8,22 @@ const_value set 2
BurnedTower1F_MapScriptHeader:
.MapTriggers:
db 3
; triggers
maptrigger .Trigger0
maptrigger .Trigger1
maptrigger .Trigger2
maptrigger .EusineTrigger
maptrigger .DummyTrigger1
maptrigger .DummyTrigger2
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_TILES, .HoleAndLadder
.Trigger0:
priorityjump .EusineTrigger
.EusineTrigger:
priorityjump .MeetEusine
end
.Trigger1:
.DummyTrigger1:
end
.Trigger2:
.DummyTrigger2:
end
.HoleAndLadder:
@ -42,7 +37,7 @@ BurnedTower1F_MapScriptHeader:
.Done:
return
.EusineTrigger:
.MeetEusine:
spriteface BURNEDTOWER1F_EUSINE, DOWN
showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement

17
maps/BurnedTowerB1F.asm
View File

@ -12,25 +12,20 @@ const_value set 2
BurnedTowerB1F_MapScriptHeader:
.MapTriggers:
db 2
; triggers
dw .Trigger0, 0
dw .Trigger1, 0
maptrigger .DummyTrigger0
maptrigger .DummyTrigger1
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .LadderCallback
; callbacks
dbw MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback
.Trigger0:
.DummyTrigger0:
end
.Trigger1:
.DummyTrigger1:
end
BurnedTowerB1FLadderCallback:
.LadderCallback:
checkevent EVENT_RELEASED_THE_BEASTS
iftrue .NoChange
changeblock $6, $e, $2

2
maps/CeladonCity.asm
View File

@ -15,8 +15,6 @@ CeladonCity_MapScriptHeader:
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:

3
maps/CeladonDeptStore6F.asm
View File

@ -8,9 +8,6 @@ CeladonDeptStore6F_MapScriptHeader:
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_TILES, .Callback
.Callback:

2
maps/CeruleanCity.asm
View File

@ -12,8 +12,6 @@ CeruleanCity_MapScriptHeader:
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:

14
maps/CeruleanGym.asm
View File

@ -9,22 +9,20 @@ const_value set 2
CeruleanGym_MapScriptHeader:
.MapTriggers:
db 2
; triggers
dw UnknownScript_0x1883d9, 0
dw UnknownScript_0x1883da, 0
maptrigger .DummyTrigger0
maptrigger .GruntRunsOut
.MapCallbacks:
db 0
UnknownScript_0x1883d9:
.DummyTrigger0:
end
UnknownScript_0x1883da:
priorityjump UnknownScript_0x1883de
.GruntRunsOut:
priorityjump .GruntRunsOutScript
end
UnknownScript_0x1883de:
.GruntRunsOutScript:
applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3
playsound SFX_TACKLE
applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb

12
maps/CherrygroveCity.asm
View File

@ -8,21 +8,17 @@ const_value set 2
CherrygroveCity_MapScriptHeader:
.MapTriggers:
db 2
; triggers
maptrigger .Trigger0
maptrigger .Trigger1
maptrigger .DummyTrigger0
maptrigger .DummyTrigger1
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0:
.DummyTrigger0:
end
.Trigger1:
.DummyTrigger1:
end
.FlyPoint:

12
maps/CianwoodCity.asm
View File

@ -15,21 +15,17 @@ const_value set 2
CianwoodCity_MapScriptHeader:
.MapTriggers:
db 2
; triggers
maptrigger .Trigger0
maptrigger .Trigger1
maptrigger .DummyTrigger0
maptrigger .DummyTrigger1
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
.Trigger0:
.DummyTrigger0:
end
.Trigger1:
.DummyTrigger1:
end
.FlyPointAndSuicune:

Some files were not shown because too many files have changed in this diff Show More