diff options
| author | yenatch <yenatch@gmail.com> | 2015-07-21 02:04:38 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-07-21 02:04:38 -0400 |
| commit | 0b5471f385d3cc66bb4ae7aa4191ce3af9f50cac (patch) | |
| tree | 61cb1021673d8a9b7b1cdddc64d90053a8476e8b /maps/Route2946Gate.asm | |
| parent | 006fc875971c92f2249f47b5fd120c5df76c6883 (diff) | |
| parent | d5ddd9e54ec2422d6f1cd7c561c1750512d0a81d (diff) | |
Merge pull request #302 from PikalaxALT/more_enum
More enum
Diffstat (limited to 'maps/Route2946Gate.asm')
| -rw-r--r-- | maps/Route2946Gate.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index b0aafb185..aeb67342a 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -1,8 +1,8 @@ Route2946Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x7b5bb: @@ -36,20 +36,20 @@ Route2946Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_ROUTE_46, MAP_ROUTE_46 warp_def $0, $5, 2, GROUP_ROUTE_46, MAP_ROUTE_46 warp_def $7, $4, 1, GROUP_ROUTE_29, MAP_ROUTE_29 warp_def $7, $5, 1, GROUP_ROUTE_29, MAP_ROUTE_29 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, -1 - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, -1 + person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x7b5bb, -1 + person_event SPRITE_YOUNGSTER, 8, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x7b5be, -1 |