pokecrystal/maps/OlivineLighthouse6F.asm

	object_const_def ; object_event constants
	const OLIVINELIGHTHOUSE6F_JASMINE
	const OLIVINELIGHTHOUSE6F_MONSTER
	const OLIVINELIGHTHOUSE6F_POKE_BALL

OlivineLighthouse6F_MapScripts:
	db 0 ; scene scripts

	db 0 ; callbacks

OlivineLighthouseJasmine:
	faceplayer
	opentext
	checkitem SECRETPOTION
	iftrue .BroughtSecretpotion
	checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
	iftrue .ExplainedSickness
	writetext JasmineCianwoodPharmacyText
	buttonsound
	setevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
.ExplainedSickness:
	writetext JasmineGetSomeMedicineText
	waitbutton
	closetext
	end

.BroughtSecretpotion:
	writetext JasmineCureAmphyText
	yesorno
	iffalse .no
	writetext PlayerHandedSecretpotionText
	buttonsound
	takeitem SECRETPOTION
	writetext JasmineDontBeOffendedText
	waitbutton
	closetext
	turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
	pause 15
	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
	opentext
	playmusic MUSIC_HEAL
	writetext JasmineAmphyHowAreYouFeelingText
	pause 60
	buttonsound
	closetext
	special RestartMapMusic
	cry AMPHAROS
	special FadeOutPalettes
	pause 10
	special FadeInPalettes
	opentext
	writetext AmphyPaluPaluluText
	waitbutton
	closetext
	turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
	pause 10
	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
	pause 10
	turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
	pause 10
	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
	pause 10
	faceplayer
	opentext
	writetext JasmineThankYouText
	waitbutton
	closetext
	setevent EVENT_JASMINE_RETURNED_TO_GYM
	clearevent EVENT_OLIVINE_GYM_JASMINE
	readvar VAR_FACING
	ifequal DOWN, .FacingDown
	ifequal RIGHT, .FacingRight
	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68
	disappear OLIVINELIGHTHOUSE6F_JASMINE
	end

.FacingDown:
	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c70
	disappear OLIVINELIGHTHOUSE6F_JASMINE
	end

.FacingRight:
	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c79
	disappear OLIVINELIGHTHOUSE6F_JASMINE
	end

.no:
	writetext JasmineISeeText
	waitbutton
	closetext
	turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
	pause 15
	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
	opentext
	writetext JasmineAmphyHangOnText
	waitbutton
	closetext
	end

OlivineLighthouseUnusedDummyScript:
; unused
	end

OlivineLighthouseAmphy:
	faceplayer
	opentext
	checkevent EVENT_JASMINE_RETURNED_TO_GYM
	iftrue .HealthyNow
	writetext AmphyPalPalooText
	setval AMPHAROS
	special PlaySlowCry
	buttonsound
	writetext AmphyBreathingLaboredText
	waitbutton
	closetext
	end

.HealthyNow:
	writetext AmphyPaluPaluluText
	cry AMPHAROS
	waitbutton
	closetext
	special FadeOutPalettes
	special FadeInPalettes
	special FadeOutPalettes
	special FadeInPalettes
	end

OlivineLighthouse6FSuperPotion:
	itemball SUPER_POTION

MovementData_0x60c68:
	slow_step UP
	slow_step UP
	slow_step RIGHT
	slow_step UP
	slow_step UP
	step_sleep 8
	step_sleep 8
	step_end

MovementData_0x60c70:
	slow_step DOWN
	slow_step RIGHT
	slow_step RIGHT
	slow_step RIGHT
	slow_step UP
	slow_step RIGHT
	slow_step RIGHT
	slow_step RIGHT
	step_end

MovementData_0x60c79:
	slow_step UP
	slow_step UP
	slow_step RIGHT
	slow_step UP
	slow_step UP
	slow_step UP
	step_sleep 8
	step_end

JasmineCianwoodPharmacyText:
	text "JASMINE: … This"
	line "#MON always"

	para "kept the sea lit"
	line "at night."

	para "…But it suddenly"
	line "got sick… It's"
	cont "gasping for air…"

	para "…I understand"
	line "that there is a"

	para "wonderful PHARMACY"
	line "in CIANWOOD…"

	para "But that's across"
	line "the sea…"

	para "And I can't leave"
	line "AMPHY unattended…"
	done

JasmineGetSomeMedicineText:
	text "…May I ask you to"
	line "get some medicine"
	cont "for me? Please?"
	done

JasmineCureAmphyText:
	text "JASMINE: …Will"
	line "that medicine cure"
	cont "AMPHY?"
	done

PlayerHandedSecretpotionText:
	text "<PLAYER> handed the"
	line "SECRETPOTION to"
	cont "JASMINE."
	done

JasmineDontBeOffendedText:
	text "JASMINE: …Um,"
	line "please don't be"
	cont "offended…"

	para "…AMPHY will not"
	line "take anything from"
	cont "anyone but me…"
	done

JasmineAmphyHowAreYouFeelingText:
	text "JASMINE: …"

	para "AMPHY, how are you"
	line "feeling?"
	done

JasmineThankYouText:
	text "JASMINE: …Oh, I'm"
	line "so relieved…"

	para "This is just so"
	line "wonderful…"

	para "Thank you so very,"
	line "very much."

	para "…I will return to"
	line "the GYM…"
	done

JasmineISeeText:
	text "JASMINE: …I see…"
	done

JasmineAmphyHangOnText:
	text "…AMPHY, hang on!"
	done

AmphyPalPalooText:
	text "AMPHY: …"
	line "…Pa… paloo…"
	done

AmphyBreathingLaboredText:
	text "Its breathing is"
	line "terribly labored…"
	done

AmphyPaluPaluluText:
	text "AMPHY: Palu!"
	line "Palulu!"
	done

OlivineLighthouse6F_MapEvents:
	db 0, 0 ; filler

	db 3 ; warp events
	warp_event  9, 15, OLIVINE_LIGHTHOUSE_5F, 1
	warp_event 16,  5, OLIVINE_LIGHTHOUSE_5F, 6
	warp_event 17,  5, OLIVINE_LIGHTHOUSE_5F, 7

	db 0 ; coord events

	db 0 ; bg events

	db 3 ; object events
	object_event  8,  8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineLighthouseJasmine, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
	object_event  9,  8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OlivineLighthouseAmphy, -1
	object_event  3,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
"object_const_def" instead of "const_def 2" 2019-04-21 21:42:25 +00:00			`object_const_def ; object_event constants`
Person event constants for each map 2015-11-27 05:22:14 +00:00			`const OLIVINELIGHTHOUSE6F_JASMINE`
			`const OLIVINELIGHTHOUSE6F_MONSTER`
			`const OLIVINELIGHTHOUSE6F_POKE_BALL`

map_header → map_def; map_header_2 → map_data 2018-01-17 03:57:19 +00:00			`OlivineLighthouse6F_MapScripts:`
Remove unreferenced map script heading labels 2018-01-30 19:15:47 +00:00			`db 0 ; scene scripts`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Remove unreferenced map script heading labels 2018-01-30 19:15:47 +00:00			`db 0 ; callbacks`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`OlivineLighthouseJasmine:`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`faceplayer`
opentext and breeding 2015-12-09 23:25:44 +00:00			`opentext`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`checkitem SECRETPOTION`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`iftrue .BroughtSecretpotion`
Add more event flags. 2015-07-10 12:08:03 +00:00			`checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`iftrue .ExplainedSickness`
			`writetext JasmineCianwoodPharmacyText`
buttonsound 2015-11-30 03:29:45 +00:00			`buttonsound`
Add more event flags. 2015-07-10 12:08:03 +00:00			`setevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`.ExplainedSickness:`
			`writetext JasmineGetSomeMedicineText`
Rename several script commands 2015-11-25 15:16:29 +00:00			`waitbutton`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`closetext`
			`end`

Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`.BroughtSecretpotion:`
			`writetext JasmineCureAmphyText`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`yesorno`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`iffalse .no`
			`writetext PlayerHandedSecretpotionText`
buttonsound 2015-11-30 03:29:45 +00:00			`buttonsound`
give/takeitem *, 1: the 1 is optional 2015-11-05 01:20:14 +00:00			`takeitem SECRETPOTION`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`writetext JasmineDontBeOffendedText`
Rename several script commands 2015-11-25 15:16:29 +00:00			`waitbutton`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`closetext`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`pause 15`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT`
opentext and breeding 2015-12-09 23:25:44 +00:00			`opentext`
Music and sound effect constants in map events. 2014-04-30 10:04:35 +00:00			`playmusic MUSIC_HEAL`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`writetext JasmineAmphyHowAreYouFeelingText`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`pause 60`
buttonsound 2015-11-30 03:29:45 +00:00			`buttonsound`
Rename several script commands 2015-11-25 15:16:29 +00:00			`closetext`
Use labels for script specials instead of constants/static values. 2015-02-11 23:03:42 +00:00			`special RestartMapMusic`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`cry AMPHAROS`
Remove Special_ prefix from special routines (close #478) 2018-01-24 16:17:05 +00:00			`special FadeOutPalettes`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`pause 10`
Remove Special_ prefix from special routines (close #478) 2018-01-24 16:17:05 +00:00			`special FadeInPalettes`
opentext and breeding 2015-12-09 23:25:44 +00:00			`opentext`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`writetext AmphyPaluPaluluText`
Rename several script commands 2015-11-25 15:16:29 +00:00			`waitbutton`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`closetext`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`pause 10`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`pause 10`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`pause 10`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`pause 10`
			`faceplayer`
opentext and breeding 2015-12-09 23:25:44 +00:00			`opentext`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`writetext JasmineThankYouText`
Rename several script commands 2015-11-25 15:16:29 +00:00			`waitbutton`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`closetext`
rename bit1 script commands to event 2013-09-24 07:48:58 +00:00			`setevent EVENT_JASMINE_RETURNED_TO_GYM`
Updated signpost items and person_event flags 2015-07-18 19:46:38 +00:00			`clearevent EVENT_OLIVINE_GYM_JASMINE`
Rename more script commands for consistency and predictability Fixes #540 2019-03-10 19:31:59 +00:00			`readvar VAR_FACING`
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # constants/map_constants.asm # constants/wram_constants.asm # data/radio/oaks_pkmn_talk_routes.asm # data/radio/pnp_hidden_places.asm # engine/battle/core.asm # engine/breeding.asm # engine/phone/phone_scripts.asm # engine/radio.asm # maps/BattleTower1F.asm # maps/OlivineLighthouse2F.asm # maps/OlivineLighthouse6F.asm # maps/PokemonFanClub.asm # maps/RadioTower1F.asm # maps/RadioTower2F.asm # maps/Route30BerryHouse.asm # maps/Route34IlexForestGate.asm # maps/Route36NationalParkGate.asm # maps/RuinsOfAlphKabutoChamber.asm # maps/RuinsOfAlphResearchCenter.asm # maps/VermilionPort.asm # maps/VictoryRoad.asm 2018-02-26 01:39:54 +00:00			`ifequal DOWN, .FacingDown`
			`ifequal RIGHT, .FacingRight`
Person event constants for each map 2015-11-27 05:22:14 +00:00			`applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68`
			`disappear OLIVINELIGHTHOUSE6F_JASMINE`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`end`

Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`.FacingDown:`
Person event constants for each map 2015-11-27 05:22:14 +00:00			`applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c70`
			`disappear OLIVINELIGHTHOUSE6F_JASMINE`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`end`

Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`.FacingRight:`
Person event constants for each map 2015-11-27 05:22:14 +00:00			`applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c79`
			`disappear OLIVINELIGHTHOUSE6F_JASMINE`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`end`

Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`.no:`
			`writetext JasmineISeeText`
Rename several script commands 2015-11-25 15:16:29 +00:00			`waitbutton`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`closetext`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`pause 15`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT`
opentext and breeding 2015-12-09 23:25:44 +00:00			`opentext`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`writetext JasmineAmphyHangOnText`
Rename several script commands 2015-11-25 15:16:29 +00:00			`waitbutton`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`closetext`
			`end`

Label more map scripts 2018-02-28 22:47:31 +00:00			`OlivineLighthouseUnusedDummyScript:`
			`; unused`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`end`

Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`OlivineLighthouseAmphy:`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`faceplayer`
opentext and breeding 2015-12-09 23:25:44 +00:00			`opentext`
rename bit1 script commands to event 2013-09-24 07:48:58 +00:00			`checkevent EVENT_JASMINE_RETURNED_TO_GYM`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`iftrue .HealthyNow`
			`writetext AmphyPalPalooText`
Rename more script commands for consistency and predictability Fixes #540 2019-03-10 19:31:59 +00:00			`setval AMPHAROS`
Remove Special_ prefix from special routines (close #478) 2018-01-24 16:17:05 +00:00			`special PlaySlowCry`
buttonsound 2015-11-30 03:29:45 +00:00			`buttonsound`
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`writetext AmphyBreathingLaboredText`
Rename several script commands 2015-11-25 15:16:29 +00:00			`waitbutton`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`closetext`
			`end`

Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`.HealthyNow:`
			`writetext AmphyPaluPaluluText`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`cry AMPHAROS`
Rename several script commands 2015-11-25 15:16:29 +00:00			`waitbutton`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`closetext`
Remove Special_ prefix from special routines (close #478) 2018-01-24 16:17:05 +00:00			`special FadeOutPalettes`
			`special FadeInPalettes`
			`special FadeOutPalettes`
			`special FadeInPalettes`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`end`

No more ItemFragment 2015-12-15 15:55:56 +00:00			`OlivineLighthouse6FSuperPotion:`
			`itemball SUPER_POTION`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Trim address comments from maps. 2015-07-10 08:45:35 +00:00			`MovementData_0x60c68:`
Unify directional movement macros 2016-05-14 17:46:14 +00:00			`slow_step UP`
			`slow_step UP`
			`slow_step RIGHT`
			`slow_step UP`
			`slow_step UP`
Unify step_sleep macro 2016-05-14 16:28:00 +00:00			`step_sleep 8`
			`step_sleep 8`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`step_end`

Trim address comments from maps. 2015-07-10 08:45:35 +00:00			`MovementData_0x60c70:`
Unify directional movement macros 2016-05-14 17:46:14 +00:00			`slow_step DOWN`
			`slow_step RIGHT`
			`slow_step RIGHT`
			`slow_step RIGHT`
			`slow_step UP`
			`slow_step RIGHT`
			`slow_step RIGHT`
			`slow_step RIGHT`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`step_end`

Trim address comments from maps. 2015-07-10 08:45:35 +00:00			`MovementData_0x60c79:`
Unify directional movement macros 2016-05-14 17:46:14 +00:00			`slow_step UP`
			`slow_step UP`
			`slow_step RIGHT`
			`slow_step UP`
			`slow_step UP`
			`slow_step UP`
Unify step_sleep macro 2016-05-14 16:28:00 +00:00			`step_sleep 8`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`step_end`

Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`JasmineCianwoodPharmacyText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "JASMINE: … This"`
			`line "#MON always"`

			`para "kept the sea lit"`
			`line "at night."`

			`para "…But it suddenly"`
			`line "got sick… It's"`
			`cont "gasping for air…"`

			`para "…I understand"`
			`line "that there is a"`

			`para "wonderful PHARMACY"`
			`line "in CIANWOOD…"`

			`para "But that's across"`
			`line "the sea…"`

			`para "And I can't leave"`
			`line "AMPHY unattended…"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`JasmineGetSomeMedicineText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "…May I ask you to"`
			`line "get some medicine"`
			`cont "for me? Please?"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`JasmineCureAmphyText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "JASMINE: …Will"`
			`line "that medicine cure"`
			`cont "AMPHY?"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`PlayerHandedSecretpotionText:`
Use charmaps for special string codepoints. Also fix all the text. Also fix some unreferenced scripts that were interpreted as text. 2015-06-28 04:59:17 +00:00			`text "<PLAYER> handed the"`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`line "SECRETPOTION to"`
			`cont "JASMINE."`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`JasmineDontBeOffendedText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "JASMINE: …Um,"`
			`line "please don't be"`
			`cont "offended…"`

			`para "…AMPHY will not"`
			`line "take anything from"`
			`cont "anyone but me…"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`JasmineAmphyHowAreYouFeelingText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "JASMINE: …"`

			`para "AMPHY, how are you"`
			`line "feeling?"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`JasmineThankYouText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "JASMINE: …Oh, I'm"`
			`line "so relieved…"`

			`para "This is just so"`
			`line "wonderful…"`

			`para "Thank you so very,"`
			`line "very much."`

			`para "…I will return to"`
			`line "the GYM…"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`JasmineISeeText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "JASMINE: …I see…"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`JasmineAmphyHangOnText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "…AMPHY, hang on!"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`AmphyPalPalooText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "AMPHY: …"`
			`line "…Pa… paloo…"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`AmphyBreathingLaboredText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "Its breathing is"`
			`line "terribly labored…"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Jasmine and Amphy labels 2018-02-02 16:13:28 +00:00			`AmphyPaluPaluluText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "AMPHY: Palu!"`
			`line "Palulu!"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
map_header → map_def; map_header_2 → map_data 2018-01-17 03:57:19 +00:00			`OlivineLighthouse6F_MapEvents:`
Remove unreferenced map script heading labels 2018-01-30 19:15:47 +00:00			`db 0, 0 ; filler`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Remove unreferenced map script heading labels 2018-01-30 19:15:47 +00:00			`db 3 ; warp events`
Align map event coordinate columns 2018-02-02 03:22:07 +00:00			`warp_event 9, 15, OLIVINE_LIGHTHOUSE_5F, 1`
			`warp_event 16, 5, OLIVINE_LIGHTHOUSE_5F, 6`
			`warp_event 17, 5, OLIVINE_LIGHTHOUSE_5F, 7`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Remove unreferenced map script heading labels 2018-01-30 19:15:47 +00:00			`db 0 ; coord events`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Remove unreferenced map script heading labels 2018-01-30 19:15:47 +00:00			`db 0 ; bg events`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Remove unreferenced map script heading labels 2018-01-30 19:15:47 +00:00			`db 3 ; object events`
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # constants/map_constants.asm # constants/wram_constants.asm # data/radio/oaks_pkmn_talk_routes.asm # data/radio/pnp_hidden_places.asm # engine/battle/core.asm # engine/breeding.asm # engine/phone/phone_scripts.asm # engine/radio.asm # maps/BattleTower1F.asm # maps/OlivineLighthouse2F.asm # maps/OlivineLighthouse6F.asm # maps/PokemonFanClub.asm # maps/RadioTower1F.asm # maps/RadioTower2F.asm # maps/Route30BerryHouse.asm # maps/Route34IlexForestGate.asm # maps/Route36NationalParkGate.asm # maps/RuinsOfAlphKabutoChamber.asm # maps/RuinsOfAlphResearchCenter.asm # maps/VermilionPort.asm # maps/VictoryRoad.asm 2018-02-26 01:39:54 +00:00			`object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineLighthouseJasmine, EVENT_OLIVINE_LIGHTHOUSE_JASMINE`
			`object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OlivineLighthouseAmphy, -1`
Align map event coordinate columns 2018-02-02 03:22:07 +00:00			`object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION`