summaryrefslogtreecommitdiff
path: root/maps/OlivineLighthouse1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/OlivineLighthouse1F.asm')
-rw-r--r--maps/OlivineLighthouse1F.asm34
1 files changed, 14 insertions, 20 deletions
diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
index 4b899ee6b..d63d7b039 100644
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -1,20 +1,17 @@
-OlivineLighthouse1F_MapScriptHeader: ; 0x5ae65
- ; trigger count
+OlivineLighthouse1F_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x5ae67
-SailorScript_0x5ae67: ; 0x5ae67
+SailorScript_0x5ae67:
jumptextfaceplayer UnknownText_0x5ae6d
-; 0x5ae6a
-PokefanFScript_0x5ae6a: ; 0x5ae6a
+PokefanFScript_0x5ae6a:
jumptextfaceplayer UnknownText_0x5aec2
-; 0x5ae6d
-UnknownText_0x5ae6d: ; 0x5ae6d
+UnknownText_0x5ae6d:
text "People train at"
line "this LIGHTHOUSE."
@@ -22,9 +19,8 @@ UnknownText_0x5ae6d: ; 0x5ae6d
line "climb because of"
cont "all the trainers."
done
-; 0x5aec2
-UnknownText_0x5aec2: ; 0x5aec2
+UnknownText_0x5aec2:
text "In the past, #-"
line "MON used to light"
@@ -35,13 +31,12 @@ UnknownText_0x5aec2: ; 0x5aec2
line "made in honor of"
cont "those #MON."
done
-; 0x5af36
-OlivineLighthouse1F_MapEventHeader: ; 0x5af36
+OlivineLighthouse1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 5
warp_def $11, $a, 9, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY
warp_def $11, $b, 9, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY
@@ -49,14 +44,13 @@ OlivineLighthouse1F_MapEventHeader: ; 0x5af36
warp_def $d, $10, 3, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F
warp_def $d, $11, 4, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, $ffff
- person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, $ffff
-; 0x5af6f
+ person_event SPRITE_SAILOR, 6, 12, OW_UP | $2, $0, -1, -1, $0, 0, SailorScript_0x5ae67, -1
+ person_event SPRITE_POKEFAN_F, 13, 20, OW_UP | $0, $20, -1, -1, $0, 0, PokefanFScript_0x5ae6a, -1