From 5d48bc96fd9f6a3800efaddb5985a0d19da2cbd8 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Tue, 23 Jun 2015 15:02:58 -0600 Subject: [PATCH] More std_scripts enums. --- constants/std_constants.asm | 8 +++- engine/std_scripts.asm | 48 +++++++++----------- main.asm | 4 +- maps/AzaleaTown.asm | 4 +- maps/BlackthornCity.asm | 4 +- maps/BlackthornGym2F.asm | 2 +- maps/BurnedTower1F.asm | 2 +- maps/BurnedTowerB1F.asm | 2 +- maps/CeladonCafe.asm | 2 +- maps/CeladonCity.asm | 2 +- maps/CeruleanCity.asm | 4 +- maps/CharcoalKiln.asm | 2 +- maps/CherrygroveCity.asm | 4 +- maps/CianwoodCity.asm | 4 +- maps/CianwoodGym.asm | 2 +- maps/CinnabarIsland.asm | 2 +- maps/DarkCaveVioletEntrance.asm | 2 +- maps/EcruteakCity.asm | 4 +- maps/EcruteakItemfinderHouse.asm | 2 +- maps/EcruteakLugiaSpeechHouse.asm | 2 +- maps/ElmsLab.asm | 2 +- maps/FastShipB1F.asm | 2 +- maps/FastShipCabins.asm | 2 +- maps/FastShipCabins_NNW_NNE_NE.asm | 2 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 2 +- maps/FastShipCabins_SW_SSW_NW.asm | 2 +- maps/FuchsiaCity.asm | 4 +- maps/GoldenrodBillsHouse.asm | 2 +- maps/GoldenrodCity.asm | 2 +- maps/GoldenrodFlowerShop.asm | 2 +- maps/GoldenrodHappinessRater.asm | 2 +- maps/GoldenrodNameRatersHouse.asm | 2 +- maps/GoldenrodPPSpeechHouse.asm | 2 +- maps/IcePathB1F.asm | 2 +- maps/IcePathB3F.asm | 2 +- maps/IlexForest.asm | 2 +- maps/KrissHouse2F.asm | 2 +- maps/KrissNeighborsHouse.asm | 2 +- maps/KurtsHouse.asm | 2 +- maps/LavenderTown.asm | 4 +- maps/MahoganyTown.asm | 2 +- maps/MountMoonSquare.asm | 2 +- maps/MountMortar1FInside.asm | 2 +- maps/MountMortarB1F.asm | 2 +- maps/OlivineCity.asm | 4 +- maps/PewterCity.asm | 4 +- maps/Route10North.asm | 2 +- maps/Route32.asm | 2 +- maps/Route40.asm | 2 +- maps/Route41.asm | 2 +- maps/SaffronCity.asm | 4 +- maps/SilverCaveOutside.asm | 2 +- maps/SlowpokeWellB1F.asm | 2 +- maps/UnionCaveB1F.asm | 2 +- maps/VermilionCity.asm | 4 +- maps/VioletCity.asm | 4 +- maps/ViridianCity.asm | 4 +- maps/WhirlIslandB1F.asm | 2 +- text/common.asm | 9 ++-- 59 files changed, 102 insertions(+), 105 deletions(-) diff --git a/constants/std_constants.asm b/constants/std_constants.asm index 951f739e7..62cdb7242 100644 --- 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 diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 8f1eaf394..650eb0c07 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -10,16 +10,16 @@ StdScripts:: ; bc000 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,24 +223,23 @@ TVScript: HomepageScript: farjumptext HomepageText -RadioScript: +Radio1Script: loadfont writebyte $0 special Functionc355 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 @@ UnknownScript_0xbc1a9: ; 0xbc1a9 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 diff --git a/main.asm b/main.asm index 23e998ae0..dd024e409 100644 --- a/main.asm +++ b/main.asm @@ -5785,7 +5785,7 @@ UnknownText_0xcd46: ; 0xcd46 db $50 ; 0xcd4b -UnknownScript_0xcd4b: ; 0xcd4b +AskStrengthScript: callasm Functioncd78 iffalse UnknownScript_0xcd5f if_equal $1, UnknownScript_0xcd59 @@ -15478,7 +15478,7 @@ Function1365b:: ; 1365b dbw $91, magazinebookshelf .table2 dbw $93, $0031 ; pc - dbw $94, radio + dbw $94, radio1 dbw $95, townmap dbw $96, merchandiseshelf dbw $97, tv diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index f2704b57a..9b102c840 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -219,11 +219,11 @@ MapAzaleaTownSignpost7Script: ; 0x198126 ; 0x198129 MapAzaleaTownSignpost5Script: ; 0x198129 - jumpstd $0010 + jumpstd pokecentersign ; 0x19812c MapAzaleaTownSignpost6Script: ; 0x19812c - jumpstd $0011 + jumpstd martsign ; 0x19812f FruitTreeScript_0x19812f: ; 0x19812f diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index bac02795d..0d2635429 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -148,11 +148,11 @@ MapBlackthornCitySignpost4Script: ; 0x1a4771 ; 0x1a4774 MapBlackthornCitySignpost6Script: ; 0x1a4774 - jumpstd $0010 + jumpstd pokecentersign ; 0x1a4777 MapBlackthornCitySignpost5Script: ; 0x1a4777 - jumpstd $0011 + jumpstd martsign ; 0x1a477a UnknownText_0x1a477a: ; 0x1a477a diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 0914854b7..1f15ece52 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -66,7 +66,7 @@ UnknownScript_0x195758: ; 0x195758 BoulderScript_0x19575e: ; 0x19575e - jumpstd $000e + jumpstd strengthboulder ; 0x195761 TrainerCooltrainermCody: ; 0x195761 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index bae9bfdb2..efaca3ae6 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -138,7 +138,7 @@ MortyScript_0x185cbf: ; 0x185cbf ; 0x185cc2 RockScript_0x185cc2: ; 0x185cc2 - jumpstd $000f + jumpstd smashrock ; 0x185cc5 MapBurnedTower1FSignpostItem0: ; 0x185cc5 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 94a6fabec..2db469cbb 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -124,7 +124,7 @@ ItemFragment_0x186231: ; 0x186231 ; 0x186233 BoulderScript_0x186233: ; 0x186233 - jumpstd $000e + jumpstd strengthboulder ; 0x186236 MovementData_0x186236: ; 0x186236 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 456b93688..2f8de521c 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -119,7 +119,7 @@ UnknownScript_0x730cd: ; 0x730cd ; 0x730db UnknownScript_0x730db: ; 0x730db - jumpstd $000d + jumpstd trashcan ; 0x730de UnknownText_0x730de: ; 0x730de diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index dd1596acc..d326c2f1d 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -81,7 +81,7 @@ MapCeladonCitySignpost5Script: ; 0x1a9f74 ; 0x1a9f77 MapCeladonCitySignpost6Script: ; 0x1a9f77 - jumpstd $0010 + jumpstd pokecentersign ; 0x1a9f7a MapCeladonCitySignpostItem7: ; 0x1a9f7a diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index d89a46aaa..ddee5b92e 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -153,11 +153,11 @@ MapCeruleanCitySignpost5Script: ; 0x1840b0 ; 0x1840b3 MapCeruleanCitySignpost6Script: ; 0x1840b3 - jumpstd $0010 + jumpstd pokecentersign ; 0x1840b6 MapCeruleanCitySignpost7Script: ; 0x1840b6 - jumpstd $0011 + jumpstd martsign ; 0x1840b9 MapCeruleanCitySignpostItem8: ; 0x1840b9 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index fda2019a6..e0358818b 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -73,7 +73,7 @@ MapCharcoalKilnSignpost1Script: ; 0x18dd6e ; 0x18dd71 MapCharcoalKilnSignpost2Script: ; 0x18dd71 - jumpstd $000c + jumpstd radio2 ; 0x18dd74 BossSlowpokeText: diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 11cdce851..23c8d7ab9 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -252,11 +252,11 @@ MapCherrygroveCitySignpost1Script: ; 0x19c18c ; 0x19c18f MapCherrygroveCitySignpost3Script: ; 0x19c18f - jumpstd $0010 + jumpstd pokecentersign ; 0x19c192 MapCherrygroveCitySignpost2Script: ; 0x19c192 - jumpstd $0011 + jumpstd martsign ; 0x19c195 MovementData_0x19c195: ; 0x19c195 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 149a63dcb..9c3183807 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -146,11 +146,11 @@ MapCianwoodCitySignpost5Script: ; 0x1a00cb ; 0x1a00ce MapCianwoodCitySignpost2Script: ; 0x1a00ce - jumpstd $0010 + jumpstd pokecentersign ; 0x1a00d1 RockScript_0x1a00d1: ; 0x1a00d1 - jumpstd $000f + jumpstd smashrock ; 0x1a00d4 MapCianwoodCitySignpostItem6: ; 0x1a00d4 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 36b55e61e..ee5a7281e 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -198,7 +198,7 @@ BlackbeltLungScript: ; 0x9d6d8 ; 0x9d6e0 BoulderScript_0x9d6e0: ; 0x9d6e0 - jumpstd $000e + jumpstd strengthboulder ; 0x9d6e3 MapCianwoodGymSignpost1Script: ; 0x9d6e3 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 56fa7ec65..8ef245c58 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -37,7 +37,7 @@ MapCinnabarIslandSignpost2Script: ; 0x1ac9c7 ; 0x1ac9ca MapCinnabarIslandSignpost0Script: ; 0x1ac9ca - jumpstd $0010 + jumpstd pokecentersign ; 0x1ac9cd MapCinnabarIslandSignpostItem3: ; 0x1ac9cd diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 2e68e3717..24d3c2b2c 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -23,7 +23,7 @@ ItemFragment_0x18c694: ; 0x18c694 ; 0x18c696 RockScript_0x18c696: ; 0x18c696 - jumpstd $000f + jumpstd smashrock ; 0x18c699 MapDarkCaveVioletEntranceSignpostItem0: ; 0x18c699 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index b4f6f135d..b065d7bcf 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -92,11 +92,11 @@ MapEcruteakCitySignpost4Script: ; 0x1a404c ; 0x1a404f MapEcruteakCitySignpost5Script: ; 0x1a404f - jumpstd $0010 + jumpstd pokecentersign ; 0x1a4052 MapEcruteakCitySignpost6Script: ; 0x1a4052 - jumpstd $0011 + jumpstd martsign ; 0x1a4055 MapEcruteakCitySignpostItem7: ; 0x1a4055 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index b8c1fdbee..cef3a2a23 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -57,7 +57,7 @@ UnknownScript_0x9a633: ; 0x9a633 ; 0x9a639 MapEcruteakItemfinderHouseSignpost0Script: ; 0x9a639 - jumpstd $000c + jumpstd radio2 ; 0x9a63c UnknownText_0x9a63c: ; 0x9a63c diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 6d26551b8..9542b3df3 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -15,7 +15,7 @@ YoungsterScript_0x99337: ; 0x99337 ; 0x9933a MapEcruteakLugiaSpeechHouseSignpost0Script: ; 0x9933a - jumpstd $000c + jumpstd radio2 ; 0x9933d UnknownText_0x9933d: ; 0x9933d diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 527ece16a..812914ba0 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -662,7 +662,7 @@ MapElmsLabSignpost15Script: ; 0x78f5e ; 0x78f61 UnknownScript_0x78f61: ; 0x78f61 - jumpstd $000d + jumpstd trashcan ; 0x78f64 MapElmsLabSignpost12Script: ; 0x78f64 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 7349fdb0c..a6dd03c48 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -383,7 +383,7 @@ SchoolboyRickyScript: ; 0x76866 ; 0x7686e MapFastShipB1FSignpost0Script: ; 0x7686e - jumpstd $000d + jumpstd trashcan ; 0x76871 MovementData_0x76871: ; 0x76871 diff --git a/maps/FastShipCabins.asm b/maps/FastShipCabins.asm index 34392b0a2..437948dd0 100644 --- a/maps/FastShipCabins.asm +++ b/maps/FastShipCabins.asm @@ -342,7 +342,7 @@ SupernerdShawnScript: ; 0x75ff9 ; 0x76001 MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script: ; 0x76001 - jumpstd $000d + jumpstd trashcan ; 0x76004 MovementData_0x76004: ; 0x76004 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index df481ad7f..5fe92f5f4 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -217,7 +217,7 @@ UnknownScript_0x75629: ; 0x75629 ; 0x75634 MapFastShipCabins_NNW_NNE_NESignpost2Script: ; 0x75634 - jumpstd $000d + jumpstd trashcan ; 0x75637 MovementData_0x75637: ; 0x75637 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 34392b0a2..437948dd0 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -342,7 +342,7 @@ SupernerdShawnScript: ; 0x75ff9 ; 0x76001 MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script: ; 0x76001 - jumpstd $000d + jumpstd trashcan ; 0x76004 MovementData_0x76004: ; 0x76004 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 16bbc6c33..435d3e7b4 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -182,7 +182,7 @@ UnknownScript_0x75af7: ; 0x75af7 ; 0x75b01 MapFastShipCabins_SW_SSW_NWSignpost2Script: ; 0x75b01 - jumpstd $000d + jumpstd trashcan ; 0x75b04 FirebreatherLyleSeenText: ; 0x75b04 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index d3d4df745..86c99df36 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -52,11 +52,11 @@ MapFuchsiaCitySignpost5Script: ; 0x194b3a ; 0x194b3d MapFuchsiaCitySignpost6Script: ; 0x194b3d - jumpstd $0010 + jumpstd pokecentersign ; 0x194b40 MapFuchsiaCitySignpost7Script: ; 0x194b40 - jumpstd $0011 + jumpstd martsign ; 0x194b43 FruitTreeScript_0x194b43: ; 0x194b43 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 357e3e700..ee39d6ea7 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -113,7 +113,7 @@ MapGoldenrodBillsHouseSignpost0Script: ; 0x54c6e ; 0x54c71 MapGoldenrodBillsHouseSignpost2Script: ; 0x54c71 - jumpstd $000c + jumpstd radio2 ; 0x54c74 UnknownText_0x54c74: ; 0x54c74 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index ea08397f7..588af924a 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -296,7 +296,7 @@ MapGoldenrodCitySignpost9Script: ; 0x198a56 ; 0x198a59 MapGoldenrodCitySignpost10Script: ; 0x198a59 - jumpstd $0010 + jumpstd pokecentersign ; 0x198a5c MapGoldenrodCitySignpost11Script: ; 0x198a5c diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index f85724467..9fcb12b85 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -89,7 +89,7 @@ UnknownScript_0x553ce: ; 0x553ce ; 0x553d1 UnknownScript_0x553d1: ; 0x553d1 - jumpstd $000c + jumpstd radio2 ; 0x553d4 UnknownText_0x553d4: ; 0x553d4 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 4ce68b78a..2dde779bb 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -75,7 +75,7 @@ MapGoldenrodHappinessRaterSignpost1Script: ; 0x5499d ; 0x549a0 MapGoldenrodHappinessRaterSignpost2Script: ; 0x549a0 - jumpstd $000c + jumpstd radio2 ; 0x549a3 UnknownText_0x549a3: ; 0x549a3 diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 5faa66644..1e1701d46 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -20,7 +20,7 @@ MapGoldenrodNameRatersHouseSignpost1Script: ; 0x55784 ; 0x55787 MapGoldenrodNameRatersHouseSignpost2Script: ; 0x55787 - jumpstd $000c + jumpstd radio2 ; 0x5578a INCLUDE "text/sweethoney.asm" diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index ff95d2870..653887fbc 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -23,7 +23,7 @@ MapGoldenrodPPSpeechHouseSignpost0Script: ; 0x55653 ; 0x55656 MapGoldenrodPPSpeechHouseSignpost2Script: ; 0x55656 - jumpstd $000c + jumpstd radio2 ; 0x55659 UnknownText_0x55659: ; 0x55659 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index a7d7d887c..c6fd96d82 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -78,7 +78,7 @@ UnknownScript_0x7e504: ; 0x7e504 BoulderScript_0x7e50a: ; 0x7e50a - jumpstd $000e + jumpstd strengthboulder ; 0x7e50d ItemFragment_0x7e50d: ; 0x7e50d diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index ff80e5409..d32bae067 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -11,7 +11,7 @@ ItemFragment_0x7e66f: ; 0x7e66f ; 0x7e671 RockScript_0x7e671: ; 0x7e671 - jumpstd $000f + jumpstd smashrock ; 0x7e674 IcePathB3F_MapEventHeader: ; 0x7e674 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 39b1c5e65..a50e1426b 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -483,7 +483,7 @@ MapIlexForestSignpostItem3: ; 0x6ee1e ; 0x6ee21 UnknownScript_0x6ee21: ; 0x6ee21 - jumpstd $000e + jumpstd strengthboulder ; 0x6ee24 MapIlexForestSignpost0Script: ; 0x6ee24 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index ae3d1e049..b32651a11 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -85,7 +85,7 @@ MapKrissHouse2FSignpost2Script: ; 0x7abda ; 0x7ac07 UnknownScript_0x7ac07: ; 0x7ac07 - jumpstd radio + jumpstd radio1 ; 0x7ac0a UnknownScript_0x7ac0a: ; 0x7ac0a diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 8ef31fc3e..ba33b405c 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -40,7 +40,7 @@ MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7 ; 0x7ad24 UnknownScript_0x7ad24: ; 0x7ad24 - jumpstd radio + jumpstd radio1 ; 0x7ad27 UnknownScript_0x7ad27: ; 0x7ad27 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index a914f4ca2..ab7bf7e25 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -475,7 +475,7 @@ MapKurtsHouseSignpost5Script: ; 0x18e460 ; 0x18e463 MapKurtsHouseSignpost0Script: ; 0x18e463 - jumpstd $000c + jumpstd radio2 ; 0x18e466 MovementData_0x18e466: ; 0x18e466 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 92d5b306c..4d2467803 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -48,11 +48,11 @@ MapLavenderTownSignpost3Script: ; 0x1ad6f9 ; 0x1ad6fc MapLavenderTownSignpost4Script: ; 0x1ad6fc - jumpstd $0010 + jumpstd pokecentersign ; 0x1ad6ff MapLavenderTownSignpost5Script: ; 0x1ad6ff - jumpstd $0011 + jumpstd martsign ; 0x1ad702 UnknownText_0x1ad702: ; 0x1ad702 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 24be2398f..d76d7167d 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -136,7 +136,7 @@ MapMahoganyTownSignpost2Script: ; 0x19009e ; 0x1900a1 MapMahoganyTownSignpost3Script: ; 0x1900a1 - jumpstd $0010 + jumpstd pokecentersign ; 0x1900a4 MovementData_0x1900a4: ; 0x1900a4 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index cb0ea25c1..2997d58f2 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -92,7 +92,7 @@ MapMountMoonSquareSignpost1Script: ; 0x7711b ; 0x7711e RockScript_0x7711e: ; 0x7711e - jumpstd $000f + jumpstd smashrock ; 0x77121 MovementData_0x77121: ; 0x77121 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 2ec1c9833..e4a4e7a1f 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -65,7 +65,7 @@ SupernerdMarkusScript: ; 0x7de71 ; 0x7de79 BoulderScript_0x7de79: ; 0x7de79 - jumpstd $000e + jumpstd strengthboulder ; 0x7de7c ItemFragment_0x7de7c: ; 0x7de7c diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 081abf549..7878c0a3a 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -48,7 +48,7 @@ UnknownScript_0x7e237: ; 0x7e237 ; 0x7e23d BoulderScript_0x7e23d: ; 0x7e23d - jumpstd $000e + jumpstd strengthboulder ; 0x7e240 ItemFragment_0x7e240: ; 0x7e240 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 61b8438a0..c8ff4b96f 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -124,11 +124,11 @@ MapOlivineCitySignpost4Script: ; 0x1a88c9 ; 0x1a88cc MapOlivineCitySignpost5Script: ; 0x1a88cc - jumpstd $0010 + jumpstd pokecentersign ; 0x1a88cf MapOlivineCitySignpost6Script: ; 0x1a88cf - jumpstd $0011 + jumpstd martsign ; 0x1a88d2 MovementData_0x1a88d2: ; 0x1a88d2 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index aead22b48..a6f0db81d 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -64,11 +64,11 @@ MapPewterCitySignpost4Script: ; 0x18c035 ; 0x18c038 MapPewterCitySignpost5Script: ; 0x18c038 - jumpstd $0010 + jumpstd pokecentersign ; 0x18c03b MapPewterCitySignpost6Script: ; 0x18c03b - jumpstd $0011 + jumpstd martsign ; 0x18c03e FruitTreeScript_0x18c03e: ; 0x18c03e diff --git a/maps/Route10North.asm b/maps/Route10North.asm index d1930f232..fd8482444 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -11,7 +11,7 @@ MapRoute10NorthSignpost0Script: ; 0x1b2080 ; 0x1b2083 MapRoute10NorthSignpost1Script: ; 0x1b2083 - jumpstd $0010 + jumpstd pokecentersign ; 0x1b2086 UnknownText_0x1b2086: ; 0x1b2086 diff --git a/maps/Route32.asm b/maps/Route32.asm index ac3124f47..1fe8bc714 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -681,7 +681,7 @@ MapRoute32Signpost2Script: ; 0x19077d ; 0x190780 MapRoute32Signpost3Script: ; 0x190780 - jumpstd $0010 + jumpstd pokecentersign ; 0x190783 MapRoute32SignpostItem4: ; 0x190783 diff --git a/maps/Route40.asm b/maps/Route40.asm index 6b8dab552..412b71dbd 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -199,7 +199,7 @@ MapRoute40Signpost0Script: ; 0x1a6213 ; 0x1a6216 RockScript_0x1a6216: ; 0x1a6216 - jumpstd $000f + jumpstd smashrock ; 0x1a6219 MapRoute40SignpostItem1: ; 0x1a6219 diff --git a/maps/Route41.asm b/maps/Route41.asm index c4e9d7541..9e58280f5 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -297,7 +297,7 @@ SwimmermMathewScript: ; 0x1a6901 ; 0x1a6909 UnknownScript_0x1a6909: ; 0x1a6909 - jumpstd $000f + jumpstd smashrock ; 0x1a690c MapRoute41SignpostItem0: ; 0x1a690c diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 02a760587..050730c81 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -114,11 +114,11 @@ MapSaffronCitySignpost5Script: ; 0x199384 ; 0x199387 MapSaffronCitySignpost6Script: ; 0x199387 - jumpstd $0010 + jumpstd pokecentersign ; 0x19938a MapSaffronCitySignpost7Script: ; 0x19938a - jumpstd $0011 + jumpstd martsign ; 0x19938d UnknownText_0x19938d: ; 0x19938d diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 337e34c41..c2d74ef80 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -16,7 +16,7 @@ UnknownScript_0x1b2047: ; 0x1b2047 ; 0x1b204b MapSilverCaveOutsideSignpost0Script: ; 0x1b204b - jumpstd $0010 + jumpstd pokecentersign ; 0x1b204e MapSilverCaveOutsideSignpost1Script: ; 0x1b204e diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index a86c8610d..acb8c65e4 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -187,7 +187,7 @@ SlowpokeScript_0x5a695: ; 0x5a695 ; 0x5a6a0 BoulderScript_0x5a6a0: ; 0x5a6a0 - jumpstd $000e + jumpstd strengthboulder ; 0x5a6a3 ItemFragment_0x5a6a3: ; 0x5a6a3 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 87a3ec86a..6a5233130 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -131,7 +131,7 @@ ItemFragment_0x5a018: ; 0x5a018 ; 0x5a01a BoulderScript_0x5a01a: ; 0x5a01a - jumpstd $000e + jumpstd strengthboulder ; 0x5a01d HikerPhillipSeenText: ; 0x5a01d diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 1a98355b7..2307c1724 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -129,11 +129,11 @@ MapVermilionCitySignpost4Script: ; 0x1aaa09 ; 0x1aaa0c MapVermilionCitySignpost5Script: ; 0x1aaa0c - jumpstd $0010 + jumpstd pokecentersign ; 0x1aaa0f MapVermilionCitySignpost6Script: ; 0x1aaa0f - jumpstd $0011 + jumpstd martsign ; 0x1aaa12 MapVermilionCitySignpostItem7: ; 0x1aaa12 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 54ed25623..828df0dfb 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -89,11 +89,11 @@ MapVioletCitySignpost3Script: ; 0x1a8418 ; 0x1a841b MapVioletCitySignpost4Script: ; 0x1a841b - jumpstd $0010 + jumpstd pokecentersign ; 0x1a841e MapVioletCitySignpost5Script: ; 0x1a841e - jumpstd $0011 + jumpstd martsign ; 0x1a8421 ItemFragment_0x1a8421: ; 0x1a8421 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 6e99a4631..d136f9101 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -91,11 +91,11 @@ MapViridianCitySignpost3Script: ; 0x1a9a9c ; 0x1a9a9f MapViridianCitySignpost4Script: ; 0x1a9a9f - jumpstd $0010 + jumpstd pokecentersign ; 0x1a9aa2 MapViridianCitySignpost5Script: ; 0x1a9aa2 - jumpstd $0011 + jumpstd martsign ; 0x1a9aa5 UnknownText_0x1a9aa5: ; 0x1a9aa5 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index e4022a762..03c939334 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -27,7 +27,7 @@ ItemFragment_0x18c418: ; 0x18c418 ; 0x18c41a BoulderScript_0x18c41a: ; 0x18c41a - jumpstd $000e + jumpstd strengthboulder ; 0x18c41d MapWhirlIslandB1FSignpostItem0: ; 0x18c41d diff --git a/text/common.asm b/text/common.asm index dea5f243c..7c5286ef8 100644 --- a/text/common.asm +++ b/text/common.asm @@ -201,11 +201,10 @@ UnknownText_0x1b04f9: ; 0x1b04f9 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 @@ UnknownText_0x1b0561: ; 0x1b0561 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"