All map triggers use the maptrigger macro, not dw

.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

View File

@@ -6,26 +6,22 @@ const_value set 2
RuinsOfAlphInnerChamber_MapScriptHeader:
.MapTriggers:
db 2
; triggers
dw UnknownScript_0x58f69, 0
dw UnknownScript_0x58f6a, 0
maptrigger .DummyTrigger0
maptrigger .UnownAppear
.MapCallbacks:
db 0
UnknownScript_0x58f69:
.DummyTrigger0:
end
UnknownScript_0x58f6a:
priorityjump UnknownScript_0x58f6e
UnknownScript_0x58f6d:
.UnownAppear:
priorityjump .StrangePresenceScript
end
UnknownScript_0x58f6e:
.StrangePresenceScript:
opentext
writetext UnknownText_0x58f89
writetext RuinsOfAlphStrangePresenceText
waitbutton
closetext
dotrigger $0
@@ -33,30 +29,30 @@ UnknownScript_0x58f6e:
clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
end
FisherScript_0x58f7d:
jumptextfaceplayer UnknownText_0x58fac
RuinsOfAlphInnerChamberFisherScript:
jumptextfaceplayer RuinsOfAlphInnerChamberFisherText
TeacherScript_0x58f80:
jumptextfaceplayer UnknownText_0x58fda
RuinsOfAlphInnerChamberTeacherScript:
jumptextfaceplayer RuinsOfAlphInnerChamberTeacherText
GrampsScript_0x58f83:
jumptextfaceplayer UnknownText_0x59024
RuinsOfAlphInnerChamberGrampsScript:
jumptextfaceplayer RuinsOfAlphInnerChamberGrampsText
RuinsOfAlphInnerChamberStatueScript:
jumptext UnknownText_0x59072
RuinsOfAlphInnerChamberStatue:
jumptext RuinsOfAlphInnerChamberStatueText
UnknownText_0x58f89:
RuinsOfAlphStrangePresenceText:
text "There is a strange"
line "presence here…"
done
UnknownText_0x58fac:
RuinsOfAlphInnerChamberFisherText:
text "This is a big"
line "room, but there's"
cont "nothing here."
done
UnknownText_0x58fda:
RuinsOfAlphInnerChamberTeacherText:
text "This place has a"
line "mystical quality"
cont "to it."
@@ -65,7 +61,7 @@ UnknownText_0x58fda:
line "ethereal even."
done
UnknownText_0x59024:
RuinsOfAlphInnerChamberGrampsText:
text "Ancient buildings"
line "are often tombs of"
cont "kings."
@@ -74,7 +70,7 @@ UnknownText_0x59024:
line "for instance."
done
UnknownText_0x59072:
RuinsOfAlphInnerChamberStatueText:
text "It's a replica of"
line "an ancient #-"
cont "MON."
@@ -101,35 +97,35 @@ RuinsOfAlphInnerChamber_MapEventHeader:
.Signposts:
db 26
signpost 3, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 3, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 3, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 3, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 3, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 3, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 8, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 8, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 8, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 8, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 8, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 8, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 13, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 13, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 18, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 18, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 18, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 18, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 18, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 18, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 24, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 24, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 24, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 24, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 24, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 24, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript
signpost 3, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 3, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 3, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 3, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 3, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 3, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 8, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 8, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 8, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 8, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 8, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 8, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 13, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 13, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 18, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 18, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 18, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 18, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 18, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 18, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 24, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 24, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 24, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 24, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 24, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
signpost 24, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue
.PersonEvents:
db 3
person_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
person_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS