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/VermilionMart.asm | |
| parent | 006fc875971c92f2249f47b5fd120c5df76c6883 (diff) | |
| parent | d5ddd9e54ec2422d6f1cd7c561c1750512d0a81d (diff) | |
Merge pull request #302 from PikalaxALT/more_enum
More enum
Diffstat (limited to 'maps/VermilionMart.asm')
| -rw-r--r-- | maps/VermilionMart.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 08549a33b..2054323ff 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,8 +1,8 @@ VermilionMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x191f7e: @@ -35,19 +35,19 @@ VermilionMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 5, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, -1 - person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, -1 - person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x191f7e, -1 + person_event SPRITE_SUPER_NERD, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x191f85, -1 + person_event SPRITE_BUENA, 10, 12, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x191f88, -1 |