Macro update, roam mon annotations

Updated map and mapgroup macros to get around an rgbds bug.

Legendary beast locale handling annotated and relabeled.

Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function.  This will make it easier for modders to add or remove engine flags.
This commit is contained in:
PikalaxALT
2015-07-25 14:25:37 -04:00
parent 432df825d4
commit 6c3000efd2
26 changed files with 760 additions and 729 deletions

View File

@@ -3,30 +3,30 @@ GoldenrodMagnetTrainStation_MapScriptHeader:
db 1
; triggers
dw UnknownScript_0x550eb, $0000
dw .Trigger1, $0000
.MapCallbacks:
db 0
UnknownScript_0x550eb:
.Trigger1:
end
OfficerScript_0x550ec:
faceplayer
loadfont
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x550fa
iftrue .MagnetTrainToSaffron
writetext UnknownText_0x55160
closetext
loadmovesprites
end
UnknownScript_0x550fa:
.MagnetTrainToSaffron:
writetext UnknownText_0x551b7
yesorno
iffalse UnknownScript_0x5512a
iffalse .DecidedNotToRide
checkitem PASS
iffalse UnknownScript_0x55124
iffalse .PassNotInBag
writetext UnknownText_0x551ed
closetext
loadmovesprites
@@ -36,27 +36,27 @@ UnknownScript_0x550fa:
special Special_MagnetTrain
warpcheck
newloadmap $f9
applymovement $0, MovementData_0x55122
applymovement $0, .MovementBoardTheTrain
wait $14
end
MovementData_0x55122:
.MovementBoardTheTrain:
turn_head_down
step_end
UnknownScript_0x55124:
.PassNotInBag:
writetext UnknownText_0x5522c
closetext
loadmovesprites
end
UnknownScript_0x5512a:
.DecidedNotToRide:
writetext UnknownText_0x5524f
closetext
loadmovesprites
end
UnknownScript_0x55130:
Script_ArriveFromSaffron:
applymovement $2, MovementData_0x55146
applymovement $0, MovementData_0x55158
applymovement $2, MovementData_0x5514b
@@ -175,7 +175,7 @@ GoldenrodMagnetTrainStation_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 0, $6, $b, $0, UnknownScript_0x55130, $0, $0
xy_trigger 0, $6, $b, $0, Script_ArriveFromSaffron, $0, $0
.Signposts:
db 0

View File

@@ -86,7 +86,7 @@ UnknownScript_0x6c38f:
writetext UnknownText_0x6c59e
closetext
showemote EMOTE_SHOCK, $2, 10
playsound SFX_UNKNOWN_2A
playsound SFX_FAINT
changeblock $6, $2, $1e
reloadmappart
loadmovesprites

View File

@@ -3,30 +3,30 @@ SaffronTrainStation_MapScriptHeader:
db 1
; triggers
dw UnknownScript_0x18a81d, $0000
dw .Trigger1, $0000
.MapCallbacks:
db 0
UnknownScript_0x18a81d:
.Trigger1:
end
OfficerScript_0x18a81e:
faceplayer
loadfont
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x18a82c
iftrue .MagnetTrainToGoldenrod
writetext UnknownText_0x18a8a9
closetext
loadmovesprites
end
UnknownScript_0x18a82c:
.MagnetTrainToGoldenrod:
writetext UnknownText_0x18a8dd
yesorno
iffalse UnknownScript_0x18a85c
iffalse .DecidedNotToRide
checkitem PASS
iffalse UnknownScript_0x18a856
iffalse .PassNotInBag
writetext UnknownText_0x18a917
closetext
loadmovesprites
@@ -36,27 +36,27 @@ UnknownScript_0x18a82c:
special Special_MagnetTrain
warpcheck
newloadmap $f9
applymovement $0, MovementData_0x18a854
applymovement $0, .MovementBoardTheTrain
wait $14
end
MovementData_0x18a854:
.MovementBoardTheTrain:
turn_head_down
step_end
UnknownScript_0x18a856:
.PassNotInBag:
writetext UnknownText_0x18a956
closetext
loadmovesprites
end
UnknownScript_0x18a85c:
.DecidedNotToRide:
writetext UnknownText_0x18a978
closetext
loadmovesprites
end
UnknownScript_0x18a862:
Script_ArriveFromGoldenrod:
applymovement $2, MovementData_0x18a88f
applymovement $0, MovementData_0x18a8a1
applymovement $2, MovementData_0x18a894
@@ -224,7 +224,7 @@ SaffronTrainStation_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 0, $6, $b, $0, UnknownScript_0x18a862, $0, $0
xy_trigger 0, $6, $b, $0, Script_ArriveFromGoldenrod, $0, $0
.Signposts:
db 0