summaryrefslogtreecommitdiff
path: root/maps/ViridianGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/ViridianGym.asm')
-rw-r--r--maps/ViridianGym.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index b6d2c985e..30aa729b2 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -1,8 +1,8 @@
ViridianGym_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
BlueScript_0x9aa26:
@@ -168,20 +168,20 @@ ViridianGym_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $11, $4, 1, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY
warp_def $11, $5, 1, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 13, 3, $0, ViridianGymStatue
- signpost 13, 6, $0, ViridianGymStatue
+ signpost 13, 3, SIGNPOST_READ, ViridianGymStatue
+ signpost 13, 6, SIGNPOST_READ, ViridianGymStatue
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_BLUE, 7, 9, $6, $0, 255, 255, $0, 0, BlueScript_0x9aa26, EVENT_776
- person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, ViridianGymGuyScript, EVENT_776
+ person_event SPRITE_BLUE, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, BlueScript_0x9aa26, EVENT_VIRIDIAN_GYM_BLUE
+ person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE