shithub: pokecrystal

Download patch

ref: 3db107b72159e991a08248be7e32d74cfb723289
parent: b28e71271d936f5d817012a2bc492df1426b5ed4
author: Remy Oukaour <[email protected]>
date: Sat Jan 13 05:25:02 EST 2018

Label Dragon Shrine

--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -21,16 +21,16 @@
 	end
 
 .DragonShrineTestScript:
-	applymovement PLAYER, MovementData_0x18d2bf
-	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7
+	applymovement PLAYER, DragonShrinePlayerWalkInMovement
+	applymovement DRAGONSHRINE_ELDER1, DragonShrineElderStepDownMovement
 	opentext
-	writetext UnknownText_0x18d2ea
+	writetext DragonShrineElderGreetingText
 	buttonsound
 .Question1:
 	setevent EVENT_RECEIVED_BALLS_FROM_KURT
-	writetext UnknownText_0x18d3bc
+	writetext DragonShrineQuestion1Text
 	buttonsound
-	loadmenudata MenuDataHeader_0x18d215
+	loadmenudata DragonShrineQuestion1_MenuDataHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .RightAnswer
@@ -40,9 +40,9 @@
 
 .Question2:
 	setevent EVENT_DRAGON_SHRINE_QUESTION_2
-	writetext UnknownText_0x18d3d3
+	writetext DragonShrineQuestion2Text
 	buttonsound
-	loadmenudata MenuDataHeader_0x18d234
+	loadmenudata DragonShrineQuestion2_MenuDataHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .RightAnswer
@@ -50,9 +50,9 @@
 	if_equal 3, .WrongAnswer
 .Question3:
 	setevent EVENT_DRAGON_SHRINE_QUESTION_3
-	writetext UnknownText_0x18d3f3
+	writetext DragonShrineQuestion3Text
 	buttonsound
-	loadmenudata MenuDataHeader_0x18d258
+	loadmenudata DragonShrineQuestion3_MenuDataHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .WrongAnswer
@@ -60,9 +60,9 @@
 	if_equal 3, .RightAnswer
 .Question4:
 	setevent EVENT_DRAGON_SHRINE_QUESTION_4
-	writetext UnknownText_0x18d420
+	writetext DragonShrineQuestion4Text
 	buttonsound
-	loadmenudata MenuDataHeader_0x18d283
+	loadmenudata DragonShrineQuestion4_MenuDataHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .RightAnswer
@@ -70,9 +70,9 @@
 	if_equal 3, .RightAnswer
 .Question5:
 	setevent EVENT_DRAGON_SHRINE_QUESTION_5
-	writetext UnknownText_0x18d44a
+	writetext DragonShrineQuestion5Text
 	buttonsound
-	loadmenudata MenuDataHeader_0x18d2a5
+	loadmenudata DragonShrineQuestion5_MenuDataHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .WrongAnswer
@@ -81,7 +81,7 @@
 .RightAnswer:
 	checkevent EVENT_DRAGON_SHRINE_QUESTION_5
 	iftrue .PassedTheTest
-	writetext UnknownText_0x18d82d
+	writetext DragonShrineRightAnswerText
 	buttonsound
 	checkevent EVENT_DRAGON_SHRINE_QUESTION_4
 	iftrue .Question5
@@ -95,12 +95,12 @@
 	closetext
 	spriteface DRAGONSHRINE_ELDER1, LEFT
 	opentext
-	writetext UnknownText_0x18d7f6
+	writetext DragonShrineWrongAnswerText1
 	waitbutton
 	closetext
 	spriteface DRAGONSHRINE_ELDER1, DOWN
 	opentext
-	writetext UnknownText_0x18d816
+	writetext DragonShrineWrongAnswerText2
 	waitbutton
 	closetext
 	setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
@@ -116,7 +116,7 @@
 	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
 	iftrue .Question1
 .PassedTheTest:
-	writetext UnknownText_0x18d47c
+	writetext DragonShrinePassedTestText
 	waitbutton
 	closetext
 	playsound SFX_ENTER_DOOR
@@ -126,39 +126,39 @@
 	waitsfx
 	spriteface PLAYER, DOWN
 	pause 30
-	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2d4
+	applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement
 	spriteface DRAGONSHRINE_CLAIR, RIGHT
 	spriteface PLAYER, LEFT
 	spriteface DRAGONSHRINE_ELDER1, LEFT
 	opentext
-	writetext UnknownText_0x18d916
+	writetext DragonShrineClairYouPassedText
 	waitbutton
 	closetext
 	special Special_FadeOutMusic
-	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2da
+	applymovement DRAGONSHRINE_CLAIR, DragonShrineClairBigStepLeftMovement
 	opentext
-	writetext UnknownText_0x18d974
+	writetext DragonShrineClairThatCantBeText
 	waitbutton
 	closetext
-	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2dd
+	applymovement DRAGONSHRINE_CLAIR, DragonShrineClairSlowStepLeftMovement
 	opentext
-	writetext UnknownText_0x18d983
+	writetext DragonShrineClairYoureLyingText
 	waitbutton
 	closetext
-	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c9
+	applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement
 	spriteface DRAGONSHRINE_CLAIR, UP
 	opentext
-	writetext UnknownText_0x18d520
+	writetext DragonShrineMustIInformLanceText
 	waitbutton
 	closetext
 	showemote EMOTE_SHOCK, DRAGONSHRINE_CLAIR, 15
 	opentext
-	writetext UnknownText_0x18d9ae
+	writetext DragonShrineIUnderstandText
 	waitbutton
 	closetext
 	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e0
 	opentext
-	writetext UnknownText_0x18d9bf
+	writetext DragonShrineHereRisingBadgeText
 	waitbutton
 	setflag ENGINE_RISINGBADGE
 	playsound SFX_GET_BADGE
@@ -167,9 +167,9 @@
 	specialphonecall SPECIALCALL_MASTERBALL
 	setscene 1
 	setmapscene DRAGONS_DEN_B1F, 1
-	writetext UnknownText_0x18d9f2
+	writetext DragonShrinePlayerReceivedRisingBadgeText
 	buttonsound
-	writetext UnknownText_0x18da0b
+	writetext DragonShrineRisingBadgeExplanationText
 	waitbutton
 	closetext
 	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce
@@ -177,11 +177,11 @@
 	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1
 	spriteface PLAYER, UP
 	opentext
-	writetext UnknownText_0x18d5a3
+	writetext DragonShrineElderScoldsClairText
 	waitbutton
 	closetext
 	opentext
-	writetext UnknownText_0x18dab4
+	writetext DragonShrineSpeechlessText
 	waitbutton
 	closetext
 	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e3
@@ -191,7 +191,7 @@
 	setevent EVENT_GAVE_KURT_APRICORNS
 	end
 
-ElderScript_0x18d1a5:
+DragonShrineElder1Script:
 	faceplayer
 	opentext
 	checkevent EVENT_GAVE_KURT_APRICORNS
@@ -202,17 +202,17 @@
 	iffalse .GiveDratini
 	checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
 	iftrue .BeatRivalInMtMoon
-	writetext UnknownText_0x18d724
+	writetext DragonShrineClairsGrandfatherText
 	waitbutton
 	closetext
 	end
 
 .GiveDratini:
-	writetext UnknownText_0x18d604
+	writetext DragonShrineTakeThisDratiniText
 	waitbutton
 	checkcode VAR_PARTYCOUNT
 	if_equal 6, .PartyFull
-	writetext UnknownText_0x18d697
+	writetext DragonShrinePlayerReceivedDratiniText
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	givepoke DRATINI, 15
@@ -220,52 +220,52 @@
 	special SpecialDratini
 	setevent EVENT_GOT_DRATINI
 	setevent EVENT_JUST_RECEIVED_DRATINI
-	writetext UnknownText_0x18d6ca
+	writetext DragonShrineSymbolicDragonText
 	waitbutton
 	closetext
 	end
 
 .PartyFull:
-	writetext UnknownText_0x18d6ac
+	writetext DragonShrinePartyFullText
 	waitbutton
 	closetext
 	end
 
 .BeatRivalInMtMoon:
-	writetext UnknownText_0x18d782
+	writetext DragonShrineSilverIsInTrainingText
 	waitbutton
 	closetext
 	end
 
 .DontGiveDratiniYet:
-	writetext UnknownText_0x18d5e5
+	writetext DragonShrineComeAgainText
 	waitbutton
 	closetext
 	end
 
 .ReceivedDratini:
-	writetext UnknownText_0x18d6ca
+	writetext DragonShrineSymbolicDragonText
 	waitbutton
 	closetext
 	end
 
-ElderScript_0x18d205:
+DragonShrineElder2Script:
 	faceplayer
 	opentext
-	writetext UnknownText_0x18d840
+	writetext DragonShrineElder2Text
 	waitbutton
 	closetext
 	end
 
-ElderScript_0x18d20d:
+DragonShrineElder3Script:
 	faceplayer
 	opentext
-	writetext UnknownText_0x18d8b1
+	writetext DragonShrineElder3Text
 	waitbutton
 	closetext
 	end
 
-MenuDataHeader_0x18d215:
+DragonShrineQuestion1_MenuDataHeader:
 	db $40 ; flags
 	db 04, 08 ; start coords
 	db 11, 19 ; end coords
@@ -279,7 +279,7 @@
 	db "Underling@"
 	db "Friend@"
 
-MenuDataHeader_0x18d234:
+DragonShrineQuestion2_MenuDataHeader:
 	db $40 ; flags
 	db 04, 09 ; start coords
 	db 11, 19 ; end coords
@@ -293,7 +293,7 @@
 	db "Raising@"
 	db "Cheating@"
 
-MenuDataHeader_0x18d258:
+DragonShrineQuestion3_MenuDataHeader:
 	db $40 ; flags
 	db 04, 05 ; start coords
 	db 11, 19 ; end coords
@@ -307,7 +307,7 @@
 	db "Tough person@"
 	db "Anybody@"
 
-MenuDataHeader_0x18d283:
+DragonShrineQuestion4_MenuDataHeader:
 	db $40 ; flags
 	db 04, 08 ; start coords
 	db 11, 19 ; end coords
@@ -321,7 +321,7 @@
 	db "Violence@"
 	db "Knowledge@"
 
-MenuDataHeader_0x18d2a5:
+DragonShrineQuestion5_MenuDataHeader:
 	db $40 ; flags
 	db 04, 12 ; start coords
 	db 11, 19 ; end coords
@@ -335,7 +335,7 @@
 	db "Both@"
 	db "Weak@"
 
-MovementData_0x18d2bf:
+DragonShrinePlayerWalkInMovement:
 	slow_step UP
 	slow_step UP
 	slow_step UP
@@ -345,11 +345,11 @@
 	slow_step UP
 	step_end
 
-MovementData_0x18d2c7:
+DragonShrineElderStepDownMovement:
 	slow_step DOWN
 	step_end
 
-MovementData_0x18d2c9:
+DragonShrineElderWalkToClairMovement:
 	slow_step LEFT
 	slow_step LEFT
 	slow_step LEFT
@@ -366,7 +366,7 @@
 	turn_head DOWN
 	step_end
 
-MovementData_0x18d2d4:
+DragonShrineClairWalkInMovement:
 	slow_step UP
 	slow_step UP
 	slow_step UP
@@ -374,12 +374,12 @@
 	slow_step UP
 	step_end
 
-MovementData_0x18d2da:
+DragonShrineClairBigStepLeftMovement:
 	fix_facing
 	big_step LEFT
 	step_end
 
-MovementData_0x18d2dd:
+DragonShrineClairSlowStepLeftMovement:
 	slow_step LEFT
 	remove_fixed_facing
 	step_end
@@ -398,7 +398,7 @@
 	step DOWN
 	step_end
 
-UnknownText_0x18d2ea:
+DragonShrineElderGreetingText:
 	text "Hm… Good to see"
 	line "you here."
 
@@ -421,29 +421,29 @@
 	para "Ready?"
 	done
 
-UnknownText_0x18d3bc:
+DragonShrineQuestion1Text:
 	text "What are #MON"
 	line "to you?"
 	done
 
-UnknownText_0x18d3d3:
+DragonShrineQuestion2Text:
 	text "What helps you to"
 	line "win battles?"
 	done
 
-UnknownText_0x18d3f3:
+DragonShrineQuestion3Text:
 	text "What kind of"
 	line "trainer do you"
 	cont "wish to battle?"
 	done
 
-UnknownText_0x18d420:
+DragonShrineQuestion4Text:
 	text "What is most"
 	line "important for"
 	cont "raising #MON?"
 	done
 
-UnknownText_0x18d44a:
+DragonShrineQuestion5Text:
 	text "Strong #MON."
 	line "Weak #MON."
 
@@ -451,7 +451,7 @@
 	line "important?"
 	done
 
-UnknownText_0x18d47c:
+DragonShrinePassedTestText:
 	text "Hm… I see…"
 
 	para "You care deeply"
@@ -470,7 +470,7 @@
 	cont "#MON LEAGUE."
 	done
 
-UnknownText_0x18d520:
+DragonShrineMustIInformLanceText:
 	text "CLAIR!"
 
 	para "This child is"
@@ -485,7 +485,7 @@
 	line "LANCE of this?"
 	done
 
-UnknownText_0x18d5a3:
+DragonShrineElderScoldsClairText:
 	text "CLAIR…"
 
 	para "Reflect upon what"
@@ -495,12 +495,12 @@
 	line "child has."
 	done
 
-UnknownText_0x18d5e5:
+DragonShrineComeAgainText:
 	text "Come again, if you"
 	line "so desire."
 	done
 
-UnknownText_0x18d604:
+DragonShrineTakeThisDratiniText:
 	text "Hm… Good to see"
 	line "you here."
 
@@ -517,17 +517,17 @@
 	line "your worth."
 	done
 
-UnknownText_0x18d697:
+DragonShrinePlayerReceivedDratiniText:
 	text "<PLAYER> received"
 	line "DRATINI!"
 	done
 
-UnknownText_0x18d6ac:
+DragonShrinePartyFullText:
 	text "Hm? Your #MON"
 	line "party is full."
 	done
 
-UnknownText_0x18d6ca:
+DragonShrineSymbolicDragonText:
 	text "Dragon #MON are"
 	line "symbolic of our"
 	cont "clan."
@@ -539,7 +539,7 @@
 	line "one."
 	done
 
-UnknownText_0x18d724:
+DragonShrineClairsGrandfatherText:
 	text "CLAIR appears to"
 	line "have learned an"
 
@@ -550,7 +550,7 @@
 	line "grandfather."
 	done
 
-UnknownText_0x18d782:
+DragonShrineSilverIsInTrainingText:
 	text "A boy close to"
 	line "your age is in"
 	cont "training here."
@@ -562,21 +562,21 @@
 	line "little worrisome…"
 	done
 
-UnknownText_0x18d7f6:
+DragonShrineWrongAnswerText1:
 	text "Hah? I didn't"
 	line "quite catch that…"
 	done
 
-UnknownText_0x18d816:
+DragonShrineWrongAnswerText2:
 	text "What was it you"
 	line "said?"
 	done
 
-UnknownText_0x18d82d:
+DragonShrineRightAnswerText:
 	text "Oh, I understand…"
 	done
 
-UnknownText_0x18d840:
+DragonShrineElder2Text:
 	text "It's been quite"
 	line "some time since a"
 
@@ -588,7 +588,7 @@
 	line "Master LANCE."
 	done
 
-UnknownText_0x18d8b1:
+DragonShrineElder3Text:
 	text "You know young"
 	line "Master LANCE?"
 
@@ -600,7 +600,7 @@
 	line "blood."
 	done
 
-UnknownText_0x18d916:
+DragonShrineClairYouPassedText:
 	text "So how did it go?"
 
 	para "I guess there's no"
@@ -613,11 +613,11 @@
 	para "…What? You passed?"
 	done
 
-UnknownText_0x18d974:
+DragonShrineClairThatCantBeText:
 	text "That can't be!"
 	done
 
-UnknownText_0x18d983:
+DragonShrineClairYoureLyingText:
 	text "You're lying!"
 
 	para "Even I haven't"
@@ -624,11 +624,11 @@
 	line "been approved!"
 	done
 
-UnknownText_0x18d9ae:
+DragonShrineIUnderstandText:
 	text "I-I understand…"
 	done
 
-UnknownText_0x18d9bf:
+DragonShrineHereRisingBadgeText:
 	text "Here, this is the"
 	line "RISINGBADGE…"
 
@@ -635,12 +635,12 @@
 	para "Hurry up! Take it!"
 	done
 
-UnknownText_0x18d9f2:
+DragonShrinePlayerReceivedRisingBadgeText:
 	text "<PLAYER> received"
 	line "RISINGBADGE."
 	done
 
-UnknownText_0x18da0b:
+DragonShrineRisingBadgeExplanationText:
 	text "RISINGBADGE will"
 	line "enable your"
 
@@ -658,7 +658,7 @@
 	line "question."
 	done
 
-UnknownText_0x18dab4:
+DragonShrineSpeechlessText:
 	text "<......><......><......><......><......><......>"
 	done
 
@@ -679,7 +679,7 @@
 
 .ObjectEvents:
 	db 4
-	object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS
-	object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS
-	object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS
+	object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_GAVE_KURT_APRICORNS
+	object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_GAVE_KURT_APRICORNS
+	object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_GAVE_KURT_APRICORNS
 	object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR