ref: 5d48bc96fd9f6a3800efaddb5985a0d19da2cbd8
parent: 17a47bf54b82f8282bcbe66b845f935c7319238d
author: IIMarckus <iimarckus@gmail.com>
date: Tue Jun 23 11:02:58 EDT 2015
More std_scripts enums.
--- a/constants/std_constants.asm
+++ b/constants/std_constants.asm
@@ -10,4 +10,10 @@
enum window
enum tv
enum homepage
- enum radio
+ enum radio1
+ enum radio2
+ enum trashcan
+ enum strengthboulder
+ enum smashrock
+ enum pokecentersign
+ enum martsign
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -10,16 +10,16 @@
dbw BANK(WindowScript), WindowScript
dbw BANK(TVScript), TVScript
dbw BANK(HomepageScript), HomepageScript
- dbw BANK(RadioScript), RadioScript
- dbw BANK(UnknownScript_0xbc19d), UnknownScript_0xbc19d
- dbw BANK(UnknownScript_0xbc1a5), UnknownScript_0xbc1a5
- dbw BANK(UnknownScript_0xbc1b8), UnknownScript_0xbc1b8
- dbw BANK(UnknownScript_0xbc1bc), UnknownScript_0xbc1bc
- dbw BANK(UnknownScript_0xbc1c0), UnknownScript_0xbc1c0
- dbw BANK(UnknownScript_0xbc1c4), UnknownScript_0xbc1c4
+ dbw BANK(Radio1Script), Radio1Script
+ dbw BANK(Radio2Script), Radio2Script
+ dbw BANK(TrashCanScript), TrashCanScript
+ dbw BANK(StrengthBoulder), StrengthBoulder
+ dbw BANK(SmashRock), SmashRock
+ dbw BANK(PokeCenterSignScript), PokeCenterSignScript
+ dbw BANK(MartSignScript), MartSignScript
dbw BANK(UnknownScript_0xbc23e), UnknownScript_0xbc23e
dbw BANK(UnknownScript_0xbc242), UnknownScript_0xbc242
- dbw BANK(UnknownScript_0xbc1af), UnknownScript_0xbc1af
+ dbw BANK(ElevatorButtonScript), ElevatorButtonScript
dbw BANK(UnknownScript_0xbc1c8), UnknownScript_0xbc1c8
dbw BANK(UnknownScript_0xbc25c), UnknownScript_0xbc25c
dbw BANK(UnknownScript_0xbc274), UnknownScript_0xbc274
@@ -223,7 +223,7 @@
HomepageScript:
farjumptext HomepageText
-RadioScript:
+Radio1Script:
loadfont
writebyte $0
special Functionc355
@@ -230,17 +230,16 @@
loadmovesprites
end
-UnknownScript_0xbc19d: ; 0xbc19d
+Radio2Script:
+; Lucky Channel
loadfont
writebyte $4
special Functionc355
loadmovesprites
end
-; 0xbc1a5
-UnknownScript_0xbc1a5: ; 0xbc1a5
- farjumptext UnknownText_0x1b0526
-; 0xbc1a9
+TrashCanScript: ; 0xbc1a5
+ farjumptext TrashCanText
UnknownScript_0xbc1a9: ; 0xbc1a9
loadfont
@@ -249,28 +248,23 @@
end
; 0xbc1af
-UnknownScript_0xbc1af: ; 0xbc1af
+ElevatorButtonScript:
playsound SFX_READ_TEXT_2
pause 15
playsound SFX_ELEVATOR_END
end
-; 0xbc1b8
-UnknownScript_0xbc1b8: ; 0xbc1b8
- farjump UnknownScript_0xcd4b
-; 0xbc1bc
+StrengthBoulder:
+ farjump AskStrengthScript
-UnknownScript_0xbc1bc: ; 0xbc1bc
+SmashRock:
farjump AskRockSmashScript
-; 0xbc1c0
-UnknownScript_0xbc1c0: ; 0xbc1c0
- farjumptext UnknownText_0x1b057f
-; 0xbc1c4
+PokeCenterSignScript:
+ farjumptext PokeCenterSignText
-UnknownScript_0xbc1c4: ; 0xbc1c4
- farjumptext UnknownText_0x1b059c
-; 0xbc1c8
+MartSignScript
+ farjumptext MartSignText
UnknownScript_0xbc1c8: ; 0xbc1c8
checkcode $b
--- a/main.asm
+++ b/main.asm
@@ -5785,7 +5785,7 @@
db $50
; 0xcd4b
-UnknownScript_0xcd4b: ; 0xcd4b
+AskStrengthScript:
callasm Functioncd78
iffalse UnknownScript_0xcd5f
if_equal $1, UnknownScript_0xcd59
@@ -15478,7 +15478,7 @@
dbw $91, magazinebookshelf
.table2
dbw $93, $0031 ; pc
- dbw $94, radio
+ dbw $94, radio1
dbw $95, townmap
dbw $96, merchandiseshelf
dbw $97, tv
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -219,11 +219,11 @@
; 0x198129
MapAzaleaTownSignpost5Script: ; 0x198129
- jumpstd $0010
+ jumpstd pokecentersign
; 0x19812c
MapAzaleaTownSignpost6Script: ; 0x19812c
- jumpstd $0011
+ jumpstd martsign
; 0x19812f
FruitTreeScript_0x19812f: ; 0x19812f
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -148,11 +148,11 @@
; 0x1a4774
MapBlackthornCitySignpost6Script: ; 0x1a4774
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1a4777
MapBlackthornCitySignpost5Script: ; 0x1a4777
- jumpstd $0011
+ jumpstd martsign
; 0x1a477a
UnknownText_0x1a477a: ; 0x1a477a
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -66,7 +66,7 @@
BoulderScript_0x19575e: ; 0x19575e
- jumpstd $000e
+ jumpstd strengthboulder
; 0x195761
TrainerCooltrainermCody: ; 0x195761
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -138,7 +138,7 @@
; 0x185cc2
RockScript_0x185cc2: ; 0x185cc2
- jumpstd $000f
+ jumpstd smashrock
; 0x185cc5
MapBurnedTower1FSignpostItem0: ; 0x185cc5
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -124,7 +124,7 @@
; 0x186233
BoulderScript_0x186233: ; 0x186233
- jumpstd $000e
+ jumpstd strengthboulder
; 0x186236
MovementData_0x186236: ; 0x186236
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -119,7 +119,7 @@
; 0x730db
UnknownScript_0x730db: ; 0x730db
- jumpstd $000d
+ jumpstd trashcan
; 0x730de
UnknownText_0x730de: ; 0x730de
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -81,7 +81,7 @@
; 0x1a9f77
MapCeladonCitySignpost6Script: ; 0x1a9f77
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1a9f7a
MapCeladonCitySignpostItem7: ; 0x1a9f7a
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -153,11 +153,11 @@
; 0x1840b3
MapCeruleanCitySignpost6Script: ; 0x1840b3
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1840b6
MapCeruleanCitySignpost7Script: ; 0x1840b6
- jumpstd $0011
+ jumpstd martsign
; 0x1840b9
MapCeruleanCitySignpostItem8: ; 0x1840b9
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -73,7 +73,7 @@
; 0x18dd71
MapCharcoalKilnSignpost2Script: ; 0x18dd71
- jumpstd $000c
+ jumpstd radio2
; 0x18dd74
BossSlowpokeText:
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -252,11 +252,11 @@
; 0x19c18f
MapCherrygroveCitySignpost3Script: ; 0x19c18f
- jumpstd $0010
+ jumpstd pokecentersign
; 0x19c192
MapCherrygroveCitySignpost2Script: ; 0x19c192
- jumpstd $0011
+ jumpstd martsign
; 0x19c195
MovementData_0x19c195: ; 0x19c195
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -146,11 +146,11 @@
; 0x1a00ce
MapCianwoodCitySignpost2Script: ; 0x1a00ce
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1a00d1
RockScript_0x1a00d1: ; 0x1a00d1
- jumpstd $000f
+ jumpstd smashrock
; 0x1a00d4
MapCianwoodCitySignpostItem6: ; 0x1a00d4
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -198,7 +198,7 @@
; 0x9d6e0
BoulderScript_0x9d6e0: ; 0x9d6e0
- jumpstd $000e
+ jumpstd strengthboulder
; 0x9d6e3
MapCianwoodGymSignpost1Script: ; 0x9d6e3
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -37,7 +37,7 @@
; 0x1ac9ca
MapCinnabarIslandSignpost0Script: ; 0x1ac9ca
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1ac9cd
MapCinnabarIslandSignpostItem3: ; 0x1ac9cd
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -23,7 +23,7 @@
; 0x18c696
RockScript_0x18c696: ; 0x18c696
- jumpstd $000f
+ jumpstd smashrock
; 0x18c699
MapDarkCaveVioletEntranceSignpostItem0: ; 0x18c699
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -92,11 +92,11 @@
; 0x1a404f
MapEcruteakCitySignpost5Script: ; 0x1a404f
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1a4052
MapEcruteakCitySignpost6Script: ; 0x1a4052
- jumpstd $0011
+ jumpstd martsign
; 0x1a4055
MapEcruteakCitySignpostItem7: ; 0x1a4055
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -57,7 +57,7 @@
; 0x9a639
MapEcruteakItemfinderHouseSignpost0Script: ; 0x9a639
- jumpstd $000c
+ jumpstd radio2
; 0x9a63c
UnknownText_0x9a63c: ; 0x9a63c
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -15,7 +15,7 @@
; 0x9933a
MapEcruteakLugiaSpeechHouseSignpost0Script: ; 0x9933a
- jumpstd $000c
+ jumpstd radio2
; 0x9933d
UnknownText_0x9933d: ; 0x9933d
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -662,7 +662,7 @@
; 0x78f61
UnknownScript_0x78f61: ; 0x78f61
- jumpstd $000d
+ jumpstd trashcan
; 0x78f64
MapElmsLabSignpost12Script: ; 0x78f64
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -383,7 +383,7 @@
; 0x7686e
MapFastShipB1FSignpost0Script: ; 0x7686e
- jumpstd $000d
+ jumpstd trashcan
; 0x76871
MovementData_0x76871: ; 0x76871
--- a/maps/FastShipCabins.asm
+++ b/maps/FastShipCabins.asm
@@ -342,7 +342,7 @@
; 0x76001
MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script: ; 0x76001
- jumpstd $000d
+ jumpstd trashcan
; 0x76004
MovementData_0x76004: ; 0x76004
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -217,7 +217,7 @@
; 0x75634
MapFastShipCabins_NNW_NNE_NESignpost2Script: ; 0x75634
- jumpstd $000d
+ jumpstd trashcan
; 0x75637
MovementData_0x75637: ; 0x75637
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -342,7 +342,7 @@
; 0x76001
MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script: ; 0x76001
- jumpstd $000d
+ jumpstd trashcan
; 0x76004
MovementData_0x76004: ; 0x76004
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -182,7 +182,7 @@
; 0x75b01
MapFastShipCabins_SW_SSW_NWSignpost2Script: ; 0x75b01
- jumpstd $000d
+ jumpstd trashcan
; 0x75b04
FirebreatherLyleSeenText: ; 0x75b04
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -52,11 +52,11 @@
; 0x194b3d
MapFuchsiaCitySignpost6Script: ; 0x194b3d
- jumpstd $0010
+ jumpstd pokecentersign
; 0x194b40
MapFuchsiaCitySignpost7Script: ; 0x194b40
- jumpstd $0011
+ jumpstd martsign
; 0x194b43
FruitTreeScript_0x194b43: ; 0x194b43
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -113,7 +113,7 @@
; 0x54c71
MapGoldenrodBillsHouseSignpost2Script: ; 0x54c71
- jumpstd $000c
+ jumpstd radio2
; 0x54c74
UnknownText_0x54c74: ; 0x54c74
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -296,7 +296,7 @@
; 0x198a59
MapGoldenrodCitySignpost10Script: ; 0x198a59
- jumpstd $0010
+ jumpstd pokecentersign
; 0x198a5c
MapGoldenrodCitySignpost11Script: ; 0x198a5c
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -89,7 +89,7 @@
; 0x553d1
UnknownScript_0x553d1: ; 0x553d1
- jumpstd $000c
+ jumpstd radio2
; 0x553d4
UnknownText_0x553d4: ; 0x553d4
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -75,7 +75,7 @@
; 0x549a0
MapGoldenrodHappinessRaterSignpost2Script: ; 0x549a0
- jumpstd $000c
+ jumpstd radio2
; 0x549a3
UnknownText_0x549a3: ; 0x549a3
--- a/maps/GoldenrodNameRatersHouse.asm
+++ b/maps/GoldenrodNameRatersHouse.asm
@@ -20,7 +20,7 @@
; 0x55787
MapGoldenrodNameRatersHouseSignpost2Script: ; 0x55787
- jumpstd $000c
+ jumpstd radio2
; 0x5578a
INCLUDE "text/sweethoney.asm"
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -23,7 +23,7 @@
; 0x55656
MapGoldenrodPPSpeechHouseSignpost2Script: ; 0x55656
- jumpstd $000c
+ jumpstd radio2
; 0x55659
UnknownText_0x55659: ; 0x55659
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -78,7 +78,7 @@
BoulderScript_0x7e50a: ; 0x7e50a
- jumpstd $000e
+ jumpstd strengthboulder
; 0x7e50d
ItemFragment_0x7e50d: ; 0x7e50d
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -11,7 +11,7 @@
; 0x7e671
RockScript_0x7e671: ; 0x7e671
- jumpstd $000f
+ jumpstd smashrock
; 0x7e674
IcePathB3F_MapEventHeader: ; 0x7e674
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -483,7 +483,7 @@
; 0x6ee21
UnknownScript_0x6ee21: ; 0x6ee21
- jumpstd $000e
+ jumpstd strengthboulder
; 0x6ee24
MapIlexForestSignpost0Script: ; 0x6ee24
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -85,7 +85,7 @@
; 0x7ac07
UnknownScript_0x7ac07: ; 0x7ac07
- jumpstd radio
+ jumpstd radio1
; 0x7ac0a
UnknownScript_0x7ac0a: ; 0x7ac0a
--- a/maps/KrissNeighborsHouse.asm
+++ b/maps/KrissNeighborsHouse.asm
@@ -40,7 +40,7 @@
; 0x7ad24
UnknownScript_0x7ad24: ; 0x7ad24
- jumpstd radio
+ jumpstd radio1
; 0x7ad27
UnknownScript_0x7ad27: ; 0x7ad27
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -475,7 +475,7 @@
; 0x18e463
MapKurtsHouseSignpost0Script: ; 0x18e463
- jumpstd $000c
+ jumpstd radio2
; 0x18e466
MovementData_0x18e466: ; 0x18e466
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -48,11 +48,11 @@
; 0x1ad6fc
MapLavenderTownSignpost4Script: ; 0x1ad6fc
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1ad6ff
MapLavenderTownSignpost5Script: ; 0x1ad6ff
- jumpstd $0011
+ jumpstd martsign
; 0x1ad702
UnknownText_0x1ad702: ; 0x1ad702
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -136,7 +136,7 @@
; 0x1900a1
MapMahoganyTownSignpost3Script: ; 0x1900a1
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1900a4
MovementData_0x1900a4: ; 0x1900a4
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -92,7 +92,7 @@
; 0x7711e
RockScript_0x7711e: ; 0x7711e
- jumpstd $000f
+ jumpstd smashrock
; 0x77121
MovementData_0x77121: ; 0x77121
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -65,7 +65,7 @@
; 0x7de79
BoulderScript_0x7de79: ; 0x7de79
- jumpstd $000e
+ jumpstd strengthboulder
; 0x7de7c
ItemFragment_0x7de7c: ; 0x7de7c
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -48,7 +48,7 @@
; 0x7e23d
BoulderScript_0x7e23d: ; 0x7e23d
- jumpstd $000e
+ jumpstd strengthboulder
; 0x7e240
ItemFragment_0x7e240: ; 0x7e240
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -124,11 +124,11 @@
; 0x1a88cc
MapOlivineCitySignpost5Script: ; 0x1a88cc
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1a88cf
MapOlivineCitySignpost6Script: ; 0x1a88cf
- jumpstd $0011
+ jumpstd martsign
; 0x1a88d2
MovementData_0x1a88d2: ; 0x1a88d2
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -64,11 +64,11 @@
; 0x18c038
MapPewterCitySignpost5Script: ; 0x18c038
- jumpstd $0010
+ jumpstd pokecentersign
; 0x18c03b
MapPewterCitySignpost6Script: ; 0x18c03b
- jumpstd $0011
+ jumpstd martsign
; 0x18c03e
FruitTreeScript_0x18c03e: ; 0x18c03e
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -11,7 +11,7 @@
; 0x1b2083
MapRoute10NorthSignpost1Script: ; 0x1b2083
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1b2086
UnknownText_0x1b2086: ; 0x1b2086
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -681,7 +681,7 @@
; 0x190780
MapRoute32Signpost3Script: ; 0x190780
- jumpstd $0010
+ jumpstd pokecentersign
; 0x190783
MapRoute32SignpostItem4: ; 0x190783
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -199,7 +199,7 @@
; 0x1a6216
RockScript_0x1a6216: ; 0x1a6216
- jumpstd $000f
+ jumpstd smashrock
; 0x1a6219
MapRoute40SignpostItem1: ; 0x1a6219
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -297,7 +297,7 @@
; 0x1a6909
UnknownScript_0x1a6909: ; 0x1a6909
- jumpstd $000f
+ jumpstd smashrock
; 0x1a690c
MapRoute41SignpostItem0: ; 0x1a690c
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -114,11 +114,11 @@
; 0x199387
MapSaffronCitySignpost6Script: ; 0x199387
- jumpstd $0010
+ jumpstd pokecentersign
; 0x19938a
MapSaffronCitySignpost7Script: ; 0x19938a
- jumpstd $0011
+ jumpstd martsign
; 0x19938d
UnknownText_0x19938d: ; 0x19938d
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -16,7 +16,7 @@
; 0x1b204b
MapSilverCaveOutsideSignpost0Script: ; 0x1b204b
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1b204e
MapSilverCaveOutsideSignpost1Script: ; 0x1b204e
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -187,7 +187,7 @@
; 0x5a6a0
BoulderScript_0x5a6a0: ; 0x5a6a0
- jumpstd $000e
+ jumpstd strengthboulder
; 0x5a6a3
ItemFragment_0x5a6a3: ; 0x5a6a3
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -131,7 +131,7 @@
; 0x5a01a
BoulderScript_0x5a01a: ; 0x5a01a
- jumpstd $000e
+ jumpstd strengthboulder
; 0x5a01d
HikerPhillipSeenText: ; 0x5a01d
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -129,11 +129,11 @@
; 0x1aaa0c
MapVermilionCitySignpost5Script: ; 0x1aaa0c
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1aaa0f
MapVermilionCitySignpost6Script: ; 0x1aaa0f
- jumpstd $0011
+ jumpstd martsign
; 0x1aaa12
MapVermilionCitySignpostItem7: ; 0x1aaa12
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -89,11 +89,11 @@
; 0x1a841b
MapVioletCitySignpost4Script: ; 0x1a841b
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1a841e
MapVioletCitySignpost5Script: ; 0x1a841e
- jumpstd $0011
+ jumpstd martsign
; 0x1a8421
ItemFragment_0x1a8421: ; 0x1a8421
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -91,11 +91,11 @@
; 0x1a9a9f
MapViridianCitySignpost4Script: ; 0x1a9a9f
- jumpstd $0010
+ jumpstd pokecentersign
; 0x1a9aa2
MapViridianCitySignpost5Script: ; 0x1a9aa2
- jumpstd $0011
+ jumpstd martsign
; 0x1a9aa5
UnknownText_0x1a9aa5: ; 0x1a9aa5
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -27,7 +27,7 @@
; 0x18c41a
BoulderScript_0x18c41a: ; 0x18c41a
- jumpstd $000e
+ jumpstd strengthboulder
; 0x18c41d
MapWhirlIslandB1FSignpostItem0: ; 0x18c41d
--- a/text/common.asm
+++ b/text/common.asm
@@ -201,11 +201,10 @@
done
; 0x1b0526
-UnknownText_0x1b0526: ; 0x1b0526
+TrashCanText:
text "There's nothing in"
line "here…"
done
-; 0x1b053f
UnknownText_0x1b053f: ; 0x1b053f
text "A #MON may be"
@@ -219,19 +218,17 @@
done
; 0x1b057f
-UnknownText_0x1b057f: ; 0x1b057f
+PokeCenterSignText:
text "Heal Your #MON!"
line "#MON CENTER"
done
-; 0x1b059c
-UnknownText_0x1b059c: ; 0x1b059c
+MartSignText:
text "For All Your"
line "#MON Needs"
para "#MON MART"
done
-; 0x1b05bf
UnknownText_0x1b05bf: ; 0x1b05bf
text "We will now judge"