diff options
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/GoldenrodMagnetTrainStation.asm | 24 | ||||
| -rw-r--r-- | maps/MahoganyMart1F.asm | 2 | ||||
| -rw-r--r-- | maps/SaffronTrainStation.asm | 24 |
3 files changed, 25 insertions, 25 deletions
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 118c86945..2fbfeb2f5 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -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 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index d9eb48dbb..b08d110db 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -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 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index e9cd86b13..b5ddd8c08 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -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 |