ref: 88328f18b6fc7df475184753d44dd7399fd68f9e
parent: 7fefefcf12f3c4669194bebeb4c7ab7528b79d42
author: IIMarckus <[email protected]>
date: Wed Apr 6 18:59:45 EDT 2016
Improve some map script labels.
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -6,7 +6,7 @@
const BLACKTHORNCITY_BLACK_BELT
const BLACKTHORNCITY_COOLTRAINER_F1
const BLACKTHORNCITY_YOUNGSTER1
- const BLACKTHORNCITY_YOUNGSTER2
+ const BLACKTHORNCITY_SANTOS
const BLACKTHORNCITY_COOLTRAINER_F2
BlackthornCity_MapScriptHeader:
@@ -27,11 +27,11 @@
.Santos
checkcode VAR_WEEKDAY
if_equal SATURDAY, .SantosAppears
- disappear BLACKTHORNCITY_YOUNGSTER2
+ disappear BLACKTHORNCITY_SANTOS
return
.SantosAppears
- appear BLACKTHORNCITY_YOUNGSTER2
+ appear BLACKTHORNCITY_SANTOS
return
BlackthornSuperNerdScript:
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -1,4 +1,3 @@
-
CeladonDeptStoreElevator_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -1,4 +1,3 @@
-
CeladonMansion2F_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/CeladonPokeCenter2FBeta.asm
+++ b/maps/CeladonPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-
CeladonPokeCenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/CeruleanPokeCenter2FBeta.asm
+++ b/maps/CeruleanPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-
CeruleanPokeCenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/CinnabarPokeCenter2FBeta.asm
+++ b/maps/CinnabarPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-
CinnabarPokeCenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -1,4 +1,3 @@
-
DragonsDen1F_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/FuchsiaPokeCenter2FBeta.asm
+++ b/maps/FuchsiaPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-
FuchsiaPokeCenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -1,4 +1,3 @@
-
GoldenrodDeptStoreElevator_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -1,6 +1,6 @@
const_value set 2
const GOLDENRODFLOWERSHOP_TEACHER
- const GOLDENRODFLOWERSHOP_LASS
+ const GOLDENRODFLOWERSHOP_FLORIA
GoldenrodFlowerShop_MapScriptHeader:
.MapTriggers:
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -8,7 +8,7 @@
const LAKEOFRAGE_COOLTRAINER_M
const LAKEOFRAGE_COOLTRAINER_F2
const LAKEOFRAGE_GYARADOS
- const LAKEOFRAGE_SUPER_NERD2
+ const LAKEOFRAGE_WESLEY
const LAKEOFRAGE_POKE_BALL1
const LAKEOFRAGE_POKE_BALL2
@@ -41,11 +41,11 @@
.Wesley
checkcode VAR_WEEKDAY
if_equal WEDNESDAY, .WesleyAppears
- disappear LAKEOFRAGE_SUPER_NERD2
+ disappear LAKEOFRAGE_WESLEY
return
.WesleyAppears
- appear LAKEOFRAGE_SUPER_NERD2
+ appear LAKEOFRAGE_WESLEY
return
LanceScript_0x70022:
--- a/maps/LavenderPokeCenter2FBeta.asm
+++ b/maps/LavenderPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-
LavenderPokeCenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,4 +1,3 @@
-
MobileBattleRoom_MapScriptHeader:
.MapTriggers:
db 2
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -1,4 +1,3 @@
-
MobileTradeRoomMobile_MapScriptHeader:
.MapTriggers:
db 2
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -30,7 +30,7 @@
disappear MOUNTMOONSQUARE_ROCK
return
-UnknownScript_0x7709a:
+ClefairyDance:
checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY
iftrue .NoDancing
checkcode VAR_WEEKDAY
@@ -84,8 +84,8 @@
dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
-MapMountMoonSquareSignpost1Script:
- jumptext UnknownText_0x7713b
+DontLitterSign:
+ jumptext DontLitterSignText
MtMoonSquareRock:
jumpstd smashrock
@@ -134,7 +134,7 @@
step_right
step_end
-UnknownText_0x7713b:
+DontLitterSignText:
text "MT.MOON SQUARE"
line "DON'T LITTER"
done
@@ -151,12 +151,12 @@
.XYTriggers:
db 1
- xy_trigger 0, $b, $7, $0, UnknownScript_0x7709a, $0, $0
+ xy_trigger 0, $b, $7, $0, ClefairyDance, $0, $0
.Signposts:
db 2
signpost 7, 7, SIGNPOST_ITEM, MountMoonSquareHiddenMoonStone
- signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script
+ signpost 7, 17, SIGNPOST_READ, DontLitterSign
.PersonEvents:
db 3
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -131,7 +131,7 @@
applymovement NEWBARKTOWN_SILVER, Movement_SilverReturnsToTheShadows_NBT
end
-MapNewBarkTownSignpost0Script:
+NewBarkTownSign:
jumptext NewBarkTownSignText
MapNewBarkTownSignpost1Script:
@@ -303,7 +303,7 @@
.Signposts:
db 4
- signpost 8, 8, SIGNPOST_READ, MapNewBarkTownSignpost0Script
+ signpost 8, 8, SIGNPOST_READ, NewBarkTownSign
signpost 5, 11, SIGNPOST_READ, MapNewBarkTownSignpost1Script
signpost 3, 3, SIGNPOST_READ, MapNewBarkTownSignpost2Script
signpost 13, 9, SIGNPOST_READ, MapNewBarkTownSignpost3Script
--- a/maps/PewterPokeCEnter2FBeta.asm
+++ b/maps/PewterPokeCEnter2FBeta.asm
@@ -1,4 +1,3 @@
-
PewterPokeCEnter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -1,4 +1,3 @@
-
RedsHouse2F_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -32,8 +32,8 @@
closetext
end
-MapRoute1Signpost0Script:
- jumptext UnknownText_0x1ac675
+Route1Sign:
+ jumptext Route1SignText
FruitTreeScript_0x1ac581:
fruittree FRUITTREE_ROUTE_1
@@ -73,7 +73,7 @@
line "have trained hard."
done
-UnknownText_0x1ac675:
+Route1SignText:
text "ROUTE 1"
para "PALLET TOWN -"
@@ -92,7 +92,7 @@
.Signposts:
db 1
- signpost 27, 7, SIGNPOST_READ, MapRoute1Signpost0Script
+ signpost 27, 7, SIGNPOST_READ, Route1Sign
.PersonEvents:
db 3
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -1,4 +1,3 @@
-
Route10North_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/Route10PokeCenter2FBeta.asm
+++ b/maps/Route10PokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-
Route10PokeCenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -31,8 +31,8 @@
closetext
end
-MapRoute10SouthSignpost0Script:
- jumptext UnknownText_0x1ae4dc
+Route10Sign:
+ jumptext Route10SignText
HikerJimSeenText:
text "Hahahah!"
@@ -68,7 +68,7 @@
line "this…"
done
-UnknownText_0x1ae4dc:
+Route10SignText:
text "ROUTE 10"
para "CERULEAN CITY -"
@@ -88,7 +88,7 @@
.Signposts:
db 1
- signpost 3, 5, SIGNPOST_READ, MapRoute10SouthSignpost0Script
+ signpost 3, 5, SIGNPOST_READ, Route10Sign
.PersonEvents:
db 2
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -56,8 +56,8 @@
closetext
end
-MapRoute11Signpost0Script:
- jumptext UnknownText_0x68238
+Route11Sign:
+ jumptext Route11SignText
FruitTreeScript_0x68055:
fruittree FRUITTREE_ROUTE_11
@@ -142,7 +142,7 @@
cont "in your #MON."
done
-UnknownText_0x68238:
+Route11SignText:
text "ROUTE 11"
done
@@ -158,7 +158,7 @@
.Signposts:
db 2
- signpost 7, 3, SIGNPOST_READ, MapRoute11Signpost0Script
+ signpost 7, 3, SIGNPOST_READ, Route11Sign
signpost 5, 32, SIGNPOST_ITEM, Route11HiddenRevive
.PersonEvents:
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -57,11 +57,11 @@
closetext
end
-MapRoute12Signpost0Script:
- jumptext UnknownText_0x1a72a0
+Route12Sign:
+ jumptext Route12SignText
-MapRoute12Signpost1Script:
- jumptext UnknownText_0x1a72c1
+FishingSpotSign:
+ jumptext FishingSpotSignText
Route12Calcium:
itemball CALCIUM
@@ -156,7 +156,7 @@
cont "an angler like me."
done
-UnknownText_0x1a72a0:
+Route12SignText:
text "ROUTE 12"
para "NORTH TO LAVENDER"
@@ -163,7 +163,7 @@
line "TOWN"
done
-UnknownText_0x1a72c1:
+FishingSpotSignText:
text "FISHING SPOT"
done
@@ -180,8 +180,8 @@
.Signposts:
db 3
- signpost 27, 11, SIGNPOST_READ, MapRoute12Signpost0Script
- signpost 9, 13, SIGNPOST_READ, MapRoute12Signpost1Script
+ signpost 27, 11, SIGNPOST_READ, Route12Sign
+ signpost 9, 13, SIGNPOST_READ, FishingSpotSign
signpost 13, 14, SIGNPOST_ITEM, Route12HiddenElixer
.PersonEvents:
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -67,14 +67,14 @@
closetext
end
-MapRoute13Signpost0Script:
- jumptext UnknownText_0x1a271c
+Route13TrainerTips:
+ jumptext Route13TrainerTipsText
-MapRoute13Signpost1Script:
- jumptext UnknownText_0x1a275b
+Route13Sign:
+ jumptext Route13SignText
-MapRoute13Signpost2Script:
- jumptext UnknownText_0x1a277d
+Route13DirectionsSign:
+ jumptext Route13DirectionsSignText
Route13HiddenCalcium:
dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM
@@ -169,7 +169,7 @@
cont "little."
done
-UnknownText_0x1a271c:
+Route13TrainerTipsText:
text "TRAINER TIPS"
para "Look! Right there,"
@@ -177,7 +177,7 @@
cont "of the post."
done
-UnknownText_0x1a275b:
+Route13SignText:
text "ROUTE 13"
para "NORTH TO SILENCE"
@@ -184,7 +184,7 @@
line "BRIDGE"
done
-UnknownText_0x1a277d:
+Route13DirectionsSignText:
text "NORTH TO LAVENDER"
line "TOWN"
@@ -204,9 +204,9 @@
.Signposts:
db 4
- signpost 13, 29, SIGNPOST_READ, MapRoute13Signpost0Script
- signpost 11, 41, SIGNPOST_READ, MapRoute13Signpost1Script
- signpost 13, 17, SIGNPOST_READ, MapRoute13Signpost2Script
+ signpost 13, 29, SIGNPOST_READ, Route13TrainerTips
+ signpost 11, 41, SIGNPOST_READ, Route13Sign
+ signpost 13, 17, SIGNPOST_READ, Route13DirectionsSign
signpost 13, 30, SIGNPOST_ITEM, Route13HiddenCalcium
.PersonEvents:
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -80,8 +80,8 @@
closetext
end
-MapRoute15Signpost0Script:
- jumptext UnknownText_0x1aa8e3
+Route15Sign:
+ jumptext Route15SignText
Route15PPUp:
itemball PP_UP
@@ -194,7 +194,7 @@
cont "I'd be the best!"
done
-UnknownText_0x1aa8e3:
+Route15SignText:
text "ROUTE 15"
para "FUCHSIA CITY -"
@@ -215,7 +215,7 @@
.Signposts:
db 1
- signpost 9, 19, SIGNPOST_READ, MapRoute15Signpost0Script
+ signpost 9, 19, SIGNPOST_READ, Route15Sign
.PersonEvents:
db 7
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -1,4 +1,3 @@
-
Route16_MapScriptHeader:
.MapTriggers:
db 0
@@ -22,10 +21,10 @@
clearflag ENGINE_ALWAYS_ON_BIKE
return
-MapRoute16Signpost0Script:
- jumptext UnknownText_0x1ad32f
+CyclingRoadSign:
+ jumptext CyclingRoadSignText
-UnknownText_0x1ad32f:
+CyclingRoadSignText:
text "CYCLING ROAD"
para "DOWNHILL COASTING"
@@ -49,7 +48,7 @@
.Signposts:
db 1
- signpost 5, 5, SIGNPOST_READ, MapRoute16Signpost0Script
+ signpost 5, 5, SIGNPOST_READ, CyclingRoadSign
.PersonEvents:
db 0
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -31,8 +31,8 @@
closetext
end
-MapRoute18Signpost0Script:
- jumptext UnknownText_0x1ad051
+Route18Sign:
+ jumptext Route18SignText
Bird_keeperBorisSeenText:
text "If you're looking"
@@ -70,7 +70,7 @@
line "the shortcut."
done
-UnknownText_0x1ad051:
+Route18SignText:
text "ROUTE 18"
para "CELADON CITY -"
@@ -91,7 +91,7 @@
.Signposts:
db 1
- signpost 5, 9, SIGNPOST_READ, MapRoute18Signpost0Script
+ signpost 5, 9, SIGNPOST_READ, Route18Sign
.PersonEvents:
db 2
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -93,23 +93,23 @@
faceplayer
opentext
checkevent EVENT_CINNABAR_ROCKS_CLEARED
- iftrue UnknownScript_0x19ea6f
- writetext UnknownText_0x19ed45
+ iftrue .RocksCleared
+ writetext Route19FisherText1
waitbutton
closetext
end
-UnknownScript_0x19ea6f:
- writetext UnknownText_0x19ed7d
+.RocksCleared
+ writetext Route19FisherText2
waitbutton
closetext
end
-MapRoute19Signpost0Script:
- jumptext UnknownText_0x19edbc
+Route19Sign:
+ jumptext Route19SignText
-MapRoute19Signpost1Script:
- jumptext UnknownText_0x19ede5
+CarefulSwimmingSign:
+ jumptext CarefulSwimmingSignText
SwimmermHaroldSeenText:
text "Have you ever gone"
@@ -207,13 +207,13 @@
line "Time for a swim!"
done
-UnknownText_0x19ed45:
+Route19FisherText1:
text "Who knows how long"
line "it would take to"
cont "move this boulder…"
done
-UnknownText_0x19ed7d:
+Route19FisherText2:
text "The roadwork is"
line "finally finished."
@@ -221,7 +221,7 @@
line "fishing again."
done
-UnknownText_0x19edbc:
+Route19SignText:
text "ROUTE 19"
para "FUCHSIA CITY -"
@@ -228,7 +228,7 @@
line "SEAFOAM ISLANDS"
done
-UnknownText_0x19ede5:
+CarefulSwimmingSignText:
text "Please be careful"
line "if you are swim-"
cont "ming to SEAFOAM"
@@ -250,8 +250,8 @@
.Signposts:
db 2
- signpost 13, 11, SIGNPOST_READ, MapRoute19Signpost0Script
- signpost 1, 11, SIGNPOST_READ, MapRoute19Signpost1Script
+ signpost 13, 11, SIGNPOST_READ, Route19Sign
+ signpost 1, 11, SIGNPOST_READ, CarefulSwimmingSign
.PersonEvents:
db 6
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -48,8 +48,8 @@
closetext
end
-MapRoute2Signpost0Script:
- jumptext UnknownText_0x1ac47a
+Route2Sign:
+ jumptext Route2SignText
MapRoute2Signpost1Script:
jumptext UnknownText_0x1ac49f
@@ -135,7 +135,7 @@
line "feel!"
done
-UnknownText_0x1ac47a:
+Route2SignText:
text "ROUTE 2"
para "VIRIDIAN CITY -"
@@ -163,7 +163,7 @@
.Signposts:
db 6
- signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script
+ signpost 51, 7, SIGNPOST_READ, Route2Sign
signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script
signpost 23, 7, SIGNPOST_ITEM, Route2HiddenMaxEther
signpost 14, 4, SIGNPOST_ITEM, Route2HiddenFullHeal
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -51,8 +51,8 @@
closetext
end
-MapRoute20Signpost0Script:
- jumptext UnknownText_0x1acec2
+CinnabarGymSign:
+ jumptext CinnabarGymSignText
SwimmerfNicoleSeenText:
text "I feel so much"
@@ -107,7 +107,7 @@
cont "ponds and rivers."
done
-UnknownText_0x1acec2:
+CinnabarGymSignText:
text "What does this"
line "sign say?"
@@ -128,7 +128,7 @@
.Signposts:
db 1
- signpost 11, 37, SIGNPOST_READ, MapRoute20Signpost0Script
+ signpost 11, 37, SIGNPOST_READ, CinnabarGymSign
.PersonEvents:
db 3
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -1,4 +1,3 @@
-
Route22_MapScriptHeader:
.MapTriggers:
db 0
@@ -6,10 +5,10 @@
.MapCallbacks:
db 0
-MapRoute22Signpost0Script:
- jumptext UnknownText_0x7c005
+VictoryRoadEntranceSign:
+ jumptext VictoryRoadEntranceSignText
-UnknownText_0x7c005:
+VictoryRoadEntranceSignText:
text "#MON LEAGUE"
para "VICTORY ROAD"
@@ -29,7 +28,7 @@
.Signposts:
db 1
- signpost 7, 15, SIGNPOST_READ, MapRoute22Signpost0Script
+ signpost 7, 15, SIGNPOST_READ, VictoryRoadEntranceSign
.PersonEvents:
db 0
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -1,4 +1,3 @@
-
Route23_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -186,8 +186,8 @@
closetext
end
-MapRoute25Signpost0Script:
- jumptext UnknownText_0x19f567
+BillsHouseSign:
+ jumptext BillsHouseSignText
Route25Protein:
itemball PROTEIN
@@ -423,12 +423,12 @@
cont "standing!"
done
-UnknownText_0x19f567:
+BillsHouseSignText:
text "SEA COTTAGE"
line "BILL'S HOUSE"
done
-UnknownText_0x19f581:
+; unused
text "BILL'S HOUSE"
done
@@ -447,7 +447,7 @@
.Signposts:
db 2
- signpost 5, 45, SIGNPOST_READ, MapRoute25Signpost0Script
+ signpost 5, 45, SIGNPOST_READ, BillsHouseSign
signpost 5, 4, SIGNPOST_ITEM, Route25HiddenPotion
.PersonEvents:
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -245,8 +245,8 @@
closetext
end
-MapRoute26Signpost0Script:
- jumptext UnknownText_0x1a5364
+Route26Sign:
+ jumptext Route26SignText
FruitTreeScript_0x1a4ec2:
fruittree FRUITTREE_ROUTE_26
@@ -405,7 +405,7 @@
line "give up."
done
-UnknownText_0x1a5364:
+Route26SignText:
text "ROUTE 26"
para "#MON LEAGUE"
@@ -427,7 +427,7 @@
.Signposts:
db 1
- signpost 6, 8, SIGNPOST_READ, MapRoute26Signpost0Script
+ signpost 6, 8, SIGNPOST_READ, Route26Sign
.PersonEvents:
db 8
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -300,8 +300,8 @@
closetext
end
-MapRoute27Signpost0Script:
- jumptext UnknownText_0x1a0e7f
+TohjoFallsSign:
+ jumptext TohjoFallsSignText
Route27TMSolarbeam:
itemball TM_SOLARBEAM
@@ -462,7 +462,7 @@
line "mand #MON."
done
-UnknownText_0x1a0e7f:
+TohjoFallsSignText:
text "TOHJO FALLS"
para "THE LINK BETWEEN"
@@ -486,7 +486,7 @@
.Signposts:
db 1
- signpost 7, 25, SIGNPOST_READ, MapRoute27Signpost0Script
+ signpost 7, 25, SIGNPOST_READ, TohjoFallsSign
.PersonEvents:
db 9
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -1,4 +1,3 @@
-
Route28_MapScriptHeader:
.MapTriggers:
db 0
@@ -6,14 +5,14 @@
.MapCallbacks:
db 0
-MapRoute28Signpost0Script:
- jumptext UnknownText_0x1a5413
+Route28Sign:
+ jumptext Route28SignText
Route28HiddenRareCandy:
dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY
-UnknownText_0x1a5413:
+Route28SignText:
text "ROUTE 28"
done
@@ -31,7 +30,7 @@
.Signposts:
db 2
- signpost 5, 31, SIGNPOST_READ, MapRoute28Signpost0Script
+ signpost 5, 31, SIGNPOST_READ, Route28Sign
signpost 2, 25, SIGNPOST_ITEM, Route28HiddenRareCandy
.PersonEvents:
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -5,7 +5,7 @@
const ROUTE29_FRUIT_TREE
const ROUTE29_FISHER
const ROUTE29_COOLTRAINER_M2
- const ROUTE29_TEACHER2
+ const ROUTE29_TUSCANY
const ROUTE29_POKE_BALL
Route29_MapScriptHeader:
@@ -34,13 +34,13 @@
iftrue .DoesTuscanyAppear
.TuscanyDisappears
- disappear ROUTE29_TEACHER2
+ disappear ROUTE29_TUSCANY
return
.DoesTuscanyAppear
checkcode VAR_WEEKDAY
if_not_equal TUESDAY, .TuscanyDisappears
- appear ROUTE29_TEACHER2
+ appear ROUTE29_TUSCANY
return
Route29Tutorial1:
@@ -207,11 +207,11 @@
closetext
end
-MapRoute29Signpost0Script:
- jumptext Route29SignText1
+Route29Sign1:
+ jumptext Route29Sign1Text
-MapRoute29Signpost1Script:
- jumptext Route29SignText2
+Route29Sign2:
+ jumptext Route29Sign2Text
Route29FruitTree:
fruittree FRUITTREE_ROUTE_29
@@ -406,7 +406,7 @@
cont "is unfortunate…"
done
-Route29SignText1:
+Route29Sign1Text:
text "ROUTE 29"
para "CHERRYGROVE CITY -"
@@ -413,7 +413,7 @@
line "NEW BARK TOWN"
done
-Route29SignText2:
+Route29Sign2Text:
text "ROUTE 29"
para "CHERRYGROVE CITY -"
@@ -435,8 +435,8 @@
.Signposts:
db 2
- signpost 7, 51, SIGNPOST_READ, MapRoute29Signpost0Script
- signpost 5, 3, SIGNPOST_READ, MapRoute29Signpost1Script
+ signpost 7, 51, SIGNPOST_READ, Route29Sign1
+ signpost 5, 3, SIGNPOST_READ, Route29Sign2
.PersonEvents:
db 8
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -226,17 +226,17 @@
Route30CooltrainerFScript:
jumptextfaceplayer Route30CooltrainerFText
-MapRoute30Signpost0Script:
- jumptext Route30MapSignText
+Route30Sign:
+ jumptext Route30SignText
-MapRoute30Signpost1Script:
- jumptext Route30DirectionsToMrPokemonsHouseSignText
+MrPokemonsHouseDirectionsSign:
+ jumptext MrPokemonsHouseDirectionsSignText
-MapRoute30Signpost2Script:
- jumptext Route30MrPokemonsHouseSignText
+MrPokemonsHouseSign:
+ jumptext MrPokemonsHouseSignText
-MapRoute30Signpost3Script:
- jumptext Route30TrainerTipsSignText
+Route30TrainerTips:
+ jumptext Route30TrainerTipsText
Route30Antidote:
itemball ANTIDOTE
@@ -365,7 +365,7 @@
cont "prepare to battle."
done
-Route30MapSignText:
+Route30SignText:
text "ROUTE 30"
para "VIOLET CITY -"
@@ -372,16 +372,16 @@
line "CHERRYGROVE CITY"
done
-Route30DirectionsToMrPokemonsHouseSignText:
+MrPokemonsHouseDirectionsSignText:
text "MR.#MON'S HOUSE"
line "STRAIGHT AHEAD!"
done
-Route30MrPokemonsHouseSignText:
+MrPokemonsHouseSignText:
text "MR.#MON'S HOUSE"
done
-Route30TrainerTipsSignText:
+Route30TrainerTipsText:
text "TRAINER TIPS"
para "No stealing other"
@@ -421,10 +421,10 @@
.Signposts:
db 5
- signpost 43, 9, SIGNPOST_READ, MapRoute30Signpost0Script
- signpost 29, 13, SIGNPOST_READ, MapRoute30Signpost1Script
- signpost 5, 15, SIGNPOST_READ, MapRoute30Signpost2Script
- signpost 21, 3, SIGNPOST_READ, MapRoute30Signpost3Script
+ signpost 43, 9, SIGNPOST_READ, Route30Sign
+ signpost 29, 13, SIGNPOST_READ, MrPokemonsHouseDirectionsSign
+ signpost 5, 15, SIGNPOST_READ, MrPokemonsHouseSign
+ signpost 21, 3, SIGNPOST_READ, Route30TrainerTips
signpost 9, 14, SIGNPOST_ITEM, Route30HiddenPotion
.PersonEvents:
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -251,11 +251,11 @@
Route31YoungsterScript:
jumptextfaceplayer Route31YoungsterText
-MapRoute31Signpost0Script:
- jumptext Route31Signpost0Text
+Route31Sign:
+ jumptext Route31SignText
-MapRoute31Signpost1Script:
- jumptext Route31Signpost1Text
+DarkCaveSign:
+ jumptext DarkCaveSignText
Route31CooltrainerMScript:
jumptextfaceplayer Route31CooltrainerMText
@@ -408,7 +408,7 @@
line "VIOLET CITY's GYM."
done
-Route31Signpost0Text:
+Route31SignText:
text "ROUTE 31"
para "VIOLET CITY -"
@@ -415,7 +415,7 @@
line "CHERRYGROVE CITY"
done
-Route31Signpost1Text:
+DarkCaveSignText:
text "DARK CAVE"
done
@@ -434,8 +434,8 @@
.Signposts:
db 2
- signpost 5, 7, SIGNPOST_READ, MapRoute31Signpost0Script
- signpost 5, 31, SIGNPOST_READ, MapRoute31Signpost1Script
+ signpost 5, 7, SIGNPOST_READ, Route31Sign
+ signpost 5, 31, SIGNPOST_READ, DarkCaveSign
.PersonEvents:
db 7
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -11,7 +11,7 @@
const ROUTE32_FISHER4
const ROUTE32_POKE_BALL1
const ROUTE32_FISHER5
- const ROUTE32_LASS2
+ const ROUTE32_FRIEDA
const ROUTE32_POKE_BALL2
Route32_MapScriptHeader:
@@ -42,11 +42,11 @@
.Frieda:
checkcode VAR_WEEKDAY
if_equal FRIDAY, .FriedaAppears
- disappear ROUTE32_LASS2
+ disappear ROUTE32_FRIEDA
return
.FriedaAppears
- appear ROUTE32_LASS2
+ appear ROUTE32_FRIEDA
return
Route32CooltrainerMScript:
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -138,8 +138,8 @@
jumpstd rematchm
end
-MapRoute33Signpost0Script:
- jumptext Route33RouteSignText
+Route33Sign:
+ jumptext Route33SignText
Route33FruitTreeScript:
fruittree FRUITTREE_ROUTE_33
@@ -190,7 +190,7 @@
line "outside."
done
-Route33RouteSignText:
+Route33SignText:
text "ROUTE 33"
done
@@ -207,7 +207,7 @@
.Signposts:
db 1
- signpost 11, 11, SIGNPOST_READ, MapRoute33Signpost0Script
+ signpost 11, 11, SIGNPOST_READ, Route33Sign
.PersonEvents:
db 3
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -475,17 +475,17 @@
closetext
end
-MapRoute34UnusedSignpostScript:
+; unused
jumptext MapRoute34UnusedSignpostText
-MapRoute34Signpost0Script:
- jumptext MapRoute34Signpost0Text
+Route34Sign:
+ jumptext Route34SignText
-MapRoute34Signpost1Script:
- jumptext MapRoute34Signpost1Text
+Route34TrainerTips:
+ jumptext Route34TrainerTipsText
-MapRoute34Signpost2Script:
- jumptext MapRoute34Signpost2Text
+DayCareSign:
+ jumptext DayCareSignText
Route34Nugget:
itemball NUGGET
@@ -736,7 +736,7 @@
line "THROUGH THE GATE"
done
-MapRoute34Signpost0Text:
+Route34SignText:
text "ROUTE 34"
para "GOLDENROD CITY -"
@@ -746,7 +746,7 @@
line "SOMEWHERE BETWEEN"
done
-MapRoute34Signpost1Text:
+Route34TrainerTipsText:
text "TRAINER TIPS"
para "BERRY trees grow"
@@ -758,7 +758,7 @@
cont "which BERRIES."
done
-MapRoute34Signpost2Text:
+DayCareSignText:
text "DAY-CARE"
para "LET US RAISE YOUR"
@@ -782,9 +782,9 @@
.Signposts:
db 5
- signpost 6, 12, SIGNPOST_READ, MapRoute34Signpost0Script
- signpost 33, 13, SIGNPOST_READ, MapRoute34Signpost1Script
- signpost 13, 10, SIGNPOST_READ, MapRoute34Signpost2Script
+ signpost 6, 12, SIGNPOST_READ, Route34Sign
+ signpost 33, 13, SIGNPOST_READ, Route34TrainerTips
+ signpost 13, 10, SIGNPOST_READ, DayCareSign
signpost 32, 8, SIGNPOST_ITEM, Route34HiddenRareCandy
signpost 19, 17, SIGNPOST_ITEM, Route34HiddenSuperPotion
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -267,8 +267,8 @@
closetext
end
-MapRoute35Signpost1Script:
- jumptext UnknownText_0x19cf94
+Route35Sign:
+ jumptext Route35SignText
Route35TMRollout:
itemball TM_ROLLOUT
@@ -458,7 +458,7 @@
line "where safely."
done
-UnknownText_0x19cf94:
+Route35SignText:
text "ROUTE 35"
done
@@ -477,8 +477,8 @@
.Signposts:
db 2
- signpost 7, 1, SIGNPOST_READ, MapRoute35Signpost1Script
- signpost 31, 11, SIGNPOST_READ, MapRoute35Signpost1Script
+ signpost 7, 1, SIGNPOST_READ, Route35Sign
+ signpost 31, 11, SIGNPOST_READ, Route35Sign
.PersonEvents:
db 11
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -5,8 +5,8 @@
const ROUTE36_LASS1
const ROUTE36_FISHER
const ROUTE36_FRUIT_TREE
- const ROUTE36_YOUNGSTER3
- const ROUTE36_LASS2
+ const ROUTE36_ARTHUR
+ const ROUTE36_FLORIA
const ROUTE36_SUICUNE
Route36_MapScriptHeader:
@@ -33,14 +33,14 @@
ArthurCallback:
checkcode VAR_WEEKDAY
if_equal THURSDAY, .ArthurAppears
- disappear ROUTE36_YOUNGSTER3
+ disappear ROUTE36_ARTHUR
return
.ArthurAppears
- appear ROUTE36_YOUNGSTER3
+ appear ROUTE36_ARTHUR
return
-UnknownScript_0x19401b:
+Route36SuicuneScript:
showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
@@ -54,32 +54,33 @@
domaptrigger CIANWOOD_CITY, $1
end
-WeirdTreeScript_0x19403c:
+SudowoodoScript:
checkitem SQUIRTBOTTLE
- iftrue UnknownScript_0x19404a
+ iftrue .Fight
+
waitsfx
playsound SFX_SANDSTORM
- applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249
+ applymovement ROUTE36_WEIRD_TREE, SudowoodoShakeMovement
end
-UnknownScript_0x19404a:
+.Fight
opentext
- writetext UnknownText_0x19426b
+ writetext UseSquirtbottleText
yesorno
- iffalse UnknownScript_0x194079
+ iffalse DidntUseSquirtbottleScript
closetext
; fallthrough
-WateredWeirdTreeScript::
+WateredWeirdTreeScript:: ; export (for when you use Squirtbottle from pack)
opentext
- writetext UnknownText_0x194290
+ writetext UsedSquirtbottleText
waitbutton
closetext
waitsfx
playsound SFX_SANDSTORM
- applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249
+ applymovement ROUTE36_WEIRD_TREE, SudowoodoShakeMovement
opentext
- writetext UnknownText_0x1942aa
+ writetext SudowoodoAttackedText
waitbutton
closetext
loadwildmon SUDOWOODO, 20
@@ -91,7 +92,7 @@
reloadmapafterbattle
end
-UnknownScript_0x194079:
+DidntUseSquirtbottleScript:
closetext
end
@@ -104,29 +105,29 @@
special RefreshSprites
end
-LassScript_0x19408c:
+Route36FloriaScript:
faceplayer
opentext
checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
- iftrue UnknownScript_0x1940b3
+ iftrue .SecondTimeTalking
setevent EVENT_MET_FLORIA
- writetext UnknownText_0x1942f1
+ writetext FloriaText1
waitbutton
closetext
clearevent EVENT_FLORIA_AT_FLOWER_SHOP
checkcode VAR_FACING
- if_equal UP, UnknownScript_0x1940ac
- applymovement ROUTE36_LASS2, MovementData_0x19424e
- disappear ROUTE36_LASS2
+ if_equal UP, .Up
+ applymovement ROUTE36_FLORIA, FloriaMovement1
+ disappear ROUTE36_FLORIA
end
-UnknownScript_0x1940ac:
- applymovement ROUTE36_LASS2, MovementData_0x194258
- disappear ROUTE36_LASS2
+.Up
+ applymovement ROUTE36_FLORIA, FloriaMovement2
+ disappear ROUTE36_FLORIA
end
-UnknownScript_0x1940b3:
- writetext UnknownText_0x1943ed
+.SecondTimeTalking
+ writetext FloriaText2
waitbutton
closetext
end
@@ -357,23 +358,23 @@
closetext
end
-MapRoute36Signpost2Script:
- jumptext UnknownText_0x194924
+Route36Sign:
+ jumptext Route36SignText
-MapRoute36Signpost1Script:
- jumptext UnknownText_0x19492e
+RuinsOfAlphNorthSign:
+ jumptext RuinsOfAlphNorthSignText
-MapRoute36Signpost3Script:
- jumptext UnknownText_0x19494c
+Route36TrainerTips1:
+ jumptext Route36TrainerTips1Text
-MapRoute36Signpost0Script:
- jumptext UnknownText_0x1949ee
+Route36TrainerTips2:
+ jumptext Route36TrainerTips2Text
FruitTreeScript_0x194247:
fruittree FRUITTREE_ROUTE_36
-MovementData_0x194249:
- db $56 ; movement
+SudowoodoShakeMovement:
+ db $56 ; shake
step_end
MovementData_0x19424b:
@@ -381,7 +382,7 @@
fast_jump_step_up
step_end
-MovementData_0x19424e:
+FloriaMovement1:
step_down
step_down
step_down
@@ -393,7 +394,7 @@
step_left
step_end
-MovementData_0x194258:
+FloriaMovement2:
step_left
step_down
step_down
@@ -416,17 +417,17 @@
db $38 ; movement
step_end
-UnknownText_0x19426b:
+UseSquirtbottleText:
text "It's a weird tree."
line "Use SQUIRTBOTTLE?"
done
-UnknownText_0x194290:
+UsedSquirtbottleText:
text "<PLAYER> used the"
line "SQUIRTBOTTLE."
done
-UnknownText_0x1942aa:
+SudowoodoAttackedText:
text "The weird tree"
line "doesn't like the"
cont "SQUIRTBOTTLE!"
@@ -435,7 +436,7 @@
line "attacked!"
done
-UnknownText_0x1942f1:
+FloriaText1:
text "I'm the FLOWER"
line "SHOP's FLORIA!"
@@ -461,7 +462,7 @@
cont "her water bottle!"
done
-UnknownText_0x1943ed:
+FloriaText2:
text "When I told my sis"
line "about the jiggly"
@@ -625,16 +626,16 @@
cont "disappointing."
done
-UnknownText_0x194924:
+Route36SignText:
text "ROUTE 36"
done
-UnknownText_0x19492e:
+RuinsOfAlphNorthSignText:
text "RUINS OF ALPH"
line "NORTH ENTRANCE"
done
-UnknownText_0x19494c:
+Route36TrainerTips1Text:
text "TRAINER TIPS"
para "#MON stats"
@@ -651,7 +652,7 @@
line "#MON grow."
done
-UnknownText_0x1949ee:
+Route36TrainerTips2Text:
text "TRAINER TIPS"
para "Use DIG to return"
@@ -678,24 +679,24 @@
.XYTriggers:
db 2
- xy_trigger 1, $7, $14, $0, UnknownScript_0x19401b, $0, $0
- xy_trigger 1, $7, $16, $0, UnknownScript_0x19401b, $0, $0
+ xy_trigger 1, $7, $14, $0, Route36SuicuneScript, $0, $0
+ xy_trigger 1, $7, $16, $0, Route36SuicuneScript, $0, $0
.Signposts:
db 4
- signpost 1, 29, SIGNPOST_READ, MapRoute36Signpost0Script
- signpost 11, 45, SIGNPOST_READ, MapRoute36Signpost1Script
- signpost 7, 55, SIGNPOST_READ, MapRoute36Signpost2Script
- signpost 7, 21, SIGNPOST_READ, MapRoute36Signpost3Script
+ signpost 1, 29, SIGNPOST_READ, Route36TrainerTips2
+ signpost 11, 45, SIGNPOST_READ, RuinsOfAlphNorthSign
+ signpost 7, 55, SIGNPOST_READ, Route36Sign
+ signpost 7, 21, SIGNPOST_READ, Route36TrainerTips1
.PersonEvents:
db 9
person_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicMark, -1
person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
- person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO
+ person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
person_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
person_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1940b9, -1
person_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x194247, -1
person_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
- person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO
+ person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
person_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -3,7 +3,7 @@
const ROUTE37_WEIRD_TREE2
const ROUTE37_YOUNGSTER
const ROUTE37_FRUIT_TREE1
- const ROUTE37_BUG_CATCHER
+ const ROUTE37_SUNNY
const ROUTE37_FRUIT_TREE2
const ROUTE37_FRUIT_TREE3
@@ -21,11 +21,11 @@
SunnyCallback:
checkcode VAR_WEEKDAY
if_equal SUNDAY, .SunnyAppears
- disappear ROUTE37_BUG_CATCHER
+ disappear ROUTE37_SUNNY
return
.SunnyAppears
- appear ROUTE37_BUG_CATCHER
+ appear ROUTE37_SUNNY
return
TrainerTwinsAnnandanne1:
@@ -104,8 +104,8 @@
closetext
end
-MapRoute37Signpost0Script:
- jumptext UnknownText_0x1a9197
+Route37Sign:
+ jumptext Route37SignText
FruitTreeScript_0x1a8e09:
fruittree FRUITTREE_ROUTE_37_1
@@ -237,7 +237,7 @@
cont "Um… I forgot!"
done
-UnknownText_0x1a9197:
+Route37SignText:
text "ROUTE 37"
done
@@ -253,7 +253,7 @@
.Signposts:
db 2
- signpost 3, 5, SIGNPOST_READ, MapRoute37Signpost0Script
+ signpost 3, 5, SIGNPOST_READ, Route37Sign
signpost 2, 4, SIGNPOST_ITEM, Route37HiddenEther
.PersonEvents:
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -313,11 +313,11 @@
closetext
end
-MapRoute38Signpost0Script:
- jumptext UnknownText_0x1a22fd
+Route38Sign:
+ jumptext Route38SignText
-MapRoute38Signpost1Script:
- jumptext UnknownText_0x1a2324
+Route38TrainerTips:
+ jumptext Route38TrainerTipsText
FruitTreeScript_0x1a1f33:
fruittree FRUITTREE_ROUTE_38
@@ -449,7 +449,7 @@
line "bottle at a time."
done
-UnknownText_0x1a22fd:
+Route38SignText:
text "ROUTE 38"
para "OLIVINE CITY -"
@@ -456,7 +456,7 @@
line "ECRUTEAK CITY"
done
-UnknownText_0x1a2324:
+Route38TrainerTipsText:
text "TRAINER TIPS"
para "If a #MON is"
@@ -486,8 +486,8 @@
.Signposts:
db 2
- signpost 7, 33, SIGNPOST_READ, MapRoute38Signpost0Script
- signpost 13, 5, SIGNPOST_READ, MapRoute38Signpost1Script
+ signpost 7, 33, SIGNPOST_READ, Route38Sign
+ signpost 13, 5, SIGNPOST_READ, Route38TrainerTips
.PersonEvents:
db 7
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -17,9 +17,9 @@
.MapCallbacks:
db 0
-TaurosScript_0x1a5af5:
+Route39Miltank:
opentext
- writetext UnknownText_0x1a5bf9
+ writetext Route39MiltankText
cry MILTANK
waitbutton
closetext
@@ -167,14 +167,14 @@
closetext
end
-MapRoute39Signpost2Script:
- jumptext UnknownText_0x1a5fe3
+Route39Sign:
+ jumptext Route39SignText
-MapRoute39Signpost1Script:
- jumptext UnknownText_0x1a600a
+MoomooFarmSign:
+ jumptext MoomooFarmSignText
-MapRoute39Signpost0Script:
- jumptext UnknownText_0x1a6036
+Route39TrainerTips:
+ jumptext Route39TrainerTipsText
FruitTreeScript_0x1a5bf4:
fruittree FRUITTREE_ROUTE_39
@@ -183,7 +183,7 @@
dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET
-UnknownText_0x1a5bf9:
+Route39MiltankText:
text "MILTANK: Mooo!"
done
@@ -315,7 +315,7 @@
line "anywhere else."
done
-UnknownText_0x1a5fe3:
+Route39SignText:
text "ROUTE 39"
para "OLIVINE CITY -"
@@ -322,7 +322,7 @@
line "ECRUTEAK CITY"
done
-UnknownText_0x1a600a:
+MoomooFarmSignText:
text "MOOMOO FARM"
para "Enjoy Our Fresh"
@@ -329,7 +329,7 @@
line "and Tasty Milk"
done
-UnknownText_0x1a6036:
+Route39TrainerTipsText:
text "TRAINER TIPS"
para "Use HEADBUTT on"
@@ -358,9 +358,9 @@
.Signposts:
db 4
- signpost 31, 5, SIGNPOST_READ, MapRoute39Signpost0Script
- signpost 5, 9, SIGNPOST_READ, MapRoute39Signpost1Script
- signpost 7, 15, SIGNPOST_READ, MapRoute39Signpost2Script
+ signpost 31, 5, SIGNPOST_READ, Route39TrainerTips
+ signpost 5, 9, SIGNPOST_READ, MoomooFarmSign
+ signpost 7, 15, SIGNPOST_READ, Route39Sign
signpost 13, 5, SIGNPOST_ITEM, Route39HiddenNugget
.PersonEvents:
@@ -368,10 +368,10 @@
person_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSailorEugene, -1
person_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1
person_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
- person_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TaurosScript_0x1a5af5, -1
- person_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TaurosScript_0x1a5af5, -1
- person_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TaurosScript_0x1a5af5, -1
- person_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TaurosScript_0x1a5af5, -1
+ person_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
+ person_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
+ person_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
+ person_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
person_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicNorman, -1
person_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
person_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -44,8 +44,8 @@
closetext
end
-MapRoute4Signpost0Script:
- jumptext UnknownText_0x1ae384
+MtMoonSquareSign:
+ jumptext MtMoonSquareSignText
Route4HPUp:
itemball HP_UP
@@ -114,7 +114,7 @@
line "some more…"
done
-UnknownText_0x1ae384:
+MtMoonSquareSignText:
text "MT.MOON SQUARE"
para "Just go up the"
@@ -134,7 +134,7 @@
.Signposts:
db 2
- signpost 7, 3, SIGNPOST_READ, MapRoute4Signpost0Script
+ signpost 7, 3, SIGNPOST_READ, MtMoonSquareSign
signpost 3, 10, SIGNPOST_ITEM, Route4HiddenUltraBall
.PersonEvents:
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -7,7 +7,7 @@
const ROUTE40_ROCK2
const ROUTE40_ROCK3
const ROUTE40_LASS1
- const ROUTE40_BUENA
+ const ROUTE40_MONICA
const ROUTE40_POKEFAN_M
const ROUTE40_LASS2
const ROUTE40_STANDING_YOUNGSTER
@@ -27,11 +27,11 @@
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
checkcode VAR_WEEKDAY
if_equal MONDAY, .MonicaAppears
- disappear ROUTE40_BUENA
+ disappear ROUTE40_MONICA
return
.MonicaAppears
- appear ROUTE40_BUENA
+ appear ROUTE40_MONICA
return
TrainerSwimmerfElaine:
@@ -131,8 +131,8 @@
closetext
end
-MapRoute40Signpost0Script:
- jumptext UnknownText_0x1a6767
+Route40Sign:
+ jumptext Route40SignText
Route40Rock:
jumpstd smashrock
@@ -333,7 +333,7 @@
cont "Monday. How sad…"
done
-UnknownText_0x1a6767:
+Route40SignText:
text "ROUTE 40"
para "CIANWOOD CITY -"
@@ -353,7 +353,7 @@
.Signposts:
db 2
- signpost 10, 14, SIGNPOST_READ, MapRoute40Signpost0Script
+ signpost 10, 14, SIGNPOST_READ, Route40Sign
signpost 8, 7, SIGNPOST_ITEM, Route40HiddenHyperPotion
.PersonEvents:
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -26,7 +26,7 @@
UnknownScript_0x1a9217:
end
-UnknownScript_0x1a9218:
+Route42SuicuneScript:
showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
@@ -186,17 +186,17 @@
closetext
end
-MapRoute42Signpost0Script:
- jumptext UnknownText_0x1a9537
+Route42Sign1:
+ jumptext Route42Sign1Text
-MapRoute42Signpost1Script:
- jumptext UnknownText_0x1a955f
+MtMortarSign1:
+ jumptext MtMortarSign1Text
-MapRoute42Signpost2Script:
- jumptext UnknownText_0x1a9580
+MtMortarSign2:
+ jumptext MtMortarSign2Text
-MapRoute42Signpost3Script:
- jumptext UnknownText_0x1a95a1
+Route42Sign2:
+ jumptext Route42Sign2Text
Route42UltraBall:
itemball ULTRA_BALL
@@ -293,7 +293,7 @@
line "it. Please?"
done
-UnknownText_0x1a9537:
+Route42Sign1Text:
text "ROUTE 42"
para "ECRUTEAK CITY -"
@@ -300,7 +300,7 @@
line "MAHOGANY TOWN"
done
-UnknownText_0x1a955f:
+MtMortarSign1Text:
text "MT.MORTAR"
para "WATERFALL CAVE"
@@ -307,7 +307,7 @@
line "INSIDE"
done
-UnknownText_0x1a9580:
+MtMortarSign2Text:
text "MT.MORTAR"
para "WATERFALL CAVE"
@@ -314,7 +314,7 @@
line "INSIDE"
done
-UnknownText_0x1a95a1:
+Route42Sign2Text:
text "ROUTE 42"
para "ECRUTEAK CITY -"
@@ -335,14 +335,14 @@
.XYTriggers:
db 1
- xy_trigger 1, $e, $18, $0, UnknownScript_0x1a9218, $0, $0
+ xy_trigger 1, $e, $18, $0, Route42SuicuneScript, $0, $0
.Signposts:
db 5
- signpost 10, 4, SIGNPOST_READ, MapRoute42Signpost0Script
- signpost 5, 7, SIGNPOST_READ, MapRoute42Signpost1Script
- signpost 9, 45, SIGNPOST_READ, MapRoute42Signpost2Script
- signpost 8, 54, SIGNPOST_READ, MapRoute42Signpost3Script
+ signpost 10, 4, SIGNPOST_READ, Route42Sign1
+ signpost 5, 7, SIGNPOST_READ, MtMortarSign1
+ signpost 9, 45, SIGNPOST_READ, MtMortarSign2
+ signpost 8, 54, SIGNPOST_READ, Route42Sign2
signpost 11, 16, SIGNPOST_ITEM, Route42HiddenMaxPotion
.PersonEvents:
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -312,14 +312,14 @@
jumpstd packfullf
end
-MapRoute43Signpost0Script:
- jumptext UnknownText_0x19d67b
+Route43Sign1:
+ jumptext Route43Sign1Text
-MapRoute43Signpost1Script:
- jumptext UnknownText_0x19d6a2
+Route43Sign2:
+ jumptext Route43Sign2Text
-MapRoute43Signpost2Script:
- jumptext UnknownText_0x19d6c9
+Route43TrainerTips:
+ jumptext Route43TrainerTipsText
FruitTreeScript_0x19d266:
fruittree FRUITTREE_ROUTE_43
@@ -467,7 +467,7 @@
cont "adorable thing?"
done
-UnknownText_0x19d67b:
+Route43Sign1Text:
text "ROUTE 43"
para "LAKE OF RAGE -"
@@ -474,7 +474,7 @@
line "MAHOGANY TOWN"
done
-UnknownText_0x19d6a2:
+Route43Sign2Text:
text "ROUTE 43"
para "LAKE OF RAGE -"
@@ -481,7 +481,7 @@
line "MAHOGANY TOWN"
done
-UnknownText_0x19d6c9:
+Route43TrainerTipsText:
text "TRAINER TIPS"
para "All #MON have"
@@ -520,9 +520,9 @@
.Signposts:
db 3
- signpost 3, 13, SIGNPOST_READ, MapRoute43Signpost0Script
- signpost 49, 11, SIGNPOST_READ, MapRoute43Signpost1Script
- signpost 38, 16, SIGNPOST_READ, MapRoute43Signpost2Script
+ signpost 3, 13, SIGNPOST_READ, Route43Sign1
+ signpost 49, 11, SIGNPOST_READ, Route43Sign2
+ signpost 38, 16, SIGNPOST_READ, Route43TrainerTips
.PersonEvents:
db 8
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -299,11 +299,11 @@
closetext
end
-MapRoute44Signpost0Script:
- jumptext UnknownText_0x19dfb3
+Route44Sign1:
+ jumptext Route44Sign1Text
-MapRoute44Signpost1Script:
- jumptext UnknownText_0x19dfcc
+Route44Sign2:
+ jumptext Route44Sign2Text
FruitTreeScript_0x19da40:
fruittree FRUITTREE_ROUTE_44
@@ -495,12 +495,12 @@
cont "today--an elite."
done
-UnknownText_0x19dfb3:
+Route44Sign1Text:
text "ROUTE 44"
line "ICE PATH AHEAD"
done
-UnknownText_0x19dfcc:
+Route44Sign2Text:
text "ROUTE 44"
para "MAHOGANY TOWN -"
@@ -520,8 +520,8 @@
.Signposts:
db 3
- signpost 7, 53, SIGNPOST_READ, MapRoute44Signpost0Script
- signpost 10, 6, SIGNPOST_READ, MapRoute44Signpost1Script
+ signpost 7, 53, SIGNPOST_READ, Route44Sign1
+ signpost 10, 6, SIGNPOST_READ, Route44Sign2
signpost 9, 32, SIGNPOST_ITEM, Route44HiddenElixer
.PersonEvents:
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -293,8 +293,8 @@
closetext
end
-MapRoute45Signpost0Script:
- jumptext UnknownText_0x19e8fe
+Route45Sign:
+ jumptext Route45SignText
FruitTreeScript_0x19e294:
fruittree FRUITTREE_ROUTE_45
@@ -527,7 +527,7 @@
line "there, but…"
done
-UnknownText_0x19e8fe:
+Route45SignText:
text "ROUTE 45"
line "MOUNTAIN RD. AHEAD"
done
@@ -545,7 +545,7 @@
.Signposts:
db 2
- signpost 4, 10, SIGNPOST_READ, MapRoute45Signpost0Script
+ signpost 4, 10, SIGNPOST_READ, Route45Sign
signpost 80, 13, SIGNPOST_ITEM, Route45HiddenPpUp
.PersonEvents:
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -158,8 +158,8 @@
closetext
end
-MapRoute46Signpost0Script:
- jumptext UnknownText_0x1a99be
+Route46Sign:
+ jumptext Route46SignText
Route46XSpeed:
itemball X_SPEED
@@ -245,7 +245,7 @@
cont "the other time."
done
-UnknownText_0x1a99be:
+Route46SignText:
text "ROUTE 46"
line "MOUNTAIN RD. AHEAD"
done
@@ -265,7 +265,7 @@
.Signposts:
db 1
- signpost 27, 9, SIGNPOST_READ, MapRoute46Signpost0Script
+ signpost 27, 9, SIGNPOST_READ, Route46Sign
.PersonEvents:
db 6
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -11,11 +11,11 @@
PokefanMScript_0x1adb19:
jumptextfaceplayer UnknownText_0x1adb22
-MapRoute5Signpost0Script:
- jumptext UnknownText_0x1adb66
+Route5UndergroundPathSign:
+ jumptext Route5UndergroundPathSignText
-MapRoute5Signpost1Script:
- jumptext UnknownText_0x1adb97
+HouseForSaleSign:
+ jumptext HouseForSaleSignText
UnknownText_0x1adb22:
text "The road is closed"
@@ -25,7 +25,7 @@
line "is solved."
done
-UnknownText_0x1adb66:
+Route5UndergroundPathSignText:
text "UNDERGROUND PATH"
para "CERULEAN CITY -"
@@ -32,7 +32,7 @@
line "VERMILION CITY"
done
-UnknownText_0x1adb97:
+HouseForSaleSignText:
text "What's this?"
para "House for Sale…"
@@ -55,8 +55,8 @@
.Signposts:
db 2
- signpost 17, 17, SIGNPOST_READ, MapRoute5Signpost0Script
- signpost 11, 10, SIGNPOST_READ, MapRoute5Signpost1Script
+ signpost 17, 17, SIGNPOST_READ, Route5UndergroundPathSign
+ signpost 11, 10, SIGNPOST_READ, HouseForSaleSign
.PersonEvents:
db 1
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -35,8 +35,8 @@
PokefanMScript_0x1ad951:
jumptextfaceplayer UnknownText_0x1ad957
-MapRoute6Signpost0Script:
- jumptext UnknownText_0x1ad99b
+Route6UndergroundPathSign:
+ jumptext Route6UndergroundPathSignText
UnknownText_0x1ad957:
text "The road is closed"
@@ -46,7 +46,7 @@
line "is solved."
done
-UnknownText_0x1ad99b:
+Route6UndergroundPathSignText:
text "UNDERGROUND PATH"
para "CERULEAN CITY -"
@@ -105,7 +105,7 @@
.Signposts:
db 1
- signpost 5, 19, SIGNPOST_READ, MapRoute6Signpost0Script
+ signpost 5, 19, SIGNPOST_READ, Route6UndergroundPathSign
.PersonEvents:
db 3
--- a/maps/Route6UndergroundEntrance.asm
+++ b/maps/Route6UndergroundEntrance.asm
@@ -1,4 +1,3 @@
-
Route6UndergroundEntrance_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -1,4 +1,3 @@
-
Route7_MapScriptHeader:
.MapTriggers:
db 0
@@ -6,13 +5,13 @@
.MapCallbacks:
db 0
-MapRoute7Signpost0Script:
- jumptext UnknownText_0x1ad388
+Route7UndergroundPathSign:
+ jumptext Route7UndergroundPathSignText
-MapRoute7Signpost1Script:
- jumptext UnknownText_0x1ad456
+Route7LockedDoor:
+ jumptext Route7LockedDoorText
-UnknownText_0x1ad388:
+Route7UndergroundPathSignText:
text "What's this flyer?"
para "… Uncouth trainers"
@@ -31,7 +30,7 @@
para "CELADON POLICE"
done
-UnknownText_0x1ad456:
+Route7LockedDoorText:
text "It's locked…"
done
@@ -49,8 +48,8 @@
.Signposts:
db 2
- signpost 11, 5, SIGNPOST_READ, MapRoute7Signpost0Script
- signpost 9, 6, SIGNPOST_READ, MapRoute7Signpost1Script
+ signpost 11, 5, SIGNPOST_READ, Route7UndergroundPathSign
+ signpost 9, 6, SIGNPOST_READ, Route7LockedDoor
.PersonEvents:
db 0
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -68,11 +68,11 @@
closetext
end
-MapRoute8Signpost1Script:
- jumptext UnknownText_0x6c2aa
+Route8LockedDoor:
+ jumptext Route8LockedDoorText
-MapRoute8Signpost0Script:
- jumptext UnknownText_0x6c2b7
+Route8UndergroundPathSign:
+ jumptext Route8UndergroundPathSignText
FruitTreeScript_0x6c06c:
fruittree FRUITTREE_ROUTE_8
@@ -161,11 +161,11 @@
cont "battles."
done
-UnknownText_0x6c2aa:
+Route8LockedDoorText:
text "It's locked…"
done
-UnknownText_0x6c2b7:
+Route8UndergroundPathSignText:
text "The flyer's torn."
para "It's impossible to"
@@ -186,8 +186,8 @@
.Signposts:
db 2
- signpost 7, 11, SIGNPOST_READ, MapRoute8Signpost0Script
- signpost 5, 10, SIGNPOST_READ, MapRoute8Signpost1Script
+ signpost 7, 11, SIGNPOST_READ, Route8UndergroundPathSign
+ signpost 5, 10, SIGNPOST_READ, Route8LockedDoor
.PersonEvents:
db 6
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -79,8 +79,8 @@
closetext
end
-MapRoute9Signpost0Script:
- jumptext UnknownText_0x1ab2a2
+Route9Sign:
+ jumptext Route9SignText
Route9HiddenEther:
dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER
@@ -199,7 +199,7 @@
cont "river."
done
-UnknownText_0x1ab2a2:
+Route9SignText:
text "ROUTE 9"
para "CERULEAN CITY -"
@@ -219,7 +219,7 @@
.Signposts:
db 2
- signpost 7, 15, SIGNPOST_READ, MapRoute9Signpost0Script
+ signpost 7, 15, SIGNPOST_READ, Route9Sign
signpost 15, 41, SIGNPOST_ITEM, Route9HiddenEther
.PersonEvents:
--- a/maps/RuinsofAlphAerodactylChamber.asm
+++ b/maps/RuinsofAlphAerodactylChamber.asm
@@ -1,4 +1,3 @@
-
RuinsofAlphAerodactylChamber_MapScriptHeader:
.MapTriggers:
db 2
--- a/maps/RuinsofAlphAerodactylWordRoom.asm
+++ b/maps/RuinsofAlphAerodactylWordRoom.asm
@@ -1,4 +1,3 @@
-
RuinsofAlphAerodactylWordRoom_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/RuinsofAlphHoOhChamber.asm
+++ b/maps/RuinsofAlphHoOhChamber.asm
@@ -1,4 +1,3 @@
-
RuinsofAlphHoOhChamber_MapScriptHeader:
.MapTriggers:
db 2
--- a/maps/RuinsofAlphHoOhWordRoom.asm
+++ b/maps/RuinsofAlphHoOhWordRoom.asm
@@ -1,4 +1,3 @@
-
RuinsofAlphHoOhWordRoom_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/RuinsofAlphKabutoWordRoom.asm
+++ b/maps/RuinsofAlphKabutoWordRoom.asm
@@ -1,4 +1,3 @@
-
RuinsofAlphKabutoWordRoom_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/RuinsofAlphOmanyteChamber.asm
+++ b/maps/RuinsofAlphOmanyteChamber.asm
@@ -1,4 +1,3 @@
-
RuinsofAlphOmanyteChamber_MapScriptHeader:
.MapTriggers:
db 2
--- a/maps/RuinsofAlphOmanyteWordRoom.asm
+++ b/maps/RuinsofAlphOmanyteWordRoom.asm
@@ -1,4 +1,3 @@
-
RuinsofAlphOmanyteWordRoom_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -1,4 +1,3 @@
-
SafariZoneBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -1,4 +1,3 @@
-
SafariZoneFuchsiaGateBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -1,4 +1,3 @@
-
SafariZoneMainOffice_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/SaffronPokeCenter2FBeta.asm
+++ b/maps/SaffronPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-
SaffronPokeCenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -1,4 +1,3 @@
-
SilverCaveOutside_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -1,4 +1,3 @@
-
TinTower2F_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/Underground.asm
+++ b/maps/Underground.asm
@@ -1,4 +1,3 @@
-
Underground_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/VermilionPokeCenter2FBeta.asm
+++ b/maps/VermilionPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-
VermilionPokeCenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -1,5 +1,5 @@
const_value set 2
- const VIOLETCITY_FISHER
+ const VIOLETCITY_EARL
const VIOLETCITY_LASS
const VIOLETCITY_SUPER_NERD
const VIOLETCITY_GRAMPS
@@ -23,7 +23,7 @@
return
VioletCityEarlScript:
- applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData
+ applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
faceplayer
opentext
writetext Text_EarlAsksIfYouBeatFalkner
@@ -42,10 +42,10 @@
waitbutton
closetext
playmusic MUSIC_SHOW_ME_AROUND
- follow VIOLETCITY_FISHER, PLAYER
- applymovement VIOLETCITY_FISHER, VioletCityFollowEarl_MovementData
+ follow VIOLETCITY_EARL, PLAYER
+ applymovement VIOLETCITY_EARL, VioletCityFollowEarl_MovementData
spriteface PLAYER, UP
- applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData
+ applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
stopfollow
special RestartMapMusic
opentext
@@ -52,10 +52,10 @@
writetext Text_HereTeacherIAm
waitbutton
closetext
- applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData
- applymovement VIOLETCITY_FISHER, VioletCityFinishFollowEarl_MovementData
+ applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
+ applymovement VIOLETCITY_EARL, VioletCityFinishFollowEarl_MovementData
playsound SFX_ENTER_DOOR
- disappear VIOLETCITY_FISHER
+ disappear VIOLETCITY_EARL
clearevent EVENT_EARLS_ACADEMY_EARL
waitsfx
end
--- a/maps/ViridianPokeCenter2FBeta.asm
+++ b/maps/ViridianPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-
ViridianPokeCenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -1,4 +1,3 @@
-
WhirlIslandCave_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -1,4 +1,3 @@
-
WhirlIslandNW_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -1,4 +1,3 @@
-
WhirlIslandSE_MapScriptHeader:
.MapTriggers:
db 0
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -1,4 +1,3 @@
-
MapGroupPointers::
; pointers to the first map header of each map group
dw MapGroup1
--- a/maps/second_map_headers.asm
+++ b/maps/second_map_headers.asm
@@ -1,4 +1,3 @@
-
map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST
connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN
connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN