diff options
| author | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
| commit | 973721491c38aa3014f5b28982227a618d2f6b59 (patch) | |
| tree | e01415064e6da53a471d75b2eb0113846650322b /maps/Route2Gate.asm | |
| parent | a3c6931fa8edd09fcea678fd8d2e9988951380de (diff) | |
| parent | 0b5471f385d3cc66bb4ae7aa4191ce3af9f50cac (diff) | |
Merge remote-tracking branch 'kanzure/master' into gfx-script
Diffstat (limited to 'maps/Route2Gate.asm')
| -rw-r--r-- | maps/Route2Gate.asm | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 96fa34642..8a92a2cf6 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,16 +1,14 @@ -Route2Gate_MapScriptHeader: ; 0x9b950 - ; trigger count +Route2Gate_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x9b952 -ScientistScript_0x9b952: ; 0x9b952 +ScientistScript_0x9b952: jumptextfaceplayer UnknownText_0x9b955 -; 0x9b955 -UnknownText_0x9b955: ; 0x9b955 +UnknownText_0x9b955: text "Are you <PLAY_G>?" para "I work as PROF." @@ -23,26 +21,24 @@ UnknownText_0x9b955: ; 0x9b955 line "nearby in PALLET" cont "TOWN." done -; 0x9b9ca -Route2Gate_MapEventHeader: ; 0x9b9ca +Route2Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 3, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $0, $5, 4, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $7, $4, 2, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $7, $5, 2, GROUP_ROUTE_2, MAP_ROUTE_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, $ffff -; 0x9b9f1 + person_event SPRITE_SCIENTIST, 8, 10, OW_UP | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x9b952, -1 |