summaryrefslogtreecommitdiff
path: root/maps/BurnedTower1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/BurnedTower1F.asm')
-rw-r--r--maps/BurnedTower1F.asm142
1 files changed, 56 insertions, 86 deletions
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index f85059398..b1e0dc278 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -1,5 +1,5 @@
-BurnedTower1F_MapScriptHeader: ; 0x185be1
- ; trigger count
+BurnedTower1F_MapScriptHeader:
+.MapTriggers:
db 3
; triggers
@@ -7,42 +7,37 @@ BurnedTower1F_MapScriptHeader: ; 0x185be1
dw UnknownScript_0x185bf6, $0000
dw UnknownScript_0x185bf7, $0000
- ; callback count
+.MapCallbacks:
db 1
; callbacks
dbw 1, UnknownScript_0x185bf8
-; 0x185bf2
-UnknownScript_0x185bf2: ; 0x185bf2
+UnknownScript_0x185bf2:
priorityjump UnknownScript_0x185c0d
end
-; 0x185bf6
-UnknownScript_0x185bf6: ; 0x185bf6
+UnknownScript_0x185bf6:
end
-; 0x185bf7
-UnknownScript_0x185bf7: ; 0x185bf7
+UnknownScript_0x185bf7:
end
-; 0x185bf8
-UnknownScript_0x185bf8: ; 0x185bf8
- checkevent $0332
- iftrue UnknownScript_0x185c02
- changeblock $a, $8, $32
-UnknownScript_0x185c02: ; 0x185c02
+UnknownScript_0x185bf8:
+ checkevent EVENT_HOLE_IN_BURNED_TOWER
+ iftrue .Next
+ changeblock $a, $8, $32 ; hole
+.Next
checkevent EVENT_RELEASED_THE_BEASTS
- iftrue UnknownScript_0x185c0c
- changeblock $6, $e, $9
-UnknownScript_0x185c0c: ; 0x185c0c
+ iftrue .Done
+ changeblock $6, $e, $9 ; ladder
+.Done
return
-; 0x185c0d
-UnknownScript_0x185c0d: ; 0x185c0d
+UnknownScript_0x185c0d:
spriteface $3, DOWN
- showemote $0, $3, 15
+ showemote EMOTE_SHOCK, $3, 15
applymovement $3, MovementData_0x185cd3
loadfont
writetext UnknownText_0x185ecc
@@ -51,10 +46,9 @@ UnknownScript_0x185c0d: ; 0x185c0d
moveperson $3, $9, $e
dotrigger $1
end
-; 0x185c25
-UnknownScript_0x185c25: ; 0x185c25
- showemote $0, $4, 15
+UnknownScript_0x185c25:
+ showemote EMOTE_SHOCK, $4, 15
special Functionc48f
pause 15
spriteface $4, RIGHT
@@ -77,9 +71,8 @@ UnknownScript_0x185c25: ; 0x185c25
reloadmapmusic
returnafterbattle
jump UnknownScript_0x185c80
-; 0x185c60
-UnknownScript_0x185c60: ; 0x185c60
+UnknownScript_0x185c60:
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
setlasttalked $4
loadtrainer RIVAL1, RIVAL1_7
@@ -87,9 +80,8 @@ UnknownScript_0x185c60: ; 0x185c60
reloadmapmusic
returnafterbattle
jump UnknownScript_0x185c80
-; 0x185c70
-UnknownScript_0x185c70: ; 0x185c70
+UnknownScript_0x185c70:
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
setlasttalked $4
loadtrainer RIVAL1, RIVAL1_8
@@ -97,20 +89,19 @@ UnknownScript_0x185c70: ; 0x185c70
reloadmapmusic
returnafterbattle
jump UnknownScript_0x185c80
-; 0x185c80
-UnknownScript_0x185c80: ; 0x185c80
+UnknownScript_0x185c80:
playmusic MUSIC_RIVAL_AFTER
loadfont
writetext UnknownText_0x185de2
closetext
loadmovesprites
dotrigger $2
- setevent $06c5
+ setevent EVENT_RIVAL_BURNED_TOWER
special Functionc48f
pause 15
earthquake 50
- showemote $0, $0, 15
+ showemote EMOTE_SHOCK, $0, 15
playsound SFX_ENTER_DOOR
waitbutton
changeblock $a, $8, $25
@@ -118,69 +109,57 @@ UnknownScript_0x185c80: ; 0x185c80
pause 15
applymovement $0, MovementData_0x185cd1
playsound SFX_KINESIS
- showemote $0, $4, 20
+ showemote EMOTE_SHOCK, $4, 20
loadfont
writetext UnknownText_0x185e75
closetext
loadmovesprites
- setevent $0332
+ setevent EVENT_HOLE_IN_BURNED_TOWER
pause 15
warpcheck
end
-; 0x185cbc
-SuperNerdScript_0x185cbc: ; 0x185cbc
+SuperNerdScript_0x185cbc:
jumptextfaceplayer UnknownText_0x185f99
-; 0x185cbf
-MortyScript_0x185cbf: ; 0x185cbf
+MortyScript_0x185cbf:
jumptextfaceplayer UnknownText_0x186002
-; 0x185cc2
BurnedTower1FRock:
jumpstd smashrock
-MapBurnedTower1FSignpostItem0: ; 0x185cc5
- dw $0080
- db ETHER
+MapBurnedTower1FSignpostItem0:
+ dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
-; 0x185cc8
-MapBurnedTower1FSignpostItem1: ; 0x185cc8
- dw $00ff
- db ULTRA_BALL
+MapBurnedTower1FSignpostItem1:
+ dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
-; 0x185ccb
-ItemFragment_0x185ccb: ; 0x185ccb
+ItemFragment_0x185ccb:
db HP_UP, 1
-; 0x185ccd
-MovementData_0x185ccd: ; 0x185ccd
+MovementData_0x185ccd:
step_left
step_end
-; 0x185ccf
-MovementData_0x185ccf: ; 0x185ccf
+MovementData_0x185ccf:
step_right
step_end
-; 0x185cd1
-MovementData_0x185cd1: ; 0x185cd1
+MovementData_0x185cd1:
db $59 ; movement
step_end
-; 0x185cd3
-MovementData_0x185cd3: ; 0x185cd3
+MovementData_0x185cd3:
step_down
step_left
step_left
step_left
step_down
step_end
-; 0x185cd9
-UnknownText_0x185cd9: ; 0x185cd9
+UnknownText_0x185cd9:
text $56, " ", $56, " ", $56
para "…Oh, it's you."
@@ -203,9 +182,8 @@ UnknownText_0x185cd9: ; 0x185cd9
para "It's all your"
line "fault!"
done
-; 0x185d9b
-UnknownText_0x185d9b: ; 0x185d9b
+UnknownText_0x185d9b:
text "…Humph!"
para "This is why I hate"
@@ -214,9 +192,8 @@ UnknownText_0x185d9b: ; 0x185d9b
para "There's no"
line "challenge in it."
done
-; 0x185de2
-UnknownText_0x185de2: ; 0x185de2
+UnknownText_0x185de2:
text "…Aw, whatever."
para "You would never be"
@@ -225,9 +202,8 @@ UnknownText_0x185de2: ; 0x185de2
para "legendary #MON"
line "anyway."
done
-; 0x185e2c
-UnknownText_0x185e2c: ; 0x185e2c
+UnknownText_0x185e2c:
text "…Humph!"
para "This is why I hate"
@@ -236,9 +212,8 @@ UnknownText_0x185e2c: ; 0x185e2c
para "It's just a waste"
line "of my time."
done
-; 0x185e75
-UnknownText_0x185e75: ; 0x185e75
+UnknownText_0x185e75:
text "Humph!"
para "What are you doing"
@@ -249,9 +224,8 @@ UnknownText_0x185e75: ; 0x185e75
para "Serves you right!"
done
-; 0x185ecc
-UnknownText_0x185ecc: ; 0x185ecc
+UnknownText_0x185ecc:
text "EUSINE: My name's"
line "EUSINE."
@@ -273,9 +247,8 @@ UnknownText_0x185ecc: ; 0x185ecc
para "But where exactly"
line "could it be?"
done
-; 0x185f99
-UnknownText_0x185f99: ; 0x185f99
+UnknownText_0x185f99:
text "EUSINE: I heard"
line "that SUICUNE is in"
@@ -285,9 +258,8 @@ UnknownText_0x185f99: ; 0x185f99
para "But where exactly"
line "could it be?"
done
-; 0x186002
-UnknownText_0x186002: ; 0x186002
+UnknownText_0x186002:
text "MORTY: ECRUTEAK's"
line "GYM LEADER has to"
@@ -304,13 +276,12 @@ UnknownText_0x186002: ; 0x186002
para "investigate the"
line "TOWER with him."
done
-; 0x1860b2
-BurnedTower1F_MapEventHeader: ; 0x1860b2
+BurnedTower1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 14
warp_def $f, $9, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $f, $a, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
@@ -327,20 +298,19 @@ BurnedTower1F_MapEventHeader: ; 0x1860b2
warp_def $e, $f, 5, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $f, $7, 6, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
- ; xy triggers
+.XYTriggers:
db 1
xy_trigger 1, $9, $b, $0, UnknownScript_0x185c25, $0, $0
- ; signposts
+.Signposts:
db 2
- signpost 7, 8, $7, MapBurnedTower1FSignpostItem0
- signpost 11, 13, $7, MapBurnedTower1FSignpostItem1
+ signpost 7, 8, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem0
+ signpost 11, 13, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem1
- ; people-events
+.PersonEvents:
db 5
- person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, $ffff
- person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, $0765
- person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, $06c5
- person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, $0764
- person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ccb, $0656
-; 0x186151
+ person_event SPRITE_ROCK, 8, 19, OW_LEFT | $10, $0, -1, -1, $0, 0, BurnedTower1FRock, -1
+ person_event SPRITE_SUPER_NERD, 16, 16, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
+ person_event SPRITE_SILVER, 13, 12, OW_LEFT | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
+ person_event SPRITE_MORTY, 18, 18, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
+ person_event SPRITE_POKE_BALL, 6, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP