Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files

34
maps/DragonShrine.asm
View File

@@ -7,22 +7,20 @@ const_value set 2
DragonShrine_MapScriptHeader:
.MapTriggers:
db 2
; triggers
maptrigger .Trigger0
maptrigger .Trigger1
maptrigger .DragonShrineTest
maptrigger .DummyTrigger
.MapCallbacks:
db 0
.Trigger0:
priorityjump DragonShrineTestScript
.DragonShrineTest:
priorityjump .DragonShrineTestScript
end
.Trigger1:
.DummyTrigger:
end
DragonShrineTestScript:
.DragonShrineTestScript:
applymovement PLAYER, MovementData_0x18d2bf
applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7
opentext
@@ -272,10 +270,10 @@ MenuDataHeader_0x18d215:
db $40 ; flags
db 04, 08 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d21d
dw .MenuData2
db 1 ; default option
MenuData2_0x18d21d:
.MenuData2:
db $81 ; flags
db 3 ; items
db "Pal@"
@@ -287,10 +285,10 @@ MenuDataHeader_0x18d234:
db $40 ; flags
db 04, 09 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d23c
dw .MenuData2
db 1 ; default option
MenuData2_0x18d23c:
.MenuData2:
db $81 ; flags
db 3 ; items
db "Strategy@"
@@ -302,10 +300,10 @@ MenuDataHeader_0x18d258:
db $40 ; flags
db 04, 05 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d260
dw .MenuData2
db 1 ; default option
MenuData2_0x18d260:
.MenuData2:
db $81 ; flags
db 3 ; items
db "Weak person@"
@@ -317,10 +315,10 @@ MenuDataHeader_0x18d283:
db $40 ; flags
db 04, 08 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d28b
dw .MenuData2
db 1 ; default option
MenuData2_0x18d28b:
.MenuData2:
db $81 ; flags
db 3 ; items
db "Love@"
@@ -332,10 +330,10 @@ MenuDataHeader_0x18d2a5:
db $40 ; flags
db 04, 12 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d2ad
dw .MenuData2
db 1 ; default option
MenuData2_0x18d2ad:
.MenuData2:
db $81 ; flags
db 3 ; items
db "Tough@"