summaryrefslogtreecommitdiff
path: root/maps/MahoganyRedGyaradosSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MahoganyRedGyaradosSpeechHouse.asm')
-rw-r--r--maps/MahoganyRedGyaradosSpeechHouse.asm22
1 files changed, 12 insertions, 10 deletions
diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
index 53159ea91..5984c89fb 100644
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -10,26 +10,28 @@ MahoganyRedGyaradosSpeechHouse_MapScripts:
MahoganyRedGyaradosSpeechHouseBlackBeltScript:
jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText
-TeacherScript_0x199982:
+MahoganyRedGyaradosSpeechHouseTeacherScript:
faceplayer
opentext
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
- iftrue UnknownScript_0x199990
- writetext UnknownText_0x199a0e
+ iftrue .RocketsInRadioTower
+ writetext MahoganyRedGyaradosSpeechHouseTeacherText
waitbutton
closetext
end
-UnknownScript_0x199990:
- writetext UnknownText_0x199a3d
+.RocketsInRadioTower:
+ writetext MahoganyRedGyaradosSpeechHouseTeacherText_RocketsInRadioTower
waitbutton
closetext
end
-UnknownScript_0x195996:
+MahoganyRedGyaradosSpeechHouseUnusedBookshelf1:
+; unused
jumpstd picturebookshelf
-UnknownScript_0x195999:
+MahoganyRedGyaradosSpeechHouseUnusedBookshelf2:
+; unused
jumpstd magazinebookshelf
MahoganyRedGyaradosSpeechHouseBlackBeltText:
@@ -44,13 +46,13 @@ MahoganyRedGyaradosSpeechHouseBlackBeltText:
line "in that lake…"
done
-UnknownText_0x199a0e:
+MahoganyRedGyaradosSpeechHouseTeacherText:
text "My favorite radio"
line "program? I'd say"
cont "#MON MUSIC."
done
-UnknownText_0x199a3d:
+MahoganyRedGyaradosSpeechHouseTeacherText_RocketsInRadioTower:
text "I've been hearing"
line "laughter on the"
@@ -71,4 +73,4 @@ MahoganyRedGyaradosSpeechHouse_MapEvents:
db 2 ; object events
object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1
- object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1
+ object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseTeacherScript, -1