diff options
Diffstat (limited to 'maps/Route7SaffronGate.asm')
-rw-r--r-- | maps/Route7SaffronGate.asm | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index d23d9774a..f1e209da1 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,12 +1,11 @@ -Route7SaffronGate_MapScriptHeader: ; 0x73516 - ; trigger count +Route7SaffronGate_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x73518 -OfficerScript_0x73518: ; 0x73518 +OfficerScript_0x73518: faceplayer loadfont checkevent EVENT_RETURNED_MACHINE_PART @@ -15,16 +14,14 @@ OfficerScript_0x73518: ; 0x73518 closetext loadmovesprites end -; 0x73526 -UnknownScript_0x73526: ; 0x73526 +UnknownScript_0x73526: writetext UnknownText_0x73592 closetext loadmovesprites end -; 0x7352c -UnknownText_0x7352c: ; 0x7352c +UnknownText_0x7352c: text "Did you hear about" line "the accident at" cont "the POWER PLANT?" @@ -33,9 +30,8 @@ UnknownText_0x7352c: ; 0x7352c line "the East, close to" cont "LAVENDER TOWN." done -; 0x73592 -UnknownText_0x73592: ; 0x73592 +UnknownText_0x73592: text "I take my GUARD" line "job seriously." @@ -45,26 +41,24 @@ UnknownText_0x73592: ; 0x73592 para "OK. You can go" line "through." done -; 0x735e0 -Route7SaffronGate_MapEventHeader: ; 0x735e0 +Route7SaffronGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_ROUTE_7, MAP_ROUTE_7 warp_def $5, $0, 2, GROUP_ROUTE_7, MAP_ROUTE_7 warp_def $4, $9, 10, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $5, $9, 11, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, $ffff -; 0x73607 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x73518, -1 |