Improve some map script labels.

This commit is contained in:
IIMarckus
2016-04-06 22:59:45 -06:00
parent 7fefefcf12
commit 88328f18b6
83 changed files with 350 additions and 391 deletions

View File

@@ -6,7 +6,7 @@ const_value set 2
const BLACKTHORNCITY_BLACK_BELT const BLACKTHORNCITY_BLACK_BELT
const BLACKTHORNCITY_COOLTRAINER_F1 const BLACKTHORNCITY_COOLTRAINER_F1
const BLACKTHORNCITY_YOUNGSTER1 const BLACKTHORNCITY_YOUNGSTER1
const BLACKTHORNCITY_YOUNGSTER2 const BLACKTHORNCITY_SANTOS
const BLACKTHORNCITY_COOLTRAINER_F2 const BLACKTHORNCITY_COOLTRAINER_F2
BlackthornCity_MapScriptHeader: BlackthornCity_MapScriptHeader:
@@ -27,11 +27,11 @@ BlackthornCity_MapScriptHeader:
.Santos .Santos
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_equal SATURDAY, .SantosAppears if_equal SATURDAY, .SantosAppears
disappear BLACKTHORNCITY_YOUNGSTER2 disappear BLACKTHORNCITY_SANTOS
return return
.SantosAppears .SantosAppears
appear BLACKTHORNCITY_YOUNGSTER2 appear BLACKTHORNCITY_SANTOS
return return
BlackthornSuperNerdScript: BlackthornSuperNerdScript:

View File

@@ -1,4 +1,3 @@
CeladonDeptStoreElevator_MapScriptHeader: CeladonDeptStoreElevator_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -1,4 +1,3 @@
CeladonMansion2F_MapScriptHeader: CeladonMansion2F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -1,4 +1,3 @@
CeladonPokeCenter2FBeta_MapScriptHeader: CeladonPokeCenter2FBeta_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -1,4 +1,3 @@
CeruleanPokeCenter2FBeta_MapScriptHeader: CeruleanPokeCenter2FBeta_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -1,4 +1,3 @@
CinnabarPokeCenter2FBeta_MapScriptHeader: CinnabarPokeCenter2FBeta_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -1,4 +1,3 @@
DragonsDen1F_MapScriptHeader: DragonsDen1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -1,4 +1,3 @@
FuchsiaPokeCenter2FBeta_MapScriptHeader: FuchsiaPokeCenter2FBeta_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -1,4 +1,3 @@
GoldenrodDeptStoreElevator_MapScriptHeader: GoldenrodDeptStoreElevator_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -1,6 +1,6 @@
const_value set 2 const_value set 2
const GOLDENRODFLOWERSHOP_TEACHER const GOLDENRODFLOWERSHOP_TEACHER
const GOLDENRODFLOWERSHOP_LASS const GOLDENRODFLOWERSHOP_FLORIA
GoldenrodFlowerShop_MapScriptHeader: GoldenrodFlowerShop_MapScriptHeader:
.MapTriggers: .MapTriggers:

View File

@@ -8,7 +8,7 @@ const_value set 2
const LAKEOFRAGE_COOLTRAINER_M const LAKEOFRAGE_COOLTRAINER_M
const LAKEOFRAGE_COOLTRAINER_F2 const LAKEOFRAGE_COOLTRAINER_F2
const LAKEOFRAGE_GYARADOS const LAKEOFRAGE_GYARADOS
const LAKEOFRAGE_SUPER_NERD2 const LAKEOFRAGE_WESLEY
const LAKEOFRAGE_POKE_BALL1 const LAKEOFRAGE_POKE_BALL1
const LAKEOFRAGE_POKE_BALL2 const LAKEOFRAGE_POKE_BALL2
@@ -41,11 +41,11 @@ LakeofRage_MapScriptHeader:
.Wesley .Wesley
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_equal WEDNESDAY, .WesleyAppears if_equal WEDNESDAY, .WesleyAppears
disappear LAKEOFRAGE_SUPER_NERD2 disappear LAKEOFRAGE_WESLEY
return return
.WesleyAppears .WesleyAppears
appear LAKEOFRAGE_SUPER_NERD2 appear LAKEOFRAGE_WESLEY
return return
LanceScript_0x70022: LanceScript_0x70022:

View File

@@ -1,4 +1,3 @@
LavenderPokeCenter2FBeta_MapScriptHeader: LavenderPokeCenter2FBeta_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -1,4 +1,3 @@
MobileBattleRoom_MapScriptHeader: MobileBattleRoom_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2

View File

@@ -1,4 +1,3 @@
MobileTradeRoomMobile_MapScriptHeader: MobileTradeRoomMobile_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2

View File

@@ -30,7 +30,7 @@ UnknownScript_0x77097:
disappear MOUNTMOONSQUARE_ROCK disappear MOUNTMOONSQUARE_ROCK
return return
UnknownScript_0x7709a: ClefairyDance:
checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY
iftrue .NoDancing iftrue .NoDancing
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
@@ -84,8 +84,8 @@ MountMoonSquareHiddenMoonStone:
dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
MapMountMoonSquareSignpost1Script: DontLitterSign:
jumptext UnknownText_0x7713b jumptext DontLitterSignText
MtMoonSquareRock: MtMoonSquareRock:
jumpstd smashrock jumpstd smashrock
@@ -134,7 +134,7 @@ MovementData_0x77134:
step_right step_right
step_end step_end
UnknownText_0x7713b: DontLitterSignText:
text "MT.MOON SQUARE" text "MT.MOON SQUARE"
line "DON'T LITTER" line "DON'T LITTER"
done done
@@ -151,12 +151,12 @@ MountMoonSquare_MapEventHeader:
.XYTriggers: .XYTriggers:
db 1 db 1
xy_trigger 0, $b, $7, $0, UnknownScript_0x7709a, $0, $0 xy_trigger 0, $b, $7, $0, ClefairyDance, $0, $0
.Signposts: .Signposts:
db 2 db 2
signpost 7, 7, SIGNPOST_ITEM, MountMoonSquareHiddenMoonStone signpost 7, 7, SIGNPOST_ITEM, MountMoonSquareHiddenMoonStone
signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script signpost 7, 17, SIGNPOST_READ, DontLitterSign
.PersonEvents: .PersonEvents:
db 3 db 3

View File

@@ -131,7 +131,7 @@ NewBarkTownSilverScript:
applymovement NEWBARKTOWN_SILVER, Movement_SilverReturnsToTheShadows_NBT applymovement NEWBARKTOWN_SILVER, Movement_SilverReturnsToTheShadows_NBT
end end
MapNewBarkTownSignpost0Script: NewBarkTownSign:
jumptext NewBarkTownSignText jumptext NewBarkTownSignText
MapNewBarkTownSignpost1Script: MapNewBarkTownSignpost1Script:
@@ -303,7 +303,7 @@ NewBarkTown_MapEventHeader:
.Signposts: .Signposts:
db 4 db 4
signpost 8, 8, SIGNPOST_READ, MapNewBarkTownSignpost0Script signpost 8, 8, SIGNPOST_READ, NewBarkTownSign
signpost 5, 11, SIGNPOST_READ, MapNewBarkTownSignpost1Script signpost 5, 11, SIGNPOST_READ, MapNewBarkTownSignpost1Script
signpost 3, 3, SIGNPOST_READ, MapNewBarkTownSignpost2Script signpost 3, 3, SIGNPOST_READ, MapNewBarkTownSignpost2Script
signpost 13, 9, SIGNPOST_READ, MapNewBarkTownSignpost3Script signpost 13, 9, SIGNPOST_READ, MapNewBarkTownSignpost3Script

View File

@@ -1,4 +1,3 @@
PewterPokeCEnter2FBeta_MapScriptHeader: PewterPokeCEnter2FBeta_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -1,4 +1,3 @@
RedsHouse2F_MapScriptHeader: RedsHouse2F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

View File

@@ -32,8 +32,8 @@ CooltrainerfQuinnScript:
closetext closetext
end end
MapRoute1Signpost0Script: Route1Sign:
jumptext UnknownText_0x1ac675 jumptext Route1SignText
FruitTreeScript_0x1ac581: FruitTreeScript_0x1ac581:
fruittree FRUITTREE_ROUTE_1 fruittree FRUITTREE_ROUTE_1
@@ -73,7 +73,7 @@ UnknownText_0x1ac640:
line "have trained hard." line "have trained hard."
done done
UnknownText_0x1ac675: Route1SignText:
text "ROUTE 1" text "ROUTE 1"
para "PALLET TOWN -" para "PALLET TOWN -"
@@ -92,7 +92,7 @@ Route1_MapEventHeader:
.Signposts: .Signposts:
db 1 db 1
signpost 27, 7, SIGNPOST_READ, MapRoute1Signpost0Script signpost 27, 7, SIGNPOST_READ, Route1Sign
.PersonEvents: .PersonEvents:
db 3 db 3

View File

@@ -1,4 +1,3 @@
Route10North_MapScriptHeader: Route10North_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0

Some files were not shown because too many files have changed in this diff Show More