summaryrefslogtreecommitdiff
path: root/maps/MahoganyRedGyaradosSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MahoganyRedGyaradosSpeechHouse.asm')
-rw-r--r--maps/MahoganyRedGyaradosSpeechHouse.asm42
1 files changed, 17 insertions, 25 deletions
diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
index 06c8feac3..347b64441 100644
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -1,32 +1,28 @@
-MahoganyRedGyaradosSpeechHouse_MapScriptHeader: ; 0x19997d
- ; trigger count
+MahoganyRedGyaradosSpeechHouse_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x19997f
-BlackBeltScript_0x19997f: ; 0x19997f
+BlackBeltScript_0x19997f:
jumptextfaceplayer UnknownText_0x19999c
-; 0x199982
-TeacherScript_0x199982: ; 0x199982
+TeacherScript_0x199982:
faceplayer
loadfont
- checkflag $0013
+ checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0x199990
writetext UnknownText_0x199a0e
closetext
loadmovesprites
end
-; 0x199990
-UnknownScript_0x199990: ; 0x199990
+UnknownScript_0x199990:
writetext UnknownText_0x199a3d
closetext
loadmovesprites
end
-; 0x199996
UnknownScript_0x195996:
jumpstd picturebookshelf
@@ -34,7 +30,7 @@ UnknownScript_0x195996:
UnknownScript_0x195999:
jumpstd magazinebookshelf
-UnknownText_0x19999c: ; 0x19999c
+UnknownText_0x19999c:
text "I heard that a red"
line "GYARADOS appeared"
cont "at the LAKE."
@@ -45,41 +41,37 @@ UnknownText_0x19999c: ; 0x19999c
para "GYARADOS are rare"
line "in that lake…"
done
-; 0x199a0e
-UnknownText_0x199a0e: ; 0x199a0e
+UnknownText_0x199a0e:
text "My favorite radio"
line "program? I'd say"
cont "#MON MUSIC."
done
-; 0x199a3d
-UnknownText_0x199a3d: ; 0x199a3d
+UnknownText_0x199a3d:
text "I've been hearing"
line "laughter on the"
para "radio…"
line "It's creepy."
done
-; 0x199a72
-MahoganyRedGyaradosSpeechHouse_MapEventHeader: ; 0x199a72
+MahoganyRedGyaradosSpeechHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 2, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN
warp_def $7, $3, 2, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, $ffff
- person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, $ffff
-; 0x199a9c
+ person_event SPRITE_BLACK_BELT, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x19997f, -1
+ person_event SPRITE_TEACHER, 9, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x199982, -1