summaryrefslogtreecommitdiff
path: root/maps/Route34IlexForestGate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route34IlexForestGate.asm')
-rw-r--r--maps/Route34IlexForestGate.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 51e160e08..8b55d58d5 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -1,8 +1,8 @@
Route34IlexForestGate_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 1
; callbacks
@@ -24,7 +24,7 @@ UnknownScript_0x62d38:
UnknownScript_0x62d3d:
checkevent EVENT_FOREST_IS_RESTLESS
iffalse UnknownScript_0x62d62
- showemote $0, $5, 20
+ showemote EMOTE_SHOCK, $5, 20
spriteface $5, LEFT
spriteface $0, RIGHT
follow $0, $5
@@ -136,23 +136,23 @@ Route34IlexForestGate_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $0, $4, 1, GROUP_ROUTE_34, MAP_ROUTE_34
warp_def $0, $5, 2, GROUP_ROUTE_34, MAP_ROUTE_34
warp_def $7, $4, 1, GROUP_ILEX_FOREST, MAP_ILEX_FOREST
warp_def $7, $5, 1, GROUP_ILEX_FOREST, MAP_ILEX_FOREST
- ; xy triggers
+.XYTriggers:
db 1
xy_trigger 0, $7, $4, $0, UnknownScript_0x62d3d, $0, $0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 4
- person_event SPRITE_TEACHER, 7, 13, $8, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EA
- person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, -1
- person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, EVENT_6EB
- person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EC
+ person_event SPRITE_TEACHER, 7, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
+ person_event SPRITE_BUTTERFREE, 8, 13, OW_UP | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ButterfreeScript_0x62d8a, -1
+ person_event SPRITE_LASS, 8, 7, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
+ person_event SPRITE_TEACHER, 11, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY