summaryrefslogtreecommitdiff
path: root/maps/Route33.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route33.asm')
-rw-r--r--maps/Route33.asm185
1 files changed, 71 insertions, 114 deletions
diff --git a/maps/Route33.asm b/maps/Route33.asm
index 48c6a856a..f71be809c 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -1,203 +1,164 @@
-Route33_MapScriptHeader: ; 0x1ac000
- ; trigger count
+Route33_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x1ac002
-LassScript_0x1ac002: ; 0x1ac002
+LassScript_0x1ac002:
jumptextfaceplayer UnknownText_0x1ac1e7
-; 0x1ac005
-TrainerHikerAnthony2: ; 0x1ac005
- ; bit/flag number
- dw $528
+TrainerHikerAnthony:
+ trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, $0000, HikerAnthony2Script
- ; trainer group && trainer id
- db HIKER, ANTHONY2
-
- ; text when seen
- dw HikerAnthony2SeenText
-
- ; text when trainer beaten
- dw HikerAnthony2BeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw HikerAnthony2Script
-; 0x1ac011
-
-HikerAnthony2Script: ; 0x1ac011
- writecode $17, $13
+HikerAnthony2Script:
+ writecode VAR_CALLERID, PHONE_HIKER_ANTHONY
talkaftercancel
loadfont
- checkflag $006f
+ checkflag ENGINE_ANTHONY
iftrue UnknownScript_0x1ac051
- checkflag $00a0
+ checkflag ENGINE_DUNSPARCE_SWARM
iftrue UnknownScript_0x1ac0c5
- checkcellnum $13
+ checkcellnum PHONE_HIKER_ANTHONY
iftrue UnknownScript_0x1ac0d7
- checkevent $027b
+ checkevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1ac03a
writetext UnknownText_0x1ac153
keeptextopen
- setevent $027b
+ setevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1ac0cb
jump UnknownScript_0x1ac03d
-; 0x1ac03a
-UnknownScript_0x1ac03a: ; 0x1ac03a
+UnknownScript_0x1ac03a:
scall UnknownScript_0x1ac0cf
-UnknownScript_0x1ac03d: ; 0x1ac03d
- askforphonenumber $13
+UnknownScript_0x1ac03d:
+ askforphonenumber PHONE_HIKER_ANTHONY
if_equal $1, UnknownScript_0x1ac0df
if_equal $2, UnknownScript_0x1ac0db
trainertotext HIKER, ANTHONY2, $0
scall UnknownScript_0x1ac0d3
jump UnknownScript_0x1ac0d7
-; 0x1ac051
-UnknownScript_0x1ac051: ; 0x1ac051
+UnknownScript_0x1ac051:
scall UnknownScript_0x1ac0e3
winlosstext HikerAnthony2BeatenText, $0000
- copybytetovar wd9fd
- if_equal $4, UnknownScript_0x1ac070
- if_equal $3, UnknownScript_0x1ac076
- if_equal $2, UnknownScript_0x1ac07c
- if_equal $1, UnknownScript_0x1ac082
- if_equal $0, UnknownScript_0x1ac088
-UnknownScript_0x1ac070: ; 0x1ac070
+ copybytetovar wAnthonyFightCount
+ if_equal 4, .Fight4
+ if_equal 3, .Fight3
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight4
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x1ac0bc
-UnknownScript_0x1ac076: ; 0x1ac076
+ iftrue .LoadFight4
+.Fight3
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1ac0af
-UnknownScript_0x1ac07c: ; 0x1ac07c
+ iftrue .LoadFight3
+.Fight2
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x1ac0a2
-UnknownScript_0x1ac082: ; 0x1ac082
- checkflag $0047
- iftrue UnknownScript_0x1ac095
-UnknownScript_0x1ac088: ; 0x1ac088
+ iftrue .LoadFight2
+.Fight1
+ checkflag ENGINE_FLYPOINT_OLIVINE
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer HIKER, ANTHONY2
startbattle
returnafterbattle
- loadvar wd9fd, $1
- clearflag $006f
+ loadvar wAnthonyFightCount, 1
+ clearflag ENGINE_ANTHONY
end
-; 0x1ac095
-UnknownScript_0x1ac095: ; 0x1ac095
+.LoadFight1
loadtrainer HIKER, ANTHONY1
startbattle
returnafterbattle
- loadvar wd9fd, $2
- clearflag $006f
+ loadvar wAnthonyFightCount, 2
+ clearflag ENGINE_ANTHONY
end
-; 0x1ac0a2
-UnknownScript_0x1ac0a2: ; 0x1ac0a2
+.LoadFight2
loadtrainer HIKER, ANTHONY3
startbattle
returnafterbattle
- loadvar wd9fd, $3
- clearflag $006f
+ loadvar wAnthonyFightCount, 3
+ clearflag ENGINE_ANTHONY
end
-; 0x1ac0af
-UnknownScript_0x1ac0af: ; 0x1ac0af
+.LoadFight3
loadtrainer HIKER, ANTHONY4
startbattle
returnafterbattle
- loadvar wd9fd, $4
- clearflag $006f
+ loadvar wAnthonyFightCount, 4
+ clearflag ENGINE_ANTHONY
end
-; 0x1ac0bc
-UnknownScript_0x1ac0bc: ; 0x1ac0bc
+.LoadFight4
loadtrainer HIKER, ANTHONY5
startbattle
returnafterbattle
- clearflag $006f
+ clearflag ENGINE_ANTHONY
end
-; 0x1ac0c5
-UnknownScript_0x1ac0c5: ; 0x1ac0c5
+UnknownScript_0x1ac0c5:
writetext UnknownText_0x1ac180
closetext
loadmovesprites
end
-; 0x1ac0cb
-UnknownScript_0x1ac0cb: ; 0x1ac0cb
+UnknownScript_0x1ac0cb:
jumpstd asknumber1m
end
-; 0x1ac0cf
-UnknownScript_0x1ac0cf: ; 0x1ac0cf
+UnknownScript_0x1ac0cf:
jumpstd asknumber2m
end
-; 0x1ac0d3
-UnknownScript_0x1ac0d3: ; 0x1ac0d3
+UnknownScript_0x1ac0d3:
jumpstd registerednumberm
end
-; 0x1ac0d7
-UnknownScript_0x1ac0d7: ; 0x1ac0d7
+UnknownScript_0x1ac0d7:
jumpstd numberacceptedm
end
-; 0x1ac0db
-UnknownScript_0x1ac0db: ; 0x1ac0db
+UnknownScript_0x1ac0db:
jumpstd numberdeclinedm
end
-; 0x1ac0df
-UnknownScript_0x1ac0df: ; 0x1ac0df
+UnknownScript_0x1ac0df:
jumpstd phonefullm
end
-; 0x1ac0e3
-UnknownScript_0x1ac0e3: ; 0x1ac0e3
+UnknownScript_0x1ac0e3:
jumpstd rematchm
end
-; 0x1ac0e7
-MapRoute33Signpost0Script: ; 0x1ac0e7
+MapRoute33Signpost0Script:
jumptext UnknownText_0x1ac279
-; 0x1ac0ea
-FruitTreeScript_0x1ac0ea: ; 0x1ac0ea
+FruitTreeScript_0x1ac0ea:
fruittree $6
-; 0x1ac0ec
-HikerAnthony2SeenText: ; 0x1ac0ec
+HikerAnthony2SeenText:
text "I came through the"
line "tunnel, but I"
para "still have plenty"
line "of energy left."
done
-; 0x1ac130
-HikerAnthony2BeatenText: ; 0x1ac130
+HikerAnthony2BeatenText:
text "Whoa! You've got"
line "more zip than me!"
done
-; 0x1ac153
-UnknownText_0x1ac153: ; 0x1ac153
+UnknownText_0x1ac153:
text "We HIKERS are at"
line "our best in the"
cont "mountains."
done
-; 0x1ac180
-UnknownText_0x1ac180: ; 0x1ac180
+UnknownText_0x1ac180:
text "Hey, did you get a"
line "DUNSPARCE?"
@@ -207,9 +168,8 @@ UnknownText_0x1ac180: ; 0x1ac180
line "in the light. It's"
cont "got a funny face!"
done
-; 0x1ac1e7
-UnknownText_0x1ac1e7: ; 0x1ac1e7
+UnknownText_0x1ac1e7:
text "Pant, pant…"
para "I finally got"
@@ -224,31 +184,28 @@ UnknownText_0x1ac1e7: ; 0x1ac1e7
para "thing, so I came"
line "outside."
done
-; 0x1ac279
-UnknownText_0x1ac279: ; 0x1ac279
+UnknownText_0x1ac279:
text "ROUTE 33"
done
-; 0x1ac283
-Route33_MapEventHeader: ; 0x1ac283
+Route33_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 1
warp_def $9, $b, 3, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 1
- signpost 11, 11, $0, MapRoute33Signpost0Script
+ signpost 11, 11, SIGNPOST_READ, MapRoute33Signpost0Script
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony2, $ffff
- person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, $ffff
- person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, $ffff
-; 0x1ac2ba
+ person_event SPRITE_POKEFAN_M, 17, 10, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerAnthony, -1
+ person_event SPRITE_LASS, 20, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x1ac002, -1
+ person_event SPRITE_FRUIT_TREE, 20, 18, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac0ea, -1