pokecrystal/maps/VictoryRoad.asm

	object_const_def ; object_event constants
	const VICTORYROAD_SILVER
	const VICTORYROAD_POKE_BALL1
	const VICTORYROAD_POKE_BALL2
	const VICTORYROAD_POKE_BALL3
	const VICTORYROAD_POKE_BALL4
	const VICTORYROAD_POKE_BALL5

VictoryRoad_MapScripts:
	db 2 ; scene scripts
	scene_script .DummyScene0 ; SCENE_DEFAULT
	scene_script .DummyScene1 ; SCENE_FINISHED

	db 0 ; callbacks

.DummyScene0:
	end

.DummyScene1:
	end

VictoryRoadRivalLeft:
	moveobject VICTORYROAD_SILVER, 18, 11
	turnobject PLAYER, DOWN
	showemote EMOTE_SHOCK, PLAYER, 15
	special FadeOutMusic
	pause 15
	appear VICTORYROAD_SILVER
	applymovement VICTORYROAD_SILVER, MovementData_0x74539
	scall VictoryRoadRivalNext
	applymovement VICTORYROAD_SILVER, MovementData_0x7454c
	disappear VICTORYROAD_SILVER
	setscene SCENE_FINISHED
	playmapmusic
	end

VictoryRoadRivalRight:
	turnobject PLAYER, DOWN
	showemote EMOTE_SHOCK, PLAYER, 15
	special FadeOutMusic
	pause 15
	appear VICTORYROAD_SILVER
	applymovement VICTORYROAD_SILVER, MovementData_0x74542
	scall VictoryRoadRivalNext
	applymovement VICTORYROAD_SILVER, MovementData_0x74555
	disappear VICTORYROAD_SILVER
	setscene SCENE_FINISHED
	playmapmusic
	end

VictoryRoadRivalNext:
	turnobject PLAYER, DOWN
	playmusic MUSIC_RIVAL_ENCOUNTER
	opentext
	writetext VictoryRoadRivalBeforeText
	waitbutton
	closetext
	setevent EVENT_RIVAL_VICTORY_ROAD
	checkevent EVENT_GOT_TOTODILE_FROM_ELM
	iftrue .GotTotodile
	checkevent EVENT_GOT_CHIKORITA_FROM_ELM
	iftrue .GotChikorita
	winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
	setlasttalked VICTORYROAD_SILVER
	loadtrainer RIVAL1, RIVAL1_5_TOTODILE
	startbattle
	dontrestartmapmusic
	reloadmapafterbattle
	sjump .AfterBattle

.GotTotodile:
	winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
	setlasttalked VICTORYROAD_SILVER
	loadtrainer RIVAL1, RIVAL1_5_CHIKORITA
	startbattle
	dontrestartmapmusic
	reloadmapafterbattle
	sjump .AfterBattle

.GotChikorita:
	winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
	setlasttalked VICTORYROAD_SILVER
	loadtrainer RIVAL1, RIVAL1_5_CYNDAQUIL
	startbattle
	dontrestartmapmusic
	reloadmapafterbattle
	sjump .AfterBattle

.AfterBattle:
	playmusic MUSIC_RIVAL_AFTER
	opentext
	writetext VictoryRoadRivalAfterText
	waitbutton
	closetext
	end

VictoryRoadTMEarthquake:
	itemball TM_EARTHQUAKE

VictoryRoadMaxRevive:
	itemball MAX_REVIVE

VictoryRoadFullRestore:
	itemball FULL_RESTORE

VictoryRoadFullHeal:
	itemball FULL_HEAL

VictoryRoadHPUp:
	itemball HP_UP

VictoryRoadHiddenMaxPotion:
	hiddenitem MAX_POTION, EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION

VictoryRoadHiddenFullHeal:
	hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL

MovementData_0x74539:
	step LEFT
	step LEFT
	step LEFT
	step LEFT
	step LEFT
	step LEFT
	step UP
	step UP
	step_end

MovementData_0x74542:
	step UP
	step UP
	step LEFT
	step LEFT
	step LEFT
	step LEFT
	step LEFT
	step UP
	step UP
	step_end

MovementData_0x7454c:
	step DOWN
	step DOWN
	step RIGHT
	step RIGHT
	step RIGHT
	step RIGHT
	step RIGHT
	step RIGHT
	step_end

MovementData_0x74555:
	step DOWN
	step DOWN
	step RIGHT
	step RIGHT
	step RIGHT
	step RIGHT
	step RIGHT
	step DOWN
	step DOWN
	step_end

VictoryRoadRivalBeforeText:
	text "Hold it."

	para "…Are you going to"
	line "take the #MON"
	cont "LEAGUE challenge?"

	para "…Don't make me"
	line "laugh."

	para "You're so much"
	line "weaker than I am."

	para "I'm not like I was"
	line "before."

	para "I now have the"
	line "best and strongest"

	para "#MON with me."
	line "I'm invincible!"

	para "<PLAYER>!"
	line "I challenge you!"
	done

VictoryRoadRivalDefeatText:
	text "…I couldn't win…"

	para "I gave it every-"
	line "thing I had…"

	para "What you possess,"
	line "and what I lack…"

	para "I'm beginning to"
	line "understand what"

	para "that dragon master"
	line "said to me…"
	done

VictoryRoadRivalAfterText:
	text "…I haven't given up"
	line "on becoming the"
	cont "greatest trainer…"

	para "I'm going to find"
	line "out why I can't"

	para "win and become"
	line "stronger…"

	para "When I do, I will"
	line "challenge you."

	para "And I'll beat you"
	line "down with all my"
	cont "power."

	para "…Humph! You keep"
	line "at it until then."
	done

VictoryRoadRivalVictoryText:
	text "…Humph!"

	para "When it comes down"
	line "to it, nothing can"
	cont "beat power."

	para "I don't need any-"
	line "thing else."
	done

VictoryRoad_MapEvents:
	db 0, 0 ; filler

	db 10 ; warp events
	warp_event  9, 67, VICTORY_ROAD_GATE, 5
	warp_event  1, 49, VICTORY_ROAD, 3
	warp_event  1, 35, VICTORY_ROAD, 2
	warp_event 13, 31, VICTORY_ROAD, 5
	warp_event 13, 17, VICTORY_ROAD, 4
	warp_event 17, 33, VICTORY_ROAD, 7
	warp_event 17, 19, VICTORY_ROAD, 6
	warp_event  0, 11, VICTORY_ROAD, 9
	warp_event  0, 27, VICTORY_ROAD, 8
	warp_event 13,  5, ROUTE_23, 3

	db 2 ; coord events
	coord_event 12,  8, SCENE_DEFAULT, VictoryRoadRivalLeft
	coord_event 13,  8, SCENE_DEFAULT, VictoryRoadRivalRight

	db 2 ; bg events
	bg_event  3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
	bg_event  3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal

	db 6 ; object events
	object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
	object_event  3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
	object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
	object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE
	object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL
	object_event  7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP
"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 VICTORYROAD_SILVER`
			`const VICTORYROAD_POKE_BALL1`
			`const VICTORYROAD_POKE_BALL2`
			`const VICTORYROAD_POKE_BALL3`
			`const VICTORYROAD_POKE_BALL4`
			`const VICTORYROAD_POKE_BALL5`

map_header → map_def; map_header_2 → map_data 2018-01-17 03:57:19 +00:00			`VictoryRoad_MapScripts:`
Remove unreferenced map script heading labels 2018-01-30 19:15:47 +00:00			`db 2 ; scene scripts`
Meaningful scene constant names (Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event) 2018-02-01 17:40:58 +00:00			`scene_script .DummyScene0 ; SCENE_DEFAULT`
SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern) 2018-02-01 20:06:06 +00:00			`scene_script .DummyScene1 ; SCENE_FINISHED`
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
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event 2017-12-24 18:46:34 +00:00			`.DummyScene0:`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`end`

Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event 2017-12-24 18:46:34 +00:00			`.DummyScene1:`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`end`

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			`VictoryRoadRivalLeft:`
Clean up some hex values in map scripts 2018-01-09 23:45:25 +00:00			`moveobject VICTORYROAD_SILVER, 18, 11`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject PLAYER, DOWN`
Add constants for common map object ids. 2015-07-22 06:49:18 +00:00			`showemote EMOTE_SHOCK, PLAYER, 15`
Remove Special_ prefix from special routines (close #478) 2018-01-24 16:17:05 +00:00			`special FadeOutMusic`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`pause 15`
Person event constants for each map 2015-11-27 05:22:14 +00:00			`appear VICTORYROAD_SILVER`
			`applymovement VICTORYROAD_SILVER, MovementData_0x74539`
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`scall VictoryRoadRivalNext`
Person event constants for each map 2015-11-27 05:22:14 +00:00			`applymovement VICTORYROAD_SILVER, MovementData_0x7454c`
			`disappear VICTORYROAD_SILVER`
SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern) 2018-02-01 20:06:06 +00:00			`setscene SCENE_FINISHED`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`playmapmusic`
			`end`

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			`VictoryRoadRivalRight:`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject PLAYER, DOWN`
Add constants for common map object ids. 2015-07-22 06:49:18 +00:00			`showemote EMOTE_SHOCK, PLAYER, 15`
Remove Special_ prefix from special routines (close #478) 2018-01-24 16:17:05 +00:00			`special FadeOutMusic`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`pause 15`
Person event constants for each map 2015-11-27 05:22:14 +00:00			`appear VICTORYROAD_SILVER`
			`applymovement VICTORYROAD_SILVER, MovementData_0x74542`
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`scall VictoryRoadRivalNext`
Person event constants for each map 2015-11-27 05:22:14 +00:00			`applymovement VICTORYROAD_SILVER, MovementData_0x74555`
			`disappear VICTORYROAD_SILVER`
SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern) 2018-02-01 20:06:06 +00:00			`setscene SCENE_FINISHED`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`playmapmusic`
			`end`

Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`VictoryRoadRivalNext:`
* loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) 2018-02-26 01:05:37 +00:00			`turnobject PLAYER, DOWN`
Music and sound effect constants in map events. 2014-04-30 10:04:35 +00:00			`playmusic MUSIC_RIVAL_ENCOUNTER`
opentext and breeding 2015-12-09 23:25:44 +00:00			`opentext`
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`writetext VictoryRoadRivalBeforeText`
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`
Updated signpost items and person_event flags 2015-07-18 19:46:38 +00:00			`setevent EVENT_RIVAL_VICTORY_ROAD`
rename bit1 script commands to event 2013-09-24 07:48:58 +00:00			`checkevent EVENT_GOT_TOTODILE_FROM_ELM`
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`iftrue .GotTotodile`
rename bit1 script commands to event 2013-09-24 07:48:58 +00:00			`checkevent EVENT_GOT_CHIKORITA_FROM_ELM`
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`iftrue .GotChikorita`
			`winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText`
underground switches, town map 2015-12-09 16:38:40 +00:00			`setlasttalked VICTORYROAD_SILVER`
Document constants with comments, actual names, and more thorough usage 2017-12-09 05:50:59 +00:00			`loadtrainer RIVAL1, RIVAL1_5_TOTODILE`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`startbattle`
Move effects; no more reloadmapmusic, returnafterbattle 2015-12-26 23:11:55 +00:00			`dontrestartmapmusic`
			`reloadmapafterbattle`
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions Fixes #580 2019-03-10 20:39:31 +00:00			`sjump .AfterBattle`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`.GotTotodile:`
			`winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText`
underground switches, town map 2015-12-09 16:38:40 +00:00			`setlasttalked VICTORYROAD_SILVER`
Document constants with comments, actual names, and more thorough usage 2017-12-09 05:50:59 +00:00			`loadtrainer RIVAL1, RIVAL1_5_CHIKORITA`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`startbattle`
Move effects; no more reloadmapmusic, returnafterbattle 2015-12-26 23:11:55 +00:00			`dontrestartmapmusic`
			`reloadmapafterbattle`
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions Fixes #580 2019-03-10 20:39:31 +00:00			`sjump .AfterBattle`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`.GotChikorita:`
			`winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText`
underground switches, town map 2015-12-09 16:38:40 +00:00			`setlasttalked VICTORYROAD_SILVER`
Document constants with comments, actual names, and more thorough usage 2017-12-09 05:50:59 +00:00			`loadtrainer RIVAL1, RIVAL1_5_CYNDAQUIL`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`startbattle`
Move effects; no more reloadmapmusic, returnafterbattle 2015-12-26 23:11:55 +00:00			`dontrestartmapmusic`
			`reloadmapafterbattle`
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions Fixes #580 2019-03-10 20:39:31 +00:00			`sjump .AfterBattle`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`.AfterBattle:`
Music and sound effect constants in map events. 2014-04-30 10:04:35 +00:00			`playmusic MUSIC_RIVAL_AFTER`
opentext and breeding 2015-12-09 23:25:44 +00:00			`opentext`
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`writetext VictoryRoadRivalAfterText`
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`

No more ItemFragment 2015-12-15 15:55:56 +00:00			`VictoryRoadTMEarthquake:`
			`itemball TM_EARTHQUAKE`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
No more ItemFragment 2015-12-15 15:55:56 +00:00			`VictoryRoadMaxRevive:`
			`itemball MAX_REVIVE`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
No more ItemFragment 2015-12-15 15:55:56 +00:00			`VictoryRoadFullRestore:`
			`itemball FULL_RESTORE`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
No more ItemFragment 2015-12-15 15:55:56 +00:00			`VictoryRoadFullHeal:`
			`itemball FULL_HEAL`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
No more ItemFragment 2015-12-15 15:55:56 +00:00			`VictoryRoadHPUp:`
			`itemball HP_UP`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Replaced SignpostItem with Hidden(ItemName) 2015-12-15 16:21:58 +00:00			`VictoryRoadHiddenMaxPotion:`
hiddenitem, like itemball and object_event, puts the item first and the event last 2018-01-23 17:59:21 +00:00			`hiddenitem MAX_POTION, EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION`
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style 2016-04-10 18:42:14 +00:00
Replaced SignpostItem with Hidden(ItemName) 2015-12-15 16:21:58 +00:00			`VictoryRoadHiddenFullHeal:`
hiddenitem, like itemball and object_event, puts the item first and the event last 2018-01-23 17:59:21 +00:00			`hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL`
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style 2016-04-10 18:42:14 +00:00
Trim address comments from maps. 2015-07-10 08:45:35 +00:00			`MovementData_0x74539:`
Unify directional movement macros 2016-05-14 17:46:14 +00:00			`step LEFT`
			`step LEFT`
			`step LEFT`
			`step LEFT`
			`step LEFT`
			`step LEFT`
			`step UP`
			`step UP`
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_0x74542:`
Unify directional movement macros 2016-05-14 17:46:14 +00:00			`step UP`
			`step UP`
			`step LEFT`
			`step LEFT`
			`step LEFT`
			`step LEFT`
			`step LEFT`
			`step UP`
			`step UP`
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_0x7454c:`
Unify directional movement macros 2016-05-14 17:46:14 +00:00			`step DOWN`
			`step DOWN`
			`step RIGHT`
			`step RIGHT`
			`step RIGHT`
			`step RIGHT`
			`step RIGHT`
			`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_0x74555:`
Unify directional movement macros 2016-05-14 17:46:14 +00:00			`step DOWN`
			`step DOWN`
			`step RIGHT`
			`step RIGHT`
			`step RIGHT`
			`step RIGHT`
			`step RIGHT`
			`step DOWN`
			`step DOWN`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00			`step_end`

Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`VictoryRoadRivalBeforeText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "Hold it."`

			`para "…Are you going to"`
			`line "take the #MON"`
			`cont "LEAGUE challenge?"`

			`para "…Don't make me"`
			`line "laugh."`

			`para "You're so much"`
			`line "weaker than I am."`

			`para "I'm not like I was"`
			`line "before."`

			`para "I now have the"`
			`line "best and strongest"`

			`para "#MON with me."`
			`line "I'm invincible!"`

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			`para "<PLAYER>!"`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`line "I challenge you!"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`VictoryRoadRivalDefeatText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "…I couldn't win…"`

			`para "I gave it every-"`
			`line "thing I had…"`

			`para "What you possess,"`
			`line "and what I lack…"`

			`para "I'm beginning to"`
			`line "understand what"`

			`para "that dragon master"`
			`line "said to me…"`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`VictoryRoadRivalAfterText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "…I haven't given up"`
			`line "on becoming the"`
			`cont "greatest trainer…"`

			`para "I'm going to find"`
			`line "out why I can't"`

			`para "win and become"`
			`line "stronger…"`

			`para "When I do, I will"`
			`line "challenge you."`

			`para "And I'll beat you"`
			`line "down with all my"`
			`cont "power."`

			`para "…Humph! You keep"`
			`line "at it until then."`
			`done`
Split map scripts, text, events from main.asm The commit we deserve 2013-02-17 06:54:07 +00:00
Labelling the Victory Road rival script 2018-02-02 15:57:06 +00:00			`VictoryRoadRivalVictoryText:`
Text macros in maps/. Looks fine at a glance. 2014-03-06 05:29:44 +00:00			`text "…Humph!"`

			`para "When it comes down"`
			`line "to it, nothing can"`
			`cont "beat power."`

			`para "I don't need any-"`
			`line "thing else."`
			`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			`VictoryRoad_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 10 ; warp events`
Align map event coordinate columns 2018-02-02 03:22:07 +00:00			`warp_event 9, 67, VICTORY_ROAD_GATE, 5`
			`warp_event 1, 49, VICTORY_ROAD, 3`
			`warp_event 1, 35, VICTORY_ROAD, 2`
warp_event x, y, map, warp_id 2018-02-02 02:54:00 +00:00			`warp_event 13, 31, VICTORY_ROAD, 5`
			`warp_event 13, 17, VICTORY_ROAD, 4`
			`warp_event 17, 33, VICTORY_ROAD, 7`
			`warp_event 17, 19, VICTORY_ROAD, 6`
Align map event coordinate columns 2018-02-02 03:22:07 +00:00			`warp_event 0, 11, VICTORY_ROAD, 9`
			`warp_event 0, 27, VICTORY_ROAD, 8`
			`warp_event 13, 5, ROUTE_23, 3`
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 2 ; coord 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			`coord_event 12, 8, SCENE_DEFAULT, VictoryRoadRivalLeft`
			`coord_event 13, 8, SCENE_DEFAULT, VictoryRoadRivalRight`
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 2 ; bg events`
Align map event coordinate columns 2018-02-02 03:22:07 +00:00			`bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion`
			`bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal`
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 6 ; object events`
Consistent (x, y) coordinate formatting in map scripts 2017-12-28 19:31:25 +00:00			`object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD`
Align map event coordinate columns 2018-02-02 03:22:07 +00:00			`object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE`
SPRITEMOVEDATA_ITEM_TREE → SPRITEMOVEDATA_STILL (it's used for other things like Azalea's Slowpokes, not just items and trees) 2018-01-31 03:12:53 +00:00			`object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE`
			`object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE`
			`object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL`
Align map event coordinate columns 2018-02-02 03:22:07 +00:00			`object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP`